diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3dcce68ab46..e045170561d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -59,9 +59,6 @@ At a minimum, the following information should be added (but add more as needed)
 - [ ] <!---ci_exclude_tsan|msan|ubsan|coverage--> Exclude: All with TSAN, MSAN, UBSAN, Coverage
 - [ ] <!---ci_exclude_aarch64|release|debug--> Exclude: All with aarch64, release, debug
 ---
-- [ ] <!---ci_include_fuzzer--> Run only fuzzers related jobs (libFuzzer fuzzers, AST fuzzers, etc.)
-- [ ] <!---ci_exclude_ast--> Exclude: AST fuzzers
----
 - [ ] <!---do_not_test--> Do not test
 - [ ] <!---woolen_wolfdog--> Woolen Wolfdog
 - [ ] <!---upload_all--> Upload binaries for special builds
diff --git a/.github/actions/check_workflow/action.yml b/.github/actions/check_workflow/action.yml
deleted file mode 100644
index 19a3cec76f5..00000000000
--- a/.github/actions/check_workflow/action.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: CheckWorkflowResults
-
-description: Check overall workflow status and post error to slack if any
-
-inputs:
-  needs:
-    description: github needs context as a json string
-    required: true
-    type: string
-
-runs:
-  using: "composite"
-  steps:
-    - name: Check Workflow
-      shell: bash
-      run: |
-        export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
-        cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
-        ${{ inputs.needs }}
-        EOF
-        python3 ./tests/ci/ci_buddy.py --check-wf-status
diff --git a/.github/actions/clean/action.yml b/.github/actions/clean/action.yml
index 8c22523cacf..547738b17cc 100644
--- a/.github/actions/clean/action.yml
+++ b/.github/actions/clean/action.yml
@@ -1,23 +1,11 @@
 name: Clean runner
 description: Clean the runner's temp path on ending
-inputs:
-  images:
-    description: clean docker images
-    default: false
-    type: boolean
 runs:
   using: "composite"
   steps:
-    - name: Clean Temp
+    - name: Clean
       shell: bash
       run: |
-        sudo rm -fr "${{runner.temp}}"
-    - name: Clean Docker Containers
-      shell: bash
-      run: |
-          docker rm -vf $(docker ps -aq) ||:
-    - name: Clean Docker Images
-      if: ${{ inputs.images }}
-      shell: bash
-      run: |
-        docker rmi -f $(docker images -aq) ||:
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "${{runner.temp}}"
diff --git a/.github/actions/debug/action.yml b/.github/actions/debug/action.yml
deleted file mode 100644
index e1fe3f28024..00000000000
--- a/.github/actions/debug/action.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: DebugInfo
-description: Prints workflow debug info
-
-runs:
-  using: "composite"
-  steps:
-    - name: Print envs
-      shell: bash
-      run: |
-          echo "::group::Envs"
-          env
-          echo "::endgroup::"
-    - name: Print Event.json
-      shell: bash
-      run: |
-          echo "::group::Event.json"
-          python3 -m json.tool "$GITHUB_EVENT_PATH"
-          echo "::endgroup::"
diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml
new file mode 100644
index 00000000000..c3897682a33
--- /dev/null
+++ b/.github/actions/release/action.yml
@@ -0,0 +1,168 @@
+name: Release
+
+description: Makes patch releases and creates new release branch
+
+inputs:
+  ref:
+    description: 'Git reference (branch or commit sha) from which to create the release'
+    required: true
+    type: string
+  type:
+    description: 'The type of release: "new" for a new release or "patch" for a patch release'
+    required: true
+    type: choice
+    options:
+      - patch
+      - new
+  dry-run:
+    description: 'Dry run'
+    required: false
+    default: true
+    type: boolean
+  token:
+    required: true
+    type: string
+
+runs:
+  using: "composite"
+  steps:
+    - name: Prepare Release Info
+      shell: bash
+      run: |
+        python3 ./tests/ci/create_release.py --prepare-release-info \
+          --ref ${{ inputs.ref }} --release-type ${{ inputs.type }} \
+          ${{ inputs.dry-run && '--dry-run' || '' }}
+        echo "::group::Release Info"
+        python3 -m json.tool /tmp/release_info.json
+        echo "::endgroup::"
+        release_tag=$(jq -r '.release_tag' /tmp/release_info.json)
+        commit_sha=$(jq -r '.commit_sha' /tmp/release_info.json)
+        echo "Release Tag: $release_tag"
+        echo "RELEASE_TAG=$release_tag" >> "$GITHUB_ENV"
+        echo "COMMIT_SHA=$commit_sha" >> "$GITHUB_ENV"
+    - name: Download All Release Artifacts
+      if: ${{ inputs.type == 'patch' }}
+      shell: bash
+      run: |
+        python3 ./tests/ci/create_release.py --download-packages ${{ inputs.dry-run && '--dry-run' || '' }}
+    - name: Push Git Tag for the Release
+      shell: bash
+      run: |
+        python3 ./tests/ci/create_release.py --push-release-tag ${{ inputs.dry-run && '--dry-run' || '' }}
+    - name: Push New Release Branch
+      if: ${{ inputs.type == 'new' }}
+      shell: bash
+      run: |
+        python3 ./tests/ci/create_release.py --push-new-release-branch ${{ inputs.dry-run && '--dry-run' || '' }}
+    - name: Bump CH Version and Update Contributors' List
+      shell: bash
+      run: |
+        python3 ./tests/ci/create_release.py --create-bump-version-pr ${{ inputs.dry-run && '--dry-run' || '' }}
+    - name: Bump Docker versions, Changelog, Security
+      if: ${{ inputs.type == 'patch' }}
+      shell: bash
+      run: |
+        git checkout master
+        python3 ./tests/ci/create_release.py --set-progress-started --progress "update changelog, docker version, security"
+        echo "List versions"
+        ./utils/list-versions/list-versions.sh > ./utils/list-versions/version_date.tsv
+        echo "Update docker version"
+        ./utils/list-versions/update-docker-version.sh
+        echo "Generate ChangeLog"
+        export CI=1
+        docker run -u "${UID}:${GID}" -e PYTHONUNBUFFERED=1 -e CI=1 --network=host \
+          --volume=".:/ClickHouse" clickhouse/style-test \
+          /ClickHouse/tests/ci/changelog.py -v --debug-helpers \
+          --gh-user-or-token=${{ inputs.token }} --jobs=5 \
+          --output="/ClickHouse/docs/changelogs/${{ env.RELEASE_TAG }}.md" ${{ env.RELEASE_TAG }}
+        git add ./docs/changelogs/${{ env.RELEASE_TAG }}.md
+        echo "Generate Security"
+        python3 ./utils/security-generator/generate_security.py > SECURITY.md
+        git diff HEAD
+    - name: Create ChangeLog PR
+      if: ${{ inputs.type == 'patch' && ! inputs.dry-run }}
+      uses: peter-evans/create-pull-request@v6
+      with:
+        author: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
+        token: ${{ inputs.token }}
+        committer: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
+        commit-message: Update version_date.tsv and changelogs after ${{ env.RELEASE_TAG }}
+        branch: auto/${{ env.RELEASE_TAG }}
+        assignees: ${{ github.event.sender.login }}  # assign the PR to the tag pusher
+        delete-branch: true
+        title: Update version_date.tsv and changelog after ${{ env.RELEASE_TAG }}
+        labels: do not test
+        body: |
+          Update version_date.tsv and changelogs after ${{ env.RELEASE_TAG }}
+          ### Changelog category (leave one):
+          - Not for changelog (changelog entry is not required)
+    - name: Complete previous steps and Restore git state
+      if: ${{ inputs.type == 'patch' }}
+      shell: bash
+      run: |
+        python3 ./tests/ci/create_release.py --set-progress-completed
+        git reset --hard HEAD
+        git checkout "$GITHUB_REF_NAME"
+    - name: Create GH Release
+      shell: bash
+      if: ${{ inputs.type == 'patch' }}
+      run: |
+        python3 ./tests/ci/create_release.py --create-gh-release ${{ inputs.dry-run && '--dry-run' || '' }}
+    - name: Export TGZ Packages
+      if: ${{ inputs.type == 'patch' }}
+      shell: bash
+      run: |
+        python3 ./tests/ci/artifactory.py --export-tgz ${{ inputs.dry-run && '--dry-run' || '' }}
+    - name: Test TGZ Packages
+      if: ${{ inputs.type == 'patch' }}
+      shell: bash
+      run: |
+        python3 ./tests/ci/artifactory.py --test-tgz ${{ inputs.dry-run && '--dry-run' || '' }}
+    - name: Export RPM Packages
+      if: ${{ inputs.type == 'patch' }}
+      shell: bash
+      run: |
+        python3 ./tests/ci/artifactory.py --export-rpm ${{ inputs.dry-run && '--dry-run' || '' }}
+    - name: Test RPM Packages
+      if: ${{ inputs.type == 'patch' }}
+      shell: bash
+      run: |
+        python3 ./tests/ci/artifactory.py --test-rpm ${{ inputs.dry-run && '--dry-run' || '' }}
+    - name: Export Debian Packages
+      if: ${{ inputs.type == 'patch' }}
+      shell: bash
+      run: |
+        python3 ./tests/ci/artifactory.py --export-debian ${{ inputs.dry-run && '--dry-run' || '' }}
+    - name: Test Debian Packages
+      if: ${{ inputs.type == 'patch' }}
+      shell: bash
+      run: |
+        python3 ./tests/ci/artifactory.py --test-debian ${{ inputs.dry-run && '--dry-run' || '' }}
+    - name: Docker clickhouse/clickhouse-server building
+      if: ${{ inputs.type == 'patch' }}
+      shell: bash
+      run: |
+        cd "./tests/ci"
+        python3 ./create_release.py --set-progress-started --progress "docker server release"
+        export CHECK_NAME="Docker server image"
+        python3 docker_server.py --release-type auto --version ${{ env.RELEASE_TAG }} --check-name "$CHECK_NAME" --sha ${{ env.COMMIT_SHA }} ${{ ! inputs.dry-run && '--push' || '' }}
+        python3 ./create_release.py --set-progress-completed
+    - name: Docker clickhouse/clickhouse-keeper building
+      if: ${{ inputs.type == 'patch' }}
+      shell: bash
+      run: |
+        cd "./tests/ci"
+        python3 ./create_release.py --set-progress-started --progress "docker keeper release"
+        export CHECK_NAME="Docker keeper image"
+        python3 docker_server.py --release-type auto --version ${{ env.RELEASE_TAG }} --check-name "$CHECK_NAME" --sha ${{ env.COMMIT_SHA }} ${{ ! inputs.dry-run && '--push'  || '' }}
+        python3 ./create_release.py --set-progress-completed
+    - name: Set current Release progress to Completed with OK
+      shell: bash
+      run: |
+        python3 ./tests/ci/create_release.py --set-progress-started --progress "completed"
+        python3 ./tests/ci/create_release.py --set-progress-completed
+    - name: Post Slack Message
+      if: ${{ !cancelled() }}
+      shell: bash
+      run: |
+        python3 ./tests/ci/create_release.py --post-status ${{ inputs.dry-run && '--dry-run' || '' }}
diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
new file mode 100644
index 00000000000..457ffacc7a8
--- /dev/null
+++ b/.github/workflows/auto_release.yml
@@ -0,0 +1,111 @@
+name: AutoRelease
+
+env:
+  PYTHONUNBUFFERED: 1
+  DRY_RUN: true
+
+concurrency:
+  group: release
+on: # yamllint disable-line rule:truthy
+  # Workflow uses a test bucket for packages and dry run mode (no real releases)
+  schedule:
+    - cron: '0 9 * * *'
+    - cron: '0 15 * * *'
+  workflow_dispatch:
+    inputs:
+      dry-run:
+        description: 'Dry run'
+        required: false
+        default: true
+        type: boolean
+
+jobs:
+  AutoRelease:
+    runs-on: [self-hosted, release-maker]
+    steps:
+      - name: DebugInfo
+        uses: hmarr/debug-action@f7318c783045ac39ed9bb497e22ce835fdafbfe6
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          ROBOT_CLICKHOUSE_SSH_KEY<<RCSK
+          ${{secrets.ROBOT_CLICKHOUSE_SSH_KEY}}
+          RCSK
+          EOF
+      - name: Set DRY_RUN for schedule
+        if: ${{ github.event_name == 'schedule' }}
+        run: echo "DRY_RUN=true" >> "$GITHUB_ENV"
+      - name: Set DRY_RUN for dispatch
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        run: echo "DRY_RUN=${{ github.event.inputs.dry-run }}" >> "$GITHUB_ENV"
+      - name: Check out repository code
+        uses: ClickHouse/checkout@v1
+        with:
+          token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
+          fetch-depth: 0
+      - name: Auto Release Prepare
+        run: |
+          cd "$GITHUB_WORKSPACE/tests/ci"
+          python3 auto_release.py --prepare
+          echo "::group::Auto Release Info"
+          python3 -m json.tool /tmp/autorelease_info.json
+          echo "::endgroup::"
+          {
+              echo 'AUTO_RELEASE_PARAMS<<EOF'
+              cat  /tmp/autorelease_info.json
+              echo 'EOF'
+          } >> "$GITHUB_ENV"
+      - name: Post Release Branch statuses
+        run: |
+          cd "$GITHUB_WORKSPACE/tests/ci"
+          python3 auto_release.py --post-status
+      - name: Release ${{ fromJson(env.AUTO_RELEASE_PARAMS).releases[0].release_branch }}
+        if: ${{ fromJson(env.AUTO_RELEASE_PARAMS).releases[0] && fromJson(env.AUTO_RELEASE_PARAMS).releases[0].ready }}
+        uses: ./.github/actions/release
+        with:
+          ref: ${{ fromJson(env.AUTO_RELEASE_PARAMS).releases[0].commit_sha }}
+          type: patch
+          dry-run: ${{ env.DRY_RUN }}
+          token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
+      - name: Release ${{ fromJson(env.AUTO_RELEASE_PARAMS).releases[1].release_branch }}
+        if: ${{ fromJson(env.AUTO_RELEASE_PARAMS).releases[0] && fromJson(env.AUTO_RELEASE_PARAMS).releases[1].ready }}
+        uses: ./.github/actions/release
+        with:
+          ref: ${{ fromJson(env.AUTO_RELEASE_PARAMS).releases[1].commit_sha }}
+          type: patch
+          dry-run: ${{ env.DRY_RUN }}
+          token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
+      - name: Release ${{ fromJson(env.AUTO_RELEASE_PARAMS).releases[2].release_branch }}
+        if: ${{ fromJson(env.AUTO_RELEASE_PARAMS).releases[2] && fromJson(env.AUTO_RELEASE_PARAMS).releases[2].ready }}
+        uses: ./.github/actions/release
+        with:
+          ref: ${{ fromJson(env.AUTO_RELEASE_PARAMS).releases[2].commit_sha }}
+          type: patch
+          dry-run: ${{ env.DRY_RUN }}
+          token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
+      - name: Release ${{ fromJson(env.AUTO_RELEASE_PARAMS).releases[3].release_branch }}
+        if: ${{ fromJson(env.AUTO_RELEASE_PARAMS).releases[3] && fromJson(env.AUTO_RELEASE_PARAMS).releases[3].ready }}
+        uses: ./.github/actions/release
+        with:
+          ref: ${{ fromJson(env.AUTO_RELEASE_PARAMS).releases[3].commit_sha }}
+          type: patch
+          dry-run: ${{ env.DRY_RUN }}
+          token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
+      - name: Release ${{ fromJson(env.AUTO_RELEASE_PARAMS).releases[4].release_branch }}
+        if: ${{ fromJson(env.AUTO_RELEASE_PARAMS).releases[4] && fromJson(env.AUTO_RELEASE_PARAMS).releases[4].ready }}
+        uses: ./.github/actions/release
+        with:
+          ref: ${{ fromJson(env.AUTO_RELEASE_PARAMS).releases[4].commit_sha }}
+          type: patch
+          dry-run: ${{ env.DRY_RUN }}
+          token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
+      - name: Post Slack Message
+        if: ${{ !cancelled() }}
+        run: |
+          cd "$GITHUB_WORKSPACE/tests/ci"
+          python3 auto_release.py --post-auto-release-complete --wf-status ${{ job.status }}
+      - name: Clean up
+        run: |
+          docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+          docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+          sudo rm -fr "$TEMP_PATH"
diff --git a/.github/workflows/auto_releases.yml b/.github/workflows/auto_releases.yml
deleted file mode 100644
index 2fdf4e30a70..00000000000
--- a/.github/workflows/auto_releases.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-name: AutoReleases
-
-env:
-  PYTHONUNBUFFERED: 1
-
-concurrency:
-  group: autoreleases
-
-on:
-  #  schedule:
-  #    - cron: '0 9 * * *'
-  workflow_dispatch:
-    inputs:
-      dry-run:
-        description: 'Dry run'
-        required: false
-        default: false
-        type: boolean
-
-jobs:
-  AutoReleaseInfo:
-    runs-on: [self-hosted, release-maker]
-    outputs:
-      data: ${{ steps.info.outputs.AUTO_RELEASE_PARAMS }}
-      dry_run: ${{ steps.info.outputs.DRY_RUN }}
-    steps:
-      - name: Set envs
-        run: |
-          cat >> "$GITHUB_ENV" << 'EOF'
-          ROBOT_CLICKHOUSE_SSH_KEY<<RCSK
-          ${{secrets.ROBOT_CLICKHOUSE_SSH_KEY}}
-          RCSK
-          EOF
-          echo "DRY_RUN=true" >> "$GITHUB_ENV"
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          fetch-depth: 0  # full history needed
-      - name: Debug Info
-        uses: ./.github/actions/debug
-      - name: Prepare Info
-        id: info
-        run: |
-          cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 auto_release.py --prepare
-          echo "::group::Auto Release Info"
-          python3 -m json.tool /tmp/autorelease_info.json
-          echo "::endgroup::"
-          {
-              echo 'AUTO_RELEASE_PARAMS<<EOF'
-              cat  /tmp/autorelease_params.json
-              echo 'EOF'
-          } >> "$GITHUB_OUTPUT"
-          if [[ "${{ github.event_name }}" == "schedule" ]]; then
-            echo "DRY_RUN=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "DRY_RUN=${{ github.event.inputs.dry-run }}" >> "$GITHUB_OUTPUT"
-          fi
-      - name: Post Release Branch statuses
-        run: |
-          cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 auto_release.py --post-status
-      - name: Clean up
-        uses: ./.github/actions/clean
-
-  Releases:
-    needs: AutoReleaseInfo
-    strategy:
-      matrix:
-        release_params: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases }}
-      max-parallel: 1
-    name: Release ${{ matrix.release_params.release_branch }}
-    uses: ./.github/workflows/create_release.yml
-    with:
-      ref: ${{ matrix.release_params.commit_sha }}
-      type: patch
-      dry-run: ${{ fromJson(needs.AutoReleaseInfo.outputs.dry_run) }}
-    secrets:
-      ROBOT_CLICKHOUSE_COMMIT_TOKEN: ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }}
-
-  CleanUp:
-    needs: [Releases]
-    runs-on: [self-hosted, release-maker]
-    steps:
-      - uses: ./.github/actions/clean
-        with:
-          images: true
-
-#  PostSlackMessage:
-#    needs: [Releases]
-#    runs-on: [self-hosted, release-maker]
-#    if: ${{ !cancelled() }}
-#    steps:
-#      - name: Check out repository code
-#        uses: ClickHouse/checkout@v1
-#      - name: Post
-#        run: |
-#          cd "$GITHUB_WORKSPACE/tests/ci"
-#          python3 auto_release.py --post-auto-release-complete --wf-status ${{ job.status }}
diff --git a/.github/workflows/backport_branches.yml b/.github/workflows/backport_branches.yml
index 23744dc7f8f..322946ac77b 100644
--- a/.github/workflows/backport_branches.yml
+++ b/.github/workflows/backport_branches.yml
@@ -260,18 +260,13 @@ jobs:
       - name: Finish label
         if: ${{ !failure() }}
         run: |
-          export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
-          cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
           cd "$GITHUB_WORKSPACE/tests/ci"
           # update mergeable check
-          python3 merge_pr.py --set-ci-status
+          python3 merge_pr.py --set-ci-status --wf-status ${{ contains(needs.*.result, 'failure') && 'failure' || 'success' }}
           # update overall ci report
           python3 finish_check.py --wf-status ${{ contains(needs.*.result, 'failure') && 'failure' || 'success' }}
           python3 merge_pr.py
       - name: Check Workflow results
-        if: ${{ !cancelled() }}
         run: |
           export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
           cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
index 1fb6cb60e96..55644bdd503 100644
--- a/.github/workflows/create_release.yml
+++ b/.github/workflows/create_release.yml
@@ -2,7 +2,6 @@ name: CreateRelease
 
 concurrency:
   group: release
-
 'on':
   workflow_dispatch:
     inputs:
@@ -17,38 +16,11 @@ concurrency:
         options:
           - patch
           - new
-      only-repo:
-        description: 'Run only repos updates including docker (repo-recovery, tests)'
-        required: false
-        default: false
-        type: boolean
       dry-run:
         description: 'Dry run'
         required: false
-        default: false
+        default: true
         type: boolean
-  workflow_call:
-    inputs:
-      ref:
-        description: 'Git reference (branch or commit sha) from which to create the release'
-        required: true
-        type: string
-      type:
-        description: 'The type of release: "new" for a new release or "patch" for a patch release'
-        required: true
-        type: string
-      only-repo:
-        description: 'Run only repos updates including docker (repo-recovery, tests)'
-        required: false
-        default: false
-        type: boolean
-      dry-run:
-        description: 'Dry run'
-        required: false
-        default: false
-        type: boolean
-    secrets:
-      ROBOT_CLICKHOUSE_COMMIT_TOKEN:
 
 jobs:
   CreateRelease:
@@ -63,164 +35,10 @@ jobs:
         with:
           token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
           fetch-depth: 0
-      - name: Prepare Release Info
-        shell: bash
-        run: |
-          if [ ${{ inputs.only-repo }} == "true" ]; then
-              git tag -l ${{ inputs.ref }} || { echo "With only-repo option ref must be a valid release tag"; exit 1; }
-          fi
-          python3 ./tests/ci/create_release.py --prepare-release-info \
-            --ref ${{ inputs.ref }} --release-type ${{ inputs.type }} \
-            ${{ inputs.dry-run == true && '--dry-run' || '' }} \
-            ${{ inputs.only-repo == true && '--skip-tag-check' || '' }}
-          echo "::group::Release Info"
-          python3 -m json.tool /tmp/release_info.json
-          echo "::endgroup::"
-          release_tag=$(jq -r '.release_tag' /tmp/release_info.json)
-          commit_sha=$(jq -r '.commit_sha' /tmp/release_info.json)
-          is_latest=$(jq -r '.latest' /tmp/release_info.json)
-          echo "Release Tag: $release_tag"
-          echo "RELEASE_TAG=$release_tag" >> "$GITHUB_ENV"
-          echo "COMMIT_SHA=$commit_sha" >> "$GITHUB_ENV"
-          if [ "$is_latest" == "true" ]; then
-            echo "DOCKER_TAG_TYPE=release-latest" >> "$GITHUB_ENV"
-          else
-            echo "DOCKER_TAG_TYPE=release" >> "$GITHUB_ENV"
-          fi
-      - name: Download All Release Artifacts
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/create_release.py --download-packages ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Push Git Tag for the Release
-        if: ${{ ! inputs.only-repo }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/create_release.py --push-release-tag ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Push New Release Branch
-        if: ${{ inputs.type == 'new' && ! inputs.only-repo }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/create_release.py --push-new-release-branch ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Bump CH Version and Update Contributors' List
-        if: ${{ ! inputs.only-repo }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/create_release.py --create-bump-version-pr ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Bump Docker versions, Changelog, Security
-        if: ${{ inputs.type == 'patch' && ! inputs.only-repo }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/create_release.py --set-progress-started --progress "update changelog, docker version, security"
-
-          git checkout master  # in case WF started from feature branch
-          echo "List versions"
-          ./utils/list-versions/list-versions.sh > ./utils/list-versions/version_date.tsv
-          echo "Update docker version"
-          ./utils/list-versions/update-docker-version.sh
-          echo "Generate ChangeLog"
-          export CI=1
-          docker run -u "${UID}:${GID}" -e PYTHONUNBUFFERED=1 -e CI=1 --network=host \
-            --volume=".:/wd" --workdir="/wd" \
-            clickhouse/style-test \
-            ./tests/ci/changelog.py -v --debug-helpers \
-            --gh-user-or-token ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }} \
-            --jobs=5 \
-            --output="./docs/changelogs/${{ env.RELEASE_TAG }}.md" ${{ env.RELEASE_TAG }}
-          git add ./docs/changelogs/${{ env.RELEASE_TAG }}.md
-          echo "Generate Security"
-          python3 ./utils/security-generator/generate_security.py > SECURITY.md
-          git diff HEAD
-      - name: Create ChangeLog PR
-        if: ${{ inputs.type == 'patch' && ! inputs.dry-run && ! inputs.only-repo }}
-        uses: peter-evans/create-pull-request@v6
+      - name: Call Release Action
+        uses: ./.github/actions/release
         with:
-          author: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
-          token: ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }}
-          committer: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
-          commit-message: Update version_date.tsv and changelogs after ${{ env.RELEASE_TAG }}
-          branch: auto/${{ env.RELEASE_TAG }}
-          base: master
-          assignees: ${{ github.event.sender.login }}  # assign the PR to the tag pusher
-          delete-branch: true
-          title: Update version_date.tsv and changelog after ${{ env.RELEASE_TAG }}
-          labels: do not test
-          body: |
-            Update version_date.tsv and changelogs after ${{ env.RELEASE_TAG }}
-            ### Changelog category (leave one):
-            - Not for changelog (changelog entry is not required)
-      - name: Complete previous steps and Restore git state
-        if: ${{ inputs.type == 'patch' && ! inputs.only-repo }}
-        shell: bash
-        run: |
-          git reset --hard HEAD
-          git checkout "$GITHUB_REF_NAME"
-          python3 ./tests/ci/create_release.py --set-progress-completed
-      - name: Create GH Release
-        if: ${{ inputs.type == 'patch' && ! inputs.only-repo }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/create_release.py --create-gh-release ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Export TGZ Packages
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/artifactory.py --export-tgz ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Test TGZ Packages
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/artifactory.py --test-tgz ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Export RPM Packages
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/artifactory.py --export-rpm ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Test RPM Packages
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/artifactory.py --test-rpm ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Export Debian Packages
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/artifactory.py --export-debian ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Test Debian Packages
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/artifactory.py --test-debian ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Docker clickhouse/clickhouse-server building
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          cd "./tests/ci"
-          python3 ./create_release.py --set-progress-started --progress "docker server release"
-          export CHECK_NAME="Docker server image"
-          python3 docker_server.py --tag-type ${{ env.DOCKER_TAG_TYPE }} --version ${{ env.RELEASE_TAG }} --check-name "$CHECK_NAME" --sha ${{ env.COMMIT_SHA }} ${{ ! inputs.dry-run && '--push' || '' }}
-          python3 ./create_release.py --set-progress-completed
-      - name: Docker clickhouse/clickhouse-keeper building
-        if: ${{ inputs.type == 'patch' }}
-        shell: bash
-        run: |
-          cd "./tests/ci"
-          python3 ./create_release.py --set-progress-started --progress "docker keeper release"
-          export CHECK_NAME="Docker keeper image"
-          python3 docker_server.py --tag-type ${{ env.DOCKER_TAG_TYPE }} --version ${{ env.RELEASE_TAG }} --check-name "$CHECK_NAME" --sha ${{ env.COMMIT_SHA }} ${{ ! inputs.dry-run && '--push'  || '' }}
-          python3 ./create_release.py --set-progress-completed
-      - name: Update release info. Merge created PRs
-        shell: bash
-        run: |
-          python3 ./tests/ci/create_release.py --merge-prs ${{ inputs.dry-run == true && '--dry-run' || '' }}
-      - name: Set current Release progress to Completed with OK
-        shell: bash
-        run: |
-          # dummy stage to finalize release info with "progress: completed; status: OK"
-          python3 ./tests/ci/create_release.py --set-progress-started --progress "completed"
-          python3 ./tests/ci/create_release.py --set-progress-completed
-      - name: Post Slack Message
-        if: ${{ !cancelled() }}
-        shell: bash
-        run: |
-          python3 ./tests/ci/create_release.py --post-status ${{ inputs.dry-run == true && '--dry-run' || '' }}
+          ref: ${{ inputs.ref }}
+          type: ${{ inputs.type }}
+          dry-run: ${{ inputs.dry-run }}
+          token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
diff --git a/.github/workflows/jepsen.yml b/.github/workflows/jepsen.yml
index ecafde9e4cb..db837ac1ec7 100644
--- a/.github/workflows/jepsen.yml
+++ b/.github/workflows/jepsen.yml
@@ -9,65 +9,19 @@ on: # yamllint disable-line rule:truthy
     - cron: '0 */6 * * *'
   workflow_dispatch:
 jobs:
-  RunConfig:
-    runs-on: [self-hosted, style-checker-aarch64]
-    outputs:
-      data: ${{ steps.runconfig.outputs.CI_DATA }}
-    steps:
-      - name: DebugInfo
-        uses: hmarr/debug-action@f7318c783045ac39ed9bb497e22ce835fdafbfe6
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true # to ensure correct digests
-          fetch-depth: 0 # to get version
-          filter: tree:0
-      - name: PrepareRunConfig
-        id: runconfig
-        run: |
-          echo "::group::configure CI run"
-          python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --configure --workflow "$GITHUB_WORKFLOW" --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
-          echo "::endgroup::"
-          {
-            echo 'CI_DATA<<EOF'
-            cat  ${{ runner.temp }}/ci_run_data.json
-            echo 'EOF'
-          } >> "$GITHUB_OUTPUT"
   KeeperJepsenRelease:
-    needs: [RunConfig]
-    uses: ./.github/workflows/reusable_test.yml
+    uses: ./.github/workflows/reusable_simple_job.yml
     with:
-      test_name: ClickHouse Keeper Jepsen
-      runner_type: style-checker-aarch64
-      data: ${{ needs.RunConfig.outputs.data }}
+      test_name: Jepsen keeper check
+      runner_type: style-checker
+      report_required: true
       run_command: |
         python3 jepsen_check.py keeper
-  ServerJepsenRelease:
-    if: false  # skip for server
-    needs: [RunConfig]
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: ClickHouse Server Jepsen
-      runner_type: style-checker-aarch64
-      data: ${{ needs.RunConfig.outputs.data }}
-      run_command: |
-        python3 jepsen_check.py server
-  CheckWorkflow:
-    if: ${{ !cancelled() }}
-    needs: [RunConfig, ServerJepsenRelease, KeeperJepsenRelease]
-    runs-on: [self-hosted, style-checker-aarch64]
-    steps:
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-      - name: Check Workflow results
-        if: ${{ !cancelled() }}
-        run: |
-          export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
-          cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
-          python3 ./tests/ci/ci_buddy.py --check-wf-status
+  # ServerJepsenRelease:
+  #   uses: ./.github/workflows/reusable_simple_job.yml
+  #   with:
+  #     test_name: Jepsen server check
+  #     runner_type: style-checker
+  #     run_command: |
+  #       cd "$REPO_COPY/tests/ci"
+  #       python3 jepsen_check.py server
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 2ce1124404f..acd7511d520 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -93,21 +93,21 @@ jobs:
     with:
       stage: Builds_2
       data: ${{ needs.RunConfig.outputs.data }}
-  Tests_2_ww:
-    needs: [RunConfig, Builds_2]
-    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_2_ww') }}
-    uses: ./.github/workflows/reusable_test_stage.yml
-    with:
-      stage: Tests_2_ww
-      data: ${{ needs.RunConfig.outputs.data }}
   Tests_2:
-    # Test_3 should not wait for Test_1/Test_2 and should not be blocked by them on master branch since all jobs need to run there.
-    needs: [RunConfig, Builds_1]
+    needs: [RunConfig, Builds_2]
     if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_2') }}
     uses: ./.github/workflows/reusable_test_stage.yml
     with:
       stage: Tests_2
       data: ${{ needs.RunConfig.outputs.data }}
+  Tests_3:
+    # Test_3 should not wait for Test_1/Test_2 and should not be blocked by them on master branch since all jobs need to run there.
+    needs: [RunConfig, Builds_1]
+    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_3') }}
+    uses: ./.github/workflows/reusable_test_stage.yml
+    with:
+      stage: Tests_3
+      data: ${{ needs.RunConfig.outputs.data }}
 
   ################################# Reports #################################
   # Reports should run even if Builds_1/2 fail - run them separately, not in Tests_1/2/3
@@ -123,7 +123,7 @@ jobs:
 
   FinishCheck:
     if: ${{ !cancelled() }}
-    needs: [RunConfig, Builds_1, Builds_2, Builds_Report, Tests_1, Tests_2_ww, Tests_2]
+    needs: [RunConfig, Builds_1, Builds_2, Builds_Report, Tests_1, Tests_2, Tests_3]
     runs-on: [self-hosted, style-checker-aarch64]
     steps:
       - name: Check out repository code
@@ -133,7 +133,6 @@ jobs:
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 finish_check.py --wf-status ${{ contains(needs.*.result, 'failure') && 'failure' || 'success' }}
       - name: Check Workflow results
-        if: ${{ !cancelled() }}
         run: |
           export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
           cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
diff --git a/.github/workflows/merge_queue.yml b/.github/workflows/merge_queue.yml
index 629cf79770e..64083668719 100644
--- a/.github/workflows/merge_queue.yml
+++ b/.github/workflows/merge_queue.yml
@@ -103,14 +103,9 @@ jobs:
       - name: Check and set merge status
         if: ${{ needs.StyleCheck.result == 'success' }}
         run: |
-          export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
-          cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
-          ${{ toJson(needs) }}
-          EOF
           cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 merge_pr.py --set-ci-status
+          python3 merge_pr.py --set-ci-status --wf-status ${{ contains(needs.*.result, 'failure') && 'failure' || 'success' }}
       - name: Check Workflow results
-        if: ${{ !cancelled() }}
         run: |
           export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
           cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 36fea39686f..ea9c125db70 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -52,7 +52,6 @@ jobs:
       - name: Check out repository code
         uses: ClickHouse/checkout@v1
       - name: Check Workflow results
-        if: ${{ !cancelled() }}
         run: |
           export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
           cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index dbc740ebc1b..63b2bd87dc9 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -123,32 +123,27 @@ jobs:
       stage: Builds_2
       data: ${{ needs.RunConfig.outputs.data }}
   # stage for running non-required checks without being blocked by required checks (Test_1) if corresponding settings is selected
-  Tests_2_ww:
-    needs: [RunConfig, Builds_1]
-    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_2_ww') }}
-    uses: ./.github/workflows/reusable_test_stage.yml
-    with:
-      stage: Tests_2_ww
-      data: ${{ needs.RunConfig.outputs.data }}
   Tests_2:
-    needs: [RunConfig, Builds_1, Tests_1]
+    needs: [RunConfig, Builds_1]
     if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_2') }}
     uses: ./.github/workflows/reusable_test_stage.yml
     with:
       stage: Tests_2
       data: ${{ needs.RunConfig.outputs.data }}
+  Tests_3:
+    needs: [RunConfig, Builds_1, Tests_1]
+    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_3') }}
+    uses: ./.github/workflows/reusable_test_stage.yml
+    with:
+      stage: Tests_3
+      data: ${{ needs.RunConfig.outputs.data }}
 
   ################################# Reports #################################
   # Reports should run even if Builds_1/2 fail - run them separately (not in Tests_1/2/3)
   Builds_Report:
     # run report check for failed builds to indicate the CI error
-    if: ${{ !cancelled()
-      && needs.RunConfig.result == 'success'
-      && needs.StyleCheck.result != 'failure'
-      && needs.FastTest.result != 'failure'
-      && needs.BuildDockers.result != 'failure'
-      && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'Builds') }}
-    needs: [RunConfig, BuildDockers, StyleCheck, FastTest, Builds_1, Builds_2]
+    if: ${{ !cancelled() && needs.RunConfig.result == 'success' && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'Builds') }}
+    needs: [RunConfig, StyleCheck, Builds_1, Builds_2]
     uses: ./.github/workflows/reusable_test.yml
     with:
       test_name: Builds
@@ -157,9 +152,8 @@ jobs:
 
   CheckReadyForMerge:
     if: ${{ !cancelled() }}
-    # Test_2 or Test_3 do not have the jobs required for Mergeable check,
-    #  however, set them as "needs" to get all checks results before the automatic merge occurs.
-    needs: [RunConfig, BuildDockers, StyleCheck, FastTest, Builds_1, Builds_2, Builds_Report, Tests_1, Tests_2_ww, Tests_2]
+    # Test_2 or Test_3 must not have jobs required for Mergeable check
+    needs: [RunConfig, BuildDockers, StyleCheck, FastTest, Builds_1, Builds_2, Builds_Report, Tests_1]
     runs-on: [self-hosted, style-checker-aarch64]
     steps:
       - name: Check out repository code
@@ -170,21 +164,20 @@ jobs:
         if: ${{ needs.StyleCheck.result == 'success' }}
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
+          python3 merge_pr.py --set-ci-status --wf-status ${{ contains(needs.*.result, 'failure') && 'failure' || 'success' }}
+      - name: Check Workflow results
+        run: |
           export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
           cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
           ${{ toJson(needs) }}
           EOF
-          python3 merge_pr.py --set-ci-status
-      - name: Check Workflow results
-        uses: ./.github/actions/check_workflow
-        with:
-          needs: ${{ toJson(needs) }}
+          python3 ./tests/ci/ci_buddy.py --check-wf-status
 
   ################################# Stage Final #################################
   #
   FinishCheck:
     if: ${{ !failure() && !cancelled() }}
-    needs: [RunConfig, BuildDockers, StyleCheck, FastTest, Builds_1, Builds_2, Builds_Report, Tests_1, Tests_2_ww, Tests_2]
+    needs: [RunConfig, BuildDockers, StyleCheck, FastTest, Builds_1, Builds_2, Builds_Report, Tests_1, Tests_2, Tests_3]
     runs-on: [self-hosted, style-checker-aarch64]
     steps:
       - name: Check out repository code
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000000..3bd6dfae6ca
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,69 @@
+name: PublishedReleaseCI
+# - Gets artifacts from S3
+# - Sends it to JFROG Artifactory
+# - Adds them to the release assets
+
+on: # yamllint disable-line rule:truthy
+  release:
+    types:
+    - published
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Release tag'
+        required: true
+        type: string
+
+jobs:
+  ReleasePublish:
+    runs-on: [self-hosted, style-checker]
+    steps:
+    - name: Set tag from input
+      if: github.event_name == 'workflow_dispatch'
+      run: |
+        echo "GITHUB_TAG=${{ github.event.inputs.tag }}" >> "$GITHUB_ENV"
+    - name: Set tag from REF
+      if: github.event_name == 'release'
+      run: |
+        echo "GITHUB_TAG=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV"
+    - name: Deploy packages and assets
+      run: |
+        curl --silent --data '' --no-buffer \
+          '${{ secrets.PACKAGES_RELEASE_URL }}/release/'"${GITHUB_TAG}"'?binary=binary_darwin&binary=binary_darwin_aarch64&sync=true'
+  ############################################################################################
+  ##################################### Docker images  #######################################
+  ############################################################################################
+  DockerServerImages:
+    runs-on: [self-hosted, style-checker]
+    steps:
+    - name: Set tag from input
+      if: github.event_name == 'workflow_dispatch'
+      run: |
+        echo "GITHUB_TAG=${{ github.event.inputs.tag }}" >> "$GITHUB_ENV"
+    - name: Set tag from REF
+      if: github.event_name == 'release'
+      run: |
+        echo "GITHUB_TAG=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV"
+    - name: Check out repository code
+      uses: ClickHouse/checkout@v1
+      with:
+        clear-repository: true
+        fetch-depth: 0  # otherwise we will have no version info
+        filter: tree:0
+        ref: ${{ env.GITHUB_TAG }}
+    - name: Check docker clickhouse/clickhouse-server building
+      run: |
+        cd "$GITHUB_WORKSPACE/tests/ci"
+        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: |
+        docker ps --quiet | xargs --no-run-if-empty docker kill ||:
+        docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
+        sudo rm -fr "$TEMP_PATH"
diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
index ec119b6ff95..297927d1dbd 100644
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@@ -482,10 +482,12 @@ jobs:
       - name: Finish label
         if: ${{ !failure() }}
         run: |
+          cd "$GITHUB_WORKSPACE/tests/ci"
+          # update mergeable check
+          python3 merge_pr.py --set-ci-status --wf-status ${{ contains(needs.*.result, 'failure') && 'failure' || 'success' }}
           # update overall ci report
           python3 ./tests/ci/finish_check.py --wf-status ${{ contains(needs.*.result, 'failure') && 'failure' || 'success' }}
       - name: Check Workflow results
-        if: ${{ !cancelled() }}
         run: |
           export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
           cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
diff --git a/.github/workflows/tags_stable.yml b/.github/workflows/tags_stable.yml
new file mode 100644
index 00000000000..2aa7694bc41
--- /dev/null
+++ b/.github/workflows/tags_stable.yml
@@ -0,0 +1,74 @@
+name: TagsStableWorkflow
+# - Gets artifacts from S3
+# - Sends it to JFROG Artifactory
+# - Adds them to the release assets
+
+env:
+  # Force the stdout and stderr streams to be unbuffered
+  PYTHONUNBUFFERED: 1
+
+on: # yamllint disable-line rule:truthy
+  push:
+    tags:
+    - 'v*-prestable'
+    - 'v*-stable'
+    - 'v*-lts'
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Test tag'
+        required: true
+        type: string
+
+
+jobs:
+  UpdateVersions:
+    runs-on: [self-hosted, style-checker]
+    steps:
+    - name: Set test tag
+      if: github.event_name == 'workflow_dispatch'
+      run: |
+        echo "GITHUB_TAG=${{ github.event.inputs.tag }}" >> "$GITHUB_ENV"
+    - name: Get tag name
+      if: github.event_name != 'workflow_dispatch'
+      run: |
+        echo "GITHUB_TAG=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV"
+    - name: Check out repository code
+      uses: ClickHouse/checkout@v1
+      with:
+        ref: master
+        fetch-depth: 0
+        filter: tree:0
+    - name: Update versions, docker version, changelog, security
+      env:
+        GITHUB_TOKEN: ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }}
+      run: |
+        ./utils/list-versions/list-versions.sh > ./utils/list-versions/version_date.tsv
+        ./utils/list-versions/update-docker-version.sh
+        GID=$(id -g "${UID}")
+        # --network=host and CI=1 are required for the S3 access from a container
+        docker run -u "${UID}:${GID}" -e PYTHONUNBUFFERED=1 -e CI=1 --network=host \
+            --volume="${GITHUB_WORKSPACE}:/ClickHouse" clickhouse/style-test \
+                /ClickHouse/tests/ci/changelog.py -v --debug-helpers \
+                --gh-user-or-token="$GITHUB_TOKEN" --jobs=5 \
+                --output="/ClickHouse/docs/changelogs/${GITHUB_TAG}.md" "${GITHUB_TAG}"
+        git add "./docs/changelogs/${GITHUB_TAG}.md"
+        python3 ./utils/security-generator/generate_security.py > SECURITY.md
+        git diff HEAD
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v6
+      with:
+        author: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
+        token: ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }}
+        committer: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
+        commit-message: Update version_date.tsv and changelogs after ${{ env.GITHUB_TAG }}
+        branch: auto/${{ env.GITHUB_TAG }}
+        assignees: ${{ github.event.sender.login }}  # assign the PR to the tag pusher
+        delete-branch: true
+        title: Update version_date.tsv and changelogs after ${{ env.GITHUB_TAG }}
+        labels: do not test
+        body: |
+          Update version_date.tsv and changelogs after ${{ env.GITHUB_TAG }}
+
+          ### Changelog category (leave one):
+          - Not for changelog (changelog entry is not required)
diff --git a/.gitmodules b/.gitmodules
index 53ebde0cd3b..12d865307d8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -108,7 +108,7 @@
 	url = https://github.com/ClickHouse/icudata
 [submodule "contrib/icu"]
 	path = contrib/icu
-	url = https://github.com/ClickHouse/icu
+	url = https://github.com/unicode-org/icu
 [submodule "contrib/flatbuffers"]
 	path = contrib/flatbuffers
 	url = https://github.com/ClickHouse/flatbuffers
@@ -230,6 +230,9 @@
 [submodule "contrib/minizip-ng"]
 	path = contrib/minizip-ng
 	url = https://github.com/zlib-ng/minizip-ng
+[submodule "contrib/annoy"]
+	path = contrib/annoy
+	url = https://github.com/ClickHouse/annoy
 [submodule "contrib/qpl"]
 	path = contrib/qpl
 	url = https://github.com/intel/qpl
@@ -338,13 +341,16 @@
 	url = https://github.com/graphitemaster/incbin.git
 [submodule "contrib/usearch"]
 	path = contrib/usearch
-	url = https://github.com/ClickHouse/usearch.git
+	url = https://github.com/unum-cloud/usearch.git
 [submodule "contrib/SimSIMD"]
 	path = contrib/SimSIMD
 	url = https://github.com/ashvardanian/SimSIMD.git
 [submodule "contrib/FP16"]
 	path = contrib/FP16
 	url = https://github.com/Maratyszcza/FP16.git
+[submodule "contrib/robin-map"]
+	path = contrib/robin-map
+	url = https://github.com/Tessil/robin-map.git
 [submodule "contrib/aklomp-base64"]
 	path = contrib/aklomp-base64
 	url = https://github.com/aklomp/base64.git
@@ -366,6 +372,3 @@
 [submodule "contrib/double-conversion"]
 	path = contrib/double-conversion
 	url = https://github.com/ClickHouse/double-conversion.git
-[submodule "contrib/numactl"]
-	path = contrib/numactl
-	url = https://github.com/ClickHouse/numactl.git
diff --git a/.yamllint b/.yamllint
index b8f7c93e246..7fb741ec9f4 100644
--- a/.yamllint
+++ b/.yamllint
@@ -5,6 +5,12 @@ rules:
     indentation:
         level: warning
         indent-sequences: consistent
+    line-length:
+        # there are:
+        # - bash -c "", so this is OK
+        # - yaml in tests
+        max: 1000
+        level: warning
     comments:
         min-spaces-from-content: 1
     document-start: disable
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 854a95820ab..4223b50c090 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,4 @@
 ### Table of Contents
-**[ClickHouse release v24.8 LTS, 2024-08-20](#243)**<br/>
-**[ClickHouse release v24.7, 2024-07-30](#247)**<br/>
 **[ClickHouse release v24.6, 2024-07-01](#246)**<br/>
 **[ClickHouse release v24.5, 2024-05-30](#245)**<br/>
 **[ClickHouse release v24.4, 2024-04-30](#244)**<br/>
@@ -11,152 +9,6 @@
 
 # 2024 Changelog
 
-### <a id="248"></a> ClickHouse release 24.8 LTS, 2024-08-20
-
-#### Backward Incompatible Change
-* `clickhouse-client` and `clickhouse-local` now default to multi-query mode (instead single-query mode). As an example, `clickhouse-client -q "SELECT 1; SELECT 2"` now works, whereas users previously had to add `--multiquery` (or `-n`). The `--multiquery/-n` switch became obsolete. INSERT queries in multi-query statements are treated specially based on their FORMAT clause: If the FORMAT is `VALUES` (the most common case), the end of the INSERT statement is represented by a trailing semicolon `;` at the end of the query. For all other FORMATs (e.g. `CSV` or `JSONEachRow`), the end of the INSERT statement is represented by two newlines `\n\n` at the end of the query. [#63898](https://github.com/ClickHouse/ClickHouse/pull/63898) ([FFish](https://github.com/wxybear)).
-* In previous versions, it was possible to use an alternative syntax for `LowCardinality` data types by appending `WithDictionary` to the name of the data type. It was an initial working implementation, and it was never documented or exposed to the public. Now, it is deprecated. If you have used this syntax, you have to ALTER your tables and rename the data types to `LowCardinality`. [#66842](https://github.com/ClickHouse/ClickHouse/pull/66842) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix logical errors with storage `Buffer` used with distributed destination table. It's a backward incompatible change: queries using `Buffer` with a distributed destination table may stop working if the table appears more than once in the query (e.g., in a self-join). [#67015](https://github.com/ClickHouse/ClickHouse/pull/67015) ([vdimir](https://github.com/vdimir)).
-* In previous versions, calling functions for random distributions based on the Gamma function (such as Chi-Squared, Student, Fisher) with negative arguments close to zero led to a long computation or an infinite loop. In the new version, calling these functions with zero or negative arguments will produce an exception. This closes [#67297](https://github.com/ClickHouse/ClickHouse/issues/67297). [#67326](https://github.com/ClickHouse/ClickHouse/pull/67326) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* The system table `text_log` is enabled by default. This is fully compatible with previous versions, but you may notice subtly increased disk usage on the local disk (this system table takes a tiny amount of disk space). [#67428](https://github.com/ClickHouse/ClickHouse/pull/67428) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* In previous versions, `arrayWithConstant` can be slow if asked to generate very large arrays. In the new version, it is limited to 1 GB per array. This closes [#32754](https://github.com/ClickHouse/ClickHouse/issues/32754). [#67741](https://github.com/ClickHouse/ClickHouse/pull/67741) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix REPLACE modifier formatting (forbid omitting brackets). [#67774](https://github.com/ClickHouse/ClickHouse/pull/67774) ([Azat Khuzhin](https://github.com/azat)).
-* Backported in [#68349](https://github.com/ClickHouse/ClickHouse/issues/68349): Reimplement `Dynamic` type. Now when the limit of dynamic data types is reached new types are not casted to String but stored in a special data structure in binary format with binary encoded data type. Now any type ever inserted into `Dynamic` column can be read from it as subcolumn. [#68132](https://github.com/ClickHouse/ClickHouse/pull/68132) ([Kruglov Pavel](https://github.com/Avogar)).
-
-#### New Feature
-* Added a new `MergeTree` setting `deduplicate_merge_projection_mode` to control the projections during merges (for specific engines) and `OPTIMIZE DEDUPLICATE` query. Supported options: `throw` (throw an exception in case the projection is not fully supported for *MergeTree engine), `drop` (remove projection during merge if it can't be merged itself consistently) and `rebuild` (rebuild projection from scratch, which is a heavy operation). [#66672](https://github.com/ClickHouse/ClickHouse/pull/66672) ([jsc0218](https://github.com/jsc0218)).
-* Add `_etag` virtual column for S3 table engine. Fixes [#65312](https://github.com/ClickHouse/ClickHouse/issues/65312). [#65386](https://github.com/ClickHouse/ClickHouse/pull/65386) ([skyoct](https://github.com/skyoct)).
-* Added a tagging (namespace) mechanism for the query cache. The same queries with different tags are considered different by the query cache. Example: `SELECT 1 SETTINGS use_query_cache = 1, query_cache_tag = 'abc'` and `SELECT 1 SETTINGS use_query_cache = 1, query_cache_tag = 'def'` now create different query cache entries. [#68235](https://github.com/ClickHouse/ClickHouse/pull/68235) ([sakulali](https://github.com/sakulali)).
-* Support more variants of JOIN strictness (`LEFT/RIGHT SEMI/ANTI/ANY JOIN`) with inequality conditions which involve columns from both left and right table. e.g. `t1.y < t2.y` (see the setting `allow_experimental_join_condition`). [#64281](https://github.com/ClickHouse/ClickHouse/pull/64281) ([lgbo](https://github.com/lgbo-ustc)).
-* Intrpret Hive-style partitioning for different engines (`File`, `URL`, `S3`, `AzureBlobStorage`, `HDFS`). Hive-style partitioning organizes data into partitioned sub-directories, making it efficient to query and manage large datasets. Currently, it only creates virtual columns with the appropriate name and data. The follow-up PR will introduce the appropriate data filtering (performance speedup). [#65997](https://github.com/ClickHouse/ClickHouse/pull/65997) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Add function `printf` for Spark compatiability (but you can use the existing `format` function). [#66257](https://github.com/ClickHouse/ClickHouse/pull/66257) ([李扬](https://github.com/taiyang-li)).
-* Add options `restore_replace_external_engines_to_null` and `restore_replace_external_table_functions_to_null` to replace external engines and table_engines to `Null` engine that can be useful for testing. It should work for RESTORE and explicit table creation. [#66536](https://github.com/ClickHouse/ClickHouse/pull/66536) ([Ilya Yatsishin](https://github.com/qoega)).
-* Added support for reading `MULTILINESTRING` geometry in `WKT` format using function `readWKTLineString`. [#67647](https://github.com/ClickHouse/ClickHouse/pull/67647) ([Jacob Reckhard](https://github.com/jacobrec)).
-* Add a new table function `fuzzQuery`. This function allows the modification of a given query string with random variations. Example: `SELECT query FROM fuzzQuery('SELECT 1') LIMIT 5;`. [#67655](https://github.com/ClickHouse/ClickHouse/pull/67655) ([pufit](https://github.com/pufit)).
-* Add a query `ALTER TABLE ... DROP DETACHED PARTITION ALL` to drop all detached partitions. [#67885](https://github.com/ClickHouse/ClickHouse/pull/67885) ([Duc Canh Le](https://github.com/canhld94)).
-* Add the `rows_before_aggregation_at_least` statistic to the query response when a new setting, `rows_before_aggregation` is enabled. This statistic represents the number of rows read before aggregation. In the context of a distributed query, when using the `group by` or `max` aggregation function without a `limit`, `rows_before_aggregation_at_least` can reflect the number of rows hit by the query. [#66084](https://github.com/ClickHouse/ClickHouse/pull/66084) ([morning-color](https://github.com/morning-color)).
-* Support `OPTIMIZE` query on `Join` tables to reduce their memory footprint. [#67883](https://github.com/ClickHouse/ClickHouse/pull/67883) ([Duc Canh Le](https://github.com/canhld94)).
-* Allow run query instantly in play if you add `&run=1` in the URL [#66457](https://github.com/ClickHouse/ClickHouse/pull/66457) ([Aleksandr Musorin](https://github.com/AVMusorin)).
-
-#### Experimental Feature
-* Implement a new `JSON` data type. [#66444](https://github.com/ClickHouse/ClickHouse/pull/66444) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add the new `TimeSeries` table engine. [#64183](https://github.com/ClickHouse/ClickHouse/pull/64183) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Add new experimental `Kafka` storage engine to store offsets in Keeper instead of relying on committing them to Kafka. It makes the commit to ClickHouse tables atomic with regard to consumption from the queue. [#57625](https://github.com/ClickHouse/ClickHouse/pull/57625) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Use adaptive read task size calculation method (adaptive meaning it depends on read column sizes) for parallel replicas. [#60377](https://github.com/ClickHouse/ClickHouse/pull/60377) ([Nikita Taranov](https://github.com/nickitat)).
-* Added statistics type `count_min` (count-min sketches) which provide selectivity estimations for equality predicates like `col = 'val'`. Supported data types are string, date, datatime and numeric types. [#65521](https://github.com/ClickHouse/ClickHouse/pull/65521) ([JackyWoo](https://github.com/JackyWoo)).
-
-#### Performance Improvement
-* Setting `optimize_functions_to_subcolumns` is enabled by default. [#68053](https://github.com/ClickHouse/ClickHouse/pull/68053) ([Anton Popov](https://github.com/CurtizJ)).
-* Store the `plain_rewritable` disk directory metadata in `__meta` layout, separately from the merge tree data in the object storage. Move the `plain_rewritable` disk to a flat directory structure. [#65751](https://github.com/ClickHouse/ClickHouse/pull/65751) ([Julia Kartseva](https://github.com/jkartseva)).
-* Improve columns squashing (an operation happening in INSERT queries) for `String`/`Array`/`Map`/`Variant`/`Dynamic` types by reserving required memory in advance for all subcolumns. [#67043](https://github.com/ClickHouse/ClickHouse/pull/67043) ([Kruglov Pavel](https://github.com/Avogar)).
-* Speed up `SYSTEM FLUSH LOGS` and flush logs on shutdown. [#67472](https://github.com/ClickHouse/ClickHouse/pull/67472) ([Sema Checherinda](https://github.com/CheSema)).
-* Improved overall performance of merges by reducing the overhead of the scheduling steps of merges. [#68016](https://github.com/ClickHouse/ClickHouse/pull/68016) ([Anton Popov](https://github.com/CurtizJ)).
-* Speed up tables removal for `DROP DATABASE` query, increased the default value for `database_catalog_drop_table_concurrency` to 16. [#67228](https://github.com/ClickHouse/ClickHouse/pull/67228) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Avoid allocating too much capacity for array column while writing ORC. Performance speeds up 15% for an Array column. [#67879](https://github.com/ClickHouse/ClickHouse/pull/67879) ([李扬](https://github.com/taiyang-li)).
-* Speed up mutations for non-replicated MergeTree significantly [#66911](https://github.com/ClickHouse/ClickHouse/pull/66911) [#66909](https://github.com/ClickHouse/ClickHouse/pull/66909) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-
-#### Improvement
-* Setting `allow_experimental_analyzer` is renamed to `enable_analyzer`. The old name is preserved in a form of an alias. This signifies that Analyzer is no longer in beta and is fully promoted to production. [#66438](https://github.com/ClickHouse/ClickHouse/pull/66438) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Improve schema inference of date times. Now DateTime64 used only when date time has fractional part, otherwise regular DateTime is used. Inference of Date/DateTime is more strict now, especially when `date_time_input_format='best_effort'` to avoid inferring date times from strings in corner cases. [#68382](https://github.com/ClickHouse/ClickHouse/pull/68382) ([Kruglov Pavel](https://github.com/Avogar)).
-* ClickHouse server now supports new setting `max_keep_alive_requests`. For keep-alive HTTP connections to the server it works in tandem with `keep_alive_timeout` - if idle timeout not expired but there already more than `max_keep_alive_requests` requests done through the given connection - it will be closed by the server. [#61793](https://github.com/ClickHouse/ClickHouse/pull/61793) ([Nikita Taranov](https://github.com/nickitat)).
-* Various improvements in the advanced dashboard. This closes [#67697](https://github.com/ClickHouse/ClickHouse/issues/67697). This closes [#63407](https://github.com/ClickHouse/ClickHouse/issues/63407). This closes [#51129](https://github.com/ClickHouse/ClickHouse/issues/51129). This closes [#61204](https://github.com/ClickHouse/ClickHouse/issues/61204). [#67701](https://github.com/ClickHouse/ClickHouse/pull/67701) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Do not require a grant for REMOTE when creating a Distributed table: a grant for the Distributed engine is enough. [#65419](https://github.com/ClickHouse/ClickHouse/pull/65419) ([jsc0218](https://github.com/jsc0218)).
-* Do not pass logs for keeper explicitly in the Docker image to allow overriding. [#65564](https://github.com/ClickHouse/ClickHouse/pull/65564) ([Azat Khuzhin](https://github.com/azat)).
-* Introduced `use_same_password_for_base_backup` settings for `BACKUP` and `RESTORE` queries, allowing to create and restore incremental backups to/from password protected archives. [#66214](https://github.com/ClickHouse/ClickHouse/pull/66214) ([Samuele](https://github.com/sguerrini97)).
-* Ignore `async_load_databases` for `ATTACH` query (previously it was possible for ATTACH to return before the tables had been attached). [#66240](https://github.com/ClickHouse/ClickHouse/pull/66240) ([Azat Khuzhin](https://github.com/azat)).
-* Added logs and metrics for rejected connections (where there are not enough resources). [#66410](https://github.com/ClickHouse/ClickHouse/pull/66410) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Support proper `UUID` type for MongoDB engine. [#66671](https://github.com/ClickHouse/ClickHouse/pull/66671) ([Azat Khuzhin](https://github.com/azat)).
-* Add replication lag and recovery time metrics. [#66703](https://github.com/ClickHouse/ClickHouse/pull/66703) ([Miсhael Stetsyuk](https://github.com/mstetsyuk)).
-* Add `DiskS3NoSuchKeyErrors` metric. [#66704](https://github.com/ClickHouse/ClickHouse/pull/66704) ([Miсhael Stetsyuk](https://github.com/mstetsyuk)).
-* Ensure the `COMMENT` clause works for all table engines. [#66832](https://github.com/ClickHouse/ClickHouse/pull/66832) ([Joe Lynch](https://github.com/joelynch)).
-* Function `mapFromArrays` now accepts `Map(K, V)` as first argument, for example: `SELECT mapFromArrays(map('a', 4, 'b', 4), ['aa', 'bb'])` now works and returns `{('a',4):'aa',('b',4):'bb'}`. Also, if the 1st argument is an Array, it can now also be of type `Array(Nullable(T))` or `Array(LowCardinality(Nullable(T)))` as long as the actual array values are not `NULL`. [#67103](https://github.com/ClickHouse/ClickHouse/pull/67103) ([李扬](https://github.com/taiyang-li)).
-* Read configuration for `clickhouse-local` from `~/.clickhouse-local`. [#67135](https://github.com/ClickHouse/ClickHouse/pull/67135) ([Azat Khuzhin](https://github.com/azat)).
-* Rename setting `input_format_orc_read_use_writer_time_zone` to `input_format_orc_reader_timezone` and allow the user to set the reader timezone. [#67175](https://github.com/ClickHouse/ClickHouse/pull/67175) ([kevinyhzou](https://github.com/KevinyhZou)).
-* Decrease level of the `Socket is not connected` error when HTTP connection immediately reset by peer after connecting, close [#34218](https://github.com/ClickHouse/ClickHouse/issues/34218). [#67177](https://github.com/ClickHouse/ClickHouse/pull/67177) ([vdimir](https://github.com/vdimir)).
-* Add ability to load dashboards for `system.dashboards` from config (once set, they overrides the default dashboards preset). [#67232](https://github.com/ClickHouse/ClickHouse/pull/67232) ([Azat Khuzhin](https://github.com/azat)).
-* The window functions in SQL are traditionally in snake case. ClickHouse uses `camelCase`, so new aliases `denseRank()` and `percentRank()` have been created. These new functions can be called the exact same as the original `dense_rank()` and `percent_rank()` functions. Both snake case and camelCase syntaxes remain usable. A new test for each of the functions has been added as well. This closes [#67042](https://github.com/ClickHouse/ClickHouse/issues/67042) . [#67334](https://github.com/ClickHouse/ClickHouse/pull/67334) ([Peter Nguyen](https://github.com/petern48)).
-* Autodetect configuration file format if is not `.xml`, `.yml` or `.yaml`. If the file begins with &lt; it might be XML, otherwise it might be YAML. It is useful when providing a configuration file from a pipe: `clickhouse-server --config-file <(echo "hello: world")`. [#67391](https://github.com/ClickHouse/ClickHouse/pull/67391) ([sakulali](https://github.com/sakulali)).
-* Functions `formatDateTime` and `formatDateTimeInJodaSyntax` now treat their format parameter as optional. If it is not specified, format strings `%Y-%m-%d %H:%i:%s` and `yyyy-MM-dd HH:mm:ss` are assumed. Example: `SELECT parseDateTime('2021-01-04 23:12:34')` now returns DateTime value `2021-01-04 23:12:34` (previously, this threw an exception). [#67399](https://github.com/ClickHouse/ClickHouse/pull/67399) ([Robert Schulze](https://github.com/rschu1ze)).
-* Automatically retry Keeper requests in KeeperMap if they happen because of timeout or connection loss. [#67448](https://github.com/ClickHouse/ClickHouse/pull/67448) ([Antonio Andelic](https://github.com/antonio2368)).
-* Add `-no-pie` to Aarch64 Linux builds to allow proper introspection and symbolizing of stacktraces after a ClickHouse restart. [#67916](https://github.com/ClickHouse/ClickHouse/pull/67916) ([filimonov](https://github.com/filimonov)).
-* Added profile events for merges and mutations for better introspection. [#68015](https://github.com/ClickHouse/ClickHouse/pull/68015) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix settings and `current_database` in `system.processes` for async BACKUP/RESTORE. [#68163](https://github.com/ClickHouse/ClickHouse/pull/68163) ([Azat Khuzhin](https://github.com/azat)).
-* Remove unnecessary logs for non-replicated `MergeTree`. [#68238](https://github.com/ClickHouse/ClickHouse/pull/68238) ([Daniil Ivanik](https://github.com/divanik)).
-
-#### Build/Testing/Packaging Improvement
-* Integration tests flaky check will not run each test case multiple times to find more issues in tests and make them more reliable. It is using `pytest-repeat` library to run test case multiple times for the same environment. It is important to cleanup tables and other entities in the end of a test case to pass. Repeating works much faster than several pytest runs as it starts necessary containers only once. [#66986](https://github.com/ClickHouse/ClickHouse/pull/66986) ([Ilya Yatsishin](https://github.com/qoega)).
-* Unblock the usage of CLion with ClickHouse. In previous versions, CLion freezed for a minute on every keypress. This closes [#66994](https://github.com/ClickHouse/ClickHouse/issues/66994). [#66995](https://github.com/ClickHouse/ClickHouse/pull/66995) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* getauxval: avoid a crash under a sanitizer re-exec due to high ASLR entropy in newer Linux kernels. [#67081](https://github.com/ClickHouse/ClickHouse/pull/67081) ([Raúl Marín](https://github.com/Algunenano)).
-* Some parts of client code are extracted to a single file and highest possible level optimization is applied to them even for debug builds. This closes: [#65745](https://github.com/ClickHouse/ClickHouse/issues/65745). [#67215](https://github.com/ClickHouse/ClickHouse/pull/67215) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-
-#### Bug Fix
-* Only relevant to the experimental Variant data type. Fix crash with Variant + AggregateFunction type. [#67122](https://github.com/ClickHouse/ClickHouse/pull/67122) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix crash in DistributedAsyncInsert when connection is empty. [#67219](https://github.com/ClickHouse/ClickHouse/pull/67219) ([Pablo Marcos](https://github.com/pamarcos)).
-* Fix crash of `uniq` and `uniqTheta ` with `tuple()` argument. Closes [#67303](https://github.com/ClickHouse/ClickHouse/issues/67303). [#67306](https://github.com/ClickHouse/ClickHouse/pull/67306) ([flynn](https://github.com/ucasfl)).
-* Fixes [#66026](https://github.com/ClickHouse/ClickHouse/issues/66026). Avoid unresolved table function arguments traversal in `ReplaceTableNodeToDummyVisitor`. [#67522](https://github.com/ClickHouse/ClickHouse/pull/67522) ([Dmitry Novik](https://github.com/novikd)).
-* Fix potential stack overflow in `JSONMergePatch` function. Renamed this function from `jsonMergePatch` to `JSONMergePatch` because the previous name was wrong. The previous name is still kept for compatibility. Improved diagnostic of errors in the function. This closes [#67304](https://github.com/ClickHouse/ClickHouse/issues/67304). [#67756](https://github.com/ClickHouse/ClickHouse/pull/67756) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fixed a NULL pointer dereference, triggered by a specially crafted query, that crashed the server via hopEnd, hopStart, tumbleEnd, and tumbleStart. [#68098](https://github.com/ClickHouse/ClickHouse/pull/68098) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Fixed `Not-ready Set` in some system tables when filtering using subqueries. [#66018](https://github.com/ClickHouse/ClickHouse/pull/66018) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fixed reading of subcolumns after `ALTER ADD COLUMN` query. [#66243](https://github.com/ClickHouse/ClickHouse/pull/66243) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix boolean literals in query sent to external database (for engines like `PostgreSQL`). [#66282](https://github.com/ClickHouse/ClickHouse/pull/66282) ([vdimir](https://github.com/vdimir)).
-* Fix formatting of query with aliased JOIN ON expression, e.g. `... JOIN t2 ON (x = y) AS e ORDER BY x` should be formatted as `... JOIN t2 ON ((x = y) AS e) ORDER BY x`. [#66312](https://github.com/ClickHouse/ClickHouse/pull/66312) ([vdimir](https://github.com/vdimir)).
-* Fix cluster() for inter-server secret (preserve initial user as before). [#66364](https://github.com/ClickHouse/ClickHouse/pull/66364) ([Azat Khuzhin](https://github.com/azat)).
-* Fix possible runtime error while converting Array field with nulls to Array(Variant). [#66727](https://github.com/ClickHouse/ClickHouse/pull/66727) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix for occasional deadlock in Context::getDDLWorker. [#66843](https://github.com/ClickHouse/ClickHouse/pull/66843) ([Alexander Gololobov](https://github.com/davenger)).
-* Fix creating KeeperMap table after an incomplete drop. [#66865](https://github.com/ClickHouse/ClickHouse/pull/66865) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix broken part error while restoring to a `s3_plain_rewritable` disk. [#66881](https://github.com/ClickHouse/ClickHouse/pull/66881) ([Vitaly Baranov](https://github.com/vitlibar)).
-* In rare cases ClickHouse could consider parts as broken because of some unexpected projections on disk. Now it's fixed. [#66898](https://github.com/ClickHouse/ClickHouse/pull/66898) ([alesapin](https://github.com/alesapin)).
-* Fix invalid format detection in schema inference that could lead to logical error Format {} doesn't support schema inference. [#66899](https://github.com/ClickHouse/ClickHouse/pull/66899) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix possible deadlock on query cancel with parallel replicas. [#66905](https://github.com/ClickHouse/ClickHouse/pull/66905) ([Nikita Taranov](https://github.com/nickitat)).
-* Forbid create as select even when database_replicated_allow_heavy_create is set. It was unconditionally forbidden in 23.12 and accidentally allowed under the setting in unreleased 24.7. [#66980](https://github.com/ClickHouse/ClickHouse/pull/66980) ([vdimir](https://github.com/vdimir)).
-* Reading from the `numbers` could wrongly throw an exception when the `max_rows_to_read` limit was set. This closes [#66992](https://github.com/ClickHouse/ClickHouse/issues/66992). [#66996](https://github.com/ClickHouse/ClickHouse/pull/66996) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add proper type conversion to lagInFrame and leadInFrame window functions - fixes msan test. [#67091](https://github.com/ClickHouse/ClickHouse/pull/67091) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* TRUNCATE DATABASE used to stop replication as if it was a DROP DATABASE query, it's fixed. [#67129](https://github.com/ClickHouse/ClickHouse/pull/67129) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Use a separate client context in `clickhouse-local`. [#67133](https://github.com/ClickHouse/ClickHouse/pull/67133) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix error `Cannot convert column because it is non constant in source stream but must be constant in result.` for a query that reads from the `Merge` table over the `Distriburted` table with one shard. [#67146](https://github.com/ClickHouse/ClickHouse/pull/67146) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Correct behavior of `ORDER BY all` with disabled `enable_order_by_all` and parallel replicas (distributed queries as well). [#67153](https://github.com/ClickHouse/ClickHouse/pull/67153) ([Igor Nikonov](https://github.com/devcrafter)).
-* Fix wrong usage of input_format_max_bytes_to_read_for_schema_inference in schema cache. [#67157](https://github.com/ClickHouse/ClickHouse/pull/67157) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix the memory leak for count distinct, when exception issued during group by single nullable key. [#67171](https://github.com/ClickHouse/ClickHouse/pull/67171) ([Jet He](https://github.com/compasses)).
-* Fix an error in optimization which converts OUTER JOIN to INNER JOIN. This closes [#67156](https://github.com/ClickHouse/ClickHouse/issues/67156). This closes [#66447](https://github.com/ClickHouse/ClickHouse/issues/66447). The bug was introduced in https://github.com/ClickHouse/ClickHouse/pull/62907. [#67178](https://github.com/ClickHouse/ClickHouse/pull/67178) ([Maksim Kita](https://github.com/kitaisreal)).
-* Fix error `Conversion from AggregateFunction(name, Type) to AggregateFunction(name, Nullable(Type)) is not supported`. The bug was caused by the `optimize_rewrite_aggregate_function_with_if` optimization. Fixes [#67112](https://github.com/ClickHouse/ClickHouse/issues/67112). [#67229](https://github.com/ClickHouse/ClickHouse/pull/67229) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix hung query when using empty tuple as lhs of function IN. [#67295](https://github.com/ClickHouse/ClickHouse/pull/67295) ([Duc Canh Le](https://github.com/canhld94)).
-* It was possible to create a very deep nested JSON data that triggered stack overflow while skipping unknown fields. This closes [#67292](https://github.com/ClickHouse/ClickHouse/issues/67292). [#67324](https://github.com/ClickHouse/ClickHouse/pull/67324) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix attaching ReplicatedMergeTree table after exception during startup. [#67360](https://github.com/ClickHouse/ClickHouse/pull/67360) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix segfault caused by incorrectly detaching from thread group in `Aggregator`. [#67385](https://github.com/ClickHouse/ClickHouse/pull/67385) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix one more case when a non-deterministic function is specified in PK. [#67395](https://github.com/ClickHouse/ClickHouse/pull/67395) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed `bloom_filter` index breaking queries with mildly weird conditions like `(k=2)=(k=2)` or `has([1,2,3], k)`. [#67423](https://github.com/ClickHouse/ClickHouse/pull/67423) ([Michael Kolupaev](https://github.com/al13n321)).
-* Correctly parse file name/URI containing `::` if it's not an archive. [#67433](https://github.com/ClickHouse/ClickHouse/pull/67433) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix wait for tasks in ~WriteBufferFromS3 in case WriteBuffer was cancelled. [#67459](https://github.com/ClickHouse/ClickHouse/pull/67459) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Protect temporary part directories from removing during RESTORE. [#67491](https://github.com/ClickHouse/ClickHouse/pull/67491) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix execution of nested short-circuit functions. [#67520](https://github.com/ClickHouse/ClickHouse/pull/67520) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix `Logical error: Expected the argument №N of type T to have X rows, but it has 0`. The error could happen in a remote query with constant expression in `GROUP BY` (with a new analyzer). [#67536](https://github.com/ClickHouse/ClickHouse/pull/67536) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix join on tuple with NULLs: Some queries with the new analyzer and `NULL` inside the tuple in the `JOIN ON` section returned incorrect results. [#67538](https://github.com/ClickHouse/ClickHouse/pull/67538) ([vdimir](https://github.com/vdimir)).
-* Fix redundant reschedule of FileCache::freeSpaceRatioKeepingThreadFunc() in case of full non-evictable cache. [#67540](https://github.com/ClickHouse/ClickHouse/pull/67540) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix inserting into stream like engines (Kafka, RabbitMQ, NATS) through HTTP interface. [#67554](https://github.com/ClickHouse/ClickHouse/pull/67554) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Fix for function `toStartOfWeek` which returned the wrong result with a small `DateTime64` value. [#67558](https://github.com/ClickHouse/ClickHouse/pull/67558) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Fix creation of view with recursive CTE. [#67587](https://github.com/ClickHouse/ClickHouse/pull/67587) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Fix `Logical error: 'file_offset_of_buffer_end <= read_until_position'` in filesystem cache. Closes [#57508](https://github.com/ClickHouse/ClickHouse/issues/57508). [#67623](https://github.com/ClickHouse/ClickHouse/pull/67623) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fixes [#62282](https://github.com/ClickHouse/ClickHouse/issues/62282). Removed the call to `convertFieldToString()` and added datatype specific serialization code. Parameterized view substitution was broken for multiple datatypes when parameter value was a function or expression returning datatype instance. [#67654](https://github.com/ClickHouse/ClickHouse/pull/67654) ([Shankar](https://github.com/shiyer7474)).
-* Fix crash on `percent_rank`. `percent_rank`'s default frame type is changed to `range unbounded preceding and unbounded following`. `IWindowFunction`'s default window frame is considered and now window functions without window frame definition in sql can be put into different `WindowTransfomer`s properly. [#67661](https://github.com/ClickHouse/ClickHouse/pull/67661) ([lgbo](https://github.com/lgbo-ustc)).
-* Fix reloading SQL UDFs with UNION. Previously, restarting the server could make UDF invalid. [#67665](https://github.com/ClickHouse/ClickHouse/pull/67665) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix possible logical error "Unexpected return type from if" with experimental Variant type and enabled setting `use_variant_as_common_type ` in function if with Tuples and Maps. [#67687](https://github.com/ClickHouse/ClickHouse/pull/67687) ([Kruglov Pavel](https://github.com/Avogar)).
-* Due to a bug in Linux Kernel, a query can hung in `TimerDescriptor::drain`. This closes [#37686](https://github.com/ClickHouse/ClickHouse/issues/37686). [#67702](https://github.com/ClickHouse/ClickHouse/pull/67702) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix completion of `RESTORE ON CLUSTER` command. [#67720](https://github.com/ClickHouse/ClickHouse/pull/67720) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix dictionary hang in case of CANNOT_SCHEDULE_TASK while loading. [#67751](https://github.com/ClickHouse/ClickHouse/pull/67751) ([Azat Khuzhin](https://github.com/azat)).
-* Queries like `SELECT count() FROM t WHERE cast(c = 1 or c = 9999 AS Bool) SETTINGS use_skip_indexes=1` with bloom filter indexes on `c` now work correctly. [#67781](https://github.com/ClickHouse/ClickHouse/pull/67781) ([jsc0218](https://github.com/jsc0218)).
-* Fix wrong aggregation result in some queries with aggregation without keys and filter, close [#67419](https://github.com/ClickHouse/ClickHouse/issues/67419). [#67804](https://github.com/ClickHouse/ClickHouse/pull/67804) ([vdimir](https://github.com/vdimir)).
-* Validate experimental/suspicious data types in ALTER ADD/MODIFY COLUMN. [#67911](https://github.com/ClickHouse/ClickHouse/pull/67911) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix DateTime64 parsing after constant folding in distributed queries, close [#66773](https://github.com/ClickHouse/ClickHouse/issues/66773). [#67920](https://github.com/ClickHouse/ClickHouse/pull/67920) ([vdimir](https://github.com/vdimir)).
-* Fix wrong `count()` result when there is non-deterministic function in predicate. [#67922](https://github.com/ClickHouse/ClickHouse/pull/67922) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Fixed the calculation of the maximum thread soft limit in containerized environments where the usable CPU count is limited. [#67963](https://github.com/ClickHouse/ClickHouse/pull/67963) ([Robert Schulze](https://github.com/rschu1ze)).
-* Now ClickHouse doesn't consider part as broken if projection doesn't exist on disk but exists in `checksums.txt`. [#68003](https://github.com/ClickHouse/ClickHouse/pull/68003) ([alesapin](https://github.com/alesapin)).
-* Fixed skipping of untouched parts in mutations with new analyzer. Previously with enabled analyzer data in part could be rewritten by mutation even if mutation doesn't affect this part according to predicate. [#68052](https://github.com/ClickHouse/ClickHouse/pull/68052) ([Anton Popov](https://github.com/CurtizJ)).
-* Removes an incorrect optimization to remove sorting in subqueries that use `OFFSET`. Fixes [#67906](https://github.com/ClickHouse/ClickHouse/issues/67906). [#68099](https://github.com/ClickHouse/ClickHouse/pull/68099) ([Graham Campbell](https://github.com/GrahamCampbell)).
-* Attempt to fix `Block structure mismatch in AggregatingStep stream: different types` for aggregate projection optimization. [#68107](https://github.com/ClickHouse/ClickHouse/pull/68107) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Try fix postgres crash when query is cancelled. [#68288](https://github.com/ClickHouse/ClickHouse/pull/68288) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix missing sync replica mode in query `SYSTEM SYNC REPLICA`. [#68326](https://github.com/ClickHouse/ClickHouse/pull/68326) ([Duc Canh Le](https://github.com/canhld94)).
-
-
 ### <a id="247"></a> ClickHouse release 24.7, 2024-07-30
 
 #### Backward Incompatible Change
@@ -165,10 +17,10 @@
 * Metric `KeeperOutstandingRequets` was renamed to `KeeperOutstandingRequests`. [#66206](https://github.com/ClickHouse/ClickHouse/pull/66206) ([Robert Schulze](https://github.com/rschu1ze)).
 * Remove `is_deterministic` field from the `system.functions` table. [#66630](https://github.com/ClickHouse/ClickHouse/pull/66630) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Function `tuple` will now try to construct named tuples in query (controlled by `enable_named_columns_in_function_tuple`). Introduce function `tupleNames` to extract names from tuples. [#54881](https://github.com/ClickHouse/ClickHouse/pull/54881) ([Amos Bird](https://github.com/amosbird)).
-* Change how deduplication for Materialized Views works. Fixed a lot of cases like: - on destination table: data is split for 2 or more blocks and that blocks is considered as duplicate when that block is inserted in parallel. - on MV destination table: the equal blocks are deduplicated, that happens when MV often produces equal data as a result for different input data due to performing aggregation. - on MV destination table: the equal blocks which comes from different MV are deduplicated. [#61601](https://github.com/ClickHouse/ClickHouse/pull/61601) ([Sema Checherinda](https://github.com/CheSema)).
 
 #### New Feature
 * Add `ASOF JOIN` support for `full_sorting_join` algorithm. [#55051](https://github.com/ClickHouse/ClickHouse/pull/55051) ([vdimir](https://github.com/vdimir)).
+* Add new window function `percent_rank`. [#62747](https://github.com/ClickHouse/ClickHouse/pull/62747) ([lgbo](https://github.com/lgbo-ustc)).
 * Support JWT authentication in `clickhouse-client` (will be available only in ClickHouse Cloud). [#62829](https://github.com/ClickHouse/ClickHouse/pull/62829) ([Konstantin Bogdanov](https://github.com/thevar1able)).
 * Add SQL functions `changeYear`, `changeMonth`, `changeDay`, `changeHour`, `changeMinute`, `changeSecond`. For example, `SELECT changeMonth(toDate('2024-06-14'), 7)` returns date `2024-07-14`. [#63186](https://github.com/ClickHouse/ClickHouse/pull/63186) ([cucumber95](https://github.com/cucumber95)).
 * Introduce startup scripts, which allow the execution of preconfigured queries at the startup stage. [#64889](https://github.com/ClickHouse/ClickHouse/pull/64889) ([pufit](https://github.com/pufit)).
@@ -179,23 +31,23 @@
 * Add a new setting to disable/enable writing page index into parquet files. [#65475](https://github.com/ClickHouse/ClickHouse/pull/65475) ([lgbo](https://github.com/lgbo-ustc)).
 * Introduce `logger.console_log_level` server config to control the log level to the console (if enabled). [#65559](https://github.com/ClickHouse/ClickHouse/pull/65559) ([Azat Khuzhin](https://github.com/azat)).
 * Automatically append a wildcard `*` to the end of a directory path with table function `file`. [#66019](https://github.com/ClickHouse/ClickHouse/pull/66019) ([Zhidong (David) Guo](https://github.com/Gun9niR)).
-* Add `--memory-usage` option to client in non-interactive mode. [#66393](https://github.com/ClickHouse/ClickHouse/pull/66393) ([vdimir](https://github.com/vdimir)).
+* Add `--memory-usage` option to client in non interactive mode. [#66393](https://github.com/ClickHouse/ClickHouse/pull/66393) ([vdimir](https://github.com/vdimir)).
 * Make an interactive client for clickhouse-disks, add local disk from the local directory. [#64446](https://github.com/ClickHouse/ClickHouse/pull/64446) ([Daniil Ivanik](https://github.com/divanik)).
 * When lightweight delete happens on a table with projection(s), users have choices either throw an exception (by default) or drop the projection [#65594](https://github.com/ClickHouse/ClickHouse/pull/65594) ([jsc0218](https://github.com/jsc0218)).
-* Add system tables with main information about all detached tables. [#65400](https://github.com/ClickHouse/ClickHouse/pull/65400) ([Konstantin Morozov](https://github.com/k-morozov)).
 
 #### Experimental Feature
-* Change binary serialization of the `Variant` data type: add `compact` mode to avoid writing the same discriminator multiple times for granules with single variant or with only NULL values. Add MergeTree setting `use_compact_variant_discriminators_serialization` that is enabled by default. Note that Variant type is still experimental and backward-incompatible change in serialization is ok. [#62774](https://github.com/ClickHouse/ClickHouse/pull/62774) ([Kruglov Pavel](https://github.com/Avogar)).
-* Support on-disk backend storage for clickhouse-keeper. [#56626](https://github.com/ClickHouse/ClickHouse/pull/56626) ([Han Fei](https://github.com/hanfei1991)).
+* Change binary serialization of Variant data type: add `compact` mode to avoid writing the same discriminator multiple times for granules with single variant or with only NULL values. Add MergeTree setting `use_compact_variant_discriminators_serialization` that is enabled by default. Note that Variant type is still experimental and backward-incompatible change in serialization is ok. [#62774](https://github.com/ClickHouse/ClickHouse/pull/62774) ([Kruglov Pavel](https://github.com/Avogar)).
+* Support rocksdb as backend storage of keeper. [#56626](https://github.com/ClickHouse/ClickHouse/pull/56626) ([Han Fei](https://github.com/hanfei1991)).
 * Refactor JSONExtract functions, support more types including experimental Dynamic type. [#66046](https://github.com/ClickHouse/ClickHouse/pull/66046) ([Kruglov Pavel](https://github.com/Avogar)).
-* Support null map subcolumn for `Variant` and `Dynamic` subcolumns. [#66178](https://github.com/ClickHouse/ClickHouse/pull/66178) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix reading `Dynamic` subcolumns from altered `Memory` table. Previously if `max_types` parameter of a Dynamic type was changed in Memory table via alter, further subcolumns reading can return wrong result. [#66066](https://github.com/ClickHouse/ClickHouse/pull/66066) ([Kruglov Pavel](https://github.com/Avogar)).
+* Support null map subcolumn for Variant and Dynamic subcolumns. [#66178](https://github.com/ClickHouse/ClickHouse/pull/66178) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix reading dynamic subcolumns from altered Memory table. Previously if `max_types` parameter of a Dynamic type was changed in Memory table via alter, further subcolumns reading can return wrong result. [#66066](https://github.com/ClickHouse/ClickHouse/pull/66066) ([Kruglov Pavel](https://github.com/Avogar)).
 * Add support for `cluster_for_parallel_replicas` when using custom key parallel replicas. It allows you to use parallel replicas with custom key with MergeTree tables. [#65453](https://github.com/ClickHouse/ClickHouse/pull/65453) ([Antonio Andelic](https://github.com/antonio2368)).
 
 #### Performance Improvement
+* Enable `optimize_functions_to_subcolumns` by default. [#58661](https://github.com/ClickHouse/ClickHouse/pull/58661) ([Anton Popov](https://github.com/CurtizJ)).
 * Replace int to string algorithm with a faster one (from a modified amdn/itoa to a modified jeaiii/itoa). [#61661](https://github.com/ClickHouse/ClickHouse/pull/61661) ([Raúl Marín](https://github.com/Algunenano)).
-* Sizes of hash tables created by join (`parallel_hash` algorithm) are collected and cached now. This information will be used to preallocate space in hash tables for subsequent query executions and save time on hash table resizes. [#64553](https://github.com/ClickHouse/ClickHouse/pull/64553) ([Nikita Taranov](https://github.com/nickitat)).
-* Optimized queries with `ORDER BY` primary key and `WHERE` that have a condition with high selectivity by using buffering. It is controlled by setting `read_in_order_use_buffering` (enabled by default) and can increase memory usage of query. [#64607](https://github.com/ClickHouse/ClickHouse/pull/64607) ([Anton Popov](https://github.com/CurtizJ)).
+* Sizes of hash tables created by join (`parallel_hash` algorithm) is collected and cached now. This information will be used to preallocate space in hash tables for subsequent query executions and save time on hash table resizes. [#64553](https://github.com/ClickHouse/ClickHouse/pull/64553) ([Nikita Taranov](https://github.com/nickitat)).
+* Optimized queries with `ORDER BY` primary key and `WHERE` that have a condition with high selectivity by using of buffering. It is controlled by setting `read_in_order_use_buffering` (enabled by default) and can increase memory usage of query. [#64607](https://github.com/ClickHouse/ClickHouse/pull/64607) ([Anton Popov](https://github.com/CurtizJ)).
 * Improve performance of loading `plain_rewritable` metadata. [#65634](https://github.com/ClickHouse/ClickHouse/pull/65634) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Attaching tables on read-only disks will use fewer resources by not loading outdated parts. [#65635](https://github.com/ClickHouse/ClickHouse/pull/65635) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Support minmax hyperrectangle for Set indices. [#65676](https://github.com/ClickHouse/ClickHouse/pull/65676) ([AntiTopQuark](https://github.com/AntiTopQuark)).
@@ -207,11 +59,11 @@
 * DatabaseCatalog drops tables faster by using up to database_catalog_drop_table_concurrency threads. [#66065](https://github.com/ClickHouse/ClickHouse/pull/66065) ([Sema Checherinda](https://github.com/CheSema)).
 
 #### Improvement
-* Improved ZooKeeper load balancing. The current session doesn't expire until the optimal nodes become available despite `fallback_session_lifetime`. Added support for AZ-aware balancing. [#65570](https://github.com/ClickHouse/ClickHouse/pull/65570) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * The setting `optimize_trivial_insert_select` is disabled by default. In most cases, it should be beneficial. Nevertheless, if you are seeing slower INSERT SELECT or increased memory usage, you can enable it back or `SET compatibility = '24.6'`. [#58970](https://github.com/ClickHouse/ClickHouse/pull/58970) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Print stacktrace and diagnostic info if `clickhouse-client` or `clickhouse-local` crashes. [#61109](https://github.com/ClickHouse/ClickHouse/pull/61109) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * The result of `SHOW INDEX | INDEXES | INDICES | KEYS` was previously sorted by the primary key column names. Since this was unintuitive, the result is now sorted by the position of the primary key columns within the primary key. [#61131](https://github.com/ClickHouse/ClickHouse/pull/61131) ([Robert Schulze](https://github.com/rschu1ze)).
 * Change how deduplication for Materialized Views works. Fixed a lot of cases like: - on destination table: data is split for 2 or more blocks and that blocks is considered as duplicate when that block is inserted in parallel. - on MV destination table: the equal blocks are deduplicated, that happens when MV often produces equal data as a result for different input data due to performing aggregation. - on MV destination table: the equal blocks which comes from different MV are deduplicated. [#61601](https://github.com/ClickHouse/ClickHouse/pull/61601) ([Sema Checherinda](https://github.com/CheSema)).
+* Allow matching column names in a case insensitive manner when reading json files (`input_format_json_case_insensitive_column_matching`). [#61750](https://github.com/ClickHouse/ClickHouse/pull/61750) ([kevinyhzou](https://github.com/KevinyhZou)).
 * Support reading partitioned data DeltaLake data. Infer DeltaLake schema by reading metadata instead of data. [#63201](https://github.com/ClickHouse/ClickHouse/pull/63201) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * In composable protocols TLS layer accepted only `certificateFile` and `privateKeyFile` parameters. https://clickhouse.com/docs/en/operations/settings/composable-protocols. [#63985](https://github.com/ClickHouse/ClickHouse/pull/63985) ([Anton Ivashkin](https://github.com/ianton-ru)).
 * Added profile event `SelectQueriesWithPrimaryKeyUsage` which indicates how many SELECT queries use the primary key to evaluate the WHERE clause. [#64492](https://github.com/ClickHouse/ClickHouse/pull/64492) ([0x01f](https://github.com/0xfei)).
@@ -219,6 +71,7 @@
 * Support aliases in parametrized view function (only new analyzer). [#65190](https://github.com/ClickHouse/ClickHouse/pull/65190) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Updated to mask account key in logs in azureBlobStorage. [#65273](https://github.com/ClickHouse/ClickHouse/pull/65273) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
 * Partition pruning for `IN` predicates when filter expression is a part of `PARTITION BY` expression. [#65335](https://github.com/ClickHouse/ClickHouse/pull/65335) ([Eduard Karacharov](https://github.com/korowa)).
+* Add system tables with main information about all detached tables. [#65400](https://github.com/ClickHouse/ClickHouse/pull/65400) ([Konstantin Morozov](https://github.com/k-morozov)).
 * `arrayMin`/`arrayMax` can be applicable to all data types that are comparable. [#65455](https://github.com/ClickHouse/ClickHouse/pull/65455) ([pn](https://github.com/chloro-pn)).
 * Improved memory accounting for cgroups v2 to exclude the amount occupied by the page cache. [#65470](https://github.com/ClickHouse/ClickHouse/pull/65470) ([Nikita Taranov](https://github.com/nickitat)).
 * Do not create format settings for each row when serializing chunks to insert to EmbeddedRocksDB table. [#65474](https://github.com/ClickHouse/ClickHouse/pull/65474) ([Duc Canh Le](https://github.com/canhld94)).
@@ -227,35 +80,36 @@
 * Disable filesystem cache background download by default. It will be enabled back when we fix the issue with possible "Memory limit exceeded" because memory deallocation is done outside of query context (while buffer is allocated inside of query context) if we use background download threads. Plus we need to add a separate setting to define max size to download for background workers (currently it is limited by max_file_segment_size, which might be too big). [#65534](https://github.com/ClickHouse/ClickHouse/pull/65534) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Add new option to config `<config_reload_interval_ms>` which allow to specify how often clickhouse will reload config. [#65545](https://github.com/ClickHouse/ClickHouse/pull/65545) ([alesapin](https://github.com/alesapin)).
 * Implement binary encoding for ClickHouse data types and add its specification in docs. Use it in Dynamic binary serialization, allow to use it in RowBinaryWithNamesAndTypes and Native formats under settings. [#65546](https://github.com/ClickHouse/ClickHouse/pull/65546) ([Kruglov Pavel](https://github.com/Avogar)).
+* Improved ZooKeeper load balancing. The current session doesn't expire until the optimal nodes become available despite `fallback_session_lifetime`. Added support for AZ-aware balancing. [#65570](https://github.com/ClickHouse/ClickHouse/pull/65570) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Server settings `compiled_expression_cache_size` and `compiled_expression_cache_elements_size` are now shown in `system.server_settings`. [#65584](https://github.com/ClickHouse/ClickHouse/pull/65584) ([Robert Schulze](https://github.com/rschu1ze)).
 * Add support for user identification based on x509 SubjectAltName extension. [#65626](https://github.com/ClickHouse/ClickHouse/pull/65626) ([Anton Kozlov](https://github.com/tonickkozlov)).
 * `clickhouse-local` will respect the `max_server_memory_usage` and `max_server_memory_usage_to_ram_ratio` from the configuration file. It will also set the max memory usage to 90% of the system memory by default, like `clickhouse-server` does. [#65697](https://github.com/ClickHouse/ClickHouse/pull/65697) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Add a script to backup your files to ClickHouse. [#65699](https://github.com/ClickHouse/ClickHouse/pull/65699) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* PostgreSQL source to support query cancellations. [#65722](https://github.com/ClickHouse/ClickHouse/pull/65722) ([Maksim Kita](https://github.com/kitaisreal)).
-* Make `allow_experimental_analyzer` be controlled by the initiator for distributed queries. This ensures compatibility and correctness during operations in mixed version clusters. [#65777](https://github.com/ClickHouse/ClickHouse/pull/65777) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* PostgreSQL source support cancel. [#65722](https://github.com/ClickHouse/ClickHouse/pull/65722) ([Maksim Kita](https://github.com/kitaisreal)).
+* Make allow_experimental_analyzer be controlled by the initiator for distributed queries. This ensures compatibility and correctness during operations in mixed version clusters. [#65777](https://github.com/ClickHouse/ClickHouse/pull/65777) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
 * Respect cgroup CPU limit in Keeper. [#65819](https://github.com/ClickHouse/ClickHouse/pull/65819) ([Antonio Andelic](https://github.com/antonio2368)).
-* Allow to use `concat` function with empty arguments `:) select concat();`. [#65887](https://github.com/ClickHouse/ClickHouse/pull/65887) ([李扬](https://github.com/taiyang-li)).
-* Allow controlling named collections in `clickhouse-local`. [#65973](https://github.com/ClickHouse/ClickHouse/pull/65973) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Improve Azure-related profile events. [#65999](https://github.com/ClickHouse/ClickHouse/pull/65999) ([alesapin](https://github.com/alesapin)).
-* Support ORC file read by writer's time zone. [#66025](https://github.com/ClickHouse/ClickHouse/pull/66025) ([kevinyhzou](https://github.com/KevinyhZou)).
-* Add settings to control connections to PostgreSQL. The setting `postgresql_connection_attempt_timeout` specifies the value passed to `connect_timeout` parameter of connection URL. The setting `postgresql_connection_pool_retries` specifies the number of retries to establish a connection to the PostgreSQL end-point. [#66232](https://github.com/ClickHouse/ClickHouse/pull/66232) ([Dmitry Novik](https://github.com/novikd)).
-* Reduce inaccuracy of `input_wait_elapsed_us`/`elapsed_us` in the `system.processors_profile_log`. [#66239](https://github.com/ClickHouse/ClickHouse/pull/66239) ([Azat Khuzhin](https://github.com/azat)).
-* Improve ProfileEvents for the filesystem cache. [#66249](https://github.com/ClickHouse/ClickHouse/pull/66249) ([zhukai](https://github.com/nauu)).
-* Add settings to ignore the `ON CLUSTER` clause in queries for named collection management with the replicated storage. [#66288](https://github.com/ClickHouse/ClickHouse/pull/66288) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Allow to use `concat` function with empty arguments ``` sql :) select concat();. [#65887](https://github.com/ClickHouse/ClickHouse/pull/65887) ([李扬](https://github.com/taiyang-li)).
+* Allow controlling named collections in clickhouse-local. [#65973](https://github.com/ClickHouse/ClickHouse/pull/65973) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve Azure profile events. [#65999](https://github.com/ClickHouse/ClickHouse/pull/65999) ([alesapin](https://github.com/alesapin)).
+* Support ORC file read by writer time zone. [#66025](https://github.com/ClickHouse/ClickHouse/pull/66025) ([kevinyhzou](https://github.com/KevinyhZou)).
+* Add settings to control connection to the PostgreSQL. * Setting `postgresql_connection_attempt_timeout` specifies the value passed to `connect_timeout` parameter of connection URL. * Setting `postgresql_connection_pool_retries` specifies the number of retries to establish a connection to the PostgreSQL end-point. [#66232](https://github.com/ClickHouse/ClickHouse/pull/66232) ([Dmitry Novik](https://github.com/novikd)).
+* Reduce inaccuracy of input_wait_elapsed_us/input_wait_elapsed_us/elapsed_us. [#66239](https://github.com/ClickHouse/ClickHouse/pull/66239) ([Azat Khuzhin](https://github.com/azat)).
+* Improve FilesystemCache ProfileEvents. [#66249](https://github.com/ClickHouse/ClickHouse/pull/66249) ([zhukai](https://github.com/nauu)).
+* Add settings to ignore ON CLUSTER clause in queries for named collection management with replicated storage. [#66288](https://github.com/ClickHouse/ClickHouse/pull/66288) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
 * Function `generateSnowflakeID` now allows to specify a machine ID as a parameter to prevent collisions in large clusters. [#66374](https://github.com/ClickHouse/ClickHouse/pull/66374) ([ZAWA_ll](https://github.com/Zawa-ll)).
-* Disable suspending on `Ctrl+Z` in interactive mode. This is a common trap and is not expected behavior for almost all users. I imagine only a few extreme power users could appreciate suspending terminal applications to the background, but I don't know any. [#66511](https://github.com/ClickHouse/ClickHouse/pull/66511) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add option for validating the primary key type in Dictionaries. Without this option for simple layouts any column type will be implicitly converted to UInt64. [#66595](https://github.com/ClickHouse/ClickHouse/pull/66595) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Disable suspending on Ctrl+Z in interactive mode. This is a common trap and is not expected behavior for almost all users. I imagine only a few extreme power users could appreciate suspending terminal applications to the background, but I don't know any. [#66511](https://github.com/ClickHouse/ClickHouse/pull/66511) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add option for validating the Primary key type in Dictionaries. Without this option for simple layouts any column type will be implicitly converted to UInt64. ### Documentation entry for user-facing changes. [#66595](https://github.com/ClickHouse/ClickHouse/pull/66595) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
 
 #### Bug Fix (user-visible misbehavior in an official stable release)
+* Fix unexpected size of low cardinality column in function calls. [#65298](https://github.com/ClickHouse/ClickHouse/pull/65298) ([Raúl Marín](https://github.com/Algunenano)).
 * Check cyclic dependencies on CREATE/REPLACE/RENAME/EXCHANGE queries and throw an exception if there is a cyclic dependency. Previously such cyclic dependencies could lead to a deadlock during server startup. Also fix some bugs in dependencies creation. [#65405](https://github.com/ClickHouse/ClickHouse/pull/65405) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix unexpected sizes of `LowCardinality` columns in function calls. [#65298](https://github.com/ClickHouse/ClickHouse/pull/65298) ([Raúl Marín](https://github.com/Algunenano)).
 * Fix crash in maxIntersections. [#65689](https://github.com/ClickHouse/ClickHouse/pull/65689) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix the `VALID UNTIL` clause in the user definition resetting after a restart. [#66409](https://github.com/ClickHouse/ClickHouse/pull/66409) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix the remaining time column in `SHOW MERGES`. [#66735](https://github.com/ClickHouse/ClickHouse/pull/66735) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix the VALID UNTIL clause in the user definition resetting after a restart. [#66409](https://github.com/ClickHouse/ClickHouse/pull/66409) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fix SHOW MERGES remaining time. [#66735](https://github.com/ClickHouse/ClickHouse/pull/66735) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * `Query was cancelled` might have been printed twice in clickhouse-client. This behaviour is fixed. [#66005](https://github.com/ClickHouse/ClickHouse/pull/66005) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fixed crash while using `MaterializedMySQL` (which is an unsupported, experimental feature) with TABLE OVERRIDE that maps MySQL NULL field into ClickHouse not NULL field. [#54649](https://github.com/ClickHouse/ClickHouse/pull/54649) ([Filipp Ozinov](https://github.com/bakwc)).
-* Fix logical error when `PREWHERE` expression read no columns and table has no adaptive index granularity (very old table). [#59173](https://github.com/ClickHouse/ClickHouse/pull/59173) ([Alexander Gololobov](https://github.com/davenger)).
-* Fix bug with the cancellation buffer when canceling a query. [#64478](https://github.com/ClickHouse/ClickHouse/pull/64478) ([Sema Checherinda](https://github.com/CheSema)).
+* Fixed crash while using MaterializedMySQL with TABLE OVERRIDE that maps MySQL NULL field into ClickHouse not NULL field. [#54649](https://github.com/ClickHouse/ClickHouse/pull/54649) ([Filipp Ozinov](https://github.com/bakwc)).
+* Fix logical error when PREWHERE expression read no columns and table has no adaptive index granularity (very old table). [#59173](https://github.com/ClickHouse/ClickHouse/pull/59173) ([Alexander Gololobov](https://github.com/davenger)).
+* Fix bug with cancellation buffer when canceling a query. [#64478](https://github.com/ClickHouse/ClickHouse/pull/64478) ([Sema Checherinda](https://github.com/CheSema)).
 * Fix filling parts columns from metadata (when columns.txt does not exists). [#64757](https://github.com/ClickHouse/ClickHouse/pull/64757) ([Azat Khuzhin](https://github.com/azat)).
 * Fix crash for `ALTER TABLE ... ON CLUSTER ... MODIFY SQL SECURITY`. [#64957](https://github.com/ClickHouse/ClickHouse/pull/64957) ([pufit](https://github.com/pufit)).
 * Fix crash on destroying AccessControl: add explicit shutdown. [#64993](https://github.com/ClickHouse/ClickHouse/pull/64993) ([Vitaly Baranov](https://github.com/vitlibar)).
@@ -302,7 +156,7 @@
 * Fixed how the ClickHouse server detects the maximum number of usable CPU cores as specified by cgroups v2 if the server runs in a container such as Docker. In more detail, containers often run their process in the root cgroup which has an empty name. In that case, ClickHouse ignored the CPU limits set by cgroups v2. [#66237](https://github.com/ClickHouse/ClickHouse/pull/66237) ([filimonov](https://github.com/filimonov)).
 * Fix the `Not-ready set` error when a subquery with `IN` is used in the constraint. [#66261](https://github.com/ClickHouse/ClickHouse/pull/66261) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix error reporting while copying to S3 or AzureBlobStorage. [#66295](https://github.com/ClickHouse/ClickHouse/pull/66295) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Prevent watchdog from keeping descriptors of unlinked (rotated) log files. [#66334](https://github.com/ClickHouse/ClickHouse/pull/66334) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Prevent watchdog from keeping descriptors of unlinked(rotated) log files. [#66334](https://github.com/ClickHouse/ClickHouse/pull/66334) ([Aleksei Filatov](https://github.com/aalexfvk)).
 * Fix the bug that logicalexpressionoptimizerpass lost logical type of constant. [#66344](https://github.com/ClickHouse/ClickHouse/pull/66344) ([pn](https://github.com/chloro-pn)).
 * Fix `Column identifier is already registered` error with `group_by_use_nulls=true` and new analyzer. [#66400](https://github.com/ClickHouse/ClickHouse/pull/66400) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix possible incorrect result for queries joining and filtering table external engine (like PostgreSQL), due to too aggressive filter pushdown. Since now, conditions from where section won't be send to external database in case of outer join with external table. [#66402](https://github.com/ClickHouse/ClickHouse/pull/66402) ([vdimir](https://github.com/vdimir)).
@@ -324,6 +178,9 @@
 * Fix `indexHint` function case found by fuzzer. [#66286](https://github.com/ClickHouse/ClickHouse/pull/66286) ([Anton Popov](https://github.com/CurtizJ)).
 * Fix AST formatting of 'create table b empty as a'. [#64951](https://github.com/ClickHouse/ClickHouse/pull/64951) ([Michael Kolupaev](https://github.com/al13n321)).
 
+#### Build/Testing/Packaging Improvement
+* Instantiate template methods ahead in different .cpp files, avoid too large translation units during compiling. [#64818](https://github.com/ClickHouse/ClickHouse/pull/64818) ([lgbo](https://github.com/lgbo-ustc)).
+
 ### <a id="246"></a> ClickHouse release 24.6, 2024-07-01
 
 #### Backward Incompatible Change
diff --git a/CITATION.cff b/CITATION.cff
deleted file mode 100644
index e4008c6940b..00000000000
--- a/CITATION.cff
+++ /dev/null
@@ -1,31 +0,0 @@
-# This CITATION.cff file was generated with cffinit.
-
-cff-version: 1.2.0
-title: "ClickHouse"
-message: "If you use this software, please cite it as below."
-type: software
-authors:
-  - family-names: "Milovidov"
-    given-names: "Alexey"
-repository-code: 'https://github.com/ClickHouse/ClickHouse'
-url: 'https://clickhouse.com'
-license: Apache-2.0
-preferred-citation:
-  type: article
-  authors:
-  - family-names: "Schulze"
-    given-names: "Robert"
-  - family-names: "Schreiber"
-    given-names: "Tom"
-  - family-names: "Yatsishin"
-    given-names: "Ilya"
-  - family-names: "Dahimene"
-    given-names: "Ryadh"
-  - family-names: "Milovidov"
-    given-names: "Alexey"
-  journal: "Proceedings of the VLDB Endowment"
-  title: "ClickHouse - Lightning Fast Analytics for Everyone"
-  year: 2024
-  volume: 17
-  issue: 12
-  doi: 10.14778/3685800.3685802
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6abf48a6927..f796e6c4616 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,6 +187,14 @@ else ()
     set(NO_WHOLE_ARCHIVE --no-whole-archive)
 endif ()
 
+if (NOT CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE")
+    # Can be lld or ld-lld or lld-13 or /path/to/lld.
+    if (LINKER_NAME MATCHES "lld")
+        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gdb-index")
+        message (STATUS "Adding .gdb-index via --gdb-index linker option.")
+    endif ()
+endif()
+
 if (NOT (SANITIZE_COVERAGE OR WITH_COVERAGE)
     AND (CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE"
         OR CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO"
@@ -322,21 +330,17 @@ if (DISABLE_OMIT_FRAME_POINTER)
     set (CMAKE_ASM_FLAGS_ADD "${CMAKE_ASM_FLAGS_ADD} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer")
 endif()
 
-# Before you start hating your debugger because it refuses to show variables ('<optimized out>'), try building with -DDEBUG_O_LEVEL="0"
-# https://stackoverflow.com/questions/63386189/whats-the-difference-between-a-compilers-o0-option-and-og-option/63386263#63386263
-set(DEBUG_O_LEVEL "g" CACHE STRING "The -Ox level used for debug builds")
-
 set (CMAKE_CXX_FLAGS                     "${CMAKE_CXX_FLAGS} ${COMPILER_FLAGS} ${CMAKE_CXX_FLAGS_ADD}")
 set (CMAKE_CXX_FLAGS_RELWITHDEBINFO      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 ${DEBUG_INFO_FLAGS} ${CMAKE_CXX_FLAGS_ADD}")
-set (CMAKE_CXX_FLAGS_DEBUG               "${CMAKE_CXX_FLAGS_DEBUG} -O${DEBUG_O_LEVEL} ${DEBUG_INFO_FLAGS} ${CMAKE_CXX_FLAGS_ADD}")
+set (CMAKE_CXX_FLAGS_DEBUG               "${CMAKE_CXX_FLAGS_DEBUG} -Og ${DEBUG_INFO_FLAGS} ${CMAKE_CXX_FLAGS_ADD}")
 
 set (CMAKE_C_FLAGS                       "${CMAKE_C_FLAGS} ${COMPILER_FLAGS} ${CMAKE_C_FLAGS_ADD}")
 set (CMAKE_C_FLAGS_RELWITHDEBINFO        "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 ${DEBUG_INFO_FLAGS} ${CMAKE_C_FLAGS_ADD}")
-set (CMAKE_C_FLAGS_DEBUG                 "${CMAKE_C_FLAGS_DEBUG} -O${DEBUG_O_LEVEL} ${DEBUG_INFO_FLAGS} ${CMAKE_C_FLAGS_ADD}")
+set (CMAKE_C_FLAGS_DEBUG                 "${CMAKE_C_FLAGS_DEBUG} -Og ${DEBUG_INFO_FLAGS} ${CMAKE_C_FLAGS_ADD}")
 
 set (CMAKE_ASM_FLAGS                     "${CMAKE_ASM_FLAGS} ${COMPILER_FLAGS} ${CMAKE_ASM_FLAGS_ADD}")
 set (CMAKE_ASM_FLAGS_RELWITHDEBINFO      "${CMAKE_ASM_FLAGS_RELWITHDEBINFO} -O3 ${DEBUG_INFO_FLAGS} ${CMAKE_ASM_FLAGS_ADD}")
-set (CMAKE_ASM_FLAGS_DEBUG               "${CMAKE_ASM_FLAGS_DEBUG} -O${DEBUG_O_LEVEL} ${DEBUG_INFO_FLAGS} ${CMAKE_ASM_FLAGS_ADD}")
+set (CMAKE_ASM_FLAGS_DEBUG               "${CMAKE_ASM_FLAGS_DEBUG} -Og ${DEBUG_INFO_FLAGS} ${CMAKE_ASM_FLAGS_ADD}")
 
 if (OS_DARWIN)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
@@ -398,7 +402,7 @@ if ((NOT OS_LINUX AND NOT OS_ANDROID) OR (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
     set(ENABLE_GWP_ASAN OFF)
 endif ()
 
-option (ENABLE_LIBFIU "Enable libfiu" ON)
+option (ENABLE_FIU "Enable Fiu" ON)
 
 option(WERROR "Enable -Werror compiler option" ON)
 
@@ -424,17 +428,12 @@ if (NOT SANITIZE)
     set (CMAKE_POSITION_INDEPENDENT_CODE OFF)
 endif()
 
-if (NOT OS_ANDROID AND OS_LINUX AND NOT ARCH_S390X AND NOT SANITIZE)
-    # Using '-no-pie' builds executables with fixed addresses, resulting in slightly more efficient code
-    # and keeping binary addresses constant even with ASLR enabled.
-    # Disabled on Android as it requires PIE: https://source.android.com/docs/security/enhancements#android-5
-    # Disabled on IBM S390X due to build issues with 'no-pie'
-    # Disabled with sanitizers to avoid issues with maximum relocation size: https://github.com/ClickHouse/ClickHouse/pull/49145
+if (OS_LINUX AND NOT (ARCH_AARCH64 OR ARCH_S390X) AND NOT SANITIZE)
+    # Slightly more efficient code can be generated
+    # It's disabled for ARM because otherwise ClickHouse cannot run on Android.
     set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fno-pie")
     set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fno-pie")
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie -Wl,-no-pie")
-else ()
-    message (WARNING "ClickHouse is built as PIE, system.trace_log will contain invalid addresses after server restart.")
 endif ()
 
 if (ENABLE_TESTS)
@@ -605,9 +604,7 @@ if (NATIVE_BUILD_TARGETS
 
     execute_process(
         COMMAND ${CMAKE_COMMAND} -E make_directory "${NATIVE_BUILD_DIR}"
-        COMMAND_ECHO STDOUT
-        COMMAND_ERROR_IS_FATAL ANY
-    )
+        COMMAND_ECHO STDOUT)
 
     execute_process(
         COMMAND ${CMAKE_COMMAND}
@@ -619,13 +616,9 @@ if (NATIVE_BUILD_TARGETS
             "-DENABLE_CLICKHOUSE_SELF_EXTRACTING=${ENABLE_CLICKHOUSE_SELF_EXTRACTING}"
         ${PROJECT_SOURCE_DIR}
         WORKING_DIRECTORY "${NATIVE_BUILD_DIR}"
-        COMMAND_ECHO STDOUT
-        COMMAND_ERROR_IS_FATAL ANY
-    )
+        COMMAND_ECHO STDOUT)
 
     execute_process(
         COMMAND ${CMAKE_COMMAND} --build "${NATIVE_BUILD_DIR}" --target ${NATIVE_BUILD_TARGETS}
-        COMMAND_ECHO STDOUT
-        COMMAND_ERROR_IS_FATAL ANY
-    )
+        COMMAND_ECHO STDOUT)
 endif ()
diff --git a/PreLoad.cmake b/PreLoad.cmake
index 92b221c9f63..e0fd37b2fd6 100644
--- a/PreLoad.cmake
+++ b/PreLoad.cmake
@@ -51,14 +51,8 @@ if (NOT "$ENV{CFLAGS}" STREQUAL ""
 endif()
 
 # Default toolchain - this is needed to avoid dependency on OS files.
-execute_process(COMMAND uname -s
-    OUTPUT_VARIABLE OS
-    COMMAND_ERROR_IS_FATAL ANY
-)
-execute_process(COMMAND uname -m
-    OUTPUT_VARIABLE ARCH
-    COMMAND_ERROR_IS_FATAL ANY
-)
+execute_process(COMMAND uname -s OUTPUT_VARIABLE OS)
+execute_process(COMMAND uname -m OUTPUT_VARIABLE ARCH)
 
 # By default, prefer clang on Linux
 # But note, that you still may change the compiler with -DCMAKE_C_COMPILER/-DCMAKE_CXX_COMPILER.
diff --git a/README.md b/README.md
index 5fa04fe29e7..98f9108f14c 100644
--- a/README.md
+++ b/README.md
@@ -34,45 +34,21 @@ curl https://clickhouse.com/ | sh
 
 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.9 Community Call](https://clickhouse.com/company/events/v24-9-community-release-call) - September 26
+* [v24.7 Community Call](https://clickhouse.com/company/events/v24-7-community-release-call) - Jul 30
 
 ## Upcoming Events
 
 Keep an eye out for upcoming meetups and events around 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.
 
-The following upcoming meetups are featuring creator of ClickHouse & CTO, Alexey Milovidov:
-
-* [Raleigh Meetup (Deutsche Bank)](https://www.meetup.com/triangletechtalks/events/302723486/) - September 9
-* [New York Meetup (Rokt)](https://www.meetup.com/clickhouse-new-york-user-group/events/302575342) - September 10
-* [Chicago Meetup (Jump Capital)](https://lu.ma/43tvmrfw) - September 12
-
-Other upcoming meetups
-
-* [Toronto Meetup (Shopify)](https://www.meetup.com/clickhouse-toronto-user-group/events/301490855/) - September 10
-* [Austin Meetup](https://www.meetup.com/clickhouse-austin-user-group/events/302558689/) - September 17
-* [London Meetup](https://www.meetup.com/clickhouse-london-user-group/events/302977267) - September 17
-* [Bangalore Meetup](https://www.meetup.com/clickhouse-bangalore-user-group/events/303208274/) - September 18
-* [Tel Aviv Meetup](https://www.meetup.com/clickhouse-meetup-israel/events/303095121) - September 22
-* [Jakarta Meetup](https://www.meetup.com/clickhouse-indonesia-user-group/events/303191359/) - October 1
-* [Singapore Meetup](https://www.meetup.com/clickhouse-singapore-meetup-group/events/303212064/) - October 3
-* [Madrid Meetup](https://www.meetup.com/clickhouse-spain-user-group/events/303096564/) - October 22
-* [Barcelona Meetup](https://www.meetup.com/clickhouse-spain-user-group/events/303096876/) - October 29
-* [Oslo Meetup](https://www.meetup.com/open-source-real-time-data-warehouse-real-time-analytics/events/302938622) - October 31
-* [Ghent Meetup](https://www.meetup.com/clickhouse-belgium-user-group/events/303049405/) - November 19
-* [Dubai Meetup](https://www.meetup.com/clickhouse-dubai-meetup-group/events/303096989/) - November 21
-* [Paris Meetup](https://www.meetup.com/clickhouse-france-user-group/events/303096434) - November 26
-
-Recently completed events
-* [ClickHouse Guangzhou User Group Meetup](https://mp.weixin.qq.com/s/GSvo-7xUoVzCsuUvlLTpCw) - August 25
-* [Seattle Meetup (Statsig)](https://www.meetup.com/clickhouse-seattle-user-group/events/302518075/) - August 27
-* [Melbourne Meetup](https://www.meetup.com/clickhouse-australia-user-group/events/302732666/) - August 27
-* [Sydney Meetup](https://www.meetup.com/clickhouse-australia-user-group/events/302862966/) - September 5
-* [Zurich Meetup](https://www.meetup.com/clickhouse-switzerland-meetup-group/events/302267429/) - September 5
-* [San Francisco Meetup (Cloudflare)](https://www.meetup.com/clickhouse-silicon-valley-meetup-group/events/302540575) - September 5
+* [ClickHouse Meetup in Paris](https://www.meetup.com/clickhouse-france-user-group/events/300783448/) - Jul 9
+* [ClickHouse Cloud - Live Update Call](https://clickhouse.com/company/events/202407-cloud-update-live) - Jul 9
+* [ClickHouse Meetup @ Ramp - New York City](https://www.meetup.com/clickhouse-new-york-user-group/events/300595845/) - Jul 9
+* [AWS Summit in New York](https://clickhouse.com/company/events/2024-07-awssummit-nyc) - Jul 10
+* [ClickHouse Meetup @ Klaviyo - Boston](https://www.meetup.com/clickhouse-boston-user-group/events/300907870) - Jul 11
 
 ## 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**: [**v24.8 LTS Release Call**](https://www.youtube.com/watch?v=AeLmp2jc51k) All the features of 24.8 LTS, one convenient video! Watch it now!
+* **Recording available**: [**v24.4 Release Call**](https://www.youtube.com/watch?v=dtUqgcfOGmE) All the features of 24.4, 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 93c48f1d9ba..53328b6e16b 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -14,15 +14,24 @@ The following versions of ClickHouse server are currently supported with securit
 
 | Version | Supported |
 |:-|:-|
-| 24.8 | ✔️ |
-| 24.7 | ✔️ |
 | 24.6 | ✔️ |
-| 24.5 | ❌ |
-| 24.4 | ❌ |
+| 24.5 | ✔️ |
+| 24.4 | ✔️ |
 | 24.3 | ✔️ |
 | 24.2 | ❌ |
 | 24.1 | ❌ |
-| 23.* | ❌ |
+| 23.12 | ❌ |
+| 23.11 | ❌ |
+| 23.10 | ❌ |
+| 23.9 | ❌ |
+| 23.8 | ✔️ |
+| 23.7 | ❌ |
+| 23.6 | ❌ |
+| 23.5 | ❌ |
+| 23.4 | ❌ |
+| 23.3 | ❌ |
+| 23.2 | ❌ |
+| 23.1 | ❌ |
 | 22.* | ❌ |
 | 21.* | ❌ |
 | 20.* | ❌ |
diff --git a/base/base/CMakeLists.txt b/base/base/CMakeLists.txt
index 3d236f52c36..159502c9735 100644
--- a/base/base/CMakeLists.txt
+++ b/base/base/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_compile_options("$<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:${COVERAGE_FLAGS}>")
+add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:${COVERAGE_FLAGS}>)
 
 if (USE_CLANG_TIDY)
     set (CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_PATH}")
@@ -8,8 +8,6 @@ endif ()
 # when instantiated from JSON.cpp. Try again when libcxx(abi) and Clang are upgraded to 16.
 set (CMAKE_CXX_STANDARD 20)
 
-configure_file(GitHash.cpp.in GitHash.generated.cpp)
-
 set (SRCS
     argsToConfig.cpp
     cgroupsv2.cpp
@@ -34,8 +32,6 @@ set (SRCS
     StringRef.cpp
     safeExit.cpp
     throwError.cpp
-    Numa.cpp
-    GitHash.generated.cpp
 )
 
 add_library (common ${SRCS})
@@ -50,10 +46,6 @@ if (TARGET ch_contrib::crc32_s390x)
     target_link_libraries(common PUBLIC ch_contrib::crc32_s390x)
 endif()
 
-if (TARGET ch_contrib::numactl)
-    target_link_libraries(common PUBLIC ch_contrib::numactl)
-endif()
-
 target_include_directories(common PUBLIC .. "${CMAKE_CURRENT_BINARY_DIR}/..")
 
 target_link_libraries (common
diff --git a/base/base/Numa.cpp b/base/base/Numa.cpp
deleted file mode 100644
index 0bf56a993b8..00000000000
--- a/base/base/Numa.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <base/Numa.h>
-
-#include "config.h"
-
-#if USE_NUMACTL
-#    include <numa.h>
-#endif
-
-namespace DB
-{
-
-std::optional<size_t> getNumaNodesTotalMemory()
-{
-    std::optional<size_t> total_memory;
-#if USE_NUMACTL
-    if (numa_available() != -1)
-    {
-        auto * membind = numa_get_membind();
-        if (!numa_bitmask_equal(membind, numa_all_nodes_ptr))
-        {
-            total_memory.emplace(0);
-            auto max_node = numa_max_node();
-            for (int i = 0; i <= max_node; ++i)
-            {
-                if (numa_bitmask_isbitset(membind, i))
-                    *total_memory += numa_node_size(i, nullptr);
-            }
-        }
-
-        numa_bitmask_free(membind);
-    }
-
-#endif
-    return total_memory;
-}
-
-}
diff --git a/base/base/Numa.h b/base/base/Numa.h
deleted file mode 100644
index b48ab15766b..00000000000
--- a/base/base/Numa.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include <optional>
-
-namespace DB
-{
-
-/// return total memory of NUMA nodes the process is bound to
-/// if NUMA is not supported or process can use all nodes, std::nullopt is returned
-std::optional<size_t> getNumaNodesTotalMemory();
-
-}
diff --git a/base/base/cgroupsv2.cpp b/base/base/cgroupsv2.cpp
index e0e37c8729b..87f62bf377d 100644
--- a/base/base/cgroupsv2.cpp
+++ b/base/base/cgroupsv2.cpp
@@ -27,6 +27,27 @@ bool cgroupsV2Enabled()
 #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 are available
+    /// for the current + child cgroups. The set of available controllers can be restricted from level to level using file
+    /// "cgroups.subtree_control". It is therefore sufficient to check the bottom-most nested "cgroup.controllers" file.
+    fs::path cgroup_dir = cgroupV2PathOfProcess();
+    if (cgroup_dir.empty())
+        return false;
+    std::ifstream controllers_file(cgroup_dir / "cgroup.controllers");
+    if (!controllers_file.is_open())
+        return false;
+    std::string controllers;
+    std::getline(controllers_file, controllers);
+    return controllers.find("memory") != std::string::npos;
+#else
+    return false;
+#endif
+}
+
 fs::path cgroupV2PathOfProcess()
 {
 #if defined(OS_LINUX)
@@ -50,28 +71,3 @@ fs::path cgroupV2PathOfProcess()
     return {};
 #endif
 }
-
-std::optional<std::string> getCgroupsV2PathContainingFile([[maybe_unused]] std::string_view file_name)
-{
-#if defined(OS_LINUX)
-    if (!cgroupsV2Enabled())
-        return {};
-
-    fs::path current_cgroup = cgroupV2PathOfProcess();
-    if (current_cgroup.empty())
-        return {};
-
-    /// Return the bottom-most nested file. If there is no such file at the current
-    /// level, try again at the parent level as settings are inherited.
-    while (current_cgroup != default_cgroups_mount.parent_path())
-    {
-        const auto path = current_cgroup / file_name;
-        if (fs::exists(path))
-            return {current_cgroup};
-        current_cgroup = current_cgroup.parent_path();
-    }
-    return {};
-#else
-    return {};
-#endif
-}
diff --git a/base/base/cgroupsv2.h b/base/base/cgroupsv2.h
index a6276474254..cfb916ff358 100644
--- a/base/base/cgroupsv2.h
+++ b/base/base/cgroupsv2.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <filesystem>
-#include <string_view>
 
 #if defined(OS_LINUX)
 /// I think it is possible to mount the cgroups hierarchy somewhere else (e.g. when in containers).
@@ -12,11 +11,11 @@ static inline const std::filesystem::path default_cgroups_mount = "/sys/fs/cgrou
 /// 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();
+
 /// Detects which cgroup v2 the process belongs to and returns the filesystem path to the cgroup.
 /// Returns an empty path the cgroup cannot be determined.
 /// Assumes that cgroupsV2Enabled() is enabled.
 std::filesystem::path cgroupV2PathOfProcess();
-
-/// Returns the most nested cgroup dir containing the specified file.
-/// If cgroups v2 is not enabled - returns an empty optional.
-std::optional<std::string> getCgroupsV2PathContainingFile([[maybe_unused]] std::string_view file_name);
diff --git a/base/base/getMemoryAmount.cpp b/base/base/getMemoryAmount.cpp
index bbfbecdbffd..afdb6ba068a 100644
--- a/base/base/getMemoryAmount.cpp
+++ b/base/base/getMemoryAmount.cpp
@@ -2,14 +2,15 @@
 
 #include <base/cgroupsv2.h>
 #include <base/getPageSize.h>
-#include <base/Numa.h>
 
 #include <fstream>
+#include <stdexcept>
 
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/param.h>
 
+
 namespace
 {
 
@@ -19,6 +20,9 @@ std::optional<uint64_t> getCgroupsV2MemoryLimit()
     if (!cgroupsV2Enabled())
         return {};
 
+    if (!cgroupsV2MemoryControllerEnabled())
+        return {};
+
     std::filesystem::path current_cgroup = cgroupV2PathOfProcess();
     if (current_cgroup.empty())
         return {};
@@ -59,9 +63,6 @@ uint64_t getMemoryAmountOrZero()
 
     uint64_t memory_amount = num_pages * page_size;
 
-    if (auto total_numa_memory = DB::getNumaNodesTotalMemory(); total_numa_memory.has_value())
-        memory_amount = *total_numa_memory;
-
     /// Respect the memory limit set by cgroups v2.
     auto limit_v2 = getCgroupsV2MemoryLimit();
     if (limit_v2.has_value() && *limit_v2 < memory_amount)
diff --git a/base/glibc-compatibility/CMakeLists.txt b/base/glibc-compatibility/CMakeLists.txt
index 8948e25cb8e..c967fa5b11b 100644
--- a/base/glibc-compatibility/CMakeLists.txt
+++ b/base/glibc-compatibility/CMakeLists.txt
@@ -18,16 +18,6 @@ if (GLIBC_COMPATIBILITY)
         message (FATAL_ERROR "glibc_compatibility can only be used on x86_64 or aarch64.")
     endif ()
 
-    if (SANITIZE STREQUAL thread)
-        # Disable TSAN instrumentation that conflicts with re-exec due to high ASLR entropy using getauxval
-        # See longer comment in __auxv_init_procfs
-        # In the case of tsan we need to make sure getauxval is not instrumented as that would introduce tsan
-        # internal calls to functions that depend on a state that isn't initialized yet
-        set_source_files_properties(
-                musl/getauxval.c
-                PROPERTIES COMPILE_FLAGS "-mllvm -tsan-instrument-func-entry-exit=false")
-    endif()
-
     # Need to omit frame pointers to match the performance of glibc
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fomit-frame-pointer")
 
diff --git a/base/glibc-compatibility/musl/getauxval.c b/base/glibc-compatibility/musl/getauxval.c
index ec2cce1e4aa..ea5cff9fc11 100644
--- a/base/glibc-compatibility/musl/getauxval.c
+++ b/base/glibc-compatibility/musl/getauxval.c
@@ -75,44 +75,6 @@ unsigned long NO_SANITIZE_THREAD __getauxval_procfs(unsigned long type)
 }
 static unsigned long NO_SANITIZE_THREAD __auxv_init_procfs(unsigned long type)
 {
-#if defined(__x86_64__) && defined(__has_feature)
-#    if __has_feature(memory_sanitizer) || __has_feature(thread_sanitizer)
-    /// Sanitizers are not compatible with high ASLR entropy, which is the default on modern Linux distributions, and
-    /// to workaround this limitation, TSAN and MSAN (couldn't see other sanitizers doing the same), re-exec the binary
-    /// without ASLR (see https://github.com/llvm/llvm-project/commit/0784b1eefa36d4acbb0dacd2d18796e26313b6c5)
-
-    /// The problem we face is that, in order to re-exec, the sanitizer wants to use the original pathname in the call
-    /// and to get its value it uses getauxval (https://github.com/llvm/llvm-project/blob/20eff684203287828d6722fc860b9d3621429542/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp#L985-L988).
-    /// Since we provide getauxval ourselves (to minimize the version dependency on runtime glibc), we are the ones
-    // being called and we fail horribly:
-    ///
-    ///    ==301455==ERROR: MemorySanitizer: SEGV on unknown address 0x2ffc6d721550 (pc 0x5622c1cc0073 bp 0x000000000003 sp 0x7ffc6d721530 T301455)
-    ///    ==301455==The signal is caused by a WRITE memory access.
-    /// #0 0x5622c1cc0073 in __auxv_init_procfs ./ClickHouse/base/glibc-compatibility/musl/getauxval.c:129:5
-    /// #1 0x5622c1cbffe9 in getauxval ./ClickHouse/base/glibc-compatibility/musl/getauxval.c:240:12
-    /// #2 0x5622c0d7bfb4 in __sanitizer::ReExec() crtstuff.c
-    /// #3 0x5622c0df7bfc in __msan::InitShadowWithReExec(bool) crtstuff.c
-    /// #4 0x5622c0d95356 in __msan_init (./ClickHouse/build_msan/contrib/google-protobuf-cmake/protoc+0x256356) (BuildId: 6411d3c88b898ba3f7d49760555977d3e61f0741)
-    /// #5 0x5622c0dfe878 in msan.module_ctor main.cc
-    /// #6 0x5622c1cc156c in __libc_csu_init (./ClickHouse/build_msan/contrib/google-protobuf-cmake/protoc+0x118256c) (BuildId: 6411d3c88b898ba3f7d49760555977d3e61f0741)
-    /// #7 0x73dc05dd7ea3 in __libc_start_main /usr/src/debug/glibc/glibc/csu/../csu/libc-start.c:343:6
-    /// #8 0x5622c0d6b7cd in _start (./ClickHouse/build_msan/contrib/google-protobuf-cmake/protoc+0x22c7cd) (BuildId: 6411d3c88b898ba3f7d49760555977d3e61f0741)
-
-    /// The source of the issue above is that, at this point in time during __msan_init, we can't really do much as
-    /// most global variables aren't initialized or available yet, so we can't initiate the auxiliary vector.
-    /// Normal glibc / musl getauxval doesn't have this problem since they initiate their auxval vector at the very
-    /// start of __libc_start_main (just keeping track of argv+argc+1), but we don't have such option (otherwise
-    /// this complexity of reading "/proc/self/auxv" or using __environ would not be necessary).
-
-    /// To avoid this crashes on the re-exec call (see above how it would fail when creating `aux`, and if we used
-    /// __auxv_init_environ then it would SIGSEV on READing `__environ`) we capture this call for `AT_EXECFN` and
-    /// unconditionally return "/proc/self/exe" without any preparation. Theoretically this should be fine in
-    /// our case, as we don't load any libraries. That's the theory at least.
-    if (type == AT_EXECFN)
-        return (unsigned long)"/proc/self/exe";
-#    endif
-#endif
-
     // For debugging:
     // - od -t dL /proc/self/auxv
     // - LD_SHOW_AUX= ls
@@ -237,7 +199,7 @@ static unsigned long NO_SANITIZE_THREAD __auxv_init_environ(unsigned long type)
 // - __auxv_init_procfs -> __auxv_init_environ -> __getauxval_environ
 static void * volatile getauxval_func = (void *)__auxv_init_procfs;
 
-unsigned long NO_SANITIZE_THREAD getauxval(unsigned long type)
+unsigned long getauxval(unsigned long type)
 {
     return ((unsigned long (*)(unsigned long))getauxval_func)(type);
 }
diff --git a/base/harmful/harmful.c b/base/harmful/harmful.c
index 19bb962999f..54b552a84ea 100644
--- a/base/harmful/harmful.c
+++ b/base/harmful/harmful.c
@@ -66,11 +66,13 @@ TRAP(gethostbyname)
 TRAP(gethostbyname2)
 TRAP(gethostent)
 TRAP(getlogin)
+TRAP(getmntent)
 TRAP(getnetbyaddr)
 TRAP(getnetbyname)
 TRAP(getnetent)
 TRAP(getnetgrent)
 TRAP(getnetgrent_r)
+TRAP(getopt)
 TRAP(getopt_long)
 TRAP(getopt_long_only)
 TRAP(getpass)
@@ -131,6 +133,7 @@ TRAP(nrand48)
 TRAP(__ppc_get_timebase_freq)
 TRAP(ptsname)
 TRAP(putchar_unlocked)
+TRAP(putenv)
 TRAP(pututline)
 TRAP(pututxline)
 TRAP(putwchar_unlocked)
@@ -145,6 +148,7 @@ TRAP(sethostent)
 TRAP(sethostid)
 TRAP(setkey)
 //TRAP(setlocale) // Used by replxx at startup
+TRAP(setlogmask)
 TRAP(setnetent)
 TRAP(setnetgrent)
 TRAP(setprotoent)
@@ -199,6 +203,7 @@ TRAP(lgammal)
 TRAP(nftw)
 TRAP(nl_langinfo)
 TRAP(putc_unlocked)
+TRAP(rand)
 /** In  the current POSIX.1 specification (POSIX.1-2008), readdir() is not required to be thread-safe.  However, in modern
   * implementations (including the glibc implementation), concurrent calls to readdir() that specify different directory streams
   * are thread-safe.  In cases where multiple threads must read from the same directory stream, using readdir() with external
@@ -283,14 +288,4 @@ TRAP(tss_get)
 TRAP(tss_set)
 TRAP(tss_delete)
 
-#ifndef USE_MUSL
-/// These produce duplicate symbol errors when statically linking with musl.
-/// Maybe we can remove them from the musl fork.
-TRAP(getopt)
-TRAP(putenv)
-TRAP(setlogmask)
-TRAP(rand)
-TRAP(getmntent)
-#endif
-
 #endif
diff --git a/base/poco/Foundation/include/Poco/ErrorHandler.h b/base/poco/Foundation/include/Poco/ErrorHandler.h
index f774f2ccf5e..c0b5bf9621e 100644
--- a/base/poco/Foundation/include/Poco/ErrorHandler.h
+++ b/base/poco/Foundation/include/Poco/ErrorHandler.h
@@ -21,7 +21,6 @@
 #include "Poco/Exception.h"
 #include "Poco/Foundation.h"
 #include "Poco/Mutex.h"
-#include "Poco/Message.h"
 
 
 namespace Poco
@@ -79,10 +78,6 @@ public:
     ///
     /// The default implementation just breaks into the debugger.
 
-    virtual void logMessageImpl(Message::Priority priority, const std::string & msg) {}
-    /// Write a messages to the log
-    /// Useful for logging from Poco
-
     static void handle(const Exception & exc);
     /// Invokes the currently registered ErrorHandler.
 
@@ -92,9 +87,6 @@ public:
     static void handle();
     /// Invokes the currently registered ErrorHandler.
 
-    static void logMessage(Message::Priority priority, const std::string & msg);
-    /// Invokes the currently registered ErrorHandler to log a message.
-
     static ErrorHandler * set(ErrorHandler * pHandler);
     /// Registers the given handler as the current error handler.
     ///
diff --git a/base/poco/Foundation/include/Poco/UUID.h b/base/poco/Foundation/include/Poco/UUID.h
index 6466d226b2e..df67ef73e4b 100644
--- a/base/poco/Foundation/include/Poco/UUID.h
+++ b/base/poco/Foundation/include/Poco/UUID.h
@@ -19,7 +19,6 @@
 
 
 #include "Poco/Foundation.h"
-#include <Poco/Types.h>
 
 
 namespace Poco
@@ -136,12 +135,6 @@ public:
     static const UUID & x500();
     /// Returns the namespace identifier for the X500 namespace.
 
-    UInt32 getTimeLow() const { return _timeLow; }
-    UInt16 getTimeMid() const { return _timeMid; }
-    UInt16 getTimeHiAndVersion() const { return _timeHiAndVersion; }
-    UInt16 getClockSeq() const { return _clockSeq; }
-    std::array<UInt8, 6> getNode() const { return std::array<UInt8, 6>{_node[0], _node[1], _node[2], _node[3], _node[4], _node[5]}; }
-
 protected:
     UUID(UInt32 timeLow, UInt32 timeMid, UInt32 timeHiAndVersion, UInt16 clockSeq, UInt8 node[]);
     UUID(const char * bytes, Version version);
diff --git a/base/poco/Foundation/src/ErrorHandler.cpp b/base/poco/Foundation/src/ErrorHandler.cpp
index 1d0a41b77ec..d0af8ea8a12 100644
--- a/base/poco/Foundation/src/ErrorHandler.cpp
+++ b/base/poco/Foundation/src/ErrorHandler.cpp
@@ -8,7 +8,7 @@
 // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
 //
-// SPDX-License-Identifier:    BSL-1.0
+// SPDX-License-Identifier:	BSL-1.0
 //
 
 
@@ -35,91 +35,79 @@ ErrorHandler::~ErrorHandler()
 
 void ErrorHandler::exception(const Exception& exc)
 {
-    poco_debugger_msg(exc.what());
+	poco_debugger_msg(exc.what());
 }
 
-    
+	
 void ErrorHandler::exception(const std::exception& exc)
 {
-    poco_debugger_msg(exc.what());
+	poco_debugger_msg(exc.what());
 }
 
 
 void ErrorHandler::exception()
 {
-    poco_debugger_msg("unknown exception");
+	poco_debugger_msg("unknown exception");
 }
 
 
 void ErrorHandler::handle(const Exception& exc)
 {
-    FastMutex::ScopedLock lock(_mutex);
-    try
-    {
-        _pHandler->exception(exc);
-    }
-    catch (...)
-    {
-    }
+	FastMutex::ScopedLock lock(_mutex);
+	try
+	{
+		_pHandler->exception(exc);
+	}
+	catch (...)
+	{
+	}
 }
 
-    
+	
 void ErrorHandler::handle(const std::exception& exc)
 {
-    FastMutex::ScopedLock lock(_mutex);
-    try
-    {
-        _pHandler->exception(exc);
-    }
-    catch (...)
-    {
-    }
+	FastMutex::ScopedLock lock(_mutex);
+	try
+	{
+		_pHandler->exception(exc);
+	}
+	catch (...)
+	{
+	}
 }
 
 
 void ErrorHandler::handle()
 {
-    FastMutex::ScopedLock lock(_mutex);
-    try
-    {
-        _pHandler->exception();
-    }
-    catch (...)
-    {
-    }
-}
-
-void ErrorHandler::logMessage(Message::Priority priority, const std::string & msg)
-{
-    FastMutex::ScopedLock lock(_mutex);
-    try
-    {
-        _pHandler->logMessageImpl(priority, msg);
-    }
-    catch (...)
-    {
-    }
+	FastMutex::ScopedLock lock(_mutex);
+	try
+	{
+		_pHandler->exception();
+	}
+	catch (...)
+	{
+	}
 }
 
 
 ErrorHandler* ErrorHandler::set(ErrorHandler* pHandler)
 {
-    poco_check_ptr(pHandler);
+	poco_check_ptr(pHandler);
 
-    FastMutex::ScopedLock lock(_mutex);
-    ErrorHandler* pOld = _pHandler;
-    _pHandler = pHandler;
-    return pOld;
+	FastMutex::ScopedLock lock(_mutex);
+	ErrorHandler* pOld = _pHandler;
+	_pHandler = pHandler;
+	return pOld;
 }
 
 
 ErrorHandler* ErrorHandler::defaultHandler()
 {
-    // NOTE: Since this is called to initialize the static _pHandler
-    // variable, sh has to be a local static, otherwise we run
-    // into static initialization order issues.
-    static SingletonHolder<ErrorHandler> sh;
-    return sh.get();
+	// NOTE: Since this is called to initialize the static _pHandler
+	// variable, sh has to be a local static, otherwise we run
+	// into static initialization order issues.
+	static SingletonHolder<ErrorHandler> sh;
+	return sh.get();
 }
 
 
diff --git a/base/poco/Foundation/src/Path_UNIX.cpp b/base/poco/Foundation/src/Path_UNIX.cpp
index fb2ed71622f..957a62db180 100644
--- a/base/poco/Foundation/src/Path_UNIX.cpp
+++ b/base/poco/Foundation/src/Path_UNIX.cpp
@@ -48,17 +48,25 @@ std::string PathImpl::currentImpl()
 std::string PathImpl::homeImpl()
 {
 	std::string path;
+#if defined(_POSIX_C_SOURCE) || defined(_BSD_SOURCE) || defined(_POSIX_C_SOURCE)
 	size_t buf_size = 1024;     // Same as glibc use for getpwuid
 	std::vector<char> buf(buf_size);
 	struct passwd res;
 	struct passwd* pwd = nullptr;
 
 	getpwuid_r(getuid(), &res, buf.data(), buf_size, &pwd);
+#else
+	struct passwd* pwd = getpwuid(getuid());
+#endif
 	if (pwd)
 		path = pwd->pw_dir;
 	else
 	{
+#if defined(_POSIX_C_SOURCE) || defined(_BSD_SOURCE) || defined(_POSIX_C_SOURCE)
 		getpwuid_r(getuid(), &res, buf.data(), buf_size, &pwd);
+#else
+		pwd = getpwuid(geteuid());
+#endif
 		if (pwd)
 			path = pwd->pw_dir;
 		else
@@ -74,7 +82,7 @@ std::string PathImpl::configHomeImpl()
 {
 	std::string path = PathImpl::homeImpl();
 	std::string::size_type n = path.size();
-	if (n > 0 && path[n - 1] == '/')
+	if (n > 0 && path[n - 1] == '/') 
 #if POCO_OS == POCO_OS_MAC_OS_X
 	  path.append("Library/Preferences/");
 #else
@@ -89,7 +97,7 @@ std::string PathImpl::dataHomeImpl()
 {
 	std::string path = PathImpl::homeImpl();
 	std::string::size_type n = path.size();
-	if (n > 0 && path[n - 1] == '/')
+	if (n > 0 && path[n - 1] == '/') 
 #if POCO_OS == POCO_OS_MAC_OS_X
 	  path.append("Library/Application Support/");
 #else
@@ -104,7 +112,7 @@ std::string PathImpl::cacheHomeImpl()
 {
 	std::string path = PathImpl::homeImpl();
 	std::string::size_type n = path.size();
-	if (n > 0 && path[n - 1] == '/')
+	if (n > 0 && path[n - 1] == '/') 
 #if POCO_OS == POCO_OS_MAC_OS_X
 	  path.append("Library/Caches/");
 #else
@@ -119,7 +127,7 @@ std::string PathImpl::tempHomeImpl()
 {
 	std::string path = PathImpl::homeImpl();
 	std::string::size_type n = path.size();
-	if (n > 0 && path[n - 1] == '/')
+	if (n > 0 && path[n - 1] == '/') 
 #if POCO_OS == POCO_OS_MAC_OS_X
 	  path.append("Library/Caches/");
 #else
@@ -151,7 +159,7 @@ std::string PathImpl::tempImpl()
 std::string PathImpl::configImpl()
 {
 	std::string path;
-
+	
 #if POCO_OS == POCO_OS_MAC_OS_X
 	  path = "/Library/Preferences/";
 #else
diff --git a/base/poco/MongoDB/src/Binary.cpp b/base/poco/MongoDB/src/Binary.cpp
index 8b0e6baeccb..ea814d6969f 100644
--- a/base/poco/MongoDB/src/Binary.cpp
+++ b/base/poco/MongoDB/src/Binary.cpp
@@ -76,13 +76,13 @@ std::string Binary::toString(int indent) const
 
 UUID Binary::uuid() const
 {
-	if ((_subtype == 0x04 || _subtype == 0x03) && _buffer.size() == 16)
+	if (_subtype == 0x04 && _buffer.size() == 16)
 	{
 		UUID uuid;
 		uuid.copyFrom((const char*) _buffer.begin());
 		return uuid;
 	}
-	throw BadCastException("Invalid subtype: " + std::to_string(_subtype) + ", size: " + std::to_string(_buffer.size()));
+	throw BadCastException("Invalid subtype");
 }
 
 
diff --git a/base/poco/Net/include/Poco/Net/HTTPResponse.h b/base/poco/Net/include/Poco/Net/HTTPResponse.h
index 623dfb783f3..3c444c3d38c 100644
--- a/base/poco/Net/include/Poco/Net/HTTPResponse.h
+++ b/base/poco/Net/include/Poco/Net/HTTPResponse.h
@@ -18,9 +18,7 @@
 #define Net_HTTPResponse_INCLUDED
 
 
-#include <map>
 #include <vector>
-
 #include "Poco/Net/HTTPCookie.h"
 #include "Poco/Net/HTTPMessage.h"
 #include "Poco/Net/Net.h"
@@ -182,8 +180,6 @@ namespace Net
         /// May throw an exception in case of a malformed
         /// Set-Cookie header.
 
-        void getHeaders(std::map<std::string, std::string> & headers) const;
-
         void write(std::ostream & ostr) const;
         /// Writes the HTTP response to the given
         /// output stream.
diff --git a/base/poco/Net/include/Poco/Net/HTTPServerSession.h b/base/poco/Net/include/Poco/Net/HTTPServerSession.h
index b0659ca405c..3df7995509a 100644
--- a/base/poco/Net/include/Poco/Net/HTTPServerSession.h
+++ b/base/poco/Net/include/Poco/Net/HTTPServerSession.h
@@ -58,10 +58,6 @@ namespace Net
 
         void setKeepAliveTimeout(Poco::Timespan keepAliveTimeout);
 
-        size_t getKeepAliveTimeout() const { return _keepAliveTimeout.totalSeconds(); }
-
-        size_t getMaxKeepAliveRequests() const { return _maxKeepAliveRequests; }
-
     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 2038fd2aff5..cac14f479db 100644
--- a/base/poco/Net/include/Poco/Net/HTTPSession.h
+++ b/base/poco/Net/include/Poco/Net/HTTPSession.h
@@ -19,8 +19,6 @@
 
 
 #include <ios>
-#include <memory>
-#include <functional>
 #include "Poco/Any.h"
 #include "Poco/Buffer.h"
 #include "Poco/Exception.h"
@@ -35,27 +33,6 @@ namespace Net
 {
 
 
-    class IHTTPSessionDataHooks
-    /// Interface to control stream of data bytes being sent or received though socket by HTTPSession
-    /// It allows to monitor, throttle and schedule data streams with syscall granulatrity
-    {
-    public:
-        virtual ~IHTTPSessionDataHooks() = default;
-
-        virtual void atStart(int bytes) = 0;
-        /// Called before sending/receiving data `bytes` to/from socket.
-
-        virtual void atFinish(int bytes) = 0;
-        /// Called when sending/receiving of data `bytes` is successfully finished.
-
-        virtual void atFail() = 0;
-        /// If an error occurred during send/receive `fail()` is called instead of `finish()`.
-    };
-
-
-    using HTTPSessionDataHooksPtr = std::shared_ptr<IHTTPSessionDataHooks>;
-
-
     class Net_API HTTPSession
     /// HTTPSession implements basic HTTP session management
     /// for both HTTP clients and HTTP servers.
@@ -96,12 +73,6 @@ namespace Net
         Poco::Timespan getReceiveTimeout() const;
         /// Returns receive timeout for the HTTP session.
 
-        void setSendDataHooks(const HTTPSessionDataHooksPtr & sendDataHooks = {});
-        /// Sets data hooks that will be called on every sent to the socket.
-
-        void setReceiveDataHooks(const HTTPSessionDataHooksPtr & receiveDataHooks = {});
-        /// Sets data hooks that will be called on every receive from the socket.
-
         bool connected() const;
         /// Returns true if the underlying socket is connected.
 
@@ -240,10 +211,6 @@ namespace Net
         Poco::Exception * _pException;
         Poco::Any _data;
 
-        // Data hooks
-        HTTPSessionDataHooksPtr _sendDataHooks;
-        HTTPSessionDataHooksPtr _receiveDataHooks;
-
         friend class HTTPStreamBuf;
         friend class HTTPHeaderStreamBuf;
         friend class HTTPFixedLengthStreamBuf;
@@ -279,16 +246,6 @@ namespace Net
         return _receiveTimeout;
     }
 
-    inline void HTTPSession::setSendDataHooks(const HTTPSessionDataHooksPtr & sendDataHooks)
-    {
-        _sendDataHooks = sendDataHooks;
-    }
-
-    inline void HTTPSession::setReceiveDataHooks(const HTTPSessionDataHooksPtr & receiveDataHooks)
-    {
-        _receiveDataHooks = receiveDataHooks;
-    }
-
     inline StreamSocket & HTTPSession::socket()
     {
         return _socket;
diff --git a/base/poco/Net/src/HTTPResponse.cpp b/base/poco/Net/src/HTTPResponse.cpp
index 4d58d05a43e..e0017321595 100644
--- a/base/poco/Net/src/HTTPResponse.cpp
+++ b/base/poco/Net/src/HTTPResponse.cpp
@@ -209,15 +209,6 @@ void HTTPResponse::getCookies(std::vector<HTTPCookie>& cookies) const
 	}
 }
 
-void HTTPResponse::getHeaders(std::map<std::string, std::string> & headers) const
-{
-    headers.clear();
-    for (const auto & it : *this)
-    {
-        headers.emplace(it.first, it.second);
-    }
-}
-
 
 void HTTPResponse::write(std::ostream& ostr) const
 {
diff --git a/base/poco/Net/src/HTTPServerSession.cpp b/base/poco/Net/src/HTTPServerSession.cpp
index 8eec3e14872..f67a63a9e0e 100644
--- a/base/poco/Net/src/HTTPServerSession.cpp
+++ b/base/poco/Net/src/HTTPServerSession.cpp
@@ -19,11 +19,11 @@ namespace Poco {
 namespace Net {
 
 
-HTTPServerSession::HTTPServerSession(const StreamSocket & socket, HTTPServerParams::Ptr pParams)
-    : HTTPSession(socket, pParams->getKeepAlive())
-    , _firstRequest(true)
-    , _keepAliveTimeout(pParams->getKeepAliveTimeout())
-    , _maxKeepAliveRequests(pParams->getMaxKeepAliveRequests())
+HTTPServerSession::HTTPServerSession(const StreamSocket& socket, HTTPServerParams::Ptr pParams):
+	HTTPSession(socket, pParams->getKeepAlive()),
+	_firstRequest(true),
+	_keepAliveTimeout(pParams->getKeepAliveTimeout()),
+	_maxKeepAliveRequests(pParams->getMaxKeepAliveRequests())
 {
 	setTimeout(pParams->getTimeout());
 }
@@ -52,12 +52,11 @@ bool HTTPServerSession::hasMoreRequests()
 	}
 	else if (_maxKeepAliveRequests != 0 && getKeepAlive())
 	{
-        if (_maxKeepAliveRequests > 0)
-            --_maxKeepAliveRequests;
-        return buffered() > 0 || socket().poll(_keepAliveTimeout, Socket::SELECT_READ);
-    }
-    else
-        return false;
+		if (_maxKeepAliveRequests > 0) 
+			--_maxKeepAliveRequests;
+		return buffered() > 0 || socket().poll(_keepAliveTimeout, Socket::SELECT_READ);
+	}
+	else return false;
 }
 
 
diff --git a/base/poco/Net/src/HTTPSession.cpp b/base/poco/Net/src/HTTPSession.cpp
index f30ccb21129..8f951b3102c 100644
--- a/base/poco/Net/src/HTTPSession.cpp
+++ b/base/poco/Net/src/HTTPSession.cpp
@@ -128,14 +128,14 @@ int HTTPSession::get()
 {
 	if (_pCurrent == _pEnd)
 		refill();
-
+	
 	if (_pCurrent < _pEnd)
 		return *_pCurrent++;
 	else
 		return std::char_traits<char>::eof();
 }
 
-
+	
 int HTTPSession::peek()
 {
 	if (_pCurrent == _pEnd)
@@ -147,7 +147,7 @@ int HTTPSession::peek()
 		return std::char_traits<char>::eof();
 }
 
-
+	
 int HTTPSession::read(char* buffer, std::streamsize length)
 {
 	if (_pCurrent < _pEnd)
@@ -166,17 +166,10 @@ int HTTPSession::write(const char* buffer, std::streamsize length)
 {
 	try
 	{
-		if (_sendDataHooks)
-			_sendDataHooks->atStart((int) length);
-		int result = _socket.sendBytes(buffer, (int) length);
-		if (_sendDataHooks)
-			_sendDataHooks->atFinish(result);
-		return result;
+		return _socket.sendBytes(buffer, (int) length);
 	}
 	catch (Poco::Exception& exc)
 	{
-		if (_sendDataHooks)
-			_sendDataHooks->atFail();
 		setException(exc);
 		throw;
 	}
@@ -187,17 +180,10 @@ int HTTPSession::receive(char* buffer, int length)
 {
 	try
 	{
-		if (_receiveDataHooks)
-			_receiveDataHooks->atStart(length);
-		int result = _socket.receiveBytes(buffer, length);
-		if (_receiveDataHooks)
-			_receiveDataHooks->atFinish(result);
-		return result;
+		return _socket.receiveBytes(buffer, length);
 	}
 	catch (Poco::Exception& exc)
 	{
-		if (_receiveDataHooks)
-			_receiveDataHooks->atFail();
 		setException(exc);
 		throw;
 	}
diff --git a/base/poco/Net/src/SocketImpl.cpp b/base/poco/Net/src/SocketImpl.cpp
index dbde3f73330..484b8cfeec3 100644
--- a/base/poco/Net/src/SocketImpl.cpp
+++ b/base/poco/Net/src/SocketImpl.cpp
@@ -17,7 +17,6 @@
 #include "Poco/Net/StreamSocketImpl.h"
 #include "Poco/NumberFormatter.h"
 #include "Poco/Timestamp.h"
-#include "Poco/ErrorHandler.h"
 #include <string.h> // FD_SET needs memset on some platforms, so we can't use <cstring>
 
 
@@ -63,7 +62,7 @@ bool checkIsBrokenTimeout()
 
 SocketImpl::SocketImpl():
 	_sockfd(POCO_INVALID_SOCKET),
-	_blocking(true),
+	_blocking(true), 
 	_isBrokenTimeout(checkIsBrokenTimeout())
 {
 }
@@ -82,7 +81,7 @@ SocketImpl::~SocketImpl()
 	close();
 }
 
-
+	
 SocketImpl* SocketImpl::acceptConnection(SocketAddress& clientAddr)
 {
 	if (_sockfd == POCO_INVALID_SOCKET) throw InvalidSocketException();
@@ -118,7 +117,7 @@ void SocketImpl::connect(const SocketAddress& address)
 		rc = ::connect(_sockfd, address.addr(), address.length());
 	}
 	while (rc != 0 && lastError() == POCO_EINTR);
-	if (rc != 0)
+	if (rc != 0) 
 	{
 		int err = lastError();
 		error(err, address.toString());
@@ -205,7 +204,7 @@ void SocketImpl::bind6(const SocketAddress& address, bool reuseAddress, bool reu
 #if defined(POCO_HAVE_IPv6)
 	if (address.family() != SocketAddress::IPv6)
 		throw Poco::InvalidArgumentException("SocketAddress must be an IPv6 address");
-
+		
 	if (_sockfd == POCO_INVALID_SOCKET)
 	{
 		init(address.af());
@@ -226,11 +225,11 @@ void SocketImpl::bind6(const SocketAddress& address, bool reuseAddress, bool reu
 #endif
 }
 
-
+	
 void SocketImpl::listen(int backlog)
 {
 	if (_sockfd == POCO_INVALID_SOCKET) throw InvalidSocketException();
-
+	
 	int rc = ::listen(_sockfd, backlog);
 	if (rc != 0) error();
 }
@@ -254,7 +253,7 @@ void SocketImpl::shutdownReceive()
 	if (rc != 0) error();
 }
 
-
+	
 void SocketImpl::shutdownSend()
 {
 	if (_sockfd == POCO_INVALID_SOCKET) throw InvalidSocketException();
@@ -263,7 +262,7 @@ void SocketImpl::shutdownSend()
 	if (rc != 0) error();
 }
 
-
+	
 void SocketImpl::shutdown()
 {
 	if (_sockfd == POCO_INVALID_SOCKET) throw InvalidSocketException();
@@ -318,7 +317,7 @@ int SocketImpl::receiveBytes(void* buffer, int length, int flags)
 				throw TimeoutException();
 		}
 	}
-
+	
 	int rc;
 	do
 	{
@@ -326,7 +325,7 @@ int SocketImpl::receiveBytes(void* buffer, int length, int flags)
 		rc = ::recv(_sockfd, reinterpret_cast<char*>(buffer), length, flags);
 	}
 	while (blocking && rc < 0 && lastError() == POCO_EINTR);
-	if (rc < 0)
+	if (rc < 0) 
 	{
 		int err = lastError();
 		if ((err == POCO_EAGAIN || err == POCO_EWOULDBLOCK) && !blocking)
@@ -364,7 +363,7 @@ int SocketImpl::receiveFrom(void* buffer, int length, SocketAddress& address, in
 				throw TimeoutException();
 		}
 	}
-
+	
 	sockaddr_storage abuffer;
 	struct sockaddr* pSA = reinterpret_cast<struct sockaddr*>(&abuffer);
 	poco_socklen_t saLen = sizeof(abuffer);
@@ -451,7 +450,7 @@ bool SocketImpl::pollImpl(Poco::Timespan& remainingTime, int mode)
 	}
 	while (rc < 0 && lastError() == POCO_EINTR);
 	if (rc < 0) error();
-	return rc > 0;
+	return rc > 0; 
 
 #else
 
@@ -494,7 +493,7 @@ bool SocketImpl::pollImpl(Poco::Timespan& remainingTime, int mode)
 	}
 	while (rc < 0 && errorCode == POCO_EINTR);
 	if (rc < 0) error(errorCode);
-	return rc > 0;
+	return rc > 0; 
 
 #endif // POCO_HAVE_FD_POLL
 }
@@ -504,13 +503,13 @@ bool SocketImpl::poll(const Poco::Timespan& timeout, int mode)
 	Poco::Timespan remainingTime(timeout);
 	return pollImpl(remainingTime, mode);
 }
-
+	
 void SocketImpl::setSendBufferSize(int size)
 {
 	setOption(SOL_SOCKET, SO_SNDBUF, size);
 }
 
-
+	
 int SocketImpl::getSendBufferSize()
 {
 	int result;
@@ -524,7 +523,7 @@ void SocketImpl::setReceiveBufferSize(int size)
 	setOption(SOL_SOCKET, SO_RCVBUF, size);
 }
 
-
+	
 int SocketImpl::getReceiveBufferSize()
 {
 	int result;
@@ -570,7 +569,7 @@ Poco::Timespan SocketImpl::getReceiveTimeout()
 	return result;
 }
 
-
+	
 SocketAddress SocketImpl::address()
 {
 	if (_sockfd == POCO_INVALID_SOCKET) throw InvalidSocketException();
@@ -581,7 +580,7 @@ SocketAddress SocketImpl::address()
 	int rc = ::getsockname(_sockfd, pSA, &saLen);
 	if (rc == 0)
 		return SocketAddress(pSA, saLen);
-	else
+	else 
 		error();
 	return SocketAddress();
 }
diff --git a/base/poco/Net/src/TCPServer.cpp b/base/poco/Net/src/TCPServer.cpp
index b957829fb7d..9bdae900bd6 100644
--- a/base/poco/Net/src/TCPServer.cpp
+++ b/base/poco/Net/src/TCPServer.cpp
@@ -8,7 +8,7 @@
 // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
 //
-// SPDX-License-Identifier:    BSL-1.0
+// SPDX-License-Identifier:	BSL-1.0
 //
 
 
@@ -44,194 +44,190 @@ TCPServerConnectionFilter::~TCPServerConnectionFilter()
 
 
 TCPServer::TCPServer(TCPServerConnectionFactory::Ptr pFactory, Poco::UInt16 portNumber, TCPServerParams::Ptr pParams):
-    _socket(ServerSocket(portNumber)),
-    _thread(threadName(_socket)),
-    _stopped(true)
-{    
-    Poco::ThreadPool& pool = Poco::ThreadPool::defaultPool();
-    if (pParams)
-    {
-        int toAdd = pParams->getMaxThreads() - pool.capacity();
-        if (toAdd > 0) pool.addCapacity(toAdd);
-    }
-    _pDispatcher = new TCPServerDispatcher(pFactory, pool, pParams);
-    
+	_socket(ServerSocket(portNumber)),
+	_thread(threadName(_socket)),
+	_stopped(true)
+{	
+	Poco::ThreadPool& pool = Poco::ThreadPool::defaultPool();
+	if (pParams)
+	{
+		int toAdd = pParams->getMaxThreads() - pool.capacity();
+		if (toAdd > 0) pool.addCapacity(toAdd);
+	}
+	_pDispatcher = new TCPServerDispatcher(pFactory, pool, pParams);
+	
 }
 
 
 TCPServer::TCPServer(TCPServerConnectionFactory::Ptr pFactory, const ServerSocket& socket, TCPServerParams::Ptr pParams):
-    _socket(socket),
-    _thread(threadName(socket)),
-    _stopped(true)
+	_socket(socket),
+	_thread(threadName(socket)),
+	_stopped(true)
 {
-    Poco::ThreadPool& pool = Poco::ThreadPool::defaultPool();
-    if (pParams)
-    {
-        int toAdd = pParams->getMaxThreads() - pool.capacity();
-        if (toAdd > 0) pool.addCapacity(toAdd);
-    }
-    _pDispatcher = new TCPServerDispatcher(pFactory, pool, pParams);
+	Poco::ThreadPool& pool = Poco::ThreadPool::defaultPool();
+	if (pParams)
+	{
+		int toAdd = pParams->getMaxThreads() - pool.capacity();
+		if (toAdd > 0) pool.addCapacity(toAdd);
+	}
+	_pDispatcher = new TCPServerDispatcher(pFactory, pool, pParams);
 }
 
 
 TCPServer::TCPServer(TCPServerConnectionFactory::Ptr pFactory, Poco::ThreadPool& threadPool, const ServerSocket& socket, TCPServerParams::Ptr pParams):
-    _socket(socket),
-    _pDispatcher(new TCPServerDispatcher(pFactory, threadPool, pParams)),
-    _thread(threadName(socket)),
-    _stopped(true)
+	_socket(socket),
+	_pDispatcher(new TCPServerDispatcher(pFactory, threadPool, pParams)),
+	_thread(threadName(socket)),
+	_stopped(true)
 {
 }
 
 
 TCPServer::~TCPServer()
 {
-    try
-    {
-        stop();
-        _pDispatcher->release();
-    }
-    catch (...)
-    {
-        poco_unexpected();
-    }
+	try
+	{
+		stop();
+		_pDispatcher->release();
+	}
+	catch (...)
+	{
+		poco_unexpected();
+	}
 }
 
 
 const TCPServerParams& TCPServer::params() const
 {
-    return _pDispatcher->params();
+	return _pDispatcher->params();
 }
 
 
 void TCPServer::start()
 {
-    poco_assert (_stopped);
+	poco_assert (_stopped);
 
-    _stopped = false;
-    _thread.start(*this);
+	_stopped = false;
+	_thread.start(*this);
 }
 
-    
+	
 void TCPServer::stop()
 {
-    if (!_stopped)
-    {
-        _stopped = true;
-        _thread.join();
-        _pDispatcher->stop();
-    }
+	if (!_stopped)
+	{
+		_stopped = true;
+		_thread.join();
+		_pDispatcher->stop();
+	}
 }
 
 
 void TCPServer::run()
 {
-    while (!_stopped)
-    {
-        Poco::Timespan timeout(250000);
-        try
-        {
-            if (_socket.poll(timeout, Socket::SELECT_READ))
-            {
-                try
-                {
-                    StreamSocket ss = _socket.acceptConnection();
-                    
-                    if (!_pConnectionFilter || _pConnectionFilter->accept(ss))
-                    {
-                        // enable nodelay per default: OSX really needs that
+	while (!_stopped)
+	{
+		Poco::Timespan timeout(250000);
+		try
+		{
+			if (_socket.poll(timeout, Socket::SELECT_READ))
+			{
+				try
+				{
+					StreamSocket ss = _socket.acceptConnection();
+					
+					if (!_pConnectionFilter || _pConnectionFilter->accept(ss))
+					{
+						// enable nodelay per default: OSX really needs that
 #if defined(POCO_OS_FAMILY_UNIX)
-                        if (ss.address().family() != AddressFamily::UNIX_LOCAL)
+						if (ss.address().family() != AddressFamily::UNIX_LOCAL)
 #endif
-                        {
-                            ss.setNoDelay(true);
-                        }
-                        _pDispatcher->enqueue(ss);
-                    }
-                    else
-                    {
-                        ErrorHandler::logMessage(Message::PRIO_WARNING, "Filtered out connection from " + ss.peerAddress().toString());
-                    }
-                }
-                catch (Poco::Exception& exc)
-                {
-                    ErrorHandler::handle(exc);
-                }
-                catch (std::exception& exc)
-                {
-                    ErrorHandler::handle(exc);
-                }
-                catch (...)
-                {
-                    ErrorHandler::handle();
-                }
-            }
-        }
-        catch (Poco::Exception& exc)
-        {
-            ErrorHandler::handle(exc);
-            // possibly a resource issue since poll() failed;
-            // give some time to recover before trying again
-            Poco::Thread::sleep(50); 
-        }
-    }
+						{
+							ss.setNoDelay(true);
+						}
+						_pDispatcher->enqueue(ss);
+					}
+				}
+				catch (Poco::Exception& exc)
+				{
+					ErrorHandler::handle(exc);
+				}
+				catch (std::exception& exc)
+				{
+					ErrorHandler::handle(exc);
+				}
+				catch (...)
+				{
+					ErrorHandler::handle();
+				}
+			}
+		}
+		catch (Poco::Exception& exc)
+		{
+			ErrorHandler::handle(exc);
+			// possibly a resource issue since poll() failed;
+			// give some time to recover before trying again
+			Poco::Thread::sleep(50); 
+		}
+	}
 }
 
 
 int TCPServer::currentThreads() const
 {
-    return _pDispatcher->currentThreads();
+	return _pDispatcher->currentThreads();
 }
 
 
 int TCPServer::maxThreads() const
 {
-    return _pDispatcher->maxThreads();
+	return _pDispatcher->maxThreads();
 }
 
-    
+	
 int TCPServer::totalConnections() const
 {
-    return _pDispatcher->totalConnections();
+	return _pDispatcher->totalConnections();
 }
 
 
 int TCPServer::currentConnections() const
 {
-    return _pDispatcher->currentConnections();
+	return _pDispatcher->currentConnections();
 }
 
 
 int TCPServer::maxConcurrentConnections() const
 {
-    return _pDispatcher->maxConcurrentConnections();
+	return _pDispatcher->maxConcurrentConnections();
 }
 
-    
+	
 int TCPServer::queuedConnections() const
 {
-    return _pDispatcher->queuedConnections();
+	return _pDispatcher->queuedConnections();
 }
 
 
 int TCPServer::refusedConnections() const
 {
-    return _pDispatcher->refusedConnections();
+	return _pDispatcher->refusedConnections();
 }
 
 
 void TCPServer::setConnectionFilter(const TCPServerConnectionFilter::Ptr& pConnectionFilter)
 {
-    poco_assert (_stopped);
+	poco_assert (_stopped);
 
-    _pConnectionFilter = pConnectionFilter;
+	_pConnectionFilter = pConnectionFilter;
 }
 
 
 std::string TCPServer::threadName(const ServerSocket& socket)
 {
-    std::string name("TCPServer: ");
-    name.append(socket.address().toString());
-    return name;
+	std::string name("TCPServer: ");
+	name.append(socket.address().toString());
+	return name;
 
 }
 
diff --git a/base/poco/Net/src/TCPServerDispatcher.cpp b/base/poco/Net/src/TCPServerDispatcher.cpp
index 9ca7c271e63..7f9f9a20ee7 100644
--- a/base/poco/Net/src/TCPServerDispatcher.cpp
+++ b/base/poco/Net/src/TCPServerDispatcher.cpp
@@ -8,7 +8,7 @@
 // Copyright (c) 2005-2007, Applied Informatics Software Engineering GmbH.
 // and Contributors.
 //
-// SPDX-License-Identifier:    BSL-1.0
+// SPDX-License-Identifier:	BSL-1.0
 //
 
 
@@ -33,44 +33,44 @@ namespace Net {
 class TCPConnectionNotification: public Notification
 {
 public:
-    TCPConnectionNotification(const StreamSocket& socket):
-        _socket(socket)
-    {
-    }
-    
-    ~TCPConnectionNotification()
-    {
-    }
-    
-    const StreamSocket& socket() const
-    {
-        return _socket;
-    }
+	TCPConnectionNotification(const StreamSocket& socket):
+		_socket(socket)
+	{
+	}
+	
+	~TCPConnectionNotification()
+	{
+	}
+	
+	const StreamSocket& socket() const
+	{
+		return _socket;
+	}
 
 private:
-    StreamSocket _socket;
+	StreamSocket _socket;
 };
 
 
 TCPServerDispatcher::TCPServerDispatcher(TCPServerConnectionFactory::Ptr pFactory, Poco::ThreadPool& threadPool, TCPServerParams::Ptr pParams):
-    _rc(1),
-    _pParams(pParams),
-    _currentThreads(0),
-    _totalConnections(0),
-    _currentConnections(0),
-    _maxConcurrentConnections(0),
-    _refusedConnections(0),
-    _stopped(false),
-    _pConnectionFactory(pFactory),
-    _threadPool(threadPool)
+	_rc(1),
+	_pParams(pParams),
+	_currentThreads(0),
+	_totalConnections(0),
+	_currentConnections(0),
+	_maxConcurrentConnections(0),
+	_refusedConnections(0),
+	_stopped(false),
+	_pConnectionFactory(pFactory),
+	_threadPool(threadPool)
 {
-    poco_check_ptr (pFactory);
+	poco_check_ptr (pFactory);
 
-    if (!_pParams)
-        _pParams = new TCPServerParams;
-    
-    if (_pParams->getMaxThreads() == 0)
-        _pParams->setMaxThreads(threadPool.capacity());
+	if (!_pParams)
+		_pParams = new TCPServerParams;
+	
+	if (_pParams->getMaxThreads() == 0)
+		_pParams->setMaxThreads(threadPool.capacity());
 }
 
 
@@ -81,184 +81,161 @@ TCPServerDispatcher::~TCPServerDispatcher()
 
 void TCPServerDispatcher::duplicate()
 {
-    ++_rc;
+	++_rc;
 }
 
 
 void TCPServerDispatcher::release()
 {
-    if (--_rc == 0) delete this;
+	if (--_rc == 0) delete this;
 }
 
 
 void TCPServerDispatcher::run()
 {
-    AutoPtr<TCPServerDispatcher> guard(this); // ensure object stays alive
+	AutoPtr<TCPServerDispatcher> guard(this); // ensure object stays alive
 
-    int idleTime = (int) _pParams->getThreadIdleTime().totalMilliseconds();
+	int idleTime = (int) _pParams->getThreadIdleTime().totalMilliseconds();
 
-    for (;;)
-    {
-        try
-        {
-            AutoPtr<Notification> pNf = _queue.waitDequeueNotification(idleTime);
-            if (pNf && !_stopped)
-            {
-                TCPConnectionNotification* pCNf = dynamic_cast<TCPConnectionNotification*>(pNf.get());
-                if (pCNf)
-                {
-                    beginConnection();
-                    if (!_stopped)
-                    {
-                        std::unique_ptr<TCPServerConnection> pConnection(_pConnectionFactory->createConnection(pCNf->socket()));
-                        poco_check_ptr(pConnection.get());
-                        pConnection->start();
-                    }
-                    /// endConnection() should be called after destroying TCPServerConnection,
-                    /// otherwise currentConnections() could become zero while some connections are yet still alive.
-                    endConnection();
-                }
-            }
-        }
-        catch (Poco::Exception &exc) { ErrorHandler::handle(exc); }
-        catch (std::exception &exc)  { ErrorHandler::handle(exc); }
-        catch (...)                  { ErrorHandler::handle();    }
-        FastMutex::ScopedLock lock(_mutex);
-        if (_stopped || (_currentThreads > 1 && _queue.empty()))
-        {
-            --_currentThreads;
-            break;
-        }
-    }
+	for (;;)
+	{
+		try
+		{
+			AutoPtr<Notification> pNf = _queue.waitDequeueNotification(idleTime);
+			if (pNf && !_stopped)
+			{
+				TCPConnectionNotification* pCNf = dynamic_cast<TCPConnectionNotification*>(pNf.get());
+				if (pCNf)
+				{
+					beginConnection();
+					if (!_stopped)
+					{
+						std::unique_ptr<TCPServerConnection> pConnection(_pConnectionFactory->createConnection(pCNf->socket()));
+						poco_check_ptr(pConnection.get());
+						pConnection->start();
+					}
+					/// endConnection() should be called after destroying TCPServerConnection,
+					/// otherwise currentConnections() could become zero while some connections are yet still alive.
+					endConnection();
+				}
+			}
+		}
+		catch (Poco::Exception &exc) { ErrorHandler::handle(exc); }
+		catch (std::exception &exc)  { ErrorHandler::handle(exc); }
+		catch (...)                  { ErrorHandler::handle();    }
+		FastMutex::ScopedLock lock(_mutex);
+		if (_stopped || (_currentThreads > 1 && _queue.empty()))
+		{
+			--_currentThreads;
+			break;
+		}
+	}
 }
 
 
 namespace
 {
-    static const std::string threadName("TCPServerConnection");
+	static const std::string threadName("TCPServerConnection");
 }
 
-    
+	
 void TCPServerDispatcher::enqueue(const StreamSocket& socket)
 {
-    FastMutex::ScopedLock lock(_mutex);
+	FastMutex::ScopedLock lock(_mutex);
 
-    ErrorHandler::logMessage(Message::PRIO_TEST, "Queue size: " + std::to_string(_queue.size()) +
-                                 ", current threads: " + std::to_string(_currentThreads) +
-                                 ", threads in pool: " + std::to_string(_threadPool.allocated()) +
-                                 ", current connections: " + std::to_string(_currentConnections));
-
-
-    if (_queue.size() < _pParams->getMaxQueued())
-    {
-        /// NOTE: the condition below is wrong.
-        /// Since the thread pool is shared between multiple servers/TCPServerDispatchers,
-        /// _currentThreads < _pParams->getMaxThreads() will be true when the pool is actually saturated.
-        /// As a result, queue is useless and connections never wait in queue.
-        /// Instead, we (mistakenly) think that we can create a thread for this connection, but we fail to create it
-        /// and the connection get rejected.
-        /// We could check _currentThreads < _threadPool.allocated() to make it work,
-        /// but it's not clear if we want to make it work
-        /// because it may be better to reject connection immediately if we don't have resources to handle it.
-        if (!_queue.hasIdleThreads() && _currentThreads < _pParams->getMaxThreads())
-        {
-            try
-            {
+	if (_queue.size() < _pParams->getMaxQueued())
+	{
+		if (!_queue.hasIdleThreads() && _currentThreads < _pParams->getMaxThreads())
+		{
+			try
+			{
                 this->duplicate();
-                _threadPool.startWithPriority(_pParams->getThreadPriority(), *this, threadName);
-                ++_currentThreads;
-            }
-            catch (Poco::Exception& exc)
-            {
-                ErrorHandler::logMessage(Message::PRIO_WARNING, "Got an exception while starting thread for connection from " +
-                                             socket.peerAddress().toString());
-                ErrorHandler::handle(exc);
+				_threadPool.startWithPriority(_pParams->getThreadPriority(), *this, threadName);
+				++_currentThreads;
+			}
+			catch (Poco::Exception& exc)
+			{
                 this->release();
-                ++_refusedConnections;
-                return;
-            }
-        }
-        else if (!_queue.hasIdleThreads())
-        {
-            ErrorHandler::logMessage(Message::PRIO_TRACE, "Don't have idle threads, adding connection from " +
-                                         socket.peerAddress().toString() + " to the queue, size: " + std::to_string(_queue.size()));
-        }
-        _queue.enqueueNotification(new TCPConnectionNotification(socket));
-    }
-    else
-    {
-        ErrorHandler::logMessage(Message::PRIO_WARNING, "Refusing connection from " + socket.peerAddress().toString() +
-                                     ", reached max queue size " + std::to_string(_pParams->getMaxQueued()));
-        ++_refusedConnections;
-    }
+				++_refusedConnections;
+				std::cerr << "Got exception while starting thread for connection. Error code: "
+						  << exc.code() << ", message: '" << exc.displayText() << "'" << std::endl;
+				return;
+			}
+		}
+		_queue.enqueueNotification(new TCPConnectionNotification(socket));
+	}
+	else
+	{
+		++_refusedConnections;
+	}
 }
 
 
 void TCPServerDispatcher::stop()
 {
-    _stopped = true;
-    _queue.clear();
-    _queue.wakeUpAll();
+	_stopped = true;
+	_queue.clear();
+	_queue.wakeUpAll();
 }
 
 
 int TCPServerDispatcher::currentThreads() const
 {
-    return _currentThreads;
+	return _currentThreads;
 }
 
 int TCPServerDispatcher::maxThreads() const
 {
-    FastMutex::ScopedLock lock(_mutex);
-    
-    return _threadPool.capacity();
+	FastMutex::ScopedLock lock(_mutex);
+	
+	return _threadPool.capacity();
 }
 
 
 int TCPServerDispatcher::totalConnections() const
 {
-    return _totalConnections;
+	return _totalConnections;
 }
 
 
 int TCPServerDispatcher::currentConnections() const
 {
-    return _currentConnections;
+	return _currentConnections;
 }
 
 
 int TCPServerDispatcher::maxConcurrentConnections() const
 {
-    return _maxConcurrentConnections;
+	return _maxConcurrentConnections;
 }
 
 
 int TCPServerDispatcher::queuedConnections() const
 {
-    return _queue.size();
+	return _queue.size();
 }
 
 
 int TCPServerDispatcher::refusedConnections() const
 {
-    return _refusedConnections;
+	return _refusedConnections;
 }
 
 
 void TCPServerDispatcher::beginConnection()
 {
-    FastMutex::ScopedLock lock(_mutex);
+	FastMutex::ScopedLock lock(_mutex);
 
-    ++_totalConnections;
-    ++_currentConnections;
-    if (_currentConnections > _maxConcurrentConnections)
-        _maxConcurrentConnections.store(_currentConnections);
+	++_totalConnections;
+	++_currentConnections;
+	if (_currentConnections > _maxConcurrentConnections)
+		_maxConcurrentConnections.store(_currentConnections);
 }
 
 
 void TCPServerDispatcher::endConnection()
 {
-    --_currentConnections;
+	--_currentConnections;
 }
 
 
diff --git a/base/poco/NetSSL_OpenSSL/src/SecureSocketImpl.cpp b/base/poco/NetSSL_OpenSSL/src/SecureSocketImpl.cpp
index eaf267d8a8b..4873d259ae5 100644
--- a/base/poco/NetSSL_OpenSSL/src/SecureSocketImpl.cpp
+++ b/base/poco/NetSSL_OpenSSL/src/SecureSocketImpl.cpp
@@ -311,14 +311,6 @@ int SecureSocketImpl::sendBytes(const void* buffer, int length, int flags)
 	while (mustRetry(rc, remaining_time));
 	if (rc <= 0)
 	{
-		// At this stage we still can have last not yet received SSL message containing SSL error
-		// so make a read to force SSL to process possible SSL error
-		if (SSL_get_error(_pSSL, rc) == SSL_ERROR_SYSCALL && SocketImpl::lastError() == POCO_ECONNRESET)
-		{
-			char c = 0;
-			SSL_read(_pSSL, &c, 1);
-		}
-
 		rc = handleError(rc);
 		if (rc == 0) throw SSLConnectionUnexpectedlyClosedException();
 	}
diff --git a/base/poco/Util/CMakeLists.txt b/base/poco/Util/CMakeLists.txt
index 52b9155c32d..52da9730d67 100644
--- a/base/poco/Util/CMakeLists.txt
+++ b/base/poco/Util/CMakeLists.txt
@@ -18,4 +18,4 @@ target_compile_options (_poco_util
         -Wno-zero-as-null-pointer-constant
 )
 target_include_directories (_poco_util SYSTEM PUBLIC "include")
-target_link_libraries (_poco_util PUBLIC Poco::JSON Poco::XML Poco::Net)
+target_link_libraries (_poco_util PUBLIC Poco::JSON Poco::XML)
diff --git a/base/poco/Util/include/Poco/Util/AbstractConfiguration.h b/base/poco/Util/include/Poco/Util/AbstractConfiguration.h
index bae4a4d2d93..926ac3ba8a9 100644
--- a/base/poco/Util/include/Poco/Util/AbstractConfiguration.h
+++ b/base/poco/Util/include/Poco/Util/AbstractConfiguration.h
@@ -241,20 +241,6 @@ namespace Util
         /// If the value contains references to other properties (${<property>}), these
         /// are expanded.
 
-        std::string getHost(const std::string & key) const;
-        /// Returns the string value of the host property with the given name.
-        /// Throws a NotFoundException if the key does not exist.
-        /// Throws a SyntaxException if the property is not a valid host (IP address or domain).
-        /// If the value contains references to other properties (${<property>}), these
-        /// are expanded.
-
-        std::string getHost(const std::string & key, const std::string & defaultValue) const;
-        /// If a property with the given key exists, returns the host property's string value,
-        /// otherwise returns the given default value.
-        /// Throws a SyntaxException if the property is not a valid host (IP address or domain).
-        /// If the value contains references to other properties (${<property>}), these
-        /// are expanded.
-
         virtual void setString(const std::string & key, const std::string & value);
         /// Sets the property with the given key to the given value.
         /// An already existing value for the key is overwritten.
@@ -353,35 +339,12 @@ namespace Util
         static bool parseBool(const std::string & value);
         void setRawWithEvent(const std::string & key, std::string value);
 
-        static void checkHostValidity(const std::string & value);
-        /// Throws a SyntaxException if the value is not a valid host (IP address or domain).
-
         virtual ~AbstractConfiguration();
 
     private:
         std::string internalExpand(const std::string & value) const;
         std::string uncheckedExpand(const std::string & value) const;
 
-        static bool isValidIPv4Address(const std::string & value);
-        /// IPv4 address considered valid if it is "0.0.0.0" or one of those,
-        /// defined by inet_aton() or inet_addr()
-
-        static bool isValidIPv6Address(const std::string & value);
-        /// IPv6 address considered valid if it is "::" or one of those,
-        /// defined by inet_pton() with AF_INET6 flag
-        /// (in this case it may have scope id and may be surrounded by '[', ']')
-
-        static bool isValidDomainName(const std::string & value);
-        /// <domain> ::= <subdomain> [ "." ]
-        /// <subdomain> ::= <label> | <subdomain> "." <label>
-        /// <label> ::= <letter> [ [ <ldh-str> ] <let-dig> ]
-        /// <ldh-str> ::= <let-dig-hyp> | <let-dig-hyp> <ldh-str>
-        /// <let-dig-hyp> ::= <let-dig> | "-"
-        /// <let-dig> ::= <letter> | <digit>
-        /// <letter> ::= any one of the 52 alphabetic characters A through Z in
-        /// upper case and a through z in lower case
-        /// <digit> ::= any one of the ten digits 0 through 9
-
         AbstractConfiguration(const AbstractConfiguration &);
         AbstractConfiguration & operator=(const AbstractConfiguration &);
 
diff --git a/base/poco/Util/include/Poco/Util/Application.h b/base/poco/Util/include/Poco/Util/Application.h
index 786e331fe73..c8d18e1bce9 100644
--- a/base/poco/Util/include/Poco/Util/Application.h
+++ b/base/poco/Util/include/Poco/Util/Application.h
@@ -261,11 +261,6 @@ namespace Util
         ///
         /// Throws a NullPointerException if no Application instance exists.
 
-        static Application * instanceRawPtr();
-        /// Returns a raw pointer to the Application singleton.
-        ///
-        /// The caller should check whether the result is nullptr.
-
         const Poco::Timestamp & startTime() const;
         /// Returns the application start time (UTC).
 
@@ -453,12 +448,6 @@ namespace Util
     }
 
 
-    inline Application * Application::instanceRawPtr()
-    {
-        return _pInstance;
-    }
-
-
     inline const Poco::Timestamp & Application::startTime() const
     {
         return _startTime;
diff --git a/base/poco/Util/src/AbstractConfiguration.cpp b/base/poco/Util/src/AbstractConfiguration.cpp
index bdde57b7b8b..2c892decd9a 100644
--- a/base/poco/Util/src/AbstractConfiguration.cpp
+++ b/base/poco/Util/src/AbstractConfiguration.cpp
@@ -18,7 +18,6 @@
 #include "Poco/NumberParser.h"
 #include "Poco/NumberFormatter.h"
 #include "Poco/String.h"
-#include "Poco/Net/IPAddressImpl.h"
 
 
 using Poco::Mutex;
@@ -264,41 +263,6 @@ bool AbstractConfiguration::getBool(const std::string& key, bool defaultValue) c
 }
 
 
-std::string AbstractConfiguration::getHost(const std::string& key) const
-{
-	Mutex::ScopedLock lock(_mutex);
-
-	std::string value;
-	if (getRaw(key, value))
-	{
-		std::string expandedValue = internalExpand(value);
-		checkHostValidity(expandedValue);
-		return expandedValue;
-	}
-	else
-		throw NotFoundException(key);
-}
-
-
-std::string AbstractConfiguration::getHost(const std::string& key, const std::string& defaultValue) const
-{
-	Mutex::ScopedLock lock(_mutex);
-
-	std::string value;
-	if (getRaw(key, value))
-	{
-		std::string expandedValue = internalExpand(value);
-		checkHostValidity(expandedValue);
-		return expandedValue;
-	}
-	else
-	{
-		checkHostValidity(defaultValue);
-		return defaultValue;
-	}
-}
-
-
 void AbstractConfiguration::setString(const std::string& key, const std::string& value)
 {
 	setRawWithEvent(key, value);
@@ -565,68 +529,4 @@ void AbstractConfiguration::setRawWithEvent(const std::string& key, std::string
 }
 
 
-void AbstractConfiguration::checkHostValidity(const std::string& value)
-{
-	if (!isValidIPv4Address(value) && !isValidIPv6Address(value) && !isValidDomainName(value))
-	{
-		throw SyntaxException("Property is not a valid host name", value);
-	}
-}
-
-
-bool AbstractConfiguration::isValidIPv4Address(const std::string& value)
-{
-	using Poco::Net::Impl::IPv4AddressImpl;
-	IPv4AddressImpl empty4 = IPv4AddressImpl();
-
-	IPv4AddressImpl ipAddress = IPv4AddressImpl::parse(value);
-	return ipAddress != empty4 || value == "0.0.0.0";
-}
-
-
-bool AbstractConfiguration::isValidIPv6Address(const std::string& value)
-{
-#if defined(POCO_HAVE_IPv6)
-	using Poco::Net::Impl::IPv6AddressImpl;
-	IPv6AddressImpl empty6 = IPv6AddressImpl();
-
-	IPv6AddressImpl ipAddress = IPv6AddressImpl::parse(value);
-	return ipAddress != empty6 || value == "::";
-#else
-	return false;
-#endif
-}
-
-
-bool AbstractConfiguration::isValidDomainName(const std::string& value)
-{
-	if (value.empty() || value == "." || value.length() > 253)
-		return false;
-	int labelLength = 0;
-	char oldChar = 0;
-
-	for (char ch : value)
-	{
-		if (ch == '.')
-		{
-			if (labelLength == 0 || labelLength > 63 || oldChar == '-')
-				return false;
-			labelLength = 0;
-		}
-		else if (isalnum(ch) || ch == '-')
-		{
-			if (labelLength == 0 && (ch == '-' || isdigit(ch)))
-				return false;
-			++labelLength;
-		}
-		else
-		{
-			return false;
-		}
-		oldChar = ch;
-	}
-	return oldChar == '.' || (labelLength > 0 && labelLength <= 63 && oldChar != '-');
-}
-
-
 } } // namespace Poco::Util
diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt
index c82038804fe..9b4791ffc7f 100644
--- a/cmake/autogenerated_versions.txt
+++ b/cmake/autogenerated_versions.txt
@@ -2,11 +2,11 @@
 
 # NOTE: VERSION_REVISION has nothing common with DBMS_TCP_PROTOCOL_VERSION,
 # only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
-SET(VERSION_REVISION 54490)
+SET(VERSION_REVISION 54492)
 SET(VERSION_MAJOR 24)
-SET(VERSION_MINOR 9)
-SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH e02b434d2fc0c4fbee29ca675deab7474d274608)
-SET(VERSION_DESCRIBE v24.9.1.1-testing)
-SET(VERSION_STRING 24.9.1.1)
+SET(VERSION_MINOR 7)
+SET(VERSION_PATCH 7)
+SET(VERSION_GITHASH 7779883593a9f4e2e0a6a4bd43f712bdb457065d)
+SET(VERSION_DESCRIBE v24.7.7.1-stable)
+SET(VERSION_STRING 24.7.7.1)
 # end of autochange
diff --git a/cmake/freebsd/default_libs.cmake b/cmake/freebsd/default_libs.cmake
index 3f5b3829877..6bde75f8c9a 100644
--- a/cmake/freebsd/default_libs.cmake
+++ b/cmake/freebsd/default_libs.cmake
@@ -9,18 +9,10 @@ endif ()
 file(GLOB bprefix "/usr/local/llvm${COMPILER_VERSION_MAJOR}/lib/clang/${COMPILER_VERSION_MAJOR}/lib/${system_processor}-portbld-freebsd*/")
 message(STATUS "-Bprefix: ${bprefix}")
 
-execute_process(COMMAND
-    ${CMAKE_CXX_COMPILER} -Bprefix=${bprefix} --print-file-name=libclang_rt.builtins-${system_processor}.a
-    OUTPUT_VARIABLE BUILTINS_LIBRARY
-    COMMAND_ERROR_IS_FATAL ANY
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${CMAKE_CXX_COMPILER} -Bprefix=${bprefix} --print-file-name=libclang_rt.builtins-${system_processor}.a OUTPUT_VARIABLE BUILTINS_LIBRARY OUTPUT_STRIP_TRAILING_WHITESPACE)
 # --print-file-name simply prints what you passed in case of nothing was resolved, so let's try one other possible option
 if (BUILTINS_LIBRARY STREQUAL "libclang_rt.builtins-${system_processor}.a")
-    execute_process(COMMAND
-        ${CMAKE_CXX_COMPILER} -Bprefix=${bprefix} --print-file-name=libclang_rt.builtins.a
-        OUTPUT_VARIABLE BUILTINS_LIBRARY
-        COMMAND_ERROR_IS_FATAL ANY
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND ${CMAKE_CXX_COMPILER} -Bprefix=${bprefix} --print-file-name=libclang_rt.builtins.a OUTPUT_VARIABLE BUILTINS_LIBRARY OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()
 if (BUILTINS_LIBRARY STREQUAL "libclang_rt.builtins.a")
     message(FATAL_ERROR "libclang_rt.builtins had not been found")
diff --git a/cmake/freebsd/toolchain-x86_64.cmake b/cmake/freebsd/toolchain-x86_64.cmake
index 4d814693b39..4635880b4a6 100644
--- a/cmake/freebsd/toolchain-x86_64.cmake
+++ b/cmake/freebsd/toolchain-x86_64.cmake
@@ -8,7 +8,4 @@ set (CMAKE_CXX_COMPILER_TARGET "x86_64-pc-freebsd11")
 set (CMAKE_ASM_COMPILER_TARGET "x86_64-pc-freebsd11")
 set (CMAKE_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/freebsd-x86_64")
 
-# dprintf is used in a patched version of replxx
-add_compile_definitions(_WITH_DPRINTF)
-
 set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)  # disable linkage check - it doesn't work in CMake
diff --git a/cmake/linux/default_libs.cmake b/cmake/linux/default_libs.cmake
index 51620bc9f33..4a06243243e 100644
--- a/cmake/linux/default_libs.cmake
+++ b/cmake/linux/default_libs.cmake
@@ -5,11 +5,7 @@ set (DEFAULT_LIBS "-nodefaultlibs")
 
 # We need builtins from Clang's RT even without libcxx - for ubsan+int128.
 # See https://bugs.llvm.org/show_bug.cgi?id=16404
-execute_process (COMMAND
-    ${CMAKE_CXX_COMPILER} --target=${CMAKE_CXX_COMPILER_TARGET} --print-libgcc-file-name --rtlib=compiler-rt
-    OUTPUT_VARIABLE BUILTINS_LIBRARY
-    COMMAND_ERROR_IS_FATAL ANY
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process (COMMAND ${CMAKE_CXX_COMPILER} --target=${CMAKE_CXX_COMPILER_TARGET} --print-libgcc-file-name --rtlib=compiler-rt OUTPUT_VARIABLE BUILTINS_LIBRARY OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 # Apparently, in clang-19, the UBSan support library for C++ was moved out into ubsan_standalone_cxx.a, so we have to include both.
 if (SANITIZE STREQUAL undefined)
diff --git a/cmake/sanitize.cmake b/cmake/sanitize.cmake
index 091e20e1387..08716c1196b 100644
--- a/cmake/sanitize.cmake
+++ b/cmake/sanitize.cmake
@@ -57,8 +57,7 @@ option(WITH_COVERAGE "Instrumentation for code coverage with default implementat
 
 if (WITH_COVERAGE)
     message (STATUS "Enabled instrumentation for code coverage")
-    set (COVERAGE_FLAGS -fprofile-instr-generate -fcoverage-mapping)
-    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
+    set(COVERAGE_FLAGS "-fprofile-instr-generate -fcoverage-mapping")
 endif()
 
 option (SANITIZE_COVERAGE "Instrumentation for code coverage with custom callbacks" OFF)
diff --git a/cmake/tools.cmake b/cmake/tools.cmake
index 5c7da54b779..7aa5d4c51ce 100644
--- a/cmake/tools.cmake
+++ b/cmake/tools.cmake
@@ -5,11 +5,7 @@ if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif ()
 
 # Print details to output
-execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version
-    OUTPUT_VARIABLE COMPILER_SELF_IDENTIFICATION
-    COMMAND_ERROR_IS_FATAL ANY
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_VARIABLE COMPILER_SELF_IDENTIFICATION OUTPUT_STRIP_TRAILING_WHITESPACE)
 message (STATUS "Using compiler:\n${COMPILER_SELF_IDENTIFICATION}")
 
 # Require minimum compiler versions
diff --git a/cmake/utils.cmake b/cmake/utils.cmake
index a99d8e050a8..a318408098a 100644
--- a/cmake/utils.cmake
+++ b/cmake/utils.cmake
@@ -90,10 +90,7 @@ endfunction()
 
 # Function get_cmake_properties returns list of all propreties that cmake supports
 function(get_cmake_properties outvar)
-    execute_process(COMMAND cmake --help-property-list
-        OUTPUT_VARIABLE cmake_properties
-        COMMAND_ERROR_IS_FATAL ANY
-    )
+    execute_process(COMMAND cmake --help-property-list OUTPUT_VARIABLE cmake_properties)
     # Convert command output into a CMake list
     string(REGEX REPLACE ";" "\\\\;" cmake_properties "${cmake_properties}")
     string(REGEX REPLACE "\n" ";" cmake_properties "${cmake_properties}")
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index d7489bc5c0e..90ae5981a21 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -71,6 +71,7 @@ add_contrib (zlib-ng-cmake zlib-ng)
 add_contrib (bzip2-cmake bzip2)
 add_contrib (minizip-ng-cmake minizip-ng)
 add_contrib (snappy-cmake snappy)
+add_contrib (rocksdb-cmake rocksdb)
 add_contrib (thrift-cmake thrift)
 # parquet/arrow/orc
 add_contrib (arrow-cmake arrow) # requires: snappy, thrift, double-conversion
@@ -147,7 +148,6 @@ add_contrib (hive-metastore-cmake hive-metastore) # requires: thrift, avro, arro
 add_contrib (cppkafka-cmake cppkafka)
 add_contrib (libpqxx-cmake libpqxx)
 add_contrib (libpq-cmake libpq)
-add_contrib (rocksdb-cmake rocksdb) # requires: jemalloc, snappy, zlib, lz4, zstd, liburing
 add_contrib (nuraft-cmake NuRaft)
 add_contrib (fast_float-cmake fast_float)
 add_contrib (idna-cmake idna)
@@ -179,7 +179,7 @@ else()
     message(STATUS "Not using QPL")
 endif ()
 
-if (OS_LINUX AND ARCH_AMD64 AND NOT NO_SSE3_OR_HIGHER)
+if (OS_LINUX AND ARCH_AMD64)
     option (ENABLE_QATLIB "Enable Intel® QuickAssist Technology Library (QATlib)" ${ENABLE_LIBRARIES})
 elseif(ENABLE_QATLIB)
     message (${RECONFIGURE_MESSAGE_LEVEL} "QATLib is only supported on x86_64")
@@ -205,12 +205,14 @@ add_contrib (morton-nd-cmake morton-nd)
 if (ARCH_S390X)
     add_contrib(crc32-s390x-cmake crc32-s390x)
 endif()
+add_contrib (annoy-cmake annoy)
 
-option(ENABLE_USEARCH "Enable USearch" ${ENABLE_LIBRARIES})
+option(ENABLE_USEARCH "Enable USearch (Approximate Neighborhood Search, HNSW) support" ${ENABLE_LIBRARIES})
 if (ENABLE_USEARCH)
     add_contrib (FP16-cmake FP16)
+    add_contrib (robin-map-cmake robin-map)
     add_contrib (SimSIMD-cmake SimSIMD)
-    add_contrib (usearch-cmake usearch) # requires: FP16, SimdSIMD
+    add_contrib (usearch-cmake usearch) # requires: FP16, robin-map, SimdSIMD
 else ()
     message(STATUS "Not using USearch")
 endif ()
@@ -228,8 +230,6 @@ add_contrib (libssh-cmake libssh)
 
 add_contrib (prometheus-protobufs-cmake prometheus-protobufs prometheus-protobufs-gogo)
 
-add_contrib(numactl-cmake numactl)
-
 # Put all targets defined here and in subdirectories under "contrib/<immediate-subdir>" folders in GUI-based IDEs.
 # Some of third-party projects may override CMAKE_FOLDER or FOLDER property of their targets, so they would not appear
 # in "contrib/..." as originally planned, so we workaround this by fixing FOLDER properties of all targets manually,
diff --git a/contrib/NuRaft b/contrib/NuRaft
index c2b0811f164..cb5dc3c906e 160000
--- a/contrib/NuRaft
+++ b/contrib/NuRaft
@@ -1 +1 @@
-Subproject commit c2b0811f164a7948208489562dab4f186eb305ce
+Subproject commit cb5dc3c906e80f253e9ce9535807caef827cc2e0
diff --git a/contrib/QAT-ZSTD-Plugin-cmake/CMakeLists.txt b/contrib/QAT-ZSTD-Plugin-cmake/CMakeLists.txt
index fc18092f574..72d21a8572b 100644
--- a/contrib/QAT-ZSTD-Plugin-cmake/CMakeLists.txt
+++ b/contrib/QAT-ZSTD-Plugin-cmake/CMakeLists.txt
@@ -27,7 +27,7 @@ if (ENABLE_QAT_OUT_OF_TREE_BUILD)
                 ${QAT_AL_INCLUDE_DIR}
                 ${QAT_USDM_INCLUDE_DIR}
                 ${ZSTD_LIBRARY_DIR})
-    target_compile_definitions(_qatzstd_plugin PRIVATE -DDEBUGLEVEL=0)
+    target_compile_definitions(_qatzstd_plugin PRIVATE -DDEBUGLEVEL=0 PUBLIC -DENABLE_ZSTD_QAT_CODEC)
     add_library (ch_contrib::qatzstd_plugin ALIAS _qatzstd_plugin)
 else () # In-tree build
     message(STATUS "Intel QATZSTD in-tree build")
@@ -78,7 +78,7 @@ else () # In-tree build
         ${QAT_USDM_INCLUDE_DIR}
         ${ZSTD_LIBRARY_DIR}
         ${LIBQAT_HEADER_DIR})
-    target_compile_definitions(_qatzstd_plugin PRIVATE -DDEBUGLEVEL=0 PUBLIC -DINTREE)
+    target_compile_definitions(_qatzstd_plugin PRIVATE -DDEBUGLEVEL=0 PUBLIC -DENABLE_ZSTD_QAT_CODEC -DINTREE)
     target_include_directories(_qatzstd_plugin SYSTEM PUBLIC $<BUILD_INTERFACE:${QATZSTD_SRC_DIR}> $<INSTALL_INTERFACE:include>)
     add_library (ch_contrib::qatzstd_plugin ALIAS _qatzstd_plugin)
 endif ()
diff --git a/contrib/SimSIMD b/contrib/SimSIMD
index 91a76d1ac51..de2cb75b9e9 160000
--- a/contrib/SimSIMD
+++ b/contrib/SimSIMD
@@ -1 +1 @@
-Subproject commit 91a76d1ac519b3b9dc8957734a3dabd985f00c26
+Subproject commit de2cb75b9e9e3389d5e1e51fd9f8ed151f3c17cf
diff --git a/contrib/annoy b/contrib/annoy
new file mode 160000
index 00000000000..f2ac8e7b48f
--- /dev/null
+++ b/contrib/annoy
@@ -0,0 +1 @@
+Subproject commit f2ac8e7b48f9a9cf676d3b58286e5455aba8e956
diff --git a/contrib/annoy-cmake/CMakeLists.txt b/contrib/annoy-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..bdef7d92132
--- /dev/null
+++ b/contrib/annoy-cmake/CMakeLists.txt
@@ -0,0 +1,24 @@
+option(ENABLE_ANNOY "Enable Annoy index support" ${ENABLE_LIBRARIES})
+
+# Annoy index should be disabled with undefined sanitizer. Because of memory storage optimizations
+# (https://github.com/ClickHouse/annoy/blob/9d8a603a4cd252448589e84c9846f94368d5a289/src/annoylib.h#L442-L463)
+# UBSan fails and leads to crash. Simmilar issue is already opened in Annoy repo
+# https://github.com/spotify/annoy/issues/456
+# Problem with aligment can lead to errors like
+# (https://stackoverflow.com/questions/46790550/c-undefined-behavior-strict-aliasing-rule-or-incorrect-alignment)
+# or will lead to crash on arm https://developer.arm.com/documentation/ka003038/latest
+# This issues should be resolved before annoy became non-experimental (--> setting "allow_experimental_annoy_index")
+if ((NOT ENABLE_ANNOY) OR (SANITIZE STREQUAL "undefined") OR (ARCH_AARCH64))
+    message (STATUS "Not using annoy")
+    return()
+endif()
+
+set(ANNOY_PROJECT_DIR "${ClickHouse_SOURCE_DIR}/contrib/annoy")
+set(ANNOY_SOURCE_DIR "${ANNOY_PROJECT_DIR}/src")
+
+add_library(_annoy INTERFACE)
+target_include_directories(_annoy SYSTEM INTERFACE ${ANNOY_SOURCE_DIR})
+
+add_library(ch_contrib::annoy ALIAS _annoy)
+target_compile_definitions(_annoy INTERFACE ENABLE_ANNOY)
+target_compile_definitions(_annoy INTERFACE ANNOYLIB_MULTITHREADED_BUILD)
diff --git a/contrib/aws b/contrib/aws
index d5450d76abd..1c2946bfcb7 160000
--- a/contrib/aws
+++ b/contrib/aws
@@ -1 +1 @@
-Subproject commit d5450d76abda556ce145ddabe7e0cc6a7644ec59
+Subproject commit 1c2946bfcb7f1e3ae0a858de0b59d4f1a7b4ccaf
diff --git a/contrib/aws-crt-cpp b/contrib/aws-crt-cpp
index e5aa45cacfd..f532d6abc0d 160000
--- a/contrib/aws-crt-cpp
+++ b/contrib/aws-crt-cpp
@@ -1 +1 @@
-Subproject commit e5aa45cacfdcda7719ead38760e7c61076f5745f
+Subproject commit f532d6abc0d2b0d8b5d6fe9e7c51eaedbe4afbd0
diff --git a/contrib/azure b/contrib/azure
index 67272b7ee0a..ea3e19a7be0 160000
--- a/contrib/azure
+++ b/contrib/azure
@@ -1 +1 @@
-Subproject commit 67272b7ee0adff6b69921b26eb071ba1a353062c
+Subproject commit ea3e19a7be08519134c643177d56c7484dfec884
diff --git a/contrib/cctz-cmake/CMakeLists.txt b/contrib/cctz-cmake/CMakeLists.txt
index fadf948b053..7161f743de1 100644
--- a/contrib/cctz-cmake/CMakeLists.txt
+++ b/contrib/cctz-cmake/CMakeLists.txt
@@ -37,9 +37,7 @@ message(STATUS "Packaging with tzdata version: ${TZDATA_VERSION}")
 execute_process(COMMAND
     bash -c "cd ${TZDIR} && find * -type f -and ! -name '*.tab' -and ! -name 'localtime' | LC_ALL=C sort | paste -sd ';' -"
     OUTPUT_STRIP_TRAILING_WHITESPACE
-    OUTPUT_VARIABLE TIMEZONES
-    COMMAND_ERROR_IS_FATAL ANY
-)
+    OUTPUT_VARIABLE TIMEZONES)
 
 file(APPEND ${TIMEZONES_FILE} "// autogenerated by ClickHouse/contrib/cctz-cmake/CMakeLists.txt\n")
 file(APPEND ${TIMEZONES_FILE} "#include <incbin.h>\n")
diff --git a/contrib/curl b/contrib/curl
index 83bedbd730d..de7b3e89218 160000
--- a/contrib/curl
+++ b/contrib/curl
@@ -1 +1 @@
-Subproject commit 83bedbd730d62b83744cc26fa0433d3f6e2e4cd6
+Subproject commit de7b3e89218467159a7af72d58cea8425946e97d
diff --git a/contrib/datasketches-cpp-cmake/CMakeLists.txt b/contrib/datasketches-cpp-cmake/CMakeLists.txt
index 497d6956d0e..b12a88ad57b 100644
--- a/contrib/datasketches-cpp-cmake/CMakeLists.txt
+++ b/contrib/datasketches-cpp-cmake/CMakeLists.txt
@@ -9,7 +9,6 @@ set(DATASKETCHES_LIBRARY theta)
 add_library(_datasketches INTERFACE)
 target_include_directories(_datasketches SYSTEM BEFORE INTERFACE
     "${ClickHouse_SOURCE_DIR}/contrib/datasketches-cpp/common/include"
-    "${ClickHouse_SOURCE_DIR}/contrib/datasketches-cpp/count/include"
     "${ClickHouse_SOURCE_DIR}/contrib/datasketches-cpp/theta/include")
 
 add_library(ch_contrib::datasketches ALIAS _datasketches)
diff --git a/contrib/google-protobuf-cmake/CMakeLists.txt b/contrib/google-protobuf-cmake/CMakeLists.txt
index f1a744f851f..e44f737cfc3 100644
--- a/contrib/google-protobuf-cmake/CMakeLists.txt
+++ b/contrib/google-protobuf-cmake/CMakeLists.txt
@@ -359,9 +359,7 @@ else ()
 
         execute_process(
             COMMAND mkdir -p ${PROTOC_BUILD_DIR}
-            COMMAND_ECHO STDOUT
-            COMMAND_ERROR_IS_FATAL ANY
-        )
+            COMMAND_ECHO STDOUT)
 
         execute_process(
             COMMAND ${CMAKE_COMMAND}
@@ -377,15 +375,11 @@ else ()
                 "-DABSL_ENABLE_INSTALL=0"
                 "${protobuf_source_dir}"
             WORKING_DIRECTORY "${PROTOC_BUILD_DIR}"
-            COMMAND_ECHO STDOUT
-            COMMAND_ERROR_IS_FATAL ANY
-        )
+            COMMAND_ECHO STDOUT)
 
         execute_process(
             COMMAND ${CMAKE_COMMAND} --build "${PROTOC_BUILD_DIR}"
-            COMMAND_ECHO STDOUT
-            COMMAND_ERROR_IS_FATAL ANY
-        )
+            COMMAND_ECHO STDOUT)
     endif ()
 
     add_executable(protoc IMPORTED GLOBAL)
diff --git a/contrib/grpc b/contrib/grpc
index 7bc3abe952a..1716359d2e2 160000
--- a/contrib/grpc
+++ b/contrib/grpc
@@ -1 +1 @@
-Subproject commit 7bc3abe952aba1dc7bce7f2f790dc781cb51a41e
+Subproject commit 1716359d2e28d304a250f9df0e6c0ccad03de8db
diff --git a/contrib/grpc-cmake/CMakeLists.txt b/contrib/grpc-cmake/CMakeLists.txt
index 975774d1990..1c0bf41ff78 100644
--- a/contrib/grpc-cmake/CMakeLists.txt
+++ b/contrib/grpc-cmake/CMakeLists.txt
@@ -51,9 +51,8 @@ if (NOT CMAKE_HOST_SYSTEM_NAME STREQUAL CMAKE_SYSTEM_NAME
     set(OPENSSL_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/openssl-cmake")
 
     execute_process(
-        COMMAND mkdir -p ${OPENSSL_BUILD_DIR}
-        COMMAND_ECHO STDOUT
-        COMMAND_ERROR_IS_FATAL ANY
+      COMMAND mkdir -p ${OPENSSL_BUILD_DIR}
+      COMMAND_ECHO STDOUT
     )
 
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64|x86_64")
@@ -90,21 +89,15 @@ if (NOT CMAKE_HOST_SYSTEM_NAME STREQUAL CMAKE_SYSTEM_NAME
             "-DClickHouse_SOURCE_DIR=${ClickHouse_SOURCE_DIR}"
             "${OPENSSL_SOURCE_DIR}"
         WORKING_DIRECTORY "${OPENSSL_BUILD_DIR}"
-        COMMAND_ECHO STDOUT
-        COMMAND_ERROR_IS_FATAL ANY
-    )
+        COMMAND_ECHO STDOUT)
 
     execute_process(
         COMMAND ${CMAKE_COMMAND} --build "${OPENSSL_BUILD_DIR}"
-        COMMAND_ECHO STDOUT
-        COMMAND_ERROR_IS_FATAL ANY
-    )
+        COMMAND_ECHO STDOUT)
 
     execute_process(
         COMMAND ${CMAKE_COMMAND} --install "${OPENSSL_BUILD_DIR}"
-        COMMAND_ECHO STDOUT
-        COMMAND_ERROR_IS_FATAL ANY
-    )
+        COMMAND_ECHO STDOUT)
 
     # It's not important on which file we depend, we just want to specify right order
     add_library(openssl_for_grpc STATIC IMPORTED GLOBAL)
@@ -115,9 +108,8 @@ if (NOT CMAKE_HOST_SYSTEM_NAME STREQUAL CMAKE_SYSTEM_NAME
     set (GRPC_CPP_PLUGIN_BUILD_DIR "${_gRPC_BINARY_DIR}/build")
 
     execute_process(
-        COMMAND mkdir -p ${GRPC_CPP_PLUGIN_BUILD_DIR}
-        COMMAND_ECHO STDOUT
-        COMMAND_ERROR_IS_FATAL ANY
+      COMMAND mkdir -p ${GRPC_CPP_PLUGIN_BUILD_DIR}
+      COMMAND_ECHO STDOUT
     )
 
     set(abseil_source_dir "${ClickHouse_SOURCE_DIR}/contrib/abseil-cpp")
@@ -148,15 +140,11 @@ if (NOT CMAKE_HOST_SYSTEM_NAME STREQUAL CMAKE_SYSTEM_NAME
             "-DgRPC_SSL_PROVIDER=package"
             "${_gRPC_SOURCE_DIR}"
         WORKING_DIRECTORY "${GRPC_CPP_PLUGIN_BUILD_DIR}"
-        COMMAND_ECHO STDOUT
-        COMMAND_ERROR_IS_FATAL ANY
-    )
+        COMMAND_ECHO STDOUT)
 
     execute_process(
         COMMAND ${CMAKE_COMMAND} --build "${GRPC_CPP_PLUGIN_BUILD_DIR}"
-        COMMAND_ECHO STDOUT
-        COMMAND_ERROR_IS_FATAL ANY
-    )
+        COMMAND_ECHO STDOUT)
 
     add_executable(grpc_cpp_plugin IMPORTED GLOBAL)
     set_target_properties (grpc_cpp_plugin PROPERTIES IMPORTED_LOCATION "${GRPC_CPP_PLUGIN_BUILD_DIR}/grpc_cpp_plugin")
diff --git a/contrib/icu b/contrib/icu
index 4216173eeeb..a56dde820dc 160000
--- a/contrib/icu
+++ b/contrib/icu
@@ -1 +1 @@
-Subproject commit 4216173eeeb39c1d4caaa54a68860e800412d273
+Subproject commit a56dde820dc35665a66f2e9ee8ba58e75049b668
diff --git a/contrib/icu-cmake/CMakeLists.txt b/contrib/icu-cmake/CMakeLists.txt
index 5714fef8347..0a650f2bcc0 100644
--- a/contrib/icu-cmake/CMakeLists.txt
+++ b/contrib/icu-cmake/CMakeLists.txt
@@ -12,67 +12,167 @@ endif()
 set(ICU_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/icu/icu4c/source")
 set(ICUDATA_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/icudata/")
 
+set (CMAKE_CXX_STANDARD 17)
+
 # These lists of sources were generated from build log of the original ICU build system (configure + make).
 
 set(ICUUC_SOURCES
-"${ICU_SOURCE_DIR}/common/appendable.cpp"
-"${ICU_SOURCE_DIR}/common/bmpset.cpp"
-"${ICU_SOURCE_DIR}/common/brkeng.cpp"
-"${ICU_SOURCE_DIR}/common/brkiter.cpp"
-"${ICU_SOURCE_DIR}/common/bytesinkutil.cpp"
-"${ICU_SOURCE_DIR}/common/bytestream.cpp"
-"${ICU_SOURCE_DIR}/common/bytestrie.cpp"
-"${ICU_SOURCE_DIR}/common/bytestriebuilder.cpp"
-"${ICU_SOURCE_DIR}/common/bytestrieiterator.cpp"
-"${ICU_SOURCE_DIR}/common/caniter.cpp"
-"${ICU_SOURCE_DIR}/common/characterproperties.cpp"
-"${ICU_SOURCE_DIR}/common/chariter.cpp"
-"${ICU_SOURCE_DIR}/common/charstr.cpp"
-"${ICU_SOURCE_DIR}/common/cmemory.cpp"
-"${ICU_SOURCE_DIR}/common/cstr.cpp"
-"${ICU_SOURCE_DIR}/common/cstring.cpp"
-"${ICU_SOURCE_DIR}/common/cwchar.cpp"
-"${ICU_SOURCE_DIR}/common/dictbe.cpp"
-"${ICU_SOURCE_DIR}/common/dictionarydata.cpp"
-"${ICU_SOURCE_DIR}/common/dtintrv.cpp"
-"${ICU_SOURCE_DIR}/common/edits.cpp"
-"${ICU_SOURCE_DIR}/common/emojiprops.cpp"
 "${ICU_SOURCE_DIR}/common/errorcode.cpp"
-"${ICU_SOURCE_DIR}/common/filteredbrk.cpp"
-"${ICU_SOURCE_DIR}/common/filterednormalizer2.cpp"
-"${ICU_SOURCE_DIR}/common/icudataver.cpp"
-"${ICU_SOURCE_DIR}/common/icuplug.cpp"
-"${ICU_SOURCE_DIR}/common/loadednormalizer2impl.cpp"
-"${ICU_SOURCE_DIR}/common/localebuilder.cpp"
-"${ICU_SOURCE_DIR}/common/localematcher.cpp"
-"${ICU_SOURCE_DIR}/common/localeprioritylist.cpp"
-"${ICU_SOURCE_DIR}/common/locavailable.cpp"
-"${ICU_SOURCE_DIR}/common/locbased.cpp"
-"${ICU_SOURCE_DIR}/common/locdispnames.cpp"
-"${ICU_SOURCE_DIR}/common/locdistance.cpp"
-"${ICU_SOURCE_DIR}/common/locdspnm.cpp"
-"${ICU_SOURCE_DIR}/common/locid.cpp"
-"${ICU_SOURCE_DIR}/common/loclikely.cpp"
-"${ICU_SOURCE_DIR}/common/loclikelysubtags.cpp"
-"${ICU_SOURCE_DIR}/common/locmap.cpp"
-"${ICU_SOURCE_DIR}/common/locresdata.cpp"
-"${ICU_SOURCE_DIR}/common/locutil.cpp"
-"${ICU_SOURCE_DIR}/common/lsr.cpp"
-"${ICU_SOURCE_DIR}/common/lstmbe.cpp"
-"${ICU_SOURCE_DIR}/common/messagepattern.cpp"
-"${ICU_SOURCE_DIR}/common/mlbe.cpp"
-"${ICU_SOURCE_DIR}/common/normalizer2.cpp"
-"${ICU_SOURCE_DIR}/common/normalizer2impl.cpp"
-"${ICU_SOURCE_DIR}/common/normlzr.cpp"
-"${ICU_SOURCE_DIR}/common/parsepos.cpp"
-"${ICU_SOURCE_DIR}/common/patternprops.cpp"
-"${ICU_SOURCE_DIR}/common/pluralmap.cpp"
-"${ICU_SOURCE_DIR}/common/propname.cpp"
-"${ICU_SOURCE_DIR}/common/propsvec.cpp"
-"${ICU_SOURCE_DIR}/common/punycode.cpp"
 "${ICU_SOURCE_DIR}/common/putil.cpp"
+"${ICU_SOURCE_DIR}/common/umath.cpp"
+"${ICU_SOURCE_DIR}/common/utypes.cpp"
+"${ICU_SOURCE_DIR}/common/uinvchar.cpp"
+"${ICU_SOURCE_DIR}/common/umutex.cpp"
+"${ICU_SOURCE_DIR}/common/ucln_cmn.cpp"
+"${ICU_SOURCE_DIR}/common/uinit.cpp"
+"${ICU_SOURCE_DIR}/common/uobject.cpp"
+"${ICU_SOURCE_DIR}/common/cmemory.cpp"
+"${ICU_SOURCE_DIR}/common/charstr.cpp"
+"${ICU_SOURCE_DIR}/common/cstr.cpp"
+"${ICU_SOURCE_DIR}/common/udata.cpp"
+"${ICU_SOURCE_DIR}/common/ucmndata.cpp"
+"${ICU_SOURCE_DIR}/common/udatamem.cpp"
+"${ICU_SOURCE_DIR}/common/umapfile.cpp"
+"${ICU_SOURCE_DIR}/common/udataswp.cpp"
+"${ICU_SOURCE_DIR}/common/utrie_swap.cpp"
+"${ICU_SOURCE_DIR}/common/ucol_swp.cpp"
+"${ICU_SOURCE_DIR}/common/utrace.cpp"
+"${ICU_SOURCE_DIR}/common/uhash.cpp"
+"${ICU_SOURCE_DIR}/common/uhash_us.cpp"
+"${ICU_SOURCE_DIR}/common/uenum.cpp"
+"${ICU_SOURCE_DIR}/common/ustrenum.cpp"
+"${ICU_SOURCE_DIR}/common/uvector.cpp"
+"${ICU_SOURCE_DIR}/common/ustack.cpp"
+"${ICU_SOURCE_DIR}/common/uvectr32.cpp"
+"${ICU_SOURCE_DIR}/common/uvectr64.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_bld.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_cnv.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_io.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_cb.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_err.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvlat1.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_u7.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_u8.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_u16.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_u32.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvscsu.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvbocu.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_ext.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvmbcs.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv2022.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvhz.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_lmb.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvisci.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvdisp.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_set.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_ct.cpp"
+"${ICU_SOURCE_DIR}/common/resource.cpp"
+"${ICU_SOURCE_DIR}/common/uresbund.cpp"
+"${ICU_SOURCE_DIR}/common/ures_cnv.cpp"
+"${ICU_SOURCE_DIR}/common/uresdata.cpp"
+"${ICU_SOURCE_DIR}/common/resbund.cpp"
+"${ICU_SOURCE_DIR}/common/resbund_cnv.cpp"
+"${ICU_SOURCE_DIR}/common/ucurr.cpp"
+"${ICU_SOURCE_DIR}/common/localebuilder.cpp"
+"${ICU_SOURCE_DIR}/common/localeprioritylist.cpp"
+"${ICU_SOURCE_DIR}/common/messagepattern.cpp"
+"${ICU_SOURCE_DIR}/common/ucat.cpp"
+"${ICU_SOURCE_DIR}/common/locmap.cpp"
+"${ICU_SOURCE_DIR}/common/uloc.cpp"
+"${ICU_SOURCE_DIR}/common/locid.cpp"
+"${ICU_SOURCE_DIR}/common/locutil.cpp"
+"${ICU_SOURCE_DIR}/common/locavailable.cpp"
+"${ICU_SOURCE_DIR}/common/locdispnames.cpp"
+"${ICU_SOURCE_DIR}/common/locdspnm.cpp"
+"${ICU_SOURCE_DIR}/common/loclikely.cpp"
+"${ICU_SOURCE_DIR}/common/locresdata.cpp"
+"${ICU_SOURCE_DIR}/common/lsr.cpp"
+"${ICU_SOURCE_DIR}/common/loclikelysubtags.cpp"
+"${ICU_SOURCE_DIR}/common/locdistance.cpp"
+"${ICU_SOURCE_DIR}/common/localematcher.cpp"
+"${ICU_SOURCE_DIR}/common/bytestream.cpp"
+"${ICU_SOURCE_DIR}/common/stringpiece.cpp"
+"${ICU_SOURCE_DIR}/common/bytesinkutil.cpp"
+"${ICU_SOURCE_DIR}/common/stringtriebuilder.cpp"
+"${ICU_SOURCE_DIR}/common/bytestriebuilder.cpp"
+"${ICU_SOURCE_DIR}/common/bytestrie.cpp"
+"${ICU_SOURCE_DIR}/common/bytestrieiterator.cpp"
+"${ICU_SOURCE_DIR}/common/ucharstrie.cpp"
+"${ICU_SOURCE_DIR}/common/ucharstriebuilder.cpp"
+"${ICU_SOURCE_DIR}/common/ucharstrieiterator.cpp"
+"${ICU_SOURCE_DIR}/common/dictionarydata.cpp"
+"${ICU_SOURCE_DIR}/common/edits.cpp"
+"${ICU_SOURCE_DIR}/common/appendable.cpp"
+"${ICU_SOURCE_DIR}/common/ustr_cnv.cpp"
+"${ICU_SOURCE_DIR}/common/unistr_cnv.cpp"
+"${ICU_SOURCE_DIR}/common/unistr.cpp"
+"${ICU_SOURCE_DIR}/common/unistr_case.cpp"
+"${ICU_SOURCE_DIR}/common/unistr_props.cpp"
+"${ICU_SOURCE_DIR}/common/utf_impl.cpp"
+"${ICU_SOURCE_DIR}/common/ustring.cpp"
+"${ICU_SOURCE_DIR}/common/ustrcase.cpp"
+"${ICU_SOURCE_DIR}/common/ucasemap.cpp"
+"${ICU_SOURCE_DIR}/common/ucasemap_titlecase_brkiter.cpp"
+"${ICU_SOURCE_DIR}/common/cstring.cpp"
+"${ICU_SOURCE_DIR}/common/ustrfmt.cpp"
+"${ICU_SOURCE_DIR}/common/ustrtrns.cpp"
+"${ICU_SOURCE_DIR}/common/ustr_wcs.cpp"
+"${ICU_SOURCE_DIR}/common/utext.cpp"
+"${ICU_SOURCE_DIR}/common/unistr_case_locale.cpp"
+"${ICU_SOURCE_DIR}/common/ustrcase_locale.cpp"
+"${ICU_SOURCE_DIR}/common/unistr_titlecase_brkiter.cpp"
+"${ICU_SOURCE_DIR}/common/ustr_titlecase_brkiter.cpp"
+"${ICU_SOURCE_DIR}/common/normalizer2impl.cpp"
+"${ICU_SOURCE_DIR}/common/normalizer2.cpp"
+"${ICU_SOURCE_DIR}/common/filterednormalizer2.cpp"
+"${ICU_SOURCE_DIR}/common/normlzr.cpp"
+"${ICU_SOURCE_DIR}/common/unorm.cpp"
+"${ICU_SOURCE_DIR}/common/unormcmp.cpp"
+"${ICU_SOURCE_DIR}/common/loadednormalizer2impl.cpp"
+"${ICU_SOURCE_DIR}/common/chariter.cpp"
+"${ICU_SOURCE_DIR}/common/schriter.cpp"
+"${ICU_SOURCE_DIR}/common/uchriter.cpp"
+"${ICU_SOURCE_DIR}/common/uiter.cpp"
+"${ICU_SOURCE_DIR}/common/patternprops.cpp"
+"${ICU_SOURCE_DIR}/common/uchar.cpp"
+"${ICU_SOURCE_DIR}/common/uprops.cpp"
+"${ICU_SOURCE_DIR}/common/ucase.cpp"
+"${ICU_SOURCE_DIR}/common/propname.cpp"
+"${ICU_SOURCE_DIR}/common/ubidi_props.cpp"
+"${ICU_SOURCE_DIR}/common/characterproperties.cpp"
+"${ICU_SOURCE_DIR}/common/ubidi.cpp"
+"${ICU_SOURCE_DIR}/common/ubidiwrt.cpp"
+"${ICU_SOURCE_DIR}/common/ubidiln.cpp"
+"${ICU_SOURCE_DIR}/common/ushape.cpp"
+"${ICU_SOURCE_DIR}/common/uscript.cpp"
+"${ICU_SOURCE_DIR}/common/uscript_props.cpp"
+"${ICU_SOURCE_DIR}/common/usc_impl.cpp"
+"${ICU_SOURCE_DIR}/common/unames.cpp"
+"${ICU_SOURCE_DIR}/common/utrie.cpp"
+"${ICU_SOURCE_DIR}/common/utrie2.cpp"
+"${ICU_SOURCE_DIR}/common/utrie2_builder.cpp"
+"${ICU_SOURCE_DIR}/common/ucptrie.cpp"
+"${ICU_SOURCE_DIR}/common/umutablecptrie.cpp"
+"${ICU_SOURCE_DIR}/common/bmpset.cpp"
+"${ICU_SOURCE_DIR}/common/unisetspan.cpp"
+"${ICU_SOURCE_DIR}/common/uset_props.cpp"
+"${ICU_SOURCE_DIR}/common/uniset_props.cpp"
+"${ICU_SOURCE_DIR}/common/uniset_closure.cpp"
+"${ICU_SOURCE_DIR}/common/uset.cpp"
+"${ICU_SOURCE_DIR}/common/uniset.cpp"
+"${ICU_SOURCE_DIR}/common/usetiter.cpp"
+"${ICU_SOURCE_DIR}/common/ruleiter.cpp"
+"${ICU_SOURCE_DIR}/common/caniter.cpp"
+"${ICU_SOURCE_DIR}/common/unifilt.cpp"
+"${ICU_SOURCE_DIR}/common/unifunct.cpp"
+"${ICU_SOURCE_DIR}/common/uarrsort.cpp"
+"${ICU_SOURCE_DIR}/common/brkiter.cpp"
+"${ICU_SOURCE_DIR}/common/ubrk.cpp"
+"${ICU_SOURCE_DIR}/common/brkeng.cpp"
+"${ICU_SOURCE_DIR}/common/dictbe.cpp"
+"${ICU_SOURCE_DIR}/common/filteredbrk.cpp"
 "${ICU_SOURCE_DIR}/common/rbbi.cpp"
-"${ICU_SOURCE_DIR}/common/rbbi_cache.cpp"
 "${ICU_SOURCE_DIR}/common/rbbidata.cpp"
 "${ICU_SOURCE_DIR}/common/rbbinode.cpp"
 "${ICU_SOURCE_DIR}/common/rbbirb.cpp"
@@ -80,180 +180,166 @@ set(ICUUC_SOURCES
 "${ICU_SOURCE_DIR}/common/rbbisetb.cpp"
 "${ICU_SOURCE_DIR}/common/rbbistbl.cpp"
 "${ICU_SOURCE_DIR}/common/rbbitblb.cpp"
-"${ICU_SOURCE_DIR}/common/resbund.cpp"
-"${ICU_SOURCE_DIR}/common/resbund_cnv.cpp"
-"${ICU_SOURCE_DIR}/common/resource.cpp"
-"${ICU_SOURCE_DIR}/common/restrace.cpp"
-"${ICU_SOURCE_DIR}/common/ruleiter.cpp"
-"${ICU_SOURCE_DIR}/common/schriter.cpp"
+"${ICU_SOURCE_DIR}/common/rbbi_cache.cpp"
 "${ICU_SOURCE_DIR}/common/serv.cpp"
+"${ICU_SOURCE_DIR}/common/servnotf.cpp"
+"${ICU_SOURCE_DIR}/common/servls.cpp"
 "${ICU_SOURCE_DIR}/common/servlk.cpp"
 "${ICU_SOURCE_DIR}/common/servlkf.cpp"
-"${ICU_SOURCE_DIR}/common/servls.cpp"
-"${ICU_SOURCE_DIR}/common/servnotf.cpp"
 "${ICU_SOURCE_DIR}/common/servrbf.cpp"
 "${ICU_SOURCE_DIR}/common/servslkf.cpp"
-"${ICU_SOURCE_DIR}/common/sharedobject.cpp"
-"${ICU_SOURCE_DIR}/common/simpleformatter.cpp"
-"${ICU_SOURCE_DIR}/common/static_unicode_sets.cpp"
-"${ICU_SOURCE_DIR}/common/stringpiece.cpp"
-"${ICU_SOURCE_DIR}/common/stringtriebuilder.cpp"
-"${ICU_SOURCE_DIR}/common/uarrsort.cpp"
-"${ICU_SOURCE_DIR}/common/ubidi.cpp"
-"${ICU_SOURCE_DIR}/common/ubidi_props.cpp"
-"${ICU_SOURCE_DIR}/common/ubidiln.cpp"
-"${ICU_SOURCE_DIR}/common/ubiditransform.cpp"
-"${ICU_SOURCE_DIR}/common/ubidiwrt.cpp"
-"${ICU_SOURCE_DIR}/common/ubrk.cpp"
-"${ICU_SOURCE_DIR}/common/ucase.cpp"
-"${ICU_SOURCE_DIR}/common/ucasemap.cpp"
-"${ICU_SOURCE_DIR}/common/ucasemap_titlecase_brkiter.cpp"
-"${ICU_SOURCE_DIR}/common/ucat.cpp"
-"${ICU_SOURCE_DIR}/common/uchar.cpp"
-"${ICU_SOURCE_DIR}/common/ucharstrie.cpp"
-"${ICU_SOURCE_DIR}/common/ucharstriebuilder.cpp"
-"${ICU_SOURCE_DIR}/common/ucharstrieiterator.cpp"
-"${ICU_SOURCE_DIR}/common/uchriter.cpp"
-"${ICU_SOURCE_DIR}/common/ucln_cmn.cpp"
-"${ICU_SOURCE_DIR}/common/ucmndata.cpp"
-"${ICU_SOURCE_DIR}/common/ucnv.cpp"
-"${ICU_SOURCE_DIR}/common/ucnv2022.cpp"
-"${ICU_SOURCE_DIR}/common/ucnv_bld.cpp"
-"${ICU_SOURCE_DIR}/common/ucnv_cb.cpp"
-"${ICU_SOURCE_DIR}/common/ucnv_cnv.cpp"
-"${ICU_SOURCE_DIR}/common/ucnv_ct.cpp"
-"${ICU_SOURCE_DIR}/common/ucnv_err.cpp"
-"${ICU_SOURCE_DIR}/common/ucnv_ext.cpp"
-"${ICU_SOURCE_DIR}/common/ucnv_io.cpp"
-"${ICU_SOURCE_DIR}/common/ucnv_lmb.cpp"
-"${ICU_SOURCE_DIR}/common/ucnv_set.cpp"
-"${ICU_SOURCE_DIR}/common/ucnv_u16.cpp"
-"${ICU_SOURCE_DIR}/common/ucnv_u32.cpp"
-"${ICU_SOURCE_DIR}/common/ucnv_u7.cpp"
-"${ICU_SOURCE_DIR}/common/ucnv_u8.cpp"
-"${ICU_SOURCE_DIR}/common/ucnvbocu.cpp"
-"${ICU_SOURCE_DIR}/common/ucnvdisp.cpp"
-"${ICU_SOURCE_DIR}/common/ucnvhz.cpp"
-"${ICU_SOURCE_DIR}/common/ucnvisci.cpp"
-"${ICU_SOURCE_DIR}/common/ucnvlat1.cpp"
-"${ICU_SOURCE_DIR}/common/ucnvmbcs.cpp"
-"${ICU_SOURCE_DIR}/common/ucnvscsu.cpp"
-"${ICU_SOURCE_DIR}/common/ucnvsel.cpp"
-"${ICU_SOURCE_DIR}/common/ucol_swp.cpp"
-"${ICU_SOURCE_DIR}/common/ucptrie.cpp"
-"${ICU_SOURCE_DIR}/common/ucurr.cpp"
-"${ICU_SOURCE_DIR}/common/udata.cpp"
-"${ICU_SOURCE_DIR}/common/udatamem.cpp"
-"${ICU_SOURCE_DIR}/common/udataswp.cpp"
-"${ICU_SOURCE_DIR}/common/uenum.cpp"
-"${ICU_SOURCE_DIR}/common/uhash.cpp"
-"${ICU_SOURCE_DIR}/common/uhash_us.cpp"
 "${ICU_SOURCE_DIR}/common/uidna.cpp"
-"${ICU_SOURCE_DIR}/common/uinit.cpp"
-"${ICU_SOURCE_DIR}/common/uinvchar.cpp"
-"${ICU_SOURCE_DIR}/common/uiter.cpp"
-"${ICU_SOURCE_DIR}/common/ulist.cpp"
-"${ICU_SOURCE_DIR}/common/uloc.cpp"
-"${ICU_SOURCE_DIR}/common/uloc_keytype.cpp"
-"${ICU_SOURCE_DIR}/common/uloc_tag.cpp"
-"${ICU_SOURCE_DIR}/common/ulocale.cpp"
-"${ICU_SOURCE_DIR}/common/ulocbuilder.cpp"
-"${ICU_SOURCE_DIR}/common/umapfile.cpp"
-"${ICU_SOURCE_DIR}/common/umath.cpp"
-"${ICU_SOURCE_DIR}/common/umutablecptrie.cpp"
-"${ICU_SOURCE_DIR}/common/umutex.cpp"
-"${ICU_SOURCE_DIR}/common/unames.cpp"
-"${ICU_SOURCE_DIR}/common/unifiedcache.cpp"
-"${ICU_SOURCE_DIR}/common/unifilt.cpp"
-"${ICU_SOURCE_DIR}/common/unifunct.cpp"
-"${ICU_SOURCE_DIR}/common/uniset.cpp"
-"${ICU_SOURCE_DIR}/common/uniset_closure.cpp"
-"${ICU_SOURCE_DIR}/common/uniset_props.cpp"
-"${ICU_SOURCE_DIR}/common/unisetspan.cpp"
-"${ICU_SOURCE_DIR}/common/unistr.cpp"
-"${ICU_SOURCE_DIR}/common/unistr_case.cpp"
-"${ICU_SOURCE_DIR}/common/unistr_case_locale.cpp"
-"${ICU_SOURCE_DIR}/common/unistr_cnv.cpp"
-"${ICU_SOURCE_DIR}/common/unistr_props.cpp"
-"${ICU_SOURCE_DIR}/common/unistr_titlecase_brkiter.cpp"
-"${ICU_SOURCE_DIR}/common/unorm.cpp"
-"${ICU_SOURCE_DIR}/common/unormcmp.cpp"
-"${ICU_SOURCE_DIR}/common/uobject.cpp"
-"${ICU_SOURCE_DIR}/common/uprops.cpp"
-"${ICU_SOURCE_DIR}/common/ures_cnv.cpp"
-"${ICU_SOURCE_DIR}/common/uresbund.cpp"
-"${ICU_SOURCE_DIR}/common/uresdata.cpp"
-"${ICU_SOURCE_DIR}/common/usc_impl.cpp"
-"${ICU_SOURCE_DIR}/common/uscript.cpp"
-"${ICU_SOURCE_DIR}/common/uscript_props.cpp"
-"${ICU_SOURCE_DIR}/common/uset.cpp"
-"${ICU_SOURCE_DIR}/common/uset_props.cpp"
-"${ICU_SOURCE_DIR}/common/usetiter.cpp"
-"${ICU_SOURCE_DIR}/common/ushape.cpp"
 "${ICU_SOURCE_DIR}/common/usprep.cpp"
-"${ICU_SOURCE_DIR}/common/ustack.cpp"
-"${ICU_SOURCE_DIR}/common/ustr_cnv.cpp"
-"${ICU_SOURCE_DIR}/common/ustr_titlecase_brkiter.cpp"
-"${ICU_SOURCE_DIR}/common/ustr_wcs.cpp"
-"${ICU_SOURCE_DIR}/common/ustrcase.cpp"
-"${ICU_SOURCE_DIR}/common/ustrcase_locale.cpp"
-"${ICU_SOURCE_DIR}/common/ustrenum.cpp"
-"${ICU_SOURCE_DIR}/common/ustrfmt.cpp"
-"${ICU_SOURCE_DIR}/common/ustring.cpp"
-"${ICU_SOURCE_DIR}/common/ustrtrns.cpp"
-"${ICU_SOURCE_DIR}/common/utext.cpp"
-"${ICU_SOURCE_DIR}/common/utf_impl.cpp"
+"${ICU_SOURCE_DIR}/common/uts46.cpp"
+"${ICU_SOURCE_DIR}/common/punycode.cpp"
 "${ICU_SOURCE_DIR}/common/util.cpp"
 "${ICU_SOURCE_DIR}/common/util_props.cpp"
-"${ICU_SOURCE_DIR}/common/utrace.cpp"
-"${ICU_SOURCE_DIR}/common/utrie.cpp"
-"${ICU_SOURCE_DIR}/common/utrie2.cpp"
-"${ICU_SOURCE_DIR}/common/utrie2_builder.cpp"
-"${ICU_SOURCE_DIR}/common/utrie_swap.cpp"
-"${ICU_SOURCE_DIR}/common/uts46.cpp"
-"${ICU_SOURCE_DIR}/common/utypes.cpp"
-"${ICU_SOURCE_DIR}/common/uvector.cpp"
-"${ICU_SOURCE_DIR}/common/uvectr32.cpp"
-"${ICU_SOURCE_DIR}/common/uvectr64.cpp"
-"${ICU_SOURCE_DIR}/common/wintz.cpp")
+"${ICU_SOURCE_DIR}/common/parsepos.cpp"
+"${ICU_SOURCE_DIR}/common/locbased.cpp"
+"${ICU_SOURCE_DIR}/common/cwchar.cpp"
+"${ICU_SOURCE_DIR}/common/wintz.cpp"
+"${ICU_SOURCE_DIR}/common/dtintrv.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvsel.cpp"
+"${ICU_SOURCE_DIR}/common/propsvec.cpp"
+"${ICU_SOURCE_DIR}/common/ulist.cpp"
+"${ICU_SOURCE_DIR}/common/uloc_tag.cpp"
+"${ICU_SOURCE_DIR}/common/icudataver.cpp"
+"${ICU_SOURCE_DIR}/common/icuplug.cpp"
+"${ICU_SOURCE_DIR}/common/sharedobject.cpp"
+"${ICU_SOURCE_DIR}/common/simpleformatter.cpp"
+"${ICU_SOURCE_DIR}/common/unifiedcache.cpp"
+"${ICU_SOURCE_DIR}/common/uloc_keytype.cpp"
+"${ICU_SOURCE_DIR}/common/ubiditransform.cpp"
+"${ICU_SOURCE_DIR}/common/pluralmap.cpp"
+"${ICU_SOURCE_DIR}/common/static_unicode_sets.cpp"
+"${ICU_SOURCE_DIR}/common/restrace.cpp"
+"${ICU_SOURCE_DIR}/common/emojiprops.cpp"
+"${ICU_SOURCE_DIR}/common/lstmbe.cpp")
 
 set(ICUI18N_SOURCES
-"${ICU_SOURCE_DIR}/i18n/alphaindex.cpp"
-"${ICU_SOURCE_DIR}/i18n/anytrans.cpp"
-"${ICU_SOURCE_DIR}/i18n/astro.cpp"
-"${ICU_SOURCE_DIR}/i18n/basictz.cpp"
-"${ICU_SOURCE_DIR}/i18n/bocsu.cpp"
-"${ICU_SOURCE_DIR}/i18n/brktrans.cpp"
-"${ICU_SOURCE_DIR}/i18n/buddhcal.cpp"
-"${ICU_SOURCE_DIR}/i18n/calendar.cpp"
-"${ICU_SOURCE_DIR}/i18n/casetrn.cpp"
-"${ICU_SOURCE_DIR}/i18n/cecal.cpp"
-"${ICU_SOURCE_DIR}/i18n/chnsecal.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucln_in.cpp"
+"${ICU_SOURCE_DIR}/i18n/fmtable.cpp"
+"${ICU_SOURCE_DIR}/i18n/format.cpp"
+"${ICU_SOURCE_DIR}/i18n/msgfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/umsg.cpp"
+"${ICU_SOURCE_DIR}/i18n/numfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/unum.cpp"
+"${ICU_SOURCE_DIR}/i18n/decimfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/dcfmtsym.cpp"
+"${ICU_SOURCE_DIR}/i18n/fmtable_cnv.cpp"
 "${ICU_SOURCE_DIR}/i18n/choicfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/datefmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/smpdtfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/reldtfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/dtfmtsym.cpp"
+"${ICU_SOURCE_DIR}/i18n/udat.cpp"
+"${ICU_SOURCE_DIR}/i18n/dtptngen.cpp"
+"${ICU_SOURCE_DIR}/i18n/udatpg.cpp"
+"${ICU_SOURCE_DIR}/i18n/nfrs.cpp"
+"${ICU_SOURCE_DIR}/i18n/nfrule.cpp"
+"${ICU_SOURCE_DIR}/i18n/nfsubs.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbnf.cpp"
+"${ICU_SOURCE_DIR}/i18n/numsys.cpp"
+"${ICU_SOURCE_DIR}/i18n/unumsys.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucsdet.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucal.cpp"
+"${ICU_SOURCE_DIR}/i18n/calendar.cpp"
+"${ICU_SOURCE_DIR}/i18n/gregocal.cpp"
+"${ICU_SOURCE_DIR}/i18n/timezone.cpp"
+"${ICU_SOURCE_DIR}/i18n/simpletz.cpp"
+"${ICU_SOURCE_DIR}/i18n/olsontz.cpp"
+"${ICU_SOURCE_DIR}/i18n/astro.cpp"
+"${ICU_SOURCE_DIR}/i18n/taiwncal.cpp"
+"${ICU_SOURCE_DIR}/i18n/buddhcal.cpp"
+"${ICU_SOURCE_DIR}/i18n/persncal.cpp"
+"${ICU_SOURCE_DIR}/i18n/islamcal.cpp"
+"${ICU_SOURCE_DIR}/i18n/japancal.cpp"
+"${ICU_SOURCE_DIR}/i18n/gregoimp.cpp"
+"${ICU_SOURCE_DIR}/i18n/hebrwcal.cpp"
+"${ICU_SOURCE_DIR}/i18n/indiancal.cpp"
+"${ICU_SOURCE_DIR}/i18n/chnsecal.cpp"
+"${ICU_SOURCE_DIR}/i18n/cecal.cpp"
+"${ICU_SOURCE_DIR}/i18n/coptccal.cpp"
+"${ICU_SOURCE_DIR}/i18n/dangical.cpp"
+"${ICU_SOURCE_DIR}/i18n/ethpccal.cpp"
 "${ICU_SOURCE_DIR}/i18n/coleitr.cpp"
 "${ICU_SOURCE_DIR}/i18n/coll.cpp"
+"${ICU_SOURCE_DIR}/i18n/sortkey.cpp"
+"${ICU_SOURCE_DIR}/i18n/bocsu.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucoleitr.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucol.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucol_res.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucol_sit.cpp"
 "${ICU_SOURCE_DIR}/i18n/collation.cpp"
-"${ICU_SOURCE_DIR}/i18n/collationbuilder.cpp"
-"${ICU_SOURCE_DIR}/i18n/collationcompare.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationsettings.cpp"
 "${ICU_SOURCE_DIR}/i18n/collationdata.cpp"
-"${ICU_SOURCE_DIR}/i18n/collationdatabuilder.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationtailoring.cpp"
 "${ICU_SOURCE_DIR}/i18n/collationdatareader.cpp"
 "${ICU_SOURCE_DIR}/i18n/collationdatawriter.cpp"
-"${ICU_SOURCE_DIR}/i18n/collationfastlatin.cpp"
-"${ICU_SOURCE_DIR}/i18n/collationfastlatinbuilder.cpp"
 "${ICU_SOURCE_DIR}/i18n/collationfcd.cpp"
 "${ICU_SOURCE_DIR}/i18n/collationiterator.cpp"
+"${ICU_SOURCE_DIR}/i18n/utf16collationiterator.cpp"
+"${ICU_SOURCE_DIR}/i18n/utf8collationiterator.cpp"
+"${ICU_SOURCE_DIR}/i18n/uitercollationiterator.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationsets.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationcompare.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationfastlatin.cpp"
 "${ICU_SOURCE_DIR}/i18n/collationkeys.cpp"
+"${ICU_SOURCE_DIR}/i18n/rulebasedcollator.cpp"
 "${ICU_SOURCE_DIR}/i18n/collationroot.cpp"
 "${ICU_SOURCE_DIR}/i18n/collationrootelements.cpp"
-"${ICU_SOURCE_DIR}/i18n/collationruleparser.cpp"
-"${ICU_SOURCE_DIR}/i18n/collationsets.cpp"
-"${ICU_SOURCE_DIR}/i18n/collationsettings.cpp"
-"${ICU_SOURCE_DIR}/i18n/collationtailoring.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationdatabuilder.cpp"
 "${ICU_SOURCE_DIR}/i18n/collationweights.cpp"
-"${ICU_SOURCE_DIR}/i18n/compactdecimalformat.cpp"
-"${ICU_SOURCE_DIR}/i18n/coptccal.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationruleparser.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationbuilder.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationfastlatinbuilder.cpp"
+"${ICU_SOURCE_DIR}/i18n/listformatter.cpp"
+"${ICU_SOURCE_DIR}/i18n/ulistformatter.cpp"
+"${ICU_SOURCE_DIR}/i18n/strmatch.cpp"
+"${ICU_SOURCE_DIR}/i18n/usearch.cpp"
+"${ICU_SOURCE_DIR}/i18n/search.cpp"
+"${ICU_SOURCE_DIR}/i18n/stsearch.cpp"
+"${ICU_SOURCE_DIR}/i18n/translit.cpp"
+"${ICU_SOURCE_DIR}/i18n/utrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/esctrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/unesctrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/funcrepl.cpp"
+"${ICU_SOURCE_DIR}/i18n/strrepl.cpp"
+"${ICU_SOURCE_DIR}/i18n/tridpars.cpp"
 "${ICU_SOURCE_DIR}/i18n/cpdtrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbt.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbt_data.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbt_pars.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbt_rule.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbt_set.cpp"
+"${ICU_SOURCE_DIR}/i18n/nultrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/remtrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/casetrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/titletrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/tolowtrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/toupptrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/anytrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/name2uni.cpp"
+"${ICU_SOURCE_DIR}/i18n/uni2name.cpp"
+"${ICU_SOURCE_DIR}/i18n/nortrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/quant.cpp"
+"${ICU_SOURCE_DIR}/i18n/transreg.cpp"
+"${ICU_SOURCE_DIR}/i18n/brktrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/regexcmp.cpp"
+"${ICU_SOURCE_DIR}/i18n/rematch.cpp"
+"${ICU_SOURCE_DIR}/i18n/repattrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/regexst.cpp"
+"${ICU_SOURCE_DIR}/i18n/regextxt.cpp"
+"${ICU_SOURCE_DIR}/i18n/regeximp.cpp"
+"${ICU_SOURCE_DIR}/i18n/uregex.cpp"
+"${ICU_SOURCE_DIR}/i18n/uregexc.cpp"
+"${ICU_SOURCE_DIR}/i18n/ulocdata.cpp"
+"${ICU_SOURCE_DIR}/i18n/measfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/currfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/curramt.cpp"
+"${ICU_SOURCE_DIR}/i18n/currunit.cpp"
+"${ICU_SOURCE_DIR}/i18n/measure.cpp"
+"${ICU_SOURCE_DIR}/i18n/utmscale.cpp"
 "${ICU_SOURCE_DIR}/i18n/csdetect.cpp"
 "${ICU_SOURCE_DIR}/i18n/csmatch.cpp"
 "${ICU_SOURCE_DIR}/i18n/csr2022.cpp"
@@ -262,80 +348,60 @@ set(ICUI18N_SOURCES
 "${ICU_SOURCE_DIR}/i18n/csrsbcs.cpp"
 "${ICU_SOURCE_DIR}/i18n/csrucode.cpp"
 "${ICU_SOURCE_DIR}/i18n/csrutf8.cpp"
-"${ICU_SOURCE_DIR}/i18n/curramt.cpp"
-"${ICU_SOURCE_DIR}/i18n/currfmt.cpp"
-"${ICU_SOURCE_DIR}/i18n/currpinf.cpp"
-"${ICU_SOURCE_DIR}/i18n/currunit.cpp"
-"${ICU_SOURCE_DIR}/i18n/dangical.cpp"
-"${ICU_SOURCE_DIR}/i18n/datefmt.cpp"
-"${ICU_SOURCE_DIR}/i18n/dayperiodrules.cpp"
-"${ICU_SOURCE_DIR}/i18n/dcfmtsym.cpp"
-"${ICU_SOURCE_DIR}/i18n/decContext.cpp"
-"${ICU_SOURCE_DIR}/i18n/decNumber.cpp"
-"${ICU_SOURCE_DIR}/i18n/decimfmt.cpp"
-"${ICU_SOURCE_DIR}/i18n/displayoptions.cpp"
-"${ICU_SOURCE_DIR}/i18n/double-conversion-bignum-dtoa.cpp"
-"${ICU_SOURCE_DIR}/i18n/double-conversion-bignum.cpp"
-"${ICU_SOURCE_DIR}/i18n/double-conversion-cached-powers.cpp"
-"${ICU_SOURCE_DIR}/i18n/double-conversion-double-to-string.cpp"
-"${ICU_SOURCE_DIR}/i18n/double-conversion-fast-dtoa.cpp"
-"${ICU_SOURCE_DIR}/i18n/double-conversion-string-to-double.cpp"
-"${ICU_SOURCE_DIR}/i18n/double-conversion-strtod.cpp"
-"${ICU_SOURCE_DIR}/i18n/dtfmtsym.cpp"
+"${ICU_SOURCE_DIR}/i18n/inputext.cpp"
+"${ICU_SOURCE_DIR}/i18n/wintzimpl.cpp"
+"${ICU_SOURCE_DIR}/i18n/windtfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/winnmfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/basictz.cpp"
+"${ICU_SOURCE_DIR}/i18n/dtrule.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbtz.cpp"
+"${ICU_SOURCE_DIR}/i18n/tzrule.cpp"
+"${ICU_SOURCE_DIR}/i18n/tztrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/vtzone.cpp"
+"${ICU_SOURCE_DIR}/i18n/zonemeta.cpp"
+"${ICU_SOURCE_DIR}/i18n/standardplural.cpp"
+"${ICU_SOURCE_DIR}/i18n/upluralrules.cpp"
+"${ICU_SOURCE_DIR}/i18n/plurrule.cpp"
+"${ICU_SOURCE_DIR}/i18n/plurfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/selfmt.cpp"
 "${ICU_SOURCE_DIR}/i18n/dtitvfmt.cpp"
 "${ICU_SOURCE_DIR}/i18n/dtitvinf.cpp"
-"${ICU_SOURCE_DIR}/i18n/dtptngen.cpp"
-"${ICU_SOURCE_DIR}/i18n/dtrule.cpp"
-"${ICU_SOURCE_DIR}/i18n/erarules.cpp"
-"${ICU_SOURCE_DIR}/i18n/esctrn.cpp"
-"${ICU_SOURCE_DIR}/i18n/ethpccal.cpp"
-"${ICU_SOURCE_DIR}/i18n/fmtable.cpp"
-"${ICU_SOURCE_DIR}/i18n/fmtable_cnv.cpp"
-"${ICU_SOURCE_DIR}/i18n/format.cpp"
-"${ICU_SOURCE_DIR}/i18n/formatted_string_builder.cpp"
-"${ICU_SOURCE_DIR}/i18n/formattedval_iterimpl.cpp"
-"${ICU_SOURCE_DIR}/i18n/formattedval_sbimpl.cpp"
-"${ICU_SOURCE_DIR}/i18n/formattedvalue.cpp"
+"${ICU_SOURCE_DIR}/i18n/udateintervalformat.cpp"
+"${ICU_SOURCE_DIR}/i18n/tmunit.cpp"
+"${ICU_SOURCE_DIR}/i18n/tmutamt.cpp"
+"${ICU_SOURCE_DIR}/i18n/tmutfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/currpinf.cpp"
+"${ICU_SOURCE_DIR}/i18n/uspoof.cpp"
+"${ICU_SOURCE_DIR}/i18n/uspoof_impl.cpp"
+"${ICU_SOURCE_DIR}/i18n/uspoof_build.cpp"
+"${ICU_SOURCE_DIR}/i18n/uspoof_conf.cpp"
+"${ICU_SOURCE_DIR}/i18n/smpdtfst.cpp"
+"${ICU_SOURCE_DIR}/i18n/ztrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/zrule.cpp"
+"${ICU_SOURCE_DIR}/i18n/vzone.cpp"
 "${ICU_SOURCE_DIR}/i18n/fphdlimp.cpp"
 "${ICU_SOURCE_DIR}/i18n/fpositer.cpp"
-"${ICU_SOURCE_DIR}/i18n/funcrepl.cpp"
+"${ICU_SOURCE_DIR}/i18n/ufieldpositer.cpp"
+"${ICU_SOURCE_DIR}/i18n/decNumber.cpp"
+"${ICU_SOURCE_DIR}/i18n/decContext.cpp"
+"${ICU_SOURCE_DIR}/i18n/alphaindex.cpp"
+"${ICU_SOURCE_DIR}/i18n/tznames.cpp"
+"${ICU_SOURCE_DIR}/i18n/tznames_impl.cpp"
+"${ICU_SOURCE_DIR}/i18n/tzgnames.cpp"
+"${ICU_SOURCE_DIR}/i18n/tzfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/compactdecimalformat.cpp"
 "${ICU_SOURCE_DIR}/i18n/gender.cpp"
-"${ICU_SOURCE_DIR}/i18n/gregocal.cpp"
-"${ICU_SOURCE_DIR}/i18n/gregoimp.cpp"
-"${ICU_SOURCE_DIR}/i18n/hebrwcal.cpp"
-"${ICU_SOURCE_DIR}/i18n/indiancal.cpp"
-"${ICU_SOURCE_DIR}/i18n/inputext.cpp"
-"${ICU_SOURCE_DIR}/i18n/islamcal.cpp"
-"${ICU_SOURCE_DIR}/i18n/iso8601cal.cpp"
-"${ICU_SOURCE_DIR}/i18n/japancal.cpp"
-"${ICU_SOURCE_DIR}/i18n/listformatter.cpp"
-"${ICU_SOURCE_DIR}/i18n/measfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/region.cpp"
+"${ICU_SOURCE_DIR}/i18n/scriptset.cpp"
+"${ICU_SOURCE_DIR}/i18n/uregion.cpp"
+"${ICU_SOURCE_DIR}/i18n/reldatefmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/quantityformatter.cpp"
 "${ICU_SOURCE_DIR}/i18n/measunit.cpp"
-"${ICU_SOURCE_DIR}/i18n/measunit_extra.cpp"
-"${ICU_SOURCE_DIR}/i18n/measure.cpp"
-"${ICU_SOURCE_DIR}/i18n/messageformat2.cpp"
-"${ICU_SOURCE_DIR}/i18n/messageformat2_arguments.cpp"
-"${ICU_SOURCE_DIR}/i18n/messageformat2_checker.cpp"
-"${ICU_SOURCE_DIR}/i18n/messageformat2_data_model.cpp"
-"${ICU_SOURCE_DIR}/i18n/messageformat2_errors.cpp"
-"${ICU_SOURCE_DIR}/i18n/messageformat2_evaluation.cpp"
-"${ICU_SOURCE_DIR}/i18n/messageformat2_formattable.cpp"
-"${ICU_SOURCE_DIR}/i18n/messageformat2_formatter.cpp"
-"${ICU_SOURCE_DIR}/i18n/messageformat2_function_registry.cpp"
-"${ICU_SOURCE_DIR}/i18n/messageformat2_parser.cpp"
-"${ICU_SOURCE_DIR}/i18n/messageformat2_serializer.cpp"
-"${ICU_SOURCE_DIR}/i18n/msgfmt.cpp"
-"${ICU_SOURCE_DIR}/i18n/name2uni.cpp"
-"${ICU_SOURCE_DIR}/i18n/nfrs.cpp"
-"${ICU_SOURCE_DIR}/i18n/nfrule.cpp"
-"${ICU_SOURCE_DIR}/i18n/nfsubs.cpp"
-"${ICU_SOURCE_DIR}/i18n/nortrans.cpp"
-"${ICU_SOURCE_DIR}/i18n/nultrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/sharedbreakiterator.cpp"
+"${ICU_SOURCE_DIR}/i18n/scientificnumberformatter.cpp"
+"${ICU_SOURCE_DIR}/i18n/dayperiodrules.cpp"
 "${ICU_SOURCE_DIR}/i18n/number_affixutils.cpp"
-"${ICU_SOURCE_DIR}/i18n/number_asformat.cpp"
-"${ICU_SOURCE_DIR}/i18n/number_capi.cpp"
 "${ICU_SOURCE_DIR}/i18n/number_compact.cpp"
-"${ICU_SOURCE_DIR}/i18n/number_currencysymbols.cpp"
 "${ICU_SOURCE_DIR}/i18n/number_decimalquantity.cpp"
 "${ICU_SOURCE_DIR}/i18n/number_decimfmtprops.cpp"
 "${ICU_SOURCE_DIR}/i18n/number_fluent.cpp"
@@ -343,9 +409,7 @@ set(ICUI18N_SOURCES
 "${ICU_SOURCE_DIR}/i18n/number_grouping.cpp"
 "${ICU_SOURCE_DIR}/i18n/number_integerwidth.cpp"
 "${ICU_SOURCE_DIR}/i18n/number_longnames.cpp"
-"${ICU_SOURCE_DIR}/i18n/number_mapper.cpp"
 "${ICU_SOURCE_DIR}/i18n/number_modifiers.cpp"
-"${ICU_SOURCE_DIR}/i18n/number_multiplier.cpp"
 "${ICU_SOURCE_DIR}/i18n/number_notation.cpp"
 "${ICU_SOURCE_DIR}/i18n/number_output.cpp"
 "${ICU_SOURCE_DIR}/i18n/number_padding.cpp"
@@ -353,139 +417,55 @@ set(ICUI18N_SOURCES
 "${ICU_SOURCE_DIR}/i18n/number_patternstring.cpp"
 "${ICU_SOURCE_DIR}/i18n/number_rounding.cpp"
 "${ICU_SOURCE_DIR}/i18n/number_scientific.cpp"
-"${ICU_SOURCE_DIR}/i18n/number_simple.cpp"
-"${ICU_SOURCE_DIR}/i18n/number_skeletons.cpp"
-"${ICU_SOURCE_DIR}/i18n/number_symbolswrapper.cpp"
-"${ICU_SOURCE_DIR}/i18n/number_usageprefs.cpp"
 "${ICU_SOURCE_DIR}/i18n/number_utils.cpp"
-"${ICU_SOURCE_DIR}/i18n/numfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_asformat.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_mapper.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_multiplier.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_currencysymbols.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_skeletons.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_capi.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-string-to-double.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-double-to-string.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-bignum-dtoa.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-bignum.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-cached-powers.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-fast-dtoa.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-strtod.cpp"
+"${ICU_SOURCE_DIR}/i18n/string_segment.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_parsednumber.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_impl.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_symbols.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_decimal.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_scientific.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_currency.cpp"
 "${ICU_SOURCE_DIR}/i18n/numparse_affixes.cpp"
 "${ICU_SOURCE_DIR}/i18n/numparse_compositions.cpp"
-"${ICU_SOURCE_DIR}/i18n/numparse_currency.cpp"
-"${ICU_SOURCE_DIR}/i18n/numparse_decimal.cpp"
-"${ICU_SOURCE_DIR}/i18n/numparse_impl.cpp"
-"${ICU_SOURCE_DIR}/i18n/numparse_parsednumber.cpp"
-"${ICU_SOURCE_DIR}/i18n/numparse_scientific.cpp"
-"${ICU_SOURCE_DIR}/i18n/numparse_symbols.cpp"
 "${ICU_SOURCE_DIR}/i18n/numparse_validators.cpp"
-"${ICU_SOURCE_DIR}/i18n/numrange_capi.cpp"
 "${ICU_SOURCE_DIR}/i18n/numrange_fluent.cpp"
 "${ICU_SOURCE_DIR}/i18n/numrange_impl.cpp"
-"${ICU_SOURCE_DIR}/i18n/numsys.cpp"
-"${ICU_SOURCE_DIR}/i18n/olsontz.cpp"
-"${ICU_SOURCE_DIR}/i18n/persncal.cpp"
+"${ICU_SOURCE_DIR}/i18n/erarules.cpp"
+"${ICU_SOURCE_DIR}/i18n/formattedvalue.cpp"
+"${ICU_SOURCE_DIR}/i18n/formattedval_iterimpl.cpp"
+"${ICU_SOURCE_DIR}/i18n/formattedval_sbimpl.cpp"
+"${ICU_SOURCE_DIR}/i18n/formatted_string_builder.cpp"
+"${ICU_SOURCE_DIR}/i18n/measunit_extra.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_symbolswrapper.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_usageprefs.cpp"
+"${ICU_SOURCE_DIR}/i18n/numrange_capi.cpp"
 "${ICU_SOURCE_DIR}/i18n/pluralranges.cpp"
-"${ICU_SOURCE_DIR}/i18n/plurfmt.cpp"
-"${ICU_SOURCE_DIR}/i18n/plurrule.cpp"
-"${ICU_SOURCE_DIR}/i18n/quant.cpp"
-"${ICU_SOURCE_DIR}/i18n/quantityformatter.cpp"
-"${ICU_SOURCE_DIR}/i18n/rbnf.cpp"
-"${ICU_SOURCE_DIR}/i18n/rbt.cpp"
-"${ICU_SOURCE_DIR}/i18n/rbt_data.cpp"
-"${ICU_SOURCE_DIR}/i18n/rbt_pars.cpp"
-"${ICU_SOURCE_DIR}/i18n/rbt_rule.cpp"
-"${ICU_SOURCE_DIR}/i18n/rbt_set.cpp"
-"${ICU_SOURCE_DIR}/i18n/rbtz.cpp"
-"${ICU_SOURCE_DIR}/i18n/regexcmp.cpp"
-"${ICU_SOURCE_DIR}/i18n/regeximp.cpp"
-"${ICU_SOURCE_DIR}/i18n/regexst.cpp"
-"${ICU_SOURCE_DIR}/i18n/regextxt.cpp"
-"${ICU_SOURCE_DIR}/i18n/region.cpp"
-"${ICU_SOURCE_DIR}/i18n/reldatefmt.cpp"
-"${ICU_SOURCE_DIR}/i18n/reldtfmt.cpp"
-"${ICU_SOURCE_DIR}/i18n/rematch.cpp"
-"${ICU_SOURCE_DIR}/i18n/remtrans.cpp"
-"${ICU_SOURCE_DIR}/i18n/repattrn.cpp"
-"${ICU_SOURCE_DIR}/i18n/rulebasedcollator.cpp"
-"${ICU_SOURCE_DIR}/i18n/scientificnumberformatter.cpp"
-"${ICU_SOURCE_DIR}/i18n/scriptset.cpp"
-"${ICU_SOURCE_DIR}/i18n/search.cpp"
-"${ICU_SOURCE_DIR}/i18n/selfmt.cpp"
-"${ICU_SOURCE_DIR}/i18n/sharedbreakiterator.cpp"
-"${ICU_SOURCE_DIR}/i18n/simpletz.cpp"
-"${ICU_SOURCE_DIR}/i18n/smpdtfmt.cpp"
-"${ICU_SOURCE_DIR}/i18n/smpdtfst.cpp"
-"${ICU_SOURCE_DIR}/i18n/sortkey.cpp"
-"${ICU_SOURCE_DIR}/i18n/standardplural.cpp"
-"${ICU_SOURCE_DIR}/i18n/string_segment.cpp"
-"${ICU_SOURCE_DIR}/i18n/strmatch.cpp"
-"${ICU_SOURCE_DIR}/i18n/strrepl.cpp"
-"${ICU_SOURCE_DIR}/i18n/stsearch.cpp"
-"${ICU_SOURCE_DIR}/i18n/taiwncal.cpp"
-"${ICU_SOURCE_DIR}/i18n/timezone.cpp"
-"${ICU_SOURCE_DIR}/i18n/titletrn.cpp"
-"${ICU_SOURCE_DIR}/i18n/tmunit.cpp"
-"${ICU_SOURCE_DIR}/i18n/tmutamt.cpp"
-"${ICU_SOURCE_DIR}/i18n/tmutfmt.cpp"
-"${ICU_SOURCE_DIR}/i18n/tolowtrn.cpp"
-"${ICU_SOURCE_DIR}/i18n/toupptrn.cpp"
-"${ICU_SOURCE_DIR}/i18n/translit.cpp"
-"${ICU_SOURCE_DIR}/i18n/transreg.cpp"
-"${ICU_SOURCE_DIR}/i18n/tridpars.cpp"
-"${ICU_SOURCE_DIR}/i18n/tzfmt.cpp"
-"${ICU_SOURCE_DIR}/i18n/tzgnames.cpp"
-"${ICU_SOURCE_DIR}/i18n/tznames.cpp"
-"${ICU_SOURCE_DIR}/i18n/tznames_impl.cpp"
-"${ICU_SOURCE_DIR}/i18n/tzrule.cpp"
-"${ICU_SOURCE_DIR}/i18n/tztrans.cpp"
-"${ICU_SOURCE_DIR}/i18n/ucal.cpp"
-"${ICU_SOURCE_DIR}/i18n/ucln_in.cpp"
-"${ICU_SOURCE_DIR}/i18n/ucol.cpp"
-"${ICU_SOURCE_DIR}/i18n/ucol_res.cpp"
-"${ICU_SOURCE_DIR}/i18n/ucol_sit.cpp"
-"${ICU_SOURCE_DIR}/i18n/ucoleitr.cpp"
-"${ICU_SOURCE_DIR}/i18n/ucsdet.cpp"
-"${ICU_SOURCE_DIR}/i18n/udat.cpp"
-"${ICU_SOURCE_DIR}/i18n/udateintervalformat.cpp"
-"${ICU_SOURCE_DIR}/i18n/udatpg.cpp"
-"${ICU_SOURCE_DIR}/i18n/ufieldpositer.cpp"
-"${ICU_SOURCE_DIR}/i18n/uitercollationiterator.cpp"
-"${ICU_SOURCE_DIR}/i18n/ulistformatter.cpp"
-"${ICU_SOURCE_DIR}/i18n/ulocdata.cpp"
-"${ICU_SOURCE_DIR}/i18n/umsg.cpp"
-"${ICU_SOURCE_DIR}/i18n/unesctrn.cpp"
-"${ICU_SOURCE_DIR}/i18n/uni2name.cpp"
 "${ICU_SOURCE_DIR}/i18n/units_complexconverter.cpp"
 "${ICU_SOURCE_DIR}/i18n/units_converter.cpp"
 "${ICU_SOURCE_DIR}/i18n/units_data.cpp"
-"${ICU_SOURCE_DIR}/i18n/units_router.cpp"
-"${ICU_SOURCE_DIR}/i18n/unum.cpp"
-"${ICU_SOURCE_DIR}/i18n/unumsys.cpp"
-"${ICU_SOURCE_DIR}/i18n/upluralrules.cpp"
-"${ICU_SOURCE_DIR}/i18n/uregex.cpp"
-"${ICU_SOURCE_DIR}/i18n/uregexc.cpp"
-"${ICU_SOURCE_DIR}/i18n/uregion.cpp"
-"${ICU_SOURCE_DIR}/i18n/usearch.cpp"
-"${ICU_SOURCE_DIR}/i18n/uspoof.cpp"
-"${ICU_SOURCE_DIR}/i18n/uspoof_build.cpp"
-"${ICU_SOURCE_DIR}/i18n/uspoof_conf.cpp"
-"${ICU_SOURCE_DIR}/i18n/uspoof_impl.cpp"
-"${ICU_SOURCE_DIR}/i18n/utf16collationiterator.cpp"
-"${ICU_SOURCE_DIR}/i18n/utf8collationiterator.cpp"
-"${ICU_SOURCE_DIR}/i18n/utmscale.cpp"
-"${ICU_SOURCE_DIR}/i18n/utrans.cpp"
-"${ICU_SOURCE_DIR}/i18n/vtzone.cpp"
-"${ICU_SOURCE_DIR}/i18n/vzone.cpp"
-"${ICU_SOURCE_DIR}/i18n/windtfmt.cpp"
-"${ICU_SOURCE_DIR}/i18n/winnmfmt.cpp"
-"${ICU_SOURCE_DIR}/i18n/wintzimpl.cpp"
-"${ICU_SOURCE_DIR}/i18n/zonemeta.cpp"
-"${ICU_SOURCE_DIR}/i18n/zrule.cpp"
-"${ICU_SOURCE_DIR}/i18n/ztrans.cpp")
+"${ICU_SOURCE_DIR}/i18n/units_router.cpp")
 
 file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/empty.cpp" CONTENT " ")
 enable_language(ASM)
 
 if (ARCH_S390X)
-    set(ICUDATA_SOURCE_FILE "${ICUDATA_SOURCE_DIR}/icudt75b_dat.S" )
+    set(ICUDATA_SOURCE_FILE "${ICUDATA_SOURCE_DIR}/icudt70b_dat.S" )
 else()
-    set(ICUDATA_SOURCE_FILE "${ICUDATA_SOURCE_DIR}/icudt75l_dat.S" )
+    set(ICUDATA_SOURCE_FILE "${ICUDATA_SOURCE_DIR}/icudt70l_dat.S" )
 endif()
-# ^^ you might be confused how for different little endian platforms (x86, ARM) the same assembly files can be used.
-# These files are indeed assembly but they only contain data ('.long' directive), which makes them portable accross CPUs.
-# Only the endianness and the character set (ASCII, EBCDIC) makes a difference, also see
-# https://unicode-org.github.io/icu/userguide/icu_data/#sharing-icu-data-between-platforms, 'Sharing ICU Data Between Platforms')
-# (and as an experiment, try re-generating the data files on x86 vs. ARM, ... you'll get exactly the same files)
 
 set(ICUDATA_SOURCES
     "${ICUDATA_SOURCE_FILE}"
diff --git a/contrib/icudata b/contrib/icudata
index 4904951339a..c8e717892a5 160000
--- a/contrib/icudata
+++ b/contrib/icudata
@@ -1 +1 @@
-Subproject commit 4904951339a70b4814d2d3723436b20d079cb01b
+Subproject commit c8e717892a557b4d2852317c7d628aacc0a0e5ab
diff --git a/contrib/libarchive b/contrib/libarchive
index 313aa1fa10b..ee457961713 160000
--- a/contrib/libarchive
+++ b/contrib/libarchive
@@ -1 +1 @@
-Subproject commit 313aa1fa10b657de791e3202c168a6c833bc3543
+Subproject commit ee45796171324519f0c0bfd012018dd099296336
diff --git a/contrib/libarchive-cmake/CMakeLists.txt b/contrib/libarchive-cmake/CMakeLists.txt
index aa6dd9638b6..e89770da5f6 100644
--- a/contrib/libarchive-cmake/CMakeLists.txt
+++ b/contrib/libarchive-cmake/CMakeLists.txt
@@ -1,6 +1,6 @@
 set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/libarchive")
 
-set(SRCS
+set(SRCS 
     "${LIBRARY_DIR}/libarchive/archive_acl.c"
     "${LIBRARY_DIR}/libarchive/archive_blake2sp_ref.c"
     "${LIBRARY_DIR}/libarchive/archive_blake2s_ref.c"
@@ -135,7 +135,7 @@ set(SRCS
 )
 
 add_library(_libarchive ${SRCS})
-target_include_directories(_libarchive PUBLIC
+target_include_directories(_libarchive PUBLIC 
     ${CMAKE_CURRENT_SOURCE_DIR}
     "${LIBRARY_DIR}/libarchive"
 )
@@ -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 HAVE_ZSTD_compressStream=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()
 
@@ -179,4 +179,4 @@ if (OS_LINUX)
     )
 endif()
 
-add_library(ch_contrib::libarchive ALIAS _libarchive)
+add_library(ch_contrib::libarchive ALIAS _libarchive)
\ No newline at end of file
diff --git a/contrib/libarchive-cmake/config.h b/contrib/libarchive-cmake/config.h
index 9696cfb112d..0b0cab47a52 100644
--- a/contrib/libarchive-cmake/config.h
+++ b/contrib/libarchive-cmake/config.h
@@ -334,16 +334,13 @@ typedef uint64_t uintmax_t;
 /* #undef ARCHIVE_XATTR_LINUX */
 
 /* Version number of bsdcpio */
-#define BSDCPIO_VERSION_STRING "3.7.4"
+#define BSDCPIO_VERSION_STRING "3.7.0"
 
 /* Version number of bsdtar */
-#define BSDTAR_VERSION_STRING "3.7.4"
+#define BSDTAR_VERSION_STRING "3.7.0"
 
 /* Version number of bsdcat */
-#define BSDCAT_VERSION_STRING "3.7.4"
-
-/* Version number of bsdunzip */
-#define BSDUNZIP_VERSION_STRING "3.7.4"
+#define BSDCAT_VERSION_STRING "3.7.0"
 
 /* Define to 1 if you have the `acl_create_entry' function. */
 /* #undef HAVE_ACL_CREATE_ENTRY */
@@ -645,8 +642,8 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the `getgrnam_r' function. */
 #define HAVE_GETGRNAM_R 1
 
-/* Define to 1 if you have the `getline' function. */
-#define HAVE_GETLINE 1
+/* Define to 1 if platform uses `optreset` to reset `getopt` */
+#define HAVE_GETOPT_OPTRESET 1
 
 /* Define to 1 if you have the `getpid' function. */
 #define HAVE_GETPID 1
@@ -753,12 +750,6 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the `pcreposix' library (-lpcreposix). */
 /* #undef HAVE_LIBPCREPOSIX */
 
-/* Define to 1 if you have the `pcre2-8' library (-lpcre2-8). */
-/* #undef HAVE_LIBPCRE2 */
-
-/* Define to 1 if you have the `pcreposix' library (-lpcre2posix). */
-/* #undef HAVE_LIBPCRE2POSIX */
-
 /* Define to 1 if you have the `xml2' library (-lxml2). */
 #define HAVE_LIBXML2 1
 
@@ -774,8 +765,9 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the `zstd' library (-lzstd). */
 /* #undef HAVE_LIBZSTD */
 
-/* Define to 1 if you have the ZSTD_compressStream function. */
-/* #undef HAVE_ZSTD_compressStream */
+/* Define to 1 if you have the `zstd' library (-lzstd) with compression
+   support. */
+/* #undef HAVE_LIBZSTD_COMPRESSOR */
 
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
@@ -931,9 +923,6 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the <pcreposix.h> header file. */
 /* #undef HAVE_PCREPOSIX_H */
 
-/* Define to 1 if you have the <pcre2posix.h> header file. */
-/* #undef HAVE_PCRE2POSIX_H */
-
 /* Define to 1 if you have the `pipe' function. */
 #define HAVE_PIPE 1
 
@@ -1040,12 +1029,6 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the `strrchr' function. */
 #define HAVE_STRRCHR 1
 
-/* Define to 1 if the system has the type `struct statfs'. */
-/* #undef HAVE_STRUCT_STATFS */
-
-/* Define to 1 if `f_iosize' is a member of `struct statfs'. */
-/* #undef HAVE_STRUCT_STATFS_F_IOSIZE */
-
 /* Define to 1 if `f_namemax' is a member of `struct statfs'. */
 /* #undef HAVE_STRUCT_STATFS_F_NAMEMAX */
 
@@ -1094,9 +1077,6 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the `symlink' function. */
 #define HAVE_SYMLINK 1
 
-/* Define to 1 if you have the `sysconf' function. */
-#define HAVE_SYSCONF 1
-
 /* Define to 1 if you have the <sys/acl.h> header file. */
 /* #undef HAVE_SYS_ACL_H */
 
@@ -1293,13 +1273,13 @@ typedef uint64_t uintmax_t;
 /* #undef HAVE__MKGMTIME */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST
+#define ICONV_CONST 
 
 /* Version number of libarchive as a single integer */
-#define LIBARCHIVE_VERSION_NUMBER "3007004"
+#define LIBARCHIVE_VERSION_NUMBER "3007000"
 
 /* Version number of libarchive */
-#define LIBARCHIVE_VERSION_STRING "3.7.4"
+#define LIBARCHIVE_VERSION_STRING "3.7.0"
 
 /* Define to 1 if `lstat' dereferences a symlink specified with a trailing
    slash. */
@@ -1353,7 +1333,7 @@ typedef uint64_t uintmax_t;
 #endif /* SAFE_TO_DEFINE_EXTENSIONS */
 
 /* Version number of package */
-#define VERSION "3.7.4"
+#define VERSION "3.7.0"
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
diff --git a/contrib/libfiu b/contrib/libfiu
index a1290d8cd3d..b85edbde4cf 160000
--- a/contrib/libfiu
+++ b/contrib/libfiu
@@ -1 +1 @@
-Subproject commit a1290d8cd3d7b4541d6c976e0a54f572ac03f2a3
+Subproject commit b85edbde4cf974b1b40d27828a56f0505f4e2ee5
diff --git a/contrib/libfiu-cmake/CMakeLists.txt b/contrib/libfiu-cmake/CMakeLists.txt
index eab55087c98..e805491edbb 100644
--- a/contrib/libfiu-cmake/CMakeLists.txt
+++ b/contrib/libfiu-cmake/CMakeLists.txt
@@ -1,21 +1,20 @@
-if (NOT ENABLE_LIBFIU)
-  message (STATUS "Not using libfiu")
+if (NOT ENABLE_FIU)
+  message (STATUS "Not using fiu")
   return ()
 endif ()
 
-set(LIBFIU_DIR "${ClickHouse_SOURCE_DIR}/contrib/libfiu/")
+set(FIU_DIR "${ClickHouse_SOURCE_DIR}/contrib/libfiu/")
 
-set(LIBFIU_SOURCES
-    ${LIBFIU_DIR}/libfiu/fiu.c
-    ${LIBFIU_DIR}/libfiu/fiu-rc.c
-    ${LIBFIU_DIR}/libfiu/backtrace.c
-    ${LIBFIU_DIR}/libfiu/wtable.c
+set(FIU_SOURCES
+  ${FIU_DIR}/libfiu/fiu.c
+  ${FIU_DIR}/libfiu/fiu-rc.c
+  ${FIU_DIR}/libfiu/backtrace.c
+  ${FIU_DIR}/libfiu/wtable.c
 )
 
-set(LIBFIU_HEADERS "${LIBFIU_DIR}/libfiu")
+set(FIU_HEADERS "${FIU_DIR}/libfiu")
 
-add_library(_libfiu ${LIBFIU_SOURCES})
-target_compile_definitions(_libfiu PUBLIC DUMMY_BACKTRACE)
-target_compile_definitions(_libfiu PUBLIC FIU_ENABLE)
-target_include_directories(_libfiu PUBLIC ${LIBFIU_HEADERS})
-add_library(ch_contrib::libfiu ALIAS _libfiu)
+add_library(_fiu ${FIU_SOURCES})
+target_compile_definitions(_fiu PUBLIC DUMMY_BACKTRACE)
+target_include_directories(_fiu PUBLIC ${FIU_HEADERS})
+add_library(ch_contrib::fiu ALIAS _fiu)
diff --git a/contrib/libprotobuf-mutator b/contrib/libprotobuf-mutator
index b922c8ab900..a304ec48dcf 160000
--- a/contrib/libprotobuf-mutator
+++ b/contrib/libprotobuf-mutator
@@ -1 +1 @@
-Subproject commit b922c8ab9004ef9944982e4f165e2747b13223fa
+Subproject commit a304ec48dcf15d942607032151f7e9ee504b5dcf
diff --git a/contrib/librdkafka b/contrib/librdkafka
index 39d4ed49ccf..2d2aab6f5b7 160000
--- a/contrib/librdkafka
+++ b/contrib/librdkafka
@@ -1 +1 @@
-Subproject commit 39d4ed49ccf3406e2bf825d5d7b0903b5a290782
+Subproject commit 2d2aab6f5b79db1cfca15d7bf0dee75d00d82082
diff --git a/contrib/libunwind b/contrib/libunwind
index 601db0b0e03..fe854449e24 160000
--- a/contrib/libunwind
+++ b/contrib/libunwind
@@ -1 +1 @@
-Subproject commit 601db0b0e03018c01710470a37703b618f9cf08b
+Subproject commit fe854449e24bedfa26e38465b84374312dbd587f
diff --git a/contrib/libuv b/contrib/libuv
index 714b58b9849..4482964660c 160000
--- a/contrib/libuv
+++ b/contrib/libuv
@@ -1 +1 @@
-Subproject commit 714b58b9849568211ade86b44dd91d37f8a2175e
+Subproject commit 4482964660c77eec1166cd7d14fb915e3dbd774a
diff --git a/contrib/libuv-cmake/CMakeLists.txt b/contrib/libuv-cmake/CMakeLists.txt
index 22df1e9a102..928fdcdd7e6 100644
--- a/contrib/libuv-cmake/CMakeLists.txt
+++ b/contrib/libuv-cmake/CMakeLists.txt
@@ -10,7 +10,6 @@ set(uv_sources
     src/random.c
     src/strscpy.c
     src/strtok.c
-    src/thread-common.c
     src/threadpool.c
     src/timer.c
     src/uv-common.c
@@ -71,7 +70,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   list(APPEND uv_defines _GNU_SOURCE _POSIX_C_SOURCE=200112)
   list(APPEND uv_libraries rt)
   list(APPEND uv_sources
-       src/unix/linux.c
+       src/unix/epoll.c
+       src/unix/linux-core.c
+       src/unix/linux-inotify.c
+       src/unix/linux-syscalls.c
        src/unix/procfs-exepath.c
        src/unix/random-getrandom.c
        src/unix/random-sysctl-linux.c)
diff --git a/contrib/llvm-project-cmake/CMakeLists.txt b/contrib/llvm-project-cmake/CMakeLists.txt
index f5dce1c4178..76e620314a2 100644
--- a/contrib/llvm-project-cmake/CMakeLists.txt
+++ b/contrib/llvm-project-cmake/CMakeLists.txt
@@ -140,12 +140,6 @@ if (CMAKE_CROSSCOMPILING)
     message (STATUS "CROSS COMPILING SET LLVM HOST TRIPLE ${LLVM_HOST_TRIPLE}")
 endif()
 
-# llvm-project/llvm/cmake/config-ix.cmake does a weird thing: it defines _LARGEFILE64_SOURCE,
-# then checks if lseek64() function exists, then undefines _LARGEFILE64_SOURCE.
-# Then the actual code that uses this function *doesn't* define _LARGEFILE64_SOURCE, so lseek64()
-# may not exist and compilation fails. This happens with musl.
-add_compile_definitions("_LARGEFILE64_SOURCE")
-
 add_subdirectory ("${LLVM_SOURCE_DIR}" "${LLVM_BINARY_DIR}")
 
 set_directory_properties (PROPERTIES
diff --git a/contrib/numactl b/contrib/numactl
deleted file mode 160000
index 8d13d63a05f..00000000000
--- a/contrib/numactl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8d13d63a05f0c3cd88bf777cbb61541202b7da08
diff --git a/contrib/numactl-cmake/CMakeLists.txt b/contrib/numactl-cmake/CMakeLists.txt
deleted file mode 100644
index a72ff11e485..00000000000
--- a/contrib/numactl-cmake/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-if (NOT (
-    OS_LINUX AND (ARCH_AMD64 OR ARCH_AARCH64 OR ARCH_LOONGARCH64))
-)
-    if (ENABLE_NUMACTL)
-        message (${RECONFIGURE_MESSAGE_LEVEL}
-            "numactl is disabled implicitly because the OS or architecture is not supported. Use -DENABLE_NUMACTL=0")
-    endif ()
-    set (ENABLE_NUMACTL OFF)
-else()
-    option (ENABLE_NUMACTL "Enable numactl" ${ENABLE_LIBRARIES})
-endif()
-
-if (NOT ENABLE_NUMACTL)
-    message (STATUS "Not using numactl")
-    return()
-endif ()
-
-set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/numactl")
-
-set (SRCS
-    "${LIBRARY_DIR}/libnuma.c"
-    "${LIBRARY_DIR}/syscall.c"
-)
-
-add_library(_numactl ${SRCS})
-
-target_include_directories(_numactl SYSTEM PRIVATE include)
-target_include_directories(_numactl SYSTEM PUBLIC "${LIBRARY_DIR}")
-
-add_library(ch_contrib::numactl ALIAS _numactl)
diff --git a/contrib/numactl-cmake/include/config.h b/contrib/numactl-cmake/include/config.h
deleted file mode 100644
index a304db38e53..00000000000
--- a/contrib/numactl-cmake/include/config.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Checking for symver attribute */
-#define HAVE_ATTRIBUTE_SYMVER 0
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_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 <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 <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_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 <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "numactl"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "numactl"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "numactl 2.1"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "numactl"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.1"
-
-/* Define to 1 if all of the C89 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
-
-/* If the compiler supports a TLS storage class define it to that here */
-#define TLS __thread
-
-/* Version number of package */
-#define VERSION "2.1"
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
-
-/* Define to 1 on platforms where this makes off_t a 64-bit type. */
-/* #undef _LARGE_FILES */
-
-/* Number of bits in time_t, on hosts where this is settable. */
-/* #undef _TIME_BITS */
-
-/* Define to 1 on platforms where this makes time_t a 64-bit type. */
-/* #undef __MINGW_USE_VC2005_COMPAT */
diff --git a/contrib/openssl b/contrib/openssl
index b3e62c440f3..66deddc1e53 160000
--- a/contrib/openssl
+++ b/contrib/openssl
@@ -1 +1 @@
-Subproject commit b3e62c440f390e12e77c80675f883af82ad3d5ed
+Subproject commit 66deddc1e53cda8706604a019777259372d1bd62
diff --git a/contrib/qpl b/contrib/qpl
index c2ced94c53c..d4715e0e798 160000
--- a/contrib/qpl
+++ b/contrib/qpl
@@ -1 +1 @@
-Subproject commit c2ced94c53c1ee22191201a59878e9280bc9b9b8
+Subproject commit d4715e0e79896b85612158e135ee1a85f3b3e04d
diff --git a/contrib/qpl-cmake/CMakeLists.txt b/contrib/qpl-cmake/CMakeLists.txt
index 89332ae0f7a..7a84048e16b 100644
--- a/contrib/qpl-cmake/CMakeLists.txt
+++ b/contrib/qpl-cmake/CMakeLists.txt
@@ -4,6 +4,7 @@ set (QPL_PROJECT_DIR "${ClickHouse_SOURCE_DIR}/contrib/qpl")
 set (QPL_SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/qpl/sources")
 set (QPL_BINARY_DIR "${ClickHouse_BINARY_DIR}/build/contrib/qpl")
 set (EFFICIENT_WAIT OFF)
+set (BLOCK_ON_FAULT ON)
 set (LOG_HW_INIT OFF)
 set (SANITIZE_MEMORY OFF)
 set (SANITIZE_THREADS OFF)
@@ -15,20 +16,16 @@ function(GetLibraryVersion _content _outputVar)
     SET(${_outputVar} ${CMAKE_MATCH_1} PARENT_SCOPE)
 endfunction()
 
-set (QPL_VERSION 1.6.0)
+set (QPL_VERSION 1.2.0)
 
 message(STATUS "Intel QPL version: ${QPL_VERSION}")
 
-# There are 5 source subdirectories under $QPL_SRC_DIR: c_api, core-iaa, core-sw, middle-layer and isal.
-# Generate 8 library targets: qpl_c_api, core_iaa, qplcore_px, qplcore_avx512, qplcore_sw_dispatcher, middle_layer_lib, isal and isal_asm,
-# which are then combined into static or shared qpl.
+# There are 5 source subdirectories under $QPL_SRC_DIR: isal, c_api, core-sw, middle-layer, c_api.
+# Generate 8 library targets: middle_layer_lib, isal, isal_asm, qplcore_px, qplcore_avx512, qplcore_sw_dispatcher, core_iaa, middle_layer_lib.
 # Output ch_contrib::qpl by linking with 8 library targets.
 
-# Note, QPL has integrated a customized version of ISA-L to meet specific needs.
-# This version has been significantly modified and there are no plans to maintain compatibility with the upstream version
-# or upgrade the current copy.
-
-## cmake/CompileOptions.cmake and automatic wrappers generation
+# The qpl submodule comes with its own version of isal. It contains code which does not exist in upstream isal. It would be nice to link
+# only upstream isal (ch_contrib::isal) but at this point we can't.
 
 # ==========================================================================
 # Copyright (C) 2022 Intel Corporation
@@ -445,7 +442,6 @@ function(generate_unpack_kernel_arrays current_directory PLATFORMS_LIST)
     endforeach()
 endfunction()
 
-# [SUBDIR]isal
 
 enable_language(ASM_NASM)
 
@@ -483,6 +479,7 @@ set(ISAL_ASM_SRC ${QPL_SRC_DIR}/isal/igzip/igzip_body.asm
                  ${QPL_SRC_DIR}/isal/igzip/igzip_set_long_icf_fg_04.asm
                  ${QPL_SRC_DIR}/isal/igzip/igzip_set_long_icf_fg_06.asm
                  ${QPL_SRC_DIR}/isal/igzip/igzip_multibinary.asm
+                 ${QPL_SRC_DIR}/isal/igzip/stdmac.asm
                  ${QPL_SRC_DIR}/isal/crc/crc_multibinary.asm
                  ${QPL_SRC_DIR}/isal/crc/crc32_gzip_refl_by8.asm
                  ${QPL_SRC_DIR}/isal/crc/crc32_gzip_refl_by8_02.asm
@@ -508,6 +505,7 @@ set_property(GLOBAL APPEND PROPERTY QPL_LIB_DEPS
 # Setting external and internal interfaces for ISA-L library
 target_include_directories(isal
                         PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/isal/include>
+                        PRIVATE ${QPL_SRC_DIR}/isal/include
                         PUBLIC ${QPL_SRC_DIR}/isal/igzip)
 
 set_target_properties(isal PROPERTIES
@@ -619,9 +617,12 @@ target_compile_options(qplcore_sw_dispatcher
 
 # [SUBDIR]core-iaa
 file(GLOB HW_PATH_SRC ${QPL_SRC_DIR}/core-iaa/sources/aecs/*.c
+                      ${QPL_SRC_DIR}/core-iaa/sources/aecs/*.cpp
                       ${QPL_SRC_DIR}/core-iaa/sources/driver_loader/*.c
+                      ${QPL_SRC_DIR}/core-iaa/sources/driver_loader/*.cpp
                       ${QPL_SRC_DIR}/core-iaa/sources/descriptors/*.c
-                      ${QPL_SRC_DIR}/core-iaa/sources/*.c)
+                      ${QPL_SRC_DIR}/core-iaa/sources/descriptors/*.cpp
+                      ${QPL_SRC_DIR}/core-iaa/sources/bit_rev.c)
 
 # Create library
 add_library(core_iaa OBJECT ${HW_PATH_SRC})
@@ -633,27 +634,31 @@ target_include_directories(core_iaa
         PRIVATE ${UUID_DIR}
         PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-iaa/include>
         PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/core-iaa/sources/include>
-        PRIVATE $<BUILD_INTERFACE:${QPL_PROJECT_DIR}/include> # status.h in own_checkers.h
-        PRIVATE $<TARGET_PROPERTY:qpl_c_api,INTERFACE_INCLUDE_DIRECTORIES> # for own_checkers.h
+        PRIVATE $<BUILD_INTERFACE:${QPL_PROJECT_DIR}/include>  # status.h in own_checkers.h
+        PRIVATE $<BUILD_INTERFACE:${QPL_PROJECT_DIR}/sources/c_api> # own_checkers.h
         PRIVATE $<TARGET_PROPERTY:qplcore_sw_dispatcher,INTERFACE_INCLUDE_DIRECTORIES>)
 
 target_compile_features(core_iaa PRIVATE c_std_11)
 
 target_compile_definitions(core_iaa PRIVATE QPL_BADARG_CHECK
+        PRIVATE $<$<BOOL:${BLOCK_ON_FAULT}>: BLOCK_ON_FAULT_ENABLED>
         PRIVATE $<$<BOOL:${LOG_HW_INIT}>:LOG_HW_INIT>
         PRIVATE $<$<BOOL:${DYNAMIC_LOADING_LIBACCEL_CONFIG}>:DYNAMIC_LOADING_LIBACCEL_CONFIG>)
 
 # [SUBDIR]middle-layer
 file(GLOB MIDDLE_LAYER_SRC
-        ${QPL_SRC_DIR}/middle-layer/accelerator/*.cpp
-	    ${QPL_SRC_DIR}/middle-layer/analytics/*.cpp
+        ${QPL_SRC_DIR}/middle-layer/analytics/*.cpp
+        ${QPL_SRC_DIR}/middle-layer/c_wrapper/*.cpp
+        ${QPL_SRC_DIR}/middle-layer/checksum/*.cpp
         ${QPL_SRC_DIR}/middle-layer/common/*.cpp
         ${QPL_SRC_DIR}/middle-layer/compression/*.cpp
         ${QPL_SRC_DIR}/middle-layer/compression/*/*.cpp
         ${QPL_SRC_DIR}/middle-layer/compression/*/*/*.cpp
         ${QPL_SRC_DIR}/middle-layer/dispatcher/*.cpp
         ${QPL_SRC_DIR}/middle-layer/other/*.cpp
-        ${QPL_SRC_DIR}/middle-layer/util/*.cpp)
+        ${QPL_SRC_DIR}/middle-layer/util/*.cpp
+        ${QPL_SRC_DIR}/middle-layer/inflate/*.cpp
+        ${QPL_SRC_DIR}/core-iaa/sources/accelerator/*.cpp) # todo
 
 add_library(middle_layer_lib OBJECT
         ${MIDDLE_LAYER_SRC})
@@ -662,7 +667,6 @@ set_property(GLOBAL APPEND PROPERTY QPL_LIB_DEPS
         $<TARGET_OBJECTS:middle_layer_lib>)
 
 target_compile_options(middle_layer_lib
-        PRIVATE $<$<C_COMPILER_ID:GNU,Clang>:$<$<CONFIG:Release>:-O3;-U_FORTIFY_SOURCE;-D_FORTIFY_SOURCE=2>>
         PRIVATE ${QPL_LINUX_TOOLCHAIN_CPP_EMBEDDED_FLAGS})
 
 target_compile_definitions(middle_layer_lib
@@ -678,7 +682,6 @@ target_include_directories(middle_layer_lib
         PRIVATE ${UUID_DIR}
         PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/middle-layer>
         PUBLIC $<TARGET_PROPERTY:_qpl,INTERFACE_INCLUDE_DIRECTORIES>
-        PRIVATE $<TARGET_PROPERTY:qpl_c_api,INTERFACE_INCLUDE_DIRECTORIES>
         PUBLIC $<TARGET_PROPERTY:qplcore_sw_dispatcher,INTERFACE_INCLUDE_DIRECTORIES>
         PUBLIC $<TARGET_PROPERTY:isal,INTERFACE_INCLUDE_DIRECTORIES>
         PUBLIC $<TARGET_PROPERTY:core_iaa,INTERFACE_INCLUDE_DIRECTORIES>)
@@ -686,50 +689,31 @@ target_include_directories(middle_layer_lib
 target_compile_definitions(middle_layer_lib PUBLIC -DQPL_LIB)
 
 # [SUBDIR]c_api
-file(GLOB QPL_C_API_SRC
-        ${QPL_SRC_DIR}/c_api/compression_operations/*.c
-        ${QPL_SRC_DIR}/c_api/compression_operations/*.cpp
-	    ${QPL_SRC_DIR}/c_api/filter_operations/*.cpp
-	    ${QPL_SRC_DIR}/c_api/legacy_hw_path/*.c
-	    ${QPL_SRC_DIR}/c_api/legacy_hw_path/*.cpp
-	    ${QPL_SRC_DIR}/c_api/other_operations/*.cpp
-	    ${QPL_SRC_DIR}/c_api/serialization/*.cpp
-	    ${QPL_SRC_DIR}/c_api/*.cpp)
-
-add_library(qpl_c_api OBJECT ${QPL_C_API_SRC})
-
-target_include_directories(qpl_c_api
-	    PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/c_api/>
-        PUBLIC $<BUILD_INTERFACE:${QPL_SRC_DIR}/include/> $<INSTALL_INTERFACE:include>
-        PRIVATE $<TARGET_PROPERTY:middle_layer_lib,INTERFACE_INCLUDE_DIRECTORIES>)
-
-set_target_properties(qpl_c_api PROPERTIES
-	$<$<C_COMPILER_ID:GNU,Clang>:C_STANDARD 17
-	CXX_STANDARD 17)
-
-target_compile_options(qpl_c_api
-        PRIVATE $<$<C_COMPILER_ID:GNU,Clang>:$<$<CONFIG:Release>:-O3;-U_FORTIFY_SOURCE;-D_FORTIFY_SOURCE=2>>
-	    PRIVATE $<$<COMPILE_LANG_AND_ID:CXX,GNU,Clang>:${QPL_LINUX_TOOLCHAIN_CPP_EMBEDDED_FLAGS}>)
-
-target_compile_definitions(qpl_c_api
-        PUBLIC -DQPL_BADARG_CHECK # own_checkers.h
-        PUBLIC -DQPL_LIB          # needed for middle_layer_lib
-        PUBLIC $<$<BOOL:${LOG_HW_INIT}>:LOG_HW_INIT>) # needed for middle_layer_lib
-
-set_property(GLOBAL APPEND PROPERTY QPL_LIB_DEPS
-        $<TARGET_OBJECTS:qpl_c_api>)
-
-# Final _qpl target
+file(GLOB_RECURSE QPL_C_API_SRC
+        ${QPL_SRC_DIR}/c_api/*.c
+        ${QPL_SRC_DIR}/c_api/*.cpp)
 
 get_property(LIB_DEPS GLOBAL PROPERTY QPL_LIB_DEPS)
 
-add_library(_qpl STATIC ${LIB_DEPS})
+add_library(_qpl STATIC ${QPL_C_API_SRC} ${LIB_DEPS})
 
 target_include_directories(_qpl
-        PUBLIC $<BUILD_INTERFACE:${QPL_PROJECT_DIR}/include/> $<INSTALL_INTERFACE:include>)
+        PUBLIC $<BUILD_INTERFACE:${QPL_PROJECT_DIR}/include/> $<INSTALL_INTERFACE:include>
+        PRIVATE $<TARGET_PROPERTY:middle_layer_lib,INTERFACE_INCLUDE_DIRECTORIES>
+        PRIVATE $<BUILD_INTERFACE:${QPL_SRC_DIR}/c_api>)
+
+target_compile_options(_qpl
+        PRIVATE ${QPL_LINUX_TOOLCHAIN_CPP_EMBEDDED_FLAGS})
+
+target_compile_definitions(_qpl
+        PRIVATE -DQPL_LIB
+        PRIVATE -DQPL_BADARG_CHECK
+        PRIVATE $<$<BOOL:${DYNAMIC_LOADING_LIBACCEL_CONFIG}>:DYNAMIC_LOADING_LIBACCEL_CONFIG>
+        PUBLIC -DENABLE_QPL_COMPRESSION)
 
 target_link_libraries(_qpl
-        PRIVATE ch_contrib::accel-config)
+        PRIVATE ch_contrib::accel-config
+        PRIVATE ch_contrib::isal)
 
 target_include_directories(_qpl SYSTEM BEFORE
         PUBLIC "${QPL_PROJECT_DIR}/include"
diff --git a/contrib/replxx b/contrib/replxx
index 711c18e7f4d..5d04501f93a 160000
--- a/contrib/replxx
+++ b/contrib/replxx
@@ -1 +1 @@
-Subproject commit 711c18e7f4d951255aa8b0851e5a55d5a5fb0ddb
+Subproject commit 5d04501f93a4fb7f0bb8b73b8f614bc986f9e25b
diff --git a/contrib/robin-map b/contrib/robin-map
new file mode 160000
index 00000000000..851a59e0e30
--- /dev/null
+++ b/contrib/robin-map
@@ -0,0 +1 @@
+Subproject commit 851a59e0e3063ee0e23089062090a73fd3de482d
diff --git a/contrib/robin-map-cmake/CMakeLists.txt b/contrib/robin-map-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..f82ad705dcc
--- /dev/null
+++ b/contrib/robin-map-cmake/CMakeLists.txt
@@ -0,0 +1 @@
+# See contrib/usearch-cmake/CMakeLists.txt
diff --git a/contrib/rocksdb b/contrib/rocksdb
index 5f003e4a22d..be366233921 160000
--- a/contrib/rocksdb
+++ b/contrib/rocksdb
@@ -1 +1 @@
-Subproject commit 5f003e4a22d2e48e37c98d9620241237cd30dd24
+Subproject commit be366233921293bd07a84dc4ea6991858665f202
diff --git a/contrib/rocksdb-cmake/CMakeLists.txt b/contrib/rocksdb-cmake/CMakeLists.txt
index 44aa7494607..3a14407166c 100644
--- a/contrib/rocksdb-cmake/CMakeLists.txt
+++ b/contrib/rocksdb-cmake/CMakeLists.txt
@@ -1,46 +1,56 @@
 option (ENABLE_ROCKSDB "Enable RocksDB" ${ENABLE_LIBRARIES})
 
-if (NOT ENABLE_ROCKSDB OR NO_SSE3_OR_HIGHER) # assumes SSE4.2 and PCLMUL
+if (NOT ENABLE_ROCKSDB)
   message (STATUS "Not using RocksDB")
   return()
 endif()
 
+# Always disable jemalloc for rocksdb by default because it introduces non-standard jemalloc APIs
+option(WITH_JEMALLOC "build with JeMalloc" OFF)
+
+option(WITH_LIBURING "build with liburing" OFF) # TODO could try to enable this conditionally, depending on ClickHouse's ENABLE_LIBURING
+
 # ClickHouse cannot be compiled without snappy, lz4, zlib, zstd
 option(WITH_SNAPPY "build with SNAPPY" ON)
 option(WITH_LZ4 "build with lz4" ON)
 option(WITH_ZLIB "build with zlib" ON)
 option(WITH_ZSTD "build with zstd" ON)
 
-if (ENABLE_JEMALLOC AND OS_LINUX) # gives compile errors with jemalloc enabled for rocksdb on non-Linux
-  add_definitions(-DROCKSDB_JEMALLOC -DJEMALLOC_NO_DEMANGLE)
-  list (APPEND THIRDPARTY_LIBS ch_contrib::jemalloc)
-endif ()
+# third-party/folly is only validated to work on Linux and Windows for now.
+# So only turn it on there by default.
+if(CMAKE_SYSTEM_NAME MATCHES "Linux|Windows")
+  option(WITH_FOLLY_DISTRIBUTED_MUTEX "build with folly::DistributedMutex" ON)
+else()
+  option(WITH_FOLLY_DISTRIBUTED_MUTEX "build with folly::DistributedMutex" OFF)
+endif()
 
-if (ENABLE_LIBURING)
-  add_definitions(-DROCKSDB_IOURING_PRESENT)
-  list (APPEND THIRDPARTY_LIBS ch_contrib::liburing)
-endif ()
-
-if (WITH_SNAPPY)
+if(WITH_SNAPPY)
   add_definitions(-DSNAPPY)
   list(APPEND THIRDPARTY_LIBS ch_contrib::snappy)
 endif()
 
-if (WITH_ZLIB)
+if(WITH_ZLIB)
   add_definitions(-DZLIB)
   list(APPEND THIRDPARTY_LIBS ch_contrib::zlib)
 endif()
 
-if (WITH_LZ4)
+if(WITH_LZ4)
   add_definitions(-DLZ4)
   list(APPEND THIRDPARTY_LIBS ch_contrib::lz4)
 endif()
 
-if (WITH_ZSTD)
+if(WITH_ZSTD)
   add_definitions(-DZSTD)
   list(APPEND THIRDPARTY_LIBS ch_contrib::zstd)
 endif()
 
+option(PORTABLE "build a portable binary" ON)
+
+if(ENABLE_SSE42 AND ENABLE_PCLMULQDQ)
+  add_definitions(-DHAVE_SSE42)
+  add_definitions(-DHAVE_PCLMUL)
+endif()
+
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64|AARCH64")
   set (HAS_ARMV8_CRC 1)
   # the original build descriptions set specific flags for ARM. These flags are already subsumed by ClickHouse's general
@@ -49,6 +59,11 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64|AARCH64")
   # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crc+crypto -Wno-unused-function")
 endif()
 
+set (HAVE_THREAD_LOCAL 1)
+if(HAVE_THREAD_LOCAL)
+  add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL)
+endif()
+
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   add_definitions(-DOS_MACOSX)
 elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -74,24 +89,19 @@ set(ROCKSDB_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/rocksdb")
 
 include_directories(${ROCKSDB_SOURCE_DIR})
 include_directories("${ROCKSDB_SOURCE_DIR}/include")
+if(WITH_FOLLY_DISTRIBUTED_MUTEX)
+  include_directories("${ROCKSDB_SOURCE_DIR}/third-party/folly")
+endif()
 
 set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/cache/cache.cc
     ${ROCKSDB_SOURCE_DIR}/cache/cache_entry_roles.cc
     ${ROCKSDB_SOURCE_DIR}/cache/cache_key.cc
-    ${ROCKSDB_SOURCE_DIR}/cache/cache_helpers.cc
     ${ROCKSDB_SOURCE_DIR}/cache/cache_reservation_manager.cc
-    ${ROCKSDB_SOURCE_DIR}/cache/charged_cache.cc
     ${ROCKSDB_SOURCE_DIR}/cache/clock_cache.cc
-    ${ROCKSDB_SOURCE_DIR}/cache/compressed_secondary_cache.cc
     ${ROCKSDB_SOURCE_DIR}/cache/lru_cache.cc
-    ${ROCKSDB_SOURCE_DIR}/cache/secondary_cache.cc
-    ${ROCKSDB_SOURCE_DIR}/cache/secondary_cache_adapter.cc
     ${ROCKSDB_SOURCE_DIR}/cache/sharded_cache.cc
-    ${ROCKSDB_SOURCE_DIR}/cache/tiered_secondary_cache.cc
     ${ROCKSDB_SOURCE_DIR}/db/arena_wrapped_db_iter.cc
-    ${ROCKSDB_SOURCE_DIR}/db/attribute_group_iterator_impl.cc
-    ${ROCKSDB_SOURCE_DIR}/db/blob/blob_contents.cc
     ${ROCKSDB_SOURCE_DIR}/db/blob/blob_fetcher.cc
     ${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_addition.cc
     ${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_builder.cc
@@ -103,11 +113,9 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/db/blob/blob_log_format.cc
     ${ROCKSDB_SOURCE_DIR}/db/blob/blob_log_sequential_reader.cc
     ${ROCKSDB_SOURCE_DIR}/db/blob/blob_log_writer.cc
-    ${ROCKSDB_SOURCE_DIR}/db/blob/blob_source.cc
     ${ROCKSDB_SOURCE_DIR}/db/blob/prefetch_buffer_collection.cc
     ${ROCKSDB_SOURCE_DIR}/db/builder.cc
     ${ROCKSDB_SOURCE_DIR}/db/c.cc
-    ${ROCKSDB_SOURCE_DIR}/db/coalescing_iterator.cc
     ${ROCKSDB_SOURCE_DIR}/db/column_family.cc
     ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction.cc
     ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_iterator.cc
@@ -116,11 +124,7 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_picker_fifo.cc
     ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_picker_level.cc
     ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_picker_universal.cc
-    ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_service_job.cc
-    ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_state.cc
-    ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_outputs.cc
     ${ROCKSDB_SOURCE_DIR}/db/compaction/sst_partitioner.cc
-    ${ROCKSDB_SOURCE_DIR}/db/compaction/subcompaction_state.cc
     ${ROCKSDB_SOURCE_DIR}/db/convenience.cc
     ${ROCKSDB_SOURCE_DIR}/db/db_filesnapshot.cc
     ${ROCKSDB_SOURCE_DIR}/db/db_impl/compacted_db_impl.cc
@@ -128,7 +132,6 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_write.cc
     ${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_compaction_flush.cc
     ${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_files.cc
-    ${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_follower.cc
     ${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_open.cc
     ${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_debug.cc
     ${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_experimental.cc
@@ -156,11 +159,10 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/db/merge_helper.cc
     ${ROCKSDB_SOURCE_DIR}/db/merge_operator.cc
     ${ROCKSDB_SOURCE_DIR}/db/output_validator.cc
-    ${ROCKSDB_SOURCE_DIR}/db/periodic_task_scheduler.cc
+    ${ROCKSDB_SOURCE_DIR}/db/periodic_work_scheduler.cc
     ${ROCKSDB_SOURCE_DIR}/db/range_del_aggregator.cc
     ${ROCKSDB_SOURCE_DIR}/db/range_tombstone_fragmenter.cc
     ${ROCKSDB_SOURCE_DIR}/db/repair.cc
-    ${ROCKSDB_SOURCE_DIR}/db/seqno_to_time_mapping.cc
     ${ROCKSDB_SOURCE_DIR}/db/snapshot_impl.cc
     ${ROCKSDB_SOURCE_DIR}/db/table_cache.cc
     ${ROCKSDB_SOURCE_DIR}/db/table_properties_collector.cc
@@ -172,21 +174,17 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/db/version_set.cc
     ${ROCKSDB_SOURCE_DIR}/db/wal_edit.cc
     ${ROCKSDB_SOURCE_DIR}/db/wal_manager.cc
-    ${ROCKSDB_SOURCE_DIR}/db/wide/wide_column_serialization.cc
-    ${ROCKSDB_SOURCE_DIR}/db/wide/wide_columns.cc
-    ${ROCKSDB_SOURCE_DIR}/db/wide/wide_columns_helper.cc
     ${ROCKSDB_SOURCE_DIR}/db/write_batch.cc
     ${ROCKSDB_SOURCE_DIR}/db/write_batch_base.cc
     ${ROCKSDB_SOURCE_DIR}/db/write_controller.cc
-    ${ROCKSDB_SOURCE_DIR}/db/write_stall_stats.cc
     ${ROCKSDB_SOURCE_DIR}/db/write_thread.cc
     ${ROCKSDB_SOURCE_DIR}/env/composite_env.cc
     ${ROCKSDB_SOURCE_DIR}/env/env.cc
     ${ROCKSDB_SOURCE_DIR}/env/env_chroot.cc
     ${ROCKSDB_SOURCE_DIR}/env/env_encryption.cc
+    ${ROCKSDB_SOURCE_DIR}/env/env_hdfs.cc
     ${ROCKSDB_SOURCE_DIR}/env/file_system.cc
     ${ROCKSDB_SOURCE_DIR}/env/file_system_tracer.cc
-    ${ROCKSDB_SOURCE_DIR}/env/fs_on_demand.cc
     ${ROCKSDB_SOURCE_DIR}/env/fs_remap.cc
     ${ROCKSDB_SOURCE_DIR}/env/mock_env.cc
     ${ROCKSDB_SOURCE_DIR}/env/unique_id_gen.cc
@@ -232,21 +230,19 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/options/configurable.cc
     ${ROCKSDB_SOURCE_DIR}/options/customizable.cc
     ${ROCKSDB_SOURCE_DIR}/options/db_options.cc
-    ${ROCKSDB_SOURCE_DIR}/options/offpeak_time_info.cc
     ${ROCKSDB_SOURCE_DIR}/options/options.cc
     ${ROCKSDB_SOURCE_DIR}/options/options_helper.cc
     ${ROCKSDB_SOURCE_DIR}/options/options_parser.cc
-    ${ROCKSDB_SOURCE_DIR}/port/mmap.cc
     ${ROCKSDB_SOURCE_DIR}/port/stack_trace.cc
     ${ROCKSDB_SOURCE_DIR}/table/adaptive/adaptive_table_factory.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/binary_search_index_reader.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/block.cc
+    ${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_filter_block.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_table_builder.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_table_factory.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_table_iterator.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_table_reader.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/block_builder.cc
-    ${ROCKSDB_SOURCE_DIR}/table/block_based/block_cache.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/block_prefetcher.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/block_prefix_index.cc
     ${ROCKSDB_SOURCE_DIR}/table/block_based/data_block_hash_index.cc
@@ -272,7 +268,6 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/table/get_context.cc
     ${ROCKSDB_SOURCE_DIR}/table/iterator.cc
     ${ROCKSDB_SOURCE_DIR}/table/merging_iterator.cc
-    ${ROCKSDB_SOURCE_DIR}/table/compaction_merging_iterator.cc
     ${ROCKSDB_SOURCE_DIR}/table/meta_blocks.cc
     ${ROCKSDB_SOURCE_DIR}/table/persistent_cache_helper.cc
     ${ROCKSDB_SOURCE_DIR}/table/plain/plain_table_bloom.cc
@@ -305,34 +300,27 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/trace_replay/trace_record_result.cc
     ${ROCKSDB_SOURCE_DIR}/trace_replay/trace_record.cc
     ${ROCKSDB_SOURCE_DIR}/trace_replay/trace_replay.cc
-    ${ROCKSDB_SOURCE_DIR}/util/async_file_reader.cc
-    ${ROCKSDB_SOURCE_DIR}/util/cleanable.cc
     ${ROCKSDB_SOURCE_DIR}/util/coding.cc
     ${ROCKSDB_SOURCE_DIR}/util/compaction_job_stats_impl.cc
     ${ROCKSDB_SOURCE_DIR}/util/comparator.cc
-    ${ROCKSDB_SOURCE_DIR}/util/compression.cc
     ${ROCKSDB_SOURCE_DIR}/util/compression_context_cache.cc
     ${ROCKSDB_SOURCE_DIR}/util/concurrent_task_limiter_impl.cc
     ${ROCKSDB_SOURCE_DIR}/util/crc32c.cc
-    ${ROCKSDB_SOURCE_DIR}/util/data_structure.cc
     ${ROCKSDB_SOURCE_DIR}/util/dynamic_bloom.cc
     ${ROCKSDB_SOURCE_DIR}/util/hash.cc
     ${ROCKSDB_SOURCE_DIR}/util/murmurhash.cc
     ${ROCKSDB_SOURCE_DIR}/util/random.cc
     ${ROCKSDB_SOURCE_DIR}/util/rate_limiter.cc
+    ${ROCKSDB_SOURCE_DIR}/util/regex.cc
     ${ROCKSDB_SOURCE_DIR}/util/ribbon_config.cc
     ${ROCKSDB_SOURCE_DIR}/util/slice.cc
     ${ROCKSDB_SOURCE_DIR}/util/file_checksum_helper.cc
     ${ROCKSDB_SOURCE_DIR}/util/status.cc
-    ${ROCKSDB_SOURCE_DIR}/util/stderr_logger.cc
     ${ROCKSDB_SOURCE_DIR}/util/string_util.cc
     ${ROCKSDB_SOURCE_DIR}/util/thread_local.cc
     ${ROCKSDB_SOURCE_DIR}/util/threadpool_imp.cc
-    ${ROCKSDB_SOURCE_DIR}/util/udt_util.cc
-    ${ROCKSDB_SOURCE_DIR}/util/write_batch_util.cc
     ${ROCKSDB_SOURCE_DIR}/util/xxhash.cc
-    ${ROCKSDB_SOURCE_DIR}/utilities/agg_merge/agg_merge.cc
-    ${ROCKSDB_SOURCE_DIR}/utilities/backup/backup_engine.cc
+    ${ROCKSDB_SOURCE_DIR}/utilities/backupable/backupable_db.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_compaction_filter.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_db.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_db_impl.cc
@@ -347,7 +335,6 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/utilities/checkpoint/checkpoint_impl.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/compaction_filters.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc
-    ${ROCKSDB_SOURCE_DIR}/utilities/counted_fs.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/debug.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/env_mirror.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/env_timed.cc
@@ -374,7 +361,6 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/utilities/persistent_cache/volatile_tier_impl.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/simulator_cache/cache_simulator.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/simulator_cache/sim_cache.cc
-    ${ROCKSDB_SOURCE_DIR}/utilities/table_properties_collectors/compact_for_tiering_collector.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/table_properties_collectors/compact_on_deletion_collector.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/trace/file_trace_reader_writer.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/trace/replayer_impl.cc
@@ -395,7 +381,6 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/utilities/transactions/write_prepared_txn_db.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/transactions/write_unprepared_txn.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/transactions/write_unprepared_txn_db.cc
-    ${ROCKSDB_SOURCE_DIR}/utilities/types_util.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/ttl/db_ttl_impl.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/wal_filter.cc
     ${ROCKSDB_SOURCE_DIR}/utilities/write_batch_with_index/write_batch_with_index.cc
@@ -414,6 +399,12 @@ set(SOURCES
     ${ROCKSDB_SOURCE_DIR}/utilities/transactions/lock/range/range_tree/lib/util/memarena.cc
     build_version.cc) # generated by hand
 
+if(ENABLE_SSE42 AND ENABLE_PCLMULQDQ)
+  set_source_files_properties(
+    "${ROCKSDB_SOURCE_DIR}/util/crc32c.cc"
+    PROPERTIES COMPILE_FLAGS "-msse4.2 -mpclmul")
+endif()
+
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
   list(APPEND SOURCES
     "${ROCKSDB_SOURCE_DIR}/util/crc32c_ppc.c"
@@ -426,18 +417,23 @@ if(HAS_ARMV8_CRC)
 endif(HAS_ARMV8_CRC)
 
 list(APPEND SOURCES
-    ${ROCKSDB_SOURCE_DIR}/port/port_posix.cc
-    ${ROCKSDB_SOURCE_DIR}/env/env_posix.cc
-    ${ROCKSDB_SOURCE_DIR}/env/fs_posix.cc
-    ${ROCKSDB_SOURCE_DIR}/env/io_posix.cc)
+    "${ROCKSDB_SOURCE_DIR}/port/port_posix.cc"
+    "${ROCKSDB_SOURCE_DIR}/env/env_posix.cc"
+    "${ROCKSDB_SOURCE_DIR}/env/fs_posix.cc"
+    "${ROCKSDB_SOURCE_DIR}/env/io_posix.cc")
+
+if(WITH_FOLLY_DISTRIBUTED_MUTEX)
+  list(APPEND SOURCES
+    "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/detail/Futex.cpp"
+    "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/AtomicNotification.cpp"
+    "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/DistributedMutex.cpp"
+    "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/ParkingLot.cpp"
+    "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/WaitOptions.cpp")
+endif()
 
 add_library(_rocksdb ${SOURCES})
 add_library(ch_contrib::rocksdb ALIAS _rocksdb)
 target_link_libraries(_rocksdb PRIVATE ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
 
-# Not in the native build system but useful anyways:
-# Make all functions in xxHash.h inline. Beneficial for performance: https://github.com/Cyan4973/xxHash/tree/v0.8.2#build-modifiers
-target_compile_definitions (_rocksdb PRIVATE XXH_INLINE_ALL)
-
 # SYSTEM is required to overcome some issues
 target_include_directories(_rocksdb SYSTEM BEFORE INTERFACE "${ROCKSDB_SOURCE_DIR}/include")
diff --git a/contrib/rocksdb-cmake/build_version.cc b/contrib/rocksdb-cmake/build_version.cc
index d5ea56673e0..f9639da516f 100644
--- a/contrib/rocksdb-cmake/build_version.cc
+++ b/contrib/rocksdb-cmake/build_version.cc
@@ -1,33 +1,16 @@
 // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+/// This file was edited for ClickHouse.
 
 #include <memory>
 
 #include "rocksdb/version.h"
-#include "rocksdb/utilities/object_registry.h"
 #include "util/string_util.h"
 
 // The build script may replace these values with real values based
 // on whether or not GIT is available and the platform settings
-static const std::string rocksdb_build_git_sha  = "rocksdb_build_git_sha:72438a678872544809393b831c7273794c074215";
-static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:main";
-#define HAS_GIT_CHANGES 0
-#if HAS_GIT_CHANGES == 0
-// If HAS_GIT_CHANGES is 0, the GIT date is used.
-// Use the time the branch/tag was last modified
-static const std::string rocksdb_build_date = "rocksdb_build_date:2024-07-12 16:01:57";
-#else
-// If HAS_GIT_CHANGES is > 0, the branch/tag has modifications.
-// Use the time the build was created.
-static const std::string rocksdb_build_date = "rocksdb_build_date:2024-07-13 17:15:50";
-#endif
-
-extern "C" {
-
-} // extern "C"
-
-std::unordered_map<std::string, ROCKSDB_NAMESPACE::RegistrarFunc> ROCKSDB_NAMESPACE::ObjectRegistry::builtins_ = {
-  
-};
+static const std::string rocksdb_build_git_sha  = "rocksdb_build_git_sha:0";
+static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:master";
+static const std::string rocksdb_build_date = "rocksdb_build_date:2000-01-01";
 
 namespace ROCKSDB_NAMESPACE {
 static void AddProperty(std::unordered_map<std::string, std::string> *props, const std::string& name) {
@@ -56,12 +39,12 @@ const std::unordered_map<std::string, std::string>& GetRocksBuildProperties() {
 }
 
 std::string GetRocksVersionAsString(bool with_patch) {
-  std::string version = std::to_string(ROCKSDB_MAJOR) + "." + std::to_string(ROCKSDB_MINOR);
+  std::string version = ToString(ROCKSDB_MAJOR) + "." + ToString(ROCKSDB_MINOR);
   if (with_patch) {
-    return version + "." + std::to_string(ROCKSDB_PATCH);
+    return version + "." + ToString(ROCKSDB_PATCH);
   } else {
     return version;
- }
+  }
 }
 
 std::string GetRocksBuildInfoAsString(const std::string& program, bool verbose) {
diff --git a/contrib/sysroot b/contrib/sysroot
index 5be834147d5..cc385041b22 160000
--- a/contrib/sysroot
+++ b/contrib/sysroot
@@ -1 +1 @@
-Subproject commit 5be834147d5b5dd77ca2b821f356982029320513
+Subproject commit cc385041b226d1fc28ead14dbab5d40a5f821dd8
diff --git a/contrib/usearch b/contrib/usearch
index 7a8967cb442..955c6f9c11a 160000
--- a/contrib/usearch
+++ b/contrib/usearch
@@ -1 +1 @@
-Subproject commit 7a8967cb442b08ca20c3dd781414378e65957d37
+Subproject commit 955c6f9c11adfd89c912e0d1643d160b4e9e543f
diff --git a/contrib/usearch-cmake/CMakeLists.txt b/contrib/usearch-cmake/CMakeLists.txt
index df131e0c528..29fbe57106c 100644
--- a/contrib/usearch-cmake/CMakeLists.txt
+++ b/contrib/usearch-cmake/CMakeLists.txt
@@ -1,22 +1,17 @@
-set(FP16_PROJECT_DIR "${ClickHouse_SOURCE_DIR}/contrib/FP16")
-set(SIMSIMD_PROJECT_DIR "${ClickHouse_SOURCE_DIR}/contrib/SimSIMD")
 set(USEARCH_PROJECT_DIR "${ClickHouse_SOURCE_DIR}/contrib/usearch")
+set(USEARCH_SOURCE_DIR "${USEARCH_PROJECT_DIR}/include")
+
+set(FP16_PROJECT_DIR "${ClickHouse_SOURCE_DIR}/contrib/FP16")
+set(ROBIN_MAP_PROJECT_DIR "${ClickHouse_SOURCE_DIR}/contrib/robin-map")
+set(SIMSIMD_PROJECT_DIR "${ClickHouse_SOURCE_DIR}/contrib/SimSIMD-map")
 
 add_library(_usearch INTERFACE)
 
 target_include_directories(_usearch SYSTEM INTERFACE
     ${FP16_PROJECT_DIR}/include
+    ${ROBIN_MAP_PROJECT_DIR}/include
     ${SIMSIMD_PROJECT_DIR}/include
-    ${USEARCH_PROJECT_DIR}/include)
-
-target_compile_definitions(_usearch INTERFACE USEARCH_USE_FP16LIB)
-
-# target_compile_definitions(_usearch INTERFACE USEARCH_USE_SIMSIMD)
-# ^^ simsimd is not enabled at the moment. Reasons:
-# - Vectorization is important for raw scans but not so much for HNSW. We use usearch only for HNSW.
-# - Simsimd does compile-time dispatch (choice of SIMD kernels determined by capabilities of the build machine) or dynamic dispatch (SIMD
-#   kernels chosen at runtime based on cpuid instruction). Since current builds are limited to SSE 4.2 (x86) and NEON (ARM), the speedup of
-#   the former would be moderate compared to AVX-512 / SVE. The latter is at the moment too fragile with respect to portability across x86
-#   and ARM machines ... certain conbinations of quantizations / distance functions / SIMD instructions are not implemented at the moment.
+    ${USEARCH_SOURCE_DIR})
 
 add_library(ch_contrib::usearch ALIAS _usearch)
+target_compile_definitions(_usearch INTERFACE ENABLE_USEARCH)
diff --git a/contrib/zlib-ng b/contrib/zlib-ng
index a2fbeffdc30..50f0eae1a41 160000
--- a/contrib/zlib-ng
+++ b/contrib/zlib-ng
@@ -1 +1 @@
-Subproject commit a2fbeffdc30a8b0ce6d54ee31208e2688eac4c9f
+Subproject commit 50f0eae1a411764cd6d1e85b3ce471438acd3c1c
diff --git a/contrib/zlib-ng-cmake/CMakeLists.txt b/contrib/zlib-ng-cmake/CMakeLists.txt
index 91a8eb2e0a3..79f343bfc75 100644
--- a/contrib/zlib-ng-cmake/CMakeLists.txt
+++ b/contrib/zlib-ng-cmake/CMakeLists.txt
@@ -14,8 +14,6 @@ add_definitions(-DHAVE_VISIBILITY_HIDDEN)
 add_definitions(-DHAVE_VISIBILITY_INTERNAL)
 add_definitions(-DHAVE_BUILTIN_CTZ)
 add_definitions(-DHAVE_BUILTIN_CTZLL)
-add_definitions(-DHAVE_ATTRIBUTE_ALIGNED)
-add_definitions(-DHAVE_POSIX_MEMALIGN)
 
 set(ZLIB_ARCH_SRCS)
 set(ZLIB_ARCH_HDRS)
@@ -26,74 +24,67 @@ if(ARCH_AARCH64)
     set(ARCHDIR "${SOURCE_DIR}/arch/arm")
 
     add_definitions(-DARM_FEATURES)
-    add_definitions(-DHAVE_SYS_AUXV_H)
     add_definitions(-DARM_AUXV_HAS_CRC32 -DARM_ASM_HWCAP)
     add_definitions(-DARM_AUXV_HAS_NEON)
-    add_definitions(-DARM_ACLE)
-    add_definitions(-DHAVE_ARM_ACLE_H)
-    add_definitions(-DARM_NEON)
-    add_definitions(-DARM_NEON_HASLD4)
+    add_definitions(-DARM_ACLE_CRC_HASH)
+    add_definitions(-DARM_NEON_ADLER32 -DARM_NEON_CHUNKSET -DARM_NEON_SLIDEHASH)
 
-    list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/arm_features.h)
-    list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/arm_features.c)
+    list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/arm.h)
+    list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/armfeature.c)
     set(ACLE_SRCS ${ARCHDIR}/crc32_acle.c ${ARCHDIR}/insert_string_acle.c)
     list(APPEND ZLIB_ARCH_SRCS ${ACLE_SRCS})
-    set(NEON_SRCS ${ARCHDIR}/adler32_neon.c ${ARCHDIR}/chunkset_neon.c
-                    ${ARCHDIR}/compare256_neon.c ${ARCHDIR}/slide_hash_neon.c)
+    set(NEON_SRCS ${ARCHDIR}/adler32_neon.c ${ARCHDIR}/chunkset_neon.c ${ARCHDIR}/slide_neon.c)
     list(APPEND ZLIB_ARCH_SRCS ${NEON_SRCS})
 
 elseif(ARCH_PPC64LE)
     set(ARCHDIR "${SOURCE_DIR}/arch/power")
 
+    add_definitions(-DPOWER8)
     add_definitions(-DPOWER_FEATURES)
-    add_definitions(-DHAVE_SYS_AUXV_H)
+    add_definitions(-DPOWER8_VSX_ADLER32)
+    add_definitions(-DPOWER8_VSX_SLIDEHASH)
 
-    if(POWER9)
-        add_definitions(-DPOWER9)
-    else()
-        add_definitions(-DPOWER8)
-        add_definitions(-DPOWER8_VSX)
-        add_definitions(-DPOWER8_VSX_CRC32)
-    endif()
-
-    list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/power_features.h)
-    list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/power_features.c)
-    set(POWER8_SRCS ${ARCHDIR}/adler32_power8.c ${ARCHDIR}/chunkset_power8.c ${ARCHDIR}/slide_hash_power8.c)
-    list(APPEND POWER8_SRCS ${ARCHDIR}/crc32_power8.c)
+    list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/power.h)
+    list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/power.c)
+    set(POWER8_SRCS ${ARCHDIR}/adler32_power8.c ${ARCHDIR}/slide_hash_power8.c)
     list(APPEND ZLIB_ARCH_SRCS ${POWER8_SRCS})
 
 elseif(ARCH_AMD64)
     set(ARCHDIR "${SOURCE_DIR}/arch/x86")
 
     add_definitions(-DX86_FEATURES)
-    list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/x86_features.h)
-    list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/x86_features.c)
+    list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/x86.h)
+    list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/x86.c)
     if(ENABLE_AVX2)
-        add_definitions(-DX86_AVX2)
-        set(AVX2_SRCS ${ARCHDIR}/slide_hash_avx2.c)
-        list(APPEND AVX2_SRCS ${ARCHDIR}/chunkset_avx2.c)
-        list(APPEND AVX2_SRCS ${ARCHDIR}/compare256_avx2.c)
-        list(APPEND AVX2_SRCS ${ARCHDIR}/adler32_avx2.c)
+        add_definitions(-DX86_AVX2 -DX86_AVX2_ADLER32 -DX86_AVX_CHUNKSET)
+        set(AVX2_SRCS ${ARCHDIR}/slide_avx.c)
+        list(APPEND AVX2_SRCS ${ARCHDIR}/chunkset_avx.c)
+        list(APPEND AVX2_SRCS ${ARCHDIR}/compare258_avx.c)
+        list(APPEND AVX2_SRCS ${ARCHDIR}/adler32_avx.c)
         list(APPEND ZLIB_ARCH_SRCS ${AVX2_SRCS})
     endif()
     if(ENABLE_SSE42)
-        add_definitions(-DX86_SSE42)
-        set(SSE42_SRCS ${ARCHDIR}/adler32_sse42.c ${ARCHDIR}/insert_string_sse42.c)
+        add_definitions(-DX86_SSE42_CRC_HASH)
+        set(SSE42_SRCS ${ARCHDIR}/insert_string_sse.c)
+        list(APPEND ZLIB_ARCH_SRCS ${SSE42_SRCS})
+        add_definitions(-DX86_SSE42_CRC_INTRIN)
+        add_definitions(-DX86_SSE42_CMP_STR)
+        set(SSE42_SRCS ${ARCHDIR}/compare258_sse.c)
         list(APPEND ZLIB_ARCH_SRCS ${SSE42_SRCS})
     endif()
     if(ENABLE_SSSE3)
-        add_definitions(-DX86_SSSE3)
-        set(SSSE3_SRCS ${ARCHDIR}/adler32_ssse3.c ${ARCHDIR}/chunkset_ssse3.c)
+        add_definitions(-DX86_SSSE3 -DX86_SSSE3_ADLER32)
+        set(SSSE3_SRCS ${ARCHDIR}/adler32_ssse3.c)
         list(APPEND ZLIB_ARCH_SRCS ${SSSE3_SRCS})
     endif()
     if(ENABLE_PCLMULQDQ)
         add_definitions(-DX86_PCLMULQDQ_CRC)
-        set(PCLMULQDQ_SRCS ${ARCHDIR}/crc32_pclmulqdq.c)
+        set(PCLMULQDQ_SRCS ${ARCHDIR}/crc_folding.c)
         list(APPEND ZLIB_ARCH_SRCS ${PCLMULQDQ_SRCS})
     endif()
 
-    add_definitions(-DX86_SSE2)
-    set(SSE2_SRCS ${ARCHDIR}/chunkset_sse2.c ${ARCHDIR}/compare256_sse2.c ${ARCHDIR}/slide_hash_sse2.c)
+    add_definitions(-DX86_SSE2 -DX86_SSE2_CHUNKSET -DX86_SSE2_SLIDEHASH)
+    set(SSE2_SRCS ${ARCHDIR}/chunkset_sse.c ${ARCHDIR}/slide_sse.c)
     list(APPEND ZLIB_ARCH_SRCS ${SSE2_SRCS})
     add_definitions(-DX86_NOCHECK_SSE2)
 endif ()
@@ -115,45 +106,39 @@ generate_cmakein(${SOURCE_DIR}/zconf.h.in ${CMAKE_CURRENT_BINARY_DIR}/zconf.h.cm
 
 set(ZLIB_SRCS
     ${SOURCE_DIR}/adler32.c
-    ${SOURCE_DIR}/adler32_fold.c
     ${SOURCE_DIR}/chunkset.c
-    ${SOURCE_DIR}/compare256.c
+    ${SOURCE_DIR}/compare258.c
     ${SOURCE_DIR}/compress.c
-    ${SOURCE_DIR}/cpu_features.c
-    ${SOURCE_DIR}/crc32_braid.c
-    ${SOURCE_DIR}/crc32_braid_comb.c
-    ${SOURCE_DIR}/crc32_fold.c
+    ${SOURCE_DIR}/crc32.c
+    ${SOURCE_DIR}/crc32_comb.c
     ${SOURCE_DIR}/deflate.c
     ${SOURCE_DIR}/deflate_fast.c
-    ${SOURCE_DIR}/deflate_huff.c
     ${SOURCE_DIR}/deflate_medium.c
     ${SOURCE_DIR}/deflate_quick.c
-    ${SOURCE_DIR}/deflate_rle.c
     ${SOURCE_DIR}/deflate_slow.c
-    ${SOURCE_DIR}/deflate_stored.c
     ${SOURCE_DIR}/functable.c
     ${SOURCE_DIR}/infback.c
+    ${SOURCE_DIR}/inffast.c
     ${SOURCE_DIR}/inflate.c
     ${SOURCE_DIR}/inftrees.c
     ${SOURCE_DIR}/insert_string.c
-    ${SOURCE_DIR}/insert_string_roll.c
-    ${SOURCE_DIR}/slide_hash.c
     ${SOURCE_DIR}/trees.c
     ${SOURCE_DIR}/uncompr.c
     ${SOURCE_DIR}/zutil.c
-)
-
-set(ZLIB_GZFILE_SRCS
     ${SOURCE_DIR}/gzlib.c
-    ${CMAKE_CURRENT_BINARY_DIR}/gzread.c
+    ${SOURCE_DIR}/gzread.c
     ${SOURCE_DIR}/gzwrite.c
 )
 
-set(ZLIB_ALL_SRCS ${ZLIB_SRCS} ${ZLIB_ARCH_SRCS} ${ZLIB_GZFILE_SRCS})
+set(ZLIB_ALL_SRCS ${ZLIB_SRCS} ${ZLIB_ARCH_SRCS})
 
 add_library(_zlib ${ZLIB_ALL_SRCS})
 add_library(ch_contrib::zlib ALIAS _zlib)
 
+# https://github.com/zlib-ng/zlib-ng/pull/733
+# This is disabed by default
+add_compile_definitions(Z_TLS=__thread)
+
 if(HAVE_UNISTD_H)
   SET(ZCONF_UNISTD_LINE "#if 1    /* was set to #if 1 by configure/cmake/etc */")
 else()
@@ -168,9 +153,6 @@ endif()
 set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
 configure_file(${SOURCE_DIR}/zlib.pc.cmakein ${ZLIB_PC} @ONLY)
 configure_file(${CMAKE_CURRENT_BINARY_DIR}/zconf.h.cmakein ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
-configure_file(${SOURCE_DIR}/zlib.h.in ${CMAKE_CURRENT_BINARY_DIR}/zlib.h @ONLY)
-configure_file(${SOURCE_DIR}/zlib_name_mangling.h.in ${CMAKE_CURRENT_BINARY_DIR}/zlib_name_mangling.h @ONLY)
-configure_file(${SOURCE_DIR}/gzread.c.in ${CMAKE_CURRENT_BINARY_DIR}/gzread.c @ONLY)
 
 # We should use same defines when including zlib.h as used when zlib compiled
 target_compile_definitions (_zlib PUBLIC ZLIB_COMPAT WITH_GZFILEOP)
diff --git a/docker/docs/builder/run.sh b/docker/docs/builder/run.sh
index d73adb5d279..01c15cb4b0f 100755
--- a/docker/docs/builder/run.sh
+++ b/docker/docs/builder/run.sh
@@ -26,6 +26,7 @@ sed -i '/onBrokenMarkdownLinks:/ s/ignore/error/g' docusaurus.config.js
 
 if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then
   export CI=true
+  yarn install
   exec yarn build "$@"
 fi
 
diff --git a/docker/images.json b/docker/images.json
index 055394b69e6..716b76ee217 100644
--- a/docker/images.json
+++ b/docker/images.json
@@ -47,7 +47,8 @@
     "docker/test/stateful": {
         "name": "clickhouse/stateful-test",
         "dependent": [
-            "docker/test/stress"
+            "docker/test/stress",
+            "docker/test/upgrade"
         ]
     },
     "docker/test/unit": {
@@ -58,6 +59,10 @@
         "name": "clickhouse/stress-test",
         "dependent": []
     },
+    "docker/test/upgrade": {
+        "name": "clickhouse/upgrade-check",
+        "dependent": []
+    },
     "docker/test/integration/runner": {
         "name": "clickhouse/integration-tests-runner",
         "dependent": []
diff --git a/docker/keeper/Dockerfile b/docker/keeper/Dockerfile
index 19c5903461c..c59ef1b919a 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="24.8.4.13"
+ARG VERSION="24.6.2.17"
 ARG PACKAGES="clickhouse-keeper"
 ARG DIRECT_DOWNLOAD_URLS=""
 
diff --git a/docker/keeper/entrypoint.sh b/docker/keeper/entrypoint.sh
index 68bd0ef9d87..1390ad9ce74 100644
--- a/docker/keeper/entrypoint.sh
+++ b/docker/keeper/entrypoint.sh
@@ -40,6 +40,8 @@ fi
 
 DATA_DIR="${CLICKHOUSE_DATA_DIR:-/var/lib/clickhouse}"
 LOG_DIR="${LOG_DIR:-/var/log/clickhouse-keeper}"
+LOG_PATH="${LOG_DIR}/clickhouse-keeper.log"
+ERROR_LOG_PATH="${LOG_DIR}/clickhouse-keeper.err.log"
 COORDINATION_DIR="${DATA_DIR}/coordination"
 COORDINATION_LOG_DIR="${DATA_DIR}/coordination/log"
 COORDINATION_SNAPSHOT_DIR="${DATA_DIR}/coordination/snapshots"
@@ -82,7 +84,7 @@ if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then
 
     # There is a config file. It is already tested with gosu (if it is readably by keeper user)
     if [ -f "$KEEPER_CONFIG" ]; then
-        exec $gosu /usr/bin/clickhouse-keeper --config-file="$KEEPER_CONFIG" "$@"
+        exec $gosu /usr/bin/clickhouse-keeper --config-file="$KEEPER_CONFIG" --log-file="$LOG_PATH" --errorlog-file="$ERROR_LOG_PATH" "$@"
     fi
 
     # There is no config file. Will use embedded one
diff --git a/docker/packager/binary-builder/build.sh b/docker/packager/binary-builder/build.sh
index ba9311c6880..bd5f2fe8466 100755
--- a/docker/packager/binary-builder/build.sh
+++ b/docker/packager/binary-builder/build.sh
@@ -108,8 +108,7 @@ if [ -n "$MAKE_DEB" ]; then
   bash -x /build/packages/build
 fi
 
-mv ./programs/clickhouse* /output ||:
-mv ./programs/*_fuzzer /output ||:
+mv ./programs/clickhouse* /output || mv ./programs/*_fuzzer /output
 [ -x ./programs/self-extracting/clickhouse ] && mv ./programs/self-extracting/clickhouse /output
 [ -x ./programs/self-extracting/clickhouse-stripped ] && mv ./programs/self-extracting/clickhouse-stripped /output
 [ -x ./programs/self-extracting/clickhouse-keeper ] && mv ./programs/self-extracting/clickhouse-keeper /output
diff --git a/docker/packager/cctools/Dockerfile b/docker/packager/cctools/Dockerfile
index 570a42d42d5..d986c6a3c86 100644
--- a/docker/packager/cctools/Dockerfile
+++ b/docker/packager/cctools/Dockerfile
@@ -1,5 +1,3 @@
-# docker build -t clickhouse/cctools .
-
 # 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`
@@ -32,29 +30,5 @@ RUN git clone https://github.com/tpoechtrager/cctools-port.git \
     && cd ../.. \
     && rm -rf cctools-port
 
-#
-# GDB
-#
-# ld from binutils is 2.38, which has the following error:
-#
-#     DWARF error: invalid or unhandled FORM value: 0x23
-#
-ENV LD=ld.lld-${LLVM_VERSION}
-ARG GDB_VERSION=15.1
-RUN apt-get update \
-    && apt-get install --yes \
-        libgmp-dev \
-        libmpfr-dev \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
-RUN wget https://sourceware.org/pub/gdb/releases/gdb-$GDB_VERSION.tar.gz \
-    && tar -xvf gdb-$GDB_VERSION.tar.gz \
-    && cd gdb-$GDB_VERSION \
-    && ./configure --prefix=/opt/gdb \
-    && make -j $(nproc) \
-    && make install \
-    && rm -fr gdb-$GDB_VERSION gdb-$GDB_VERSION.tar.gz
-
 FROM scratch
 COPY --from=builder /cctools /cctools
-COPY --from=builder /opt/gdb /opt/gdb
diff --git a/docker/server/Dockerfile.alpine b/docker/server/Dockerfile.alpine
index e74dcf6d73d..240df79aeb1 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="24.8.4.13"
+ARG VERSION="24.6.2.17"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 ARG DIRECT_DOWNLOAD_URLS=""
 
diff --git a/docker/server/Dockerfile.ubuntu b/docker/server/Dockerfile.ubuntu
index 456bed14a7e..ac64655991a 100644
--- a/docker/server/Dockerfile.ubuntu
+++ b/docker/server/Dockerfile.ubuntu
@@ -28,7 +28,7 @@ RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list
 
 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="24.8.4.13"
+ARG VERSION="24.6.2.17"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 
 #docker-official-library:off
diff --git a/docker/test/base/Dockerfile b/docker/test/base/Dockerfile
index 848da4ef5b0..a81826ed6b5 100644
--- a/docker/test/base/Dockerfile
+++ b/docker/test/base/Dockerfile
@@ -28,18 +28,14 @@ RUN echo "TSAN_OPTIONS='verbosity=1000 halt_on_error=1 abort_on_error=1 history_
 RUN echo "UBSAN_OPTIONS='print_stacktrace=1 max_allocation_size_mb=32768'" >> /etc/environment
 RUN echo "MSAN_OPTIONS='abort_on_error=1 poison_in_dtor=1 max_allocation_size_mb=32768'" >> /etc/environment
 RUN echo "LSAN_OPTIONS='suppressions=/usr/share/clickhouse-test/config/lsan_suppressions.txt max_allocation_size_mb=32768'" >> /etc/environment
-RUN echo "ASAN_OPTIONS='halt_on_error=1 abort_on_error=1'" >> /etc/environment
 # Sanitizer options for current shell (not current, but the one that will be spawned on "docker run")
 # (but w/o verbosity for TSAN, otherwise test.reference will not match)
 ENV TSAN_OPTIONS='halt_on_error=1 abort_on_error=1 history_size=7 memory_limit_mb=46080 second_deadlock_stack=1 max_allocation_size_mb=32768'
 ENV UBSAN_OPTIONS='print_stacktrace=1 max_allocation_size_mb=32768'
 ENV MSAN_OPTIONS='abort_on_error=1 poison_in_dtor=1 max_allocation_size_mb=32768'
 ENV LSAN_OPTIONS='max_allocation_size_mb=32768'
-ENV ASAN_OPTIONS='halt_on_error=1 abort_on_error=1'
 
-# for external_symbolizer_path, and also ensure that llvm-symbolizer really
-# exists (since you don't want to fallback to addr2line, it is very slow)
-RUN test -f /usr/bin/llvm-symbolizer-${LLVM_VERSION}
+# 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
diff --git a/docker/test/base/setup_export_logs.sh b/docker/test/base/setup_export_logs.sh
index a39f96867be..0c869a95db2 100755
--- a/docker/test/base/setup_export_logs.sh
+++ b/docker/test/base/setup_export_logs.sh
@@ -124,8 +124,6 @@ function setup_logs_replication
     check_logs_credentials || return 0
     __set_connection_args
 
-    echo "My hostname is ${HOSTNAME}"
-
     echo 'Create all configured system logs'
     clickhouse-client --query "SYSTEM FLUSH LOGS"
 
@@ -186,17 +184,7 @@ function setup_logs_replication
             /^TTL /d
             ')
 
-        echo -e "Creating remote destination table ${table}_${hash} with statement:" >&2
-
-        echo "::group::${table}"
-        # there's the only way big "$statement" can be printed without causing EAGAIN error
-        # cat: write error: Resource temporarily unavailable
-        statement_print="${statement}"
-        if [ "${#statement_print}" -gt 4000 ]; then
-          statement_print="${statement::1999}\n…\n${statement:${#statement}-1999}"
-        fi
-        echo -e "$statement_print"
-        echo "::endgroup::"
+        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_output_mode=throw_only_active \
@@ -230,6 +218,6 @@ function stop_logs_replication
     clickhouse-client --query "select database||'.'||table from system.tables where database = 'system' and (table like '%_sender' or table like '%_watcher')" | {
         tee /dev/stderr
     } | {
-        timeout --preserve-status --signal TERM --kill-after 5m 15m xargs -n1 -r -i clickhouse-client --query "drop table {}"
+        xargs -n1 -r -i clickhouse-client --query "drop table {}"
     }
 }
diff --git a/docker/test/fasttest/Dockerfile b/docker/test/fasttest/Dockerfile
index ca93b24f66e..4cac2ee6135 100644
--- a/docker/test/fasttest/Dockerfile
+++ b/docker/test/fasttest/Dockerfile
@@ -83,7 +83,7 @@ RUN arch=${TARGETARCH:-amd64} \
 
 # Give suid to gdb to grant it attach permissions
 # chmod 777 to make the container user independent
-RUN chmod u+s /opt/gdb/bin/gdb \
+RUN chmod u+s /usr/bin/gdb \
   && mkdir -p /var/lib/clickhouse \
   && chmod 777 /var/lib/clickhouse
 
@@ -93,3 +93,6 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 ENV COMMIT_SHA=''
 ENV PULL_REQUEST_NUMBER=''
 ENV COPY_CLICKHOUSE_BINARY_TO_OUTPUT=0
+
+COPY run.sh /
+CMD ["/bin/bash", "/run.sh"]
diff --git a/tests/docker_scripts/fasttest_runner.sh b/docker/test/fasttest/run.sh
similarity index 96%
rename from tests/docker_scripts/fasttest_runner.sh
rename to docker/test/fasttest/run.sh
index 1eaba2c7cdf..970bf12a81a 100755
--- a/tests/docker_scripts/fasttest_runner.sh
+++ b/docker/test/fasttest/run.sh
@@ -41,7 +41,7 @@ export FASTTEST_WORKSPACE
 export FASTTEST_SOURCE
 export FASTTEST_BUILD
 export FASTTEST_DATA
-export FASTTEST_OUTPUT
+export FASTTEST_OUT
 export PATH
 
 function ccache_status
@@ -256,6 +256,19 @@ function configure
     rm -f "$FASTTEST_DATA/config.d/secure_ports.xml"
 }
 
+function timeout_with_logging() {
+    local exit_code=0
+
+    timeout -s TERM --preserve-status "${@}" || exit_code="${?}"
+
+    if [[ "${exit_code}" -eq "124" ]]
+    then
+      echo "The command 'timeout ${*}' has been killed by timeout"
+    fi
+
+    return $exit_code
+}
+
 function run_tests
 {
     clickhouse-server --version
@@ -324,8 +337,8 @@ case "$stage" in
     configure 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/install_log.txt"
     ;&
 "run_tests")
-    run_tests ||:
-    /repo/tests/docker_scripts/process_functional_tests_result.py --in-results-dir "$FASTTEST_OUTPUT/" \
+    timeout_with_logging 35m bash -c run_tests ||:
+    /process_functional_tests_result.py --in-results-dir "$FASTTEST_OUTPUT/" \
         --out-results-file "$FASTTEST_OUTPUT/test_results.tsv" \
         --out-status-file "$FASTTEST_OUTPUT/check_status.tsv" || echo -e "failure\tCannot parse results" > "$FASTTEST_OUTPUT/check_status.tsv"
     ;;
diff --git a/docker/test/fuzzer/query-fuzzer-tweaks-users.xml b/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
index 476464e9cc2..e2a4976b385 100644
--- a/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
+++ b/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
@@ -20,7 +20,7 @@
                 </max_execution_time>
 
                 <max_memory_usage>
-                    <max>5G</max>
+                    <max>10G</max>
                 </max_memory_usage>
 
                 <table_function_remote_max_addresses>
@@ -28,9 +28,9 @@
                 </table_function_remote_max_addresses>
 
                 <!-- Don't waste cycles testing the old interpreter. Spend time in the new analyzer instead -->
-                <enable_analyzer>
+                <allow_experimental_analyzer>
                     <readonly/>
-                </enable_analyzer>
+                </allow_experimental_analyzer>
 
                 <!-- This feature is broken, deprecated and will be removed. We don't want more reports about it -->
                 <allow_experimental_object_type>
diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index ae1b9e94bed..6191aeaf304 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -193,60 +193,54 @@ function fuzz
 
     kill -0 $server_pid
 
-    IS_ASAN=$(clickhouse-client --query "SELECT count() FROM system.build_options WHERE name = 'CXX_FLAGS' AND position('sanitize=address' IN value)")
-    if [[ "$IS_ASAN" = "1" ]];
-    then
-        echo "ASAN build detected. Not using gdb since it disables LeakSanitizer detections"
-    else
-        # Set follow-fork-mode to parent, because we attach to clickhouse-server, not to watchdog
-        # and clickhouse-server can do fork-exec, for example, to run some bridge.
-        # Do not set nostop noprint for all signals, because some it may cause gdb to hang,
-        # explicitly ignore non-fatal signals that are used by server.
-        # Number of SIGRTMIN can be determined only in runtime.
-        RTMIN=$(kill -l SIGRTMIN)
-        echo "
-    set follow-fork-mode parent
-    handle SIGHUP nostop noprint pass
-    handle SIGINT nostop noprint pass
-    handle SIGQUIT nostop noprint pass
-    handle SIGPIPE nostop noprint pass
-    handle SIGTERM nostop noprint pass
-    handle SIGUSR1 nostop noprint pass
-    handle SIGUSR2 nostop noprint pass
-    handle SIG$RTMIN nostop noprint pass
-    info signals
-    continue
-    backtrace full
-    thread apply all backtrace full
-    info registers
-    disassemble /s
-    up
-    disassemble /s
-    up
-    disassemble /s
-    p \"done\"
-    detach
-    quit
-    " > script.gdb
+    # Set follow-fork-mode to parent, because we attach to clickhouse-server, not to watchdog
+    # and clickhouse-server can do fork-exec, for example, to run some bridge.
+    # Do not set nostop noprint for all signals, because some it may cause gdb to hang,
+    # explicitly ignore non-fatal signals that are used by server.
+    # Number of SIGRTMIN can be determined only in runtime.
+    RTMIN=$(kill -l SIGRTMIN)
+    echo "
+set follow-fork-mode parent
+handle SIGHUP nostop noprint pass
+handle SIGINT nostop noprint pass
+handle SIGQUIT nostop noprint pass
+handle SIGPIPE nostop noprint pass
+handle SIGTERM nostop noprint pass
+handle SIGUSR1 nostop noprint pass
+handle SIGUSR2 nostop noprint pass
+handle SIGSEGV nostop pass
+handle SIG$RTMIN nostop noprint pass
+info signals
+continue
+backtrace full
+thread apply all backtrace full
+info registers
+disassemble /s
+up
+disassemble /s
+up
+disassemble /s
+p \"done\"
+detach
+quit
+" > script.gdb
 
-        gdb -batch -command script.gdb -p $server_pid &
-        sleep 5
-        # gdb will send SIGSTOP, spend some time loading debug info, and then send SIGCONT, wait for it (up to send_timeout, 300s)
-        time clickhouse-client --query "SELECT 'Connected to clickhouse-server after attaching gdb'" ||:
-
-        # Check connectivity after we attach gdb, because it might cause the server
-        # to freeze, and the fuzzer will fail. In debug build, it can take a lot of time.
-        for _ in {1..180}
-        do
-            if clickhouse-client --query "select 1"
-            then
-                break
-            fi
-            sleep 1
-        done
-        kill -0 $server_pid # This checks that it is our server that is started and not some other one
-    fi
+    gdb -batch -command script.gdb -p $server_pid &
+    sleep 5
+    # gdb will send SIGSTOP, spend some time loading debug info, and then send SIGCONT, wait for it (up to send_timeout, 300s)
+    time clickhouse-client --query "SELECT 'Connected to clickhouse-server after attaching gdb'" ||:
 
+    # Check connectivity after we attach gdb, because it might cause the server
+    # to freeze, and the fuzzer will fail. In debug build, it can take a lot of time.
+    for _ in {1..180}
+    do
+        if clickhouse-client --query "select 1"
+        then
+            break
+        fi
+        sleep 1
+    done
+    kill -0 $server_pid # This checks that it is our server that is started and not some other one
     echo 'Server started and responded.'
 
     setup_logs_replication
@@ -271,13 +265,8 @@ function fuzz
     # The fuzzer_pid belongs to the timeout process.
     actual_fuzzer_pid=$(ps -o pid= --ppid "$fuzzer_pid")
 
-    if [[ "$IS_ASAN" = "1" ]];
-    then
-        echo "ASAN build detected. Not using gdb since it disables LeakSanitizer detections"
-    else
-        echo "Attaching gdb to the fuzzer itself"
-        gdb -batch -command script.gdb -p $actual_fuzzer_pid &
-    fi
+    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
diff --git a/docker/test/integration/base/Dockerfile b/docker/test/integration/base/Dockerfile
index dc4d470a262..469251f648c 100644
--- a/docker/test/integration/base/Dockerfile
+++ b/docker/test/integration/base/Dockerfile
@@ -11,6 +11,7 @@ RUN apt-get update \
         curl \
         default-jre \
         g++ \
+        gdb \
         iproute2 \
         krb5-user \
         libicu-dev \
@@ -72,6 +73,3 @@ maxClientCnxns=80' > /opt/zookeeper/conf/zoo.cfg && \
 
 ENV TZ=Etc/UTC
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-COPY --from=clickhouse/cctools:0d6b90a7a490 /opt/gdb /opt/gdb
-ENV PATH="/opt/gdb/bin:${PATH}"
diff --git a/docker/test/integration/helper_container/Dockerfile b/docker/test/integration/helper_container/Dockerfile
index 1084d087e53..49a3d3cd84b 100644
--- a/docker/test/integration/helper_container/Dockerfile
+++ b/docker/test/integration/helper_container/Dockerfile
@@ -3,8 +3,6 @@
 
 FROM alpine:3.18
 RUN apk add --no-cache -U iproute2 \
-  && for bin in \
-  iptables iptables-restore iptables-save \
-  ip6tables ip6tables-restore ip6tables-save; \
+  && for bin in iptables iptables-restore iptables-save; \
     do ln -sf xtables-nft-multi "/sbin/$bin"; \
   done
diff --git a/docker/test/integration/runner/Dockerfile b/docker/test/integration/runner/Dockerfile
index d62009f1be3..d250b746e7d 100644
--- a/docker/test/integration/runner/Dockerfile
+++ b/docker/test/integration/runner/Dockerfile
@@ -30,6 +30,7 @@ RUN apt-get update \
     luajit \
     libssl-dev \
     libcurl4-openssl-dev \
+    gdb \
     default-jdk \
     software-properties-common \
     libkrb5-dev \
@@ -86,8 +87,6 @@ COPY modprobe.sh /usr/local/bin/modprobe
 COPY dockerd-entrypoint.sh /usr/local/bin/
 COPY misc/ /misc/
 
-COPY --from=clickhouse/cctools:0d6b90a7a490 /opt/gdb /opt/gdb
-ENV PATH="/opt/gdb/bin:${PATH}"
 
 # Same options as in test/base/Dockerfile
 # (in case you need to override them in tests)
diff --git a/docker/test/integration/runner/requirements.txt b/docker/test/integration/runner/requirements.txt
index 2c9df73ccca..7ca15ea86b0 100644
--- a/docker/test/integration/runner/requirements.txt
+++ b/docker/test/integration/runner/requirements.txt
@@ -74,7 +74,6 @@ protobuf==4.25.2
 psycopg2-binary==2.9.6
 py4j==0.10.9.5
 py==1.11.0
-pyarrow==17.0.0
 pycparser==2.22
 pycryptodome==3.20.0
 pymongo==3.11.0
diff --git a/docker/test/performance-comparison/Dockerfile b/docker/test/performance-comparison/Dockerfile
index f7139275282..c68a39f6f70 100644
--- a/docker/test/performance-comparison/Dockerfile
+++ b/docker/test/performance-comparison/Dockerfile
@@ -9,6 +9,7 @@ RUN apt-get update \
             curl \
             dmidecode \
             g++ \
+            gdb \
             git \
             gnuplot \
             imagemagick \
@@ -41,9 +42,6 @@ RUN pip3 --no-cache-dir install -r requirements.txt
 
 COPY run.sh /
 
-COPY --from=clickhouse/cctools:0d6b90a7a490 /opt/gdb /opt/gdb
-ENV PATH="/opt/gdb/bin:${PATH}"
-
 CMD ["bash", "/run.sh"]
 
 # docker run --network=host --volume <workspace>:/workspace --volume=<output>:/output -e PR_TO_TEST=<> -e SHA_TO_TEST=<> clickhouse/performance-comparison
diff --git a/docker/test/performance-comparison/run.sh b/docker/test/performance-comparison/run.sh
index e40f643e08c..7afb5da59b1 100644
--- a/docker/test/performance-comparison/run.sh
+++ b/docker/test/performance-comparison/run.sh
@@ -13,8 +13,6 @@ entry="/usr/share/clickhouse-test/performance/scripts/entrypoint.sh"
 # https://www.kernel.org/doc/Documentation/filesystems/tmpfs.txt
 # Double-escaped backslashes are a tribute to the engineering wonder of docker --
 # it gives '/bin/sh: 1: [bash,: not found' otherwise.
-echo > compare.log
-numactl --hardware | tee -a compare.log
 node=$(( RANDOM % $(numactl --hardware | sed -n 's/^.*available:\(.*\)nodes.*$/\1/p') ));
-echo Will bind to NUMA node $node | tee -a compare.log
+echo Will bind to NUMA node $node;
 numactl --cpunodebind=$node --membind=$node $entry
diff --git a/docker/test/sqlancer/Dockerfile b/docker/test/sqlancer/Dockerfile
index 3b919ffb3e3..82fc2598397 100644
--- a/docker/test/sqlancer/Dockerfile
+++ b/docker/test/sqlancer/Dockerfile
@@ -6,7 +6,7 @@ ARG apt_archive="http://archive.ubuntu.com"
 RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
 RUN apt-get update --yes \
-    && env DEBIAN_FRONTEND=noninteractive apt-get install wget git python3 default-jdk maven --yes --no-install-recommends  \
+    && 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/*
 
diff --git a/docker/test/sqllogic/Dockerfile b/docker/test/sqllogic/Dockerfile
index 0d21a2da44e..1425e12cd84 100644
--- a/docker/test/sqllogic/Dockerfile
+++ b/docker/test/sqllogic/Dockerfile
@@ -35,8 +35,12 @@ RUN mkdir -p /tmp/clickhouse-odbc-tmp \
 
 
 ENV TZ=Europe/Amsterdam
+ENV MAX_RUN_TIME=9000
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ARG sqllogic_test_repo="https://github.com/gregrahn/sqllogictest.git"
 
 RUN git clone --recursive ${sqllogic_test_repo}
+
+COPY run.sh /
+CMD ["/bin/bash", "/run.sh"]
diff --git a/tests/docker_scripts/sqllogic_runner.sh b/docker/test/sqllogic/run.sh
similarity index 85%
rename from tests/docker_scripts/sqllogic_runner.sh
rename to docker/test/sqllogic/run.sh
index 8b8f1e7aec7..ccba344035e 100755
--- a/tests/docker_scripts/sqllogic_runner.sh
+++ b/docker/test/sqllogic/run.sh
@@ -15,10 +15,10 @@ echo "Files in current directory"
 ls -la ./
 echo "Files in root directory"
 ls -la /
-echo "Files in /repo/tests directory"
-ls -la /repo/tests
-echo "Files in /repo/tests/sqllogic directory"
-ls -la /repo/tests/sqllogic
+echo "Files in /clickhouse-tests directory"
+ls -la /clickhouse-tests
+echo "Files in /clickhouse-tests/sqllogic directory"
+ls -la /clickhouse-tests/sqllogic
 echo "Files in /package_folder directory"
 ls -la /package_folder
 echo "Files in /test_output"
@@ -45,13 +45,13 @@ function run_tests()
 
     cd /test_output
 
-    /repo/tests/sqllogic/runner.py --help 2>&1 \
+    /clickhouse-tests/sqllogic/runner.py --help 2>&1 \
         | ts '%Y-%m-%d %H:%M:%S'
 
     mkdir -p /test_output/self-test
-    /repo/tests/sqllogic/runner.py --log-file /test_output/runner-self-test.log \
+    /clickhouse-tests/sqllogic/runner.py --log-file /test_output/runner-self-test.log \
         self-test \
-        --self-test-dir /repo/tests/sqllogic/self-test \
+        --self-test-dir /clickhouse-tests/sqllogic/self-test \
         --out-dir /test_output/self-test \
         2>&1 \
         | ts '%Y-%m-%d %H:%M:%S'
@@ -63,7 +63,7 @@ function run_tests()
     if [ -d /sqllogictest ]
     then
         mkdir -p /test_output/statements-test
-        /repo/tests/sqllogic/runner.py \
+        /clickhouse-tests/sqllogic/runner.py \
         --log-file /test_output/runner-statements-test.log \
         --log-level info \
             statements-test \
@@ -77,7 +77,7 @@ function run_tests()
         tar -zcvf statements-check.tar.gz statements-test 1>/dev/null
 
         mkdir -p /test_output/complete-test
-        /repo/tests/sqllogic/runner.py \
+        /clickhouse-tests/sqllogic/runner.py \
         --log-file /test_output/runner-complete-test.log \
         --log-level info \
             complete-test \
@@ -94,7 +94,7 @@ function run_tests()
 
 export -f run_tests
 
-run_tests
+timeout "${MAX_RUN_TIME:-9000}" bash -c run_tests || echo "timeout reached" >&2
 
 #/process_functional_tests_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
 
diff --git a/docker/test/sqltest/Dockerfile b/docker/test/sqltest/Dockerfile
index b805bb03c2b..71d915b0c7a 100644
--- a/docker/test/sqltest/Dockerfile
+++ b/docker/test/sqltest/Dockerfile
@@ -22,6 +22,7 @@ ARG sqltest_repo="https://github.com/elliotchance/sqltest/"
 RUN git clone ${sqltest_repo}
 
 ENV TZ=UTC
+ENV MAX_RUN_TIME=900
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 COPY run.sh /
diff --git a/docker/test/stateful/Dockerfile b/docker/test/stateful/Dockerfile
index 9aa936cb069..0daf88cad7e 100644
--- a/docker/test/stateful/Dockerfile
+++ b/docker/test/stateful/Dockerfile
@@ -10,3 +10,7 @@ RUN apt-get update -y \
         npm \
     && 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/tests/docker_scripts/create.sql b/docker/test/stateful/create.sql
similarity index 100%
rename from tests/docker_scripts/create.sql
rename to docker/test/stateful/create.sql
diff --git a/tests/docker_scripts/stateful_runner.sh b/docker/test/stateful/run.sh
similarity index 89%
rename from tests/docker_scripts/stateful_runner.sh
rename to docker/test/stateful/run.sh
index 86f6a299ad3..857385f4715 100755
--- a/tests/docker_scripts/stateful_runner.sh
+++ b/docker/test/stateful/run.sh
@@ -4,6 +4,9 @@
 source /setup_export_logs.sh
 set -e -x
 
+MAX_RUN_TIME=${MAX_RUN_TIME:-3600}
+MAX_RUN_TIME=$((MAX_RUN_TIME == 0 ? 3600 : MAX_RUN_TIME))
+
 # Choose random timezone for this test run
 TZ="$(rg -v '#' /usr/share/zoneinfo/zone.tab | awk '{print $3}' | shuf | head -n1)"
 echo "Choosen random timezone $TZ"
@@ -14,17 +17,17 @@ dpkg -i package_folder/clickhouse-common-static-dbg_*.deb
 dpkg -i package_folder/clickhouse-server_*.deb
 dpkg -i package_folder/clickhouse-client_*.deb
 
-ln -s /repo/tests/clickhouse-test /usr/bin/clickhouse-test
+ln -s /usr/share/clickhouse-test/clickhouse-test /usr/bin/clickhouse-test
 
 # shellcheck disable=SC1091
-source /repo/tests/docker_scripts/utils.lib
+source /utils.lib
 
 # install test configs
-/repo/tests/config/install.sh
+/usr/share/clickhouse-test/config/install.sh
 
 azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --silent --inMemoryPersistence &
 
-/repo/tests/docker_scripts/setup_minio.sh stateful
+./setup_minio.sh stateful
 ./mc admin trace clickminio > /test_output/minio.log &
 MC_ADMIN_PID=$!
 
@@ -105,7 +108,7 @@ setup_logs_replication
 
 clickhouse-client --query "SHOW DATABASES"
 clickhouse-client --query "CREATE DATABASE datasets"
-clickhouse-client --multiquery < /repo/tests/docker_scripts/create.sql
+clickhouse-client --multiquery < create.sql
 clickhouse-client --query "SHOW TABLES FROM datasets"
 
 if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
@@ -115,11 +118,14 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     clickhouse-client --query "CREATE TABLE test.hits AS datasets.hits_v1"
     clickhouse-client --query "CREATE TABLE test.visits AS datasets.visits_v1"
 
-    clickhouse-client --max_memory_usage 10G --query "INSERT INTO test.hits SELECT * FROM datasets.hits_v1"
-    clickhouse-client --max_memory_usage 10G --query "INSERT INTO test.visits SELECT * FROM datasets.visits_v1"
+    clickhouse-client --query "INSERT INTO test.hits SELECT * FROM datasets.hits_v1"
+    clickhouse-client --query "INSERT INTO test.visits SELECT * FROM datasets.visits_v1"
 
     clickhouse-client --query "DROP TABLE datasets.hits_v1"
     clickhouse-client --query "DROP TABLE datasets.visits_v1"
+
+    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)
 else
     clickhouse-client --query "CREATE DATABASE test"
     clickhouse-client --query "SHOW TABLES FROM test"
@@ -185,8 +191,8 @@ else
             ENGINE = CollapsingMergeTree(Sign) PARTITION BY toYYYYMM(StartDate) ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID)
             SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192, storage_policy='s3_cache'"
 
-        clickhouse-client --max_memory_usage 10G --query "INSERT INTO test.hits SELECT * FROM datasets.hits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0, max_insert_threads=16"
-        clickhouse-client --max_memory_usage 10G --query "INSERT INTO test.visits SELECT * FROM datasets.visits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0, max_insert_threads=16"
+        clickhouse-client --query "INSERT INTO test.hits SELECT * FROM datasets.hits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0"
+        clickhouse-client --query "INSERT INTO test.visits SELECT * FROM datasets.visits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0"
         clickhouse-client --query "DROP TABLE datasets.visits_v1 SYNC"
         clickhouse-client --query "DROP TABLE datasets.hits_v1 SYNC"
     else
@@ -194,8 +200,7 @@ else
         clickhouse-client --query "RENAME TABLE datasets.visits_v1 TO test.visits"
     fi
     clickhouse-client --query "CREATE TABLE test.hits_s3  (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 Nested(Key1 String, Key2 String, Key3 String, Key4 String, Key5 String, ValueDouble 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, storage_policy='s3_cache'"
-    # AWS S3 is very inefficient, so increase memory even further:
-    clickhouse-client --max_memory_usage 30G --max_memory_usage_for_user 30G --query "INSERT INTO test.hits_s3 SELECT * FROM test.hits SETTINGS enable_filesystem_cache_on_write_operations=0, max_insert_threads=16"
+    clickhouse-client --query "INSERT INTO test.hits_s3 SELECT * FROM test.hits SETTINGS enable_filesystem_cache_on_write_operations=0"
 fi
 
 clickhouse-client --query "SHOW TABLES FROM test"
@@ -227,40 +232,42 @@ function run_tests()
 
     set +e
 
-    TEST_ARGS=(
-        -j 2
-        --testname
-        --shard
-        --zookeeper
-        --check-zookeeper-session
-        --no-stateless
-        --hung-check
-        --print-time
-        --capture-client-stacktrace
-        --queries "/repo/tests/queries"
-        "${ADDITIONAL_OPTIONS[@]}"
-        "$SKIP_TESTS_OPTION"
-    )
     if [[ -n "$USE_PARALLEL_REPLICAS" ]] && [[ "$USE_PARALLEL_REPLICAS" -eq 1 ]]; then
-        TEST_ARGS+=(
-            --client="clickhouse-client --allow_experimental_parallel_reading_from_replicas=1 --parallel_replicas_for_non_replicated_merge_tree=1 --max_parallel_replicas=100 --cluster_for_parallel_replicas='parallel_replicas'"
-            --no-parallel-replicas
-        )
+        clickhouse-test --client="clickhouse-client --allow_experimental_parallel_reading_from_replicas=1 --parallel_replicas_for_non_replicated_merge_tree=1 \
+            --max_parallel_replicas=100 --cluster_for_parallel_replicas='parallel_replicas'" \
+            -j 2 --testname --shard --zookeeper --check-zookeeper-session --no-stateless --no-parallel-replicas --hung-check --print-time "${ADDITIONAL_OPTIONS[@]}" \
+        "$SKIP_TESTS_OPTION" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
+    else
+        clickhouse-test -j 2 --testname --shard --zookeeper --check-zookeeper-session --no-stateless --hung-check --print-time "${ADDITIONAL_OPTIONS[@]}" \
+        "$SKIP_TESTS_OPTION" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
     fi
-    clickhouse-test "${TEST_ARGS[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
     set -e
 }
 
 export -f run_tests
 
-run_tests ||:
+function timeout_with_logging() {
+    local exit_code=0
+
+    timeout -s TERM --preserve-status "${@}" || exit_code="${?}"
+
+    if [[ "${exit_code}" -eq "124" ]]
+    then
+      echo "The command 'timeout ${*}' has been killed by timeout"
+    fi
+
+    return $exit_code
+}
+
+TIMEOUT=$((MAX_RUN_TIME - 700))
+timeout_with_logging "$TIMEOUT" bash -c run_tests ||:
 
 echo "Files in current directory"
 ls -la ./
 echo "Files in root directory"
 ls -la /
 
-/repo/tests/docker_scripts/process_functional_tests_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
+/process_functional_tests_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
 
 sudo clickhouse stop ||:
 if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
diff --git a/docker/test/stateful/setup_minio.sh b/docker/test/stateful/setup_minio.sh
new file mode 120000
index 00000000000..0d539f72cb3
--- /dev/null
+++ b/docker/test/stateful/setup_minio.sh
@@ -0,0 +1 @@
+../stateless/setup_minio.sh
\ No newline at end of file
diff --git a/docker/test/stateless/Dockerfile b/docker/test/stateless/Dockerfile
index 69f81b35a95..a0e5513a3a2 100644
--- a/docker/test/stateless/Dockerfile
+++ b/docker/test/stateless/Dockerfile
@@ -65,11 +65,12 @@ ENV TZ=Europe/Amsterdam
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ENV NUM_TRIES=1
+ENV MAX_RUN_TIME=0
 
 # Unrelated to vars in setup_minio.sh, but should be the same there
 # to have the same binaries for local running scenario
-ARG MINIO_SERVER_VERSION=2024-08-03T04-33-23Z
-ARG MINIO_CLIENT_VERSION=2024-07-31T15-58-33Z
+ARG MINIO_SERVER_VERSION=2022-01-03T18-22-58Z
+ARG MINIO_CLIENT_VERSION=2022-01-05T23-52-51Z
 ARG TARGETARCH
 
 # Download Minio-related binaries
@@ -85,6 +86,18 @@ RUN curl -L --no-verbose -O 'https://archive.apache.org/dist/hadoop/common/hadoo
 ENV MINIO_ROOT_USER="clickhouse"
 ENV MINIO_ROOT_PASSWORD="clickhouse"
 ENV EXPORT_S3_STORAGE_POLICIES=1
+ENV CLICKHOUSE_GRPC_CLIENT="/usr/share/clickhouse-utils/grpc-client/clickhouse-grpc-client.py"
 
 RUN npm install -g azurite@3.30.0 \
     && npm install -g tslib && npm install -g node
+
+COPY run.sh /
+COPY setup_minio.sh /
+COPY setup_hdfs_minicluster.sh /
+COPY attach_gdb.lib /
+COPY utils.lib /
+
+# We store stress_tests.lib in stateless image to avoid duplication of this file in stress and upgrade tests
+COPY stress_tests.lib /
+
+CMD ["/bin/bash", "/run.sh"]
diff --git a/docker/test/stateless/attach_gdb.lib b/docker/test/stateless/attach_gdb.lib
new file mode 100644
index 00000000000..eb54f920b98
--- /dev/null
+++ b/docker/test/stateless/attach_gdb.lib
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# shellcheck source=./utils.lib
+source /utils.lib
+
+function attach_gdb_to_clickhouse()
+{
+    # Set follow-fork-mode to parent, because we attach to clickhouse-server, not to watchdog
+    # and clickhouse-server can do fork-exec, for example, to run some bridge.
+    # Do not set nostop noprint for all signals, because some it may cause gdb to hang,
+    # explicitly ignore non-fatal signals that are used by server.
+    # Number of SIGRTMIN can be determined only in runtime.
+    RTMIN=$(kill -l SIGRTMIN)
+  echo "
+set follow-fork-mode parent
+handle SIGHUP nostop noprint pass
+handle SIGINT nostop noprint pass
+handle SIGQUIT nostop noprint pass
+handle SIGPIPE nostop noprint pass
+handle SIGTERM nostop noprint pass
+handle SIGUSR1 nostop noprint pass
+handle SIGUSR2 nostop noprint pass
+handle SIGSEGV nostop pass
+handle SIG$RTMIN nostop noprint pass
+info signals
+continue
+backtrace full
+thread apply all backtrace full
+info registers
+disassemble /s
+up
+disassemble /s
+up
+disassemble /s
+p \"done\"
+detach
+quit
+" > script.gdb
+
+    # FIXME Hung check may work incorrectly because of attached gdb
+    # We cannot attach another gdb to get stacktraces if some queries hung
+    gdb -batch -command script.gdb -p "$(cat /var/run/clickhouse-server/clickhouse-server.pid)" | ts '%Y-%m-%d %H:%M:%S' >> /test_output/gdb.log &
+    sleep 5
+    # gdb will send SIGSTOP, spend some time loading debug info and then send SIGCONT, wait for it (up to send_timeout, 300s)
+    run_with_retry 60 clickhouse-client --query "SELECT 'Connected to clickhouse-server after attaching gdb'"
+}
+
+# vi: ft=bash
diff --git a/tests/docker_scripts/stateless_runner.sh b/docker/test/stateless/run.sh
similarity index 76%
rename from tests/docker_scripts/stateless_runner.sh
rename to docker/test/stateless/run.sh
index d8921a04458..670a2420ddf 100755
--- a/tests/docker_scripts/stateless_runner.sh
+++ b/docker/test/stateless/run.sh
@@ -1,20 +1,14 @@
 #!/bin/bash
 
-# fail on errors, verbose and export all env variables
-set -e -x -a
-
 # shellcheck disable=SC1091
 source /setup_export_logs.sh
 
-# shellcheck source=../stateless/stress_tests.lib
-source /repo/tests/docker_scripts/stress_tests.lib
-
-# Avoid overlaps with previous runs
-dmesg --clear
-
 # fail on errors, verbose and export all env variables
 set -e -x -a
 
+MAX_RUN_TIME=${MAX_RUN_TIME:-9000}
+MAX_RUN_TIME=$((MAX_RUN_TIME == 0 ? 9000 : MAX_RUN_TIME))
+
 USE_DATABASE_REPLICATED=${USE_DATABASE_REPLICATED:=0}
 USE_SHARED_CATALOG=${USE_SHARED_CATALOG:=0}
 
@@ -42,22 +36,22 @@ if [[ -z "$BUGFIX_VALIDATE_CHECK" ]]; then
     chc --version || exit 1
 fi
 
-ln -sf /repo/tests/clickhouse-test /usr/bin/clickhouse-test
-
-export CLICKHOUSE_GRPC_CLIENT="/repo/utils/grpc-client/clickhouse-grpc-client.py"
+ln -s /usr/share/clickhouse-test/clickhouse-test /usr/bin/clickhouse-test
 
 # shellcheck disable=SC1091
-source /repo/tests/docker_scripts/attach_gdb.lib
+source /attach_gdb.lib
 
 # shellcheck disable=SC1091
-source /repo/tests/docker_scripts/utils.lib
+source /utils.lib
 
 # install test configs
-/repo/tests/config/install.sh
+/usr/share/clickhouse-test/config/install.sh
 
-/repo/tests/docker_scripts/setup_minio.sh stateless
+./setup_minio.sh stateless
+./mc admin trace clickminio > /test_output/minio.log &
+MC_ADMIN_PID=$!
 
-/repo/tests/docker_scripts/setup_hdfs_minicluster.sh
+./setup_hdfs_minicluster.sh
 
 config_logs_export_cluster /etc/clickhouse-server/config.d/system_logs_export.yaml
 
@@ -78,15 +72,8 @@ if [[ -n "$BUGFIX_VALIDATE_CHECK" ]] && [[ "$BUGFIX_VALIDATE_CHECK" -eq 1 ]]; th
     remove_keeper_config "latest_logs_cache_size_threshold" "[[:digit:]]\+"
 fi
 
-export IS_FLAKY_CHECK=0
-
-# Export NUM_TRIES so python scripts will see its value as env variable
-export NUM_TRIES
-
 # For flaky check we also enable thread fuzzer
 if [ "$NUM_TRIES" -gt "1" ]; then
-    export IS_FLAKY_CHECK=1
-
     export THREAD_FUZZER_CPU_TIME_PERIOD_US=1000
     export THREAD_FUZZER_SLEEP_PROBABILITY=0.1
     export THREAD_FUZZER_SLEEP_TIME_US_MAX=100000
@@ -177,56 +164,7 @@ do
 done
 
 setup_logs_replication
-attach_gdb_to_clickhouse
-
-# create tables for minio log webhooks
-clickhouse-client --query "CREATE TABLE minio_audit_logs
-(
-    log String,
-    event_time DateTime64(9) MATERIALIZED parseDateTime64BestEffortOrZero(trim(BOTH '\"' FROM JSONExtractRaw(log, 'time')), 9, 'UTC')
-)
-ENGINE = MergeTree
-ORDER BY tuple()"
-
-clickhouse-client --query "CREATE TABLE minio_server_logs
-(
-    log String,
-    event_time DateTime64(9) MATERIALIZED parseDateTime64BestEffortOrZero(trim(BOTH '\"' FROM JSONExtractRaw(log, 'time')), 9, 'UTC')
-)
-ENGINE = MergeTree
-ORDER BY tuple()"
-
-# create minio log webhooks for both audit and server logs
-# use async inserts to avoid creating too many parts
-./mc admin config set clickminio logger_webhook:ch_server_webhook endpoint="http://localhost:8123/?async_insert=1&wait_for_async_insert=0&async_insert_busy_timeout_min_ms=5000&async_insert_busy_timeout_max_ms=5000&async_insert_max_query_number=1000&async_insert_max_data_size=10485760&query=INSERT%20INTO%20minio_server_logs%20FORMAT%20LineAsString" queue_size=1000000 batch_size=500
-./mc admin config set clickminio audit_webhook:ch_audit_webhook endpoint="http://localhost:8123/?async_insert=1&wait_for_async_insert=0&async_insert_busy_timeout_min_ms=5000&async_insert_busy_timeout_max_ms=5000&async_insert_max_query_number=1000&async_insert_max_data_size=10485760&query=INSERT%20INTO%20minio_audit_logs%20FORMAT%20LineAsString" queue_size=1000000 batch_size=500
-
-max_retries=100
-retry=1
-while [ $retry -le $max_retries ]; do
-    echo "clickminio restart attempt $retry:"
-
-    output=$(./mc admin service restart clickminio --wait --json 2>&1 | jq -r .status)
-    echo "Output of restart status: $output"
-
-    expected_output="success
-success"
-    if [ "$output" = "$expected_output" ]; then
-        echo "Restarted clickminio successfully."
-        break
-    fi
-
-    sleep 1
-
-    retry=$((retry + 1))
-done
-
-if [ $retry -gt $max_retries ]; then
-    echo "Failed to restart clickminio after $max_retries attempts."
-fi
-
-./mc admin trace clickminio > /test_output/minio.log &
-MC_ADMIN_PID=$!
+attach_gdb_to_clickhouse || true  # FIXME: to not break old builds, clean on 2023-09-01
 
 function fn_exists() {
     declare -F "$1" > /dev/null;
@@ -274,10 +212,6 @@ function run_tests()
         ADDITIONAL_OPTIONS+=('--shared-catalog')
     fi
 
-    if [[ "$USE_DISTRIBUTED_CACHE" -eq 1 ]]; then
-        ADDITIONAL_OPTIONS+=('--distributed-cache')
-    fi
-
     if [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
         ADDITIONAL_OPTIONS+=('--replicated-database')
         # Too many tests fail for DatabaseReplicated in parallel.
@@ -314,43 +248,33 @@ function run_tests()
     try_run_with_retry 10 clickhouse-client -q "insert into system.zookeeper (name, path, value) values ('auxiliary_zookeeper2', '/test/chroot/', '')"
 
     set +e
-
-    TEST_ARGS=(
-        --testname
-        --shard
-        --zookeeper
-        --check-zookeeper-session
-        --hung-check
-        --print-time
-        --no-drop-if-fail
-        --capture-client-stacktrace
-        --queries "/repo/tests/queries"
-        --test-runs "$NUM_TRIES"
-        "${ADDITIONAL_OPTIONS[@]}"
-    )
-    clickhouse-test "${TEST_ARGS[@]}" 2>&1 \
-        | ts '%Y-%m-%d %H:%M:%S' \
-        | tee -a test_output/test_result.txt
+    timeout -k 60m -s TERM --preserve-status 140m  clickhouse-test --testname --shard --zookeeper --check-zookeeper-session --hung-check --print-time \
+         --no-drop-if-fail --test-runs "$NUM_TRIES" "${ADDITIONAL_OPTIONS[@]}" 2>&1 \
+    | ts '%Y-%m-%d %H:%M:%S' \
+    | tee -a test_output/test_result.txt
     set -e
 }
 
 export -f run_tests
 
+
+# This should be enough to setup job and collect artifacts
+TIMEOUT=$((MAX_RUN_TIME - 700))
 if [ "$NUM_TRIES" -gt "1" ]; then
     # We don't run tests with Ordinary database in PRs, only in master.
     # So run new/changed tests with Ordinary at least once in flaky check.
-    NUM_TRIES=1 USE_DATABASE_ORDINARY=1 run_tests \
-      | sed 's/All tests have finished/Redacted: a message about tests finish is deleted/' | sed 's/No tests were run/Redacted: a message about no tests run is deleted/' ||:
+    timeout_with_logging "$TIMEOUT" bash -c 'NUM_TRIES=1; USE_DATABASE_ORDINARY=1; run_tests' \
+      | sed 's/All tests have finished//' | sed 's/No tests were run//' ||:
 fi
 
-run_tests ||:
+timeout_with_logging "$TIMEOUT" bash -c run_tests ||:
 
 echo "Files in current directory"
 ls -la ./
 echo "Files in root directory"
 ls -la /
 
-/repo/tests/docker_scripts/process_functional_tests_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
+/process_functional_tests_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
 
 clickhouse-client -q "system flush logs" ||:
 
@@ -361,33 +285,25 @@ stop_logs_replication
 failed_to_save_logs=0
 for table in query_log zookeeper_log trace_log transactions_info_log metric_log blob_storage_log error_log
 do
-    if ! clickhouse-client -q "select * from system.$table into outfile '/test_output/$table.tsv.zst' format TSVWithNamesAndTypes"; then
-        failed_to_save_logs=1
-    fi
+    err=$(clickhouse-client -q "select * from system.$table into outfile '/test_output/$table.tsv.gz' format TSVWithNamesAndTypes")
+    echo "$err"
+    [[ "0" != "${#err}"  ]] && failed_to_save_logs=1
     if [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
-        if ! clickhouse-client --port 19000 -q "select * from system.$table into outfile '/test_output/$table.1.tsv.zst' format TSVWithNamesAndTypes"; then
-            failed_to_save_logs=1
-        fi
-        if ! clickhouse-client --port 29000 -q "select * from system.$table into outfile '/test_output/$table.2.tsv.zst' format TSVWithNamesAndTypes"; then
-            failed_to_save_logs=1
-        fi
+        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 [[ "$USE_SHARED_CATALOG" -eq 1 ]]; then
-        if ! clickhouse-client --port 29000 -q "select * from system.$table into outfile '/test_output/$table.2.tsv.zst' format TSVWithNamesAndTypes"; then
-            failed_to_save_logs=1
-        fi
+        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
 
-
-# collect minio audit and server logs
-# wait for minio to flush its batch if it has any
-sleep 1
-clickhouse-client -q "SYSTEM FLUSH ASYNC INSERT QUEUE"
-clickhouse-client --max_block_size 8192 --max_memory_usage 10G --max_threads 1 --max_result_bytes 0 --max_result_rows 0 --max_rows_to_read 0 --max_bytes_to_read 0 -q "SELECT log FROM minio_audit_logs ORDER BY event_time INTO OUTFILE '/test_output/minio_audit_logs.jsonl.zst' FORMAT JSONEachRow"
-clickhouse-client --max_block_size 8192 --max_memory_usage 10G --max_threads 1 --max_result_bytes 0 --max_result_rows 0 --max_rows_to_read 0 --max_bytes_to_read 0 -q "SELECT log FROM minio_server_logs ORDER BY event_time INTO OUTFILE '/test_output/minio_server_logs.jsonl.zst' FORMAT JSONEachRow"
-
 # 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.
@@ -457,8 +373,6 @@ do
         | zstd --threads=0 > "/test_output/trace-log-$trace_type-flamegraph.tsv.zst" ||:
 done
 
-# Grep logs for sanitizer asserts, crashes and other critical errors
-check_logs_for_critical_errors
 
 # Compressed (FIXME: remove once only github actions will be left)
 rm /var/log/clickhouse-server/clickhouse-server.log
diff --git a/tests/docker_scripts/setup_hdfs_minicluster.sh b/docker/test/stateless/setup_hdfs_minicluster.sh
similarity index 95%
rename from tests/docker_scripts/setup_hdfs_minicluster.sh
rename to docker/test/stateless/setup_hdfs_minicluster.sh
index 622270ba5d5..15a54f59096 100755
--- a/tests/docker_scripts/setup_hdfs_minicluster.sh
+++ b/docker/test/stateless/setup_hdfs_minicluster.sh
@@ -5,7 +5,7 @@ set -e -x -a -u
 
 ls -lha
 
-cd /hadoop-3.3.1
+cd hadoop-3.3.1
 
 export JAVA_HOME=/usr
 mkdir -p target/test/data
diff --git a/tests/docker_scripts/setup_minio.sh b/docker/test/stateless/setup_minio.sh
similarity index 87%
rename from tests/docker_scripts/setup_minio.sh
rename to docker/test/stateless/setup_minio.sh
index 40e93e713a1..2b9433edd20 100755
--- a/tests/docker_scripts/setup_minio.sh
+++ b/docker/test/stateless/setup_minio.sh
@@ -59,8 +59,8 @@ find_os() {
 download_minio() {
   local os
   local arch
-  local minio_server_version=${MINIO_SERVER_VERSION:-2024-08-03T04-33-23Z}
-  local minio_client_version=${MINIO_CLIENT_VERSION:-2024-07-31T15-58-33Z}
+  local minio_server_version=${MINIO_SERVER_VERSION:-2022-09-07T22-25-02Z}
+  local minio_client_version=${MINIO_CLIENT_VERSION:-2022-08-28T20-08-11Z}
 
   os=$(find_os)
   arch=$(find_arch)
@@ -82,10 +82,10 @@ setup_minio() {
   local test_type=$1
   ./mc alias set clickminio http://localhost:11111 clickhouse clickhouse
   ./mc admin user add clickminio test testtest
-  ./mc admin policy attach clickminio readwrite --user=test
+  ./mc admin policy set clickminio readwrite user=test
   ./mc mb --ignore-existing clickminio/test
   if [ "$test_type" = "stateless" ]; then
-    ./mc anonymous set public clickminio/test
+    ./mc policy set public clickminio/test
   fi
 }
 
@@ -99,9 +99,10 @@ upload_data() {
   # iterating over globs will cause redundant file variable to be
   # a path to a file, not a filename
   # shellcheck disable=SC2045
-  if [ -d "${data_path}" ]; then
-    ./mc cp --recursive "${data_path}"/ clickminio/test/
-  fi
+  for file in $(ls "${data_path}"); do
+    echo "${file}";
+    ./mc cp "${data_path}"/"${file}" clickminio/test/"${file}";
+  done
 }
 
 setup_aws_credentials() {
@@ -143,8 +144,8 @@ main() {
   fi
   start_minio
   setup_minio "$1"
-  upload_data "${query_dir}" "${2:-/repo/tests/}"
+  upload_data "${query_dir}" "${2:-/usr/share/clickhouse-test}"
   setup_aws_credentials
 }
 
-main "$@"
+main "$@"
\ No newline at end of file
diff --git a/tests/docker_scripts/stress_tests.lib b/docker/test/stateless/stress_tests.lib
similarity index 95%
rename from tests/docker_scripts/stress_tests.lib
rename to docker/test/stateless/stress_tests.lib
index cc4c290afef..682da1df837 100644
--- a/tests/docker_scripts/stress_tests.lib
+++ b/docker/test/stateless/stress_tests.lib
@@ -42,7 +42,7 @@ function configure()
     # install test configs
     export USE_DATABASE_ORDINARY=1
     export EXPORT_S3_STORAGE_POLICIES=1
-    /repo/tests/config/install.sh
+    /usr/share/clickhouse-test/config/install.sh
 
     # avoid too slow startup
     sudo cat /etc/clickhouse-server/config.d/keeper_port.xml \
@@ -139,9 +139,9 @@ EOL
                 </table_function_remote_max_addresses>
 
                 <!-- Don't waste cycles testing the old interpreter. Spend time in the new analyzer instead -->
-                <enable_analyzer>
+                <allow_experimental_analyzer>
                     <readonly/>
-                </enable_analyzer>
+                </allow_experimental_analyzer>
 
                 <!-- This feature is broken, deprecated and will be removed. We don't want more reports about it -->
                 <allow_experimental_object_type>
@@ -242,7 +242,7 @@ function check_server_start()
 function check_logs_for_critical_errors()
 {
     # Sanitizer asserts
-    sed -n '/WARNING:.*anitizer/,/^$/p' /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
@@ -272,10 +272,8 @@ function check_logs_for_critical_errors()
     # Remove file no_such_key_errors.txt if it's empty
     [ -s /test_output/no_such_key_errors.txt ] || rm /test_output/no_such_key_errors.txt
 
-    # Crash. This must have fewer '#'s than the command below, otherwise the command below will match
-    # the echo of this command (if set -x is enabled, and this script's stdout is sent
-    # to /test_output/run.log).
-    rg -Fa "#######################################" /var/log/clickhouse-server/clickhouse-server*.log > /dev/null \
+    # Crash
+    rg -Fa "########################################" /var/log/clickhouse-server/clickhouse-server*.log > /dev/null \
         && echo -e "Killed by signal (in clickhouse-server.log)$FAIL" >> /test_output/test_results.tsv \
         || echo -e "Not crashed$OK" >> /test_output/test_results.tsv
 
@@ -310,8 +308,7 @@ function collect_query_and_trace_logs()
 {
     for table in query_log trace_log metric_log
     do
-        # Don't ignore errors here, it leads to ignore sanitizer reports when running clickhouse-local
-        clickhouse-local --config-file=/etc/clickhouse-server/config.xml --only-system-tables -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.tsv.zst
+        clickhouse-local --config-file=/etc/clickhouse-server/config.xml --only-system-tables -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.tsv.zst ||:
     done
 }
 
diff --git a/tests/docker_scripts/utils.lib b/docker/test/stateless/utils.lib
similarity index 76%
rename from tests/docker_scripts/utils.lib
rename to docker/test/stateless/utils.lib
index 31cd67254b4..c3bb8ae9ea4 100644
--- a/tests/docker_scripts/utils.lib
+++ b/docker/test/stateless/utils.lib
@@ -40,6 +40,19 @@ function fn_exists() {
     declare -F "$1" > /dev/null;
 }
 
+function timeout_with_logging() {
+    local exit_code=0
+
+    timeout -s TERM --preserve-status "${@}" || exit_code="${?}"
+
+    if [[ "${exit_code}" -eq "124" ]]
+    then
+      echo "The command 'timeout ${*}' has been killed by timeout"
+    fi
+
+    return $exit_code
+}
+
 function collect_core_dumps()
 {
   find . -type f -maxdepth 1 -name 'core.*' | while read -r core; do
diff --git a/docker/test/stress/Dockerfile b/docker/test/stress/Dockerfile
index ecb98a4e3ed..0f81a1cd07f 100644
--- a/docker/test/stress/Dockerfile
+++ b/docker/test/stress/Dockerfile
@@ -22,5 +22,8 @@ RUN apt-get update -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
+COPY run.sh /
+
 ENV EXPORT_S3_STORAGE_POLICIES=1
 
+CMD ["/bin/bash", "/run.sh"]
diff --git a/tests/docker_scripts/stress_runner.sh b/docker/test/stress/run.sh
old mode 100755
new mode 100644
similarity index 96%
rename from tests/docker_scripts/stress_runner.sh
rename to docker/test/stress/run.sh
index 039c60c8e4e..86467394513
--- a/tests/docker_scripts/stress_runner.sh
+++ b/docker/test/stress/run.sh
@@ -3,24 +3,26 @@
 # shellcheck disable=SC2086
 # shellcheck disable=SC2024
 
-set -x
-
 # Avoid overlaps with previous runs
 dmesg --clear
 # shellcheck disable=SC1091
 source /setup_export_logs.sh
 
-ln -s /repo/tests/clickhouse-test /usr/bin/clickhouse-test
+set -x
+
+# we mount tests folder from repo to /usr/share
+ln -s /usr/share/clickhouse-test/ci/stress.py /usr/bin/stress
+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 /repo/tests/docker_scripts/attach_gdb.lib
+source /attach_gdb.lib
 # shellcheck source=../stateless/stress_tests.lib
-source /repo/tests/docker_scripts/stress_tests.lib
+source /stress_tests.lib
 
 # shellcheck disable=SC1091
-source /repo/tests/docker_scripts/utils.lib
+source /utils.lib
 
 install_packages package_folder
 
@@ -53,7 +55,7 @@ export ZOOKEEPER_FAULT_INJECTION=1
 # available for dump via clickhouse-local
 configure
 
-/repo/tests/docker_scripts/setup_minio.sh stateless # to have a proper environment
+./setup_minio.sh stateless # to have a proper environment
 
 config_logs_export_cluster /etc/clickhouse-server/config.d/system_logs_export.yaml
 
@@ -62,7 +64,7 @@ start_server
 setup_logs_replication
 
 clickhouse-client --query "CREATE DATABASE datasets"
-clickhouse-client --multiquery < /repo/tests/docker_scripts/create.sql
+clickhouse-client --multiquery < create.sql
 clickhouse-client --query "SHOW TABLES FROM datasets"
 
 clickhouse-client --query "CREATE DATABASE IF NOT EXISTS test"
@@ -207,9 +209,9 @@ clickhouse-client --query "CREATE TABLE test.visits (CounterID UInt32,  StartDat
     ENGINE = CollapsingMergeTree(Sign) PARTITION BY toYYYYMM(StartDate) ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID)
     SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192, storage_policy='$TEMP_POLICY'"
 
-clickhouse-client --query "INSERT INTO test.hits_s3 SELECT * FROM datasets.hits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0, max_insert_threads=16"
-clickhouse-client --query "INSERT INTO test.hits SELECT * FROM datasets.hits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0, max_insert_threads=16"
-clickhouse-client --query "INSERT INTO test.visits SELECT * FROM datasets.visits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0, max_insert_threads=16"
+clickhouse-client --query "INSERT INTO test.hits_s3 SELECT * FROM datasets.hits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0"
+clickhouse-client --query "INSERT INTO test.hits SELECT * FROM datasets.hits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0"
+clickhouse-client --query "INSERT INTO test.visits SELECT * FROM datasets.visits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0"
 
 clickhouse-client --query "DROP TABLE datasets.visits_v1 SYNC"
 clickhouse-client --query "DROP TABLE datasets.hits_v1 SYNC"
@@ -265,8 +267,7 @@ fi
 
 start_server
 
-cd /repo/tests/ || exit 1  # clickhouse-test can find queries dir from there
-python3 /repo/tests/ci/stress.py --hung-check --drop-databases --output-folder /test_output --skip-func-tests "$SKIP_TESTS_OPTION" --global-time-limit 1200 \
+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 \
     || echo -e "Test script failed$FAIL script exit code: $?" >> /test_output/test_results.tsv
 
diff --git a/docker/test/unit/Dockerfile b/docker/test/unit/Dockerfile
index 9f4b86aa0ca..af44dc930b2 100644
--- a/docker/test/unit/Dockerfile
+++ b/docker/test/unit/Dockerfile
@@ -4,5 +4,4 @@ ARG FROM_TAG=latest
 FROM clickhouse/test-base:$FROM_TAG
 
 COPY run.sh /
-RUN chmod +x run.sh
-ENTRYPOINT ["/run.sh"]
+CMD ["/bin/bash", "/run.sh"]
diff --git a/docker/test/unit/run.sh b/docker/test/unit/run.sh
index 210f31170a5..7323c384d9c 100644
--- a/docker/test/unit/run.sh
+++ b/docker/test/unit/run.sh
@@ -1,27 +1,5 @@
 #!/bin/bash
 
 set -x
-# Need to keep error from tests after `tee`. Otherwise we don't alert on asan errors
-set -o pipefail
-set -e
 
-if [ "$#" -ne 1 ]; then
-    echo "Expected exactly one argument"
-    exit 1
-fi
-
-if [ "$1" = "GDB" ];
-then
-  timeout 40m \
-    gdb -q  -ex "set print inferior-events off" -ex "set confirm off" -ex "set print thread-events off" -ex run -ex bt -ex quit --args \
-    ./unit_tests_dbms --gtest_output='json:test_output/test_result.json' \
-    | tee test_output/test_result.txt
-elif [ "$1" = "NO_GDB" ];
-then
-  timeout 40m \
-    ./unit_tests_dbms --gtest_output='json:test_output/test_result.json' \
-    | tee test_output/test_result.txt
-else
-    echo "Unknown argument: $1"
-    exit 1
-fi
+timeout 40m gdb -q  -ex 'set print inferior-events off' -ex 'set confirm off' -ex 'set print thread-events off' -ex run -ex bt -ex quit --args ./unit_tests_dbms --gtest_output='json:test_output/test_result.json' | tee test_output/test_result.txt
diff --git a/docker/test/upgrade/Dockerfile b/docker/test/upgrade/Dockerfile
new file mode 100644
index 00000000000..78d912fd031
--- /dev/null
+++ b/docker/test/upgrade/Dockerfile
@@ -0,0 +1,29 @@
+# rebuild in #33610
+# docker build -t clickhouse/upgrade-check .
+ARG FROM_TAG=latest
+FROM clickhouse/stateful-test:$FROM_TAG
+
+RUN apt-get update -y \
+    && env DEBIAN_FRONTEND=noninteractive \
+        apt-get install --yes --no-install-recommends \
+            bash \
+            tzdata \
+            parallel \
+            expect \
+            python3 \
+            python3-lxml \
+            python3-termcolor \
+            python3-requests \
+            curl \
+            sudo \
+            openssl \
+            netcat-openbsd \
+            brotli \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
+
+COPY run.sh /
+
+ENV EXPORT_S3_STORAGE_POLICIES=1
+
+CMD ["/bin/bash", "/run.sh"]
diff --git a/tests/docker_scripts/upgrade_runner.sh b/docker/test/upgrade/run.sh
old mode 100755
new mode 100644
similarity index 93%
rename from tests/docker_scripts/upgrade_runner.sh
rename to docker/test/upgrade/run.sh
index ece75ebf782..a4c4c75e5b3
--- a/tests/docker_scripts/upgrade_runner.sh
+++ b/docker/test/upgrade/run.sh
@@ -9,20 +9,20 @@ dmesg --clear
 set -x
 
 # we mount tests folder from repo to /usr/share
-ln -s /repo/tests/ci/stress.py /usr/bin/stress
-ln -s /repo/tests/clickhouse-test /usr/bin/clickhouse-test
-ln -s /repo/tests/ci/download_release_packages.py /usr/bin/download_release_packages
-ln -s /repo/tests/ci/get_previous_release_tag.py /usr/bin/get_previous_release_tag
+ln -s /usr/share/clickhouse-test/ci/stress.py /usr/bin/stress
+ln -s /usr/share/clickhouse-test/clickhouse-test /usr/bin/clickhouse-test
+ln -s /usr/share/clickhouse-test/ci/download_release_packages.py /usr/bin/download_release_packages
+ln -s /usr/share/clickhouse-test/ci/get_previous_release_tag.py /usr/bin/get_previous_release_tag
 
 # 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 /repo/tests/docker_scripts/attach_gdb.lib
+source /attach_gdb.lib
 # shellcheck source=../stateless/stress_tests.lib
-source /repo/tests/docker_scripts/stress_tests.lib
+source /stress_tests.lib
 
 azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
-/repo/tests/docker_scripts/setup_minio.sh stateless # to have a proper environment
+./setup_minio.sh stateless # to have a proper environment
 
 echo "Get previous release tag"
 # shellcheck disable=SC2016
@@ -129,7 +129,6 @@ 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
-# Also the automatic value of 'max_threads' and similar was displayed as "'auto(...)'" in previous versions instead of "auto(...)".
 # 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" ]
@@ -146,9 +145,7 @@ then
       old_settings.value AS old_value
   FROM new_settings
   LEFT JOIN old_settings ON new_settings.name = old_settings.name
-  WHERE (new_value != old_value)
-      AND NOT (startsWith(new_value, 'auto(') AND old_value LIKE '%auto(%')
-      AND (name NOT IN (
+  WHERE (new_settings.value != old_settings.value) AND (name NOT IN (
       SELECT arrayJoin(tupleElement(changes, 'name'))
       FROM
       (
@@ -180,7 +177,7 @@ then
   if [ -s changed_settings.txt ]
   then
       mv changed_settings.txt /test_output/
-      echo -e "Changed settings are not reflected in the settings changes history (see changed_settings.txt)$FAIL$(head_escaped /test_output/changed_settings.txt)" >> /test_output/test_results.tsv
+      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
diff --git a/docker/test/util/Dockerfile b/docker/test/util/Dockerfile
index 6b9fb94a4c6..babddbd228c 100644
--- a/docker/test/util/Dockerfile
+++ b/docker/test/util/Dockerfile
@@ -5,6 +5,14 @@ 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
 
+# FIXME: rebuild for clang 18.1.3, that contains a workaround [1] for
+# sanitizers issue [2]:
+#
+# $ git tag --contains  c2a57034eff048cd36c563c8e0051db3a70991b3 | tail -1
+# llvmorg-18.1.3
+#
+#  [1]: https://github.com/llvm/llvm-project/commit/c2a57034eff048cd36c563c8e0051db3a70991b3
+#  [2]: https://github.com/ClickHouse/ClickHouse/issues/64086
 ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=18
 
 RUN apt-get update \
@@ -44,6 +52,7 @@ RUN apt-get update \
         bash \
         bsdmainutils \
         build-essential \
+        gdb \
         git \
         gperf \
         moreutils \
@@ -56,5 +65,4 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
-COPY --from=clickhouse/cctools:0d6b90a7a490 /opt/gdb /opt/gdb
-ENV PATH="/opt/gdb/bin:${PATH}"
+COPY process_functional_tests_result.py /
diff --git a/tests/docker_scripts/process_functional_tests_result.py b/docker/test/util/process_functional_tests_result.py
similarity index 81%
rename from tests/docker_scripts/process_functional_tests_result.py
rename to docker/test/util/process_functional_tests_result.py
index 1dc3090484c..4442c9d7d9e 100755
--- a/tests/docker_scripts/process_functional_tests_result.py
+++ b/docker/test/util/process_functional_tests_result.py
@@ -12,7 +12,6 @@ UNKNOWN_SIGN = "[ UNKNOWN "
 SKIPPED_SIGN = "[ SKIPPED "
 HUNG_SIGN = "Found hung queries in processlist"
 SERVER_DIED_SIGN = "Server died, terminating all processes"
-SERVER_DIED_SIGN2 = "Server does not respond to health check"
 DATABASE_SIGN = "Database: "
 
 SUCCESS_FINISH_SIGNS = ["All tests have finished", "No tests were run"]
@@ -32,7 +31,7 @@ def process_test_log(log_path, broken_tests):
     success_finish = False
     test_results = []
     test_end = True
-    with open(log_path, "r", encoding="utf-8") as test_file:
+    with open(log_path, "r") as test_file:
         for line in test_file:
             original_line = line
             line = line.strip()
@@ -44,7 +43,7 @@ def process_test_log(log_path, broken_tests):
             if HUNG_SIGN in line:
                 hung = True
                 break
-            if SERVER_DIED_SIGN in line or SERVER_DIED_SIGN2 in line:
+            if SERVER_DIED_SIGN in line:
                 server_died = True
             if RETRIES_SIGN in line:
                 retries = True
@@ -112,12 +111,12 @@ def process_test_log(log_path, broken_tests):
     # Python does not support TSV, so we have to escape '\t' and '\n' manually
     # and hope that complex escape sequences will not break anything
     test_results = [
-        [
+        (
             test[0],
             test[1],
             test[2],
-            "".join(test[3])[:8192].replace("\t", "\\t").replace("\n", "\\n"),
-        ]
+            "".join(test[3])[:4096].replace("\t", "\\t").replace("\n", "\\n"),
+        )
         for test in test_results
     ]
 
@@ -150,7 +149,7 @@ def process_result(result_path, broken_tests):
 
     if result_path and os.path.exists(result_path):
         (
-            _total,
+            total,
             skipped,
             unknown,
             failed,
@@ -161,41 +160,36 @@ def process_result(result_path, broken_tests):
             retries,
             test_results,
         ) = process_test_log(result_path, broken_tests)
-        is_flaky_check = 1 < int(os.environ.get("NUM_TRIES", 1))
-        logging.info("Is flaky check: %s", is_flaky_check)
+        is_flacky_check = 1 < int(os.environ.get("NUM_TRIES", 1))
+        logging.info("Is flaky check: %s", is_flacky_check)
         # If no tests were run (success == 0) it indicates an error (e.g. server did not start or crashed immediately)
         # But it's Ok for "flaky checks" - they can contain just one test for check which is marked as skipped.
-        if failed != 0 or unknown != 0 or (success == 0 and (not is_flaky_check)):
+        if failed != 0 or unknown != 0 or (success == 0 and (not is_flacky_check)):
             state = "failure"
 
         if hung:
             description = "Some queries hung, "
             state = "failure"
-            test_results.append(["Some queries hung", "FAIL", "0", ""])
+            test_results.append(("Some queries hung", "FAIL", "0", ""))
         elif server_died:
             description = "Server died, "
             state = "failure"
-            # When ClickHouse server crashes, some tests are still running
-            # and fail because they cannot connect to server
-            for result in test_results:
-                if result[1] == "FAIL":
-                    result[1] = "SERVER_DIED"
-            test_results.append(["Server died", "FAIL", "0", ""])
+            test_results.append(("Server died", "FAIL", "0", ""))
         elif not success_finish:
             description = "Tests are not finished, "
             state = "failure"
-            test_results.append(["Tests are not finished", "FAIL", "0", ""])
+            test_results.append(("Tests are not finished", "FAIL", "0", ""))
         elif retries:
             description = "Some tests restarted, "
-            test_results.append(["Some tests restarted", "SKIPPED", "0", ""])
+            test_results.append(("Some tests restarted", "SKIPPED", "0", ""))
         else:
             description = ""
 
-        description += f"fail: {failed}, passed: {success}"
+        description += "fail: {}, passed: {}".format(failed, success)
         if skipped != 0:
-            description += f", skipped: {skipped}"
+            description += ", skipped: {}".format(skipped)
         if unknown != 0:
-            description += f", unknown: {unknown}"
+            description += ", unknown: {}".format(unknown)
     else:
         state = "failure"
         description = "Output log doesn't exist"
@@ -205,10 +199,10 @@ def process_result(result_path, broken_tests):
 
 
 def write_results(results_file, status_file, results, status):
-    with open(results_file, "w", encoding="utf-8") as f:
+    with open(results_file, "w") as f:
         out = csv.writer(f, delimiter="\t")
         out.writerows(results)
-    with open(status_file, "w", encoding="utf-8") as f:
+    with open(status_file, "w") as f:
         out = csv.writer(f, delimiter="\t")
         out.writerow(status)
 
@@ -221,15 +215,15 @@ if __name__ == "__main__":
     parser.add_argument("--in-results-dir", default="/test_output/")
     parser.add_argument("--out-results-file", default="/test_output/test_results.tsv")
     parser.add_argument("--out-status-file", default="/test_output/check_status.tsv")
-    parser.add_argument("--broken-tests", default="/repo/tests/analyzer_tech_debt.txt")
+    parser.add_argument("--broken-tests", default="/analyzer_tech_debt.txt")
     args = parser.parse_args()
 
-    broken_tests = []
+    broken_tests = list()
     if os.path.exists(args.broken_tests):
-        print(f"File {args.broken_tests} with broken tests found")
-        with open(args.broken_tests, encoding="utf-8") as f:
+        logging.info(f"File {args.broken_tests} with broken tests found")
+        with open(args.broken_tests) as f:
             broken_tests = f.read().splitlines()
-        print(f"Broken tests in the list: {len(broken_tests)}")
+        logging.info(f"Broken tests in the list: {len(broken_tests)}")
 
     state, description, test_results = process_result(args.in_results_dir, broken_tests)
     logging.info("Result parsed")
@@ -239,12 +233,11 @@ if __name__ == "__main__":
         # sort by status then by check name
         order = {
             "FAIL": 0,
-            "SERVER_DIED": 1,
-            "Timeout": 2,
-            "NOT_FAILED": 3,
-            "BROKEN": 4,
-            "OK": 5,
-            "SKIPPED": 6,
+            "Timeout": 1,
+            "NOT_FAILED": 2,
+            "BROKEN": 3,
+            "OK": 4,
+            "SKIPPED": 5,
         }
         return order.get(item[1], 10), str(item[0]), item[1]
 
diff --git a/docs/changelogs/v20.5.1.3833-prestable.md b/docs/changelogs/v20.5.1.3833-prestable.md
index 3de263f5e37..79d61fb12f9 100644
--- a/docs/changelogs/v20.5.1.3833-prestable.md
+++ b/docs/changelogs/v20.5.1.3833-prestable.md
@@ -331,7 +331,7 @@
 * Fix several non significant errors in unit tests. [#11262](https://github.com/ClickHouse/ClickHouse/pull/11262) ([alesapin](https://github.com/alesapin)).
 * Add a test for Join table engine from @donmikel. This closes [#9158](https://github.com/ClickHouse/ClickHouse/issues/9158). [#11265](https://github.com/ClickHouse/ClickHouse/pull/11265) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Repeat test in CI if `curl` invocation was timed out. It is possible due to system hangups for 10+ seconds that are typical in our CI infrastructure. This fixes [#11267](https://github.com/ClickHouse/ClickHouse/issues/11267). [#11268](https://github.com/ClickHouse/ClickHouse/pull/11268) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix potentially flaky test `00731_long_merge_tree_select_opened_files.sh`. It does not fail frequently but we have discovered potential race condition in this test while experimenting with ThreadFuzzer: [#9814](https://github.com/ClickHouse/ClickHouse/issues/9814) See [link](https://clickhouse-test-reports.s3.yandex.net/9814/40e3023e215df22985d275bf85f4d2290897b76b/functional_stateless_tests_(unbundled).html#fail1) for the example. [#11270](https://github.com/ClickHouse/ClickHouse/pull/11270) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix potentially flacky test `00731_long_merge_tree_select_opened_files.sh`. It does not fail frequently but we have discovered potential race condition in this test while experimenting with ThreadFuzzer: [#9814](https://github.com/ClickHouse/ClickHouse/issues/9814) See [link](https://clickhouse-test-reports.s3.yandex.net/9814/40e3023e215df22985d275bf85f4d2290897b76b/functional_stateless_tests_(unbundled).html#fail1) for the example. [#11270](https://github.com/ClickHouse/ClickHouse/pull/11270) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Now clickhouse-test check the server aliveness before tests run. [#11285](https://github.com/ClickHouse/ClickHouse/pull/11285) ([alesapin](https://github.com/alesapin)).
 * Emit a warning if server was build in debug or with sanitizers. [#11304](https://github.com/ClickHouse/ClickHouse/pull/11304) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Better check for hung queries in clickhouse-test. [#11321](https://github.com/ClickHouse/ClickHouse/pull/11321) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
diff --git a/docs/changelogs/v21.11.1.8636-prestable.md b/docs/changelogs/v21.11.1.8636-prestable.md
index 95c8580d591..d6a435dd3ce 100644
--- a/docs/changelogs/v21.11.1.8636-prestable.md
+++ b/docs/changelogs/v21.11.1.8636-prestable.md
@@ -280,7 +280,7 @@ sidebar_label: 2022
 * Cleanup unbundled image [#29689](https://github.com/ClickHouse/ClickHouse/pull/29689) ([Azat Khuzhin](https://github.com/azat)).
 * Fix memory tracking for merges and mutations [#29691](https://github.com/ClickHouse/ClickHouse/pull/29691) ([Azat Khuzhin](https://github.com/azat)).
 * Fix data-race in WriteIndirectBuffer (used in DiskMemory) [#29692](https://github.com/ClickHouse/ClickHouse/pull/29692) ([Azat Khuzhin](https://github.com/azat)).
-* Fix flaky test [#29706](https://github.com/ClickHouse/ClickHouse/pull/29706) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flacky test [#29706](https://github.com/ClickHouse/ClickHouse/pull/29706) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * BorrowedObjectPool condition variable notify fix [#29722](https://github.com/ClickHouse/ClickHouse/pull/29722) ([Maksim Kita](https://github.com/kitaisreal)).
 * Better exception message for local interactive [#29737](https://github.com/ClickHouse/ClickHouse/pull/29737) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Fix --stage for clickhouse-local [#29745](https://github.com/ClickHouse/ClickHouse/pull/29745) ([Azat Khuzhin](https://github.com/azat)).
@@ -308,7 +308,7 @@ sidebar_label: 2022
 * Fix client [#29864](https://github.com/ClickHouse/ClickHouse/pull/29864) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Remove some more streams. [#29898](https://github.com/ClickHouse/ClickHouse/pull/29898) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Add logging in ZooKeeper client [#29901](https://github.com/ClickHouse/ClickHouse/pull/29901) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Fix some flaky tests [#29902](https://github.com/ClickHouse/ClickHouse/pull/29902) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix some flacky tests [#29902](https://github.com/ClickHouse/ClickHouse/pull/29902) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Grep server log even if it contains binary data [#29903](https://github.com/ClickHouse/ClickHouse/pull/29903) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Cosmetic refactoring of server constants. [#29913](https://github.com/ClickHouse/ClickHouse/pull/29913) ([Amos Bird](https://github.com/amosbird)).
 * Format improvement of AlterQuery [#29916](https://github.com/ClickHouse/ClickHouse/pull/29916) ([flynn](https://github.com/ucasfl)).
@@ -465,7 +465,7 @@ sidebar_label: 2022
 * Fix docs release [#30933](https://github.com/ClickHouse/ClickHouse/pull/30933) ([alesapin](https://github.com/alesapin)).
 * Fix style check [#30937](https://github.com/ClickHouse/ClickHouse/pull/30937) ([alesapin](https://github.com/alesapin)).
 * Fix file progress for clickhouse-local [#30938](https://github.com/ClickHouse/ClickHouse/pull/30938) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix flaky test [#30940](https://github.com/ClickHouse/ClickHouse/pull/30940) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flacky test [#30940](https://github.com/ClickHouse/ClickHouse/pull/30940) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Fix reading from TinyLog [#30941](https://github.com/ClickHouse/ClickHouse/pull/30941) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Add github to known hosts in docs release [#30947](https://github.com/ClickHouse/ClickHouse/pull/30947) ([alesapin](https://github.com/alesapin)).
 * Parse json from response in ci checks [#30948](https://github.com/ClickHouse/ClickHouse/pull/30948) ([alesapin](https://github.com/alesapin)).
diff --git a/docs/changelogs/v21.12.1.9017-prestable.md b/docs/changelogs/v21.12.1.9017-prestable.md
index f5416664d35..bd84873e67a 100644
--- a/docs/changelogs/v21.12.1.9017-prestable.md
+++ b/docs/changelogs/v21.12.1.9017-prestable.md
@@ -220,7 +220,7 @@ sidebar_label: 2022
 * Fix test_backward_compatibility [#30950](https://github.com/ClickHouse/ClickHouse/pull/30950) ([Ilya Yatsishin](https://github.com/qoega)).
 * Add stress test to github actions [#30952](https://github.com/ClickHouse/ClickHouse/pull/30952) ([alesapin](https://github.com/alesapin)).
 * Try smaller blacklist of non parallel integration tests  [#30963](https://github.com/ClickHouse/ClickHouse/pull/30963) ([Ilya Yatsishin](https://github.com/qoega)).
-* Fix flaky test [#30967](https://github.com/ClickHouse/ClickHouse/pull/30967) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flacky test [#30967](https://github.com/ClickHouse/ClickHouse/pull/30967) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Move access-rights source code [#30973](https://github.com/ClickHouse/ClickHouse/pull/30973) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Set output_format_avro_rows_in_file default to 1 [#30990](https://github.com/ClickHouse/ClickHouse/pull/30990) ([Kruglov Pavel](https://github.com/Avogar)).
 * Remove remaining usages of Y_IGNORE [#30993](https://github.com/ClickHouse/ClickHouse/pull/30993) ([Yuriy Chernyshov](https://github.com/georgthegreat)).
@@ -353,7 +353,7 @@ sidebar_label: 2022
 * Support toUInt8/toInt8 for if constant condition optimization. [#31866](https://github.com/ClickHouse/ClickHouse/pull/31866) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Added -no-sanitize=unsigned-integer-overflow build flag [#31881](https://github.com/ClickHouse/ClickHouse/pull/31881) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
 * Fix typos [#31886](https://github.com/ClickHouse/ClickHouse/pull/31886) ([Anton Popov](https://github.com/CurtizJ)).
-* Try to fix flaky test. [#31889](https://github.com/ClickHouse/ClickHouse/pull/31889) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Try to fix flacky test. [#31889](https://github.com/ClickHouse/ClickHouse/pull/31889) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Reduce the files that depend on parser headers [#31896](https://github.com/ClickHouse/ClickHouse/pull/31896) ([Raúl Marín](https://github.com/Algunenano)).
 * Fix magic_enum for debug helpers (fixes build w/ USE_DEBUG_HELPERS) [#31922](https://github.com/ClickHouse/ClickHouse/pull/31922) ([Azat Khuzhin](https://github.com/azat)).
 * Remove some trash from build [#31923](https://github.com/ClickHouse/ClickHouse/pull/31923) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
@@ -387,7 +387,7 @@ sidebar_label: 2022
 * make looping in H3 funcs uniform [#32110](https://github.com/ClickHouse/ClickHouse/pull/32110) ([Bharat Nallan](https://github.com/bharatnc)).
 * Remove PVS check from master [#32114](https://github.com/ClickHouse/ClickHouse/pull/32114) ([alesapin](https://github.com/alesapin)).
 * Fix flaky keeper whitelist test [#32115](https://github.com/ClickHouse/ClickHouse/pull/32115) ([alesapin](https://github.com/alesapin)).
-* Fix flaky test test_executable_storage_input [#32118](https://github.com/ClickHouse/ClickHouse/pull/32118) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix flacky test test_executable_storage_input [#32118](https://github.com/ClickHouse/ClickHouse/pull/32118) ([Maksim Kita](https://github.com/kitaisreal)).
 * Fix data race in `removePartAndEnqueueFetch(...)` [#32119](https://github.com/ClickHouse/ClickHouse/pull/32119) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Move fuzzers and unit tests to another group [#32120](https://github.com/ClickHouse/ClickHouse/pull/32120) ([alesapin](https://github.com/alesapin)).
 * Add a test with 20000 mutations in one query [#32122](https://github.com/ClickHouse/ClickHouse/pull/32122) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
@@ -411,11 +411,11 @@ sidebar_label: 2022
 * Add test for [#32186](https://github.com/ClickHouse/ClickHouse/issues/32186) [#32203](https://github.com/ClickHouse/ClickHouse/pull/32203) ([Raúl Marín](https://github.com/Algunenano)).
 * Fix uncaught exception in DatabaseLazy [#32206](https://github.com/ClickHouse/ClickHouse/pull/32206) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Update ASTCreateQuery.cpp [#32208](https://github.com/ClickHouse/ClickHouse/pull/32208) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix flaky fileLog test (probably) [#32209](https://github.com/ClickHouse/ClickHouse/pull/32209) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flacky fileLog test (probably) [#32209](https://github.com/ClickHouse/ClickHouse/pull/32209) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Fix jemalloc under osx [#32219](https://github.com/ClickHouse/ClickHouse/pull/32219) ([Azat Khuzhin](https://github.com/azat)).
 * Add missing timezones to some tests [#32222](https://github.com/ClickHouse/ClickHouse/pull/32222) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Fix versioning of aggregate functions (fixes performance tests) [#32236](https://github.com/ClickHouse/ClickHouse/pull/32236) ([Azat Khuzhin](https://github.com/azat)).
-* Disable window view tests temporarily because still flaky [#32257](https://github.com/ClickHouse/ClickHouse/pull/32257) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Disable window view tests temporarily because still flacky [#32257](https://github.com/ClickHouse/ClickHouse/pull/32257) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Fix typo in tupleToNameValuePairs doc [#32262](https://github.com/ClickHouse/ClickHouse/pull/32262) ([Vladimir C](https://github.com/vdimir)).
 * Fix possible Pipeline stuck in case of StrictResize processor. [#32270](https://github.com/ClickHouse/ClickHouse/pull/32270) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix possible crash in DataTypeAggregateFunction [#32287](https://github.com/ClickHouse/ClickHouse/pull/32287) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
diff --git a/docs/changelogs/v21.5.1.6601-prestable.md b/docs/changelogs/v21.5.1.6601-prestable.md
index 69ea9cb8d0e..b7dd8ae87c0 100644
--- a/docs/changelogs/v21.5.1.6601-prestable.md
+++ b/docs/changelogs/v21.5.1.6601-prestable.md
@@ -158,7 +158,7 @@ sidebar_label: 2022
 * MemoryStorage sync comments and code [#22721](https://github.com/ClickHouse/ClickHouse/pull/22721) ([Maksim Kita](https://github.com/kitaisreal)).
 * Fix potential segfault on Keeper startup [#22743](https://github.com/ClickHouse/ClickHouse/pull/22743) ([alesapin](https://github.com/alesapin)).
 * Avoid using harmful function rand() [#22744](https://github.com/ClickHouse/ClickHouse/pull/22744) ([Amos Bird](https://github.com/amosbird)).
-* Fix flaky hedged tests [#22746](https://github.com/ClickHouse/ClickHouse/pull/22746) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix flacky hedged tests [#22746](https://github.com/ClickHouse/ClickHouse/pull/22746) ([Kruglov Pavel](https://github.com/Avogar)).
 * add more messages when flushing the logs [#22761](https://github.com/ClickHouse/ClickHouse/pull/22761) ([Alexander Kuzmenkov](https://github.com/akuzm)).
 * Moved BorrowedObjectPool to common [#22764](https://github.com/ClickHouse/ClickHouse/pull/22764) ([Maksim Kita](https://github.com/kitaisreal)).
 * Functions ExternalDictionaries standardize exception throw [#22821](https://github.com/ClickHouse/ClickHouse/pull/22821) ([Maksim Kita](https://github.com/kitaisreal)).
diff --git a/docs/changelogs/v21.6.9.7-stable.md b/docs/changelogs/v21.6.9.7-stable.md
index 533c58badac..0a989e4d6b7 100644
--- a/docs/changelogs/v21.6.9.7-stable.md
+++ b/docs/changelogs/v21.6.9.7-stable.md
@@ -55,7 +55,7 @@ sidebar_label: 2022
 * Try fix rabbitmq tests [#26826](https://github.com/ClickHouse/ClickHouse/pull/26826) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * One more library bridge fix [#26873](https://github.com/ClickHouse/ClickHouse/pull/26873) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Update PVS checksum [#27317](https://github.com/ClickHouse/ClickHouse/pull/27317) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Fix flaky test [#27383](https://github.com/ClickHouse/ClickHouse/pull/27383) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flacky test [#27383](https://github.com/ClickHouse/ClickHouse/pull/27383) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Fix throw without exception in MySQL source. [#28027](https://github.com/ClickHouse/ClickHouse/pull/28027) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix race between REPLACE PARTITION and MOVE PARTITION [#28035](https://github.com/ClickHouse/ClickHouse/pull/28035) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Follow-up to [#28016](https://github.com/ClickHouse/ClickHouse/issues/28016) [#28036](https://github.com/ClickHouse/ClickHouse/pull/28036) ([Alexander Tokmakov](https://github.com/tavplubix)).
diff --git a/docs/changelogs/v21.7.9.7-stable.md b/docs/changelogs/v21.7.9.7-stable.md
index 684d0e8995e..7aaab54af6b 100644
--- a/docs/changelogs/v21.7.9.7-stable.md
+++ b/docs/changelogs/v21.7.9.7-stable.md
@@ -35,7 +35,7 @@ sidebar_label: 2022
 #### NOT FOR CHANGELOG / INSIGNIFICANT
 
 * Fix prometheus metric name [#26140](https://github.com/ClickHouse/ClickHouse/pull/26140) ([Vladimir C](https://github.com/vdimir)).
-* Fix flaky test [#27383](https://github.com/ClickHouse/ClickHouse/pull/27383) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flacky test [#27383](https://github.com/ClickHouse/ClickHouse/pull/27383) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Fix throw without exception in MySQL source. [#28027](https://github.com/ClickHouse/ClickHouse/pull/28027) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix race between REPLACE PARTITION and MOVE PARTITION [#28035](https://github.com/ClickHouse/ClickHouse/pull/28035) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Follow-up to [#28016](https://github.com/ClickHouse/ClickHouse/issues/28016) [#28036](https://github.com/ClickHouse/ClickHouse/pull/28036) ([Alexander Tokmakov](https://github.com/tavplubix)).
diff --git a/docs/changelogs/v21.8.1.7409-prestable.md b/docs/changelogs/v21.8.1.7409-prestable.md
index 6ef2f1b50d2..cb6ab82b30f 100644
--- a/docs/changelogs/v21.8.1.7409-prestable.md
+++ b/docs/changelogs/v21.8.1.7409-prestable.md
@@ -101,7 +101,7 @@ sidebar_label: 2022
 * Separate log files for separate runs in stress test [#25741](https://github.com/ClickHouse/ClickHouse/pull/25741) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Fix slow performance test [#25742](https://github.com/ClickHouse/ClickHouse/pull/25742) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * DatabaseAtomic EXCHANGE DICTIONARIES fix test [#25753](https://github.com/ClickHouse/ClickHouse/pull/25753) ([Maksim Kita](https://github.com/kitaisreal)).
-* Try fix flaky rabbitmq test [#25756](https://github.com/ClickHouse/ClickHouse/pull/25756) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Try fix flacky rabbitmq test [#25756](https://github.com/ClickHouse/ClickHouse/pull/25756) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Add a test for [#13993](https://github.com/ClickHouse/ClickHouse/issues/13993) [#25758](https://github.com/ClickHouse/ClickHouse/pull/25758) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Set follow-fork-mode child for gdb in stress/fasttest/fuzzer [#25769](https://github.com/ClickHouse/ClickHouse/pull/25769) ([Azat Khuzhin](https://github.com/azat)).
 * Ignore TOO_DEEP_RECURSION server exception during fuzzing [#25770](https://github.com/ClickHouse/ClickHouse/pull/25770) ([Azat Khuzhin](https://github.com/azat)).
diff --git a/docs/changelogs/v21.8.5.7-lts.md b/docs/changelogs/v21.8.5.7-lts.md
index 4d0727e362c..fa459e093f7 100644
--- a/docs/changelogs/v21.8.5.7-lts.md
+++ b/docs/changelogs/v21.8.5.7-lts.md
@@ -40,7 +40,7 @@ sidebar_label: 2022
 
 * Fix several bugs in ZooKeeper snapshots deserialization [#26127](https://github.com/ClickHouse/ClickHouse/pull/26127) ([alesapin](https://github.com/alesapin)).
 * Fix prometheus metric name [#26140](https://github.com/ClickHouse/ClickHouse/pull/26140) ([Vladimir C](https://github.com/vdimir)).
-* Fix flaky test [#27383](https://github.com/ClickHouse/ClickHouse/pull/27383) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flacky test [#27383](https://github.com/ClickHouse/ClickHouse/pull/27383) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Fix throw without exception in MySQL source. [#28027](https://github.com/ClickHouse/ClickHouse/pull/28027) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix race between REPLACE PARTITION and MOVE PARTITION [#28035](https://github.com/ClickHouse/ClickHouse/pull/28035) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Follow-up to [#28016](https://github.com/ClickHouse/ClickHouse/issues/28016) [#28036](https://github.com/ClickHouse/ClickHouse/pull/28036) ([Alexander Tokmakov](https://github.com/tavplubix)).
diff --git a/docs/changelogs/v21.9.1.8000-prestable.md b/docs/changelogs/v21.9.1.8000-prestable.md
index 70ae3697e92..bc921a68693 100644
--- a/docs/changelogs/v21.9.1.8000-prestable.md
+++ b/docs/changelogs/v21.9.1.8000-prestable.md
@@ -346,7 +346,7 @@ sidebar_label: 2022
 * Update PVS checksum [#27317](https://github.com/ClickHouse/ClickHouse/pull/27317) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Fix 01300_client_save_history_when_terminated_long [#27324](https://github.com/ClickHouse/ClickHouse/pull/27324) ([Raúl Marín](https://github.com/Algunenano)).
 * Try update contrib/zlib-ng [#27327](https://github.com/ClickHouse/ClickHouse/pull/27327) ([Ilya Yatsishin](https://github.com/qoega)).
-* Fix flaky test [#27383](https://github.com/ClickHouse/ClickHouse/pull/27383) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flacky test [#27383](https://github.com/ClickHouse/ClickHouse/pull/27383) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Add and check system.mutations for database filter [#27384](https://github.com/ClickHouse/ClickHouse/pull/27384) ([Azat Khuzhin](https://github.com/azat)).
 * Correct the key data type used in mapContains [#27423](https://github.com/ClickHouse/ClickHouse/pull/27423) ([Fuwang Hu](https://github.com/fuwhu)).
 * Fix tests for WithMergeableStateAfterAggregationAndLimit [#27424](https://github.com/ClickHouse/ClickHouse/pull/27424) ([Azat Khuzhin](https://github.com/azat)).
diff --git a/docs/changelogs/v22.1.1.2542-prestable.md b/docs/changelogs/v22.1.1.2542-prestable.md
index 3b0422abb11..cacd13c1e12 100644
--- a/docs/changelogs/v22.1.1.2542-prestable.md
+++ b/docs/changelogs/v22.1.1.2542-prestable.md
@@ -398,7 +398,7 @@ sidebar_label: 2022
 * test for [#24410](https://github.com/ClickHouse/ClickHouse/issues/24410) [#33265](https://github.com/ClickHouse/ClickHouse/pull/33265) ([Denny Crane](https://github.com/den-crane)).
 * Wait for RabbitMQ container to actually start when it was restarted in test on purpose [#33266](https://github.com/ClickHouse/ClickHouse/pull/33266) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Mark max_alter_threads as obsolete [#33268](https://github.com/ClickHouse/ClickHouse/pull/33268) ([Denny Crane](https://github.com/den-crane)).
-* Fix azure tests flakyness because of azure server closing connection [#33269](https://github.com/ClickHouse/ClickHouse/pull/33269) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix azure tests flackyness because of azure server closing connection [#33269](https://github.com/ClickHouse/ClickHouse/pull/33269) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Test for [#26920](https://github.com/ClickHouse/ClickHouse/issues/26920) [#33272](https://github.com/ClickHouse/ClickHouse/pull/33272) ([Denny Crane](https://github.com/den-crane)).
 * Fix test_storage_kafka failures by adjusting retention.ms [#33278](https://github.com/ClickHouse/ClickHouse/pull/33278) ([Azat Khuzhin](https://github.com/azat)).
 * Disable FunctionConvertFromString::canBeExecutedOnDefaultArguments [#33286](https://github.com/ClickHouse/ClickHouse/pull/33286) ([Vladimir C](https://github.com/vdimir)).
@@ -447,7 +447,7 @@ sidebar_label: 2022
 * Update mongodb.md [#33585](https://github.com/ClickHouse/ClickHouse/pull/33585) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Restore existing static builds links [#33597](https://github.com/ClickHouse/ClickHouse/pull/33597) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Fix pylint for run_check.py [#33600](https://github.com/ClickHouse/ClickHouse/pull/33600) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
-* Fix flaky test_dictionaries_postgresql/ [#33601](https://github.com/ClickHouse/ClickHouse/pull/33601) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flacky test_dictionaries_postgresql/ [#33601](https://github.com/ClickHouse/ClickHouse/pull/33601) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Make ZooKeeper client better interpret keeper server connection reject [#33602](https://github.com/ClickHouse/ClickHouse/pull/33602) ([alesapin](https://github.com/alesapin)).
 * Fix broken workflow dependencies [#33608](https://github.com/ClickHouse/ClickHouse/pull/33608) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Force rebuild images in CI [#33609](https://github.com/ClickHouse/ClickHouse/pull/33609) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
diff --git a/docs/changelogs/v22.4.1.2305-prestable.md b/docs/changelogs/v22.4.1.2305-prestable.md
index e8304e6505f..b277137ca7e 100644
--- a/docs/changelogs/v22.4.1.2305-prestable.md
+++ b/docs/changelogs/v22.4.1.2305-prestable.md
@@ -410,7 +410,7 @@ sidebar_label: 2022
 * Fix mongodb test with new cert [#36161](https://github.com/ClickHouse/ClickHouse/pull/36161) ([alesapin](https://github.com/alesapin)).
 * Some fixes for ReplicatedMergeTree [#36163](https://github.com/ClickHouse/ClickHouse/pull/36163) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * clickhouse-client: properly cancel query in case of error during formatting data [#36164](https://github.com/ClickHouse/ClickHouse/pull/36164) ([Azat Khuzhin](https://github.com/azat)).
-* Fix flaky test 01161_all_system_tables under s3 storage [#36175](https://github.com/ClickHouse/ClickHouse/pull/36175) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flacky test 01161_all_system_tables under s3 storage [#36175](https://github.com/ClickHouse/ClickHouse/pull/36175) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Revert "Fix possible mutation stuck due to race with DROP_RANGE" [#36190](https://github.com/ClickHouse/ClickHouse/pull/36190) ([Azat Khuzhin](https://github.com/azat)).
 * Use atomic instead of mutex + condvar in ParallelReadBuffer [#36192](https://github.com/ClickHouse/ClickHouse/pull/36192) ([Kruglov Pavel](https://github.com/Avogar)).
 * Follow-up to [#36138](https://github.com/ClickHouse/ClickHouse/issues/36138) [#36194](https://github.com/ClickHouse/ClickHouse/pull/36194) ([Alexander Tokmakov](https://github.com/tavplubix)).
diff --git a/docs/changelogs/v23.4.1.1943-stable.md b/docs/changelogs/v23.4.1.1943-stable.md
index 34590ba9d37..ea16f5856be 100644
--- a/docs/changelogs/v23.4.1.1943-stable.md
+++ b/docs/changelogs/v23.4.1.1943-stable.md
@@ -321,7 +321,7 @@ sidebar_label: 2023
 * Add a test for [#38128](https://github.com/ClickHouse/ClickHouse/issues/38128) [#48817](https://github.com/ClickHouse/ClickHouse/pull/48817) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Remove excessive logging [#48826](https://github.com/ClickHouse/ClickHouse/pull/48826) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * remove duplicate indentwith in clang-format [#48834](https://github.com/ClickHouse/ClickHouse/pull/48834) ([cluster](https://github.com/infdahai)).
-* Try fix flaky test_concurrent_alter_move_and_drop [#48843](https://github.com/ClickHouse/ClickHouse/pull/48843) ([Sergei Trifonov](https://github.com/serxa)).
+* Try fix flacky test_concurrent_alter_move_and_drop [#48843](https://github.com/ClickHouse/ClickHouse/pull/48843) ([Sergei Trifonov](https://github.com/serxa)).
 * fix the race wait loading parts [#48844](https://github.com/ClickHouse/ClickHouse/pull/48844) ([Sema Checherinda](https://github.com/CheSema)).
 * suppress assert of progress for test_system_replicated_fetches [#48856](https://github.com/ClickHouse/ClickHouse/pull/48856) ([Han Fei](https://github.com/hanfei1991)).
 * Fix: do not run test_store_cleanup_disk_s3 in parallel [#48863](https://github.com/ClickHouse/ClickHouse/pull/48863) ([Igor Nikonov](https://github.com/devcrafter)).
@@ -372,3 +372,4 @@ sidebar_label: 2023
 * suppress two timeout tests [#49175](https://github.com/ClickHouse/ClickHouse/pull/49175) ([Han Fei](https://github.com/hanfei1991)).
 * Document makeDateTime() and its variants [#49183](https://github.com/ClickHouse/ClickHouse/pull/49183) ([Robert Schulze](https://github.com/rschu1ze)).
 * Fix after [#49110](https://github.com/ClickHouse/ClickHouse/issues/49110) [#49206](https://github.com/ClickHouse/ClickHouse/pull/49206) ([Kseniia Sumarokova](https://github.com/kssenii)).
+
diff --git a/docs/changelogs/v23.6.1.1524-stable.md b/docs/changelogs/v23.6.1.1524-stable.md
index 0de9ab37653..b91c5340789 100644
--- a/docs/changelogs/v23.6.1.1524-stable.md
+++ b/docs/changelogs/v23.6.1.1524-stable.md
@@ -263,7 +263,7 @@ sidebar_label: 2023
 * Fix broken labeling for `manual approve` [#51405](https://github.com/ClickHouse/ClickHouse/pull/51405) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Fix parts lifetime in `MergeTreeTransaction` [#51407](https://github.com/ClickHouse/ClickHouse/pull/51407) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Fix flaky test test_skip_empty_files [#51409](https://github.com/ClickHouse/ClickHouse/pull/51409) ([Kruglov Pavel](https://github.com/Avogar)).
-* fix flaky test test_profile_events_s3 [#51412](https://github.com/ClickHouse/ClickHouse/pull/51412) ([Sema Checherinda](https://github.com/CheSema)).
+* fix flacky test test_profile_events_s3 [#51412](https://github.com/ClickHouse/ClickHouse/pull/51412) ([Sema Checherinda](https://github.com/CheSema)).
 * Update README.md [#51413](https://github.com/ClickHouse/ClickHouse/pull/51413) ([Tyler Hannan](https://github.com/tylerhannan)).
 * Replace try/catch logic in hasTokenOrNull() by something more lightweight [#51425](https://github.com/ClickHouse/ClickHouse/pull/51425) ([Robert Schulze](https://github.com/rschu1ze)).
 * Add retries to `tlsv1_3` tests [#51434](https://github.com/ClickHouse/ClickHouse/pull/51434) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
diff --git a/docs/changelogs/v23.8.16.40-lts.md b/docs/changelogs/v23.8.16.40-lts.md
deleted file mode 100644
index 75caf1ea277..00000000000
--- a/docs/changelogs/v23.8.16.40-lts.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v23.8.16.40-lts (e143a9039ba) FIXME as compared to v23.8.15.35-lts (060ff8e813a)
-
-#### Improvement
-* Backported in [#66962](https://github.com/ClickHouse/ClickHouse/issues/66962): 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)).
-* Backported in [#65461](https://github.com/ClickHouse/ClickHouse/issues/65461): Reload certificate chain during certificate reload. [#61671](https://github.com/ClickHouse/ClickHouse/pull/61671) ([Pervakov Grigorii](https://github.com/GrigoryPervakov)).
-* Backported in [#65880](https://github.com/ClickHouse/ClickHouse/issues/65880): Always start Keeper with sufficient amount of threads in global thread pool. [#64444](https://github.com/ClickHouse/ClickHouse/pull/64444) ([Duc Canh Le](https://github.com/canhld94)).
-* Backported in [#65912](https://github.com/ClickHouse/ClickHouse/issues/65912): Respect cgroup CPU limit in Keeper. [#65819](https://github.com/ClickHouse/ClickHouse/pull/65819) ([Antonio Andelic](https://github.com/antonio2368)).
-
-#### Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)
-* Backported in [#65281](https://github.com/ClickHouse/ClickHouse/issues/65281): Fix crash with UniqInjectiveFunctionsEliminationPass and uniqCombined. [#65188](https://github.com/ClickHouse/ClickHouse/pull/65188) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#65368](https://github.com/ClickHouse/ClickHouse/issues/65368): Fix a bug in ClickHouse Keeper that causes digest mismatch during closing session. [#65198](https://github.com/ClickHouse/ClickHouse/pull/65198) ([Aleksei Filatov](https://github.com/aalexfvk)).
-* Backported in [#65743](https://github.com/ClickHouse/ClickHouse/issues/65743): Fix crash in maxIntersections. [#65689](https://github.com/ClickHouse/ClickHouse/pull/65689) ([Raúl Marín](https://github.com/Algunenano)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#65351](https://github.com/ClickHouse/ClickHouse/issues/65351): Fix possible abort on uncaught exception in ~WriteBufferFromFileDescriptor in StatusFile. [#64206](https://github.com/ClickHouse/ClickHouse/pull/64206) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#66037](https://github.com/ClickHouse/ClickHouse/issues/66037): Fix crash on destroying AccessControl: add explicit shutdown. [#64993](https://github.com/ClickHouse/ClickHouse/pull/64993) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Backported in [#65782](https://github.com/ClickHouse/ClickHouse/issues/65782): Fixed bug in MergeJoin. Column in sparse serialisation might be treated as a column of its nested type though the required conversion wasn't performed. [#65632](https://github.com/ClickHouse/ClickHouse/pull/65632) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#65926](https://github.com/ClickHouse/ClickHouse/issues/65926): For queries that read from `PostgreSQL`, cancel the internal `PostgreSQL` query if the ClickHouse query is finished. Otherwise, `ClickHouse` query cannot be canceled until the internal `PostgreSQL` query is finished. [#65771](https://github.com/ClickHouse/ClickHouse/pull/65771) ([Maksim Kita](https://github.com/kitaisreal)).
-* Backported in [#65822](https://github.com/ClickHouse/ClickHouse/issues/65822): Fix a bug in short circuit logic when old analyzer and dictGetOrDefault is used. [#65802](https://github.com/ClickHouse/ClickHouse/pull/65802) ([jsc0218](https://github.com/jsc0218)).
-* Backported in [#66449](https://github.com/ClickHouse/ClickHouse/issues/66449): Fixed a bug in ZooKeeper client: a session could get stuck in unusable state after receiving a hardware error from ZooKeeper. For example, this might happen due to "soft memory limit" in ClickHouse Keeper. [#66140](https://github.com/ClickHouse/ClickHouse/pull/66140) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#66717](https://github.com/ClickHouse/ClickHouse/issues/66717): Correctly track memory for `Allocator::realloc`. [#66548](https://github.com/ClickHouse/ClickHouse/pull/66548) ([Antonio Andelic](https://github.com/antonio2368)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#65080](https://github.com/ClickHouse/ClickHouse/issues/65080): Follow up to [#56541](https://github.com/ClickHouse/ClickHouse/issues/56541). [#57141](https://github.com/ClickHouse/ClickHouse/pull/57141) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Backported in [#65913](https://github.com/ClickHouse/ClickHouse/issues/65913): Fix bug with session closing in Keeper. [#65735](https://github.com/ClickHouse/ClickHouse/pull/65735) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#66853](https://github.com/ClickHouse/ClickHouse/issues/66853): Fix data race in S3::ClientCache. [#66644](https://github.com/ClickHouse/ClickHouse/pull/66644) ([Konstantin Morozov](https://github.com/k-morozov)).
-
diff --git a/docs/changelogs/v24.3.10.33-lts.md b/docs/changelogs/v24.3.10.33-lts.md
deleted file mode 100644
index fbce8f76dad..00000000000
--- a/docs/changelogs/v24.3.10.33-lts.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.3.10.33-lts (37b6502ebf0) FIXME as compared to v24.3.9.5-lts (a939270465e)
-
-#### Improvement
-* Backported in [#68870](https://github.com/ClickHouse/ClickHouse/issues/68870): Make allow_experimental_analyzer be controlled by the initiator for distributed queries. This ensures compatibility and correctness during operations in mixed version clusters. [#65777](https://github.com/ClickHouse/ClickHouse/pull/65777) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Backported in [#69095](https://github.com/ClickHouse/ClickHouse/issues/69095): Support for the Spanish language in the embedded dictionaries. [#69035](https://github.com/ClickHouse/ClickHouse/pull/69035) ([Vasily Okunev](https://github.com/VOkunev)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#68995](https://github.com/ClickHouse/ClickHouse/issues/68995): Fix the upper bound of the function `fromModifiedJulianDay`. It was supposed to be `9999-12-31` but was mistakenly set to `9999-01-01`. [#67583](https://github.com/ClickHouse/ClickHouse/pull/67583) ([PHO](https://github.com/depressed-pho)).
-* Backported in [#68844](https://github.com/ClickHouse/ClickHouse/issues/68844): Fixed crash in Parquet filtering when data types in the file substantially differ from requested types (e.g. `... FROM file('a.parquet', Parquet, 'x String')`, but the file has `x Int64`). Without this fix, use `input_format_parquet_filter_push_down = 0` as a workaround. [#68131](https://github.com/ClickHouse/ClickHouse/pull/68131) ([Michael Kolupaev](https://github.com/al13n321)).
-* Backported in [#68881](https://github.com/ClickHouse/ClickHouse/issues/68881): Fixes [#50868](https://github.com/ClickHouse/ClickHouse/issues/50868). Small DateTime64 constant values returned by a nested subquery inside a distributed query were wrongly transformed to Nulls, thus causing errors and possible incorrect query results. [#68323](https://github.com/ClickHouse/ClickHouse/pull/68323) ([Shankar](https://github.com/shiyer7474)).
-* Backported in [#69054](https://github.com/ClickHouse/ClickHouse/issues/69054): Added back virtual columns ` _table` and `_database` to distributed tables. They were available until version 24.3. [#68672](https://github.com/ClickHouse/ClickHouse/pull/68672) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#68856](https://github.com/ClickHouse/ClickHouse/issues/68856): Fix possible error `Size of permutation (0) is less than required (...)` during Variant column permutation. [#68681](https://github.com/ClickHouse/ClickHouse/pull/68681) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#69152](https://github.com/ClickHouse/ClickHouse/issues/69152): Fix possible wrong result during anyHeavy state merge. [#68950](https://github.com/ClickHouse/ClickHouse/pull/68950) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#69112](https://github.com/ClickHouse/ClickHouse/issues/69112): Fix logical error when we have empty async insert. [#69080](https://github.com/ClickHouse/ClickHouse/pull/69080) ([Han Fei](https://github.com/hanfei1991)).
-
-#### NO CL CATEGORY
-
-* Backported in [#68938](https://github.com/ClickHouse/ClickHouse/issues/68938):. [#68897](https://github.com/ClickHouse/ClickHouse/pull/68897) ([Alexander Gololobov](https://github.com/davenger)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#68826](https://github.com/ClickHouse/ClickHouse/issues/68826): Turn off fault injection for insert in `01396_inactive_replica_cleanup_nodes_zookeeper`. [#68715](https://github.com/ClickHouse/ClickHouse/pull/68715) ([alesapin](https://github.com/alesapin)).
-* Backported in [#68754](https://github.com/ClickHouse/ClickHouse/issues/68754): To make patch release possible from every commit on release branch, package_debug build is required and must not be skipped. [#68750](https://github.com/ClickHouse/ClickHouse/pull/68750) ([Max K.](https://github.com/maxknv)).
-* Backported in [#69044](https://github.com/ClickHouse/ClickHouse/issues/69044): Fix 01114_database_atomic flakiness. [#68930](https://github.com/ClickHouse/ClickHouse/pull/68930) ([Raúl Marín](https://github.com/Algunenano)).
-
diff --git a/docs/changelogs/v24.3.11.7-lts.md b/docs/changelogs/v24.3.11.7-lts.md
deleted file mode 100644
index 2d97dfbaad2..00000000000
--- a/docs/changelogs/v24.3.11.7-lts.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.3.11.7-lts (28795d0a47e) FIXME as compared to v24.3.10.33-lts (37b6502ebf0)
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#67479](https://github.com/ClickHouse/ClickHouse/issues/67479): In rare cases ClickHouse could consider parts as broken because of some unexpected projections on disk. Now it's fixed. [#66898](https://github.com/ClickHouse/ClickHouse/pull/66898) ([alesapin](https://github.com/alesapin)).
-* Backported in [#69243](https://github.com/ClickHouse/ClickHouse/issues/69243): `UNION` clause in subqueries wasn't handled correctly in queries with parallel replicas and lead to LOGICAL_ERROR `Duplicate announcement received for replica`. [#69146](https://github.com/ClickHouse/ClickHouse/pull/69146) ([Igor Nikonov](https://github.com/devcrafter)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#69221](https://github.com/ClickHouse/ClickHouse/issues/69221): Disable memory test with sanitizer. [#69193](https://github.com/ClickHouse/ClickHouse/pull/69193) ([alesapin](https://github.com/alesapin)).
-
diff --git a/docs/changelogs/v24.3.5.46-lts.md b/docs/changelogs/v24.3.5.46-lts.md
deleted file mode 100644
index 1f2b7c8b0b7..00000000000
--- a/docs/changelogs/v24.3.5.46-lts.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.3.5.46-lts (fe54cead6b6) FIXME as compared to v24.3.4.147-lts (31a7bdc346d)
-
-#### Improvement
-* Backported in [#65463](https://github.com/ClickHouse/ClickHouse/issues/65463): Reload certificate chain during certificate reload. [#61671](https://github.com/ClickHouse/ClickHouse/pull/61671) ([Pervakov Grigorii](https://github.com/GrigoryPervakov)).
-* Backported in [#65882](https://github.com/ClickHouse/ClickHouse/issues/65882): Always start Keeper with sufficient amount of threads in global thread pool. [#64444](https://github.com/ClickHouse/ClickHouse/pull/64444) ([Duc Canh Le](https://github.com/canhld94)).
-* Backported in [#65302](https://github.com/ClickHouse/ClickHouse/issues/65302): Returned back the behaviour of how ClickHouse works and interprets Tuples in CSV format. This change effectively reverts https://github.com/ClickHouse/ClickHouse/pull/60994 and makes it available only under a few settings: `output_format_csv_serialize_tuple_into_separate_columns`, `input_format_csv_deserialize_separate_columns_into_tuple` and `input_format_csv_try_infer_strings_from_quoted_tuples`. [#65170](https://github.com/ClickHouse/ClickHouse/pull/65170) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Backported in [#65892](https://github.com/ClickHouse/ClickHouse/issues/65892): Respect cgroup CPU limit in Keeper. [#65819](https://github.com/ClickHouse/ClickHouse/pull/65819) ([Antonio Andelic](https://github.com/antonio2368)).
-
-#### Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)
-* Backported in [#65283](https://github.com/ClickHouse/ClickHouse/issues/65283): Fix crash with UniqInjectiveFunctionsEliminationPass and uniqCombined. [#65188](https://github.com/ClickHouse/ClickHouse/pull/65188) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#65370](https://github.com/ClickHouse/ClickHouse/issues/65370): Fix a bug in ClickHouse Keeper that causes digest mismatch during closing session. [#65198](https://github.com/ClickHouse/ClickHouse/pull/65198) ([Aleksei Filatov](https://github.com/aalexfvk)).
-* Backported in [#65446](https://github.com/ClickHouse/ClickHouse/issues/65446): Use correct memory alignment for Distinct combinator. Previously, crash could happen because of invalid memory allocation when the combinator was used. [#65379](https://github.com/ClickHouse/ClickHouse/pull/65379) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#65708](https://github.com/ClickHouse/ClickHouse/issues/65708): Fix crash in maxIntersections. [#65689](https://github.com/ClickHouse/ClickHouse/pull/65689) ([Raúl Marín](https://github.com/Algunenano)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#65352](https://github.com/ClickHouse/ClickHouse/issues/65352): Fix possible abort on uncaught exception in ~WriteBufferFromFileDescriptor in StatusFile. [#64206](https://github.com/ClickHouse/ClickHouse/pull/64206) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#65327](https://github.com/ClickHouse/ClickHouse/issues/65327): Fix the crash loop when restoring from backup is blocked by creating an MV with a definer that hasn't been restored yet. [#64595](https://github.com/ClickHouse/ClickHouse/pull/64595) ([pufit](https://github.com/pufit)).
-* Backported in [#65538](https://github.com/ClickHouse/ClickHouse/issues/65538): Fix crash for `ALTER TABLE ... ON CLUSTER ... MODIFY SQL SECURITY`. [#64957](https://github.com/ClickHouse/ClickHouse/pull/64957) ([pufit](https://github.com/pufit)).
-* Backported in [#65576](https://github.com/ClickHouse/ClickHouse/issues/65576): Fix crash on destroying AccessControl: add explicit shutdown. [#64993](https://github.com/ClickHouse/ClickHouse/pull/64993) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Backported in [#65159](https://github.com/ClickHouse/ClickHouse/issues/65159): Fix pushing arithmetic operations out of aggregation. In the new analyzer, optimization was applied only once. [#65104](https://github.com/ClickHouse/ClickHouse/pull/65104) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#65615](https://github.com/ClickHouse/ClickHouse/issues/65615): Fix aggregate function name rewriting in the new analyzer. [#65110](https://github.com/ClickHouse/ClickHouse/pull/65110) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#65728](https://github.com/ClickHouse/ClickHouse/issues/65728): Eliminate injective function in argument of functions `uniq*` recursively. This used to work correctly but was broken in the new analyzer. [#65140](https://github.com/ClickHouse/ClickHouse/pull/65140) ([Duc Canh Le](https://github.com/canhld94)).
-* Backported in [#65261](https://github.com/ClickHouse/ClickHouse/issues/65261): Fix the bug in Hashed and Hashed_Array dictionary short circuit evaluation, which may read uninitialized number, leading to various errors. [#65256](https://github.com/ClickHouse/ClickHouse/pull/65256) ([jsc0218](https://github.com/jsc0218)).
-* Backported in [#65667](https://github.com/ClickHouse/ClickHouse/issues/65667): Disable `non-intersecting-parts` optimization for queries with `FINAL` in case of `read-in-order` optimization was enabled. This could lead to an incorrect query result. As a workaround, disable `do_not_merge_across_partitions_select_final` and `split_parts_ranges_into_intersecting_and_non_intersecting_final` before this fix is merged. [#65505](https://github.com/ClickHouse/ClickHouse/pull/65505) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#65784](https://github.com/ClickHouse/ClickHouse/issues/65784): Fixed bug in MergeJoin. Column in sparse serialisation might be treated as a column of its nested type though the required conversion wasn't performed. [#65632](https://github.com/ClickHouse/ClickHouse/pull/65632) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#65929](https://github.com/ClickHouse/ClickHouse/issues/65929): For queries that read from `PostgreSQL`, cancel the internal `PostgreSQL` query if the ClickHouse query is finished. Otherwise, `ClickHouse` query cannot be canceled until the internal `PostgreSQL` query is finished. [#65771](https://github.com/ClickHouse/ClickHouse/pull/65771) ([Maksim Kita](https://github.com/kitaisreal)).
-* Backported in [#65824](https://github.com/ClickHouse/ClickHouse/issues/65824): Fix a bug in short circuit logic when old analyzer and dictGetOrDefault is used. [#65802](https://github.com/ClickHouse/ClickHouse/pull/65802) ([jsc0218](https://github.com/jsc0218)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#65223](https://github.com/ClickHouse/ClickHouse/issues/65223): Capture weak_ptr of ContextAccess for safety. [#65051](https://github.com/ClickHouse/ClickHouse/pull/65051) ([Alexander Gololobov](https://github.com/davenger)).
-* Backported in [#65901](https://github.com/ClickHouse/ClickHouse/issues/65901): Fix bug with session closing in Keeper. [#65735](https://github.com/ClickHouse/ClickHouse/pull/65735) ([Antonio Andelic](https://github.com/antonio2368)).
-
diff --git a/docs/changelogs/v24.3.6.48-lts.md b/docs/changelogs/v24.3.6.48-lts.md
deleted file mode 100644
index f045afc619b..00000000000
--- a/docs/changelogs/v24.3.6.48-lts.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.3.6.48-lts (b2d33c3c45d) FIXME as compared to v24.3.5.46-lts (fe54cead6b6)
-
-#### Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)
-* Backported in [#66889](https://github.com/ClickHouse/ClickHouse/issues/66889): Fix unexpeced size of low cardinality column in function calls. [#65298](https://github.com/ClickHouse/ClickHouse/pull/65298) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66687](https://github.com/ClickHouse/ClickHouse/issues/66687): Fix the VALID UNTIL clause in the user definition resetting after a restart. Closes [#66405](https://github.com/ClickHouse/ClickHouse/issues/66405). [#66409](https://github.com/ClickHouse/ClickHouse/pull/66409) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Backported in [#67497](https://github.com/ClickHouse/ClickHouse/issues/67497): Fix crash in DistributedAsyncInsert when connection is empty. [#67219](https://github.com/ClickHouse/ClickHouse/pull/67219) ([Pablo Marcos](https://github.com/pamarcos)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#66324](https://github.com/ClickHouse/ClickHouse/issues/66324): Add missing settings `input_format_csv_skip_first_lines/input_format_tsv_skip_first_lines/input_format_csv_try_infer_numbers_from_strings/input_format_csv_try_infer_strings_from_quoted_tuples` in schema inference cache because they can change the resulting schema. It prevents from incorrect result of schema inference with these settings changed. [#65980](https://github.com/ClickHouse/ClickHouse/pull/65980) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#66151](https://github.com/ClickHouse/ClickHouse/issues/66151): Fixed buffer overflow bug in `unbin`/`unhex` implementation. [#66106](https://github.com/ClickHouse/ClickHouse/pull/66106) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#66451](https://github.com/ClickHouse/ClickHouse/issues/66451): Fixed a bug in ZooKeeper client: a session could get stuck in unusable state after receiving a hardware error from ZooKeeper. For example, this might happen due to "soft memory limit" in ClickHouse Keeper. [#66140](https://github.com/ClickHouse/ClickHouse/pull/66140) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#66222](https://github.com/ClickHouse/ClickHouse/issues/66222): Fix issue in SumIfToCountIfVisitor and signed integers. [#66146](https://github.com/ClickHouse/ClickHouse/pull/66146) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66676](https://github.com/ClickHouse/ClickHouse/issues/66676): Fix handling limit for `system.numbers_mt` when no index can be used. [#66231](https://github.com/ClickHouse/ClickHouse/pull/66231) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#66602](https://github.com/ClickHouse/ClickHouse/issues/66602): Fixed how the ClickHouse server detects the maximum number of usable CPU cores as specified by cgroups v2 if the server runs in a container such as Docker. In more detail, containers often run their process in the root cgroup which has an empty name. In that case, ClickHouse ignored the CPU limits set by cgroups v2. [#66237](https://github.com/ClickHouse/ClickHouse/pull/66237) ([filimonov](https://github.com/filimonov)).
-* Backported in [#66356](https://github.com/ClickHouse/ClickHouse/issues/66356): Fix the `Not-ready set` error when a subquery with `IN` is used in the constraint. [#66261](https://github.com/ClickHouse/ClickHouse/pull/66261) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66970](https://github.com/ClickHouse/ClickHouse/issues/66970): Fix `Column identifier is already registered` error with `group_by_use_nulls=true` and new analyzer. [#66400](https://github.com/ClickHouse/ClickHouse/pull/66400) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66967](https://github.com/ClickHouse/ClickHouse/issues/66967): Fix `Cannot find column` error for queries with constant expression in `GROUP BY` key and new analyzer enabled. [#66433](https://github.com/ClickHouse/ClickHouse/pull/66433) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66718](https://github.com/ClickHouse/ClickHouse/issues/66718): Correctly track memory for `Allocator::realloc`. [#66548](https://github.com/ClickHouse/ClickHouse/pull/66548) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#66949](https://github.com/ClickHouse/ClickHouse/issues/66949): Fix an invalid result for queries with `WINDOW`. This could happen when `PARTITION` columns have sparse serialization and window functions are executed in parallel. [#66579](https://github.com/ClickHouse/ClickHouse/pull/66579) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66946](https://github.com/ClickHouse/ClickHouse/issues/66946): Fix `Method getResultType is not supported for QUERY query node` error when scalar subquery was used as the first argument of IN (with new analyzer). [#66655](https://github.com/ClickHouse/ClickHouse/pull/66655) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#67629](https://github.com/ClickHouse/ClickHouse/issues/67629): Fix for occasional deadlock in Context::getDDLWorker. [#66843](https://github.com/ClickHouse/ClickHouse/pull/66843) ([Alexander Gololobov](https://github.com/davenger)).
-* Backported in [#67193](https://github.com/ClickHouse/ClickHouse/issues/67193): TRUNCATE DATABASE used to stop replication as if it was a DROP DATABASE query, it's fixed. [#67129](https://github.com/ClickHouse/ClickHouse/pull/67129) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#67375](https://github.com/ClickHouse/ClickHouse/issues/67375): Fix error `Cannot convert column because it is non constant in source stream but must be constant in result.` for a query that reads from the `Merge` table over the `Distriburted` table with one shard. [#67146](https://github.com/ClickHouse/ClickHouse/pull/67146) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#67572](https://github.com/ClickHouse/ClickHouse/issues/67572): Fix execution of nested short-circuit functions. [#67520](https://github.com/ClickHouse/ClickHouse/pull/67520) ([Kruglov Pavel](https://github.com/Avogar)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#66422](https://github.com/ClickHouse/ClickHouse/issues/66422): Ignore subquery for IN in DDLLoadingDependencyVisitor. [#66395](https://github.com/ClickHouse/ClickHouse/pull/66395) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66855](https://github.com/ClickHouse/ClickHouse/issues/66855): Fix data race in S3::ClientCache. [#66644](https://github.com/ClickHouse/ClickHouse/pull/66644) ([Konstantin Morozov](https://github.com/k-morozov)).
-* Backported in [#67055](https://github.com/ClickHouse/ClickHouse/issues/67055): Increase asio pool size in case the server is tiny. [#66761](https://github.com/ClickHouse/ClickHouse/pull/66761) ([alesapin](https://github.com/alesapin)).
-* Backported in [#66943](https://github.com/ClickHouse/ClickHouse/issues/66943): Small fix in realloc memory tracking. [#66820](https://github.com/ClickHouse/ClickHouse/pull/66820) ([Antonio Andelic](https://github.com/antonio2368)).
-
diff --git a/docs/changelogs/v24.3.7.30-lts.md b/docs/changelogs/v24.3.7.30-lts.md
deleted file mode 100644
index f945a54840f..00000000000
--- a/docs/changelogs/v24.3.7.30-lts.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.3.7.30-lts (c8a28cf4331) FIXME as compared to v24.3.6.48-lts (b2d33c3c45d)
-
-#### Improvement
-* Backported in [#68103](https://github.com/ClickHouse/ClickHouse/issues/68103): Distinguish booleans and integers while parsing values for custom settings: ``` SET custom_a = true; SET custom_b = 1; ```. [#62206](https://github.com/ClickHouse/ClickHouse/pull/62206) ([Vitaly Baranov](https://github.com/vitlibar)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#67931](https://github.com/ClickHouse/ClickHouse/issues/67931): Fixing the `Not-ready Set` error after the `PREWHERE` optimization for StorageMerge. [#65057](https://github.com/ClickHouse/ClickHouse/pull/65057) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#68062](https://github.com/ClickHouse/ClickHouse/issues/68062): Fix boolean literals in query sent to external database (for engines like `PostgreSQL`). [#66282](https://github.com/ClickHouse/ClickHouse/pull/66282) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67812](https://github.com/ClickHouse/ClickHouse/issues/67812): Only relevant to the experimental Variant data type. Fix crash with Variant + AggregateFunction type. [#67122](https://github.com/ClickHouse/ClickHouse/pull/67122) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67848](https://github.com/ClickHouse/ClickHouse/issues/67848): Fixes [#66026](https://github.com/ClickHouse/ClickHouse/issues/66026). Avoid unresolved table function arguments traversal in `ReplaceTableNodeToDummyVisitor`. [#67522](https://github.com/ClickHouse/ClickHouse/pull/67522) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#68271](https://github.com/ClickHouse/ClickHouse/issues/68271): Fix inserting into stream like engines (Kafka, RabbitMQ, NATS) through HTTP interface. [#67554](https://github.com/ClickHouse/ClickHouse/pull/67554) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#67806](https://github.com/ClickHouse/ClickHouse/issues/67806): Fix reloading SQL UDFs with UNION. Previously, restarting the server could make UDF invalid. [#67665](https://github.com/ClickHouse/ClickHouse/pull/67665) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#67834](https://github.com/ClickHouse/ClickHouse/issues/67834): Fix potential stack overflow in `JSONMergePatch` function. Renamed this function from `jsonMergePatch` to `JSONMergePatch` because the previous name was wrong. The previous name is still kept for compatibility. Improved diagnostic of errors in the function. This closes [#67304](https://github.com/ClickHouse/ClickHouse/issues/67304). [#67756](https://github.com/ClickHouse/ClickHouse/pull/67756) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Backported in [#68206](https://github.com/ClickHouse/ClickHouse/issues/68206): Fix wrong `count()` result when there is non-deterministic function in predicate. [#67922](https://github.com/ClickHouse/ClickHouse/pull/67922) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#68089](https://github.com/ClickHouse/ClickHouse/issues/68089): Fixed the calculation of the maximum thread soft limit in containerized environments where the usable CPU count is limited. [#67963](https://github.com/ClickHouse/ClickHouse/pull/67963) ([Robert Schulze](https://github.com/rschu1ze)).
-* Backported in [#68120](https://github.com/ClickHouse/ClickHouse/issues/68120): Fixed skipping of untouched parts in mutations with new analyzer. Previously with enabled analyzer data in part could be rewritten by mutation even if mutation doesn't affect this part according to predicate. [#68052](https://github.com/ClickHouse/ClickHouse/pull/68052) ([Anton Popov](https://github.com/CurtizJ)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Update version after release. [#67676](https://github.com/ClickHouse/ClickHouse/pull/67676) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Backported in [#68074](https://github.com/ClickHouse/ClickHouse/issues/68074): Add an explicit error for `ALTER MODIFY SQL SECURITY` on non-view tables. [#67953](https://github.com/ClickHouse/ClickHouse/pull/67953) ([pufit](https://github.com/pufit)).
-
diff --git a/docs/changelogs/v24.3.8.13-lts.md b/docs/changelogs/v24.3.8.13-lts.md
deleted file mode 100644
index 6fbceacd624..00000000000
--- a/docs/changelogs/v24.3.8.13-lts.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.3.8.13-lts (84bbfc70f5d) FIXME as compared to v24.3.7.30-lts (c8a28cf4331)
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#68562](https://github.com/ClickHouse/ClickHouse/issues/68562): Fix indexHint function case found by fuzzer. [#66286](https://github.com/ClickHouse/ClickHouse/pull/66286) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#68114](https://github.com/ClickHouse/ClickHouse/issues/68114): Fix possible PARAMETER_OUT_OF_BOUND error during reading variant subcolumn. [#66659](https://github.com/ClickHouse/ClickHouse/pull/66659) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67989](https://github.com/ClickHouse/ClickHouse/issues/67989): Validate experimental/suspicious data types in ALTER ADD/MODIFY COLUMN. [#67911](https://github.com/ClickHouse/ClickHouse/pull/67911) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68335](https://github.com/ClickHouse/ClickHouse/issues/68335): Try fix postgres crash when query is cancelled. [#68288](https://github.com/ClickHouse/ClickHouse/pull/68288) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Backported in [#68392](https://github.com/ClickHouse/ClickHouse/issues/68392): Fix missing sync replica mode in query `SYSTEM SYNC REPLICA`. [#68326](https://github.com/ClickHouse/ClickHouse/pull/68326) ([Duc Canh Le](https://github.com/canhld94)).
-
diff --git a/docs/changelogs/v24.4.4.107-stable.md b/docs/changelogs/v24.4.4.107-stable.md
deleted file mode 100644
index ba7c576715e..00000000000
--- a/docs/changelogs/v24.4.4.107-stable.md
+++ /dev/null
@@ -1,70 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.4.4.107-stable (af0ed6b197e) FIXME as compared to v24.4.3.25-stable (a915dd4eda4)
-
-#### Improvement
-* Backported in [#65884](https://github.com/ClickHouse/ClickHouse/issues/65884): Always start Keeper with sufficient amount of threads in global thread pool. [#64444](https://github.com/ClickHouse/ClickHouse/pull/64444) ([Duc Canh Le](https://github.com/canhld94)).
-* Backported in [#65303](https://github.com/ClickHouse/ClickHouse/issues/65303): Returned back the behaviour of how ClickHouse works and interprets Tuples in CSV format. This change effectively reverts https://github.com/ClickHouse/ClickHouse/pull/60994 and makes it available only under a few settings: `output_format_csv_serialize_tuple_into_separate_columns`, `input_format_csv_deserialize_separate_columns_into_tuple` and `input_format_csv_try_infer_strings_from_quoted_tuples`. [#65170](https://github.com/ClickHouse/ClickHouse/pull/65170) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Backported in [#65894](https://github.com/ClickHouse/ClickHouse/issues/65894): Respect cgroup CPU limit in Keeper. [#65819](https://github.com/ClickHouse/ClickHouse/pull/65819) ([Antonio Andelic](https://github.com/antonio2368)).
-
-#### Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)
-* Backported in [#65372](https://github.com/ClickHouse/ClickHouse/issues/65372): Fix a bug in ClickHouse Keeper that causes digest mismatch during closing session. [#65198](https://github.com/ClickHouse/ClickHouse/pull/65198) ([Aleksei Filatov](https://github.com/aalexfvk)).
-* Backported in [#66883](https://github.com/ClickHouse/ClickHouse/issues/66883): Fix unexpeced size of low cardinality column in function calls. [#65298](https://github.com/ClickHouse/ClickHouse/pull/65298) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#65435](https://github.com/ClickHouse/ClickHouse/issues/65435): Forbid `QUALIFY` clause in the old analyzer. The old analyzer ignored `QUALIFY`, so it could lead to unexpected data removal in mutations. [#65356](https://github.com/ClickHouse/ClickHouse/pull/65356) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#65448](https://github.com/ClickHouse/ClickHouse/issues/65448): Use correct memory alignment for Distinct combinator. Previously, crash could happen because of invalid memory allocation when the combinator was used. [#65379](https://github.com/ClickHouse/ClickHouse/pull/65379) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#65710](https://github.com/ClickHouse/ClickHouse/issues/65710): Fix crash in maxIntersections. [#65689](https://github.com/ClickHouse/ClickHouse/pull/65689) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66689](https://github.com/ClickHouse/ClickHouse/issues/66689): Fix the VALID UNTIL clause in the user definition resetting after a restart. Closes [#66405](https://github.com/ClickHouse/ClickHouse/issues/66405). [#66409](https://github.com/ClickHouse/ClickHouse/pull/66409) ([Nikolay Degterinsky](https://github.com/evillique)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#65353](https://github.com/ClickHouse/ClickHouse/issues/65353): Fix possible abort on uncaught exception in ~WriteBufferFromFileDescriptor in StatusFile. [#64206](https://github.com/ClickHouse/ClickHouse/pull/64206) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#65060](https://github.com/ClickHouse/ClickHouse/issues/65060): Fix the `Expression nodes list expected 1 projection names` and `Unknown expression or identifier` errors for queries with aliases to `GLOBAL IN.`. [#64517](https://github.com/ClickHouse/ClickHouse/pull/64517) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#65329](https://github.com/ClickHouse/ClickHouse/issues/65329): Fix the crash loop when restoring from backup is blocked by creating an MV with a definer that hasn't been restored yet. [#64595](https://github.com/ClickHouse/ClickHouse/pull/64595) ([pufit](https://github.com/pufit)).
-* Backported in [#64833](https://github.com/ClickHouse/ClickHouse/issues/64833): Fix bug which could lead to non-working TTLs with expressions. [#64694](https://github.com/ClickHouse/ClickHouse/pull/64694) ([alesapin](https://github.com/alesapin)).
-* Backported in [#65086](https://github.com/ClickHouse/ClickHouse/issues/65086): Fix removing the `WHERE` and `PREWHERE` expressions, which are always true (for the new analyzer). [#64695](https://github.com/ClickHouse/ClickHouse/pull/64695) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#65540](https://github.com/ClickHouse/ClickHouse/issues/65540): Fix crash for `ALTER TABLE ... ON CLUSTER ... MODIFY SQL SECURITY`. [#64957](https://github.com/ClickHouse/ClickHouse/pull/64957) ([pufit](https://github.com/pufit)).
-* Backported in [#65578](https://github.com/ClickHouse/ClickHouse/issues/65578): Fix crash on destroying AccessControl: add explicit shutdown. [#64993](https://github.com/ClickHouse/ClickHouse/pull/64993) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Backported in [#65161](https://github.com/ClickHouse/ClickHouse/issues/65161): Fix pushing arithmetic operations out of aggregation. In the new analyzer, optimization was applied only once. [#65104](https://github.com/ClickHouse/ClickHouse/pull/65104) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#65616](https://github.com/ClickHouse/ClickHouse/issues/65616): Fix aggregate function name rewriting in the new analyzer. [#65110](https://github.com/ClickHouse/ClickHouse/pull/65110) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#65730](https://github.com/ClickHouse/ClickHouse/issues/65730): Eliminate injective function in argument of functions `uniq*` recursively. This used to work correctly but was broken in the new analyzer. [#65140](https://github.com/ClickHouse/ClickHouse/pull/65140) ([Duc Canh Le](https://github.com/canhld94)).
-* Backported in [#65668](https://github.com/ClickHouse/ClickHouse/issues/65668): Disable `non-intersecting-parts` optimization for queries with `FINAL` in case of `read-in-order` optimization was enabled. This could lead to an incorrect query result. As a workaround, disable `do_not_merge_across_partitions_select_final` and `split_parts_ranges_into_intersecting_and_non_intersecting_final` before this fix is merged. [#65505](https://github.com/ClickHouse/ClickHouse/pull/65505) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#65786](https://github.com/ClickHouse/ClickHouse/issues/65786): Fixed bug in MergeJoin. Column in sparse serialisation might be treated as a column of its nested type though the required conversion wasn't performed. [#65632](https://github.com/ClickHouse/ClickHouse/pull/65632) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#65810](https://github.com/ClickHouse/ClickHouse/issues/65810): Fix invalid exceptions in function `parseDateTime` with `%F` and `%D` placeholders. [#65768](https://github.com/ClickHouse/ClickHouse/pull/65768) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#65931](https://github.com/ClickHouse/ClickHouse/issues/65931): For queries that read from `PostgreSQL`, cancel the internal `PostgreSQL` query if the ClickHouse query is finished. Otherwise, `ClickHouse` query cannot be canceled until the internal `PostgreSQL` query is finished. [#65771](https://github.com/ClickHouse/ClickHouse/pull/65771) ([Maksim Kita](https://github.com/kitaisreal)).
-* Backported in [#65826](https://github.com/ClickHouse/ClickHouse/issues/65826): Fix a bug in short circuit logic when old analyzer and dictGetOrDefault is used. [#65802](https://github.com/ClickHouse/ClickHouse/pull/65802) ([jsc0218](https://github.com/jsc0218)).
-* Backported in [#66299](https://github.com/ClickHouse/ClickHouse/issues/66299): Better handling of join conditions involving `IS NULL` checks (for example `ON (a = b AND (a IS NOT NULL) AND (b IS NOT NULL) ) OR ( (a IS NULL) AND (b IS NULL) )` is rewritten to `ON a <=> b`), fix incorrect optimization when condition other then `IS NULL` are present. [#65835](https://github.com/ClickHouse/ClickHouse/pull/65835) ([vdimir](https://github.com/vdimir)).
-* Backported in [#66326](https://github.com/ClickHouse/ClickHouse/issues/66326): Add missing settings `input_format_csv_skip_first_lines/input_format_tsv_skip_first_lines/input_format_csv_try_infer_numbers_from_strings/input_format_csv_try_infer_strings_from_quoted_tuples` in schema inference cache because they can change the resulting schema. It prevents from incorrect result of schema inference with these settings changed. [#65980](https://github.com/ClickHouse/ClickHouse/pull/65980) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#66153](https://github.com/ClickHouse/ClickHouse/issues/66153): Fixed buffer overflow bug in `unbin`/`unhex` implementation. [#66106](https://github.com/ClickHouse/ClickHouse/pull/66106) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#66459](https://github.com/ClickHouse/ClickHouse/issues/66459): Fixed a bug in ZooKeeper client: a session could get stuck in unusable state after receiving a hardware error from ZooKeeper. For example, this might happen due to "soft memory limit" in ClickHouse Keeper. [#66140](https://github.com/ClickHouse/ClickHouse/pull/66140) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#66224](https://github.com/ClickHouse/ClickHouse/issues/66224): Fix issue in SumIfToCountIfVisitor and signed integers. [#66146](https://github.com/ClickHouse/ClickHouse/pull/66146) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66267](https://github.com/ClickHouse/ClickHouse/issues/66267): Don't throw `TIMEOUT_EXCEEDED` for `none_only_active` mode of `distributed_ddl_output_mode`. [#66218](https://github.com/ClickHouse/ClickHouse/pull/66218) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#66678](https://github.com/ClickHouse/ClickHouse/issues/66678): Fix handling limit for `system.numbers_mt` when no index can be used. [#66231](https://github.com/ClickHouse/ClickHouse/pull/66231) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#66603](https://github.com/ClickHouse/ClickHouse/issues/66603): Fixed how the ClickHouse server detects the maximum number of usable CPU cores as specified by cgroups v2 if the server runs in a container such as Docker. In more detail, containers often run their process in the root cgroup which has an empty name. In that case, ClickHouse ignored the CPU limits set by cgroups v2. [#66237](https://github.com/ClickHouse/ClickHouse/pull/66237) ([filimonov](https://github.com/filimonov)).
-* Backported in [#66358](https://github.com/ClickHouse/ClickHouse/issues/66358): Fix the `Not-ready set` error when a subquery with `IN` is used in the constraint. [#66261](https://github.com/ClickHouse/ClickHouse/pull/66261) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66971](https://github.com/ClickHouse/ClickHouse/issues/66971): Fix `Column identifier is already registered` error with `group_by_use_nulls=true` and new analyzer. [#66400](https://github.com/ClickHouse/ClickHouse/pull/66400) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66968](https://github.com/ClickHouse/ClickHouse/issues/66968): Fix `Cannot find column` error for queries with constant expression in `GROUP BY` key and new analyzer enabled. [#66433](https://github.com/ClickHouse/ClickHouse/pull/66433) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66719](https://github.com/ClickHouse/ClickHouse/issues/66719): Correctly track memory for `Allocator::realloc`. [#66548](https://github.com/ClickHouse/ClickHouse/pull/66548) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#66950](https://github.com/ClickHouse/ClickHouse/issues/66950): Fix an invalid result for queries with `WINDOW`. This could happen when `PARTITION` columns have sparse serialization and window functions are executed in parallel. [#66579](https://github.com/ClickHouse/ClickHouse/pull/66579) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66947](https://github.com/ClickHouse/ClickHouse/issues/66947): Fix `Method getResultType is not supported for QUERY query node` error when scalar subquery was used as the first argument of IN (with new analyzer). [#66655](https://github.com/ClickHouse/ClickHouse/pull/66655) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#67195](https://github.com/ClickHouse/ClickHouse/issues/67195): TRUNCATE DATABASE used to stop replication as if it was a DROP DATABASE query, it's fixed. [#67129](https://github.com/ClickHouse/ClickHouse/pull/67129) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#67377](https://github.com/ClickHouse/ClickHouse/issues/67377): Fix error `Cannot convert column because it is non constant in source stream but must be constant in result.` for a query that reads from the `Merge` table over the `Distriburted` table with one shard. [#67146](https://github.com/ClickHouse/ClickHouse/pull/67146) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#67240](https://github.com/ClickHouse/ClickHouse/issues/67240): This closes [#67156](https://github.com/ClickHouse/ClickHouse/issues/67156). This closes [#66447](https://github.com/ClickHouse/ClickHouse/issues/66447). The bug was introduced in https://github.com/ClickHouse/ClickHouse/pull/62907. [#67178](https://github.com/ClickHouse/ClickHouse/pull/67178) ([Maksim Kita](https://github.com/kitaisreal)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#65410](https://github.com/ClickHouse/ClickHouse/issues/65410): Re-enable OpenSSL session caching. [#65111](https://github.com/ClickHouse/ClickHouse/pull/65111) ([Robert Schulze](https://github.com/rschu1ze)).
-* Backported in [#65903](https://github.com/ClickHouse/ClickHouse/issues/65903): Fix bug with session closing in Keeper. [#65735](https://github.com/ClickHouse/ClickHouse/pull/65735) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#66385](https://github.com/ClickHouse/ClickHouse/issues/66385): Disable broken cases from 02911_join_on_nullsafe_optimization. [#66310](https://github.com/ClickHouse/ClickHouse/pull/66310) ([vdimir](https://github.com/vdimir)).
-* Backported in [#66424](https://github.com/ClickHouse/ClickHouse/issues/66424): Ignore subquery for IN in DDLLoadingDependencyVisitor. [#66395](https://github.com/ClickHouse/ClickHouse/pull/66395) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66542](https://github.com/ClickHouse/ClickHouse/issues/66542): Add additional log masking in CI. [#66523](https://github.com/ClickHouse/ClickHouse/pull/66523) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66857](https://github.com/ClickHouse/ClickHouse/issues/66857): Fix data race in S3::ClientCache. [#66644](https://github.com/ClickHouse/ClickHouse/pull/66644) ([Konstantin Morozov](https://github.com/k-morozov)).
-* Backported in [#66873](https://github.com/ClickHouse/ClickHouse/issues/66873): Support one more case in JOIN ON ... IS NULL. [#66725](https://github.com/ClickHouse/ClickHouse/pull/66725) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67057](https://github.com/ClickHouse/ClickHouse/issues/67057): Increase asio pool size in case the server is tiny. [#66761](https://github.com/ClickHouse/ClickHouse/pull/66761) ([alesapin](https://github.com/alesapin)).
-* Backported in [#66944](https://github.com/ClickHouse/ClickHouse/issues/66944): Small fix in realloc memory tracking. [#66820](https://github.com/ClickHouse/ClickHouse/pull/66820) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#67250](https://github.com/ClickHouse/ClickHouse/issues/67250): Followup [#66725](https://github.com/ClickHouse/ClickHouse/issues/66725). [#66869](https://github.com/ClickHouse/ClickHouse/pull/66869) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67410](https://github.com/ClickHouse/ClickHouse/issues/67410): CI: Fix build results for release branches. [#67402](https://github.com/ClickHouse/ClickHouse/pull/67402) ([Max K.](https://github.com/maxknv)).
-
diff --git a/docs/changelogs/v24.4.4.113-stable.md b/docs/changelogs/v24.4.4.113-stable.md
deleted file mode 100644
index 1f8a221a0a2..00000000000
--- a/docs/changelogs/v24.4.4.113-stable.md
+++ /dev/null
@@ -1,73 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.4.4.113-stable (d63a54957bd) FIXME as compared to v24.4.3.25-stable (a915dd4eda4)
-
-#### Improvement
-* Backported in [#65884](https://github.com/ClickHouse/ClickHouse/issues/65884): Always start Keeper with sufficient amount of threads in global thread pool. [#64444](https://github.com/ClickHouse/ClickHouse/pull/64444) ([Duc Canh Le](https://github.com/canhld94)).
-* Backported in [#65303](https://github.com/ClickHouse/ClickHouse/issues/65303): Returned back the behaviour of how ClickHouse works and interprets Tuples in CSV format. This change effectively reverts https://github.com/ClickHouse/ClickHouse/pull/60994 and makes it available only under a few settings: `output_format_csv_serialize_tuple_into_separate_columns`, `input_format_csv_deserialize_separate_columns_into_tuple` and `input_format_csv_try_infer_strings_from_quoted_tuples`. [#65170](https://github.com/ClickHouse/ClickHouse/pull/65170) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Backported in [#65894](https://github.com/ClickHouse/ClickHouse/issues/65894): Respect cgroup CPU limit in Keeper. [#65819](https://github.com/ClickHouse/ClickHouse/pull/65819) ([Antonio Andelic](https://github.com/antonio2368)).
-
-#### Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)
-* Backported in [#65372](https://github.com/ClickHouse/ClickHouse/issues/65372): Fix a bug in ClickHouse Keeper that causes digest mismatch during closing session. [#65198](https://github.com/ClickHouse/ClickHouse/pull/65198) ([Aleksei Filatov](https://github.com/aalexfvk)).
-* Backported in [#66883](https://github.com/ClickHouse/ClickHouse/issues/66883): Fix unexpeced size of low cardinality column in function calls. [#65298](https://github.com/ClickHouse/ClickHouse/pull/65298) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#65435](https://github.com/ClickHouse/ClickHouse/issues/65435): Forbid `QUALIFY` clause in the old analyzer. The old analyzer ignored `QUALIFY`, so it could lead to unexpected data removal in mutations. [#65356](https://github.com/ClickHouse/ClickHouse/pull/65356) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#65448](https://github.com/ClickHouse/ClickHouse/issues/65448): Use correct memory alignment for Distinct combinator. Previously, crash could happen because of invalid memory allocation when the combinator was used. [#65379](https://github.com/ClickHouse/ClickHouse/pull/65379) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#65710](https://github.com/ClickHouse/ClickHouse/issues/65710): Fix crash in maxIntersections. [#65689](https://github.com/ClickHouse/ClickHouse/pull/65689) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66689](https://github.com/ClickHouse/ClickHouse/issues/66689): Fix the VALID UNTIL clause in the user definition resetting after a restart. Closes [#66405](https://github.com/ClickHouse/ClickHouse/issues/66405). [#66409](https://github.com/ClickHouse/ClickHouse/pull/66409) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Backported in [#67499](https://github.com/ClickHouse/ClickHouse/issues/67499): Fix crash in DistributedAsyncInsert when connection is empty. [#67219](https://github.com/ClickHouse/ClickHouse/pull/67219) ([Pablo Marcos](https://github.com/pamarcos)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#65353](https://github.com/ClickHouse/ClickHouse/issues/65353): Fix possible abort on uncaught exception in ~WriteBufferFromFileDescriptor in StatusFile. [#64206](https://github.com/ClickHouse/ClickHouse/pull/64206) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#65060](https://github.com/ClickHouse/ClickHouse/issues/65060): Fix the `Expression nodes list expected 1 projection names` and `Unknown expression or identifier` errors for queries with aliases to `GLOBAL IN.`. [#64517](https://github.com/ClickHouse/ClickHouse/pull/64517) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#65329](https://github.com/ClickHouse/ClickHouse/issues/65329): Fix the crash loop when restoring from backup is blocked by creating an MV with a definer that hasn't been restored yet. [#64595](https://github.com/ClickHouse/ClickHouse/pull/64595) ([pufit](https://github.com/pufit)).
-* Backported in [#64833](https://github.com/ClickHouse/ClickHouse/issues/64833): Fix bug which could lead to non-working TTLs with expressions. [#64694](https://github.com/ClickHouse/ClickHouse/pull/64694) ([alesapin](https://github.com/alesapin)).
-* Backported in [#65086](https://github.com/ClickHouse/ClickHouse/issues/65086): Fix removing the `WHERE` and `PREWHERE` expressions, which are always true (for the new analyzer). [#64695](https://github.com/ClickHouse/ClickHouse/pull/64695) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#65540](https://github.com/ClickHouse/ClickHouse/issues/65540): Fix crash for `ALTER TABLE ... ON CLUSTER ... MODIFY SQL SECURITY`. [#64957](https://github.com/ClickHouse/ClickHouse/pull/64957) ([pufit](https://github.com/pufit)).
-* Backported in [#65578](https://github.com/ClickHouse/ClickHouse/issues/65578): Fix crash on destroying AccessControl: add explicit shutdown. [#64993](https://github.com/ClickHouse/ClickHouse/pull/64993) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Backported in [#65161](https://github.com/ClickHouse/ClickHouse/issues/65161): Fix pushing arithmetic operations out of aggregation. In the new analyzer, optimization was applied only once. [#65104](https://github.com/ClickHouse/ClickHouse/pull/65104) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#65616](https://github.com/ClickHouse/ClickHouse/issues/65616): Fix aggregate function name rewriting in the new analyzer. [#65110](https://github.com/ClickHouse/ClickHouse/pull/65110) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#65730](https://github.com/ClickHouse/ClickHouse/issues/65730): Eliminate injective function in argument of functions `uniq*` recursively. This used to work correctly but was broken in the new analyzer. [#65140](https://github.com/ClickHouse/ClickHouse/pull/65140) ([Duc Canh Le](https://github.com/canhld94)).
-* Backported in [#65668](https://github.com/ClickHouse/ClickHouse/issues/65668): Disable `non-intersecting-parts` optimization for queries with `FINAL` in case of `read-in-order` optimization was enabled. This could lead to an incorrect query result. As a workaround, disable `do_not_merge_across_partitions_select_final` and `split_parts_ranges_into_intersecting_and_non_intersecting_final` before this fix is merged. [#65505](https://github.com/ClickHouse/ClickHouse/pull/65505) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#65786](https://github.com/ClickHouse/ClickHouse/issues/65786): Fixed bug in MergeJoin. Column in sparse serialisation might be treated as a column of its nested type though the required conversion wasn't performed. [#65632](https://github.com/ClickHouse/ClickHouse/pull/65632) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#65810](https://github.com/ClickHouse/ClickHouse/issues/65810): Fix invalid exceptions in function `parseDateTime` with `%F` and `%D` placeholders. [#65768](https://github.com/ClickHouse/ClickHouse/pull/65768) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#65931](https://github.com/ClickHouse/ClickHouse/issues/65931): For queries that read from `PostgreSQL`, cancel the internal `PostgreSQL` query if the ClickHouse query is finished. Otherwise, `ClickHouse` query cannot be canceled until the internal `PostgreSQL` query is finished. [#65771](https://github.com/ClickHouse/ClickHouse/pull/65771) ([Maksim Kita](https://github.com/kitaisreal)).
-* Backported in [#65826](https://github.com/ClickHouse/ClickHouse/issues/65826): Fix a bug in short circuit logic when old analyzer and dictGetOrDefault is used. [#65802](https://github.com/ClickHouse/ClickHouse/pull/65802) ([jsc0218](https://github.com/jsc0218)).
-* Backported in [#66299](https://github.com/ClickHouse/ClickHouse/issues/66299): Better handling of join conditions involving `IS NULL` checks (for example `ON (a = b AND (a IS NOT NULL) AND (b IS NOT NULL) ) OR ( (a IS NULL) AND (b IS NULL) )` is rewritten to `ON a <=> b`), fix incorrect optimization when condition other then `IS NULL` are present. [#65835](https://github.com/ClickHouse/ClickHouse/pull/65835) ([vdimir](https://github.com/vdimir)).
-* Backported in [#66326](https://github.com/ClickHouse/ClickHouse/issues/66326): Add missing settings `input_format_csv_skip_first_lines/input_format_tsv_skip_first_lines/input_format_csv_try_infer_numbers_from_strings/input_format_csv_try_infer_strings_from_quoted_tuples` in schema inference cache because they can change the resulting schema. It prevents from incorrect result of schema inference with these settings changed. [#65980](https://github.com/ClickHouse/ClickHouse/pull/65980) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#66153](https://github.com/ClickHouse/ClickHouse/issues/66153): Fixed buffer overflow bug in `unbin`/`unhex` implementation. [#66106](https://github.com/ClickHouse/ClickHouse/pull/66106) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#66459](https://github.com/ClickHouse/ClickHouse/issues/66459): Fixed a bug in ZooKeeper client: a session could get stuck in unusable state after receiving a hardware error from ZooKeeper. For example, this might happen due to "soft memory limit" in ClickHouse Keeper. [#66140](https://github.com/ClickHouse/ClickHouse/pull/66140) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#66224](https://github.com/ClickHouse/ClickHouse/issues/66224): Fix issue in SumIfToCountIfVisitor and signed integers. [#66146](https://github.com/ClickHouse/ClickHouse/pull/66146) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66267](https://github.com/ClickHouse/ClickHouse/issues/66267): Don't throw `TIMEOUT_EXCEEDED` for `none_only_active` mode of `distributed_ddl_output_mode`. [#66218](https://github.com/ClickHouse/ClickHouse/pull/66218) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#66678](https://github.com/ClickHouse/ClickHouse/issues/66678): Fix handling limit for `system.numbers_mt` when no index can be used. [#66231](https://github.com/ClickHouse/ClickHouse/pull/66231) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#66603](https://github.com/ClickHouse/ClickHouse/issues/66603): Fixed how the ClickHouse server detects the maximum number of usable CPU cores as specified by cgroups v2 if the server runs in a container such as Docker. In more detail, containers often run their process in the root cgroup which has an empty name. In that case, ClickHouse ignored the CPU limits set by cgroups v2. [#66237](https://github.com/ClickHouse/ClickHouse/pull/66237) ([filimonov](https://github.com/filimonov)).
-* Backported in [#66358](https://github.com/ClickHouse/ClickHouse/issues/66358): Fix the `Not-ready set` error when a subquery with `IN` is used in the constraint. [#66261](https://github.com/ClickHouse/ClickHouse/pull/66261) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66971](https://github.com/ClickHouse/ClickHouse/issues/66971): Fix `Column identifier is already registered` error with `group_by_use_nulls=true` and new analyzer. [#66400](https://github.com/ClickHouse/ClickHouse/pull/66400) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66968](https://github.com/ClickHouse/ClickHouse/issues/66968): Fix `Cannot find column` error for queries with constant expression in `GROUP BY` key and new analyzer enabled. [#66433](https://github.com/ClickHouse/ClickHouse/pull/66433) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66719](https://github.com/ClickHouse/ClickHouse/issues/66719): Correctly track memory for `Allocator::realloc`. [#66548](https://github.com/ClickHouse/ClickHouse/pull/66548) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#66950](https://github.com/ClickHouse/ClickHouse/issues/66950): Fix an invalid result for queries with `WINDOW`. This could happen when `PARTITION` columns have sparse serialization and window functions are executed in parallel. [#66579](https://github.com/ClickHouse/ClickHouse/pull/66579) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66947](https://github.com/ClickHouse/ClickHouse/issues/66947): Fix `Method getResultType is not supported for QUERY query node` error when scalar subquery was used as the first argument of IN (with new analyzer). [#66655](https://github.com/ClickHouse/ClickHouse/pull/66655) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#67631](https://github.com/ClickHouse/ClickHouse/issues/67631): Fix for occasional deadlock in Context::getDDLWorker. [#66843](https://github.com/ClickHouse/ClickHouse/pull/66843) ([Alexander Gololobov](https://github.com/davenger)).
-* Backported in [#67195](https://github.com/ClickHouse/ClickHouse/issues/67195): TRUNCATE DATABASE used to stop replication as if it was a DROP DATABASE query, it's fixed. [#67129](https://github.com/ClickHouse/ClickHouse/pull/67129) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#67377](https://github.com/ClickHouse/ClickHouse/issues/67377): Fix error `Cannot convert column because it is non constant in source stream but must be constant in result.` for a query that reads from the `Merge` table over the `Distriburted` table with one shard. [#67146](https://github.com/ClickHouse/ClickHouse/pull/67146) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#67240](https://github.com/ClickHouse/ClickHouse/issues/67240): This closes [#67156](https://github.com/ClickHouse/ClickHouse/issues/67156). This closes [#66447](https://github.com/ClickHouse/ClickHouse/issues/66447). The bug was introduced in https://github.com/ClickHouse/ClickHouse/pull/62907. [#67178](https://github.com/ClickHouse/ClickHouse/pull/67178) ([Maksim Kita](https://github.com/kitaisreal)).
-* Backported in [#67574](https://github.com/ClickHouse/ClickHouse/issues/67574): Fix execution of nested short-circuit functions. [#67520](https://github.com/ClickHouse/ClickHouse/pull/67520) ([Kruglov Pavel](https://github.com/Avogar)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#65410](https://github.com/ClickHouse/ClickHouse/issues/65410): Re-enable OpenSSL session caching. [#65111](https://github.com/ClickHouse/ClickHouse/pull/65111) ([Robert Schulze](https://github.com/rschu1ze)).
-* Backported in [#65903](https://github.com/ClickHouse/ClickHouse/issues/65903): Fix bug with session closing in Keeper. [#65735](https://github.com/ClickHouse/ClickHouse/pull/65735) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#66385](https://github.com/ClickHouse/ClickHouse/issues/66385): Disable broken cases from 02911_join_on_nullsafe_optimization. [#66310](https://github.com/ClickHouse/ClickHouse/pull/66310) ([vdimir](https://github.com/vdimir)).
-* Backported in [#66424](https://github.com/ClickHouse/ClickHouse/issues/66424): Ignore subquery for IN in DDLLoadingDependencyVisitor. [#66395](https://github.com/ClickHouse/ClickHouse/pull/66395) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66542](https://github.com/ClickHouse/ClickHouse/issues/66542): Add additional log masking in CI. [#66523](https://github.com/ClickHouse/ClickHouse/pull/66523) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66857](https://github.com/ClickHouse/ClickHouse/issues/66857): Fix data race in S3::ClientCache. [#66644](https://github.com/ClickHouse/ClickHouse/pull/66644) ([Konstantin Morozov](https://github.com/k-morozov)).
-* Backported in [#66873](https://github.com/ClickHouse/ClickHouse/issues/66873): Support one more case in JOIN ON ... IS NULL. [#66725](https://github.com/ClickHouse/ClickHouse/pull/66725) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67057](https://github.com/ClickHouse/ClickHouse/issues/67057): Increase asio pool size in case the server is tiny. [#66761](https://github.com/ClickHouse/ClickHouse/pull/66761) ([alesapin](https://github.com/alesapin)).
-* Backported in [#66944](https://github.com/ClickHouse/ClickHouse/issues/66944): Small fix in realloc memory tracking. [#66820](https://github.com/ClickHouse/ClickHouse/pull/66820) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#67250](https://github.com/ClickHouse/ClickHouse/issues/67250): Followup [#66725](https://github.com/ClickHouse/ClickHouse/issues/66725). [#66869](https://github.com/ClickHouse/ClickHouse/pull/66869) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67410](https://github.com/ClickHouse/ClickHouse/issues/67410): CI: Fix build results for release branches. [#67402](https://github.com/ClickHouse/ClickHouse/pull/67402) ([Max K.](https://github.com/maxknv)).
-
diff --git a/docs/changelogs/v24.5.5.41-stable.md b/docs/changelogs/v24.5.5.41-stable.md
deleted file mode 100644
index 8ba160e31d7..00000000000
--- a/docs/changelogs/v24.5.5.41-stable.md
+++ /dev/null
@@ -1,71 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.5.5.41-stable (441d4a6ebe3) FIXME as compared to v24.5.4.49-stable (63b760955a0)
-
-#### Improvement
-* Backported in [#66768](https://github.com/ClickHouse/ClickHouse/issues/66768): Make allow_experimental_analyzer be controlled by the initiator for distributed queries. This ensures compatibility and correctness during operations in mixed version clusters. [#65777](https://github.com/ClickHouse/ClickHouse/pull/65777) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#65350](https://github.com/ClickHouse/ClickHouse/issues/65350): Fix possible abort on uncaught exception in ~WriteBufferFromFileDescriptor in StatusFile. [#64206](https://github.com/ClickHouse/ClickHouse/pull/64206) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#65621](https://github.com/ClickHouse/ClickHouse/issues/65621): Fix `Cannot find column` in distributed query with `ARRAY JOIN` by `Nested` column. Fixes [#64755](https://github.com/ClickHouse/ClickHouse/issues/64755). [#64801](https://github.com/ClickHouse/ClickHouse/pull/64801) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#67902](https://github.com/ClickHouse/ClickHouse/issues/67902): Fixing the `Not-ready Set` error after the `PREWHERE` optimization for StorageMerge. [#65057](https://github.com/ClickHouse/ClickHouse/pull/65057) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66884](https://github.com/ClickHouse/ClickHouse/issues/66884): Fix unexpeced size of low cardinality column in function calls. [#65298](https://github.com/ClickHouse/ClickHouse/pull/65298) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#65933](https://github.com/ClickHouse/ClickHouse/issues/65933): For queries that read from `PostgreSQL`, cancel the internal `PostgreSQL` query if the ClickHouse query is finished. Otherwise, `ClickHouse` query cannot be canceled until the internal `PostgreSQL` query is finished. [#65771](https://github.com/ClickHouse/ClickHouse/pull/65771) ([Maksim Kita](https://github.com/kitaisreal)).
-* Backported in [#66301](https://github.com/ClickHouse/ClickHouse/issues/66301): Better handling of join conditions involving `IS NULL` checks (for example `ON (a = b AND (a IS NOT NULL) AND (b IS NOT NULL) ) OR ( (a IS NULL) AND (b IS NULL) )` is rewritten to `ON a <=> b`), fix incorrect optimization when condition other then `IS NULL` are present. [#65835](https://github.com/ClickHouse/ClickHouse/pull/65835) ([vdimir](https://github.com/vdimir)).
-* Backported in [#66328](https://github.com/ClickHouse/ClickHouse/issues/66328): Add missing settings `input_format_csv_skip_first_lines/input_format_tsv_skip_first_lines/input_format_csv_try_infer_numbers_from_strings/input_format_csv_try_infer_strings_from_quoted_tuples` in schema inference cache because they can change the resulting schema. It prevents from incorrect result of schema inference with these settings changed. [#65980](https://github.com/ClickHouse/ClickHouse/pull/65980) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68252](https://github.com/ClickHouse/ClickHouse/issues/68252): Fixed `Not-ready Set` in some system tables when filtering using subqueries. [#66018](https://github.com/ClickHouse/ClickHouse/pull/66018) ([Michael Kolupaev](https://github.com/al13n321)).
-* Backported in [#66155](https://github.com/ClickHouse/ClickHouse/issues/66155): Fixed buffer overflow bug in `unbin`/`unhex` implementation. [#66106](https://github.com/ClickHouse/ClickHouse/pull/66106) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#66454](https://github.com/ClickHouse/ClickHouse/issues/66454): Fixed a bug in ZooKeeper client: a session could get stuck in unusable state after receiving a hardware error from ZooKeeper. For example, this might happen due to "soft memory limit" in ClickHouse Keeper. [#66140](https://github.com/ClickHouse/ClickHouse/pull/66140) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#66226](https://github.com/ClickHouse/ClickHouse/issues/66226): Fix issue in SumIfToCountIfVisitor and signed integers. [#66146](https://github.com/ClickHouse/ClickHouse/pull/66146) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66680](https://github.com/ClickHouse/ClickHouse/issues/66680): Fix handling limit for `system.numbers_mt` when no index can be used. [#66231](https://github.com/ClickHouse/ClickHouse/pull/66231) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#66604](https://github.com/ClickHouse/ClickHouse/issues/66604): Fixed how the ClickHouse server detects the maximum number of usable CPU cores as specified by cgroups v2 if the server runs in a container such as Docker. In more detail, containers often run their process in the root cgroup which has an empty name. In that case, ClickHouse ignored the CPU limits set by cgroups v2. [#66237](https://github.com/ClickHouse/ClickHouse/pull/66237) ([filimonov](https://github.com/filimonov)).
-* Backported in [#66360](https://github.com/ClickHouse/ClickHouse/issues/66360): Fix the `Not-ready set` error when a subquery with `IN` is used in the constraint. [#66261](https://github.com/ClickHouse/ClickHouse/pull/66261) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#68064](https://github.com/ClickHouse/ClickHouse/issues/68064): Fix boolean literals in query sent to external database (for engines like `PostgreSQL`). [#66282](https://github.com/ClickHouse/ClickHouse/pull/66282) ([vdimir](https://github.com/vdimir)).
-* Backported in [#68158](https://github.com/ClickHouse/ClickHouse/issues/68158): Fix cluster() for inter-server secret (preserve initial user as before). [#66364](https://github.com/ClickHouse/ClickHouse/pull/66364) ([Azat Khuzhin](https://github.com/azat)).
-* Backported in [#66972](https://github.com/ClickHouse/ClickHouse/issues/66972): Fix `Column identifier is already registered` error with `group_by_use_nulls=true` and new analyzer. [#66400](https://github.com/ClickHouse/ClickHouse/pull/66400) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66691](https://github.com/ClickHouse/ClickHouse/issues/66691): Fix the VALID UNTIL clause in the user definition resetting after a restart. Closes [#66405](https://github.com/ClickHouse/ClickHouse/issues/66405). [#66409](https://github.com/ClickHouse/ClickHouse/pull/66409) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Backported in [#66969](https://github.com/ClickHouse/ClickHouse/issues/66969): Fix `Cannot find column` error for queries with constant expression in `GROUP BY` key and new analyzer enabled. [#66433](https://github.com/ClickHouse/ClickHouse/pull/66433) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66720](https://github.com/ClickHouse/ClickHouse/issues/66720): Correctly track memory for `Allocator::realloc`. [#66548](https://github.com/ClickHouse/ClickHouse/pull/66548) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#66951](https://github.com/ClickHouse/ClickHouse/issues/66951): Fix an invalid result for queries with `WINDOW`. This could happen when `PARTITION` columns have sparse serialization and window functions are executed in parallel. [#66579](https://github.com/ClickHouse/ClickHouse/pull/66579) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66757](https://github.com/ClickHouse/ClickHouse/issues/66757): Fix `Unknown identifier` and `Column is not under aggregate function` errors for queries with the expression `(column IS NULL).` The bug was triggered by [#65088](https://github.com/ClickHouse/ClickHouse/issues/65088), with the disabled analyzer only. [#66654](https://github.com/ClickHouse/ClickHouse/pull/66654) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66948](https://github.com/ClickHouse/ClickHouse/issues/66948): Fix `Method getResultType is not supported for QUERY query node` error when scalar subquery was used as the first argument of IN (with new analyzer). [#66655](https://github.com/ClickHouse/ClickHouse/pull/66655) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#68115](https://github.com/ClickHouse/ClickHouse/issues/68115): Fix possible PARAMETER_OUT_OF_BOUND error during reading variant subcolumn. [#66659](https://github.com/ClickHouse/ClickHouse/pull/66659) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67633](https://github.com/ClickHouse/ClickHouse/issues/67633): Fix for occasional deadlock in Context::getDDLWorker. [#66843](https://github.com/ClickHouse/ClickHouse/pull/66843) ([Alexander Gololobov](https://github.com/davenger)).
-* Backported in [#67481](https://github.com/ClickHouse/ClickHouse/issues/67481): In rare cases ClickHouse could consider parts as broken because of some unexpected projections on disk. Now it's fixed. [#66898](https://github.com/ClickHouse/ClickHouse/pull/66898) ([alesapin](https://github.com/alesapin)).
-* Backported in [#67814](https://github.com/ClickHouse/ClickHouse/issues/67814): Only relevant to the experimental Variant data type. Fix crash with Variant + AggregateFunction type. [#67122](https://github.com/ClickHouse/ClickHouse/pull/67122) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67197](https://github.com/ClickHouse/ClickHouse/issues/67197): TRUNCATE DATABASE used to stop replication as if it was a DROP DATABASE query, it's fixed. [#67129](https://github.com/ClickHouse/ClickHouse/pull/67129) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#67379](https://github.com/ClickHouse/ClickHouse/issues/67379): Fix error `Cannot convert column because it is non constant in source stream but must be constant in result.` for a query that reads from the `Merge` table over the `Distriburted` table with one shard. [#67146](https://github.com/ClickHouse/ClickHouse/pull/67146) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#67501](https://github.com/ClickHouse/ClickHouse/issues/67501): Fix crash in DistributedAsyncInsert when connection is empty. [#67219](https://github.com/ClickHouse/ClickHouse/pull/67219) ([Pablo Marcos](https://github.com/pamarcos)).
-* Backported in [#67886](https://github.com/ClickHouse/ClickHouse/issues/67886): Correctly parse file name/URI containing `::` if it's not an archive. [#67433](https://github.com/ClickHouse/ClickHouse/pull/67433) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#67576](https://github.com/ClickHouse/ClickHouse/issues/67576): Fix execution of nested short-circuit functions. [#67520](https://github.com/ClickHouse/ClickHouse/pull/67520) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67850](https://github.com/ClickHouse/ClickHouse/issues/67850): Fixes [#66026](https://github.com/ClickHouse/ClickHouse/issues/66026). Avoid unresolved table function arguments traversal in `ReplaceTableNodeToDummyVisitor`. [#67522](https://github.com/ClickHouse/ClickHouse/pull/67522) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#68272](https://github.com/ClickHouse/ClickHouse/issues/68272): Fix inserting into stream like engines (Kafka, RabbitMQ, NATS) through HTTP interface. [#67554](https://github.com/ClickHouse/ClickHouse/pull/67554) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#67807](https://github.com/ClickHouse/ClickHouse/issues/67807): Fix reloading SQL UDFs with UNION. Previously, restarting the server could make UDF invalid. [#67665](https://github.com/ClickHouse/ClickHouse/pull/67665) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#67836](https://github.com/ClickHouse/ClickHouse/issues/67836): Fix potential stack overflow in `JSONMergePatch` function. Renamed this function from `jsonMergePatch` to `JSONMergePatch` because the previous name was wrong. The previous name is still kept for compatibility. Improved diagnostic of errors in the function. This closes [#67304](https://github.com/ClickHouse/ClickHouse/issues/67304). [#67756](https://github.com/ClickHouse/ClickHouse/pull/67756) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Backported in [#67991](https://github.com/ClickHouse/ClickHouse/issues/67991): Validate experimental/suspicious data types in ALTER ADD/MODIFY COLUMN. [#67911](https://github.com/ClickHouse/ClickHouse/pull/67911) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68207](https://github.com/ClickHouse/ClickHouse/issues/68207): Fix wrong `count()` result when there is non-deterministic function in predicate. [#67922](https://github.com/ClickHouse/ClickHouse/pull/67922) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#68091](https://github.com/ClickHouse/ClickHouse/issues/68091): Fixed the calculation of the maximum thread soft limit in containerized environments where the usable CPU count is limited. [#67963](https://github.com/ClickHouse/ClickHouse/pull/67963) ([Robert Schulze](https://github.com/rschu1ze)).
-* Backported in [#68122](https://github.com/ClickHouse/ClickHouse/issues/68122): Fixed skipping of untouched parts in mutations with new analyzer. Previously with enabled analyzer data in part could be rewritten by mutation even if mutation doesn't affect this part according to predicate. [#68052](https://github.com/ClickHouse/ClickHouse/pull/68052) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#68171](https://github.com/ClickHouse/ClickHouse/issues/68171): Removes an incorrect optimization to remove sorting in subqueries that use `OFFSET`. Fixes [#67906](https://github.com/ClickHouse/ClickHouse/issues/67906). [#68099](https://github.com/ClickHouse/ClickHouse/pull/68099) ([Graham Campbell](https://github.com/GrahamCampbell)).
-* Backported in [#68337](https://github.com/ClickHouse/ClickHouse/issues/68337): Try fix postgres crash when query is cancelled. [#68288](https://github.com/ClickHouse/ClickHouse/pull/68288) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Backported in [#68667](https://github.com/ClickHouse/ClickHouse/issues/68667): Fix `LOGICAL_ERROR`s when functions `sipHash64Keyed`, `sipHash128Keyed`, or `sipHash128ReferenceKeyed` are applied to empty arrays or tuples. [#68630](https://github.com/ClickHouse/ClickHouse/pull/68630) ([Robert Schulze](https://github.com/rschu1ze)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#66387](https://github.com/ClickHouse/ClickHouse/issues/66387): Disable broken cases from 02911_join_on_nullsafe_optimization. [#66310](https://github.com/ClickHouse/ClickHouse/pull/66310) ([vdimir](https://github.com/vdimir)).
-* Backported in [#66426](https://github.com/ClickHouse/ClickHouse/issues/66426): Ignore subquery for IN in DDLLoadingDependencyVisitor. [#66395](https://github.com/ClickHouse/ClickHouse/pull/66395) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66544](https://github.com/ClickHouse/ClickHouse/issues/66544): Add additional log masking in CI. [#66523](https://github.com/ClickHouse/ClickHouse/pull/66523) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66859](https://github.com/ClickHouse/ClickHouse/issues/66859): Fix data race in S3::ClientCache. [#66644](https://github.com/ClickHouse/ClickHouse/pull/66644) ([Konstantin Morozov](https://github.com/k-morozov)).
-* Backported in [#66875](https://github.com/ClickHouse/ClickHouse/issues/66875): Support one more case in JOIN ON ... IS NULL. [#66725](https://github.com/ClickHouse/ClickHouse/pull/66725) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67059](https://github.com/ClickHouse/ClickHouse/issues/67059): Increase asio pool size in case the server is tiny. [#66761](https://github.com/ClickHouse/ClickHouse/pull/66761) ([alesapin](https://github.com/alesapin)).
-* Backported in [#66945](https://github.com/ClickHouse/ClickHouse/issues/66945): Small fix in realloc memory tracking. [#66820](https://github.com/ClickHouse/ClickHouse/pull/66820) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#67252](https://github.com/ClickHouse/ClickHouse/issues/67252): Followup [#66725](https://github.com/ClickHouse/ClickHouse/issues/66725). [#66869](https://github.com/ClickHouse/ClickHouse/pull/66869) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67412](https://github.com/ClickHouse/ClickHouse/issues/67412): CI: Fix build results for release branches. [#67402](https://github.com/ClickHouse/ClickHouse/pull/67402) ([Max K.](https://github.com/maxknv)).
-* Update version after release. [#67862](https://github.com/ClickHouse/ClickHouse/pull/67862) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Backported in [#68077](https://github.com/ClickHouse/ClickHouse/issues/68077): Add an explicit error for `ALTER MODIFY SQL SECURITY` on non-view tables. [#67953](https://github.com/ClickHouse/ClickHouse/pull/67953) ([pufit](https://github.com/pufit)).
-
diff --git a/docs/changelogs/v24.5.5.78-stable.md b/docs/changelogs/v24.5.5.78-stable.md
deleted file mode 100644
index 415ea165101..00000000000
--- a/docs/changelogs/v24.5.5.78-stable.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.5.5.78-stable (0138248cb62) FIXME as compared to v24.5.4.49-stable (63b760955a0)
-
-#### Improvement
-* Backported in [#66768](https://github.com/ClickHouse/ClickHouse/issues/66768): Make allow_experimental_analyzer be controlled by the initiator for distributed queries. This ensures compatibility and correctness during operations in mixed version clusters. [#65777](https://github.com/ClickHouse/ClickHouse/pull/65777) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-
-#### Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)
-* Backported in [#66884](https://github.com/ClickHouse/ClickHouse/issues/66884): Fix unexpeced size of low cardinality column in function calls. [#65298](https://github.com/ClickHouse/ClickHouse/pull/65298) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66691](https://github.com/ClickHouse/ClickHouse/issues/66691): Fix the VALID UNTIL clause in the user definition resetting after a restart. Closes [#66405](https://github.com/ClickHouse/ClickHouse/issues/66405). [#66409](https://github.com/ClickHouse/ClickHouse/pull/66409) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Backported in [#67814](https://github.com/ClickHouse/ClickHouse/issues/67814): Only relevant to the experimental Variant data type. Fix crash with Variant + AggregateFunction type. [#67122](https://github.com/ClickHouse/ClickHouse/pull/67122) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67501](https://github.com/ClickHouse/ClickHouse/issues/67501): Fix crash in DistributedAsyncInsert when connection is empty. [#67219](https://github.com/ClickHouse/ClickHouse/pull/67219) ([Pablo Marcos](https://github.com/pamarcos)).
-* Backported in [#67850](https://github.com/ClickHouse/ClickHouse/issues/67850): Fixes [#66026](https://github.com/ClickHouse/ClickHouse/issues/66026). Avoid unresolved table function arguments traversal in `ReplaceTableNodeToDummyVisitor`. [#67522](https://github.com/ClickHouse/ClickHouse/pull/67522) ([Dmitry Novik](https://github.com/novikd)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#65350](https://github.com/ClickHouse/ClickHouse/issues/65350): Fix possible abort on uncaught exception in ~WriteBufferFromFileDescriptor in StatusFile. [#64206](https://github.com/ClickHouse/ClickHouse/pull/64206) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#65621](https://github.com/ClickHouse/ClickHouse/issues/65621): Fix `Cannot find column` in distributed query with `ARRAY JOIN` by `Nested` column. Fixes [#64755](https://github.com/ClickHouse/ClickHouse/issues/64755). [#64801](https://github.com/ClickHouse/ClickHouse/pull/64801) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#65933](https://github.com/ClickHouse/ClickHouse/issues/65933): For queries that read from `PostgreSQL`, cancel the internal `PostgreSQL` query if the ClickHouse query is finished. Otherwise, `ClickHouse` query cannot be canceled until the internal `PostgreSQL` query is finished. [#65771](https://github.com/ClickHouse/ClickHouse/pull/65771) ([Maksim Kita](https://github.com/kitaisreal)).
-* Backported in [#66301](https://github.com/ClickHouse/ClickHouse/issues/66301): Better handling of join conditions involving `IS NULL` checks (for example `ON (a = b AND (a IS NOT NULL) AND (b IS NOT NULL) ) OR ( (a IS NULL) AND (b IS NULL) )` is rewritten to `ON a <=> b`), fix incorrect optimization when condition other then `IS NULL` are present. [#65835](https://github.com/ClickHouse/ClickHouse/pull/65835) ([vdimir](https://github.com/vdimir)).
-* Backported in [#66328](https://github.com/ClickHouse/ClickHouse/issues/66328): Add missing settings `input_format_csv_skip_first_lines/input_format_tsv_skip_first_lines/input_format_csv_try_infer_numbers_from_strings/input_format_csv_try_infer_strings_from_quoted_tuples` in schema inference cache because they can change the resulting schema. It prevents from incorrect result of schema inference with these settings changed. [#65980](https://github.com/ClickHouse/ClickHouse/pull/65980) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#66155](https://github.com/ClickHouse/ClickHouse/issues/66155): Fixed buffer overflow bug in `unbin`/`unhex` implementation. [#66106](https://github.com/ClickHouse/ClickHouse/pull/66106) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#66454](https://github.com/ClickHouse/ClickHouse/issues/66454): Fixed a bug in ZooKeeper client: a session could get stuck in unusable state after receiving a hardware error from ZooKeeper. For example, this might happen due to "soft memory limit" in ClickHouse Keeper. [#66140](https://github.com/ClickHouse/ClickHouse/pull/66140) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#66226](https://github.com/ClickHouse/ClickHouse/issues/66226): Fix issue in SumIfToCountIfVisitor and signed integers. [#66146](https://github.com/ClickHouse/ClickHouse/pull/66146) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66680](https://github.com/ClickHouse/ClickHouse/issues/66680): Fix handling limit for `system.numbers_mt` when no index can be used. [#66231](https://github.com/ClickHouse/ClickHouse/pull/66231) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#66604](https://github.com/ClickHouse/ClickHouse/issues/66604): Fixed how the ClickHouse server detects the maximum number of usable CPU cores as specified by cgroups v2 if the server runs in a container such as Docker. In more detail, containers often run their process in the root cgroup which has an empty name. In that case, ClickHouse ignored the CPU limits set by cgroups v2. [#66237](https://github.com/ClickHouse/ClickHouse/pull/66237) ([filimonov](https://github.com/filimonov)).
-* Backported in [#66360](https://github.com/ClickHouse/ClickHouse/issues/66360): Fix the `Not-ready set` error when a subquery with `IN` is used in the constraint. [#66261](https://github.com/ClickHouse/ClickHouse/pull/66261) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66972](https://github.com/ClickHouse/ClickHouse/issues/66972): Fix `Column identifier is already registered` error with `group_by_use_nulls=true` and new analyzer. [#66400](https://github.com/ClickHouse/ClickHouse/pull/66400) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66969](https://github.com/ClickHouse/ClickHouse/issues/66969): Fix `Cannot find column` error for queries with constant expression in `GROUP BY` key and new analyzer enabled. [#66433](https://github.com/ClickHouse/ClickHouse/pull/66433) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66720](https://github.com/ClickHouse/ClickHouse/issues/66720): Correctly track memory for `Allocator::realloc`. [#66548](https://github.com/ClickHouse/ClickHouse/pull/66548) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#66951](https://github.com/ClickHouse/ClickHouse/issues/66951): Fix an invalid result for queries with `WINDOW`. This could happen when `PARTITION` columns have sparse serialization and window functions are executed in parallel. [#66579](https://github.com/ClickHouse/ClickHouse/pull/66579) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66757](https://github.com/ClickHouse/ClickHouse/issues/66757): Fix `Unknown identifier` and `Column is not under aggregate function` errors for queries with the expression `(column IS NULL).` The bug was triggered by [#65088](https://github.com/ClickHouse/ClickHouse/issues/65088), with the disabled analyzer only. [#66654](https://github.com/ClickHouse/ClickHouse/pull/66654) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66948](https://github.com/ClickHouse/ClickHouse/issues/66948): Fix `Method getResultType is not supported for QUERY query node` error when scalar subquery was used as the first argument of IN (with new analyzer). [#66655](https://github.com/ClickHouse/ClickHouse/pull/66655) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#67633](https://github.com/ClickHouse/ClickHouse/issues/67633): Fix for occasional deadlock in Context::getDDLWorker. [#66843](https://github.com/ClickHouse/ClickHouse/pull/66843) ([Alexander Gololobov](https://github.com/davenger)).
-* Backported in [#67481](https://github.com/ClickHouse/ClickHouse/issues/67481): In rare cases ClickHouse could consider parts as broken because of some unexpected projections on disk. Now it's fixed. [#66898](https://github.com/ClickHouse/ClickHouse/pull/66898) ([alesapin](https://github.com/alesapin)).
-* Backported in [#67197](https://github.com/ClickHouse/ClickHouse/issues/67197): TRUNCATE DATABASE used to stop replication as if it was a DROP DATABASE query, it's fixed. [#67129](https://github.com/ClickHouse/ClickHouse/pull/67129) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#67379](https://github.com/ClickHouse/ClickHouse/issues/67379): Fix error `Cannot convert column because it is non constant in source stream but must be constant in result.` for a query that reads from the `Merge` table over the `Distriburted` table with one shard. [#67146](https://github.com/ClickHouse/ClickHouse/pull/67146) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#67576](https://github.com/ClickHouse/ClickHouse/issues/67576): Fix execution of nested short-circuit functions. [#67520](https://github.com/ClickHouse/ClickHouse/pull/67520) ([Kruglov Pavel](https://github.com/Avogar)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#66387](https://github.com/ClickHouse/ClickHouse/issues/66387): Disable broken cases from 02911_join_on_nullsafe_optimization. [#66310](https://github.com/ClickHouse/ClickHouse/pull/66310) ([vdimir](https://github.com/vdimir)).
-* Backported in [#66426](https://github.com/ClickHouse/ClickHouse/issues/66426): Ignore subquery for IN in DDLLoadingDependencyVisitor. [#66395](https://github.com/ClickHouse/ClickHouse/pull/66395) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66544](https://github.com/ClickHouse/ClickHouse/issues/66544): Add additional log masking in CI. [#66523](https://github.com/ClickHouse/ClickHouse/pull/66523) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66859](https://github.com/ClickHouse/ClickHouse/issues/66859): Fix data race in S3::ClientCache. [#66644](https://github.com/ClickHouse/ClickHouse/pull/66644) ([Konstantin Morozov](https://github.com/k-morozov)).
-* Backported in [#66875](https://github.com/ClickHouse/ClickHouse/issues/66875): Support one more case in JOIN ON ... IS NULL. [#66725](https://github.com/ClickHouse/ClickHouse/pull/66725) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67059](https://github.com/ClickHouse/ClickHouse/issues/67059): Increase asio pool size in case the server is tiny. [#66761](https://github.com/ClickHouse/ClickHouse/pull/66761) ([alesapin](https://github.com/alesapin)).
-* Backported in [#66945](https://github.com/ClickHouse/ClickHouse/issues/66945): Small fix in realloc memory tracking. [#66820](https://github.com/ClickHouse/ClickHouse/pull/66820) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#67252](https://github.com/ClickHouse/ClickHouse/issues/67252): Followup [#66725](https://github.com/ClickHouse/ClickHouse/issues/66725). [#66869](https://github.com/ClickHouse/ClickHouse/pull/66869) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67412](https://github.com/ClickHouse/ClickHouse/issues/67412): CI: Fix build results for release branches. [#67402](https://github.com/ClickHouse/ClickHouse/pull/67402) ([Max K.](https://github.com/maxknv)).
-
diff --git a/docs/changelogs/v24.5.6.45-stable.md b/docs/changelogs/v24.5.6.45-stable.md
deleted file mode 100644
index b329ebab27b..00000000000
--- a/docs/changelogs/v24.5.6.45-stable.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.5.6.45-stable (bdca8604c29) FIXME as compared to v24.5.5.78-stable (0138248cb62)
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#67902](https://github.com/ClickHouse/ClickHouse/issues/67902): Fixing the `Not-ready Set` error after the `PREWHERE` optimization for StorageMerge. [#65057](https://github.com/ClickHouse/ClickHouse/pull/65057) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#68252](https://github.com/ClickHouse/ClickHouse/issues/68252): Fixed `Not-ready Set` in some system tables when filtering using subqueries. [#66018](https://github.com/ClickHouse/ClickHouse/pull/66018) ([Michael Kolupaev](https://github.com/al13n321)).
-* Backported in [#68064](https://github.com/ClickHouse/ClickHouse/issues/68064): Fix boolean literals in query sent to external database (for engines like `PostgreSQL`). [#66282](https://github.com/ClickHouse/ClickHouse/pull/66282) ([vdimir](https://github.com/vdimir)).
-* Backported in [#68158](https://github.com/ClickHouse/ClickHouse/issues/68158): Fix cluster() for inter-server secret (preserve initial user as before). [#66364](https://github.com/ClickHouse/ClickHouse/pull/66364) ([Azat Khuzhin](https://github.com/azat)).
-* Backported in [#68115](https://github.com/ClickHouse/ClickHouse/issues/68115): Fix possible PARAMETER_OUT_OF_BOUND error during reading variant subcolumn. [#66659](https://github.com/ClickHouse/ClickHouse/pull/66659) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67886](https://github.com/ClickHouse/ClickHouse/issues/67886): Correctly parse file name/URI containing `::` if it's not an archive. [#67433](https://github.com/ClickHouse/ClickHouse/pull/67433) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#68272](https://github.com/ClickHouse/ClickHouse/issues/68272): Fix inserting into stream like engines (Kafka, RabbitMQ, NATS) through HTTP interface. [#67554](https://github.com/ClickHouse/ClickHouse/pull/67554) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#67807](https://github.com/ClickHouse/ClickHouse/issues/67807): Fix reloading SQL UDFs with UNION. Previously, restarting the server could make UDF invalid. [#67665](https://github.com/ClickHouse/ClickHouse/pull/67665) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#67836](https://github.com/ClickHouse/ClickHouse/issues/67836): Fix potential stack overflow in `JSONMergePatch` function. Renamed this function from `jsonMergePatch` to `JSONMergePatch` because the previous name was wrong. The previous name is still kept for compatibility. Improved diagnostic of errors in the function. This closes [#67304](https://github.com/ClickHouse/ClickHouse/issues/67304). [#67756](https://github.com/ClickHouse/ClickHouse/pull/67756) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Backported in [#67991](https://github.com/ClickHouse/ClickHouse/issues/67991): Validate experimental/suspicious data types in ALTER ADD/MODIFY COLUMN. [#67911](https://github.com/ClickHouse/ClickHouse/pull/67911) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68207](https://github.com/ClickHouse/ClickHouse/issues/68207): Fix wrong `count()` result when there is non-deterministic function in predicate. [#67922](https://github.com/ClickHouse/ClickHouse/pull/67922) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#68091](https://github.com/ClickHouse/ClickHouse/issues/68091): Fixed the calculation of the maximum thread soft limit in containerized environments where the usable CPU count is limited. [#67963](https://github.com/ClickHouse/ClickHouse/pull/67963) ([Robert Schulze](https://github.com/rschu1ze)).
-* Backported in [#68122](https://github.com/ClickHouse/ClickHouse/issues/68122): Fixed skipping of untouched parts in mutations with new analyzer. Previously with enabled analyzer data in part could be rewritten by mutation even if mutation doesn't affect this part according to predicate. [#68052](https://github.com/ClickHouse/ClickHouse/pull/68052) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#68171](https://github.com/ClickHouse/ClickHouse/issues/68171): Removes an incorrect optimization to remove sorting in subqueries that use `OFFSET`. Fixes [#67906](https://github.com/ClickHouse/ClickHouse/issues/67906). [#68099](https://github.com/ClickHouse/ClickHouse/pull/68099) ([Graham Campbell](https://github.com/GrahamCampbell)).
-* Backported in [#68337](https://github.com/ClickHouse/ClickHouse/issues/68337): Try fix postgres crash when query is cancelled. [#68288](https://github.com/ClickHouse/ClickHouse/pull/68288) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Backported in [#68667](https://github.com/ClickHouse/ClickHouse/issues/68667): Fix `LOGICAL_ERROR`s when functions `sipHash64Keyed`, `sipHash128Keyed`, or `sipHash128ReferenceKeyed` are applied to empty arrays or tuples. [#68630](https://github.com/ClickHouse/ClickHouse/pull/68630) ([Robert Schulze](https://github.com/rschu1ze)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Update version after release. [#67862](https://github.com/ClickHouse/ClickHouse/pull/67862) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Backported in [#68077](https://github.com/ClickHouse/ClickHouse/issues/68077): Add an explicit error for `ALTER MODIFY SQL SECURITY` on non-view tables. [#67953](https://github.com/ClickHouse/ClickHouse/pull/67953) ([pufit](https://github.com/pufit)).
-* Backported in [#68756](https://github.com/ClickHouse/ClickHouse/issues/68756): To make patch release possible from every commit on release branch, package_debug build is required and must not be skipped. [#68750](https://github.com/ClickHouse/ClickHouse/pull/68750) ([Max K.](https://github.com/maxknv)).
-
diff --git a/docs/changelogs/v24.5.7.31-stable.md b/docs/changelogs/v24.5.7.31-stable.md
deleted file mode 100644
index 44f43fb7c4b..00000000000
--- a/docs/changelogs/v24.5.7.31-stable.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.5.7.31-stable (6c185e9aec1) FIXME as compared to v24.5.6.45-stable (bdca8604c29)
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#68564](https://github.com/ClickHouse/ClickHouse/issues/68564): Fix indexHint function case found by fuzzer. [#66286](https://github.com/ClickHouse/ClickHouse/pull/66286) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#68996](https://github.com/ClickHouse/ClickHouse/issues/68996): Fix the upper bound of the function `fromModifiedJulianDay`. It was supposed to be `9999-12-31` but was mistakenly set to `9999-01-01`. [#67583](https://github.com/ClickHouse/ClickHouse/pull/67583) ([PHO](https://github.com/depressed-pho)).
-* Backported in [#68865](https://github.com/ClickHouse/ClickHouse/issues/68865): Fixed crash in Parquet filtering when data types in the file substantially differ from requested types (e.g. `... FROM file('a.parquet', Parquet, 'x String')`, but the file has `x Int64`). Without this fix, use `input_format_parquet_filter_push_down = 0` as a workaround. [#68131](https://github.com/ClickHouse/ClickHouse/pull/68131) ([Michael Kolupaev](https://github.com/al13n321)).
-* Backported in [#69004](https://github.com/ClickHouse/ClickHouse/issues/69004): After https://github.com/ClickHouse/ClickHouse/pull/61984 `schema_inference_make_columns_nullable=0` still can make columns `Nullable` in Parquet/Arrow formats. The change was backward incompatible and users noticed the changes in the behaviour. This PR makes `schema_inference_make_columns_nullable=0` to work as before (no Nullable columns will be inferred) and introduces new value `auto` for this setting that will make columns `Nullable` only if data has information about nullability. [#68298](https://github.com/ClickHouse/ClickHouse/pull/68298) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68882](https://github.com/ClickHouse/ClickHouse/issues/68882): Fixes [#50868](https://github.com/ClickHouse/ClickHouse/issues/50868). Small DateTime64 constant values returned by a nested subquery inside a distributed query were wrongly transformed to Nulls, thus causing errors and possible incorrect query results. [#68323](https://github.com/ClickHouse/ClickHouse/pull/68323) ([Shankar](https://github.com/shiyer7474)).
-* Backported in [#69023](https://github.com/ClickHouse/ClickHouse/issues/69023): Added back virtual columns ` _table` and `_database` to distributed tables. They were available until version 24.3. [#68672](https://github.com/ClickHouse/ClickHouse/pull/68672) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#68858](https://github.com/ClickHouse/ClickHouse/issues/68858): Fix possible error `Size of permutation (0) is less than required (...)` during Variant column permutation. [#68681](https://github.com/ClickHouse/ClickHouse/pull/68681) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68784](https://github.com/ClickHouse/ClickHouse/issues/68784): Fix issue with materialized constant keys when hashing maps with arrays as keys in functions `sipHash(64/128)Keyed`. [#68731](https://github.com/ClickHouse/ClickHouse/pull/68731) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Backported in [#69154](https://github.com/ClickHouse/ClickHouse/issues/69154): Fix possible wrong result during anyHeavy state merge. [#68950](https://github.com/ClickHouse/ClickHouse/pull/68950) ([Raúl Marín](https://github.com/Algunenano)).
-
-#### NO CL CATEGORY
-
-* Backported in [#68940](https://github.com/ClickHouse/ClickHouse/issues/68940):. [#68897](https://github.com/ClickHouse/ClickHouse/pull/68897) ([Alexander Gololobov](https://github.com/davenger)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#68828](https://github.com/ClickHouse/ClickHouse/issues/68828): Turn off fault injection for insert in `01396_inactive_replica_cleanup_nodes_zookeeper`. [#68715](https://github.com/ClickHouse/ClickHouse/pull/68715) ([alesapin](https://github.com/alesapin)).
-* Backported in [#69046](https://github.com/ClickHouse/ClickHouse/issues/69046): Fix 01114_database_atomic flakiness. [#68930](https://github.com/ClickHouse/ClickHouse/pull/68930) ([Raúl Marín](https://github.com/Algunenano)).
-
diff --git a/docs/changelogs/v24.5.8.10-stable.md b/docs/changelogs/v24.5.8.10-stable.md
deleted file mode 100644
index c7a2baa4e4c..00000000000
--- a/docs/changelogs/v24.5.8.10-stable.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.5.8.10-stable (f11729638ea) FIXME as compared to v24.5.7.31-stable (6c185e9aec1)
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#69295](https://github.com/ClickHouse/ClickHouse/issues/69295): TODO. [#68744](https://github.com/ClickHouse/ClickHouse/pull/68744) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#69245](https://github.com/ClickHouse/ClickHouse/issues/69245): `UNION` clause in subqueries wasn't handled correctly in queries with parallel replicas and lead to LOGICAL_ERROR `Duplicate announcement received for replica`. [#69146](https://github.com/ClickHouse/ClickHouse/pull/69146) ([Igor Nikonov](https://github.com/devcrafter)).
-* Fix crash when using `s3` table function with GLOB paths and filters. [#69176](https://github.com/ClickHouse/ClickHouse/pull/69176) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#69223](https://github.com/ClickHouse/ClickHouse/issues/69223): Disable memory test with sanitizer. [#69193](https://github.com/ClickHouse/ClickHouse/pull/69193) ([alesapin](https://github.com/alesapin)).
-
diff --git a/docs/changelogs/v24.6.3.38-stable.md b/docs/changelogs/v24.6.3.38-stable.md
deleted file mode 100644
index 01d7e26e31f..00000000000
--- a/docs/changelogs/v24.6.3.38-stable.md
+++ /dev/null
@@ -1,83 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.6.3.38-stable (4e33c831589) FIXME as compared to v24.6.2.17-stable (5710a8b5c0c)
-
-#### Improvement
-* Backported in [#66770](https://github.com/ClickHouse/ClickHouse/issues/66770): Make allow_experimental_analyzer be controlled by the initiator for distributed queries. This ensures compatibility and correctness during operations in mixed version clusters. [#65777](https://github.com/ClickHouse/ClickHouse/pull/65777) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#66885](https://github.com/ClickHouse/ClickHouse/issues/66885): Fix unexpeced size of low cardinality column in function calls. [#65298](https://github.com/ClickHouse/ClickHouse/pull/65298) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66303](https://github.com/ClickHouse/ClickHouse/issues/66303): Better handling of join conditions involving `IS NULL` checks (for example `ON (a = b AND (a IS NOT NULL) AND (b IS NOT NULL) ) OR ( (a IS NULL) AND (b IS NULL) )` is rewritten to `ON a <=> b`), fix incorrect optimization when condition other then `IS NULL` are present. [#65835](https://github.com/ClickHouse/ClickHouse/pull/65835) ([vdimir](https://github.com/vdimir)).
-* Backported in [#66330](https://github.com/ClickHouse/ClickHouse/issues/66330): Add missing settings `input_format_csv_skip_first_lines/input_format_tsv_skip_first_lines/input_format_csv_try_infer_numbers_from_strings/input_format_csv_try_infer_strings_from_quoted_tuples` in schema inference cache because they can change the resulting schema. It prevents from incorrect result of schema inference with these settings changed. [#65980](https://github.com/ClickHouse/ClickHouse/pull/65980) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#66157](https://github.com/ClickHouse/ClickHouse/issues/66157): Fixed buffer overflow bug in `unbin`/`unhex` implementation. [#66106](https://github.com/ClickHouse/ClickHouse/pull/66106) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#66210](https://github.com/ClickHouse/ClickHouse/issues/66210): Disable the `merge-filters` optimization introduced in [#64760](https://github.com/ClickHouse/ClickHouse/issues/64760). It may cause an exception if optimization merges two filter expressions and does not apply a short-circuit evaluation. [#66126](https://github.com/ClickHouse/ClickHouse/pull/66126) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66456](https://github.com/ClickHouse/ClickHouse/issues/66456): Fixed a bug in ZooKeeper client: a session could get stuck in unusable state after receiving a hardware error from ZooKeeper. For example, this might happen due to "soft memory limit" in ClickHouse Keeper. [#66140](https://github.com/ClickHouse/ClickHouse/pull/66140) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#66228](https://github.com/ClickHouse/ClickHouse/issues/66228): Fix issue in SumIfToCountIfVisitor and signed integers. [#66146](https://github.com/ClickHouse/ClickHouse/pull/66146) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66183](https://github.com/ClickHouse/ClickHouse/issues/66183): Fix rare case with missing data in the result of distributed query, close [#61432](https://github.com/ClickHouse/ClickHouse/issues/61432). [#66174](https://github.com/ClickHouse/ClickHouse/pull/66174) ([vdimir](https://github.com/vdimir)).
-* Backported in [#66271](https://github.com/ClickHouse/ClickHouse/issues/66271): Don't throw `TIMEOUT_EXCEEDED` for `none_only_active` mode of `distributed_ddl_output_mode`. [#66218](https://github.com/ClickHouse/ClickHouse/pull/66218) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#66682](https://github.com/ClickHouse/ClickHouse/issues/66682): Fix handling limit for `system.numbers_mt` when no index can be used. [#66231](https://github.com/ClickHouse/ClickHouse/pull/66231) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#66587](https://github.com/ClickHouse/ClickHouse/issues/66587): Fixed how the ClickHouse server detects the maximum number of usable CPU cores as specified by cgroups v2 if the server runs in a container such as Docker. In more detail, containers often run their process in the root cgroup which has an empty name. In that case, ClickHouse ignored the CPU limits set by cgroups v2. [#66237](https://github.com/ClickHouse/ClickHouse/pull/66237) ([filimonov](https://github.com/filimonov)).
-* Backported in [#66362](https://github.com/ClickHouse/ClickHouse/issues/66362): Fix the `Not-ready set` error when a subquery with `IN` is used in the constraint. [#66261](https://github.com/ClickHouse/ClickHouse/pull/66261) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#68066](https://github.com/ClickHouse/ClickHouse/issues/68066): Fix boolean literals in query sent to external database (for engines like `PostgreSQL`). [#66282](https://github.com/ClickHouse/ClickHouse/pull/66282) ([vdimir](https://github.com/vdimir)).
-* Backported in [#68566](https://github.com/ClickHouse/ClickHouse/issues/68566): Fix indexHint function case found by fuzzer. [#66286](https://github.com/ClickHouse/ClickHouse/pull/66286) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#68159](https://github.com/ClickHouse/ClickHouse/issues/68159): Fix cluster() for inter-server secret (preserve initial user as before). [#66364](https://github.com/ClickHouse/ClickHouse/pull/66364) ([Azat Khuzhin](https://github.com/azat)).
-* Backported in [#66613](https://github.com/ClickHouse/ClickHouse/issues/66613): Fix `Column identifier is already registered` error with `group_by_use_nulls=true` and new analyzer. [#66400](https://github.com/ClickHouse/ClickHouse/pull/66400) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66693](https://github.com/ClickHouse/ClickHouse/issues/66693): Fix the VALID UNTIL clause in the user definition resetting after a restart. Closes [#66405](https://github.com/ClickHouse/ClickHouse/issues/66405). [#66409](https://github.com/ClickHouse/ClickHouse/pull/66409) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Backported in [#66577](https://github.com/ClickHouse/ClickHouse/issues/66577): Fix `Cannot find column` error for queries with constant expression in `GROUP BY` key and new analyzer enabled. [#66433](https://github.com/ClickHouse/ClickHouse/pull/66433) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66721](https://github.com/ClickHouse/ClickHouse/issues/66721): Correctly track memory for `Allocator::realloc`. [#66548](https://github.com/ClickHouse/ClickHouse/pull/66548) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#66670](https://github.com/ClickHouse/ClickHouse/issues/66670): Fix reading of uninitialized memory when hashing empty tuples. This closes [#66559](https://github.com/ClickHouse/ClickHouse/issues/66559). [#66562](https://github.com/ClickHouse/ClickHouse/pull/66562) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Backported in [#66952](https://github.com/ClickHouse/ClickHouse/issues/66952): Fix an invalid result for queries with `WINDOW`. This could happen when `PARTITION` columns have sparse serialization and window functions are executed in parallel. [#66579](https://github.com/ClickHouse/ClickHouse/pull/66579) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66956](https://github.com/ClickHouse/ClickHouse/issues/66956): Fix removing named collections in local storage. [#66599](https://github.com/ClickHouse/ClickHouse/pull/66599) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#66716](https://github.com/ClickHouse/ClickHouse/issues/66716): Fix removing named collections in local storage. [#66599](https://github.com/ClickHouse/ClickHouse/pull/66599) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#66759](https://github.com/ClickHouse/ClickHouse/issues/66759): Fix `Unknown identifier` and `Column is not under aggregate function` errors for queries with the expression `(column IS NULL).` The bug was triggered by [#65088](https://github.com/ClickHouse/ClickHouse/issues/65088), with the disabled analyzer only. [#66654](https://github.com/ClickHouse/ClickHouse/pull/66654) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66751](https://github.com/ClickHouse/ClickHouse/issues/66751): Fix `Method getResultType is not supported for QUERY query node` error when scalar subquery was used as the first argument of IN (with new analyzer). [#66655](https://github.com/ClickHouse/ClickHouse/pull/66655) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#68116](https://github.com/ClickHouse/ClickHouse/issues/68116): Fix possible PARAMETER_OUT_OF_BOUND error during reading variant subcolumn. [#66659](https://github.com/ClickHouse/ClickHouse/pull/66659) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67635](https://github.com/ClickHouse/ClickHouse/issues/67635): Fix for occasional deadlock in Context::getDDLWorker. [#66843](https://github.com/ClickHouse/ClickHouse/pull/66843) ([Alexander Gololobov](https://github.com/davenger)).
-* Backported in [#67482](https://github.com/ClickHouse/ClickHouse/issues/67482): In rare cases ClickHouse could consider parts as broken because of some unexpected projections on disk. Now it's fixed. [#66898](https://github.com/ClickHouse/ClickHouse/pull/66898) ([alesapin](https://github.com/alesapin)).
-* Backported in [#67816](https://github.com/ClickHouse/ClickHouse/issues/67816): Only relevant to the experimental Variant data type. Fix crash with Variant + AggregateFunction type. [#67122](https://github.com/ClickHouse/ClickHouse/pull/67122) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67199](https://github.com/ClickHouse/ClickHouse/issues/67199): TRUNCATE DATABASE used to stop replication as if it was a DROP DATABASE query, it's fixed. [#67129](https://github.com/ClickHouse/ClickHouse/pull/67129) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#67381](https://github.com/ClickHouse/ClickHouse/issues/67381): Fix error `Cannot convert column because it is non constant in source stream but must be constant in result.` for a query that reads from the `Merge` table over the `Distriburted` table with one shard. [#67146](https://github.com/ClickHouse/ClickHouse/pull/67146) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#67244](https://github.com/ClickHouse/ClickHouse/issues/67244): This closes [#67156](https://github.com/ClickHouse/ClickHouse/issues/67156). This closes [#66447](https://github.com/ClickHouse/ClickHouse/issues/66447). The bug was introduced in https://github.com/ClickHouse/ClickHouse/pull/62907. [#67178](https://github.com/ClickHouse/ClickHouse/pull/67178) ([Maksim Kita](https://github.com/kitaisreal)).
-* Backported in [#67503](https://github.com/ClickHouse/ClickHouse/issues/67503): Fix crash in DistributedAsyncInsert when connection is empty. [#67219](https://github.com/ClickHouse/ClickHouse/pull/67219) ([Pablo Marcos](https://github.com/pamarcos)).
-* Backported in [#67887](https://github.com/ClickHouse/ClickHouse/issues/67887): Correctly parse file name/URI containing `::` if it's not an archive. [#67433](https://github.com/ClickHouse/ClickHouse/pull/67433) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#67578](https://github.com/ClickHouse/ClickHouse/issues/67578): Fix execution of nested short-circuit functions. [#67520](https://github.com/ClickHouse/ClickHouse/pull/67520) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68611](https://github.com/ClickHouse/ClickHouse/issues/68611): Fixes [#66026](https://github.com/ClickHouse/ClickHouse/issues/66026). Avoid unresolved table function arguments traversal in `ReplaceTableNodeToDummyVisitor`. [#67522](https://github.com/ClickHouse/ClickHouse/pull/67522) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#67852](https://github.com/ClickHouse/ClickHouse/issues/67852): Fixes [#66026](https://github.com/ClickHouse/ClickHouse/issues/66026). Avoid unresolved table function arguments traversal in `ReplaceTableNodeToDummyVisitor`. [#67522](https://github.com/ClickHouse/ClickHouse/pull/67522) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#68275](https://github.com/ClickHouse/ClickHouse/issues/68275): Fix inserting into stream like engines (Kafka, RabbitMQ, NATS) through HTTP interface. [#67554](https://github.com/ClickHouse/ClickHouse/pull/67554) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#67808](https://github.com/ClickHouse/ClickHouse/issues/67808): Fix reloading SQL UDFs with UNION. Previously, restarting the server could make UDF invalid. [#67665](https://github.com/ClickHouse/ClickHouse/pull/67665) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#67838](https://github.com/ClickHouse/ClickHouse/issues/67838): Fix potential stack overflow in `JSONMergePatch` function. Renamed this function from `jsonMergePatch` to `JSONMergePatch` because the previous name was wrong. The previous name is still kept for compatibility. Improved diagnostic of errors in the function. This closes [#67304](https://github.com/ClickHouse/ClickHouse/issues/67304). [#67756](https://github.com/ClickHouse/ClickHouse/pull/67756) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Backported in [#67993](https://github.com/ClickHouse/ClickHouse/issues/67993): Validate experimental/suspicious data types in ALTER ADD/MODIFY COLUMN. [#67911](https://github.com/ClickHouse/ClickHouse/pull/67911) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68208](https://github.com/ClickHouse/ClickHouse/issues/68208): Fix wrong `count()` result when there is non-deterministic function in predicate. [#67922](https://github.com/ClickHouse/ClickHouse/pull/67922) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#68093](https://github.com/ClickHouse/ClickHouse/issues/68093): Fixed the calculation of the maximum thread soft limit in containerized environments where the usable CPU count is limited. [#67963](https://github.com/ClickHouse/ClickHouse/pull/67963) ([Robert Schulze](https://github.com/rschu1ze)).
-* Backported in [#68124](https://github.com/ClickHouse/ClickHouse/issues/68124): Fixed skipping of untouched parts in mutations with new analyzer. Previously with enabled analyzer data in part could be rewritten by mutation even if mutation doesn't affect this part according to predicate. [#68052](https://github.com/ClickHouse/ClickHouse/pull/68052) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#68221](https://github.com/ClickHouse/ClickHouse/issues/68221): Fixed a NULL pointer dereference, triggered by a specially crafted query, that crashed the server via hopEnd, hopStart, tumbleEnd, and tumbleStart. [#68098](https://github.com/ClickHouse/ClickHouse/pull/68098) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Backported in [#68173](https://github.com/ClickHouse/ClickHouse/issues/68173): Removes an incorrect optimization to remove sorting in subqueries that use `OFFSET`. Fixes [#67906](https://github.com/ClickHouse/ClickHouse/issues/67906). [#68099](https://github.com/ClickHouse/ClickHouse/pull/68099) ([Graham Campbell](https://github.com/GrahamCampbell)).
-* Backported in [#68339](https://github.com/ClickHouse/ClickHouse/issues/68339): Try fix postgres crash when query is cancelled. [#68288](https://github.com/ClickHouse/ClickHouse/pull/68288) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Backported in [#68396](https://github.com/ClickHouse/ClickHouse/issues/68396): Fix missing sync replica mode in query `SYSTEM SYNC REPLICA`. [#68326](https://github.com/ClickHouse/ClickHouse/pull/68326) ([Duc Canh Le](https://github.com/canhld94)).
-* Backported in [#68668](https://github.com/ClickHouse/ClickHouse/issues/68668): Fix `LOGICAL_ERROR`s when functions `sipHash64Keyed`, `sipHash128Keyed`, or `sipHash128ReferenceKeyed` are applied to empty arrays or tuples. [#68630](https://github.com/ClickHouse/ClickHouse/pull/68630) ([Robert Schulze](https://github.com/rschu1ze)).
-
-#### NO CL ENTRY
-
-* NO CL ENTRY:  'Revert "Backport [#66599](https://github.com/ClickHouse/ClickHouse/issues/66599) to 24.6: Fix dropping named collection in local storage"'. [#66922](https://github.com/ClickHouse/ClickHouse/pull/66922) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#66332](https://github.com/ClickHouse/ClickHouse/issues/66332): Do not raise a NOT_IMPLEMENTED error when getting s3 metrics with a multiple disk configuration. [#65403](https://github.com/ClickHouse/ClickHouse/pull/65403) ([Elena Torró](https://github.com/elenatorro)).
-* Backported in [#66142](https://github.com/ClickHouse/ClickHouse/issues/66142): Fix flaky test_storage_s3_queue tests. [#66009](https://github.com/ClickHouse/ClickHouse/pull/66009) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Backported in [#66389](https://github.com/ClickHouse/ClickHouse/issues/66389): Disable broken cases from 02911_join_on_nullsafe_optimization. [#66310](https://github.com/ClickHouse/ClickHouse/pull/66310) ([vdimir](https://github.com/vdimir)).
-* Backported in [#66428](https://github.com/ClickHouse/ClickHouse/issues/66428): Ignore subquery for IN in DDLLoadingDependencyVisitor. [#66395](https://github.com/ClickHouse/ClickHouse/pull/66395) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66546](https://github.com/ClickHouse/ClickHouse/issues/66546): Add additional log masking in CI. [#66523](https://github.com/ClickHouse/ClickHouse/pull/66523) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66861](https://github.com/ClickHouse/ClickHouse/issues/66861): Fix data race in S3::ClientCache. [#66644](https://github.com/ClickHouse/ClickHouse/pull/66644) ([Konstantin Morozov](https://github.com/k-morozov)).
-* Backported in [#66877](https://github.com/ClickHouse/ClickHouse/issues/66877): Support one more case in JOIN ON ... IS NULL. [#66725](https://github.com/ClickHouse/ClickHouse/pull/66725) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67061](https://github.com/ClickHouse/ClickHouse/issues/67061): Increase asio pool size in case the server is tiny. [#66761](https://github.com/ClickHouse/ClickHouse/pull/66761) ([alesapin](https://github.com/alesapin)).
-* Backported in [#66940](https://github.com/ClickHouse/ClickHouse/issues/66940): Small fix in realloc memory tracking. [#66820](https://github.com/ClickHouse/ClickHouse/pull/66820) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#67254](https://github.com/ClickHouse/ClickHouse/issues/67254): Followup [#66725](https://github.com/ClickHouse/ClickHouse/issues/66725). [#66869](https://github.com/ClickHouse/ClickHouse/pull/66869) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67414](https://github.com/ClickHouse/ClickHouse/issues/67414): CI: Fix build results for release branches. [#67402](https://github.com/ClickHouse/ClickHouse/pull/67402) ([Max K.](https://github.com/maxknv)).
-* Update version after release. [#67909](https://github.com/ClickHouse/ClickHouse/pull/67909) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Backported in [#68079](https://github.com/ClickHouse/ClickHouse/issues/68079): Add an explicit error for `ALTER MODIFY SQL SECURITY` on non-view tables. [#67953](https://github.com/ClickHouse/ClickHouse/pull/67953) ([pufit](https://github.com/pufit)).
-
diff --git a/docs/changelogs/v24.6.3.95-stable.md b/docs/changelogs/v24.6.3.95-stable.md
deleted file mode 100644
index b90b7346e40..00000000000
--- a/docs/changelogs/v24.6.3.95-stable.md
+++ /dev/null
@@ -1,67 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.6.3.95-stable (8325c920d11) FIXME as compared to v24.6.2.17-stable (5710a8b5c0c)
-
-#### Improvement
-* Backported in [#66770](https://github.com/ClickHouse/ClickHouse/issues/66770): Make allow_experimental_analyzer be controlled by the initiator for distributed queries. This ensures compatibility and correctness during operations in mixed version clusters. [#65777](https://github.com/ClickHouse/ClickHouse/pull/65777) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-
-#### Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)
-* Backported in [#66885](https://github.com/ClickHouse/ClickHouse/issues/66885): Fix unexpeced size of low cardinality column in function calls. [#65298](https://github.com/ClickHouse/ClickHouse/pull/65298) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66693](https://github.com/ClickHouse/ClickHouse/issues/66693): Fix the VALID UNTIL clause in the user definition resetting after a restart. Closes [#66405](https://github.com/ClickHouse/ClickHouse/issues/66405). [#66409](https://github.com/ClickHouse/ClickHouse/pull/66409) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Backported in [#67816](https://github.com/ClickHouse/ClickHouse/issues/67816): Only relevant to the experimental Variant data type. Fix crash with Variant + AggregateFunction type. [#67122](https://github.com/ClickHouse/ClickHouse/pull/67122) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67503](https://github.com/ClickHouse/ClickHouse/issues/67503): Fix crash in DistributedAsyncInsert when connection is empty. [#67219](https://github.com/ClickHouse/ClickHouse/pull/67219) ([Pablo Marcos](https://github.com/pamarcos)).
-* Backported in [#67852](https://github.com/ClickHouse/ClickHouse/issues/67852): Fixes [#66026](https://github.com/ClickHouse/ClickHouse/issues/66026). Avoid unresolved table function arguments traversal in `ReplaceTableNodeToDummyVisitor`. [#67522](https://github.com/ClickHouse/ClickHouse/pull/67522) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#67838](https://github.com/ClickHouse/ClickHouse/issues/67838): Fix potential stack overflow in `JSONMergePatch` function. Renamed this function from `jsonMergePatch` to `JSONMergePatch` because the previous name was wrong. The previous name is still kept for compatibility. Improved diagnostic of errors in the function. This closes [#67304](https://github.com/ClickHouse/ClickHouse/issues/67304). [#67756](https://github.com/ClickHouse/ClickHouse/pull/67756) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#66303](https://github.com/ClickHouse/ClickHouse/issues/66303): Better handling of join conditions involving `IS NULL` checks (for example `ON (a = b AND (a IS NOT NULL) AND (b IS NOT NULL) ) OR ( (a IS NULL) AND (b IS NULL) )` is rewritten to `ON a <=> b`), fix incorrect optimization when condition other then `IS NULL` are present. [#65835](https://github.com/ClickHouse/ClickHouse/pull/65835) ([vdimir](https://github.com/vdimir)).
-* Backported in [#66330](https://github.com/ClickHouse/ClickHouse/issues/66330): Add missing settings `input_format_csv_skip_first_lines/input_format_tsv_skip_first_lines/input_format_csv_try_infer_numbers_from_strings/input_format_csv_try_infer_strings_from_quoted_tuples` in schema inference cache because they can change the resulting schema. It prevents from incorrect result of schema inference with these settings changed. [#65980](https://github.com/ClickHouse/ClickHouse/pull/65980) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#66157](https://github.com/ClickHouse/ClickHouse/issues/66157): Fixed buffer overflow bug in `unbin`/`unhex` implementation. [#66106](https://github.com/ClickHouse/ClickHouse/pull/66106) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#66210](https://github.com/ClickHouse/ClickHouse/issues/66210): Disable the `merge-filters` optimization introduced in [#64760](https://github.com/ClickHouse/ClickHouse/issues/64760). It may cause an exception if optimization merges two filter expressions and does not apply a short-circuit evaluation. [#66126](https://github.com/ClickHouse/ClickHouse/pull/66126) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66456](https://github.com/ClickHouse/ClickHouse/issues/66456): Fixed a bug in ZooKeeper client: a session could get stuck in unusable state after receiving a hardware error from ZooKeeper. For example, this might happen due to "soft memory limit" in ClickHouse Keeper. [#66140](https://github.com/ClickHouse/ClickHouse/pull/66140) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#66228](https://github.com/ClickHouse/ClickHouse/issues/66228): Fix issue in SumIfToCountIfVisitor and signed integers. [#66146](https://github.com/ClickHouse/ClickHouse/pull/66146) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66183](https://github.com/ClickHouse/ClickHouse/issues/66183): Fix rare case with missing data in the result of distributed query, close [#61432](https://github.com/ClickHouse/ClickHouse/issues/61432). [#66174](https://github.com/ClickHouse/ClickHouse/pull/66174) ([vdimir](https://github.com/vdimir)).
-* Backported in [#66271](https://github.com/ClickHouse/ClickHouse/issues/66271): Don't throw `TIMEOUT_EXCEEDED` for `none_only_active` mode of `distributed_ddl_output_mode`. [#66218](https://github.com/ClickHouse/ClickHouse/pull/66218) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#66682](https://github.com/ClickHouse/ClickHouse/issues/66682): Fix handling limit for `system.numbers_mt` when no index can be used. [#66231](https://github.com/ClickHouse/ClickHouse/pull/66231) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#66587](https://github.com/ClickHouse/ClickHouse/issues/66587): Fixed how the ClickHouse server detects the maximum number of usable CPU cores as specified by cgroups v2 if the server runs in a container such as Docker. In more detail, containers often run their process in the root cgroup which has an empty name. In that case, ClickHouse ignored the CPU limits set by cgroups v2. [#66237](https://github.com/ClickHouse/ClickHouse/pull/66237) ([filimonov](https://github.com/filimonov)).
-* Backported in [#66362](https://github.com/ClickHouse/ClickHouse/issues/66362): Fix the `Not-ready set` error when a subquery with `IN` is used in the constraint. [#66261](https://github.com/ClickHouse/ClickHouse/pull/66261) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66613](https://github.com/ClickHouse/ClickHouse/issues/66613): Fix `Column identifier is already registered` error with `group_by_use_nulls=true` and new analyzer. [#66400](https://github.com/ClickHouse/ClickHouse/pull/66400) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66577](https://github.com/ClickHouse/ClickHouse/issues/66577): Fix `Cannot find column` error for queries with constant expression in `GROUP BY` key and new analyzer enabled. [#66433](https://github.com/ClickHouse/ClickHouse/pull/66433) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66721](https://github.com/ClickHouse/ClickHouse/issues/66721): Correctly track memory for `Allocator::realloc`. [#66548](https://github.com/ClickHouse/ClickHouse/pull/66548) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#66670](https://github.com/ClickHouse/ClickHouse/issues/66670): Fix reading of uninitialized memory when hashing empty tuples. This closes [#66559](https://github.com/ClickHouse/ClickHouse/issues/66559). [#66562](https://github.com/ClickHouse/ClickHouse/pull/66562) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Backported in [#66952](https://github.com/ClickHouse/ClickHouse/issues/66952): Fix an invalid result for queries with `WINDOW`. This could happen when `PARTITION` columns have sparse serialization and window functions are executed in parallel. [#66579](https://github.com/ClickHouse/ClickHouse/pull/66579) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66956](https://github.com/ClickHouse/ClickHouse/issues/66956): Fix removing named collections in local storage. [#66599](https://github.com/ClickHouse/ClickHouse/pull/66599) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#66716](https://github.com/ClickHouse/ClickHouse/issues/66716): Fix removing named collections in local storage. [#66599](https://github.com/ClickHouse/ClickHouse/pull/66599) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#66759](https://github.com/ClickHouse/ClickHouse/issues/66759): Fix `Unknown identifier` and `Column is not under aggregate function` errors for queries with the expression `(column IS NULL).` The bug was triggered by [#65088](https://github.com/ClickHouse/ClickHouse/issues/65088), with the disabled analyzer only. [#66654](https://github.com/ClickHouse/ClickHouse/pull/66654) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66751](https://github.com/ClickHouse/ClickHouse/issues/66751): Fix `Method getResultType is not supported for QUERY query node` error when scalar subquery was used as the first argument of IN (with new analyzer). [#66655](https://github.com/ClickHouse/ClickHouse/pull/66655) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#67635](https://github.com/ClickHouse/ClickHouse/issues/67635): Fix for occasional deadlock in Context::getDDLWorker. [#66843](https://github.com/ClickHouse/ClickHouse/pull/66843) ([Alexander Gololobov](https://github.com/davenger)).
-* Backported in [#67482](https://github.com/ClickHouse/ClickHouse/issues/67482): In rare cases ClickHouse could consider parts as broken because of some unexpected projections on disk. Now it's fixed. [#66898](https://github.com/ClickHouse/ClickHouse/pull/66898) ([alesapin](https://github.com/alesapin)).
-* Backported in [#67199](https://github.com/ClickHouse/ClickHouse/issues/67199): TRUNCATE DATABASE used to stop replication as if it was a DROP DATABASE query, it's fixed. [#67129](https://github.com/ClickHouse/ClickHouse/pull/67129) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#67381](https://github.com/ClickHouse/ClickHouse/issues/67381): Fix error `Cannot convert column because it is non constant in source stream but must be constant in result.` for a query that reads from the `Merge` table over the `Distriburted` table with one shard. [#67146](https://github.com/ClickHouse/ClickHouse/pull/67146) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#67244](https://github.com/ClickHouse/ClickHouse/issues/67244): This closes [#67156](https://github.com/ClickHouse/ClickHouse/issues/67156). This closes [#66447](https://github.com/ClickHouse/ClickHouse/issues/66447). The bug was introduced in https://github.com/ClickHouse/ClickHouse/pull/62907. [#67178](https://github.com/ClickHouse/ClickHouse/pull/67178) ([Maksim Kita](https://github.com/kitaisreal)).
-* Backported in [#67578](https://github.com/ClickHouse/ClickHouse/issues/67578): Fix execution of nested short-circuit functions. [#67520](https://github.com/ClickHouse/ClickHouse/pull/67520) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67808](https://github.com/ClickHouse/ClickHouse/issues/67808): Fix reloading SQL UDFs with UNION. Previously, restarting the server could make UDF invalid. [#67665](https://github.com/ClickHouse/ClickHouse/pull/67665) ([Antonio Andelic](https://github.com/antonio2368)).
-
-#### NO CL ENTRY
-
-* NO CL ENTRY:  'Revert "Backport [#66599](https://github.com/ClickHouse/ClickHouse/issues/66599) to 24.6: Fix dropping named collection in local storage"'. [#66922](https://github.com/ClickHouse/ClickHouse/pull/66922) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#66332](https://github.com/ClickHouse/ClickHouse/issues/66332): Do not raise a NOT_IMPLEMENTED error when getting s3 metrics with a multiple disk configuration. [#65403](https://github.com/ClickHouse/ClickHouse/pull/65403) ([Elena Torró](https://github.com/elenatorro)).
-* Backported in [#66142](https://github.com/ClickHouse/ClickHouse/issues/66142): Fix flaky test_storage_s3_queue tests. [#66009](https://github.com/ClickHouse/ClickHouse/pull/66009) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Backported in [#66389](https://github.com/ClickHouse/ClickHouse/issues/66389): Disable broken cases from 02911_join_on_nullsafe_optimization. [#66310](https://github.com/ClickHouse/ClickHouse/pull/66310) ([vdimir](https://github.com/vdimir)).
-* Backported in [#66428](https://github.com/ClickHouse/ClickHouse/issues/66428): Ignore subquery for IN in DDLLoadingDependencyVisitor. [#66395](https://github.com/ClickHouse/ClickHouse/pull/66395) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#66546](https://github.com/ClickHouse/ClickHouse/issues/66546): Add additional log masking in CI. [#66523](https://github.com/ClickHouse/ClickHouse/pull/66523) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#66861](https://github.com/ClickHouse/ClickHouse/issues/66861): Fix data race in S3::ClientCache. [#66644](https://github.com/ClickHouse/ClickHouse/pull/66644) ([Konstantin Morozov](https://github.com/k-morozov)).
-* Backported in [#66877](https://github.com/ClickHouse/ClickHouse/issues/66877): Support one more case in JOIN ON ... IS NULL. [#66725](https://github.com/ClickHouse/ClickHouse/pull/66725) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67061](https://github.com/ClickHouse/ClickHouse/issues/67061): Increase asio pool size in case the server is tiny. [#66761](https://github.com/ClickHouse/ClickHouse/pull/66761) ([alesapin](https://github.com/alesapin)).
-* Backported in [#66940](https://github.com/ClickHouse/ClickHouse/issues/66940): Small fix in realloc memory tracking. [#66820](https://github.com/ClickHouse/ClickHouse/pull/66820) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#67254](https://github.com/ClickHouse/ClickHouse/issues/67254): Followup [#66725](https://github.com/ClickHouse/ClickHouse/issues/66725). [#66869](https://github.com/ClickHouse/ClickHouse/pull/66869) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67414](https://github.com/ClickHouse/ClickHouse/issues/67414): CI: Fix build results for release branches. [#67402](https://github.com/ClickHouse/ClickHouse/pull/67402) ([Max K.](https://github.com/maxknv)).
-
diff --git a/docs/changelogs/v24.6.4.42-stable.md b/docs/changelogs/v24.6.4.42-stable.md
deleted file mode 100644
index 29b6ba095af..00000000000
--- a/docs/changelogs/v24.6.4.42-stable.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.6.4.42-stable (c534bb4b4dd) FIXME as compared to v24.6.3.95-stable (8325c920d11)
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#68066](https://github.com/ClickHouse/ClickHouse/issues/68066): Fix boolean literals in query sent to external database (for engines like `PostgreSQL`). [#66282](https://github.com/ClickHouse/ClickHouse/pull/66282) ([vdimir](https://github.com/vdimir)).
-* Backported in [#68566](https://github.com/ClickHouse/ClickHouse/issues/68566): Fix indexHint function case found by fuzzer. [#66286](https://github.com/ClickHouse/ClickHouse/pull/66286) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#68159](https://github.com/ClickHouse/ClickHouse/issues/68159): Fix cluster() for inter-server secret (preserve initial user as before). [#66364](https://github.com/ClickHouse/ClickHouse/pull/66364) ([Azat Khuzhin](https://github.com/azat)).
-* Backported in [#68116](https://github.com/ClickHouse/ClickHouse/issues/68116): Fix possible PARAMETER_OUT_OF_BOUND error during reading variant subcolumn. [#66659](https://github.com/ClickHouse/ClickHouse/pull/66659) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67887](https://github.com/ClickHouse/ClickHouse/issues/67887): Correctly parse file name/URI containing `::` if it's not an archive. [#67433](https://github.com/ClickHouse/ClickHouse/pull/67433) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#68611](https://github.com/ClickHouse/ClickHouse/issues/68611): Fixes [#66026](https://github.com/ClickHouse/ClickHouse/issues/66026). Avoid unresolved table function arguments traversal in `ReplaceTableNodeToDummyVisitor`. [#67522](https://github.com/ClickHouse/ClickHouse/pull/67522) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#68275](https://github.com/ClickHouse/ClickHouse/issues/68275): Fix inserting into stream like engines (Kafka, RabbitMQ, NATS) through HTTP interface. [#67554](https://github.com/ClickHouse/ClickHouse/pull/67554) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#67993](https://github.com/ClickHouse/ClickHouse/issues/67993): Validate experimental/suspicious data types in ALTER ADD/MODIFY COLUMN. [#67911](https://github.com/ClickHouse/ClickHouse/pull/67911) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68208](https://github.com/ClickHouse/ClickHouse/issues/68208): Fix wrong `count()` result when there is non-deterministic function in predicate. [#67922](https://github.com/ClickHouse/ClickHouse/pull/67922) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#68093](https://github.com/ClickHouse/ClickHouse/issues/68093): Fixed the calculation of the maximum thread soft limit in containerized environments where the usable CPU count is limited. [#67963](https://github.com/ClickHouse/ClickHouse/pull/67963) ([Robert Schulze](https://github.com/rschu1ze)).
-* Backported in [#68124](https://github.com/ClickHouse/ClickHouse/issues/68124): Fixed skipping of untouched parts in mutations with new analyzer. Previously with enabled analyzer data in part could be rewritten by mutation even if mutation doesn't affect this part according to predicate. [#68052](https://github.com/ClickHouse/ClickHouse/pull/68052) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#68221](https://github.com/ClickHouse/ClickHouse/issues/68221): Fixed a NULL pointer dereference, triggered by a specially crafted query, that crashed the server via hopEnd, hopStart, tumbleEnd, and tumbleStart. [#68098](https://github.com/ClickHouse/ClickHouse/pull/68098) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Backported in [#68173](https://github.com/ClickHouse/ClickHouse/issues/68173): Removes an incorrect optimization to remove sorting in subqueries that use `OFFSET`. Fixes [#67906](https://github.com/ClickHouse/ClickHouse/issues/67906). [#68099](https://github.com/ClickHouse/ClickHouse/pull/68099) ([Graham Campbell](https://github.com/GrahamCampbell)).
-* Backported in [#68339](https://github.com/ClickHouse/ClickHouse/issues/68339): Try fix postgres crash when query is cancelled. [#68288](https://github.com/ClickHouse/ClickHouse/pull/68288) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Backported in [#68396](https://github.com/ClickHouse/ClickHouse/issues/68396): Fix missing sync replica mode in query `SYSTEM SYNC REPLICA`. [#68326](https://github.com/ClickHouse/ClickHouse/pull/68326) ([Duc Canh Le](https://github.com/canhld94)).
-* Backported in [#68668](https://github.com/ClickHouse/ClickHouse/issues/68668): Fix `LOGICAL_ERROR`s when functions `sipHash64Keyed`, `sipHash128Keyed`, or `sipHash128ReferenceKeyed` are applied to empty arrays or tuples. [#68630](https://github.com/ClickHouse/ClickHouse/pull/68630) ([Robert Schulze](https://github.com/rschu1ze)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Update version after release. [#67909](https://github.com/ClickHouse/ClickHouse/pull/67909) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Backported in [#68079](https://github.com/ClickHouse/ClickHouse/issues/68079): Add an explicit error for `ALTER MODIFY SQL SECURITY` on non-view tables. [#67953](https://github.com/ClickHouse/ClickHouse/pull/67953) ([pufit](https://github.com/pufit)).
-* Backported in [#68758](https://github.com/ClickHouse/ClickHouse/issues/68758): To make patch release possible from every commit on release branch, package_debug build is required and must not be skipped. [#68750](https://github.com/ClickHouse/ClickHouse/pull/68750) ([Max K.](https://github.com/maxknv)).
-
diff --git a/docs/changelogs/v24.6.5.30-stable.md b/docs/changelogs/v24.6.5.30-stable.md
deleted file mode 100644
index 4eac5691799..00000000000
--- a/docs/changelogs/v24.6.5.30-stable.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.6.5.30-stable (e6e196c92d6) FIXME as compared to v24.6.4.42-stable (c534bb4b4dd)
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#68969](https://github.com/ClickHouse/ClickHouse/issues/68969): Fix the upper bound of the function `fromModifiedJulianDay`. It was supposed to be `9999-12-31` but was mistakenly set to `9999-01-01`. [#67583](https://github.com/ClickHouse/ClickHouse/pull/67583) ([PHO](https://github.com/depressed-pho)).
-* Backported in [#68814](https://github.com/ClickHouse/ClickHouse/issues/68814): Fixed crash in Parquet filtering when data types in the file substantially differ from requested types (e.g. `... FROM file('a.parquet', Parquet, 'x String')`, but the file has `x Int64`). Without this fix, use `input_format_parquet_filter_push_down = 0` as a workaround. [#68131](https://github.com/ClickHouse/ClickHouse/pull/68131) ([Michael Kolupaev](https://github.com/al13n321)).
-* Backported in [#69005](https://github.com/ClickHouse/ClickHouse/issues/69005): After https://github.com/ClickHouse/ClickHouse/pull/61984 `schema_inference_make_columns_nullable=0` still can make columns `Nullable` in Parquet/Arrow formats. The change was backward incompatible and users noticed the changes in the behaviour. This PR makes `schema_inference_make_columns_nullable=0` to work as before (no Nullable columns will be inferred) and introduces new value `auto` for this setting that will make columns `Nullable` only if data has information about nullability. [#68298](https://github.com/ClickHouse/ClickHouse/pull/68298) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68883](https://github.com/ClickHouse/ClickHouse/issues/68883): Fixes [#50868](https://github.com/ClickHouse/ClickHouse/issues/50868). Small DateTime64 constant values returned by a nested subquery inside a distributed query were wrongly transformed to Nulls, thus causing errors and possible incorrect query results. [#68323](https://github.com/ClickHouse/ClickHouse/pull/68323) ([Shankar](https://github.com/shiyer7474)).
-* Backported in [#69025](https://github.com/ClickHouse/ClickHouse/issues/69025): Added back virtual columns ` _table` and `_database` to distributed tables. They were available until version 24.3. [#68672](https://github.com/ClickHouse/ClickHouse/pull/68672) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#68860](https://github.com/ClickHouse/ClickHouse/issues/68860): Fix possible error `Size of permutation (0) is less than required (...)` during Variant column permutation. [#68681](https://github.com/ClickHouse/ClickHouse/pull/68681) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68786](https://github.com/ClickHouse/ClickHouse/issues/68786): Fix issue with materialized constant keys when hashing maps with arrays as keys in functions `sipHash(64/128)Keyed`. [#68731](https://github.com/ClickHouse/ClickHouse/pull/68731) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Backported in [#69156](https://github.com/ClickHouse/ClickHouse/issues/69156): Fix possible wrong result during anyHeavy state merge. [#68950](https://github.com/ClickHouse/ClickHouse/pull/68950) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#69116](https://github.com/ClickHouse/ClickHouse/issues/69116): Fix logical error when we have empty async insert. [#69080](https://github.com/ClickHouse/ClickHouse/pull/69080) ([Han Fei](https://github.com/hanfei1991)).
-
-#### NO CL CATEGORY
-
-* Backported in [#68942](https://github.com/ClickHouse/ClickHouse/issues/68942):. [#68897](https://github.com/ClickHouse/ClickHouse/pull/68897) ([Alexander Gololobov](https://github.com/davenger)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#68830](https://github.com/ClickHouse/ClickHouse/issues/68830): Turn off fault injection for insert in `01396_inactive_replica_cleanup_nodes_zookeeper`. [#68715](https://github.com/ClickHouse/ClickHouse/pull/68715) ([alesapin](https://github.com/alesapin)).
-* Backported in [#69048](https://github.com/ClickHouse/ClickHouse/issues/69048): Fix 01114_database_atomic flakiness. [#68930](https://github.com/ClickHouse/ClickHouse/pull/68930) ([Raúl Marín](https://github.com/Algunenano)).
-
diff --git a/docs/changelogs/v24.6.6.6-stable.md b/docs/changelogs/v24.6.6.6-stable.md
deleted file mode 100644
index 8cf83e8fc18..00000000000
--- a/docs/changelogs/v24.6.6.6-stable.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.6.6.6-stable (a4c4580e639) FIXME as compared to v24.6.5.30-stable (e6e196c92d6)
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#69197](https://github.com/ClickHouse/ClickHouse/issues/69197): TODO. [#68744](https://github.com/ClickHouse/ClickHouse/pull/68744) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#69225](https://github.com/ClickHouse/ClickHouse/issues/69225): Disable memory test with sanitizer. [#69193](https://github.com/ClickHouse/ClickHouse/pull/69193) ([alesapin](https://github.com/alesapin)).
-
diff --git a/docs/changelogs/v24.7.1.2915-stable.md b/docs/changelogs/v24.7.1.2915-stable.md
deleted file mode 100644
index abffbe58bfc..00000000000
--- a/docs/changelogs/v24.7.1.2915-stable.md
+++ /dev/null
@@ -1,524 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.7.1.2915-stable (a37d2d43da7) FIXME as compared to v24.7.1.1-new (aa023477a92)
-
-#### Backward Incompatible Change
-* Change binary serialization of Variant data type: add `compact` mode to avoid writing the same discriminator multiple times for granules with single variant or with only NULL values. Add MergeTree setting `use_compact_variant_discriminators_serialization` that is enabled by default. Note that Variant type is still experimental and backward-incompatible change in serialization is ok. [#62774](https://github.com/ClickHouse/ClickHouse/pull/62774) ([Kruglov Pavel](https://github.com/Avogar)).
-* Forbid `CREATE MATERIALIZED VIEW ... ENGINE Replicated*MergeTree POPULATE AS SELECT ...` with Replicated databases. [#63963](https://github.com/ClickHouse/ClickHouse/pull/63963) ([vdimir](https://github.com/vdimir)).
-* `clickhouse-keeper-client` will only accept paths in string literals, such as `ls '/hello/world'`, not bare strings such as `ls /hello/world`. [#65494](https://github.com/ClickHouse/ClickHouse/pull/65494) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Metric `KeeperOutstandingRequets` was renamed to `KeeperOutstandingRequests`. This fixes a typo reported in [#66179](https://github.com/ClickHouse/ClickHouse/issues/66179). [#66206](https://github.com/ClickHouse/ClickHouse/pull/66206) ([Robert Schulze](https://github.com/rschu1ze)).
-* Remove `is_deterministic` field from the `system.functions` table. [#66630](https://github.com/ClickHouse/ClickHouse/pull/66630) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-
-#### New Feature
-* Extend function `tuple` to construct named tuples in query. Introduce function `tupleNames` to extract names from tuples. [#54881](https://github.com/ClickHouse/ClickHouse/pull/54881) ([Amos Bird](https://github.com/amosbird)).
-* `ASOF JOIN` support for `full_sorting_join` algorithm Close [#54493](https://github.com/ClickHouse/ClickHouse/issues/54493). [#55051](https://github.com/ClickHouse/ClickHouse/pull/55051) ([vdimir](https://github.com/vdimir)).
-* A new table function, `fuzzQuery,` was added. This function allows you to modify a given query string with random variations. Example: `SELECT query FROM fuzzQuery('SELECT 1');`. [#62103](https://github.com/ClickHouse/ClickHouse/pull/62103) ([pufit](https://github.com/pufit)).
-* Add new window function `percent_rank`. [#62747](https://github.com/ClickHouse/ClickHouse/pull/62747) ([lgbo](https://github.com/lgbo-ustc)).
-* Support JWT authentication in `clickhouse-client`. [#62829](https://github.com/ClickHouse/ClickHouse/pull/62829) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-* Add SQL functions `changeYear`, `changeMonth`, `changeDay`, `changeHour`, `changeMinute`, `changeSecond`. For example, `SELECT changeMonth(toDate('2024-06-14'), 7)` returns date `2024-07-14`. [#63186](https://github.com/ClickHouse/ClickHouse/pull/63186) ([cucumber95](https://github.com/cucumber95)).
-* Introduce startup scripts, which allow the execution of preconfigured queries at the startup stage. [#64889](https://github.com/ClickHouse/ClickHouse/pull/64889) ([pufit](https://github.com/pufit)).
-* Support accept_invalid_certificate in client's config in order to allow for client to connect over secure TCP to a server running with self-signed certificate - can be used as a shorthand for corresponding `openSSL` client settings `verificationMode=none` + `invalidCertificateHandler.name=AcceptCertificateHandler`. [#65238](https://github.com/ClickHouse/ClickHouse/pull/65238) ([peacewalker122](https://github.com/peacewalker122)).
-* Add system.error_log which contains history of error values from table system.errors, periodically flushed to disk. [#65381](https://github.com/ClickHouse/ClickHouse/pull/65381) ([Pablo Marcos](https://github.com/pamarcos)).
-* Add aggregate function `groupConcat`. About the same as `arrayStringConcat( groupArray(column), ',')` Can receive 2 parameters: a string delimiter and the number of elements to be processed. [#65451](https://github.com/ClickHouse/ClickHouse/pull/65451) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Add AzureQueue storage. [#65458](https://github.com/ClickHouse/ClickHouse/pull/65458) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Add a new setting to disable/enable writing page index into parquet files. [#65475](https://github.com/ClickHouse/ClickHouse/pull/65475) ([lgbo](https://github.com/lgbo-ustc)).
-* Allow system administrators to configure `logger.console_log_level`. [#65559](https://github.com/ClickHouse/ClickHouse/pull/65559) ([Azat Khuzhin](https://github.com/azat)).
-* Automatically append a wildcard `*` to the end of a directory path with table function `file`. [#66019](https://github.com/ClickHouse/ClickHouse/pull/66019) ([Zhidong (David) Guo](https://github.com/Gun9niR)).
-* Add `--memory-usage` option to client in non interactive mode. [#66393](https://github.com/ClickHouse/ClickHouse/pull/66393) ([vdimir](https://github.com/vdimir)).
-
-#### Performance Improvement
-* Enable `optimize_functions_to_subcolumns` by default. [#58661](https://github.com/ClickHouse/ClickHouse/pull/58661) ([Anton Popov](https://github.com/CurtizJ)).
-* Replace int to string algorithm with a faster one (from a modified amdn/itoa to a modified jeaiii/itoa). [#61661](https://github.com/ClickHouse/ClickHouse/pull/61661) ([Raúl Marín](https://github.com/Algunenano)).
-* Sizes of hash tables created by join (`parallel_hash` algorithm) is collected and cached now. This information will be used to preallocate space in hash tables for subsequent query executions and save time on hash table resizes. [#64553](https://github.com/ClickHouse/ClickHouse/pull/64553) ([Nikita Taranov](https://github.com/nickitat)).
-* Optimized queries with `ORDER BY` primary key and `WHERE` that have a condition with high selectivity by using of buffering. It is controlled by setting `read_in_order_use_buffering` (enabled by default) and can increase memory usage of query. [#64607](https://github.com/ClickHouse/ClickHouse/pull/64607) ([Anton Popov](https://github.com/CurtizJ)).
-* Improve performance of loading `plain_rewritable` metadata. [#65634](https://github.com/ClickHouse/ClickHouse/pull/65634) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Attaching tables on read-only disks will use fewer resources by not loading outdated parts. [#65635](https://github.com/ClickHouse/ClickHouse/pull/65635) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Support minmax hyperrectangle for Set indices. [#65676](https://github.com/ClickHouse/ClickHouse/pull/65676) ([AntiTopQuark](https://github.com/AntiTopQuark)).
-* Unload primary index of outdated parts to reduce total memory usage. [#65852](https://github.com/ClickHouse/ClickHouse/pull/65852) ([Anton Popov](https://github.com/CurtizJ)).
-* Functions `replaceRegexpAll` and `replaceRegexpOne` are now significantly faster if the pattern is trivial, i.e. contains no metacharacters, pattern classes, flags, grouping characters etc. (Thanks to Taiyang Li). [#66185](https://github.com/ClickHouse/ClickHouse/pull/66185) ([Robert Schulze](https://github.com/rschu1ze)).
-
-#### Improvement
-* Support rocksdb as backend storage of keeper. [#56626](https://github.com/ClickHouse/ClickHouse/pull/56626) ([Han Fei](https://github.com/hanfei1991)).
-* The setting `optimize_trivial_insert_select` is disabled by default. In most cases, it should be beneficial. Nevertheless, if you are seeing slower INSERT SELECT or increased memory usage, you can enable it back or `SET compatibility = '24.6'`. [#58970](https://github.com/ClickHouse/ClickHouse/pull/58970) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Print stacktrace and diagnostic info if `clickhouse-client` or `clickhouse-local` crashes. [#61109](https://github.com/ClickHouse/ClickHouse/pull/61109) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* The result of `SHOW INDEX | INDEXES | INDICES | KEYS` was previously sorted by the primary key column names. Since this was unintuitive, the result is now sorted by the position of the primary key columns within the primary key. [#61131](https://github.com/ClickHouse/ClickHouse/pull/61131) ([Robert Schulze](https://github.com/rschu1ze)).
-* This PR changes how deduplication for MV works. Fixed a lot of cases like: - on destination table: data is split for 2 or more blocks and that blocks is considered as duplicate when that block is inserted in parallel. - on MV destination table: the equal blocks are deduplicated, that happens when MV often produces equal data as a result for different input data due to performing aggregation. - on MV destination table: the equal blocks which comes from different MV are deduplicated. [#61601](https://github.com/ClickHouse/ClickHouse/pull/61601) ([Sema Checherinda](https://github.com/CheSema)).
-* Allow matching column names in a case insensitive manner when reading json files (`input_format_json_case_insensitive_column_matching`). [#61750](https://github.com/ClickHouse/ClickHouse/pull/61750) ([kevinyhzou](https://github.com/KevinyhZou)).
-* Support reading partitioned data DeltaLake data. Infer DeltaLake schema by reading metadata instead of data. [#63201](https://github.com/ClickHouse/ClickHouse/pull/63201) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* In composable protocols TLS layer accepted only `certificateFile` and `privateKeyFile` parameters. https://clickhouse.com/docs/en/operations/settings/composable-protocols. [#63985](https://github.com/ClickHouse/ClickHouse/pull/63985) ([Anton Ivashkin](https://github.com/ianton-ru)).
-* Make an interactive client for clickhouse-disks, add local disk from the local directory. Fixes [#56791](https://github.com/ClickHouse/ClickHouse/issues/56791). [#64446](https://github.com/ClickHouse/ClickHouse/pull/64446) ([Daniil Ivanik](https://github.com/divanik)).
-* Added profile event `SelectQueriesWithPrimaryKeyUsage` which indicates how many SELECT queries use the primary key to evaluate the WHERE clause. [#64492](https://github.com/ClickHouse/ClickHouse/pull/64492) ([0x01f](https://github.com/0xfei)).
-* `StorageS3Queue` related fixes and improvements. Deduce a default value of `s3queue_processing_threads_num` according to the number of physical cpu cores on the server (instead of the previous default value as 1). Set default value of `s3queue_loading_retries` to 10. Fix possible vague "Uncaught exception" in exception column of `system.s3queue`. Do not increment retry count on `MEMORY_LIMIT_EXCEEDED` exception. Move files commit to a stage after insertion into table fully finished to avoid files being commited while not inserted. Add settings `s3queue_max_processed_files_before_commit`, `s3queue_max_processed_rows_before_commit`, `s3queue_max_processed_bytes_before_commit`, `s3queue_max_processing_time_sec_before_commit`, to better control commit and flush time. [#65046](https://github.com/ClickHouse/ClickHouse/pull/65046) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fixed broken multiple columns aggregation on s390x. [#65062](https://github.com/ClickHouse/ClickHouse/pull/65062) ([Harry Lee](https://github.com/HarryLeeIBM)).
-* Support aliases in parametrized view function (only new analyzer). [#65190](https://github.com/ClickHouse/ClickHouse/pull/65190) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* S3. reduce retires time for queries, increase retries count for backups. 8.5 minutes and 100 retires for queries, 1.2 hours and 1000 retries for backup restore. [#65232](https://github.com/ClickHouse/ClickHouse/pull/65232) ([Sema Checherinda](https://github.com/CheSema)).
-* Updated to mask account key in logs in azureBlobStorage. [#65273](https://github.com/ClickHouse/ClickHouse/pull/65273) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Partition pruning for `IN` predicates when filter expression is a part of `PARTITION BY` expression. [#65335](https://github.com/ClickHouse/ClickHouse/pull/65335) ([Eduard Karacharov](https://github.com/korowa)).
-* Add system tables with main information about all detached tables. [#65400](https://github.com/ClickHouse/ClickHouse/pull/65400) ([Konstantin Morozov](https://github.com/k-morozov)).
-* Add support for `cluster_for_parallel_replicas` when using custom key parallel replicas. It allows you to use parallel replicas with custom key with MergeTree tables. [#65453](https://github.com/ClickHouse/ClickHouse/pull/65453) ([Antonio Andelic](https://github.com/antonio2368)).
-* Support query plan LIMIT optimization. Support LIMIT pushdown for PostgreSQL storage and table function. [#65454](https://github.com/ClickHouse/ClickHouse/pull/65454) ([Maksim Kita](https://github.com/kitaisreal)).
-* Arraymin/max can be applicable to all data types that are comparable. [#65455](https://github.com/ClickHouse/ClickHouse/pull/65455) ([pn](https://github.com/chloro-pn)).
-* Improved memory accounting for cgroups v2 to exclude the amount occupied by the page cache. [#65470](https://github.com/ClickHouse/ClickHouse/pull/65470) ([Nikita Taranov](https://github.com/nickitat)).
-* Do not create format settings for each rows when serializing chunks to insert to EmbeddedRocksDB table. [#65474](https://github.com/ClickHouse/ClickHouse/pull/65474) ([Duc Canh Le](https://github.com/canhld94)).
-* Fixed out-of-range exception in parsing Dwarf5 on s390x. [#65501](https://github.com/ClickHouse/ClickHouse/pull/65501) ([Harry Lee](https://github.com/HarryLeeIBM)).
-* Reduce `clickhouse-local` prompt to just `:)`. `getFQDNOrHostName()` takes too long on macOS, and we don't want a hostname in the prompt for `clickhouse-local` anyway. [#65510](https://github.com/ClickHouse/ClickHouse/pull/65510) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-* Avoid printing a message from jemalloc about per-CPU arenas on low-end virtual machines. [#65532](https://github.com/ClickHouse/ClickHouse/pull/65532) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Disable filesystem cache background download by default. It will be enabled back when we fix the issue with possible "Memory limit exceeded" because memory deallocation is done outside of query context (while buffer is allocated inside of query context) if we use background download threads. Plus we need to add a separate setting to define max size to download for background workers (currently it is limited by max_file_segment_size, which might be too big). [#65534](https://github.com/ClickHouse/ClickHouse/pull/65534) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Add new option to config `<config_reload_interval_ms>` which allow to specify how often clickhouse will reload config. [#65545](https://github.com/ClickHouse/ClickHouse/pull/65545) ([alesapin](https://github.com/alesapin)).
-* Implement binary encoding for ClickHouse data types and add its specification in docs. Use it in Dynamic binary serialization, allow to use it in RowBinaryWithNamesAndTypes and Native formats under settings. [#65546](https://github.com/ClickHouse/ClickHouse/pull/65546) ([Kruglov Pavel](https://github.com/Avogar)).
-* Improved ZooKeeper load balancing. The current session doesn't expire until the optimal nodes become available despite `fallback_session_lifetime`. Added support for AZ-aware balancing. [#65570](https://github.com/ClickHouse/ClickHouse/pull/65570) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Server settings `compiled_expression_cache_size` and `compiled_expression_cache_elements_size` are now shown in `system.server_settings`. [#65584](https://github.com/ClickHouse/ClickHouse/pull/65584) ([Robert Schulze](https://github.com/rschu1ze)).
-* When lightweight delete happens on a table with projection(s), users have choices either throw an exception (by default) or drop the projection lightweight delete would happen. [#65594](https://github.com/ClickHouse/ClickHouse/pull/65594) ([jsc0218](https://github.com/jsc0218)).
-* Add support for user identification based on x509 SubjectAltName extension. [#65626](https://github.com/ClickHouse/ClickHouse/pull/65626) ([Anton Kozlov](https://github.com/tonickkozlov)).
-* `clickhouse-local` will respect the `max_server_memory_usage` and `max_server_memory_usage_to_ram_ratio` from the configuration file. It will also set the max memory usage to 90% of the system memory by default, like `clickhouse-server` does. This closes [#65695](https://github.com/ClickHouse/ClickHouse/issues/65695). [#65697](https://github.com/ClickHouse/ClickHouse/pull/65697) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add a script to backup your files to ClickHouse. This is strange, but works. [#65699](https://github.com/ClickHouse/ClickHouse/pull/65699) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* PostgreSQL source support cancel. [#65722](https://github.com/ClickHouse/ClickHouse/pull/65722) ([Maksim Kita](https://github.com/kitaisreal)).
-* Make allow_experimental_analyzer be controlled by the initiator for distributed queries. This ensures compatibility and correctness during operations in mixed version clusters. [#65777](https://github.com/ClickHouse/ClickHouse/pull/65777) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Respect cgroup CPU limit in Keeper. [#65819](https://github.com/ClickHouse/ClickHouse/pull/65819) ([Antonio Andelic](https://github.com/antonio2368)).
-* Allow to use `concat` function with empty arguments ``` sql :) select concat();. [#65887](https://github.com/ClickHouse/ClickHouse/pull/65887) ([李扬](https://github.com/taiyang-li)).
-* Allow controlling named collections in clickhouse-local. [#65973](https://github.com/ClickHouse/ClickHouse/pull/65973) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Improve Azure profile events. [#65999](https://github.com/ClickHouse/ClickHouse/pull/65999) ([alesapin](https://github.com/alesapin)).
-* `Query was cancelled` might have been printed twice in clickhouse-client. This behaviour is fixed. [#66005](https://github.com/ClickHouse/ClickHouse/pull/66005) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Support ORC file read by writer time zone. [#66025](https://github.com/ClickHouse/ClickHouse/pull/66025) ([kevinyhzou](https://github.com/KevinyhZou)).
-* Refactor JSONExtract functions, support more types including experimental Dynamic type. [#66046](https://github.com/ClickHouse/ClickHouse/pull/66046) ([Kruglov Pavel](https://github.com/Avogar)).
-* DatabaseCatalog drops tables faster by using up to database_catalog_drop_table_concurrency threads. [#66065](https://github.com/ClickHouse/ClickHouse/pull/66065) ([Sema Checherinda](https://github.com/CheSema)).
-* This PR changes how deduplication for MV works. Fixed a lot of cases like: - on destination table: data is split for 2 or more blocks and that blocks is considered as duplicate when that block is inserted in parallel. - on MV destination table: the equal blocks are deduplicated, that happens when MV often produces equal data as a result for different input data due to performing aggregation. - on MV destination table: the equal blocks which comes from different MV are deduplicated. [#66144](https://github.com/ClickHouse/ClickHouse/pull/66144) ([Sema Checherinda](https://github.com/CheSema)).
-* Support null map subcolumn for Variant and Dynamic subcolumns. [#66178](https://github.com/ClickHouse/ClickHouse/pull/66178) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add settings to control connection to the PostgreSQL. * Setting `postgresql_connection_attempt_timeout` specifies the value passed to `connect_timeout` parameter of connection URL. * Setting `postgresql_connection_pool_retries` specifies the number of retries to establish a connection to the PostgreSQL end-point. [#66232](https://github.com/ClickHouse/ClickHouse/pull/66232) ([Dmitry Novik](https://github.com/novikd)).
-* Reduce inaccuracy of input_wait_elapsed_us/input_wait_elapsed_us/elapsed_us. [#66239](https://github.com/ClickHouse/ClickHouse/pull/66239) ([Azat Khuzhin](https://github.com/azat)).
-* Improve FilesystemCache ProfileEvents. [#66249](https://github.com/ClickHouse/ClickHouse/pull/66249) ([zhukai](https://github.com/nauu)).
-* Add settings to ignore ON CLUSTER clause in queries for named collection management with replicated storage. [#66288](https://github.com/ClickHouse/ClickHouse/pull/66288) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
-* Upgraded `pocketfft` dependency to the recent commit https://github.com/mreineck/pocketfft/commit/f4c1aa8aa9ce79ad39e80f2c9c41b92ead90fda3. [#66291](https://github.com/ClickHouse/ClickHouse/pull/66291) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Upgraded `azure-sdk-for-cpp` to the recent commit https://github.com/ClickHouse/azure-sdk-for-cpp/commit/ea3e19a7be08519134c643177d56c7484dfec884. [#66292](https://github.com/ClickHouse/ClickHouse/pull/66292) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Function `generateSnowflakeID` now allows to specify a machine ID as a parameter to prevent collisions in large clusters. [#66374](https://github.com/ClickHouse/ClickHouse/pull/66374) ([ZAWA_ll](https://github.com/Zawa-ll)).
-* Disable suspending on Ctrl+Z in interactive mode. This is a common trap and is not expected behavior for almost all users. I imagine only a few extreme power users could appreciate suspending terminal applications to the background, but I don't know any. [#66511](https://github.com/ClickHouse/ClickHouse/pull/66511) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add option for validating the Primary key type in Dictionaries. Without this option for simple layouts any column type will be implicitly converted to UInt64. ### Documentation entry for user-facing changes. [#66595](https://github.com/ClickHouse/ClickHouse/pull/66595) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
-* Fix SHOW MERGES remaining time. [#66735](https://github.com/ClickHouse/ClickHouse/pull/66735) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-
-#### Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)
-* Fix unexpeced size of low cardinality column in function calls. [#65298](https://github.com/ClickHouse/ClickHouse/pull/65298) ([Raúl Marín](https://github.com/Algunenano)).
-* Check cyclic dependencies on CREATE/REPLACE/RENAME/EXCHANGE queries and throw an exception if there is a cyclic dependency. Previously such cyclic dependencies could lead to a deadlock during server startup. Closes [#65355](https://github.com/ClickHouse/ClickHouse/issues/65355). Also fix some bugs in dependencies creation. [#65405](https://github.com/ClickHouse/ClickHouse/pull/65405) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix crash in maxIntersections. [#65689](https://github.com/ClickHouse/ClickHouse/pull/65689) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix the VALID UNTIL clause in the user definition resetting after a restart. Closes [#66405](https://github.com/ClickHouse/ClickHouse/issues/66405). [#66409](https://github.com/ClickHouse/ClickHouse/pull/66409) ([Nikolay Degterinsky](https://github.com/evillique)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Fixed crash while using MaterializedMySQL with TABLE OVERRIDE that maps MySQL NULL field into ClickHouse not NULL field. [#54649](https://github.com/ClickHouse/ClickHouse/pull/54649) ([Filipp Ozinov](https://github.com/bakwc)).
-* Fix logical error when PREWHERE expression read no columns and table has no adaptive index granularity (very old table). Fix [#56640](https://github.com/ClickHouse/ClickHouse/issues/56640). [#59173](https://github.com/ClickHouse/ClickHouse/pull/59173) ([Alexander Gololobov](https://github.com/davenger)).
-* Fix bug with cancelation buffer when canceling a query. [#64478](https://github.com/ClickHouse/ClickHouse/pull/64478) ([Sema Checherinda](https://github.com/CheSema)).
-* Fix filling parts columns from metadata (when columns.txt does not exists). [#64757](https://github.com/ClickHouse/ClickHouse/pull/64757) ([Azat Khuzhin](https://github.com/azat)).
-* Fix AST formatting of 'create table b empty as a'. [#64951](https://github.com/ClickHouse/ClickHouse/pull/64951) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fix crash for `ALTER TABLE ... ON CLUSTER ... MODIFY SQL SECURITY`. [#64957](https://github.com/ClickHouse/ClickHouse/pull/64957) ([pufit](https://github.com/pufit)).
-* Fix crash on destroying AccessControl: add explicit shutdown. [#64993](https://github.com/ClickHouse/ClickHouse/pull/64993) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Eliminate injective function in argument of functions `uniq*` recursively. This used to work correctly but was broken in the new analyzer. [#65140](https://github.com/ClickHouse/ClickHouse/pull/65140) ([Duc Canh Le](https://github.com/canhld94)).
-* Fix unexpected projection name when query with CTE. [#65267](https://github.com/ClickHouse/ClickHouse/pull/65267) ([wudidapaopao](https://github.com/wudidapaopao)).
-* Require `dictGet` privilege when accessing dictionaries via direct query or the `Dictionary` table engine. [#65359](https://github.com/ClickHouse/ClickHouse/pull/65359) ([Joe Lynch](https://github.com/joelynch)).
-* Fix user-specific S3 auth with incremental backups. [#65481](https://github.com/ClickHouse/ClickHouse/pull/65481) ([Antonio Andelic](https://github.com/antonio2368)).
-* Disable `non-intersecting-parts` optimization for queries with `FINAL` in case of `read-in-order` optimization was enabled. This could lead to an incorrect query result. As a workaround, disable `do_not_merge_across_partitions_select_final` and `split_parts_ranges_into_intersecting_and_non_intersecting_final` before this fix is merged. [#65505](https://github.com/ClickHouse/ClickHouse/pull/65505) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix getting exception `Index out of bound for blob metadata` in case all files from list batch were filtered out. [#65523](https://github.com/ClickHouse/ClickHouse/pull/65523) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix NOT_FOUND_COLUMN_IN_BLOCK for deduplicate merge of projection. [#65573](https://github.com/ClickHouse/ClickHouse/pull/65573) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Fixed bug in MergeJoin. Column in sparse serialisation might be treated as a column of its nested type though the required conversion wasn't performed. [#65632](https://github.com/ClickHouse/ClickHouse/pull/65632) ([Nikita Taranov](https://github.com/nickitat)).
-* Fixed a bug that compatibility level '23.4' was not properly applied. [#65737](https://github.com/ClickHouse/ClickHouse/pull/65737) ([cw5121](https://github.com/cw5121)).
-* Fix odbc table with nullable fields. [#65738](https://github.com/ClickHouse/ClickHouse/pull/65738) ([Rodolphe Dugé de Bernonville](https://github.com/RodolpheDuge)).
-* Fix data race in `TCPHandler`, which could happen on fatal error. [#65744](https://github.com/ClickHouse/ClickHouse/pull/65744) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix invalid exceptions in function `parseDateTime` with `%F` and `%D` placeholders. [#65768](https://github.com/ClickHouse/ClickHouse/pull/65768) ([Antonio Andelic](https://github.com/antonio2368)).
-* For queries that read from `PostgreSQL`, cancel the internal `PostgreSQL` query if the ClickHouse query is finished. Otherwise, `ClickHouse` query cannot be canceled until the internal `PostgreSQL` query is finished. [#65771](https://github.com/ClickHouse/ClickHouse/pull/65771) ([Maksim Kita](https://github.com/kitaisreal)).
-* Fix a bug in short circuit logic when old analyzer and dictGetOrDefault is used. [#65802](https://github.com/ClickHouse/ClickHouse/pull/65802) ([jsc0218](https://github.com/jsc0218)).
-* Fix a bug leads to EmbeddedRocksDB with TTL write corrupted SST files. [#65816](https://github.com/ClickHouse/ClickHouse/pull/65816) ([Duc Canh Le](https://github.com/canhld94)).
-* Functions `bitTest`, `bitTestAll`, and `bitTestAny` now return an error if the specified bit index is out-of-bounds (issue [#65517](https://github.com/ClickHouse/ClickHouse/issues/65517)). [#65818](https://github.com/ClickHouse/ClickHouse/pull/65818) ([Pablo Marcos](https://github.com/pamarcos)).
-* Setting `join_any_take_last_row` is supported in any query with hash join. [#65820](https://github.com/ClickHouse/ClickHouse/pull/65820) ([vdimir](https://github.com/vdimir)).
-* Better handling of join conditions involving `IS NULL` checks (for example `ON (a = b AND (a IS NOT NULL) AND (b IS NOT NULL) ) OR ( (a IS NULL) AND (b IS NULL) )` is rewritten to `ON a <=> b`), fix incorrect optimization when condition other then `IS NULL` are present. [#65835](https://github.com/ClickHouse/ClickHouse/pull/65835) ([vdimir](https://github.com/vdimir)).
-* Functions `bitShiftLeft` and `bitShitfRight` return an error for out of bounds shift positions (issue [#65516](https://github.com/ClickHouse/ClickHouse/issues/65516)). [#65838](https://github.com/ClickHouse/ClickHouse/pull/65838) ([Pablo Marcos](https://github.com/pamarcos)).
-* Fix growing memory usage in S3Queue. [#65839](https://github.com/ClickHouse/ClickHouse/pull/65839) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix tie handling in `arrayAUC` to match sklearn. [#65840](https://github.com/ClickHouse/ClickHouse/pull/65840) ([gabrielmcg44](https://github.com/gabrielmcg44)).
-* Fix possible issues with MySQL server protocol TLS connections. [#65917](https://github.com/ClickHouse/ClickHouse/pull/65917) ([Azat Khuzhin](https://github.com/azat)).
-* Fix possible issues with MySQL client protocol TLS connections. [#65938](https://github.com/ClickHouse/ClickHouse/pull/65938) ([Azat Khuzhin](https://github.com/azat)).
-* Fix handling of `SSL_ERROR_WANT_READ`/`SSL_ERROR_WANT_WRITE` with zero timeout. [#65941](https://github.com/ClickHouse/ClickHouse/pull/65941) ([Azat Khuzhin](https://github.com/azat)).
-* Add missing settings `input_format_csv_skip_first_lines/input_format_tsv_skip_first_lines/input_format_csv_try_infer_numbers_from_strings/input_format_csv_try_infer_strings_from_quoted_tuples` in schema inference cache because they can change the resulting schema. It prevents from incorrect result of schema inference with these settings changed. [#65980](https://github.com/ClickHouse/ClickHouse/pull/65980) ([Kruglov Pavel](https://github.com/Avogar)).
-* Column _size in s3 engine and s3 table function denotes the size of a file inside the archive, not a size of the archive itself. [#65993](https://github.com/ClickHouse/ClickHouse/pull/65993) ([Daniil Ivanik](https://github.com/divanik)).
-* Fix resolving dynamic subcolumns in analyzer, avoid reading the whole column on dynamic subcolumn reading. [#66004](https://github.com/ClickHouse/ClickHouse/pull/66004) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix config merging for from_env with replace overrides. [#66034](https://github.com/ClickHouse/ClickHouse/pull/66034) ([Azat Khuzhin](https://github.com/azat)).
-* Fix a possible hanging in `GRPCServer` during shutdown. This PR fixes [#65622](https://github.com/ClickHouse/ClickHouse/issues/65622). [#66061](https://github.com/ClickHouse/ClickHouse/pull/66061) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix reading dynamic subcolumns from altered Memory table. Previously if `max_types` peremeter of a Dynamic type was changed in Memory table via alter, further subcolumns reading can return wrong result. [#66066](https://github.com/ClickHouse/ClickHouse/pull/66066) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fixed several cases in function `has` with non-constant `LowCardinality` arguments. [#66088](https://github.com/ClickHouse/ClickHouse/pull/66088) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix for `groupArrayIntersect`. It had incorrect behavior in the `merge()` function. Also, fixed behavior in `deserialise()` for numeric and general data. [#66103](https://github.com/ClickHouse/ClickHouse/pull/66103) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Fixed buffer overflow bug in `unbin`/`unhex` implementation. [#66106](https://github.com/ClickHouse/ClickHouse/pull/66106) ([Nikita Taranov](https://github.com/nickitat)).
-* Disable the `merge-filters` optimization introduced in [#64760](https://github.com/ClickHouse/ClickHouse/issues/64760). It may cause an exception if optimization merges two filter expressions and does not apply a short-circuit evaluation. [#66126](https://github.com/ClickHouse/ClickHouse/pull/66126) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed the issue when the server failed to parse Avro files with negative block size arrays encoded, which is now allowed by the Avro specification. [#66130](https://github.com/ClickHouse/ClickHouse/pull/66130) ([Serge Klochkov](https://github.com/slvrtrn)).
-* Fixed a bug in ZooKeeper client: a session could get stuck in unusable state after receiving a hardware error from ZooKeeper. For example, this might happen due to "soft memory limit" in ClickHouse Keeper. [#66140](https://github.com/ClickHouse/ClickHouse/pull/66140) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Fix issue in SumIfToCountIfVisitor and signed integers. [#66146](https://github.com/ClickHouse/ClickHouse/pull/66146) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix rare case with missing data in the result of distributed query, close [#61432](https://github.com/ClickHouse/ClickHouse/issues/61432). [#66174](https://github.com/ClickHouse/ClickHouse/pull/66174) ([vdimir](https://github.com/vdimir)).
-* Fix order of parsing metadata fields in StorageDeltaLake. [#66211](https://github.com/ClickHouse/ClickHouse/pull/66211) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Don't throw `TIMEOUT_EXCEEDED` for `none_only_active` mode of `distributed_ddl_output_mode`. [#66218](https://github.com/ClickHouse/ClickHouse/pull/66218) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Fix handling limit for `system.numbers_mt` when no index can be used. [#66231](https://github.com/ClickHouse/ClickHouse/pull/66231) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Fixed how the ClickHouse server detects the maximum number of usable CPU cores as specified by cgroups v2 if the server runs in a container such as Docker. In more detail, containers often run their process in the root cgroup which has an empty name. In that case, ClickHouse ignored the CPU limits set by cgroups v2. [#66237](https://github.com/ClickHouse/ClickHouse/pull/66237) ([filimonov](https://github.com/filimonov)).
-* Fix the `Not-ready set` error when a subquery with `IN` is used in the constraint. [#66261](https://github.com/ClickHouse/ClickHouse/pull/66261) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix indexHint function case found by fuzzer. [#66286](https://github.com/ClickHouse/ClickHouse/pull/66286) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix error reporting while copying to S3 or AzureBlobStorage. [#66295](https://github.com/ClickHouse/ClickHouse/pull/66295) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Prevent watchdog from keeping descriptors of unlinked(rotated) log files. [#66334](https://github.com/ClickHouse/ClickHouse/pull/66334) ([Aleksei Filatov](https://github.com/aalexfvk)).
-* Fix the bug that logicalexpressionoptimizerpass lost logical type of constant. closes [#64487](https://github.com/ClickHouse/ClickHouse/issues/64487). [#66344](https://github.com/ClickHouse/ClickHouse/pull/66344) ([pn](https://github.com/chloro-pn)).
-* Fix `Column identifier is already registered` error with `group_by_use_nulls=true` and new analyzer. [#66400](https://github.com/ClickHouse/ClickHouse/pull/66400) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix possible incorrect result for queries joining and filtering table external engine (like PostgreSQL), due to too aggressive filter pushdown. Since now, conditions from where section won't be send to external database in case of outer join with external table. [#66402](https://github.com/ClickHouse/ClickHouse/pull/66402) ([vdimir](https://github.com/vdimir)).
-* Added missing column materialization for cross join. [#66413](https://github.com/ClickHouse/ClickHouse/pull/66413) ([lgbo](https://github.com/lgbo-ustc)).
-* Fix `Cannot find column` error for queries with constant expression in `GROUP BY` key and new analyzer enabled. [#66433](https://github.com/ClickHouse/ClickHouse/pull/66433) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Avoid possible logical error during import from Npy format in case of bad array nesting level, fix testing of other kinds of errors. [#66461](https://github.com/ClickHouse/ClickHouse/pull/66461) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Fix wrong count() result when there is non-deterministic function in predicate. [#66510](https://github.com/ClickHouse/ClickHouse/pull/66510) ([Duc Canh Le](https://github.com/canhld94)).
-* Correctly track memory for `Allocator::realloc`. [#66548](https://github.com/ClickHouse/ClickHouse/pull/66548) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix reading of uninitialized memory when hashing empty tuples. This closes [#66559](https://github.com/ClickHouse/ClickHouse/issues/66559). [#66562](https://github.com/ClickHouse/ClickHouse/pull/66562) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix an invalid result for queries with `WINDOW`. This could happen when `PARTITION` columns have sparse serialization and window functions are executed in parallel. [#66579](https://github.com/ClickHouse/ClickHouse/pull/66579) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix removing named collections in local storage. [#66599](https://github.com/ClickHouse/ClickHouse/pull/66599) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Fix logical error in `PrometheusRequestHandler`. [#66621](https://github.com/ClickHouse/ClickHouse/pull/66621) ([Vitaly Baranov](https://github.com/vitlibar)).
-* `column_length` is not updated in `ColumnTuple::insertManyFrom`. [#66626](https://github.com/ClickHouse/ClickHouse/pull/66626) ([lgbo](https://github.com/lgbo-ustc)).
-* Fix `Unknown identifier` and `Column is not under aggregate function` errors for queries with the expression `(column IS NULL).` The bug was triggered by [#65088](https://github.com/ClickHouse/ClickHouse/issues/65088), with the disabled analyzer only. [#66654](https://github.com/ClickHouse/ClickHouse/pull/66654) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix `Method getResultType is not supported for QUERY query node` error when scalar subquery was used as the first argument of IN (with new analyzer). [#66655](https://github.com/ClickHouse/ClickHouse/pull/66655) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix possible PARAMETER_OUT_OF_BOUND error during reading variant subcolumn. [#66659](https://github.com/ClickHouse/ClickHouse/pull/66659) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix rare case of stuck merge after drop column. [#66707](https://github.com/ClickHouse/ClickHouse/pull/66707) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix assertion `isUniqTypes` when insert select from remote sources. [#66722](https://github.com/ClickHouse/ClickHouse/pull/66722) ([Sema Checherinda](https://github.com/CheSema)).
-* Backported in [#67026](https://github.com/ClickHouse/ClickHouse/issues/67026): In rare cases ClickHouse could consider parts as broken because of some unexpected projections on disk. Now it's fixed. [#66898](https://github.com/ClickHouse/ClickHouse/pull/66898) ([alesapin](https://github.com/alesapin)).
-* Backported in [#67443](https://github.com/ClickHouse/ClickHouse/issues/67443): Forbid create as select even when database_replicated_allow_heavy_create is set. It was unconditionally forbidden in 23.12 and accidentally allowed under the setting in unreleased 24.7. [#66980](https://github.com/ClickHouse/ClickHouse/pull/66980) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67201](https://github.com/ClickHouse/ClickHouse/issues/67201): TRUNCATE DATABASE used to stop replication as if it was a DROP DATABASE query, it's fixed. [#67129](https://github.com/ClickHouse/ClickHouse/pull/67129) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#67383](https://github.com/ClickHouse/ClickHouse/issues/67383): Fix error `Cannot convert column because it is non constant in source stream but must be constant in result.` for a query that reads from the `Merge` table over the `Distriburted` table with one shard. [#67146](https://github.com/ClickHouse/ClickHouse/pull/67146) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#67246](https://github.com/ClickHouse/ClickHouse/issues/67246): This closes [#67156](https://github.com/ClickHouse/ClickHouse/issues/67156). This closes [#66447](https://github.com/ClickHouse/ClickHouse/issues/66447). The bug was introduced in https://github.com/ClickHouse/ClickHouse/pull/62907. [#67178](https://github.com/ClickHouse/ClickHouse/pull/67178) ([Maksim Kita](https://github.com/kitaisreal)).
-
-#### Build/Testing/Packaging Improvement
-* Instantiate template methods ahead in different .cpp files, avoid too large translation units during compiling. [#64818](https://github.com/ClickHouse/ClickHouse/pull/64818) ([lgbo](https://github.com/lgbo-ustc)).
-* Stateless tests: Improve tests speed and decrease number of parallel jobs. [#65186](https://github.com/ClickHouse/ClickHouse/pull/65186) ([Nikita Fomichev](https://github.com/fm4v)).
-* Add tests for `base64URLEncode` and `base64URLDecode`. Add analyzer tests. [#65979](https://github.com/ClickHouse/ClickHouse/pull/65979) ([Nikita Fomichev](https://github.com/fm4v)).
-* Fix problem when github terminate instances by timeout and artifacts are not collected and full test report is not generated. [#66036](https://github.com/ClickHouse/ClickHouse/pull/66036) ([Nikita Fomichev](https://github.com/fm4v)).
-* Fix test [test_grpc_protocol/test.py::test_progress](https://s3.amazonaws.com/clickhouse-test-reports/57695/188f8a3df74caf830ad1ced3c4cf6dfb0aa90093/integration_tests__asan__old_analyzer__[4_6].html). [#66063](https://github.com/ClickHouse/ClickHouse/pull/66063) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Stateless tests: Improve tests speed and decrease number of parallel jobs. [#66305](https://github.com/ClickHouse/ClickHouse/pull/66305) ([Nikita Fomichev](https://github.com/fm4v)).
-* Stateless tests: Improve tests speed and decrease number of parallel jobs 3. [#66363](https://github.com/ClickHouse/ClickHouse/pull/66363) ([Nikita Fomichev](https://github.com/fm4v)).
-* Tests: fix tests hang up in cases when gdb catches error. [#66411](https://github.com/ClickHouse/ClickHouse/pull/66411) ([Nikita Fomichev](https://github.com/fm4v)).
-* ... since [Release v24.6.1.4423-stable](https://github.com/ClickHouse/ClickHouse/releases/tag/v24.6.1.4423-stable) when build in ppc64le with dynamic openssl build (`cmake -DENABLE_OPENSSL_DYNAMIC=1 -DCMAKE_TOOLCHAIN_FILE= cmake/linux/toolchain-ppc64le.cmake `) got error: ` ld.lld: error: duplicate symbol: OPENSSL_cleanse`. [#66733](https://github.com/ClickHouse/ClickHouse/pull/66733) ([Yong Wang](https://github.com/kashwy)).
-
-#### NO CL CATEGORY
-
-* Backported in [#67084](https://github.com/ClickHouse/ClickHouse/issues/67084):. [#67040](https://github.com/ClickHouse/ClickHouse/pull/67040) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#67452](https://github.com/ClickHouse/ClickHouse/issues/67452):. [#67392](https://github.com/ClickHouse/ClickHouse/pull/67392) ([alesapin](https://github.com/alesapin)).
-
-#### NO CL ENTRY
-
-* NO CL ENTRY:  'Revert "Revert "Small fix for 02340_parts_refcnt_mergetree""'. [#65155](https://github.com/ClickHouse/ClickHouse/pull/65155) ([Nikita Taranov](https://github.com/nickitat)).
-* NO CL ENTRY:  'Revert "Use 1MB HTTP buffers to avoid frequent send syscalls"'. [#65498](https://github.com/ClickHouse/ClickHouse/pull/65498) ([Sergei Trifonov](https://github.com/serxa)).
-* NO CL ENTRY:  'Revert "Resubmit http_external_tables_memory_tracking test"'. [#65500](https://github.com/ClickHouse/ClickHouse/pull/65500) ([Nikita Taranov](https://github.com/nickitat)).
-* NO CL ENTRY:  'Revert "Add an assertion in ReplicatedMergeTreeQueue"'. [#65686](https://github.com/ClickHouse/ClickHouse/pull/65686) ([Raúl Marín](https://github.com/Algunenano)).
-* NO CL ENTRY:  'Revert "insertion deduplication on retries for materialised views"'. [#66134](https://github.com/ClickHouse/ClickHouse/pull/66134) ([Sema Checherinda](https://github.com/CheSema)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Return and fix 01600_parts_states_metrics_long test. [#58748](https://github.com/ClickHouse/ClickHouse/pull/58748) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Add azure_cache as storage policy to tests. [#59943](https://github.com/ClickHouse/ClickHouse/pull/59943) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Minor: replaced expression with LEGACY_MAX_LEVEL. [#61268](https://github.com/ClickHouse/ClickHouse/pull/61268) ([Vasily Nemkov](https://github.com/Enmk)).
-* Make write to temporary data in cache do all checks and assertions as during write to ordinary cache. [#63348](https://github.com/ClickHouse/ClickHouse/pull/63348) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Refactoring near azure blob storage. [#63636](https://github.com/ClickHouse/ClickHouse/pull/63636) ([Anton Popov](https://github.com/CurtizJ)).
-* Everything should work with Analyzer. [#63643](https://github.com/ClickHouse/ClickHouse/pull/63643) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* add some log for non using detached tables. [#64992](https://github.com/ClickHouse/ClickHouse/pull/64992) ([Konstantin Morozov](https://github.com/k-morozov)).
-* Remove dag flags. [#65234](https://github.com/ClickHouse/ClickHouse/pull/65234) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix flaky autocompletion test. [#65246](https://github.com/ClickHouse/ClickHouse/pull/65246) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-* Disable userspace page cache by default. [#65305](https://github.com/ClickHouse/ClickHouse/pull/65305) ([Michael Kolupaev](https://github.com/al13n321)).
-* Update version_date.tsv and changelogs after v24.4.3.25-stable. [#65308](https://github.com/ClickHouse/ClickHouse/pull/65308) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Do not raise a NOT_IMPLEMENTED error when getting s3 metrics with a multiple disk configuration. [#65403](https://github.com/ClickHouse/ClickHouse/pull/65403) ([Elena Torró](https://github.com/elenatorro)).
-* Dodging reading from wrong table with parallel replicas. [#65417](https://github.com/ClickHouse/ClickHouse/pull/65417) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix: return error if can't connect to any replicas chosen for query execution. [#65467](https://github.com/ClickHouse/ClickHouse/pull/65467) ([Igor Nikonov](https://github.com/devcrafter)).
-* Fix `AzureObjectStorage::exists` method. [#65471](https://github.com/ClickHouse/ClickHouse/pull/65471) ([Anton Popov](https://github.com/CurtizJ)).
-* Update version after release. [#65483](https://github.com/ClickHouse/ClickHouse/pull/65483) ([Raúl Marín](https://github.com/Algunenano)).
-* Generate 24.6 changelog. [#65485](https://github.com/ClickHouse/ClickHouse/pull/65485) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix of `PlanSquashingTransform`: pipeline stuck. [#65487](https://github.com/ClickHouse/ClickHouse/pull/65487) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Fix bad test `02922_deduplication_with_zero_copy`. [#65492](https://github.com/ClickHouse/ClickHouse/pull/65492) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Disable clang-format in special areas. [#65495](https://github.com/ClickHouse/ClickHouse/pull/65495) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix `test_keeper_snapshots`. [#65497](https://github.com/ClickHouse/ClickHouse/pull/65497) ([Antonio Andelic](https://github.com/antonio2368)).
-* Update to libunwind 8.1.7. [#65509](https://github.com/ClickHouse/ClickHouse/pull/65509) ([Michael Kolupaev](https://github.com/al13n321)).
-* Setting `uniform_snowflake_conversion_functions` (not in any release yet) was replaced by setting `allow_deprecated_snowflake_conversion_functions`. The latter controls if the legacy snowflake conversion functions are available (by default, they are not). [#65522](https://github.com/ClickHouse/ClickHouse/pull/65522) ([Robert Schulze](https://github.com/rschu1ze)).
-* Try CI without RerunCheck, jobs can be easily rerun manually though extra amount of work in CI will follow on workflow restart. [#65524](https://github.com/ClickHouse/ClickHouse/pull/65524) ([Max K.](https://github.com/maxknv)).
-* Bump re2 to latest HEAD. [#65526](https://github.com/ClickHouse/ClickHouse/pull/65526) ([Robert Schulze](https://github.com/rschu1ze)).
-* OpenSSL: Replace temporary fix for unsynchronized access by official fix. [#65529](https://github.com/ClickHouse/ClickHouse/pull/65529) ([Robert Schulze](https://github.com/rschu1ze)).
-* Update README.md. [#65531](https://github.com/ClickHouse/ClickHouse/pull/65531) ([Tyler Hannan](https://github.com/tylerhannan)).
-* CI: some time there are timeouts on DROP TABLES for random tests. [#65535](https://github.com/ClickHouse/ClickHouse/pull/65535) ([Sema Checherinda](https://github.com/CheSema)).
-* Synchronize `MARK_CACHE_SIZE` value in default settings and config. [#65547](https://github.com/ClickHouse/ClickHouse/pull/65547) ([Denny Crane](https://github.com/den-crane)).
-* CI: Skip removed test files in stateless flaky check job. [#65553](https://github.com/ClickHouse/ClickHouse/pull/65553) ([Max K.](https://github.com/maxknv)).
-* Renames Build report jobs. [#65554](https://github.com/ClickHouse/ClickHouse/pull/65554) ([Max K.](https://github.com/maxknv)).
-* Parse user from URL for dashboard.html (useful for sharing). [#65556](https://github.com/ClickHouse/ClickHouse/pull/65556) ([Azat Khuzhin](https://github.com/azat)).
-* Remove tech debt. [#65561](https://github.com/ClickHouse/ClickHouse/pull/65561) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Maybe fix test `00763_lock_buffer_long.sh`. [#65562](https://github.com/ClickHouse/ClickHouse/pull/65562) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix clickhouse-keeper with not system-wide directories and provide override for local development. [#65563](https://github.com/ClickHouse/ClickHouse/pull/65563) ([Azat Khuzhin](https://github.com/azat)).
-* Re-configure yamllint to allow document-start. [#65565](https://github.com/ClickHouse/ClickHouse/pull/65565) ([Azat Khuzhin](https://github.com/azat)).
-* Fix flaky test `01254_dict_load_after_detach_attach.sql`. [#65571](https://github.com/ClickHouse/ClickHouse/pull/65571) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Improve flaky test to provide more diagnostics. [#65586](https://github.com/ClickHouse/ClickHouse/pull/65586) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix test_parallel_replicas_distributed_skip_shards flakiness. [#65588](https://github.com/ClickHouse/ClickHouse/pull/65588) ([Igor Nikonov](https://github.com/devcrafter)).
-* Fix an error in the test about metadata_type. [#65592](https://github.com/ClickHouse/ClickHouse/pull/65592) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix slow test. [#65593](https://github.com/ClickHouse/ClickHouse/pull/65593) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* fix flaky 02864_statistics_uniq. [#65599](https://github.com/ClickHouse/ClickHouse/pull/65599) ([Han Fei](https://github.com/hanfei1991)).
-* Fix 03172_error_log_table_not_empty. [#65604](https://github.com/ClickHouse/ClickHouse/pull/65604) ([Pablo Marcos](https://github.com/pamarcos)).
-* Enable realtime digest for Jepsen tests. [#65608](https://github.com/ClickHouse/ClickHouse/pull/65608) ([Antonio Andelic](https://github.com/antonio2368)).
-* CI: Return Job Rerun check. [#65613](https://github.com/ClickHouse/ClickHouse/pull/65613) ([Max K.](https://github.com/maxknv)).
-* Update CHANGELOG.md. [#65624](https://github.com/ClickHouse/ClickHouse/pull/65624) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Module is required for authenticating in GH (in cloud). [#65628](https://github.com/ClickHouse/ClickHouse/pull/65628) ([Max K.](https://github.com/maxknv)).
-* Update IObjectStorage.h. [#65631](https://github.com/ClickHouse/ClickHouse/pull/65631) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix 02834_apache_arrow_abort flakiness with MSAN. [#65640](https://github.com/ClickHouse/ClickHouse/pull/65640) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fix overflow in StorageWindowView. [#65641](https://github.com/ClickHouse/ClickHouse/pull/65641) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fix inconsistent AST formatting when a keyword is used as type name. [#65648](https://github.com/ClickHouse/ClickHouse/pull/65648) ([Michael Kolupaev](https://github.com/al13n321)).
-* CI: Single point of setting mergeable check status. [#65658](https://github.com/ClickHouse/ClickHouse/pull/65658) ([Max K.](https://github.com/maxknv)).
-* Miscellaneous and insignificant changes around Client/ClientBase. [#65669](https://github.com/ClickHouse/ClickHouse/pull/65669) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Add Replicated database names to ZooKeeper for introspection. [#65675](https://github.com/ClickHouse/ClickHouse/pull/65675) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Introduce type contract checks in `IColumn`. [#65687](https://github.com/ClickHouse/ClickHouse/pull/65687) ([Nikita Taranov](https://github.com/nickitat)).
-* Print slightly more information in 02982_aggregation_states_destruction. [#65688](https://github.com/ClickHouse/ClickHouse/pull/65688) ([Michael Kolupaev](https://github.com/al13n321)).
-* Disable stacktrace collection in GWPAsan by default. [#65701](https://github.com/ClickHouse/ClickHouse/pull/65701) ([Antonio Andelic](https://github.com/antonio2368)).
-* Build jemalloc with profiler. [#65702](https://github.com/ClickHouse/ClickHouse/pull/65702) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix duplicate symbol linkage error. [#65705](https://github.com/ClickHouse/ClickHouse/pull/65705) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix server restarts in performance tests. [#65717](https://github.com/ClickHouse/ClickHouse/pull/65717) ([Antonio Andelic](https://github.com/antonio2368)).
-* Update 03002_part_log_rmt_fetch_mutate_error.sql. [#65720](https://github.com/ClickHouse/ClickHouse/pull/65720) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Fix bug with session closing in Keeper. [#65735](https://github.com/ClickHouse/ClickHouse/pull/65735) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix flaky `02265_column_ttl`. Closes [#65719](https://github.com/ClickHouse/ClickHouse/issues/65719). [#65742](https://github.com/ClickHouse/ClickHouse/pull/65742) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* See [#65745](https://github.com/ClickHouse/ClickHouse/issues/65745). It doesn't solve the issue, but helps a bit. [#65746](https://github.com/ClickHouse/ClickHouse/pull/65746) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Update CHANGELOG.md. [#65752](https://github.com/ClickHouse/ClickHouse/pull/65752) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* document declarative ssh-keys authentication. [#65756](https://github.com/ClickHouse/ClickHouse/pull/65756) ([Tobias Florek](https://github.com/ibotty)).
-* `base64En/Decode64Url` --> `base64En/Decode64URL`. [#65760](https://github.com/ClickHouse/ClickHouse/pull/65760) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix for issue [#65757](https://github.com/ClickHouse/ClickHouse/issues/65757). [#65763](https://github.com/ClickHouse/ClickHouse/pull/65763) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Fix flaky `test_replicated_database::test_alter_attach`. [#65766](https://github.com/ClickHouse/ClickHouse/pull/65766) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix: progress bar for read in order queries. [#65769](https://github.com/ClickHouse/ClickHouse/pull/65769) ([Igor Nikonov](https://github.com/devcrafter)).
-* CI: Fix for Builds report job in backports and releases. [#65774](https://github.com/ClickHouse/ClickHouse/pull/65774) ([Max K.](https://github.com/maxknv)).
-* CI: New create release workflow. [#65775](https://github.com/ClickHouse/ClickHouse/pull/65775) ([Max K.](https://github.com/maxknv)).
-* fixed misspelled word. [#65778](https://github.com/ClickHouse/ClickHouse/pull/65778) ([Linh Giang](https://github.com/linhgiang24)).
-* Refactor statistics interface. [#65792](https://github.com/ClickHouse/ClickHouse/pull/65792) ([Robert Schulze](https://github.com/rschu1ze)).
-* Try to make `test_ldap_external_user_directory` less flaky. [#65794](https://github.com/ClickHouse/ClickHouse/pull/65794) ([Andrey Zvonov](https://github.com/zvonand)).
-* AMI image with gh and jwt. [#65795](https://github.com/ClickHouse/ClickHouse/pull/65795) ([Max K.](https://github.com/maxknv)).
-* Forbid join algorithm randomisation for 03094_one_thousand_joins. [#65798](https://github.com/ClickHouse/ClickHouse/pull/65798) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix 02931_rewrite_sum_column_and_constant flakiness. [#65800](https://github.com/ClickHouse/ClickHouse/pull/65800) ([Michael Kolupaev](https://github.com/al13n321)).
-* Update StorageMaterializedView.cpp. [#65801](https://github.com/ClickHouse/ClickHouse/pull/65801) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix slow `getFQDNOrHostNameImpl` on macOS. [#65803](https://github.com/ClickHouse/ClickHouse/pull/65803) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-* No jemalloc profiler for non-Linux. [#65834](https://github.com/ClickHouse/ClickHouse/pull/65834) ([Antonio Andelic](https://github.com/antonio2368)).
-* Add missing workload identity changes. [#65848](https://github.com/ClickHouse/ClickHouse/pull/65848) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Fix rocksdb. [#65858](https://github.com/ClickHouse/ClickHouse/pull/65858) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Update the list of easy tasks. [#65865](https://github.com/ClickHouse/ClickHouse/pull/65865) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Update CHANGELOG.md. [#65866](https://github.com/ClickHouse/ClickHouse/pull/65866) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* This closes [#43003](https://github.com/ClickHouse/ClickHouse/issues/43003). [#65870](https://github.com/ClickHouse/ClickHouse/pull/65870) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Uninteresting changes. [#65871](https://github.com/ClickHouse/ClickHouse/pull/65871) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Max sessions for user tests improvements. [#65888](https://github.com/ClickHouse/ClickHouse/pull/65888) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
-* Update version_date.tsv and changelogs after v24.6.1.4423-stable. [#65909](https://github.com/ClickHouse/ClickHouse/pull/65909) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Remove standalone Keeper build. [#65910](https://github.com/ClickHouse/ClickHouse/pull/65910) ([Antonio Andelic](https://github.com/antonio2368)).
-* Add extra profiling helpers for Keeper. [#65918](https://github.com/ClickHouse/ClickHouse/pull/65918) ([Antonio Andelic](https://github.com/antonio2368)).
-* PostgreSQL source cancel query comments. [#65919](https://github.com/ClickHouse/ClickHouse/pull/65919) ([Maksim Kita](https://github.com/kitaisreal)).
-* Remove mysqlxx::Pool::Entry assignment operator. [#65920](https://github.com/ClickHouse/ClickHouse/pull/65920) ([Azat Khuzhin](https://github.com/azat)).
-* No random settings for a test with `Object(JSON)`. [#65921](https://github.com/ClickHouse/ClickHouse/pull/65921) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Follow up to [#65046](https://github.com/ClickHouse/ClickHouse/issues/65046). [#65928](https://github.com/ClickHouse/ClickHouse/pull/65928) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* add restriction for storage join. [#65936](https://github.com/ClickHouse/ClickHouse/pull/65936) ([Han Fei](https://github.com/hanfei1991)).
-* Update version_date.tsv and changelogs after v24.5.4.49-stable. [#65937](https://github.com/ClickHouse/ClickHouse/pull/65937) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Add table name to MergeTreeSource spans. [#65940](https://github.com/ClickHouse/ClickHouse/pull/65940) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix SettingsChangesHistory 24.7. [#65945](https://github.com/ClickHouse/ClickHouse/pull/65945) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix logical error "Expected ReadBufferFromFile, but got DB::EmptyReadBuffer". [#65949](https://github.com/ClickHouse/ClickHouse/pull/65949) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Use -Og instead of -O0 for debug builds. [#65953](https://github.com/ClickHouse/ClickHouse/pull/65953) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fix data race for Keeper snapshot queue. [#65970](https://github.com/ClickHouse/ClickHouse/pull/65970) ([Antonio Andelic](https://github.com/antonio2368)).
-* Minor changes in CHANGELOG. [#65971](https://github.com/ClickHouse/ClickHouse/pull/65971) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Remove unnatural punctuation from Parquet. [#65972](https://github.com/ClickHouse/ClickHouse/pull/65972) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Try fix "Check timeout expired" without any server logs in report in stateless tests. [#65977](https://github.com/ClickHouse/ClickHouse/pull/65977) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix support of non-const scale arguments in rounding functions. [#65983](https://github.com/ClickHouse/ClickHouse/pull/65983) ([Mikhail Gorshkov](https://github.com/mgorshkov)).
-* More aesthetic error messages. [#65985](https://github.com/ClickHouse/ClickHouse/pull/65985) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix race in s3queue. [#65986](https://github.com/ClickHouse/ClickHouse/pull/65986) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Now it's possible to specify `s3-storage`, `azure-object-storage` and in general `object-storage`. [#65988](https://github.com/ClickHouse/ClickHouse/pull/65988) ([alesapin](https://github.com/alesapin)).
-* Fix flaky test_storage_s3_queue tests. [#66009](https://github.com/ClickHouse/ClickHouse/pull/66009) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Relax the check in 02982_aggregation_states_destruction. [#66011](https://github.com/ClickHouse/ClickHouse/pull/66011) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix `01158_zookeeper_log_long`. [#66012](https://github.com/ClickHouse/ClickHouse/pull/66012) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Remove scary jemalloc log. [#66028](https://github.com/ClickHouse/ClickHouse/pull/66028) ([Antonio Andelic](https://github.com/antonio2368)).
-* Move experimental settings to the experimental block. [#66030](https://github.com/ClickHouse/ClickHouse/pull/66030) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix lock-order-inversion in DatabaseCatalog. [#66038](https://github.com/ClickHouse/ClickHouse/pull/66038) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Try disabling jemalloc background threads. [#66041](https://github.com/ClickHouse/ClickHouse/pull/66041) ([Antonio Andelic](https://github.com/antonio2368)).
-* Try to avoid conflicts in `SettingsChangesHistory.cpp`. [#66042](https://github.com/ClickHouse/ClickHouse/pull/66042) ([Anton Popov](https://github.com/CurtizJ)).
-* Add profile events for regex cache. [#66050](https://github.com/ClickHouse/ClickHouse/pull/66050) ([Antonio Andelic](https://github.com/antonio2368)).
-* Bump vectorscan to 5.4.10.1. [#66056](https://github.com/ClickHouse/ClickHouse/pull/66056) ([Robert Schulze](https://github.com/rschu1ze)).
-* Remove obsolete comment. [#66059](https://github.com/ClickHouse/ClickHouse/pull/66059) ([Robert Schulze](https://github.com/rschu1ze)).
-* Maybe fix tsan assert in `test_mysql_killed_while_insert_8_0`. [#66064](https://github.com/ClickHouse/ClickHouse/pull/66064) ([Robert Schulze](https://github.com/rschu1ze)).
-* Move some of `HTTPHandler` stuff to separate source files in order to reuse it in `PrometheusRequestHandler`. This PR is required for https://github.com/ClickHouse/ClickHouse/pull/64183. [#66067](https://github.com/ClickHouse/ClickHouse/pull/66067) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Bump rocksdb to v6.23.3. [#66068](https://github.com/ClickHouse/ClickHouse/pull/66068) ([Robert Schulze](https://github.com/rschu1ze)).
-* Add protobufs for `Prometheus` `remote-write` / `remote-read` protocols to our repository. Fix cmake script for compiling protobufs. [#66069](https://github.com/ClickHouse/ClickHouse/pull/66069) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Use pinned versions of all python packages in CI docker images. Also makes clang-18.1.8 work with sanitizers and surprisingly fixes [#66049](https://github.com/ClickHouse/ClickHouse/issues/66049). [#66070](https://github.com/ClickHouse/ClickHouse/pull/66070) ([alesapin](https://github.com/alesapin)).
-* Clean-up custom LLVM 15 patches. [#66072](https://github.com/ClickHouse/ClickHouse/pull/66072) ([Robert Schulze](https://github.com/rschu1ze)).
-* Minor JWT client fixes. [#66073](https://github.com/ClickHouse/ClickHouse/pull/66073) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-* Bump vectorscan to 5.4.11. [#66082](https://github.com/ClickHouse/ClickHouse/pull/66082) ([Robert Schulze](https://github.com/rschu1ze)).
-* Print stacktrace in case of abort after logical error. [#66091](https://github.com/ClickHouse/ClickHouse/pull/66091) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* fix flaky 03172_error_log_table_not_empty. [#66093](https://github.com/ClickHouse/ClickHouse/pull/66093) ([Sema Checherinda](https://github.com/CheSema)).
-* Bump s2geometry to latest master. [#66094](https://github.com/ClickHouse/ClickHouse/pull/66094) ([Robert Schulze](https://github.com/rschu1ze)).
-* update keeper bench example config file. [#66095](https://github.com/ClickHouse/ClickHouse/pull/66095) ([Han Fei](https://github.com/hanfei1991)).
-* Avoid using source directory for generated files. [#66097](https://github.com/ClickHouse/ClickHouse/pull/66097) ([Azat Khuzhin](https://github.com/azat)).
-* More precise warning message about sanitizers. [#66098](https://github.com/ClickHouse/ClickHouse/pull/66098) ([Anton Popov](https://github.com/CurtizJ)).
-* Slightly better calculation of primary index. [#66099](https://github.com/ClickHouse/ClickHouse/pull/66099) ([Anton Popov](https://github.com/CurtizJ)).
-* Bump Azure to 1.12. [#66100](https://github.com/ClickHouse/ClickHouse/pull/66100) ([Robert Schulze](https://github.com/rschu1ze)).
-* Add a test for [#58998](https://github.com/ClickHouse/ClickHouse/issues/58998). [#66101](https://github.com/ClickHouse/ClickHouse/pull/66101) ([Anton Popov](https://github.com/CurtizJ)).
-* CI: Fix sync pr merge. [#66105](https://github.com/ClickHouse/ClickHouse/pull/66105) ([Max K.](https://github.com/maxknv)).
-* Remove flaky case from 02956_rocksdb_bulk_sink. [#66107](https://github.com/ClickHouse/ClickHouse/pull/66107) ([vdimir](https://github.com/vdimir)).
-* Fix bugfix checker. [#66120](https://github.com/ClickHouse/ClickHouse/pull/66120) ([Raúl Marín](https://github.com/Algunenano)).
-* Correctly print long processing requests in Keeper. [#66124](https://github.com/ClickHouse/ClickHouse/pull/66124) ([Antonio Andelic](https://github.com/antonio2368)).
-* Update version_date.tsv and changelogs after v24.6.2.17-stable. [#66127](https://github.com/ClickHouse/ClickHouse/pull/66127) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Bump s2geometry again. [#66136](https://github.com/ClickHouse/ClickHouse/pull/66136) ([Robert Schulze](https://github.com/rschu1ze)).
-* Switch submodule `contrib/orc` to a proper commit in the [main](https://github.com/ClickHouse/orc/tree/main) branch. Previously a commit from a removed branch was used ([see](https://github.com/ClickHouse/orc/pull/13)). [#66137](https://github.com/ClickHouse/ClickHouse/pull/66137) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Finalize MergedBlockOutputStream in dtor. [#66138](https://github.com/ClickHouse/ClickHouse/pull/66138) ([Nikita Taranov](https://github.com/nickitat)).
-* Proper destruction order of AsyncLoader::Pool fields. [#66145](https://github.com/ClickHouse/ClickHouse/pull/66145) ([Sergei Trifonov](https://github.com/serxa)).
-* Playing minesweeper with build system. [#66147](https://github.com/ClickHouse/ClickHouse/pull/66147) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix clang-tidy error in BufferWithOwnMemory.h. [#66161](https://github.com/ClickHouse/ClickHouse/pull/66161) ([Nikita Taranov](https://github.com/nickitat)).
-* Use peak_threads_usage instead of arrayUniq(thread_ids) in tests. [#66162](https://github.com/ClickHouse/ClickHouse/pull/66162) ([Azat Khuzhin](https://github.com/azat)).
-* Fix crash when adding empty tuple to query cache. [#66168](https://github.com/ClickHouse/ClickHouse/pull/66168) ([Michael Kolupaev](https://github.com/al13n321)).
-* tests: fix 01563_distributed_query_finish flakiness (due to system.*_log_sender). [#66171](https://github.com/ClickHouse/ClickHouse/pull/66171) ([Azat Khuzhin](https://github.com/azat)).
-* Refactor `OptimizeIfWithConstantConditionVisitor` using `InDepthNodeVisitor`. [#66184](https://github.com/ClickHouse/ClickHouse/pull/66184) ([zhongyuankai](https://github.com/zhongyuankai)).
-* Update README.md. [#66186](https://github.com/ClickHouse/ClickHouse/pull/66186) ([Tyler Hannan](https://github.com/tylerhannan)).
-* Fix 01246_buffer_flush flakiness. [#66188](https://github.com/ClickHouse/ClickHouse/pull/66188) ([Azat Khuzhin](https://github.com/azat)).
-* Avoid using harmful function `rand()` in grpc. [#66191](https://github.com/ClickHouse/ClickHouse/pull/66191) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Bump RocksDB. [#66216](https://github.com/ClickHouse/ClickHouse/pull/66216) ([Robert Schulze](https://github.com/rschu1ze)).
-* Update README.md. [#66217](https://github.com/ClickHouse/ClickHouse/pull/66217) ([Tyler Hannan](https://github.com/tylerhannan)).
-* Fixes peak_threads_usage metric when materialised views are involved. [#66230](https://github.com/ClickHouse/ClickHouse/pull/66230) ([Sema Checherinda](https://github.com/CheSema)).
-* Remove test as requested in https://github.com/ClickHouse/ClickHouse/pull/65277#issuecomment-2211361465. [#66233](https://github.com/ClickHouse/ClickHouse/pull/66233) ([Arthur Passos](https://github.com/arthurpassos)).
-* Fix test `00504_mergetree_arrays_rw.sql`. [#66248](https://github.com/ClickHouse/ClickHouse/pull/66248) ([Anton Popov](https://github.com/CurtizJ)).
-* CI: Do not finalize CI running status unless all success. [#66276](https://github.com/ClickHouse/ClickHouse/pull/66276) ([Max K.](https://github.com/maxknv)).
-* Collect core dumps in more tests. [#66281](https://github.com/ClickHouse/ClickHouse/pull/66281) ([Antonio Andelic](https://github.com/antonio2368)).
-* Add a stateless test for gRPC protocol. [#66284](https://github.com/ClickHouse/ClickHouse/pull/66284) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Log message: Failed to connect to replica ... [#66289](https://github.com/ClickHouse/ClickHouse/pull/66289) ([Igor Nikonov](https://github.com/devcrafter)).
-* Update run.sh. [#66290](https://github.com/ClickHouse/ClickHouse/pull/66290) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Some changes in the codebase as a preparation for LLVM 18. [#66293](https://github.com/ClickHouse/ClickHouse/pull/66293) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* There's some problem with iptables in parallel tests. [#66304](https://github.com/ClickHouse/ClickHouse/pull/66304) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Disable broken cases from 02911_join_on_nullsafe_optimization. [#66310](https://github.com/ClickHouse/ClickHouse/pull/66310) ([vdimir](https://github.com/vdimir)).
-* Build failure if ENABLE_AWS_S3 is OFF fixed. [#66335](https://github.com/ClickHouse/ClickHouse/pull/66335) ([Ilya Golshtein](https://github.com/ilejn)).
-* Enable checks in assert_cast under sanitizers. [#66336](https://github.com/ClickHouse/ClickHouse/pull/66336) ([Nikita Taranov](https://github.com/nickitat)).
-* Create release workflow. [#66339](https://github.com/ClickHouse/ClickHouse/pull/66339) ([Max K.](https://github.com/maxknv)).
-* Fix invalid XML. [#66342](https://github.com/ClickHouse/ClickHouse/pull/66342) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Fix possible deadlock for jemalloc with enabled profiler. [#66346](https://github.com/ClickHouse/ClickHouse/pull/66346) ([Azat Khuzhin](https://github.com/azat)).
-* Fix test_parallel_replicas_custom_key. [#66349](https://github.com/ClickHouse/ClickHouse/pull/66349) ([Antonio Andelic](https://github.com/antonio2368)).
-* Collect logs from `minio` in stateless and statefull tests. [#66353](https://github.com/ClickHouse/ClickHouse/pull/66353) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Fix "Sending a batch of X files to Y (0.00 rows, 0.00 B bytes)." in case of batch restoring. [#66375](https://github.com/ClickHouse/ClickHouse/pull/66375) ([Azat Khuzhin](https://github.com/azat)).
-* Fix 03030_system_flush_distributed_settings flakiness. [#66376](https://github.com/ClickHouse/ClickHouse/pull/66376) ([Azat Khuzhin](https://github.com/azat)).
-* PR cleanup: remove redundant code. [#66380](https://github.com/ClickHouse/ClickHouse/pull/66380) ([Igor Nikonov](https://github.com/devcrafter)).
-* New slack bot to post messages about CI events - Post message if OOM. [#66392](https://github.com/ClickHouse/ClickHouse/pull/66392) ([Max K.](https://github.com/maxknv)).
-* Ignore subquery for IN in DDLLoadingDependencyVisitor. [#66395](https://github.com/ClickHouse/ClickHouse/pull/66395) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Update test_storage_rabbitmq/test.py. [#66396](https://github.com/ClickHouse/ClickHouse/pull/66396) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Add query elapsed time for non-default format in play UI. [#66398](https://github.com/ClickHouse/ClickHouse/pull/66398) ([Azat Khuzhin](https://github.com/azat)).
-* Untangle setting headers. [#66404](https://github.com/ClickHouse/ClickHouse/pull/66404) ([Raúl Marín](https://github.com/Algunenano)).
-* Remove noisy message. [#66406](https://github.com/ClickHouse/ClickHouse/pull/66406) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* If job detected as in-progress in PR workflow run - just remove it from todo list, as it not affected by the change. [#66407](https://github.com/ClickHouse/ClickHouse/pull/66407) ([Max K.](https://github.com/maxknv)).
-* CI: CIBuddy to post from master only. [#66417](https://github.com/ClickHouse/ClickHouse/pull/66417) ([Max K.](https://github.com/maxknv)).
-* Add a test for [#66333](https://github.com/ClickHouse/ClickHouse/issues/66333). [#66432](https://github.com/ClickHouse/ClickHouse/pull/66432) ([max-vostrikov](https://github.com/max-vostrikov)).
-* Limit number of linker jobs on arm to avoid OOM during build. [#66435](https://github.com/ClickHouse/ClickHouse/pull/66435) ([Nikita Taranov](https://github.com/nickitat)).
-* [RFC] Fix jemalloc assertion due to non-monotonic CLOCK_MONOTONIC_COARSE. [#66439](https://github.com/ClickHouse/ClickHouse/pull/66439) ([Azat Khuzhin](https://github.com/azat)).
-* CI: Do not block CI on few number of test failures. [#66440](https://github.com/ClickHouse/ClickHouse/pull/66440) ([Max K.](https://github.com/maxknv)).
-* Stateless tests: fix flaky tests 01037_polygon_dicts*. [#66445](https://github.com/ClickHouse/ClickHouse/pull/66445) ([Nikita Fomichev](https://github.com/fm4v)).
-* Related to https://github.com/ClickHouse/ClickHouse/pull/62067 https://s3.amazonaws.com/clickhouse-test-reports/66410/5557dce188cabc7477bb4e874d47e3b80278ee66/stateless_tests__release_.html ``` 2024-07-12 16:04:29 +Queries for alter_table did not finish automatically after 250+ seconds 2024-07-12 16:04:29 +==================== QUERIES ==================== 2024-07-12 16:04:29 +Row 1: 2024-07-12 16:04:29 +────── 2024-07-12 16:04:29 +is_initial_query: 1 2024-07-12 16:04:29 +user: default 2024-07-12 16:04:29 +query_id: b43ffd7d-aee6-4161-aa82-bf9fff9d78c0 2024-07-12 16:04:29 +address: ::1 2024-07-12 16:04:29 +port: 58360 2024-07-12 16:04:29 +initial_user: default 2024-07-12 16:04:29 +initial_query_id: b43ffd7d-aee6-4161-aa82-bf9fff9d78c0 ... 2024-07-12 16:04:29 +query: OPTIMIZE TABLE alter_table0 FINAL ```. [#66460](https://github.com/ClickHouse/ClickHouse/pull/66460) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* OOM error was not visible since process is killed and status is not set Change sets ERROR status if job was killed. [#66463](https://github.com/ClickHouse/ClickHouse/pull/66463) ([Max K.](https://github.com/maxknv)).
-* Add AST fuzzers jobs for CI caching so that they can be skipped in PRs not related to build or tests. [#66468](https://github.com/ClickHouse/ClickHouse/pull/66468) ([Max K.](https://github.com/maxknv)).
-* If job with the same digest has been seen in master's CI it should be skipped in PR run. [#66471](https://github.com/ClickHouse/ClickHouse/pull/66471) ([Max K.](https://github.com/maxknv)).
-* CI: Check job's exit status and report if killed. [#66477](https://github.com/ClickHouse/ClickHouse/pull/66477) ([Max K.](https://github.com/maxknv)).
-* This closes [#37557](https://github.com/ClickHouse/ClickHouse/issues/37557). [#66482](https://github.com/ClickHouse/ClickHouse/pull/66482) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* CI: Add retry for GH set_status_comment call. [#66488](https://github.com/ClickHouse/ClickHouse/pull/66488) ([Max K.](https://github.com/maxknv)).
-* OpenSSL: Minor follow-up to [#66064](https://github.com/ClickHouse/ClickHouse/issues/66064). [#66489](https://github.com/ClickHouse/ClickHouse/pull/66489) ([Robert Schulze](https://github.com/rschu1ze)).
-* CI: Fix for job filtering in PRs. [#66490](https://github.com/ClickHouse/ClickHouse/pull/66490) ([Max K.](https://github.com/maxknv)).
-* CI: Create release workflow updates. [#66498](https://github.com/ClickHouse/ClickHouse/pull/66498) ([Max K.](https://github.com/maxknv)).
-* Add one more revision to ignore. [#66499](https://github.com/ClickHouse/ClickHouse/pull/66499) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Unit tests vomit a ton of garbage, see https://s3.amazonaws.com/clickhouse-test-reports/66457/0c82dc91f07b29ba503d7579c7d3ebecba532b73/unit_tests__tsan_/run.log - remove it. [#66501](https://github.com/ClickHouse/ClickHouse/pull/66501) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix double whitespace in EXPLAIN AST CREATE. [#66505](https://github.com/ClickHouse/ClickHouse/pull/66505) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix bad test `02530_dictionaries_update_field`. [#66507](https://github.com/ClickHouse/ClickHouse/pull/66507) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Https://play.clickhouse.com/play?user=play#u0vmrunuignozwnrx3n0yxj0x3rpbwusignozwnrx25hbwusihrlc3rfbmftzswgcmvwb3j0x3vybapguk9nignozwnrcwpxsevsrsbjagvja19zdgfydf90aw1lid49ig5vdygpic0gsu5urvjwquwgmjqwiehpvvikicagieforcbwdwxsx3jlcxvlc3rfbnvtymvyid0gmaogicagqu5eihrlc3rfc3rhdhvzice9icdts0lquevejwogicagqu5eihrlc3rfc3rhdhvziexjs0ugj0yljwogicagqu5eignozwnrx3n0yxr1cyahpsanc3vjy2vzcyckicagieforcbwb3npdglvbih0zxn0x25hbwusicdhcgfjagvfyxjyb3cnksa+idakt1jervigqlkgy2hly2tfc3rhcnrfdgltzq==. [#66508](https://github.com/ClickHouse/ClickHouse/pull/66508) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix MSan report in GRPC. [#66509](https://github.com/ClickHouse/ClickHouse/pull/66509) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* CI: Fix for skipping Builds_2 in PRs' CI. [#66512](https://github.com/ClickHouse/ClickHouse/pull/66512) ([Max K.](https://github.com/maxknv)).
-* CI: Do not block Tests_3 unless MAX_FAILED_TESTS exceeded. [#66513](https://github.com/ClickHouse/ClickHouse/pull/66513) ([Max K.](https://github.com/maxknv)).
-* Fix `02918_parallel_replicas_custom_key_unavailable_replica`. [#66516](https://github.com/ClickHouse/ClickHouse/pull/66516) ([Antonio Andelic](https://github.com/antonio2368)).
-* Stateless tests: improvements related to OOM of test runs. [#66520](https://github.com/ClickHouse/ClickHouse/pull/66520) ([Nikita Fomichev](https://github.com/fm4v)).
-* Tests: rename bad log names. [#66522](https://github.com/ClickHouse/ClickHouse/pull/66522) ([Nikita Fomichev](https://github.com/fm4v)).
-* Add additional log masking in CI. [#66523](https://github.com/ClickHouse/ClickHouse/pull/66523) ([Raúl Marín](https://github.com/Algunenano)).
-* CI: Multiple fixes for handling killed jobs. [#66524](https://github.com/ClickHouse/ClickHouse/pull/66524) ([Max K.](https://github.com/maxknv)).
-* Allow GWP Asan allocations only when initialization is finished. [#66526](https://github.com/ClickHouse/ClickHouse/pull/66526) ([Alexey Katsman](https://github.com/alexkats)).
-* Update 02443_detach_attach_partition.sh. [#66529](https://github.com/ClickHouse/ClickHouse/pull/66529) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Follow up [#66435](https://github.com/ClickHouse/ClickHouse/issues/66435). [#66530](https://github.com/ClickHouse/ClickHouse/pull/66530) ([Nikita Taranov](https://github.com/nickitat)).
-* fix log in keeper tcp handler. [#66531](https://github.com/ClickHouse/ClickHouse/pull/66531) ([Han Fei](https://github.com/hanfei1991)).
-* CI: Report job start and finish to CI DB. [#66533](https://github.com/ClickHouse/ClickHouse/pull/66533) ([Max K.](https://github.com/maxknv)).
-* Update 01396_inactive_replica_cleanup_nodes_zookeeper.sh. [#66535](https://github.com/ClickHouse/ClickHouse/pull/66535) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Add dedicated runner to libfuzzer, update docker. [#66551](https://github.com/ClickHouse/ClickHouse/pull/66551) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* fix tidy build. [#66552](https://github.com/ClickHouse/ClickHouse/pull/66552) ([Sema Checherinda](https://github.com/CheSema)).
-* No-op env change. [#66553](https://github.com/ClickHouse/ClickHouse/pull/66553) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix typo in new_delete.cpp. [#66554](https://github.com/ClickHouse/ClickHouse/pull/66554) ([alesapin](https://github.com/alesapin)).
-* Fix something in Fast Test. [#66558](https://github.com/ClickHouse/ClickHouse/pull/66558) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* update trusted contributors. [#66561](https://github.com/ClickHouse/ClickHouse/pull/66561) ([Xu Jia](https://github.com/XuJia0210)).
-* Delete bad test `02805_distributed_queries_timeouts`. [#66563](https://github.com/ClickHouse/ClickHouse/pull/66563) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* More clarity in the test `03001_consider_lwd_when_merge`. [#66564](https://github.com/ClickHouse/ClickHouse/pull/66564) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Stateless tests: temporary disable sequential tests in parallel. [#66585](https://github.com/ClickHouse/ClickHouse/pull/66585) ([Nikita Fomichev](https://github.com/fm4v)).
-* Move view targets to separate AST class `ASTViewTargets` in order to allow extending it to support more kinds of view targets. [#66590](https://github.com/ClickHouse/ClickHouse/pull/66590) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix bsdtar for @nikitamikhaylov. [#66592](https://github.com/ClickHouse/ClickHouse/pull/66592) ([alesapin](https://github.com/alesapin)).
-* CI: POC for Auto Releases. [#66593](https://github.com/ClickHouse/ClickHouse/pull/66593) ([Max K.](https://github.com/maxknv)).
-* Fix clang tidy after [#66402](https://github.com/ClickHouse/ClickHouse/issues/66402). [#66597](https://github.com/ClickHouse/ClickHouse/pull/66597) ([vdimir](https://github.com/vdimir)).
-* Adjust the runtime of some slow performance test. [#66619](https://github.com/ClickHouse/ClickHouse/pull/66619) ([Robert Schulze](https://github.com/rschu1ze)).
-* CI: Scale down AutoScaling Groups from runners. [#66622](https://github.com/ClickHouse/ClickHouse/pull/66622) ([Max K.](https://github.com/maxknv)).
-* Allow to run clang-tidy with clang-19. [#66625](https://github.com/ClickHouse/ClickHouse/pull/66625) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix terrible test @arthurpassos. [#66632](https://github.com/ClickHouse/ClickHouse/pull/66632) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix bad log message. [#66633](https://github.com/ClickHouse/ClickHouse/pull/66633) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Negative sign in prewhere optimization. [#66637](https://github.com/ClickHouse/ClickHouse/pull/66637) ([cangyin](https://github.com/cangyin)).
-* Closes [#66639](https://github.com/ClickHouse/ClickHouse/issues/66639#event-13533944949). [#66640](https://github.com/ClickHouse/ClickHouse/pull/66640) ([Kruglov Pavel](https://github.com/Avogar)).
-* Avoid generating named tuple for special keywords (null, true, false). [#66641](https://github.com/ClickHouse/ClickHouse/pull/66641) ([Amos Bird](https://github.com/amosbird)).
-* rearrange heavy tests 03008_deduplication. [#66642](https://github.com/ClickHouse/ClickHouse/pull/66642) ([Sema Checherinda](https://github.com/CheSema)).
-* Fix data race in S3::ClientCache. [#66644](https://github.com/ClickHouse/ClickHouse/pull/66644) ([Konstantin Morozov](https://github.com/k-morozov)).
-* CI: Remove aws lambda packages from oss. [#66651](https://github.com/ClickHouse/ClickHouse/pull/66651) ([Max K.](https://github.com/maxknv)).
-* Introduce separate DEBUG_OR_SANITIZER_BUILD macro. [#66652](https://github.com/ClickHouse/ClickHouse/pull/66652) ([Nikita Taranov](https://github.com/nickitat)).
-* Increase backoff because with slow builds sometimes 100ms is not enough to recover. [#66653](https://github.com/ClickHouse/ClickHouse/pull/66653) ([alesapin](https://github.com/alesapin)).
-* Fix wrong queries hung error because of 02044_url_glob_parallel_connection_refused. [#66657](https://github.com/ClickHouse/ClickHouse/pull/66657) ([Nikita Taranov](https://github.com/nickitat)).
-* add log for splitBlockIntoParts. [#66658](https://github.com/ClickHouse/ClickHouse/pull/66658) ([Han Fei](https://github.com/hanfei1991)).
-* Minor: Make `CaseSensitiveness` an enum class. [#66673](https://github.com/ClickHouse/ClickHouse/pull/66673) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix bad test `02210_processors_profile_log`. [#66684](https://github.com/ClickHouse/ClickHouse/pull/66684) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix something around clang-tidy. [#66694](https://github.com/ClickHouse/ClickHouse/pull/66694) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* ci: dump dmesg in case of OOM. [#66705](https://github.com/ClickHouse/ClickHouse/pull/66705) ([Azat Khuzhin](https://github.com/azat)).
-* fix clang tidy. [#66706](https://github.com/ClickHouse/ClickHouse/pull/66706) ([Han Fei](https://github.com/hanfei1991)).
-* Https://s3.amazonaws.com/clickhouse-test-reports/61109/5cf2b53f146c1a4f24d8212f9f810d587c46bfc0/stateless_tests__release_.html. [#66724](https://github.com/ClickHouse/ClickHouse/pull/66724) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Support one more case in JOIN ON ... IS NULL. [#66725](https://github.com/ClickHouse/ClickHouse/pull/66725) ([vdimir](https://github.com/vdimir)).
-* CI: Fix issue with a skipped Build report. [#66726](https://github.com/ClickHouse/ClickHouse/pull/66726) ([Max K.](https://github.com/maxknv)).
-* relax condition in test, remove unused counters. [#66730](https://github.com/ClickHouse/ClickHouse/pull/66730) ([Sema Checherinda](https://github.com/CheSema)).
-* Remove bad test `host_resolver_fail_count`. [#66731](https://github.com/ClickHouse/ClickHouse/pull/66731) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix bad test `03036_join_filter_push_down_equivalent_sets`. [#66736](https://github.com/ClickHouse/ClickHouse/pull/66736) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix bad tests `long_select_and_alter`. [#66737](https://github.com/ClickHouse/ClickHouse/pull/66737) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add test test_storage_mysql/test.py::test_joins. [#66743](https://github.com/ClickHouse/ClickHouse/pull/66743) ([vdimir](https://github.com/vdimir)).
-* Disallow build exclusion only by CI settings (ci_include_, ci_exclude_) to avoid running builds in auto sync prs. [#66744](https://github.com/ClickHouse/ClickHouse/pull/66744) ([Max K.](https://github.com/maxknv)).
-* Use non-existent address to check connection error at table creation. [#66760](https://github.com/ClickHouse/ClickHouse/pull/66760) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#67063](https://github.com/ClickHouse/ClickHouse/issues/67063): Increase asio pool size in case the server is tiny. [#66761](https://github.com/ClickHouse/ClickHouse/pull/66761) ([alesapin](https://github.com/alesapin)).
-* Fix flakiness of async insert tests due to adaptive timeout. [#66771](https://github.com/ClickHouse/ClickHouse/pull/66771) ([Raúl Marín](https://github.com/Algunenano)).
-* Attempt to fix flakiness of 01194_http_query_id. [#66774](https://github.com/ClickHouse/ClickHouse/pull/66774) ([Raúl Marín](https://github.com/Algunenano)).
-* Turn off randomization of harmful setting. [#66776](https://github.com/ClickHouse/ClickHouse/pull/66776) ([alesapin](https://github.com/alesapin)).
-* The number of batches was reduced in https://github.com/ClickHouse/ClickHouse/pull/65186, but then the parallel execution was disabled in https://github.com/ClickHouse/ClickHouse/pull/66585. So now tasks fail with timeout sometimes: https://s3.amazonaws.com/clickhouse-test-reports/66724/36275fdacc34206931f69087fe77539e25bbbedd/stateless_tests__tsan__s3_storage__[2_3].html. [#66783](https://github.com/ClickHouse/ClickHouse/pull/66783) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Remove obsolete code from CMakeLists. [#66786](https://github.com/ClickHouse/ClickHouse/pull/66786) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Stateless tests: split parallel tests more evenly. [#66787](https://github.com/ClickHouse/ClickHouse/pull/66787) ([Nikita Fomichev](https://github.com/fm4v)).
-* Fix test `02724_limit_num_mutations.sh`. [#66788](https://github.com/ClickHouse/ClickHouse/pull/66788) ([Anton Popov](https://github.com/CurtizJ)).
-* Better diagnostics in `test_disk_configuration`. [#66802](https://github.com/ClickHouse/ClickHouse/pull/66802) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix bad test `02950_part_log_bytes_uncompressed`. [#66803](https://github.com/ClickHouse/ClickHouse/pull/66803) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Better diagnostics for test trace_events_stress. [#66804](https://github.com/ClickHouse/ClickHouse/pull/66804) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Make test `00997_set_index_array` lighter. [#66817](https://github.com/ClickHouse/ClickHouse/pull/66817) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Miscellaneous. [#66818](https://github.com/ClickHouse/ClickHouse/pull/66818) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix inconsistent formatting of lambda functions inside composite types. [#66819](https://github.com/ClickHouse/ClickHouse/pull/66819) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Small fix in realloc memory tracking. [#66820](https://github.com/ClickHouse/ClickHouse/pull/66820) ([Antonio Andelic](https://github.com/antonio2368)).
-* Never await in CI on BuildReport - just redo (await can be longer) - Remove BuildReport if no build jobs in workflow (for instance: Docs change) - Do not fail CheckReadyForMerge job if the only non-green status is Cloud Sync. [#66822](https://github.com/ClickHouse/ClickHouse/pull/66822) ([Max K.](https://github.com/maxknv)).
-* Remove bad tests @azat. [#66823](https://github.com/ClickHouse/ClickHouse/pull/66823) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* CI: New Release workflow updates and fixes. [#66830](https://github.com/ClickHouse/ClickHouse/pull/66830) ([Max K.](https://github.com/maxknv)).
-* Fix signed integer overflow in function `age`. [#66831](https://github.com/ClickHouse/ClickHouse/pull/66831) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix RocksDB bs. [#66838](https://github.com/ClickHouse/ClickHouse/pull/66838) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Split a test for index. [#66839](https://github.com/ClickHouse/ClickHouse/pull/66839) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix inconsistent formatting of `NOT ((SELECT ...))`. [#66840](https://github.com/ClickHouse/ClickHouse/pull/66840) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Make test `01592_long_window_functions1` lighter. [#66841](https://github.com/ClickHouse/ClickHouse/pull/66841) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* What if I will change the test for SSL authentication?. [#66844](https://github.com/ClickHouse/ClickHouse/pull/66844) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Functions `[a-g]*`: Iterate over `input_rows_count` where appropriate. [#66846](https://github.com/ClickHouse/ClickHouse/pull/66846) ([Robert Schulze](https://github.com/rschu1ze)).
-* Revert libunwind patch. [#66850](https://github.com/ClickHouse/ClickHouse/pull/66850) ([Antonio Andelic](https://github.com/antonio2368)).
-* Split test 03038_nested_dynamic_merges to avoid timeouts. [#66863](https://github.com/ClickHouse/ClickHouse/pull/66863) ([Kruglov Pavel](https://github.com/Avogar)).
-* CI: Print instance info in runner's init script. [#66868](https://github.com/ClickHouse/ClickHouse/pull/66868) ([Max K.](https://github.com/maxknv)).
-* Backported in [#67257](https://github.com/ClickHouse/ClickHouse/issues/67257): Followup [#66725](https://github.com/ClickHouse/ClickHouse/issues/66725). [#66869](https://github.com/ClickHouse/ClickHouse/pull/66869) ([vdimir](https://github.com/vdimir)).
-* CI: CI Buddy to notify about fatal workflow failures. [#66890](https://github.com/ClickHouse/ClickHouse/pull/66890) ([Max K.](https://github.com/maxknv)).
-* CI: Add ec2 instance lifecycle metadata to CIDB. [#66918](https://github.com/ClickHouse/ClickHouse/pull/66918) ([Max K.](https://github.com/maxknv)).
-* CI: Remove ci runners scripts from oss. [#66920](https://github.com/ClickHouse/ClickHouse/pull/66920) ([Max K.](https://github.com/maxknv)).
-* Backported in [#67209](https://github.com/ClickHouse/ClickHouse/issues/67209): Decrease rate limit in `01923_network_receive_time_metric_insert`. [#66924](https://github.com/ClickHouse/ClickHouse/pull/66924) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#67227](https://github.com/ClickHouse/ClickHouse/issues/67227): Grouparrayintersect: fix serialization bug. [#66928](https://github.com/ClickHouse/ClickHouse/pull/66928) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#67207](https://github.com/ClickHouse/ClickHouse/issues/67207): Un-flake test_runtime_configurable_cache_size. [#66934](https://github.com/ClickHouse/ClickHouse/pull/66934) ([Robert Schulze](https://github.com/rschu1ze)).
-* Backported in [#66975](https://github.com/ClickHouse/ClickHouse/issues/66975): CI: Fixes docker server build for release branches. [#66955](https://github.com/ClickHouse/ClickHouse/pull/66955) ([Max K.](https://github.com/maxknv)).
-* Backported in [#67213](https://github.com/ClickHouse/ClickHouse/issues/67213): [CI Fest] Split dynamic tests and rewrite them from sh to sql to avoid timeouts. [#66981](https://github.com/ClickHouse/ClickHouse/pull/66981) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67033](https://github.com/ClickHouse/ClickHouse/issues/67033): [CI Fest] Fix use-of-uninitialized-value in JSONExtract* numeric functions. [#66984](https://github.com/ClickHouse/ClickHouse/pull/66984) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67051](https://github.com/ClickHouse/ClickHouse/issues/67051): CI: Fix for workflow results parsing. [#67000](https://github.com/ClickHouse/ClickHouse/pull/67000) ([Max K.](https://github.com/maxknv)).
-* Backported in [#67116](https://github.com/ClickHouse/ClickHouse/issues/67116): Disable setting `optimize_functions_to_subcolumns`. [#67046](https://github.com/ClickHouse/ClickHouse/pull/67046) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#67205](https://github.com/ClickHouse/ClickHouse/issues/67205): Increase max allocation size for sanitizers. [#67049](https://github.com/ClickHouse/ClickHouse/pull/67049) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#67124](https://github.com/ClickHouse/ClickHouse/issues/67124): Very sad failure: ``` 2024.07.24 13:28:45.517777 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> executeQuery: (from 172.16.11.1:55890) OPTIMIZE TABLE replicated_mt FINAL (stage: Complete) 2024.07.24 13:28:45.525945 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Trace> default.replicated_mt (ReplicatedMergeTreeQueue): Waiting for 4 entries to be processed: queue-0000000004, queue-0000000002, queue-0000000001, queue-0000000000 2024.07.24 13:29:15.528024 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e) (MergerMutator): Selected 3 parts from all_0_0_0 to all_2_2_0 2024.07.24 13:29:15.530736 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Trace> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e): Created log entry /clickhouse/tables/replicated_mt/log/log-0000000004 for merge all_0_2_1 2024.07.24 13:29:15.530873 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e): Waiting for node1 to process log entry 2024.07.24 13:29:15.530919 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e): Waiting for node1 to pull log-0000000004 to queue 2024.07.24 13:29:15.534286 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e): Looking for node corresponding to log-0000000004 in node1 queue 2024.07.24 13:29:15.534793 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e): Waiting for queue-0000000005 to disappear from node1 queue 2024.07.24 13:29:15.585533 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> TCPHandler: Processed in 30.067804125 sec. ```. [#67067](https://github.com/ClickHouse/ClickHouse/pull/67067) ([alesapin](https://github.com/alesapin)).
-* Backported in [#67203](https://github.com/ClickHouse/ClickHouse/issues/67203): Fix flaky `test_seekable_formats_url` and `test_seekable_formats` S3 storage tests. [#67070](https://github.com/ClickHouse/ClickHouse/pull/67070) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#67222](https://github.com/ClickHouse/ClickHouse/issues/67222): Fix 2680 flasky. [#67078](https://github.com/ClickHouse/ClickHouse/pull/67078) ([jsc0218](https://github.com/jsc0218)).
-* Backported in [#67190](https://github.com/ClickHouse/ClickHouse/issues/67190): Attempt to fix flakiness of some window view tests. [#67130](https://github.com/ClickHouse/ClickHouse/pull/67130) ([Robert Schulze](https://github.com/rschu1ze)).
-* Backported in [#67272](https://github.com/ClickHouse/ClickHouse/issues/67272): Rename (unreleased) bad setting. [#67149](https://github.com/ClickHouse/ClickHouse/pull/67149) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#67441](https://github.com/ClickHouse/ClickHouse/issues/67441): Try to fix 2572. [#67158](https://github.com/ClickHouse/ClickHouse/pull/67158) ([jsc0218](https://github.com/jsc0218)).
-* Backported in [#67416](https://github.com/ClickHouse/ClickHouse/issues/67416): CI: Fix build results for release branches. [#67402](https://github.com/ClickHouse/ClickHouse/pull/67402) ([Max K.](https://github.com/maxknv)).
-
diff --git a/docs/changelogs/v24.7.2.13-stable.md b/docs/changelogs/v24.7.2.13-stable.md
deleted file mode 100644
index 4a2fb665116..00000000000
--- a/docs/changelogs/v24.7.2.13-stable.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.7.2.13-stable (6e41f601b2f) FIXME as compared to v24.7.1.2915-stable (a37d2d43da7)
-
-#### Improvement
-* Backported in [#67531](https://github.com/ClickHouse/ClickHouse/issues/67531): In pr : https://github.com/ClickHouse/ClickHouse/pull/66025, we introduce a settings `input_format_orc_read_use_writer_time_zone` to fix when read orc file, make the reader use writer timezone, not always use `GMT`. [#67175](https://github.com/ClickHouse/ClickHouse/pull/67175) ([kevinyhzou](https://github.com/KevinyhZou)).
-
-#### Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)
-* Backported in [#67505](https://github.com/ClickHouse/ClickHouse/issues/67505): Fix crash in DistributedAsyncInsert when connection is empty. [#67219](https://github.com/ClickHouse/ClickHouse/pull/67219) ([Pablo Marcos](https://github.com/pamarcos)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#67580](https://github.com/ClickHouse/ClickHouse/issues/67580): Fix execution of nested short-circuit functions. [#67520](https://github.com/ClickHouse/ClickHouse/pull/67520) ([Kruglov Pavel](https://github.com/Avogar)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#67551](https://github.com/ClickHouse/ClickHouse/issues/67551): [Green CI] Fix test test_storage_s3_queue/test.py::test_max_set_age. [#67035](https://github.com/ClickHouse/ClickHouse/pull/67035) ([Pablo Marcos](https://github.com/pamarcos)).
-* Backported in [#67514](https://github.com/ClickHouse/ClickHouse/issues/67514): Split test 02967_parallel_replicas_join_algo_and_analyzer. [#67211](https://github.com/ClickHouse/ClickHouse/pull/67211) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#67545](https://github.com/ClickHouse/ClickHouse/issues/67545): [Green CI] Fix WriteBuffer destructor when finalize has failed for MergeTreeDeduplicationLog::shutdown. [#67474](https://github.com/ClickHouse/ClickHouse/pull/67474) ([Alexey Katsman](https://github.com/alexkats)).
-
diff --git a/docs/changelogs/v24.7.3.42-stable.md b/docs/changelogs/v24.7.3.42-stable.md
deleted file mode 100644
index 48f6e301f3c..00000000000
--- a/docs/changelogs/v24.7.3.42-stable.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.7.3.42-stable (63730bc4293) FIXME as compared to v24.7.2.13-stable (6e41f601b2f)
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#67969](https://github.com/ClickHouse/ClickHouse/issues/67969): Fixed reading of subcolumns after `ALTER ADD COLUMN` query. [#66243](https://github.com/ClickHouse/ClickHouse/pull/66243) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#67637](https://github.com/ClickHouse/ClickHouse/issues/67637): Fix for occasional deadlock in Context::getDDLWorker. [#66843](https://github.com/ClickHouse/ClickHouse/pull/66843) ([Alexander Gololobov](https://github.com/davenger)).
-* Backported in [#67820](https://github.com/ClickHouse/ClickHouse/issues/67820): Fix possible deadlock on query cancel with parallel replicas. [#66905](https://github.com/ClickHouse/ClickHouse/pull/66905) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#67881](https://github.com/ClickHouse/ClickHouse/issues/67881): Correctly parse file name/URI containing `::` if it's not an archive. [#67433](https://github.com/ClickHouse/ClickHouse/pull/67433) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#67713](https://github.com/ClickHouse/ClickHouse/issues/67713): Fix reloading SQL UDFs with UNION. Previously, restarting the server could make UDF invalid. [#67665](https://github.com/ClickHouse/ClickHouse/pull/67665) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#67995](https://github.com/ClickHouse/ClickHouse/issues/67995): Validate experimental/suspicious data types in ALTER ADD/MODIFY COLUMN. [#67911](https://github.com/ClickHouse/ClickHouse/pull/67911) ([Kruglov Pavel](https://github.com/Avogar)).
-
-#### Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)
-
-* Backported in [#67818](https://github.com/ClickHouse/ClickHouse/issues/67818): Only relevant to the experimental Variant data type. Fix crash with Variant + AggregateFunction type. [#67122](https://github.com/ClickHouse/ClickHouse/pull/67122) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67766](https://github.com/ClickHouse/ClickHouse/issues/67766): Fix crash of `uniq` and `uniqTheta ` with `tuple()` argument. Closes [#67303](https://github.com/ClickHouse/ClickHouse/issues/67303). [#67306](https://github.com/ClickHouse/ClickHouse/pull/67306) ([flynn](https://github.com/ucasfl)).
-* Backported in [#67854](https://github.com/ClickHouse/ClickHouse/issues/67854): Fixes [#66026](https://github.com/ClickHouse/ClickHouse/issues/66026). Avoid unresolved table function arguments traversal in `ReplaceTableNodeToDummyVisitor`. [#67522](https://github.com/ClickHouse/ClickHouse/pull/67522) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#67840](https://github.com/ClickHouse/ClickHouse/issues/67840): Fix potential stack overflow in `JSONMergePatch` function. Renamed this function from `jsonMergePatch` to `JSONMergePatch` because the previous name was wrong. The previous name is still kept for compatibility. Improved diagnostic of errors in the function. This closes [#67304](https://github.com/ClickHouse/ClickHouse/issues/67304). [#67756](https://github.com/ClickHouse/ClickHouse/pull/67756) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#67518](https://github.com/ClickHouse/ClickHouse/issues/67518): Split slow test 03036_dynamic_read_subcolumns. [#66954](https://github.com/ClickHouse/ClickHouse/pull/66954) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#67516](https://github.com/ClickHouse/ClickHouse/issues/67516): Split 01508_partition_pruning_long. [#66983](https://github.com/ClickHouse/ClickHouse/pull/66983) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#67529](https://github.com/ClickHouse/ClickHouse/issues/67529): Reduce max time of 00763_long_lock_buffer_alter_destination_table. [#67185](https://github.com/ClickHouse/ClickHouse/pull/67185) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#67643](https://github.com/ClickHouse/ClickHouse/issues/67643): [Green CI] Fix potentially flaky test_mask_sensitive_info integration test. [#67506](https://github.com/ClickHouse/ClickHouse/pull/67506) ([Alexey Katsman](https://github.com/alexkats)).
-* Backported in [#67609](https://github.com/ClickHouse/ClickHouse/issues/67609): Fix test_zookeeper_config_load_balancing after adding the xdist worker name to the instance. [#67590](https://github.com/ClickHouse/ClickHouse/pull/67590) ([Pablo Marcos](https://github.com/pamarcos)).
-* Backported in [#67871](https://github.com/ClickHouse/ClickHouse/issues/67871): Fix 02434_cancel_insert_when_client_dies. [#67600](https://github.com/ClickHouse/ClickHouse/pull/67600) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67704](https://github.com/ClickHouse/ClickHouse/issues/67704): Fix 02910_bad_logs_level_in_local in fast tests. [#67603](https://github.com/ClickHouse/ClickHouse/pull/67603) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#67689](https://github.com/ClickHouse/ClickHouse/issues/67689): Fix 01605_adaptive_granularity_block_borders. [#67605](https://github.com/ClickHouse/ClickHouse/pull/67605) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#67827](https://github.com/ClickHouse/ClickHouse/issues/67827): Try fix 03143_asof_join_ddb_long. [#67620](https://github.com/ClickHouse/ClickHouse/pull/67620) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#67892](https://github.com/ClickHouse/ClickHouse/issues/67892): Revert "Merge pull request [#66510](https://github.com/ClickHouse/ClickHouse/issues/66510) from canhld94/fix_trivial_count_non_deterministic_func". [#67800](https://github.com/ClickHouse/ClickHouse/pull/67800) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-
diff --git a/docs/changelogs/v24.7.3.47-stable.md b/docs/changelogs/v24.7.3.47-stable.md
deleted file mode 100644
index e5f23a70fe1..00000000000
--- a/docs/changelogs/v24.7.3.47-stable.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.7.3.47-stable (2e50fe27a14) FIXME as compared to v24.7.2.13-stable (6e41f601b2f)
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#68232](https://github.com/ClickHouse/ClickHouse/issues/68232): Fixed `Not-ready Set` in some system tables when filtering using subqueries. [#66018](https://github.com/ClickHouse/ClickHouse/pull/66018) ([Michael Kolupaev](https://github.com/al13n321)).
-* Backported in [#67969](https://github.com/ClickHouse/ClickHouse/issues/67969): Fixed reading of subcolumns after `ALTER ADD COLUMN` query. [#66243](https://github.com/ClickHouse/ClickHouse/pull/66243) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#68068](https://github.com/ClickHouse/ClickHouse/issues/68068): Fix boolean literals in query sent to external database (for engines like `PostgreSQL`). [#66282](https://github.com/ClickHouse/ClickHouse/pull/66282) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67637](https://github.com/ClickHouse/ClickHouse/issues/67637): Fix for occasional deadlock in Context::getDDLWorker. [#66843](https://github.com/ClickHouse/ClickHouse/pull/66843) ([Alexander Gololobov](https://github.com/davenger)).
-* Backported in [#67820](https://github.com/ClickHouse/ClickHouse/issues/67820): Fix possible deadlock on query cancel with parallel replicas. [#66905](https://github.com/ClickHouse/ClickHouse/pull/66905) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#67818](https://github.com/ClickHouse/ClickHouse/issues/67818): Only relevant to the experimental Variant data type. Fix crash with Variant + AggregateFunction type. [#67122](https://github.com/ClickHouse/ClickHouse/pull/67122) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67766](https://github.com/ClickHouse/ClickHouse/issues/67766): Fix crash of `uniq` and `uniqTheta ` with `tuple()` argument. Closes [#67303](https://github.com/ClickHouse/ClickHouse/issues/67303). [#67306](https://github.com/ClickHouse/ClickHouse/pull/67306) ([flynn](https://github.com/ucasfl)).
-* Backported in [#67881](https://github.com/ClickHouse/ClickHouse/issues/67881): Correctly parse file name/URI containing `::` if it's not an archive. [#67433](https://github.com/ClickHouse/ClickHouse/pull/67433) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#68613](https://github.com/ClickHouse/ClickHouse/issues/68613): Fixes [#66026](https://github.com/ClickHouse/ClickHouse/issues/66026). Avoid unresolved table function arguments traversal in `ReplaceTableNodeToDummyVisitor`. [#67522](https://github.com/ClickHouse/ClickHouse/pull/67522) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#67854](https://github.com/ClickHouse/ClickHouse/issues/67854): Fixes [#66026](https://github.com/ClickHouse/ClickHouse/issues/66026). Avoid unresolved table function arguments traversal in `ReplaceTableNodeToDummyVisitor`. [#67522](https://github.com/ClickHouse/ClickHouse/pull/67522) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#68278](https://github.com/ClickHouse/ClickHouse/issues/68278): Fix inserting into stream like engines (Kafka, RabbitMQ, NATS) through HTTP interface. [#67554](https://github.com/ClickHouse/ClickHouse/pull/67554) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#68040](https://github.com/ClickHouse/ClickHouse/issues/68040): Fix creation of view with recursive CTE. [#67587](https://github.com/ClickHouse/ClickHouse/pull/67587) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Backported in [#68038](https://github.com/ClickHouse/ClickHouse/issues/68038): Fix crash on `percent_rank`. `percent_rank`'s default frame type is changed to `range unbounded preceding and unbounded following`. `IWindowFunction`'s default window frame is considered and now window functions without window frame definition in sql can be put into different `WindowTransfomer`s properly. [#67661](https://github.com/ClickHouse/ClickHouse/pull/67661) ([lgbo](https://github.com/lgbo-ustc)).
-* Backported in [#67713](https://github.com/ClickHouse/ClickHouse/issues/67713): Fix reloading SQL UDFs with UNION. Previously, restarting the server could make UDF invalid. [#67665](https://github.com/ClickHouse/ClickHouse/pull/67665) ([Antonio Andelic](https://github.com/antonio2368)).
-* Backported in [#67840](https://github.com/ClickHouse/ClickHouse/issues/67840): Fix potential stack overflow in `JSONMergePatch` function. Renamed this function from `jsonMergePatch` to `JSONMergePatch` because the previous name was wrong. The previous name is still kept for compatibility. Improved diagnostic of errors in the function. This closes [#67304](https://github.com/ClickHouse/ClickHouse/issues/67304). [#67756](https://github.com/ClickHouse/ClickHouse/pull/67756) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Backported in [#67995](https://github.com/ClickHouse/ClickHouse/issues/67995): Validate experimental/suspicious data types in ALTER ADD/MODIFY COLUMN. [#67911](https://github.com/ClickHouse/ClickHouse/pull/67911) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68224](https://github.com/ClickHouse/ClickHouse/issues/68224): Fix wrong `count()` result when there is non-deterministic function in predicate. [#67922](https://github.com/ClickHouse/ClickHouse/pull/67922) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#68095](https://github.com/ClickHouse/ClickHouse/issues/68095): Fixed the calculation of the maximum thread soft limit in containerized environments where the usable CPU count is limited. [#67963](https://github.com/ClickHouse/ClickHouse/pull/67963) ([Robert Schulze](https://github.com/rschu1ze)).
-* Backported in [#68126](https://github.com/ClickHouse/ClickHouse/issues/68126): Fixed skipping of untouched parts in mutations with new analyzer. Previously with enabled analyzer data in part could be rewritten by mutation even if mutation doesn't affect this part according to predicate. [#68052](https://github.com/ClickHouse/ClickHouse/pull/68052) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#68223](https://github.com/ClickHouse/ClickHouse/issues/68223): Fixed a NULL pointer dereference, triggered by a specially crafted query, that crashed the server via hopEnd, hopStart, tumbleEnd, and tumbleStart. [#68098](https://github.com/ClickHouse/ClickHouse/pull/68098) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Backported in [#68175](https://github.com/ClickHouse/ClickHouse/issues/68175): Removes an incorrect optimization to remove sorting in subqueries that use `OFFSET`. Fixes [#67906](https://github.com/ClickHouse/ClickHouse/issues/67906). [#68099](https://github.com/ClickHouse/ClickHouse/pull/68099) ([Graham Campbell](https://github.com/GrahamCampbell)).
-* Backported in [#68341](https://github.com/ClickHouse/ClickHouse/issues/68341): Try fix postgres crash when query is cancelled. [#68288](https://github.com/ClickHouse/ClickHouse/pull/68288) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Backported in [#68398](https://github.com/ClickHouse/ClickHouse/issues/68398): Fix missing sync replica mode in query `SYSTEM SYNC REPLICA`. [#68326](https://github.com/ClickHouse/ClickHouse/pull/68326) ([Duc Canh Le](https://github.com/canhld94)).
-* Backported in [#68669](https://github.com/ClickHouse/ClickHouse/issues/68669): Fix `LOGICAL_ERROR`s when functions `sipHash64Keyed`, `sipHash128Keyed`, or `sipHash128ReferenceKeyed` are applied to empty arrays or tuples. [#68630](https://github.com/ClickHouse/ClickHouse/pull/68630) ([Robert Schulze](https://github.com/rschu1ze)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#67518](https://github.com/ClickHouse/ClickHouse/issues/67518): Split slow test 03036_dynamic_read_subcolumns. [#66954](https://github.com/ClickHouse/ClickHouse/pull/66954) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#67516](https://github.com/ClickHouse/ClickHouse/issues/67516): Split 01508_partition_pruning_long. [#66983](https://github.com/ClickHouse/ClickHouse/pull/66983) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#67529](https://github.com/ClickHouse/ClickHouse/issues/67529): Reduce max time of 00763_long_lock_buffer_alter_destination_table. [#67185](https://github.com/ClickHouse/ClickHouse/pull/67185) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#67803](https://github.com/ClickHouse/ClickHouse/issues/67803): Disable some Dynamic tests under sanitizers, rewrite 03202_dynamic_null_map_subcolumn to sql. [#67359](https://github.com/ClickHouse/ClickHouse/pull/67359) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#67643](https://github.com/ClickHouse/ClickHouse/issues/67643): [Green CI] Fix potentially flaky test_mask_sensitive_info integration test. [#67506](https://github.com/ClickHouse/ClickHouse/pull/67506) ([Alexey Katsman](https://github.com/alexkats)).
-* Backported in [#67609](https://github.com/ClickHouse/ClickHouse/issues/67609): Fix test_zookeeper_config_load_balancing after adding the xdist worker name to the instance. [#67590](https://github.com/ClickHouse/ClickHouse/pull/67590) ([Pablo Marcos](https://github.com/pamarcos)).
-* Backported in [#67871](https://github.com/ClickHouse/ClickHouse/issues/67871): Fix 02434_cancel_insert_when_client_dies. [#67600](https://github.com/ClickHouse/ClickHouse/pull/67600) ([vdimir](https://github.com/vdimir)).
-* Backported in [#67704](https://github.com/ClickHouse/ClickHouse/issues/67704): Fix 02910_bad_logs_level_in_local in fast tests. [#67603](https://github.com/ClickHouse/ClickHouse/pull/67603) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#67689](https://github.com/ClickHouse/ClickHouse/issues/67689): Fix 01605_adaptive_granularity_block_borders. [#67605](https://github.com/ClickHouse/ClickHouse/pull/67605) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#67827](https://github.com/ClickHouse/ClickHouse/issues/67827): Try fix 03143_asof_join_ddb_long. [#67620](https://github.com/ClickHouse/ClickHouse/pull/67620) ([Nikita Taranov](https://github.com/nickitat)).
-* Backported in [#67892](https://github.com/ClickHouse/ClickHouse/issues/67892): Revert "Merge pull request [#66510](https://github.com/ClickHouse/ClickHouse/issues/66510) from canhld94/fix_trivial_count_non_deterministic_func". [#67800](https://github.com/ClickHouse/ClickHouse/pull/67800) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#68081](https://github.com/ClickHouse/ClickHouse/issues/68081): Add an explicit error for `ALTER MODIFY SQL SECURITY` on non-view tables. [#67953](https://github.com/ClickHouse/ClickHouse/pull/67953) ([pufit](https://github.com/pufit)).
-* Update version after release. [#68044](https://github.com/ClickHouse/ClickHouse/pull/68044) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Backported in [#68269](https://github.com/ClickHouse/ClickHouse/issues/68269): [Green CI] Fix test 01903_correct_block_size_prediction_with_default. [#68203](https://github.com/ClickHouse/ClickHouse/pull/68203) ([Pablo Marcos](https://github.com/pamarcos)).
-* Backported in [#68432](https://github.com/ClickHouse/ClickHouse/issues/68432): tests: make 01600_parts_states_metrics_long better. [#68265](https://github.com/ClickHouse/ClickHouse/pull/68265) ([Azat Khuzhin](https://github.com/azat)).
-* Backported in [#68538](https://github.com/ClickHouse/ClickHouse/issues/68538): CI: Native build for package_aarch64. [#68457](https://github.com/ClickHouse/ClickHouse/pull/68457) ([Max K.](https://github.com/maxknv)).
-* Backported in [#68555](https://github.com/ClickHouse/ClickHouse/issues/68555): CI: Minor release workflow fix. [#68536](https://github.com/ClickHouse/ClickHouse/pull/68536) ([Max K.](https://github.com/maxknv)).
-
diff --git a/docs/changelogs/v24.7.4.51-stable.md b/docs/changelogs/v24.7.4.51-stable.md
deleted file mode 100644
index a7cf9790383..00000000000
--- a/docs/changelogs/v24.7.4.51-stable.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.7.4.51-stable (70fe2f6fa52) FIXME as compared to v24.7.3.42-stable (63730bc4293)
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#68232](https://github.com/ClickHouse/ClickHouse/issues/68232): Fixed `Not-ready Set` in some system tables when filtering using subqueries. [#66018](https://github.com/ClickHouse/ClickHouse/pull/66018) ([Michael Kolupaev](https://github.com/al13n321)).
-* Backported in [#68068](https://github.com/ClickHouse/ClickHouse/issues/68068): Fix boolean literals in query sent to external database (for engines like `PostgreSQL`). [#66282](https://github.com/ClickHouse/ClickHouse/pull/66282) ([vdimir](https://github.com/vdimir)).
-* Backported in [#68613](https://github.com/ClickHouse/ClickHouse/issues/68613): Fixes [#66026](https://github.com/ClickHouse/ClickHouse/issues/66026). Avoid unresolved table function arguments traversal in `ReplaceTableNodeToDummyVisitor`. [#67522](https://github.com/ClickHouse/ClickHouse/pull/67522) ([Dmitry Novik](https://github.com/novikd)).
-* Backported in [#68278](https://github.com/ClickHouse/ClickHouse/issues/68278): Fix inserting into stream like engines (Kafka, RabbitMQ, NATS) through HTTP interface. [#67554](https://github.com/ClickHouse/ClickHouse/pull/67554) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#68040](https://github.com/ClickHouse/ClickHouse/issues/68040): Fix creation of view with recursive CTE. [#67587](https://github.com/ClickHouse/ClickHouse/pull/67587) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Backported in [#68038](https://github.com/ClickHouse/ClickHouse/issues/68038): Fix crash on `percent_rank`. `percent_rank`'s default frame type is changed to `range unbounded preceding and unbounded following`. `IWindowFunction`'s default window frame is considered and now window functions without window frame definition in sql can be put into different `WindowTransfomer`s properly. [#67661](https://github.com/ClickHouse/ClickHouse/pull/67661) ([lgbo](https://github.com/lgbo-ustc)).
-* Backported in [#68224](https://github.com/ClickHouse/ClickHouse/issues/68224): Fix wrong `count()` result when there is non-deterministic function in predicate. [#67922](https://github.com/ClickHouse/ClickHouse/pull/67922) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Backported in [#68095](https://github.com/ClickHouse/ClickHouse/issues/68095): Fixed the calculation of the maximum thread soft limit in containerized environments where the usable CPU count is limited. [#67963](https://github.com/ClickHouse/ClickHouse/pull/67963) ([Robert Schulze](https://github.com/rschu1ze)).
-* Backported in [#68126](https://github.com/ClickHouse/ClickHouse/issues/68126): Fixed skipping of untouched parts in mutations with new analyzer. Previously with enabled analyzer data in part could be rewritten by mutation even if mutation doesn't affect this part according to predicate. [#68052](https://github.com/ClickHouse/ClickHouse/pull/68052) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#68223](https://github.com/ClickHouse/ClickHouse/issues/68223): Fixed a NULL pointer dereference, triggered by a specially crafted query, that crashed the server via hopEnd, hopStart, tumbleEnd, and tumbleStart. [#68098](https://github.com/ClickHouse/ClickHouse/pull/68098) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Backported in [#68175](https://github.com/ClickHouse/ClickHouse/issues/68175): Removes an incorrect optimization to remove sorting in subqueries that use `OFFSET`. Fixes [#67906](https://github.com/ClickHouse/ClickHouse/issues/67906). [#68099](https://github.com/ClickHouse/ClickHouse/pull/68099) ([Graham Campbell](https://github.com/GrahamCampbell)).
-* Backported in [#68341](https://github.com/ClickHouse/ClickHouse/issues/68341): Try fix postgres crash when query is cancelled. [#68288](https://github.com/ClickHouse/ClickHouse/pull/68288) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Backported in [#68398](https://github.com/ClickHouse/ClickHouse/issues/68398): Fix missing sync replica mode in query `SYSTEM SYNC REPLICA`. [#68326](https://github.com/ClickHouse/ClickHouse/pull/68326) ([Duc Canh Le](https://github.com/canhld94)).
-* Backported in [#68669](https://github.com/ClickHouse/ClickHouse/issues/68669): Fix `LOGICAL_ERROR`s when functions `sipHash64Keyed`, `sipHash128Keyed`, or `sipHash128ReferenceKeyed` are applied to empty arrays or tuples. [#68630](https://github.com/ClickHouse/ClickHouse/pull/68630) ([Robert Schulze](https://github.com/rschu1ze)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#67803](https://github.com/ClickHouse/ClickHouse/issues/67803): Disable some Dynamic tests under sanitizers, rewrite 03202_dynamic_null_map_subcolumn to sql. [#67359](https://github.com/ClickHouse/ClickHouse/pull/67359) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68081](https://github.com/ClickHouse/ClickHouse/issues/68081): Add an explicit error for `ALTER MODIFY SQL SECURITY` on non-view tables. [#67953](https://github.com/ClickHouse/ClickHouse/pull/67953) ([pufit](https://github.com/pufit)).
-* Update version after release. [#68044](https://github.com/ClickHouse/ClickHouse/pull/68044) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Backported in [#68269](https://github.com/ClickHouse/ClickHouse/issues/68269): [Green CI] Fix test 01903_correct_block_size_prediction_with_default. [#68203](https://github.com/ClickHouse/ClickHouse/pull/68203) ([Pablo Marcos](https://github.com/pamarcos)).
-* Backported in [#68432](https://github.com/ClickHouse/ClickHouse/issues/68432): tests: make 01600_parts_states_metrics_long better. [#68265](https://github.com/ClickHouse/ClickHouse/pull/68265) ([Azat Khuzhin](https://github.com/azat)).
-* Backported in [#68538](https://github.com/ClickHouse/ClickHouse/issues/68538): CI: Native build for package_aarch64. [#68457](https://github.com/ClickHouse/ClickHouse/pull/68457) ([Max K.](https://github.com/maxknv)).
-* Backported in [#68555](https://github.com/ClickHouse/ClickHouse/issues/68555): CI: Minor release workflow fix. [#68536](https://github.com/ClickHouse/ClickHouse/pull/68536) ([Max K.](https://github.com/maxknv)).
-* Backported in [#68760](https://github.com/ClickHouse/ClickHouse/issues/68760): To make patch release possible from every commit on release branch, package_debug build is required and must not be skipped. [#68750](https://github.com/ClickHouse/ClickHouse/pull/68750) ([Max K.](https://github.com/maxknv)).
-
diff --git a/docs/changelogs/v24.7.6.8-stable.md b/docs/changelogs/v24.7.6.8-stable.md
deleted file mode 100644
index 13102a97b40..00000000000
--- a/docs/changelogs/v24.7.6.8-stable.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.7.6.8-stable (7779883593a) FIXME as compared to v24.7.5.37-stable (f2533ca97be)
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#69198](https://github.com/ClickHouse/ClickHouse/issues/69198): TODO. [#68744](https://github.com/ClickHouse/ClickHouse/pull/68744) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#69249](https://github.com/ClickHouse/ClickHouse/issues/69249): `UNION` clause in subqueries wasn't handled correctly in queries with parallel replicas and lead to LOGICAL_ERROR `Duplicate announcement received for replica`. [#69146](https://github.com/ClickHouse/ClickHouse/pull/69146) ([Igor Nikonov](https://github.com/devcrafter)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#69227](https://github.com/ClickHouse/ClickHouse/issues/69227): Disable memory test with sanitizer. [#69193](https://github.com/ClickHouse/ClickHouse/pull/69193) ([alesapin](https://github.com/alesapin)).
-
diff --git a/docs/changelogs/v24.8.1.2684-lts.md b/docs/changelogs/v24.8.1.2684-lts.md
deleted file mode 100644
index 8171bb3d719..00000000000
--- a/docs/changelogs/v24.8.1.2684-lts.md
+++ /dev/null
@@ -1,525 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.8.1.2684-lts (161c62fd295) FIXME as compared to v24.8.1.1-new (3f8b27d7acc)
-
-#### Backward Incompatible Change
-* `clickhouse-client` and `clickhouse-local` now default to multi-query mode (instead single-query mode). As an example, `clickhouse-client -q "SELECT 1; SELECT 2"` now works, whereas users previously had to add `--multiquery` (or `-n`). The `--multiquery/-n` switch became obsolete. INSERT queries in multi-query statements are treated specially based on their FORMAT clause: If the FORMAT is `VALUES` (the most common case), the end of the INSERT statement is represented by a trailing semicolon `;` at the end of the query. For all other FORMATs (e.g. `CSV` or `JSONEachRow`), the end of the INSERT statement is represented by two newlines `\n\n` at the end of the query. [#63898](https://github.com/ClickHouse/ClickHouse/pull/63898) ([FFish](https://github.com/wxybear)).
-* In previous versions, it was possible to use an alternative syntax for `LowCardinality` data types by appending `WithDictionary` to the name of the data type. It was an initial working implementation, and it was never documented or exposed to the public. Now, it is deprecated. If you have used this syntax, you have to ALTER your tables and rename the data types to `LowCardinality`. [#66842](https://github.com/ClickHouse/ClickHouse/pull/66842) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix logical errors with storage `Buffer` used with distributed destination table. It's a backward incompatible change: queries using `Buffer` with a distributed destination table may stop working if the table appears more than once in the query (e.g., in a self-join). [#67015](https://github.com/ClickHouse/ClickHouse/pull/67015) ([vdimir](https://github.com/vdimir)).
-* In previous versions, calling functions for random distributions based on the Gamma function (such as Chi-Squared, Student, Fisher) with negative arguments close to zero led to a long computation or an infinite loop. In the new version, calling these functions with zero or negative arguments will produce an exception. This closes [#67297](https://github.com/ClickHouse/ClickHouse/issues/67297). [#67326](https://github.com/ClickHouse/ClickHouse/pull/67326) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* The system table `text_log` is enabled by default. This is fully compatible with previous versions, but you may notice subtly increased disk usage on the local disk (this system table takes a tiny amount of disk space). [#67428](https://github.com/ClickHouse/ClickHouse/pull/67428) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* In previous versions, `arrayWithConstant` can be slow if asked to generate very large arrays. In the new version, it is limited to 1 GB per array. This closes [#32754](https://github.com/ClickHouse/ClickHouse/issues/32754). [#67741](https://github.com/ClickHouse/ClickHouse/pull/67741) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix REPLACE modifier formatting (forbid omitting brackets). [#67774](https://github.com/ClickHouse/ClickHouse/pull/67774) ([Azat Khuzhin](https://github.com/azat)).
-* Backported in [#68349](https://github.com/ClickHouse/ClickHouse/issues/68349): Reimplement Dynamic type. Now when the limit of dynamic data types is reached new types are not casted to String but stored in a special data structure in binary format with binary encoded data type. Now any type ever inserted into Dynamic column can be read from it as subcolumn. [#68132](https://github.com/ClickHouse/ClickHouse/pull/68132) ([Kruglov Pavel](https://github.com/Avogar)).
-
-#### New Feature
-* Add new experimental Kafka storage engine to store offsets in Keeper instead of relying on committing them to Kafka. [#57625](https://github.com/ClickHouse/ClickHouse/pull/57625) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Add new TimeSeries table engine: - by default: ``` CREATE TABLE tbl ENGINE=TimeSeries ``` - or with specifying engines of its internal tables:. [#64183](https://github.com/ClickHouse/ClickHouse/pull/64183) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Support more join strictnesses (`LEFT/RIGHT SEMI/ANTI/ANY JOIN`) with inequal conditions which involve columns from both left and right table. e.g. t1.y < t2.y (see setting `allow_experimental_join_condition`). [#64281](https://github.com/ClickHouse/ClickHouse/pull/64281) ([lgbo](https://github.com/lgbo-ustc)).
-* Add `_etag` virtual column for S3 table engine. Fixes [#65312](https://github.com/ClickHouse/ClickHouse/issues/65312). [#65386](https://github.com/ClickHouse/ClickHouse/pull/65386) ([skyoct](https://github.com/skyoct)).
-* This pull request introduces Hive-style partitioning for different engines (`File`, `URL`, `S3`, `AzureBlobStorage`, `HDFS`). Hive-style partitioning organizes data into partitioned sub-directories, making it efficient to query and manage large datasets. Currently, it only creates virtual columns with the appropriate name and data. The follow-up PR will introduce the appropriate data filtering (performance speedup). [#65997](https://github.com/ClickHouse/ClickHouse/pull/65997) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Add function printf for spark compatiability. [#66257](https://github.com/ClickHouse/ClickHouse/pull/66257) ([李扬](https://github.com/taiyang-li)).
-* Backported in [#68450](https://github.com/ClickHouse/ClickHouse/issues/68450): Implement new JSON data type. [#66444](https://github.com/ClickHouse/ClickHouse/pull/66444) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add a new server setting: disable_insertion_and_mutation Set it to true. This node will deny all insertions and mutations(Alter table delete/update/drop partition). Include async insertion. [#66519](https://github.com/ClickHouse/ClickHouse/pull/66519) ([Xu Jia](https://github.com/XuJia0210)).
-* Add options `restore_replace_external_engines_to_null` and `restore_replace_external_table_functions_to_null` to replace external engines and table_engines to Null engine that can be useful for testing. It should work for RESTORE and explicit table creation. [#66536](https://github.com/ClickHouse/ClickHouse/pull/66536) ([Ilya Yatsishin](https://github.com/qoega)).
-* Added support for reading MULTILINESTRING geometry in WKT format using function readWKTLineString. [#67647](https://github.com/ClickHouse/ClickHouse/pull/67647) ([Jacob Reckhard](https://github.com/jacobrec)).
-* Add a new table function `fuzzQuery`. This function allows the modification of a given query string with random variations. Example: `SELECT query FROM fuzzQuery('SELECT 1') LIMIT 5;`. [#67655](https://github.com/ClickHouse/ClickHouse/pull/67655) ([pufit](https://github.com/pufit)).
-* Support query `DROP DETACHED PARTITION ALL` to drop all detached partitions. [#67885](https://github.com/ClickHouse/ClickHouse/pull/67885) ([Duc Canh Le](https://github.com/canhld94)).
-* Added a tagging (namespace) mechanism for the query cache. The same queries with different tags are considered different by the query cache. Example: `SELECT 1 SETTINGS use_query_cache = 1, query_cache_tag = 'abc'` and `SELECT 1 SETTINGS use_query_cache = 1, query_cache_tag = 'def'` now create different query cache entries. [#68235](https://github.com/ClickHouse/ClickHouse/pull/68235) ([sakulali](https://github.com/sakulali)).
-
-#### Performance Improvement
-* Use adaptive read task size calculation method (adaptive meaning it depends on read column sizes) for parallel replicas. [#60377](https://github.com/ClickHouse/ClickHouse/pull/60377) ([Nikita Taranov](https://github.com/nickitat)).
-* Store the `plain_rewritable` disk directory metadata in `__meta` layout, separately from the merge tree data in the object storage. Move the `plain_rewritable` disk to a flat directory structure. [#65751](https://github.com/ClickHouse/ClickHouse/pull/65751) ([Julia Kartseva](https://github.com/jkartseva)).
-* Enable `compile_expressions` (JIT compiler for fragments of ordinary expressions) by default. This closes [#51264](https://github.com/ClickHouse/ClickHouse/issues/51264) and [#56386](https://github.com/ClickHouse/ClickHouse/issues/56386). [#66486](https://github.com/ClickHouse/ClickHouse/pull/66486) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Improve columns squashing for String/Array/Map/Variant/Dynamic types by reserving required memory in advance for all subcolumns. [#67043](https://github.com/ClickHouse/ClickHouse/pull/67043) ([Kruglov Pavel](https://github.com/Avogar)).
-* Speed up system flush logs, flush logs on shutdown. [#67472](https://github.com/ClickHouse/ClickHouse/pull/67472) ([Sema Checherinda](https://github.com/CheSema)).
-* Backported in [#68496](https://github.com/ClickHouse/ClickHouse/issues/68496): Improved overall performance of merges by reducing the overhead of scheduling steps of merges. [#68016](https://github.com/ClickHouse/ClickHouse/pull/68016) ([Anton Popov](https://github.com/CurtizJ)).
-* Setting `optimize_functions_to_subcolumns` is enabled by default. [#68053](https://github.com/ClickHouse/ClickHouse/pull/68053) ([Anton Popov](https://github.com/CurtizJ)).
-
-#### Improvement
-* ClickHouse server now supports new setting `max_keep_alive_requests`. For keep-alive HTTP connections to the server it works in tandem with `keep_alive_timeout` - if idle timeout not expired but there already more than `max_keep_alive_requests` requests done through the given connection - it will be closed by the server. [#61793](https://github.com/ClickHouse/ClickHouse/pull/61793) ([Nikita Taranov](https://github.com/nickitat)).
-* As in the new version, SOURCES are checked based on Table Engine logic, even grant table engine is disabled by default, if a source is not granted, a prompt of table engine would popup instead, which is misleading. [#65419](https://github.com/ClickHouse/ClickHouse/pull/65419) ([jsc0218](https://github.com/jsc0218)).
-* Added statistics type `count_min` (count-min sketches) which provide selectivity estimations for equality predicates like `col = 'val'`. Supported data types are string, date, datatime and numeric types. [#65521](https://github.com/ClickHouse/ClickHouse/pull/65521) ([JackyWoo](https://github.com/JackyWoo)).
-* Do not pass logs for keeper explicitly in the image to allow overriding. [#65564](https://github.com/ClickHouse/ClickHouse/pull/65564) ([Azat Khuzhin](https://github.com/azat)).
-* Use `Atomic` database by default in `clickhouse-local`. Address items 1 and 5 from [#50647](https://github.com/ClickHouse/ClickHouse/issues/50647). Closes [#44817](https://github.com/ClickHouse/ClickHouse/issues/44817). [#65860](https://github.com/ClickHouse/ClickHouse/pull/65860) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add the `rows_before_aggregation_at_least` statistic to the query response when `rows_before_aggregation` is enabled. This statistic represents the number of rows read before aggregation. In the context of a distributed query, when using the `group by` or `max` aggregation function without a `limit`, `rows_before_aggregation_at_least` can reflect the number of rows hit by the query. [#66084](https://github.com/ClickHouse/ClickHouse/pull/66084) ([morning-color](https://github.com/morning-color)).
-* Introduced `use_same_password_for_base_backup` settings for `BACKUP` and `RESTORE` queries, allowing to create and restore incremental backups to/from password protected archives. [#66214](https://github.com/ClickHouse/ClickHouse/pull/66214) ([Samuele](https://github.com/sguerrini97)).
-* Ignore async_load_databases for ATTACH query (previously it was possible for ATTACH to return before the tables had been attached). [#66240](https://github.com/ClickHouse/ClickHouse/pull/66240) ([Azat Khuzhin](https://github.com/azat)).
-* [Replicated]MergeTreeSink has to properly cancel its delayed_chunk on `onCancel()` method. [#66279](https://github.com/ClickHouse/ClickHouse/pull/66279) ([Sema Checherinda](https://github.com/CheSema)).
-* Added logs and metrics for rejected connections (where there are not enough resources). [#66410](https://github.com/ClickHouse/ClickHouse/pull/66410) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Setting `allow_experimental_analyzer` is renamed to `enable_analyzer`. The old name is preserved in a form of an alias. [#66438](https://github.com/ClickHouse/ClickHouse/pull/66438) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Support true UUID type for MongoDB engine. [#66671](https://github.com/ClickHouse/ClickHouse/pull/66671) ([Azat Khuzhin](https://github.com/azat)).
-* Added a new `MergeTree` setting `deduplicate_merge_projection_mode` to control the projections during merges (for specific engines) and `OPTIMIZE DEDUPLICATE` query. Supported options: `throw` (throw an exception in case the projection is not fully supported for *MergeTree engine), `drop` (remove projection during merge if it can't be merged itself consistently) and `rebuild` (rebuild projection from scratch, which is a heavy operation). [#66672](https://github.com/ClickHouse/ClickHouse/pull/66672) ([jsc0218](https://github.com/jsc0218)).
-* Add replication lag and recovery time metrics. [#66703](https://github.com/ClickHouse/ClickHouse/pull/66703) ([Miсhael Stetsyuk](https://github.com/mstetsyuk)).
-* Add S3DiskNoKeyErrors metric. [#66704](https://github.com/ClickHouse/ClickHouse/pull/66704) ([Miсhael Stetsyuk](https://github.com/mstetsyuk)).
-* Ensure COMMENT clause works for all table engines. [#66832](https://github.com/ClickHouse/ClickHouse/pull/66832) ([Joe Lynch](https://github.com/joelynch)).
-* Update the usage of error code `BAD_ARGUMENTS` and `ILLEGAL_TYPE_OF_ARGUMENT` by more accurate error codes when appropriate. [#66851](https://github.com/ClickHouse/ClickHouse/pull/66851) ([Yohann Jardin](https://github.com/yohannj)).
-* Function `mapFromArrays` now accepts `Map(K, V)` as first argument, for example: `SELECT mapFromArrays(map('a', 4, 'b', 4), ['aa', 'bb'])` now works and returns `{('a',4):'aa',('b',4):'bb'}`. Also, if the 1st argument is an Array, it can now also be of type `Array(Nullable(T))` or `Array(LowCardinality(Nullable(T)))` as long as the actual array values are not `NULL`. [#67103](https://github.com/ClickHouse/ClickHouse/pull/67103) ([李扬](https://github.com/taiyang-li)).
-* Read configuration for clickhouse-local from ~/.clickhouse-local. [#67135](https://github.com/ClickHouse/ClickHouse/pull/67135) ([Azat Khuzhin](https://github.com/azat)).
-* Rename setting `input_format_orc_read_use_writer_time_zone` to `input_format_orc_reader_timezone` and allow the user to set the reader timezone. [#67175](https://github.com/ClickHouse/ClickHouse/pull/67175) ([kevinyhzou](https://github.com/KevinyhZou)).
-* Decrease level of 'Socket is not connected' error when HTTP connection immediately reset by peer after connecting, close [#34218](https://github.com/ClickHouse/ClickHouse/issues/34218). [#67177](https://github.com/ClickHouse/ClickHouse/pull/67177) ([vdimir](https://github.com/vdimir)).
-* Speed up tables removal for `DROP DATABASE` query, increased the default value for `database_catalog_drop_table_concurrency` to 16. [#67228](https://github.com/ClickHouse/ClickHouse/pull/67228) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Add ability to load dashboards for system.dashboards from config (once set, they overrides the default dashboards preset). [#67232](https://github.com/ClickHouse/ClickHouse/pull/67232) ([Azat Khuzhin](https://github.com/azat)).
-* The window functions in SQL are traditionally in snake case. ClickHouse uses camelCase, so new aliases `denseRank()` and `percentRank()` have been created. These new functions can be called the exact same as the original `dense_rank()` and `percent_rank()` functions. Both snake case and camelCase syntaxes remain usable. A new test for each of the functions has been added as well. This closes [#67042](https://github.com/ClickHouse/ClickHouse/issues/67042) . [#67334](https://github.com/ClickHouse/ClickHouse/pull/67334) ([Peter Nguyen](https://github.com/petern48)).
-* Autodetect configuration file format if is not .xml, .yml or .yaml. If the file begins with < it might be XML, otherwise it might be YAML. Non regular file just parse as XML such as PIPE: /dev/fd/X. [#67391](https://github.com/ClickHouse/ClickHouse/pull/67391) ([sakulali](https://github.com/sakulali)).
-* Functions `formatDateTime` and `formatDateTimeInJodaSyntax` now treat their format parameter as optional. If it is not specified, format strings `%Y-%m-%d %H:%i:%s` and `yyyy-MM-dd HH:mm:ss` are assumed. Example: `SELECT parseDateTime('2021-01-04 23:12:34')` now returns DateTime value `2021-01-04 23:12:34` (previously, this threw an exception). [#67399](https://github.com/ClickHouse/ClickHouse/pull/67399) ([Robert Schulze](https://github.com/rschu1ze)).
-* Automatically retry Keeper requests in KeeperMap if they happen because of timeout or connection loss. [#67448](https://github.com/ClickHouse/ClickHouse/pull/67448) ([Antonio Andelic](https://github.com/antonio2368)).
-* Rework usage of custom table's disks. [#67684](https://github.com/ClickHouse/ClickHouse/pull/67684) ([Sema Checherinda](https://github.com/CheSema)).
-* Various improvements in the advanced dashboard. This closes [#67697](https://github.com/ClickHouse/ClickHouse/issues/67697). This closes [#63407](https://github.com/ClickHouse/ClickHouse/issues/63407). This closes [#51129](https://github.com/ClickHouse/ClickHouse/issues/51129). This closes [#61204](https://github.com/ClickHouse/ClickHouse/issues/61204). [#67701](https://github.com/ClickHouse/ClickHouse/pull/67701) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Avoid allocate too much capacity for array column while writing orc & some minor refactors to make code cleaner. Performance speeds up 15% for array column. [#67879](https://github.com/ClickHouse/ClickHouse/pull/67879) ([李扬](https://github.com/taiyang-li)).
-* Support OPTIMIZE query on Join table engine to reduce Join tables memory footprint. [#67883](https://github.com/ClickHouse/ClickHouse/pull/67883) ([Duc Canh Le](https://github.com/canhld94)).
-* Add replication lag and recovery time metrics. [#67913](https://github.com/ClickHouse/ClickHouse/pull/67913) ([Miсhael Stetsyuk](https://github.com/mstetsyuk)).
-* Add '-no-pie' to aarch64 Linux builds to allow proper introspection and symbolizing of stacktraces after a ClickHouse restart. [#67916](https://github.com/ClickHouse/ClickHouse/pull/67916) ([filimonov](https://github.com/filimonov)).
-* Backported in [#68481](https://github.com/ClickHouse/ClickHouse/issues/68481): Added profile events for merges and mutations for better introspection. [#68015](https://github.com/ClickHouse/ClickHouse/pull/68015) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix settings/current_database in system.processes for async BACKUP/RESTORE. [#68163](https://github.com/ClickHouse/ClickHouse/pull/68163) ([Azat Khuzhin](https://github.com/azat)).
-* Remove unnecessary logs for MergeTree that doesn't support replication. [#68238](https://github.com/ClickHouse/ClickHouse/pull/68238) ([Daniil Ivanik](https://github.com/divanik)).
-* Backported in [#68430](https://github.com/ClickHouse/ClickHouse/issues/68430): Improve schema inference of date times. Now DateTime64 used only when date time has fractional part, otherwise regular DateTime is used. Inference of Date/DateTime is more strict now, especially when `date_time_input_format='best_effort'` to avoid inferring date times from strings in corner cases. [#68382](https://github.com/ClickHouse/ClickHouse/pull/68382) ([Kruglov Pavel](https://github.com/Avogar)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Fixed `Not-ready Set` in some system tables when filtering using subqueries. [#66018](https://github.com/ClickHouse/ClickHouse/pull/66018) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fixed reading of subcolumns after `ALTER ADD COLUMN` query. [#66243](https://github.com/ClickHouse/ClickHouse/pull/66243) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix boolean literals in query sent to external database (for engines like `PostgreSQL`). [#66282](https://github.com/ClickHouse/ClickHouse/pull/66282) ([vdimir](https://github.com/vdimir)).
-* Fix formatting of query with aliased JOIN ON expression, e.g. `... JOIN t2 ON (x = y) AS e ORDER BY x` should be formatted as `... JOIN t2 ON ((x = y) AS e) ORDER BY x`. [#66312](https://github.com/ClickHouse/ClickHouse/pull/66312) ([vdimir](https://github.com/vdimir)).
-* Fix cluster() for inter-server secret (preserve initial user as before). [#66364](https://github.com/ClickHouse/ClickHouse/pull/66364) ([Azat Khuzhin](https://github.com/azat)).
-* Fix possible runtime error while converting Array field with nulls to Array(Variant). [#66727](https://github.com/ClickHouse/ClickHouse/pull/66727) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix for occasional deadlock in Context::getDDLWorker. [#66843](https://github.com/ClickHouse/ClickHouse/pull/66843) ([Alexander Gololobov](https://github.com/davenger)).
-* Fix creating KeeperMap table after an incomplete drop. [#66865](https://github.com/ClickHouse/ClickHouse/pull/66865) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix broken part error while restoring to a `s3_plain_rewritable` disk. [#66881](https://github.com/ClickHouse/ClickHouse/pull/66881) ([Vitaly Baranov](https://github.com/vitlibar)).
-* In rare cases ClickHouse could consider parts as broken because of some unexpected projections on disk. Now it's fixed. [#66898](https://github.com/ClickHouse/ClickHouse/pull/66898) ([alesapin](https://github.com/alesapin)).
-* Fix invalid format detection in schema inference that could lead to logical error Format {} doesn't support schema inference. [#66899](https://github.com/ClickHouse/ClickHouse/pull/66899) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix possible deadlock on query cancel with parallel replicas. [#66905](https://github.com/ClickHouse/ClickHouse/pull/66905) ([Nikita Taranov](https://github.com/nickitat)).
-* Forbid create as select even when database_replicated_allow_heavy_create is set. It was unconditionally forbidden in 23.12 and accidentally allowed under the setting in unreleased 24.7. [#66980](https://github.com/ClickHouse/ClickHouse/pull/66980) ([vdimir](https://github.com/vdimir)).
-* Reading from the `numbers` could wrongly throw an exception when the `max_rows_to_read` limit was set. This closes [#66992](https://github.com/ClickHouse/ClickHouse/issues/66992). [#66996](https://github.com/ClickHouse/ClickHouse/pull/66996) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add proper type conversion to lagInFrame and leadInFrame window functions - fixes msan test. [#67091](https://github.com/ClickHouse/ClickHouse/pull/67091) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Only relevant to the experimental Variant data type. Fix crash with Variant + AggregateFunction type. [#67122](https://github.com/ClickHouse/ClickHouse/pull/67122) ([Kruglov Pavel](https://github.com/Avogar)).
-* TRUNCATE DATABASE used to stop replication as if it was a DROP DATABASE query, it's fixed. [#67129](https://github.com/ClickHouse/ClickHouse/pull/67129) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Use a separate client context in `clickhouse-local`. [#67133](https://github.com/ClickHouse/ClickHouse/pull/67133) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix error `Cannot convert column because it is non constant in source stream but must be constant in result.` for a query that reads from the `Merge` table over the `Distriburted` table with one shard. [#67146](https://github.com/ClickHouse/ClickHouse/pull/67146) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Correct behavior of `ORDER BY all` with disabled `enable_order_by_all` and parallel replicas (distributed queries as well). [#67153](https://github.com/ClickHouse/ClickHouse/pull/67153) ([Igor Nikonov](https://github.com/devcrafter)).
-* Fix wrong usage of input_format_max_bytes_to_read_for_schema_inference in schema cache. [#67157](https://github.com/ClickHouse/ClickHouse/pull/67157) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix the memory leak for count distinct, when exception issued during group by single nullable key. [#67171](https://github.com/ClickHouse/ClickHouse/pull/67171) ([Jet He](https://github.com/compasses)).
-* This closes [#67156](https://github.com/ClickHouse/ClickHouse/issues/67156). This closes [#66447](https://github.com/ClickHouse/ClickHouse/issues/66447). The bug was introduced in https://github.com/ClickHouse/ClickHouse/pull/62907. [#67178](https://github.com/ClickHouse/ClickHouse/pull/67178) ([Maksim Kita](https://github.com/kitaisreal)).
-* Fix crash in DistributedAsyncInsert when connection is empty. [#67219](https://github.com/ClickHouse/ClickHouse/pull/67219) ([Pablo Marcos](https://github.com/pamarcos)).
-* Fix error `Conversion from AggregateFunction(name, Type) to AggregateFunction(name, Nullable(Type)) is not supported`. The bug was caused by the `optimize_rewrite_aggregate_function_with_if` optimization. Fixes [#67112](https://github.com/ClickHouse/ClickHouse/issues/67112). [#67229](https://github.com/ClickHouse/ClickHouse/pull/67229) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix hung query when using empty tuple as lhs of function IN. [#67295](https://github.com/ClickHouse/ClickHouse/pull/67295) ([Duc Canh Le](https://github.com/canhld94)).
-* Fix crash of `uniq` and `uniqTheta ` with `tuple()` argument. Closes [#67303](https://github.com/ClickHouse/ClickHouse/issues/67303). [#67306](https://github.com/ClickHouse/ClickHouse/pull/67306) ([flynn](https://github.com/ucasfl)).
-* It was possible to create a very deep nested JSON data that triggered stack overflow while skipping unknown fields. This closes [#67292](https://github.com/ClickHouse/ClickHouse/issues/67292). [#67324](https://github.com/ClickHouse/ClickHouse/pull/67324) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix attaching ReplicatedMergeTree table after exception during startup. [#67360](https://github.com/ClickHouse/ClickHouse/pull/67360) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix segfault caused by incorrectly detaching from thread group in `Aggregator`. [#67385](https://github.com/ClickHouse/ClickHouse/pull/67385) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix one more case when a non-deterministic function is specified in PK. [#67395](https://github.com/ClickHouse/ClickHouse/pull/67395) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed `bloom_filter` index breaking queries with mildly weird conditions like `(k=2)=(k=2)` or `has([1,2,3], k)`. [#67423](https://github.com/ClickHouse/ClickHouse/pull/67423) ([Michael Kolupaev](https://github.com/al13n321)).
-* Correctly parse file name/URI containing `::` if it's not an archive. [#67433](https://github.com/ClickHouse/ClickHouse/pull/67433) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix wait for tasks in ~WriteBufferFromS3 in case WriteBuffer was cancelled. [#67459](https://github.com/ClickHouse/ClickHouse/pull/67459) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Protect temporary part directories from removing during RESTORE. [#67491](https://github.com/ClickHouse/ClickHouse/pull/67491) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix execution of nested short-circuit functions. [#67520](https://github.com/ClickHouse/ClickHouse/pull/67520) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fixes [#66026](https://github.com/ClickHouse/ClickHouse/issues/66026). Avoid unresolved table function arguments traversal in `ReplaceTableNodeToDummyVisitor`. [#67522](https://github.com/ClickHouse/ClickHouse/pull/67522) ([Dmitry Novik](https://github.com/novikd)).
-* Fix `Logical error: Expected the argument №N of type T to have X rows, but it has 0`. The error could happen in a remote query with constant expression in `GROUP BY` (with a new analyzer). [#67536](https://github.com/ClickHouse/ClickHouse/pull/67536) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix join on tuple with NULLs: Some queries with the new analyzer and `NULL` inside the tuple in the `JOIN ON` section returned incorrect results. [#67538](https://github.com/ClickHouse/ClickHouse/pull/67538) ([vdimir](https://github.com/vdimir)).
-* Fix redundant reschedule of FileCache::freeSpaceRatioKeepingThreadFunc() in case of full non-evictable cache. [#67540](https://github.com/ClickHouse/ClickHouse/pull/67540) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix inserting into stream like engines (Kafka, RabbitMQ, NATS) through HTTP interface. [#67554](https://github.com/ClickHouse/ClickHouse/pull/67554) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Fix for function `toStartOfWeek` which returned the wrong result with a small `DateTime64` value. [#67558](https://github.com/ClickHouse/ClickHouse/pull/67558) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Fix creation of view with recursive CTE. [#67587](https://github.com/ClickHouse/ClickHouse/pull/67587) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Fix `Logical error: 'file_offset_of_buffer_end <= read_until_position'` in filesystem cache. Closes [#57508](https://github.com/ClickHouse/ClickHouse/issues/57508). [#67623](https://github.com/ClickHouse/ClickHouse/pull/67623) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fixes [#62282](https://github.com/ClickHouse/ClickHouse/issues/62282). Removed the call to `convertFieldToString()` and added datatype specific serialization code. Parameterized view substitution was broken for multiple datatypes when parameter value was a function or expression returning datatype instance. [#67654](https://github.com/ClickHouse/ClickHouse/pull/67654) ([Shankar](https://github.com/shiyer7474)).
-* Fix crash on `percent_rank`. `percent_rank`'s default frame type is changed to `range unbounded preceding and unbounded following`. `IWindowFunction`'s default window frame is considered and now window functions without window frame definition in sql can be put into different `WindowTransfomer`s properly. [#67661](https://github.com/ClickHouse/ClickHouse/pull/67661) ([lgbo](https://github.com/lgbo-ustc)).
-* Fix reloading SQL UDFs with UNION. Previously, restarting the server could make UDF invalid. [#67665](https://github.com/ClickHouse/ClickHouse/pull/67665) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix possible logical error "Unexpected return type from if" with experimental Variant type and enabled setting `use_variant_as_common_type ` in function if with Tuples and Maps. [#67687](https://github.com/ClickHouse/ClickHouse/pull/67687) ([Kruglov Pavel](https://github.com/Avogar)).
-* Due to a bug in Linux Kernel, a query can hung in `TimerDescriptor::drain`. This closes [#37686](https://github.com/ClickHouse/ClickHouse/issues/37686). [#67702](https://github.com/ClickHouse/ClickHouse/pull/67702) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix completion of `RESTORE ON CLUSTER` command. [#67720](https://github.com/ClickHouse/ClickHouse/pull/67720) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix dictionary hang in case of CANNOT_SCHEDULE_TASK while loading. [#67751](https://github.com/ClickHouse/ClickHouse/pull/67751) ([Azat Khuzhin](https://github.com/azat)).
-* Fix potential stack overflow in `JSONMergePatch` function. Renamed this function from `jsonMergePatch` to `JSONMergePatch` because the previous name was wrong. The previous name is still kept for compatibility. Improved diagnostic of errors in the function. This closes [#67304](https://github.com/ClickHouse/ClickHouse/issues/67304). [#67756](https://github.com/ClickHouse/ClickHouse/pull/67756) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Queries like `SELECT count() FROM t WHERE cast(c = 1 or c = 9999 AS Bool) SETTINGS use_skip_indexes=1` with bloom filter indexes on `c` now work correctly. [#67781](https://github.com/ClickHouse/ClickHouse/pull/67781) ([jsc0218](https://github.com/jsc0218)).
-* Fix wrong aggregation result in some queries with aggregation without keys and filter, close [#67419](https://github.com/ClickHouse/ClickHouse/issues/67419). [#67804](https://github.com/ClickHouse/ClickHouse/pull/67804) ([vdimir](https://github.com/vdimir)).
-* Validate experimental/suspicious data types in ALTER ADD/MODIFY COLUMN. [#67911](https://github.com/ClickHouse/ClickHouse/pull/67911) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix DateTime64 parsing after constant folding in distributed queries, close [#66773](https://github.com/ClickHouse/ClickHouse/issues/66773). [#67920](https://github.com/ClickHouse/ClickHouse/pull/67920) ([vdimir](https://github.com/vdimir)).
-* Fix wrong `count()` result when there is non-deterministic function in predicate. [#67922](https://github.com/ClickHouse/ClickHouse/pull/67922) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Fixed the calculation of the maximum thread soft limit in containerized environments where the usable CPU count is limited. [#67963](https://github.com/ClickHouse/ClickHouse/pull/67963) ([Robert Schulze](https://github.com/rschu1ze)).
-* Now ClickHouse doesn't consider part as broken if projection doesn't exist on disk but exists in `checksums.txt`. [#68003](https://github.com/ClickHouse/ClickHouse/pull/68003) ([alesapin](https://github.com/alesapin)).
-* Fixed skipping of untouched parts in mutations with new analyzer. Previously with enabled analyzer data in part could be rewritten by mutation even if mutation doesn't affect this part according to predicate. [#68052](https://github.com/ClickHouse/ClickHouse/pull/68052) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed a NULL pointer dereference, triggered by a specially crafted query, that crashed the server via hopEnd, hopStart, tumbleEnd, and tumbleStart. [#68098](https://github.com/ClickHouse/ClickHouse/pull/68098) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Removes an incorrect optimization to remove sorting in subqueries that use `OFFSET`. Fixes [#67906](https://github.com/ClickHouse/ClickHouse/issues/67906). [#68099](https://github.com/ClickHouse/ClickHouse/pull/68099) ([Graham Campbell](https://github.com/GrahamCampbell)).
-* Attempt to fix `Block structure mismatch in AggregatingStep stream: different types` for aggregate projection optimization. [#68107](https://github.com/ClickHouse/ClickHouse/pull/68107) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#68343](https://github.com/ClickHouse/ClickHouse/issues/68343): Try fix postgres crash when query is cancelled. [#68288](https://github.com/ClickHouse/ClickHouse/pull/68288) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Backported in [#68400](https://github.com/ClickHouse/ClickHouse/issues/68400): Fix missing sync replica mode in query `SYSTEM SYNC REPLICA`. [#68326](https://github.com/ClickHouse/ClickHouse/pull/68326) ([Duc Canh Le](https://github.com/canhld94)).
-
-#### Build/Testing/Packaging Improvement
-* Improved `test_storage_s3` tests: increased `s3_max_single_read_retries` for read from "unstable" s3 source and allowed all tests to run multiple times in a row. [#66896](https://github.com/ClickHouse/ClickHouse/pull/66896) ([Ilya Yatsishin](https://github.com/qoega)).
-* Integration tests flaky check will not run each test case multiple times to find more issues in tests and make them more reliable. It is using `pytest-repeat` library to run test case multiple times for the same environment. It is important to cleanup tables and other entities in the end of a test case to pass. Repeat works much faster than several pytest runs as it starts necessary containers only once. [#66986](https://github.com/ClickHouse/ClickHouse/pull/66986) ([Ilya Yatsishin](https://github.com/qoega)).
-* Allow to use CLion with ClickHouse. In previous versions, CLion freezed for a minute on every keypress. This closes [#66994](https://github.com/ClickHouse/ClickHouse/issues/66994). [#66995](https://github.com/ClickHouse/ClickHouse/pull/66995) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Getauxval: avoid crash under sanitizer re-exec due to high aslr entropy. [#67081](https://github.com/ClickHouse/ClickHouse/pull/67081) ([Raúl Marín](https://github.com/Algunenano)).
-* Some parts of client code are extracted to a single file and highest possible level optimization is applied to them even for debug builds. This closes: [#65745](https://github.com/ClickHouse/ClickHouse/issues/65745). [#67215](https://github.com/ClickHouse/ClickHouse/pull/67215) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-
-#### NO CL CATEGORY
-
-* Backported in [#68416](https://github.com/ClickHouse/ClickHouse/issues/68416):. [#68386](https://github.com/ClickHouse/ClickHouse/pull/68386) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-
-#### NO CL ENTRY
-
-* NO CL ENTRY:  'Revert "Fix for 992 and friends"'. [#66993](https://github.com/ClickHouse/ClickHouse/pull/66993) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* NO CL ENTRY:  'Revert "Revert "Fix for 992 and friends""'. [#67029](https://github.com/ClickHouse/ClickHouse/pull/67029) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* NO CL ENTRY:  'Revert "FuzzQuery table function"'. [#67040](https://github.com/ClickHouse/ClickHouse/pull/67040) ([Raúl Marín](https://github.com/Algunenano)).
-* NO CL ENTRY:  'Revert "Enable `compile_expressions` by default."'. [#67299](https://github.com/ClickHouse/ClickHouse/pull/67299) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* NO CL ENTRY:  'Revert "Slightly better calculation of primary index"'. [#67392](https://github.com/ClickHouse/ClickHouse/pull/67392) ([alesapin](https://github.com/alesapin)).
-* NO CL ENTRY:  'Revert "Add settings to replace external engines to Null during create"'. [#67507](https://github.com/ClickHouse/ClickHouse/pull/67507) ([Raúl Marín](https://github.com/Algunenano)).
-* NO CL ENTRY:  'Revert "Revert "Add settings to replace external engines to Null during create""'. [#67511](https://github.com/ClickHouse/ClickHouse/pull/67511) ([Ilya Yatsishin](https://github.com/qoega)).
-* NO CL ENTRY:  'Revert "Add replication lag and recovery time metrics"'. [#67731](https://github.com/ClickHouse/ClickHouse/pull/67731) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* NO CL ENTRY:  'Revert "Revert "Slightly better calculation of primary index""'. [#67846](https://github.com/ClickHouse/ClickHouse/pull/67846) ([Anton Popov](https://github.com/CurtizJ)).
-* NO CL ENTRY:  'Revert "CI: Strict job timeout 1.5h for tests, 2h for builds"'. [#67986](https://github.com/ClickHouse/ClickHouse/pull/67986) ([Max K.](https://github.com/maxknv)).
-* NO CL ENTRY:  'Revert "Bump rocksdb from v8.10 to v9.4 + enable jemalloc and liburing"'. [#68014](https://github.com/ClickHouse/ClickHouse/pull/68014) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* NO CL ENTRY:  'Revert "Use `Atomic` database by default in `clickhouse-local`"'. [#68023](https://github.com/ClickHouse/ClickHouse/pull/68023) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* NO CL ENTRY:  'Revert "Refactor tests for (experimental) statistics"'. [#68156](https://github.com/ClickHouse/ClickHouse/pull/68156) ([Alexander Tokmakov](https://github.com/tavplubix)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* CI: enable libfuzzer (fixing build and docker). [#61908](https://github.com/ClickHouse/ClickHouse/pull/61908) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Initial implementation of vector similarity index. [#63675](https://github.com/ClickHouse/ClickHouse/pull/63675) ([Robert Schulze](https://github.com/rschu1ze)).
-* Update zlib-ng from 2.0.2 to 2.1.7. [#64489](https://github.com/ClickHouse/ClickHouse/pull/64489) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fix 02444_async_broken_outdated_part_loading flakiness. [#64956](https://github.com/ClickHouse/ClickHouse/pull/64956) ([Azat Khuzhin](https://github.com/azat)).
-* attach_gdb.lib: print more information before all stacks. [#65253](https://github.com/ClickHouse/ClickHouse/pull/65253) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fix some perf tests. [#65320](https://github.com/ClickHouse/ClickHouse/pull/65320) ([Nikita Taranov](https://github.com/nickitat)).
-* Remove ActionsDAGPtr whenever it is possible. [#65414](https://github.com/ClickHouse/ClickHouse/pull/65414) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Scheduler queue throughput introspection, Fix CPU indication in client. [#65654](https://github.com/ClickHouse/ClickHouse/pull/65654) ([Sergei Trifonov](https://github.com/serxa)).
-* Increase timeout in 02122_join_group_by_timeout for tsan build. [#65976](https://github.com/ClickHouse/ClickHouse/pull/65976) ([vdimir](https://github.com/vdimir)).
-* Remove default values for certificateFile/privateKeyFile/dhParamsFile in keeper config (to avoid annoying errors in logs). [#65978](https://github.com/ClickHouse/ClickHouse/pull/65978) ([Azat Khuzhin](https://github.com/azat)).
-* Update version_date.tsv and changelogs after v24.3.5.46-lts. [#66054](https://github.com/ClickHouse/ClickHouse/pull/66054) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Fix flaky `02814_currentDatabase_for_table_functions`. [#66111](https://github.com/ClickHouse/ClickHouse/pull/66111) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix possible data-race StorageKafka with statistics_interval_ms>0. [#66311](https://github.com/ClickHouse/ClickHouse/pull/66311) ([Azat Khuzhin](https://github.com/azat)).
-* Avoid unneeded calculation in SeriesPeriodDetect. [#66320](https://github.com/ClickHouse/ClickHouse/pull/66320) ([Ruihang Xia](https://github.com/waynexia)).
-* It aims to complete [#58630](https://github.com/ClickHouse/ClickHouse/issues/58630). This is made possible by [#60463](https://github.com/ClickHouse/ClickHouse/issues/60463), [#61459](https://github.com/ClickHouse/ClickHouse/issues/61459) and [#60082](https://github.com/ClickHouse/ClickHouse/issues/60082). [#66443](https://github.com/ClickHouse/ClickHouse/pull/66443) ([Amos Bird](https://github.com/amosbird)).
-* Allow run query instantly in play. [#66457](https://github.com/ClickHouse/ClickHouse/pull/66457) ([Aleksandr Musorin](https://github.com/AVMusorin)).
-* Bump ICU from v70 to v75. [#66474](https://github.com/ClickHouse/ClickHouse/pull/66474) ([Robert Schulze](https://github.com/rschu1ze)).
-* Bump RocksDB from v6.29.5 to v7.10.2. [#66475](https://github.com/ClickHouse/ClickHouse/pull/66475) ([Robert Schulze](https://github.com/rschu1ze)).
-* Bump RocksDB from v7.10.2 to v8.9.1. [#66479](https://github.com/ClickHouse/ClickHouse/pull/66479) ([Robert Schulze](https://github.com/rschu1ze)).
-* I believe the error code for this function should not be "NOT_ALLOWED" since it simply is an invalid query and "BAD_QUERY_PARAMETER" is a more reasonable error code for this. [#66491](https://github.com/ClickHouse/ClickHouse/pull/66491) ([Ali](https://github.com/xogoodnow)).
-* Update gdb to 15.1 (by compiling from sources). [#66494](https://github.com/ClickHouse/ClickHouse/pull/66494) ([Azat Khuzhin](https://github.com/azat)).
-* Ensure that llvm-symbolizer is used for symbolizing sanitizer reports. [#66495](https://github.com/ClickHouse/ClickHouse/pull/66495) ([Azat Khuzhin](https://github.com/azat)).
-* Remove unused local variables. [#66503](https://github.com/ClickHouse/ClickHouse/pull/66503) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* This will solve a lot of problems with inconsistent formatting. And it opens the path for [#65753](https://github.com/ClickHouse/ClickHouse/issues/65753). This closes [#66807](https://github.com/ClickHouse/ClickHouse/issues/66807). This closes [#61611](https://github.com/ClickHouse/ClickHouse/issues/61611). This closes [#61711](https://github.com/ClickHouse/ClickHouse/issues/61711). This closes [#67445](https://github.com/ClickHouse/ClickHouse/issues/67445). [#66506](https://github.com/ClickHouse/ClickHouse/pull/66506) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Rename Context::getSettings() to Context::getSettingsCopy(). [#66528](https://github.com/ClickHouse/ClickHouse/pull/66528) ([Raúl Marín](https://github.com/Algunenano)).
-* Uninteresting change: introducing `ClientApplicationBase`. [#66549](https://github.com/ClickHouse/ClickHouse/pull/66549) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Respond to parallel replicas protocol requests with priority on initiator. [#66618](https://github.com/ClickHouse/ClickHouse/pull/66618) ([Igor Nikonov](https://github.com/devcrafter)).
-* Fix bad code: it was catching exceptions. [#66628](https://github.com/ClickHouse/ClickHouse/pull/66628) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Dump all memory stats in CgroupsMemoryUsageObserver on hitting the limit. [#66732](https://github.com/ClickHouse/ClickHouse/pull/66732) ([Nikita Taranov](https://github.com/nickitat)).
-* Save writer thread id in shared mutex for debugging. [#66745](https://github.com/ClickHouse/ClickHouse/pull/66745) ([Alexander Gololobov](https://github.com/davenger)).
-* Increase asio pool size in case the server is tiny. [#66761](https://github.com/ClickHouse/ClickHouse/pull/66761) ([alesapin](https://github.com/alesapin)).
-* Looks like it runs too many mutations sometimes and fails to process them within the timeout. So if a query waits for mutations - the test fails. [#66785](https://github.com/ClickHouse/ClickHouse/pull/66785) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Better diagnostics in functional tests. [#66790](https://github.com/ClickHouse/ClickHouse/pull/66790) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix bad test `01042_system_reload_dictionary_reloads_completely`. [#66811](https://github.com/ClickHouse/ClickHouse/pull/66811) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Something is strange with the test about refreshable materialized views. [#66816](https://github.com/ClickHouse/ClickHouse/pull/66816) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Randomize `trace_profile_events`. [#66821](https://github.com/ClickHouse/ClickHouse/pull/66821) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Stop ignoring SIGSEGV in GDB. [#66847](https://github.com/ClickHouse/ClickHouse/pull/66847) ([Antonio Andelic](https://github.com/antonio2368)).
-* Followup [#66725](https://github.com/ClickHouse/ClickHouse/issues/66725). [#66869](https://github.com/ClickHouse/ClickHouse/pull/66869) ([vdimir](https://github.com/vdimir)).
-* When executing queries with parallel replicas that involve only a subset of nodes within a shard, the current behavior is that if all participating replicas are unavailable, the query completes without any errors but returns no results. Referencing issue [#65467](https://github.com/ClickHouse/ClickHouse/issues/65467), this pull request addresses the issue where only a portion of the nodes in a shard are participating in the execution. [#66880](https://github.com/ClickHouse/ClickHouse/pull/66880) ([zoomxi](https://github.com/zoomxi)).
-* Speed up stateful tests setup. [#66886](https://github.com/ClickHouse/ClickHouse/pull/66886) ([Raúl Marín](https://github.com/Algunenano)).
-* Functions [h-r]*: Iterate over input_rows_count where appropriate. [#66897](https://github.com/ClickHouse/ClickHouse/pull/66897) ([Robert Schulze](https://github.com/rschu1ze)).
-* Stateless tests: Change status of failed tests in case of server crash and add no-parallel to high-load tests. [#66901](https://github.com/ClickHouse/ClickHouse/pull/66901) ([Nikita Fomichev](https://github.com/fm4v)).
-* Fix performance test about the generateRandom table function, supposedly. [#66906](https://github.com/ClickHouse/ClickHouse/pull/66906) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix bad tests `share_big_sets`, CC @davenger. [#66908](https://github.com/ClickHouse/ClickHouse/pull/66908) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Speed up mutations for non-replicated MergeTree a bit. [#66909](https://github.com/ClickHouse/ClickHouse/pull/66909) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Speed up mutations for non-replicated MergeTree significantly. [#66911](https://github.com/ClickHouse/ClickHouse/pull/66911) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix views over distributed tables with Analyzer. [#66912](https://github.com/ClickHouse/ClickHouse/pull/66912) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* [CI fest] Try to fix `test_broken_projections/test.py::test_broken_ignored_replicated`. [#66915](https://github.com/ClickHouse/ClickHouse/pull/66915) ([Andrey Zvonov](https://github.com/zvonand)).
-* Decrease rate limit in `01923_network_receive_time_metric_insert`. [#66924](https://github.com/ClickHouse/ClickHouse/pull/66924) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Grouparrayintersect: fix serialization bug. [#66928](https://github.com/ClickHouse/ClickHouse/pull/66928) ([Raúl Marín](https://github.com/Algunenano)).
-* Update version after release branch. [#66929](https://github.com/ClickHouse/ClickHouse/pull/66929) ([Raúl Marín](https://github.com/Algunenano)).
-* Un-flake test_runtime_configurable_cache_size. [#66934](https://github.com/ClickHouse/ClickHouse/pull/66934) ([Robert Schulze](https://github.com/rschu1ze)).
-* fix unit tests ResolvePoolTest with timeouts. [#66953](https://github.com/ClickHouse/ClickHouse/pull/66953) ([Sema Checherinda](https://github.com/CheSema)).
-* Split slow test 03036_dynamic_read_subcolumns. [#66954](https://github.com/ClickHouse/ClickHouse/pull/66954) ([Nikita Taranov](https://github.com/nickitat)).
-* CI: Fixes docker server build for release branches. [#66955](https://github.com/ClickHouse/ClickHouse/pull/66955) ([Max K.](https://github.com/maxknv)).
-* Addressing issue [#64936](https://github.com/ClickHouse/ClickHouse/issues/64936). [#66973](https://github.com/ClickHouse/ClickHouse/pull/66973) ([alesapin](https://github.com/alesapin)).
-* Add initial 24.7 changelog. [#66976](https://github.com/ClickHouse/ClickHouse/pull/66976) ([Raúl Marín](https://github.com/Algunenano)).
-* Apply libunwind fix. [#66977](https://github.com/ClickHouse/ClickHouse/pull/66977) ([Michael Kolupaev](https://github.com/al13n321)).
-* CI: Add logs for debugging. [#66979](https://github.com/ClickHouse/ClickHouse/pull/66979) ([Max K.](https://github.com/maxknv)).
-* [CI Fest] Split dynamic tests and rewrite them from sh to sql to avoid timeouts. [#66981](https://github.com/ClickHouse/ClickHouse/pull/66981) ([Kruglov Pavel](https://github.com/Avogar)).
-* Split 01508_partition_pruning_long. [#66983](https://github.com/ClickHouse/ClickHouse/pull/66983) ([Nikita Taranov](https://github.com/nickitat)).
-* [CI Fest] Fix use-of-uninitialized-value in JSONExtract* numeric functions. [#66984](https://github.com/ClickHouse/ClickHouse/pull/66984) ([Kruglov Pavel](https://github.com/Avogar)).
-* It should fix SQLancer checks, but for some reason we stopped invalidating cache for docker builds and fix was not published to our CI for a while. [#66987](https://github.com/ClickHouse/ClickHouse/pull/66987) ([Ilya Yatsishin](https://github.com/qoega)).
-* Fixes [#66941](https://github.com/ClickHouse/ClickHouse/issues/66941). [#66991](https://github.com/ClickHouse/ClickHouse/pull/66991) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-* Remove the support for Kerberized HDFS. [#66998](https://github.com/ClickHouse/ClickHouse/pull/66998) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* CI: Fix for workflow results parsing. [#67000](https://github.com/ClickHouse/ClickHouse/pull/67000) ([Max K.](https://github.com/maxknv)).
-* Fix flaky `01454_storagememory_data_race_challenge`. [#67003](https://github.com/ClickHouse/ClickHouse/pull/67003) ([Antonio Andelic](https://github.com/antonio2368)).
-* CI: Jepsen Workflow fix for skipped builds and observability. [#67004](https://github.com/ClickHouse/ClickHouse/pull/67004) ([Max K.](https://github.com/maxknv)).
-* bugfix AttachedTable counting not symmetry, and adding some test logs…. [#67007](https://github.com/ClickHouse/ClickHouse/pull/67007) ([Xu Jia](https://github.com/XuJia0210)).
-* CI: Automerge when required and non-required checks completed. [#67008](https://github.com/ClickHouse/ClickHouse/pull/67008) ([Max K.](https://github.com/maxknv)).
-* Fix test `very_long_arrays`. [#67009](https://github.com/ClickHouse/ClickHouse/pull/67009) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Try to fix exception logging in destructors of static objects. [#67016](https://github.com/ClickHouse/ClickHouse/pull/67016) ([Antonio Andelic](https://github.com/antonio2368)).
-* [Green CI] Fix test test_storage_azure_blob_storage. [#67019](https://github.com/ClickHouse/ClickHouse/pull/67019) ([Daniil Ivanik](https://github.com/divanik)).
-* Integration tests: fix flaky tests `test_backup_restore_on_cluster/test_concurrency.py` & `test_manipulate_statistics/test.py`. [#67027](https://github.com/ClickHouse/ClickHouse/pull/67027) ([Nikita Fomichev](https://github.com/fm4v)).
-* [Green CI] Fix test test_storage_s3_queue/test.py::test_max_set_age. [#67035](https://github.com/ClickHouse/ClickHouse/pull/67035) ([Pablo Marcos](https://github.com/pamarcos)).
-* Test for alter select with parallel replicas. [#67041](https://github.com/ClickHouse/ClickHouse/pull/67041) ([Igor Nikonov](https://github.com/devcrafter)).
-* Split query into multiple queries to consume less memory at once + use less data. Fixes [#67034](https://github.com/ClickHouse/ClickHouse/issues/67034). [#67044](https://github.com/ClickHouse/ClickHouse/pull/67044) ([alesapin](https://github.com/alesapin)).
-* Disable setting `optimize_functions_to_subcolumns`. [#67046](https://github.com/ClickHouse/ClickHouse/pull/67046) ([Anton Popov](https://github.com/CurtizJ)).
-* Increase max allocation size for sanitizers. [#67049](https://github.com/ClickHouse/ClickHouse/pull/67049) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* rewrite 01171 test. [#67054](https://github.com/ClickHouse/ClickHouse/pull/67054) ([Sema Checherinda](https://github.com/CheSema)).
-* Add `**` to `hdfs` docs, add test for `**` in `hdfs`. [#67064](https://github.com/ClickHouse/ClickHouse/pull/67064) ([Andrey Zvonov](https://github.com/zvonand)).
-* Very sad failure: ``` 2024.07.24 13:28:45.517777 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> executeQuery: (from 172.16.11.1:55890) OPTIMIZE TABLE replicated_mt FINAL (stage: Complete) 2024.07.24 13:28:45.525945 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Trace> default.replicated_mt (ReplicatedMergeTreeQueue): Waiting for 4 entries to be processed: queue-0000000004, queue-0000000002, queue-0000000001, queue-0000000000 2024.07.24 13:29:15.528024 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e) (MergerMutator): Selected 3 parts from all_0_0_0 to all_2_2_0 2024.07.24 13:29:15.530736 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Trace> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e): Created log entry /clickhouse/tables/replicated_mt/log/log-0000000004 for merge all_0_2_1 2024.07.24 13:29:15.530873 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e): Waiting for node1 to process log entry 2024.07.24 13:29:15.530919 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e): Waiting for node1 to pull log-0000000004 to queue 2024.07.24 13:29:15.534286 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e): Looking for node corresponding to log-0000000004 in node1 queue 2024.07.24 13:29:15.534793 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> default.replicated_mt (6581a6fb-8458-466d-8350-89951eb1ac8e): Waiting for queue-0000000005 to disappear from node1 queue 2024.07.24 13:29:15.585533 [ 10 ] {08745bf9-4bc1-4946-b9a8-c03d82ec55dc} <Debug> TCPHandler: Processed in 30.067804125 sec. ```. [#67067](https://github.com/ClickHouse/ClickHouse/pull/67067) ([alesapin](https://github.com/alesapin)).
-* Fix flaky `test_seekable_formats_url` and `test_seekable_formats` S3 storage tests. [#67070](https://github.com/ClickHouse/ClickHouse/pull/67070) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* CI: Docker server build fix for new release workflow. [#67075](https://github.com/ClickHouse/ClickHouse/pull/67075) ([Max K.](https://github.com/maxknv)).
-* Fix 2680 flasky. [#67078](https://github.com/ClickHouse/ClickHouse/pull/67078) ([jsc0218](https://github.com/jsc0218)).
-* [CI Fest] Fix flaky 02447_drop_replica test. [#67085](https://github.com/ClickHouse/ClickHouse/pull/67085) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fixes [#67030](https://github.com/ClickHouse/ClickHouse/issues/67030). [#67086](https://github.com/ClickHouse/ClickHouse/pull/67086) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Increase timeout for curl in tests. [#67089](https://github.com/ClickHouse/ClickHouse/pull/67089) ([Anton Popov](https://github.com/CurtizJ)).
-* Try calculating available memory if ClickHouse is bound to subset of NUMA nodes. [#67098](https://github.com/ClickHouse/ClickHouse/pull/67098) ([Antonio Andelic](https://github.com/antonio2368)).
-* A more precise way of tracking flushing time in 01246_buffer_flush. [#67099](https://github.com/ClickHouse/ClickHouse/pull/67099) ([Azat Khuzhin](https://github.com/azat)).
-* Do not fail CheckReadyForMerge on failed Tests_2 (non-required jobs) Do not skip CiBuddy report step on failures. [#67101](https://github.com/ClickHouse/ClickHouse/pull/67101) ([Max K.](https://github.com/maxknv)).
-* Tststs_1 - for all required checks Tststs_2 - for all non-required checks (normal mode) Tststs_2_ww - for all non-required checks (woolenwolfdog mode). [#67104](https://github.com/ClickHouse/ClickHouse/pull/67104) ([Max K.](https://github.com/maxknv)).
-* Functions [s-t]*: Iterate over input_rows_count where appropriate. [#67105](https://github.com/ClickHouse/ClickHouse/pull/67105) ([Robert Schulze](https://github.com/rschu1ze)).
-* Reintroduce 02805_distributed_queries_timeouts. [#67106](https://github.com/ClickHouse/ClickHouse/pull/67106) ([Azat Khuzhin](https://github.com/azat)).
-* Added some tests in relation with [#54881](https://github.com/ClickHouse/ClickHouse/issues/54881). [#67110](https://github.com/ClickHouse/ClickHouse/pull/67110) ([max-vostrikov](https://github.com/max-vostrikov)).
-* Reintroduce 03002_part_log_rmt_fetch_*_error tests without flakiness and less time. [#67113](https://github.com/ClickHouse/ClickHouse/pull/67113) ([Azat Khuzhin](https://github.com/azat)).
-* Improve tag matching in backport scripts. [#67118](https://github.com/ClickHouse/ClickHouse/pull/67118) ([Raúl Marín](https://github.com/Algunenano)).
-* Fixes [#67111](https://github.com/ClickHouse/ClickHouse/issues/67111). [#67121](https://github.com/ClickHouse/ClickHouse/pull/67121) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-* Increase lock_acquire_timeout_for_background_operations setting in dynamic merges tests. [#67126](https://github.com/ClickHouse/ClickHouse/pull/67126) ([Kruglov Pavel](https://github.com/Avogar)).
-* Attempt to fix flakiness of some window view tests. [#67130](https://github.com/ClickHouse/ClickHouse/pull/67130) ([Robert Schulze](https://github.com/rschu1ze)).
-* Update assert in cache. [#67138](https://github.com/ClickHouse/ClickHouse/pull/67138) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix test `00673_subquery_prepared_set_performance`. [#67141](https://github.com/ClickHouse/ClickHouse/pull/67141) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fixes [#67047](https://github.com/ClickHouse/ClickHouse/issues/67047). [#67142](https://github.com/ClickHouse/ClickHouse/pull/67142) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Lower max allocation size in query fuzzer. [#67145](https://github.com/ClickHouse/ClickHouse/pull/67145) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fixes [#66966](https://github.com/ClickHouse/ClickHouse/issues/66966). [#67147](https://github.com/ClickHouse/ClickHouse/pull/67147) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Try fix `02481_async_insert_race_long` flakiness. [#67148](https://github.com/ClickHouse/ClickHouse/pull/67148) ([Julia Kartseva](https://github.com/jkartseva)).
-* Rename (unreleased) bad setting. [#67149](https://github.com/ClickHouse/ClickHouse/pull/67149) ([Raúl Marín](https://github.com/Algunenano)).
-* Uncomment accidentally commented out code in QueryProfiler. [#67152](https://github.com/ClickHouse/ClickHouse/pull/67152) ([Michael Kolupaev](https://github.com/al13n321)).
-* Try to fix 2572. [#67158](https://github.com/ClickHouse/ClickHouse/pull/67158) ([jsc0218](https://github.com/jsc0218)).
-* Fix benign data race in ZooKeeper. [#67164](https://github.com/ClickHouse/ClickHouse/pull/67164) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Remove too long unit test. [#67168](https://github.com/ClickHouse/ClickHouse/pull/67168) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix `00705_drop_create_merge_tree`. [#67170](https://github.com/ClickHouse/ClickHouse/pull/67170) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix stacktrace cache. [#67173](https://github.com/ClickHouse/ClickHouse/pull/67173) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fixes [#67151](https://github.com/ClickHouse/ClickHouse/issues/67151). [#67174](https://github.com/ClickHouse/ClickHouse/pull/67174) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-* Make 02908_many_requests_to_system_replicas less stressful. [#67176](https://github.com/ClickHouse/ClickHouse/pull/67176) ([Alexander Gololobov](https://github.com/davenger)).
-* Reduce max time of 00763_long_lock_buffer_alter_destination_table. [#67185](https://github.com/ClickHouse/ClickHouse/pull/67185) ([Raúl Marín](https://github.com/Algunenano)).
-* Do not count AttachedTable for tables in information schema databases. [#67187](https://github.com/ClickHouse/ClickHouse/pull/67187) ([Sergei Trifonov](https://github.com/serxa)).
-* Verbose output for 03203_client_benchmark_options. [#67188](https://github.com/ClickHouse/ClickHouse/pull/67188) ([vdimir](https://github.com/vdimir)).
-* Split test 02967_parallel_replicas_join_algo_and_analyzer. [#67211](https://github.com/ClickHouse/ClickHouse/pull/67211) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix flaky `test_pkill_query_log` (tsan). [#67223](https://github.com/ClickHouse/ClickHouse/pull/67223) ([Sergei Trifonov](https://github.com/serxa)).
-* Remove integration test `test_broken_projections_in_backups_1`. [#67231](https://github.com/ClickHouse/ClickHouse/pull/67231) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Debug logging for [#67002](https://github.com/ClickHouse/ClickHouse/issues/67002). [#67233](https://github.com/ClickHouse/ClickHouse/pull/67233) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix oss-fuzz build. [#67235](https://github.com/ClickHouse/ClickHouse/pull/67235) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix flaky 00180_no_seek_avoiding_when_reading_from_cache. [#67236](https://github.com/ClickHouse/ClickHouse/pull/67236) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* English. [#67258](https://github.com/ClickHouse/ClickHouse/pull/67258) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Remove strange code. [#67260](https://github.com/ClickHouse/ClickHouse/pull/67260) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix MSan report in DatabaseReplicated. [#67262](https://github.com/ClickHouse/ClickHouse/pull/67262) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix test `02310_clickhouse_local_INSERT_progress_profile_events`. [#67264](https://github.com/ClickHouse/ClickHouse/pull/67264) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Remove test `02982_aggregation_states_destruction`. [#67266](https://github.com/ClickHouse/ClickHouse/pull/67266) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix OOM in test runs. [#67268](https://github.com/ClickHouse/ClickHouse/pull/67268) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Remove harmful stuff from tests. [#67275](https://github.com/ClickHouse/ClickHouse/pull/67275) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix test `03201_variant_null_map_subcolumn`. [#67276](https://github.com/ClickHouse/ClickHouse/pull/67276) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Split `01651_lc_insert_tiny_log`. [#67279](https://github.com/ClickHouse/ClickHouse/pull/67279) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Debug test `02490_benchmark_max_consecutive_errors`. [#67281](https://github.com/ClickHouse/ClickHouse/pull/67281) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix bad test `02833_concurrrent_sessions`. [#67282](https://github.com/ClickHouse/ClickHouse/pull/67282) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add a separate test for exception handling. [#67283](https://github.com/ClickHouse/ClickHouse/pull/67283) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Debug test `01600_parts_states_metrics_long`. [#67284](https://github.com/ClickHouse/ClickHouse/pull/67284) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Faster test `02231_buffer_aggregate_states_leak`. [#67285](https://github.com/ClickHouse/ClickHouse/pull/67285) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix curiosities in `TimerDescriptor`. [#67287](https://github.com/ClickHouse/ClickHouse/pull/67287) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add retries to test `02911_backup_restore_keeper_map`. [#67290](https://github.com/ClickHouse/ClickHouse/pull/67290) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Functions: Iterate over input_rows_count where appropriate. [#67294](https://github.com/ClickHouse/ClickHouse/pull/67294) ([Robert Schulze](https://github.com/rschu1ze)).
-* Add documentation for `compile_expressions`. [#67300](https://github.com/ClickHouse/ClickHouse/pull/67300) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Wrap log lines in the CI report for functional tests. [#67301](https://github.com/ClickHouse/ClickHouse/pull/67301) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix bad test `02050_client_profile_events`. [#67309](https://github.com/ClickHouse/ClickHouse/pull/67309) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* I do not want to think about this code. [#67312](https://github.com/ClickHouse/ClickHouse/pull/67312) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix test `00940_max_parts_in_total`. [#67313](https://github.com/ClickHouse/ClickHouse/pull/67313) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Tests for Kafka cannot run in parallel. [#67315](https://github.com/ClickHouse/ClickHouse/pull/67315) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add a test for [#66285](https://github.com/ClickHouse/ClickHouse/issues/66285). [#67325](https://github.com/ClickHouse/ClickHouse/pull/67325) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Follow-up for [#67301](https://github.com/ClickHouse/ClickHouse/issues/67301). [#67327](https://github.com/ClickHouse/ClickHouse/pull/67327) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add a test for [#61659](https://github.com/ClickHouse/ClickHouse/issues/61659). [#67332](https://github.com/ClickHouse/ClickHouse/pull/67332) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix integration test `test_backup_restore_on_cluster/test_disallow_concurrency`. [#67336](https://github.com/ClickHouse/ClickHouse/pull/67336) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Faster and less flaky 01246_buffer_flush (by using HTTP over clickhouse-client). [#67340](https://github.com/ClickHouse/ClickHouse/pull/67340) ([Azat Khuzhin](https://github.com/azat)).
-* Fix: data race in TCPHandler on socket timeouts settings. [#67341](https://github.com/ClickHouse/ClickHouse/pull/67341) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* CI: Print stdout, stderr for docker pull command. [#67343](https://github.com/ClickHouse/ClickHouse/pull/67343) ([Max K.](https://github.com/maxknv)).
-* Followup [#67290](https://github.com/ClickHouse/ClickHouse/issues/67290). [#67348](https://github.com/ClickHouse/ClickHouse/pull/67348) ([vdimir](https://github.com/vdimir)).
-* Skip parallel for `test_storage_kerberized_kafka`. [#67349](https://github.com/ClickHouse/ClickHouse/pull/67349) ([Andrey Zvonov](https://github.com/zvonand)).
-* Don't use PeekableReadBuffer in JSONAsObject format. [#67354](https://github.com/ClickHouse/ClickHouse/pull/67354) ([Kruglov Pavel](https://github.com/Avogar)).
-* This closes: [#57316](https://github.com/ClickHouse/ClickHouse/issues/57316). [#67355](https://github.com/ClickHouse/ClickHouse/pull/67355) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Remove duplicated tests. [#67357](https://github.com/ClickHouse/ClickHouse/pull/67357) ([Kruglov Pavel](https://github.com/Avogar)).
-* Release branch was not detected properly and job which must run on release branch could be reused from feature branches. PR Fixes detection of release branches. [#67358](https://github.com/ClickHouse/ClickHouse/pull/67358) ([Max K.](https://github.com/maxknv)).
-* Disable some Dynamic tests under sanitizers, rewrite 03202_dynamic_null_map_subcolumn to sql. [#67359](https://github.com/ClickHouse/ClickHouse/pull/67359) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add no-distributed-cache tag in tests. [#67361](https://github.com/ClickHouse/ClickHouse/pull/67361) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Trying to fix test_cache_evicted_by_temporary_data and print debug info. [#67362](https://github.com/ClickHouse/ClickHouse/pull/67362) ([vdimir](https://github.com/vdimir)).
-* Try to fix: ALL_CONNECTION_TRIES_FAILED with parallel replicas. [#67389](https://github.com/ClickHouse/ClickHouse/pull/67389) ([Igor Nikonov](https://github.com/devcrafter)).
-* Fix bad test `01036_no_superfluous_dict_reload_on_create_database`. [#67390](https://github.com/ClickHouse/ClickHouse/pull/67390) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Adding `SelectedPartsTotal` and `SelectedMarksTotal` as new ProfileEvents. [#67393](https://github.com/ClickHouse/ClickHouse/pull/67393) ([Jordi Villar](https://github.com/jrdi)).
-* Print debug info in `test_storage_s3_queue/test.py::test_shards_distributed`. [#67394](https://github.com/ClickHouse/ClickHouse/pull/67394) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Mute degraded perf test. [#67396](https://github.com/ClickHouse/ClickHouse/pull/67396) ([Nikita Taranov](https://github.com/nickitat)).
-* Debug TimerDescriptor. [#67397](https://github.com/ClickHouse/ClickHouse/pull/67397) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Remove has_single_port property from plan stream. [#67398](https://github.com/ClickHouse/ClickHouse/pull/67398) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix typo. [#67400](https://github.com/ClickHouse/ClickHouse/pull/67400) ([Halersson Paris](https://github.com/halersson)).
-* CI: Fix build results for release branches. [#67402](https://github.com/ClickHouse/ClickHouse/pull/67402) ([Max K.](https://github.com/maxknv)).
-* Disable 02932_refreshable_materialized_views. [#67404](https://github.com/ClickHouse/ClickHouse/pull/67404) ([Michael Kolupaev](https://github.com/al13n321)).
-* Follow-up to [#67294](https://github.com/ClickHouse/ClickHouse/issues/67294). [#67405](https://github.com/ClickHouse/ClickHouse/pull/67405) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix DWARF range list parsing in stack symbolizer. [#67417](https://github.com/ClickHouse/ClickHouse/pull/67417) ([Michael Kolupaev](https://github.com/al13n321)).
-* Make Dwarf::findAddress() fallback slow path less slow. [#67418](https://github.com/ClickHouse/ClickHouse/pull/67418) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fix inconsistent formatting of CODEC and STATISTICS. [#67421](https://github.com/ClickHouse/ClickHouse/pull/67421) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Reduced complexity of the test 02832_alter_max_sessions_for_user. [#67425](https://github.com/ClickHouse/ClickHouse/pull/67425) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
-* Remove obsolete `--multiquery` parameter from tests. [#67435](https://github.com/ClickHouse/ClickHouse/pull/67435) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix public backports. [#67439](https://github.com/ClickHouse/ClickHouse/pull/67439) ([Raúl Marín](https://github.com/Algunenano)).
-* Bump Azure from v1.12 to v1.13. [#67446](https://github.com/ClickHouse/ClickHouse/pull/67446) ([Robert Schulze](https://github.com/rschu1ze)).
-* 24.7 add missing documentation and testing. [#67454](https://github.com/ClickHouse/ClickHouse/pull/67454) ([Nikita Fomichev](https://github.com/fm4v)).
-* Use correct order of fields in `StorageURLSource`. [#67455](https://github.com/ClickHouse/ClickHouse/pull/67455) ([Antonio Andelic](https://github.com/antonio2368)).
-* run 01171 test in parallel. [#67470](https://github.com/ClickHouse/ClickHouse/pull/67470) ([Sema Checherinda](https://github.com/CheSema)).
-* [Green CI] Fix WriteBuffer destructor when finalize has failed for MergeTreeDeduplicationLog::shutdown. [#67474](https://github.com/ClickHouse/ClickHouse/pull/67474) ([Alexey Katsman](https://github.com/alexkats)).
-* Reduce 02473_multistep_prewhere run time. [#67475](https://github.com/ClickHouse/ClickHouse/pull/67475) ([Alexander Gololobov](https://github.com/davenger)).
-* Update version_date.tsv and changelogs after v24.7.1.2915-stable. [#67483](https://github.com/ClickHouse/ClickHouse/pull/67483) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Revert [#61750](https://github.com/ClickHouse/ClickHouse/issues/61750) "Improve JSONEachRow reading by ignoring the keys case". [#67484](https://github.com/ClickHouse/ClickHouse/pull/67484) ([Michael Kolupaev](https://github.com/al13n321)).
-* Disable parallel run for `01923_network_receive_time_metric_insert.sh`. [#67492](https://github.com/ClickHouse/ClickHouse/pull/67492) ([Julia Kartseva](https://github.com/jkartseva)).
-* Fix test `test_backup_restore_on_cluster/test.py::test_mutation`. [#67494](https://github.com/ClickHouse/ClickHouse/pull/67494) ([Vitaly Baranov](https://github.com/vitlibar)).
-* [Green CI] Fix potentially flaky test_mask_sensitive_info integration test. [#67506](https://github.com/ClickHouse/ClickHouse/pull/67506) ([Alexey Katsman](https://github.com/alexkats)).
-* [Green CI] Test `test_storage_azure_blob_storage/test.py` is flaky. [#67512](https://github.com/ClickHouse/ClickHouse/pull/67512) ([Daniil Ivanik](https://github.com/divanik)).
-* Prepare Release workflow for production. [#67523](https://github.com/ClickHouse/ClickHouse/pull/67523) ([Max K.](https://github.com/maxknv)).
-* Fix upgrade check. [#67524](https://github.com/ClickHouse/ClickHouse/pull/67524) ([Raúl Marín](https://github.com/Algunenano)).
-* [Green CI] test 03164_s3_settings_for_queries_and_merges is flaky. [#67535](https://github.com/ClickHouse/ClickHouse/pull/67535) ([Daniil Ivanik](https://github.com/divanik)).
-* Log message and increased concurrency for table removal. [#67537](https://github.com/ClickHouse/ClickHouse/pull/67537) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix AsyncLoader destruction race. [#67553](https://github.com/ClickHouse/ClickHouse/pull/67553) ([Sergei Trifonov](https://github.com/serxa)).
-* Add an assert into TimerDescriptor. [#67555](https://github.com/ClickHouse/ClickHouse/pull/67555) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Re-enable ICU on s390/x. [#67557](https://github.com/ClickHouse/ClickHouse/pull/67557) ([Robert Schulze](https://github.com/rschu1ze)).
-* Update version_date.tsv and changelogs after v24.4.4.107-stable. [#67559](https://github.com/ClickHouse/ClickHouse/pull/67559) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Sometimes we fail with timeout in stateless tests and the reason for that seems to be in `stop_logs_replication` step. Add a check for timeout here. [#67560](https://github.com/ClickHouse/ClickHouse/pull/67560) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Miscellaneous. [#67564](https://github.com/ClickHouse/ClickHouse/pull/67564) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* enable parallel_view_processing in perf tests. [#67565](https://github.com/ClickHouse/ClickHouse/pull/67565) ([Sema Checherinda](https://github.com/CheSema)).
-* Fix flaky `test_system_kafka_consumers_rebalance`. [#67566](https://github.com/ClickHouse/ClickHouse/pull/67566) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Update version_date.tsv and changelogs after v24.7.2.13-stable. [#67586](https://github.com/ClickHouse/ClickHouse/pull/67586) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Fix 01811_storage_buffer_flush_parameters flakiness. [#67589](https://github.com/ClickHouse/ClickHouse/pull/67589) ([Azat Khuzhin](https://github.com/azat)).
-* Fix test_zookeeper_config_load_balancing after adding the xdist worker name to the instance. [#67590](https://github.com/ClickHouse/ClickHouse/pull/67590) ([Pablo Marcos](https://github.com/pamarcos)).
-* Update minio in integration tests. [#67595](https://github.com/ClickHouse/ClickHouse/pull/67595) ([Antonio Andelic](https://github.com/antonio2368)).
-* added tests for page index in parquet files. [#67596](https://github.com/ClickHouse/ClickHouse/pull/67596) ([max-vostrikov](https://github.com/max-vostrikov)).
-* Update check_rabbitmq_is_available. [#67597](https://github.com/ClickHouse/ClickHouse/pull/67597) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix 02434_cancel_insert_when_client_dies. [#67600](https://github.com/ClickHouse/ClickHouse/pull/67600) ([vdimir](https://github.com/vdimir)).
-* Fix 02910_bad_logs_level_in_local in fast tests. [#67603](https://github.com/ClickHouse/ClickHouse/pull/67603) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix 01605_adaptive_granularity_block_borders. [#67605](https://github.com/ClickHouse/ClickHouse/pull/67605) ([Nikita Taranov](https://github.com/nickitat)).
-* Update CHANGELOG.md. [#67607](https://github.com/ClickHouse/ClickHouse/pull/67607) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Remove some `no-parallel` tags from tests. [#67610](https://github.com/ClickHouse/ClickHouse/pull/67610) ([Raúl Marín](https://github.com/Algunenano)).
-* Update README.md. [#67613](https://github.com/ClickHouse/ClickHouse/pull/67613) ([Tyler Hannan](https://github.com/tylerhannan)).
-* Try fix 03143_asof_join_ddb_long. [#67620](https://github.com/ClickHouse/ClickHouse/pull/67620) ([Nikita Taranov](https://github.com/nickitat)).
-* Don't run ASAN unit tests under gdb. [#67622](https://github.com/ClickHouse/ClickHouse/pull/67622) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix crash in KeyCondition::cloneASTWithInversionPushDown() caused by type change. [#67641](https://github.com/ClickHouse/ClickHouse/pull/67641) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fix race condition between ProcessList and Settings. [#67645](https://github.com/ClickHouse/ClickHouse/pull/67645) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* `02481_async_insert_race_long.sh` flakiness fixes. [#67650](https://github.com/ClickHouse/ClickHouse/pull/67650) ([Julia Kartseva](https://github.com/jkartseva)).
-* Fixes [#67651](https://github.com/ClickHouse/ClickHouse/issues/67651). [#67653](https://github.com/ClickHouse/ClickHouse/pull/67653) ([pufit](https://github.com/pufit)).
-* Fix flaky `test_replicated_table_attach`. [#67658](https://github.com/ClickHouse/ClickHouse/pull/67658) ([Antonio Andelic](https://github.com/antonio2368)).
-* Update version_date.tsv and changelogs after v24.4.4.113-stable. [#67659](https://github.com/ClickHouse/ClickHouse/pull/67659) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Even better healthcheck for ldap. [#67667](https://github.com/ClickHouse/ClickHouse/pull/67667) ([Andrey Zvonov](https://github.com/zvonand)).
-* Fix 03203_client_benchmark_options. [#67671](https://github.com/ClickHouse/ClickHouse/pull/67671) ([vdimir](https://github.com/vdimir)).
-* Integration tests: fix ports clashing problem. [#67672](https://github.com/ClickHouse/ClickHouse/pull/67672) ([Nikita Fomichev](https://github.com/fm4v)).
-* Remove some `no-parallel` tags from tests (Part 2). [#67673](https://github.com/ClickHouse/ClickHouse/pull/67673) ([Raúl Marín](https://github.com/Algunenano)).
-* Use FunctionArgumentDescriptors for bitSlice. [#67674](https://github.com/ClickHouse/ClickHouse/pull/67674) ([Lennard Eijsackers](https://github.com/Blokje5)).
-* Update version_date.tsv and changelog after v24.3.6.48-lts. [#67677](https://github.com/ClickHouse/ClickHouse/pull/67677) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Avoid ddl queue timeout in 02313_filesystem_cache_seeks. [#67680](https://github.com/ClickHouse/ClickHouse/pull/67680) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix bad log message in sort description. [#67690](https://github.com/ClickHouse/ClickHouse/pull/67690) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Update version_date.tsv and changelog after v23.8.16.40-lts. [#67692](https://github.com/ClickHouse/ClickHouse/pull/67692) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Fix check names in test reports and the CI Logs database. [#67696](https://github.com/ClickHouse/ClickHouse/pull/67696) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* CI: Minor refactoring in ci_utils. [#67706](https://github.com/ClickHouse/ClickHouse/pull/67706) ([Max K.](https://github.com/maxknv)).
-* Fix 01042_system_reload_dictionary_reloads_completely flakiness. [#67719](https://github.com/ClickHouse/ClickHouse/pull/67719) ([Azat Khuzhin](https://github.com/azat)).
-* Fix test `00002_log_and_exception_messages_formatting`. [#67723](https://github.com/ClickHouse/ClickHouse/pull/67723) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix test `02789_reading_from_s3_with_connection_pool`. [#67726](https://github.com/ClickHouse/ClickHouse/pull/67726) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix strange code in HostResolvePool. [#67727](https://github.com/ClickHouse/ClickHouse/pull/67727) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix a typo. [#67729](https://github.com/ClickHouse/ClickHouse/pull/67729) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Smart handling of processes leftovers in tests. [#67737](https://github.com/ClickHouse/ClickHouse/pull/67737) ([Azat Khuzhin](https://github.com/azat)).
-* Fix test retries. [#67738](https://github.com/ClickHouse/ClickHouse/pull/67738) ([Azat Khuzhin](https://github.com/azat)).
-* Fill only selected columns from system.clusters. [#67739](https://github.com/ClickHouse/ClickHouse/pull/67739) ([Azat Khuzhin](https://github.com/azat)).
-* Bump NuRaft (to properly catch thread exceptions). [#67740](https://github.com/ClickHouse/ClickHouse/pull/67740) ([Azat Khuzhin](https://github.com/azat)).
-* Try to fix RabbitMQ test failures. [#67743](https://github.com/ClickHouse/ClickHouse/pull/67743) ([Azat Khuzhin](https://github.com/azat)).
-* Stateless tests: attempt to fix timeouts of `02473_multistep_prewhere* 00411_long_accurate_number_comparison*`. [#67746](https://github.com/ClickHouse/ClickHouse/pull/67746) ([Nikita Fomichev](https://github.com/fm4v)).
-* Fix test_ttl_move::test_alter_with_merge_work flakiness. [#67747](https://github.com/ClickHouse/ClickHouse/pull/67747) ([Azat Khuzhin](https://github.com/azat)).
-* ci: better stateless runner (correctly collect artifacts and also some basic errors capturing). [#67752](https://github.com/ClickHouse/ClickHouse/pull/67752) ([Azat Khuzhin](https://github.com/azat)).
-* Introduce `no-flaky-check` tag. [#67755](https://github.com/ClickHouse/ClickHouse/pull/67755) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Whitespaces. [#67771](https://github.com/ClickHouse/ClickHouse/pull/67771) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* [RFC] Print original query for AST formatting check on CI. [#67776](https://github.com/ClickHouse/ClickHouse/pull/67776) ([Azat Khuzhin](https://github.com/azat)).
-* Fix test `02833_concurrent_sessions`, Fix test `02835_drop_user_during_session`. [#67779](https://github.com/ClickHouse/ClickHouse/pull/67779) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix diagnostics in the test script. [#67780](https://github.com/ClickHouse/ClickHouse/pull/67780) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix test `02231_bloom_filter_sizing`. [#67784](https://github.com/ClickHouse/ClickHouse/pull/67784) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fixed session_log related tests race condition on logout. [#67785](https://github.com/ClickHouse/ClickHouse/pull/67785) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
-* ci/stateless: fix artifacts post-processing and detect if something failed there. [#67791](https://github.com/ClickHouse/ClickHouse/pull/67791) ([Azat Khuzhin](https://github.com/azat)).
-* Integration tests: fix flaky `test_dictionaries_update_and_reload::test_reload_after_fail_by_timer`. [#67793](https://github.com/ClickHouse/ClickHouse/pull/67793) ([Nikita Fomichev](https://github.com/fm4v)).
-* Fix possible CANNOT_READ_ALL_DATA during server startup in performance tests. [#67795](https://github.com/ClickHouse/ClickHouse/pull/67795) ([Azat Khuzhin](https://github.com/azat)).
-* Reduce table size in 03037_dynamic_merges_2* tests. [#67797](https://github.com/ClickHouse/ClickHouse/pull/67797) ([Kruglov Pavel](https://github.com/Avogar)).
-* Disable 03038_nested_dynamic_merges* under sanitizers because it's too slow. [#67798](https://github.com/ClickHouse/ClickHouse/pull/67798) ([Kruglov Pavel](https://github.com/Avogar)).
-* Revert "Merge pull request [#66510](https://github.com/ClickHouse/ClickHouse/issues/66510) from canhld94/fix_trivial_count_non_deterministic_func". [#67800](https://github.com/ClickHouse/ClickHouse/pull/67800) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Update comment. [#67801](https://github.com/ClickHouse/ClickHouse/pull/67801) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix bad test `03032_redundant_equals`. [#67822](https://github.com/ClickHouse/ClickHouse/pull/67822) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Update tags for a few tests. [#67829](https://github.com/ClickHouse/ClickHouse/pull/67829) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Add debug logging for window view tests. [#67841](https://github.com/ClickHouse/ClickHouse/pull/67841) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Closes [#67621](https://github.com/ClickHouse/ClickHouse/issues/67621). [#67843](https://github.com/ClickHouse/ClickHouse/pull/67843) ([Ilya Yatsishin](https://github.com/qoega)).
-* Fix query cache randomization in stress tests. [#67855](https://github.com/ClickHouse/ClickHouse/pull/67855) ([Azat Khuzhin](https://github.com/azat)).
-* Update version_date.tsv and changelogs after v24.5.5.78-stable. [#67863](https://github.com/ClickHouse/ClickHouse/pull/67863) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Un-flake 02524_fuzz_and_fuss_2. [#67867](https://github.com/ClickHouse/ClickHouse/pull/67867) ([Robert Schulze](https://github.com/rschu1ze)).
-* Misc fixes. [#67869](https://github.com/ClickHouse/ClickHouse/pull/67869) ([Alexey Katsman](https://github.com/alexkats)).
-* Fixes [#67444](https://github.com/ClickHouse/ClickHouse/issues/67444). [#67873](https://github.com/ClickHouse/ClickHouse/pull/67873) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-* no-msan 00314_sample_factor_virtual_column. [#67874](https://github.com/ClickHouse/ClickHouse/pull/67874) ([Michael Kolupaev](https://github.com/al13n321)).
-* Revert "Revert "Add a test for [#47892](https://github.com/ClickHouse/ClickHouse/issues/47892)"". [#67877](https://github.com/ClickHouse/ClickHouse/pull/67877) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Lazily create invalid files in S3. [#67882](https://github.com/ClickHouse/ClickHouse/pull/67882) ([Antonio Andelic](https://github.com/antonio2368)).
-* Do not try to create azure container if not needed. [#67896](https://github.com/ClickHouse/ClickHouse/pull/67896) ([Anton Popov](https://github.com/CurtizJ)).
-* CI: Fix for setting Mergeable Check from sync. [#67898](https://github.com/ClickHouse/ClickHouse/pull/67898) ([Max K.](https://github.com/maxknv)).
-* Bump rocksdb from v8.10 to v9.4 + enable jemalloc and liburing. [#67904](https://github.com/ClickHouse/ClickHouse/pull/67904) ([Robert Schulze](https://github.com/rschu1ze)).
-* Update version_date.tsv and changelogs after v24.6.3.95-stable. [#67910](https://github.com/ClickHouse/ClickHouse/pull/67910) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Remove some no-parallel tags from tests (Part 3). [#67914](https://github.com/ClickHouse/ClickHouse/pull/67914) ([Raúl Marín](https://github.com/Algunenano)).
-* Follow up [#67235](https://github.com/ClickHouse/ClickHouse/issues/67235). [#67917](https://github.com/ClickHouse/ClickHouse/pull/67917) ([Nikita Taranov](https://github.com/nickitat)).
-* CI: Changelog: Critical Bug Fix to Bug Fix. [#67919](https://github.com/ClickHouse/ClickHouse/pull/67919) ([Max K.](https://github.com/maxknv)).
-* CI: Multi-channel CiBuddy. [#67923](https://github.com/ClickHouse/ClickHouse/pull/67923) ([Max K.](https://github.com/maxknv)).
-* more logs to debug logical error from async inserts. [#67928](https://github.com/ClickHouse/ClickHouse/pull/67928) ([Han Fei](https://github.com/hanfei1991)).
-* Fix stress test error with TDigest statistics. [#67930](https://github.com/ClickHouse/ClickHouse/pull/67930) ([Robert Schulze](https://github.com/rschu1ze)).
-* Remove some no-parallel tags from tests (Part 4). [#67932](https://github.com/ClickHouse/ClickHouse/pull/67932) ([Raúl Marín](https://github.com/Algunenano)).
-* Upgrade QPL to v1.6.0. [#67933](https://github.com/ClickHouse/ClickHouse/pull/67933) ([Maria Zhukova](https://github.com/mzhukova)).
-* CI: Strict job timeout 1.5h for tests, 2h for builds. [#67934](https://github.com/ClickHouse/ClickHouse/pull/67934) ([Max K.](https://github.com/maxknv)).
-* Remove slow tests from fasttest check. [#67941](https://github.com/ClickHouse/ClickHouse/pull/67941) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix memory corruption in usearch. [#67942](https://github.com/ClickHouse/ClickHouse/pull/67942) ([Robert Schulze](https://github.com/rschu1ze)).
-* Backported in [#68547](https://github.com/ClickHouse/ClickHouse/issues/68547): Timeout handling for functional and integration tests, store artifacts and report if timed out - sets 2h default timeout for all jobs. [#67944](https://github.com/ClickHouse/ClickHouse/pull/67944) ([Max K.](https://github.com/maxknv)).
-* Unflake 02099_tsv_raw_format.sh. [#67947](https://github.com/ClickHouse/ClickHouse/pull/67947) ([Robert Schulze](https://github.com/rschu1ze)).
-* This closes: [#67866](https://github.com/ClickHouse/ClickHouse/issues/67866). [#67950](https://github.com/ClickHouse/ClickHouse/pull/67950) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Change log level of an insignificant message in clickhouse-local. [#67952](https://github.com/ClickHouse/ClickHouse/pull/67952) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add an explicit error for `ALTER MODIFY SQL SECURITY` on non-view tables. [#67953](https://github.com/ClickHouse/ClickHouse/pull/67953) ([pufit](https://github.com/pufit)).
-* Fix flaky `test_storage_s3_queue/test.py::test_multiple_tables_streaming_sync_distributed`. [#67959](https://github.com/ClickHouse/ClickHouse/pull/67959) ([Julia Kartseva](https://github.com/jkartseva)).
-* tests: fix 03002_part_log_rmt_fetch_merge_error flakiness. [#67960](https://github.com/ClickHouse/ClickHouse/pull/67960) ([Azat Khuzhin](https://github.com/azat)).
-* Fix timeout of 02310_clickhouse_local_INSERT_progress_profile_events. [#67961](https://github.com/ClickHouse/ClickHouse/pull/67961) ([Robert Schulze](https://github.com/rschu1ze)).
-* Remove obsolete `--multiquery` parameter (follow-up to [#63898](https://github.com/ClickHouse/ClickHouse/issues/63898)), pt. III. [#67964](https://github.com/ClickHouse/ClickHouse/pull/67964) ([Robert Schulze](https://github.com/rschu1ze)).
-* Update minio in stateless tests. [#67975](https://github.com/ClickHouse/ClickHouse/pull/67975) ([Antonio Andelic](https://github.com/antonio2368)).
-* CI: Integration tests uncover some logging. [#67978](https://github.com/ClickHouse/ClickHouse/pull/67978) ([Max K.](https://github.com/maxknv)).
-* Fix 03130_convert_outer_join_to_inner_join. [#67980](https://github.com/ClickHouse/ClickHouse/pull/67980) ([vdimir](https://github.com/vdimir)).
-* Collect minio audit logs in stateless tests. [#67998](https://github.com/ClickHouse/ClickHouse/pull/67998) ([Antonio Andelic](https://github.com/antonio2368)).
-* Remove some no-parallel tags from tests (Part 5). [#68002](https://github.com/ClickHouse/ClickHouse/pull/68002) ([Raúl Marín](https://github.com/Algunenano)).
-* Minor fixes in tables.md. [#68004](https://github.com/ClickHouse/ClickHouse/pull/68004) ([Ilya Yatsishin](https://github.com/qoega)).
-* Follow up for [#67843](https://github.com/ClickHouse/ClickHouse/issues/67843). [#68007](https://github.com/ClickHouse/ClickHouse/pull/68007) ([Ilya Yatsishin](https://github.com/qoega)).
-* Remove unused CLI option. [#68008](https://github.com/ClickHouse/ClickHouse/pull/68008) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix test `02845_threads_count_in_distributed_queries`. [#68011](https://github.com/ClickHouse/ClickHouse/pull/68011) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* CI: Pass job timeout into tests config. [#68013](https://github.com/ClickHouse/ClickHouse/pull/68013) ([Nikita Fomichev](https://github.com/fm4v)).
-* Add a test for [#57420](https://github.com/ClickHouse/ClickHouse/issues/57420). [#68017](https://github.com/ClickHouse/ClickHouse/pull/68017) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Revert "Revert "Bump rocksdb from v8.10 to v9.4 + enable jemalloc and liburing"". [#68021](https://github.com/ClickHouse/ClickHouse/pull/68021) ([Robert Schulze](https://github.com/rschu1ze)).
-* CI: Fix for filtering jobs in PRs. [#68022](https://github.com/ClickHouse/ClickHouse/pull/68022) ([Max K.](https://github.com/maxknv)).
-* Docs: Update 3rd party library guide. [#68027](https://github.com/ClickHouse/ClickHouse/pull/68027) ([Robert Schulze](https://github.com/rschu1ze)).
-* Refactor tests for (experimental) statistics. [#68034](https://github.com/ClickHouse/ClickHouse/pull/68034) ([Robert Schulze](https://github.com/rschu1ze)).
-* Split `00284_external_aggregation.sql`. [#68037](https://github.com/ClickHouse/ClickHouse/pull/68037) ([Robert Schulze](https://github.com/rschu1ze)).
-* Update version_date.tsv and changelog after v24.7.3.42-stable. [#68045](https://github.com/ClickHouse/ClickHouse/pull/68045) ([robot-clickhouse](https://github.com/robot-clickhouse)).
-* Update test_drop_is_lock_free/test.py. [#68051](https://github.com/ClickHouse/ClickHouse/pull/68051) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Fixes [#67865](https://github.com/ClickHouse/ClickHouse/issues/67865). [#68054](https://github.com/ClickHouse/ClickHouse/pull/68054) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-* Disable randomization of `trace_profile_events` in clickhouse-test. [#68058](https://github.com/ClickHouse/ClickHouse/pull/68058) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Minor CMake cleanup. [#68069](https://github.com/ClickHouse/ClickHouse/pull/68069) ([Robert Schulze](https://github.com/rschu1ze)).
-* If the test cluster is overloaded, sometimes simple query execution [can take more time](https://pastila.nl/?00224e71/f017cd6675b52ccc205c81aa62a47de5#8dB4+C4MOdOi3NLV1dc0Fg==) than `Buffer`'s max time to flush. This PR doubles the timeout and allows to skip the check in case of significant latency. [#68072](https://github.com/ClickHouse/ClickHouse/pull/68072) ([pufit](https://github.com/pufit)).
-* Fix flaky `02675_profile_events_from_query_log_and_client`. [#68097](https://github.com/ClickHouse/ClickHouse/pull/68097) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix race in `WithRetries`. [#68106](https://github.com/ClickHouse/ClickHouse/pull/68106) ([Antonio Andelic](https://github.com/antonio2368)).
-* Add empty cell to reports when time is missing. [#68112](https://github.com/ClickHouse/ClickHouse/pull/68112) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Fix test `00900_long_parquet_load`. [#68130](https://github.com/ClickHouse/ClickHouse/pull/68130) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* tests: fix 01246_buffer_flush flakiness due to slow trace_log flush. [#68134](https://github.com/ClickHouse/ClickHouse/pull/68134) ([Azat Khuzhin](https://github.com/azat)).
-* Only use Field::safeGet - Field::get prone to type punning. [#68135](https://github.com/ClickHouse/ClickHouse/pull/68135) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* tests: attempt to fix 01600_parts_states_metrics_long (by forbid parallel run). [#68136](https://github.com/ClickHouse/ClickHouse/pull/68136) ([Azat Khuzhin](https://github.com/azat)).
-* Fix01710 Timeout. [#68138](https://github.com/ClickHouse/ClickHouse/pull/68138) ([jsc0218](https://github.com/jsc0218)).
-* Remove the extra cell from reports when it is not necessary. [#68145](https://github.com/ClickHouse/ClickHouse/pull/68145) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Remove "Processing configuration file" message from clickhouse-local. [#68157](https://github.com/ClickHouse/ClickHouse/pull/68157) ([Azat Khuzhin](https://github.com/azat)).
-* tests: fix 02122_join_group_by_timeout flakiness. [#68160](https://github.com/ClickHouse/ClickHouse/pull/68160) ([Azat Khuzhin](https://github.com/azat)).
-* Fix `test_cluster_all_replicas`. [#68178](https://github.com/ClickHouse/ClickHouse/pull/68178) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix leftovers. [#68181](https://github.com/ClickHouse/ClickHouse/pull/68181) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix test `01172_transaction_counters`. [#68182](https://github.com/ClickHouse/ClickHouse/pull/68182) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Refactor tests for (experimental) statistics. [#68186](https://github.com/ClickHouse/ClickHouse/pull/68186) ([Robert Schulze](https://github.com/rschu1ze)).
-* Remove Log engine from Kafka integration tests. [#68200](https://github.com/ClickHouse/ClickHouse/pull/68200) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* [Green CI] Fix test 01903_correct_block_size_prediction_with_default. [#68203](https://github.com/ClickHouse/ClickHouse/pull/68203) ([Pablo Marcos](https://github.com/pamarcos)).
-* Replace segfault in Replicated database with logical error. [#68250](https://github.com/ClickHouse/ClickHouse/pull/68250) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Backported in [#68423](https://github.com/ClickHouse/ClickHouse/issues/68423): tests: make 01600_parts_states_metrics_long better. [#68265](https://github.com/ClickHouse/ClickHouse/pull/68265) ([Azat Khuzhin](https://github.com/azat)).
-* Backported in [#68374](https://github.com/ClickHouse/ClickHouse/issues/68374): Rename: S3DiskNoKeyErrors -> DiskS3NoSuchKeyErrors. [#68361](https://github.com/ClickHouse/ClickHouse/pull/68361) ([Miсhael Stetsyuk](https://github.com/mstetsyuk)).
-* Backported in [#68637](https://github.com/ClickHouse/ClickHouse/issues/68637): Check for invalid regexp in JSON SKIP REGEXP section. [#68451](https://github.com/ClickHouse/ClickHouse/pull/68451) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68485](https://github.com/ClickHouse/ClickHouse/issues/68485): Better inference of date times 2. [#68452](https://github.com/ClickHouse/ClickHouse/pull/68452) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68540](https://github.com/ClickHouse/ClickHouse/issues/68540): CI: Native build for package_aarch64. [#68457](https://github.com/ClickHouse/ClickHouse/pull/68457) ([Max K.](https://github.com/maxknv)).
-* Backported in [#68518](https://github.com/ClickHouse/ClickHouse/issues/68518): Minor update in Dynamic/JSON serializations. [#68459](https://github.com/ClickHouse/ClickHouse/pull/68459) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68558](https://github.com/ClickHouse/ClickHouse/issues/68558): CI: Minor release workflow fix. [#68536](https://github.com/ClickHouse/ClickHouse/pull/68536) ([Max K.](https://github.com/maxknv)).
-* Backported in [#68576](https://github.com/ClickHouse/ClickHouse/issues/68576): CI: Tidy build timeout from 2h to 3h. [#68567](https://github.com/ClickHouse/ClickHouse/pull/68567) ([Max K.](https://github.com/maxknv)).
-
diff --git a/docs/changelogs/v24.8.2.3-lts.md b/docs/changelogs/v24.8.2.3-lts.md
deleted file mode 100644
index 69dfc9961a2..00000000000
--- a/docs/changelogs/v24.8.2.3-lts.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.8.2.3-lts (b54f79ed323) FIXME as compared to v24.8.1.2684-lts (161c62fd295)
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#68670](https://github.com/ClickHouse/ClickHouse/issues/68670): Fix `LOGICAL_ERROR`s when functions `sipHash64Keyed`, `sipHash128Keyed`, or `sipHash128ReferenceKeyed` are applied to empty arrays or tuples. [#68630](https://github.com/ClickHouse/ClickHouse/pull/68630) ([Robert Schulze](https://github.com/rschu1ze)).
-
diff --git a/docs/changelogs/v24.8.3.59-lts.md b/docs/changelogs/v24.8.3.59-lts.md
deleted file mode 100644
index 342905f0a8c..00000000000
--- a/docs/changelogs/v24.8.3.59-lts.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.8.3.59-lts (e729b9fa40e) FIXME as compared to v24.8.2.3-lts (b54f79ed323)
-
-#### New Feature
-* Backported in [#68710](https://github.com/ClickHouse/ClickHouse/issues/68710): Query cache entries can now be dropped by tag. For example, the query cache entry created by `SELECT 1 SETTINGS use_query_cache = true, query_cache_tag = 'abc'` can now be dropped by `SYSTEM DROP QUERY CACHE TAG 'abc'` (or of course just: `SYSTEM DROP QUERY CACHE` which will clear the entire query cache). [#68477](https://github.com/ClickHouse/ClickHouse/pull/68477) ([Michał Tabaszewski](https://github.com/pinsvin00)).
-
-#### Improvement
-* Backported in [#69097](https://github.com/ClickHouse/ClickHouse/issues/69097): Support for the Spanish language in the embedded dictionaries. [#69035](https://github.com/ClickHouse/ClickHouse/pull/69035) ([Vasily Okunev](https://github.com/VOkunev)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#68973](https://github.com/ClickHouse/ClickHouse/issues/68973): Fix the upper bound of the function `fromModifiedJulianDay`. It was supposed to be `9999-12-31` but was mistakenly set to `9999-01-01`. [#67583](https://github.com/ClickHouse/ClickHouse/pull/67583) ([PHO](https://github.com/depressed-pho)).
-* Backported in [#68818](https://github.com/ClickHouse/ClickHouse/issues/68818): Fixed crash in Parquet filtering when data types in the file substantially differ from requested types (e.g. `... FROM file('a.parquet', Parquet, 'x String')`, but the file has `x Int64`). Without this fix, use `input_format_parquet_filter_push_down = 0` as a workaround. [#68131](https://github.com/ClickHouse/ClickHouse/pull/68131) ([Michael Kolupaev](https://github.com/al13n321)).
-* Backported in [#68893](https://github.com/ClickHouse/ClickHouse/issues/68893): After https://github.com/ClickHouse/ClickHouse/pull/61984 `schema_inference_make_columns_nullable=0` still can make columns `Nullable` in Parquet/Arrow formats. The change was backward incompatible and users noticed the changes in the behaviour. This PR makes `schema_inference_make_columns_nullable=0` to work as before (no Nullable columns will be inferred) and introduces new value `auto` for this setting that will make columns `Nullable` only if data has information about nullability. [#68298](https://github.com/ClickHouse/ClickHouse/pull/68298) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68721](https://github.com/ClickHouse/ClickHouse/issues/68721): Fixes [#50868](https://github.com/ClickHouse/ClickHouse/issues/50868). Small DateTime64 constant values returned by a nested subquery inside a distributed query were wrongly transformed to Nulls, thus causing errors and possible incorrect query results. [#68323](https://github.com/ClickHouse/ClickHouse/pull/68323) ([Shankar](https://github.com/shiyer7474)).
-* Backported in [#69029](https://github.com/ClickHouse/ClickHouse/issues/69029): Added back virtual columns ` _table` and `_database` to distributed tables. They were available until version 24.3. [#68672](https://github.com/ClickHouse/ClickHouse/pull/68672) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#68864](https://github.com/ClickHouse/ClickHouse/issues/68864): Fix possible error `Size of permutation (0) is less than required (...)` during Variant column permutation. [#68681](https://github.com/ClickHouse/ClickHouse/pull/68681) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68854](https://github.com/ClickHouse/ClickHouse/issues/68854): Fix possible error `DB::Exception: Block structure mismatch in joined block stream: different columns:` with new JSON column. [#68686](https://github.com/ClickHouse/ClickHouse/pull/68686) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68790](https://github.com/ClickHouse/ClickHouse/issues/68790): Fix issue with materialized constant keys when hashing maps with arrays as keys in functions `sipHash(64/128)Keyed`. [#68731](https://github.com/ClickHouse/ClickHouse/pull/68731) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Backported in [#69108](https://github.com/ClickHouse/ClickHouse/issues/69108): TODO. [#68744](https://github.com/ClickHouse/ClickHouse/pull/68744) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Backported in [#68850](https://github.com/ClickHouse/ClickHouse/issues/68850): Fix resolving dynamic subcolumns from subqueries in analyzer. [#68824](https://github.com/ClickHouse/ClickHouse/pull/68824) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68911](https://github.com/ClickHouse/ClickHouse/issues/68911): Fix complex types metadata parsing in DeltaLake. Closes [#68739](https://github.com/ClickHouse/ClickHouse/issues/68739). [#68836](https://github.com/ClickHouse/ClickHouse/pull/68836) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Backported in [#69160](https://github.com/ClickHouse/ClickHouse/issues/69160): Fix possible wrong result during anyHeavy state merge. [#68950](https://github.com/ClickHouse/ClickHouse/pull/68950) ([Raúl Marín](https://github.com/Algunenano)).
-* Backported in [#69072](https://github.com/ClickHouse/ClickHouse/issues/69072): Fixed writing to Materialized Views with enabled setting `optimize_functions_to_subcolumns`. [#68951](https://github.com/ClickHouse/ClickHouse/pull/68951) ([Anton Popov](https://github.com/CurtizJ)).
-* Backported in [#69016](https://github.com/ClickHouse/ClickHouse/issues/69016): Don't use serializations cache in const Dynamic column methods. It could let to use-of-unitialized value or even race condition during aggregations. [#68953](https://github.com/ClickHouse/ClickHouse/pull/68953) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#69120](https://github.com/ClickHouse/ClickHouse/issues/69120): Fix logical error when we have empty async insert. [#69080](https://github.com/ClickHouse/ClickHouse/pull/69080) ([Han Fei](https://github.com/hanfei1991)).
-
-#### NO CL CATEGORY
-
-* Backported in [#68947](https://github.com/ClickHouse/ClickHouse/issues/68947):. [#68897](https://github.com/ClickHouse/ClickHouse/pull/68897) ([Alexander Gololobov](https://github.com/davenger)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#68704](https://github.com/ClickHouse/ClickHouse/issues/68704): Fix enumerating dynamic subcolumns. [#68582](https://github.com/ClickHouse/ClickHouse/pull/68582) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#69000](https://github.com/ClickHouse/ClickHouse/issues/69000): Prioritizing of virtual columns in hive partitioning. [#68606](https://github.com/ClickHouse/ClickHouse/pull/68606) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Backported in [#68799](https://github.com/ClickHouse/ClickHouse/issues/68799): CI: Disable SQLLogic job. [#68654](https://github.com/ClickHouse/ClickHouse/pull/68654) ([Max K.](https://github.com/maxknv)).
-* Backported in [#68834](https://github.com/ClickHouse/ClickHouse/issues/68834): Turn off fault injection for insert in `01396_inactive_replica_cleanup_nodes_zookeeper`. [#68715](https://github.com/ClickHouse/ClickHouse/pull/68715) ([alesapin](https://github.com/alesapin)).
-* Backported in [#68781](https://github.com/ClickHouse/ClickHouse/issues/68781): Fix flaky test 00989_parallel_parts_loading. [#68737](https://github.com/ClickHouse/ClickHouse/pull/68737) ([alesapin](https://github.com/alesapin)).
-* Backported in [#68762](https://github.com/ClickHouse/ClickHouse/issues/68762): To make patch release possible from every commit on release branch, package_debug build is required and must not be skipped. [#68750](https://github.com/ClickHouse/ClickHouse/pull/68750) ([Max K.](https://github.com/maxknv)).
-* Backported in [#68810](https://github.com/ClickHouse/ClickHouse/issues/68810): Try to disable rerun check if job triggered manually. [#68751](https://github.com/ClickHouse/ClickHouse/pull/68751) ([Max K.](https://github.com/maxknv)).
-* Backported in [#68962](https://github.com/ClickHouse/ClickHouse/issues/68962): Fix 2477 timeout. [#68752](https://github.com/ClickHouse/ClickHouse/pull/68752) ([jsc0218](https://github.com/jsc0218)).
-* Backported in [#68977](https://github.com/ClickHouse/ClickHouse/issues/68977): Check setting use_json_alias_for_old_object_type in runtime. [#68793](https://github.com/ClickHouse/ClickHouse/pull/68793) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#68852](https://github.com/ClickHouse/ClickHouse/issues/68852): Make dynamic structure selection more consistent. [#68802](https://github.com/ClickHouse/ClickHouse/pull/68802) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#69052](https://github.com/ClickHouse/ClickHouse/issues/69052): Fix 01114_database_atomic flakiness. [#68930](https://github.com/ClickHouse/ClickHouse/pull/68930) ([Raúl Marín](https://github.com/Algunenano)).
-
diff --git a/docs/changelogs/v24.8.4.13-lts.md b/docs/changelogs/v24.8.4.13-lts.md
deleted file mode 100644
index 66385172cf8..00000000000
--- a/docs/changelogs/v24.8.4.13-lts.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-sidebar_position: 1
-sidebar_label: 2024
----
-
-# 2024 Changelog
-
-### ClickHouse release v24.8.4.13-lts (53195bc189b) FIXME as compared to v24.8.3.59-lts (e729b9fa40e)
-
-#### Improvement
-* Backported in [#68699](https://github.com/ClickHouse/ClickHouse/issues/68699): Delete old code of named collections from dictionaries and substitute it to the new, which allows to use DDL created named collections in dictionaries. Closes [#60936](https://github.com/ClickHouse/ClickHouse/issues/60936), closes [#36890](https://github.com/ClickHouse/ClickHouse/issues/36890). [#68412](https://github.com/ClickHouse/ClickHouse/pull/68412) ([Kseniia Sumarokova](https://github.com/kssenii)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Backported in [#69231](https://github.com/ClickHouse/ClickHouse/issues/69231): Fix parsing error when null should be inserted as default in some cases during JSON type parsing. [#68955](https://github.com/ClickHouse/ClickHouse/pull/68955) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#69251](https://github.com/ClickHouse/ClickHouse/issues/69251): `UNION` clause in subqueries wasn't handled correctly in queries with parallel replicas and lead to LOGICAL_ERROR `Duplicate announcement received for replica`. [#69146](https://github.com/ClickHouse/ClickHouse/pull/69146) ([Igor Nikonov](https://github.com/devcrafter)).
-
-#### NOT FOR CHANGELOG / INSIGNIFICANT
-
-* Backported in [#69189](https://github.com/ClickHouse/ClickHouse/issues/69189): Don't create Object type if use_json_alias_for_old_object_type=1 but allow_experimental_object_type=0. [#69150](https://github.com/ClickHouse/ClickHouse/pull/69150) ([Kruglov Pavel](https://github.com/Avogar)).
-* Backported in [#69229](https://github.com/ClickHouse/ClickHouse/issues/69229): Disable memory test with sanitizer. [#69193](https://github.com/ClickHouse/ClickHouse/pull/69193) ([alesapin](https://github.com/alesapin)).
-* Backported in [#69219](https://github.com/ClickHouse/ClickHouse/issues/69219): Disable perf-like test with sanitizers. [#69194](https://github.com/ClickHouse/ClickHouse/pull/69194) ([alesapin](https://github.com/alesapin)).
-
diff --git a/docs/en/development/architecture.md b/docs/en/development/architecture.md
index a1a5901f859..6428c0e90d5 100644
--- a/docs/en/development/architecture.md
+++ b/docs/en/development/architecture.md
@@ -118,7 +118,7 @@ And the result of interpreting the `INSERT SELECT` query is a "completed" `Query
 
 `InterpreterSelectQuery` uses `ExpressionAnalyzer` and `ExpressionActions` machinery for query analysis and transformations. This is where most rule-based query optimizations are performed. `ExpressionAnalyzer` is quite messy and should be rewritten: various query transformations and optimizations should be extracted into separate classes to allow for modular transformations of the query.
 
-To address problems that exist in interpreters, a new `InterpreterSelectQueryAnalyzer` has been developed. This is a new version of the `InterpreterSelectQuery`, which does not use the `ExpressionAnalyzer` and introduces an additional layer of abstraction between `AST` and `QueryPipeline`, called `QueryTree'. It is fully ready for use in production, but just in case it can be turned off by setting the value of the `enable_analyzer` setting to `false`.
+To address current problems that exist in interpreters, a new `InterpreterSelectQueryAnalyzer` is being developed. It is a new version of `InterpreterSelectQuery` that does not use `ExpressionAnalyzer` and introduces an additional abstraction level between `AST` and `QueryPipeline` called `QueryTree`. It is not production-ready yet, but it can be tested with the `allow_experimental_analyzer` flag.
 
 ## Functions {#functions}
 
diff --git a/docs/en/development/contrib.md b/docs/en/development/contrib.md
index c49492c1cb4..db3eabaecfc 100644
--- a/docs/en/development/contrib.md
+++ b/docs/en/development/contrib.md
@@ -27,23 +27,23 @@ Avoid dumping copies of external code into the library directory.
 Instead create a Git submodule to pull third-party code from an external upstream repository.
 
 All submodules used by ClickHouse are listed in the `.gitmodule` file.
-- If the library can be used as-is (the default case), you can reference the upstream repository directly.
-- If the library needs patching, create a fork of the upstream repository in the [ClickHouse organization on GitHub](https://github.com/ClickHouse).
+If the library can be used as-is (the default case), you can reference the upstream repository directly.
+If the library needs patching, create a fork of the upstream repository in the [ClickHouse organization on GitHub](https://github.com/ClickHouse).
 
 In the latter case, we aim to isolate custom patches as much as possible from upstream commits.
-To that end, create a branch with prefix `ClickHouse/` from the branch or tag you want to integrate, e.g. `ClickHouse/2024_2` (for branch `2024_2`) or `ClickHouse/release/vX.Y.Z` (for tag `release/vX.Y.Z`).
-Avoid following upstream development branches `master`/ `main` / `dev` (i.e., prefix branches `ClickHouse/master` / `ClickHouse/main` / `ClickHouse/dev` in the fork repository).
-Such branches are moving targets which make proper versioning harder.
-"Prefix branches" ensure that pulls from the upstream repository into the fork will leave custom `ClickHouse/` branches unaffected.
-Submodules in `contrib/` must only track `ClickHouse/` branches of forked third-party repositories.
+To that end, create a branch with prefix `clickhouse/` from the branch or tag you want to integrate, e.g. `clickhouse/master` (for branch `master`) or `clickhouse/release/vX.Y.Z` (for tag `release/vX.Y.Z`).
+This ensures that pulls from the upstream repository into the fork will leave custom `clickhouse/` branches unaffected.
+Submodules in `contrib/` must only track `clickhouse/` branches of forked third-party repositories.
 
-Patches are only applied against `ClickHouse/` branches of external libraries.
-
-There are two ways to do that:
-- you like to make a new fix against a `ClickHouse/`-prefix branch in the forked repository, e.g. a sanitizer fix. In that case, push the fix as a branch with `ClickHouse/` prefix, e.g. `ClickHouse/fix-sanitizer-disaster`. Then create a PR from the new branch against the custom tracking branch, e.g. `ClickHouse/2024_2 <-- ClickHouse/fix-sanitizer-disaster` and merge the PR.
-- you update the submodule and need to re-apply earlier patches. In this case, re-creating old PRs is overkill. Instead, simply cherry-pick older commits into the new `ClickHouse/` branch (corresponding to the new version). Feel free to squash commits of PRs that had multiple commits. In the best case, we did contribute custom patches back to upstream and can omit patches in the new version.
-
-Once the submodule has been updated, bump the submodule in ClickHouse to point to the new hash in the fork.
+Patches are only applied against `clickhouse/` branches of external libraries.
+For that, push the patch as a branch with `clickhouse/`, e.g. `clickhouse/fix-some-desaster`.
+Then create a PR from the new branch against the custom tracking branch with `clickhouse/` prefix, (e.g. `clickhouse/master` or `clickhouse/release/vX.Y.Z`) and merge the patch.
 
 Create patches of third-party libraries with the official repository in mind and consider contributing the patch back to the upstream repository.
 This makes sure that others will also benefit from the patch and it will not be a maintenance burden for the ClickHouse team.
+
+To pull upstream changes into the submodule, you can use two methods:
+- (less work but less clean): merge upstream `master` into the corresponding `clickhouse/` tracking branch in the forked repository. You will need to resolve merge conflicts with previous custom patches. This method can be used when the `clickhouse/` branch tracks an upstream development branch like `master`, `main`, `dev`, etc.
+- (more work but cleaner): create a new branch with `clickhouse/` prefix from the upstream commit or tag you like to integrate. Then re-apply all existing patches using new PRs (or squash them into a single PR). This method can be used when the `clickhouse/` branch tracks a specific upstream version branch or tag. It is cleaner in the sense that custom patches and upstream changes are better isolated from each other.
+
+Once the submodule has been updated, bump the submodule in ClickHouse to point to the new hash in the fork.
diff --git a/docs/en/development/tests.md b/docs/en/development/tests.md
index 4cc7563135a..269995a1a96 100644
--- a/docs/en/development/tests.md
+++ b/docs/en/development/tests.md
@@ -14,7 +14,7 @@ Each functional test sends one or multiple queries to the running ClickHouse ser
 
 Tests are located in `queries` directory. There are two subdirectories: `stateless` and `stateful`. Stateless tests run queries without any preloaded test data - they often create small synthetic datasets on the fly, within the test itself. Stateful tests require preloaded test data from ClickHouse and it is available to general public.
 
-Each test can be one of two types: `.sql` and `.sh`. `.sql` test is the simple SQL script that is piped to `clickhouse-client`. `.sh` test is a script that is run by itself. SQL tests are generally preferable to `.sh` tests. You should use `.sh` tests only when you have to test some feature that cannot be exercised from pure SQL, such as piping some input data into `clickhouse-client` or testing `clickhouse-local`.
+Each test can be one of two types: `.sql` and `.sh`. `.sql` test is the simple SQL script that is piped to `clickhouse-client --multiquery`. `.sh` test is a script that is run by itself. SQL tests are generally preferable to `.sh` tests. You should use `.sh` tests only when you have to test some feature that cannot be exercised from pure SQL, such as piping some input data into `clickhouse-client` or testing `clickhouse-local`.
 
 :::note
 A common mistake when testing data types `DateTime` and `DateTime64` is assuming that the server uses a specific time zone (e.g. "UTC"). This is not the case, time zones in CI test runs
@@ -38,7 +38,7 @@ For more options, see `tests/clickhouse-test --help`. You can simply run all tes
 
 ### Adding a New Test
 
-To add new test, create a `.sql` or `.sh` file in `queries/0_stateless` directory, check it manually and then generate `.reference` file in the following way: `clickhouse-client < 00000_test.sql > 00000_test.reference` or `./00000_test.sh > ./00000_test.reference`.
+To add new test, create a `.sql` or `.sh` file in `queries/0_stateless` directory, check it manually and then generate `.reference` file in the following way: `clickhouse-client --multiquery < 00000_test.sql > 00000_test.reference` or `./00000_test.sh > ./00000_test.reference`.
 
 Tests should use (create, drop, etc) only tables in `test` database that is assumed to be created beforehand; also tests can use temporary tables.
 
@@ -91,28 +91,6 @@ SELECT 1
 In addition to the above settings, you can use `USE_*` flags from `system.build_options` to define usage of particular ClickHouse features.
 For example, if your test uses a MySQL table, you should add a tag `use-mysql`.
 
-### Specifying limits for random settings
-
-A test can specify minimum and maximum allowed values for settings that can be randomized during test run.
-
-For `.sh` tests limits are written as a comment on the line next to tags or on the second line if no tags are specified:
-
-```bash
-#!/usr/bin/env bash
-# Tags: no-fasttest
-# Random settings limits: max_block_size=(1000, 10000); index_granularity=(100, None)
-```
-
-For `.sql` tests tags are placed as a SQL comment in the line next to tags or in the first line:
-
-```sql
--- Tags: no-fasttest
--- Random settings limits: max_block_size=(1000, 10000); index_granularity=(100, None)
-SELECT 1
-```
-
-If you need to specify only one limit, you can use `None` for another one.
-
 ### Choosing the Test Name
 
 The name of the test starts with a five-digit prefix followed by a descriptive name, such as `00422_hash_function_constexpr.sql`. To choose the prefix, find the largest prefix already present in the directory, and increment it by one. In the meantime, some other tests might be added with the same numeric prefix, but this is OK and does not lead to any problems, you don't have to change it later.
diff --git a/docs/en/engines/table-engines/index.md b/docs/en/engines/table-engines/index.md
index 20c7c511aa9..5e81eacc937 100644
--- a/docs/en/engines/table-engines/index.md
+++ b/docs/en/engines/table-engines/index.md
@@ -61,7 +61,6 @@ Engines in the family:
 - [RabbitMQ](../../engines/table-engines/integrations/rabbitmq.md)
 - [PostgreSQL](../../engines/table-engines/integrations/postgresql.md)
 - [S3Queue](../../engines/table-engines/integrations/s3queue.md)
-- [TimeSeries](../../engines/table-engines/integrations/time-series.md)
 
 ### Special Engines {#special-engines}
 
diff --git a/docs/en/engines/table-engines/integrations/azure-queue.md b/docs/en/engines/table-engines/integrations/azure-queue.md
deleted file mode 100644
index b5259336a8b..00000000000
--- a/docs/en/engines/table-engines/integrations/azure-queue.md
+++ /dev/null
@@ -1,72 +0,0 @@
----
-slug: /en/engines/table-engines/integrations/azure-queue
-sidebar_position: 181
-sidebar_label: AzureQueue
----
-
-# AzureQueue Table Engine
-
-This engine provides an integration with [Azure Blob Storage](https://azure.microsoft.com/en-us/products/storage/blobs) ecosystem, allowing streaming data import.
-
-## Create Table {#creating-a-table}
-
-``` sql
-CREATE TABLE test (name String, value UInt32)
-    ENGINE = AzureQueue(...)
-    [SETTINGS]
-    [mode = '',]
-    [after_processing = 'keep',]
-    [keeper_path = '',]
-    ...
-```
-
-**Engine parameters**
-
-`AzureQueue` parameters are the same as `AzureBlobStorage` table engine supports. See parameters section [here](../../../engines/table-engines/integrations/azureBlobStorage.md).
-
-**Example**
-
-```sql
-CREATE TABLE azure_queue_engine_table (name String, value UInt32)
-ENGINE=AzureQueue('DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite1:10000/devstoreaccount1/data/')
-SETTINGS
-    mode = 'unordered'
-```
-
-## Settings {#settings}
-
-The set of supported settings is the same as for `S3Queue` table engine, but without `s3queue_` prefix. See [full list of settings settings](../../../engines/table-engines/integrations/s3queue.md#settings).
-
-## Description {#description}
-
-`SELECT` is not particularly useful for streaming import (except for debugging), because each file can be imported only once. It is more practical to create real-time threads using [materialized views](../../../sql-reference/statements/create/view.md). To do this:
-
-1.  Use the engine to create a table for consuming from specified path in S3 and consider it a data stream.
-2.  Create a table with the desired structure.
-3.  Create a materialized view that converts data from the engine and puts it into a previously created table.
-
-When the `MATERIALIZED VIEW` joins the engine, it starts collecting data in the background.
-
-Example:
-
-``` sql
-  CREATE TABLE azure_queue_engine_table (name String, value UInt32)
-    ENGINE=AzureQueue('<endpoint>', 'CSV', 'gzip')
-    SETTINGS
-        mode = 'unordered';
-
-  CREATE TABLE stats (name String, value UInt32)
-    ENGINE = MergeTree() ORDER BY name;
-
-  CREATE MATERIALIZED VIEW consumer TO stats
-    AS SELECT name, value FROM azure_queue_engine_table;
-
-  SELECT * FROM stats ORDER BY name;
-```
-
-## Virtual columns {#virtual-columns}
-
-- `_path` — Path to the file.
-- `_file` — Name of the file.
-
-For more information about virtual columns see [here](../../../engines/table-engines/index.md#table_engines-virtual_columns).
diff --git a/docs/en/engines/table-engines/integrations/hdfs.md b/docs/en/engines/table-engines/integrations/hdfs.md
index 404cec97def..c9df713231a 100644
--- a/docs/en/engines/table-engines/integrations/hdfs.md
+++ b/docs/en/engines/table-engines/integrations/hdfs.md
@@ -240,7 +240,7 @@ libhdfs3 support HDFS namenode HA.
 ## Storage Settings {#storage-settings}
 
 - [hdfs_truncate_on_insert](/docs/en/operations/settings/settings.md#hdfs_truncate_on_insert) - allows to truncate file before insert into it. Disabled by default.
-- [hdfs_create_new_file_on_insert](/docs/en/operations/settings/settings.md#hdfs_create_new_file_on_insert) - allows to create a new file on each insert if format has suffix. Disabled by default.
+- [hdfs_create_multiple_files](/docs/en/operations/settings/settings.md#hdfs_allow_create_multiple_files) - allows to create a new file on each insert if format has suffix. Disabled by default.
 - [hdfs_skip_empty_files](/docs/en/operations/settings/settings.md#hdfs_skip_empty_files) - allows to skip empty files while reading. Disabled by default.
 
 **See Also**
diff --git a/docs/en/engines/table-engines/integrations/iceberg.md b/docs/en/engines/table-engines/integrations/iceberg.md
index 94468066372..21fdbc0b1a5 100644
--- a/docs/en/engines/table-engines/integrations/iceberg.md
+++ b/docs/en/engines/table-engines/integrations/iceberg.md
@@ -6,34 +6,28 @@ sidebar_label: Iceberg
 
 # Iceberg Table Engine
 
-This engine provides a read-only integration with existing Apache [Iceberg](https://iceberg.apache.org/) tables in Amazon S3, Azure and locally stored tables.
+This engine provides a read-only integration with existing Apache [Iceberg](https://iceberg.apache.org/) tables in Amazon S3.
 
 ## Create Table
 
-Note that the Iceberg table must already exist in the storage, this command does not take DDL parameters to create a new table.
+Note that the Iceberg table must already exist in S3, this command does not take DDL parameters to create a new table.
 
 ``` sql
-CREATE TABLE iceberg_table_s3
-    ENGINE = IcebergS3(url,  [, NOSIGN | access_key_id, secret_access_key, [session_token]], format, [,compression])
-
-CREATE TABLE iceberg_table_azure
-    ENGINE = IcebergAzure(connection_string|storage_account_url, container_name, blobpath, [account_name, account_key, format, compression])
-
-CREATE TABLE iceberg_table_local
-    ENGINE = IcebergLocal(path_to_table, [,format] [,compression_method])
+CREATE TABLE iceberg_table
+    ENGINE = Iceberg(url, [aws_access_key_id, aws_secret_access_key,])
 ```
 
-**Engine arguments**
+**Engine parameters**
 
-Description of the arguments coincides with description of arguments in engines `S3`, `AzureBlobStorage` and `File` correspondingly.
-`format` stands for the format of data files in the Iceberg table.
+- `url` — url with the path to an existing Iceberg table.
+- `aws_access_key_id`, `aws_secret_access_key` - Long-term credentials for the [AWS](https://aws.amazon.com/) account user.  You can use these to authenticate your requests. Parameter is optional. If credentials are not specified, they are used from the configuration file.
 
 Engine parameters can be specified using [Named Collections](../../../operations/named-collections.md)
 
 **Example**
 
 ```sql
-CREATE TABLE iceberg_table ENGINE=IcebergS3('http://test.s3.amazonaws.com/clickhouse-bucket/test_table', 'test', 'test')
+CREATE TABLE iceberg_table ENGINE=Iceberg('http://test.s3.amazonaws.com/clickhouse-bucket/test_table', 'test', 'test')
 ```
 
 Using named collections:
@@ -51,15 +45,9 @@ Using named collections:
 ```
 
 ```sql
-CREATE TABLE iceberg_table ENGINE=IcebergS3(iceberg_conf, filename = 'test_table')
-
+CREATE TABLE iceberg_table ENGINE=Iceberg(iceberg_conf, filename = 'test_table')
 ```
 
-**Aliases**
-
-
-Table engine `Iceberg` is an alias to `IcebergS3` now.
-
 ## See also
 
 - [iceberg table function](/docs/en/sql-reference/table-functions/iceberg.md)
diff --git a/docs/en/engines/table-engines/integrations/kafka.md b/docs/en/engines/table-engines/integrations/kafka.md
index de6492e8ea7..7bdc856c9fd 100644
--- a/docs/en/engines/table-engines/integrations/kafka.md
+++ b/docs/en/engines/table-engines/integrations/kafka.md
@@ -251,44 +251,6 @@ The number of rows in one Kafka message depends on whether the format is row-bas
 - For row-based formats the number of rows in one Kafka message can be controlled by setting `kafka_max_rows_per_message`.
 - For block-based formats we cannot divide block into smaller parts, but the number of rows in one block can be controlled by general setting [max_block_size](../../../operations/settings/settings.md#setting-max_block_size).
 
-## Experimental engine to store committed offsets in ClickHouse Keeper
-
-If `allow_experimental_kafka_offsets_storage_in_keeper` is enabled, then two more settings can be specified to the Kafka table engine:
- - `kafka_keeper_path` specifies the path to the table in ClickHouse Keeper
- - `kafka_replica_name` specifies the replica name in ClickHouse Keeper
-
-Either both of the settings must be specified or neither of them. When both of them are specified, then a new, experimental Kafka engine will be used. The new engine doesn't depend on storing the committed offsets in Kafka, but stores them in ClickHouse Keeper. It still tries to commit the offsets to Kafka, but it only depends on those offsets when the table is created. In any other circumstances (table is restarted, or recovered after some error) the offsets stored in ClickHouse Keeper will be used as an offset to continue consuming messages from. Apart from the committed offset, it also stores how many messages were consumed in the last batch, so if the insert fails, the same amount of messages will be consumed, thus enabling deduplication if necessary.
-
-Example:
-
-``` sql
-CREATE TABLE experimental_kafka (key UInt64, value UInt64)
-ENGINE = Kafka('localhost:19092', 'my-topic', 'my-consumer', 'JSONEachRow')
-SETTINGS
-  kafka_keeper_path = '/clickhouse/{database}/experimental_kafka',
-  kafka_replica_name = 'r1'
-SETTINGS allow_experimental_kafka_offsets_storage_in_keeper=1;
-```
-
-Or to utilize the `uuid` and `replica` macros similarly to ReplicatedMergeTree:
-
-``` sql
-CREATE TABLE experimental_kafka (key UInt64, value UInt64)
-ENGINE = Kafka('localhost:19092', 'my-topic', 'my-consumer', 'JSONEachRow')
-SETTINGS
-  kafka_keeper_path = '/clickhouse/{database}/{uuid}',
-  kafka_replica_name = '{replica}'
-SETTINGS allow_experimental_kafka_offsets_storage_in_keeper=1;
-```
-
-### Known limitations
-
-As the new engine is experimental, it is not production ready yet. There are few known limitations of the implementation:
- - The biggest limitation is the engine doesn't support direct reading. Reading from the engine using materialized views and writing to the engine work, but direct reading doesn't. As a result, all direct `SELECT` queries will fail.
- - Rapidly dropping and recreating the table or specifying the same ClickHouse Keeper path to different engines might cause issues. As best practice you can use the `{uuid}` in `kafka_keeper_path` to avoid clashing paths.
- - To make repeatable reads, messages cannot be consumed from multiple partitions on a single thread. On the other hand, the Kafka consumers have to be polled regularly to keep them alive. As a result of these two objectives, we decided to only allow creating multiple consumers if `kafka_thread_per_consumer` is enabled, otherwise it is too complicated to avoid issues regarding polling consumers regularly.
- - Consumers created by the new storage engine do not show up in [`system.kafka_consumers`](../../../operations/system-tables/kafka_consumers.md) table.
-
 **See Also**
 
 - [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
diff --git a/docs/en/engines/table-engines/integrations/s3.md b/docs/en/engines/table-engines/integrations/s3.md
index f02d0563491..93f4a187656 100644
--- a/docs/en/engines/table-engines/integrations/s3.md
+++ b/docs/en/engines/table-engines/integrations/s3.md
@@ -35,7 +35,7 @@ CREATE TABLE s3_engine_table (name String, value UInt32)
     [SETTINGS ...]
 ```
 
-### Engine parameters {#parameters}
+### Engine parameters
 
 - `path` — Bucket url with path to file. Supports following wildcards in readonly mode: `*`, `**`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc'`, `'def'` — strings. For more information see [below](#wildcards-in-path).
 - `NOSIGN` - If this keyword is provided in place of credentials, all the requests will not be signed.
@@ -146,7 +146,6 @@ Code: 48. DB::Exception: Received from localhost:9000. DB::Exception: Reading fr
 - `_file` — Name of the file. Type: `LowCardinalty(String)`.
 - `_size` — Size of the file in bytes. Type: `Nullable(UInt64)`. If the size is unknown, the value is `NULL`.
 - `_time` — Last modified time of the file. Type: `Nullable(DateTime)`. If the time is unknown, the value is `NULL`.
-- `_etag` — ETag of the file. Type: `LowCardinalty(String)`. If the etag is unknown, the value is `NULL`.
 
 For more information about virtual columns see [here](../../../engines/table-engines/index.md#table_engines-virtual_columns).
 
@@ -225,7 +224,7 @@ CREATE TABLE table_with_asterisk (name String, value UInt32)
 ## Storage Settings {#storage-settings}
 
 - [s3_truncate_on_insert](/docs/en/operations/settings/settings.md#s3_truncate_on_insert) - allows to truncate file before insert into it. Disabled by default.
-- [s3_create_new_file_on_insert](/docs/en/operations/settings/settings.md#s3_create_new_file_on_insert) - allows to create a new file on each insert if format has suffix. Disabled by default.
+- [s3_create_multiple_files](/docs/en/operations/settings/settings.md#s3_allow_create_multiple_files) - allows to create a new file on each insert if format has suffix. Disabled by default.
 - [s3_skip_empty_files](/docs/en/operations/settings/settings.md#s3_skip_empty_files) - allows to skip empty files while reading. Disabled by default.
 
 ## S3-related Settings {#settings}
diff --git a/docs/en/engines/table-engines/integrations/s3queue.md b/docs/en/engines/table-engines/integrations/s3queue.md
index f1957cfe1ce..06325fa15fb 100644
--- a/docs/en/engines/table-engines/integrations/s3queue.md
+++ b/docs/en/engines/table-engines/integrations/s3queue.md
@@ -5,7 +5,6 @@ sidebar_label: S3Queue
 ---
 
 # S3Queue Table Engine
-
 This engine provides integration with [Amazon S3](https://aws.amazon.com/s3/) ecosystem and allows streaming import. This engine is similar to the [Kafka](../../../engines/table-engines/integrations/kafka.md), [RabbitMQ](../../../engines/table-engines/integrations/rabbitmq.md) engines, but provides S3-specific features.
 
 ## Create Table {#creating-a-table}
@@ -17,25 +16,27 @@ CREATE TABLE s3_queue_engine_table (name String, value UInt32)
     [mode = '',]
     [after_processing = 'keep',]
     [keeper_path = '',]
-    [loading_retries = 0,]
-    [processing_threads_num = 1,]
-    [enable_logging_to_s3queue_log = 0,]
-    [polling_min_timeout_ms = 1000,]
-    [polling_max_timeout_ms = 10000,]
-    [polling_backoff_ms = 0,]
-    [tracked_file_ttl_sec = 0,]
-    [tracked_files_limit = 1000,]
-    [cleanup_interval_min_ms = 10000,]
-    [cleanup_interval_max_ms = 30000,]
+    [s3queue_loading_retries = 0,]
+    [s3queue_processing_threads_num = 1,]
+    [s3queue_enable_logging_to_s3queue_log = 0,]
+    [s3queue_polling_min_timeout_ms = 1000,]
+    [s3queue_polling_max_timeout_ms = 10000,]
+    [s3queue_polling_backoff_ms = 0,]
+    [s3queue_tracked_file_ttl_sec = 0,]
+    [s3queue_tracked_files_limit = 1000,]
+    [s3queue_cleanup_interval_min_ms = 10000,]
+    [s3queue_cleanup_interval_max_ms = 30000,]
 ```
 
-:::warning
-Before `24.7`, it is required to use `s3queue_` prefix for all settings apart from `mode`, `after_processing` and `keeper_path`.
-:::
+Starting with `24.7` settings without `s3queue_` prefix are also supported.
 
 **Engine parameters**
 
-`S3Queue` parameters are the same as `S3` table engine supports. See parameters section [here](../../../engines/table-engines/integrations/s3.md#parameters).
+- `path` — Bucket url with path to file. Supports following wildcards in readonly mode: `*`, `**`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc'`, `'def'` — strings. For more information see [below](#wildcards-in-path).
+- `NOSIGN` - If this keyword is provided in place of credentials, all the requests will not be signed.
+- `format` — The [format](../../../interfaces/formats.md#formats) of the file.
+- `aws_access_key_id`, `aws_secret_access_key` - Long-term credentials for the [AWS](https://aws.amazon.com/) account user.  You can use these to authenticate your requests. Parameter is optional. If credentials are not specified, they are used from the configuration file. For more information see [Using S3 for Data Storage](../mergetree-family/mergetree.md#table_engine-mergetree-s3).
+- `compression` — Compression type. Supported values: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. Parameter is optional. By default, it will autodetect compression by file extension.
 
 **Example**
 
diff --git a/docs/en/engines/table-engines/integrations/time-series.md b/docs/en/engines/table-engines/integrations/time-series.md
deleted file mode 100644
index 4830fd61d27..00000000000
--- a/docs/en/engines/table-engines/integrations/time-series.md
+++ /dev/null
@@ -1,295 +0,0 @@
----
-slug: /en/engines/table-engines/special/time_series
-sidebar_position: 60
-sidebar_label: TimeSeries
----
-
-# TimeSeries Engine [Experimental]
-
-A table engine storing time series, i.e. a set of values associated with timestamps and tags (or labels):
-
-```
-metric_name1[tag1=value1, tag2=value2, ...] = {timestamp1: value1, timestamp2: value2, ...}
-metric_name2[...] = ...
-```
-
-:::info
-This is an experimental feature that may change in backwards-incompatible ways in the future releases.
-Enable usage of the TimeSeries table engine
-with [allow_experimental_time_series_table](../../../operations/settings/settings.md#allow-experimental-time-series-table) setting.
-Input the command `set allow_experimental_time_series_table = 1`.
-:::
-
-## Syntax {#syntax}
-
-``` sql
-CREATE TABLE name [(columns)] ENGINE=TimeSeries
-[SETTINGS var1=value1, ...]
-[DATA db.data_table_name | DATA ENGINE data_table_engine(arguments)]
-[TAGS db.tags_table_name | TAGS ENGINE tags_table_engine(arguments)]
-[METRICS db.metrics_table_name | METRICS ENGINE metrics_table_engine(arguments)]
-```
-
-## Usage {#usage}
-
-It's easier to start with everything set by default (it's allowed to create a `TimeSeries` table without specifying a list of columns):
-
-``` sql
-CREATE TABLE my_table ENGINE=TimeSeries
-```
-
-Then this table can be used with the following protocols (a port must be assigned in the server configuration):
-- [prometheus remote-write](../../../interfaces/prometheus.md#remote-write)
-- [prometheus remote-read](../../../interfaces/prometheus.md#remote-read)
-
-## Target tables {#target-tables}
-
-A `TimeSeries` table doesn't have its own data, everything is stored in its target tables.
-This is similar to how a [materialized view](../../../sql-reference/statements/create/view#materialized-view) works,
-with the difference that a materialized view has one target table
-whereas a `TimeSeries` table has three target tables named [data]{#data-table}, [tags]{#tags-table], and [metrics]{#metrics-table}.
-
-The target tables can be either specified explicitly in the `CREATE TABLE` query
-or the `TimeSeries` table engine can generate inner target tables automatically.
-
-The target tables are the following:
-1. The _data_ table {#data-table} contains time series associated with some identifier.
-The _data_ table must have columns:
-
-| Name | Mandatory? | Default type | Possible types | Description |
-|---|---|---|---|---|
-| `id` | [x] | `UUID` | any | Identifies a combination of a metric names and tags |
-| `timestamp` | [x] | `DateTime64(3)` | `DateTime64(X)` | A time point |
-| `value` | [x] | `Float64` | `Float32` or `Float64` | A value associated with the `timestamp` |
-
-2. The _tags_ table {#tags-table} contains identifiers calculated for each combination of a metric name and tags.
-The _tags_ table must have columns:
-
-| Name | Mandatory? | Default type | Possible types | Description |
-|---|---|---|---|---|
-| `id` | [x] | `UUID` | any (must match the type of `id` in the [data]{#data-table} table) | An `id` identifies a combination of a metric name and tags. The DEFAULT expression specifies how to calculate such an identifier |
-| `metric_name` | [x] | `LowCardinality(String)` | `String` or `LowCardinality(String)` | The name of a metric |
-| `<tag_value_column>` | [ ] | `String` | `String` or `LowCardinality(String)` or `LowCardinality(Nullable(String))` | The value of a specific tag, the tag's name and the name of a corresponding column are specified in the [tags_to_columns](#settings) setting |
-| `tags` | [x] | `Map(LowCardinality(String), String)` | `Map(String, String)` or `Map(LowCardinality(String), String)` or `Map(LowCardinality(String), LowCardinality(String))` | Map of tags excluding the tag `__name__` containing the name of a metric and excluding tags with names enumerated in the [tags_to_columns](#settings) setting |
-| `all_tags` | [ ] | `Map(String, String)` | `Map(String, String)` or `Map(LowCardinality(String), String)` or `Map(LowCardinality(String), LowCardinality(String))` | Ephemeral column, each row is a map of all the tags excluding only the tag `__name__` containing the name of a metric. The only purpose of that column is to be used while calculating `id` |
-| `min_time` | [ ] | `Nullable(DateTime64(3))` | `DateTime64(X)` or `Nullable(DateTime64(X))` | Minimum timestamp of time series with that `id`. The column is created if [store_min_time_and_max_time](#settings) is `true` |
-| `max_time` | [ ] | `Nullable(DateTime64(3))` | `DateTime64(X)` or `Nullable(DateTime64(X))` | Maximum timestamp of time series with that `id`. The column is created if [store_min_time_and_max_time](#settings) is `true` |
-
-3. The _metrics_ table {#metrics-table} contains some information about metrics been collected, the types of those metrics and their descriptions.
-The _metrics_ table must have columns:
-
-| Name | Mandatory? | Default type | Possible types | Description |
-|---|---|---|---|---|
-| `metric_family_name` | [x] | `String` | `String` or `LowCardinality(String)` | The name of a metric family |
-| `type` | [x] | `String` | `String` or `LowCardinality(String)` | The type of a metric family, one of "counter", "gauge", "summary", "stateset", "histogram", "gaugehistogram" |
-| `unit` | [x] | `String` | `String` or `LowCardinality(String)` | The unit used in a metric |
-| `help` | [x] | `String` | `String` or `LowCardinality(String)` | The description of a metric |
-
-Any row inserted into a `TimeSeries` table will be in fact stored in those three target tables.
-A `TimeSeries` table contains all those columns from the [data]{#data-table}, [tags]{#tags-table}, [metrics]{#metrics-table} tables.
-
-## Creation {#creation}
-
-There are multiple ways to create a table with the `TimeSeries` table engine.
-The simplest statement
-
-``` sql
-CREATE TABLE my_table ENGINE=TimeSeries
-```
-
-will actually create the following table (you can see that by executing `SHOW CREATE TABLE my_table`):
-
-``` sql
-CREATE TABLE my_table
-(
-    `id` UUID DEFAULT reinterpretAsUUID(sipHash128(metric_name, all_tags)),
-    `timestamp` DateTime64(3),
-    `value` Float64,
-    `metric_name` LowCardinality(String),
-    `tags` Map(LowCardinality(String), String),
-    `all_tags` Map(String, String),
-    `min_time` Nullable(DateTime64(3)),
-    `max_time` Nullable(DateTime64(3)),
-    `metric_family_name` String,
-    `type` String,
-    `unit` String,
-    `help` String
-)
-ENGINE = TimeSeries
-DATA ENGINE = MergeTree ORDER BY (id, timestamp)
-DATA INNER UUID '01234567-89ab-cdef-0123-456789abcdef'
-TAGS ENGINE = AggregatingMergeTree PRIMARY KEY metric_name ORDER BY (metric_name, id)
-TAGS INNER UUID '01234567-89ab-cdef-0123-456789abcdef'
-METRICS ENGINE = ReplacingMergeTree ORDER BY metric_family_name
-METRICS INNER UUID '01234567-89ab-cdef-0123-456789abcdef'
-```
-
-So the columns were generated automatically and also there are three inner UUIDs in this statement -
-one per each inner target table that was created.
-(Inner UUIDs are not shown normally until setting
-[show_table_uuid_in_table_create_query_if_not_nil](../../../operations/settings/settings#show_table_uuid_in_table_create_query_if_not_nil)
-is set.)
-
-Inner target tables have names like `.inner_id.data.xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`,
-`.inner_id.tags.xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`, `.inner_id.metrics.xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`
-and each target table has columns which is a subset of the columns of the main `TimeSeries` table:
-
-``` sql
-CREATE TABLE default.`.inner_id.data.xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`
-(
-    `id` UUID,
-    `timestamp` DateTime64(3),
-    `value` Float64
-)
-ENGINE = MergeTree
-ORDER BY (id, timestamp)
-```
-
-``` sql
-CREATE TABLE default.`.inner_id.tags.xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`
-(
-    `id` UUID DEFAULT reinterpretAsUUID(sipHash128(metric_name, all_tags)),
-    `metric_name` LowCardinality(String),
-    `tags` Map(LowCardinality(String), String),
-    `all_tags` Map(String, String) EPHEMERAL,
-    `min_time` SimpleAggregateFunction(min, Nullable(DateTime64(3))),
-    `max_time` SimpleAggregateFunction(max, Nullable(DateTime64(3)))
-)
-ENGINE = AggregatingMergeTree
-PRIMARY KEY metric_name
-ORDER BY (metric_name, id)
-```
-
-``` sql
-CREATE TABLE default.`.inner_id.metrics.xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`
-(
-    `metric_family_name` String,
-    `type` String,
-    `unit` String,
-    `help` String
-)
-ENGINE = ReplacingMergeTree
-ORDER BY metric_family_name
-```
-
-## Adjusting types of columns {#adjusting-column-types}
-
-You can adjust the types of almost any column of the inner target tables by specifying them explicitly
-while defining the main table. For example,
-
-``` sql
-CREATE TABLE my_table
-(
-    timestamp DateTime64(6)
-) ENGINE=TimeSeries
-```
-
-will make the inner [data]{#data-table} table store timestamp in microseconds instead of milliseconds:
-
-``` sql
-CREATE TABLE default.`.inner_id.data.xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`
-(
-    `id` UUID,
-    `timestamp` DateTime64(6),
-    `value` Float64
-)
-ENGINE = MergeTree
-ORDER BY (id, timestamp)
-```
-
-## The `id` column {#id-column}
-
-The `id` column contains identifiers, every identifier is calculated for a combination of a metric name and tags.
-The DEFAULT expression for the `id` column is an expression which will be used to calculate such identifiers.
-Both the type of the `id` column and that expression can be adjusted by specifying them explicitly:
-
-``` sql
-CREATE TABLE my_table
-(
-    id UInt64 DEFAULT sipHash64(metric_name, all_tags)
-) ENGINE=TimeSeries
-```
-
-## The `tags` and `all_tags` columns {#tags-and-all-tags}
-
-There are two columns containing maps of tags - `tags` and `all_tags`. In this example they mean the same, however they can be different
-if setting `tags_to_columns` is used. This setting allows to specify that a specific tag should be stored in a separate column instead of storing
-in a map inside the `tags` column:
-
-``` sql
-CREATE TABLE my_table ENGINE=TimeSeries SETTINGS = {'instance': 'instance', 'job': 'job'}
-```
-
-This statement will add columns
-```
-    `instance` String,
-    `job` String
-```
-to the definition of both `my_table` and its inner [tags]{#tags-table} target table. In this case the `tags` column will not contain tags `instance` and `job`,
-but the `all_tags` column will contain them. The `all_tags` column is ephemeral and its only purpose to be used in the DEFAULT expression
-for the `id` column.
-
-The types of columns can be adjusted by specifying them explicitly:
-
-``` sql
-CREATE TABLE my_table (instance LowCardinality(String), job LowCardinality(Nullable(String)))
-ENGINE=TimeSeries SETTINGS = {'instance': 'instance', 'job': 'job'}
-```
-
-## Table engines of inner target tables {#inner-table-engines}
-
-By default inner target tables use the following table engines:
-- the [data]{#data-table} table uses [MergeTree](../mergetree-family/mergetree);
-- the [tags]{#tags-table} table uses [AggregatingMergeTree](../mergetree-family/aggregatingmergetree) because the same data is often inserted multiple times to this table so we need a way
-to remove duplicates, and also because it's required to do aggregation for columns `min_time` and `max_time`;
-- the [metrics]{#metrics-table} table uses [ReplacingMergeTree](../mergetree-family/replacingmergetree) because the same data is often inserted multiple times to this table so we need a way
-to remove duplicates.
-
-Other table engines also can be used for inner target tables if it's specified so:
-
-``` sql
-CREATE TABLE my_table ENGINE=TimeSeries
-DATA ENGINE=ReplicatedMergeTree
-TAGS ENGINE=ReplicatedAggregatingMergeTree
-METRICS ENGINE=ReplicatedReplacingMergeTree
-```
-
-## External target tables {#external-target-tables}
-
-It's possible to make a `TimeSeries` table use a manually created table:
-
-``` sql
-CREATE TABLE data_for_my_table
-(
-    `id` UUID,
-    `timestamp` DateTime64(3),
-    `value` Float64
-)
-ENGINE = MergeTree
-ORDER BY (id, timestamp);
-
-CREATE TABLE tags_for_my_table ...
-
-CREATE TABLE metrics_for_my_table ...
-
-CREATE TABLE my_table ENGINE=TimeSeries DATA data_for_my_table TAGS tags_for_my_table METRICS metrics_for_my_table;
-```
-
-## Settings {#settings}
-
-Here is a list of settings which can be specified while defining a `TimeSeries` table:
-
-| Name | Type | Default | Description |
-|---|---|---|---|
-| `tags_to_columns` | Map | {} | Map specifying which tags should be put to separate columns in the [tags]{#tags-table} table. Syntax: `{'tag1': 'column1', 'tag2' : column2, ...}` |
-| `use_all_tags_column_to_generate_id` | Bool | true | When generating an expression to calculate an identifier of a time series, this flag enables using the `all_tags` column in that calculation |
-| `store_min_time_and_max_time` | Bool | true | If set to true then the table will store `min_time` and `max_time` for each time series |
-| `aggregate_min_time_and_max_time` | Bool | true | When creating an inner target `tags` table, this flag enables using `SimpleAggregateFunction(min, Nullable(DateTime64(3)))` instead of just `Nullable(DateTime64(3))` as the type of the `min_time` column, and the same for the `max_time` column |
-| `filter_by_min_time_and_max_time` | Bool | true | If set to true then the table will use the `min_time` and `max_time` columns for filtering time series |
-
-# Functions {#functions}
-
-Here is a list of functions supporting a `TimeSeries` table as an argument:
-- [timeSeriesData](../../../sql-reference/table-functions/timeSeriesData.md)
-- [timeSeriesTags](../../../sql-reference/table-functions/timeSeriesTags.md)
-- [timeSeriesMetrics](../../../sql-reference/table-functions/timeSeriesMetrics.md)
diff --git a/docs/en/engines/table-engines/mergetree-family/annindexes.md b/docs/en/engines/table-engines/mergetree-family/annindexes.md
index 3c75b8dbef0..5a81313f62e 100644
--- a/docs/en/engines/table-engines/mergetree-family/annindexes.md
+++ b/docs/en/engines/table-engines/mergetree-family/annindexes.md
@@ -17,122 +17,85 @@ In terms of SQL, the nearest neighborhood problem can be expressed as follows:
 
 ``` sql
 SELECT *
-FROM table
+FROM table_with_ann_index
 ORDER BY Distance(vectors, Point)
 LIMIT N
 ```
 
-`vectors` contains N-dimensional values of type [Array(Float32)](../../../sql-reference/data-types/array.md) or Array(Float64), for example
-embeddings. Function `Distance` computes the distance between two vectors. 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.
+`vectors` contains N-dimensional values of type [Array(Float32)](../../../sql-reference/data-types/array.md), for example embeddings.
+Function `Distance` computes the distance between two vectors. 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.
 
-This query returns the top-`N` closest points to the reference point. Parameter `N` limits the number of returned values which is useful for
-situations where `MaxDistance` is difficult to determine in advance.
+An alternative formulation of the nearest neighborhood search problem looks as follows:
 
-With brute force search, the query is expensive (linear in the number of points) because the distance between all points in `vectors` and
+``` sql
+SELECT *
+FROM table_with_ann_index
+WHERE Distance(vectors, Point) < MaxDistance
+LIMIT N
+```
+
+While the first query returns the top-`N` closest points to the reference point, the second query returns all points closer to the reference
+point than a maximally allowed radius `MaxDistance`. Parameter `N` limits the number of returned values which is useful for situations where
+`MaxDistance` is difficult to determine in advance.
+
+With brute force search, both queries are expensive (linear in the number of points) because the distance between all points in `vectors` and
 `Point` must be computed. To speed this process up, Approximate Nearest Neighbor Search Indexes (ANN indexes) store a compact representation
 of the search space (using clustering, search trees, etc.) which allows to compute an approximate answer much quicker (in sub-linear time).
 
-# Creating and Using Vector Similarity Indexes
+# Creating and Using ANN Indexes {#creating_using_ann_indexes}
 
-Syntax to create a vector similarity index over an [Array(Float32)](../../../sql-reference/data-types/array.md) column:
+Syntax to create an ANN index over an [Array(Float32)](../../../sql-reference/data-types/array.md) column:
 
 ```sql
-CREATE TABLE table
+CREATE TABLE table_with_ann_index
 (
-  id Int64,
-  vectors Array(Float32),
-  INDEX index_name vectors TYPE vector_similarity(method, distance_function[, quantization, connectivity, expansion_add, expansion_search]) [GRANULARITY N]
+  `id` Int64,
+  `vectors` Array(Float32),
+  INDEX [ann_index_name vectors TYPE [ann_index_type]([ann_index_parameters]) [GRANULARITY [N]]
 )
 ENGINE = MergeTree
 ORDER BY id;
 ```
 
-Parameters:
-- `method`: Supports currently only `hnsw`.
-- `distance_function`: either `L2Distance` (the [Euclidean distance](https://en.wikipedia.org/wiki/Euclidean_distance) - the length of a
-  line between two points in Euclidean space), or `cosineDistance` (the [cosine
-  distance](https://en.wikipedia.org/wiki/Cosine_similarity#Cosine_distance)- the angle between two non-zero vectors).
-- `quantization`: either `f64`, `f32`, `f16`, `bf16`, or `i8` for storing the vector with reduced precision (optional, default: `bf16`)
-- `m`: the number of neighbors per graph node (optional, default: 16)
-- `ef_construction`: (optional, default: 128)
-- `ef_search`: (optional, default: 64)
-
-Value 0 for parameters `m`, `ef_construction`, and `ef_search` refers to the default value.
-
-Example:
-
-```sql
-CREATE TABLE table
-(
-  id Int64,
-  vectors Array(Float32),
-  INDEX idx vectors TYPE vector_similarity('hnsw', 'L2Distance') -- Alternative syntax: TYPE vector_similarity(hnsw, L2Distance)
-)
-ENGINE = MergeTree
-ORDER BY id;
-```
-
-Vector similarity indexes are based on the [USearch library](https://github.com/unum-cloud/usearch), which implements the [HNSW
-algorithm](https://arxiv.org/abs/1603.09320), i.e., 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, that are expensive
-to load and compare. The library also has several hardware-specific SIMD optimizations to accelerate further distance computations on modern
-Arm (NEON and SVE) and x86 (AVX2 and AVX-512) CPUs and OS-specific optimizations to allow efficient navigation around immutable persistent
-files, without loading them into RAM.
-
-USearch indexes are currently experimental, to use them you first need to `SET allow_experimental_vector_similarity_index = 1`.
-
-Vector similarity indexes currently support two distance functions:
-- `L2Distance`, also called Euclidean distance, is the length of a line segment between two points in Euclidean space
-  ([Wikipedia](https://en.wikipedia.org/wiki/Euclidean_distance)).
-- `cosineDistance`, also called cosine similarity, is the cosine of the angle between two (non-zero) vectors
-  ([Wikipedia](https://en.wikipedia.org/wiki/Cosine_similarity)).
-
-Vector similarity indexes allows storing the vectors in reduced precision formats. Supported scalar kinds are `f64`, `f32`, `f16` or `i8`.
-If no scalar kind was specified during index creation, `f16` is used as default.
-
-For normalized data, `L2Distance` is usually a better choice, otherwise `cosineDistance` is recommended to compensate for scale. If no
-distance function was specified during index creation, `L2Distance` is used as default.
-
-:::note
-All arrays must have same length. To avoid errors, you can use a
-[CONSTRAINT](/docs/en/sql-reference/statements/create/table.md#constraints), for example, `CONSTRAINT constraint_name_1 CHECK
-length(vectors) = 256`. Also, empty `Arrays` and unspecified `Array` values in INSERT statements (i.e. default values) are not supported.
-:::
-
-:::note
-The vector similarity index currently does not work with per-table, non-default `index_granularity` settings (see
-[here](https://github.com/ClickHouse/ClickHouse/pull/51325#issuecomment-1605920475)). If necessary, the value must be changed in config.xml.
-:::
-
 ANN indexes are built during column insertion and merge. As a result, `INSERT` and `OPTIMIZE` statements will be slower than for ordinary
 tables. ANNIndexes are ideally used only with immutable or rarely changed data, respectively when are far more read requests than write
 requests.
 
-ANN indexes support this type of query:
+ANN indexes support two types of queries:
 
-``` sql
-WITH [...] AS reference_vector
-SELECT *
-FROM table
-WHERE ...                       -- WHERE clause is optional
-ORDER BY Distance(vectors, reference_vector)
-LIMIT N
-```
+- ORDER BY queries:
+
+  ``` sql
+  SELECT *
+  FROM table_with_ann_index
+  [WHERE ...]
+  ORDER BY Distance(vectors, Point)
+  LIMIT N
+  ```
+
+- WHERE queries:
+
+   ``` sql
+   SELECT *
+   FROM table_with_ann_index
+   WHERE Distance(vectors, Point) < MaxDistance
+   LIMIT N
+   ```
 
 :::tip
 To avoid writing out large vectors, you can use [query
 parameters](/docs/en/interfaces/cli.md#queries-with-parameters-cli-queries-with-parameters), e.g.
 
 ```bash
-clickhouse-client --param_vec='hello' --query="SELECT * FROM table WHERE L2Distance(vectors, {vec: Array(Float32)}) < 1.0"
+clickhouse-client --param_vec='hello' --query="SELECT * FROM table_with_ann_index WHERE L2Distance(vectors, {vec: Array(Float32)}) < 1.0"
 ```
 :::
 
-**Restrictions**: 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
+**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
 `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.
 
@@ -159,3 +122,128 @@ brute-force distance calculation over all rows of the granules. With a small `GR
 equally good, only the processing performance differs. It is generally recommended to use a large `GRANULARITY` for ANN indexes and fall
 back to a smaller `GRANULARITY` values only in case of problems like excessive memory consumption of the ANN structures. If no `GRANULARITY`
 was specified for ANN indexes, the default value is 100 million.
+
+
+# Available ANN Indexes {#available_ann_indexes}
+
+- [Annoy](/docs/en/engines/table-engines/mergetree-family/annindexes.md#annoy-annoy)
+
+- [USearch](/docs/en/engines/table-engines/mergetree-family/annindexes.md#usearch-usearch)
+
+## Annoy {#annoy}
+
+Annoy indexes are currently experimental, to use them you first need to `SET allow_experimental_annoy_index = 1`. They are also currently
+disabled on ARM due to memory safety problems with the algorithm.
+
+This type of ANN index is based on the [Annoy library](https://github.com/spotify/annoy) which recursively divides the space into random
+linear surfaces (lines in 2D, planes in 3D etc.).
+
+<div class='vimeo-container'>
+  <iframe src="//www.youtube.com/embed/QkCCyLW0ehU"
+    width="640"
+    height="360"
+    frameborder="0"
+    allow="autoplay;
+    fullscreen;
+    picture-in-picture"
+    allowfullscreen>
+  </iframe>
+</div>
+
+Syntax to create an Annoy index over an [Array(Float32)](../../../sql-reference/data-types/array.md) column:
+
+```sql
+CREATE TABLE table_with_annoy_index
+(
+  id Int64,
+  vectors Array(Float32),
+  INDEX [ann_index_name] vectors TYPE annoy([Distance[, NumTrees]]) [GRANULARITY N]
+)
+ENGINE = MergeTree
+ORDER BY id;
+```
+
+Annoy currently supports two distance functions:
+- `L2Distance`, also called Euclidean distance, is the length of a line segment between two points in Euclidean space
+  ([Wikipedia](https://en.wikipedia.org/wiki/Euclidean_distance)).
+- `cosineDistance`, also called cosine similarity, is the cosine of the angle between two (non-zero) vectors
+  ([Wikipedia](https://en.wikipedia.org/wiki/Cosine_similarity)).
+
+For normalized data, `L2Distance` is usually a better choice, otherwise `cosineDistance` is recommended to compensate for scale. If no
+distance function was specified during index creation, `L2Distance` is used as default.
+
+Parameter `NumTrees` is the number of trees which the algorithm creates (default if not specified: 100). Higher values of `NumTree` mean
+more accurate search results but slower index creation / query times (approximately linearly) as well as larger index sizes.
+
+:::note
+All arrays must have same length. To avoid errors, you can use a
+[CONSTRAINT](/docs/en/sql-reference/statements/create/table.md#constraints), for example, `CONSTRAINT constraint_name_1 CHECK
+length(vectors) = 256`. Also, empty `Arrays` and unspecified `Array` values in INSERT statements (i.e. default values) are not supported.
+:::
+
+The creation of Annoy indexes (whenever a new part is build, e.g. at the end of a merge) is a relatively slow process. You can increase
+setting `max_threads_for_annoy_index_creation` (default: 4) which controls how many threads are used to create an Annoy index. Please be
+careful with this setting, it is possible that multiple indexes are created in parallel in which case there can be overparallelization.
+
+Setting `annoy_index_search_k_nodes` (default: `NumTrees * LIMIT`) determines how many tree nodes are inspected during SELECTs. Larger
+values mean more accurate results at the cost of longer query runtime:
+
+```sql
+SELECT *
+FROM table_name
+ORDER BY L2Distance(vectors, Point)
+LIMIT N
+SETTINGS annoy_index_search_k_nodes=100;
+```
+
+:::note
+The Annoy index currently does not work with per-table, non-default `index_granularity` settings (see
+[here](https://github.com/ClickHouse/ClickHouse/pull/51325#issuecomment-1605920475)). If necessary, the value must be changed in config.xml.
+:::
+
+## USearch {#usearch}
+
+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,
+that are expensive to load and compare. The library also has several hardware-specific SIMD optimizations to accelerate further
+distance computations on modern Arm (NEON and SVE) and x86 (AVX2 and AVX-512) CPUs and OS-specific optimizations to allow efficient
+navigation around immutable persistent files, without loading them into RAM.
+
+<div class='vimeo-container'>
+  <iframe src="//www.youtube.com/embed/UMrhB3icP9w"
+    width="640"
+    height="360"
+    frameborder="0"
+    allow="autoplay;
+    fullscreen;
+    picture-in-picture"
+    allowfullscreen>
+  </iframe>
+</div>
+
+Syntax to create an USearch index over an [Array](../../../sql-reference/data-types/array.md) column:
+
+```sql
+CREATE TABLE table_with_usearch_index
+(
+  id Int64,
+  vectors Array(Float32),
+  INDEX [ann_index_name] vectors TYPE usearch([Distance[, ScalarKind]]) [GRANULARITY N]
+)
+ENGINE = MergeTree
+ORDER BY id;
+```
+
+USearch currently supports two distance functions:
+- `L2Distance`, also called Euclidean distance, is the length of a line segment between two points in Euclidean space
+  ([Wikipedia](https://en.wikipedia.org/wiki/Euclidean_distance)).
+- `cosineDistance`, also called cosine similarity, is the cosine of the angle between two (non-zero) vectors
+  ([Wikipedia](https://en.wikipedia.org/wiki/Cosine_similarity)).
+
+USearch allows storing the vectors in reduced precision formats. Supported scalar kinds are `f64`, `f32`, `f16` or `i8`. If no scalar kind
+was specified during index creation, `f16` is used as default.
+
+For normalized data, `L2Distance` is usually a better choice, otherwise `cosineDistance` is recommended to compensate for scale. If no
+distance function was specified during index creation, `L2Distance` is used as default.
diff --git a/docs/en/engines/table-engines/mergetree-family/mergetree.md b/docs/en/engines/table-engines/mergetree-family/mergetree.md
index 0bbee5f86f3..3826e4e9c94 100644
--- a/docs/en/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/mergetree.md
@@ -80,7 +80,7 @@ For partitioning by month, use the `toYYYYMM(date_column)` expression, where `da
 `PRIMARY KEY` — The primary key if it [differs from the sorting key](#choosing-a-primary-key-that-differs-from-the-sorting-key). Optional.
 
 Specifying a sorting key (using `ORDER BY` clause) implicitly specifies a primary key.
-It is usually not necessary to specify the primary key in addition to the sorting key.
+It is usually not necessary to specify the primary key in addition to the primary key.
 
 #### SAMPLE BY
 
@@ -989,56 +989,19 @@ ALTER TABLE tab DROP STATISTICS a;
 These lightweight statistics aggregate information about distribution of values in columns. Statistics are stored in every part and updated when every insert comes.
 They can be used for prewhere optimization only if we enable `set allow_statistics_optimize = 1`.
 
-### Available Types of Column Statistics {#available-types-of-column-statistics}
-
-- `MinMax`
-
-    The minimum and maximum column value which allows to estimate the selectivity of range filters on numeric columns.
-
-    Syntax: `minmax`
+#### Available Types of Column Statistics {#available-types-of-column-statistics}
 
 - `TDigest`
 
     [TDigest](https://github.com/tdunning/t-digest) sketches which allow to compute approximate percentiles (e.g. the 90th percentile) for numeric columns.
 
-    Syntax: `tdigest`
-
 - `Uniq`
 
     [HyperLogLog](https://en.wikipedia.org/wiki/HyperLogLog) sketches which provide an estimation how many distinct values a column contains.
 
-    Syntax: `uniq`
-
-- `CountMin`
-
-    [CountMin](https://en.wikipedia.org/wiki/Count%E2%80%93min_sketch) sketches which provide an approximate count of the frequency of each value in a column.
-
-    Syntax `countmin`
-
-
-### Supported Data Types {#supported-data-types}
-
-|           | (U)Int*, Float*, Decimal(*), Date*, Boolean, Enum* | String or FixedString |
-|-----------|----------------------------------------------------|-----------------------|
-| CountMin  | ✔                                                  | ✔                     |
-| MinMax    | ✔                                                  | ✗                     |
-| TDigest   | ✔                                                  | ✗                     |
-| Uniq      | ✔                                                  | ✔                     |
-
-
-### Supported Operations {#supported-operations}
-
-|           | Equality filters (==) | Range filters (>, >=, <, <=) |
-|-----------|-----------------------|------------------------------|
-| CountMin  | ✔                     | ✗                            |
-| MinMax    | ✗                     | ✔                            |
-| TDigest   | ✗                     | ✔                            |
-| Uniq      | ✔                     | ✗                            |
-
-
 ## Column-level Settings {#column-level-settings}
 
-Certain MergeTree settings can be overridden at column level:
+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.
diff --git a/docs/en/engines/table-engines/special/keepermap.md b/docs/en/engines/table-engines/special/keepermap.md
index 04a9a4b0d4e..5559cc2c648 100644
--- a/docs/en/engines/table-engines/special/keepermap.md
+++ b/docs/en/engines/table-engines/special/keepermap.md
@@ -54,7 +54,7 @@ CREATE TABLE keeper_map_table
     `v2` String,
     `v3` Float32
 )
-ENGINE = KeeperMap('/keeper_map_table', 4)
+ENGINE = KeeperMap(/keeper_map_table, 4)
 PRIMARY KEY key
 ```
 
diff --git a/docs/en/engines/table-engines/special/url.md b/docs/en/engines/table-engines/special/url.md
index bbc28daef48..c906830d0e9 100644
--- a/docs/en/engines/table-engines/special/url.md
+++ b/docs/en/engines/table-engines/special/url.md
@@ -109,7 +109,6 @@ For partitioning by month, use the `toYYYYMM(date_column)` expression, where `da
 - `_file` — Resource name of the `URL`. Type: `LowCardinalty(String)`.
 - `_size` — Size of the resource in bytes. Type: `Nullable(UInt64)`. If the size is unknown, the value is `NULL`.
 - `_time` — Last modified time of the file. Type: `Nullable(DateTime)`. If the time is unknown, the value is `NULL`.
-- `_headers` - HTTP response headers. Type: `Map(LowCardinality(String), LowCardinality(String))`.
 
 ## Storage Settings {#storage-settings}
 
diff --git a/docs/en/getting-started/example-datasets/nypd_complaint_data.md b/docs/en/getting-started/example-datasets/nypd_complaint_data.md
index 1caa1ab6a9a..a178fe456a6 100644
--- a/docs/en/getting-started/example-datasets/nypd_complaint_data.md
+++ b/docs/en/getting-started/example-datasets/nypd_complaint_data.md
@@ -55,7 +55,7 @@ CMPLNT_FR_TM                Nullable(String)
 ```
 
 :::tip
-Most of the time the above command will let you know which fields in the input data are numeric, and which are strings, and which are tuples.  This is not always the case.  Because ClickHouse is routineley used with datasets containing billions of records there is a default number (100) of rows examined to [infer the schema](/en/integrations/data-formats/json/inference) in order to avoid parsing billions of rows to infer the schema. The response below may not match what you see, as the dataset is updated several times each year. Looking at the Data Dictionary you can see that CMPLNT_NUM is specified as text, and not numeric.  By overriding the default of 100 rows for inference with the setting `SETTINGS input_format_max_rows_to_read_for_schema_inference=2000`
+Most of the time the above command will let you know which fields in the input data are numeric, and which are strings, and which are tuples.  This is not always the case.  Because ClickHouse is routineley used with datasets containing billions of records there is a default number (100) of rows examined to [infer the schema](/docs/en/integrations/data-ingestion/data-formats/json.md#relying-on-schema-inference) in order to avoid parsing billions of rows to infer the schema. The response below may not match what you see, as the dataset is updated several times each year. Looking at the Data Dictionary you can see that CMPLNT_NUM is specified as text, and not numeric.  By overriding the default of 100 rows for inference with the setting `SETTINGS input_format_max_rows_to_read_for_schema_inference=2000`
 you can get a better idea of the content.
 
 Note: as of version 22.5 the default is now 25,000 rows for inferring the schema, so only change the setting if you are on an older version or if you need more than 25,000 rows to be sampled.
diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index df96b8129f1..9c4c082bc3a 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -32,14 +32,12 @@ The supported formats are:
 | [Vertical](#vertical)                                                                     | ✗    | ✔     |
 | [JSON](#json)                                                                             | ✔    | ✔     |
 | [JSONAsString](#jsonasstring)                                                             | ✔    | ✗     |
-| [JSONAsObject](#jsonasobject)                                                             | ✔    | ✗     |
 | [JSONStrings](#jsonstrings)                                                               | ✔    | ✔     |
 | [JSONColumns](#jsoncolumns)                                                               | ✔    | ✔     |
 | [JSONColumnsWithMetadata](#jsoncolumnsmonoblock)                                          | ✔    | ✔     |
 | [JSONCompact](#jsoncompact)                                                               | ✔    | ✔     |
 | [JSONCompactStrings](#jsoncompactstrings)                                                 | ✗    | ✔     |
 | [JSONCompactColumns](#jsoncompactcolumns)                                                 | ✔    | ✔     |
-| [JSONCompactWithProgress](#jsoncompactwithprogress)                                       | ✗    | ✔     |
 | [JSONEachRow](#jsoneachrow)                                                               | ✔    | ✔     |
 | [PrettyJSONEachRow](#prettyjsoneachrow)                                                   | ✗    | ✔     |
 | [JSONEachRowWithProgress](#jsoneachrowwithprogress)                                       | ✗    | ✔     |
@@ -824,67 +822,6 @@ Result:
 └────────────────────────────┘
 ```
 
-## JSONAsObject {#jsonasobject}
-
-In this format, a single JSON object is interpreted as a single [Object('json')](/docs/en/sql-reference/data-types/json.md) value. If the input has several JSON objects (comma separated), they are interpreted as separate rows. If the input data is enclosed in square brackets, it is interpreted as an array of JSONs.
-
-This format can only be parsed for a table with a single field of type [Object('json')](/docs/en/sql-reference/data-types/json.md). The remaining columns must be set to [DEFAULT](/docs/en/sql-reference/statements/create/table.md/#default) or [MATERIALIZED](/docs/en/sql-reference/statements/create/table.md/#materialized).
-
-**Examples**
-
-Query:
-
-``` sql
-SET allow_experimental_object_type = 1;
-CREATE TABLE json_as_object (json Object('json')) ENGINE = Memory;
-INSERT INTO json_as_object (json) FORMAT JSONAsObject {"foo":{"bar":{"x":"y"},"baz":1}},{},{"any json stucture":1}
-SELECT * FROM json_as_object FORMAT JSONEachRow;
-```
-
-Result:
-
-``` response
-{"json":{"any json stucture":0,"foo":{"bar":{"x":"y"},"baz":1}}}
-{"json":{"any json stucture":0,"foo":{"bar":{"x":""},"baz":0}}}
-{"json":{"any json stucture":1,"foo":{"bar":{"x":""},"baz":0}}}
-```
-
-**An array of JSON objects**
-
-Query:
-
-``` sql
-SET allow_experimental_object_type = 1;
-CREATE TABLE json_square_brackets (field Object('json')) ENGINE = Memory;
-INSERT INTO json_square_brackets FORMAT JSONAsObject [{"id": 1, "name": "name1"}, {"id": 2, "name": "name2"}];
-
-SELECT * FROM json_square_brackets FORMAT JSONEachRow;
-```
-
-Result:
-
-```response
-{"field":{"id":1,"name":"name1"}}
-{"field":{"id":2,"name":"name2"}}
-```
-
-**Columns with default values**
-
-```sql
-SET allow_experimental_object_type = 1;
-CREATE TABLE json_as_object (json Object('json'), time DateTime MATERIALIZED now()) ENGINE = Memory;
-INSERT INTO json_as_object (json) FORMAT JSONAsObject {"foo":{"bar":{"x":"y"},"baz":1}};
-INSERT INTO json_as_object (json) FORMAT JSONAsObject {};
-INSERT INTO json_as_object (json) FORMAT JSONAsObject {"any json stucture":1}
-SELECT * FROM json_as_object FORMAT JSONEachRow
-```
-
-```resonse
-{"json":{"any json stucture":0,"foo":{"bar":{"x":"y"},"baz":1}},"time":"2024-07-25 17:02:45"}
-{"json":{"any json stucture":0,"foo":{"bar":{"x":""},"baz":0}},"time":"2024-07-25 17:02:47"}
-{"json":{"any json stucture":1,"foo":{"bar":{"x":""},"baz":0}},"time":"2024-07-25 17:02:50"}
-```
-
 ## JSONCompact {#jsoncompact}
 
 Differs from JSON only in that data rows are output in arrays, not in objects.
@@ -989,59 +926,6 @@ Example:
 
 Columns that are not present in the block will be filled with default values (you can use  [input_format_defaults_for_omitted_fields](/docs/en/operations/settings/settings-formats.md/#input_format_defaults_for_omitted_fields) setting here)
 
-## JSONCompactWithProgress (#jsoncompactwithprogress)
-
-In this format, ClickHouse outputs each row as a separated, newline-delimited JSON Object.
-
-Each row is either a metadata object, data object, progress information or statistics object:
-
-1. **Metadata Object (`meta`)**
-    - Describes the structure of the data rows.
-    - Fields: `name` (column name), `type` (data type, e.g., `UInt32`, `String`, etc.).
-    - Example: `{"meta": [{"name":"id", "type":"UInt32"}, {"name":"name", "type":"String"}]}`
-    - Appears before any data objects.
-
-2. **Data Object (`data`)**
-    - Represents a row of query results.
-    - Fields: An array with values corresponding to the columns defined in the metadata.
-    - Example: `{"data":["1", "John Doe"]}`
-    - Appears after the metadata object, one per row.
-
-3. **Progress Information Object (`progress`)**
-    - Provides real-time progress feedback during query execution.
-    - Fields: `read_rows`, `read_bytes`, `written_rows`, `written_bytes`, `total_rows_to_read`, `result_rows`, `result_bytes`, `elapsed_ns`.
-    - Example: `{"progress":{"read_rows":"8","read_bytes":"168"}}`
-    - May appear intermittently.
-
-4. **Statistics Object (`statistics`)**
-    - Summarizes query execution statistics.
-    - Fields: `rows`, `rows_before_limit_at_least`, `elapsed`, `rows_read`, `bytes_read`.
-    - Example: `{"statistics": {"rows":2, "elapsed":0.001995, "rows_read":8}}`
-    - Appears at the end.
-
-5. **Exception Object (`exception`)**
-    - Represents an error that occurred during query execution.
-    - Fields: A single text field containing the error message.
-    - Example: `{"exception": "Code: 395. DB::Exception: Value passed to 'throwIf' function is non-zero..."}`
-    - Appears when an error is encountered.
-
-6. **Totals Object (`totals`)**
-    - Provides the totals for each numeric column in the result set.
-    - Fields: An array with total values corresponding to the columns defined in the metadata.
-    - Example: `{"totals": ["", "3"]}`
-    - Appears at the end of the data rows, if applicable.
-
-Example:
-
-```json
-{"meta": [{"name":"id", "type":"UInt32"}, {"name":"name", "type":"String"}]}
-{"progress":{"read_rows":"8","read_bytes":"168","written_rows":"0","written_bytes":"0","total_rows_to_read":"2","result_rows":"0","result_bytes":"0","elapsed_ns":"0"}}
-{"data":["1", "John Doe"]}
-{"data":["2", "Joe Doe"]}
-{"statistics": {"rows":2, "rows_before_limit_at_least":8, "elapsed":0.001995, "rows_read":8, "bytes_read":168}}
-```
-
-
 ## JSONEachRow {#jsoneachrow}
 
 In this format, ClickHouse outputs each row as a separated, newline-delimited JSON Object.
diff --git a/docs/en/interfaces/http.md b/docs/en/interfaces/http.md
index ffd65fce00f..f5b6326fa96 100644
--- a/docs/en/interfaces/http.md
+++ b/docs/en/interfaces/http.md
@@ -58,7 +58,7 @@ Connection: Close
 Content-Type: text/tab-separated-values; charset=UTF-8
 X-ClickHouse-Server-Display-Name: clickhouse.ru-central1.internal
 X-ClickHouse-Query-Id: 5abe861c-239c-467f-b955-8a201abb8b7f
-X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334", "real_time_microseconds": "0"}
+X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334"}
 
 1
 ```
@@ -379,7 +379,7 @@ You can mitigate this problem by enabling `wait_end_of_query=1` ([Response Buffe
 However, this does not completely solve the problem because the result must still fit within the `http_response_buffer_size`, and other settings like `send_progress_in_http_headers` can interfere with the delay of the header.
 The only way to catch all errors is to analyze the HTTP body before parsing it using the required format.
 
-## Queries with Parameters {#cli-queries-with-parameters}
+### Queries with Parameters {#cli-queries-with-parameters}
 
 You can create a query with parameters and pass values for them from the corresponding HTTP request parameters. For more information, see [Queries with Parameters for CLI](../interfaces/cli.md#cli-queries-with-parameters).
 
@@ -472,7 +472,7 @@ $ curl -v 'http://localhost:8123/predefined_query'
 < X-ClickHouse-Format: Template
 < X-ClickHouse-Timezone: Asia/Shanghai
 < Keep-Alive: timeout=10
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334", "real_time_microseconds":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334"}
 <
 # HELP "Query" "Number of executing queries"
 # TYPE "Query" counter
@@ -668,7 +668,7 @@ $ curl -vv  -H 'XXX:xxx' 'http://localhost:8123/hi'
 < Content-Type: text/html; charset=UTF-8
 < Transfer-Encoding: chunked
 < Keep-Alive: timeout=10
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334", "real_time_microseconds":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334"}
 <
 * Connection #0 to host localhost left intact
 Say Hi!%
@@ -708,7 +708,7 @@ $ curl -v  -H 'XXX:xxx' 'http://localhost:8123/get_config_static_handler'
 < Content-Type: text/plain; charset=UTF-8
 < Transfer-Encoding: chunked
 < Keep-Alive: timeout=10
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334", "real_time_microseconds":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334"}
 <
 * Connection #0 to host localhost left intact
 <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>%
@@ -766,7 +766,7 @@ $ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_absolute_path_static_handler'
 < Content-Type: text/html; charset=UTF-8
 < Transfer-Encoding: chunked
 < Keep-Alive: timeout=10
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334", "real_time_microseconds":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334"}
 <
 <html><body>Absolute Path File</body></html>
 * Connection #0 to host localhost left intact
@@ -785,7 +785,7 @@ $ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_relative_path_static_handler'
 < Content-Type: text/html; charset=UTF-8
 < Transfer-Encoding: chunked
 < Keep-Alive: timeout=10
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334", "real_time_microseconds":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334"}
 <
 <html><body>Relative Path File</body></html>
 * Connection #0 to host localhost left intact
diff --git a/docs/en/interfaces/prometheus.md b/docs/en/interfaces/prometheus.md
deleted file mode 100644
index 8e7023cc51f..00000000000
--- a/docs/en/interfaces/prometheus.md
+++ /dev/null
@@ -1,160 +0,0 @@
----
-slug: /en/interfaces/prometheus
-sidebar_position: 19
-sidebar_label: Prometheus protocols
----
-
-# Prometheus protocols
-
-## Exposing metrics {#expose}
-
-:::note
-ClickHouse Cloud does not currently support connecting to Prometheus. To be notified when this feature is supported, please contact support@clickhouse.com.
-:::
-
-ClickHouse can expose its own metrics for scraping from Prometheus:
-
-```xml
-<prometheus>
-    <port>9363</port>
-    <endpoint>/metrics</endpoint>
-    <metrics>true</metrics>
-    <asynchronous_metrics>true</asynchronous_metrics>
-    <events>true</events>
-    <errors>true</errors>
-</prometheus>
-
-Section `<prometheus.handlers>` can be used to make more extended handlers.
-This section is similar to [<http_handlers>](/en/interfaces/http) but works for prometheus protocols:
-
-```xml
-<prometheus>
-    <port>9363</port>
-    <handlers>
-        <my_rule_1>
-            <url>/metrics</url>
-            <handler>
-                <type>expose_metrics</type>
-                <metrics>true</metrics>
-                <asynchronous_metrics>true</asynchronous_metrics>
-                <events>true</events>
-                <errors>true</errors>
-            </handler>
-        </my_rule_1>
-    </handlers>
-</prometheus>
-```
-
-Settings:
-
-| Name | Default | Description |
-|---|---|---|---|
-| `port` | none | Port for serving the exposing metrics protocol. |
-| `endpoint` | `/metrics` | HTTP endpoint for scraping metrics by prometheus server. Starts with `/`. Should not be used with the `<handlers>` section. |
-| `url` / `headers` / `method` | none | Filters used to find a matching handler for a request. Similar to the fields with the same names in the [<http_handlers>](/en/interfaces/http) section. |
-| `metrics` | true | Expose metrics from the [system.metrics](/en/operations/system-tables/metrics) table. |
-| `asynchronous_metrics` | true | Expose current metrics values from the [system.asynchronous_metrics](/en/operations/system-tables/asynchronous_metrics) table. |
-| `events` | true | Expose metrics from the [system.events](/en/operations/system-tables/events) table. |
-| `errors` | true | Expose the number of errors by error codes occurred since the last server restart. This information could be obtained from the [system.errors](/en/operations/system-tables/errors) as well. |
-
-Check (replace `127.0.0.1` with the IP addr or hostname of your ClickHouse server):
-```bash
-curl 127.0.0.1:9363/metrics
-```
-
-## Remote-write protocol {#remote-write}
-
-ClickHouse supports the [remote-write](https://prometheus.io/docs/specs/remote_write_spec/) protocol.
-Data are received by this protocol and written to a [TimeSeries](/en/engines/table-engines/special/time_series) table
-(which should be created beforehand).
-
-```xml
-<prometheus>
-    <port>9363</port>
-    <handlers>
-        <my_rule_1>
-            <url>/write</url>
-            <handler>
-                <type>remote_write</type>
-                <database>db_name</database>
-                <table>time_series_table</table>
-            </handler>
-        </my_rule_1>
-    </handlers>
-</prometheus>
-```
-
-Settings:
-
-| Name | Default | Description |
-|---|---|---|---|
-| `port` | none | Port for serving the `remote-write` protocol. |
-| `url` / `headers` / `method` | none | Filters used to find a matching handler for a request. Similar to the fields with the same names in the [<http_handlers>](/en/interfaces/http) section. |
-| `table` | none | The name of a [TimeSeries](/en/engines/table-engines/special/time_series) table to write data received by the `remote-write` protocol. This name can optionally contain the name of a database too. |
-| `database` | none | The name of a database where the table specified in the `table` setting is located if it's not specified in the `table` setting. |
-
-## Remote-read protocol {#remote-read}
-
-ClickHouse supports the [remote-read](https://prometheus.io/docs/prometheus/latest/querying/remote_read_api/) protocol.
-Data are read from a [TimeSeries](/en/engines/table-engines/special/time_series) table and sent via this protocol.
-
-```xml
-<prometheus>
-    <port>9363</port>
-    <handlers>
-        <my_rule_1>
-            <url>/read</url>
-            <handler>
-                <type>remote_read</type>
-                <database>db_name</database>
-                <table>time_series_table</table>
-            </handler>
-        </my_rule_1>
-    </handlers>
-</prometheus>
-```
-
-Settings:
-
-| Name | Default | Description |
-|---|---|---|---|
-| `port` | none | Port for serving the `remote-read` protocol. |
-| `url` / `headers` / `method` | none | Filters used to find a matching handler for a request. Similar to the fields with the same names in the [<http_handlers>](/en/interfaces/http) section. |
-| `table` | none | The name of a [TimeSeries](/en/engines/table-engines/special/time_series) table to read data to send by the `remote-read` protocol. This name can optionally contain the name of a database too. |
-| `database` | none | The name of a database where the table specified in the `table` setting is located if it's not specified in the `table` setting. |
-
-## Configuration for multiple protocols {#multiple-protocols}
-
-Multiple protocols can be specified together in one place:
-
-```xml
-<prometheus>
-    <port>9363</port>
-    <handlers>
-        <my_rule_1>
-            <url>/metrics</url>
-            <handler>
-                <type>expose_metrics</type>
-                <metrics>true</metrics>
-                <asynchronous_metrics>true</asynchronous_metrics>
-                <events>true</events>
-                <errors>true</errors>
-            </handler>
-        </my_rule_1>
-        <my_rule_2>
-            <url>/write</url>
-            <handler>
-                <type>remote_write</type>
-                <table>db_name.time_series_table</table>
-            </handler>
-        </my_rule_2>
-        <my_rule_3>
-            <url>/read</url>
-            <handler>
-                <type>remote_read</type>
-                <table>db_name.time_series_table</table>
-            </handler>
-        </my_rule_3>
-    </handlers>
-</prometheus>
-```
diff --git a/docs/en/interfaces/schema-inference.md b/docs/en/interfaces/schema-inference.md
index a2d96c078e8..5b3cd179e21 100644
--- a/docs/en/interfaces/schema-inference.md
+++ b/docs/en/interfaces/schema-inference.md
@@ -359,14 +359,13 @@ DESC format(JSONEachRow, '{"int" : 42, "float" : 42.42, "string" : "Hello, World
 Dates, DateTimes:
 
 ```sql
-DESC format(JSONEachRow, '{"date" : "2022-01-01", "datetime" : "2022-01-01 00:00:00", "datetime64" : "2022-01-01 00:00:00.000"}')
+DESC format(JSONEachRow, '{"date" : "2022-01-01", "datetime" : "2022-01-01 00:00:00"}')
 ```
 ```response
-┌─name───────┬─type────────────────────┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┬─ttl_expression─┐
-│ date       │ Nullable(Date)          │              │                    │         │                  │                │
-│ datetime   │ Nullable(DateTime)      │              │                    │         │                  │                │
-│ datetime64 │ Nullable(DateTime64(9)) │              │                    │         │                  │                │
-└────────────┴─────────────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
+┌─name─────┬─type────────────────────┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┬─ttl_expression─┐
+│ date     │ Nullable(Date)          │              │                    │         │                  │                │
+│ datetime │ Nullable(DateTime64(9)) │              │                    │         │                  │                │
+└──────────┴─────────────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
 Arrays:
@@ -760,13 +759,12 @@ DESC format(CSV, 'Hello world!,World hello!')
 Dates, DateTimes:
 
 ```sql
-DESC format(CSV, '"2020-01-01","2020-01-01 00:00:00","2022-01-01 00:00:00.000"')
+DESC format(CSV, '"2020-01-01","2020-01-01 00:00:00"')
 ```
 ```response
 ┌─name─┬─type────────────────────┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┬─ttl_expression─┐
 │ c1   │ Nullable(Date)          │              │                    │         │                  │                │
-│ c2   │ Nullable(DateTime)      │              │                    │         │                  │                │
-│ c3   │ Nullable(DateTime64(9)) │              │                    │         │                  │                │
+│ c2   │ Nullable(DateTime64(9)) │              │                    │         │                  │                │
 └──────┴─────────────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
@@ -958,13 +956,12 @@ DESC format(TSKV, 'int=42	float=42.42	bool=true	string=Hello,World!\n')
 Dates, DateTimes:
 
 ```sql
-DESC format(TSV, '2020-01-01	2020-01-01 00:00:00	2022-01-01 00:00:00.000')
+DESC format(TSV, '2020-01-01	2020-01-01 00:00:00')
 ```
 ```response
 ┌─name─┬─type────────────────────┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┬─ttl_expression─┐
 │ c1   │ Nullable(Date)          │              │                    │         │                  │                │
-│ c2   │ Nullable(DateTime)      │              │                    │         │                  │                │
-│ c3   │ Nullable(DateTime64(9)) │              │                    │         │                  │                │
+│ c2   │ Nullable(DateTime64(9)) │              │                    │         │                  │                │
 └──────┴─────────────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
@@ -1129,13 +1126,12 @@ DESC format(Values, $$(42, 42.42, true, 'Hello,World!')$$)
 Dates, DateTimes:
 
 ```sql
- DESC format(Values, $$('2020-01-01', '2020-01-01 00:00:00', '2022-01-01 00:00:00.000')$$)
- ```
+DESC format(Values, $$('2020-01-01', '2020-01-01 00:00:00')$$)
+```
 ```response
 ┌─name─┬─type────────────────────┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┬─ttl_expression─┐
 │ c1   │ Nullable(Date)          │              │                    │         │                  │                │
-│ c2   │ Nullable(DateTime)      │              │                    │         │                  │                │
-│ c3   │ Nullable(DateTime64(9)) │              │                    │         │                  │                │
+│ c2   │ Nullable(DateTime64(9)) │              │                    │         │                  │                │
 └──────┴─────────────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
@@ -1505,8 +1501,8 @@ DESC format(JSONEachRow, $$
 
 #### input_format_try_infer_datetimes
 
-If enabled, ClickHouse will try to infer type `DateTime` or `DateTime64` from string fields in schema inference for text formats.
-If all fields from a column in sample data were successfully parsed as datetimes, the result type will be `DateTime` or `DateTime64(9)` (if any datetime had fractional part),
+If enabled, ClickHouse will try to infer type `DateTime64` from string fields in schema inference for text formats.
+If all fields from a column in sample data were successfully parsed as datetimes, the result type will be `DateTime64(9)`,
 if at least one field was not parsed as datetime, the result type will be `String`.
 
 Enabled by default.
@@ -1514,66 +1510,39 @@ Enabled by default.
 **Examples**
 
 ```sql
-SET input_format_try_infer_datetimes = 0;
+SET input_format_try_infer_datetimes = 0
 DESC format(JSONEachRow, $$
-                                {"datetime" : "2021-01-01 00:00:00", "datetime64" : "2021-01-01 00:00:00.000"}
-                                {"datetime" : "2022-01-01 00:00:00", "datetime64" : "2022-01-01 00:00:00.000"}
+                                {"datetime" : "2021-01-01 00:00:00.000"}
+                                {"datetime" : "2022-01-01 00:00:00.000"}
                          $$)
 ```
 ```response
-┌─name───────┬─type─────────────┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┬─ttl_expression─┐
-│ datetime   │ Nullable(String) │              │                    │         │                  │                │
-│ datetime64 │ Nullable(String) │              │                    │         │                  │                │
-└────────────┴──────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
+┌─name─────┬─type─────────────┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┬─ttl_expression─┐
+│ datetime │ Nullable(String) │              │                    │         │                  │                │
+└──────────┴──────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 ```sql
-SET input_format_try_infer_datetimes = 1;
+SET input_format_try_infer_datetimes = 1
 DESC format(JSONEachRow, $$
-                                {"datetime" : "2021-01-01 00:00:00", "datetime64" : "2021-01-01 00:00:00.000"}
-                                {"datetime" : "2022-01-01 00:00:00", "datetime64" : "2022-01-01 00:00:00.000"}
+                                {"datetime" : "2021-01-01 00:00:00.000"}
+                                {"datetime" : "2022-01-01 00:00:00.000"}
                          $$)
 ```
 ```response
-┌─name───────┬─type────────────────────┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┬─ttl_expression─┐
-│ datetime   │ Nullable(DateTime)      │              │                    │         │                  │                │
-│ datetime64 │ Nullable(DateTime64(9)) │              │                    │         │                  │                │
-└────────────┴─────────────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
+┌─name─────┬─type────────────────────┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┬─ttl_expression─┐
+│ datetime │ Nullable(DateTime64(9)) │              │                    │         │                  │                │
+└──────────┴─────────────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 ```sql
 DESC format(JSONEachRow, $$
-                                {"datetime" : "2021-01-01 00:00:00", "datetime64" : "2021-01-01 00:00:00.000"}
-                                {"datetime" : "unknown", "datetime64" : "unknown"}
+                                {"datetime" : "2021-01-01 00:00:00.000"}
+                                {"datetime" : "unknown"}
                          $$)
 ```
 ```response
-┌─name───────┬─type─────────────┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┬─ttl_expression─┐
-│ datetime   │ Nullable(String) │              │                    │         │                  │                │
-│ datetime64 │ Nullable(String) │              │                    │         │                  │                │
-└────────────┴──────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
-```
-
-#### input_format_try_infer_datetimes_only_datetime64
-
-If enabled, ClickHouse will always infer `DateTime64(9)` when `input_format_try_infer_datetimes` is enabled even if datetime values don't contain fractional part.
-
-Disabled by default.
-
-**Examples**
-
-```sql
-SET input_format_try_infer_datetimes = 1;
-SET input_format_try_infer_datetimes_only_datetime64 = 1;
-DESC format(JSONEachRow, $$
-                                {"datetime" : "2021-01-01 00:00:00", "datetime64" : "2021-01-01 00:00:00.000"}
-                                {"datetime" : "2022-01-01 00:00:00", "datetime64" : "2022-01-01 00:00:00.000"}
-                         $$)
-```
-
-```text
-┌─name───────┬─type────────────────────┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┬─ttl_expression─┐
-│ datetime   │ Nullable(DateTime64(9)) │              │                    │         │                  │                │
-│ datetime64 │ Nullable(DateTime64(9)) │              │                    │         │                  │                │
-└────────────┴─────────────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
+┌─name─────┬─type─────────────┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┬─ttl_expression─┐
+│ datetime │ Nullable(String) │              │                    │         │                  │                │
+└──────────┴──────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
 Note: Parsing datetimes during schema inference respect setting [date_time_input_format](/docs/en/operations/settings/settings-formats.md#date_time_input_format)
diff --git a/docs/en/interfaces/third-party/gui.md b/docs/en/interfaces/third-party/gui.md
index 16d9b66e17f..5b7615485ca 100644
--- a/docs/en/interfaces/third-party/gui.md
+++ b/docs/en/interfaces/third-party/gui.md
@@ -10,7 +10,7 @@ sidebar_label: Visual Interfaces
 
 ### ch-ui {#ch-ui}
 
-[ch-ui](https://github.com/caioricciuti/ch-ui) is a simple React.js app interface for ClickHouse databases designed for executing queries and visualizing data. Built with React and the ClickHouse client for web, it offers a sleek and user-friendly UI for easy database interactions.
+[ch-ui](https://github.com/caioricciuti/ch-ui) is a simple React.js app interface for ClickHouse databases, designed for executing queries and visualizing data. Built with React and the ClickHouse client for web, it offers a sleek and user-friendly UI for easy database interactions.
 
 Features:
 
@@ -25,7 +25,7 @@ Web interface for ClickHouse in the [Tabix](https://github.com/tabixio/tabix) pr
 
 Features:
 
-- Works with ClickHouse directly from the browser without the need to install additional software.
+- Works with ClickHouse directly from the browser, without the need to install additional software.
 - Query editor with syntax highlighting.
 - Auto-completion of commands.
 - Tools for graphical analysis of query execution.
@@ -63,7 +63,7 @@ Features:
 
 - Table list with filtering and metadata.
 - Table preview with filtering and sorting.
-- Read-only query execution.
+- Read-only queries execution.
 
 ### Redash {#redash}
 
@@ -75,23 +75,23 @@ Features:
 
 - Powerful editor of queries.
 - Database explorer.
-- Visualization tool that allows you to represent data in different forms.
+- Visualization tools, that allow you to represent data in different forms.
 
 ### Grafana {#grafana}
 
 [Grafana](https://grafana.com/grafana/plugins/grafana-clickhouse-datasource/) is a platform for monitoring and visualization.
 
-"Grafana allows you to query, visualize, alert on and understand your metrics no matter where they are stored. Create, explore, and share dashboards with your team and foster a data-driven culture. Trusted and loved by the community" &mdash; grafana.com.
+"Grafana allows you to query, visualize, alert on and understand your metrics no matter where they are stored. Create, explore, and share dashboards with your team and foster a data driven culture. Trusted and loved by the community" &mdash; grafana.com.
 
-ClickHouse data source plugin provides support for ClickHouse as a backend database.
+ClickHouse datasource plugin provides a support for ClickHouse as a backend database.
 
-### qryn {#qryn}
+### qryn (#qryn)
 
 [qryn](https://metrico.in) is a polyglot, high-performance observability stack for ClickHouse _(formerly cLoki)_ with native Grafana integrations allowing users to ingest and analyze logs, metrics and telemetry traces from any agent supporting Loki/LogQL, Prometheus/PromQL, OTLP/Tempo, Elastic, InfluxDB and many more.
 
 Features:
 
-- Built-in Explore UI and LogQL CLI for querying, extracting and visualizing data
+- Built in Explore UI and LogQL CLI for querying, extracting and visualizing data
 - Native Grafana APIs support for querying, processing, ingesting, tracing and alerting without plugins
 - Powerful pipeline to dynamically search, filter and extract data from logs, events, traces and beyond
 - Ingestion and PUSH APIs transparently compatible with LogQL, PromQL, InfluxDB, Elastic and many more
@@ -139,7 +139,7 @@ Features:
 
 ### DBM {#dbm}
 
-[DBM](https://github.com/devlive-community/dbm) DBM is a visual management tool for ClickHouse!
+[DBM](https://dbm.incubator.edurt.io/) DBM is a visual management tool for ClickHouse!
 
 Features:
 
@@ -151,7 +151,7 @@ Features:
 - Support custom query
 - Support multiple data sources management(connection test, monitoring)
 - Support monitor (processor, connection, query)
-- Support migrating data
+- Support migrate data
 
 ### Bytebase {#bytebase}
 
@@ -169,7 +169,7 @@ Features:
 
 ### Zeppelin-Interpreter-for-ClickHouse {#zeppelin-interpreter-for-clickhouse}
 
-[Zeppelin-Interpreter-for-ClickHouse](https://github.com/SiderZhang/Zeppelin-Interpreter-for-ClickHouse) is a [Zeppelin](https://zeppelin.apache.org) interpreter for ClickHouse. Compared with the JDBC interpreter, it can provide better timeout control for long-running queries.
+[Zeppelin-Interpreter-for-ClickHouse](https://github.com/SiderZhang/Zeppelin-Interpreter-for-ClickHouse) is a [Zeppelin](https://zeppelin.apache.org) interpreter for ClickHouse. Compared with JDBC interpreter, it can provide better timeout control for long running queries.
 
 ### ClickCat {#clickcat}
 
@@ -179,7 +179,7 @@ Features:
 
 - An online SQL editor which can run your SQL code without any installing.
 - You can observe all processes and mutations. For those unfinished processes, you can kill them in ui.
-- The Metrics contain Cluster Analysis, Data Analysis, and Query Analysis.
+- The Metrics contains Cluster Analysis,Data Analysis,Query Analysis.
 
 ### ClickVisual {#clickvisual}
 
@@ -233,16 +233,6 @@ Features:
 - Useful tools: Zookeeper data exploration, query EXPLAIN, kill queries, etc.
 - Visualization metric charts: queries and resource usage, number of merges/mutation, merge performance, query performance, etc.
 
-### CKibana {#ckibana}
-
-[CKibana](https://github.com/TongchengOpenSource/ckibana) is a lightweight service that allows you to effortlessly search, explore, and visualize ClickHouse data using the native Kibana UI.
-
-Features:
-
-- Translates chart requests from the native Kibana UI into ClickHouse query syntax.
-- Supports advanced features such as sampling and caching to enhance query performance.
-- Minimizes the learning cost for users after migrating from ElasticSearch to ClickHouse.
-
 ## Commercial {#commercial}
 
 ### DataGrip {#datagrip}
@@ -342,7 +332,7 @@ 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!
+[CKMAN] (https://www.github.com/housepower/ckman) is a tool for managing and monitoring ClickHouse clusters!
 
 Features:
 
diff --git a/docs/en/operations/analyzer.md b/docs/en/operations/analyzer.md
index c9b3c30d30d..298c6dacd06 100644
--- a/docs/en/operations/analyzer.md
+++ b/docs/en/operations/analyzer.md
@@ -123,7 +123,7 @@ To ensure consistent and expected results, especially when migrating old queries
 In the new version of the analyzer, the rules for determining the common supertype for columns specified in the `USING` clause have been standardized to produce more predictable outcomes, especially when dealing with type modifiers like `LowCardinality` and `Nullable`.
 
 - `LowCardinality(T)` and `T`: When a column of type `LowCardinality(T)` is joined with a column of type `T`, the resulting common supertype will be `T`, effectively discarding the `LowCardinality` modifier.
-
+  
 - `Nullable(T)` and `T`: When a column of type `Nullable(T)` is joined with a column of type `T`, the resulting common supertype will be `Nullable(T)`, ensuring that the nullable property is preserved.
 
 **Example:**
@@ -144,7 +144,7 @@ During projection names computation, aliases are not substituted.
 SELECT
     1 + 1 AS x,
     x + 1
-SETTINGS enable_analyzer = 0
+SETTINGS allow_experimental_analyzer = 0
 FORMAT PrettyCompact
 
    ┌─x─┬─plus(plus(1, 1), 1)─┐
@@ -154,7 +154,7 @@ FORMAT PrettyCompact
 SELECT
     1 + 1 AS x,
     x + 1
-SETTINGS enable_analyzer = 1
+SETTINGS allow_experimental_analyzer = 1
 FORMAT PrettyCompact
 
    ┌─x─┬─plus(x, 1)─┐
@@ -177,7 +177,7 @@ SELECT toTypeName(if(0, [2, 3, 4], 'String'))
 
 ### Heterogeneous clusters
 
-The new analyzer significantly changed the communication protocol between servers in the cluster. Thus, it's impossible to run distributed queries on servers with different `enable_analyzer` setting values.
+The new analyzer significantly changed the communication protocol between servers in the cluster. Thus, it's impossible to run distributed queries on servers with different `allow_experimental_analyzer` setting values.
 
 ### Mutations are interpreted by previous analyzer
 
diff --git a/docs/en/operations/backup.md b/docs/en/operations/backup.md
index 248fdbc156f..fc861e25e9f 100644
--- a/docs/en/operations/backup.md
+++ b/docs/en/operations/backup.md
@@ -85,7 +85,6 @@ The BACKUP and RESTORE statements take a list of DATABASE and TABLE names, a des
     - `password` for the file on disk
     - `base_backup`: the destination of the previous backup of this source.  For example, `Disk('backups', '1.zip')`
     - `use_same_s3_credentials_for_base_backup`: whether base backup to S3 should inherit credentials from the query. Only works with `S3`.
-    - `use_same_password_for_base_backup`: whether base backup archive should inherit the password from the query.
     - `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`
diff --git a/docs/en/operations/external-authenticators/ssl-x509.md b/docs/en/operations/external-authenticators/ssl-x509.md
index a7514966fa7..09fac45d7ae 100644
--- a/docs/en/operations/external-authenticators/ssl-x509.md
+++ b/docs/en/operations/external-authenticators/ssl-x509.md
@@ -6,7 +6,7 @@ import SelfManaged from '@site/docs/en/_snippets/_self_managed_only_no_roadmap.m
 
 <SelfManaged />
 
-[SSL 'strict' option](../server-configuration-parameters/settings.md#server_configuration_parameters-openssl) enables mandatory certificate validation for the incoming connections. In this case, only connections with trusted certificates can be established. Connections with untrusted certificates will be rejected. Thus, certificate validation allows to uniquely authenticate an incoming connection. `Common Name` or `subjectAltName extension` field of the certificate is used to identify the connected user. `subjectAltName extension` supports the usage of one wildcard '*' in the server configuration. This allows to associate multiple certificates with the same user. Additionally, reissuing and revoking of the certificates does not affect the ClickHouse configuration.
+[SSL 'strict' option](../server-configuration-parameters/settings.md#server_configuration_parameters-openssl) enables mandatory certificate validation for the incoming connections. In this case, only connections with trusted certificates can be established. Connections with untrusted certificates will be rejected. Thus, certificate validation allows to uniquely authenticate an incoming connection. `Common Name` or `subjectAltName extension` field of the certificate is used to identify the connected user. This allows to associate multiple certificates with the same user. Additionally, reissuing and revoking of the certificates does not affect the ClickHouse configuration.
 
 To enable SSL certificate authentication, a list of `Common Name`'s or `Subject Alt Name`'s for each ClickHouse user must be specified in the settings file `users.xml `:
 
@@ -30,12 +30,6 @@ To enable SSL certificate authentication, a list of `Common Name`'s or `Subject
             </ssl_certificates>
             <!-- Other settings -->
         </user_name_2>
-        <user_name_3>
-            <ssl_certificates>
-                <!-- Wildcard support -->
-                <subject_alt_name>URI:spiffe://foo.com/*/bar</subject_alt_name>
-            </ssl_certificates>
-        </user_name_3>
     </users>
 </clickhouse>
 ```
diff --git a/docs/en/operations/named-collections.md b/docs/en/operations/named-collections.md
index 1c82aeaaf2c..59ee05d1f9e 100644
--- a/docs/en/operations/named-collections.md
+++ b/docs/en/operations/named-collections.md
@@ -73,21 +73,13 @@ In the above example the `password_sha256_hex` value is the hexadecimal represen
 
 ### Storage for named collections
 
-Named collections can either be stored on local disk or in ZooKeeper/Keeper. By default local storage is used.
-They can also be stored using encryption with the same algorithms used for [disk encryption](storing-data#encrypted-virtual-file-system),
-where `aes_128_ctr` is used by default.
+Named collections can either be stored on local disk or in zookeeper/keeper. By default local storage is used.
 
-To configure named collections storage you need to specify a `type`. This can be either `local` or `keeper`/`zookeeper`. For encrypted storage,
-you can use `local_encrypted` or `keeper_encrypted`/`zookeeper_encrypted`.
-
-To use ZooKeeper/Keeper we also need to set up a `path` (path in ZooKeeper/Keeper, where named collections will be stored) to
-`named_collections_storage` section in configuration file. The following example uses encryption and ZooKeeper/Keeper:
+To configure named collections storage in keeper and a `type` (equal to either `keeper` or `zookeeper`) and `path` (path in keeper, where named collections will be stored) to `named_collections_storage` section in configuration file:
 ```
 <clickhouse>
   <named_collections_storage>
-    <type>zookeeper_encrypted</type>
-    <key_hex>bebec0cabebec0cabebec0cabebec0ca</key_hex>
-    <algorithm>aes_128_ctr</algorithm>
+    <type>zookeeper</type>
     <path>/named_collections_path/</path>
     <update_timeout_ms>1000</update_timeout_ms>
   </named_collections_storage>
@@ -315,22 +307,8 @@ SELECT dictGet('dict', 'B', 2);
 
 ## Named collections for accessing PostgreSQL database
 
-The description of parameters see [postgresql](../sql-reference/table-functions/postgresql.md). Additionally, there are aliases:
+The description of parameters see [postgresql](../sql-reference/table-functions/postgresql.md).
 
-- `username` for `user`
-- `db` for `database`.
-
-Parameter `addresses_expr` is used in a collection instead of `host:port`. The parameter is optional, because there are other optional ones: `host`, `hostname`, `port`. The following pseudo code explains the priority:
-
-```sql
-CASE
-    WHEN collection['addresses_expr'] != '' THEN collection['addresses_expr']
-    WHEN collection['host'] != ''           THEN collection['host'] || ':' || if(collection['port'] != '', collection['port'], '5432')
-    WHEN collection['hostname'] != ''       THEN collection['hostname'] || ':' || if(collection['port'] != '', collection['port'], '5432')
-END
-```
-
-Example of creation:
 ```sql
 CREATE NAMED COLLECTION mypg AS
 user = 'pguser',
@@ -338,7 +316,7 @@ password = 'jw8s0F4',
 host = '127.0.0.1',
 port = 5432,
 database = 'test',
-schema = 'test_schema'
+schema = 'test_schema',
 ```
 
 Example of configuration:
@@ -391,10 +369,6 @@ SELECT * FROM mypgtable;
 └───┘
 ```
 
-:::note
-PostgreSQL copies data from the named collection when the table is being created. A change in the collection does not affect the existing tables.
-:::
-
 ### Example of using named collections with database with engine PostgreSQL
 
 ```sql
@@ -504,7 +478,7 @@ kafka_topic_list = 'kafka_topic',
 kafka_group_name = 'consumer_group',
 kafka_format = 'JSONEachRow',
 kafka_max_block_size = '1048576';
-
+       
 ```
 ### XML example
 
diff --git a/docs/en/operations/query-cache.md b/docs/en/operations/query-cache.md
index 955cec0234e..7a920671fc2 100644
--- a/docs/en/operations/query-cache.md
+++ b/docs/en/operations/query-cache.md
@@ -143,20 +143,6 @@ value can be specified at session, profile or query level using setting [query_c
 Entries in the query cache are compressed by default. This reduces the overall memory consumption at the cost of slower writes into / reads
 from the query cache. To disable compression, use setting [query_cache_compress_entries](settings/settings.md#query-cache-compress-entries).
 
-Sometimes it is useful to keep multiple results for the same query cached. This can be achieved using setting
-[query_cache_tag](settings/settings.md#query-cache-tag) that acts as as a label (or namespace) for a query cache entries. The query cache
-considers results of the same query with different tags different.
-
-Example for creating three different query cache entries for the same query:
-
-```sql
-SELECT 1 SETTINGS use_query_cache = true; -- query_cache_tag is implicitly '' (empty string)
-SELECT 1 SETTINGS use_query_cache = true, query_cache_tag = 'tag 1';
-SELECT 1 SETTINGS use_query_cache = true, query_cache_tag = 'tag 2';
-```
-
-To remove only entries with tag `tag` from the query cache, you can use statement `SYSTEM DROP QUERY CACHE TAG 'tag'`.
-
 ClickHouse reads table data in blocks of [max_block_size](settings/settings.md#setting-max_block_size) rows. Due to filtering, aggregation,
 etc., result blocks are typically much smaller than 'max_block_size' but there are also cases where they are much bigger. Setting
 [query_cache_squash_partial_results](settings/settings.md#query-cache-squash-partial-results) (enabled by default) controls if result blocks
diff --git a/docs/en/operations/server-configuration-parameters/settings.md b/docs/en/operations/server-configuration-parameters/settings.md
index ccc8cf017ca..8278f8c8699 100644
--- a/docs/en/operations/server-configuration-parameters/settings.md
+++ b/docs/en/operations/server-configuration-parameters/settings.md
@@ -103,6 +103,8 @@ Default: 2
 
 The policy on how to perform a scheduling for background merges and mutations. Possible values are: `round_robin` and `shortest_task_first`.
 
+## background_merges_mutations_scheduling_policy
+
 Algorithm used to select next merge or mutation to be executed by background thread pool. Policy may be changed at runtime without server restart.
 Could be applied from the `default` profile for backward compatibility.
 
@@ -1400,16 +1402,6 @@ The number of seconds that ClickHouse waits for incoming requests before closing
 <keep_alive_timeout>10</keep_alive_timeout>
 ```
 
-## max_keep_alive_requests {#max-keep-alive-requests}
-
-Maximal number of requests through a single keep-alive connection until it will be closed by ClickHouse server. Default to 10000.
-
-**Example**
-
-``` xml
-<max_keep_alive_requests>10</max_keep_alive_requests>
-```
-
 ## listen_host {#listen_host}
 
 Restriction on hosts that requests can come from. If you want the server to answer all of them, specify `::`.
@@ -1463,29 +1455,26 @@ Examples:
 
 ## logger {#logger}
 
-The location and format of log messages.
+Logging settings.
 
 Keys:
 
-- `level` – Log level. Acceptable values: `none` (turn logging off), `fatal`, `critical`, `error`, `warning`, `notice`, `information`,
-  `debug`, `trace`, `test`
-- `log` – The path to the log file.
-- `errorlog` – The path to the error log file.
-- `size` – Rotation policy: Maximum size of the log files in bytes. Once the log file size exceeds this threshold, it is renamed and archived, and a new log file is created.
-- `count` – Rotation policy: How many historical log files Clickhouse are kept at most.
-- `stream_compress` – Compress log messages using LZ4. Set to `1` or `true` to enable.
-- `console` – Do not write log messages to log files, instead print them in the console. Set to `1` or `true` to enable. Default is
-  `1` if Clickhouse does not run in daemon mode, `0` otherwise.
-- `console_log_level` – Log level for console output. Defaults to `level`.
-- `formatting` – Log format for console output. Currently, only `json` is supported).
-- `use_syslog` - Also forward log output to syslog.
-- `syslog_level` - Log level for logging to syslog.
+- `level` – Logging level. Acceptable values: `trace`, `debug`, `information`, `warning`, `error`.
+- `log` – The log file. Contains all the entries according to `level`.
+- `errorlog` – Error log file.
+- `size` – Size of the file. Applies to `log` and `errorlog`. Once the file reaches `size`, ClickHouse archives and renames it, and creates a new log file in its place.
+- `count` – The number of archived log files that ClickHouse stores.
+- `console` – Send `log` and `errorlog` to the console instead of file. To enable, set to `1` or `true`.
+- `console_log_level` – Logging level for console. Default to `level`.
+- `use_syslog` - Log to syslog as well.
+- `syslog_level` - Logging level for logging to syslog.
+- `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).
 
-**Log format specifiers**
+Both log and error log file names (only file names, not directories) support date and time format specifiers.
 
-File names in `log` and `errorLog` paths support below format specifiers for the resulting file name (the directory part does not support them).
-
-Column “Example” shows the output at `2023-07-06 18:32:07`.
+**Format specifiers**
+Using the following format specifiers, you can define a pattern for the resulting file name. “Example” column shows possible results for `2023-07-06 18:32:07`.
 
 | Specifier   | Description                                                                                                         | Example                  |
 |-------------|---------------------------------------------------------------------------------------------------------------------|--------------------------|
@@ -1540,37 +1529,18 @@ Column “Example” shows the output at `2023-07-06 18:32:07`.
 </logger>
 ```
 
-To print log messages only in the console:
+Writing to the console can be configured. Config example:
 
 ``` xml
 <logger>
     <level>information</level>
-    <console>true</console>
-</logger>
-```
-
-**Per-level Overrides**
-
-The log level of individual log names can be overridden. For example, to mute all messages of loggers "Backup" and "RBAC".
-
-```xml
-<logger>
-    <levels>
-        <logger>
-            <name>Backup</name>
-            <level>none</level>
-        </logger>
-        <logger>
-            <name>RBAC</name>
-            <level>none</level>
-        </logger>
-    </levels>
+    <console>1</console>
 </logger>
 ```
 
 ### syslog
 
-To write log messages additionally to syslog:
+Writing to the syslog is also supported. Config example:
 
 ``` xml
 <logger>
@@ -1584,12 +1554,14 @@ To write log messages additionally to syslog:
 </logger>
 ```
 
-Keys for `<syslog>`:
+Keys for syslog:
 
-- `address` — The address of syslog in format `host\[:port\]`. If omitted, the local daemon is used.
-- `hostname` — The name of the host from which logs are send. Optional.
-- `facility` — The syslog [facility keyword](https://en.wikipedia.org/wiki/Syslog#Facility). Must be specified uppercase with a “LOG_” prefix, e.g. `LOG_USER`, `LOG_DAEMON`, `LOG_LOCAL3`, etc. Default value: `LOG_USER` if `address` is specified, `LOG_DAEMON` otherwise.
-- `format` – Log message format. Possible values: `bsd` and `syslog.`
+- use_syslog — Required setting if you want to write to the syslog.
+- address — The host\[:port\] of syslogd. If omitted, the local daemon is used.
+- hostname — Optional. The name of the host that logs are sent from.
+- facility — [The syslog facility keyword](https://en.wikipedia.org/wiki/Syslog#Facility) in uppercase letters with the “LOG_” prefix: (`LOG_USER`, `LOG_DAEMON`, `LOG_LOCAL3`, and so on).
+    Default value: `LOG_USER` if `address` is specified, `LOG_DAEMON` otherwise.
+- format – Message format. Possible values: `bsd` and `syslog.`
 
 ### Log formats
 
@@ -1608,7 +1580,6 @@ You can specify the log format that will be outputted in the console log. Curren
   "source_line": "192"
 }
 ```
-
 To enable JSON logging support, use the following snippet:
 
 ```xml
@@ -2143,6 +2114,48 @@ The trailing slash is mandatory.
 <path>/var/lib/clickhouse/</path>
 ```
 
+## Prometheus {#prometheus}
+
+:::note
+ClickHouse Cloud does not currently support connecting to Prometheus. To be notified when this feature is supported, please contact support@clickhouse.com.
+:::
+
+Exposing metrics data for scraping from [Prometheus](https://prometheus.io).
+
+Settings:
+
+- `endpoint` – HTTP endpoint for scraping metrics by prometheus server. Start from ‘/’.
+- `port` – Port for `endpoint`.
+- `metrics` – Expose metrics from the [system.metrics](../../operations/system-tables/metrics.md#system_tables-metrics) table.
+- `events` – Expose metrics from the [system.events](../../operations/system-tables/events.md#system_tables-events) table.
+- `asynchronous_metrics` – Expose current metrics values from the [system.asynchronous_metrics](../../operations/system-tables/asynchronous_metrics.md#system_tables-asynchronous_metrics) table.
+- `errors` - Expose the number of errors by error codes occurred since the last server restart. This information could be obtained from the [system.errors](../../operations/system-tables/asynchronous_metrics.md#system_tables-errors) as well.
+
+**Example**
+
+``` xml
+<clickhouse>
+    <listen_host>0.0.0.0</listen_host>
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <!-- highlight-start -->
+    <prometheus>
+        <endpoint>/metrics</endpoint>
+        <port>9363</port>
+        <metrics>true</metrics>
+        <events>true</events>
+        <asynchronous_metrics>true</asynchronous_metrics>
+        <errors>true</errors>
+    </prometheus>
+    <!-- highlight-end -->
+</clickhouse>
+```
+
+Check (replace `127.0.0.1` with the IP addr or hostname of your ClickHouse server):
+```bash
+curl 127.0.0.1:9363/metrics
+```
+
 ## query_log {#query-log}
 
 Setting for logging queries received with the [log_queries=1](../../operations/settings/settings.md) setting.
diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index a13aacc76e6..7278b91f90d 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -119,6 +119,11 @@ Minimum size of blocks of uncompressed data required for compression when writin
 You can also specify this setting in the global settings (see [min_compress_block_size](/docs/en/operations/settings/settings.md/#min-compress-block-size) setting).
 The value specified when table is created overrides the global value for this setting.
 
+## max_partitions_to_read
+
+Limits the maximum number of partitions that can be accessed in one query.
+You can also specify setting [max_partitions_to_read](/docs/en/operations/settings/merge-tree-settings.md/#max-partitions-to-read) in the global setting.
+
 ## max_suspicious_broken_parts
 
 If the number of broken parts in a single partition exceeds the `max_suspicious_broken_parts` value, automatic deletion is denied.
@@ -686,8 +691,6 @@ Possible values:
 
 Default value: -1 (unlimited).
 
-You can also specify a query complexity setting [max_partitions_to_read](query-complexity#max-partitions-to-read) at a query / session / profile level.
-
 ## min_age_to_force_merge_seconds {#min_age_to_force_merge_seconds}
 
 Merge parts if every part in the range is older than the value of `min_age_to_force_merge_seconds`.
@@ -1041,27 +1044,3 @@ Compression rates of LZ4 or ZSTD improve on average by 20-40%.
 
 This setting works best for tables with no primary key or a low-cardinality primary key, i.e. a table with only few distinct primary key values.
 High-cardinality primary keys, e.g. involving timestamp columns of type `DateTime64`, are not expected to benefit from this setting.
-
-## lightweight_mutation_projection_mode
-
-By default, lightweight delete `DELETE` does not work for tables with projections. This is because rows in a projection may be affected by a `DELETE` operation. So the default value would be `throw`.
-However, this option can change the behavior. With the value either `drop` or `rebuild`, deletes will work with projections. `drop` would delete the projection so it might be fast in the current query as projection gets deleted but slow in future queries as no projection attached.
-`rebuild` would rebuild the projection which might affect the performance of the current query, but might speedup for future queries. A good thing is that these options would only work in the part level,
-which means projections in the part that don't get touched would stay intact instead of triggering any action like drop or rebuild.
-
-Possible values:
-
-- throw, drop, rebuild
-
-Default value: throw
-
-## deduplicate_merge_projection_mode
-
-Whether to allow create projection for the table with non-classic MergeTree, that is not (Replicated, Shared) MergeTree. If allowed, what is the action when merge projections, either drop or rebuild. So classic MergeTree would ignore this setting.
-It also controls `OPTIMIZE DEDUPLICATE` as well, but has effect on all MergeTree family members. Similar to the option `lightweight_mutation_projection_mode`, it is also part level.
-
-Possible values:
-
-- throw, drop, rebuild
-
-Default value: throw
\ No newline at end of file
diff --git a/docs/en/operations/settings/query-complexity.md b/docs/en/operations/settings/query-complexity.md
index 14ccb1167f9..2a20e74e20f 100644
--- a/docs/en/operations/settings/query-complexity.md
+++ b/docs/en/operations/settings/query-complexity.md
@@ -188,7 +188,7 @@ If you set `timeout_before_checking_execution_speed `to 0, ClickHouse will use c
 
 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
+# max_execution_time_leaf
 
 Similar semantic to `max_execution_time` but only apply on leaf node for distributed or remote queries.
 
@@ -204,7 +204,7 @@ We can use `max_execution_time_leaf` as the query settings:
 SELECT count() FROM cluster(cluster, view(SELECT * FROM t)) SETTINGS max_execution_time_leaf = 10;
 ```
 
-## timeout_overflow_mode_leaf
+# timeout_overflow_mode_leaf
 
 What to do when the query in leaf node run longer than `max_execution_time_leaf`: `throw` or `break`. By default, `throw`.
 
@@ -426,17 +426,3 @@ Example:
 ```
 
 Default value: 0 (Infinite count of simultaneous sessions).
-
-## max_partitions_to_read {#max-partitions-to-read}
-
-Limits the maximum number of partitions that can be accessed in one query.
-
-The setting value specified when the table is created can be overridden via query-level setting.
-
-Possible values:
-
-- Any positive integer.
-
-Default value: -1 (unlimited).
-
-You can also specify a MergeTree setting [max_partitions_to_read](merge-tree-settings#max-partitions-to-read) in tables' setting.
diff --git a/docs/en/operations/settings/settings-formats.md b/docs/en/operations/settings/settings-formats.md
index 5aad8db2809..57812ef0e03 100644
--- a/docs/en/operations/settings/settings-formats.md
+++ b/docs/en/operations/settings/settings-formats.md
@@ -194,17 +194,6 @@ If enabled, ClickHouse will try to infer type `DateTime64` from string fields in
 
 Enabled by default.
 
-## input_format_try_infer_variants {#input_format_try_infer_variants}
-
-If enabled, ClickHouse will try to infer type [`Variant`](../../sql-reference/data-types/variant.md) in schema inference for text formats when there is more than one possible type for column/array elements.
-
-Possible values:
-
-- 0 — Disabled.
-- 1 — Enabled.
-
-Default value: `0`.
-
 ## date_time_input_format {#date_time_input_format}
 
 Allows choosing a parser of the text representation of date and time.
diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index e826bb457c2..c3f697c3bdc 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -1381,7 +1381,7 @@ Default value: `2`.
 
 Close connection before returning connection to the pool.
 
-Default value: false.
+Default value: true.
 
 ## odbc_bridge_connection_pool_size {#odbc-bridge-connection-pool-size}
 
@@ -1800,17 +1800,6 @@ Possible values:
 
 Default value: `0`.
 
-## query_cache_tag {#query-cache-tag}
-
-A string which acts as a label for [query cache](../query-cache.md) entries.
-The same queries with different tags are considered different by the query cache.
-
-Possible values:
-
-- Any string
-
-Default value: `''`
-
 ## query_cache_max_size_in_bytes {#query-cache-max-size-in-bytes}
 
 The maximum amount of memory (in bytes) the current user may allocate in the [query cache](../query-cache.md). 0 means unlimited.
@@ -2855,7 +2844,7 @@ The minimum chunk size in bytes, which each thread will parse in parallel.
 
 ## merge_selecting_sleep_ms {#merge_selecting_sleep_ms}
 
-Minimum time to wait before trying to select parts to merge again after no parts were selected. A lower setting triggers selecting tasks in `background_schedule_pool` frequently, which results in a large number of requests to ClickHouse Keeper in large-scale clusters.
+Sleep time for merge selecting when no part is selected. A lower setting triggers selecting tasks in `background_schedule_pool` frequently, which results in a large number of requests to ClickHouse Keeper in large-scale clusters.
 
 Possible values:
 
@@ -2863,16 +2852,6 @@ Possible values:
 
 Default value: `5000`.
 
-## max_merge_selecting_sleep_ms
-
-Maximum time to wait before trying to select parts to merge again after no parts were selected. A lower setting triggers selecting tasks in `background_schedule_pool` frequently, which results in a large number of requests to ClickHouse Keeper in large-scale clusters.
-
-Possible values:
-
-- Any positive integer.
-
-Default value: `60000`.
-
 ## parallel_distributed_insert_select {#parallel_distributed_insert_select}
 
 Enables parallel distributed `INSERT ... SELECT` query.
@@ -3226,7 +3205,7 @@ Default value: `0`.
 
 ## lightweight_deletes_sync {#lightweight_deletes_sync}
 
-The same as [`mutations_sync`](#mutations_sync), but controls only execution of lightweight deletes.
+The same as 'mutation_sync', but controls only execution of lightweight deletes.
 
 Possible values:
 
@@ -4072,7 +4051,7 @@ Rewrite aggregate functions with if expression as argument when logically equiva
 For example, `avg(if(cond, col, null))` can be rewritten to `avgOrNullIf(cond, col)`. It may improve performance.
 
 :::note
-Supported only with experimental analyzer (`enable_analyzer = 1`).
+Supported only with experimental analyzer (`allow_experimental_analyzer = 1`).
 :::
 
 ## database_replicated_initial_query_timeout_sec {#database_replicated_initial_query_timeout_sec}
@@ -4650,8 +4629,8 @@ Default Value: 5.
 
 ## memory_overcommit_ratio_denominator {#memory_overcommit_ratio_denominator}
 
-It represents the soft memory limit when the hard limit is reached on the global level.
-This value is used to compute the overcommit ratio for the query.
+It represents soft memory limit in case when hard limit is reached on user level.
+This value is used to compute overcommit ratio for the query.
 Zero means skip the query.
 Read more about [memory overcommit](memory-overcommit.md).
 
@@ -4667,8 +4646,8 @@ Default value: `5000000`.
 
 ## memory_overcommit_ratio_denominator_for_user {#memory_overcommit_ratio_denominator_for_user}
 
-It represents the soft memory limit when the hard limit is reached on the user level.
-This value is used to compute the overcommit ratio for the query.
+It represents soft memory limit in case when hard limit is reached on global level.
+This value is used to compute overcommit ratio for the query.
 Zero means skip the query.
 Read more about [memory overcommit](memory-overcommit.md).
 
@@ -5629,56 +5608,3 @@ Default value: `10000000`.
 Minimal size of block to compress in CROSS JOIN. Zero value means - disable this threshold. This block is compressed when any of the two thresholds (by rows or by bytes) are reached.
 
 Default value: `1GiB`.
-
-## use_json_alias_for_old_object_type
-
-When enabled, `JSON` data type alias will be used to create an old [Object('json')](../../sql-reference/data-types/json.md) type instead of the new [JSON](../../sql-reference/data-types/newjson.md) type.
-
-Default value: `false`.
-
-## type_json_skip_duplicated_paths
-
-When enabled, ClickHouse will skip duplicated paths during parsing of [JSON](../../sql-reference/data-types/newjson.md) object. Only the value of the first occurrence of each path will be inserted.
-
-Default value: `false`
-
-## restore_replace_external_engines_to_null
-
-For testing purposes. Replaces all external engines to Null to not initiate external connections.
-
-Default value: `False`
-
-## restore_replace_external_table_functions_to_null
-
-For testing purposes. Replaces all external table functions to Null to not initiate external connections.
-
-Default value: `False`
-
-## disable_insertion_and_mutation
-
-Disable all insert and mutations (alter table update / alter table delete / alter table drop partition). Set to true, can make this node focus on reading queries.
-
-Default value: `false`.
-
-## use_hive_partitioning
-
-When enabled, ClickHouse will detect Hive-style partitioning in path (`/name=value/`) in file-like table engines [File](../../engines/table-engines/special/file.md#hive-style-partitioning)/[S3](../../engines/table-engines/integrations/s3.md#hive-style-partitioning)/[URL](../../engines/table-engines/special/url.md#hive-style-partitioning)/[HDFS](../../engines/table-engines/integrations/hdfs.md#hive-style-partitioning)/[AzureBlobStorage](../../engines/table-engines/integrations/azureBlobStorage.md#hive-style-partitioning) and will allow to use partition columns as virtual columns in the query. These virtual columns will have the same names as in the partitioned path, but starting with `_`.
-
-Default value: `false`.
-
-## allow_experimental_time_series_table {#allow-experimental-time-series-table}
-
-Allows creation of tables with the [TimeSeries](../../engines/table-engines/integrations/time-series.md) table engine.
-
-Possible values:
-
-- 0 — the [TimeSeries](../../engines/table-engines/integrations/time-series.md) table engine is disabled.
-- 1 — the [TimeSeries](../../engines/table-engines/integrations/time-series.md) table engine is enabled.
-
-Default value: `0`.
-
-## create_if_not_exists
-
-Enable `IF NOT EXISTS` for `CREATE` statement by default. If either this setting or `IF NOT EXISTS` is specified and a table with the provided name already exists, no exception will be thrown.
-
-Default value: `false`.
diff --git a/docs/en/operations/storing-data.md b/docs/en/operations/storing-data.md
index 903611a9a65..53ecd66396d 100644
--- a/docs/en/operations/storing-data.md
+++ b/docs/en/operations/storing-data.md
@@ -499,7 +499,7 @@ Required parameters:
 - `type` — `encrypted`. Otherwise the encrypted disk is not created.
 - `disk` — Type of disk for data storage.
 - `key` — The key for encryption and decryption. Type: [Uint64](/docs/en/sql-reference/data-types/int-uint.md). You can use `key_hex` parameter to encode the key in hexadecimal form.
-    You can specify multiple keys using the `id` attribute (see example below).
+    You can specify multiple keys using the `id` attribute (see example above).
 
 Optional parameters:
 
diff --git a/docs/en/operations/system-tables/kafka_consumers.md b/docs/en/operations/system-tables/kafka_consumers.md
index d58c9f754fd..7e28a251e26 100644
--- a/docs/en/operations/system-tables/kafka_consumers.md
+++ b/docs/en/operations/system-tables/kafka_consumers.md
@@ -24,7 +24,6 @@ Columns:
 - `num_rebalance_revocations`, (UInt64) - number of times the consumer was revoked its partitions
 - `num_rebalance_assignments`, (UInt64) - number of times the consumer was assigned to Kafka cluster
 - `is_currently_used`, (UInt8) - consumer is in use
-- `last_used`, (UInt64) - last time this consumer was in use, unix time in microseconds
 - `rdkafka_stat` (String) - library internal statistic. See https://github.com/ClickHouse/librdkafka/blob/master/STATISTICS.md . Set `statistics_interval_ms` to 0 disable, default is 3000 (once in three seconds).
 
 Example:
diff --git a/docs/en/operations/system-tables/projections.md b/docs/en/operations/system-tables/projections.md
deleted file mode 100644
index e9c88f731b2..00000000000
--- a/docs/en/operations/system-tables/projections.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-slug: /en/operations/system-tables/projections
----
-# projections
-
-Contains information about existing projections in all the tables.
-
-Columns:
-
-- `database` ([String](../../sql-reference/data-types/string.md)) — Database name.
-- `table` ([String](../../sql-reference/data-types/string.md)) — Table name.
-- `name` ([String](../../sql-reference/data-types/string.md)) — Projection name.
-- `type` ([Enum](../../sql-reference/data-types/enum.md)) — Projection type ('Normal' = 0, 'Aggregate' = 1).
-- `sorting_key` ([Array(String)](../../sql-reference/data-types/array.md)) — Projection sorting key.
-- `query` ([String](../../sql-reference/data-types/string.md)) — Projection query.
-
-**Example**
-
-```sql
-SELECT * FROM system.projections LIMIT 2 FORMAT Vertical;
-```
-
-```text
-Row 1:
-──────
-database:    default
-table:       landing
-name:        improved_sorting_key
-type:        Normal
-sorting_key: ['user_id','date']
-query:       SELECT * ORDER BY user_id, date
-
-Row 2:
-──────
-database:    default
-table:       landing
-name:        agg_no_key
-type:        Aggregate
-sorting_key: []
-query:       SELECT count()
-```
diff --git a/docs/en/operations/system-tables/query_cache.md b/docs/en/operations/system-tables/query_cache.md
index 9c48574a329..a9f86f5fc2b 100644
--- a/docs/en/operations/system-tables/query_cache.md
+++ b/docs/en/operations/system-tables/query_cache.md
@@ -9,7 +9,6 @@ Columns:
 
 - `query` ([String](../../sql-reference/data-types/string.md)) — Query string.
 - `result_size` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Size of the query cache entry.
-- `tag` ([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md)) — Tag of the query cache entry.
 - `stale` ([UInt8](../../sql-reference/data-types/int-uint.md)) — If the query cache entry is stale.
 - `shared` ([UInt8](../../sql-reference/data-types/int-uint.md)) — If the query cache entry is shared between multiple users.
 - `compressed` ([UInt8](../../sql-reference/data-types/int-uint.md)) — If the query cache entry is compressed.
@@ -27,7 +26,6 @@ Row 1:
 ──────
 query:       SELECT 1 SETTINGS use_query_cache = 1
 result_size: 128
-tag:
 stale:       0
 shared:      0
 compressed:  1
diff --git a/docs/en/operations/system-tables/trace_log.md b/docs/en/operations/system-tables/trace_log.md
index a60de2a08d1..5adc33de37f 100644
--- a/docs/en/operations/system-tables/trace_log.md
+++ b/docs/en/operations/system-tables/trace_log.md
@@ -3,7 +3,7 @@ slug: /en/operations/system-tables/trace_log
 ---
 # trace_log
 
-Contains stack traces collected by the [sampling query profiler](../../operations/optimizing-performance/sampling-query-profiler.md).
+Contains stack traces collected by the sampling query profiler.
 
 ClickHouse creates this table when the [trace_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-trace_log) server configuration section is set. Also see settings: [query_profiler_real_time_period_ns](../../operations/settings/settings.md#query_profiler_real_time_period_ns), [query_profiler_cpu_time_period_ns](../../operations/settings/settings.md#query_profiler_cpu_time_period_ns), [memory_profiler_step](../../operations/settings/settings.md#memory_profiler_step),
 [memory_profiler_sample_probability](../../operations/settings/settings.md#memory_profiler_sample_probability), [trace_profile_events](../../operations/settings/settings.md#trace_profile_events).
diff --git a/docs/en/operations/system-tables/view_refreshes.md b/docs/en/operations/system-tables/view_refreshes.md
index e792e0d095d..12377507b39 100644
--- a/docs/en/operations/system-tables/view_refreshes.md
+++ b/docs/en/operations/system-tables/view_refreshes.md
@@ -17,8 +17,7 @@ Columns:
 - `duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md)) — How long the last refresh attempt took.
 - `next_refresh_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Time at which the next refresh is scheduled to start.
 - `remaining_dependencies` ([Array(String)](../../sql-reference/data-types/array.md)) — If the view has [refresh dependencies](../../sql-reference/statements/create/view.md#refresh-dependencies), this array contains the subset of those dependencies that are not satisfied for the current refresh yet. If `status = 'WaitingForDependencies'`, a refresh is ready to start as soon as these dependencies are fulfilled.
-- `exception` ([String](../../sql-reference/data-types/string.md)) — if `last_refresh_result = 'Error'`, i.e. the last refresh attempt failed, this column contains the corresponding error message and stack trace.
-- `retry` ([UInt64](../../sql-reference/data-types/int-uint.md)) — If nonzero, the current or next refresh is a retry (see `refresh_retries` refresh setting), and `retry` is the 1-based index of that retry.
+- `exception` ([String](../../sql-reference/data-types/string.md)) — if `last_refresh_result = 'Exception'`, i.e. the last refresh attempt failed, this column contains the corresponding error message and stack trace.
 - `refresh_count` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of successful refreshes since last server restart or table creation.
 - `progress` ([Float64](../../sql-reference/data-types/float.md)) — Progress of the current refresh, between 0 and 1.
 - `read_rows` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of rows read by the current refresh so far.
diff --git a/docs/en/operations/utilities/clickhouse-keeper-client.md b/docs/en/operations/utilities/clickhouse-keeper-client.md
index 6f026766750..6407c66783b 100644
--- a/docs/en/operations/utilities/clickhouse-keeper-client.md
+++ b/docs/en/operations/utilities/clickhouse-keeper-client.md
@@ -28,41 +28,39 @@ A client application to interact with clickhouse-keeper by its native protocol.
 Connected to ZooKeeper at [::1]:9181 with session_id 137
 / :) ls
 keeper foo bar
-/ :) cd 'keeper'
+/ :) cd keeper
 /keeper :) ls
 api_version
-/keeper :) cd 'api_version'
+/keeper :) cd api_version
 /keeper/api_version :) ls
 
-/keeper/api_version :) cd 'xyz'
+/keeper/api_version :) cd xyz
 Path /keeper/api_version/xyz does not exist
 /keeper/api_version :) cd ../../
 / :) ls
 keeper foo bar
-/ :) get 'keeper/api_version'
+/ :) get keeper/api_version
 2
 ```
 
 ## Commands {#clickhouse-keeper-client-commands}
 
--   `ls '[path]'` -- Lists the nodes for the given path (default: cwd)
--   `cd '[path]'` -- Changes the working path (default `.`)
--   `cp '<src>' '<dest>'`  -- Copies 'src' node to 'dest' path
--   `mv '<src>' '<dest>'`  -- Moves 'src' node to the 'dest' path
--   `exists '<path>'` -- Returns `1` if node exists, `0` otherwise
--   `set '<path>' <value> [version]` -- Updates the node's value. Only updates if version matches (default: -1)
--   `create '<path>' <value> [mode]` -- Creates new node with the set value
--   `touch '<path>'` -- Creates new node with an empty string as value. Doesn't throw an exception if the node already exists
--   `get '<path>'` -- Returns the node's value
--   `rm '<path>' [version]` -- Removes the node only if version matches (default: -1)
--   `rmr '<path>' [limit]` -- Recursively deletes path if the subtree size is smaller than the limit. Confirmation required (default limit = 100)
+-   `ls [path]` -- Lists the nodes for the given path (default: cwd)
+-   `cd [path]` -- Changes the working path (default `.`)
+-   `exists <path>` -- Returns `1` if node exists, `0` otherwise
+-   `set <path> <value> [version]` -- Updates the node's value. Only updates if version matches (default: -1)
+-   `create <path> <value> [mode]` -- Creates new node with the set value
+-   `touch <path>` -- Creates new node with an empty string as value. Doesn't throw an exception if the node already exists
+-   `get <path>` -- Returns the node's value
+-   `rm <path> [version]` -- Removes the node only if version matches (default: -1)
+-   `rmr <path>` -- Recursively deletes path. Confirmation required
 -   `flwc <command>` -- Executes four-letter-word command
 -   `help` -- Prints this message
--   `get_direct_children_number '[path]'` -- Get numbers of direct children nodes under a specific path
--   `get_all_children_number '[path]'` -- Get all numbers of children nodes under a specific path
--   `get_stat '[path]'` -- Returns the node's stat (default `.`)
--   `find_super_nodes <threshold> '[path]'` -- Finds nodes with number of children larger than some threshold for the given path (default `.`)
+-   `get_direct_children_number [path]` -- Get numbers of direct children nodes under a specific path
+-   `get_all_children_number [path]` -- Get all numbers of children nodes under a specific path
+-   `get_stat [path]` -- Returns the node's stat (default `.`)
+-   `find_super_nodes <threshold> [path]` -- Finds nodes with number of children larger than some threshold for the given path (default `.`)
 -   `delete_stale_backups` -- Deletes ClickHouse nodes used for backups that are now inactive
 -   `find_big_family [path] [n]` -- Returns the top n nodes with the biggest family in the subtree (default path = `.` and n = 10)
--   `sync '<path>'` -- Synchronizes node between processes and leader
+-   `sync <path>` -- Synchronizes node between processes and leader
 -   `reconfig <add|remove|set> "<arg>" [version]` -- Reconfigure Keeper cluster. See https://clickhouse.com/docs/en/guides/sre/keeper/clickhouse-keeper#reconfiguration
diff --git a/docs/en/sql-reference/aggregate-functions/parametric-functions.md b/docs/en/sql-reference/aggregate-functions/parametric-functions.md
index b06717fcc8c..093d88f939f 100644
--- a/docs/en/sql-reference/aggregate-functions/parametric-functions.md
+++ b/docs/en/sql-reference/aggregate-functions/parametric-functions.md
@@ -104,7 +104,7 @@ Events that occur at the same second may lay in the sequence in an undefined ord
 
 **Parameters**
 
-- `pattern` — Pattern string. See [Pattern syntax](#pattern-syntax).
+- `pattern` — Pattern string. See [Pattern syntax](#sequencematch).
 
 **Returned values**
 
@@ -113,7 +113,8 @@ Events that occur at the same second may lay in the sequence in an undefined ord
 
 Type: `UInt8`.
 
-#### Pattern syntax
+<a name="sequence-function-pattern-syntax"></a>
+**Pattern syntax**
 
 - `(?N)` — Matches the condition argument at position `N`. Conditions are numbered in the `[1, 32]` range. For example, `(?1)` matches the argument passed to the `cond1` parameter.
 
@@ -195,7 +196,7 @@ sequenceCount(pattern)(timestamp, cond1, cond2, ...)
 
 **Parameters**
 
-- `pattern` — Pattern string. See [Pattern syntax](#pattern-syntax).
+- `pattern` — Pattern string. See [Pattern syntax](#sequencematch).
 
 **Returned values**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/distinctdynamictypes.md b/docs/en/sql-reference/aggregate-functions/reference/distinctdynamictypes.md
deleted file mode 100644
index 970209252fa..00000000000
--- a/docs/en/sql-reference/aggregate-functions/reference/distinctdynamictypes.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-slug: /en/sql-reference/aggregate-functions/reference/distinctdynamictypes
-sidebar_position: 215
----
-
-# distinctDynamicTypes
-
-Calculates the list of distinct data types stored in [Dynamic](../../data-types/dynamic.md) column.
-
-**Syntax**
-
-```sql
-distinctDynamicTypes(dynamic)
-```
-
-**Arguments**
-
-- `dynamic` — [Dynamic](../../data-types/dynamic.md) column.
-
-**Returned Value**
-
-- The sorted list of data type names [Array(String)](../../data-types/array.md).
-
-**Example**
-
-Query:
-
-```sql
-DROP TABLE IF EXISTS test_dynamic;
-CREATE TABLE test_dynamic(d Dynamic) ENGINE = Memory;
-INSERT INTO test_dynamic VALUES (42), (NULL), ('Hello'), ([1, 2, 3]), ('2020-01-01'), (map(1, 2)), (43), ([4, 5]), (NULL), ('World'), (map(3, 4))
-```
-
-```sql
-SELECT distinctDynamicTypes(d) FROM test_dynamic;
-```
-
-Result:
-
-```reference
-┌─distinctDynamicTypes(d)──────────────────────────────────────┐
-│ ['Array(Int64)','Date','Int64','Map(UInt8, UInt8)','String'] │
-└──────────────────────────────────────────────────────────────┘
-```
diff --git a/docs/en/sql-reference/aggregate-functions/reference/distinctjsonpaths.md b/docs/en/sql-reference/aggregate-functions/reference/distinctjsonpaths.md
deleted file mode 100644
index d88b2eb024b..00000000000
--- a/docs/en/sql-reference/aggregate-functions/reference/distinctjsonpaths.md
+++ /dev/null
@@ -1,125 +0,0 @@
----
-slug: /en/sql-reference/aggregate-functions/reference/distinctjsonpaths
-sidebar_position: 216
----
-
-# distinctJSONPaths
-
-Calculates the list of distinct paths stored in [JSON](../../data-types/newjson.md) column.
-
-**Syntax**
-
-```sql
-distinctJSONPaths(json)
-```
-
-**Arguments**
-
-- `json` — [JSON](../../data-types/newjson.md) column.
-
-**Returned Value**
-
-- The sorted list of paths [Array(String)](../../data-types/array.md).
-
-**Example**
-
-Query:
-
-```sql
-DROP TABLE IF EXISTS test_json;
-CREATE TABLE test_json(json JSON) ENGINE = Memory;
-INSERT INTO test_json VALUES ('{"a" : 42, "b" : "Hello"}'), ('{"b" : [1, 2, 3], "c" : {"d" : {"e" : "2020-01-01"}}}'), ('{"a" : 43, "c" : {"d" : {"f" : [{"g" : 42}]}}}')
-```
-
-```sql
-SELECT distinctJSONPaths(json) FROM test_json;
-```
-
-Result:
-
-```reference
-┌─distinctJSONPaths(json)───┐
-│ ['a','b','c.d.e','c.d.f'] │
-└───────────────────────────┘
-```
-
-# distinctJSONPathsAndTypes
-
-Calculates the list of distinct paths and their types stored in [JSON](../../data-types/newjson.md) column.
-
-**Syntax**
-
-```sql
-distinctJSONPathsAndTypes(json)
-```
-
-**Arguments**
-
-- `json` — [JSON](../../data-types/newjson.md) column.
-
-**Returned Value**
-
-- The sorted map of paths and types [Map(String, Array(String))](../../data-types/map.md).
-
-**Example**
-
-Query:
-
-```sql
-DROP TABLE IF EXISTS test_json;
-CREATE TABLE test_json(json JSON) ENGINE = Memory;
-INSERT INTO test_json VALUES ('{"a" : 42, "b" : "Hello"}'), ('{"b" : [1, 2, 3], "c" : {"d" : {"e" : "2020-01-01"}}}'), ('{"a" : 43, "c" : {"d" : {"f" : [{"g" : 42}]}}}')
-```
-
-```sql
-SELECT distinctJSONPathsAndTypes(json) FROM test_json;
-```
-
-Result:
-
-```reference
-┌─distinctJSONPathsAndTypes(json)───────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-│ {'a':['Int64'],'b':['Array(Nullable(Int64))','String'],'c.d.e':['Date'],'c.d.f':['Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))']} │
-└───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-**Note**
-
-If JSON declaration contains paths with specified types, these paths will be always included in the result of `distinctJSONPaths/distinctJSONPathsAndTypes` functions even if input data didn't have values for these paths.
-
-```sql
-DROP TABLE IF EXISTS test_json;
-CREATE TABLE test_json(json JSON(a UInt32)) ENGINE = Memory;
-INSERT INTO test_json VALUES ('{"b" : "Hello"}'), ('{"b" : "World", "c" : [1, 2, 3]}');
-```
-
-```sql
-SELECT json FROM test_json;
-```
-
-```text
-┌─json──────────────────────────────────┐
-│ {"a":0,"b":"Hello"}                   │
-│ {"a":0,"b":"World","c":["1","2","3"]} │
-└───────────────────────────────────────┘
-```
-
-```sql
-SELECT distinctJSONPaths(json) FROM test_json;
-```
-
-```text
-┌─distinctJSONPaths(json)─┐
-│ ['a','b','c']           │
-└─────────────────────────┘
-```
-
-```sql
-SELECT distinctJSONPathsAndTypes(json) FROM test_json;
-```
-
-```text
-┌─distinctJSONPathsAndTypes(json)────────────────────────────────┐
-│ {'a':['UInt32'],'b':['String'],'c':['Array(Nullable(Int64))']} │
-└────────────────────────────────────────────────────────────────┘
-```
\ No newline at end of file
diff --git a/docs/en/sql-reference/aggregate-functions/reference/groupconcat.md b/docs/en/sql-reference/aggregate-functions/reference/groupconcat.md
deleted file mode 100644
index 6a24aa244bf..00000000000
--- a/docs/en/sql-reference/aggregate-functions/reference/groupconcat.md
+++ /dev/null
@@ -1,90 +0,0 @@
----
-slug: /en/sql-reference/aggregate-functions/reference/groupconcat
-sidebar_position: 363
-sidebar_label: groupConcat
-title: groupConcat
----
-
-Calculates a concatenated string from a group of strings, optionally separated by a delimiter, and optionally limited by a maximum number of elements.
-
-**Syntax**
-
-``` sql
-groupConcat[(delimiter [, limit])](expression);
-```
-
-**Arguments**
-
-- `expression` — The expression or column name that outputs strings to be concatenated..
-- `delimiter` — A [string](../../../sql-reference/data-types/string.md) that will be used to separate concatenated values. This parameter is optional and defaults to an empty string if not specified.
-- `limit` — A positive [integer](../../../sql-reference/data-types/int-uint.md) specifying the maximum number of elements to concatenate. If more elements are present, excess elements are ignored. This parameter is optional.
-
-:::note
-If delimiter is specified without limit, it must be the first parameter. If both delimiter and limit are specified, delimiter must precede limit.
-:::
-
-**Returned value**
-
-- Returns a [string](../../../sql-reference/data-types/string.md) consisting of the concatenated values of the column or expression. If the group has no elements or only null elements, and the function does not specify a handling for only null values, the result is a nullable string with a null value.
-
-**Examples**
-
-Input table:
-
-``` text
-┌─id─┬─name─┐
-│ 1  │  John│
-│ 2  │  Jane│
-│ 3  │   Bob│
-└────┴──────┘
-```
-
-1.	Basic usage without a delimiter:
-
-Query:
-
-``` sql
-SELECT groupConcat(Name) FROM Employees;
-```
-
-Result:
-
-``` text
-JohnJaneBob
-```
-
-This concatenates all names into one continuous string without any separator.
-
-
-2. Using comma as a delimiter:
-
-Query:
-
-``` sql
-SELECT groupConcat(', ')(Name)  FROM Employees;
-```
-
-Result:
-
-``` text
-John, Jane, Bob
-```
-
-This output shows the names separated by a comma followed by a space.
-
-
-3. Limiting the number of concatenated elements
-
-Query:
-
-``` sql
-SELECT groupConcat(', ', 2)(Name) FROM Employees;
-```
-
-Result:
-
-``` text
-John, Jane
-```
-
-This query limits the output to the first two names, even though there are more names in the table.
diff --git a/docs/en/sql-reference/data-types/data-types-binary-encoding.md b/docs/en/sql-reference/data-types/data-types-binary-encoding.md
index 08fb664126a..812e946e43e 100644
--- a/docs/en/sql-reference/data-types/data-types-binary-encoding.md
+++ b/docs/en/sql-reference/data-types/data-types-binary-encoding.md
@@ -12,59 +12,57 @@ This specification describes the binary format that can be used for binary encod
 The table below describes how each data type is represented in binary format. Each data type encoding consist of 1 byte that indicates the type and some optional additional information.
 `var_uint` in the binary encoding means that the size is encoded using Variable-Length Quantity compression.
 
-| ClickHouse data type                                                                                      | Binary encoding                                                                                                                                                                                                                                                                                                                                                            |
-|-----------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `Nothing`                                                                                                 | `0x00`                                                                                                                                                                                                                                                                                                                                                                     |
-| `UInt8`                                                                                                   | `0x01`                                                                                                                                                                                                                                                                                                                                                                     |
-| `UInt16`                                                                                                  | `0x02`                                                                                                                                                                                                                                                                                                                                                                     |
-| `UInt32`                                                                                                  | `0x03`                                                                                                                                                                                                                                                                                                                                                                     |
-| `UInt64`                                                                                                  | `0x04`                                                                                                                                                                                                                                                                                                                                                                     |
-| `UInt128`                                                                                                 | `0x05`                                                                                                                                                                                                                                                                                                                                                                     |
-| `UInt256`                                                                                                 | `0x06`                                                                                                                                                                                                                                                                                                                                                                     |
-| `Int8`                                                                                                    | `0x07`                                                                                                                                                                                                                                                                                                                                                                     |
-| `Int16`                                                                                                   | `0x08`                                                                                                                                                                                                                                                                                                                                                                     |
-| `Int32`                                                                                                   | `0x09`                                                                                                                                                                                                                                                                                                                                                                     |
-| `Int64`                                                                                                   | `0x0A`                                                                                                                                                                                                                                                                                                                                                                     |
-| `Int128`                                                                                                  | `0x0B`                                                                                                                                                                                                                                                                                                                                                                     |
-| `Int256`                                                                                                  | `0x0C`                                                                                                                                                                                                                                                                                                                                                                     |
-| `Float32`                                                                                                 | `0x0D`                                                                                                                                                                                                                                                                                                                                                                     |
-| `Float64`                                                                                                 | `0x0E`                                                                                                                                                                                                                                                                                                                                                                     |
-| `Date`                                                                                                    | `0x0F`                                                                                                                                                                                                                                                                                                                                                                     |
-| `Date32`                                                                                                  | `0x10`                                                                                                                                                                                                                                                                                                                                                                     |
-| `DateTime`                                                                                                | `0x11`                                                                                                                                                                                                                                                                                                                                                                     |
-| `DateTime(time_zone)`                                                                                     | `0x12<var_uint_time_zone_name_size><time_zone_name_data>`                                                                                                                                                                                                                                                                                                                  |
-| `DateTime64(P)`                                                                                           | `0x13<uint8_precision>`                                                                                                                                                                                                                                                                                                                                                    |
-| `DateTime64(P, time_zone)`                                                                                | `0x14<uint8_precision><var_uint_time_zone_name_size><time_zone_name_data>`                                                                                                                                                                                                                                                                                                 |
-| `String`                                                                                                  | `0x15`                                                                                                                                                                                                                                                                                                                                                                     |
-| `FixedString(N)`                                                                                          | `0x16<var_uint_size>`                                                                                                                                                                                                                                                                                                                                                      |
-| `Enum8`                                                                                                   | `0x17<var_uint_number_of_elements><var_uint_name_size_1><name_data_1><int8_value_1>...<var_uint_name_size_N><name_data_N><int8_value_N>`                                                                                                                                                                                                                                   |
-| `Enum16`                                                                                                  | `0x18<var_uint_number_of_elements><var_uint_name_size_1><name_data_1><int16_little_endian_value_1>...><var_uint_name_size_N><name_data_N><int16_little_endian_value_N>`                                                                                                                                                                                                    |
-| `Decimal32(P, S)`                                                                                         | `0x19<uint8_precision><uint8_scale>`                                                                                                                                                                                                                                                                                                                                       |
-| `Decimal64(P, S)`                                                                                         | `0x1A<uint8_precision><uint8_scale>`                                                                                                                                                                                                                                                                                                                                       |
-| `Decimal128(P, S)`                                                                                        | `0x1B<uint8_precision><uint8_scale>`                                                                                                                                                                                                                                                                                                                                       |
-| `Decimal256(P, S)`                                                                                        | `0x1C<uint8_precision><uint8_scale>`                                                                                                                                                                                                                                                                                                                                       |
-| `UUID`                                                                                                    | `0x1D`                                                                                                                                                                                                                                                                                                                                                                     |
-| `Array(T)`                                                                                                | `0x1E<nested_type_encoding>`                                                                                                                                                                                                                                                                                                                                               |
-| `Tuple(T1, ..., TN)`                                                                                      | `0x1F<var_uint_number_of_elements><nested_type_encoding_1>...<nested_type_encoding_N>`                                                                                                                                                                                                                                                                                     |
-| `Tuple(name1 T1, ..., nameN TN)`                                                                          | `0x20<var_uint_number_of_elements><var_uint_name_size_1><name_data_1><nested_type_encoding_1>...<var_uint_name_size_N><name_data_N><nested_type_encoding_N>`                                                                                                                                                                                                               |
-| `Set`                                                                                                     | `0x21`                                                                                                                                                                                                                                                                                                                                                                     |
-| `Interval`                                                                                                | `0x22<interval_kind>` (see [interval kind binary encoding](#interval-kind-binary-encoding))                                                                                                                                                                                                                                                                                |
-| `Nullable(T)`                                                                                             | `0x23<nested_type_encoding>`                                                                                                                                                                                                                                                                                                                                               |
-| `Function`                                                                                                | `0x24<var_uint_number_of_arguments><argument_type_encoding_1>...<argument_type_encoding_N><return_type_encoding>`                                                                                                                                                                                                                                                          |
-| `AggregateFunction(function_name(param_1, ..., param_N), arg_T1, ..., arg_TN)`                            | `0x25<var_uint_version><var_uint_function_name_size><function_name_data><var_uint_number_of_parameters><param_1>...<param_N><var_uint_number_of_arguments><argument_type_encoding_1>...<argument_type_encoding_N>` (see [aggregate function parameter binary encoding](#aggregate-function-parameter-binary-encoding))                                                     |
-| `LowCardinality(T)`                                                                                       | `0x26<nested_type_encoding>`                                                                                                                                                                                                                                                                                                                                               |
-| `Map(K, V)`                                                                                               | `0x27<key_type_encoding><value_type_encoding>`                                                                                                                                                                                                                                                                                                                             |
-| `IPv4`                                                                                                    | `0x28`                                                                                                                                                                                                                                                                                                                                                                     |
-| `IPv6`                                                                                                    | `0x29`                                                                                                                                                                                                                                                                                                                                                                     |
-| `Variant(T1, ..., TN)`                                                                                    | `0x2A<var_uint_number_of_variants><variant_type_encoding_1>...<variant_type_encoding_N>`                                                                                                                                                                                                                                                                                   |
-| `Dynamic(max_types=N)`                                                                                    | `0x2B<uint8_max_types>`                                                                                                                                                                                                                                                                                                                                                    |
-| `Custom type` (`Ring`, `Polygon`, etc)                                                                    | `0x2C<var_uint_type_name_size><type_name_data>`                                                                                                                                                                                                                                                                                                                            |
-| `Bool`                                                                                                    | `0x2D`                                                                                                                                                                                                                                                                                                                                                                     |
-| `SimpleAggregateFunction(function_name(param_1, ..., param_N), arg_T1, ..., arg_TN)`                      | `0x2E<var_uint_function_name_size><function_name_data><var_uint_number_of_parameters><param_1>...<param_N><var_uint_number_of_arguments><argument_type_encoding_1>...<argument_type_encoding_N>` (see [aggregate function parameter binary encoding](#aggregate-function-parameter-binary-encoding))                                                                       |
-| `Nested(name1 T1, ..., nameN TN)`                                                                         | `0x2F<var_uint_number_of_elements><var_uint_name_size_1><name_data_1><nested_type_encoding_1>...<var_uint_name_size_N><name_data_N><nested_type_encoding_N>`                                                                                                                                                                                                               |
-| `JSON(max_dynamic_paths=N, max_dynamic_types=M, path Type, SKIP skip_path, SKIP REGEXP skip_path_regexp)` | `0x30<uint8_serialization_version><var_int_max_dynamic_paths><uint8_max_dynamic_types><var_uint_number_of_typed_paths><var_uint_path_name_size_1><path_name_data_1><encoded_type_1>...<var_uint_number_of_skip_paths><var_uint_skip_path_size_1><skip_path_data_1>...<var_uint_number_of_skip_path_regexps><var_uint_skip_path_regexp_size_1><skip_path_data_regexp_1>...` |
+| ClickHouse data type                                                                 | Binary encoding                                                                                                                                                                                                                                                                                                        |
+|--------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `Nothing`                                                                            | `0x00`                                                                                                                                                                                                                                                                                                                 |
+| `UInt8`                                                                              | `0x01`                                                                                                                                                                                                                                                                                                                 |
+| `UInt16`                                                                             | `0x02`                                                                                                                                                                                                                                                                                                                 |
+| `UInt32`                                                                             | `0x03`                                                                                                                                                                                                                                                                                                                 |
+| `UInt64`                                                                             | `0x04`                                                                                                                                                                                                                                                                                                                 |
+| `UInt128`                                                                            | `0x05`                                                                                                                                                                                                                                                                                                                 |
+| `UInt256`                                                                            | `0x06`                                                                                                                                                                                                                                                                                                                 |
+| `Int8`                                                                               | `0x07`                                                                                                                                                                                                                                                                                                                 |
+| `Int16`                                                                              | `0x08`                                                                                                                                                                                                                                                                                                                 |
+| `Int32`                                                                              | `0x09`                                                                                                                                                                                                                                                                                                                 |
+| `Int64`                                                                              | `0x0A`                                                                                                                                                                                                                                                                                                                 |
+| `Int128`                                                                             | `0x0B`                                                                                                                                                                                                                                                                                                                 |
+| `Int256`                                                                             | `0x0C`                                                                                                                                                                                                                                                                                                                 |
+| `Float32`                                                                            | `0x0D`                                                                                                                                                                                                                                                                                                                 |
+| `Float64`                                                                            | `0x0E`                                                                                                                                                                                                                                                                                                                 |
+| `Date`                                                                               | `0x0F`                                                                                                                                                                                                                                                                                                                 |
+| `Date32`                                                                             | `0x10`                                                                                                                                                                                                                                                                                                                 |
+| `DateTime`                                                                           | `0x11`                                                                                                                                                                                                                                                                                                                 |
+| `DateTime(time_zone)`                                                                | `0x12<var_uint_time_zone_name_size><time_zone_name_data>`                                                                                                                                                                                                                                                              |
+| `DateTime64(P)`                                                                      | `0x13<uint8_precision>`                                                                                                                                                                                                                                                                                                |
+| `DateTime64(P, time_zone)`                                                           | `0x14<uint8_precision><var_uint_time_zone_name_size><time_zone_name_data>`                                                                                                                                                                                                                                             |
+| `String`                                                                             | `0x15`                                                                                                                                                                                                                                                                                                                 |
+| `FixedString(N)`                                                                     | `0x16<var_uint_size>`                                                                                                                                                                                                                                                                                                  |
+| `Enum8`                                                                              | `0x17<var_uint_number_of_elements><var_uint_name_size_1><name_data_1><int8_value_1>...<var_uint_name_size_N><name_data_N><int8_value_N>`                                                                                                                                                                               |
+| `Enum16`                                                                             | `0x18<var_uint_number_of_elements><var_uint_name_size_1><name_data_1><int16_little_endian_value_1>...><var_uint_name_size_N><name_data_N><int16_little_endian_value_N>`                                                                                                                                                |
+| `Decimal32(P, S)`                                                                    | `0x19<uint8_precision><uint8_scale>`                                                                                                                                                                                                                                                                                   |
+| `Decimal64(P, S)`                                                                    | `0x1A<uint8_precision><uint8_scale>`                                                                                                                                                                                                                                                                                   |
+| `Decimal128(P, S)`                                                                   | `0x1B<uint8_precision><uint8_scale>`                                                                                                                                                                                                                                                                                   |
+| `Decimal256(P, S)`                                                                   | `0x1C<uint8_precision><uint8_scale>`                                                                                                                                                                                                                                                                                   |
+| `UUID`                                                                               | `0x1D`                                                                                                                                                                                                                                                                                                                 |
+| `Array(T)`                                                                           | `0x1E<nested_type_encoding>`                                                                                                                                                                                                                                                                                           |
+| `Tuple(T1, ..., TN)`                                                                 | `0x1F<var_uint_number_of_elements><nested_type_encoding_1>...<nested_type_encoding_N>`                                                                                                                                                                                                                                 |
+| `Tuple(name1 T1, ..., nameN TN)`                                                     | `0x20<var_uint_number_of_elements><var_uint_name_size_1><name_data_1><nested_type_encoding_1>...<var_uint_name_size_N><name_data_N><nested_type_encoding_N>`                                                                                                                                                           |
+| `Set`                                                                                | `0x21`                                                                                                                                                                                                                                                                                                                 |
+| `Interval`                                                                           | `0x22<interval_kind>` (see [interval kind binary encoding](#interval-kind-binary-encoding))                                                                                                                                                                                                                            |
+| `Nullable(T)`                                                                        | `0x23<nested_type_encoding>`                                                                                                                                                                                                                                                                                           |
+| `Function`                                                                           | `0x24<var_uint_number_of_arguments><argument_type_encoding_1>...<argument_type_encoding_N><return_type_encoding>`                                                                                                                                                                                                      |
+| `AggregateFunction(function_name(param_1, ..., param_N), arg_T1, ..., arg_TN)`       | `0x25<var_uint_version><var_uint_function_name_size><function_name_data><var_uint_number_of_parameters><param_1>...<param_N><var_uint_number_of_arguments><argument_type_encoding_1>...<argument_type_encoding_N>` (see [aggregate function parameter binary encoding](#aggregate-function-parameter-binary-encoding)) |
+| `LowCardinality(T)`                                                                  | `0x26<nested_type_encoding>`                                                                                                                                                                                                                                                                                           |
+| `Map(K, V)`                                                                          | `0x27<key_type_encoding><value_type_encoding>`                                                                                                                                                                                                                                                                         |
+| `IPv4`                                                                               | `0x28`                                                                                                                                                                                                                                                                                                                 |
+| `IPv6`                                                                               | `0x29`                                                                                                                                                                                                                                                                                                                 |
+| `Variant(T1, ..., TN)`                                                               | `0x2A<var_uint_number_of_variants><variant_type_encoding_1>...<variant_type_encoding_N>`                                                                                                                                                                                                                               |
+| `Dynamic(max_types=N)`                                                               | `0x2B<uint8_max_types>`                                                                                                                                                                                                                                                                                                |
+| `Custom type` (`Ring`, `Polygon`, etc)                                               | `0x2C<var_uint_type_name_size><type_name_data>`                                                                                                                                                                                                                                                                        |
+| `Bool`                                                                               | `0x2D`                                                                                                                                                                                                                                                                                                                 |
+| `SimpleAggregateFunction(function_name(param_1, ..., param_N), arg_T1, ..., arg_TN)` | `0x2E<var_uint_function_name_size><function_name_data><var_uint_number_of_parameters><param_1>...<param_N><var_uint_number_of_arguments><argument_type_encoding_1>...<argument_type_encoding_N>` (see [aggregate function parameter binary encoding](#aggregate-function-parameter-binary-encoding))                   |
+| `Nested(name1 T1, ..., nameN TN)`                                                    | `0x2F<var_uint_number_of_elements><var_uint_name_size_1><name_data_1><nested_type_encoding_1>...<var_uint_name_size_N><name_data_N><nested_type_encoding_N>`                                                                                                                                                           |
 
-For type `JSON` byte `uint8_serialization_version` indicates the version of the serialization. Right now the version is always 0 but can change in future if new arguments will be introduced for `JSON` type.
 
 ### Interval kind binary encoding
 
diff --git a/docs/en/sql-reference/data-types/dynamic.md b/docs/en/sql-reference/data-types/dynamic.md
index f9befd166fe..8be81471377 100644
--- a/docs/en/sql-reference/data-types/dynamic.md
+++ b/docs/en/sql-reference/data-types/dynamic.md
@@ -14,7 +14,7 @@ To declare a column of `Dynamic` type, use the following syntax:
 <column_name> Dynamic(max_types=N)
 ```
 
-Where `N` is an optional parameter between `0` and `254` indicating how many different data types can be stored as separate subcolumns inside a column with type `Dynamic` across single block of data that is stored separately (for example across single data part for MergeTree table). If this limit is exceeded, all values with new types will be stored together in a special shared data structure in binary form. Default value of `max_types` is `32`.
+Where `N` is an optional parameter between `1` and `255` indicating how many different data types can be stored inside a column with type `Dynamic` across single block of data that is stored separately (for example across single data part for MergeTree table). If this limit is exceeded, all new types will be converted to type `String`. Default value of `max_types` is `32`.
 
 :::note
 The Dynamic data type is an experimental feature. To use it, set `allow_experimental_dynamic_type = 1`.
@@ -224,43 +224,41 @@ SELECT d::Dynamic(max_types=5) as d2, dynamicType(d2) FROM test;
 └───────┴────────────────┘
 ```
 
-If `K < N`, then the values with the rarest types will be inserted into a single special subcolumn, but still will be accessible:
+If `K < N`, then the values with the rarest types are converted to `String`:
 ```text
 CREATE TABLE test (d Dynamic(max_types=4)) ENGINE = Memory;
 INSERT INTO test VALUES (NULL), (42), (43), ('42.42'), (true), ([1, 2, 3]);
-SELECT d, dynamicType(d), d::Dynamic(max_types=2) as d2, dynamicType(d2), isDynamicElementInSharedData(d2) FROM test;
+SELECT d, dynamicType(d), d::Dynamic(max_types=2) as d2, dynamicType(d2) FROM test;
 ```
 
 ```text
-┌─d───────┬─dynamicType(d)─┬─d2──────┬─dynamicType(d2)─┬─isDynamicElementInSharedData(d2)─┐
-│ ᴺᵁᴸᴸ    │ None           │ ᴺᵁᴸᴸ    │ None            │ false                            │
-│ 42      │ Int64          │ 42      │ Int64           │ false                            │
-│ 43      │ Int64          │ 43      │ Int64           │ false                            │
-│ 42.42   │ String         │ 42.42   │ String          │ false                            │
-│ true    │ Bool           │ true    │ Bool            │ true                             │
-│ [1,2,3] │ Array(Int64)   │ [1,2,3] │ Array(Int64)    │ true                             │
-└─────────┴────────────────┴─────────┴─────────────────┴──────────────────────────────────┘
+┌─d───────┬─dynamicType(d)─┬─d2──────┬─dynamicType(d2)─┐
+│ ᴺᵁᴸᴸ    │ None           │ ᴺᵁᴸᴸ    │ None            │
+│ 42      │ Int64          │ 42      │ Int64           │
+│ 43      │ Int64          │ 43      │ Int64           │
+│ 42.42   │ String         │ 42.42   │ String          │
+│ true    │ Bool           │ true    │ String          │
+│ [1,2,3] │ Array(Int64)   │ [1,2,3] │ String          │
+└─────────┴────────────────┴─────────┴─────────────────┘
 ```
 
-Functions `isDynamicElementInSharedData` returns `true` for rows that are stored in a special shared data structure inside `Dynamic` and as we can see, resulting column contains only 2 types that are not stored in shared data structure.
-
-If `K=0`, all types will be inserted into single special subcolumn:
+If `K=1`, all types are converted to `String`:
 
 ```text
 CREATE TABLE test (d Dynamic(max_types=4)) ENGINE = Memory;
 INSERT INTO test VALUES (NULL), (42), (43), ('42.42'), (true), ([1, 2, 3]);
-SELECT d, dynamicType(d), d::Dynamic(max_types=0) as d2, dynamicType(d2), isDynamicElementInSharedData(d2) FROM test;
+SELECT d, dynamicType(d), d::Dynamic(max_types=1) as d2, dynamicType(d2) FROM test;
 ```
 
 ```text
-┌─d───────┬─dynamicType(d)─┬─d2──────┬─dynamicType(d2)─┬─isDynamicElementInSharedData(d2)─┐
-│ ᴺᵁᴸᴸ    │ None           │ ᴺᵁᴸᴸ    │ None            │ false                            │
-│ 42      │ Int64          │ 42      │ Int64           │ true                             │
-│ 43      │ Int64          │ 43      │ Int64           │ true                             │
-│ 42.42   │ String         │ 42.42   │ String          │ true                             │
-│ true    │ Bool           │ true    │ Bool            │ true                             │
-│ [1,2,3] │ Array(Int64)   │ [1,2,3] │ Array(Int64)    │ true                             │
-└─────────┴────────────────┴─────────┴─────────────────┴──────────────────────────────────┘
+┌─d───────┬─dynamicType(d)─┬─d2──────┬─dynamicType(d2)─┐
+│ ᴺᵁᴸᴸ    │ None           │ ᴺᵁᴸᴸ    │ None            │
+│ 42      │ Int64          │ 42      │ String          │
+│ 43      │ Int64          │ 43      │ String          │
+│ 42.42   │ String         │ 42.42   │ String          │
+│ true    │ Bool           │ true    │ String          │
+│ [1,2,3] │ Array(Int64)   │ [1,2,3] │ String          │
+└─────────┴────────────────┴─────────┴─────────────────┘
 ```
 
 ## Reading Dynamic type from the data
@@ -413,17 +411,17 @@ SELECT d, dynamicType(d) FROM test ORDER by d;
 
 ## Reaching the limit in number of different data types stored inside Dynamic
 
-`Dynamic` data type can store only limited number of different data types as separate subcolumns. By default, this limit is 32, but you can change it in type declaration using syntax `Dynamic(max_types=N)` where N is between 0 and 254 (due to implementation details, it's impossible to have more than 254 different data types that can be stored as separate subcolumns inside Dynamic).
-When the limit is reached, all new data types inserted to `Dynamic` column will be inserted into a single shared data structure that stores values with different data types in binary form.
+`Dynamic` data type can store only limited number of different data types inside. By default, this limit is 32, but you can change it in type declaration using syntax `Dynamic(max_types=N)` where N is between 1 and 255 (due to implementation details, it's impossible to have more than 255 different data types inside Dynamic).
+When the limit is reached, all new data types inserted to `Dynamic` column will be casted to `String` and stored as `String` values.
 
 Let's see what happens when the limit is reached in different scenarios.
 
 ### Reaching the limit during data parsing
 
-During parsing of `Dynamic` values from the data, when the limit is reached for current block of data, all new values will be inserted into shared data structure:
+During parsing of `Dynamic` values from the data, when the limit is reached for current block of data, all new values will be inserted as `String` values:
 
 ```sql
-SELECT d, dynamicType(d), isDynamicElementInSharedData(d) FROM format(JSONEachRow, 'd Dynamic(max_types=3)', '
+SELECT d, dynamicType(d) FROM format(JSONEachRow, 'd Dynamic(max_types=3)', '
 {"d" : 42}
 {"d" : [1, 2, 3]}
 {"d" : "Hello, World!"}
@@ -434,22 +432,22 @@ SELECT d, dynamicType(d), isDynamicElementInSharedData(d) FROM format(JSONEachRo
 ```
 
 ```text
-┌─d──────────────────────┬─dynamicType(d)─────────────────┬─isDynamicElementInSharedData(d)─┐
-│ 42                     │ Int64                          │ false                           │
-│ [1,2,3]                │ Array(Int64)                   │ false                           │
-│ Hello, World!          │ String                         │ false                           │
-│ 2020-01-01             │ Date                           │ true                            │
-│ ['str1','str2','str3'] │ Array(String)                  │ true                            │
-│ (1,[1,2,3])            │ Tuple(a Int64, b Array(Int64)) │ true                            │
-└────────────────────────┴────────────────────────────────┴─────────────────────────────────┘
+┌─d──────────────────────────┬─dynamicType(d)─┐
+│ 42                         │ Int64          │
+│ [1,2,3]                    │ Array(Int64)   │
+│ Hello, World!              │ String         │
+│ 2020-01-01                 │ String         │
+│ ["str1", "str2", "str3"]   │ String         │
+│ {"a" : 1, "b" : [1, 2, 3]} │ String         │
+└────────────────────────────┴────────────────┘
 ```
 
-As we can see, after inserting 3 different data types `Int64`, `Array(Int64)` and `String` all new types were inserted into special shared data structure.
+As we can see, after inserting 3 different data types `Int64`, `Array(Int64)` and `String` all new types were converted to `String`.
 
 ### During merges of data parts in MergeTree table engines
 
-During merge of several data parts in MergeTree table the `Dynamic` column in the resulting data part can reach the limit of different data types that can be stored in separate subcolumns inside and won't be able to store all types as subcolumns from source parts.
-In this case ClickHouse chooses what types will remain as separate subcolumns after merge and what types will be inserted into shared data structure. In most cases ClickHouse tries to keep the most frequent types and store the rarest types in shared data structure, but it depends on the implementation.
+During merge of several data parts in MergeTree table the `Dynamic` column in the resulting data part can reach the limit of different data types inside and won't be able to store all types from source parts.
+In this case ClickHouse chooses what types will remain after merge and what types will be casted to `String`.  In most cases ClickHouse tries to keep the most frequent types and cast the rarest types to `String`, but it depends on the implementation.
 
 Let's see an example of such merge. First, let's create a table with `Dynamic` column, set the limit of different data types to `3` and insert values with `5` different types:
 
@@ -465,17 +463,17 @@ INSERT INTO test SELECT number, 'str_' || toString(number) FROM numbers(1);
 
 Each insert will create a separate data pert with `Dynamic` column containing single type:
 ```sql
-SELECT count(), dynamicType(d), isDynamicElementInSharedData(d), _part FROM test GROUP BY _part, dynamicType(d), isDynamicElementInSharedData(d) ORDER BY _part, count();
+SELECT count(), dynamicType(d), _part FROM test GROUP BY _part, dynamicType(d) ORDER BY _part;
 ```
 
 ```text
-┌─count()─┬─dynamicType(d)──────┬─isDynamicElementInSharedData(d)─┬─_part─────┐
-│       5 │ UInt64              │ false                           │ all_1_1_0 │
-│       4 │ Array(UInt64)       │ false                           │ all_2_2_0 │
-│       3 │ Date                │ false                           │ all_3_3_0 │
-│       2 │ Map(UInt64, UInt64) │ false                           │ all_4_4_0 │
-│       1 │ String              │ false                           │ all_5_5_0 │
-└─────────┴─────────────────────┴─────────────────────────────────┴───────────┘
+┌─count()─┬─dynamicType(d)──────┬─_part─────┐
+│       5 │ UInt64              │ all_1_1_0 │
+│       4 │ Array(UInt64)       │ all_2_2_0 │
+│       3 │ Date                │ all_3_3_0 │
+│       2 │ Map(UInt64, UInt64) │ all_4_4_0 │
+│       1 │ String              │ all_5_5_0 │
+└─────────┴─────────────────────┴───────────┘
 ```
 
 Now, let's merge all parts into one and see what will happen:
@@ -483,20 +481,18 @@ Now, let's merge all parts into one and see what will happen:
 ```sql
 SYSTEM START MERGES test;
 OPTIMIZE TABLE test FINAL;
-SELECT count(), dynamicType(d), isDynamicElementInSharedData(d), _part FROM test GROUP BY _part, dynamicType(d), isDynamicElementInSharedData(d) ORDER BY _part, count() desc;
+SELECT count(), dynamicType(d), _part FROM test GROUP BY _part, dynamicType(d) ORDER BY _part;
 ```
 
 ```text
-┌─count()─┬─dynamicType(d)──────┬─isDynamicElementInSharedData(d)─┬─_part─────┐
-│       5 │ UInt64              │ false                           │ all_1_5_2 │
-│       4 │ Array(UInt64)       │ false                           │ all_1_5_2 │
-│       3 │ Date                │ false                           │ all_1_5_2 │
-│       2 │ Map(UInt64, UInt64) │ true                            │ all_1_5_2 │
-│       1 │ String              │ true                            │ all_1_5_2 │
-└─────────┴─────────────────────┴─────────────────────────────────┴───────────┘
+┌─count()─┬─dynamicType(d)─┬─_part─────┐
+│       5 │ UInt64         │ all_1_5_2 │
+│       6 │ String         │ all_1_5_2 │
+│       4 │ Array(UInt64)  │ all_1_5_2 │
+└─────────┴────────────────┴───────────┘
 ```
 
-As we can see, ClickHouse kept the most frequent types `UInt64` and `Array(UInt64)` as subcolumns and inserted all other types into shared data.
+As we can see, ClickHouse kept the most frequent types `UInt64` and `Array(UInt64)` and casted all other types to `String`.
 
 ## JSONExtract functions with Dynamic
 
@@ -513,23 +509,22 @@ SELECT JSONExtract('{"a" : [1, 2, 3]}', 'a', 'Dynamic') AS dynamic, dynamicType(
 ```
 
 ```sql
-SELECT JSONExtract('{"obj" : {"a" : 42, "b" : "Hello", "c" : [1,2,3]}}', 'obj', 'Map(String, Dynamic)') AS map_of_dynamics, mapApply((k, v) -> (k, dynamicType(v)), map_of_dynamics) AS map_of_dynamic_types
-```
+SELECT JSONExtract('{"obj" : {"a" : 42, "b" : "Hello", "c" : [1,2,3]}}', 'obj', 'Map(String, Variant(UInt32, String, Array(UInt32)))') AS map_of_dynamics, mapApply((k, v) -> (k, variantType(v)), map_of_dynamics) AS map_of_dynamic_types```
 
 ```text
-┌─map_of_dynamics──────────────────┬─map_of_dynamic_types────────────────────────────────────┐
-│ {'a':42,'b':'Hello','c':[1,2,3]} │ {'a':'Int64','b':'String','c':'Array(Nullable(Int64))'} │
-└──────────────────────────────────┴─────────────────────────────────────────────────────────┘
+┌─map_of_dynamics──────────────────┬─map_of_dynamic_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]}', 'Dynamic') AS dynamics, arrayMap(x -> (x.1, dynamicType(x.2)), dynamics) AS dynamic_types```
+SELECT JSONExtractKeysAndValues('{"a" : 42, "b" : "Hello", "c" : [1,2,3]}', 'Variant(UInt32, String, Array(UInt32))') AS dynamics, arrayMap(x -> (x.1, variantType(x.2)), dynamics) AS dynamic_types```
 ```
 
 ```text
-┌─dynamics───────────────────────────────┬─dynamic_types─────────────────────────────────────────────────┐
-│ [('a',42),('b','Hello'),('c',[1,2,3])] │ [('a','Int64'),('b','String'),('c','Array(Nullable(Int64))')] │
-└────────────────────────────────────────┴───────────────────────────────────────────────────────────────┘
+┌─dynamics───────────────────────────────┬─dynamic_types─────────────────────────────────────────┐
+│ [('a',42),('b','Hello'),('c',[1,2,3])] │ [('a','UInt32'),('b','String'),('c','Array(UInt32)')] │
+└────────────────────────────────────────┴───────────────────────────────────────────────────────┘
 ```
 
 ### Binary output format
diff --git a/docs/en/sql-reference/data-types/geo.md b/docs/en/sql-reference/data-types/geo.md
index 8ce53bb2ef2..7ffc7447d96 100644
--- a/docs/en/sql-reference/data-types/geo.md
+++ b/docs/en/sql-reference/data-types/geo.md
@@ -52,48 +52,6 @@ Result:
 └───────────────────────────────┴───────────────┘
 ```
 
-## LineString
-
-`LineString` is a line stored as an array of points: [Array](array.md)([Point](#point)).
-
-**Example**
-
-Query:
-
-```sql
-CREATE TABLE geo_linestring (l LineString) ENGINE = Memory();
-INSERT INTO geo_linestring VALUES([(0, 0), (10, 0), (10, 10), (0, 10)]);
-SELECT l, toTypeName(l) FROM geo_linestring;
-```
-Result:
-
-``` text
-┌─r─────────────────────────────┬─toTypeName(r)─┐
-│ [(0,0),(10,0),(10,10),(0,10)] │ LineString    │
-└───────────────────────────────┴───────────────┘
-```
-
-## MultiLineString
-
-`MultiLineString` is multiple lines stored as an array of `LineString`: [Array](array.md)([LineString](#linestring)).
-
-**Example**
-
-Query:
-
-```sql
-CREATE TABLE geo_multilinestring (l MultiLineString) ENGINE = Memory();
-INSERT INTO geo_multilinestring VALUES([[(0, 0), (10, 0), (10, 10), (0, 10)], [(1, 1), (2, 2), (3, 3)]]);
-SELECT l, toTypeName(l) FROM geo_multilinestring;
-```
-Result:
-
-``` text
-┌─l───────────────────────────────────────────────────┬─toTypeName(l)───┐
-│ [[(0,0),(10,0),(10,10),(0,10)],[(1,1),(2,2),(3,3)]] │ MultiLineString │
-└─────────────────────────────────────────────────────┴─────────────────┘
-```
-
 ## Polygon
 
 `Polygon` is a polygon with holes stored as an array of rings: [Array](array.md)([Ring](#ring)). First element of outer array is the outer shape of polygon and all the following elements are holes.
diff --git a/docs/en/sql-reference/data-types/index.md b/docs/en/sql-reference/data-types/index.md
index 2b89dd145e6..fcb0b60d022 100644
--- a/docs/en/sql-reference/data-types/index.md
+++ b/docs/en/sql-reference/data-types/index.md
@@ -19,8 +19,7 @@ ClickHouse data types include:
 - **Boolean**: ClickHouse has a [`Boolean` type](./boolean.md)
 - **Strings**: [`String`](./string.md) and [`FixedString`](./fixedstring.md)
 - **Dates**: use [`Date`](./date.md) and [`Date32`](./date32.md) for days, and [`DateTime`](./datetime.md) and [`DateTime64`](./datetime64.md) for instances in time
-- **Object**: the [`Object`](./json.md) stores a JSON document in a single column (deprecated)
-- **JSON**: the [`JSON` object](./newjson.md) stores a JSON document in a single column
+- **JSON**: the [`JSON` object](./json.md) stores a JSON document in a single column
 - **UUID**: a performant option for storing [`UUID` values](./uuid.md)
 - **Low cardinality types**: use an [`Enum`](./enum.md) when you have a handful of unique values, or use [`LowCardinality`](./lowcardinality.md) when you have up to 10,000 unique values of a column
 - **Arrays**: any column can be defined as an [`Array` of values](./array.md)
diff --git a/docs/en/sql-reference/data-types/json.md b/docs/en/sql-reference/data-types/json.md
index e48b308a620..f2eac12594d 100644
--- a/docs/en/sql-reference/data-types/json.md
+++ b/docs/en/sql-reference/data-types/json.md
@@ -7,13 +7,13 @@ keywords: [object, data type]
 
 # Object Data Type (deprecated)
 
-**This feature is not production-ready and is now deprecated.** If you need to work with JSON documents, consider using [this guide](/docs/en/integrations/data-formats/json/overview) instead. A new implementation to support JSON object is in progress and can be tracked [here](https://github.com/ClickHouse/ClickHouse/issues/54864).
+**This feature is not production-ready and is now deprecated.** If you need to work with JSON documents, consider using [this guide](/docs/en/integrations/data-ingestion/data-formats/json) instead. A new implementation to support JSON object is in progress and can be tracked [here](https://github.com/ClickHouse/ClickHouse/issues/54864).
 
 <hr />
 
 Stores JavaScript Object Notation (JSON) documents in a single column.
 
-`JSON` can be used as an alias to `Object('json')` when setting [use_json_alias_for_old_object_type](../../operations/settings/settings.md#usejsonaliasforoldobjecttype) is enabled.
+`JSON` is an alias for `Object('json')`.
 
 ## Example
 
@@ -79,5 +79,5 @@ SELECT * FROM json FORMAT JSONEachRow
 
 ## Related Content
 
-- [Using JSON in ClickHouse](/en/integrations/data-formats/json/overview)
+- [Using JSON in ClickHouse](/docs/en/integrations/data-formats/json)
 - [Getting Data Into ClickHouse - Part 2 - A JSON detour](https://clickhouse.com/blog/getting-data-into-clickhouse-part-2-json)
diff --git a/docs/en/sql-reference/data-types/newjson.md b/docs/en/sql-reference/data-types/newjson.md
deleted file mode 100644
index 68952590eb9..00000000000
--- a/docs/en/sql-reference/data-types/newjson.md
+++ /dev/null
@@ -1,639 +0,0 @@
----
-slug: /en/sql-reference/data-types/newjson
-sidebar_position: 63
-sidebar_label: JSON
-keywords: [json, data type]
----
-
-# JSON
-
-Stores JavaScript Object Notation (JSON) documents in a single column.
-
-:::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-formats/json/overview) instead.
-If you want to use JSON type, set `allow_experimental_json_type = 1`. 
-:::
-
-To declare a column of `JSON` type, use the following syntax:
-
-``` sql
-<column_name> JSON(max_dynamic_paths=N, max_dynamic_types=M, some.path TypeName, SKIP path.to.skip, SKIP REGEXP 'paths_regexp')
-```
-Where:
-- `max_dynamic_paths` is an optional parameter indicating how many paths can be stored separately as subcolumns across single block of data that is stored separately (for example across single data part for MergeTree table). If this limit is exceeded, all other paths will be stored together in a single structure. Default value of `max_dynamic_paths` is `1024`.
-- `max_dynamic_types` is an optional parameter between `1` and `255` indicating how many different data types can be stored inside a single path column with type `Dynamic` across single block of data that is stored separately (for example across single data part for MergeTree table). If this limit is exceeded, all new types will be converted to type `String`. Default value of `max_dynamic_types` is `32`.
-- `some.path TypeName` is an optional type hint for particular path in the JSON. Such paths will be always stored as subcolumns with specified type.
-- `SKIP path.to.skip` is an optional hint for particular path that should be skipped during JSON parsing. Such paths will never be stored in the JSON column. If specified path is a nested JSON object, the whole nested object will be skipped.
-- `SKIP REGEXP 'path_regexp'` is an optional hint with a regular expression that is used to skip paths during JSON parsing. All paths that match this regular expression will never be stored in the JSON column.
-
-## Creating JSON
-
-Using `JSON` type in table column definition:
-
-```sql
-CREATE TABLE test (json JSON) ENGINE = Memory;
-INSERT INTO test VALUES ('{"a" : {"b" : 42}, "c" : [1, 2, 3]}'), ('{"f" : "Hello, World!"}'), ('{"a" : {"b" : 43, "e" : 10}, "c" : [4, 5, 6]}');
-SELECT json FROM test;
-```
-
-```text
-┌─json────────────────────────────────────────┐
-│ {"a":{"b":"42"},"c":["1","2","3"]}          │
-│ {"f":"Hello, World!"}                       │
-│ {"a":{"b":"43","e":"10"},"c":["4","5","6"]} │
-└─────────────────────────────────────────────┘
-```
-
-```sql
-CREATE TABLE test (json JSON(a.b UInt32, SKIP a.e)) ENGINE = Memory;
-INSERT INTO test VALUES ('{"a" : {"b" : 42}, "c" : [1, 2, 3]}'), ('{"f" : "Hello, World!"}'), ('{"a" : {"b" : 43, "e" : 10}, "c" : [4, 5, 6]}');
-SELECT json FROM test;
-```
-
-```text
-┌─json──────────────────────────────┐
-│ {"a":{"b":42},"c":[1,2,3]}        │
-│ {"a":{"b":0},"f":"Hello, World!"} │
-│ {"a":{"b":43},"c":[4,5,6]}        │
-└───────────────────────────────────┘
-```
-
-Using CAST from 'String':
-
-```sql
-SELECT '{"a" : {"b" : 42},"c" : [1, 2, 3], "d" : "Hello, World!"}'::JSON as json;
-```
-
-```text
-┌─json───────────────────────────────────────────┐
-│ {"a":{"b":42},"c":[1,2,3],"d":"Hello, World!"} │
-└────────────────────────────────────────────────┘
-```
-
-CAST from `JSON`, named `Tuple`, `Map` and `Object('json')` to `JSON` type will be supported later.
-
-## Reading JSON paths as subcolumns
-
-JSON type supports reading every path as a separate subcolumn. If type of the requested path was not specified in the JSON type declaration, the subcolumn of the path will always have type [Dynamic](/docs/en/sql-reference/data-types/dynamic.md).
-
-For example:
-
-```sql
-CREATE TABLE test (json JSON(a.b UInt32, SKIP a.e)) ENGINE = Memory;
-INSERT INTO test VALUES ('{"a" : {"b" : 42, "g" : 42.42}, "c" : [1, 2, 3], "d" : "2020-01-01"}'), ('{"f" : "Hello, World!", "d" : "2020-01-02"}'), ('{"a" : {"b" : 43, "e" : 10, "g" : 43.43}, "c" : [4, 5, 6]}');
-SELECT json FROM test;
-```
-
-```text
-┌─json──────────────────────────────────────────────────┐
-│ {"a":{"b":42,"g":42.42},"c":[1,2,3],"d":"2020-01-01"} │
-│ {"a":{"b":0},"d":"2020-01-02","f":"Hello, World!"}    │
-│ {"a":{"b":43,"g":43.43},"c":[4,5,6]}                  │
-└───────────────────────────────────────────────────────┘
-```
-
-```sql
-SELECT json.a.b, json.a.g, json.c, json.d FROM test;
-```
-
-```text
-┌─json.a.b─┬─json.a.g─┬─json.c──┬─json.d─────┐
-│       42 │ 42.42    │ [1,2,3] │ 2020-01-01 │
-│        0 │ ᴺᵁᴸᴸ     │ ᴺᵁᴸᴸ    │ 2020-01-02 │
-│       43 │ 43.43    │ [4,5,6] │ ᴺᵁᴸᴸ       │
-└──────────┴──────────┴─────────┴────────────┘
-```
-
-If the requested path wasn't found in the data, it will be filled with `NULL` values:
-
-```sql
-SELECT json.non.existing.path FROM test;
-```
-
-```text
-┌─json.non.existing.path─┐
-│ ᴺᵁᴸᴸ                   │
-│ ᴺᵁᴸᴸ                   │
-│ ᴺᵁᴸᴸ                   │
-└────────────────────────┘
-```
-
-Let's check the data types of returned subcolumns:
-```sql
-SELECT toTypeName(json.a.b), toTypeName(json.a.g), toTypeName(json.c), toTypeName(json.d) FROM test;
-```
-
-```text
-┌─toTypeName(json.a.b)─┬─toTypeName(json.a.g)─┬─toTypeName(json.c)─┬─toTypeName(json.d)─┐
-│ UInt32               │ Dynamic              │ Dynamic            │ Dynamic            │
-│ UInt32               │ Dynamic              │ Dynamic            │ Dynamic            │
-│ UInt32               │ Dynamic              │ Dynamic            │ Dynamic            │
-└──────────────────────┴──────────────────────┴────────────────────┴────────────────────┘
-```
-
-As we can see, for `a.b` the type is `UInt32` as we specified in the JSON type declaration, and for all other subcolumns the type is `Dynamic`.
-
-It is also possible to read subcolumns of a `Dynamic` type using special syntax `json.some.path.:TypeName`:
-
-```sql
-select json.a.g.:Float64, dynamicType(json.a.g), json.d.:Date, dynamicType(json.d) FROM test;
-```
-
-```text
-┌─json.a.g.:`Float64`─┬─dynamicType(json.a.g)─┬─json.d.:`Date`─┬─dynamicType(json.d)─┐
-│               42.42 │ Float64               │     2020-01-01 │ Date                │
-│                ᴺᵁᴸᴸ │ None                  │     2020-01-02 │ Date                │
-│               43.43 │ Float64               │           ᴺᵁᴸᴸ │ None                │
-└─────────────────────┴───────────────────────┴────────────────┴─────────────────────┘
-```
-
-`Dynamic` subcolumns can be casted to any data type. In this case the exception will be thrown if internal type inside `Dynamic` cannot be casted to the requested type:
-
-```sql
-select json.a.g::UInt64 as uint FROM test;
-```
-
-```text
-┌─uint─┐
-│   42 │
-│    0 │
-│   43 │
-└──────┘
-```
-
-```sql
-select json.a.g::UUID as float FROM test;
-```
-
-```text
-Received exception:
-Code: 48. DB::Exception: Conversion between numeric types and UUID is not supported. Probably the passed UUID is unquoted: while executing 'FUNCTION CAST(__table1.json.a.g :: 2, 'UUID'_String :: 1) -> CAST(__table1.json.a.g, 'UUID'_String) UUID : 0'. (NOT_IMPLEMENTED)
-```
-
-## Reading JSON sub-objects as subcolumns
-
-JSON type supports reading nested objects as subcolumns with type `JSON` using special syntax `json.^some.path`:
-
-```sql
-CREATE TABLE test (json JSON) ENGINE = Memory;
-INSERT INTO test VALUES ('{"a" : {"b" : {"c" : 42, "g" : 42.42}}, "c" : [1, 2, 3], "d" : {"e" : {"f" : {"g" : "Hello, World", "h" : [1, 2, 3]}}}}'), ('{"f" : "Hello, World!", "d" : {"e" : {"f" : {"h" : [4, 5, 6]}}}}'), ('{"a" : {"b" : {"c" : 43, "e" : 10, "g" : 43.43}}, "c" : [4, 5, 6]}');
-SELECT json FROM test;
-```
-
-```text
-┌─json────────────────────────────────────────────────────────────────────────────────────────┐
-│ {"a":{"b":{"c":42,"g":42.42}},"c":[1,2,3],"d":{"e":{"f":{"g":"Hello, World","h":[1,2,3]}}}} │
-│ {"d":{"e":{"f":{"h":[4,5,6]}}},"f":"Hello, World!"}                                         │
-│ {"a":{"b":{"c":43,"e":10,"g":43.43}},"c":[4,5,6]}                                           │
-└─────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-```sql
-SELECT json.^a.b, json.^d.e.f FROM test;
-```
-
-```text
-┌─json.^`a`.b───────────────┬─json.^`d`.e.f────────────────────┐
-│ {"c":42,"g":42.42}        │ {"g":"Hello, World","h":[1,2,3]} │
-│ {}                        │ {"h":[4,5,6]}                    │
-│ {"c":43,"e":10,"g":43.43} │ {}                               │
-└───────────────────────────┴──────────────────────────────────┘
-```
-
-:::note
-Reading sub-objects as subcolumns may be inefficient, as this may require almost full scan of the JSON data.
-:::
-
-## Types inference for paths
-
-During JSON parsing ClickHouse tries to detect the most appropriate data type for each JSON path. It works similar to [automatic schema inference from input data](/docs/en/interfaces/schema-inference.md) and controlled by the same settings:
- 
-- [input_format_try_infer_integers](/docs/en/interfaces/schema-inference.md#inputformattryinferintegers)
-- [input_format_try_infer_dates](/docs/en/interfaces/schema-inference.md#inputformattryinferdates)
-- [input_format_try_infer_datetimes](/docs/en/interfaces/schema-inference.md#inputformattryinferdatetimes)
-- [schema_inference_make_columns_nullable](/docs/en/interfaces/schema-inference.md#schemainferencemakecolumnsnullable)
-- [input_format_json_try_infer_numbers_from_strings](/docs/en/interfaces/schema-inference.md#inputformatjsontryinfernumbersfromstrings)
-- [input_format_json_infer_incomplete_types_as_strings](/docs/en/interfaces/schema-inference.md#inputformatjsoninferincompletetypesasstrings)
-- [input_format_json_read_numbers_as_strings](/docs/en/interfaces/schema-inference.md#inputformatjsonreadnumbersasstrings)
-- [input_format_json_read_bools_as_strings](/docs/en/interfaces/schema-inference.md#inputformatjsonreadboolsasstrings)
-- [input_format_json_read_bools_as_numbers](/docs/en/interfaces/schema-inference.md#inputformatjsonreadboolsasnumbers)
-- [input_format_json_read_arrays_as_strings](/docs/en/interfaces/schema-inference.md#inputformatjsonreadarraysasstrings)
-
-Let's see some examples:
-
-```sql
-SELECT JSONAllPathsWithTypes('{"a" : "2020-01-01", "b" : "2020-01-01 10:00:00"}'::JSON) AS paths_with_types settings input_format_try_infer_dates=1, input_format_try_infer_datetimes=1;
-```
-
-```text
-┌─paths_with_types─────────────────┐
-│ {'a':'Date','b':'DateTime64(9)'} │
-└──────────────────────────────────┘
-```
-
-```sql
-SELECT JSONAllPathsWithTypes('{"a" : "2020-01-01", "b" : "2020-01-01 10:00:00"}'::JSON) AS paths_with_types settings input_format_try_infer_dates=0, input_format_try_infer_datetimes=0;
-```
-
-```text
-┌─paths_with_types────────────┐
-│ {'a':'String','b':'String'} │
-└─────────────────────────────┘
-```
-
-```sql
-SELECT JSONAllPathsWithTypes('{"a" : [1, 2, 3]}'::JSON) AS paths_with_types settings schema_inference_make_columns_nullable=1;
-```
-
-```text
-┌─paths_with_types───────────────┐
-│ {'a':'Array(Nullable(Int64))'} │
-└────────────────────────────────┘
-```
-
-```sql
-SELECT JSONAllPathsWithTypes('{"a" : [1, 2, 3]}'::JSON) AS paths_with_types settings schema_inference_make_columns_nullable=0;
-```
-
-```text
-┌─paths_with_types─────┐
-│ {'a':'Array(Int64)'} │
-└──────────────────────┘
-```
-
-## Handling arrays of JSON objects
-
-JSON paths that contains an array of objects are parsed as type `Array(JSON)` and inserted into `Dynamic` column for this path. To read an array of objects you can extract it from `Dynamic` column as a subcolumn:
-
-```sql
-CREATE TABLE test (json JSON) ENGINE = Memory;
-INSERT INTO test VALUES
-('{"a" : {"b" : [{"c" : 42, "d" : "Hello", "f" : [[{"g" : 42.42}]], "k" : {"j" : 1000}}, {"c" : 43}, {"e" : [1, 2, 3], "d" : "My", "f" : [[{"g" : 43.43, "h" : "2020-01-01"}]],  "k" : {"j" : 2000}}]}}'),
-('{"a" : {"b" : [1, 2, 3]}}'),
-('{"a" : {"b" : [{"c" : 44, "f" : [[{"h" : "2020-01-02"}]]}, {"e" : [4, 5, 6], "d" : "World", "f" : [[{"g" : 44.44}]],  "k" : {"j" : 3000}}]}}');
-SELECT json FROM test;
-```
-
-```text3
-┌─json────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-│ {"a":{"b":[{"c":"42","d":"Hello","f":[[{"g":42.42}]],"k":{"j":"1000"}},{"c":"43"},{"d":"My","e":["1","2","3"],"f":[[{"g":43.43,"h":"2020-01-01"}]],"k":{"j":"2000"}}]}} │
-│ {"a":{"b":["1","2","3"]}}                                                                                                                                               │
-│ {"a":{"b":[{"c":"44","f":[[{"h":"2020-01-02"}]]},{"d":"World","e":["4","5","6"],"f":[[{"g":44.44}]],"k":{"j":"3000"}}]}}                                                │
-└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-```sql
-SELECT json.a.b, dynamicType(json.a.b) FROM test;
-```
-
-```text
-┌─json.a.b──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┬─dynamicType(json.a.b)────────────────────────────────────┐
-│ ['{"c":"42","d":"Hello","f":[[{"g":42.42}]],"k":{"j":"1000"}}','{"c":"43"}','{"d":"My","e":["1","2","3"],"f":[[{"g":43.43,"h":"2020-01-01"}]],"k":{"j":"2000"}}'] │ Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)) │
-│ [1,2,3]                                                                                                                                                           │ Array(Nullable(Int64))                                   │
-│ ['{"c":"44","f":[[{"h":"2020-01-02"}]]}','{"d":"World","e":["4","5","6"],"f":[[{"g":44.44}]],"k":{"j":"3000"}}']                                                  │ Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)) │
-└───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────┘
-```
-
-As you can notice, the `max_dynamic_types/max_dynamic_paths` parameters of the nested `JSON` type were reduced compared to the default values. It's needed to avoid number of subcolumns to grow  uncontrolled on nested arrays of JSON objects.
-
-Let's try to read subcolumns from this nested `JSON` column:
-
-```sql
-SELECT json.a.b.:`Array(JSON)`.c, json.a.b.:`Array(JSON)`.f, json.a.b.:`Array(JSON)`.d FROM test; 
-```
-
-```text
-┌─json.a.b.:`Array(JSON)`.c─┬─json.a.b.:`Array(JSON)`.f───────────────────────────────────┬─json.a.b.:`Array(JSON)`.d─┐
-│ [42,43,NULL]              │ [[['{"g":42.42}']],NULL,[['{"g":43.43,"h":"2020-01-01"}']]] │ ['Hello',NULL,'My']       │
-│ []                        │ []                                                          │ []                        │
-│ [44,NULL]                 │ [[['{"h":"2020-01-02"}']],[['{"g":44.44}']]]                │ [NULL,'World']            │
-└───────────────────────────┴─────────────────────────────────────────────────────────────┴───────────────────────────┘
-```
-
-We can avoid writing `Array(JSON)` subcolumn name using special syntax:
-
-```sql
-SELECT json.a.b[].c, json.a.b[].f, json.a.b[].d FROM test;
-```
-
-```text
-┌─json.a.b.:`Array(JSON)`.c─┬─json.a.b.:`Array(JSON)`.f───────────────────────────────────┬─json.a.b.:`Array(JSON)`.d─┐
-│ [42,43,NULL]              │ [[['{"g":42.42}']],NULL,[['{"g":43.43,"h":"2020-01-01"}']]] │ ['Hello',NULL,'My']       │
-│ []                        │ []                                                          │ []                        │
-│ [44,NULL]                 │ [[['{"h":"2020-01-02"}']],[['{"g":44.44}']]]                │ [NULL,'World']            │
-└───────────────────────────┴─────────────────────────────────────────────────────────────┴───────────────────────────┘
-```
-
-The number of `[]` after path indicates the array level. `json.path[][]` will be transformed to `json.path.:Array(Array(JSON))`
-
-Let's check the paths and types inside our `Array(JSON)`:
-
-```sql
-SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(arrayJoin(json.a.b[]))) FROM test;
-```
-
-```text
-┌─arrayJoin(JSONAllPathsWithTypes(arrayJoin(json.a.b.:`Array(JSON)`)))──┐
-│ ('c','Int64')                                                         │
-│ ('d','String')                                                        │
-│ ('f','Array(Array(JSON(max_dynamic_types=8, max_dynamic_paths=64)))') │
-│ ('k.j','Int64')                                                       │
-│ ('e','Array(Nullable(Int64))')                                        │
-└───────────────────────────────────────────────────────────────────────┘
-```
-
-Let's read subcolumns from `Array(JSON)` column:
-
-```sql
-SELECT json.a.b[].c.:Int64, json.a.b[].f[][].g.:Float64, json.a.b[].f[][].h.:Date FROM test;
-```
-
-```text
-┌─json.a.b.:`Array(JSON)`.c.:`Int64`─┬─json.a.b.:`Array(JSON)`.f.:`Array(Array(JSON))`.g.:`Float64`─┬─json.a.b.:`Array(JSON)`.f.:`Array(Array(JSON))`.h.:`Date`─┐
-│ [42,43,NULL]                       │ [[[42.42]],[],[[43.43]]]                                     │ [[[NULL]],[],[['2020-01-01']]]                            │
-│ []                                 │ []                                                           │ []                                                        │
-│ [44,NULL]                          │ [[[NULL]],[[44.44]]]                                         │ [[['2020-01-02']],[[NULL]]]                               │
-└────────────────────────────────────┴──────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────┘
-```
-
-We can also read sub-object subcolumns from nested `JSON` column:
-
-```sql
-SELECT json.a.b[].^k FROM test
-```
-
-```text
-┌─json.a.b.:`Array(JSON)`.^`k`─────────┐
-│ ['{"j":"1000"}','{}','{"j":"2000"}'] │
-│ []                                   │
-│ ['{}','{"j":"3000"}']                │
-└──────────────────────────────────────┘
-```
-
-## Reading JSON type from the data
-
-All text formats (JSONEachRow, TSV, CSV, CustomSeparated, Values, etc) supports reading `JSON` type.
-
-Examples:
-
-```sql
-SELECT json FROM format(JSONEachRow, 'json JSON(a.b.c UInt32, SKIP a.b.d, SKIP d.e, SKIP REGEXP \'b.*\')', '
-{"json" : {"a" : {"b" : {"c" : 1, "d" : [0, 1]}}, "b" : "2020-01-01", "c" : 42, "d" : {"e" : {"f" : ["s1", "s2"]}, "i" : [1, 2, 3]}}}
-{"json" : {"a" : {"b" : {"c" : 2, "d" : [2, 3]}}, "b" : [1, 2, 3], "c" : null, "d" : {"e" : {"g" : 43}, "i" : [4, 5, 6]}}}
-{"json" : {"a" : {"b" : {"c" : 3, "d" : [4, 5]}}, "b" : {"c" : 10}, "e" : "Hello, World!"}}
-{"json" : {"a" : {"b" : {"c" : 4, "d" : [6, 7]}}, "c" : 43}}
-{"json" : {"a" : {"b" : {"c" : 5, "d" : [8, 9]}}, "b" : {"c" : 11, "j" : [1, 2, 3]}, "d" : {"e" : {"f" : ["s3", "s4"], "g" : 44}, "h" : "2020-02-02 10:00:00"}}}
-')
-```
-
-```text
-┌─json──────────────────────────────────────────────────────────┐
-│ {"a":{"b":{"c":1}},"c":"42","d":{"i":["1","2","3"]}}          │
-│ {"a":{"b":{"c":2}},"d":{"i":["4","5","6"]}}                   │
-│ {"a":{"b":{"c":3}},"e":"Hello, World!"}                       │
-│ {"a":{"b":{"c":4}},"c":"43"}                                  │
-│ {"a":{"b":{"c":5}},"d":{"h":"2020-02-02 10:00:00.000000000"}} │
-└───────────────────────────────────────────────────────────────┘
-```
-
-For text formats like CSV/TSV/etc `JSON` is parsed from a string containing JSON object
-
-```sql
-SELECT json FROM format(TSV, 'json JSON(a.b.c UInt32, SKIP a.b.d, SKIP REGEXP \'b.*\')',
-'{"a" : {"b" : {"c" : 1, "d" : [0, 1]}}, "b" : "2020-01-01", "c" : 42, "d" : {"e" : {"f" : ["s1", "s2"]}, "i" : [1, 2, 3]}}
-{"a" : {"b" : {"c" : 2, "d" : [2, 3]}}, "b" : [1, 2, 3], "c" : null, "d" : {"e" : {"g" : 43}, "i" : [4, 5, 6]}}
-{"a" : {"b" : {"c" : 3, "d" : [4, 5]}}, "b" : {"c" : 10}, "e" : "Hello, World!"}
-{"a" : {"b" : {"c" : 4, "d" : [6, 7]}}, "c" : 43}
-{"a" : {"b" : {"c" : 5, "d" : [8, 9]}}, "b" : {"c" : 11, "j" : [1, 2, 3]}, "d" : {"e" : {"f" : ["s3", "s4"], "g" : 44}, "h" : "2020-02-02 10:00:00"}}')
-```
-
-```text
-┌─json──────────────────────────────────────────────────────────┐
-│ {"a":{"b":{"c":1}},"c":"42","d":{"i":["1","2","3"]}}          │
-│ {"a":{"b":{"c":2}},"d":{"i":["4","5","6"]}}                   │
-│ {"a":{"b":{"c":3}},"e":"Hello, World!"}                       │
-│ {"a":{"b":{"c":4}},"c":"43"}                                  │
-│ {"a":{"b":{"c":5}},"d":{"h":"2020-02-02 10:00:00.000000000"}} │
-└───────────────────────────────────────────────────────────────┘
-```
-
-## Reaching the limit of dynamic paths inside JSON
-
-`JSON` data type can store only limited number of paths as separate subcolumns inside. By default, this limit is 1024, but you can change it in type declaration using parameter `max_dynamic_paths`.
-When the limit is reached, all new paths inserted to `JSON` column will be stored in a single shared data structure. It's still possible to read such paths as subcolumns, but it will require reading the whole
-shared data structure to extract the values of this path. This limit is needed to avoid the enormous number of different subcolumns that can make the table unusable.
-
-Let's see what happens when the limit is reached in different scenarios.
-
-### Reaching the limit during data parsing
-
-During parsing of `JSON` object from the data, when the limit is reached for current block of data, all new paths will be stored in a shared data structure. We can check it using introspection functions `JSONDynamicPaths, JSONSharedDataPaths`:
-
-```sql
-SELECT json, JSONDynamicPaths(json), JSONSharedDataPaths(json) FROM format(JSONEachRow, 'json JSON(max_dynamic_paths=3)', '
-{"json" : {"a" : {"b" : 42}, "c" : [1, 2, 3]}}
-{"json" : {"a" : {"b" : 43}, "d" : "2020-01-01"}}
-{"json" : {"a" : {"b" : 44}, "c" : [4, 5, 6]}}
-{"json" : {"a" : {"b" : 43}, "d" : "2020-01-02", "e" : "Hello", "f" : {"g" : 42.42}}}
-{"json" : {"a" : {"b" : 43}, "c" : [7, 8, 9], "f" : {"g" : 43.43}, "h" : "World"}}
-')
-```
-
-```text
-┌─json───────────────────────────────────────────────────────────┬─JSONDynamicPaths(json)─┬─JSONSharedDataPaths(json)─┐
-│ {"a":{"b":"42"},"c":["1","2","3"]}                             │ ['a.b','c','d']        │ []                        │
-│ {"a":{"b":"43"},"d":"2020-01-01"}                              │ ['a.b','c','d']        │ []                        │
-│ {"a":{"b":"44"},"c":["4","5","6"]}                             │ ['a.b','c','d']        │ []                        │
-│ {"a":{"b":"43"},"d":"2020-01-02","e":"Hello","f":{"g":42.42}}  │ ['a.b','c','d']        │ ['e','f.g']               │
-│ {"a":{"b":"43"},"c":["7","8","9"],"f":{"g":43.43},"h":"World"} │ ['a.b','c','d']        │ ['f.g','h']               │
-└────────────────────────────────────────────────────────────────┴────────────────────────┴───────────────────────────┘
-```
-
-As we can see, after inserting paths `e` and `f.g` the limit was reached and we inserted them into shared data structure.
-
-### During merges of data parts in MergeTree table engines
-
-During merge of several data parts in MergeTree table the `JSON` column in the resulting data part can reach the limit of dynamic paths and won't be able to store all paths from source parts as subcolumns.
-In this case ClickHouse chooses what paths will remain as subcolumns after merge and what paths will be stored in the shared data structure. In most cases ClickHouse tries to keep paths that contain
-the largest number of non-null values and move the rarest paths to the shared data structure, but it depends on the implementation.
-
-Let's see an example of such merge. First, let's create a table with `JSON` column, set the limit of dynamic paths to `3` and insert values with `5` different paths:
-
-```sql
-CREATE TABLE test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree ORDER BY id;
-SYSTEM STOP MERGES test;
-INSERT INTO test SELECT number, formatRow('JSONEachRow', number as a) FROM numbers(5);
-INSERT INTO test SELECT number, formatRow('JSONEachRow', number as b) FROM numbers(4);
-INSERT INTO test SELECT number, formatRow('JSONEachRow', number as c) FROM numbers(3);
-INSERT INTO test SELECT number, formatRow('JSONEachRow', number as d) FROM numbers(2);
-INSERT INTO test SELECT number, formatRow('JSONEachRow', number as e)  FROM numbers(1);
-```
-
-Each insert will create a separate data pert with `JSON` column containing single path:
-```sql
-SELECT count(), JSONDynamicPaths(json) AS dynamic_paths, JSONSharedDataPaths(json) AS shared_data_paths, _part FROM test GROUP BY _part, dynamic_paths, shared_data_paths ORDER BY _part ASC
-```
-
-```text
-┌─count()─┬─dynamic_paths─┬─shared_data_paths─┬─_part─────┐
-│       5 │ ['a']         │ []                │ all_1_1_0 │
-│       4 │ ['b']         │ []                │ all_2_2_0 │
-│       3 │ ['c']         │ []                │ all_3_3_0 │
-│       2 │ ['d']         │ []                │ all_4_4_0 │
-│       1 │ ['e']         │ []                │ all_5_5_0 │
-└─────────┴───────────────┴───────────────────┴───────────┘
-
-```
-
-Now, let's merge all parts into one and see what will happen:
-
-```sql
-SYSTEM START MERGES test;
-OPTIMIZE TABLE test FINAL;
-SELECT count(), dynamicType(d), _part FROM test GROUP BY _part, dynamicType(d) ORDER BY _part;
-```
-
-```text
-┌─count()─┬─dynamic_paths─┬─shared_data_paths─┬─_part─────┐
-│       1 │ ['a','b','c'] │ ['e']             │ all_1_5_2 │
-│       2 │ ['a','b','c'] │ ['d']             │ all_1_5_2 │
-│      12 │ ['a','b','c'] │ []                │ all_1_5_2 │
-└─────────┴───────────────┴───────────────────┴───────────┘
-```
-
-As we can see, ClickHouse kept the most frequent paths `a`, `b` and `c` and moved paths `e` and `d` to shared data structure.
-
-## Introspection functions
-
-There are several functions that can help to inspect the content of the JSON column: [JSONAllPaths](../functions/json-functions.md#jsonallpaths), [JSONAllPathsWithTypes](../functions/json-functions.md#jsonallpathswithtypes), [JSONDynamicPaths](../functions/json-functions.md#jsondynamicpaths), [JSONDynamicPathsWithTypes](../functions/json-functions.md#jsondynamicpathswithtypes), [JSONSharedDataPaths](../functions/json-functions.md#jsonshareddatapaths), [JSONSharedDataPathsWithTypes](../functions/json-functions.md#jsonshareddatapathswithtypes), [distinctDynamicTypes](../aggregate-functions/reference/distinctdynamictypes.md), [distinctJSONPaths and distinctJSONPathsAndTypes](../aggregate-functions/reference/distinctjsonpaths.md)
-
-**Examples**
-
-Let's investigate the content of [GH Archive](https://www.gharchive.org/) dataset for `2020-01-01` date:
-
-```sql
-SELECT arrayJoin(distinctJSONPaths(json)) FROM s3('s3://clickhouse-public-datasets/gharchive/original/2020-01-01-*.json.gz', JSONAsObject) 
-```
-
-```text
-┌─arrayJoin(distinctJSONPaths(json))─────────────────────────┐
-│ actor.avatar_url                                           │
-│ actor.display_login                                        │
-│ actor.gravatar_id                                          │
-│ actor.id                                                   │
-│ actor.login                                                │
-│ actor.url                                                  │
-│ created_at                                                 │
-│ id                                                         │
-│ org.avatar_url                                             │
-│ org.gravatar_id                                            │
-│ org.id                                                     │
-│ org.login                                                  │
-│ org.url                                                    │
-│ payload.action                                             │
-│ payload.before                                             │
-│ payload.comment._links.html.href                           │
-│ payload.comment._links.pull_request.href                   │
-│ payload.comment._links.self.href                           │
-│ payload.comment.author_association                         │
-│ payload.comment.body                                       │
-│ payload.comment.commit_id                                  │
-│ payload.comment.created_at                                 │
-│ payload.comment.diff_hunk                                  │
-│ payload.comment.html_url                                   │
-│ payload.comment.id                                         │
-│ payload.comment.in_reply_to_id                             │
-│ payload.comment.issue_url                                  │
-│ payload.comment.line                                       │
-│ payload.comment.node_id                                    │
-│ payload.comment.original_commit_id                         │
-│ payload.comment.original_position                          │
-│ payload.comment.path                                       │
-│ payload.comment.position                                   │
-│ payload.comment.pull_request_review_id                     │
-...
-│ payload.release.node_id                                    │
-│ payload.release.prerelease                                 │
-│ payload.release.published_at                               │
-│ payload.release.tag_name                                   │
-│ payload.release.tarball_url                                │
-│ payload.release.target_commitish                           │
-│ payload.release.upload_url                                 │
-│ payload.release.url                                        │
-│ payload.release.zipball_url                                │
-│ payload.size                                               │
-│ public                                                     │
-│ repo.id                                                    │
-│ repo.name                                                  │
-│ repo.url                                                   │
-│ type                                                       │
-└─arrayJoin(distinctJSONPaths(json))─────────────────────────┘
-```
-
-```sql
-SELECT arrayJoin(distinctJSONPathsAndTypes(json)) FROM s3('s3://clickhouse-public-datasets/gharchive/original/2020-01-01-*.json.gz', JSONAsObject) SETTINGS date_time_input_format='best_effort'
-```
-
-
-```text
-┌─arrayJoin(distinctJSONPathsAndTypes(json))──────────────────┐
-│ ('actor.avatar_url',['String'])                             │
-│ ('actor.display_login',['String'])                          │
-│ ('actor.gravatar_id',['String'])                            │
-│ ('actor.id',['Int64'])                                      │
-│ ('actor.login',['String'])                                  │
-│ ('actor.url',['String'])                                    │
-│ ('created_at',['DateTime'])                                 │
-│ ('id',['String'])                                           │
-│ ('org.avatar_url',['String'])                               │
-│ ('org.gravatar_id',['String'])                              │
-│ ('org.id',['Int64'])                                        │
-│ ('org.login',['String'])                                    │
-│ ('org.url',['String'])                                      │
-│ ('payload.action',['String'])                               │
-│ ('payload.before',['String'])                               │
-│ ('payload.comment._links.html.href',['String'])             │
-│ ('payload.comment._links.pull_request.href',['String'])     │
-│ ('payload.comment._links.self.href',['String'])             │
-│ ('payload.comment.author_association',['String'])           │
-│ ('payload.comment.body',['String'])                         │
-│ ('payload.comment.commit_id',['String'])                    │
-│ ('payload.comment.created_at',['DateTime'])                 │
-│ ('payload.comment.diff_hunk',['String'])                    │
-│ ('payload.comment.html_url',['String'])                     │
-│ ('payload.comment.id',['Int64'])                            │
-│ ('payload.comment.in_reply_to_id',['Int64'])                │
-│ ('payload.comment.issue_url',['String'])                    │
-│ ('payload.comment.line',['Int64'])                          │
-│ ('payload.comment.node_id',['String'])                      │
-│ ('payload.comment.original_commit_id',['String'])           │
-│ ('payload.comment.original_position',['Int64'])             │
-│ ('payload.comment.path',['String'])                         │
-│ ('payload.comment.position',['Int64'])                      │
-│ ('payload.comment.pull_request_review_id',['Int64'])        │
-...
-│ ('payload.release.node_id',['String'])                      │
-│ ('payload.release.prerelease',['Bool'])                     │
-│ ('payload.release.published_at',['DateTime'])               │
-│ ('payload.release.tag_name',['String'])                     │
-│ ('payload.release.tarball_url',['String'])                  │
-│ ('payload.release.target_commitish',['String'])             │
-│ ('payload.release.upload_url',['String'])                   │
-│ ('payload.release.url',['String'])                          │
-│ ('payload.release.zipball_url',['String'])                  │
-│ ('payload.size',['Int64'])                                  │
-│ ('public',['Bool'])                                         │
-│ ('repo.id',['Int64'])                                       │
-│ ('repo.name',['String'])                                    │
-│ ('repo.url',['String'])                                     │
-│ ('type',['String'])                                         │
-└─arrayJoin(distinctJSONPathsAndTypes(json))──────────────────┘
-```
-
-## Tips for better usage of the JSON type
-
-Before creating `JSON` column and loading data into it, consider the following tips:
-
-- Investigate your data and specify as many path hints with types as you can. It will make the storage and the reading much more efficient.
-- Think about what paths you will need and what paths you will never need. Specify paths that you won't need in the SKIP section and SKIP REGEXP if needed. It will improve the storage.
-- Don't set `max_dynamic_paths` parameter to very high values, it can make the storage and reading less efficient.
diff --git a/docs/en/sql-reference/data-types/special-data-types/interval.md b/docs/en/sql-reference/data-types/special-data-types/interval.md
index 4ef1a7e6238..bedbcf0bd28 100644
--- a/docs/en/sql-reference/data-types/special-data-types/interval.md
+++ b/docs/en/sql-reference/data-types/special-data-types/interval.md
@@ -53,28 +53,29 @@ SELECT now() as current_date_time, current_date_time + INTERVAL 4 DAY
 └─────────────────────┴───────────────────────────────┘
 ```
 
-Also it is possible to use multiple intervals simultaneously:
+Intervals with different types can’t be combined. You can’t use intervals like `4 DAY 1 HOUR`. Specify intervals in units that are smaller or equal to the smallest unit of the interval, for example, the interval `1 day and an hour` interval can be expressed as `25 HOUR` or `90000 SECOND`.
+
+You can’t perform arithmetical operations with `Interval`-type values, but you can add intervals of different types consequently to values in `Date` or `DateTime` data types. For example:
 
 ``` sql
-SELECT now() AS current_date_time, current_date_time + (INTERVAL 4 DAY + INTERVAL 3 HOUR)
+SELECT now() AS current_date_time, current_date_time + INTERVAL 4 DAY + INTERVAL 3 HOUR
 ```
 
 ``` text
-┌───current_date_time─┬─plus(current_date_time, plus(toIntervalDay(4), toIntervalHour(3)))─┐
-│ 2024-08-08 18:31:39 │                                                2024-08-12 21:31:39 │
-└─────────────────────┴────────────────────────────────────────────────────────────────────┘
+┌───current_date_time─┬─plus(plus(now(), toIntervalDay(4)), toIntervalHour(3))─┐
+│ 2019-10-23 11:16:28 │                                    2019-10-27 14:16:28 │
+└─────────────────────┴────────────────────────────────────────────────────────┘
 ```
 
-And to compare values with different intervals:
+The following query causes an exception:
 
 ``` sql
-SELECT toIntervalMicrosecond(3600000000) = toIntervalHour(1);
+select now() AS current_date_time, current_date_time + (INTERVAL 4 DAY + INTERVAL 3 HOUR)
 ```
 
 ``` text
-┌─less(toIntervalMicrosecond(179999999), toIntervalMinute(3))─┐
-│                                                           1 │
-└─────────────────────────────────────────────────────────────┘
+Received exception from server (version 19.14.1):
+Code: 43. DB::Exception: Received from localhost:9000. DB::Exception: Wrong argument types for function plus: if one argument is Interval, then another must be Date or DateTime..
 ```
 
 ## See Also
diff --git a/docs/en/sql-reference/functions/array-functions.md b/docs/en/sql-reference/functions/array-functions.md
index ad971ae7554..1b52440903d 100644
--- a/docs/en/sql-reference/functions/array-functions.md
+++ b/docs/en/sql-reference/functions/array-functions.md
@@ -2035,7 +2035,6 @@ Query:
 SELECT arrayZip(['a', 'b', 'c'], [5, 2, 1]);
 ```
 
-
 Result:
 
 ``` text
@@ -2044,43 +2043,6 @@ Result:
 └──────────────────────────────────────┘
 ```
 
-## arrayZipUnaligned
-
-Combines multiple arrays into a single array, allowing for unaligned arrays. The resulting array contains the corresponding elements of the source arrays grouped into tuples in the listed order of arguments.
-
-**Syntax**
-
-``` sql
-arrayZipUnaligned(arr1, arr2, ..., arrN)
-```
-
-**Arguments**
-
-- `arrN` — [Array](../data-types/array.md).
-
-The function can take any number of arrays of different types.
-
-**Returned value**
-
-- Array with elements from the source arrays grouped into [tuples](../data-types/tuple.md). Data types in the tuple are the same as types of the input arrays and in the same order as arrays are passed. [Array](../data-types/array.md). If the arrays have different sizes, the shorter arrays will be padded with `null` values.
-
-**Example**
-
-Query:
-
-``` sql
-SELECT arrayZipUnaligned(['a'], [1, 2, 3]);
-```
-
-Result:
-
-``` text
-┌─arrayZipUnaligned(['a'], [1, 2, 3])─┐
-│ [('a',1),(NULL,2),(NULL,3)]         │
-└─────────────────────────────────────┘
-```
-
-
 ## arrayAUC
 
 Calculate AUC (Area Under the Curve, which is a concept in machine learning, see more details: <https://en.wikipedia.org/wiki/Receiver_operating_characteristic#Area_under_the_curve>).
diff --git a/docs/en/sql-reference/functions/conditional-functions.md b/docs/en/sql-reference/functions/conditional-functions.md
index 8b8ee524c7e..564186fd8db 100644
--- a/docs/en/sql-reference/functions/conditional-functions.md
+++ b/docs/en/sql-reference/functions/conditional-functions.md
@@ -49,7 +49,7 @@ Result:
 
 ## multiIf
 
-Allows to write the [CASE](../../sql-reference/operators/index.md#conditional-expression) operator more compactly in the query.
+Allows to write the [CASE](../../sql-reference/operators/index.md#operator_case) operator more compactly in the query.
 
 **Syntax**
 
@@ -264,4 +264,4 @@ SELECT clamp(1, 2, 3) result,  toTypeName(result) type;
 ┌─result─┬─type────┐
 │      2 │ Float64 │
 └────────┴─────────┘
-```
+```
\ No newline at end of file
diff --git a/docs/en/sql-reference/functions/date-time-functions.md b/docs/en/sql-reference/functions/date-time-functions.md
index d3db0e43041..3d95ae2cb74 100644
--- a/docs/en/sql-reference/functions/date-time-functions.md
+++ b/docs/en/sql-reference/functions/date-time-functions.md
@@ -1617,348 +1617,45 @@ The calculation is performed relative to specific points in time:
 
 If unit `WEEK` was specified, `toStartOfInterval` assumes that weeks start on Monday. Note that this behavior is different from that of function `toStartOfWeek` in which weeks start by default on Sunday.
 
-**Syntax**
-
-```sql
-toStartOfInterval(value, INTERVAL x unit[, time_zone])
-toStartOfInterval(value, INTERVAL x unit[, origin[, time_zone]])
-```
-
-The second overload emulates TimescaleDB's `time_bucket()` function, respectively PostgreSQL's `date_bin()` function, e.g.
-
-``` SQL
-SELECT toStartOfInterval(toDateTime('2023-01-01 14:45:00'), INTERVAL 1 MINUTE, toDateTime('2023-01-01 14:35:30'));
-```
 **See Also**
+
 - [date_trunc](#date_trunc)
 
 ## toTime
 
 Converts a date with time to a certain fixed date, while preserving the time.
 
-**Syntax**
-
-```sql
-toTime(date[,timezone])
-```
-
-**Arguments**
-
-- `date` — Date to convert to a time. [Date](../data-types/date.md)/[DateTime](../data-types/datetime.md)/[DateTime64](../data-types/datetime64.md).
-- `timezone` (optional) — Timezone for the returned value. [String](../data-types/string.md).
-
-**Returned value**
-
-- DateTime with date equated to `1970-01-02` while preserving the time. [DateTime](../data-types/datetime.md).
-
-:::note
-If the `date` input argument contained sub-second components,
-they will be dropped in the returned `DateTime` value with second-accuracy.
-:::
-
-**Example**
-
-Query:
-
-```sql
-SELECT toTime(toDateTime64('1970-12-10 01:20:30.3000',3)) AS result, toTypeName(result);
-```
-
-Result:
-
-```response
-┌──────────────result─┬─toTypeName(result)─┐
-│ 1970-01-02 01:20:30 │ DateTime           │
-└─────────────────────┴────────────────────┘
-```
-
 ## toRelativeYearNum
 
-Converts a date, or date with time, to the number of years elapsed since a certain fixed point in the past. 
-
-**Syntax**
-
-```sql
-toRelativeYearNum(date)
-```
-
-**Arguments**
-
-- `date` — Date or date with time. [Date](../data-types/date.md)/[DateTime](../data-types/datetime.md)/[DateTime64](../data-types/datetime64.md).
-
-**Returned value**
-
-- The number of years from a fixed reference point in the past. [UInt16](../data-types/int-uint.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toRelativeYearNum(toDate('2002-12-08')) AS y1,
-    toRelativeYearNum(toDate('2010-10-26')) AS y2
-```
-
-Result:
-
-```response
-┌───y1─┬───y2─┐
-│ 2002 │ 2010 │
-└──────┴──────┘
-```
+Converts a date, or date with time, to the number of the year, starting from a certain fixed point in the past.
 
 ## toRelativeQuarterNum
 
-Converts a date, or date with time, to the number of quarters elapsed since a certain fixed point in the past.
-
-**Syntax**
-
-```sql
-toRelativeQuarterNum(date)
-```
-
-**Arguments**
-
-- `date` — Date or date with time. [Date](../data-types/date.md)/[DateTime](../data-types/datetime.md)/[DateTime64](../data-types/datetime64.md).
-
-**Returned value**
-
-- The number of quarters from a fixed reference point in the past. [UInt32](../data-types/int-uint.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-  toRelativeQuarterNum(toDate('1993-11-25')) AS q1,
-  toRelativeQuarterNum(toDate('2005-01-05')) AS q2
-```
-
-Result:
-
-```response
-┌───q1─┬───q2─┐
-│ 7975 │ 8020 │
-└──────┴──────┘
-```
+Converts a date, or date with time, to the number of the quarter, starting from a certain fixed point in the past.
 
 ## toRelativeMonthNum
 
-Converts a date, or date with time, to the number of months elapsed since a certain fixed point in the past.
-
-**Syntax**
-
-```sql
-toRelativeMonthNum(date)
-```
-
-**Arguments**
-
-- `date` — Date or date with time. [Date](../data-types/date.md)/[DateTime](../data-types/datetime.md)/[DateTime64](../data-types/datetime64.md).
-
-**Returned value**
-
-- The number of months from a fixed reference point in the past. [UInt32](../data-types/int-uint.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-  toRelativeMonthNum(toDate('2001-04-25')) AS m1,
-  toRelativeMonthNum(toDate('2009-07-08')) AS m2
-```
-
-Result:
-
-```response
-┌────m1─┬────m2─┐
-│ 24016 │ 24115 │
-└───────┴───────┘
-```
+Converts a date, or date with time, to the number of the month, starting from a certain fixed point in the past.
 
 ## toRelativeWeekNum
 
-Converts a date, or date with time, to the number of weeks elapsed since a certain fixed point in the past.
-
-**Syntax**
-
-```sql
-toRelativeWeekNum(date)
-```
-
-**Arguments**
-
-- `date` — Date or date with time. [Date](../data-types/date.md)/[DateTime](../data-types/datetime.md)/[DateTime64](../data-types/datetime64.md).
-
-**Returned value**
-
-- The number of weeks from a fixed reference point in the past. [UInt32](../data-types/int-uint.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-  toRelativeWeekNum(toDate('2000-02-29')) AS w1,
-  toRelativeWeekNum(toDate('2001-01-12')) AS w2
-```
-
-Result:
-
-```response
-┌───w1─┬───w2─┐
-│ 1574 │ 1619 │
-└──────┴──────┘
-```
+Converts a date, or date with time, to the number of the week, starting from a certain fixed point in the past.
 
 ## toRelativeDayNum
 
-Converts a date, or date with time, to the number of days elapsed since a certain fixed point in the past.
-
-**Syntax**
-
-```sql
-toRelativeDayNum(date)
-```
-
-**Arguments**
-
-- `date` — Date or date with time. [Date](../data-types/date.md)/[DateTime](../data-types/datetime.md)/[DateTime64](../data-types/datetime64.md).
-
-**Returned value**
-
-- The number of days from a fixed reference point in the past. [UInt32](../data-types/int-uint.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-  toRelativeDayNum(toDate('1993-10-05')) AS d1,
-  toRelativeDayNum(toDate('2000-09-20')) AS d2
-```
-
-Result:
-
-```response
-┌───d1─┬────d2─┐
-│ 8678 │ 11220 │
-└──────┴───────┘
-```
+Converts a date, or date with time, to the number of the day, starting from a certain fixed point in the past.
 
 ## toRelativeHourNum
 
-Converts a date, or date with time, to the number of hours elapsed since a certain fixed point in the past.
-
-**Syntax**
-
-```sql
-toRelativeHourNum(date)
-```
-
-**Arguments**
-
-- `date` — Date or date with time. [Date](../data-types/date.md)/[DateTime](../data-types/datetime.md)/[DateTime64](../data-types/datetime64.md).
-
-**Returned value**
-
-- The number of hours from a fixed reference point in the past. [UInt32](../data-types/int-uint.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-  toRelativeHourNum(toDateTime('1993-10-05 05:20:36')) AS h1,
-  toRelativeHourNum(toDateTime('2000-09-20 14:11:29')) AS h2
-```
-
-Result:
-
-```response
-┌─────h1─┬─────h2─┐
-│ 208276 │ 269292 │
-└────────┴────────┘
-```
+Converts a date, or date with time, to the number of the hour, starting from a certain fixed point in the past.
 
 ## toRelativeMinuteNum
 
-Converts a date, or date with time, to the number of minutes elapsed since a certain fixed point in the past.
-
-**Syntax**
-
-```sql
-toRelativeMinuteNum(date)
-```
-
-**Arguments**
-
-- `date` — Date or date with time. [Date](../data-types/date.md)/[DateTime](../data-types/datetime.md)/[DateTime64](../data-types/datetime64.md).
-
-**Returned value**
-
-- The number of minutes from a fixed reference point in the past. [UInt32](../data-types/int-uint.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-  toRelativeMinuteNum(toDateTime('1993-10-05 05:20:36')) AS m1,
-  toRelativeMinuteNum(toDateTime('2000-09-20 14:11:29')) AS m2
-```
-
-Result:
-
-```response
-┌───────m1─┬───────m2─┐
-│ 12496580 │ 16157531 │
-└──────────┴──────────┘
-```
+Converts a date, or date with time, to the number of the minute, starting from a certain fixed point in the past.
 
 ## toRelativeSecondNum
 
-Converts a date, or date with time, to the number of the seconds elapsed since a certain fixed point in the past.
-
-**Syntax**
-
-```sql
-toRelativeSecondNum(date)
-```
-
-**Arguments**
-
-- `date` — Date or date with time. [Date](../data-types/date.md)/[DateTime](../data-types/datetime.md)/[DateTime64](../data-types/datetime64.md).
-
-**Returned value**
-
-- The number of seconds from a fixed reference point in the past. [UInt32](../data-types/int-uint.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-  toRelativeSecondNum(toDateTime('1993-10-05 05:20:36')) AS s1,
-  toRelativeSecondNum(toDateTime('2000-09-20 14:11:29')) AS s2
-```
-
-Result:
-
-```response
-┌────────s1─┬────────s2─┐
-│ 749794836 │ 969451889 │
-└───────────┴───────────┘
-```
+Converts a date, or date with time, to the number of the second, starting from a certain fixed point in the past.
 
 ## toISOYear
 
@@ -2322,7 +2019,7 @@ Alias: `dateTrunc`.
 
     `unit` argument is case-insensitive.
 
-- `value` — Date and time. [Date](../data-types/date.md), [Date32](../data-types/date32.md), [DateTime](../data-types/datetime.md) or [DateTime64](../data-types/datetime64.md).
+- `value` — Date and time. [DateTime](../data-types/datetime.md) or [DateTime64](../data-types/datetime64.md).
 - `timezone` — [Timezone name](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) for the returned value (optional). If not specified, the function uses the timezone of the `value` parameter. [String](../data-types/string.md).
 
 **Returned value**
@@ -4187,29 +3884,19 @@ Result:
 └───────────────────────────────────────────────────────────────────────┘
 ```
 
-## timeSlots
+## timeSlots(StartTime, Duration,\[, Size\])
 
 For a time interval starting at ‘StartTime’ and continuing for ‘Duration’ seconds, it returns an array of moments in time, consisting of points from this interval rounded down to the ‘Size’ in seconds. ‘Size’ is an optional parameter set to 1800 (30 minutes) by default.
 This is necessary, for example, when searching for pageviews in the corresponding session.
 Accepts DateTime and DateTime64 as ’StartTime’ argument. For DateTime, ’Duration’ and ’Size’ arguments must be `UInt32`. For ’DateTime64’ they must be `Decimal64`.
 Returns an array of DateTime/DateTime64 (return type matches the type of ’StartTime’). For DateTime64, the return value's scale can differ from the scale of ’StartTime’ --- the highest scale among all given arguments is taken.
 
-**Syntax**
-
-```sql
-timeSlots(StartTime, Duration,\[, Size\])
-```
-
-**Example**
-
+Example:
 ```sql
 SELECT timeSlots(toDateTime('2012-01-01 12:20:00'), toUInt32(600));
 SELECT timeSlots(toDateTime('1980-12-12 21:01:02', 'UTC'), toUInt32(600), 299);
 SELECT timeSlots(toDateTime64('1980-12-12 21:01:02.1234', 4, 'UTC'), toDecimal64(600.1, 1), toDecimal64(299, 0));
 ```
-
-Result:
-
 ``` text
 ┌─timeSlots(toDateTime('2012-01-01 12:20:00'), toUInt32(600))─┐
 │ ['2012-01-01 12:00:00','2012-01-01 12:30:00']               │
diff --git a/docs/en/sql-reference/functions/geo/geohash.md b/docs/en/sql-reference/functions/geo/geohash.md
index ce2e3c43b3e..b6ac7a74092 100644
--- a/docs/en/sql-reference/functions/geo/geohash.md
+++ b/docs/en/sql-reference/functions/geo/geohash.md
@@ -6,7 +6,7 @@ title: "Functions for Working with Geohash"
 
 ## Geohash
 
-[Geohash](https://en.wikipedia.org/wiki/Geohash) is the geocode system, which subdivides Earth’s surface into buckets of grid shape and encodes each cell into a short string of letters and digits. It is a hierarchical data structure, so the longer the geohash string is, the more precise the geographic location will be.
+[Geohash](https://en.wikipedia.org/wiki/Geohash) is the geocode system, which subdivides Earth’s surface into buckets of grid shape and encodes each cell into a short string of letters and digits. It is a hierarchical data structure, so the longer is the geohash string, the more precise is the geographic location.
 
 If you need to manually convert geographic coordinates to geohash strings, you can use [geohash.org](http://geohash.org/).
 
@@ -14,37 +14,26 @@ If you need to manually convert geographic coordinates to geohash strings, you c
 
 Encodes latitude and longitude as a [geohash](#geohash)-string.
 
-**Syntax**
-
 ``` sql
 geohashEncode(longitude, latitude, [precision])
 ```
 
 **Input values**
 
-- `longitude` — Longitude part of the coordinate you want to encode. Floating in range`[-180°, 180°]`. [Float](../../data-types/float.md). 
-- `latitude` — Latitude part of the coordinate you want to encode. Floating in range `[-90°, 90°]`. [Float](../../data-types/float.md).
-- `precision` (optional) — Length of the resulting encoded string. Defaults to `12`. Integer in the range `[1, 12]`. [Int8](../../data-types/int-uint.md).
-
-:::note
-- All coordinate parameters must be of the same type: either `Float32` or `Float64`.
-- For the `precision` parameter, any value less than `1` or greater than `12` is silently converted to `12`.
-:::
+- longitude - longitude part of the coordinate you want to encode. Floating in range`[-180°, 180°]`
+- latitude - latitude part of the coordinate you want to encode. Floating in range `[-90°, 90°]`
+- precision - Optional, length of the resulting encoded string, defaults to `12`. Integer in range `[1, 12]`. Any value less than `1` or greater than `12` is silently converted to `12`.
 
 **Returned values**
 
-- Alphanumeric string of the encoded coordinate (modified version of the base32-encoding alphabet is used). [String](../../data-types/string.md).
+- alphanumeric `String` of encoded coordinate (modified version of the base32-encoding alphabet is used).
 
 **Example**
 
-Query:
-
 ``` sql
 SELECT geohashEncode(-5.60302734375, 42.593994140625, 0) AS res;
 ```
 
-Result:
-
 ``` text
 ┌─res──────────┐
 │ ezs42d000000 │
@@ -55,19 +44,13 @@ Result:
 
 Decodes any [geohash](#geohash)-encoded string into longitude and latitude.
 
-**Syntax**
-
-```sql
-geohashDecode(hash_str)
-```
-
 **Input values**
 
-- `hash_str` — Geohash-encoded string.
+- encoded string - geohash-encoded string.
 
 **Returned values**
 
-- Tuple `(longitude, latitude)` of `Float64` values of longitude and latitude. [Tuple](../../data-types/tuple.md)([Float64](../../data-types/float.md))
+- (longitude, latitude) - 2-tuple of `Float64` values of longitude and latitude.
 
 **Example**
 
diff --git a/docs/en/sql-reference/functions/geo/polygon.md b/docs/en/sql-reference/functions/geo/polygon.md
index be9e9810626..25a7a1fac8e 100644
--- a/docs/en/sql-reference/functions/geo/polygon.md
+++ b/docs/en/sql-reference/functions/geo/polygon.md
@@ -6,13 +6,11 @@ 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:
+Returns a WKT (Well Known Text) geometric object from various [Geo Data Types](../../data-types/geo.md). Supported WKT objects are: 
 
 - POINT
 - POLYGON
 - MULTIPOLYGON
-- LINESTRING
-- MULTILINESTRING
 
 **Syntax**
 
@@ -28,16 +26,12 @@ WKT(geo_data)
 - [Ring](../../data-types/geo.md#ring)
 - [Polygon](../../data-types/geo.md#polygon)
 - [MultiPolygon](../../data-types/geo.md#multipolygon)
-- [LineString](../../data-types/geo.md#linestring)
-- [MultiLineString](../../data-types/geo.md#multilinestring)
 
 **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.
-- WKT geometric object `LINESTRING` is returned for a LineString.
-- WKT geometric object `MULTILINESTRING` is returned for a MultiLineString.
+- WKT geometric object `MULTIPOLYGON` is returned for a MultiPolygon. 
 
 **Examples**
 
@@ -90,7 +84,7 @@ SELECT
 
 ### Input parameters
 
-String starting with `MULTIPOLYGON`
+String starting with `MULTIPOLYGON` 
 
 ### Returned value
 
@@ -176,34 +170,6 @@ SELECT readWKTLineString('LINESTRING (1 1, 2 2, 3 3, 1 1)');
 [(1,1),(2,2),(3,3),(1,1)]
 ```
 
-## readWKTMultiLineString
-
-Parses a Well-Known Text (WKT) representation of a MultiLineString geometry and returns it in the internal ClickHouse format.
-
-### Syntax
-
-```sql
-readWKTMultiLineString(wkt_string)
-```
-
-### Arguments
-
-- `wkt_string`: The input WKT string representing a MultiLineString geometry.
-
-### Returned value
-
-The function returns a ClickHouse internal representation of the multilinestring geometry.
-
-### Example
-
-```sql
-SELECT readWKTMultiLineString('MULTILINESTRING ((1 1, 2 2, 3 3), (4 4, 5 5, 6 6))');
-```
-
-```response
-[[(1,1),(2,2),(3,3)],[(4,4),(5,5),(6,6)]]
-```
-
 ## readWKTRing
 
 Parses a Well-Known Text (WKT) representation of a Polygon geometry and returns a ring (closed linestring) in the internal ClickHouse format.
@@ -253,7 +219,7 @@ UInt8, 0 for false, 1 for true
 
 ## polygonsDistanceSpherical
 
-Calculates the minimal distance between two points where one point belongs to the first polygon and the second to another polygon. Spherical means that coordinates are interpreted as coordinates on a pure and ideal sphere, which is not true for the Earth. Using this type of coordinate system speeds up execution, but of course is not precise.
+Calculates the minimal distance between two points where one point belongs to the first polygon and the second to another polygon. Spherical means that coordinates are interpreted as coordinates on a pure and ideal sphere, which is not true for the Earth. Using this type of coordinate system speeds up execution, but of course is not precise. 
 
 ### Example
 
diff --git a/docs/en/sql-reference/functions/hash-functions.md b/docs/en/sql-reference/functions/hash-functions.md
index 908e288cf59..7c977e7d6dc 100644
--- a/docs/en/sql-reference/functions/hash-functions.md
+++ b/docs/en/sql-reference/functions/hash-functions.md
@@ -688,40 +688,6 @@ SELECT kostikConsistentHash(16045690984833335023, 2);
 └───────────────────────────────────────────────┘
 ```
 
-## ripeMD160
-
-Produces [RIPEMD-160](https://en.wikipedia.org/wiki/RIPEMD) hash value.
-
-**Syntax**
-
-```sql
-ripeMD160(input)
-```
-
-**Parameters**
-
-- `input`: Input string. [String](../data-types/string.md)
-
-**Returned value**
-
-- A [UInt256](../data-types/int-uint.md) hash value where the 160-bit RIPEMD-160 hash is stored in the first 20 bytes. The remaining 12 bytes are zero-padded.
-
-**Example**
-
-Use the [hex](../functions/encoding-functions.md/#hex) function to represent the result as a hex-encoded string.
-
-Query:
-
-```sql
-SELECT hex(ripeMD160('The quick brown fox jumps over the lazy dog'));
-```
-
-```response
-┌─hex(ripeMD160('The quick brown fox jumps over the lazy dog'))─┐
-│ 37F332F68DB77BD9D7EDD4969571AD671CF9DD3B                      │
-└───────────────────────────────────────────────────────────────┘
-```
-
 ## murmurHash2_32, murmurHash2_64
 
 Produces a [MurmurHash2](https://github.com/aappleby/smhasher) hash value.
diff --git a/docs/en/sql-reference/functions/json-functions.md b/docs/en/sql-reference/functions/json-functions.md
index 26fe888ab49..7bff6a6cba5 100644
--- a/docs/en/sql-reference/functions/json-functions.md
+++ b/docs/en/sql-reference/functions/json-functions.md
@@ -1155,207 +1155,3 @@ SELECT jsonMergePatch('{"a":1}', '{"name": "joey"}', '{"name": "tom"}', '{"name"
 │ {"a":1,"name":"zoey"} │
 └───────────────────────┘
 ```
-
-### JSONAllPaths
-
-Returns the list of all paths stored in each row in [JSON](../data-types/newjson.md) column.
-
-**Syntax**
-
-``` sql
-JSONAllPaths(json)
-```
-
-**Arguments**
-
-- `json` — [JSON](../data-types/newjson.md).
-
-**Returned value**
-
-- An array of paths. [Array(String)](../data-types/array.md).
-
-**Example**
-
-``` sql
-CREATE TABLE test (json JSON(max_dynamic_paths=1)) ENGINE = Memory;
-INSERT INTO test FORMAT JSONEachRow {"json" : {"a" : 42}}, {"json" : {"b" : "Hello"}}, {"json" : {"a" : [1, 2, 3], "c" : "2020-01-01"}}
-SELECT json, JSONAllPaths(json) FROM test;
-```
-
-```text
-┌─json─────────────────────────────────┬─JSONAllPaths(json)─┐
-│ {"a":"42"}                           │ ['a']              │
-│ {"b":"Hello"}                        │ ['b']              │
-│ {"a":["1","2","3"],"c":"2020-01-01"} │ ['a','c']          │
-└──────────────────────────────────────┴────────────────────┘
-```
-
-### JSONAllPathsWithTypes
-
-Returns the map of all paths and their data types stored in each row in [JSON](../data-types/newjson.md) column.
-
-**Syntax**
-
-``` sql
-JSONAllPathsWithTypes(json)
-```
-
-**Arguments**
-
-- `json` — [JSON](../data-types/newjson.md).
-
-**Returned value**
-
-- An array of paths. [Map(String, String)](../data-types/array.md).
-
-**Example**
-
-``` sql
-CREATE TABLE test (json JSON(max_dynamic_paths=1)) ENGINE = Memory;
-INSERT INTO test FORMAT JSONEachRow {"json" : {"a" : 42}}, {"json" : {"b" : "Hello"}}, {"json" : {"a" : [1, 2, 3], "c" : "2020-01-01"}}
-SELECT json, JSONAllPathsWithTypes(json) FROM test;
-```
-
-```text
-┌─json─────────────────────────────────┬─JSONAllPathsWithTypes(json)───────────────┐
-│ {"a":"42"}                           │ {'a':'Int64'}                             │
-│ {"b":"Hello"}                        │ {'b':'String'}                            │
-│ {"a":["1","2","3"],"c":"2020-01-01"} │ {'a':'Array(Nullable(Int64))','c':'Date'} │
-└──────────────────────────────────────┴───────────────────────────────────────────┘
-```
-
-### JSONDynamicPaths
-
-Returns the list of dynamic paths that are stored as separate subcolumns in [JSON](../data-types/newjson.md) column.
-
-**Syntax**
-
-``` sql
-JSONDynamicPaths(json)
-```
-
-**Arguments**
-
-- `json` — [JSON](../data-types/newjson.md).
-
-**Returned value**
-
-- An array of paths. [Array(String)](../data-types/array.md).
-
-**Example**
-
-``` sql
-CREATE TABLE test (json JSON(max_dynamic_paths=1)) ENGINE = Memory;
-INSERT INTO test FORMAT JSONEachRow {"json" : {"a" : 42}}, {"json" : {"b" : "Hello"}}, {"json" : {"a" : [1, 2, 3], "c" : "2020-01-01"}}
-SELECT json, JSONDynamicPaths(json) FROM test;
-```
-
-```text
-┌─json─────────────────────────────────┬─JSONDynamicPaths(json)─┐
-| {"a":"42"}                           │ ['a']                  │
-│ {"b":"Hello"}                        │ []                     │
-│ {"a":["1","2","3"],"c":"2020-01-01"} │ ['a']                  │
-└──────────────────────────────────────┴────────────────────────┘
-```
-
-### JSONDynamicPathsWithTypes
-
-Returns the map of dynamic paths that are stored as separate subcolumns and their types in each row in [JSON](../data-types/newjson.md) column.
-
-**Syntax**
-
-``` sql
-JSONAllPathsWithTypes(json)
-```
-
-**Arguments**
-
-- `json` — [JSON](../data-types/newjson.md).
-
-**Returned value**
-
-- An array of paths. [Map(String, String)](../data-types/array.md).
-
-**Example**
-
-``` sql
-CREATE TABLE test (json JSON(max_dynamic_paths=1)) ENGINE = Memory;
-INSERT INTO test FORMAT JSONEachRow {"json" : {"a" : 42}}, {"json" : {"b" : "Hello"}}, {"json" : {"a" : [1, 2, 3], "c" : "2020-01-01"}}
-SELECT json, JSONDynamicPathsWithTypes(json) FROM test;
-```
-
-```text
-┌─json─────────────────────────────────┬─JSONDynamicPathsWithTypes(json)─┐
-│ {"a":"42"}                           │ {'a':'Int64'}                   │
-│ {"b":"Hello"}                        │ {}                              │
-│ {"a":["1","2","3"],"c":"2020-01-01"} │ {'a':'Array(Nullable(Int64))'}  │
-└──────────────────────────────────────┴─────────────────────────────────┘
-```
-
-### JSONSharedDataPaths
-
-Returns the list of paths that are stored in shared data structure in [JSON](../data-types/newjson.md) column.
-
-**Syntax**
-
-``` sql
-JSONSharedDataPaths(json)
-```
-
-**Arguments**
-
-- `json` — [JSON](../data-types/newjson.md).
-
-**Returned value**
-
-- An array of paths. [Array(String)](../data-types/array.md).
-
-**Example**
-
-``` sql
-CREATE TABLE test (json JSON(max_dynamic_paths=1)) ENGINE = Memory;
-INSERT INTO test FORMAT JSONEachRow {"json" : {"a" : 42}}, {"json" : {"b" : "Hello"}}, {"json" : {"a" : [1, 2, 3], "c" : "2020-01-01"}}
-SELECT json, JSONSharedDataPaths(json) FROM test;
-```
-
-```text
-┌─json─────────────────────────────────┬─JSONSharedDataPaths(json)─┐
-│ {"a":"42"}                           │ []                        │
-│ {"b":"Hello"}                        │ ['b']                     │
-│ {"a":["1","2","3"],"c":"2020-01-01"} │ ['c']                     │
-└──────────────────────────────────────┴───────────────────────────┘
-```
-
-### JSONSharedDataPathsWithTypes
-
-Returns the map of paths that are stored in shared data structure and their types in each row in [JSON](../data-types/newjson.md) column.
-
-**Syntax**
-
-``` sql
-JSONSharedDataPathsWithTypes(json)
-```
-
-**Arguments**
-
-- `json` — [JSON](../data-types/newjson.md).
-
-**Returned value**
-
-- An array of paths. [Map(String, String)](../data-types/array.md).
-
-**Example**
-
-``` sql
-CREATE TABLE test (json JSON(max_dynamic_paths=1)) ENGINE = Memory;
-INSERT INTO test FORMAT JSONEachRow {"json" : {"a" : 42}}, {"json" : {"b" : "Hello"}}, {"json" : {"a" : [1, 2, 3], "c" : "2020-01-01"}}
-SELECT json, JSONSharedDataPathsWithTypes(json) FROM test;
-```
-
-```text
-┌─json─────────────────────────────────┬─JSONSharedDataPathsWithTypes(json)─┐
-│ {"a":"42"}                           │ {}                                 │
-│ {"b":"Hello"}                        │ {'b':'String'}                     │
-│ {"a":["1","2","3"],"c":"2020-01-01"} │ {'c':'Date'}                       │
-└──────────────────────────────────────┴────────────────────────────────────┘
-```
diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index 1b50104da52..b7e4094f30e 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -346,9 +346,7 @@ Result:
 ## materialize
 
 Turns a constant into a full column containing a single value.
-Full columns and constants are represented differently in memory.
-Functions usually execute different code for normal and constant arguments, although the result should typically be the same. 
-This function can be used to debug this behavior.
+Full columns and constants are represented differently in memory. Functions usually execute different code for normal and constant arguments, although the result should typically be the same. This function can be used to debug this behavior.
 
 **Syntax**
 
@@ -356,34 +354,6 @@ This function can be used to debug this behavior.
 materialize(x)
 ```
 
-**Parameters**
-
-- `x` — A constant. [Constant](../functions/index.md/#constants).
-
-**Returned value**
-
-- A column containing a single value `x`.
-
-**Example**
-
-In the example below the `countMatches` function expects a constant second argument. 
-This behaviour can be debugged by using the `materialize` function to turn a constant into a full column, 
-verifying that the function throws an error for a non-constant argument.
-
-Query:
-
-```sql
-SELECT countMatches('foobarfoo', 'foo');
-SELECT countMatches('foobarfoo', materialize('foo'));
-```
-
-Result:
-
-```response
-2
-Code: 44. DB::Exception: Received from localhost:9000. DB::Exception: Illegal type of argument #2 'pattern' of function countMatches, expected constant String, got String
-```
-
 ## ignore
 
 Accepts any arguments, including `NULL` and does nothing. Always returns 0.
@@ -2132,14 +2102,14 @@ Result:
 └─────────────────┘
 ```
 
-## filesystemUnreserved
+## filesystemFree
 
-Returns the total amount of the free space on the filesystem hosting the database persistence. (previously `filesystemFree`). See also [`filesystemAvailable`](#filesystemavailable).
+Returns the total amount of the free space on the filesystem hosting the database persistence. See also `filesystemAvailable`
 
 **Syntax**
 
 ```sql
-filesystemUnreserved()
+filesystemFree()
 ```
 
 **Returned value**
@@ -2151,7 +2121,7 @@ filesystemUnreserved()
 Query:
 
 ```sql
-SELECT formatReadableSize(filesystemUnreserved()) AS "Free space";
+SELECT formatReadableSize(filesystemFree()) AS "Free space";
 ```
 
 Result:
@@ -2479,11 +2449,11 @@ As you can see, `runningAccumulate` merges states for each group of rows separat
 
 ## joinGet
 
-The function lets you extract data from the table the same way as from a [dictionary](../../sql-reference/dictionaries/index.md). Gets the data from [Join](../../engines/table-engines/special/join.md#creating-a-table) tables using the specified join key.
+The function lets you extract data from the table the same way as from a [dictionary](../../sql-reference/dictionaries/index.md).
+
+Gets the data from [Join](../../engines/table-engines/special/join.md#creating-a-table) tables using the specified join key.
 
-:::note
 Only supports tables created with the `ENGINE = Join(ANY, LEFT, <join_keys>)` statement.
-:::
 
 **Syntax**
 
@@ -2493,32 +2463,26 @@ joinGet(join_storage_table_name, `value_column`, join_keys)
 
 **Arguments**
 
-- `join_storage_table_name` — an [identifier](../../sql-reference/syntax.md#syntax-identifiers) indicating where the search is performed.
+- `join_storage_table_name` — an [identifier](../../sql-reference/syntax.md#syntax-identifiers) indicating where the search is performed. The identifier is searched in the default database (see setting `default_database` in the config file). To override the default database, use `USE db_name` or specify the database and the table through the separator `db_name.db_table` as in the example.
 - `value_column` — name of the column of the table that contains required data.
 - `join_keys` — list of keys.
 
-:::note
-The identifier is searched for in the default database (see setting `default_database` in the config file). To override the default database, use `USE db_name` or specify the database and the table through the separator `db_name.db_table` as in the example.
-:::
-
 **Returned value**
 
-- Returns a list of values corresponded to the list of keys.
+Returns a list of values corresponded to list of keys.
+
+If certain does not exist in source table then `0` or `null` will be returned based on [join_use_nulls](../../operations/settings/settings.md#join_use_nulls) setting.
 
-:::note
-If a certain key does not exist in source table then `0` or `null` will be returned based on [join_use_nulls](../../operations/settings/settings.md#join_use_nulls) setting during table creation.
 More info about `join_use_nulls` in [Join operation](../../engines/table-engines/special/join.md).
-:::
 
 **Example**
 
 Input table:
 
 ```sql
-CREATE DATABASE db_test;
-CREATE TABLE db_test.id_val(`id` UInt32, `val` UInt32) ENGINE = Join(ANY, LEFT, id);
-INSERT INTO db_test.id_val VALUES (1, 11)(2, 12)(4, 13);
-SELECT * FROM db_test.id_val;
+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
@@ -2532,116 +2496,18 @@ SELECT * FROM db_test.id_val;
 Query:
 
 ```sql
-SELECT number, joinGet(db_test.id_val, 'val', toUInt32(number)) from numbers(4);
+SELECT joinGet(db_test.id_val, 'val', toUInt32(number)) from numbers(4) SETTINGS join_use_nulls = 1
 ```
 
 Result:
 
 ```text
-   ┌─number─┬─joinGet('db_test.id_val', 'val', toUInt32(number))─┐
-1. │      0 │                                                  0 │
-2. │      1 │                                                 11 │
-3. │      2 │                                                 12 │
-4. │      3 │                                                  0 │
-   └────────┴────────────────────────────────────────────────────┘
-```
-
-Setting `join_use_nulls` can be used during table creation to change the behaviour of what gets returned if no key exists in the source table.
-
-```sql
-CREATE DATABASE db_test;
-CREATE TABLE db_test.id_val_nulls(`id` UInt32, `val` UInt32) ENGINE = Join(ANY, LEFT, id) SETTINGS join_use_nulls=1;
-INSERT INTO db_test.id_val_nulls VALUES (1, 11)(2, 12)(4, 13);
-SELECT * FROM db_test.id_val_nulls;
-```
-
-```text
-┌─id─┬─val─┐
-│  4 │  13 │
-│  2 │  12 │
-│  1 │  11 │
-└────┴─────┘
-```
-
-Query:
-
-```sql
-SELECT number, joinGet(db_test.id_val_nulls, 'val', toUInt32(number)) from numbers(4);
-```
-
-Result:
-
-```text
-   ┌─number─┬─joinGet('db_test.id_val_nulls', 'val', toUInt32(number))─┐
-1. │      0 │                                                     ᴺᵁᴸᴸ │
-2. │      1 │                                                       11 │
-3. │      2 │                                                       12 │
-4. │      3 │                                                     ᴺᵁᴸᴸ │
-   └────────┴──────────────────────────────────────────────────────────┘
-```
-
-## joinGetOrNull
-
-Like [joinGet](#joinget) but returns `NULL` when the key is missing instead of returning the default value.
-
-**Syntax**
-
-```sql
-joinGetOrNull(join_storage_table_name, `value_column`, join_keys)
-```
-
-**Arguments**
-
-- `join_storage_table_name` — an [identifier](../../sql-reference/syntax.md#syntax-identifiers) indicating where the search is performed. 
-- `value_column` — name of the column of the table that contains required data.
-- `join_keys` — list of keys.
-
-:::note
-The identifier is searched for in the default database (see setting `default_database` in the config file). To override the default database, use `USE db_name` or specify the database and the table through the separator `db_name.db_table` as in the example.
-:::
-
-**Returned value**
-
-- Returns a list of values corresponded to the list of keys.
-
-:::note
-If a certain key does not exist in source table then `NULL` is returned for that key.
-:::
-
-**Example**
-
-Input table:
-
-```sql
-CREATE DATABASE db_test;
-CREATE TABLE db_test.id_val(`id` UInt32, `val` UInt32) ENGINE = Join(ANY, LEFT, id);
-INSERT INTO db_test.id_val VALUES (1, 11)(2, 12)(4, 13);
-SELECT * FROM db_test.id_val;
-```
-
-```text
-┌─id─┬─val─┐
-│  4 │  13 │
-│  2 │  12 │
-│  1 │  11 │
-└────┴─────┘
-```
-
-Query:
-
-```sql
-SELECT number, joinGetOrNull(db_test.id_val, 'val', toUInt32(number)) from numbers(4);
-```
-
-Result:
-
-```text
-   ┌─number─┬─joinGetOrNull('db_test.id_val', 'val', toUInt32(number))─┐
-1. │      0 │                                                     ᴺᵁᴸᴸ │
-2. │      1 │                                                       11 │
-3. │      2 │                                                       12 │
-4. │      3 │                                                     ᴺᵁᴸᴸ │
-   └────────┴──────────────────────────────────────────────────────────┘
+┌─joinGet(db_test.id_val, 'val', toUInt32(number))─┐
+│                                                0 │
+│                                               11 │
+│                                               12 │
+│                                                0 │
+└──────────────────────────────────────────────────┘
 ```
 
 ## catboostEvaluate
@@ -4189,94 +4055,3 @@ Result:
 │                          32 │
 └─────────────────────────────┘
 ```
-
-## getSubcolumn
-
-Takes a table expression or identifier and constant string with the name of the sub-column, and returns the requested sub-column extracted from the expression.
-
-**Syntax**
-
-```sql
-getSubcolumn(col_name, subcol_name)
-```
-
-**Arguments**
-
-- `col_name` — Table expression or identifier. [Expression](../syntax.md/#expressions), [Identifier](../syntax.md/#identifiers).
-- `subcol_name` — The name of the sub-column. [String](../data-types/string.md).
-
-**Returned value**
-
-- Returns the extracted sub-column.
-
-**Example**
-
-Query:
-
-```sql
-CREATE TABLE t_arr (arr Array(Tuple(subcolumn1 UInt32, subcolumn2 String))) ENGINE = MergeTree ORDER BY tuple();
-INSERT INTO t_arr VALUES ([(1, 'Hello'), (2, 'World')]), ([(3, 'This'), (4, 'is'), (5, 'subcolumn')]);
-SELECT getSubcolumn(arr, 'subcolumn1'), getSubcolumn(arr, 'subcolumn2') FROM t_arr;
-```
-
-Result:
-
-```response
-   ┌─getSubcolumn(arr, 'subcolumn1')─┬─getSubcolumn(arr, 'subcolumn2')─┐
-1. │ [1,2]                           │ ['Hello','World']               │
-2. │ [3,4,5]                         │ ['This','is','subcolumn']       │
-   └─────────────────────────────────┴─────────────────────────────────┘
-```
-
-## getTypeSerializationStreams
-
-Enumerates stream paths of a data type.
-
-:::note
-This function is intended for use by developers.
-:::
-
-**Syntax**
-
-```sql
-getTypeSerializationStreams(col)
-```
-
-**Arguments**
-
-- `col` — Column or string representation of a data-type from which the data type will be detected.
-
-**Returned value**
-
-- Returns an array with all the serialization sub-stream paths.[Array](../data-types/array.md)([String](../data-types/string.md)).
-
-**Examples**
-
-Query:
-
-```sql
-SELECT getTypeSerializationStreams(tuple('a', 1, 'b', 2));
-```
-
-Result:
-
-```response
-   ┌─getTypeSerializationStreams(('a', 1, 'b', 2))─────────────────────────────────────────────────────────────────────────┐
-1. │ ['{TupleElement(1), Regular}','{TupleElement(2), Regular}','{TupleElement(3), Regular}','{TupleElement(4), Regular}'] │
-   └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
-Query:
-
-```sql
-SELECT getTypeSerializationStreams('Map(String, Int64)');
-```
-
-Result:
-
-```response
-   ┌─getTypeSerializationStreams('Map(String, Int64)')────────────────────────────────────────────────────────────────┐
-1. │ ['{ArraySizes}','{ArrayElements, TupleElement(keys), Regular}','{ArrayElements, TupleElement(values), Regular}'] │
-   └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-```
-
diff --git a/docs/en/sql-reference/functions/string-replace-functions.md b/docs/en/sql-reference/functions/string-replace-functions.md
index 3f50cd24f93..8793ebdd1a3 100644
--- a/docs/en/sql-reference/functions/string-replace-functions.md
+++ b/docs/en/sql-reference/functions/string-replace-functions.md
@@ -8,91 +8,6 @@ sidebar_label: Replacing in Strings
 
 [General strings functions](string-functions.md) and [functions for searching in strings](string-search-functions.md) are described separately.
 
-## overlay
-
-Replace part of the string `input` with another string `replace`, starting at the 1-based index `offset`.
-
-**Syntax**
-
-```sql
-overlay(s, replace, offset[, length])
-```
-
-**Parameters**
-
-- `s`: A string type [String](../data-types/string.md).
-- `replace`: A string type [String](../data-types/string.md).
-- `offset`: An integer type [Int](../data-types/int-uint.md) (1-based). If `offset` is negative, it is counted from the end of the string `s`.
-- `length`: Optional. An integer type [Int](../data-types/int-uint.md). `length` specifies the length of the snippet within the input string `s` to be replaced. If `length` is not specified, the number of bytes removed from `s` equals the length of `replace`; otherwise `length` bytes are removed.
-
-**Returned value**
-
-- A [String](../data-types/string.md) data type value.
-
-**Example**
-
-```sql
-SELECT overlay('My father is from Mexico.', 'mother', 4) AS res;
-```
-
-Result:
-
-```text
-┌─res──────────────────────┐
-│ My mother is from Mexico.│
-└──────────────────────────┘
-```
-
-```sql
-SELECT overlay('My father is from Mexico.', 'dad', 4, 6) AS res;
-```
-
-Result:
-
-```text
-┌─res───────────────────┐
-│ My dad is from Mexico.│
-└───────────────────────┘
-```
-
-## overlayUTF8
-
-Replace part of the string `input` with another string `replace`, starting at the 1-based index `offset`.
-
-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
-overlayUTF8(s, replace, offset[, length])
-```
-
-**Parameters**
-
-- `s`: A string type [String](../data-types/string.md).
-- `replace`: A string type [String](../data-types/string.md).
-- `offset`: An integer type [Int](../data-types/int-uint.md) (1-based). If `offset` is negative, it is counted from the end of the input string `s`.
-- `length`: Optional. An integer type [Int](../data-types/int-uint.md). `length` specifies the length of the snippet within the input string `s` to be replaced. If `length` is not specified, the number of characters removed from `s` equals the length of `replace`; otherwise `length` characters are removed.
-
-**Returned value**
-
-- A [String](../data-types/string.md) data type value.
-
-**Example**
-
-```sql
-SELECT overlay('Mein Vater ist aus Österreich.', 'der Türkei', 20) AS res;
-```
-
-Result:
-
-```text
-┌─res───────────────────────────┐
-│ Mein Vater ist aus der Türkei.│
-└───────────────────────────────┘
-```
-
 ## replaceOne
 
 Replaces the first occurrence of the substring `pattern` in `haystack` by the `replacement` string.
@@ -308,28 +223,3 @@ SELECT translateUTF8('Münchener Straße', 'üß', 'us') AS res;
 │ Munchener Strase │
 └──────────────────┘
 ```
-
-## printf
-
-The `printf` function formats the given string with the values (strings, integers, floating-points etc.) listed in the arguments, similar to printf function in C++. The format string can contain format specifiers starting with `%` character. Anything not contained in `%` and the following format specifier is considered literal text and copied verbatim into the output. Literal `%` character can be escaped by `%%`.
-
-**Syntax**
-
-``` sql
-printf(format, arg1, arg2, ...)
-```
-
-**Example**
-
-Query:
-
-``` sql
-select printf('%%%s %s %d', 'Hello', 'World', 2024);
-```
-
-
-``` response
-┌─printf('%%%s %s %d', 'Hello', 'World', 2024)─┐
-│ %Hello World 2024                            │
-└──────────────────────────────────────────────┘
-```
diff --git a/docs/en/sql-reference/functions/string-search-functions.md b/docs/en/sql-reference/functions/string-search-functions.md
index e9ff7ebf33b..b7ba1d4feb7 100644
--- a/docs/en/sql-reference/functions/string-search-functions.md
+++ b/docs/en/sql-reference/functions/string-search-functions.md
@@ -150,15 +150,15 @@ A case insensitive invariant of [position](#position).
 Query:
 
 ``` sql
-SELECT positionCaseInsensitive('Hello, world!', 'hello');
+SELECT position('Hello, world!', 'hello');
 ```
 
 Result:
 
 ``` text
-┌─positionCaseInsensitive('Hello, world!', 'hello')─┐
-│                                                 1 │
-└───────────────────────────────────────────────────┘
+┌─position('Hello, world!', 'hello')─┐
+│                                  0 │
+└────────────────────────────────────┘
 ```
 
 ## positionUTF8
diff --git a/docs/en/sql-reference/functions/tuple-map-functions.md b/docs/en/sql-reference/functions/tuple-map-functions.md
index d670ed42a2a..24b356eca87 100644
--- a/docs/en/sql-reference/functions/tuple-map-functions.md
+++ b/docs/en/sql-reference/functions/tuple-map-functions.md
@@ -43,7 +43,7 @@ Result:
 
 ## mapFromArrays
 
-Creates a map from an array or map of keys and an array or map of values.
+Creates a map from an array of keys and an array of values.
 
 The function is a convenient alternative to syntax `CAST([...], 'Map(key_type, value_type)')`.
 For example, instead of writing
@@ -62,8 +62,8 @@ Alias: `MAP_FROM_ARRAYS(keys, values)`
 
 **Arguments**
 
-- `keys` —  Array or map of keys to create the map from [Array](../data-types/array.md) or [Map](../data-types/map.md). If `keys` is an array, we accept `Array(Nullable(T))` or `Array(LowCardinality(Nullable(T)))` as its type as long as it doesn't contain NULL value.
-- `values`  - Array or map of values to create the map from [Array](../data-types/array.md) or [Map](../data-types/map.md).
+- `keys` —  Array of keys to create the map from. [Array(T)](../data-types/array.md) where `T` can be any type supported by [Map](../data-types/map.md) as key type.
+- `values`  - Array or map of values to create the map from. [Array](../data-types/array.md) or [Map](../data-types/map.md).
 
 **Returned value**
 
@@ -99,18 +99,6 @@ Result:
 └───────────────────────────────────────────────────────┘
 ```
 
-```sql
-SELECT mapFromArrays(map('a', 1, 'b', 2, 'c', 3), [1, 2, 3])
-```
-
-Result:
-
-```
-┌─mapFromArrays(map('a', 1, 'b', 2, 'c', 3), [1, 2, 3])─┐
-│ {('a',1):1,('b',2):2,('c',3):3}                       │
-└───────────────────────────────────────────────────────┘
-```
-
 ## extractKeyValuePairs
 
 Converts a string of key-value pairs to a [Map(String, String)](../data-types/map.md).
diff --git a/docs/en/sql-reference/functions/type-conversion-functions.md b/docs/en/sql-reference/functions/type-conversion-functions.md
index 0a40ddcc2c2..61e84ca72d1 100644
--- a/docs/en/sql-reference/functions/type-conversion-functions.md
+++ b/docs/en/sql-reference/functions/type-conversion-functions.md
@@ -49,3448 +49,157 @@ SETTINGS cast_keep_nullable = 1
 └──────────────────┴─────────────────────┴──────────────────┘
 ```
 
-## toBool
+## toInt(8\|16\|32\|64\|128\|256)
 
-Converts an input value to a value of type [`Bool`](../data-types/boolean.md). Throws an exception in case of an error.
+Converts an input value to a value the [Int](../data-types/int-uint.md) data type. This function family includes:
 
-**Syntax**
-
-```sql
-toBool(expr)
-```
+- `toInt8(expr)` — Converts to a value of data type `Int8`.
+- `toInt16(expr)` — Converts to a value of data type `Int16`.
+- `toInt32(expr)` — Converts to a value of data type `Int32`.
+- `toInt64(expr)` — Converts to a value of data type `Int64`.
+- `toInt128(expr)` — Converts to a value of data type `Int128`.
+- `toInt256(expr)` — Converts to a value of data type `Int256`.
 
 **Arguments**
 
-- `expr` — Expression returning a number or a string. [Expression](../syntax.md/#syntax-expressions).
-
-Supported arguments:
-- Values of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-- Strings `true` or `false` (case-insensitive).
+- `expr` — [Expression](../syntax.md/#syntax-expressions) returning a number or a string with the decimal representation of a number. Binary, octal, and hexadecimal representations of numbers are not supported. Leading zeroes are stripped.
 
 **Returned value**
 
-- Returns `true` or `false` based on evaluation of the argument. [Bool](../data-types/boolean.md).
+Integer value in the `Int8`, `Int16`, `Int32`, `Int64`, `Int128` or `Int256` data type.
 
-**Example**
+Functions use [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning they truncate fractional digits of numbers.
 
-Query:
-
-```sql
-SELECT
-    toBool(toUInt8(1)),
-    toBool(toInt8(-1)),
-    toBool(toFloat32(1.01)),
-    toBool('true'),
-    toBool('false'),
-    toBool('FALSE')
-FORMAT Vertical
-```
-
-Result:
-
-```response
-toBool(toUInt8(1)):      true
-toBool(toInt8(-1)):      true
-toBool(toFloat32(1.01)): true
-toBool('true'):          true
-toBool('false'):         false
-toBool('FALSE'):         false
-```
-
-## toInt8
-
-Converts an input value to a value of type [`Int8`](../data-types/int-uint.md). Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toInt8(expr)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt8('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int8](../data-types/int-uint.md), overflow or underflow of the result occurs. 
-This is not considered an error.  
-For example: `SELECT toInt8(128) == -128;`.
-:::
-
-**Returned value**
-
-- 8-bit integer value. [Int8](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toInt8(-8),
-    toInt8(-8.8),
-    toInt8('-8')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt8(-8):   -8
-toInt8(-8.8): -8
-toInt8('-8'): -8
-```
-
-**See also**
-
-- [`toInt8OrZero`](#toint8orzero).
-- [`toInt8OrNull`](#toint8ornull).
-- [`toInt8OrDefault`](#toint8ordefault).
-
-## toInt8OrZero
-
-Like [`toInt8`](#toint8), this function converts an input value to a value of type [Int8](../data-types/int-uint.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toInt8OrZero(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `0`):
-- String representations of ordinary Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt8OrZero('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int8](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 8-bit integer value if successful, otherwise `0`. [Int8](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers. 
-:::
+The behavior of functions for the [NaN and Inf](../data-types/float.md/#data_type-float-nan-inf) arguments is undefined. Remember about [numeric conversions issues](#common-issues-with-data-conversion), when using the functions.
 
 **Example**
 
 Query:
 
 ``` sql
-SELECT
-    toInt8OrZero('-8'),
-    toInt8OrZero('abc')
-FORMAT Vertical;
+SELECT toInt64(nan), toInt32(32), toInt16('16'), toInt8(8.8);
 ```
 
 Result:
 
 ```response
-Row 1:
-──────
-toInt8OrZero('-8'):  -8
-toInt8OrZero('abc'): 0
+┌─────────toInt64(nan)─┬─toInt32(32)─┬─toInt16('16')─┬─toInt8(8.8)─┐
+│ -9223372036854775808 │          32 │            16 │           8 │
+└──────────────────────┴─────────────┴───────────────┴─────────────┘
 ```
 
-**See also**
+## toInt(8\|16\|32\|64\|128\|256)OrZero
 
-- [`toInt8`](#toint8).
-- [`toInt8OrNull`](#toint8ornull).
-- [`toInt8OrDefault`](#toint8ordefault).
-
-## toInt8OrNull
-
-Like [`toInt8`](#toint8), this function converts an input value to a value of type [Int8](../data-types/int-uint.md) but returns `NULL` in case of an error.
-
-**Syntax**
-
-```sql
-toInt8OrNull(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `\N`)
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt8OrNull('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int8](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 8-bit integer value if successful, otherwise `NULL`. [Int8](../data-types/int-uint.md) / [NULL](../data-types/nullable.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
+Takes an argument of type [String](../data-types/string.md) and tries to parse it into an Int (8 \| 16 \| 32 \| 64 \| 128 \| 256). If unsuccessful, returns `0`.
 
 **Example**
 
 Query:
 
 ``` sql
-SELECT
-    toInt8OrNull('-8'),
-    toInt8OrNull('abc')
-FORMAT Vertical;
+SELECT toInt64OrZero('123123'), toInt8OrZero('123qwe123');
 ```
 
 Result:
 
 ```response
-Row 1:
-──────
-toInt8OrNull('-8'):  -8
-toInt8OrNull('abc'): ᴺᵁᴸᴸ
+┌─toInt64OrZero('123123')─┬─toInt8OrZero('123qwe123')─┐
+│                  123123 │                         0 │
+└─────────────────────────┴───────────────────────────┘
 ```
 
-**See also**
+## toInt(8\|16\|32\|64\|128\|256)OrNull
 
-- [`toInt8`](#toint8).
-- [`toInt8OrZero`](#toint8orzero).
-- [`toInt8OrDefault`](#toint8ordefault).
-
-## toInt8OrDefault
-
-Like [`toInt8`](#toint8), this function converts an input value to a value of type [Int8](../data-types/int-uint.md) but returns the default value in case of an error.
-If no `default` value is passed then `0` is returned in case of an error.
-
-**Syntax**
-
-```sql
-toInt8OrDefault(expr[, default])
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-- `default` (optional) — The default value to return if parsing to type `Int8` is unsuccessful. [Int8](../data-types/int-uint.md).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Arguments for which the default value is returned:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt8OrDefault('0xc0fe', CAST('-1', 'Int8'));`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int8](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 8-bit integer value if successful, otherwise returns the default value if passed or `0` if not. [Int8](../data-types/int-uint.md).
-
-:::note
-- The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-- The default value type should be the same as the cast type.
-:::
+It takes an argument of type String and tries to parse it into Int (8 \| 16 \| 32 \| 64 \| 128 \| 256). If unsuccessful, returns `NULL`.
 
 **Example**
 
 Query:
 
 ``` sql
-SELECT
-    toInt8OrDefault('-8', CAST('-1', 'Int8')),
-    toInt8OrDefault('abc', CAST('-1', 'Int8'))
-FORMAT Vertical;
+SELECT toInt64OrNull('123123'), toInt8OrNull('123qwe123');
 ```
 
 Result:
 
 ```response
-Row 1:
-──────
-toInt8OrDefault('-8', CAST('-1', 'Int8')):  -8
-toInt8OrDefault('abc', CAST('-1', 'Int8')): -1
+┌─toInt64OrNull('123123')─┬─toInt8OrNull('123qwe123')─┐
+│                  123123 │                      ᴺᵁᴸᴸ │
+└─────────────────────────┴───────────────────────────┘
 ```
 
-**See also**
+## toInt(8\|16\|32\|64\|128\|256)OrDefault
 
-- [`toInt8`](#toint8).
-- [`toInt8OrZero`](#toint8orzero).
-- [`toInt8OrNull`](#toint8orNull).
-
-## toInt16
-
-Converts an input value to a value of type [`Int16`](../data-types/int-uint.md). Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toInt16(expr)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt16('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int16](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.  
-For example: `SELECT toInt16(32768) == -32768;`.
-:::
-
-**Returned value**
-
-- 16-bit integer value. [Int16](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toInt16(-16),
-    toInt16(-16.16),
-    toInt16('-16')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt16(-16):    -16
-toInt16(-16.16): -16
-toInt16('-16'):  -16
-```
-
-**See also**
-
-- [`toInt16OrZero`](#toint16orzero).
-- [`toInt16OrNull`](#toint16ornull).
-- [`toInt16OrDefault`](#toint16ordefault).
-
-## toInt16OrZero
-
-Like [`toInt16`](#toint16), this function converts an input value to a value of type [Int16](../data-types/int-uint.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toInt16OrZero(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `0`):
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt16OrZero('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int16](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered as an error.
-:::
-
-**Returned value**
-
-- 16-bit integer value if successful, otherwise `0`. [Int16](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
+It takes an argument of type String and tries to parse it into Int (8 \| 16 \| 32 \| 64 \| 128 \| 256). If unsuccessful, returns the default type value.
 
 **Example**
 
 Query:
 
 ``` sql
-SELECT
-    toInt16OrZero('-16'),
-    toInt16OrZero('abc')
-FORMAT Vertical;
+SELECT toInt64OrDefault('123123', cast('-1' as Int64)), toInt8OrDefault('123qwe123', cast('-1' as Int8));
 ```
 
 Result:
 
 ```response
-Row 1:
-──────
-toInt16OrZero('-16'): -16
-toInt16OrZero('abc'): 0
+┌─toInt64OrDefault('123123', CAST('-1', 'Int64'))─┬─toInt8OrDefault('123qwe123', CAST('-1', 'Int8'))─┐
+│                                          123123 │                                               -1 │
+└─────────────────────────────────────────────────┴──────────────────────────────────────────────────┘
 ```
 
-**See also**
 
-- [`toInt16`](#toint16).
-- [`toInt16OrNull`](#toint16ornull).
-- [`toInt16OrDefault`](#toint16ordefault).
+## toUInt(8\|16\|32\|64\|256)
 
-## toInt16OrNull
+Converts an input value to the [UInt](../data-types/int-uint.md) data type. This function family includes:
 
-Like [`toInt16`](#toint16), this function converts an input value to a value of type [Int16](../data-types/int-uint.md) but returns `NULL` in case of an error.
-
-**Syntax**
-
-```sql
-toInt16OrNull(x)
-```
+- `toUInt8(expr)` — Converts to a value of data type `UInt8`.
+- `toUInt16(expr)` — Converts to a value of data type `UInt16`.
+- `toUInt32(expr)` — Converts to a value of data type `UInt32`.
+- `toUInt64(expr)` — Converts to a value of data type `UInt64`.
+- `toUInt256(expr)` — Converts to a value of data type `UInt256`.
 
 **Arguments**
 
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `\N`)
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt16OrNull('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int16](../data-types/int-uint.md), overflow or underflow of the result occurs. 
-This is not considered an error.
-:::
+- `expr` — [Expression](../syntax.md/#syntax-expressions) returning a number or a string with the decimal representation of a number. Binary, octal, and hexadecimal representations of numbers are not supported. Leading zeroes are stripped.
 
 **Returned value**
 
-- 16-bit integer value if successful, otherwise `NULL`. [Int16](../data-types/int-uint.md) / [NULL](../data-types/nullable.md).
+- Integer value in the `UInt8`, `UInt16`, `UInt32`, `UInt64` or `UInt256` data type.
 
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
+Functions use [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning they truncate fractional digits of numbers.
+
+The behavior of functions for negative arguments and for the [NaN and Inf](../data-types/float.md/#data_type-float-nan-inf) arguments is undefined. If you pass a string with a negative number, for example `'-32'`, ClickHouse raises an exception. Remember about [numeric conversions issues](#common-issues-with-data-conversion), when using the functions.
 
 **Example**
 
 Query:
 
 ``` sql
-SELECT
-    toInt16OrNull('-16'),
-    toInt16OrNull('abc')
-FORMAT Vertical;
+SELECT toUInt64(nan), toUInt32(-32), toUInt16('16'), toUInt8(8.8);
 ```
 
 Result:
 
 ```response
-Row 1:
-──────
-toInt16OrNull('-16'): -16
-toInt16OrNull('abc'): ᴺᵁᴸᴸ
+┌───────toUInt64(nan)─┬─toUInt32(-32)─┬─toUInt16('16')─┬─toUInt8(8.8)─┐
+│ 9223372036854775808 │    4294967264 │             16 │            8 │
+└─────────────────────┴───────────────┴────────────────┴──────────────┘
 ```
 
-**See also**
+## toUInt(8\|16\|32\|64\|256)OrZero
 
-- [`toInt16`](#toint16).
-- [`toInt16OrZero`](#toint16orzero).
-- [`toInt16OrDefault`](#toint16ordefault).
+## toUInt(8\|16\|32\|64\|256)OrNull
 
-## toInt16OrDefault
+## toUInt(8\|16\|32\|64\|256)OrDefault
 
-Like [`toInt16`](#toint16), this function converts an input value to a value of type [Int16](../data-types/int-uint.md) but returns the default value in case of an error.
-If no `default` value is passed then `0` is returned in case of an error.
+## toFloat(32\|64)
 
-**Syntax**
+## toFloat(32\|64)OrZero
 
-```sql
-toInt16OrDefault(expr[, default])
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-- `default` (optional) — The default value to return if parsing to type `Int16` is unsuccessful. [Int16](../data-types/int-uint.md).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Arguments for which the default value is returned:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt16OrDefault('0xc0fe', CAST('-1', 'Int16'));`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int16](../data-types/int-uint.md), overflow or underflow of the result occurs. 
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 16-bit integer value if successful, otherwise returns the default value if passed or `0` if not. [Int16](../data-types/int-uint.md).
-
-:::note
-- The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-- The default value type should be the same as the cast type.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toInt16OrDefault('-16', CAST('-1', 'Int16')),
-    toInt16OrDefault('abc', CAST('-1', 'Int16'))
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt16OrDefault('-16', CAST('-1', 'Int16')): -16
-toInt16OrDefault('abc', CAST('-1', 'Int16')): -1
-```
-
-**See also**
-
-- [`toInt16`](#toint16).
-- [`toInt16OrZero`](#toint16orzero).
-- [`toInt16OrNull`](#toint16ornull).
-
-## toInt32
-
-Converts an input value to a value of type [`Int32`](../data-types/int-uint.md). Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toInt32(expr)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt32('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int32](../data-types/int-uint.md), the result over or under flows. 
-This is not considered an error.  
-For example: `SELECT toInt32(2147483648) == -2147483648;`
-:::
-
-**Returned value**
-
-- 32-bit integer value. [Int32](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toInt32(-32),
-    toInt32(-32.32),
-    toInt32('-32')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt32(-32):    -32
-toInt32(-32.32): -32
-toInt32('-32'):  -32
-```
-
-**See also**
-
-- [`toInt32OrZero`](#toint32orzero).
-- [`toInt32OrNull`](#toint32ornull).
-- [`toInt32OrDefault`](#toint32ordefault).
-
-## toInt32OrZero
-
-Like [`toInt32`](#toint32), this function converts an input value to a value of type [Int32](../data-types/int-uint.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toInt32OrZero(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `0`):
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt32OrZero('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int32](../data-types/int-uint.md), overflow or underflow of the result occurs. 
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 32-bit integer value if successful, otherwise `0`. [Int32](../data-types/int-uint.md)
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncate fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toInt32OrZero('-32'),
-    toInt32OrZero('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt32OrZero('-32'): -32
-toInt32OrZero('abc'): 0
-```
-**See also**
-
-- [`toInt32`](#toint32).
-- [`toInt32OrNull`](#toint32ornull).
-- [`toInt32OrDefault`](#toint32ordefault).
-
-## toInt32OrNull
-
-Like [`toInt32`](#toint32), this function converts an input value to a value of type [Int32](../data-types/int-uint.md) but returns `NULL` in case of an error.
-
-**Syntax**
-
-```sql
-toInt32OrNull(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `\N`)
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt32OrNull('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int32](../data-types/int-uint.md), overflow or underflow of the result occurs. 
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 32-bit integer value if successful, otherwise `NULL`. [Int32](../data-types/int-uint.md) / [NULL](../data-types/nullable.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toInt32OrNull('-32'),
-    toInt32OrNull('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt32OrNull('-32'): -32
-toInt32OrNull('abc'): ᴺᵁᴸᴸ
-```
-
-**See also**
-
-- [`toInt32`](#toint32).
-- [`toInt32OrZero`](#toint32orzero).
-- [`toInt32OrDefault`](#toint32ordefault).
-
-## toInt32OrDefault
-
-Like [`toInt32`](#toint32), this function converts an input value to a value of type [Int32](../data-types/int-uint.md) but returns the default value in case of an error.
-If no `default` value is passed then `0` is returned in case of an error.
-
-**Syntax**
-
-```sql
-toInt32OrDefault(expr[, default])
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-- `default` (optional) — The default value to return if parsing to type `Int32` is unsuccessful. [Int32](../data-types/int-uint.md).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Arguments for which the default value is returned:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt32OrDefault('0xc0fe', CAST('-1', 'Int32'));`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int32](../data-types/int-uint.md), overflow or underflow of the result occurs. 
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 32-bit integer value if successful, otherwise returns the default value if passed or `0` if not. [Int32](../data-types/int-uint.md).
-
-:::note
-- The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-- The default value type should be the same as the cast type.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toInt32OrDefault('-32', CAST('-1', 'Int32')),
-    toInt32OrDefault('abc', CAST('-1', 'Int32'))
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt32OrDefault('-32', CAST('-1', 'Int32')): -32
-toInt32OrDefault('abc', CAST('-1', 'Int32')): -1
-```
-
-**See also**
-
-- [`toInt32`](#toint32).
-- [`toInt32OrZero`](#toint32orzero).
-- [`toInt32OrNull`](#toint32ornull).
-
-## toInt64
-
-Converts an input value to a value of type [`Int64`](../data-types/int-uint.md). Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toInt64(expr)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Unsupported types:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt64('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int64](../data-types/int-uint.md), the result over or under flows. 
-This is not considered an error.  
-For example: `SELECT toInt64(9223372036854775808) == -9223372036854775808;`
-:::
-
-**Returned value**
-
-- 64-bit integer value. [Int64](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toInt64(-64),
-    toInt64(-64.64),
-    toInt64('-64')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt64(-64):    -64
-toInt64(-64.64): -64
-toInt64('-64'):  -64
-```
-
-**See also**
-
-- [`toInt64OrZero`](#toint64orzero).
-- [`toInt64OrNull`](#toint64ornull).
-- [`toInt64OrDefault`](#toint64ordefault).
-
-## toInt64OrZero
-
-Like [`toInt64`](#toint64), this function converts an input value to a value of type [Int64](../data-types/int-uint.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toInt64OrZero(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `0`):
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt64OrZero('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int64](../data-types/int-uint.md), overflow or underflow of the result occurs. 
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 64-bit integer value if successful, otherwise `0`. [Int64](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toInt64OrZero('-64'),
-    toInt64OrZero('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt64OrZero('-64'): -64
-toInt64OrZero('abc'): 0
-```
-
-**See also**
-
-- [`toInt64`](#toint64).
-- [`toInt64OrNull`](#toint64ornull).
-- [`toInt64OrDefault`](#toint64ordefault).
-
-## toInt64OrNull
-
-Like [`toInt64`](#toint64), this function converts an input value to a value of type [Int64](../data-types/int-uint.md) but returns `NULL` in case of an error.
-
-**Syntax**
-
-```sql
-toInt64OrNull(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `\N`)
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt64OrNull('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int64](../data-types/int-uint.md), overflow or underflow of the result occurs. 
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 64-bit integer value if successful, otherwise `NULL`. [Int64](../data-types/int-uint.md) / [NULL](../data-types/nullable.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toInt64OrNull('-64'),
-    toInt64OrNull('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt64OrNull('-64'): -64
-toInt64OrNull('abc'): ᴺᵁᴸᴸ
-```
-
-**See also**
-
-- [`toInt64`](#toint64).
-- [`toInt64OrZero`](#toint64orzero).
-- [`toInt64OrDefault`](#toint64ordefault).
-
-## toInt64OrDefault
-
-Like [`toInt64`](#toint64), this function converts an input value to a value of type [Int64](../data-types/int-uint.md) but returns the default value in case of an error.
-If no `default` value is passed then `0` is returned in case of an error.
-
-**Syntax**
-
-```sql
-toInt64OrDefault(expr[, default])
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-- `default` (optional) — The default value to return if parsing to type `Int64` is unsuccessful. [Int64](../data-types/int-uint.md).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Arguments for which the default value is returned:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt64OrDefault('0xc0fe', CAST('-1', 'Int64'));`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int64](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 64-bit integer value if successful, otherwise returns the default value if passed or `0` if not. [Int64](../data-types/int-uint.md).
-
-:::note
-- The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-- The default value type should be the same as the cast type.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toInt64OrDefault('-64', CAST('-1', 'Int64')),
-    toInt64OrDefault('abc', CAST('-1', 'Int64'))
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt64OrDefault('-64', CAST('-1', 'Int64')): -64
-toInt64OrDefault('abc', CAST('-1', 'Int64')): -1
-```
-
-**See also**
-
-- [`toInt64`](#toint64).
-- [`toInt64OrZero`](#toint64orzero).
-- [`toInt64OrNull`](#toint64ornull).
-
-## toInt128
-
-Converts an input value to a value of type [`Int128`](../data-types/int-uint.md). Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toInt128(expr)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt128('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int128](../data-types/int-uint.md), the result over or under flows. 
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 128-bit integer value. [Int128](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toInt128(-128),
-    toInt128(-128.8),
-    toInt128('-128')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt128(-128):   -128
-toInt128(-128.8): -128
-toInt128('-128'): -128
-```
-
-**See also**
-
-- [`toInt128OrZero`](#toint128orzero).
-- [`toInt128OrNull`](#toint128ornull).
-- [`toInt128OrDefault`](#toint128ordefault).
-
-## toInt128OrZero
-
-Like [`toInt128`](#toint128), this function converts an input value to a value of type [Int128](../data-types/int-uint.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toInt128OrZero(expr)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `0`):
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt128OrZero('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int128](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 128-bit integer value if successful, otherwise `0`. [Int128](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toInt128OrZero('-128'),
-    toInt128OrZero('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt128OrZero('-128'): -128
-toInt128OrZero('abc'):  0
-```
-
-**See also**
-
-- [`toInt128`](#toint128).
-- [`toInt128OrNull`](#toint128ornull).
-- [`toInt128OrDefault`](#toint128ordefault).
-
-## toInt128OrNull
-
-Like [`toInt128`](#toint128), this function converts an input value to a value of type [Int128](../data-types/int-uint.md) but returns `NULL` in case of an error.
-
-**Syntax**
-
-```sql
-toInt128OrNull(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `\N`)
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt128OrNull('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int128](../data-types/int-uint.md), overflow or underflow of the result occurs. 
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 128-bit integer value if successful, otherwise `NULL`. [Int128](../data-types/int-uint.md) / [NULL](../data-types/nullable.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toInt128OrNull('-128'),
-    toInt128OrNull('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt128OrNull('-128'): -128
-toInt128OrNull('abc'):  ᴺᵁᴸᴸ
-```
-
-**See also**
-
-- [`toInt128`](#toint128).
-- [`toInt128OrZero`](#toint128orzero).
-- [`toInt128OrDefault`](#toint128ordefault).
-
-## toInt128OrDefault
-
-Like [`toInt128`](#toint128), this function converts an input value to a value of type [Int128](../data-types/int-uint.md) but returns the default value in case of an error.
-If no `default` value is passed then `0` is returned in case of an error.
-
-**Syntax**
-
-```sql
-toInt128OrDefault(expr[, default])
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-- `default` (optional) — The default value to return if parsing to type `Int128` is unsuccessful. [Int128](../data-types/int-uint.md).
-
-Supported arguments:
-- (U)Int8/16/32/64/128/256.
-- Float32/64.
-- String representations of (U)Int8/16/32/128/256.
-
-Arguments for which the default value is returned:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt128OrDefault('0xc0fe', CAST('-1', 'Int128'));`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int128](../data-types/int-uint.md), overflow or underflow of the result occurs. 
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 128-bit integer value if successful, otherwise returns the default value if passed or `0` if not. [Int128](../data-types/int-uint.md).
-
-:::note
-- The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-- The default value type should be the same as the cast type.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toInt128OrDefault('-128', CAST('-1', 'Int128')),
-    toInt128OrDefault('abc', CAST('-1', 'Int128'))
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt128OrDefault('-128', CAST('-1', 'Int128')): -128
-toInt128OrDefault('abc', CAST('-1', 'Int128')):  -1
-```
-
-**See also**
-
-- [`toInt128`](#toint128).
-- [`toInt128OrZero`](#toint128orzero).
-- [`toInt128OrNull`](#toint128ornull).
-
-## toInt256
-
-Converts an input value to a value of type [`Int256`](../data-types/int-uint.md). Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toInt256(expr)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt256('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int256](../data-types/int-uint.md), the result over or under flows. 
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 256-bit integer value. [Int256](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toInt256(-256),
-    toInt256(-256.256),
-    toInt256('-256')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt256(-256):     -256
-toInt256(-256.256): -256
-toInt256('-256'):   -256
-```
-
-**See also**
-
-- [`toInt256OrZero`](#toint256orzero).
-- [`toInt256OrNull`](#toint256ornull).
-- [`toInt256OrDefault`](#toint256ordefault).
-
-## toInt256OrZero
-
-Like [`toInt256`](#toint256), this function converts an input value to a value of type [Int256](../data-types/int-uint.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toInt256OrZero(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `0`):
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt256OrZero('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int256](../data-types/int-uint.md), overflow or underflow of the result occurs. 
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 256-bit integer value if successful, otherwise `0`. [Int256](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toInt256OrZero('-256'),
-    toInt256OrZero('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt256OrZero('-256'): -256
-toInt256OrZero('abc'):  0
-```
-
-**See also**
-
-- [`toInt256`](#toint256).
-- [`toInt256OrNull`](#toint256ornull).
-- [`toInt256OrDefault`](#toint256ordefault).
-
-## toInt256OrNull
-
-Like [`toInt256`](#toint256), this function converts an input value to a value of type [Int256](../data-types/int-uint.md) but returns `NULL` in case of an error.
-
-**Syntax**
-
-```sql
-toInt256OrNull(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `\N`)
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt256OrNull('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [Int256](../data-types/int-uint.md), overflow or underflow of the result occurs. 
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 256-bit integer value if successful, otherwise `NULL`. [Int256](../data-types/int-uint.md) / [NULL](../data-types/nullable.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toInt256OrNull('-256'),
-    toInt256OrNull('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt256OrNull('-256'): -256
-toInt256OrNull('abc'):  ᴺᵁᴸᴸ
-```
-
-**See also**
-
-- [`toInt256`](#toint256).
-- [`toInt256OrZero`](#toint256orzero).
-- [`toInt256OrDefault`](#toint256ordefault).
-
-## toInt256OrDefault
-
-Like [`toInt256`](#toint256), this function converts an input value to a value of type [Int256](../data-types/int-uint.md) but returns the default value in case of an error.
-If no `default` value is passed then `0` is returned in case of an error.
-
-**Syntax**
-
-```sql
-toInt256OrDefault(expr[, default])
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-- `default` (optional) — The default value to return if parsing to type `Int256` is unsuccessful. [Int256](../data-types/int-uint.md).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Arguments for which the default value is returned:
-- String representations of Float32/64 values, including `NaN` and `Inf`
-- String representations of binary and hexadecimal values, e.g. `SELECT toInt256OrDefault('0xc0fe', CAST('-1', 'Int256'));`
-
-:::note
-If the input value cannot be represented within the bounds of [Int256](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 256-bit integer value if successful, otherwise returns the default value if passed or `0` if not. [Int256](../data-types/int-uint.md).
-
-:::note
-- The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-- The default value type should be the same as the cast type.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toInt256OrDefault('-256', CAST('-1', 'Int256')),
-    toInt256OrDefault('abc', CAST('-1', 'Int256'))
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toInt256OrDefault('-256', CAST('-1', 'Int256')): -256
-toInt256OrDefault('abc', CAST('-1', 'Int256')):  -1
-```
-
-**See also**
-
-- [`toInt256`](#toint256).
-- [`toInt256OrZero`](#toint256orzero).
-- [`toInt256OrNull`](#toint256ornull).
-
-## toUInt8
-
-Converts an input value to a value of type [`UInt8`](../data-types/int-uint.md). Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toUInt8(expr)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt8('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt8](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.  
-For example: `SELECT toUInt8(256) == 0;`.
-:::
-
-**Returned value**
-
-- 8-bit unsigned integer value. [UInt8](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toUInt8(8),
-    toUInt8(8.8),
-    toUInt8('8')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt8(8):   8
-toUInt8(8.8): 8
-toUInt8('8'): 8
-```
-
-**See also**
-
-- [`toUInt8OrZero`](#touint8orzero).
-- [`toUInt8OrNull`](#touint8ornull).
-- [`toUInt8OrDefault`](#touint8ordefault).
-
-## toUInt8OrZero
-
-Like [`toUInt8`](#touint8), this function converts an input value to a value of type [UInt8](../data-types/int-uint.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toUInt8OrZero(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `0`):
-- String representations of ordinary Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt8OrZero('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt8](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 8-bit unsigned integer value if successful, otherwise `0`. [UInt8](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt8OrZero('-8'),
-    toUInt8OrZero('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt8OrZero('-8'):  0
-toUInt8OrZero('abc'): 0
-```
-
-**See also**
-
-- [`toUInt8`](#touint8).
-- [`toUInt8OrNull`](#touint8ornull).
-- [`toUInt8OrDefault`](#touint8ordefault).
-
-## toUInt8OrNull
-
-Like [`toUInt8`](#touint8), this function converts an input value to a value of type [UInt8](../data-types/int-uint.md) but returns `NULL` in case of an error.
-
-**Syntax**
-
-```sql
-toUInt8OrNull(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `\N`)
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt8OrNull('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt8](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 8-bit unsigned integer value if successful, otherwise `NULL`. [UInt8](../data-types/int-uint.md) / [NULL](../data-types/nullable.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt8OrNull('8'),
-    toUInt8OrNull('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt8OrNull('8'):   8
-toUInt8OrNull('abc'): ᴺᵁᴸᴸ
-```
-
-**See also**
-
-- [`toUInt8`](#touint8).
-- [`toUInt8OrZero`](#touint8orzero).
-- [`toUInt8OrDefault`](#touint8ordefault).
-
-## toUInt8OrDefault
-
-Like [`toUInt8`](#touint8), this function converts an input value to a value of type [UInt8](../data-types/int-uint.md) but returns the default value in case of an error.
-If no `default` value is passed then `0` is returned in case of an error.
-
-**Syntax**
-
-```sql
-toUInt8OrDefault(expr[, default])
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-- `default` (optional) — The default value to return if parsing to type `UInt8` is unsuccessful. [UInt8](../data-types/int-uint.md).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Arguments for which the default value is returned:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt8OrDefault('0xc0fe', CAST('0', 'UInt8'));`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt8](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 8-bit unsigned integer value if successful, otherwise returns the default value if passed or `0` if not. [UInt8](../data-types/int-uint.md).
-
-:::note
-- The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-- The default value type should be the same as the cast type.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt8OrDefault('8', CAST('0', 'UInt8')),
-    toUInt8OrDefault('abc', CAST('0', 'UInt8'))
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt8OrDefault('8', CAST('0', 'UInt8')):   8
-toUInt8OrDefault('abc', CAST('0', 'UInt8')): 0
-```
-
-**See also**
-
-- [`toUInt8`](#touint8).
-- [`toUInt8OrZero`](#touint8orzero).
-- [`toUInt8OrNull`](#touint8orNull).
-
-## toUInt16
-
-Converts an input value to a value of type [`UInt16`](../data-types/int-uint.md). Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toUInt16(expr)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt16('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt16](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.  
-For example: `SELECT toUInt16(65536) == 0;`.
-:::
-
-**Returned value**
-
-- 16-bit unsigned integer value. [UInt16](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toUInt16(16),
-    toUInt16(16.16),
-    toUInt16('16')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt16(16):    16
-toUInt16(16.16): 16
-toUInt16('16'):  16
-```
-
-**See also**
-
-- [`toUInt16OrZero`](#touint16orzero).
-- [`toUInt16OrNull`](#touint16ornull).
-- [`toUInt16OrDefault`](#touint16ordefault).
-
-## toUInt16OrZero
-
-Like [`toUInt16`](#touint16), this function converts an input value to a value of type [UInt16](../data-types/int-uint.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toUInt16OrZero(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `0`):
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt16OrZero('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt16](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered as an error.
-:::
-
-**Returned value**
-
-- 16-bit unsigned integer value if successful, otherwise `0`. [UInt16](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt16OrZero('16'),
-    toUInt16OrZero('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt16OrZero('16'):  16
-toUInt16OrZero('abc'): 0
-```
-
-**See also**
-
-- [`toUInt16`](#touint16).
-- [`toUInt16OrNull`](#touint16ornull).
-- [`toUInt16OrDefault`](#touint16ordefault).
-
-## toUInt16OrNull
-
-Like [`toUInt16`](#touint16), this function converts an input value to a value of type [UInt16](../data-types/int-uint.md) but returns `NULL` in case of an error.
-
-**Syntax**
-
-```sql
-toUInt16OrNull(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `\N`)
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt16OrNull('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt16](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 16-bit unsigned integer value if successful, otherwise `NULL`. [UInt16](../data-types/int-uint.md) / [NULL](../data-types/nullable.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt16OrNull('16'),
-    toUInt16OrNull('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt16OrNull('16'):  16
-toUInt16OrNull('abc'): ᴺᵁᴸᴸ
-```
-
-**See also**
-
-- [`toUInt16`](#touint16).
-- [`toUInt16OrZero`](#touint16orzero).
-- [`toUInt16OrDefault`](#touint16ordefault).
-
-## toUInt16OrDefault
-
-Like [`toUInt16`](#touint16), this function converts an input value to a value of type [UInt16](../data-types/int-uint.md) but returns the default value in case of an error.
-If no `default` value is passed then `0` is returned in case of an error.
-
-**Syntax**
-
-```sql
-toUInt16OrDefault(expr[, default])
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-- `default` (optional) — The default value to return if parsing to type `UInt16` is unsuccessful. [UInt16](../data-types/int-uint.md).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Arguments for which the default value is returned:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt16OrDefault('0xc0fe', CAST('0', 'UInt16'));`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt16](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 16-bit unsigned integer value if successful, otherwise returns the default value if passed or `0` if not. [UInt16](../data-types/int-uint.md).
-
-:::note
-- The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-- The default value type should be the same as the cast type.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt16OrDefault('16', CAST('0', 'UInt16')),
-    toUInt16OrDefault('abc', CAST('0', 'UInt16'))
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt16OrDefault('16', CAST('0', 'UInt16')):  16
-toUInt16OrDefault('abc', CAST('0', 'UInt16')): 0
-```
-
-**See also**
-
-- [`toUInt16`](#touint16).
-- [`toUInt16OrZero`](#touint16orzero).
-- [`toUInt16OrNull`](#touint16ornull).
-
-## toUInt32
-
-Converts an input value to a value of type [`UInt32`](../data-types/int-uint.md). Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toUInt32(expr)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt32('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt32](../data-types/int-uint.md), the result over or under flows.
-This is not considered an error.  
-For example: `SELECT toUInt32(4294967296) == 0;`
-:::
-
-**Returned value**
-
-- 32-bit unsigned integer value. [UInt32](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toUInt32(32),
-    toUInt32(32.32),
-    toUInt32('32')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt32(32):    32
-toUInt32(32.32): 32
-toUInt32('32'):  32
-```
-
-**See also**
-
-- [`toUInt32OrZero`](#touint32orzero).
-- [`toUInt32OrNull`](#touint32ornull).
-- [`toUInt32OrDefault`](#touint32ordefault).
-
-## toUInt32OrZero
-
-Like [`toUInt32`](#touint32), this function converts an input value to a value of type [UInt32](../data-types/int-uint.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toUInt32OrZero(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `0`):
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt32OrZero('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt32](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 32-bit unsigned integer value if successful, otherwise `0`. [UInt32](../data-types/int-uint.md)
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero)
-, meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt32OrZero('32'),
-    toUInt32OrZero('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt32OrZero('32'):  32
-toUInt32OrZero('abc'): 0
-```
-**See also**
-
-- [`toUInt32`](#touint32).
-- [`toUInt32OrNull`](#touint32ornull).
-- [`toUInt32OrDefault`](#touint32ordefault).
-
-## toUInt32OrNull
-
-Like [`toUInt32`](#touint32), this function converts an input value to a value of type [UInt32](../data-types/int-uint.md) but returns `NULL` in case of an error.
-
-**Syntax**
-
-```sql
-toUInt32OrNull(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `\N`)
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt32OrNull('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt32](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 32-bit unsigned integer value if successful, otherwise `NULL`. [UInt32](../data-types/int-uint.md) / [NULL](../data-types/nullable.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero)
-, meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt32OrNull('32'),
-    toUInt32OrNull('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt32OrNull('32'):  32
-toUInt32OrNull('abc'): ᴺᵁᴸᴸ
-```
-
-**See also**
-
-- [`toUInt32`](#touint32).
-- [`toUInt32OrZero`](#touint32orzero).
-- [`toUInt32OrDefault`](#touint32ordefault).
-
-## toUInt32OrDefault
-
-Like [`toUInt32`](#touint32), this function converts an input value to a value of type [UInt32](../data-types/int-uint.md) but returns the default value in case of an error.
-If no `default` value is passed then `0` is returned in case of an error.
-
-**Syntax**
-
-```sql
-toUInt32OrDefault(expr[, default])
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-- `default` (optional) — The default value to return if parsing to type `UInt32` is unsuccessful. [UInt32](../data-types/int-uint.md).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Arguments for which the default value is returned:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt32OrDefault('0xc0fe', CAST('0', 'UInt32'));`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt32](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 32-bit unsigned integer value if successful, otherwise returns the default value if passed or `0` if not. [UInt32](../data-types/int-uint.md).
-
-:::note
-- The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-- The default value type should be the same as the cast type.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt32OrDefault('32', CAST('0', 'UInt32')),
-    toUInt32OrDefault('abc', CAST('0', 'UInt32'))
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt32OrDefault('32', CAST('0', 'UInt32')):  32
-toUInt32OrDefault('abc', CAST('0', 'UInt32')): 0
-```
-
-**See also**
-
-- [`toUInt32`](#touint32).
-- [`toUInt32OrZero`](#touint32orzero).
-- [`toUInt32OrNull`](#touint32ornull).
-
-## toUInt64
-
-Converts an input value to a value of type [`UInt64`](../data-types/int-uint.md). Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toUInt64(expr)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Unsupported types:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt64('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt64](../data-types/int-uint.md), the result over or under flows.
-This is not considered an error.  
-For example: `SELECT toUInt64(18446744073709551616) == 0;`
-:::
-
-**Returned value**
-
-- 64-bit unsigned integer value. [UInt64](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toUInt64(64),
-    toUInt64(64.64),
-    toUInt64('64')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt64(64):    64
-toUInt64(64.64): 64
-toUInt64('64'):  64
-```
-
-**See also**
-
-- [`toUInt64OrZero`](#touint64orzero).
-- [`toUInt64OrNull`](#touint64ornull).
-- [`toUInt64OrDefault`](#touint64ordefault).
-
-## toUInt64OrZero
-
-Like [`toUInt64`](#touint64), this function converts an input value to a value of type [UInt64](../data-types/int-uint.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toUInt64OrZero(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `0`):
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt64OrZero('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt64](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 64-bit unsigned integer value if successful, otherwise `0`. [UInt64](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt64OrZero('64'),
-    toUInt64OrZero('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt64OrZero('64'):  64
-toUInt64OrZero('abc'): 0
-```
-
-**See also**
-
-- [`toUInt64`](#touint64).
-- [`toUInt64OrNull`](#touint64ornull).
-- [`toUInt64OrDefault`](#touint64ordefault).
-
-## toUInt64OrNull
-
-Like [`toUInt64`](#touint64), this function converts an input value to a value of type [UInt64](../data-types/int-uint.md) but returns `NULL` in case of an error.
-
-**Syntax**
-
-```sql
-toUInt64OrNull(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `\N`)
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt64OrNull('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt64](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 64-bit unsigned integer value if successful, otherwise `NULL`. [UInt64](../data-types/int-uint.md) / [NULL](../data-types/nullable.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt64OrNull('64'),
-    toUInt64OrNull('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt64OrNull('64'):  64
-toUInt64OrNull('abc'): ᴺᵁᴸᴸ
-```
-
-**See also**
-
-- [`toUInt64`](#touint64).
-- [`toUInt64OrZero`](#touint64orzero).
-- [`toUInt64OrDefault`](#touint64ordefault).
-
-## toUInt64OrDefault
-
-Like [`toUInt64`](#touint64), this function converts an input value to a value of type [UInt64](../data-types/int-uint.md) but returns the default value in case of an error.
-If no `default` value is passed then `0` is returned in case of an error.
-
-**Syntax**
-
-```sql
-toUInt64OrDefault(expr[, default])
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-- `defauult` (optional) — The default value to return if parsing to type `UInt64` is unsuccessful. [UInt64](../data-types/int-uint.md).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Arguments for which the default value is returned:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt64OrDefault('0xc0fe', CAST('0', 'UInt64'));`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt64](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 64-bit unsigned integer value if successful, otherwise returns the default value if passed or `0` if not. [UInt64](../data-types/int-uint.md).
-
-:::note
-- The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-- The default value type should be the same as the cast type.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt64OrDefault('64', CAST('0', 'UInt64')),
-    toUInt64OrDefault('abc', CAST('0', 'UInt64'))
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt64OrDefault('64', CAST('0', 'UInt64')):  64
-toUInt64OrDefault('abc', CAST('0', 'UInt64')): 0
-```
-
-**See also**
-
-- [`toUInt64`](#touint64).
-- [`toUInt64OrZero`](#touint64orzero).
-- [`toUInt64OrNull`](#touint64ornull).
-
-## toUInt128
-
-Converts an input value to a value of type [`UInt128`](../data-types/int-uint.md). Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toUInt128(expr)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt128('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt128](../data-types/int-uint.md), the result over or under flows.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 128-bit unsigned integer value. [UInt128](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toUInt128(128),
-    toUInt128(128.8),
-    toUInt128('128')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt128(128):   128
-toUInt128(128.8): 128
-toUInt128('128'): 128
-```
-
-**See also**
-
-- [`toUInt128OrZero`](#touint128orzero).
-- [`toUInt128OrNull`](#touint128ornull).
-- [`toUInt128OrDefault`](#touint128ordefault).
-
-## toUInt128OrZero
-
-Like [`toUInt128`](#touint128), this function converts an input value to a value of type [UInt128](../data-types/int-uint.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toUInt128OrZero(expr)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `0`):
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt128OrZero('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt128](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 128-bit unsigned integer value if successful, otherwise `0`. [UInt128](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt128OrZero('128'),
-    toUInt128OrZero('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt128OrZero('128'): 128
-toUInt128OrZero('abc'): 0
-```
-
-**See also**
-
-- [`toUInt128`](#touint128).
-- [`toUInt128OrNull`](#touint128ornull).
-- [`toUInt128OrDefault`](#touint128ordefault).
-
-## toUInt128OrNull
-
-Like [`toUInt128`](#touint128), this function converts an input value to a value of type [UInt128](../data-types/int-uint.md) but returns `NULL` in case of an error.
-
-**Syntax**
-
-```sql
-toUInt128OrNull(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `\N`)
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt128OrNull('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt128](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 128-bit unsigned integer value if successful, otherwise `NULL`. [UInt128](../data-types/int-uint.md) / [NULL](../data-types/nullable.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt128OrNull('128'),
-    toUInt128OrNull('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt128OrNull('128'): 128
-toUInt128OrNull('abc'): ᴺᵁᴸᴸ
-```
-
-**See also**
-
-- [`toUInt128`](#touint128).
-- [`toUInt128OrZero`](#touint128orzero).
-- [`toUInt128OrDefault`](#touint128ordefault).
-
-## toUInt128OrDefault
-
-Like [`toUInt128`](#toint128), this function converts an input value to a value of type [UInt128](../data-types/int-uint.md) but returns the default value in case of an error.
-If no `default` value is passed then `0` is returned in case of an error.
-
-**Syntax**
-
-```sql
-toUInt128OrDefault(expr[, default])
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-- `default` (optional) — The default value to return if parsing to type `UInt128` is unsuccessful. [UInt128](../data-types/int-uint.md).
-
-Supported arguments:
-- (U)Int8/16/32/64/128/256.
-- Float32/64.
-- String representations of (U)Int8/16/32/128/256.
-
-Arguments for which the default value is returned:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt128OrDefault('0xc0fe', CAST('0', 'UInt128'));`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt128](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 128-bit unsigned integer value if successful, otherwise returns the default value if passed or `0` if not. [UInt128](../data-types/int-uint.md).
-
-:::note
-- The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-- The default value type should be the same as the cast type.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt128OrDefault('128', CAST('0', 'UInt128')),
-    toUInt128OrDefault('abc', CAST('0', 'UInt128'))
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt128OrDefault('128', CAST('0', 'UInt128')): 128
-toUInt128OrDefault('abc', CAST('0', 'UInt128')): 0
-```
-
-**See also**
-
-- [`toUInt128`](#touint128).
-- [`toUInt128OrZero`](#touint128orzero).
-- [`toUInt128OrNull`](#touint128ornull).
-
-## toUInt256
-
-Converts an input value to a value of type [`UInt256`](../data-types/int-uint.md). Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toUInt256(expr)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt256('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt256](../data-types/int-uint.md), the result over or under flows.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 256-bit unsigned integer value. [Int256](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toUInt256(256),
-    toUInt256(256.256),
-    toUInt256('256')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt256(256):     256
-toUInt256(256.256): 256
-toUInt256('256'):   256
-```
-
-**See also**
-
-- [`toUInt256OrZero`](#touint256orzero).
-- [`toUInt256OrNull`](#touint256ornull).
-- [`toUInt256OrDefault`](#touint256ordefault).
-
-## toUInt256OrZero
-
-Like [`toUInt256`](#touint256), this function converts an input value to a value of type [UInt256](../data-types/int-uint.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toUInt256OrZero(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `0`):
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt256OrZero('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt256](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 256-bit unsigned integer value if successful, otherwise `0`. [UInt256](../data-types/int-uint.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt256OrZero('256'),
-    toUInt256OrZero('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt256OrZero('256'): 256
-toUInt256OrZero('abc'): 0
-```
-
-**See also**
-
-- [`toUInt256`](#touint256).
-- [`toUInt256OrNull`](#touint256ornull).
-- [`toUInt256OrDefault`](#touint256ordefault).
-
-## toUInt256OrNull
-
-Like [`toUInt256`](#touint256), this function converts an input value to a value of type [UInt256](../data-types/int-uint.md) but returns `NULL` in case of an error.
-
-**Syntax**
-
-```sql
-toUInt256OrNull(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256.
-
-Unsupported arguments (return `\N`)
-- String representations of Float32/64 values, including `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt256OrNull('0xc0fe');`.
-
-:::note
-If the input value cannot be represented within the bounds of [UInt256](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 256-bit unsigned integer value if successful, otherwise `NULL`. [UInt256](../data-types/int-uint.md) / [NULL](../data-types/nullable.md).
-
-:::note
-The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt256OrNull('256'),
-    toUInt256OrNull('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt256OrNull('256'): 256
-toUInt256OrNull('abc'): ᴺᵁᴸᴸ
-```
-
-**See also**
-
-- [`toUInt256`](#touint256).
-- [`toUInt256OrZero`](#touint256orzero).
-- [`toUInt256OrDefault`](#touint256ordefault).
-
-## toUInt256OrDefault
-
-Like [`toUInt256`](#touint256), this function converts an input value to a value of type [UInt256](../data-types/int-uint.md) but returns the default value in case of an error.
-If no `default` value is passed then `0` is returned in case of an error.
-
-**Syntax**
-
-```sql
-toUInt256OrDefault(expr[, default])
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-- `default` (optional) — The default value to return if parsing to type `UInt256` is unsuccessful. [UInt256](../data-types/int-uint.md).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values of type Float32/64.
-
-Arguments for which the default value is returned:
-- String representations of Float32/64 values, including `NaN` and `Inf`
-- String representations of binary and hexadecimal values, e.g. `SELECT toUInt256OrDefault('0xc0fe', CAST('0', 'UInt256'));`
-
-:::note
-If the input value cannot be represented within the bounds of [UInt256](../data-types/int-uint.md), overflow or underflow of the result occurs.
-This is not considered an error.
-:::
-
-**Returned value**
-
-- 256-bit unsigned integer value if successful, otherwise returns the default value if passed or `0` if not. [UInt256](../data-types/int-uint.md).
-
-:::note
-- The function uses [rounding towards zero](https://en.wikipedia.org/wiki/Rounding#Rounding_towards_zero), meaning it truncates fractional digits of numbers.
-- The default value type should be the same as the cast type.
-:::
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toUInt256OrDefault('-256', CAST('0', 'UInt256')),
-    toUInt256OrDefault('abc', CAST('0', 'UInt256'))
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toUInt256OrDefault('-256', CAST('0', 'UInt256')): 0
-toUInt256OrDefault('abc', CAST('0', 'UInt256')):  0
-```
-
-**See also**
-
-- [`toUInt256`](#touint256).
-- [`toUInt256OrZero`](#touint256orzero).
-- [`toUInt256OrNull`](#touint256ornull).
-
-## toFloat32
-
-Converts an input value to a value of type [`Float32`](../data-types/float.md). Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toFloat32(expr)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-
-Supported arguments:
-- Values of type (U)Int8/16/32/64/128/256.
-- String representations of (U)Int8/16/32/128/256.
-- Values of type Float32/64, including `NaN` and `Inf`.
-- String representations of Float32/64, including `NaN` and `Inf` (case-insensitive).
-
-Unsupported arguments:
-- String representations of binary and hexadecimal values, e.g. `SELECT toFloat32('0xc0fe');`.
-
-**Returned value**
-
-- 32-bit floating point value. [Float32](../data-types/float.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toFloat32(42.7),
-    toFloat32('42.7'),
-    toFloat32('NaN')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toFloat32(42.7):   42.7
-toFloat32('42.7'): 42.7
-toFloat32('NaN'):  nan
-```
-
-**See also**
-
-- [`toFloat32OrZero`](#tofloat32orzero).
-- [`toFloat32OrNull`](#tofloat32ornull).
-- [`toFloat32OrDefault`](#tofloat32ordefault).
-
-## toFloat32OrZero
-
-Like [`toFloat32`](#tofloat32), this function converts an input value to a value of type [Float32](../data-types/float.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toFloat32OrZero(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256, Float32/64.
-
-Unsupported arguments (return `0`):
-- String representations of binary and hexadecimal values, e.g. `SELECT toFloat32OrZero('0xc0fe');`.
-
-**Returned value**
-
-- 32-bit Float value if successful, otherwise `0`. [Float32](../data-types/float.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toFloat32OrZero('42.7'),
-    toFloat32OrZero('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toFloat32OrZero('42.7'): 42.7
-toFloat32OrZero('abc'):  0
-```
-
-**See also**
-
-- [`toFloat32`](#tofloat32).
-- [`toFloat32OrNull`](#tofloat32ornull).
-- [`toFloat32OrDefault`](#tofloat32ordefault).
-
-## toFloat32OrNull
-
-Like [`toFloat32`](#tofloat32), this function converts an input value to a value of type [Float32](../data-types/float.md) but returns `NULL` in case of an error.
-
-**Syntax**
-
-```sql
-toFloat32OrNull(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256, Float32/64.
-
-Unsupported arguments (return `\N`):
-- String representations of binary and hexadecimal values, e.g. `SELECT toFloat32OrNull('0xc0fe');`.
-
-**Returned value**
-
-- 32-bit Float value if successful, otherwise `\N`. [Float32](../data-types/float.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toFloat32OrNull('42.7'),
-    toFloat32OrNull('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toFloat32OrNull('42.7'): 42.7
-toFloat32OrNull('abc'):  ᴺᵁᴸᴸ
-```
-
-**See also**
-
-- [`toFloat32`](#tofloat32).
-- [`toFloat32OrZero`](#tofloat32orzero).
-- [`toFloat32OrDefault`](#tofloat32ordefault).
-
-## toFloat32OrDefault
-
-Like [`toFloat32`](#tofloat32), this function converts an input value to a value of type [Float32](../data-types/float.md) but returns the default value in case of an error.
-If no `default` value is passed then `0` is returned in case of an error.
-
-**Syntax**
-
-```sql
-toFloat32OrDefault(expr[, default])
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-- `default` (optional) — The default value to return if parsing to type `Float32` is unsuccessful. [Float32](../data-types/float.md).
-
-Supported arguments:
-- Values of type (U)Int8/16/32/64/128/256.
-- String representations of (U)Int8/16/32/128/256.
-- Values of type Float32/64, including `NaN` and `Inf`.
-- String representations of Float32/64, including `NaN` and `Inf` (case-insensitive).
-
-Arguments for which the default value is returned:
-- String representations of binary and hexadecimal values, e.g. `SELECT toFloat32OrDefault('0xc0fe', CAST('0', 'Float32'));`.
-
-**Returned value**
-
-- 32-bit Float value if successful, otherwise returns the default value if passed or `0` if not. [Float32](../data-types/float.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toFloat32OrDefault('8', CAST('0', 'Float32')),
-    toFloat32OrDefault('abc', CAST('0', 'Float32'))
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toFloat32OrDefault('8', CAST('0', 'Float32')):   8
-toFloat32OrDefault('abc', CAST('0', 'Float32')): 0
-```
-
-**See also**
-
-- [`toFloat32`](#tofloat32).
-- [`toFloat32OrZero`](#tofloat32orzero).
-- [`toFloat32OrNull`](#tofloat32ornull).
-
-## toFloat64
-
-Converts an input value to a value of type [`Float64`](../data-types/float.md). Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toFloat64(expr)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-
-Supported arguments:
-- Values of type (U)Int8/16/32/64/128/256.
-- String representations of (U)Int8/16/32/128/256.
-- Values of type Float32/64, including `NaN` and `Inf`.
-- String representations of type Float32/64, including `NaN` and `Inf` (case-insensitive).
-
-Unsupported arguments:
-- String representations of binary and hexadecimal values, e.g. `SELECT toFloat64('0xc0fe');`.
-
-**Returned value**
-
-- 64-bit floating point value. [Float64](../data-types/float.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toFloat64(42.7),
-    toFloat64('42.7'),
-    toFloat64('NaN')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toFloat64(42.7):   42.7
-toFloat64('42.7'): 42.7
-toFloat64('NaN'):  nan
-```
-
-**See also**
-
-- [`toFloat64OrZero`](#tofloat64orzero).
-- [`toFloat64OrNull`](#tofloat64ornull).
-- [`toFloat64OrDefault`](#tofloat64ordefault).
-
-## toFloat64OrZero
-
-Like [`toFloat64`](#tofloat64), this function converts an input value to a value of type [Float64](../data-types/float.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toFloat64OrZero(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256, Float32/64.
-
-Unsupported arguments (return `0`):
-- String representations of binary and hexadecimal values, e.g. `SELECT toFloat64OrZero('0xc0fe');`.
-
-**Returned value**
-
-- 64-bit Float value if successful, otherwise `0`. [Float64](../data-types/float.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toFloat64OrZero('42.7'),
-    toFloat64OrZero('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toFloat64OrZero('42.7'): 42.7
-toFloat64OrZero('abc'):  0
-```
-
-**See also**
-
-- [`toFloat64`](#tofloat64).
-- [`toFloat64OrNull`](#tofloat64ornull).
-- [`toFloat64OrDefault`](#tofloat64ordefault).
-
-## toFloat64OrNull
-
-Like [`toFloat64`](#tofloat64), this function converts an input value to a value of type [Float64](../data-types/float.md) but returns `NULL` in case of an error.
-
-**Syntax**
-
-```sql
-toFloat64OrNull(x)
-```
-
-**Arguments**
-
-- `x` — A String representation of a number. [String](../data-types/string.md).
-
-Supported arguments:
-- String representations of (U)Int8/16/32/128/256, Float32/64.
-
-Unsupported arguments (return `\N`):
-- String representations of binary and hexadecimal values, e.g. `SELECT toFloat64OrNull('0xc0fe');`.
-
-**Returned value**
-
-- 64-bit Float value if successful, otherwise `\N`. [Float64](../data-types/float.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toFloat64OrNull('42.7'),
-    toFloat64OrNull('abc')
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toFloat64OrNull('42.7'): 42.7
-toFloat64OrNull('abc'):  ᴺᵁᴸᴸ
-```
-
-**See also**
-
-- [`toFloat64`](#tofloat64).
-- [`toFloat64OrZero`](#tofloat64orzero).
-- [`toFloat64OrDefault`](#tofloat64ordefault).
-
-## toFloat64OrDefault
-
-Like [`toFloat64`](#tofloat64), this function converts an input value to a value of type [Float64](../data-types/float.md) but returns the default value in case of an error.
-If no `default` value is passed then `0` is returned in case of an error.
-
-**Syntax**
-
-```sql
-toFloat64OrDefault(expr[, default])
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions) / [String](../data-types/string.md).
-- `default` (optional) — The default value to return if parsing to type `Float64` is unsuccessful. [Float64](../data-types/float.md).
-
-Supported arguments:
-- Values of type (U)Int8/16/32/64/128/256.
-- String representations of (U)Int8/16/32/128/256.
-- Values of type Float32/64, including `NaN` and `Inf`.
-- String representations of Float32/64, including `NaN` and `Inf` (case-insensitive).
-
-Arguments for which the default value is returned:
-- String representations of binary and hexadecimal values, e.g. `SELECT toFloat64OrDefault('0xc0fe', CAST('0', 'Float64'));`.
-
-**Returned value**
-
-- 64-bit Float value if successful, otherwise returns the default value if passed or `0` if not. [Float64](../data-types/float.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toFloat64OrDefault('8', CAST('0', 'Float64')),
-    toFloat64OrDefault('abc', CAST('0', 'Float64'))
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-toFloat64OrDefault('8', CAST('0', 'Float64')):   8
-toFloat64OrDefault('abc', CAST('0', 'Float64')): 0
-```
-
-**See also**
+## toFloat(32\|64)OrNull
 
-- [`toFloat64`](#tofloat64).
-- [`toFloat64OrZero`](#tofloat64orzero).
-- [`toFloat64OrNull`](#tofloat64ornull).
+## toFloat(32\|64)OrDefault
 
 ## toDate
 
@@ -3906,7 +615,7 @@ Result:
 
 ## toDateTime64
 
-Converts an input value to a value of type [DateTime64](../data-types/datetime64.md).
+Converts the argument to the [DateTime64](../data-types/datetime64.md) data type.
 
 **Syntax**
 
@@ -3918,7 +627,7 @@ toDateTime64(expr, scale, [timezone])
 
 - `expr` — The value. [String](../data-types/string.md), [UInt32](../data-types/int-uint.md), [Float](../data-types/float.md) or [DateTime](../data-types/datetime.md).
 - `scale` - Tick size (precision): 10<sup>-precision</sup> seconds. Valid range: [ 0 : 9 ].
-- `timezone` (optional) - Time zone of the specified datetime64 object.
+- `timezone` - Time zone of the specified datetime64 object.
 
 **Returned value**
 
@@ -3977,1153 +686,179 @@ SELECT toDateTime64('2019-01-01 00:00:00', 3, 'Asia/Istanbul') AS value, toTypeN
 
 ## toDateTime64OrZero
 
-Like [toDateTime64](#todatetime64), this function converts an input value to a value of type [DateTime64](../data-types/datetime64.md) but returns the min value of [DateTime64](../data-types/datetime64.md) if an invalid argument is received.
-
-**Syntax**
-
-``` sql
-toDateTime64OrZero(expr, scale, [timezone])
-```
-
-**Arguments**
-
-- `expr` — The value. [String](../data-types/string.md), [UInt32](../data-types/int-uint.md), [Float](../data-types/float.md) or [DateTime](../data-types/datetime.md).
-- `scale` - Tick size (precision): 10<sup>-precision</sup> seconds. Valid range: [ 0 : 9 ].
-- `timezone` (optional) - Time zone of the specified DateTime64 object.
-
-**Returned value**
-
-- A calendar date and time of day, with sub-second precision, otherwise the minimum value of `DateTime64`: `1970-01-01 01:00:00.000`. [DateTime64](../data-types/datetime64.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT toDateTime64OrZero('2008-10-12 00:00:00 00:30:30', 3) AS invalid_arg
-```
-
-Result:
-
-```response
-┌─────────────invalid_arg─┐
-│ 1970-01-01 01:00:00.000 │
-└─────────────────────────┘
-```
-
-**See also**
-
-- [toDateTime64](#todatetime64).
-- [toDateTime64OrNull](#todatetime64ornull).
-- [toDateTime64OrDefault](#todatetime64ordefault).
-
 ## toDateTime64OrNull
 
-Like [toDateTime64](#todatetime64), this function converts an input value to a value of type [DateTime64](../data-types/datetime64.md) but returns `NULL` if an invalid argument is received.
-
-**Syntax**
-
-``` sql
-toDateTime64OrNull(expr, scale, [timezone])
-```
-
-**Arguments**
-
-- `expr` — The value. [String](../data-types/string.md), [UInt32](../data-types/int-uint.md), [Float](../data-types/float.md) or [DateTime](../data-types/datetime.md).
-- `scale` - Tick size (precision): 10<sup>-precision</sup> seconds. Valid range: [ 0 : 9 ].
-- `timezone` (optional) - Time zone of the specified DateTime64 object.
-
-**Returned value**
-
-- A calendar date and time of day, with sub-second precision, otherwise `NULL`. [DateTime64](../data-types/datetime64.md)/[NULL](../data-types/nullable.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toDateTime64OrNull('1976-10-18 00:00:00.30', 3) AS valid_arg,
-    toDateTime64OrNull('1976-10-18 00:00:00 30', 3) AS invalid_arg
-```
-
-Result:
-
-```response
-┌───────────────valid_arg─┬─invalid_arg─┐
-│ 1976-10-18 00:00:00.300 │        ᴺᵁᴸᴸ │
-└─────────────────────────┴─────────────┘
-```
-
-**See also**
-
-- [toDateTime64](#todatetime64).
-- [toDateTime64OrZero](#todatetime64orzero).
-- [toDateTime64OrDefault](#todatetime64ordefault).
-
 ## toDateTime64OrDefault
 
-Like [toDateTime64](#todatetime64), this function converts an input value to a value of type [DateTime64](../data-types/datetime64.md), 
-but returns either the default value of [DateTime64](../data-types/datetime64.md)
-or the provided default if an invalid argument is received.
+## toDecimal(32\|64\|128\|256)
 
-**Syntax**
+Converts `value` to the [Decimal](../data-types/decimal.md) data type with precision of `S`. The `value` can be a number or a string. The `S` (scale) parameter specifies the number of decimal places.
 
-``` sql
-toDateTime64OrNull(expr, scale, [timezone, default])
-```
+- `toDecimal32(value, S)`
+- `toDecimal64(value, S)`
+- `toDecimal128(value, S)`
+- `toDecimal256(value, S)`
+
+## toDecimal(32\|64\|128\|256)OrNull
+
+Converts an input string to a [Nullable(Decimal(P,S))](../data-types/decimal.md) data type value. This family of functions includes:
+
+- `toDecimal32OrNull(expr, S)` — Results in `Nullable(Decimal32(S))` data type.
+- `toDecimal64OrNull(expr, S)` — Results in `Nullable(Decimal64(S))` data type.
+- `toDecimal128OrNull(expr, S)` — Results in `Nullable(Decimal128(S))` data type.
+- `toDecimal256OrNull(expr, S)` — Results in `Nullable(Decimal256(S))` data type.
+
+These functions should be used instead of `toDecimal*()` functions, if you prefer to get a `NULL` value instead of an exception in the event of an input value parsing error.
 
 **Arguments**
 
-- `expr` — The value. [String](../data-types/string.md), [UInt32](../data-types/int-uint.md), [Float](../data-types/float.md) or [DateTime](../data-types/datetime.md).
-- `scale` - Tick size (precision): 10<sup>-precision</sup> seconds. Valid range: [ 0 : 9 ].
-- `timezone` (optional) - Time zone of the specified DateTime64 object.
-- `default` (optional) - Default value to return if an invalid argument is received. [DateTime64](../data-types/datetime64.md).
+- `expr` — [Expression](../syntax.md/#syntax-expressions), returns a value in the [String](../data-types/string.md) data type. ClickHouse expects the textual representation of the decimal number. For example, `'1.111'`.
+- `S` — Scale, the number of decimal places in the resulting value.
 
 **Returned value**
 
-- A calendar date and time of day, with sub-second precision, otherwise the minimum value of `DateTime64` or the `default` value if provided. [DateTime64](../data-types/datetime64.md).
+A value in the `Nullable(Decimal(P,S))` data type. The value contains:
 
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toDateTime64OrDefault('1976-10-18 00:00:00 30', 3) AS invalid_arg,
-    toDateTime64OrDefault('1976-10-18 00:00:00 30', 3, 'UTC', toDateTime64('2001-01-01 00:00:00.00',3)) AS invalid_arg_with_default
-```
-
-Result:
-
-```response
-┌─────────────invalid_arg─┬─invalid_arg_with_default─┐
-│ 1970-01-01 01:00:00.000 │  2000-12-31 23:00:00.000 │
-└─────────────────────────┴──────────────────────────┘
-```
-
-**See also**
-
-- [toDateTime64](#todatetime64).
-- [toDateTime64OrZero](#todatetime64orzero).
-- [toDateTime64OrNull](#todatetime64ornull).
-
-## toDecimal32
-
-Converts an input value to a value of type [`Decimal(9, S)`](../data-types/decimal.md) with scale of `S`. Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toDecimal32(expr, S)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-- `S` — Scale parameter between 0 and 9, specifying how many digits the fractional part of a number can have. [UInt8](../data-types/int-uint.md).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values or string representations of type Float32/64.
-
-Unsupported arguments:
-- Values or string representations of Float32/64 values `NaN` and `Inf` (case-insensitive).
-- String representations of binary and hexadecimal values, e.g. `SELECT toDecimal32('0xc0fe', 1);`.
-
-:::note
-An overflow can occur if the value of `expr` exceeds the bounds of `Decimal32`: `( -1 * 10^(9 - S), 1 * 10^(9 - S) )`. 
-Excessive digits in a fraction are discarded (not rounded). 
-Excessive digits in the integer part will lead to an exception.
-:::
-
-**Returned value**
-
-- Value of type `Decimal(9, S)`. [Decimal32(S)](../data-types/int-uint.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toDecimal32(2, 1) AS a, toTypeName(a) AS type_a,
-    toDecimal32(4.2, 2) AS b, toTypeName(b) AS type_b,
-    toDecimal32('4.2', 3) AS c, toTypeName(c) AS type_c
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-a:      2
-type_a: Decimal(9, 1)
-b:      4.2
-type_b: Decimal(9, 2)
-c:      4.2
-type_c: Decimal(9, 3)
-```
-
-**See also**
-
-- [`toDecimal32OrZero`](#todecimal32orzero).
-- [`toDecimal32OrNull`](#todecimal32ornull).
-- [`toDecimal32OrDefault`](#todecimal32ordefault).
-
-## toDecimal32OrZero
-
-Like [`toDecimal32`](#todecimal32), this function converts an input value to a value of type [Decimal(9, S)](../data-types/decimal.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toDecimal32OrZero(expr, S)
-```
-
-**Arguments**
-
-- `expr` — A String representation of a number. [String](../data-types/string.md).
-- `S` — Scale parameter between 0 and 9, specifying how many digits the fractional part of a number can have. [UInt8](../data-types/int-uint.md).
-
-Supported arguments:
-- String representations of type (U)Int8/16/32/64/128/256.
-- String representations of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toDecimal32OrZero('0xc0fe', 1);`.
-
-:::note
-An overflow can occur if the value of `expr` exceeds the bounds of `Decimal32`: `( -1 * 10^(9 - S), 1 * 10^(9 - S) )`.
-Excessive digits in a fraction are discarded (not rounded).
-Excessive digits in the integer part will lead to an error.
-:::
-
-**Returned value**
-
-- Value of type `Decimal(9, S)` if successful, otherwise `0` with `S` decimal places. [Decimal32(S)](../data-types/decimal.md).
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toDecimal32OrZero(toString(-1.111), 5) AS a,
-    toTypeName(a),
-    toDecimal32OrZero(toString('Inf'), 5) as b,
-    toTypeName(b)
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-a:             -1.111
-toTypeName(a): Decimal(9, 5)
-b:             0
-toTypeName(b): Decimal(9, 5)
-```
-
-**See also**
-
-- [`toDecimal32`](#todecimal32).
-- [`toDecimal32OrNull`](#todecimal32ornull).
-- [`toDecimal32OrDefault`](#todecimal32ordefault).
-
-## toDecimal32OrNull
-
-Like [`toDecimal32`](#todecimal32), this function converts an input value to a value of type [Nullable(Decimal(9, S))](../data-types/decimal.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toDecimal32OrNull(expr, S)
-```
-
-**Arguments**
-
-- `expr` — A String representation of a number. [String](../data-types/string.md).
-- `S` — Scale parameter between 0 and 9, specifying how many digits the fractional part of a number can have. [UInt8](../data-types/int-uint.md).
-
-Supported arguments:
-- String representations of type (U)Int8/16/32/64/128/256.
-- String representations of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toDecimal32OrNull('0xc0fe', 1);`.
-
-:::note
-An overflow can occur if the value of `expr` exceeds the bounds of `Decimal32`: `( -1 * 10^(9 - S), 1 * 10^(9 - S) )`.
-Excessive digits in a fraction are discarded (not rounded).
-Excessive digits in the integer part will lead to an error.
-:::
-
-**Returned value**
-
-- Value of type `Nullable(Decimal(9, S))` if successful, otherwise value `NULL` of the same type. [Decimal32(S)](../data-types/decimal.md).
+- Number with `S` decimal places, if ClickHouse interprets the input string as a number.
+- `NULL`, if ClickHouse can’t interpret the input string as a number or if the input number contains more than `S` decimal places.
 
 **Examples**
 
 Query:
 
 ``` sql
-SELECT
-    toDecimal32OrNull(toString(-1.111), 5) AS a,
-    toTypeName(a),
-    toDecimal32OrNull(toString('Inf'), 5) as b,
-    toTypeName(b)
-FORMAT Vertical;
+SELECT toDecimal32OrNull(toString(-1.111), 5) AS val, toTypeName(val);
 ```
 
 Result:
 
 ```response
-Row 1:
-──────
-a:             -1.111
-toTypeName(a): Nullable(Decimal(9, 5))
-b:             ᴺᵁᴸᴸ
-toTypeName(b): Nullable(Decimal(9, 5))
+┌────val─┬─toTypeName(toDecimal32OrNull(toString(-1.111), 5))─┐
+│ -1.111 │ Nullable(Decimal(9, 5))                            │
+└────────┴────────────────────────────────────────────────────┘
 ```
 
-**See also**
+Query:
 
-- [`toDecimal32`](#todecimal32).
-- [`toDecimal32OrZero`](#todecimal32orzero).
-- [`toDecimal32OrDefault`](#todecimal32ordefault).
-
-## toDecimal32OrDefault
-
-Like [`toDecimal32`](#todecimal32), this function converts an input value to a value of type [Decimal(9, S)](../data-types/decimal.md) but returns the default value in case of an error.
-
-**Syntax**
-
-```sql
-toDecimal32OrDefault(expr, S[, default])
+``` sql
+SELECT toDecimal32OrNull(toString(-1.111), 2) AS val, toTypeName(val);
 ```
 
+Result:
+
+```response
+┌──val─┬─toTypeName(toDecimal32OrNull(toString(-1.111), 2))─┐
+│ ᴺᵁᴸᴸ │ Nullable(Decimal(9, 2))                            │
+└──────┴────────────────────────────────────────────────────┘
+```
+
+
+## toDecimal(32\|64\|128\|256)OrDefault
+
+Converts an input string to a [Decimal(P,S)](../data-types/decimal.md) data type value. This family of functions includes:
+
+- `toDecimal32OrDefault(expr, S)` — Results in `Decimal32(S)` data type.
+- `toDecimal64OrDefault(expr, S)` — Results in `Decimal64(S)` data type.
+- `toDecimal128OrDefault(expr, S)` — Results in `Decimal128(S)` data type.
+- `toDecimal256OrDefault(expr, S)` — Results in `Decimal256(S)` data type.
+
+These functions should be used instead of `toDecimal*()` functions, if you prefer to get a default value instead of an exception in the event of an input value parsing error.
+
 **Arguments**
 
-- `expr` — A String representation of a number. [String](../data-types/string.md).
-- `S` — Scale parameter between 0 and 9, specifying how many digits the fractional part of a number can have. [UInt8](../data-types/int-uint.md).
-- `default` (optional) — The default value to return if parsing to type `Decimal32(S)` is unsuccessful. [Decimal32(S)](../data-types/decimal.md).
-
-Supported arguments:
-- String representations of type (U)Int8/16/32/64/128/256.
-- String representations of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toDecimal32OrDefault('0xc0fe', 1);`.
-
-:::note
-An overflow can occur if the value of `expr` exceeds the bounds of `Decimal32`: `( -1 * 10^(9 - S), 1 * 10^(9 - S) )`.
-Excessive digits in a fraction are discarded (not rounded).
-Excessive digits in the integer part will lead to an error.
-:::
+- `expr` — [Expression](../syntax.md/#syntax-expressions), returns a value in the [String](../data-types/string.md) data type. ClickHouse expects the textual representation of the decimal number. For example, `'1.111'`.
+- `S` — Scale, the number of decimal places in the resulting value.
 
 **Returned value**
 
-- Value of type `Decimal(9, S)` if successful, otherwise returns the default value if passed or `0` if not. [Decimal32(S)](../data-types/decimal.md).
+A value in the `Decimal(P,S)` data type. The value contains:
+
+- Number with `S` decimal places, if ClickHouse interprets the input string as a number.
+- Default `Decimal(P,S)` data type value, if ClickHouse can’t interpret the input string as a number or if the input number contains more than `S` decimal places.
 
 **Examples**
 
 Query:
 
 ``` sql
-SELECT
-    toDecimal32OrDefault(toString(0.0001), 5) AS a,
-    toTypeName(a),
-    toDecimal32OrDefault('Inf', 0, CAST('-1', 'Decimal32(0)')) AS b,
-    toTypeName(b)
-FORMAT Vertical;
+SELECT toDecimal32OrDefault(toString(-1.111), 5) AS val, toTypeName(val);
 ```
 
 Result:
 
 ```response
-Row 1:
-──────
-a:             0.0001
-toTypeName(a): Decimal(9, 5)
-b:             -1
-toTypeName(b): Decimal(9, 0)
+┌────val─┬─toTypeName(toDecimal32OrDefault(toString(-1.111), 5))─┐
+│ -1.111 │ Decimal(9, 5)                                         │
+└────────┴───────────────────────────────────────────────────────┘
 ```
 
-**See also**
-
-- [`toDecimal32`](#todecimal32).
-- [`toDecimal32OrZero`](#todecimal32orzero).
-- [`toDecimal32OrNull`](#todecimal32ornull).
-
-## toDecimal64
-
-Converts an input value to a value of type [`Decimal(18, S)`](../data-types/decimal.md) with scale of `S`. Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toDecimal64(expr, S)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-- `S` — Scale parameter between 0 and 18, specifying how many digits the fractional part of a number can have. [UInt8](../data-types/int-uint.md).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values or string representations of type Float32/64.
-
-Unsupported arguments:
-- Values or string representations of Float32/64 values `NaN` and `Inf` (case-insensitive).
-- String representations of binary and hexadecimal values, e.g. `SELECT toDecimal64('0xc0fe', 1);`.
-
-:::note
-An overflow can occur if the value of `expr` exceeds the bounds of `Decimal64`: `( -1 * 10^(18 - S), 1 * 10^(18 - S) )`.
-Excessive digits in a fraction are discarded (not rounded).
-Excessive digits in the integer part will lead to an exception.
-:::
-
-**Returned value**
-
-- Value of type `Decimal(18, S)`. [Decimal64(S)](../data-types/int-uint.md).
-
-**Example**
-
 Query:
 
-```sql
-SELECT
-    toDecimal64(2, 1) AS a, toTypeName(a) AS type_a,
-    toDecimal64(4.2, 2) AS b, toTypeName(b) AS type_b,
-    toDecimal64('4.2', 3) AS c, toTypeName(c) AS type_c
-FORMAT Vertical;
+``` sql
+SELECT toDecimal32OrDefault(toString(-1.111), 2) AS val, toTypeName(val);
 ```
 
 Result:
 
 ```response
-Row 1:
-──────
-a:      2
-type_a: Decimal(18, 1)
-b:      4.2
-type_b: Decimal(18, 2)
-c:      4.2
-type_c: Decimal(18, 3)
+┌─val─┬─toTypeName(toDecimal32OrDefault(toString(-1.111), 2))─┐
+│   0 │ Decimal(9, 2)                                         │
+└─────┴───────────────────────────────────────────────────────┘
 ```
 
-**See also**
+## toDecimal(32\|64\|128\|256)OrZero
 
-- [`toDecimal64OrZero`](#todecimal64orzero).
-- [`toDecimal64OrNull`](#todecimal64ornull).
-- [`toDecimal64OrDefault`](#todecimal64ordefault).
+Converts an input value to the [Decimal(P,S)](../data-types/decimal.md) data type. This family of functions includes:
 
-## toDecimal64OrZero
+- `toDecimal32OrZero( expr, S)` — Results in `Decimal32(S)` data type.
+- `toDecimal64OrZero( expr, S)` — Results in `Decimal64(S)` data type.
+- `toDecimal128OrZero( expr, S)` — Results in `Decimal128(S)` data type.
+- `toDecimal256OrZero( expr, S)` — Results in `Decimal256(S)` data type.
 
-Like [`toDecimal64`](#todecimal64), this function converts an input value to a value of type [Decimal(18, S)](../data-types/decimal.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toDecimal64OrZero(expr, S)
-```
+These functions should be used instead of `toDecimal*()` functions, if you prefer to get a `0` value instead of an exception in the event of an input value parsing error.
 
 **Arguments**
 
-- `expr` — A String representation of a number. [String](../data-types/string.md).
-- `S` — Scale parameter between 0 and 18, specifying how many digits the fractional part of a number can have. [UInt8](../data-types/int-uint.md).
-
-Supported arguments:
-- String representations of type (U)Int8/16/32/64/128/256.
-- String representations of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toDecimal64OrZero('0xc0fe', 1);`.
-
-:::note
-An overflow can occur if the value of `expr` exceeds the bounds of `Decimal64`: `( -1 * 10^(18 - S), 1 * 10^(18 - S) )`.
-Excessive digits in a fraction are discarded (not rounded).
-Excessive digits in the integer part will lead to an error.
-:::
+- `expr` — [Expression](../syntax.md/#syntax-expressions), returns a value in the [String](../data-types/string.md) data type. ClickHouse expects the textual representation of the decimal number. For example, `'1.111'`.
+- `S` — Scale, the number of decimal places in the resulting value.
 
 **Returned value**
 
-- Value of type `Decimal(18, S)` if successful, otherwise `0` with `S` decimal places. [Decimal64(S)](../data-types/decimal.md).
+A value in the `Nullable(Decimal(P,S))` data type. The value contains:
+
+- Number with `S` decimal places, if ClickHouse interprets the input string as a number.
+- 0 with `S` decimal places, if ClickHouse can’t interpret the input string as a number or if the input number contains more than `S` decimal places.
 
 **Example**
 
 Query:
 
 ``` sql
-SELECT
-    toDecimal64OrZero(toString(0.0001), 18) AS a,
-    toTypeName(a),
-    toDecimal64OrZero(toString('Inf'), 18) as b,
-    toTypeName(b)
-FORMAT Vertical;
+SELECT toDecimal32OrZero(toString(-1.111), 5) AS val, toTypeName(val);
 ```
 
 Result:
 
 ```response
-Row 1:
-──────
-a:             0.0001
-toTypeName(a): Decimal(18, 18)
-b:             0
-toTypeName(b): Decimal(18, 18)
+┌────val─┬─toTypeName(toDecimal32OrZero(toString(-1.111), 5))─┐
+│ -1.111 │ Decimal(9, 5)                                      │
+└────────┴────────────────────────────────────────────────────┘
 ```
 
-**See also**
-
-- [`toDecimal64`](#todecimal64).
-- [`toDecimal64OrNull`](#todecimal64ornull).
-- [`toDecimal64OrDefault`](#todecimal64ordefault).
-
-## toDecimal64OrNull
-
-Like [`toDecimal64`](#todecimal64), this function converts an input value to a value of type [Nullable(Decimal(18, S))](../data-types/decimal.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toDecimal64OrNull(expr, S)
-```
-
-**Arguments**
-
-- `expr` — A String representation of a number. [String](../data-types/string.md).
-- `S` — Scale parameter between 0 and 18, specifying how many digits the fractional part of a number can have. [UInt8](../data-types/int-uint.md).
-
-Supported arguments:
-- String representations of type (U)Int8/16/32/64/128/256.
-- String representations of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toDecimal64OrNull('0xc0fe', 1);`.
-
-:::note
-An overflow can occur if the value of `expr` exceeds the bounds of `Decimal64`: `( -1 * 10^(18 - S), 1 * 10^(18 - S) )`.
-Excessive digits in a fraction are discarded (not rounded).
-Excessive digits in the integer part will lead to an error.
-:::
-
-**Returned value**
-
-- Value of type `Nullable(Decimal(18, S))` if successful, otherwise value `NULL` of the same type. [Decimal64(S)](../data-types/decimal.md).
-
-**Examples**
-
 Query:
 
 ``` sql
-SELECT
-    toDecimal64OrNull(toString(0.0001), 18) AS a,
-    toTypeName(a),
-    toDecimal64OrNull(toString('Inf'), 18) as b,
-    toTypeName(b)
-FORMAT Vertical;
+SELECT toDecimal32OrZero(toString(-1.111), 2) AS val, toTypeName(val);
 ```
 
 Result:
 
 ```response
-Row 1:
-──────
-a:             0.0001
-toTypeName(a): Nullable(Decimal(18, 18))
-b:             ᴺᵁᴸᴸ
-toTypeName(b): Nullable(Decimal(18, 18))
+┌──val─┬─toTypeName(toDecimal32OrZero(toString(-1.111), 2))─┐
+│ 0.00 │ Decimal(9, 2)                                      │
+└──────┴────────────────────────────────────────────────────┘
 ```
 
-**See also**
-
-- [`toDecimal64`](#todecimal64).
-- [`toDecimal64OrZero`](#todecimal64orzero).
-- [`toDecimal64OrDefault`](#todecimal64ordefault).
-
-## toDecimal64OrDefault
-
-Like [`toDecimal64`](#todecimal64), this function converts an input value to a value of type [Decimal(18, S)](../data-types/decimal.md) but returns the default value in case of an error.
-
-**Syntax**
-
-```sql
-toDecimal64OrDefault(expr, S[, default])
-```
-
-**Arguments**
-
-- `expr` — A String representation of a number. [String](../data-types/string.md).
-- `S` — Scale parameter between 0 and 18, specifying how many digits the fractional part of a number can have. [UInt8](../data-types/int-uint.md).
-- `default` (optional) — The default value to return if parsing to type `Decimal64(S)` is unsuccessful. [Decimal64(S)](../data-types/decimal.md).
-
-Supported arguments:
-- String representations of type (U)Int8/16/32/64/128/256.
-- String representations of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toDecimal64OrDefault('0xc0fe', 1);`.
-
-:::note
-An overflow can occur if the value of `expr` exceeds the bounds of `Decimal64`: `( -1 * 10^(18 - S), 1 * 10^(18 - S) )`.
-Excessive digits in a fraction are discarded (not rounded).
-Excessive digits in the integer part will lead to an error.
-:::
-
-**Returned value**
-
-- Value of type `Decimal(18, S)` if successful, otherwise returns the default value if passed or `0` if not. [Decimal64(S)](../data-types/decimal.md).
-
-**Examples**
-
-Query:
-
-``` sql
-SELECT
-    toDecimal64OrDefault(toString(0.0001), 18) AS a,
-    toTypeName(a),
-    toDecimal64OrDefault('Inf', 0, CAST('-1', 'Decimal64(0)')) AS b,
-    toTypeName(b)
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-a:             0.0001
-toTypeName(a): Decimal(18, 18)
-b:             -1
-toTypeName(b): Decimal(18, 0)
-```
-
-**See also**
-
-- [`toDecimal64`](#todecimal64).
-- [`toDecimal64OrZero`](#todecimal64orzero).
-- [`toDecimal64OrNull`](#todecimal64ornull).
-
-## toDecimal128
-
-Converts an input value to a value of type [`Decimal(38, S)`](../data-types/decimal.md) with scale of `S`. Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toDecimal128(expr, S)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-- `S` — Scale parameter between 0 and 38, specifying how many digits the fractional part of a number can have. [UInt8](../data-types/int-uint.md).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values or string representations of type Float32/64.
-
-Unsupported arguments:
-- Values or string representations of Float32/64 values `NaN` and `Inf` (case-insensitive).
-- String representations of binary and hexadecimal values, e.g. `SELECT toDecimal128('0xc0fe', 1);`.
-
-:::note
-An overflow can occur if the value of `expr` exceeds the bounds of `Decimal128`: `( -1 * 10^(38 - S), 1 * 10^(38 - S) )`.
-Excessive digits in a fraction are discarded (not rounded).
-Excessive digits in the integer part will lead to an exception.
-:::
-
-**Returned value**
-
-- Value of type `Decimal(38, S)`. [Decimal128(S)](../data-types/int-uint.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toDecimal128(99, 1) AS a, toTypeName(a) AS type_a,
-    toDecimal128(99.67, 2) AS b, toTypeName(b) AS type_b,
-    toDecimal128('99.67', 3) AS c, toTypeName(c) AS type_c
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-a:      99
-type_a: Decimal(38, 1)
-b:      99.67
-type_b: Decimal(38, 2)
-c:      99.67
-type_c: Decimal(38, 3)
-```
-
-**See also**
-
-- [`toDecimal128OrZero`](#todecimal128orzero).
-- [`toDecimal128OrNull`](#todecimal128ornull).
-- [`toDecimal128OrDefault`](#todecimal128ordefault).
-
-## toDecimal128OrZero
-
-Like [`toDecimal128`](#todecimal128), this function converts an input value to a value of type [Decimal(38, S)](../data-types/decimal.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toDecimal128OrZero(expr, S)
-```
-
-**Arguments**
-
-- `expr` — A String representation of a number. [String](../data-types/string.md).
-- `S` — Scale parameter between 0 and 38, specifying how many digits the fractional part of a number can have. [UInt8](../data-types/int-uint.md).
-
-Supported arguments:
-- String representations of type (U)Int8/16/32/64/128/256.
-- String representations of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toDecimal128OrZero('0xc0fe', 1);`.
-
-:::note
-An overflow can occur if the value of `expr` exceeds the bounds of `Decimal128`: `( -1 * 10^(38 - S), 1 * 10^(38 - S) )`.
-Excessive digits in a fraction are discarded (not rounded).
-Excessive digits in the integer part will lead to an error.
-:::
-
-**Returned value**
-
-- Value of type `Decimal(38, S)` if successful, otherwise `0` with `S` decimal places. [Decimal128(S)](../data-types/decimal.md).
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toDecimal128OrZero(toString(0.0001), 38) AS a,
-    toTypeName(a),
-    toDecimal128OrZero(toString('Inf'), 38) as b,
-    toTypeName(b)
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-a:             0.0001
-toTypeName(a): Decimal(38, 38)
-b:             0
-toTypeName(b): Decimal(38, 38)
-```
-
-**See also**
-
-- [`toDecimal128`](#todecimal128).
-- [`toDecimal128OrNull`](#todecimal128ornull).
-- [`toDecimal128OrDefault`](#todecimal128ordefault).
-
-## toDecimal128OrNull
-
-Like [`toDecimal128`](#todecimal128), this function converts an input value to a value of type [Nullable(Decimal(38, S))](../data-types/decimal.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toDecimal128OrNull(expr, S)
-```
-
-**Arguments**
-
-- `expr` — A String representation of a number. [String](../data-types/string.md).
-- `S` — Scale parameter between 0 and 38, specifying how many digits the fractional part of a number can have. [UInt8](../data-types/int-uint.md).
-
-Supported arguments:
-- String representations of type (U)Int8/16/32/64/128/256.
-- String representations of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toDecimal128OrNull('0xc0fe', 1);`.
-
-:::note
-An overflow can occur if the value of `expr` exceeds the bounds of `Decimal128`: `( -1 * 10^(38 - S), 1 * 10^(38 - S) )`.
-Excessive digits in a fraction are discarded (not rounded).
-Excessive digits in the integer part will lead to an error.
-:::
-
-**Returned value**
-
-- Value of type `Nullable(Decimal(38, S))` if successful, otherwise value `NULL` of the same type. [Decimal128(S)](../data-types/decimal.md).
-
-**Examples**
-
-Query:
-
-``` sql
-SELECT
-    toDecimal128OrNull(toString(1/42), 38) AS a,
-    toTypeName(a),
-    toDecimal128OrNull(toString('Inf'), 38) as b,
-    toTypeName(b)
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-a:             0.023809523809523808
-toTypeName(a): Nullable(Decimal(38, 38))
-b:             ᴺᵁᴸᴸ
-toTypeName(b): Nullable(Decimal(38, 38))
-```
-
-**See also**
-
-- [`toDecimal128`](#todecimal128).
-- [`toDecimal128OrZero`](#todecimal128orzero).
-- [`toDecimal128OrDefault`](#todecimal128ordefault).
-
-## toDecimal128OrDefault
-
-Like [`toDecimal128`](#todecimal128), this function converts an input value to a value of type [Decimal(38, S)](../data-types/decimal.md) but returns the default value in case of an error.
-
-**Syntax**
-
-```sql
-toDecimal128OrDefault(expr, S[, default])
-```
-
-**Arguments**
-
-- `expr` — A String representation of a number. [String](../data-types/string.md).
-- `S` — Scale parameter between 0 and 38, specifying how many digits the fractional part of a number can have. [UInt8](../data-types/int-uint.md).
-- `default` (optional) — The default value to return if parsing to type `Decimal128(S)` is unsuccessful. [Decimal128(S)](../data-types/decimal.md).
-
-Supported arguments:
-- String representations of type (U)Int8/16/32/64/128/256.
-- String representations of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toDecimal128OrDefault('0xc0fe', 1);`.
-
-:::note
-An overflow can occur if the value of `expr` exceeds the bounds of `Decimal128`: `( -1 * 10^(38 - S), 1 * 10^(38 - S) )`.
-Excessive digits in a fraction are discarded (not rounded).
-Excessive digits in the integer part will lead to an error.
-:::
-
-**Returned value**
-
-- Value of type `Decimal(38, S)` if successful, otherwise returns the default value if passed or `0` if not. [Decimal128(S)](../data-types/decimal.md).
-
-**Examples**
-
-Query:
-
-``` sql
-SELECT
-    toDecimal128OrDefault(toString(1/42), 18) AS a,
-    toTypeName(a),
-    toDecimal128OrDefault('Inf', 0, CAST('-1', 'Decimal128(0)')) AS b,
-    toTypeName(b)
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-a:             0.023809523809523808
-toTypeName(a): Decimal(38, 18)
-b:             -1
-toTypeName(b): Decimal(38, 0)
-```
-
-**See also**
-
-- [`toDecimal128`](#todecimal128).
-- [`toDecimal128OrZero`](#todecimal128orzero).
-- [`toDecimal128OrNull`](#todecimal128ornull).
-
-## toDecimal256
-
-Converts an input value to a value of type [`Decimal(76, S)`](../data-types/decimal.md) with scale of `S`. Throws an exception in case of an error.
-
-**Syntax**
-
-```sql
-toDecimal256(expr, S)
-```
-
-**Arguments**
-
-- `expr` — Expression returning a number or a string representation of a number. [Expression](../syntax.md/#syntax-expressions).
-- `S` — Scale parameter between 0 and 76, specifying how many digits the fractional part of a number can have. [UInt8](../data-types/int-uint.md).
-
-Supported arguments:
-- Values or string representations of type (U)Int8/16/32/64/128/256.
-- Values or string representations of type Float32/64.
-
-Unsupported arguments:
-- Values or string representations of Float32/64 values `NaN` and `Inf` (case-insensitive).
-- String representations of binary and hexadecimal values, e.g. `SELECT toDecimal256('0xc0fe', 1);`.
-
-:::note
-An overflow can occur if the value of `expr` exceeds the bounds of `Decimal256`: `( -1 * 10^(76 - S), 1 * 10^(76 - S) )`.
-Excessive digits in a fraction are discarded (not rounded).
-Excessive digits in the integer part will lead to an exception.
-:::
-
-**Returned value**
-
-- Value of type `Decimal(76, S)`. [Decimal256(S)](../data-types/int-uint.md).
-
-**Example**
-
-Query:
-
-```sql
-SELECT
-    toDecimal256(99, 1) AS a, toTypeName(a) AS type_a,
-    toDecimal256(99.67, 2) AS b, toTypeName(b) AS type_b,
-    toDecimal256('99.67', 3) AS c, toTypeName(c) AS type_c
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-a:      99
-type_a: Decimal(76, 1)
-b:      99.67
-type_b: Decimal(76, 2)
-c:      99.67
-type_c: Decimal(76, 3)
-```
-
-**See also**
-
-- [`toDecimal256OrZero`](#todecimal256orzero).
-- [`toDecimal256OrNull`](#todecimal256ornull).
-- [`toDecimal256OrDefault`](#todecimal256ordefault).
-
-## toDecimal256OrZero
-
-Like [`toDecimal256`](#todecimal256), this function converts an input value to a value of type [Decimal(76, S)](../data-types/decimal.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toDecimal256OrZero(expr, S)
-```
-
-**Arguments**
-
-- `expr` — A String representation of a number. [String](../data-types/string.md).
-- `S` — Scale parameter between 0 and 76, specifying how many digits the fractional part of a number can have. [UInt8](../data-types/int-uint.md).
-
-Supported arguments:
-- String representations of type (U)Int8/16/32/64/128/256.
-- String representations of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toDecimal256OrZero('0xc0fe', 1);`.
-
-:::note
-An overflow can occur if the value of `expr` exceeds the bounds of `Decimal256`: `( -1 * 10^(76 - S), 1 * 10^(76 - S) )`.
-Excessive digits in a fraction are discarded (not rounded).
-Excessive digits in the integer part will lead to an error.
-:::
-
-**Returned value**
-
-- Value of type `Decimal(76, S)` if successful, otherwise `0` with `S` decimal places. [Decimal256(S)](../data-types/decimal.md).
-
-**Example**
-
-Query:
-
-``` sql
-SELECT
-    toDecimal256OrZero(toString(0.0001), 76) AS a,
-    toTypeName(a),
-    toDecimal256OrZero(toString('Inf'), 76) as b,
-    toTypeName(b)
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-a:             0.0001
-toTypeName(a): Decimal(76, 76)
-b:             0
-toTypeName(b): Decimal(76, 76)
-```
-
-**See also**
-
-- [`toDecimal256`](#todecimal256).
-- [`toDecimal256OrNull`](#todecimal256ornull).
-- [`toDecimal256OrDefault`](#todecimal256ordefault).
-
-## toDecimal256OrNull
-
-Like [`toDecimal256`](#todecimal256), this function converts an input value to a value of type [Nullable(Decimal(76, S))](../data-types/decimal.md) but returns `0` in case of an error.
-
-**Syntax**
-
-```sql
-toDecimal256OrNull(expr, S)
-```
-
-**Arguments**
-
-- `expr` — A String representation of a number. [String](../data-types/string.md).
-- `S` — Scale parameter between 0 and 76, specifying how many digits the fractional part of a number can have. [UInt8](../data-types/int-uint.md).
-
-Supported arguments:
-- String representations of type (U)Int8/16/32/64/128/256.
-- String representations of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toDecimal256OrNull('0xc0fe', 1);`.
-
-:::note
-An overflow can occur if the value of `expr` exceeds the bounds of `Decimal256`: `( -1 * 10^(76 - S), 1 * 10^(76 - S) )`.
-Excessive digits in a fraction are discarded (not rounded).
-Excessive digits in the integer part will lead to an error.
-:::
-
-**Returned value**
-
-- Value of type `Nullable(Decimal(76, S))` if successful, otherwise value `NULL` of the same type. [Decimal256(S)](../data-types/decimal.md).
-
-**Examples**
-
-Query:
-
-``` sql
-SELECT
-    toDecimal256OrNull(toString(1/42), 76) AS a,
-    toTypeName(a),
-    toDecimal256OrNull(toString('Inf'), 76) as b,
-    toTypeName(b)
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-a:             0.023809523809523808
-toTypeName(a): Nullable(Decimal(76, 76))
-b:             ᴺᵁᴸᴸ
-toTypeName(b): Nullable(Decimal(76, 76))
-```
-
-**See also**
-
-- [`toDecimal256`](#todecimal256).
-- [`toDecimal256OrZero`](#todecimal256orzero).
-- [`toDecimal256OrDefault`](#todecimal256ordefault).
-
-## toDecimal256OrDefault
-
-Like [`toDecimal256`](#todecimal256), this function converts an input value to a value of type [Decimal(76, S)](../data-types/decimal.md) but returns the default value in case of an error.
-
-**Syntax**
-
-```sql
-toDecimal256OrDefault(expr, S[, default])
-```
-
-**Arguments**
-
-- `expr` — A String representation of a number. [String](../data-types/string.md).
-- `S` — Scale parameter between 0 and 76, specifying how many digits the fractional part of a number can have. [UInt8](../data-types/int-uint.md).
-- `default` (optional) — The default value to return if parsing to type `Decimal256(S)` is unsuccessful. [Decimal256(S)](../data-types/decimal.md).
-
-Supported arguments:
-- String representations of type (U)Int8/16/32/64/128/256.
-- String representations of type Float32/64.
-
-Unsupported arguments:
-- String representations of Float32/64 values `NaN` and `Inf`.
-- String representations of binary and hexadecimal values, e.g. `SELECT toDecimal256OrDefault('0xc0fe', 1);`.
-
-:::note
-An overflow can occur if the value of `expr` exceeds the bounds of `Decimal256`: `( -1 * 10^(76 - S), 1 * 10^(76 - S) )`.
-Excessive digits in a fraction are discarded (not rounded).
-Excessive digits in the integer part will lead to an error.
-:::
-
-**Returned value**
-
-- Value of type `Decimal(76, S)` if successful, otherwise returns the default value if passed or `0` if not. [Decimal256(S)](../data-types/decimal.md).
-
-**Examples**
-
-Query:
-
-``` sql
-SELECT
-    toDecimal256OrDefault(toString(1/42), 76) AS a,
-    toTypeName(a),
-    toDecimal256OrDefault('Inf', 0, CAST('-1', 'Decimal256(0)')) AS b,
-    toTypeName(b)
-FORMAT Vertical;
-```
-
-Result:
-
-```response
-Row 1:
-──────
-a:             0.023809523809523808
-toTypeName(a): Decimal(76, 76)
-b:             -1
-toTypeName(b): Decimal(76, 0)
-```
-
-**See also**
-
-- [`toDecimal256`](#todecimal256).
-- [`toDecimal256OrZero`](#todecimal256orzero).
-- [`toDecimal256OrNull`](#todecimal256ornull).
-
 ## toString
 
 Functions for converting between numbers, strings (but not fixed strings), dates, and dates with times.
@@ -6279,23 +2014,30 @@ Result:
 └───────┴───────────────┴──────┴──────────────┴──────────────┴──────────────────────┘
 ```
 
-## toIntervalYear
+## toInterval(Year\|Quarter\|Month\|Week\|Day\|Hour\|Minute\|Second)
 
-Returns an interval of `n` years of data type [IntervalYear](../data-types/special-data-types/interval.md).
+Converts a Number type argument to an [Interval](../data-types/special-data-types/interval.md) data type.
 
 **Syntax**
 
 ``` sql
-toIntervalYear(n)
+toIntervalSecond(number)
+toIntervalMinute(number)
+toIntervalHour(number)
+toIntervalDay(number)
+toIntervalWeek(number)
+toIntervalMonth(number)
+toIntervalQuarter(number)
+toIntervalYear(number)
 ```
 
 **Arguments**
 
-- `n` — Number of years. Integer numbers or string representations thereof, and float numbers. [(U)Int*](../data-types/int-uint.md)/[Float*](../data-types/float.md)/[String](../data-types/string.md).
+- `number` — Duration of interval. Positive integer number.
 
 **Returned values**
 
-- Interval of `n` years. [IntervalYear](../data-types/special-data-types/interval.md).
+- The value in `Interval` data type.
 
 **Example**
 
@@ -6303,387 +2045,20 @@ Query:
 
 ``` sql
 WITH
-    toDate('2024-06-15') AS date,
-    toIntervalYear(1) AS interval_to_year
-SELECT date + interval_to_year AS result
-```
-
-Result:
-
-```response
-┌─────result─┐
-│ 2025-06-15 │
-└────────────┘
-```
-
-## toIntervalQuarter
-
-Returns an interval of `n` quarters of data type [IntervalQuarter](../data-types/special-data-types/interval.md).
-
-**Syntax**
-
-``` sql
-toIntervalQuarter(n)
-```
-
-**Arguments**
-
-- `n` — Number of quarters. Integer numbers or string representations thereof, and float numbers. [(U)Int*](../data-types/int-uint.md)/[Float*](../data-types/float.md)/[String](../data-types/string.md).
-
-**Returned values**
-
-- Interval of `n` quarters. [IntervalQuarter](../data-types/special-data-types/interval.md).
-
-**Example**
-
-Query:
-
-``` sql
-WITH
-    toDate('2024-06-15') AS date,
-    toIntervalQuarter(1) AS interval_to_quarter
-SELECT date + interval_to_quarter AS result
-```
-
-Result:
-
-```response
-┌─────result─┐
-│ 2024-09-15 │
-└────────────┘
-```
-
-## toIntervalMonth
-
-Returns an interval of `n` months of data type [IntervalMonth](../data-types/special-data-types/interval.md).
-
-**Syntax**
-
-``` sql
-toIntervalMonth(n)
-```
-
-**Arguments**
-
-- `n` — Number of months. Integer numbers or string representations thereof, and float numbers. [(U)Int*](../data-types/int-uint.md)/[Float*](../data-types/float.md)/[String](../data-types/string.md).
-
-**Returned values**
-
-- Interval of `n` months. [IntervalMonth](../data-types/special-data-types/interval.md).
-
-**Example**
-
-Query:
-
-``` sql
-WITH
-    toDate('2024-06-15') AS date,
-    toIntervalMonth(1) AS interval_to_month
-SELECT date + interval_to_month AS result
-```
-
-Result:
-
-```response
-┌─────result─┐
-│ 2024-07-15 │
-└────────────┘
-```
-
-## toIntervalWeek
-
-Returns an interval of `n` weeks of data type [IntervalWeek](../data-types/special-data-types/interval.md).
-
-**Syntax**
-
-``` sql
-toIntervalWeek(n)
-```
-
-**Arguments**
-
-- `n` — Number of weeks. Integer numbers or string representations thereof, and float numbers. [(U)Int*](../data-types/int-uint.md)/[Float*](../data-types/float.md)/[String](../data-types/string.md).
-
-**Returned values**
-
-- Interval of `n` weeks. [IntervalWeek](../data-types/special-data-types/interval.md).
-
-**Example**
-
-Query:
-
-``` sql
-WITH
-    toDate('2024-06-15') AS date,
+    toDate('2019-01-01') AS date,
+    INTERVAL 1 WEEK AS interval_week,
     toIntervalWeek(1) AS interval_to_week
-SELECT date + interval_to_week AS result
+SELECT
+    date + interval_week,
+    date + interval_to_week;
 ```
 
 Result:
 
 ```response
-┌─────result─┐
-│ 2024-06-22 │
-└────────────┘
-```
-
-## toIntervalDay
-
-Returns an interval of `n` days of data type [IntervalDay](../data-types/special-data-types/interval.md).
-
-**Syntax**
-
-``` sql
-toIntervalDay(n)
-```
-
-**Arguments**
-
-- `n` — Number of days. Integer numbers or string representations thereof, and float numbers. [(U)Int*](../data-types/int-uint.md)/[Float*](../data-types/float.md)/[String](../data-types/string.md).
-
-**Returned values**
-
-- Interval of `n` days. [IntervalDay](../data-types/special-data-types/interval.md).
-
-**Example**
-
-Query:
-
-``` sql
-WITH
-    toDate('2024-06-15') AS date,
-    toIntervalDay(5) AS interval_to_days
-SELECT date + interval_to_days AS result
-```
-
-Result:
-
-```response
-┌─────result─┐
-│ 2024-06-20 │
-└────────────┘
-```
-
-## toIntervalHour
-
-Returns an interval of `n` hours of data type [IntervalHour](../data-types/special-data-types/interval.md).
-
-**Syntax**
-
-``` sql
-toIntervalHour(n)
-```
-
-**Arguments**
-
-- `n` — Number of hours. Integer numbers or string representations thereof, and float numbers. [(U)Int*](../data-types/int-uint.md)/[Float*](../data-types/float.md)/[String](../data-types/string.md).
-
-**Returned values**
-
-- Interval of `n` hours. [IntervalHour](../data-types/special-data-types/interval.md).
-
-**Example**
-
-Query:
-
-``` sql
-WITH
-    toDate('2024-06-15') AS date,
-    toIntervalHour(12) AS interval_to_hours
-SELECT date + interval_to_hours AS result
-```
-
-Result:
-
-```response
-┌──────────────result─┐
-│ 2024-06-15 12:00:00 │
-└─────────────────────┘
-```
-
-## toIntervalMinute
-
-Returns an interval of `n` minutes of data type [IntervalMinute](../data-types/special-data-types/interval.md).
-
-**Syntax**
-
-``` sql
-toIntervalMinute(n)
-```
-
-**Arguments**
-
-- `n` — Number of minutes. Integer numbers or string representations thereof, and float numbers. [(U)Int*](../data-types/int-uint.md)/[Float*](../data-types/float.md)/[String](../data-types/string.md).
-
-**Returned values**
-
-- Interval of `n` minutes. [IntervalMinute](../data-types/special-data-types/interval.md).
-
-**Example**
-
-Query:
-
-``` sql
-WITH
-    toDate('2024-06-15') AS date,
-    toIntervalMinute(12) AS interval_to_minutes
-SELECT date + interval_to_minutes AS result
-```
-
-Result:
-
-```response
-┌──────────────result─┐
-│ 2024-06-15 00:12:00 │
-└─────────────────────┘
-```
-
-## toIntervalSecond
-
-Returns an interval of `n` seconds of data type [IntervalSecond](../data-types/special-data-types/interval.md).
-
-**Syntax**
-
-``` sql
-toIntervalSecond(n)
-```
-
-**Arguments**
-
-- `n` — Number of seconds. Integer numbers or string representations thereof, and float numbers. [(U)Int*](../data-types/int-uint.md)/[Float*](../data-types/float.md)/[String](../data-types/string.md).
-
-**Returned values**
-
-- Interval of `n` seconds. [IntervalSecond](../data-types/special-data-types/interval.md).
-
-**Example**
-
-Query:
-
-``` sql
-WITH
-    toDate('2024-06-15') AS date,
-    toIntervalSecond(30) AS interval_to_seconds
-SELECT date + interval_to_seconds AS result
-```
-
-Result:
-
-```response
-┌──────────────result─┐
-│ 2024-06-15 00:00:30 │
-└─────────────────────┘
-```
-
-## toIntervalMillisecond
-
-Returns an interval of `n` milliseconds of data type [IntervalMillisecond](../data-types/special-data-types/interval.md).
-
-**Syntax**
-
-``` sql
-toIntervalMillisecond(n)
-```
-
-**Arguments**
-
-- `n` — Number of milliseconds. Integer numbers or string representations thereof, and float numbers. [(U)Int*](../data-types/int-uint.md)/[Float*](../data-types/float.md)/[String](../data-types/string.md).
-
-**Returned values**
-
-- Interval of `n` milliseconds. [IntervalMilliseconds](../data-types/special-data-types/interval.md).
-
-**Example**
-
-Query:
-
-``` sql
-WITH
-    toDateTime('2024-06-15') AS date,
-    toIntervalMillisecond(30) AS interval_to_milliseconds
-SELECT date + interval_to_milliseconds AS result
-```
-
-Result:
-
-```response
-┌──────────────────result─┐
-│ 2024-06-15 00:00:00.030 │
-└─────────────────────────┘
-```
-
-## toIntervalMicrosecond
-
-Returns an interval of `n` microseconds of data type [IntervalMicrosecond](../data-types/special-data-types/interval.md).
-
-**Syntax**
-
-``` sql
-toIntervalMicrosecond(n)
-```
-
-**Arguments**
-
-- `n` — Number of microseconds. Integer numbers or string representations thereof, and float numbers. [(U)Int*](../data-types/int-uint.md)/[Float*](../data-types/float.md)/[String](../data-types/string.md).
-
-**Returned values**
-
-- Interval of `n` microseconds. [IntervalMicrosecond](../data-types/special-data-types/interval.md).
-
-**Example**
-
-Query:
-
-``` sql
-WITH
-    toDateTime('2024-06-15') AS date,
-    toIntervalMicrosecond(30) AS interval_to_microseconds
-SELECT date + interval_to_microseconds AS result
-```
-
-Result:
-
-```response
-┌─────────────────────result─┐
-│ 2024-06-15 00:00:00.000030 │
-└────────────────────────────┘
-```
-
-## toIntervalNanosecond
-
-Returns an interval of `n` nanoseconds of data type [IntervalNanosecond](../data-types/special-data-types/interval.md).
-
-**Syntax**
-
-``` sql
-toIntervalNanosecond(n)
-```
-
-**Arguments**
-
-- `n` — Number of nanoseconds. Integer numbers or string representations thereof, and float numbers. [(U)Int*](../data-types/int-uint.md)/[Float*](../data-types/float.md)/[String](../data-types/string.md).
-
-**Returned values**
-
-- Interval of `n` nanoseconds. [IntervalNanosecond](../data-types/special-data-types/interval.md).
-
-**Example**
-
-Query:
-
-``` sql
-WITH
-    toDateTime('2024-06-15') AS date,
-    toIntervalNanosecond(30) AS interval_to_nanoseconds
-SELECT date + interval_to_nanoseconds AS result
-```
-
-Result:
-
-```response
-┌────────────────────────result─┐
-│ 2024-06-15 00:00:00.000000030 │
-└───────────────────────────────┘
+┌─plus(date, interval_week)─┬─plus(date, interval_to_week)─┐
+│                2019-01-08 │                   2019-01-08 │
+└───────────────────────────┴──────────────────────────────┘
 ```
 
 ## parseDateTime
@@ -6695,13 +2070,13 @@ This function is the opposite operation of function [formatDateTime](../function
 **Syntax**
 
 ``` sql
-parseDateTime(str[, format[, timezone]])
+parseDateTime(str, format[, timezone])
 ```
 
 **Arguments**
 
-- `str` — The String to be parsed
-- `format` — The format string. Optional. `%Y-%m-%d %H:%i:%s` if not specified.
+- `str` — the String to be parsed
+- `format` — the format string
 - `timezone` — [Timezone](/docs/en/operations/server-configuration-parameters/settings.md/#server_configuration_parameters-timezone). Optional.
 
 **Returned value(s)**
@@ -6744,13 +2119,13 @@ This function is the opposite operation of function [formatDateTimeInJodaSyntax]
 **Syntax**
 
 ``` sql
-parseDateTimeInJodaSyntax(str[, format[, timezone]])
+parseDateTimeInJodaSyntax(str, format[, timezone])
 ```
 
 **Arguments**
 
-- `str` — The String to be parsed
-- `format` — The format string. Optional. `yyyy-MM-dd HH:mm:ss` if not specified.
+- `str` — the String to be parsed
+- `format` — the format string
 - `timezone` — [Timezone](/docs/en/operations/server-configuration-parameters/settings.md/#server_configuration_parameters-timezone). Optional.
 
 **Returned value(s)**
@@ -6914,7 +2289,7 @@ Result:
 └─────────────────────┴─────────────────┴─────────────────────────────────────┘
 ```
 
-**See also**
+**See Also**
 
 - [RFC 1123](https://datatracker.ietf.org/doc/html/rfc1123)
 - [toDate](#todate)
diff --git a/docs/en/sql-reference/operators/index.md b/docs/en/sql-reference/operators/index.md
index cd76f2d81c9..31bf43e8b35 100644
--- a/docs/en/sql-reference/operators/index.md
+++ b/docs/en/sql-reference/operators/index.md
@@ -265,6 +265,8 @@ SELECT now() AS current_date_time, current_date_time + INTERVAL '4' day + INTERV
 └─────────────────────┴────────────────────────────────────────────────────────────┘
 ```
 
+You can work with dates without using `INTERVAL`, just by adding or subtracting seconds, minutes, and hours. For example, an interval of one day can be set by adding `60*60*24`.
+
 :::note    
 The `INTERVAL` syntax or `addDays` function are always preferred. Simple addition or subtraction (syntax like `now() + ...`) doesn't consider time settings. For example, daylight saving time.
 :::
diff --git a/docs/en/sql-reference/statements/alter/column.md b/docs/en/sql-reference/statements/alter/column.md
index 2e9b0cf3080..aa6f132e08e 100644
--- a/docs/en/sql-reference/statements/alter/column.md
+++ b/docs/en/sql-reference/statements/alter/column.md
@@ -36,7 +36,7 @@ These actions are described in detail below.
 ADD COLUMN [IF NOT EXISTS] name [type] [default_expr] [codec] [AFTER name_after | FIRST]
 ```
 
-Adds a new column to the table with the specified `name`, `type`, [`codec`](../create/table.md/#column_compression_codec) and `default_expr` (see the section [Default expressions](/docs/en/sql-reference/statements/create/table.md/#create-default-values)).
+Adds a new column to the table with the specified `name`, `type`, [`codec`](../create/table.md/#codecs) and `default_expr` (see the section [Default expressions](/docs/en/sql-reference/statements/create/table.md/#create-default-values)).
 
 If the `IF NOT EXISTS` clause is included, the query won’t return an error if the column already exists. If you specify `AFTER name_after` (the name of another column), the column is added after the specified one in the list of table columns. If you want to add a column to the beginning of the table use the `FIRST` clause. Otherwise, the column is added to the end of the table. For a chain of actions, `name_after` can be the name of a column that is added in one of the previous actions.
 
@@ -155,7 +155,7 @@ This query changes the `name` column properties:
 
 - Column-level Settings
 
-For examples of columns compression CODECS modifying, see [Column Compression Codecs](../create/table.md/#column_compression_codec).
+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).
 
diff --git a/docs/en/sql-reference/statements/alter/partition.md b/docs/en/sql-reference/statements/alter/partition.md
index 11926b2aa08..778816f8934 100644
--- a/docs/en/sql-reference/statements/alter/partition.md
+++ b/docs/en/sql-reference/statements/alter/partition.md
@@ -9,7 +9,6 @@ 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.
-- [DROP DETACHED PARTITION\|PART](#drop-detached-partitionpart) - Delete a part or all parts of a partition from `detached`.
 - [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.
@@ -69,7 +68,7 @@ ALTER TABLE mt DROP PART 'all_4_4_0';
 ## DROP DETACHED PARTITION\|PART
 
 ``` sql
-ALTER TABLE table_name [ON CLUSTER cluster] DROP DETACHED PARTITION|PART ALL|partition_expr
+ALTER TABLE table_name [ON CLUSTER cluster] DROP DETACHED PARTITION|PART partition_expr
 ```
 
 Removes the specified part or all parts of the specified partition from `detached`.
@@ -351,7 +350,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/ATTACH FROM. For example, `ALTER TABLE visits ATTACH PARTITION ALL`.
+- 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](#attach-partitionpart) and [DROP DETACHED PART](#drop-detached-partitionpart) 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/statistics.md b/docs/en/sql-reference/statements/alter/statistics.md
index 7a1774a01b5..6880cef0e5c 100644
--- a/docs/en/sql-reference/statements/alter/statistics.md
+++ b/docs/en/sql-reference/statements/alter/statistics.md
@@ -8,28 +8,26 @@ sidebar_label: STATISTICS
 
 The following operations are available:
 
--   `ALTER TABLE [db].table ADD STATISTICS [IF NOT EXISTS] (column list) TYPE (type list)` - Adds statistic description to tables metadata.
+-   `ALTER TABLE [db].table ADD STATISTICS (columns list) TYPE (type list)` - Adds statistic description to tables metadata.
 
--   `ALTER TABLE [db].table MODIFY STATISTICS (column list) TYPE (type list)` - Modifies statistic description to tables metadata.
+-   `ALTER TABLE [db].table MODIFY STATISTICS (columns list) TYPE (type list)` - Modifies statistic description to tables metadata.
 
--   `ALTER TABLE [db].table DROP STATISTICS [IF EXISTS] (column list)` - Removes statistics from the metadata of the specified columns and deletes all statistics objects in all parts for the specified columns.
+-   `ALTER TABLE [db].table DROP STATISTICS (columns list)` - Removes statistics from the metadata of the specified columns and deletes all statistics objects in all parts for the specified columns.
 
--   `ALTER TABLE [db].table CLEAR STATISTICS [IF EXISTS] (column list)` - Deletes all statistics objects in all parts for the specified columns. Statistics objects can be rebuild using `ALTER TABLE MATERIALIZE STATISTICS`.
+-   `ALTER TABLE [db].table CLEAR STATISTICS (columns list)` - Deletes all statistics objects in all parts for the specified columns. Statistics objects can be rebuild using `ALTER TABLE MATERIALIZE STATISTICS`.
 
--   `ALTER TABLE [db.]table MATERIALIZE STATISTICS [IF EXISTS] (column list)` - Rebuilds the statistic for columns. Implemented as a [mutation](../../../sql-reference/statements/alter/index.md#mutations). 
+-   `ALTER TABLE [db.]table MATERIALIZE STATISTICS (columns list)` - Rebuilds the statistic for columns. Implemented as a [mutation](../../../sql-reference/statements/alter/index.md#mutations). 
 
 The first two commands are lightweight in a sense that they only change metadata or remove files.
 
 Also, they are replicated, syncing statistics metadata via ZooKeeper.
 
-## Example:
-
-Adding two statistics types to two columns:
+There is an example adding two statistics types to two columns:
 
 ```
 ALTER TABLE t1 MODIFY STATISTICS c, d TYPE TDigest, Uniq;
 ```
 
 :::note
-Statistic are supported only for [`*MergeTree`](../../../engines/table-engines/mergetree-family/mergetree.md) engine tables (including [replicated](../../../engines/table-engines/mergetree-family/replication.md) variants).
+Statistic manipulation is supported only for tables with [`*MergeTree`](../../../engines/table-engines/mergetree-family/mergetree.md) engine (including [replicated](../../../engines/table-engines/mergetree-family/replication.md) variants).
 :::
diff --git a/docs/en/sql-reference/statements/create/row-policy.md b/docs/en/sql-reference/statements/create/row-policy.md
index 8be766710fd..cd7718793bd 100644
--- a/docs/en/sql-reference/statements/create/row-policy.md
+++ b/docs/en/sql-reference/statements/create/row-policy.md
@@ -8,7 +8,7 @@ title: "CREATE ROW POLICY"
 Creates a [row policy](../../../guides/sre/user-management/index.md#row-policy-management), i.e. a filter used to determine which rows a user can read from a table.
 
 :::tip
-Row policies make sense only for users with readonly access. If a user can modify a table or copy partitions between tables, it defeats the restrictions of row policies.
+Row policies makes sense only for users with readonly access. If user can modify table or copy partitions between tables, it defeats the restrictions of row policies.
 :::
 
 Syntax:
@@ -24,40 +24,40 @@ CREATE [ROW] POLICY [IF NOT EXISTS | OR REPLACE] policy_name1 [ON CLUSTER cluste
 
 ## USING Clause
 
-Allows specifying a condition to filter rows. A user will see a row if the condition is calculated to non-zero for the row.
+Allows to specify a condition to filter rows. An user will see a row if the condition is calculated to non-zero for the row.
 
 ## TO Clause
 
-In the `TO` section you can provide a list of users and roles this policy should work for. For example, `CREATE ROW POLICY ... TO accountant, john@localhost`.
+In the section `TO` you can provide a list of users and roles this policy should work for. For example, `CREATE ROW POLICY ... TO accountant, john@localhost`.
 
-Keyword `ALL` means all the ClickHouse users, including current user. Keyword `ALL EXCEPT` allows excluding some users from the all users list, for example, `CREATE ROW POLICY ... TO ALL EXCEPT accountant, john@localhost`
+Keyword `ALL` means all the ClickHouse users including current user. Keyword `ALL EXCEPT` allow to exclude some users from the all users list, for example, `CREATE ROW POLICY ... TO ALL EXCEPT accountant, john@localhost`
 
 :::note
-If there are no row policies defined for a table, then any user can `SELECT` all the rows from the table. Defining one or more row policies for the table makes access to the table dependent on the row policies, no matter if those row policies are defined for the current user or not. For example, the following policy:
+If there are no row policies defined for a table then any user can `SELECT` all the row from the table. Defining one or more row policies for the table makes the access to the table depending on the row policies no matter if those row policies are defined for the current user or not. For example, the following policy
 
 `CREATE ROW POLICY pol1 ON mydb.table1 USING b=1 TO mira, peter`
 
-forbids the users `mira` and `peter` from seeing the rows with `b != 1`, and any non-mentioned user (e.g., the user `paul`) will see no rows from `mydb.table1` at all.
+forbids the users `mira` and `peter` to see the rows with `b != 1`, and any non-mentioned user (e.g., the user `paul`) will see no rows from `mydb.table1` at all.
 
-If that's not desirable, it can be fixed by adding one more row policy, like the following:
+If that's not desirable it can't be fixed by adding one more row policy, like the following:
 
 `CREATE ROW POLICY pol2 ON mydb.table1 USING 1 TO ALL EXCEPT mira, peter`
 :::
 
 ## AS Clause
 
-It's allowed to have more than one policy enabled on the same table for the same user at one time. So we need a way to combine the conditions from multiple policies.
+It's allowed to have more than one policy enabled on the same table for the same user at the one time. So we need a way to combine the conditions from multiple policies.
 
-By default, policies are combined using the boolean `OR` operator. For example, the following policies:
+By default policies are combined using the boolean `OR` operator. For example, the following policies
 
 ``` sql
 CREATE ROW POLICY pol1 ON mydb.table1 USING b=1 TO mira, peter
 CREATE ROW POLICY pol2 ON mydb.table1 USING c=2 TO peter, antonio
 ```
 
-enable the user `peter` to see rows with either `b=1` or `c=2`.
+enables the user `peter` to see rows with either `b=1` or `c=2`.
 
-The `AS` clause specifies how policies should be combined with other policies. Policies can be either permissive or restrictive. By default, policies are permissive, which means they are combined using the boolean `OR` operator.
+The `AS` clause specifies how policies should be combined with other policies. Policies can be either permissive or restrictive. By default policies are permissive, which means they are combined using the boolean `OR` operator.
 
 A policy can be defined as restrictive as an alternative. Restrictive policies are combined using the boolean `AND` operator.
 
@@ -68,25 +68,25 @@ row_is_visible = (one or more of the permissive policies' conditions are non-zer
                  (all of the restrictive policies's conditions are non-zero)
 ```
 
-For example, the following policies:
+For example, the following policies
 
 ``` sql
 CREATE ROW POLICY pol1 ON mydb.table1 USING b=1 TO mira, peter
 CREATE ROW POLICY pol2 ON mydb.table1 USING c=2 AS RESTRICTIVE TO peter, antonio
 ```
 
-enable the user `peter` to see rows only if both `b=1` AND `c=2`.
+enables the user `peter` to see rows only if both `b=1` AND `c=2`.
 
 Database policies are combined with table policies.
 
-For example, the following policies:
+For example, the following policies
 
 ``` sql
 CREATE ROW POLICY pol1 ON mydb.* USING b=1 TO mira, peter
 CREATE ROW POLICY pol2 ON mydb.table1 USING c=2 AS RESTRICTIVE TO peter, antonio
 ```
 
-enable the user `peter` to see table1 rows only if both `b=1` AND `c=2`, although
+enables the user `peter` to see table1 rows only if both `b=1` AND `c=2`, although
 any other table in mydb would have only `b=1` policy applied for the user.
 
 
diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index 7428e6cd6ca..b866d0b9f5f 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -21,7 +21,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
     name2 [type2] [NULL|NOT NULL] [DEFAULT|MATERIALIZED|EPHEMERAL|ALIAS expr2] [COMMENT 'comment for column'] [compression_codec] [TTL expr2],
     ...
 ) ENGINE = engine
-  [COMMENT 'comment for table']
+  COMMENT 'comment for table'
 ```
 
 Creates a table named `table_name` in the `db` database or the current database if `db` is not set, with the structure specified in brackets and the `engine` engine.
@@ -241,12 +241,12 @@ CREATE OR REPLACE TABLE test
 (
     id UInt64,
     size_bytes Int64,
-    size String ALIAS formatReadableSize(size_bytes)
+    size String Alias formatReadableSize(size_bytes)
 )
 ENGINE = MergeTree
 ORDER BY id;
 
-INSERT INTO test VALUES (1, 4678899);
+INSERT INTO test Values (1, 4678899);
 
 SELECT id, size_bytes, size FROM test;
 ┌─id─┬─size_bytes─┬─size─────┐
@@ -497,7 +497,7 @@ If you perform a SELECT query mentioning a specific value in an encrypted column
 ```sql
 CREATE TABLE mytable
 (
-    x String CODEC(AES_128_GCM_SIV)
+    x String Codec(AES_128_GCM_SIV)
 )
 ENGINE = MergeTree ORDER BY x;
 ```
@@ -626,6 +626,11 @@ SELECT * FROM base.t1;
 
 You can add a comment to the table when you creating it.
 
+:::note
+The comment clause is supported by all table engines except [Kafka](../../../engines/table-engines/integrations/kafka.md), [RabbitMQ](../../../engines/table-engines/integrations/rabbitmq.md) and [EmbeddedRocksDB](../../../engines/table-engines/integrations/embedded-rocksdb.md).
+:::
+
+
 **Syntax**
 
 ``` sql
diff --git a/docs/en/sql-reference/statements/create/view.md b/docs/en/sql-reference/statements/create/view.md
index 45e7a41e8a2..1fabb6d8cc7 100644
--- a/docs/en/sql-reference/statements/create/view.md
+++ b/docs/en/sql-reference/statements/create/view.md
@@ -13,10 +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]
-[DEFINER = { user | CURRENT_USER }] [SQL SECURITY { DEFINER | INVOKER | NONE }]
+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 ...
-[COMMENT 'comment']
 ```
 
 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.
@@ -55,10 +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]
-[DEFINER = { user | CURRENT_USER }] [SQL SECURITY { DEFINER | INVOKER | NONE }]
+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 ...
-[COMMENT 'comment']
 ```
 
 :::tip
@@ -92,7 +90,7 @@ Given that `POPULATE` works like `CREATE TABLE ... AS SELECT ...` it has limitat
 - It is not supported with Replicated database
 - It is not supported in ClickHouse cloud
 
-Instead a separate `INSERT ... SELECT` can be used.
+Instead a separate `INSERT ... SELECT` can be used.  
 :::
 
 A `SELECT` query can contain `DISTINCT`, `GROUP BY`, `ORDER BY`, `LIMIT`. Note that the corresponding conversions are performed independently on each block of inserted data. For example, if `GROUP BY` is set, data is aggregated during insertion, but only within a single packet of inserted data. The data won’t be further aggregated. The exception is when using an `ENGINE` that independently performs data aggregation, such as `SummingMergeTree`.
@@ -110,7 +108,7 @@ To delete a view, use [DROP VIEW](../../../sql-reference/statements/drop.md#drop
 `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.
+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                                                                                                 |
@@ -130,7 +128,7 @@ If `DEFINER`/`SQL SECURITY` aren't specified, the default values are used:
 
 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
+To change SQL security for an existing view, use 
 ```sql
 ALTER TABLE MODIFY SQL SECURITY { DEFINER | INVOKER | NONE } [DEFINER = { user | CURRENT_USER }]
 ```
@@ -161,34 +159,26 @@ CREATE MATERIALIZED VIEW [IF NOT EXISTS] [db.]table_name
 REFRESH EVERY|AFTER interval [OFFSET interval]
 RANDOMIZE FOR interval
 DEPENDS ON [db.]name [, [db.]name [, ...]]
-SETTINGS name = value [, name = value [, ...]]
-[APPEND]
 [TO[db.]name] [(columns)] [ENGINE = engine] [EMPTY]
 AS SELECT ...
-[COMMENT 'comment']
 ```
 where `interval` is a sequence of simple intervals:
 ```sql
 number SECOND|MINUTE|HOUR|DAY|WEEK|MONTH|YEAR
 ```
 
-Periodically runs the corresponding query and stores its result in a table.
- * If the query says `APPEND`, each refresh inserts rows into the table without deleting existing rows. The insert is not atomic, just like a regular INSERT SELECT.
- * Otherwise each refresh atomically replaces the table's previous contents.
+Periodically runs the corresponding query and stores its result in a table, atomically replacing the table's previous contents.
 
 Differences from regular non-refreshable materialized views:
- * No insert trigger. I.e. when new data is inserted into the table specified in SELECT, it's *not* automatically pushed to the refreshable materialized view. The periodic refresh runs the entire query.
+ * No insert trigger. I.e. when new data is inserted into the table specified in SELECT, it's *not* automatically pushed to the refreshable materialized view. The periodic refresh runs the entire query and replaces the entire table.
  * No restrictions on the SELECT query. Table functions (e.g. `url()`), views, UNION, JOIN, are all allowed.
 
-:::note
-The settings in the `REFRESH ... SETTINGS` part of the query are refresh settings (e.g. `refresh_retries`), distinct from regular settings (e.g. `max_threads`). Regular settings can be specified using `SETTINGS` at the end of the query.
-:::
-
 :::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
  * 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.
 :::
 
@@ -253,22 +243,15 @@ A few more examples:
 `DEPENDS ON` only works between refreshable materialized views. Listing a regular table in the `DEPENDS ON` list will prevent the view from ever refreshing (dependencies can be removed with `ALTER`, see below).
 :::
 
-### Settings
-
-Available refresh settings:
- * `refresh_retries` - How many times to retry if refresh query fails with an exception. If all retries fail, skip to the next scheduled refresh time. 0 means no retries, -1 means infinite retries. Default: 0.
- * `refresh_retry_initial_backoff_ms` - Delay before the first retry, if `refresh_retries` is not zero. Each subsequent retry doubles the delay, up to `refresh_retry_max_backoff_ms`. Default: 100 ms.
- * `refresh_retry_max_backoff_ms` - Limit on the exponential growth of delay between refresh attempts. Default: 60000 ms (1 minute).
-
 ### Changing Refresh Parameters {#changing-refresh-parameters}
 
 To change refresh parameters:
 ```
-ALTER TABLE [db.]name MODIFY REFRESH EVERY|AFTER ... [RANDOMIZE FOR ...] [DEPENDS ON ...] [SETTINGS ...]
+ALTER TABLE [db.]name MODIFY REFRESH EVERY|AFTER ... [RANDOMIZE FOR ...] [DEPENDS ON ...]
 ```
 
 :::note
-This replaces *all* refresh parameters at once: schedule, dependencies, settings, and APPEND-ness. E.g. if the table had a `DEPENDS ON`, doing a `MODIFY REFRESH` without `DEPENDS ON` will remove the dependencies.
+This replaces refresh schedule *and* dependencies. If the table had a `DEPENDS ON`, doing a `MODIFY REFRESH` without `DEPENDS ON` will remove the dependencies.
 :::
 
 ### Other operations
@@ -277,10 +260,6 @@ The status of all refreshable materialized views is available in table [`system.
 
 To manually stop, start, trigger, or cancel refreshes use [`SYSTEM STOP|START|REFRESH|CANCEL VIEW`](../system.md#refreshable-materialized-views).
 
-:::note
-Fun fact: the refresh query is allowed to read from the view that's being refreshed, seeing pre-refresh version of the data. This means you can implement Conway's game of life: https://pastila.nl/?00021a4b/d6156ff819c83d490ad2dcec05676865#O0LGWTO7maUQIA4AcGUtlA==
-:::
-
 ## Window View [Experimental]
 
 :::info
@@ -288,10 +267,7 @@ This is an experimental feature that may change in backwards-incompatible ways i
 :::
 
 ``` sql
-CREATE WINDOW VIEW [IF NOT EXISTS] [db.]table_name [TO [db.]table_name] [INNER ENGINE engine] [ENGINE engine] [WATERMARK strategy] [ALLOWED_LATENESS interval_function] [POPULATE]
-AS SELECT ...
-GROUP BY time_window_function
-[COMMENT 'comment']
+CREATE WINDOW VIEW [IF NOT EXISTS] [db.]table_name [TO [db.]table_name] [INNER ENGINE engine] [ENGINE engine] [WATERMARK strategy] [ALLOWED_LATENESS interval_function] [POPULATE] AS SELECT ... GROUP BY time_window_function
 ```
 
 Window view can aggregate data by time window and output the results when the window is ready to fire. It stores the partial aggregation results in an inner(or specified) table to reduce latency and can push the processing result to a specified table or push notifications using the WATCH query.
diff --git a/docs/en/sql-reference/statements/delete.md b/docs/en/sql-reference/statements/delete.md
index 5733efbf8f2..a52b7204c30 100644
--- a/docs/en/sql-reference/statements/delete.md
+++ b/docs/en/sql-reference/statements/delete.md
@@ -10,10 +10,10 @@ title: The Lightweight DELETE Statement
 The lightweight `DELETE` statement removes rows from the table `[db.]table` that match the expression `expr`. It is only available for the *MergeTree table engine family.
 
 ``` sql
-DELETE FROM [db.]table [ON CLUSTER cluster] [IN PARTITION partition_expr] WHERE expr;
+DELETE FROM [db.]table [ON CLUSTER cluster] WHERE expr;
 ```
 
-It is called "lightweight `DELETE`" to contrast it to the [ALTER TABLE ... DELETE](/en/sql-reference/statements/alter/delete) command, which is a heavyweight process.
+It is called "lightweight `DELETE`" to contrast it to the [ALTER table DELETE](/en/sql-reference/statements/alter/delete) command, which is a heavyweight process.
 
 ## Examples
 
@@ -22,27 +22,23 @@ It is called "lightweight `DELETE`" to contrast it to the [ALTER TABLE ... DELET
 DELETE FROM hits WHERE Title LIKE '%hello%';
 ```
 
-## Lightweight `DELETE` does not delete data immediately
+## Lightweight `DELETE` does not delete data from storage immediately
 
-Lightweight `DELETE` is implemented as a [mutation](/en/sql-reference/statements/alter#mutations) that marks rows as deleted but does not immediately physically delete them.
+With lightweight `DELETE`, deleted rows are internally marked as deleted immediately and will be automatically filtered out of all subsequent queries. However, cleanup of data happens during the next merge. As a result, it is possible that for an unspecified period, data is not actually deleted from storage and is only marked as deleted.
 
-By default, `DELETE` statements wait until marking the rows as deleted is completed before returning. This can take a long time if the amount of data is large. Alternatively, you can run it asynchronously in the background using the setting [`lightweight_deletes_sync`](/en/operations/settings/settings#lightweight_deletes_sync). If disabled, the `DELETE` statement is going to return immediately, but the data can still be visible to queries until the background mutation is finished.
-
-The mutation does not physically delete the rows that have been marked as deleted, this will only happen during the next merge. As a result, it is possible that for an unspecified period, data is not actually deleted from storage and is only marked as deleted.
-
-If you need to guarantee that your data is deleted from storage in a predictable time, consider using the table setting [`min_age_to_force_merge_seconds`](https://clickhouse.com/docs/en/operations/settings/merge-tree-settings#min_age_to_force_merge_seconds). Or you can use the [ALTER TABLE ... DELETE](/en/sql-reference/statements/alter/delete) command. Note that deleting data using `ALTER TABLE ... DELETE` may consume significant resources as it recreates all affected parts.
+If you need to guarantee that your data is deleted from storage in a predictable time, consider using the [ALTER table DELETE](/en/sql-reference/statements/alter/delete) command. Note that deleting data using `ALTER table DELETE` may consume significant resources as it recreates all affected parts.
 
 ## Deleting large amounts of data
 
 Large deletes can negatively affect ClickHouse performance. If you are attempting to delete all rows from a table, consider using the [`TRUNCATE TABLE`](/en/sql-reference/statements/truncate) command.
 
-If you anticipate frequent deletes, consider using a [custom partitioning key](/en/engines/table-engines/mergetree-family/custom-partitioning-key). You can then use the [`ALTER TABLE ... DROP PARTITION`](/en/sql-reference/statements/alter/partition#drop-partitionpart) command to quickly drop all rows associated with that partition.
+If you anticipate frequent deletes, consider using a [custom partitioning key](/en/engines/table-engines/mergetree-family/custom-partitioning-key). You can then use the [`ALTER TABLE...DROP PARTITION`](/en/sql-reference/statements/alter/partition#drop-partitionpart) command to quickly drop all rows associated with that partition.
 
 ## Limitations of lightweight `DELETE`
 
-### Lightweight `DELETE`s with projections
+### Lightweight `DELETE`s do not work with projections
 
-By default, `DELETE` does not work for tables with projections. This is because rows in a projection may be affected by a `DELETE` operation. But there is a [MergeTree setting](https://clickhouse.com/docs/en/operations/settings/merge-tree-settings) `lightweight_mutation_projection_mode` to change the behavior.
+Currently, `DELETE` does not work for tables with projections. This is because rows in a projection may be affected by a `DELETE` operation and may require the projection to be rebuilt, negatively affecting `DELETE` performance.
 
 ## Performance considerations when using lightweight `DELETE`
 
@@ -52,7 +48,7 @@ The following can also negatively impact lightweight `DELETE` performance:
 
 - A heavy `WHERE` condition in a `DELETE` query.
 - If the mutations queue is filled with many other mutations, this can possibly lead to performance issues as all mutations on a table are executed sequentially.
-- The affected table has a very large number of data parts.
+- The affected table having a very large number of data parts.
 - Having a lot of data in compact parts. In a Compact part, all columns are stored in one file.
 
 ## Delete permissions
@@ -65,31 +61,31 @@ GRANT ALTER DELETE ON db.table to username;
 
 ## How lightweight DELETEs work internally in ClickHouse
 
-1. **A "mask" is applied to affected rows**
+1. A "mask" is applied to affected rows
 
-   When a `DELETE FROM table ...` query is executed, ClickHouse saves a mask where each row is marked as either “existing” or as “deleted”. Those “deleted” rows are omitted for subsequent queries. However, rows are actually only removed later by subsequent merges. Writing this mask is much more lightweight than what is done by an `ALTER TABLE ... DELETE` query.
+When a `DELETE FROM table ...` query is executed, ClickHouse saves a mask where each row is marked as either “existing” or as “deleted”. Those “deleted” rows are omitted for subsequent queries. However, rows are actually only removed later by subsequent merges. Writing this mask is much more lightweight than what is done by an `ALTER table DELETE` query.
 
-   The mask is implemented as a hidden `_row_exists` system column that stores `True` for all visible rows and `False` for deleted ones. This column is only present in a part if some rows in the part were deleted. This column does not exist when a part has all values equal to `True`.
+The mask is implemented as a hidden `_row_exists` system column that stores `True` for all visible rows and `False` for deleted ones. This column is only present in a part if some rows in the part were deleted. This column does not exist when a part has all values equal to `True`.
 
-2. **`SELECT` queries are transformed to include the mask**
+2. `SELECT` queries are transformed to include the mask
 
-   When a masked column is used in a query, the `SELECT ... FROM table WHERE condition` query internally is extended by the predicate on `_row_exists` and is transformed to:
-   ```sql
-   SELECT ... FROM table PREWHERE _row_exists WHERE condition
-   ```
-   At execution time, the column `_row_exists` is read to determine which rows should not be returned. If there are many deleted rows, ClickHouse can determine which granules can be fully skipped when reading the rest of the columns.
+When a masked column is used in a query, the `SELECT ... FROM table WHERE condition` query internally is extended by the predicate on `_row_exists` and is transformed to:
+```sql
+SELECT ... FROM table PREWHERE _row_exists WHERE condition
+```
+At execution time, the column `_row_exists` is read to determine which rows should not be returned. If there are many deleted rows, ClickHouse can determine which granules can be fully skipped when reading the rest of the columns.
 
-3. **`DELETE` queries are transformed to `ALTER TABLE ... UPDATE` queries**
+3. `DELETE` queries are transformed to `ALTER table UPDATE` queries
 
-   The `DELETE FROM table WHERE condition` is translated into an `ALTER TABLE table UPDATE _row_exists = 0 WHERE condition` mutation.
+The `DELETE FROM table WHERE condition` is translated into an `ALTER table UPDATE _row_exists = 0 WHERE condition` mutation.
 
-   Internally, this mutation is executed in two steps:
+Internally, this mutation is executed in two steps:
 
-   1. A `SELECT count() FROM table WHERE condition` command is executed for each individual part to determine if the part is affected.
+1. A `SELECT count() FROM table WHERE condition` command is executed for each individual part to determine if the part is affected.
 
-   2. Based on the commands above, affected parts are then mutated, and hardlinks are created for unaffected parts. In the case of wide parts, the `_row_exists` column for each row is updated, and all other columns' files are hardlinked. For compact parts, all columns are re-written because they are all stored together in one file.
+2. Based on the commands above, affected parts are then mutated, and hardlinks are created for unaffected parts. In the case of wide parts, the `_row_exists` column for each row is updated and all other columns' files are hardlinked. For compact parts, all columns are re-written because they are all stored together in one file.
 
-   From the steps above, we can see that lightweight `DELETE` using the masking technique improves performance over traditional `ALTER TABLE ... DELETE` because it does not re-write all the columns' files for affected parts.
+From the steps above, we can see that lightweight deletes using the masking technique improves performance over traditional `ALTER table DELETE` commands because `ALTER table DELETE` reads and re-writes all the columns' files for affected parts.
 
 ## Related content
 
diff --git a/docs/en/sql-reference/statements/grant.md b/docs/en/sql-reference/statements/grant.md
index 6118f4c1d36..43fa344a16d 100644
--- a/docs/en/sql-reference/statements/grant.md
+++ b/docs/en/sql-reference/statements/grant.md
@@ -200,7 +200,6 @@ Hierarchy of privileges:
     - `JDBC`
     - `HDFS`
     - `S3`
-    - `POSTGRES`
 - [dictGet](#dictget)
 - [displaySecretsInShowAndSelect](#displaysecretsinshowandselect)
 - [NAMED COLLECTION ADMIN](#named-collection-admin)
@@ -477,7 +476,6 @@ Allows using external data sources. Applies to [table engines](../../engines/tab
     - `JDBC`. Level: `GLOBAL`
     - `HDFS`. Level: `GLOBAL`
     - `S3`. Level: `GLOBAL`
-    - `POSTGRES`. Level: `GLOBAL`
 
 The `SOURCES` privilege enables use of all the sources. Also you can grant a privilege for each source individually. To use sources, you need additional privileges.
 
diff --git a/docs/en/sql-reference/statements/select/from.md b/docs/en/sql-reference/statements/select/from.md
index f319e7b1357..7a6e2ab054c 100644
--- a/docs/en/sql-reference/statements/select/from.md
+++ b/docs/en/sql-reference/statements/select/from.md
@@ -15,14 +15,7 @@ The `FROM` clause specifies the source to read data from:
 
 Subquery is another `SELECT` query that may be specified in parenthesis inside `FROM` clause.
 
-The `FROM` can contain multiple data sources, separated by commas, which is equivalent of performing [CROSS JOIN](../../../sql-reference/statements/select/join.md) on them.
-
-`FROM` can optionally appear before a `SELECT` clause. This is a ClickHouse-specific extension of standard SQL which makes `SELECT` statements easier to read. Example:
-
-```sql
-FROM table
-SELECT *
-```
+`FROM` clause can contain multiple data sources, separated by commas, which is equivalent of performing [CROSS JOIN](../../../sql-reference/statements/select/join.md) on them.
 
 ## FINAL Modifier
 
@@ -52,19 +45,19 @@ As an alternative to using `FINAL`, it is sometimes possible to use different qu
 
 ### Example Usage
 
-Using the `FINAL` keyword
+**Using the `FINAL` keyword**
 
 ```sql
 SELECT x, y FROM mytable FINAL WHERE x > 1;
 ```
 
-Using `FINAL` as a query-level setting
+**Using `FINAL` as a query-level setting**
 
 ```sql
 SELECT x, y FROM mytable WHERE x > 1 SETTINGS final = 1;
 ```
 
-Using `FINAL` as a session-level setting
+**Using `FINAL` as a session-level setting**
 
 ```sql
 SET final = 1;
diff --git a/docs/en/sql-reference/statements/select/join.md b/docs/en/sql-reference/statements/select/join.md
index b228f7025c4..96d9d26977d 100644
--- a/docs/en/sql-reference/statements/select/join.md
+++ b/docs/en/sql-reference/statements/select/join.md
@@ -186,7 +186,7 @@ Otherwise, you'll get `INVALID_JOIN_ON_EXPRESSION`.
 
 :::
 
-Clickhouse currently supports `ALL/ANY/SEMI/ANTI INNER/LEFT/RIGHT/FULL JOIN` with inequality conditions in addition to equality conditions. The inequality conditions are supported only for `hash` and `grace_hash` join algorithms. The inequality conditions are not supported with `join_use_nulls`.
+Clickhouse currently supports `ALL INNER/LEFT/RIGHT/FULL JOIN` with inequality conditions in addition to equality conditions. The inequality conditions are supported only for `hash` and `grace_hash` join algorithms. The inequality conditions are not supported with `join_use_nulls`.
 
 **Example**
 
diff --git a/docs/en/sql-reference/statements/system.md b/docs/en/sql-reference/statements/system.md
index 77d023b67ce..e6d3439d2b9 100644
--- a/docs/en/sql-reference/statements/system.md
+++ b/docs/en/sql-reference/statements/system.md
@@ -18,21 +18,10 @@ Reloads all dictionaries that have been successfully loaded before.
 By default, dictionaries are loaded lazily (see [dictionaries_lazy_load](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-dictionaries_lazy_load)), so instead of being loaded automatically at startup, they are initialized on first access through dictGet function or SELECT from tables with ENGINE = Dictionary. The `SYSTEM RELOAD DICTIONARIES` query reloads such dictionaries (LOADED).
 Always returns `Ok.` regardless of the result of the dictionary update.
 
-**Syntax**
-
-```sql
-SYSTEM RELOAD DICTIONARIES [ON CLUSTER cluster_name]
-```
-
 ## RELOAD DICTIONARY
 
 Completely reloads a dictionary `dictionary_name`, regardless of the state of the dictionary (LOADED / NOT_LOADED / FAILED).
 Always returns `Ok.` regardless of the result of updating the dictionary.
-
-``` sql
-SYSTEM RELOAD DICTIONARY [ON CLUSTER cluster_name] dictionary_name
-```
-
 The status of the dictionary can be checked by querying the `system.dictionaries` table.
 
 ``` sql
@@ -136,13 +125,7 @@ The compiled expression cache is enabled/disabled with the query/user/profile-le
 
 ## DROP QUERY CACHE
 
-```sql
-SYSTEM DROP QUERY CACHE;
-SYSTEM DROP QUERY CACHE TAG '<tag>'
-````
-
 Clears the [query cache](../../operations/query-cache.md).
-If a tag is specified, only query cache entries with the specified tag are deleted.
 
 ## DROP FORMAT SCHEMA CACHE {#system-drop-schema-format}
 
@@ -406,7 +389,7 @@ SYSTEM SYNC REPLICA [ON CLUSTER cluster_name] [db.]replicated_merge_tree_family_
 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.
 
@@ -532,10 +515,6 @@ Trigger an immediate out-of-schedule refresh of a given view.
 SYSTEM REFRESH VIEW [db.]name
 ```
 
-### REFRESH VIEW
-
-Wait for the currently running refresh to complete. If the refresh fails, throws an exception. If no refresh is running, completes immediately, throwing an exception if previous refresh failed.
-
 ### STOP VIEW, STOP VIEWS
 
 Disable periodic refreshing of the given view or all refreshable views. If a refresh is in progress, cancel it too.
diff --git a/docs/en/sql-reference/table-functions/azureBlobStorage.md b/docs/en/sql-reference/table-functions/azureBlobStorage.md
index 6936c807f96..f59fedeb3a2 100644
--- a/docs/en/sql-reference/table-functions/azureBlobStorage.md
+++ b/docs/en/sql-reference/table-functions/azureBlobStorage.md
@@ -77,16 +77,3 @@ SELECT count(*) FROM azureBlobStorage('DefaultEndpointsProtocol=https;AccountNam
 **See Also**
 
 - [AzureBlobStorage Table Engine](/docs/en/engines/table-engines/integrations/azureBlobStorage.md)
-
-## Hive-style partitioning {#hive-style-partitioning}
-
-When setting `use_hive_partitioning` is set to 1, ClickHouse will detect Hive-style partitioning in the path (`/name=value/`) and will allow to use partition columns as virtual columns in the query. These virtual columns will have the same names as in the partitioned path, but starting with `_`.
-
-**Example**
-
-Use virtual column, created with Hive-style partitioning
-
-``` sql
-SET use_hive_partitioning = 1;
-SELECT * from azureBlobStorage(config, storage_account_url='...', container='...', blob_path='http://data/path/date=*/country=*/code=*/*.parquet') where _date > '2020-01-01' and _country = 'Netherlands' and _code = 42;
-```
diff --git a/docs/en/sql-reference/table-functions/file.md b/docs/en/sql-reference/table-functions/file.md
index 3243e6cf569..44b1b50620a 100644
--- a/docs/en/sql-reference/table-functions/file.md
+++ b/docs/en/sql-reference/table-functions/file.md
@@ -103,7 +103,7 @@ LIMIT 2;
 └─────────┴─────────┴─────────┘
 ```
 
-### Inserting data from a file into a table
+### Inserting data from a file into a table:
 
 ``` sql
 INSERT INTO FUNCTION
@@ -206,19 +206,6 @@ SELECT count(*) FROM file('big_dir/**/file002', 'CSV', 'name String, value UInt3
 - `_size` — Size of the file in bytes. Type: `Nullable(UInt64)`. If the file size is unknown, the value is `NULL`.
 - `_time` — Last modified time of the file. Type: `Nullable(DateTime)`. If the time is unknown, the value is `NULL`.
 
-## Hive-style partitioning {#hive-style-partitioning}
-
-When setting `use_hive_partitioning` is set to 1, ClickHouse will detect Hive-style partitioning in the path (`/name=value/`) and will allow to use partition columns as virtual columns in the query. These virtual columns will have the same names as in the partitioned path, but starting with `_`.
-
-**Example**
-
-Use virtual column, created with Hive-style partitioning
-
-``` sql
-SET use_hive_partitioning = 1;
-SELECT * from file('data/path/date=*/country=*/code=*/*.parquet') where _date > '2020-01-01' and _country = 'Netherlands' and _code = 42;
-```
-
 ## Settings {#settings}
 
 - [engine_file_empty_if_not_exists](/docs/en/operations/settings/settings.md#engine-file-empty_if-not-exists) - allows to select empty data from a file that doesn't exist. Disabled by default.
diff --git a/docs/en/sql-reference/table-functions/fuzzQuery.md b/docs/en/sql-reference/table-functions/fuzzQuery.md
deleted file mode 100644
index e15f8a40156..00000000000
--- a/docs/en/sql-reference/table-functions/fuzzQuery.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-slug: /en/sql-reference/table-functions/fuzzQuery
-sidebar_position: 75
-sidebar_label: fuzzQuery
----
-
-# fuzzQuery
-
-Perturbs the given query string with random variations.
-
-``` sql
-fuzzQuery(query[, max_query_length[, random_seed]])
-```
-
-**Arguments**
-
-- `query` (String) - The source query to perform the fuzzing on.
-- `max_query_length` (UInt64) - A maximum length the query can get during the fuzzing process.
-- `random_seed` (UInt64) - A random seed for producing stable results.
-
-**Returned Value**
-
-A table object with a single column containing perturbed query strings.
-
-## Usage Example
-
-``` sql
-SELECT * FROM fuzzQuery('SELECT materialize(\'a\' AS key) GROUP BY key') LIMIT 2;
-```
-
-```
-   ┌─query──────────────────────────────────────────────────────────┐
-1. │ SELECT 'a' AS key GROUP BY key                                 │
-2. │ EXPLAIN PIPELINE compact = true SELECT 'a' AS key GROUP BY key │
-   └────────────────────────────────────────────────────────────────┘
-```
diff --git a/docs/en/sql-reference/table-functions/hdfs.md b/docs/en/sql-reference/table-functions/hdfs.md
index 30d2e371c7e..28cba5ccc6a 100644
--- a/docs/en/sql-reference/table-functions/hdfs.md
+++ b/docs/en/sql-reference/table-functions/hdfs.md
@@ -44,7 +44,6 @@ LIMIT 2
 Paths may use globbing. Files must match the whole path pattern, not only the suffix or prefix.
 
 - `*` — Represents arbitrarily many characters except `/` but including the empty string.
-- `**` — Represents all files inside a folder recursively.
 - `?` — Represents an arbitrary single character.
 - `{some_string,another_string,yet_another_one}` — Substitutes any of strings `'some_string', 'another_string', 'yet_another_one'`. The strings can contain the `/` symbol.
 - `{N..M}` — Represents any number `>= N` and `<= M`.
@@ -100,23 +99,10 @@ FROM hdfs('hdfs://hdfs1:9000/big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name Strin
 - `_size` — Size of the file in bytes. Type: `Nullable(UInt64)`. If the size is unknown, the value is `NULL`.
 - `_time` — Last modified time of the file. Type: `Nullable(DateTime)`. If the time is unknown, the value is `NULL`.
 
-## Hive-style partitioning {#hive-style-partitioning}
-
-When setting `use_hive_partitioning` is set to 1, ClickHouse will detect Hive-style partitioning in the path (`/name=value/`) and will allow to use partition columns as virtual columns in the query. These virtual columns will have the same names as in the partitioned path, but starting with `_`.
-
-**Example**
-
-Use virtual column, created with Hive-style partitioning
-
-``` sql
-SET use_hive_partitioning = 1;
-SELECT * from HDFS('hdfs://hdfs1:9000/data/path/date=*/country=*/code=*/*.parquet') where _date > '2020-01-01' and _country = 'Netherlands' and _code = 42;
-```
-
 ## Storage Settings {#storage-settings}
 
 - [hdfs_truncate_on_insert](/docs/en/operations/settings/settings.md#hdfs_truncate_on_insert) - allows to truncate file before insert into it. Disabled by default.
-- [hdfs_create_new_file_on_insert](/docs/en/operations/settings/settings.md#hdfs_create_new_file_on_insert) - allows to create a new file on each insert if format has suffix. Disabled by default.
+- [hdfs_create_multiple_files](/docs/en/operations/settings/settings.md#hdfs_allow_create_multiple_files) - allows to create a new file on each insert if format has suffix. Disabled by default.
 - [hdfs_skip_empty_files](/docs/en/operations/settings/settings.md#hdfs_skip_empty_files) - allows to skip empty files while reading. Disabled by default.
 - [ignore_access_denied_multidirectory_globs](/docs/en/operations/settings/settings.md#ignore_access_denied_multidirectory_globs) - allows to ignore permission denied errors for multi-directory globs.
 
diff --git a/docs/en/sql-reference/table-functions/iceberg.md b/docs/en/sql-reference/table-functions/iceberg.md
index 784fd646860..fa86b436a5e 100644
--- a/docs/en/sql-reference/table-functions/iceberg.md
+++ b/docs/en/sql-reference/table-functions/iceberg.md
@@ -6,37 +6,35 @@ sidebar_label: iceberg
 
 # iceberg Table Function
 
-Provides a read-only table-like interface to Apache [Iceberg](https://iceberg.apache.org/) tables in Amazon S3, Azure or locally stored.
+Provides a read-only table-like interface to Apache [Iceberg](https://iceberg.apache.org/) tables in Amazon S3.
 
 ## Syntax
 
 ``` sql
-icebergS3(url [, NOSIGN | access_key_id, secret_access_key, [session_token]] [,format] [,compression_method])
-icebergS3(named_collection[, option=value [,..]])
-
-icebergAzure(connection_string|storage_account_url, container_name, blobpath, [,account_name], [,account_key] [,format] [,compression_method])
-icebergAzure(named_collection[, option=value [,..]])
-
-icebergLocal(path_to_table, [,format] [,compression_method])
-icebergLocal(named_collection[, option=value [,..]])
+iceberg(url [,aws_access_key_id, aws_secret_access_key] [,format] [,structure])
 ```
 
 ## Arguments
 
-Description of the arguments coincides with description of arguments in table functions `s3`, `azureBlobStorage` and `file` correspondingly.
-`format` stands for the format of data files in the Iceberg table.
+- `url` — Bucket url with the path to an existing Iceberg table in S3.
+- `aws_access_key_id`, `aws_secret_access_key` - Long-term credentials for the [AWS](https://aws.amazon.com/) account user.  You can use these to authenticate your requests. These parameters are optional. If credentials are not specified, they are used from the ClickHouse configuration. For more information see [Using S3 for Data Storage](/docs/en/engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-s3).
+- `format` — The [format](/docs/en/interfaces/formats.md/#formats) of the file. By default `Parquet` is used.
+- `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
+
+Engine parameters can be specified using [Named Collections](/docs/en/operations/named-collections.md).
 
 **Returned value**
-A table with the specified structure for reading data in the specified Iceberg table.
+
+A table with the specified structure for reading data in the specified Iceberg table in S3.
 
 **Example**
 
 ```sql
-SELECT * FROM icebergS3('http://test.s3.amazonaws.com/clickhouse-bucket/test_table', 'test', 'test')
+SELECT * FROM iceberg('http://test.s3.amazonaws.com/clickhouse-bucket/test_table', 'test', 'test')
 ```
 
 :::important
-ClickHouse currently supports reading v1 and v2 of the Iceberg format via the `icebergS3`, `icebergAzure` and `icebergLocal` table functions and `IcebergS3`, `icebergAzure` ans `icebergLocal` table engines.
+ClickHouse currently supports reading v1 (v2 support is coming soon!) of the Iceberg format via the `iceberg` table function and `Iceberg` table engine.
 :::
 
 ## Defining a named collection
@@ -58,14 +56,10 @@ Here is an example of configuring a named collection for storing the URL and cre
 ```
 
 ```sql
-SELECT * FROM icebergS3(iceberg_conf, filename = 'test_table')
-DESCRIBE icebergS3(iceberg_conf, filename = 'test_table')
+SELECT * FROM iceberg(iceberg_conf, filename = 'test_table')
+DESCRIBE iceberg(iceberg_conf, filename = 'test_table')
 ```
 
-**Aliases**
-
-Table function `iceberg` is an alias to `icebergS3` now.
-
 **See Also**
 
 - [Iceberg engine](/docs/en/engines/table-engines/integrations/iceberg.md)
diff --git a/docs/en/sql-reference/table-functions/s3.md b/docs/en/sql-reference/table-functions/s3.md
index 181c92b92d4..35e5d86034c 100644
--- a/docs/en/sql-reference/table-functions/s3.md
+++ b/docs/en/sql-reference/table-functions/s3.md
@@ -274,23 +274,10 @@ FROM s3(
 - `_size` — Size of the file in bytes. Type: `Nullable(UInt64)`. If the file size is unknown, the value is `NULL`. In case of archive shows uncompressed file size of the file inside the archive. 
 - `_time` — Last modified time of the file. Type: `Nullable(DateTime)`. If the time is unknown, the value is `NULL`.
 
-## Hive-style partitioning {#hive-style-partitioning}
-
-When setting `use_hive_partitioning` is set to 1, ClickHouse will detect Hive-style partitioning in the path (`/name=value/`) and will allow to use partition columns as virtual columns in the query. These virtual columns will have the same names as in the partitioned path, but starting with `_`.
-
-**Example**
-
-Use virtual column, created with Hive-style partitioning
-
-``` sql
-SET use_hive_partitioning = 1;
-SELECT * from s3('s3://data/path/date=*/country=*/code=*/*.parquet') where _date > '2020-01-01' and _country = 'Netherlands' and _code = 42;
-```
-
 ## Storage Settings {#storage-settings}
 
 - [s3_truncate_on_insert](/docs/en/operations/settings/settings.md#s3_truncate_on_insert) - allows to truncate file before insert into it. Disabled by default.
-- [s3_create_new_file_on_insert](/docs/en/operations/settings/settings.md#s3_create_new_file_on_insert) - allows to create a new file on each insert if format has suffix. Disabled by default.
+- [s3_create_multiple_files](/docs/en/operations/settings/settings.md#s3_allow_create_multiple_files) - allows to create a new file on each insert if format has suffix. Disabled by default.
 - [s3_skip_empty_files](/docs/en/operations/settings/settings.md#s3_skip_empty_files) - allows to skip empty files while reading. Disabled by default.
 
 **See Also**
diff --git a/docs/en/sql-reference/table-functions/timeSeriesData.md b/docs/en/sql-reference/table-functions/timeSeriesData.md
deleted file mode 100644
index aa7a9d30c2a..00000000000
--- a/docs/en/sql-reference/table-functions/timeSeriesData.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-slug: /en/sql-reference/table-functions/timeSeriesData
-sidebar_position: 145
-sidebar_label: timeSeriesData
----
-
-# timeSeriesData
-
-`timeSeriesData(db_name.time_series_table)` - Returns the [data](../../engines/table-engines/integrations/time-series.md#data-table) table
-used by table `db_name.time_series_table` which table engine is [TimeSeries](../../engines/table-engines/integrations/time-series.md):
-
-``` sql
-CREATE TABLE db_name.time_series_table ENGINE=TimeSeries DATA data_table
-```
-
-The function also works if the _data_ table is inner:
-
-``` sql
-CREATE TABLE db_name.time_series_table ENGINE=TimeSeries DATA INNER UUID '01234567-89ab-cdef-0123-456789abcdef'
-```
-
-The following queries are equivalent:
-
-``` sql
-SELECT * FROM timeSeriesData(db_name.time_series_table);
-SELECT * FROM timeSeriesData('db_name.time_series_table');
-SELECT * FROM timeSeriesData('db_name', 'time_series_table');
-```
diff --git a/docs/en/sql-reference/table-functions/timeSeriesMetrics.md b/docs/en/sql-reference/table-functions/timeSeriesMetrics.md
deleted file mode 100644
index 913f1185bca..00000000000
--- a/docs/en/sql-reference/table-functions/timeSeriesMetrics.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-slug: /en/sql-reference/table-functions/timeSeriesMetrics
-sidebar_position: 145
-sidebar_label: timeSeriesMetrics
----
-
-# timeSeriesMetrics
-
-`timeSeriesMetrics(db_name.time_series_table)` - Returns the [metrics](../../engines/table-engines/integrations/time-series.md#metrics-table) table
-used by table `db_name.time_series_table` which table engine is [TimeSeries](../../engines/table-engines/integrations/time-series.md):
-
-``` sql
-CREATE TABLE db_name.time_series_table ENGINE=TimeSeries METRICS metrics_table
-```
-
-The function also works if the _metrics_ table is inner:
-
-``` sql
-CREATE TABLE db_name.time_series_table ENGINE=TimeSeries METRICS INNER UUID '01234567-89ab-cdef-0123-456789abcdef'
-```
-
-The following queries are equivalent:
-
-``` sql
-SELECT * FROM timeSeriesMetrics(db_name.time_series_table);
-SELECT * FROM timeSeriesMetrics('db_name.time_series_table');
-SELECT * FROM timeSeriesMetrics('db_name', 'time_series_table');
-```
diff --git a/docs/en/sql-reference/table-functions/timeSeriesTags.md b/docs/en/sql-reference/table-functions/timeSeriesTags.md
deleted file mode 100644
index 663a7dc6ac8..00000000000
--- a/docs/en/sql-reference/table-functions/timeSeriesTags.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-slug: /en/sql-reference/table-functions/timeSeriesTags
-sidebar_position: 145
-sidebar_label: timeSeriesTags
----
-
-# timeSeriesTags
-
-`timeSeriesTags(db_name.time_series_table)` - Returns the [tags](../../engines/table-engines/integrations/time-series.md#tags-table) table
-used by table `db_name.time_series_table` which table engine is [TimeSeries](../../engines/table-engines/integrations/time-series.md):
-
-``` sql
-CREATE TABLE db_name.time_series_table ENGINE=TimeSeries TAGS tags_table
-```
-
-The function also works if the _tags_ table is inner:
-
-``` sql
-CREATE TABLE db_name.time_series_table ENGINE=TimeSeries TAGS INNER UUID '01234567-89ab-cdef-0123-456789abcdef'
-```
-
-The following queries are equivalent:
-
-``` sql
-SELECT * FROM timeSeriesTags(db_name.time_series_table);
-SELECT * FROM timeSeriesTags('db_name.time_series_table');
-SELECT * FROM timeSeriesTags('db_name', 'time_series_table');
-```
diff --git a/docs/en/sql-reference/table-functions/url.md b/docs/en/sql-reference/table-functions/url.md
index 7a354ea0364..3bb7aff53a7 100644
--- a/docs/en/sql-reference/table-functions/url.md
+++ b/docs/en/sql-reference/table-functions/url.md
@@ -54,20 +54,6 @@ Character `|` inside patterns is used to specify failover addresses. They are it
 - `_file` — Resource name of the `URL`. Type: `LowCardinalty(String)`.
 - `_size` — Size of the resource in bytes. Type: `Nullable(UInt64)`. If the size is unknown, the value is `NULL`.
 - `_time` — Last modified time of the file. Type: `Nullable(DateTime)`. If the time is unknown, the value is `NULL`.
-- `_headers` - HTTP response headers. Type: `Map(LowCardinality(String), LowCardinality(String))`.
-
-## Hive-style partitioning {#hive-style-partitioning}
-
-When setting `use_hive_partitioning` is set to 1, ClickHouse will detect Hive-style partitioning in the path (`/name=value/`) and will allow to use partition columns as virtual columns in the query. These virtual columns will have the same names as in the partitioned path, but starting with `_`.
-
-**Example**
-
-Use virtual column, created with Hive-style partitioning
-
-``` sql
-SET use_hive_partitioning = 1;
-SELECT * from url('http://data/path/date=*/country=*/code=*/*.parquet') where _date > '2020-01-01' and _country = 'Netherlands' and _code = 42;
-```
 
 ## Storage Settings {#storage-settings}
 
diff --git a/docs/en/sql-reference/transactions.md b/docs/en/sql-reference/transactions.md
index cd97e9092c7..09cdc192b03 100644
--- a/docs/en/sql-reference/transactions.md
+++ b/docs/en/sql-reference/transactions.md
@@ -8,14 +8,14 @@ slug: /en/guides/developer/transactional
 This is transactional (ACID) if the inserted rows are packed and inserted as a single block (see Notes):
 - Atomic: an INSERT succeeds or is rejected as a whole: if a confirmation is sent to the client, then all rows were inserted; if an error is sent to the client, then no rows were inserted.
 - Consistent: if there are no table constraints violated, then all rows in an INSERT are inserted and the INSERT succeeds; if constraints are violated, then no rows are inserted.
-- Isolated: concurrent clients observe a consistent snapshot of the table–the state of the table either as it was before the INSERT attempt, or after the successful INSERT; no partial state is seen. Clients inside of another transaction have [snapshot isolation](https://en.wikipedia.org/wiki/Snapshot_isolation), while clients outside of a transaction have [read uncommitted](https://en.wikipedia.org/wiki/Isolation_(database_systems)#Read_uncommitted) isolation level.
+- Isolated: concurrent clients observe a consistent snapshot of the table–the state of the table either as it was before the INSERT attempt, or after the successful INSERT; no partial state is seen
 - Durable: a successful INSERT is written to the filesystem before answering to the client, on a single replica or multiple replicas (controlled by the `insert_quorum` setting), and ClickHouse can ask the OS to sync the filesystem data on the storage media (controlled by the `fsync_after_insert` setting).
 - INSERT into multiple tables with one statement is possible if materialized views are involved (the INSERT from the client is to a table which has associate materialized views).
 
 ## Case 2: INSERT into multiple partitions, of one table, of the MergeTree* family
 
 Same as Case 1 above, with this detail:
-- If table has many partitions and INSERT covers many partitions, then insertion into every partition is transactional on its own
+- If table has many partitions and INSERT covers many partitions–then insertion into every partition is transactional on its own
 
 
 ## Case 3: INSERT into one distributed table of the MergeTree* family
@@ -38,7 +38,7 @@ Same as Case 1 above, with this detail:
   - the insert format is column-based (like Native, Parquet, ORC, etc) and the data contains only one block of data
 - the size of the inserted block in general may depend on many settings (for example: `max_block_size`, `max_insert_block_size`, `min_insert_block_size_rows`, `min_insert_block_size_bytes`, `preferred_block_size_bytes`, etc)
 - if the client did not receive an answer from the server, the client does not know if the transaction succeeded, and it can repeat the transaction, using exactly-once insertion properties
-- ClickHouse is using [MVCC](https://en.wikipedia.org/wiki/Multiversion_concurrency_control) with [snapshot isolation](https://en.wikipedia.org/wiki/Snapshot_isolation) internally for concurrent transactions
+- ClickHouse is using MVCC with snapshot isolation internally
 - all ACID properties are valid even in the case of server kill/crash
 - either insert_quorum into different AZ or fsync should be enabled to ensure durable inserts in the typical setup
 - "consistency" in ACID terms does not cover the semantics of distributed systems, see https://jepsen.io/consistency which is controlled by different settings (select_sequential_consistency)
@@ -260,7 +260,7 @@ FROM mergetree_table
 ### Transactions introspection
 
 You can inspect transactions by querying the `system.transactions` table, but note that you cannot query that
-table from a session that is in a transaction. Open a second `clickhouse client` session to query that table.
+table from a session that is in a transaction–open a second `clickhouse client` session to query that table.
 
 ```sql
 SELECT *
diff --git a/docs/en/sql-reference/window-functions/dense_rank.md b/docs/en/sql-reference/window-functions/dense_rank.md
index 2c8617fb668..d6445b68c55 100644
--- a/docs/en/sql-reference/window-functions/dense_rank.md
+++ b/docs/en/sql-reference/window-functions/dense_rank.md
@@ -12,8 +12,6 @@ The [rank](./rank.md) function provides the same behaviour, but with gaps in ran
 
 **Syntax**
 
-Alias: `denseRank` (case-sensitive)
-
 ```sql
 dense_rank (column_name)
   OVER ([[PARTITION BY grouping_column] [ORDER BY sorting_column] 
diff --git a/docs/en/sql-reference/window-functions/index.md b/docs/en/sql-reference/window-functions/index.md
index 27d4bd763c7..0c3e2ea1cb6 100644
--- a/docs/en/sql-reference/window-functions/index.md
+++ b/docs/en/sql-reference/window-functions/index.md
@@ -23,8 +23,8 @@ ClickHouse supports the standard grammar for defining windows and window functio
 | `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()`                                           | ✅ <br/>Alias: `denseRank()`                                                                                                                                                                                   |
-| `percent_rank()` | ✅  Efficiently computes the relative standing of a value within a partition in a dataset. This function effectively replaces the more verbose and computationally intensive manual SQL calculation expressed as `ifNull((rank() OVER(PARTITION BY x ORDER BY y) - 1) / nullif(count(1) OVER(PARTITION BY x) - 1, 0), 0)` <br/>Alias: `percentRank()`| 
+| `rank()`, `dense_rank()`, `row_number()`                                           | ✅                                                                                                                                                                                   |
+| `percent_rank()` | ✅  Efficiently computes the relative standing of a value within a partition in a dataset. This function effectively replaces the more verbose and computationally intensive manual SQL calculation expressed as `ifNull((rank() OVER(PARTITION BY x ORDER BY y) - 1) / nullif(count(1) OVER(PARTITION BY x) - 1, 0), 0)`| 
 | `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). |
 
diff --git a/docs/en/sql-reference/window-functions/lagInFrame.md b/docs/en/sql-reference/window-functions/lagInFrame.md
index 01bf809e76e..fc5e2185b6a 100644
--- a/docs/en/sql-reference/window-functions/lagInFrame.md
+++ b/docs/en/sql-reference/window-functions/lagInFrame.md
@@ -23,7 +23,7 @@ For more detail on window function syntax see: [Window Functions - Syntax](./ind
 **Parameters**
 - `x` — Column name. 
 - `offset` — Offset to apply. [(U)Int*](../data-types/int-uint.md). (Optional - `1` by default).
-- `default` — Value to return if calculated row exceeds the boundaries of the window frame. (Optional - default value of column type when omitted).
+- `default` — Value to return if calculated row exceeds the boundaries of the window frame. (Optional - `null` by default).
 
 **Returned value**
 
diff --git a/docs/en/sql-reference/window-functions/leadInFrame.md b/docs/en/sql-reference/window-functions/leadInFrame.md
index dae4353b582..29b054c46aa 100644
--- a/docs/en/sql-reference/window-functions/leadInFrame.md
+++ b/docs/en/sql-reference/window-functions/leadInFrame.md
@@ -23,7 +23,7 @@ For more detail on window function syntax see: [Window Functions - Syntax](./ind
 **Parameters**
 - `x` — Column name.
 - `offset` — Offset to apply. [(U)Int*](../data-types/int-uint.md). (Optional - `1` by default).
-- `default` — Value to return if calculated row exceeds the boundaries of the window frame. (Optional - default value of column type when omitted).
+- `default` — Value to return if calculated row exceeds the boundaries of the window frame. (Optional - `null` by default).
 
 **Returned value**
 
diff --git a/docs/ru/development/architecture.md b/docs/ru/development/architecture.md
index d2afbf233b8..575799cccc4 100644
--- a/docs/ru/development/architecture.md
+++ b/docs/ru/development/architecture.md
@@ -115,7 +115,7 @@ ClickHouse — полноценная столбцовая СУБД. Данны
 
 `InterpreterSelectQuery` использует `ExpressionAnalyzer` и `ExpressionActions` механизмы для анализа запросов и преобразований. Именно здесь выполняется большинство оптимизаций запросов на основе правил. `ExpressionAnalyzer` написан довольно грязно и должен быть переписан: различные преобразования запросов и оптимизации должны быть извлечены в отдельные классы, чтобы позволить модульные преобразования или запросы.
 
-Для решения проблем, существующих в интерпретаторах, был разработан новый `InterpreterSelectQueryAnalyzer`. Это новая версия `InterpreterSelectQuery`, которая не использует `ExpressionAnalyzer` и вводит дополнительный уровень абстракции между `AST` и `QueryPipeline`, называемый `QueryTree`. Он полностью готов к использованию в продакшене, но на всякий случай его можно выключить, установив значение настройки `enable_analyzer` в `false`.
+Для решения текущих проблем, существующих в интерпретаторах, разрабатывается новый `InterpreterSelectQueryAnalyzer`. Это новая версия `InterpreterSelectQuery`, которая не использует `ExpressionAnalyzer` и вводит дополнительный уровень абстракции между `AST` и `QueryPipeline`, называемый `QueryTree`. Он еще не готов к использованию в продакшене, но его можно протестировать с помощью флага `allow_experimental_analyzer`.
 
 ## Функции {#functions}
 
diff --git a/docs/ru/getting-started/install.md b/docs/ru/getting-started/install.md
index f8a660fbec9..aee445da843 100644
--- a/docs/ru/getting-started/install.md
+++ b/docs/ru/getting-started/install.md
@@ -22,26 +22,18 @@ grep -q sse4_2 /proc/cpuinfo && echo "SSE 4.2 supported" || echo "SSE 4.2 not su
 
 ### Из deb-пакетов {#install-from-deb-packages}
 
-Рекомендуется использовать официальные скомпилированные `deb`-пакеты для Debian или Ubuntu. Для установки пакетов выполните:
+Яндекс рекомендует использовать официальные скомпилированные `deb`-пакеты для Debian или Ubuntu. Для установки пакетов выполните:
 
 ``` bash
-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
+sudo apt-get install -y apt-transport-https ca-certificates dirmngr
+sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 8919F6BD2B48D754
 
-echo "deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb stable main" | sudo tee \
+echo "deb https://packages.clickhouse.com/deb stable main" | sudo tee \
     /etc/apt/sources.list.d/clickhouse.list
 sudo apt-get update
-```
 
-#### Установка ClickHouse server и client
-
-```bash
 sudo apt-get install -y clickhouse-server clickhouse-client
-```
 
-#### Запуск ClickHouse server
-
-```bash
 sudo service clickhouse-server start
 clickhouse-client # or "clickhouse-client --password" if you've set up a password.
 ```
@@ -63,7 +55,7 @@ clickhouse-client # or "clickhouse-client --password" if you've set up a passwor
 :::
 ### Из rpm-пакетов {#from-rpm-packages}
 
-Команда ClickHouse рекомендует использовать официальные предкомпилированные `rpm`-пакеты для CentOS, RedHat и всех остальных дистрибутивов Linux, основанных на rpm.
+Команда ClickHouse в Яндексе рекомендует использовать официальные предкомпилированные `rpm`-пакеты для CentOS, RedHat и всех остальных дистрибутивов Linux, основанных на rpm.
 
 #### Установка официального репозитория
 
@@ -110,7 +102,7 @@ sudo yum install clickhouse-server clickhouse-client
 
 ### Из tgz-архивов {#from-tgz-archives}
 
-Команда ClickHouse рекомендует использовать предкомпилированные бинарники из `tgz`-архивов для всех дистрибутивов, где невозможна установка `deb`- и `rpm`- пакетов.
+Команда ClickHouse в Яндексе рекомендует использовать предкомпилированные бинарники из `tgz`-архивов для всех дистрибутивов, где невозможна установка `deb`- и `rpm`- пакетов.
 
 Интересующую версию архивов можно скачать вручную с помощью `curl` или `wget` из репозитория https://packages.clickhouse.com/tgz/.
 После этого архивы нужно распаковать и воспользоваться скриптами установки. Пример установки самой свежей версии:
diff --git a/docs/ru/interfaces/http.md b/docs/ru/interfaces/http.md
index 01d788e62cf..d9da51892f9 100644
--- a/docs/ru/interfaces/http.md
+++ b/docs/ru/interfaces/http.md
@@ -50,7 +50,7 @@ Connection: Close
 Content-Type: text/tab-separated-values; charset=UTF-8
 X-ClickHouse-Server-Display-Name: clickhouse.ru-central1.internal
 X-ClickHouse-Query-Id: 5abe861c-239c-467f-b955-8a201abb8b7f
-X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334", "real_time_microseconds":"0"}
+X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334"}
 
 1
 ```
@@ -367,7 +367,7 @@ $ curl -v 'http://localhost:8123/predefined_query'
 < X-ClickHouse-Format: Template
 < X-ClickHouse-Timezone: Asia/Shanghai
 < Keep-Alive: timeout=10
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0", "elapsed_ns":"662334", "real_time_microseconds":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}
 <
 # HELP "Query" "Number of executing queries"
 # TYPE "Query" counter
@@ -601,7 +601,7 @@ $ curl -v  -H 'XXX:xxx' 'http://localhost:8123/get_config_static_handler'
 < Content-Type: text/plain; charset=UTF-8
 < Transfer-Encoding: chunked
 < Keep-Alive: timeout=10
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334", "real_time_microseconds":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334"}
 <
 * Connection #0 to host localhost left intact
 <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>%
@@ -659,7 +659,7 @@ $ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_absolute_path_static_handler'
 < Content-Type: text/html; charset=UTF-8
 < Transfer-Encoding: chunked
 < Keep-Alive: timeout=10
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334", "real_time_microseconds":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334"}
 <
 <html><body>Absolute Path File</body></html>
 * Connection #0 to host localhost left intact
@@ -678,7 +678,7 @@ $ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_relative_path_static_handler'
 < Content-Type: text/html; charset=UTF-8
 < Transfer-Encoding: chunked
 < Keep-Alive: timeout=10
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334", "real_time_microseconds":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334"}
 <
 <html><body>Relative Path File</body></html>
 * Connection #0 to host localhost left intact
diff --git a/docs/ru/operations/named-collections.md b/docs/ru/operations/named-collections.md
index 67656f24ba3..48ee7c9f15d 100644
--- a/docs/ru/operations/named-collections.md
+++ b/docs/ru/operations/named-collections.md
@@ -146,30 +146,7 @@ SELECT dictGet('dict', 'B', 2);
 
 ## Пример использования именованных соединений с базой данных PostgreSQL
 
-Описание параметров смотрите [postgresql](../sql-reference/table-functions/postgresql.md). Дополнительно есть алиасы: 
-- `username` для `user`
-- `db` для `database`.
-
-Параметр `addresses_expr` используется в коллекции вместо `host:port`. Параметр опционален, потому что есть так же другие: `host`, `hostname`, `port`. Следующий псевдокод показывает приоритет:
-
-```sql
-CASE 
-    WHEN collection['addresses_expr'] != '' THEN collection['addresses_expr']
-    WHEN collection['host'] != ''           THEN collection['host'] || ':' || if(collection['port'] != '', collection['port'], '5432')
-    WHEN collection['hostname'] != ''       THEN collection['hostname'] || ':' || if(collection['port'] != '', collection['port'], '5432')
-END
-```
-
-Пример создания:
-```sql
-CREATE NAMED COLLECTION mypg AS
-user = 'pguser',
-password = 'jw8s0F4',
-host = '127.0.0.1',
-port = 5432,
-database = 'test',
-schema = 'test_schema'
-```
+Описание параметров смотрите [postgresql](../sql-reference/table-functions/postgresql.md).
 
 Пример конфигурации:
 ```xml
@@ -222,10 +199,6 @@ SELECT * FROM mypgtable;
 └───┘
 ```
 
-:::note
-PostgreSQL копирует данные из named collection при создании таблицы. Изменения в коллекции не влияют на существующие таблицы.
-:::
-
 ### Пример использования именованных соединений базой данных с движком PostgreSQL
 
 ```sql
diff --git a/docs/ru/sql-reference/data-types/special-data-types/interval.md b/docs/ru/sql-reference/data-types/special-data-types/interval.md
index 5064391f582..867a6665f4b 100644
--- a/docs/ru/sql-reference/data-types/special-data-types/interval.md
+++ b/docs/ru/sql-reference/data-types/special-data-types/interval.md
@@ -54,28 +54,29 @@ SELECT now() as current_date_time, current_date_time + INTERVAL 4 DAY
 └─────────────────────┴───────────────────────────────┘
 ```
 
-Также можно использовать различные типы интервалов одновременно:
+Нельзя объединять интервалы различных типов. Нельзя использовать интервалы вида `4 DAY 1 HOUR`. Вместо этого выражайте интервал в единицах меньших или равных минимальной единице интервала, например, интервал «1 день и 1 час» можно выразить как `25 HOUR` или `90000 SECOND`.
+
+Арифметические операции со значениями типов `Interval` не доступны, однако можно последовательно добавлять различные интервалы к значениям типов `Date` и `DateTime`. Например:
 
 ``` sql
-SELECT now() AS current_date_time, current_date_time + (INTERVAL 4 DAY + INTERVAL 3 HOUR)
+SELECT now() AS current_date_time, current_date_time + INTERVAL 4 DAY + INTERVAL 3 HOUR
 ```
 
 ``` text
-┌───current_date_time─┬─plus(current_date_time, plus(toIntervalDay(4), toIntervalHour(3)))─┐
-│ 2024-08-08 18:31:39 │                                                2024-08-12 21:31:39 │
-└─────────────────────┴────────────────────────────────────────────────────────────────────┘
+┌───current_date_time─┬─plus(plus(now(), toIntervalDay(4)), toIntervalHour(3))─┐
+│ 2019-10-23 11:16:28 │                                    2019-10-27 14:16:28 │
+└─────────────────────┴────────────────────────────────────────────────────────┘
 ```
 
-И сравнивать значения из разными интервалами:
+Следующий запрос приведёт к генерированию исключения:
 
 ``` sql
-SELECT toIntervalMicrosecond(3600000000) = toIntervalHour(1);
+select now() AS current_date_time, current_date_time + (INTERVAL 4 DAY + INTERVAL 3 HOUR)
 ```
 
 ``` text
-┌─less(toIntervalMicrosecond(179999999), toIntervalMinute(3))─┐
-│                                                           1 │
-└─────────────────────────────────────────────────────────────┘
+Received exception from server (version 19.14.1):
+Code: 43. DB::Exception: Received from localhost:9000. DB::Exception: Wrong argument types for function plus: if one argument is Interval, then another must be Date or DateTime..
 ```
 
 ## Смотрите также {#smotrite-takzhe}
diff --git a/docs/ru/sql-reference/functions/hash-functions.md b/docs/ru/sql-reference/functions/hash-functions.md
index d7b90b09122..98b6d8d4b17 100644
--- a/docs/ru/sql-reference/functions/hash-functions.md
+++ b/docs/ru/sql-reference/functions/hash-functions.md
@@ -124,40 +124,6 @@ SELECT hex(sipHash128('foo', '\x01', 3));
 └──────────────────────────────────┘
 ```
 
-## ripeMD160
-
-Генерирует [RIPEMD-160](https://en.wikipedia.org/wiki/RIPEMD) хеш строки.
-
-**Синтаксис**
-
-```sql
-ripeMD160(input)
-```
-
-**Аргументы**
-
-- `input`: Строка [String](../data-types/string.md)
-
-**Возвращаемое значение**
-
-- [UInt256](../data-types/int-uint.md), где 160-битный хеш RIPEMD-160 хранится в первых 20 байтах. Оставшиеся 12 байт заполняются нулями.
-
-**Пример**
-
-Используйте функцию [hex](../functions/encoding-functions.md#hex) для представления результата в виде строки с шестнадцатеричной кодировкой
-
-Запрос:
-
-```sql
-SELECT hex(ripeMD160('The quick brown fox jumps over the lazy dog'));
-```
-Результат:
-```response
-┌─hex(ripeMD160('The quick brown fox jumps over the lazy dog'))─┐
-│ 37F332F68DB77BD9D7EDD4969571AD671CF9DD3B                      │
-└───────────────────────────────────────────────────────────────┘
-```
-
 ## cityHash64 {#cityhash64}
 
 Генерирует 64-х битное значение [CityHash](https://github.com/google/cityhash).
diff --git a/docs/ru/sql-reference/statements/system.md b/docs/ru/sql-reference/statements/system.md
index d17e5acd693..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 [ON CLUSTER cluster_name] [db.]replicated_merge_tree_family_table_name [STRICT | LIGHTWEIGHT [FROM 'srcReplica1'[, 'srcReplica2'[, ...]]] | 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/file.md b/docs/ru/sql-reference/table-functions/file.md
index f3e8b0f46b7..546a674d41a 100644
--- a/docs/ru/sql-reference/table-functions/file.md
+++ b/docs/ru/sql-reference/table-functions/file.md
@@ -81,7 +81,6 @@ SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 U
 Обрабатываться будут те и только те файлы, которые существуют в файловой системе и удовлетворяют всему шаблону пути.
 
 -   `*` — заменяет любое количество любых символов кроме `/`, включая отсутствие символов.
--   `**` — Заменяет любое количество любых символов, включая `/`, то есть осуществляет рекурсивный поиск по вложенным директориям.
 -   `?` — заменяет ровно один любой символ.
 -   `{some_string,another_string,yet_another_one}` — заменяет любую из строк `'some_string', 'another_string', 'yet_another_one'`. Эти строки также могут содержать символ `/`.
 -   `{N..M}` — заменяет любое число в интервале от `N` до `M` включительно (может содержать ведущие нули).
diff --git a/docs/ru/sql-reference/table-functions/hdfs.md b/docs/ru/sql-reference/table-functions/hdfs.md
index 13f1bdc43af..6dcb1a21791 100644
--- a/docs/ru/sql-reference/table-functions/hdfs.md
+++ b/docs/ru/sql-reference/table-functions/hdfs.md
@@ -47,7 +47,6 @@ LIMIT 2
 
 
 -   `*` — Заменяет любое количество любых символов (кроме `/`), включая отсутствие символов.
--   `**` — Заменяет любое количество любых символов, включая `/`, то есть осуществляет рекурсивный поиск по вложенным директориям.
 -   `?` — Заменяет ровно один любой символ.
 -   `{some_string,another_string,yet_another_one}` — Заменяет любую из строк `'some_string', 'another_string', 'yet_another_one'`. Эти строки также могут содержать символ `/`.
 -   `{N..M}` — Заменяет любое число в интервале от `N` до `M` включительно (может содержать ведущие нули).
diff --git a/docs/zh/changelog/index.md b/docs/zh/changelog/index.md
index fb50dfcee85..cd77a8c03cf 100644
--- a/docs/zh/changelog/index.md
+++ b/docs/zh/changelog/index.md
@@ -252,7 +252,7 @@ sidebar_label: "\u53D8\u66F4\u65E5\u5FD7"
 -   抑制MSan下的一些测试失败。 [#8780](https://github.com/ClickHouse/ClickHouse/pull/8780) ([Alexander Kuzmenkov](https://github.com/akuzm))
 -   加速 “exception while insert” 测试 此测试通常在具有复盖率的调试版本中超时。 [#8711](https://github.com/ClickHouse/ClickHouse/pull/8711) ([阿列克谢-米洛维多夫](https://github.com/alexey-milovidov))
 -   更新 `libcxx` 和 `libcxxabi` 为了主人 在准备 [#9304](https://github.com/ClickHouse/ClickHouse/issues/9304) [#9308](https://github.com/ClickHouse/ClickHouse/pull/9308) ([阿列克谢-米洛维多夫](https://github.com/alexey-milovidov))
--   修复flaky测试 `00910_zookeeper_test_alter_compression_codecs`. [#9525](https://github.com/ClickHouse/ClickHouse/pull/9525) ([阿列克谢-米洛维多夫](https://github.com/alexey-milovidov))
+-   修复flacky测试 `00910_zookeeper_test_alter_compression_codecs`. [#9525](https://github.com/ClickHouse/ClickHouse/pull/9525) ([阿列克谢-米洛维多夫](https://github.com/alexey-milovidov))
 -   清理重复的链接器标志。 确保链接器不会查找意想不到的符号。 [#9433](https://github.com/ClickHouse/ClickHouse/pull/9433) ([阿莫斯鸟](https://github.com/amosbird))
 -   添加 `clickhouse-odbc` 驱动程序进入测试图像。 这允许通过自己的ODBC驱动程序测试ClickHouse与ClickHouse的交互。 [#9348](https://github.com/ClickHouse/ClickHouse/pull/9348) ([filimonov](https://github.com/filimonov))
 -   修复单元测试中的几个错误。 [#9047](https://github.com/ClickHouse/ClickHouse/pull/9047) ([阿利沙平](https://github.com/alesapin))
diff --git a/docs/zh/interfaces/http.md b/docs/zh/interfaces/http.md
index 4767a540d61..f55cf41936f 100644
--- a/docs/zh/interfaces/http.md
+++ b/docs/zh/interfaces/http.md
@@ -53,7 +53,7 @@ Connection: Close
 Content-Type: text/tab-separated-values; charset=UTF-8
 X-ClickHouse-Server-Display-Name: clickhouse.ru-central1.internal
 X-ClickHouse-Query-Id: 5abe861c-239c-467f-b955-8a201abb8b7f
-X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334","real_time_microseconds":"0"}
+X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334"}
 
 1
 ```
@@ -363,7 +363,7 @@ $ curl -v 'http://localhost:8123/predefined_query'
 < X-ClickHouse-Format: Template
 < X-ClickHouse-Timezone: Asia/Shanghai
 < Keep-Alive: timeout=10
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334", "real_time_microseconds":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334"}
 <
 # HELP "Query" "Number of executing queries"
 # TYPE "Query" counter
@@ -524,7 +524,7 @@ $ curl -vv  -H 'XXX:xxx' 'http://localhost:8123/hi'
 < Content-Type: text/html; charset=UTF-8
 < Transfer-Encoding: chunked
 < Keep-Alive: timeout=10
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334", "real_time_microseconds":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334"}
 <
 * Connection #0 to host localhost left intact
 Say Hi!%
@@ -564,7 +564,7 @@ $ curl -v  -H 'XXX:xxx' 'http://localhost:8123/get_config_static_handler'
 < Content-Type: text/plain; charset=UTF-8
 < Transfer-Encoding: chunked
 < Keep-Alive: timeout=10
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334","real_time_microseconds":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334"}
 <
 * Connection #0 to host localhost left intact
 <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>%
@@ -616,7 +616,7 @@ $ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_absolute_path_static_handler'
 < Content-Type: text/html; charset=UTF-8
 < Transfer-Encoding: chunked
 < Keep-Alive: timeout=10
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334","real_time_microseconds":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334"}
 <
 <html><body>Absolute Path File</body></html>
 * Connection #0 to host localhost left intact
@@ -635,7 +635,7 @@ $ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_relative_path_static_handler'
 < Content-Type: text/html; charset=UTF-8
 < Transfer-Encoding: chunked
 < Keep-Alive: timeout=10
-< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334","real_time_microseconds":"0"}
+< X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","elapsed_ns":"662334"}
 <
 <html><body>Relative Path File</body></html>
 * Connection #0 to host localhost left intact
diff --git a/docs/zh/operations/external-authenticators/kerberos.md b/docs/zh/operations/external-authenticators/kerberos.md
index d1a39bbc952..649a0b9bd48 100644
--- a/docs/zh/operations/external-authenticators/kerberos.md
+++ b/docs/zh/operations/external-authenticators/kerberos.md
@@ -23,30 +23,30 @@ slug: /zh/operations/external-authenticators/kerberos
 
 示例 (进入 `config.xml`):
 ```xml
-<clickhouse>
+<yandex>
     <!- ... -->
     <kerberos />
-</clickhouse>
+</yandex>
 ```
 
 主体规范:
 ```xml
-<clickhouse>
+<yandex>
     <!- ... -->
     <kerberos>
         <principal>HTTP/clickhouse.example.com@EXAMPLE.COM</principal>
     </kerberos>
-</clickhouse>
+</yandex>
 ```
 
 按领域过滤:
 ```xml
-<clickhouse>
+<yandex>
     <!- ... -->
     <kerberos>
         <realm>EXAMPLE.COM</realm>
     </kerberos>
-</clickhouse>
+</yandex>
 ```
 
 !!! warning "注意"
@@ -74,7 +74,7 @@ Kerberos主体名称格式通常遵循以下模式:
 
 示例 (进入 `users.xml`):
 ```
-<clickhouse>
+<yandex>
     <!- ... -->
     <users>
         <!- ... -->
@@ -85,7 +85,7 @@ Kerberos主体名称格式通常遵循以下模式:
             </kerberos>
         </my_user>
     </users>
-</clickhouse>
+</yandex>
 ```
 
 !!! warning "警告"
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index 3add371b30f..ce3a4659e0e 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_compile_options("$<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:${COVERAGE_FLAGS}>")
+add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:${COVERAGE_FLAGS}>)
 
 if (USE_CLANG_TIDY)
     set (CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_PATH}")
diff --git a/programs/bash-completion/completions/CMakeLists.txt b/programs/bash-completion/completions/CMakeLists.txt
index 2e911e81981..d364e07ef6e 100644
--- a/programs/bash-completion/completions/CMakeLists.txt
+++ b/programs/bash-completion/completions/CMakeLists.txt
@@ -6,7 +6,6 @@ macro(configure_bash_completion)
             COMMAND ${PKG_CONFIG_BIN} --variable=completionsdir bash-completion
             OUTPUT_VARIABLE ${out}
             OUTPUT_STRIP_TRAILING_WHITESPACE
-            COMMAND_ERROR_IS_FATAL ANY
         )
     endif()
     string(REPLACE /usr "${CMAKE_INSTALL_PREFIX}" out "${out}")
diff --git a/programs/benchmark/Benchmark.cpp b/programs/benchmark/Benchmark.cpp
index 36f774a3c12..48dca82eb2b 100644
--- a/programs/benchmark/Benchmark.cpp
+++ b/programs/benchmark/Benchmark.cpp
@@ -75,8 +75,6 @@ public:
             const String & default_database_,
             const String & user_,
             const String & password_,
-            const String & proto_send_chunked_,
-            const String & proto_recv_chunked_,
             const String & quota_key_,
             const String & stage,
             bool randomize_,
@@ -130,9 +128,7 @@ public:
             connections.emplace_back(std::make_unique<ConnectionPool>(
                 concurrency,
                 cur_host, cur_port,
-                default_database_, user_, password_,
-                proto_send_chunked_, proto_recv_chunked_,
-                quota_key_,
+                default_database_, user_, password_, quota_key_,
                 /* cluster_= */ "",
                 /* cluster_secret_= */ "",
                 /* client_name_= */ std::string(DEFAULT_CLIENT_NAME),
@@ -666,50 +662,6 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
 
         Strings hosts = options.count("host") ? options["host"].as<Strings>() : Strings({"localhost"});
 
-        String proto_send_chunked {"notchunked"};
-        String proto_recv_chunked {"notchunked"};
-
-        if (options.count("proto_caps"))
-        {
-            std::string proto_caps_str = options["proto_caps"].as<std::string>();
-
-            std::vector<std::string_view> proto_caps;
-            splitInto<','>(proto_caps, proto_caps_str);
-
-            for (auto cap_str : proto_caps)
-            {
-                std::string direction;
-
-                if (cap_str.starts_with("send_"))
-                {
-                    direction = "send";
-                    cap_str = cap_str.substr(std::string_view("send_").size());
-                }
-                else if (cap_str.starts_with("recv_"))
-                {
-                    direction = "recv";
-                    cap_str = cap_str.substr(std::string_view("recv_").size());
-                }
-
-                if (cap_str != "chunked" && cap_str != "notchunked" && cap_str != "chunked_optional" && cap_str != "notchunked_optional")
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "proto_caps option is incorrect ({})", proto_caps_str);
-
-                if (direction.empty())
-                {
-                    proto_send_chunked = cap_str;
-                    proto_recv_chunked = cap_str;
-                }
-                else
-                {
-                    if (direction == "send")
-                        proto_send_chunked = cap_str;
-                    else
-                        proto_recv_chunked = cap_str;
-                }
-            }
-        }
-
-
         Benchmark benchmark(
             options["concurrency"].as<unsigned>(),
             options["delay"].as<double>(),
@@ -721,8 +673,6 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
             options["database"].as<std::string>(),
             options["user"].as<std::string>(),
             options["password"].as<std::string>(),
-            proto_send_chunked,
-            proto_recv_chunked,
             options["quota_key"].as<std::string>(),
             options["stage"].as<std::string>(),
             options.count("randomize"),
diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 25c94c56aa6..887c5cb86bc 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -209,8 +209,8 @@ std::vector<String> Client::loadWarningMessages()
                           {} /* query_parameters */,
                           "" /* query_id */,
                           QueryProcessingStage::Complete,
-                          &client_context->getSettingsRef(),
-                          &client_context->getClientInfo(), false, {});
+                          &global_context->getSettingsRef(),
+                          &global_context->getClientInfo(), false, {});
     while (true)
     {
         Packet packet = connection->receivePacket();
@@ -223,7 +223,7 @@ std::vector<String> Client::loadWarningMessages()
 
                     size_t rows = packet.block.rows();
                     for (size_t i = 0; i < rows; ++i)
-                        messages.emplace_back(column[i].safeGet<String>());
+                        messages.emplace_back(column[i].get<String>());
                 }
                 continue;
 
@@ -306,6 +306,9 @@ void Client::initialize(Poco::Util::Application & self)
     if (env_password && !config().has("password"))
         config().setString("password", env_password);
 
+    // global_context->setApplicationType(Context::ApplicationType::CLIENT);
+    global_context->setQueryParameters(query_parameters);
+
     /// settings and limits could be specified in config file, but passed settings has higher priority
     for (const auto & setting : global_context->getSettingsRef().allUnchanged())
     {
@@ -379,7 +382,7 @@ try
         showWarnings();
 
     /// Set user password complexity rules
-    auto & access_control = client_context->getAccessControl();
+    auto & access_control = global_context->getAccessControl();
     access_control.setPasswordComplexityRules(connection->getPasswordComplexityRules());
 
     if (is_interactive && !delayed_interactive)
@@ -456,7 +459,7 @@ void Client::connect()
                           << connection_parameters.host << ":" << connection_parameters.port
                           << (!connection_parameters.user.empty() ? " as user " + connection_parameters.user : "") << "." << std::endl;
 
-            connection = Connection::createConnection(connection_parameters, client_context);
+            connection = Connection::createConnection(connection_parameters, global_context);
 
             if (max_client_network_bandwidth)
             {
@@ -525,7 +528,7 @@ void Client::connect()
         }
     }
 
-    if (!client_context->getSettingsRef().use_client_time_zone)
+    if (!global_context->getSettingsRef().use_client_time_zone)
     {
         const auto & time_zone = connection->getServerTimezone(connection_parameters.timeouts);
         if (!time_zone.empty())
@@ -608,7 +611,7 @@ void Client::printChangedSettings() const
         }
     };
 
-    print_changes(client_context->getSettingsRef().changes(), "settings");
+    print_changes(global_context->getSettingsRef().changes(), "settings");
     print_changes(cmd_merge_tree_settings.changes(), "MergeTree settings");
 }
 
@@ -706,7 +709,7 @@ bool Client::processWithFuzzing(const String & full_query)
     {
         const char * begin = full_query.data();
         orig_ast = parseQuery(begin, begin + full_query.size(),
-            client_context->getSettingsRef(),
+            global_context->getSettingsRef(),
             /*allow_multi_statements=*/ true);
     }
     catch (const Exception & e)
@@ -730,7 +733,7 @@ bool Client::processWithFuzzing(const String & full_query)
     }
 
     // Kusto is not a subject for fuzzing (yet)
-    if (client_context->getSettingsRef().dialect == DB::Dialect::kusto)
+    if (global_context->getSettingsRef().dialect == DB::Dialect::kusto)
     {
         return true;
     }
@@ -1135,6 +1138,8 @@ void Client::processOptions(const OptionsDescription & options_description,
 
     if ((query_fuzzer_runs = options["query-fuzzer-runs"].as<int>()))
     {
+        // Fuzzer implies multiquery.
+        config().setBool("multiquery", true);
         // Ignore errors in parsing queries.
         config().setBool("ignore-error", true);
         ignore_error = true;
@@ -1142,6 +1147,8 @@ void Client::processOptions(const OptionsDescription & options_description,
 
     if ((create_query_fuzzer_runs = options["create-query-fuzzer-runs"].as<int>()))
     {
+        // Fuzzer implies multiquery.
+        config().setBool("multiquery", true);
         // Ignore errors in parsing queries.
         config().setBool("ignore-error", true);
 
@@ -1159,11 +1166,6 @@ void Client::processOptions(const OptionsDescription & options_description,
 
     if (options.count("opentelemetry-tracestate"))
         global_context->getClientTraceContext().tracestate = options["opentelemetry-tracestate"].as<std::string>();
-
-    /// In case of clickhouse-client the `client_context` can be just an alias for the `global_context`.
-    /// (There is no need to copy the context because clickhouse-client has no background tasks so it won't use that context in parallel.)
-    client_context = global_context;
-    initClientContext();
 }
 
 
@@ -1197,9 +1199,17 @@ void Client::processConfig()
     }
     print_stack_trace = config().getBool("stacktrace", false);
 
+    if (config().has("multiquery"))
+        is_multiquery = true;
+
     pager = config().getString("pager", "");
 
     setDefaultFormatsAndCompressionFromConfiguration();
+
+    global_context->setClientName(std::string(DEFAULT_CLIENT_NAME));
+    global_context->setQueryKindInitial();
+    global_context->setQuotaClientKey(config().getString("quota_key", ""));
+    global_context->setQueryKind(query_kind);
 }
 
 
@@ -1352,6 +1362,13 @@ void Client::readArguments(
                 allow_repeated_settings = true;
             else if (arg == "--allow_merge_tree_settings")
                 allow_merge_tree_settings = true;
+            else if (arg == "--multiquery" && (arg_num + 1) < argc && !std::string_view(argv[arg_num + 1]).starts_with('-'))
+            {
+                /// Transform the abbreviated syntax '--multiquery <SQL>' into the full syntax '--multiquery -q <SQL>'
+                ++arg_num;
+                arg = argv[arg_num];
+                addMultiquery(arg, common_arguments);
+            }
             else if (arg == "--password" && ((arg_num + 1) >= argc || std::string_view(argv[arg_num + 1]).starts_with('-')))
             {
                 common_arguments.emplace_back(arg);
diff --git a/programs/client/Client.h b/programs/client/Client.h
index 07a8e293b1a..229608f787d 100644
--- a/programs/client/Client.h
+++ b/programs/client/Client.h
@@ -1,26 +1,22 @@
 #pragma once
 
-#include <Client/ClientApplicationBase.h>
+#include <Client/ClientBase.h>
 
 
 namespace DB
 {
 
-class Client : public ClientApplicationBase
+class Client : public ClientBase
 {
 public:
-    using Arguments = ClientApplicationBase::Arguments;
-
-    Client()
-    {
-        fuzzer = QueryFuzzer(randomSeed(), &std::cout, &std::cerr);
-    }
+    Client() = default;
 
     void initialize(Poco::Util::Application & self) override;
 
     int main(const std::vector<String> & /*args*/) override;
 
 protected:
+
     Poco::Util::LayeredConfiguration & getClientConfiguration() override;
 
     bool processWithFuzzing(const String & full_query) override;
diff --git a/programs/client/clickhouse-client.xml b/programs/client/clickhouse-client.xml
index 6eb8976a6ef..c32b63413e9 100644
--- a/programs/client/clickhouse-client.xml
+++ b/programs/client/clickhouse-client.xml
@@ -38,24 +38,6 @@
         <production>{display_name} \e[1;31m:)\e[0m </production> <!-- if it matched to the substring "production" in the server display name -->
     </prompt_by_server_display_name>
 
-    <!-- Chunked capabilities for native protocol by client.
-         Can be enabled separately for send and receive channels.
-         Supported modes:
-         - chunked - client will only work with server supporting chunked protocol;
-         - chunked_optional - client prefer server to enable chunked protocol, but can switch to notchunked if server does not support this;
-         - notchunked - client will only work with server supporting notchunked protocol (current default);
-         - notchunked_optional - client prefer server notchunked protocol, but can switch to chunked if server does not support this.
-     -->
-    <!--
-    <proto_caps>
-        <send>chunked_optional</send>
-        <recv>chunked_optional</recv>
-    </proto_caps>
-    -->
-
-    <!-- Do not send clickhouse-client to background on C-z -->
-    <!-- <ignore_shell_suspend>true</ignore_shell_suspend> -->
-
     <!--
         Settings adjustable via command-line parameters
         can take their defaults from that config file, see examples:
diff --git a/programs/disks/DisksApp.cpp b/programs/disks/DisksApp.cpp
index 884550ff2ed..59ba45b9451 100644
--- a/programs/disks/DisksApp.cpp
+++ b/programs/disks/DisksApp.cpp
@@ -247,7 +247,6 @@ void DisksApp::runInteractiveReplxx()
         suggest,
         history_file,
         /* multiline= */ false,
-        /* ignore_shell_suspend= */ false,
         query_extenders,
         query_delimiters,
         word_break_characters.c_str(),
diff --git a/programs/disks/DisksApp.h b/programs/disks/DisksApp.h
index 5b240648508..f8167884c62 100644
--- a/programs/disks/DisksApp.h
+++ b/programs/disks/DisksApp.h
@@ -2,7 +2,7 @@
 
 #include <unordered_map>
 #include <vector>
-#include <Client/LineReader.h>
+#include <Client/ReplxxLineReader.h>
 #include <Loggers/Loggers.h>
 #include "DisksClient.h"
 #include "ICommand_fwd.h"
diff --git a/programs/disks/DisksClient.cpp b/programs/disks/DisksClient.cpp
index 53d7c7f78f6..7e36c7911ab 100644
--- a/programs/disks/DisksClient.cpp
+++ b/programs/disks/DisksClient.cpp
@@ -1,5 +1,6 @@
 #include "DisksClient.h"
 #include <Client/ClientBase.h>
+#include <Client/ReplxxLineReader.h>
 #include <Disks/registerDisks.h>
 #include <Common/Config/ConfigProcessor.h>
 
diff --git a/programs/disks/DisksClient.h b/programs/disks/DisksClient.h
index 299631f1afe..8a55d22af93 100644
--- a/programs/disks/DisksClient.h
+++ b/programs/disks/DisksClient.h
@@ -5,8 +5,9 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
+#include <Client/ReplxxLineReader.h>
 #include <Loggers/Loggers.h>
-#include <Disks/IDisk.h>
+#include "Disks/IDisk.h"
 
 #include <Interpreters/Context.h>
 #include <boost/program_options/options_description.hpp>
diff --git a/programs/format/Format.cpp b/programs/format/Format.cpp
index f07387bd395..1b91e7ceaf3 100644
--- a/programs/format/Format.cpp
+++ b/programs/format/Format.cpp
@@ -175,11 +175,6 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
                 hash_func.update(options["seed"].as<std::string>());
             }
 
-            SharedContextHolder shared_context = Context::createShared();
-            auto context = Context::createGlobal(shared_context.get());
-            auto context_const = WithContext(context).getContext();
-            context->makeGlobalContext();
-
             registerInterpreters();
             registerFunctions();
             registerAggregateFunctions();
@@ -264,11 +259,7 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
                     if (!backslash)
                     {
                         WriteBufferFromOwnString str_buf;
-                        bool oneline_current_query = oneline || approx_query_length < max_line_length;
-                        IAST::FormatSettings settings(str_buf, oneline_current_query, hilite);
-                        settings.show_secrets = true;
-                        settings.print_pretty_type_names = !oneline_current_query;
-                        res->format(settings);
+                        formatAST(*res, str_buf, hilite, oneline || approx_query_length < max_line_length);
 
                         if (insert_query_payload)
                         {
@@ -311,11 +302,7 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
                     else
                     {
                         WriteBufferFromOwnString str_buf;
-                        bool oneline_current_query = oneline || approx_query_length < max_line_length;
-                        IAST::FormatSettings settings(str_buf, oneline_current_query, hilite);
-                        settings.show_secrets = true;
-                        settings.print_pretty_type_names = !oneline_current_query;
-                        res->format(settings);
+                        formatAST(*res, str_buf, hilite, oneline);
 
                         auto res_string = str_buf.str();
                         WriteBufferFromOStream res_cout(std::cout, 4096);
diff --git a/programs/keeper-client/Commands.cpp b/programs/keeper-client/Commands.cpp
index b4a5329b01f..df9da8e9613 100644
--- a/programs/keeper-client/Commands.cpp
+++ b/programs/keeper-client/Commands.cpp
@@ -95,7 +95,7 @@ void SetCommand::execute(const ASTKeeperQuery * query, KeeperClient * client) co
         client->zookeeper->set(
             client->getAbsolutePath(query->args[0].safeGet<String>()),
             query->args[1].safeGet<String>(),
-            static_cast<Int32>(query->args[2].safeGet<Int32>()));
+            static_cast<Int32>(query->args[2].get<Int32>()));
 }
 
 bool CreateCommand::parse(IParser::Pos & pos, std::shared_ptr<ASTKeeperQuery> & node, Expected & expected) const
@@ -494,7 +494,7 @@ void RMCommand::execute(const ASTKeeperQuery * query, KeeperClient * client) con
 {
     Int32 version{-1};
     if (query->args.size() == 2)
-        version = static_cast<Int32>(query->args[1].safeGet<Int32>());
+        version = static_cast<Int32>(query->args[1].get<Int32>());
 
     client->zookeeper->remove(client->getAbsolutePath(query->args[0].safeGet<String>()), version);
 }
@@ -506,23 +506,14 @@ bool RMRCommand::parse(IParser::Pos & pos, std::shared_ptr<ASTKeeperQuery> & nod
         return false;
     node->args.push_back(std::move(path));
 
-    ASTPtr remove_nodes_limit;
-    if (ParserUnsignedInteger{}.parse(pos, remove_nodes_limit, expected))
-        node->args.push_back(remove_nodes_limit->as<ASTLiteral &>().value);
-    else
-        node->args.push_back(UInt64(100));
-
     return true;
 }
 
 void RMRCommand::execute(const ASTKeeperQuery * query, KeeperClient * client) const
 {
     String path = client->getAbsolutePath(query->args[0].safeGet<String>());
-    UInt64 remove_nodes_limit = query->args[1].safeGet<UInt64>();
-
     client->askConfirmation(
-        "You are going to recursively delete path " + path,
-        [client, path, remove_nodes_limit] { client->zookeeper->removeRecursive(path, static_cast<UInt32>(remove_nodes_limit)); });
+        "You are going to recursively delete path " + path, [client, path] { client->zookeeper->removeRecursive(path); });
 }
 
 bool ReconfigCommand::parse(IParser::Pos & pos, std::shared_ptr<ASTKeeperQuery> & node, DB::Expected & expected) const
@@ -558,7 +549,7 @@ void ReconfigCommand::execute(const DB::ASTKeeperQuery * query, DB::KeeperClient
     String leaving;
     String new_members;
 
-    auto operation = query->args[0].safeGet<ReconfigCommand::Operation>();
+    auto operation = query->args[0].get<ReconfigCommand::Operation>();
     switch (operation)
     {
         case static_cast<UInt8>(ReconfigCommand::Operation::ADD):
@@ -686,122 +677,4 @@ void GetAllChildrenNumberCommand::execute(const ASTKeeperQuery * query, KeeperCl
     std::cout << totalNumChildren << "\n";
 }
 
-namespace
-{
-
-class CPMVOperation
-{
-    constexpr static UInt64 kTryLimit = 1000;
-
-public:
-    CPMVOperation(String src_, String dest_, bool remove_src_, KeeperClient * client_)
-        : src(std::move(src_)), dest(std::move(dest_)), remove_src(remove_src_), client(client_)
-    {
-    }
-
-    bool isTryLimitReached() const { return failed_tries_count >= kTryLimit; }
-
-    bool isCompleted() const { return is_completed; }
-
-    void perform()
-    {
-        Coordination::Stat src_stat;
-        String data = client->zookeeper->get(src, &src_stat);
-
-        Coordination::Requests ops{
-            zkutil::makeCheckRequest(src, src_stat.version),
-            zkutil::makeCreateRequest(dest, data, zkutil::CreateMode::Persistent), // Do we need to copy ACLs here?
-        };
-
-        if (remove_src)
-            ops.push_back(zkutil::makeRemoveRequest(src, src_stat.version));
-
-        Coordination::Responses responses;
-        auto code = client->zookeeper->tryMulti(ops, responses);
-
-        switch (code)
-        {
-            case Coordination::Error::ZOK: {
-                is_completed = true;
-                return;
-            }
-            case Coordination::Error::ZBADVERSION: {
-                ++failed_tries_count;
-
-                if (isTryLimitReached())
-                    zkutil::KeeperMultiException::check(code, ops, responses);
-
-                return;
-            }
-            default:
-                zkutil::KeeperMultiException::check(code, ops, responses);
-        }
-
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unreachable");
-    }
-
-private:
-    String src;
-    String dest;
-    bool remove_src = false;
-    KeeperClient * client = nullptr;
-
-    bool is_completed = false;
-    uint64_t failed_tries_count = 0;
-};
-
-}
-
-bool CPCommand::parse(IParser::Pos & pos, std::shared_ptr<ASTKeeperQuery> & node, [[maybe_unused]] Expected & expected) const
-{
-    String src_path;
-    if (!parseKeeperPath(pos, expected, src_path))
-        return false;
-    node->args.push_back(std::move(src_path));
-
-    String to_path;
-    if (!parseKeeperPath(pos, expected, to_path))
-        return false;
-    node->args.push_back(std::move(to_path));
-
-    return true;
-}
-
-void CPCommand::execute(const ASTKeeperQuery * query, KeeperClient * client) const
-{
-    auto src = client->getAbsolutePath(query->args[0].safeGet<String>());
-    auto dest = client->getAbsolutePath(query->args[1].safeGet<String>());
-
-    CPMVOperation operation(std::move(src), std::move(dest), /*remove_src_=*/false, /*client_=*/client);
-
-    while (!operation.isTryLimitReached() && !operation.isCompleted())
-        operation.perform();
-}
-
-bool MVCommand::parse(IParser::Pos & pos, std::shared_ptr<ASTKeeperQuery> & node, Expected & expected) const
-{
-    String src_path;
-    if (!parseKeeperPath(pos, expected, src_path))
-        return false;
-    node->args.push_back(std::move(src_path));
-
-    String to_path;
-    if (!parseKeeperPath(pos, expected, to_path))
-        return false;
-    node->args.push_back(std::move(to_path));
-
-    return true;
-}
-
-void MVCommand::execute(const ASTKeeperQuery * query, KeeperClient * client) const
-{
-    auto src = client->getAbsolutePath(query->args[0].safeGet<String>());
-    auto dest = client->getAbsolutePath(query->args[1].safeGet<String>());
-
-    CPMVOperation operation(std::move(src), std::move(dest), /*remove_src_=*/true, /*client_=*/client);
-
-    while (!operation.isTryLimitReached() && !operation.isCompleted())
-        operation.perform();
-}
-
 }
diff --git a/programs/keeper-client/Commands.h b/programs/keeper-client/Commands.h
index da577ce1e65..c6dd731fb3b 100644
--- a/programs/keeper-client/Commands.h
+++ b/programs/keeper-client/Commands.h
@@ -184,7 +184,7 @@ class RMRCommand : public IKeeperClientCommand
 
     void execute(const ASTKeeperQuery * query, KeeperClient * client) const override;
 
-    String getHelpMessage() const override { return "{} <path> [limit] -- Recursively deletes path if the subtree size is smaller than the limit. Confirmation required (default limit = 100)"; }
+    String getHelpMessage() const override { return "{} <path> -- Recursively deletes path. Confirmation required"; }
 };
 
 class ReconfigCommand : public IKeeperClientCommand
@@ -266,32 +266,4 @@ class GetAllChildrenNumberCommand : public IKeeperClientCommand
     }
 };
 
-class CPCommand : public IKeeperClientCommand
-{
-    String getName() const override { return "cp"; }
-
-    bool parse(IParser::Pos & pos, std::shared_ptr<ASTKeeperQuery> & node, Expected & expected) const override;
-
-    void execute(const ASTKeeperQuery * query, KeeperClient * client) const override;
-
-    String getHelpMessage() const override
-    {
-        return "{} <src> <dest> -- Copies 'src' node to 'dest' path.";
-    }
-};
-
-class MVCommand : public IKeeperClientCommand
-{
-    String getName() const override { return "mv"; }
-
-    bool parse(IParser::Pos & pos, std::shared_ptr<ASTKeeperQuery> & node, Expected & expected) const override;
-
-    void execute(const ASTKeeperQuery * query, KeeperClient * client) const override;
-
-    String getHelpMessage() const override
-    {
-        return "{} <src> <dest> -- Moves 'src' node to the 'dest' path.";
-    }
-};
-
 }
diff --git a/programs/keeper-client/KeeperClient.cpp b/programs/keeper-client/KeeperClient.cpp
index 97caa142124..a20c1f686f3 100644
--- a/programs/keeper-client/KeeperClient.cpp
+++ b/programs/keeper-client/KeeperClient.cpp
@@ -212,8 +212,6 @@ void KeeperClient::initialize(Poco::Util::Application & /* self */)
         std::make_shared<FourLetterWordCommand>(),
         std::make_shared<GetDirectChildrenNumberCommand>(),
         std::make_shared<GetAllChildrenNumberCommand>(),
-        std::make_shared<CPCommand>(),
-        std::make_shared<MVCommand>(),
     });
 
     String home_path;
@@ -316,7 +314,6 @@ void KeeperClient::runInteractiveReplxx()
         suggest,
         history_file,
         /* multiline= */ false,
-        /* ignore_shell_suspend= */ false,
         query_extenders,
         query_delimiters,
         word_break_characters,
diff --git a/programs/keeper/Keeper.cpp b/programs/keeper/Keeper.cpp
index 3007df60765..8cf1a4d1999 100644
--- a/programs/keeper/Keeper.cpp
+++ b/programs/keeper/Keeper.cpp
@@ -11,7 +11,6 @@
 #include <Core/ServerUUID.h>
 #include <Common/logger_useful.h>
 #include <Common/CgroupsMemoryUsageObserver.h>
-#include <Common/MemoryWorker.h>
 #include <Common/ErrorHandlers.h>
 #include <Common/assertProcessUserMatchesDataOwner.h>
 #include <Common/makeSocketAddress.h>
@@ -20,7 +19,6 @@
 #include <base/getMemoryAmount.h>
 #include <base/scope_guard.h>
 #include <base/safeExit.h>
-#include <base/Numa.h>
 #include <Poco/Net/NetException.h>
 #include <Poco/Net/TCPServerParams.h>
 #include <Poco/Net/TCPServer.h>
@@ -39,7 +37,7 @@
 #include <Server/HTTP/HTTPServer.h>
 #include <Server/HTTPHandlerFactory.h>
 #include <Server/KeeperReadinessHandler.h>
-#include <Server/PrometheusRequestHandlerFactory.h>
+#include <Server/PrometheusMetricsWriter.h>
 #include <Server/TCPServer.h>
 
 #include "Core/Defines.h"
@@ -67,8 +65,6 @@
 /// A minimal file used when the keeper is run without installation
 INCBIN(keeper_resource_embedded_xml, SOURCE_DIR "/programs/keeper/keeper_embedded.xml");
 
-extern const char * GIT_HASH;
-
 int mainEntryClickHouseKeeper(int argc, char ** argv)
 {
     DB::Keeper app;
@@ -315,12 +311,6 @@ try
 
     MainThreadStatus::getInstance();
 
-    if (auto total_numa_memory = getNumaNodesTotalMemory(); total_numa_memory.has_value())
-    {
-        LOG_INFO(
-            log, "Keeper is bound to a subset of NUMA nodes. Total memory of all available nodes: {}", ReadableSize(*total_numa_memory));
-    }
-
 #if !defined(NDEBUG) || !defined(__OPTIMIZE__)
     LOG_WARNING(log, "Keeper was built in debug mode. It will work slowly.");
 #endif
@@ -385,9 +375,6 @@ try
         LOG_INFO(log, "Background threads finished in {} ms", watch.elapsedMilliseconds());
     });
 
-    MemoryWorker memory_worker(config().getUInt64("memory_worker_period_ms", 0));
-    memory_worker.start();
-
     static ServerErrorHandler error_handler;
     Poco::ErrorHandler::set(&error_handler);
 
@@ -427,11 +414,10 @@ try
             std::lock_guard lock(servers_lock);
             metrics.reserve(servers->size());
             for (const auto & server : *servers)
-                metrics.emplace_back(ProtocolServerMetrics{server.getPortName(), server.currentThreads(), server.refusedConnections()});
+                metrics.emplace_back(ProtocolServerMetrics{server.getPortName(), server.currentThreads()});
             return metrics;
-        },
-        /*update_jemalloc_epoch_=*/memory_worker.getSource() != MemoryWorker::MemoryUsageSource::Jemalloc,
-        /*update_rss_=*/memory_worker.getSource() == MemoryWorker::MemoryUsageSource::None);
+        }
+    );
 
     std::vector<std::string> listen_hosts = DB::getMultipleValuesFromConfig(config(), "", "listen_host");
 
@@ -516,13 +502,14 @@ try
                 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),
-                        createKeeperPrometheusHandlerFactory(*this, config_getter(), async_metrics, "PrometheusHandler-factory"),
+                        createPrometheusMainHandlerFactory(*this, config_getter(), metrics_writer, "PrometheusHandler-factory"),
                         server_pool,
                         socket,
                         http_params));
@@ -660,6 +647,7 @@ try
     GWPAsan::initFinished();
 #endif
 
+
     LOG_INFO(log, "Ready for connections.");
 
     waitForTerminationRequest();
@@ -681,7 +669,7 @@ void Keeper::logRevision() const
         "Starting ClickHouse Keeper {} (revision: {}, git hash: {}, build id: {}), PID {}",
         VERSION_STRING,
         ClickHouseRevision::getVersionRevision(),
-        GIT_HASH,
+        git_hash.empty() ? "<unknown>" : git_hash,
         build_id.empty() ? "<unknown>" : build_id,
         getpid());
 }
diff --git a/programs/keeper/keeper_config.xml b/programs/keeper/keeper_config.xml
index efd0010d184..4cf84cffc86 100644
--- a/programs/keeper/keeper_config.xml
+++ b/programs/keeper/keeper_config.xml
@@ -66,14 +66,14 @@
       <server>
             <!-- Used for 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-keeper/server.crt</certificateFile> -->
-            <!-- <privateKeyFile>/etc/clickhouse-keeper/server.key</privateKeyFile> -->
+            <certificateFile>/etc/clickhouse-keeper/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-keeper/server.key</privateKeyFile>
             <!-- dhparams are optional. You can delete the <dhParamsFile> element.
                  To generate dhparams, use the following command:
                   openssl dhparam -out /etc/clickhouse-keeper/dhparam.pem 4096
                  Only file format with BEGIN DH PARAMETERS is supported.
               -->
-            <!-- <dhParamsFile>/etc/clickhouse-keeper/dhparam.pem</dhParamsFile> -->
+            <dhParamsFile>/etc/clickhouse-keeper/dhparam.pem</dhParamsFile>
             <verificationMode>none</verificationMode>
             <loadDefaultCAFile>true</loadDefaultCAFile>
             <cacheSessions>true</cacheSessions>
diff --git a/programs/library-bridge/LibraryBridge.cpp b/programs/library-bridge/LibraryBridge.cpp
index 261484ac744..d35e7a9b832 100644
--- a/programs/library-bridge/LibraryBridge.cpp
+++ b/programs/library-bridge/LibraryBridge.cpp
@@ -27,7 +27,7 @@ std::string LibraryBridge::bridgeName() const
 
 LibraryBridge::HandlerFactoryPtr LibraryBridge::getHandlerFactoryPtr(ContextPtr context) const
 {
-    return std::make_shared<LibraryBridgeHandlerFactory>("LibraryRequestHandlerFactory", context);
+    return std::make_shared<LibraryBridgeHandlerFactory>("LibraryRequestHandlerFactory", keep_alive_timeout, context);
 }
 
 }
diff --git a/programs/library-bridge/LibraryBridgeHandlerFactory.cpp b/programs/library-bridge/LibraryBridgeHandlerFactory.cpp
index 234904c6265..e5ab22f2d40 100644
--- a/programs/library-bridge/LibraryBridgeHandlerFactory.cpp
+++ b/programs/library-bridge/LibraryBridgeHandlerFactory.cpp
@@ -9,10 +9,12 @@ namespace DB
 {
 LibraryBridgeHandlerFactory::LibraryBridgeHandlerFactory(
     const std::string & name_,
+    size_t keep_alive_timeout_,
     ContextPtr context_)
     : WithContext(context_)
     , log(getLogger(name_))
     , name(name_)
+    , keep_alive_timeout(keep_alive_timeout_)
 {
 }
 
@@ -24,17 +26,17 @@ std::unique_ptr<HTTPRequestHandler> LibraryBridgeHandlerFactory::createRequestHa
     if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
     {
         if (uri.getPath() == "/extdict_ping")
-            return std::make_unique<ExternalDictionaryLibraryBridgeExistsHandler>(getContext());
+            return std::make_unique<ExternalDictionaryLibraryBridgeExistsHandler>(keep_alive_timeout, getContext());
         else if (uri.getPath() == "/catboost_ping")
-            return std::make_unique<CatBoostLibraryBridgeExistsHandler>(getContext());
+            return std::make_unique<CatBoostLibraryBridgeExistsHandler>(keep_alive_timeout, getContext());
     }
 
     if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST)
     {
         if (uri.getPath() == "/extdict_request")
-            return std::make_unique<ExternalDictionaryLibraryBridgeRequestHandler>(getContext());
+            return std::make_unique<ExternalDictionaryLibraryBridgeRequestHandler>(keep_alive_timeout, getContext());
         else if (uri.getPath() == "/catboost_request")
-            return std::make_unique<CatBoostLibraryBridgeRequestHandler>(getContext());
+            return std::make_unique<CatBoostLibraryBridgeRequestHandler>(keep_alive_timeout, getContext());
     }
 
     return nullptr;
diff --git a/programs/library-bridge/LibraryBridgeHandlerFactory.h b/programs/library-bridge/LibraryBridgeHandlerFactory.h
index c65394efa3b..5b0f088bc29 100644
--- a/programs/library-bridge/LibraryBridgeHandlerFactory.h
+++ b/programs/library-bridge/LibraryBridgeHandlerFactory.h
@@ -13,6 +13,7 @@ class LibraryBridgeHandlerFactory : public HTTPRequestHandlerFactory, WithContex
 public:
     LibraryBridgeHandlerFactory(
         const std::string & name_,
+        size_t keep_alive_timeout_,
         ContextPtr context_);
 
     std::unique_ptr<HTTPRequestHandler> createRequestHandler(const HTTPServerRequest & request) override;
@@ -20,6 +21,7 @@ public:
 private:
     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 236256dc36b..53f4b31ca06 100644
--- a/programs/library-bridge/LibraryBridgeHandlers.cpp
+++ b/programs/library-bridge/LibraryBridgeHandlers.cpp
@@ -87,8 +87,10 @@ static void writeData(Block data, OutputFormatPtr format)
 }
 
 
-ExternalDictionaryLibraryBridgeRequestHandler::ExternalDictionaryLibraryBridgeRequestHandler(ContextPtr context_)
-    : WithContext(context_), log(getLogger("ExternalDictionaryLibraryBridgeRequestHandler"))
+ExternalDictionaryLibraryBridgeRequestHandler::ExternalDictionaryLibraryBridgeRequestHandler(size_t keep_alive_timeout_, ContextPtr context_)
+    : WithContext(context_)
+    , keep_alive_timeout(keep_alive_timeout_)
+    , log(getLogger("ExternalDictionaryLibraryBridgeRequestHandler"))
 {
 }
 
@@ -135,7 +137,7 @@ void ExternalDictionaryLibraryBridgeRequestHandler::handleRequest(HTTPServerRequ
     const String & dictionary_id = params.get("dictionary_id");
 
     LOG_TRACE(log, "Library method: '{}', dictionary id: {}", method, dictionary_id);
-    WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD);
+    WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
 
     try
     {
@@ -372,8 +374,10 @@ void ExternalDictionaryLibraryBridgeRequestHandler::handleRequest(HTTPServerRequ
 }
 
 
-ExternalDictionaryLibraryBridgeExistsHandler::ExternalDictionaryLibraryBridgeExistsHandler(ContextPtr context_)
-    : WithContext(context_), log(getLogger("ExternalDictionaryLibraryBridgeExistsHandler"))
+ExternalDictionaryLibraryBridgeExistsHandler::ExternalDictionaryLibraryBridgeExistsHandler(size_t keep_alive_timeout_, ContextPtr context_)
+    : WithContext(context_)
+    , keep_alive_timeout(keep_alive_timeout_)
+    , log(getLogger("ExternalDictionaryLibraryBridgeExistsHandler"))
 {
 }
 
@@ -397,7 +401,7 @@ void ExternalDictionaryLibraryBridgeExistsHandler::handleRequest(HTTPServerReque
 
         String res = library_handler ? "1" : "0";
 
-        setResponseDefaultHeaders(response);
+        setResponseDefaultHeaders(response, keep_alive_timeout);
         LOG_TRACE(log, "Sending ping response: {} (dictionary id: {})", res, dictionary_id);
         response.sendBuffer(res.data(), res.size());
     }
@@ -408,8 +412,11 @@ void ExternalDictionaryLibraryBridgeExistsHandler::handleRequest(HTTPServerReque
 }
 
 
-CatBoostLibraryBridgeRequestHandler::CatBoostLibraryBridgeRequestHandler(ContextPtr context_)
-    : WithContext(context_), log(getLogger("CatBoostLibraryBridgeRequestHandler"))
+CatBoostLibraryBridgeRequestHandler::CatBoostLibraryBridgeRequestHandler(
+    size_t keep_alive_timeout_, ContextPtr context_)
+    : WithContext(context_)
+    , keep_alive_timeout(keep_alive_timeout_)
+    , log(getLogger("CatBoostLibraryBridgeRequestHandler"))
 {
 }
 
@@ -448,7 +455,7 @@ void CatBoostLibraryBridgeRequestHandler::handleRequest(HTTPServerRequest & requ
     const String & method = params.get("method");
 
     LOG_TRACE(log, "Library method: '{}'", method);
-    WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD);
+    WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
 
     try
     {
@@ -610,8 +617,10 @@ void CatBoostLibraryBridgeRequestHandler::handleRequest(HTTPServerRequest & requ
 }
 
 
-CatBoostLibraryBridgeExistsHandler::CatBoostLibraryBridgeExistsHandler(ContextPtr context_)
-    : WithContext(context_), log(getLogger("CatBoostLibraryBridgeExistsHandler"))
+CatBoostLibraryBridgeExistsHandler::CatBoostLibraryBridgeExistsHandler(size_t keep_alive_timeout_, ContextPtr context_)
+    : WithContext(context_)
+    , keep_alive_timeout(keep_alive_timeout_)
+    , log(getLogger("CatBoostLibraryBridgeExistsHandler"))
 {
 }
 
@@ -625,7 +634,7 @@ void CatBoostLibraryBridgeExistsHandler::handleRequest(HTTPServerRequest & reque
 
         String res = "1";
 
-        setResponseDefaultHeaders(response);
+        setResponseDefaultHeaders(response, keep_alive_timeout);
         LOG_TRACE(log, "Sending ping response: {}", res);
         response.sendBuffer(res.data(), res.size());
     }
diff --git a/programs/library-bridge/LibraryBridgeHandlers.h b/programs/library-bridge/LibraryBridgeHandlers.h
index 367d25a6e2d..62fbf2caede 100644
--- a/programs/library-bridge/LibraryBridgeHandlers.h
+++ b/programs/library-bridge/LibraryBridgeHandlers.h
@@ -18,13 +18,14 @@ namespace DB
 class ExternalDictionaryLibraryBridgeRequestHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    explicit ExternalDictionaryLibraryBridgeRequestHandler(ContextPtr context_);
+    ExternalDictionaryLibraryBridgeRequestHandler(size_t keep_alive_timeout_, ContextPtr context_);
 
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
 
 private:
     static constexpr auto FORMAT = "RowBinary";
 
+    const size_t keep_alive_timeout;
     LoggerPtr log;
 };
 
@@ -33,11 +34,12 @@ private:
 class ExternalDictionaryLibraryBridgeExistsHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    explicit ExternalDictionaryLibraryBridgeExistsHandler(ContextPtr context_);
+    ExternalDictionaryLibraryBridgeExistsHandler(size_t keep_alive_timeout_, ContextPtr context_);
 
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
 
 private:
+    const size_t keep_alive_timeout;
     LoggerPtr log;
 };
 
@@ -61,11 +63,12 @@ private:
 class CatBoostLibraryBridgeRequestHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    explicit CatBoostLibraryBridgeRequestHandler(ContextPtr context_);
+    CatBoostLibraryBridgeRequestHandler(size_t keep_alive_timeout_, ContextPtr context_);
 
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
 
 private:
+    const size_t keep_alive_timeout;
     LoggerPtr log;
 };
 
@@ -74,11 +77,12 @@ private:
 class CatBoostLibraryBridgeExistsHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    explicit CatBoostLibraryBridgeExistsHandler(ContextPtr context_);
+    CatBoostLibraryBridgeExistsHandler(size_t keep_alive_timeout_, ContextPtr context_);
 
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
 
 private:
+    const size_t keep_alive_timeout;
     LoggerPtr log;
 };
 
diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index 184f147a86a..48e0cca7b73 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -1,7 +1,6 @@
 #include "LocalServer.h"
 
 #include <sys/resource.h>
-#include <Common/Config/getLocalConfigPath.h>
 #include <Common/logger_useful.h>
 #include <Common/formatReadable.h>
 #include <Core/UUID.h>
@@ -81,7 +80,7 @@ namespace ErrorCodes
 
 void applySettingsOverridesForLocal(ContextMutablePtr context)
 {
-    Settings settings = context->getSettingsCopy();
+    Settings settings = context->getSettings();
 
     settings.allow_introspection_functions = true;
     settings.storage_file_read_method = LocalFSReadMethod::mmap;
@@ -128,22 +127,11 @@ void LocalServer::initialize(Poco::Util::Application & self)
 {
     Poco::Util::Application::initialize(self);
 
-    const char * home_path_cstr = getenv("HOME"); // NOLINT(concurrency-mt-unsafe)
-    if (home_path_cstr)
-        home_path = home_path_cstr;
-
     /// Load config files if exists
-    std::string config_path;
-    if (getClientConfiguration().has("config-file"))
-        config_path = getClientConfiguration().getString("config-file");
-    else if (config_path.empty() && fs::exists("config.xml"))
-        config_path = "config.xml";
-    else if (config_path.empty())
-        config_path = getLocalConfigPath(home_path).value_or("");
-
-    if (fs::exists(config_path))
+    if (getClientConfiguration().has("config-file") || fs::exists("config.xml"))
     {
-        ConfigProcessor config_processor(config_path);
+        const auto config_path = getClientConfiguration().getString("config-file", "config.xml");
+        ConfigProcessor config_processor(config_path, false, true);
         ConfigProcessor::setConfigPath(fs::path(config_path).parent_path());
         auto loaded_config = config_processor.loadConfig();
         getClientConfiguration().add(loaded_config.configuration.duplicate(), PRIO_DEFAULT, false);
@@ -196,11 +184,6 @@ void LocalServer::initialize(Poco::Util::Application & self)
         cleanup_threads,
         0, // We don't need any threads one all the parts will be deleted
         cleanup_threads);
-
-    getDatabaseCatalogDropTablesThreadPool().initialize(
-        server_settings.database_catalog_drop_table_concurrency,
-        0, // We don't need any threads if there are no DROP queries.
-        server_settings.database_catalog_drop_table_concurrency);
 }
 
 
@@ -312,8 +295,6 @@ void LocalServer::cleanup()
         if (suggest)
             suggest.reset();
 
-        client_context.reset();
-
         if (global_context)
         {
             global_context->shutdown();
@@ -367,7 +348,7 @@ std::string LocalServer::getInitialCreateTableQuery()
     else
         table_structure = "(" + table_structure + ")";
 
-    return fmt::format("CREATE TEMPORARY TABLE {} {} ENGINE = File({}, {});",
+    return fmt::format("CREATE TABLE {} {} ENGINE = File({}, {});",
                        table_name, table_structure, data_format, table_file);
 }
 
@@ -455,7 +436,7 @@ void LocalServer::connect()
         in = input.get();
     }
     connection = LocalConnection::createConnection(
-        connection_parameters, client_context, in, need_render_progress, need_render_profile_events, server_display_name);
+        connection_parameters, global_context, in, need_render_progress, need_render_profile_events, server_display_name);
 }
 
 
@@ -516,6 +497,8 @@ try
     initTTYBuffer(toProgressOption(getClientConfiguration().getString("progress", "default")));
     ASTAlterCommand::setFormatAlterCommandsWithParentheses(true);
 
+    applyCmdSettings(global_context);
+
     /// try to load user defined executable functions, throw on error and die
     try
     {
@@ -527,11 +510,6 @@ try
         throw;
     }
 
-    /// Must be called after we stopped initializing the global context and changing its settings.
-    /// After this point the global context must be stayed almost unchanged till shutdown,
-    /// and all necessary changes must be made to the client context instead.
-    createClientContext();
-
     if (is_interactive)
     {
         clearTerminal();
@@ -586,6 +564,9 @@ void LocalServer::processConfig()
     if (!queries.empty() && getClientConfiguration().has("queries-file"))
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Options '--query' and '--queries-file' cannot be specified at the same time");
 
+    if (getClientConfiguration().has("multiquery"))
+        is_multiquery = true;
+
     pager = getClientConfiguration().getString("pager", "");
 
     delayed_interactive = getClientConfiguration().has("interactive") && (!queries.empty() || getClientConfiguration().has("queries-file"));
@@ -713,7 +694,7 @@ void LocalServer::processConfig()
     if (index_uncompressed_cache_size > max_cache_size)
     {
         index_uncompressed_cache_size = max_cache_size;
-        LOG_INFO(log, "Lowered index uncompressed cache size to {} because the system has limited RAM", formatReadableSizeWithBinarySuffix(index_uncompressed_cache_size));
+        LOG_INFO(log, "Lowered index uncompressed cache size to {} because the system has limited RAM", formatReadableSizeWithBinarySuffix(uncompressed_cache_size));
     }
     global_context->setIndexUncompressedCache(index_uncompressed_cache_policy, index_uncompressed_cache_size, index_uncompressed_cache_size_ratio);
 
@@ -723,7 +704,7 @@ void LocalServer::processConfig()
     if (index_mark_cache_size > max_cache_size)
     {
         index_mark_cache_size = max_cache_size;
-        LOG_INFO(log, "Lowered index mark cache size to {} because the system has limited RAM", formatReadableSizeWithBinarySuffix(index_mark_cache_size));
+        LOG_INFO(log, "Lowered index mark cache size to {} because the system has limited RAM", formatReadableSizeWithBinarySuffix(uncompressed_cache_size));
     }
     global_context->setIndexMarkCache(index_mark_cache_policy, index_mark_cache_size, index_mark_cache_size_ratio);
 
@@ -731,7 +712,7 @@ void LocalServer::processConfig()
     if (mmap_cache_size > max_cache_size)
     {
         mmap_cache_size = max_cache_size;
-        LOG_INFO(log, "Lowered mmap file cache size to {} because the system has limited RAM", formatReadableSizeWithBinarySuffix(mmap_cache_size));
+        LOG_INFO(log, "Lowered mmap file cache size to {} because the system has limited RAM", formatReadableSizeWithBinarySuffix(uncompressed_cache_size));
     }
     global_context->setMMappedFileCache(mmap_cache_size);
 
@@ -754,9 +735,6 @@ void LocalServer::processConfig()
     /// Load global settings from default_profile and system_profile.
     global_context->setDefaultProfiles(getClientConfiguration());
 
-    /// Command-line parameters can override settings from the default profile.
-    applyCmdSettings(global_context);
-
     /// We load temporary database first, because projections need it.
     DatabaseCatalog::instance().initializeAndLoadTemporaryDatabase();
 
@@ -800,6 +778,10 @@ void LocalServer::processConfig()
 
     server_display_name = getClientConfiguration().getString("display_name", "");
     prompt_by_server_display_name = getClientConfiguration().getRawString("prompt_by_server_display_name.default", ":) ");
+
+    global_context->setQueryKindInitial();
+    global_context->setQueryKind(query_kind);
+    global_context->setQueryParameters(query_parameters);
 }
 
 
@@ -878,16 +860,6 @@ void LocalServer::applyCmdOptions(ContextMutablePtr context)
 }
 
 
-void LocalServer::createClientContext()
-{
-    /// In case of clickhouse-local it's necessary to use a separate context for client-related purposes.
-    /// We can't just change the global context because it is used in background tasks (for example, in merges)
-    /// which don't expect that the global context can suddenly change.
-    client_context = Context::createCopy(global_context);
-    initClientContext();
-}
-
-
 void LocalServer::processOptions(const OptionsDescription &, const CommandLineOptions & options, const std::vector<Arguments> &, const std::vector<Arguments> &)
 {
     if (options.count("table"))
@@ -950,6 +922,13 @@ void LocalServer::readArguments(int argc, char ** argv, Arguments & common_argum
                 query_parameters.emplace(param_continuation.substr(0, equal_pos), param_continuation.substr(equal_pos + 1));
             }
         }
+        else if (arg == "--multiquery" && (arg_num + 1) < argc && !std::string_view(argv[arg_num + 1]).starts_with('-'))
+        {
+            /// Transform the abbreviated syntax '--multiquery <SQL>' into the full syntax '--multiquery -q <SQL>'
+            ++arg_num;
+            arg = argv[arg_num];
+            addMultiquery(arg, common_arguments);
+        }
         else
         {
             common_arguments.emplace_back(arg);
diff --git a/programs/local/LocalServer.h b/programs/local/LocalServer.h
index b18a7a90961..0715f358313 100644
--- a/programs/local/LocalServer.h
+++ b/programs/local/LocalServer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Client/ClientApplicationBase.h>
+#include <Client/ClientBase.h>
 #include <Client/LocalConnection.h>
 
 #include <Core/ServerSettings.h>
@@ -21,7 +21,7 @@ namespace DB
 /// Lightweight Application for clickhouse-local
 /// No networking, no extra configs and working directories, no pid and status files, no dictionaries, no logging.
 /// Quiet mode by default
-class LocalServer : public ClientApplicationBase, public Loggers
+class LocalServer : public ClientBase, public Loggers
 {
 public:
     LocalServer() = default;
@@ -31,6 +31,7 @@ public:
     int main(const std::vector<String> & /*args*/) override;
 
 protected:
+
     Poco::Util::LayeredConfiguration & getClientConfiguration() override;
 
     void connect() override;
@@ -49,6 +50,7 @@ protected:
     void processConfig() override;
     void readArguments(int argc, char ** argv, Arguments & common_arguments, std::vector<Arguments> &, std::vector<Arguments> &) override;
 
+
     void updateLoggerLevel(const String & logs_level) override;
 
 private:
@@ -65,8 +67,6 @@ private:
     void applyCmdOptions(ContextMutablePtr context);
     void applyCmdSettings(ContextMutablePtr context);
 
-    void createClientContext();
-
     ServerSettings server_settings;
 
     std::optional<StatusFile> status;
diff --git a/programs/obfuscator/Obfuscator.cpp b/programs/obfuscator/Obfuscator.cpp
index 4c3981c1d01..688ae1a1143 100644
--- a/programs/obfuscator/Obfuscator.cpp
+++ b/programs/obfuscator/Obfuscator.cpp
@@ -1307,7 +1307,6 @@ 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, context_const);
     }
     else
diff --git a/programs/odbc-bridge/ColumnInfoHandler.cpp b/programs/odbc-bridge/ColumnInfoHandler.cpp
index 6c149d7a08c..a738d5e8c12 100644
--- a/programs/odbc-bridge/ColumnInfoHandler.cpp
+++ b/programs/odbc-bridge/ColumnInfoHandler.cpp
@@ -202,7 +202,10 @@ void ODBCColumnsInfoHandler::handleRequest(HTTPServerRequest & request, HTTPServ
         if (columns.empty())
             throw Exception(ErrorCodes::UNKNOWN_TABLE, "Columns definition was not returned");
 
-        WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD);
+        WriteBufferFromHTTPServerResponse out(
+            response,
+            request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD,
+            keep_alive_timeout);
         try
         {
             writeStringBinary(columns.toString(), out);
diff --git a/programs/odbc-bridge/ColumnInfoHandler.h b/programs/odbc-bridge/ColumnInfoHandler.h
index 1edd62dcba3..610fb128c9d 100644
--- a/programs/odbc-bridge/ColumnInfoHandler.h
+++ b/programs/odbc-bridge/ColumnInfoHandler.h
@@ -15,12 +15,18 @@ namespace DB
 class ODBCColumnsInfoHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    explicit ODBCColumnsInfoHandler(ContextPtr context_) : WithContext(context_), log(getLogger("ODBCColumnsInfoHandler")) { }
+    ODBCColumnsInfoHandler(size_t keep_alive_timeout_, ContextPtr context_)
+        : WithContext(context_)
+        , log(getLogger("ODBCColumnsInfoHandler"))
+        , keep_alive_timeout(keep_alive_timeout_)
+    {
+    }
 
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
 
 private:
     LoggerPtr log;
+    size_t keep_alive_timeout;
 };
 
 }
diff --git a/programs/odbc-bridge/IdentifierQuoteHandler.cpp b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
index 778e6019be1..2f00e1171bb 100644
--- a/programs/odbc-bridge/IdentifierQuoteHandler.cpp
+++ b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
@@ -74,7 +74,7 @@ void IdentifierQuoteHandler::handleRequest(HTTPServerRequest & request, HTTPServ
 
         auto identifier = getIdentifierQuote(std::move(connection));
 
-        WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD);
+        WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
         try
         {
             writeStringBinary(identifier, out);
diff --git a/programs/odbc-bridge/IdentifierQuoteHandler.h b/programs/odbc-bridge/IdentifierQuoteHandler.h
index a85b56a9f6a..7b78c5b4b93 100644
--- a/programs/odbc-bridge/IdentifierQuoteHandler.h
+++ b/programs/odbc-bridge/IdentifierQuoteHandler.h
@@ -14,12 +14,18 @@ namespace DB
 class IdentifierQuoteHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    explicit IdentifierQuoteHandler(ContextPtr context_) : WithContext(context_), log(getLogger("IdentifierQuoteHandler")) { }
+    IdentifierQuoteHandler(size_t keep_alive_timeout_, ContextPtr context_)
+        : WithContext(context_)
+        , log(getLogger("IdentifierQuoteHandler"))
+        , keep_alive_timeout(keep_alive_timeout_)
+    {
+    }
 
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
 
 private:
     LoggerPtr log;
+    size_t keep_alive_timeout;
 };
 
 }
diff --git a/programs/odbc-bridge/MainHandler.cpp b/programs/odbc-bridge/MainHandler.cpp
index 160add9d2ed..404f66eab3b 100644
--- a/programs/odbc-bridge/MainHandler.cpp
+++ b/programs/odbc-bridge/MainHandler.cpp
@@ -132,7 +132,7 @@ void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
         return;
     }
 
-    WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD);
+    WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
 
     try
     {
diff --git a/programs/odbc-bridge/MainHandler.h b/programs/odbc-bridge/MainHandler.h
index 0fcad61d274..ed0c6b2e28c 100644
--- a/programs/odbc-bridge/MainHandler.h
+++ b/programs/odbc-bridge/MainHandler.h
@@ -20,10 +20,12 @@ class ODBCHandler : public HTTPRequestHandler, WithContext
 {
 public:
     ODBCHandler(
+        size_t keep_alive_timeout_,
         ContextPtr context_,
         const String & mode_)
         : WithContext(context_)
         , log(getLogger("ODBCHandler"))
+        , keep_alive_timeout(keep_alive_timeout_)
         , mode(mode_)
     {
     }
@@ -33,6 +35,7 @@ public:
 private:
     LoggerPtr log;
 
+    size_t keep_alive_timeout;
     String mode;
 
     static inline std::mutex mutex;
diff --git a/programs/odbc-bridge/ODBCBridge.cpp b/programs/odbc-bridge/ODBCBridge.cpp
index 096d1b2dcca..155e26c8a27 100644
--- a/programs/odbc-bridge/ODBCBridge.cpp
+++ b/programs/odbc-bridge/ODBCBridge.cpp
@@ -27,7 +27,7 @@ std::string ODBCBridge::bridgeName() const
 
 ODBCBridge::HandlerFactoryPtr ODBCBridge::getHandlerFactoryPtr(ContextPtr context) const
 {
-    return std::make_shared<ODBCBridgeHandlerFactory>("ODBCRequestHandlerFactory-factory", context);
+    return std::make_shared<ODBCBridgeHandlerFactory>("ODBCRequestHandlerFactory-factory", keep_alive_timeout, context);
 }
 
 }
diff --git a/programs/odbc-bridge/ODBCHandlerFactory.cpp b/programs/odbc-bridge/ODBCHandlerFactory.cpp
index b5d0be908f4..eebb0c24c7a 100644
--- a/programs/odbc-bridge/ODBCHandlerFactory.cpp
+++ b/programs/odbc-bridge/ODBCHandlerFactory.cpp
@@ -9,8 +9,11 @@
 namespace DB
 {
 
-ODBCBridgeHandlerFactory::ODBCBridgeHandlerFactory(const std::string & name_, ContextPtr context_)
-    : WithContext(context_), log(getLogger(name_)), name(name_)
+ODBCBridgeHandlerFactory::ODBCBridgeHandlerFactory(const std::string & name_, size_t keep_alive_timeout_, ContextPtr context_)
+    : WithContext(context_)
+    , log(getLogger(name_))
+    , name(name_)
+    , keep_alive_timeout(keep_alive_timeout_)
 {
 }
 
@@ -20,33 +23,33 @@ std::unique_ptr<HTTPRequestHandler> ODBCBridgeHandlerFactory::createRequestHandl
     LOG_TRACE(log, "Request URI: {}", uri.toString());
 
     if (uri.getPath() == "/ping" && request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
-        return std::make_unique<PingHandler>();
+        return std::make_unique<PingHandler>(keep_alive_timeout);
 
     if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST)
     {
 
         if (uri.getPath() == "/columns_info")
 #if USE_ODBC
-            return std::make_unique<ODBCColumnsInfoHandler>(getContext());
+            return std::make_unique<ODBCColumnsInfoHandler>(keep_alive_timeout, getContext());
 #else
             return nullptr;
 #endif
         else if (uri.getPath() == "/identifier_quote")
 #if USE_ODBC
-            return std::make_unique<IdentifierQuoteHandler>(getContext());
+            return std::make_unique<IdentifierQuoteHandler>(keep_alive_timeout, getContext());
 #else
             return nullptr;
 #endif
         else if (uri.getPath() == "/schema_allowed")
 #if USE_ODBC
-            return std::make_unique<SchemaAllowedHandler>(getContext());
+            return std::make_unique<SchemaAllowedHandler>(keep_alive_timeout, getContext());
 #else
             return nullptr;
 #endif
         else if (uri.getPath() == "/write")
-            return std::make_unique<ODBCHandler>(getContext(), "write");
+            return std::make_unique<ODBCHandler>(keep_alive_timeout, getContext(), "write");
         else
-            return std::make_unique<ODBCHandler>(getContext(), "read");
+            return std::make_unique<ODBCHandler>(keep_alive_timeout, getContext(), "read");
     }
     return nullptr;
 }
diff --git a/programs/odbc-bridge/ODBCHandlerFactory.h b/programs/odbc-bridge/ODBCHandlerFactory.h
index f4a2717dc9f..4aaf1b55453 100644
--- a/programs/odbc-bridge/ODBCHandlerFactory.h
+++ b/programs/odbc-bridge/ODBCHandlerFactory.h
@@ -17,13 +17,14 @@ namespace DB
 class ODBCBridgeHandlerFactory : public HTTPRequestHandlerFactory, WithContext
 {
 public:
-    ODBCBridgeHandlerFactory(const std::string & name_, ContextPtr context_);
+    ODBCBridgeHandlerFactory(const std::string & name_, size_t keep_alive_timeout_, ContextPtr context_);
 
     std::unique_ptr<HTTPRequestHandler> createRequestHandler(const HTTPServerRequest & request) override;
 
 private:
     LoggerPtr log;
     std::string name;
+    size_t keep_alive_timeout;
 };
 
 }
diff --git a/programs/odbc-bridge/PingHandler.cpp b/programs/odbc-bridge/PingHandler.cpp
index e5d094fb7eb..80d0e2bf4a9 100644
--- a/programs/odbc-bridge/PingHandler.cpp
+++ b/programs/odbc-bridge/PingHandler.cpp
@@ -10,7 +10,7 @@ void PingHandler::handleRequest(HTTPServerRequest & /* request */, HTTPServerRes
 {
     try
     {
-        setResponseDefaultHeaders(response);
+        setResponseDefaultHeaders(response, keep_alive_timeout);
         const char * data = "Ok.\n";
         response.sendBuffer(data, strlen(data));
     }
diff --git a/programs/odbc-bridge/PingHandler.h b/programs/odbc-bridge/PingHandler.h
index 4c557bd3cf6..c5447107e0c 100644
--- a/programs/odbc-bridge/PingHandler.h
+++ b/programs/odbc-bridge/PingHandler.h
@@ -9,7 +9,11 @@ namespace DB
 class PingHandler : public HTTPRequestHandler
 {
 public:
+    explicit PingHandler(size_t keep_alive_timeout_) : keep_alive_timeout(keep_alive_timeout_) {}
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
+
+private:
+    size_t keep_alive_timeout;
 };
 
 }
diff --git a/programs/odbc-bridge/SchemaAllowedHandler.cpp b/programs/odbc-bridge/SchemaAllowedHandler.cpp
index e17d7c5b880..dfb4333240b 100644
--- a/programs/odbc-bridge/SchemaAllowedHandler.cpp
+++ b/programs/odbc-bridge/SchemaAllowedHandler.cpp
@@ -88,7 +88,7 @@ void SchemaAllowedHandler::handleRequest(HTTPServerRequest & request, HTTPServer
 
         bool result = isSchemaAllowed(std::move(connection));
 
-        WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD);
+        WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
         try
         {
             writeBoolText(result, out);
diff --git a/programs/odbc-bridge/SchemaAllowedHandler.h b/programs/odbc-bridge/SchemaAllowedHandler.h
index 59022151b53..8dc725dbb33 100644
--- a/programs/odbc-bridge/SchemaAllowedHandler.h
+++ b/programs/odbc-bridge/SchemaAllowedHandler.h
@@ -17,12 +17,18 @@ class Context;
 class SchemaAllowedHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    explicit SchemaAllowedHandler(ContextPtr context_) : WithContext(context_), log(getLogger("SchemaAllowedHandler")) { }
+    SchemaAllowedHandler(size_t keep_alive_timeout_, ContextPtr context_)
+        : WithContext(context_)
+        , log(getLogger("SchemaAllowedHandler"))
+        , keep_alive_timeout(keep_alive_timeout_)
+    {
+    }
 
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
 
 private:
     LoggerPtr log;
+    size_t keep_alive_timeout;
 };
 
 }
diff --git a/programs/odbc-bridge/tests/CMakeLists.txt b/programs/odbc-bridge/tests/CMakeLists.txt
index f1411dbb554..edf364ea192 100644
--- a/programs/odbc-bridge/tests/CMakeLists.txt
+++ b/programs/odbc-bridge/tests/CMakeLists.txt
@@ -1,2 +1,2 @@
 clickhouse_add_executable (validate-odbc-connection-string validate-odbc-connection-string.cpp ../validateODBCConnectionString.cpp)
-target_link_libraries (validate-odbc-connection-string PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (validate-odbc-connection-string PRIVATE clickhouse_common_io)
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index c69d822e383..29c330f53b1 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -11,6 +11,7 @@
 #include <Poco/Util/HelpFormatter.h>
 #include <Poco/Environment.h>
 #include <Poco/Config.h>
+#include <Common/Jemalloc.h>
 #include <Common/scope_guard_safe.h>
 #include <Common/logger_useful.h>
 #include <base/phdr_cache.h>
@@ -21,10 +22,8 @@
 #include <base/coverage.h>
 #include <base/getFQDNOrHostName.h>
 #include <base/safeExit.h>
-#include <base/Numa.h>
 #include <Common/PoolId.h>
 #include <Common/MemoryTracker.h>
-#include <Common/MemoryWorker.h>
 #include <Common/ClickHouseRevision.h>
 #include <Common/DNSResolver.h>
 #include <Common/CgroupsMemoryUsageObserver.h>
@@ -111,8 +110,6 @@
 #include <filesystem>
 #include <unordered_set>
 
-#include <Common/Jemalloc.h>
-
 #include "config.h"
 #include <Common/config_version.h>
 
@@ -143,7 +140,6 @@
 #   include <azure/core/diagnostics/logger.hpp>
 #endif
 
-
 #include <incbin.h>
 /// A minimal file used when the server is run without installation
 INCBIN(resource_embedded_xml, SOURCE_DIR "/programs/server/embedded.xml");
@@ -451,12 +447,9 @@ void checkForUsersNotInMainConfig(
     }
 }
 
-namespace
-{
-
 /// Unused in other builds
 #if defined(OS_LINUX)
-String readLine(const String & path)
+static String readLine(const String & path)
 {
     ReadBufferFromFile in(path);
     String contents;
@@ -464,7 +457,7 @@ String readLine(const String & path)
     return contents;
 }
 
-int readNumber(const String & path)
+static int readNumber(const String & path)
 {
     ReadBufferFromFile in(path);
     int result;
@@ -474,7 +467,7 @@ int readNumber(const String & path)
 
 #endif
 
-void sanityChecks(Server & server)
+static void sanityChecks(Server & server)
 {
     std::string data_path = getCanonicalPath(server.config().getString("path", DBMS_DEFAULT_PATH));
     std::string logs_path = server.config().getString("logger.log", "");
@@ -595,8 +588,6 @@ void sanityChecks(Server & server)
     }
 }
 
-}
-
 void loadStartupScripts(const Poco::Util::AbstractConfiguration & config, ContextMutablePtr context, Poco::Logger * log)
 {
     try
@@ -763,12 +754,6 @@ try
         setenv("OPENSSL_CONF", config_dir.c_str(), true); /// NOLINT
     }
 
-    if (auto total_numa_memory = getNumaNodesTotalMemory(); total_numa_memory.has_value())
-    {
-        LOG_INFO(
-            log, "ClickHouse is bound to a subset of NUMA nodes. Total memory of all available nodes: {}", ReadableSize(*total_numa_memory));
-    }
-
     registerInterpreters();
     registerFunctions();
     registerAggregateFunctions();
@@ -857,7 +842,7 @@ try
 #endif
 
 #if defined(SANITIZER)
-    LOG_INFO(log, "Query Profiler is disabled because it cannot work under sanitizers"
+    LOG_INFO(log, "Query Profiler disabled because they cannot work under sanitizers"
         " when two different stack unwinding methods will interfere with each other.");
 #endif
 
@@ -913,8 +898,6 @@ try
         LOG_INFO(log, "Background threads finished in {} ms", watch.elapsedMilliseconds());
     });
 
-    MemoryWorker memory_worker(global_context->getServerSettings().memory_worker_period_ms);
-
     /// This object will periodically calculate some metrics.
     ServerAsynchronousMetrics async_metrics(
         global_context,
@@ -928,14 +911,13 @@ try
             metrics.reserve(servers_to_start_before_tables.size() + servers.size());
 
             for (const auto & server : servers_to_start_before_tables)
-                metrics.emplace_back(ProtocolServerMetrics{server.getPortName(), server.currentThreads(), server.refusedConnections()});
+                metrics.emplace_back(ProtocolServerMetrics{server.getPortName(), server.currentThreads()});
 
             for (const auto & server : servers)
-                metrics.emplace_back(ProtocolServerMetrics{server.getPortName(), server.currentThreads(), server.refusedConnections()});
+                metrics.emplace_back(ProtocolServerMetrics{server.getPortName(), server.currentThreads()});
             return metrics;
-        },
-        /*update_jemalloc_epoch_=*/memory_worker.getSource() != MemoryWorker::MemoryUsageSource::Jemalloc,
-        /*update_rss_=*/memory_worker.getSource() == MemoryWorker::MemoryUsageSource::None);
+        }
+    );
 
     /// NOTE: global context should be destroyed *before* GlobalThreadPool::shutdown()
     /// Otherwise GlobalThreadPool::shutdown() will hang, since Context holds some threads.
@@ -988,7 +970,6 @@ try
         /** Explicitly destroy Context. It is more convenient than in destructor of Server, because logger is still available.
           * At this moment, no one could own shared part of Context.
           */
-        global_context->resetSharedContext();
         global_context.reset();
         shared_context.reset();
         LOG_DEBUG(log, "Destroyed global context.");
@@ -1055,11 +1036,6 @@ try
         0, // We don't need any threads once all the tables will be created
         max_database_replicated_create_table_thread_pool_size);
 
-    getDatabaseCatalogDropTablesThreadPool().initialize(
-        server_settings.database_catalog_drop_table_concurrency,
-        0, // We don't need any threads if there are no DROP queries.
-        server_settings.database_catalog_drop_table_concurrency);
-
     /// Initialize global local cache for remote filesystem.
     if (config().has("local_cache_for_remote_fs"))
     {
@@ -1214,8 +1190,6 @@ try
 
     FailPointInjection::enableFromGlobalConfig(config());
 
-    memory_worker.start();
-
     int default_oom_score = 0;
 
 #if !defined(NDEBUG)
@@ -1433,7 +1407,7 @@ try
     if (index_uncompressed_cache_size > max_cache_size)
     {
         index_uncompressed_cache_size = max_cache_size;
-        LOG_INFO(log, "Lowered index uncompressed cache size to {} because the system has limited RAM", formatReadableSizeWithBinarySuffix(index_uncompressed_cache_size));
+        LOG_INFO(log, "Lowered index uncompressed cache size to {} because the system has limited RAM", formatReadableSizeWithBinarySuffix(uncompressed_cache_size));
     }
     global_context->setIndexUncompressedCache(index_uncompressed_cache_policy, index_uncompressed_cache_size, index_uncompressed_cache_size_ratio);
 
@@ -1443,7 +1417,7 @@ try
     if (index_mark_cache_size > max_cache_size)
     {
         index_mark_cache_size = max_cache_size;
-        LOG_INFO(log, "Lowered index mark cache size to {} because the system has limited RAM", formatReadableSizeWithBinarySuffix(index_mark_cache_size));
+        LOG_INFO(log, "Lowered index mark cache size to {} because the system has limited RAM", formatReadableSizeWithBinarySuffix(uncompressed_cache_size));
     }
     global_context->setIndexMarkCache(index_mark_cache_policy, index_mark_cache_size, index_mark_cache_size_ratio);
 
@@ -1451,7 +1425,7 @@ try
     if (mmap_cache_size > max_cache_size)
     {
         mmap_cache_size = max_cache_size;
-        LOG_INFO(log, "Lowered mmap file cache size to {} because the system has limited RAM", formatReadableSizeWithBinarySuffix(mmap_cache_size));
+        LOG_INFO(log, "Lowered mmap file cache size to {} because the system has limited RAM", formatReadableSizeWithBinarySuffix(uncompressed_cache_size));
     }
     global_context->setMMappedFileCache(mmap_cache_size);
 
@@ -1462,7 +1436,7 @@ try
     if (query_cache_max_size_in_bytes > max_cache_size)
     {
         query_cache_max_size_in_bytes = max_cache_size;
-        LOG_INFO(log, "Lowered query cache size to {} because the system has limited RAM", formatReadableSizeWithBinarySuffix(query_cache_max_size_in_bytes));
+        LOG_INFO(log, "Lowered query cache size to {} because the system has limited RAM", formatReadableSizeWithBinarySuffix(uncompressed_cache_size));
     }
     global_context->setQueryCache(query_cache_max_size_in_bytes, query_cache_max_entries, query_cache_query_cache_max_entry_size_in_bytes, query_cache_max_entry_size_in_rows);
 
@@ -1559,6 +1533,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);
@@ -1587,6 +1570,8 @@ try
             background_memory_tracker.setDescription("(background)");
             background_memory_tracker.setMetric(CurrentMetrics::MergesMutationsMemoryTracking);
 
+            total_memory_tracker.setAllowUseJemallocMemory(new_server_settings.allow_use_jemalloc_memory);
+
             auto * global_overcommit_tracker = global_context->getGlobalOvercommitTracker();
             total_memory_tracker.setOvercommitTracker(global_overcommit_tracker);
 
@@ -1598,8 +1583,6 @@ try
             global_context->setMacros(std::make_unique<Macros>(*config, "macros", log));
             global_context->setExternalAuthenticatorsConfig(*config);
 
-            global_context->setDashboardsConfig(config);
-
             if (global_context->isServerCompletelyStarted())
             {
                 /// It does not make sense to reload anything before server has started.
@@ -1771,8 +1754,6 @@ try
                     new_server_settings.http_connections_store_limit,
                 });
 
-            DNSResolver::instance().setFilterSettings(new_server_settings.dns_allow_resolve_names_to_ipv4, new_server_settings.dns_allow_resolve_names_to_ipv6);
-
             if (global_context->isServerCompletelyStarted())
                 CannotAllocateThreadFaultInjector::setFaultProbability(new_server_settings.cannot_allocate_thread_fault_injection_probability);
 
@@ -2432,7 +2413,6 @@ void Server::createServers(
     Poco::Net::HTTPServerParams::Ptr http_params = new Poco::Net::HTTPServerParams;
     http_params->setTimeout(settings.http_receive_timeout);
     http_params->setKeepAliveTimeout(global_context->getServerSettings().keep_alive_timeout);
-    http_params->setMaxKeepAliveRequests(static_cast<int>(global_context->getServerSettings().max_keep_alive_requests));
 
     Poco::Util::AbstractConfiguration::Keys protocols;
     config.keys("protocols", protocols);
diff --git a/programs/server/config.d/backups.xml b/programs/server/config.d/backups.xml
deleted file mode 100644
index 382794e1123..00000000000
--- a/programs/server/config.d/backups.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<clickhouse>
-    <storage_configuration>
-        <disks>
-            <backups>
-                <type>local</type>
-                <path>/tmp/backups/</path>
-            </backups>
-        </disks>
-    </storage_configuration>
-    <backups>
-        <allowed_disk>backups</allowed_disk>
-    </backups>
-</clickhouse>
diff --git a/programs/server/config.d/enable_keeper_map.xml b/programs/server/config.d/enable_keeper_map.xml
deleted file mode 120000
index 47c36159882..00000000000
--- a/programs/server/config.d/enable_keeper_map.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../../tests/config/config.d/enable_keeper_map.xml
\ No newline at end of file
diff --git a/programs/server/config.d/session_log.xml b/programs/server/config.d/session_log.xml
deleted file mode 120000
index 7678cc33129..00000000000
--- a/programs/server/config.d/session_log.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../../tests/config/config.d/session_log.xml
\ No newline at end of file
diff --git a/programs/server/config.d/transactions.xml b/programs/server/config.d/transactions.xml
deleted file mode 120000
index be9de46b607..00000000000
--- a/programs/server/config.d/transactions.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../../tests/config/config.d/transactions.xml
\ No newline at end of file
diff --git a/programs/server/config.xml b/programs/server/config.xml
index 10ad831465a..94825a55f67 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -150,21 +150,6 @@
     -->
     <tcp_port>9000</tcp_port>
 
-    <!-- Chunked capabilities for native protocol by server.
-         Can be enabled separately for send and receive channels.
-         Supported modes:
-         - chunked - server requires from client to have chunked enabled;
-         - chunked_optional - server supports both chunked and notchunked protocol;
-         - notchunked - server requires from client notchunked protocol (current default);
-         - notchunked_optional - server supports both chunked and notchunked protocol.
-     -->
-    <!--
-    <proto_caps>
-        <send>notchunked_optional</send>
-        <recv>notchunked_optional</recv>
-    </proto_caps>
-    -->
-
     <!-- Compatibility with MySQL protocol.
          ClickHouse will pretend to be MySQL for applications connecting to this port.
     -->
@@ -1145,7 +1130,8 @@
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </query_views_log>
 
-    <!-- Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads). -->
+    <!-- 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>
@@ -1157,9 +1143,9 @@
         <flush_on_crash>false</flush_on_crash>
     </part_log>
 
-    <!-- Text log contains all information from usual server log but stores it in structured and efficient way.
+    <!-- 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>
@@ -1168,8 +1154,9 @@
         <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>trace</level>
+        <level></level>
     </text_log>
+    -->
 
     <!-- Metric log contains rows with current values of ProfileEvents, CurrentMetrics collected with "collect_interval_milliseconds" interval. -->
     <metric_log>
@@ -1325,31 +1312,6 @@
         <ttl>event_date + INTERVAL 30 DAY</ttl>
     </blob_storage_log>
 
-    <!-- Configure system.dashboards for dashboard.html.
-
-         Could have any query parameters, for which there will be an input on the page.
-         For instance an example from comments have the following:
-         - seconds
-         - rounding
-
-         NOTE: All default dashboards will be overwritten if it was set here. -->
-    <!-- Here is an example without merge() function, to make it work with readonly user -->
-    <!--
-    <dashboards>
-        <dashboard>
-            <dashboard>Overview</dashboard>
-            <title>Queries/second</title>
-            <query>
-                SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_Query)
-                FROM 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}
-            </query>
-        </dashboard>
-    </dashboards>
-    -->
-
     <!-- <top_level_domains_path>/var/lib/clickhouse/top_level_domains/</top_level_domains_path> -->
     <!-- Custom TLD lists.
          Format: <name>/path/to/file</name>
diff --git a/programs/server/dashboard.html b/programs/server/dashboard.html
index 0b099b15536..45f988f7b1e 100644
--- a/programs/server/dashboard.html
+++ b/programs/server/dashboard.html
@@ -17,7 +17,7 @@
             --input-shadow-color: rgba(0, 255, 0, 1);
             --error-color: red;
             --global-error-color: white;
-            --legend-background: rgba(255, 255, 0, 0.75);
+            --legend-background: rgba(255, 255, 255, 0.75);
             --title-color: #666;
             --text-color: black;
             --edit-title-background: #FEE;
@@ -41,7 +41,7 @@
             --moving-shadow-color: rgba(255, 255, 255, 0.25);
             --input-shadow-color: rgba(255, 128, 0, 0.25);
             --error-color: #F66;
-            --legend-background: rgba(0, 96, 128, 0.75);
+            --legend-background: rgba(255, 255, 255, 0.25);
             --title-color: white;
             --text-color: white;
             --edit-title-background: #364f69;
@@ -218,7 +218,6 @@
 
         #chart-params .param {
             width: 6%;
-            font-family: monospace;
         }
 
         input {
@@ -257,7 +256,6 @@
             font-weight: bold;
             user-select: none;
             cursor: pointer;
-            margin-bottom: 1rem;
         }
 
         #run:hover {
@@ -311,7 +309,7 @@
             color: var(--param-text-color);
             display: inline-block;
             box-shadow: 1px 1px 0 var(--shadow-color);
-            margin-bottom: 0.5rem;
+            margin-bottom: 1rem;
         }
 
         input:focus {
@@ -659,10 +657,6 @@ function insertParam(name, value) {
     param_value.value = value;
     param_value.spellcheck = false;
 
-    let setWidth = e => { e.style.width = (e.value.length + 1) + 'ch' };
-    if (value) { setWidth(param_value); }
-    param_value.addEventListener('input', e => setWidth(e.target));
-
     param_wrapper.appendChild(param_name);
     param_wrapper.appendChild(param_value);
     document.getElementById('chart-params').appendChild(param_wrapper);
@@ -951,7 +945,6 @@ function showMassEditor() {
     let editor = document.getElementById('mass-editor-textarea');
     editor.value = JSON.stringify({params: params, queries: queries}, null, 2);
 
-    editor.focus();
     mass_editor_active = true;
 }
 
@@ -1011,14 +1004,14 @@ function legendAsTooltipPlugin({ className, style = { background: "var(--legend-
         className && legendEl.classList.add(className);
 
         uPlot.assign(legendEl.style, {
-            textAlign: "right",
+            textAlign: "left",
             pointerEvents: "none",
             display: "none",
             position: "absolute",
             left: 0,
             top: 0,
             zIndex: 100,
-            boxShadow: "2px 2px 10px rgba(0, 0, 0, 0.1)",
+            boxShadow: "2px 2px 10px rgba(0,0,0,0.1)",
             ...style
         });
 
@@ -1058,10 +1051,8 @@ function legendAsTooltipPlugin({ className, style = { background: "var(--legend-
 
     function update(u) {
         let { left, top } = u.cursor;
-        /// This will make the balloon to the right of the cursor when the cursor is on the left side, and vise-versa,
-        /// avoiding the borders of the chart.
-        left -= legendEl.clientWidth * (left / u.width);
-        top -= legendEl.clientHeight;
+        left -= legendEl.clientWidth / 2;
+        top -= legendEl.clientHeight / 2;
         legendEl.style.transform = "translate(" + left + "px, " + top + "px)";
 
         if (multiline) {
@@ -1148,7 +1139,7 @@ async function draw(idx, chart, url_params, query) {
 
     let {reply, error} = await doFetch(query, url_params);
     if (!error) {
-        if (reply.rows == 0) {
+        if (reply.rows.length == 0) {
             error = "Query returned empty result.";
         } else if (reply.meta.length < 2) {
             error = "Query should return at least two columns: unix timestamp and value.";
@@ -1238,53 +1229,14 @@ async function draw(idx, chart, url_params, query) {
 
     let sync = uPlot.sync("sync");
 
-    function formatDateTime(t) {
-        return (new Date(t * 1000)).toISOString().replace('T', '\n').replace('.000Z', '');
-    }
-
-    function formatDateTimes(self, ticks) {
-        return ticks.map((t, idx) => {
-            let res = formatDateTime(t);
-            if (idx == 0 || res.substring(0, 10) != formatDateTime(ticks[idx - 1]).substring(0, 10)) {
-                return res;
-            } else {
-                return res.substring(11);
-            }
-        });
-    }
-
-    function formatValue(v) {
-        const a = Math.abs(v);
-        if (a >= 1000000000000000) { return (v / 1000000000000000) + 'P'; }
-        if (a >= 1000000000000) { return (v / 1000000000000) + 'T'; }
-        if (a >= 1000000000) { return (v / 1000000000) + 'G'; }
-        if (a >= 1000000) { return (v / 1000000) + 'M'; }
-        if (a >= 1000) { return (v / 1000) + 'K'; }
-        if (a > 0 && a < 0.001) { return (v * 1000000) + "μ"; }
-        return v;
-    }
-
-    let axis_x = {
+    let axis = {
         stroke: axes_color,
         grid: { width: 1 / devicePixelRatio, stroke: grid_color },
-        ticks: { width: 1 / devicePixelRatio, stroke: grid_color },
-        values: formatDateTimes,
-        space: 80,
-        incrs: [1, 5, 10, 15, 30,
-            60, 60 * 5, 60 * 10, 60 * 15, 60 * 30,
-            3600, 3600 * 2, 3600 * 3, 3600 * 4, 3600 * 6, 3600 * 12,
-            3600 * 24],
+        ticks: { width: 1 / devicePixelRatio, stroke: grid_color }
     };
 
-    let axis_y = {
-        stroke: axes_color,
-        grid: { width: 1 / devicePixelRatio, stroke: grid_color },
-        ticks: { width: 1 / devicePixelRatio, stroke: grid_color },
-        values: (self, ticks) => ticks.map(formatValue)
-    };
-
-    let axes = [axis_x, axis_y];
-    let series = [{ label: "time", value: (self, t) => formatDateTime(t) }];
+    let axes = [axis, axis];
+    let series = [{ label: "x" }];
     let data = [reply.data[reply.meta[0].name]];
 
     // Treat every column as series
@@ -1302,10 +1254,9 @@ async function draw(idx, chart, url_params, query) {
     const opts = {
         width: chart.clientWidth,
         height: chart.clientHeight,
-        scales: { x: { time: false } }, /// Because we want to split and format time on our own.
         axes,
         series,
-        padding: [ null, null, null, 3 ],
+        padding: [ null, null, null, (Math.round(max_value * 100) / 100).toString().length * 6 - 10 ],
         plugins: [ legendAsTooltipPlugin() ],
         cursor: {
             sync: {
diff --git a/programs/server/fuzzers/tcp_protocol_fuzzer.cpp b/programs/server/fuzzers/tcp_protocol_fuzzer.cpp
index 7cebdc2ad65..950ea09669a 100644
--- a/programs/server/fuzzers/tcp_protocol_fuzzer.cpp
+++ b/programs/server/fuzzers/tcp_protocol_fuzzer.cpp
@@ -10,7 +10,6 @@
 #include <Poco/Net/SocketAddress.h>
 #include <Poco/Net/StreamSocket.h>
 
-#include <Daemon/BaseDaemon.h>
 #include <Interpreters/Context.h>
 
 
@@ -26,12 +25,6 @@ static int64_t port = 9000;
 
 using namespace std::chrono_literals;
 
-void on_exit()
-{
-    BaseDaemon::terminate();
-    main_app.wait();
-}
-
 extern "C"
 int LLVMFuzzerInitialize(int * argc, char ***argv)
 {
@@ -67,8 +60,6 @@ int LLVMFuzzerInitialize(int * argc, char ***argv)
             exit(-1);
     }
 
-    atexit(on_exit);
-
     return 0;
 }
 
diff --git a/programs/server/play.html b/programs/server/play.html
index 0d76a01cf7e..9590a65524c 100644
--- a/programs/server/play.html
+++ b/programs/server/play.html
@@ -522,9 +522,6 @@
     const current_url = new URL(window.location);
     const opened_locally = location.protocol == 'file:';
 
-    /// Run query instantly after page is loaded if the run parameter is present.
-    const run_immediately = current_url.searchParams.has("run");
-
     const server_address = current_url.searchParams.get('url');
     if (server_address) {
         document.getElementById('url').value = server_address;
@@ -602,9 +599,6 @@
                     const title = "ClickHouse Query: " + query;
 
                     let history_url = window.location.pathname + '?user=' + encodeURIComponent(user);
-                    if (run_immediately) {
-                        history_url += "&run=1";
-                    }
                     if (server_address != location.origin) {
                         /// Save server's address in URL if it's not identical to the address of the play UI.
                         history_url += '&url=' + encodeURIComponent(server_address);
@@ -1166,10 +1160,6 @@
         });
     }
 
-    if (run_immediately) {
-        post();
-    }
-
     document.getElementById('toggle-light').onclick = function() {
         setColorTheme('light', true);
     }
diff --git a/pyproject.toml b/pyproject.toml
index 4268901e7f9..c89d46c0929 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,8 +39,6 @@ disable = '''
           no-else-return,
           global-statement,
           f-string-without-interpolation,
-          consider-using-with,
-          use-maxsplit-arg,
           '''
 
 [tool.pylint.SIMILARITIES]
diff --git a/src/Access/AccessBackup.cpp b/src/Access/AccessBackup.cpp
index d9ee89b45ce..90effdab70f 100644
--- a/src/Access/AccessBackup.cpp
+++ b/src/Access/AccessBackup.cpp
@@ -93,7 +93,7 @@ namespace
                         break;
                     }
 
-                    UUID id = parse<UUID>(line.substr(0, line.find('\t')));
+                    UUID id = parse<UUID>(line);
                     line.clear();
 
                     String queries;
diff --git a/src/Access/Authentication.cpp b/src/Access/Authentication.cpp
index 90c82b466db..6b9a6e05cf6 100644
--- a/src/Access/Authentication.cpp
+++ b/src/Access/Authentication.cpp
@@ -239,36 +239,15 @@ bool Authentication::areCredentialsValid(
                 throw Authentication::Require<GSSAcceptorContext>(auth_data.getKerberosRealm());
 
             case AuthenticationType::SSL_CERTIFICATE:
-            {
                 for (SSLCertificateSubjects::Type type : {SSLCertificateSubjects::Type::CN, SSLCertificateSubjects::Type::SAN})
                 {
                     for (const auto & subject : auth_data.getSSLCertificateSubjects().at(type))
                     {
                         if (ssl_certificate_credentials->getSSLCertificateSubjects().at(type).contains(subject))
                             return true;
-
-                        // Wildcard support (1 only)
-                        if (subject.contains('*'))
-                        {
-                            auto prefix = std::string_view(subject).substr(0, subject.find('*'));
-                            auto suffix = std::string_view(subject).substr(subject.find('*') + 1);
-                            auto slashes = std::count(subject.begin(), subject.end(), '/');
-
-                            for (const auto & certificate_subject : ssl_certificate_credentials->getSSLCertificateSubjects().at(type))
-                            {
-                                bool matches_wildcard = certificate_subject.starts_with(prefix) && certificate_subject.ends_with(suffix);
-
-                                // '*' must not represent a '/' in URI, so check if the number of '/' are equal
-                                bool matches_slashes = slashes == count(certificate_subject.begin(), certificate_subject.end(), '/');
-
-                                if (matches_wildcard && matches_slashes)
-                                    return true;
-                            }
-                        }
                     }
                 }
                 return false;
-            }
 
             case AuthenticationType::SSH_KEY:
 #if USE_SSH
diff --git a/src/Access/Common/AccessRightsElement.cpp b/src/Access/Common/AccessRightsElement.cpp
index 63bda09a51b..24ff4e7631b 100644
--- a/src/Access/Common/AccessRightsElement.cpp
+++ b/src/Access/Common/AccessRightsElement.cpp
@@ -224,11 +224,7 @@ void AccessRightsElement::replaceEmptyDatabase(const String & current_database)
 
 String AccessRightsElement::toString() const { return toStringImpl(*this, true); }
 String AccessRightsElement::toStringWithoutOptions() const { return toStringImpl(*this, false); }
-String AccessRightsElement::toStringForAccessTypeSource() const
-{
-    String result{access_flags.toKeywords().front()};
-    return result + " ON *.*";
-}
+
 
 bool AccessRightsElements::empty() const { return std::all_of(begin(), end(), [](const AccessRightsElement & e) { return e.empty(); }); }
 
diff --git a/src/Access/Common/AccessRightsElement.h b/src/Access/Common/AccessRightsElement.h
index 78e94e6f2e4..ba625fc43df 100644
--- a/src/Access/Common/AccessRightsElement.h
+++ b/src/Access/Common/AccessRightsElement.h
@@ -89,7 +89,6 @@ struct AccessRightsElement
     /// Returns a human-readable representation like "GRANT SELECT, UPDATE(x, y) ON db.table".
     String toString() const;
     String toStringWithoutOptions() const;
-    String toStringForAccessTypeSource() const;
 };
 
 
diff --git a/src/Access/ContextAccess.cpp b/src/Access/ContextAccess.cpp
index e50521a0730..a2807ecc5ea 100644
--- a/src/Access/ContextAccess.cpp
+++ b/src/Access/ContextAccess.cpp
@@ -38,24 +38,6 @@ namespace ErrorCodes
 
 namespace
 {
-    const std::vector<std::tuple<AccessFlags, std::string>> source_and_table_engines = {
-        {AccessType::FILE, "File"},
-        {AccessType::URL, "URL"},
-        {AccessType::REMOTE, "Distributed"},
-        {AccessType::MONGO, "MongoDB"},
-        {AccessType::REDIS, "Redis"},
-        {AccessType::MYSQL, "MySQL"},
-        {AccessType::POSTGRES, "PostgreSQL"},
-        {AccessType::SQLITE, "SQLite"},
-        {AccessType::ODBC, "ODBC"},
-        {AccessType::JDBC, "JDBC"},
-        {AccessType::HDFS, "HDFS"},
-        {AccessType::S3, "S3"},
-        {AccessType::HIVE, "Hive"},
-        {AccessType::AZURE, "AzureBlobStorage"}
-    };
-
-
     AccessRights mixAccessRightsFromUserAndRoles(const User & user, const EnabledRolesInfo & roles_info)
     {
         AccessRights res = user.access;
@@ -224,6 +206,22 @@ namespace
         }
 
         /// There is overlap between AccessType sources and table engines, so the following code avoids user granting twice.
+        static const std::vector<std::tuple<AccessFlags, std::string>> source_and_table_engines = {
+            {AccessType::FILE, "File"},
+            {AccessType::URL, "URL"},
+            {AccessType::REMOTE, "Distributed"},
+            {AccessType::MONGO, "MongoDB"},
+            {AccessType::REDIS, "Redis"},
+            {AccessType::MYSQL, "MySQL"},
+            {AccessType::POSTGRES, "PostgreSQL"},
+            {AccessType::SQLITE, "SQLite"},
+            {AccessType::ODBC, "ODBC"},
+            {AccessType::JDBC, "JDBC"},
+            {AccessType::HDFS, "HDFS"},
+            {AccessType::S3, "S3"},
+            {AccessType::HIVE, "Hive"},
+            {AccessType::AZURE, "AzureBlobStorage"}
+        };
 
         /// Sync SOURCE and TABLE_ENGINE, so only need to check TABLE_ENGINE later.
         if (access_control.doesTableEnginesRequireGrant())
@@ -269,11 +267,6 @@ namespace
 
     template <typename... OtherArgs>
     std::string_view getDatabase(std::string_view arg1, const OtherArgs &...) { return arg1; }
-
-    std::string_view getTableEngine() { return {}; }
-
-    template <typename... OtherArgs>
-    std::string_view getTableEngine(std::string_view arg1, const OtherArgs &...) { return arg1; }
 }
 
 
@@ -627,58 +620,18 @@ bool ContextAccess::checkAccessImplHelper(const ContextPtr & context, AccessFlag
 
     if (!granted)
     {
-        auto access_denied_no_grant = [&]<typename... FmtArgs>(AccessFlags access_flags, FmtArgs && ...fmt_args)
+        if (grant_option && acs->isGranted(flags, args...))
         {
-            if (grant_option && acs->isGranted(access_flags, fmt_args...))
-            {
-                return access_denied(ErrorCodes::ACCESS_DENIED,
-                    "{}: Not enough privileges. "
-                    "The required privileges have been granted, but without grant option. "
-                    "To execute this query, it's necessary to have the grant {} WITH GRANT OPTION",
-                    AccessRightsElement{access_flags, fmt_args...}.toStringWithoutOptions());
-            }
-
             return access_denied(ErrorCodes::ACCESS_DENIED,
-                "{}: Not enough privileges. To execute this query, it's necessary to have the grant {}",
-                AccessRightsElement{access_flags, fmt_args...}.toStringWithoutOptions() + (grant_option ? " WITH GRANT OPTION" : ""));
-        };
-
-        /// As we check the SOURCES from the Table Engine logic, direct prompt about Table Engine would be misleading
-        /// since SOURCES is not granted actually. In order to solve this, turn the prompt logic back to Sources.
-        if (flags & AccessType::TABLE_ENGINE && !access_control->doesTableEnginesRequireGrant())
-        {
-            AccessFlags new_flags;
-
-            String table_engine_name{getTableEngine(args...)};
-            for (const auto & source_and_table_engine : source_and_table_engines)
-            {
-                const auto & table_engine = std::get<1>(source_and_table_engine);
-                if (table_engine != table_engine_name) continue;
-                const auto & source = std::get<0>(source_and_table_engine);
-                /// Set the flags from Table Engine to SOURCES so that prompts can be meaningful.
-                new_flags = source;
-                break;
-            }
-
-            /// Might happen in the case of grant Table Engine on A (but not source), then revoke A.
-            if (new_flags.isEmpty())
-                return access_denied_no_grant(flags, args...);
-
-            if (grant_option && acs->isGranted(flags, args...))
-            {
-                return access_denied(ErrorCodes::ACCESS_DENIED,
-                    "{}: Not enough privileges. "
-                    "The required privileges have been granted, but without grant option. "
-                    "To execute this query, it's necessary to have the grant {} WITH GRANT OPTION",
-                    AccessRightsElement{new_flags}.toStringForAccessTypeSource());
-            }
-
-            return access_denied(ErrorCodes::ACCESS_DENIED,
-                "{}: Not enough privileges. To execute this query, it's necessary to have the grant {}",
-                AccessRightsElement{new_flags}.toStringForAccessTypeSource() + (grant_option ? " WITH GRANT OPTION" : ""));
+                "{}: Not enough privileges. "
+                "The required privileges have been granted, but without grant option. "
+                "To execute this query, it's necessary to have the grant {} WITH GRANT OPTION",
+                AccessRightsElement{flags, args...}.toStringWithoutOptions());
         }
 
-        return access_denied_no_grant(flags, args...);
+        return access_denied(ErrorCodes::ACCESS_DENIED,
+            "{}: Not enough privileges. To execute this query, it's necessary to have the grant {}",
+            AccessRightsElement{flags, args...}.toStringWithoutOptions() + (grant_option ? " WITH GRANT OPTION" : ""));
     }
 
     struct PrecalculatedFlags
diff --git a/src/Access/HTTPAuthClient.h b/src/Access/HTTPAuthClient.h
index a1b97a729a3..a8b56cf05a7 100644
--- a/src/Access/HTTPAuthClient.h
+++ b/src/Access/HTTPAuthClient.h
@@ -82,8 +82,7 @@ public:
 
     Result authenticate(const String & user_name, const String & password) const
     {
-        Poco::Net::HTTPRequest request{
-            Poco::Net::HTTPRequest::HTTP_GET, this->getURI().getPathAndQuery(), Poco::Net::HTTPRequest::HTTP_1_1};
+        Poco::Net::HTTPRequest request{Poco::Net::HTTPRequest::HTTP_GET, this->getURI().getPathAndQuery()};
         Poco::Net::HTTPBasicCredentials basic_credentials{user_name, password};
         basic_credentials.authenticate(request);
 
diff --git a/src/AggregateFunctions/AggregateFunctionDistinctDynamicTypes.cpp b/src/AggregateFunctions/AggregateFunctionDistinctDynamicTypes.cpp
deleted file mode 100644
index 57f7aecd316..00000000000
--- a/src/AggregateFunctions/AggregateFunctionDistinctDynamicTypes.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-#include <unordered_set>
-#include <IO/WriteHelpers.h>
-#include <IO/ReadHelpers.h>
-
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypesBinaryEncoding.h>
-#include <Columns/ColumnDynamic.h>
-
-#include <AggregateFunctions/IAggregateFunction.h>
-#include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/FactoryHelpers.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int TOO_LARGE_ARRAY_SIZE;
-}
-
-struct AggregateFunctionDistinctDynamicTypesData
-{
-    constexpr static size_t MAX_ARRAY_SIZE = 0xFFFFFF;
-
-    std::unordered_set<String> data;
-
-    void add(const String & type)
-    {
-        data.insert(type);
-    }
-
-    void merge(const AggregateFunctionDistinctDynamicTypesData & other)
-    {
-        data.insert(other.data.begin(), other.data.end());
-    }
-
-    void serialize(WriteBuffer & buf) const
-    {
-        writeVarUInt(data.size(), buf);
-        for (const auto & type : data)
-            writeStringBinary(type, buf);
-    }
-
-    void deserialize(ReadBuffer & buf)
-    {
-        size_t size;
-        readVarUInt(size, buf);
-        if (size > MAX_ARRAY_SIZE)
-            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size (maximum: {}): {}", MAX_ARRAY_SIZE, size);
-
-        data.reserve(size);
-        String type;
-        for (size_t i = 0; i != size; ++i)
-        {
-            readStringBinary(type, buf);
-            data.insert(type);
-        }
-    }
-
-    void insertResultInto(IColumn & column)
-    {
-        /// Insert types in sorted order for better output.
-        auto & array_column = assert_cast<ColumnArray &>(column);
-        auto & string_column = assert_cast<ColumnString &>(array_column.getData());
-        std::vector<String> sorted_data(data.begin(), data.end());
-        std::sort(sorted_data.begin(), sorted_data.end());
-        for (const auto & type : sorted_data)
-            string_column.insertData(type.data(), type.size());
-        array_column.getOffsets().push_back(string_column.size());
-    }
-};
-
-/// Calculates the list of distinct data types in Dynamic column.
-class AggregateFunctionDistinctDynamicTypes final : public IAggregateFunctionDataHelper<AggregateFunctionDistinctDynamicTypesData, AggregateFunctionDistinctDynamicTypes>
-{
-public:
-    explicit AggregateFunctionDistinctDynamicTypes(const DataTypes & argument_types_)
-        : IAggregateFunctionDataHelper<AggregateFunctionDistinctDynamicTypesData, AggregateFunctionDistinctDynamicTypes>(argument_types_, {}, std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()))
-    {
-    }
-
-    String getName() const override { return "distinctDynamicTypes"; }
-
-    bool allocatesMemoryInArena() const override { return false; }
-
-    void ALWAYS_INLINE add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
-    {
-        const auto & dynamic_column = assert_cast<const ColumnDynamic & >(*columns[0]);
-        if (dynamic_column.isNullAt(row_num))
-            return;
-
-        data(place).add(dynamic_column.getTypeNameAt(row_num));
-    }
-
-    void ALWAYS_INLINE addBatchSinglePlace(
-        size_t row_begin, size_t row_end, AggregateDataPtr __restrict place, const IColumn ** columns, Arena * arena, ssize_t if_argument_pos)
-        const override
-    {
-        if (if_argument_pos >= 0 || row_begin != 0 || row_end != columns[0]->size())
-            IAggregateFunctionDataHelper::addBatchSinglePlace(row_begin, row_end, place, columns, arena, if_argument_pos);
-        /// Optimization for case when we add all rows from the column into single place.
-        /// In this case we can avoid iterating over all rows because we can get all types
-        /// in Dynamic column in a more efficient way.
-        else
-            assert_cast<const ColumnDynamic & >(*columns[0]).getAllTypeNamesInto(data(place).data);
-    }
-
-    void addManyDefaults(
-        AggregateDataPtr __restrict /*place*/,
-        const IColumn ** /*columns*/,
-        size_t /*length*/,
-        Arena * /*arena*/) const override
-    {
-        /// Default value for Dynamic is NULL, so nothing to add.
-    }
-
-    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
-    {
-        data(place).merge(data(rhs));
-    }
-
-    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
-    {
-        data(place).serialize(buf);
-    }
-
-    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena *) const override
-    {
-        data(place).deserialize(buf);
-    }
-
-    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
-    {
-        data(place).insertResultInto(to);
-    }
-};
-
-AggregateFunctionPtr createAggregateFunctionDistinctDynamicTypes(
-    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
-{
-    assertNoParameters(name, parameters);
-    if (argument_types.size() != 1)
-        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                        "Incorrect number of arguments for aggregate function {}. Expected single argument with type Dynamic, got {} arguments", name, argument_types.size());
-
-    if (!isDynamic(argument_types[0]))
-        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument for aggregate function {}. Expected type Dynamic", argument_types[0]->getName(), name);
-
-    return std::make_shared<AggregateFunctionDistinctDynamicTypes>(argument_types);
-}
-
-void registerAggregateFunctionDistinctDynamicTypes(AggregateFunctionFactory & factory)
-{
-    factory.registerFunction("distinctDynamicTypes", createAggregateFunctionDistinctDynamicTypes);
-}
-
-}
diff --git a/src/AggregateFunctions/AggregateFunctionDistinctJSONPaths.cpp b/src/AggregateFunctions/AggregateFunctionDistinctJSONPaths.cpp
deleted file mode 100644
index 4e60e6fe60b..00000000000
--- a/src/AggregateFunctions/AggregateFunctionDistinctJSONPaths.cpp
+++ /dev/null
@@ -1,350 +0,0 @@
-#include <unordered_set>
-#include <IO/WriteHelpers.h>
-#include <IO/ReadHelpers.h>
-
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeMap.h>
-#include <DataTypes/DataTypeObject.h>
-#include <DataTypes/DataTypesBinaryEncoding.h>
-#include <Columns/ColumnDynamic.h>
-#include <Columns/ColumnObject.h>
-#include <Columns/ColumnMap.h>
-
-#include <AggregateFunctions/IAggregateFunction.h>
-#include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/FactoryHelpers.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int TOO_LARGE_ARRAY_SIZE;
-}
-
-constexpr static size_t DISTINCT_JSON_PATHS_MAX_ARRAY_SIZE = 0xFFFFFF;
-
-
-struct AggregateFunctionDistinctJSONPathsData
-{
-    static constexpr auto name = "distinctJSONPaths";
-
-    std::unordered_set<String> data;
-
-    void add(const ColumnObject & column, size_t row_num, const std::unordered_map<String, String> &)
-    {
-        for (const auto & [path, _] : column.getTypedPaths())
-            data.insert(path);
-        for (const auto & [path, dynamic_column] : column.getDynamicPathsPtrs())
-        {
-            /// Add path from dynamic paths only if it's not NULL in this row.
-            if (!dynamic_column->isNullAt(row_num))
-                data.insert(path);
-        }
-
-        /// Iterate over paths in shared data in this row.
-        const auto [shared_data_paths, _] = column.getSharedDataPathsAndValues();
-        const auto & shared_data_offsets = column.getSharedDataOffsets();
-        const size_t start = shared_data_offsets[static_cast<ssize_t>(row_num) - 1];
-        const size_t end = shared_data_offsets[static_cast<ssize_t>(row_num)];
-        for (size_t i = start; i != end; ++i)
-            data.insert(shared_data_paths->getDataAt(i).toString());
-    }
-
-    void addWholeColumn(const ColumnObject & column, const std::unordered_map<String, String> &)
-    {
-        for (const auto & [path, _] : column.getTypedPaths())
-            data.insert(path);
-        for (const auto & [path, dynamic_column] : column.getDynamicPathsPtrs())
-        {
-            /// Add dynamic path only if it has at least one non-null value.
-            /// getNumberOfDefaultRows for Dynamic column is O(1).
-            if (dynamic_column->getNumberOfDefaultRows() != dynamic_column->size())
-                data.insert(path);
-        }
-
-        /// Iterate over all paths in shared data.
-        const auto [shared_data_paths, _] = column.getSharedDataPathsAndValues();
-        for (size_t i = 0; i != shared_data_paths->size(); ++i)
-            data.insert(shared_data_paths->getDataAt(i).toString());
-    }
-
-    void merge(const AggregateFunctionDistinctJSONPathsData & other)
-    {
-        data.insert(other.data.begin(), other.data.end());
-    }
-
-    void serialize(WriteBuffer & buf) const
-    {
-        writeVarUInt(data.size(), buf);
-        for (const auto & path : data)
-            writeStringBinary(path, buf);
-    }
-
-    void deserialize(ReadBuffer & buf)
-    {
-        size_t size;
-        readVarUInt(size, buf);
-        if (size > DISTINCT_JSON_PATHS_MAX_ARRAY_SIZE)
-            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size (maximum: {}): {}", DISTINCT_JSON_PATHS_MAX_ARRAY_SIZE, size);
-
-        String path;
-        for (size_t i = 0; i != size; ++i)
-        {
-            readStringBinary(path, buf);
-            data.insert(path);
-        }
-    }
-
-    void insertResultInto(IColumn & column)
-    {
-        /// Insert paths in sorted order for better output.
-        auto & array_column = assert_cast<ColumnArray &>(column);
-        auto & string_column = assert_cast<ColumnString &>(array_column.getData());
-        std::vector<String> sorted_data(data.begin(), data.end());
-        std::sort(sorted_data.begin(), sorted_data.end());
-        for (const auto & path : sorted_data)
-            string_column.insertData(path.data(), path.size());
-        array_column.getOffsets().push_back(string_column.size());
-    }
-
-    static DataTypePtr getResultType()
-    {
-        return std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>());
-    }
-};
-
-struct AggregateFunctionDistinctJSONPathsAndTypesData
-{
-    static constexpr auto name = "distinctJSONPathsAndTypes";
-
-    std::unordered_map<String, std::unordered_set<String>> data;
-
-    void add(const ColumnObject & column, size_t row_num, const std::unordered_map<String, String> & typed_paths_type_names)
-    {
-        for (const auto & [path, _] : column.getTypedPaths())
-            data[path].insert(typed_paths_type_names.at(path));
-        for (const auto & [path, dynamic_column] : column.getDynamicPathsPtrs())
-        {
-            if (!dynamic_column->isNullAt(row_num))
-                data[path].insert(dynamic_column->getTypeNameAt(row_num));
-        }
-
-        /// Iterate over paths om shared data in this row and decode the data types.
-        const auto [shared_data_paths, shared_data_values] = column.getSharedDataPathsAndValues();
-        const auto & shared_data_offsets = column.getSharedDataOffsets();
-        const size_t start = shared_data_offsets[static_cast<ssize_t>(row_num) - 1];
-        const size_t end = shared_data_offsets[static_cast<ssize_t>(row_num)];
-        for (size_t i = start; i != end; ++i)
-        {
-            auto path = shared_data_paths->getDataAt(i).toString();
-            auto value = shared_data_values->getDataAt(i);
-            ReadBufferFromMemory buf(value.data, value.size);
-            auto type = decodeDataType(buf);
-            /// We should not have Nulls here but let's check just in case.
-            chassert(!isNothing(type));
-            data[path].insert(type->getName());
-        }
-    }
-
-    void addWholeColumn(const ColumnObject & column, const std::unordered_map<String, String> & typed_paths_type_names)
-    {
-        for (const auto & [path, _] : column.getTypedPaths())
-            data[path].insert(typed_paths_type_names.at(path));
-        for (const auto & [path, dynamic_column] : column.getDynamicPathsPtrs())
-        {
-            /// Add dynamic path only if it has at least one non-null value.
-            /// getNumberOfDefaultRows for Dynamic column is O(1).
-            if (dynamic_column->getNumberOfDefaultRows() != dynamic_column->size())
-                dynamic_column->getAllTypeNamesInto(data[path]);
-        }
-
-        /// Iterate over all paths in shared data and decode the data types.
-        const auto [shared_data_paths, shared_data_values] = column.getSharedDataPathsAndValues();
-        for (size_t i = 0; i != shared_data_paths->size(); ++i)
-        {
-            auto path = shared_data_paths->getDataAt(i).toString();
-            auto value = shared_data_values->getDataAt(i);
-            ReadBufferFromMemory buf(value.data, value.size);
-            auto type = decodeDataType(buf);
-            /// We should not have Nulls here but let's check just in case.
-            chassert(!isNothing(type));
-            data[path].insert(type->getName());
-        }
-    }
-
-    void merge(const AggregateFunctionDistinctJSONPathsAndTypesData & other)
-    {
-        for (const auto & [path, types] : other.data)
-            data[path].insert(types.begin(), types.end());
-    }
-
-    void serialize(WriteBuffer & buf) const
-    {
-        writeVarUInt(data.size(), buf);
-        for (const auto & [path, types] : data)
-        {
-            writeStringBinary(path, buf);
-            writeVarUInt(types.size(), buf);
-            for (const auto & type : types)
-                writeStringBinary(type, buf);
-        }
-    }
-
-    void deserialize(ReadBuffer & buf)
-    {
-        size_t paths_size, types_size;
-        readVarUInt(paths_size, buf);
-        if (paths_size > DISTINCT_JSON_PATHS_MAX_ARRAY_SIZE)
-            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size for paths (maximum: {}): {}", DISTINCT_JSON_PATHS_MAX_ARRAY_SIZE, paths_size);
-
-        data.reserve(paths_size);
-        String path, type;
-        for (size_t i = 0; i != paths_size; ++i)
-        {
-            readStringBinary(path, buf);
-            readVarUInt(types_size, buf);
-            if (types_size > DISTINCT_JSON_PATHS_MAX_ARRAY_SIZE)
-                throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size for types (maximum: {}): {}", DISTINCT_JSON_PATHS_MAX_ARRAY_SIZE, types_size);
-
-            data[path].reserve(types_size);
-            for (size_t j = 0; j != types_size; ++j)
-            {
-                readStringBinary(type, buf);
-                data[path].insert(type);
-            }
-        }
-    }
-
-    void insertResultInto(IColumn & column)
-    {
-        /// Insert sorted paths and types for better output.
-        auto & array_column = assert_cast<ColumnMap &>(column).getNestedColumn();
-        auto & tuple_column = assert_cast<ColumnTuple &>(array_column.getData());
-        auto & key_column = assert_cast<ColumnString &>(tuple_column.getColumn(0));
-        auto & value_column = assert_cast<ColumnArray &>(tuple_column.getColumn(1));
-        auto & value_column_data = assert_cast<ColumnString &>(value_column.getData());
-        std::vector<std::pair<String, std::vector<String>>> sorted_data;
-        sorted_data.reserve(data.size());
-        for (const auto & [path, types] : data)
-        {
-            std::vector<String> sorted_types(types.begin(), types.end());
-            std::sort(sorted_types.begin(), sorted_types.end());
-            sorted_data.emplace_back(path, std::move(sorted_types));
-        }
-        std::sort(sorted_data.begin(), sorted_data.end());
-
-        for (const auto & [path, types] : sorted_data)
-        {
-            key_column.insertData(path.data(), path.size());
-            for (const auto & type : types)
-                value_column_data.insertData(type.data(), type.size());
-            value_column.getOffsets().push_back(value_column_data.size());
-        }
-
-        array_column.getOffsets().push_back(key_column.size());
-    }
-
-    static DataTypePtr getResultType()
-    {
-        return std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()));
-    }
-};
-
-/// Calculates the list of distinct paths or pairs (path, type) in JSON column.
-template <typename Data>
-class AggregateFunctionDistinctJSONPathsAndTypes final : public IAggregateFunctionDataHelper<Data, AggregateFunctionDistinctJSONPathsAndTypes<Data>>
-{
-public:
-    explicit AggregateFunctionDistinctJSONPathsAndTypes(const DataTypes & argument_types_)
-        : IAggregateFunctionDataHelper<Data, AggregateFunctionDistinctJSONPathsAndTypes<Data>>(
-            argument_types_, {}, Data::getResultType())
-    {
-        const auto & typed_paths_types = assert_cast<const DataTypeObject &>(*argument_types_[0]).getTypedPaths();
-        typed_paths_type_names.reserve(typed_paths_types.size());
-        for (const auto & [path, type] : typed_paths_types)
-            typed_paths_type_names[path] = type->getName();
-    }
-
-    String getName() const override { return Data::name; }
-
-    bool allocatesMemoryInArena() const override { return false; }
-
-    void ALWAYS_INLINE add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
-    {
-        const auto & object_column = assert_cast<const ColumnObject & >(*columns[0]);
-        this->data(place).add(object_column, row_num, typed_paths_type_names);
-    }
-
-    void ALWAYS_INLINE addBatchSinglePlace(
-        size_t row_begin, size_t row_end, AggregateDataPtr __restrict place, const IColumn ** columns, Arena * arena, ssize_t if_argument_pos)
-        const override
-    {
-        if (if_argument_pos >= 0 || row_begin != 0 || row_end != columns[0]->size())
-            IAggregateFunctionDataHelper<Data, AggregateFunctionDistinctJSONPathsAndTypes<Data>>::addBatchSinglePlace(row_begin, row_end, place, columns, arena, if_argument_pos);
-        /// Optimization for case when we add all rows from the column into single place.
-        /// In this case we can avoid iterating over all rows because we can get all paths
-        /// and types in JSON column in a more efficient way.
-        else
-            this->data(place).addWholeColumn(assert_cast<const ColumnObject & >(*columns[0]), typed_paths_type_names);
-    }
-
-    void addManyDefaults(
-        AggregateDataPtr __restrict /*place*/,
-        const IColumn ** /*columns*/,
-        size_t /*length*/,
-        Arena * /*arena*/) const override
-    {
-        /// Default value for JSON is empty object, so nothing to add.
-    }
-
-    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
-    {
-        this->data(place).merge(this->data(rhs));
-    }
-
-    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
-    {
-        this->data(place).serialize(buf);
-    }
-
-    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena *) const override
-    {
-        this->data(place).deserialize(buf);
-    }
-
-    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
-    {
-        this->data(place).insertResultInto(to);
-    }
-
-private:
-    std::unordered_map<String, String> typed_paths_type_names;
-};
-
-template <typename Data>
-AggregateFunctionPtr createAggregateFunctionDistinctJSONPathsAndTypes(
-    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
-{
-    assertNoParameters(name, parameters);
-    if (argument_types.size() != 1)
-        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                        "Incorrect number of arguments for aggregate function {}. Expected single argument with type JSON, got {} arguments", name, argument_types.size());
-
-    if (!isObject(argument_types[0]))
-        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument for aggregate function {}. Expected type JSON", argument_types[0]->getName(), name);
-
-    return std::make_shared<AggregateFunctionDistinctJSONPathsAndTypes<Data>>(argument_types);
-}
-
-void registerAggregateFunctionDistinctJSONPathsAndTypes(AggregateFunctionFactory & factory)
-{
-    factory.registerFunction("distinctJSONPaths", createAggregateFunctionDistinctJSONPathsAndTypes<AggregateFunctionDistinctJSONPathsData>);
-    factory.registerFunction("distinctJSONPathsAndTypes", createAggregateFunctionDistinctJSONPathsAndTypes<AggregateFunctionDistinctJSONPathsAndTypesData>);
-}
-
-}
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArray.cpp b/src/AggregateFunctions/AggregateFunctionGroupArray.cpp
index 5cc9f725b46..7034e6373b1 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArray.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupArray.cpp
@@ -780,12 +780,12 @@ AggregateFunctionPtr createAggregateFunctionGroupArray(
         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].safeGet<Int64>() < 0) ||
-            (type == Field::Types::UInt64 && parameters[0].safeGet<UInt64>() == 0))
+        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);
 
         has_limit = true;
-        max_elems = parameters[0].safeGet<UInt64>();
+        max_elems = parameters[0].get<UInt64>();
     }
     else
         throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
@@ -816,11 +816,11 @@ AggregateFunctionPtr createAggregateFunctionGroupArraySample(
         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[i].safeGet<Int64>() < 0) ||
-                (type == Field::Types::UInt64 && parameters[i].safeGet<UInt64>() == 0))
+        if ((type == Field::Types::Int64 && parameters[i].get<Int64>() < 0) ||
+                (type == Field::Types::UInt64 && parameters[i].get<UInt64>() == 0))
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Parameter for aggregate function {} should be positive number", name);
 
-        return parameters[i].safeGet<UInt64>();
+        return parameters[i].get<UInt64>();
     };
 
     UInt64 max_elems = get_parameter(0);
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayIntersect.cpp b/src/AggregateFunctions/AggregateFunctionGroupArrayIntersect.cpp
index 36d00b1d9ec..38f2fcb9fb9 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayIntersect.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayIntersect.cpp
@@ -83,16 +83,16 @@ public:
         if (version == 1)
         {
             for (size_t i = 0; i < arr_size; ++i)
-                set.insert(static_cast<T>((*data_column)[offset + i].safeGet<T>()));
+                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].safeGet<T>()));
+                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].safeGet<T>()));
+                    new_set.insert(static_cast<T>((*data_column)[offset + i].get<T>()));
             }
             set = std::move(new_set);
         }
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
index 2c3ac7f883e..026b8d1956f 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
@@ -269,12 +269,12 @@ AggregateFunctionPtr createAggregateFunctionMoving(
         if (type != Field::Types::Int64 && type != Field::Types::UInt64)
                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Parameter for aggregate function {} should be positive integer", name);
 
-        if ((type == Field::Types::Int64 && parameters[0].safeGet<Int64>() <= 0) ||
-            (type == Field::Types::UInt64 && parameters[0].safeGet<UInt64>() == 0))
+        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 integer", name);
 
         limit_size = true;
-        max_elems = parameters[0].safeGet<UInt64>();
+        max_elems = parameters[0].get<UInt64>();
     }
     else
         throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArraySorted.cpp b/src/AggregateFunctions/AggregateFunctionGroupArraySorted.cpp
index 27043ed6aa6..d41d743e17a 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArraySorted.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupArraySorted.cpp
@@ -397,11 +397,11 @@ AggregateFunctionPtr createAggregateFunctionGroupArray(
         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].safeGet<Int64>() < 0) ||
-            (type == Field::Types::UInt64 && parameters[0].safeGet<UInt64>() == 0))
+        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].safeGet<UInt64>();
+        max_elems = parameters[0].get<UInt64>();
     }
     else
         throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
diff --git a/src/AggregateFunctions/AggregateFunctionGroupConcat.cpp b/src/AggregateFunctions/AggregateFunctionGroupConcat.cpp
index 8fb0b645096..5494ef74705 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupConcat.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupConcat.cpp
@@ -116,17 +116,15 @@ class GroupConcatImpl final
     SerializationPtr serialization;
     UInt64 limit;
     const String delimiter;
-    const DataTypePtr type;
 
 public:
     GroupConcatImpl(const DataTypePtr & data_type_, const Array & parameters_, UInt64 limit_, const String & delimiter_)
         : IAggregateFunctionDataHelper<GroupConcatData<has_limit>, GroupConcatImpl<has_limit>>(
             {data_type_}, parameters_, std::make_shared<DataTypeString>())
+        , serialization(this->argument_types[0]->getDefaultSerialization())
         , limit(limit_)
         , delimiter(delimiter_)
-        , type(data_type_)
     {
-        serialization = isFixedString(type) ? std::make_shared<DataTypeString>()->getDefaultSerialization() : this->argument_types[0]->getDefaultSerialization();
     }
 
     String getName() const override { return name; }
@@ -142,14 +140,7 @@ public:
         if (cur_data.data_size != 0)
             cur_data.insertChar(delimiter.c_str(), delimiter.size(), arena);
 
-        if (isFixedString(type))
-        {
-            ColumnWithTypeAndName col = {columns[0]->getPtr(), type, "column"};
-            const auto & col_str = castColumn(col, std::make_shared<DataTypeString>());
-            cur_data.insert(col_str.get(), serialization, row_num, arena);
-        }
-        else
-            cur_data.insert(columns[0], serialization, row_num, arena);
+        cur_data.insert(columns[0], serialization, row_num, arena);
     }
 
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
@@ -256,7 +247,7 @@ AggregateFunctionPtr createAggregateFunctionGroupConcat(
         if (type != Field::Types::String)
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "First parameter for aggregate function {} should be string", name);
 
-        delimiter = parameters[0].safeGet<String>();
+        delimiter = parameters[0].get<String>();
     }
     if (parameters.size() == 2)
     {
@@ -265,12 +256,12 @@ AggregateFunctionPtr createAggregateFunctionGroupConcat(
         if (type != Field::Types::Int64 && type != Field::Types::UInt64)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Second parameter for aggregate function {} should be a positive number", name);
 
-        if ((type == Field::Types::Int64 && parameters[1].safeGet<Int64>() <= 0) ||
-            (type == Field::Types::UInt64 && parameters[1].safeGet<UInt64>() == 0))
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Second parameter for aggregate function {} should be a positive number, got: {}", name, parameters[1].safeGet<Int64>());
+        if ((type == Field::Types::Int64 && parameters[1].get<Int64>() <= 0) ||
+            (type == Field::Types::UInt64 && parameters[1].get<UInt64>() == 0))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Second parameter for aggregate function {} should be a positive number, got: {}", name, parameters[1].get<Int64>());
 
         has_limit = true;
-        limit = parameters[1].safeGet<UInt64>();
+        limit = parameters[1].get<UInt64>();
     }
 
     if (has_limit)
diff --git a/src/AggregateFunctions/AggregateFunctionGroupUniqArray.cpp b/src/AggregateFunctions/AggregateFunctionGroupUniqArray.cpp
index 5cbf449c946..7b4300b3568 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupUniqArray.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupUniqArray.cpp
@@ -323,12 +323,12 @@ AggregateFunctionPtr createAggregateFunctionGroupUniqArray(
         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].safeGet<Int64>() < 0) ||
-            (type == Field::Types::UInt64 && parameters[0].safeGet<UInt64>() == 0))
+        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);
 
         limit_size = true;
-        max_elems = parameters[0].safeGet<UInt64>();
+        max_elems = parameters[0].get<UInt64>();
     }
     else
         throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
diff --git a/src/AggregateFunctions/AggregateFunctionKolmogorovSmirnovTest.cpp b/src/AggregateFunctions/AggregateFunctionKolmogorovSmirnovTest.cpp
index 28e8d37b8c8..04eebe9f485 100644
--- a/src/AggregateFunctions/AggregateFunctionKolmogorovSmirnovTest.cpp
+++ b/src/AggregateFunctions/AggregateFunctionKolmogorovSmirnovTest.cpp
@@ -238,7 +238,7 @@ public:
         if (params[0].getType() != Field::Types::String)
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Aggregate function {} require first parameter to be a String", getName());
 
-        const auto & param = params[0].safeGet<String>();
+        const auto & param = params[0].get<String>();
         if (param == "two-sided")
             alternative = Alternative::TwoSided;
         else if (param == "less")
@@ -255,7 +255,7 @@ public:
         if (params[1].getType() != Field::Types::String)
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Aggregate function {} require second parameter to be a String", getName());
 
-        method = params[1].safeGet<String>();
+        method = params[1].get<String>();
         if (method != "auto" && method != "exact" && method != "asymp" && method != "asymptotic")
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown method in aggregate function {}. "
                     "It must be one of: 'auto', 'exact', 'asymp' (or 'asymptotic')", getName());
diff --git a/src/AggregateFunctions/AggregateFunctionLargestTriangleThreeBuckets.cpp b/src/AggregateFunctions/AggregateFunctionLargestTriangleThreeBuckets.cpp
index 813b13b6f7b..6d1e3c0f64b 100644
--- a/src/AggregateFunctions/AggregateFunctionLargestTriangleThreeBuckets.cpp
+++ b/src/AggregateFunctions/AggregateFunctionLargestTriangleThreeBuckets.cpp
@@ -181,7 +181,7 @@ public:
             throw Exception(
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Aggregate function {} require first parameter to be a UInt64", getName());
 
-        total_buckets = params[0].safeGet<UInt64>();
+        total_buckets = params[0].get<UInt64>();
 
         this->x_type = WhichDataType(arguments[0]).idx;
         this->y_type = WhichDataType(arguments[1]).idx;
diff --git a/src/AggregateFunctions/AggregateFunctionMannWhitney.cpp b/src/AggregateFunctions/AggregateFunctionMannWhitney.cpp
index ecd848f5af3..f088737c340 100644
--- a/src/AggregateFunctions/AggregateFunctionMannWhitney.cpp
+++ b/src/AggregateFunctions/AggregateFunctionMannWhitney.cpp
@@ -114,7 +114,7 @@ private:
             {
                 if (ind < first.size())
                     return first[ind];
-                return second[ind - first.size()];
+                return second[ind % first.size()];
             }
 
             size_t size() const
@@ -152,7 +152,7 @@ public:
         if (params[0].getType() != Field::Types::String)
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Aggregate function {} require first parameter to be a String", getName());
 
-        const auto & param = params[0].safeGet<String>();
+        const auto & param = params[0].get<String>();
         if (param == "two-sided")
             alternative = Alternative::TwoSided;
         else if (param == "less")
@@ -169,7 +169,7 @@ public:
         if (params[1].getType() != Field::Types::UInt64)
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Aggregate function {} require second parameter to be a UInt64", getName());
 
-        continuity_correction = static_cast<bool>(params[1].safeGet<UInt64>());
+        continuity_correction = static_cast<bool>(params[1].get<UInt64>());
     }
 
     String getName() const override
diff --git a/src/AggregateFunctions/AggregateFunctionQuantile.h b/src/AggregateFunctions/AggregateFunctionQuantile.h
index 423fd4bc569..127dc06b642 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantile.h
+++ b/src/AggregateFunctions/AggregateFunctionQuantile.h
@@ -117,7 +117,7 @@ public:
                 throw Exception(
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Aggregate function {} requires relative accuracy parameter with Float64 type", getName());
 
-            relative_accuracy = relative_accuracy_field.safeGet<Float64>();
+            relative_accuracy = relative_accuracy_field.get<Float64>();
 
             if (relative_accuracy <= 0 || relative_accuracy >= 1 || isNaN(relative_accuracy))
                 throw Exception(
@@ -147,9 +147,9 @@ public:
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Aggregate function {} requires accuracy parameter with integer type", getName());
 
             if (accuracy_field.getType() == Field::Types::Int64)
-                accuracy = accuracy_field.safeGet<Int64>();
+                accuracy = accuracy_field.get<Int64>();
             else
-                accuracy = accuracy_field.safeGet<UInt64>();
+                accuracy = accuracy_field.get<UInt64>();
 
             if (accuracy <= 0)
                 throw Exception(
diff --git a/src/AggregateFunctions/AggregateFunctionSumMap.cpp b/src/AggregateFunctions/AggregateFunctionSumMap.cpp
index 9a94c3dfe1a..666136a91b7 100644
--- a/src/AggregateFunctions/AggregateFunctionSumMap.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSumMap.cpp
@@ -300,12 +300,12 @@ public:
                     /// Compatibility with previous versions.
                     if (value.getType() == Field::Types::Decimal32)
                     {
-                        auto source = value.safeGet<DecimalField<Decimal32>>();
+                        auto source = value.get<DecimalField<Decimal32>>();
                         value = DecimalField<Decimal128>(source.getValue(), source.getScale());
                     }
                     else if (value.getType() == Field::Types::Decimal64)
                     {
-                        auto source = value.safeGet<DecimalField<Decimal64>>();
+                        auto source = value.get<DecimalField<Decimal64>>();
                         value = DecimalField<Decimal128>(source.getValue(), source.getScale());
                     }
 
@@ -355,7 +355,7 @@ public:
                     /// Compatibility with previous versions.
                     if (value.getType() == Field::Types::Decimal128)
                     {
-                        auto source = value.safeGet<DecimalField<Decimal128>>();
+                        auto source = value.get<DecimalField<Decimal128>>();
                         WhichDataType value_type(values_types[col_idx]);
                         if (value_type.isDecimal32())
                         {
@@ -560,7 +560,7 @@ private:
     template <typename FieldType>
     bool compareImpl(FieldType & x) const
     {
-        auto val = rhs.safeGet<FieldType>();
+        auto val = rhs.get<FieldType>();
         if (val > x)
         {
             x = val;
@@ -600,7 +600,7 @@ private:
     template <typename FieldType>
     bool compareImpl(FieldType & x) const
     {
-        auto val = rhs.safeGet<FieldType>();
+        auto val = rhs.get<FieldType>();
         if (val < x)
         {
             x = val;
diff --git a/src/AggregateFunctions/AggregateFunctionUniq.h b/src/AggregateFunctions/AggregateFunctionUniq.h
index 35d6e599e38..cef23f766c7 100644
--- a/src/AggregateFunctions/AggregateFunctionUniq.h
+++ b/src/AggregateFunctions/AggregateFunctionUniq.h
@@ -459,8 +459,6 @@ public:
 
     bool isParallelizeMergePrepareNeeded() const override { return is_parallelize_merge_prepare_needed; }
 
-    constexpr static bool parallelizeMergeWithKey() { return true; }
-
     void parallelizeMergePrepare(AggregateDataPtrs & places, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled) const override
     {
         if constexpr (is_parallelize_merge_prepare_needed)
diff --git a/src/AggregateFunctions/IAggregateFunction.h b/src/AggregateFunctions/IAggregateFunction.h
index f8e7051d635..ee227db6d9d 100644
--- a/src/AggregateFunctions/IAggregateFunction.h
+++ b/src/AggregateFunctions/IAggregateFunction.h
@@ -145,8 +145,6 @@ public:
 
     virtual bool isParallelizeMergePrepareNeeded() const { return false; }
 
-    constexpr static bool parallelizeMergeWithKey() { return false; }
-
     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());
@@ -171,7 +169,7 @@ public:
 
     /// Merges states (on which src places points to) with other states (on which dst places points to) of current aggregation function
     /// then destroy states (on which src places points to).
-    virtual void mergeAndDestroyBatch(AggregateDataPtr * dst_places, AggregateDataPtr * src_places, size_t size, size_t offset, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled, Arena * arena) const = 0;
+    virtual void mergeAndDestroyBatch(AggregateDataPtr * dst_places, AggregateDataPtr * src_places, size_t size, size_t offset, Arena * arena) const = 0;
 
     /// Serializes state (to transmit it over the network, for example).
     virtual void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> version = std::nullopt) const = 0; /// NOLINT
@@ -501,15 +499,11 @@ public:
                 static_cast<const Derived *>(this)->merge(places[i] + place_offset, rhs[i], arena);
     }
 
-    void mergeAndDestroyBatch(AggregateDataPtr * dst_places, AggregateDataPtr * rhs_places, size_t size, size_t offset, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled, Arena * arena) const override
+    void mergeAndDestroyBatch(AggregateDataPtr * dst_places, AggregateDataPtr * rhs_places, size_t size, size_t offset, Arena * arena) const override
     {
         for (size_t i = 0; i < size; ++i)
         {
-            if constexpr (Derived::parallelizeMergeWithKey())
-                static_cast<const Derived *>(this)->merge(dst_places[i] + offset, rhs_places[i] + offset, thread_pool, is_cancelled, arena);
-            else
-                static_cast<const Derived *>(this)->merge(dst_places[i] + offset, rhs_places[i] + offset, arena);
-
+            static_cast<const Derived *>(this)->merge(dst_places[i] + offset, rhs_places[i] + offset, arena);
             static_cast<const Derived *>(this)->destroy(rhs_places[i] + offset);
         }
     }
diff --git a/src/AggregateFunctions/SingleValueData.cpp b/src/AggregateFunctions/SingleValueData.cpp
index 11931acbbc8..a14caf00f73 100644
--- a/src/AggregateFunctions/SingleValueData.cpp
+++ b/src/AggregateFunctions/SingleValueData.cpp
@@ -195,7 +195,7 @@ bool SingleValueDataFixed<T>::isEqualTo(const IColumn & column, size_t index) co
 template <typename T>
 bool SingleValueDataFixed<T>::isEqualTo(const SingleValueDataFixed<T> & to) const
 {
-    return has() && to.has() && to.value == value;
+    return has() && to.value == value;
 }
 
 template <typename T>
@@ -904,7 +904,6 @@ bool SingleValueDataNumeric<T>::isEqualTo(const DB::IColumn & column, size_t ind
 template <typename T>
 bool SingleValueDataNumeric<T>::isEqualTo(const DB::SingleValueDataBase & to) const
 {
-    /// to.has() is checked in memory.get().isEqualTo
     auto const & other = assert_cast<const Self &>(to);
     return memory.get().isEqualTo(other.memory.get());
 }
@@ -918,7 +917,6 @@ void SingleValueDataNumeric<T>::set(const DB::IColumn & column, size_t row_num,
 template <typename T>
 void SingleValueDataNumeric<T>::set(const DB::SingleValueDataBase & to, DB::Arena * arena)
 {
-    /// to.has() is checked in memory.get().set
     auto const & other = assert_cast<const Self &>(to);
     return memory.get().set(other.memory.get(), arena);
 }
@@ -926,7 +924,6 @@ void SingleValueDataNumeric<T>::set(const DB::SingleValueDataBase & to, DB::Aren
 template <typename T>
 bool SingleValueDataNumeric<T>::setIfSmaller(const DB::SingleValueDataBase & to, DB::Arena * arena)
 {
-    /// to.has() is checked in memory.get().setIfSmaller
     auto const & other = assert_cast<const Self &>(to);
     return memory.get().setIfSmaller(other.memory.get(), arena);
 }
@@ -934,7 +931,6 @@ bool SingleValueDataNumeric<T>::setIfSmaller(const DB::SingleValueDataBase & to,
 template <typename T>
 bool SingleValueDataNumeric<T>::setIfGreater(const DB::SingleValueDataBase & to, DB::Arena * arena)
 {
-    /// to.has() is checked in memory.get().setIfGreater
     auto const & other = assert_cast<const Self &>(to);
     return memory.get().setIfGreater(other.memory.get(), arena);
 }
@@ -1195,7 +1191,7 @@ bool SingleValueDataString::isEqualTo(const DB::IColumn & column, size_t row_num
 bool SingleValueDataString::isEqualTo(const SingleValueDataBase & other) const
 {
     auto const & to = assert_cast<const Self &>(other);
-    return has() && to.has() && to.getStringRef() == getStringRef();
+    return has() && to.getStringRef() == getStringRef();
 }
 
 void SingleValueDataString::set(const IColumn & column, size_t row_num, Arena * arena)
@@ -1295,7 +1291,7 @@ bool SingleValueDataGeneric::isEqualTo(const IColumn & column, size_t row_num) c
 bool SingleValueDataGeneric::isEqualTo(const DB::SingleValueDataBase & other) const
 {
     auto const & to = assert_cast<const Self &>(other);
-    return has() && to.has() && to.value == value;
+    return has() && to.value == value;
 }
 
 void SingleValueDataGeneric::set(const IColumn & column, size_t row_num, Arena *)
diff --git a/src/AggregateFunctions/UniqExactSet.h b/src/AggregateFunctions/UniqExactSet.h
index 25c6f7ac55f..2ae8c3a8386 100644
--- a/src/AggregateFunctions/UniqExactSet.h
+++ b/src/AggregateFunctions/UniqExactSet.h
@@ -101,13 +101,6 @@ public:
 
     auto merge(const UniqExactSet & other, ThreadPool * thread_pool = nullptr, std::atomic<bool> * is_cancelled = nullptr)
     {
-        /// If the size is large, we may convert the singleLevelHash to twoLevelHash and merge in parallel.
-        if (other.size() > 40000)
-        {
-            if (isSingleLevel())
-                convertToTwoLevel();
-        }
-
         if (isSingleLevel() && other.isTwoLevel())
             convertToTwoLevel();
 
diff --git a/src/AggregateFunctions/fuzzers/CMakeLists.txt b/src/AggregateFunctions/fuzzers/CMakeLists.txt
index 1ce0c52feb7..907a275b4b3 100644
--- a/src/AggregateFunctions/fuzzers/CMakeLists.txt
+++ b/src/AggregateFunctions/fuzzers/CMakeLists.txt
@@ -1,2 +1,2 @@
 clickhouse_add_executable(aggregate_function_state_deserialization_fuzzer aggregate_function_state_deserialization_fuzzer.cpp ${SRCS})
-target_link_libraries(aggregate_function_state_deserialization_fuzzer PRIVATE clickhouse_functions clickhouse_aggregate_functions)
+target_link_libraries(aggregate_function_state_deserialization_fuzzer PRIVATE dbms clickhouse_aggregate_functions)
diff --git a/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp b/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp
index 87979259c9e..425364efb9c 100644
--- a/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp
+++ b/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp
@@ -12,36 +12,38 @@
 
 #include <Interpreters/Context.h>
 
-#include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/registerAggregateFunctions.h>
 
 #include <base/scope_guard.h>
 
-using namespace DB;
-
-
-ContextMutablePtr context;
-
-extern "C" int LLVMFuzzerInitialize(int *, char ***)
-{
-    if (context)
-        return true;
-
-    SharedContextHolder shared_context = Context::createShared();
-    context = Context::createGlobal(shared_context.get());
-    context->makeGlobalContext();
-
-    MainThreadStatus::getInstance();
-
-    registerAggregateFunctions();
-
-    return 0;
-}
-
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 {
     try
     {
+        using namespace DB;
+
+        static SharedContextHolder shared_context;
+        static ContextMutablePtr context;
+
+        auto initialize = [&]() mutable
+        {
+            if (context)
+                return true;
+
+            shared_context = Context::createShared();
+            context = Context::createGlobal(shared_context.get());
+            context->makeGlobalContext();
+            context->setApplicationType(Context::ApplicationType::LOCAL);
+
+            MainThreadStatus::getInstance();
+
+            registerAggregateFunctions();
+            return true;
+        };
+
+        static bool initialized = initialize();
+        (void) initialized;
+
         total_memory_tracker.resetCounters();
         total_memory_tracker.setHardLimit(1_GiB);
         CurrentThread::get().memory_tracker.resetCounters();
diff --git a/src/AggregateFunctions/registerAggregateFunctions.cpp b/src/AggregateFunctions/registerAggregateFunctions.cpp
index 068f1aebd87..4ac25e14ee6 100644
--- a/src/AggregateFunctions/registerAggregateFunctions.cpp
+++ b/src/AggregateFunctions/registerAggregateFunctions.cpp
@@ -89,8 +89,6 @@ void registerAggregateFunctionAnalysisOfVariance(AggregateFunctionFactory &);
 void registerAggregateFunctionFlameGraph(AggregateFunctionFactory &);
 void registerAggregateFunctionKolmogorovSmirnovTest(AggregateFunctionFactory & factory);
 void registerAggregateFunctionLargestTriangleThreeBuckets(AggregateFunctionFactory & factory);
-void registerAggregateFunctionDistinctDynamicTypes(AggregateFunctionFactory & factory);
-void registerAggregateFunctionDistinctJSONPathsAndTypes(AggregateFunctionFactory & factory);
 
 class AggregateFunctionCombinatorFactory;
 void registerAggregateFunctionCombinatorIf(AggregateFunctionCombinatorFactory &);
@@ -193,8 +191,6 @@ void registerAggregateFunctions()
         registerAggregateFunctionFlameGraph(factory);
         registerAggregateFunctionKolmogorovSmirnovTest(factory);
         registerAggregateFunctionLargestTriangleThreeBuckets(factory);
-        registerAggregateFunctionDistinctDynamicTypes(factory);
-        registerAggregateFunctionDistinctJSONPathsAndTypes(factory);
 
         registerWindowFunctions(factory);
     }
diff --git a/src/Analyzer/ConstantNode.cpp b/src/Analyzer/ConstantNode.cpp
index 3a99ad08ad8..2afd4a26e2f 100644
--- a/src/Analyzer/ConstantNode.cpp
+++ b/src/Analyzer/ConstantNode.cpp
@@ -5,13 +5,13 @@
 #include <Common/assert_cast.h>
 #include <Common/FieldVisitorToString.h>
 #include <Common/SipHash.h>
-#include <DataTypes/DataTypeDateTime64.h>
 
 #include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
 
 #include <DataTypes/FieldToDataType.h>
+#include <DataTypes/DataTypeDateTime64.h>
 
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTFunction.h>
diff --git a/src/Analyzer/FunctionNode.cpp b/src/Analyzer/FunctionNode.cpp
index 8e4e0725a2d..e98b04fe9a9 100644
--- a/src/Analyzer/FunctionNode.cpp
+++ b/src/Analyzer/FunctionNode.cpp
@@ -242,8 +242,7 @@ ASTPtr FunctionNode::toASTImpl(const ConvertToASTOptions & options) const
     /// Avoid cast for `IN tuple(...)` expression.
     /// 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
-        && !static_cast<const ConstantNode *>(argument_nodes[1].get())->hasSourceExpression())
+    if (isNameOfInFunction(function_name) && argument_nodes.size() > 1 &&  argument_nodes[1]->getNodeType() == QueryTreeNodeType::CONSTANT)
         new_options.add_cast_for_constants = false;
 
     const auto & parameters = getParameters();
diff --git a/src/Analyzer/IQueryTreeNode.h b/src/Analyzer/IQueryTreeNode.h
index b36c1401798..df3687f8fd9 100644
--- a/src/Analyzer/IQueryTreeNode.h
+++ b/src/Analyzer/IQueryTreeNode.h
@@ -49,7 +49,7 @@ enum class QueryTreeNodeType : uint8_t
 /// Convert query tree node type to string
 const char * toString(QueryTreeNodeType type);
 
-/** Query tree is a semantic representation of query.
+/** Query tree is semantical representation of query.
   * Query tree node represent node in query tree.
   * IQueryTreeNode is base class for all query tree nodes.
   *
diff --git a/src/Analyzer/InterpolateNode.cpp b/src/Analyzer/InterpolateNode.cpp
index 17c734cf386..97dc79f565b 100644
--- a/src/Analyzer/InterpolateNode.cpp
+++ b/src/Analyzer/InterpolateNode.cpp
@@ -24,7 +24,7 @@ void InterpolateNode::dumpTreeImpl(WriteBuffer & buffer, FormatState & format_st
 {
     buffer << std::string(indent, ' ') << "INTERPOLATE id: " << format_state.getNodeId(this);
 
-    buffer << '\n' << std::string(indent + 2, ' ') << "EXPRESSION " << expression_name << " \n";
+    buffer << '\n' << std::string(indent + 2, ' ') << "EXPRESSION\n";
     getExpression()->dumpTreeImpl(buffer, format_state, indent + 4);
 
     buffer << '\n' << std::string(indent + 2, ' ') << "INTERPOLATE_EXPRESSION\n";
diff --git a/src/Analyzer/InterpolateNode.h b/src/Analyzer/InterpolateNode.h
index eb3d64d7170..ec493ed8bdd 100644
--- a/src/Analyzer/InterpolateNode.h
+++ b/src/Analyzer/InterpolateNode.h
@@ -50,8 +50,6 @@ public:
         return QueryTreeNodeType::INTERPOLATE;
     }
 
-    const std::string & getExpressionName() const { return expression_name; }
-
     void dumpTreeImpl(WriteBuffer & buffer, FormatState & format_state, size_t indent) const override;
 
 protected:
diff --git a/src/Analyzer/Passes/ComparisonTupleEliminationPass.cpp b/src/Analyzer/Passes/ComparisonTupleEliminationPass.cpp
index f31920f8e33..180470952cd 100644
--- a/src/Analyzer/Passes/ComparisonTupleEliminationPass.cpp
+++ b/src/Analyzer/Passes/ComparisonTupleEliminationPass.cpp
@@ -11,7 +11,6 @@
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/ConstantNode.h>
 #include <Analyzer/FunctionNode.h>
-#include <Analyzer/JoinNode.h>
 #include <Analyzer/Utils.h>
 
 namespace DB
@@ -26,15 +25,8 @@ public:
     using Base = InDepthQueryTreeVisitorWithContext<ComparisonTupleEliminationPassVisitor>;
     using Base::Base;
 
-    static bool needChildVisit(QueryTreeNodePtr & parent, QueryTreeNodePtr & child)
+    static bool needChildVisit(QueryTreeNodePtr &, QueryTreeNodePtr & child)
     {
-        if (parent->getNodeType() == QueryTreeNodeType::JOIN)
-        {
-            /// In JOIN ON section comparison of tuples works a bit differently.
-            /// For example we can join on tuple(NULL) = tuple(NULL), join algorithms consider only NULLs on the top level.
-            if (parent->as<const JoinNode &>().getJoinExpression().get() == child.get())
-                return false;
-        }
         return child->getNodeType() != QueryTreeNodeType::TABLE_FUNCTION;
     }
 
@@ -137,7 +129,7 @@ private:
         if (constant_node_value.getType() != Field::Types::Which::Tuple)
             return {};
 
-        const auto & constant_tuple = constant_node_value.safeGet<const Tuple &>();
+        const auto & constant_tuple = constant_node_value.get<const Tuple &>();
 
         const auto & function_arguments_nodes = function_node_typed.getArguments().getNodes();
         size_t function_arguments_nodes_size = function_arguments_nodes.size();
diff --git a/src/Analyzer/Passes/ConvertOrLikeChainPass.cpp b/src/Analyzer/Passes/ConvertOrLikeChainPass.cpp
index 6c4ce789993..2b2ac95d7b9 100644
--- a/src/Analyzer/Passes/ConvertOrLikeChainPass.cpp
+++ b/src/Analyzer/Passes/ConvertOrLikeChainPass.cpp
@@ -89,7 +89,7 @@ public:
             if (!pattern || !isString(pattern->getResultType()))
                 continue;
 
-            auto regexp = likePatternToRegexp(pattern->getValue().safeGet<String>());
+            auto regexp = likePatternToRegexp(pattern->getValue().get<String>());
             /// Case insensitive. Works with UTF-8 as well.
             if (is_ilike)
                 regexp = "(?i)" + regexp;
diff --git a/src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp b/src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp
index 6f1c3937880..b968f43c6a6 100644
--- a/src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp
+++ b/src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp
@@ -68,10 +68,10 @@ void optimizeFunctionEmpty(QueryTreeNodePtr &, FunctionNode & function_node, Col
 String getSubcolumnNameForElement(const Field & value, const DataTypeTuple & data_type_tuple)
 {
     if (value.getType() == Field::Types::String)
-        return value.safeGet<const String &>();
+        return value.get<const String &>();
 
     if (value.getType() == Field::Types::UInt64)
-        return data_type_tuple.getNameByPosition(value.safeGet<UInt64>());
+        return data_type_tuple.getNameByPosition(value.get<UInt64>());
 
     return "";
 }
@@ -79,7 +79,7 @@ String getSubcolumnNameForElement(const Field & value, const DataTypeTuple & dat
 String getSubcolumnNameForElement(const Field & value, const DataTypeVariant &)
 {
     if (value.getType() == Field::Types::String)
-        return value.safeGet<const String &>();
+        return value.get<const String &>();
 
     return "";
 }
@@ -209,7 +209,7 @@ std::map<std::pair<TypeIndex, String>, NodeToSubcolumnTransformer> node_transfor
     },
 };
 
-std::tuple<FunctionNode *, ColumnNode *, TableNode *> getTypedNodesForOptimization(const QueryTreeNodePtr & node, const ContextPtr & context)
+std::tuple<FunctionNode *, ColumnNode *, TableNode *> getTypedNodesForOptimization(const QueryTreeNodePtr & node)
 {
     auto * function_node = node->as<FunctionNode>();
     if (!function_node)
@@ -232,12 +232,6 @@ std::tuple<FunctionNode *, ColumnNode *, TableNode *> getTypedNodesForOptimizati
     const auto & storage_snapshot = table_node->getStorageSnapshot();
     auto column = first_argument_column_node->getColumn();
 
-    /// If view source is set we cannot optimize because it doesn't support moving functions to subcolumns.
-    /// The storage is replaced to the view source but it happens only after building a query tree and applying passes.
-    auto view_source = context->getViewSource();
-    if (view_source && view_source->getStorageID().getFullNameNotQuoted() == storage->getStorageID().getFullNameNotQuoted())
-        return {};
-
     if (!storage->supportsOptimizationToSubcolumns() || storage->isVirtualColumn(column.name, storage_snapshot->metadata))
         return {};
 
@@ -272,7 +266,7 @@ public:
             return;
         }
 
-        auto [function_node, first_argument_node, table_node] = getTypedNodesForOptimization(node, getContext());
+        auto [function_node, first_argument_node, table_node] = getTypedNodesForOptimization(node);
         if (function_node && first_argument_node && table_node)
         {
             enterImpl(*function_node, *first_argument_node, *table_node);
@@ -422,7 +416,7 @@ public:
         if (!getSettings().optimize_functions_to_subcolumns)
             return;
 
-        auto [function_node, first_argument_column_node, table_node] = getTypedNodesForOptimization(node, getContext());
+        auto [function_node, first_argument_column_node, table_node] = getTypedNodesForOptimization(node);
         if (!function_node || !first_argument_column_node || !table_node)
             return;
 
diff --git a/src/Analyzer/Passes/FuseFunctionsPass.cpp b/src/Analyzer/Passes/FuseFunctionsPass.cpp
index f3b109a10ed..0175e304a2b 100644
--- a/src/Analyzer/Passes/FuseFunctionsPass.cpp
+++ b/src/Analyzer/Passes/FuseFunctionsPass.cpp
@@ -187,7 +187,7 @@ FunctionNodePtr createFusedQuantilesNode(std::vector<QueryTreeNodePtr *> & nodes
         /// Sort nodes and parameters in ascending order of quantile level
         std::vector<size_t> permutation(nodes.size());
         iota(permutation.data(), permutation.size(), size_t(0));
-        std::sort(permutation.begin(), permutation.end(), [&](size_t i, size_t j) { return parameters[i].safeGet<Float64>() < parameters[j].safeGet<Float64>(); });
+        std::sort(permutation.begin(), permutation.end(), [&](size_t i, size_t j) { return parameters[i].get<Float64>() < parameters[j].get<Float64>(); });
 
         std::vector<QueryTreeNodePtr *> new_nodes;
         new_nodes.reserve(permutation.size());
diff --git a/src/Analyzer/Passes/IfTransformStringsToEnumPass.cpp b/src/Analyzer/Passes/IfTransformStringsToEnumPass.cpp
index f81327c5d55..d966f129d08 100644
--- a/src/Analyzer/Passes/IfTransformStringsToEnumPass.cpp
+++ b/src/Analyzer/Passes/IfTransformStringsToEnumPass.cpp
@@ -134,8 +134,8 @@ public:
                 return;
 
             std::set<std::string> string_values;
-            string_values.insert(first_literal->getValue().safeGet<std::string>());
-            string_values.insert(second_literal->getValue().safeGet<std::string>());
+            string_values.insert(first_literal->getValue().get<std::string>());
+            string_values.insert(second_literal->getValue().get<std::string>());
 
             changeIfArguments(*function_if_node, string_values, context);
             wrapIntoToString(*function_node, std::move(modified_if_node), context);
@@ -163,7 +163,7 @@ public:
             if (!isArray(literal_to->getResultType()) || !isString(literal_default->getResultType()))
                 return;
 
-            auto array_to = literal_to->getValue().safeGet<Array>();
+            auto array_to = literal_to->getValue().get<Array>();
 
             if (array_to.empty())
                 return;
@@ -178,9 +178,9 @@ public:
             std::set<std::string> string_values;
 
             for (const auto & value : array_to)
-                string_values.insert(value.safeGet<std::string>());
+                string_values.insert(value.get<std::string>());
 
-            string_values.insert(literal_default->getValue().safeGet<std::string>());
+            string_values.insert(literal_default->getValue().get<std::string>());
 
             changeTransformArguments(*function_modified_transform_node, string_values, context);
             wrapIntoToString(*function_node, std::move(modified_transform_node), context);
diff --git a/src/Analyzer/Passes/NormalizeCountVariantsPass.cpp b/src/Analyzer/Passes/NormalizeCountVariantsPass.cpp
index 02f1c93ea7f..3a8b6e75d40 100644
--- a/src/Analyzer/Passes/NormalizeCountVariantsPass.cpp
+++ b/src/Analyzer/Passes/NormalizeCountVariantsPass.cpp
@@ -54,7 +54,7 @@ public:
         }
         else if (function_node->getFunctionName() == "sum" &&
             first_argument_constant_literal.getType() == Field::Types::UInt64 &&
-            first_argument_constant_literal.safeGet<UInt64>() == 1)
+            first_argument_constant_literal.get<UInt64>() == 1)
         {
             function_node->getArguments().getNodes().clear();
             resolveAggregateFunctionNodeByName(*function_node, "count");
diff --git a/src/Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.cpp b/src/Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.cpp
index 0f33c302265..feb8bcc792d 100644
--- a/src/Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.cpp
+++ b/src/Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.cpp
@@ -143,13 +143,13 @@ private:
         const auto & column_type = column_node_typed.getColumnType().get();
         if (isDateOrDate32(column_type))
         {
-            start_date_or_date_time = date_lut.dateToString(range.first.safeGet<DateLUTImpl::Time>());
-            end_date_or_date_time = date_lut.dateToString(range.second.safeGet<DateLUTImpl::Time>());
+            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_type) || isDateTime64(column_type))
         {
-            start_date_or_date_time = date_lut.timeToString(range.first.safeGet<DateLUTImpl::Time>());
-            end_date_or_date_time = date_lut.timeToString(range.second.safeGet<DateLUTImpl::Time>());
+            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 {};
diff --git a/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp b/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp
index 091061ceb81..c1adf05ac76 100644
--- a/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp
+++ b/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp
@@ -2,7 +2,6 @@
 
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeAggregateFunction.h>
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/IAggregateFunction.h>
@@ -43,7 +42,7 @@ public:
         if (lower_name.ends_with("if"))
             return;
 
-        const auto & function_arguments_nodes = function_node->getArguments().getNodes();
+        auto & function_arguments_nodes = function_node->getArguments().getNodes();
         if (function_arguments_nodes.size() != 1)
             return;
 
@@ -51,8 +50,6 @@ public:
         if (!if_node || if_node->getFunctionName() != "if")
             return;
 
-        FunctionNodePtr replaced_node;
-
         auto if_arguments_nodes = if_node->getArguments().getNodes();
         auto * first_const_node = if_arguments_nodes[1]->as<ConstantNode>();
         auto * second_const_node = if_arguments_nodes[2]->as<ConstantNode>();
@@ -60,7 +57,7 @@ public:
         {
             const auto & second_const_value = second_const_node->getValue();
             if (second_const_value.isNull()
-                || (lower_name == "sum" && isInt64OrUInt64FieldType(second_const_value.getType()) && second_const_value.safeGet<UInt64>() == 0
+                || (lower_name == "sum" && isInt64OrUInt64FieldType(second_const_value.getType()) && second_const_value.get<UInt64>() == 0
                     && !if_node->getResultType()->isNullable()))
             {
                 /// avg(if(cond, a, null)) -> avgIf(a::ResultTypeIf, cond)
@@ -78,18 +75,15 @@ public:
                     new_arguments[0] = std::move(if_arguments_nodes[1]);
 
                 new_arguments[1] = std::move(if_arguments_nodes[0]);
-
-                replaced_node = std::make_shared<FunctionNode>(function_node->getFunctionName() + "If");
-                replaced_node->getArguments().getNodes() = std::move(new_arguments);
-                replaced_node->getParameters().getNodes() = function_node->getParameters().getNodes();
-                resolveAggregateFunctionNodeByName(*replaced_node, replaced_node->getFunctionName());
+                function_arguments_nodes = std::move(new_arguments);
+                resolveAggregateFunctionNodeByName(*function_node, function_node->getFunctionName() + "If");
             }
         }
         else if (first_const_node)
         {
             const auto & first_const_value = first_const_node->getValue();
             if (first_const_value.isNull()
-                || (lower_name == "sum" && isInt64OrUInt64FieldType(first_const_value.getType()) && first_const_value.safeGet<UInt64>() == 0
+                || (lower_name == "sum" && isInt64OrUInt64FieldType(first_const_value.getType()) && first_const_value.get<UInt64>() == 0
                     && !if_node->getResultType()->isNullable()))
             {
                 /// avg(if(cond, null, a) -> avgIf(a::ResultTypeIf, !cond))
@@ -110,26 +104,10 @@ public:
                     FunctionFactory::instance().get("not", getContext())->build(not_function->getArgumentColumns()));
                 new_arguments[1] = std::move(not_function);
 
-                replaced_node = std::make_shared<FunctionNode>(function_node->getFunctionName() + "If");
-                replaced_node->getArguments().getNodes() = std::move(new_arguments);
-                replaced_node->getParameters().getNodes() = function_node->getParameters().getNodes();
-                resolveAggregateFunctionNodeByName(*replaced_node, replaced_node->getFunctionName());
+                function_arguments_nodes = std::move(new_arguments);
+                resolveAggregateFunctionNodeByName(*function_node, function_node->getFunctionName() + "If");
             }
         }
-
-        if (!replaced_node)
-            return;
-
-        auto prev_type = function_node->getResultType();
-        auto curr_type = replaced_node->getResultType();
-        if (!prev_type->equals(*curr_type))
-            return;
-
-        /// Just in case, CAST compatible aggregate function states.
-        if (WhichDataType(prev_type).isAggregateFunction() && !DataTypeAggregateFunction::strictEquals(prev_type, curr_type))
-            node = createCastFunction(std::move(replaced_node), prev_type, getContext());
-        else
-            node = std::move(replaced_node);
     }
 };
 
diff --git a/src/Analyzer/Passes/ShardNumColumnToFunctionPass.cpp b/src/Analyzer/Passes/ShardNumColumnToFunctionPass.cpp
index c58504064ce..82e3281121c 100644
--- a/src/Analyzer/Passes/ShardNumColumnToFunctionPass.cpp
+++ b/src/Analyzer/Passes/ShardNumColumnToFunctionPass.cpp
@@ -46,7 +46,7 @@ public:
             return;
 
         const auto & storage_snapshot = table_node ? table_node->getStorageSnapshot() : table_function_node->getStorageSnapshot();
-        if (!storage->isVirtualColumn(column.name, storage_snapshot->metadata))
+        if (!storage->isVirtualColumn(column.name, storage_snapshot->getMetadataForQuery()))
             return;
 
         auto function_node = std::make_shared<FunctionNode>("shardNum");
diff --git a/src/Analyzer/Passes/SumIfToCountIfPass.cpp b/src/Analyzer/Passes/SumIfToCountIfPass.cpp
index a987ced497a..1524629dc81 100644
--- a/src/Analyzer/Passes/SumIfToCountIfPass.cpp
+++ b/src/Analyzer/Passes/SumIfToCountIfPass.cpp
@@ -66,7 +66,7 @@ public:
 
             resolveAggregateFunctionNodeByName(*function_node, "countIf");
 
-            if (constant_value_literal.safeGet<UInt64>() != 1)
+            if (constant_value_literal.get<UInt64>() != 1)
             {
                 /// Rewrite `sumIf(123, cond)` into `123 * countIf(cond)`
                 node = getMultiplyFunction(std::move(multiplier_node), node);
@@ -105,8 +105,8 @@ public:
         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();
 
-        auto if_true_condition_value = if_true_condition_constant_value_literal.safeGet<UInt64>();
-        auto if_false_condition_value = if_false_condition_constant_value_literal.safeGet<UInt64>();
+        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>();
 
         if (if_false_condition_value == 0)
         {
diff --git a/src/Analyzer/QueryTreeBuilder.cpp b/src/Analyzer/QueryTreeBuilder.cpp
index 9754897d54d..a62b6e56ac5 100644
--- a/src/Analyzer/QueryTreeBuilder.cpp
+++ b/src/Analyzer/QueryTreeBuilder.cpp
@@ -237,7 +237,7 @@ QueryTreeNodePtr QueryTreeBuilder::buildSelectExpression(const ASTPtr & select_q
     /// Remove global settings limit and offset
     if (const auto & settings_ref = updated_context->getSettingsRef(); settings_ref.limit || settings_ref.offset)
     {
-        Settings settings = updated_context->getSettingsCopy();
+        Settings settings = updated_context->getSettings();
         limit = settings.limit;
         offset = settings.offset;
         settings.limit = 0;
@@ -268,8 +268,6 @@ QueryTreeNodePtr QueryTreeBuilder::buildSelectExpression(const ASTPtr & select_q
         }
     }
 
-    const auto enable_order_by_all = updated_context->getSettingsRef().enable_order_by_all;
-
     auto current_query_tree = std::make_shared<QueryNode>(std::move(updated_context), std::move(settings_changes));
 
     current_query_tree->setIsSubquery(is_subquery);
@@ -283,10 +281,7 @@ QueryTreeNodePtr QueryTreeBuilder::buildSelectExpression(const ASTPtr & select_q
     current_query_tree->setIsGroupByWithRollup(select_query_typed.group_by_with_rollup);
     current_query_tree->setIsGroupByWithGroupingSets(select_query_typed.group_by_with_grouping_sets);
     current_query_tree->setIsGroupByAll(select_query_typed.group_by_all);
-    /// order_by_all flag in AST is set w/o consideration of `enable_order_by_all` setting
-    /// since SETTINGS section has not been parsed yet, - so, check the setting here
-    if (enable_order_by_all)
-        current_query_tree->setIsOrderByAll(select_query_typed.order_by_all);
+    current_query_tree->setIsOrderByAll(select_query_typed.order_by_all);
     current_query_tree->setOriginalAST(select_query);
 
     auto current_context = current_query_tree->getContext();
@@ -471,7 +466,7 @@ QueryTreeNodePtr QueryTreeBuilder::buildSortList(const ASTPtr & order_by_express
 
         std::shared_ptr<Collator> collator;
         if (order_by_element.getCollation())
-            collator = std::make_shared<Collator>(order_by_element.getCollation()->as<ASTLiteral &>().value.safeGet<String &>());
+            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);
diff --git a/src/Analyzer/Resolve/IdentifierResolver.cpp b/src/Analyzer/Resolve/IdentifierResolver.cpp
index 80e7d1e4445..447bf825836 100644
--- a/src/Analyzer/Resolve/IdentifierResolver.cpp
+++ b/src/Analyzer/Resolve/IdentifierResolver.cpp
@@ -1,5 +1,5 @@
 #include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypeObjectDeprecated.h>
+#include <DataTypes/DataTypeObject.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/NestedUtils.h>
 
@@ -452,10 +452,10 @@ QueryTreeNodePtr IdentifierResolver::tryResolveIdentifierFromCompoundExpression(
         if (auto * column = compound_expression->as<ColumnNode>())
         {
             const DataTypePtr & column_type = column->getColumn().getTypeInStorage();
-            if (column_type->getTypeId() == TypeIndex::ObjectDeprecated)
+            if (column_type->getTypeId() == TypeIndex::Object)
             {
-                const auto & object_type = checkAndGetDataType<DataTypeObjectDeprecated>(*column_type);
-                if (object_type.getSchemaFormat() == "json" && object_type.hasNullableSubcolumns())
+                const auto * object_type = checkAndGetDataType<DataTypeObject>(column_type.get());
+                if (object_type->getSchemaFormat() == "json" && object_type->hasNullableSubcolumns())
                 {
                     QueryTreeNodePtr constant_node_null = std::make_shared<ConstantNode>(Field());
                     return constant_node_null;
@@ -692,7 +692,7 @@ QueryTreeNodePtr IdentifierResolver::tryResolveIdentifierFromStorage(
         result_column_node = it->second;
     }
     /// Check if it's a dynamic subcolumn
-    else if (table_expression_data.supports_subcolumns)
+    else
     {
         auto [column_name, dynamic_subcolumn_name] = Nested::splitName(identifier_full_name);
         auto jt = table_expression_data.column_name_to_column_node.find(column_name);
@@ -1000,6 +1000,7 @@ QueryTreeNodePtr IdentifierResolver::tryResolveIdentifierFromJoin(const Identifi
     if (!join_node_in_resolve_process && from_join_node.isUsingJoinExpression())
     {
         auto & join_using_list = from_join_node.getJoinExpression()->as<ListNode &>();
+
         for (auto & join_using_node : join_using_list.getNodes())
         {
             auto & column_node = join_using_node->as<ColumnNode &>();
@@ -1272,7 +1273,7 @@ QueryTreeNodePtr IdentifierResolver::matchArrayJoinSubcolumns(
             const auto & constant_node_value = constant_node.getValue();
             if (constant_node_value.getType() == Field::Types::String)
             {
-                array_join_subcolumn_prefix = constant_node_value.safeGet<String>() + ".";
+                array_join_subcolumn_prefix = constant_node_value.get<String>() + ".";
                 array_join_parent_column = argument_nodes.at(0).get();
             }
         }
@@ -1286,7 +1287,7 @@ QueryTreeNodePtr IdentifierResolver::matchArrayJoinSubcolumns(
     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().safeGet<String &>();
+    const auto & resolved_subcolumn_path = second_argument->getValue().get<String &>();
     if (!startsWith(resolved_subcolumn_path, array_join_subcolumn_prefix))
         return {};
 
@@ -1330,7 +1331,7 @@ QueryTreeNodePtr IdentifierResolver::tryResolveExpressionFromArrayJoinExpression
             size_t nested_function_arguments_size = nested_function_arguments.size();
 
             const auto & nested_keys_names_constant_node = nested_function_arguments[0]->as<ConstantNode & >();
-            const auto & nested_keys_names = nested_keys_names_constant_node.getValue().safeGet<Array &>();
+            const auto & nested_keys_names = nested_keys_names_constant_node.getValue().get<Array &>();
             size_t nested_keys_names_size = nested_keys_names.size();
 
             if (nested_keys_names_size == nested_function_arguments_size - 1)
@@ -1343,7 +1344,7 @@ QueryTreeNodePtr IdentifierResolver::tryResolveExpressionFromArrayJoinExpression
                     auto array_join_column = std::make_shared<ColumnNode>(array_join_column_expression_typed.getColumn(),
                         array_join_column_expression_typed.getColumnSource());
 
-                    const auto & nested_key_name = nested_keys_names[i - 1].safeGet<String &>();
+                    const auto & nested_key_name = nested_keys_names[i - 1].get<String &>();
                     Identifier nested_identifier = Identifier(nested_key_name);
                     array_join_resolved_expression = wrapExpressionNodeInTupleElement(array_join_column, nested_identifier, scope.context);
                     break;
diff --git a/src/Analyzer/Resolve/QueryAnalyzer.cpp b/src/Analyzer/Resolve/QueryAnalyzer.cpp
index a18c2901a58..a43e3e62ebc 100644
--- a/src/Analyzer/Resolve/QueryAnalyzer.cpp
+++ b/src/Analyzer/Resolve/QueryAnalyzer.cpp
@@ -3,7 +3,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeObjectDeprecated.h>
+#include <DataTypes/DataTypeObject.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeMap.h>
@@ -64,8 +64,6 @@
 #include <Analyzer/Resolve/TableExpressionsAliasVisitor.h>
 #include <Analyzer/Resolve/ReplaceColumnsVisitor.h>
 
-#include <Planner/PlannerActionsVisitor.h>
-
 #include <Core/Settings.h>
 
 namespace ProfileEvents
@@ -505,7 +503,7 @@ void QueryAnalyzer::evaluateScalarSubqueryIfNeeded(QueryTreeNodePtr & node, Iden
         ProfileEvents::increment(ProfileEvents::ScalarSubqueriesCacheMiss);
         auto subquery_context = Context::createCopy(context);
 
-        Settings subquery_settings = context->getSettingsCopy();
+        Settings subquery_settings = context->getSettings();
         subquery_settings.max_result_rows = 1;
         subquery_settings.extremes = false;
         subquery_context->setSettings(subquery_settings);
@@ -748,11 +746,11 @@ void QueryAnalyzer::replaceNodesWithPositionalArguments(QueryTreeNodePtr & node_
         UInt64 pos;
         if (constant_node->getValue().getType() == Field::Types::UInt64)
         {
-            pos = constant_node->getValue().safeGet<UInt64>();
+            pos = constant_node->getValue().get<UInt64>();
         }
         else // Int64
         {
-            auto value = constant_node->getValue().safeGet<Int64>();
+            auto value = constant_node->getValue().get<Int64>();
             if (value > 0)
                 pos = value;
             else
@@ -1742,7 +1740,7 @@ QueryAnalyzer::QueryTreeNodesWithNames QueryAnalyzer::resolveQualifiedMatcher(Qu
         const auto * tuple_data_type = typeid_cast<const DataTypeTuple *>(result_type.get());
         if (!tuple_data_type)
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
-                "Qualified matcher {} found a non-compound expression {} with type {}. Expected a tuple or an array of tuples. In scope {}",
+                "Qualified matcher {} find non compound expression {} with type {}. Expected tuple or array of tuples. In scope {}",
                 matcher_node->formatASTForErrorMessage(),
                 expression_query_tree_node->formatASTForErrorMessage(),
                 expression_query_tree_node->getResultType()->getName(),
@@ -4124,7 +4122,13 @@ void QueryAnalyzer::resolveInterpolateColumnsNodeList(QueryTreeNodePtr & interpo
     {
         auto & interpolate_node_typed = interpolate_node->as<InterpolateNode &>();
 
-        auto column_to_interpolate_name = interpolate_node_typed.getExpressionName();
+        auto * column_to_interpolate = interpolate_node_typed.getExpression()->as<IdentifierNode>();
+        if (!column_to_interpolate)
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "INTERPOLATE can work only for identifiers, but {} is found",
+                interpolate_node_typed.getExpression()->formatASTForErrorMessage());
+        auto column_to_interpolate_name = column_to_interpolate->getIdentifier().getFullName();
 
         resolveExpressionNode(interpolate_node_typed.getExpression(), scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
 
@@ -4133,11 +4137,14 @@ void QueryAnalyzer::resolveInterpolateColumnsNodeList(QueryTreeNodePtr & interpo
         auto & interpolation_to_resolve = interpolate_node_typed.getInterpolateExpression();
         IdentifierResolveScope interpolate_scope(interpolation_to_resolve, &scope /*parent_scope*/);
 
-        auto fake_column_node = std::make_shared<ColumnNode>(NameAndTypePair(column_to_interpolate_name, interpolate_node_typed.getExpression()->getResultType()), interpolate_node);
+        auto fake_column_node = std::make_shared<ColumnNode>(NameAndTypePair(column_to_interpolate_name, interpolate_node_typed.getExpression()->getResultType()), interpolate_node_typed.getExpression());
         if (is_column_constant)
             interpolate_scope.expression_argument_name_to_node.emplace(column_to_interpolate_name, fake_column_node);
 
         resolveExpressionNode(interpolation_to_resolve, interpolate_scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
+
+        if (is_column_constant)
+            interpolation_to_resolve = interpolation_to_resolve->cloneAndReplace(fake_column_node, interpolate_node_typed.getExpression());
     }
 }
 
@@ -4379,10 +4386,7 @@ void QueryAnalyzer::initializeTableExpressionData(const QueryTreeNodePtr & table
 
         auto get_column_options = GetColumnsOptions(GetColumnsOptions::All).withExtendedObjects().withVirtuals();
         if (storage_snapshot->storage.supportsSubcolumns())
-        {
             get_column_options.withSubcolumns();
-            table_expression_data.supports_subcolumns = true;
-        }
 
         auto column_names_and_types = storage_snapshot->getColumns(get_column_options);
         table_expression_data.column_names_and_types = NamesAndTypes(column_names_and_types.begin(), column_names_and_types.end());
@@ -4544,15 +4548,7 @@ void QueryAnalyzer::resolveTableFunction(QueryTreeNodePtr & table_function_node,
                     resolveExpressionNode(nodes[1], scope, /* allow_lambda_expression */false, /* allow_table_function */false);
                     if (auto * constant = nodes[1]->as<ConstantNode>())
                     {
-                        /// Serialize the constant value using datatype specific
-                        /// interfaces to match the deserialization in ReplaceQueryParametersVistor.
-                        WriteBufferFromOwnString buf;
-                        const auto & value = constant->getValue();
-                        auto real_type = constant->getResultType();
-                        auto temporary_column  = real_type->createColumn();
-                        temporary_column->insert(value);
-                        real_type->getDefaultSerialization()->serializeTextEscaped(*temporary_column, 0, buf, {});
-                        view_params[identifier_node->getIdentifier().getFullName()] = buf.str();
+                        view_params[identifier_node->getIdentifier().getFullName()] = convertFieldToString(constant->getValue());
                     }
                 }
             }
diff --git a/src/Analyzer/Resolve/TableExpressionData.h b/src/Analyzer/Resolve/TableExpressionData.h
index 6770672d0c2..18cbfa32366 100644
--- a/src/Analyzer/Resolve/TableExpressionData.h
+++ b/src/Analyzer/Resolve/TableExpressionData.h
@@ -36,7 +36,6 @@ struct AnalysisTableExpressionData
     std::string database_name;
     std::string table_name;
     bool should_qualify_columns = true;
-    bool supports_subcolumns = false;
     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
diff --git a/src/Analyzer/SetUtils.cpp b/src/Analyzer/SetUtils.cpp
index 59a243b27f3..0ecb3545225 100644
--- a/src/Analyzer/SetUtils.cpp
+++ b/src/Analyzer/SetUtils.cpp
@@ -43,12 +43,6 @@ size_t getCompoundTypeDepth(const IDataType & type)
             const auto & tuple_elements = assert_cast<const DataTypeTuple &>(*current_type).getElements();
             if (!tuple_elements.empty())
                 current_type = tuple_elements.at(0).get();
-            else
-            {
-                /// Special case: tuple with no element - tuple(). In this case, what's the compound type depth?
-                /// I'm not certain about the theoretical answer, but from experiment, 1 is the most reasonable choice.
-                return 1;
-            }
 
             ++result;
         }
@@ -99,7 +93,7 @@ Block createBlockFromCollection(const Collection & collection, const DataTypes&
                 "Invalid type in set. Expected tuple, got {}",
                 value.getTypeName());
 
-        const auto & tuple = value.template safeGet<const Tuple &>();
+        const auto & tuple = value.template get<const Tuple &>();
         const DataTypePtr & value_type = value_types[collection_index];
         const DataTypes & tuple_value_type = typeid_cast<const DataTypeTuple *>(value_type.get())->getElements();
 
@@ -175,15 +169,15 @@ Block getSetElementsForConstantValue(const DataTypePtr & expression_type, const
         if (rhs_which_type.isArray())
         {
             const DataTypeArray * value_array_type = assert_cast<const DataTypeArray *>(value_type.get());
-            size_t value_array_size = value.safeGet<const Array &>().size();
+            size_t value_array_size = value.get<const Array &>().size();
             DataTypes value_types(value_array_size, value_array_type->getNestedType());
-            result_block = createBlockFromCollection(value.safeGet<const Array &>(), value_types, set_element_types, transform_null_in);
+            result_block = createBlockFromCollection(value.get<const Array &>(), value_types, set_element_types, transform_null_in);
         }
         else if (rhs_which_type.isTuple())
         {
             const DataTypeTuple * value_tuple_type = assert_cast<const DataTypeTuple *>(value_type.get());
             const DataTypes & value_types = value_tuple_type->getElements();
-            result_block = createBlockFromCollection(value.safeGet<const Tuple &>(), value_types, set_element_types, transform_null_in);
+            result_block = createBlockFromCollection(value.get<const Tuple &>(), value_types, set_element_types, transform_null_in);
         }
         else
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
diff --git a/src/Analyzer/Utils.cpp b/src/Analyzer/Utils.cpp
index e5f372b7368..d10bbd9bd23 100644
--- a/src/Analyzer/Utils.cpp
+++ b/src/Analyzer/Utils.cpp
@@ -867,7 +867,7 @@ void updateContextForSubqueryExecution(ContextMutablePtr & mutable_context)
       *  max_rows_in_join, max_bytes_in_join, join_overflow_mode,
       *  which are checked separately (in the Set, Join objects).
       */
-    Settings subquery_settings = mutable_context->getSettingsCopy();
+    Settings subquery_settings = mutable_context->getSettings();
     subquery_settings.max_result_rows = 0;
     subquery_settings.max_result_bytes = 0;
     /// The calculation of extremes does not make sense and is not necessary (if you do it, then the extremes of the subquery can be taken for whole query).
diff --git a/src/Backups/BackupFactory.h b/src/Backups/BackupFactory.h
index 807b8516d49..e13a9a12ca2 100644
--- a/src/Backups/BackupFactory.h
+++ b/src/Backups/BackupFactory.h
@@ -41,7 +41,6 @@ public:
         bool allow_s3_native_copy = true;
         bool allow_azure_native_copy = true;
         bool use_same_s3_credentials_for_base_backup = false;
-        bool use_same_password_for_base_backup = false;
         bool azure_attempt_to_create_container = true;
         ReadSettings read_settings;
         WriteSettings write_settings;
diff --git a/src/Backups/BackupImpl.cpp b/src/Backups/BackupImpl.cpp
index 23f067a62f5..3f972c36e47 100644
--- a/src/Backups/BackupImpl.cpp
+++ b/src/Backups/BackupImpl.cpp
@@ -92,8 +92,7 @@ BackupImpl::BackupImpl(
     std::shared_ptr<IBackupReader> reader_,
     const ContextPtr & context_,
     bool is_internal_backup_,
-    bool use_same_s3_credentials_for_base_backup_,
-    bool use_same_password_for_base_backup_)
+    bool use_same_s3_credentials_for_base_backup_)
     : backup_info(backup_info_)
     , backup_name_for_logging(backup_info.toStringForLogging())
     , use_archive(!archive_params_.archive_name.empty())
@@ -105,7 +104,6 @@ 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_)
-    , use_same_password_for_base_backup(use_same_password_for_base_backup_)
     , log(getLogger("BackupImpl"))
 {
     open();
@@ -122,8 +120,7 @@ BackupImpl::BackupImpl(
     const std::shared_ptr<IBackupCoordination> & coordination_,
     const std::optional<UUID> & backup_uuid_,
     bool deduplicate_files_,
-    bool use_same_s3_credentials_for_base_backup_,
-    bool use_same_password_for_base_backup_)
+    bool use_same_s3_credentials_for_base_backup_)
     : backup_info(backup_info_)
     , backup_name_for_logging(backup_info.toStringForLogging())
     , use_archive(!archive_params_.archive_name.empty())
@@ -138,7 +135,6 @@ 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_)
-    , use_same_password_for_base_backup(use_same_password_for_base_backup_)
     , log(getLogger("BackupImpl"))
 {
     open();
@@ -262,11 +258,6 @@ std::shared_ptr<const IBackup> BackupImpl::getBaseBackupUnlocked() const
         params.is_internal_backup = is_internal_backup;
         /// use_same_s3_credentials_for_base_backup should be inherited for base backups
         params.use_same_s3_credentials_for_base_backup = use_same_s3_credentials_for_base_backup;
-        /// use_same_password_for_base_backup should be inherited for base backups
-        params.use_same_password_for_base_backup = use_same_password_for_base_backup;
-
-        if (params.use_same_password_for_base_backup)
-            params.password = archive_params.password;
 
         base_backup = BackupFactory::instance().createBackup(params);
 
diff --git a/src/Backups/BackupImpl.h b/src/Backups/BackupImpl.h
index d7846104c4c..2b27e2ab090 100644
--- a/src/Backups/BackupImpl.h
+++ b/src/Backups/BackupImpl.h
@@ -41,8 +41,7 @@ public:
         std::shared_ptr<IBackupReader> reader_,
         const ContextPtr & context_,
         bool is_internal_backup_,
-        bool use_same_s3_credentials_for_base_backup_,
-        bool use_same_password_for_base_backup_);
+        bool use_same_s3_credentials_for_base_backup_);
 
     BackupImpl(
         const BackupInfo & backup_info_,
@@ -54,8 +53,7 @@ public:
         const std::shared_ptr<IBackupCoordination> & coordination_,
         const std::optional<UUID> & backup_uuid_,
         bool deduplicate_files_,
-        bool use_same_s3_credentials_for_base_backup_,
-        bool use_same_password_for_base_backup_);
+        bool use_same_s3_credentials_for_base_backup_);
 
     ~BackupImpl() override;
 
@@ -155,7 +153,6 @@ private:
     bool writing_finalized = false;
     bool deduplicate_files = true;
     bool use_same_s3_credentials_for_base_backup = false;
-    bool use_same_password_for_base_backup = false;
     const LoggerPtr log;
 };
 
diff --git a/src/Backups/BackupSettings.cpp b/src/Backups/BackupSettings.cpp
index e982a806b7c..e33880f88e3 100644
--- a/src/Backups/BackupSettings.cpp
+++ b/src/Backups/BackupSettings.cpp
@@ -29,7 +29,6 @@ namespace ErrorCodes
     M(Bool, allow_s3_native_copy) \
     M(Bool, allow_azure_native_copy) \
     M(Bool, use_same_s3_credentials_for_base_backup) \
-    M(Bool, use_same_password_for_base_backup) \
     M(Bool, azure_attempt_to_create_container) \
     M(Bool, read_from_filesystem_cache) \
     M(UInt64, shard_num) \
@@ -126,7 +125,7 @@ std::vector<Strings> BackupSettings::Util::clusterHostIDsFromAST(const IAST & as
                 throw Exception(
                     ErrorCodes::CANNOT_PARSE_BACKUP_SETTINGS,
                     "Setting cluster_host_ids has wrong format, must be array of arrays of string literals");
-            const auto & replicas = array_of_replicas->value.safeGet<const Array &>();
+            const auto & replicas = array_of_replicas->value.get<const Array &>();
             res[i].resize(replicas.size());
             for (size_t j = 0; j != replicas.size(); ++j)
             {
@@ -135,7 +134,7 @@ std::vector<Strings> BackupSettings::Util::clusterHostIDsFromAST(const IAST & as
                     throw Exception(
                         ErrorCodes::CANNOT_PARSE_BACKUP_SETTINGS,
                         "Setting cluster_host_ids has wrong format, must be array of arrays of string literals");
-                res[i][j] = replica.safeGet<const String &>();
+                res[i][j] = replica.get<const String &>();
             }
         }
     }
diff --git a/src/Backups/BackupSettings.h b/src/Backups/BackupSettings.h
index 0abeb897db4..a6c4d5d7181 100644
--- a/src/Backups/BackupSettings.h
+++ b/src/Backups/BackupSettings.h
@@ -50,9 +50,6 @@ struct BackupSettings
     /// Whether base backup to S3 should inherit credentials from the BACKUP query.
     bool use_same_s3_credentials_for_base_backup = false;
 
-    /// Whether base backup archive should be unlocked using the same password as the incremental archive
-    bool use_same_password_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;
 
diff --git a/src/Backups/BackupsWorker.cpp b/src/Backups/BackupsWorker.cpp
index 0b93ae6d547..15a7d7c1eca 100644
--- a/src/Backups/BackupsWorker.cpp
+++ b/src/Backups/BackupsWorker.cpp
@@ -384,7 +384,6 @@ BackupsWorker::BackupsWorker(ContextMutablePtr global_context, size_t num_backup
     , 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_randomize_order(global_context->getConfigRef().getBool("backups.test_randomize_order", false))
     , test_inject_sleep(global_context->getConfigRef().getBool("backups.test_inject_sleep", false))
     , log(getLogger("BackupsWorker"))
     , backup_log(global_context->getBackupLog())
@@ -602,7 +601,6 @@ void BackupsWorker::doBackup(
     backup_create_params.allow_s3_native_copy = backup_settings.allow_s3_native_copy;
     backup_create_params.allow_azure_native_copy = backup_settings.allow_azure_native_copy;
     backup_create_params.use_same_s3_credentials_for_base_backup = backup_settings.use_same_s3_credentials_for_base_backup;
-    backup_create_params.use_same_password_for_base_backup = backup_settings.use_same_password_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);
@@ -715,25 +713,14 @@ void BackupsWorker::writeBackupEntries(
     bool always_single_threaded = !backup->supportsWritingInMultipleThreads();
     auto & thread_pool = getThreadPool(ThreadPoolId::BACKUP_COPY_FILES);
 
-    std::vector<size_t> writing_order;
-    if (test_randomize_order)
-    {
-        /// Randomize the order in which we write backup entries to the backup.
-        writing_order.resize(backup_entries.size());
-        std::iota(writing_order.begin(), writing_order.end(), 0);
-        std::shuffle(writing_order.begin(), writing_order.end(), thread_local_rng);
-    }
-
     ThreadPoolCallbackRunnerLocal<void> runner(thread_pool, "BackupWorker");
     for (size_t i = 0; i != backup_entries.size(); ++i)
     {
         if (failed)
             break;
 
-        size_t index = !writing_order.empty() ? writing_order[i] : i;
-
-        auto & entry = backup_entries[index].second;
-        const auto & file_info = file_infos[index];
+        auto & entry = backup_entries[i].second;
+        const auto & file_info = file_infos[i];
 
         auto job = [&]()
         {
@@ -925,7 +912,6 @@ void BackupsWorker::doRestore(
     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.use_same_password_for_base_backup = restore_settings.use_same_password_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;
diff --git a/src/Backups/BackupsWorker.h b/src/Backups/BackupsWorker.h
index 946562b575f..e7ace91dace 100644
--- a/src/Backups/BackupsWorker.h
+++ b/src/Backups/BackupsWorker.h
@@ -119,7 +119,6 @@ private:
     const bool allow_concurrent_backups;
     const bool allow_concurrent_restores;
     const bool remove_backup_files_after_failure;
-    const bool test_randomize_order;
     const bool test_inject_sleep;
 
     LoggerPtr log;
diff --git a/src/Backups/DDLAdjustingForBackupVisitor.cpp b/src/Backups/DDLAdjustingForBackupVisitor.cpp
index 4dcbdcc1617..910831195a3 100644
--- a/src/Backups/DDLAdjustingForBackupVisitor.cpp
+++ b/src/Backups/DDLAdjustingForBackupVisitor.cpp
@@ -46,8 +46,8 @@ namespace
         if (zookeeper_path_ast && (zookeeper_path_ast->value.getType() == Field::Types::String) &&
             replica_name_ast && (replica_name_ast->value.getType() == Field::Types::String))
         {
-            String & zookeeper_path_arg = zookeeper_path_ast->value.safeGet<String>();
-            String & replica_name_arg = replica_name_ast->value.safeGet<String>();
+            String & zookeeper_path_arg = zookeeper_path_ast->value.get<String>();
+            String & replica_name_arg = replica_name_ast->value.get<String>();
             if (create.uuid != UUIDHelpers::Nil)
             {
                 String table_uuid_str = toString(create.uuid);
diff --git a/src/Backups/RestoreCoordinationRemote.cpp b/src/Backups/RestoreCoordinationRemote.cpp
index 0a69bc0eafb..44214d00be5 100644
--- a/src/Backups/RestoreCoordinationRemote.cpp
+++ b/src/Backups/RestoreCoordinationRemote.cpp
@@ -323,7 +323,7 @@ bool RestoreCoordinationRemote::hasConcurrentRestores(const std::atomic<size_t>
         return false;
 
     bool result = false;
-    std::string path = zookeeper_path + "/stage";
+    std::string path = zookeeper_path +"/stage";
 
     auto holder = with_retries.createRetriesControlHolder("createRootNodes");
     holder.retries_ctl.retryLoop(
diff --git a/src/Backups/RestoreCoordinationRemote.h b/src/Backups/RestoreCoordinationRemote.h
index a3d57e9a4d0..9c299865cfa 100644
--- a/src/Backups/RestoreCoordinationRemote.h
+++ b/src/Backups/RestoreCoordinationRemote.h
@@ -61,6 +61,8 @@ private:
     void createRootNodes();
     void removeAllNodes();
 
+    class ReplicatedDatabasesMetadataSync;
+
     /// get_zookeeper will provide a zookeeper client without any fault injection
     const zkutil::GetZooKeeper get_zookeeper;
     const String root_zookeeper_path;
diff --git a/src/Backups/RestoreSettings.cpp b/src/Backups/RestoreSettings.cpp
index 8e60e8d129e..7bbfd9ed751 100644
--- a/src/Backups/RestoreSettings.cpp
+++ b/src/Backups/RestoreSettings.cpp
@@ -31,7 +31,7 @@ namespace
         {
             if (field.getType() == Field::Types::String)
             {
-                const String & str = field.safeGet<const String &>();
+                const String & str = field.get<const String &>();
                 if (str == "1" || boost::iequals(str, "true") || boost::iequals(str, "create"))
                 {
                     value = RestoreTableCreationMode::kCreate;
@@ -54,7 +54,7 @@ namespace
 
             if (field.getType() == Field::Types::UInt64)
             {
-                UInt64 number = field.safeGet<UInt64>();
+                UInt64 number = field.get<UInt64>();
                 if (number == 1)
                 {
                     value = RestoreTableCreationMode::kCreate;
@@ -95,7 +95,7 @@ namespace
         {
             if (field.getType() == Field::Types::String)
             {
-                const String & str = field.safeGet<const String &>();
+                const String & str = field.get<const String &>();
                 if (str == "1" || boost::iequals(str, "true") || boost::iequals(str, "create"))
                 {
                     value = RestoreAccessCreationMode::kCreate;
@@ -118,7 +118,7 @@ namespace
 
             if (field.getType() == Field::Types::UInt64)
             {
-                UInt64 number = field.safeGet<UInt64>();
+                UInt64 number = field.get<UInt64>();
                 if (number == 1)
                 {
                     value = RestoreAccessCreationMode::kCreate;
@@ -164,7 +164,6 @@ namespace
     M(RestoreUDFCreationMode, create_function) \
     M(Bool, allow_s3_native_copy) \
     M(Bool, use_same_s3_credentials_for_base_backup) \
-    M(Bool, use_same_password_for_base_backup) \
     M(Bool, restore_broken_parts_as_detached) \
     M(Bool, internal) \
     M(String, host_id) \
diff --git a/src/Backups/RestoreSettings.h b/src/Backups/RestoreSettings.h
index fe07a0a7208..06ecbc80aef 100644
--- a/src/Backups/RestoreSettings.h
+++ b/src/Backups/RestoreSettings.h
@@ -113,9 +113,6 @@ struct RestoreSettings
     /// Whether base backup from S3 should inherit credentials from the RESTORE query.
     bool use_same_s3_credentials_for_base_backup = false;
 
-    /// Whether base backup archive should be unlocked using the same password as the incremental archive
-    bool use_same_password_for_base_backup = false;
-
     /// If it's true RESTORE won't stop on broken parts while restoring, instead they will be restored as detached parts
     /// to the `detached` folder with names starting with `broken-from-backup'.
     bool restore_broken_parts_as_detached = false;
diff --git a/src/Backups/RestorerFromBackup.cpp b/src/Backups/RestorerFromBackup.cpp
index 5e6beec791d..3056f9fe421 100644
--- a/src/Backups/RestorerFromBackup.cpp
+++ b/src/Backups/RestorerFromBackup.cpp
@@ -222,19 +222,10 @@ void RestorerFromBackup::setStage(const String & new_stage, const String & messa
     if (restore_coordination)
     {
         restore_coordination->setStage(new_stage, message);
-
-        /// The initiator of a RESTORE ON CLUSTER query waits for other hosts to complete their work (see waitForStage(Stage::COMPLETED) in BackupsWorker::doRestore),
-        /// but other hosts shouldn't wait for each others' completion. (That's simply unnecessary and also
-        /// the initiator may start cleaning up (e.g. removing restore-coordination ZooKeeper nodes) once all other hosts are in Stage::COMPLETED.)
-        bool need_wait = (new_stage != Stage::COMPLETED);
-
-        if (need_wait)
-        {
-            if (new_stage == Stage::FINDING_TABLES_IN_BACKUP)
-                restore_coordination->waitForStage(new_stage, on_cluster_first_sync_timeout);
-            else
-                restore_coordination->waitForStage(new_stage);
-        }
+        if (new_stage == Stage::FINDING_TABLES_IN_BACKUP)
+            restore_coordination->waitForStage(new_stage, on_cluster_first_sync_timeout);
+        else
+            restore_coordination->waitForStage(new_stage);
     }
 }
 
@@ -913,15 +904,11 @@ void RestorerFromBackup::createTable(const QualifiedTableName & table_name)
             table_info.database = DatabaseCatalog::instance().getDatabase(table_name.database);
         DatabasePtr database = table_info.database;
 
-        auto query_context = Context::createCopy(context);
-        query_context->setSetting("database_replicated_allow_explicit_uuid", 3);
-        query_context->setSetting("database_replicated_allow_replicated_engine_arguments", 3);
-
         /// Execute CREATE TABLE query (we call IDatabase::createTableRestoredFromBackup() to allow the database to do some
         /// database-specific things).
         database->createTableRestoredFromBackup(
             create_table_query,
-            query_context,
+            context,
             restore_coordination,
             std::chrono::duration_cast<std::chrono::milliseconds>(create_table_timeout).count());
     }
diff --git a/src/Backups/SettingsFieldOptionalString.cpp b/src/Backups/SettingsFieldOptionalString.cpp
index 684407a533d..573fd1e052c 100644
--- a/src/Backups/SettingsFieldOptionalString.cpp
+++ b/src/Backups/SettingsFieldOptionalString.cpp
@@ -19,7 +19,7 @@ SettingFieldOptionalString::SettingFieldOptionalString(const Field & field)
 
     if (field.getType() == Field::Types::String)
     {
-        value = field.safeGet<const String &>();
+        value = field.get<const String &>();
         return;
     }
 
diff --git a/src/Backups/SettingsFieldOptionalUUID.cpp b/src/Backups/SettingsFieldOptionalUUID.cpp
index 0011f7f1073..3f14608b206 100644
--- a/src/Backups/SettingsFieldOptionalUUID.cpp
+++ b/src/Backups/SettingsFieldOptionalUUID.cpp
@@ -22,7 +22,7 @@ namespace ErrorCodes
 
         if (field.getType() == Field::Types::String)
         {
-            const String & str = field.safeGet<const String &>();
+            const String & str = field.get<const String &>();
             if (str.empty())
             {
                 value = std::nullopt;
diff --git a/src/Backups/WithRetries.cpp b/src/Backups/WithRetries.cpp
index 9f22085f5a9..181e6331ac9 100644
--- a/src/Backups/WithRetries.cpp
+++ b/src/Backups/WithRetries.cpp
@@ -68,19 +68,13 @@ const WithRetries::KeeperSettings & WithRetries::getKeeperSettings() const
 
 WithRetries::FaultyKeeper WithRetries::getFaultyZooKeeper() const
 {
-    zkutil::ZooKeeperPtr current_zookeeper;
-    {
-        std::lock_guard lock(zookeeper_mutex);
-        current_zookeeper = zookeeper;
-    }
-
-    /// We need to create new instance of ZooKeeperWithFaultInjection each time and copy a pointer to ZooKeeper client there
+    /// We need to create new instance of ZooKeeperWithFaultInjection each time a copy a pointer to ZooKeeper client there
     /// The reason is that ZooKeeperWithFaultInjection may reset the underlying pointer and there could be a race condition
     /// when the same object is used from multiple threads.
     auto faulty_zookeeper = ZooKeeperWithFaultInjection::createInstance(
         settings.keeper_fault_injection_probability,
         settings.keeper_fault_injection_seed,
-        current_zookeeper,
+        zookeeper,
         log->name(),
         log);
 
diff --git a/src/Backups/registerBackupEngineAzureBlobStorage.cpp b/src/Backups/registerBackupEngineAzureBlobStorage.cpp
index 45f0386375a..626df99b00c 100644
--- a/src/Backups/registerBackupEngineAzureBlobStorage.cpp
+++ b/src/Backups/registerBackupEngineAzureBlobStorage.cpp
@@ -141,8 +141,7 @@ void registerBackupEngineAzureBlobStorage(BackupFactory & factory)
                 reader,
                 params.context,
                 params.is_internal_backup,
-                /* use_same_s3_credentials_for_base_backup*/ false,
-                params.use_same_password_for_base_backup);
+                /* use_same_s3_credentials_for_base_backup*/ false);
         }
         else
         {
@@ -165,8 +164,7 @@ void registerBackupEngineAzureBlobStorage(BackupFactory & factory)
                 params.backup_coordination,
                 params.backup_uuid,
                 params.deduplicate_files,
-                /* use_same_s3_credentials_for_base_backup */ false,
-                params.use_same_password_for_base_backup);
+                /* use_same_s3_credentials_for_base_backup */ false);
         }
 #else
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "AzureBlobStorage support is disabled");
diff --git a/src/Backups/registerBackupEngineS3.cpp b/src/Backups/registerBackupEngineS3.cpp
index 79e3e945557..59ed9506af0 100644
--- a/src/Backups/registerBackupEngineS3.cpp
+++ b/src/Backups/registerBackupEngineS3.cpp
@@ -120,8 +120,7 @@ void registerBackupEngineS3(BackupFactory & factory)
                 reader,
                 params.context,
                 params.is_internal_backup,
-                params.use_same_s3_credentials_for_base_backup,
-                params.use_same_password_for_base_backup);
+                params.use_same_s3_credentials_for_base_backup);
         }
         else
         {
@@ -145,8 +144,7 @@ void registerBackupEngineS3(BackupFactory & factory)
                 params.backup_coordination,
                 params.backup_uuid,
                 params.deduplicate_files,
-                params.use_same_s3_credentials_for_base_backup,
-                params.use_same_password_for_base_backup);
+                params.use_same_s3_credentials_for_base_backup);
         }
 #else
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "S3 support is disabled");
diff --git a/src/Backups/registerBackupEnginesFileAndDisk.cpp b/src/Backups/registerBackupEnginesFileAndDisk.cpp
index c486f79a77a..35263d39cba 100644
--- a/src/Backups/registerBackupEnginesFileAndDisk.cpp
+++ b/src/Backups/registerBackupEnginesFileAndDisk.cpp
@@ -178,8 +178,7 @@ void registerBackupEnginesFileAndDisk(BackupFactory & factory)
                 reader,
                 params.context,
                 params.is_internal_backup,
-                params.use_same_s3_credentials_for_base_backup,
-                params.use_same_password_for_base_backup);
+                params.use_same_s3_credentials_for_base_backup);
         }
         else
         {
@@ -198,8 +197,7 @@ void registerBackupEnginesFileAndDisk(BackupFactory & factory)
                 params.backup_coordination,
                 params.backup_uuid,
                 params.deduplicate_files,
-                params.use_same_s3_credentials_for_base_backup,
-                params.use_same_password_for_base_backup);
+                params.use_same_s3_credentials_for_base_backup);
         }
     };
 
diff --git a/src/Bridge/IBridge.cpp b/src/Bridge/IBridge.cpp
index 5682a28f899..de48a4f2b84 100644
--- a/src/Bridge/IBridge.cpp
+++ b/src/Bridge/IBridge.cpp
@@ -232,7 +232,7 @@ int IBridge::main(const std::vector<std::string> & /*args*/)
     auto context = Context::createGlobal(shared_context.get());
     context->makeGlobalContext();
 
-    auto settings = context->getSettingsCopy();
+    auto settings = context->getSettings();
     settings.set("http_max_field_value_size", http_max_field_value_size);
     context->setSettings(settings);
 
diff --git a/src/BridgeHelper/XDBCBridgeHelper.h b/src/BridgeHelper/XDBCBridgeHelper.h
index 0630a0f24e3..5f4c7fd8381 100644
--- a/src/BridgeHelper/XDBCBridgeHelper.h
+++ b/src/BridgeHelper/XDBCBridgeHelper.h
@@ -100,7 +100,6 @@ protected:
             auto buf = BuilderRWBufferFromHTTP(getPingURI())
                            .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
                            .withTimeouts(getHTTPTimeouts())
-                           .withSettings(getContext()->getReadSettings())
                            .create(credentials);
 
             return checkString(PING_OK_ANSWER, *buf);
@@ -207,7 +206,6 @@ protected:
                            .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
                            .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
                            .withTimeouts(getHTTPTimeouts())
-                           .withSettings(getContext()->getReadSettings())
                            .create(credentials);
 
             bool res = false;
@@ -234,7 +232,6 @@ protected:
                            .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
                            .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
                            .withTimeouts(getHTTPTimeouts())
-                           .withSettings(getContext()->getReadSettings())
                            .create(credentials);
 
             std::string character;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f0410eee9fe..dac20aaca48 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_compile_options("$<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:${COVERAGE_FLAGS}>")
+add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:${COVERAGE_FLAGS}>)
 
 if (USE_INCLUDE_WHAT_YOU_USE)
     set (CMAKE_CXX_INCLUDE_WHAT_YOU_USE ${IWYU_PATH})
@@ -78,7 +78,6 @@ 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/Protobuf)
 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)
@@ -111,7 +110,6 @@ add_headers_and_sources(dbms Storages/ObjectStorage)
 add_headers_and_sources(dbms Storages/ObjectStorage/Azure)
 add_headers_and_sources(dbms Storages/ObjectStorage/S3)
 add_headers_and_sources(dbms Storages/ObjectStorage/HDFS)
-add_headers_and_sources(dbms Storages/ObjectStorage/Local)
 add_headers_and_sources(dbms Storages/ObjectStorage/DataLakes)
 add_headers_and_sources(dbms Common/NamedCollections)
 
@@ -176,7 +174,7 @@ add_library (clickhouse_new_delete STATIC Common/new_delete.cpp)
 target_link_libraries (clickhouse_new_delete PRIVATE clickhouse_common_io)
 if (TARGET ch_contrib::jemalloc)
     target_link_libraries (clickhouse_new_delete PRIVATE ch_contrib::jemalloc)
-    target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::jemalloc)
+    target_link_libraries (clickhouse_common_io PRIVATE ch_contrib::jemalloc)
     target_link_libraries (clickhouse_storages_system PRIVATE ch_contrib::jemalloc)
 endif()
 
@@ -227,11 +225,7 @@ add_object_library(clickhouse_storages_liveview Storages/LiveView)
 add_object_library(clickhouse_storages_windowview Storages/WindowView)
 add_object_library(clickhouse_storages_s3queue Storages/ObjectStorageQueue)
 add_object_library(clickhouse_storages_materializedview Storages/MaterializedView)
-add_object_library(clickhouse_storages_time_series Storages/TimeSeries)
 add_object_library(clickhouse_client Client)
-# Always compile this file with the highest possible level of optimizations, even in Debug builds.
-# https://github.com/ClickHouse/ClickHouse/issues/65745
-set_source_files_properties(Client/ClientBaseOptimizedParts.cpp PROPERTIES COMPILE_FLAGS "-O3")
 add_object_library(clickhouse_bridge BridgeHelper)
 add_object_library(clickhouse_server Server)
 add_object_library(clickhouse_server_http Server/HTTP)
@@ -354,8 +348,8 @@ target_link_libraries(clickhouse_common_io
             Poco::Foundation
 )
 
-if (TARGET ch_contrib::libfiu)
-    target_link_libraries(clickhouse_common_io PUBLIC ch_contrib::libfiu)
+if (TARGET ch_contrib::fiu)
+    target_link_libraries(clickhouse_common_io PUBLIC ch_contrib::fiu)
 endif()
 
 if (TARGET ch_contrib::cpuid)
@@ -472,7 +466,6 @@ dbms_target_link_libraries (PUBLIC ch_contrib::sparsehash)
 
 if (TARGET ch_contrib::protobuf)
     dbms_target_link_libraries (PRIVATE ch_contrib::protobuf)
-    target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::protobuf)
 endif ()
 
 if (TARGET clickhouse_grpc_protos)
@@ -550,20 +543,21 @@ if (TARGET ch_contrib::libpqxx)
 endif()
 
 if (TARGET ch_contrib::datasketches)
-    dbms_target_link_libraries(PUBLIC ch_contrib::datasketches)
+    target_link_libraries (clickhouse_aggregate_functions PRIVATE ch_contrib::datasketches)
 endif ()
 
 target_link_libraries (clickhouse_common_io PRIVATE ch_contrib::lz4)
 
 if (TARGET ch_contrib::qpl)
     dbms_target_link_libraries(PUBLIC ch_contrib::qpl)
-    target_link_libraries (clickhouse_compression PUBLIC ch_contrib::qpl)
-    target_link_libraries (clickhouse_compression PUBLIC ch_contrib::accel-config)
 endif ()
 
-if (TARGET ch_contrib::accel-config AND TARGET ch_contrib::qatzstd_plugin)
-    dbms_target_link_libraries(PUBLIC ch_contrib::qatzstd_plugin)
+if (TARGET ch_contrib::accel-config)
     dbms_target_link_libraries(PUBLIC ch_contrib::accel-config)
+endif ()
+
+if (TARGET ch_contrib::qatzstd_plugin)
+    dbms_target_link_libraries(PUBLIC ch_contrib::qatzstd_plugin)
     target_link_libraries(clickhouse_common_io PUBLIC ch_contrib::qatzstd_plugin)
 endif ()
 
@@ -602,6 +596,10 @@ endif()
 
 dbms_target_link_libraries(PUBLIC ch_contrib::consistent_hashing)
 
+if (TARGET ch_contrib::annoy)
+    dbms_target_link_libraries(PUBLIC ch_contrib::annoy)
+endif()
+
 if (TARGET ch_contrib::usearch)
     dbms_target_link_libraries(PUBLIC ch_contrib::usearch)
 endif()
diff --git a/src/Client/ClientApplicationBase.cpp b/src/Client/ClientApplicationBase.cpp
deleted file mode 100644
index 0649aa5f5d7..00000000000
--- a/src/Client/ClientApplicationBase.cpp
+++ /dev/null
@@ -1,430 +0,0 @@
-#include <Client/ClientApplicationBase.h>
-
-#include <base/argsToConfig.h>
-#include <base/safeExit.h>
-#include <Core/BaseSettingsProgramOptions.h>
-#include <Common/clearPasswordFromCommandLine.h>
-#include <Common/TerminalSize.h>
-#include <Common/Exception.h>
-#include <Common/SignalHandlers.h>
-
-#include <Common/config_version.h>
-#include "config.h"
-
-#include <unordered_set>
-#include <string>
-#include <boost/algorithm/string/case_conv.hpp>
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/algorithm/string/split.hpp>
-
-using namespace std::literals;
-
-namespace CurrentMetrics
-{
-    extern const Metric MemoryTracking;
-}
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-    extern const int CANNOT_SET_SIGNAL_HANDLER;
-}
-
-static ClientInfo::QueryKind parseQueryKind(const String & query_kind)
-{
-    if (query_kind == "initial_query")
-        return ClientInfo::QueryKind::INITIAL_QUERY;
-    if (query_kind == "secondary_query")
-        return ClientInfo::QueryKind::SECONDARY_QUERY;
-    if (query_kind == "no_query")
-        return ClientInfo::QueryKind::NO_QUERY;
-    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown query kind {}", query_kind);
-}
-
-/// This signal handler is set only for SIGINT and SIGQUIT.
-void interruptSignalHandler(int signum)
-{
-    /// Signal handler might be called even before the setup is fully finished
-    /// and client application started to process the query.
-    /// Because of that we have to manually check it.
-    if (auto * instance = ClientApplicationBase::instanceRawPtr(); instance)
-        if (auto * base = dynamic_cast<ClientApplicationBase *>(instance); base)
-            if (base->tryStopQuery())
-                safeExit(128 + signum);
-}
-
-ClientApplicationBase::~ClientApplicationBase()
-{
-    try
-    {
-        writeSignalIDtoSignalPipe(SignalListener::StopThread);
-        signal_listener_thread.join();
-        HandledSignals::instance().reset();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-    }
-}
-
-ClientApplicationBase::ClientApplicationBase() : ClientBase(STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO, std::cin, std::cout, std::cerr) {}
-
-ClientApplicationBase & ClientApplicationBase::getInstance()
-{
-    return dynamic_cast<ClientApplicationBase&>(Poco::Util::Application::instance());
-}
-
-void ClientApplicationBase::setupSignalHandler()
-{
-    ClientApplicationBase::getInstance().stopQuery();
-
-    struct sigaction new_act;
-    memset(&new_act, 0, sizeof(new_act));
-
-    new_act.sa_handler = interruptSignalHandler;
-    new_act.sa_flags = 0;
-
-#if defined(OS_DARWIN)
-    sigemptyset(&new_act.sa_mask);
-#else
-    if (sigemptyset(&new_act.sa_mask))
-        throw ErrnoException(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler");
-#endif
-
-    if (sigaction(SIGINT, &new_act, nullptr))
-        throw ErrnoException(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler");
-
-    if (sigaction(SIGQUIT, &new_act, nullptr))
-        throw ErrnoException(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler");
-}
-
-void ClientApplicationBase::addMultiquery(std::string_view query, Arguments & common_arguments) const
-{
-    common_arguments.emplace_back("--multiquery");
-    common_arguments.emplace_back("-q");
-    common_arguments.emplace_back(query);
-}
-
-Poco::Util::LayeredConfiguration & ClientApplicationBase::getClientConfiguration()
-{
-    return config();
-}
-
-void ClientApplicationBase::init(int argc, char ** argv)
-{
-    namespace po = boost::program_options;
-
-    /// Don't parse options with Poco library, we prefer neat boost::program_options.
-    stopOptionsProcessing();
-
-    stdin_is_a_tty = isatty(STDIN_FILENO);
-    stdout_is_a_tty = isatty(STDOUT_FILENO);
-    stderr_is_a_tty = isatty(STDERR_FILENO);
-    terminal_width = getTerminalWidth();
-
-    std::vector<Arguments> external_tables_arguments;
-    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
-    /// Interpret Unicode dashes as default double-hyphen
-    for (auto & arg : common_arguments)
-    {
-        // replace em-dash(U+2014)
-        boost::replace_all(arg, "—", "--");
-        // replace en-dash(U+2013)
-        boost::replace_all(arg, "–", "--");
-        // replace mathematical minus(U+2212)
-        boost::replace_all(arg, "−", "--");
-    }
-
-
-    OptionsDescription options_description;
-    options_description.main_description.emplace(createOptionsDescription("Main options", terminal_width));
-
-    /// Common options for clickhouse-client and clickhouse-local.
-    options_description.main_description->add_options()
-        ("help", "print usage summary, combine with --verbose to display all options")
-        ("verbose", "print query and other debugging info")
-        ("version,V", "print version information and exit")
-        ("version-clean", "print version in machine-readable format and exit")
-
-        ("config-file,C", po::value<std::string>(), "config-file path")
-
-        ("proto_caps", po::value<std::string>(), "enable/disable chunked protocol: chunked_optional, notchunked, notchunked_optional, send_chunked, send_chunked_optional, send_notchunked, send_notchunked_optional, recv_chunked, recv_chunked_optional, recv_notchunked, recv_notchunked_optional")
-
-        ("query,q", po::value<std::vector<std::string>>()->multitoken(), R"(Query. Can be specified multiple times (--query "SELECT 1" --query "SELECT 2") or once with multiple comma-separated queries (--query "SELECT 1; SELECT 2;"). In the latter case, INSERT queries with non-VALUE format must be separated by empty lines.)")
-        ("queries-file", po::value<std::vector<std::string>>()->multitoken(), "file path with queries to execute; multiple files can be specified (--queries-file file1 file2...)")
-        ("multiquery,n", "Obsolete, does nothing")
-        ("multiline,m", "If specified, allow multiline queries (do not send the query on Enter)")
-        ("database,d", po::value<std::string>(), "database")
-        ("query_kind", po::value<std::string>()->default_value("initial_query"), "One of initial_query/secondary_query/no_query")
-        ("query_id", po::value<std::string>(), "query_id")
-
-        ("history_file", po::value<std::string>(), "path to history file")
-
-        ("stage", po::value<std::string>()->default_value("complete"), "Request query processing up to specified stage: complete,fetch_columns,with_mergeable_state,with_mergeable_state_after_aggregation,with_mergeable_state_after_aggregation_and_limit")
-        ("progress", po::value<ProgressOption>()->implicit_value(ProgressOption::TTY, "tty")->default_value(ProgressOption::DEFAULT, "default"), "Print progress of queries execution - to TTY: tty|on|1|true|yes; to STDERR non-interactive mode: err; OFF: off|0|false|no; DEFAULT - interactive to TTY, non-interactive is off")
-
-        ("disable_suggestion,A", "Disable loading suggestion data. Note that suggestion data is loaded asynchronously through a second connection to ClickHouse server. Also it is reasonable to disable suggestion if you want to paste a query with TAB characters. Shorthand option -A is for those who get used to mysql client.")
-        ("wait_for_suggestions_to_load", "Load suggestion data synchonously.")
-        ("time,t", "print query execution time to stderr in non-interactive mode (for benchmarks)")
-        ("memory-usage", po::value<std::string>()->implicit_value("default")->default_value("none"), "print memory usage to stderr in non-interactive mode (for benchmarks). Values: 'none', 'default', 'readable'")
-
-        ("echo", "in batch mode, print query before execution")
-
-        ("log-level", po::value<std::string>(), "log level")
-        ("server_logs_file", po::value<std::string>(), "put server logs into specified file")
-
-        ("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 (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")
-
-        ("ignore-error", "do not stop processing when an error occurs")
-        ("stacktrace", "print stack traces of exceptions")
-        ("hardware-utilization", "print hardware utilization information in progress bar")
-        ("print-profile-events", po::value(&profile_events.print)->zero_tokens(), "Printing ProfileEvents packets")
-        ("profile-events-delay-ms", po::value<UInt64>()->default_value(profile_events.delay_ms), "Delay between printing `ProfileEvents` packets (-1 - print only totals, 0 - print every single packet)")
-        ("processed-rows", "print the number of locally processed rows")
-
-        ("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")
-
-        ("client_logs_file", po::value<std::string>(), "Path to a file for writing client logs. Currently we only have fatal logs (when the client crashes)")
-    ;
-
-    addOptions(options_description);
-
-    OptionsDescription options_description_non_verbose = options_description;
-
-    auto getter = [](const auto & op)
-    {
-        String op_long_name = op->long_name();
-        return "--" + String(op_long_name);
-    };
-
-    if (options_description.main_description)
-    {
-        const auto & main_options = options_description.main_description->options();
-        std::transform(main_options.begin(), main_options.end(), std::back_inserter(cmd_options), getter);
-    }
-
-    if (options_description.external_description)
-    {
-        const auto & external_options = options_description.external_description->options();
-        std::transform(external_options.begin(), external_options.end(), std::back_inserter(cmd_options), getter);
-    }
-
-    po::variables_map options;
-    parseAndCheckOptions(options_description, options, common_arguments);
-    po::notify(options);
-
-    if (options.count("version") || options.count("V"))
-    {
-        showClientVersion();
-        exit(0); // NOLINT(concurrency-mt-unsafe)
-    }
-
-    if (options.count("version-clean"))
-    {
-        output_stream << VERSION_STRING;
-        exit(0); // NOLINT(concurrency-mt-unsafe)
-    }
-
-    if (options.count("verbose"))
-        getClientConfiguration().setBool("verbose", true);
-
-    /// Output of help message.
-    if (options.count("help")
-        || (options.count("host") && options["host"].as<std::string>() == "elp")) /// If user writes -help instead of --help.
-    {
-        if (getClientConfiguration().getBool("verbose", false))
-            printHelpMessage(options_description, true);
-        else
-            printHelpMessage(options_description_non_verbose, false);
-        exit(0); // NOLINT(concurrency-mt-unsafe)
-    }
-
-    /// Common options for clickhouse-client and clickhouse-local.
-
-    /// Output execution time to stderr in batch mode.
-    if (options.count("time"))
-        getClientConfiguration().setBool("print-time-to-stderr", true);
-    if (options.count("memory-usage"))
-    {
-        const auto & memory_usage_mode = options["memory-usage"].as<std::string>();
-        if (memory_usage_mode != "none" && memory_usage_mode != "default" && memory_usage_mode != "readable")
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown memory-usage mode: {}", memory_usage_mode);
-        getClientConfiguration().setString("print-memory-to-stderr", memory_usage_mode);
-    }
-
-    if (options.count("query"))
-        queries = options["query"].as<std::vector<std::string>>();
-    if (options.count("query_id"))
-        getClientConfiguration().setString("query_id", options["query_id"].as<std::string>());
-    if (options.count("database"))
-        getClientConfiguration().setString("database", options["database"].as<std::string>());
-    if (options.count("config-file"))
-        getClientConfiguration().setString("config-file", options["config-file"].as<std::string>());
-    if (options.count("queries-file"))
-        queries_files = options["queries-file"].as<std::vector<std::string>>();
-    if (options.count("multiline"))
-        getClientConfiguration().setBool("multiline", true);
-    if (options.count("ignore-error"))
-        getClientConfiguration().setBool("ignore-error", true);
-    if (options.count("format"))
-        getClientConfiguration().setString("format", options["format"].as<std::string>());
-    if (options.count("output-format"))
-        getClientConfiguration().setString("output-format", options["output-format"].as<std::string>());
-    if (options.count("vertical"))
-        getClientConfiguration().setBool("vertical", true);
-    if (options.count("stacktrace"))
-        getClientConfiguration().setBool("stacktrace", true);
-    if (options.count("print-profile-events"))
-        getClientConfiguration().setBool("print-profile-events", true);
-    if (options.count("profile-events-delay-ms"))
-        getClientConfiguration().setUInt64("profile-events-delay-ms", options["profile-events-delay-ms"].as<UInt64>());
-    /// Whether to print the number of processed rows at
-    if (options.count("processed-rows"))
-        getClientConfiguration().setBool("print-num-processed-rows", true);
-    if (options.count("progress"))
-    {
-        switch (options["progress"].as<ProgressOption>())
-        {
-            case DEFAULT:
-                getClientConfiguration().setString("progress", "default");
-                break;
-            case OFF:
-                getClientConfiguration().setString("progress", "off");
-                break;
-            case TTY:
-                getClientConfiguration().setString("progress", "tty");
-                break;
-            case ERR:
-                getClientConfiguration().setString("progress", "err");
-                break;
-        }
-    }
-    if (options.count("echo"))
-        getClientConfiguration().setBool("echo", true);
-    if (options.count("disable_suggestion"))
-        getClientConfiguration().setBool("disable_suggestion", true);
-    if (options.count("wait_for_suggestions_to_load"))
-        getClientConfiguration().setBool("wait_for_suggestions_to_load", true);
-    if (options.count("suggestion_limit"))
-        getClientConfiguration().setInt("suggestion_limit", options["suggestion_limit"].as<int>());
-    if (options.count("highlight"))
-        getClientConfiguration().setBool("highlight", options["highlight"].as<bool>());
-    if (options.count("history_file"))
-        getClientConfiguration().setString("history_file", options["history_file"].as<std::string>());
-    if (options.count("interactive"))
-        getClientConfiguration().setBool("interactive", true);
-    if (options.count("pager"))
-        getClientConfiguration().setString("pager", options["pager"].as<std::string>());
-
-    if (options.count("log-level"))
-        Poco::Logger::root().setLevel(options["log-level"].as<std::string>());
-    if (options.count("server_logs_file"))
-        server_logs_file = options["server_logs_file"].as<std::string>();
-
-    if (options.count("proto_caps"))
-    {
-        std::string proto_caps_str = options["proto_caps"].as<std::string>();
-
-        std::vector<std::string_view> proto_caps;
-        splitInto<','>(proto_caps, proto_caps_str);
-
-        for (auto cap_str : proto_caps)
-        {
-            std::string direction;
-
-            if (cap_str.starts_with("send_"))
-            {
-                direction = "send";
-                cap_str = cap_str.substr(std::string_view("send_").size());
-            }
-            else if (cap_str.starts_with("recv_"))
-            {
-                direction = "recv";
-                cap_str = cap_str.substr(std::string_view("recv_").size());
-            }
-
-            if (cap_str != "chunked" && cap_str != "notchunked" && cap_str != "chunked_optional" && cap_str != "notchunked_optional")
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "proto_caps option is incorrect ({})", proto_caps_str);
-
-            if (direction.empty())
-            {
-                config().setString("proto_caps.send", std::string(cap_str));
-                config().setString("proto_caps.recv", std::string(cap_str));
-            }
-            else
-                config().setString("proto_caps." + direction, std::string(cap_str));
-        }
-    }
-
-    query_processing_stage = QueryProcessingStage::fromString(options["stage"].as<std::string>());
-    query_kind = parseQueryKind(options["query_kind"].as<std::string>());
-    profile_events.print = options.count("print-profile-events");
-    profile_events.delay_ms = options["profile-events-delay-ms"].as<UInt64>();
-
-    processOptions(options_description, options, external_tables_arguments, hosts_and_ports_arguments);
-    {
-        std::unordered_set<std::string> alias_names;
-        alias_names.reserve(options_description.main_description->options().size());
-        for (const auto& option : options_description.main_description->options())
-            alias_names.insert(option->long_name());
-        argsToConfig(common_arguments, getClientConfiguration(), 100, &alias_names);
-    }
-
-    clearPasswordFromCommandLine(argc, argv);
-
-    /// Limit on total memory usage
-    std::string max_client_memory_usage = getClientConfiguration().getString("max_memory_usage_in_client", "0" /*default value*/);
-    if (max_client_memory_usage != "0")
-    {
-        UInt64 max_client_memory_usage_int = parseWithSizeSuffix<UInt64>(max_client_memory_usage.c_str(), max_client_memory_usage.length());
-
-        total_memory_tracker.setHardLimit(max_client_memory_usage_int);
-        total_memory_tracker.setDescription("(total)");
-        total_memory_tracker.setMetric(CurrentMetrics::MemoryTracking);
-    }
-
-    /// Print stacktrace in case of crash
-    HandledSignals::instance().setupTerminateHandler();
-    HandledSignals::instance().setupCommonDeadlySignalHandlers();
-    /// We don't setup signal handlers for SIGINT, SIGQUIT, SIGTERM because we don't
-    /// have an option for client to shutdown gracefully.
-
-    fatal_channel_ptr = new Poco::SplitterChannel;
-    fatal_console_channel_ptr = new Poco::ConsoleChannel;
-    fatal_channel_ptr->addChannel(fatal_console_channel_ptr);
-    if (options.count("client_logs_file"))
-    {
-        fatal_file_channel_ptr = new Poco::SimpleFileChannel(options["client_logs_file"].as<std::string>());
-        fatal_channel_ptr->addChannel(fatal_file_channel_ptr);
-    }
-
-    fatal_log = createLogger("ClientBase", fatal_channel_ptr.get(), Poco::Message::PRIO_FATAL);
-    signal_listener = std::make_unique<SignalListener>(nullptr, fatal_log);
-    signal_listener_thread.start(*signal_listener);
-
-#if USE_GWP_ASAN
-    GWPAsan::initFinished();
-#endif
-
-}
-
-
-}
diff --git a/src/Client/ClientApplicationBase.h b/src/Client/ClientApplicationBase.h
deleted file mode 100644
index 3663271dd25..00000000000
--- a/src/Client/ClientApplicationBase.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#pragma once
-
-
-#include <Poco/Util/Application.h>
-#include <Client/ClientBase.h>
-#include <Client/Suggest.h>
-#include <Common/NamePrompter.h>
-#include <Poco/ConsoleChannel.h>
-#include <Poco/SimpleFileChannel.h>
-#include <Poco/SplitterChannel.h>
-
-#include <boost/program_options.hpp>
-
-#include <vector>
-
-namespace po = boost::program_options;
-
-namespace DB
-{
-
-void interruptSignalHandler(int signum);
-
-/**
- * The base class for client appliucations such as
- * clickhouse-client or clickhouse-local.
- * The main purpose and responsibility of it is dealing with
- * application-specific stuff such as command line arguments parsing
- * and setting up signal handlers, so queries will be cancelled after
- * Ctrl+C is pressed.
- */
-class ClientApplicationBase : public ClientBase, public Poco::Util::Application, public IHints<2>
-{
-public:
-    using ClientBase::processOptions;
-    using Arguments = ClientBase::Arguments;
-
-    static ClientApplicationBase & getInstance();
-
-    ClientApplicationBase();
-    ~ClientApplicationBase() override;
-
-    void init(int argc, char ** argv);
-    std::vector<String> getAllRegisteredNames() const override { return cmd_options; }
-
-protected:
-    Poco::Util::LayeredConfiguration & getClientConfiguration() override;
-    void setupSignalHandler() override;
-    void addMultiquery(std::string_view query, Arguments & common_arguments) const;
-
-private:
-    void parseAndCheckOptions(OptionsDescription & options_description, po::variables_map & options, Arguments & arguments);
-
-    std::vector<String> cmd_options;
-
-    LoggerPtr fatal_log;
-    Poco::AutoPtr<Poco::SplitterChannel> fatal_channel_ptr;
-    Poco::AutoPtr<Poco::Channel> fatal_console_channel_ptr;
-    Poco::AutoPtr<Poco::Channel> fatal_file_channel_ptr;
-    Poco::Thread signal_listener_thread;
-    std::unique_ptr<Poco::Runnable> signal_listener;
-};
-
-
-}
diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index 717a9bbe95a..7af199131b6 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -5,6 +5,7 @@
 #include <Client/InternalTextLogs.h>
 #include <Client/TestTags.h>
 
+#include <base/argsToConfig.h>
 #include <base/safeExit.h>
 #include <Core/Block.h>
 #include <Core/BaseSettingsProgramOptions.h>
@@ -16,6 +17,7 @@
 #include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Common/typeid_cast.h>
 #include <Common/TerminalSize.h>
+#include <Common/clearPasswordFromCommandLine.h>
 #include <Common/StringUtils.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/NetException.h>
@@ -34,7 +36,6 @@
 #include <Parsers/Access/ASTCreateUserQuery.h>
 #include <Parsers/Access/ASTAuthenticationData.h>
 #include <Parsers/ASTDropQuery.h>
-#include <Parsers/ASTExplainQuery.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTUseQuery.h>
@@ -69,19 +70,16 @@
 
 #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>
 #include <map>
 #include <memory>
-#include <string_view>
 #include <unordered_map>
 
 #include <Common/config_version.h>
-#include <base/find_symbols.h>
 #include "config.h"
-#include <IO/ReadHelpers.h>
-#include <Processors/Formats/Impl/ValuesBlockInputFormat.h>
 
 #if USE_GWP_ASAN
 #    include <Common/GWPAsan.h>
@@ -91,6 +89,12 @@
 namespace fs = std::filesystem;
 using namespace std::literals;
 
+
+namespace CurrentMetrics
+{
+    extern const Metric MemoryTracking;
+}
+
 namespace DB
 {
 
@@ -104,6 +108,7 @@ namespace ErrorCodes
     extern const int UNEXPECTED_PACKET_FROM_SERVER;
     extern const int INVALID_USAGE_OF_INPUT;
     extern const int CANNOT_SET_SIGNAL_HANDLER;
+    extern const int UNRECOGNIZED_ARGUMENTS;
     extern const int LOGICAL_ERROR;
     extern const int CANNOT_OPEN_FILE;
     extern const int FILE_ALREADY_EXISTS;
@@ -153,6 +158,17 @@ std::istream& operator>> (std::istream & in, ProgressOption & progress)
     return in;
 }
 
+static ClientInfo::QueryKind parseQueryKind(const String & query_kind)
+{
+    if (query_kind == "initial_query")
+        return ClientInfo::QueryKind::INITIAL_QUERY;
+    if (query_kind == "secondary_query")
+        return ClientInfo::QueryKind::SECONDARY_QUERY;
+    if (query_kind == "no_query")
+        return ClientInfo::QueryKind::NO_QUERY;
+    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown query kind {}", query_kind);
+}
+
 static void incrementProfileEventsBlock(Block & dst, const Block & src)
 {
     if (!dst)
@@ -253,6 +269,36 @@ static void incrementProfileEventsBlock(Block & dst, const Block & src)
     dst.setColumns(std::move(mutable_columns));
 }
 
+
+std::atomic<Int32> exit_after_signals = 0;
+
+class QueryInterruptHandler : private boost::noncopyable
+{
+public:
+    /// Store how much interrupt signals can be before stopping the query
+    /// by default stop after the first interrupt signal.
+    static void start(Int32 signals_before_stop = 1) { exit_after_signals.store(signals_before_stop); }
+
+    /// Set value not greater then 0 to mark the query as stopped.
+    static void stop() { exit_after_signals.store(0); }
+
+    /// Return true if the query was stopped.
+    /// Query was stopped if it received at least "signals_before_stop" interrupt signals.
+    static bool try_stop() { return exit_after_signals.fetch_sub(1) <= 0; }
+    static bool cancelled() { return exit_after_signals.load() <= 0; }
+
+    /// Return how much interrupt signals remain before stop.
+    static Int32 cancelled_status() { return exit_after_signals.load(); }
+};
+
+/// This signal handler is set for SIGINT and SIGQUIT.
+void interruptSignalHandler(int signum)
+{
+    if (QueryInterruptHandler::try_stop())
+        safeExit(128 + signum);
+}
+
+
 /// To cancel the query on local format error.
 class LocalFormatError : public DB::Exception
 {
@@ -261,7 +307,12 @@ public:
 };
 
 
-ClientBase::~ClientBase() = default;
+ClientBase::~ClientBase()
+{
+    writeSignalIDtoSignalPipe(SignalListener::StopThread);
+    signal_listener_thread.join();
+    HandledSignals::instance().reset();
+}
 
 ClientBase::ClientBase(
     int in_fd_,
@@ -287,6 +338,31 @@ ClientBase::ClientBase(
     terminal_width = getTerminalWidth(in_fd, err_fd);
 }
 
+void ClientBase::setupSignalHandler()
+{
+    QueryInterruptHandler::stop();
+
+    struct sigaction new_act;
+    memset(&new_act, 0, sizeof(new_act));
+
+    new_act.sa_handler = interruptSignalHandler;
+    new_act.sa_flags = 0;
+
+#if defined(OS_DARWIN)
+    sigemptyset(&new_act.sa_mask);
+#else
+    if (sigemptyset(&new_act.sa_mask))
+        throw ErrnoException(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler");
+#endif
+
+    if (sigaction(SIGINT, &new_act, nullptr))
+        throw ErrnoException(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler");
+
+    if (sigaction(SIGQUIT, &new_act, nullptr))
+        throw ErrnoException(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler");
+}
+
+
 ASTPtr ClientBase::parseQuery(const char *& pos, const char * end, const Settings & settings, bool allow_multi_statements)
 {
     std::unique_ptr<IParserBase> parser;
@@ -332,11 +408,7 @@ ASTPtr ClientBase::parseQuery(const char *& pos, const char * end, const Setting
     {
         output_stream << std::endl;
         WriteBufferFromOStream res_buf(output_stream, 4096);
-        IAST::FormatSettings format_settings(res_buf, /* one_line */ false);
-        format_settings.hilite = true;
-        format_settings.show_secrets = true;
-        format_settings.print_pretty_type_names = true;
-        res->format(format_settings);
+        formatAST(*res, res_buf);
         res_buf.finalize();
         output_stream << std::endl << std::endl;
     }
@@ -399,7 +471,7 @@ void ClientBase::sendExternalTables(ASTPtr parsed_query)
 
     std::vector<ExternalTableDataPtr> data;
     for (auto & table : external_tables)
-        data.emplace_back(table.getData(client_context));
+        data.emplace_back(table.getData(global_context));
 
     connection->sendExternalTablesData(data);
 }
@@ -484,8 +556,6 @@ void ClientBase::onProfileInfo(const ProfileInfo & profile_info)
 {
     if (profile_info.hasAppliedLimit() && output_format)
         output_format->setRowsBeforeLimit(profile_info.getRowsBeforeLimit());
-    if (profile_info.hasAppliedAggregation() && output_format)
-        output_format->setRowsBeforeAggregation(profile_info.getRowsBeforeAggregation());
 }
 
 
@@ -614,10 +684,10 @@ try
         /// intermixed with data with parallel formatting.
         /// It may increase code complexity significantly.
         if (!extras_into_stdout || select_only_into_file)
-            output_format = client_context->getOutputFormatParallelIfPossible(
+            output_format = global_context->getOutputFormatParallelIfPossible(
                 current_format, out_file_buf ? *out_file_buf : *out_buf, block);
         else
-            output_format = client_context->getOutputFormat(
+            output_format = global_context->getOutputFormat(
                 current_format, out_file_buf ? *out_file_buf : *out_buf, block);
 
         output_format->setAutoFlush();
@@ -665,10 +735,18 @@ void ClientBase::initLogsOutputStream()
 
 void ClientBase::adjustSettings()
 {
-    Settings settings = global_context->getSettingsCopy();
+    Settings settings = global_context->getSettings();
 
     /// NOTE: Do not forget to set changed=false to avoid sending it to the server (to avoid breakage read only profiles)
 
+    /// In case of multi-query we allow data after semicolon since it will be
+    /// parsed by the client and interpreted as new query
+    if (is_multiquery && !global_context->getSettingsRef().input_format_values_allow_data_after_semicolon.changed)
+    {
+        settings.input_format_values_allow_data_after_semicolon = true;
+        settings.input_format_values_allow_data_after_semicolon.changed = false;
+    }
+
     /// Do not limit pretty format output in case of --pager specified or in case of stdout is not a tty.
     if (!pager.empty() || !stdout_is_a_tty)
     {
@@ -688,15 +766,6 @@ void ClientBase::adjustSettings()
     global_context->setSettings(settings);
 }
 
-void ClientBase::initClientContext()
-{
-    client_context->setClientName(std::string(DEFAULT_CLIENT_NAME));
-    client_context->setQuotaClientKey(getClientConfiguration().getString("quota_key", ""));
-    client_context->setQueryKindInitial();
-    client_context->setQueryKind(query_kind);
-    client_context->setQueryParameters(query_parameters);
-}
-
 bool ClientBase::isRegularFile(int fd)
 {
     struct stat file_stat;
@@ -874,7 +943,7 @@ bool ClientBase::isSyncInsertWithData(const ASTInsertQuery & insert_query, const
     if (!insert_query.data)
         return false;
 
-    auto settings = context->getSettingsCopy();
+    auto settings = context->getSettings();
     if (insert_query.settings_ast)
         settings.applyChanges(insert_query.settings_ast->as<ASTSetQuery>()->changes);
 
@@ -887,7 +956,7 @@ void ClientBase::processTextAsSingleQuery(const String & full_query)
     /// client-side. Thus we need to parse the query.
     const char * begin = full_query.data();
     auto parsed_query = parseQuery(begin, begin + full_query.size(),
-        client_context->getSettingsRef(),
+        global_context->getSettingsRef(),
         /*allow_multi_statements=*/ false);
 
     if (!parsed_query)
@@ -910,7 +979,7 @@ void ClientBase::processTextAsSingleQuery(const String & full_query)
     /// But for asynchronous inserts we don't extract data, because it's needed
     /// to be done on server side in that case (for coalescing the data from multiple inserts on server side).
     const auto * insert = parsed_query->as<ASTInsertQuery>();
-    if (insert && isSyncInsertWithData(*insert, client_context))
+    if (insert && isSyncInsertWithData(*insert, global_context))
         query_to_execute = full_query.substr(0, insert->data - full_query.data());
     else
         query_to_execute = full_query;
@@ -921,8 +990,6 @@ void ClientBase::processTextAsSingleQuery(const String & full_query)
     }
     catch (Exception & e)
     {
-        if (server_exception)
-            server_exception->rethrow();
         if (!is_interactive)
             e.addMessage("(in query: {})", full_query);
         throw;
@@ -1030,7 +1097,7 @@ void ClientBase::processOrdinaryQuery(const String & query_to_execute, ASTPtr pa
         }
     }
 
-    const auto & settings = client_context->getSettingsRef();
+    const auto & settings = global_context->getSettingsRef();
     const Int32 signals_before_stop = settings.partial_result_on_first_cancel ? 2 : 1;
 
     int retries_left = 10;
@@ -1038,31 +1105,22 @@ void ClientBase::processOrdinaryQuery(const String & query_to_execute, ASTPtr pa
     {
         try
         {
-            query_interrupt_handler.start(signals_before_stop);
-            SCOPE_EXIT({ query_interrupt_handler.stop(); });
+            QueryInterruptHandler::start(signals_before_stop);
+            SCOPE_EXIT({ QueryInterruptHandler::stop(); });
 
-            try {
-                connection->sendQuery(
-                    connection_parameters.timeouts,
-                    query,
-                    query_parameters,
-                    client_context->getCurrentQueryId(),
-                    query_processing_stage,
-                    &client_context->getSettingsRef(),
-                    &client_context->getClientInfo(),
-                    true,
-                    [&](const Progress & progress) { onProgress(progress); });
-
-                if (send_external_tables)
-                    sendExternalTables(parsed_query);
-            }
-            catch (const NetException &)
-            {
-                // We still want to attempt to process whatever we already received or can receive (socket receive buffer can be not empty)
-                receiveResult(parsed_query, signals_before_stop, settings.partial_result_on_first_cancel);
-                throw;
-            }
+            connection->sendQuery(
+                connection_parameters.timeouts,
+                query,
+                query_parameters,
+                global_context->getCurrentQueryId(),
+                query_processing_stage,
+                &global_context->getSettingsRef(),
+                &global_context->getClientInfo(),
+                true,
+                [&](const Progress & progress) { onProgress(progress); });
 
+            if (send_external_tables)
+                sendExternalTables(parsed_query);
             receiveResult(parsed_query, signals_before_stop, settings.partial_result_on_first_cancel);
 
             break;
@@ -1112,13 +1170,13 @@ void ClientBase::receiveResult(ASTPtr parsed_query, Int32 signals_before_stop, b
             /// to avoid losing sync.
             if (!cancelled)
             {
-                if (partial_result_on_first_cancel && query_interrupt_handler.cancelled_status() == signals_before_stop - 1)
+                if (partial_result_on_first_cancel && QueryInterruptHandler::cancelled_status() == signals_before_stop - 1)
                 {
                     connection->sendCancel();
                     /// First cancel reading request was sent. Next requests will only be with a full cancel
                     partial_result_on_first_cancel = false;
                 }
-                else if (query_interrupt_handler.cancelled())
+                else if (QueryInterruptHandler::cancelled())
                 {
                     cancelQuery();
                 }
@@ -1244,7 +1302,7 @@ void ClientBase::onProgress(const Progress & value)
 
 void ClientBase::onTimezoneUpdate(const String & tz)
 {
-    client_context->setSetting("session_timezone", tz);
+    global_context->setSetting("session_timezone", tz);
 }
 
 
@@ -1440,18 +1498,25 @@ bool ClientBase::receiveSampleBlock(Block & out, ColumnsDescription & columns_de
 
 void ClientBase::setInsertionTable(const ASTInsertQuery & insert_query)
 {
-    if (!client_context->hasInsertionTable() && insert_query.table)
+    if (!global_context->hasInsertionTable() && insert_query.table)
     {
         String table = insert_query.table->as<ASTIdentifier &>().shortName();
         if (!table.empty())
         {
             String database = insert_query.database ? insert_query.database->as<ASTIdentifier &>().shortName() : "";
-            client_context->setInsertionTable(StorageID(database, table));
+            global_context->setInsertionTable(StorageID(database, table));
         }
     }
 }
 
 
+void ClientBase::addMultiquery(std::string_view query, Arguments & common_arguments) const
+{
+    common_arguments.emplace_back("--multiquery");
+    common_arguments.emplace_back("-q");
+    common_arguments.emplace_back(query);
+}
+
 namespace
 {
 bool isStdinNotEmptyAndValid(ReadBufferFromFileDescriptor & std_in)
@@ -1490,24 +1555,24 @@ void ClientBase::processInsertQuery(const String & query_to_execute, ASTPtr pars
     const auto & parsed_insert_query = parsed_query->as<ASTInsertQuery &>();
     if ((!parsed_insert_query.data && !parsed_insert_query.infile) && (is_interactive || (!stdin_is_a_tty && !isStdinNotEmptyAndValid(std_in))))
     {
-        const auto & settings = client_context->getSettingsRef();
+        const auto & settings = global_context->getSettingsRef();
         if (settings.throw_if_no_data_to_insert)
             throw Exception(ErrorCodes::NO_DATA_TO_INSERT, "No data to insert");
         else
             return;
     }
 
-    query_interrupt_handler.start();
-    SCOPE_EXIT({ query_interrupt_handler.stop(); });
+    QueryInterruptHandler::start();
+    SCOPE_EXIT({ QueryInterruptHandler::stop(); });
 
     connection->sendQuery(
         connection_parameters.timeouts,
         query,
         query_parameters,
-        client_context->getCurrentQueryId(),
+        global_context->getCurrentQueryId(),
         query_processing_stage,
-        &client_context->getSettingsRef(),
-        &client_context->getClientInfo(),
+        &global_context->getSettingsRef(),
+        &global_context->getClientInfo(),
         true,
         [&](const Progress & progress) { onProgress(progress); });
 
@@ -1555,7 +1620,7 @@ void ClientBase::sendData(Block & sample, const ColumnsDescription & columns_des
 
         /// Set callback to be called on file progress.
         if (tty_buf)
-            progress_indication.setFileProgressCallback(client_context, *tty_buf);
+            progress_indication.setFileProgressCallback(global_context, *tty_buf);
     }
 
     /// If data fetched from file (maybe compressed file)
@@ -1589,10 +1654,10 @@ void ClientBase::sendData(Block & sample, const ColumnsDescription & columns_des
         }
 
         StorageFile::CommonArguments args{
-            WithContext(client_context),
+            WithContext(global_context),
             parsed_insert_query->table_id,
             current_format,
-            getFormatSettings(client_context),
+            getFormatSettings(global_context),
             compression_method,
             columns_for_storage_file,
             ConstraintsDescription{},
@@ -1600,7 +1665,7 @@ void ClientBase::sendData(Block & sample, const ColumnsDescription & columns_des
             {},
             String{},
         };
-        StoragePtr storage = std::make_shared<StorageFile>(in_file, client_context->getUserFilesPath(), args);
+        StoragePtr storage = std::make_shared<StorageFile>(in_file, global_context->getUserFilesPath(), args);
         storage->startup();
         SelectQueryInfo query_info;
 
@@ -1611,16 +1676,16 @@ void ClientBase::sendData(Block & sample, const ColumnsDescription & columns_des
             storage->read(
                     plan,
                     sample.getNames(),
-                    storage->getStorageSnapshot(metadata, client_context),
+                    storage->getStorageSnapshot(metadata, global_context),
                     query_info,
-                    client_context,
+                    global_context,
                     {},
-                    client_context->getSettingsRef().max_block_size,
+                    global_context->getSettingsRef().max_block_size,
                     getNumberOfPhysicalCPUCores());
 
             auto builder = plan.buildQueryPipeline(
-                QueryPlanOptimizationSettings::fromContext(client_context),
-                BuildQueryPipelineSettings::fromContext(client_context));
+                QueryPlanOptimizationSettings::fromContext(global_context),
+                BuildQueryPipelineSettings::fromContext(global_context));
 
             QueryPlanResourceHolder resources;
             auto pipe = QueryPipelineBuilder::getPipe(std::move(*builder), resources);
@@ -1681,14 +1746,14 @@ void ClientBase::sendDataFrom(ReadBuffer & buf, Block & sample, const ColumnsDes
             current_format = insert->format;
     }
 
-    auto source = client_context->getInputFormat(current_format, buf, sample, insert_format_max_block_size);
+    auto source = global_context->getInputFormat(current_format, buf, sample, insert_format_max_block_size);
     Pipe pipe(source);
 
     if (columns_description.hasDefaults())
     {
         pipe.addSimpleTransform([&](const Block & header)
         {
-            return std::make_shared<AddingDefaultsTransform>(header, columns_description, *source, client_context);
+            return std::make_shared<AddingDefaultsTransform>(header, columns_description, *source, global_context);
         });
     }
 
@@ -1709,7 +1774,7 @@ try
     Block block;
     while (executor.pull(block))
     {
-        if (!cancelled && query_interrupt_handler.cancelled())
+        if (!cancelled && QueryInterruptHandler::cancelled())
         {
             cancelQuery();
             executor.cancel();
@@ -1850,12 +1915,12 @@ void ClientBase::processParsedSingleQuery(const String & full_query, const Strin
 
     if (is_interactive)
     {
-        client_context->setCurrentQueryId("");
+        global_context->setCurrentQueryId("");
         // Generate a new query_id
         for (const auto & query_id_format : query_id_formats)
         {
             writeString(query_id_format.first, std_out);
-            writeString(fmt::format(fmt::runtime(query_id_format.second), fmt::arg("query_id", client_context->getCurrentQueryId())), std_out);
+            writeString(fmt::format(fmt::runtime(query_id_format.second), fmt::arg("query_id", global_context->getCurrentQueryId())), std_out);
             writeChar('\n', std_out);
             std_out.next();
         }
@@ -1882,7 +1947,7 @@ void ClientBase::processParsedSingleQuery(const String & full_query, const Strin
                 auto password = auth_data->getPassword();
 
                 if (password)
-                    client_context->getAccessControl().checkPasswordComplexityRules(*password);
+                    global_context->getAccessControl().checkPasswordComplexityRules(*password);
             }
         }
     }
@@ -1896,31 +1961,16 @@ void ClientBase::processParsedSingleQuery(const String & full_query, const Strin
         /// Temporarily apply query settings to context.
         std::optional<Settings> old_settings;
         SCOPE_EXIT_SAFE({
-            try
-            {
-                /// We need to park ParallelFormating threads,
-                /// because they can use settings from global context
-                /// and it can lead to data race with `setSettings`
-                resetOutput();
-            }
-            catch (...)
-            {
-                if (!have_error)
-                {
-                    client_exception = std::make_unique<Exception>(getCurrentExceptionMessageAndPattern(print_stack_trace), getCurrentExceptionCode());
-                    have_error = true;
-                }
-            }
             if (old_settings)
-                client_context->setSettings(*old_settings);
+                global_context->setSettings(*old_settings);
         });
 
         auto apply_query_settings = [&](const IAST & settings_ast)
         {
             if (!old_settings)
-                old_settings.emplace(client_context->getSettingsRef());
-            client_context->applySettingsChanges(settings_ast.as<ASTSetQuery>()->changes);
-            client_context->resetSettingsToDefaultValue(settings_ast.as<ASTSetQuery>()->default_settings);
+                old_settings.emplace(global_context->getSettingsRef());
+            global_context->applySettingsChanges(settings_ast.as<ASTSetQuery>()->changes);
+            global_context->resetSettingsToDefaultValue(settings_ast.as<ASTSetQuery>()->default_settings);
         };
 
         const auto * insert = parsed_query->as<ASTInsertQuery>();
@@ -1953,7 +2003,7 @@ void ClientBase::processParsedSingleQuery(const String & full_query, const Strin
         if (insert && insert->select)
             insert->tryFindInputFunction(input_function);
 
-        bool is_async_insert_with_inlined_data = client_context->getSettingsRef().async_insert && insert && insert->hasInlinedData();
+        bool is_async_insert_with_inlined_data = global_context->getSettingsRef().async_insert && insert && insert->hasInlinedData();
 
         if (is_async_insert_with_inlined_data)
         {
@@ -1988,9 +2038,9 @@ void ClientBase::processParsedSingleQuery(const String & full_query, const Strin
                 if (change.name == "profile")
                     current_profile = change.value.safeGet<String>();
                 else
-                    client_context->applySettingChange(change);
+                    global_context->applySettingChange(change);
             }
-            client_context->resetSettingsToDefaultValue(set_query->default_settings);
+            global_context->resetSettingsToDefaultValue(set_query->default_settings);
 
             /// Query parameters inside SET queries should be also saved on the client side
             ///  to override their previous definitions set with --param_* arguments
@@ -1998,7 +2048,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);
 
-            client_context->addQueryParameters(NameToNameMap{set_query->query_parameters.begin(), set_query->query_parameters.end()});
+            global_context->addQueryParameters(NameToNameMap{set_query->query_parameters.begin(), set_query->query_parameters.end()});
         }
         if (const auto * use_query = parsed_query->as<ASTUseQuery>())
         {
@@ -2075,8 +2125,8 @@ MultiQueryProcessingStage ClientBase::analyzeMultiQueryText(
     if (this_query_begin >= all_queries_end)
         return MultiQueryProcessingStage::QUERIES_END;
 
-    unsigned max_parser_depth = static_cast<unsigned>(client_context->getSettingsRef().max_parser_depth);
-    unsigned max_parser_backtracks = static_cast<unsigned>(client_context->getSettingsRef().max_parser_backtracks);
+    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
@@ -2096,7 +2146,7 @@ MultiQueryProcessingStage ClientBase::analyzeMultiQueryText(
     try
     {
         parsed_query = parseQuery(this_query_end, all_queries_end,
-            client_context->getSettingsRef(),
+            global_context->getSettingsRef(),
             /*allow_multi_statements=*/ true);
     }
     catch (const Exception & e)
@@ -2121,59 +2171,25 @@ MultiQueryProcessingStage ClientBase::analyzeMultiQueryText(
         return MultiQueryProcessingStage::PARSING_FAILED;
     }
 
-    // INSERT queries may have the inserted data in the query text that follow the query itself, e.g. "insert into t format CSV 1,2". They
-    // need special handling.
-    // - If the INSERT statement FORMAT is VALUES, we use the VALUES format parser to skip the inserted data until we reach the trailing single semicolon.
-    // - Other formats (e.g. FORMAT CSV) are arbitrarily more complex and tricky to parse. For example, we may be unable to distinguish if the semicolon
-    //   is part of the data or ends the statement. In this case, we simply assume that the end of the INSERT statement is determined by \n\n (two newlines).
+    // INSERT queries may have the inserted data in the query text
+    // that follow the query itself, e.g. "insert into t format CSV 1;2".
+    // They need special handling. First of all, here we find where the
+    // inserted data ends. In multi-query mode, it is delimited by a
+    // newline.
+    // The VALUES format needs even more handling - we also allow the
+    // data to be delimited by semicolon. This case is handled later by
+    // the format parser itself.
+    // We can't do multiline INSERTs with inline data, because most
+    // row input formats (e.g. TSV) can't tell when the input stops,
+    // unlike VALUES.
     auto * insert_ast = parsed_query->as<ASTInsertQuery>();
-    // We also consider the INSERT query in EXPLAIN queries (same as normal INSERT queries)
-    if (!insert_ast)
-    {
-        auto * explain_ast = parsed_query->as<ASTExplainQuery>();
-        if (explain_ast && explain_ast->getExplainedQuery())
-        {
-            insert_ast = explain_ast->getExplainedQuery()->as<ASTInsertQuery>();
-        }
-    }
     const char * query_to_execute_end = this_query_end;
+
     if (insert_ast && insert_ast->data)
     {
-        if (insert_ast->format == "Values")
-        {
-            // Invoke the VALUES format parser to skip the inserted data
-            ReadBufferFromMemory data_in(insert_ast->data, all_queries_end - insert_ast->data);
-            skipBOMIfExists(data_in);
-            do
-            {
-                skipWhitespaceIfAny(data_in);
-                if (data_in.eof() || *data_in.position() == ';')
-                    break;
-            }
-            while (ValuesBlockInputFormat::skipToNextRow(&data_in, 1, 0));
-            // Handle the case of a comment followed by a semicolon
-            //   Example: INSERT INTO tab VALUES xx; -- {serverError xx}
-            // If we use this error hint, the next query should not be placed on the same line
-            this_query_end = insert_ast->data + data_in.count();
-            const auto * pos_newline = find_first_symbols<'\n'>(this_query_end, all_queries_end);
-            if (pos_newline != this_query_end)
-            {
-                TestHint hint(String(this_query_end, pos_newline - this_query_end));
-                if (hint.hasClientErrors() || hint.hasServerErrors())
-                    this_query_end = pos_newline;
-            }
-        }
-        else
-        {
-            // Handling of generic formats
-            auto pos_newline = String(insert_ast->data, all_queries_end).find("\n\n");
-            if (pos_newline != std::string::npos)
-                this_query_end = insert_ast->data + pos_newline;
-            else
-                this_query_end = all_queries_end;
-        }
+        this_query_end = find_first_symbols<'\n'>(insert_ast->data, all_queries_end);
         insert_ast->end = this_query_end;
-        query_to_execute_end = isSyncInsertWithData(*insert_ast, client_context) ? insert_ast->data : this_query_end;
+        query_to_execute_end = isSyncInsertWithData(*insert_ast, global_context) ? insert_ast->data : this_query_end;
     }
 
     query_to_execute = all_queries_text.substr(this_query_begin - all_queries_text.data(), query_to_execute_end - this_query_begin);
@@ -2206,10 +2222,7 @@ bool ClientBase::executeMultiQuery(const String & all_queries_text)
     size_t test_tags_length = getTestTagsLength(all_queries_text);
 
     /// Several queries separated by ';'.
-    /// INSERT data is ended by the empty line (\n\n), not ';'.
-    /// Unnecessary semicolons may cause data to be parsed containing ';'
-    /// e.g. 'insert into xx format csv val;' will insert "val;" instead of "val"
-    ///      'insert into xx format csv val\n;' will insert "val" and ";"
+    /// INSERT data is ended by the end of line, not ';'.
     /// An exception is VALUES format where we also support semicolon in
     /// addition to end of line.
     const char * this_query_begin = all_queries_text.data() + test_tags_length;
@@ -2220,8 +2233,6 @@ bool ClientBase::executeMultiQuery(const String & all_queries_text)
     String query_to_execute;
     ASTPtr parsed_query;
     std::unique_ptr<Exception> current_exception;
-    size_t retries_count = 0;
-    bool is_first = true;
 
     while (true)
     {
@@ -2230,24 +2241,16 @@ bool ClientBase::executeMultiQuery(const String & all_queries_text)
         switch (stage)
         {
             case MultiQueryProcessingStage::QUERIES_END:
-            {
-                /// Compatible with old version when run interactive, e.g. "", "\ld"
-                if (is_first && is_interactive)
-                    processTextAsSingleQuery(all_queries_text);
-                return true;
-            }
             case MultiQueryProcessingStage::PARSING_FAILED:
             {
                 return true;
             }
             case MultiQueryProcessingStage::CONTINUE_PARSING:
             {
-                is_first = false;
                 continue;
             }
             case MultiQueryProcessingStage::PARSING_EXCEPTION:
             {
-                is_first = false;
                 this_query_end = find_first_symbols<'\n'>(this_query_end, all_queries_end);
 
                 // Try to find test hint for syntax error. We don't know where
@@ -2277,7 +2280,6 @@ bool ClientBase::executeMultiQuery(const String & all_queries_text)
             }
             case MultiQueryProcessingStage::EXECUTE_QUERY:
             {
-                is_first = false;
                 full_query = all_queries_text.substr(this_query_begin - all_queries_text.data(), this_query_end - this_query_begin);
                 if (query_fuzzer_runs)
                 {
@@ -2287,8 +2289,6 @@ bool ClientBase::executeMultiQuery(const String & all_queries_text)
                     this_query_begin = this_query_end;
                     continue;
                 }
-                if (suggest)
-                    updateSuggest(parsed_query);
 
                 // Now we know for sure where the query ends.
                 // Look for the hint in the text of query + insert data + trailing
@@ -2314,12 +2314,7 @@ bool ClientBase::executeMultiQuery(const String & all_queries_text)
                 // Check whether the error (or its absence) matches the test hints
                 // (or their absence).
                 bool error_matches_hint = true;
-                bool need_retry = test_hint.needRetry(server_exception, &retries_count);
-                if (need_retry)
-                {
-                    std::this_thread::sleep_for(std::chrono::seconds(1));
-                }
-                else if (have_error)
+                if (have_error)
                 {
                     if (test_hint.hasServerErrors())
                     {
@@ -2396,13 +2391,13 @@ bool ClientBase::executeMultiQuery(const String & all_queries_text)
                 // , where the inline data is delimited by semicolon and not by a
                 // newline.
                 auto * insert_ast = parsed_query->as<ASTInsertQuery>();
-                if (insert_ast && isSyncInsertWithData(*insert_ast, client_context))
+                if (insert_ast && isSyncInsertWithData(*insert_ast, global_context))
                 {
                     this_query_end = insert_ast->end;
                     adjustQueryEnd(
                         this_query_end, all_queries_end,
-                        static_cast<unsigned>(client_context->getSettingsRef().max_parser_depth),
-                        static_cast<unsigned>(client_context->getSettingsRef().max_parser_backtracks));
+                        static_cast<unsigned>(global_context->getSettingsRef().max_parser_depth),
+                        static_cast<unsigned>(global_context->getSettingsRef().max_parser_backtracks));
                 }
 
                 // Report error.
@@ -2413,8 +2408,7 @@ bool ClientBase::executeMultiQuery(const String & all_queries_text)
                 if (have_error && !ignore_error)
                     return is_interactive;
 
-                if (!need_retry)
-                    this_query_begin = this_query_end;
+                this_query_begin = this_query_end;
                 break;
             }
         }
@@ -2439,6 +2433,14 @@ bool ClientBase::processQueryText(const String & text)
         return processMultiQueryFromFile(file_name);
     }
 
+    if (!is_multiquery)
+    {
+        assert(!query_fuzzer_runs);
+        processTextAsSingleQuery(text);
+
+        return true;
+    }
+
     if (query_fuzzer_runs)
     {
         processWithFuzzing(text);
@@ -2525,10 +2527,10 @@ void ClientBase::runInteractive()
     if (load_suggestions)
     {
         /// Load suggestion data from the server.
-        if (client_context->getApplicationType() == Context::ApplicationType::CLIENT)
-            suggest->load<Connection>(client_context, connection_parameters, getClientConfiguration().getInt("suggestion_limit"), wait_for_suggestions_to_load);
-        else if (client_context->getApplicationType() == Context::ApplicationType::LOCAL)
-            suggest->load<LocalConnection>(client_context, connection_parameters, getClientConfiguration().getInt("suggestion_limit"), wait_for_suggestions_to_load);
+        if (global_context->getApplicationType() == Context::ApplicationType::CLIENT)
+            suggest->load<Connection>(global_context, connection_parameters, getClientConfiguration().getInt("suggestion_limit"), wait_for_suggestions_to_load);
+        else if (global_context->getApplicationType() == Context::ApplicationType::LOCAL)
+            suggest->load<LocalConnection>(global_context, connection_parameters, getClientConfiguration().getInt("suggestion_limit"), wait_for_suggestions_to_load);
     }
 
     if (home_path.empty())
@@ -2579,7 +2581,6 @@ void ClientBase::runInteractive()
         *suggest,
         history_file,
         getClientConfiguration().has("multiline"),
-        getClientConfiguration().getBool("ignore_shell_suspend", true),
         query_extenders,
         query_delimiters,
         word_break_characters,
@@ -2667,7 +2668,7 @@ void ClientBase::runInteractive()
         {
             // If a separate connection loading suggestions failed to open a new session,
             // use the main session to receive them.
-            suggest->load(*connection, connection_parameters.timeouts, getClientConfiguration().getInt("suggestion_limit"), client_context->getClientInfo());
+            suggest->load(*connection, connection_parameters.timeouts, getClientConfiguration().getInt("suggestion_limit"), global_context->getClientInfo());
         }
 
         try
@@ -2714,6 +2715,14 @@ bool ClientBase::processMultiQueryFromFile(const String & file_name)
     ReadBufferFromFile in(file_name);
     readStringUntilEOF(queries_from_file, in);
 
+    if (!getClientConfiguration().has("log_comment"))
+    {
+        Settings settings = global_context->getSettings();
+        /// NOTE: cannot use even weakly_canonical() since it fails for /dev/stdin due to resolving of "pipe:[X]"
+        settings.log_comment = fs::absolute(fs::path(file_name));
+        global_context->setSettings(settings);
+    }
+
     return executeMultiQuery(queries_from_file);
 }
 
@@ -2786,7 +2795,7 @@ void ClientBase::runLibFuzzer()
     for (auto & arg : fuzzer_args_holder)
         fuzzer_args.emplace_back(arg.data());
 
-    int fuzzer_argc = static_cast<int>(fuzzer_args.size());
+    int fuzzer_argc = fuzzer_args.size();
     char ** fuzzer_argv = fuzzer_args.data();
 
     LLVMFuzzerRunDriver(&fuzzer_argc, &fuzzer_argv, [](const uint8_t * data, size_t size)
@@ -2808,6 +2817,7 @@ void ClientBase::runLibFuzzer()
 void ClientBase::runLibFuzzer() {}
 #endif
 
+
 void ClientBase::clearTerminal()
 {
     /// Clear from cursor until end of screen.
@@ -2817,9 +2827,452 @@ void ClientBase::clearTerminal()
     output_stream << "\033[0J" "\033[?25h";
 }
 
+
 void ClientBase::showClientVersion()
 {
     output_stream << VERSION_NAME << " " + getName() + " version " << VERSION_STRING << VERSION_OFFICIAL << "." << std::endl;
 }
 
+namespace
+{
+
+/// Define transparent hash to we can use
+/// std::string_view with the containers
+struct TransparentStringHash
+{
+    using is_transparent = void;
+    size_t operator()(std::string_view txt) const
+    {
+        return std::hash<std::string_view>{}(txt);
+    }
+};
+
+/*
+ * This functor is used to parse command line arguments and replace dashes with underscores,
+ * allowing options to be specified using either dashes or underscores.
+ */
+class OptionsAliasParser
+{
+public:
+    explicit OptionsAliasParser(const boost::program_options::options_description& options)
+    {
+        options_names.reserve(options.options().size());
+        for (const auto& option : options.options())
+            options_names.insert(option->long_name());
+    }
+
+    /*
+     * Parses arguments by replacing dashes with underscores, and matches the resulting name with known options
+     * Implements boost::program_options::ext_parser logic
+     */
+    std::pair<std::string, std::string> operator()(const std::string & token) const
+    {
+        if (!token.starts_with("--"))
+            return {};
+        std::string arg = token.substr(2);
+
+        // divide token by '=' to separate key and value if options style=long_allow_adjacent
+        auto pos_eq = arg.find('=');
+        std::string key = arg.substr(0, pos_eq);
+
+        if (options_names.contains(key))
+            // option does not require any changes, because it is already correct
+            return {};
+
+        std::replace(key.begin(), key.end(), '-', '_');
+        if (!options_names.contains(key))
+            // after replacing '-' with '_' argument is still unknown
+            return {};
+
+        std::string value;
+        if (pos_eq != std::string::npos && pos_eq < arg.size())
+            value = arg.substr(pos_eq + 1);
+
+        return {key, value};
+    }
+
+private:
+    std::unordered_set<std::string> options_names;
+};
+
+}
+
+/// Enable optimizations even in debug builds because otherwise options parsing becomes extremely slow affecting .sh tests
+#if defined(__clang__)
+#pragma clang optimize on
+#endif
+void ClientBase::parseAndCheckOptions(OptionsDescription & options_description, po::variables_map & options, Arguments & arguments)
+{
+    if (allow_repeated_settings)
+        addProgramOptionsAsMultitokens(cmd_settings, options_description.main_description.value());
+    else
+        addProgramOptions(cmd_settings, options_description.main_description.value());
+
+    if (allow_merge_tree_settings)
+    {
+        /// Add merge tree settings manually, because names of some settings
+        /// may clash. Query settings have higher priority and we just
+        /// skip ambiguous merge tree settings.
+        auto & main_options = options_description.main_description.value();
+
+        std::unordered_set<std::string, TransparentStringHash, std::equal_to<>> main_option_names;
+        for (const auto & option : main_options.options())
+            main_option_names.insert(option->long_name());
+
+        for (const auto & setting : cmd_merge_tree_settings.all())
+        {
+            const auto add_setting = [&](const std::string_view name)
+            {
+                if (auto it = main_option_names.find(name); it != main_option_names.end())
+                    return;
+
+                if (allow_repeated_settings)
+                    addProgramOptionAsMultitoken(cmd_merge_tree_settings, main_options, name, setting);
+                else
+                    addProgramOption(cmd_merge_tree_settings, main_options, name, setting);
+            };
+
+            const auto & setting_name = setting.getName();
+
+            add_setting(setting_name);
+
+            const auto & settings_to_aliases = MergeTreeSettings::Traits::settingsToAliases();
+            if (auto it = settings_to_aliases.find(setting_name); it != settings_to_aliases.end())
+            {
+                for (const auto alias : it->second)
+                {
+                    add_setting(alias);
+                }
+            }
+        }
+    }
+
+    /// Parse main commandline options.
+    auto parser = po::command_line_parser(arguments)
+                      .options(options_description.main_description.value())
+                      .extra_parser(OptionsAliasParser(options_description.main_description.value()))
+                      .allow_unregistered();
+    po::parsed_options parsed = parser.run();
+
+    /// Check unrecognized options without positional options.
+    auto unrecognized_options = po::collect_unrecognized(parsed.options, po::collect_unrecognized_mode::exclude_positional);
+    if (!unrecognized_options.empty())
+    {
+        auto hints = this->getHints(unrecognized_options[0]);
+        if (!hints.empty())
+            throw Exception(ErrorCodes::UNRECOGNIZED_ARGUMENTS, "Unrecognized option '{}'. Maybe you meant {}",
+                            unrecognized_options[0], toString(hints));
+
+        throw Exception(ErrorCodes::UNRECOGNIZED_ARGUMENTS, "Unrecognized option '{}'", unrecognized_options[0]);
+    }
+
+    /// Check positional options.
+    for (const auto & op : parsed.options)
+    {
+        if (!op.unregistered && op.string_key.empty() && !op.original_tokens[0].starts_with("--")
+            && !op.original_tokens[0].empty() && !op.value.empty())
+        {
+            /// Two special cases for better usability:
+            /// - if the option contains a whitespace, it might be a query: clickhouse "SELECT 1"
+            /// These are relevant for interactive usage - user-friendly, but questionable in general.
+            /// In case of ambiguity or for scripts, prefer using proper options.
+
+            const auto & token = op.original_tokens[0];
+            po::variable_value value(boost::any(op.value), false);
+
+            const char * option;
+            if (token.contains(' '))
+                option = "query";
+            else
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Positional option `{}` is not supported.", token);
+
+            if (!options.emplace(option, value).second)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Positional option `{}` is not supported.", token);
+        }
+    }
+
+    po::store(parsed, options);
+}
+
+
+void ClientBase::init(int argc, char ** argv)
+{
+    namespace po = boost::program_options;
+
+    /// Don't parse options with Poco library, we prefer neat boost::program_options.
+    stopOptionsProcessing();
+
+    stdin_is_a_tty = isatty(STDIN_FILENO);
+    stdout_is_a_tty = isatty(STDOUT_FILENO);
+    stderr_is_a_tty = isatty(STDERR_FILENO);
+    terminal_width = getTerminalWidth();
+
+    std::vector<Arguments> external_tables_arguments;
+    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
+    /// Interpret Unicode dashes as default double-hyphen
+    for (auto & arg : common_arguments)
+    {
+        // replace em-dash(U+2014)
+        boost::replace_all(arg, "—", "--");
+        // replace en-dash(U+2013)
+        boost::replace_all(arg, "–", "--");
+        // replace mathematical minus(U+2212)
+        boost::replace_all(arg, "−", "--");
+    }
+
+
+    OptionsDescription options_description;
+    options_description.main_description.emplace(createOptionsDescription("Main options", terminal_width));
+
+    /// Common options for clickhouse-client and clickhouse-local.
+    options_description.main_description->add_options()
+        ("help", "print usage summary, combine with --verbose to display all options")
+        ("verbose", "print query and other debugging info")
+        ("version,V", "print version information and exit")
+        ("version-clean", "print version in machine-readable format and exit")
+
+        ("config-file,C", po::value<std::string>(), "config-file path")
+
+        ("query,q", po::value<std::vector<std::string>>()->multitoken(), R"(query; can be specified multiple times (--query "SELECT 1" --query "SELECT 2"...))")
+        ("queries-file", po::value<std::vector<std::string>>()->multitoken(), "file path with queries to execute; multiple files can be specified (--queries-file file1 file2...)")
+        ("multiquery,n", "If specified, multiple queries separated by semicolons can be listed after --query. For convenience, it is also possible to omit --query and pass the queries directly after --multiquery.")
+        ("multiline,m", "If specified, allow multiline queries (do not send the query on Enter)")
+        ("database,d", po::value<std::string>(), "database")
+        ("query_kind", po::value<std::string>()->default_value("initial_query"), "One of initial_query/secondary_query/no_query")
+        ("query_id", po::value<std::string>(), "query_id")
+
+        ("history_file", po::value<std::string>(), "path to history file")
+
+        ("stage", po::value<std::string>()->default_value("complete"), "Request query processing up to specified stage: complete,fetch_columns,with_mergeable_state,with_mergeable_state_after_aggregation,with_mergeable_state_after_aggregation_and_limit")
+        ("progress", po::value<ProgressOption>()->implicit_value(ProgressOption::TTY, "tty")->default_value(ProgressOption::DEFAULT, "default"), "Print progress of queries execution - to TTY: tty|on|1|true|yes; to STDERR non-interactive mode: err; OFF: off|0|false|no; DEFAULT - interactive to TTY, non-interactive is off")
+
+        ("disable_suggestion,A", "Disable loading suggestion data. Note that suggestion data is loaded asynchronously through a second connection to ClickHouse server. Also it is reasonable to disable suggestion if you want to paste a query with TAB characters. Shorthand option -A is for those who get used to mysql client.")
+        ("wait_for_suggestions_to_load", "Load suggestion data synchonously.")
+        ("time,t", "print query execution time to stderr in non-interactive mode (for benchmarks)")
+        ("memory-usage", po::value<std::string>()->implicit_value("default")->default_value("none"), "print memory usage to stderr in non-interactive mode (for benchmarks). Values: 'none', 'default', 'readable'")
+
+        ("echo", "in batch mode, print query before execution")
+
+        ("log-level", po::value<std::string>(), "log level")
+        ("server_logs_file", po::value<std::string>(), "put server logs into specified file")
+
+        ("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 (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")
+
+        ("ignore-error", "do not stop processing in multiquery mode")
+        ("stacktrace", "print stack traces of exceptions")
+        ("hardware-utilization", "print hardware utilization information in progress bar")
+        ("print-profile-events", po::value(&profile_events.print)->zero_tokens(), "Printing ProfileEvents packets")
+        ("profile-events-delay-ms", po::value<UInt64>()->default_value(profile_events.delay_ms), "Delay between printing `ProfileEvents` packets (-1 - print only totals, 0 - print every single packet)")
+        ("processed-rows", "print the number of locally processed rows")
+
+        ("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.")
+
+        ("client_logs_file", po::value<std::string>(), "Path to a file for writing client logs. Currently we only have fatal logs (when the client crashes)")
+    ;
+
+    addOptions(options_description);
+
+    OptionsDescription options_description_non_verbose = options_description;
+
+    auto getter = [](const auto & op)
+    {
+        String op_long_name = op->long_name();
+        return "--" + String(op_long_name);
+    };
+
+    if (options_description.main_description)
+    {
+        const auto & main_options = options_description.main_description->options();
+        std::transform(main_options.begin(), main_options.end(), std::back_inserter(cmd_options), getter);
+    }
+
+    if (options_description.external_description)
+    {
+        const auto & external_options = options_description.external_description->options();
+        std::transform(external_options.begin(), external_options.end(), std::back_inserter(cmd_options), getter);
+    }
+
+    po::variables_map options;
+    parseAndCheckOptions(options_description, options, common_arguments);
+    po::notify(options);
+
+    if (options.count("version") || options.count("V"))
+    {
+        showClientVersion();
+        exit(0); // NOLINT(concurrency-mt-unsafe)
+    }
+
+    if (options.count("version-clean"))
+    {
+        output_stream << VERSION_STRING;
+        exit(0); // NOLINT(concurrency-mt-unsafe)
+    }
+
+    if (options.count("verbose"))
+        getClientConfiguration().setBool("verbose", true);
+
+    /// Output of help message.
+    if (options.count("help")
+        || (options.count("host") && options["host"].as<std::string>() == "elp")) /// If user writes -help instead of --help.
+    {
+        if (getClientConfiguration().getBool("verbose", false))
+            printHelpMessage(options_description, true);
+        else
+            printHelpMessage(options_description_non_verbose, false);
+        exit(0); // NOLINT(concurrency-mt-unsafe)
+    }
+
+    /// Common options for clickhouse-client and clickhouse-local.
+
+    /// Output execution time to stderr in batch mode.
+    if (options.count("time"))
+        getClientConfiguration().setBool("print-time-to-stderr", true);
+    if (options.count("memory-usage"))
+    {
+        const auto & memory_usage_mode = options["memory-usage"].as<std::string>();
+        if (memory_usage_mode != "none" && memory_usage_mode != "default" && memory_usage_mode != "readable")
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown memory-usage mode: {}", memory_usage_mode);
+        getClientConfiguration().setString("print-memory-to-stderr", memory_usage_mode);
+    }
+
+    if (options.count("query"))
+        queries = options["query"].as<std::vector<std::string>>();
+    if (options.count("query_id"))
+        getClientConfiguration().setString("query_id", options["query_id"].as<std::string>());
+    if (options.count("database"))
+        getClientConfiguration().setString("database", options["database"].as<std::string>());
+    if (options.count("config-file"))
+        getClientConfiguration().setString("config-file", options["config-file"].as<std::string>());
+    if (options.count("queries-file"))
+        queries_files = options["queries-file"].as<std::vector<std::string>>();
+    if (options.count("multiline"))
+        getClientConfiguration().setBool("multiline", true);
+    if (options.count("multiquery"))
+        getClientConfiguration().setBool("multiquery", true);
+    if (options.count("ignore-error"))
+        getClientConfiguration().setBool("ignore-error", true);
+    if (options.count("format"))
+        getClientConfiguration().setString("format", options["format"].as<std::string>());
+    if (options.count("output-format"))
+        getClientConfiguration().setString("output-format", options["output-format"].as<std::string>());
+    if (options.count("vertical"))
+        getClientConfiguration().setBool("vertical", true);
+    if (options.count("stacktrace"))
+        getClientConfiguration().setBool("stacktrace", true);
+    if (options.count("print-profile-events"))
+        getClientConfiguration().setBool("print-profile-events", true);
+    if (options.count("profile-events-delay-ms"))
+        getClientConfiguration().setUInt64("profile-events-delay-ms", options["profile-events-delay-ms"].as<UInt64>());
+    /// Whether to print the number of processed rows at
+    if (options.count("processed-rows"))
+        getClientConfiguration().setBool("print-num-processed-rows", true);
+    if (options.count("progress"))
+    {
+        switch (options["progress"].as<ProgressOption>())
+        {
+            case DEFAULT:
+                getClientConfiguration().setString("progress", "default");
+                break;
+            case OFF:
+                getClientConfiguration().setString("progress", "off");
+                break;
+            case TTY:
+                getClientConfiguration().setString("progress", "tty");
+                break;
+            case ERR:
+                getClientConfiguration().setString("progress", "err");
+                break;
+        }
+    }
+    if (options.count("echo"))
+        getClientConfiguration().setBool("echo", true);
+    if (options.count("disable_suggestion"))
+        getClientConfiguration().setBool("disable_suggestion", true);
+    if (options.count("wait_for_suggestions_to_load"))
+        getClientConfiguration().setBool("wait_for_suggestions_to_load", true);
+    if (options.count("suggestion_limit"))
+        getClientConfiguration().setInt("suggestion_limit", options["suggestion_limit"].as<int>());
+    if (options.count("highlight"))
+        getClientConfiguration().setBool("highlight", options["highlight"].as<bool>());
+    if (options.count("history_file"))
+        getClientConfiguration().setString("history_file", options["history_file"].as<std::string>());
+    if (options.count("interactive"))
+        getClientConfiguration().setBool("interactive", true);
+    if (options.count("pager"))
+        getClientConfiguration().setString("pager", options["pager"].as<std::string>());
+
+    if (options.count("log-level"))
+        Poco::Logger::root().setLevel(options["log-level"].as<std::string>());
+    if (options.count("server_logs_file"))
+        server_logs_file = options["server_logs_file"].as<std::string>();
+
+    query_processing_stage = QueryProcessingStage::fromString(options["stage"].as<std::string>());
+    query_kind = parseQueryKind(options["query_kind"].as<std::string>());
+    profile_events.print = options.count("print-profile-events");
+    profile_events.delay_ms = options["profile-events-delay-ms"].as<UInt64>();
+
+    processOptions(options_description, options, external_tables_arguments, hosts_and_ports_arguments);
+    {
+        std::unordered_set<std::string> alias_names;
+        alias_names.reserve(options_description.main_description->options().size());
+        for (const auto& option : options_description.main_description->options())
+            alias_names.insert(option->long_name());
+        argsToConfig(common_arguments, getClientConfiguration(), 100, &alias_names);
+    }
+
+    clearPasswordFromCommandLine(argc, argv);
+
+    /// Limit on total memory usage
+    std::string max_client_memory_usage = getClientConfiguration().getString("max_memory_usage_in_client", "0" /*default value*/);
+    if (max_client_memory_usage != "0")
+    {
+        UInt64 max_client_memory_usage_int = parseWithSizeSuffix<UInt64>(max_client_memory_usage.c_str(), max_client_memory_usage.length());
+
+        total_memory_tracker.setHardLimit(max_client_memory_usage_int);
+        total_memory_tracker.setDescription("(total)");
+        total_memory_tracker.setMetric(CurrentMetrics::MemoryTracking);
+    }
+
+    /// Print stacktrace in case of crash
+    HandledSignals::instance().setupTerminateHandler();
+    HandledSignals::instance().setupCommonDeadlySignalHandlers();
+    /// We don't setup signal handlers for SIGINT, SIGQUIT, SIGTERM because we don't
+    /// have an option for client to shutdown gracefully.
+
+    fatal_channel_ptr = new Poco::SplitterChannel;
+    fatal_console_channel_ptr = new Poco::ConsoleChannel;
+    fatal_channel_ptr->addChannel(fatal_console_channel_ptr);
+    if (options.count("client_logs_file"))
+    {
+        fatal_file_channel_ptr = new Poco::SimpleFileChannel(options["client_logs_file"].as<std::string>());
+        fatal_channel_ptr->addChannel(fatal_file_channel_ptr);
+    }
+
+    fatal_log = createLogger("ClientBase", fatal_channel_ptr.get(), Poco::Message::PRIO_FATAL);
+    signal_listener = std::make_unique<SignalListener>(nullptr, fatal_log);
+    signal_listener_thread.start(*signal_listener);
+
+#if USE_GWP_ASAN
+    GWPAsan::initFinished();
+#endif
+
+}
+
 }
diff --git a/src/Client/ClientBase.h b/src/Client/ClientBase.h
index 45251aea28a..986990aecaa 100644
--- a/src/Client/ClientBase.h
+++ b/src/Client/ClientBase.h
@@ -1,32 +1,26 @@
 #pragma once
 
-
-#include <Client/Suggest.h>
-#include <Common/QueryFuzzer.h>
-#include <Common/DNSResolver.h>
-#include <Common/InterruptListener.h>
+#include <string_view>
+#include "Common/NamePrompter.h"
+#include <Parsers/ASTCreateQuery.h>
 #include <Common/ProgressIndication.h>
+#include <Common/InterruptListener.h>
 #include <Common/ShellCommand.h>
 #include <Common/Stopwatch.h>
+#include <Common/DNSResolver.h>
 #include <Core/ExternalTable.h>
 #include <Core/Settings.h>
+#include <Poco/Util/Application.h>
 #include <Poco/ConsoleChannel.h>
 #include <Poco/SimpleFileChannel.h>
 #include <Poco/SplitterChannel.h>
 #include <Interpreters/Context.h>
-#include <Parsers/ASTCreateQuery.h>
-#include <Poco/Util/Application.h>
-
-#include <Storages/MergeTree/MergeTreeSettings.h>
-#include <Storages/SelectQueryInfo.h>
-#include <Storages/StorageFile.h>
-
+#include <Client/Suggest.h>
+#include <Client/QueryFuzzer.h>
 #include <boost/program_options.hpp>
-
-#include <atomic>
-#include <optional>
-#include <string_view>
-#include <string>
+#include <Storages/StorageFile.h>
+#include <Storages/SelectQueryInfo.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 
 namespace po = boost::program_options;
 
@@ -70,16 +64,9 @@ std::istream& operator>> (std::istream & in, ProgressOption & progress);
 class InternalTextLogs;
 class WriteBufferFromFileDescriptor;
 
-/**
- * The base class which encapsulates the core functionality of a client.
- * Can be used in a standalone application (clickhouse-client or clickhouse-local),
- * or be embedded into server.
- * Always keep in mind that there can be several instances of this class within
- * a process. Thus, it cannot keep its state in global shared variables or even use them.
- * The best example - std::cin, std::cout and std::cerr.
- */
-class ClientBase
+class ClientBase : public Poco::Util::Application, public IHints<2>
 {
+
 public:
     using Arguments = std::vector<String>;
 
@@ -92,11 +79,12 @@ public:
         std::ostream & output_stream_ = std::cout,
         std::ostream & error_stream_ = std::cerr
     );
-    virtual ~ClientBase();
 
-    bool tryStopQuery() { return query_interrupt_handler.tryStop(); }
-    void stopQuery() { query_interrupt_handler.stop(); }
+    ~ClientBase() override;
 
+    void init(int argc, char ** argv);
+
+    std::vector<String> getAllRegisteredNames() const override { return cmd_options; }
     ASTPtr parseQuery(const char *& pos, const char * end, const Settings & settings, bool allow_multi_statements);
 
 protected:
@@ -126,7 +114,7 @@ protected:
         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, uint32_t max_parser_backtracks);
-    virtual void setupSignalHandler() = 0;
+    static void setupSignalHandler();
 
     bool executeMultiQuery(const String & all_queries_text);
     MultiQueryProcessingStage analyzeMultiQueryText(
@@ -168,6 +156,8 @@ protected:
 
     void setInsertionTable(const ASTInsertQuery & insert_query);
 
+    void addMultiquery(std::string_view query, Arguments & common_arguments) const;
+
 private:
     void receiveResult(ASTPtr parsed_query, Int32 signals_before_stop, bool partial_result_on_first_cancel);
     bool receiveAndProcessPacket(ASTPtr parsed_query, bool cancelled_);
@@ -200,6 +190,7 @@ private:
     String prompt() const;
 
     void resetOutput();
+    void parseAndCheckOptions(OptionsDescription & options_description, po::variables_map & options, Arguments & arguments);
 
     void updateSuggest(const ASTPtr & ast);
 
@@ -207,31 +198,6 @@ private:
     bool addMergeTreeSettings(ASTCreateQuery & ast_create);
 
 protected:
-
-    class QueryInterruptHandler : private boost::noncopyable
-    {
-    public:
-        /// Store how much interrupt signals can be before stopping the query
-        /// by default stop after the first interrupt signal.
-        void start(Int32 signals_before_stop = 1) { exit_after_signals.store(signals_before_stop); }
-
-        /// Set value not greater then 0 to mark the query as stopped.
-        void stop() { exit_after_signals.store(0); }
-
-        /// Return true if the query was stopped.
-        /// Query was stopped if it received at least "signals_before_stop" interrupt signals.
-        bool tryStop() { return exit_after_signals.fetch_sub(1) <= 0; }
-        bool cancelled() { return exit_after_signals.load() <= 0; }
-
-        /// Return how much interrupt signals remain before stop.
-        Int32 cancelled_status() { return exit_after_signals.load(); }
-
-    private:
-        std::atomic<Int32> exit_after_signals = 0;
-    };
-
-    QueryInterruptHandler query_interrupt_handler;
-
     static bool isSyncInsertWithData(const ASTInsertQuery & insert_query, const ContextPtr & context);
     bool processMultiQueryFromFile(const String & file_name);
 
@@ -240,9 +206,6 @@ protected:
     /// Adjust some settings after command line options and config had been processed.
     void adjustSettings();
 
-    /// Initializes the client context.
-    void initClientContext();
-
     void setDefaultFormatsAndCompressionFromConfiguration();
 
     void initTTYBuffer(ProgressOption progress);
@@ -252,10 +215,15 @@ protected:
     SharedContextHolder shared_context;
     ContextMutablePtr global_context;
 
-    /// Client context is a context used only by the client to parse queries, process query parameters and to connect to clickhouse-server.
-    ContextMutablePtr client_context;
+    LoggerPtr fatal_log;
+    Poco::AutoPtr<Poco::SplitterChannel> fatal_channel_ptr;
+    Poco::AutoPtr<Poco::Channel> fatal_console_channel_ptr;
+    Poco::AutoPtr<Poco::Channel> fatal_file_channel_ptr;
+    Poco::Thread signal_listener_thread;
+    std::unique_ptr<Poco::Runnable> signal_listener;
 
     bool is_interactive = false; /// Use either interactive line editing interface or batch mode.
+    bool is_multiquery = false;
     bool delayed_interactive = false;
 
     bool echo_queries = false; /// Print queries before execution in batch mode.
@@ -268,6 +236,7 @@ protected:
     std::vector<String> queries; /// Queries passed via '--query'
     std::vector<String> queries_files; /// If not empty, queries will be read from these files
     std::vector<String> interleave_queries_files; /// If not empty, run queries from these files before processing every file from 'queries_files'.
+    std::vector<String> cmd_options;
 
     bool stdin_is_a_tty = false; /// stdin is a terminal.
     bool stdout_is_a_tty = false; /// stdout is a terminal.
diff --git a/src/Client/ClientBaseOptimizedParts.cpp b/src/Client/ClientBaseOptimizedParts.cpp
deleted file mode 100644
index 297b8e7ce51..00000000000
--- a/src/Client/ClientBaseOptimizedParts.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-#include <Client/ClientApplicationBase.h>
-#include <Core/BaseSettingsProgramOptions.h>
-
-namespace DB
-{
-
-/**
- * Program options parsing is very slow in debug builds and it affects .sh tests
- * causing them to timeout sporadically.
- * It seems impossible to enable optimizations for a single function (only to disable them), so
- * instead we extract the code to a separate source file and compile it with different options.
- */
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-    extern const int UNRECOGNIZED_ARGUMENTS;
-}
-
-namespace
-{
-
-/// Define transparent hash to we can use
-/// std::string_view with the containers
-struct TransparentStringHash
-{
-    using is_transparent = void;
-    size_t operator()(std::string_view txt) const
-    {
-        return std::hash<std::string_view>{}(txt);
-    }
-};
-
-/*
- * This functor is used to parse command line arguments and replace dashes with underscores,
- * allowing options to be specified using either dashes or underscores.
- */
-class OptionsAliasParser
-{
-public:
-    explicit OptionsAliasParser(const boost::program_options::options_description& options)
-    {
-        options_names.reserve(options.options().size());
-        for (const auto& option : options.options())
-            options_names.insert(option->long_name());
-    }
-
-    /*
-     * Parses arguments by replacing dashes with underscores, and matches the resulting name with known options
-     * Implements boost::program_options::ext_parser logic
-     */
-    std::pair<std::string, std::string> operator()(const std::string & token) const
-    {
-        if (!token.starts_with("--"))
-            return {};
-        std::string arg = token.substr(2);
-
-        // divide token by '=' to separate key and value if options style=long_allow_adjacent
-        auto pos_eq = arg.find('=');
-        std::string key = arg.substr(0, pos_eq);
-
-        if (options_names.contains(key))
-            // option does not require any changes, because it is already correct
-            return {};
-
-        std::replace(key.begin(), key.end(), '-', '_');
-        if (!options_names.contains(key))
-            // after replacing '-' with '_' argument is still unknown
-            return {};
-
-        std::string value;
-        if (pos_eq != std::string::npos && pos_eq < arg.size())
-            value = arg.substr(pos_eq + 1);
-
-        return {key, value};
-    }
-
-private:
-    std::unordered_set<std::string> options_names;
-};
-
-}
-
-void ClientApplicationBase::parseAndCheckOptions(OptionsDescription & options_description, po::variables_map & options, Arguments & arguments)
-{
-    if (allow_repeated_settings)
-        addProgramOptionsAsMultitokens(cmd_settings, options_description.main_description.value());
-    else
-        addProgramOptions(cmd_settings, options_description.main_description.value());
-
-    if (allow_merge_tree_settings)
-    {
-        /// Add merge tree settings manually, because names of some settings
-        /// may clash. Query settings have higher priority and we just
-        /// skip ambiguous merge tree settings.
-        auto & main_options = options_description.main_description.value();
-
-        std::unordered_set<std::string, TransparentStringHash, std::equal_to<>> main_option_names;
-        for (const auto & option : main_options.options())
-            main_option_names.insert(option->long_name());
-
-        for (const auto & setting : cmd_merge_tree_settings.all())
-        {
-            const auto add_setting = [&](const std::string_view name)
-            {
-                if (auto it = main_option_names.find(name); it != main_option_names.end())
-                    return;
-
-                if (allow_repeated_settings)
-                    addProgramOptionAsMultitoken(cmd_merge_tree_settings, main_options, name, setting);
-                else
-                    addProgramOption(cmd_merge_tree_settings, main_options, name, setting);
-            };
-
-            const auto & setting_name = setting.getName();
-
-            add_setting(setting_name);
-
-            const auto & settings_to_aliases = MergeTreeSettings::Traits::settingsToAliases();
-            if (auto it = settings_to_aliases.find(setting_name); it != settings_to_aliases.end())
-            {
-                for (const auto alias : it->second)
-                {
-                    add_setting(alias);
-                }
-            }
-        }
-    }
-
-    /// Parse main commandline options.
-    auto parser = po::command_line_parser(arguments)
-                      .options(options_description.main_description.value())
-                      .extra_parser(OptionsAliasParser(options_description.main_description.value()))
-                      .allow_unregistered();
-    po::parsed_options parsed = parser.run();
-
-    /// Check unrecognized options without positional options.
-    auto unrecognized_options = po::collect_unrecognized(parsed.options, po::collect_unrecognized_mode::exclude_positional);
-    if (!unrecognized_options.empty())
-    {
-        auto hints = this->getHints(unrecognized_options[0]);
-        if (!hints.empty())
-            throw Exception(ErrorCodes::UNRECOGNIZED_ARGUMENTS, "Unrecognized option '{}'. Maybe you meant {}",
-                            unrecognized_options[0], toString(hints));
-
-        throw Exception(ErrorCodes::UNRECOGNIZED_ARGUMENTS, "Unrecognized option '{}'", unrecognized_options[0]);
-    }
-
-    /// Check positional options.
-    for (const auto & op : parsed.options)
-    {
-        if (!op.unregistered && op.string_key.empty() && !op.original_tokens[0].starts_with("--")
-            && !op.original_tokens[0].empty() && !op.value.empty())
-        {
-            /// Two special cases for better usability:
-            /// - if the option contains a whitespace, it might be a query: clickhouse "SELECT 1"
-            /// These are relevant for interactive usage - user-friendly, but questionable in general.
-            /// In case of ambiguity or for scripts, prefer using proper options.
-
-            const auto & token = op.original_tokens[0];
-            po::variable_value value(boost::any(op.value), false);
-
-            const char * option;
-            if (token.contains(' '))
-                option = "query";
-            else
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Positional option `{}` is not supported.", token);
-
-            if (!options.emplace(option, value).second)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Positional option `{}` is not supported.", token);
-        }
-    }
-
-    po::store(parsed, options);
-}
-
-}
diff --git a/src/Client/Connection.cpp b/src/Client/Connection.cpp
index da6e5baa3ad..799c7511982 100644
--- a/src/Client/Connection.cpp
+++ b/src/Client/Connection.cpp
@@ -5,6 +5,8 @@
 #include <Core/Settings.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Compression/CompressedWriteBuffer.h>
+#include <IO/ReadBufferFromPocoSocket.h>
+#include <IO/WriteBufferFromPocoSocket.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <IO/copyData.h>
@@ -83,7 +85,6 @@ Connection::~Connection()
 Connection::Connection(const String & host_, UInt16 port_,
     const String & default_database_,
     const String & user_, const String & password_,
-    const String & proto_send_chunked_, const String & proto_recv_chunked_,
     [[maybe_unused]] const SSHKey & ssh_private_key_,
     const String & jwt_,
     const String & quota_key_,
@@ -94,7 +95,6 @@ Connection::Connection(const String & host_, UInt16 port_,
     Protocol::Secure secure_)
     : host(host_), port(port_), default_database(default_database_)
     , user(user_), password(password_)
-    , proto_send_chunked(proto_send_chunked_), proto_recv_chunked(proto_recv_chunked_)
 #if USE_SSH
     , ssh_private_key(ssh_private_key_)
 #endif
@@ -145,9 +145,6 @@ void Connection::connect(const ConnectionTimeouts & timeouts)
                 /// work we need to pass host name separately. It will be send into TLS Hello packet to let
                 /// the server know which host we want to talk with (single IP can process requests for multiple hosts using SNI).
                 static_cast<Poco::Net::SecureStreamSocket*>(socket.get())->setPeerHostName(host);
-                /// we want to postpone SSL handshake until first read or write operation
-                /// so any errors during negotiation would be properly processed
-                static_cast<Poco::Net::SecureStreamSocket*>(socket.get())->setLazyHandshake(true);
 #else
                 throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "tcp_secure protocol is disabled because poco library was built without NetSSL support.");
 #endif
@@ -214,10 +211,10 @@ void Connection::connect(const ConnectionTimeouts & timeouts)
                 , tcp_keep_alive_timeout_in_sec);
         }
 
-        in = std::make_shared<ReadBufferFromPocoSocketChunked>(*socket);
+        in = std::make_shared<ReadBufferFromPocoSocket>(*socket);
         in->setAsyncCallback(async_callback);
 
-        out = std::make_shared<WriteBufferFromPocoSocketChunked>(*socket);
+        out = std::make_shared<WriteBufferFromPocoSocket>(*socket);
         out->setAsyncCallback(async_callback);
         connected = true;
         setDescription();
@@ -225,61 +222,9 @@ void Connection::connect(const ConnectionTimeouts & timeouts)
         sendHello();
         receiveHello(timeouts.handshake_timeout);
 
-        if (server_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_CHUNKED_PACKETS)
-        {
-            /// Client side of chunked protocol negotiation.
-            /// Server advertises its protocol capabilities (separate for send and receive channels) by sending
-            /// in its 'Hello' response one of four types - chunked, notchunked, chunked_optional, notchunked_optional.
-            /// Not optional types are strict meaning that server only supports this type, optional means that
-            /// server prefer this type but capable to work in opposite.
-            /// Client selects which type it is going to communicate based on the settings from config or arguments,
-            /// and sends either "chunked" or "notchunked" protocol request in addendum section of handshake.
-            /// Client can detect if server's protocol capabilities are not compatible with client's settings (for example
-            /// server strictly requires chunked protocol but client's settings only allows notchunked protocol) - in such case
-            /// client should interrupt this connection. However if client continues with incompatible protocol type request, server
-            /// will send appropriate exception and disconnect client.
-
-            auto is_chunked = [](const String & chunked_srv_str, const String & chunked_cl_str, const String & direction)
-            {
-                bool chunked_srv = chunked_srv_str.starts_with("chunked");
-                bool optional_srv = chunked_srv_str.ends_with("_optional");
-                bool chunked_cl = chunked_cl_str.starts_with("chunked");
-                bool optional_cl = chunked_cl_str.ends_with("_optional");
-
-                if (optional_srv)
-                    return chunked_cl;
-                if (optional_cl)
-                    return chunked_srv;
-                if (chunked_cl != chunked_srv)
-                    throw NetException(
-                        ErrorCodes::NETWORK_ERROR,
-                        "Incompatible protocol: {} set to {}, server requires {}",
-                        direction,
-                        chunked_cl ? "chunked" : "notchunked",
-                        chunked_srv ? "chunked" : "notchunked");
-
-                return chunked_srv;
-            };
-
-            proto_send_chunked = is_chunked(proto_recv_chunked_srv, proto_send_chunked, "send") ? "chunked" : "notchunked";
-            proto_recv_chunked = is_chunked(proto_send_chunked_srv, proto_recv_chunked, "recv") ? "chunked" : "notchunked";
-        }
-        else
-        {
-            if (proto_send_chunked == "chunked" || proto_recv_chunked == "chunked")
-                throw NetException(
-                        ErrorCodes::NETWORK_ERROR,
-                        "Incompatible protocol: server's version is too old and doesn't support chunked protocol while client settings require it.");
-        }
-
         if (server_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_ADDENDUM)
             sendAddendum();
 
-        if (proto_send_chunked == "chunked")
-            out->enableChunked();
-        if (proto_recv_chunked == "chunked")
-            in->enableChunked();
-
         LOG_TRACE(log_wrapper.get(), "Connected to {} server version {}.{}.{}.",
             server_name, server_version_major, server_version_minor, server_version_patch);
     }
@@ -448,13 +393,6 @@ void Connection::sendAddendum()
 {
     if (server_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_QUOTA_KEY)
         writeStringBinary(quota_key, *out);
-
-    if (server_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_CHUNKED_PACKETS)
-    {
-        writeStringBinary(proto_send_chunked, *out);
-        writeStringBinary(proto_recv_chunked, *out);
-    }
-
     out->next();
 }
 
@@ -534,12 +472,6 @@ void Connection::receiveHello(const Poco::Timespan & handshake_timeout)
         else
             server_version_patch = server_revision;
 
-        if (server_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_CHUNKED_PACKETS)
-        {
-            readStringBinary(proto_send_chunked_srv, *in);
-            readStringBinary(proto_recv_chunked_srv, *in);
-        }
-
         if (server_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_PASSWORD_COMPLEXITY_RULES)
         {
             UInt64 rules_size;
@@ -679,7 +611,6 @@ bool Connection::ping(const ConnectionTimeouts & timeouts)
 
         UInt64 pong = 0;
         writeVarUInt(Protocol::Client::Ping, *out);
-        out->finishChunk();
         out->next();
 
         if (in->eof())
@@ -729,7 +660,6 @@ TablesStatusResponse Connection::getTablesStatus(const ConnectionTimeouts & time
 
     writeVarUInt(Protocol::Client::TablesStatusRequest, *out);
     request.write(*out, server_revision);
-    out->finishChunk();
     out->next();
 
     UInt64 response_type = 0;
@@ -883,8 +813,6 @@ void Connection::sendQuery(
     block_profile_events_in.reset();
     block_out.reset();
 
-    out->finishChunk();
-
     /// Send empty block which means end of data.
     if (!with_pending_data)
     {
@@ -901,7 +829,6 @@ void Connection::sendCancel()
         return;
 
     writeVarUInt(Protocol::Client::Cancel, *out);
-    out->finishChunk();
     out->next();
 }
 
@@ -927,10 +854,7 @@ void Connection::sendData(const Block & block, const String & name, bool scalar)
     size_t prev_bytes = out->count();
 
     block_out->write(block);
-    if (maybe_compressed_out != out)
-        maybe_compressed_out->next();
-    if (!block)
-        out->finishChunk();
+    maybe_compressed_out->next();
     out->next();
 
     if (throttler)
@@ -941,7 +865,6 @@ void Connection::sendIgnoredPartUUIDs(const std::vector<UUID> & uuids)
 {
     writeVarUInt(Protocol::Client::IgnoredPartUUIDs, *out);
     writeVectorBinary(uuids, *out);
-    out->finishChunk();
     out->next();
 }
 
@@ -951,7 +874,6 @@ void Connection::sendReadTaskResponse(const String & response)
     writeVarUInt(Protocol::Client::ReadTaskResponse, *out);
     writeVarUInt(DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION, *out);
     writeStringBinary(response, *out);
-    out->finishChunk();
     out->next();
 }
 
@@ -960,7 +882,6 @@ void Connection::sendMergeTreeReadTaskResponse(const ParallelReadResponse & resp
 {
     writeVarUInt(Protocol::Client::MergeTreeReadTaskResponse, *out);
     response.serialize(*out);
-    out->finishChunk();
     out->next();
 }
 
@@ -978,8 +899,6 @@ void Connection::sendPreparedData(ReadBuffer & input, size_t size, const String
         copyData(input, *out);
     else
         copyData(input, *out, size);
-
-    out->finishChunk();
     out->next();
 }
 
@@ -1008,8 +927,6 @@ void Connection::sendScalarsData(Scalars & data)
         sendData(elem.second, elem.first, true /* scalar */);
     }
 
-    out->finishChunk();
-
     out_bytes = out->count() - out_bytes;
     maybe_compressed_out_bytes = maybe_compressed_out->count() - maybe_compressed_out_bytes;
     double elapsed = watch.elapsedSeconds();
@@ -1152,13 +1069,13 @@ std::optional<Poco::Net::SocketAddress> Connection::getResolvedAddress() const
 
 bool Connection::poll(size_t timeout_microseconds)
 {
-    return in->poll(timeout_microseconds);
+    return static_cast<ReadBufferFromPocoSocket &>(*in).poll(timeout_microseconds);
 }
 
 
 bool Connection::hasReadPendingData() const
 {
-    return last_input_packet_type.has_value() || in->hasBufferedData();
+    return last_input_packet_type.has_value() || static_cast<const ReadBufferFromPocoSocket &>(*in).hasPendingData();
 }
 
 
@@ -1402,7 +1319,7 @@ Progress Connection::receiveProgress() const
 ProfileInfo Connection::receiveProfileInfo() const
 {
     ProfileInfo profile_info;
-    profile_info.read(*in, server_revision);
+    profile_info.read(*in);
     return profile_info;
 }
 
@@ -1432,8 +1349,6 @@ ServerConnectionPtr Connection::createConnection(const ConnectionParameters & pa
         parameters.default_database,
         parameters.user,
         parameters.password,
-        parameters.proto_send_chunked,
-        parameters.proto_recv_chunked,
         parameters.ssh_private_key,
         parameters.jwt,
         parameters.quota_key,
diff --git a/src/Client/Connection.h b/src/Client/Connection.h
index ed84bc51318..0f4b3e436df 100644
--- a/src/Client/Connection.h
+++ b/src/Client/Connection.h
@@ -8,8 +8,8 @@
 #include <Core/Defines.h>
 
 
-#include <IO/ReadBufferFromPocoSocketChunked.h>
-#include <IO/WriteBufferFromPocoSocketChunked.h>
+#include <IO/ReadBufferFromPocoSocket.h>
+#include <IO/WriteBufferFromPocoSocket.h>
 
 #include <Interpreters/TablesStatus.h>
 #include <Interpreters/Context_fwd.h>
@@ -52,7 +52,6 @@ public:
     Connection(const String & host_, UInt16 port_,
         const String & default_database_,
         const String & user_, const String & password_,
-        const String & proto_send_chunked_, const String & proto_recv_chunked_,
         const SSHKey & ssh_private_key_,
         const String & jwt_,
         const String & quota_key_,
@@ -171,10 +170,6 @@ private:
     String default_database;
     String user;
     String password;
-    String proto_send_chunked;
-    String proto_recv_chunked;
-    String proto_send_chunked_srv;
-    String proto_recv_chunked_srv;
 #if USE_SSH
     SSHKey ssh_private_key;
 #endif
@@ -214,8 +209,8 @@ private:
     String server_display_name;
 
     std::unique_ptr<Poco::Net::StreamSocket> socket;
-    std::shared_ptr<ReadBufferFromPocoSocketChunked> in;
-    std::shared_ptr<WriteBufferFromPocoSocketChunked> out;
+    std::shared_ptr<ReadBufferFromPocoSocket> in;
+    std::shared_ptr<WriteBufferFromPocoSocket> out;
     std::optional<UInt64> last_input_packet_type;
 
     String query_id;
diff --git a/src/Client/ConnectionEstablisher.cpp b/src/Client/ConnectionEstablisher.cpp
index f96546846c7..4bab643ed31 100644
--- a/src/Client/ConnectionEstablisher.cpp
+++ b/src/Client/ConnectionEstablisher.cpp
@@ -33,12 +33,12 @@ ConnectionEstablisher::ConnectionEstablisher(
 {
 }
 
-void ConnectionEstablisher::run(ConnectionEstablisher::TryResult & result, std::string & fail_message, bool force_connected)
+void ConnectionEstablisher::run(ConnectionEstablisher::TryResult & result, std::string & fail_message)
 {
     try
     {
         ProfileEvents::increment(ProfileEvents::DistributedConnectionTries);
-        result.entry = pool->get(*timeouts, settings, force_connected);
+        result.entry = pool->get(*timeouts, settings, /* force_connected = */ false);
         AsyncCallbackSetter async_setter(&*result.entry, std::move(async_callback));
 
         UInt64 server_revision = 0;
diff --git a/src/Client/ConnectionEstablisher.h b/src/Client/ConnectionEstablisher.h
index ff071e59aea..a3a01e63246 100644
--- a/src/Client/ConnectionEstablisher.h
+++ b/src/Client/ConnectionEstablisher.h
@@ -24,13 +24,7 @@ public:
                           const QualifiedTableName * table_to_check = nullptr);
 
     /// Establish connection and save it in result, write possible exception message in fail_message.
-    /// The connection is returned from connection pool and it can be stale. Use force_connected flag to ensure that connection is working one.
-    /// NOTE: force_connected is false by default due to the following consideration ...
-    ///      When true, it implies sending a Ping packet to another peer and, if it fails - reestablishing the connection.
-    ///      Ping-Pong round trip can be unnecessary in case of connection is still alive.
-    ///      So, the optimistic approach is used by default. In this case, stale connections can be handled by retrying,
-    ///      - see ConnectionPoolWithFailover, as example
-    void run(TryResult & result, std::string & fail_message, bool force_connected = false);
+    void run(TryResult & result, std::string & fail_message);
 
     /// Set async callback that will be called when reading from socket blocks.
     void setAsyncCallback(AsyncCallback async_callback_) { async_callback = std::move(async_callback_); }
diff --git a/src/Client/ConnectionParameters.cpp b/src/Client/ConnectionParameters.cpp
index 4d0a9ffa08c..303bebc30d2 100644
--- a/src/Client/ConnectionParameters.cpp
+++ b/src/Client/ConnectionParameters.cpp
@@ -107,9 +107,6 @@ ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfigurati
         }
     }
 
-    proto_send_chunked = config.getString("proto_caps.send", "notchunked");
-    proto_recv_chunked = config.getString("proto_caps.recv", "notchunked");
-
     quota_key = config.getString("quota_key", "");
 
     /// By default compression is disabled if address looks like localhost.
diff --git a/src/Client/ConnectionParameters.h b/src/Client/ConnectionParameters.h
index 382bfe34a3d..c305c7813f2 100644
--- a/src/Client/ConnectionParameters.h
+++ b/src/Client/ConnectionParameters.h
@@ -20,8 +20,6 @@ struct ConnectionParameters
     std::string default_database;
     std::string user;
     std::string password;
-    std::string proto_send_chunked = "notchunked";
-    std::string proto_recv_chunked = "notchunked";
     std::string quota_key;
     SSHKey ssh_private_key;
     std::string jwt;
diff --git a/src/Client/ConnectionPool.cpp b/src/Client/ConnectionPool.cpp
index ab8ad08826c..ed2e7c3c725 100644
--- a/src/Client/ConnectionPool.cpp
+++ b/src/Client/ConnectionPool.cpp
@@ -13,8 +13,6 @@ ConnectionPoolPtr ConnectionPoolFactory::get(
     String default_database,
     String user,
     String password,
-    String proto_send_chunked,
-    String proto_recv_chunked,
     String quota_key,
     String cluster,
     String cluster_secret,
@@ -24,7 +22,7 @@ ConnectionPoolPtr ConnectionPoolFactory::get(
     Priority priority)
 {
     Key key{
-        max_connections, host, port, default_database, user, password, proto_send_chunked, proto_recv_chunked, quota_key, cluster, cluster_secret, client_name, compression, secure, priority};
+        max_connections, host, port, default_database, user, password, quota_key, cluster, cluster_secret, client_name, compression, secure, priority};
 
     std::lock_guard lock(mutex);
     auto [it, inserted] = pools.emplace(key, ConnectionPoolPtr{});
@@ -41,8 +39,6 @@ ConnectionPoolPtr ConnectionPoolFactory::get(
             default_database,
             user,
             password,
-            proto_send_chunked,
-            proto_recv_chunked,
             quota_key,
             cluster,
             cluster_secret,
diff --git a/src/Client/ConnectionPool.h b/src/Client/ConnectionPool.h
index 219548b62a0..0fcb3c4e7e1 100644
--- a/src/Client/ConnectionPool.h
+++ b/src/Client/ConnectionPool.h
@@ -73,8 +73,6 @@ public:
         const String & default_database_,
         const String & user_,
         const String & password_,
-        const String & proto_send_chunked_,
-        const String & proto_recv_chunked_,
         const String & quota_key_,
         const String & cluster_,
         const String & cluster_secret_,
@@ -87,8 +85,6 @@ public:
         , default_database(default_database_)
         , user(user_)
         , password(password_)
-        , proto_send_chunked(proto_send_chunked_)
-        , proto_recv_chunked(proto_recv_chunked_)
         , quota_key(quota_key_)
         , cluster(cluster_)
         , cluster_secret(cluster_secret_)
@@ -120,9 +116,7 @@ protected:
     {
         return std::make_shared<Connection>(
             host, port,
-            default_database, user, password,
-            proto_send_chunked, proto_recv_chunked,
-            SSHKey(), /*jwt*/ "", quota_key,
+            default_database, user, password, SSHKey(), /*jwt*/ "", quota_key,
             cluster, cluster_secret,
             client_name, compression, secure);
     }
@@ -131,8 +125,6 @@ private:
     String default_database;
     String user;
     String password;
-    String proto_send_chunked;
-    String proto_recv_chunked;
     String quota_key;
 
     /// For inter-server authorization
@@ -158,8 +150,6 @@ public:
         String default_database;
         String user;
         String password;
-        String proto_send_chunked;
-        String proto_recv_chunked;
         String quota_key;
         String cluster;
         String cluster_secret;
@@ -183,8 +173,6 @@ public:
         String default_database,
         String user,
         String password,
-        String proto_send_chunked,
-        String proto_recv_chunked,
         String quota_key,
         String cluster,
         String cluster_secret,
@@ -202,7 +190,6 @@ inline bool operator==(const ConnectionPoolFactory::Key & lhs, const ConnectionP
 {
     return lhs.max_connections == rhs.max_connections && lhs.host == rhs.host && lhs.port == rhs.port
         && lhs.default_database == rhs.default_database && lhs.user == rhs.user && lhs.password == rhs.password
-        && lhs.proto_send_chunked == rhs.proto_send_chunked && lhs.proto_recv_chunked == rhs.proto_recv_chunked
         && lhs.quota_key == rhs.quota_key
         && lhs.cluster == rhs.cluster && lhs.cluster_secret == rhs.cluster_secret && lhs.client_name == rhs.client_name
         && lhs.compression == rhs.compression && lhs.secure == rhs.secure && lhs.priority == rhs.priority;
diff --git a/src/Client/LocalConnection.cpp b/src/Client/LocalConnection.cpp
index 7595a29912b..072184e0a66 100644
--- a/src/Client/LocalConnection.cpp
+++ b/src/Client/LocalConnection.cpp
@@ -365,7 +365,7 @@ bool LocalConnection::poll(size_t)
         {
             while (pollImpl())
             {
-                LOG_TEST(&Poco::Logger::get("LocalConnection"), "Executor timeout encountered, will retry");
+                LOG_DEBUG(&Poco::Logger::get("LocalConnection"), "Executor timeout encountered, will retry");
 
                 if (needSendProgressOrMetrics())
                     return true;
diff --git a/src/Common/QueryFuzzer.cpp b/src/Client/QueryFuzzer.cpp
similarity index 95%
rename from src/Common/QueryFuzzer.cpp
rename to src/Client/QueryFuzzer.cpp
index 0b2f6c09b45..f5b700ea529 100644
--- a/src/Common/QueryFuzzer.cpp
+++ b/src/Client/QueryFuzzer.cpp
@@ -68,21 +68,22 @@ Field QueryFuzzer::getRandomField(int type)
     {
     case 0:
     {
-        return bad_int64_values[fuzz_rand() % std::size(bad_int64_values)];
+        return bad_int64_values[fuzz_rand() % (sizeof(bad_int64_values)
+                / sizeof(*bad_int64_values))];
     }
     case 1:
     {
         static constexpr double values[]
                 = {NAN, INFINITY, -INFINITY, 0., -0., 0.0001, 0.5, 0.9999,
                    1., 1.0001, 2., 10.0001, 100.0001, 1000.0001, 1e10, 1e20,
-                  FLT_MIN, FLT_MIN + FLT_EPSILON, FLT_MAX, FLT_MAX + FLT_EPSILON}; return values[fuzz_rand() % std::size(values)];
+                  FLT_MIN, FLT_MIN + FLT_EPSILON, FLT_MAX, FLT_MAX + FLT_EPSILON}; return values[fuzz_rand() % (sizeof(values) / sizeof(*values))];
     }
     case 2:
     {
         static constexpr UInt64 scales[] = {0, 1, 2, 10};
         return DecimalField<Decimal64>(
-            bad_int64_values[fuzz_rand() % std::size(bad_int64_values)],
-            static_cast<UInt32>(scales[fuzz_rand() % std::size(scales)])
+            bad_int64_values[fuzz_rand() % (sizeof(bad_int64_values) / sizeof(*bad_int64_values))],
+            static_cast<UInt32>(scales[fuzz_rand() % (sizeof(scales) / sizeof(*scales))])
         );
     }
     default:
@@ -132,7 +133,7 @@ Field QueryFuzzer::fuzzField(Field field)
 
     if (type == Field::Types::String)
     {
-        auto & str = field.safeGet<std::string>();
+        auto & str = field.get<std::string>();
         UInt64 action = fuzz_rand() % 10;
         switch (action)
         {
@@ -158,14 +159,13 @@ Field QueryFuzzer::fuzzField(Field field)
     }
     else if (type == Field::Types::Array)
     {
-        auto & arr = field.safeGet<Array>();
+        auto & arr = field.get<Array>();
 
         if (fuzz_rand() % 5 == 0 && !arr.empty())
         {
             size_t pos = fuzz_rand() % arr.size();
             arr.erase(arr.begin() + pos);
-            if (debug_stream)
-                *debug_stream << "erased\n";
+            std::cerr << "erased\n";
         }
 
         if (fuzz_rand() % 5 == 0)
@@ -174,14 +174,12 @@ Field QueryFuzzer::fuzzField(Field field)
             {
                 size_t pos = fuzz_rand() % arr.size();
                 arr.insert(arr.begin() + pos, fuzzField(arr[pos]));
-                if (debug_stream)
-                    *debug_stream << fmt::format("inserted (pos {})\n", pos);
+                std::cerr << fmt::format("inserted (pos {})\n", pos);
             }
             else
             {
                 arr.insert(arr.begin(), getRandomField(0));
-                if (debug_stream)
-                    *debug_stream << "inserted (0)\n";
+                std::cerr << "inserted (0)\n";
             }
 
         }
@@ -193,15 +191,13 @@ Field QueryFuzzer::fuzzField(Field field)
     }
     else if (type == Field::Types::Tuple)
     {
-        auto & arr = field.safeGet<Tuple>();
+        auto & arr = field.get<Tuple>();
 
         if (fuzz_rand() % 5 == 0 && !arr.empty())
         {
             size_t pos = fuzz_rand() % arr.size();
             arr.erase(arr.begin() + pos);
-
-            if (debug_stream)
-                *debug_stream << "erased\n";
+            std::cerr << "erased\n";
         }
 
         if (fuzz_rand() % 5 == 0)
@@ -210,16 +206,12 @@ Field QueryFuzzer::fuzzField(Field field)
             {
                 size_t pos = fuzz_rand() % arr.size();
                 arr.insert(arr.begin() + pos, fuzzField(arr[pos]));
-
-                if (debug_stream)
-                    *debug_stream << fmt::format("inserted (pos {})\n", pos);
+                std::cerr << fmt::format("inserted (pos {})\n", pos);
             }
             else
             {
                 arr.insert(arr.begin(), getRandomField(0));
-
-                if (debug_stream)
-                    *debug_stream << "inserted (0)\n";
+                std::cerr << "inserted (0)\n";
             }
 
         }
@@ -352,8 +344,7 @@ void QueryFuzzer::fuzzOrderByList(IAST * ast)
         }
         else
         {
-            if (debug_stream)
-                *debug_stream << "No random column.\n";
+            std::cerr << "No random column.\n";
         }
     }
 
@@ -387,8 +378,7 @@ void QueryFuzzer::fuzzColumnLikeExpressionList(IAST * ast)
         if (col)
             impl->children.insert(pos, col);
         else
-            if (debug_stream)
-                *debug_stream << "No random column.\n";
+            std::cerr << "No random column.\n";
     }
 
     // We don't have to recurse here to fuzz the children, this is handled by
@@ -922,17 +912,17 @@ ASTPtr QueryFuzzer::fuzzLiteralUnderExpressionList(ASTPtr child)
     auto type = l->value.getType();
     if (type == Field::Types::Which::String && fuzz_rand() % 7 == 0)
     {
-        String value = l->value.safeGet<String>();
+        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.safeGet<UInt64>()));
+        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.safeGet<Int64>()));
+        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)
     {
@@ -940,22 +930,22 @@ ASTPtr QueryFuzzer::fuzzLiteralUnderExpressionList(ASTPtr child)
         if (decimal == 0)
             child = makeASTFunction(
                 "toDecimal32",
-                std::make_shared<ASTLiteral>(l->value.safeGet<Float64>()),
+                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.safeGet<Float64>()),
+                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.safeGet<Float64>()),
+                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.safeGet<Float64>()),
+                std::make_shared<ASTLiteral>(l->value.get<Float64>()),
                 std::make_shared<ASTLiteral>(static_cast<UInt64>(fuzz_rand() % 76)));
     }
 
@@ -1371,15 +1361,11 @@ void QueryFuzzer::fuzzMain(ASTPtr & ast)
     collectFuzzInfoMain(ast);
     fuzz(ast);
 
-    if (out_stream)
-    {
-        *out_stream << std::endl;
-
-        WriteBufferFromOStream ast_buf(*out_stream, 4096);
-        formatAST(*ast, ast_buf, false /*highlight*/);
-        ast_buf.finalize();
-        *out_stream << std::endl << std::endl;
-    }
+    std::cout << std::endl;
+    WriteBufferFromOStream ast_buf(std::cout, 4096);
+    formatAST(*ast, ast_buf, false /*highlight*/);
+    ast_buf.finalize();
+    std::cout << std::endl << std::endl;
 }
 
 }
diff --git a/src/Common/QueryFuzzer.h b/src/Client/QueryFuzzer.h
similarity index 91%
rename from src/Common/QueryFuzzer.h
rename to src/Client/QueryFuzzer.h
index 35d088809f2..6165e589cae 100644
--- a/src/Common/QueryFuzzer.h
+++ b/src/Client/QueryFuzzer.h
@@ -35,31 +35,9 @@ struct ASTWindowDefinition;
  * queries, so you want to feed it a lot of queries to get some interesting mix
  * of them. Normally we feed SQL regression tests to it.
  */
-class QueryFuzzer
+struct QueryFuzzer
 {
-public:
-    explicit QueryFuzzer(pcg64 fuzz_rand_ = randomSeed(), std::ostream * out_stream_ = nullptr, std::ostream * debug_stream_ = nullptr)
-        : fuzz_rand(fuzz_rand_)
-        , out_stream(out_stream_)
-        , debug_stream(debug_stream_)
-    {
-    }
-
-    // This is the only function you have to call -- it will modify the passed
-    // ASTPtr to point to new AST with some random changes.
-    void fuzzMain(ASTPtr & ast);
-
-    ASTs getInsertQueriesForFuzzedTables(const String & full_query);
-    ASTs getDropQueriesForFuzzedTables(const ASTDropQuery & drop_query);
-    void notifyQueryFailed(ASTPtr ast);
-
-    static bool isSuitableForFuzzing(const ASTCreateQuery & create);
-
-private:
-    pcg64 fuzz_rand;
-
-    std::ostream * out_stream = nullptr;
-    std::ostream * debug_stream = nullptr;
+    pcg64 fuzz_rand{randomSeed()};
 
     // We add elements to expression lists with fixed probability. Some elements
     // are so large, that the expected number of elements we add to them is
@@ -88,6 +66,10 @@ private:
     std::unordered_map<std::string, size_t> index_of_fuzzed_table;
     std::set<IAST::Hash> created_tables_hashes;
 
+    // This is the only function you have to call -- it will modify the passed
+    // ASTPtr to point to new AST with some random changes.
+    void fuzzMain(ASTPtr & ast);
+
     // Various helper functions follow, normally you shouldn't have to call them.
     Field getRandomField(int type);
     Field fuzzField(Field field);
@@ -95,6 +77,9 @@ private:
     ASTPtr getRandomExpressionList();
     DataTypePtr fuzzDataType(DataTypePtr type);
     DataTypePtr getRandomType();
+    ASTs getInsertQueriesForFuzzedTables(const String & full_query);
+    ASTs getDropQueriesForFuzzedTables(const ASTDropQuery & drop_query);
+    void notifyQueryFailed(ASTPtr ast);
     void replaceWithColumnLike(ASTPtr & ast);
     void replaceWithTableLike(ASTPtr & ast);
     void fuzzOrderByElement(ASTOrderByElement * elem);
@@ -117,6 +102,8 @@ private:
     void addTableLike(ASTPtr ast);
     void addColumnLike(ASTPtr ast);
     void collectFuzzInfoRecurse(ASTPtr ast);
+
+    static bool isSuitableForFuzzing(const ASTCreateQuery & create);
 };
 
 }
diff --git a/src/Client/ReplxxLineReader.cpp b/src/Client/ReplxxLineReader.cpp
index 37ceb471e5b..3b3508d1a58 100644
--- a/src/Client/ReplxxLineReader.cpp
+++ b/src/Client/ReplxxLineReader.cpp
@@ -294,19 +294,17 @@ ReplxxLineReader::ReplxxLineReader(
     Suggest & suggest,
     const String & history_file_path_,
     bool multiline_,
-    bool ignore_shell_suspend,
     Patterns extenders_,
     Patterns delimiters_,
     const char word_break_characters_[],
     replxx::Replxx::highlighter_callback_t highlighter_,
-    std::istream & input_stream_,
-    std::ostream & output_stream_,
-    int in_fd_,
-    int out_fd_,
-    int err_fd_
+    [[ maybe_unused ]] std::istream & input_stream_,
+    [[ maybe_unused ]] std::ostream & output_stream_,
+    [[ maybe_unused ]] int in_fd_,
+    [[ maybe_unused ]] int out_fd_,
+    [[ maybe_unused ]] int err_fd_
 )
     : LineReader(history_file_path_, multiline_, std::move(extenders_), std::move(delimiters_), input_stream_, output_stream_, in_fd_)
-    , rx(input_stream_, output_stream_, in_fd_, out_fd_, err_fd_)
     , highlighter(std::move(highlighter_))
     , word_break_characters(word_break_characters_)
     , editor(getEditor())
@@ -365,8 +363,7 @@ ReplxxLineReader::ReplxxLineReader(
     rx.bind_key(Replxx::KEY::control('P'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::HISTORY_PREVIOUS, code); });
 
     /// We don't want the default, "suspend" behavior, it confuses people.
-    if (ignore_shell_suspend)
-        rx.bind_key_internal(replxx::Replxx::KEY::control('Z'), "insert_character");
+    rx.bind_key_internal(replxx::Replxx::KEY::control('Z'), "insert_character");
 
     auto commit_action = [this](char32_t code)
     {
@@ -517,7 +514,7 @@ void ReplxxLineReader::addToHistory(const String & line)
     rx.history_add(line);
 
     // flush changes to the disk
-    if (history_file_fd >= 0 && !rx.history_save(history_file_path))
+    if (!rx.history_save(history_file_path))
         rx.print("Saving history failed: %s\n", errnoToString().c_str());
 
     if (history_file_fd >= 0 && locked && 0 != flock(history_file_fd, LOCK_UN))
diff --git a/src/Client/ReplxxLineReader.h b/src/Client/ReplxxLineReader.h
index 1dbad2c70dd..c46080420ef 100644
--- a/src/Client/ReplxxLineReader.h
+++ b/src/Client/ReplxxLineReader.h
@@ -15,7 +15,6 @@ public:
         Suggest & suggest,
         const String & history_file_path,
         bool multiline,
-        bool ignore_shell_suspend,
         Patterns extenders_,
         Patterns delimiters_,
         const char word_break_characters_[],
diff --git a/src/Client/Suggest.cpp b/src/Client/Suggest.cpp
index affd620f83a..0188ebc8173 100644
--- a/src/Client/Suggest.cpp
+++ b/src/Client/Suggest.cpp
@@ -214,7 +214,7 @@ void Suggest::fillWordsFromBlock(const Block & block)
     Words new_words;
     new_words.reserve(rows);
     for (size_t i = 0; i < rows; ++i)
-        new_words.emplace_back(column[i].safeGet<String>());
+        new_words.emplace_back(column[i].get<String>());
 
     addWords(std::move(new_words));
 }
diff --git a/src/Client/TestHint.cpp b/src/Client/TestHint.cpp
index 74c65009a73..b64882577ee 100644
--- a/src/Client/TestHint.cpp
+++ b/src/Client/TestHint.cpp
@@ -10,7 +10,6 @@
 namespace DB::ErrorCodes
 {
     extern const int CANNOT_PARSE_TEXT;
-    extern const int OK;
 }
 
 namespace DB
@@ -63,28 +62,9 @@ bool TestHint::hasExpectedServerError(int error)
     return std::find(server_errors.begin(), server_errors.end(), error) != server_errors.end();
 }
 
-bool TestHint::needRetry(const std::unique_ptr<Exception> & server_exception, size_t * retries_counter)
-{
-    chassert(retries_counter);
-    if (max_retries <= *retries_counter)
-        return false;
-
-    ++*retries_counter;
-
-    int error = ErrorCodes::OK;
-    if (server_exception)
-        error = server_exception->code();
-
-
-    if (retry_until)
-        return !hasExpectedServerError(error);  /// retry until we get the expected error
-    else
-        return hasExpectedServerError(error);   /// retry while we have the expected error
-}
-
 void TestHint::parse(Lexer & comment_lexer, bool is_leading_hint)
 {
-    std::unordered_set<std::string_view> commands{"echo", "echoOn", "echoOff", "retry"};
+    std::unordered_set<std::string_view> commands{"echo", "echoOn", "echoOff"};
 
     std::unordered_set<std::string_view> command_errors{
         "serverError",
@@ -93,9 +73,6 @@ void TestHint::parse(Lexer & comment_lexer, bool is_leading_hint)
 
     for (Token token = comment_lexer.nextToken(); !token.isEnd(); token = comment_lexer.nextToken())
     {
-        if (token.type == TokenType::Whitespace)
-            continue;
-
         String item = String(token.begin, token.end);
         if (token.type == TokenType::BareWord && commands.contains(item))
         {
@@ -105,30 +82,6 @@ void TestHint::parse(Lexer & comment_lexer, bool is_leading_hint)
                 echo.emplace(true);
             if (item == "echoOff")
                 echo.emplace(false);
-
-            if (item == "retry")
-            {
-                token = comment_lexer.nextToken();
-                while (token.type == TokenType::Whitespace)
-                    token = comment_lexer.nextToken();
-
-                if (token.type != TokenType::Number)
-                    throw DB::Exception(DB::ErrorCodes::CANNOT_PARSE_TEXT, "Could not parse the number of retries: {}",
-                                        std::string_view(token.begin, token.end));
-
-                max_retries = std::stoul(std::string(token.begin, token.end));
-
-                token = comment_lexer.nextToken();
-                while (token.type == TokenType::Whitespace)
-                    token = comment_lexer.nextToken();
-
-                if (token.type != TokenType::BareWord ||
-                    (std::string_view(token.begin, token.end) != "until" &&
-                    std::string_view(token.begin, token.end) != "while"))
-                    throw DB::Exception(DB::ErrorCodes::CANNOT_PARSE_TEXT, "Expected 'until' or 'while' after the number of retries, got: {}",
-                                        std::string_view(token.begin, token.end));
-                retry_until = std::string_view(token.begin, token.end) == "until";
-            }
         }
         else if (!is_leading_hint && token.type == TokenType::BareWord && command_errors.contains(item))
         {
@@ -180,9 +133,6 @@ void TestHint::parse(Lexer & comment_lexer, bool is_leading_hint)
             break;
         }
     }
-
-    if (max_retries && server_errors.size() != 1)
-        throw DB::Exception(DB::ErrorCodes::CANNOT_PARSE_TEXT, "Expected one serverError after the 'retry N while|until' command");
 }
 
 }
diff --git a/src/Client/TestHint.h b/src/Client/TestHint.h
index bbe7873c08b..b76c4245df4 100644
--- a/src/Client/TestHint.h
+++ b/src/Client/TestHint.h
@@ -6,7 +6,6 @@
 #include <fmt/format.h>
 
 #include <Core/Types.h>
-#include <Common/Exception.h>
 
 
 namespace DB
@@ -66,17 +65,12 @@ public:
     bool hasExpectedClientError(int error);
     bool hasExpectedServerError(int error);
 
-    bool needRetry(const std::unique_ptr<Exception> & server_exception, size_t * retries_counter);
-
 private:
     const String & query;
     ErrorVector server_errors{};
     ErrorVector client_errors{};
     std::optional<bool> echo;
 
-    size_t max_retries = 0;
-    bool retry_until = false;
-
     void parse(Lexer & comment_lexer, bool is_leading_hint);
 
     bool allErrorsExpected(int actual_server_error, int actual_client_error) const
diff --git a/src/Columns/ColumnAggregateFunction.cpp b/src/Columns/ColumnAggregateFunction.cpp
index d3363d91a46..4bc48c62eb4 100644
--- a/src/Columns/ColumnAggregateFunction.cpp
+++ b/src/Columns/ColumnAggregateFunction.cpp
@@ -457,9 +457,9 @@ MutableColumnPtr ColumnAggregateFunction::cloneEmpty() const
 Field ColumnAggregateFunction::operator[](size_t n) const
 {
     Field field = AggregateFunctionStateData();
-    field.safeGet<AggregateFunctionStateData &>().name = type_string;
+    field.get<AggregateFunctionStateData &>().name = type_string;
     {
-        WriteBufferFromString buffer(field.safeGet<AggregateFunctionStateData &>().data);
+        WriteBufferFromString buffer(field.get<AggregateFunctionStateData &>().data);
         func->serialize(data[n], buffer, version);
     }
     return field;
@@ -467,7 +467,12 @@ Field ColumnAggregateFunction::operator[](size_t n) const
 
 void ColumnAggregateFunction::get(size_t n, Field & res) const
 {
-    res = operator[](n);
+    res = AggregateFunctionStateData();
+    res.get<AggregateFunctionStateData &>().name = type_string;
+    {
+        WriteBufferFromString buffer(res.get<AggregateFunctionStateData &>().data);
+        func->serialize(data[n], buffer, version);
+    }
 }
 
 StringRef ColumnAggregateFunction::getDataAt(size_t n) const
@@ -547,7 +552,7 @@ void ColumnAggregateFunction::insert(const Field & x)
             "Inserting field of type {} into ColumnAggregateFunction. Expected {}",
             x.getTypeName(), Field::Types::AggregateFunctionState);
 
-    const auto & field_name = x.safeGet<const AggregateFunctionStateData &>().name;
+    const auto & field_name = x.get<const AggregateFunctionStateData &>().name;
     if (type_string != field_name)
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot insert filed with type {} into column with type {}",
                 field_name, type_string);
@@ -555,7 +560,7 @@ void ColumnAggregateFunction::insert(const Field & x)
     ensureOwnership();
     Arena & arena = createOrGetArena();
     pushBackAndCreateState(data, arena, func.get());
-    ReadBufferFromString read_buffer(x.safeGet<const AggregateFunctionStateData &>().data);
+    ReadBufferFromString read_buffer(x.get<const AggregateFunctionStateData &>().data);
     func->deserialize(data.back(), read_buffer, version, &arena);
 }
 
@@ -564,14 +569,14 @@ bool ColumnAggregateFunction::tryInsert(const DB::Field & x)
     if (x.getType() != Field::Types::AggregateFunctionState)
         return false;
 
-    const auto & field_name = x.safeGet<const AggregateFunctionStateData &>().name;
+    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.safeGet<const AggregateFunctionStateData &>().data);
+    ReadBufferFromString read_buffer(x.get<const AggregateFunctionStateData &>().data);
     func->deserialize(data.back(), read_buffer, version, &arena);
     return true;
 }
diff --git a/src/Columns/ColumnArray.cpp b/src/Columns/ColumnArray.cpp
index 83d4c24c769..19cce678cc7 100644
--- a/src/Columns/ColumnArray.cpp
+++ b/src/Columns/ColumnArray.cpp
@@ -141,7 +141,7 @@ void ColumnArray::get(size_t n, Field & res) const
             size, max_array_size_as_field);
 
     res = Array();
-    Array & res_arr = res.safeGet<Array &>();
+    Array & res_arr = res.get<Array &>();
     res_arr.reserve(size);
 
     for (size_t i = 0; i < size; ++i)
@@ -309,7 +309,7 @@ void ColumnArray::updateHashFast(SipHash & hash) const
 
 void ColumnArray::insert(const Field & x)
 {
-    const Array & array = x.safeGet<const Array &>();
+    const Array & array = x.get<const Array &>();
     size_t size = array.size();
     for (size_t i = 0; i < size; ++i)
         getData().insert(array[i]);
@@ -321,7 +321,7 @@ bool ColumnArray::tryInsert(const Field & x)
     if (x.getType() != Field::Types::Which::Array)
         return false;
 
-    const Array & array = x.safeGet<const Array &>();
+    const Array & array = x.get<const Array &>();
     size_t size = array.size();
     for (size_t i = 0; i < size; ++i)
     {
@@ -452,27 +452,6 @@ void ColumnArray::reserve(size_t 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.
 }
 
-size_t ColumnArray::capacity() const
-{
-    return getOffsets().capacity();
-}
-
-void ColumnArray::prepareForSquashing(const Columns & source_columns)
-{
-    size_t new_size = size();
-    Columns source_data_columns;
-    source_data_columns.reserve(source_columns.size());
-    for (const auto & source_column : source_columns)
-    {
-        const auto & source_array_column = assert_cast<const ColumnArray &>(*source_column);
-        new_size += source_array_column.size();
-        source_data_columns.push_back(source_array_column.getDataPtr());
-    }
-
-    getOffsets().reserve_exact(new_size);
-    data->prepareForSquashing(source_data_columns);
-}
-
 void ColumnArray::shrinkToFit()
 {
     getOffsets().shrink_to_fit();
diff --git a/src/Columns/ColumnArray.h b/src/Columns/ColumnArray.h
index f77268a8be6..63affb86d9d 100644
--- a/src/Columns/ColumnArray.h
+++ b/src/Columns/ColumnArray.h
@@ -118,8 +118,6 @@ 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;
-    size_t capacity() const override;
-    void prepareForSquashing(const Columns & source_columns) override;
     void shrinkToFit() override;
     void ensureOwnership() override;
     size_t byteSize() const override;
diff --git a/src/Columns/ColumnDecimal.h b/src/Columns/ColumnDecimal.h
index 6f8360a54dd..59bfbd2159c 100644
--- a/src/Columns/ColumnDecimal.h
+++ b/src/Columns/ColumnDecimal.h
@@ -53,7 +53,6 @@ public:
     size_t allocatedBytes() const override { return data.allocated_bytes(); }
     void protect() override { data.protect(); }
     void reserve(size_t n) override { data.reserve_exact(n); }
-    size_t capacity() const override { return data.capacity(); }
     void shrinkToFit() override { data.shrink_to_fit(); }
 
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
@@ -75,7 +74,7 @@ public:
     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.safeGet<T>()); }
+    void insert(const Field & x) override { data.push_back(x.get<T>()); }
     bool tryInsert(const Field & x) override;
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
diff --git a/src/Columns/ColumnDynamic.cpp b/src/Columns/ColumnDynamic.cpp
index a0a9bda7678..a92d54dd675 100644
--- a/src/Columns/ColumnDynamic.cpp
+++ b/src/Columns/ColumnDynamic.cpp
@@ -1,21 +1,17 @@
 #include <Columns/ColumnDynamic.h>
 
 #include <Columns/ColumnCompressed.h>
-#include <Columns/ColumnString.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeVariant.h>
 #include <DataTypes/DataTypeString.h>
-#include <DataTypes/Serializations/SerializationString.h>
 #include <DataTypes/DataTypeNothing.h>
 #include <DataTypes/FieldToDataType.h>
 #include <DataTypes/DataTypesBinaryEncoding.h>
 #include <Common/Arena.h>
 #include <Common/SipHash.h>
 #include <Processors/Transforms/ColumnGathererTransform.h>
-#include <IO/WriteBufferFromVector.h>
-#include <IO/ReadBufferFromMemory.h>
-#include <IO/WriteBufferFromString.h>
-#include <Formats/FormatSettings.h>
+#include <Interpreters/castColumn.h>
+#include <Common/logger_useful.h>
 
 namespace DB
 {
@@ -26,80 +22,31 @@ namespace ErrorCodes
     extern const int PARAMETER_OUT_OF_BOUND;
 }
 
-namespace
-{
 
-/// Static default format settings to avoid creating it every time.
-const FormatSettings & getFormatSettings()
+ColumnDynamic::ColumnDynamic(size_t max_dynamic_types_) : max_dynamic_types(max_dynamic_types_)
 {
-    static const FormatSettings settings;
-    return settings;
-}
-
-}
-
-/// Shared variant will contain String values but we cannot use usual String type
-/// because we can have regular variant with type String.
-/// To solve it, we use String type with custom name for shared variant.
-DataTypePtr ColumnDynamic::getSharedVariantDataType()
-{
-    return DataTypeFactory::instance().getCustom("String", std::make_unique<DataTypeCustomDesc>(std::make_unique<DataTypeCustomFixedName>(getSharedVariantTypeName())));
-}
-
-ColumnDynamic::ColumnDynamic(size_t max_dynamic_types_) : max_dynamic_types(max_dynamic_types_), global_max_dynamic_types(max_dynamic_types)
-{
-    /// Create Variant with shared variant.
-    setVariantType(std::make_shared<DataTypeVariant>(DataTypes{getSharedVariantDataType()}));
+    /// Create empty Variant.
+    variant_info.variant_type = std::make_shared<DataTypeVariant>(DataTypes{});
+    variant_info.variant_name = variant_info.variant_type->getName();
+    variant_column = variant_info.variant_type->createColumn();
 }
 
 ColumnDynamic::ColumnDynamic(
-    MutableColumnPtr variant_column_, const DataTypePtr & variant_type_, size_t max_dynamic_types_, size_t global_max_dynamic_types_, const StatisticsPtr & statistics_)
+    MutableColumnPtr variant_column_, const VariantInfo & variant_info_, size_t max_dynamic_types_, const Statistics & statistics_)
     : variant_column(std::move(variant_column_))
-    , variant_column_ptr(assert_cast<ColumnVariant *>(variant_column.get()))
-    , max_dynamic_types(max_dynamic_types_)
-    , global_max_dynamic_types(global_max_dynamic_types_)
-    , statistics(statistics_)
-{
-    createVariantInfo(variant_type_);
-}
-
-ColumnDynamic::ColumnDynamic(
-    MutableColumnPtr variant_column_, const VariantInfo & variant_info_, size_t max_dynamic_types_, size_t global_max_dynamic_types_, const StatisticsPtr & statistics_)
-    : variant_column(std::move(variant_column_))
-    , variant_column_ptr(assert_cast<ColumnVariant *>(variant_column.get()))
     , variant_info(variant_info_)
     , max_dynamic_types(max_dynamic_types_)
-    , global_max_dynamic_types(global_max_dynamic_types_)
     , statistics(statistics_)
 {
 }
 
-void ColumnDynamic::setVariantType(const DataTypePtr & variant_type)
-{
-    if (variant_column && !empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Setting specific variant type is allowed only for empty dynamic column");
-
-    variant_column = variant_type->createColumn();
-    variant_column_ptr = assert_cast<ColumnVariant *>(variant_column.get());
-    createVariantInfo(variant_type);
-}
-
-void ColumnDynamic::setMaxDynamicPaths(size_t max_dynamic_type_)
-{
-    if (variant_column && !empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Setting specific max_dynamic_type parameter is allowed only for empty dynamic column");
-
-    max_dynamic_types = max_dynamic_type_;
-}
-
-void ColumnDynamic::createVariantInfo(const DataTypePtr & variant_type)
+ColumnDynamic::MutablePtr ColumnDynamic::create(MutableColumnPtr variant_column, const DataTypePtr & variant_type, size_t max_dynamic_types_, const Statistics & statistics_)
 {
+    VariantInfo variant_info;
     variant_info.variant_type = variant_type;
     variant_info.variant_name = variant_type->getName();
     const auto & variants = assert_cast<const DataTypeVariant &>(*variant_type).getVariants();
-    variant_info.variant_names.clear();
     variant_info.variant_names.reserve(variants.size());
-    variant_info.variant_name_to_discriminator.clear();
     variant_info.variant_name_to_discriminator.reserve(variants.size());
     for (ColumnVariant::Discriminator discr = 0; discr != variants.size(); ++discr)
     {
@@ -107,26 +54,30 @@ void ColumnDynamic::createVariantInfo(const DataTypePtr & variant_type)
         variant_info.variant_name_to_discriminator[variant_name] = discr;
     }
 
-    if (!variant_info.variant_name_to_discriminator.contains(getSharedVariantTypeName()))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Variant in Dynamic column doesn't contain shared variant");
+    return create(std::move(variant_column), variant_info, max_dynamic_types_, statistics_);
 }
 
-bool ColumnDynamic::addNewVariant(const DataTypePtr & new_variant, const String & new_variant_name)
+bool ColumnDynamic::addNewVariant(const DB::DataTypePtr & new_variant)
 {
     /// Check if we already have such variant.
-    if (variant_info.variant_name_to_discriminator.contains(new_variant_name))
+    if (variant_info.variant_name_to_discriminator.contains(new_variant->getName()))
         return true;
 
     /// Check if we reached maximum number of variants.
-    if (!canAddNewVariant())
+    if (variant_info.variant_names.size() >= max_dynamic_types)
     {
-        /// Dynamic column should always have shared variant.
-        if (!variant_info.variant_name_to_discriminator.contains(getSharedVariantTypeName()))
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Maximum number of variants reached, but no shared variant exists");
+        /// ColumnDynamic can have max_dynamic_types number of variants only when it has String as a variant.
+        /// Otherwise we won't be able to cast new variants to Strings.
+        if (!variant_info.variant_name_to_discriminator.contains("String"))
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Maximum number of variants reached, but no String variant exists");
 
         return false;
     }
 
+    /// If we have (max_dynamic_types - 1) number of variants and don't have String variant, we can add only String variant.
+    if (variant_info.variant_names.size() == max_dynamic_types - 1 && new_variant->getName() != "String" && !variant_info.variant_name_to_discriminator.contains("String"))
+        return false;
+
     const DataTypes & current_variants = assert_cast<const DataTypeVariant &>(*variant_info.variant_type).getVariants();
     DataTypes all_variants = current_variants;
     all_variants.push_back(new_variant);
@@ -135,15 +86,21 @@ bool ColumnDynamic::addNewVariant(const DataTypePtr & new_variant, const String
     return true;
 }
 
-void extendVariantColumn(
-    IColumn & variant_column,
-    const DataTypePtr & old_variant_type,
-    const DataTypePtr & new_variant_type,
-    std::unordered_map<String, UInt8> old_variant_name_to_discriminator)
+void ColumnDynamic::addStringVariant()
 {
-    const DataTypes & current_variants =  assert_cast<const DataTypeVariant *>(old_variant_type.get())->getVariants();
+    if (!addNewVariant(std::make_shared<DataTypeString>()))
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot add String variant to Dynamic column, it's a bug");
+}
+
+void ColumnDynamic::updateVariantInfoAndExpandVariantColumn(const DB::DataTypePtr & new_variant_type)
+{
+    const DataTypes & current_variants =  assert_cast<const DataTypeVariant *>(variant_info.variant_type.get())->getVariants();
     const DataTypes & new_variants = assert_cast<const DataTypeVariant *>(new_variant_type.get())->getVariants();
 
+    Names new_variant_names;
+    new_variant_names.reserve(new_variants.size());
+    std::unordered_map<String, ColumnVariant::Discriminator> new_variant_name_to_discriminator;
+    new_variant_name_to_discriminator.reserve(new_variants.size());
     std::vector<std::pair<MutableColumnPtr, ColumnVariant::Discriminator>> new_variant_columns_and_discriminators_to_add;
     new_variant_columns_and_discriminators_to_add.reserve(new_variants.size() - current_variants.size());
     std::vector<ColumnVariant::Discriminator> current_to_new_discriminators;
@@ -151,26 +108,26 @@ void extendVariantColumn(
 
     for (ColumnVariant::Discriminator discr = 0; discr != new_variants.size(); ++discr)
     {
-        auto current_it = old_variant_name_to_discriminator.find(new_variants[discr]->getName());
-        if (current_it == old_variant_name_to_discriminator.end())
+        const auto & name = new_variant_names.emplace_back(new_variants[discr]->getName());
+        new_variant_name_to_discriminator[name] = discr;
+
+        auto current_it = variant_info.variant_name_to_discriminator.find(name);
+        if (current_it == variant_info.variant_name_to_discriminator.end())
             new_variant_columns_and_discriminators_to_add.emplace_back(new_variants[discr]->createColumn(), discr);
         else
             current_to_new_discriminators[current_it->second] = discr;
     }
 
-    assert_cast<ColumnVariant &>(variant_column).extend(current_to_new_discriminators, std::move(new_variant_columns_and_discriminators_to_add));
-}
-
-void ColumnDynamic::updateVariantInfoAndExpandVariantColumn(const DataTypePtr & new_variant_type)
-{
-    extendVariantColumn(*variant_column, variant_info.variant_type, new_variant_type, variant_info.variant_name_to_discriminator);
-    createVariantInfo(new_variant_type);
-
+    variant_info.variant_type = new_variant_type;
+    variant_info.variant_name = new_variant_type->getName();
+    variant_info.variant_names = new_variant_names;
+    variant_info.variant_name_to_discriminator = new_variant_name_to_discriminator;
+    assert_cast<ColumnVariant &>(*variant_column).extend(current_to_new_discriminators, std::move(new_variant_columns_and_discriminators_to_add));
     /// Clear mappings cache because now with new Variant we will have new mappings.
     variant_mappings_cache.clear();
 }
 
-std::vector<ColumnVariant::Discriminator> * ColumnDynamic::combineVariants(const ColumnDynamic::VariantInfo & other_variant_info)
+std::vector<ColumnVariant::Discriminator> * ColumnDynamic::combineVariants(const DB::ColumnDynamic::VariantInfo & other_variant_info)
 {
     /// Check if we already have global discriminators mapping for other Variant in cache.
     /// It's used to not calculate the same mapping each call of insertFrom with the same columns.
@@ -197,13 +154,20 @@ std::vector<ColumnVariant::Discriminator> * ColumnDynamic::combineVariants(const
         const DataTypes & current_variants = assert_cast<const DataTypeVariant &>(*variant_info.variant_type).getVariants();
 
         /// We cannot combine Variants if total number of variants exceeds max_dynamic_types.
-        if (!canAddNewVariants(num_new_variants))
+        if (current_variants.size() + num_new_variants > max_dynamic_types)
         {
             /// Remember that we cannot combine our variant with this one, so we will not try to do it again.
             variants_with_failed_combination.insert(other_variant_info.variant_name);
             return nullptr;
         }
 
+        /// We cannot combine Variants if total number of variants reaches max_dynamic_types and we don't have String variant.
+        if (current_variants.size() + num_new_variants == max_dynamic_types && !variant_info.variant_name_to_discriminator.contains("String") && !other_variant_info.variant_name_to_discriminator.contains("String"))
+        {
+            variants_with_failed_combination.insert(other_variant_info.variant_name);
+            return nullptr;
+        }
+
         DataTypes all_variants = current_variants;
         all_variants.insert(all_variants.end(), other_variants.begin(), other_variants.end());
         auto new_variant_type = std::make_shared<DataTypeVariant>(all_variants);
@@ -221,93 +185,40 @@ std::vector<ColumnVariant::Discriminator> * ColumnDynamic::combineVariants(const
     return &it->second;
 }
 
-void ColumnDynamic::insert(const Field & x)
+void ColumnDynamic::insert(const DB::Field & x)
 {
-    if (x.isNull())
-    {
-        insertDefault();
+    /// Check if we can insert field without Variant extension.
+    if (variant_column->tryInsert(x))
         return;
-    }
-
-    auto & variant_col = getVariantColumn();
-    auto shared_variant_discr = getSharedVariantDiscriminator();
-    /// Check if we can insert field into existing variants and avoid Variant extension.
-    for (size_t i = 0; i != variant_col.getNumVariants(); ++i)
-    {
-        if (i != shared_variant_discr && variant_col.getVariantByGlobalDiscriminator(i).tryInsert(x))
-        {
-            variant_col.getLocalDiscriminators().push_back(variant_col.localDiscriminatorByGlobal(i));
-            variant_col.getOffsets().push_back(variant_col.getVariantByGlobalDiscriminator(i).size() - 1);
-            return;
-        }
-    }
 
     /// If we cannot insert field into current variant column, extend it with new variant for this field from its type.
-    auto field_data_type = applyVisitor(FieldToDataType(), x);
-    auto field_data_type_name = field_data_type->getName();
-    if (addNewVariant(field_data_type, field_data_type_name))
+    if (addNewVariant(applyVisitor(FieldToDataType(), x)))
     {
-        /// Insert this field into newly added variant.
-        auto discr = variant_info.variant_name_to_discriminator[field_data_type_name];
-        variant_col.getVariantByGlobalDiscriminator(discr).insert(x);
-        variant_col.getLocalDiscriminators().push_back(variant_col.localDiscriminatorByGlobal(discr));
-        variant_col.getOffsets().push_back(variant_col.getVariantByGlobalDiscriminator(discr).size() - 1);
+        /// Now we should be able to insert this field into extended variant column.
+        variant_column->insert(x);
     }
     else
     {
         /// We reached maximum number of variants and couldn't add new variant.
-        /// In this case we add the value of this new variant into special shared variant.
-        /// We store values in shared variant in binary form with binary encoded type.
-        auto & shared_variant = getSharedVariant();
-        auto & chars = shared_variant.getChars();
-        WriteBufferFromVector<ColumnString::Chars> value_buf(chars, AppendModeTag());
-        encodeDataType(field_data_type, value_buf);
-        getVariantSerialization(field_data_type, field_data_type_name)->serializeBinary(x, value_buf, getFormatSettings());
-        value_buf.finalize();
-        chars.push_back(0);
-        shared_variant.getOffsets().push_back(chars.size());
-        variant_col.getLocalDiscriminators().push_back(variant_col.localDiscriminatorByGlobal(shared_variant_discr));
-        variant_col.getOffsets().push_back(shared_variant.size() - 1);
+        /// This case should be really rare in real use cases.
+        /// We should always be able to add String variant and cast inserted value to String.
+        addStringVariant();
+        variant_column->insert(toString(x));
     }
 }
 
-bool ColumnDynamic::tryInsert(const Field & x)
+bool ColumnDynamic::tryInsert(const DB::Field & x)
 {
     /// We can insert any value into Dynamic column.
     insert(x);
     return true;
 }
 
-Field ColumnDynamic::operator[](size_t n) const
-{
-    Field res;
-    get(n, res);
-    return res;
-}
-
-void ColumnDynamic::get(size_t n, Field & res) const
-{
-    const auto & variant_col = getVariantColumn();
-    /// Check if value is not in shared variant.
-    if (variant_col.globalDiscriminatorAt(n) != getSharedVariantDiscriminator())
-    {
-        variant_col.get(n, res);
-        return;
-    }
-
-    /// We should deeserialize value from shared variant.
-    const auto & shared_variant = getSharedVariant();
-    auto value_data = shared_variant.getDataAt(variant_col.offsetAt(n));
-    ReadBufferFromMemory buf(value_data.data, value_data.size);
-    auto type = decodeDataType(buf);
-    type->getDefaultSerialization()->deserializeBinary(res, buf, getFormatSettings());
-}
-
 
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
-void ColumnDynamic::insertFrom(const IColumn & src_, size_t n)
+void ColumnDynamic::insertFrom(const DB::IColumn & src_, size_t n)
 #else
-void ColumnDynamic::doInsertFrom(const IColumn & src_, size_t n)
+void ColumnDynamic::doInsertFrom(const DB::IColumn & src_, size_t n)
 #endif
 {
     const auto & dynamic_src = assert_cast<const ColumnDynamic &>(src_);
@@ -315,33 +226,11 @@ void ColumnDynamic::doInsertFrom(const IColumn & src_, size_t n)
     /// Check if we have the same variants in both columns.
     if (variant_info.variant_name == dynamic_src.variant_info.variant_name)
     {
-        variant_column_ptr->insertFrom(*dynamic_src.variant_column, n);
+        variant_column->insertFrom(*dynamic_src.variant_column, n);
         return;
     }
 
-    auto & variant_col = getVariantColumn();
-    const auto & src_variant_col = dynamic_src.getVariantColumn();
-    auto src_global_discr = src_variant_col.globalDiscriminatorAt(n);
-    auto src_offset = src_variant_col.offsetAt(n);
-
-    /// Check if we insert from shared variant and process it separately.
-    if (src_global_discr == dynamic_src.getSharedVariantDiscriminator())
-    {
-        const auto & src_shared_variant = dynamic_src.getSharedVariant();
-        auto value = src_shared_variant.getDataAt(src_offset);
-        /// Decode data type of this value.
-        ReadBufferFromMemory buf(value.data, value.size);
-        auto type = decodeDataType(buf);
-        auto type_name = type->getName();
-        /// Check if we have this variant and deserialize value into variant from shared variant data.
-        if (auto it = variant_info.variant_name_to_discriminator.find(type_name); it != variant_info.variant_name_to_discriminator.end())
-            variant_col.deserializeBinaryIntoVariant(it->second, getVariantSerialization(type, type_name), buf, getFormatSettings());
-        /// Otherwise just insert it into our shared variant.
-        else
-            variant_col.insertIntoVariantFrom(getSharedVariantDiscriminator(), src_shared_variant, src_offset);
-
-        return;
-    }
+    auto & variant_col = assert_cast<ColumnVariant &>(*variant_column);
 
     /// If variants are different, we need to extend our variant with new variants.
     if (auto * global_discriminators_mapping = combineVariants(dynamic_src.variant_info))
@@ -352,6 +241,8 @@ void ColumnDynamic::doInsertFrom(const IColumn & src_, size_t n)
 
     /// We cannot combine 2 Variant types as total number of variants exceeds the limit.
     /// We need to insert single value, try to add only corresponding variant.
+    const auto & src_variant_col = assert_cast<const ColumnVariant &>(*dynamic_src.variant_column);
+    auto src_global_discr = src_variant_col.globalDiscriminatorAt(n);
 
     /// NULL doesn't require Variant extension.
     if (src_global_discr == ColumnVariant::NULL_DISCRIMINATOR)
@@ -369,18 +260,19 @@ void ColumnDynamic::doInsertFrom(const IColumn & src_, size_t n)
     }
 
     /// We reached maximum number of variants and couldn't add new variant.
-    /// Insert this value into shared variant.
-    insertValueIntoSharedVariant(
-        src_variant_col.getVariantByGlobalDiscriminator(src_global_discr),
-        variant_type,
-        dynamic_src.variant_info.variant_names[src_global_discr],
-        src_offset);
+    /// We should always be able to add String variant and cast inserted value to String.
+    addStringVariant();
+    auto tmp_variant_column = src_variant_col.getVariantByGlobalDiscriminator(src_global_discr).cloneEmpty();
+    tmp_variant_column->insertFrom(src_variant_col.getVariantByGlobalDiscriminator(src_global_discr), src_variant_col.offsetAt(n));
+    auto tmp_string_column = castColumn(ColumnWithTypeAndName(tmp_variant_column->getPtr(), variant_type, ""), std::make_shared<DataTypeString>());
+    auto string_variant_discr = variant_info.variant_name_to_discriminator["String"];
+    variant_col.insertIntoVariantFrom(string_variant_discr, *tmp_string_column, 0);
 }
 
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
-void ColumnDynamic::insertRangeFrom(const IColumn & src_, size_t start, size_t length)
+void ColumnDynamic::insertRangeFrom(const DB::IColumn & src_, size_t start, size_t length)
 #else
-void ColumnDynamic::doInsertRangeFrom(const IColumn & src_, size_t start, size_t length)
+void ColumnDynamic::doInsertRangeFrom(const DB::IColumn & src_, size_t start, size_t length)
 #endif
 {
     if (start + length > src_.size())
@@ -388,260 +280,181 @@ void ColumnDynamic::doInsertRangeFrom(const IColumn & src_, size_t start, size_t
                                                             "[start({}) + length({}) > src.size()({})]", start, length, src_.size());
 
     const auto & dynamic_src = assert_cast<const ColumnDynamic &>(src_);
-    auto & variant_col = getVariantColumn();
 
     /// Check if we have the same variants in both columns.
     if (variant_info.variant_names == dynamic_src.variant_info.variant_names)
     {
-        variant_col.insertRangeFrom(*dynamic_src.variant_column, start, length);
+        variant_column->insertRangeFrom(*dynamic_src.variant_column, start, length);
         return;
     }
 
+    auto & variant_col = assert_cast<ColumnVariant &>(*variant_column);
+
     /// If variants are different, we need to extend our variant with new variants.
     if (auto * global_discriminators_mapping = combineVariants(dynamic_src.variant_info))
     {
-        size_t prev_size = variant_col.size();
-        auto shared_variant_discr = getSharedVariantDiscriminator();
-        variant_col.insertRangeFrom(*dynamic_src.variant_column, start, length, *global_discriminators_mapping, shared_variant_discr);
-
-        /// We should process insertion from src shared variant separately, because it can contain
-        /// values that should be extracted into our variants. insertRangeFrom above didn't insert
-        /// values into our shared variant (we specified shared_variant_discr as special skip discriminator).
-
-        /// Check if src shared variant is empty, nothing to do in this case.
-        if (dynamic_src.getSharedVariant().empty())
-            return;
-
-        /// Iterate over src discriminators and process insertion from src shared variant.
-        const auto & src_variant_column = dynamic_src.getVariantColumn();
-        const auto src_shared_variant_discr = dynamic_src.getSharedVariantDiscriminator();
-        const auto src_shared_variant_local_discr = src_variant_column.localDiscriminatorByGlobal(src_shared_variant_discr);
-        const auto & src_local_discriminators = src_variant_column.getLocalDiscriminators();
-        const auto & src_offsets = src_variant_column.getOffsets();
-        const auto & src_shared_variant = assert_cast<const ColumnString &>(src_variant_column.getVariantByLocalDiscriminator(src_shared_variant_local_discr));
-
-        auto & local_discriminators = variant_col.getLocalDiscriminators();
-        auto & offsets = variant_col.getOffsets();
-        const auto shared_variant_local_discr = variant_col.localDiscriminatorByGlobal(shared_variant_discr);
-        auto & shared_variant = assert_cast<ColumnString &>(variant_col.getVariantByLocalDiscriminator(shared_variant_local_discr));
-        for (size_t i = 0; i != length; ++i)
-        {
-            if (src_local_discriminators[start + i] == src_shared_variant_local_discr)
-            {
-                chassert(local_discriminators[prev_size + i] == shared_variant_local_discr);
-                auto value = src_shared_variant.getDataAt(src_offsets[start + i]);
-                ReadBufferFromMemory buf(value.data, value.size);
-                auto type = decodeDataType(buf);
-                auto type_name = type->getName();
-                /// Check if we have variant with this type. In this case we should extract
-                /// the value from src shared variant and insert it into this variant.
-                if (auto it = variant_info.variant_name_to_discriminator.find(type_name); it != variant_info.variant_name_to_discriminator.end())
-                {
-                    auto local_discr = variant_col.localDiscriminatorByGlobal(it->second);
-                    auto & variant = variant_col.getVariantByLocalDiscriminator(local_discr);
-                    getVariantSerialization(type, type_name)->deserializeBinary(variant, buf, getFormatSettings());
-                    /// Local discriminators were already filled in ColumnVariant::insertRangeFrom and this row should contain
-                    /// shared_variant_local_discr. Change it to local discriminator of the found variant and update offsets.
-                    local_discriminators[prev_size + i] = local_discr;
-                    offsets[prev_size + i] = variant.size() - 1;
-                }
-                /// Otherwise, insert this value into shared variant.
-                else
-                {
-                    shared_variant.insertData(value.data, value.size);
-                    /// Update variant offset.
-                    offsets[prev_size + i] = shared_variant.size() - 1;
-                }
-            }
-        }
-
+        variant_col.insertRangeFrom(*dynamic_src.variant_column, start, length, *global_discriminators_mapping);
         return;
     }
 
     /// We cannot combine 2 Variant types as total number of variants exceeds the limit.
-    /// In this case we will add most frequent variants and insert them as usual,
-    /// all other variants will be inserted into shared variant.
+    /// In this case we will add most frequent variants from this range and insert them as usual,
+    /// all other variants will be converted to String.
+    /// TODO: instead of keeping all current variants and just adding new most frequent variants
+    ///       from source columns we can also try to replace rarest existing variants with frequent
+    ///       variants from source column (so we will avoid casting new frequent variants to String
+    ///       and keeping rare existing ones). It will require rewriting of existing data in Variant
+    ///       column but will improve usability of Dynamic column for example during squashing blocks
+    ///       during insert.
+
+    const auto & src_variant_column = dynamic_src.getVariantColumn();
+
+    /// Calculate ranges for each variant in current range.
+    std::vector<std::pair<size_t, size_t>> variants_ranges(dynamic_src.variant_info.variant_names.size(), {0, 0});
+    /// If we insert the whole column, no need to iterate through the range, we can just take variant sizes.
+    if (start == 0 && length == dynamic_src.size())
+    {
+        for (size_t i = 0; i != dynamic_src.variant_info.variant_names.size(); ++i)
+            variants_ranges[i] = {0, src_variant_column.getVariantByGlobalDiscriminator(i).size()};
+    }
+    /// Otherwise we need to iterate through discriminators and calculate the range for each variant.
+    else
+    {
+        const auto & local_discriminators = src_variant_column.getLocalDiscriminators();
+        const auto & offsets = src_variant_column.getOffsets();
+        size_t end = start + length;
+        for (size_t i = start; i != end; ++i)
+        {
+            auto discr = src_variant_column.globalDiscriminatorByLocal(local_discriminators[i]);
+            if (discr != ColumnVariant::NULL_DISCRIMINATOR)
+            {
+                if (!variants_ranges[discr].second)
+                    variants_ranges[discr].first = offsets[i];
+                ++variants_ranges[discr].second;
+            }
+        }
+    }
+
     const auto & src_variants = assert_cast<const DataTypeVariant &>(*dynamic_src.variant_info.variant_type).getVariants();
+    /// List of variants that will be converted to String.
+    std::vector<ColumnVariant::Discriminator> variants_to_convert_to_string;
     /// Mapping from global discriminators of src_variant to the new variant we will create.
     std::vector<ColumnVariant::Discriminator> other_to_new_discriminators;
     other_to_new_discriminators.reserve(dynamic_src.variant_info.variant_names.size());
 
-    /// Check if we cannot add any more new variants. In this case we will insert all new variants into shared variant.
-    if (!canAddNewVariant())
+    /// Check if we cannot add any more new variants. In this case we will convert all new variants to String.
+    if (variant_info.variant_names.size() == max_dynamic_types || (variant_info.variant_names.size() == max_dynamic_types - 1 && !variant_info.variant_name_to_discriminator.contains("String")))
     {
-        auto shared_variant_discr = getSharedVariantDiscriminator();
-        for (const auto & variant_name : dynamic_src.variant_info.variant_names)
+        addStringVariant();
+        for (size_t i = 0; i != dynamic_src.variant_info.variant_names.size(); ++i)
         {
-            auto it = variant_info.variant_name_to_discriminator.find(variant_name);
+            auto it = variant_info.variant_name_to_discriminator.find(dynamic_src.variant_info.variant_names[i]);
             if (it == variant_info.variant_name_to_discriminator.end())
-                other_to_new_discriminators.push_back(shared_variant_discr);
+            {
+                variants_to_convert_to_string.push_back(i);
+                other_to_new_discriminators.push_back(variant_info.variant_name_to_discriminator["String"]);
+            }
             else
+            {
                 other_to_new_discriminators.push_back(it->second);
+            }
         }
     }
-    /// We still can add some new variants, but not all of them. Let's choose the most frequent variants.
+    /// We still can add some new variants, but not all of them. Let's choose the most frequent variants in specified range.
     else
     {
-        /// Create list of pairs <size, discriminator> and sort it.
         std::vector<std::pair<size_t, ColumnVariant::Discriminator>> new_variants_with_sizes;
         new_variants_with_sizes.reserve(dynamic_src.variant_info.variant_names.size());
-        const auto & src_variant_column = dynamic_src.getVariantColumn();
-        for (const auto & [name, discr] : dynamic_src.variant_info.variant_name_to_discriminator)
+        for (size_t i = 0; i != dynamic_src.variant_info.variant_names.size(); ++i)
         {
-            if (!variant_info.variant_name_to_discriminator.contains(name))
-                new_variants_with_sizes.emplace_back(src_variant_column.getVariantByGlobalDiscriminator(discr).size(), discr);
+            const auto & variant_name = dynamic_src.variant_info.variant_names[i];
+            if (variant_name != "String" && !variant_info.variant_name_to_discriminator.contains(variant_name))
+                new_variants_with_sizes.emplace_back(variants_ranges[i].second, i);
         }
 
         std::sort(new_variants_with_sizes.begin(), new_variants_with_sizes.end(), std::greater());
         DataTypes new_variants = assert_cast<const DataTypeVariant &>(*variant_info.variant_type).getVariants();
-        /// Add new variants from sorted list until we reach max_dynamic_types.
+        if (!variant_info.variant_name_to_discriminator.contains("String"))
+            new_variants.push_back(std::make_shared<DataTypeString>());
+
         for (const auto & [_, discr] : new_variants_with_sizes)
         {
-            if (!canAddNewVariant(new_variants.size()))
-                break;
-            new_variants.push_back(src_variants[discr]);
+            if (new_variants.size() != max_dynamic_types)
+                new_variants.push_back(src_variants[discr]);
+            else
+                variants_to_convert_to_string.push_back(discr);
         }
 
         auto new_variant_type = std::make_shared<DataTypeVariant>(new_variants);
         updateVariantInfoAndExpandVariantColumn(new_variant_type);
-        auto shared_variant_discr = getSharedVariantDiscriminator();
+        auto string_variant_discriminator = variant_info.variant_name_to_discriminator.at("String");
         for (const auto & variant_name : dynamic_src.variant_info.variant_names)
         {
             auto it = variant_info.variant_name_to_discriminator.find(variant_name);
             if (it == variant_info.variant_name_to_discriminator.end())
-                other_to_new_discriminators.push_back(shared_variant_discr);
+                other_to_new_discriminators.push_back(string_variant_discriminator);
             else
                 other_to_new_discriminators.push_back(it->second);
         }
     }
 
-    /// Iterate over the range and perform insertion.
-    const auto & src_variant_column = dynamic_src.getVariantColumn();
+    /// Convert to String all variants that couldn't be added.
+    std::unordered_map<ColumnVariant::Discriminator, ColumnPtr> variants_converted_to_string;
+    variants_converted_to_string.reserve(variants_to_convert_to_string.size());
+    for (auto discr : variants_to_convert_to_string)
+    {
+        auto [variant_start, variant_length] = variants_ranges[discr];
+        const auto & variant = src_variant_column.getVariantPtrByGlobalDiscriminator(discr);
+        if (variant_start == 0 && variant_length == variant->size())
+            variants_converted_to_string[discr] = castColumn(ColumnWithTypeAndName(variant, src_variants[discr], ""), std::make_shared<DataTypeString>());
+        else
+            variants_converted_to_string[discr] = castColumn(ColumnWithTypeAndName(variant->cut(variant_start, variant_length), src_variants[discr], ""), std::make_shared<DataTypeString>());
+    }
+
     const auto & src_local_discriminators = src_variant_column.getLocalDiscriminators();
     const auto & src_offsets = src_variant_column.getOffsets();
     const auto & src_variant_columns = src_variant_column.getVariants();
-    const auto src_shared_variant_discr = dynamic_src.getSharedVariantDiscriminator();
-    const auto src_shared_variant_local_discr = src_variant_column.localDiscriminatorByGlobal(src_shared_variant_discr);
-    const auto & src_shared_variant = assert_cast<const ColumnString &>(*src_variant_columns[src_shared_variant_local_discr]);
-    auto & local_discriminators = variant_col.getLocalDiscriminators();
-    local_discriminators.reserve(local_discriminators.size() + length);
-    auto & offsets = variant_col.getOffsets();
-    offsets.reserve(offsets.size() + length);
-    auto & variant_columns = variant_col.getVariants();
-    const auto shared_variant_discr = getSharedVariantDiscriminator();
-    const auto shared_variant_local_discr = variant_col.localDiscriminatorByGlobal(shared_variant_discr);
-    auto & shared_variant = assert_cast<ColumnString &>(*variant_columns[shared_variant_local_discr]);
     size_t end = start + length;
     for (size_t i = start; i != end; ++i)
     {
-        auto src_local_discr = src_local_discriminators[i];
-        auto src_offset = src_offsets[i];
-        if (src_local_discr == ColumnVariant::NULL_DISCRIMINATOR)
+        auto local_discr = src_local_discriminators[i];
+        if (local_discr == ColumnVariant::NULL_DISCRIMINATOR)
         {
-            local_discriminators.push_back(ColumnVariant::NULL_DISCRIMINATOR);
-            offsets.emplace_back();
+            variant_col.insertDefault();
         }
         else
         {
-            /// Process insertion from src shared variant separately.
-            if (src_local_discr == src_shared_variant_local_discr)
+            auto global_discr = src_variant_column.globalDiscriminatorByLocal(local_discr);
+            auto to_global_discr = other_to_new_discriminators[global_discr];
+            auto it = variants_converted_to_string.find(global_discr);
+            if (it == variants_converted_to_string.end())
             {
-                auto value = src_shared_variant.getDataAt(src_offset);
-                ReadBufferFromMemory buf(value.data, value.size);
-                auto type = decodeDataType(buf);
-                auto type_name = type->getName();
-                /// Check if we have variant with this type. In this case we should extract
-                /// the value from src shared variant and insert it into this variant.
-                if (auto it = variant_info.variant_name_to_discriminator.find(type_name); it != variant_info.variant_name_to_discriminator.end())
-                {
-                    auto local_discr = variant_col.localDiscriminatorByGlobal(it->second);
-                    getVariantSerialization(type, type_name)->deserializeBinary(*variant_columns[local_discr], buf, getFormatSettings());
-                    local_discriminators.push_back(local_discr);
-                    offsets.push_back(variant_columns[local_discr]->size() - 1);
-                }
-                /// Otherwise, insert this value into shared variant.
-                else
-                {
-                    shared_variant.insertData(value.data, value.size);
-                    local_discriminators.push_back(shared_variant_local_discr);
-                    offsets.push_back(shared_variant.size() - 1);
-                }
+                variant_col.insertIntoVariantFrom(to_global_discr, *src_variant_columns[local_discr], src_offsets[i]);
             }
-            /// Insertion from usual variant.
             else
             {
-                auto src_global_discr = src_variant_column.globalDiscriminatorByLocal(src_local_discr);
-                auto global_discr = other_to_new_discriminators[src_global_discr];
-                /// Check if we need to insert this value into shared variant.
-                if (global_discr == shared_variant_discr)
-                {
-                    serializeValueIntoSharedVariant(
-                        shared_variant,
-                        *src_variant_columns[src_local_discr],
-                        src_variants[src_global_discr],
-                        getVariantSerialization(src_variants[src_global_discr], dynamic_src.variant_info.variant_names[src_global_discr]),
-                        src_offset);
-                    local_discriminators.push_back(shared_variant_local_discr);
-                    offsets.push_back(shared_variant.size() - 1);
-                }
-                else
-                {
-                    auto local_discr = variant_col.localDiscriminatorByGlobal(global_discr);
-                    variant_columns[local_discr]->insertFrom(*src_variant_columns[src_local_discr], src_offset);
-                    local_discriminators.push_back(local_discr);
-                    offsets.push_back(variant_columns[local_discr]->size() - 1);
-                }
+                variant_col.insertIntoVariantFrom(to_global_discr, *it->second, src_offsets[i] - variants_ranges[global_discr].first);
             }
         }
     }
 }
 
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
-void ColumnDynamic::insertManyFrom(const IColumn & src_, size_t position, size_t length)
+void ColumnDynamic::insertManyFrom(const DB::IColumn & src_, size_t position, size_t length)
 #else
-void ColumnDynamic::doInsertManyFrom(const IColumn & src_, size_t position, size_t length)
+void ColumnDynamic::doInsertManyFrom(const DB::IColumn & src_, size_t position, size_t length)
 #endif
 {
     const auto & dynamic_src = assert_cast<const ColumnDynamic &>(src_);
-    auto & variant_col = getVariantColumn();
 
     /// Check if we have the same variants in both columns.
     if (variant_info.variant_names == dynamic_src.variant_info.variant_names)
     {
-        variant_col.insertManyFrom(*dynamic_src.variant_column, position, length);
+        variant_column->insertManyFrom(*dynamic_src.variant_column, position, length);
         return;
     }
 
-    const auto & src_variant_col = assert_cast<const ColumnVariant &>(*dynamic_src.variant_column);
-    auto src_global_discr = src_variant_col.globalDiscriminatorAt(position);
-    auto src_offset = src_variant_col.offsetAt(position);
-
-    /// Check if we insert from shared variant and process it separately.
-    if (src_global_discr == dynamic_src.getSharedVariantDiscriminator())
-    {
-        const auto & src_shared_variant = dynamic_src.getSharedVariant();
-        auto value = src_shared_variant.getDataAt(src_offset);
-        /// Decode data type of this value.
-        ReadBufferFromMemory buf(value.data, value.size);
-        auto type = decodeDataType(buf);
-        auto type_name = type->getName();
-        /// Check if we have this variant and deserialize value into variant from shared variant data.
-        if (auto it = variant_info.variant_name_to_discriminator.find(type_name); it != variant_info.variant_name_to_discriminator.end())
-        {
-            /// Deserialize value into temporary column and use it in insertManyIntoVariantFrom.
-            auto tmp_column = type->createColumn();
-            tmp_column->reserve(1);
-            getVariantSerialization(type, type_name)->deserializeBinary(*tmp_column, buf, getFormatSettings());
-            variant_col.insertManyIntoVariantFrom(it->second, *tmp_column, 0, length);
-        }
-        /// Otherwise just insert it into our shared variant.
-        else
-        {
-            variant_col.insertManyIntoVariantFrom(getSharedVariantDiscriminator(), src_shared_variant, src_offset, length);
-        }
-
-        return;
-    }
+    auto & variant_col = assert_cast<ColumnVariant &>(*variant_column);
 
     /// If variants are different, we need to extend our variant with new variants.
     if (auto * global_discriminators_mapping = combineVariants(dynamic_src.variant_info))
@@ -652,6 +465,8 @@ void ColumnDynamic::doInsertManyFrom(const IColumn & src_, size_t position, size
 
     /// We cannot combine 2 Variant types as total number of variants exceeds the limit.
     /// We need to insert single value, try to add only corresponding variant.
+    const auto & src_variant_col = assert_cast<const ColumnVariant &>(*dynamic_src.variant_column);
+    auto src_global_discr = src_variant_col.globalDiscriminatorAt(position);
     if (src_global_discr == ColumnVariant::NULL_DISCRIMINATOR)
     {
         insertDefault();
@@ -666,51 +481,21 @@ void ColumnDynamic::doInsertManyFrom(const IColumn & src_, size_t position, size
         return;
     }
 
-    /// We reached maximum number of variants and couldn't add new variant.
-    /// Insert this value into shared variant.
-    /// Create temporary string column, serialize value into it and use it in insertManyIntoVariantFrom.
-    auto tmp_shared_variant = ColumnString::create();
-    serializeValueIntoSharedVariant(
-        *tmp_shared_variant,
-        src_variant_col.getVariantByGlobalDiscriminator(src_global_discr),
-        variant_type,
-        getVariantSerialization(variant_type, dynamic_src.variant_info.variant_names[src_global_discr]),
-        src_offset);
-
-    variant_col.insertManyIntoVariantFrom(getSharedVariantDiscriminator(), *tmp_shared_variant, 0, length);
+    addStringVariant();
+    auto tmp_variant_column = src_variant_col.getVariantByGlobalDiscriminator(src_global_discr).cloneEmpty();
+    tmp_variant_column->insertFrom(src_variant_col.getVariantByGlobalDiscriminator(src_global_discr), src_variant_col.offsetAt(position));
+    auto tmp_string_column = castColumn(ColumnWithTypeAndName(tmp_variant_column->getPtr(), variant_type, ""), std::make_shared<DataTypeString>());
+    auto string_variant_discr = variant_info.variant_name_to_discriminator["String"];
+    variant_col.insertManyIntoVariantFrom(string_variant_discr, *tmp_string_column, 0, length);
 }
 
-void ColumnDynamic::insertValueIntoSharedVariant(const IColumn & src, const DataTypePtr & type, const String & type_name, size_t n)
-{
-    auto & variant_col = getVariantColumn();
-    auto & shared_variant = getSharedVariant();
-    serializeValueIntoSharedVariant(shared_variant, src, type, getVariantSerialization(type, type_name), n);
-    variant_col.getLocalDiscriminators().push_back(variant_col.localDiscriminatorByGlobal(getSharedVariantDiscriminator()));
-    variant_col.getOffsets().push_back(shared_variant.size() - 1);
-}
 
-void ColumnDynamic::serializeValueIntoSharedVariant(
-    ColumnString & shared_variant,
-    const IColumn & src,
-    const DataTypePtr & type,
-    const SerializationPtr & serialization,
-    size_t n)
-{
-    auto & chars = shared_variant.getChars();
-    WriteBufferFromVector<ColumnString::Chars> value_buf(chars, AppendModeTag());
-    encodeDataType(type, value_buf);
-    serialization->serializeBinary(src, n, value_buf, getFormatSettings());
-    value_buf.finalize();
-    chars.push_back(0);
-    shared_variant.getOffsets().push_back(chars.size());
-}
-
-StringRef ColumnDynamic::serializeValueIntoArena(size_t n, Arena & arena, const char *& begin) const
+StringRef ColumnDynamic::serializeValueIntoArena(size_t n, DB::Arena & arena, const char *& begin) const
 {
     /// We cannot use Variant serialization here as it serializes discriminator + value,
     /// but Dynamic doesn't have fixed mapping discriminator <-> variant type
     /// as different Dynamic column can have different Variants.
-    /// Instead, we serialize null bit + variant type and value in binary format (size + data).
+    /// Instead, we serialize null bit + variant type in binary format (size + bytes) + value.
     const auto & variant_col = assert_cast<const ColumnVariant &>(*variant_column);
     auto discr = variant_col.globalDiscriminatorAt(n);
     StringRef res;
@@ -724,34 +509,25 @@ StringRef ColumnDynamic::serializeValueIntoArena(size_t n, Arena & arena, const
         return res;
     }
 
-    WriteBufferFromOwnString buf;
-    StringRef type_and_value;
-    /// If we have value from shared variant, it's already stored in the desired format.
-    if (discr == getSharedVariantDiscriminator())
-    {
-        type_and_value = getSharedVariant().getDataAt(variant_col.offsetAt(n));
-    }
-    /// For regular variants serialize its type and value in binary format.
-    else
-    {
-        const auto & variant_type = assert_cast<const DataTypeVariant &>(*variant_info.variant_type).getVariant(discr);
-        encodeDataType(variant_type, buf);
-        variant_type->getDefaultSerialization()->serializeBinary(variant_col.getVariantByGlobalDiscriminator(discr), variant_col.offsetAt(n), buf, getFormatSettings());
-        type_and_value = buf.str();
-    }
-
-    char * pos = arena.allocContinue(sizeof(UInt8) + sizeof(size_t) + type_and_value.size, begin);
+    const auto & variant_type = assert_cast<const DataTypeVariant &>(*variant_info.variant_type).getVariant(discr);
+    String variant_type_binary_data = encodeDataType(variant_type);
+    size_t variant_type_binary_data_size = variant_type_binary_data.size();
+    char * pos = arena.allocContinue(sizeof(UInt8) + sizeof(size_t) + variant_type_binary_data.size(), begin);
     memcpy(pos, &null_bit, sizeof(UInt8));
-    memcpy(pos + sizeof(UInt8), &type_and_value.size, sizeof(size_t));
-    memcpy(pos + sizeof(UInt8) + sizeof(size_t), type_and_value.data, type_and_value.size);
+    memcpy(pos + sizeof(UInt8), &variant_type_binary_data_size, sizeof(size_t));
+    memcpy(pos + sizeof(UInt8) + sizeof(size_t), variant_type_binary_data.data(), variant_type_binary_data.size());
     res.data = pos;
-    res.size = sizeof(UInt8) + sizeof(size_t) + type_and_value.size;
+    res.size = sizeof(UInt8) + sizeof(size_t) + variant_type_binary_data.size();
+
+    auto value_ref = variant_col.getVariantByGlobalDiscriminator(discr).serializeValueIntoArena(variant_col.offsetAt(n), arena, begin);
+    res.data = value_ref.data - res.size;
+    res.size += value_ref.size;
     return res;
 }
 
 const char * ColumnDynamic::deserializeAndInsertFromArena(const char * pos)
 {
-    auto & variant_col = getVariantColumn();
+    auto & variant_col = assert_cast<ColumnVariant &>(*variant_column);
     UInt8 null_bit = unalignedLoad<UInt8>(pos);
     pos += sizeof(UInt8);
     if (null_bit)
@@ -760,36 +536,39 @@ const char * ColumnDynamic::deserializeAndInsertFromArena(const char * pos)
         return pos;
     }
 
-    /// Read variant type and value in binary format.
-    const size_t type_and_value_size = unalignedLoad<size_t>(pos);
-    pos += sizeof(type_and_value_size);
-    std::string_view type_and_value(pos, type_and_value_size);
-    pos += type_and_value_size;
-
-    ReadBufferFromMemory buf(type_and_value.data(), type_and_value.size());
-    auto variant_type = decodeDataType(buf);
+    /// Read variant type in binary format.
+    const size_t variant_type_binary_data_size = unalignedLoad<size_t>(pos);
+    pos += sizeof(variant_type_binary_data_size);
+    String variant_type_binary_data;
+    variant_type_binary_data.resize(variant_type_binary_data_size);
+    memcpy(variant_type_binary_data.data(), pos, variant_type_binary_data_size);
+    pos += variant_type_binary_data_size;
+    auto variant_type = decodeDataType(variant_type_binary_data);
     auto variant_name = variant_type->getName();
     /// If we already have such variant, just deserialize it into corresponding variant column.
     auto it = variant_info.variant_name_to_discriminator.find(variant_name);
     if (it != variant_info.variant_name_to_discriminator.end())
     {
-        variant_col.deserializeBinaryIntoVariant(it->second, getVariantSerialization(variant_type, variant_name), buf, getFormatSettings());
-    }
-    /// If we don't have such variant, try to add it.
-    else if (likely(addNewVariant(variant_type)))
-    {
-        auto discr = variant_info.variant_name_to_discriminator[variant_name];
-        variant_col.deserializeBinaryIntoVariant(discr, getVariantSerialization(variant_type, variant_name), buf, getFormatSettings());
-    }
-    /// Otherwise insert this value into shared variant.
-    else
-    {
-        auto & shared_variant = getSharedVariant();
-        shared_variant.insertData(type_and_value.data(), type_and_value.size());
-        variant_col.getLocalDiscriminators().push_back(variant_col.localDiscriminatorByGlobal(getSharedVariantDiscriminator()));
-        variant_col.getOffsets().push_back(shared_variant.size() - 1);
+        auto discr = it->second;
+        return variant_col.deserializeVariantAndInsertFromArena(discr, pos);
     }
 
+    /// If we don't have such variant, add it.
+    if (likely(addNewVariant(variant_type)))
+    {
+        auto discr = variant_info.variant_name_to_discriminator[variant_name];
+        return variant_col.deserializeVariantAndInsertFromArena(discr, pos);
+    }
+
+    /// We reached maximum number of variants and couldn't add new variant.
+    /// We should always be able to add String variant and cast inserted value to String.
+    addStringVariant();
+    /// Create temporary column of this variant type and deserialize value into it.
+    auto tmp_variant_column = variant_type->createColumn();
+    pos = tmp_variant_column->deserializeAndInsertFromArena(pos);
+    /// Cast temporary column to String and insert this value into String variant.
+    auto str_column = castColumn(ColumnWithTypeAndName(tmp_variant_column->getPtr(), variant_type, ""), std::make_shared<DataTypeString>());
+    variant_col.insertIntoVariantFrom(variant_info.variant_name_to_discriminator["String"], *str_column, 0);
     return pos;
 }
 
@@ -800,15 +579,19 @@ const char * ColumnDynamic::skipSerializedInArena(const char * pos) const
     if (null_bit)
         return pos;
 
-    const size_t type_and_value_size = unalignedLoad<size_t>(pos);
-    pos += sizeof(type_and_value_size);
-    pos += type_and_value_size;
-    return pos;
+    const size_t variant_type_binary_data_size = unalignedLoad<size_t>(pos);
+    pos += sizeof(variant_type_binary_data_size);
+    String variant_type_binary_data;
+    variant_type_binary_data.resize(variant_type_binary_data_size);
+    memcpy(variant_type_binary_data.data(), pos, variant_type_binary_data_size);
+    pos += variant_type_binary_data_size;
+    auto tmp_variant_column = decodeDataType(variant_type_binary_data)->createColumn();
+    return tmp_variant_column->skipSerializedInArena(pos);
 }
 
 void ColumnDynamic::updateHashWithValue(size_t n, SipHash & hash) const
 {
-    const auto & variant_col = getVariantColumn();
+    const auto & variant_col = assert_cast<const ColumnVariant &>(*variant_column);
     auto discr = variant_col.globalDiscriminatorAt(n);
     if (discr == ColumnVariant::NULL_DISCRIMINATOR)
     {
@@ -821,19 +604,17 @@ void ColumnDynamic::updateHashWithValue(size_t n, SipHash & hash) const
 }
 
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
-int ColumnDynamic::compareAt(size_t n, size_t m, const IColumn & rhs, int nan_direction_hint) const
+int ColumnDynamic::compareAt(size_t n, size_t m, const DB::IColumn & rhs, int nan_direction_hint) const
 #else
-int ColumnDynamic::doCompareAt(size_t n, size_t m, const IColumn & rhs, int nan_direction_hint) const
+int ColumnDynamic::doCompareAt(size_t n, size_t m, const DB::IColumn & rhs, int nan_direction_hint) const
 #endif
 {
-    const auto & left_variant = getVariantColumn();
+    const auto & left_variant = assert_cast<const ColumnVariant &>(*variant_column);
     const auto & right_dynamic = assert_cast<const ColumnDynamic &>(rhs);
-    const auto & right_variant = right_dynamic.getVariantColumn();
+    const auto & right_variant = assert_cast<const ColumnVariant &>(*right_dynamic.variant_column);
 
     auto left_discr = left_variant.globalDiscriminatorAt(n);
-    auto left_shared_variant_discr = getSharedVariantDiscriminator();
     auto right_discr = right_variant.globalDiscriminatorAt(m);
-    auto right_shared_variant_discr = right_dynamic.getSharedVariantDiscriminator();
 
     /// Check if we have NULLs and return result based on nan_direction_hint.
     if (left_discr == ColumnVariant::NULL_DISCRIMINATOR && right_discr == ColumnVariant::NULL_DISCRIMINATOR)
@@ -843,300 +624,25 @@ int ColumnDynamic::doCompareAt(size_t n, size_t m, const IColumn & rhs, int nan_
     else if (right_discr == ColumnVariant::NULL_DISCRIMINATOR)
         return -nan_direction_hint;
 
-    /// Check if both values are in shared variant.
-    if (left_discr == left_shared_variant_discr && right_discr == right_shared_variant_discr)
-    {
-        /// First check if both type and value are equal.
-        auto left_value = getSharedVariant().getDataAt(left_variant.offsetAt(n));
-        auto right_value = right_dynamic.getSharedVariant().getDataAt(right_variant.offsetAt(m));
-        if (left_value == right_value)
-            return 0;
+    /// If rows have different types, we compare type names.
+    if (variant_info.variant_names[left_discr] != right_dynamic.variant_info.variant_names[right_discr])
+        return variant_info.variant_names[left_discr] < right_dynamic.variant_info.variant_names[right_discr] ? -1 : 1;
 
-        /// Extract type names from both values.
-        ReadBufferFromMemory buf_left(left_value.data, left_value.size);
-        auto left_data_type = decodeDataType(buf_left);
-        auto left_data_type_name = left_data_type->getName();
-
-        ReadBufferFromMemory buf_right(right_value.data, right_value.size);
-        auto right_data_type = decodeDataType(buf_right);
-        auto right_data_type_name = right_data_type->getName();
-
-        /// If rows have different types, we compare type names.
-        if (left_data_type_name != right_data_type_name)
-            return left_data_type_name < right_data_type_name ? -1 : 1;
-
-        /// If rows have the same type, we compare actual values.
-        /// We have both values serialized in binary format, so we need to
-        /// create temporary column, insert both values into it and compare.
-        auto tmp_column = left_data_type->createColumn();
-        const auto & serialization = left_data_type->getDefaultSerialization();
-        serialization->deserializeBinary(*tmp_column, buf_left, getFormatSettings());
-        serialization->deserializeBinary(*tmp_column, buf_right, getFormatSettings());
-        return tmp_column->compareAt(0, 1, *tmp_column, nan_direction_hint);
-    }
-    /// Check if only left value is in shared data.
-    else if (left_discr == left_shared_variant_discr)
-    {
-        /// Extract left type name from the value.
-        auto left_value = getSharedVariant().getDataAt(left_variant.offsetAt(n));
-        ReadBufferFromMemory buf_left(left_value.data, left_value.size);
-        auto left_data_type = decodeDataType(buf_left);
-        auto left_data_type_name = left_data_type->getName();
-
-        /// If rows have different types, we compare type names.
-        if (left_data_type_name != right_dynamic.variant_info.variant_names[right_discr])
-            return left_data_type_name < right_dynamic.variant_info.variant_names[right_discr] ? -1 : 1;
-
-        /// If rows have the same type, we compare actual values.
-        /// We have left value serialized in binary format, we need to
-        /// create temporary column, insert the value into it and compare.
-        auto tmp_column = left_data_type->createColumn();
-        left_data_type->getDefaultSerialization()->deserializeBinary(*tmp_column, buf_left, getFormatSettings());
-        return tmp_column->compareAt(0, right_variant.offsetAt(m), right_variant.getVariantByGlobalDiscriminator(right_discr), nan_direction_hint);
-    }
-    /// Check if only right value is in shared data.
-    else if (right_discr == right_shared_variant_discr)
-    {
-        /// Extract right type name from the value.
-        auto right_value = right_dynamic.getSharedVariant().getDataAt(right_variant.offsetAt(m));
-        ReadBufferFromMemory buf_right(right_value.data, right_value.size);
-        auto right_data_type = decodeDataType(buf_right);
-        auto right_data_type_name = right_data_type->getName();
-
-        /// If rows have different types, we compare type names.
-        if (variant_info.variant_names[left_discr] != right_data_type_name)
-            return variant_info.variant_names[left_discr] < right_data_type_name ? -1 : 1;
-
-        /// If rows have the same type, we compare actual values.
-        /// We have right value serialized in binary format, we need to
-        /// create temporary column, insert the value into it and compare.
-        auto tmp_column = right_data_type->createColumn();
-        right_data_type->getDefaultSerialization()->deserializeBinary(*tmp_column, buf_right, getFormatSettings());
-        return left_variant.getVariantByGlobalDiscriminator(left_discr).compareAt(left_variant.offsetAt(n), 0, *tmp_column, nan_direction_hint);
-    }
-    /// Otherwise both values are regular variants.
-    else
-    {
-        /// If rows have different types, we compare type names.
-        if (variant_info.variant_names[left_discr] != right_dynamic.variant_info.variant_names[right_discr])
-            return variant_info.variant_names[left_discr] < right_dynamic.variant_info.variant_names[right_discr] ? -1 : 1;
-
-        /// If rows have the same types, compare actual values from corresponding variants.
-        return left_variant.getVariantByGlobalDiscriminator(left_discr).compareAt(left_variant.offsetAt(n), right_variant.offsetAt(m), right_variant.getVariantByGlobalDiscriminator(right_discr), nan_direction_hint);
-    }
-}
-
-struct ColumnDynamic::ComparatorBase
-{
-    const ColumnDynamic & parent;
-    int nan_direction_hint;
-
-    ComparatorBase(const ColumnDynamic & parent_, int nan_direction_hint_)
-        : parent(parent_), nan_direction_hint(nan_direction_hint_)
-    {
-    }
-
-    ALWAYS_INLINE int compare(size_t lhs, size_t rhs) const
-    {
-        return parent.compareAt(lhs, rhs, parent, nan_direction_hint);
-    }
-};
-
-void ColumnDynamic::getPermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability, size_t limit, int nan_direction_hint, IColumn::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 ColumnDynamic::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());
+    /// If rows have the same types, compare actual values from corresponding variants.
+    return left_variant.getVariantByGlobalDiscriminator(left_discr).compareAt(left_variant.offsetAt(n), right_variant.offsetAt(m), right_variant.getVariantByGlobalDiscriminator(right_discr), nan_direction_hint);
 }
 
 ColumnPtr ColumnDynamic::compress() const
 {
-    ColumnPtr variant_compressed = variant_column_ptr->compress();
+    ColumnPtr variant_compressed = variant_column->compress();
     size_t byte_size = variant_compressed->byteSize();
     return ColumnCompressed::create(size(), byte_size,
-        [my_variant_compressed = std::move(variant_compressed), my_variant_info = variant_info, my_max_dynamic_types = max_dynamic_types, my_global_max_dynamic_types = global_max_dynamic_types, my_statistics = statistics]() mutable
+        [my_variant_compressed = std::move(variant_compressed), my_variant_info = variant_info, my_max_dynamic_types = max_dynamic_types, my_statistics = statistics]() mutable
         {
-            return ColumnDynamic::create(my_variant_compressed->decompress(), my_variant_info, my_max_dynamic_types, my_global_max_dynamic_types, my_statistics);
+            return ColumnDynamic::create(my_variant_compressed->decompress(), my_variant_info, my_max_dynamic_types, my_statistics);
         });
 }
 
-String ColumnDynamic::getTypeNameAt(size_t row_num) const
-{
-    const auto & variant_col = getVariantColumn();
-    const size_t discr = variant_col.globalDiscriminatorAt(row_num);
-    if (discr == ColumnVariant::NULL_DISCRIMINATOR)
-        return "";
-
-    if (discr == getSharedVariantDiscriminator())
-    {
-        const auto value = getSharedVariant().getDataAt(variant_col.offsetAt(row_num));
-        ReadBufferFromMemory buf(value.data, value.size);
-        return decodeDataType(buf)->getName();
-    }
-
-    return variant_info.variant_names[discr];
-}
-
-void ColumnDynamic::getAllTypeNamesInto(std::unordered_set<String> & names) const
-{
-    auto shared_variant_discr = getSharedVariantDiscriminator();
-    for (size_t i = 0; i != variant_info.variant_names.size(); ++i)
-    {
-        if (i != shared_variant_discr && !variant_column_ptr->getVariantByGlobalDiscriminator(i).empty())
-            names.insert(variant_info.variant_names[i]);
-    }
-
-    const auto & shared_variant = getSharedVariant();
-    for (size_t i = 0; i != shared_variant.size(); ++i)
-    {
-        const auto value = shared_variant.getDataAt(i);
-        ReadBufferFromMemory buf(value.data, value.size);
-        names.insert(decodeDataType(buf)->getName());
-    }
-}
-
-void ColumnDynamic::prepareForSquashing(const Columns & source_columns)
-{
-    if (source_columns.empty())
-        return;
-
-    /// Internal variants of source dynamic columns may differ.
-    /// We want to preallocate memory for all variants we will have after squashing.
-    /// It may happen that the total number of variants in source columns will
-    /// exceed the limit, in this case we will choose the most frequent variants
-    /// and insert the rest types into the shared variant.
-
-    /// First, preallocate memory for variant discriminators and offsets.
-    size_t new_size = size();
-    for (const auto & source_column : source_columns)
-        new_size += source_column->size();
-    auto & variant_col = getVariantColumn();
-    variant_col.getLocalDiscriminators().reserve_exact(new_size);
-    variant_col.getOffsets().reserve_exact(new_size);
-
-    /// Second, preallocate memory for variants.
-    prepareVariantsForSquashing(source_columns);
-}
-
-void ColumnDynamic::prepareVariantsForSquashing(const Columns & source_columns)
-{
-    /// Internal variants of source dynamic columns may differ.
-    /// We want to preallocate memory for all variants we will have after squashing.
-    /// It may happen that the total number of variants in source columns will
-    /// exceed the limit, in this case we will choose the most frequent variants.
-
-    /// Collect all variants and their total sizes.
-    std::unordered_map<String, size_t> total_variant_sizes;
-    DataTypes all_variants;
-
-    auto add_variants = [&](const ColumnDynamic & source_dynamic)
-    {
-        const auto & source_variant_column = source_dynamic.getVariantColumn();
-        const auto & source_variant_info = source_dynamic.getVariantInfo();
-        const auto & source_variants = assert_cast<const DataTypeVariant &>(*source_variant_info.variant_type).getVariants();
-
-        for (size_t i = 0; i != source_variants.size(); ++i)
-        {
-            const auto & variant_name = source_variant_info.variant_names[i];
-            auto it = total_variant_sizes.find(variant_name);
-            /// Add this variant to the list of all variants if we didn't see it yet.
-            if (it == total_variant_sizes.end())
-            {
-                all_variants.push_back(source_variants[i]);
-                it = total_variant_sizes.emplace(variant_name, 0).first;
-            }
-
-            it->second += source_variant_column.getVariantByGlobalDiscriminator(i).size();
-        }
-    };
-
-    for (const auto & source_column : source_columns)
-        add_variants(assert_cast<const ColumnDynamic &>(*source_column));
-
-    /// Add variants from this dynamic column.
-    add_variants(*this);
-
-    DataTypePtr result_variant_type;
-    /// Check if the number of all variants exceeds the limit.
-    if (!canAddNewVariants(0, all_variants.size()))
-    {
-        /// We want to keep the most frequent variants in the resulting dynamic column.
-        DataTypes result_variants;
-        result_variants.reserve(max_dynamic_types + 1); /// +1 for shared variant.
-        /// Add variants from current variant column as we will not rewrite it.
-        for (const auto & variant : assert_cast<const DataTypeVariant &>(*variant_info.variant_type).getVariants())
-            result_variants.push_back(variant);
-
-        /// Create list of remaining variants with their sizes and sort it.
-        std::vector<std::pair<size_t, DataTypePtr>> variants_with_sizes;
-        variants_with_sizes.reserve(all_variants.size() - variant_info.variant_names.size());
-        for (const auto & variant : all_variants)
-        {
-            /// Add variant to the list only of we didn't add it yet.
-            auto variant_name = variant->getName();
-            if (!variant_info.variant_name_to_discriminator.contains(variant_name))
-                variants_with_sizes.emplace_back(total_variant_sizes[variant_name], variant);
-        }
-
-        std::sort(variants_with_sizes.begin(), variants_with_sizes.end(), std::greater());
-        /// Add the most frequent variants until we reach max_dynamic_types.
-        for (const auto & [_, new_variant] : variants_with_sizes)
-        {
-            if (!canAddNewVariant(result_variants.size()))
-                break;
-            result_variants.push_back(new_variant);
-        }
-
-        result_variant_type = std::make_shared<DataTypeVariant>(result_variants);
-    }
-    else
-    {
-        result_variant_type = std::make_shared<DataTypeVariant>(all_variants);
-    }
-
-    if (!result_variant_type->equals(*variant_info.variant_type))
-        updateVariantInfoAndExpandVariantColumn(result_variant_type);
-
-    /// Now current dynamic column has all resulting variants and we can call
-    /// prepareForSquashing on them to preallocate the memory.
-    auto & variant_col = getVariantColumn();
-    for (size_t i = 0; i != variant_info.variant_names.size(); ++i)
-    {
-        Columns source_variant_columns;
-        source_variant_columns.reserve(source_columns.size());
-        for (const auto & source_column : source_columns)
-        {
-            const auto & source_dynamic_column = assert_cast<const ColumnDynamic &>(*source_column);
-            const auto & source_variant_info = source_dynamic_column.getVariantInfo();
-            /// Try to find this variant in the current source column.
-            auto it = source_variant_info.variant_name_to_discriminator.find(variant_info.variant_names[i]);
-            if (it != source_variant_info.variant_name_to_discriminator.end())
-                source_variant_columns.push_back(source_dynamic_column.getVariantColumn().getVariantPtrByGlobalDiscriminator(it->second));
-        }
-
-        variant_col.getVariantByGlobalDiscriminator(i).prepareForSquashing(source_variant_columns);
-    }
-}
-
 void ColumnDynamic::takeDynamicStructureFromSourceColumns(const Columns & source_columns)
 {
     if (!empty())
@@ -1157,9 +663,6 @@ void ColumnDynamic::takeDynamicStructureFromSourceColumns(const Columns & source
     /// First, collect all variants from all source columns and calculate total sizes.
     std::unordered_map<String, size_t> total_sizes;
     DataTypes all_variants;
-    /// Add shared variant type in advance;
-    all_variants.push_back(getSharedVariantDataType());
-    total_sizes[getSharedVariantTypeName()] = 0;
 
     for (const auto & source_column : source_columns)
     {
@@ -1168,7 +671,7 @@ void ColumnDynamic::takeDynamicStructureFromSourceColumns(const Columns & source
         const auto & source_variant_info = source_dynamic.getVariantInfo();
         const auto & source_variants = assert_cast<const DataTypeVariant &>(*source_variant_info.variant_type).getVariants();
         /// During deserialization from MergeTree we will have variant sizes statistics from the whole data part.
-        const auto & source_statistics = source_dynamic.getStatistics();
+        const auto & source_statistics =  source_dynamic.getStatistics();
         for (size_t i = 0; i != source_variants.size(); ++i)
         {
             const auto & variant_name = source_variant_info.variant_names[i];
@@ -1179,68 +682,35 @@ void ColumnDynamic::takeDynamicStructureFromSourceColumns(const Columns & source
                 all_variants.push_back(source_variants[i]);
                 it = total_sizes.emplace(variant_name, 0).first;
             }
-            size_t size = source_variant_column.getVariantByGlobalDiscriminator(i).size();
-            if (source_statistics)
-            {
-                auto statistics_it = source_statistics->variants_statistics.find(variant_name);
-                if (statistics_it != source_statistics->variants_statistics.end())
-                    size = statistics_it->second;
-            }
-
+            auto statistics_it = source_statistics.data.find(variant_name);
+            size_t size = statistics_it == source_statistics.data.end() ? source_variant_column.getVariantByGlobalDiscriminator(i).size() : statistics_it->second;
             it->second += size;
         }
-
-        /// Use add variants from shared variant statistics. It can help extracting
-        /// frequent variants from shared variant to usual variants.
-        if (source_statistics)
-        {
-            for (const auto & [variant_name, size] : source_statistics->shared_variants_statistics)
-            {
-                auto it = total_sizes.find(variant_name);
-                /// Add this variant to the list of all variants if we didn't see it yet.
-                if (it == total_sizes.end())
-                {
-                    all_variants.push_back(DataTypeFactory::instance().get(variant_name));
-                    it = total_sizes.emplace(variant_name, 0).first;
-                }
-                it->second += size;
-            }
-        }
     }
 
     DataTypePtr result_variant_type;
-    Statistics new_statistics(Statistics::Source::MERGE);
-    /// Reset max_dynamic_types to global_max_dynamic_types.
-    max_dynamic_types = global_max_dynamic_types;
-    /// Check if the number of all dynamic types exceeds the limit.
-    if (!canAddNewVariants(0, all_variants.size()))
+    /// Check if the number of all variants exceeds the limit.
+    if (all_variants.size() > max_dynamic_types || (all_variants.size() == max_dynamic_types && !total_sizes.contains("String")))
     {
-        /// Create a list of variants with their sizes and names and then sort it.
-        std::vector<std::tuple<size_t, String, DataTypePtr>> variants_with_sizes;
+        /// Create list of variants with their sizes and sort it.
+        std::vector<std::pair<size_t, DataTypePtr>> variants_with_sizes;
         variants_with_sizes.reserve(all_variants.size());
         for (const auto & variant : all_variants)
-        {
-            auto variant_name = variant->getName();
-            if (variant_name != getSharedVariantTypeName())
-                variants_with_sizes.emplace_back(total_sizes[variant_name], variant_name, variant);
-        }
+            variants_with_sizes.emplace_back(total_sizes[variant->getName()], variant);
         std::sort(variants_with_sizes.begin(), variants_with_sizes.end(), std::greater());
 
-        /// Take first max_dynamic_types variants from sorted list and fill shared_variants_statistics with the rest.
+        /// Take first max_dynamic_types variants from sorted list.
         DataTypes result_variants;
-        result_variants.reserve(max_dynamic_types + 1); /// +1 for shared variant.
-        /// Add shared variant.
-        result_variants.push_back(getSharedVariantDataType());
-        for (const auto & [size, variant_name, variant_type] : variants_with_sizes)
+        result_variants.reserve(max_dynamic_types);
+        /// Add String variant in advance.
+        result_variants.push_back(std::make_shared<DataTypeString>());
+        for (const auto & [_, variant] : variants_with_sizes)
         {
-            /// Add variant to the resulting variants list until we reach max_dynamic_types.
-            if (canAddNewVariant(result_variants.size()))
-                result_variants.push_back(variant_type);
-            /// Add all remaining variants into shared_variants_statistics until we reach its max size.
-            else if (new_statistics.shared_variants_statistics.size() < Statistics::MAX_SHARED_VARIANT_STATISTICS_SIZE)
-                new_statistics.shared_variants_statistics[variant_name] = size;
-            else
+            if (result_variants.size() == max_dynamic_types)
                 break;
+
+            if (variant->getName() != "String")
+                result_variants.push_back(variant);
         }
 
         result_variant_type = std::make_shared<DataTypeVariant>(result_variants);
@@ -1250,17 +720,26 @@ void ColumnDynamic::takeDynamicStructureFromSourceColumns(const Columns & source
         result_variant_type = std::make_shared<DataTypeVariant>(all_variants);
     }
 
-    /// Now we have resulting Variant and can fill variant info and create merge statistics.
-    setVariantType(result_variant_type);
-    new_statistics.variants_statistics.reserve(variant_info.variant_names.size());
-    for (const auto & variant_name : variant_info.variant_names)
-        new_statistics.variants_statistics[variant_name] = total_sizes[variant_name];
-    statistics = std::make_shared<const Statistics>(std::move(new_statistics));
+    /// Now we have resulting Variant and can fill variant info.
+    variant_info.variant_type = result_variant_type;
+    variant_info.variant_name = result_variant_type->getName();
+    const auto & result_variants = assert_cast<const DataTypeVariant &>(*result_variant_type).getVariants();
+    variant_info.variant_names.clear();
+    variant_info.variant_names.reserve(result_variants.size());
+    variant_info.variant_name_to_discriminator.clear();
+    variant_info.variant_name_to_discriminator.reserve(result_variants.size());
+    statistics.data.clear();
+    statistics.data.reserve(result_variants.size());
+    statistics.source = Statistics::Source::MERGE;
+    for (size_t i = 0; i != result_variants.size(); ++i)
+    {
+        auto variant_name = result_variants[i]->getName();
+        variant_info.variant_names.push_back(variant_name);
+        variant_info.variant_name_to_discriminator[variant_name] = i;
+        statistics.data[variant_name] = total_sizes[variant_name];
+    }
 
-    /// Reduce max_dynamic_types to the number of selected variants, so there will be no possibility
-    /// to extend selected variants on inerts into this column during merges.
-    /// -1 because we don't count shared variant in the limit.
-    max_dynamic_types = variant_info.variant_names.size() - 1;
+    variant_column = variant_info.variant_type->createColumn();
 
     /// Now we have the resulting Variant that will be used in all merged columns.
     /// Variants can also contain Dynamic columns inside, we should collect
@@ -1276,7 +755,7 @@ void ColumnDynamic::takeDynamicStructureFromSourceColumns(const Columns & source
         {
             /// Try to find this variant in current source column.
             auto it = source_variant_info.variant_name_to_discriminator.find(variant_info.variant_names[i]);
-            if (it != source_variant_info.variant_name_to_discriminator.end())        /// Add shared variant.
+            if (it != source_variant_info.variant_name_to_discriminator.end())
                 variants_source_columns[i].push_back(source_dynamic_column.getVariantColumn().getVariantPtrByGlobalDiscriminator(it->second));
         }
     }
@@ -1288,12 +767,12 @@ void ColumnDynamic::takeDynamicStructureFromSourceColumns(const Columns & source
 
 void ColumnDynamic::applyNullMap(const ColumnVector<UInt8>::Container & null_map)
 {
-    variant_column_ptr->applyNullMap(null_map);
+    assert_cast<ColumnVariant &>(*variant_column).applyNullMap(null_map);
 }
 
 void ColumnDynamic::applyNegatedNullMap(const ColumnVector<UInt8>::Container & null_map)
 {
-    variant_column_ptr->applyNegatedNullMap(null_map);
+    assert_cast<ColumnVariant &>(*variant_column).applyNegatedNullMap(null_map);
 }
 
 }
diff --git a/src/Columns/ColumnDynamic.h b/src/Columns/ColumnDynamic.h
index 17b0d80e5eb..e92cabd3db9 100644
--- a/src/Columns/ColumnDynamic.h
+++ b/src/Columns/ColumnDynamic.h
@@ -3,7 +3,6 @@
 #include <Columns/IColumn.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnVariant.h>
-#include <Columns/ColumnString.h>
 #include <DataTypes/IDataType.h>
 #include <Common/WeakHash.h>
 
@@ -20,19 +19,11 @@ namespace DB
  *
  * When new values are inserted into Dynamic column, the internal Variant
  * type and column are extended if the inserted value has new type.
- * When the limit on number of dynamic types is exceeded, all values
- * with new types are inserted into special shared variant with type String
- * that contains values and their types in binary format.
  */
 class ColumnDynamic final : public COWHelper<IColumnHelper<ColumnDynamic>, ColumnDynamic>
 {
 public:
-    /// Maximum limit on dynamic types. We use ColumnVariant to store all the types,
-    /// so the limit cannot be greater then ColumnVariant::MAX_NESTED_COLUMNS.
-    /// We also always have reserved variant for shared variant.
-    static constexpr size_t MAX_DYNAMIC_TYPES_LIMIT = ColumnVariant::MAX_NESTED_COLUMNS - 1;
-    static constexpr const char * SHARED_VARIANT_TYPE_NAME = "SharedVariant";
-
+    ///
     struct Statistics
     {
         enum class Source
@@ -41,27 +32,12 @@ public:
             MERGE, /// Statistics were calculated during merge of several MergeTree parts.
         };
 
-        explicit Statistics(Source source_) : source(source_) {}
-
         /// Source of the statistics.
         Source source;
-        /// Statistics data for usual variants: (variant name) -> (total variant size in data part).
-        std::unordered_map<String, size_t> variants_statistics;
-        /// Statistics data for variants from shared variant: (variant name) -> (total variant size in data part).
-        /// For shared variant we store statistics only for first 256 variants (should cover almost all cases and it's not expensive).
-        static constexpr const size_t MAX_SHARED_VARIANT_STATISTICS_SIZE = 256;
-        std::unordered_map<String, size_t> shared_variants_statistics;
+        /// Statistics data: (variant name) -> (total variant size in data part).
+        std::unordered_map<String, size_t> data;
     };
 
-    using StatisticsPtr = std::shared_ptr<const Statistics>;
-
-    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<ColumnDynamic>, ColumnDynamic>;
 
@@ -78,40 +54,36 @@ private:
     };
 
     explicit ColumnDynamic(size_t max_dynamic_types_);
-    ColumnDynamic(MutableColumnPtr variant_column_, const DataTypePtr & variant_type_, size_t max_dynamic_types_, size_t global_max_dynamic_types_, const StatisticsPtr & statistics_ = {});
-    ColumnDynamic(MutableColumnPtr variant_column_, const VariantInfo & variant_info_, size_t max_dynamic_types_, size_t global_max_dynamic_types_, const StatisticsPtr & statistics_ = {});
+    ColumnDynamic(MutableColumnPtr variant_column_, const VariantInfo & variant_info_, size_t max_dynamic_types_, const Statistics & statistics_ = {});
 
 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<IColumnHelper<ColumnDynamic>, ColumnDynamic>;
-    static Ptr create(const ColumnPtr & variant_column_, const VariantInfo & variant_info_, size_t max_dynamic_types_, size_t global_max_dynamic_types_, const StatisticsPtr & statistics_ = {})
+    static Ptr create(const ColumnPtr & variant_column_, const VariantInfo & variant_info_, size_t max_dynamic_types_, const Statistics & statistics_ = {})
     {
-        return ColumnDynamic::create(variant_column_->assumeMutable(), variant_info_, max_dynamic_types_, global_max_dynamic_types_, statistics_);
+        return ColumnDynamic::create(variant_column_->assumeMutable(), variant_info_, max_dynamic_types_, statistics_);
     }
 
-    static MutablePtr create(MutableColumnPtr variant_column_, const VariantInfo & variant_info_, size_t max_dynamic_types_, size_t global_max_dynamic_types_, const StatisticsPtr & statistics_ = {})
+    static MutablePtr create(MutableColumnPtr variant_column_, const VariantInfo & variant_info_, size_t max_dynamic_types_, const Statistics & statistics_ = {})
     {
-        return Base::create(std::move(variant_column_), variant_info_, max_dynamic_types_, global_max_dynamic_types_, statistics_);
+        return Base::create(std::move(variant_column_), variant_info_, max_dynamic_types_, statistics_);
     }
 
-    static MutablePtr create(MutableColumnPtr variant_column_, const DataTypePtr & variant_type_, size_t max_dynamic_types_, size_t global_max_dynamic_types_, const StatisticsPtr & statistics_ = {})
+    static MutablePtr create(MutableColumnPtr variant_column_, const DataTypePtr & variant_type, size_t max_dynamic_types_, const Statistics & statistics_ = {});
+
+    static ColumnPtr create(ColumnPtr variant_column_, const DataTypePtr & variant_type, size_t max_dynamic_types_, const Statistics & statistics_ = {})
     {
-        return Base::create(std::move(variant_column_), variant_type_, max_dynamic_types_, global_max_dynamic_types_, statistics_);
+        return create(variant_column_->assumeMutable(), variant_type, max_dynamic_types_, statistics_);
     }
 
-    static ColumnPtr create(ColumnPtr variant_column_, const DataTypePtr & variant_type, size_t max_dynamic_types_, size_t global_max_dynamic_types_, const StatisticsPtr & statistics_ = {})
-    {
-        return create(variant_column_->assumeMutable(), variant_type, max_dynamic_types_, global_max_dynamic_types_, statistics_);
-    }
-
-    static MutablePtr create(size_t max_dynamic_types_ = MAX_DYNAMIC_TYPES_LIMIT)
+    static MutablePtr create(size_t max_dynamic_types_)
     {
         return Base::create(max_dynamic_types_);
     }
 
-    std::string getName() const override { return "Dynamic(max_types=" + std::to_string(global_max_dynamic_types) + ")"; }
+    std::string getName() const override { return "Dynamic(max_types=" + std::to_string(max_dynamic_types) + ")"; }
 
     const char * getFamilyName() const override
     {
@@ -126,41 +98,47 @@ public:
     MutableColumnPtr cloneEmpty() const override
     {
         /// Keep current dynamic structure
-        return Base::create(variant_column->cloneEmpty(), variant_info, max_dynamic_types, global_max_dynamic_types, statistics);
+        return Base::create(variant_column->cloneEmpty(), variant_info, max_dynamic_types, statistics);
     }
 
     MutableColumnPtr cloneResized(size_t size) const override
     {
-        return Base::create(variant_column->cloneResized(size), variant_info, max_dynamic_types, global_max_dynamic_types, statistics);
+        return Base::create(variant_column->cloneResized(size), variant_info, max_dynamic_types, statistics);
     }
 
     size_t size() const override
     {
-        return variant_column_ptr->size();
+        return variant_column->size();
     }
 
-    Field operator[](size_t n) const override;
+    Field operator[](size_t n) const override
+    {
+        return (*variant_column)[n];
+    }
 
-    void get(size_t n, Field & res) const override;
+    void get(size_t n, Field & res) const override
+    {
+        variant_column->get(n, res);
+    }
 
     bool isDefaultAt(size_t n) const override
     {
-        return variant_column_ptr->isDefaultAt(n);
+        return variant_column->isDefaultAt(n);
     }
 
     bool isNullAt(size_t n) const override
     {
-        return variant_column_ptr->isNullAt(n);
+        return variant_column->isNullAt(n);
     }
 
     StringRef getDataAt(size_t n) const override
     {
-        return variant_column_ptr->getDataAt(n);
+        return variant_column->getDataAt(n);
     }
 
     void insertData(const char * pos, size_t length) override
     {
-        variant_column_ptr->insertData(pos, length);
+        variant_column->insertData(pos, length);
     }
 
     void insert(const Field & x) override;
@@ -178,17 +156,17 @@ public:
 
     void insertDefault() override
     {
-        variant_column_ptr->insertDefault();
+        variant_column->insertDefault();
     }
 
     void insertManyDefaults(size_t length) override
     {
-        variant_column_ptr->insertManyDefaults(length);
+        variant_column->insertManyDefaults(length);
     }
 
     void popBack(size_t n) override
     {
-        variant_column_ptr->popBack(n);
+        variant_column->popBack(n);
     }
 
     StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
@@ -199,46 +177,46 @@ public:
 
     WeakHash32 getWeakHash32() const override
     {
-        return variant_column_ptr->getWeakHash32();
+        return variant_column->getWeakHash32();
     }
 
     void updateHashFast(SipHash & hash) const override
     {
-        variant_column_ptr->updateHashFast(hash);
+        variant_column->updateHashFast(hash);
     }
 
     ColumnPtr filter(const Filter & filt, ssize_t result_size_hint) const override
     {
-        return create(variant_column_ptr->filter(filt, result_size_hint), variant_info, max_dynamic_types, global_max_dynamic_types);
+        return create(variant_column->filter(filt, result_size_hint), variant_info, max_dynamic_types);
     }
 
     void expand(const Filter & mask, bool inverted) override
     {
-        variant_column_ptr->expand(mask, inverted);
+        variant_column->expand(mask, inverted);
     }
 
     ColumnPtr permute(const Permutation & perm, size_t limit) const override
     {
-        return create(variant_column_ptr->permute(perm, limit), variant_info, max_dynamic_types, global_max_dynamic_types);
+        return create(variant_column->permute(perm, limit), variant_info, max_dynamic_types);
     }
 
     ColumnPtr index(const IColumn & indexes, size_t limit) const override
     {
-        return create(variant_column_ptr->index(indexes, limit), variant_info, max_dynamic_types, global_max_dynamic_types);
+        return create(variant_column->index(indexes, limit), variant_info, max_dynamic_types);
     }
 
     ColumnPtr replicate(const Offsets & replicate_offsets) const override
     {
-        return create(variant_column_ptr->replicate(replicate_offsets), variant_info, max_dynamic_types, global_max_dynamic_types);
+        return create(variant_column->replicate(replicate_offsets), variant_info, max_dynamic_types);
     }
 
     MutableColumns scatter(ColumnIndex num_columns, const Selector & selector) const override
     {
-        MutableColumns scattered_variant_columns = variant_column_ptr->scatter(num_columns, selector);
+        MutableColumns scattered_variant_columns = variant_column->scatter(num_columns, selector);
         MutableColumns scattered_columns;
         scattered_columns.reserve(num_columns);
         for (auto & scattered_variant_column : scattered_variant_columns)
-            scattered_columns.emplace_back(create(std::move(scattered_variant_column), variant_info, max_dynamic_types, global_max_dynamic_types));
+            scattered_columns.emplace_back(create(std::move(scattered_variant_column), variant_info, max_dynamic_types));
 
         return scattered_columns;
     }
@@ -251,76 +229,71 @@ public:
 
     bool hasEqualValues() const override
     {
-        return variant_column_ptr->hasEqualValues();
+        return variant_column->hasEqualValues();
     }
 
     void getExtremes(Field & min, Field & max) const override
     {
-        variant_column_ptr->getExtremes(min, max);
+        variant_column->getExtremes(min, max);
     }
 
     void getPermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
-                        size_t limit, int nan_direction_hint, IColumn::Permutation & res) const override;
+                        size_t limit, int nan_direction_hint, IColumn::Permutation & res) const override
+    {
+        variant_column->getPermutation(direction, stability, limit, nan_direction_hint, res);
+    }
 
     void updatePermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
-                           size_t limit, int nan_direction_hint, IColumn::Permutation & res, EqualRanges & equal_ranges) const override;
+                           size_t limit, int nan_direction_hint, IColumn::Permutation & res, EqualRanges & equal_ranges) const override
+    {
+        variant_column->updatePermutation(direction, stability, limit, nan_direction_hint, res, equal_ranges);
+    }
 
     void reserve(size_t n) override
     {
-        variant_column_ptr->reserve(n);
+        variant_column->reserve(n);
     }
 
-    size_t capacity() const override
-    {
-        return variant_column_ptr->capacity();
-    }
-
-    void prepareForSquashing(const Columns & source_columns) override;
-    /// Prepare only variants but not discriminators and offsets.
-    void prepareVariantsForSquashing(const Columns & source_columns);
-
     void ensureOwnership() override
     {
-        variant_column_ptr->ensureOwnership();
+        variant_column->ensureOwnership();
     }
 
     size_t byteSize() const override
     {
-        return variant_column_ptr->byteSize();
+        return variant_column->byteSize();
     }
 
     size_t byteSizeAt(size_t n) const override
     {
-        return variant_column_ptr->byteSizeAt(n);
+        return variant_column->byteSizeAt(n);
     }
 
     size_t allocatedBytes() const override
     {
-        return variant_column_ptr->allocatedBytes();
+        return variant_column->allocatedBytes();
     }
 
     void protect() override
     {
-        variant_column_ptr->protect();
+        variant_column->protect();
     }
 
     void forEachSubcolumn(MutableColumnCallback callback) override
     {
         callback(variant_column);
-        variant_column_ptr = assert_cast<ColumnVariant *>(variant_column.get());
     }
 
     void forEachSubcolumnRecursively(RecursiveMutableColumnCallback callback) override
     {
         callback(*variant_column);
-        variant_column_ptr = assert_cast<ColumnVariant *>(variant_column.get());
         variant_column->forEachSubcolumnRecursively(callback);
     }
 
     bool structureEquals(const IColumn & rhs) const override
     {
         if (const auto * rhs_concrete = typeid_cast<const ColumnDynamic *>(&rhs))
-            return global_max_dynamic_types == rhs_concrete->global_max_dynamic_types;
+            return max_dynamic_types == rhs_concrete->max_dynamic_types;
         return false;
     }
 
@@ -328,27 +301,27 @@ public:
 
     double getRatioOfDefaultRows(double sample_ratio) const override
     {
-        return variant_column_ptr->getRatioOfDefaultRows(sample_ratio);
+        return variant_column->getRatioOfDefaultRows(sample_ratio);
     }
 
     UInt64 getNumberOfDefaultRows() const override
     {
-        return variant_column_ptr->getNumberOfDefaultRows();
+        return variant_column->getNumberOfDefaultRows();
     }
 
     void getIndicesOfNonDefaultRows(Offsets & indices, size_t from, size_t limit) const override
     {
-        variant_column_ptr->getIndicesOfNonDefaultRows(indices, from, limit);
+        variant_column->getIndicesOfNonDefaultRows(indices, from, limit);
     }
 
     void finalize() override
     {
-        variant_column_ptr->finalize();
+        variant_column->finalize();
     }
 
     bool isFinalized() const override
     {
-        return variant_column_ptr->isFinalized();
+        return variant_column->isFinalized();
     }
 
     /// Apply null map to a nested Variant column.
@@ -360,82 +333,20 @@ public:
     const ColumnPtr & getVariantColumnPtr() const { return variant_column; }
     ColumnPtr & getVariantColumnPtr() { return variant_column; }
 
-    const ColumnVariant & getVariantColumn() const { return *variant_column_ptr; }
-    ColumnVariant & getVariantColumn() { return *variant_column_ptr; }
+    const ColumnVariant & getVariantColumn() const { return assert_cast<const ColumnVariant &>(*variant_column); }
+    ColumnVariant & getVariantColumn() { return assert_cast<ColumnVariant &>(*variant_column); }
 
-    bool addNewVariant(const DataTypePtr & new_variant, const String & new_variant_name);
-    bool addNewVariant(const DataTypePtr & new_variant) { return addNewVariant(new_variant, new_variant->getName()); }
+    bool addNewVariant(const DataTypePtr & new_variant);
+    void addStringVariant();
 
     bool hasDynamicStructure() const override { return true; }
     void takeDynamicStructureFromSourceColumns(const Columns & source_columns) override;
 
-    const StatisticsPtr & getStatistics() const { return statistics; }
-    void setStatistics(const StatisticsPtr & statistics_) { statistics = statistics_; }
+    const Statistics & getStatistics() const { return statistics; }
 
     size_t getMaxDynamicTypes() const { return max_dynamic_types; }
 
-    /// Check if we can add new variant types.
-    /// Shared variant doesn't count in the limit but always presents,
-    /// so we should subtract 1 from the total types count.
-    bool canAddNewVariants(size_t current_variants_count, size_t new_variants_count) const { return current_variants_count + new_variants_count - 1 <= max_dynamic_types; }
-    bool canAddNewVariant(size_t current_variants_count) const { return canAddNewVariants(current_variants_count, 1); }
-    bool canAddNewVariants(size_t new_variants_count) const { return canAddNewVariants(variant_info.variant_names.size(), new_variants_count); }
-    bool canAddNewVariant() const { return canAddNewVariants(variant_info.variant_names.size(), 1); }
-
-    void setVariantType(const DataTypePtr & variant_type);
-    void setMaxDynamicPaths(size_t max_dynamic_type_);
-
-    static const String & getSharedVariantTypeName()
-    {
-        static const String name = SHARED_VARIANT_TYPE_NAME;
-        return name;
-    }
-
-    static DataTypePtr getSharedVariantDataType();
-
-    ColumnVariant::Discriminator getSharedVariantDiscriminator() const
-    {
-        return variant_info.variant_name_to_discriminator.at(getSharedVariantTypeName());
-    }
-
-    ColumnString & getSharedVariant()
-    {
-        return assert_cast<ColumnString &>(getVariantColumn().getVariantByGlobalDiscriminator(getSharedVariantDiscriminator()));
-    }
-
-    const ColumnString & getSharedVariant() const
-    {
-        return assert_cast<const ColumnString &>(getVariantColumn().getVariantByGlobalDiscriminator(getSharedVariantDiscriminator()));
-    }
-
-    /// Serializes type and value in binary format into provided shared variant. Doesn't update Variant discriminators and offsets.
-    static void serializeValueIntoSharedVariant(ColumnString & shared_variant, const IColumn & src, const DataTypePtr & type, const SerializationPtr & serialization, size_t n);
-
-    /// Insert value into shared variant. Also updates Variant discriminators and offsets.
-    void insertValueIntoSharedVariant(const IColumn & src, const DataTypePtr & type, const String & type_name, size_t n);
-
-    const SerializationPtr & getVariantSerialization(const DataTypePtr & variant_type, const String & variant_name)
-    {
-        /// Get serialization for provided data type.
-        /// To avoid calling type->getDefaultSerialization() every time we use simple cache with max size.
-        /// When max size is reached, just clear the cache.
-        if (serialization_cache.size() == SERIALIZATION_CACHE_MAX_SIZE)
-            serialization_cache.clear();
-
-        if (auto it = serialization_cache.find(variant_name); it != serialization_cache.end())
-            return it->second;
-
-        return serialization_cache.emplace(variant_name, variant_type->getDefaultSerialization()).first->second;
-    }
-
-    const SerializationPtr & getVariantSerialization(const DataTypePtr & variant_type) { return getVariantSerialization(variant_type, variant_type->getName()); }
-
-    String getTypeNameAt(size_t row_num) const;
-    void getAllTypeNamesInto(std::unordered_set<String> & names) const;
-
 private:
-    void createVariantInfo(const DataTypePtr & variant_type);
-
     /// Combine current variant with the other variant and return global discriminators mapping
     /// from other variant to the combined one. It's used for inserting from
     /// different variants.
@@ -445,26 +356,15 @@ private:
     void updateVariantInfoAndExpandVariantColumn(const DataTypePtr & new_variant_type);
 
     WrappedPtr variant_column;
-    /// Store and use pointer to ColumnVariant to avoid virtual calls.
-    /// ColumnDynamic is widely used inside ColumnObject for each path and
-    /// with hundreds of paths these virtual calls are noticeable.
-    ColumnVariant * variant_column_ptr;
     /// Store the type of current variant with some additional information.
     VariantInfo variant_info;
     /// The maximum number of different types that can be stored in this Dynamic column.
-    /// If exceeded, all new variants will be added to a special shared variant with type String
-    /// in binary format. This limit can be different for different instances of Dynamic column.
-    /// When max_dynamic_types = 0, we will have only shared variant and insert all values into it.
+    /// If exceeded, all new variants will be converted to String.
     size_t max_dynamic_types;
-    /// The types limit specified in the data type by the user Dynamic(max_types=N).
-    /// max_dynamic_types in all column instances of this Dynamic type can be only smaller
-    /// (for example, max_dynamic_types can be reduced in takeDynamicStructureFromSourceColumns
-    /// before merge of different Dynamic columns).
-    size_t global_max_dynamic_types;
 
     /// Size statistics of each variants from MergeTree data part.
     /// Used in takeDynamicStructureFromSourceColumns and set during deserialization.
-    StatisticsPtr statistics;
+    Statistics statistics;
 
     /// Cache (Variant name) -> (global discriminators mapping from this variant to current variant in Dynamic column).
     /// Used to avoid mappings recalculation in combineVariants for the same Variant types.
@@ -472,17 +372,6 @@ private:
     /// Cache of Variant types that couldn't be combined with current variant in Dynamic column.
     /// Used to avoid checking if combination is possible for the same Variant types.
     std::unordered_set<String> variants_with_failed_combination;
-
-    /// We can use serializations of different data types to serialize values into shared variant.
-    /// To avoid creating the same serialization multiple times, use simple cache.
-    static const size_t SERIALIZATION_CACHE_MAX_SIZE = 256;
-    std::unordered_map<String, SerializationPtr> serialization_cache;
 };
 
-void extendVariantColumn(
-    IColumn & variant_column,
-    const DataTypePtr & old_variant_type,
-    const DataTypePtr & new_variant_type,
-    std::unordered_map<String, UInt8> old_variant_name_to_discriminator);
-
 }
diff --git a/src/Columns/ColumnFixedString.cpp b/src/Columns/ColumnFixedString.cpp
index 04e894ee5ab..0bb3f7edb14 100644
--- a/src/Columns/ColumnFixedString.cpp
+++ b/src/Columns/ColumnFixedString.cpp
@@ -59,7 +59,7 @@ bool ColumnFixedString::isDefaultAt(size_t index) const
 
 void ColumnFixedString::insert(const Field & x)
 {
-    const String & s = x.safeGet<const String &>();
+    const String & s = x.get<const String &>();
     insertData(s.data(), s.size());
 }
 
@@ -67,7 +67,7 @@ bool ColumnFixedString::tryInsert(const Field & x)
 {
     if (x.getType() != Field::Types::Which::String)
         return false;
-    const String & s = x.safeGet<const String &>();
+    const String & s = x.get<const String &>();
     if (s.size() > n)
         return false;
     insertData(s.data(), s.size());
diff --git a/src/Columns/ColumnFixedString.h b/src/Columns/ColumnFixedString.h
index 8cf0a6a57da..676ac7712ba 100644
--- a/src/Columns/ColumnFixedString.h
+++ b/src/Columns/ColumnFixedString.h
@@ -182,11 +182,6 @@ public:
         chars.reserve_exact(n * size);
     }
 
-    size_t capacity() const override
-    {
-        return chars.capacity() / n;
-    }
-
     void shrinkToFit() override
     {
         chars.shrink_to_fit();
diff --git a/src/Columns/ColumnLowCardinality.h b/src/Columns/ColumnLowCardinality.h
index 3cc1c8919c0..3766b247d60 100644
--- a/src/Columns/ColumnLowCardinality.h
+++ b/src/Columns/ColumnLowCardinality.h
@@ -46,8 +46,8 @@ public:
         return Base::create(std::move(column_unique), std::move(indexes), is_shared);
     }
 
-    std::string getName() const override { return "LowCardinality(" + getDictionary().getNestedColumn()->getName() + ")"; }
-    const char * getFamilyName() const override { return "LowCardinality"; }
+    std::string getName() const override { return "ColumnLowCardinality"; }
+    const char * getFamilyName() const override { return "ColumnLowCardinality"; }
     TypeIndex getDataType() const override { return TypeIndex::LowCardinality; }
 
     ColumnPtr convertToFullColumn() const { return getDictionary().getNestedColumn()->index(getIndexes(), 0); }
@@ -172,7 +172,6 @@ public:
     }
 
     void reserve(size_t n) override { idx.reserve(n); }
-    size_t capacity() const override { return idx.capacity(); }
     void shrinkToFit() override { idx.shrinkToFit(); }
 
     /// Don't count the dictionary size as it can be shared between different blocks.
@@ -310,7 +309,6 @@ public:
 
         void popBack(size_t n) { positions->popBack(n); }
         void reserve(size_t n) { positions->reserve(n); }
-        size_t capacity() const { return positions->capacity(); }
         void shrinkToFit() { positions->shrinkToFit(); }
 
         UInt64 getMaxPositionForCurrentType() const;
diff --git a/src/Columns/ColumnMap.cpp b/src/Columns/ColumnMap.cpp
index 536da4d06d0..1025b4e77b9 100644
--- a/src/Columns/ColumnMap.cpp
+++ b/src/Columns/ColumnMap.cpp
@@ -72,7 +72,7 @@ void ColumnMap::get(size_t n, Field & res) const
     size_t size = offsets[n] - offsets[n - 1];
 
     res = Map();
-    auto & map = res.safeGet<Map &>();
+    auto & map = res.get<Map &>();
     map.reserve(size);
 
     for (size_t i = 0; i < size; ++i)
@@ -96,7 +96,7 @@ void ColumnMap::insertData(const char *, size_t)
 
 void ColumnMap::insert(const Field & x)
 {
-    const auto & map = x.safeGet<const Map &>();
+    const auto & map = x.get<const Map &>();
     nested->insert(Array(map.begin(), map.end()));
 }
 
@@ -105,7 +105,7 @@ bool ColumnMap::tryInsert(const Field & x)
     if (x.getType() != Field::Types::Which::Map)
         return false;
 
-    const auto & map = x.safeGet<const Map &>();
+    const auto & map = x.get<const Map &>();
     return nested->tryInsert(Array(map.begin(), map.end()));
 }
 
@@ -249,20 +249,6 @@ void ColumnMap::reserve(size_t n)
     nested->reserve(n);
 }
 
-size_t ColumnMap::capacity() const
-{
-    return nested->capacity();
-}
-
-void ColumnMap::prepareForSquashing(const Columns & source_columns)
-{
-    Columns nested_source_columns;
-    nested_source_columns.reserve(source_columns.size());
-    for (const auto & source_column : source_columns)
-        nested_source_columns.push_back(assert_cast<const ColumnMap &>(*source_column).getNestedColumnPtr());
-    nested->prepareForSquashing(nested_source_columns);
-}
-
 void ColumnMap::shrinkToFit()
 {
     nested->shrinkToFit();
@@ -302,8 +288,8 @@ void ColumnMap::getExtremes(Field & min, Field & max) const
 
     /// Convert result Array fields to Map fields because client expect min and max field to have type Map
 
-    Array nested_min_value = nested_min.safeGet<Array>();
-    Array nested_max_value = nested_max.safeGet<Array>();
+    Array nested_min_value = nested_min.get<Array>();
+    Array nested_max_value = nested_max.get<Array>();
 
     Map map_min_value(nested_min_value.begin(), nested_min_value.end());
     Map map_max_value(nested_max_value.begin(), nested_max_value.end());
diff --git a/src/Columns/ColumnMap.h b/src/Columns/ColumnMap.h
index 39d15a586b9..3eaaa0ad562 100644
--- a/src/Columns/ColumnMap.h
+++ b/src/Columns/ColumnMap.h
@@ -94,8 +94,6 @@ public:
     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;
-    size_t capacity() const override;
-    void prepareForSquashing(const Columns & source_columns) override;
     void shrinkToFit() override;
     void ensureOwnership() override;
     size_t byteSize() const override;
diff --git a/src/Columns/ColumnNullable.cpp b/src/Columns/ColumnNullable.cpp
index ec375ea5a8d..6529f0b78db 100644
--- a/src/Columns/ColumnNullable.cpp
+++ b/src/Columns/ColumnNullable.cpp
@@ -706,27 +706,6 @@ void ColumnNullable::reserve(size_t n)
     getNullMapData().reserve(n);
 }
 
-size_t ColumnNullable::capacity() const
-{
-    return getNullMapData().capacity();
-}
-
-void ColumnNullable::prepareForSquashing(const Columns & source_columns)
-{
-    size_t new_size = size();
-    Columns nested_source_columns;
-    nested_source_columns.reserve(source_columns.size());
-    for (const auto & source_column : source_columns)
-    {
-        const auto & source_nullable_column = assert_cast<const ColumnNullable &>(*source_column);
-        new_size += source_nullable_column.size();
-        nested_source_columns.push_back(source_nullable_column.getNestedColumnPtr());
-    }
-
-    nested_column->prepareForSquashing(nested_source_columns);
-    getNullMapData().reserve(new_size);
-}
-
 void ColumnNullable::shrinkToFit()
 {
     getNestedColumn().shrinkToFit();
diff --git a/src/Columns/ColumnNullable.h b/src/Columns/ColumnNullable.h
index 78274baca51..fe9f5b6dcc2 100644
--- a/src/Columns/ColumnNullable.h
+++ b/src/Columns/ColumnNullable.h
@@ -125,8 +125,6 @@ public:
                         size_t limit, int null_direction_hint, Permutation & res, EqualRanges& equal_ranges) const override;
     size_t estimateCardinalityInPermutedRange(const Permutation & permutation, const EqualRange & equal_range) const override;
     void reserve(size_t n) override;
-    size_t capacity() const override;
-    void prepareForSquashing(const Columns & source_columns) override;
     void shrinkToFit() override;
     void ensureOwnership() override;
     size_t byteSize() const override;
diff --git a/src/Columns/ColumnObject.cpp b/src/Columns/ColumnObject.cpp
index e397b03b69e..a6431007cb6 100644
--- a/src/Columns/ColumnObject.cpp
+++ b/src/Columns/ColumnObject.cpp
@@ -1,444 +1,766 @@
+#include <Core/Field.h>
 #include <Columns/ColumnObject.h>
-#include <Columns/ColumnCompressed.h>
-#include <DataTypes/Serializations/SerializationDynamic.h>
-#include <IO/Operators.h>
-#include <IO/WriteBufferFromString.h>
-#include <IO/ReadBufferFromString.h>
-#include <Common/Arena.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>
+#include <DataTypes/DataTypeNothing.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <Interpreters/castColumn.h>
+#include <Interpreters/convertFieldToType.h>
+#include <Common/HashTable/HashSet.h>
+#include <numeric>
+
 
 namespace DB
 {
 
 namespace ErrorCodes
 {
-    extern const int NOT_IMPLEMENTED;
-    extern const int LOGICAL_ERROR;
+    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;
 }
 
 namespace
 {
 
-const FormatSettings & getFormatSettings()
+/// Recreates column with default scalar values and keeps sizes of arrays.
+ColumnPtr recreateColumnWithDefaultValues(
+    const ColumnPtr & column, const DataTypePtr & scalar_type, size_t num_dimensions)
 {
-    static const FormatSettings settings;
-    return settings;
-}
-
-const std::shared_ptr<SerializationDynamic> & getDynamicSerialization()
-{
-    static const std::shared_ptr<SerializationDynamic> dynamic_serialization = std::make_shared<SerializationDynamic>();
-    return dynamic_serialization;
-}
-
-}
-
-ColumnObject::ColumnObject(
-    std::unordered_map<String, MutableColumnPtr> typed_paths_,
-    std::unordered_map<String, MutableColumnPtr> dynamic_paths_,
-    MutableColumnPtr shared_data_,
-    size_t max_dynamic_paths_,
-    size_t global_max_dynamic_paths_,
-    size_t max_dynamic_types_,
-    const StatisticsPtr & statistics_)
-    : shared_data(std::move(shared_data_))
-    , max_dynamic_paths(max_dynamic_paths_)
-    , global_max_dynamic_paths(global_max_dynamic_paths_)
-    , max_dynamic_types(max_dynamic_types_)
-    , statistics(statistics_)
-{
-    typed_paths.reserve(typed_paths_.size());
-    for (auto & [path, column] : typed_paths_)
-        typed_paths[path] = std::move(column);
-
-    dynamic_paths.reserve(dynamic_paths_.size());
-    dynamic_paths_ptrs.reserve(dynamic_paths_.size());
-    for (auto & [path, column] : dynamic_paths_)
+    const auto * column_array = checkAndGetColumn<ColumnArray>(column.get());
+    if (column_array && num_dimensions)
     {
-        dynamic_paths[path] = std::move(column);
-        dynamic_paths_ptrs[path] = assert_cast<ColumnDynamic *>(dynamic_paths[path].get());
+        return ColumnArray::create(
+            recreateColumnWithDefaultValues(
+                column_array->getDataPtr(), scalar_type, num_dimensions - 1),
+                IColumn::mutate(column_array->getOffsetsPtr()));
+    }
+
+    return createArrayOfType(scalar_type, num_dimensions)->createColumn()->cloneResized(column->size());
+}
+
+/// Replaces NULL fields to given field or empty array.
+class FieldVisitorReplaceNull : public StaticVisitor<Field>
+{
+public:
+    explicit FieldVisitorReplaceNull(
+        const Field & replacement_, size_t num_dimensions_)
+        : replacement(replacement_)
+        , num_dimensions(num_dimensions_)
+    {
+    }
+
+    Field operator()(const Null &) const
+    {
+        return num_dimensions ? Array() : replacement;
+    }
+
+    Field operator()(const Array & x) const
+    {
+        assert(num_dimensions > 0);
+        const size_t size = x.size();
+        Array res(size);
+        for (size_t i = 0; i < size; ++i)
+            res[i] = applyVisitor(FieldVisitorReplaceNull(replacement, num_dimensions - 1), x[i]);
+        return res;
+    }
+
+    template <typename T>
+    Field operator()(const T & x) const { return x; }
+
+private:
+    const Field & replacement;
+    size_t num_dimensions;
+};
+
+/// Visitor that allows to get type of scalar field
+/// or least common type of scalars in array.
+/// More optimized version of FieldToDataType.
+class FieldVisitorToScalarType : public StaticVisitor<>
+{
+public:
+    using FieldType = Field::Types::Which;
+
+    void operator()(const Array & x)
+    {
+        size_t size = x.size();
+        for (size_t i = 0; i < size; ++i)
+            applyVisitor(*this, x[i]);
+    }
+
+    void operator()(const UInt64 & x)
+    {
+        field_types.insert(FieldType::UInt64);
+        if (x <= std::numeric_limits<UInt8>::max())
+            type_indexes.insert(TypeIndex::UInt8);
+        else if (x <= std::numeric_limits<UInt16>::max())
+            type_indexes.insert(TypeIndex::UInt16);
+        else if (x <= std::numeric_limits<UInt32>::max())
+            type_indexes.insert(TypeIndex::UInt32);
+        else
+            type_indexes.insert(TypeIndex::UInt64);
+    }
+
+    void operator()(const Int64 & x)
+    {
+        field_types.insert(FieldType::Int64);
+        if (x <= std::numeric_limits<Int8>::max() && x >= std::numeric_limits<Int8>::min())
+            type_indexes.insert(TypeIndex::Int8);
+        else if (x <= std::numeric_limits<Int16>::max() && x >= std::numeric_limits<Int16>::min())
+            type_indexes.insert(TypeIndex::Int16);
+        else if (x <= std::numeric_limits<Int32>::max() && x >= std::numeric_limits<Int32>::min())
+            type_indexes.insert(TypeIndex::Int32);
+        else
+            type_indexes.insert(TypeIndex::Int64);
+    }
+
+    void operator()(const bool &)
+    {
+        field_types.insert(FieldType::UInt64);
+        type_indexes.insert(TypeIndex::UInt8);
+    }
+
+    void operator()(const Null &)
+    {
+        have_nulls = true;
+    }
+
+    template <typename T>
+    void operator()(const T &)
+    {
+        field_types.insert(Field::TypeToEnum<NearestFieldType<T>>::value);
+        type_indexes.insert(TypeToTypeIndex<NearestFieldType<T>>);
+    }
+
+    DataTypePtr getScalarType() const { return getLeastSupertypeOrString(type_indexes); }
+    bool haveNulls() const { return have_nulls; }
+    bool needConvertField() const { return field_types.size() > 1; }
+
+private:
+    TypeIndexSet type_indexes;
+    std::unordered_set<FieldType> field_types;
+    bool have_nulls = false;
+};
+
+}
+
+FieldInfo getFieldInfo(const Field & field)
+{
+    FieldVisitorToScalarType to_scalar_type_visitor;
+    applyVisitor(to_scalar_type_visitor, field);
+    FieldVisitorToNumberOfDimensions to_number_dimension_visitor;
+
+    return
+    {
+        to_scalar_type_visitor.getScalarType(),
+        to_scalar_type_visitor.haveNulls(),
+        to_scalar_type_visitor.needConvertField(),
+        applyVisitor(to_number_dimension_visitor, field),
+        to_number_dimension_visitor.need_fold_dimension
+    };
+}
+
+ColumnObject::Subcolumn::Subcolumn(MutableColumnPtr && data_, bool is_nullable_)
+    : least_common_type(getDataTypeByColumn(*data_))
+    , is_nullable(is_nullable_)
+    , num_rows(data_->size())
+{
+    data.push_back(std::move(data_));
+}
+
+ColumnObject::Subcolumn::Subcolumn(
+    size_t size_, bool is_nullable_)
+    : least_common_type(std::make_shared<DataTypeNothing>())
+    , is_nullable(is_nullable_)
+    , num_of_defaults_in_prefix(size_)
+    , num_rows(size_)
+{
+}
+
+size_t ColumnObject::Subcolumn::size() const
+{
+    return num_rows;
+}
+
+size_t ColumnObject::Subcolumn::byteSize() const
+{
+    size_t res = 0;
+    for (const auto & part : data)
+        res += part->byteSize();
+    return res;
+}
+
+size_t ColumnObject::Subcolumn::allocatedBytes() const
+{
+    size_t res = 0;
+    for (const auto & part : data)
+        res += part->allocatedBytes();
+    return res;
+}
+
+void ColumnObject::Subcolumn::get(size_t n, Field & res) const
+{
+    if (isFinalized())
+    {
+        getFinalizedColumn().get(n, res);
+        return;
+    }
+
+    size_t ind = n;
+    if (ind < num_of_defaults_in_prefix)
+    {
+        res = least_common_type.get()->getDefault();
+        return;
+    }
+
+    ind -= num_of_defaults_in_prefix;
+    for (const auto & part : data)
+    {
+        if (ind < part->size())
+        {
+            part->get(ind, res);
+            res = convertFieldToTypeOrThrow(res, *least_common_type.get());
+            return;
+        }
+
+        ind -= part->size();
+    }
+
+    throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Index ({}) for getting field is out of range", n);
+}
+
+void ColumnObject::Subcolumn::checkTypes() const
+{
+    DataTypes prefix_types;
+    prefix_types.reserve(data.size());
+    for (size_t i = 0; i < data.size(); ++i)
+    {
+        auto current_type = getDataTypeByColumn(*data[i]);
+        prefix_types.push_back(current_type);
+        auto prefix_common_type = getLeastSupertype(prefix_types);
+        if (!prefix_common_type->equals(*current_type))
+            throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR,
+                "Data type {} of column at position {} cannot represent all columns from i-th prefix",
+                current_type->getName(), i);
     }
 }
 
-ColumnObject::ColumnObject(
-    std::unordered_map<String, MutableColumnPtr> typed_paths_, size_t max_dynamic_paths_, size_t max_dynamic_types_)
-    : max_dynamic_paths(max_dynamic_paths_), global_max_dynamic_paths(max_dynamic_paths_), max_dynamic_types(max_dynamic_types_)
+void ColumnObject::Subcolumn::insert(Field field)
 {
-    typed_paths.reserve(typed_paths_.size());
-    for (auto & [path, column] : typed_paths_)
+    auto info = DB::getFieldInfo(field);
+    insert(std::move(field), std::move(info));
+}
+
+void ColumnObject::Subcolumn::addNewColumnPart(DataTypePtr type)
+{
+    auto serialization = type->getSerialization(ISerialization::Kind::SPARSE);
+    data.push_back(type->createColumn(*serialization));
+    least_common_type = LeastCommonType{std::move(type)};
+}
+
+static bool isConversionRequiredBetweenIntegers(const IDataType & lhs, const IDataType & rhs)
+{
+    /// If both of types are signed/unsigned integers and size of left field type
+    /// is less than right type, we don't need to convert field,
+    /// because all integer fields are stored in Int64/UInt64.
+
+    WhichDataType which_lhs(lhs);
+    WhichDataType which_rhs(rhs);
+
+    bool is_native_int = which_lhs.isNativeInt() && which_rhs.isNativeInt();
+    bool is_native_uint = which_lhs.isNativeUInt() && which_rhs.isNativeUInt();
+
+    return (!is_native_int && !is_native_uint)
+        || lhs.getSizeOfValueInMemory() > rhs.getSizeOfValueInMemory();
+}
+
+void ColumnObject::Subcolumn::insert(Field field, FieldInfo info)
+{
+    auto base_type = std::move(info.scalar_type);
+
+    if (isNothing(base_type) && info.num_dimensions == 0)
     {
-        if (!column->empty())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected non-empty typed path column in ColumnObject constructor");
-        typed_paths[path] = std::move(column);
+        insertDefault();
+        return;
     }
 
-    MutableColumns paths_and_values;
-    paths_and_values.emplace_back(ColumnString::create());
-    paths_and_values.emplace_back(ColumnString::create());
-    shared_data = ColumnArray::create(ColumnTuple::create(std::move(paths_and_values)));
+    auto column_dim = least_common_type.getNumberOfDimensions();
+    auto value_dim = info.num_dimensions;
+
+    if (isNothing(least_common_type.get()))
+        column_dim = value_dim;
+
+    if (isNothing(base_type))
+        value_dim = column_dim;
+
+    if (value_dim != column_dim)
+        throw Exception(ErrorCodes::NUMBER_OF_DIMENSIONS_MISMATCHED,
+            "Dimension of types mismatched between inserted value and column. "
+            "Dimension of value: {}. Dimension of column: {}",
+             value_dim, column_dim);
+
+    if (is_nullable)
+        base_type = makeNullable(base_type);
+
+    if (!is_nullable && info.have_nulls)
+        field = applyVisitor(FieldVisitorReplaceNull(base_type->getDefault(), value_dim), std::move(field));
+
+    bool type_changed = false;
+    const auto & least_common_base_type = least_common_type.getBase();
+
+    if (data.empty())
+    {
+        addNewColumnPart(createArrayOfType(std::move(base_type), value_dim));
+    }
+    else if (!least_common_base_type->equals(*base_type) && !isNothing(base_type))
+    {
+        if (isConversionRequiredBetweenIntegers(*base_type, *least_common_base_type))
+        {
+            base_type = getLeastSupertypeOrString(DataTypes{std::move(base_type), least_common_base_type});
+            type_changed = true;
+            if (!least_common_base_type->equals(*base_type))
+                addNewColumnPart(createArrayOfType(std::move(base_type), value_dim));
+        }
+    }
+
+    if (type_changed || info.need_convert)
+        field = convertFieldToTypeOrThrow(field, *least_common_type.get());
+
+    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;
 }
 
-ColumnObject::Ptr ColumnObject::create(
-    const std::unordered_map<String, ColumnPtr> & typed_paths_,
-    const std::unordered_map<String, ColumnPtr> & dynamic_paths_,
-    const ColumnPtr & shared_data_,
-    size_t max_dynamic_paths_,
-    size_t global_max_dynamic_paths_,
-    size_t max_dynamic_types_,
-    const ColumnObject::StatisticsPtr & statistics_)
+void ColumnObject::Subcolumn::insertRangeFrom(const Subcolumn & src, size_t start, size_t length)
 {
-    std::unordered_map<String, MutableColumnPtr> mutable_typed_paths;
-    mutable_typed_paths.reserve(typed_paths_.size());
-    for (const auto & [path, column] : typed_paths_)
-        mutable_typed_paths[path] = typed_paths_.at(path)->assumeMutable();
+    assert(start + length <= src.size());
+    size_t end = start + length;
+    num_rows += length;
 
-    std::unordered_map<String, MutableColumnPtr> mutable_dynamic_paths;
-    mutable_dynamic_paths.reserve(dynamic_paths_.size());
-    for (const auto & [path, column] : dynamic_paths_)
-        mutable_dynamic_paths[path] = dynamic_paths_.at(path)->assumeMutable();
+    if (data.empty())
+    {
+        addNewColumnPart(src.getLeastCommonType());
+    }
+    else if (!least_common_type.get()->equals(*src.getLeastCommonType()))
+    {
+        auto new_least_common_type = getLeastSupertypeOrString(DataTypes{least_common_type.get(), src.getLeastCommonType()});
+        if (!new_least_common_type->equals(*least_common_type.get()))
+            addNewColumnPart(std::move(new_least_common_type));
+    }
 
-    return ColumnObject::create(
-        std::move(mutable_typed_paths),
-        std::move(mutable_dynamic_paths),
-        shared_data_->assumeMutable(),
-        max_dynamic_paths_,
-        global_max_dynamic_paths_,
-        max_dynamic_types_,
-        statistics_);
+    if (end <= src.num_of_defaults_in_prefix)
+    {
+        data.back()->insertManyDefaults(length);
+        return;
+    }
+
+    if (start < src.num_of_defaults_in_prefix)
+        data.back()->insertManyDefaults(src.num_of_defaults_in_prefix - start);
+
+    auto insert_from_part = [&](const auto & column, size_t from, size_t n)
+    {
+        assert(from + n <= column->size());
+        auto column_type = getDataTypeByColumn(*column);
+
+        if (column_type->equals(*least_common_type.get()))
+        {
+            data.back()->insertRangeFrom(*column, from, n);
+            return;
+        }
+
+        /// If we need to insert large range, there is no sense to cut part of column and cast it.
+        /// Casting of all column and inserting from it can be faster.
+        /// Threshold is just a guess.
+
+        if (n * 3 >= column->size())
+        {
+            auto casted_column = castColumn({column, column_type, ""}, least_common_type.get());
+            data.back()->insertRangeFrom(*casted_column, from, n);
+            return;
+        }
+
+        auto casted_column = column->cut(from, n);
+        casted_column = castColumn({casted_column, column_type, ""}, least_common_type.get());
+        data.back()->insertRangeFrom(*casted_column, 0, n);
+    };
+
+    size_t pos = 0;
+    size_t processed_rows = src.num_of_defaults_in_prefix;
+
+    /// Find the first part of the column that intersects the range.
+    while (pos < src.data.size() && processed_rows + src.data[pos]->size() < start)
+    {
+        processed_rows += src.data[pos]->size();
+        ++pos;
+    }
+
+    /// Insert from the first part of column.
+    if (pos < src.data.size() && processed_rows < start)
+    {
+        size_t part_start = start - processed_rows;
+        size_t part_length = std::min(src.data[pos]->size() - part_start, end - start);
+        insert_from_part(src.data[pos], part_start, part_length);
+        processed_rows += src.data[pos]->size();
+        ++pos;
+    }
+
+    /// Insert from the parts of column in the middle of range.
+    while (pos < src.data.size() && processed_rows + src.data[pos]->size() < end)
+    {
+        insert_from_part(src.data[pos], 0, src.data[pos]->size());
+        processed_rows += src.data[pos]->size();
+        ++pos;
+    }
+
+    /// Insert from the last part of column if needed.
+    if (pos < src.data.size() && processed_rows < end)
+    {
+        size_t part_end = end - processed_rows;
+        insert_from_part(src.data[pos], 0, part_end);
+    }
 }
 
-ColumnObject::MutablePtr ColumnObject::create(
-    std::unordered_map<String, MutableColumnPtr> typed_paths_,
-    std::unordered_map<String, MutableColumnPtr> dynamic_paths_,
-    MutableColumnPtr shared_data_,
-    size_t max_dynamic_paths_,
-    size_t global_max_dynamic_paths_,
-    size_t max_dynamic_types_,
-    const ColumnObject::StatisticsPtr & statistics_)
+bool ColumnObject::Subcolumn::isFinalized() const
 {
-    return Base::create(std::move(typed_paths_), std::move(dynamic_paths_), std::move(shared_data_), max_dynamic_paths_, global_max_dynamic_paths_, max_dynamic_types_, statistics_);
+    return num_of_defaults_in_prefix == 0 &&
+        (data.empty() || (data.size() == 1 && !data[0]->isSparse()));
 }
 
-ColumnObject::MutablePtr ColumnObject::create(std::unordered_map<String, MutableColumnPtr> typed_paths_, size_t max_dynamic_paths_, size_t max_dynamic_types_)
+void ColumnObject::Subcolumn::finalize()
 {
-    return Base::create(std::move(typed_paths_), max_dynamic_paths_, max_dynamic_types_);
+    if (isFinalized())
+        return;
+
+    if (data.size() == 1 && num_of_defaults_in_prefix == 0)
+    {
+        data[0] = data[0]->convertToFullColumnIfSparse();
+        return;
+    }
+
+    const auto & to_type = least_common_type.get();
+    auto result_column = to_type->createColumn();
+
+    if (num_of_defaults_in_prefix)
+        result_column->insertManyDefaults(num_of_defaults_in_prefix);
+
+    for (auto & part : data)
+    {
+        part = part->convertToFullColumnIfSparse();
+        auto from_type = getDataTypeByColumn(*part);
+        size_t part_size = part->size();
+
+        if (!from_type->equals(*to_type))
+        {
+            auto offsets = ColumnUInt64::create();
+            auto & offsets_data = offsets->getData();
+
+            /// We need to convert only non-default values and then recreate column
+            /// with default value of new type, because default values (which represents misses in data)
+            /// may be inconsistent between types (e.g "0" in UInt64 and empty string in String).
+
+            part->getIndicesOfNonDefaultRows(offsets_data, 0, part_size);
+
+            if (offsets->size() == part_size)
+            {
+                part = castColumn({part, from_type, ""}, to_type);
+            }
+            else
+            {
+                auto values = part->index(*offsets, offsets->size());
+                values = castColumn({values, from_type, ""}, to_type);
+                part = values->createWithOffsets(offsets_data, *createColumnConstWithDefaultValue(result_column->getPtr()), part_size, /*shift=*/ 0);
+            }
+        }
+
+        result_column->insertRangeFrom(*part, 0, part_size);
+    }
+
+    data = { std::move(result_column) };
+    num_of_defaults_in_prefix = 0;
 }
 
-std::string ColumnObject::getName() const
+void ColumnObject::Subcolumn::insertDefault()
 {
-    WriteBufferFromOwnString ss;
-    ss << "Object(";
-    ss << "max_dynamic_paths=" << global_max_dynamic_paths;
-    ss << ", max_dynamic_types=" << max_dynamic_types;
-    std::vector<String> sorted_typed_paths;
-    sorted_typed_paths.reserve(typed_paths.size());
-    for (const auto & [path, column] : typed_paths)
-        sorted_typed_paths.push_back(path);
-    std::sort(sorted_typed_paths.begin(), sorted_typed_paths.end());
-    for (const auto & path : sorted_typed_paths)
-        ss << ", " << path << " " << typed_paths.at(path)->getName();
-    ss << ")";
-    return ss.str();
+    if (data.empty())
+        ++num_of_defaults_in_prefix;
+    else
+        data.back()->insertDefault();
+
+    ++num_rows;
 }
 
-MutableColumnPtr ColumnObject::cloneEmpty() const
+void ColumnObject::Subcolumn::insertManyDefaults(size_t length)
 {
-    std::unordered_map<String, MutableColumnPtr> empty_typed_paths;
-    empty_typed_paths.reserve(typed_paths.size());
-    for (const auto & [path, column] : typed_paths)
-        empty_typed_paths[path] = column->cloneEmpty();
+    if (data.empty())
+        num_of_defaults_in_prefix += length;
+    else
+        data.back()->insertManyDefaults(length);
 
-    std::unordered_map<String, MutableColumnPtr> empty_dynamic_paths;
-    empty_dynamic_paths.reserve(dynamic_paths.size());
-    for (const auto & [path, column] : dynamic_paths)
-        empty_dynamic_paths[path] = column->cloneEmpty();
-
-    return ColumnObject::create(
-        std::move(empty_typed_paths),
-        std::move(empty_dynamic_paths),
-        shared_data->cloneEmpty(),
-        max_dynamic_paths,
-        global_max_dynamic_paths,
-        max_dynamic_types,
-        statistics);
+    num_rows += length;
 }
 
-MutableColumnPtr ColumnObject::cloneResized(size_t size) const
+void ColumnObject::Subcolumn::popBack(size_t n)
 {
-    std::unordered_map<String, MutableColumnPtr> resized_typed_paths;
-    resized_typed_paths.reserve(typed_paths.size());
-    for (const auto & [path, column] : typed_paths)
-        resized_typed_paths[path] = column->cloneResized(size);
+    assert(n <= size());
 
-    std::unordered_map<String, MutableColumnPtr> resized_dynamic_paths;
-    resized_dynamic_paths.reserve(dynamic_paths.size());
-    for (const auto & [path, column] : dynamic_paths)
-        resized_dynamic_paths[path] = column->cloneResized(size);
+    num_rows -= n;
+    size_t num_removed = 0;
+    for (auto it = data.rbegin(); it != data.rend(); ++it)
+    {
+        if (n == 0)
+            break;
 
-    return ColumnObject::create(
-        std::move(resized_typed_paths),
-        std::move(resized_dynamic_paths),
-        shared_data->cloneResized(size),
-        max_dynamic_paths,
-        global_max_dynamic_paths,
-        max_dynamic_types,
-        statistics);
+        auto & column = *it;
+        if (n < column->size())
+        {
+            column->popBack(n);
+            n = 0;
+        }
+        else
+        {
+            ++num_removed;
+            n -= column->size();
+        }
+    }
+
+    data.resize(data.size() - num_removed);
+    num_of_defaults_in_prefix -= n;
+}
+
+ColumnObject::Subcolumn ColumnObject::Subcolumn::cut(size_t start, size_t length) const
+{
+    Subcolumn new_subcolumn(0, is_nullable);
+    new_subcolumn.insertRangeFrom(*this, start, length);
+    return new_subcolumn;
+}
+
+Field ColumnObject::Subcolumn::getLastField() const
+{
+    if (data.empty())
+        return Field();
+
+    const auto & last_part = data.back();
+    assert(!last_part->empty());
+    return (*last_part)[last_part->size() - 1];
+}
+
+FieldInfo ColumnObject::Subcolumn::getFieldInfo() const
+{
+    const auto & base_type = least_common_type.getBase();
+    return FieldInfo
+    {
+        .scalar_type = base_type,
+        .have_nulls = base_type->isNullable(),
+        .need_convert = false,
+        .num_dimensions = least_common_type.getNumberOfDimensions(),
+        .need_fold_dimension = false,
+    };
+}
+
+ColumnObject::Subcolumn ColumnObject::Subcolumn::recreateWithDefaultValues(const FieldInfo & field_info) const
+{
+    auto scalar_type = field_info.scalar_type;
+    if (is_nullable)
+        scalar_type = makeNullable(scalar_type);
+
+    Subcolumn new_subcolumn(*this);
+    new_subcolumn.least_common_type = LeastCommonType{createArrayOfType(scalar_type, field_info.num_dimensions)};
+
+    for (auto & part : new_subcolumn.data)
+        part = recreateColumnWithDefaultValues(part, scalar_type, field_info.num_dimensions);
+
+    return new_subcolumn;
+}
+
+IColumn & ColumnObject::Subcolumn::getFinalizedColumn()
+{
+    assert(isFinalized());
+    return *data[0];
+}
+
+const IColumn & ColumnObject::Subcolumn::getFinalizedColumn() const
+{
+    assert(isFinalized());
+    return *data[0];
+}
+
+const ColumnPtr & ColumnObject::Subcolumn::getFinalizedColumnPtr() const
+{
+    assert(isFinalized());
+    return data[0];
+}
+
+ColumnObject::Subcolumn::LeastCommonType::LeastCommonType()
+    : type(std::make_shared<DataTypeNothing>())
+    , base_type(type)
+    , num_dimensions(0)
+{
+}
+
+ColumnObject::Subcolumn::LeastCommonType::LeastCommonType(DataTypePtr type_)
+    : type(std::move(type_))
+    , base_type(getBaseTypeOfArray(type))
+    , num_dimensions(DB::getNumberOfDimensions(*type))
+{
+}
+
+ColumnObject::ColumnObject(bool is_nullable_)
+    : is_nullable(is_nullable_)
+    , num_rows(0)
+{
+}
+
+ColumnObject::ColumnObject(Subcolumns && subcolumns_, bool is_nullable_)
+    : is_nullable(is_nullable_)
+    , subcolumns(std::move(subcolumns_))
+    , num_rows(subcolumns.empty() ? 0 : (*subcolumns.begin())->data.size())
+
+{
+    checkConsistency();
+}
+
+void ColumnObject::checkConsistency() const
+{
+    if (subcolumns.empty())
+        return;
+
+    for (const auto & leaf : subcolumns)
+    {
+        if (num_rows != leaf->data.size())
+        {
+            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);
+        }
+    }
+}
+
+size_t ColumnObject::size() const
+{
+#ifndef NDEBUG
+    checkConsistency();
+#endif
+    return num_rows;
+}
+
+size_t ColumnObject::byteSize() const
+{
+    size_t res = 0;
+    for (const auto & entry : subcolumns)
+        res += entry->data.byteSize();
+    return res;
+}
+
+size_t ColumnObject::allocatedBytes() const
+{
+    size_t res = 0;
+    for (const auto & entry : subcolumns)
+        res += entry->data.allocatedBytes();
+    return res;
+}
+
+void ColumnObject::forEachSubcolumn(MutableColumnCallback callback)
+{
+    for (auto & entry : subcolumns)
+        for (auto & part : entry->data.data)
+            callback(part);
+}
+
+void ColumnObject::forEachSubcolumnRecursively(RecursiveMutableColumnCallback callback)
+{
+    for (auto & entry : subcolumns)
+    {
+        for (auto & part : entry->data.data)
+        {
+            callback(*part);
+            part->forEachSubcolumnRecursively(callback);
+        }
+    }
+}
+
+void ColumnObject::insert(const Field & field)
+{
+    const auto & object = field.get<const Object &>();
+
+    HashSet<StringRef, StringRefHash> inserted_paths;
+    size_t old_size = size();
+    for (const auto & [key_str, value] : object)
+    {
+        PathInData key(key_str);
+        inserted_paths.insert(key_str);
+        if (!hasSubcolumn(key))
+            addSubcolumn(key, old_size);
+
+        auto & subcolumn = getSubcolumn(key);
+        subcolumn.insert(value);
+    }
+
+    for (auto & entry : subcolumns)
+    {
+        if (!inserted_paths.has(entry->path.getPath()))
+        {
+            bool inserted = tryInsertDefaultFromNested(entry);
+            if (!inserted)
+                entry->data.insertDefault();
+        }
+    }
+
+    ++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)
+        entry->data.insertDefault();
+
+    ++num_rows;
 }
 
 Field ColumnObject::operator[](size_t n) const
 {
-    Object object;
-
-    for (const auto & [path, column] : typed_paths)
-        object[path] = (*column)[n];
-    for (const auto & [path, column] : dynamic_paths_ptrs)
-    {
-        /// Output only non-null values from dynamic paths. We cannot distinguish cases when
-        /// dynamic path has Null value and when it's absent in the row and consider them equivalent.
-        if (!column->isNullAt(n))
-            object[path] = (*column)[n];
-    }
-
-    const auto & shared_data_offsets = getSharedDataOffsets();
-    const auto [shared_paths, shared_values] = getSharedDataPathsAndValues();
-    size_t start = shared_data_offsets[static_cast<ssize_t>(n) - 1];
-    size_t end = shared_data_offsets[n];
-    for (size_t i = start; i != end; ++i)
-    {
-        String path = shared_paths->getDataAt(i).toString();
-        auto value_data = shared_values->getDataAt(i);
-        ReadBufferFromMemory buf(value_data.data, value_data.size);
-        Field value;
-        getDynamicSerialization()->deserializeBinary(value, buf, getFormatSettings());
-        object[path] = value;
-    }
-
+    Field object;
+    get(n, object);
     return object;
 }
 
 void ColumnObject::get(size_t n, Field & res) const
 {
-    res = (*this)[n];
-}
+    assert(n < size());
+    res = Object();
+    auto & object = res.get<Object &>();
 
-bool ColumnObject::isDefaultAt(size_t n) const
-{
-    for (const auto & [path, column] : typed_paths)
+    for (const auto & entry : subcolumns)
     {
-        if (!column->isDefaultAt(n))
-            return false;
+        auto it = object.try_emplace(entry->path.getPath()).first;
+        entry->data.get(n, it->second);
     }
-
-    for (const auto & [path, column] : dynamic_paths_ptrs)
-    {
-        if (!column->isDefaultAt(n))
-            return false;
-    }
-
-    if (!shared_data->isDefaultAt(n))
-        return false;
-
-    return true;
-}
-
-StringRef ColumnObject::getDataAt(size_t) const
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getDataAt is not supported for {}", getName());
-}
-
-void ColumnObject::insertData(const char *, size_t)
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertData is not supported for {}", getName());
-}
-
-ColumnDynamic * ColumnObject::tryToAddNewDynamicPath(std::string_view path)
-{
-    if (dynamic_paths.size() == max_dynamic_paths)
-        return nullptr;
-
-    auto new_dynamic_column = ColumnDynamic::create(max_dynamic_types);
-    new_dynamic_column->reserve(shared_data->capacity());
-    new_dynamic_column->insertManyDefaults(size());
-    auto it = dynamic_paths.emplace(path, std::move(new_dynamic_column)).first;
-    auto it_ptr = dynamic_paths_ptrs.emplace(path, assert_cast<ColumnDynamic *>(it->second.get())).first;
-    return it_ptr->second;
-}
-
-void ColumnObject::addNewDynamicPath(std::string_view path)
-{
-    if (!tryToAddNewDynamicPath(path))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot add new dynamic path as the limit ({}) on dynamic paths is reached", max_dynamic_paths);
-}
-
-void ColumnObject::setMaxDynamicPaths(size_t max_dynamic_paths_)
-{
-    if (!empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Setting specific max_dynamic_paths parameter is allowed only for empty object column");
-
-    max_dynamic_paths = max_dynamic_paths_;
-}
-
-void ColumnObject::setDynamicPaths(const std::vector<String> & paths)
-{
-    if (paths.size() > max_dynamic_paths)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot set dynamic paths to Object column, the number of paths ({}) exceeds the limit ({})", paths.size(), max_dynamic_paths);
-
-    size_t size = this->size();
-    for (const auto & path : paths)
-    {
-        auto new_dynamic_column = ColumnDynamic::create(max_dynamic_types);
-        if (size)
-            new_dynamic_column->insertManyDefaults(size);
-        dynamic_paths[path] = std::move(new_dynamic_column);
-        dynamic_paths_ptrs[path] = assert_cast<ColumnDynamic *>(dynamic_paths[path].get());
-    }
-}
-
-void ColumnObject::insert(const Field & x)
-{
-    const auto & object = x.safeGet<Object>();
-    auto & shared_data_offsets = getSharedDataOffsets();
-    auto [shared_data_paths, shared_data_values] = getSharedDataPathsAndValues();
-    size_t current_size = size();
-    for (const auto & [path, value_field] : object)
-    {
-        if (auto typed_it = typed_paths.find(path); typed_it != typed_paths.end())
-        {
-            typed_it->second->insert(value_field);
-        }
-        else if (auto dynamic_it = dynamic_paths_ptrs.find(path); dynamic_it != dynamic_paths_ptrs.end())
-        {
-            dynamic_it->second->insert(value_field);
-        }
-        else if (auto * dynamic_path_column = tryToAddNewDynamicPath(path))
-        {
-            dynamic_path_column->insert(value_field);
-        }
-        /// We reached the limit on dynamic paths. Add this path to the common data if the value is not Null.
-        /// (we cannot distinguish cases when path has Null value or is absent in the row and consider them equivalent).
-        /// Object is actually std::map, so all paths are already sorted and we can add it right now.
-        else if (!value_field.isNull())
-        {
-            shared_data_paths->insertData(path.data(), path.size());
-            auto & shared_data_values_chars = shared_data_values->getChars();
-            WriteBufferFromVector<ColumnString::Chars> value_buf(shared_data_values_chars, AppendModeTag());
-            getDynamicSerialization()->serializeBinary(value_field, value_buf, getFormatSettings());
-            value_buf.finalize();
-            shared_data_values_chars.push_back(0);
-            shared_data_values->getOffsets().push_back(shared_data_values_chars.size());
-        }
-    }
-
-    shared_data_offsets.push_back(shared_data_paths->size());
-
-    /// Fill all remaining typed and dynamic paths with default values.
-    for (auto & [_, column] : typed_paths)
-    {
-        if (column->size() == current_size)
-            column->insertDefault();
-    }
-
-    for (auto & [_, column] : dynamic_paths_ptrs)
-    {
-        if (column->size() == current_size)
-            column->insertDefault();
-    }
-}
-
-bool ColumnObject::tryInsert(const Field & x)
-{
-    if (x.getType() != Field::Types::Which::Object)
-        return false;
-
-    const auto & object = x.safeGet<Object>();
-    auto & shared_data_offsets = getSharedDataOffsets();
-    auto [shared_data_paths, shared_data_values] = getSharedDataPathsAndValues();
-    size_t prev_size = size();
-    size_t prev_paths_size = shared_data_paths->size();
-    size_t prev_values_size = shared_data_values->size();
-    /// Save all newly added dynamic paths. In case of failure
-    /// we should remove them.
-    std::unordered_set<String> new_dynamic_paths;
-    auto restore_sizes = [&]()
-    {
-        for (auto & [_, column] : typed_paths)
-        {
-            if (column->size() != prev_size)
-                column->popBack(column->size() - prev_size);
-        }
-
-        /// Remove all newly added dynamic paths.
-        for (const auto & path : new_dynamic_paths)
-        {
-            dynamic_paths_ptrs.erase(path);
-            dynamic_paths.erase(path);
-        }
-
-        for (auto & [_, column] : dynamic_paths_ptrs)
-        {
-            if (column->size() != prev_size)
-                column->popBack(column->size() - prev_size);
-        }
-
-        if (shared_data_paths->size() != prev_paths_size)
-            shared_data_paths->popBack(shared_data_paths->size() - prev_paths_size);
-        if (shared_data_values->size() != prev_values_size)
-            shared_data_values->popBack(shared_data_values->size() - prev_values_size);
-    };
-
-    for (const auto & [path, value_field] : object)
-    {
-        if (auto typed_it = typed_paths.find(path); typed_it != typed_paths.end())
-        {
-            if (!typed_it->second->tryInsert(value_field))
-            {
-                restore_sizes();
-                return false;
-            }
-        }
-        else if (auto dynamic_it = dynamic_paths_ptrs.find(path); dynamic_it != dynamic_paths_ptrs.end())
-        {
-            if (!dynamic_it->second->tryInsert(value_field))
-            {
-                restore_sizes();
-                return false;
-            }
-        }
-        else if (auto * dynamic_path_column = tryToAddNewDynamicPath(path))
-        {
-            if (!dynamic_path_column->tryInsert(value_field))
-            {
-                restore_sizes();
-                return false;
-            }
-        }
-        /// We reached the limit on dynamic paths. Add this path to the common data if the value is not Null.
-        /// (we cannot distinguish cases when path has Null value or is absent in the row and consider them equivalent).
-        /// Object is actually std::map, so all paths are already sorted and we can add it right now.
-        else if (!value_field.isNull())
-        {
-            WriteBufferFromOwnString value_buf;
-            getDynamicSerialization()->serializeBinary(value_field, value_buf, getFormatSettings());
-            shared_data_paths->insertData(path.data(), path.size());
-            shared_data_values->insertData(value_buf.str().data(), value_buf.str().size());
-        }
-    }
-
-    shared_data_offsets.push_back(shared_data_paths->size());
-
-    /// Fill all remaining typed and dynamic paths with default values.
-    for (auto & [_, column] : typed_paths)
-    {
-        if (column->size() == prev_size)
-            column->insertDefault();
-    }
-
-    for (auto & [_, column] : dynamic_paths_ptrs)
-    {
-        if (column->size() == prev_size)
-            column->insertDefault();
-    }
-
-    return true;
 }
 
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
@@ -447,31 +769,7 @@ void ColumnObject::insertFrom(const IColumn & src, size_t n)
 void ColumnObject::doInsertFrom(const IColumn & src, size_t n)
 #endif
 {
-    const auto & src_object_column = assert_cast<const ColumnObject &>(src);
-
-    /// First, insert typed paths, they must be the same for both columns.
-    for (const auto & [path, column] : src_object_column.typed_paths)
-        typed_paths[path]->insertFrom(*column, n);
-
-    /// Second, insert dynamic paths and extend them if needed.
-    /// We can reach the limit of dynamic paths, and in this case
-    /// the rest of dynamic paths will be inserted into shared data.
-    std::vector<std::string_view> src_dynamic_paths_for_shared_data;
-    for (const auto & [path, column] : src_object_column.dynamic_paths)
-    {
-        /// Check if we already have such dynamic path.
-        if (auto it = dynamic_paths_ptrs.find(path); it != dynamic_paths_ptrs.end())
-            it->second->insertFrom(*column, n);
-        /// Try to add a new dynamic path.
-        else if (auto * dynamic_path_column = tryToAddNewDynamicPath(path))
-            dynamic_path_column->insertFrom(*column, n);
-        /// Limit on dynamic paths is reached, add path to shared data later.
-        else
-            src_dynamic_paths_for_shared_data.push_back(path);
-    }
-
-    /// Finally, insert paths from shared data.
-    insertFromSharedDataAndFillRemainingDynamicPaths(src_object_column, std::move(src_dynamic_paths_for_shared_data), n, 1);
+    insert(src[n]);
 }
 
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
@@ -480,659 +778,101 @@ void ColumnObject::insertRangeFrom(const IColumn & src, size_t start, size_t len
 void ColumnObject::doInsertRangeFrom(const IColumn & src, size_t start, size_t length)
 #endif
 {
-    /// TODO: try to parallelize doInsertRangeFrom over typed/dynamic paths if it makes sense.
-    const auto & src_object_column = assert_cast<const ColumnObject &>(src);
+    const auto & src_object = assert_cast<const ColumnObject &>(src);
 
-    /// First, insert typed paths, they must be the same for both columns.
-    for (const auto & [path, column] : src_object_column.typed_paths)
-        typed_paths[path]->insertRangeFrom(*column, start, length);
-
-    /// Second, insert dynamic paths and extend them if needed.
-    /// We can reach the limit of dynamic paths, and in this case
-    /// the rest of dynamic paths will be inserted into shared data.
-    std::vector<std::string_view> src_dynamic_paths_for_shared_data;
-    for (const auto & [path, column] : src_object_column.dynamic_paths)
+    for (const auto & entry : src_object.subcolumns)
     {
-        /// Check if we already have such dynamic path.
-        if (auto it = dynamic_paths_ptrs.find(path); it != dynamic_paths_ptrs.end())
-            it->second->insertRangeFrom(*column, start, length);
-        /// Try to add a new dynamic path.
-        else if (auto * dynamic_path_column = tryToAddNewDynamicPath(path))
-            dynamic_path_column->insertRangeFrom(*column, start, length);
-        /// Limit on dynamic paths is reached, add path to shared data later.
-        else
-            src_dynamic_paths_for_shared_data.push_back(path);
-    }
-
-    /// Finally, insert paths from shared data.
-    insertFromSharedDataAndFillRemainingDynamicPaths(src_object_column, std::move(src_dynamic_paths_for_shared_data), start, length);
-}
-
-void ColumnObject::insertFromSharedDataAndFillRemainingDynamicPaths(const DB::ColumnObject & src_object_column, std::vector<std::string_view> && src_dynamic_paths_for_shared_data, size_t start, size_t length)
-{
-    /// Paths in shared data are sorted, so paths from src_dynamic_paths_for_shared_data should be inserted properly
-    /// to keep paths sorted. Let's sort them in advance.
-    std::sort(src_dynamic_paths_for_shared_data.begin(), src_dynamic_paths_for_shared_data.end());
-
-    /// Check if src object doesn't have any paths in shared data in specified range.
-    const auto & src_shared_data_offsets = src_object_column.getSharedDataOffsets();
-    if (src_shared_data_offsets[static_cast<ssize_t>(start) - 1] == src_shared_data_offsets[static_cast<ssize_t>(start) + length - 1])
-    {
-        size_t current_size = size();
-
-        /// If no src dynamic columns should be inserted into shared data, insert defaults.
-        if (src_dynamic_paths_for_shared_data.empty())
+        if (!hasSubcolumn(entry->path))
         {
-            shared_data->insertManyDefaults(length);
-        }
-        /// Otherwise insert required src dynamic columns into shared data.
-        else
-        {
-            const auto [shared_data_paths, shared_data_values] = getSharedDataPathsAndValues();
-            auto & shared_data_offsets = getSharedDataOffsets();
-            for (size_t i = start; i != start + length; ++i)
-            {
-                /// Paths in src_dynamic_paths_for_shared_data are already sorted.
-                for (const auto path : src_dynamic_paths_for_shared_data)
-                    serializePathAndValueIntoSharedData(shared_data_paths, shared_data_values, path, *src_object_column.dynamic_paths.find(path)->second, i);
-                shared_data_offsets.push_back(shared_data_paths->size());
-            }
-        }
-
-        /// Insert default values in all remaining dynamic paths.
-        for (auto & [_, column] : dynamic_paths_ptrs)
-        {
-            if (column->size() == current_size)
-                column->insertManyDefaults(length);
-        }
-        return;
-    }
-
-    /// Src object column contains some paths in shared data in specified range.
-    /// Iterate over this range and insert all required paths into shared data or dynamic paths.
-    const auto [src_shared_data_paths, src_shared_data_values] = src_object_column.getSharedDataPathsAndValues();
-    const auto [shared_data_paths, shared_data_values] = getSharedDataPathsAndValues();
-    auto & shared_data_offsets = getSharedDataOffsets();
-    for (size_t row = start; row != start + length; ++row)
-    {
-        size_t current_size = shared_data_offsets.size();
-        /// Use separate index to iterate over sorted src_dynamic_paths_for_shared_data.
-        size_t src_dynamic_paths_for_shared_data_index = 0;
-        size_t offset = src_shared_data_offsets[static_cast<ssize_t>(row) - 1];
-        size_t end = src_shared_data_offsets[row];
-        for (size_t i = offset; i != end; ++i)
-        {
-            auto path = src_shared_data_paths->getDataAt(i).toView();
-            /// Check if we have this path in dynamic paths.
-            if (auto it = dynamic_paths_ptrs.find(path); it != dynamic_paths_ptrs.end())
-            {
-                /// Deserialize binary value into dynamic column from shared data.
-                deserializeValueFromSharedData(src_shared_data_values, i, *it->second);
-            }
+            if (entry->path.hasNested())
+                addNestedSubcolumn(entry->path, entry->data.getFieldInfo(), num_rows);
             else
-            {
-                /// Before inserting this path into shared data check if we need to
-                /// insert dynamic paths from src_dynamic_paths_for_shared_data before.
-                while (src_dynamic_paths_for_shared_data_index < src_dynamic_paths_for_shared_data.size()
-                       && src_dynamic_paths_for_shared_data[src_dynamic_paths_for_shared_data_index] < path)
-                {
-                    const auto dynamic_path = src_dynamic_paths_for_shared_data[src_dynamic_paths_for_shared_data_index];
-                    serializePathAndValueIntoSharedData(shared_data_paths, shared_data_values, dynamic_path, *src_object_column.dynamic_paths.find(dynamic_path)->second, row);
-                    ++src_dynamic_paths_for_shared_data_index;
-                }
-
-                /// Insert path and value from src shared data to our shared data.
-                shared_data_paths->insertFrom(*src_shared_data_paths, i);
-                shared_data_values->insertFrom(*src_shared_data_values, i);
-            }
+                addSubcolumn(entry->path, num_rows);
         }
 
-        /// Insert remaining dynamic paths from src_dynamic_paths_for_shared_data.
-        for (; src_dynamic_paths_for_shared_data_index != src_dynamic_paths_for_shared_data.size(); ++src_dynamic_paths_for_shared_data_index)
-        {
-            const auto dynamic_path = src_dynamic_paths_for_shared_data[src_dynamic_paths_for_shared_data_index];
-            serializePathAndValueIntoSharedData(shared_data_paths, shared_data_values, dynamic_path, *src_object_column.dynamic_paths.find(dynamic_path)->second, row);
-        }
-
-        shared_data_offsets.push_back(shared_data_paths->size());
-
-        /// Insert default value in all remaining dynamic paths.
-        for (auto & [_, column] : dynamic_paths_ptrs)
-        {
-            if (column->size() == current_size)
-                column->insertDefault();
-        }
+        auto & subcolumn = getSubcolumn(entry->path);
+        subcolumn.insertRangeFrom(entry->data, start, length);
     }
-}
 
-void ColumnObject::serializePathAndValueIntoSharedData(ColumnString * shared_data_paths, ColumnString * shared_data_values, std::string_view path, const IColumn & column, size_t n)
-{
-    /// Don't store Null values in shared data. We consider Null value equivalent to the absence
-    /// of this path in the row because we cannot distinguish these 2 cases for dynamic paths.
-    if (column.isNullAt(n))
-        return;
-
-    shared_data_paths->insertData(path.data(), path.size());
-    auto & shared_data_values_chars = shared_data_values->getChars();
-    WriteBufferFromVector<ColumnString::Chars> value_buf(shared_data_values_chars, AppendModeTag());
-    getDynamicSerialization()->serializeBinary(column, n, value_buf, getFormatSettings());
-    value_buf.finalize();
-    shared_data_values_chars.push_back(0);
-    shared_data_values->getOffsets().push_back(shared_data_values_chars.size());
-}
-
-void ColumnObject::deserializeValueFromSharedData(const ColumnString * shared_data_values, size_t n, IColumn & column) const
-{
-    auto value_data = shared_data_values->getDataAt(n);
-    ReadBufferFromMemory buf(value_data.data, value_data.size);
-    getDynamicSerialization()->deserializeBinary(column, buf, getFormatSettings());
-}
-
-void ColumnObject::insertDefault()
-{
-    for (auto & [_, column] : typed_paths)
-        column->insertDefault();
-    for (auto & [_, column] : dynamic_paths_ptrs)
-        column->insertDefault();
-    shared_data->insertDefault();
-}
-
-void ColumnObject::insertManyDefaults(size_t length)
-{
-    for (auto & [_, column] : typed_paths)
-        column->insertManyDefaults(length);
-    for (auto & [_, column] : dynamic_paths_ptrs)
-        column->insertManyDefaults(length);
-    shared_data->insertManyDefaults(length);
-}
-
-void ColumnObject::popBack(size_t n)
-{
-    for (auto & [_, column] : typed_paths)
-        column->popBack(n);
-    for (auto & [_, column] : dynamic_paths_ptrs)
-        column->popBack(n);
-    shared_data->popBack(n);
-}
-
-StringRef ColumnObject::serializeValueIntoArena(size_t n, Arena & arena, const char *& begin) const
-{
-    StringRef res(begin, 0);
-    // Serialize all paths and values in binary format.
-    const auto & shared_data_offsets = getSharedDataOffsets();
-    size_t offset = shared_data_offsets[static_cast<ssize_t>(n) - 1];
-    size_t end = shared_data_offsets[static_cast<ssize_t>(n)];
-    size_t num_paths = typed_paths.size() + dynamic_paths.size() + (end - offset);
-    char * pos = arena.allocContinue(sizeof(size_t), begin);
-    memcpy(pos, &num_paths, sizeof(size_t));
-    res.data = pos - res.size;
-    res.size += sizeof(size_t);
-    /// Serialize paths and values from typed paths.
-    for (const auto & [path, column] : typed_paths)
+    for (auto & entry : subcolumns)
     {
-        size_t path_size = path.size();
-        pos = arena.allocContinue(sizeof(size_t) + path_size, begin);
-        memcpy(pos, &path_size, sizeof(size_t));
-        memcpy(pos + sizeof(size_t), path.data(), path_size);
-        auto data_ref = column->serializeValueIntoArena(n, arena, begin);
-        res.data = data_ref.data - res.size - sizeof(size_t) - path_size;
-        res.size += data_ref.size + sizeof(size_t) + path_size;
+        if (!src_object.hasSubcolumn(entry->path))
+        {
+            bool inserted = tryInsertManyDefaultsFromNested(entry);
+            if (!inserted)
+                entry->data.insertManyDefaults(length);
+        }
     }
 
-    /// Serialize paths and values from dynamic paths.
-    for (const auto & [path, column] : dynamic_paths)
+    num_rows += length;
+    finalize();
+}
+
+void ColumnObject::popBack(size_t length)
+{
+    for (auto & entry : subcolumns)
+        entry->data.popBack(length);
+
+    num_rows -= length;
+}
+
+template <typename Func>
+MutableColumnPtr ColumnObject::applyForSubcolumns(Func && func) const
+{
+    if (!isFinalized())
     {
-        WriteBufferFromOwnString buf;
-        getDynamicSerialization()->serializeBinary(*column, n, buf, getFormatSettings());
-        serializePathAndValueIntoArena(arena, begin, path, buf.str(), res);
+        auto finalized = cloneFinalized();
+        auto & finalized_object = assert_cast<ColumnObject &>(*finalized);
+        return finalized_object.applyForSubcolumns(std::forward<Func>(func));
     }
 
-    /// Serialize paths and values from shared data.
-    auto [shared_data_paths, shared_data_values] = getSharedDataPathsAndValues();
-    for (size_t i = offset; i != end; ++i)
-        serializePathAndValueIntoArena(arena, begin, shared_data_paths->getDataAt(i), shared_data_values->getDataAt(i), res);
+    auto res = ColumnObject::create(is_nullable);
+    for (const auto & subcolumn : subcolumns)
+    {
+        auto new_subcolumn = func(subcolumn->data.getFinalizedColumn());
+        res->addSubcolumn(subcolumn->path, new_subcolumn->assumeMutable());
+    }
 
     return res;
 }
 
-void ColumnObject::serializePathAndValueIntoArena(DB::Arena & arena, const char *& begin, StringRef path, StringRef value, StringRef & res) const
-{
-    size_t value_size = value.size;
-    size_t path_size = path.size;
-    char * pos = arena.allocContinue(sizeof(size_t) + path_size + sizeof(size_t) + value_size, begin);
-    memcpy(pos, &path_size, sizeof(size_t));
-    memcpy(pos + sizeof(size_t), path.data, path_size);
-    memcpy(pos + sizeof(size_t) + path_size, &value_size, sizeof(size_t));
-    memcpy(pos + sizeof(size_t) + path_size + sizeof(size_t), value.data, value_size);
-    res.data = pos - res.size;
-    res.size += sizeof(size_t) + path_size + sizeof(size_t) + value_size;
-}
-
-const char * ColumnObject::deserializeAndInsertFromArena(const char * pos)
-{
-    size_t current_size = size();
-    /// Deserialize paths and values and insert them into typed paths, dynamic paths or shared data.
-    /// Serialized paths could be unsorted, so we will have to sort all paths that will be inserted into shared data.
-    std::vector<std::pair<std::string_view, std::string_view>> paths_and_values_for_shared_data;
-    auto num_paths = unalignedLoad<size_t>(pos);
-    pos += sizeof(size_t);
-    for (size_t i = 0; i != num_paths; ++i)
-    {
-        auto path_size = unalignedLoad<size_t>(pos);
-        pos += sizeof(size_t);
-        std::string_view path(pos, path_size);
-        pos += path_size;
-        /// Check if it's a typed path. In this case we should use
-        /// deserializeAndInsertFromArena of corresponding column.
-        if (auto typed_it = typed_paths.find(path); typed_it != typed_paths.end())
-        {
-            pos = typed_it->second->deserializeAndInsertFromArena(pos);
-        }
-        /// If it's not a typed path, deserialize binary value and try to insert it
-        /// to dynamic paths or shared data.
-        else
-        {
-            auto value_size = unalignedLoad<size_t>(pos);
-            pos += sizeof(size_t);
-            std::string_view value(pos, value_size);
-            pos += value_size;
-            /// Check if we have this path in dynamic paths.
-            if (auto dynamic_it = dynamic_paths.find(path); dynamic_it != dynamic_paths.end())
-            {
-                ReadBufferFromMemory buf(value.data(), value.size());
-                getDynamicSerialization()->deserializeBinary(*dynamic_it->second, buf, getFormatSettings());
-            }
-            /// Try to add a new dynamic path.
-            else if (auto * dynamic_path_column = tryToAddNewDynamicPath(path))
-            {
-                ReadBufferFromMemory buf(value.data(), value.size());
-                getDynamicSerialization()->deserializeBinary(*dynamic_path_column, buf, getFormatSettings());
-            }
-            /// Limit on dynamic paths is reached, add this path to shared data later.
-            else
-            {
-                paths_and_values_for_shared_data.emplace_back(path, value);
-            }
-        }
-    }
-
-    /// Sort and insert all paths from paths_and_values_for_shared_data into shared data.
-    std::sort(paths_and_values_for_shared_data.begin(), paths_and_values_for_shared_data.end());
-    const auto [shared_data_paths, shared_data_values] = getSharedDataPathsAndValues();
-    for (const auto & [path, value] : paths_and_values_for_shared_data)
-    {
-        shared_data_paths->insertData(path.data(), path.size());
-        shared_data_values->insertData(value.data(), value.size());
-    }
-
-    getSharedDataOffsets().push_back(shared_data_paths->size());
-
-    /// Insert default value in all remaining typed and dynamic paths.
-
-    for (auto & [_, column] : typed_paths)
-    {
-        if (column->size() == current_size)
-            column->insertDefault();
-    }
-
-    for (auto & [_, column] : dynamic_paths_ptrs)
-    {
-        if (column->size() == current_size)
-            column->insertDefault();
-    }
-
-    return pos;
-}
-
-const char * ColumnObject::skipSerializedInArena(const char * pos) const
-{
-    auto num_paths = unalignedLoad<size_t>(pos);
-    pos += sizeof(size_t);
-    for (size_t i = 0; i != num_paths; ++i)
-    {
-        auto path_size = unalignedLoad<size_t>(pos);
-        pos += sizeof(size_t);
-        std::string_view path(pos, path_size);
-        pos += path_size;
-        if (auto typed_it = typed_paths.find(path); typed_it != typed_paths.end())
-        {
-            pos = typed_it->second->skipSerializedInArena(pos);
-        }
-        else
-        {
-            auto value_size = unalignedLoad<size_t>(pos);
-            pos += sizeof(size_t) + value_size;
-        }
-    }
-
-    return pos;
-}
-
-void ColumnObject::updateHashWithValue(size_t n, SipHash & hash) const
-{
-    for (const auto & [_, column] : typed_paths)
-        column->updateHashWithValue(n, hash);
-    for (const auto & [_, column] : dynamic_paths_ptrs)
-        column->updateHashWithValue(n, hash);
-    shared_data->updateHashWithValue(n, hash);
-}
-
-WeakHash32 ColumnObject::getWeakHash32() const
-{
-    WeakHash32 hash(size());
-    for (const auto & [_, column] : typed_paths)
-        hash.update(column->getWeakHash32());
-    for (const auto & [_, column] : dynamic_paths_ptrs)
-        hash.update(column->getWeakHash32());
-    hash.update(shared_data->getWeakHash32());
-    return hash;
-}
-
-void ColumnObject::updateHashFast(SipHash & hash) const
-{
-    for (const auto & [_, column] : typed_paths)
-        column->updateHashFast(hash);
-    for (const auto & [_, column] : dynamic_paths_ptrs)
-        column->updateHashFast(hash);
-    shared_data->updateHashFast(hash);
-}
-
-ColumnPtr ColumnObject::filter(const Filter & filt, ssize_t result_size_hint) const
-{
-    std::unordered_map<String, ColumnPtr> filtered_typed_paths;
-    filtered_typed_paths.reserve(typed_paths.size());
-    for (const auto & [path, column] : typed_paths)
-        filtered_typed_paths[path] = column->filter(filt, result_size_hint);
-
-    std::unordered_map<String, ColumnPtr> filtered_dynamic_paths;
-    filtered_dynamic_paths.reserve(dynamic_paths_ptrs.size());
-    for (const auto & [path, column] : dynamic_paths_ptrs)
-        filtered_dynamic_paths[path] = column->filter(filt, result_size_hint);
-
-    auto filtered_shared_data = shared_data->filter(filt, result_size_hint);
-    return ColumnObject::create(filtered_typed_paths, filtered_dynamic_paths, filtered_shared_data, max_dynamic_paths, global_max_dynamic_paths, max_dynamic_types);
-}
-
-void ColumnObject::expand(const Filter & mask, bool inverted)
-{
-    for (auto & [_, column] : typed_paths)
-        column->expand(mask, inverted);
-    for (auto & [_, column] : dynamic_paths_ptrs)
-        column->expand(mask, inverted);
-    shared_data->expand(mask, inverted);
-}
-
 ColumnPtr ColumnObject::permute(const Permutation & perm, size_t limit) const
 {
-    std::unordered_map<String, ColumnPtr> permuted_typed_paths;
-    permuted_typed_paths.reserve(typed_paths.size());
-    for (const auto & [path, column] : typed_paths)
-        permuted_typed_paths[path] = column->permute(perm, limit);
+    return applyForSubcolumns([&](const auto & subcolumn) { return subcolumn.permute(perm, limit); });
+}
 
-    std::unordered_map<String, ColumnPtr> permuted_dynamic_paths;
-    permuted_dynamic_paths.reserve(dynamic_paths_ptrs.size());
-    for (const auto & [path, column] : dynamic_paths_ptrs)
-        permuted_dynamic_paths[path] = column->permute(perm, limit);
-
-    auto permuted_shared_data = shared_data->permute(perm, limit);
-    return ColumnObject::create(permuted_typed_paths, permuted_dynamic_paths, permuted_shared_data, max_dynamic_paths, global_max_dynamic_paths, max_dynamic_types);
+ColumnPtr ColumnObject::filter(const Filter & filter, ssize_t result_size_hint) const
+{
+    return applyForSubcolumns([&](const auto & subcolumn) { return subcolumn.filter(filter, result_size_hint); });
 }
 
 ColumnPtr ColumnObject::index(const IColumn & indexes, size_t limit) const
 {
-    std::unordered_map<String, ColumnPtr> indexed_typed_paths;
-    indexed_typed_paths.reserve(typed_paths.size());
-    for (const auto & [path, column] : typed_paths)
-        indexed_typed_paths[path] = column->index(indexes, limit);
-
-    std::unordered_map<String, ColumnPtr> indexed_dynamic_paths;
-    indexed_dynamic_paths.reserve(dynamic_paths_ptrs.size());
-    for (const auto & [path, column] : dynamic_paths_ptrs)
-        indexed_dynamic_paths[path] = column->index(indexes, limit);
-
-    auto indexed_shared_data = shared_data->index(indexes, limit);
-    return ColumnObject::create(indexed_typed_paths, indexed_dynamic_paths, indexed_shared_data, max_dynamic_paths, global_max_dynamic_paths, max_dynamic_types);
+    return applyForSubcolumns([&](const auto & subcolumn) { return subcolumn.index(indexes, limit); });
 }
 
-ColumnPtr ColumnObject::replicate(const Offsets & replicate_offsets) const
+ColumnPtr ColumnObject::replicate(const Offsets & offsets) const
 {
-    std::unordered_map<String, ColumnPtr> replicated_typed_paths;
-    replicated_typed_paths.reserve(typed_paths.size());
-    for (const auto & [path, column] : typed_paths)
-        replicated_typed_paths[path] = column->replicate(replicate_offsets);
-
-    std::unordered_map<String, ColumnPtr> replicated_dynamic_paths;
-    replicated_dynamic_paths.reserve(dynamic_paths_ptrs.size());
-    for (const auto & [path, column] : dynamic_paths_ptrs)
-        replicated_dynamic_paths[path] = column->replicate(replicate_offsets);
-
-    auto replicated_shared_data = shared_data->replicate(replicate_offsets);
-    return ColumnObject::create(replicated_typed_paths, replicated_dynamic_paths, replicated_shared_data, max_dynamic_paths, global_max_dynamic_paths, max_dynamic_types);
+    return applyForSubcolumns([&](const auto & subcolumn) { return subcolumn.replicate(offsets); });
 }
 
-MutableColumns ColumnObject::scatter(ColumnIndex num_columns, const Selector & selector) const
+MutableColumnPtr ColumnObject::cloneResized(size_t new_size) const
 {
-    std::vector<std::unordered_map<String, MutableColumnPtr>> scattered_typed_paths(num_columns);
-    for (auto & typed_paths_ : scattered_typed_paths)
-        typed_paths_.reserve(typed_paths.size());
+    if (new_size == 0)
+        return ColumnObject::create(is_nullable);
 
-    for (const auto & [path, column] : typed_paths)
-    {
-        auto scattered_columns = column->scatter(num_columns, selector);
-        for (size_t i = 0; i != num_columns; ++i)
-            scattered_typed_paths[i][path] = std::move(scattered_columns[i]);
-    }
-
-    std::vector<std::unordered_map<String, MutableColumnPtr>> scattered_dynamic_paths(num_columns);
-    for (auto & dynamic_paths_ : scattered_dynamic_paths)
-        dynamic_paths_.reserve(dynamic_paths_ptrs.size());
-
-    for (const auto & [path, column] : dynamic_paths_ptrs)
-    {
-        auto scattered_columns = column->scatter(num_columns, selector);
-        for (size_t i = 0; i != num_columns; ++i)
-            scattered_dynamic_paths[i][path] = std::move(scattered_columns[i]);
-    }
-
-    auto scattered_shared_data_columns = shared_data->scatter(num_columns, selector);
-    MutableColumns result_columns;
-    result_columns.reserve(num_columns);
-    for (size_t i = 0; i != num_columns; ++i)
-        result_columns.emplace_back(ColumnObject::create(std::move(scattered_typed_paths[i]), std::move(scattered_dynamic_paths[i]), std::move(scattered_shared_data_columns[i]), max_dynamic_paths, global_max_dynamic_paths, max_dynamic_types));
-    return result_columns;
+    return applyForSubcolumns([&](const auto & subcolumn) { return subcolumn.cloneResized(new_size); });
 }
 
 void ColumnObject::getPermutation(PermutationSortDirection, PermutationSortStability, size_t, int, Permutation & res) const
 {
-    /// Values in ColumnObject are not comparable.
-    res.resize(size());
+    res.resize(num_rows);
     iota(res.data(), res.size(), size_t(0));
 }
 
-void ColumnObject::reserve(size_t n)
+void ColumnObject::getExtremes(Field & min, Field & max) const
 {
-    for (auto & [_, column] : typed_paths)
-        column->reserve(n);
-    for (auto & [_, column] : dynamic_paths_ptrs)
-        column->reserve(n);
-    shared_data->reserve(n);
-}
-
-size_t ColumnObject::capacity() const
-{
-    return shared_data->capacity();
-}
-
-void ColumnObject::ensureOwnership()
-{
-    for (auto & [_, column] : typed_paths)
-        column->ensureOwnership();
-    for (auto & [_, column] : dynamic_paths_ptrs)
-        column->ensureOwnership();
-    shared_data->ensureOwnership();
-}
-
-size_t ColumnObject::byteSize() const
-{
-    size_t size = 0;
-    for (const auto & [_, column] : typed_paths)
-        size += column->byteSize();
-    for (const auto & [_, column] : dynamic_paths_ptrs)
-        size += column->byteSize();
-    size += shared_data->byteSize();
-    return size;
-}
-
-size_t ColumnObject::byteSizeAt(size_t n) const
-{
-    size_t size = 0;
-    for (const auto & [_, column] : typed_paths)
-        size += column->byteSizeAt(n);
-    for (const auto & [_, column] : dynamic_paths_ptrs)
-        size += column->byteSizeAt(n);
-    size += shared_data->byteSizeAt(n);
-    return size;
-}
-
-size_t ColumnObject::allocatedBytes() const
-{
-    size_t size = 0;
-    for (const auto & [_, column] : typed_paths)
-        size += column->allocatedBytes();
-    for (const auto & [_, column] : dynamic_paths_ptrs)
-        size += column->allocatedBytes();
-    size += shared_data->allocatedBytes();
-    return size;
-}
-
-void ColumnObject::protect()
-{
-    for (auto & [_, column] : typed_paths)
-        column->protect();
-    for (auto & [_, column] : dynamic_paths_ptrs)
-        column->protect();
-    shared_data->protect();
-}
-
-void ColumnObject::forEachSubcolumn(DB::IColumn::MutableColumnCallback callback)
-{
-    for (auto & [_, column] : typed_paths)
-        callback(column);
-    for (auto & [path, column] : dynamic_paths)
-    {
-        callback(column);
-        dynamic_paths_ptrs[path] = assert_cast<ColumnDynamic *>(column.get());
-    }
-    callback(shared_data);
-}
-
-void ColumnObject::forEachSubcolumnRecursively(DB::IColumn::RecursiveMutableColumnCallback callback)
-{
-    for (auto & [_, column] : typed_paths)
-    {
-        callback(*column);
-        column->forEachSubcolumnRecursively(callback);
-    }
-    for (auto & [path, column] : dynamic_paths)
-    {
-        callback(*column);
-        column->forEachSubcolumnRecursively(callback);
-        dynamic_paths_ptrs[path] = assert_cast<ColumnDynamic *>(column.get());
-    }
-    callback(*shared_data);
-    shared_data->forEachSubcolumnRecursively(callback);
-}
-
-bool ColumnObject::structureEquals(const IColumn & rhs) const
-{
-    /// 2 Object columns have equal structure if they have the same typed paths and global_max_dynamic_paths/max_dynamic_types.
-    const auto * rhs_object = typeid_cast<const ColumnObject *>(&rhs);
-    if (!rhs_object || typed_paths.size() != rhs_object->typed_paths.size() || global_max_dynamic_paths != rhs_object->global_max_dynamic_paths || max_dynamic_types != rhs_object->max_dynamic_types)
-        return false;
-
-    for (const auto & [path, column] : typed_paths)
-    {
-        auto it = rhs_object->typed_paths.find(path);
-        if (it == rhs_object->typed_paths.end() || !it->second->structureEquals(*column))
-            return false;
-    }
-
-    return true;
-}
-
-ColumnPtr ColumnObject::compress() const
-{
-    std::unordered_map<String, ColumnPtr> compressed_typed_paths;
-    compressed_typed_paths.reserve(typed_paths.size());
-    size_t byte_size = 0;
-    for (const auto & [path, column] : typed_paths)
-    {
-        auto compressed_column = column->compress();
-        byte_size += compressed_column->byteSize();
-        compressed_typed_paths[path] = std::move(compressed_column);
-    }
-
-    std::unordered_map<String, ColumnPtr> compressed_dynamic_paths;
-    compressed_dynamic_paths.reserve(dynamic_paths_ptrs.size());
-    for (const auto & [path, column] : dynamic_paths_ptrs)
-    {
-        auto compressed_column = column->compress();
-        byte_size += compressed_column->byteSize();
-        compressed_dynamic_paths[path] = std::move(compressed_column);
-    }
-
-    auto compressed_shared_data = shared_data->compress();
-    byte_size += compressed_shared_data->byteSize();
-
-    auto decompress =
-        [my_compressed_typed_paths = std::move(compressed_typed_paths),
-         my_compressed_dynamic_paths = std::move(compressed_dynamic_paths),
-         my_compressed_shared_data = std::move(compressed_shared_data),
-         my_max_dynamic_paths = max_dynamic_paths,
-         my_global_max_dynamic_paths = global_max_dynamic_paths,
-         my_max_dynamic_types = max_dynamic_types,
-         my_statistics = statistics]() mutable
-    {
-        std::unordered_map<String, ColumnPtr> decompressed_typed_paths;
-        decompressed_typed_paths.reserve(my_compressed_typed_paths.size());
-        for (const auto & [path, column] : my_compressed_typed_paths)
-            decompressed_typed_paths[path] = column->decompress();
-
-        std::unordered_map<String, ColumnPtr> decompressed_dynamic_paths;
-        decompressed_dynamic_paths.reserve(my_compressed_dynamic_paths.size());
-        for (const auto & [path, column] : my_compressed_dynamic_paths)
-            decompressed_dynamic_paths[path] = column->decompress();
-
-        auto decompressed_shared_data = my_compressed_shared_data->decompress();
-        return ColumnObject::create(decompressed_typed_paths, decompressed_dynamic_paths, decompressed_shared_data, my_max_dynamic_paths, my_global_max_dynamic_paths, my_max_dynamic_types, my_statistics);
-    };
-
-    return ColumnCompressed::create(size(), byte_size, decompress);
-}
-
-void ColumnObject::finalize()
-{
-    for (auto & [_, column] : typed_paths)
-        column->finalize();
-    for (auto & [_, column] : dynamic_paths_ptrs)
-        column->finalize();
-    shared_data->finalize();
-}
-
-bool ColumnObject::isFinalized() const
-{
-    bool finalized = true;
-    for (const auto & [_, column] : typed_paths)
-        finalized &= column->isFinalized();
-    for (const auto & [_, column] : dynamic_paths_ptrs)
-        finalized &= column->isFinalized();
-    finalized &= shared_data->isFinalized();
-    return finalized;
-}
-
-void ColumnObject::getExtremes(DB::Field & min, DB::Field & max) const
-{
-    if (empty())
+    if (num_rows == 0)
     {
         min = Object();
         max = Object();
@@ -1144,311 +884,227 @@ void ColumnObject::getExtremes(DB::Field & min, DB::Field & max) const
     }
 }
 
-void ColumnObject::prepareForSquashing(const std::vector<ColumnPtr> & source_columns)
+const ColumnObject::Subcolumn & ColumnObject::getSubcolumn(const PathInData & key) const
 {
-    if (source_columns.empty())
-        return;
+    if (const auto * node = subcolumns.findLeaf(key))
+        return node->data;
 
-    /// Dynamic paths of source Object columns may differ.
-    /// We want to preallocate memory for all dynamic paths we will have after squashing.
-    /// It may happen that the total number of dynamic paths in source columns will
-    /// exceed the limit, in this case we will choose the most frequent paths.
-    std::unordered_map<String, size_t> path_to_total_number_of_non_null_values;
+    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "There is no subcolumn {} in ColumnObject", key.getPath());
+}
 
-    auto add_dynamic_paths = [&](const ColumnObject & source_object)
+ColumnObject::Subcolumn & ColumnObject::getSubcolumn(const PathInData & key)
+{
+    if (const auto * node = subcolumns.findLeaf(key))
+        return const_cast<Subcolumns::Node *>(node)->data;
+
+    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "There is no subcolumn {} in ColumnObject", key.getPath());
+}
+
+bool ColumnObject::hasSubcolumn(const PathInData & key) const
+{
+    return subcolumns.findLeaf(key) != nullptr;
+}
+
+void ColumnObject::addSubcolumn(const PathInData & key, MutableColumnPtr && subcolumn)
+{
+    size_t new_size = subcolumn->size();
+    bool inserted = subcolumns.add(key, Subcolumn(std::move(subcolumn), is_nullable));
+
+    if (!inserted)
+        throw Exception(ErrorCodes::DUPLICATE_COLUMN, "Subcolumn '{}' already exists", key.getPath());
+
+    if (num_rows == 0)
+        num_rows = new_size;
+    else if (new_size != num_rows)
+        throw Exception(ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH,
+            "Size of subcolumn {} ({}) is inconsistent with column size ({})",
+            key.getPath(), new_size, num_rows);
+}
+
+void ColumnObject::addSubcolumn(const PathInData & key, size_t new_size)
+{
+    bool inserted = subcolumns.add(key, Subcolumn(new_size, is_nullable));
+    if (!inserted)
+        throw Exception(ErrorCodes::DUPLICATE_COLUMN, "Subcolumn '{}' already exists", key.getPath());
+
+    if (num_rows == 0)
+        num_rows = new_size;
+    else if (new_size != num_rows)
+        throw Exception(ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH,
+            "Required size of subcolumn {} ({}) is inconsistent with column size ({})",
+            key.getPath(), new_size, num_rows);
+}
+
+void ColumnObject::addNestedSubcolumn(const PathInData & key, const FieldInfo & field_info, size_t new_size)
+{
+    if (!key.hasNested())
+        throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR,
+            "Cannot add Nested subcolumn, because path doesn't contain Nested");
+
+    bool inserted = false;
+    /// We find node that represents the same Nested type as @key.
+    const auto * nested_node = subcolumns.findBestMatch(key);
+
+    if (nested_node)
     {
-        for (const auto & [path, dynamic_column_ptr] : source_object.dynamic_paths_ptrs)
-        {
-            auto it = path_to_total_number_of_non_null_values.find(path);
-            if (it == path_to_total_number_of_non_null_values.end())
-                it = path_to_total_number_of_non_null_values.emplace(path, 0).first;
-            it->second += (dynamic_column_ptr->size() - dynamic_column_ptr->getNumberOfDefaultRows());
-        }
-    };
+        /// Find any leaf of Nested subcolumn.
+        const auto * leaf = Subcolumns::findLeaf(nested_node, [&](const auto &) { return true; });
+        assert(leaf);
 
-    for (const auto & source_column : source_columns)
-        add_dynamic_paths(assert_cast<const ColumnObject &>(*source_column));
+        /// Recreate subcolumn with default values and the same sizes of arrays.
+        auto new_subcolumn = leaf->data.recreateWithDefaultValues(field_info);
 
-    /// Add dynamic paths from this object column.
-    add_dynamic_paths(*this);
+        /// It's possible that we have already inserted value from current row
+        /// to this subcolumn. So, adjust size to expected.
+        if (new_subcolumn.size() > new_size)
+            new_subcolumn.popBack(new_subcolumn.size() - new_size);
 
-    /// Check if the number of all dynamic paths exceeds the limit.
-    if (path_to_total_number_of_non_null_values.size() > max_dynamic_paths)
-    {
-        /// We want to keep the most frequent paths in the resulting object column.
-        /// Sort paths by total number of non null values.
-        /// Don't include paths from current column as we cannot change them.
-        std::vector<std::pair<size_t, std::string_view>> paths_with_sizes;
-        paths_with_sizes.reserve(path_to_total_number_of_non_null_values.size() - dynamic_paths.size());
-        for (const auto & [path, size] : path_to_total_number_of_non_null_values)
-        {
-            if (!dynamic_paths.contains(path))
-                paths_with_sizes.emplace_back(size, path);
-        }
-        std::sort(paths_with_sizes.begin(), paths_with_sizes.end(), std::greater());
-
-        /// Fill dynamic_paths with first paths in sorted list until we reach the limit.
-        size_t paths_to_add = max_dynamic_paths - dynamic_paths.size();
-        for (size_t i = 0; i != paths_to_add; ++i)
-            addNewDynamicPath(paths_with_sizes[i].second);
+        assert(new_subcolumn.size() == new_size);
+        inserted = subcolumns.add(key, new_subcolumn);
     }
-    /// Otherwise keep all paths.
     else
     {
-        /// Create columns for new dynamic paths.
-        for (const auto & [path, _] : path_to_total_number_of_non_null_values)
-        {
-            if (!dynamic_paths.contains(path))
-                addNewDynamicPath(path);
-        }
+        /// If node was not found just add subcolumn with empty arrays.
+        inserted = subcolumns.add(key, Subcolumn(new_size, is_nullable));
     }
 
-    /// Now current object column has all resulting dynamic paths and we can call
-    /// prepareForSquashing on them to preallocate the memory.
-    /// Also we can preallocate memory for dynamic paths and shared data.
-    Columns shared_data_source_columns;
-    shared_data_source_columns.reserve(source_columns.size());
-    std::unordered_map<String, Columns> typed_paths_source_columns;
-    typed_paths_source_columns.reserve(typed_paths.size());
-    std::unordered_map<String, Columns> dynamic_paths_source_columns;
-    dynamic_paths_source_columns.reserve(dynamic_paths.size());
+    if (!inserted)
+        throw Exception(ErrorCodes::DUPLICATE_COLUMN, "Subcolumn '{}' already exists", key.getPath());
 
-    for (const auto & [path, column] : typed_paths)
-        typed_paths_source_columns[path].reserve(source_columns.size());
-
-    for (const auto & [path, column] : dynamic_paths)
-        dynamic_paths_source_columns[path].reserve(source_columns.size());
-
-    size_t total_size = 0;
-    for (const auto & source_column : source_columns)
-    {
-        const auto & source_object_column = assert_cast<const ColumnObject &>(*source_column);
-        total_size += source_object_column.size();
-        shared_data_source_columns.push_back(source_object_column.shared_data);
-
-        for (const auto & [path, column] : source_object_column.typed_paths)
-            typed_paths_source_columns.at(path).push_back(column);
-
-        for (const auto & [path, column] : source_object_column.dynamic_paths)
-        {
-            if (dynamic_paths.contains(path))
-                dynamic_paths_source_columns.at(path).push_back(column);
-        }
-    }
-
-    shared_data->prepareForSquashing(shared_data_source_columns);
-
-    for (const auto & [path, source_typed_columns] : typed_paths_source_columns)
-        typed_paths[path]->prepareForSquashing(source_typed_columns);
-
-    for (const auto & [path, source_dynamic_columns] : dynamic_paths_source_columns)
-    {
-        /// ColumnDynamic::prepareForSquashing may not preallocate enough memory for discriminators and offsets
-        /// because source columns may not have this dynamic path (and so dynamic columns filled with nulls).
-        /// For this reason we first call ColumnDynamic::reserve with resulting size to preallocate memory for
-        /// discriminators and offsets and ColumnDynamic::prepareVariantsForSquashing to preallocate memory
-        /// for all variants inside Dynamic.
-        dynamic_paths_ptrs[path]->reserve(total_size);
-        dynamic_paths_ptrs[path]->prepareVariantsForSquashing(source_dynamic_columns);
-    }
+    if (num_rows == 0)
+        num_rows = new_size;
+    else if (new_size != num_rows)
+        throw Exception(ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH,
+            "Required size of subcolumn {} ({}) is inconsistent with column size ({})",
+            key.getPath(), new_size, num_rows);
 }
 
-void ColumnObject::takeDynamicStructureFromSourceColumns(const DB::Columns & source_columns)
+const ColumnObject::Subcolumns::Node * ColumnObject::getLeafOfTheSameNested(const Subcolumns::NodePtr & entry) const
 {
-    if (!empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "takeDynamicStructureFromSourceColumns should be called only on empty Object column");
+    if (!entry->path.hasNested())
+        return nullptr;
 
-    /// During serialization of Object column in MergeTree all Object columns
-    /// in single part must have the same structure (the same dynamic paths). During merge
-    /// resulting column is constructed by inserting from source columns,
-    /// but it may happen that resulting column doesn't have rows from all source parts
-    /// but only from subset of them, and as a result some dynamic paths could be missing
-    /// and structures of resulting column may differ.
-    /// To solve this problem, before merge we create empty resulting column and use this method
-    /// to take dynamic structure from all source columns even if we won't insert
-    /// rows from some of them.
+    size_t old_size = entry->data.size();
+    const auto * current_node = subcolumns.findLeaf(entry->path);
+    const Subcolumns::Node * leaf = nullptr;
 
-    /// We want to construct resulting set of dynamic paths with paths that have least number of null values in source columns
-    /// and insert the rest paths into shared data if we exceed the limit of dynamic paths.
-    /// First, collect all dynamic paths from all source columns and calculate total number of non-null values.
-    std::unordered_map<String, size_t> path_to_total_number_of_non_null_values;
-    for (const auto & source_column : source_columns)
+    while (current_node)
     {
-        const auto & source_object = assert_cast<const ColumnObject &>(*source_column);
-        /// During deserialization from MergeTree we will have statistics from the whole
-        /// data part with number of non null values for each dynamic path.
-        const auto & source_statistics = source_object.getStatistics();
-        for (const auto & [path, column_ptr] : source_object.dynamic_paths_ptrs)
-        {
-            auto it = path_to_total_number_of_non_null_values.find(path);
-            if (it == path_to_total_number_of_non_null_values.end())
-                it = path_to_total_number_of_non_null_values.emplace(path, 0).first;
-            size_t size = column_ptr->size() - column_ptr->getNumberOfDefaultRows();
-            if (source_statistics)
+        /// Try to find the first Nested up to the current node.
+        const auto * node_nested = Subcolumns::findParent(current_node,
+            [](const auto & candidate) { return candidate.isNested(); });
+
+        if (!node_nested)
+            break;
+
+        /// Find the leaf with subcolumn that contains values
+        /// 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,
+            [&](const auto & candidate)
             {
-                auto statistics_it = source_statistics->dynamic_paths_statistics.find(path);
-                if (statistics_it != source_statistics->dynamic_paths_statistics.end())
-                    size = statistics_it->second;
-            }
-            it->second += size;
-        }
+                return candidate.data.size() > old_size;
+            });
 
-        /// Add paths from shared data statistics. It can helo extracting frequent paths
-        /// from shared data to dynamic paths.
-        if (source_statistics)
-        {
-            for (const auto & [path, size] : source_statistics->shared_data_paths_statistics)
-            {
-                auto it = path_to_total_number_of_non_null_values.find(path);
-                if (it == path_to_total_number_of_non_null_values.end())
-                    it = path_to_total_number_of_non_null_values.emplace(path, 0).first;
-                it->second += size;
-            }
-        }
+        if (leaf)
+            break;
+
+        current_node = node_nested->parent;
     }
 
-    /// Reset current state.
-    dynamic_paths.clear();
-    dynamic_paths_ptrs.clear();
-    max_dynamic_paths = global_max_dynamic_paths;
-    Statistics new_statistics(Statistics::Source::MERGE);
+    if (leaf && isNothing(leaf->data.getLeastCommonTypeBase()))
+        return nullptr;
 
-    /// Check if the number of all dynamic paths exceeds the limit.
-    if (path_to_total_number_of_non_null_values.size() > max_dynamic_paths)
-    {
-        /// Sort paths by total number of non null values.
-        std::vector<std::pair<size_t, std::string_view>> paths_with_sizes;
-        paths_with_sizes.reserve(path_to_total_number_of_non_null_values.size());
-        for (const auto & [path, size] : path_to_total_number_of_non_null_values)
-            paths_with_sizes.emplace_back(size, path);
-        std::sort(paths_with_sizes.begin(), paths_with_sizes.end(), std::greater());
-
-        /// Fill dynamic_paths with first max_dynamic_paths paths in sorted list.
-        for (const auto & [size, path] : paths_with_sizes)
-        {
-            if (dynamic_paths.size() < max_dynamic_paths)
-            {
-                dynamic_paths.emplace(path, ColumnDynamic::create(max_dynamic_types));
-                dynamic_paths_ptrs.emplace(path, assert_cast<ColumnDynamic *>(dynamic_paths.find(path)->second.get()));
-            }
-            /// Add all remaining paths into shared data statistics until we reach its max size;
-            else if (new_statistics.shared_data_paths_statistics.size() < Statistics::MAX_SHARED_DATA_STATISTICS_SIZE)
-            {
-                new_statistics.shared_data_paths_statistics.emplace(path, size);
-            }
-        }
-    }
-    /// Use all dynamic paths from all source columns.
-    else
-    {
-        for (const auto & [path, _] : path_to_total_number_of_non_null_values)
-        {
-            dynamic_paths[path] = ColumnDynamic::create(max_dynamic_types);
-            dynamic_paths_ptrs[path] = assert_cast<ColumnDynamic *>(dynamic_paths[path].get());
-        }
-    }
-
-    /// Fill statistics for the merged part.
-    for (const auto & [path, _] : dynamic_paths)
-        new_statistics.dynamic_paths_statistics[path] = path_to_total_number_of_non_null_values[path];
-    statistics = std::make_shared<const Statistics>(std::move(new_statistics));
-
-    /// Set max_dynamic_paths to the number of selected dynamic paths.
-    /// It's needed to avoid adding new unexpected dynamic paths during inserts into this column during merge.
-    max_dynamic_paths = dynamic_paths.size();
-
-    /// Now we have the resulting set of dynamic paths that will be used in all merged columns.
-    /// As we use Dynamic column for dynamic paths, we should call takeDynamicStructureFromSourceColumns
-    /// on all resulting dynamic columns.
-    for (auto & [path, column] : dynamic_paths)
-    {
-        Columns dynamic_path_source_columns;
-        for (const auto & source_column : source_columns)
-        {
-            const auto & source_object = assert_cast<const ColumnObject &>(*source_column);
-            auto it = source_object.dynamic_paths.find(path);
-            if (it != source_object.dynamic_paths.end())
-                dynamic_path_source_columns.push_back(it->second);
-        }
-        column->takeDynamicStructureFromSourceColumns(dynamic_path_source_columns);
-    }
-
-    /// Typed paths also can contain types with dynamic structure.
-    for (auto & [path, column] : typed_paths)
-    {
-        Columns typed_path_source_columns;
-        typed_path_source_columns.reserve(source_columns.size());
-        for (const auto & source_column : source_columns)
-            typed_path_source_columns.push_back(assert_cast<const ColumnObject &>(*source_column).typed_paths.at(path));
-        column->takeDynamicStructureFromSourceColumns(typed_path_source_columns);
-    }
+    return leaf;
 }
 
-size_t ColumnObject::findPathLowerBoundInSharedData(StringRef path, const ColumnString & shared_data_paths, size_t start, size_t end)
+bool ColumnObject::tryInsertManyDefaultsFromNested(const Subcolumns::NodePtr & entry) const
 {
-    /// Simple random access iterator over values in ColumnString in specified range.
-    class Iterator
-    {
-    public:
-        using difference_type = size_t;
-        using value_type = StringRef;
-        using iterator_category = std::random_access_iterator_tag;
-        using pointer = StringRef*;
-        using reference = StringRef&;
+    const auto * leaf = getLeafOfTheSameNested(entry);
+    if (!leaf)
+        return false;
 
-        Iterator() = delete;
-        Iterator(const ColumnString * data_, size_t index_) : data(data_), index(index_) {}
-        Iterator(const Iterator & rhs) = default;
-        Iterator & operator=(const Iterator & rhs) = default;
-        inline Iterator& operator+=(difference_type rhs) { index += rhs; return *this;}
-        inline StringRef operator*() const {return data->getDataAt(index);}
+    size_t old_size = entry->data.size();
+    auto field_info = entry->data.getFieldInfo();
 
-        inline Iterator& operator++() { ++index; return *this; }
-        inline difference_type operator-(const Iterator & rhs) const {return index - rhs.index; }
+    /// Cut the needed range from the found leaf
+    /// and replace scalar values to the correct
+    /// default values for given entry.
+    auto new_subcolumn = leaf->data
+        .cut(old_size, leaf->data.size() - old_size)
+        .recreateWithDefaultValues(field_info);
 
-        const ColumnString * data;
-        size_t index;
-    };
-
-    Iterator start_it(&shared_data_paths, start);
-    Iterator end_it(&shared_data_paths, end);
-    auto it = std::lower_bound(start_it, end_it, path);
-    return it.index;
+    entry->data.insertRangeFrom(new_subcolumn, 0, new_subcolumn.size());
+    return true;
 }
 
-void ColumnObject::fillPathColumnFromSharedData(IColumn & path_column, StringRef path, const ColumnPtr & shared_data_column, size_t start, size_t end)
+bool ColumnObject::tryInsertDefaultFromNested(const Subcolumns::NodePtr & entry) const
 {
-    const auto & shared_data_array = assert_cast<const ColumnArray &>(*shared_data_column);
-    const auto & shared_data_offsets = shared_data_array.getOffsets();
-    size_t first_offset = shared_data_offsets[static_cast<ssize_t>(start) - 1];
-    size_t last_offset = shared_data_offsets[static_cast<ssize_t>(end) - 1];
-    /// Check if we have at least one row with data.
-    if (first_offset == last_offset)
-    {
-        path_column.insertManyDefaults(end - start);
-        return;
-    }
+    const auto * leaf = getLeafOfTheSameNested(entry);
+    if (!leaf)
+        return false;
 
-    const auto & shared_data_tuple = assert_cast<const ColumnTuple &>(shared_data_array.getData());
-    const auto & shared_data_paths = assert_cast<const ColumnString &>(shared_data_tuple.getColumn(0));
-    const auto & shared_data_values = assert_cast<const ColumnString &>(shared_data_tuple.getColumn(1));
-    const auto & dynamic_serialization = getDynamicSerialization();
-    for (size_t i = start; i != end; ++i)
-    {
-        size_t paths_start = shared_data_offsets[static_cast<ssize_t>(i) - 1];
-        size_t paths_end = shared_data_offsets[static_cast<ssize_t>(i)];
-        auto lower_bound_path_index = ColumnObject::findPathLowerBoundInSharedData(path, shared_data_paths, paths_start, paths_end);
-        if (lower_bound_path_index != paths_end && shared_data_paths.getDataAt(lower_bound_path_index) == path)
-        {
-            auto value_data = shared_data_values.getDataAt(lower_bound_path_index);
-            ReadBufferFromMemory buf(value_data.data, value_data.size);
-            dynamic_serialization->deserializeBinary(path_column, buf, getFormatSettings());
-        }
-        else
-        {
-            path_column.insertDefault();
-        }
-    }
+    auto last_field = leaf->data.getLastField();
+    if (last_field.isNull())
+        return false;
+
+    size_t leaf_num_dimensions = leaf->data.getNumberOfDimensions();
+    size_t entry_num_dimensions = entry->data.getNumberOfDimensions();
+
+    auto default_scalar = entry_num_dimensions > leaf_num_dimensions
+        ? createEmptyArrayField(entry_num_dimensions - leaf_num_dimensions)
+        : entry->data.getLeastCommonTypeBase()->getDefault();
+
+    auto default_field = applyVisitor(FieldVisitorReplaceScalars(default_scalar, leaf_num_dimensions), last_field);
+    entry->data.insert(std::move(default_field));
+    return true;
 }
 
+PathsInData ColumnObject::getKeys() const
+{
+    PathsInData keys;
+    keys.reserve(subcolumns.size());
+    for (const auto & entry : subcolumns)
+        keys.emplace_back(entry->path);
+    return keys;
+}
+
+bool ColumnObject::isFinalized() const
+{
+    return std::all_of(subcolumns.begin(), subcolumns.end(),
+        [](const auto & entry) { return entry->data.isFinalized(); });
+}
+
+void ColumnObject::finalize()
+{
+    size_t old_size = size();
+    Subcolumns new_subcolumns;
+    for (auto && entry : subcolumns)
+    {
+        const auto & least_common_type = entry->data.getLeastCommonType();
+
+        /// Do not add subcolumns, which consist only from NULLs.
+        if (isNothing(getBaseTypeOfArray(least_common_type)))
+            continue;
+
+        entry->data.finalize();
+        new_subcolumns.add(entry->path, entry->data);
+    }
+
+    /// If all subcolumns were skipped add a dummy subcolumn,
+    /// because Tuple type must have at least one element.
+    if (new_subcolumns.empty())
+        new_subcolumns.add(PathInData{COLUMN_NAME_DUMMY}, Subcolumn{ColumnUInt8::create(old_size, 0), is_nullable});
+
+    std::swap(subcolumns, new_subcolumns);
+    checkObjectHasNoAmbiguosPaths(getKeys());
+}
+
+void ColumnObject::updateHashFast(SipHash & hash) const
+{
+    for (const auto & entry : subcolumns)
+        for (auto & part : entry->data.data)
+            part->updateHashFast(hash);
+}
 }
diff --git a/src/Columns/ColumnObject.h b/src/Columns/ColumnObject.h
index f530ed29ef3..25cfaa550f6 100644
--- a/src/Columns/ColumnObject.h
+++ b/src/Columns/ColumnObject.h
@@ -1,117 +1,216 @@
 #pragma once
 
 #include <Columns/IColumn.h>
-#include <Columns/ColumnVector.h>
-#include <Columns/ColumnArray.h>
-#include <Columns/ColumnTuple.h>
-#include <Columns/ColumnString.h>
+#include <Core/Field.h>
+#include <Core/Names.h>
+#include <DataTypes/Serializations/SubcolumnsTree.h>
+#include <Common/PODArray.h>
+#include <Common/WeakHash.h>
 
 #include <DataTypes/IDataType.h>
-#include <DataTypes/Serializations/SerializationDynamic.h>
-#include <Formats/FormatSettings.h>
-#include <Common/StringHashForHeterogeneousLookup.h>
-#include <Common/WeakHash.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+}
+
+/// Info that represents a scalar or array field in a decomposed view.
+/// It allows to recreate field with different number
+/// of dimensions or nullability.
+struct FieldInfo
+{
+    /// The common type of of all scalars in field.
+    DataTypePtr scalar_type;
+
+    /// Do we have NULL scalar in field.
+    bool have_nulls;
+
+    /// If true then we have scalars with different types in array and
+    /// we need to convert scalars to the common type.
+    bool need_convert;
+
+    /// Number of dimension in array. 0 if field is scalar.
+    size_t num_dimensions;
+
+    /// If true then this field is an array of variadic dimension field
+    /// and we need to normalize the dimension
+    bool need_fold_dimension;
+};
+
+FieldInfo getFieldInfo(const Field & field);
+
+/** A column that represents object with dynamic set of subcolumns.
+ *  Subcolumns are identified by paths in document and are stored in
+ *  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<IColumnHelper<ColumnObject>, ColumnObject>
 {
 public:
-    struct Statistics
+    /** Class that represents one subcolumn.
+     * It stores values in several parts of column
+     * and keeps current common type of all parts.
+     * We add a new column part with a new type, when we insert a field,
+     * which can't be converted to the current common type.
+     * After insertion of all values subcolumn should be finalized
+     * for writing and other operations.
+     */
+    class Subcolumn
     {
-        enum class Source
+    public:
+        Subcolumn() = default;
+        Subcolumn(size_t size_, bool is_nullable_);
+        Subcolumn(MutableColumnPtr && data_, bool is_nullable_);
+
+        size_t size() const;
+        size_t byteSize() const;
+        size_t allocatedBytes() const;
+        void get(size_t n, Field & res) const;
+
+        bool isFinalized() const;
+        const DataTypePtr & getLeastCommonType() const { return least_common_type.get(); }
+        const DataTypePtr & getLeastCommonTypeBase() const { return least_common_type.getBase(); }
+        size_t getNumberOfDimensions() const { return least_common_type.getNumberOfDimensions(); }
+
+        /// Checks the consistency of column's parts stored in @data.
+        void checkTypes() const;
+
+        /// Inserts a field, which scalars can be arbitrary, but number of
+        /// dimensions should be consistent with current common type.
+        void insert(Field field);
+        void insert(Field field, FieldInfo info);
+
+        void insertDefault();
+        void insertManyDefaults(size_t length);
+        void insertRangeFrom(const Subcolumn & src, size_t start, size_t length);
+        void popBack(size_t n);
+
+        Subcolumn cut(size_t start, size_t length) const;
+
+        /// Converts all column's parts to the common type and
+        /// creates a single column that stores all values.
+        void finalize();
+
+        /// Returns last inserted field.
+        Field getLastField() const;
+
+        FieldInfo getFieldInfo() const;
+
+        /// Recreates subcolumn with default scalar values and keeps sizes of arrays.
+        /// Used to create columns of type Nested with consistent array sizes.
+        Subcolumn recreateWithDefaultValues(const FieldInfo & field_info) const;
+
+        /// Returns single column if subcolumn in finalizes.
+        /// Otherwise -- undefined behaviour.
+        IColumn & getFinalizedColumn();
+        const IColumn & getFinalizedColumn() const;
+        const ColumnPtr & getFinalizedColumnPtr() const;
+
+        const std::vector<WrappedPtr> & getData() const { return data; }
+        size_t getNumberOfDefaultsInPrefix() const { return num_of_defaults_in_prefix; }
+
+        friend class ColumnObject;
+
+    private:
+        class LeastCommonType
         {
-            READ,  /// Statistics were loaded into column during reading from MergeTree.
-            MERGE, /// Statistics were calculated during merge of several MergeTree parts.
+        public:
+            LeastCommonType();
+            explicit LeastCommonType(DataTypePtr type_);
+
+            const DataTypePtr & get() const { return type; }
+            const DataTypePtr & getBase() const { return base_type; }
+            size_t getNumberOfDimensions() const { return num_dimensions; }
+
+        private:
+            DataTypePtr type;
+            DataTypePtr base_type;
+            size_t num_dimensions = 0;
         };
 
-        explicit Statistics(Source source_) : source(source_) {}
+        void addNewColumnPart(DataTypePtr type);
 
-        /// Source of the statistics.
-        Source source;
-        /// Statistics for dynamic paths: (path) -> (total number of not-null values).
-        std::unordered_map<String, size_t> dynamic_paths_statistics;
-        /// Statistics for paths in shared data: path) -> (total number of not-null values).
-        /// We don't store statistics for all paths in shared data but only for some subset of them
-        /// (is 10000 a good limit? It should not be expensive to store 10000 paths per part)
-        static const size_t MAX_SHARED_DATA_STATISTICS_SIZE = 10000;
-        std::unordered_map<String, size_t, StringHashForHeterogeneousLookup, StringHashForHeterogeneousLookup::transparent_key_equal> shared_data_paths_statistics;
+        /// Current least common type of all values inserted to this subcolumn.
+        LeastCommonType least_common_type;
+
+        /// If true then common type type of subcolumn is Nullable
+        /// and default values are NULLs.
+        bool is_nullable = false;
+
+        /// Parts of column. Parts should be in increasing order in terms of subtypes/supertypes.
+        /// That means that the least common type for i-th prefix is the type of i-th part
+        /// and it's the supertype for all type of column from 0 to i-1.
+        std::vector<WrappedPtr> data;
+
+        /// Until we insert any non-default field we don't know further
+        /// least common type and we count number of defaults in prefix,
+        /// which will be converted to the default type of final common type.
+        size_t num_of_defaults_in_prefix = 0;
+
+        size_t num_rows = 0;
     };
 
-    using StatisticsPtr = std::shared_ptr<const Statistics>;
+    using Subcolumns = SubcolumnsTree<Subcolumn>;
 
 private:
-    friend class COWHelper<IColumnHelper<ColumnObject>, ColumnObject>;
+    /// If true then all subcolumns are nullable.
+    const bool is_nullable;
 
-    ColumnObject(std::unordered_map<String, MutableColumnPtr> typed_paths_, size_t max_dynamic_paths_, size_t max_dynamic_types_);
-    ColumnObject(
-        std::unordered_map<String, MutableColumnPtr> typed_paths_,
-        std::unordered_map<String, MutableColumnPtr> dynamic_paths_,
-        MutableColumnPtr shared_data_,
-        size_t max_dynamic_paths_,
-        size_t global_max_dynamic_paths_,
-        size_t max_dynamic_types_,
-        const StatisticsPtr & statistics_ = {});
+    Subcolumns subcolumns;
+    size_t num_rows;
 
-    /// Use StringHashForHeterogeneousLookup hash for hash maps to be able to use std::string_view in find() method.
-    using PathToColumnMap = std::unordered_map<String, WrappedPtr, StringHashForHeterogeneousLookup, StringHashForHeterogeneousLookup::transparent_key_equal>;
-    using PathToDynamicColumnPtrMap = std::unordered_map<String, ColumnDynamic *, StringHashForHeterogeneousLookup, StringHashForHeterogeneousLookup::transparent_key_equal>;
 public:
-    /** Create immutable column using immutable arguments. This arguments may be shared with other columns.
-      * Use mutate in order to make mutable column and mutate shared nested columns.
-      */
-    using Base = COWHelper<IColumnHelper<ColumnObject>, ColumnObject>;
+    static constexpr auto COLUMN_NAME_DUMMY = "_dummy";
 
-    static Ptr create(
-        const std::unordered_map<String, ColumnPtr> & typed_paths_,
-        const std::unordered_map<String, ColumnPtr> & dynamic_paths_,
-        const ColumnPtr & shared_data_,
-        size_t max_dynamic_paths_,
-        size_t global_max_dynamic_paths_,
-        size_t max_dynamic_types_,
-        const StatisticsPtr & statistics_ = {});
+    explicit ColumnObject(bool is_nullable_);
+    ColumnObject(Subcolumns && subcolumns_, bool is_nullable_);
 
-    static MutablePtr create(
-        std::unordered_map<String, MutableColumnPtr> typed_paths_,
-        std::unordered_map<String, MutableColumnPtr> dynamic_paths_,
-        MutableColumnPtr shared_data_,
-        size_t max_dynamic_paths_,
-        size_t global_max_dynamic_paths_,
-        size_t max_dynamic_types_,
-        const StatisticsPtr & statistics_ = {});
+    /// Checks that all subcolumns have consistent sizes.
+    void checkConsistency() const;
 
-    static MutablePtr create(std::unordered_map<String, MutableColumnPtr> typed_paths_, size_t max_dynamic_paths_, size_t max_dynamic_types_);
+    bool hasSubcolumn(const PathInData & key) const;
 
-    std::string getName() const override;
+    const Subcolumn & getSubcolumn(const PathInData & key) const;
+    Subcolumn & getSubcolumn(const PathInData & key);
 
-    const char * getFamilyName() const override
-    {
-        return "Object";
-    }
+    void incrementNumRows() { ++num_rows; }
 
-    TypeIndex getDataType() const override
-    {
-        return TypeIndex::Object;
-    }
+    /// Adds a subcolumn from existing IColumn.
+    void addSubcolumn(const PathInData & key, MutableColumnPtr && subcolumn);
 
-    MutableColumnPtr cloneEmpty() const override;
-    MutableColumnPtr cloneResized(size_t size) const override;
+    /// Adds a subcolumn of specific size with default values.
+    void addSubcolumn(const PathInData & key, size_t new_size);
 
-    size_t size() const override
-    {
-        return shared_data->size();
-    }
+    /// Adds a subcolumn of type Nested of specific size with default values.
+    /// It cares about consistency of sizes of Nested arrays.
+    void addNestedSubcolumn(const PathInData & key, const FieldInfo & field_info, size_t new_size);
 
-    Field operator[](size_t n) const override;
-    void get(size_t n, Field & res) const override;
+    /// Finds a subcolumn from the same Nested type as @entry and inserts
+    /// an array with default values with consistent sizes as in Nested type.
+    bool tryInsertDefaultFromNested(const Subcolumns::NodePtr & entry) const;
+    bool tryInsertManyDefaultsFromNested(const Subcolumns::NodePtr & entry) const;
 
-    bool isDefaultAt(size_t n) const override;
-    StringRef getDataAt(size_t n) const override;
-    void insertData(const char * pos, size_t length) override;
+    const Subcolumns & getSubcolumns() const { return subcolumns; }
+    Subcolumns & getSubcolumns() { return subcolumns; }
+    PathsInData getKeys() const;
+
+    /// Part of interface
+
+    const char * getFamilyName() const override { return "Object"; }
+    TypeIndex getDataType() const override { return TypeIndex::Object; }
+
+    size_t size() const override;
+    size_t byteSize() const override;
+    size_t allocatedBytes() const override;
+    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 insert(const Field & x) override;
-    bool tryInsert(const Field & x) override;
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
     void insertFrom(const IColumn & src, size_t n) override;
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
@@ -119,31 +218,24 @@ public:
     void doInsertFrom(const IColumn & src, size_t n) override;
     void doInsertRangeFrom(const IColumn & src, size_t start, size_t length) override;
 #endif
-    /// TODO: implement more optimal insertManyFrom
-    void insertDefault() override;
-    void insertManyDefaults(size_t length) override;
 
-    void popBack(size_t n) override;
+    void popBack(size_t length) override;
+    Field operator[](size_t n) const override;
+    void get(size_t n, Field & res) 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;
-    WeakHash32 getWeakHash32() 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 filter(const Filter & filter, ssize_t result_size_hint) const override;
     ColumnPtr index(const IColumn & indexes, size_t limit) const override;
-    ColumnPtr replicate(const Offsets & replicate_offsets) const override;
-    MutableColumns scatter(ColumnIndex num_columns, const Selector & selector) const override;
+    ColumnPtr replicate(const Offsets & offsets) const override;
+    MutableColumnPtr cloneResized(size_t new_size) const override;
 
-    void getPermutation(PermutationSortDirection, PermutationSortStability, size_t, int, Permutation &) const override;
+    /// Finalizes all subcolumns.
+    void finalize() override;
+    bool isFinalized() const override;
+
+    /// Order of rows in ColumnObject is undefined.
+    void getPermutation(PermutationSortDirection, PermutationSortStability, size_t, int, Permutation & res) const override;
     void updatePermutation(PermutationSortDirection, PermutationSortStability, size_t, int, Permutation &, EqualRanges &) const override {}
-
-    /// Values of ColumnObject are not comparable.
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
     int compareAt(size_t, size_t, const IColumn &, int) const override { return 0; }
 #else
@@ -151,118 +243,35 @@ public:
 #endif
     void getExtremes(Field & min, Field & max) const override;
 
-    void reserve(size_t n) override;
-    size_t capacity() const override;
-    void prepareForSquashing(const std::vector<ColumnPtr> & source_columns) 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;
+    /// All other methods throw exception.
 
-    void forEachSubcolumn(MutableColumnCallback callback) override;
-
-    void forEachSubcolumnRecursively(RecursiveMutableColumnCallback callback) override;
-
-    bool structureEquals(const IColumn & rhs) const override;
-
-    ColumnPtr compress() const override;
-
-    void finalize() override;
-    bool isFinalized() const override;
-
-    bool hasDynamicStructure() const override { return true; }
-    void takeDynamicStructureFromSourceColumns(const Columns & source_columns) override;
-
-    const PathToColumnMap & getTypedPaths() const { return typed_paths; }
-    PathToColumnMap & getTypedPaths() { return typed_paths; }
-
-    const PathToColumnMap & getDynamicPaths() const { return dynamic_paths; }
-    PathToColumnMap & getDynamicPaths() { return dynamic_paths; }
-
-    const PathToDynamicColumnPtrMap & getDynamicPathsPtrs() const { return dynamic_paths_ptrs; }
-    PathToDynamicColumnPtrMap & getDynamicPathsPtrs() { return dynamic_paths_ptrs; }
-
-    const StatisticsPtr & getStatistics() const { return statistics; }
-
-    const ColumnPtr & getSharedDataPtr() const { return shared_data; }
-    ColumnPtr & getSharedDataPtr() { return shared_data; }
-    IColumn & getSharedDataColumn() { return *shared_data; }
-
-    const ColumnArray & getSharedDataNestedColumn() const { return assert_cast<const ColumnArray &>(*shared_data); }
-    ColumnArray & getSharedDataNestedColumn() { return assert_cast<ColumnArray &>(*shared_data); }
-
-    ColumnArray::Offsets & getSharedDataOffsets() { return assert_cast<ColumnArray &>(*shared_data).getOffsets(); }
-    const ColumnArray::Offsets & getSharedDataOffsets() const { return assert_cast<const ColumnArray &>(*shared_data).getOffsets(); }
-
-    std::pair<ColumnString *, ColumnString *> getSharedDataPathsAndValues()
-    {
-        auto & column_array = assert_cast<ColumnArray &>(*shared_data);
-        auto & column_tuple = assert_cast<ColumnTuple &>(column_array.getData());
-        return {assert_cast<ColumnString *>(&column_tuple.getColumn(0)), assert_cast<ColumnString *>(&column_tuple.getColumn(1))};
-    }
-
-    std::pair<const ColumnString *, const ColumnString *> getSharedDataPathsAndValues() const
-    {
-        const auto & column_array = assert_cast<const ColumnArray &>(*shared_data);
-        const auto & column_tuple = assert_cast<const ColumnTuple &>(column_array.getData());
-        return {assert_cast<const ColumnString *>(&column_tuple.getColumn(0)), assert_cast<const ColumnString *>(&column_tuple.getColumn(1))};
-    }
-
-    size_t getMaxDynamicTypes() const { return max_dynamic_types; }
-    size_t getMaxDynamicPaths() const { return max_dynamic_paths; }
-    size_t getGlobalMaxDynamicPaths() const { return global_max_dynamic_paths; }
-
-    /// Try to add new dynamic path. Returns pointer to the new dynamic
-    /// path column or nullptr if limit on dynamic paths is reached.
-    ColumnDynamic * tryToAddNewDynamicPath(std::string_view path);
-    /// Throws an exception if cannot add.
-    void addNewDynamicPath(std::string_view path);
-
-    void setDynamicPaths(const std::vector<String> & paths);
-    void setMaxDynamicPaths(size_t max_dynamic_paths_);
-    void setStatistics(const StatisticsPtr & statistics_) { statistics = statistics_; }
-
-    void serializePathAndValueIntoSharedData(ColumnString * shared_data_paths, ColumnString * shared_data_values, std::string_view path, const IColumn & column, size_t n);
-    void deserializeValueFromSharedData(const ColumnString * shared_data_values, size_t n, IColumn & column) const;
-
-    /// Paths in shared data are sorted in each row. Use this method to find the lower bound for specific path in the row.
-    static size_t findPathLowerBoundInSharedData(StringRef path, const ColumnString & shared_data_paths, size_t start, size_t end);
-    /// Insert all the data from shared data with specified path to dynamic column.
-    static void fillPathColumnFromSharedData(IColumn & path_column, StringRef path, const ColumnPtr & shared_data_column, size_t start, size_t end);
+    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 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(); }
+    WeakHash32 getWeakHash32() const override { throwMustBeConcrete(); }
+    void updateHashFast(SipHash & hash) const override;
+    void expand(const Filter &, bool) override { throwMustBeConcrete(); }
+    bool hasEqualValues() const override { throwMustBeConcrete(); }
+    size_t byteSizeAt(size_t) const override { throwMustBeConcrete(); }
+    double getRatioOfDefaultRows(double) const override { throwMustBeConcrete(); }
+    UInt64 getNumberOfDefaultRows() const override { throwMustBeConcrete(); }
+    void getIndicesOfNonDefaultRows(Offsets &, size_t, size_t) const override { throwMustBeConcrete(); }
 
 private:
-    void insertFromSharedDataAndFillRemainingDynamicPaths(const ColumnObject & src_object_column, std::vector<std::string_view> && src_dynamic_paths_for_shared_data, size_t start, size_t length);
-    void serializePathAndValueIntoArena(Arena & arena, const char *& begin, StringRef path, StringRef value, StringRef & res) const;
+    [[noreturn]] static void throwMustBeConcrete()
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "ColumnObject must be converted to ColumnTuple before use");
+    }
 
-    /// Map path -> column for paths with explicitly specified types.
-    /// This set of paths is constant and cannot be changed.
-    PathToColumnMap typed_paths;
-    /// Map path -> column for dynamically added paths. All columns
-    /// here are Dynamic columns. This set of paths can be extended
-    /// during inerts into the column.
-    PathToColumnMap dynamic_paths;
-    /// Store and use pointers to ColumnDynamic to avoid virtual calls.
-    /// With hundreds of dynamic paths these virtual calls are noticeable.
-    PathToDynamicColumnPtrMap dynamic_paths_ptrs;
-    /// Shared storage for all other paths and values. It's filled
-    /// when the number of dynamic paths reaches the limit.
-    /// It has type Array(Tuple(String, String)) and stores
-    /// an array of pairs (path, binary serialized dynamic value) for each row.
-    WrappedPtr shared_data;
+    template <typename Func>
+    MutableColumnPtr applyForSubcolumns(Func && func) const;
 
-    /// Maximum number of dynamic paths. If this limit is reached, all new paths will be inserted into shared data.
-    /// This limit can be different for different instances of Object column. For example, we can decrease it
-    /// in takeDynamicStructureFromSourceColumns before merge.
-    size_t max_dynamic_paths;
-    /// Global limit on number of dynamic paths for all column instances of this Object type. It's the limit specified
-    /// in the type definition (for example 'JSON(max_dynamic_paths=N)'). max_dynamic_paths is always not greater than this limit.
-    size_t global_max_dynamic_paths;
-    /// Maximum number of dynamic types for each dynamic path. Used while creating Dynamic columns for new dynamic paths.
-    size_t max_dynamic_types;
-    /// Statistics on the number of non-null values for each dynamic path and for some shared data paths in the MergeTree data part.
-    /// Calculated during serializing of data part in MergeTree. Used to determine the set of dynamic paths for the merged part.
-    StatisticsPtr statistics;
+    /// It's used to get shared sized of Nested to insert correct default values.
+    const Subcolumns::Node * getLeafOfTheSameNested(const Subcolumns::NodePtr & entry) const;
 };
-
 }
diff --git a/src/Columns/ColumnObjectDeprecated.cpp b/src/Columns/ColumnObjectDeprecated.cpp
deleted file mode 100644
index d03b1d0df82..00000000000
--- a/src/Columns/ColumnObjectDeprecated.cpp
+++ /dev/null
@@ -1,1111 +0,0 @@
-#include <Core/Field.h>
-#include <Columns/ColumnObjectDeprecated.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>
-#include <DataTypes/DataTypeNothing.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <Interpreters/castColumn.h>
-#include <Interpreters/convertFieldToType.h>
-#include <Common/HashTable/HashSet.h>
-#include <numeric>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    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;
-}
-
-namespace
-{
-
-/// Recreates column with default scalar values and keeps sizes of arrays.
-ColumnPtr recreateColumnWithDefaultValues(
-    const ColumnPtr & column, const DataTypePtr & scalar_type, size_t num_dimensions)
-{
-    const auto * column_array = checkAndGetColumn<ColumnArray>(column.get());
-    if (column_array && num_dimensions)
-    {
-        return ColumnArray::create(
-            recreateColumnWithDefaultValues(
-                column_array->getDataPtr(), scalar_type, num_dimensions - 1),
-                IColumn::mutate(column_array->getOffsetsPtr()));
-    }
-
-    return createArrayOfType(scalar_type, num_dimensions)->createColumn()->cloneResized(column->size());
-}
-
-/// Replaces NULL fields to given field or empty array.
-class FieldVisitorReplaceNull : public StaticVisitor<Field>
-{
-public:
-    explicit FieldVisitorReplaceNull(
-        const Field & replacement_, size_t num_dimensions_)
-        : replacement(replacement_)
-        , num_dimensions(num_dimensions_)
-    {
-    }
-
-    Field operator()(const Null &) const
-    {
-        return num_dimensions ? Array() : replacement;
-    }
-
-    Field operator()(const Array & x) const
-    {
-        assert(num_dimensions > 0);
-        const size_t size = x.size();
-        Array res(size);
-        for (size_t i = 0; i < size; ++i)
-            res[i] = applyVisitor(FieldVisitorReplaceNull(replacement, num_dimensions - 1), x[i]);
-        return res;
-    }
-
-    template <typename T>
-    Field operator()(const T & x) const { return x; }
-
-private:
-    const Field & replacement;
-    size_t num_dimensions;
-};
-
-/// Visitor that allows to get type of scalar field
-/// or least common type of scalars in array.
-/// More optimized version of FieldToDataType.
-class FieldVisitorToScalarType : public StaticVisitor<>
-{
-public:
-    using FieldType = Field::Types::Which;
-
-    void operator()(const Array & x)
-    {
-        size_t size = x.size();
-        for (size_t i = 0; i < size; ++i)
-            applyVisitor(*this, x[i]);
-    }
-
-    void operator()(const UInt64 & x)
-    {
-        field_types.insert(FieldType::UInt64);
-        if (x <= std::numeric_limits<UInt8>::max())
-            type_indexes.insert(TypeIndex::UInt8);
-        else if (x <= std::numeric_limits<UInt16>::max())
-            type_indexes.insert(TypeIndex::UInt16);
-        else if (x <= std::numeric_limits<UInt32>::max())
-            type_indexes.insert(TypeIndex::UInt32);
-        else
-            type_indexes.insert(TypeIndex::UInt64);
-    }
-
-    void operator()(const Int64 & x)
-    {
-        field_types.insert(FieldType::Int64);
-        if (x <= std::numeric_limits<Int8>::max() && x >= std::numeric_limits<Int8>::min())
-            type_indexes.insert(TypeIndex::Int8);
-        else if (x <= std::numeric_limits<Int16>::max() && x >= std::numeric_limits<Int16>::min())
-            type_indexes.insert(TypeIndex::Int16);
-        else if (x <= std::numeric_limits<Int32>::max() && x >= std::numeric_limits<Int32>::min())
-            type_indexes.insert(TypeIndex::Int32);
-        else
-            type_indexes.insert(TypeIndex::Int64);
-    }
-
-    void operator()(const bool &)
-    {
-        field_types.insert(FieldType::UInt64);
-        type_indexes.insert(TypeIndex::UInt8);
-    }
-
-    void operator()(const Null &)
-    {
-        have_nulls = true;
-    }
-
-    template <typename T>
-    void operator()(const T &)
-    {
-        field_types.insert(Field::TypeToEnum<NearestFieldType<T>>::value);
-        type_indexes.insert(TypeToTypeIndex<NearestFieldType<T>>);
-    }
-
-    DataTypePtr getScalarType() const { return getLeastSupertypeOrString(type_indexes); }
-    bool haveNulls() const { return have_nulls; }
-    bool needConvertField() const { return field_types.size() > 1; }
-
-private:
-    TypeIndexSet type_indexes;
-    std::unordered_set<FieldType> field_types;
-    bool have_nulls = false;
-};
-
-}
-
-FieldInfo getFieldInfo(const Field & field)
-{
-    FieldVisitorToScalarType to_scalar_type_visitor;
-    applyVisitor(to_scalar_type_visitor, field);
-    FieldVisitorToNumberOfDimensions to_number_dimension_visitor;
-
-    return
-    {
-        to_scalar_type_visitor.getScalarType(),
-        to_scalar_type_visitor.haveNulls(),
-        to_scalar_type_visitor.needConvertField(),
-        applyVisitor(to_number_dimension_visitor, field),
-        to_number_dimension_visitor.need_fold_dimension
-    };
-}
-
-ColumnObjectDeprecated::Subcolumn::Subcolumn(MutableColumnPtr && data_, bool is_nullable_)
-    : least_common_type(getDataTypeByColumn(*data_))
-    , is_nullable(is_nullable_)
-    , num_rows(data_->size())
-{
-    data.push_back(std::move(data_));
-}
-
-ColumnObjectDeprecated::Subcolumn::Subcolumn(
-    size_t size_, bool is_nullable_)
-    : least_common_type(std::make_shared<DataTypeNothing>())
-    , is_nullable(is_nullable_)
-    , num_of_defaults_in_prefix(size_)
-    , num_rows(size_)
-{
-}
-
-size_t ColumnObjectDeprecated::Subcolumn::size() const
-{
-    return num_rows;
-}
-
-size_t ColumnObjectDeprecated::Subcolumn::byteSize() const
-{
-    size_t res = 0;
-    for (const auto & part : data)
-        res += part->byteSize();
-    return res;
-}
-
-size_t ColumnObjectDeprecated::Subcolumn::allocatedBytes() const
-{
-    size_t res = 0;
-    for (const auto & part : data)
-        res += part->allocatedBytes();
-    return res;
-}
-
-void ColumnObjectDeprecated::Subcolumn::get(size_t n, Field & res) const
-{
-    if (isFinalized())
-    {
-        getFinalizedColumn().get(n, res);
-        return;
-    }
-
-    size_t ind = n;
-    if (ind < num_of_defaults_in_prefix)
-    {
-        res = least_common_type.get()->getDefault();
-        return;
-    }
-
-    ind -= num_of_defaults_in_prefix;
-    for (const auto & part : data)
-    {
-        if (ind < part->size())
-        {
-            part->get(ind, res);
-            res = convertFieldToTypeOrThrow(res, *least_common_type.get());
-            return;
-        }
-
-        ind -= part->size();
-    }
-
-    throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Index ({}) for getting field is out of range", n);
-}
-
-void ColumnObjectDeprecated::Subcolumn::checkTypes() const
-{
-    DataTypes prefix_types;
-    prefix_types.reserve(data.size());
-    for (size_t i = 0; i < data.size(); ++i)
-    {
-        auto current_type = getDataTypeByColumn(*data[i]);
-        prefix_types.push_back(current_type);
-        auto prefix_common_type = getLeastSupertype(prefix_types);
-        if (!prefix_common_type->equals(*current_type))
-            throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR,
-                "Data type {} of column at position {} cannot represent all columns from i-th prefix",
-                current_type->getName(), i);
-    }
-}
-
-void ColumnObjectDeprecated::Subcolumn::insert(Field field)
-{
-    auto info = DB::getFieldInfo(field);
-    insert(std::move(field), std::move(info));
-}
-
-void ColumnObjectDeprecated::Subcolumn::addNewColumnPart(DataTypePtr type)
-{
-    auto serialization = type->getSerialization(ISerialization::Kind::SPARSE);
-    data.push_back(type->createColumn(*serialization));
-    least_common_type = LeastCommonType{std::move(type)};
-}
-
-static bool isConversionRequiredBetweenIntegers(const IDataType & lhs, const IDataType & rhs)
-{
-    /// If both of types are signed/unsigned integers and size of left field type
-    /// is less than right type, we don't need to convert field,
-    /// because all integer fields are stored in Int64/UInt64.
-
-    WhichDataType which_lhs(lhs);
-    WhichDataType which_rhs(rhs);
-
-    bool is_native_int = which_lhs.isNativeInt() && which_rhs.isNativeInt();
-    bool is_native_uint = which_lhs.isNativeUInt() && which_rhs.isNativeUInt();
-
-    return (!is_native_int && !is_native_uint)
-        || lhs.getSizeOfValueInMemory() > rhs.getSizeOfValueInMemory();
-}
-
-void ColumnObjectDeprecated::Subcolumn::insert(Field field, FieldInfo info)
-{
-    auto base_type = std::move(info.scalar_type);
-
-    if (isNothing(base_type) && info.num_dimensions == 0)
-    {
-        insertDefault();
-        return;
-    }
-
-    auto column_dim = least_common_type.getNumberOfDimensions();
-    auto value_dim = info.num_dimensions;
-
-    if (isNothing(least_common_type.get()))
-        column_dim = value_dim;
-
-    if (isNothing(base_type))
-        value_dim = column_dim;
-
-    if (value_dim != column_dim)
-        throw Exception(ErrorCodes::NUMBER_OF_DIMENSIONS_MISMATCHED,
-            "Dimension of types mismatched between inserted value and column. "
-            "Dimension of value: {}. Dimension of column: {}",
-             value_dim, column_dim);
-
-    if (is_nullable)
-        base_type = makeNullable(base_type);
-
-    if (!is_nullable && info.have_nulls)
-        field = applyVisitor(FieldVisitorReplaceNull(base_type->getDefault(), value_dim), std::move(field));
-
-    bool type_changed = false;
-    const auto & least_common_base_type = least_common_type.getBase();
-
-    if (data.empty())
-    {
-        addNewColumnPart(createArrayOfType(std::move(base_type), value_dim));
-    }
-    else if (!least_common_base_type->equals(*base_type) && !isNothing(base_type))
-    {
-        if (isConversionRequiredBetweenIntegers(*base_type, *least_common_base_type))
-        {
-            base_type = getLeastSupertypeOrString(DataTypes{std::move(base_type), least_common_base_type});
-            type_changed = true;
-            if (!least_common_base_type->equals(*base_type))
-                addNewColumnPart(createArrayOfType(std::move(base_type), value_dim));
-        }
-    }
-
-    if (type_changed || info.need_convert)
-        field = convertFieldToTypeOrThrow(field, *least_common_type.get());
-
-    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;
-}
-
-void ColumnObjectDeprecated::Subcolumn::insertRangeFrom(const Subcolumn & src, size_t start, size_t length)
-{
-    assert(start + length <= src.size());
-    size_t end = start + length;
-    num_rows += length;
-
-    if (data.empty())
-    {
-        addNewColumnPart(src.getLeastCommonType());
-    }
-    else if (!least_common_type.get()->equals(*src.getLeastCommonType()))
-    {
-        auto new_least_common_type = getLeastSupertypeOrString(DataTypes{least_common_type.get(), src.getLeastCommonType()});
-        if (!new_least_common_type->equals(*least_common_type.get()))
-            addNewColumnPart(std::move(new_least_common_type));
-    }
-
-    if (end <= src.num_of_defaults_in_prefix)
-    {
-        data.back()->insertManyDefaults(length);
-        return;
-    }
-
-    if (start < src.num_of_defaults_in_prefix)
-        data.back()->insertManyDefaults(src.num_of_defaults_in_prefix - start);
-
-    auto insert_from_part = [&](const auto & column, size_t from, size_t n)
-    {
-        assert(from + n <= column->size());
-        auto column_type = getDataTypeByColumn(*column);
-
-        if (column_type->equals(*least_common_type.get()))
-        {
-            data.back()->insertRangeFrom(*column, from, n);
-            return;
-        }
-
-        /// If we need to insert large range, there is no sense to cut part of column and cast it.
-        /// Casting of all column and inserting from it can be faster.
-        /// Threshold is just a guess.
-
-        if (n * 3 >= column->size())
-        {
-            auto casted_column = castColumn({column, column_type, ""}, least_common_type.get());
-            data.back()->insertRangeFrom(*casted_column, from, n);
-            return;
-        }
-
-        auto casted_column = column->cut(from, n);
-        casted_column = castColumn({casted_column, column_type, ""}, least_common_type.get());
-        data.back()->insertRangeFrom(*casted_column, 0, n);
-    };
-
-    size_t pos = 0;
-    size_t processed_rows = src.num_of_defaults_in_prefix;
-
-    /// Find the first part of the column that intersects the range.
-    while (pos < src.data.size() && processed_rows + src.data[pos]->size() < start)
-    {
-        processed_rows += src.data[pos]->size();
-        ++pos;
-    }
-
-    /// Insert from the first part of column.
-    if (pos < src.data.size() && processed_rows < start)
-    {
-        size_t part_start = start - processed_rows;
-        size_t part_length = std::min(src.data[pos]->size() - part_start, end - start);
-        insert_from_part(src.data[pos], part_start, part_length);
-        processed_rows += src.data[pos]->size();
-        ++pos;
-    }
-
-    /// Insert from the parts of column in the middle of range.
-    while (pos < src.data.size() && processed_rows + src.data[pos]->size() < end)
-    {
-        insert_from_part(src.data[pos], 0, src.data[pos]->size());
-        processed_rows += src.data[pos]->size();
-        ++pos;
-    }
-
-    /// Insert from the last part of column if needed.
-    if (pos < src.data.size() && processed_rows < end)
-    {
-        size_t part_end = end - processed_rows;
-        insert_from_part(src.data[pos], 0, part_end);
-    }
-}
-
-bool ColumnObjectDeprecated::Subcolumn::isFinalized() const
-{
-    return num_of_defaults_in_prefix == 0 &&
-        (data.empty() || (data.size() == 1 && !data[0]->isSparse()));
-}
-
-void ColumnObjectDeprecated::Subcolumn::finalize()
-{
-    if (isFinalized())
-        return;
-
-    if (data.size() == 1 && num_of_defaults_in_prefix == 0)
-    {
-        data[0] = data[0]->convertToFullColumnIfSparse();
-        return;
-    }
-
-    const auto & to_type = least_common_type.get();
-    auto result_column = to_type->createColumn();
-
-    if (num_of_defaults_in_prefix)
-        result_column->insertManyDefaults(num_of_defaults_in_prefix);
-
-    for (auto & part : data)
-    {
-        part = part->convertToFullColumnIfSparse();
-        auto from_type = getDataTypeByColumn(*part);
-        size_t part_size = part->size();
-
-        if (!from_type->equals(*to_type))
-        {
-            auto offsets = ColumnUInt64::create();
-            auto & offsets_data = offsets->getData();
-
-            /// We need to convert only non-default values and then recreate column
-            /// with default value of new type, because default values (which represents misses in data)
-            /// may be inconsistent between types (e.g "0" in UInt64 and empty string in String).
-
-            part->getIndicesOfNonDefaultRows(offsets_data, 0, part_size);
-
-            if (offsets->size() == part_size)
-            {
-                part = castColumn({part, from_type, ""}, to_type);
-            }
-            else
-            {
-                auto values = part->index(*offsets, offsets->size());
-                values = castColumn({values, from_type, ""}, to_type);
-                part = values->createWithOffsets(offsets_data, *createColumnConstWithDefaultValue(result_column->getPtr()), part_size, /*shift=*/ 0);
-            }
-        }
-
-        result_column->insertRangeFrom(*part, 0, part_size);
-    }
-
-    data = { std::move(result_column) };
-    num_of_defaults_in_prefix = 0;
-}
-
-void ColumnObjectDeprecated::Subcolumn::insertDefault()
-{
-    if (data.empty())
-        ++num_of_defaults_in_prefix;
-    else
-        data.back()->insertDefault();
-
-    ++num_rows;
-}
-
-void ColumnObjectDeprecated::Subcolumn::insertManyDefaults(size_t length)
-{
-    if (data.empty())
-        num_of_defaults_in_prefix += length;
-    else
-        data.back()->insertManyDefaults(length);
-
-    num_rows += length;
-}
-
-void ColumnObjectDeprecated::Subcolumn::popBack(size_t n)
-{
-    assert(n <= size());
-
-    num_rows -= n;
-    size_t num_removed = 0;
-    for (auto it = data.rbegin(); it != data.rend(); ++it)
-    {
-        if (n == 0)
-            break;
-
-        auto & column = *it;
-        if (n < column->size())
-        {
-            column->popBack(n);
-            n = 0;
-        }
-        else
-        {
-            ++num_removed;
-            n -= column->size();
-        }
-    }
-
-    data.resize(data.size() - num_removed);
-    num_of_defaults_in_prefix -= n;
-}
-
-ColumnObjectDeprecated::Subcolumn ColumnObjectDeprecated::Subcolumn::cut(size_t start, size_t length) const
-{
-    Subcolumn new_subcolumn(0, is_nullable);
-    new_subcolumn.insertRangeFrom(*this, start, length);
-    return new_subcolumn;
-}
-
-Field ColumnObjectDeprecated::Subcolumn::getLastField() const
-{
-    if (data.empty())
-        return Field();
-
-    const auto & last_part = data.back();
-    assert(!last_part->empty());
-    return (*last_part)[last_part->size() - 1];
-}
-
-FieldInfo ColumnObjectDeprecated::Subcolumn::getFieldInfo() const
-{
-    const auto & base_type = least_common_type.getBase();
-    return FieldInfo
-    {
-        .scalar_type = base_type,
-        .have_nulls = base_type->isNullable(),
-        .need_convert = false,
-        .num_dimensions = least_common_type.getNumberOfDimensions(),
-        .need_fold_dimension = false,
-    };
-}
-
-ColumnObjectDeprecated::Subcolumn ColumnObjectDeprecated::Subcolumn::recreateWithDefaultValues(const FieldInfo & field_info) const
-{
-    auto scalar_type = field_info.scalar_type;
-    if (is_nullable)
-        scalar_type = makeNullable(scalar_type);
-
-    Subcolumn new_subcolumn(*this);
-    new_subcolumn.least_common_type = LeastCommonType{createArrayOfType(scalar_type, field_info.num_dimensions)};
-
-    for (auto & part : new_subcolumn.data)
-        part = recreateColumnWithDefaultValues(part, scalar_type, field_info.num_dimensions);
-
-    return new_subcolumn;
-}
-
-IColumn & ColumnObjectDeprecated::Subcolumn::getFinalizedColumn()
-{
-    assert(isFinalized());
-    return *data[0];
-}
-
-const IColumn & ColumnObjectDeprecated::Subcolumn::getFinalizedColumn() const
-{
-    assert(isFinalized());
-    return *data[0];
-}
-
-const ColumnPtr & ColumnObjectDeprecated::Subcolumn::getFinalizedColumnPtr() const
-{
-    assert(isFinalized());
-    return data[0];
-}
-
-ColumnObjectDeprecated::Subcolumn::LeastCommonType::LeastCommonType()
-    : type(std::make_shared<DataTypeNothing>())
-    , base_type(type)
-    , num_dimensions(0)
-{
-}
-
-ColumnObjectDeprecated::Subcolumn::LeastCommonType::LeastCommonType(DataTypePtr type_)
-    : type(std::move(type_))
-    , base_type(getBaseTypeOfArray(type))
-    , num_dimensions(DB::getNumberOfDimensions(*type))
-{
-}
-
-ColumnObjectDeprecated::ColumnObjectDeprecated(bool is_nullable_)
-    : is_nullable(is_nullable_)
-    , num_rows(0)
-{
-}
-
-ColumnObjectDeprecated::ColumnObjectDeprecated(Subcolumns && subcolumns_, bool is_nullable_)
-    : is_nullable(is_nullable_)
-    , subcolumns(std::move(subcolumns_))
-    , num_rows(subcolumns.empty() ? 0 : (*subcolumns.begin())->data.size())
-
-{
-    checkConsistency();
-}
-
-void ColumnObjectDeprecated::checkConsistency() const
-{
-    if (subcolumns.empty())
-        return;
-
-    for (const auto & leaf : subcolumns)
-    {
-        if (num_rows != leaf->data.size())
-        {
-            throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR, "Sizes of subcolumns are inconsistent in ColumnObjectDeprecated."
-                " Subcolumn '{}' has {} rows, but expected size is {}",
-                leaf->path.getPath(), leaf->data.size(), num_rows);
-        }
-    }
-}
-
-size_t ColumnObjectDeprecated::size() const
-{
-#ifndef NDEBUG
-    checkConsistency();
-#endif
-    return num_rows;
-}
-
-size_t ColumnObjectDeprecated::byteSize() const
-{
-    size_t res = 0;
-    for (const auto & entry : subcolumns)
-        res += entry->data.byteSize();
-    return res;
-}
-
-size_t ColumnObjectDeprecated::allocatedBytes() const
-{
-    size_t res = 0;
-    for (const auto & entry : subcolumns)
-        res += entry->data.allocatedBytes();
-    return res;
-}
-
-void ColumnObjectDeprecated::forEachSubcolumn(MutableColumnCallback callback)
-{
-    for (auto & entry : subcolumns)
-        for (auto & part : entry->data.data)
-            callback(part);
-}
-
-void ColumnObjectDeprecated::forEachSubcolumnRecursively(RecursiveMutableColumnCallback callback)
-{
-    for (auto & entry : subcolumns)
-    {
-        for (auto & part : entry->data.data)
-        {
-            callback(*part);
-            part->forEachSubcolumnRecursively(callback);
-        }
-    }
-}
-
-void ColumnObjectDeprecated::insert(const Field & field)
-{
-    const auto & object = field.safeGet<const Object &>();
-
-    HashSet<StringRef, StringRefHash> inserted_paths;
-    size_t old_size = size();
-    for (const auto & [key_str, value] : object)
-    {
-        PathInData key(key_str);
-        inserted_paths.insert(key_str);
-        if (!hasSubcolumn(key))
-            addSubcolumn(key, old_size);
-
-        auto & subcolumn = getSubcolumn(key);
-        subcolumn.insert(value);
-    }
-
-    for (auto & entry : subcolumns)
-    {
-        if (!inserted_paths.has(entry->path.getPath()))
-        {
-            bool inserted = tryInsertDefaultFromNested(entry);
-            if (!inserted)
-                entry->data.insertDefault();
-        }
-    }
-
-    ++num_rows;
-}
-
-bool ColumnObjectDeprecated::tryInsert(const Field & field)
-{
-    if (field.getType() != Field::Types::Which::Object)
-        return false;
-
-    insert(field);
-    return true;
-}
-
-void ColumnObjectDeprecated::insertDefault()
-{
-    for (auto & entry : subcolumns)
-        entry->data.insertDefault();
-
-    ++num_rows;
-}
-
-Field ColumnObjectDeprecated::operator[](size_t n) const
-{
-    Field object;
-    get(n, object);
-    return object;
-}
-
-void ColumnObjectDeprecated::get(size_t n, Field & res) const
-{
-    assert(n < size());
-    res = Object();
-    auto & object = res.safeGet<Object &>();
-
-    for (const auto & entry : subcolumns)
-    {
-        auto it = object.try_emplace(entry->path.getPath()).first;
-        entry->data.get(n, it->second);
-    }
-}
-
-#if !defined(DEBUG_OR_SANITIZER_BUILD)
-void ColumnObjectDeprecated::insertFrom(const IColumn & src, size_t n)
-#else
-void ColumnObjectDeprecated::doInsertFrom(const IColumn & src, size_t n)
-#endif
-{
-    insert(src[n]);
-}
-
-#if !defined(DEBUG_OR_SANITIZER_BUILD)
-void ColumnObjectDeprecated::insertRangeFrom(const IColumn & src, size_t start, size_t length)
-#else
-void ColumnObjectDeprecated::doInsertRangeFrom(const IColumn & src, size_t start, size_t length)
-#endif
-{
-    const auto & src_object = assert_cast<const ColumnObjectDeprecated &>(src);
-
-    for (const auto & entry : src_object.subcolumns)
-    {
-        if (!hasSubcolumn(entry->path))
-        {
-            if (entry->path.hasNested())
-                addNestedSubcolumn(entry->path, entry->data.getFieldInfo(), num_rows);
-            else
-                addSubcolumn(entry->path, num_rows);
-        }
-
-        auto & subcolumn = getSubcolumn(entry->path);
-        subcolumn.insertRangeFrom(entry->data, start, length);
-    }
-
-    for (auto & entry : subcolumns)
-    {
-        if (!src_object.hasSubcolumn(entry->path))
-        {
-            bool inserted = tryInsertManyDefaultsFromNested(entry);
-            if (!inserted)
-                entry->data.insertManyDefaults(length);
-        }
-    }
-
-    num_rows += length;
-    finalize();
-}
-
-void ColumnObjectDeprecated::popBack(size_t length)
-{
-    for (auto & entry : subcolumns)
-        entry->data.popBack(length);
-
-    num_rows -= length;
-}
-
-template <typename Func>
-MutableColumnPtr ColumnObjectDeprecated::applyForSubcolumns(Func && func) const
-{
-    if (!isFinalized())
-    {
-        auto finalized = cloneFinalized();
-        auto & finalized_object = assert_cast<ColumnObjectDeprecated &>(*finalized);
-        return finalized_object.applyForSubcolumns(std::forward<Func>(func));
-    }
-
-    auto res = ColumnObjectDeprecated::create(is_nullable);
-    for (const auto & subcolumn : subcolumns)
-    {
-        auto new_subcolumn = func(subcolumn->data.getFinalizedColumn());
-        res->addSubcolumn(subcolumn->path, new_subcolumn->assumeMutable());
-    }
-
-    return res;
-}
-
-ColumnPtr ColumnObjectDeprecated::permute(const Permutation & perm, size_t limit) const
-{
-    return applyForSubcolumns([&](const auto & subcolumn) { return subcolumn.permute(perm, limit); });
-}
-
-ColumnPtr ColumnObjectDeprecated::filter(const Filter & filter, ssize_t result_size_hint) const
-{
-    return applyForSubcolumns([&](const auto & subcolumn) { return subcolumn.filter(filter, result_size_hint); });
-}
-
-ColumnPtr ColumnObjectDeprecated::index(const IColumn & indexes, size_t limit) const
-{
-    return applyForSubcolumns([&](const auto & subcolumn) { return subcolumn.index(indexes, limit); });
-}
-
-ColumnPtr ColumnObjectDeprecated::replicate(const Offsets & offsets) const
-{
-    return applyForSubcolumns([&](const auto & subcolumn) { return subcolumn.replicate(offsets); });
-}
-
-MutableColumnPtr ColumnObjectDeprecated::cloneResized(size_t new_size) const
-{
-    if (new_size == 0)
-        return ColumnObjectDeprecated::create(is_nullable);
-
-    return applyForSubcolumns([&](const auto & subcolumn) { return subcolumn.cloneResized(new_size); });
-}
-
-void ColumnObjectDeprecated::getPermutation(PermutationSortDirection, PermutationSortStability, size_t, int, Permutation & res) const
-{
-    res.resize(num_rows);
-    iota(res.data(), res.size(), size_t(0));
-}
-
-void ColumnObjectDeprecated::getExtremes(Field & min, Field & max) const
-{
-    if (num_rows == 0)
-    {
-        min = Object();
-        max = Object();
-    }
-    else
-    {
-        get(0, min);
-        get(0, max);
-    }
-}
-
-const ColumnObjectDeprecated::Subcolumn & ColumnObjectDeprecated::getSubcolumn(const PathInData & key) const
-{
-    if (const auto * node = subcolumns.findLeaf(key))
-        return node->data;
-
-    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "There is no subcolumn {} in ColumnObjectDeprecated", key.getPath());
-}
-
-ColumnObjectDeprecated::Subcolumn & ColumnObjectDeprecated::getSubcolumn(const PathInData & key)
-{
-    if (const auto * node = subcolumns.findLeaf(key))
-        return const_cast<Subcolumns::Node *>(node)->data;
-
-    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "There is no subcolumn {} in ColumnObjectDeprecated", key.getPath());
-}
-
-bool ColumnObjectDeprecated::hasSubcolumn(const PathInData & key) const
-{
-    return subcolumns.findLeaf(key) != nullptr;
-}
-
-void ColumnObjectDeprecated::addSubcolumn(const PathInData & key, MutableColumnPtr && subcolumn)
-{
-    size_t new_size = subcolumn->size();
-    bool inserted = subcolumns.add(key, Subcolumn(std::move(subcolumn), is_nullable));
-
-    if (!inserted)
-        throw Exception(ErrorCodes::DUPLICATE_COLUMN, "Subcolumn '{}' already exists", key.getPath());
-
-    if (num_rows == 0)
-        num_rows = new_size;
-    else if (new_size != num_rows)
-        throw Exception(ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH,
-            "Size of subcolumn {} ({}) is inconsistent with column size ({})",
-            key.getPath(), new_size, num_rows);
-}
-
-void ColumnObjectDeprecated::addSubcolumn(const PathInData & key, size_t new_size)
-{
-    bool inserted = subcolumns.add(key, Subcolumn(new_size, is_nullable));
-    if (!inserted)
-        throw Exception(ErrorCodes::DUPLICATE_COLUMN, "Subcolumn '{}' already exists", key.getPath());
-
-    if (num_rows == 0)
-        num_rows = new_size;
-    else if (new_size != num_rows)
-        throw Exception(ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH,
-            "Required size of subcolumn {} ({}) is inconsistent with column size ({})",
-            key.getPath(), new_size, num_rows);
-}
-
-void ColumnObjectDeprecated::addNestedSubcolumn(const PathInData & key, const FieldInfo & field_info, size_t new_size)
-{
-    if (!key.hasNested())
-        throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR,
-            "Cannot add Nested subcolumn, because path doesn't contain Nested");
-
-    bool inserted = false;
-    /// We find node that represents the same Nested type as @key.
-    const auto * nested_node = subcolumns.findBestMatch(key);
-
-    if (nested_node)
-    {
-        /// Find any leaf of Nested subcolumn.
-        const auto * leaf = Subcolumns::findLeaf(nested_node, [&](const auto &) { return true; });
-        assert(leaf);
-
-        /// Recreate subcolumn with default values and the same sizes of arrays.
-        auto new_subcolumn = leaf->data.recreateWithDefaultValues(field_info);
-
-        /// It's possible that we have already inserted value from current row
-        /// to this subcolumn. So, adjust size to expected.
-        if (new_subcolumn.size() > new_size)
-            new_subcolumn.popBack(new_subcolumn.size() - new_size);
-
-        assert(new_subcolumn.size() == new_size);
-        inserted = subcolumns.add(key, new_subcolumn);
-    }
-    else
-    {
-        /// If node was not found just add subcolumn with empty arrays.
-        inserted = subcolumns.add(key, Subcolumn(new_size, is_nullable));
-    }
-
-    if (!inserted)
-        throw Exception(ErrorCodes::DUPLICATE_COLUMN, "Subcolumn '{}' already exists", key.getPath());
-
-    if (num_rows == 0)
-        num_rows = new_size;
-    else if (new_size != num_rows)
-        throw Exception(ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH,
-            "Required size of subcolumn {} ({}) is inconsistent with column size ({})",
-            key.getPath(), new_size, num_rows);
-}
-
-const ColumnObjectDeprecated::Subcolumns::Node * ColumnObjectDeprecated::getLeafOfTheSameNested(const Subcolumns::NodePtr & entry) const
-{
-    if (!entry->path.hasNested())
-        return nullptr;
-
-    size_t old_size = entry->data.size();
-    const auto * current_node = subcolumns.findLeaf(entry->path);
-    const Subcolumns::Node * leaf = nullptr;
-
-    while (current_node)
-    {
-        /// Try to find the first Nested up to the current node.
-        const auto * node_nested = Subcolumns::findParent(current_node,
-            [](const auto & candidate) { return candidate.isNested(); });
-
-        if (!node_nested)
-            break;
-
-        /// Find the leaf with subcolumn that contains values
-        /// 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,
-            [&](const auto & candidate)
-            {
-                return candidate.data.size() > old_size;
-            });
-
-        if (leaf)
-            break;
-
-        current_node = node_nested->parent;
-    }
-
-    if (leaf && isNothing(leaf->data.getLeastCommonTypeBase()))
-        return nullptr;
-
-    return leaf;
-}
-
-bool ColumnObjectDeprecated::tryInsertManyDefaultsFromNested(const Subcolumns::NodePtr & entry) const
-{
-    const auto * leaf = getLeafOfTheSameNested(entry);
-    if (!leaf)
-        return false;
-
-    size_t old_size = entry->data.size();
-    auto field_info = entry->data.getFieldInfo();
-
-    /// Cut the needed range from the found leaf
-    /// and replace scalar values to the correct
-    /// default values for given entry.
-    auto new_subcolumn = leaf->data
-        .cut(old_size, leaf->data.size() - old_size)
-        .recreateWithDefaultValues(field_info);
-
-    entry->data.insertRangeFrom(new_subcolumn, 0, new_subcolumn.size());
-    return true;
-}
-
-bool ColumnObjectDeprecated::tryInsertDefaultFromNested(const Subcolumns::NodePtr & entry) const
-{
-    const auto * leaf = getLeafOfTheSameNested(entry);
-    if (!leaf)
-        return false;
-
-    auto last_field = leaf->data.getLastField();
-    if (last_field.isNull())
-        return false;
-
-    size_t leaf_num_dimensions = leaf->data.getNumberOfDimensions();
-    size_t entry_num_dimensions = entry->data.getNumberOfDimensions();
-
-    auto default_scalar = entry_num_dimensions > leaf_num_dimensions
-        ? createEmptyArrayField(entry_num_dimensions - leaf_num_dimensions)
-        : entry->data.getLeastCommonTypeBase()->getDefault();
-
-    auto default_field = applyVisitor(FieldVisitorReplaceScalars(default_scalar, leaf_num_dimensions), last_field);
-    entry->data.insert(std::move(default_field));
-    return true;
-}
-
-PathsInData ColumnObjectDeprecated::getKeys() const
-{
-    PathsInData keys;
-    keys.reserve(subcolumns.size());
-    for (const auto & entry : subcolumns)
-        keys.emplace_back(entry->path);
-    return keys;
-}
-
-bool ColumnObjectDeprecated::isFinalized() const
-{
-    return std::all_of(subcolumns.begin(), subcolumns.end(),
-        [](const auto & entry) { return entry->data.isFinalized(); });
-}
-
-void ColumnObjectDeprecated::finalize()
-{
-    size_t old_size = size();
-    Subcolumns new_subcolumns;
-    for (auto && entry : subcolumns)
-    {
-        const auto & least_common_type = entry->data.getLeastCommonType();
-
-        /// Do not add subcolumns, which consist only from NULLs.
-        if (isNothing(getBaseTypeOfArray(least_common_type)))
-            continue;
-
-        entry->data.finalize();
-        new_subcolumns.add(entry->path, entry->data);
-    }
-
-    /// If all subcolumns were skipped add a dummy subcolumn,
-    /// because Tuple type must have at least one element.
-    if (new_subcolumns.empty())
-        new_subcolumns.add(PathInData{COLUMN_NAME_DUMMY}, Subcolumn{ColumnUInt8::create(old_size, 0), is_nullable});
-
-    std::swap(subcolumns, new_subcolumns);
-    checkObjectHasNoAmbiguosPaths(getKeys());
-}
-
-void ColumnObjectDeprecated::updateHashFast(SipHash & hash) const
-{
-    for (const auto & entry : subcolumns)
-        for (auto & part : entry->data.data)
-            part->updateHashFast(hash);
-}
-
-}
diff --git a/src/Columns/ColumnObjectDeprecated.h b/src/Columns/ColumnObjectDeprecated.h
deleted file mode 100644
index 29e2d8f0709..00000000000
--- a/src/Columns/ColumnObjectDeprecated.h
+++ /dev/null
@@ -1,275 +0,0 @@
-#pragma once
-
-#include <Columns/IColumn.h>
-#include <Core/Field.h>
-#include <Core/Names.h>
-#include <DataTypes/Serializations/SubcolumnsTree.h>
-#include <Common/PODArray.h>
-#include <Common/WeakHash.h>
-
-#include <DataTypes/IDataType.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-/// Info that represents a scalar or array field in a decomposed view.
-/// It allows to recreate field with different number
-/// of dimensions or nullability.
-struct FieldInfo
-{
-    /// The common type of of all scalars in field.
-    DataTypePtr scalar_type;
-
-    /// Do we have NULL scalar in field.
-    bool have_nulls;
-
-    /// If true then we have scalars with different types in array and
-    /// we need to convert scalars to the common type.
-    bool need_convert;
-
-    /// Number of dimension in array. 0 if field is scalar.
-    size_t num_dimensions;
-
-    /// If true then this field is an array of variadic dimension field
-    /// and we need to normalize the dimension
-    bool need_fold_dimension;
-};
-
-FieldInfo getFieldInfo(const Field & field);
-
-/** A column that represents object with dynamic set of subcolumns.
- *  Subcolumns are identified by paths in document and are stored in
- *  a trie-like structure. ColumnObjectDeprecated is not suitable for writing into tables
- *  and it should be converted to Tuple with fixed set of subcolumns before that.
- */
-class ColumnObjectDeprecated final : public COWHelper<IColumnHelper<ColumnObjectDeprecated>, ColumnObjectDeprecated>
-{
-public:
-    /** Class that represents one subcolumn.
-     * It stores values in several parts of column
-     * and keeps current common type of all parts.
-     * We add a new column part with a new type, when we insert a field,
-     * which can't be converted to the current common type.
-     * After insertion of all values subcolumn should be finalized
-     * for writing and other operations.
-     */
-    class Subcolumn
-    {
-    public:
-        Subcolumn() = default;
-        Subcolumn(size_t size_, bool is_nullable_);
-        Subcolumn(MutableColumnPtr && data_, bool is_nullable_);
-
-        size_t size() const;
-        size_t byteSize() const;
-        size_t allocatedBytes() const;
-        void get(size_t n, Field & res) const;
-
-        bool isFinalized() const;
-        const DataTypePtr & getLeastCommonType() const { return least_common_type.get(); }
-        const DataTypePtr & getLeastCommonTypeBase() const { return least_common_type.getBase(); }
-        size_t getNumberOfDimensions() const { return least_common_type.getNumberOfDimensions(); }
-
-        /// Checks the consistency of column's parts stored in @data.
-        void checkTypes() const;
-
-        /// Inserts a field, which scalars can be arbitrary, but number of
-        /// dimensions should be consistent with current common type.
-        void insert(Field field);
-        void insert(Field field, FieldInfo info);
-
-        void insertDefault();
-        void insertManyDefaults(size_t length);
-        void insertRangeFrom(const Subcolumn & src, size_t start, size_t length);
-        void popBack(size_t n);
-
-        Subcolumn cut(size_t start, size_t length) const;
-
-        /// Converts all column's parts to the common type and
-        /// creates a single column that stores all values.
-        void finalize();
-
-        /// Returns last inserted field.
-        Field getLastField() const;
-
-        FieldInfo getFieldInfo() const;
-
-        /// Recreates subcolumn with default scalar values and keeps sizes of arrays.
-        /// Used to create columns of type Nested with consistent array sizes.
-        Subcolumn recreateWithDefaultValues(const FieldInfo & field_info) const;
-
-        /// Returns single column if subcolumn in finalizes.
-        /// Otherwise -- undefined behaviour.
-        IColumn & getFinalizedColumn();
-        const IColumn & getFinalizedColumn() const;
-        const ColumnPtr & getFinalizedColumnPtr() const;
-
-        const std::vector<WrappedPtr> & getData() const { return data; }
-        size_t getNumberOfDefaultsInPrefix() const { return num_of_defaults_in_prefix; }
-
-        friend class ColumnObjectDeprecated;
-
-    private:
-        class LeastCommonType
-        {
-        public:
-            LeastCommonType();
-            explicit LeastCommonType(DataTypePtr type_);
-
-            const DataTypePtr & get() const { return type; }
-            const DataTypePtr & getBase() const { return base_type; }
-            size_t getNumberOfDimensions() const { return num_dimensions; }
-
-        private:
-            DataTypePtr type;
-            DataTypePtr base_type;
-            size_t num_dimensions = 0;
-        };
-
-        void addNewColumnPart(DataTypePtr type);
-
-        /// Current least common type of all values inserted to this subcolumn.
-        LeastCommonType least_common_type;
-
-        /// If true then common type type of subcolumn is Nullable
-        /// and default values are NULLs.
-        bool is_nullable = false;
-
-        /// Parts of column. Parts should be in increasing order in terms of subtypes/supertypes.
-        /// That means that the least common type for i-th prefix is the type of i-th part
-        /// and it's the supertype for all type of column from 0 to i-1.
-        std::vector<WrappedPtr> data;
-
-        /// Until we insert any non-default field we don't know further
-        /// least common type and we count number of defaults in prefix,
-        /// which will be converted to the default type of final common type.
-        size_t num_of_defaults_in_prefix = 0;
-
-        size_t num_rows = 0;
-    };
-
-    using Subcolumns = SubcolumnsTree<Subcolumn>;
-
-private:
-    /// If true then all subcolumns are nullable.
-    const bool is_nullable;
-
-    Subcolumns subcolumns;
-    size_t num_rows;
-
-public:
-    static constexpr auto COLUMN_NAME_DUMMY = "_dummy";
-
-    explicit ColumnObjectDeprecated(bool is_nullable_);
-    ColumnObjectDeprecated(Subcolumns && subcolumns_, bool is_nullable_);
-
-    /// Checks that all subcolumns have consistent sizes.
-    void checkConsistency() const;
-
-    bool hasSubcolumn(const PathInData & key) const;
-
-    const Subcolumn & getSubcolumn(const PathInData & key) const;
-    Subcolumn & getSubcolumn(const PathInData & key);
-
-    void incrementNumRows() { ++num_rows; }
-
-    /// Adds a subcolumn from existing IColumn.
-    void addSubcolumn(const PathInData & key, MutableColumnPtr && subcolumn);
-
-    /// Adds a subcolumn of specific size with default values.
-    void addSubcolumn(const PathInData & key, size_t new_size);
-
-    /// Adds a subcolumn of type Nested of specific size with default values.
-    /// It cares about consistency of sizes of Nested arrays.
-    void addNestedSubcolumn(const PathInData & key, const FieldInfo & field_info, size_t new_size);
-
-    /// Finds a subcolumn from the same Nested type as @entry and inserts
-    /// an array with default values with consistent sizes as in Nested type.
-    bool tryInsertDefaultFromNested(const Subcolumns::NodePtr & entry) const;
-    bool tryInsertManyDefaultsFromNested(const Subcolumns::NodePtr & entry) const;
-
-    const Subcolumns & getSubcolumns() const { return subcolumns; }
-    Subcolumns & getSubcolumns() { return subcolumns; }
-    PathsInData getKeys() const;
-
-    /// Part of interface
-
-    const char * getFamilyName() const override { return "Object"; }
-    TypeIndex getDataType() const override { return TypeIndex::ObjectDeprecated; }
-
-    size_t size() const override;
-    size_t byteSize() const override;
-    size_t allocatedBytes() const override;
-    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;
-#if !defined(DEBUG_OR_SANITIZER_BUILD)
-    void insertFrom(const IColumn & src, size_t n) override;
-    void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
-#else
-    void doInsertFrom(const IColumn & src, size_t n) override;
-    void doInsertRangeFrom(const IColumn & src, size_t start, size_t length) override;
-#endif
-    void popBack(size_t length) override;
-    Field operator[](size_t n) const override;
-    void get(size_t n, Field & res) const override;
-
-    ColumnPtr permute(const Permutation & perm, size_t limit) const override;
-    ColumnPtr filter(const Filter & filter, ssize_t result_size_hint) const override;
-    ColumnPtr index(const IColumn & indexes, size_t limit) const override;
-    ColumnPtr replicate(const Offsets & offsets) const override;
-    MutableColumnPtr cloneResized(size_t new_size) const override;
-
-    /// Finalizes all subcolumns.
-    void finalize() override;
-    bool isFinalized() const override;
-
-    /// Order of rows in ColumnObjectDeprecated is undefined.
-    void getPermutation(PermutationSortDirection, PermutationSortStability, size_t, int, Permutation & res) const override;
-    void updatePermutation(PermutationSortDirection, PermutationSortStability, size_t, int, Permutation &, EqualRanges &) const override {}
-#if !defined(DEBUG_OR_SANITIZER_BUILD)
-    int compareAt(size_t, size_t, const IColumn &, int) const override { return 0; }
-#else
-    int doCompareAt(size_t, size_t, const IColumn &, int) const override { return 0; }
-#endif
-    void getExtremes(Field & min, Field & max) const 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 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(); }
-    WeakHash32 getWeakHash32() const override { throwMustBeConcrete(); }
-    void updateHashFast(SipHash &) const override;
-    void expand(const Filter &, bool) override { throwMustBeConcrete(); }
-    bool hasEqualValues() const override { throwMustBeConcrete(); }
-    size_t byteSizeAt(size_t) const override { throwMustBeConcrete(); }
-    double getRatioOfDefaultRows(double) const override { throwMustBeConcrete(); }
-    UInt64 getNumberOfDefaultRows() const override { throwMustBeConcrete(); }
-    void getIndicesOfNonDefaultRows(Offsets &, size_t, size_t) const override { throwMustBeConcrete(); }
-
-private:
-    [[noreturn]] static void throwMustBeConcrete()
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "ColumnObjectDeprecated must be converted to ColumnTuple before use");
-    }
-
-    template <typename Func>
-    MutableColumnPtr applyForSubcolumns(Func && func) const;
-
-    /// It's used to get shared sized of Nested to insert correct default values.
-    const Subcolumns::Node * getLeafOfTheSameNested(const Subcolumns::NodePtr & entry) const;
-};
-}
diff --git a/src/Columns/ColumnString.cpp b/src/Columns/ColumnString.cpp
index 00cf3bd9c30..7cfa2571f5a 100644
--- a/src/Columns/ColumnString.cpp
+++ b/src/Columns/ColumnString.cpp
@@ -557,26 +557,6 @@ void ColumnString::reserve(size_t n)
     offsets.reserve_exact(n);
 }
 
-size_t ColumnString::capacity() const
-{
-    return offsets.capacity();
-}
-
-void ColumnString::prepareForSquashing(const Columns & source_columns)
-{
-    size_t new_size = size();
-    size_t new_chars_size = chars.size();
-    for (const auto & source_column : source_columns)
-    {
-        const auto & source_string_column = assert_cast<const ColumnString &>(*source_column);
-        new_size += source_string_column.size();
-        new_chars_size += source_string_column.chars.size();
-    }
-
-    offsets.reserve_exact(new_size);
-    chars.reserve_exact(new_chars_size);
-}
-
 void ColumnString::shrinkToFit()
 {
     chars.shrink_to_fit();
diff --git a/src/Columns/ColumnString.h b/src/Columns/ColumnString.h
index ec0563b3f00..c1012e1e55e 100644
--- a/src/Columns/ColumnString.h
+++ b/src/Columns/ColumnString.h
@@ -123,7 +123,7 @@ public:
 
     void insert(const Field & x) override
     {
-        const String & s = x.safeGet<const String &>();
+        const String & s = x.get<const String &>();
         const size_t old_size = chars.size();
         const size_t size_to_append = s.size() + 1;
         const size_t new_size = old_size + size_to_append;
@@ -283,8 +283,6 @@ public:
     ColumnPtr compress() const override;
 
     void reserve(size_t n) override;
-    size_t capacity() const override;
-    void prepareForSquashing(const Columns & source_columns) override;
     void shrinkToFit() override;
 
     void getExtremes(Field & min, Field & max) const override;
diff --git a/src/Columns/ColumnTuple.cpp b/src/Columns/ColumnTuple.cpp
index e741eb51c68..4fc3f88a87c 100644
--- a/src/Columns/ColumnTuple.cpp
+++ b/src/Columns/ColumnTuple.cpp
@@ -141,7 +141,7 @@ void ColumnTuple::get(size_t n, Field & res) const
     const size_t tuple_size = columns.size();
 
     res = Tuple();
-    Tuple & res_tuple = res.safeGet<Tuple &>();
+    Tuple & res_tuple = res.get<Tuple &>();
     res_tuple.reserve(tuple_size);
 
     for (size_t i = 0; i < tuple_size; ++i)
@@ -169,7 +169,7 @@ void ColumnTuple::insertData(const char *, size_t)
 
 void ColumnTuple::insert(const Field & x)
 {
-    const auto & tuple = x.safeGet<const Tuple &>();
+    const auto & tuple = x.get<const Tuple &>();
 
     const size_t tuple_size = columns.size();
     if (tuple.size() != tuple_size)
@@ -185,7 +185,7 @@ bool ColumnTuple::tryInsert(const Field & x)
     if (x.getType() != Field::Types::Which::Tuple)
         return false;
 
-    const auto & tuple = x.safeGet<const Tuple &>();
+    const auto & tuple = x.get<const Tuple &>();
 
     const size_t tuple_size = columns.size();
     if (tuple.size() != tuple_size)
@@ -595,27 +595,6 @@ void ColumnTuple::reserve(size_t n)
         getColumn(i).reserve(n);
 }
 
-size_t ColumnTuple::capacity() const
-{
-    if (columns.empty())
-        return size();
-
-    return getColumn(0).capacity();
-}
-
-void ColumnTuple::prepareForSquashing(const Columns & source_columns)
-{
-    const size_t tuple_size = columns.size();
-    for (size_t i = 0; i < tuple_size; ++i)
-    {
-        Columns nested_columns;
-        nested_columns.reserve(source_columns.size());
-        for (const auto & source_column : source_columns)
-            nested_columns.push_back(assert_cast<const ColumnTuple &>(*source_column).getColumnPtr(i));
-        getColumn(i).prepareForSquashing(nested_columns);
-    }
-}
-
 void ColumnTuple::shrinkToFit()
 {
     const size_t tuple_size = columns.size();
diff --git a/src/Columns/ColumnTuple.h b/src/Columns/ColumnTuple.h
index 6968294aef9..16b47a993f6 100644
--- a/src/Columns/ColumnTuple.h
+++ b/src/Columns/ColumnTuple.h
@@ -110,8 +110,6 @@ 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;
-    size_t capacity() const override;
-    void prepareForSquashing(const Columns & source_columns) override;
     void shrinkToFit() override;
     void ensureOwnership() override;
     size_t byteSize() const override;
diff --git a/src/Columns/ColumnUnique.h b/src/Columns/ColumnUnique.h
index 8a66f4e02ed..d6cb75679be 100644
--- a/src/Columns/ColumnUnique.h
+++ b/src/Columns/ColumnUnique.h
@@ -48,8 +48,6 @@ private:
     ColumnUnique(const ColumnUnique & other);
 
 public:
-    std::string getName() const override { return "Unique(" + getNestedColumn()->getName() + ")"; }
-
     MutableColumnPtr cloneEmpty() const override;
 
     const ColumnPtr & getNestedColumn() const override;
diff --git a/src/Columns/ColumnVariant.cpp b/src/Columns/ColumnVariant.cpp
index c6511695f5c..47158758e1f 100644
--- a/src/Columns/ColumnVariant.cpp
+++ b/src/Columns/ColumnVariant.cpp
@@ -476,7 +476,7 @@ void ColumnVariant::insertFromImpl(const DB::IColumn & src_, size_t n, const std
     }
 }
 
-void ColumnVariant::insertRangeFromImpl(const DB::IColumn & src_, size_t start, size_t length, const std::vector<ColumnVariant::Discriminator> * global_discriminators_mapping, const Discriminator * skip_discriminator)
+void ColumnVariant::insertRangeFromImpl(const DB::IColumn & src_, size_t start, size_t length, const std::vector<ColumnVariant::Discriminator> * global_discriminators_mapping)
 {
     const size_t num_variants = variants.size();
     const auto & src = assert_cast<const ColumnVariant &>(src_);
@@ -557,12 +557,9 @@ void ColumnVariant::insertRangeFromImpl(const DB::IColumn & src_, size_t start,
         Discriminator global_discr = src_global_discr;
         if (global_discriminators_mapping && src_global_discr != NULL_DISCRIMINATOR)
             global_discr = (*global_discriminators_mapping)[src_global_discr];
-        if (!skip_discriminator || global_discr != *skip_discriminator)
-        {
-            Discriminator local_discr = localDiscriminatorByGlobal(global_discr);
-            if (nested_length)
-                variants[local_discr]->insertRangeFrom(*src.variants[src_local_discr], nested_start, nested_length);
-        }
+        Discriminator local_discr = localDiscriminatorByGlobal(global_discr);
+        if (nested_length)
+            variants[local_discr]->insertRangeFrom(*src.variants[src_local_discr], nested_start, nested_length);
     }
 }
 
@@ -613,7 +610,7 @@ void ColumnVariant::insertRangeFrom(const IColumn & src_, size_t start, size_t l
 void ColumnVariant::doInsertRangeFrom(const IColumn & src_, size_t start, size_t length)
 #endif
 {
-    insertRangeFromImpl(src_, start, length, nullptr, nullptr);
+    insertRangeFromImpl(src_, start, length, nullptr);
 }
 
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
@@ -630,9 +627,9 @@ void ColumnVariant::insertFrom(const DB::IColumn & src_, size_t n, const std::ve
     insertFromImpl(src_, n, &global_discriminators_mapping);
 }
 
-void ColumnVariant::insertRangeFrom(const IColumn & src_, size_t start, size_t length, const std::vector<ColumnVariant::Discriminator> & global_discriminators_mapping, Discriminator skip_discriminator)
+void ColumnVariant::insertRangeFrom(const IColumn & src_, size_t start, size_t length, const std::vector<ColumnVariant::Discriminator> & global_discriminators_mapping)
 {
-    insertRangeFromImpl(src_, start, length, &global_discriminators_mapping, &skip_discriminator);
+    insertRangeFromImpl(src_, start, length, &global_discriminators_mapping);
 }
 
 void ColumnVariant::insertManyFrom(const DB::IColumn & src_, size_t position, size_t length, const std::vector<ColumnVariant::Discriminator> & global_discriminators_mapping)
@@ -676,14 +673,6 @@ void ColumnVariant::insertManyIntoVariantFrom(DB::ColumnVariant::Discriminator g
     variants[local_discr]->insertManyFrom(src_, position, length);
 }
 
-void ColumnVariant::deserializeBinaryIntoVariant(ColumnVariant::Discriminator global_discr, const SerializationPtr & serialization, ReadBuffer & buf, const FormatSettings & format_settings)
-{
-    auto local_discr = localDiscriminatorByGlobal(global_discr);
-    serialization->deserializeBinary(*variants[local_discr], buf, format_settings);
-    getLocalDiscriminators().push_back(local_discr);
-    getOffsets().push_back(variants[local_discr]->size() - 1);
-}
-
 void ColumnVariant::insertDefault()
 {
     getLocalDiscriminators().push_back(NULL_DISCRIMINATOR);
@@ -1232,7 +1221,9 @@ struct ColumnVariant::ComparatorBase
 
     ALWAYS_INLINE int compare(size_t lhs, size_t rhs) const
     {
-        return parent.compareAt(lhs, rhs, parent, nan_direction_hint);
+        int res = parent.compareAt(lhs, rhs, parent, nan_direction_hint);
+
+        return res;
     }
 };
 
@@ -1264,30 +1255,8 @@ void ColumnVariant::updatePermutation(IColumn::PermutationSortDirection directio
 
 void ColumnVariant::reserve(size_t n)
 {
-    getLocalDiscriminators().reserve_exact(n);
-    getOffsets().reserve_exact(n);
-}
-
-void ColumnVariant::prepareForSquashing(const Columns & source_columns)
-{
-    size_t new_size = size();
-    for (const auto & source_column : source_columns)
-        new_size += source_column->size();
-    reserve(new_size);
-
-    for (size_t i = 0; i != variants.size(); ++i)
-    {
-        Columns source_variant_columns;
-        source_variant_columns.reserve(source_columns.size());
-        for (const auto & source_column : source_columns)
-            source_variant_columns.push_back(assert_cast<const ColumnVariant &>(*source_column).getVariantPtrByGlobalDiscriminator(i));
-        getVariantByGlobalDiscriminator(i).prepareForSquashing(source_variant_columns);
-    }
-}
-
-size_t ColumnVariant::capacity() const
-{
-    return local_discriminators->capacity();
+    local_discriminators->reserve(n);
+    offsets->reserve(n);
 }
 
 void ColumnVariant::ensureOwnership()
diff --git a/src/Columns/ColumnVariant.h b/src/Columns/ColumnVariant.h
index 925eab74af8..34c24b5428d 100644
--- a/src/Columns/ColumnVariant.h
+++ b/src/Columns/ColumnVariant.h
@@ -2,8 +2,6 @@
 
 #include <Columns/IColumn.h>
 #include <Columns/ColumnVector.h>
-#include <Formats/FormatSettings.h>
-#include <DataTypes/Serializations/ISerialization.h>
 
 
 namespace DB
@@ -198,15 +196,13 @@ public:
 
     /// Methods for insertion from another Variant but with known mapping between global discriminators.
     void insertFrom(const IColumn & src_, size_t n, const std::vector<ColumnVariant::Discriminator> & global_discriminators_mapping);
-    /// Don't insert data into variant with skip_discriminator global discriminator, it will be processed separately.
-    void insertRangeFrom(const IColumn & src_, size_t start, size_t length, const std::vector<ColumnVariant::Discriminator> & global_discriminators_mapping, Discriminator skip_discriminator);
+    void insertRangeFrom(const IColumn & src_, size_t start, size_t length, const std::vector<ColumnVariant::Discriminator> & global_discriminators_mapping);
     void insertManyFrom(const IColumn & src_, size_t position, size_t length, const std::vector<ColumnVariant::Discriminator> & global_discriminators_mapping);
 
     /// Methods for insertion into a specific variant.
     void insertIntoVariantFrom(Discriminator global_discr, const IColumn & src_, size_t n);
     void insertRangeIntoVariantFrom(Discriminator global_discr, const IColumn & src_, size_t start, size_t length);
     void insertManyIntoVariantFrom(Discriminator global_discr, const IColumn & src_, size_t position, size_t length);
-    void deserializeBinaryIntoVariant(Discriminator global_discr, const SerializationPtr & serialization, ReadBuffer & buf, const FormatSettings & format_settings);
 
     void insertDefault() override;
     void insertManyDefaults(size_t length) override;
@@ -241,8 +237,6 @@ public:
                            size_t limit, int nan_direction_hint, IColumn::Permutation & res, EqualRanges & equal_ranges) const override;
 
     void reserve(size_t n) override;
-    size_t capacity() const override;
-    void prepareForSquashing(const Columns & source_columns) override;
     void ensureOwnership() override;
     size_t byteSize() const override;
     size_t byteSizeAt(size_t n) const override;
@@ -269,7 +263,6 @@ public:
     ColumnPtr & getVariantPtrByGlobalDiscriminator(size_t discr) { return variants[global_to_local_discriminators.at(discr)]; }
 
     const NestedColumns & getVariants() const { return variants; }
-    NestedColumns & getVariants() { return variants; }
 
     const IColumn & getLocalDiscriminatorsColumn() const { return *local_discriminators; }
     IColumn & getLocalDiscriminatorsColumn() { return *local_discriminators; }
@@ -309,8 +302,6 @@ public:
         return true;
     }
 
-    std::vector<Discriminator> getLocalToGlobalDiscriminatorsMapping() const { return local_to_global_discriminators; }
-
     /// 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;
@@ -331,7 +322,7 @@ public:
 
 private:
     void insertFromImpl(const IColumn & src_, size_t n, const std::vector<ColumnVariant::Discriminator> * global_discriminators_mapping);
-    void insertRangeFromImpl(const IColumn & src_, size_t start, size_t length, const std::vector<ColumnVariant::Discriminator> * global_discriminators_mapping, const Discriminator * skip_discriminator);
+    void insertRangeFromImpl(const IColumn & src_, size_t start, size_t length, const std::vector<ColumnVariant::Discriminator> * global_discriminators_mapping);
     void insertManyFromImpl(const IColumn & src_, size_t position, size_t length, const std::vector<ColumnVariant::Discriminator> * global_discriminators_mapping);
 
     void initIdentityGlobalToLocalDiscriminatorsMapping();
diff --git a/src/Columns/ColumnVector.h b/src/Columns/ColumnVector.h
index 8f81da86375..2fe5b635bd2 100644
--- a/src/Columns/ColumnVector.h
+++ b/src/Columns/ColumnVector.h
@@ -85,7 +85,7 @@ public:
 
     void insertMany(const Field & field, size_t length) override
     {
-        data.resize_fill(data.size() + length, static_cast<T>(field.safeGet<T>()));
+        data.resize_fill(data.size() + length, static_cast<T>(field.get<T>()));
     }
 
     void insertData(const char * pos, size_t) override
@@ -180,11 +180,6 @@ public:
         data.reserve_exact(n);
     }
 
-    size_t capacity() const override
-    {
-        return data.capacity();
-    }
-
     void shrinkToFit() override
     {
         data.shrink_to_fit();
@@ -240,7 +235,7 @@ public:
 
     void insert(const Field & x) override
     {
-        data.push_back(static_cast<T>(x.safeGet<T>()));
+        data.push_back(static_cast<T>(x.get<T>()));
     }
 
     bool tryInsert(const DB::Field & x) override;
diff --git a/src/Columns/IColumn.cpp b/src/Columns/IColumn.cpp
index 15e29d1422a..a189903b617 100644
--- a/src/Columns/IColumn.cpp
+++ b/src/Columns/IColumn.cpp
@@ -11,13 +11,12 @@
 #include <Columns/ColumnLowCardinality.h>
 #include <Columns/ColumnMap.h>
 #include <Columns/ColumnNullable.h>
-#include <Columns/ColumnObjectDeprecated.h>
+#include <Columns/ColumnObject.h>
 #include <Columns/ColumnSparse.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnVariant.h>
 #include <Columns/ColumnDynamic.h>
-#include <Columns/ColumnObject.h>
 #include <Columns/ColumnVector.h>
 #include <Core/Field.h>
 #include <DataTypes/Serializations/SerializationInfo.h>
@@ -467,13 +466,12 @@ template class IColumnHelper<ColumnArray, IColumn>;
 template class IColumnHelper<ColumnTuple, IColumn>;
 template class IColumnHelper<ColumnMap, IColumn>;
 template class IColumnHelper<ColumnSparse, IColumn>;
-template class IColumnHelper<ColumnObjectDeprecated, 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<ColumnDynamic, IColumn>;
-template class IColumnHelper<ColumnObject, IColumn>;
 
 template class IColumnHelper<IColumnDummy, IColumn>;
 
diff --git a/src/Columns/IColumn.h b/src/Columns/IColumn.h
index e4fe233ffdf..f9c1a3e7034 100644
--- a/src/Columns/IColumn.h
+++ b/src/Columns/IColumn.h
@@ -475,18 +475,6 @@ public:
     /// It affects performance only (not correctness).
     virtual void reserve(size_t /*n*/) {}
 
-    /// Returns the number of elements allocated in reserve.
-    virtual size_t capacity() const { return size(); }
-
-    /// Reserve memory before squashing all specified source columns into this column.
-    virtual void prepareForSquashing(const std::vector<Ptr> & source_columns)
-    {
-        size_t new_size = size();
-        for (const auto & source_column : source_columns)
-            new_size += source_column->size();
-        reserve(new_size);
-    }
-
     /// Requests the removal of unused capacity.
     /// It is a non-binding request to reduce the capacity of the underlying container to its size.
     virtual void shrinkToFit() {}
diff --git a/src/Columns/IColumnUnique.h b/src/Columns/IColumnUnique.h
index 52b1bef3009..a8e10e5e2b2 100644
--- a/src/Columns/IColumnUnique.h
+++ b/src/Columns/IColumnUnique.h
@@ -73,7 +73,7 @@ public:
     /// Returns dictionary hash which is SipHash is applied to each row of nested column.
     virtual UInt128 getHash() const = 0;
 
-    const char * getFamilyName() const override { return "Unique"; }
+    const char * getFamilyName() const override { return "ColumnUnique"; }
     TypeIndex getDataType() const override { return getNestedColumn()->getDataType(); }
 
     void insert(const Field &) override
diff --git a/src/Columns/tests/gtest_column_dump_structure.cpp b/src/Columns/tests/gtest_column_dump_structure.cpp
index d9647147157..e00c77798c8 100644
--- a/src/Columns/tests/gtest_column_dump_structure.cpp
+++ b/src/Columns/tests/gtest_column_dump_structure.cpp
@@ -10,7 +10,7 @@ TEST(IColumn, dumpStructure)
 {
     auto type_lc = std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>());
     ColumnPtr column_lc = type_lc->createColumn();
-    String expected_structure = "LowCardinality(size = 0, UInt8(size = 0), Unique(size = 1, String(size = 1)))";
+    String expected_structure = "ColumnLowCardinality(size = 0, UInt8(size = 0), ColumnUnique(size = 1, String(size = 1)))";
 
     std::vector<std::thread> threads;
     for (size_t i = 0; i < 6; ++i)
diff --git a/src/Columns/tests/gtest_column_dynamic.cpp b/src/Columns/tests/gtest_column_dynamic.cpp
index de76261229d..a2862b09de1 100644
--- a/src/Columns/tests/gtest_column_dynamic.cpp
+++ b/src/Columns/tests/gtest_column_dynamic.cpp
@@ -7,34 +7,28 @@ using namespace DB;
 
 TEST(ColumnDynamic, CreateEmpty)
 {
-    auto column = ColumnDynamic::create(254);
+    auto column = ColumnDynamic::create(255);
     ASSERT_TRUE(column->empty());
-    ASSERT_EQ(column->getVariantInfo().variant_type->getName(), "Variant(SharedVariant)");
-    ASSERT_EQ(column->getVariantInfo().variant_names.size(), 1);
-    ASSERT_EQ(column->getVariantInfo().variant_names[0], "SharedVariant");
-    ASSERT_EQ(column->getVariantInfo().variant_name_to_discriminator.size(), 1);
-    ASSERT_EQ(column->getVariantInfo().variant_name_to_discriminator.at("SharedVariant"), 0);
-    ASSERT_TRUE(column->getVariantColumn().getVariantByGlobalDiscriminator(0).empty());
+    ASSERT_EQ(column->getVariantInfo().variant_type->getName(), "Variant()");
+    ASSERT_TRUE(column->getVariantInfo().variant_names.empty());
+    ASSERT_TRUE(column->getVariantInfo().variant_name_to_discriminator.empty());
 }
 
 TEST(ColumnDynamic, InsertDefault)
 {
-    auto column = ColumnDynamic::create(254);
+    auto column = ColumnDynamic::create(255);
     column->insertDefault();
     ASSERT_TRUE(column->size() == 1);
-    ASSERT_EQ(column->getVariantInfo().variant_type->getName(), "Variant(SharedVariant)");
-    ASSERT_EQ(column->getVariantInfo().variant_names.size(), 1);
-    ASSERT_EQ(column->getVariantInfo().variant_names[0], "SharedVariant");
-    ASSERT_EQ(column->getVariantInfo().variant_name_to_discriminator.size(), 1);
-    ASSERT_EQ(column->getVariantInfo().variant_name_to_discriminator.at("SharedVariant"), 0);
-    ASSERT_TRUE(column->getVariantColumn().getVariantByGlobalDiscriminator(0).empty());
+    ASSERT_EQ(column->getVariantInfo().variant_type->getName(), "Variant()");
+    ASSERT_TRUE(column->getVariantInfo().variant_names.empty());
+    ASSERT_TRUE(column->getVariantInfo().variant_name_to_discriminator.empty());
     ASSERT_TRUE(column->isNullAt(0));
     ASSERT_EQ((*column)[0], Field(Null()));
 }
 
 TEST(ColumnDynamic, InsertFields)
 {
-    auto column = ColumnDynamic::create(254);
+    auto column = ColumnDynamic::create(255);
     column->insert(Field(42));
     column->insert(Field(-42));
     column->insert(Field("str1"));
@@ -47,16 +41,16 @@ TEST(ColumnDynamic, InsertFields)
     column->insert(Field(43.43));
     ASSERT_TRUE(column->size() == 10);
 
-    ASSERT_EQ(column->getVariantInfo().variant_type->getName(), "Variant(Float64, Int8, SharedVariant, String)");
-    std::vector<String> expected_names = {"Float64", "Int8", "SharedVariant", "String"};
+    ASSERT_EQ(column->getVariantInfo().variant_type->getName(), "Variant(Float64, Int8, String)");
+    std::vector<String> expected_names = {"Float64", "Int8", "String"};
     ASSERT_EQ(column->getVariantInfo().variant_names, expected_names);
-    std::unordered_map<String, UInt8> expected_variant_name_to_discriminator = {{"Float64", 0}, {"Int8", 1}, {"SharedVariant", 2}, {"String", 3}};
+    std::unordered_map<String, UInt8> expected_variant_name_to_discriminator = {{"Float64", 0}, {"Int8", 1}, {"String", 2}};
     ASSERT_TRUE(column->getVariantInfo().variant_name_to_discriminator == expected_variant_name_to_discriminator);
 }
 
 ColumnDynamic::MutablePtr getDynamicWithManyVariants(size_t num_variants, Field tuple_element = Field(42))
 {
-    auto column = ColumnDynamic::create(254);
+    auto column = ColumnDynamic::create(255);
     for (size_t i = 0; i != num_variants; ++i)
     {
         Tuple tuple;
@@ -72,71 +66,61 @@ TEST(ColumnDynamic, InsertFieldsOverflow1)
 {
     auto column = getDynamicWithManyVariants(253);
 
-    ASSERT_EQ(column->getVariantInfo().variant_names.size(), 254);
+    ASSERT_EQ(column->getVariantInfo().variant_names.size(), 253);
 
     column->insert(Field(42.42));
-    ASSERT_EQ(column->size(), 254);
-    ASSERT_EQ(column->getVariantInfo().variant_names.size(), 255);
+    ASSERT_EQ(column->getVariantInfo().variant_names.size(), 254);
     ASSERT_TRUE(column->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
 
     column->insert(Field(42));
-    ASSERT_EQ(column->size(), 255);
     ASSERT_EQ(column->getVariantInfo().variant_names.size(), 255);
     ASSERT_FALSE(column->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
-    ASSERT_EQ(column->getSharedVariant().size(), 1);
+    ASSERT_TRUE(column->getVariantInfo().variant_name_to_discriminator.contains("String"));
     Field field = (*column)[column->size() - 1];
-    ASSERT_EQ(field, 42);
+    ASSERT_EQ(field, "42");
 
     column->insert(Field(43));
-    ASSERT_EQ(column->size(), 256);
     ASSERT_EQ(column->getVariantInfo().variant_names.size(), 255);
     ASSERT_FALSE(column->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
-    ASSERT_EQ(column->getSharedVariant().size(), 2);
+    ASSERT_TRUE(column->getVariantInfo().variant_name_to_discriminator.contains("String"));
     field = (*column)[column->size() - 1];
-    ASSERT_EQ(field, 43);
+    ASSERT_EQ(field, "43");
 
     column->insert(Field("str1"));
-    ASSERT_EQ(column->size(), 257);
     ASSERT_EQ(column->getVariantInfo().variant_names.size(), 255);
     ASSERT_FALSE(column->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
-    ASSERT_FALSE(column->getVariantInfo().variant_name_to_discriminator.contains("String"));
-    ASSERT_EQ(column->getSharedVariant().size(), 3);
+    ASSERT_TRUE(column->getVariantInfo().variant_name_to_discriminator.contains("String"));
     field = (*column)[column->size() - 1];
     ASSERT_EQ(field, "str1");
 
     column->insert(Field(Array({Field(42), Field(43)})));
     ASSERT_EQ(column->getVariantInfo().variant_names.size(), 255);
     ASSERT_FALSE(column->getVariantInfo().variant_name_to_discriminator.contains("Array(Int8)"));
-    ASSERT_FALSE(column->getVariantInfo().variant_name_to_discriminator.contains("String"));
-    ASSERT_EQ(column->getSharedVariant().size(), 4);
+    ASSERT_TRUE(column->getVariantInfo().variant_name_to_discriminator.contains("String"));
     field = (*column)[column->size() - 1];
-    ASSERT_EQ(field, Field(Array({Field(42), Field(43)})));
+    ASSERT_EQ(field, "[42, 43]");
 }
 
 TEST(ColumnDynamic, InsertFieldsOverflow2)
 {
     auto column = getDynamicWithManyVariants(254);
-    ASSERT_EQ(column->getVariantInfo().variant_names.size(), 255);
+    ASSERT_EQ(column->getVariantInfo().variant_names.size(), 254);
 
     column->insert(Field("str1"));
     ASSERT_EQ(column->getVariantInfo().variant_names.size(), 255);
-    ASSERT_FALSE(column->getVariantInfo().variant_name_to_discriminator.contains("String"));
-    ASSERT_EQ(column->getSharedVariant().size(), 1);
-    Field field = (*column)[column->size() - 1];
-    ASSERT_EQ(field, "str1");
+    ASSERT_TRUE(column->getVariantInfo().variant_name_to_discriminator.contains("String"));
 
     column->insert(Field(42));
     ASSERT_EQ(column->getVariantInfo().variant_names.size(), 255);
     ASSERT_FALSE(column->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
-    ASSERT_FALSE(column->getVariantInfo().variant_name_to_discriminator.contains("String"));
-    ASSERT_EQ(column->getSharedVariant().size(), 2);
-    field = (*column)[column->size() - 1];
-    ASSERT_EQ(field, 42);
+    ASSERT_TRUE(column->getVariantInfo().variant_name_to_discriminator.contains("String"));
+    Field field = (*column)[column->size() - 1];
+    ASSERT_EQ(field, "42");
 }
 
 ColumnDynamic::MutablePtr getInsertFromColumn(size_t num = 1)
 {
-    auto column_from = ColumnDynamic::create(254);
+    auto column_from = ColumnDynamic::create(255);
     for (size_t i = 0; i != num; ++i)
     {
         column_from->insert(Field(42));
@@ -170,41 +154,41 @@ void checkInsertFrom(const ColumnDynamic::MutablePtr & column_from, ColumnDynami
 
 TEST(ColumnDynamic, InsertFrom1)
 {
-    auto column_to = ColumnDynamic::create(254);
-    checkInsertFrom(getInsertFromColumn(), column_to, "Variant(Float64, Int8, SharedVariant, String)", {"Float64", "Int8", "SharedVariant", "String"}, {{"Float64", 0}, {"Int8", 1}, {"SharedVariant", 2}, {"String", 3}});
+    auto column_to = ColumnDynamic::create(255);
+    checkInsertFrom(getInsertFromColumn(), column_to, "Variant(Float64, Int8, String)", {"Float64", "Int8", "String"}, {{"Float64", 0}, {"Int8", 1}, {"String", 2}});
 }
 
 TEST(ColumnDynamic, InsertFrom2)
 {
-    auto column_to = ColumnDynamic::create(254);
+    auto column_to = ColumnDynamic::create(255);
     column_to->insert(Field(42));
     column_to->insert(Field(42.42));
     column_to->insert(Field("str"));
 
-    checkInsertFrom(getInsertFromColumn(), column_to, "Variant(Float64, Int8, SharedVariant, String)", {"Float64", "Int8", "SharedVariant", "String"}, {{"Float64", 0}, {"Int8", 1}, {"SharedVariant", 2}, {"String", 3}});
+    checkInsertFrom(getInsertFromColumn(), column_to, "Variant(Float64, Int8, String)", {"Float64", "Int8", "String"}, {{"Float64", 0}, {"Int8", 1}, {"String", 2}});
 }
 
 TEST(ColumnDynamic, InsertFrom3)
 {
-    auto column_to = ColumnDynamic::create(254);
+    auto column_to = ColumnDynamic::create(255);
     column_to->insert(Field(42));
     column_to->insert(Field(42.42));
     column_to->insert(Field("str"));
     column_to->insert(Array({Field(42)}));
 
-    checkInsertFrom(getInsertFromColumn(), column_to, "Variant(Array(Int8), Float64, Int8, SharedVariant, String)", {"Array(Int8)", "Float64", "Int8", "SharedVariant", "String"}, {{"Array(Int8)", 0}, {"Float64", 1}, {"Int8", 2}, {"SharedVariant", 3}, {"String", 4}});
+    checkInsertFrom(getInsertFromColumn(), column_to, "Variant(Array(Int8), Float64, Int8, String)", {"Array(Int8)", "Float64", "Int8", "String"}, {{"Array(Int8)", 0}, {"Float64", 1}, {"Int8", 2}, {"String", 3}});
 }
 
 TEST(ColumnDynamic, InsertFromOverflow1)
 {
-    auto column_from = ColumnDynamic::create(254);
+    auto column_from = ColumnDynamic::create(255);
     column_from->insert(Field(42));
     column_from->insert(Field(42.42));
     column_from->insert(Field("str"));
 
     auto column_to = getDynamicWithManyVariants(253);
     column_to->insertFrom(*column_from, 0);
-    ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 255);
+    ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 254);
     ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
     auto field = (*column_to)[column_to->size() - 1];
     ASSERT_EQ(field, 42);
@@ -212,22 +196,20 @@ TEST(ColumnDynamic, InsertFromOverflow1)
     column_to->insertFrom(*column_from, 1);
     ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 255);
     ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 1);
+    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
     field = (*column_to)[column_to->size() - 1];
-    ASSERT_EQ(field, 42.42);
+    ASSERT_EQ(field, "42.42");
 
     column_to->insertFrom(*column_from, 2);
     ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 255);
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 2);
+    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
     field = (*column_to)[column_to->size() - 1];
     ASSERT_EQ(field, "str");
 }
 
 TEST(ColumnDynamic, InsertFromOverflow2)
 {
-    auto column_from = ColumnDynamic::create(254);
+    auto column_from = ColumnDynamic::create(255);
     column_from->insert(Field(42));
     column_from->insert(Field(42.42));
 
@@ -239,32 +221,9 @@ TEST(ColumnDynamic, InsertFromOverflow2)
 
     column_to->insertFrom(*column_from, 1);
     ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 1);
+    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
     field = (*column_to)[column_to->size() - 1];
-    ASSERT_EQ(field, 42.42);
-}
-
-TEST(ColumnDynamic, InsertFromOverflow3)
-{
-    auto column_from = ColumnDynamic::create(1);
-    column_from->insert(Field(42));
-    column_from->insert(Field(42.42));
-
-    auto column_to = ColumnDynamic::create(254);
-    column_to->insert(Field(41));
-
-    column_to->insertFrom(*column_from, 0);
-    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 0);
-    auto field = (*column_to)[column_to->size() - 1];
-    ASSERT_EQ(field, 42);
-
-    column_to->insertFrom(*column_from, 1);
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 1);
-    field = (*column_to)[column_to->size() - 1];
-    ASSERT_EQ(field, 42.42);
+    ASSERT_EQ(field, "42.42");
 }
 
 void checkInsertManyFrom(const ColumnDynamic::MutablePtr & column_from, ColumnDynamic::MutablePtr & column_to, const std::string & expected_variant, const std::vector<String> & expected_names, const std::unordered_map<String, UInt8> & expected_variant_name_to_discriminator)
@@ -297,43 +256,42 @@ void checkInsertManyFrom(const ColumnDynamic::MutablePtr & column_from, ColumnDy
 
 TEST(ColumnDynamic, InsertManyFrom1)
 {
-    auto column_to = ColumnDynamic::create(254);
-    checkInsertManyFrom(getInsertFromColumn(), column_to, "Variant(Float64, Int8, SharedVariant, String)", {"Float64", "Int8", "SharedVariant", "String"}, {{"Float64", 0}, {"Int8", 1}, {"SharedVariant", 2}, {"String", 3}});
+    auto column_to = ColumnDynamic::create(255);
+    checkInsertManyFrom(getInsertFromColumn(), column_to, "Variant(Float64, Int8, String)", {"Float64", "Int8", "String"}, {{"Float64", 0}, {"Int8", 1}, {"String", 2}});
 }
 
 TEST(ColumnDynamic, InsertManyFrom2)
 {
-    auto column_to = ColumnDynamic::create(254);
+    auto column_to = ColumnDynamic::create(255);
     column_to->insert(Field(42));
     column_to->insert(Field(42.42));
     column_to->insert(Field("str"));
 
-    checkInsertManyFrom(getInsertFromColumn(), column_to, "Variant(Float64, Int8, SharedVariant, String)", {"Float64", "Int8", "SharedVariant", "String"}, {{"Float64", 0}, {"Int8", 1}, {"SharedVariant", 2}, {"String", 3}});
+    checkInsertManyFrom(getInsertFromColumn(), column_to, "Variant(Float64, Int8, String)", {"Float64", "Int8", "String"}, {{"Float64", 0}, {"Int8", 1}, {"String", 2}});
 }
 
 TEST(ColumnDynamic, InsertManyFrom3)
 {
-    auto column_to = ColumnDynamic::create(254);
+    auto column_to = ColumnDynamic::create(255);
     column_to->insert(Field(42));
     column_to->insert(Field(42.42));
     column_to->insert(Field("str"));
     column_to->insert(Array({Field(42)}));
 
-    checkInsertManyFrom(getInsertFromColumn(), column_to, "Variant(Array(Int8), Float64, Int8, SharedVariant, String)", {"Array(Int8)", "Float64", "Int8", "SharedVariant", "String"}, {{"Array(Int8)", 0}, {"Float64", 1}, {"Int8", 2}, {"SharedVariant", 3}, {"String", 4}});
+    checkInsertManyFrom(getInsertFromColumn(), column_to, "Variant(Array(Int8), Float64, Int8, String)", {"Array(Int8)", "Float64", "Int8", "String"}, {{"Array(Int8)", 0}, {"Float64", 1}, {"Int8", 2}, {"String", 3}});
 }
 
 TEST(ColumnDynamic, InsertManyFromOverflow1)
 {
-    auto column_from = ColumnDynamic::create(254);
+    auto column_from = ColumnDynamic::create(255);
     column_from->insert(Field(42));
     column_from->insert(Field(42.42));
     column_from->insert(Field("str"));
 
     auto column_to = getDynamicWithManyVariants(253);
     column_to->insertManyFrom(*column_from, 0, 2);
-    ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 255);
+    ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 254);
     ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 0);
     auto field = (*column_to)[column_to->size() - 2];
     ASSERT_EQ(field, 42);
     field = (*column_to)[column_to->size() - 1];
@@ -342,17 +300,15 @@ TEST(ColumnDynamic, InsertManyFromOverflow1)
     column_to->insertManyFrom(*column_from, 1, 2);
     ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 255);
     ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 2);
+    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
     field = (*column_to)[column_to->size() - 2];
-    ASSERT_EQ(field, 42.42);
+    ASSERT_EQ(field, "42.42");
     field = (*column_to)[column_to->size() - 1];
-    ASSERT_EQ(field, 42.42);
+    ASSERT_EQ(field, "42.42");
 
     column_to->insertManyFrom(*column_from, 2, 2);
     ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 255);
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 4);
+    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
     field = (*column_to)[column_to->size() - 1];
     ASSERT_EQ(field, "str");
     field = (*column_to)[column_to->size() - 2];
@@ -361,15 +317,14 @@ TEST(ColumnDynamic, InsertManyFromOverflow1)
 
 TEST(ColumnDynamic, InsertManyFromOverflow2)
 {
-    auto column_from = ColumnDynamic::create(254);
+    auto column_from = ColumnDynamic::create(255);
     column_from->insert(Field(42));
     column_from->insert(Field(42.42));
 
     auto column_to = getDynamicWithManyVariants(253);
     column_to->insertManyFrom(*column_from, 0, 2);
-    ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 255);
+    ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 254);
     ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 0);
     auto field = (*column_to)[column_to->size() - 2];
     ASSERT_EQ(field, 42);
     field = (*column_to)[column_to->size() - 1];
@@ -378,39 +333,11 @@ TEST(ColumnDynamic, InsertManyFromOverflow2)
     column_to->insertManyFrom(*column_from, 1, 2);
     ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 255);
     ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 2);
+    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
     field = (*column_to)[column_to->size() - 2];
-    ASSERT_EQ(field, 42.42);
+    ASSERT_EQ(field, "42.42");
     field = (*column_to)[column_to->size() - 1];
-    ASSERT_EQ(field, 42.42);
-}
-
-
-TEST(ColumnDynamic, InsertManyFromOverflow3)
-{
-    auto column_from = ColumnDynamic::create(1);
-    column_from->insert(Field(42));
-    column_from->insert(Field(42.42));
-
-    auto column_to = ColumnDynamic::create(254);
-    column_to->insert(Field(41));
-
-    column_to->insertManyFrom(*column_from, 0, 2);
-    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 0);
-    auto field = (*column_to)[column_to->size() - 2];
-    ASSERT_EQ(field, 42);
-    field = (*column_to)[column_to->size() - 1];
-    ASSERT_EQ(field, 42);
-
-    column_to->insertManyFrom(*column_from, 1, 2);
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 2);
-    field = (*column_to)[column_to->size() - 2];
-    ASSERT_EQ(field, 42.42);
-    field = (*column_to)[column_to->size() - 1];
-    ASSERT_EQ(field, 42.42);
+    ASSERT_EQ(field, "42.42");
 }
 
 void checkInsertRangeFrom(const ColumnDynamic::MutablePtr & column_from, ColumnDynamic::MutablePtr & column_to, const std::string & expected_variant, const std::vector<String> & expected_names, const std::unordered_map<String, UInt8> & expected_variant_name_to_discriminator)
@@ -441,34 +368,34 @@ void checkInsertRangeFrom(const ColumnDynamic::MutablePtr & column_from, ColumnD
 
 TEST(ColumnDynamic, InsertRangeFrom1)
 {
-    auto column_to = ColumnDynamic::create(254);
-    checkInsertRangeFrom(getInsertFromColumn(2), column_to, "Variant(Float64, Int8, SharedVariant, String)", {"Float64", "Int8", "SharedVariant", "String"}, {{"Float64", 0}, {"Int8", 1}, {"SharedVariant", 2}, {"String", 3}});
+    auto column_to = ColumnDynamic::create(255);
+    checkInsertRangeFrom(getInsertFromColumn(2), column_to, "Variant(Float64, Int8, String)", {"Float64", "Int8", "String"}, {{"Float64", 0}, {"Int8", 1}, {"String", 2}});
 }
 
 TEST(ColumnDynamic, InsertRangeFrom2)
 {
-    auto column_to = ColumnDynamic::create(254);
+    auto column_to = ColumnDynamic::create(255);
     column_to->insert(Field(42));
     column_to->insert(Field(42.42));
     column_to->insert(Field("str1"));
 
-    checkInsertRangeFrom(getInsertFromColumn(2), column_to, "Variant(Float64, Int8, SharedVariant, String)", {"Float64", "Int8", "SharedVariant", "String"}, {{"Float64", 0}, {"Int8", 1}, {"SharedVariant", 2}, {"String", 3}});
+    checkInsertRangeFrom(getInsertFromColumn(2), column_to, "Variant(Float64, Int8, String)", {"Float64", "Int8", "String"}, {{"Float64", 0}, {"Int8", 1}, {"String", 2}});
 }
 
 TEST(ColumnDynamic, InsertRangeFrom3)
 {
-    auto column_to = ColumnDynamic::create(254);
+    auto column_to = ColumnDynamic::create(255);
     column_to->insert(Field(42));
     column_to->insert(Field(42.42));
     column_to->insert(Field("str1"));
     column_to->insert(Array({Field(42)}));
 
-    checkInsertRangeFrom(getInsertFromColumn(2), column_to, "Variant(Array(Int8), Float64, Int8, SharedVariant, String)", {"Array(Int8)", "Float64", "Int8", "SharedVariant", "String"}, {{"Array(Int8)", 0}, {"Float64", 1}, {"Int8", 2}, {"SharedVariant", 3}, {"String", 4}});
+    checkInsertRangeFrom(getInsertFromColumn(2), column_to, "Variant(Array(Int8), Float64, Int8, String)", {"Array(Int8)", "Float64", "Int8", "String"}, {{"Array(Int8)", 0}, {"Float64", 1}, {"Int8", 2}, {"String", 3}});
 }
 
 TEST(ColumnDynamic, InsertRangeFromOverflow1)
 {
-    auto column_from = ColumnDynamic::create(254);
+    auto column_from = ColumnDynamic::create(255);
     column_from->insert(Field(42));
     column_from->insert(Field(43));
     column_from->insert(Field(42.42));
@@ -476,25 +403,23 @@ TEST(ColumnDynamic, InsertRangeFromOverflow1)
 
     auto column_to = getDynamicWithManyVariants(253);
     column_to->insertRangeFrom(*column_from, 0, 4);
-    ASSERT_EQ(column_to->size(), 257);
     ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 255);
     ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
+    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
     ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 2);
     auto field = (*column_to)[column_to->size() - 4];
     ASSERT_EQ(field, Field(42));
     field = (*column_to)[column_to->size() - 3];
     ASSERT_EQ(field, Field(43));
     field = (*column_to)[column_to->size() - 2];
-    ASSERT_EQ(field, Field(42.42));
+    ASSERT_EQ(field, Field("42.42"));
     field = (*column_to)[column_to->size() - 1];
     ASSERT_EQ(field, Field("str"));
 }
 
 TEST(ColumnDynamic, InsertRangeFromOverflow2)
 {
-    auto column_from = ColumnDynamic::create(254);
+    auto column_from = ColumnDynamic::create(255);
     column_from->insert(Field(42));
     column_from->insert(Field(43));
     column_from->insert(Field(42.42));
@@ -503,20 +428,19 @@ TEST(ColumnDynamic, InsertRangeFromOverflow2)
     column_to->insertRangeFrom(*column_from, 0, 3);
     ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 255);
     ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
+    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
     ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 1);
     auto field = (*column_to)[column_to->size() - 3];
     ASSERT_EQ(field, Field(42));
     field = (*column_to)[column_to->size() - 2];
     ASSERT_EQ(field, Field(43));
     field = (*column_to)[column_to->size() - 1];
-    ASSERT_EQ(field, Field(42.42));
+    ASSERT_EQ(field, Field("42.42"));
 }
 
 TEST(ColumnDynamic, InsertRangeFromOverflow3)
 {
-    auto column_from = ColumnDynamic::create(254);
+    auto column_from = ColumnDynamic::create(255);
     column_from->insert(Field(42));
     column_from->insert(Field(43));
     column_from->insert(Field(42.42));
@@ -525,21 +449,20 @@ TEST(ColumnDynamic, InsertRangeFromOverflow3)
     column_to->insert(Field("Str"));
     column_to->insertRangeFrom(*column_from, 0, 3);
     ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 255);
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
+    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
     ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
     ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 3);
     auto field = (*column_to)[column_to->size() - 3];
     ASSERT_EQ(field, Field(42));
     field = (*column_to)[column_to->size() - 2];
     ASSERT_EQ(field, Field(43));
     field = (*column_to)[column_to->size() - 1];
-    ASSERT_EQ(field, Field(42.42));
+    ASSERT_EQ(field, Field("42.42"));
 }
 
 TEST(ColumnDynamic, InsertRangeFromOverflow4)
 {
-    auto column_from = ColumnDynamic::create(254);
+    auto column_from = ColumnDynamic::create(255);
     column_from->insert(Field(42));
     column_from->insert(Field(42.42));
     column_from->insert(Field("str"));
@@ -548,20 +471,19 @@ TEST(ColumnDynamic, InsertRangeFromOverflow4)
     column_to->insertRangeFrom(*column_from, 0, 3);
     ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 255);
     ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
+    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
     ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 3);
     auto field = (*column_to)[column_to->size() - 3];
-    ASSERT_EQ(field, Field(42));
+    ASSERT_EQ(field, Field("42"));
     field = (*column_to)[column_to->size() - 2];
-    ASSERT_EQ(field, Field(42.42));
+    ASSERT_EQ(field, Field("42.42"));
     field = (*column_to)[column_to->size() - 1];
     ASSERT_EQ(field, Field("str"));
 }
 
 TEST(ColumnDynamic, InsertRangeFromOverflow5)
 {
-    auto column_from = ColumnDynamic::create(254);
+    auto column_from = ColumnDynamic::create(255);
     column_from->insert(Field(42));
     column_from->insert(Field(43));
     column_from->insert(Field(42.42));
@@ -571,23 +493,22 @@ TEST(ColumnDynamic, InsertRangeFromOverflow5)
     column_to->insert(Field("str"));
     column_to->insertRangeFrom(*column_from, 0, 4);
     ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 255);
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
+    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
     ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
     ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 3);
     auto field = (*column_to)[column_to->size() - 4];
     ASSERT_EQ(field, Field(42));
     field = (*column_to)[column_to->size() - 3];
     ASSERT_EQ(field, Field(43));
     field = (*column_to)[column_to->size() - 2];
-    ASSERT_EQ(field, Field(42.42));
+    ASSERT_EQ(field, Field("42.42"));
     field = (*column_to)[column_to->size() - 1];
     ASSERT_EQ(field, Field("str"));
 }
 
 TEST(ColumnDynamic, InsertRangeFromOverflow6)
 {
-    auto column_from = ColumnDynamic::create(254);
+    auto column_from = ColumnDynamic::create(255);
     column_from->insert(Field(42));
     column_from->insert(Field(43));
     column_from->insert(Field(44));
@@ -599,14 +520,13 @@ TEST(ColumnDynamic, InsertRangeFromOverflow6)
     auto column_to = getDynamicWithManyVariants(253);
     column_to->insertRangeFrom(*column_from, 2, 5);
     ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 255);
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
-    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
+    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
+    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
+    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
     ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Array(Int8)"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 4);
     auto field = (*column_to)[column_to->size() - 5];
 
-    ASSERT_EQ(field, Field(44));
+    ASSERT_EQ(field, Field("44"));
     field = (*column_to)[column_to->size() - 4];
     ASSERT_EQ(field, Field(42.42));
     field = (*column_to)[column_to->size() - 3];
@@ -614,136 +534,12 @@ TEST(ColumnDynamic, InsertRangeFromOverflow6)
     field = (*column_to)[column_to->size() - 2];
     ASSERT_EQ(field, Field("str"));
     field = (*column_to)[column_to->size() - 1];
-    ASSERT_EQ(field, Field(Array({Field(42)})));
-}
-
-TEST(ColumnDynamic, InsertRangeFromOverflow7)
-{
-    auto column_from = ColumnDynamic::create(2);
-    column_from->insert(Field(42.42));
-    column_from->insert(Field("str1"));
-    column_from->insert(Field(42));
-    column_from->insert(Field(43.43));
-    column_from->insert(Field(Array({Field(41)})));
-    column_from->insert(Field(43));
-    column_from->insert(Field("str2"));
-    column_from->insert(Field(Array({Field(42)})));
-
-    auto column_to = ColumnDynamic::create(254);
-    column_to->insert(Field(42));
-
-    column_to->insertRangeFrom(*column_from, 0, 8);
-    ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 4);
-    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
-    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Array(Int8)"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 2);
-    auto field = (*column_to)[column_to->size() - 8];
-    ASSERT_EQ(field, Field(42.42));
-    field = (*column_to)[column_to->size() - 7];
-    ASSERT_EQ(field, Field("str1"));
-    field = (*column_to)[column_to->size() - 6];
-    ASSERT_EQ(field, Field(42));
-    field = (*column_to)[column_to->size() - 5];
-    ASSERT_EQ(field, Field(43.43));
-    field = (*column_to)[column_to->size() - 4];
-    ASSERT_EQ(field, Field(Array({Field(41)})));
-    field = (*column_to)[column_to->size() - 3];
-    ASSERT_EQ(field, Field(43));
-    field = (*column_to)[column_to->size() - 2];
-    ASSERT_EQ(field, Field("str2"));
-    field = (*column_to)[column_to->size() - 1];
-    ASSERT_EQ(field, Field(Array({Field(42)})));
-}
-
-TEST(ColumnDynamic, InsertRangeFromOverflow8)
-{
-    auto column_from = ColumnDynamic::create(2);
-    column_from->insert(Field(42.42));
-    column_from->insert(Field("str1"));
-    column_from->insert(Field(42));
-    column_from->insert(Field(43.43));
-    column_from->insert(Field(Array({Field(41)})));
-    column_from->insert(Field(43));
-    column_from->insert(Field("str2"));
-    column_from->insert(Field(Array({Field(42)})));
-
-    auto column_to = ColumnDynamic::create(2);
-    column_to->insert(Field(42));
-    column_from->insert(Field("str1"));
-
-    column_to->insertRangeFrom(*column_from, 0, 8);
-    ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 3);
-    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
-    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Array(Int8)"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 4);
-    auto field = (*column_to)[column_to->size() - 8];
-    ASSERT_EQ(field, Field(42.42));
-    field = (*column_to)[column_to->size() - 7];
-    ASSERT_EQ(field, Field("str1"));
-    field = (*column_to)[column_to->size() - 6];
-    ASSERT_EQ(field, Field(42));
-    field = (*column_to)[column_to->size() - 5];
-    ASSERT_EQ(field, Field(43.43));
-    field = (*column_to)[column_to->size() - 4];
-    ASSERT_EQ(field, Field(Array({Field(41)})));
-    field = (*column_to)[column_to->size() - 3];
-    ASSERT_EQ(field, Field(43));
-    field = (*column_to)[column_to->size() - 2];
-    ASSERT_EQ(field, Field("str2"));
-    field = (*column_to)[column_to->size() - 1];
-    ASSERT_EQ(field, Field(Array({Field(42)})));
-}
-
-TEST(ColumnDynamic, InsertRangeFromOverflow9)
-{
-    auto column_from = ColumnDynamic::create(3);
-    column_from->insert(Field("str1"));
-    column_from->insert(Field(42.42));
-    column_from->insert(Field("str2"));
-    column_from->insert(Field(42));
-    column_from->insert(Field(43.43));
-    column_from->insert(Field(Array({Field(41)})));
-    column_from->insert(Field(43));
-    column_from->insert(Field("str2"));
-    column_from->insert(Field(Array({Field(42)})));
-
-    auto column_to = ColumnDynamic::create(2);
-    column_to->insert(Field(42));
-
-    column_to->insertRangeFrom(*column_from, 0, 9);
-    ASSERT_EQ(column_to->getVariantInfo().variant_names.size(), 3);
-    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
-    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Array(Int8)"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 4);
-    auto field = (*column_to)[column_to->size() - 9];
-    ASSERT_EQ(field, Field("str1"));
-    field = (*column_to)[column_to->size() - 8];
-    ASSERT_EQ(field, Field(42.42));
-    field = (*column_to)[column_to->size() - 7];
-    ASSERT_EQ(field, Field("str2"));
-    field = (*column_to)[column_to->size() - 6];
-    ASSERT_EQ(field, Field(42));
-    field = (*column_to)[column_to->size() - 5];
-    ASSERT_EQ(field, Field(43.43));
-    field = (*column_to)[column_to->size() - 4];
-    ASSERT_EQ(field, Field(Array({Field(41)})));
-    field = (*column_to)[column_to->size() - 3];
-    ASSERT_EQ(field, Field(43));
-    field = (*column_to)[column_to->size() - 2];
-    ASSERT_EQ(field, Field("str2"));
-    field = (*column_to)[column_to->size() - 1];
-    ASSERT_EQ(field, Field(Array({Field(42)})));
+    ASSERT_EQ(field, Field("[42]"));
 }
 
 TEST(ColumnDynamic, SerializeDeserializeFromArena1)
 {
-    auto column = ColumnDynamic::create(254);
+    auto column = ColumnDynamic::create(255);
     column->insert(Field(42));
     column->insert(Field(42.42));
     column->insert(Field("str"));
@@ -768,7 +564,7 @@ TEST(ColumnDynamic, SerializeDeserializeFromArena1)
 
 TEST(ColumnDynamic, SerializeDeserializeFromArena2)
 {
-    auto column_from = ColumnDynamic::create(254);
+    auto column_from = ColumnDynamic::create(255);
     column_from->insert(Field(42));
     column_from->insert(Field(42.42));
     column_from->insert(Field("str"));
@@ -781,26 +577,26 @@ TEST(ColumnDynamic, SerializeDeserializeFromArena2)
     column_from->serializeValueIntoArena(2, arena, pos);
     column_from->serializeValueIntoArena(3, arena, pos);
 
-    auto column_to = ColumnDynamic::create(254);
+    auto column_to = ColumnDynamic::create(255);
     pos = column_to->deserializeAndInsertFromArena(ref1.data);
     pos = column_to->deserializeAndInsertFromArena(pos);
     pos = column_to->deserializeAndInsertFromArena(pos);
     column_to->deserializeAndInsertFromArena(pos);
 
-    ASSERT_EQ((*column_to)[column_to->size() - 4], 42);
-    ASSERT_EQ((*column_to)[column_to->size() - 3], 42.42);
-    ASSERT_EQ((*column_to)[column_to->size() - 2], "str");
-    ASSERT_EQ((*column_to)[column_to->size() - 1], Null());
-    ASSERT_EQ(column_to->getVariantInfo().variant_type->getName(), "Variant(Float64, Int8, SharedVariant, String)");
-    std::vector<String> expected_names = {"Float64", "Int8", "SharedVariant", "String"};
+    ASSERT_EQ((*column_from)[column_from->size() - 4], 42);
+    ASSERT_EQ((*column_from)[column_from->size() - 3], 42.42);
+    ASSERT_EQ((*column_from)[column_from->size() - 2], "str");
+    ASSERT_EQ((*column_from)[column_from->size() - 1], Null());
+    ASSERT_EQ(column_to->getVariantInfo().variant_type->getName(), "Variant(Float64, Int8, String)");
+    std::vector<String> expected_names = {"Float64", "Int8", "String"};
     ASSERT_EQ(column_to->getVariantInfo().variant_names, expected_names);
-    std::unordered_map<String, UInt8> expected_variant_name_to_discriminator = {{"Float64", 0}, {"Int8", 1}, {"SharedVariant", 2}, {"String", 3}};
+    std::unordered_map<String, UInt8> expected_variant_name_to_discriminator = {{"Float64", 0}, {"Int8", 1}, {"String", 2}};
     ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator == expected_variant_name_to_discriminator);
 }
 
-TEST(ColumnDynamic, SerializeDeserializeFromArenaOverflow1)
+TEST(ColumnDynamic, SerializeDeserializeFromArenaOverflow)
 {
-    auto column_from = ColumnDynamic::create(254);
+    auto column_from = ColumnDynamic::create(255);
     column_from->insert(Field(42));
     column_from->insert(Field(42.42));
     column_from->insert(Field("str"));
@@ -819,56 +615,18 @@ TEST(ColumnDynamic, SerializeDeserializeFromArenaOverflow1)
     pos = column_to->deserializeAndInsertFromArena(pos);
     column_to->deserializeAndInsertFromArena(pos);
 
-    ASSERT_EQ((*column_to)[column_to->size() - 4], 42);
-    ASSERT_EQ((*column_to)[column_to->size() - 3], 42.42);
-    ASSERT_EQ((*column_to)[column_to->size() - 2], "str");
-    ASSERT_EQ((*column_to)[column_to->size() - 1], Null());
+    ASSERT_EQ((*column_from)[column_from->size() - 4], 42);
+    ASSERT_EQ((*column_from)[column_from->size() - 3], 42.42);
+    ASSERT_EQ((*column_from)[column_from->size() - 2], "str");
+    ASSERT_EQ((*column_from)[column_from->size() - 1], Null());
     ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
     ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 2);
-}
-
-TEST(ColumnDynamic, SerializeDeserializeFromArenaOverflow2)
-{
-    auto column_from = ColumnDynamic::create(2);
-    column_from->insert(Field(42));
-    column_from->insert(Field(42.42));
-    column_from->insert(Field("str"));
-    column_from->insert(Field(Null()));
-    column_from->insert(Field(Array({Field(42)})));
-
-    Arena arena;
-    const char * pos = nullptr;
-    auto ref1 = column_from->serializeValueIntoArena(0, arena, pos);
-    column_from->serializeValueIntoArena(1, arena, pos);
-    column_from->serializeValueIntoArena(2, arena, pos);
-    column_from->serializeValueIntoArena(3, arena, pos);
-    column_from->serializeValueIntoArena(4, arena, pos);
-
-    auto column_to = ColumnDynamic::create(2);
-    column_to->insert(Field(42.42));
-    pos = column_to->deserializeAndInsertFromArena(ref1.data);
-    pos = column_to->deserializeAndInsertFromArena(pos);
-    pos = column_to->deserializeAndInsertFromArena(pos);
-    pos = column_to->deserializeAndInsertFromArena(pos);
-    column_to->deserializeAndInsertFromArena(pos);
-
-    ASSERT_EQ((*column_to)[column_to->size() - 5], 42);
-    ASSERT_EQ((*column_to)[column_to->size() - 4], 42.42);
-    ASSERT_EQ((*column_to)[column_to->size() - 3], "str");
-    ASSERT_EQ((*column_to)[column_to->size() - 2], Null());
-    ASSERT_EQ((*column_to)[column_to->size() - 1], Field(Array({Field(42)})));
-    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Int8"));
-    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Float64"));
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
-    ASSERT_FALSE(column_to->getVariantInfo().variant_name_to_discriminator.contains("Array(Int8)"));
-    ASSERT_EQ(column_to->getSharedVariant().size(), 2);
+    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.contains("String"));
 }
 
 TEST(ColumnDynamic, skipSerializedInArena)
 {
-    auto column_from = ColumnDynamic::create(3);
+    auto column_from = ColumnDynamic::create(255);
     column_from->insert(Field(42));
     column_from->insert(Field(42.42));
     column_from->insert(Field("str"));
@@ -882,41 +640,13 @@ TEST(ColumnDynamic, skipSerializedInArena)
     auto ref4 = column_from->serializeValueIntoArena(3, arena, pos);
 
     const char * end = ref4.data + ref4.size;
-    auto column_to = ColumnDynamic::create(254);
+    auto column_to = ColumnDynamic::create(255);
     pos = column_to->skipSerializedInArena(ref1.data);
     pos = column_to->skipSerializedInArena(pos);
     pos = column_to->skipSerializedInArena(pos);
     pos = column_to->skipSerializedInArena(pos);
 
     ASSERT_EQ(pos, end);
-    ASSERT_EQ(column_to->getVariantInfo().variant_name_to_discriminator.at("SharedVariant"), 0);
-    ASSERT_EQ(column_to->getVariantInfo().variant_names, Names{"SharedVariant"});
-}
-
-TEST(ColumnDynamic, compare)
-{
-    auto column_from = ColumnDynamic::create(3);
-    column_from->insert(Field(42));
-    column_from->insert(Field(42.42));
-    column_from->insert(Field("str"));
-    column_from->insert(Field(Null()));
-    column_from->insert(Field(Array({Field(42)})));
-
-    ASSERT_EQ(column_from->compareAt(0, 0, *column_from, -1), 0);
-    ASSERT_EQ(column_from->compareAt(0, 1, *column_from, -1), 1);
-    ASSERT_EQ(column_from->compareAt(1, 1, *column_from, -1), 0);
-    ASSERT_EQ(column_from->compareAt(0, 2, *column_from, -1), -1);
-    ASSERT_EQ(column_from->compareAt(2, 0, *column_from, -1), 1);
-    ASSERT_EQ(column_from->compareAt(2, 4, *column_from, -1), 1);
-    ASSERT_EQ(column_from->compareAt(4, 2, *column_from, -1), -1);
-    ASSERT_EQ(column_from->compareAt(4, 4, *column_from, -1), 0);
-    ASSERT_EQ(column_from->compareAt(0, 3, *column_from, -1), 1);
-    ASSERT_EQ(column_from->compareAt(1, 3, *column_from, -1), 1);
-    ASSERT_EQ(column_from->compareAt(2, 3, *column_from, -1), 1);
-    ASSERT_EQ(column_from->compareAt(3, 3, *column_from, -1), 0);
-    ASSERT_EQ(column_from->compareAt(4, 3, *column_from, -1), 1);
-    ASSERT_EQ(column_from->compareAt(3, 0, *column_from, -1), -1);
-    ASSERT_EQ(column_from->compareAt(3, 1, *column_from, -1), -1);
-    ASSERT_EQ(column_from->compareAt(3, 2, *column_from, -1), -1);
-    ASSERT_EQ(column_from->compareAt(3, 4, *column_from, -1), -1);
+    ASSERT_TRUE(column_to->getVariantInfo().variant_name_to_discriminator.empty());
+    ASSERT_TRUE(column_to->getVariantInfo().variant_names.empty());
 }
diff --git a/src/Columns/tests/gtest_column_object.cpp b/src/Columns/tests/gtest_column_object.cpp
deleted file mode 100644
index f6a1da64ba3..00000000000
--- a/src/Columns/tests/gtest_column_object.cpp
+++ /dev/null
@@ -1,351 +0,0 @@
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnObject.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <IO/ReadBufferFromMemory.h>
-#include <IO/WriteBufferFromString.h>
-
-#include <Common/Arena.h>
-#include <gtest/gtest.h>
-
-using namespace DB;
-
-TEST(ColumnObject, CreateEmpty)
-{
-    auto type = DataTypeFactory::instance().get("JSON(max_dynamic_types=10, max_dynamic_paths=20, a.b UInt32, a.c Array(String))");
-    auto col = type->createColumn();
-    const auto & col_object = assert_cast<const ColumnObject &>(*col);
-    const auto & typed_paths = col_object.getTypedPaths();
-    ASSERT_TRUE(typed_paths.contains("a.b"));
-    ASSERT_EQ(typed_paths.at("a.b")->getName(), "UInt32");
-    ASSERT_TRUE(typed_paths.contains("a.c"));
-    ASSERT_EQ(typed_paths.at("a.c")->getName(), "Array(String)");
-    ASSERT_TRUE(col_object.getDynamicPaths().empty());
-    ASSERT_TRUE(col_object.getSharedDataOffsets().empty());
-    ASSERT_TRUE(col_object.getSharedDataPathsAndValues().first->empty());
-    ASSERT_TRUE(col_object.getSharedDataPathsAndValues().second->empty());
-    ASSERT_EQ(col_object.getMaxDynamicTypes(), 10);
-    ASSERT_EQ(col_object.getMaxDynamicPaths(), 20);
-}
-
-TEST(ColumnObject, GetName)
-{
-    auto type = DataTypeFactory::instance().get("JSON(max_dynamic_types=10, max_dynamic_paths=20, b.d UInt32, a.b Array(String))");
-    auto col = type->createColumn();
-    ASSERT_EQ(col->getName(), "Object(max_dynamic_paths=20, max_dynamic_types=10, a.b Array(String), b.d UInt32)");
-}
-
-Field deserializeFieldFromSharedData(ColumnString * values, size_t n)
-{
-    auto data = values->getDataAt(n);
-    ReadBufferFromMemory buf(data.data, data.size);
-    Field res;
-    std::make_shared<SerializationDynamic>()->deserializeBinary(res, buf, FormatSettings());
-    return res;
-}
-
-TEST(ColumnObject, InsertField)
-{
-    auto type = DataTypeFactory::instance().get("JSON(max_dynamic_types=10, max_dynamic_paths=2, b.d UInt32, a.b Array(String))");
-    auto col = type->createColumn();
-    auto & col_object = assert_cast<ColumnObject &>(*col);
-    const auto & typed_paths = col_object.getTypedPaths();
-    const auto & dynamic_paths = col_object.getDynamicPaths();
-    const auto & shared_data_nested_column = col_object.getSharedDataNestedColumn();
-    const auto & shared_data_offsets = col_object.getSharedDataOffsets();
-    const auto [shared_data_paths, shared_data_values] = col_object.getSharedDataPathsAndValues();
-    Object empty_object;
-    col_object.insert(empty_object);
-    ASSERT_EQ(col_object[0], (Object{{"a.b", Array{}}, {"b.d", Field(0u)}}));
-    ASSERT_EQ(typed_paths.at("a.b")->size(), 1);
-    ASSERT_TRUE(typed_paths.at("a.b")->isDefaultAt(0));
-    ASSERT_EQ(typed_paths.at("b.d")->size(), 1);
-    ASSERT_TRUE(typed_paths.at("b.d")->isDefaultAt(0));
-    ASSERT_TRUE(dynamic_paths.empty());
-    ASSERT_EQ(shared_data_nested_column.size(), 1);
-    ASSERT_TRUE(shared_data_nested_column.isDefaultAt(0));
-
-    Object object1 = {{"a.b", Array{String("Hello"), String("World")}}, {"a.c", Field(42)}};
-    col_object.insert(object1);
-    ASSERT_EQ(col_object[1], (Object{{"a.b", Array{String("Hello"), String("World")}}, {"b.d", Field(0u)}, {"a.c", Field(42)}}));
-    ASSERT_EQ(typed_paths.at("a.b")->size(), 2);
-    ASSERT_EQ((*typed_paths.at("a.b"))[1], (Array{String("Hello"), String("World")}));
-    ASSERT_EQ(typed_paths.at("b.d")->size(), 2);
-    ASSERT_TRUE(typed_paths.at("b.d")->isDefaultAt(1));
-    ASSERT_EQ(dynamic_paths.size(), 1);
-    ASSERT_TRUE(dynamic_paths.contains("a.c"));
-    ASSERT_EQ(dynamic_paths.at("a.c")->size(), 2);
-    ASSERT_TRUE(dynamic_paths.at("a.c")->isDefaultAt(0));
-    ASSERT_EQ((*dynamic_paths.at("a.c"))[1], Field(42));
-    ASSERT_EQ(shared_data_nested_column.size(), 2);
-    ASSERT_TRUE(shared_data_nested_column.isDefaultAt(1));
-
-    Object object2 = {{"b.d", Field(142u)}, {"a.c", Field(43)}, {"a.d", Field("str")}, {"a.e", Field(242)}, {"a.f", Array{Field(42), Field(43)}}};
-    col_object.insert(object2);
-    ASSERT_EQ(col_object[2], (Object{{"a.b", Array{}}, {"b.d", Field(142u)}, {"a.c", Field(43)}, {"a.d", Field("str")}, {"a.e", Field(242)}, {"a.f", Array{Field(42), Field(43)}}}));
-    ASSERT_EQ(typed_paths.at("a.b")->size(), 3);
-    ASSERT_TRUE(typed_paths.at("a.b")->isDefaultAt(2));
-    ASSERT_EQ(typed_paths.at("b.d")->size(), 3);
-    ASSERT_EQ((*typed_paths.at("b.d"))[2], Field(142u));
-    ASSERT_EQ(dynamic_paths.size(), 2);
-    ASSERT_TRUE(dynamic_paths.contains("a.c"));
-    ASSERT_EQ(dynamic_paths.at("a.c")->size(), 3);
-    ASSERT_EQ((*dynamic_paths.at("a.c"))[2], Field(43));
-    ASSERT_TRUE(dynamic_paths.contains("a.d"));
-    ASSERT_EQ(dynamic_paths.at("a.d")->size(), 3);
-    ASSERT_EQ((*dynamic_paths.at("a.d"))[2], Field("str"));
-
-    ASSERT_EQ(shared_data_nested_column.size(), 3);
-    ASSERT_EQ(shared_data_offsets[2] - shared_data_offsets[1], 2);
-    ASSERT_EQ((*shared_data_paths)[0], "a.e");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 0), Field(242));
-    ASSERT_EQ((*shared_data_paths)[1], "a.f");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 1), (Array({Field(42), Field(43)})));
-
-    Object object3 = {{"b.a", Field("Str")}, {"b.b", Field(2)}, {"b.c", Field(Tuple{Field(42), Field("Str")})}};
-    col_object.insert(object3);
-    ASSERT_EQ(col_object[3], (Object{{"a.b", Array{}}, {"b.d", Field(0u)}, {"b.a", Field("Str")}, {"b.b", Field(2)}, {"b.c", Field(Tuple{Field(42), Field("Str")})}}));
-    ASSERT_EQ(typed_paths.at("a.b")->size(), 4);
-    ASSERT_TRUE(typed_paths.at("a.b")->isDefaultAt(3));
-    ASSERT_EQ(typed_paths.at("b.d")->size(), 4);
-    ASSERT_TRUE(typed_paths.at("b.d")->isDefaultAt(3));
-    ASSERT_EQ(dynamic_paths.size(), 2);
-    ASSERT_EQ(dynamic_paths.at("a.c")->size(), 4);
-    ASSERT_TRUE(dynamic_paths.at("a.c")->isDefaultAt(3));
-    ASSERT_EQ(dynamic_paths.at("a.d")->size(), 4);
-    ASSERT_TRUE(dynamic_paths.at("a.d")->isDefaultAt(3));
-
-    ASSERT_EQ(shared_data_nested_column.size(), 4);
-    ASSERT_EQ(shared_data_offsets[3] - shared_data_offsets[2], 3);
-    ASSERT_EQ((*shared_data_paths)[2], "b.a");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 2), Field("Str"));
-    ASSERT_EQ((*shared_data_paths)[3], "b.b");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 3), Field(2));
-    ASSERT_EQ((*shared_data_paths)[4], "b.c");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 4), Field(Tuple{Field(42), Field("Str")}));
-
-    Object object4 = {{"c.c", Field(Null())}, {"c.d", Field(Null())}};
-    col_object.insert(object4);
-    ASSERT_TRUE(shared_data_nested_column.isDefaultAt(4));
-}
-
-TEST(ColumnObject, InsertFrom)
-{
-    auto type = DataTypeFactory::instance().get("JSON(max_dynamic_types=10, max_dynamic_paths=2, b.d UInt32, a.b Array(String))");
-    auto col = type->createColumn();
-    auto & col_object = assert_cast<ColumnObject &>(*col);
-    col_object.insert(Object{{"a.a", Field(42)}});
-
-    const auto & typed_paths = col_object.getTypedPaths();
-    const auto & dynamic_paths = col_object.getDynamicPaths();
-    const auto & shared_data_nested_column = col_object.getSharedDataNestedColumn();
-    const auto & shared_data_offsets = col_object.getSharedDataOffsets();
-    const auto [shared_data_paths, shared_data_values] = col_object.getSharedDataPathsAndValues();
-
-    auto src_col1 = type->createColumn();
-    auto & src_col_object1 = assert_cast<ColumnObject &>(*src_col1);
-    src_col_object1.insert(Object{{"b.d", Field(43u)}, {"a.c", Field("Str1")}});
-    col_object.insertFrom(src_col_object1, 0);
-    ASSERT_EQ((*typed_paths.at("a.b"))[1], Field(Array{}));
-    ASSERT_EQ((*typed_paths.at("b.d"))[1], Field(43u));
-    ASSERT_EQ(dynamic_paths.size(), 2);
-    ASSERT_EQ((*dynamic_paths.at("a.a"))[1], Field(Null()));
-    ASSERT_EQ((*dynamic_paths.at("a.c"))[1], Field("Str1"));
-    ASSERT_TRUE(shared_data_nested_column.isDefaultAt(1));
-
-    auto src_col2 = type->createColumn();
-    auto & src_col_object2 = assert_cast<ColumnObject &>(*src_col2);
-    src_col_object2.insert(Object{{"a.b", Array{"Str4", "Str5"}}, {"b.d", Field(44u)}, {"a.d", Field("Str2")}, {"a.e", Field("Str3")}});
-    col_object.insertFrom(src_col_object2, 0);
-    ASSERT_EQ((*typed_paths.at("a.b"))[2], Field(Array{"Str4", "Str5"}));
-    ASSERT_EQ((*typed_paths.at("b.d"))[2], Field(44u));
-    ASSERT_EQ(dynamic_paths.size(), 2);
-    ASSERT_EQ((*dynamic_paths.at("a.a"))[2], Field(Null()));
-    ASSERT_EQ((*dynamic_paths.at("a.c"))[2], Field(Null()));
-    ASSERT_EQ(shared_data_offsets[2] - shared_data_offsets[1], 2);
-    ASSERT_EQ((*shared_data_paths)[0], "a.d");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 0), Field("Str2"));
-    ASSERT_EQ((*shared_data_paths)[1], "a.e");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 1), Field("Str3"));
-
-    auto src_col3 = type->createColumn();
-    auto & src_col_object3 = assert_cast<ColumnObject &>(*src_col3);
-    src_col_object3.insert(Object{{"a.h", Field("Str6")}, {"h.h", Field("Str7")}});
-    src_col_object3.insert(Object{{"a.a", Field("Str10")}, {"a.c", Field(45u)}, {"a.h", Field("Str6")}, {"h.h", Field("Str7")}, {"a.f", Field("Str8")}, {"a.g", Field("Str9")}, {"a.i", Field("Str11")}, {"a.u", Field(Null())}});
-    col_object.insertFrom(src_col_object3, 1);
-    ASSERT_EQ((*typed_paths.at("a.b"))[3], Field(Array{}));
-    ASSERT_EQ((*typed_paths.at("b.d"))[3], Field(0u));
-    ASSERT_EQ(dynamic_paths.size(), 2);
-    ASSERT_EQ((*dynamic_paths.at("a.a"))[3], Field("Str10"));
-    ASSERT_EQ((*dynamic_paths.at("a.c"))[3], Field(45u));
-    ASSERT_EQ(shared_data_offsets[3] - shared_data_offsets[2], 5);
-    ASSERT_EQ((*shared_data_paths)[2], "a.f");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 2), Field("Str8"));
-    ASSERT_EQ((*shared_data_paths)[3], "a.g");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 3), Field("Str9"));
-    ASSERT_EQ((*shared_data_paths)[4], "a.h");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 4), Field("Str6"));
-    ASSERT_EQ((*shared_data_paths)[5], "a.i");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 5), Field("Str11"));
-    ASSERT_EQ((*shared_data_paths)[6], "h.h");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 6), Field("Str7"));
-}
-
-
-TEST(ColumnObject, InsertRangeFrom)
-{
-    auto type = DataTypeFactory::instance().get("JSON(max_dynamic_types=10, max_dynamic_paths=2, b.d UInt32, a.b Array(String))");
-    auto col = type->createColumn();
-    auto & col_object = assert_cast<ColumnObject &>(*col);
-    col_object.insert(Object{{"a.a", Field(42)}});
-
-    const auto & typed_paths = col_object.getTypedPaths();
-    const auto & dynamic_paths = col_object.getDynamicPaths();
-    const auto & shared_data_nested_column = col_object.getSharedDataNestedColumn();
-    const auto & shared_data_offsets = col_object.getSharedDataOffsets();
-    const auto [shared_data_paths, shared_data_values] = col_object.getSharedDataPathsAndValues();
-
-    auto src_col1 = type->createColumn();
-    auto & src_col_object1 = assert_cast<ColumnObject &>(*src_col1);
-    src_col_object1.insert(Object{{"b.d", Field(43u)}, {"a.c", Field("Str1")}});
-    src_col_object1.insert(Object{{"a.b", Field(Array{"Str1", "Str2"})}, {"a.a", Field("Str1")}});
-    src_col_object1.insert(Object{{"b.d", Field(45u)}, {"a.c", Field("Str2")}});
-    col_object.insertRangeFrom(src_col_object1, 0, 3);
-    ASSERT_EQ((*typed_paths.at("a.b"))[1], Field(Array{}));
-    ASSERT_EQ((*typed_paths.at("a.b"))[2], Field(Array{"Str1", "Str2"}));
-    ASSERT_EQ((*typed_paths.at("a.b"))[3], Field(Array{}));
-    ASSERT_EQ((*typed_paths.at("b.d"))[1], Field(43u));
-    ASSERT_EQ((*typed_paths.at("b.d"))[2], Field(0u));
-    ASSERT_EQ((*typed_paths.at("b.d"))[3], Field(45u));
-    ASSERT_EQ(dynamic_paths.size(), 2);
-    ASSERT_EQ((*dynamic_paths.at("a.a"))[1], Field(Null()));
-    ASSERT_EQ((*dynamic_paths.at("a.a"))[2], Field("Str1"));
-    ASSERT_EQ((*dynamic_paths.at("a.a"))[3], Field(Null()));
-    ASSERT_EQ((*dynamic_paths.at("a.c"))[1], Field("Str1"));
-    ASSERT_EQ((*dynamic_paths.at("a.c"))[2], Field(Null()));
-    ASSERT_EQ((*dynamic_paths.at("a.c"))[3], Field("Str2"));
-    ASSERT_TRUE(shared_data_nested_column.isDefaultAt(1));
-    ASSERT_TRUE(shared_data_nested_column.isDefaultAt(2));
-    ASSERT_TRUE(shared_data_nested_column.isDefaultAt(3));
-
-    auto src_col2 = type->createColumn();
-    auto & src_col_object2 = assert_cast<ColumnObject &>(*src_col2);
-    src_col_object2.insert(Object{{"a.b", Array{"Str4", "Str5"}}, {"a.d", Field("Str2")}, {"a.e", Field("Str3")}});
-    src_col_object2.insert(Object{{"b.d", Field(44u)}, {"a.d", Field("Str22")}, {"a.e", Field("Str33")}});
-    src_col_object2.insert(Object{{"a.b", Array{"Str44", "Str55"}}, {"a.d", Field("Str222")}, {"a.e", Field("Str333")}});
-    col_object.insertRangeFrom(src_col_object2, 0, 3);
-    ASSERT_EQ((*typed_paths.at("a.b"))[4], Field(Array{"Str4", "Str5"}));
-    ASSERT_EQ((*typed_paths.at("a.b"))[5], Field(Array{}));
-    ASSERT_EQ((*typed_paths.at("a.b"))[6], Field(Array{"Str44", "Str55"}));
-    ASSERT_EQ((*typed_paths.at("b.d"))[4], Field(0u));
-    ASSERT_EQ((*typed_paths.at("b.d"))[5], Field(44u));
-    ASSERT_EQ((*typed_paths.at("b.d"))[6], Field(0u));
-    ASSERT_EQ(dynamic_paths.size(), 2);
-    ASSERT_EQ((*dynamic_paths.at("a.a"))[4], Field(Null()));
-    ASSERT_EQ((*dynamic_paths.at("a.a"))[5], Field(Null()));
-    ASSERT_EQ((*dynamic_paths.at("a.a"))[6], Field(Null()));
-    ASSERT_EQ((*dynamic_paths.at("a.c"))[4], Field(Null()));
-    ASSERT_EQ((*dynamic_paths.at("a.c"))[5], Field(Null()));
-    ASSERT_EQ((*dynamic_paths.at("a.c"))[6], Field(Null()));
-    ASSERT_EQ(shared_data_offsets[4] - shared_data_offsets[3], 2);
-    ASSERT_EQ((*shared_data_paths)[0], "a.d");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 0), Field("Str2"));
-    ASSERT_EQ((*shared_data_paths)[1], "a.e");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 1), Field("Str3"));
-    ASSERT_EQ(shared_data_offsets[5] - shared_data_offsets[4], 2);
-    ASSERT_EQ((*shared_data_paths)[2], "a.d");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 2), Field("Str22"));
-    ASSERT_EQ((*shared_data_paths)[3], "a.e");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 3), Field("Str33"));
-    ASSERT_EQ(shared_data_offsets[6] - shared_data_offsets[5], 2);
-    ASSERT_EQ((*shared_data_paths)[4], "a.d");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 4), Field("Str222"));
-    ASSERT_EQ((*shared_data_paths)[5], "a.e");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 5), Field("Str333"));
-
-    auto src_col3 = type->createColumn();
-    auto & src_col_object3 = assert_cast<ColumnObject &>(*src_col3);
-    src_col_object3.insert(Object{{"a.h", Field("Str6")}, {"h.h", Field("Str7")}});
-    src_col_object3.insert(Object{{"a.h", Field("Str6")}, {"h.h", Field("Str7")}, {"a.f", Field("Str8")}, {"a.g", Field("Str9")}, {"a.i", Field("Str11")}});
-    src_col_object3.insert(Object{{"a.a", Field("Str10")}});
-    src_col_object3.insert(Object{{"a.h", Field("Str6")}, {"a.c", Field(45u)}, {"h.h", Field("Str7")}, {"a.i", Field("Str11")}});
-    col_object.insertRangeFrom(src_col_object3, 1, 3);
-    ASSERT_EQ((*typed_paths.at("a.b"))[7], Field(Array{}));
-    ASSERT_EQ((*typed_paths.at("a.b"))[8], Field(Array{}));
-    ASSERT_EQ((*typed_paths.at("a.b"))[9], Field(Array{}));
-    ASSERT_EQ((*typed_paths.at("b.d"))[7], Field(0u));
-    ASSERT_EQ((*typed_paths.at("b.d"))[8], Field(0u));
-    ASSERT_EQ((*typed_paths.at("b.d"))[9], Field(0u));
-    ASSERT_EQ(dynamic_paths.size(), 2);
-    ASSERT_EQ((*dynamic_paths.at("a.a"))[7], Field(Null()));
-    ASSERT_EQ((*dynamic_paths.at("a.a"))[8], Field("Str10"));
-    ASSERT_EQ((*dynamic_paths.at("a.a"))[9], Field(Null()));
-    ASSERT_EQ((*dynamic_paths.at("a.c"))[7], Field(Null()));
-    ASSERT_EQ((*dynamic_paths.at("a.c"))[8], Field(Null()));
-    ASSERT_EQ((*dynamic_paths.at("a.c"))[9], Field(45u));
-    ASSERT_EQ(shared_data_offsets[7] - shared_data_offsets[6], 5);
-    ASSERT_EQ((*shared_data_paths)[6], "a.f");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 6), Field("Str8"));
-    ASSERT_EQ((*shared_data_paths)[7], "a.g");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 7), Field("Str9"));
-    ASSERT_EQ((*shared_data_paths)[8], "a.h");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 8), Field("Str6"));
-    ASSERT_EQ((*shared_data_paths)[9], "a.i");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 9), Field("Str11"));
-    ASSERT_EQ((*shared_data_paths)[10], "h.h");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 10), Field("Str7"));
-    ASSERT_EQ(shared_data_offsets[8] - shared_data_offsets[7], 0);
-    ASSERT_EQ(shared_data_offsets[9] - shared_data_offsets[8], 3);
-    ASSERT_EQ((*shared_data_paths)[11], "a.h");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 11), Field("Str6"));
-    ASSERT_EQ((*shared_data_paths)[12], "a.i");
-    ASSERT_EQ(deserializeFieldFromSharedData(shared_data_values, 12), Field("Str11"));
-}
-
-TEST(ColumnObject, SerializeDeserializerFromArena)
-{
-    auto type = DataTypeFactory::instance().get("JSON(max_dynamic_types=10, max_dynamic_paths=2, b.d UInt32, a.b Array(String))");
-    auto col = type->createColumn();
-    auto & col_object = assert_cast<ColumnObject &>(*col);
-    col_object.insert(Object{{"b.d", Field(42u)}, {"a.b", Array{"Str1", "Str2"}}, {"a.a", Tuple{"Str3", 441u}}, {"a.c", Field("Str4")}, {"a.d", Array{Field(45), Field(46)}}, {"a.e", Field(47)}});
-    col_object.insert(Object{{"b.a", Field(48)}, {"b.b", Array{Field(49), Field(50)}}});
-    col_object.insert(Object{{"b.d", Field(442u)}, {"a.b", Array{"Str11", "Str22"}}, {"a.a", Tuple{"Str33", 444u}}, {"a.c", Field("Str44")}, {"a.d", Array{Field(445), Field(446)}}, {"a.e", Field(447)}});
-
-    Arena arena;
-    const char * pos = nullptr;
-    auto ref1 = col_object.serializeValueIntoArena(0, arena, pos);
-    col_object.serializeValueIntoArena(1, arena, pos);
-    col_object.serializeValueIntoArena(2, arena, pos);
-
-    auto col2 = type->createColumn();
-    auto & col_object2 = assert_cast<ColumnObject &>(*col);
-    pos = col_object2.deserializeAndInsertFromArena(ref1.data);
-    pos = col_object2.deserializeAndInsertFromArena(pos);
-    col_object2.deserializeAndInsertFromArena(pos);
-
-    ASSERT_EQ(col_object2[0], (Object{{"b.d", Field(42u)}, {"a.b", Array{"Str1", "Str2"}}, {"a.a", Tuple{"Str3", 441u}}, {"a.c", Field("Str4")}, {"a.d", Array{Field(45), Field(46)}}, {"a.e", Field(47)}}));
-    ASSERT_EQ(col_object2[1], (Object{{"b.d", Field{0u}}, {"a.b", Array{}}, {"b.a", Field(48)}, {"b.b", Array{Field(49), Field(50)}}}));
-    ASSERT_EQ(col_object2[2], (Object{{"b.d", Field(442u)}, {"a.b", Array{"Str11", "Str22"}}, {"a.a", Tuple{"Str33", 444u}}, {"a.c", Field("Str44")}, {"a.d", Array{Field(445), Field(446)}}, {"a.e", Field(447)}}));
-}
-
-TEST(ColumnObject, SkipSerializedInArena)
-{
-    auto type = DataTypeFactory::instance().get("JSON(max_dynamic_types=10, max_dynamic_paths=2, b.d UInt32, a.b Array(String))");
-    auto col = type->createColumn();
-    auto & col_object = assert_cast<ColumnObject &>(*col);
-    col_object.insert(Object{{"b.d", Field(42u)}, {"a.b", Array{"Str1", "Str2"}}, {"a.a", Tuple{"Str3", 441u}}, {"a.c", Field("Str4")}, {"a.d", Array{Field(45), Field(46)}}, {"a.e", Field(47)}});
-    col_object.insert(Object{{"b.a", Field(48)}, {"b.b", Array{Field(49), Field(50)}}});
-    col_object.insert(Object{{"b.d", Field(442u)}, {"a.b", Array{"Str11", "Str22"}}, {"a.a", Tuple{"Str33", 444u}}, {"a.c", Field("Str44")}, {"a.d", Array{Field(445), Field(446)}}, {"a.e", Field(447)}});
-
-    Arena arena;
-    const char * pos = nullptr;
-    auto ref1 = col_object.serializeValueIntoArena(0, arena, pos);
-    col_object.serializeValueIntoArena(1, arena, pos);
-    auto ref3 = col_object.serializeValueIntoArena(2, arena, pos);
-
-    const char * end = ref3.data + ref3.size;
-    auto col2 = type->createColumn();
-    pos = col2->skipSerializedInArena(ref1.data);
-    pos = col2->skipSerializedInArena(pos);
-    pos = col2->skipSerializedInArena(pos);
-    ASSERT_EQ(pos, end);
-}
diff --git a/src/Columns/tests/gtest_column_variant.cpp b/src/Columns/tests/gtest_column_variant.cpp
index 5e481b88409..25f276b9600 100644
--- a/src/Columns/tests/gtest_column_variant.cpp
+++ b/src/Columns/tests/gtest_column_variant.cpp
@@ -108,10 +108,10 @@ void checkColumnVariant1(ColumnVariant * column)
     ASSERT_EQ(offsets[1], 0);
     ASSERT_EQ(offsets[3], 1);
     ASSERT_TRUE(column->isDefaultAt(2) && column->isDefaultAt(4));
-    ASSERT_EQ((*column)[0].safeGet<UInt32>(), 42);
-    ASSERT_EQ((*column)[1].safeGet<String>(), "Hello");
+    ASSERT_EQ((*column)[0].get<UInt32>(), 42);
+    ASSERT_EQ((*column)[1].get<String>(), "Hello");
     ASSERT_TRUE((*column)[2].isNull());
-    ASSERT_EQ((*column)[3].safeGet<String>(), "World");
+    ASSERT_EQ((*column)[3].get<String>(), "World");
     ASSERT_TRUE((*column)[4].isNull());
 }
 
@@ -209,9 +209,9 @@ TEST(ColumnVariant, CreateFromDiscriminatorsAndOneFullColumnNoNulls)
     ASSERT_EQ(offsets[0], 0);
     ASSERT_EQ(offsets[1], 1);
     ASSERT_EQ(offsets[2], 2);
-    ASSERT_EQ((*column)[0].safeGet<UInt64>(), 0);
-    ASSERT_EQ((*column)[1].safeGet<UInt64>(), 1);
-    ASSERT_EQ((*column)[2].safeGet<UInt64>(), 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)
@@ -222,9 +222,9 @@ TEST(ColumnVariant, CreateFromDiscriminatorsAndOneFullColumnNoNullsWithLocalOrde
     ASSERT_EQ(offsets[0], 0);
     ASSERT_EQ(offsets[1], 1);
     ASSERT_EQ(offsets[2], 2);
-    ASSERT_EQ((*column)[0].safeGet<UInt64>(), 0);
-    ASSERT_EQ((*column)[1].safeGet<UInt64>(), 1);
-    ASSERT_EQ((*column)[2].safeGet<UInt64>(), 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);
@@ -331,9 +331,9 @@ TEST(ColumnVariant, CloneResizedGeneral1)
     ASSERT_EQ(offsets[0], 0);
     ASSERT_EQ(offsets[1], 0);
     ASSERT_EQ(offsets[3], 1);
-    ASSERT_EQ((*resized_column_variant)[0].safeGet<UInt64>(), 42);
-    ASSERT_EQ((*resized_column_variant)[1].safeGet<String>(), "Hello");
-    ASSERT_EQ((*resized_column_variant)[3].safeGet<UInt64>(), 43);
+    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)
@@ -367,7 +367,7 @@ TEST(ColumnVariant, CloneResizedGeneral2)
     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].safeGet<UInt64>(), 42);
+    ASSERT_EQ((*resized_column_variant)[0].get<UInt64>(), 42);
 }
 
 TEST(ColumnVariant, CloneResizedGeneral3)
@@ -405,10 +405,10 @@ TEST(ColumnVariant, CloneResizedGeneral3)
     ASSERT_EQ(offsets[1], 0);
     ASSERT_EQ(offsets[2], 1);
     ASSERT_EQ(offsets[3], 1);
-    ASSERT_EQ((*resized_column_variant)[0].safeGet<UInt64>(), 42);
-    ASSERT_EQ((*resized_column_variant)[1].safeGet<String>(), "Hello");
-    ASSERT_EQ((*resized_column_variant)[2].safeGet<String>(), "World");
-    ASSERT_EQ((*resized_column_variant)[3].safeGet<UInt64>(), 43);
+    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()
@@ -465,7 +465,7 @@ TEST(ColumnVariant, InsertFrom)
         auto column_from = createVariantColumn2(change_order);
         column_to->insertFrom(*column_from, 3);
         ASSERT_EQ(column_to->globalDiscriminatorAt(5), 0);
-        ASSERT_EQ((*column_to)[5].safeGet<UInt64>(), 43);
+        ASSERT_EQ((*column_to)[5].get<UInt64>(), 43);
     }
 }
 
@@ -478,8 +478,8 @@ TEST(ColumnVariant, InsertRangeFromOneColumnNoNulls)
         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].safeGet<UInt64>(), 2);
-        ASSERT_EQ((*column_to)[8].safeGet<UInt64>(), 3);
+        ASSERT_EQ((*column_to)[7].get<UInt64>(), 2);
+        ASSERT_EQ((*column_to)[8].get<UInt64>(), 3);
     }
 }
 
@@ -494,9 +494,9 @@ TEST(ColumnVariant, InsertRangeFromGeneral)
         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].safeGet<String>(), "Hello");
-        ASSERT_EQ((*column_to)[7].safeGet<UInt64>(), 43);
-        ASSERT_EQ((*column_to)[8].safeGet<String>(), "World");
+        ASSERT_EQ((*column_to)[5].get<String>(), "Hello");
+        ASSERT_EQ((*column_to)[7].get<UInt64>(), 43);
+        ASSERT_EQ((*column_to)[8].get<String>(), "World");
     }
 }
 
@@ -509,8 +509,8 @@ TEST(ColumnVariant, InsertManyFrom)
         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].safeGet<UInt64>(), 43);
-        ASSERT_EQ((*column_to)[6].safeGet<UInt64>(), 43);
+        ASSERT_EQ((*column_to)[5].get<UInt64>(), 43);
+        ASSERT_EQ((*column_to)[6].get<UInt64>(), 43);
     }
 }
 
@@ -520,8 +520,8 @@ TEST(ColumnVariant, PopBackOneColumnNoNulls)
     column->popBack(3);
     ASSERT_EQ(column->size(), 2);
     ASSERT_EQ(column->getVariantByLocalDiscriminator(0).size(), 2);
-    ASSERT_EQ((*column)[0].safeGet<UInt64>(), 0);
-    ASSERT_EQ((*column)[1].safeGet<UInt64>(), 1);
+    ASSERT_EQ((*column)[0].get<UInt64>(), 0);
+    ASSERT_EQ((*column)[1].get<UInt64>(), 1);
 }
 
 TEST(ColumnVariant, PopBackGeneral)
@@ -531,8 +531,8 @@ TEST(ColumnVariant, PopBackGeneral)
     ASSERT_EQ(column->size(), 3);
     ASSERT_EQ(column->getVariantByLocalDiscriminator(0).size(), 1);
     ASSERT_EQ(column->getVariantByLocalDiscriminator(1).size(), 1);
-    ASSERT_EQ((*column)[0].safeGet<UInt64>(), 42);
-    ASSERT_EQ((*column)[1].safeGet<String>(), "Hello");
+    ASSERT_EQ((*column)[0].get<UInt64>(), 42);
+    ASSERT_EQ((*column)[1].get<String>(), "Hello");
     ASSERT_TRUE((*column)[2].isNull());
 }
 
@@ -545,8 +545,8 @@ TEST(ColumnVariant, FilterOneColumnNoNulls)
     filter.push_back(1);
     auto filtered_column = column->filter(filter, -1);
     ASSERT_EQ(filtered_column->size(), 2);
-    ASSERT_EQ((*filtered_column)[0].safeGet<UInt64>(), 0);
-    ASSERT_EQ((*filtered_column)[1].safeGet<UInt64>(), 2);
+    ASSERT_EQ((*filtered_column)[0].get<UInt64>(), 0);
+    ASSERT_EQ((*filtered_column)[1].get<UInt64>(), 2);
 }
 
 TEST(ColumnVariant, FilterGeneral)
@@ -562,7 +562,7 @@ TEST(ColumnVariant, FilterGeneral)
     filter.push_back(0);
     auto filtered_column = column->filter(filter, -1);
     ASSERT_EQ(filtered_column->size(), 3);
-    ASSERT_EQ((*filtered_column)[0].safeGet<String>(), "Hello");
+    ASSERT_EQ((*filtered_column)[0].get<String>(), "Hello");
     ASSERT_TRUE((*filtered_column)[1].isNull());
     ASSERT_TRUE((*filtered_column)[2].isNull());
 }
@@ -577,9 +577,9 @@ TEST(ColumnVariant, PermuteAndIndexOneColumnNoNulls)
     permutation.push_back(0);
     auto permuted_column = column->permute(permutation, 3);
     ASSERT_EQ(permuted_column->size(), 3);
-    ASSERT_EQ((*permuted_column)[0].safeGet<UInt64>(), 1);
-    ASSERT_EQ((*permuted_column)[1].safeGet<UInt64>(), 3);
-    ASSERT_EQ((*permuted_column)[2].safeGet<UInt64>(), 2);
+    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);
@@ -588,9 +588,9 @@ TEST(ColumnVariant, PermuteAndIndexOneColumnNoNulls)
     index->getData().push_back(0);
     auto indexed_column = column->index(*index, 3);
     ASSERT_EQ(indexed_column->size(), 3);
-    ASSERT_EQ((*indexed_column)[0].safeGet<UInt64>(), 1);
-    ASSERT_EQ((*indexed_column)[1].safeGet<UInt64>(), 3);
-    ASSERT_EQ((*indexed_column)[2].safeGet<UInt64>(), 2);
+    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)
@@ -603,9 +603,9 @@ TEST(ColumnVariant, PermuteGeneral)
     permutation.push_back(5);
     auto permuted_column = column->permute(permutation, 4);
     ASSERT_EQ(permuted_column->size(), 4);
-    ASSERT_EQ((*permuted_column)[0].safeGet<UInt64>(), 43);
-    ASSERT_EQ((*permuted_column)[1].safeGet<String>(), "World");
-    ASSERT_EQ((*permuted_column)[2].safeGet<String>(), "Hello");
+    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());
 }
 
@@ -618,12 +618,12 @@ TEST(ColumnVariant, ReplicateOneColumnNoNull)
     offsets.push_back(6);
     auto replicated_column = column->replicate(offsets);
     ASSERT_EQ(replicated_column->size(), 6);
-    ASSERT_EQ((*replicated_column)[0].safeGet<UInt64>(), 1);
-    ASSERT_EQ((*replicated_column)[1].safeGet<UInt64>(), 1);
-    ASSERT_EQ((*replicated_column)[2].safeGet<UInt64>(), 1);
-    ASSERT_EQ((*replicated_column)[3].safeGet<UInt64>(), 2);
-    ASSERT_EQ((*replicated_column)[4].safeGet<UInt64>(), 2);
-    ASSERT_EQ((*replicated_column)[5].safeGet<UInt64>(), 2);
+    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)
@@ -637,9 +637,9 @@ TEST(ColumnVariant, ReplicateGeneral)
     offsets.push_back(7);
     auto replicated_column = column->replicate(offsets);
     ASSERT_EQ(replicated_column->size(), 7);
-    ASSERT_EQ((*replicated_column)[0].safeGet<UInt64>(), 42);
-    ASSERT_EQ((*replicated_column)[1].safeGet<String>(), "Hello");
-    ASSERT_EQ((*replicated_column)[2].safeGet<String>(), "Hello");
+    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());
@@ -657,13 +657,13 @@ TEST(ColumnVariant, ScatterOneColumnNoNulls)
     selector.push_back(1);
     auto columns = column->scatter(3, selector);
     ASSERT_EQ(columns[0]->size(), 2);
-    ASSERT_EQ((*columns[0])[0].safeGet<UInt64>(), 0);
-    ASSERT_EQ((*columns[0])[1].safeGet<UInt64>(), 3);
+    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].safeGet<UInt64>(), 1);
-    ASSERT_EQ((*columns[1])[1].safeGet<UInt64>(), 4);
+    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].safeGet<UInt64>(), 2);
+    ASSERT_EQ((*columns[2])[0].get<UInt64>(), 2);
 }
 
 TEST(ColumnVariant, ScatterGeneral)
@@ -680,12 +680,12 @@ TEST(ColumnVariant, ScatterGeneral)
 
     auto columns = column->scatter(3, selector);
     ASSERT_EQ(columns[0]->size(), 3);
-    ASSERT_EQ((*columns[0])[0].safeGet<UInt64>(), 42);
-    ASSERT_EQ((*columns[0])[1].safeGet<String>(), "Hello");
-    ASSERT_EQ((*columns[0])[2].safeGet<UInt64>(), 43);
+    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].safeGet<String>(), "World");
-    ASSERT_EQ((*columns[1])[1].safeGet<UInt64>(), 44);
+    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_low_cardinality.cpp b/src/Columns/tests/gtest_low_cardinality.cpp
index ce16d2cadb1..5e01279b7df 100644
--- a/src/Columns/tests/gtest_low_cardinality.cpp
+++ b/src/Columns/tests/gtest_low_cardinality.cpp
@@ -20,13 +20,13 @@ void testLowCardinalityNumberInsert(const DataTypePtr & data_type)
 
     Field value;
     column->get(0, value);
-    ASSERT_EQ(value.safeGet<T>(), 15);
+    ASSERT_EQ(value.get<T>(), 15);
 
     column->get(1, value);
-    ASSERT_EQ(value.safeGet<T>(), 20);
+    ASSERT_EQ(value.get<T>(), 20);
 
     column->get(2, value);
-    ASSERT_EQ(value.safeGet<T>(), 25);
+    ASSERT_EQ(value.get<T>(), 25);
 }
 
 TEST(ColumnLowCardinality, Insert)
diff --git a/src/Common/AsyncLoader.cpp b/src/Common/AsyncLoader.cpp
index d40e320e741..6264eb03106 100644
--- a/src/Common/AsyncLoader.cpp
+++ b/src/Common/AsyncLoader.cpp
@@ -218,27 +218,20 @@ AsyncLoader::~AsyncLoader()
 {
     // 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())
-        {
-            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();
-        }
-    }
+    std::unique_lock lock{mutex};
+    if (scheduled_jobs.empty() && finished_jobs.empty())
+        return;
 
-    // When all jobs are done we could still have finalizing workers.
-    // These workers could call updateCurrentPriorityAndSpawn() that scans all pools.
-    // We need to stop all of them before destructing any of them.
-    stop();
+    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()
diff --git a/src/Common/AsynchronousMetrics.cpp b/src/Common/AsynchronousMetrics.cpp
index a92d321f8aa..6309f6079f6 100644
--- a/src/Common/AsynchronousMetrics.cpp
+++ b/src/Common/AsynchronousMetrics.cpp
@@ -1,24 +1,18 @@
+#include <Common/formatReadable.h>
+#include <Common/AsynchronousMetrics.h>
+#include <Common/Exception.h>
+#include <Common/setThreadName.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/filesystemHelpers.h>
+#include <Common/logger_useful.h>
+#include <IO/UncompressedCache.h>
 #include <IO/MMappedFileCache.h>
 #include <IO/ReadHelpers.h>
-#include <IO/UncompressedCache.h>
-#include <base/cgroupsv2.h>
 #include <base/errnoToString.h>
 #include <base/find_symbols.h>
 #include <base/getPageSize.h>
 #include <sys/resource.h>
-#include <Common/AsynchronousMetrics.h>
-#include <Common/CurrentMetrics.h>
-#include <Common/Exception.h>
-#include <Common/Jemalloc.h>
-#include <Common/filesystemHelpers.h>
-#include <Common/formatReadable.h>
-#include <Common/logger_useful.h>
-#include <Common/setThreadName.h>
-
-#include <boost/locale/date_time_facet.hpp>
-
 #include <chrono>
-#include <string_view>
 
 #include "config.h"
 
@@ -58,36 +52,32 @@ static std::unique_ptr<ReadBufferFromFilePRead> openFileIfExists(const std::stri
     return {};
 }
 
-static void openCgroupv2MetricFile(const std::string & filename, std::optional<ReadBufferFromFilePRead> & out)
-{
-    if (auto path = getCgroupsV2PathContainingFile(filename))
-        openFileIfExists((path.value() + filename).c_str(), out);
-};
-
 #endif
 
 
 AsynchronousMetrics::AsynchronousMetrics(
     unsigned update_period_seconds,
-    const ProtocolServerMetricsFunc & protocol_server_metrics_func_,
-    bool update_jemalloc_epoch_,
-    bool update_rss_)
+    const ProtocolServerMetricsFunc & protocol_server_metrics_func_)
     : update_period(update_period_seconds)
     , log(getLogger("AsynchronousMetrics"))
     , protocol_server_metrics_func(protocol_server_metrics_func_)
-    , update_jemalloc_epoch(update_jemalloc_epoch_)
-    , update_rss(update_rss_)
 {
 #if defined(OS_LINUX)
+    openFileIfExists("/proc/meminfo", meminfo);
+    openFileIfExists("/proc/loadavg", loadavg);
+    openFileIfExists("/proc/stat", proc_stat);
     openFileIfExists("/proc/cpuinfo", cpuinfo);
     openFileIfExists("/proc/sys/fs/file-nr", file_nr);
+    openFileIfExists("/proc/uptime", uptime);
     openFileIfExists("/proc/net/dev", net_dev);
 
     /// CGroups v2
-    openCgroupv2MetricFile("memory.max", cgroupmem_limit_in_bytes);
-    openCgroupv2MetricFile("memory.current", cgroupmem_usage_in_bytes);
-    openCgroupv2MetricFile("cpu.max", cgroupcpu_max);
-    openCgroupv2MetricFile("cpu.stat", cgroupcpu_stat);
+    openFileIfExists("/sys/fs/cgroup/memory.max", cgroupmem_limit_in_bytes);
+    if (cgroupmem_limit_in_bytes)
+    {
+        openFileIfExists("/sys/fs/cgroup/memory.current", cgroupmem_usage_in_bytes);
+    }
+    openFileIfExists("/sys/fs/cgroup/cpu.max", cgroupcpu_max);
 
     /// CGroups v1
     if (!cgroupmem_limit_in_bytes)
@@ -100,21 +90,6 @@ AsynchronousMetrics::AsynchronousMetrics(
         openFileIfExists("/sys/fs/cgroup/cpu/cpu.cfs_period_us", cgroupcpu_cfs_period);
         openFileIfExists("/sys/fs/cgroup/cpu/cpu.cfs_quota_us", cgroupcpu_cfs_quota);
     }
-    if (!cgroupcpu_stat)
-        openFileIfExists("/sys/fs/cgroup/cpuacct/cpuacct.stat", cgroupcpuacct_stat);
-
-    if (!cgroupcpu_stat && !cgroupcpuacct_stat)
-    {
-        /// The following metrics are not cgroup-aware and we've found cgroup-specific metric files for the similar metrics,
-        /// so we're better not reporting them at all to avoid confusion
-        openFileIfExists("/proc/loadavg", loadavg);
-        openFileIfExists("/proc/stat", proc_stat);
-        openFileIfExists("/proc/uptime", uptime);
-    }
-
-    /// The same story for memory metrics
-    if (!cgroupmem_limit_in_bytes)
-        openFileIfExists("/proc/meminfo", meminfo);
 
     openFileIfExists("/proc/sys/vm/max_map_count", vm_max_map_count);
     openFileIfExists("/proc/self/maps", vm_maps);
@@ -415,7 +390,9 @@ Value saveJemallocMetricImpl(
     const std::string & jemalloc_full_name,
     const std::string & clickhouse_full_name)
 {
-    auto value = getJemallocValue<Value>(jemalloc_full_name.c_str());
+    Value value{};
+    size_t size = sizeof(value);
+    mallctl(jemalloc_full_name.c_str(), &value, &size, nullptr, 0);
     values[clickhouse_full_name] = AsynchronousMetricValue(value, "An internal metric of the low-level memory allocator (jemalloc). See https://jemalloc.net/jemalloc.3.html");
     return value;
 }
@@ -593,151 +570,6 @@ AsynchronousMetrics::NetworkInterfaceStatValues::operator-(const AsynchronousMet
 #endif
 
 
-#if defined(OS_LINUX)
-void AsynchronousMetrics::applyCPUMetricsUpdate(
-    AsynchronousMetricValues & new_values, const std::string & cpu_suffix, const ProcStatValuesCPU & delta_values, double multiplier)
-{
-    new_values["OSUserTime" + cpu_suffix]
-        = {delta_values.user * multiplier,
-           "The ratio of time the CPU core was running userspace code. This is a system-wide metric, it includes all the processes on the "
-           "host machine, not just clickhouse-server."
-           " This includes also the time when the CPU was under-utilized due to the reasons internal to the CPU (memory loads, pipeline "
-           "stalls, branch mispredictions, running another SMT core)."
-           " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across "
-           "them [0..num cores]."};
-    new_values["OSNiceTime" + cpu_suffix]
-        = {delta_values.nice * multiplier,
-           "The ratio of time the CPU core was running userspace code with higher priority. This is a system-wide metric, it includes all "
-           "the processes on the host machine, not just clickhouse-server."
-           " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across "
-           "them [0..num cores]."};
-    new_values["OSSystemTime" + cpu_suffix]
-        = {delta_values.system * multiplier,
-           "The ratio of time the CPU core was running OS kernel (system) code. This is a system-wide metric, it includes all the "
-           "processes on the host machine, not just clickhouse-server."
-           " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across "
-           "them [0..num cores]."};
-    new_values["OSIdleTime" + cpu_suffix]
-        = {delta_values.idle * multiplier,
-           "The ratio of time the CPU core was idle (not even ready to run a process waiting for IO) from the OS kernel standpoint. This "
-           "is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server."
-           " This does not include the time when the CPU was under-utilized due to the reasons internal to the CPU (memory loads, pipeline "
-           "stalls, branch mispredictions, running another SMT core)."
-           " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across "
-           "them [0..num cores]."};
-    new_values["OSIOWaitTime" + cpu_suffix]
-        = {delta_values.iowait * multiplier,
-           "The ratio of time the CPU core was not running the code but when the OS kernel did not run any other process on this CPU as "
-           "the processes were waiting for IO. This is a system-wide metric, it includes all the processes on the host machine, not just "
-           "clickhouse-server."
-           " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across "
-           "them [0..num cores]."};
-    new_values["OSIrqTime" + cpu_suffix]
-        = {delta_values.irq * multiplier,
-           "The ratio of time spent for running hardware interrupt requests on the CPU. This is a system-wide metric, it includes all the "
-           "processes on the host machine, not just clickhouse-server."
-           " A high number of this metric may indicate hardware misconfiguration or a very high network load."
-           " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across "
-           "them [0..num cores]."};
-    new_values["OSSoftIrqTime" + cpu_suffix]
-        = {delta_values.softirq * multiplier,
-           "The ratio of time spent for running software interrupt requests on the CPU. This is a system-wide metric, it includes all the "
-           "processes on the host machine, not just clickhouse-server."
-           " A high number of this metric may indicate inefficient software running on the system."
-           " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across "
-           "them [0..num cores]."};
-    new_values["OSStealTime" + cpu_suffix]
-        = {delta_values.steal * multiplier,
-           "The ratio of time spent in other operating systems by the CPU when running in a virtualized environment. This is a system-wide "
-           "metric, it includes all the processes on the host machine, not just clickhouse-server."
-           " Not every virtualized environments present this metric, and most of them don't."
-           " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across "
-           "them [0..num cores]."};
-    new_values["OSGuestTime" + cpu_suffix]
-        = {delta_values.guest * multiplier,
-           "The ratio of time spent running a virtual CPU for guest operating systems under the control of the Linux kernel (See `man "
-           "procfs`). This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server."
-           " This metric is irrelevant for ClickHouse, but still exists for completeness."
-           " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across "
-           "them [0..num cores]."};
-    new_values["OSGuestNiceTime" + cpu_suffix]
-        = {delta_values.guest_nice * multiplier,
-           "The ratio of time spent running a virtual CPU for guest operating systems under the control of the Linux kernel, when a guest "
-           "was set to a higher priority (See `man procfs`). This is a system-wide metric, it includes all the processes on the host "
-           "machine, not just clickhouse-server."
-           " This metric is irrelevant for ClickHouse, but still exists for completeness."
-           " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across "
-           "them [0..num cores]."};
-}
-
-void AsynchronousMetrics::applyNormalizedCPUMetricsUpdate(
-    AsynchronousMetricValues & new_values, double num_cpus_to_normalize, const ProcStatValuesCPU & delta_values_all_cpus, double multiplier)
-{
-    chassert(num_cpus_to_normalize);
-
-    new_values["OSUserTimeNormalized"]
-        = {delta_values_all_cpus.user * multiplier / num_cpus_to_normalize,
-           "The value is similar to `OSUserTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless "
-           "of the number of cores."
-           " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is "
-           "non-uniform, and still get the average resource utilization metric."};
-    new_values["OSNiceTimeNormalized"]
-        = {delta_values_all_cpus.nice * multiplier / num_cpus_to_normalize,
-           "The value is similar to `OSNiceTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless "
-           "of the number of cores."
-           " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is "
-           "non-uniform, and still get the average resource utilization metric."};
-    new_values["OSSystemTimeNormalized"]
-        = {delta_values_all_cpus.system * multiplier / num_cpus_to_normalize,
-           "The value is similar to `OSSystemTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless "
-           "of the number of cores."
-           " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is "
-           "non-uniform, and still get the average resource utilization metric."};
-    new_values["OSIdleTimeNormalized"]
-        = {delta_values_all_cpus.idle * multiplier / num_cpus_to_normalize,
-           "The value is similar to `OSIdleTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless "
-           "of the number of cores."
-           " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is "
-           "non-uniform, and still get the average resource utilization metric."};
-    new_values["OSIOWaitTimeNormalized"]
-        = {delta_values_all_cpus.iowait * multiplier / num_cpus_to_normalize,
-           "The value is similar to `OSIOWaitTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless "
-           "of the number of cores."
-           " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is "
-           "non-uniform, and still get the average resource utilization metric."};
-    new_values["OSIrqTimeNormalized"]
-        = {delta_values_all_cpus.irq * multiplier / num_cpus_to_normalize,
-           "The value is similar to `OSIrqTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of "
-           "the number of cores."
-           " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is "
-           "non-uniform, and still get the average resource utilization metric."};
-    new_values["OSSoftIrqTimeNormalized"]
-        = {delta_values_all_cpus.softirq * multiplier / num_cpus_to_normalize,
-           "The value is similar to `OSSoftIrqTime` but divided to the number of CPU cores to be measured in the [0..1] interval "
-           "regardless of the number of cores."
-           " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is "
-           "non-uniform, and still get the average resource utilization metric."};
-    new_values["OSStealTimeNormalized"]
-        = {delta_values_all_cpus.steal * multiplier / num_cpus_to_normalize,
-           "The value is similar to `OSStealTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless "
-           "of the number of cores."
-           " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is "
-           "non-uniform, and still get the average resource utilization metric."};
-    new_values["OSGuestTimeNormalized"]
-        = {delta_values_all_cpus.guest * multiplier / num_cpus_to_normalize,
-           "The value is similar to `OSGuestTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless "
-           "of the number of cores."
-           " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is "
-           "non-uniform, and still get the average resource utilization metric."};
-    new_values["OSGuestNiceTimeNormalized"]
-        = {delta_values_all_cpus.guest_nice * multiplier / num_cpus_to_normalize,
-           "The value is similar to `OSGuestNiceTime` but divided to the number of CPU cores to be measured in the [0..1] interval "
-           "regardless of the number of cores."
-           " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is "
-           "non-uniform, and still get the average resource utilization metric."};
-}
-#endif
-
 void AsynchronousMetrics::update(TimePoint update_time, bool force_update)
 {
     Stopwatch watch;
@@ -770,11 +602,8 @@ void AsynchronousMetrics::update(TimePoint update_time, bool force_update)
     // 'epoch' is a special mallctl -- it updates the statistics. Without it, all
     // the following calls will return stale values. It increments and returns
     // the current epoch number, which might be useful to log as a sanity check.
-    auto epoch = update_jemalloc_epoch ? updateJemallocEpoch() : getJemallocValue<uint64_t>("epoch");
-    new_values["jemalloc.epoch"]
-        = {epoch,
-           "An internal incremental update number of the statistics of jemalloc (Jason Evans' memory allocator), used in all other "
-           "`jemalloc` metrics."};
+    auto epoch = updateJemallocEpoch();
+    new_values["jemalloc.epoch"] = { epoch, "An internal incremental update number of the statistics of jemalloc (Jason Evans' memory allocator), used in all other `jemalloc` metrics." };
 
     // Collect the statistics themselves.
     saveJemallocMetric<size_t>(new_values, "allocated");
@@ -787,10 +616,10 @@ void AsynchronousMetrics::update(TimePoint update_time, bool force_update)
     saveJemallocMetric<size_t>(new_values, "background_thread.num_threads");
     saveJemallocMetric<uint64_t>(new_values, "background_thread.num_runs");
     saveJemallocMetric<uint64_t>(new_values, "background_thread.run_intervals");
-    saveJemallocProf<bool>(new_values, "active");
+    saveJemallocProf<size_t>(new_values, "active");
     saveAllArenasMetric<size_t>(new_values, "pactive");
-    saveAllArenasMetric<size_t>(new_values, "pdirty");
-    saveAllArenasMetric<size_t>(new_values, "pmuzzy");
+    [[maybe_unused]] size_t je_malloc_pdirty = saveAllArenasMetric<size_t>(new_values, "pdirty");
+    [[maybe_unused]] size_t je_malloc_pmuzzy = saveAllArenasMetric<size_t>(new_values, "pmuzzy");
     saveAllArenasMetric<size_t>(new_values, "dirty_purged");
     saveAllArenasMetric<size_t>(new_values, "muzzy_purged");
 #endif
@@ -819,8 +648,41 @@ void AsynchronousMetrics::update(TimePoint update_time, bool force_update)
             " It is unspecified whether it includes the per-thread stacks and most of the allocated memory, that is allocated with the 'mmap' system call."
             " This metric exists only for completeness reasons. I recommend to use the `MemoryResident` metric for monitoring."};
 
-        if (update_rss)
-            MemoryTracker::updateRSS(data.resident);
+        /// We must update the value of total_memory_tracker periodically.
+        /// Otherwise it might be calculated incorrectly - it can include a "drift" of memory amount.
+        /// See https://github.com/ClickHouse/ClickHouse/issues/10293
+        {
+            Int64 amount = total_memory_tracker.get();
+            Int64 peak = total_memory_tracker.getPeak();
+            Int64 rss = data.resident;
+            Int64 free_memory_in_allocator_arenas = 0;
+
+#if USE_JEMALLOC
+            /// According to jemalloc man, pdirty is:
+            ///
+            ///     Number of pages within unused extents that are potentially
+            ///     dirty, and for which madvise() or similar has not been called.
+            ///
+            /// So they will be subtracted from RSS to make accounting more
+            /// accurate, since those pages are not really RSS but a memory
+            /// that can be used at anytime via jemalloc.
+            free_memory_in_allocator_arenas = je_malloc_pdirty * getPageSize();
+#endif
+
+            Int64 difference = rss - amount;
+
+            /// Log only if difference is high. This is for convenience. The threshold is arbitrary.
+            if (difference >= 1048576 || difference <= -1048576)
+                LOG_TRACE(log,
+                    "MemoryTracking: was {}, peak {}, free memory in arenas {}, will set to {} (RSS), difference: {}",
+                    ReadableSize(amount),
+                    ReadableSize(peak),
+                    ReadableSize(free_memory_in_allocator_arenas),
+                    ReadableSize(rss),
+                    ReadableSize(difference));
+
+            MemoryTracker::setRSS(rss, free_memory_in_allocator_arenas);
+        }
     }
 
     {
@@ -969,68 +831,7 @@ void AsynchronousMetrics::update(TimePoint update_time, bool force_update)
         new_values["CGroupMaxCPU"] = { max_cpu_cgroups, "The maximum number of CPU cores according to CGroups."};
     }
 
-    if (cgroupcpu_stat || cgroupcpuacct_stat)
-    {
-        try
-        {
-            ReadBufferFromFilePRead & in = cgroupcpu_stat ? *cgroupcpu_stat : *cgroupcpuacct_stat;
-            ProcStatValuesCPU current_values{};
-
-            /// We re-read the file from the beginning each time
-            in.rewind();
-
-            while (!in.eof())
-            {
-                String name;
-                readStringUntilWhitespace(name, in);
-                skipWhitespaceIfAny(in);
-
-                /// `user_usec` for cgroup v2 and `user` for cgroup v1
-                if (name.starts_with("user"))
-                {
-                    readText(current_values.user, in);
-                    skipToNextLineOrEOF(in);
-                }
-                /// `system_usec` for cgroup v2 and `system` for cgroup v1
-                else if (name.starts_with("system"))
-                {
-                    readText(current_values.system, in);
-                    skipToNextLineOrEOF(in);
-                }
-                else
-                    skipToNextLineOrEOF(in);
-            }
-
-            if (!first_run)
-            {
-                auto get_clock_ticks = [&]()
-                {
-                    if (auto hz = sysconf(_SC_CLK_TCK); hz != -1)
-                        return hz;
-                    else
-                        throw ErrnoException(ErrorCodes::CANNOT_SYSCONF, "Cannot call 'sysconf' to obtain system HZ");
-                };
-                const auto cgroup_version_specific_divisor = cgroupcpu_stat ? 1e6 : get_clock_ticks();
-                const double multiplier = 1.0 / cgroup_version_specific_divisor
-                    / (std::chrono::duration_cast<std::chrono::nanoseconds>(time_since_previous_update).count() / 1e9);
-
-                const ProcStatValuesCPU delta_values = current_values - proc_stat_values_all_cpus;
-                applyCPUMetricsUpdate(new_values, /*cpu_suffix=*/"", delta_values, multiplier);
-                if (max_cpu_cgroups > 0)
-                    applyNormalizedCPUMetricsUpdate(new_values, max_cpu_cgroups, delta_values, multiplier);
-            }
-
-            proc_stat_values_all_cpus = current_values;
-        }
-        catch (...)
-        {
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-            openCgroupv2MetricFile("cpu.stat", cgroupcpu_stat);
-            if (!cgroupcpu_stat)
-                openFileIfExists("/sys/fs/cgroup/cpuacct/cpuacct.stat", cgroupcpuacct_stat);
-        }
-    }
-    else if (proc_stat)
+    if (proc_stat)
     {
         try
         {
@@ -1085,7 +886,43 @@ void AsynchronousMetrics::update(TimePoint update_time, bool force_update)
                         else
                             delta_values_all_cpus = delta_values;
 
-                        applyCPUMetricsUpdate(new_values, cpu_suffix, delta_values, multiplier);
+                        new_values["OSUserTime" + cpu_suffix] = { delta_values.user * multiplier,
+                            "The ratio of time the CPU core was running userspace code. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server."
+                            " This includes also the time when the CPU was under-utilized due to the reasons internal to the CPU (memory loads, pipeline stalls, branch mispredictions, running another SMT core)."
+                            " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores]."};
+                        new_values["OSNiceTime" + cpu_suffix] = { delta_values.nice * multiplier,
+                            "The ratio of time the CPU core was running userspace code with higher priority. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server."
+                            " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores]."};
+                        new_values["OSSystemTime" + cpu_suffix] = { delta_values.system * multiplier,
+                            "The ratio of time the CPU core was running OS kernel (system) code. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server."
+                            " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores]."};
+                        new_values["OSIdleTime" + cpu_suffix] = { delta_values.idle * multiplier,
+                            "The ratio of time the CPU core was idle (not even ready to run a process waiting for IO) from the OS kernel standpoint. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server."
+                            " This does not include the time when the CPU was under-utilized due to the reasons internal to the CPU (memory loads, pipeline stalls, branch mispredictions, running another SMT core)."
+                            " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores]."};
+                        new_values["OSIOWaitTime" + cpu_suffix] = { delta_values.iowait * multiplier,
+                            "The ratio of time the CPU core was not running the code but when the OS kernel did not run any other process on this CPU as the processes were waiting for IO. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server."
+                            " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores]."};
+                        new_values["OSIrqTime" + cpu_suffix] = { delta_values.irq * multiplier,
+                            "The ratio of time spent for running hardware interrupt requests on the CPU. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server."
+                            " A high number of this metric may indicate hardware misconfiguration or a very high network load."
+                            " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores]."};
+                        new_values["OSSoftIrqTime" + cpu_suffix] = { delta_values.softirq * multiplier,
+                            "The ratio of time spent for running software interrupt requests on the CPU. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server."
+                            " A high number of this metric may indicate inefficient software running on the system."
+                            " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores]."};
+                        new_values["OSStealTime" + cpu_suffix] = { delta_values.steal * multiplier,
+                            "The ratio of time spent in other operating systems by the CPU when running in a virtualized environment. This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server."
+                            " Not every virtualized environments present this metric, and most of them don't."
+                            " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores]."};
+                        new_values["OSGuestTime" + cpu_suffix] = { delta_values.guest * multiplier,
+                            "The ratio of time spent running a virtual CPU for guest operating systems under the control of the Linux kernel (See `man procfs`). This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server."
+                            " This metric is irrelevant for ClickHouse, but still exists for completeness."
+                            " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores]."};
+                        new_values["OSGuestNiceTime" + cpu_suffix] = { delta_values.guest_nice * multiplier,
+                            "The ratio of time spent running a virtual CPU for guest operating systems under the control of the Linux kernel, when a guest was set to a higher priority (See `man procfs`). This is a system-wide metric, it includes all the processes on the host machine, not just clickhouse-server."
+                            " This metric is irrelevant for ClickHouse, but still exists for completeness."
+                            " The value for a single CPU core will be in the interval [0..1]. The value for all CPU cores is calculated as a sum across them [0..num cores]."};
                     }
 
                     prev_values = current_values;
@@ -1141,7 +978,38 @@ void AsynchronousMetrics::update(TimePoint update_time, bool force_update)
                 Float64 num_cpus_to_normalize = max_cpu_cgroups > 0 ? max_cpu_cgroups : num_cpus;
 
                 if (num_cpus_to_normalize > 0)
-                    applyNormalizedCPUMetricsUpdate(new_values, num_cpus_to_normalize, delta_values_all_cpus, multiplier);
+                {
+                    new_values["OSUserTimeNormalized"] = { delta_values_all_cpus.user * multiplier / num_cpus_to_normalize,
+                        "The value is similar to `OSUserTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores."
+                        " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric."};
+                    new_values["OSNiceTimeNormalized"] = { delta_values_all_cpus.nice * multiplier / num_cpus_to_normalize,
+                        "The value is similar to `OSNiceTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores."
+                        " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric."};
+                    new_values["OSSystemTimeNormalized"] = { delta_values_all_cpus.system * multiplier / num_cpus_to_normalize,
+                        "The value is similar to `OSSystemTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores."
+                        " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric."};
+                    new_values["OSIdleTimeNormalized"] = { delta_values_all_cpus.idle * multiplier / num_cpus_to_normalize,
+                        "The value is similar to `OSIdleTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores."
+                        " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric."};
+                    new_values["OSIOWaitTimeNormalized"] = { delta_values_all_cpus.iowait * multiplier / num_cpus_to_normalize,
+                        "The value is similar to `OSIOWaitTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores."
+                        " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric."};
+                    new_values["OSIrqTimeNormalized"] = { delta_values_all_cpus.irq * multiplier / num_cpus_to_normalize,
+                        "The value is similar to `OSIrqTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores."
+                        " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric."};
+                    new_values["OSSoftIrqTimeNormalized"] = { delta_values_all_cpus.softirq * multiplier / num_cpus_to_normalize,
+                        "The value is similar to `OSSoftIrqTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores."
+                        " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric."};
+                    new_values["OSStealTimeNormalized"] = { delta_values_all_cpus.steal * multiplier / num_cpus_to_normalize,
+                        "The value is similar to `OSStealTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores."
+                        " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric."};
+                    new_values["OSGuestTimeNormalized"] = { delta_values_all_cpus.guest * multiplier / num_cpus_to_normalize,
+                        "The value is similar to `OSGuestTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores."
+                        " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric."};
+                    new_values["OSGuestNiceTimeNormalized"] = { delta_values_all_cpus.guest_nice * multiplier / num_cpus_to_normalize,
+                        "The value is similar to `OSGuestNiceTime` but divided to the number of CPU cores to be measured in the [0..1] interval regardless of the number of cores."
+                        " This allows you to average the values of this metric across multiple servers in a cluster even if the number of cores is non-uniform, and still get the average resource utilization metric."};
+                }
             }
 
             proc_stat_values_other = current_other_values;
@@ -1174,7 +1042,8 @@ void AsynchronousMetrics::update(TimePoint update_time, bool force_update)
             tryLogCurrentException(__PRETTY_FUNCTION__);
         }
     }
-    else if (meminfo)
+
+    if (meminfo)
     {
         try
         {
@@ -1744,7 +1613,7 @@ void AsynchronousMetrics::update(TimePoint update_time, bool force_update)
 #endif
 
     {
-        auto threads_get_metric_name_doc = [](const String & name) -> std::pair<const char *, const char *>
+        auto get_metric_name_doc = [](const String & name) -> std::pair<const char *, const char *>
         {
             static std::map<String, std::pair<const char *, const char *>> metric_map =
             {
@@ -1768,38 +1637,11 @@ void AsynchronousMetrics::update(TimePoint update_time, bool force_update)
                 return it->second;
         };
 
-        auto rejected_connections_get_metric_name_doc = [](const String & name) -> std::pair<const char *, const char *>
-        {
-            static std::map<String, std::pair<const char *, const char *>> metric_map =
-                {
-                    {"tcp_port", {"TCPRejectedConnections", "Number of rejected connections for the TCP protocol (without TLS)."}},
-                    {"tcp_port_secure", {"TCPSecureRejectedConnections", "Number of rejected connections for the TCP protocol (with TLS)."}},
-                    {"http_port", {"HTTPRejectedConnections", "Number of rejected connections for the HTTP interface (without TLS)."}},
-                    {"https_port", {"HTTPSecureRejectedConnections", "Number of rejected connections for the HTTPS interface."}},
-                    {"interserver_http_port", {"InterserverRejectedConnections", "Number of rejected connections for the replicas communication protocol (without TLS)."}},
-                    {"interserver_https_port", {"InterserverSecureRejectedConnections", "Number of rejected connections for the replicas communication protocol (with TLS)."}},
-                    {"mysql_port", {"MySQLRejectedConnections", "Number of rejected connections for the MySQL compatibility protocol."}},
-                    {"postgresql_port", {"PostgreSQLRejectedConnections", "Number of rejected connections for the PostgreSQL compatibility protocol."}},
-                    {"grpc_port", {"GRPCRejectedConnections", "Number of rejected connections for the GRPC protocol."}},
-                    {"prometheus.port", {"PrometheusRejectedConnections", "Number of rejected connections for the Prometheus endpoint. Note: prometheus endpoints can be also used via the usual HTTP/HTTPs ports."}},
-                    {"keeper_server.tcp_port", {"KeeperTCPRejectedConnections", "Number of rejected connections for the Keeper TCP protocol (without TLS)."}},
-                    {"keeper_server.tcp_port_secure", {"KeeperTCPSecureRejectedConnections", "Number of rejected connections for the Keeper TCP protocol (with TLS)."}}
-                };
-            auto it = metric_map.find(name);
-            if (it == metric_map.end())
-                return { nullptr, nullptr };
-            else
-                return it->second;
-        };
-
         const auto server_metrics = protocol_server_metrics_func();
         for (const auto & server_metric : server_metrics)
         {
-            if (auto name_doc = threads_get_metric_name_doc(server_metric.port_name); name_doc.first != nullptr)
+            if (auto name_doc = get_metric_name_doc(server_metric.port_name); name_doc.first != nullptr)
                 new_values[name_doc.first] = { server_metric.current_threads, name_doc.second };
-
-            if (auto name_doc = rejected_connections_get_metric_name_doc(server_metric.port_name); name_doc.first != nullptr)
-                new_values[name_doc.first] = { server_metric.rejected_connections, name_doc.second };
         }
     }
 
diff --git a/src/Common/AsynchronousMetrics.h b/src/Common/AsynchronousMetrics.h
index 215dc6e1337..10a972d2458 100644
--- a/src/Common/AsynchronousMetrics.h
+++ b/src/Common/AsynchronousMetrics.h
@@ -1,14 +1,15 @@
 #pragma once
 
-#include <Common/CgroupsMemoryUsageObserver.h>
 #include <Common/MemoryStatisticsOS.h>
 #include <Common/ThreadPool.h>
 #include <Common/Stopwatch.h>
 #include <IO/ReadBufferFromFile.h>
 
 #include <condition_variable>
+#include <map>
 #include <mutex>
 #include <string>
+#include <thread>
 #include <vector>
 #include <optional>
 #include <unordered_map>
@@ -41,7 +42,6 @@ struct ProtocolServerMetrics
 {
     String port_name;
     size_t current_threads;
-    size_t rejected_connections;
 };
 
 /** Periodically (by default, each second)
@@ -68,9 +68,7 @@ public:
 
     AsynchronousMetrics(
         unsigned update_period_seconds,
-        const ProtocolServerMetricsFunc & protocol_server_metrics_func_,
-        bool update_jemalloc_epoch_,
-        bool update_rss_);
+        const ProtocolServerMetricsFunc & protocol_server_metrics_func_);
 
     virtual ~AsynchronousMetrics();
 
@@ -113,9 +111,6 @@ private:
     MemoryStatisticsOS memory_stat TSA_GUARDED_BY(data_mutex);
 #endif
 
-    [[maybe_unused]] const bool update_jemalloc_epoch;
-    [[maybe_unused]] const bool update_rss;
-
 #if defined(OS_LINUX)
     std::optional<ReadBufferFromFilePRead> meminfo TSA_GUARDED_BY(data_mutex);
     std::optional<ReadBufferFromFilePRead> loadavg TSA_GUARDED_BY(data_mutex);
@@ -130,8 +125,6 @@ private:
     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::optional<ReadBufferFromFilePRead> cgroupcpu_stat TSA_GUARDED_BY(data_mutex);
-    std::optional<ReadBufferFromFilePRead> cgroupcpuacct_stat TSA_GUARDED_BY(data_mutex);
 
     std::optional<ReadBufferFromFilePRead> vm_max_map_count TSA_GUARDED_BY(data_mutex);
     std::optional<ReadBufferFromFilePRead> vm_maps TSA_GUARDED_BY(data_mutex);
@@ -227,16 +220,6 @@ private:
     void openBlockDevices();
     void openSensorsChips();
     void openEDAC();
-
-    void applyCPUMetricsUpdate(
-        AsynchronousMetricValues & new_values, const std::string & cpu_suffix, const ProcStatValuesCPU & delta_values, double multiplier);
-
-    void applyNormalizedCPUMetricsUpdate(
-        AsynchronousMetricValues & new_values,
-        double num_cpus_to_normalize,
-        const ProcStatValuesCPU & delta_values_all_cpus,
-        double multiplier);
-
 #endif
 
     void run();
diff --git a/src/Common/CacheBase.h b/src/Common/CacheBase.h
index 23e6a6fc91c..a809136f451 100644
--- a/src/Common/CacheBase.h
+++ b/src/Common/CacheBase.h
@@ -197,12 +197,6 @@ public:
         cache_policy->remove(key);
     }
 
-    void remove(std::function<bool(const Key&, const MappedPtr &)> predicate)
-    {
-        std::lock_guard lock(mutex);
-        cache_policy->remove(predicate);
-    }
-
     size_t sizeInBytes() const
     {
         std::lock_guard lock(mutex);
diff --git a/src/Common/CgroupsMemoryUsageObserver.cpp b/src/Common/CgroupsMemoryUsageObserver.cpp
index 28bb861865a..02bde0d80b7 100644
--- a/src/Common/CgroupsMemoryUsageObserver.cpp
+++ b/src/Common/CgroupsMemoryUsageObserver.cpp
@@ -11,24 +11,243 @@
 #include <base/cgroupsv2.h>
 #include <base/getMemoryAmount.h>
 #include <base/sleep.h>
-#include <fmt/ranges.h>
 
 #include <cstdint>
+#include <filesystem>
+#include <memory>
+#include <optional>
+
+#include "config.h"
+#if USE_JEMALLOC
+#    include <jemalloc/jemalloc.h>
+#define STRINGIFY_HELPER(x) #x
+#define STRINGIFY(x) STRINGIFY_HELPER(x)
+#endif
 
 using namespace DB;
+namespace fs = std::filesystem;
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+extern const int FILE_DOESNT_EXIST;
+extern const int INCORRECT_DATA;
+}
+
+}
+
+namespace
+{
+
+/// Format is
+///   kernel 5
+///   rss 15
+///   [...]
+uint64_t readMetricFromStatFile(ReadBufferFromFile & buf, const std::string & key)
+{
+    while (!buf.eof())
+    {
+        std::string current_key;
+        readStringUntilWhitespace(current_key, buf);
+        if (current_key != key)
+        {
+            std::string dummy;
+            readStringUntilNewlineInto(dummy, buf);
+            buf.ignore();
+            continue;
+        }
+
+        assertChar(' ', buf);
+        uint64_t value = 0;
+        readIntText(value, buf);
+        return value;
+    }
+
+    throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot find '{}' in '{}'", key, buf.getFileName());
+}
+
+struct CgroupsV1Reader : ICgroupsReader
+{
+    explicit CgroupsV1Reader(const fs::path & stat_file_dir) : buf(stat_file_dir / "memory.stat") { }
+
+    uint64_t readMemoryUsage() override
+    {
+        std::lock_guard lock(mutex);
+        buf.rewind();
+        return readMetricFromStatFile(buf, "rss");
+    }
+
+private:
+    std::mutex mutex;
+    ReadBufferFromFile buf TSA_GUARDED_BY(mutex);
+};
+
+struct CgroupsV2Reader : ICgroupsReader
+{
+    explicit CgroupsV2Reader(const fs::path & stat_file_dir)
+        : current_buf(stat_file_dir / "memory.current"), stat_buf(stat_file_dir / "memory.stat")
+    {
+    }
+
+    uint64_t readMemoryUsage() override
+    {
+        std::lock_guard lock(mutex);
+        current_buf.rewind();
+        stat_buf.rewind();
+
+        int64_t mem_usage = 0;
+        /// memory.current contains a single number
+        /// the reason why we subtract it described here: https://github.com/ClickHouse/ClickHouse/issues/64652#issuecomment-2149630667
+        readIntText(mem_usage, current_buf);
+        mem_usage -= readMetricFromStatFile(stat_buf, "inactive_file");
+        chassert(mem_usage >= 0, "Negative memory usage");
+        return mem_usage;
+    }
+
+private:
+    std::mutex mutex;
+    ReadBufferFromFile current_buf TSA_GUARDED_BY(mutex);
+    ReadBufferFromFile stat_buf TSA_GUARDED_BY(mutex);
+};
+
+/// 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> getCgroupsV2Path()
+{
+    if (!cgroupsV2Enabled())
+        return {};
+
+    if (!cgroupsV2MemoryControllerEnabled())
+        return {};
+
+    fs::path current_cgroup = cgroupV2PathOfProcess();
+    if (current_cgroup.empty())
+        return {};
+
+    /// 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())
+    {
+        const auto current_path = current_cgroup / "memory.current";
+        const auto stat_path = current_cgroup / "memory.stat";
+        if (fs::exists(current_path) && fs::exists(stat_path))
+            return {current_cgroup};
+        current_cgroup = current_cgroup.parent_path();
+    }
+    return {};
+}
+
+std::optional<std::string> getCgroupsV1Path()
+{
+    auto path = default_cgroups_mount / "memory/memory.stat";
+    if (!fs::exists(path))
+        return {};
+    return {default_cgroups_mount / "memory"};
+}
+
+std::pair<std::string, CgroupsMemoryUsageObserver::CgroupsVersion> getCgroupsPath()
+{
+    auto v2_path = getCgroupsV2Path();
+    if (v2_path.has_value())
+        return {*v2_path, CgroupsMemoryUsageObserver::CgroupsVersion::V2};
+
+    auto v1_path = getCgroupsV1Path();
+    if (v1_path.has_value())
+        return {*v1_path, CgroupsMemoryUsageObserver::CgroupsVersion::V1};
+
+    throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "Cannot find cgroups v1 or v2 current memory file");
+}
+
+}
 
 namespace DB
 {
 
 CgroupsMemoryUsageObserver::CgroupsMemoryUsageObserver(std::chrono::seconds wait_time_)
     : log(getLogger("CgroupsMemoryUsageObserver")), wait_time(wait_time_)
-{}
+{
+    const auto [cgroup_path, version] = getCgroupsPath();
+
+    if (version == CgroupsVersion::V2)
+        cgroup_reader = std::make_unique<CgroupsV2Reader>(cgroup_path);
+    else
+        cgroup_reader = std::make_unique<CgroupsV1Reader>(cgroup_path);
+
+    LOG_INFO(
+        log,
+        "Will read the current memory usage from '{}' (cgroups version: {}), wait time is {} sec",
+        cgroup_path,
+        (version == CgroupsVersion::V1) ? "v1" : "v2",
+        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 soft 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 = cgroup_reader->readMemoryUsage();
+            LOG_TRACE(log, "Read current memory usage {} bytes ({}) from cgroups", memory_usage, ReadableSize(memory_usage));
+            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);
@@ -82,6 +301,35 @@ void CgroupsMemoryUsageObserver::runThread()
                 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 = cgroup_reader->readMemoryUsage();
+                LOG_TRACE(log, "Read current memory usage {} bytes ({}) from cgroups", memory_usage, ReadableSize(memory_usage));
+                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 (...)
         {
diff --git a/src/Common/CgroupsMemoryUsageObserver.h b/src/Common/CgroupsMemoryUsageObserver.h
index 3de83d6b437..b848a2bff3c 100644
--- a/src/Common/CgroupsMemoryUsageObserver.h
+++ b/src/Common/CgroupsMemoryUsageObserver.h
@@ -3,27 +3,51 @@
 #include <Common/ThreadPool.h>
 
 #include <chrono>
+#include <memory>
 #include <mutex>
 
 namespace DB
 {
 
-///  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.
+struct ICgroupsReader
+{
+    virtual ~ICgroupsReader() = default;
+
+    virtual uint64_t readMemoryUsage() = 0;
+};
+
+/// 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 : uint8_t
+    {
+        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();
@@ -34,16 +58,23 @@ private:
     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
 
     void stopThread();
 
     void runThread();
 
+    std::unique_ptr<ICgroupsReader> cgroup_reader;
+
     std::mutex thread_mutex;
     std::condition_variable cond;
     ThreadFromGlobalPool thread;
diff --git a/src/Common/CollectionOfDerived.h b/src/Common/CollectionOfDerived.h
index bcbcc36c67a..9f80ff727b4 100644
--- a/src/Common/CollectionOfDerived.h
+++ b/src/Common/CollectionOfDerived.h
@@ -168,7 +168,7 @@ private:
         records.emplace(it, type_idx, item);
     }
 
-    typename Records::const_iterator getImpl(std::type_index type_idx) const
+    Records::const_iterator getImpl(std::type_index type_idx) const
     {
         auto it = std::lower_bound(records.cbegin(), records.cend(), type_idx);
 
diff --git a/src/Common/ConcurrentBoundedQueue.h b/src/Common/ConcurrentBoundedQueue.h
index a830ae157a5..16b9488c98d 100644
--- a/src/Common/ConcurrentBoundedQueue.h
+++ b/src/Common/ConcurrentBoundedQueue.h
@@ -243,7 +243,7 @@ public:
     }
 
     /// Clear and finish queue
-    void clearAndFinish() noexcept
+    void clearAndFinish()
     {
         {
             std::lock_guard lock(queue_mutex);
diff --git a/src/Common/Config/CMakeLists.txt b/src/Common/Config/CMakeLists.txt
index 2bd32b98bda..09095ef5acc 100644
--- a/src/Common/Config/CMakeLists.txt
+++ b/src/Common/Config/CMakeLists.txt
@@ -2,7 +2,6 @@ set (SRCS
     AbstractConfigurationComparison.cpp
     ConfigProcessor.cpp
     getClientConfigPath.cpp
-    getLocalConfigPath.cpp
     ConfigReloader.cpp
     YAMLParser.cpp
     ConfigHelper.cpp
diff --git a/src/Common/Config/ConfigProcessor.cpp b/src/Common/Config/ConfigProcessor.cpp
index c4b4a1d5e7e..67d6036aa51 100644
--- a/src/Common/Config/ConfigProcessor.cpp
+++ b/src/Common/Config/ConfigProcessor.cpp
@@ -138,14 +138,9 @@ static Node * getRootNode(Document * document)
     return XMLUtils::getRootNode(document);
 }
 
-static size_t firstNonWhitespacePos(const std::string & s)
-{
-    return s.find_first_not_of(" \t\n\r");
-}
-
 static bool allWhitespace(const std::string & s)
 {
-    return firstNonWhitespacePos(s) == std::string::npos;
+    return s.find_first_not_of(" \t\n\r") == std::string::npos;
 }
 
 static void deleteAttributesRecursive(Node * root)
@@ -627,49 +622,6 @@ ConfigProcessor::Files ConfigProcessor::getConfigMergeFiles(const std::string &
     return files;
 }
 
-XMLDocumentPtr ConfigProcessor::parseConfig(const std::string & config_path)
-{
-    fs::path p(config_path);
-    std::string extension = p.extension();
-    boost::algorithm::to_lower(extension);
-
-    if (extension == ".xml")
-        return dom_parser.parse(config_path);
-    else if (extension == ".yaml" || extension == ".yml")
-        return YAMLParser::parse(config_path);
-    else
-    {
-        /// Suppose non regular file parsed as XML, such as pipe: /dev/fd/X (regardless it has .xml extension or not)
-        if (!fs::is_regular_file(config_path))
-            return dom_parser.parse(config_path);
-
-        /// If the regular file begins with < it might be XML, otherwise it might be YAML.
-        bool maybe_xml = false;
-        {
-            std::ifstream file(config_path);
-            if (!file.is_open())
-                throw Exception(ErrorCodes::CANNOT_LOAD_CONFIG, "Unknown format of '{}' config", config_path);
-
-            std::string line;
-            while (std::getline(file, line))
-            {
-                const size_t pos = firstNonWhitespacePos(line);
-
-                if (pos < line.size() && '<' == line[pos])
-                {
-                    maybe_xml = true;
-                    break;
-                }
-                else if (pos != std::string::npos)
-                    break;
-            }
-        }
-        if (maybe_xml)
-            return dom_parser.parse(config_path);
-        return YAMLParser::parse(config_path);
-    }
-}
-
 XMLDocumentPtr ConfigProcessor::processConfig(
     bool * has_zk_includes,
     zkutil::ZooKeeperNodeCache * zk_node_cache,
@@ -681,7 +633,23 @@ XMLDocumentPtr ConfigProcessor::processConfig(
 
     if (fs::exists(path))
     {
-        config = parseConfig(path);
+        fs::path p(path);
+
+        std::string extension = p.extension();
+        boost::algorithm::to_lower(extension);
+
+        if (extension == ".yaml" || extension == ".yml")
+        {
+            config = YAMLParser::parse(path);
+        }
+        else if (extension == ".xml" || extension == ".conf" || extension.empty())
+        {
+            config = dom_parser.parse(path);
+        }
+        else
+        {
+            throw Exception(ErrorCodes::CANNOT_LOAD_CONFIG, "Unknown format of '{}' config", path);
+        }
     }
     else
     {
@@ -705,7 +673,20 @@ XMLDocumentPtr ConfigProcessor::processConfig(
             LOG_DEBUG(log, "Merging configuration file '{}'.", merge_file);
 
             XMLDocumentPtr with;
-            with = parseConfig(merge_file);
+
+            fs::path p(merge_file);
+            std::string extension = p.extension();
+            boost::algorithm::to_lower(extension);
+
+            if (extension == ".yaml" || extension == ".yml")
+            {
+                with = YAMLParser::parse(merge_file);
+            }
+            else
+            {
+                with = dom_parser.parse(merge_file);
+            }
+
             if (!merge(config, with))
             {
                 LOG_DEBUG(log, "Merging bypassed - configuration file '{}' doesn't belong to configuration '{}' - merging root node name '{}' doesn't match '{}'",
@@ -749,7 +730,19 @@ XMLDocumentPtr ConfigProcessor::processConfig(
         {
             LOG_DEBUG(log, "Including configuration file '{}'.", include_from_path);
 
-            include_from = parseConfig(include_from_path);
+            fs::path p(include_from_path);
+            std::string extension = p.extension();
+            boost::algorithm::to_lower(extension);
+
+            if (extension == ".yaml" || extension == ".yml")
+            {
+                include_from = YAMLParser::parse(include_from_path);
+            }
+            else
+            {
+                include_from = dom_parser.parse(include_from_path);
+            }
+
             contributing_files.push_back(include_from_path);
         }
 
diff --git a/src/Common/Config/ConfigProcessor.h b/src/Common/Config/ConfigProcessor.h
index a9d1325b722..5712c36d737 100644
--- a/src/Common/Config/ConfigProcessor.h
+++ b/src/Common/Config/ConfigProcessor.h
@@ -65,8 +65,6 @@ public:
         zkutil::ZooKeeperNodeCache * zk_node_cache = nullptr,
         const zkutil::EventPtr & zk_changed_event = nullptr);
 
-    XMLDocumentPtr parseConfig(const std::string & config_path);
-
     /// These configurations will be used if there is no configuration file.
     static void registerEmbeddedConfig(std::string name, std::string_view content);
 
diff --git a/src/Common/Config/getClientConfigPath.cpp b/src/Common/Config/getClientConfigPath.cpp
index 5e9bb16bc85..a32ad1068bf 100644
--- a/src/Common/Config/getClientConfigPath.cpp
+++ b/src/Common/Config/getClientConfigPath.cpp
@@ -12,6 +12,7 @@ namespace DB
 std::optional<std::string> getClientConfigPath(const std::string & home_path)
 {
     std::string config_path;
+    bool found = false;
 
     std::vector<std::string> names;
     names.emplace_back("./clickhouse-client");
@@ -27,10 +28,18 @@ std::optional<std::string> getClientConfigPath(const std::string & home_path)
 
             std::error_code ec;
             if (fs::exists(config_path, ec))
-                return config_path;
+            {
+                found = true;
+                break;
+            }
         }
+        if (found)
+            break;
     }
 
+    if (found)
+        return config_path;
+
     return std::nullopt;
 }
 
diff --git a/src/Common/Config/getLocalConfigPath.cpp b/src/Common/Config/getLocalConfigPath.cpp
deleted file mode 100644
index 195de8aed03..00000000000
--- a/src/Common/Config/getLocalConfigPath.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <Common/Config/getLocalConfigPath.h>
-
-#include <filesystem>
-#include <vector>
-
-
-namespace fs = std::filesystem;
-
-namespace DB
-{
-
-std::optional<std::string> getLocalConfigPath(const std::string & home_path)
-{
-    std::string config_path;
-
-    std::vector<std::string> names;
-    names.emplace_back("./clickhouse-local");
-    if (!home_path.empty())
-        names.emplace_back(home_path + "/.clickhouse-local/config");
-    names.emplace_back("/etc/clickhouse-local/config");
-
-    for (const auto & name : names)
-    {
-        for (const auto & extension : {".xml", ".yaml", ".yml"})
-        {
-            config_path = name + extension;
-
-            std::error_code ec;
-            if (fs::exists(config_path, ec))
-                return config_path;
-        }
-    }
-
-    return std::nullopt;
-}
-
-}
diff --git a/src/Common/Config/getLocalConfigPath.h b/src/Common/Config/getLocalConfigPath.h
deleted file mode 100644
index 14625571d6c..00000000000
--- a/src/Common/Config/getLocalConfigPath.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include <string>
-#include <optional>
-
-namespace DB
-{
-
-/// Return path to existing configuration file.
-std::optional<std::string> getLocalConfigPath(const std::string & home_path);
-
-}
diff --git a/src/Common/CurrentMetrics.cpp b/src/Common/CurrentMetrics.cpp
index 4bf2b0704f1..1011ab12d15 100644
--- a/src/Common/CurrentMetrics.cpp
+++ b/src/Common/CurrentMetrics.cpp
@@ -75,9 +75,9 @@
     M(GlobalThread, "Number of threads in global thread pool.") \
     M(GlobalThreadActive, "Number of threads in global thread pool running a task.") \
     M(GlobalThreadScheduled, "Number of queued or active jobs in global thread pool.") \
-    M(LocalThread, "Obsolete. Number of threads in local thread pools. The threads in local thread pools are taken from the global thread pool.") \
-    M(LocalThreadActive, "Obsolete. Number of threads in local thread pools running a task.") \
-    M(LocalThreadScheduled, "Obsolete. Number of queued or active jobs in local thread pools.") \
+    M(LocalThread, "Number of threads in local thread pools. The threads in local thread pools are taken from the global thread pool.") \
+    M(LocalThreadActive, "Number of threads in local thread pools running a task.") \
+    M(LocalThreadScheduled, "Number of queued or active jobs in local thread pools.") \
     M(MergeTreeDataSelectExecutorThreads, "Number of threads in the MergeTreeDataSelectExecutor thread pool.") \
     M(MergeTreeDataSelectExecutorThreadsActive, "Number of threads in the MergeTreeDataSelectExecutor thread pool running a task.") \
     M(MergeTreeDataSelectExecutorThreadsScheduled, "Number of queued or active jobs in the MergeTreeDataSelectExecutor thread pool.") \
@@ -292,9 +292,6 @@
     M(DistrCacheWriteRequests, "Number of executed Write requests to Distributed Cache") \
     M(DistrCacheServerConnections, "Number of open connections to ClickHouse server from Distributed Cache") \
     \
-    M(SchedulerIOReadScheduled, "Number of IO reads are being scheduled currently") \
-    M(SchedulerIOWriteScheduled, "Number of IO writes are being scheduled currently") \
-    \
     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") \
     \
@@ -309,8 +306,6 @@
     \
     M(FilteringMarksWithPrimaryKey, "Number of threads currently doing filtering of mark ranges by the primary key") \
     M(FilteringMarksWithSecondaryKeys, "Number of threads currently doing filtering of mark ranges by secondary keys") \
-    \
-    M(DiskS3NoSuchKeyErrors, "The number of `NoSuchKey` errors that occur when reading data from S3 cloud storage through ClickHouse disks.") \
 
 #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/CurrentThread.cpp b/src/Common/CurrentThread.cpp
index ba7087ca7f1..70b69d6bcc7 100644
--- a/src/Common/CurrentThread.cpp
+++ b/src/Common/CurrentThread.cpp
@@ -113,56 +113,6 @@ std::string_view CurrentThread::getQueryId()
     return current_thread->getQueryId();
 }
 
-void CurrentThread::attachReadResource(ResourceLink link)
-{
-    if (unlikely(!current_thread))
-        return;
-    if (current_thread->read_resource_link)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Thread #{} has been already attached to read resource", std::to_string(getThreadId()));
-    current_thread->read_resource_link = link;
-}
-
-void CurrentThread::detachReadResource()
-{
-    if (unlikely(!current_thread))
-        return;
-    if (!current_thread->read_resource_link)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Thread #{} has not been attached to read resource", std::to_string(getThreadId()));
-    current_thread->read_resource_link.reset();
-}
-
-ResourceLink CurrentThread::getReadResourceLink()
-{
-    if (unlikely(!current_thread))
-        return {};
-    return current_thread->read_resource_link;
-}
-
-void CurrentThread::attachWriteResource(ResourceLink link)
-{
-    if (unlikely(!current_thread))
-        return;
-    if (current_thread->write_resource_link)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Thread #{} has been already attached to write resource", std::to_string(getThreadId()));
-    current_thread->write_resource_link = link;
-}
-
-void CurrentThread::detachWriteResource()
-{
-    if (unlikely(!current_thread))
-        return;
-    if (!current_thread->write_resource_link)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Thread #{} has not been attached to write resource", std::to_string(getThreadId()));
-    current_thread->write_resource_link.reset();
-}
-
-ResourceLink CurrentThread::getWriteResourceLink()
-{
-    if (unlikely(!current_thread))
-        return {};
-    return current_thread->write_resource_link;
-}
-
 MemoryTracker * CurrentThread::getUserMemoryTracker()
 {
     if (unlikely(!current_thread))
diff --git a/src/Common/CurrentThread.h b/src/Common/CurrentThread.h
index 787e8369a83..53b61ba315f 100644
--- a/src/Common/CurrentThread.h
+++ b/src/Common/CurrentThread.h
@@ -2,7 +2,6 @@
 
 #include <Interpreters/Context_fwd.h>
 #include <Common/ThreadStatus.h>
-#include <Common/Scheduler/ResourceLink.h>
 
 #include <memory>
 #include <string>
@@ -24,6 +23,7 @@ class QueryStatus;
 struct Progress;
 class InternalTextLogsQueue;
 
+
 /** Collection of static methods to work with thread-local objects.
   * Allows to attach and detach query/process (thread group) to a thread
   * (to calculate query-related metrics and to allow to obtain query-related data from a thread).
@@ -92,14 +92,6 @@ public:
 
     static std::string_view getQueryId();
 
-    // For IO Scheduling
-    static void attachReadResource(ResourceLink link);
-    static void detachReadResource();
-    static ResourceLink getReadResourceLink();
-    static void attachWriteResource(ResourceLink link);
-    static void detachWriteResource();
-    static ResourceLink getWriteResourceLink();
-
     /// Initializes query with current thread as master thread in constructor, and detaches it in destructor
     struct QueryScope : private boost::noncopyable
     {
@@ -110,39 +102,6 @@ public:
         void logPeakMemoryUsage();
         bool log_peak_memory_usage_in_destructor = true;
     };
-
-    /// Scoped attach/detach of IO resource links
-    struct IOScope : private boost::noncopyable
-    {
-        explicit IOScope(ResourceLink read_resource_link, ResourceLink write_resource_link)
-        {
-            if (read_resource_link)
-            {
-                attachReadResource(read_resource_link);
-                read_attached = true;
-            }
-            if (write_resource_link)
-            {
-                attachWriteResource(write_resource_link);
-                write_attached = true;
-            }
-        }
-
-        explicit IOScope(const IOSchedulingSettings & settings)
-            : IOScope(settings.read_resource_link, settings.write_resource_link)
-        {}
-
-        ~IOScope()
-        {
-            if (read_attached)
-                detachReadResource();
-            if (write_attached)
-                detachWriteResource();
-        }
-
-        bool read_attached = false;
-        bool write_attached = false;
-    };
 };
 
 }
diff --git a/src/Common/DNSResolver.cpp b/src/Common/DNSResolver.cpp
index 68a8fa7d74c..4b577a251af 100644
--- a/src/Common/DNSResolver.cpp
+++ b/src/Common/DNSResolver.cpp
@@ -12,7 +12,6 @@
 #include <atomic>
 #include <optional>
 #include <string_view>
-#include "Common/MultiVersion.h"
 #include <unordered_set>
 #include "DNSPTRResolverProvider.h"
 
@@ -140,6 +139,12 @@ DNSResolver::IPAddresses resolveIPAddressImpl(const std::string & host)
     return addresses;
 }
 
+DNSResolver::IPAddresses resolveIPAddressWithCache(CacheBase<std::string, DNSResolver::CacheEntry> & cache, const std::string & host)
+{
+    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)
 {
     auto ptr_resolver = DB::DNSPTRResolverProvider::get();
@@ -193,89 +198,21 @@ struct DNSResolver::Impl
     std::atomic<bool> disable_cache{false};
 };
 
-struct DNSResolver::AddressFilter
-{
-    struct DNSFilterSettings
-    {
-        bool dns_allow_resolve_names_to_ipv4{true};
-        bool dns_allow_resolve_names_to_ipv6{true};
-    };
 
-    AddressFilter() : settings(std::make_unique<DNSFilterSettings>()) {}
-
-    void performAddressFiltering(DNSResolver::IPAddresses & addresses) const
-    {
-        const auto current_settings = settings.get();
-        bool dns_resolve_ipv4 = current_settings->dns_allow_resolve_names_to_ipv4;
-        bool dns_resolve_ipv6 = current_settings->dns_allow_resolve_names_to_ipv6;
-
-        if (dns_resolve_ipv4 && dns_resolve_ipv6)
-        {
-            return;
-        }
-        if (!dns_resolve_ipv4 && !dns_resolve_ipv6)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "DNS can't resolve any address, because dns_resolve_ipv6_interfaces and dns_resolve_ipv4_interfaces both are disabled");
-        }
-
-        std::erase_if(addresses, [dns_resolve_ipv6, dns_resolve_ipv4](const Poco::Net::IPAddress& address)
-        {
-            return (address.family() == Poco::Net::IPAddress::IPv6 && !dns_resolve_ipv6)
-                || (address.family() == Poco::Net::IPAddress::IPv4 && !dns_resolve_ipv4);
-        });
-    }
-
-    void setSettings(bool dns_allow_resolve_names_to_ipv4, bool dns_allow_resolve_names_to_ipv6)
-    {
-        settings.set(std::make_unique<DNSFilterSettings>(dns_allow_resolve_names_to_ipv4, dns_allow_resolve_names_to_ipv6));
-    }
-
-    MultiVersion<DNSFilterSettings> settings;
-};
-
-
-DNSResolver::DNSResolver()
-    : impl(std::make_unique<DNSResolver::Impl>())
-    , addressFilter(std::make_unique<DNSResolver::AddressFilter>())
-    , log(getLogger("DNSResolver")) {}
-
-
-DNSResolver::IPAddresses DNSResolver::getResolvedIPAdressessWithFiltering(const std::string & host)
-{
-    auto addresses = resolveIPAddressImpl(host);
-    addressFilter->performAddressFiltering(addresses);
-
-    if (addresses.empty())
-    {
-        ProfileEvents::increment(ProfileEvents::DNSError);
-        throw DB::NetException(ErrorCodes::DNS_ERROR, "After filtering there are no resolved address for host({}).", host);
-    }
-    return addresses;
-}
-
-DNSResolver::IPAddresses DNSResolver::resolveIPAddressWithCache(const std::string & host)
-{
-    auto [result, _ ] = impl->cache_host.getOrSet(host, [&host, this]() {return std::make_shared<DNSResolver::CacheEntry>(getResolvedIPAdressessWithFiltering(host), std::chrono::system_clock::now());});
-    return result->addresses;
-}
+DNSResolver::DNSResolver() : impl(std::make_unique<DNSResolver::Impl>()), log(getLogger("DNSResolver")) {}
 
 Poco::Net::IPAddress DNSResolver::resolveHost(const std::string & host)
 {
     return pickAddress(resolveHostAll(host)); // random order -> random pick
 }
 
-void DNSResolver::setFilterSettings(bool dns_allow_resolve_names_to_ipv4, bool dns_allow_resolve_names_to_ipv6)
-{
-    addressFilter->setSettings(dns_allow_resolve_names_to_ipv4, dns_allow_resolve_names_to_ipv6);
-}
-
 DNSResolver::IPAddresses DNSResolver::resolveHostAllInOriginOrder(const std::string & host)
 {
     if (impl->disable_cache)
-        return getResolvedIPAdressessWithFiltering(host);
+        return resolveIPAddressImpl(host);
 
     addToNewHosts(host);
-    return resolveIPAddressWithCache(host);
+    return resolveIPAddressWithCache(impl->cache_host, host);
 }
 
 DNSResolver::IPAddresses DNSResolver::resolveHostAll(const std::string & host)
@@ -295,7 +232,7 @@ Poco::Net::SocketAddress DNSResolver::resolveAddress(const std::string & host_an
     splitHostAndPort(host_and_port, host, port);
 
     addToNewHosts(host);
-    return Poco::Net::SocketAddress(pickAddress(resolveIPAddressWithCache(host)), port);
+    return Poco::Net::SocketAddress(pickAddress(resolveIPAddressWithCache(impl->cache_host, host)), port);
 }
 
 Poco::Net::SocketAddress DNSResolver::resolveAddress(const std::string & host, UInt16 port)
@@ -304,7 +241,7 @@ Poco::Net::SocketAddress DNSResolver::resolveAddress(const std::string & host, U
         return Poco::Net::SocketAddress(host, port);
 
     addToNewHosts(host);
-    return Poco::Net::SocketAddress(pickAddress(resolveIPAddressWithCache(host)), port);
+    return Poco::Net::SocketAddress(pickAddress(resolveIPAddressWithCache(impl->cache_host, host)), port);
 }
 
 std::vector<Poco::Net::SocketAddress> DNSResolver::resolveAddressList(const std::string & host, UInt16 port)
@@ -317,7 +254,7 @@ std::vector<Poco::Net::SocketAddress> DNSResolver::resolveAddressList(const std:
     if (!impl->disable_cache)
         addToNewHosts(host);
 
-    std::vector<Poco::Net::IPAddress> ips = impl->disable_cache ? hostByName(host) : resolveIPAddressWithCache(host);
+    std::vector<Poco::Net::IPAddress> ips = impl->disable_cache ? hostByName(host) : resolveIPAddressWithCache(impl->cache_host, host);
     auto ips_end = std::unique(ips.begin(), ips.end());
 
     addresses.reserve(ips_end - ips.begin());
@@ -482,8 +419,8 @@ bool DNSResolver::updateCache(UInt32 max_consecutive_failures)
 
 bool DNSResolver::updateHost(const String & host)
 {
-    const auto old_value = resolveIPAddressWithCache(host);
-    auto new_value = getResolvedIPAdressessWithFiltering(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::CacheEntry>(std::move(new_value), std::chrono::system_clock::now()));
     return result;
diff --git a/src/Common/DNSResolver.h b/src/Common/DNSResolver.h
index b35f55dfcd2..1ddd9d3b991 100644
--- a/src/Common/DNSResolver.h
+++ b/src/Common/DNSResolver.h
@@ -68,8 +68,6 @@ 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);
 
-    void setFilterSettings(bool dns_allow_resolve_names_to_ipv4, bool dns_allow_resolve_names_to_ipv6);
-
     /// Returns a copy of cache entries
     std::vector<std::pair<std::string, CacheEntry>> cacheEntries() const;
 
@@ -88,10 +86,6 @@ private:
 
     struct Impl;
     std::unique_ptr<Impl> impl;
-
-    struct AddressFilter;
-    std::unique_ptr<AddressFilter> addressFilter;
-
     LoggerPtr log;
 
     /// Updates cached value and returns true it has been changed.
@@ -100,9 +94,6 @@ private:
 
     void addToNewHosts(const String & host);
     void addToNewAddresses(const Poco::Net::IPAddress & address);
-
-    IPAddresses resolveIPAddressWithCache(const std::string & host);
-    IPAddresses getResolvedIPAdressessWithFiltering(const std::string & host);
 };
 
 }
diff --git a/src/Common/Dwarf.cpp b/src/Common/Dwarf.cpp
index 37d0d51db91..8439c01b22c 100644
--- a/src/Common/Dwarf.cpp
+++ b/src/Common/Dwarf.cpp
@@ -1029,8 +1029,7 @@ bool Dwarf::findLocation(
     const LocationInfoMode mode,
     CompilationUnit & cu,
     LocationInfo & info,
-    std::vector<SymbolizedFrame> & inline_frames,
-    bool assume_in_cu_range) const
+    std::vector<SymbolizedFrame> & inline_frames) const
 {
     Die die = getDieAtOffset(cu, cu.first_die);
     // Partial compilation unit (DW_TAG_partial_unit) is not supported.
@@ -1042,11 +1041,6 @@ bool Dwarf::findLocation(
     std::optional<std::string_view> main_file_name;
     std::optional<uint64_t> base_addr_cu;
 
-    std::optional<uint64_t> low_pc;
-    std::optional<uint64_t> high_pc;
-    std::optional<bool> is_high_pc_addr;
-    std::optional<uint64_t> range_offset;
-
     forEachAttribute(cu, die, [&](const Attribute & attr)
     {
         switch (attr.spec.name) // NOLINT(bugprone-switch-missing-default-case)
@@ -1064,47 +1058,18 @@ bool Dwarf::findLocation(
                 // File name of main file being compiled
                 main_file_name = std::get<std::string_view>(attr.attr_value);
                 break;
+            case DW_AT_low_pc:
             case DW_AT_entry_pc:
                 // 2.17.1: historically DW_AT_low_pc was used. DW_AT_entry_pc was
                 // introduced in DWARF3. Support either to determine the base address of
                 // the CU.
                 base_addr_cu = std::get<uint64_t>(attr.attr_value);
                 break;
-            case DW_AT_ranges:
-                range_offset = std::get<uint64_t>(attr.attr_value);
-                break;
-            case DW_AT_low_pc:
-                low_pc = std::get<uint64_t>(attr.attr_value);
-                base_addr_cu = std::get<uint64_t>(attr.attr_value);
-                break;
-            case DW_AT_high_pc:
-                // The value of the DW_AT_high_pc attribute can be
-                // an address (DW_FORM_addr*) or an offset (DW_FORM_data*).
-                is_high_pc_addr = attr.spec.form == DW_FORM_addr || //
-                    attr.spec.form == DW_FORM_addrx || //
-                    attr.spec.form == DW_FORM_addrx1 || //
-                    attr.spec.form == DW_FORM_addrx2 || //
-                    attr.spec.form == DW_FORM_addrx3 || //
-                    attr.spec.form == DW_FORM_addrx4;
-                high_pc = std::get<uint64_t>(attr.attr_value);
-                break;
         }
         // Iterate through all attributes until find all above.
         return true;
     });
 
-    /// Check if the address falls inside this unit's address ranges.
-    if (!assume_in_cu_range && ((low_pc && high_pc) || range_offset))
-    {
-        bool pc_match = low_pc && high_pc && is_high_pc_addr && address >= *low_pc
-            && (address < (*is_high_pc_addr ? *high_pc : *low_pc + *high_pc));
-        bool range_match = range_offset && isAddrInRangeList(cu, address, base_addr_cu, range_offset.value(), cu.addr_size);
-        if (!pc_match && !range_match)
-        {
-            return false;
-        }
-    }
-
     if (main_file_name)
     {
         info.has_main_file = true;
@@ -1477,7 +1442,7 @@ bool Dwarf::findAddress(
             {
                 return false;
             }
-            findLocation(address, mode, unit, locationInfo, inline_frames, /*assume_in_cu_range*/ true);
+            findLocation(address, mode, unit, locationInfo, inline_frames);
             return locationInfo.has_file_and_line;
         }
         else if (mode == LocationInfoMode::FAST)
@@ -1506,7 +1471,7 @@ bool Dwarf::findAddress(
         {
             continue;
         }
-        findLocation(address, mode, unit, locationInfo, inline_frames, /*assume_in_cu_range*/ false);
+        findLocation(address, mode, unit, locationInfo, inline_frames);
     }
 
     return locationInfo.has_file_and_line;
@@ -1594,7 +1559,8 @@ bool Dwarf::isAddrInRangeList(const CompilationUnit & cu,
                     auto sp_start = addr_.substr(*cu.addr_base + index_start * sizeof(uint64_t));
                     auto start = read<uint64_t>(sp_start);
 
-                    auto end = start + length;
+                    auto sp_end = addr_.substr(*cu.addr_base + index_start * sizeof(uint64_t) + length);
+                    auto end = read<uint64_t>(sp_end);
                     if (start != end && address >= start && address < end)
                     {
                         return true;
diff --git a/src/Common/Dwarf.h b/src/Common/Dwarf.h
index d754191bfa9..da18b3affa0 100644
--- a/src/Common/Dwarf.h
+++ b/src/Common/Dwarf.h
@@ -283,8 +283,7 @@ private:
         LocationInfoMode mode,
         CompilationUnit & cu,
         LocationInfo & info,
-        std::vector<SymbolizedFrame> & inline_frames,
-        bool assume_in_cu_range) const;
+        std::vector<SymbolizedFrame> & inline_frames) const;
 
     /**
      * Finds a subprogram debugging info entry that contains a given address among
diff --git a/src/Common/Epoll.cpp b/src/Common/Epoll.cpp
index ef7c6e143a0..49c86222cf0 100644
--- a/src/Common/Epoll.cpp
+++ b/src/Common/Epoll.cpp
@@ -19,7 +19,7 @@ Epoll::Epoll() : events_count(0)
 {
     epoll_fd = epoll_create1(0);
     if (epoll_fd == -1)
-        throw ErrnoException(ErrorCodes::EPOLL_ERROR, "Cannot open epoll descriptor");
+        throw DB::ErrnoException(DB::ErrorCodes::EPOLL_ERROR, "Cannot open epoll descriptor");
 }
 
 Epoll::Epoll(Epoll && other) noexcept : epoll_fd(other.epoll_fd), events_count(other.events_count.load())
@@ -47,7 +47,7 @@ void Epoll::add(int fd, void * ptr, uint32_t events)
     ++events_count;
 
     if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd, &event) == -1)
-        throw ErrnoException(ErrorCodes::EPOLL_ERROR, "Cannot add new descriptor to epoll");
+        throw DB::ErrnoException(DB::ErrorCodes::EPOLL_ERROR, "Cannot add new descriptor to epoll");
 }
 
 void Epoll::remove(int fd)
@@ -55,7 +55,7 @@ void Epoll::remove(int fd)
     --events_count;
 
     if (epoll_ctl(epoll_fd, EPOLL_CTL_DEL, fd, nullptr) == -1)
-        throw ErrnoException(ErrorCodes::EPOLL_ERROR, "Cannot remove descriptor from epoll");
+        throw DB::ErrnoException(DB::ErrorCodes::EPOLL_ERROR, "Cannot remove descriptor from epoll");
 }
 
 size_t Epoll::getManyReady(int max_events, epoll_event * events_out, int timeout) const
@@ -82,7 +82,7 @@ size_t Epoll::getManyReady(int max_events, epoll_event * events_out, int timeout
                 continue;
             }
             else
-                throw ErrnoException(ErrorCodes::EPOLL_ERROR, "Error in epoll_wait");
+                throw DB::ErrnoException(DB::ErrorCodes::EPOLL_ERROR, "Error in epoll_wait");
         }
         else
             break;
diff --git a/src/Common/ErrorCodes.cpp b/src/Common/ErrorCodes.cpp
index 1055b3d34db..b1b8e2367a4 100644
--- a/src/Common/ErrorCodes.cpp
+++ b/src/Common/ErrorCodes.cpp
@@ -604,11 +604,6 @@
     M(723, PARQUET_EXCEPTION) \
     M(724, TOO_MANY_TABLES) \
     M(725, TOO_MANY_DATABASES) \
-    M(726, UNEXPECTED_HTTP_HEADERS) \
-    M(727, UNEXPECTED_TABLE_ENGINE) \
-    M(728, UNEXPECTED_DATA_TYPE) \
-    M(729, ILLEGAL_TIME_SERIES_TAGS) \
-    M(730, REFRESH_FAILED) \
     \
     M(900, DISTRIBUTED_CACHE_ERROR) \
     M(901, CANNOT_USE_DISTRIBUTED_CACHE) \
diff --git a/src/Common/ErrorHandlers.h b/src/Common/ErrorHandlers.h
index 4e7d391e66f..a4a7c4683aa 100644
--- a/src/Common/ErrorHandlers.h
+++ b/src/Common/ErrorHandlers.h
@@ -2,7 +2,6 @@
 
 #include <Poco/ErrorHandler.h>
 #include <Common/Exception.h>
-#include <Common/logger_useful.h>
 
 
 /** ErrorHandler for Poco::Thread,
@@ -27,32 +26,8 @@ public:
     void exception(const std::exception &)  override { logException(); }
     void exception()                        override { logException(); }
 
-    void logMessageImpl(Poco::Message::Priority priority, const std::string & msg) override
-    {
-        switch (priority)
-        {
-            case Poco::Message::PRIO_FATAL: [[fallthrough]];
-            case Poco::Message::PRIO_CRITICAL:
-                LOG_FATAL(trace_log, fmt::runtime(msg)); break;
-            case Poco::Message::PRIO_ERROR:
-                LOG_ERROR(trace_log, fmt::runtime(msg)); break;
-            case Poco::Message::PRIO_WARNING:
-                LOG_WARNING(trace_log, fmt::runtime(msg)); break;
-            case Poco::Message::PRIO_NOTICE: [[fallthrough]];
-            case Poco::Message::PRIO_INFORMATION:
-                LOG_INFO(trace_log, fmt::runtime(msg)); break;
-            case Poco::Message::PRIO_DEBUG:
-                LOG_DEBUG(trace_log, fmt::runtime(msg)); break;
-            case Poco::Message::PRIO_TRACE:
-                LOG_TRACE(trace_log, fmt::runtime(msg)); break;
-            case Poco::Message::PRIO_TEST:
-                LOG_TEST(trace_log, fmt::runtime(msg)); break;
-        }
-    }
-
 private:
     LoggerPtr log = getLogger("ServerErrorHandler");
-    LoggerPtr trace_log = getLogger("Poco");
 
     void logException()
     {
diff --git a/src/Common/EventRateMeter.h b/src/Common/EventRateMeter.h
index b8a9112428f..3a21a80ce8b 100644
--- a/src/Common/EventRateMeter.h
+++ b/src/Common/EventRateMeter.h
@@ -4,6 +4,8 @@
 
 #include <Common/ExponentiallySmoothedCounter.h>
 
+#include <numbers>
+
 
 namespace DB
 {
@@ -12,10 +14,9 @@ namespace DB
 class EventRateMeter
 {
 public:
-    explicit EventRateMeter(double now, double period_, size_t heating_ = 0)
+    explicit EventRateMeter(double now, double period_)
         : period(period_)
-        , max_interval(period * 10)
-        , heating(heating_)
+        , half_decay_time(period * std::numbers::ln2) // for `ExponentiallySmoothedAverage::sumWeights()` to be equal to `1/period`
     {
         reset(now);
     }
@@ -28,11 +29,16 @@ public:
     {
         // Remove data for initial heating stage that can present at the beginning of a query.
         // Otherwise it leads to wrong gradual increase of average value, turning algorithm into not very reactive.
-        if (count != 0.0 && data_points++ <= heating)
-            reset(events.time, data_points);
+        if (count != 0.0 && ++data_points < 5)
+        {
+            start = events.time;
+            events = ExponentiallySmoothedAverage();
+        }
 
-        duration.add(std::min(max_interval, now - duration.time), now, period);
-        events.add(count, now, period);
+        if (now - period <= start) // precise counting mode
+            events = ExponentiallySmoothedAverage(events.value + count, now);
+        else // exponential smoothing mode
+            events.add(count, now, half_decay_time);
     }
 
     /// Compute average event rate throughout `[now - period, now]` period.
@@ -43,26 +49,24 @@ public:
         add(now, 0);
         if (unlikely(now <= start))
             return 0;
-
-        // We do not use .get() because sum of weights will anyway be canceled out (optimization)
-        return events.value / duration.value;
+        if (now - period <= start) // precise counting mode
+            return events.value / (now - start);
+        else // exponential smoothing mode
+            return events.get(half_decay_time); // equals to `events.value / period`
     }
 
-    void reset(double now, size_t data_points_ = 0)
+    void reset(double now)
     {
         start = now;
         events = ExponentiallySmoothedAverage();
-        duration = ExponentiallySmoothedAverage();
-        data_points = data_points_;
+        data_points = 0;
     }
 
 private:
     const double period;
-    const double max_interval;
-    const size_t heating;
+    const double half_decay_time;
     double start; // Instant in past without events before it; when measurement started or reset
-    ExponentiallySmoothedAverage duration; // Current duration of a period
-    ExponentiallySmoothedAverage events; // Estimated number of events in last `duration` seconds
+    ExponentiallySmoothedAverage events; // Estimated number of events in the last `period`
     size_t data_points = 0;
 };
 
diff --git a/src/Common/Exception.cpp b/src/Common/Exception.cpp
index d68537513da..33befa64946 100644
--- a/src/Common/Exception.cpp
+++ b/src/Common/Exception.cpp
@@ -8,7 +8,6 @@
 #include <Common/ErrorCodes.h>
 #include <Common/Exception.h>
 #include <Common/LockMemoryExceptionInThread.h>
-#include <Common/Logger.h>
 #include <Common/MemorySanitizer.h>
 #include <Common/SensitiveDataMasker.h>
 #include <Common/config_version.h>
@@ -101,7 +100,7 @@ Exception::Exception(const MessageMasked & msg_masked, int code, bool remote_)
 {
     if (terminate_on_any_exception)
         std::_Exit(terminate_status_code);
-    capture_thread_frame_pointers = getThreadFramePointers();
+    capture_thread_frame_pointers = thread_frame_pointers;
     handle_error_code(msg_masked.msg, code, remote, getStackFramePointers());
 }
 
@@ -111,7 +110,7 @@ Exception::Exception(MessageMasked && msg_masked, int code, bool remote_)
 {
     if (terminate_on_any_exception)
         std::_Exit(terminate_status_code);
-    capture_thread_frame_pointers = getThreadFramePointers();
+    capture_thread_frame_pointers = thread_frame_pointers;
     handle_error_code(message(), code, remote, getStackFramePointers());
 }
 
@@ -120,7 +119,7 @@ Exception::Exception(CreateFromPocoTag, const Poco::Exception & exc)
 {
     if (terminate_on_any_exception)
         std::_Exit(terminate_status_code);
-    capture_thread_frame_pointers = getThreadFramePointers();
+    capture_thread_frame_pointers = thread_frame_pointers;
 #ifdef STD_EXCEPTION_HAS_STACK_TRACE
     auto * stack_trace_frames = exc.get_stack_trace_frames();
     auto stack_trace_size = exc.get_stack_trace_size();
@@ -134,7 +133,7 @@ Exception::Exception(CreateFromSTDTag, const std::exception & exc)
 {
     if (terminate_on_any_exception)
         std::_Exit(terminate_status_code);
-    capture_thread_frame_pointers = getThreadFramePointers();
+    capture_thread_frame_pointers = thread_frame_pointers;
 #ifdef STD_EXCEPTION_HAS_STACK_TRACE
     auto * stack_trace_frames = exc.get_stack_trace_frames();
     auto stack_trace_size = exc.get_stack_trace_size();
@@ -224,38 +223,10 @@ Exception::FramePointers Exception::getStackFramePointers() const
 }
 
 thread_local bool Exception::enable_job_stack_trace = false;
-thread_local bool Exception::can_use_thread_frame_pointers = false;
-thread_local Exception::ThreadFramePointers Exception::thread_frame_pointers;
-
-Exception::ThreadFramePointers::ThreadFramePointers()
-{
-    can_use_thread_frame_pointers = true;
-}
-
-Exception::ThreadFramePointers::~ThreadFramePointers()
-{
-    can_use_thread_frame_pointers = false;
-}
-
-Exception::ThreadFramePointersBase Exception::getThreadFramePointers()
-{
-    if (can_use_thread_frame_pointers)
-        return thread_frame_pointers.frame_pointers;
-
-    return {};
-}
-
-void Exception::setThreadFramePointers(ThreadFramePointersBase frame_pointers)
-{
-    if (can_use_thread_frame_pointers)
-        thread_frame_pointers.frame_pointers = std::move(frame_pointers);
-}
+thread_local std::vector<StackTrace::FramePointers> Exception::thread_frame_pointers = {};
 
 static void tryLogCurrentExceptionImpl(Poco::Logger * logger, const std::string & start_of_message)
 {
-    if (!isLoggingEnabled())
-        return;
-
     try
     {
         PreformattedMessage message = getCurrentExceptionMessageAndPattern(true);
@@ -271,9 +242,6 @@ static void tryLogCurrentExceptionImpl(Poco::Logger * logger, const std::string
 
 void tryLogCurrentException(const char * log_name, const std::string & start_of_message)
 {
-    if (!isLoggingEnabled())
-        return;
-
     /// Under high memory pressure, new allocations throw a
     /// MEMORY_LIMIT_EXCEEDED exception.
     ///
diff --git a/src/Common/Exception.h b/src/Common/Exception.h
index a4f55f41caa..4e54c411bf1 100644
--- a/src/Common/Exception.h
+++ b/src/Common/Exception.h
@@ -10,6 +10,7 @@
 
 #include <cerrno>
 #include <exception>
+#include <memory>
 #include <vector>
 
 #include <fmt/core.h>
@@ -48,14 +49,14 @@ public:
     {
         if (terminate_on_any_exception)
             std::terminate();
-        capture_thread_frame_pointers = getThreadFramePointers();
+        capture_thread_frame_pointers = thread_frame_pointers;
     }
 
     Exception(const PreformattedMessage & msg, int code): Exception(msg.text, code)
     {
         if (terminate_on_any_exception)
             std::terminate();
-        capture_thread_frame_pointers = getThreadFramePointers();
+        capture_thread_frame_pointers = thread_frame_pointers;
         message_format_string = msg.format_string;
         message_format_string_args = msg.format_string_args;
     }
@@ -64,36 +65,18 @@ public:
     {
         if (terminate_on_any_exception)
             std::terminate();
-        capture_thread_frame_pointers = getThreadFramePointers();
+        capture_thread_frame_pointers = thread_frame_pointers;
         message_format_string = msg.format_string;
         message_format_string_args = msg.format_string_args;
     }
 
     /// Collect call stacks of all previous jobs' schedulings leading to this thread job's execution
     static thread_local bool enable_job_stack_trace;
-    static thread_local bool can_use_thread_frame_pointers;
-    /// Because of unknown order of static destructor calls,
-    /// thread_frame_pointers can already be uninitialized when a different destructor generates an exception.
-    /// To prevent such scenarios, a wrapper class is created and a function that will return empty vector
-    /// if its destructor is already called
-    using ThreadFramePointersBase = std::vector<StackTrace::FramePointers>;
-    struct ThreadFramePointers
-    {
-        ThreadFramePointers();
-        ~ThreadFramePointers();
-
-        ThreadFramePointersBase frame_pointers;
-    };
-
-    static ThreadFramePointersBase getThreadFramePointers();
-    static void setThreadFramePointers(ThreadFramePointersBase frame_pointers);
-
+    static thread_local std::vector<StackTrace::FramePointers> thread_frame_pointers;
     /// Callback for any exception
     static std::function<void(const std::string & msg, int code, bool remote, const Exception::FramePointers & trace)> callback;
 
 protected:
-    static thread_local ThreadFramePointers thread_frame_pointers;
-
     // used to remove the sensitive information from exceptions if query_masking_rules is configured
     struct MessageMasked
     {
@@ -195,7 +178,7 @@ class ErrnoException : public Exception
 public:
     ErrnoException(std::string && msg, int code, int with_errno) : Exception(msg, code), saved_errno(with_errno)
     {
-        capture_thread_frame_pointers = getThreadFramePointers();
+        capture_thread_frame_pointers = thread_frame_pointers;
         addMessage(", {}", errnoToString(saved_errno));
     }
 
@@ -204,7 +187,7 @@ public:
     requires std::is_convertible_v<T, String>
     ErrnoException(int code, T && message) : Exception(message, code), saved_errno(errno)
     {
-        capture_thread_frame_pointers = getThreadFramePointers();
+        capture_thread_frame_pointers = thread_frame_pointers;
         addMessage(", {}", errnoToString(saved_errno));
     }
 
diff --git a/src/Common/FailPoint.cpp b/src/Common/FailPoint.cpp
index b2fcbc77c56..5454cba8e2e 100644
--- a/src/Common/FailPoint.cpp
+++ b/src/Common/FailPoint.cpp
@@ -7,8 +7,6 @@
 #include <condition_variable>
 #include <mutex>
 
-#include "config.h"
-
 namespace DB
 {
 
@@ -17,7 +15,7 @@ namespace ErrorCodes
 extern const int LOGICAL_ERROR;
 };
 
-#if USE_LIBFIU
+#if FIU_ENABLE
 static struct InitFiu
 {
     InitFiu()
@@ -59,10 +57,7 @@ static struct InitFiu
     PAUSEABLE_ONCE(finish_clean_quorum_failed_parts) \
     PAUSEABLE(dummy_pausable_failpoint) \
     ONCE(execute_query_calling_empty_set_result_func_on_exception) \
-    ONCE(receive_timeout_on_table_status_response) \
-    REGULAR(keepermap_fail_drop_data) \
-    REGULAR(lazy_pipe_fds_fail_close) \
-    PAUSEABLE(infinite_sleep) \
+    ONCE(receive_timeout_on_table_status_response)
 
 
 namespace FailPoints
@@ -137,7 +132,7 @@ void FailPointInjection::pauseFailPoint(const String & fail_point_name)
 
 void FailPointInjection::enableFailPoint(const String & fail_point_name)
 {
-#if USE_LIBFIU
+#if FIU_ENABLE
 #define SUB_M(NAME, flags, pause)                                                                               \
     if (fail_point_name == FailPoints::NAME)                                                                    \
     {                                                                                                           \
diff --git a/src/Common/FailPoint.h b/src/Common/FailPoint.h
index 1af13d08553..b3e1214d597 100644
--- a/src/Common/FailPoint.h
+++ b/src/Common/FailPoint.h
@@ -1,16 +1,17 @@
 #pragma once
+#include "config.h"
 
 #include <Common/Exception.h>
 #include <Core/Types.h>
 #include <Poco/Util/AbstractConfiguration.h>
 
-#include "config.h"
-
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 #pragma clang diagnostic ignored "-Wreserved-macro-identifier"
-#  include <fiu.h>
-#  include <fiu-control.h>
+
+#include <fiu.h>
+#include <fiu-control.h>
+
 #pragma clang diagnostic pop
 
 #include <unordered_map>
diff --git a/src/Common/FieldBinaryEncoding.cpp b/src/Common/FieldBinaryEncoding.cpp
index 23263c988c3..6c1a8496fe6 100644
--- a/src/Common/FieldBinaryEncoding.cpp
+++ b/src/Common/FieldBinaryEncoding.cpp
@@ -208,7 +208,7 @@ void FieldVisitorEncodeBinary::operator() (const Map & x, WriteBuffer & buf) con
     writeVarUInt(size, buf);
     for (size_t i = 0; i < size; ++i)
     {
-        const Tuple & key_and_value = x[i].safeGet<Tuple>();
+        const Tuple & key_and_value = x[i].get<Tuple>();
         Field::dispatch([&buf] (const auto & value) { FieldVisitorEncodeBinary()(value, buf); }, key_and_value[0]);
         Field::dispatch([&buf] (const auto & value) { FieldVisitorEncodeBinary()(value, buf); }, key_and_value[1]);
     }
diff --git a/src/Common/FieldVisitorSum.cpp b/src/Common/FieldVisitorSum.cpp
index af9503ac046..b825f188586 100644
--- a/src/Common/FieldVisitorSum.cpp
+++ b/src/Common/FieldVisitorSum.cpp
@@ -19,7 +19,7 @@ bool FieldVisitorSum::operator() (UInt64 & x) const
     return x != 0;
 }
 
-bool FieldVisitorSum::operator() (Float64 & x) const { x += rhs.safeGet<Float64>(); return x != 0; }
+bool FieldVisitorSum::operator() (Float64 & x) const { x += rhs.get<Float64>(); return x != 0; }
 
 bool FieldVisitorSum::operator() (Null &) const
 {
diff --git a/src/Common/FieldVisitorSum.h b/src/Common/FieldVisitorSum.h
index d28676b5093..cbb4c4a1de3 100644
--- a/src/Common/FieldVisitorSum.h
+++ b/src/Common/FieldVisitorSum.h
@@ -37,7 +37,7 @@ public:
     template <typename T>
     bool operator() (DecimalField<T> & x) const
     {
-        x += rhs.safeGet<DecimalField<T>>();
+        x += rhs.get<DecimalField<T>>();
         return x.getValue() != T(0);
     }
 
diff --git a/src/Common/FieldVisitorToString.cpp b/src/Common/FieldVisitorToString.cpp
index 2148bac20d1..c4cb4266418 100644
--- a/src/Common/FieldVisitorToString.cpp
+++ b/src/Common/FieldVisitorToString.cpp
@@ -172,7 +172,7 @@ String FieldVisitorToString::operator() (const Object & x) const
 String convertFieldToString(const Field & field)
 {
     if (field.getType() == Field::Types::Which::String)
-        return field.safeGet<String>();
+        return field.get<String>();
     return applyVisitor(FieldVisitorToString(), field);
 }
 
diff --git a/src/Common/HTTPConnectionPool.cpp b/src/Common/HTTPConnectionPool.cpp
index 7a65863180e..f3ff09bc90a 100644
--- a/src/Common/HTTPConnectionPool.cpp
+++ b/src/Common/HTTPConnectionPool.cpp
@@ -2,7 +2,6 @@
 #include <Common/HostResolvePool.h>
 
 #include <Common/ProfileEvents.h>
-#include <Common/Stopwatch.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/logger_useful.h>
 #include <Common/Exception.h>
@@ -10,7 +9,6 @@
 #include <Common/ProxyConfiguration.h>
 #include <Common/MemoryTrackerSwitcher.h>
 #include <Common/SipHash.h>
-#include <Common/Scheduler/ResourceGuard.h>
 #include <Common/proxyConfigurationToPocoProxyConfig.h>
 
 #include <Poco/Net/HTTPChunkedStream.h>
@@ -238,59 +236,6 @@ public:
 };
 
 
-// Session data hooks implementation for integration with resource scheduler.
-// Hooks are created per every request-response pair and are registered/unregistered in HTTP session.
-// * `atStart()` send resource request to the scheduler every time HTTP session is going to send or receive
-//   data to/from socket. `start()` waits for the scheduler confirmation. This way scheduler might
-//   throttle and/or schedule socket data streams.
-// * `atFinish()` hook is called on successful socket read/write operation.
-//   It informs the scheduler that operation is complete, which allows the scheduler to control the total
-//   amount of in-flight bytes and/or operations.
-// * `atFail()` hook is called on failure of socket operation. The purpose is to correct the amount of bytes
-//   passed through the scheduler queue to ensure fair bandwidth allocation even in presence of errors.
-struct ResourceGuardSessionDataHooks : public Poco::Net::IHTTPSessionDataHooks
-{
-    ResourceGuardSessionDataHooks(ResourceLink link_, const ResourceGuard::Metrics * metrics, LoggerPtr log_, const String & method, const String & uri)
-        : link(link_)
-        , log(log_)
-        , http_request(method + " " + uri)
-    {
-        request.metrics = metrics;
-        chassert(link);
-    }
-
-    ~ResourceGuardSessionDataHooks() override
-    {
-        request.assertFinished(); // Never destruct with an active request
-    }
-
-    void atStart(int bytes) override
-    {
-        Stopwatch timer;
-        request.enqueue(bytes, link);
-        request.wait();
-        timer.stop();
-        if (timer.elapsedMilliseconds() >= 5000)
-            LOG_INFO(log, "Resource request took too long to finish: {} ms for {}", timer.elapsedMilliseconds(), http_request);
-    }
-
-    void atFinish(int bytes) override
-    {
-        request.finish(bytes, link);
-    }
-
-    void atFail() override
-    {
-        request.finish(0, link);
-    }
-
-    ResourceLink link;
-    ResourceGuard::Request request;
-    LoggerPtr log;
-    String http_request;
-};
-
-
 // EndpointConnectionPool manage connections to the endpoint
 // Features:
 // - it uses HostResolver for address selecting. See Common/HostResolver.h for more info.
@@ -301,6 +246,8 @@ struct ResourceGuardSessionDataHooks : public Poco::Net::IHTTPSessionDataHooks
 // - `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
 {
@@ -390,13 +337,6 @@ private:
         std::ostream & sendRequest(Poco::Net::HTTPRequest & request) override
         {
             auto idle = idleTime();
-
-            // Set data hooks for IO scheduling
-            if (ResourceLink link = CurrentThread::getReadResourceLink())
-                Session::setReceiveDataHooks(std::make_shared<ResourceGuardSessionDataHooks>(link, ResourceGuard::Metrics::getIORead(), log, request.getMethod(), request.getURI()));
-            if (ResourceLink link = CurrentThread::getWriteResourceLink())
-                Session::setSendDataHooks(std::make_shared<ResourceGuardSessionDataHooks>(link, ResourceGuard::Metrics::getIOWrite(), log, request.getMethod(), request.getURI()));
-
             std::ostream & result = Session::sendRequest(request);
             result.exceptions(std::ios::badbit);
 
@@ -453,8 +393,6 @@ private:
                 }
             }
             response_stream = nullptr;
-            Session::setSendDataHooks();
-            Session::setReceiveDataHooks();
 
             group->atConnectionDestroy();
 
diff --git a/src/Common/HashTable/HashMap.h b/src/Common/HashTable/HashMap.h
index 92621db5558..a26797a687a 100644
--- a/src/Common/HashTable/HashMap.h
+++ b/src/Common/HashTable/HashMap.h
@@ -297,7 +297,7 @@ public:
     }
 
     /// Only inserts the value if key isn't already present
-    void ALWAYS_INLINE insertIfNotPresent(const Key & x, const typename Cell::Mapped & value)
+    void ALWAYS_INLINE insertIfNotPresent(const Key & x, const Cell::Mapped & value)
     {
         LookupResult it;
         bool inserted;
diff --git a/src/Common/HostResolvePool.cpp b/src/Common/HostResolvePool.cpp
index e8a05a269bc..cad64ee7204 100644
--- a/src/Common/HostResolvePool.cpp
+++ b/src/Common/HostResolvePool.cpp
@@ -253,18 +253,18 @@ void HostResolver::updateImpl(Poco::Timestamp now, std::vector<Poco::Net::IPAddr
         }
     }
 
-    for (auto & record : merged)
+    for (auto & rec : merged)
     {
-        if (!record.failed || !record.consecutive_fail_count)
-            continue;
+            if (!rec.failed)
+                continue;
 
-        /// Exponential increased time for each consecutive fail
-        auto banned_until = now - Poco::Timespan(history.totalMicroseconds() * (1ull << (record.consecutive_fail_count - 1)));
-        if (record.fail_time < banned_until)
-        {
-            record.failed = false;
-            CurrentMetrics::sub(metrics.banned_count);
-        }
+            /// Exponential increased time for each consecutive fail
+            auto banned_until = now - Poco::Timespan(history.totalMicroseconds() * (1ull << (rec.consecutive_fail_count - 1)));
+            if (rec.fail_time < banned_until)
+            {
+                rec.failed = false;
+                CurrentMetrics::sub(metrics.banned_count);
+            }
     }
 
     chassert(std::is_sorted(merged.begin(), merged.end()));
diff --git a/src/Common/ICachePolicy.h b/src/Common/ICachePolicy.h
index 567fa35d977..301a5c6cbbd 100644
--- a/src/Common/ICachePolicy.h
+++ b/src/Common/ICachePolicy.h
@@ -55,7 +55,6 @@ public:
     virtual void set(const Key & key, const MappedPtr & mapped) = 0;
 
     virtual void remove(const Key & key) = 0;
-    virtual void remove(std::function<bool(const Key & key, const MappedPtr & mapped)> predicate) = 0;
 
     virtual void clear() = 0;
     virtual std::vector<KeyMapped> dump() const = 0;
diff --git a/src/Common/Jemalloc.cpp b/src/Common/Jemalloc.cpp
index d8ff9268cca..d7cc246db6a 100644
--- a/src/Common/Jemalloc.cpp
+++ b/src/Common/Jemalloc.cpp
@@ -5,6 +5,7 @@
 #include <Common/Exception.h>
 #include <Common/Stopwatch.h>
 #include <Common/logger_useful.h>
+#include <jemalloc/jemalloc.h>
 
 #define STRINGIFY_HELPER(x) #x
 #define STRINGIFY(x) STRINGIFY_HELPER(x)
@@ -25,6 +26,7 @@ namespace ErrorCodes
 
 void purgeJemallocArenas()
 {
+    LOG_TRACE(getLogger("SystemJemalloc"), "Purging unused memory");
     Stopwatch watch;
     mallctl("arena." STRINGIFY(MALLCTL_ARENAS_ALL) ".purge", nullptr, nullptr, nullptr, 0);
     ProfileEvents::increment(ProfileEvents::MemoryAllocatorPurge);
@@ -44,6 +46,20 @@ void checkJemallocProfilingEnabled()
             "set: MALLOC_CONF=background_thread:true,prof:true");
 }
 
+template <typename T>
+void setJemallocValue(const char * name, T value)
+{
+    T old_value;
+    size_t old_value_size = sizeof(T);
+    if (mallctl(name, &old_value, &old_value_size, reinterpret_cast<void*>(&value), sizeof(T)))
+    {
+        LOG_WARNING(getLogger("Jemalloc"), "mallctl for {} failed", name);
+        return;
+    }
+
+    LOG_INFO(getLogger("Jemalloc"), "Value for {} set to {} (from {})", name, value, old_value);
+}
+
 void setJemallocProfileActive(bool value)
 {
     checkJemallocProfilingEnabled();
diff --git a/src/Common/Jemalloc.h b/src/Common/Jemalloc.h
index 22a94a44eba..499a906fd3d 100644
--- a/src/Common/Jemalloc.h
+++ b/src/Common/Jemalloc.h
@@ -5,8 +5,6 @@
 #if USE_JEMALLOC
 
 #include <string>
-#include <Common/logger_useful.h>
-#include <jemalloc/jemalloc.h>
 
 namespace DB
 {
@@ -23,59 +21,6 @@ void setJemallocBackgroundThreads(bool enabled);
 
 void setJemallocMaxBackgroundThreads(size_t max_threads);
 
-template <typename T>
-void setJemallocValue(const char * name, T value)
-{
-    T old_value;
-    size_t old_value_size = sizeof(T);
-    mallctl(name, &old_value, &old_value_size, reinterpret_cast<void*>(&value), sizeof(T));
-    LOG_INFO(getLogger("Jemalloc"), "Value for {} set to {} (from {})", name, value, old_value);
-}
-
-template <typename T>
-T getJemallocValue(const char * name)
-{
-    T value;
-    size_t value_size = sizeof(T);
-    mallctl(name, &value, &value_size, nullptr, 0);
-    return value;
-}
-
-/// Each mallctl call consists of string name lookup which can be expensive.
-/// This can be avoided by translating name to "Management Information Base" (MIB)
-/// and using it in mallctlbymib calls
-template <typename T>
-struct JemallocMibCache
-{
-    explicit JemallocMibCache(const char * name)
-    {
-        mallctlnametomib(name, mib, &mib_length);
-    }
-
-    void setValue(T value)
-    {
-        mallctlbymib(mib, mib_length, nullptr, nullptr, reinterpret_cast<void*>(&value), sizeof(T));
-    }
-
-    T getValue()
-    {
-        T value;
-        size_t value_size = sizeof(T);
-        mallctlbymib(mib, mib_length, &value, &value_size, nullptr, 0);
-        return value;
-    }
-
-    void run()
-    {
-        mallctlbymib(mib, mib_length, nullptr, nullptr, nullptr, 0);
-    }
-
-private:
-    static constexpr size_t max_mib_length = 4;
-    size_t mib[max_mib_length];
-    size_t mib_length = max_mib_length;
-};
-
 }
 
 #endif
diff --git a/src/Common/LRUCachePolicy.h b/src/Common/LRUCachePolicy.h
index cb8fdbd2b9c..f833e46a821 100644
--- a/src/Common/LRUCachePolicy.h
+++ b/src/Common/LRUCachePolicy.h
@@ -79,22 +79,6 @@ public:
         cells.erase(it);
     }
 
-    void remove(std::function<bool(const Key &, const MappedPtr &)> predicate) override
-    {
-        for (auto it = cells.begin(); it != cells.end();)
-        {
-            if (predicate(it->first, it->second.value))
-            {
-                Cell & cell = it->second;
-                current_size_in_bytes -= cell.size;
-                queue.erase(cell.queue_iterator);
-                it = cells.erase(it);
-            }
-            else
-                ++it;
-        }
-    }
-
     MappedPtr get(const Key & key) override
     {
         auto it = cells.find(key);
diff --git a/src/Common/Logger.cpp b/src/Common/Logger.cpp
index bd848abe353..c8d557bc3a3 100644
--- a/src/Common/Logger.cpp
+++ b/src/Common/Logger.cpp
@@ -25,15 +25,3 @@ bool hasLogger(const std::string & name)
 {
     return Poco::Logger::has(name);
 }
-
-static constinit std::atomic<bool> allow_logging{true};
-
-bool isLoggingEnabled()
-{
-    return allow_logging;
-}
-
-void disableLogging()
-{
-    allow_logging = false;
-}
diff --git a/src/Common/Logger.h b/src/Common/Logger.h
index 7471e3dff9b..b54ccd33e72 100644
--- a/src/Common/Logger.h
+++ b/src/Common/Logger.h
@@ -64,7 +64,3 @@ LoggerRawPtr createRawLogger(const std::string & name, Poco::Channel * channel,
   * Otherwise, returns false.
   */
 bool hasLogger(const std::string & name);
-
-void disableLogging();
-
-bool isLoggingEnabled();
diff --git a/src/Common/MemoryTracker.cpp b/src/Common/MemoryTracker.cpp
index 7bf665ea7a0..ac412684cf7 100644
--- a/src/Common/MemoryTracker.cpp
+++ b/src/Common/MemoryTracker.cpp
@@ -20,9 +20,13 @@
 #if USE_JEMALLOC
 #    include <jemalloc/jemalloc.h>
 
+#define STRINGIFY_HELPER(x) #x
+#define STRINGIFY(x) STRINGIFY_HELPER(x)
+
 #endif
 
 #include <atomic>
+#include <cmath>
 #include <random>
 #include <cstdlib>
 #include <string>
@@ -82,10 +86,7 @@ inline std::string_view toDescription(OvercommitResult result)
 
 bool shouldTrackAllocation(Float64 probability, void * ptr)
 {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wimplicit-const-int-float-conversion"
     return intHash64(uintptr_t(ptr)) < std::numeric_limits<uint64_t>::max() * probability;
-#pragma clang diagnostic pop
 }
 
 }
@@ -111,6 +112,8 @@ void AllocationTrace::onFreeImpl(void * ptr, size_t size) const
 namespace ProfileEvents
 {
     extern const Event QueryMemoryLimitExceeded;
+    extern const Event MemoryAllocatorPurge;
+    extern const Event MemoryAllocatorPurgeTimeMicroseconds;
 }
 
 using namespace std::chrono_literals;
@@ -120,13 +123,15 @@ static constexpr size_t log_peak_memory_usage_every = 1ULL << 30;
 MemoryTracker total_memory_tracker(nullptr, VariableContext::Global);
 MemoryTracker background_memory_tracker(&total_memory_tracker, VariableContext::User, false);
 
+std::atomic<Int64> MemoryTracker::free_memory_in_allocator_arenas;
+
 MemoryTracker::MemoryTracker(VariableContext level_) : parent(&total_memory_tracker), level(level_) {}
 MemoryTracker::MemoryTracker(MemoryTracker * parent_, VariableContext level_) : parent(parent_), level(level_) {}
-
 MemoryTracker::MemoryTracker(MemoryTracker * parent_, VariableContext level_, bool log_peak_memory_usage_in_destructor_)
-    : parent(parent_), log_peak_memory_usage_in_destructor(log_peak_memory_usage_in_destructor_), level(level_)
-{
-}
+    : parent(parent_)
+    , log_peak_memory_usage_in_destructor(log_peak_memory_usage_in_destructor_)
+    , level(level_)
+{}
 
 MemoryTracker::~MemoryTracker()
 {
@@ -196,14 +201,10 @@ void MemoryTracker::debugLogBigAllocationWithoutCheck(Int64 size [[maybe_unused]
         return;
 
     MemoryTrackerBlockerInThread blocker(VariableContext::Global);
-    LOG_TEST(
-        getLogger("MemoryTracker"),
-        "Too big allocation ({} bytes) without checking memory limits, "
-        "it may lead to OOM. Stack trace: {}",
-        size,
-        StackTrace().toString());
+    LOG_TEST(getLogger("MemoryTracker"), "Too big allocation ({} bytes) without checking memory limits, "
+                                                   "it may lead to OOM. Stack trace: {}", size, StackTrace().toString());
 #else
-    /// Avoid trash logging in release builds
+    return;     /// Avoid trash logging in release builds
 #endif
 }
 
@@ -224,7 +225,6 @@ AllocationTrace MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceed
         {
             /// For global memory tracker always update memory usage.
             amount.fetch_add(size, std::memory_order_relaxed);
-            rss.fetch_add(size, std::memory_order_relaxed);
 
             auto metric_loaded = metric.load(std::memory_order_relaxed);
             if (metric_loaded != CurrentMetrics::end())
@@ -246,7 +246,6 @@ AllocationTrace MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceed
       * So, we allow over-allocations.
       */
     Int64 will_be = size ? size + amount.fetch_add(size, std::memory_order_relaxed) : amount.load(std::memory_order_relaxed);
-    Int64 will_be_rss = size ? size + rss.fetch_add(size, std::memory_order_relaxed) : rss.load(std::memory_order_relaxed);
 
     auto metric_loaded = metric.load(std::memory_order_relaxed);
     if (metric_loaded != CurrentMetrics::end() && size)
@@ -273,7 +272,6 @@ AllocationTrace MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceed
         {
             /// Revert
             amount.fetch_sub(size, std::memory_order_relaxed);
-            rss.fetch_sub(size, std::memory_order_relaxed);
 
             /// Prevent recursion. Exception::ctor -> std::string -> new[] -> MemoryTracker::alloc
             MemoryTrackerBlockerInThread untrack_lock(VariableContext::Global);
@@ -296,8 +294,33 @@ AllocationTrace MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceed
         }
     }
 
-    if (unlikely(
-            current_hard_limit && (will_be > current_hard_limit || (level == VariableContext::Global && will_be_rss > current_hard_limit))))
+    Int64 limit_to_check = current_hard_limit;
+
+#if USE_JEMALLOC
+    if (level == VariableContext::Global && allow_use_jemalloc_memory.load(std::memory_order_relaxed))
+    {
+        /// Jemalloc arenas may keep some extra memory.
+        /// This memory was substucted from RSS to decrease memory drift.
+        /// In case memory is close to limit, try to pugre the arenas.
+        /// This is needed to avoid OOM, because some allocations are directly done with mmap.
+        Int64 current_free_memory_in_allocator_arenas = free_memory_in_allocator_arenas.load(std::memory_order_relaxed);
+
+        if (current_free_memory_in_allocator_arenas > 0 && current_hard_limit && current_free_memory_in_allocator_arenas + will_be > current_hard_limit)
+        {
+            if (free_memory_in_allocator_arenas.exchange(-current_free_memory_in_allocator_arenas) > 0)
+            {
+                Stopwatch watch;
+                mallctl("arena." STRINGIFY(MALLCTL_ARENAS_ALL) ".purge", nullptr, nullptr, nullptr, 0);
+                ProfileEvents::increment(ProfileEvents::MemoryAllocatorPurge);
+                ProfileEvents::increment(ProfileEvents::MemoryAllocatorPurgeTimeMicroseconds, watch.elapsedMicroseconds());
+            }
+        }
+
+        limit_to_check += abs(current_free_memory_in_allocator_arenas);
+    }
+#endif
+
+    if (unlikely(current_hard_limit && will_be > limit_to_check))
     {
         if (memoryTrackerCanThrow(level, false) && throw_if_memory_exceeded)
         {
@@ -309,7 +332,6 @@ AllocationTrace MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceed
             {
                 /// Revert
                 amount.fetch_sub(size, std::memory_order_relaxed);
-                rss.fetch_sub(size, std::memory_order_relaxed);
 
                 /// Prevent recursion. Exception::ctor -> std::string -> new[] -> MemoryTracker::alloc
                 MemoryTrackerBlockerInThread untrack_lock(VariableContext::Global);
@@ -318,13 +340,12 @@ AllocationTrace MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceed
                 throw DB::Exception(
                                     DB::ErrorCodes::MEMORY_LIMIT_EXCEEDED,
                                     "Memory limit{}{} exceeded: "
-                                    "would use {} (attempt to allocate chunk of {} bytes), current RSS {}, maximum: {}."
+                                    "would use {} (attempt to allocate chunk of {} bytes), maximum: {}."
                                     "{}{}",
                                     description ? " " : "",
                                     description ? description : "",
                                     formatReadableSizeWithBinarySuffix(will_be),
                                     size,
-                                    formatReadableSizeWithBinarySuffix(rss.load(std::memory_order_relaxed)),
                                     formatReadableSizeWithBinarySuffix(current_hard_limit),
                                     overcommit_result == OvercommitResult::NONE ? "" : " OvercommitTracker decision: ",
                                     toDescription(overcommit_result));
@@ -418,7 +439,6 @@ AllocationTrace MemoryTracker::free(Int64 size, double _sample_probability)
         {
             /// For global memory tracker always update memory usage.
             amount.fetch_sub(size, std::memory_order_relaxed);
-            rss.fetch_sub(size, std::memory_order_relaxed);
             auto metric_loaded = metric.load(std::memory_order_relaxed);
             if (metric_loaded != CurrentMetrics::end())
                 CurrentMetrics::sub(metric_loaded, size);
@@ -432,12 +452,7 @@ AllocationTrace MemoryTracker::free(Int64 size, double _sample_probability)
     }
 
     Int64 accounted_size = size;
-    if (level == VariableContext::Global)
-    {
-        amount.fetch_sub(accounted_size, std::memory_order_relaxed);
-        rss.fetch_sub(accounted_size, std::memory_order_relaxed);
-    }
-    else if (level == VariableContext::Thread)
+    if (level == VariableContext::Thread || level == VariableContext::Global)
     {
         /// Could become negative if memory allocated in this thread is freed in another one
         amount.fetch_sub(accounted_size, std::memory_order_relaxed);
@@ -511,29 +526,21 @@ void MemoryTracker::reset()
 }
 
 
-void MemoryTracker::updateRSS(Int64 rss_)
+void MemoryTracker::setRSS(Int64 rss_, Int64 free_memory_in_allocator_arenas_)
 {
-    total_memory_tracker.rss.store(rss_, std::memory_order_relaxed);
-}
-
-void MemoryTracker::updateAllocated(Int64 allocated_)
-{
-    Int64 new_amount = allocated_;
-    LOG_INFO(
-        getLogger("MemoryTracker"),
-        "Correcting the value of global memory tracker from {} to {}",
-        ReadableSize(total_memory_tracker.amount.load(std::memory_order_relaxed)),
-        ReadableSize(allocated_));
+    Int64 new_amount = rss_;
     total_memory_tracker.amount.store(new_amount, std::memory_order_relaxed);
+    free_memory_in_allocator_arenas.store(free_memory_in_allocator_arenas_, std::memory_order_relaxed);
 
     auto metric_loaded = total_memory_tracker.metric.load(std::memory_order_relaxed);
     if (metric_loaded != CurrentMetrics::end())
         CurrentMetrics::set(metric_loaded, new_amount);
 
     bool log_memory_usage = true;
-    total_memory_tracker.updatePeak(new_amount, log_memory_usage);
+    total_memory_tracker.updatePeak(rss_, log_memory_usage);
 }
 
+
 void MemoryTracker::setSoftLimit(Int64 value)
 {
     soft_limit.store(value, std::memory_order_relaxed);
diff --git a/src/Common/MemoryTracker.h b/src/Common/MemoryTracker.h
index f15465a20c1..fd32b631774 100644
--- a/src/Common/MemoryTracker.h
+++ b/src/Common/MemoryTracker.h
@@ -2,6 +2,7 @@
 
 #include <atomic>
 #include <chrono>
+#include <optional>
 #include <base/types.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/VariableContext.h>
@@ -56,8 +57,9 @@ private:
     std::atomic<Int64> soft_limit {0};
     std::atomic<Int64> hard_limit {0};
     std::atomic<Int64> profiler_limit {0};
+    std::atomic_bool allow_use_jemalloc_memory {true};
 
-    std::atomic<Int64> rss{0};
+    static std::atomic<Int64> free_memory_in_allocator_arenas;
 
     Int64 profiler_step = 0;
 
@@ -120,11 +122,6 @@ public:
         return amount.load(std::memory_order_relaxed);
     }
 
-    Int64 getRSS() const
-    {
-        return rss.load(std::memory_order_relaxed);
-    }
-
     // Merges and mutations may pass memory ownership to other threads thus in the end of execution
     // MemoryTracker for background task may have a non-zero counter.
     // This method is intended to fix the counter inside of background_memory_tracker.
@@ -157,6 +154,14 @@ public:
     {
         return soft_limit.load(std::memory_order_relaxed);
     }
+    void setAllowUseJemallocMemory(bool value)
+    {
+        allow_use_jemalloc_memory.store(value, std::memory_order_relaxed);
+    }
+    bool getAllowUseJemallocMmemory() const
+    {
+        return allow_use_jemalloc_memory.load(std::memory_order_relaxed);
+    }
 
     /** Set limit if it was not set.
       * Otherwise, set limit to new value, if new value is greater than previous limit.
@@ -244,9 +249,10 @@ public:
     /// Reset the accumulated data.
     void reset();
 
-    /// update values based on external information (e.g. jemalloc's stat)
-    static void updateRSS(Int64 rss_);
-    static void updateAllocated(Int64 allocated_);
+    /// Reset current counter to an RSS value.
+    /// Jemalloc may have pre-allocated arenas, they are accounted in RSS.
+    /// We can free this arenas in case of exception to avoid OOM.
+    static void setRSS(Int64 rss_, Int64 free_memory_in_allocator_arenas_);
 
     /// Prints info about peak memory consumption into log.
     void logPeakMemoryUsage();
diff --git a/src/Common/MemoryWorker.cpp b/src/Common/MemoryWorker.cpp
deleted file mode 100644
index 11f3bff348c..00000000000
--- a/src/Common/MemoryWorker.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-#include <Common/MemoryWorker.h>
-
-#include <IO/ReadBufferFromFile.h>
-#include <IO/ReadBufferFromFileDescriptor.h>
-#include <IO/ReadHelpers.h>
-#include <base/cgroupsv2.h>
-#include <Common/Jemalloc.h>
-#include <Common/MemoryTracker.h>
-#include <Common/ProfileEvents.h>
-#include <Common/formatReadable.h>
-#include <Common/logger_useful.h>
-
-#include <fmt/ranges.h>
-
-#include <filesystem>
-#include <optional>
-
-namespace fs = std::filesystem;
-
-namespace ProfileEvents
-{
-    extern const Event MemoryAllocatorPurge;
-    extern const Event MemoryAllocatorPurgeTimeMicroseconds;
-    extern const Event MemoryWorkerRun;
-    extern const Event MemoryWorkerRunElapsedMicroseconds;
-}
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int FILE_DOESNT_EXIST;
-    extern const int LOGICAL_ERROR;
-}
-
-#if defined(OS_LINUX)
-namespace
-{
-
-using Metrics = std::map<std::string, uint64_t>;
-
-/// Format is
-///   kernel 5
-///   rss 15
-///   [...]
-Metrics readAllMetricsFromStatFile(ReadBufferFromFile & buf)
-{
-    Metrics metrics;
-    while (!buf.eof())
-    {
-        std::string current_key;
-        readStringUntilWhitespace(current_key, buf);
-
-        assertChar(' ', buf);
-
-        uint64_t value = 0;
-        readIntText(value, buf);
-        assertChar('\n', buf);
-
-        auto [_, inserted] = metrics.emplace(std::move(current_key), value);
-        chassert(inserted, "Duplicate keys in stat file");
-    }
-    return metrics;
-}
-
-uint64_t readMetricFromStatFile(ReadBufferFromFile & buf, std::string_view key)
-{
-    while (!buf.eof())
-    {
-        std::string current_key;
-        readStringUntilWhitespace(current_key, buf);
-        if (current_key != key)
-        {
-            std::string dummy;
-            readStringUntilNewlineInto(dummy, buf);
-            buf.ignore();
-            continue;
-        }
-
-        assertChar(' ', buf);
-        uint64_t value = 0;
-        readIntText(value, buf);
-        return value;
-    }
-    LOG_ERROR(getLogger("CgroupsReader"), "Cannot find '{}' in '{}'", key, buf.getFileName());
-    return 0;
-}
-
-struct CgroupsV1Reader : ICgroupsReader
-{
-    explicit CgroupsV1Reader(const fs::path & stat_file_dir) : buf(stat_file_dir / "memory.stat") { }
-
-    uint64_t readMemoryUsage() override
-    {
-        std::lock_guard lock(mutex);
-        buf.rewind();
-        return readMetricFromStatFile(buf, "rss");
-    }
-
-    std::string dumpAllStats() override
-    {
-        std::lock_guard lock(mutex);
-        buf.rewind();
-        return fmt::format("{}", readAllMetricsFromStatFile(buf));
-    }
-
-private:
-    std::mutex mutex;
-    ReadBufferFromFile buf TSA_GUARDED_BY(mutex);
-};
-
-struct CgroupsV2Reader : ICgroupsReader
-{
-    explicit CgroupsV2Reader(const fs::path & stat_file_dir) : stat_buf(stat_file_dir / "memory.stat") { }
-
-    uint64_t readMemoryUsage() override
-    {
-        std::lock_guard lock(mutex);
-        stat_buf.rewind();
-        return readMetricFromStatFile(stat_buf, "anon");
-    }
-
-    std::string dumpAllStats() override
-    {
-        std::lock_guard lock(mutex);
-        stat_buf.rewind();
-        return fmt::format("{}", readAllMetricsFromStatFile(stat_buf));
-    }
-
-private:
-    std::mutex mutex;
-    ReadBufferFromFile stat_buf TSA_GUARDED_BY(mutex);
-};
-
-/// 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> getCgroupsV1Path()
-{
-    auto path = default_cgroups_mount / "memory/memory.stat";
-    if (!fs::exists(path))
-        return {};
-    return {default_cgroups_mount / "memory"};
-}
-
-std::pair<std::string, ICgroupsReader::CgroupsVersion> getCgroupsPath()
-{
-    auto v2_path = getCgroupsV2PathContainingFile("memory.current");
-    if (v2_path.has_value())
-        return {*v2_path, ICgroupsReader::CgroupsVersion::V2};
-
-    auto v1_path = getCgroupsV1Path();
-    if (v1_path.has_value())
-        return {*v1_path, ICgroupsReader::CgroupsVersion::V1};
-
-    throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "Cannot find cgroups v1 or v2 current memory file");
-}
-
-}
-
-std::shared_ptr<ICgroupsReader> ICgroupsReader::createCgroupsReader(ICgroupsReader::CgroupsVersion version, const std::filesystem::path & cgroup_path)
-{
-    if (version == CgroupsVersion::V2)
-        return std::make_shared<CgroupsV2Reader>(cgroup_path);
-    else
-    {
-        chassert(version == CgroupsVersion::V1);
-        return std::make_shared<CgroupsV1Reader>(cgroup_path);
-    }
-}
-#endif
-
-namespace
-{
-
-std::string_view sourceToString(MemoryWorker::MemoryUsageSource source)
-{
-    switch (source)
-    {
-        case MemoryWorker::MemoryUsageSource::Cgroups: return "Cgroups";
-        case MemoryWorker::MemoryUsageSource::Jemalloc: return "Jemalloc";
-        case MemoryWorker::MemoryUsageSource::None: return "None";
-    }
-}
-
-}
-
-/// We try to pick the best possible supported source for reading memory usage.
-/// Supported sources in order of priority
-/// - reading from cgroups' pseudo-files (fastest and most accurate)
-/// - reading jemalloc's resident stat (doesn't take into account allocations that didn't use jemalloc)
-/// Also, different tick rates are used because not all options are equally fast
-MemoryWorker::MemoryWorker(uint64_t period_ms_)
-    : log(getLogger("MemoryWorker"))
-    , period_ms(period_ms_)
-{
-#if defined(OS_LINUX)
-    try
-    {
-        static constexpr uint64_t cgroups_memory_usage_tick_ms{50};
-
-        const auto [cgroup_path, version] = getCgroupsPath();
-        LOG_INFO(
-            getLogger("CgroupsReader"),
-            "Will create cgroup reader from '{}' (cgroups version: {})",
-            cgroup_path,
-            (version == ICgroupsReader::CgroupsVersion::V1) ? "v1" : "v2");
-
-        cgroups_reader = ICgroupsReader::createCgroupsReader(version, cgroup_path);
-        source = MemoryUsageSource::Cgroups;
-        if (period_ms == 0)
-            period_ms = cgroups_memory_usage_tick_ms;
-
-        return;
-    }
-    catch (...)
-    {
-        tryLogCurrentException(log, "Cannot use cgroups reader");
-    }
-#endif
-
-#if USE_JEMALLOC
-    static constexpr uint64_t jemalloc_memory_usage_tick_ms{100};
-
-    source = MemoryUsageSource::Jemalloc;
-    if (period_ms == 0)
-        period_ms = jemalloc_memory_usage_tick_ms;
-#endif
-}
-
-MemoryWorker::MemoryUsageSource MemoryWorker::getSource()
-{
-    return source;
-}
-
-void MemoryWorker::start()
-{
-    if (source == MemoryUsageSource::None)
-        return;
-
-    LOG_INFO(
-        getLogger("MemoryWorker"),
-        "Starting background memory thread with period of {}ms, using {} as source",
-        period_ms,
-        sourceToString(source));
-    background_thread = ThreadFromGlobalPool([this] { backgroundThread(); });
-}
-
-MemoryWorker::~MemoryWorker()
-{
-    {
-        std::unique_lock lock(mutex);
-        shutdown = true;
-    }
-    cv.notify_all();
-
-    if (background_thread.joinable())
-        background_thread.join();
-}
-
-uint64_t MemoryWorker::getMemoryUsage()
-{
-    switch (source)
-    {
-        case MemoryUsageSource::Cgroups:
-            return cgroups_reader != nullptr ? cgroups_reader->readMemoryUsage() : 0;
-        case MemoryUsageSource::Jemalloc:
-#if USE_JEMALLOC
-            return resident_mib.getValue();
-#else
-            return 0;
-#endif
-        case MemoryUsageSource::None:
-            throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "Trying to fetch memory usage while no memory source can be used");
-    }
-}
-
-void MemoryWorker::backgroundThread()
-{
-    std::chrono::milliseconds chrono_period_ms{period_ms};
-    [[maybe_unused]] bool first_run = true;
-    std::unique_lock lock(mutex);
-    while (true)
-    {
-        cv.wait_for(lock, chrono_period_ms, [this] { return shutdown; });
-        if (shutdown)
-            return;
-
-        Stopwatch total_watch;
-
-#if USE_JEMALLOC
-        if (source == MemoryUsageSource::Jemalloc)
-            epoch_mib.setValue(0);
-#endif
-
-        Int64 resident = getMemoryUsage();
-        MemoryTracker::updateRSS(resident);
-
-#if USE_JEMALLOC
-        if (resident > total_memory_tracker.getHardLimit())
-        {
-            Stopwatch purge_watch;
-            purge_mib.run();
-            ProfileEvents::increment(ProfileEvents::MemoryAllocatorPurge);
-            ProfileEvents::increment(ProfileEvents::MemoryAllocatorPurgeTimeMicroseconds, purge_watch.elapsedMicroseconds());
-        }
-#endif
-
-#if USE_JEMALLOC
-        if (unlikely(first_run || total_memory_tracker.get() < 0))
-        {
-            if (source != MemoryUsageSource::Jemalloc)
-                epoch_mib.setValue(0);
-
-            MemoryTracker::updateAllocated(allocated_mib.getValue());
-        }
-#endif
-
-        ProfileEvents::increment(ProfileEvents::MemoryWorkerRun);
-        ProfileEvents::increment(ProfileEvents::MemoryWorkerRunElapsedMicroseconds, total_watch.elapsedMicroseconds());
-        first_run = false;
-    }
-}
-
-}
diff --git a/src/Common/MemoryWorker.h b/src/Common/MemoryWorker.h
deleted file mode 100644
index f4b0fed23ec..00000000000
--- a/src/Common/MemoryWorker.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#pragma once
-
-#include <Common/CgroupsMemoryUsageObserver.h>
-#include <Common/ThreadPool.h>
-#include <Common/Jemalloc.h>
-
-namespace DB
-{
-
-struct ICgroupsReader
-{
-    enum class CgroupsVersion : uint8_t
-    {
-        V1,
-        V2
-    };
-
-#if defined(OS_LINUX)
-    static std::shared_ptr<ICgroupsReader>
-    createCgroupsReader(ICgroupsReader::CgroupsVersion version, const std::filesystem::path & cgroup_path);
-#endif
-
-    virtual ~ICgroupsReader() = default;
-
-    virtual uint64_t readMemoryUsage() = 0;
-
-    virtual std::string dumpAllStats() = 0;
-};
-
-
-/// Correct MemoryTracker based on external information (e.g. Cgroups or stats.resident from jemalloc)
-/// The worker spawns a background thread which periodically reads current resident memory from the source,
-/// whose value is sent to global MemoryTracker.
-/// It can do additional things like purging jemalloc dirty pages if the current memory usage is higher than global hard limit.
-class MemoryWorker
-{
-public:
-    explicit MemoryWorker(uint64_t period_ms_);
-
-    enum class MemoryUsageSource : uint8_t
-    {
-        None,
-        Cgroups,
-        Jemalloc
-    };
-
-    MemoryUsageSource getSource();
-
-    void start();
-
-    ~MemoryWorker();
-private:
-    uint64_t getMemoryUsage();
-
-    void backgroundThread();
-
-    ThreadFromGlobalPool background_thread;
-
-    std::mutex mutex;
-    std::condition_variable cv;
-    bool shutdown = false;
-
-    LoggerPtr log;
-
-    uint64_t period_ms;
-
-    MemoryUsageSource source{MemoryUsageSource::None};
-
-    std::shared_ptr<ICgroupsReader> cgroups_reader;
-
-#if USE_JEMALLOC
-    JemallocMibCache<uint64_t> epoch_mib{"epoch"};
-    JemallocMibCache<size_t> resident_mib{"stats.resident"};
-    JemallocMibCache<size_t> allocated_mib{"stats.allocated"};
-
-#define STRINGIFY_HELPER(x) #x
-#define STRINGIFY(x) STRINGIFY_HELPER(x)
-    JemallocMibCache<size_t> purge_mib{"arena." STRINGIFY(MALLCTL_ARENAS_ALL) ".purge"};
-#undef STRINGIFY
-#undef STRINGIFY_HELPER
-#endif
-};
-
-}
diff --git a/src/Common/NamedCollections/NamedCollectionsMetadataStorage.cpp b/src/Common/NamedCollections/NamedCollectionsMetadataStorage.cpp
index e9f7816ce73..36191b89e86 100644
--- a/src/Common/NamedCollections/NamedCollectionsMetadataStorage.cpp
+++ b/src/Common/NamedCollections/NamedCollectionsMetadataStorage.cpp
@@ -6,18 +6,14 @@
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Core/Settings.h>
-#include <IO/FileEncryptionCommon.h>
-#include <IO/ReadBufferFromFile.h>
-#include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromFile.h>
-#include <IO/WriteBufferFromString.h>
+#include <IO/ReadBufferFromFile.h>
 #include <IO/WriteHelpers.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/formatAST.h>
 #include <Interpreters/Context.h>
 #include <filesystem>
-#include <boost/algorithm/hex.hpp>
 
 namespace fs = std::filesystem;
 
@@ -30,7 +26,6 @@ namespace ErrorCodes
     extern const int INVALID_CONFIG_PARAMETER;
     extern const int BAD_ARGUMENTS;
     extern const int LOGICAL_ERROR;
-    extern const int SUPPORT_IS_DISABLED;
 }
 
 static const std::string named_collections_storage_config_path = "named_collections_storage";
@@ -79,9 +74,9 @@ public:
 };
 
 
-class NamedCollectionsMetadataStorage::LocalStorage : public INamedCollectionsStorage, protected WithContext
+class NamedCollectionsMetadataStorage::LocalStorage : public INamedCollectionsStorage, private WithContext
 {
-protected:
+private:
     std::string root_path;
 
 public:
@@ -131,11 +126,6 @@ public:
         ReadBufferFromFile in(getPath(file_name));
         std::string data;
         readStringUntilEOF(data, in);
-        return readHook(data);
-    }
-
-    virtual std::string readHook(const std::string & data) const
-    {
         return data;
     }
 
@@ -152,9 +142,8 @@ public:
         fs::create_directories(root_path);
 
         auto tmp_path = getPath(file_name + ".tmp");
-        auto write_data = writeHook(data);
-        WriteBufferFromFile out(tmp_path, write_data.size(), O_WRONLY | O_CREAT | O_EXCL);
-        writeString(write_data, out);
+        WriteBufferFromFile out(tmp_path, data.size(), O_WRONLY | O_CREAT | O_EXCL);
+        writeString(data, out);
 
         out.next();
         if (getContext()->getSettingsRef().fsync_metadata)
@@ -164,11 +153,6 @@ public:
         fs::rename(tmp_path, getPath(file_name));
     }
 
-    virtual std::string writeHook(const std::string & data) const
-    {
-        return data;
-    }
-
     void remove(const std::string & file_name) override
     {
         if (!removeIfExists(file_name))
@@ -184,7 +168,7 @@ public:
         return fs::remove(getPath(file_name));
     }
 
-protected:
+private:
     std::string getPath(const std::string & file_name) const
     {
         const auto file_name_as_path = fs::path(file_name);
@@ -194,7 +178,6 @@ protected:
         return fs::path(root_path) / file_name_as_path;
     }
 
-private:
     /// Delete .tmp files. They could be left undeleted in case of
     /// some exception or abrupt server restart.
     void cleanup()
@@ -211,7 +194,8 @@ private:
     }
 };
 
-class NamedCollectionsMetadataStorage::ZooKeeperStorage : public INamedCollectionsStorage, protected WithContext
+
+class NamedCollectionsMetadataStorage::ZooKeeperStorage : public INamedCollectionsStorage, private WithContext
 {
 private:
     std::string root_path;
@@ -291,25 +275,18 @@ public:
 
     std::string read(const std::string & file_name) const override
     {
-        auto data = getClient()->get(getPath(file_name));
-        return readHook(data);
-    }
-
-    virtual std::string readHook(const std::string & data) const
-    {
-        return data;
+        return getClient()->get(getPath(file_name));
     }
 
     void write(const std::string & file_name, const std::string & data, bool replace) override
     {
-        auto write_data = writeHook(data);
         if (replace)
         {
-            getClient()->createOrUpdate(getPath(file_name), write_data, zkutil::CreateMode::Persistent);
+            getClient()->createOrUpdate(getPath(file_name), data, zkutil::CreateMode::Persistent);
         }
         else
         {
-            auto code = getClient()->tryCreate(getPath(file_name), write_data, zkutil::CreateMode::Persistent);
+            auto code = getClient()->tryCreate(getPath(file_name), data, zkutil::CreateMode::Persistent);
 
             if (code == Coordination::Error::ZNODEEXISTS)
             {
@@ -321,11 +298,6 @@ public:
         }
     }
 
-    virtual std::string writeHook(const std::string & data) const
-    {
-        return data;
-    }
-
     void remove(const std::string & file_name) override
     {
         getClient()->remove(getPath(file_name));
@@ -362,93 +334,6 @@ private:
     }
 };
 
-#if USE_SSL
-
-template <typename BaseMetadataStorage>
-class NamedCollectionsMetadataStorageEncrypted : public BaseMetadataStorage
-{
-public:
-    NamedCollectionsMetadataStorageEncrypted(ContextPtr context_, const std::string & path_)
-        : BaseMetadataStorage(context_, path_)
-    {
-        const auto & config = BaseMetadataStorage::getContext()->getConfigRef();
-        auto key_hex = config.getRawString("named_collections_storage.key_hex", "");
-        try
-        {
-            key = boost::algorithm::unhex(key_hex);
-            key_fingerprint = FileEncryption::calculateKeyFingerprint(key);
-        }
-        catch (const std::exception &)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot read key_hex, check for valid characters [0-9a-fA-F] and length");
-        }
-
-        algorithm = FileEncryption::parseAlgorithmFromString(config.getString("named_collections_storage.algorithm", "aes_128_ctr"));
-    }
-
-    std::string readHook(const std::string & data) const override
-    {
-        ReadBufferFromString in(data);
-        Memory<> encrypted_buffer(data.length());
-
-        FileEncryption::Header header;
-        try
-        {
-            header.read(in);
-        }
-        catch (Exception & e)
-        {
-            e.addMessage("While reading the header of encrypted data");
-            throw;
-        }
-
-        size_t bytes_read = 0;
-        while (bytes_read < encrypted_buffer.size() && !in.eof())
-        {
-            bytes_read += in.read(encrypted_buffer.data() + bytes_read, encrypted_buffer.size() - bytes_read);
-        }
-
-        std::string decrypted_buffer;
-        decrypted_buffer.resize(bytes_read);
-        FileEncryption::Encryptor encryptor(header.algorithm, key, header.init_vector);
-        encryptor.decrypt(encrypted_buffer.data(), bytes_read, decrypted_buffer.data());
-
-        return decrypted_buffer;
-    }
-
-    std::string writeHook(const std::string & data) const override
-    {
-        FileEncryption::Header header{
-            .algorithm = algorithm,
-            .key_fingerprint = key_fingerprint,
-            .init_vector = FileEncryption::InitVector::random()
-        };
-
-        FileEncryption::Encryptor encryptor(header.algorithm, key, header.init_vector);
-        WriteBufferFromOwnString out;
-        header.write(out);
-        encryptor.encrypt(data.data(), data.size(), out);
-        return std::string(out.str());
-    }
-
-private:
-    std::string key;
-    UInt128 key_fingerprint;
-    FileEncryption::Algorithm algorithm;
-};
-
-class NamedCollectionsMetadataStorage::LocalStorageEncrypted : public NamedCollectionsMetadataStorageEncrypted<NamedCollectionsMetadataStorage::LocalStorage>
-{
-    using NamedCollectionsMetadataStorageEncrypted<NamedCollectionsMetadataStorage::LocalStorage>::NamedCollectionsMetadataStorageEncrypted;
-};
-
-class NamedCollectionsMetadataStorage::ZooKeeperStorageEncrypted : public NamedCollectionsMetadataStorageEncrypted<NamedCollectionsMetadataStorage::ZooKeeperStorage>
-{
-    using NamedCollectionsMetadataStorageEncrypted<NamedCollectionsMetadataStorage::ZooKeeperStorage>::NamedCollectionsMetadataStorageEncrypted;
-};
-
-#endif
-
 NamedCollectionsMetadataStorage::NamedCollectionsMetadataStorage(
     std::shared_ptr<INamedCollectionsStorage> storage_,
     ContextPtr context_)
@@ -610,7 +495,7 @@ std::unique_ptr<NamedCollectionsMetadataStorage> NamedCollectionsMetadataStorage
     const auto & config = context_->getConfigRef();
     const auto storage_type = config.getString(named_collections_storage_config_path + ".type", "local");
 
-    if (storage_type == "local" || storage_type == "local_encrypted")
+    if (storage_type == "local")
     {
         const auto path = config.getString(
             named_collections_storage_config_path + ".path",
@@ -619,36 +504,14 @@ std::unique_ptr<NamedCollectionsMetadataStorage> NamedCollectionsMetadataStorage
         LOG_TRACE(getLogger("NamedCollectionsMetadataStorage"),
                   "Using local storage for named collections at path: {}", path);
 
-        std::unique_ptr<INamedCollectionsStorage> local_storage;
-        if (storage_type == "local")
-            local_storage = std::make_unique<NamedCollectionsMetadataStorage::LocalStorage>(context_, path);
-        else if (storage_type == "local_encrypted")
-        {
-#if USE_SSL
-            local_storage = std::make_unique<NamedCollectionsMetadataStorage::LocalStorageEncrypted>(context_, path);
-#else
-            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Named collections encryption requires building with SSL support");
-#endif
-        }
-
+        auto local_storage = std::make_unique<NamedCollectionsMetadataStorage::LocalStorage>(context_, path);
         return std::unique_ptr<NamedCollectionsMetadataStorage>(
             new NamedCollectionsMetadataStorage(std::move(local_storage), context_));
     }
-    if (storage_type == "zookeeper" || storage_type == "keeper" || storage_type == "zookeeper_encrypted" || storage_type == "keeper_encrypted")
+    if (storage_type == "zookeeper" || storage_type == "keeper")
     {
         const auto path = config.getString(named_collections_storage_config_path + ".path");
-
-        std::unique_ptr<INamedCollectionsStorage> zk_storage;
-        if (!storage_type.ends_with("_encrypted"))
-            zk_storage = std::make_unique<NamedCollectionsMetadataStorage::ZooKeeperStorage>(context_, path);
-        else
-        {
-#if USE_SSL
-            zk_storage = std::make_unique<NamedCollectionsMetadataStorage::ZooKeeperStorageEncrypted>(context_, path);
-#else
-            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Named collections encryption requires building with SSL support");
-#endif
-        }
+        auto zk_storage = std::make_unique<NamedCollectionsMetadataStorage::ZooKeeperStorage>(context_, path);
 
         LOG_TRACE(getLogger("NamedCollectionsMetadataStorage"),
                   "Using zookeeper storage for named collections at path: {}", path);
diff --git a/src/Common/NamedCollections/NamedCollectionsMetadataStorage.h b/src/Common/NamedCollections/NamedCollectionsMetadataStorage.h
index 52805e8359d..c3468fbc468 100644
--- a/src/Common/NamedCollections/NamedCollectionsMetadataStorage.h
+++ b/src/Common/NamedCollections/NamedCollectionsMetadataStorage.h
@@ -35,9 +35,7 @@ public:
 private:
     class INamedCollectionsStorage;
     class LocalStorage;
-    class LocalStorageEncrypted;
     class ZooKeeperStorage;
-    class ZooKeeperStorageEncrypted;
 
     std::shared_ptr<INamedCollectionsStorage> storage;
 
diff --git a/src/Common/ObjectStorageKeyGenerator.cpp b/src/Common/ObjectStorageKeyGenerator.cpp
index 3bdc0004198..e9212c3f04d 100644
--- a/src/Common/ObjectStorageKeyGenerator.cpp
+++ b/src/Common/ObjectStorageKeyGenerator.cpp
@@ -14,10 +14,7 @@ public:
     , re_gen(key_template)
     {
     }
-    DB::ObjectStorageKey generate(const String &, bool /* is_directory */, const std::optional<String> & /* key_prefix */) const override
-    {
-        return DB::ObjectStorageKey::createAsAbsolute(re_gen.generate());
-    }
+    DB::ObjectStorageKey generate(const String &, bool) const override { return DB::ObjectStorageKey::createAsAbsolute(re_gen.generate()); }
 
 private:
     String key_template;
@@ -32,7 +29,7 @@ public:
         : key_prefix(std::move(key_prefix_))
     {}
 
-    DB::ObjectStorageKey generate(const String &, bool /* is_directory */, const std::optional<String> & /* key_prefix */) const override
+    DB::ObjectStorageKey generate(const String &, bool) const override
     {
         /// Path to store the new S3 object.
 
@@ -63,8 +60,7 @@ public:
         : key_prefix(std::move(key_prefix_))
     {}
 
-    DB::ObjectStorageKey
-    generate(const String & path, bool /* is_directory */, const std::optional<String> & /* key_prefix */) const override
+    DB::ObjectStorageKey generate(const String & path, bool) const override
     {
         return DB::ObjectStorageKey::createAsRelative(key_prefix, path);
     }
diff --git a/src/Common/ObjectStorageKeyGenerator.h b/src/Common/ObjectStorageKeyGenerator.h
index 008e3c88fac..11da039b33b 100644
--- a/src/Common/ObjectStorageKeyGenerator.h
+++ b/src/Common/ObjectStorageKeyGenerator.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <memory>
-#include <optional>
 #include "ObjectStorageKey.h"
 
 namespace DB
@@ -12,11 +11,7 @@ class IObjectStorageKeysGenerator
 public:
     virtual ~IObjectStorageKeysGenerator() = default;
 
-    /// Generates an object storage key based on a path in the virtual filesystem.
-    /// @param path         - Path in the virtual filesystem.
-    /// @param is_directory - If the path in the virtual filesystem corresponds to a directory.
-    /// @param key_prefix   - Optional key prefix for the generated object storage key. If provided, this prefix will be added to the beginning of the generated key.
-    virtual ObjectStorageKey generate(const String & path, bool is_directory, const std::optional<String> & key_prefix) const = 0;
+    virtual ObjectStorageKey generate(const String & path, bool is_directory) const = 0;
 };
 
 using ObjectStorageKeysGeneratorPtr = std::shared_ptr<IObjectStorageKeysGenerator>;
diff --git a/src/Common/OptimizedRegularExpression.cpp b/src/Common/OptimizedRegularExpression.cpp
index 2cdb3409487..712cab80aff 100644
--- a/src/Common/OptimizedRegularExpression.cpp
+++ b/src/Common/OptimizedRegularExpression.cpp
@@ -244,43 +244,33 @@ const char * analyzeImpl(
                 is_trivial = false;
                 if (!in_square_braces)
                 {
-                    /// it means flag negation
-                    /// there are various possible flags
-                    /// actually only imsU are supported by re2
-                    auto is_flag_char = [](char x)
-                    {
-                        return x == '-' || x == 'i' || x == 'm' || x == 's' || x == 'U' || x == 'u';
-                    };
                     /// Check for case-insensitive flag.
-                    if (pos + 2 < end && pos[1] == '?' && is_flag_char(pos[2]))
+                    if (pos + 1 < end && pos[1] == '?')
                     {
-                        size_t offset = 2;
-                        for (; pos + offset < end; ++offset)
+                        for (size_t offset = 2; pos + offset < end; ++offset)
                         {
-                            if (pos[offset] == 'i')
+                            if (pos[offset] == '-'  /// it means flag negation
+                                /// various possible flags, actually only imsU are supported by re2
+                                || (pos[offset] >= 'a' && pos[offset] <= 'z')
+                                || (pos[offset] >= 'A' && pos[offset] <= 'Z'))
                             {
-                                /// Actually it can be negated case-insensitive flag. But we don't care.
-                                has_case_insensitive_flag = true;
+                                if (pos[offset] == 'i')
+                                {
+                                    /// Actually it can be negated case-insensitive flag. But we don't care.
+                                    has_case_insensitive_flag = true;
+                                    break;
+                                }
                             }
-                            else if (!is_flag_char(pos[offset]))
+                            else
                                 break;
                         }
-                        pos += offset;
-                        if (pos == end)
-                            return pos;
-                        /// if this group only contains flags, we have nothing to do.
-                        if (*pos == ')')
-                        {
-                            ++pos;
-                            break;
-                        }
                     }
                     /// (?:regex) means non-capturing parentheses group
-                    else if (pos + 2 < end && pos[1] == '?' && pos[2] == ':')
+                    if (pos + 2 < end && pos[1] == '?' && pos[2] == ':')
                     {
                         pos += 2;
                     }
-                    else if (pos + 3 < end && pos[1] == '?' && (pos[2] == '<' || pos[2] == '\'' || (pos[2] == 'P' && pos[3] == '<')))
+                    if (pos + 3 < end && pos[1] == '?' && (pos[2] == '<' || pos[2] == '\'' || (pos[2] == 'P' && pos[3] == '<')))
                     {
                         pos = skipNameCapturingGroup(pos, pos[2] == 'P' ? 3: 2, end);
                     }
diff --git a/src/Common/PipeFDs.cpp b/src/Common/PipeFDs.cpp
index 50eeda1bbe2..ceadbb2f983 100644
--- a/src/Common/PipeFDs.cpp
+++ b/src/Common/PipeFDs.cpp
@@ -1,23 +1,19 @@
 #include <Common/PipeFDs.h>
 #include <Common/Exception.h>
 #include <Common/formatReadable.h>
-#include <Common/FailPoint.h>
 
 #include <Common/logger_useful.h>
 #include <base/errnoToString.h>
 
 #include <unistd.h>
 #include <fcntl.h>
+#include <string>
 #include <algorithm>
 
+
 namespace DB
 {
 
-namespace FailPoints
-{
-    extern const char lazy_pipe_fds_fail_close[];
-}
-
 namespace ErrorCodes
 {
     extern const int CANNOT_PIPE;
@@ -46,11 +42,6 @@ void LazyPipeFDs::open()
 
 void LazyPipeFDs::close()
 {
-    fiu_do_on(FailPoints::lazy_pipe_fds_fail_close,
-    {
-        throw Exception(ErrorCodes::CANNOT_PIPE, "Manually triggered exception on close");
-    });
-
     for (int & fd : fds_rw)
     {
         if (fd < 0)
diff --git a/src/Common/PipeFDs.h b/src/Common/PipeFDs.h
index b651176ee26..20bd847c077 100644
--- a/src/Common/PipeFDs.h
+++ b/src/Common/PipeFDs.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cstddef>
+
+
 namespace DB
 {
 
diff --git a/src/Common/ProfileEvents.cpp b/src/Common/ProfileEvents.cpp
index 467dfe60cd7..2b090136e2e 100644
--- a/src/Common/ProfileEvents.cpp
+++ b/src/Common/ProfileEvents.cpp
@@ -86,20 +86,6 @@
     M(NetworkReceiveBytes, "Total number of bytes received from network. Only ClickHouse-related network interaction is included, not by 3rd party libraries.") \
     M(NetworkSendBytes, "Total number of bytes send to network. Only ClickHouse-related network interaction is included, not by 3rd party libraries.") \
     \
-    M(GlobalThreadPoolExpansions, "Counts the total number of times new threads have been added to the global thread pool. This metric indicates the frequency of expansions in the global thread pool to accommodate increased processing demands.") \
-    M(GlobalThreadPoolShrinks, "Counts the total number of times the global thread pool has shrunk by removing threads. This occurs when the number of idle threads exceeds max_thread_pool_free_size, indicating adjustments in the global thread pool size in response to decreased thread utilization.") \
-    M(GlobalThreadPoolThreadCreationMicroseconds, "Total time spent waiting for new threads to start.") \
-    M(GlobalThreadPoolLockWaitMicroseconds, "Total time threads have spent waiting for locks in the global thread pool.") \
-    M(GlobalThreadPoolJobs, "Counts the number of jobs that have been pushed to the global thread pool.") \
-    M(GlobalThreadPoolJobWaitTimeMicroseconds, "Measures the elapsed time from when a job is scheduled in the thread pool to when it is picked up for execution by a worker thread. This metric helps identify delays in job processing, indicating the responsiveness of the thread pool to new tasks.") \
-    M(LocalThreadPoolExpansions, "Counts the total number of times threads have been borrowed from the global thread pool to expand local thread pools.") \
-    M(LocalThreadPoolShrinks, "Counts the total number of times threads have been returned to the global thread pool from local thread pools.") \
-    M(LocalThreadPoolThreadCreationMicroseconds, "Total time local thread pools have spent waiting to borrow a thread from the global pool.") \
-    M(LocalThreadPoolLockWaitMicroseconds, "Total time threads have spent waiting for locks in the local thread pools.") \
-    M(LocalThreadPoolJobs, "Counts the number of jobs that have been pushed to the local thread pools.") \
-    M(LocalThreadPoolBusyMicroseconds, "Total time threads have spent executing the actual work.") \
-    M(LocalThreadPoolJobWaitTimeMicroseconds, "Measures the elapsed time from when a job is scheduled in the thread pool to when it is picked up for execution by a worker thread. This metric helps identify delays in job processing, indicating the responsiveness of the thread pool to new tasks.") \
-    \
     M(DiskS3GetRequestThrottlerCount, "Number of DiskS3 GET and SELECT requests passed through throttler.") \
     M(DiskS3GetRequestThrottlerSleepMicroseconds, "Total time a query was sleeping to conform DiskS3 GET and SELECT request throttling.") \
     M(DiskS3PutRequestThrottlerCount, "Number of DiskS3 PUT, COPY, POST and LIST requests passed through throttler.") \
@@ -120,13 +106,6 @@
     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(SchedulerIOReadRequests, "Resource requests passed through scheduler for IO reads.") \
-    M(SchedulerIOReadBytes, "Bytes passed through scheduler for IO reads.") \
-    M(SchedulerIOReadWaitMicroseconds, "Total time a query was waiting on resource requests for IO reads.") \
-    M(SchedulerIOWriteRequests, "Resource requests passed through scheduler for IO writes.") \
-    M(SchedulerIOWriteBytes, "Bytes passed through scheduler for IO writes.") \
-    M(SchedulerIOWriteWaitMicroseconds, "Total time a query was waiting on resource requests for IO writes.") \
-    \
     M(QueryMaskingRulesMatch, "Number of times query masking rules was successfully matched.") \
     \
     M(ReplicatedPartFetches, "Number of times a data part was downloaded from replica of a ReplicatedMergeTree table.") \
@@ -214,10 +193,8 @@
     M(ReplicaPartialShutdown, "How many times Replicated table has to deinitialize its state due to session expiration in ZooKeeper. The state is reinitialized every time when ZooKeeper is available again.") \
     \
     M(SelectedParts, "Number of data parts selected to read from a MergeTree table.") \
-    M(SelectedPartsTotal, "Number of total data parts before selecting which ones to read from a MergeTree table.") \
     M(SelectedRanges, "Number of (non-adjacent) ranges in all data parts selected to read from a MergeTree table.") \
     M(SelectedMarks, "Number of marks (index granules) selected to read from a MergeTree table.") \
-    M(SelectedMarksTotal, "Number of total marks (index granules) before selecting which ones to read from a MergeTree table.") \
     M(SelectedRows, "Number of rows SELECTed from all tables.") \
     M(SelectedBytes, "Number of bytes (uncompressed; for columns as they stored in memory) SELECTed from all tables.") \
     M(RowsReadByMainReader, "Number of rows read from MergeTree tables by the main reader (after PREWHERE step).") \
@@ -230,35 +207,8 @@
     \
     M(Merge, "Number of launched background merges.") \
     M(MergedRows, "Rows read for background merges. This is the number of rows before merge.") \
-    M(MergedColumns, "Number of columns merged during the horizontal stage of merges.") \
-    M(GatheredColumns, "Number of columns gathered during the vertical stage of merges.") \
     M(MergedUncompressedBytes, "Uncompressed bytes (for columns as they stored in memory) that was read for background merges. This is the number before merge.") \
-    M(MergeTotalMilliseconds, "Total time spent for background merges") \
-    M(MergeExecuteMilliseconds, "Total busy time spent for execution of background merges") \
-    M(MergeHorizontalStageTotalMilliseconds, "Total time spent for horizontal stage of background merges") \
-    M(MergeHorizontalStageExecuteMilliseconds, "Total busy time spent for execution of horizontal stage of background merges") \
-    M(MergeVerticalStageTotalMilliseconds, "Total time spent for vertical stage of background merges") \
-    M(MergeVerticalStageExecuteMilliseconds, "Total busy time spent for execution of vertical stage of background merges") \
-    M(MergeProjectionStageTotalMilliseconds, "Total time spent for projection stage of background merges") \
-    M(MergeProjectionStageExecuteMilliseconds, "Total busy time spent for execution of projection stage of background merges") \
-    \
-    M(MergingSortedMilliseconds, "Total time spent while merging sorted columns") \
-    M(AggregatingSortedMilliseconds, "Total time spent while aggregating sorted columns") \
-    M(CollapsingSortedMilliseconds, "Total time spent while collapsing sorted columns") \
-    M(ReplacingSortedMilliseconds, "Total time spent while replacing sorted columns") \
-    M(SummingSortedMilliseconds, "Total time spent while summing sorted columns") \
-    M(VersionedCollapsingSortedMilliseconds, "Total time spent while version collapsing sorted columns") \
-    M(GatheringColumnMilliseconds, "Total time spent while gathering columns for vertical merge") \
-    \
-    M(MutationTotalParts, "Number of total parts for which mutations tried to be applied") \
-    M(MutationUntouchedParts, "Number of total parts for which mutations tried to be applied but which was completely skipped according to predicate") \
-    M(MutatedRows, "Rows read for mutations. This is the number of rows before mutation") \
-    M(MutatedUncompressedBytes, "Uncompressed bytes (for columns as they stored in memory) that was read for mutations. This is the number before mutation.") \
-    M(MutationTotalMilliseconds, "Total time spent for mutations.") \
-    M(MutationExecuteMilliseconds, "Total busy time spent for execution of mutations.") \
-    M(MutationAllPartColumns, "Number of times when task to mutate all columns in part was created") \
-    M(MutationSomePartColumns, "Number of times when task to mutate some columns in part was created") \
-    M(MutateTaskProjectionsCalculationMicroseconds, "Time spent calculating projections in mutations.") \
+    M(MergesTimeMilliseconds, "Total time spent for background merges.")\
     \
     M(MergeTreeDataWriterRows, "Number of rows INSERTed to MergeTree tables.") \
     M(MergeTreeDataWriterUncompressedBytes, "Uncompressed bytes (for columns as they stored in memory) INSERTed to MergeTree tables.") \
@@ -273,6 +223,7 @@
     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.") \
@@ -506,7 +457,6 @@ The server successfully detected this situation and will download merged part fr
     M(AzureDeleteObjects, "Number of Azure blob storage API DeleteObject(s) calls.") \
     M(AzureListObjects, "Number of Azure blob storage API ListObjects calls.") \
     M(AzureGetProperties, "Number of Azure blob storage API GetProperties calls.") \
-    M(AzureCreateContainer, "Number of Azure blob storage API CreateContainer calls.") \
     \
     M(DiskAzureGetObject, "Number of Disk Azure API GetObject calls.") \
     M(DiskAzureUpload, "Number of Disk Azure blob storage API Upload calls") \
@@ -514,9 +464,8 @@ The server successfully detected this situation and will download merged part fr
     M(DiskAzureCommitBlockList, "Number of Disk Azure blob storage API CommitBlockList calls") \
     M(DiskAzureCopyObject, "Number of Disk Azure blob storage API CopyObject calls") \
     M(DiskAzureListObjects, "Number of Disk Azure blob storage API ListObjects calls.") \
-    M(DiskAzureDeleteObjects, "Number of Disk Azure blob storage API DeleteObject(s) calls.") \
+    M(DiskAzureDeleteObjects, "Number of Azure blob storage API DeleteObject(s) calls.") \
     M(DiskAzureGetProperties, "Number of Disk Azure blob storage API GetProperties calls.") \
-    M(DiskAzureCreateContainer, "Number of Disk Azure blob storage API CreateContainer calls.") \
     \
     M(ReadBufferFromAzureMicroseconds, "Time spent on reading from Azure.") \
     M(ReadBufferFromAzureInitMicroseconds, "Time spent initializing connection to Azure.") \
@@ -827,9 +776,6 @@ The server successfully detected this situation and will download merged part fr
     M(GWPAsanAllocateSuccess, "Number of successful allocations done by GWPAsan") \
     M(GWPAsanAllocateFailed, "Number of failed allocations done by GWPAsan (i.e. filled pool)") \
     M(GWPAsanFree, "Number of free operations done by GWPAsan") \
-    \
-    M(MemoryWorkerRun, "Number of runs done by MemoryWorker in background") \
-    M(MemoryWorkerRunElapsedMicroseconds, "Total time spent by MemoryWorker for background work") \
 
 
 #ifdef APPLY_FOR_EXTERNAL_EVENTS
diff --git a/src/Common/ProgressIndication.cpp b/src/Common/ProgressIndication.cpp
index 79c694574b0..8f0fb3cac6c 100644
--- a/src/Common/ProgressIndication.cpp
+++ b/src/Common/ProgressIndication.cpp
@@ -34,16 +34,13 @@ bool ProgressIndication::updateProgress(const Progress & value)
 
 void ProgressIndication::resetProgress()
 {
-    {
-        std::lock_guard lock(progress_mutex);
-        progress.reset();
-        show_progress_bar = false;
-        written_progress_chars = 0;
-        write_progress_on_update = false;
-    }
+    watch.restart();
+    progress.reset();
+    show_progress_bar = false;
+    written_progress_chars = 0;
+    write_progress_on_update = false;
     {
         std::lock_guard lock(profile_events_mutex);
-        watch.restart();
         cpu_usage_meter.reset(getElapsedNanoseconds());
         hosts_data.clear();
     }
@@ -93,8 +90,6 @@ ProgressIndication::MemoryUsage ProgressIndication::getMemoryUsage() const
 
 void ProgressIndication::writeFinalProgress()
 {
-    std::lock_guard lock(progress_mutex);
-
     if (progress.read_rows < 1000)
         return;
 
@@ -276,8 +271,6 @@ void ProgressIndication::writeProgress(WriteBufferFromFileDescriptor & message)
 
 void ProgressIndication::clearProgressOutput(WriteBufferFromFileDescriptor & message)
 {
-    std::lock_guard lock(progress_mutex);
-
     if (written_progress_chars)
     {
         written_progress_chars = 0;
diff --git a/src/Common/ProgressIndication.h b/src/Common/ProgressIndication.h
index 61b4ca1b305..9baa1c7ffc4 100644
--- a/src/Common/ProgressIndication.h
+++ b/src/Common/ProgressIndication.h
@@ -105,7 +105,7 @@ private:
 
     bool write_progress_on_update = false;
 
-    EventRateMeter cpu_usage_meter{static_cast<double>(clock_gettime_ns()), 2'000'000'000 /*ns*/, 4}; // average cpu utilization last 2 second, skip first 4 points
+    EventRateMeter cpu_usage_meter{static_cast<double>(clock_gettime_ns()), 2'000'000'000 /*ns*/}; // average cpu utilization last 2 second
     HostToTimesMap hosts_data;
     /// In case of all of the above:
     /// - clickhouse-local
@@ -115,8 +115,6 @@ private:
     /// It is possible concurrent access to the following:
     /// - writeProgress() (class properties) (guarded with progress_mutex)
     /// - hosts_data/cpu_usage_meter (guarded with profile_events_mutex)
-    ///
-    /// It is also possible to have more races if query is cancelled, so that clearProgressOutput() is called concurrently
     mutable std::mutex profile_events_mutex;
     mutable std::mutex progress_mutex;
 
diff --git a/src/Common/ProxyConfigurationResolverProvider.cpp b/src/Common/ProxyConfigurationResolverProvider.cpp
index a46837bfdb9..b06073121e7 100644
--- a/src/Common/ProxyConfigurationResolverProvider.cpp
+++ b/src/Common/ProxyConfigurationResolverProvider.cpp
@@ -112,8 +112,9 @@ namespace
         return configuration.has(config_prefix + ".uri");
     }
 
-    /* New syntax requires protocol prefix "<http> or <https>"
-     */
+    /*
+     * New syntax requires protocol prefix "<http> or <https>"
+     * */
     std::optional<std::string> getProtocolPrefix(
         ProxyConfiguration::Protocol request_protocol,
         const String & config_prefix,
@@ -129,18 +130,22 @@ namespace
         return protocol_prefix;
     }
 
+    template <bool new_syntax>
     std::optional<std::string> calculatePrefixBasedOnSettingsSyntax(
-        bool new_syntax,
         ProxyConfiguration::Protocol request_protocol,
         const String & config_prefix,
         const Poco::Util::AbstractConfiguration & configuration
     )
     {
         if (!configuration.has(config_prefix))
+        {
             return std::nullopt;
+        }
 
-        if (new_syntax)
+        if constexpr (new_syntax)
+        {
             return getProtocolPrefix(request_protocol, config_prefix, configuration);
+        }
 
         return config_prefix;
     }
@@ -150,21 +155,24 @@ std::shared_ptr<ProxyConfigurationResolver> ProxyConfigurationResolverProvider::
     Protocol request_protocol,
     const Poco::Util::AbstractConfiguration & configuration)
 {
-    if (auto resolver = getFromSettings(true, request_protocol, "proxy", configuration))
+    if (auto resolver = getFromSettings(request_protocol, "proxy", configuration))
+    {
         return resolver;
+    }
 
     return std::make_shared<EnvironmentProxyConfigurationResolver>(
         request_protocol,
         isTunnelingDisabledForHTTPSRequestsOverHTTPProxy(configuration));
 }
 
+template <bool is_new_syntax>
 std::shared_ptr<ProxyConfigurationResolver> ProxyConfigurationResolverProvider::getFromSettings(
-    bool new_syntax,
     Protocol request_protocol,
     const String & config_prefix,
-    const Poco::Util::AbstractConfiguration & configuration)
+    const Poco::Util::AbstractConfiguration & configuration
+)
 {
-    auto prefix_opt = calculatePrefixBasedOnSettingsSyntax(new_syntax, request_protocol, config_prefix, configuration);
+    auto prefix_opt = calculatePrefixBasedOnSettingsSyntax<is_new_syntax>(request_protocol, config_prefix, configuration);
 
     if (!prefix_opt)
     {
@@ -187,17 +195,20 @@ std::shared_ptr<ProxyConfigurationResolver> ProxyConfigurationResolverProvider::
 std::shared_ptr<ProxyConfigurationResolver> ProxyConfigurationResolverProvider::getFromOldSettingsFormat(
     Protocol request_protocol,
     const String & config_prefix,
-    const Poco::Util::AbstractConfiguration & configuration)
+    const Poco::Util::AbstractConfiguration & configuration
+)
 {
-    /* First try to get it from settings only using the combination of config_prefix and configuration.
+    /*
+     * First try to get it from settings only using the combination of config_prefix and configuration.
      * This logic exists for backward compatibility with old S3 storage specific proxy configuration.
      * */
-    if (auto resolver = ProxyConfigurationResolverProvider::getFromSettings(false, request_protocol, config_prefix + ".proxy", configuration))
+    if (auto resolver = ProxyConfigurationResolverProvider::getFromSettings<false>(request_protocol, config_prefix + ".proxy", configuration))
     {
         return resolver;
     }
 
-    /* In case the combination of config_prefix and configuration does not provide a resolver, try to get it from general / new settings.
+    /*
+     * In case the combination of config_prefix and configuration does not provide a resolver, try to get it from general / new settings.
      * Falls back to Environment resolver if no configuration is found.
      * */
     return ProxyConfigurationResolverProvider::get(request_protocol, configuration);
diff --git a/src/Common/ProxyConfigurationResolverProvider.h b/src/Common/ProxyConfigurationResolverProvider.h
index 357b218e499..ebf22f7e92a 100644
--- a/src/Common/ProxyConfigurationResolverProvider.h
+++ b/src/Common/ProxyConfigurationResolverProvider.h
@@ -33,11 +33,12 @@ public:
     );
 
 private:
+    template <bool is_new_syntax = true>
     static std::shared_ptr<ProxyConfigurationResolver> getFromSettings(
-        bool is_new_syntax,
         Protocol protocol,
         const String & config_prefix,
-        const Poco::Util::AbstractConfiguration & configuration);
+        const Poco::Util::AbstractConfiguration & configuration
+    );
 };
 
 }
diff --git a/src/Common/QueryProfiler.cpp b/src/Common/QueryProfiler.cpp
index 85c92ec292d..746010b5462 100644
--- a/src/Common/QueryProfiler.cpp
+++ b/src/Common/QueryProfiler.cpp
@@ -110,7 +110,7 @@ namespace
         errno = saved_errno;
     }
 
-    [[maybe_unused]] constexpr UInt64 TIMER_PRECISION = 1e9;
+    [[maybe_unused]] constexpr UInt32 TIMER_PRECISION = 1e9;
 }
 
 namespace ErrorCodes
@@ -167,18 +167,18 @@ void Timer::createIfNecessary(UInt64 thread_id, int clock_type, int pause_signal
     }
 }
 
-void Timer::set(UInt64 period)
+void Timer::set(UInt32 period)
 {
     /// Too high frequency can introduce infinite busy loop of signal handlers. We will limit maximum frequency (with 1000 signals per second).
-    period = std::max<UInt64>(period, 1000000);
+    period = std::max<UInt32>(period, 1000000);
     /// Randomize offset as uniform random value from 0 to period - 1.
     /// It will allow to sample short queries even if timer period is large.
     /// (For example, with period of 1 second, query with 50 ms duration will be sampled with 1 / 20 probability).
     /// It also helps to avoid interference (moire).
-    UInt64 period_rand = std::uniform_int_distribution<UInt64>(0, period)(thread_local_rng);
+    UInt32 period_rand = std::uniform_int_distribution<UInt32>(0, period)(thread_local_rng);
 
-    struct timespec interval{.tv_sec = time_t(period / TIMER_PRECISION), .tv_nsec = int64_t(period % TIMER_PRECISION)};
-    struct timespec offset{.tv_sec = time_t(period_rand / TIMER_PRECISION), .tv_nsec = int64_t(period_rand % TIMER_PRECISION)};
+    struct timespec interval{.tv_sec = period / TIMER_PRECISION, .tv_nsec = period % TIMER_PRECISION};
+    struct timespec offset{.tv_sec = period_rand / TIMER_PRECISION, .tv_nsec = period_rand % TIMER_PRECISION};
 
     struct itimerspec timer_spec = {.it_interval = interval, .it_value = offset};
     if (timer_settime(*timer_id, 0, &timer_spec, nullptr))
@@ -229,7 +229,7 @@ void Timer::cleanup()
 
 template <typename ProfilerImpl>
 QueryProfilerBase<ProfilerImpl>::QueryProfilerBase(
-    [[maybe_unused]] UInt64 thread_id, [[maybe_unused]] int clock_type, [[maybe_unused]] UInt64 period, [[maybe_unused]] int pause_signal_)
+    [[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)
@@ -270,7 +270,7 @@ QueryProfilerBase<ProfilerImpl>::QueryProfilerBase(
 
 
 template <typename ProfilerImpl>
-void QueryProfilerBase<ProfilerImpl>::setPeriod([[maybe_unused]] UInt64 period_)
+void QueryProfilerBase<ProfilerImpl>::setPeriod([[maybe_unused]] UInt32 period_)
 {
 #if defined(SANITIZER)
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "QueryProfiler disabled because they cannot work under sanitizers");
@@ -307,7 +307,7 @@ void QueryProfilerBase<ProfilerImpl>::cleanup()
 template class QueryProfilerBase<QueryProfilerReal>;
 template class QueryProfilerBase<QueryProfilerCPU>;
 
-QueryProfilerReal::QueryProfilerReal(UInt64 thread_id, UInt64 period)
+QueryProfilerReal::QueryProfilerReal(UInt64 thread_id, UInt32 period)
     : QueryProfilerBase(thread_id, CLOCK_MONOTONIC, period, SIGUSR1)
 {}
 
@@ -320,7 +320,7 @@ void QueryProfilerReal::signalHandler(int sig, siginfo_t * info, void * context)
     writeTraceInfo(TraceType::Real, sig, info, context);
 }
 
-QueryProfilerCPU::QueryProfilerCPU(UInt64 thread_id, UInt64 period)
+QueryProfilerCPU::QueryProfilerCPU(UInt64 thread_id, UInt32 period)
     : QueryProfilerBase(thread_id, CLOCK_THREAD_CPUTIME_ID, period, SIGUSR2)
 {}
 
diff --git a/src/Common/QueryProfiler.h b/src/Common/QueryProfiler.h
index e3ab0b2e094..ea4cc73bca6 100644
--- a/src/Common/QueryProfiler.h
+++ b/src/Common/QueryProfiler.h
@@ -40,7 +40,7 @@ public:
     ~Timer();
 
     void createIfNecessary(UInt64 thread_id, int clock_type, int pause_signal);
-    void set(UInt64 period);
+    void set(UInt32 period);
     void stop();
     void cleanup();
 
@@ -54,10 +54,10 @@ template <typename ProfilerImpl>
 class QueryProfilerBase
 {
 public:
-    QueryProfilerBase(UInt64 thread_id, int clock_type, UInt64 period, int pause_signal_);
+    QueryProfilerBase(UInt64 thread_id, int clock_type, UInt32 period, int pause_signal_);
     ~QueryProfilerBase();
 
-    void setPeriod(UInt64 period_);
+    void setPeriod(UInt32 period_);
 
 private:
     void cleanup();
@@ -76,7 +76,7 @@ private:
 class QueryProfilerReal : public QueryProfilerBase<QueryProfilerReal>
 {
 public:
-    QueryProfilerReal(UInt64 thread_id, UInt64 period); /// NOLINT
+    QueryProfilerReal(UInt64 thread_id, UInt32 period); /// NOLINT
 
     static void signalHandler(int sig, siginfo_t * info, void * context);
 };
@@ -85,7 +85,7 @@ public:
 class QueryProfilerCPU : public QueryProfilerBase<QueryProfilerCPU>
 {
 public:
-    QueryProfilerCPU(UInt64 thread_id, UInt64 period); /// NOLINT
+    QueryProfilerCPU(UInt64 thread_id, UInt32 period); /// NOLINT
 
     static void signalHandler(int sig, siginfo_t * info, void * context);
 };
diff --git a/src/Common/SLRUCachePolicy.h b/src/Common/SLRUCachePolicy.h
index 5321110f3e5..354ec1d36d6 100644
--- a/src/Common/SLRUCachePolicy.h
+++ b/src/Common/SLRUCachePolicy.h
@@ -95,27 +95,6 @@ public:
         cells.erase(it);
     }
 
-    void remove(std::function<bool(const Key &, const MappedPtr &)> predicate) override
-    {
-        for (auto it = cells.begin(); it != cells.end();)
-        {
-            if (predicate(it->first, it->second.value))
-            {
-                auto & cell = it->second;
-
-                current_size_in_bytes -= cell.size;
-                if (cell.is_protected)
-                    current_protected_size -= cell.size;
-
-                auto & queue = cell.is_protected ? protected_queue : probationary_queue;
-                queue.erase(cell.queue_iterator);
-                it = cells.erase(it);
-            }
-            else
-                ++it;
-        }
-    }
-
     MappedPtr get(const Key & key) override
     {
         auto it = cells.find(key);
diff --git a/src/Common/Scheduler/ISchedulerNode.h b/src/Common/Scheduler/ISchedulerNode.h
index c051829e336..81b491b0eda 100644
--- a/src/Common/Scheduler/ISchedulerNode.h
+++ b/src/Common/Scheduler/ISchedulerNode.h
@@ -3,8 +3,6 @@
 #include <Common/ErrorCodes.h>
 #include <Common/Exception.h>
 #include <Common/Priority.h>
-#include <Common/EventRateMeter.h>
-#include <Common/Stopwatch.h>
 #include <base/defines.h>
 #include <base/types.h>
 
@@ -178,14 +176,6 @@ protected:
     /// Postponed to be handled in scheduler thread, so it is intended to be called from outside.
     void scheduleActivation();
 
-    /// Helper for introspection metrics
-    void incrementDequeued(ResourceCost cost)
-    {
-        dequeued_requests++;
-        dequeued_cost += cost;
-        throughput.add(static_cast<double>(clock_gettime_ns())/1e9, cost);
-    }
-
 public:
     EventQueue * const event_queue;
     String basename;
@@ -199,10 +189,6 @@ public:
     std::atomic<ResourceCost> dequeued_cost{0};
     std::atomic<ResourceCost> canceled_cost{0};
     std::atomic<UInt64> busy_periods{0};
-
-    /// Average dequeued_cost per second
-    /// WARNING: Should only be accessed from the scheduler thread, so that locking is not required
-    EventRateMeter throughput{static_cast<double>(clock_gettime_ns())/1e9, 2, 1};
 };
 
 using SchedulerNodePtr = std::shared_ptr<ISchedulerNode>;
diff --git a/src/Common/Scheduler/ISchedulerQueue.h b/src/Common/Scheduler/ISchedulerQueue.h
index b7a51870a24..532f4bf6c63 100644
--- a/src/Common/Scheduler/ISchedulerQueue.h
+++ b/src/Common/Scheduler/ISchedulerQueue.h
@@ -22,13 +22,10 @@ public:
     {}
 
     // Wrapper for `enqueueRequest()` that should be used to account for available resource budget
-    // Returns `estimated_cost` that should be passed later to `adjustBudget()`
-    [[ nodiscard ]] ResourceCost enqueueRequestUsingBudget(ResourceRequest * request)
+    void enqueueRequestUsingBudget(ResourceRequest * request)
     {
-        ResourceCost estimated_cost = request->cost;
-        request->cost = budget.ask(estimated_cost);
+        request->cost = budget.ask(request->cost);
         enqueueRequest(request);
-        return estimated_cost;
     }
 
     // Should be called to account for difference between real and estimated costs
@@ -37,6 +34,18 @@ public:
         budget.adjust(estimated_cost, real_cost);
     }
 
+    // Adjust budget to account for extra consumption of `cost` resource units
+    void consumeBudget(ResourceCost cost)
+    {
+        adjustBudget(0, cost);
+    }
+
+    // Adjust budget to account for requested, but not consumed `cost` resource units
+    void accumulateBudget(ResourceCost cost)
+    {
+        adjustBudget(cost, 0);
+    }
+
     /// Enqueue new request to be executed using underlying resource.
     /// Should be called outside of scheduling subsystem, implementation must be thread-safe.
     virtual void enqueueRequest(ResourceRequest * request) = 0;
diff --git a/src/Common/Scheduler/Nodes/DynamicResourceManager.cpp b/src/Common/Scheduler/Nodes/DynamicResourceManager.cpp
index 6b9f6318903..01aa7df48d3 100644
--- a/src/Common/Scheduler/Nodes/DynamicResourceManager.cpp
+++ b/src/Common/Scheduler/Nodes/DynamicResourceManager.cpp
@@ -184,20 +184,14 @@ void DynamicResourceManager::updateConfiguration(const Poco::Util::AbstractConfi
 
     // Resource update leads to loss of runtime data of nodes and may lead to temporary violation of constraints (e.g. limits)
     // Try to minimise this by reusing "equal" resources (initialized with the same configuration).
-    std::vector<State::ResourcePtr> resources_to_attach;
     for (auto & [name, new_resource] : new_state->resources)
     {
         if (auto iter = state->resources.find(name); iter != state->resources.end()) // Resource update
         {
             State::ResourcePtr old_resource = iter->second;
             if (old_resource->equals(*new_resource))
-            {
                 new_resource = old_resource; // Rewrite with older version to avoid loss of runtime data
-                continue;
-            }
         }
-        // It is new or updated resource
-        resources_to_attach.emplace_back(new_resource);
     }
 
     // Commit new state
@@ -205,14 +199,17 @@ void DynamicResourceManager::updateConfiguration(const Poco::Util::AbstractConfi
     state = new_state;
 
     // Attach new and updated resources to the scheduler
-    for (auto & resource : resources_to_attach)
+    for (auto & [name, resource] : new_state->resources)
     {
         const SchedulerNodePtr & root = resource->nodes.find("/")->second.ptr;
-        resource->attached_to = &scheduler;
-        scheduler.event_queue->enqueue([this, root]
+        if (root->parent == nullptr)
         {
-            scheduler.attachChild(root);
-        });
+            resource->attached_to = &scheduler;
+            scheduler.event_queue->enqueue([this, root]
+            {
+                scheduler.attachChild(root);
+            });
+        }
     }
 
     // NOTE: after mutex unlock `state` became available for Classifier(s) and must be immutable
diff --git a/src/Common/Scheduler/Nodes/FairPolicy.h b/src/Common/Scheduler/Nodes/FairPolicy.h
index fba637e979e..0a4e55c253b 100644
--- a/src/Common/Scheduler/Nodes/FairPolicy.h
+++ b/src/Common/Scheduler/Nodes/FairPolicy.h
@@ -188,7 +188,8 @@ public:
 
             if (request)
             {
-                incrementDequeued(request->cost);
+                dequeued_requests++;
+                dequeued_cost += request->cost;
                 return {request, heap_size > 0};
             }
         }
diff --git a/src/Common/Scheduler/Nodes/FifoQueue.h b/src/Common/Scheduler/Nodes/FifoQueue.h
index 9fbc6d1ae65..9ec997c06d2 100644
--- a/src/Common/Scheduler/Nodes/FifoQueue.h
+++ b/src/Common/Scheduler/Nodes/FifoQueue.h
@@ -59,7 +59,8 @@ public:
         if (requests.empty())
             busy_periods++;
         queue_cost -= result->cost;
-        incrementDequeued(result->cost);
+        dequeued_requests++;
+        dequeued_cost += result->cost;
         return {result, !requests.empty()};
     }
 
diff --git a/src/Common/Scheduler/Nodes/PriorityPolicy.h b/src/Common/Scheduler/Nodes/PriorityPolicy.h
index 91dc95600d5..22a5155cfeb 100644
--- a/src/Common/Scheduler/Nodes/PriorityPolicy.h
+++ b/src/Common/Scheduler/Nodes/PriorityPolicy.h
@@ -122,7 +122,8 @@ public:
 
             if (request)
             {
-                incrementDequeued(request->cost);
+                dequeued_requests++;
+                dequeued_cost += request->cost;
                 return {request, !items.empty()};
             }
         }
diff --git a/src/Common/Scheduler/Nodes/SemaphoreConstraint.h b/src/Common/Scheduler/Nodes/SemaphoreConstraint.h
index 92c6af9db18..10fce536f5d 100644
--- a/src/Common/Scheduler/Nodes/SemaphoreConstraint.h
+++ b/src/Common/Scheduler/Nodes/SemaphoreConstraint.h
@@ -81,7 +81,8 @@ public:
         child_active = child_now_active;
         if (!active())
             busy_periods++;
-        incrementDequeued(request->cost);
+        dequeued_requests++;
+        dequeued_cost += request->cost;
         return {request, active()};
     }
 
diff --git a/src/Common/Scheduler/Nodes/ThrottlerConstraint.h b/src/Common/Scheduler/Nodes/ThrottlerConstraint.h
index 56866336f50..f4a5795bb2b 100644
--- a/src/Common/Scheduler/Nodes/ThrottlerConstraint.h
+++ b/src/Common/Scheduler/Nodes/ThrottlerConstraint.h
@@ -89,7 +89,8 @@ public:
         child_active = child_now_active;
         if (!active())
             busy_periods++;
-        incrementDequeued(request->cost);
+        dequeued_requests++;
+        dequeued_cost += request->cost;
         return {request, active()};
     }
 
diff --git a/src/Common/Scheduler/Nodes/tests/ResourceTest.h b/src/Common/Scheduler/Nodes/tests/ResourceTest.h
index c787a686a09..ea3f9edf765 100644
--- a/src/Common/Scheduler/Nodes/tests/ResourceTest.h
+++ b/src/Common/Scheduler/Nodes/tests/ResourceTest.h
@@ -232,13 +232,12 @@ struct ResourceTestManager : public ResourceTestBase
         ResourceTestManager & t;
 
         Guard(ResourceTestManager & t_, ResourceLink link_, ResourceCost cost)
-            : ResourceGuard(ResourceGuard::Metrics::getIOWrite(), link_, cost, Lock::Defer)
+            : ResourceGuard(link_, cost, PostponeLocking)
             , t(t_)
         {
             t.onEnqueue(link);
             lock();
             t.onExecute(link);
-            consume(cost);
         }
     };
 
@@ -311,9 +310,8 @@ struct ResourceTestManager : public ResourceTestBase
     // NOTE: actually leader's request(s) make their own small busy period.
     void blockResource(ResourceLink link)
     {
-        ResourceGuard g(ResourceGuard::Metrics::getIOWrite(), link, 1, ResourceGuard::Lock::Defer);
+        ResourceGuard g(link, 1, ResourceGuard::PostponeLocking);
         g.lock();
-        g.consume(1);
         // NOTE: at this point we assume resource to be blocked by single request (<max_requests>1</max_requests>)
         busy_period.arrive_and_wait(); // (1) notify all followers that resource is blocked
         busy_period.arrive_and_wait(); // (2) wait all followers to enqueue their requests
@@ -322,11 +320,10 @@ struct ResourceTestManager : public ResourceTestBase
     {
         getLinkData(link).left += total_requests + 1;
         busy_period.arrive_and_wait(); // (1) wait leader to block resource
-        ResourceGuard g(ResourceGuard::Metrics::getIOWrite(), link, cost, ResourceGuard::Lock::Defer);
+        ResourceGuard g(link, cost, ResourceGuard::PostponeLocking);
         onEnqueue(link);
         busy_period.arrive_and_wait(); // (2) notify leader to unblock
         g.lock();
-        g.consume(cost);
         onExecute(link);
     }
 };
diff --git a/src/Common/Scheduler/Nodes/tests/gtest_dynamic_resource_manager.cpp b/src/Common/Scheduler/Nodes/tests/gtest_dynamic_resource_manager.cpp
index 3328196cced..1901a4fd120 100644
--- a/src/Common/Scheduler/Nodes/tests/gtest_dynamic_resource_manager.cpp
+++ b/src/Common/Scheduler/Nodes/tests/gtest_dynamic_resource_manager.cpp
@@ -36,16 +36,11 @@ TEST(SchedulerDynamicResourceManager, Smoke)
 
     for (int i = 0; i < 10; i++)
     {
-        ResourceGuard gA(ResourceGuard::Metrics::getIOWrite(), cA->get("res1"), 1, ResourceGuard::Lock::Defer);
+        ResourceGuard gA(cA->get("res1"), ResourceGuard::PostponeLocking);
         gA.lock();
-        gA.consume(1);
         gA.unlock();
 
-        ResourceGuard gB(ResourceGuard::Metrics::getIOWrite(), cB->get("res1"));
-        gB.unlock();
-
-        ResourceGuard gC(ResourceGuard::Metrics::getIORead(), cB->get("res1"));
-        gB.consume(2);
+        ResourceGuard gB(cB->get("res1"));
     }
 }
 
diff --git a/src/Common/Scheduler/Nodes/tests/gtest_resource_class_fair.cpp b/src/Common/Scheduler/Nodes/tests/gtest_resource_class_fair.cpp
index 16cce309c2a..4f0e8c80734 100644
--- a/src/Common/Scheduler/Nodes/tests/gtest_resource_class_fair.cpp
+++ b/src/Common/Scheduler/Nodes/tests/gtest_resource_class_fair.cpp
@@ -8,9 +8,7 @@ using namespace DB;
 
 using ResourceTest = ResourceTestClass;
 
-/// Tests disabled because of leaks in the test themselves: https://github.com/ClickHouse/ClickHouse/issues/67678
-
-TEST(DISABLED_SchedulerFairPolicy, Factory)
+TEST(SchedulerFairPolicy, Factory)
 {
     ResourceTest t;
 
@@ -19,7 +17,7 @@ TEST(DISABLED_SchedulerFairPolicy, Factory)
     EXPECT_TRUE(dynamic_cast<FairPolicy *>(fair.get()) != nullptr);
 }
 
-TEST(DISABLED_SchedulerFairPolicy, FairnessWeights)
+TEST(SchedulerFairPolicy, FairnessWeights)
 {
     ResourceTest t;
 
@@ -43,7 +41,7 @@ TEST(DISABLED_SchedulerFairPolicy, FairnessWeights)
     t.consumed("B", 20);
 }
 
-TEST(DISABLED_SchedulerFairPolicy, Activation)
+TEST(SchedulerFairPolicy, Activation)
 {
     ResourceTest t;
 
@@ -79,7 +77,7 @@ TEST(DISABLED_SchedulerFairPolicy, Activation)
     t.consumed("B", 10);
 }
 
-TEST(DISABLED_SchedulerFairPolicy, FairnessMaxMin)
+TEST(SchedulerFairPolicy, FairnessMaxMin)
 {
     ResourceTest t;
 
@@ -103,7 +101,7 @@ TEST(DISABLED_SchedulerFairPolicy, FairnessMaxMin)
     t.consumed("A", 20);
 }
 
-TEST(DISABLED_SchedulerFairPolicy, HierarchicalFairness)
+TEST(SchedulerFairPolicy, HierarchicalFairness)
 {
     ResourceTest t;
 
diff --git a/src/Common/Scheduler/Nodes/tests/gtest_resource_class_priority.cpp b/src/Common/Scheduler/Nodes/tests/gtest_resource_class_priority.cpp
index d3d38aae048..a447b7f6780 100644
--- a/src/Common/Scheduler/Nodes/tests/gtest_resource_class_priority.cpp
+++ b/src/Common/Scheduler/Nodes/tests/gtest_resource_class_priority.cpp
@@ -8,9 +8,7 @@ using namespace DB;
 
 using ResourceTest = ResourceTestClass;
 
-/// Tests disabled because of leaks in the test themselves: https://github.com/ClickHouse/ClickHouse/issues/67678
-
-TEST(DISABLED_SchedulerPriorityPolicy, Factory)
+TEST(SchedulerPriorityPolicy, Factory)
 {
     ResourceTest t;
 
@@ -19,7 +17,7 @@ TEST(DISABLED_SchedulerPriorityPolicy, Factory)
     EXPECT_TRUE(dynamic_cast<PriorityPolicy *>(prio.get()) != nullptr);
 }
 
-TEST(DISABLED_SchedulerPriorityPolicy, Priorities)
+TEST(SchedulerPriorityPolicy, Priorities)
 {
     ResourceTest t;
 
@@ -53,7 +51,7 @@ TEST(DISABLED_SchedulerPriorityPolicy, Priorities)
     t.consumed("C", 0);
 }
 
-TEST(DISABLED_SchedulerPriorityPolicy, Activation)
+TEST(SchedulerPriorityPolicy, Activation)
 {
     ResourceTest t;
 
@@ -94,7 +92,7 @@ TEST(DISABLED_SchedulerPriorityPolicy, Activation)
     t.consumed("C", 0);
 }
 
-TEST(DISABLED_SchedulerPriorityPolicy, SinglePriority)
+TEST(SchedulerPriorityPolicy, SinglePriority)
 {
     ResourceTest t;
 
diff --git a/src/Common/Scheduler/Nodes/tests/gtest_resource_scheduler.cpp b/src/Common/Scheduler/Nodes/tests/gtest_resource_scheduler.cpp
index ddfe0cfbc6f..f8196d15819 100644
--- a/src/Common/Scheduler/Nodes/tests/gtest_resource_scheduler.cpp
+++ b/src/Common/Scheduler/Nodes/tests/gtest_resource_scheduler.cpp
@@ -1,13 +1,11 @@
 #include <gtest/gtest.h>
 
+#include <Common/Scheduler/SchedulerRoot.h>
+
 #include <Common/Scheduler/Nodes/tests/ResourceTest.h>
 
-#include <Common/Scheduler/SchedulerRoot.h>
-#include <Common/randomSeed.h>
-
 #include <barrier>
 #include <future>
-#include <pcg_random.hpp>
 
 using namespace DB;
 
@@ -24,17 +22,6 @@ struct ResourceTest : public ResourceTestBase
     {
         scheduler.stop(true);
     }
-
-    std::mutex rng_mutex;
-    pcg64 rng{randomSeed()};
-
-    template <typename T>
-    T randomInt(T from, T to)
-    {
-        std::uniform_int_distribution<T> distribution(from, to);
-        std::lock_guard lock(rng_mutex);
-        return distribution(rng);
-    }
 };
 
 struct ResourceHolder
@@ -122,55 +109,26 @@ TEST(SchedulerRoot, Smoke)
     r2.registerResource();
 
     {
-        ResourceGuard rg(ResourceGuard::Metrics::getIOWrite(), a);
+        ResourceGuard rg(a);
         EXPECT_TRUE(fc1->requests.contains(&rg.request));
-        rg.consume(1);
     }
 
     {
-        ResourceGuard rg(ResourceGuard::Metrics::getIOWrite(), b);
+        ResourceGuard rg(b);
         EXPECT_TRUE(fc1->requests.contains(&rg.request));
-        rg.consume(1);
     }
 
     {
-        ResourceGuard rg(ResourceGuard::Metrics::getIOWrite(), c);
+        ResourceGuard rg(c);
         EXPECT_TRUE(fc2->requests.contains(&rg.request));
-        rg.consume(1);
     }
 
     {
-        ResourceGuard rg(ResourceGuard::Metrics::getIOWrite(), d);
+        ResourceGuard rg(d);
         EXPECT_TRUE(fc2->requests.contains(&rg.request));
-        rg.consume(1);
     }
 }
 
-TEST(SchedulerRoot, Budget)
-{
-    ResourceTest t;
-
-    ResourceHolder r1(t);
-    r1.add<ConstraintTest>("/", "<max_requests>1</max_requests>");
-    r1.add<PriorityPolicy>("/prio");
-    auto a = r1.addQueue("/prio/A", "");
-    r1.registerResource();
-
-    ResourceCost total_real_cost = 0;
-    int total_requests = 10;
-    for (int i = 0 ; i < total_requests; i++)
-    {
-        ResourceCost est_cost = t.randomInt(1, 10);
-        ResourceCost real_cost = t.randomInt(0, 10);
-        ResourceGuard rg(ResourceGuard::Metrics::getIOWrite(), a, est_cost);
-        rg.consume(real_cost);
-        total_real_cost += real_cost;
-    }
-
-    EXPECT_EQ(total_requests, a.queue->dequeued_requests);
-    EXPECT_EQ(total_real_cost, a.queue->dequeued_cost - a.queue->getBudget());
-}
-
 TEST(SchedulerRoot, Cancel)
 {
     ResourceTest t;
diff --git a/src/Common/Scheduler/Nodes/tests/gtest_throttler_constraint.cpp b/src/Common/Scheduler/Nodes/tests/gtest_throttler_constraint.cpp
index 2bc24cdb292..6cfccb252fa 100644
--- a/src/Common/Scheduler/Nodes/tests/gtest_throttler_constraint.cpp
+++ b/src/Common/Scheduler/Nodes/tests/gtest_throttler_constraint.cpp
@@ -10,9 +10,7 @@ using namespace DB;
 
 using ResourceTest = ResourceTestClass;
 
-/// Tests disabled because of leaks in the test themselves: https://github.com/ClickHouse/ClickHouse/issues/67678
-
-TEST(DISABLED_SchedulerThrottlerConstraint, LeakyBucketConstraint)
+TEST(SchedulerThrottlerConstraint, LeakyBucketConstraint)
 {
     ResourceTest t;
     EventQueue::TimePoint start = std::chrono::system_clock::now();
@@ -42,7 +40,7 @@ TEST(DISABLED_SchedulerThrottlerConstraint, LeakyBucketConstraint)
     t.consumed("A", 10);
 }
 
-TEST(DISABLED_SchedulerThrottlerConstraint, Unlimited)
+TEST(SchedulerThrottlerConstraint, Unlimited)
 {
     ResourceTest t;
     EventQueue::TimePoint start = std::chrono::system_clock::now();
@@ -59,7 +57,7 @@ TEST(DISABLED_SchedulerThrottlerConstraint, Unlimited)
     }
 }
 
-TEST(DISABLED_SchedulerThrottlerConstraint, Pacing)
+TEST(SchedulerThrottlerConstraint, Pacing)
 {
     ResourceTest t;
     EventQueue::TimePoint start = std::chrono::system_clock::now();
@@ -79,7 +77,7 @@ TEST(DISABLED_SchedulerThrottlerConstraint, Pacing)
     }
 }
 
-TEST(DISABLED_SchedulerThrottlerConstraint, BucketFilling)
+TEST(SchedulerThrottlerConstraint, BucketFilling)
 {
     ResourceTest t;
     EventQueue::TimePoint start = std::chrono::system_clock::now();
@@ -113,7 +111,7 @@ TEST(DISABLED_SchedulerThrottlerConstraint, BucketFilling)
     t.consumed("A", 3);
 }
 
-TEST(DISABLED_SchedulerThrottlerConstraint, PeekAndAvgLimits)
+TEST(SchedulerThrottlerConstraint, PeekAndAvgLimits)
 {
     ResourceTest t;
     EventQueue::TimePoint start = std::chrono::system_clock::now();
@@ -141,7 +139,7 @@ TEST(DISABLED_SchedulerThrottlerConstraint, PeekAndAvgLimits)
     }
 }
 
-TEST(DISABLED_SchedulerThrottlerConstraint, 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/Common/Scheduler/ResourceGuard.h b/src/Common/Scheduler/ResourceGuard.h
index cf97f7acf93..3c29f588fba 100644
--- a/src/Common/Scheduler/ResourceGuard.h
+++ b/src/Common/Scheduler/ResourceGuard.h
@@ -7,30 +7,10 @@
 #include <Common/Scheduler/ResourceRequest.h>
 #include <Common/Scheduler/ResourceLink.h>
 
-#include <Common/CurrentThread.h>
-#include <Common/ProfileEvents.h>
-#include <Common/CurrentMetrics.h>
-
 #include <condition_variable>
 #include <mutex>
 
 
-namespace ProfileEvents
-{
-    extern const Event SchedulerIOReadRequests;
-    extern const Event SchedulerIOReadBytes;
-    extern const Event SchedulerIOReadWaitMicroseconds;
-    extern const Event SchedulerIOWriteRequests;
-    extern const Event SchedulerIOWriteBytes;
-    extern const Event SchedulerIOWriteWaitMicroseconds;
-}
-
-namespace CurrentMetrics
-{
-    extern const Metric SchedulerIOReadScheduled;
-    extern const Metric SchedulerIOWriteScheduled;
-}
-
 namespace DB
 {
 
@@ -42,42 +22,12 @@ namespace DB
 class ResourceGuard
 {
 public:
-    enum class Lock
+    enum ResourceGuardCtor
     {
-        Default, /// Locks inside constructor
+        LockStraightAway, /// Locks inside constructor (default)
 
         // WARNING: Only for tests. It is not exception-safe because `lock()` must be called after construction.
-        Defer /// Don't lock in constructor, but send request
-    };
-
-    struct Metrics
-    {
-        const ProfileEvents::Event requests = ProfileEvents::end();
-        const ProfileEvents::Event cost = ProfileEvents::end();
-        const ProfileEvents::Event wait_microseconds = ProfileEvents::end();
-        const CurrentMetrics::Metric scheduled_count = CurrentMetrics::end();
-
-        static const Metrics * getIORead()
-        {
-            static Metrics metrics{
-                .requests = ProfileEvents::SchedulerIOReadRequests,
-                .cost = ProfileEvents::SchedulerIOReadBytes,
-                .wait_microseconds = ProfileEvents::SchedulerIOReadWaitMicroseconds,
-                .scheduled_count = CurrentMetrics::SchedulerIOReadScheduled
-            };
-            return &metrics;
-        }
-
-        static const Metrics * getIOWrite()
-        {
-            static Metrics metrics{
-                .requests = ProfileEvents::SchedulerIOWriteRequests,
-                .cost = ProfileEvents::SchedulerIOWriteBytes,
-                .wait_microseconds = ProfileEvents::SchedulerIOWriteWaitMicroseconds,
-                .scheduled_count = CurrentMetrics::SchedulerIOWriteScheduled
-            };
-            return &metrics;
-        }
+        PostponeLocking /// Don't lock in constructor, but send request
     };
 
     enum RequestState
@@ -96,74 +46,60 @@ public:
             chassert(state == Finished);
             state = Enqueued;
             ResourceRequest::reset(cost_);
-            estimated_cost = link_.queue->enqueueRequestUsingBudget(this); // NOTE: it modifies `cost` and enqueues request
+            link_.queue->enqueueRequestUsingBudget(this);
         }
 
         // This function is executed inside scheduler thread and wakes thread issued this `request`.
         // That thread will continue execution and do real consumption of requested resource synchronously.
         void execute() override
         {
-            std::unique_lock lock(mutex);
-            chassert(state == Enqueued);
-            state = Dequeued;
+            {
+                std::unique_lock lock(mutex);
+                chassert(state == Enqueued);
+                state = Dequeued;
+            }
             dequeued_cv.notify_one();
         }
 
         void wait()
         {
-            CurrentMetrics::Increment scheduled(metrics->scheduled_count);
-            auto timer = CurrentThread::getProfileEvents().timer(metrics->wait_microseconds);
             std::unique_lock lock(mutex);
             dequeued_cv.wait(lock, [this] { return state == Dequeued; });
         }
 
-        void finish(ResourceCost real_cost_, ResourceLink link_)
+        void finish()
         {
             // lock(mutex) is not required because `Dequeued` request cannot be used by the scheduler thread
             chassert(state == Dequeued);
             state = Finished;
-            if (estimated_cost != real_cost_)
-                link_.queue->adjustBudget(estimated_cost, real_cost_);
             ResourceRequest::finish();
-            ProfileEvents::increment(metrics->requests);
-            ProfileEvents::increment(metrics->cost, real_cost_);
         }
 
-        void assertFinished()
-        {
-            // lock(mutex) is not required because `Finished` request cannot be used by the scheduler thread
-            chassert(state == Finished);
-        }
-
-        static Request & local(const Metrics * metrics)
+        static Request & local()
         {
             // Since single thread cannot use more than one resource request simultaneously,
             // we can reuse thread-local request to avoid allocations
             static thread_local Request instance;
-            instance.metrics = metrics;
             return instance;
         }
 
-        const Metrics * metrics = nullptr; // Must be initialized before use
-
     private:
-        ResourceCost estimated_cost = 0; // Stores initial `cost` value in case budget was used to modify it
         std::mutex mutex;
         std::condition_variable dequeued_cv;
         RequestState state = Finished;
     };
 
-    /// Creates pending request for resource; blocks while resource is not available (unless `Lock::Defer`)
-    explicit ResourceGuard(const Metrics * metrics, ResourceLink link_, ResourceCost cost = 1, ResourceGuard::Lock type = ResourceGuard::Lock::Default)
+    /// Creates pending request for resource; blocks while resource is not available (unless `PostponeLocking`)
+    explicit ResourceGuard(ResourceLink link_, ResourceCost cost = 1, ResourceGuardCtor ctor = LockStraightAway)
         : link(link_)
-        , request(Request::local(metrics))
+        , request(Request::local())
     {
         if (cost == 0)
-            link.reset(); // Ignore zero-cost requests
-        else if (link)
+            link.queue = nullptr; // Ignore zero-cost requests
+        else if (link.queue)
         {
             request.enqueue(cost, link);
-            if (type == Lock::Default)
+            if (ctor == LockStraightAway)
                 request.wait();
         }
     }
@@ -176,29 +112,22 @@ public:
     /// Blocks until resource is available
     void lock()
     {
-        if (link)
+        if (link.queue)
             request.wait();
     }
 
-    void consume(ResourceCost cost)
-    {
-        real_cost += cost;
-    }
-
     /// Report resource consumption has finished
-    void unlock(ResourceCost consumed = 0)
+    void unlock()
     {
-        consume(consumed);
-        if (link)
+        if (link.queue)
         {
-            request.finish(real_cost, link);
-            link.reset();
+            request.finish();
+            link.queue = nullptr;
         }
     }
 
     ResourceLink link;
     Request & request;
-    ResourceCost real_cost = 0;
 };
 
 }
diff --git a/src/Common/Scheduler/ResourceLink.h b/src/Common/Scheduler/ResourceLink.h
index a4e2adbd963..450d9bc1efa 100644
--- a/src/Common/Scheduler/ResourceLink.h
+++ b/src/Common/Scheduler/ResourceLink.h
@@ -13,28 +13,13 @@ using ResourceCost = Int64;
 struct ResourceLink
 {
     ISchedulerQueue * queue = nullptr;
-
     bool operator==(const ResourceLink &) const = default;
-    explicit operator bool() const { return queue != nullptr; }
 
-    void reset()
-    {
-        queue = nullptr;
-    }
-};
+    void adjust(ResourceCost estimated_cost, ResourceCost real_cost) const;
 
-/*
- * Everything required for IO scheduling.
- * Note that raw pointer are stored inside, so make sure that `ClassifierPtr` that produced
- * resource links will outlive them. Usually classifier is stored in query `Context`.
- */
-struct IOSchedulingSettings
-{
-    ResourceLink read_resource_link;
-    ResourceLink write_resource_link;
+    void consumed(ResourceCost cost) const;
 
-    bool operator==(const IOSchedulingSettings &) const = default;
-    explicit operator bool() const { return read_resource_link && write_resource_link; }
+    void accumulate(ResourceCost cost) const;
 };
 
 }
diff --git a/src/Common/Scheduler/ResourceRequest.h b/src/Common/Scheduler/ResourceRequest.h
index 7b6a5af0fe6..d64f624cec5 100644
--- a/src/Common/Scheduler/ResourceRequest.h
+++ b/src/Common/Scheduler/ResourceRequest.h
@@ -45,7 +45,7 @@ constexpr ResourceCost ResourceCostMax = std::numeric_limits<int>::max();
 class ResourceRequest : public boost::intrusive::list_base_hook<>
 {
 public:
-    /// Cost of request execution; should be filled before request enqueueing and remain constant until `finish()`.
+    /// Cost of request execution; should be filled before request enqueueing.
     /// NOTE: If cost is not known in advance, ResourceBudget should be used (note that every ISchedulerQueue has it)
     ResourceCost cost;
 
diff --git a/src/Common/Scheduler/SchedulerRoot.h b/src/Common/Scheduler/SchedulerRoot.h
index 5307aadc3cc..7af42fdbbea 100644
--- a/src/Common/Scheduler/SchedulerRoot.h
+++ b/src/Common/Scheduler/SchedulerRoot.h
@@ -162,7 +162,8 @@ public:
             if (request == nullptr) // Possible in case of request cancel, just retry
                 continue;
 
-            incrementDequeued(request->cost);
+            dequeued_requests++;
+            dequeued_cost += request->cost;
             return {request, current != nullptr};
         }
     }
diff --git a/src/Common/SharedMutex.cpp b/src/Common/SharedMutex.cpp
index 2d63f8542b0..1df09ca998a 100644
--- a/src/Common/SharedMutex.cpp
+++ b/src/Common/SharedMutex.cpp
@@ -1,5 +1,4 @@
 #include <Common/SharedMutex.h>
-#include <base/getThreadId.h>
 
 #ifdef OS_LINUX /// Because of futex
 
@@ -13,7 +12,6 @@ namespace DB
 SharedMutex::SharedMutex()
     : state(0)
     , waiters(0)
-    , writer_thread_id(0)
 {}
 
 void SharedMutex::lock()
@@ -31,10 +29,6 @@ void SharedMutex::lock()
             break;
     }
 
-    /// The first step of acquiring the exclusive ownership is finished.
-    /// Now we just wait until all readers release the shared ownership.
-    writer_thread_id.store(getThreadId());
-
     value |= writers;
     while (value & readers)
         futexWaitLowerFetch(state, value);
@@ -43,15 +37,11 @@ void SharedMutex::lock()
 bool SharedMutex::try_lock()
 {
     UInt64 value = 0;
-    bool success = state.compare_exchange_strong(value, writers);
-    if (success)
-        writer_thread_id.store(getThreadId());
-    return success;
+    return state.compare_exchange_strong(value, writers);
 }
 
 void SharedMutex::unlock()
 {
-    writer_thread_id.store(0);
     state.store(0);
     if (waiters)
         futexWakeUpperAll(state);
diff --git a/src/Common/SharedMutex.h b/src/Common/SharedMutex.h
index d2947645eca..9215ff62af3 100644
--- a/src/Common/SharedMutex.h
+++ b/src/Common/SharedMutex.h
@@ -19,8 +19,6 @@ public:
     ~SharedMutex() = default;
     SharedMutex(const SharedMutex &) = delete;
     SharedMutex & operator=(const SharedMutex &) = delete;
-    SharedMutex(SharedMutex &&) = delete;
-    SharedMutex & operator=(SharedMutex &&) = delete;
 
     // Exclusive ownership
     void lock() TSA_ACQUIRE();
@@ -38,8 +36,6 @@ private:
 
     alignas(64) std::atomic<UInt64> state;
     std::atomic<UInt32> waiters;
-    /// Is set while the lock is held (or is in the process of being acquired) in exclusive mode only to facilitate debugging
-    std::atomic<UInt64> writer_thread_id;
 };
 
 }
diff --git a/src/Common/ShellCommand.cpp b/src/Common/ShellCommand.cpp
index 0d41669816c..98a21b43d76 100644
--- a/src/Common/ShellCommand.cpp
+++ b/src/Common/ShellCommand.cpp
@@ -237,14 +237,7 @@ std::unique_ptr<ShellCommand> ShellCommand::executeImpl(
         res->write_fds.emplace(fd, fds.fds_rw[1]);
     }
 
-    LOG_TRACE(
-        getLogger(),
-        "Started shell command '{}' with pid {} and file descriptors: out {}, err {}",
-        filename,
-        pid,
-        res->out.getFD(),
-        res->err.getFD());
-
+    LOG_TRACE(getLogger(), "Started shell command '{}' with pid {}", filename, pid);
     return res;
 }
 
diff --git a/src/Common/SignalHandlers.cpp b/src/Common/SignalHandlers.cpp
index 554a56f22e8..a4b7784df5c 100644
--- a/src/Common/SignalHandlers.cpp
+++ b/src/Common/SignalHandlers.cpp
@@ -13,23 +13,18 @@
 #include <IO/ReadHelpers.h>
 #include <Interpreters/Context.h>
 #include <Core/Settings.h>
-#include <Poco/Environment.h>
 
 #pragma clang diagnostic ignored "-Wreserved-identifier"
 
 namespace DB
 {
-
 namespace ErrorCodes
 {
 extern const int CANNOT_SET_SIGNAL_HANDLER;
 extern const int CANNOT_SEND_SIGNAL;
 }
-
 }
 
-extern const char * GIT_HASH;
-
 using namespace DB;
 
 
@@ -94,7 +89,7 @@ void signalHandler(int sig, siginfo_t * info, void * context)
     writePODBinary(*info, out);
     writePODBinary(signal_context, out);
     writePODBinary(stack_trace, out);
-    writeVectorBinary(Exception::enable_job_stack_trace ? Exception::getThreadFramePointers() : std::vector<StackTrace::FramePointers>{}, out);
+    writeVectorBinary(Exception::enable_job_stack_trace ? Exception::thread_frame_pointers : std::vector<StackTrace::FramePointers>{}, out);
     writeBinary(static_cast<UInt32>(getThreadId()), out);
     writePODBinary(current_thread, out);
 
@@ -339,7 +334,7 @@ void SignalListener::onTerminate(std::string_view message, UInt32 thread_num) co
     size_t pos = message.find('\n');
 
     LOG_FATAL(log, "(version {}{}, build id: {}, git hash: {}) (from thread {}) {}",
-              VERSION_STRING, VERSION_OFFICIAL, daemon ? daemon->build_id : "", GIT_HASH, thread_num, message.substr(0, pos));
+              VERSION_STRING, VERSION_OFFICIAL, daemon ? daemon->build_id : "", daemon ? daemon->git_hash : "", thread_num, message.substr(0, pos));
 
     /// Print trace from std::terminate exception line-by-line to make it easy for grep.
     while (pos != std::string_view::npos)
@@ -372,8 +367,8 @@ try
     /// in case of double fault.
 
     LOG_FATAL(log, "########## Short fault info ############");
-    LOG_FATAL(log, "(version {}{}, build id: {}, git hash: {}, architecture: {}) (from thread {}) Received signal {}",
-              VERSION_STRING, VERSION_OFFICIAL, daemon ? daemon->build_id : "", GIT_HASH, Poco::Environment::osArchitecture(),
+    LOG_FATAL(log, "(version {}{}, build id: {}, git hash: {}) (from thread {}) Received signal {}",
+              VERSION_STRING, VERSION_OFFICIAL, daemon ? daemon->build_id : "", daemon ? daemon->git_hash : "",
               thread_num, sig);
 
     std::string signal_description = "Unknown signal";
@@ -439,13 +434,13 @@ try
     if (query_id.empty())
     {
         LOG_FATAL(log, "(version {}{}, build id: {}, git hash: {}) (from thread {}) (no query) Received signal {} ({})",
-                  VERSION_STRING, VERSION_OFFICIAL, daemon ? daemon->build_id : "", GIT_HASH,
+                  VERSION_STRING, VERSION_OFFICIAL, daemon ? daemon->build_id : "", daemon ? daemon->git_hash : "",
                   thread_num, signal_description, sig);
     }
     else
     {
         LOG_FATAL(log, "(version {}{}, build id: {}, git hash: {}) (from thread {}) (query_id: {}) (query: {}) Received signal {} ({})",
-                  VERSION_STRING, VERSION_OFFICIAL, daemon ? daemon->build_id : "", GIT_HASH,
+                  VERSION_STRING, VERSION_OFFICIAL, daemon ? daemon->build_id : "", daemon ? daemon->git_hash : "",
                   thread_num, query_id, query, signal_description, sig);
     }
 
@@ -610,14 +605,7 @@ void HandledSignals::reset()
 
 HandledSignals::~HandledSignals()
 {
-    try
-    {
-        reset();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-    }
+    reset();
 };
 
 HandledSignals & HandledSignals::instance()
@@ -634,7 +622,6 @@ void HandledSignals::setupTerminateHandler()
 void HandledSignals::setupCommonDeadlySignalHandlers()
 {
     /// SIGTSTP is added for debugging purposes. To output a stack trace of any running thread at anytime.
-    /// NOTE: that it is also used by clickhouse-test wrapper
     addSignalHandler({SIGABRT, SIGSEGV, SIGILL, SIGBUS, SIGSYS, SIGFPE, SIGPIPE, SIGTSTP, SIGTRAP}, signalHandler, true);
 
 #if defined(SANITIZER)
diff --git a/src/Common/StackTrace.cpp b/src/Common/StackTrace.cpp
index 3dce34803b2..34f6f0b7535 100644
--- a/src/Common/StackTrace.cpp
+++ b/src/Common/StackTrace.cpp
@@ -67,18 +67,10 @@ std::string SigsegvErrorString(const siginfo_t & info, [[maybe_unused]] const uc
         = info.si_addr == nullptr ? "NULL pointer"s : (shouldShowAddress(info.si_addr) ? fmt::format("{}", info.si_addr) : ""s);
 
     const std::string_view access =
-#if defined(__arm__)
-        "<not available on ARM>";
-#elif defined(__powerpc__)
-        "<not available on PowerPC>";
-#elif defined(OS_DARWIN)
-        "<not available on Darwin>";
-#elif defined(OS_FREEBSD)
-        "<not available on FreeBSD>";
-#elif !defined(__x86_64__)
-        "<not available>";
-#else
+#if defined(__x86_64__) && !defined(OS_FREEBSD) && !defined(OS_DARWIN) && !defined(__arm__) && !defined(__powerpc__)
         (context.uc_mcontext.gregs[REG_ERR] & 0x02) ? "write" : "read";
+#else
+        "";
 #endif
 
     std::string_view message;
@@ -256,31 +248,8 @@ void StackTrace::forEachFrame(
                 auto dwarf_it = dwarfs.try_emplace(object->name, object->elf).first;
 
                 DB::Dwarf::LocationInfo location;
-                uintptr_t adjusted_addr = uintptr_t(current_frame.physical_addr);
-                if (i > 0)
-                {
-                    /// For non-innermost stack frames, the address points to the *next* instruction
-                    /// after the `call` instruction. But we want the line number and inline function
-                    /// information for the `call` instruction. So subtract 1 from the address.
-                    /// Caveats:
-                    ///  * The `call` instruction can be longer than 1 byte, so addr-1 is in the middle
-                    ///    of the instruction. That's ok for debug info lookup: address ranges in debug
-                    ///    info cover the whole instruction.
-                    ///  * If the stack trace unwound out of a signal handler, the stack frame just
-                    ///    outside the signal didn't do a function call. It was interrupted by signal.
-                    ///    There's no `call` instruction, and decrementing the address is incorrect.
-                    ///    We may get incorrect line number and inlined functions in this case.
-                    ///    Unfortunate.
-                    ///    Note that libunwind, when producing this stack trace, knows whether this
-                    ///    frame is interrupted by signal or not. We could propagate this information
-                    ///    from libunwind to here and avoid subtracting 1 in this case, but currently
-                    ///    we don't do this.
-                    ///    But we don't do the decrement for findSymbol below (because `call` is
-                    ///    ~never the last instruction of a function), so the function name should be
-                    ///    correct for both pre-signal frames and regular frames.
-                    adjusted_addr -= 1;
-                }
-                if (dwarf_it->second.findAddress(adjusted_addr, location, mode, inline_frames))
+                if (dwarf_it->second.findAddress(
+                        uintptr_t(current_frame.physical_addr), location, mode, inline_frames))
                 {
                     current_frame.file = location.file.toString();
                     current_frame.line = location.line;
@@ -520,25 +489,13 @@ struct CacheEntry
 
 using CacheEntryPtr = std::shared_ptr<CacheEntry>;
 
-static constinit bool can_use_cache = false;
+using StackTraceCache = std::map<StackTraceTriple, CacheEntryPtr, std::less<>>;
 
-using StackTraceCacheBase = std::map<StackTraceTriple, CacheEntryPtr, std::less<>>;
-
-struct StackTraceCache : public StackTraceCacheBase
+static StackTraceCache & cacheInstance()
 {
-    StackTraceCache()
-        : StackTraceCacheBase()
-    {
-        can_use_cache = true;
-    }
-
-    ~StackTraceCache()
-    {
-        can_use_cache = false;
-    }
-};
-
-static StackTraceCache cache;
+    static StackTraceCache cache;
+    return cache;
+}
 
 static DB::SharedMutex stacktrace_cache_mutex;
 
@@ -546,16 +503,10 @@ String toStringCached(const StackTrace::FramePointers & pointers, size_t offset,
 {
     const StackTraceRefTriple key{pointers, offset, size};
 
-    if (!can_use_cache)
-    {
-        DB::WriteBufferFromOwnString out;
-        toStringEveryLineImpl(false, key, [&](std::string_view str) { out << str << '\n'; });
-        return out.str();
-    }
-
     /// Calculation of stack trace text is extremely slow.
     /// We use cache because otherwise the server could be overloaded by trash queries.
     /// Note that this cache can grow unconditionally, but practically it should be small.
+    StackTraceCache & cache = cacheInstance();
     CacheEntryPtr cache_entry;
 
     // Optimistic try for cache hit to avoid any contention whatsoever, should be the main hot code route
@@ -607,7 +558,7 @@ std::string StackTrace::toString(void * const * frame_pointers_raw, size_t offse
 void StackTrace::dropCache()
 {
     std::lock_guard lock{stacktrace_cache_mutex};
-    cache.clear();
+    cacheInstance().clear();
 }
 
 
diff --git a/src/Common/StatusFile.cpp b/src/Common/StatusFile.cpp
index 0bbb7ff411d..80464f38082 100644
--- a/src/Common/StatusFile.cpp
+++ b/src/Common/StatusFile.cpp
@@ -51,7 +51,7 @@ StatusFile::StatusFile(std::string path_, FillFunction fill_)
         std::string contents;
         {
             ReadBufferFromFile in(path, 1024);
-            LimitReadBuffer limit_in(in, 1024, /* throw_exception */ false, /* exact_limit */ {});
+            LimitReadBuffer limit_in(in, 1024, /* trow_exception */ false, /* exact_limit */ {});
             readStringUntilEOF(contents, limit_in);
         }
 
diff --git a/src/Common/StringHashForHeterogeneousLookup.h b/src/Common/StringHashForHeterogeneousLookup.h
deleted file mode 100644
index 56d8ccf0009..00000000000
--- a/src/Common/StringHashForHeterogeneousLookup.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-#include <base/StringRef.h>
-
-namespace DB
-{
-
-/// See https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0919r3.html
-struct StringHashForHeterogeneousLookup
-{
-    using hash_type = std::hash<std::string_view>;
-    using transparent_key_equal = std::equal_to<>;
-    using is_transparent = void; // required to make find() work with different type than key_type
-
-    auto operator()(const std::string_view view) const
-    {
-        return hash_type()(view);
-    }
-
-    auto operator()(const std::string & str) const
-    {
-        return hash_type()(str);
-    }
-
-    auto operator()(const char * data) const
-    {
-        return hash_type()(data);
-    }
-};
-
-}
diff --git a/src/Common/SystemLogBase.cpp b/src/Common/SystemLogBase.cpp
index 45f4eb1c5a6..a9307c3be99 100644
--- a/src/Common/SystemLogBase.cpp
+++ b/src/Common/SystemLogBase.cpp
@@ -27,14 +27,12 @@
 #include <Common/logger_useful.h>
 #include <base/scope_guard.h>
 
-
 namespace DB
 {
 
 namespace ErrorCodes
 {
     extern const int TIMEOUT_EXCEEDED;
-    extern const int ABORTED;
 }
 
 ISystemLog::~ISystemLog() = default;
@@ -67,7 +65,7 @@ void SystemLogQueue<LogElement>::push(LogElement&& element)
     /// Memory can be allocated while resizing on queue.push_back.
     /// The size of allocation can be in order of a few megabytes.
     /// But this should not be accounted for query memory usage.
-    /// Otherwise the tests like 01017_uniqCombined_memory_usage.sql will be flaky.
+    /// Otherwise the tests like 01017_uniqCombined_memory_usage.sql will be flacky.
     MemoryTrackerBlockerInThread temporarily_disable_memory_tracker;
 
     /// Should not log messages under mutex.
@@ -88,18 +86,32 @@ void SystemLogQueue<LogElement>::push(LogElement&& element)
             // by one, under exclusive lock, so we will see each message count.
             // It is enough to only wake the flushing thread once, after the message
             // count increases past half available size.
+            const uint64_t queue_end = queue_front_index + queue.size();
+            requested_flush_up_to = std::max(requested_flush_up_to, queue_end);
 
-            const auto last_log_index = queue_front_index + queue.size();
-            notifyFlushUnlocked(last_log_index, /* should_prepare_tables_anyway */ false);
+            flush_event.notify_all();
         }
 
         if (queue.size() >= settings.max_size_rows)
         {
-            chassert(queue.size() == settings.max_size_rows);
-
             // Ignore all further entries until the queue is flushed.
-            // To the next batch we add a log message about how much we have lost
-            ++ignored_logs;
+            // Log a message about that. Don't spam it -- this might be especially
+            // problematic in case of trace log. Remember what the front index of the
+            // queue was when we last logged the message. If it changed, it means the
+            // queue was flushed, and we can log again.
+            if (queue_front_index != logged_queue_full_at_index)
+            {
+                logged_queue_full_at_index = queue_front_index;
+
+                // TextLog sets its logger level to 0, so this log is a noop and
+                // there is no recursive logging.
+                lock.unlock();
+                LOG_ERROR(log, "Queue is full for system log '{}' at {}. max_size_rows {}",
+                          demangle(typeid(*this).name()),
+                          queue_front_index,
+                          settings.max_size_rows);
+            }
+
             return;
         }
 
@@ -115,50 +127,20 @@ template <typename LogElement>
 void SystemLogQueue<LogElement>::handleCrash()
 {
     if (settings.notify_flush_on_crash)
-    {
-        notifyFlush(getLastLogIndex(), /* should_prepare_tables_anyway */ true);
-    }
+        notifyFlush(/* force */ true);
 }
 
 template <typename LogElement>
-void SystemLogQueue<LogElement>::notifyFlushUnlocked(Index expected_flushed_index, bool should_prepare_tables_anyway)
+void SystemLogQueue<LogElement>::waitFlush(uint64_t expected_flushed_up_to)
 {
-    if (should_prepare_tables_anyway)
-        requested_prepare_tables = std::max(requested_prepare_tables, expected_flushed_index);
-
-    requested_flush_index = std::max(requested_flush_index, expected_flushed_index);
-
-    flush_event.notify_all();
-}
-
-template <typename LogElement>
-void SystemLogQueue<LogElement>::notifyFlush(SystemLogQueue<LogElement>::Index expected_flushed_index, bool should_prepare_tables_anyway)
-{
-    std::lock_guard lock(mutex);
-    notifyFlushUnlocked(expected_flushed_index, should_prepare_tables_anyway);
-}
-
-template <typename LogElement>
-void SystemLogQueue<LogElement>::waitFlush(SystemLogQueue<LogElement>::Index expected_flushed_index, bool should_prepare_tables_anyway)
-{
-    LOG_DEBUG(log, "Requested flush up to offset {}", expected_flushed_index);
-
     // Use an arbitrary timeout to avoid endless waiting. 60s proved to be
     // too fast for our parallel functional tests, probably because they
     // heavily load the disk.
     const int timeout_seconds = 180;
-
     std::unique_lock lock(mutex);
-
-    // there is no obligation to call notifyFlush before waitFlush, than we have to be sure that flush_event has been triggered before we wait the result
-    notifyFlushUnlocked(expected_flushed_index, should_prepare_tables_anyway);
-
-    auto result = confirm_event.wait_for(lock, std::chrono::seconds(timeout_seconds), [&]
+    bool result = flush_event.wait_for(lock, std::chrono::seconds(timeout_seconds), [&]
     {
-        if (should_prepare_tables_anyway)
-            return (flushed_index >= expected_flushed_index && prepared_tables >= requested_prepare_tables) || is_shutdown;
-        else
-            return (flushed_index >= expected_flushed_index) || is_shutdown;
+        return flushed_up_to >= expected_flushed_up_to && !is_force_prepare_tables;
     });
 
     if (!result)
@@ -166,63 +148,67 @@ void SystemLogQueue<LogElement>::waitFlush(SystemLogQueue<LogElement>::Index exp
         throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "Timeout exceeded ({} s) while flushing system log '{}'.",
             toString(timeout_seconds), demangle(typeid(*this).name()));
     }
-
-    if (is_shutdown)
-    {
-        throw Exception(ErrorCodes::ABORTED, "Shutdown has been called while flushing system log '{}'. Aborting.",
-            demangle(typeid(*this).name()));
-    }
 }
 
 template <typename LogElement>
-SystemLogQueue<LogElement>::Index SystemLogQueue<LogElement>::getLastLogIndex()
+uint64_t SystemLogQueue<LogElement>::notifyFlush(bool should_prepare_tables_anyway)
 {
-    std::lock_guard lock(mutex);
-    return queue_front_index + queue.size();
-}
-
-template <typename LogElement>
-void SystemLogQueue<LogElement>::confirm(SystemLogQueue<LogElement>::Index last_flashed_index)
-{
-    std::lock_guard lock(mutex);
-    prepared_tables = std::max(prepared_tables, last_flashed_index);
-    flushed_index = std::max(flushed_index, last_flashed_index);
-    confirm_event.notify_all();
-}
-
-template <typename LogElement>
-typename SystemLogQueue<LogElement>::PopResult SystemLogQueue<LogElement>::pop()
-{
-    PopResult result;
-    size_t prev_ignored_logs = 0;
+    uint64_t this_thread_requested_offset;
 
     {
-        std::unique_lock lock(mutex);
-
-        flush_event.wait_for(lock, std::chrono::milliseconds(settings.flush_interval_milliseconds), [&] ()
-        {
-            return requested_flush_index > flushed_index || requested_prepare_tables > prepared_tables || is_shutdown;
-        });
-
+        std::lock_guard lock(mutex);
         if (is_shutdown)
-            return PopResult{.is_shutdown = true};
+            return uint64_t(-1);
 
-        queue_front_index += queue.size();
-        prev_ignored_logs = ignored_logs;
-        ignored_logs = 0;
+        this_thread_requested_offset = queue_front_index + queue.size();
 
-        result.last_log_index = queue_front_index;
-        result.logs.swap(queue);
-        result.create_table_force = requested_prepare_tables > prepared_tables;
+        // Publish our flush request, taking care not to overwrite the requests
+        // made by other threads.
+        is_force_prepare_tables |= should_prepare_tables_anyway;
+        requested_flush_up_to = std::max(requested_flush_up_to, this_thread_requested_offset);
+
+        flush_event.notify_all();
     }
 
-    if (prev_ignored_logs)
-        LOG_ERROR(log, "Queue had been full at {}, accepted {} logs, ignored {} logs.",
-                    result.last_log_index - result.logs.size(),
-                    result.logs.size(),
-                    prev_ignored_logs);
+    LOG_DEBUG(log, "Requested flush up to offset {}", this_thread_requested_offset);
+    return this_thread_requested_offset;
+}
 
-    return result;
+template <typename LogElement>
+void SystemLogQueue<LogElement>::confirm(uint64_t to_flush_end)
+{
+    std::lock_guard lock(mutex);
+    flushed_up_to = to_flush_end;
+    is_force_prepare_tables = false;
+    flush_event.notify_all();
+}
+
+template <typename LogElement>
+typename SystemLogQueue<LogElement>::Index SystemLogQueue<LogElement>::pop(std::vector<LogElement> & output,
+                                                                           bool & should_prepare_tables_anyway,
+                                                                           bool & exit_this_thread)
+{
+    /// Call dtors and deallocate strings without holding the global lock
+    output.resize(0);
+
+    std::unique_lock lock(mutex);
+    flush_event.wait_for(lock,
+        std::chrono::milliseconds(settings.flush_interval_milliseconds),
+        [&] ()
+        {
+            return requested_flush_up_to > flushed_up_to || is_shutdown || is_force_prepare_tables;
+        }
+    );
+
+    queue_front_index += queue.size();
+    // Swap with existing array from previous flush, to save memory
+    // allocations.
+    queue.swap(output);
+
+    should_prepare_tables_anyway = is_force_prepare_tables;
+
+    exit_this_thread = is_shutdown;
+    return queue_front_index;
 }
 
 template <typename LogElement>
@@ -243,21 +229,13 @@ SystemLogBase<LogElement>::SystemLogBase(
 }
 
 template <typename LogElement>
-SystemLogBase<LogElement>::Index SystemLogBase<LogElement>::getLastLogIndex()
+void SystemLogBase<LogElement>::flush(bool force)
 {
-    return queue->getLastLogIndex();
-}
+    uint64_t this_thread_requested_offset = queue->notifyFlush(force);
+    if (this_thread_requested_offset == uint64_t(-1))
+        return;
 
-template <typename LogElement>
-void SystemLogBase<LogElement>::notifyFlush(Index expected_flushed_index, bool should_prepare_tables_anyway)
-{
-    queue->notifyFlush(expected_flushed_index, should_prepare_tables_anyway);
-}
-
-template <typename LogElement>
-void SystemLogBase<LogElement>::flush(Index expected_flushed_index, bool should_prepare_tables_anyway)
-{
-    queue->waitFlush(expected_flushed_index, should_prepare_tables_anyway);
+    queue->waitFlush(this_thread_requested_offset);
 }
 
 template <typename LogElement>
@@ -273,31 +251,15 @@ void SystemLogBase<LogElement>::startup()
     saving_thread = std::make_unique<ThreadFromGlobalPool>([this] { savingThreadFunction(); });
 }
 
-template <typename LogElement>
-void SystemLogBase<LogElement>::stopFlushThread()
-{
-    {
-        std::lock_guard lock(thread_mutex);
-
-        if (!saving_thread || !saving_thread->joinable())
-            return;
-
-        if (is_shutdown)
-            return;
-
-        is_shutdown = true;
-        queue->shutdown();
-    }
-
-    saving_thread->join();
-}
-
 template <typename LogElement>
 void SystemLogBase<LogElement>::add(LogElement element)
 {
     queue->push(std::move(element));
 }
 
+template <typename LogElement>
+void SystemLogBase<LogElement>::notifyFlush(bool force) { queue->notifyFlush(force); }
+
 #define INSTANTIATE_SYSTEM_LOG_BASE(ELEMENT) template class SystemLogBase<ELEMENT>;
 SYSTEM_LOG_ELEMENTS(INSTANTIATE_SYSTEM_LOG_BASE)
 
diff --git a/src/Common/SystemLogBase.h b/src/Common/SystemLogBase.h
index 0942e920a42..b87fcf419d3 100644
--- a/src/Common/SystemLogBase.h
+++ b/src/Common/SystemLogBase.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <condition_variable>
-#include <limits>
 #include <memory>
 #include <vector>
 #include <base/types.h>
@@ -55,19 +54,10 @@ struct StorageID;
 class ISystemLog
 {
 public:
-    using Index = int64_t;
-
     virtual String getName() const = 0;
 
-    /// Return the index of the latest added log element. That index no less than the flashed index.
-    /// The flashed index is the index of the last log element which has been flushed successfully.
-    /// Thereby all the records whose index is less than the flashed index are flushed already.
-    virtual Index getLastLogIndex() = 0;
-    /// Call this method to wake up the flush thread and flush the data in the background. It is non blocking call
-    virtual void notifyFlush(Index expected_flushed_index, bool should_prepare_tables_anyway) = 0;
-    /// Call this method to wait intill the logs are flushed up to expected_flushed_index. It is blocking call.
-    virtual void flush(Index expected_flushed_index, bool should_prepare_tables_anyway) = 0;
-
+    //// force -- force table creation (used for SYSTEM FLUSH LOGS)
+    virtual void flush(bool force = false) = 0; /// NOLINT
     virtual void prepareTable() = 0;
 
     /// Start the background thread.
@@ -107,38 +97,26 @@ struct SystemLogQueueSettings
 template <typename LogElement>
 class SystemLogQueue
 {
-public:
-    using Index = ISystemLog::Index;
+    using Index = uint64_t;
 
+public:
     explicit SystemLogQueue(const SystemLogQueueSettings & settings_);
 
     void shutdown();
 
     // producer methods
     void push(LogElement && element);
-
-    Index getLastLogIndex();
-    void notifyFlush(Index expected_flushed_index, bool should_prepare_tables_anyway);
-    void waitFlush(Index expected_flushed_index, bool should_prepare_tables_anyway);
+    Index notifyFlush(bool should_prepare_tables_anyway);
+    void waitFlush(Index expected_flushed_up_to);
 
     /// Handles crash, flushes log without blocking if notify_flush_on_crash is set
     void handleCrash();
 
-    struct PopResult
-    {
-        Index last_log_index = 0;
-        std::vector<LogElement> logs = {};
-        bool create_table_force = false;
-        bool is_shutdown = false;
-    };
-
      // consumer methods
-    PopResult pop();
-    void confirm(Index last_flashed_index);
+    Index pop(std::vector<LogElement>& output, bool & should_prepare_tables_anyway, bool & exit_this_thread);
+    void confirm(Index to_flush_end);
 
 private:
-    void notifyFlushUnlocked(Index expected_flushed_index, bool should_prepare_tables_anyway);
-
     /// Data shared between callers of add()/flush()/shutdown(), and the saving thread
     std::mutex mutex;
 
@@ -146,32 +124,22 @@ private:
 
     // Queue is bounded. But its size is quite large to not block in all normal cases.
     std::vector<LogElement> queue;
-
     // An always-incrementing index of the first message currently in the queue.
     // We use it to give a global sequential index to every message, so that we
     // can wait until a particular message is flushed. This is used to implement
     // synchronous log flushing for SYSTEM FLUSH LOGS.
     Index queue_front_index = 0;
-
+    // A flag that says we must create the tables even if the queue is empty.
+    bool is_force_prepare_tables = false;
     // Requested to flush logs up to this index, exclusive
-    Index requested_flush_index = std::numeric_limits<Index>::min();
+    Index requested_flush_up_to = 0;
     // Flushed log up to this index, exclusive
-    Index flushed_index = 0;
-
-    // The same logic for the prepare tables: if requested_prepar_tables > prepared_tables we need to do prepare
-    // except that initial prepared_tables is -1
-    // it is due to the difference: when no logs have been written and we call flush logs
-    // it becomes in the state: requested_flush_index = 0 and flushed_index = 0 -- we do not want to do anything
-    // but if we need to prepare tables it becomes requested_prepare_tables = 0 and prepared_tables = -1
-    // we trigger background thread and do prepare
-    Index requested_prepare_tables = std::numeric_limits<Index>::min();
-    Index prepared_tables = -1;
-
-    size_t ignored_logs = 0;
+    Index flushed_up_to = 0;
+    // Logged overflow message at this queue front index
+    Index logged_queue_full_at_index = -1;
 
     bool is_shutdown = false;
 
-    std::condition_variable confirm_event;
     std::condition_variable flush_event;
 
     const SystemLogQueueSettings settings;
@@ -182,7 +150,6 @@ template <typename LogElement>
 class SystemLogBase : public ISystemLog
 {
 public:
-    using Index = ISystemLog::Index;
     using Self = SystemLogBase;
 
     explicit SystemLogBase(
@@ -196,16 +163,15 @@ public:
       */
     void add(LogElement element);
 
-    Index getLastLogIndex() override;
-
-    void notifyFlush(Index expected_flushed_index, bool should_prepare_tables_anyway) override;
-
     /// Flush data in the buffer to disk. Block the thread until the data is stored on disk.
-    void flush(Index expected_flushed_index, bool should_prepare_tables_anyway) override;
+    void flush(bool force) override;
 
     /// Handles crash, flushes log without blocking if notify_flush_on_crash is set
     void handleCrash() override;
 
+    /// Non-blocking flush data in the buffer to disk.
+    void notifyFlush(bool force);
+
     String getName() const override { return LogElement::name(); }
 
     static const char * getDefaultOrderBy() { return "event_date, event_time"; }
@@ -216,8 +182,6 @@ public:
     static consteval bool shouldTurnOffLogger() { return false; }
 
 protected:
-    void stopFlushThread() final;
-
     std::shared_ptr<SystemLogQueue<LogElement>> queue;
 };
 }
diff --git a/src/Common/TTLCachePolicy.h b/src/Common/TTLCachePolicy.h
index 6c548e5042b..6401835b0d7 100644
--- a/src/Common/TTLCachePolicy.h
+++ b/src/Common/TTLCachePolicy.h
@@ -145,23 +145,6 @@ public:
         size_in_bytes -= sz;
     }
 
-    void remove(std::function<bool(const Key &, const MappedPtr &)> predicate) override
-    {
-        for (auto it = cache.begin(); it != cache.end();)
-        {
-            if (predicate(it->first, it->second))
-            {
-                size_t sz = weight_function(*it->second);
-                if (it->first.user_id.has_value())
-                    Base::user_quotas->decreaseActual(*it->first.user_id, sz);
-                it = cache.erase(it);
-                size_in_bytes -= sz;
-            }
-            else
-                ++it;
-        }
-    }
-
     MappedPtr get(const Key & key) override
     {
         auto it = cache.find(key);
diff --git a/src/Common/ThreadPool.cpp b/src/Common/ThreadPool.cpp
index 8685533e2d1..01f561d573f 100644
--- a/src/Common/ThreadPool.cpp
+++ b/src/Common/ThreadPool.cpp
@@ -1,5 +1,4 @@
 #include <Common/ThreadPool.h>
-#include <Common/ProfileEvents.h>
 #include <Common/setThreadName.h>
 #include <Common/Exception.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
@@ -28,25 +27,6 @@ namespace CurrentMetrics
     extern const Metric GlobalThreadScheduled;
 }
 
-namespace ProfileEvents
-{
-    extern const Event GlobalThreadPoolExpansions;
-    extern const Event GlobalThreadPoolShrinks;
-    extern const Event GlobalThreadPoolThreadCreationMicroseconds;
-    extern const Event GlobalThreadPoolLockWaitMicroseconds;
-    extern const Event GlobalThreadPoolJobs;
-    extern const Event GlobalThreadPoolJobWaitTimeMicroseconds;
-
-    extern const Event LocalThreadPoolExpansions;
-    extern const Event LocalThreadPoolShrinks;
-    extern const Event LocalThreadPoolThreadCreationMicroseconds;
-    extern const Event LocalThreadPoolLockWaitMicroseconds;
-    extern const Event LocalThreadPoolJobs;
-    extern const Event LocalThreadPoolBusyMicroseconds;
-    extern const Event LocalThreadPoolJobWaitTimeMicroseconds;
-
-}
-
 class JobWithPriority
 {
 public:
@@ -60,7 +40,6 @@ public:
     /// Call stacks of all jobs' schedulings leading to this one
     std::vector<StackTrace::FramePointers> frame_pointers;
     bool enable_job_stack_trace = false;
-    Stopwatch job_create_time;
 
     JobWithPriority(
         Job job_, Priority priority_, CurrentMetrics::Metric metric,
@@ -72,7 +51,7 @@ public:
         if (!capture_frame_pointers)
             return;
         /// Save all previous jobs call stacks and append with current
-        frame_pointers = DB::Exception::getThreadFramePointers();
+        frame_pointers = DB::Exception::thread_frame_pointers;
         frame_pointers.push_back(StackTrace().getFramePointers());
     }
 
@@ -80,13 +59,6 @@ public:
     {
         return priority > rhs.priority; // Reversed for `priority_queue` max-heap to yield minimum value (i.e. highest priority) first
     }
-
-    UInt64 elapsedMicroseconds() const
-    {
-        return job_create_time.elapsedMicroseconds();
-    }
-
-
 };
 
 static constexpr auto DEFAULT_THREAD_NAME = "ThreadPool";
@@ -208,18 +180,14 @@ ReturnType ThreadPoolImpl<Thread>::scheduleImpl(Job job, Priority priority, std:
     };
 
     {
-        Stopwatch watch;
         std::unique_lock lock(mutex);
-        ProfileEvents::increment(
-            std::is_same_v<Thread, std::thread> ? ProfileEvents::GlobalThreadPoolLockWaitMicroseconds : ProfileEvents::LocalThreadPoolLockWaitMicroseconds,
-            watch.elapsedMicroseconds());
 
         if (CannotAllocateThreadFaultInjector::injectFault())
             return on_error("fault injected");
 
         auto pred = [this] { return !queue_size || scheduled_jobs < queue_size || shutdown; };
 
-        if (wait_microseconds)  /// Check for optional. Condition is true if the optional is set. Even if the value is zero.
+        if (wait_microseconds)  /// Check for optional. Condition is true if the optional is set and the value is zero.
         {
             if (!job_finished.wait_for(lock, std::chrono::microseconds(*wait_microseconds), pred))
                 return on_error(fmt::format("no free thread (timeout={})", *wait_microseconds));
@@ -248,13 +216,7 @@ ReturnType ThreadPoolImpl<Thread>::scheduleImpl(Job job, Priority priority, std:
 
             try
             {
-                Stopwatch watch2;
                 threads.front() = Thread([this, it = threads.begin()] { worker(it); });
-                ProfileEvents::increment(
-                    std::is_same_v<Thread, std::thread> ? ProfileEvents::GlobalThreadPoolThreadCreationMicroseconds : ProfileEvents::LocalThreadPoolThreadCreationMicroseconds,
-                    watch2.elapsedMicroseconds());
-                ProfileEvents::increment(
-                    std::is_same_v<Thread, std::thread> ? ProfileEvents::GlobalThreadPoolExpansions : ProfileEvents::LocalThreadPoolExpansions);
             }
             catch (...)
             {
@@ -277,8 +239,6 @@ ReturnType ThreadPoolImpl<Thread>::scheduleImpl(Job job, Priority priority, std:
     /// Wake up a free thread to run the new job.
     new_job_or_shutdown.notify_one();
 
-    ProfileEvents::increment(std::is_same_v<Thread, std::thread> ? ProfileEvents::GlobalThreadPoolJobs : ProfileEvents::LocalThreadPoolJobs);
-
     return static_cast<ReturnType>(true);
 }
 
@@ -302,14 +262,7 @@ void ThreadPoolImpl<Thread>::startNewThreadsNoLock()
 
         try
         {
-            Stopwatch watch;
             threads.front() = Thread([this, it = threads.begin()] { worker(it); });
-            ProfileEvents::increment(
-                std::is_same_v<Thread, std::thread> ? ProfileEvents::GlobalThreadPoolThreadCreationMicroseconds : ProfileEvents::LocalThreadPoolThreadCreationMicroseconds,
-                watch.elapsedMicroseconds());
-            ProfileEvents::increment(
-                std::is_same_v<Thread, std::thread> ? ProfileEvents::GlobalThreadPoolExpansions : ProfileEvents::LocalThreadPoolExpansions);
-
         }
         catch (...)
         {
@@ -340,11 +293,7 @@ void ThreadPoolImpl<Thread>::scheduleOrThrow(Job job, Priority priority, uint64_
 template <typename Thread>
 void ThreadPoolImpl<Thread>::wait()
 {
-    Stopwatch watch;
     std::unique_lock lock(mutex);
-    ProfileEvents::increment(
-        std::is_same_v<Thread, std::thread> ? ProfileEvents::GlobalThreadPoolLockWaitMicroseconds : ProfileEvents::LocalThreadPoolLockWaitMicroseconds,
-        watch.elapsedMicroseconds());
     /// Signal here just in case.
     /// If threads are waiting on condition variables, but there are some jobs in the queue
     /// then it will prevent us from deadlock.
@@ -385,11 +334,7 @@ void ThreadPoolImpl<Thread>::finalize()
 
     /// Wait for all currently running jobs to finish (we don't wait for all scheduled jobs here like the function wait() does).
     for (auto & thread : threads)
-    {
         thread.join();
-        ProfileEvents::increment(
-            std::is_same_v<Thread, std::thread> ? ProfileEvents::GlobalThreadPoolShrinks : ProfileEvents::LocalThreadPoolShrinks);
-    }
 
     threads.clear();
 }
@@ -446,11 +391,7 @@ void ThreadPoolImpl<Thread>::worker(typename std::list<Thread>::iterator thread_
         std::optional<JobWithPriority> job_data;
 
         {
-            Stopwatch watch;
             std::unique_lock lock(mutex);
-            ProfileEvents::increment(
-                std::is_same_v<Thread, std::thread> ? ProfileEvents::GlobalThreadPoolLockWaitMicroseconds : ProfileEvents::LocalThreadPoolLockWaitMicroseconds,
-                watch.elapsedMicroseconds());
 
             // Finish with previous job if any
             if (job_is_done)
@@ -483,8 +424,6 @@ void ThreadPoolImpl<Thread>::worker(typename std::list<Thread>::iterator thread_
                 {
                     thread_it->detach();
                     threads.erase(thread_it);
-                    ProfileEvents::increment(
-                        std::is_same_v<Thread, std::thread> ? ProfileEvents::GlobalThreadPoolShrinks : ProfileEvents::LocalThreadPoolShrinks);
                 }
                 return;
             }
@@ -494,10 +433,6 @@ void ThreadPoolImpl<Thread>::worker(typename std::list<Thread>::iterator thread_
             job_data = std::move(const_cast<JobWithPriority &>(jobs.top()));
             jobs.pop();
 
-            ProfileEvents::increment(
-                std::is_same_v<Thread, std::thread> ? ProfileEvents::GlobalThreadPoolJobWaitTimeMicroseconds : ProfileEvents::LocalThreadPoolJobWaitTimeMicroseconds,
-                job_data->elapsedMicroseconds());
-
             /// We don't run jobs after `shutdown` is set, but we have to properly dequeue all jobs and finish them.
             if (shutdown)
             {
@@ -520,26 +455,11 @@ void ThreadPoolImpl<Thread>::worker(typename std::list<Thread>::iterator thread_
         try
         {
             if (DB::Exception::enable_job_stack_trace)
-                DB::Exception::setThreadFramePointers(std::move(job_data->frame_pointers));
+                DB::Exception::thread_frame_pointers = std::move(job_data->frame_pointers);
 
             CurrentMetrics::Increment metric_active_pool_threads(metric_active_threads);
 
-            if constexpr (!std::is_same_v<Thread, std::thread>)
-            {
-                Stopwatch watch;
-                job_data->job();
-                // This metric is less relevant for the global thread pool, as it would show large values (time while
-                // a thread was used by local pools) and increment only when local pools are destroyed.
-                //
-                // In cases where global pool threads are used directly (without a local thread pool), distinguishing
-                // them is difficult.
-                ProfileEvents::increment(ProfileEvents::LocalThreadPoolBusyMicroseconds, watch.elapsedMicroseconds());
-            }
-            else
-            {
-                job_data->job();
-            }
-
+            job_data->job();
 
             if (thread_trace_context.root_span.isTraceEnabled())
             {
diff --git a/src/Common/ThreadPool.h b/src/Common/ThreadPool.h
index fd9149bda04..a31d793264e 100644
--- a/src/Common/ThreadPool.h
+++ b/src/Common/ThreadPool.h
@@ -131,7 +131,7 @@ private:
     bool threads_remove_themselves = true;
     const bool shutdown_on_exception = true;
 
-    boost::heap::priority_queue<JobWithPriority,boost::heap::stable<true>> jobs;
+    boost::heap::priority_queue<JobWithPriority> jobs;
     std::list<Thread> threads;
     std::exception_ptr first_exception;
     std::stack<OnDestroyCallback> on_destroy_callbacks;
diff --git a/src/Common/ThreadPoolTaskTracker.cpp b/src/Common/ThreadPoolTaskTracker.cpp
index 1697a13f780..61d34801f7a 100644
--- a/src/Common/ThreadPoolTaskTracker.cpp
+++ b/src/Common/ThreadPoolTaskTracker.cpp
@@ -19,10 +19,6 @@ TaskTracker::TaskTracker(ThreadPoolCallbackRunnerUnsafe<void> scheduler_, size_t
 
 TaskTracker::~TaskTracker()
 {
-    /// Tasks should be waited outside of dtor.
-    /// Important for WriteBufferFromS3/AzureBlobStorage, where TaskTracker is currently used.
-    chassert(finished_futures.empty() && futures.empty());
-
     safeWaitAll();
 }
 
@@ -174,3 +170,4 @@ bool TaskTracker::isAsync() const
 }
 
 }
+
diff --git a/src/Common/ThreadStatus.h b/src/Common/ThreadStatus.h
index 6ea0a9a848c..0c02ab8fdb0 100644
--- a/src/Common/ThreadStatus.h
+++ b/src/Common/ThreadStatus.h
@@ -7,11 +7,11 @@
 #include <Common/MemoryTracker.h>
 #include <Common/ProfileEvents.h>
 #include <Common/Stopwatch.h>
-#include <Common/Scheduler/ResourceLink.h>
 
 #include <boost/noncopyable.hpp>
 
 #include <functional>
+#include <map>
 #include <memory>
 #include <mutex>
 #include <unordered_set>
@@ -188,10 +188,6 @@ public:
     Progress progress_in;
     Progress progress_out;
 
-    /// IO scheduling
-    ResourceLink read_resource_link;
-    ResourceLink write_resource_link;
-
 private:
     /// Group of threads, to which this thread attached
     ThreadGroupPtr thread_group;
diff --git a/src/Common/TimerDescriptor.cpp b/src/Common/TimerDescriptor.cpp
index 1622642c507..248febe226e 100644
--- a/src/Common/TimerDescriptor.cpp
+++ b/src/Common/TimerDescriptor.cpp
@@ -1,14 +1,10 @@
 #if defined(OS_LINUX)
-
 #include <Common/TimerDescriptor.h>
 #include <Common/Exception.h>
-#include <Common/Epoll.h>
-#include <Common/logger_useful.h>
 
 #include <sys/timerfd.h>
+#include <fcntl.h>
 #include <unistd.h>
-#include <fmt/format.h>
-
 
 namespace DB
 {
@@ -17,18 +13,21 @@ namespace ErrorCodes
 {
     extern const int CANNOT_CREATE_TIMER;
     extern const int CANNOT_SET_TIMER_PERIOD;
+    extern const int CANNOT_FCNTL;
     extern const int CANNOT_READ_FROM_SOCKET;
 }
 
-TimerDescriptor::TimerDescriptor()
+TimerDescriptor::TimerDescriptor(int clockid, int flags)
 {
-    timer_fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK | TFD_CLOEXEC);
+    timer_fd = timerfd_create(clockid, flags);
     if (timer_fd == -1)
-        throw ErrnoException(ErrorCodes::CANNOT_CREATE_TIMER, "Cannot create timer_fd descriptor");
+        throw Exception(ErrorCodes::CANNOT_CREATE_TIMER, "Cannot create timer_fd descriptor");
+
+    if (-1 == fcntl(timer_fd, F_SETFL, O_NONBLOCK))
+        throw ErrnoException(ErrorCodes::CANNOT_FCNTL, "Cannot set O_NONBLOCK for timer_fd");
 }
 
-TimerDescriptor::TimerDescriptor(TimerDescriptor && other) noexcept
-    : timer_fd(other.timer_fd)
+TimerDescriptor::TimerDescriptor(TimerDescriptor && other) noexcept : timer_fd(other.timer_fd)
 {
     other.timer_fd = -1;
 }
@@ -41,19 +40,21 @@ TimerDescriptor & TimerDescriptor::operator=(DB::TimerDescriptor && other) noexc
 
 TimerDescriptor::~TimerDescriptor()
 {
+    /// Do not check for result cause cannot throw exception.
     if (timer_fd != -1)
     {
-        if (0 != ::close(timer_fd))
-            std::terminate();
+        int err = close(timer_fd);
+        chassert(!err || errno == EINTR);
     }
 }
 
 void TimerDescriptor::reset() const
 {
-    if (timer_fd == -1)
-        return;
-
-    itimerspec spec{};
+    itimerspec spec;
+    spec.it_interval.tv_nsec = 0;
+    spec.it_interval.tv_sec = 0;
+    spec.it_value.tv_sec = 0;
+    spec.it_value.tv_nsec = 0;
 
     if (-1 == timerfd_settime(timer_fd, 0 /*relative timer */, &spec, nullptr))
         throw ErrnoException(ErrorCodes::CANNOT_SET_TIMER_PERIOD, "Cannot reset timer_fd");
@@ -65,81 +66,25 @@ void TimerDescriptor::reset() const
 
 void TimerDescriptor::drain() const
 {
-    if (timer_fd == -1)
-        return;
-
     /// It is expected that socket returns 8 bytes when readable.
     /// Read in loop anyway cause signal may interrupt read call.
-
-    /// man timerfd_create:
-    /// If the timer has already expired one or more times since its settings were last modified using timerfd_settime(),
-    /// or since the last successful read(2), then the buffer given to read(2) returns an unsigned 8-byte integer (uint64_t)
-    /// containing the number of expirations that have occurred.
-    /// (The returned value is in host byte order—that is, the native byte order for integers on the host machine.)
-
-    /// Due to a bug in Linux Kernel, reading from timerfd in non-blocking mode can be still blocking.
-    /// Avoid it with polling.
-    Epoll epoll;
-    epoll.add(timer_fd);
-    epoll_event event;
-    event.data.fd = -1;
-    size_t ready_count = epoll.getManyReady(1, &event, 0);
-    if (!ready_count)
-        return;
-
     uint64_t buf;
     while (true)
     {
         ssize_t res = ::read(timer_fd, &buf, sizeof(buf));
-
         if (res < 0)
         {
-            /// man timerfd_create:
-            /// If no timer expirations have occurred at the time of the read(2),
-            /// then the call either blocks until the next timer expiration, or fails with the error EAGAIN
-            /// if the file descriptor has been made nonblocking
-            /// (via the use of the fcntl(2) F_SETFL operation to set the O_NONBLOCK flag).
             if (errno == EAGAIN)
                 break;
 
-            /// A signal happened, need to retry.
-            if (errno == EINTR)
-            {
-                /** This is to help with debugging.
-                  *
-                  * Sometimes reading from timer_fd blocks, which should not happen, because we opened it in a non-blocking mode.
-                  * But it could be possible if a rogue 3rd-party library closed our file descriptor by mistake
-                  * (for example by double closing due to the lack of exception safety or if it is a crappy code in plain C)
-                  * and then another file descriptor is opened in its place.
-                  *
-                  * Let's try to get a name of this file descriptor and log it.
-                  */
-                LoggerPtr log = getLogger("TimerDescriptor");
-
-                static constexpr ssize_t max_link_path_length = 256;
-                char link_path[max_link_path_length];
-                ssize_t link_path_length = readlink(fmt::format("/proc/self/fd/{}", timer_fd).c_str(), link_path, max_link_path_length);
-                if (-1 == link_path_length)
-                    throw ErrnoException(ErrorCodes::CANNOT_READ_FROM_SOCKET, "Cannot readlink for a timer_fd {}", timer_fd);
-
-                LOG_TRACE(log, "Received EINTR while trying to drain a TimerDescriptor, fd {}: {}", timer_fd, std::string_view(link_path, link_path_length));
-
-                /// Check that it's actually a timerfd.
-                chassert(std::string_view(link_path, link_path_length).contains("timerfd"));
-                continue;
-            }
-
-            throw ErrnoException(ErrorCodes::CANNOT_READ_FROM_SOCKET, "Cannot drain timer_fd {}", timer_fd);
+            if (errno != EINTR)
+                throw ErrnoException(ErrorCodes::CANNOT_READ_FROM_SOCKET, "Cannot drain timer_fd");
         }
-
-        chassert(res == sizeof(buf));
     }
 }
 
 void TimerDescriptor::setRelative(uint64_t usec) const
 {
-    chassert(timer_fd >= 0);
-
     static constexpr uint32_t TIMER_PRECISION = 1e6;
 
     itimerspec spec;
@@ -158,5 +103,4 @@ void TimerDescriptor::setRelative(Poco::Timespan timespan) const
 }
 
 }
-
 #endif
diff --git a/src/Common/TimerDescriptor.h b/src/Common/TimerDescriptor.h
index 8d3b22868ac..0292f85d770 100644
--- a/src/Common/TimerDescriptor.h
+++ b/src/Common/TimerDescriptor.h
@@ -12,7 +12,7 @@ private:
     int timer_fd;
 
 public:
-    TimerDescriptor();
+    explicit TimerDescriptor(int clockid = CLOCK_MONOTONIC, int flags = 0);
     ~TimerDescriptor();
 
     TimerDescriptor(const TimerDescriptor &) = delete;
diff --git a/src/Common/ZooKeeper/IKeeper.cpp b/src/Common/ZooKeeper/IKeeper.cpp
index 34c9d94fca5..7cca262baca 100644
--- a/src/Common/ZooKeeper/IKeeper.cpp
+++ b/src/Common/ZooKeeper/IKeeper.cpp
@@ -171,7 +171,6 @@ bool isUserError(Error zk_return_code)
 
 void CreateRequest::addRootPath(const String & root_path) { Coordination::addRootPath(path, root_path); }
 void RemoveRequest::addRootPath(const String & root_path) { Coordination::addRootPath(path, root_path); }
-void RemoveRecursiveRequest::addRootPath(const String & root_path) { Coordination::addRootPath(path, root_path); }
 void ExistsRequest::addRootPath(const String & root_path) { Coordination::addRootPath(path, root_path); }
 void GetRequest::addRootPath(const String & root_path) { Coordination::addRootPath(path, root_path); }
 void SetRequest::addRootPath(const String & root_path) { Coordination::addRootPath(path, root_path); }
diff --git a/src/Common/ZooKeeper/IKeeper.h b/src/Common/ZooKeeper/IKeeper.h
index a0d6ae54f56..2c6cbc4a5d5 100644
--- a/src/Common/ZooKeeper/IKeeper.h
+++ b/src/Common/ZooKeeper/IKeeper.h
@@ -248,23 +248,6 @@ struct RemoveResponse : virtual Response
 {
 };
 
-struct RemoveRecursiveRequest : virtual Request
-{
-    String path;
-
-    /// strict limit for number of deleted nodes
-    uint32_t remove_nodes_limit = 1;
-
-    void addRootPath(const String & root_path) override;
-    String getPath() const override { return path; }
-
-    size_t bytesSize() const override { return path.size() + sizeof(remove_nodes_limit); }
-};
-
-struct RemoveRecursiveResponse : virtual Response
-{
-};
-
 struct ExistsRequest : virtual Request
 {
     String path;
@@ -447,7 +430,6 @@ struct ErrorResponse : virtual Response
 
 using CreateCallback = std::function<void(const CreateResponse &)>;
 using RemoveCallback = std::function<void(const RemoveResponse &)>;
-using RemoveRecursiveCallback = std::function<void(const RemoveRecursiveResponse &)>;
 using ExistsCallback = std::function<void(const ExistsResponse &)>;
 using GetCallback = std::function<void(const GetResponse &)>;
 using SetCallback = std::function<void(const SetResponse &)>;
@@ -566,7 +548,7 @@ public:
     virtual bool isExpired() const = 0;
 
     /// Get the current connected node idx.
-    virtual std::optional<int8_t> getConnectedNodeIdx() const = 0;
+    virtual Int8 getConnectedNodeIdx() const = 0;
 
     /// Get the current connected host and port.
     virtual String getConnectedHostPort() const = 0;
@@ -605,11 +587,6 @@ public:
         int32_t version,
         RemoveCallback callback) = 0;
 
-    virtual void removeRecursive(
-        const String & path,
-        uint32_t remove_nodes_limit,
-        RemoveRecursiveCallback callback) = 0;
-
     virtual void exists(
         const String & path,
         ExistsCallback callback,
diff --git a/src/Common/ZooKeeper/TestKeeper.cpp b/src/Common/ZooKeeper/TestKeeper.cpp
index 2fbe9110b6b..16ea412eb77 100644
--- a/src/Common/ZooKeeper/TestKeeper.cpp
+++ b/src/Common/ZooKeeper/TestKeeper.cpp
@@ -90,36 +90,6 @@ struct TestKeeperRemoveRequest final : RemoveRequest, TestKeeperRequest
     }
 };
 
-struct TestKeeperRemoveRecursiveRequest final : RemoveRecursiveRequest, TestKeeperRequest
-{
-    TestKeeperRemoveRecursiveRequest() = default;
-    explicit TestKeeperRemoveRecursiveRequest(const RemoveRecursiveRequest & base) : RemoveRecursiveRequest(base) {}
-    ResponsePtr createResponse() const override;
-    std::pair<ResponsePtr, Undo> process(TestKeeper::Container & container, int64_t zxid) const override;
-
-    void processWatches(TestKeeper::Watches & node_watches, TestKeeper::Watches & list_watches) const override
-    {
-        std::vector<std::pair<String, size_t>> deleted;
-
-        auto add_deleted_watches = [&](TestKeeper::Watches & w)
-        {
-            for (const auto & [watch_path, _] : w)
-                if (watch_path.starts_with(path))
-                    deleted.emplace_back(watch_path, std::count(watch_path.begin(), watch_path.end(), '/'));
-        };
-
-        add_deleted_watches(node_watches);
-        add_deleted_watches(list_watches);
-        std::sort(deleted.begin(), deleted.end(), [](const auto & lhs, const auto & rhs)
-        {
-            return lhs.second < rhs.second;
-        });
-
-        for (const auto & [watch_path, _] : deleted)
-            processWatchesImpl(watch_path, node_watches, list_watches);
-    }
-};
-
 struct TestKeeperExistsRequest final : ExistsRequest, TestKeeperRequest
 {
     ResponsePtr createResponse() const override;
@@ -205,10 +175,6 @@ struct TestKeeperMultiRequest final : MultiRequest, TestKeeperRequest
             {
                 requests.push_back(std::make_shared<TestKeeperRemoveRequest>(*concrete_request_remove));
             }
-            else if (const auto * concrete_request_remove_recursive = dynamic_cast<const RemoveRecursiveRequest *>(generic_request.get()))
-            {
-                requests.push_back(std::make_shared<TestKeeperRemoveRecursiveRequest>(*concrete_request_remove_recursive));
-            }
             else if (const auto * concrete_request_set = dynamic_cast<const SetRequest *>(generic_request.get()))
             {
                 requests.push_back(std::make_shared<TestKeeperSetRequest>(*concrete_request_set));
@@ -347,62 +313,6 @@ std::pair<ResponsePtr, Undo> TestKeeperRemoveRequest::process(TestKeeper::Contai
     return { std::make_shared<RemoveResponse>(response), undo };
 }
 
-std::pair<ResponsePtr, Undo> TestKeeperRemoveRecursiveRequest::process(TestKeeper::Container & container, int64_t zxid) const
-{
-    RemoveRecursiveResponse response;
-    response.zxid = zxid;
-    Undo undo;
-
-    auto root_it = container.find(path);
-    if (root_it == container.end())
-    {
-        response.error = Error::ZNONODE;
-        return { std::make_shared<RemoveRecursiveResponse>(response), undo };
-    }
-
-    std::vector<std::pair<std::string, Coordination::TestKeeper::Node>> children;
-
-    for (auto it = std::next(root_it); it != container.end(); ++it)
-    {
-        const auto & [child_path, child_node] = *it;
-
-        if (child_path.starts_with(path))
-            children.emplace_back(child_path, child_node);
-        else
-            break;
-    }
-
-    if (children.size() > remove_nodes_limit)
-    {
-        response.error = Error::ZNOTEMPTY;
-        return { std::make_shared<RemoveRecursiveResponse>(response), undo };
-    }
-
-    auto & parent = container.at(parentPath(path));
-    --parent.stat.numChildren;
-    ++parent.stat.cversion;
-
-    for (const auto & [child_path, child_node] : children)
-    {
-        auto child_it = container.find(child_path);
-        chassert(child_it != container.end());
-        container.erase(child_it);
-    }
-
-    response.error = Error::ZOK;
-    undo = [&container, dead = std::move(children), root_path = path]()
-    {
-        for (auto && [child_path, child_node] : dead)
-            container.emplace(child_path, child_node);
-
-        auto & undo_parent = container.at(parentPath(root_path));
-        ++undo_parent.stat.numChildren;
-        --undo_parent.stat.cversion;
-    };
-
-    return { std::make_shared<RemoveRecursiveResponse>(response), undo };
-}
-
 std::pair<ResponsePtr, Undo> TestKeeperExistsRequest::process(TestKeeper::Container & container, int64_t zxid) const
 {
     ExistsResponse response;
@@ -620,7 +530,6 @@ std::pair<ResponsePtr, Undo> TestKeeperMultiRequest::process(TestKeeper::Contain
 
 ResponsePtr TestKeeperCreateRequest::createResponse() const { return std::make_shared<CreateResponse>(); }
 ResponsePtr TestKeeperRemoveRequest::createResponse() const { return std::make_shared<RemoveResponse>(); }
-ResponsePtr TestKeeperRemoveRecursiveRequest::createResponse() const { return std::make_shared<RemoveRecursiveResponse>(); }
 ResponsePtr TestKeeperExistsRequest::createResponse() const { return std::make_shared<ExistsResponse>(); }
 ResponsePtr TestKeeperGetRequest::createResponse() const { return std::make_shared<GetResponse>(); }
 ResponsePtr TestKeeperSetRequest::createResponse() const { return std::make_shared<SetResponse>(); }
@@ -862,21 +771,6 @@ void TestKeeper::remove(
     pushRequest(std::move(request_info));
 }
 
-void TestKeeper::removeRecursive(
-    const String & path,
-    uint32_t remove_nodes_limit,
-    RemoveRecursiveCallback callback)
-{
-    TestKeeperRemoveRecursiveRequest request;
-    request.path = path;
-    request.remove_nodes_limit = remove_nodes_limit;
-
-    RequestInfo request_info;
-    request_info.request = std::make_shared<TestKeeperRemoveRecursiveRequest>(std::move(request));
-    request_info.callback = [callback](const Response & response) { callback(dynamic_cast<const RemoveRecursiveResponse &>(response)); };
-    pushRequest(std::move(request_info));
-}
-
 void TestKeeper::exists(
         const String & path,
         ExistsCallback callback,
diff --git a/src/Common/ZooKeeper/TestKeeper.h b/src/Common/ZooKeeper/TestKeeper.h
index c32f0064dec..2194ad015bf 100644
--- a/src/Common/ZooKeeper/TestKeeper.h
+++ b/src/Common/ZooKeeper/TestKeeper.h
@@ -39,7 +39,7 @@ public:
     ~TestKeeper() override;
 
     bool isExpired() const override { return expired; }
-    std::optional<int8_t> getConnectedNodeIdx() const override { return 0; }
+    Int8 getConnectedNodeIdx() const override { return 0; }
     String getConnectedHostPort() const override { return "TestKeeper:0000"; }
     int32_t getConnectionXid() const override { return 0; }
     int64_t getSessionID() const override { return 0; }
@@ -58,11 +58,6 @@ public:
             int32_t version,
             RemoveCallback callback) override;
 
-    void removeRecursive(
-        const String & path,
-        uint32_t remove_nodes_limit,
-        RemoveRecursiveCallback callback) override;
-
     void exists(
             const String & path,
             ExistsCallback callback,
diff --git a/src/Common/ZooKeeper/Types.h b/src/Common/ZooKeeper/Types.h
index 4a163c15838..d2876adaabc 100644
--- a/src/Common/ZooKeeper/Types.h
+++ b/src/Common/ZooKeeper/Types.h
@@ -31,7 +31,6 @@ using AsyncResponses = std::vector<std::pair<std::string, std::future<R>>>;
 
 Coordination::RequestPtr makeCreateRequest(const std::string & path, const std::string & data, int create_mode, bool ignore_if_exists = false);
 Coordination::RequestPtr makeRemoveRequest(const std::string & path, int version);
-Coordination::RequestPtr makeRemoveRecursiveRequest(const std::string & path, uint32_t remove_nodes_limit);
 Coordination::RequestPtr makeSetRequest(const std::string & path, const std::string & data, int version);
 Coordination::RequestPtr makeCheckRequest(const std::string & path, int version);
 
diff --git a/src/Common/ZooKeeper/ZooKeeper.cpp b/src/Common/ZooKeeper/ZooKeeper.cpp
index ae60520affb..01bb508da95 100644
--- a/src/Common/ZooKeeper/ZooKeeper.cpp
+++ b/src/Common/ZooKeeper/ZooKeeper.cpp
@@ -128,15 +128,16 @@ void ZooKeeper::init(ZooKeeperArgs args_, std::unique_ptr<Coordination::IKeeper>
         ShuffleHosts shuffled_hosts = shuffleHosts();
 
         impl = std::make_unique<Coordination::ZooKeeper>(shuffled_hosts, args, zk_log);
-        auto node_idx = impl->getConnectedNodeIdx();
+        Int8 node_idx = impl->getConnectedNodeIdx();
 
         if (args.chroot.empty())
             LOG_TRACE(log, "Initialized, hosts: {}", fmt::join(args.hosts, ","));
         else
             LOG_TRACE(log, "Initialized, hosts: {}, chroot: {}", fmt::join(args.hosts, ","), args.chroot);
 
+
         /// If the balancing strategy has an optimal node then it will be the first in the list
-        bool connected_to_suboptimal_node = node_idx && static_cast<UInt8>(*node_idx) != shuffled_hosts[0].original_index;
+        bool connected_to_suboptimal_node = node_idx != shuffled_hosts[0].original_index;
         bool respect_az = args.prefer_local_availability_zone && !args.client_availability_zone.empty();
         bool may_benefit_from_reconnecting = respect_az || args.get_priority_load_balancing.hasOptimalNode();
         if (connected_to_suboptimal_node && may_benefit_from_reconnecting)
@@ -144,7 +145,7 @@ void ZooKeeper::init(ZooKeeperArgs args_, std::unique_ptr<Coordination::IKeeper>
             auto reconnect_timeout_sec = getSecondsUntilReconnect(args);
             LOG_DEBUG(log, "Connected to a suboptimal ZooKeeper host ({}, index {})."
                            " To preserve balance in ZooKeeper usage, this ZooKeeper session will expire in {} seconds",
-                      impl->getConnectedHostPort(), *node_idx, reconnect_timeout_sec);
+                      impl->getConnectedHostPort(), node_idx, reconnect_timeout_sec);
 
             auto reconnect_task_holder = DB::Context::getGlobalContextInstance()->getSchedulePool().createTask("ZKReconnect", [this, optimal_host = shuffled_hosts[0]]()
             {
@@ -153,15 +154,13 @@ void ZooKeeper::init(ZooKeeperArgs args_, std::unique_ptr<Coordination::IKeeper>
                     LOG_DEBUG(log, "Trying to connect to a more optimal node {}", optimal_host.host);
                     ShuffleHosts node{optimal_host};
                     std::unique_ptr<Coordination::IKeeper> new_impl = std::make_unique<Coordination::ZooKeeper>(node, args, zk_log);
-
-                    auto new_node_idx = new_impl->getConnectedNodeIdx();
-                    chassert(new_node_idx.has_value());
+                    Int8 new_node_idx = new_impl->getConnectedNodeIdx();
 
                     /// Maybe the node was unavailable when getting AZs first time, update just in case
-                    if (args.availability_zone_autodetect && availability_zones[*new_node_idx].empty())
+                    if (args.availability_zone_autodetect && availability_zones[new_node_idx].empty())
                     {
-                        availability_zones[*new_node_idx] = new_impl->tryGetAvailabilityZone();
-                        LOG_DEBUG(log, "Got availability zone for {}: {}", optimal_host.host, availability_zones[*new_node_idx]);
+                        availability_zones[new_node_idx] = new_impl->tryGetAvailabilityZone();
+                        LOG_DEBUG(log, "Got availability zone for {}: {}", optimal_host.host, availability_zones[new_node_idx]);
                     }
 
                     optimal_impl = std::move(new_impl);
@@ -979,48 +978,19 @@ bool ZooKeeper::tryRemoveChildrenRecursive(const std::string & path, bool probab
     return removed_as_expected;
 }
 
-void ZooKeeper::removeRecursive(const std::string & path, uint32_t remove_nodes_limit)
+void ZooKeeper::removeRecursive(const std::string & path)
 {
-    if (!isFeatureEnabled(DB::KeeperFeatureFlag::REMOVE_RECURSIVE))
-    {
-        removeChildrenRecursive(path);
-        remove(path);
-        return;
-    }
-
-    check(tryRemoveRecursive(path, remove_nodes_limit), path);
+    removeChildrenRecursive(path);
+    remove(path);
 }
 
-Coordination::Error ZooKeeper::tryRemoveRecursive(const std::string & path, uint32_t remove_nodes_limit)
+void ZooKeeper::tryRemoveRecursive(const std::string & path)
 {
-    if (!isFeatureEnabled(DB::KeeperFeatureFlag::REMOVE_RECURSIVE))
-    {
-        tryRemoveChildrenRecursive(path);
-        return tryRemove(path);
-    }
-
-    auto promise = std::make_shared<std::promise<Coordination::RemoveRecursiveResponse>>();
-    auto future = promise->get_future();
-
-    auto callback = [promise](const Coordination::RemoveRecursiveResponse & response) mutable
-    {
-        promise->set_value(response);
-    };
-
-    impl->removeRecursive(path, remove_nodes_limit, std::move(callback));
-
-    if (future.wait_for(std::chrono::milliseconds(args.operation_timeout_ms)) != std::future_status::ready)
-    {
-        impl->finalize(fmt::format("Operation timeout on {} {}", Coordination::OpNum::RemoveRecursive, path));
-        return Coordination::Error::ZOPERATIONTIMEOUT;
-    }
-    else
-    {
-        auto response = future.get();
-        return response.error;
-    }
+    tryRemoveChildrenRecursive(path);
+    tryRemove(path);
 }
 
+
 namespace
 {
     struct WaitForDisappearState
@@ -1555,7 +1525,7 @@ void ZooKeeper::setServerCompletelyStarted()
         zk->setServerCompletelyStarted();
 }
 
-std::optional<int8_t> ZooKeeper::getConnectedHostIdx() const
+Int8 ZooKeeper::getConnectedHostIdx() const
 {
     return impl->getConnectedNodeIdx();
 }
@@ -1574,10 +1544,10 @@ String ZooKeeper::getConnectedHostAvailabilityZone() const
 {
     if (args.implementation != "zookeeper" || !impl)
         return "";
-    std::optional<int8_t> idx = impl->getConnectedNodeIdx();
-    if (!idx)
+    Int8 idx = impl->getConnectedNodeIdx();
+    if (idx < 0)
         return "";     /// session expired
-    return availability_zones.at(*idx);
+    return availability_zones.at(idx);
 }
 
 size_t getFailedOpIndex(Coordination::Error exception_code, const Coordination::Responses & responses)
@@ -1599,7 +1569,7 @@ size_t getFailedOpIndex(Coordination::Error exception_code, const Coordination::
 
 
 KeeperMultiException::KeeperMultiException(Coordination::Error exception_code, size_t failed_op_index_, const Coordination::Requests & requests_, const Coordination::Responses & responses_)
-        : KeeperException(exception_code, "Transaction failed ({}): Op #{}, path", exception_code, failed_op_index_),
+        : KeeperException(exception_code, "Transaction failed: Op #{}, path", failed_op_index_),
           requests(requests_), responses(responses_), failed_op_index(failed_op_index_)
 {
     addMessage(getPathForFirstFailedOp());
@@ -1648,14 +1618,6 @@ Coordination::RequestPtr makeRemoveRequest(const std::string & path, int version
     return request;
 }
 
-Coordination::RequestPtr makeRemoveRecursiveRequest(const std::string & path, uint32_t remove_nodes_limit)
-{
-    auto request = std::make_shared<Coordination::RemoveRecursiveRequest>();
-    request->path = path;
-    request->remove_nodes_limit = remove_nodes_limit;
-    return request;
-}
-
 Coordination::RequestPtr makeSetRequest(const std::string & path, const std::string & data, int version)
 {
     auto request = std::make_shared<Coordination::SetRequest>();
diff --git a/src/Common/ZooKeeper/ZooKeeper.h b/src/Common/ZooKeeper/ZooKeeper.h
index 29c4fbc9b74..4ae2cfa6096 100644
--- a/src/Common/ZooKeeper/ZooKeeper.h
+++ b/src/Common/ZooKeeper/ZooKeeper.h
@@ -44,7 +44,7 @@ namespace ErrorCodes
 namespace zkutil
 {
 
-/// Preferred size of multi command (in the number of operations)
+/// Preferred size of multi() command (in number of ops)
 constexpr size_t MULTI_BATCH_SIZE = 100;
 
 struct ShuffleHost
@@ -479,16 +479,15 @@ public:
 
     Int64 getClientID();
 
-    /// Remove the node with the subtree.
-    /// If Keeper supports RemoveRecursive operation then it will be performed atomically.
-    /// Otherwise if someone concurrently adds or removes a node in the subtree, the result is undefined.
-    void removeRecursive(const std::string & path, uint32_t remove_nodes_limit = 100);
+    /// Remove the node with the subtree. If someone concurrently adds or removes a node
+    /// in the subtree, the result is undefined.
+    void removeRecursive(const std::string & path);
 
-    /// Same as removeRecursive but in case if Keeper does not supports RemoveRecursive and
-    /// if someone concurrently removes a node in the subtree, this will not cause errors.
+    /// Remove the node with the subtree. If someone concurrently removes a node in the subtree,
+    /// this will not cause errors.
     /// For instance, you can call this method twice concurrently for the same node and the end
     /// result would be the same as for the single call.
-    Coordination::Error tryRemoveRecursive(const std::string & path, uint32_t remove_nodes_limit = 100);
+    void tryRemoveRecursive(const std::string & path);
 
     /// Similar to removeRecursive(...) and tryRemoveRecursive(...), but does not remove path itself.
     /// Node defined as RemoveException will not be deleted.
@@ -621,7 +620,7 @@ public:
 
     void setServerCompletelyStarted();
 
-    std::optional<int8_t> getConnectedHostIdx() const;
+    Int8 getConnectedHostIdx() const;
     String getConnectedHostPort() const;
     int32_t getConnectionXid() const;
 
diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.cpp b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
index 3f9225e84dd..dff14f74681 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
@@ -1,5 +1,5 @@
-#include <Common/ZooKeeper/IKeeper.h>
-#include <Common/ZooKeeper/ZooKeeperConstants.h>
+#include "Common/ZooKeeper/IKeeper.h"
+#include "Common/ZooKeeper/ZooKeeperConstants.h"
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Common/ZooKeeper/ZooKeeperIO.h>
 #include <Common/Stopwatch.h>
@@ -232,27 +232,6 @@ void ZooKeeperRemoveRequest::readImpl(ReadBuffer & in)
     Coordination::read(version, in);
 }
 
-void ZooKeeperRemoveRecursiveRequest::writeImpl(WriteBuffer & out) const
-{
-    Coordination::write(path, out);
-    Coordination::write(remove_nodes_limit, out);
-}
-
-void ZooKeeperRemoveRecursiveRequest::readImpl(ReadBuffer & in)
-{
-    Coordination::read(path, in);
-    Coordination::read(remove_nodes_limit, in);
-}
-
-std::string ZooKeeperRemoveRecursiveRequest::toStringImpl(bool /*short_format*/) const
-{
-    return fmt::format(
-        "path = {}\n"
-        "remove_nodes_limit = {}",
-        path,
-        remove_nodes_limit);
-}
-
 void ZooKeeperExistsRequest::writeImpl(WriteBuffer & out) const
 {
     Coordination::write(path, out);
@@ -531,11 +510,6 @@ ZooKeeperMultiRequest::ZooKeeperMultiRequest(std::span<const Coordination::Reque
             checkOperationType(Write);
             requests.push_back(std::make_shared<ZooKeeperRemoveRequest>(*concrete_request_remove));
         }
-        else if (const auto * concrete_request_remove_recursive = dynamic_cast<const RemoveRecursiveRequest *>(generic_request.get()))
-        {
-            checkOperationType(Write);
-            requests.push_back(std::make_shared<ZooKeeperRemoveRecursiveRequest>(*concrete_request_remove_recursive));
-        }
         else if (const auto * concrete_request_set = dynamic_cast<const SetRequest *>(generic_request.get()))
         {
             checkOperationType(Write);
@@ -733,7 +707,6 @@ ZooKeeperResponsePtr ZooKeeperHeartbeatRequest::makeResponse() const { return se
 ZooKeeperResponsePtr ZooKeeperSyncRequest::makeResponse() const { return setTime(std::make_shared<ZooKeeperSyncResponse>()); }
 ZooKeeperResponsePtr ZooKeeperAuthRequest::makeResponse() const { return setTime(std::make_shared<ZooKeeperAuthResponse>()); }
 ZooKeeperResponsePtr ZooKeeperRemoveRequest::makeResponse() const { return setTime(std::make_shared<ZooKeeperRemoveResponse>()); }
-ZooKeeperResponsePtr ZooKeeperRemoveRecursiveRequest::makeResponse() const { return setTime(std::make_shared<ZooKeeperRemoveRecursiveResponse>()); }
 ZooKeeperResponsePtr ZooKeeperExistsRequest::makeResponse() const { return setTime(std::make_shared<ZooKeeperExistsResponse>()); }
 ZooKeeperResponsePtr ZooKeeperGetRequest::makeResponse() const { return setTime(std::make_shared<ZooKeeperGetResponse>()); }
 ZooKeeperResponsePtr ZooKeeperSetRequest::makeResponse() const { return setTime(std::make_shared<ZooKeeperSetResponse>()); }
@@ -1051,7 +1024,6 @@ ZooKeeperRequestFactory::ZooKeeperRequestFactory()
     registerZooKeeperRequest<OpNum::SetACL, ZooKeeperSetACLRequest>(*this);
     registerZooKeeperRequest<OpNum::FilteredList, ZooKeeperFilteredListRequest>(*this);
     registerZooKeeperRequest<OpNum::CheckNotExists, ZooKeeperCheckRequest>(*this);
-    registerZooKeeperRequest<OpNum::RemoveRecursive, ZooKeeperRemoveRecursiveRequest>(*this);
 }
 
 PathMatchResult matchPath(std::string_view path, std::string_view match_to)
diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.h b/src/Common/ZooKeeper/ZooKeeperCommon.h
index 66c075b277b..fd6ec3cd375 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.h
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.h
@@ -285,31 +285,6 @@ struct ZooKeeperRemoveResponse final : RemoveResponse, ZooKeeperResponse
     size_t bytesSize() const override { return RemoveResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
-struct ZooKeeperRemoveRecursiveRequest final : RemoveRecursiveRequest, ZooKeeperRequest
-{
-    ZooKeeperRemoveRecursiveRequest() = default;
-    explicit ZooKeeperRemoveRecursiveRequest(const RemoveRecursiveRequest & base) : RemoveRecursiveRequest(base) {}
-
-    OpNum getOpNum() const override { return OpNum::RemoveRecursive; }
-    void writeImpl(WriteBuffer & out) const override;
-    void readImpl(ReadBuffer & in) override;
-    std::string toStringImpl(bool short_format) const override;
-
-    ZooKeeperResponsePtr makeResponse() const override;
-    bool isReadRequest() const override { return false; }
-
-    size_t bytesSize() const override { return RemoveRecursiveRequest::bytesSize() + sizeof(xid); }
-};
-
-struct ZooKeeperRemoveRecursiveResponse : RemoveRecursiveResponse, ZooKeeperResponse
-{
-    void readImpl(ReadBuffer &) override {}
-    void writeImpl(WriteBuffer &) const override {}
-    OpNum getOpNum() const override { return OpNum::RemoveRecursive; }
-
-    size_t bytesSize() const override { return RemoveRecursiveResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
-};
-
 struct ZooKeeperExistsRequest final : ExistsRequest, ZooKeeperRequest
 {
     ZooKeeperExistsRequest() = default;
diff --git a/src/Common/ZooKeeper/ZooKeeperConstants.cpp b/src/Common/ZooKeeper/ZooKeeperConstants.cpp
index a2780dfd5e2..cf8ba35e992 100644
--- a/src/Common/ZooKeeper/ZooKeeperConstants.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperConstants.cpp
@@ -29,7 +29,6 @@ static const std::unordered_set<int32_t> VALID_OPERATIONS =
     static_cast<int32_t>(OpNum::GetACL),
     static_cast<int32_t>(OpNum::FilteredList),
     static_cast<int32_t>(OpNum::CheckNotExists),
-    static_cast<int32_t>(OpNum::RemoveRecursive),
 };
 
 OpNum getOpNum(int32_t raw_op_num)
diff --git a/src/Common/ZooKeeper/ZooKeeperConstants.h b/src/Common/ZooKeeper/ZooKeeperConstants.h
index 9d8e2d4f857..1d9830505f8 100644
--- a/src/Common/ZooKeeper/ZooKeeperConstants.h
+++ b/src/Common/ZooKeeper/ZooKeeperConstants.h
@@ -40,7 +40,6 @@ enum class OpNum : int32_t
     FilteredList = 500,
     CheckNotExists = 501,
     CreateIfNotExists = 502,
-    RemoveRecursive = 503,
 
     SessionID = 997, /// Special internal request
 };
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.cpp b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
index a6dd9738e17..2728f953bea 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
@@ -536,7 +536,7 @@ void ZooKeeper::connect(
                     compressed_out.emplace(*out, CompressionCodecFactory::instance().get("LZ4", {}));
                 }
 
-                original_index.store(node.original_index);
+                original_index = static_cast<Int8>(node.original_index);
                 break;
             }
             catch (...)
@@ -1014,6 +1014,9 @@ void ZooKeeper::finalize(bool error_send, bool error_receive, const String & rea
     LOG_INFO(log, "Finalizing session {}. finalization_started: {}, queue_finished: {}, reason: '{}'",
              session_id, already_started, requests_queue.isFinished(), reason);
 
+    /// Reset the original index.
+    original_index = -1;
+
     auto expire_session_if_not_expired = [&]
     {
         /// No new requests will appear in queue after finish()
@@ -1347,25 +1350,6 @@ void ZooKeeper::remove(
     ProfileEvents::increment(ProfileEvents::ZooKeeperRemove);
 }
 
-void ZooKeeper::removeRecursive(
-    const String &path,
-    uint32_t remove_nodes_limit,
-    RemoveRecursiveCallback callback)
-{
-    if (!isFeatureEnabled(KeeperFeatureFlag::REMOVE_RECURSIVE))
-        throw Exception::fromMessage(Error::ZBADARGUMENTS, "RemoveRecursive request type cannot be used because it's not supported by the server");
-
-    ZooKeeperRemoveRecursiveRequest request;
-    request.path = path;
-    request.remove_nodes_limit = remove_nodes_limit;
-
-    RequestInfo request_info;
-    request_info.request = std::make_shared<ZooKeeperRemoveRecursiveRequest>(std::move(request));
-    request_info.callback = [callback](const Response & response) { callback(dynamic_cast<const RemoveRecursiveResponse &>(response)); };
-
-    pushRequest(std::move(request_info));
-    ProfileEvents::increment(ProfileEvents::ZooKeeperRemove);
-}
 
 void ZooKeeper::exists(
     const String & path,
@@ -1550,30 +1534,6 @@ void ZooKeeper::close()
 }
 
 
-std::optional<int8_t> ZooKeeper::getConnectedNodeIdx() const
-{
-    int8_t res = original_index.load();
-    if (res == -1)
-        return std::nullopt;
-    else
-        return res;
-}
-
-String ZooKeeper::getConnectedHostPort() const
-{
-    auto idx = getConnectedNodeIdx();
-    if (idx)
-        return args.hosts[*idx];
-    else
-        return "";
-}
-
-int32_t ZooKeeper::getConnectionXid() const
-{
-    return next_xid.load();
-}
-
-
 void ZooKeeper::setZooKeeperLog(std::shared_ptr<DB::ZooKeeperLog> zk_log_)
 {
     /// logOperationIfNeeded(...) uses zk_log and can be called from different threads, so we have to use atomic shared_ptr
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.h b/src/Common/ZooKeeper/ZooKeeperImpl.h
index 47d2ab8f401..0c88c35b381 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.h
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.h
@@ -114,12 +114,13 @@ public:
 
     ~ZooKeeper() override;
 
+
     /// If expired, you can only destroy the object. All other methods will throw exception.
     bool isExpired() const override { return requests_queue.isFinished(); }
 
-    std::optional<int8_t> getConnectedNodeIdx() const override;
-    String getConnectedHostPort() const override;
-    int32_t getConnectionXid() const override;
+    Int8 getConnectedNodeIdx() const override { return original_index; }
+    String getConnectedHostPort() const override { return (original_index == -1) ? "" : args.hosts[original_index]; }
+    int32_t getConnectionXid() const override { return next_xid.load(); }
 
     String tryGetAvailabilityZone() override;
 
@@ -146,11 +147,6 @@ public:
         int32_t version,
         RemoveCallback callback) override;
 
-    void removeRecursive(
-        const String &path,
-        uint32_t remove_nodes_limit,
-        RemoveRecursiveCallback callback) override;
-
     void exists(
         const String & path,
         ExistsCallback callback,
@@ -223,7 +219,7 @@ private:
     ACLs default_acls;
 
     zkutil::ZooKeeperArgs args;
-    std::atomic<int8_t> original_index{-1};
+    Int8 original_index = -1;
 
     /// Fault injection
     void maybeInjectSendFault();
diff --git a/src/Common/config.h.in b/src/Common/config.h.in
index 2e3b8d84366..f68701d5d10 100644
--- a/src/Common/config.h.in
+++ b/src/Common/config.h.in
@@ -32,8 +32,6 @@
 #cmakedefine01 USE_IDNA
 #cmakedefine01 USE_NLP
 #cmakedefine01 USE_VECTORSCAN
-#cmakedefine01 USE_QPL
-#cmakedefine01 USE_QATLIB
 #cmakedefine01 USE_LIBURING
 #cmakedefine01 USE_AVRO
 #cmakedefine01 USE_CAPNP
@@ -58,16 +56,14 @@
 #cmakedefine01 USE_FILELOG
 #cmakedefine01 USE_ODBC
 #cmakedefine01 USE_BLAKE3
-#cmakedefine01 USE_USEARCH
 #cmakedefine01 USE_SKIM
 #cmakedefine01 USE_PRQL
 #cmakedefine01 USE_ULID
-#cmakedefine01 USE_LIBFIU
+#cmakedefine01 FIU_ENABLE
 #cmakedefine01 USE_BCRYPT
 #cmakedefine01 USE_LIBARCHIVE
 #cmakedefine01 USE_POCKETFFT
 #cmakedefine01 USE_PROMETHEUS_PROTOBUFS
-#cmakedefine01 USE_NUMACTL
 
 /// This is needed for .incbin in assembly. For some reason, include paths don't work there in presence of LTO.
 /// That's why we use absolute paths.
diff --git a/src/Common/examples/CMakeLists.txt b/src/Common/examples/CMakeLists.txt
index 8383e80d09d..c133e9f5617 100644
--- a/src/Common/examples/CMakeLists.txt
+++ b/src/Common/examples/CMakeLists.txt
@@ -1,14 +1,14 @@
 clickhouse_add_executable (hashes_test hashes_test.cpp)
-target_link_libraries (hashes_test PRIVATE clickhouse_common_io clickhouse_common_config ch_contrib::cityhash)
+target_link_libraries (hashes_test PRIVATE clickhouse_common_io ch_contrib::cityhash)
 if (TARGET OpenSSL::Crypto)
     target_link_libraries (hashes_test PRIVATE OpenSSL::Crypto)
 endif()
 
 clickhouse_add_executable (sip_hash_perf sip_hash_perf.cpp)
-target_link_libraries (sip_hash_perf PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (sip_hash_perf PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (small_table small_table.cpp)
-target_link_libraries (small_table PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (small_table PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (parallel_aggregation parallel_aggregation.cpp)
 target_link_libraries (parallel_aggregation PRIVATE dbms clickhouse_functions)
@@ -17,13 +17,13 @@ clickhouse_add_executable (parallel_aggregation2 parallel_aggregation2.cpp)
 target_link_libraries (parallel_aggregation2 PRIVATE dbms clickhouse_functions)
 
 clickhouse_add_executable (int_hashes_perf int_hashes_perf.cpp)
-target_link_libraries (int_hashes_perf PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (int_hashes_perf PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (compact_array compact_array.cpp)
-target_link_libraries (compact_array PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (compact_array PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (radix_sort radix_sort.cpp)
-target_link_libraries (radix_sort PRIVATE clickhouse_common_io clickhouse_common_config ch_contrib::pdqsort)
+target_link_libraries (radix_sort PRIVATE clickhouse_common_io ch_contrib::pdqsort)
 
 clickhouse_add_executable (arena_with_free_lists arena_with_free_lists.cpp)
 target_link_libraries (arena_with_free_lists PRIVATE dbms)
@@ -33,46 +33,46 @@ target_link_libraries (lru_hash_map_perf PRIVATE dbms)
 
 if (OS_LINUX)
     clickhouse_add_executable (thread_creation_latency thread_creation_latency.cpp)
-    target_link_libraries (thread_creation_latency PRIVATE clickhouse_common_io clickhouse_common_config)
+    target_link_libraries (thread_creation_latency PRIVATE clickhouse_common_io)
 endif()
 
 clickhouse_add_executable (array_cache array_cache.cpp)
-target_link_libraries (array_cache PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (array_cache PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (space_saving space_saving.cpp)
-target_link_libraries (space_saving PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (space_saving PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (integer_hash_tables_benchmark integer_hash_tables_benchmark.cpp)
 target_link_libraries (integer_hash_tables_benchmark PRIVATE dbms ch_contrib::abseil_swiss_tables ch_contrib::sparsehash)
 
 clickhouse_add_executable (cow_columns cow_columns.cpp)
-target_link_libraries (cow_columns PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (cow_columns PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (cow_compositions cow_compositions.cpp)
-target_link_libraries (cow_compositions PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (cow_compositions PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (stopwatch stopwatch.cpp)
-target_link_libraries (stopwatch PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (stopwatch PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (symbol_index symbol_index.cpp)
-target_link_libraries (symbol_index PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (symbol_index PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (chaos_sanitizer chaos_sanitizer.cpp)
-target_link_libraries (chaos_sanitizer PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (chaos_sanitizer PRIVATE clickhouse_common_io)
 
 if (OS_LINUX)
     clickhouse_add_executable (memory_statistics_os_perf memory_statistics_os_perf.cpp)
-    target_link_libraries (memory_statistics_os_perf PRIVATE clickhouse_common_io clickhouse_common_config)
+    target_link_libraries (memory_statistics_os_perf PRIVATE clickhouse_common_io)
 endif()
 
 clickhouse_add_executable (procfs_metrics_provider_perf procfs_metrics_provider_perf.cpp)
-target_link_libraries (procfs_metrics_provider_perf PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (procfs_metrics_provider_perf PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (average average.cpp)
-target_link_libraries (average PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (average PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (shell_command_inout shell_command_inout.cpp)
-target_link_libraries (shell_command_inout PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (shell_command_inout PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (executable_udf executable_udf.cpp)
 target_link_libraries (executable_udf PRIVATE dbms)
@@ -91,9 +91,4 @@ if (ENABLE_SSL)
 endif()
 
 clickhouse_add_executable (check_pointer_valid check_pointer_valid.cpp)
-target_link_libraries (check_pointer_valid PRIVATE clickhouse_common_io clickhouse_common_config)
-
-if (TARGET ch_contrib::icu)
-    clickhouse_add_executable (utf8_upper_lower utf8_upper_lower.cpp)
-    target_link_libraries (utf8_upper_lower PRIVATE ch_contrib::icu)
-endif ()
+target_link_libraries (check_pointer_valid PRIVATE clickhouse_common_io)
diff --git a/src/Common/examples/arena_with_free_lists.cpp b/src/Common/examples/arena_with_free_lists.cpp
index 3a1304e2d94..6793d567aca 100644
--- a/src/Common/examples/arena_with_free_lists.cpp
+++ b/src/Common/examples/arena_with_free_lists.cpp
@@ -174,19 +174,19 @@ struct Dictionary
     {
         switch (attribute.type)
         {
-            case AttributeUnderlyingTypeTest::UInt8: std::get<ContainerPtrType<UInt8>>(attribute.arrays)[idx] = value.safeGet<UInt64>(); break;
-            case AttributeUnderlyingTypeTest::UInt16: std::get<ContainerPtrType<UInt16>>(attribute.arrays)[idx] = value.safeGet<UInt64>(); break;
-            case AttributeUnderlyingTypeTest::UInt32: std::get<ContainerPtrType<UInt32>>(attribute.arrays)[idx] = static_cast<UInt32>(value.safeGet<UInt64>()); break;
-            case AttributeUnderlyingTypeTest::UInt64: std::get<ContainerPtrType<UInt64>>(attribute.arrays)[idx] = value.safeGet<UInt64>(); break;
-            case AttributeUnderlyingTypeTest::Int8: std::get<ContainerPtrType<Int8>>(attribute.arrays)[idx] = value.safeGet<Int64>(); break;
-            case AttributeUnderlyingTypeTest::Int16: std::get<ContainerPtrType<Int16>>(attribute.arrays)[idx] = value.safeGet<Int64>(); break;
-            case AttributeUnderlyingTypeTest::Int32: std::get<ContainerPtrType<Int32>>(attribute.arrays)[idx] = static_cast<Int32>(value.safeGet<Int64>()); break;
-            case AttributeUnderlyingTypeTest::Int64: std::get<ContainerPtrType<Int64>>(attribute.arrays)[idx] = value.safeGet<Int64>(); break;
-            case AttributeUnderlyingTypeTest::Float32: std::get<ContainerPtrType<Float32>>(attribute.arrays)[idx] = static_cast<Float32>(value.safeGet<Float64>()); break;
-            case AttributeUnderlyingTypeTest::Float64: std::get<ContainerPtrType<Float64>>(attribute.arrays)[idx] = value.safeGet<Float64>(); break;
+            case AttributeUnderlyingTypeTest::UInt8: std::get<ContainerPtrType<UInt8>>(attribute.arrays)[idx] = value.get<UInt64>(); break;
+            case AttributeUnderlyingTypeTest::UInt16: std::get<ContainerPtrType<UInt16>>(attribute.arrays)[idx] = value.get<UInt64>(); break;
+            case AttributeUnderlyingTypeTest::UInt32: std::get<ContainerPtrType<UInt32>>(attribute.arrays)[idx] = static_cast<UInt32>(value.get<UInt64>()); break;
+            case AttributeUnderlyingTypeTest::UInt64: std::get<ContainerPtrType<UInt64>>(attribute.arrays)[idx] = value.get<UInt64>(); break;
+            case AttributeUnderlyingTypeTest::Int8: std::get<ContainerPtrType<Int8>>(attribute.arrays)[idx] = value.get<Int64>(); break;
+            case AttributeUnderlyingTypeTest::Int16: std::get<ContainerPtrType<Int16>>(attribute.arrays)[idx] = value.get<Int64>(); break;
+            case AttributeUnderlyingTypeTest::Int32: std::get<ContainerPtrType<Int32>>(attribute.arrays)[idx] = static_cast<Int32>(value.get<Int64>()); break;
+            case AttributeUnderlyingTypeTest::Int64: std::get<ContainerPtrType<Int64>>(attribute.arrays)[idx] = value.get<Int64>(); break;
+            case AttributeUnderlyingTypeTest::Float32: std::get<ContainerPtrType<Float32>>(attribute.arrays)[idx] = static_cast<Float32>(value.get<Float64>()); break;
+            case AttributeUnderlyingTypeTest::Float64: std::get<ContainerPtrType<Float64>>(attribute.arrays)[idx] = value.get<Float64>(); break;
             case AttributeUnderlyingTypeTest::String:
             {
-                const auto & string = value.safeGet<String>();
+                const auto & string = value.get<String>();
                 auto & string_ref = std::get<ContainerPtrType<StringRef>>(attribute.arrays)[idx];
                 const auto & null_value_ref = std::get<String>(attribute.null_values);
 
diff --git a/src/Common/examples/utf8_upper_lower.cpp b/src/Common/examples/utf8_upper_lower.cpp
deleted file mode 100644
index 826e1763105..00000000000
--- a/src/Common/examples/utf8_upper_lower.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <iostream>
-#include <unicode/unistr.h>
-
-std::string utf8_to_lower(const std::string & input)
-{
-    icu::UnicodeString unicodeInput(input.c_str(), "UTF-8");
-    unicodeInput.toLower();
-    std::string output;
-    unicodeInput.toUTF8String(output);
-    return output;
-}
-
-std::string utf8_to_upper(const std::string & input)
-{
-    icu::UnicodeString unicodeInput(input.c_str(), "UTF-8");
-    unicodeInput.toUpper();
-    std::string output;
-    unicodeInput.toUTF8String(output);
-    return output;
-}
-
-int main()
-{
-    std::string input = "ır";
-    std::cout << "upper:" << utf8_to_upper(input) << std::endl;
-    return 0;
-}
diff --git a/src/Common/mysqlxx/tests/CMakeLists.txt b/src/Common/mysqlxx/tests/CMakeLists.txt
index 53bee778470..c560d0e3153 100644
--- a/src/Common/mysqlxx/tests/CMakeLists.txt
+++ b/src/Common/mysqlxx/tests/CMakeLists.txt
@@ -1,2 +1,2 @@
 clickhouse_add_executable (mysqlxx_pool_test mysqlxx_pool_test.cpp)
-target_link_libraries (mysqlxx_pool_test PRIVATE mysqlxx clickhouse_common_config loggers_no_text_log)
+target_link_libraries (mysqlxx_pool_test PRIVATE mysqlxx)
diff --git a/src/Common/parseRemoteDescription.cpp b/src/Common/parseRemoteDescription.cpp
index 6a53098362d..df3820b11f9 100644
--- a/src/Common/parseRemoteDescription.cpp
+++ b/src/Common/parseRemoteDescription.cpp
@@ -79,16 +79,11 @@ std::vector<String> parseRemoteDescription(
             /// Look for the corresponding closing bracket
             for (m = i + 1; m < r; ++m)
             {
-                if (description[m] == '{')
-                    ++cnt;
-                if (description[m] == '}')
-                    --cnt;
-                if (description[m] == '.' && description[m-1] == '.')
-                    last_dot = m;
-                if (description[m] == separator)
-                    have_splitter = true;
-                if (cnt == 0)
-                    break;
+                if (description[m] == '{') ++cnt;
+                if (description[m] == '}') --cnt;
+                if (description[m] == '.' && description[m-1] == '.') last_dot = m;
+                if (description[m] == separator) have_splitter = true;
+                if (cnt == 0) break;
             }
             if (cnt != 0)
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table function '{}': incorrect brace sequence in first argument", func_name);
diff --git a/src/Common/tests/gtest_cgroups_reader.cpp b/src/Common/tests/gtest_cgroups_reader.cpp
deleted file mode 100644
index e24b91a59b8..00000000000
--- a/src/Common/tests/gtest_cgroups_reader.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-#if defined(OS_LINUX)
-
-#include <gtest/gtest.h>
-
-#include <cstdint>
-#include <filesystem>
-
-#include <IO/WriteBufferFromFile.h>
-#include <Common/MemoryWorker.h>
-#include <Common/filesystemHelpers.h>
-
-using namespace DB;
-
-
-const std::string SAMPLE_FILE[2] = {
-    R"(cache 4673703936
-rss 2232029184
-rss_huge 0
-shmem 0
-mapped_file 344678400
-dirty 4730880
-writeback 135168
-swap 0
-pgpgin 2038569918
-pgpgout 2036883790
-pgfault 2055373287
-pgmajfault 0
-inactive_anon 2156335104
-active_anon 0
-inactive_file 2841305088
-active_file 1653915648
-unevictable 256008192
-hierarchical_memory_limit 8589934592
-hierarchical_memsw_limit 8589934592
-total_cache 4673703936
-total_rss 2232029184
-total_rss_huge 0
-total_shmem 0
-total_mapped_file 344678400
-total_dirty 4730880
-total_writeback 135168
-total_swap 0
-total_pgpgin 2038569918
-total_pgpgout 2036883790
-total_pgfault 2055373287
-total_pgmajfault 0
-total_inactive_anon 2156335104
-total_active_anon 0
-total_inactive_file 2841305088
-total_active_file 1653915648
-total_unevictable 256008192
-)",
-    R"(anon 10429399040
-file 17410793472
-kernel 1537789952
-kernel_stack 3833856
-pagetables 65441792
-sec_pagetables 0
-percpu 15232
-sock 0
-vmalloc 0
-shmem 0
-zswap 0
-zswapped 0
-file_mapped 344010752
-file_dirty 2060857344
-file_writeback 0
-swapcached 0
-anon_thp 0
-file_thp 0
-shmem_thp 0
-inactive_anon 0
-active_anon 10429370368
-inactive_file 8693084160
-active_file 8717561856
-unevictable 0
-slab_reclaimable 1460982504
-slab_unreclaimable 5152864
-slab 1466135368
-workingset_refault_anon 0
-workingset_refault_file 0
-workingset_activate_anon 0
-workingset_activate_file 0
-workingset_restore_anon 0
-workingset_restore_file 0
-workingset_nodereclaim 0
-pgscan 0
-pgsteal 0
-pgscan_kswapd 0
-pgscan_direct 0
-pgscan_khugepaged 0
-pgsteal_kswapd 0
-pgsteal_direct 0
-pgsteal_khugepaged 0
-pgfault 43026352
-pgmajfault 36762
-pgrefill 0
-pgactivate 0
-pgdeactivate 0
-pglazyfree 259
-pglazyfreed 0
-zswpin 0
-zswpout 0
-thp_fault_alloc 0
-thp_collapse_alloc 0
-)"};
-
-const std::string EXPECTED[2]
-    = {"{\"active_anon\": 0, \"active_file\": 1653915648, \"cache\": 4673703936, \"dirty\": 4730880, \"hierarchical_memory_limit\": "
-       "8589934592, \"hierarchical_memsw_limit\": 8589934592, \"inactive_anon\": 2156335104, \"inactive_file\": 2841305088, "
-       "\"mapped_file\": 344678400, \"pgfault\": 2055373287, \"pgmajfault\": 0, \"pgpgin\": 2038569918, \"pgpgout\": 2036883790, \"rss\": "
-       "2232029184, \"rss_huge\": 0, \"shmem\": 0, \"swap\": 0, \"total_active_anon\": 0, \"total_active_file\": 1653915648, "
-       "\"total_cache\": 4673703936, \"total_dirty\": 4730880, \"total_inactive_anon\": 2156335104, \"total_inactive_file\": 2841305088, "
-       "\"total_mapped_file\": 344678400, \"total_pgfault\": 2055373287, \"total_pgmajfault\": 0, \"total_pgpgin\": 2038569918, "
-       "\"total_pgpgout\": 2036883790, \"total_rss\": 2232029184, \"total_rss_huge\": 0, \"total_shmem\": 0, \"total_swap\": 0, "
-       "\"total_unevictable\": 256008192, \"total_writeback\": 135168, \"unevictable\": 256008192, \"writeback\": 135168}",
-       "{\"active_anon\": 10429370368, \"active_file\": 8717561856, \"anon\": 10429399040, \"anon_thp\": 0, \"file\": 17410793472, "
-       "\"file_dirty\": 2060857344, \"file_mapped\": 344010752, \"file_thp\": 0, \"file_writeback\": 0, \"inactive_anon\": 0, "
-       "\"inactive_file\": 8693084160, \"kernel\": 1537789952, \"kernel_stack\": 3833856, \"pagetables\": 65441792, \"percpu\": 15232, "
-       "\"pgactivate\": 0, \"pgdeactivate\": 0, \"pgfault\": 43026352, \"pglazyfree\": 259, \"pglazyfreed\": 0, \"pgmajfault\": 36762, "
-       "\"pgrefill\": 0, \"pgscan\": 0, \"pgscan_direct\": 0, \"pgscan_khugepaged\": 0, \"pgscan_kswapd\": 0, \"pgsteal\": 0, "
-       "\"pgsteal_direct\": 0, \"pgsteal_khugepaged\": 0, \"pgsteal_kswapd\": 0, \"sec_pagetables\": 0, \"shmem\": 0, \"shmem_thp\": 0, "
-       "\"slab\": 1466135368, \"slab_reclaimable\": 1460982504, \"slab_unreclaimable\": 5152864, \"sock\": 0, \"swapcached\": 0, "
-       "\"thp_collapse_alloc\": 0, \"thp_fault_alloc\": 0, \"unevictable\": 0, \"vmalloc\": 0, \"workingset_activate_anon\": 0, "
-       "\"workingset_activate_file\": 0, \"workingset_nodereclaim\": 0, \"workingset_refault_anon\": 0, \"workingset_refault_file\": 0, "
-       "\"workingset_restore_anon\": 0, \"workingset_restore_file\": 0, \"zswap\": 0, \"zswapped\": 0, \"zswpin\": 0, \"zswpout\": 0}"};
-
-
-class CgroupsMemoryUsageObserverFixture : public ::testing::TestWithParam<ICgroupsReader::CgroupsVersion>
-{
-    void SetUp() override
-    {
-        const uint8_t version = static_cast<uint8_t>(GetParam());
-        tmp_dir = fmt::format("./test_cgroups_{}", magic_enum::enum_name(GetParam()));
-        fs::create_directories(tmp_dir);
-
-        auto stat_file = WriteBufferFromFile(tmp_dir + "/memory.stat");
-        stat_file.write(SAMPLE_FILE[version].data(), SAMPLE_FILE[version].size());
-        stat_file.sync();
-
-        if (GetParam() == ICgroupsReader::CgroupsVersion::V2)
-        {
-            auto current_file = WriteBufferFromFile(tmp_dir + "/memory.current");
-            current_file.write("29645422592", 11);
-            current_file.sync();
-        }
-    }
-
-protected:
-    std::string tmp_dir;
-};
-
-
-TEST_P(CgroupsMemoryUsageObserverFixture, ReadMemoryUsageTest)
-{
-    const auto version = GetParam();
-    auto reader = ICgroupsReader::createCgroupsReader(version, tmp_dir);
-    ASSERT_EQ(
-        reader->readMemoryUsage(),
-        version == ICgroupsReader::CgroupsVersion::V1 ? /* rss from memory.stat */ 2232029184
-                                                                  : /* anon from memory.stat */ 10429399040);
-}
-
-
-TEST_P(CgroupsMemoryUsageObserverFixture, DumpAllStatsTest)
-{
-    const auto version = GetParam();
-    auto reader = ICgroupsReader::createCgroupsReader(version, tmp_dir);
-    ASSERT_EQ(reader->dumpAllStats(), EXPECTED[static_cast<uint8_t>(version)]);
-}
-
-
-INSTANTIATE_TEST_SUITE_P(
-    CgroupsMemoryUsageObserverTests,
-    CgroupsMemoryUsageObserverFixture,
-    ::testing::Values(ICgroupsReader::CgroupsVersion::V1, ICgroupsReader::CgroupsVersion::V2));
-
-#endif
diff --git a/src/Common/tests/gtest_config_host_validation.cpp b/src/Common/tests/gtest_config_host_validation.cpp
deleted file mode 100644
index b51e11f6f8a..00000000000
--- a/src/Common/tests/gtest_config_host_validation.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include <Poco/AutoPtr.h>
-#include <Poco/DOM/DOMParser.h>
-#include <Poco/Util/XMLConfiguration.h>
-
-#include <gtest/gtest.h>
-
-TEST(Common, ConfigHostValidation)
-{
-    std::string xml(R"CONFIG(<clickhouse>
-    <IPv4_1>0.0.0.0</IPv4_1>
-    <IPv4_2>192.168.0.1</IPv4_2>
-    <IPv4_3>127.0.0.1</IPv4_3>
-    <IPv4_4>255.255.255.255</IPv4_4>
-    <IPv6_1>2001:0db8:85a3:0000:0000:8a2e:0370:7334</IPv6_1>
-    <IPv6_2>2001:DB8::8a2e:370:7334</IPv6_2>
-    <IPv6_3>::1</IPv6_3>
-    <IPv6_4>::</IPv6_4>
-    <Domain_1>www.example.com.</Domain_1>
-    <Domain_2>a.co</Domain_2>
-    <Domain_3>localhost</Domain_3>
-    <Domain_4>xn--fiqs8s.xn--fiqz9s</Domain_4>
-    <IPv4_Invalid_1>192.168.1.256</IPv4_Invalid_1>
-    <IPv4_Invalid_2>192.168.1.1.1</IPv4_Invalid_2>
-    <IPv4_Invalid_3>192.168.1.99999999999999999999</IPv4_Invalid_3>
-    <IPv4_Invalid_4>192.168.1.a</IPv4_Invalid_4>
-    <IPv6_Invalid_1>2001:0db8:85a3:::8a2e:0370:7334</IPv6_Invalid_1>
-    <IPv6_Invalid_2>1200::AB00:1234::2552:7777:1313</IPv6_Invalid_2>
-    <IPv6_Invalid_3>1200::AB00:1234:Q000:2552:7777:1313</IPv6_Invalid_3>
-    <IPv6_Invalid_4>1200:AB00:1234:2552:7777:1313:FFFF</IPv6_Invalid_4>
-    <Domain_Invalid_1>example.com..</Domain_Invalid_1>
-    <Domain_Invalid_2>5example.com</Domain_Invalid_2>
-    <Domain_Invalid_3>example.com-</Domain_Invalid_3>
-    <Domain_Invalid_4>exa_mple.com</Domain_Invalid_4>
-</clickhouse>)CONFIG");
-
-    Poco::XML::DOMParser dom_parser;
-    Poco::AutoPtr<Poco::XML::Document> document = dom_parser.parseString(xml);
-    Poco::AutoPtr<Poco::Util::XMLConfiguration> config = new Poco::Util::XMLConfiguration(document);
-
-    EXPECT_NO_THROW(config->getHost("IPv4_1"));
-    EXPECT_NO_THROW(config->getHost("IPv4_2"));
-    EXPECT_NO_THROW(config->getHost("IPv4_3"));
-    EXPECT_NO_THROW(config->getHost("IPv4_4"));
-
-    EXPECT_NO_THROW(config->getHost("IPv6_1"));
-    EXPECT_NO_THROW(config->getHost("IPv6_2"));
-    EXPECT_NO_THROW(config->getHost("IPv6_3"));
-    EXPECT_NO_THROW(config->getHost("IPv6_4"));
-
-    EXPECT_NO_THROW(config->getHost("Domain_1"));
-    EXPECT_NO_THROW(config->getHost("Domain_2"));
-    EXPECT_NO_THROW(config->getHost("Domain_3"));
-    EXPECT_NO_THROW(config->getHost("Domain_4"));
-
-    EXPECT_THROW(config->getHost("IPv4_Invalid_1"), Poco::SyntaxException);
-    EXPECT_THROW(config->getHost("IPv4_Invalid_2"), Poco::SyntaxException);
-    EXPECT_THROW(config->getHost("IPv4_Invalid_3"), Poco::SyntaxException);
-    EXPECT_THROW(config->getHost("IPv4_Invalid_4"), Poco::SyntaxException);
-
-    EXPECT_THROW(config->getHost("IPv6_Invalid_1"), Poco::SyntaxException);
-    EXPECT_THROW(config->getHost("IPv6_Invalid_2"), Poco::SyntaxException);
-    EXPECT_THROW(config->getHost("IPv6_Invalid_3"), Poco::SyntaxException);
-    EXPECT_THROW(config->getHost("IPv6_Invalid_4"), Poco::SyntaxException);
-
-    EXPECT_THROW(config->getHost("Domain_Invalid_1"), Poco::SyntaxException);
-    EXPECT_THROW(config->getHost("Domain_Invalid_2"), Poco::SyntaxException);
-    EXPECT_THROW(config->getHost("Domain_Invalid_3"), Poco::SyntaxException);
-    EXPECT_THROW(config->getHost("Domain_Invalid_4"), Poco::SyntaxException);
-}
diff --git a/src/Common/tests/gtest_event_rate_meter.cpp b/src/Common/tests/gtest_event_rate_meter.cpp
deleted file mode 100644
index 91ceec5eef7..00000000000
--- a/src/Common/tests/gtest_event_rate_meter.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-#include <gtest/gtest.h>
-
-#include <Common/EventRateMeter.h>
-
-#include <cmath>
-
-
-TEST(EventRateMeter, ExponentiallySmoothedAverage)
-{
-    double target = 100.0;
-
-    // The test is only correct for timestep of 1 second because of
-    // how sum of weights is implemented inside `ExponentiallySmoothedAverage`
-    double time_step = 1.0;
-
-    for (double half_decay_time : { 0.1, 1.0, 10.0, 100.0})
-    {
-        DB::ExponentiallySmoothedAverage esa;
-
-        int steps = static_cast<int>(half_decay_time * 30 / time_step);
-        for (int i = 1; i <= steps; ++i)
-            esa.add(target * time_step, i * time_step, half_decay_time);
-        double measured = esa.get(half_decay_time);
-        ASSERT_LE(std::fabs(measured - target), 1e-5 * target);
-    }
-}
-
-TEST(EventRateMeter, ConstantRate)
-{
-    double target = 100.0;
-
-    for (double period : {0.1, 1.0, 10.0})
-    {
-        for (double time_step : {0.001, 0.01, 0.1, 1.0})
-        {
-            DB::EventRateMeter erm(0.0, period);
-
-            int steps = static_cast<int>(period * 30 / time_step);
-            for (int i = 1; i <= steps; ++i)
-                erm.add(i * time_step, target * time_step);
-            double measured = erm.rate(steps * time_step);
-            // std::cout << "T=" << period << " dt=" << time_step << " measured=" << measured << std::endl;
-            ASSERT_LE(std::fabs(measured - target), 1e-5 * target);
-        }
-    }
-}
-
-TEST(EventRateMeter, PreciseStart)
-{
-    double target = 100.0;
-
-    for (double period : {0.1, 1.0, 10.0})
-    {
-        for (double time_step : {0.001, 0.01, 0.1, 1.0})
-        {
-            DB::EventRateMeter erm(0.0, period);
-
-            int steps = static_cast<int>(period / time_step);
-            for (int i = 1; i <= steps; ++i)
-            {
-                erm.add(i * time_step, target * time_step);
-                double measured = erm.rate(i * time_step);
-                // std::cout << "T=" << period << " dt=" << time_step << " measured=" << measured << std::endl;
-                ASSERT_LE(std::fabs(measured - target), 1e-5 * target);
-            }
-        }
-    }
-}
diff --git a/src/Common/tests/gtest_lsan.cpp b/src/Common/tests/gtest_lsan.cpp
index 7fc4ad2749e..f6e1984ec58 100644
--- a/src/Common/tests/gtest_lsan.cpp
+++ b/src/Common/tests/gtest_lsan.cpp
@@ -14,21 +14,20 @@
 /// because of broken getauxval() [1].
 ///
 ///   [1]: https://github.com/ClickHouse/ClickHouse/pull/33957
-TEST(SanitizerDeathTest, LSan)
+TEST(Common, LSan)
 {
-    EXPECT_DEATH(
-        {
-            std::thread leak_in_thread(
-                []()
-                {
-                    void * leak = malloc(4096);
-                    ASSERT_NE(leak, nullptr);
-                });
-            leak_in_thread.join();
+    int sanitizers_exit_code = 1;
 
-            __lsan_do_leak_check();
-        },
-        ".*LeakSanitizer: detected memory leaks.*");
+    ASSERT_EXIT({
+        std::thread leak_in_thread([]()
+        {
+            void * leak = malloc(4096);
+            ASSERT_NE(leak, nullptr);
+        });
+        leak_in_thread.join();
+
+        __lsan_do_leak_check();
+    }, ::testing::ExitedWithCode(sanitizers_exit_code), ".*LeakSanitizer: detected memory leaks.*");
 }
 
 #endif
diff --git a/src/Common/tests/gtest_optimize_re.cpp b/src/Common/tests/gtest_optimize_re.cpp
index d6735c3ccfe..a9fcb918b24 100644
--- a/src/Common/tests/gtest_optimize_re.cpp
+++ b/src/Common/tests/gtest_optimize_re.cpp
@@ -19,9 +19,6 @@ TEST(OptimizeRE, analyze)
     };
     test_f("abc", "abc", {}, true, true);
     test_f("c([^k]*)de", "");
-    test_f("(?-s)bob", "bob", {}, false, true);
-    test_f("(?s)bob", "bob", {}, false, true);
-    test_f("(?ssss", "");
     test_f("abc(de)fg", "abcdefg", {}, false, true);
     test_f("abc(de|xyz)fg", "abc", {"abcdefg", "abcxyzfg"}, false, true);
     test_f("abc(de?f|xyz)fg", "abc", {"abcd", "abcxyzfg"}, false, true);
diff --git a/src/Common/tests/gtest_resolve_pool.cpp b/src/Common/tests/gtest_resolve_pool.cpp
index c443e961cc7..b760b9b1524 100644
--- a/src/Common/tests/gtest_resolve_pool.cpp
+++ b/src/Common/tests/gtest_resolve_pool.cpp
@@ -33,7 +33,7 @@ size_t toMilliseconds(auto duration)
    return std::chrono::duration_cast<std::chrono::milliseconds>(duration).count();
 }
 
-const auto epsilon = 1ms;
+const auto epsilon = 500us;
 
 class ResolvePoolMock : public DB::HostResolver
 {
@@ -358,60 +358,54 @@ void check_no_failed_address(size_t iteration, auto & resolver, auto & addresses
 
 TEST_F(ResolvePoolTest, BannedForConsiquenceFail)
 {
-    auto history = 10ms;
+    auto history = 5ms;
     auto resolver = make_resolver(toMilliseconds(history));
 
     auto failed_addr = resolver->resolve();
     ASSERT_TRUE(addresses.contains(*failed_addr));
 
-
-    failed_addr.setFail();
     auto start_at = now();
 
+    failed_addr.setFail();
     ASSERT_EQ(3, CurrentMetrics::get(metrics.active_count));
     ASSERT_EQ(1, CurrentMetrics::get(metrics.banned_count));
     check_no_failed_address(1, resolver, addresses, failed_addr, metrics, start_at + history - epsilon);
 
     sleep_until(start_at + history + epsilon);
+    start_at = now();
 
     resolver->update();
     ASSERT_EQ(3, CurrentMetrics::get(metrics.active_count));
     ASSERT_EQ(0, CurrentMetrics::get(metrics.banned_count));
 
     failed_addr.setFail();
-    start_at = now();
-
     check_no_failed_address(2, resolver, addresses, failed_addr, metrics, start_at + history - epsilon);
 
     sleep_until(start_at + history + epsilon);
+    start_at = now();
 
     resolver->update();
-
-    // too much time has passed
-    if (now() > start_at + 2*history - epsilon)
-        return;
-
     ASSERT_EQ(3, CurrentMetrics::get(metrics.active_count));
     ASSERT_EQ(1, CurrentMetrics::get(metrics.banned_count));
 
     // ip still banned adter history_ms + update, because it was his second consiquent fail
-    check_no_failed_address(2, resolver, addresses, failed_addr, metrics, start_at + 2*history - epsilon);
+    check_no_failed_address(2, resolver, addresses, failed_addr, metrics, start_at + history - epsilon);
 }
 
 TEST_F(ResolvePoolTest, NoAditionalBannForConcurrentFail)
 {
-    auto history = 10ms;
+    auto history = 5ms;
     auto resolver = make_resolver(toMilliseconds(history));
 
     auto failed_addr = resolver->resolve();
     ASSERT_TRUE(addresses.contains(*failed_addr));
 
-    failed_addr.setFail();
-    failed_addr.setFail();
-    failed_addr.setFail();
-
     auto start_at = now();
 
+    failed_addr.setFail();
+    failed_addr.setFail();
+    failed_addr.setFail();
+
     ASSERT_EQ(3, CurrentMetrics::get(metrics.active_count));
     ASSERT_EQ(1, CurrentMetrics::get(metrics.banned_count));
     check_no_failed_address(3, resolver, addresses, failed_addr, metrics, start_at + history - epsilon);
@@ -419,7 +413,6 @@ TEST_F(ResolvePoolTest, NoAditionalBannForConcurrentFail)
     sleep_until(start_at + history + epsilon);
 
     resolver->update();
-
     // ip is cleared after just 1 history_ms interval.
     ASSERT_EQ(3, CurrentMetrics::get(metrics.active_count));
     ASSERT_EQ(0, CurrentMetrics::get(metrics.banned_count));
diff --git a/src/Compression/CompressedReadBufferBase.cpp b/src/Compression/CompressedReadBufferBase.cpp
index 907e87a6d30..e416fadc829 100644
--- a/src/Compression/CompressedReadBufferBase.cpp
+++ b/src/Compression/CompressedReadBufferBase.cpp
@@ -39,7 +39,7 @@ using Checksum = CityHash_v1_0_2::uint128;
 
 
 /// Validate checksum of data, and if it mismatches, find out possible reason and throw exception.
-static void validateChecksum(char * data, size_t size, const Checksum expected_checksum, bool external_data)
+static void validateChecksum(char * data, size_t size, const Checksum expected_checksum)
 {
     auto calculated_checksum = CityHash_v1_0_2::CityHash128(data, size);
     if (expected_checksum == calculated_checksum)
@@ -64,8 +64,6 @@ static void validateChecksum(char * data, size_t size, const Checksum expected_c
                                             "this can be caused by disk bit rot. This exception protects ClickHouse "
                                             "from data corruption due to hardware failures.";
 
-    int error_code = external_data ? ErrorCodes::CANNOT_DECOMPRESS : ErrorCodes::CHECKSUM_DOESNT_MATCH;
-
     auto flip_bit = [](char * buf, size_t pos)
     {
         buf[pos / 8] ^= 1 << pos % 8;
@@ -89,7 +87,7 @@ static void validateChecksum(char * data, size_t size, const Checksum expected_c
             {
                 message << ". The mismatch is caused by single bit flip in data block at byte " << (bit_pos / 8) << ", bit " << (bit_pos % 8) << ". "
                     << message_hardware_failure;
-                throw Exception::createDeprecated(message.str(), error_code);
+                throw Exception::createDeprecated(message.str(), ErrorCodes::CHECKSUM_DOESNT_MATCH);
             }
 
             flip_bit(tmp_data, bit_pos);    /// Restore
@@ -104,10 +102,10 @@ static void validateChecksum(char * data, size_t size, const Checksum expected_c
     {
         message << ". The mismatch is caused by single bit flip in checksum. "
             << message_hardware_failure;
-        throw Exception::createDeprecated(message.str(), error_code);
+        throw Exception::createDeprecated(message.str(), ErrorCodes::CHECKSUM_DOESNT_MATCH);
     }
 
-    throw Exception::createDeprecated(message.str(), error_code);
+    throw Exception::createDeprecated(message.str(), ErrorCodes::CHECKSUM_DOESNT_MATCH);
 }
 
 static void readHeaderAndGetCodecAndSize(
@@ -153,7 +151,7 @@ static void readHeaderAndGetCodecAndSize(
                         "Most likely corrupted data.", size_compressed_without_checksum);
 
     if (size_compressed_without_checksum < header_size)
-        throw Exception(external_data ? ErrorCodes::CANNOT_DECOMPRESS : ErrorCodes::CORRUPTED_DATA, "Can't decompress data: "
+        throw Exception(ErrorCodes::CORRUPTED_DATA, "Can't decompress data: "
             "the compressed data size ({}, this should include header size) is less than the header size ({})",
             size_compressed_without_checksum, static_cast<size_t>(header_size));
 }
@@ -204,7 +202,7 @@ size_t CompressedReadBufferBase::readCompressedData(size_t & size_decompressed,
         readBinaryLittleEndian(checksum.low64, checksum_in);
         readBinaryLittleEndian(checksum.high64, checksum_in);
 
-        validateChecksum(compressed_buffer, size_compressed_without_checksum, checksum, external_data);
+        validateChecksum(compressed_buffer, size_compressed_without_checksum, checksum);
     }
 
     ProfileEvents::increment(ProfileEvents::ReadCompressedBytes, size_compressed_without_checksum + sizeof(Checksum));
@@ -249,7 +247,7 @@ size_t CompressedReadBufferBase::readCompressedDataBlockForAsynchronous(size_t &
             readBinaryLittleEndian(checksum.low64, checksum_in);
             readBinaryLittleEndian(checksum.high64, checksum_in);
 
-            validateChecksum(compressed_buffer, size_compressed_without_checksum, checksum, external_data);
+            validateChecksum(compressed_buffer, size_compressed_without_checksum, checksum);
         }
 
         ProfileEvents::increment(ProfileEvents::ReadCompressedBytes, size_compressed_without_checksum + sizeof(Checksum));
@@ -309,7 +307,7 @@ void CompressedReadBufferBase::decompress(BufferBase::Buffer & to, size_t size_d
 
         UInt8 header_size = ICompressionCodec::getHeaderSize();
         if (size_compressed_without_checksum < header_size)
-            throw Exception(external_data ? ErrorCodes::CANNOT_DECOMPRESS : ErrorCodes::CORRUPTED_DATA,
+            throw Exception(ErrorCodes::CORRUPTED_DATA,
                 "Can't decompress data: the compressed data size ({}, this should include header size) is less than the header size ({})",
                     size_compressed_without_checksum, static_cast<size_t>(header_size));
 
diff --git a/src/Compression/CompressedWriteBuffer.cpp b/src/Compression/CompressedWriteBuffer.cpp
index c3acfcb7da6..83c9fbc9573 100644
--- a/src/Compression/CompressedWriteBuffer.cpp
+++ b/src/Compression/CompressedWriteBuffer.cpp
@@ -55,29 +55,10 @@ void CompressedWriteBuffer::nextImpl()
 
         out.write(compressed_buffer.data(), compressed_size);
     }
-
-    /// Increase buffer size for next data if adaptive buffer size is used and nextImpl was called because of end of buffer.
-    if (!available() && use_adaptive_buffer_size && memory.size() < adaptive_buffer_max_size)
-    {
-        memory.resize(std::min(memory.size() * 2, adaptive_buffer_max_size));
-        BufferBase::set(memory.data(), memory.size(), 0);
-    }
 }
 
-void CompressedWriteBuffer::finalizeImpl()
-{
-    /// Don't try to resize buffer in nextImpl.
-    use_adaptive_buffer_size = false;
-    next();
-}
-
-CompressedWriteBuffer::CompressedWriteBuffer(
-    WriteBuffer & out_, CompressionCodecPtr codec_, size_t buf_size, bool use_adaptive_buffer_size_, size_t adaptive_buffer_initial_size)
-    : BufferWithOwnMemory<WriteBuffer>(use_adaptive_buffer_size_ ? adaptive_buffer_initial_size : buf_size)
-    , out(out_)
-    , codec(std::move(codec_))
-    , use_adaptive_buffer_size(use_adaptive_buffer_size_)
-    , adaptive_buffer_max_size(buf_size)
+CompressedWriteBuffer::CompressedWriteBuffer(WriteBuffer & out_, CompressionCodecPtr codec_, size_t buf_size)
+    : BufferWithOwnMemory<WriteBuffer>(buf_size), out(out_), codec(std::move(codec_))
 {
 }
 
diff --git a/src/Compression/CompressedWriteBuffer.h b/src/Compression/CompressedWriteBuffer.h
index 41596703bfe..6ae1fbee9cc 100644
--- a/src/Compression/CompressedWriteBuffer.h
+++ b/src/Compression/CompressedWriteBuffer.h
@@ -19,9 +19,7 @@ public:
     explicit CompressedWriteBuffer(
         WriteBuffer & out_,
         CompressionCodecPtr codec_ = CompressionCodecFactory::instance().getDefaultCodec(),
-        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
-        bool use_adaptive_buffer_size_ = false,
-        size_t adaptive_buffer_initial_size = DBMS_DEFAULT_INITIAL_ADAPTIVE_BUFFER_SIZE);
+        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE);
 
     ~CompressedWriteBuffer() override;
 
@@ -47,17 +45,10 @@ public:
 
 private:
     void nextImpl() override;
-    void finalizeImpl() override;
 
     WriteBuffer & out;
     CompressionCodecPtr codec;
 
-    /// If true, the size of internal buffer will be exponentially increased up to
-    /// adaptive_buffer_max_size after each nextImpl call. It can be used to avoid
-    /// large buffer allocation when actual size of written data is small.
-    bool use_adaptive_buffer_size;
-    size_t adaptive_buffer_max_size;
-
     PODArray<char> compressed_buffer;
 };
 
diff --git a/src/Compression/CompressionCodecDeflateQpl.cpp b/src/Compression/CompressionCodecDeflateQpl.cpp
index c82ee861a6f..f1b5b24e866 100644
--- a/src/Compression/CompressionCodecDeflateQpl.cpp
+++ b/src/Compression/CompressionCodecDeflateQpl.cpp
@@ -1,3 +1,7 @@
+#ifdef ENABLE_QPL_COMPRESSION
+
+#include <cstdio>
+#include <thread>
 #include <Compression/CompressionCodecDeflateQpl.h>
 #include <Compression/CompressionFactory.h>
 #include <Compression/CompressionInfo.h>
@@ -7,10 +11,6 @@
 #include <Common/randomSeed.h>
 #include <base/scope_guard.h>
 #include <base/getPageSize.h>
-#include <cstdio>
-#include <thread>
-
-#if USE_QPL
 
 #include "libaccel_config.h"
 
diff --git a/src/Compression/CompressionCodecDeflateQpl.h b/src/Compression/CompressionCodecDeflateQpl.h
index d9abc0fb7e0..86fd9051bd8 100644
--- a/src/Compression/CompressionCodecDeflateQpl.h
+++ b/src/Compression/CompressionCodecDeflateQpl.h
@@ -4,11 +4,6 @@
 #include <map>
 #include <random>
 #include <pcg_random.hpp>
-
-#include "config.h"
-
-#if USE_QPL
-
 #include <qpl/qpl.h>
 
 namespace Poco
@@ -122,4 +117,3 @@ private:
 };
 
 }
-#endif
diff --git a/src/Compression/CompressionCodecZSTDQAT.cpp b/src/Compression/CompressionCodecZSTDQAT.cpp
index e19b7e4a001..5a4ef70a30a 100644
--- a/src/Compression/CompressionCodecZSTDQAT.cpp
+++ b/src/Compression/CompressionCodecZSTDQAT.cpp
@@ -1,6 +1,4 @@
-#include "config.h"
-
-#if USE_QATLIB
+#ifdef ENABLE_ZSTD_QAT_CODEC
 
 #include <Common/logger_useful.h>
 #include <Compression/CompressionCodecZSTD.h>
@@ -8,7 +6,6 @@
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/IAST.h>
 #include <Poco/Logger.h>
-
 #include <qatseqprod.h>
 #include <zstd.h>
 
diff --git a/src/Compression/CompressionFactory.cpp b/src/Compression/CompressionFactory.cpp
index ac00f571568..2e7aa0d086f 100644
--- a/src/Compression/CompressionFactory.cpp
+++ b/src/Compression/CompressionFactory.cpp
@@ -1,20 +1,20 @@
+#include "config.h"
+
 #include <Compression/CompressionFactory.h>
-#include <Compression/CompressionCodecMultiple.h>
-#include <Compression/CompressionCodecNone.h>
-#include <IO/ReadBuffer.h>
-#include <IO/WriteHelpers.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
-#include <Parsers/ExpressionElementParsers.h>
-#include <Parsers/parseQuery.h>
-#include <Parsers/queryToString.h>
 #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>
 
 #include <boost/algorithm/string/join.hpp>
 
-#include "config.h"
-
 namespace DB
 {
 
@@ -175,11 +175,11 @@ void registerCodecNone(CompressionCodecFactory & factory);
 void registerCodecLZ4(CompressionCodecFactory & factory);
 void registerCodecLZ4HC(CompressionCodecFactory & factory);
 void registerCodecZSTD(CompressionCodecFactory & factory);
-#if USE_QATLIB
+#ifdef ENABLE_ZSTD_QAT_CODEC
 void registerCodecZSTDQAT(CompressionCodecFactory & factory);
 #endif
 void registerCodecMultiple(CompressionCodecFactory & factory);
-#if USE_QPL
+#ifdef ENABLE_QPL_COMPRESSION
 void registerCodecDeflateQpl(CompressionCodecFactory & factory);
 #endif
 
@@ -198,7 +198,7 @@ CompressionCodecFactory::CompressionCodecFactory()
     registerCodecNone(*this);
     registerCodecLZ4(*this);
     registerCodecZSTD(*this);
-#if USE_QATLIB
+#ifdef ENABLE_ZSTD_QAT_CODEC
     registerCodecZSTDQAT(*this);
 #endif
     registerCodecLZ4HC(*this);
@@ -209,7 +209,7 @@ CompressionCodecFactory::CompressionCodecFactory()
     registerCodecGorilla(*this);
     registerCodecEncrypted(*this);
     registerCodecFPC(*this);
-#if USE_QPL
+#ifdef ENABLE_QPL_COMPRESSION
     registerCodecDeflateQpl(*this);
 #endif
     registerCodecGCD(*this);
diff --git a/src/Compression/examples/CMakeLists.txt b/src/Compression/examples/CMakeLists.txt
index fee8cf89942..a7cc6bebf42 100644
--- a/src/Compression/examples/CMakeLists.txt
+++ b/src/Compression/examples/CMakeLists.txt
@@ -1,2 +1,2 @@
 clickhouse_add_executable (compressed_buffer compressed_buffer.cpp)
-target_link_libraries (compressed_buffer PRIVATE clickhouse_common_io clickhouse_common_config clickhouse_compression)
+target_link_libraries (compressed_buffer PRIVATE clickhouse_common_io clickhouse_compression)
diff --git a/src/Compression/fuzzers/CMakeLists.txt b/src/Compression/fuzzers/CMakeLists.txt
index 311f1eb3d35..a693faecc14 100644
--- a/src/Compression/fuzzers/CMakeLists.txt
+++ b/src/Compression/fuzzers/CMakeLists.txt
@@ -5,19 +5,19 @@
 # If you want really small size of the resulted binary, just link with fuzz_compression and clickhouse_common_io
 
 clickhouse_add_executable (compressed_buffer_fuzzer compressed_buffer_fuzzer.cpp)
-target_link_libraries (compressed_buffer_fuzzer PRIVATE dbms clickhouse_functions)
+target_link_libraries (compressed_buffer_fuzzer PRIVATE dbms)
 
 clickhouse_add_executable (lz4_decompress_fuzzer lz4_decompress_fuzzer.cpp)
-target_link_libraries (lz4_decompress_fuzzer PUBLIC dbms ch_contrib::lz4 clickhouse_functions)
+target_link_libraries (lz4_decompress_fuzzer PUBLIC dbms ch_contrib::lz4)
 
 clickhouse_add_executable (delta_decompress_fuzzer delta_decompress_fuzzer.cpp)
-target_link_libraries (delta_decompress_fuzzer PRIVATE dbms clickhouse_functions)
+target_link_libraries (delta_decompress_fuzzer PRIVATE dbms)
 
 clickhouse_add_executable (double_delta_decompress_fuzzer double_delta_decompress_fuzzer.cpp)
-target_link_libraries (double_delta_decompress_fuzzer PRIVATE dbms clickhouse_functions)
+target_link_libraries (double_delta_decompress_fuzzer PRIVATE dbms)
 
 clickhouse_add_executable (encrypted_decompress_fuzzer encrypted_decompress_fuzzer.cpp)
-target_link_libraries (encrypted_decompress_fuzzer PRIVATE dbms clickhouse_functions)
+target_link_libraries (encrypted_decompress_fuzzer PRIVATE dbms)
 
 clickhouse_add_executable (gcd_decompress_fuzzer gcd_decompress_fuzzer.cpp)
-target_link_libraries (gcd_decompress_fuzzer PRIVATE dbms clickhouse_functions)
+target_link_libraries (gcd_decompress_fuzzer PRIVATE dbms)
diff --git a/src/Coordination/KeeperAsynchronousMetrics.cpp b/src/Coordination/KeeperAsynchronousMetrics.cpp
index 157858f3c44..86166ffe31b 100644
--- a/src/Coordination/KeeperAsynchronousMetrics.cpp
+++ b/src/Coordination/KeeperAsynchronousMetrics.cpp
@@ -114,13 +114,8 @@ void updateKeeperInformation(KeeperDispatcher & keeper_dispatcher, AsynchronousM
 }
 
 KeeperAsynchronousMetrics::KeeperAsynchronousMetrics(
-    ContextPtr context_,
-    unsigned update_period_seconds,
-    const ProtocolServerMetricsFunc & protocol_server_metrics_func_,
-    bool update_jemalloc_epoch_,
-    bool update_rss_)
-    : AsynchronousMetrics(update_period_seconds, protocol_server_metrics_func_, update_jemalloc_epoch_, update_rss_)
-    , context(std::move(context_))
+    ContextPtr context_, unsigned update_period_seconds, const ProtocolServerMetricsFunc & protocol_server_metrics_func_)
+    : AsynchronousMetrics(update_period_seconds, protocol_server_metrics_func_), context(std::move(context_))
 {
 }
 
diff --git a/src/Coordination/KeeperAsynchronousMetrics.h b/src/Coordination/KeeperAsynchronousMetrics.h
index a2ab7cab756..ec0e60cbb6e 100644
--- a/src/Coordination/KeeperAsynchronousMetrics.h
+++ b/src/Coordination/KeeperAsynchronousMetrics.h
@@ -13,13 +13,9 @@ class KeeperAsynchronousMetrics : public AsynchronousMetrics
 {
 public:
     KeeperAsynchronousMetrics(
-        ContextPtr context_,
-        unsigned update_period_seconds,
-        const ProtocolServerMetricsFunc & protocol_server_metrics_func_,
-        bool update_jemalloc_epoch_,
-        bool update_rss_);
-
+        ContextPtr context_, unsigned update_period_seconds, const ProtocolServerMetricsFunc & protocol_server_metrics_func_);
     ~KeeperAsynchronousMetrics() override;
+
 private:
     ContextPtr context;
 
diff --git a/src/Coordination/KeeperConstants.h b/src/Coordination/KeeperConstants.h
index d984d077872..08a7c85585a 100644
--- a/src/Coordination/KeeperConstants.h
+++ b/src/Coordination/KeeperConstants.h
@@ -11,7 +11,6 @@ enum class KeeperApiVersion : uint8_t
     WITH_FILTERED_LIST,
     WITH_MULTI_READ,
     WITH_CHECK_NOT_EXISTS,
-    WITH_REMOVE_RECURSIVE,
 };
 
 const String keeper_system_path = "/keeper";
diff --git a/src/Coordination/KeeperContext.cpp b/src/Coordination/KeeperContext.cpp
index dd2c1d59d56..1f66882ecad 100644
--- a/src/Coordination/KeeperContext.cpp
+++ b/src/Coordination/KeeperContext.cpp
@@ -23,7 +23,6 @@
 #if USE_ROCKSDB
 #include <rocksdb/table.h>
 #include <rocksdb/convenience.h>
-#include <rocksdb/statistics.h>
 #include <rocksdb/utilities/db_ttl.h>
 #endif
 
@@ -89,7 +88,7 @@ static rocksdb::Options getRocksDBOptionsFromConfig(const Poco::Util::AbstractCo
     if (config.has("keeper_server.rocksdb.options"))
     {
         auto config_options = getOptionsFromConfig(config, "keeper_server.rocksdb.options");
-        status = rocksdb::GetDBOptionsFromMap({}, merged, config_options, &merged);
+        status = rocksdb::GetDBOptionsFromMap(merged, config_options, &merged);
         if (!status.ok())
         {
             throw Exception(ErrorCodes::ROCKSDB_ERROR, "Fail to merge rocksdb options from 'rocksdb.options' : {}",
@@ -99,7 +98,7 @@ static rocksdb::Options getRocksDBOptionsFromConfig(const Poco::Util::AbstractCo
     if (config.has("rocksdb.column_family_options"))
     {
         auto column_family_options = getOptionsFromConfig(config, "rocksdb.column_family_options");
-        status = rocksdb::GetColumnFamilyOptionsFromMap({}, merged, column_family_options, &merged);
+        status = rocksdb::GetColumnFamilyOptionsFromMap(merged, column_family_options, &merged);
         if (!status.ok())
         {
             throw Exception(ErrorCodes::ROCKSDB_ERROR, "Fail to merge rocksdb options from 'rocksdb.column_family_options' at: {}", status.ToString());
@@ -108,7 +107,7 @@ static rocksdb::Options getRocksDBOptionsFromConfig(const Poco::Util::AbstractCo
     if (config.has("rocksdb.block_based_table_options"))
     {
         auto block_based_table_options = getOptionsFromConfig(config, "rocksdb.block_based_table_options");
-        status = rocksdb::GetBlockBasedTableOptionsFromMap({}, table_options, block_based_table_options, &table_options);
+        status = rocksdb::GetBlockBasedTableOptionsFromMap(table_options, block_based_table_options, &table_options);
         if (!status.ok())
         {
             throw Exception(ErrorCodes::ROCKSDB_ERROR, "Fail to merge rocksdb options from 'rocksdb.block_based_table_options' at: {}", status.ToString());
diff --git a/src/Coordination/KeeperDispatcher.cpp b/src/Coordination/KeeperDispatcher.cpp
index 142bd3b7c71..4a350077596 100644
--- a/src/Coordination/KeeperDispatcher.cpp
+++ b/src/Coordination/KeeperDispatcher.cpp
@@ -91,12 +91,6 @@ bool checkIfRequestIncreaseMem(const Coordination::ZooKeeperRequestPtr & request
                     memory_delta -= remove_req.bytesSize();
                     break;
                 }
-                case Coordination::OpNum::RemoveRecursive:
-                {
-                    Coordination::ZooKeeperRemoveRecursiveRequest & remove_req = dynamic_cast<Coordination::ZooKeeperRemoveRecursiveRequest &>(*sub_zk_request);
-                    memory_delta -= remove_req.bytesSize();
-                    break;
-                }
                 default:
                     break;
             }
@@ -154,14 +148,7 @@ void KeeperDispatcher::requestThread()
                 Int64 mem_soft_limit = keeper_context->getKeeperMemorySoftLimit();
                 if (configuration_and_settings->standalone_keeper && isExceedingMemorySoftLimit() && checkIfRequestIncreaseMem(request.request))
                 {
-                    LOG_WARNING(
-                        log,
-                        "Processing requests refused because of max_memory_usage_soft_limit {}, the total allocated memory is {}, RSS is {}, request type "
-                        "is {}",
-                        ReadableSize(mem_soft_limit),
-                        ReadableSize(total_memory_tracker.get()),
-                        ReadableSize(total_memory_tracker.getRSS()),
-                        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;
                 }
diff --git a/src/Coordination/KeeperFeatureFlags.h b/src/Coordination/KeeperFeatureFlags.h
index e70bd50cc88..4e26ca60736 100644
--- a/src/Coordination/KeeperFeatureFlags.h
+++ b/src/Coordination/KeeperFeatureFlags.h
@@ -12,7 +12,6 @@ enum class KeeperFeatureFlag : size_t
     MULTI_READ,
     CHECK_NOT_EXISTS,
     CREATE_IF_NOT_EXISTS,
-    REMOVE_RECURSIVE,
 };
 
 class KeeperFeatureFlags
diff --git a/src/Coordination/KeeperServer.cpp b/src/Coordination/KeeperServer.cpp
index 918f24efb2c..f09ea56391a 100644
--- a/src/Coordination/KeeperServer.cpp
+++ b/src/Coordination/KeeperServer.cpp
@@ -602,7 +602,7 @@ bool KeeperServer::isLeaderAlive() const
 bool KeeperServer::isExceedingMemorySoftLimit() const
 {
     Int64 mem_soft_limit = keeper_context->getKeeperMemorySoftLimit();
-    return mem_soft_limit > 0 && std::max(total_memory_tracker.get(), total_memory_tracker.getRSS()) >= mem_soft_limit;
+    return mem_soft_limit > 0 && total_memory_tracker.get() >= mem_soft_limit;
 }
 
 /// TODO test whether taking failed peer in count
diff --git a/src/Coordination/KeeperSnapshotManager.cpp b/src/Coordination/KeeperSnapshotManager.cpp
index 2ed89c414ff..3f5ac055470 100644
--- a/src/Coordination/KeeperSnapshotManager.cpp
+++ b/src/Coordination/KeeperSnapshotManager.cpp
@@ -54,7 +54,7 @@ namespace
         std::filesystem::path path(snapshot_path);
         std::string filename = path.stem();
         Strings name_parts;
-        splitInto<'_', '.'>(name_parts, filename);
+        splitInto<'_'>(name_parts, filename);
         return parse<uint64_t>(name_parts[1]);
     }
 
diff --git a/src/Coordination/KeeperStorage.cpp b/src/Coordination/KeeperStorage.cpp
index 2eb9ab30efa..acdf209baae 100644
--- a/src/Coordination/KeeperStorage.cpp
+++ b/src/Coordination/KeeperStorage.cpp
@@ -832,15 +832,6 @@ std::shared_ptr<typename Container::Node> KeeperStorage<Container>::UncommittedS
     return tryGetNodeFromStorage(path);
 }
 
-template<typename Container>
-const typename Container::Node * KeeperStorage<Container>::UncommittedState::getActualNodeView(StringRef path, const Node & storage_node) const
-{
-    if (auto node_it = nodes.find(path.toView()); node_it != nodes.end())
-        return node_it->second.node.get();
-
-    return &storage_node;
-}
-
 template<typename Container>
 Coordination::ACLs KeeperStorage<Container>::UncommittedState::getACLs(StringRef path) const
 {
@@ -1133,7 +1124,7 @@ struct KeeperStorageRequestProcessor
     }
 
     virtual KeeperStorageBase::ResponsesForSessions
-    processWatches(const Storage & /*storage*/, int64_t /*zxid*/, KeeperStorageBase::Watches & /*watches*/, KeeperStorageBase::Watches & /*list_watches*/) const
+    processWatches(KeeperStorageBase::Watches & /*watches*/, KeeperStorageBase::Watches & /*list_watches*/) const
     {
         return {};
     }
@@ -1250,7 +1241,7 @@ struct KeeperStorageCreateRequestProcessor final : public KeeperStorageRequestPr
     using KeeperStorageRequestProcessor<Storage>::KeeperStorageRequestProcessor;
 
     KeeperStorageBase::ResponsesForSessions
-    processWatches(const Storage & /*storage*/, int64_t /*zxid*/, KeeperStorageBase::Watches & watches, KeeperStorageBase::Watches & list_watches) const override
+    processWatches(KeeperStorageBase::Watches & watches, KeeperStorageBase::Watches & list_watches) const override
     {
         return processWatchesImpl(this->zk_request->getPath(), watches, list_watches, Coordination::Event::CREATED);
     }
@@ -1471,41 +1462,16 @@ struct KeeperStorageGetRequestProcessor final : public KeeperStorageRequestProce
     }
 };
 
-namespace
-{
-
-template <typename Storage>
-void addUpdateParentPzxidDelta(Storage & storage, std::vector<typename Storage::Delta> & deltas, int64_t zxid, StringRef path)
-{
-    auto parent_path = parentNodePath(path);
-    if (!storage.uncommitted_state.getNode(parent_path))
-        return;
-
-    deltas.emplace_back(
-        std::string{parent_path},
-        zxid,
-        typename Storage::UpdateNodeDelta
-        {
-            [zxid](Storage::Node & parent)
-            {
-                parent.pzxid = std::max(parent.pzxid, zxid);
-            }
-        }
-    );
-}
-
-}
-
 template<typename Storage>
 struct KeeperStorageRemoveRequestProcessor final : public KeeperStorageRequestProcessor<Storage>
 {
-    using KeeperStorageRequestProcessor<Storage>::KeeperStorageRequestProcessor;
-
     bool checkAuth(Storage & storage, int64_t session_id, bool is_local) const override
     {
         return storage.checkACL(parentNodePath(this->zk_request->getPath()), Coordination::ACL::Delete, session_id, is_local);
     }
 
+    using KeeperStorageRequestProcessor<Storage>::KeeperStorageRequestProcessor;
+
     std::vector<typename Storage::Delta>
     preprocess(Storage & storage, int64_t zxid, int64_t /*session_id*/, int64_t /*time*/, uint64_t & digest, const KeeperContext & keeper_context) const override
     {
@@ -1522,12 +1488,31 @@ struct KeeperStorageRemoveRequestProcessor final : public KeeperStorageRequestPr
             return {typename Storage::Delta{zxid, Coordination::Error::ZBADARGUMENTS}};
         }
 
+        const auto update_parent_pzxid = [&]()
+        {
+            auto parent_path = parentNodePath(request.path);
+            if (!storage.uncommitted_state.getNode(parent_path))
+                return;
+
+            new_deltas.emplace_back(
+                std::string{parent_path},
+                zxid,
+                typename Storage::UpdateNodeDelta
+                {
+                    [zxid](Storage::Node & parent)
+                    {
+                        parent.pzxid = std::max(parent.pzxid, zxid);
+                    }
+                }
+            );
+        };
+
         auto node = storage.uncommitted_state.getNode(request.path);
 
         if (!node)
         {
             if (request.restored_from_zookeeper_log)
-                addUpdateParentPzxidDelta(storage, new_deltas, zxid, request.path);
+                update_parent_pzxid();
             return {typename Storage::Delta{zxid, Coordination::Error::ZNONODE}};
         }
         else if (request.version != -1 && request.version != node->version)
@@ -1536,7 +1521,7 @@ struct KeeperStorageRemoveRequestProcessor final : public KeeperStorageRequestPr
             return {typename Storage::Delta{zxid, Coordination::Error::ZNOTEMPTY}};
 
         if (request.restored_from_zookeeper_log)
-            addUpdateParentPzxidDelta(storage, new_deltas, zxid, request.path);
+            update_parent_pzxid();
 
         new_deltas.emplace_back(
             std::string{parentNodePath(request.path)},
@@ -1567,318 +1552,12 @@ struct KeeperStorageRemoveRequestProcessor final : public KeeperStorageRequestPr
     }
 
     KeeperStorageBase::ResponsesForSessions
-    processWatches(const Storage & /*storage*/, int64_t /*zxid*/, KeeperStorageBase::Watches & watches, KeeperStorageBase::Watches & list_watches) const override
+    processWatches(KeeperStorageBase::Watches & watches, KeeperStorageBase::Watches & list_watches) const override
     {
         return processWatchesImpl(this->zk_request->getPath(), watches, list_watches, Coordination::Event::DELETED);
     }
 };
 
-template<typename Storage>
-struct KeeperStorageRemoveRecursiveRequestProcessor final : public KeeperStorageRequestProcessor<Storage>
-{
-    using KeeperStorageRequestProcessor<Storage>::KeeperStorageRequestProcessor;
-
-    bool checkAuth(Storage & storage, int64_t session_id, bool is_local) const override
-    {
-        return storage.checkACL(parentNodePath(this->zk_request->getPath()), Coordination::ACL::Delete, session_id, is_local);
-    }
-
-    std::vector<typename Storage::Delta>
-    preprocess(Storage & storage, int64_t zxid, int64_t session_id, int64_t /*time*/, uint64_t & digest, const KeeperContext & keeper_context) const override
-    {
-        ProfileEvents::increment(ProfileEvents::KeeperRemoveRequest);
-        Coordination::ZooKeeperRemoveRecursiveRequest & request = dynamic_cast<Coordination::ZooKeeperRemoveRecursiveRequest &>(*this->zk_request);
-
-        std::vector<typename Storage::Delta> new_deltas;
-
-        if (Coordination::matchPath(request.path, keeper_system_path) != Coordination::PathMatchResult::NOT_MATCH)
-        {
-            auto error_msg = fmt::format("Trying to delete an internal Keeper path ({}) which is not allowed", request.path);
-
-            handleSystemNodeModification(keeper_context, error_msg);
-            return {typename Storage::Delta{zxid, Coordination::Error::ZBADARGUMENTS}};
-        }
-
-        auto node = storage.uncommitted_state.getNode(request.path);
-
-        if (!node)
-        {
-            if (request.restored_from_zookeeper_log)
-                addUpdateParentPzxidDelta(storage, new_deltas, zxid, request.path);
-
-            return {typename Storage::Delta{zxid, Coordination::Error::ZNONODE}};
-        }
-
-        ToDeleteTreeCollector collector(storage, zxid, session_id, request.remove_nodes_limit);
-        auto collect_status = collector.collect(request.path, *node);
-
-        if (collect_status == ToDeleteTreeCollector::CollectStatus::NoAuth)
-            return {typename Storage::Delta{zxid, Coordination::Error::ZNOAUTH}};
-
-        if (collect_status == ToDeleteTreeCollector::CollectStatus::LimitExceeded)
-            return {typename Storage::Delta{zxid, Coordination::Error::ZNOTEMPTY}};
-
-        if (request.restored_from_zookeeper_log)
-            addUpdateParentPzxidDelta(storage, new_deltas, zxid, request.path);
-
-        auto delete_deltas = collector.extractDeltas();
-
-        for (const auto & delta : delete_deltas)
-        {
-            const auto * remove_delta = std::get_if<typename Storage::RemoveNodeDelta>(&delta.operation);
-            if (remove_delta && remove_delta->ephemeral_owner)
-                storage.unregisterEphemeralPath(remove_delta->ephemeral_owner, delta.path);
-        }
-
-        new_deltas.insert(new_deltas.end(), std::make_move_iterator(delete_deltas.begin()), std::make_move_iterator(delete_deltas.end()));
-
-        digest = storage.calculateNodesDigest(digest, new_deltas);
-
-        return new_deltas;
-    }
-
-    Coordination::ZooKeeperResponsePtr process(Storage & storage, int64_t zxid) const override
-    {
-        Coordination::ZooKeeperResponsePtr response_ptr = this->zk_request->makeResponse();
-        Coordination::ZooKeeperRemoveRecursiveResponse & response = dynamic_cast<Coordination::ZooKeeperRemoveRecursiveResponse &>(*response_ptr);
-
-        response.error = storage.commit(zxid);
-        return response_ptr;
-    }
-
-    KeeperStorageBase::ResponsesForSessions
-    processWatches(const Storage & storage, int64_t zxid, KeeperStorageBase::Watches & watches, KeeperStorageBase::Watches & list_watches) const override
-    {
-        /// need to iterate over zxid deltas and update watches for deleted tree.
-        const auto & deltas = storage.uncommitted_state.deltas;
-
-        KeeperStorageBase::ResponsesForSessions responses;
-        for (auto it = deltas.rbegin(); it != deltas.rend() && it->zxid == zxid; ++it)
-        {
-            const auto * remove_delta = std::get_if<typename Storage::RemoveNodeDelta>(&it->operation);
-            if (remove_delta)
-            {
-                auto new_responses = processWatchesImpl(it->path, watches, list_watches, Coordination::Event::DELETED);
-                responses.insert(responses.end(), std::make_move_iterator(new_responses.begin()), std::make_move_iterator(new_responses.end()));
-            }
-        }
-
-        return responses;
-    }
-
-private:
-    using SNode = typename Storage::Node;
-
-    class ToDeleteTreeCollector
-    {
-        Storage & storage;
-        int64_t zxid;
-        int64_t session_id;
-        uint32_t limit;
-
-        uint32_t max_level = 0;
-        uint32_t nodes_observed = 1;  /// root node
-        std::unordered_map<uint32_t, std::vector<typename Storage::Delta>> by_level_deltas;
-
-        struct Step
-        {
-            String path;
-            std::variant<SNode, const SNode *> node;
-            uint32_t level;
-        };
-
-        enum class CollectStatus
-        {
-            Ok,
-            NoAuth,
-            LimitExceeded,
-        };
-
-        friend struct KeeperStorageRemoveRecursiveRequestProcessor;
-
-    public:
-        ToDeleteTreeCollector(Storage & storage_, int64_t zxid_, int64_t session_id_, uint32_t limit_)
-            : storage(storage_)
-            , zxid(zxid_)
-            , session_id(session_id_)
-            , limit(limit_)
-        {
-        }
-
-        CollectStatus collect(StringRef root_path, const SNode & root_node)
-        {
-            std::deque<Step> steps;
-
-            if (checkLimits(&root_node))
-                return CollectStatus::LimitExceeded;
-
-            steps.push_back(Step{root_path.toString(), &root_node, 0});
-
-            while (!steps.empty())
-            {
-                Step step = std::move(steps.front());
-                steps.pop_front();
-
-                StringRef path = step.path;
-                uint32_t level = step.level;
-                const SNode * node_ptr = nullptr;
-
-                if (auto * rdb = std::get_if<SNode>(&step.node))
-                    node_ptr = rdb;
-                else
-                    node_ptr = std::get<const SNode *>(step.node);
-
-                chassert(!path.empty());
-                chassert(node_ptr != nullptr);
-
-                const auto & node = *node_ptr;
-                auto actual_node_ptr = storage.uncommitted_state.getActualNodeView(path, node);
-                chassert(actual_node_ptr != nullptr); /// explicitly check that node is not deleted
-
-                if (actual_node_ptr->numChildren() > 0 && !storage.checkACL(path, Coordination::ACL::Delete, session_id, /*is_local=*/false))
-                    return CollectStatus::NoAuth;
-
-                if (auto status = visitRocksDBNode(steps, path, level); status != CollectStatus::Ok)
-                    return status;
-
-                if (auto status = visitMemNode(steps, path, level); status != CollectStatus::Ok)
-                    return status;
-
-                if (auto status = visitRootAndUncommitted(steps, path, node, level); status != CollectStatus::Ok)
-                    return status;
-            }
-
-            return CollectStatus::Ok;
-        }
-
-        std::vector<typename Storage::Delta> extractDeltas()
-        {
-            std::vector<typename Storage::Delta> deltas;
-
-            for (ssize_t level = max_level; level >= 0; --level)
-            {
-                auto & level_deltas = by_level_deltas[static_cast<uint32_t>(level)];
-                deltas.insert(deltas.end(), std::make_move_iterator(level_deltas.begin()), std::make_move_iterator(level_deltas.end()));
-            }
-
-            return std::move(deltas);
-        }
-
-    private:
-        CollectStatus visitRocksDBNode(std::deque<Step> & steps, StringRef root_path, uint32_t level)
-        {
-            if constexpr (Storage::use_rocksdb)
-            {
-                std::filesystem::path root_fs_path(root_path.toString());
-                auto children = storage.container.getChildren(root_path.toString());
-
-                for (auto && [child_name, child_node] : children)
-                {
-                    auto child_path = (root_fs_path / child_name).generic_string();
-                    const auto actual_child_node_ptr = storage.uncommitted_state.getActualNodeView(child_path, child_node);
-
-                    if (actual_child_node_ptr == nullptr) /// node was deleted in previous step of multi transaction
-                        continue;
-
-                    if (checkLimits(actual_child_node_ptr))
-                        return CollectStatus::LimitExceeded;
-
-                    steps.push_back(Step{std::move(child_path), std::move(child_node), level + 1});
-                }
-            }
-
-            return CollectStatus::Ok;
-        }
-
-        CollectStatus visitMemNode(std::deque<Step> & steps, StringRef root_path, uint32_t level)
-        {
-            if constexpr (!Storage::use_rocksdb)
-            {
-                auto node_it = storage.container.find(root_path);
-                if (node_it == storage.container.end())
-                    return CollectStatus::Ok;
-
-                std::filesystem::path root_fs_path(root_path.toString());
-                const auto & children = node_it->value.getChildren();
-
-                for (const auto & child_name : children)
-                {
-                    auto child_path = (root_fs_path / child_name.toView()).generic_string();
-
-                    auto child_it = storage.container.find(child_path);
-                    chassert(child_it != storage.container.end());
-                    const auto & child_node = child_it->value;
-
-                    const auto actual_child_node_ptr = storage.uncommitted_state.getActualNodeView(child_path, child_node);
-
-                    if (actual_child_node_ptr == nullptr) /// node was deleted in previous step of multi transaction
-                        continue;
-
-                    if (checkLimits(actual_child_node_ptr))
-                        return CollectStatus::LimitExceeded;
-
-                    steps.push_back(Step{std::move(child_path), &child_node, level + 1});
-                }
-            }
-
-            return CollectStatus::Ok;
-        }
-
-        CollectStatus visitRootAndUncommitted(std::deque<Step> & steps, StringRef root_path, const SNode & root_node, uint32_t level)
-        {
-            const auto & nodes = storage.uncommitted_state.nodes;
-
-            /// nodes are sorted by paths with level locality
-            auto it = nodes.upper_bound(root_path.toString() + "/");
-
-            for (; it != nodes.end() && parentNodePath(it->first) == root_path; ++it)
-            {
-                const auto actual_child_node_ptr = it->second.node.get();
-
-                if (actual_child_node_ptr == nullptr) /// node was deleted in previous step of multi transaction
-                    continue;
-
-                if (checkLimits(actual_child_node_ptr))
-                    return CollectStatus::LimitExceeded;
-
-                const String & child_path = it->first;
-                const SNode & child_node = *it->second.node;
-
-                steps.push_back(Step{child_path, &child_node, level + 1});
-            }
-
-            addDelta(root_path, root_node, level);
-
-            return CollectStatus::Ok;
-        }
-
-        void addDelta(StringRef root_path, const SNode & root_node, uint32_t level)
-        {
-            max_level = std::max(max_level, level);
-
-            by_level_deltas[level].emplace_back(
-                parentNodePath(root_path).toString(),
-                zxid,
-                typename Storage::UpdateNodeDelta{
-                    [](SNode & parent)
-                    {
-                        ++parent.cversion;
-                        parent.decreaseNumChildren();
-                    }
-                });
-
-            by_level_deltas[level].emplace_back(root_path.toString(), zxid, typename Storage::RemoveNodeDelta{root_node.version, root_node.ephemeralOwner()});
-        }
-
-        bool checkLimits(const SNode * node)
-        {
-            chassert(node != nullptr);
-            nodes_observed += node->numChildren();
-            return nodes_observed > limit;
-        }
-    };
-};
-
 template<typename Storage>
 struct KeeperStorageExistsRequestProcessor final : public KeeperStorageRequestProcessor<Storage>
 {
@@ -2030,7 +1709,7 @@ struct KeeperStorageSetRequestProcessor final : public KeeperStorageRequestProce
     }
 
     KeeperStorageBase::ResponsesForSessions
-    processWatches(const Storage & /*storage*/, int64_t /*zxid*/, typename Storage::Watches & watches, typename Storage::Watches & list_watches) const override
+    processWatches(typename Storage::Watches & watches, typename Storage::Watches & list_watches) const override
     {
         return processWatchesImpl(this->zk_request->getPath(), watches, list_watches, Coordination::Event::CHANGED);
     }
@@ -2452,10 +2131,6 @@ struct KeeperStorageMultiRequestProcessor final : public KeeperStorageRequestPro
                     check_operation_type(OperationType::Write);
                     concrete_requests.push_back(std::make_shared<KeeperStorageRemoveRequestProcessor<Storage>>(sub_zk_request));
                     break;
-                case Coordination::OpNum::RemoveRecursive:
-                    check_operation_type(OperationType::Write);
-                    concrete_requests.push_back(std::make_shared<KeeperStorageRemoveRecursiveRequestProcessor<Storage>>(sub_zk_request));
-                    break;
                 case Coordination::OpNum::Set:
                     check_operation_type(OperationType::Write);
                     concrete_requests.push_back(std::make_shared<KeeperStorageSetRequestProcessor<Storage>>(sub_zk_request));
@@ -2575,12 +2250,12 @@ struct KeeperStorageMultiRequestProcessor final : public KeeperStorageRequestPro
     }
 
     KeeperStorageBase::ResponsesForSessions
-    processWatches(const Storage & storage, int64_t zxid, typename Storage::Watches & watches, typename Storage::Watches & list_watches) const override
+    processWatches(typename Storage::Watches & watches, typename Storage::Watches & list_watches) const override
     {
         typename Storage::ResponsesForSessions result;
         for (const auto & generic_request : concrete_requests)
         {
-            auto responses = generic_request->processWatches(storage, zxid, watches, list_watches);
+            auto responses = generic_request->processWatches(watches, list_watches);
             result.insert(result.end(), responses.begin(), responses.end());
         }
         return result;
@@ -2725,7 +2400,6 @@ KeeperStorageRequestProcessorsFactory<Storage>::KeeperStorageRequestProcessorsFa
     registerKeeperRequestProcessor<Coordination::OpNum::SetACL, KeeperStorageSetACLRequestProcessor<Storage>>(*this);
     registerKeeperRequestProcessor<Coordination::OpNum::GetACL, KeeperStorageGetACLRequestProcessor<Storage>>(*this);
     registerKeeperRequestProcessor<Coordination::OpNum::CheckNotExists, KeeperStorageCheckRequestProcessor<Storage>>(*this);
-    registerKeeperRequestProcessor<Coordination::OpNum::RemoveRecursive, KeeperStorageRemoveRecursiveRequestProcessor<Storage>>(*this);
 }
 
 
@@ -3044,7 +2718,7 @@ KeeperStorage<Container>::ResponsesForSessions KeeperStorage<Container>::process
         /// If this requests processed successfully we need to check watches
         if (response->error == Coordination::Error::ZOK)
         {
-            auto watch_responses = request_processor->processWatches(*this, zxid, watches, list_watches);
+            auto watch_responses = request_processor->processWatches(watches, list_watches);
             results.insert(results.end(), watch_responses.begin(), watch_responses.end());
         }
 
diff --git a/src/Coordination/KeeperStorage.h b/src/Coordination/KeeperStorage.h
index 904af76ef37..4a9286d4835 100644
--- a/src/Coordination/KeeperStorage.h
+++ b/src/Coordination/KeeperStorage.h
@@ -566,7 +566,6 @@ public:
         void rollback(int64_t rollback_zxid);
 
         std::shared_ptr<Node> getNode(StringRef path) const;
-        const Node * getActualNodeView(StringRef path, const Node & storage_node) const;
         Coordination::ACLs getACLs(StringRef path) const;
 
         void applyDelta(const Delta & delta);
@@ -610,18 +609,7 @@ public:
             using is_transparent = void; // required to make find() work with different type than key_type
         };
 
-        struct PathCmp
-        {
-            using is_transparent = std::true_type;
-
-            auto operator()(const std::string_view a,
-                            const std::string_view b) const
-            {
-                return a.size() < b.size() || (a.size() == b.size() && a < b);
-            }
-        };
-
-        mutable std::map<std::string, UncommittedNode, PathCmp> nodes;
+        mutable std::unordered_map<std::string, UncommittedNode, Hash, Equal> nodes;
         std::unordered_map<std::string, std::list<const Delta *>, Hash, Equal> deltas_for_path;
 
         std::list<Delta> deltas;
diff --git a/src/Coordination/RaftServerConfig.cpp b/src/Coordination/RaftServerConfig.cpp
index bafc177b736..929eeeb640e 100644
--- a/src/Coordination/RaftServerConfig.cpp
+++ b/src/Coordination/RaftServerConfig.cpp
@@ -26,16 +26,12 @@ std::optional<RaftServerConfig> RaftServerConfig::parse(std::string_view server)
     if (!with_id_endpoint && !with_server_type && !with_priority)
         return std::nullopt;
 
-    std::string_view id_str = parts[0];
+    const std::string_view id_str = parts[0];
     if (!id_str.starts_with("server."))
         return std::nullopt;
 
-    id_str = id_str.substr(7);
-    if (auto eq_pos = id_str.find('='); std::string_view::npos != eq_pos)
-        id_str = id_str.substr(0, eq_pos);
-
     Int32 id;
-    if (!tryParse(id, id_str))
+    if (!tryParse(id, std::next(id_str.begin(), 7)))
         return std::nullopt;
     if (id <= 0)
         return std::nullopt;
diff --git a/src/Coordination/tests/gtest_coordination.cpp b/src/Coordination/tests/gtest_coordination.cpp
index 73402af5ec4..beae6254562 100644
--- a/src/Coordination/tests/gtest_coordination.cpp
+++ b/src/Coordination/tests/gtest_coordination.cpp
@@ -111,13 +111,10 @@ public:
     }
 };
 
-using Implementation = testing::Types<TestParam<DB::KeeperMemoryStorage, true>
-                                      ,TestParam<DB::KeeperMemoryStorage, false>
-#if USE_ROCKSDB
-                                      ,TestParam<DB::KeeperRocksStorage, true>
-                                      ,TestParam<DB::KeeperRocksStorage, false>
-#endif
-                                      >;
+using Implementation = testing::Types<TestParam<DB::KeeperMemoryStorage, true>,
+                                      TestParam<DB::KeeperMemoryStorage, false>,
+                                      TestParam<DB::KeeperRocksStorage, true>,
+                                      TestParam<DB::KeeperRocksStorage, false>>;
 TYPED_TEST_SUITE(CoordinationTest, Implementation);
 
 TYPED_TEST(CoordinationTest, RaftServerConfigParse)
@@ -3113,8 +3110,6 @@ TYPED_TEST(CoordinationTest, TestFeatureFlags)
     ASSERT_TRUE(feature_flags.isEnabled(KeeperFeatureFlag::FILTERED_LIST));
     ASSERT_TRUE(feature_flags.isEnabled(KeeperFeatureFlag::MULTI_READ));
     ASSERT_FALSE(feature_flags.isEnabled(KeeperFeatureFlag::CHECK_NOT_EXISTS));
-    ASSERT_FALSE(feature_flags.isEnabled(KeeperFeatureFlag::CREATE_IF_NOT_EXISTS));
-    ASSERT_FALSE(feature_flags.isEnabled(KeeperFeatureFlag::REMOVE_RECURSIVE));
 }
 
 TYPED_TEST(CoordinationTest, TestSystemNodeModify)
@@ -3376,474 +3371,6 @@ TYPED_TEST(CoordinationTest, TestReapplyingDeltas)
     ASSERT_TRUE(children1_set == children2_set);
 }
 
-TYPED_TEST(CoordinationTest, TestRemoveRecursiveRequest)
-{
-    using namespace DB;
-    using namespace Coordination;
-
-    using Storage = typename TestFixture::Storage;
-
-    ChangelogDirTest rocks("./rocksdb");
-    this->setRocksDBDirectory("./rocksdb");
-
-    Storage storage{500, "", this->keeper_context};
-
-    int32_t zxid = 0;
-
-    const auto create = [&](const String & path, int create_mode)
-    {
-        int new_zxid = ++zxid;
-
-        const auto create_request = std::make_shared<ZooKeeperCreateRequest>();
-        create_request->path = path;
-        create_request->is_ephemeral = create_mode == zkutil::CreateMode::Ephemeral || create_mode == zkutil::CreateMode::EphemeralSequential;
-        create_request->is_sequential = create_mode == zkutil::CreateMode::PersistentSequential || create_mode == zkutil::CreateMode::EphemeralSequential;
-
-        storage.preprocessRequest(create_request, 1, 0, new_zxid);
-        auto responses = storage.processRequest(create_request, 1, new_zxid);
-
-        EXPECT_EQ(responses.size(), 1);
-        EXPECT_EQ(responses[0].response->error, Coordination::Error::ZOK) << "Failed to create " << path;
-    };
-
-    const auto remove = [&](const String & path, int32_t version = -1)
-    {
-        int new_zxid = ++zxid;
-
-        auto remove_request = std::make_shared<ZooKeeperRemoveRequest>();
-        remove_request->path = path;
-        remove_request->version = version;
-
-        storage.preprocessRequest(remove_request, 1, 0, new_zxid);
-        return storage.processRequest(remove_request, 1, new_zxid);
-    };
-
-    const auto remove_recursive = [&](const String & path, uint32_t remove_nodes_limit = 1)
-    {
-        int new_zxid = ++zxid;
-
-        auto remove_request = std::make_shared<ZooKeeperRemoveRecursiveRequest>();
-        remove_request->path = path;
-        remove_request->remove_nodes_limit = remove_nodes_limit;
-
-        storage.preprocessRequest(remove_request, 1, 0, new_zxid);
-        return storage.processRequest(remove_request, 1, new_zxid);
-    };
-
-    const auto exists = [&](const String & path)
-    {
-        int new_zxid = ++zxid;
-
-        const auto exists_request = std::make_shared<ZooKeeperExistsRequest>();
-        exists_request->path = path;
-
-        storage.preprocessRequest(exists_request, 1, 0, new_zxid);
-        auto responses = storage.processRequest(exists_request, 1, new_zxid);
-
-        EXPECT_EQ(responses.size(), 1);
-        return responses[0].response->error == Coordination::Error::ZOK;
-    };
-
-    {
-        SCOPED_TRACE("Single Remove Single Node");
-        create("/T1", zkutil::CreateMode::Persistent);
-
-        auto responses = remove("/T1");
-        ASSERT_EQ(responses.size(), 1);
-        ASSERT_EQ(responses[0].response->error, Coordination::Error::ZOK);
-        ASSERT_FALSE(exists("/T1"));
-    }
-
-    {
-        SCOPED_TRACE("Single Remove Tree");
-        create("/T2", zkutil::CreateMode::Persistent);
-        create("/T2/A", zkutil::CreateMode::Persistent);
-
-        auto responses = remove("/T2");
-        ASSERT_EQ(responses.size(), 1);
-        ASSERT_EQ(responses[0].response->error, Coordination::Error::ZNOTEMPTY);
-        ASSERT_TRUE(exists("/T2"));
-    }
-
-    {
-        SCOPED_TRACE("Recursive Remove Single Node");
-        create("/T3", zkutil::CreateMode::Persistent);
-
-        auto responses = remove_recursive("/T3", 100);
-        ASSERT_EQ(responses.size(), 1);
-        ASSERT_EQ(responses[0].response->error, Coordination::Error::ZOK);
-        ASSERT_FALSE(exists("/T3"));
-    }
-
-    {
-        SCOPED_TRACE("Recursive Remove Tree Small Limit");
-        create("/T5", zkutil::CreateMode::Persistent);
-        create("/T5/A", zkutil::CreateMode::Persistent);
-        create("/T5/B", zkutil::CreateMode::Persistent);
-        create("/T5/A/C", zkutil::CreateMode::Persistent);
-
-        auto responses = remove_recursive("/T5", 2);
-        ASSERT_EQ(responses.size(), 1);
-        ASSERT_EQ(responses[0].response->error, Coordination::Error::ZNOTEMPTY);
-        ASSERT_TRUE(exists("/T5"));
-        ASSERT_TRUE(exists("/T5/A"));
-        ASSERT_TRUE(exists("/T5/B"));
-        ASSERT_TRUE(exists("/T5/A/C"));
-    }
-
-    {
-        SCOPED_TRACE("Recursive Remove Tree Big Limit");
-        create("/T6", zkutil::CreateMode::Persistent);
-        create("/T6/A", zkutil::CreateMode::Persistent);
-        create("/T6/B", zkutil::CreateMode::Persistent);
-        create("/T6/A/C", zkutil::CreateMode::Persistent);
-
-        auto responses = remove_recursive("/T6", 4);
-        ASSERT_EQ(responses.size(), 1);
-        ASSERT_EQ(responses[0].response->error, Coordination::Error::ZOK);
-        ASSERT_FALSE(exists("/T6"));
-        ASSERT_FALSE(exists("/T6/A"));
-        ASSERT_FALSE(exists("/T6/B"));
-        ASSERT_FALSE(exists("/T6/A/C"));
-    }
-
-    {
-        SCOPED_TRACE("Recursive Remove Ephemeral");
-        create("/T7", zkutil::CreateMode::Ephemeral);
-        ASSERT_EQ(storage.ephemerals.size(), 1);
-
-        auto responses = remove_recursive("/T7", 100);
-        ASSERT_EQ(responses.size(), 1);
-        ASSERT_EQ(responses[0].response->error, Coordination::Error::ZOK);
-        ASSERT_EQ(storage.ephemerals.size(), 0);
-        ASSERT_FALSE(exists("/T7"));
-    }
-
-    {
-        SCOPED_TRACE("Recursive Remove Tree With Ephemeral");
-        create("/T8", zkutil::CreateMode::Persistent);
-        create("/T8/A", zkutil::CreateMode::Persistent);
-        create("/T8/B", zkutil::CreateMode::Ephemeral);
-        create("/T8/A/C", zkutil::CreateMode::Ephemeral);
-        ASSERT_EQ(storage.ephemerals.size(), 1);
-
-        auto responses = remove_recursive("/T8", 4);
-        ASSERT_EQ(responses.size(), 1);
-        ASSERT_EQ(responses[0].response->error, Coordination::Error::ZOK);
-        ASSERT_EQ(storage.ephemerals.size(), 0);
-        ASSERT_FALSE(exists("/T8"));
-        ASSERT_FALSE(exists("/T8/A"));
-        ASSERT_FALSE(exists("/T8/B"));
-        ASSERT_FALSE(exists("/T8/A/C"));
-    }
-}
-
-TYPED_TEST(CoordinationTest, TestRemoveRecursiveInMultiRequest)
-{
-    using namespace DB;
-    using namespace Coordination;
-
-    using Storage = typename TestFixture::Storage;
-
-    ChangelogDirTest rocks("./rocksdb");
-    this->setRocksDBDirectory("./rocksdb");
-
-    Storage storage{500, "", this->keeper_context};
-    int zxid = 0;
-
-    auto prepare_create_tree = []()
-    {
-        return Coordination::Requests{
-            zkutil::makeCreateRequest("/A", "A", zkutil::CreateMode::Persistent),
-            zkutil::makeCreateRequest("/A/B", "B", zkutil::CreateMode::Persistent),
-            zkutil::makeCreateRequest("/A/C", "C", zkutil::CreateMode::Ephemeral),
-            zkutil::makeCreateRequest("/A/B/D", "D", zkutil::CreateMode::Ephemeral),
-        };
-    };
-
-    const auto exists = [&](const String & path)
-    {
-        int new_zxid = ++zxid;
-
-        const auto exists_request = std::make_shared<ZooKeeperExistsRequest>();
-        exists_request->path = path;
-
-        storage.preprocessRequest(exists_request, 1, 0, new_zxid);
-        auto responses = storage.processRequest(exists_request, 1, new_zxid);
-
-        EXPECT_EQ(responses.size(), 1);
-        return responses[0].response->error == Coordination::Error::ZOK;
-    };
-
-    const auto is_multi_ok = [&](Coordination::ZooKeeperResponsePtr response)
-    {
-        const auto & multi_response = dynamic_cast<Coordination::ZooKeeperMultiResponse &>(*response);
-
-        for (const auto & op_response : multi_response.responses)
-            if (op_response->error != Coordination::Error::ZOK)
-                return false;
-
-        return true;
-    };
-
-    {
-        SCOPED_TRACE("Remove In Multi Tx");
-        int new_zxid = ++zxid;
-        auto ops = prepare_create_tree();
-
-        ops.push_back(zkutil::makeRemoveRequest("/A", -1));
-        const auto request = std::make_shared<ZooKeeperMultiRequest>(ops, ACLs{});
-
-        storage.preprocessRequest(request, 1, 0, new_zxid);
-        auto responses = storage.processRequest(request, 1, new_zxid);
-        ops.pop_back();
-
-        ASSERT_EQ(responses.size(), 1);
-        ASSERT_FALSE(is_multi_ok(responses[0].response));
-    }
-
-    {
-        SCOPED_TRACE("Recursive Remove In Multi Tx");
-        int new_zxid = ++zxid;
-        auto ops = prepare_create_tree();
-
-        ops.push_back(zkutil::makeRemoveRecursiveRequest("/A", 4));
-        const auto request = std::make_shared<ZooKeeperMultiRequest>(ops, ACLs{});
-
-        storage.preprocessRequest(request, 1, 0, new_zxid);
-        auto responses = storage.processRequest(request, 1, new_zxid);
-        ops.pop_back();
-
-        ASSERT_EQ(responses.size(), 1);
-        ASSERT_TRUE(is_multi_ok(responses[0].response));
-        ASSERT_FALSE(exists("/A"));
-        ASSERT_FALSE(exists("/A/C"));
-        ASSERT_FALSE(exists("/A/B"));
-        ASSERT_FALSE(exists("/A/B/D"));
-    }
-
-    {
-        SCOPED_TRACE("Recursive Remove With Regular In Multi Tx");
-        int new_zxid = ++zxid;
-        auto ops = prepare_create_tree();
-
-        ops.push_back(zkutil::makeRemoveRequest("/A/C", -1));
-        ops.push_back(zkutil::makeRemoveRecursiveRequest("/A", 3));
-        const auto request = std::make_shared<ZooKeeperMultiRequest>(ops, ACLs{});
-
-        storage.preprocessRequest(request, 1, 0, new_zxid);
-        auto responses = storage.processRequest(request, 1, new_zxid);
-        ops.pop_back();
-        ops.pop_back();
-
-        ASSERT_EQ(responses.size(), 1);
-        ASSERT_TRUE(is_multi_ok(responses[0].response));
-        ASSERT_FALSE(exists("/A"));
-        ASSERT_FALSE(exists("/A/C"));
-        ASSERT_FALSE(exists("/A/B"));
-        ASSERT_FALSE(exists("/A/B/D"));
-    }
-
-    {
-        SCOPED_TRACE("Recursive Remove From Committed and Uncommitted states");
-        int create_zxid = ++zxid;
-        auto ops = prepare_create_tree();
-
-        /// First create nodes
-        const auto create_request = std::make_shared<ZooKeeperMultiRequest>(ops, ACLs{});
-        storage.preprocessRequest(create_request, 1, 0, create_zxid);
-        auto create_responses = storage.processRequest(create_request, 1, create_zxid);
-        ASSERT_EQ(create_responses.size(), 1);
-        ASSERT_TRUE(is_multi_ok(create_responses[0].response));
-        ASSERT_TRUE(exists("/A"));
-        ASSERT_TRUE(exists("/A/C"));
-        ASSERT_TRUE(exists("/A/B"));
-        ASSERT_TRUE(exists("/A/B/D"));
-
-        /// Remove node A/C as a single remove request.
-        /// Remove all other as remove recursive request.
-        /// In this case we should list storage to understand the tree topology
-        /// but ignore already deleted nodes in uncommitted state.
-
-        int remove_zxid = ++zxid;
-        ops = {
-            zkutil::makeRemoveRequest("/A/C", -1),
-            zkutil::makeRemoveRecursiveRequest("/A", 3),
-        };
-        const auto remove_request = std::make_shared<ZooKeeperMultiRequest>(ops, ACLs{});
-
-        storage.preprocessRequest(remove_request, 1, 0, remove_zxid);
-        auto remove_responses = storage.processRequest(remove_request, 1, remove_zxid);
-
-        ASSERT_EQ(remove_responses.size(), 1);
-        ASSERT_TRUE(is_multi_ok(remove_responses[0].response));
-        ASSERT_FALSE(exists("/A"));
-        ASSERT_FALSE(exists("/A/C"));
-        ASSERT_FALSE(exists("/A/B"));
-        ASSERT_FALSE(exists("/A/B/D"));
-    }
-}
-
-TYPED_TEST(CoordinationTest, TestRemoveRecursiveWatches)
-{
-    using namespace DB;
-    using namespace Coordination;
-
-    using Storage = typename TestFixture::Storage;
-
-    ChangelogDirTest rocks("./rocksdb");
-    this->setRocksDBDirectory("./rocksdb");
-
-    Storage storage{500, "", this->keeper_context};
-    int zxid = 0;
-
-    const auto create = [&](const String & path, int create_mode)
-    {
-        int new_zxid = ++zxid;
-
-        const auto create_request = std::make_shared<ZooKeeperCreateRequest>();
-        create_request->path = path;
-        create_request->is_ephemeral = create_mode == zkutil::CreateMode::Ephemeral || create_mode == zkutil::CreateMode::EphemeralSequential;
-        create_request->is_sequential = create_mode == zkutil::CreateMode::PersistentSequential || create_mode == zkutil::CreateMode::EphemeralSequential;
-
-        storage.preprocessRequest(create_request, 1, 0, new_zxid);
-        auto responses = storage.processRequest(create_request, 1, new_zxid);
-
-        EXPECT_EQ(responses.size(), 1);
-        EXPECT_EQ(responses[0].response->error, Coordination::Error::ZOK) << "Failed to create " << path;
-    };
-
-    const auto add_watch = [&](const String & path)
-    {
-        int new_zxid = ++zxid;
-
-        const auto exists_request = std::make_shared<ZooKeeperExistsRequest>();
-        exists_request->path = path;
-        exists_request->has_watch = true;
-
-        storage.preprocessRequest(exists_request, 1, 0, new_zxid);
-        auto responses = storage.processRequest(exists_request, 1, new_zxid);
-
-        EXPECT_EQ(responses.size(), 1);
-        EXPECT_EQ(responses[0].response->error, Coordination::Error::ZOK);
-    };
-
-    const auto add_list_watch = [&](const String & path)
-    {
-        int new_zxid = ++zxid;
-
-        const auto list_request = std::make_shared<ZooKeeperListRequest>();
-        list_request->path = path;
-        list_request->has_watch = true;
-
-        storage.preprocessRequest(list_request, 1, 0, new_zxid);
-        auto responses = storage.processRequest(list_request, 1, new_zxid);
-
-        EXPECT_EQ(responses.size(), 1);
-        EXPECT_EQ(responses[0].response->error, Coordination::Error::ZOK);
-    };
-
-    create("/A", zkutil::CreateMode::Persistent);
-    create("/A/B", zkutil::CreateMode::Persistent);
-    create("/A/C", zkutil::CreateMode::Ephemeral);
-    create("/A/B/D", zkutil::CreateMode::Ephemeral);
-
-    add_watch("/A");
-    add_watch("/A/B");
-    add_watch("/A/C");
-    add_watch("/A/B/D");
-    add_list_watch("/A");
-    add_list_watch("/A/B");
-    ASSERT_EQ(storage.watches.size(), 4);
-    ASSERT_EQ(storage.list_watches.size(), 2);
-
-    int new_zxid = ++zxid;
-
-    auto remove_request = std::make_shared<ZooKeeperRemoveRecursiveRequest>();
-    remove_request->path = "/A";
-    remove_request->remove_nodes_limit = 4;
-
-    storage.preprocessRequest(remove_request, 1, 0, new_zxid);
-    auto responses = storage.processRequest(remove_request, 1, new_zxid);
-
-    ASSERT_EQ(responses.size(), 7);
-
-    for (size_t i = 0; i < 7; ++i)
-    {
-        ASSERT_EQ(responses[i].response->error, Coordination::Error::ZOK);
-
-        if (const auto * watch_response = dynamic_cast<Coordination::ZooKeeperWatchResponse *>(responses[i].response.get()))
-            ASSERT_EQ(watch_response->type, Coordination::Event::DELETED);
-    }
-
-    ASSERT_EQ(storage.watches.size(), 0);
-    ASSERT_EQ(storage.list_watches.size(), 0);
-}
-
-TYPED_TEST(CoordinationTest, TestRemoveRecursiveAcls)
-{
-    using namespace DB;
-    using namespace Coordination;
-
-    using Storage = typename TestFixture::Storage;
-
-    ChangelogDirTest rocks("./rocksdb");
-    this->setRocksDBDirectory("./rocksdb");
-
-    Storage storage{500, "", this->keeper_context};
-    int zxid = 0;
-
-    {
-        int new_zxid = ++zxid;
-        String user_auth_data = "test_user:test_password";
-
-        const auto auth_request = std::make_shared<ZooKeeperAuthRequest>();
-        auth_request->scheme = "digest";
-        auth_request->data = user_auth_data;
-
-        storage.preprocessRequest(auth_request, 1, 0, new_zxid);
-        auto responses = storage.processRequest(auth_request, 1, new_zxid);
-
-        EXPECT_EQ(responses.size(), 1);
-        EXPECT_EQ(responses[0].response->error, Coordination::Error::ZOK) << "Failed to add auth to session";
-    }
-
-    const auto create = [&](const String & path)
-    {
-        int new_zxid = ++zxid;
-
-        const auto create_request = std::make_shared<ZooKeeperCreateRequest>();
-        create_request->path = path;
-        create_request->acls = {{.permissions = ACL::Create, .scheme = "auth", .id = ""}};
-
-        storage.preprocessRequest(create_request, 1, 0, new_zxid);
-        auto responses = storage.processRequest(create_request, 1, new_zxid);
-
-        EXPECT_EQ(responses.size(), 1);
-        EXPECT_EQ(responses[0].response->error, Coordination::Error::ZOK) << "Failed to create " << path;
-    };
-
-    /// Add nodes with only Create ACL
-    create("/A");
-    create("/A/B");
-    create("/A/C");
-    create("/A/B/D");
-
-    {
-        int new_zxid = ++zxid;
-
-        auto remove_request = std::make_shared<ZooKeeperRemoveRecursiveRequest>();
-        remove_request->path = "/A";
-        remove_request->remove_nodes_limit = 4;
-
-        storage.preprocessRequest(remove_request, 1, 0, new_zxid);
-        auto responses = storage.processRequest(remove_request, 1, new_zxid);
-
-        EXPECT_EQ(responses.size(), 1);
-        EXPECT_EQ(responses[0].response->error, Coordination::Error::ZNOAUTH);
-    }
-}
-
 /// INSTANTIATE_TEST_SUITE_P(CoordinationTestSuite,
 ///     CoordinationTest,
 ///     ::testing::ValuesIn(std::initializer_list<CompressionParam>{CompressionParam{true, ".zstd"}, CompressionParam{false, ""}}));
diff --git a/src/Core/Defines.h b/src/Core/Defines.h
index c6e65f34e90..3341669fed2 100644
--- a/src/Core/Defines.h
+++ b/src/Core/Defines.h
@@ -20,9 +20,6 @@ static constexpr auto DBMS_DEFAULT_POLL_INTERVAL = 10;
 /// The size of the I/O buffer by default.
 static constexpr auto DBMS_DEFAULT_BUFFER_SIZE = 1048576ULL;
 
-/// The initial size of adaptive I/O buffer by default.
-static constexpr auto DBMS_DEFAULT_INITIAL_ADAPTIVE_BUFFER_SIZE = 16384ULL;
-
 static constexpr auto PADDING_FOR_SIMD = 64;
 
 /** Which blocks by default read the data (by number of rows).
diff --git a/src/Core/ExternalTable.cpp b/src/Core/ExternalTable.cpp
index 7fe23f844b6..af681cd5639 100644
--- a/src/Core/ExternalTable.cpp
+++ b/src/Core/ExternalTable.cpp
@@ -17,12 +17,11 @@
 
 #include <Core/ExternalTable.h>
 #include <Core/Settings.h>
+#include <Poco/Net/MessageHeader.h>
 #include <Parsers/ASTNameTypePair.h>
-#include <Parsers/IdentifierQuotingStyle.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/parseQuery.h>
 #include <base/scope_guard.h>
-#include <Poco/Net/MessageHeader.h>
 
 
 namespace DB
@@ -50,7 +49,7 @@ ExternalTableDataPtr BaseExternalTable::getData(ContextPtr context)
 {
     initReadBuffer();
     initSampleBlock();
-    auto input = context->getInputFormat(format, *read_buffer, sample_block, context->getSettingsRef().get("max_block_size").safeGet<UInt64>());
+    auto input = context->getInputFormat(format, *read_buffer, sample_block, context->getSettingsRef().get("max_block_size").get<UInt64>());
 
     auto data = std::make_unique<ExternalTableData>();
     data->pipe = std::make_unique<QueryPipelineBuilder>();
@@ -86,15 +85,7 @@ void BaseExternalTable::parseStructureFromStructureField(const std::string & arg
         /// 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(
-                    /*max_length=*/0,
-                    /*one_line=*/true,
-                    /*show_secrets=*/true,
-                    /*print_pretty_type_names=*/false,
-                    /*always_quote_identifiers=*/false,
-                    /*identifier_quoting_style=*/IdentifierQuotingStyle::Backticks));
+            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());
     }
@@ -111,15 +102,7 @@ void BaseExternalTable::parseStructureFromTypesField(const std::string & argumen
         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(
-                /*max_length=*/0,
-                /*one_line=*/true,
-                /*show_secrets=*/true,
-                /*print_pretty_type_names=*/false,
-                /*always_quote_identifiers=*/false,
-                /*identifier_quoting_style=*/IdentifierQuotingStyle::Backticks));
+        structure.emplace_back("_" + toString(i + 1), type_list_raw->children[i]->formatWithPossiblyHidingSensitiveData(0, true, true));
 }
 
 void BaseExternalTable::initSampleBlock()
diff --git a/src/Core/Field.h b/src/Core/Field.h
index ba8c66580ad..f1bb4a72b0d 100644
--- a/src/Core/Field.h
+++ b/src/Core/Field.h
@@ -457,6 +457,15 @@ public:
     std::string_view getTypeName() const;
 
     bool isNull() const { return which == Types::Null; }
+    template <typename T>
+    NearestFieldType<std::decay_t<T>> & get();
+
+    template <typename T>
+    const auto & get() const
+    {
+        auto * mutable_this = const_cast<std::decay_t<decltype(*this)> *>(this);
+        return mutable_this->get<T>();
+    }
 
     bool isNegativeInfinity() const { return which == Types::Null && get<Null>().isNegativeInfinity(); }
     bool isPositiveInfinity() const { return which == Types::Null && get<Null>().isPositiveInfinity(); }
@@ -672,25 +681,6 @@ private:
 
     Types::Which which;
 
-    /// This function is prone to type punning and should never be used outside of Field class,
-    /// whenever it is used within this class the stored type should be checked in advance.
-    template <typename T>
-    NearestFieldType<std::decay_t<T>> & get()
-    {
-        // Before storing the value in the Field, we static_cast it to the field
-        // storage type, so here we return the value of storage type as well.
-        // Otherwise, it is easy to make a mistake of reinterpret_casting the stored
-        // value to a different and incompatible type.
-        // For example, a Float32 value is stored as Float64, and it is incorrect to
-        // return a reference to this value as Float32.
-        return *reinterpret_cast<NearestFieldType<std::decay_t<T>>*>(&storage);
-    }
-
-    template <typename T>
-    NearestFieldType<std::decay_t<T>> & get() const
-    {
-        return const_cast<Field *>(this)->get<T>();
-    }
 
     /// Assuming there was no allocated state or it was deallocated (see destroy).
     template <typename T>
@@ -876,21 +866,48 @@ constexpr bool isInt64OrUInt64orBoolFieldType(Field::Types::Which t)
         || t == Field::Types::Bool;
 }
 
+// Field value getter with type checking in debug builds.
+template <typename T>
+NearestFieldType<std::decay_t<T>> & Field::get()
+{
+    // Before storing the value in the Field, we static_cast it to the field
+    // storage type, so here we return the value of storage type as well.
+    // Otherwise, it is easy to make a mistake of reinterpret_casting the stored
+    // value to a different and incompatible type.
+    // For example, a Float32 value is stored as Float64, and it is incorrect to
+    // return a reference to this value as Float32.
+    using StoredType = NearestFieldType<std::decay_t<T>>;
+
+#ifndef NDEBUG
+    // Disregard signedness when converting between int64 types.
+    constexpr Field::Types::Which target = TypeToEnum<StoredType>::value;
+    if (target != which
+           && (!isInt64OrUInt64orBoolFieldType(target) || !isInt64OrUInt64orBoolFieldType(which)) && target != Field::Types::IPv4)
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+            "Invalid Field get from type {} to type {}", which, target);
+#endif
+
+    StoredType * MAY_ALIAS ptr = reinterpret_cast<StoredType *>(&storage);
+
+    return *ptr;
+}
+
+
 template <typename T>
 auto & Field::safeGet()
 {
     const Types::Which target = TypeToEnum<NearestFieldType<std::decay_t<T>>>::value;
 
-    /// bool is stored as uint64, will be returned as UInt64 when requested as bool or UInt64, as Int64 when requested as Int64
-    /// also allow UInt64 <-> Int64 conversion
-    if (target != which &&
-        !(which == Field::Types::Bool && (target == Field::Types::UInt64 || target == Field::Types::Int64)) &&
-        !(isInt64OrUInt64FieldType(which) && isInt64OrUInt64FieldType(target)))
-            throw Exception(ErrorCodes::BAD_GET, "Bad get: has {}, requested {}", getTypeName(), target);
+    /// We allow converting int64 <-> uint64, int64 <-> bool, uint64 <-> bool in safeGet().
+    if (target != which
+           && (!isInt64OrUInt64orBoolFieldType(target) || !isInt64OrUInt64orBoolFieldType(which)))
+        throw Exception(ErrorCodes::BAD_GET,
+            "Bad get: has {}, requested {}", getTypeName(), target);
 
     return get<T>();
 }
 
+
 template <typename T>
 requires not_field_or_bool_or_stringlike<T>
 Field::Field(T && rhs)
diff --git a/src/Core/InterpolateDescription.cpp b/src/Core/InterpolateDescription.cpp
index 86681fdb591..d828c2e85e9 100644
--- a/src/Core/InterpolateDescription.cpp
+++ b/src/Core/InterpolateDescription.cpp
@@ -13,10 +13,10 @@
 
 namespace DB
 {
-    InterpolateDescription::InterpolateDescription(ActionsDAG actions_, const Aliases & aliases)
-        : actions(std::move(actions_))
+    InterpolateDescription::InterpolateDescription(ActionsDAGPtr actions_, const Aliases & aliases)
+        : actions(actions_)
     {
-        for (const auto & name_type : actions.getRequiredColumns())
+        for (const auto & name_type : actions->getRequiredColumns())
         {
             if (const auto & p = aliases.find(name_type.name); p != aliases.end())
                 required_columns_map[p->second->getColumnName()] = name_type;
@@ -24,7 +24,7 @@ namespace DB
                 required_columns_map[name_type.name] = name_type;
         }
 
-        for (const ColumnWithTypeAndName & column : actions.getResultColumns())
+        for (const ColumnWithTypeAndName & column : actions->getResultColumns())
         {
             std::string name = column.name;
             if (const auto & p = aliases.find(name); p != aliases.end())
diff --git a/src/Core/InterpolateDescription.h b/src/Core/InterpolateDescription.h
index eeead71d780..62d7120508b 100644
--- a/src/Core/InterpolateDescription.h
+++ b/src/Core/InterpolateDescription.h
@@ -5,20 +5,21 @@
 #include <string>
 #include <Core/NamesAndTypes.h>
 #include <Parsers/IAST_fwd.h>
-#include <Interpreters/ActionsDAG.h>
 
 
 namespace DB
 {
 
+class ActionsDAG;
+using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
 using Aliases = std::unordered_map<String, ASTPtr>;
 
 /// Interpolate description
 struct InterpolateDescription
 {
-    explicit InterpolateDescription(ActionsDAG actions, const Aliases & aliases);
+    explicit InterpolateDescription(ActionsDAGPtr actions, const Aliases & aliases);
 
-    ActionsDAG actions;
+    ActionsDAGPtr actions;
 
     std::unordered_map<std::string, NameAndTypePair> required_columns_map; /// input column name -> {alias, type}
     std::unordered_set<std::string> result_columns_set; /// result block columns
diff --git a/src/Core/MySQL/MySQLGtid.cpp b/src/Core/MySQL/MySQLGtid.cpp
index 28b583a0cfe..7916f882979 100644
--- a/src/Core/MySQL/MySQLGtid.cpp
+++ b/src/Core/MySQL/MySQLGtid.cpp
@@ -24,7 +24,9 @@ void GTIDSet::tryMerge(size_t i)
 void GTIDSets::parse(String gtid_format)
 {
     if (gtid_format.empty())
+    {
         return;
+    }
 
     std::vector<String> gtid_sets;
     boost::split(gtid_sets, gtid_format, [](char c) { return c == ','; });
diff --git a/src/Core/MySQL/tests/gtest_MySQLGtid.cpp b/src/Core/MySQL/tests/gtest_MySQLGtid.cpp
index e5a2fe44e5c..e31a87aaa39 100644
--- a/src/Core/MySQL/tests/gtest_MySQLGtid.cpp
+++ b/src/Core/MySQL/tests/gtest_MySQLGtid.cpp
@@ -10,19 +10,20 @@ GTEST_TEST(GTIDSetsContains, Tests)
              contained1, contained2, contained3, contained4, contained5,
              not_contained1, not_contained2, not_contained3, not_contained4, not_contained5, not_contained6;
 
-    gtid_set.parse("2174B383-5441-11E8-B90A-C80AA9429562:1-3:11:47-49, FBC30C64-F8C9-4DDF-8CDD-066208EB433B:1-19:47-49:60");
-    contained1.parse("2174B383-5441-11E8-B90A-C80AA9429562:1-3:11:47-49, FBC30C64-F8C9-4DDF-8CDD-066208EB433B:1-19:47-49:60");
+    gtid_set.parse("2174B383-5441-11E8-B90A-C80AA9429562:1-3:11:47-49, 24DA167-0C0C-11E8-8442-00059A3C7B00:1-19:47-49:60");
+    contained1.parse("2174B383-5441-11E8-B90A-C80AA9429562:1-3:11:47-49, 24DA167-0C0C-11E8-8442-00059A3C7B00:1-19:47-49:60");
     contained2.parse("2174B383-5441-11E8-B90A-C80AA9429562:2-3:11:47-49");
     contained3.parse("2174B383-5441-11E8-B90A-C80AA9429562:11");
-    contained4.parse("FBC30C64-F8C9-4DDF-8CDD-066208EB433B:2-16:47-49:60");
-    contained5.parse("FBC30C64-F8C9-4DDF-8CDD-066208EB433B:60");
+    contained4.parse("24DA167-0C0C-11E8-8442-00059A3C7B00:2-16:47-49:60");
+    contained5.parse("24DA167-0C0C-11E8-8442-00059A3C7B00:60");
 
-    not_contained1.parse("2174B383-5441-11E8-B90A-C80AA9429562:1-3:11:47-50, FBC30C64-F8C9-4DDF-8CDD-066208EB433B:1-19:47-49:60");
+    not_contained1.parse("2174B383-5441-11E8-B90A-C80AA9429562:1-3:11:47-50, 24DA167-0C0C-11E8-8442-00059A3C7B00:1-19:47-49:60");
     not_contained2.parse("2174B383-5441-11E8-B90A-C80AA9429562:0-3:11:47-49");
     not_contained3.parse("2174B383-5441-11E8-B90A-C80AA9429562:99");
-    not_contained4.parse("FBC30C64-F8C9-4DDF-8CDD-066208EB433B:2-16:46-49:60");
-    not_contained5.parse("FBC30C64-F8C9-4DDF-8CDD-066208EB433B:99");
-    not_contained6.parse("2174B383-5441-11E8-B90A-C80AA9429562:1-3:11:47-49, FBC30C64-F8C9-4DDF-8CDD-066208EB433B:1-19:47-49:60, 00000000-0000-0000-0000-000000000000");
+    not_contained4.parse("24DA167-0C0C-11E8-8442-00059A3C7B00:2-16:46-49:60");
+    not_contained5.parse("24DA167-0C0C-11E8-8442-00059A3C7B00:99");
+    not_contained6.parse("2174B383-5441-11E8-B90A-C80AA9429562:1-3:11:47-49, 24DA167-0C0C-11E8-8442-00059A3C7B00:1-19:47-49:60, 00000000-0000-0000-0000-000000000000");
+
 
     ASSERT_TRUE(gtid_set.contains(contained1));
     ASSERT_TRUE(gtid_set.contains(contained2));
diff --git a/src/Core/PostgreSQL/PoolWithFailover.cpp b/src/Core/PostgreSQL/PoolWithFailover.cpp
index 054fc3b2226..5014564dbe0 100644
--- a/src/Core/PostgreSQL/PoolWithFailover.cpp
+++ b/src/Core/PostgreSQL/PoolWithFailover.cpp
@@ -23,7 +23,7 @@ namespace postgres
 {
 
 PoolWithFailover::PoolWithFailover(
-    const ReplicasConfigurationByPriority & configurations_by_priority,
+    const DB::ExternalDataSourcesConfigurationByPriority & configurations_by_priority,
     size_t pool_size,
     size_t pool_wait_timeout_,
     size_t max_tries_,
diff --git a/src/Core/PostgreSQL/PoolWithFailover.h b/src/Core/PostgreSQL/PoolWithFailover.h
index 2237c752367..502a9a9b7d7 100644
--- a/src/Core/PostgreSQL/PoolWithFailover.h
+++ b/src/Core/PostgreSQL/PoolWithFailover.h
@@ -8,6 +8,7 @@
 #include "ConnectionHolder.h"
 #include <mutex>
 #include <Poco/Util/AbstractConfiguration.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 #include <Storages/StoragePostgreSQL.h>
 
 
@@ -19,12 +20,12 @@ namespace postgres
 
 class PoolWithFailover
 {
-public:
-    using ReplicasConfigurationByPriority = std::map<size_t, std::vector<DB::StoragePostgreSQL::Configuration>>;
-    using RemoteDescription = std::vector<std::pair<String, uint16_t>>;
 
+using RemoteDescription = std::vector<std::pair<String, uint16_t>>;
+
+public:
     PoolWithFailover(
-        const ReplicasConfigurationByPriority & configurations_by_priority,
+        const DB::ExternalDataSourcesConfigurationByPriority & configurations_by_priority,
         size_t pool_size,
         size_t pool_wait_timeout,
         size_t max_tries_,
diff --git a/src/Core/ProtocolDefines.h b/src/Core/ProtocolDefines.h
index 790987272fa..7e6893c6d85 100644
--- a/src/Core/ProtocolDefines.h
+++ b/src/Core/ProtocolDefines.h
@@ -81,11 +81,6 @@ static constexpr auto DBMS_MIN_REVISION_WITH_TABLE_READ_ONLY_CHECK = 54467;
 
 static constexpr auto DBMS_MIN_REVISION_WITH_SYSTEM_KEYWORDS_TABLE = 54468;
 
-static constexpr auto DBMS_MIN_REVISION_WITH_ROWS_BEFORE_AGGREGATION = 54469;
-
-/// Packets size header
-static constexpr auto DBMS_MIN_PROTOCOL_VERSION_WITH_CHUNKED_PACKETS = 54470;
-
 /// Version of ClickHouse TCP protocol.
 ///
 /// Should be incremented manually on protocol changes.
@@ -93,6 +88,6 @@ static constexpr auto DBMS_MIN_PROTOCOL_VERSION_WITH_CHUNKED_PACKETS = 54470;
 /// 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 = 54470;
+static constexpr auto DBMS_TCP_PROTOCOL_VERSION = 54468;
 
 }
diff --git a/src/Core/Range.cpp b/src/Core/Range.cpp
index 1a5ce1e012e..956b96653a1 100644
--- a/src/Core/Range.cpp
+++ b/src/Core/Range.cpp
@@ -62,27 +62,27 @@ void Range::shrinkToIncludedIfPossible()
 {
     if (left.isExplicit() && !left_included)
     {
-        if (left.getType() == Field::Types::UInt64 && left.safeGet<UInt64>() != std::numeric_limits<UInt64>::max())
+        if (left.getType() == Field::Types::UInt64 && left.get<UInt64>() != std::numeric_limits<UInt64>::max())
         {
-            ++left.safeGet<UInt64 &>();
+            ++left.get<UInt64 &>();
             left_included = true;
         }
-        if (left.getType() == Field::Types::Int64 && left.safeGet<Int64>() != std::numeric_limits<Int64>::max())
+        if (left.getType() == Field::Types::Int64 && left.get<Int64>() != std::numeric_limits<Int64>::max())
         {
-            ++left.safeGet<Int64 &>();
+            ++left.get<Int64 &>();
             left_included = true;
         }
     }
     if (right.isExplicit() && !right_included)
     {
-        if (right.getType() == Field::Types::UInt64 && right.safeGet<UInt64>() != std::numeric_limits<UInt64>::min())
+        if (right.getType() == Field::Types::UInt64 && right.get<UInt64>() != std::numeric_limits<UInt64>::min())
         {
-            --right.safeGet<UInt64 &>();
+            --right.get<UInt64 &>();
             right_included = true;
         }
-        if (right.getType() == Field::Types::Int64 && right.safeGet<Int64>() != std::numeric_limits<Int64>::min())
+        if (right.getType() == Field::Types::Int64 && right.get<Int64>() != std::numeric_limits<Int64>::min())
         {
-            --right.safeGet<Int64 &>();
+            --right.get<Int64 &>();
             right_included = true;
         }
     }
diff --git a/src/Core/ServerSettings.cpp b/src/Core/ServerSettings.cpp
index 6c498014996..fbf86d3e9ad 100644
--- a/src/Core/ServerSettings.cpp
+++ b/src/Core/ServerSettings.cpp
@@ -1,4 +1,4 @@
-#include <Core/ServerSettings.h>
+#include "ServerSettings.h"
 #include <Poco/Util/AbstractConfiguration.h>
 
 namespace DB
diff --git a/src/Core/ServerSettings.h b/src/Core/ServerSettings.h
index 18ee096569a..28b32a6e6a5 100644
--- a/src/Core/ServerSettings.h
+++ b/src/Core/ServerSettings.h
@@ -66,15 +66,6 @@ namespace DB
     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)  \
     \
-    /* Database Catalog */ \
-    M(UInt64, database_atomic_delay_before_drop_table_sec, 8 * 60, "The delay during which a dropped table can be restored using the UNDROP statement. If DROP TABLE ran with a SYNC modifier, the setting is ignored.", 0) \
-    M(UInt64, database_catalog_unused_dir_hide_timeout_sec, 60 * 60, "Parameter of a task that cleans up garbage from store/ directory. If some subdirectory is not used by clickhouse-server and this directory was not modified for last database_catalog_unused_dir_hide_timeout_sec seconds, the task will 'hide' this directory by removing all access rights. It also works for directories that clickhouse-server does not expect to see inside store/. Zero means 'immediately'.", 0) \
-    M(UInt64, database_catalog_unused_dir_rm_timeout_sec, 30 * 24 * 60 * 60, "Parameter of a task that cleans up garbage from store/ directory. If some subdirectory is not used by clickhouse-server and it was previously 'hidden' (see database_catalog_unused_dir_hide_timeout_sec) and this directory was not modified for last database_catalog_unused_dir_rm_timeout_sec seconds, the task will remove this directory. It also works for directories that clickhouse-server does not expect to see inside store/. Zero means 'never'.", 0) \
-    M(UInt64, database_catalog_unused_dir_cleanup_period_sec, 24 * 60 * 60, "Parameter of a task that cleans up garbage from store/ directory. Sets scheduling period of the task. Zero means 'never'.", 0) \
-    M(UInt64, database_catalog_drop_error_cooldown_sec, 5, "In case if drop table failed, ClickHouse will wait for this timeout before retrying the operation.", 0) \
-    M(UInt64, database_catalog_drop_table_concurrency, 16, "The size of the threadpool used for dropping tables.", 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) \
@@ -106,8 +97,6 @@ namespace DB
     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(Bool, dns_allow_resolve_names_to_ipv4, true, "Allows resolve names to ipv4 addresses.", 0) \
-    M(Bool, dns_allow_resolve_names_to_ipv6, true, "Allows resolve names to ipv6 addresses.", 0) \
     \
     M(UInt64, max_table_size_to_drop, 50000000000lu, "If size of a table is greater than this value (in bytes) than table could not be dropped with any DROP query.", 0) \
     M(UInt64, max_partition_size_to_drop, 50000000000lu, "Same as max_table_size_to_drop, but for the partitions.", 0) \
@@ -136,7 +125,6 @@ namespace DB
     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(UInt64, max_keep_alive_requests, 10000, "The maximum number of requests handled via a single http keepalive connection before the server closes this 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) \
     M(Seconds, replicated_fetches_http_receive_timeout, 0, "HTTP receive timeout for fetch part requests. Inherited from default profile `http_receive_timeout` if not set explicitly.", 0) \
@@ -148,7 +136,6 @@ namespace DB
     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, database_replicated_allow_detach_permanently, true, "Allow detaching tables permanently in Replicated databases", 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) \
@@ -170,8 +157,6 @@ namespace DB
     M(Bool, prepare_system_log_tables_on_startup, false, "If true, ClickHouse creates all configured `system.*_log` tables before the startup. It can be helpful if some startup scripts depend on these tables.", 0) \
     M(Double, gwp_asan_force_sample_probability, 0.0003, "Probability that an allocation from specific places will be sampled by GWP Asan (i.e. PODArray allocations)", 0) \
     M(UInt64, config_reload_interval_ms, 2000, "How often clickhouse will reload config and check for new changes", 0) \
-    M(UInt64, memory_worker_period_ms, 0, "Tick period of background memory worker which corrects memory tracker memory usages and cleans up unused pages during higher memory usage. If set to 0, default value will be used depending on the memory usage source", 0) \
-    M(Bool, disable_insertion_and_mutation, false, "Disable all insert/alter/delete queries. This setting will be enabled if someone needs read-only nodes to prevent insertion and mutation affect reading performance.", 0)
 
 /// If you add a setting which can be updated at runtime, please update 'changeable_settings' map in StorageSystemServerSettings.cpp
 
diff --git a/src/Core/Settings.cpp b/src/Core/Settings.cpp
index 45bd2b9eb42..9c9c9c1db00 100644
--- a/src/Core/Settings.cpp
+++ b/src/Core/Settings.cpp
@@ -118,7 +118,7 @@ void Settings::set(std::string_view name, const Field & value)
     {
         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.safeGet<String>());
+        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,
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index 3a2c7b12b13..c0e340afe37 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -1,8 +1,5 @@
 #pragma once
 
-/// CLion freezes for a minute on every keypress in any file including this.
-#if !defined(__CLION_IDE__)
-
 #include <Common/NamePrompter.h>
 #include <Core/BaseSettings.h>
 #include <Core/SettingsEnums.h>
@@ -186,7 +183,7 @@ class IColumn;
     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. Due to a bug in the LLVM compiler infrastructure, on AArch64 machines, it is known to lead to a nullptr dereference and, consequently, server crash. Do not enable this setting.", 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) \
     M(UInt64, min_count_to_compile_aggregate_expression, 3, "The number of identical aggregate expressions before they are JIT-compiled", 0) \
@@ -325,7 +322,6 @@ class IColumn;
     \
     M(Bool, join_use_nulls, false, "Use NULLs for non-joined rows of outer JOINs for types that can be inside Nullable. If false, use default value of corresponding columns data type.", IMPORTANT) \
     \
-    M(Int32, join_output_by_rowlist_perkey_rows_threshold, 5, "The lower limit of per-key average rows in the right table to determine whether to output by row list in hash join.", 0) \
     M(JoinStrictness, join_default_strictness, JoinStrictness::All, "Set default strictness in JOIN query. Possible values: empty string, 'ANY', 'ALL'. If empty, query without strictness will throw exception.", 0) \
     M(Bool, any_join_distinct_right_table_keys, false, "Enable old ANY JOIN logic with many-to-one left-to-right table keys mapping for all ANY JOINs. It leads to confusing not equal results for 't1 ANY LEFT JOIN t2' and 't2 ANY RIGHT JOIN t1'. ANY RIGHT JOIN needs one-to-many keys mapping to be consistent with LEFT one.", IMPORTANT) \
     M(Bool, single_join_prefer_left_table, true, "For single JOIN in case of identifier ambiguity prefer left table", IMPORTANT) \
@@ -594,6 +590,7 @@ class IColumn;
     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(LightweightMutationProjectionMode, lightweight_mutation_projection_mode, LightweightMutationProjectionMode::THROW, "When lightweight delete happens on a table with projection(s), the possible operations include throw the exception as projection exists, or drop all projection related to this table then do lightweight delete.", 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) \
@@ -605,7 +602,7 @@ class IColumn;
     M(Bool, optimize_if_chain_to_multiif, false, "Replace if(cond1, then1, if(cond2, ...)) chains to multiIf. Currently it's not beneficial for numeric types.", 0) \
     M(Bool, optimize_multiif_to_if, true, "Replace 'multiIf' with only one condition to 'if'.", 0) \
     M(Bool, optimize_if_transform_strings_to_enum, false, "Replaces string-type arguments in If and Transform to enum. Disabled by default cause it could make inconsistent change in distributed query that would lead to its fail.", 0) \
-    M(Bool, optimize_functions_to_subcolumns, true, "Transform functions to subcolumns, if possible, to reduce amount of read data. E.g. 'length(arr)' -> 'arr.size0', 'col IS NULL' -> 'col.null' ", 0) \
+    M(Bool, optimize_functions_to_subcolumns, false, "Transform functions to subcolumns, if possible, to reduce amount of read data. E.g. 'length(arr)' -> 'arr.size0', 'col IS NULL' -> 'col.null' ", 0) \
     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) \
@@ -616,7 +613,6 @@ class IColumn;
     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, 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 target table during pushing to views", 0) \
-    M(Bool, allow_materialized_view_with_bad_select, true, "Allow CREATE MATERIALIZED VIEW with SELECT query that references nonexistent tables or columns. It must still be syntactically valid. Doesn't apply to refreshable MVs. Doesn't apply if the MV schema needs to be inferred from the SELECT query (i.e. if the CREATE has no column list and no TO table). Can be used for creating MV before its source table.", 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) \
@@ -677,7 +673,6 @@ class IColumn;
     M(Bool, query_cache_squash_partial_results, true, "Squash partial result blocks to blocks of size 'max_block_size'. Reduces performance of inserts into the query cache but improves the compressability of cache entries.", 0) \
     M(Seconds, query_cache_ttl, 60, "After this time in seconds entries in the query cache become stale", 0) \
     M(Bool, query_cache_share_between_users, false, "Allow other users to read entry in the query cache", 0) \
-    M(String, query_cache_tag, "", "A string which acts as a label for query cache entries. The same queries with different tags are considered different by the query cache.", 0) \
     M(Bool, enable_sharing_sets_for_mutations, true, "Allow sharing set objects build for IN subqueries between different tasks of the same mutation. This reduces memory usage and CPU consumption", 0) \
     \
     M(Bool, optimize_rewrite_sum_if_to_count_if, true, "Rewrite sumIf() and sum(if()) function countIf() function when logically equivalent", 0) \
@@ -692,7 +687,6 @@ class IColumn;
     M(UInt64, max_size_to_preallocate_for_joins, 100'000'000, "For how many elements it is allowed to preallocate space in all hash tables in total before join", 0) \
     \
     M(Bool, kafka_disable_num_consumers_limit, false, "Disable limit on kafka_num_consumers that depends on the number of available CPU cores", 0) \
-    M(Bool, allow_experimental_kafka_offsets_storage_in_keeper, false, "Allow experimental feature to store Kafka related offsets in ClickHouse Keeper. When enabled a ClickHouse Keeper path and replica name can be specified to the Kafka table engine. As a result instead of the regular Kafka engine, a new type of storage engine will be used that stores the committed offsets primarily in ClickHouse Keeper", 0) \
     M(Bool, enable_software_prefetch_in_aggregation, true, "Enable use of software prefetch in aggregation", 0) \
     M(Bool, allow_aggregate_partitions_independently, false, "Enable independent aggregation of partitions on separate threads when partition key suits group by key. Beneficial when number of partitions close to number of cores and partitions have roughly the same size", 0) \
     M(Bool, force_aggregate_partitions_independently, false, "Force the use of optimization when it is applicable, but heuristics decided not to use it", 0) \
@@ -710,8 +704,7 @@ class IColumn;
     M(UInt64, max_distributed_depth, 5, "Maximum distributed query depth", 0) \
     M(Bool, database_replicated_always_detach_permanently, false, "Execute DETACH TABLE as DETACH TABLE PERMANENTLY if database engine is Replicated", 0) \
     M(Bool, database_replicated_allow_only_replicated_engine, false, "Allow to create only Replicated tables in database with engine Replicated", 0) \
-    M(UInt64, database_replicated_allow_replicated_engine_arguments, 0, "0 - Don't allow to explicitly specify ZooKeeper path and replica name for *MergeTree tables in Replicated databases. 1 - Allow. 2 - Allow, but ignore the specified path and use default one instead.", 0) \
-    M(UInt64, database_replicated_allow_explicit_uuid, 0, "0 - Don't allow to explicitly specify UUIDs for tables in Replicated databases. 1 - Allow. 2 - Allow, but ignore the specified UUID and generate a random one instead.", 0) \
+    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, database_replicated_allow_heavy_create, false, "Allow long-running DDL queries (CREATE AS SELECT and POPULATE) in Replicated database engine. Note that it can block DDL queue for a long time.", 0) \
     M(Bool, cloud_mode, false, "Only available in ClickHouse Cloud", 0) \
     M(UInt64, cloud_mode_engine, 1, "Only available in ClickHouse Cloud", 0) \
@@ -770,7 +763,7 @@ class IColumn;
     M(UInt64, merge_tree_min_rows_for_concurrent_read_for_remote_filesystem, (20 * 8192), "If at least as many lines are read from one file, the reading can be parallelized, when reading from remote filesystem.", 0) \
     M(UInt64, merge_tree_min_bytes_for_concurrent_read_for_remote_filesystem, (24 * 10 * 1024 * 1024), "If at least as many bytes are read from one file, the reading can be parallelized, when reading from remote filesystem.", 0) \
     M(UInt64, remote_read_min_bytes_for_seek, 4 * DBMS_DEFAULT_BUFFER_SIZE, "Min bytes required for remote read (url, s3) to do seek, instead of read with ignore.", 0) \
-    M(UInt64, merge_tree_min_bytes_per_task_for_remote_reading, 2 * DBMS_DEFAULT_BUFFER_SIZE, "Min bytes to read per task.", 0) ALIAS(filesystem_prefetch_min_bytes_for_single_read_task) \
+    M(UInt64, merge_tree_min_bytes_per_task_for_remote_reading, 4 * DBMS_DEFAULT_BUFFER_SIZE, "Min bytes to read per task.", 0) \
     M(Bool, merge_tree_use_const_size_tasks_for_remote_reading, true, "Whether to use constant size tasks for reading from a remote table.", 0) \
     M(Bool, merge_tree_determine_task_size_by_prewhere_columns, true, "Whether to use only prewhere columns size to determine reading task size.", 0) \
     M(UInt64, merge_tree_compact_parts_min_granules_to_multibuffer_read, 16, "Only available in ClickHouse Cloud", 0) \
@@ -812,6 +805,7 @@ class IColumn;
     M(UInt64, prefetch_buffer_size, DBMS_DEFAULT_BUFFER_SIZE, "The maximum size of the prefetch buffer to read from the filesystem.", 0) \
     M(UInt64, filesystem_prefetch_step_bytes, 0, "Prefetch step in bytes. Zero means `auto` - approximately the best prefetch step will be auto deduced, but might not be 100% the best. The actual value might be different because of setting filesystem_prefetch_min_bytes_for_single_read_task", 0) \
     M(UInt64, filesystem_prefetch_step_marks, 0, "Prefetch step in marks. Zero means `auto` - approximately the best prefetch step will be auto deduced, but might not be 100% the best. The actual value might be different because of setting filesystem_prefetch_min_bytes_for_single_read_task", 0) \
+    M(UInt64, filesystem_prefetch_min_bytes_for_single_read_task, "2Mi", "Do not parallelize within one file read less than this amount of bytes. E.g. one reader will not receive a read task of size less than this amount. This setting is recommended to avoid spikes of time for aws getObject requests to aws", 0) \
     M(UInt64, filesystem_prefetch_max_memory_usage, "1Gi", "Maximum memory usage for prefetches.", 0) \
     M(UInt64, filesystem_prefetches_limit, 200, "Maximum number of prefetches. Zero means unlimited. A setting `filesystem_prefetches_max_memory_usage` is more recommended if you want to limit the number of prefetches", 0) \
     \
@@ -880,10 +874,9 @@ class IColumn;
     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) \
     M(Bool, cast_string_to_dynamic_use_inference, false, "Use types inference during String to Dynamic conversion", 0) \
     M(Bool, enable_blob_storage_log, true, "Write information about blob storage operations to system.blob_storage_log table", 0) \
-    M(Bool, use_json_alias_for_old_object_type, false, "When enabled, JSON type alias will create old experimental Object type instead of a new JSON type", 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 the DESCRIBE query and `toTypeName` function, as well as in the `SHOW CREATE TABLE` query and the `formatQuery` function.", 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(SQLSecurityType, default_normal_view_sql_security, SQLSecurityType::INVOKER, "Allows to set a default value for SQL SECURITY option when creating a normal view.", 0) \
@@ -898,9 +891,6 @@ class IColumn;
     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_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(Bool, restore_replace_external_engines_to_null, false, "Replace all the external table engines to Null on restore. Useful for testing purposes", 0) \
-    M(Bool, restore_replace_external_table_functions_to_null, false, "Replace all table functions to Null on restore. Useful for testing purposes", 0) \
-    M(Bool, create_if_not_exists, false, "Enable IF NOT EXISTS for CREATE statements by default", 0) \
     \
     \
     /* ###################################### */ \
@@ -911,23 +901,20 @@ 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_time_series_table, false, "Allows experimental TimeSeries table engine", 0) \
-    M(Bool, allow_experimental_vector_similarity_index, false, "Allow experimental vector similarity index", 0) \
     M(Bool, allow_experimental_variant_type, false, "Allow Variant data type", 0) \
     M(Bool, allow_experimental_dynamic_type, false, "Allow Dynamic data type", 0) \
-    M(Bool, allow_experimental_json_type, false, "Allow JSON 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(Bool, allow_experimental_codecs, false, "If it is set to true, allow to specify experimental compression codecs (but we don't have those yet and this option does nothing).", 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) \
+    M(UInt64, max_threads_for_annoy_index_creation, 4, "Number of threads used to build Annoy indexes (0 means all cores, not recommended)", 0) \
+    M(Int64, annoy_index_search_k_nodes, -1, "SELECT queries search up to this many nodes in Annoy indexes.", 0) \
     M(Bool, throw_on_unsupported_query_inside_transaction, true, "Throw exception if unsupported query is used inside transaction", 0) \
     M(TransactionsWaitCSNMode, wait_changes_become_visible_after_commit_mode, TransactionsWaitCSNMode::WAIT_UNKNOWN, "Wait for committed changes to become actually visible in the latest snapshot", 0) \
     M(Bool, implicit_transaction, false, "If enabled and not already inside a transaction, wraps the query inside a full transaction (begin + commit or rollback)", 0) \
     M(UInt64, grace_hash_join_initial_buckets, 1, "Initial number of grace hash join buckets", 0) \
     M(UInt64, grace_hash_join_max_buckets, 1024, "Limit on the number of grace hash join buckets", 0) \
-    M(Int32, join_to_sort_minimum_perkey_rows, 40, "The lower limit of per-key average rows in the right table to determine whether to rerange the right table by key in left or inner join. This setting ensures that the optimization is not applied for sparse table keys", 0) \
-    M(Int32, join_to_sort_maximum_table_rows, 10000, "The maximum number of rows in the right table to determine whether to rerange the right table by key in left or inner join.", 0) \
-    M(Bool, allow_experimental_join_right_table_sorting, false, "If it is set to true, and the conditions of `join_to_sort_minimum_perkey_rows` and `join_to_sort_maximum_table_rows` are met, rerange the right table by key to improve the performance in left or inner hash join.", 0) \
     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, use_hive_partitioning, false, "Allows to use hive partitioning for File, URL, S3, AzureBlobStorage and HDFS engines.", 0)\
     \
     M(Bool, allow_statistics_optimize, false, "Allows using statistics to optimize queries", 0) ALIAS(allow_statistic_optimize) \
     M(Bool, allow_experimental_statistics, false, "Allows using statistics", 0) ALIAS(allow_experimental_statistic) \
@@ -948,14 +935,14 @@ class IColumn;
     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, allow_archive_path_syntax, true, "File/S3 engines/table function will parse paths with '::' as '<archive> :: <file>' if archive has correct extension", 0) \
-    M(Bool, parallel_replicas_local_plan, false, "Build local plan for local replica", 0) \
     \
     M(Bool, allow_experimental_inverted_index, false, "If it is set to true, allow to use experimental inverted index.", 0) \
     M(Bool, allow_experimental_full_text_index, false, "If it is set to true, allow to use experimental full-text index.", 0) \
     \
     M(Bool, allow_experimental_join_condition, false, "Support join with inequal conditions which involve columns from both left and right table. e.g. t1.y < t2.y.", 0) \
     \
-    M(Bool, allow_experimental_analyzer, true, "Allow new query analyzer.", IMPORTANT) ALIAS(enable_analyzer) \
+    /* Analyzer: It's not experimental anymore (WIP) */ \
+    M(Bool, allow_experimental_analyzer, true, "Allow new query analyzer.", IMPORTANT) \
     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, allow_experimental_live_view, false, "Enable LIVE VIEW. Not mature enough.", 0) \
@@ -1044,10 +1031,6 @@ class IColumn;
     MAKE_OBSOLETE(M, UInt64, parallel_replicas_min_number_of_granules_to_enable, 0) \
     MAKE_OBSOLETE(M, Bool, query_plan_optimize_projection, true) \
     MAKE_OBSOLETE(M, Bool, query_cache_store_results_of_queries_with_nondeterministic_functions, false) \
-    MAKE_OBSOLETE(M, Bool, allow_experimental_annoy_index, false) \
-    MAKE_OBSOLETE(M, UInt64, max_threads_for_annoy_index_creation, 4) \
-    MAKE_OBSOLETE(M, Int64, annoy_index_search_k_nodes, -1) \
-    MAKE_OBSOLETE(M, Bool, allow_experimental_usearch_index, false) \
     MAKE_OBSOLETE(M, Bool, optimize_move_functions_out_of_any, false) \
     MAKE_OBSOLETE(M, Bool, allow_experimental_undrop_table_query, true) \
     MAKE_OBSOLETE(M, Bool, allow_experimental_s3queue, true) \
@@ -1141,13 +1124,10 @@ class IColumn;
     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_json_ignore_unnecessary_fields, true, "Ignore unnecessary fields and not parse them. Enabling this may not throw exceptions on json strings of invalid format or with duplicated fields", 0) \
-    M(Bool, input_format_try_infer_variants, false, "Try to infer the Variant type in text formats when there is more than one possible type for column/array elements", 0) \
-    M(Bool, type_json_skip_duplicated_paths, false, "When enabled, during parsing JSON object into JSON type duplicated paths will be ignored and only the first one will be inserted instead of an exception", 0) \
-    M(UInt64, input_format_json_max_depth, 1000, "Maximum depth of a field in JSON. This is not a strict limit, it does not have to be applied precisely.", 0) \
+    M(Bool, input_format_json_case_insensitive_column_matching, false, "Ignore case when matching JSON keys with CH columns", 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_datetimes_only_datetime64, false, "When input_format_try_infer_datetimes is enabled, infer only DateTime64 but not DateTime types", 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) \
@@ -1175,6 +1155,7 @@ class IColumn;
     M(Bool, input_format_values_interpret_expressions, true, "For Values format: if the field could not be parsed by streaming parser, run SQL parser and try to interpret it as SQL expression.", 0) \
     M(Bool, input_format_values_deduce_templates_of_expressions, true, "For Values format: if the field could not be parsed by streaming parser, run SQL parser, deduce template of the SQL expression, try to parse all rows using template and then interpret expression for all rows.", 0) \
     M(Bool, input_format_values_accurate_types_of_literals, true, "For Values format: when parsing and interpreting expressions using template, check actual type of literal to avoid possible overflow and precision issues.", 0) \
+    M(Bool, input_format_values_allow_data_after_semicolon, false, "For Values format: allow extra data after semicolon (used by client to interpret comments).", 0) \
     M(Bool, input_format_avro_allow_missing_fields, false, "For Avro/AvroConfluent format: when field is not found in schema use default value instead of error", 0) \
     /** This setting is obsolete and do nothing, left for compatibility reasons. */ \
     M(Bool, input_format_avro_null_as_default, false, "For Avro/AvroConfluent format: insert default in case of null and non Nullable column", 0) \
@@ -1258,7 +1239,6 @@ class IColumn;
     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(Bool, rows_before_aggregation, false, "When enabled, ClickHouse will provide exact value for rows_before_aggregation statistic, represents the number of rows read before aggregation", 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) \
@@ -1301,9 +1281,6 @@ class IColumn;
     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) \
-    \
-    M(Bool, output_format_always_quote_identifiers, false, "Always quote identifiers", 0) \
-    M(IdentifierQuotingStyle, output_format_identifier_quoting_style, IdentifierQuotingStyle::Backticks, "Set the quoting style for identifiers", 0) \
 
 
 // End of FORMAT_FACTORY_SETTINGS
@@ -1372,5 +1349,3 @@ struct FormatFactorySettings : public BaseSettings<FormatFactorySettingsTraits>
 };
 
 }
-
-#endif
diff --git a/src/Core/SettingsChangesHistory.cpp b/src/Core/SettingsChangesHistory.cpp
index 6bd354ce05b..671ee287b04 100644
--- a/src/Core/SettingsChangesHistory.cpp
+++ b/src/Core/SettingsChangesHistory.cpp
@@ -57,474 +57,265 @@ String ClickHouseVersion::toString() const
 /// Note: please check if the key already exists to prevent duplicate entries.
 static std::initializer_list<std::pair<ClickHouseVersion, SettingsChangesHistory::SettingsChanges>> settings_changes_history_initializer =
 {
-    {"24.12",
-        {
-        }
-    },
-    {"24.11",
-        {
-        }
-    },
-    {"24.10",
-        {
-        }
-    },
-    {"24.9",
-        {
-            {"input_format_try_infer_variants", false, false, "Try to infer Variant type in text formats when there is more than one possible type for column/array elements"},
-            {"join_output_by_rowlist_perkey_rows_threshold", 0, 5, "The lower limit of per-key average rows in the right table to determine whether to output by row list in hash join."},
-            {"create_if_not_exists", false, false, "New setting."},
-            {"allow_materialized_view_with_bad_select", true, true, "Support (but not enable yet) stricter validation in CREATE MATERIALIZED VIEW"},
-            {"output_format_always_quote_identifiers", false, false, "New setting."},
-            {"output_format_identifier_quoting_style", "Backticks", "Backticks", "New setting."},
-            {"database_replicated_allow_replicated_engine_arguments", 1, 0, "Don't allow explicit arguments by default"},
-            {"database_replicated_allow_explicit_uuid", 0, 0, "Added a new setting to disallow explicitly specifying table UUID"},
-            {"parallel_replicas_local_plan", false, false, "Use local plan for local replica in a query with parallel replicas"},
-            {"join_to_sort_minimum_perkey_rows", 0, 40, "The lower limit of per-key average rows in the right table to determine whether to rerange the right table by key in left or inner join. This setting ensures that the optimization is not applied for sparse table keys"},
-            {"join_to_sort_maximum_table_rows", 0, 10000, "The maximum number of rows in the right table to determine whether to rerange the right table by key in left or inner join"},
-            {"allow_experimental_join_right_table_sorting", false, false, "If it is set to true, and the conditions of `join_to_sort_minimum_perkey_rows` and `join_to_sort_maximum_table_rows` are met, rerange the right table by key to improve the performance in left or inner hash join"}
-        }
-    },
-    {"24.8",
-        {
-            {"rows_before_aggregation", false, false, "Provide exact value for rows_before_aggregation statistic, represents the number of rows read before aggregation"},
-            {"restore_replace_external_table_functions_to_null", false, false, "New setting."},
-            {"restore_replace_external_engines_to_null", false, false, "New setting."},
-            {"input_format_json_max_depth", 1000000, 1000, "It was unlimited in previous versions, but that was unsafe."},
-            {"merge_tree_min_bytes_per_task_for_remote_reading", 4194304, 2097152, "Value is unified with `filesystem_prefetch_min_bytes_for_single_read_task`"},
-            {"use_hive_partitioning", false, false, "Allows to use hive partitioning for File, URL, S3, AzureBlobStorage and HDFS engines."},
-            {"allow_experimental_kafka_offsets_storage_in_keeper", false, false, "Allow the usage of experimental Kafka storage engine that stores the committed offsets in ClickHouse Keeper"},
-            {"allow_archive_path_syntax", true, true, "Added new setting to allow disabling archive path syntax."},
-            {"query_cache_tag", "", "", "New setting for labeling query cache settings."},
-            {"allow_experimental_time_series_table", false, false, "Added new setting to allow the TimeSeries table engine"},
-            {"enable_analyzer", 1, 1, "Added an alias to a setting `allow_experimental_analyzer`."},
-            {"optimize_functions_to_subcolumns", false, true, "Enabled settings by default"},
-            {"allow_experimental_json_type", false, false, "Add new experimental JSON type"},
-            {"use_json_alias_for_old_object_type", true, false, "Use JSON type alias to create new JSON type"},
-            {"type_json_skip_duplicated_paths", false, false, "Allow to skip duplicated paths during JSON parsing"},
-            {"allow_experimental_vector_similarity_index", false, false, "Added new setting to allow experimental vector similarity indexes"},
-            {"input_format_try_infer_datetimes_only_datetime64", true, false, "Allow to infer DateTime instead of DateTime64 in data formats"},
-        }
-    },
-    {"24.7",
-        {
-            {"output_format_parquet_write_page_index", false, true, "Add a possibility to write page index into parquet files."},
-            {"output_format_binary_encode_types_in_binary_format", false, false, "Added new setting to allow to write type names in binary format in RowBinaryWithNamesAndTypes output format"},
-            {"input_format_binary_decode_types_in_binary_format", false, false, "Added new setting to allow to read type names in binary format in RowBinaryWithNamesAndTypes input format"},
-            {"output_format_native_encode_types_in_binary_format", false, false, "Added new setting to allow to write type names in binary format in Native output format"},
-            {"input_format_native_decode_types_in_binary_format", false, false, "Added new setting to allow to read type names in binary format in Native output format"},
-            {"read_in_order_use_buffering", false, true, "Use buffering before merging while reading in order of primary key"},
-            {"enable_named_columns_in_function_tuple", false, true, "Generate named tuples in function tuple() when all names are unique and can be treated as unquoted identifiers."},
-            {"optimize_trivial_insert_select", true, false, "The optimization does not make sense in many cases."},
-            {"dictionary_validate_primary_key_type", false, false, "Validate primary key type for dictionaries. By default id type for simple layouts will be implicitly converted to UInt64."},
-            {"collect_hash_table_stats_during_joins", false, true, "New setting."},
-            {"max_size_to_preallocate_for_joins", 0, 100'000'000, "New setting."},
-            {"input_format_orc_reader_time_zone_name", "GMT", "GMT", "The time zone name for ORC row reader, the default ORC row reader's time zone is GMT."},
-            {"database_replicated_allow_heavy_create", true, false, "Long-running DDL queries (CREATE AS SELECT and POPULATE) for Replicated database engine was forbidden"},
-            {"query_plan_merge_filters", false, false, "Allow to merge filters in the query plan"},
-            {"azure_sdk_max_retries", 10, 10, "Maximum number of retries in azure sdk"},
-            {"azure_sdk_retry_initial_backoff_ms", 10, 10, "Minimal backoff between retries in azure sdk"},
-            {"azure_sdk_retry_max_backoff_ms", 1000, 1000, "Maximal backoff between retries in azure sdk"},
-            {"ignore_on_cluster_for_replicated_named_collections_queries", false, false, "Ignore ON CLUSTER clause for replicated named collections management queries."},
-            {"backup_restore_s3_retry_attempts", 1000,1000, "Setting for Aws::Client::RetryStrategy, Aws::Client does retries itself, 0 means no retries. It takes place only for backup/restore."},
-            {"postgresql_connection_attempt_timeout", 2, 2, "Allow to control 'connect_timeout' parameter of PostgreSQL connection."},
-            {"postgresql_connection_pool_retries", 2, 2, "Allow to control the number of retries in PostgreSQL connection pool."}
-        }
-    },
-    {"24.6",
-        {
-            {"materialize_skip_indexes_on_insert", true, true, "Added new setting to allow to disable materialization of skip indexes on insert"},
-            {"materialize_statistics_on_insert", true, true, "Added new setting to allow to disable materialization of statistics on insert"},
-            {"input_format_parquet_use_native_reader", false, false, "When reading Parquet files, to use native reader instead of arrow reader."},
-            {"hdfs_throw_on_zero_files_match", false, false, "Allow to throw an error when ListObjects request cannot match any files in HDFS engine instead of empty query result"},
-            {"azure_throw_on_zero_files_match", false, false, "Allow to throw an error when ListObjects request cannot match any files in AzureBlobStorage engine instead of empty query result"},
-            {"s3_validate_request_settings", true, true, "Allow to disable S3 request settings validation"},
-            {"allow_experimental_full_text_index", false, false, "Enable experimental full-text index"},
-            {"azure_skip_empty_files", false, false, "Allow to skip empty files in azure table engine"},
-            {"hdfs_ignore_file_doesnt_exist", false, false, "Allow to return 0 rows when the requested files don't exist instead of throwing an exception in HDFS table engine"},
-            {"azure_ignore_file_doesnt_exist", false, false, "Allow to return 0 rows when the requested files don't exist instead of throwing an exception in AzureBlobStorage table engine"},
-            {"s3_ignore_file_doesnt_exist", false, false, "Allow to return 0 rows when the requested files don't exist instead of throwing an exception in S3 table engine"},
-            {"s3_max_part_number", 10000, 10000, "Maximum part number number for s3 upload part"},
-            {"s3_max_single_operation_copy_size", 32 * 1024 * 1024, 32 * 1024 * 1024, "Maximum size for a single copy operation in s3"},
-            {"input_format_parquet_max_block_size", 8192, DEFAULT_BLOCK_SIZE, "Increase block size for parquet reader."},
-            {"input_format_parquet_prefer_block_bytes", 0, DEFAULT_BLOCK_SIZE * 256, "Average block bytes output by parquet reader."},
-            {"enable_blob_storage_log", true, true, "Write information about blob storage operations to system.blob_storage_log table"},
-            {"allow_deprecated_snowflake_conversion_functions", true, false, "Disabled deprecated functions snowflakeToDateTime[64] and dateTime[64]ToSnowflake."},
-            {"allow_statistic_optimize", false, false, "Old setting which popped up here being renamed."},
-            {"allow_experimental_statistic", false, false, "Old setting which popped up here being renamed."},
-            {"allow_statistics_optimize", false, false, "The setting was renamed. The previous name is `allow_statistic_optimize`."},
-            {"allow_experimental_statistics", false, false, "The setting was renamed. The previous name is `allow_experimental_statistic`."},
-            {"enable_vertical_final", false, true, "Enable vertical final by default again after fixing bug"},
-            {"parallel_replicas_custom_key_range_lower", 0, 0, "Add settings to control the range filter when using parallel replicas with dynamic shards"},
-            {"parallel_replicas_custom_key_range_upper", 0, 0, "Add settings to control the range filter when using parallel replicas with dynamic shards. A value of 0 disables the upper limit"},
-            {"output_format_pretty_display_footer_column_names", 0, 1, "Add a setting to display column names in the footer if there are many rows. Threshold value is controlled by output_format_pretty_display_footer_column_names_min_rows."},
-            {"output_format_pretty_display_footer_column_names_min_rows", 0, 50, "Add a setting to control the threshold value for setting output_format_pretty_display_footer_column_names_min_rows. Default 50."},
-            {"output_format_csv_serialize_tuple_into_separate_columns", true, true, "A new way of how interpret tuples in CSV format was added."},
-            {"input_format_csv_deserialize_separate_columns_into_tuple", true, true, "A new way of how interpret tuples in CSV format was added."},
-            {"input_format_csv_try_infer_strings_from_quoted_tuples", true, true, "A new way of how interpret tuples in CSV format was added."},
-        }
-    },
-    {"24.5",
-        {
-            {"allow_deprecated_error_prone_window_functions", true, false, "Allow usage of deprecated error prone window functions (neighbor, runningAccumulate, runningDifferenceStartingWithFirstValue, runningDifference)"},
-            {"allow_experimental_join_condition", false, false, "Support join with inequal conditions which involve columns from both left and right table. e.g. t1.y < t2.y."},
-            {"input_format_tsv_crlf_end_of_line", false, false, "Enables reading of CRLF line endings with TSV formats"},
-            {"output_format_parquet_use_custom_encoder", false, true, "Enable custom Parquet encoder."},
-            {"cross_join_min_rows_to_compress", 0, 10000000, "Minimal count of rows to compress block in CROSS JOIN. Zero value means - disable this threshold. This block is compressed when any of the two thresholds (by rows or by bytes) are reached."},
-            {"cross_join_min_bytes_to_compress", 0, 1_GiB, "Minimal size of block to compress in CROSS JOIN. Zero value means - disable this threshold. This block is compressed when any of the two thresholds (by rows or by bytes) are reached."},
-            {"http_max_chunk_size", 0, 0, "Internal limitation"},
-            {"prefer_external_sort_block_bytes", 0, DEFAULT_BLOCK_SIZE * 256, "Prefer maximum block bytes for external sort, reduce the memory usage during merging."},
-            {"input_format_force_null_for_omitted_fields", false, false, "Disable type-defaults for omitted fields when needed"},
-            {"cast_string_to_dynamic_use_inference", false, false, "Add setting to allow converting String to Dynamic through parsing"},
-            {"allow_experimental_dynamic_type", false, false, "Add new experimental Dynamic type"},
-            {"azure_max_blocks_in_multipart_upload", 50000, 50000, "Maximum number of blocks in multipart upload for Azure."},
-            {"allow_archive_path_syntax", false, true, "Added new setting to allow disabling archive path syntax."},
-        }
-    },
-    {"24.4",
-        {
-            {"input_format_json_throw_on_bad_escape_sequence", true, true, "Allow to save JSON strings with bad escape sequences"},
-            {"max_parsing_threads", 0, 0, "Add a separate setting to control number of threads in parallel parsing from files"},
-            {"ignore_drop_queries_probability", 0, 0, "Allow to ignore drop queries in server with specified probability for testing purposes"},
-            {"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"},
-            {"input_format_json_ignore_unnecessary_fields", false, true, "Ignore unnecessary fields and not parse them. Enabling this may not throw exceptions on json strings of invalid format or with duplicated fields"},
-            {"input_format_hive_text_allow_variable_number_of_columns", false, true, "Ignore extra columns in Hive Text input (if file has more columns than expected) and treat missing fields in Hive Text input as default values."},
-            {"allow_experimental_database_replicated", false, true, "Database engine Replicated is now in Beta stage"},
-            {"temporary_data_in_cache_reserve_space_wait_lock_timeout_milliseconds", (10 * 60 * 1000), (10 * 60 * 1000), "Wait time to lock cache for sapce reservation in temporary data in filesystem cache"},
-            {"optimize_rewrite_sum_if_to_count_if", false, true, "Only available for the analyzer, where it works correctly"},
-            {"azure_allow_parallel_part_upload", "true", "true", "Use multiple threads for azure multipart upload."},
-            {"max_recursive_cte_evaluation_depth", DBMS_RECURSIVE_CTE_MAX_EVALUATION_DEPTH, DBMS_RECURSIVE_CTE_MAX_EVALUATION_DEPTH, "Maximum limit on recursive CTE evaluation depth"},
-            {"query_plan_convert_outer_join_to_inner_join", false, true, "Allow to convert OUTER JOIN to INNER JOIN if filter after JOIN always filters default values"},
-        }
-    },
-    {"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 in 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."},
-            {"output_format_csv_serialize_tuple_into_separate_columns", true, true, "A new way of how interpret tuples in CSV format was added."},
-            {"input_format_csv_deserialize_separate_columns_into_tuple", true, true, "A new way of how interpret tuples in CSV format was added."},
-            {"input_format_csv_try_infer_strings_from_quoted_tuples", true, true, "A new way of how interpret tuples in CSV format was added."},
-        }
-    },
-    {"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"},
-            {"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"},
-            {"input_format_arrow_allow_missing_columns", false, true, "Allow missing columns in Arrow files by default"}
-        }
-    },
-    {"23.11",
-        {
-            {"parsedatetime_parse_without_leading_zeros", false, true, "Improved compatibility with MySQL DATE_FORMAT/STR_TO_DATE"}
-        }
-    },
-    {"23.9",
-        {
-            {"optimize_group_by_constant_keys", false, true, "Optimize group by constant keys by default"},
-            {"input_format_json_try_infer_named_tuples_from_objects", false, true, "Try to infer named Tuples from JSON objects by default"},
-            {"input_format_json_read_numbers_as_strings", false, true, "Allow to read numbers as strings in JSON formats by default"},
-            {"input_format_json_read_arrays_as_strings", false, true, "Allow to read arrays as strings in JSON formats by default"},
-            {"input_format_json_infer_incomplete_types_as_strings", false, true, "Allow to infer incomplete types as Strings in JSON formats by default"},
-            {"input_format_json_try_infer_numbers_from_strings", true, false, "Don't infer numbers from strings in JSON formats by default to prevent possible parsing errors"},
-            {"http_write_exception_in_output_format", false, true, "Output valid JSON/XML on exception in HTTP streaming."}
-        }
-    },
-    {"23.8",
-        {
-            {"rewrite_count_distinct_if_with_count_distinct_implementation", false, true, "Rewrite countDistinctIf with count_distinct_implementation configuration"}
-        }
-    },
-    {"23.7",
-        {
-            {"function_sleep_max_microseconds_per_block", 0, 3000000, "In previous versions, the maximum sleep time of 3 seconds was applied only for `sleep`, but not for `sleepEachRow` function. In the new version, we introduce this setting. If you set compatibility with the previous versions, we will disable the limit altogether."}
-        }
-    },
-    {"23.6",
-        {
-            {"http_send_timeout", 180, 30, "3 minutes seems crazy long. Note that this is timeout for a single network write call, not for the whole upload operation."},
-            {"http_receive_timeout", 180, 30, "See http_send_timeout."}
-        }
-    },
-    {"23.5",
-        {
-            {"input_format_parquet_preserve_order", true, false, "Allow Parquet reader to reorder rows for better parallelism."},
-            {"parallelize_output_from_storages", false, true, "Allow parallelism when executing queries that read from file/url/s3/etc. This may reorder rows."},
-            {"use_with_fill_by_sorting_prefix", false, true, "Columns preceding WITH FILL columns in ORDER BY clause form sorting prefix. Rows with different values in sorting prefix are filled independently"},
-            {"output_format_parquet_compliant_nested_types", false, true, "Change an internal field name in output Parquet file schema."}
-        }
-    },
-    {"23.4",
-        {
-            {"allow_suspicious_indices", true, false, "If true, index can defined with identical expressions"},
-            {"allow_nonconst_timezone_arguments", true, false, "Allow non-const timezone arguments in certain time-related functions like toTimeZone(), fromUnixTimestamp*(), snowflakeToDateTime*()."},
-            {"connect_timeout_with_failover_ms", 50, 1000, "Increase default connect timeout because of async connect"},
-            {"connect_timeout_with_failover_secure_ms", 100, 1000, "Increase default secure connect timeout because of async connect"},
-            {"hedged_connection_timeout_ms", 100, 50, "Start new connection in hedged requests after 50 ms instead of 100 to correspond with previous connect timeout"},
-            {"formatdatetime_f_prints_single_zero", true, false, "Improved compatibility with MySQL DATE_FORMAT()/STR_TO_DATE()"},
-            {"formatdatetime_parsedatetime_m_is_month_name", false, true, "Improved compatibility with MySQL DATE_FORMAT/STR_TO_DATE"}
-        }
-    },
-    {"23.3",
-        {
-            {"output_format_parquet_version", "1.0", "2.latest", "Use latest Parquet format version for output format"},
-            {"input_format_json_ignore_unknown_keys_in_named_tuple", false, true, "Improve parsing JSON objects as named tuples"},
-            {"input_format_native_allow_types_conversion", false, true, "Allow types conversion in Native input forma"},
-            {"output_format_arrow_compression_method", "none", "lz4_frame", "Use lz4 compression in Arrow output format by default"},
-            {"output_format_parquet_compression_method", "snappy", "lz4", "Use lz4 compression in Parquet output format by default"},
-            {"output_format_orc_compression_method", "none", "lz4_frame", "Use lz4 compression in ORC output format by default"},
-            {"async_query_sending_for_remote", false, true, "Create connections and send query async across shards"}
-        }
-    },
-    {"23.2",
-        {
-            {"output_format_parquet_fixed_string_as_fixed_byte_array", false, true, "Use Parquet FIXED_LENGTH_BYTE_ARRAY type for FixedString by default"},
-            {"output_format_arrow_fixed_string_as_fixed_byte_array", false, true, "Use Arrow FIXED_SIZE_BINARY type for FixedString by default"},
-            {"query_plan_remove_redundant_distinct", false, true, "Remove redundant Distinct step in query plan"},
-            {"optimize_duplicate_order_by_and_distinct", true, false, "Remove duplicate ORDER BY and DISTINCT if it's possible"},
-            {"insert_keeper_max_retries", 0, 20, "Enable reconnections to Keeper on INSERT, improve reliability"}
-        }
-    },
-    {"23.1",
-        {
-            {"input_format_json_read_objects_as_strings", 0, 1, "Enable reading nested json objects as strings while object type is experimental"},
-            {"input_format_json_defaults_for_missing_elements_in_named_tuple", false, true, "Allow missing elements in JSON objects while reading named tuples by default"},
-            {"input_format_csv_detect_header", false, true, "Detect header in CSV format by default"},
-            {"input_format_tsv_detect_header", false, true, "Detect header in TSV format by default"},
-            {"input_format_custom_detect_header", false, true, "Detect header in CustomSeparated format by default"},
-            {"query_plan_remove_redundant_sorting", false, true, "Remove redundant sorting in query plan. For example, sorting steps related to ORDER BY clauses in subqueries"}
-        }
-    },
-    {"22.12",
-        {
-            {"max_size_to_preallocate_for_aggregation", 10'000'000, 100'000'000, "This optimizes performance"},
-            {"query_plan_aggregation_in_order", 0, 1, "Enable some refactoring around query plan"},
-            {"format_binary_max_string_size", 0, 1_GiB, "Prevent allocating large amount of memory"}
-        }
-    },
-    {"22.11",
-        {
-            {"use_structure_from_insertion_table_in_table_functions", 0, 2, "Improve using structure from insertion table in table functions"}
-        }
-    },
-    {"22.9",
-        {
-            {"force_grouping_standard_compatibility", false, true, "Make GROUPING function output the same as in SQL standard and other DBMS"}
-        }
-    },
-    {"22.7",
-        {
-            {"cross_to_inner_join_rewrite", 1, 2, "Force rewrite comma join to inner"},
-            {"enable_positional_arguments", false, true, "Enable positional arguments feature by default"},
-            {"format_csv_allow_single_quotes", true, false, "Most tools don't treat single quote in CSV specially, don't do it by default too"}
-        }
-    },
-    {"22.6",
-        {
-            {"output_format_json_named_tuples_as_objects", false, true, "Allow to serialize named tuples as JSON objects in JSON formats by default"},
-            {"input_format_skip_unknown_fields", false, true, "Optimize reading subset of columns for some input formats"}
-        }
-    },
-    {"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"}
-        }
-    },
-    {"22.4",
-        {
-            {"allow_settings_after_format_in_insert", true, false, "Do not allow SETTINGS after FORMAT for INSERT queries because ClickHouse interpret SETTINGS as some values, which is misleading"}
-        }
-    },
-    {"22.3",
-        {
-            {"cast_ipv4_ipv6_default_on_conversion_error", true, false, "Make functions cast(value, 'IPv4') and cast(value, 'IPv6') behave same as toIPv4 and toIPv6 functions"}
-        }
-    },
-    {"21.12",
-        {
-            {"stream_like_engine_allow_direct_select", true, false, "Do not allow direct select for Kafka/RabbitMQ/FileLog by default"}
-        }
-    },
-    {"21.9",
-        {
-            {"output_format_decimal_trailing_zeros", true, false, "Do not output trailing zeros in text representation of Decimal types by default for better looking output"},
-            {"use_hedged_requests", false, true, "Enable Hedged Requests feature by default"}
-        }
-    },
-    {"21.7",
-        {
-            {"legacy_column_name_of_tuple_literal", true, false, "Add this setting 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"}
-        }
-    },
-    {"21.5",
-        {
-            {"async_socket_for_remote", false, true, "Fix all problems and turn on asynchronous reads from socket for remote queries by default again"}
-        }
-    },
-    {"21.3",
-        {
-            {"async_socket_for_remote", true, false, "Turn off asynchronous reads from socket for remote queries because of some problems"},
-            {"optimize_normalize_count_variants", false, true, "Rewrite aggregate functions that semantically equals to count() as count() by default"},
-            {"normalize_function_names", false, true, "Normalize function names to their canonical names, this was needed for projection query routing"}
-        }
-    },
-    {"21.2",
-        {
-            {"enable_global_with_statement", false, true, "Propagate WITH statements to UNION queries and all subqueries by default"}
-        }
-    },
-    {"21.1",
-        {
-            {"insert_quorum_parallel", false, true, "Use parallel quorum inserts by default. It is significantly more convenient to use than sequential quorum inserts"},
-            {"input_format_null_as_default", false, true, "Allow to insert NULL as default for input formats by default"},
-            {"optimize_on_insert", false, true, "Enable data optimization on INSERT by default for better user experience"},
-            {"use_compact_format_in_distributed_parts_names", false, true, "Use compact format for async INSERT into Distributed tables by default"}
-        }
-    },
-    {"20.10",
-        {
-            {"format_regexp_escaping_rule", "Escaped", "Raw", "Use Raw as default escaping rule for Regexp format to male the behaviour more like to what users expect"}
-        }
-    },
-    {"20.7",
-        {
-            {"show_table_uuid_in_table_create_query_if_not_nil", true, false, "Stop showing  UID of the table in its CREATE query for Engine=Atomic"}
-        }
-    },
-    {"20.5",
-        {
-            {"input_format_with_names_use_header", false, true, "Enable using header with names for formats with WithNames/WithNamesAndTypes suffixes"},
-            {"allow_suspicious_codecs", true, false, "Don't allow to specify meaningless compression codecs"}
-        }
-    },
-    {"20.4",
-        {
-            {"validate_polygons", false, true, "Throw exception if polygon is invalid in function pointInPolygon by default instead of returning possibly wrong results"}
-        }
-    },
-    {"19.18",
-        {
-            {"enable_scalar_subquery_optimization", false, true, "Prevent scalar subqueries from (de)serializing large scalar values and possibly avoid running the same subquery more than once"}
-        }
-    },
-    {"19.14",
-        {
-            {"any_join_distinct_right_table_keys", true, false, "Disable ANY RIGHT and ANY FULL JOINs by default to avoid inconsistency"}
-        }
-    },
-    {"19.12",
-        {
-            {"input_format_defaults_for_omitted_fields", false, true, "Enable calculation of complex default expressions for omitted fields for some input formats, because it should be the expected behaviour"}
-        }
-    },
-    {"19.5",
-        {
-            {"max_partitions_per_insert_block", 0, 100, "Add a limit for the number of partitions in one block"}
-        }
-    },
-    {"18.12.17",
-        {
-            {"enable_optimize_predicate_expression", 0, 1, "Optimize predicates to subqueries by default"}
-        }
-    },
+    {"24.7", {{"output_format_parquet_write_page_index", false, true, "Add a possibility to write page index into parquet files."},
+              {"output_format_binary_encode_types_in_binary_format", false, false, "Added new setting to allow to write type names in binary format in RowBinaryWithNamesAndTypes output format"},
+              {"input_format_binary_decode_types_in_binary_format", false, false, "Added new setting to allow to read type names in binary format in RowBinaryWithNamesAndTypes input format"},
+              {"output_format_native_encode_types_in_binary_format", false, false, "Added new setting to allow to write type names in binary format in Native output format"},
+              {"input_format_native_decode_types_in_binary_format", false, false, "Added new setting to allow to read type names in binary format in Native output format"},
+              {"read_in_order_use_buffering", false, true, "Use buffering before merging while reading in order of primary key"},
+              {"enable_named_columns_in_function_tuple", false, true, "Generate named tuples in function tuple() when all names are unique and can be treated as unquoted identifiers."},
+              {"input_format_json_case_insensitive_column_matching", false, false, "Ignore case when matching JSON keys with CH columns."},
+              {"optimize_trivial_insert_select", true, false, "The optimization does not make sense in many cases."},
+              {"dictionary_validate_primary_key_type", false, false, "Validate primary key type for dictionaries. By default id type for simple layouts will be implicitly converted to UInt64."},
+              {"collect_hash_table_stats_during_joins", false, true, "New setting."},
+              {"max_size_to_preallocate_for_joins", 0, 100'000'000, "New setting."},
+              {"input_format_orc_reader_time_zone_name", "GMT", "GMT", "The time zone name for ORC row reader, the default ORC row reader's time zone is GMT."},
+              {"lightweight_mutation_projection_mode", "throw", "throw", "When lightweight delete happens on a table with projection(s), the possible operations include throw the exception as projection exists, or drop all projection related to this table then do lightweight delete."},
+              {"database_replicated_allow_heavy_create", true, false, "Long-running DDL queries (CREATE AS SELECT and POPULATE) for Replicated database engine was forbidden"},
+              {"query_plan_merge_filters", false, false, "Allow to merge filters in the query plan"},
+              {"azure_sdk_max_retries", 10, 10, "Maximum number of retries in azure sdk"},
+              {"azure_sdk_retry_initial_backoff_ms", 10, 10, "Minimal backoff between retries in azure sdk"},
+              {"azure_sdk_retry_max_backoff_ms", 1000, 1000, "Maximal backoff between retries in azure sdk"},
+              {"ignore_on_cluster_for_replicated_named_collections_queries", false, false, "Ignore ON CLUSTER clause for replicated named collections management queries."},
+              {"backup_restore_s3_retry_attempts", 1000,1000, "Setting for Aws::Client::RetryStrategy, Aws::Client does retries itself, 0 means no retries. It takes place only for backup/restore."},
+              {"postgresql_connection_attempt_timeout", 2, 2, "Allow to control 'connect_timeout' parameter of PostgreSQL connection."},
+              {"postgresql_connection_pool_retries", 2, 2, "Allow to control the number of retries in PostgreSQL connection pool."}
+              }},
+    {"24.6", {{"materialize_skip_indexes_on_insert", true, true, "Added new setting to allow to disable materialization of skip indexes on insert"},
+              {"materialize_statistics_on_insert", true, true, "Added new setting to allow to disable materialization of statistics on insert"},
+              {"input_format_parquet_use_native_reader", false, false, "When reading Parquet files, to use native reader instead of arrow reader."},
+              {"hdfs_throw_on_zero_files_match", false, false, "Allow to throw an error when ListObjects request cannot match any files in HDFS engine instead of empty query result"},
+              {"azure_throw_on_zero_files_match", false, false, "Allow to throw an error when ListObjects request cannot match any files in AzureBlobStorage engine instead of empty query result"},
+              {"s3_validate_request_settings", true, true, "Allow to disable S3 request settings validation"},
+              {"allow_experimental_full_text_index", false, false, "Enable experimental full-text index"},
+              {"azure_skip_empty_files", false, false, "Allow to skip empty files in azure table engine"},
+              {"hdfs_ignore_file_doesnt_exist", false, false, "Allow to return 0 rows when the requested files don't exist instead of throwing an exception in HDFS table engine"},
+              {"azure_ignore_file_doesnt_exist", false, false, "Allow to return 0 rows when the requested files don't exist instead of throwing an exception in AzureBlobStorage table engine"},
+              {"s3_ignore_file_doesnt_exist", false, false, "Allow to return 0 rows when the requested files don't exist instead of throwing an exception in S3 table engine"},
+              {"s3_max_part_number", 10000, 10000, "Maximum part number number for s3 upload part"},
+              {"s3_max_single_operation_copy_size", 32 * 1024 * 1024, 32 * 1024 * 1024, "Maximum size for a single copy operation in s3"},
+              {"input_format_parquet_max_block_size", 8192, DEFAULT_BLOCK_SIZE, "Increase block size for parquet reader."},
+              {"input_format_parquet_prefer_block_bytes", 0, DEFAULT_BLOCK_SIZE * 256, "Average block bytes output by parquet reader."},
+              {"enable_blob_storage_log", true, true, "Write information about blob storage operations to system.blob_storage_log table"},
+              {"allow_deprecated_snowflake_conversion_functions", true, false, "Disabled deprecated functions snowflakeToDateTime[64] and dateTime[64]ToSnowflake."},
+              {"allow_statistic_optimize", false, false, "Old setting which popped up here being renamed."},
+              {"allow_experimental_statistic", false, false, "Old setting which popped up here being renamed."},
+              {"allow_statistics_optimize", false, false, "The setting was renamed. The previous name is `allow_statistic_optimize`."},
+              {"allow_experimental_statistics", false, false, "The setting was renamed. The previous name is `allow_experimental_statistic`."},
+              {"enable_vertical_final", false, true, "Enable vertical final by default again after fixing bug"},
+              {"parallel_replicas_custom_key_range_lower", 0, 0, "Add settings to control the range filter when using parallel replicas with dynamic shards"},
+              {"parallel_replicas_custom_key_range_upper", 0, 0, "Add settings to control the range filter when using parallel replicas with dynamic shards. A value of 0 disables the upper limit"},
+              {"output_format_pretty_display_footer_column_names", 0, 1, "Add a setting to display column names in the footer if there are many rows. Threshold value is controlled by output_format_pretty_display_footer_column_names_min_rows."},
+              {"output_format_pretty_display_footer_column_names_min_rows", 0, 50, "Add a setting to control the threshold value for setting output_format_pretty_display_footer_column_names_min_rows. Default 50."},
+              {"output_format_csv_serialize_tuple_into_separate_columns", true, true, "A new way of how interpret tuples in CSV format was added."},
+              {"input_format_csv_deserialize_separate_columns_into_tuple", true, true, "A new way of how interpret tuples in CSV format was added."},
+              {"input_format_csv_try_infer_strings_from_quoted_tuples", true, true, "A new way of how interpret tuples in CSV format was added."},
+              }},
+    {"24.5", {{"allow_deprecated_error_prone_window_functions", true, false, "Allow usage of deprecated error prone window functions (neighbor, runningAccumulate, runningDifferenceStartingWithFirstValue, runningDifference)"},
+              {"allow_experimental_join_condition", false, false, "Support join with inequal conditions which involve columns from both left and right table. e.g. t1.y < t2.y."},
+              {"input_format_tsv_crlf_end_of_line", false, false, "Enables reading of CRLF line endings with TSV formats"},
+              {"output_format_parquet_use_custom_encoder", false, true, "Enable custom Parquet encoder."},
+              {"cross_join_min_rows_to_compress", 0, 10000000, "Minimal count of rows to compress block in CROSS JOIN. Zero value means - disable this threshold. This block is compressed when any of the two thresholds (by rows or by bytes) are reached."},
+              {"cross_join_min_bytes_to_compress", 0, 1_GiB, "Minimal size of block to compress in CROSS JOIN. Zero value means - disable this threshold. This block is compressed when any of the two thresholds (by rows or by bytes) are reached."},
+              {"http_max_chunk_size", 0, 0, "Internal limitation"},
+              {"prefer_external_sort_block_bytes", 0, DEFAULT_BLOCK_SIZE * 256, "Prefer maximum block bytes for external sort, reduce the memory usage during merging."},
+              {"input_format_force_null_for_omitted_fields", false, false, "Disable type-defaults for omitted fields when needed"},
+              {"cast_string_to_dynamic_use_inference", false, false, "Add setting to allow converting String to Dynamic through parsing"},
+              {"allow_experimental_dynamic_type", false, false, "Add new experimental Dynamic type"},
+              {"azure_max_blocks_in_multipart_upload", 50000, 50000, "Maximum number of blocks in multipart upload for Azure."},
+              {"allow_archive_path_syntax", false, true, "Added new setting to allow disabling archive path syntax."},
+              }},
+    {"24.4", {{"input_format_json_throw_on_bad_escape_sequence", true, true, "Allow to save JSON strings with bad escape sequences"},
+              {"max_parsing_threads", 0, 0, "Add a separate setting to control number of threads in parallel parsing from files"},
+              {"ignore_drop_queries_probability", 0, 0, "Allow to ignore drop queries in server with specified probability for testing purposes"},
+              {"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"},
+              {"input_format_json_ignore_unnecessary_fields", false, true, "Ignore unnecessary fields and not parse them. Enabling this may not throw exceptions on json strings of invalid format or with duplicated fields"},
+              {"input_format_hive_text_allow_variable_number_of_columns", false, true, "Ignore extra columns in Hive Text input (if file has more columns than expected) and treat missing fields in Hive Text input as default values."},
+              {"allow_experimental_database_replicated", false, true, "Database engine Replicated is now in Beta stage"},
+              {"temporary_data_in_cache_reserve_space_wait_lock_timeout_milliseconds", (10 * 60 * 1000), (10 * 60 * 1000), "Wait time to lock cache for sapce reservation in temporary data in filesystem cache"},
+              {"optimize_rewrite_sum_if_to_count_if", false, true, "Only available for the analyzer, where it works correctly"},
+              {"azure_allow_parallel_part_upload", "true", "true", "Use multiple threads for azure multipart upload."},
+              {"max_recursive_cte_evaluation_depth", DBMS_RECURSIVE_CTE_MAX_EVALUATION_DEPTH, DBMS_RECURSIVE_CTE_MAX_EVALUATION_DEPTH, "Maximum limit on recursive CTE evaluation depth"},
+              {"query_plan_convert_outer_join_to_inner_join", false, true, "Allow to convert OUTER JOIN to INNER JOIN if filter after JOIN always filters default values"},
+              }},
+    {"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."},
+              {"output_format_csv_serialize_tuple_into_separate_columns", true, true, "A new way of how interpret tuples in CSV format was added."},
+              {"input_format_csv_deserialize_separate_columns_into_tuple", true, true, "A new way of how interpret tuples in CSV format was added."},
+              {"input_format_csv_try_infer_strings_from_quoted_tuples", true, true, "A new way of how interpret tuples in CSV format was added."},
+              }},
+    {"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"},
+              {"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"},
+              {"input_format_arrow_allow_missing_columns", false, true, "Allow missing columns in Arrow files by default"}}},
+    {"23.11", {{"parsedatetime_parse_without_leading_zeros", false, true, "Improved compatibility with MySQL DATE_FORMAT/STR_TO_DATE"}}},
+    {"23.9", {{"optimize_group_by_constant_keys", false, true, "Optimize group by constant keys by default"},
+              {"input_format_json_try_infer_named_tuples_from_objects", false, true, "Try to infer named Tuples from JSON objects by default"},
+              {"input_format_json_read_numbers_as_strings", false, true, "Allow to read numbers as strings in JSON formats by default"},
+              {"input_format_json_read_arrays_as_strings", false, true, "Allow to read arrays as strings in JSON formats by default"},
+              {"input_format_json_infer_incomplete_types_as_strings", false, true, "Allow to infer incomplete types as Strings in JSON formats by default"},
+              {"input_format_json_try_infer_numbers_from_strings", true, false, "Don't infer numbers from strings in JSON formats by default to prevent possible parsing errors"},
+              {"http_write_exception_in_output_format", false, true, "Output valid JSON/XML on exception in HTTP streaming."}}},
+    {"23.8", {{"rewrite_count_distinct_if_with_count_distinct_implementation", false, true, "Rewrite countDistinctIf with count_distinct_implementation configuration"}}},
+    {"23.7", {{"function_sleep_max_microseconds_per_block", 0, 3000000, "In previous versions, the maximum sleep time of 3 seconds was applied only for `sleep`, but not for `sleepEachRow` function. In the new version, we introduce this setting. If you set compatibility with the previous versions, we will disable the limit altogether."}}},
+    {"23.6", {{"http_send_timeout", 180, 30, "3 minutes seems crazy long. Note that this is timeout for a single network write call, not for the whole upload operation."},
+              {"http_receive_timeout", 180, 30, "See http_send_timeout."}}},
+    {"23.5", {{"input_format_parquet_preserve_order", true, false, "Allow Parquet reader to reorder rows for better parallelism."},
+              {"parallelize_output_from_storages", false, true, "Allow parallelism when executing queries that read from file/url/s3/etc. This may reorder rows."},
+              {"use_with_fill_by_sorting_prefix", false, true, "Columns preceding WITH FILL columns in ORDER BY clause form sorting prefix. Rows with different values in sorting prefix are filled independently"},
+              {"output_format_parquet_compliant_nested_types", false, true, "Change an internal field name in output Parquet file schema."}}},
+    {"23.4", {{"allow_suspicious_indices", true, false, "If true, index can defined with identical expressions"},
+              {"allow_nonconst_timezone_arguments", true, false, "Allow non-const timezone arguments in certain time-related functions like toTimeZone(), fromUnixTimestamp*(), snowflakeToDateTime*()."},
+              {"connect_timeout_with_failover_ms", 50, 1000, "Increase default connect timeout because of async connect"},
+              {"connect_timeout_with_failover_secure_ms", 100, 1000, "Increase default secure connect timeout because of async connect"},
+              {"hedged_connection_timeout_ms", 100, 50, "Start new connection in hedged requests after 50 ms instead of 100 to correspond with previous connect timeout"},
+              {"formatdatetime_f_prints_single_zero", true, false, "Improved compatibility with MySQL DATE_FORMAT()/STR_TO_DATE()"},
+              {"formatdatetime_parsedatetime_m_is_month_name", false, true, "Improved compatibility with MySQL DATE_FORMAT/STR_TO_DATE"}}},
+    {"23.3", {{"output_format_parquet_version", "1.0", "2.latest", "Use latest Parquet format version for output format"},
+              {"input_format_json_ignore_unknown_keys_in_named_tuple", false, true, "Improve parsing JSON objects as named tuples"},
+              {"input_format_native_allow_types_conversion", false, true, "Allow types conversion in Native input forma"},
+              {"output_format_arrow_compression_method", "none", "lz4_frame", "Use lz4 compression in Arrow output format by default"},
+              {"output_format_parquet_compression_method", "snappy", "lz4", "Use lz4 compression in Parquet output format by default"},
+              {"output_format_orc_compression_method", "none", "lz4_frame", "Use lz4 compression in ORC output format by default"},
+              {"async_query_sending_for_remote", false, true, "Create connections and send query async across shards"}}},
+    {"23.2", {{"output_format_parquet_fixed_string_as_fixed_byte_array", false, true, "Use Parquet FIXED_LENGTH_BYTE_ARRAY type for FixedString by default"},
+              {"output_format_arrow_fixed_string_as_fixed_byte_array", false, true, "Use Arrow FIXED_SIZE_BINARY type for FixedString by default"},
+              {"query_plan_remove_redundant_distinct", false, true, "Remove redundant Distinct step in query plan"},
+              {"optimize_duplicate_order_by_and_distinct", true, false, "Remove duplicate ORDER BY and DISTINCT if it's possible"},
+              {"insert_keeper_max_retries", 0, 20, "Enable reconnections to Keeper on INSERT, improve reliability"}}},
+    {"23.1", {{"input_format_json_read_objects_as_strings", 0, 1, "Enable reading nested json objects as strings while object type is experimental"},
+              {"input_format_json_defaults_for_missing_elements_in_named_tuple", false, true, "Allow missing elements in JSON objects while reading named tuples by default"},
+              {"input_format_csv_detect_header", false, true, "Detect header in CSV format by default"},
+              {"input_format_tsv_detect_header", false, true, "Detect header in TSV format by default"},
+              {"input_format_custom_detect_header", false, true, "Detect header in CustomSeparated format by default"},
+              {"query_plan_remove_redundant_sorting", false, true, "Remove redundant sorting in query plan. For example, sorting steps related to ORDER BY clauses in subqueries"}}},
+    {"22.12", {{"max_size_to_preallocate_for_aggregation", 10'000'000, 100'000'000, "This optimizes performance"},
+               {"query_plan_aggregation_in_order", 0, 1, "Enable some refactoring around query plan"},
+               {"format_binary_max_string_size", 0, 1_GiB, "Prevent allocating large amount of memory"}}},
+    {"22.11", {{"use_structure_from_insertion_table_in_table_functions", 0, 2, "Improve using structure from insertion table in table functions"}}},
+    {"22.9", {{"force_grouping_standard_compatibility", false, true, "Make GROUPING function output the same as in SQL standard and other DBMS"}}},
+    {"22.7", {{"cross_to_inner_join_rewrite", 1, 2, "Force rewrite comma join to inner"},
+              {"enable_positional_arguments", false, true, "Enable positional arguments feature by default"},
+              {"format_csv_allow_single_quotes", true, false, "Most tools don't treat single quote in CSV specially, don't do it by default too"}}},
+    {"22.6", {{"output_format_json_named_tuples_as_objects", false, true, "Allow to serialize named tuples as JSON objects in JSON formats by default"},
+              {"input_format_skip_unknown_fields", false, true, "Optimize reading subset of columns for some input formats"}}},
+    {"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"}}},
+    {"22.4", {{"allow_settings_after_format_in_insert", true, false, "Do not allow SETTINGS after FORMAT for INSERT queries because ClickHouse interpret SETTINGS as some values, which is misleading"}}},
+    {"22.3", {{"cast_ipv4_ipv6_default_on_conversion_error", true, false, "Make functions cast(value, 'IPv4') and cast(value, 'IPv6') behave same as toIPv4 and toIPv6 functions"}}},
+    {"21.12", {{"stream_like_engine_allow_direct_select", true, false, "Do not allow direct select for Kafka/RabbitMQ/FileLog by default"}}},
+    {"21.9", {{"output_format_decimal_trailing_zeros", true, false, "Do not output trailing zeros in text representation of Decimal types by default for better looking output"},
+              {"use_hedged_requests", false, true, "Enable Hedged Requests feature by default"}}},
+    {"21.7", {{"legacy_column_name_of_tuple_literal", true, false, "Add this setting 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"}}},
+    {"21.5", {{"async_socket_for_remote", false, true, "Fix all problems and turn on asynchronous reads from socket for remote queries by default again"}}},
+    {"21.3", {{"async_socket_for_remote", true, false, "Turn off asynchronous reads from socket for remote queries because of some problems"},
+              {"optimize_normalize_count_variants", false, true, "Rewrite aggregate functions that semantically equals to count() as count() by default"},
+              {"normalize_function_names", false, true, "Normalize function names to their canonical names, this was needed for projection query routing"}}},
+    {"21.2", {{"enable_global_with_statement", false, true, "Propagate WITH statements to UNION queries and all subqueries by default"}}},
+    {"21.1", {{"insert_quorum_parallel", false, true, "Use parallel quorum inserts by default. It is significantly more convenient to use than sequential quorum inserts"},
+              {"input_format_null_as_default", false, true, "Allow to insert NULL as default for input formats by default"},
+              {"optimize_on_insert", false, true, "Enable data optimization on INSERT by default for better user experience"},
+              {"use_compact_format_in_distributed_parts_names", false, true, "Use compact format for async INSERT into Distributed tables by default"}}},
+    {"20.10", {{"format_regexp_escaping_rule", "Escaped", "Raw", "Use Raw as default escaping rule for Regexp format to male the behaviour more like to what users expect"}}},
+    {"20.7", {{"show_table_uuid_in_table_create_query_if_not_nil", true, false, "Stop showing  UID of the table in its CREATE query for Engine=Atomic"}}},
+    {"20.5", {{"input_format_with_names_use_header", false, true, "Enable using header with names for formats with WithNames/WithNamesAndTypes suffixes"},
+              {"allow_suspicious_codecs", true, false, "Don't allow to specify meaningless compression codecs"}}},
+    {"20.4", {{"validate_polygons", false, true, "Throw exception if polygon is invalid in function pointInPolygon by default instead of returning possibly wrong results"}}},
+    {"19.18", {{"enable_scalar_subquery_optimization", false, true, "Prevent scalar subqueries from (de)serializing large scalar values and possibly avoid running the same subquery more than once"}}},
+    {"19.14", {{"any_join_distinct_right_table_keys", true, false, "Disable ANY RIGHT and ANY FULL JOINs by default to avoid inconsistency"}}},
+    {"19.12", {{"input_format_defaults_for_omitted_fields", false, true, "Enable calculation of complex default expressions for omitted fields for some input formats, because it should be the expected behaviour"}}},
+    {"19.5", {{"max_partitions_per_insert_block", 0, 100, "Add a limit for the number of partitions in one block"}}},
+    {"18.12.17", {{"enable_optimize_predicate_expression", 0, 1, "Optimize predicates to subqueries by default"}}},
 };
 
 
diff --git a/src/Core/SettingsEnums.cpp b/src/Core/SettingsEnums.cpp
index 0c43b5256d6..82e7d6db410 100644
--- a/src/Core/SettingsEnums.cpp
+++ b/src/Core/SettingsEnums.cpp
@@ -175,13 +175,7 @@ IMPLEMENT_SETTING_ENUM(ParallelReplicasCustomKeyFilterType, ErrorCodes::BAD_ARGU
 
 IMPLEMENT_SETTING_ENUM(LightweightMutationProjectionMode, ErrorCodes::BAD_ARGUMENTS,
     {{"throw", LightweightMutationProjectionMode::THROW},
-     {"drop", LightweightMutationProjectionMode::DROP},
-     {"rebuild", LightweightMutationProjectionMode::REBUILD}})
-
-IMPLEMENT_SETTING_ENUM(DeduplicateMergeProjectionMode, ErrorCodes::BAD_ARGUMENTS,
-    {{"throw", DeduplicateMergeProjectionMode::THROW},
-     {"drop", DeduplicateMergeProjectionMode::DROP},
-     {"rebuild", DeduplicateMergeProjectionMode::REBUILD}})
+     {"drop", LightweightMutationProjectionMode::DROP}})
 
 IMPLEMENT_SETTING_AUTO_ENUM(LocalFSReadMethod, ErrorCodes::BAD_ARGUMENTS)
 
@@ -244,10 +238,4 @@ IMPLEMENT_SETTING_ENUM(
     GroupArrayActionWhenLimitReached,
     ErrorCodes::BAD_ARGUMENTS,
     {{"throw", GroupArrayActionWhenLimitReached::THROW}, {"discard", GroupArrayActionWhenLimitReached::DISCARD}})
-
-IMPLEMENT_SETTING_ENUM(IdentifierQuotingStyle, ErrorCodes::BAD_ARGUMENTS,
-    {{"None", IdentifierQuotingStyle::None},
-     {"Backticks", IdentifierQuotingStyle::Backticks},
-     {"DoubleQuotes", IdentifierQuotingStyle::DoubleQuotes},
-     {"BackticksMySQL", IdentifierQuotingStyle::BackticksMySQL}})
 }
diff --git a/src/Core/SettingsEnums.h b/src/Core/SettingsEnums.h
index d358a2d44a0..f6d9593ca56 100644
--- a/src/Core/SettingsEnums.h
+++ b/src/Core/SettingsEnums.h
@@ -10,7 +10,6 @@
 #include <Formats/FormatSettings.h>
 #include <IO/ReadSettings.h>
 #include <Parsers/ASTSQLSecurity.h>
-#include <Parsers/IdentifierQuotingStyle.h>
 #include <QueryPipeline/SizeLimits.h>
 #include <Common/ShellCommandSettings.h>
 
@@ -312,20 +311,10 @@ enum class LightweightMutationProjectionMode : uint8_t
 {
     THROW,
     DROP,
-    REBUILD,
 };
 
 DECLARE_SETTING_ENUM(LightweightMutationProjectionMode)
 
-enum class DeduplicateMergeProjectionMode : uint8_t
-{
-    THROW,
-    DROP,
-    REBUILD,
-};
-
-DECLARE_SETTING_ENUM(DeduplicateMergeProjectionMode)
-
 DECLARE_SETTING_ENUM(LocalFSReadMethod)
 
 enum class ObjectStorageQueueMode : uint8_t
@@ -352,8 +341,6 @@ DECLARE_SETTING_ENUM_WITH_RENAME(DateTimeOverflowBehavior, FormatSettings::DateT
 
 DECLARE_SETTING_ENUM(SQLSecurityType)
 
-DECLARE_SETTING_ENUM(IdentifierQuotingStyle)
-
 enum class GroupArrayActionWhenLimitReached : uint8_t
 {
     THROW,
diff --git a/src/Core/SettingsFields.cpp b/src/Core/SettingsFields.cpp
index 930eedb8d70..7d094e2a107 100644
--- a/src/Core/SettingsFields.cpp
+++ b/src/Core/SettingsFields.cpp
@@ -53,29 +53,29 @@ namespace
     {
         if (f.getType() == Field::Types::String)
         {
-            return stringToNumber<T>(f.safeGet<const String &>());
+            return stringToNumber<T>(f.get<const String &>());
         }
         else if (f.getType() == Field::Types::UInt64)
         {
             T result;
-            if (!accurate::convertNumeric(f.safeGet<UInt64>(), 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.safeGet<Int64>(), 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.safeGet<bool>());
+            return T(f.get<bool>());
         }
         else if (f.getType() == Field::Types::Float64)
         {
-            Float64 x = f.safeGet<Float64>();
+            Float64 x = f.get<Float64>();
             if constexpr (std::is_floating_point_v<T>)
             {
                 return T(x);
@@ -120,7 +120,7 @@ namespace
         if (f.getType() == Field::Types::String)
         {
             /// Allow to parse Map from string field. For the convenience.
-            const auto & str = f.safeGet<const String &>();
+            const auto & str = f.get<const String &>();
             return stringToMap(str);
         }
 
@@ -210,7 +210,7 @@ namespace
 {
     UInt64 stringToMaxThreads(const String & str)
     {
-        if (startsWith(str, "auto") || startsWith(str, "'auto"))
+        if (startsWith(str, "auto"))
             return 0;
         return parseFromString<UInt64>(str);
     }
@@ -218,7 +218,7 @@ namespace
     UInt64 fieldToMaxThreads(const Field & f)
     {
         if (f.getType() == Field::Types::String)
-            return stringToMaxThreads(f.safeGet<const String &>());
+            return stringToMaxThreads(f.get<const String &>());
         else
             return fieldToNumber<UInt64>(f);
     }
@@ -237,7 +237,6 @@ SettingFieldMaxThreads & SettingFieldMaxThreads::operator=(const Field & f)
 String SettingFieldMaxThreads::toString() const
 {
     if (is_auto)
-        /// Removing quotes here will introduce an incompatibility between replicas with different versions.
         return "'auto(" + ::DB::toString(value) + ")'";
     else
         return ::DB::toString(value);
@@ -272,12 +271,9 @@ 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);
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wimplicit-const-int-float-conversion"
         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);
-#pragma clang diagnostic pop
 
         return static_cast<Poco::Timespan::TimeDiff>(d * 1000000);
     }
diff --git a/src/Core/SettingsFields.h b/src/Core/SettingsFields.h
index 533d69f3fbb..266141815e3 100644
--- a/src/Core/SettingsFields.h
+++ b/src/Core/SettingsFields.h
@@ -153,7 +153,7 @@ struct SettingFieldMaxThreads
     operator UInt64() const { return value; } /// NOLINT
     explicit operator Field() const { return value; }
 
-    /// Writes "auto(<number>)" instead of simple "<number>" if `is_auto == true`.
+    /// Writes "auto(<number>)" instead of simple "<number>" if `is_auto==true`.
     String toString() const;
     void parseFromString(const String & str);
 
diff --git a/src/Core/SettingsQuirks.cpp b/src/Core/SettingsQuirks.cpp
index 3127a5ef36d..5541cc19653 100644
--- a/src/Core/SettingsQuirks.cpp
+++ b/src/Core/SettingsQuirks.cpp
@@ -100,7 +100,7 @@ void doSettingsSanityCheckClamp(Settings & current_settings, LoggerPtr log)
         return current_value;
     };
 
-    UInt64 max_threads = get_current_value("max_threads").safeGet<UInt64>();
+    UInt64 max_threads = get_current_value("max_threads").get<UInt64>();
     UInt64 max_threads_max_value = 256 * getNumberOfPhysicalCPUCores();
     if (max_threads > max_threads_max_value)
     {
@@ -120,7 +120,7 @@ void doSettingsSanityCheckClamp(Settings & current_settings, LoggerPtr log)
         "input_format_parquet_max_block_size"};
     for (auto const & setting : block_rows_settings)
     {
-        if (auto block_size = get_current_value(setting).safeGet<UInt64>();
+        if (auto block_size = get_current_value(setting).get<UInt64>();
             block_size > max_sane_block_rows_size)
         {
             if (log)
@@ -129,7 +129,7 @@ void doSettingsSanityCheckClamp(Settings & current_settings, LoggerPtr log)
         }
     }
 
-    if (auto max_block_size = get_current_value("max_block_size").safeGet<UInt64>(); max_block_size == 0)
+    if (auto max_block_size = get_current_value("max_block_size").get<UInt64>(); max_block_size == 0)
     {
         if (log)
             LOG_WARNING(log, "Sanity check: 'max_block_size' cannot be 0. Set to default value {}", DEFAULT_BLOCK_SIZE);
diff --git a/src/Core/SortDescription.cpp b/src/Core/SortDescription.cpp
index 1b3f81f8547..9edc79a1ff1 100644
--- a/src/Core/SortDescription.cpp
+++ b/src/Core/SortDescription.cpp
@@ -103,15 +103,7 @@ static std::string getSortDescriptionDump(const SortDescription & description, c
     WriteBufferFromOwnString buffer;
 
     for (size_t i = 0; i < description.size(); ++i)
-    {
-        if (i != 0)
-            buffer << ", ";
-
-        buffer << "(type: " << header_types[i]->getName()
-            << ", direction: " << description[i].direction
-            << ", nulls_direction: " << description[i].nulls_direction
-            << ")";
-    }
+        buffer << header_types[i]->getName() << ' ' << description[i].direction << ' ' << description[i].nulls_direction;
 
     return buffer.str();
 }
diff --git a/src/Core/TypeId.h b/src/Core/TypeId.h
index 1eba944e63e..e4f850cbb59 100644
--- a/src/Core/TypeId.h
+++ b/src/Core/TypeId.h
@@ -45,7 +45,6 @@ enum class TypeIndex : uint8_t
     AggregateFunction,
     LowCardinality,
     Map,
-    ObjectDeprecated,
     Object,
     IPv4,
     IPv6,
diff --git a/src/Core/callOnTypeIndex.h b/src/Core/callOnTypeIndex.h
index ae5afce36be..f5f67df563b 100644
--- a/src/Core/callOnTypeIndex.h
+++ b/src/Core/callOnTypeIndex.h
@@ -3,7 +3,6 @@
 #include <utility>
 
 #include <Core/Types.h>
-#include <DataTypes/DataTypeInterval.h>
 
 
 namespace DB
@@ -213,8 +212,6 @@ static bool callOnIndexAndDataType(TypeIndex number, F && f, ExtraArgs && ... ar
         case TypeIndex::IPv4:           return f(TypePair<DataTypeIPv4, T>(), std::forward<ExtraArgs>(args)...);
         case TypeIndex::IPv6:           return f(TypePair<DataTypeIPv6, T>(), std::forward<ExtraArgs>(args)...);
 
-        case TypeIndex::Interval:       return f(TypePair<DataTypeInterval, T>(), std::forward<ExtraArgs>(args)...);
-
         default:
             break;
     }
diff --git a/src/Core/examples/CMakeLists.txt b/src/Core/examples/CMakeLists.txt
index 97e5e8e67e6..f30ee25491f 100644
--- a/src/Core/examples/CMakeLists.txt
+++ b/src/Core/examples/CMakeLists.txt
@@ -1,8 +1,8 @@
 clickhouse_add_executable (string_pool string_pool.cpp)
-target_link_libraries (string_pool PRIVATE clickhouse_common_io clickhouse_common_config ch_contrib::sparsehash)
+target_link_libraries (string_pool PRIVATE clickhouse_common_io ch_contrib::sparsehash)
 
 clickhouse_add_executable (field field.cpp)
 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_common_config)
+target_link_libraries (string_ref_hash PRIVATE clickhouse_common_io)
diff --git a/src/Core/examples/field.cpp b/src/Core/examples/field.cpp
index 3064290e127..110e11d0cb1 100644
--- a/src/Core/examples/field.cpp
+++ b/src/Core/examples/field.cpp
@@ -37,7 +37,7 @@ int main(int argc, char ** argv)
         std::cerr << applyVisitor(to_string, field) << std::endl;
     }
 
-    field.safeGet<Array &>().push_back(field);
+    field.get<Array &>().push_back(field);
     std::cerr << applyVisitor(to_string, field) << std::endl;
 
     std::cerr << (field < field2) << std::endl;
diff --git a/src/Core/fuzzers/CMakeLists.txt b/src/Core/fuzzers/CMakeLists.txt
index 61d6b9629eb..51db6fa0b53 100644
--- a/src/Core/fuzzers/CMakeLists.txt
+++ b/src/Core/fuzzers/CMakeLists.txt
@@ -1,2 +1,2 @@
 clickhouse_add_executable (names_and_types_fuzzer names_and_types_fuzzer.cpp)
-target_link_libraries (names_and_types_fuzzer PRIVATE clickhouse_functions)
+target_link_libraries (names_and_types_fuzzer PRIVATE dbms)
diff --git a/src/Core/tests/gtest_field.cpp b/src/Core/tests/gtest_field.cpp
index 7e778be9575..5585442d835 100644
--- a/src/Core/tests/gtest_field.cpp
+++ b/src/Core/tests/gtest_field.cpp
@@ -8,31 +8,31 @@ GTEST_TEST(Field, FromBool)
     {
         Field f{false};
         ASSERT_EQ(f.getType(), Field::Types::Bool);
-        ASSERT_EQ(f.safeGet<UInt64>(), 0);
-        ASSERT_EQ(f.safeGet<bool>(), false);
+        ASSERT_EQ(f.get<UInt64>(), 0);
+        ASSERT_EQ(f.get<bool>(), false);
     }
 
     {
         Field f{true};
         ASSERT_EQ(f.getType(), Field::Types::Bool);
-        ASSERT_EQ(f.safeGet<UInt64>(), 1);
-        ASSERT_EQ(f.safeGet<bool>(), true);
+        ASSERT_EQ(f.get<UInt64>(), 1);
+        ASSERT_EQ(f.get<bool>(), true);
     }
 
     {
         Field f;
         f = false;
         ASSERT_EQ(f.getType(), Field::Types::Bool);
-        ASSERT_EQ(f.safeGet<UInt64>(), 0);
-        ASSERT_EQ(f.safeGet<bool>(), false);
+        ASSERT_EQ(f.get<UInt64>(), 0);
+        ASSERT_EQ(f.get<bool>(), false);
     }
 
     {
         Field f;
         f = true;
         ASSERT_EQ(f.getType(), Field::Types::Bool);
-        ASSERT_EQ(f.safeGet<UInt64>(), 1);
-        ASSERT_EQ(f.safeGet<bool>(), true);
+        ASSERT_EQ(f.get<UInt64>(), 1);
+        ASSERT_EQ(f.get<bool>(), true);
     }
 }
 
@@ -42,15 +42,15 @@ GTEST_TEST(Field, Move)
     Field f;
 
     f = Field{String{"Hello, world (1)"}};
-    ASSERT_EQ(f.safeGet<String>(), "Hello, world (1)");
+    ASSERT_EQ(f.get<String>(), "Hello, world (1)");
     f = Field{String{"Hello, world (2)"}};
-    ASSERT_EQ(f.safeGet<String>(), "Hello, world (2)");
+    ASSERT_EQ(f.get<String>(), "Hello, world (2)");
     f = Field{Array{Field{String{"Hello, world (3)"}}}};
-    ASSERT_EQ(f.safeGet<Array>()[0].safeGet<String>(), "Hello, world (3)");
+    ASSERT_EQ(f.get<Array>()[0].get<String>(), "Hello, world (3)");
     f = String{"Hello, world (4)"};
-    ASSERT_EQ(f.safeGet<String>(), "Hello, world (4)");
+    ASSERT_EQ(f.get<String>(), "Hello, world (4)");
     f = Array{Field{String{"Hello, world (5)"}}};
-    ASSERT_EQ(f.safeGet<Array>()[0].safeGet<String>(), "Hello, world (5)");
+    ASSERT_EQ(f.get<Array>()[0].get<String>(), "Hello, world (5)");
     f = Array{String{"Hello, world (6)"}};
-    ASSERT_EQ(f.safeGet<Array>()[0].safeGet<String>(), "Hello, world (6)");
+    ASSERT_EQ(f.get<Array>()[0].get<String>(), "Hello, world (6)");
 }
diff --git a/src/Daemon/BaseDaemon.cpp b/src/Daemon/BaseDaemon.cpp
index d4d3ad58ddd..d77878415db 100644
--- a/src/Daemon/BaseDaemon.cpp
+++ b/src/Daemon/BaseDaemon.cpp
@@ -16,28 +16,39 @@
 #include <sys/resource.h>
 
 #if defined(OS_LINUX)
-#include <sys/prctl.h>
+    #include <sys/prctl.h>
 #endif
 #include <cerrno>
 #include <cstring>
 #include <unistd.h>
+
 #include <algorithm>
+#include <typeinfo>
 #include <iostream>
+#include <fstream>
 #include <memory>
+#include <base/scope_guard.h>
 
 #include <Poco/Message.h>
 #include <Poco/Util/Application.h>
 #include <Poco/Exception.h>
 #include <Poco/ErrorHandler.h>
 #include <Poco/Pipe.h>
+
 #include <Common/ErrorHandlers.h>
 #include <Common/SignalHandlers.h>
 #include <base/argsToConfig.h>
+#include <base/getThreadId.h>
 #include <base/coverage.h>
+#include <base/sleep.h>
 
 #include <IO/WriteBufferFromFileDescriptorDiscardOnFailure.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 #include <Common/Exception.h>
+#include <Common/PipeFDs.h>
+#include <Common/StackTrace.h>
 #include <Common/getMultipleKeysFromConfig.h>
 #include <Common/ClickHouseRevision.h>
 #include <Common/Config/ConfigProcessor.h>
@@ -135,19 +146,10 @@ BaseDaemon::BaseDaemon() = default;
 
 BaseDaemon::~BaseDaemon()
 {
-    try
-    {
-        writeSignalIDtoSignalPipe(SignalListener::StopThread);
-        signal_listener_thread.join();
-        HandledSignals::instance().reset();
-        SentryWriter::resetInstance();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(&logger());
-    }
-
-    disableLogging();
+    writeSignalIDtoSignalPipe(SignalListener::StopThread);
+    signal_listener_thread.join();
+    HandledSignals::instance().reset();
+    SentryWriter::resetInstance();
 }
 
 
@@ -448,9 +450,17 @@ void BaseDaemon::initializeTerminationAndSignalProcessing()
     signal_listener_thread.start(*signal_listener);
 
 #if defined(__ELF__) && !defined(OS_FREEBSD)
-    build_id = SymbolIndex::instance().getBuildIDHex();
+    String build_id_hex = SymbolIndex::instance().getBuildIDHex();
+    if (build_id_hex.empty())
+        build_id = "";
+    else
+        build_id = build_id_hex;
+#else
+    build_id = "";
 #endif
 
+    git_hash = GIT_HASH;
+
 #if defined(OS_LINUX)
     std::string executable_path = getExecutablePath();
 
@@ -463,7 +473,7 @@ void BaseDaemon::logRevision() const
 {
     logger().information("Starting " + std::string{VERSION_FULL}
         + " (revision: " + std::to_string(ClickHouseRevision::getVersionRevision())
-        + ", git hash: " + std::string(GIT_HASH)
+        + ", git hash: " + (git_hash.empty() ? "<unknown>" : git_hash)
         + ", build id: " + (build_id.empty() ? "<unknown>" : build_id) + ")"
         + ", PID " + std::to_string(getpid()));
 }
diff --git a/src/Daemon/BaseDaemon.h b/src/Daemon/BaseDaemon.h
index a6efa94a567..b15aa74fcf3 100644
--- a/src/Daemon/BaseDaemon.h
+++ b/src/Daemon/BaseDaemon.h
@@ -165,6 +165,7 @@ protected:
     Poco::Util::AbstractConfiguration * last_configuration = nullptr;
 
     String build_id;
+    String git_hash;
     String stored_binary_hash;
 
     bool should_setup_watchdog = false;
diff --git a/src/Daemon/CMakeLists.txt b/src/Daemon/CMakeLists.txt
index 2068af2200d..35ea2122dbb 100644
--- a/src/Daemon/CMakeLists.txt
+++ b/src/Daemon/CMakeLists.txt
@@ -1,7 +1,10 @@
+configure_file(GitHash.cpp.in GitHash.generated.cpp)
+
 add_library (daemon
     BaseDaemon.cpp
     GraphiteWriter.cpp
     SentryWriter.cpp
+    GitHash.generated.cpp
 )
 
 target_link_libraries (daemon PUBLIC loggers common PRIVATE clickhouse_parsers clickhouse_common_io clickhouse_common_config)
diff --git a/base/base/GitHash.cpp.in b/src/Daemon/GitHash.cpp.in
similarity index 100%
rename from base/base/GitHash.cpp.in
rename to src/Daemon/GitHash.cpp.in
diff --git a/src/DataTypes/DataTypeAggregateFunction.cpp b/src/DataTypes/DataTypeAggregateFunction.cpp
index 1facaaab0d6..ef7d86d2a81 100644
--- a/src/DataTypes/DataTypeAggregateFunction.cpp
+++ b/src/DataTypes/DataTypeAggregateFunction.cpp
@@ -33,16 +33,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-
-DataTypeAggregateFunction::DataTypeAggregateFunction(AggregateFunctionPtr function_, const DataTypes & argument_types_,
-                            const Array & parameters_, std::optional<size_t> version_)
-    : function(std::move(function_))
-    , argument_types(argument_types_)
-    , parameters(parameters_)
-    , version(version_)
-{
-}
-
 String DataTypeAggregateFunction::getFunctionName() const
 {
     return function->getName();
@@ -129,7 +119,7 @@ MutableColumnPtr DataTypeAggregateFunction::createColumn() const
 Field DataTypeAggregateFunction::getDefault() const
 {
     Field field = AggregateFunctionStateData();
-    field.safeGet<AggregateFunctionStateData &>().name = getName();
+    field.get<AggregateFunctionStateData &>().name = getName();
 
     AlignedBuffer place_buffer(function->sizeOfData(), function->alignOfData());
     AggregateDataPtr place = place_buffer.data();
@@ -138,7 +128,7 @@ Field DataTypeAggregateFunction::getDefault() const
 
     try
     {
-        WriteBufferFromString buffer_from_field(field.safeGet<AggregateFunctionStateData &>().data);
+        WriteBufferFromString buffer_from_field(field.get<AggregateFunctionStateData &>().data);
         function->serialize(place, buffer_from_field, version);
     }
     catch (...)
@@ -267,8 +257,8 @@ static DataTypePtr create(const ASTPtr & arguments)
     }
     else
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Unexpected AST element {} passed as aggregate function name for data type AggregateFunction. "
-                        "Must be identifier or function", data_type_ast->getID());
+                        "Unexpected AST element passed as aggregate function name for data type AggregateFunction. "
+                        "Must be identifier or function.");
 
     for (size_t i = argument_types_start_idx; i < arguments->children.size(); ++i)
         argument_types.push_back(DataTypeFactory::instance().get(arguments->children[i]));
diff --git a/src/DataTypes/DataTypeAggregateFunction.h b/src/DataTypes/DataTypeAggregateFunction.h
index e3a4f9726d9..52ed151107e 100644
--- a/src/DataTypes/DataTypeAggregateFunction.h
+++ b/src/DataTypes/DataTypeAggregateFunction.h
@@ -30,7 +30,13 @@ public:
     static constexpr bool is_parametric = true;
 
     DataTypeAggregateFunction(AggregateFunctionPtr function_, const DataTypes & argument_types_,
-                              const Array & parameters_, std::optional<size_t> version_ = std::nullopt);
+                              const Array & parameters_, std::optional<size_t> version_ = std::nullopt)
+        : function(std::move(function_))
+        , argument_types(argument_types_)
+        , parameters(parameters_)
+        , version(version_)
+    {
+    }
 
     size_t getVersion() const;
 
diff --git a/src/DataTypes/DataTypeCustomGeo.cpp b/src/DataTypes/DataTypeCustomGeo.cpp
index f90788ec403..0736d837d46 100644
--- a/src/DataTypes/DataTypeCustomGeo.cpp
+++ b/src/DataTypes/DataTypeCustomGeo.cpp
@@ -24,13 +24,6 @@ void registerDataTypeDomainGeo(DataTypeFactory & factory)
             std::make_unique<DataTypeCustomDesc>(std::make_unique<DataTypeLineStringName>()));
     });
 
-    // Custom type for multiple lines stored as Array(LineString)
-    factory.registerSimpleDataTypeCustom("MultiLineString", []
-    {
-        return std::make_pair(DataTypeFactory::instance().get("Array(LineString)"),
-            std::make_unique<DataTypeCustomDesc>(std::make_unique<DataTypeMultiLineStringName>()));
-    });
-
     // Custom type for simple polygon without holes stored as Array(Point)
     factory.registerSimpleDataTypeCustom("Ring", []
     {
diff --git a/src/DataTypes/DataTypeCustomGeo.h b/src/DataTypes/DataTypeCustomGeo.h
index 6a632f0d05c..0a1c83e4638 100644
--- a/src/DataTypes/DataTypeCustomGeo.h
+++ b/src/DataTypes/DataTypeCustomGeo.h
@@ -17,12 +17,6 @@ public:
     DataTypeLineStringName() : DataTypeCustomFixedName("LineString") {}
 };
 
-class DataTypeMultiLineStringName : public DataTypeCustomFixedName
-{
-public:
-    DataTypeMultiLineStringName() : DataTypeCustomFixedName("MultiLineString") {}
-};
-
 class DataTypeRingName : public DataTypeCustomFixedName
 {
 public:
diff --git a/src/DataTypes/DataTypeDynamic.cpp b/src/DataTypes/DataTypeDynamic.cpp
index fb938f5fbd8..a1b1f8325f0 100644
--- a/src/DataTypes/DataTypeDynamic.cpp
+++ b/src/DataTypes/DataTypeDynamic.cpp
@@ -7,7 +7,6 @@
 #include <DataTypes/NestedUtils.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypesBinaryEncoding.h>
 #include <Columns/ColumnDynamic.h>
 #include <Columns/ColumnVariant.h>
 #include <Core/Field.h>
@@ -15,8 +14,6 @@
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
-#include <base/find_symbols.h>
-#include <IO/ReadBufferFromMemory.h>
 
 namespace DB
 {
@@ -68,20 +65,16 @@ static DataTypePtr create(const ASTPtr & arguments)
     if (!argument || argument->name != "equals")
         throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE, "Dynamic data type argument should be in a form 'max_types=N'");
 
-    const auto * identifier = argument->arguments->children[0]->as<ASTIdentifier>();
-    if (!identifier)
-        throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE, "Unexpected Dynamic type argument: {}. Expected expression 'max_types=N'", identifier->formatForErrorMessage());
-
-    auto identifier_name = identifier->name();
+    auto identifier_name = argument->arguments->children[0]->as<ASTIdentifier>()->name();
     if (identifier_name != "max_types")
         throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE, "Unexpected identifier: {}. Dynamic data type argument should be in a form 'max_types=N'", identifier_name);
 
     auto * literal = argument->arguments->children[1]->as<ASTLiteral>();
 
-    if (!literal || literal->value.getType() != Field::Types::UInt64 || literal->value.safeGet<UInt64>() > ColumnDynamic::MAX_DYNAMIC_TYPES_LIMIT)
-        throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE, "'max_types' argument for Dynamic type should be a positive integer between 0 and {}", ColumnDynamic::MAX_DYNAMIC_TYPES_LIMIT);
+    if (!literal || literal->value.getType() != Field::Types::UInt64 || literal->value.get<UInt64>() == 0 || literal->value.get<UInt64>() > ColumnVariant::MAX_NESTED_COLUMNS)
+        throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE, "'max_types' argument for Dynamic type should be a positive integer between 1 and 255");
 
-    return std::make_shared<DataTypeDynamic>(literal->value.safeGet<UInt64>());
+    return std::make_shared<DataTypeDynamic>(literal->value.get<UInt64>());
 }
 
 void registerDataTypeDynamic(DataTypeFactory & factory)
@@ -89,118 +82,32 @@ void registerDataTypeDynamic(DataTypeFactory & factory)
     factory.registerDataType("Dynamic", create);
 }
 
-namespace
-{
-
-/// Split Dynamic subcolumn name into 2 parts: type name and subcolumn of this type.
-/// We cannot simply split by '.' because type name can also contain dots. For example: Tuple(`a.b` UInt32).
-/// But in all such cases this '.' will be inside back quotes. To split subcolumn name correctly
-/// we search for the first '.' that is not inside back quotes.
-std::pair<std::string_view, std::string_view> splitSubcolumnName(std::string_view subcolumn_name)
-{
-    bool inside_quotes = false;
-    const char * pos = subcolumn_name.data();
-    const char * end = subcolumn_name.data() + subcolumn_name.size();
-    while (true)
-    {
-        pos = find_first_symbols<'`', '.', '\\'>(pos, end);
-        if (pos == end)
-            break;
-
-        if (*pos == '`')
-        {
-            inside_quotes = !inside_quotes;
-            ++pos;
-        }
-        else if (*pos == '\\')
-        {
-            ++pos;
-        }
-        else if (*pos == '.')
-        {
-            if (inside_quotes)
-                ++pos;
-            else
-                break;
-        }
-    }
-
-    if (pos == end)
-        return {subcolumn_name, {}};
-
-    return {std::string_view(subcolumn_name.data(), pos), std::string_view(pos + 1, end)};
-}
-
-}
-
 std::unique_ptr<IDataType::SubstreamData> DataTypeDynamic::getDynamicSubcolumnData(std::string_view subcolumn_name, const DB::IDataType::SubstreamData & data, bool throw_if_null) const
 {
-    auto [type_subcolumn_name, subcolumn_nested_name] = splitSubcolumnName(subcolumn_name);
+    auto [subcolumn_type_name, subcolumn_nested_name] = Nested::splitName(subcolumn_name);
     /// Check if requested subcolumn is a valid data type.
-    auto subcolumn_type = DataTypeFactory::instance().tryGet(String(type_subcolumn_name));
+    auto subcolumn_type = DataTypeFactory::instance().tryGet(String(subcolumn_type_name));
     if (!subcolumn_type)
     {
         if (throw_if_null)
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Dynamic type doesn't have subcolumn '{}'", type_subcolumn_name);
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Dynamic type doesn't have subcolumn '{}'", subcolumn_type_name);
         return nullptr;
     }
 
     std::unique_ptr<SubstreamData> res = std::make_unique<SubstreamData>(subcolumn_type->getDefaultSerialization());
     res->type = subcolumn_type;
     std::optional<ColumnVariant::Discriminator> discriminator;
-    ColumnPtr null_map_for_variant_from_shared_variant;
     if (data.column)
     {
         /// If column was provided, we should extract subcolumn from Dynamic column.
         const auto & dynamic_column = assert_cast<const ColumnDynamic &>(*data.column);
         const auto & variant_info = dynamic_column.getVariantInfo();
-        const auto & variant_column = dynamic_column.getVariantColumn();
-        const auto & shared_variant = dynamic_column.getSharedVariant();
         /// Check if provided Dynamic column has subcolumn of this type.
-        String subcolumn_type_name = subcolumn_type->getName();
-        auto it = variant_info.variant_name_to_discriminator.find(subcolumn_type_name);
+        auto it = variant_info.variant_name_to_discriminator.find(subcolumn_type->getName());
         if (it != variant_info.variant_name_to_discriminator.end())
         {
             discriminator = it->second;
-            res->column = variant_column.getVariantPtrByGlobalDiscriminator(*discriminator);
-        }
-        /// Otherwise if there is data in shared variant try to find requested type there.
-        else if (!shared_variant.empty())
-        {
-            /// Create null map for resulting subcolumn to make it Nullable.
-            auto null_map_column = ColumnUInt8::create();
-            NullMap & null_map = assert_cast<ColumnUInt8 &>(*null_map_column).getData();
-            null_map.reserve(variant_column.size());
-            auto subcolumn = subcolumn_type->createColumn();
-            auto shared_variant_local_discr = variant_column.localDiscriminatorByGlobal(dynamic_column.getSharedVariantDiscriminator());
-            const auto & local_discriminators = variant_column.getLocalDiscriminators();
-            const auto & offsets = variant_column.getOffsets();
-            const FormatSettings format_settings;
-            for (size_t i = 0; i != local_discriminators.size(); ++i)
-            {
-                if (local_discriminators[i] == shared_variant_local_discr)
-                {
-                    auto value = shared_variant.getDataAt(offsets[i]);
-                    ReadBufferFromMemory buf(value.data, value.size);
-                    auto type = decodeDataType(buf);
-                    if (type->getName() == subcolumn_type_name)
-                    {
-                        subcolumn_type->getDefaultSerialization()->deserializeBinary(*subcolumn, buf, format_settings);
-                        null_map.push_back(0);
-                    }
-                    else
-                    {
-                        null_map.push_back(1);
-                    }
-                }
-                else
-                {
-                    null_map.push_back(1);
-                }
-            }
-
-            res->column = std::move(subcolumn);
-            null_map_for_variant_from_shared_variant = std::move(null_map_column);
+            res->column = dynamic_column.getVariantColumn().getVariantPtrByGlobalDiscriminator(*discriminator);
         }
     }
 
@@ -218,7 +125,7 @@ std::unique_ptr<IDataType::SubstreamData> DataTypeDynamic::getDynamicSubcolumnDa
             return nullptr;
     }
 
-    res->serialization = std::make_shared<SerializationDynamicElement>(res->serialization, subcolumn_type->getName(), String(subcolumn_nested_name), is_null_map_subcolumn);
+    res->serialization = std::make_shared<SerializationDynamicElement>(res->serialization, subcolumn_type->getName(), is_null_map_subcolumn);
     /// Make resulting subcolumn Nullable only if type subcolumn can be inside Nullable or can be LowCardinality(Nullable()).
     bool make_subcolumn_nullable = subcolumn_type->canBeInsideNullable() || subcolumn_type->lowCardinality();
     if (!is_null_map_subcolumn && make_subcolumn_nullable)
@@ -226,10 +133,10 @@ std::unique_ptr<IDataType::SubstreamData> DataTypeDynamic::getDynamicSubcolumnDa
 
     if (data.column)
     {
-        /// Check if provided Dynamic column has subcolumn of this type. In this case we should use VariantSubcolumnCreator/VariantNullMapSubcolumnCreator to
-        /// create full subcolumn from variant according to discriminators.
         if (discriminator)
         {
+            /// Provided Dynamic column has subcolumn of this type, we should use VariantSubcolumnCreator/VariantNullMapSubcolumnCreator to
+            /// create full subcolumn from variant according to discriminators.
             const auto & variant_column = assert_cast<const ColumnDynamic &>(*data.column).getVariantColumn();
             std::unique_ptr<ISerialization::ISubcolumnCreator> creator;
             if (is_null_map_subcolumn)
@@ -247,21 +154,6 @@ std::unique_ptr<IDataType::SubstreamData> DataTypeDynamic::getDynamicSubcolumnDa
                     make_subcolumn_nullable);
             res->column = creator->create(res->column);
         }
-        /// Check if requested type was extracted from shared variant. In this case we should use
-        /// VariantSubcolumnCreator to create full subcolumn from variant according to created null map.
-        else if (null_map_for_variant_from_shared_variant)
-        {
-            if (is_null_map_subcolumn)
-            {
-                res->column = null_map_for_variant_from_shared_variant;
-            }
-            else
-            {
-                SerializationVariantElement::VariantSubcolumnCreator creator(
-                    null_map_for_variant_from_shared_variant, "", 0, 0, make_subcolumn_nullable, null_map_for_variant_from_shared_variant);
-                res->column = creator.create(res->column);
-            }
-        }
         /// Provided Dynamic column doesn't have subcolumn of this type, just create column filled with default values.
         else if (is_null_map_subcolumn)
         {
diff --git a/src/DataTypes/DataTypeDynamic.h b/src/DataTypes/DataTypeDynamic.h
index 2e7a23d314d..d5e4c5261ce 100644
--- a/src/DataTypes/DataTypeDynamic.h
+++ b/src/DataTypes/DataTypeDynamic.h
@@ -12,9 +12,6 @@ class DataTypeDynamic final : public IDataType
 public:
     static constexpr bool is_parametric = true;
 
-    /// Don't change this constant, it can break backward compatibility.
-    static constexpr size_t DEFAULT_MAX_DYNAMIC_TYPES = 32;
-
     explicit DataTypeDynamic(size_t max_dynamic_types_ = DEFAULT_MAX_DYNAMIC_TYPES);
 
     TypeIndex getTypeId() const override { return TypeIndex::Dynamic; }
@@ -46,6 +43,8 @@ public:
     size_t getMaxDynamicTypes() const { return max_dynamic_types; }
 
 private:
+    static constexpr size_t DEFAULT_MAX_DYNAMIC_TYPES = 32;
+
     SerializationPtr doGetDefaultSerialization() const override;
     String doGetName() const override;
 
diff --git a/src/DataTypes/DataTypeEnum.cpp b/src/DataTypes/DataTypeEnum.cpp
index b9a5a1a5a68..08e0c0d2045 100644
--- a/src/DataTypes/DataTypeEnum.cpp
+++ b/src/DataTypes/DataTypeEnum.cpp
@@ -122,12 +122,12 @@ Field DataTypeEnum<Type>::castToName(const Field & value_or_name) const
 {
     if (value_or_name.getType() == Field::Types::String)
     {
-        this->getValue(value_or_name.safeGet<String>()); /// Check correctness
-        return value_or_name.safeGet<String>();
+        this->getValue(value_or_name.get<String>()); /// Check correctness
+        return value_or_name.get<String>();
     }
     else if (value_or_name.getType() == Field::Types::Int64)
     {
-        Int64 value = value_or_name.safeGet<Int64>();
+        Int64 value = value_or_name.get<Int64>();
         checkOverflow<Type>(value);
         return this->getNameForValue(static_cast<Type>(value)).toString();
     }
@@ -141,12 +141,12 @@ Field DataTypeEnum<Type>::castToValue(const Field & value_or_name) const
 {
     if (value_or_name.getType() == Field::Types::String)
     {
-        return this->getValue(value_or_name.safeGet<String>());
+        return this->getValue(value_or_name.get<String>());
     }
     else if (value_or_name.getType() == Field::Types::Int64
           || value_or_name.getType() == Field::Types::UInt64)
     {
-        Int64 value = value_or_name.safeGet<Int64>();
+        Int64 value = value_or_name.get<Int64>();
         checkOverflow<Type>(value);
         this->getNameForValue(static_cast<Type>(value)); /// Check correctness
         return value;
@@ -220,7 +220,7 @@ static void autoAssignNumberForEnum(const ASTPtr & arguments)
                                     "Elements of Enum data type must be of form: "
                                     "'name' = number or 'name', where name is string literal and number is an integer");
 
-                literal_child_assign_num = value_literal->value.safeGet<Int64>();
+                literal_child_assign_num = value_literal->value.get<Int64>();
             }
             assign_number_child.emplace_back(child);
         }
@@ -269,8 +269,8 @@ static DataTypePtr createExact(const ASTPtr & arguments)
                                     "Elements of Enum data type must be of form: "
                                     "'name' = number or 'name', where name is string literal and number is an integer");
 
-        const String & field_name = name_literal->value.safeGet<String>();
-        const auto value = value_literal->value.safeGet<FieldType>();
+        const String & field_name = name_literal->value.get<String>();
+        const auto value = value_literal->value.get<FieldType>();
 
         if (value > std::numeric_limits<FieldType>::max() || value < std::numeric_limits<FieldType>::min())
             throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Value {} for element '{}' exceeds range of {}",
@@ -302,7 +302,7 @@ static DataTypePtr create(const ASTPtr & arguments)
                                     "Elements of Enum data type must be of form: "
                                     "'name' = number or 'name', where name is string literal and number is an integer");
 
-        Int64 value = value_literal->value.safeGet<Int64>();
+        Int64 value = value_literal->value.get<Int64>();
 
         if (value > std::numeric_limits<Int8>::max() || value < std::numeric_limits<Int8>::min())
             return createExact<DataTypeEnum16>(arguments);
diff --git a/src/DataTypes/DataTypeFactory.cpp b/src/DataTypes/DataTypeFactory.cpp
index 107d2d48135..af37cde2846 100644
--- a/src/DataTypes/DataTypeFactory.cpp
+++ b/src/DataTypes/DataTypeFactory.cpp
@@ -2,7 +2,7 @@
 #include <DataTypes/DataTypeCustom.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/ParserCreateQuery.h>
-#include <Parsers/ASTDataType.h>
+#include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
 #include <Common/typeid_cast.h>
@@ -22,6 +22,7 @@ namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int UNKNOWN_TYPE;
+    extern const int ILLEGAL_SYNTAX_FOR_DATA_TYPE;
     extern const int UNEXPECTED_AST_STRUCTURE;
     extern const int DATA_TYPE_CANNOT_HAVE_ARGUMENTS;
 }
@@ -82,9 +83,15 @@ DataTypePtr DataTypeFactory::tryGet(const ASTPtr & ast) const
 template <bool nullptr_on_error>
 DataTypePtr DataTypeFactory::getImpl(const ASTPtr & ast) const
 {
-    if (const auto * type = ast->as<ASTDataType>())
+    if (const auto * func = ast->as<ASTFunction>())
     {
-        return getImpl<nullptr_on_error>(type->name, type->arguments);
+        if (func->parameters)
+        {
+            if constexpr (nullptr_on_error)
+                return nullptr;
+            throw Exception(ErrorCodes::ILLEGAL_SYNTAX_FOR_DATA_TYPE, "Data type cannot have multiple parenthesized parameters.");
+        }
+        return getImpl<nullptr_on_error>(func->name, func->arguments);
     }
 
     if (const auto * ident = ast->as<ASTIdentifier>())
@@ -100,7 +107,7 @@ DataTypePtr DataTypeFactory::getImpl(const ASTPtr & ast) const
 
     if constexpr (nullptr_on_error)
         return nullptr;
-    throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE, "Unexpected AST element for data type: {}.", ast->getID());
+    throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE, "Unexpected AST element for data type.");
 }
 
 DataTypePtr DataTypeFactory::get(const String & family_name_param, const ASTPtr & parameters) const
@@ -118,6 +125,23 @@ DataTypePtr DataTypeFactory::getImpl(const String & family_name_param, const AST
 {
     String family_name = getAliasToOrName(family_name_param);
 
+    if (endsWith(family_name, "WithDictionary"))
+    {
+        ASTPtr low_cardinality_params = std::make_shared<ASTExpressionList>();
+        String param_name = family_name.substr(0, family_name.size() - strlen("WithDictionary"));
+        if (parameters)
+        {
+            auto func = std::make_shared<ASTFunction>();
+            func->name = param_name;
+            func->arguments = parameters;
+            low_cardinality_params->children.push_back(func);
+        }
+        else
+            low_cardinality_params->children.push_back(std::make_shared<ASTIdentifier>(param_name));
+
+        return getImpl<nullptr_on_error>("LowCardinality", low_cardinality_params);
+    }
+
     const auto * creator = findCreatorByName<nullptr_on_error>(family_name);
     if constexpr (nullptr_on_error)
     {
@@ -150,12 +174,6 @@ DataTypePtr DataTypeFactory::getCustom(DataTypeCustomDescPtr customization) cons
     return type;
 }
 
-DataTypePtr DataTypeFactory::getCustom(const String & base_name, DataTypeCustomDescPtr customization) const
-{
-    auto type = get(base_name);
-    type->setCustomization(std::move(customization));
-    return type;
-}
 
 void DataTypeFactory::registerDataType(const String & family_name, Value creator, Case case_sensitiveness)
 {
@@ -273,10 +291,9 @@ DataTypeFactory::DataTypeFactory()
     registerDataTypeDomainSimpleAggregateFunction(*this);
     registerDataTypeDomainGeo(*this);
     registerDataTypeMap(*this);
-    registerDataTypeObjectDeprecated(*this);
+    registerDataTypeObject(*this);
     registerDataTypeVariant(*this);
     registerDataTypeDynamic(*this);
-    registerDataTypeJSON(*this);
 }
 
 DataTypeFactory & DataTypeFactory::instance()
diff --git a/src/DataTypes/DataTypeFactory.h b/src/DataTypes/DataTypeFactory.h
index 7234c53551c..edba9886d1c 100644
--- a/src/DataTypes/DataTypeFactory.h
+++ b/src/DataTypes/DataTypeFactory.h
@@ -34,7 +34,6 @@ public:
     DataTypePtr get(const String & family_name, const ASTPtr & parameters) const;
     DataTypePtr get(const ASTPtr & ast) const;
     DataTypePtr getCustom(DataTypeCustomDescPtr customization) const;
-    DataTypePtr getCustom(const String & base_name, DataTypeCustomDescPtr customization) const;
 
     /// Return nullptr in case of error.
     DataTypePtr tryGet(const String & full_name) const;
@@ -99,9 +98,8 @@ void registerDataTypeLowCardinality(DataTypeFactory & factory);
 void registerDataTypeDomainBool(DataTypeFactory & factory);
 void registerDataTypeDomainSimpleAggregateFunction(DataTypeFactory & factory);
 void registerDataTypeDomainGeo(DataTypeFactory & factory);
-void registerDataTypeObjectDeprecated(DataTypeFactory & factory);
+void registerDataTypeObject(DataTypeFactory & factory);
 void registerDataTypeVariant(DataTypeFactory & factory);
 void registerDataTypeDynamic(DataTypeFactory & factory);
-void registerDataTypeJSON(DataTypeFactory & factory);
 
 }
diff --git a/src/DataTypes/DataTypeFixedString.cpp b/src/DataTypes/DataTypeFixedString.cpp
index 63d5245287f..080ff8826a5 100644
--- a/src/DataTypes/DataTypeFixedString.cpp
+++ b/src/DataTypes/DataTypeFixedString.cpp
@@ -51,11 +51,11 @@ static DataTypePtr create(const ASTPtr & arguments)
                         "FixedString data type family must have exactly one argument - size in bytes");
 
     const auto * argument = arguments->children[0]->as<ASTLiteral>();
-    if (!argument || argument->value.getType() != Field::Types::UInt64 || argument->value.safeGet<UInt64>() == 0)
+    if (!argument || argument->value.getType() != Field::Types::UInt64 || argument->value.get<UInt64>() == 0)
         throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE,
                         "FixedString data type family must have a number (positive integer) as its argument");
 
-    return std::make_shared<DataTypeFixedString>(argument->value.safeGet<UInt64>());
+    return std::make_shared<DataTypeFixedString>(argument->value.get<UInt64>());
 }
 
 
diff --git a/src/DataTypes/DataTypeObject.cpp b/src/DataTypes/DataTypeObject.cpp
index d8cbfda4afe..5636a46373f 100644
--- a/src/DataTypes/DataTypeObject.cpp
+++ b/src/DataTypes/DataTypeObject.cpp
@@ -1,538 +1,82 @@
-#include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeObject.h>
-#include <DataTypes/DataTypeObjectDeprecated.h>
-#include <DataTypes/Serializations/SerializationJSON.h>
-#include <DataTypes/Serializations/SerializationObjectTypedPath.h>
-#include <DataTypes/Serializations/SerializationObjectDynamicPath.h>
-#include <DataTypes/Serializations/SerializationSubObject.h>
-#include <Columns/ColumnObject.h>
-#include <Common/CurrentThread.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/Serializations/SerializationObject.h>
 
 #include <Parsers/IAST.h>
 #include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTDataType.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTObjectTypeArgument.h>
-#include <Parsers/ASTNameTypePair.h>
-#include <Formats/JSONExtractTree.h>
-#include <Interpreters/Context.h>
-#include <Core/Settings.h>
 #include <IO/Operators.h>
 
-#include "config.h"
-
-#if USE_SIMDJSON
-#  include <Common/JSONParsers/SimdJSONParser.h>
-#elif USE_RAPIDJSON
-#  include <Common/JSONParsers/RapidJSONParser.h>
-#else
-#  include <Common/JSONParsers/DummyJSONParser.h>
-#endif
-
 namespace DB
 {
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int UNEXPECTED_AST_STRUCTURE;
-    extern const int BAD_ARGUMENTS;
-    extern const int CANNOT_COMPILE_REGEXP;
 }
 
-DataTypeObject::DataTypeObject(
-    const SchemaFormat & schema_format_,
-    std::unordered_map<String, DataTypePtr> typed_paths_,
-    std::unordered_set<String> paths_to_skip_,
-    std::vector<String> path_regexps_to_skip_,
-    size_t max_dynamic_paths_,
-    size_t max_dynamic_types_)
-    : schema_format(schema_format_)
-    , typed_paths(std::move(typed_paths_))
-    , paths_to_skip(std::move(paths_to_skip_))
-    , path_regexps_to_skip(std::move(path_regexps_to_skip_))
-    , max_dynamic_paths(max_dynamic_paths_)
-    , max_dynamic_types(max_dynamic_types_)
-{
-    /// Check if regular expressions are valid.
-    for (const auto & regexp_str : path_regexps_to_skip)
-    {
-        re2::RE2::Options options;
-        /// Don't log errors to stderr.
-        options.set_log_errors(false);
-        auto regexp = re2::RE2(regexp_str, options);
-        if (!regexp.ok())
-            throw Exception(ErrorCodes::CANNOT_COMPILE_REGEXP, "Invalid regexp '{}': {}", regexp_str, regexp.error());
-    }
-
-    for (const auto & [typed_path, type] : typed_paths)
-    {
-        for (const auto & path_to_skip : paths_to_skip)
-        {
-            if (typed_path.starts_with(path_to_skip))
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Path '{}' is specified with the data type ('{}') and matches the SKIP path prefix '{}'", typed_path, type->getName(), path_to_skip);
-        }
-
-        for (const auto & path_regex_to_skip : path_regexps_to_skip)
-        {
-            if (re2::RE2::FullMatch(typed_path, re2::RE2(path_regex_to_skip)))
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Path '{}' is specified with the data type ('{}') and matches the SKIP REGEXP '{}'", typed_path, type->getName(), path_regex_to_skip);
-        }
-    }
-}
-
-DataTypeObject::DataTypeObject(const DB::DataTypeObject::SchemaFormat & schema_format_, size_t max_dynamic_paths_, size_t max_dynamic_types_)
-    : schema_format(schema_format_)
-    , max_dynamic_paths(max_dynamic_paths_)
-    , max_dynamic_types(max_dynamic_types_)
+DataTypeObject::DataTypeObject(const String & schema_format_, bool is_nullable_)
+    : schema_format(Poco::toLower(schema_format_))
+    , is_nullable(is_nullable_)
 {
 }
 
 bool DataTypeObject::equals(const IDataType & rhs) const
 {
     if (const auto * object = typeid_cast<const DataTypeObject *>(&rhs))
-    {
-        if (typed_paths.size() != object->typed_paths.size())
-            return false;
-
-        for (const auto & [path, type] : typed_paths)
-        {
-            auto it = object->typed_paths.find(path);
-            if (it == object->typed_paths.end())
-                return false;
-            if (!type->equals(*it->second))
-                return false;
-        }
-
-        return schema_format == object->schema_format && paths_to_skip == object->paths_to_skip && path_regexps_to_skip == object->path_regexps_to_skip
-            && max_dynamic_types == object->max_dynamic_types && max_dynamic_paths == object->max_dynamic_paths;
-    }
-
+        return schema_format == object->schema_format && is_nullable == object->is_nullable;
     return false;
 }
 
 SerializationPtr DataTypeObject::doGetDefaultSerialization() const
 {
-    std::unordered_map<String, SerializationPtr> typed_path_serializations;
-    typed_path_serializations.reserve(typed_paths.size());
-    for (const auto & [path, type] : typed_paths)
-        typed_path_serializations[path] = type->getDefaultSerialization();
-
-    switch (schema_format)
-    {
-        case SchemaFormat::JSON:
-#if USE_SIMDJSON
-            return std::make_shared<SerializationJSON<SimdJSONParser>>(
-                std::move(typed_path_serializations),
-                paths_to_skip,
-                path_regexps_to_skip,
-                buildJSONExtractTree<SimdJSONParser>(getPtr(), "JSON serialization"));
-#elif USE_RAPIDJSON
-            return std::make_shared<SerializationJSON<RapidJSONParser>>(
-                std::move(typed_path_serializations),
-                paths_to_skip,
-                path_regexps_to_skip,
-                buildJSONExtractTree<RapidJSONParser>(getPtr(), "JSON serialization"));
-#else
-            return std::make_shared<SerializationJSON<DummyJSONParser>>(
-                std::move(typed_path_serializations),
-                paths_to_skip,
-                path_regexps_to_skip,
-                buildJSONExtractTree<DummyJSONParser>(getPtr(), "JSON serialization"));
-#endif
-    }
+    return getObjectSerialization(schema_format);
 }
 
 String DataTypeObject::doGetName() const
 {
     WriteBufferFromOwnString out;
-    out << magic_enum::enum_name(schema_format);
-    bool first = true;
-    auto write_separator = [&]()
-    {
-        if (!first)
-        {
-            out << ", ";
-        }
-        else
-        {
-            out << "(";
-            first = false;
-        }
-    };
-
-    if (max_dynamic_types != DataTypeDynamic::DEFAULT_MAX_DYNAMIC_TYPES)
-    {
-        write_separator();
-        out << "max_dynamic_types=" << max_dynamic_types;
-    }
-
-    if (max_dynamic_paths != DEFAULT_MAX_SEPARATELY_STORED_PATHS)
-    {
-        write_separator();
-        out << "max_dynamic_paths=" << max_dynamic_paths;
-    }
-
-    std::vector<String> sorted_typed_paths;
-    sorted_typed_paths.reserve(typed_paths.size());
-    for (const auto & [path, _] : typed_paths)
-        sorted_typed_paths.push_back(path);
-    std::sort(sorted_typed_paths.begin(), sorted_typed_paths.end());
-    for (const auto & path : sorted_typed_paths)
-    {
-        write_separator();
-        out << backQuoteIfNeed(path) << " " << typed_paths.at(path)->getName();
-    }
-
-    std::vector<String> sorted_skip_paths;
-    sorted_skip_paths.reserve(paths_to_skip.size());
-    for (const auto & skip_path : paths_to_skip)
-        sorted_skip_paths.push_back(skip_path);
-    std::sort(sorted_skip_paths.begin(), sorted_skip_paths.end());
-    for (const auto & skip_path : sorted_skip_paths)
-    {
-        write_separator();
-        out << "SKIP " << backQuoteIfNeed(skip_path);
-    }
-
-    for (const auto & skip_regexp : path_regexps_to_skip)
-    {
-        write_separator();
-        out << "SKIP REGEXP " << quoteString(skip_regexp);
-    }
-
-    if (!first)
-        out << ")";
-
+    if (is_nullable)
+        out << "Object(Nullable(" << quote << schema_format << "))";
+    else
+        out << "Object(" << quote << schema_format << ")";
     return out.str();
 }
 
-MutableColumnPtr DataTypeObject::createColumn() const
+static DataTypePtr create(const ASTPtr & arguments)
 {
-    std::unordered_map<String, MutableColumnPtr> typed_path_columns;
-    typed_path_columns.reserve(typed_paths.size());
-    for (const auto & [path, type] : typed_paths)
-        typed_path_columns[path] = type->createColumn();
+    if (!arguments || arguments->children.size() != 1)
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            "Object data type family must have one argument - name of schema format");
 
-    return ColumnObject::create(std::move(typed_path_columns), max_dynamic_paths, max_dynamic_types);
-}
+    ASTPtr schema_argument = arguments->children[0];
+    bool is_nullable = false;
 
-namespace
-{
-
-/// It is possible to have nested JSON object inside Dynamic. For example when we have an array of JSON objects.
-/// During type inference in parsing in case of creating nested JSON objects, we reduce max_dynamic_paths/max_dynamic_types by factors
-/// NESTED_OBJECT_MAX_DYNAMIC_PATHS_REDUCE_FACTOR/NESTED_OBJECT_MAX_DYNAMIC_TYPES_REDUCE_FACTOR.
-/// So the type name will actually be JSON(max_dynamic_paths=N, max_dynamic_types=M). But we want the user to be able to query it
-/// using json.array.:`Array(JSON)`.some.path without specifying max_dynamic_paths/max_dynamic_types.
-/// To support it, we do a trick - we replace JSON name in subcolumn to JSON(max_dynamic_paths=N, max_dynamic_types=M), because we know
-/// the exact values of max_dynamic_paths/max_dynamic_types for it.
-void replaceJSONTypeNameIfNeeded(String & type_name, size_t max_dynamic_paths, size_t max_dynamic_types)
-{
-    auto pos = type_name.find("JSON");
-    while (pos != String::npos)
+    if (const auto * func = schema_argument->as<ASTFunction>())
     {
-        /// Replace only if we don't already have parameters in JSON type declaration.
-        if (pos + 4 == type_name.size() || type_name[pos + 4] != '(')
-            type_name.replace(
-                pos,
-                4,
-                fmt::format(
-                    "JSON(max_dynamic_paths={}, max_dynamic_types={})",
-                    max_dynamic_paths / DataTypeObject::NESTED_OBJECT_MAX_DYNAMIC_PATHS_REDUCE_FACTOR,
-                    max_dynamic_types / DataTypeObject::NESTED_OBJECT_MAX_DYNAMIC_TYPES_REDUCE_FACTOR));
-        pos = type_name.find("JSON", pos + 4);
-    }
-}
+        if (func->name != "Nullable" || func->arguments->children.size() != 1)
+            throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE,
+                "Expected 'Nullable(<schema_name>)' as parameter for type Object (function: {})", func->name);
 
-/// JSON subcolumn name with Dynamic type subcolumn looks like this:
-/// "json.some.path.:`Type_name`.some.subcolumn".
-/// We back quoted type name during identifier parsing so we can distinguish type subcolumn and path element ":TypeName".
-std::pair<String, String> splitPathAndDynamicTypeSubcolumn(std::string_view subcolumn_name, size_t max_dynamic_paths, size_t max_dynamic_types)
-{
-    /// Try to find dynamic type subcolumn in a form .:`Type`.
-    auto pos = subcolumn_name.find(".:`");
-    if (pos == std::string_view::npos)
-        return {String(subcolumn_name), ""};
-
-    ReadBufferFromMemory buf(subcolumn_name.substr(pos + 2));
-    String dynamic_subcolumn;
-    /// Try to read back quoted type name.
-    if (!tryReadBackQuotedString(dynamic_subcolumn, buf))
-        return {String(subcolumn_name), ""};
-
-    replaceJSONTypeNameIfNeeded(dynamic_subcolumn, max_dynamic_paths, max_dynamic_types);
-
-    /// If there is more data in the buffer - it's subcolumn of a type, append it to the type name.
-    if (!buf.eof())
-        dynamic_subcolumn += String(buf.position(), buf.available());
-
-    return {String(subcolumn_name.substr(0, pos)), dynamic_subcolumn};
-}
-
-/// Sub-object subcolumn in JSON path always looks like "^`some`.path.path".
-/// We back quote first path element after `^` so we can distinguish sub-object subcolumn and path element "^path".
-std::optional<String> tryGetSubObjectSubcolumn(std::string_view subcolumn_name)
-{
-    if (!subcolumn_name.starts_with("^`"))
-        return std::nullopt;
-
-    ReadBufferFromMemory buf(subcolumn_name.data() + 1);
-    String path;
-    /// Try to read back-quoted first path element.
-    if (!tryReadBackQuotedString(path, buf))
-        return std::nullopt;
-
-    /// Add remaining path elements if any.
-    return path + String(buf.position(), buf.available());
-}
-
-/// Return sub-path by specified prefix.
-/// For example, for prefix a.b:
-/// a.b.c.d -> c.d, a.b.c -> c
-String getSubPath(const String & path, const String & prefix)
-{
-    return path.substr(prefix.size() + 1);
-}
-
-std::string_view getSubPath(std::string_view path, const String & prefix)
-{
-    return path.substr(prefix.size() + 1);
-}
-
-}
-
-std::unique_ptr<ISerialization::SubstreamData> DataTypeObject::getDynamicSubcolumnData(std::string_view subcolumn_name, const SubstreamData & data, bool throw_if_null) const
-{
-    /// Check if it's sub-object subcolumn.
-    /// In this case we should return JSON column with all paths that are inside specified object prefix.
-    /// For example, if we have {"a" : {"b" : {"c" : {"d" : 10, "e" : "Hello"}, "f" : [1, 2, 3]}}} and subcolumn ^a.b
-    /// we should return JSON column with data {"c" : {"d" : 10, "e" : Hello}, "f" : [1, 2, 3]}
-    if (auto sub_object_subcolumn = tryGetSubObjectSubcolumn(subcolumn_name))
-    {
-        const String & prefix = *sub_object_subcolumn;
-        /// Collect new typed paths.
-        std::unordered_map<String, DataTypePtr> typed_sub_paths;
-        /// Collect serializations for typed paths. They will be needed for sub-object subcolumn deserialization.
-        std::unordered_map<String, SerializationPtr> typed_paths_serializations;
-        for (const auto & [path, type] : typed_paths)
-        {
-            if (path.starts_with(prefix) && path.size() != prefix.size())
-            {
-                typed_sub_paths[getSubPath(path, prefix)] = type;
-                typed_paths_serializations[path] = type->getDefaultSerialization();
-            }
-        }
-
-        std::unique_ptr<SubstreamData> res = std::make_unique<SubstreamData>(std::make_shared<SerializationSubObject>(prefix, typed_paths_serializations));
-        /// Keep all current constraints like limits and skip paths/prefixes/regexps.
-        res->type = std::make_shared<DataTypeObject>(schema_format, typed_sub_paths, paths_to_skip, path_regexps_to_skip, max_dynamic_paths, max_dynamic_types);
-        /// If column was provided, we should create a column for the requested subcolumn.
-        if (data.column)
-        {
-            const auto & object_column = assert_cast<const ColumnObject &>(*data.column);
-
-            auto result_column = res->type->createColumn();
-            auto & result_object_column = assert_cast<ColumnObject &>(*result_column);
-
-            /// Iterate over all typed/dynamic/shared data paths and collect all paths with specified prefix.
-            auto & result_typed_columns = result_object_column.getTypedPaths();
-            for (const auto & [path, column] : object_column.getTypedPaths())
-            {
-                if (path.starts_with(prefix) && path.size() != prefix.size())
-                    result_typed_columns[getSubPath(path, prefix)] = column;
-            }
-
-            auto & result_dynamic_columns = result_object_column.getDynamicPaths();
-            auto & result_dynamic_columns_ptrs = result_object_column.getDynamicPathsPtrs();
-            for (const auto & [path, column] :  object_column.getDynamicPaths())
-            {
-                if (path.starts_with(prefix) && path.size() != prefix.size())
-                {
-                    auto sub_path = getSubPath(path, prefix);
-                    result_dynamic_columns[sub_path] = column;
-                    result_dynamic_columns_ptrs[sub_path] = assert_cast<ColumnDynamic *>(result_dynamic_columns[sub_path].get());
-                }
-            }
-
-            const auto & shared_data_offsets = object_column.getSharedDataOffsets();
-            const auto [shared_data_paths, shared_data_values] = object_column.getSharedDataPathsAndValues();
-            auto & result_shared_data_offsets = result_object_column.getSharedDataOffsets();
-            result_shared_data_offsets.reserve(shared_data_offsets.size());
-            auto [result_shared_data_paths, result_shared_data_values] = result_object_column.getSharedDataPathsAndValues();
-            for (size_t i = 0; i != shared_data_offsets.size(); ++i)
-            {
-                size_t start = shared_data_offsets[ssize_t(i) - 1];
-                size_t end = shared_data_offsets[ssize_t(i)];
-                size_t lower_bound_index = ColumnObject::findPathLowerBoundInSharedData(prefix, *shared_data_paths, start, end);
-                for (; lower_bound_index != end; ++lower_bound_index)
-                {
-                    auto path = shared_data_paths->getDataAt(lower_bound_index).toView();
-                    if (!path.starts_with(prefix))
-                        break;
-
-                    /// Don't include path that is equal to the prefix.
-                    if (path.size() != prefix.size())
-                    {
-                        auto sub_path = getSubPath(path, prefix);
-                        result_shared_data_paths->insertData(sub_path.data(), sub_path.size());
-                        result_shared_data_values->insertFrom(*shared_data_values, lower_bound_index);
-                    }
-                }
-                result_shared_data_offsets.push_back(result_shared_data_paths->size());
-            }
-
-            res->column = std::move(result_column);
-        }
-
-        return res;
+        schema_argument = func->arguments->children[0];
+        is_nullable = true;
     }
 
-    /// Split requested subcolumn to the JSON path and Dynamic type subcolumn.
-    auto [path, path_subcolumn] = splitPathAndDynamicTypeSubcolumn(subcolumn_name, max_dynamic_paths, max_dynamic_types);
-    std::unique_ptr<SubstreamData> res;
-    if (auto it = typed_paths.find(path); it != typed_paths.end())
-    {
-        res = std::make_unique<SubstreamData>(it->second->getDefaultSerialization());
-        res->type = it->second;
-    }
-    else
-    {
-        res = std::make_unique<SubstreamData>(std::make_shared<SerializationDynamic>());
-        res->type = std::make_shared<DataTypeDynamic>();
-    }
+    const auto * literal = schema_argument->as<ASTLiteral>();
+    if (!literal || literal->value.getType() != Field::Types::String)
+        throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE,
+            "Object data type family must have a const string as its schema name parameter");
 
-    /// If column was provided, we should create a column for requested subcolumn.
-    if (data.column)
-    {
-        const auto & object_column = assert_cast<const ColumnObject &>(*data.column);
-        /// Try to find requested path in typed paths.
-        if (auto typed_it = object_column.getTypedPaths().find(path); typed_it != object_column.getTypedPaths().end())
-        {
-            res->column = typed_it->second;
-        }
-        /// Try to find requested path in dynamic paths.
-        else if (auto dynamic_it = object_column.getDynamicPaths().find(path); dynamic_it != object_column.getDynamicPaths().end())
-        {
-            res->column = dynamic_it->second;
-        }
-        /// Extract values of requested path from shared data.
-        else
-        {
-            auto dynamic_column = ColumnDynamic::create(max_dynamic_types);
-            dynamic_column->reserve(object_column.size());
-            ColumnObject::fillPathColumnFromSharedData(*dynamic_column, path, object_column.getSharedDataPtr(), 0, object_column.size());
-            res->column = std::move(dynamic_column);
-        }
-    }
-
-    /// Get subcolumn for Dynamic type if needed.
-    if (!path_subcolumn.empty())
-    {
-        res = res->type->getSubcolumnData(path_subcolumn, *res, throw_if_null);
-        if (!res)
-            return nullptr;
-    }
-
-    if (typed_paths.contains(path))
-        res->serialization = std::make_shared<SerializationObjectTypedPath>(res->serialization, path);
-    else
-        res->serialization = std::make_shared<SerializationObjectDynamicPath>(res->serialization, path, path_subcolumn, max_dynamic_types);
-
-    return res;
+    return std::make_shared<DataTypeObject>(literal->value.get<const String &>(), is_nullable);
 }
 
-static DataTypePtr createObject(const ASTPtr & arguments, const DataTypeObject::SchemaFormat & schema_format)
+void registerDataTypeObject(DataTypeFactory & factory)
 {
-    if (!arguments || arguments->children.empty())
-        return std::make_shared<DataTypeObject>(schema_format);
-
-    std::unordered_map<String, DataTypePtr> typed_paths;
-    std::unordered_set<String> paths_to_skip;
-    std::vector<String> path_regexps_to_skip;
-
-    size_t max_dynamic_types = DataTypeDynamic::DEFAULT_MAX_DYNAMIC_TYPES;
-    size_t max_dynamic_paths = DataTypeObject::DEFAULT_MAX_SEPARATELY_STORED_PATHS;
-
-    for (const auto & argument : arguments->children)
-    {
-        const auto * object_type_argument = argument->as<ASTObjectTypeArgument>();
-        if (object_type_argument->parameter)
-        {
-            const auto * function = object_type_argument->parameter->as<ASTFunction>();
-
-            if (!function || function->name != "equals")
-                throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE, "Unexpected parameter in {} type arguments: {}", magic_enum::enum_name(schema_format), function->formatForErrorMessage());
-
-            const auto * identifier = function->arguments->children[0]->as<ASTIdentifier>();
-            if (!identifier)
-                throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE, "Unexpected {} type argument: {}. Expected expression 'max_dynamic_types=N' or 'max_dynamic_paths=N'", magic_enum::enum_name(schema_format), function->formatForErrorMessage());
-
-            auto identifier_name = identifier->name();
-            if (identifier_name != "max_dynamic_types" && identifier_name != "max_dynamic_paths")
-                throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE, "Unexpected parameter in {} type arguments: {}. Expected 'max_dynamic_types' or `max_dynamic_paths`", magic_enum::enum_name(schema_format), identifier_name);
-
-            auto * literal = function->arguments->children[1]->as<ASTLiteral>();
-            /// Is 1000000 a good maximum for max paths?
-            size_t max_value = identifier_name == "max_dynamic_types" ? ColumnDynamic::MAX_DYNAMIC_TYPES_LIMIT : 1000000;
-            if (!literal || literal->value.getType() != Field::Types::UInt64 || literal->value.safeGet<UInt64>() > max_value)
-                throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE, "'{}' parameter for {} type should be a positive integer between 0 and {}. Got {}", identifier_name, magic_enum::enum_name(schema_format), max_value, function->arguments->children[1]->formatForErrorMessage());
-
-            if (identifier_name == "max_dynamic_types")
-                max_dynamic_types = literal->value.safeGet<UInt64>();
-            else
-                max_dynamic_paths = literal->value.safeGet<UInt64>();
-        }
-        else if (object_type_argument->path_with_type)
-        {
-            const auto * path_with_type = object_type_argument->path_with_type->as<ASTNameTypePair>();
-            auto data_type = DataTypeFactory::instance().get(path_with_type->type);
-            if (typed_paths.contains(path_with_type->name))
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Found duplicated path with type: {}", path_with_type->name);
-            typed_paths.emplace(path_with_type->name, data_type);
-        }
-        else if (object_type_argument->skip_path)
-        {
-            const auto * identifier = object_type_argument->skip_path->as<ASTIdentifier>();
-            if (!identifier)
-                throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE, "Unexpected AST in SKIP section of {} type arguments: {}. Expected identifier with path name", magic_enum::enum_name(schema_format), object_type_argument->skip_path->formatForErrorMessage());
-
-            paths_to_skip.insert(identifier->name());
-        }
-        else if (object_type_argument->skip_path_regexp)
-        {
-            const auto * literal = object_type_argument->skip_path_regexp->as<ASTLiteral>();
-            if (!literal || literal->value.getType() != Field::Types::String)
-                throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE, "Unexpected AST in SKIP section of {} type arguments: {}. Expected identifier with path name", magic_enum::enum_name(schema_format), object_type_argument->skip_path->formatForErrorMessage());
-
-            path_regexps_to_skip.push_back(literal->value.safeGet<String>());
-        }
-    }
-
-    std::sort(path_regexps_to_skip.begin(), path_regexps_to_skip.end());
-    return std::make_shared<DataTypeObject>(schema_format, std::move(typed_paths), std::move(paths_to_skip), std::move(path_regexps_to_skip), max_dynamic_paths, max_dynamic_types);
-}
-
-static DataTypePtr createJSON(const ASTPtr & arguments)
-{
-    auto context = CurrentThread::getQueryContext();
-    if (!context)
-        context = Context::getGlobalContextInstance();
-
-    if (context->getSettingsRef().allow_experimental_object_type && context->getSettingsRef().use_json_alias_for_old_object_type)
-    {
-        if (arguments && !arguments->children.empty())
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Experimental Object type doesn't support any arguments. If you want to use new JSON type, set settings allow_experimental_json_type = 1 and use_json_alias_for_old_object_type = 0");
-
-        return std::make_shared<DataTypeObjectDeprecated>("JSON", false);
-    }
-
-    return createObject(arguments, DataTypeObject::SchemaFormat::JSON);
-}
-
-void registerDataTypeJSON(DataTypeFactory & factory)
-{
-    factory.registerDataType("JSON", createJSON, DataTypeFactory::Case::Insensitive);
+    factory.registerDataType("Object", create);
+    factory.registerSimpleDataType("JSON",
+        [] { return std::make_shared<DataTypeObject>("JSON", false); },
+        DataTypeFactory::Case::Insensitive);
 }
 
 }
diff --git a/src/DataTypes/DataTypeObject.h b/src/DataTypes/DataTypeObject.h
index 7eb2e7729de..c610a1a8ba4 100644
--- a/src/DataTypes/DataTypeObject.h
+++ b/src/DataTypes/DataTypeObject.h
@@ -1,80 +1,48 @@
 #pragma once
 
 #include <DataTypes/IDataType.h>
-#include <DataTypes/DataTypeDynamic.h>
 #include <Core/Field.h>
-#include <Columns/ColumnObjectDeprecated.h>
-#include <Common/re2.h>
+#include <Columns/ColumnObject.h>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+}
+
 class DataTypeObject : public IDataType
 {
+private:
+    String schema_format;
+    bool is_nullable;
+
 public:
-    enum class SchemaFormat
-    {
-        JSON = 0,
-    };
-
-    /// Don't change these constants, it can break backward compatibility.
-    static constexpr size_t DEFAULT_MAX_SEPARATELY_STORED_PATHS = 1024;
-    static constexpr size_t NESTED_OBJECT_MAX_DYNAMIC_PATHS_REDUCE_FACTOR = 4;
-    static constexpr size_t NESTED_OBJECT_MAX_DYNAMIC_TYPES_REDUCE_FACTOR = 2;
-
-    explicit DataTypeObject(
-        const SchemaFormat & schema_format_,
-        std::unordered_map<String, DataTypePtr> typed_paths_ = {},
-        std::unordered_set<String> paths_to_skip_ = {},
-        std::vector<String> path_regexps_to_skip_ = {},
-        size_t max_dynamic_paths_ = DEFAULT_MAX_SEPARATELY_STORED_PATHS,
-        size_t max_dynamic_types_ = DataTypeDynamic::DEFAULT_MAX_DYNAMIC_TYPES);
-
-    DataTypeObject(const SchemaFormat & schema_format_, size_t max_dynamic_paths_, size_t max_dynamic_types_);
+    DataTypeObject(const String & schema_format_, bool is_nullable_);
 
     const char * getFamilyName() const override { return "Object"; }
     String doGetName() const override;
     TypeIndex getTypeId() const override { return TypeIndex::Object; }
 
-    MutableColumnPtr createColumn() const override;
+    MutableColumnPtr createColumn() const override { return ColumnObject::create(is_nullable); }
 
-    Field getDefault() const override { return Object(); }
+    Field getDefault() const override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getDefault() is not implemented for data type {}", getName());
+    }
 
-    bool isParametric() const override { return true; }
-    bool canBeInsideNullable() const override { return false; }
-    bool supportsSparseSerialization() const override { return false; }
-    bool canBeInsideSparseColumns() const override { return false; }
-    bool isComparable() const override { return false; }
     bool haveSubtypes() const override { return false; }
-
     bool equals(const IDataType & rhs) const override;
-
-    bool hasDynamicSubcolumnsData() const override { return true; }
-    std::unique_ptr<SubstreamData> getDynamicSubcolumnData(std::string_view subcolumn_name, const SubstreamData & data, bool throw_if_null) const override;
+    bool isParametric() const override { return true; }
+    bool hasDynamicSubcolumnsDeprecated() const override { return true; }
 
     SerializationPtr doGetDefaultSerialization() const override;
 
-    const SchemaFormat & getSchemaFormat() const { return schema_format; }
-    const std::unordered_map<String, DataTypePtr> & getTypedPaths() const { return typed_paths; }
-    const std::unordered_set<String> & getPathsToSkip() const { return paths_to_skip; }
-    const std::vector<String> & getPathRegexpsToSkip() const { return path_regexps_to_skip; }
+    bool hasNullableSubcolumns() const { return is_nullable; }
 
-    size_t getMaxDynamicTypes() const { return max_dynamic_types; }
-    size_t getMaxDynamicPaths() const { return max_dynamic_paths; }
-
-private:
-    SchemaFormat schema_format;
-    /// Set of paths with types that were specified in type declaration.
-    std::unordered_map<String, DataTypePtr> typed_paths;
-    /// Set of paths that should be skipped during data parsing.
-    std::unordered_set<String> paths_to_skip;
-    /// List of regular expressions that should be used to skip paths during data parsing.
-    std::vector<String> path_regexps_to_skip;
-    /// Limit on the number of paths that can be stored as subcolumn.
-    size_t max_dynamic_paths;
-    /// Limit of dynamic types that should be used for Dynamic columns.
-    size_t max_dynamic_types;
+    const String & getSchemaFormat() const { return schema_format; }
 };
 
 }
diff --git a/src/DataTypes/DataTypeObjectDeprecated.cpp b/src/DataTypes/DataTypeObjectDeprecated.cpp
deleted file mode 100644
index 2ef3098811d..00000000000
--- a/src/DataTypes/DataTypeObjectDeprecated.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypeObjectDeprecated.h>
-#include <DataTypes/Serializations/SerializationObjectDeprecated.h>
-
-#include <Parsers/IAST.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTDataType.h>
-#include <IO/Operators.h>
-
-#include <Interpreters/Context.h>
-#include <Core/Settings.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int UNEXPECTED_AST_STRUCTURE;
-}
-
-DataTypeObjectDeprecated::DataTypeObjectDeprecated(const String & schema_format_, bool is_nullable_)
-    : schema_format(Poco::toLower(schema_format_))
-    , is_nullable(is_nullable_)
-{
-}
-
-bool DataTypeObjectDeprecated::equals(const IDataType & rhs) const
-{
-    if (const auto * object = typeid_cast<const DataTypeObjectDeprecated *>(&rhs))
-        return schema_format == object->schema_format && is_nullable == object->is_nullable;
-    return false;
-}
-
-SerializationPtr DataTypeObjectDeprecated::doGetDefaultSerialization() const
-{
-    return getObjectSerialization(schema_format);
-}
-
-String DataTypeObjectDeprecated::doGetName() const
-{
-    WriteBufferFromOwnString out;
-    if (is_nullable)
-        out << "Object(Nullable(" << quote << schema_format << "))";
-    else
-        out << "Object(" << quote << schema_format << ")";
-    return out.str();
-}
-
-static DataTypePtr create(const ASTPtr & arguments)
-{
-    if (!arguments || arguments->children.size() != 1)
-        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-            "Object data type family must have one argument - name of schema format");
-
-    ASTPtr schema_argument = arguments->children[0];
-    bool is_nullable = false;
-
-    if (const auto * type = schema_argument->as<ASTDataType>())
-    {
-        if (type->name != "Nullable" || type->arguments->children.size() != 1)
-            throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE,
-                            "Expected 'Nullable(<schema_name>)' as parameter for type Object (function: {})", type->name);
-
-        schema_argument = type->arguments->children[0];
-        is_nullable = true;
-    }
-
-    const auto * literal = schema_argument->as<ASTLiteral>();
-    if (!literal || literal->value.getType() != Field::Types::String)
-        throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE,
-            "Object data type family must have a const string as its schema name parameter");
-
-    return std::make_shared<DataTypeObjectDeprecated>(literal->value.safeGet<const String &>(), is_nullable);
-}
-
-void registerDataTypeObjectDeprecated(DataTypeFactory & factory)
-{
-    factory.registerDataType("Object", create);
-}
-
-}
diff --git a/src/DataTypes/DataTypeObjectDeprecated.h b/src/DataTypes/DataTypeObjectDeprecated.h
deleted file mode 100644
index e1f81caaa4f..00000000000
--- a/src/DataTypes/DataTypeObjectDeprecated.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-#include <DataTypes/IDataType.h>
-#include <Core/Field.h>
-#include <Columns/ColumnObjectDeprecated.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-class DataTypeObjectDeprecated : public IDataType
-{
-private:
-    String schema_format;
-    bool is_nullable;
-
-public:
-    DataTypeObjectDeprecated(const String & schema_format_, bool is_nullable_);
-
-    const char * getFamilyName() const override { return "Object"; }
-    String doGetName() const override;
-    TypeIndex getTypeId() const override { return TypeIndex::ObjectDeprecated; }
-
-    MutableColumnPtr createColumn() const override { return ColumnObjectDeprecated::create(is_nullable); }
-
-    Field getDefault() const override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getDefault() is not implemented for data type {}", getName());
-    }
-
-    bool haveSubtypes() const override { return false; }
-    bool equals(const IDataType & rhs) const override;
-    bool isParametric() const override { return true; }
-    bool hasDynamicSubcolumnsDeprecated() const override { return true; }
-
-    SerializationPtr doGetDefaultSerialization() const override;
-
-    bool hasNullableSubcolumns() const { return is_nullable; }
-
-    const String & getSchemaFormat() const { return schema_format; }
-};
-
-}
diff --git a/src/DataTypes/DataTypeTuple.cpp b/src/DataTypes/DataTypeTuple.cpp
index 75556ed4090..e96937d522d 100644
--- a/src/DataTypes/DataTypeTuple.cpp
+++ b/src/DataTypes/DataTypeTuple.cpp
@@ -11,7 +11,7 @@
 #include <DataTypes/Serializations/SerializationTuple.h>
 #include <DataTypes/Serializations/SerializationNamed.h>
 #include <DataTypes/Serializations/SerializationInfoTuple.h>
-#include <DataTypes/Serializations/SerializationWrapper.h>
+#include <DataTypes/Serializations/SerializationVariantElement.h>
 #include <DataTypes/NestedUtils.h>
 #include <Parsers/IAST.h>
 #include <Parsers/ASTNameTypePair.h>
@@ -192,12 +192,17 @@ MutableColumnPtr DataTypeTuple::createColumn() const
 
 MutableColumnPtr DataTypeTuple::createColumn(const ISerialization & serialization) const
 {
-    /// If we read subcolumn of nested Tuple or this Tuple is a subcolumn, it may be wrapped to SerializationWrapper
+    /// 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_wrapper = dynamic_cast<const SerializationWrapper *>(current_serialization))
-        current_serialization = serialization_wrapper->getNested().get();
+    while (const auto * serialization_named = typeid_cast<const SerializationNamed *>(current_serialization))
+        current_serialization = serialization_named->getNested().get();
 
     const auto * serialization_tuple = typeid_cast<const SerializationTuple *>(current_serialization);
     if (!serialization_tuple)
diff --git a/src/DataTypes/DataTypeVariant.cpp b/src/DataTypes/DataTypeVariant.cpp
index cc8d04e94da..8a10ca7d06d 100644
--- a/src/DataTypes/DataTypeVariant.cpp
+++ b/src/DataTypes/DataTypeVariant.cpp
@@ -117,7 +117,7 @@ bool DataTypeVariant::equals(const IDataType & rhs) const
 
         /// The same data types with different custom names considered different.
         /// For example, UInt8 and Bool.
-        if ((variants[i]->hasCustomName() || rhs_variant.variants[i]->hasCustomName()) && variants[i]->getName() != rhs_variant.variants[i]->getName())
+        if ((variants[i]->hasCustomName() || rhs_variant.variants[i]) && variants[i]->getName() != rhs_variant.variants[i]->getName())
             return false;
     }
 
diff --git a/src/DataTypes/DataTypesBinaryEncoding.cpp b/src/DataTypes/DataTypesBinaryEncoding.cpp
index dc0f2f3f5aa..bd994e313ba 100644
--- a/src/DataTypes/DataTypesBinaryEncoding.cpp
+++ b/src/DataTypes/DataTypesBinaryEncoding.cpp
@@ -9,7 +9,6 @@
 #include <DataTypes/DataTypeFunction.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeMap.h>
-#include <DataTypes/DataTypeObject.h>
 #include <DataTypes/DataTypeVariant.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeUUID.h>
@@ -95,13 +94,8 @@ enum class BinaryTypeIndex : uint8_t
     Bool = 0x2D,
     SimpleAggregateFunction = 0x2E,
     Nested = 0x2F,
-    JSON = 0x30,
 };
 
-/// In future we can introduce more arguments in the JSON data type definition.
-/// To support such changes, use versioning in the serialization of JSON type.
-const UInt8 TYPE_JSON_SERIALIZATION_VERSION = 0;
-
 BinaryTypeIndex getBinaryTypeIndex(const DataTypePtr & type)
 {
     /// By default custom types don't have their own BinaryTypeIndex.
@@ -208,7 +202,7 @@ BinaryTypeIndex getBinaryTypeIndex(const DataTypePtr & type)
             return BinaryTypeIndex::LowCardinality;
         case TypeIndex::Map:
             return BinaryTypeIndex::Map;
-        case TypeIndex::ObjectDeprecated:
+        case TypeIndex::Object:
             /// Object type will be deprecated and replaced by new implementation. No need to support it here.
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Binary encoding of type Object is not supported");
         case TypeIndex::IPv4:
@@ -222,15 +216,6 @@ BinaryTypeIndex getBinaryTypeIndex(const DataTypePtr & type)
         /// JSONPaths is used only during schema inference and cannot be used anywhere else.
         case TypeIndex::JSONPaths:
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Binary encoding of type JSONPaths is not supported");
-        case TypeIndex::Object:
-        {
-            const auto & object_type = assert_cast<const DataTypeObject &>(*type);
-            switch (object_type.getSchemaFormat())
-            {
-                case DataTypeObject::SchemaFormat::JSON:
-                    return BinaryTypeIndex::JSON;
-            }
-        }
     }
 }
 
@@ -459,7 +444,7 @@ void encodeDataType(const DataTypePtr & type, WriteBuffer & buf)
         case BinaryTypeIndex::Dynamic:
         {
             const auto & dynamic_type = assert_cast<const DataTypeDynamic &>(*type);
-            /// Maximum number of dynamic types is 254, we can write it as 1 byte.
+            /// Maximum number of dynamic types is 255, we can write it as 1 byte.
             writeBinary(UInt8(dynamic_type.getMaxDynamicTypes()), buf);
             break;
         }
@@ -495,30 +480,6 @@ void encodeDataType(const DataTypePtr & type, WriteBuffer & buf)
             writeStringBinary(type_name, buf);
             break;
         }
-        case BinaryTypeIndex::JSON:
-        {
-            const auto & object_type = assert_cast<const DataTypeObject &>(*type);
-            /// Write version of the serialization because we can add new arguments in the JSON type.
-            writeBinary(TYPE_JSON_SERIALIZATION_VERSION, buf);
-            writeVarUInt(object_type.getMaxDynamicPaths(), buf);
-            writeBinary(UInt8(object_type.getMaxDynamicTypes()), buf);
-            const auto & typed_paths = object_type.getTypedPaths();
-            writeVarUInt(typed_paths.size(), buf);
-            for (const auto & [path, path_type] : typed_paths)
-            {
-                writeStringBinary(path, buf);
-                encodeDataType(path_type, buf);
-            }
-            const auto & paths_to_skip = object_type.getPathsToSkip();
-            writeVarUInt(paths_to_skip.size(), buf);
-            for (const auto & path : paths_to_skip)
-                writeStringBinary(path, buf);
-            const auto & path_regexps_to_skip = object_type.getPathRegexpsToSkip();
-            writeVarUInt(path_regexps_to_skip.size(), buf);
-            for (const auto & regexp : path_regexps_to_skip)
-                writeStringBinary(regexp, buf);
-            break;
-        }
         default:
             break;
     }
@@ -730,54 +691,6 @@ DataTypePtr decodeDataType(ReadBuffer & buf)
             readStringBinary(type_name, buf);
             return DataTypeFactory::instance().get(type_name);
         }
-        case BinaryTypeIndex::JSON:
-        {
-            UInt8 serialization_version;
-            readBinary(serialization_version, buf);
-            if (serialization_version > TYPE_JSON_SERIALIZATION_VERSION)
-                throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected version of JSON type binary encoding");
-            size_t max_dynamic_paths;
-            readVarUInt(max_dynamic_paths, buf);
-            UInt8 max_dynamic_types;
-            readBinary(max_dynamic_types, buf);
-            size_t typed_paths_size;
-            readVarUInt(typed_paths_size, buf);
-            std::unordered_map<String, DataTypePtr> typed_paths;
-            for (size_t i = 0; i != typed_paths_size; ++i)
-            {
-                String path;
-                readStringBinary(path, buf);
-                typed_paths[path] = decodeDataType(buf);
-            }
-            size_t paths_to_skip_size;
-            readVarUInt(paths_to_skip_size, buf);
-            std::unordered_set<String> paths_to_skip;
-            paths_to_skip.reserve(paths_to_skip_size);
-            for (size_t i = 0; i != paths_to_skip_size; ++i)
-            {
-                String path;
-                readStringBinary(path, buf);
-                paths_to_skip.insert(path);
-            }
-
-            size_t path_regexps_to_skip_size;
-            readVarUInt(path_regexps_to_skip_size, buf);
-            std::vector<String> path_regexps_to_skip;
-            path_regexps_to_skip.reserve(path_regexps_to_skip_size);
-            for (size_t i = 0; i != path_regexps_to_skip_size; ++i)
-            {
-                String regexp;
-                readStringBinary(regexp, buf);
-                path_regexps_to_skip.push_back(regexp);
-            }
-            return std::make_shared<DataTypeObject>(
-                DataTypeObject::SchemaFormat::JSON,
-                typed_paths,
-                paths_to_skip,
-                path_regexps_to_skip,
-                max_dynamic_paths,
-                max_dynamic_types);
-        }
     }
 
     throw Exception(ErrorCodes::INCORRECT_DATA, "Unknown type code: {0:#04x}", UInt64(type));
diff --git a/src/DataTypes/DataTypesBinaryEncoding.h b/src/DataTypes/DataTypesBinaryEncoding.h
index cdfbfee1ccf..d02e7f85942 100644
--- a/src/DataTypes/DataTypesBinaryEncoding.h
+++ b/src/DataTypes/DataTypesBinaryEncoding.h
@@ -8,59 +8,58 @@ namespace DB
 /**
 
 Binary encoding for ClickHouse data types:
-|---------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| ClickHouse data type                                                                                    | Binary encoding                                                                                                                                                                                                                                                                                                                                                          |
-|---------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Nothing                                                                                                 | 0x00                                                                                                                                                                                                                                                                                                                                                                     |
-| UInt8                                                                                                   | 0x01                                                                                                                                                                                                                                                                                                                                                                     |
-| UInt16                                                                                                  | 0x02                                                                                                                                                                                                                                                                                                                                                                     |
-| UInt32                                                                                                  | 0x03                                                                                                                                                                                                                                                                                                                                                                     |
-| UInt64                                                                                                  | 0x04                                                                                                                                                                                                                                                                                                                                                                     |
-| UInt128                                                                                                 | 0x05                                                                                                                                                                                                                                                                                                                                                                     |
-| UInt256                                                                                                 | 0x06                                                                                                                                                                                                                                                                                                                                                                     |
-| Int8                                                                                                    | 0x07                                                                                                                                                                                                                                                                                                                                                                     |
-| Int16                                                                                                   | 0x08                                                                                                                                                                                                                                                                                                                                                                     |
-| Int32                                                                                                   | 0x09                                                                                                                                                                                                                                                                                                                                                                     |
-| Int64                                                                                                   | 0x0A                                                                                                                                                                                                                                                                                                                                                                     |
-| Int128                                                                                                  | 0x0B                                                                                                                                                                                                                                                                                                                                                                     |
-| Int256                                                                                                  | 0x0C                                                                                                                                                                                                                                                                                                                                                                     |
-| Float32                                                                                                 | 0x0D                                                                                                                                                                                                                                                                                                                                                                     |
-| Float64                                                                                                 | 0x0E                                                                                                                                                                                                                                                                                                                                                                     |
-| Date                                                                                                    | 0x0F                                                                                                                                                                                                                                                                                                                                                                     |
-| Date32                                                                                                  | 0x10                                                                                                                                                                                                                                                                                                                                                                     |
-| DateTime                                                                                                | 0x11                                                                                                                                                                                                                                                                                                                                                                     |
-| DateTime(time_zone)                                                                                     | 0x12<var_uint_time_zone_name_size><time_zone_name_data>                                                                                                                                                                                                                                                                                                                  |
-| DateTime64(P)                                                                                           | 0x13<uint8_precision>                                                                                                                                                                                                                                                                                                                                                    |
-| DateTime64(P, time_zone)                                                                                | 0x14<uint8_precision><var_uint_time_zone_name_size><time_zone_name_data>                                                                                                                                                                                                                                                                                                 |
-| String                                                                                                  | 0x15                                                                                                                                                                                                                                                                                                                                                                     |
-| FixedString(N)                                                                                          | 0x16<var_uint_size>                                                                                                                                                                                                                                                                                                                                                      |
-| Enum8                                                                                                   | 0x17<var_uint_number_of_elements><var_uint_name_size_1><name_data_1><int8_value_1>...<var_uint_name_size_N><name_data_N><int8_value_N>                                                                                                                                                                                                                                   |
-| Enum16                                                                                                  | 0x18<var_uint_number_of_elements><var_uint_name_size_1><name_data_1><int16_little_endian_value_1>...><var_uint_name_size_N><name_data_N><int16_little_endian_value_N>                                                                                                                                                                                                    |
-| Decimal32(P, S)                                                                                         | 0x19<uint8_precision><uint8_scale>                                                                                                                                                                                                                                                                                                                                       |
-| Decimal64(P, S)                                                                                         | 0x1A<uint8_precision><uint8_scale>                                                                                                                                                                                                                                                                                                                                       |
-| Decimal128(P, S)                                                                                        | 0x1B<uint8_precision><uint8_scale>                                                                                                                                                                                                                                                                                                                                       |
-| Decimal256(P, S)                                                                                        | 0x1C<uint8_precision><uint8_scale>                                                                                                                                                                                                                                                                                                                                       |
-| UUID                                                                                                    | 0x1D                                                                                                                                                                                                                                                                                                                                                                     |
-| Array(T)                                                                                                | 0x1E<nested_type_encoding>                                                                                                                                                                                                                                                                                                                                               |
-| Tuple(T1, ..., TN)                                                                                      | 0x1F<var_uint_number_of_elements><nested_type_encoding_1>...<nested_type_encoding_N>                                                                                                                                                                                                                                                                                     |
-| Tuple(name1 T1, ..., nameN TN)                                                                          | 0x20<var_uint_number_of_elements><var_uint_name_size_1><name_data_1><nested_type_encoding_1>...<var_uint_name_size_N><name_data_N><nested_type_encoding_N>                                                                                                                                                                                                               |
-| Set| 0x21                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| Interval                                                                                                | 0x22<interval_kind>                                                                                                                                                                                                                                                                                                                                                      |
-| Nullable(T)                                                                                             | 0x23<nested_type_encoding>                                                                                                                                                                                                                                                                                                                                               |
-| Function                                                                                                | 0x24<var_uint_number_of_arguments><argument_type_encoding_1>...<argument_type_encoding_N><return_type_encoding>                                                                                                                                                                                                                                                          |
-| AggregateFunction(function_name(param_1, ..., param_N), arg_T1, ..., arg_TN)                            | 0x25<var_uint_version><var_uint_function_name_size><function_name_data><var_uint_number_of_parameters><param_1>...<param_N><var_uint_number_of_arguments><argument_type_encoding_1>...<argument_type_encoding_N>                                                                                                                                                         |
-| LowCardinality(T)                                                                                       | 0x26<nested_type_encoding>                                                                                                                                                                                                                                                                                                                                               |
-| Map(K, V)                                                                                               | 0x27<key_type_encoding><value_type_encoding>                                                                                                                                                                                                                                                                                                                             |
-| IPv4                                                                                                    | 0x28                                                                                                                                                                                                                                                                                                                                                                     |
-| IPv6                                                                                                    | 0x29                                                                                                                                                                                                                                                                                                                                                                     |
-| Variant(T1, ..., TN)                                                                                    | 0x2A<var_uint_number_of_variants><variant_type_encoding_1>...<variant_type_encoding_N>                                                                                                                                                                                                                                                                                   |
-| Dynamic(max_types=N)                                                                                    | 0x2B<uint8_max_types>                                                                                                                                                                                                                                                                                                                                                    |
-| Custom type (Ring, Polygon, etc)                                                                        | 0x2C<var_uint_type_name_size><type_name_data>                                                                                                                                                                                                                                                                                                                            |
-| Bool                                                                                                    | 0x2D                                                                                                                                                                                                                                                                                                                                                                     |
-| SimpleAggregateFunction(function_name(param_1, ..., param_N), arg_T1, ..., arg_TN)                      | 0x2E<var_uint_function_name_size><function_name_data><var_uint_number_of_parameters><param_1>...<param_N><var_uint_number_of_arguments><argument_type_encoding_1>...<argument_type_encoding_N>                                                                                                                                                                           |
-| Nested(name1 T1, ..., nameN TN)                                                                         | 0x2F<var_uint_number_of_elements><var_uint_name_size_1><name_data_1><nested_type_encoding_1>...<var_uint_name_size_N><name_data_N><nested_type_encoding_N>                                                                                                                                                                                                               |
-| JSON(max_dynamic_paths=N, max_dynamic_types=M, path Type, SKIP skip_path, SKIP REGEXP skip_path_regexp) | 0x30<uint8_serialization_version><var_int_max_dynamic_paths><uint8_max_dynamic_types><var_uint_number_of_typed_paths><var_uint_path_name_size_1><path_name_data_1><encoded_type_1>...<var_uint_number_of_skip_paths><var_uint_skip_path_size_1><skip_path_data_1>...<var_uint_number_of_skip_path_regexps><var_uint_skip_path_regexp_size_1><skip_path_data_regexp_1>... |
-|---------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| ClickHouse data type                                                               | Binary encoding                                                                                                                                                                                                  |
+|------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Nothing                                                                            | 0x00                                                                                                                                                                                                             |
+| UInt8                                                                              | 0x01                                                                                                                                                                                                             |
+| UInt16                                                                             | 0x02                                                                                                                                                                                                             |
+| UInt32                                                                             | 0x03                                                                                                                                                                                                             |
+| UInt64                                                                             | 0x04                                                                                                                                                                                                             |
+| UInt128                                                                            | 0x05                                                                                                                                                                                                             |
+| UInt256                                                                            | 0x06                                                                                                                                                                                                             |
+| Int8                                                                               | 0x07                                                                                                                                                                                                             |
+| Int16                                                                              | 0x08                                                                                                                                                                                                             |
+| Int32                                                                              | 0x09                                                                                                                                                                                                             |
+| Int64                                                                              | 0x0A                                                                                                                                                                                                             |
+| Int128                                                                             | 0x0B                                                                                                                                                                                                             |
+| Int256                                                                             | 0x0C                                                                                                                                                                                                             |
+| Float32                                                                            | 0x0D                                                                                                                                                                                                             |
+| Float64                                                                            | 0x0E                                                                                                                                                                                                             |
+| Date                                                                               | 0x0F                                                                                                                                                                                                             |
+| Date32                                                                             | 0x10                                                                                                                                                                                                             |
+| DateTime                                                                           | 0x11                                                                                                                                                                                                             |
+| DateTime(time_zone)                                                                | 0x12<var_uint_time_zone_name_size><time_zone_name_data>                                                                                                                                                          |
+| DateTime64(P)                                                                      | 0x13<uint8_precision>                                                                                                                                                                                            |
+| DateTime64(P, time_zone)                                                           | 0x14<uint8_precision><var_uint_time_zone_name_size><time_zone_name_data>                                                                                                                                         |
+| String                                                                             | 0x15                                                                                                                                                                                                             |
+| FixedString(N)                                                                     | 0x16<var_uint_size>                                                                                                                                                                                              |
+| Enum8                                                                              | 0x17<var_uint_number_of_elements><var_uint_name_size_1><name_data_1><int8_value_1>...<var_uint_name_size_N><name_data_N><int8_value_N>                                                                           |
+| Enum16                                                                             | 0x18<var_uint_number_of_elements><var_uint_name_size_1><name_data_1><int16_little_endian_value_1>...><var_uint_name_size_N><name_data_N><int16_little_endian_value_N>                                            |
+| Decimal32(P, S)                                                                    | 0x19<uint8_precision><uint8_scale>                                                                                                                                                                               |
+| Decimal64(P, S)                                                                    | 0x1A<uint8_precision><uint8_scale>                                                                                                                                                                               |
+| Decimal128(P, S)                                                                   | 0x1B<uint8_precision><uint8_scale>                                                                                                                                                                               |
+| Decimal256(P, S)                                                                   | 0x1C<uint8_precision><uint8_scale>                                                                                                                                                                               |
+| UUID                                                                               | 0x1D                                                                                                                                                                                                             |
+| Array(T)                                                                           | 0x1E<nested_type_encoding>                                                                                                                                                                                       |
+| Tuple(T1, ..., TN)                                                                 | 0x1F<var_uint_number_of_elements><nested_type_encoding_1>...<nested_type_encoding_N>                                                                                                                             |
+| Tuple(name1 T1, ..., nameN TN)                                                     | 0x20<var_uint_number_of_elements><var_uint_name_size_1><name_data_1><nested_type_encoding_1>...<var_uint_name_size_N><name_data_N><nested_type_encoding_N>                                                       |
+| Set                                                                                | 0x21                                                                                                                                                                                                             |
+| Interval                                                                           | 0x22<interval_kind>                                                                                                                                                                                              |
+| Nullable(T)                                                                        | 0x23<nested_type_encoding>                                                                                                                                                                                       |
+| Function                                                                           | 0x24<var_uint_number_of_arguments><argument_type_encoding_1>...<argument_type_encoding_N><return_type_encoding>                                                                                                  |
+| AggregateFunction(function_name(param_1, ..., param_N), arg_T1, ..., arg_TN)       | 0x25<var_uint_version><var_uint_function_name_size><function_name_data><var_uint_number_of_parameters><param_1>...<param_N><var_uint_number_of_arguments><argument_type_encoding_1>...<argument_type_encoding_N> |
+| LowCardinality(T)                                                                  | 0x26<nested_type_encoding>                                                                                                                                                                                       |
+| Map(K, V)                                                                          | 0x27<key_type_encoding><value_type_encoding>                                                                                                                                                                     |
+| IPv4                                                                               | 0x28                                                                                                                                                                                                             |
+| IPv6                                                                               | 0x29                                                                                                                                                                                                             |
+| Variant(T1, ..., TN)                                                               | 0x2A<var_uint_number_of_variants><variant_type_encoding_1>...<variant_type_encoding_N>                                                                                                                           |
+| Dynamic(max_types=N)                                                               | 0x2B<uint8_max_types>                                                                                                                                                                                            |
+| Custom type (Ring, Polygon, etc)                                                   | 0x2C<var_uint_type_name_size><type_name_data>                                                                                                                                                                    |
+| Bool                                                                               | 0x2D                                                                                                                                                                                                             |
+| SimpleAggregateFunction(function_name(param_1, ..., param_N), arg_T1, ..., arg_TN) | 0x2E<var_uint_function_name_size><function_name_data><var_uint_number_of_parameters><param_1>...<param_N><var_uint_number_of_arguments><argument_type_encoding_1>...<argument_type_encoding_N>                   |
+| Nested(name1 T1, ..., nameN TN)                                                    | 0x2F<var_uint_number_of_elements><var_uint_name_size_1><name_data_1><nested_type_encoding_1>...<var_uint_name_size_N><name_data_N><nested_type_encoding_N>                                                       |
+|------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 
 Interval kind binary encoding:
 |---------------|-----------------|
diff --git a/src/DataTypes/DataTypesDecimal.cpp b/src/DataTypes/DataTypesDecimal.cpp
index 1d8f7711de1..a427fd0717a 100644
--- a/src/DataTypes/DataTypesDecimal.cpp
+++ b/src/DataTypes/DataTypesDecimal.cpp
@@ -80,14 +80,14 @@ static DataTypePtr create(const ASTPtr & arguments)
         const auto * precision_arg = arguments->children[0]->as<ASTLiteral>();
         if (!precision_arg || precision_arg->value.getType() != Field::Types::UInt64)
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Decimal argument precision is invalid");
-        precision = precision_arg->value.safeGet<UInt64>();
+        precision = precision_arg->value.get<UInt64>();
 
         if (arguments->children.size() == 2)
         {
             const auto * scale_arg = arguments->children[1]->as<ASTLiteral>();
             if (!scale_arg || !isInt64OrUInt64FieldType(scale_arg->value.getType()))
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Decimal argument scale is invalid");
-            scale = scale_arg->value.safeGet<UInt64>();
+            scale = scale_arg->value.get<UInt64>();
         }
     }
 
@@ -107,7 +107,7 @@ static DataTypePtr createExact(const ASTPtr & arguments)
         "Decimal32 | Decimal64 | Decimal128 | Decimal256 data type family must have a one number as its argument");
 
     UInt64 precision = DecimalUtils::max_precision<T>;
-    UInt64 scale = scale_arg->value.safeGet<UInt64>();
+    UInt64 scale = scale_arg->value.get<UInt64>();
 
     return createDecimal<DataTypeDecimal>(precision, scale);
 }
diff --git a/src/DataTypes/FieldToDataType.cpp b/src/DataTypes/FieldToDataType.cpp
index 536d2656021..03874279a0b 100644
--- a/src/DataTypes/FieldToDataType.cpp
+++ b/src/DataTypes/FieldToDataType.cpp
@@ -178,7 +178,8 @@ DataTypePtr FieldToDataType<on_error>::operator() (const Map & map) const
 template <LeastSupertypeOnError on_error>
 DataTypePtr FieldToDataType<on_error>::operator() (const Object &) const
 {
-    return std::make_shared<DataTypeObject>(DataTypeObject::SchemaFormat::JSON);
+    /// TODO: Do we need different parameters for type Object?
+    return std::make_shared<DataTypeObject>("json", false);
 }
 
 template <LeastSupertypeOnError on_error>
diff --git a/src/DataTypes/IDataType.cpp b/src/DataTypes/IDataType.cpp
index 945d36dbb92..824bc6e33b0 100644
--- a/src/DataTypes/IDataType.cpp
+++ b/src/DataTypes/IDataType.cpp
@@ -8,6 +8,7 @@
 #include <Common/quoteString.h>
 
 #include <IO/WriteHelpers.h>
+#include <IO/Operators.h>
 
 #include <DataTypes/IDataType.h>
 #include <DataTypes/DataTypeCustom.h>
@@ -149,8 +150,6 @@ std::unique_ptr<IDataType::SubstreamData> IDataType::getSubcolumnData(
 
     ISerialization::EnumerateStreamsSettings settings;
     settings.position_independent_encoding = false;
-    /// Don't enumerate dynamic subcolumns, they are handled separately.
-    settings.enumerate_dynamic_streams = false;
     data.serialization->enumerateStreams(settings, callback_with_data, data);
 
     if (!res && data.type->hasDynamicSubcolumnsData())
@@ -364,10 +363,9 @@ 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 isObjectDeprecated(TYPE data_type) { return WhichDataType(data_type).isObjectDeprecated(); } \
+bool isObject(TYPE data_type) { return WhichDataType(data_type).isObject(); } \
 bool isVariant(TYPE data_type) { return WhichDataType(data_type).isVariant(); } \
 bool isDynamic(TYPE data_type) { return WhichDataType(data_type).isDynamic(); } \
-bool isObject(TYPE data_type) { return WhichDataType(data_type).isObject(); } \
 bool isNothing(TYPE data_type) { return WhichDataType(data_type).isNothing(); } \
 \
 bool isColumnedAsNumber(TYPE data_type) \
diff --git a/src/DataTypes/IDataType.h b/src/DataTypes/IDataType.h
index a7665e610ab..397ae3d8be9 100644
--- a/src/DataTypes/IDataType.h
+++ b/src/DataTypes/IDataType.h
@@ -432,7 +432,7 @@ struct WhichDataType
     constexpr bool isMap() const {return idx == TypeIndex::Map; }
     constexpr bool isSet() const { return idx == TypeIndex::Set; }
     constexpr bool isInterval() const { return idx == TypeIndex::Interval; }
-    constexpr bool isObjectDeprecated() const { return idx == TypeIndex::ObjectDeprecated; }
+    constexpr bool isObject() const { return idx == TypeIndex::Object; }
 
     constexpr bool isNothing() const { return idx == TypeIndex::Nothing; }
     constexpr bool isNullable() const { return idx == TypeIndex::Nullable; }
@@ -444,7 +444,6 @@ struct WhichDataType
 
     constexpr bool isVariant() const { return idx == TypeIndex::Variant; }
     constexpr bool isDynamic() const { return idx == TypeIndex::Dynamic; }
-    constexpr bool isObject() const { return idx == TypeIndex::Object; }
 };
 
 /// IDataType helpers (alternative for IDataType virtual methods with single point of truth)
@@ -503,10 +502,9 @@ bool isArray(TYPE data_type); \
 bool isTuple(TYPE data_type); \
 bool isMap(TYPE data_type); \
 bool isInterval(TYPE data_type); \
-bool isObjectDeprecated(TYPE data_type); \
+bool isObject(TYPE data_type); \
 bool isVariant(TYPE data_type); \
 bool isDynamic(TYPE data_type); \
-bool isObject(TYPE data_type); \
 bool isNothing(TYPE data_type); \
 \
 bool isColumnedAsNumber(TYPE data_type); \
diff --git a/src/DataTypes/ObjectUtils.cpp b/src/DataTypes/ObjectUtils.cpp
index fb64199a1b0..356e609e77a 100644
--- a/src/DataTypes/ObjectUtils.cpp
+++ b/src/DataTypes/ObjectUtils.cpp
@@ -4,7 +4,7 @@
 #include <Analyzer/QueryNode.h>
 #include <Analyzer/Utils.h>
 #include <DataTypes/ObjectUtils.h>
-#include <DataTypes/DataTypeObjectDeprecated.h>
+#include <DataTypes/DataTypeObject.h>
 #include <DataTypes/DataTypeNothing.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeMap.h>
@@ -16,7 +16,7 @@
 #include <DataTypes/getLeastSupertype.h>
 #include <DataTypes/NestedUtils.h>
 #include <Storages/StorageSnapshot.h>
-#include <Columns/ColumnObjectDeprecated.h>
+#include <Columns/ColumnObject.h>
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnMap.h>
@@ -135,7 +135,7 @@ Array createEmptyArrayField(size_t num_dimensions)
     for (size_t i = 1; i < num_dimensions; ++i)
     {
         current_array->push_back(Array());
-        current_array = &current_array->back().safeGet<Array &>();
+        current_array = &current_array->back().get<Array &>();
     }
 
     return array;
@@ -180,12 +180,12 @@ static DataTypePtr recreateTupleWithElements(const DataTypeTuple & type_tuple, c
 }
 
 static std::pair<ColumnPtr, DataTypePtr> convertObjectColumnToTuple(
-    const ColumnObjectDeprecated & column_object, const DataTypeObjectDeprecated & type_object)
+    const ColumnObject & column_object, const DataTypeObject & type_object)
 {
     if (!column_object.isFinalized())
     {
         auto finalized = column_object.cloneFinalized();
-        const auto & finalized_object = assert_cast<const ColumnObjectDeprecated &>(*finalized);
+        const auto & finalized_object = assert_cast<const ColumnObject &>(*finalized);
         return convertObjectColumnToTuple(finalized_object, type_object);
     }
 
@@ -211,9 +211,9 @@ static std::pair<ColumnPtr, DataTypePtr> recursivlyConvertDynamicColumnToTuple(
     if (!type->hasDynamicSubcolumnsDeprecated())
         return {column, type};
 
-    if (const auto * type_object = typeid_cast<const DataTypeObjectDeprecated *>(type.get()))
+    if (const auto * type_object = typeid_cast<const DataTypeObject *>(type.get()))
     {
-        const auto & column_object = assert_cast<const ColumnObjectDeprecated &>(*column);
+        const auto & column_object = assert_cast<const ColumnObject &>(*column);
         return convertObjectColumnToTuple(column_object, *type_object);
     }
 
@@ -369,7 +369,7 @@ static DataTypePtr getLeastCommonTypeForObject(const DataTypes & types, bool che
     for (const auto & [key, subtypes] : subcolumns_types)
     {
         assert(!subtypes.empty());
-        if (key.getPath() == ColumnObjectDeprecated::COLUMN_NAME_DUMMY)
+        if (key.getPath() == ColumnObject::COLUMN_NAME_DUMMY)
             continue;
 
         size_t first_dim = getNumberOfDimensions(*subtypes[0]);
@@ -385,7 +385,7 @@ static DataTypePtr getLeastCommonTypeForObject(const DataTypes & types, bool che
 
     if (tuple_paths.empty())
     {
-        tuple_paths.emplace_back(ColumnObjectDeprecated::COLUMN_NAME_DUMMY);
+        tuple_paths.emplace_back(ColumnObject::COLUMN_NAME_DUMMY);
         tuple_types.emplace_back(std::make_shared<DataTypeUInt8>());
     }
 
@@ -452,7 +452,7 @@ static DataTypePtr getLeastCommonTypeForDynamicColumnsImpl(
     if (!type_in_storage->hasDynamicSubcolumnsDeprecated())
         return type_in_storage;
 
-    if (isObjectDeprecated(type_in_storage))
+    if (isObject(type_in_storage))
         return getLeastCommonTypeForObject(concrete_types, check_ambiguos_paths);
 
     if (const auto * type_array = typeid_cast<const DataTypeArray *>(type_in_storage.get()))
@@ -494,9 +494,9 @@ DataTypePtr createConcreteEmptyDynamicColumn(const DataTypePtr & type_in_storage
     if (!type_in_storage->hasDynamicSubcolumnsDeprecated())
         return type_in_storage;
 
-    if (isObjectDeprecated(type_in_storage))
+    if (isObject(type_in_storage))
         return std::make_shared<DataTypeTuple>(
-            DataTypes{std::make_shared<DataTypeUInt8>()}, Names{ColumnObjectDeprecated::COLUMN_NAME_DUMMY});
+            DataTypes{std::make_shared<DataTypeUInt8>()}, Names{ColumnObject::COLUMN_NAME_DUMMY});
 
     if (const auto * type_array = typeid_cast<const DataTypeArray *>(type_in_storage.get()))
         return std::make_shared<DataTypeArray>(
@@ -838,7 +838,7 @@ DataTypePtr unflattenTuple(const PathsInData & paths, const DataTypes & tuple_ty
     return unflattenTuple(paths, tuple_types, tuple_columns).second;
 }
 
-std::pair<ColumnPtr, DataTypePtr> unflattenObjectToTuple(const ColumnObjectDeprecated & column)
+std::pair<ColumnPtr, DataTypePtr> unflattenObjectToTuple(const ColumnObject & column)
 {
     const auto & subcolumns = column.getSubcolumns();
 
@@ -846,7 +846,7 @@ std::pair<ColumnPtr, DataTypePtr> unflattenObjectToTuple(const ColumnObjectDepre
     {
         auto type = std::make_shared<DataTypeTuple>(
             DataTypes{std::make_shared<DataTypeUInt8>()},
-            Names{ColumnObjectDeprecated::COLUMN_NAME_DUMMY});
+            Names{ColumnObject::COLUMN_NAME_DUMMY});
 
         return {type->createColumn()->cloneResized(column.size()), type};
     }
diff --git a/src/DataTypes/ObjectUtils.h b/src/DataTypes/ObjectUtils.h
index d4109b971a4..21e5c3b2f59 100644
--- a/src/DataTypes/ObjectUtils.h
+++ b/src/DataTypes/ObjectUtils.h
@@ -6,7 +6,7 @@
 #include <Storages/ColumnsDescription.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <Columns/ColumnObjectDeprecated.h>
+#include <Columns/ColumnObject.h>
 
 namespace DB
 {
@@ -88,7 +88,7 @@ DataTypePtr unflattenTuple(
     const PathsInData & paths,
     const DataTypes & tuple_types);
 
-std::pair<ColumnPtr, DataTypePtr> unflattenObjectToTuple(const ColumnObjectDeprecated & column);
+std::pair<ColumnPtr, DataTypePtr> unflattenObjectToTuple(const ColumnObject & column);
 
 std::pair<ColumnPtr, DataTypePtr> unflattenTuple(
     const PathsInData & paths,
diff --git a/src/DataTypes/Serializations/ISerialization.cpp b/src/DataTypes/Serializations/ISerialization.cpp
index dcf637c7d2b..7642a6619b3 100644
--- a/src/DataTypes/Serializations/ISerialization.cpp
+++ b/src/DataTypes/Serializations/ISerialization.cpp
@@ -202,12 +202,6 @@ String getNameForSubstreamPath(
             stream_name += "." + it->variant_element_name + ".null";
         else if (it->type == SubstreamType::DynamicStructure)
             stream_name += ".dynamic_structure";
-        else if (it->type == SubstreamType::ObjectStructure)
-            stream_name += ".object_structure";
-        else if (it->type == SubstreamType::ObjectSharedData)
-            stream_name += ".object_shared_data";
-        else if (it->type == SubstreamType::ObjectTypedPath || it->type == SubstreamType::ObjectDynamicPath)
-            stream_name += "." + it->object_path_name;
     }
 
     return stream_name;
@@ -407,32 +401,7 @@ bool ISerialization::hasSubcolumnForPath(const SubstreamPath & path, size_t pref
             || path[last_elem].type == Substream::TupleElement
             || path[last_elem].type == Substream::ArraySizes
             || path[last_elem].type == Substream::VariantElement
-            || path[last_elem].type == Substream::VariantElementNullMap
-            || path[last_elem].type == Substream::ObjectTypedPath;
-}
-
-bool ISerialization::isEphemeralSubcolumn(const DB::ISerialization::SubstreamPath & path, size_t prefix_len)
-{
-    if (prefix_len == 0 || prefix_len > path.size())
-        return false;
-
-    size_t last_elem = prefix_len - 1;
-    return path[last_elem].type == Substream::VariantElementNullMap;
-}
-
-bool ISerialization::isDynamicSubcolumn(const DB::ISerialization::SubstreamPath & path, size_t prefix_len)
-{
-    if (prefix_len == 0 || prefix_len > path.size())
-        return false;
-
-    for (size_t i = 0; i != prefix_len; ++i)
-    {
-        if (path[i].type == SubstreamType::DynamicData || path[i].type == SubstreamType::DynamicStructure
-            || path[i].type == SubstreamType::ObjectData || path[i].type == SubstreamType::ObjectStructure)
-            return true;
-    }
-
-    return false;
+            || path[last_elem].type == Substream::VariantElementNullMap;
 }
 
 ISerialization::SubstreamData ISerialization::createFromPath(const SubstreamPath & path, size_t prefix_len)
diff --git a/src/DataTypes/Serializations/ISerialization.h b/src/DataTypes/Serializations/ISerialization.h
index 32f418e9132..5d0bf60c59f 100644
--- a/src/DataTypes/Serializations/ISerialization.h
+++ b/src/DataTypes/Serializations/ISerialization.h
@@ -176,8 +176,8 @@ public:
             SparseElements,
             SparseOffsets,
 
-            DeprecatedObjectStructure,
-            DeprecatedObjectData,
+            ObjectStructure,
+            ObjectData,
 
             VariantDiscriminators,
             NamedVariantDiscriminators,
@@ -189,12 +189,6 @@ public:
             DynamicData,
             DynamicStructure,
 
-            ObjectData,
-            ObjectTypedPath,
-            ObjectDynamicPath,
-            ObjectSharedData,
-            ObjectStructure,
-
             Regular,
         };
 
@@ -209,9 +203,6 @@ public:
         /// Name of substream for type from 'named_types'.
         String name_of_substream;
 
-        /// Path name for Object type elements.
-        String object_path_name;
-
         /// Data for current substream.
         SubstreamData data;
 
@@ -241,10 +232,6 @@ public:
     {
         SubstreamPath path;
         bool position_independent_encoding = true;
-        /// If set to false, don't enumerate dynamic subcolumns
-        /// (such as dynamic types in Dynamic column or dynamic paths in JSON column).
-        /// It may be needed when dynamic subcolumns are processed separately.
-        bool enumerate_dynamic_streams = true;
     };
 
     virtual void enumerateStreams(
@@ -276,13 +263,13 @@ public:
 
         bool use_compact_variant_discriminators_serialization = false;
 
-        enum class ObjectAndDynamicStatisticsMode
+        enum class DynamicStatisticsMode
         {
             NONE,   /// Don't write statistics.
             PREFIX, /// Write statistics in prefix.
             SUFFIX, /// Write statistics in suffix.
         };
-        ObjectAndDynamicStatisticsMode object_and_dynamic_write_statistics = ObjectAndDynamicStatisticsMode::NONE;
+        DynamicStatisticsMode dynamic_write_statistics = DynamicStatisticsMode::NONE;
     };
 
     struct DeserializeBinaryBulkSettings
@@ -303,7 +290,7 @@ public:
         /// If not zero, may be used to avoid reallocations while reading column of String type.
         double avg_value_size_hint = 0;
 
-        bool object_and_dynamic_read_statistics = false;
+        bool dynamic_read_statistics = false;
     };
 
     /// Call before serializeBinaryBulkWithMultipleStreams chain to write something before first mark.
@@ -453,13 +440,6 @@ public:
     static bool hasSubcolumnForPath(const SubstreamPath & path, size_t prefix_len);
     static SubstreamData createFromPath(const SubstreamPath & path, size_t prefix_len);
 
-    /// Returns true if subcolumn doesn't actually stores any data in column and doesn't require a separate stream
-    /// for writing/reading data. For example, it's a null-map subcolumn of Variant type (it's always constructed from discriminators);.
-    static bool isEphemeralSubcolumn(const SubstreamPath & path, size_t prefix_len);
-
-    /// Returns true if stream with specified path corresponds to dynamic subcolumn.
-    static bool isDynamicSubcolumn(const SubstreamPath & path, size_t prefix_len);
-
 protected:
     template <typename State, typename StatePtr>
     State * checkAndGetState(const StatePtr & state) const;
diff --git a/src/DataTypes/Serializations/JSONDataParser.cpp b/src/DataTypes/Serializations/JSONDataParser.cpp
index 0f74815f5b4..56641424396 100644
--- a/src/DataTypes/Serializations/JSONDataParser.cpp
+++ b/src/DataTypes/Serializations/JSONDataParser.cpp
@@ -131,7 +131,7 @@ void JSONDataParser<ParserImpl>::traverseArrayElement(const Element & element, P
             auto nested_hash = getHashOfNestedPath(paths[i], values[i]);
             if (nested_hash)
             {
-                size_t array_size = values[i].template safeGet<const Array &>().size();
+                size_t array_size = values[i].template get<const Array &>().size();
                 auto & current_nested_sizes = ctx.nested_sizes_by_path[*nested_hash];
 
                 if (current_nested_sizes.size() == ctx.current_size)
@@ -154,7 +154,7 @@ void JSONDataParser<ParserImpl>::traverseArrayElement(const Element & element, P
             auto nested_hash = getHashOfNestedPath(paths[i], values[i]);
             if (nested_hash)
             {
-                size_t array_size = values[i].template safeGet<const Array &>().size();
+                size_t array_size = values[i].template get<const Array &>().size();
                 auto & current_nested_sizes = ctx.nested_sizes_by_path[*nested_hash];
 
                 if (current_nested_sizes.empty())
diff --git a/src/DataTypes/Serializations/SerializationAggregateFunction.cpp b/src/DataTypes/Serializations/SerializationAggregateFunction.cpp
index 41b198890e4..55f7641e058 100644
--- a/src/DataTypes/Serializations/SerializationAggregateFunction.cpp
+++ b/src/DataTypes/Serializations/SerializationAggregateFunction.cpp
@@ -16,14 +16,14 @@ namespace DB
 
 void SerializationAggregateFunction::serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings &) const
 {
-    const AggregateFunctionStateData & state = field.safeGet<const AggregateFunctionStateData &>();
+    const AggregateFunctionStateData & state = field.get<const AggregateFunctionStateData &>();
     writeBinary(state.data, ostr);
 }
 
 void SerializationAggregateFunction::deserializeBinary(Field & field, ReadBuffer & istr, const FormatSettings &) const
 {
     field = AggregateFunctionStateData();
-    AggregateFunctionStateData & s = field.safeGet<AggregateFunctionStateData &>();
+    AggregateFunctionStateData & s = field.get<AggregateFunctionStateData &>();
     readBinary(s.data, istr);
     s.name = type_name;
 }
diff --git a/src/DataTypes/Serializations/SerializationArray.cpp b/src/DataTypes/Serializations/SerializationArray.cpp
index 0a9c4529e23..b7d43332085 100644
--- a/src/DataTypes/Serializations/SerializationArray.cpp
+++ b/src/DataTypes/Serializations/SerializationArray.cpp
@@ -29,7 +29,7 @@ static constexpr size_t MAX_ARRAYS_SIZE = 1ULL << 40;
 
 void SerializationArray::serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings & settings) const
 {
-    const Array & a = field.safeGet<const Array &>();
+    const Array & a = field.get<const Array &>();
     writeVarUInt(a.size(), ostr);
     for (const auto & i : a)
     {
@@ -51,7 +51,7 @@ void SerializationArray::deserializeBinary(Field & field, ReadBuffer & istr, con
             settings.binary.max_binary_string_size);
 
     field = Array();
-    Array & arr = field.safeGet<Array &>();
+    Array & arr = field.get<Array &>();
     arr.reserve(size);
     for (size_t i = 0; i < size; ++i)
         nested->deserializeBinary(arr.emplace_back(), istr, settings);
diff --git a/src/DataTypes/Serializations/SerializationDecimalBase.cpp b/src/DataTypes/Serializations/SerializationDecimalBase.cpp
index 8927f949368..49dc042e872 100644
--- a/src/DataTypes/Serializations/SerializationDecimalBase.cpp
+++ b/src/DataTypes/Serializations/SerializationDecimalBase.cpp
@@ -13,7 +13,7 @@ namespace DB
 template <typename T>
 void SerializationDecimalBase<T>::serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings &) const
 {
-    FieldType x = field.safeGet<DecimalField<T>>();
+    FieldType x = field.get<DecimalField<T>>();
     writeBinaryLittleEndian(x, ostr);
 }
 
diff --git a/src/DataTypes/Serializations/SerializationDynamic.cpp b/src/DataTypes/Serializations/SerializationDynamic.cpp
index 32964e17bce..7609ffc91ca 100644
--- a/src/DataTypes/Serializations/SerializationDynamic.cpp
+++ b/src/DataTypes/Serializations/SerializationDynamic.cpp
@@ -27,21 +27,15 @@ namespace ErrorCodes
 struct SerializeBinaryBulkStateDynamic : public ISerialization::SerializeBinaryBulkState
 {
     SerializationDynamic::DynamicStructureSerializationVersion structure_version;
-    size_t max_dynamic_types;
     DataTypePtr variant_type;
     Names variant_names;
     SerializationPtr variant_serialization;
     ISerialization::SerializeBinaryBulkStatePtr variant_state;
 
-    /// Variants statistics.
-    ColumnDynamic::Statistics statistics;
-    /// If true, statistics will be recalculated during serialization.
-    bool recalculate_statistics = false;
+    /// Variants statistics. Map (Variant name) -> (Variant size).
+    ColumnDynamic::Statistics statistics = { .source = ColumnDynamic::Statistics::Source::READ, .data = {} };
 
-    explicit SerializeBinaryBulkStateDynamic(UInt64 structure_version_)
-        : structure_version(structure_version_), statistics(ColumnDynamic::Statistics::Source::READ)
-    {
-    }
+    explicit SerializeBinaryBulkStateDynamic(UInt64 structure_version_) : structure_version(structure_version_) {}
 };
 
 struct DeserializeBinaryBulkStateDynamic : public ISerialization::DeserializeBinaryBulkState
@@ -64,7 +58,7 @@ void SerializationDynamic::enumerateStreams(
     const auto * deserialize_state = data.deserialize_state ? checkAndGetState<DeserializeBinaryBulkStateDynamic>(data.deserialize_state) : nullptr;
 
     /// If column is nullptr and we don't have deserialize state yet, nothing to enumerate as we don't have any variants.
-    if (!settings.enumerate_dynamic_streams || (!column_dynamic && !deserialize_state))
+    if (!column_dynamic && !deserialize_state)
         return;
 
     const auto & variant_type = column_dynamic ? column_dynamic->getVariantInfo().variant_type : checkAndGetState<DeserializeBinaryBulkStateDynamicStructure>(deserialize_state->structure_state)->variant_type;
@@ -112,41 +106,20 @@ void SerializationDynamic::serializeBinaryBulkStatePrefix(
     writeBinaryLittleEndian(structure_version, *stream);
     auto dynamic_state = std::make_shared<SerializeBinaryBulkStateDynamic>(structure_version);
 
-    dynamic_state->max_dynamic_types = column_dynamic.getMaxDynamicTypes();
-    /// Write max_dynamic_types parameter, because it can differ from the max_dynamic_types
-    /// that is specified in the Dynamic type (we could decrease it before merge).
-    writeVarUInt(dynamic_state->max_dynamic_types, *stream);
-
     dynamic_state->variant_type = variant_info.variant_type;
     dynamic_state->variant_names = variant_info.variant_names;
     const auto & variant_column = column_dynamic.getVariantColumn();
 
-    /// Write information about variants.
-    size_t num_variants = dynamic_state->variant_names.size() - 1; /// Don't write shared variant, Dynamic column should always have it.
-    writeVarUInt(num_variants, *stream);
+    /// Write internal Variant type name.
     if (settings.data_types_binary_encoding)
-    {
-        const auto & variants = assert_cast<const DataTypeVariant &>(*dynamic_state->variant_type).getVariants();
-        for (const auto & variant: variants)
-        {
-            if (variant->getName() != ColumnDynamic::getSharedVariantTypeName())
-                encodeDataType(variant, *stream);
-        }
-    }
+        encodeDataType(dynamic_state->variant_type, *stream);
     else
-    {
-        for (const auto & name : dynamic_state->variant_names)
-        {
-            if (name != ColumnDynamic::getSharedVariantTypeName())
-                writeStringBinary(name, *stream);
-        }
-    }
+        writeStringBinary(dynamic_state->variant_type->getName(), *stream);
 
     /// Write statistics in prefix if needed.
-    if (settings.object_and_dynamic_write_statistics == SerializeBinaryBulkSettings::ObjectAndDynamicStatisticsMode::PREFIX)
+    if (settings.dynamic_write_statistics == SerializeBinaryBulkSettings::DynamicStatisticsMode::PREFIX)
     {
         const auto & statistics = column_dynamic.getStatistics();
-        /// First, write statistics for usual variants.
         for (size_t i = 0; i != variant_info.variant_names.size(); ++i)
         {
             size_t size = 0;
@@ -156,55 +129,13 @@ void SerializationDynamic::serializeBinaryBulkStatePrefix(
             ///   - statistics read from the data part during deserialization of Dynamic column (Statistics::Source::READ).
             /// We can rely only on statistics calculated during the merge, because column with statistics that was read
             /// during deserialization from some data part could be filtered/limited/transformed/etc and so the statistics can be outdated.
-            if (statistics && statistics->source == ColumnDynamic::Statistics::Source::MERGE)
-                size = statistics->variants_statistics.at(variant_info.variant_names[i]);
+            if (!statistics.data.empty() && statistics.source == ColumnDynamic::Statistics::Source::MERGE)
+                size = statistics.data.at(variant_info.variant_names[i]);
             /// Otherwise we can use only variant sizes from current column.
             else
                 size = variant_column.getVariantByGlobalDiscriminator(i).size();
             writeVarUInt(size, *stream);
         }
-
-        /// Second, write statistics for variants in shared variant.
-        /// Check if we have statistics calculated during merge of some data parts (Statistics::Source::MERGE).
-        if (statistics && statistics->source == ColumnDynamic::Statistics::Source::MERGE)
-        {
-            writeVarUInt(statistics->shared_variants_statistics.size(), *stream);
-            for (const auto & [variant_name, size] : statistics->shared_variants_statistics)
-            {
-                writeStringBinary(variant_name, *stream);
-                writeVarUInt(size, *stream);
-            }
-        }
-        /// If we don't have statistics for shared variants from merge, calculate it from the column.
-        else
-        {
-            std::unordered_map<String, size_t> shared_variants_statistics;
-            const auto & shared_variant = column_dynamic.getSharedVariant();
-            for (size_t i = 0; i != shared_variant.size(); ++i)
-            {
-                auto value = shared_variant.getDataAt(i);
-                ReadBufferFromMemory buf(value.data, value.size);
-                auto type = decodeDataType(buf);
-                auto type_name = type->getName();
-                if (auto it = shared_variants_statistics.find(type_name); it != shared_variants_statistics.end())
-                    ++it->second;
-                else if (shared_variants_statistics.size() < ColumnDynamic::Statistics::MAX_SHARED_VARIANT_STATISTICS_SIZE)
-                    shared_variants_statistics.emplace(type_name, 1);
-            }
-
-            writeVarUInt(shared_variants_statistics.size(), *stream);
-            for (const auto & [variant_name, size] : shared_variants_statistics)
-            {
-                writeStringBinary(variant_name, *stream);
-                writeVarUInt(size, *stream);
-            }
-        }
-    }
-    /// Otherwise statistics will be written in the suffix, in this case we will recalculate
-    /// statistics during serialization to make it more precise.
-    else
-    {
-        dynamic_state->recalculate_statistics = true;
     }
 
     dynamic_state->variant_serialization = dynamic_state->variant_type->getDefaultSerialization();
@@ -225,8 +156,8 @@ void SerializationDynamic::deserializeBinaryBulkStatePrefix(
         return;
 
     auto dynamic_state = std::make_shared<DeserializeBinaryBulkStateDynamic>();
-    dynamic_state->structure_state = std::move(structure_state);
-    dynamic_state->variant_serialization = checkAndGetState<DeserializeBinaryBulkStateDynamicStructure>(dynamic_state->structure_state)->variant_type->getDefaultSerialization();
+    dynamic_state->structure_state = structure_state;
+    dynamic_state->variant_serialization = checkAndGetState<DeserializeBinaryBulkStateDynamicStructure>(structure_state)->variant_type->getDefaultSerialization();
 
     settings.path.push_back(Substream::DynamicData);
     dynamic_state->variant_serialization->deserializeBinaryBulkStatePrefix(settings, dynamic_state->variant_state, cache);
@@ -243,7 +174,7 @@ ISerialization::DeserializeBinaryBulkStatePtr SerializationDynamic::deserializeD
     DeserializeBinaryBulkStatePtr state = nullptr;
     if (auto cached_state = getFromSubstreamsDeserializeStatesCache(cache, settings.path))
     {
-        state = std::move(cached_state);
+        state = cached_state;
     }
     else if (auto * structure_stream = settings.getter(settings.path))
     {
@@ -251,53 +182,33 @@ ISerialization::DeserializeBinaryBulkStatePtr SerializationDynamic::deserializeD
         UInt64 structure_version;
         readBinaryLittleEndian(structure_version, *structure_stream);
         auto structure_state = std::make_shared<DeserializeBinaryBulkStateDynamicStructure>(structure_version);
-        /// Read max_dynamic_types parameter.
-        readVarUInt(structure_state->max_dynamic_types, *structure_stream);
-        /// Read information about variants.
-        DataTypes variants;
-        size_t num_variants;
-        readVarUInt(num_variants, *structure_stream);
-        variants.reserve(num_variants + 1); /// +1 for shared variant.
+        /// Read internal Variant type name.
         if (settings.data_types_binary_encoding)
         {
-            for (size_t i = 0; i != num_variants; ++i)
-                variants.push_back(decodeDataType(*structure_stream));
+            structure_state->variant_type = decodeDataType(*structure_stream);
         }
         else
         {
             String data_type_name;
-            for (size_t i = 0; i != num_variants; ++i)
-            {
-                readStringBinary(data_type_name, *structure_stream);
-                variants.push_back(DataTypeFactory::instance().get(data_type_name));
-            }
+            readStringBinary(data_type_name, *structure_stream);
+            structure_state->variant_type = DataTypeFactory::instance().get(data_type_name);
         }
-        /// Add shared variant, Dynamic column should always have it.
-        variants.push_back(ColumnDynamic::getSharedVariantDataType());
-        auto variant_type = std::make_shared<DataTypeVariant>(variants);
+        const auto * variant_type = typeid_cast<const DataTypeVariant *>(structure_state->variant_type.get());
+        if (!variant_type)
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect type of Dynamic nested column, expected Variant, got {}", structure_state->variant_type->getName());
 
         /// Read statistics.
-        if (settings.object_and_dynamic_read_statistics)
+        if (settings.dynamic_read_statistics)
         {
-            ColumnDynamic::Statistics statistics(ColumnDynamic::Statistics::Source::READ);
-            /// First, read statistics for usual variants.
-            for (const auto & variant : variant_type->getVariants())
-                readVarUInt(statistics.variants_statistics[variant->getName()], *structure_stream);
-
-            /// Second, read statistics for shared variants.
-            size_t statistics_size;
-            readVarUInt(statistics_size, *structure_stream);
-            String variant_name;
-            for (size_t i = 0; i != statistics_size; ++i)
+            const auto & variants = variant_type->getVariants();
+            size_t variant_size;
+            for (const auto & variant : variants)
             {
-                readStringBinary(variant_name, *structure_stream);
-                readVarUInt(statistics.shared_variants_statistics[variant_name], *structure_stream);
+                readVarUInt(variant_size, *structure_stream);
+                structure_state->statistics.data[variant->getName()] = variant_size;
             }
-
-            structure_state->statistics = std::make_shared<const ColumnDynamic::Statistics>(std::move(statistics));
         }
 
-        structure_state->variant_type = std::move(variant_type);
         state = structure_state;
         addToSubstreamsDeserializeStatesCache(cache, settings.path, state);
     }
@@ -315,21 +226,13 @@ void SerializationDynamic::serializeBinaryBulkStateSuffix(
     settings.path.pop_back();
 
     if (!stream)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Missing stream for Dynamic column structure during serialization of binary bulk state suffix");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Missing stream for Dynamic column structure during serialization of binary bulk state prefix");
 
     /// Write statistics in suffix if needed.
-    if (settings.object_and_dynamic_write_statistics == SerializeBinaryBulkSettings::ObjectAndDynamicStatisticsMode::SUFFIX)
+    if (settings.dynamic_write_statistics == SerializeBinaryBulkSettings::DynamicStatisticsMode::SUFFIX)
     {
-        /// First, write statistics for usual variants.
         for (const auto & variant_name : dynamic_state->variant_names)
-            writeVarUInt(dynamic_state->statistics.variants_statistics[variant_name], *stream);
-        /// Second, write statistics for shared variants.
-        writeVarUInt(dynamic_state->statistics.shared_variants_statistics.size(), *stream);
-        for (const auto & [variant_name, size] : dynamic_state->statistics.shared_variants_statistics)
-        {
-            writeStringBinary(variant_name, *stream);
-            writeVarUInt(size, *stream);
-        }
+            writeVarUInt(dynamic_state->statistics.data[variant_name], *stream);
     }
 
     settings.path.push_back(Substream::DynamicData);
@@ -343,18 +246,6 @@ void SerializationDynamic::serializeBinaryBulkWithMultipleStreams(
     size_t limit,
     SerializeBinaryBulkSettings & settings,
     SerializeBinaryBulkStatePtr & state) const
-{
-    size_t tmp_size;
-    serializeBinaryBulkWithMultipleStreamsAndCountTotalSizeOfVariants(column, offset, limit, settings, state, tmp_size);
-}
-
-void SerializationDynamic::serializeBinaryBulkWithMultipleStreamsAndCountTotalSizeOfVariants(
-    const IColumn & column,
-    size_t offset,
-    size_t limit,
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state,
-    size_t & total_size_of_variants) const
 {
     const auto & column_dynamic = assert_cast<const ColumnDynamic &>(column);
     auto * dynamic_state = checkAndGetState<SerializeBinaryBulkStateDynamic>(state);
@@ -364,46 +255,9 @@ void SerializationDynamic::serializeBinaryBulkWithMultipleStreamsAndCountTotalSi
     if (!variant_info.variant_type->equals(*dynamic_state->variant_type))
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Mismatch of internal columns of Dynamic. Expected: {}, Got: {}", dynamic_state->variant_type->getName(), variant_info.variant_type->getName());
 
-    if (column_dynamic.getMaxDynamicTypes() != dynamic_state->max_dynamic_types)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Mismatch of max_dynamic_types parameter of Dynamic. Expected: {}, Got: {}", dynamic_state->max_dynamic_types, column_dynamic.getMaxDynamicTypes());
-
     settings.path.push_back(Substream::DynamicData);
     assert_cast<const SerializationVariant &>(*dynamic_state->variant_serialization)
-        .serializeBinaryBulkWithMultipleStreamsAndUpdateVariantStatistics(
-            *variant_column,
-            offset,
-            limit,
-            settings,
-            dynamic_state->variant_state,
-            dynamic_state->statistics.variants_statistics,
-            total_size_of_variants);
-
-    if (dynamic_state->recalculate_statistics)
-    {
-        /// Calculate statistics for shared variants.
-        const auto & shared_variant = column_dynamic.getSharedVariant();
-        if (!shared_variant.empty())
-        {
-            const auto & local_discriminators = variant_column->getLocalDiscriminators();
-            const auto & offsets = variant_column->getOffsets();
-            const auto shared_variant_discr = variant_column->localDiscriminatorByGlobal(column_dynamic.getSharedVariantDiscriminator());
-            size_t end = limit == 0 || offset + limit > local_discriminators.size() ? local_discriminators.size() : offset + limit;
-            for (size_t i = offset; i != end; ++i)
-            {
-                if (local_discriminators[i] == shared_variant_discr)
-                {
-                    auto value = shared_variant.getDataAt(offsets[i]);
-                    ReadBufferFromMemory buf(value.data, value.size);
-                    auto type = decodeDataType(buf);
-                    auto type_name = type->getName();
-                    if (auto it = dynamic_state->statistics.shared_variants_statistics.find(type_name); it != dynamic_state->statistics.shared_variants_statistics.end())
-                        ++it->second;
-                    else if (dynamic_state->statistics.shared_variants_statistics.size() < ColumnDynamic::Statistics::MAX_SHARED_VARIANT_STATISTICS_SIZE)
-                        dynamic_state->statistics.shared_variants_statistics.emplace(type_name, 1);
-                }
-            }
-        }
-    }
+        .serializeBinaryBulkWithMultipleStreamsAndUpdateVariantStatistics(*variant_column, offset, limit, settings, dynamic_state->variant_state, dynamic_state->statistics.data);
     settings.path.pop_back();
 }
 
@@ -418,17 +272,13 @@ void SerializationDynamic::deserializeBinaryBulkWithMultipleStreams(
         return;
 
     auto mutable_column = column->assumeMutable();
-    auto & column_dynamic = assert_cast<ColumnDynamic &>(*mutable_column);
     auto * dynamic_state = checkAndGetState<DeserializeBinaryBulkStateDynamic>(state);
     auto * structure_state = checkAndGetState<DeserializeBinaryBulkStateDynamicStructure>(dynamic_state->structure_state);
 
     if (mutable_column->empty())
-    {
-        column_dynamic.setMaxDynamicPaths(structure_state->max_dynamic_types);
-        column_dynamic.setVariantType(structure_state->variant_type);
-        column_dynamic.setStatistics(structure_state->statistics);
-    }
+        mutable_column = ColumnDynamic::create(structure_state->variant_type->createColumn(), structure_state->variant_type, max_dynamic_types, structure_state->statistics);
 
+    auto & column_dynamic = assert_cast<ColumnDynamic &>(*mutable_column);
     const auto & variant_info = column_dynamic.getVariantInfo();
     if (!variant_info.variant_type->equals(*structure_state->variant_type))
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Mismatch of internal columns of Dynamic. Expected: {}, Got: {}", structure_state->variant_type->getName(), variant_info.variant_type->getName());
@@ -479,41 +329,24 @@ void SerializationDynamic::serializeBinary(const IColumn & column, size_t row_nu
         encodeDataType(std::make_shared<DataTypeNothing>(), ostr);
         return;
     }
-    /// Check if this value is in shared variant. In this case it's already
-    /// in desired binary format.
-    else if (global_discr == dynamic_column.getSharedVariantDiscriminator())
-    {
-        auto value = dynamic_column.getSharedVariant().getDataAt(variant_column.offsetAt(row_num));
-        ostr.write(value.data, value.size);
-        return;
-    }
 
     const auto & variant_type = assert_cast<const DataTypeVariant &>(*variant_info.variant_type).getVariant(global_discr);
     encodeDataType(variant_type, ostr);
     variant_type->getDefaultSerialization()->serializeBinary(variant_column.getVariantByGlobalDiscriminator(global_discr), variant_column.offsetAt(row_num), ostr, settings);
 }
 
-template <typename ReturnType = void, typename DeserializeFunc>
-static ReturnType deserializeVariant(
+template <typename DeserializeFunc>
+static void deserializeVariant(
     ColumnVariant & variant_column,
-    const SerializationPtr & variant_serialization,
+    const DataTypePtr & variant_type,
     ColumnVariant::Discriminator global_discr,
     ReadBuffer & istr,
     DeserializeFunc deserialize)
 {
     auto & variant = variant_column.getVariantByGlobalDiscriminator(global_discr);
-    if constexpr (std::is_same_v<ReturnType, bool>)
-    {
-        if (!deserialize(*variant_serialization, variant, istr))
-            return ReturnType(false);
-    }
-    else
-    {
-        deserialize(*variant_serialization, variant, istr);
-    }
+    deserialize(*variant_type->getDefaultSerialization(), variant, istr);
     variant_column.getLocalDiscriminators().push_back(variant_column.localDiscriminatorByGlobal(global_discr));
     variant_column.getOffsets().push_back(variant.size() - 1);
-    return ReturnType(true);
 }
 
 void SerializationDynamic::deserializeBinary(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
@@ -527,12 +360,11 @@ void SerializationDynamic::deserializeBinary(IColumn & column, ReadBuffer & istr
     }
 
     auto variant_type_name = variant_type->getName();
-    const auto & variant_serialization = dynamic_column.getVariantSerialization(variant_type, variant_type_name);
     const auto & variant_info = dynamic_column.getVariantInfo();
     auto it = variant_info.variant_name_to_discriminator.find(variant_type_name);
     if (it != variant_info.variant_name_to_discriminator.end())
     {
-        deserializeVariant(dynamic_column.getVariantColumn(), variant_serialization, it->second, istr, [&settings](const ISerialization & serialization, IColumn & variant, ReadBuffer & buf){ serialization.deserializeBinary(variant, buf, settings); });
+        deserializeVariant(dynamic_column.getVariantColumn(), variant_type, it->second, istr, [&settings](const ISerialization & serialization, IColumn & variant, ReadBuffer & buf){ serialization.deserializeBinary(variant, buf, settings); });
         return;
     }
 
@@ -540,15 +372,25 @@ void SerializationDynamic::deserializeBinary(IColumn & column, ReadBuffer & istr
     if (dynamic_column.addNewVariant(variant_type))
     {
         auto discr = variant_info.variant_name_to_discriminator.at(variant_type_name);
-        deserializeVariant(dynamic_column.getVariantColumn(), variant_serialization, discr, istr, [&settings](const ISerialization & serialization, IColumn & variant, ReadBuffer & buf){ serialization.deserializeBinary(variant, buf, settings); });
+        deserializeVariant(dynamic_column.getVariantColumn(), variant_type, discr, istr, [&settings](const ISerialization & serialization, IColumn & variant, ReadBuffer & buf){ serialization.deserializeBinary(variant, buf, settings); });
         return;
     }
 
     /// We reached maximum number of variants and couldn't add new variant.
-    /// In this case we insert this value into shared variant in binary form.
+    /// This case should be really rare in real use cases.
+    /// We should always be able to add String variant and insert value as String.
+    dynamic_column.addStringVariant();
     auto tmp_variant_column = variant_type->createColumn();
-    variant_serialization->deserializeBinary(*tmp_variant_column, istr, settings);
-    dynamic_column.insertValueIntoSharedVariant(*tmp_variant_column, variant_type, variant_type_name, 0);
+    variant_type->getDefaultSerialization()->deserializeBinary(*tmp_variant_column, istr, settings);
+    auto string_column = castColumn(ColumnWithTypeAndName(tmp_variant_column->getPtr(), variant_type, ""), std::make_shared<DataTypeString>());
+    auto & variant_column = dynamic_column.getVariantColumn();
+    variant_column.insertIntoVariantFrom(variant_info.variant_name_to_discriminator.at("String"), *string_column, 0);
+}
+
+void SerializationDynamic::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const auto & dynamic_column = assert_cast<const ColumnDynamic &>(column);
+    dynamic_column.getVariantInfo().variant_type->getDefaultSerialization()->serializeTextCSV(dynamic_column.getVariantColumn(), row_num, ostr, settings);
 }
 
 template <typename ReadFieldFunc, typename TryDeserializeVariantFunc, typename DeserializeVariant>
@@ -564,7 +406,6 @@ static void deserializeTextImpl(
     auto & dynamic_column = assert_cast<ColumnDynamic &>(column);
     auto & variant_column = dynamic_column.getVariantColumn();
     const auto & variant_info = dynamic_column.getVariantInfo();
-    const auto & variant_types = assert_cast<const DataTypeVariant &>(*variant_info.variant_type).getVariants();
     String field = read_field(istr);
     auto field_buf = std::make_unique<ReadBufferFromString>(field);
     JSONInferenceInfo json_info;
@@ -572,81 +413,27 @@ static void deserializeTextImpl(
     if (escaping_rule == FormatSettings::EscapingRule::JSON)
         transformFinalInferredJSONTypeIfNeeded(variant_type, settings, &json_info);
 
-    /// If inferred type is not complete, we cannot add it as a new variant.
-    /// Let's try to deserialize this field into existing variants.
-    /// If failed, insert this value as String.
-    if (!checkIfTypeIsComplete(variant_type))
-    {
-        size_t shared_variant_discr = dynamic_column.getSharedVariantDiscriminator();
-        for (size_t i = 0; i != variant_types.size(); ++i)
-        {
-            field_buf = std::make_unique<ReadBufferFromString>(field);
-            if (i != shared_variant_discr
-                && deserializeVariant<bool>(
-                    variant_column,
-                    dynamic_column.getVariantSerialization(variant_types[i], variant_info.variant_names[i]),
-                    i,
-                    *field_buf,
-                    try_deserialize_variant))
-                return;
-        }
-
-        variant_type = std::make_shared<DataTypeString>();
-        /// To be able to deserialize field as String with Quoted escaping rule, it should be quoted.
-        if (escaping_rule == FormatSettings::EscapingRule::Quoted && (field.size() < 2 || field.front() != '\'' || field.back() != '\''))
-            field = "'" + field + "'";
-    }
-    else if (dynamic_column.addNewVariant(variant_type, variant_type->getName()))
+    if (checkIfTypeIsComplete(variant_type) && dynamic_column.addNewVariant(variant_type))
     {
         auto discr = variant_info.variant_name_to_discriminator.at(variant_type->getName());
-        deserializeVariant(dynamic_column.getVariantColumn(), dynamic_column.getVariantSerialization(variant_type), discr, *field_buf, deserialize_variant);
+        deserializeVariant(dynamic_column.getVariantColumn(), variant_type, discr, *field_buf, deserialize_variant);
         return;
     }
 
-    /// We couldn't infer type or add new variant. Insert it into shared variant.
-    auto tmp_variant_column = variant_type->createColumn();
+    /// We couldn't infer type or add new variant. Try to insert field into current variants.
     field_buf = std::make_unique<ReadBufferFromString>(field);
-    auto variant_type_name = variant_type->getName();
-    deserialize_variant(*dynamic_column.getVariantSerialization(variant_type, variant_type_name), *tmp_variant_column, *field_buf);
-    dynamic_column.insertValueIntoSharedVariant(*tmp_variant_column, variant_type, variant_type_name, 0);
-}
+    if (try_deserialize_variant(*variant_info.variant_type->getDefaultSerialization(), variant_column, *field_buf))
+        return;
 
-template <typename NestedSerialize>
-static void serializeTextImpl(
-    const IColumn & column,
-    size_t row_num,
-    WriteBuffer & ostr,
-    const FormatSettings & settings,
-    NestedSerialize nested_serialize)
-{
-    const auto & dynamic_column = assert_cast<const ColumnDynamic &>(column);
-    const auto & variant_column = dynamic_column.getVariantColumn();
-    /// Check if this row has value in shared variant. In this case we should first deserialize it from binary format.
-    if (variant_column.globalDiscriminatorAt(row_num) == dynamic_column.getSharedVariantDiscriminator())
-    {
-        auto value = dynamic_column.getSharedVariant().getDataAt(variant_column.offsetAt(row_num));
-        ReadBufferFromMemory buf(value.data, value.size);
-        auto variant_type = decodeDataType(buf);
-        auto tmp_variant_column = variant_type->createColumn();
-        auto variant_serialization = variant_type->getDefaultSerialization();
-        variant_serialization->deserializeBinary(*tmp_variant_column, buf, settings);
-        nested_serialize(*variant_serialization, *tmp_variant_column, 0, ostr);
-    }
-    /// Otherwise just use serialization for Variant.
-    else
-    {
-        nested_serialize(*dynamic_column.getVariantInfo().variant_type->getDefaultSerialization(), variant_column, row_num, ostr);
-    }
-}
+    /// We couldn't insert field into any existing variant, add String variant and read value as String.
+    dynamic_column.addStringVariant();
 
-void SerializationDynamic::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    auto nested_serialize = [&settings](const ISerialization & serialization, const IColumn & col, size_t row, WriteBuffer & buf)
-    {
-        serialization.serializeTextCSV(col, row, buf, settings);
-    };
+    if (escaping_rule == FormatSettings::EscapingRule::Quoted && (field.size() < 2 || field.front() != '\'' || field.back() != '\''))
+        field = "'" + field + "'";
 
-    serializeTextImpl(column, row_num, ostr, settings, nested_serialize);
+    field_buf = std::make_unique<ReadBufferFromString>(field);
+    auto string_discr = variant_info.variant_name_to_discriminator.at("String");
+    deserializeVariant(dynamic_column.getVariantColumn(), std::make_shared<DataTypeString>(), string_discr, *field_buf, deserialize_variant);
 }
 
 void SerializationDynamic::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
@@ -679,12 +466,8 @@ bool SerializationDynamic::tryDeserializeTextCSV(DB::IColumn & column, DB::ReadB
 
 void SerializationDynamic::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
-    auto nested_serialize = [&settings](const ISerialization & serialization, const IColumn & col, size_t row, WriteBuffer & buf)
-    {
-        serialization.serializeTextEscaped(col, row, buf, settings);
-    };
-
-    serializeTextImpl(column, row_num, ostr, settings, nested_serialize);
+    const auto & dynamic_column = assert_cast<const ColumnDynamic &>(column);
+    dynamic_column.getVariantInfo().variant_type->getDefaultSerialization()->serializeTextEscaped(dynamic_column.getVariantColumn(), row_num, ostr, settings);
 }
 
 void SerializationDynamic::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
@@ -717,12 +500,8 @@ bool SerializationDynamic::tryDeserializeTextEscaped(DB::IColumn & column, DB::R
 
 void SerializationDynamic::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
-    auto nested_serialize = [&settings](const ISerialization & serialization, const IColumn & col, size_t row, WriteBuffer & buf)
-    {
-        serialization.serializeTextQuoted(col, row, buf, settings);
-    };
-
-    serializeTextImpl(column, row_num, ostr, settings, nested_serialize);
+    const auto & dynamic_column = assert_cast<const ColumnDynamic &>(column);
+    dynamic_column.getVariantInfo().variant_type->getDefaultSerialization()->serializeTextQuoted(dynamic_column.getVariantColumn(), row_num, ostr, settings);
 }
 
 void SerializationDynamic::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
@@ -754,19 +533,9 @@ bool SerializationDynamic::tryDeserializeTextQuoted(DB::IColumn & column, DB::Re
 }
 
 void SerializationDynamic::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    auto nested_serialize = [&settings](const ISerialization & serialization, const IColumn & col, size_t row, WriteBuffer & buf)
-    {
-        serialization.serializeTextJSON(col, row, buf, settings);
-    };
-
-    serializeTextImpl(column, row_num, ostr, settings, nested_serialize);
-}
-
-void SerializationDynamic::serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const
 {
     const auto & dynamic_column = assert_cast<const ColumnDynamic &>(column);
-    dynamic_column.getVariantInfo().variant_type->getDefaultSerialization()->serializeTextJSONPretty(dynamic_column.getVariantColumn(), row_num, ostr, settings, indent);
+    dynamic_column.getVariantInfo().variant_type->getDefaultSerialization()->serializeTextJSON(dynamic_column.getVariantColumn(), row_num, ostr, settings);
 }
 
 void SerializationDynamic::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
@@ -799,12 +568,8 @@ bool SerializationDynamic::tryDeserializeTextJSON(DB::IColumn & column, DB::Read
 
 void SerializationDynamic::serializeTextRaw(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
-    auto nested_serialize = [&settings](const ISerialization & serialization, const IColumn & col, size_t row, WriteBuffer & buf)
-    {
-        serialization.serializeTextRaw(col, row, buf, settings);
-    };
-
-    serializeTextImpl(column, row_num, ostr, settings, nested_serialize);
+    const auto & dynamic_column = assert_cast<const ColumnDynamic &>(column);
+    dynamic_column.getVariantInfo().variant_type->getDefaultSerialization()->serializeTextRaw(dynamic_column.getVariantColumn(), row_num, ostr, settings);
 }
 
 void SerializationDynamic::deserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
@@ -837,12 +602,8 @@ bool SerializationDynamic::tryDeserializeTextRaw(DB::IColumn & column, DB::ReadB
 
 void SerializationDynamic::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
-    auto nested_serialize = [&settings](const ISerialization & serialization, const IColumn & col, size_t row, WriteBuffer & buf)
-    {
-        serialization.serializeText(col, row, buf, settings);
-    };
-
-    serializeTextImpl(column, row_num, ostr, settings, nested_serialize);
+    const auto & dynamic_column = assert_cast<const ColumnDynamic &>(column);
+    dynamic_column.getVariantInfo().variant_type->getDefaultSerialization()->serializeText(dynamic_column.getVariantColumn(), row_num, ostr, settings);
 }
 
 void SerializationDynamic::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
@@ -875,12 +636,8 @@ bool SerializationDynamic::tryDeserializeWholeText(DB::IColumn & column, DB::Rea
 
 void SerializationDynamic::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
-    auto nested_serialize = [&settings](const ISerialization & serialization, const IColumn & col, size_t row, WriteBuffer & buf)
-    {
-        serialization.serializeTextXML(col, row, buf, settings);
-    };
-
-    serializeTextImpl(column, row_num, ostr, settings, nested_serialize);
+    const auto & dynamic_column = assert_cast<const ColumnDynamic &>(column);
+    dynamic_column.getVariantInfo().variant_type->getDefaultSerialization()->serializeTextXML(dynamic_column.getVariantColumn(), row_num, ostr, settings);
 }
 
 }
diff --git a/src/DataTypes/Serializations/SerializationDynamic.h b/src/DataTypes/Serializations/SerializationDynamic.h
index f34b5d0e770..001a3cf87ce 100644
--- a/src/DataTypes/Serializations/SerializationDynamic.h
+++ b/src/DataTypes/Serializations/SerializationDynamic.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <DataTypes/Serializations/ISerialization.h>
-#include <DataTypes/DataTypeDynamic.h>
 #include <Columns/ColumnDynamic.h>
 
 namespace DB
@@ -12,7 +11,7 @@ class SerializationDynamicElement;
 class SerializationDynamic : public ISerialization
 {
 public:
-    explicit SerializationDynamic(size_t max_dynamic_types_ = DataTypeDynamic::DEFAULT_MAX_DYNAMIC_TYPES) : max_dynamic_types(max_dynamic_types_)
+    explicit SerializationDynamic(size_t max_dynamic_types_) : max_dynamic_types(max_dynamic_types_)
     {
     }
 
@@ -60,14 +59,6 @@ public:
         SerializeBinaryBulkSettings & settings,
         SerializeBinaryBulkStatePtr & state) const override;
 
-    void serializeBinaryBulkWithMultipleStreamsAndCountTotalSizeOfVariants(
-        const IColumn & column,
-        size_t offset,
-        size_t limit,
-        SerializeBinaryBulkSettings & settings,
-        SerializeBinaryBulkStatePtr & state,
-        size_t & total_size_of_variants) const;
-
     void deserializeBinaryBulkWithMultipleStreams(
         ColumnPtr & column,
         size_t limit,
@@ -98,7 +89,6 @@ public:
     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 serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const override;
     void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
     bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
 
@@ -115,13 +105,9 @@ private:
     {
         DynamicStructureSerializationVersion structure_version;
         DataTypePtr variant_type;
-        size_t max_dynamic_types;
-        ColumnDynamic::StatisticsPtr statistics;
+        ColumnDynamic::Statistics statistics = {.source = ColumnDynamic::Statistics::Source::READ, .data = {}};
 
-        explicit DeserializeBinaryBulkStateDynamicStructure(UInt64 structure_version_)
-            : structure_version(structure_version_)
-        {
-        }
+        explicit DeserializeBinaryBulkStateDynamicStructure(UInt64 structure_version_) : structure_version(structure_version_) {}
     };
 
     size_t max_dynamic_types;
diff --git a/src/DataTypes/Serializations/SerializationDynamicElement.cpp b/src/DataTypes/Serializations/SerializationDynamicElement.cpp
index a16186abf2e..211f0ac9377 100644
--- a/src/DataTypes/Serializations/SerializationDynamicElement.cpp
+++ b/src/DataTypes/Serializations/SerializationDynamicElement.cpp
@@ -4,10 +4,7 @@
 #include <DataTypes/Serializations/SerializationDynamic.h>
 #include <DataTypes/DataTypeVariant.h>
 #include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypesBinaryEncoding.h>
 #include <Columns/ColumnDynamic.h>
-#include <Columns/ColumnLowCardinality.h>
-#include <Formats/FormatSettings.h>
 #include <IO/ReadHelpers.h>
 
 namespace DB
@@ -24,8 +21,6 @@ struct DeserializeBinaryBulkStateDynamicElement : public ISerialization::Deseria
     ISerialization::DeserializeBinaryBulkStatePtr structure_state;
     SerializationPtr variant_serialization;
     ISerialization::DeserializeBinaryBulkStatePtr variant_element_state;
-    bool read_from_shared_variant;
-    ColumnPtr shared_variant;
 };
 
 void SerializationDynamicElement::enumerateStreams(
@@ -53,7 +48,6 @@ void SerializationDynamicElement::enumerateStreams(
                             .withColumn(data.column)
                             .withSerializationInfo(data.serialization_info)
                             .withDeserializeState(deserialize_state->variant_element_state);
-    settings.path.back().data = variant_data;
     deserialize_state->variant_serialization->enumerateStreams(settings, callback, variant_data);
     settings.path.pop_back();
 }
@@ -79,10 +73,9 @@ void SerializationDynamicElement::deserializeBinaryBulkStatePrefix(
 
     auto dynamic_element_state = std::make_shared<DeserializeBinaryBulkStateDynamicElement>();
     dynamic_element_state->structure_state = std::move(structure_state);
-    const auto & variant_type = assert_cast<const DataTypeVariant &>(
-        *checkAndGetState<SerializationDynamic::DeserializeBinaryBulkStateDynamicStructure>(dynamic_element_state->structure_state)->variant_type);
+    const auto & variant_type = checkAndGetState<SerializationDynamic::DeserializeBinaryBulkStateDynamicStructure>(dynamic_element_state->structure_state)->variant_type;
     /// Check if we actually have required element in the Variant.
-    if (auto global_discr = variant_type.tryGetVariantDiscriminator(dynamic_element_name))
+    if (auto global_discr = assert_cast<const DataTypeVariant &>(*variant_type).tryGetVariantDiscriminator(dynamic_element_name))
     {
         settings.path.push_back(Substream::DynamicData);
         if (is_null_map_subcolumn)
@@ -90,21 +83,6 @@ void SerializationDynamicElement::deserializeBinaryBulkStatePrefix(
         else
             dynamic_element_state->variant_serialization = std::make_shared<SerializationVariantElement>(nested_serialization, dynamic_element_name, *global_discr);
         dynamic_element_state->variant_serialization->deserializeBinaryBulkStatePrefix(settings, dynamic_element_state->variant_element_state, cache);
-        dynamic_element_state->read_from_shared_variant = false;
-        settings.path.pop_back();
-    }
-    /// If we don't have this element in the Variant, we will read shared variant and try to find it there.
-    else
-    {
-        auto shared_variant_global_discr = variant_type.tryGetVariantDiscriminator(ColumnDynamic::getSharedVariantTypeName());
-        chassert(shared_variant_global_discr.has_value());
-        settings.path.push_back(Substream::DynamicData);
-        dynamic_element_state->variant_serialization = std::make_shared<SerializationVariantElement>(
-            ColumnDynamic::getSharedVariantDataType()->getDefaultSerialization(),
-            ColumnDynamic::getSharedVariantTypeName(),
-            *shared_variant_global_discr);
-        dynamic_element_state->variant_serialization->deserializeBinaryBulkStatePrefix(settings, dynamic_element_state->variant_element_state, cache);
-        dynamic_element_state->read_from_shared_variant = true;
         settings.path.pop_back();
     }
 
@@ -137,103 +115,23 @@ void SerializationDynamicElement::deserializeBinaryBulkWithMultipleStreams(
 
     auto * dynamic_element_state = checkAndGetState<DeserializeBinaryBulkStateDynamicElement>(state);
 
-    /// Check if this subcolumn should not be read from shared variant.
-    /// In this case just read data from the corresponding variant.
-    if (!dynamic_element_state->read_from_shared_variant)
+    if (dynamic_element_state->variant_serialization)
     {
         settings.path.push_back(Substream::DynamicData);
-        dynamic_element_state->variant_serialization->deserializeBinaryBulkWithMultipleStreams(
-            result_column, limit, settings, dynamic_element_state->variant_element_state, cache);
+        dynamic_element_state->variant_serialization->deserializeBinaryBulkWithMultipleStreams(result_column, limit, settings, dynamic_element_state->variant_element_state, cache);
         settings.path.pop_back();
     }
-    /// Otherwise, read the shared variant column and extract requested type from it.
+    else if (is_null_map_subcolumn)
+    {
+        auto mutable_column = result_column->assumeMutable();
+        auto & data = assert_cast<ColumnUInt8 &>(*mutable_column).getData();
+        data.resize_fill(data.size() + limit, 1);
+    }
     else
     {
-        settings.path.push_back(Substream::DynamicData);
-        /// Initialize shared_variant column if needed.
-        if (result_column->empty())
-            dynamic_element_state->shared_variant = makeNullable(ColumnDynamic::getSharedVariantDataType()->createColumn());
-        size_t prev_size = result_column->size();
-        dynamic_element_state->variant_serialization->deserializeBinaryBulkWithMultipleStreams(
-            dynamic_element_state->shared_variant, limit, settings, dynamic_element_state->variant_element_state, cache);
-        settings.path.pop_back();
-
-        /// If we need to read a subcolumn from variant column, create an empty variant column, fill it and extract subcolumn.
-        auto variant_type = DataTypeFactory::instance().get(dynamic_element_name);
-        auto result_type = makeNullableOrLowCardinalityNullableSafe(variant_type);
-        MutableColumnPtr variant_column = nested_subcolumn.empty() || is_null_map_subcolumn ? result_column->assumeMutable() : result_type->createColumn();
-        variant_column->reserve(variant_column->size() + limit);
-        MutableColumnPtr non_nullable_variant_column = variant_column->assumeMutable();
-        NullMap * null_map = nullptr;
-        bool is_low_cardinality_nullable = isColumnLowCardinalityNullable(*variant_column);
-        /// Resulting subolumn can be Nullable, but value is serialized in shared variant as non-Nullable.
-        /// Extract non-nullable column and remember the null map to fill it during deserialization.
-        if (isColumnNullable(*variant_column))
-        {
-            auto & nullable_variant_column = assert_cast<ColumnNullable &>(*variant_column);
-            non_nullable_variant_column = nullable_variant_column.getNestedColumnPtr()->assumeMutable();
-            null_map = &nullable_variant_column.getNullMapData();
-        }
-        else if (is_null_map_subcolumn)
-        {
-            null_map = &assert_cast<ColumnUInt8 &>(*variant_column).getData();
-        }
-
-        auto variant_serialization = variant_type->getDefaultSerialization();
-
-        const auto & nullable_shared_variant = assert_cast<const ColumnNullable &>(*dynamic_element_state->shared_variant);
-        const auto & shared_null_map = nullable_shared_variant.getNullMapData();
-        const auto & shared_variant = assert_cast<const ColumnString &>(nullable_shared_variant.getNestedColumn());
-        const FormatSettings format_settings;
-        for (size_t i = prev_size; i != shared_variant.size(); ++i)
-        {
-            if (!shared_null_map[i])
-            {
-                auto value = shared_variant.getDataAt(i);
-                ReadBufferFromMemory buf(value.data, value.size);
-                auto type = decodeDataType(buf);
-                if (type->getName() == dynamic_element_name)
-                {
-                    /// When requested type is LowCardinality the subcolumn type name will be LowCardinality(Nullable).
-                    /// Value in shared variant is serialized as LowCardinality and we cannot simply deserialize it
-                    /// inside LowCardinality(Nullable) column (it will try to deserialize null bit). In this case we
-                    /// have to create temporary LowCardinality column, deserialize value into it and insert it into
-                    /// resulting LowCardinality(Nullable) (insertion from LowCardinality column to LowCardinality(Nullable)
-                    /// column is allowed).
-                    if (is_low_cardinality_nullable)
-                    {
-                        auto tmp_column = variant_type->createColumn();
-                        variant_serialization->deserializeBinary(*tmp_column, buf, format_settings);
-                        non_nullable_variant_column->insertFrom(*tmp_column, 0);
-                    }
-                    else if (is_null_map_subcolumn)
-                    {
-                        null_map->push_back(0);
-                    }
-                    else
-                    {
-                        variant_serialization->deserializeBinary(*non_nullable_variant_column, buf, format_settings);
-                        if (null_map)
-                            null_map->push_back(0);
-                    }
-                }
-                else
-                {
-                    variant_column->insertDefault();
-                }
-            }
-            else
-            {
-                variant_column->insertDefault();
-            }
-        }
-
-        /// Extract nested subcolumn if needed.
-        if (!nested_subcolumn.empty() && !is_null_map_subcolumn)
-        {
-            auto subcolumn = result_type->getSubcolumn(nested_subcolumn, variant_column->getPtr());
-            result_column->assumeMutable()->insertRangeFrom(*subcolumn, 0, subcolumn->size());
-        }
+        auto mutable_column = result_column->assumeMutable();
+        mutable_column->insertManyDefaults(limit);
+        result_column = std::move(mutable_column);
     }
 }
 
diff --git a/src/DataTypes/Serializations/SerializationDynamicElement.h b/src/DataTypes/Serializations/SerializationDynamicElement.h
index c674cf479ae..127d14a55e0 100644
--- a/src/DataTypes/Serializations/SerializationDynamicElement.h
+++ b/src/DataTypes/Serializations/SerializationDynamicElement.h
@@ -13,15 +13,11 @@ private:
     /// To be able to deserialize Dynamic element as a subcolumn
     /// we need its type name and global discriminator.
     String dynamic_element_name;
-    /// Nested subcolumn of a type dynamic type. For example, for `Tuple(a UInt32)`.a
-    /// subcolumn dynamic_element_name = 'Tuple(a UInt32)' and nested_subcolumn = 'a'.
-    /// Needed to extract nested subcolumn from values in shared variant.
-    String nested_subcolumn;
     bool is_null_map_subcolumn;
 
 public:
-    SerializationDynamicElement(const SerializationPtr & nested_, const String & dynamic_element_name_, const String & nested_subcolumn_, bool is_null_map_subcolumn_ = false)
-        : SerializationWrapper(nested_), dynamic_element_name(dynamic_element_name_), nested_subcolumn(nested_subcolumn_), is_null_map_subcolumn(is_null_map_subcolumn_)
+    SerializationDynamicElement(const SerializationPtr & nested_, const String & dynamic_element_name_, bool is_null_map_subcolumn_ = false)
+        : SerializationWrapper(nested_), dynamic_element_name(dynamic_element_name_), is_null_map_subcolumn(is_null_map_subcolumn_)
     {
     }
 
diff --git a/src/DataTypes/Serializations/SerializationFixedString.cpp b/src/DataTypes/Serializations/SerializationFixedString.cpp
index 688c71792fa..f919dc16d33 100644
--- a/src/DataTypes/Serializations/SerializationFixedString.cpp
+++ b/src/DataTypes/Serializations/SerializationFixedString.cpp
@@ -28,7 +28,7 @@ static constexpr size_t MAX_STRINGS_SIZE = 1ULL << 30;
 
 void SerializationFixedString::serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings &) const
 {
-    const String & s = field.safeGet<const String &>();
+    const String & s = field.get<const String &>();
     ostr.write(s.data(), std::min(s.size(), n));
     if (s.size() < n)
         for (size_t i = s.size(); i < n; ++i)
@@ -39,7 +39,7 @@ void SerializationFixedString::serializeBinary(const Field & field, WriteBuffer
 void SerializationFixedString::deserializeBinary(Field & field, ReadBuffer & istr, const FormatSettings &) const
 {
     field = String();
-    String & s = field.safeGet<String &>();
+    String & s = field.get<String &>();
     s.resize(n);
     istr.readStrict(s.data(), n);
 }
diff --git a/src/DataTypes/Serializations/SerializationIPv4andIPv6.cpp b/src/DataTypes/Serializations/SerializationIPv4andIPv6.cpp
index c1beceb4533..dfcd24aff58 100644
--- a/src/DataTypes/Serializations/SerializationIPv4andIPv6.cpp
+++ b/src/DataTypes/Serializations/SerializationIPv4andIPv6.cpp
@@ -125,7 +125,7 @@ bool SerializationIP<IPv>::tryDeserializeTextCSV(DB::IColumn & column, DB::ReadB
 template <typename IPv>
 void SerializationIP<IPv>::serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings &) const
 {
-    IPv x = field.safeGet<IPv>();
+    IPv x = field.get<IPv>();
     if constexpr (std::is_same_v<IPv, IPv6>)
         writeBinary(x, ostr);
     else
diff --git a/src/DataTypes/Serializations/SerializationJSON.cpp b/src/DataTypes/Serializations/SerializationJSON.cpp
deleted file mode 100644
index 092ccd1c5a5..00000000000
--- a/src/DataTypes/Serializations/SerializationJSON.cpp
+++ /dev/null
@@ -1,405 +0,0 @@
-#include <DataTypes/Serializations/SerializationJSON.h>
-#include <IO/WriteHelpers.h>
-#include <IO/ReadHelpers.h>
-
-#if USE_SIMDJSON
-#include <Common/JSONParsers/SimdJSONParser.h>
-#endif
-#if USE_RAPIDJSON
-#include <Common/JSONParsers/RapidJSONParser.h>
-#endif
-#include <Common/JSONParsers/DummyJSONParser.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int INCORRECT_DATA;
-}
-
-template <typename Parser>
-SerializationJSON<Parser>::SerializationJSON(
-    std::unordered_map<String, SerializationPtr> typed_paths_serializations_,
-    const std::unordered_set<String> & paths_to_skip_,
-    const std::vector<String> & path_regexps_to_skip_,
-    std::unique_ptr<JSONExtractTreeNode<Parser>> json_extract_tree_)
-    : SerializationObject(std::move(typed_paths_serializations_), paths_to_skip_, path_regexps_to_skip_)
-    , json_extract_tree(std::move(json_extract_tree_))
-{
-}
-
-namespace
-{
-
-/// Struct that represents elements of the JSON path.
-/// "a.b.c" -> ["a", "b", "c"]
-struct PathElements
-{
-    explicit PathElements(const String & path)
-    {
-        const char * start = path.data();
-        const char * end = start + path.size();
-        const char * pos = start;
-        const char * last_dot_pos = pos - 1;
-        for (pos = start; pos != end; ++pos)
-        {
-            if (*pos == '.')
-            {
-                elements.emplace_back(last_dot_pos + 1, size_t(pos - last_dot_pos - 1));
-                last_dot_pos = pos;
-            }
-        }
-
-        elements.emplace_back(last_dot_pos + 1, size_t(pos - last_dot_pos - 1));
-    }
-
-    size_t size() const { return elements.size(); }
-
-    std::vector<std::string_view> elements;
-};
-
-/// Struct that represents a prefix of a JSON path. Used during output of the JSON object.
-struct Prefix
-{
-    /// Shrink current prefix to the common prefix of current prefix and specified path.
-    /// For example, if current prefix is a.b.c.d and path is a.b.e, then shrink the prefix to a.b.
-    void shrinkToCommonPrefix(const PathElements & path_elements)
-    {
-        /// Don't include last element in path_elements in the prefix.
-        size_t i = 0;
-        while (i != elements.size() && i != (path_elements.elements.size() - 1) && elements[i].first == path_elements.elements[i])
-            ++i;
-        elements.resize(i);
-    }
-
-    /// Check is_first flag in current object.
-    bool isFirstInCurrentObject() const
-    {
-        if (elements.empty())
-            return root_is_first_flag;
-        return elements.back().second;
-    }
-
-    /// Set flag is_first = false in current object.
-    void setNotFirstInCurrentObject()
-    {
-        if (elements.empty())
-            root_is_first_flag = false;
-        else
-            elements.back().second = false;
-    }
-
-    size_t size() const { return elements.size(); }
-
-    /// Elements of the prefix: (path element, is_first flag in this prefix).
-    /// is_first flag indicates if we already serialized some key in the object with such prefix.
-    std::vector<std::pair<std::string_view, bool>> elements;
-    bool root_is_first_flag = true;
-};
-
-}
-
-template <typename Parser>
-void SerializationJSON<Parser>::serializeTextImpl(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, bool pretty, size_t indent) const
-{
-    const auto & column_object = assert_cast<const ColumnObject &>(column);
-    const auto & typed_paths = column_object.getTypedPaths();
-    const auto & dynamic_paths = column_object.getDynamicPaths();
-    const auto & shared_data_offsets = column_object.getSharedDataOffsets();
-    const auto [shared_data_paths, shared_data_values] = column_object.getSharedDataPathsAndValues();
-    size_t shared_data_offset = shared_data_offsets[static_cast<ssize_t>(row_num) - 1];
-    size_t shared_data_end = shared_data_offsets[static_cast<ssize_t>(row_num)];
-
-    /// We need to convert the set of paths in this row to a JSON object.
-    /// To do it, we first collect all the paths from current row, then we sort them
-    /// and construct the resulting JSON object by iterating over sorted list of paths.
-    /// For example:
-    /// b.c, a.b, a.a, b.e, g, h.u.t -> a.a, a.b, b.c, b.e, g, h.u.t -> {"a" : {"a" : ..., "b" : ...}, "b" : {"c" : ..., "e" : ...}, "g" : ..., "h" : {"u" : {"t" : ...}}}.
-    std::vector<String> sorted_paths;
-    sorted_paths.reserve(typed_paths.size() + dynamic_paths.size() + (shared_data_end - shared_data_offset));
-    for (const auto & [path, _] : typed_paths)
-        sorted_paths.emplace_back(path);
-    for (const auto & [path, dynamic_column] : dynamic_paths)
-    {
-        /// We consider null value and absence of the path in a row as equivalent cases, because we cannot actually distinguish them.
-        /// So, we don't output null values at all.
-        if (!dynamic_column->isNullAt(row_num))
-            sorted_paths.emplace_back(path);
-    }
-    for (size_t i = shared_data_offset; i != shared_data_end; ++i)
-    {
-        auto path = shared_data_paths->getDataAt(i).toString();
-        sorted_paths.emplace_back(path);
-    }
-
-    std::sort(sorted_paths.begin(), sorted_paths.end());
-
-    if (pretty)
-        writeCString("{\n", ostr);
-    else
-        writeChar('{', ostr);
-    size_t index_in_shared_data_values = shared_data_offset;
-    /// current_prefix represents the path of the object we are currently serializing keys in.
-    Prefix current_prefix;
-    for (const auto & path : sorted_paths)
-    {
-        PathElements path_elements(path);
-        /// Change prefix to common prefix between current prefix and current path.
-        /// If prefix changed (it can only decrease), close all finished objects.
-        /// For example:
-        /// Current prefix: a.b.c.d
-        /// Current path: a.b.e.f
-        /// It means now we have : {..., "a" : {"b" : {"c" : {"d" : ...
-        /// Common prefix will be a.b, so it means we should close objects a.b.c.d and a.b.c: {..., "a" : {"b" : {"c" : {"d" : ...}}
-        /// and continue serializing keys in object a.b
-        size_t prev_prefix_size = current_prefix.size();
-        current_prefix.shrinkToCommonPrefix(path_elements);
-        size_t prefix_size = current_prefix.size();
-        if (prefix_size != prev_prefix_size)
-        {
-            size_t objects_to_close = prev_prefix_size - prefix_size;
-            if (pretty)
-            {
-                writeChar('\n', ostr);
-                for (size_t i = 0; i != objects_to_close; ++i)
-                {
-                    writeChar(' ', (indent + prefix_size + objects_to_close - i) * 4, ostr);
-                    if (i != objects_to_close - 1)
-                        writeCString("}\n", ostr);
-                    else
-                        writeChar('}', ostr);
-                }
-            }
-            else
-            {
-                for (size_t i = 0; i != objects_to_close; ++i)
-                    writeChar('}', ostr);
-            }
-        }
-
-        /// Now we are inside object that has common prefix with current path.
-        /// We should go inside all objects in current path.
-        /// From the example above we should open object a.b.e:
-        ///  {..., "a" : {"b" : {"c" : {"d" : ...}}, "e" : {
-        if (prefix_size + 1 < path_elements.size())
-        {
-            for (size_t i = prefix_size; i != path_elements.size() - 1; ++i)
-            {
-                /// Write comma before the key if it's not the first key in this prefix.
-                if (!current_prefix.isFirstInCurrentObject())
-                {
-                    if (pretty)
-                        writeCString(",\n", ostr);
-                    else
-                        writeChar(',', ostr);
-                }
-                else
-                {
-                    current_prefix.setNotFirstInCurrentObject();
-                }
-
-                if (pretty)
-                {
-                    writeChar(' ', (indent + i + 1) * 4, ostr);
-                    writeJSONString(path_elements.elements[i], ostr, settings);
-                    writeCString(" : {\n", ostr);
-                }
-                else
-                {
-                    writeJSONString(path_elements.elements[i], ostr, settings);
-                    writeCString(":{", ostr);
-                }
-
-                /// Update current prefix.
-                current_prefix.elements.emplace_back(path_elements.elements[i], true);
-            }
-        }
-
-        /// Write comma before the key if it's not the first key in this prefix.
-        if (!current_prefix.isFirstInCurrentObject())
-        {
-            if (pretty)
-                writeCString(",\n", ostr);
-            else
-                writeChar(',', ostr);
-        }
-        else
-        {
-            current_prefix.setNotFirstInCurrentObject();
-        }
-
-        if (pretty)
-        {
-            writeChar(' ', (indent + current_prefix.size() + 1) * 4, ostr);
-            writeJSONString(path_elements.elements.back(), ostr, settings);
-            writeCString(" : ", ostr);
-        }
-        else
-        {
-            writeJSONString(path_elements.elements.back(), ostr, settings);
-            writeCString(":", ostr);
-        }
-
-        /// Serialize value of current path.
-        if (auto typed_it = typed_paths.find(path); typed_it != typed_paths.end())
-        {
-            if (pretty)
-                typed_path_serializations.at(path)->serializeTextJSONPretty(*typed_it->second, row_num, ostr, settings, indent + current_prefix.size() + 1);
-            else
-                typed_path_serializations.at(path)->serializeTextJSON(*typed_it->second, row_num, ostr, settings);
-        }
-        else if (auto dynamic_it = dynamic_paths.find(path); dynamic_it != dynamic_paths.end())
-        {
-            if (pretty)
-                dynamic_serialization->serializeTextJSONPretty(*dynamic_it->second, row_num, ostr, settings, indent + current_prefix.size() + 1);
-            else
-                dynamic_serialization->serializeTextJSON(*dynamic_it->second, row_num, ostr, settings);
-        }
-        else
-        {
-            /// To serialize value stored in shared data we should first deserialize it from binary format.
-            auto tmp_dynamic_column = ColumnDynamic::create();
-            tmp_dynamic_column->reserve(1);
-            column_object.deserializeValueFromSharedData(shared_data_values, index_in_shared_data_values++, *tmp_dynamic_column);
-
-            if (pretty)
-                dynamic_serialization->serializeTextJSONPretty(*tmp_dynamic_column, 0, ostr, settings, indent + current_prefix.size() + 1);
-            else
-                dynamic_serialization->serializeTextJSON(*tmp_dynamic_column, 0, ostr, settings);
-        }
-    }
-
-    /// Close all remaining open objects.
-    if (pretty)
-    {
-        writeChar('\n', ostr);
-        for (size_t i = 0; i != current_prefix.elements.size(); ++i)
-        {
-            writeChar(' ', (indent + current_prefix.size() - i) * 4, ostr);
-            writeCString("}\n", ostr);
-        }
-        writeChar(' ', indent * 4, ostr);
-        writeChar('}', ostr);
-    }
-    else
-    {
-        for (size_t i = 0; i != current_prefix.elements.size(); ++i)
-            writeChar('}', ostr);
-        writeChar('}', ostr);
-    }
-}
-
-template <typename Parser>
-void SerializationJSON<Parser>::deserializeTextImpl(IColumn & column, std::string_view object, const FormatSettings & settings) const
-{
-    typename Parser::Element document;
-    auto parser = parsers_pool.get([] { return new Parser; });
-    if (!parser->parse(object, document))
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot parse JSON object here: {}", object);
-
-    String error;
-    if (!json_extract_tree->insertResultToColumn(column, document, insert_settings, settings, error))
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot insert data into JSON column: {}", error);
-}
-
-template <typename Parser>
-void SerializationJSON<Parser>::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeTextImpl(column, row_num, ostr, settings);
-}
-
-template <typename Parser>
-void SerializationJSON<Parser>::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    String object;
-    readStringUntilEOF(object, istr);
-    deserializeTextImpl(column, object, settings);
-}
-
-template <typename Parser>
-void SerializationJSON<Parser>::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    WriteBufferFromOwnString buf;
-    serializeTextImpl(column, row_num, buf, settings);
-    writeEscapedString(buf.str(), ostr);
-}
-
-template <typename Parser>
-void SerializationJSON<Parser>::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    String object;
-    readEscapedString(object, istr);
-    deserializeTextImpl(column, object, settings);
-}
-
-template <typename Parser>
-void SerializationJSON<Parser>::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    WriteBufferFromOwnString buf;
-    serializeTextImpl(column, row_num, buf, settings);
-    writeQuotedString(buf.str(), ostr);
-}
-
-template <typename Parser>
-void SerializationJSON<Parser>::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    String object;
-    readQuotedString(object, istr);
-    deserializeTextImpl(column, object, settings);
-}
-
-template <typename Parser>
-void SerializationJSON<Parser>::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    WriteBufferFromOwnString buf;
-    serializeTextImpl(column, row_num, buf, settings);
-    writeCSVString(buf.str(), ostr);
-}
-
-template <typename Parser>
-void SerializationJSON<Parser>::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    String object;
-    readCSVString(object, istr, settings.csv);
-    deserializeTextImpl(column, object, settings);
-}
-
-template <typename Parser>
-void SerializationJSON<Parser>::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    WriteBufferFromOwnString buf;
-    serializeTextImpl(column, row_num, buf, settings);
-    writeXMLStringForTextElement(buf.str(), ostr);
-}
-
-template <typename Parser>
-void SerializationJSON<Parser>::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeTextImpl(column, row_num, ostr, settings);
-}
-
-template <typename Parser>
-void SerializationJSON<Parser>::serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const
-{
-    serializeTextImpl(column, row_num, ostr, settings, true, indent);
-}
-
-template <typename Parser>
-void SerializationJSON<Parser>::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    String object_buffer;
-    auto object_view = readJSONObjectAsViewPossiblyInvalid(istr, object_buffer);
-    deserializeTextImpl(column, object_view, settings);
-}
-
-#if USE_SIMDJSON
-template class SerializationJSON<SimdJSONParser>;
-#endif
-#if USE_RAPIDJSON
-template class SerializationJSON<RapidJSONParser>;
-#else
-template class SerializationJSON<DummyJSONParser>;
-#endif
-
-}
diff --git a/src/DataTypes/Serializations/SerializationJSON.h b/src/DataTypes/Serializations/SerializationJSON.h
deleted file mode 100644
index 934c94527f3..00000000000
--- a/src/DataTypes/Serializations/SerializationJSON.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once
-
-#include <DataTypes/Serializations/SerializationObject.h>
-#include <Formats/JSONExtractTree.h>
-#include <Common/ObjectPool.h>
-
-namespace DB
-{
-
-/// Class for text serialization/deserialization of the JSON data type.
-template <typename Parser>
-class SerializationJSON : public SerializationObject
-{
-public:
-    SerializationJSON(
-        std::unordered_map<String, SerializationPtr> typed_paths_serializations_,
-        const std::unordered_set<String> & paths_to_skip_,
-        const std::vector<String> & path_regexps_to_skip_,
-        std::unique_ptr<JSONExtractTreeNode<Parser>> json_extract_tree_);
-
-    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 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;
-
-    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;
-
-    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;
-
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
-    void serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const override;
-    void deserializeTextJSON(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;
-
-private:
-    void serializeTextImpl(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, bool pretty = false, size_t indent = 0) const;
-    void deserializeTextImpl(IColumn & column, std::string_view object, const FormatSettings & settings) const;
-
-    std::unique_ptr<JSONExtractTreeNode<Parser>> json_extract_tree;
-    JSONExtractInsertSettings insert_settings;
-    /// Pool of parser objects to make SerializationJSON thread safe.
-    mutable SimpleObjectPool<Parser> parsers_pool;
-};
-
-}
diff --git a/src/DataTypes/Serializations/SerializationLowCardinality.cpp b/src/DataTypes/Serializations/SerializationLowCardinality.cpp
index 3195a04d348..40071c4607a 100644
--- a/src/DataTypes/Serializations/SerializationLowCardinality.cpp
+++ b/src/DataTypes/Serializations/SerializationLowCardinality.cpp
@@ -268,16 +268,9 @@ void SerializationLowCardinality::serializeBinaryBulkStateSuffix(
 void SerializationLowCardinality::deserializeBinaryBulkStatePrefix(
     DeserializeBinaryBulkSettings & settings,
     DeserializeBinaryBulkStatePtr & state,
-    SubstreamsDeserializeStatesCache * cache) const
+    SubstreamsDeserializeStatesCache * /*cache*/) const
 {
     settings.path.push_back(Substream::DictionaryKeys);
-
-    if (auto cached_state = getFromSubstreamsDeserializeStatesCache(cache, settings.path))
-    {
-        state = std::move(cached_state);
-        return;
-    }
-
     auto * stream = settings.getter(settings.path);
     settings.path.pop_back();
 
diff --git a/src/DataTypes/Serializations/SerializationMap.cpp b/src/DataTypes/Serializations/SerializationMap.cpp
index c722b3ac7a1..0bef3c7d79d 100644
--- a/src/DataTypes/Serializations/SerializationMap.cpp
+++ b/src/DataTypes/Serializations/SerializationMap.cpp
@@ -40,7 +40,7 @@ static IColumn & extractNestedColumn(IColumn & column)
 
 void SerializationMap::serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings & settings) const
 {
-    const auto & map = field.safeGet<const Map &>();
+    const auto & map = field.get<const Map &>();
     writeVarUInt(map.size(), ostr);
     for (const auto & elem : map)
     {
@@ -63,7 +63,7 @@ void SerializationMap::deserializeBinary(Field & field, ReadBuffer & istr, const
             size,
             settings.binary.max_binary_string_size);
     field = Map();
-    Map & map = field.safeGet<Map &>();
+    Map & map = field.get<Map &>();
     map.reserve(size);
     for (size_t i = 0; i < size; ++i)
     {
diff --git a/src/DataTypes/Serializations/SerializationNumber.cpp b/src/DataTypes/Serializations/SerializationNumber.cpp
index bfc13af8ca3..bdb4dfc6735 100644
--- a/src/DataTypes/Serializations/SerializationNumber.cpp
+++ b/src/DataTypes/Serializations/SerializationNumber.cpp
@@ -169,7 +169,7 @@ template <typename T>
 void SerializationNumber<T>::serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings &) const
 {
     /// ColumnVector<T>::ValueType is a narrower type. For example, UInt8, when the Field type is UInt64
-    typename ColumnVector<T>::ValueType x = static_cast<typename ColumnVector<T>::ValueType>(field.safeGet<FieldType>());
+    typename ColumnVector<T>::ValueType x = static_cast<typename ColumnVector<T>::ValueType>(field.get<FieldType>());
     writeBinaryLittleEndian(x, ostr);
 }
 
diff --git a/src/DataTypes/Serializations/SerializationObject.cpp b/src/DataTypes/Serializations/SerializationObject.cpp
index 760f6ce750d..c6c87b5aa7b 100644
--- a/src/DataTypes/Serializations/SerializationObject.cpp
+++ b/src/DataTypes/Serializations/SerializationObject.cpp
@@ -1,793 +1,586 @@
 #include <DataTypes/Serializations/SerializationObject.h>
-#include <DataTypes/Serializations/SerializationObjectTypedPath.h>
-
-#include <Columns/ColumnObject.h>
-#include <DataTypes/DataTypeObject.h>
-#include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/Serializations/JSONDataParser.h>
+#include <DataTypes/Serializations/SerializationString.h>
 #include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/ObjectUtils.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <Common/JSONParsers/SimdJSONParser.h>
+#include <Common/JSONParsers/RapidJSONParser.h>
+#include <Columns/ColumnObject.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnString.h>
+
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/VarInt.h>
+#include <magic_enum.hpp>
+#include <memory>
+#include <string>
 
 namespace DB
 {
 
 namespace ErrorCodes
 {
+    extern const int NOT_IMPLEMENTED;
     extern const int INCORRECT_DATA;
-    extern const int LOGICAL_ERROR;
+    extern const int CANNOT_READ_ALL_DATA;
+    extern const int ARGUMENT_OUT_OF_BOUND;
+    extern const int CANNOT_PARSE_TEXT;
+    extern const int EXPERIMENTAL_FEATURE_ERROR;
 }
 
-SerializationObject::SerializationObject(
-    std::unordered_map<String, SerializationPtr> typed_path_serializations_,
-    const std::unordered_set<String> & paths_to_skip_,
-    const std::vector<String> & path_regexps_to_skip_)
-    : typed_path_serializations(std::move(typed_path_serializations_))
-    , paths_to_skip(paths_to_skip_)
-    , dynamic_serialization(std::make_shared<SerializationDynamic>())
-    , shared_data_serialization(getTypeOfSharedData()->getDefaultSerialization())
+template <typename Parser>
+template <typename Reader>
+void SerializationObject<Parser>::deserializeTextImpl(IColumn & column, Reader && reader) const
 {
-    /// We will need sorted order of typed paths to serialize them in order for consistency.
-    sorted_typed_paths.reserve(typed_path_serializations.size());
-    for (const auto & [path, _] : typed_path_serializations)
-        sorted_typed_paths.emplace_back(path);
-    std::sort(sorted_typed_paths.begin(), sorted_typed_paths.end());
-    sorted_paths_to_skip.assign(paths_to_skip.begin(), paths_to_skip.end());
-    std::sort(sorted_paths_to_skip.begin(), sorted_paths_to_skip.end());
-    for (const auto & regexp_str : path_regexps_to_skip_)
-        path_regexps_to_skip.emplace_back(regexp_str);
-}
+    auto & column_object = assert_cast<ColumnObject &>(column);
 
-const DataTypePtr & SerializationObject::getTypeOfSharedData()
-{
-    /// Array(Tuple(String, String))
-    static const DataTypePtr type = std::make_shared<DataTypeArray>(std::make_shared<DataTypeTuple>(DataTypes{std::make_shared<DataTypeString>(), std::make_shared<DataTypeString>()}, Names{"paths", "values"}));
-    return type;
-}
+    String buf;
+    reader(buf);
+    std::optional<ParseResult> result;
 
-bool SerializationObject::shouldSkipPath(const String & path) const
-{
-    if (paths_to_skip.contains(path))
-        return true;
-
-    auto it = std::lower_bound(sorted_paths_to_skip.begin(), sorted_paths_to_skip.end(), path);
-    if (it != sorted_paths_to_skip.end() && it != sorted_paths_to_skip.begin() && path.starts_with(*std::prev(it)))
-        return true;
-
-    for (const auto & regexp : path_regexps_to_skip)
+    /// Treat empty string as an empty object
+    /// for better CAST from String to Object.
+    if (!buf.empty())
     {
-        if (re2::RE2::FullMatch(path, regexp))
-            return true;
+        auto parser = parsers_pool.get([] { return new Parser; });
+        result = parser->parse(buf.data(), buf.size());
+    }
+    else
+    {
+        result = ParseResult{};
     }
 
-    return false;
-}
+    if (!result)
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot parse object");
 
-SerializationObject::ObjectSerializationVersion::ObjectSerializationVersion(UInt64 version) : value(static_cast<Value>(version))
-{
-    checkVersion(version);
-}
+    auto & [paths, values] = *result;
+    assert(paths.size() == values.size());
 
-void SerializationObject::ObjectSerializationVersion::checkVersion(UInt64 version)
-{
-    if (version != BASIC)
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Invalid version for Object structure serialization.");
-}
-
-struct SerializeBinaryBulkStateObject: public ISerialization::SerializeBinaryBulkState
-{
-    SerializationObject::ObjectSerializationVersion serialization_version;
-    size_t max_dynamic_paths;
-    std::vector<String> sorted_dynamic_paths;
-    std::unordered_map<String, ISerialization::SerializeBinaryBulkStatePtr> typed_path_states;
-    std::unordered_map<String, ISerialization::SerializeBinaryBulkStatePtr> dynamic_path_states;
-    ISerialization::SerializeBinaryBulkStatePtr shared_data_state;
-    /// Paths statistics.
-    ColumnObject::Statistics statistics;
-    /// If true, statistics will be recalculated during serialization.
-    bool recalculate_statistics = false;
-
-    explicit SerializeBinaryBulkStateObject(UInt64 serialization_version_)
-        : serialization_version(serialization_version_), statistics(ColumnObject::Statistics::Source::READ)
+    size_t old_column_size = column_object.size();
+    for (size_t i = 0; i < paths.size(); ++i)
     {
+        auto field_info = getFieldInfo(values[i]);
+        if (field_info.need_fold_dimension)
+            values[i] = applyVisitor(FieldVisitorFoldDimension(field_info.num_dimensions), std::move(values[i]));
+        if (isNothing(field_info.scalar_type))
+            continue;
+
+        if (!column_object.hasSubcolumn(paths[i]))
+        {
+            if (paths[i].hasNested())
+                column_object.addNestedSubcolumn(paths[i], field_info, old_column_size);
+            else
+                column_object.addSubcolumn(paths[i], old_column_size);
+        }
+
+        auto & subcolumn = column_object.getSubcolumn(paths[i]);
+        assert(subcolumn.size() == old_column_size);
+
+        subcolumn.insert(std::move(values[i]), std::move(field_info));
     }
+
+    /// Insert default values to missed subcolumns.
+    const auto & subcolumns = column_object.getSubcolumns();
+    for (const auto & entry : subcolumns)
+    {
+        if (entry->data.size() == old_column_size)
+        {
+            bool inserted = column_object.tryInsertDefaultFromNested(entry);
+            if (!inserted)
+                entry->data.insertDefault();
+        }
+    }
+
+    column_object.incrementNumRows();
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    deserializeTextImpl(column, [&](String & s) { readStringInto(s, istr); });
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeTextImpl(column, [&](String & s) { settings.tsv.crlf_end_of_line_input ? readEscapedStringCRLF(s, istr) : readEscapedString(s, istr); });
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    deserializeTextImpl(column, [&](String & s) { readQuotedStringInto<true>(s, istr); });
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    deserializeTextImpl(column, [&](String & s) { Parser::readJSON(s, istr); });
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeTextImpl(column, [&](String & s) { readCSVStringInto(s, istr, settings.csv); });
+}
+
+template <typename Parser>
+template <typename TSettings>
+void SerializationObject<Parser>::checkSerializationIsSupported(const TSettings & settings) const
+{
+    if (settings.position_independent_encoding)
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+            "DataTypeObject doesn't support serialization with position independent encoding");
+}
+
+template <typename Parser>
+struct SerializationObject<Parser>::SerializeStateObject : public ISerialization::SerializeBinaryBulkState
+{
+    DataTypePtr nested_type;
+    SerializationPtr nested_serialization;
+    SerializeBinaryBulkStatePtr nested_state;
 };
 
-struct DeserializeBinaryBulkStateObject : public ISerialization::DeserializeBinaryBulkState
+template <typename Parser>
+struct SerializationObject<Parser>::DeserializeStateObject : public ISerialization::DeserializeBinaryBulkState
 {
-    std::unordered_map<String, ISerialization::DeserializeBinaryBulkStatePtr> typed_path_states;
-    std::unordered_map<String, ISerialization::DeserializeBinaryBulkStatePtr> dynamic_path_states;
-    ISerialization::DeserializeBinaryBulkStatePtr shared_data_state;
-    ISerialization::DeserializeBinaryBulkStatePtr structure_state;
+    BinarySerializationKind kind;
+    DataTypePtr nested_type;
+    SerializationPtr nested_serialization;
+    DeserializeBinaryBulkStatePtr nested_state;
 };
 
-void SerializationObject::enumerateStreams(EnumerateStreamsSettings & settings, const StreamCallback & callback, const SubstreamData & data) const
-{
-    settings.path.push_back(Substream::ObjectStructure);
-    callback(settings.path);
-    settings.path.pop_back();
-
-    const auto * column_object = data.column ? &assert_cast<const ColumnObject &>(*data.column) : nullptr;
-    const auto * type_object = data.type ? &assert_cast<const DataTypeObject &>(*data.type) : nullptr;
-    const auto * deserialize_state = data.deserialize_state ? checkAndGetState<DeserializeBinaryBulkStateObject>(data.deserialize_state) : nullptr;
-    const auto * structure_state = deserialize_state ? checkAndGetState<DeserializeBinaryBulkStateObjectStructure>(deserialize_state->structure_state) : nullptr;
-    settings.path.push_back(Substream::ObjectData);
-
-    /// First, iterate over typed paths in sorted order, we will always serialize them.
-    for (const auto & path : sorted_typed_paths)
-    {
-        settings.path.back().creator = std::make_shared<TypedPathSubcolumnCreator>(path);
-        settings.path.push_back(Substream::ObjectTypedPath);
-        settings.path.back().object_path_name = path;
-        const auto & serialization = typed_path_serializations.at(path);
-        auto path_data = SubstreamData(serialization)
-                                .withType(type_object ? type_object->getTypedPaths().at(path) : nullptr)
-                                .withColumn(column_object ? column_object->getTypedPaths().at(path) : nullptr)
-                                .withSerializationInfo(data.serialization_info)
-                                .withDeserializeState(deserialize_state ? deserialize_state->typed_path_states.at(path) : nullptr);
-        settings.path.back().data = path_data;
-        serialization->enumerateStreams(settings, callback, path_data);
-        settings.path.pop_back();
-        settings.path.back().creator.reset();
-    }
-
-    /// If column or deserialization state was provided, iterate over dynamic paths,
-    if (settings.enumerate_dynamic_streams && (column_object || structure_state))
-    {
-        /// Enumerate dynamic paths in sorted order for consistency.
-        const auto * dynamic_paths = column_object ? &column_object->getDynamicPaths() : nullptr;
-        std::vector<String> sorted_dynamic_paths;
-        /// If we have deserialize_state we can take sorted dynamic paths list from it.
-        if (structure_state)
-        {
-            sorted_dynamic_paths = structure_state->sorted_dynamic_paths;
-        }
-        else
-        {
-            sorted_dynamic_paths.reserve(dynamic_paths->size());
-            for (const auto & [path, _] : *dynamic_paths)
-                sorted_dynamic_paths.push_back(path);
-            std::sort(sorted_dynamic_paths.begin(), sorted_dynamic_paths.end());
-        }
-
-        DataTypePtr dynamic_type = std::make_shared<DataTypeDynamic>();
-        for (const auto & path : sorted_dynamic_paths)
-        {
-            settings.path.push_back(Substream::ObjectDynamicPath);
-            settings.path.back().object_path_name = path;
-            auto path_data = SubstreamData(dynamic_serialization)
-                                 .withType(dynamic_type)
-                                 .withColumn(dynamic_paths ? dynamic_paths->at(path) : nullptr)
-                                 .withSerializationInfo(data.serialization_info)
-                                 .withDeserializeState(deserialize_state ? deserialize_state->dynamic_path_states.at(path) : nullptr);
-            settings.path.back().data = path_data;
-            dynamic_serialization->enumerateStreams(settings, callback, path_data);
-            settings.path.pop_back();
-        }
-    }
-
-    settings.path.push_back(Substream::ObjectSharedData);
-    auto shared_data_substream_data = SubstreamData(shared_data_serialization)
-                                          .withType(getTypeOfSharedData())
-                                          .withColumn(column_object ? column_object->getSharedDataPtr() : nullptr)
-                                          .withSerializationInfo(data.serialization_info)
-                                          .withDeserializeState(deserialize_state ? deserialize_state->shared_data_state : nullptr);
-    shared_data_serialization->enumerateStreams(settings, callback, shared_data_substream_data);
-    settings.path.pop_back();
-    settings.path.pop_back();
-}
-
-void SerializationObject::serializeBinaryBulkStatePrefix(
+template <typename Parser>
+void SerializationObject<Parser>::serializeBinaryBulkStatePrefix(
     const IColumn & column,
     SerializeBinaryBulkSettings & settings,
     SerializeBinaryBulkStatePtr & state) const
 {
+    checkSerializationIsSupported(settings);
+    if (state)
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+            "DataTypeObject doesn't support serialization with non-trivial state");
+
     const auto & column_object = assert_cast<const ColumnObject &>(column);
-    const auto & typed_paths = column_object.getTypedPaths();
-    const auto & dynamic_paths = column_object.getDynamicPaths();
-    const auto & shared_data = column_object.getSharedDataPtr();
+    if (!column_object.isFinalized())
+    {
+        auto finalized = column_object.cloneFinalized();
+        serializeBinaryBulkStatePrefix(*finalized, settings, state);
+        return;
+    }
+
+    settings.path.push_back(Substream::ObjectStructure);
+    auto * stream = settings.getter(settings.path);
+
+    if (!stream)
+        throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR, "Missing stream for kind of binary serialization");
+
+    auto [tuple_column, tuple_type] = unflattenObjectToTuple(column_object);
+
+    writeIntBinary(static_cast<UInt8>(BinarySerializationKind::TUPLE), *stream);
+    writeStringBinary(tuple_type->getName(), *stream);
+
+    auto state_object = std::make_shared<SerializeStateObject>();
+    state_object->nested_type = tuple_type;
+    state_object->nested_serialization = tuple_type->getDefaultSerialization();
+
+    settings.path.back() = Substream::ObjectData;
+    state_object->nested_serialization->serializeBinaryBulkStatePrefix(*tuple_column, settings, state_object->nested_state);
+
+    state = std::move(state_object);
+    settings.path.pop_back();
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::serializeBinaryBulkStateSuffix(
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    checkSerializationIsSupported(settings);
+    auto * state_object = checkAndGetState<SerializeStateObject>(state);
+
+    settings.path.push_back(Substream::ObjectData);
+    state_object->nested_serialization->serializeBinaryBulkStateSuffix(settings, state_object->nested_state);
+    settings.path.pop_back();
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::deserializeBinaryBulkStatePrefix(
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state,
+    SubstreamsDeserializeStatesCache * cache) const
+{
+    checkSerializationIsSupported(settings);
+    if (state)
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+            "DataTypeObject doesn't support serialization with non-trivial state");
 
     settings.path.push_back(Substream::ObjectStructure);
     auto * stream = settings.getter(settings.path);
     settings.path.pop_back();
 
     if (!stream)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Missing stream for Object column structure during serialization of binary bulk state prefix");
+        throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA,
+            "Cannot read kind of binary serialization of DataTypeObject, because its stream is missing");
 
-    /// Write serialization version.
-    UInt64 serialization_version = ObjectSerializationVersion::Value::BASIC;
-    writeBinaryLittleEndian(serialization_version, *stream);
+    UInt8 kind_raw;
+    readIntBinary(kind_raw, *stream);
+    auto kind = magic_enum::enum_cast<BinarySerializationKind>(kind_raw);
+    if (!kind)
+        throw Exception(ErrorCodes::INCORRECT_DATA,
+            "Unknown binary serialization kind of Object: {}", std::to_string(kind_raw));
 
-    auto object_state = std::make_shared<SerializeBinaryBulkStateObject>(serialization_version);
-    object_state->max_dynamic_paths = column_object.getMaxDynamicPaths();
-    /// Write max_dynamic_paths parameter.
-    writeVarUInt(object_state->max_dynamic_paths, *stream);
-    /// Write all dynamic paths in sorted order.
-    object_state->sorted_dynamic_paths.reserve(dynamic_paths.size());
-    for (const auto & [path, _] : dynamic_paths)
-        object_state->sorted_dynamic_paths.push_back(path);
-    std::sort(object_state->sorted_dynamic_paths.begin(), object_state->sorted_dynamic_paths.end());
-    writeVarUInt(object_state->sorted_dynamic_paths.size(), *stream);
-    for (const auto & path : object_state->sorted_dynamic_paths)
-        writeStringBinary(path, *stream);
+    auto state_object = std::make_shared<DeserializeStateObject>();
+    state_object->kind = *kind;
 
-    /// Write statistics in prefix if needed.
-    if (settings.object_and_dynamic_write_statistics == SerializeBinaryBulkSettings::ObjectAndDynamicStatisticsMode::PREFIX)
+    if (state_object->kind == BinarySerializationKind::TUPLE)
     {
-        const auto & statistics = column_object.getStatistics();
-        /// First, write statistics for dynamic paths.
-        for (const auto & path : object_state->sorted_dynamic_paths)
-        {
-            size_t number_of_non_null_values = 0;
-            /// Check if we can use statistics stored in the column. There are 2 possible sources
-            /// of this statistics:
-            ///   - statistics calculated during merge of some data parts (Statistics::Source::MERGE)
-            ///   - statistics read from the data part during deserialization of Object column (Statistics::Source::READ).
-            /// We can rely only on statistics calculated during the merge, because column with statistics that was read
-            /// during deserialization from some data part could be filtered/limited/transformed/etc and so the statistics can be outdated.
-            if (statistics && statistics->source == ColumnObject::Statistics::Source::MERGE)
-                number_of_non_null_values = statistics->dynamic_paths_statistics.at(path);
-            /// Otherwise we can use only path column from current object column.
-            else
-                number_of_non_null_values = (dynamic_paths.at(path)->size() - dynamic_paths.at(path)->getNumberOfDefaultRows());
-            writeVarUInt(number_of_non_null_values, *stream);
-        }
+        String data_type_name;
+        readStringBinary(data_type_name, *stream);
+        state_object->nested_type = DataTypeFactory::instance().get(data_type_name);
+        state_object->nested_serialization = state_object->nested_type->getDefaultSerialization();
 
-        /// Second, write statistics for paths in shared data.
-        /// Check if we have statistics calculated during merge of some data parts (Statistics::Source::MERGE).
-        if (statistics && statistics->source == ColumnObject::Statistics::Source::MERGE)
-        {
-            writeVarUInt(statistics->shared_data_paths_statistics.size(), *stream);
-            for (const auto & [path, size] : statistics->shared_data_paths_statistics)
-            {
-                writeStringBinary(path, *stream);
-                writeVarUInt(size, *stream);
-            }
-        }
-        /// If we don't have statistics for shared data from merge, calculate it from the column.
-        else
-        {
-            std::unordered_map<String, size_t, StringHashForHeterogeneousLookup, StringHashForHeterogeneousLookup::transparent_key_equal> shared_data_paths_statistics;
-            const auto [shared_data_paths, _] = column_object.getSharedDataPathsAndValues();
-            for (size_t i = 0; i != shared_data_paths->size(); ++i)
-            {
-                auto path = shared_data_paths->getDataAt(i).toView();
-                if (auto it = shared_data_paths_statistics.find(path); it != shared_data_paths_statistics.end())
-                    ++it->second;
-                else if (shared_data_paths_statistics.size() < ColumnObject::Statistics::MAX_SHARED_DATA_STATISTICS_SIZE)
-                    shared_data_paths_statistics.emplace(path, 1);
-            }
-
-            writeVarUInt(shared_data_paths_statistics.size(), *stream);
-            for (const auto & [path, size] : shared_data_paths_statistics)
-            {
-                writeStringBinary(path, *stream);
-                writeVarUInt(size, *stream);
-            }
-        }
+        if (!isTuple(state_object->nested_type))
+            throw Exception(ErrorCodes::INCORRECT_DATA,
+                "Data of type Object should be written as Tuple, got: {}", data_type_name);
+    }
+    else if (state_object->kind == BinarySerializationKind::STRING)
+    {
+        state_object->nested_type = std::make_shared<DataTypeString>();
+        state_object->nested_serialization = std::make_shared<SerializationString>();
     }
-    /// Otherwise statistics will be written in the suffix, in this case we will recalculate
-    /// statistics during serialization to make it more precise.
     else
     {
-        object_state->recalculate_statistics = true;
+        throw Exception(ErrorCodes::INCORRECT_DATA,
+            "Unknown binary serialization kind of Object: {}", std::to_string(kind_raw));
     }
 
     settings.path.push_back(Substream::ObjectData);
-
-    for (const auto & path : sorted_typed_paths)
-    {
-        settings.path.push_back(Substream::ObjectTypedPath);
-        settings.path.back().object_path_name = path;
-        typed_path_serializations.at(path)->serializeBinaryBulkStatePrefix(*typed_paths.at(path), settings, object_state->typed_path_states[path]);
-        settings.path.pop_back();
-    }
-
-    for (const auto & path : object_state->sorted_dynamic_paths)
-    {
-        settings.path.push_back(Substream::ObjectDynamicPath);
-        settings.path.back().object_path_name = path;
-        dynamic_serialization->serializeBinaryBulkStatePrefix(*dynamic_paths.at(path), settings, object_state->dynamic_path_states[path]);
-        settings.path.pop_back();
-    }
-
-    settings.path.push_back(Substream::ObjectSharedData);
-    shared_data_serialization->serializeBinaryBulkStatePrefix(*shared_data, settings, object_state->shared_data_state);
-    settings.path.pop_back();
+    state_object->nested_serialization->deserializeBinaryBulkStatePrefix(settings, state_object->nested_state, cache);
     settings.path.pop_back();
 
-    state = std::move(object_state);
+    state = std::move(state_object);
 }
 
-void SerializationObject::deserializeBinaryBulkStatePrefix(
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state,
-    SubstreamsDeserializeStatesCache * cache) const
-{
-    auto structure_state = deserializeObjectStructureStatePrefix(settings, cache);
-    if (!structure_state)
-        return;
-
-    auto object_state = std::make_shared<DeserializeBinaryBulkStateObject>();
-    object_state->structure_state = std::move(structure_state);
-
-    settings.path.push_back(Substream::ObjectData);
-
-    for (const auto & path : sorted_typed_paths)
-    {
-        settings.path.push_back(Substream::ObjectTypedPath);
-        settings.path.back().object_path_name = path;
-        typed_path_serializations.at(path)->deserializeBinaryBulkStatePrefix(settings, object_state->typed_path_states[path], cache);
-        settings.path.pop_back();
-    }
-
-    const auto & sorted_dynamic_paths = checkAndGetState<DeserializeBinaryBulkStateObjectStructure>(object_state->structure_state)->sorted_dynamic_paths;
-    for (const auto & path : sorted_dynamic_paths)
-    {
-        settings.path.push_back(Substream::ObjectDynamicPath);
-        settings.path.back().object_path_name = path;
-        dynamic_serialization->deserializeBinaryBulkStatePrefix(settings, object_state->dynamic_path_states[path], cache);
-        settings.path.pop_back();
-    }
-
-    settings.path.push_back(Substream::ObjectSharedData);
-    shared_data_serialization->deserializeBinaryBulkStatePrefix(settings, object_state->shared_data_state, cache);
-    settings.path.pop_back();
-    settings.path.pop_back();
-
-    state = std::move(object_state);
-}
-
-ISerialization::DeserializeBinaryBulkStatePtr SerializationObject::deserializeObjectStructureStatePrefix(
-    DeserializeBinaryBulkSettings & settings, SubstreamsDeserializeStatesCache * cache)
-{
-    settings.path.push_back(Substream::ObjectStructure);
-
-    DeserializeBinaryBulkStatePtr state = nullptr;
-    /// Check if we already deserialized this state. It can happen when we read both object column and its subcolumns.
-    if (auto cached_state = getFromSubstreamsDeserializeStatesCache(cache, settings.path))
-    {
-        state = cached_state;
-    }
-    else if (auto * structure_stream = settings.getter(settings.path))
-    {
-        /// Read structure serialization version.
-        UInt64 serialization_version;
-        readBinaryLittleEndian(serialization_version, *structure_stream);
-        auto structure_state = std::make_shared<DeserializeBinaryBulkStateObjectStructure>(serialization_version);
-        /// Read max_dynamic_paths parameter.
-        readVarUInt(structure_state->max_dynamic_paths, *structure_stream);
-        /// Read the sorted list of dynamic paths.
-        size_t dynamic_paths_size;
-        readVarUInt(dynamic_paths_size, *structure_stream);
-        structure_state->sorted_dynamic_paths.reserve(dynamic_paths_size);
-        structure_state->dynamic_paths.reserve(dynamic_paths_size);
-        for (size_t i = 0; i != dynamic_paths_size; ++i)
-        {
-            structure_state->sorted_dynamic_paths.emplace_back();
-            readStringBinary(structure_state->sorted_dynamic_paths.back(), *structure_stream);
-            structure_state->dynamic_paths.insert(structure_state->sorted_dynamic_paths.back());
-        }
-
-        /// Read statistics if needed.
-        if (settings.object_and_dynamic_read_statistics)
-        {
-            ColumnObject::Statistics statistics(ColumnObject::Statistics::Source::READ);
-            statistics.dynamic_paths_statistics.reserve(structure_state->sorted_dynamic_paths.size());
-            /// First, read dynamic paths statistics.
-            for (const auto & path : structure_state->sorted_dynamic_paths)
-                readVarUInt(statistics.dynamic_paths_statistics[path], *structure_stream);
-
-            /// Second, read shared data paths statistics.
-            size_t size;
-            readVarUInt(size, *structure_stream);
-            statistics.shared_data_paths_statistics.reserve(size);
-            String path;
-            for (size_t i = 0; i != size; ++i)
-            {
-                readStringBinary(path, *structure_stream);
-                readVarUInt(statistics.shared_data_paths_statistics[path], *structure_stream);
-            }
-
-            structure_state->statistics = std::make_shared<const ColumnObject::Statistics>(std::move(statistics));
-        }
-
-        state = std::move(structure_state);
-        addToSubstreamsDeserializeStatesCache(cache, settings.path, state);
-    }
-
-    settings.path.pop_back();
-    return state;
-}
-
-void SerializationObject::serializeBinaryBulkWithMultipleStreams(
+template <typename Parser>
+void SerializationObject<Parser>::serializeBinaryBulkWithMultipleStreams(
     const IColumn & column,
     size_t offset,
     size_t limit,
     SerializeBinaryBulkSettings & settings,
     SerializeBinaryBulkStatePtr & state) const
 {
+    checkSerializationIsSupported(settings);
     const auto & column_object = assert_cast<const ColumnObject &>(column);
-    const auto & typed_paths = column_object.getTypedPaths();
-    const auto & dynamic_paths = column_object.getDynamicPaths();
-    const auto & shared_data = column_object.getSharedDataPtr();
-    auto * object_state = checkAndGetState<SerializeBinaryBulkStateObject>(state);
+    auto * state_object = checkAndGetState<SerializeStateObject>(state);
 
-    if (column_object.getMaxDynamicPaths() != object_state->max_dynamic_paths)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Mismatch of max_dynamic_paths parameter of Object. Expected: {}, Got: {}", object_state->max_dynamic_paths, column_object.getMaxDynamicPaths());
-
-    if (column_object.getDynamicPaths().size() != object_state->sorted_dynamic_paths.size())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Mismatch of number of dynamic paths in Object. Expected: {}, Got: {}", object_state->sorted_dynamic_paths.size(), column_object.getDynamicPaths().size());
-
-    settings.path.push_back(Substream::ObjectData);
-
-    for (const auto & path : sorted_typed_paths)
+    if (!column_object.isFinalized())
     {
-        settings.path.push_back(Substream::ObjectTypedPath);
-        settings.path.back().object_path_name = path;
-        typed_path_serializations.at(path)->serializeBinaryBulkWithMultipleStreams(*typed_paths.at(path), offset, limit, settings, object_state->typed_path_states[path]);
-        settings.path.pop_back();
+        auto finalized = column_object.cloneFinalized();
+        serializeBinaryBulkWithMultipleStreams(*finalized, offset, limit, settings, state);
+        return;
     }
 
-    const auto * dynamic_serialization_typed = assert_cast<const SerializationDynamic *>(dynamic_serialization.get());
-    for (const auto & path : object_state->sorted_dynamic_paths)
+    auto [tuple_column, tuple_type] = unflattenObjectToTuple(column_object);
+
+    if (!state_object->nested_type->equals(*tuple_type))
     {
-        settings.path.push_back(Substream::ObjectDynamicPath);
-        settings.path.back().object_path_name = path;
-        auto it = dynamic_paths.find(path);
-        if (it == dynamic_paths.end())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Dynamic structure mismatch for Object column: dynamic path '{}' is not found in the column", path);
-        if (object_state->recalculate_statistics)
-        {
-            size_t number_of_non_null_values = 0;
-            dynamic_serialization_typed->serializeBinaryBulkWithMultipleStreamsAndCountTotalSizeOfVariants(*it->second, offset, limit, settings, object_state->dynamic_path_states[path], number_of_non_null_values);
-            object_state->statistics.dynamic_paths_statistics[path] += number_of_non_null_values;
-        }
-        else
-        {
-            dynamic_serialization_typed->serializeBinaryBulkWithMultipleStreams(*it->second, offset, limit, settings, object_state->dynamic_path_states[path]);
-        }
-        settings.path.pop_back();
-    }
-
-    settings.path.push_back(Substream::ObjectSharedData);
-    shared_data_serialization->serializeBinaryBulkWithMultipleStreams(*shared_data, offset, limit, settings, object_state->shared_data_state);
-    if (object_state->recalculate_statistics)
-    {
-        /// Calculate statistics for paths in shared data.
-        const auto [shared_data_paths, _] = column_object.getSharedDataPathsAndValues();
-        const auto & shared_data_offsets = column_object.getSharedDataOffsets();
-        size_t start = shared_data_offsets[offset - 1];
-        size_t end = limit == 0 || offset + limit > shared_data_offsets.size() ? shared_data_paths->size() : shared_data_offsets[offset + limit - 1];
-        for (size_t i = start; i != end; ++i)
-        {
-            auto path = shared_data_paths->getDataAt(i).toView();
-            if (auto it = object_state->statistics.shared_data_paths_statistics.find(path); it != object_state->statistics.shared_data_paths_statistics.end())
-                ++it->second;
-            else if (object_state->statistics.shared_data_paths_statistics.size() < ColumnObject::Statistics::MAX_SHARED_DATA_STATISTICS_SIZE)
-                object_state->statistics.shared_data_paths_statistics.emplace(path, 1);
-        }
-    }
-    settings.path.pop_back();
-    settings.path.pop_back();
-}
-
-void SerializationObject::serializeBinaryBulkStateSuffix(
-    SerializeBinaryBulkSettings & settings, SerializeBinaryBulkStatePtr & state) const
-{
-    auto * object_state = checkAndGetState<SerializeBinaryBulkStateObject>(state);
-    settings.path.push_back(Substream::ObjectStructure);
-    auto * stream = settings.getter(settings.path);
-    settings.path.pop_back();
-
-    if (!stream)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Missing stream for Object column structure during serialization of binary bulk state suffix");
-
-    /// Write statistics in suffix if needed.
-    if (settings.object_and_dynamic_write_statistics == SerializeBinaryBulkSettings::ObjectAndDynamicStatisticsMode::SUFFIX)
-    {
-        /// First, write dynamic paths statistics.
-        for (const auto & path : object_state->sorted_dynamic_paths)
-            writeVarUInt(object_state->statistics.dynamic_paths_statistics[path], *stream);
-
-        /// Second, write shared data paths statistics.
-        writeVarUInt(object_state->statistics.shared_data_paths_statistics.size(), *stream);
-        for (const auto & [path, size] : object_state->statistics.shared_data_paths_statistics)
-        {
-            writeStringBinary(path, *stream);
-            writeVarUInt(size, *stream);
-        }
+        throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR,
+            "Types of internal column of Object mismatched. Expected: {}, Got: {}",
+            state_object->nested_type->getName(), tuple_type->getName());
     }
 
     settings.path.push_back(Substream::ObjectData);
-
-    for (const auto & path : sorted_typed_paths)
+    if (auto * stream = settings.getter(settings.path))
     {
-        settings.path.push_back(Substream::ObjectTypedPath);
-        settings.path.back().object_path_name = path;
-        typed_path_serializations.at(path)->serializeBinaryBulkStateSuffix(settings, object_state->typed_path_states[path]);
-        settings.path.pop_back();
+        state_object->nested_serialization->serializeBinaryBulkWithMultipleStreams(
+            *tuple_column, offset, limit, settings, state_object->nested_state);
     }
 
-    for (const auto & path : object_state->sorted_dynamic_paths)
-    {
-        settings.path.push_back(Substream::ObjectDynamicPath);
-        settings.path.back().object_path_name = path;
-        dynamic_serialization->serializeBinaryBulkStateSuffix(settings, object_state->dynamic_path_states[path]);
-        settings.path.pop_back();
-    }
-
-    settings.path.push_back(Substream::ObjectSharedData);
-    shared_data_serialization->serializeBinaryBulkStateSuffix(settings, object_state->shared_data_state);
-    settings.path.pop_back();
     settings.path.pop_back();
 }
 
-void SerializationObject::deserializeBinaryBulkWithMultipleStreams(
+template <typename Parser>
+void SerializationObject<Parser>::deserializeBinaryBulkWithMultipleStreams(
     ColumnPtr & column,
     size_t limit,
     DeserializeBinaryBulkSettings & settings,
     DeserializeBinaryBulkStatePtr & state,
     SubstreamsCache * cache) const
 {
-    if (!state)
-        return;
+    checkSerializationIsSupported(settings);
+    if (!column->empty())
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+            "DataTypeObject cannot be deserialized to non-empty column");
 
-    auto * object_state = checkAndGetState<DeserializeBinaryBulkStateObject>(state);
-    auto * structure_state = checkAndGetState<DeserializeBinaryBulkStateObjectStructure>(object_state->structure_state);
     auto mutable_column = column->assumeMutable();
     auto & column_object = assert_cast<ColumnObject &>(*mutable_column);
-    /// If it's a new object column, set dynamic paths and statistics.
-    if (column_object.empty())
-    {
-        column_object.setMaxDynamicPaths(structure_state->max_dynamic_paths);
-        column_object.setDynamicPaths(structure_state->sorted_dynamic_paths);
-        column_object.setStatistics(structure_state->statistics);
-    }
-
-    auto & typed_paths = column_object.getTypedPaths();
-    auto & dynamic_paths = column_object.getDynamicPaths();
-    auto & shared_data = column_object.getSharedDataPtr();
+    auto * state_object = checkAndGetState<DeserializeStateObject>(state);
 
     settings.path.push_back(Substream::ObjectData);
-    for (const auto & path : sorted_typed_paths)
-    {
-        settings.path.push_back(Substream::ObjectTypedPath);
-        settings.path.back().object_path_name = path;
-        typed_path_serializations.at(path)->deserializeBinaryBulkWithMultipleStreams(typed_paths[path], limit, settings, object_state->typed_path_states[path], cache);
-        settings.path.pop_back();
-    }
+    if (state_object->kind == BinarySerializationKind::STRING)
+        deserializeBinaryBulkFromString(column_object, limit, settings, *state_object, cache);
+    else
+        deserializeBinaryBulkFromTuple(column_object, limit, settings, *state_object, cache);
 
-    for (const auto & path : structure_state->sorted_dynamic_paths)
-    {
-        settings.path.push_back(Substream::ObjectDynamicPath);
-        settings.path.back().object_path_name = path;
-        dynamic_serialization->deserializeBinaryBulkWithMultipleStreams(dynamic_paths[path], limit, settings, object_state->dynamic_path_states[path], cache);
-        settings.path.pop_back();
-    }
-
-    settings.path.push_back(Substream::ObjectSharedData);
-    shared_data_serialization->deserializeBinaryBulkWithMultipleStreams(shared_data, limit, settings, object_state->shared_data_state, cache);
-    settings.path.pop_back();
     settings.path.pop_back();
+    column_object.checkConsistency();
+    column_object.finalize();
+    column = std::move(mutable_column);
 }
 
-void SerializationObject::serializeBinary(const Field & field, WriteBuffer & ostr, const DB::FormatSettings & settings) const
+template <typename Parser>
+void SerializationObject<Parser>::deserializeBinaryBulkFromString(
+    ColumnObject & column_object,
+    size_t limit,
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeStateObject & state,
+    SubstreamsCache * cache) const
 {
-    const auto & object = field.safeGet<Object>();
-    /// Serialize number of paths and then pairs (path, value).
-    writeVarUInt(object.size(), ostr);
-    for (const auto & [path, value] : object)
+    ColumnPtr column_string = state.nested_type->createColumn();
+    state.nested_serialization->deserializeBinaryBulkWithMultipleStreams(
+        column_string, limit, settings, state.nested_state, cache);
+
+    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)
     {
-        writeStringBinary(path, ostr);
-        if (auto it = typed_path_serializations.find(path); it != typed_path_serializations.end())
-            it->second->serializeBinary(value, ostr, settings);
+        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>
+void SerializationObject<Parser>::deserializeBinaryBulkFromTuple(
+    ColumnObject & column_object,
+    size_t limit,
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeStateObject & state,
+    SubstreamsCache * cache) const
+{
+    ColumnPtr column_tuple = state.nested_type->createColumn();
+    state.nested_serialization->deserializeBinaryBulkWithMultipleStreams(
+        column_tuple, limit, settings, state.nested_state, cache);
+
+    auto [tuple_paths, tuple_types] = flattenTuple(state.nested_type);
+    auto flattened_tuple = flattenTuple(column_tuple);
+    const auto & tuple_columns = assert_cast<const ColumnTuple &>(*flattened_tuple).getColumns();
+
+    assert(tuple_paths.size() == tuple_types.size());
+    size_t num_subcolumns = tuple_paths.size();
+
+    if (tuple_columns.size() != num_subcolumns)
+        throw Exception(ErrorCodes::INCORRECT_DATA,
+            "Inconsistent type ({}) and column ({}) while reading column of type Object",
+            state.nested_type->getName(), column_tuple->getName());
+
+    for (size_t i = 0; i < num_subcolumns; ++i)
+        column_object.addSubcolumn(tuple_paths[i], tuple_columns[i]->assumeMutable());
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::serializeBinary(const Field &, WriteBuffer &, const FormatSettings &) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented for SerializationObject");
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::deserializeBinary(Field &, ReadBuffer &, const FormatSettings &) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented for SerializationObject");
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::serializeBinary(const IColumn &, size_t, WriteBuffer &, const FormatSettings &) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented for SerializationObject");
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::deserializeBinary(IColumn &, ReadBuffer &, const FormatSettings &) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented for SerializationObject");
+}
+
+/// TODO: use format different of JSON in serializations.
+
+template <typename Parser>
+void SerializationObject<Parser>::serializeTextImpl(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const auto & column_object = assert_cast<const ColumnObject &>(column);
+    const auto & subcolumns = column_object.getSubcolumns();
+
+    writeChar('{', ostr);
+    for (auto it = subcolumns.begin(); it != subcolumns.end(); ++it)
+    {
+        const auto & entry = *it;
+        if (it != subcolumns.begin())
+            writeCString(",", ostr);
+
+        writeDoubleQuoted(entry->path.getPath(), ostr);
+        writeChar(':', ostr);
+        serializeTextFromSubcolumn(entry->data, row_num, ostr, settings);
+    }
+    writeChar('}', ostr);
+}
+
+template <typename Parser>
+template <bool pretty_json>
+void SerializationObject<Parser>::serializeTextFromSubcolumn(
+    const ColumnObject::Subcolumn & subcolumn, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const
+{
+    const auto & least_common_type = subcolumn.getLeastCommonType();
+
+    if (subcolumn.isFinalized())
+    {
+        const auto & finalized_column = subcolumn.getFinalizedColumn();
+        auto info = least_common_type->getSerializationInfo(finalized_column);
+        auto serialization = least_common_type->getSerialization(*info);
+        if constexpr (pretty_json)
+            serialization->serializeTextJSONPretty(finalized_column, row_num, ostr, settings, indent);
         else
-            dynamic_serialization->serializeBinary(value, ostr, settings);
-    }
-}
-
-void SerializationObject::serializeBinary(const IColumn & col, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    const auto & column_object = assert_cast<const ColumnObject &>(col);
-    const auto & typed_paths = column_object.getTypedPaths();
-    const auto & dynamic_paths = column_object.getDynamicPaths();
-    const auto & shared_data_offsets = column_object.getSharedDataOffsets();
-    size_t offset = shared_data_offsets[ssize_t(row_num) - 1];
-    size_t end = shared_data_offsets[ssize_t(row_num)];
-
-    /// Serialize number of paths and then pairs (path, value).
-    writeVarUInt(typed_paths.size() + dynamic_paths.size() + (end - offset), ostr);
-
-    for (const auto & [path, column] : typed_paths)
-    {
-        writeStringBinary(path, ostr);
-        typed_path_serializations.at(path)->serializeBinary(*column, row_num, ostr, settings);
+            serialization->serializeTextJSON(finalized_column, row_num, ostr, settings);
+        return;
     }
 
-    for (const auto & [path, column] : dynamic_paths)
+    size_t ind = row_num;
+    if (ind < subcolumn.getNumberOfDefaultsInPrefix())
     {
-        writeStringBinary(path, ostr);
-        dynamic_serialization->serializeBinary(*column, row_num, ostr, settings);
-    }
+        /// Suboptimal, but it should happen rarely.
+        auto tmp_column = subcolumn.getLeastCommonType()->createColumn();
+        tmp_column->insertDefault();
 
-    const auto [shared_data_paths, shared_data_values] = column_object.getSharedDataPathsAndValues();
-    for (size_t i = offset; i != end; ++i)
-    {
-        writeStringBinary(shared_data_paths->getDataAt(i), ostr);
-        auto value = shared_data_values->getDataAt(i);
-        ostr.write(value.data, value.size);
-    }
-}
-
-void SerializationObject::deserializeBinary(Field & field, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    Object object;
-    size_t number_of_paths;
-    readVarUInt(number_of_paths, istr);
-    /// Read pairs (path, value).
-    for (size_t i = 0; i != number_of_paths; ++i)
-    {
-        String path;
-        readStringBinary(path, istr);
-        if (!shouldSkipPath(path))
-        {
-            if (auto it = typed_path_serializations.find(path); it != typed_path_serializations.end())
-                it->second->deserializeBinary(object[path], istr, settings);
-            else
-                dynamic_serialization->deserializeBinary(object[path], istr, settings);
-        }
+        auto info = least_common_type->getSerializationInfo(*tmp_column);
+        auto serialization = least_common_type->getSerialization(*info);
+        if constexpr (pretty_json)
+            serialization->serializeTextJSONPretty(*tmp_column, 0, ostr, settings, indent);
         else
+            serialization->serializeTextJSON(*tmp_column, 0, ostr, settings);
+        return;
+    }
+
+    ind -= subcolumn.getNumberOfDefaultsInPrefix();
+    for (const auto & part : subcolumn.getData())
+    {
+        if (ind < part->size())
         {
-            /// Skip value of this path.
-            Field tmp;
-            dynamic_serialization->deserializeBinary(tmp, istr, settings);
-        }
-    }
-
-    field = std::move(object);
-}
-
-/// Restore column object to the state with previous size.
-/// We can use it in case of an exception during deserialization.
-void SerializationObject::restoreColumnObject(ColumnObject & column_object, size_t prev_size)
-{
-    auto & typed_paths = column_object.getTypedPaths();
-    auto & dynamic_paths = column_object.getDynamicPaths();
-    auto [shared_data_paths, shared_data_values] = column_object.getSharedDataPathsAndValues();
-    auto & shared_data_offsets = column_object.getSharedDataOffsets();
-
-    for (auto & [_, column] : typed_paths)
-    {
-        if (column->size() > prev_size)
-            column->popBack(column->size() - prev_size);
-    }
-
-    for (auto & [_, column] : dynamic_paths)
-    {
-        if (column->size() > prev_size)
-            column->popBack(column->size() - prev_size);
-    }
-
-    if (shared_data_offsets.size() > prev_size)
-        shared_data_offsets.resize(prev_size);
-    size_t prev_shared_data_offset = shared_data_offsets.back();
-    if (shared_data_paths->size() > prev_shared_data_offset)
-        shared_data_paths->popBack(shared_data_paths->size() - prev_shared_data_offset);
-    if (shared_data_values->size() > prev_shared_data_offset)
-        shared_data_values->popBack(shared_data_values->size() - prev_shared_data_offset);
-}
-
-void SerializationObject::deserializeBinary(IColumn & col, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    auto & column_object = assert_cast<ColumnObject &>(col);
-    auto & typed_paths = column_object.getTypedPaths();
-    auto & dynamic_paths = column_object.getDynamicPaths();
-    auto [shared_data_paths, shared_data_values] = column_object.getSharedDataPathsAndValues();
-    auto & shared_data_offsets = column_object.getSharedDataOffsets();
-
-    size_t number_of_paths;
-    readVarUInt(number_of_paths, istr);
-    std::vector<std::pair<String, String>> paths_and_values_for_shared_data;
-    size_t prev_size = column_object.size();
-    try
-    {
-        /// Read pairs (path, value).
-        for (size_t i = 0; i != number_of_paths; ++i)
-        {
-            String path;
-            readStringBinary(path, istr);
-            if (!shouldSkipPath(path))
-            {
-                /// Check if we have this path in typed paths.
-                if (auto typed_it = typed_path_serializations.find(path); typed_it != typed_path_serializations.end())
-                {
-                    auto & typed_column = typed_paths[path];
-                    /// Check if we already had this path.
-                    if (typed_column->size() > prev_size)
-                    {
-                        if (!settings.json.type_json_skip_duplicated_paths)
-                            throw Exception(ErrorCodes::INCORRECT_DATA, "Found duplicated path during binary deserialization of JSON type: {}. You can enable setting type_json_skip_duplicated_paths to skip duplicated paths during insert", path);
-                    }
-                    else
-                    {
-                        typed_it->second->deserializeBinary(*typed_column, istr, settings);
-                    }
-                }
-                /// Check if we have this path in dynamic paths.
-                else if (auto dynamic_it = dynamic_paths.find(path); dynamic_it != dynamic_paths.end())
-                {
-                    /// Check if we already had this path.
-                    if (dynamic_it->second->size() > prev_size)
-                    {
-                        if (!settings.json.type_json_skip_duplicated_paths)
-                            throw Exception(ErrorCodes::INCORRECT_DATA, "Found duplicated path during binary deserialization of JSON type: {}. You can enable setting type_json_skip_duplicated_paths to skip duplicated paths during insert", path);
-                    }
-
-                    dynamic_serialization->deserializeBinary(*dynamic_it->second, istr, settings);
-                }
-                /// Try to add a new dynamic paths.
-                else if (auto * dynamic_column = column_object.tryToAddNewDynamicPath(path))
-                {
-                    dynamic_serialization->deserializeBinary(*dynamic_column, istr, settings);
-                }
-                /// Otherwise this path should go to shared data.
-                else
-                {
-                    auto tmp_dynamic_column = ColumnDynamic::create();
-                    tmp_dynamic_column->reserve(1);
-                    String value;
-                    readParsedValueIntoString(value, istr, [&](ReadBuffer & buf){ dynamic_serialization->deserializeBinary(*tmp_dynamic_column, buf, settings); });
-                    paths_and_values_for_shared_data.emplace_back(std::move(path), std::move(value));
-                }
-            }
+            auto part_type = getDataTypeByColumn(*part);
+            auto info = part_type->getSerializationInfo(*part);
+            auto serialization = part_type->getSerialization(*info);
+            if constexpr (pretty_json)
+                serialization->serializeTextJSONPretty(*part, ind, ostr, settings, indent);
             else
-            {
-                /// Skip value of this path.
-                Field tmp;
-                dynamic_serialization->deserializeBinary(tmp, istr, settings);
-            }
+                serialization->serializeTextJSON(*part, ind, ostr, settings);
+            return;
         }
 
-        std::sort(paths_and_values_for_shared_data.begin(), paths_and_values_for_shared_data.end());
-        for (size_t i = 0; i != paths_and_values_for_shared_data.size(); ++i)
-        {
-            const auto & [path, value] = paths_and_values_for_shared_data[i];
-            if (i != 0 && path == paths_and_values_for_shared_data[i - 1].first)
-            {
-                if (!settings.json.type_json_skip_duplicated_paths)
-                    throw Exception(ErrorCodes::INCORRECT_DATA, "Found duplicated path during binary deserialization of JSON type: {}. You can enable setting type_json_skip_duplicated_paths to skip duplicated paths during insert", path);
-            }
-            else
-            {
-                shared_data_paths->insertData(path.data(), path.size());
-                shared_data_values->insertData(value.data(), value.size());
-            }
-        }
-        shared_data_offsets.push_back(shared_data_paths->size());
-    }
-    catch (...)
-    {
-        restoreColumnObject(column_object, prev_size);
-        throw;
+        ind -= part->size();
     }
 
-    /// Insert default to all remaining typed and dynamic paths.
-    for (auto & [_, column] : typed_paths)
-    {
-        if (column->size() == prev_size)
-            column->insertDefault();
-    }
-
-    for (auto & [_, column] : column_object.getDynamicPathsPtrs())
-    {
-        if (column->size() == prev_size)
-            column->insertDefault();
-    }
+    throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Index ({}) for text serialization is out of range", row_num);
 }
 
-SerializationPtr SerializationObject::TypedPathSubcolumnCreator::create(const DB::SerializationPtr & prev) const
+template <typename Parser>
+void SerializationObject<Parser>::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
-    return std::make_shared<SerializationObjectTypedPath>(prev, path);
+    serializeTextImpl(column, row_num, ostr, settings);
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    WriteBufferFromOwnString ostr_str;
+    serializeTextImpl(column, row_num, ostr_str, settings);
+    writeEscapedString(ostr_str.str(), ostr);
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    WriteBufferFromOwnString ostr_str;
+    serializeTextImpl(column, row_num, ostr_str, settings);
+    writeQuotedString(ostr_str.str(), ostr);
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    serializeTextImpl(column, row_num, ostr, settings);
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    WriteBufferFromOwnString ostr_str;
+    serializeTextImpl(column, row_num, ostr_str, settings);
+    writeCSVString(ostr_str.str(), ostr);
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::serializeTextMarkdown(
+    const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    if (settings.markdown.escape_special_characters)
+    {
+        WriteBufferFromOwnString ostr_str;
+        serializeTextImpl(column, row_num, ostr_str, settings);
+        writeMarkdownEscapedString(ostr_str.str(), ostr);
+    }
+    else
+    {
+        serializeTextEscaped(column, row_num, ostr, settings);
+    }
+}
+
+template <typename Parser>
+void SerializationObject<Parser>::serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const
+{
+    const auto & column_object = assert_cast<const ColumnObject &>(column);
+    const auto & subcolumns = column_object.getSubcolumns();
+
+    writeCString("{\n", ostr);
+    for (auto it = subcolumns.begin(); it != subcolumns.end(); ++it)
+    {
+        const auto & entry = *it;
+        if (it != subcolumns.begin())
+            writeCString(",\n", ostr);
+
+        writeChar(' ', (indent + 1) * 4, ostr);
+        writeDoubleQuoted(entry->path.getPath(), ostr);
+        writeCString(": ", ostr);
+        serializeTextFromSubcolumn<true>(entry->data, row_num, ostr, settings, indent + 1);
+    }
+    writeChar('\n', ostr);
+    writeChar(' ', indent * 4, ostr);
+    writeChar('}', ostr);
+}
+
+
+SerializationPtr getObjectSerialization(const String & schema_format)
+{
+    if (schema_format == "json")
+    {
+#if USE_SIMDJSON
+        return std::make_shared<SerializationObject<JSONDataParser<SimdJSONParser>>>();
+#elif USE_RAPIDJSON
+        return std::make_shared<SerializationObject<JSONDataParser<RapidJSONParser>>>();
+#else
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+            "To use data type Object with JSON format ClickHouse should be built with Simdjson or Rapidjson");
+#endif
+    }
+
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Unknown schema format '{}'", schema_format);
 }
 
 }
-
diff --git a/src/DataTypes/Serializations/SerializationObject.h b/src/DataTypes/Serializations/SerializationObject.h
index 62ff9849f45..4cb7d0ab6a8 100644
--- a/src/DataTypes/Serializations/SerializationObject.h
+++ b/src/DataTypes/Serializations/SerializationObject.h
@@ -1,43 +1,34 @@
 #pragma once
 
 #include <Columns/ColumnObject.h>
-#include <DataTypes/DataTypeObject.h>
-#include <list>
+#include <DataTypes/Serializations/SimpleTextSerialization.h>
+#include <Common/ObjectPool.h>
 
 namespace DB
 {
 
-class SerializationObjectDynamicPath;
-class SerializationSubObject;
-
-/// Class for binary serialization/deserialization of an Object type (currently only JSON).
+/** Serialization for data type Object.
+  * Supported only text serialization/deserialization.
+  * and binary bulk serialization/deserialization without position independent
+  * encoding, i.e. serialization/deserialization into Native format.
+  */
+template <typename Parser>
 class SerializationObject : public ISerialization
 {
 public:
-    /// Serialization can change in future. Let's introduce serialization version.
-    struct ObjectSerializationVersion
-    {
-        enum Value
-        {
-            BASIC = 0,
-        };
-
-        Value value;
-
-        static void checkVersion(UInt64 version);
-
-        explicit ObjectSerializationVersion(UInt64 version);
-    };
-
-    SerializationObject(
-        std::unordered_map<String, SerializationPtr> typed_path_serializations_,
-        const std::unordered_set<String> & paths_to_skip_,
-        const std::vector<String> & path_regexps_to_skip_);
-
-    void enumerateStreams(
-        EnumerateStreamsSettings & settings,
-        const StreamCallback & callback,
-        const SubstreamData & data) const override;
+    /** In Native format ColumnObject can be serialized
+      * in two formats: as Tuple or as String.
+      * The format is the following:
+      *
+      * <serialization_kind> 1 byte -- 0 if Tuple, 1 if String.
+      * [type_name] -- Only for tuple serialization.
+      * ... data of internal column ...
+      *
+      * ClickHouse client serializazes objects as tuples.
+      * String serialization exists for clients, which cannot
+      * do parsing by themselves and they can send raw data as
+      * string. It will be parsed on the server side.
+      */
 
     void serializeBinaryBulkStatePrefix(
         const IColumn & column,
@@ -72,55 +63,59 @@ public:
     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;
 
-    static void restoreColumnObject(ColumnObject & column_object, size_t prev_size);
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const override;
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void serializeTextMarkdown(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;
+    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
 
 private:
-    friend SerializationObjectDynamicPath;
-    friend SerializationSubObject;
-
-    /// State of an Object structure. Can be also used during deserializing of Object subcolumns.
-    struct DeserializeBinaryBulkStateObjectStructure : public ISerialization::DeserializeBinaryBulkState
+    enum class BinarySerializationKind : UInt8
     {
-        ObjectSerializationVersion structure_version;
-        size_t max_dynamic_paths;
-        std::vector<String> sorted_dynamic_paths;
-        std::unordered_set<String> dynamic_paths;
-        /// Paths statistics. Map (dynamic path) -> (number of non-null values in this path).
-        ColumnObject::StatisticsPtr statistics;
-
-        explicit DeserializeBinaryBulkStateObjectStructure(UInt64 structure_version_) : structure_version(structure_version_) {}
+        TUPLE = 0,
+        STRING = 1,
     };
 
-    static DeserializeBinaryBulkStatePtr deserializeObjectStructureStatePrefix(
+    struct SerializeStateObject;
+    struct DeserializeStateObject;
+
+    void deserializeBinaryBulkFromString(
+        ColumnObject & column_object,
+        size_t limit,
         DeserializeBinaryBulkSettings & settings,
-        SubstreamsDeserializeStatesCache * cache);
+        DeserializeStateObject & state,
+        SubstreamsCache * cache) const;
 
-    /// Shared data has type Array(Tuple(String, String)).
-    static const DataTypePtr & getTypeOfSharedData();
+    void deserializeBinaryBulkFromTuple(
+        ColumnObject & column_object,
+        size_t limit,
+        DeserializeBinaryBulkSettings & settings,
+        DeserializeStateObject & state,
+        SubstreamsCache * cache) const;
 
-    struct TypedPathSubcolumnCreator : public ISubcolumnCreator
-    {
-        String path;
+    template <typename TSettings>
+    void checkSerializationIsSupported(const TSettings & settings) const;
 
-        explicit TypedPathSubcolumnCreator(const String & path_) : path(path_) {}
+    template <typename Reader>
+    void deserializeTextImpl(IColumn & column, Reader && reader) const;
 
-        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;
-    };
+    void serializeTextImpl(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const;
 
-protected:
-    bool shouldSkipPath(const String & path) const;
+    template <bool pretty_json = false>
+    void serializeTextFromSubcolumn(const ColumnObject::Subcolumn & subcolumn, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent = 0) const;
 
-    std::unordered_map<String, SerializationPtr> typed_path_serializations;
-    std::unordered_set<String> paths_to_skip;
-    std::vector<String> sorted_paths_to_skip;
-    std::list<re2::RE2> path_regexps_to_skip;
-    SerializationPtr dynamic_serialization;
-
-private:
-    std::vector<String> sorted_typed_paths;
-    SerializationPtr shared_data_serialization;
+    /// Pool of parser objects to make SerializationObject thread safe.
+    mutable SimpleObjectPool<Parser> parsers_pool;
 };
 
+SerializationPtr getObjectSerialization(const String & schema_format);
+
 }
diff --git a/src/DataTypes/Serializations/SerializationObjectDeprecated.cpp b/src/DataTypes/Serializations/SerializationObjectDeprecated.cpp
deleted file mode 100644
index 4e9ebf6c03d..00000000000
--- a/src/DataTypes/Serializations/SerializationObjectDeprecated.cpp
+++ /dev/null
@@ -1,586 +0,0 @@
-#include <DataTypes/Serializations/SerializationObjectDeprecated.h>
-#include <DataTypes/Serializations/JSONDataParser.h>
-#include <DataTypes/Serializations/SerializationString.h>
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/ObjectUtils.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <Common/JSONParsers/SimdJSONParser.h>
-#include <Common/JSONParsers/RapidJSONParser.h>
-#include <Columns/ColumnObjectDeprecated.h>
-#include <Columns/ColumnTuple.h>
-#include <Columns/ColumnString.h>
-
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <IO/VarInt.h>
-#include <magic_enum.hpp>
-#include <memory>
-#include <string>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-    extern const int INCORRECT_DATA;
-    extern const int CANNOT_READ_ALL_DATA;
-    extern const int ARGUMENT_OUT_OF_BOUND;
-    extern const int CANNOT_PARSE_TEXT;
-    extern const int EXPERIMENTAL_FEATURE_ERROR;
-}
-
-template <typename Parser>
-template <typename Reader>
-void SerializationObjectDeprecated<Parser>::deserializeTextImpl(IColumn & column, Reader && reader) const
-{
-    auto & column_object = assert_cast<ColumnObjectDeprecated &>(column);
-
-    String buf;
-    reader(buf);
-    std::optional<ParseResult> result;
-
-    /// Treat empty string as an empty object
-    /// for better CAST from String to Object.
-    if (!buf.empty())
-    {
-        auto parser = parsers_pool.get([] { return new Parser; });
-        result = parser->parse(buf.data(), buf.size());
-    }
-    else
-    {
-        result = ParseResult{};
-    }
-
-    if (!result)
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot parse object");
-
-    auto & [paths, values] = *result;
-    assert(paths.size() == values.size());
-
-    size_t old_column_size = column_object.size();
-    for (size_t i = 0; i < paths.size(); ++i)
-    {
-        auto field_info = getFieldInfo(values[i]);
-        if (field_info.need_fold_dimension)
-            values[i] = applyVisitor(FieldVisitorFoldDimension(field_info.num_dimensions), std::move(values[i]));
-        if (isNothing(field_info.scalar_type))
-            continue;
-
-        if (!column_object.hasSubcolumn(paths[i]))
-        {
-            if (paths[i].hasNested())
-                column_object.addNestedSubcolumn(paths[i], field_info, old_column_size);
-            else
-                column_object.addSubcolumn(paths[i], old_column_size);
-        }
-
-        auto & subcolumn = column_object.getSubcolumn(paths[i]);
-        assert(subcolumn.size() == old_column_size);
-
-        subcolumn.insert(std::move(values[i]), std::move(field_info));
-    }
-
-    /// Insert default values to missed subcolumns.
-    const auto & subcolumns = column_object.getSubcolumns();
-    for (const auto & entry : subcolumns)
-    {
-        if (entry->data.size() == old_column_size)
-        {
-            bool inserted = column_object.tryInsertDefaultFromNested(entry);
-            if (!inserted)
-                entry->data.insertDefault();
-        }
-    }
-
-    column_object.incrementNumRows();
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    deserializeTextImpl(column, [&](String & s) { readStringInto(s, istr); });
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeTextImpl(column, [&](String & s) { settings.tsv.crlf_end_of_line_input ? readEscapedStringCRLF(s, istr) : readEscapedString(s, istr); });
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    deserializeTextImpl(column, [&](String & s) { readQuotedStringInto<true>(s, istr); });
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
-{
-    deserializeTextImpl(column, [&](String & s) { Parser::readJSON(s, istr); });
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeTextImpl(column, [&](String & s) { readCSVStringInto(s, istr, settings.csv); });
-}
-
-template <typename Parser>
-template <typename TSettings>
-void SerializationObjectDeprecated<Parser>::checkSerializationIsSupported(const TSettings & settings) const
-{
-    if (settings.position_independent_encoding)
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-            "DataTypeObject doesn't support serialization with position independent encoding");
-}
-
-template <typename Parser>
-struct SerializationObjectDeprecated<Parser>::SerializeStateObject : public ISerialization::SerializeBinaryBulkState
-{
-    DataTypePtr nested_type;
-    SerializationPtr nested_serialization;
-    SerializeBinaryBulkStatePtr nested_state;
-};
-
-template <typename Parser>
-struct SerializationObjectDeprecated<Parser>::DeserializeStateObject : public ISerialization::DeserializeBinaryBulkState
-{
-    BinarySerializationKind kind;
-    DataTypePtr nested_type;
-    SerializationPtr nested_serialization;
-    DeserializeBinaryBulkStatePtr nested_state;
-};
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::serializeBinaryBulkStatePrefix(
-    const IColumn & column,
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    checkSerializationIsSupported(settings);
-    if (state)
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-            "DataTypeObject doesn't support serialization with non-trivial state");
-
-    const auto & column_object = assert_cast<const ColumnObjectDeprecated &>(column);
-    if (!column_object.isFinalized())
-    {
-        auto finalized = column_object.cloneFinalized();
-        serializeBinaryBulkStatePrefix(*finalized, settings, state);
-        return;
-    }
-
-    settings.path.push_back(Substream::DeprecatedObjectStructure);
-    auto * stream = settings.getter(settings.path);
-
-    if (!stream)
-        throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR, "Missing stream for kind of binary serialization");
-
-    auto [tuple_column, tuple_type] = unflattenObjectToTuple(column_object);
-
-    writeIntBinary(static_cast<UInt8>(BinarySerializationKind::TUPLE), *stream);
-    writeStringBinary(tuple_type->getName(), *stream);
-
-    auto state_object = std::make_shared<SerializeStateObject>();
-    state_object->nested_type = tuple_type;
-    state_object->nested_serialization = tuple_type->getDefaultSerialization();
-
-    settings.path.back() = Substream::DeprecatedObjectData;
-    state_object->nested_serialization->serializeBinaryBulkStatePrefix(*tuple_column, settings, state_object->nested_state);
-
-    state = std::move(state_object);
-    settings.path.pop_back();
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::serializeBinaryBulkStateSuffix(
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    checkSerializationIsSupported(settings);
-    auto * state_object = checkAndGetState<SerializeStateObject>(state);
-
-    settings.path.push_back(Substream::DeprecatedObjectData);
-    state_object->nested_serialization->serializeBinaryBulkStateSuffix(settings, state_object->nested_state);
-    settings.path.pop_back();
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::deserializeBinaryBulkStatePrefix(
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state,
-    SubstreamsDeserializeStatesCache * cache) const
-{
-    checkSerializationIsSupported(settings);
-    if (state)
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-            "DataTypeObject doesn't support serialization with non-trivial state");
-
-    settings.path.push_back(Substream::DeprecatedObjectStructure);
-    auto * stream = settings.getter(settings.path);
-    settings.path.pop_back();
-
-    if (!stream)
-        throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA,
-            "Cannot read kind of binary serialization of DataTypeObject, because its stream is missing");
-
-    UInt8 kind_raw;
-    readIntBinary(kind_raw, *stream);
-    auto kind = magic_enum::enum_cast<BinarySerializationKind>(kind_raw);
-    if (!kind)
-        throw Exception(ErrorCodes::INCORRECT_DATA,
-            "Unknown binary serialization kind of Object: {}", std::to_string(kind_raw));
-
-    auto state_object = std::make_shared<DeserializeStateObject>();
-    state_object->kind = *kind;
-
-    if (state_object->kind == BinarySerializationKind::TUPLE)
-    {
-        String data_type_name;
-        readStringBinary(data_type_name, *stream);
-        state_object->nested_type = DataTypeFactory::instance().get(data_type_name);
-        state_object->nested_serialization = state_object->nested_type->getDefaultSerialization();
-
-        if (!isTuple(state_object->nested_type))
-            throw Exception(ErrorCodes::INCORRECT_DATA,
-                "Data of type Object should be written as Tuple, got: {}", data_type_name);
-    }
-    else if (state_object->kind == BinarySerializationKind::STRING)
-    {
-        state_object->nested_type = std::make_shared<DataTypeString>();
-        state_object->nested_serialization = std::make_shared<SerializationString>();
-    }
-    else
-    {
-        throw Exception(ErrorCodes::INCORRECT_DATA,
-            "Unknown binary serialization kind of Object: {}", std::to_string(kind_raw));
-    }
-
-    settings.path.push_back(Substream::DeprecatedObjectData);
-    state_object->nested_serialization->deserializeBinaryBulkStatePrefix(settings, state_object->nested_state, cache);
-    settings.path.pop_back();
-
-    state = std::move(state_object);
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::serializeBinaryBulkWithMultipleStreams(
-    const IColumn & column,
-    size_t offset,
-    size_t limit,
-    SerializeBinaryBulkSettings & settings,
-    SerializeBinaryBulkStatePtr & state) const
-{
-    checkSerializationIsSupported(settings);
-    const auto & column_object = assert_cast<const ColumnObjectDeprecated &>(column);
-    auto * state_object = checkAndGetState<SerializeStateObject>(state);
-
-    if (!column_object.isFinalized())
-    {
-        auto finalized = column_object.cloneFinalized();
-        serializeBinaryBulkWithMultipleStreams(*finalized, offset, limit, settings, state);
-        return;
-    }
-
-    auto [tuple_column, tuple_type] = unflattenObjectToTuple(column_object);
-
-    if (!state_object->nested_type->equals(*tuple_type))
-    {
-        throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR,
-            "Types of internal column of Object mismatched. Expected: {}, Got: {}",
-            state_object->nested_type->getName(), tuple_type->getName());
-    }
-
-    settings.path.push_back(Substream::DeprecatedObjectData);
-    if (auto * stream = settings.getter(settings.path))
-    {
-        state_object->nested_serialization->serializeBinaryBulkWithMultipleStreams(
-            *tuple_column, offset, limit, settings, state_object->nested_state);
-    }
-
-    settings.path.pop_back();
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::deserializeBinaryBulkWithMultipleStreams(
-    ColumnPtr & column,
-    size_t limit,
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state,
-    SubstreamsCache * cache) const
-{
-    checkSerializationIsSupported(settings);
-    if (!column->empty())
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-            "DataTypeObject cannot be deserialized to non-empty column");
-
-    auto mutable_column = column->assumeMutable();
-    auto & column_object = assert_cast<ColumnObjectDeprecated &>(*mutable_column);
-    auto * state_object = checkAndGetState<DeserializeStateObject>(state);
-
-    settings.path.push_back(Substream::DeprecatedObjectData);
-    if (state_object->kind == BinarySerializationKind::STRING)
-        deserializeBinaryBulkFromString(column_object, limit, settings, *state_object, cache);
-    else
-        deserializeBinaryBulkFromTuple(column_object, limit, settings, *state_object, cache);
-
-    settings.path.pop_back();
-    column_object.checkConsistency();
-    column_object.finalize();
-    column = std::move(mutable_column);
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::deserializeBinaryBulkFromString(
-    ColumnObjectDeprecated & column_object,
-    size_t limit,
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeStateObject & state,
-    SubstreamsCache * cache) const
-{
-    ColumnPtr column_string = state.nested_type->createColumn();
-    state.nested_serialization->deserializeBinaryBulkWithMultipleStreams(
-        column_string, limit, settings, state.nested_state, cache);
-
-    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>
-void SerializationObjectDeprecated<Parser>::deserializeBinaryBulkFromTuple(
-    ColumnObjectDeprecated & column_object,
-    size_t limit,
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeStateObject & state,
-    SubstreamsCache * cache) const
-{
-    ColumnPtr column_tuple = state.nested_type->createColumn();
-    state.nested_serialization->deserializeBinaryBulkWithMultipleStreams(
-        column_tuple, limit, settings, state.nested_state, cache);
-
-    auto [tuple_paths, tuple_types] = flattenTuple(state.nested_type);
-    auto flattened_tuple = flattenTuple(column_tuple);
-    const auto & tuple_columns = assert_cast<const ColumnTuple &>(*flattened_tuple).getColumns();
-
-    assert(tuple_paths.size() == tuple_types.size());
-    size_t num_subcolumns = tuple_paths.size();
-
-    if (tuple_columns.size() != num_subcolumns)
-        throw Exception(ErrorCodes::INCORRECT_DATA,
-            "Inconsistent type ({}) and column ({}) while reading column of type Object",
-            state.nested_type->getName(), column_tuple->getName());
-
-    for (size_t i = 0; i < num_subcolumns; ++i)
-        column_object.addSubcolumn(tuple_paths[i], tuple_columns[i]->assumeMutable());
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::serializeBinary(const Field &, WriteBuffer &, const FormatSettings &) const
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented for SerializationObjectDeprecated");
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::deserializeBinary(Field &, ReadBuffer &, const FormatSettings &) const
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented for SerializationObjectDeprecated");
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::serializeBinary(const IColumn &, size_t, WriteBuffer &, const FormatSettings &) const
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented for SerializationObjectDeprecated");
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::deserializeBinary(IColumn &, ReadBuffer &, const FormatSettings &) const
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented for SerializationObjectDeprecated");
-}
-
-/// TODO: use format different of JSON in serializations.
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::serializeTextImpl(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    const auto & column_object = assert_cast<const ColumnObjectDeprecated &>(column);
-    const auto & subcolumns = column_object.getSubcolumns();
-
-    writeChar('{', ostr);
-    for (auto it = subcolumns.begin(); it != subcolumns.end(); ++it)
-    {
-        const auto & entry = *it;
-        if (it != subcolumns.begin())
-            writeCString(",", ostr);
-
-        writeDoubleQuoted(entry->path.getPath(), ostr);
-        writeChar(':', ostr);
-        serializeTextFromSubcolumn(entry->data, row_num, ostr, settings);
-    }
-    writeChar('}', ostr);
-}
-
-template <typename Parser>
-template <bool pretty_json>
-void SerializationObjectDeprecated<Parser>::serializeTextFromSubcolumn(
-    const ColumnObjectDeprecated::Subcolumn & subcolumn, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const
-{
-    const auto & least_common_type = subcolumn.getLeastCommonType();
-
-    if (subcolumn.isFinalized())
-    {
-        const auto & finalized_column = subcolumn.getFinalizedColumn();
-        auto info = least_common_type->getSerializationInfo(finalized_column);
-        auto serialization = least_common_type->getSerialization(*info);
-        if constexpr (pretty_json)
-            serialization->serializeTextJSONPretty(finalized_column, row_num, ostr, settings, indent);
-        else
-            serialization->serializeTextJSON(finalized_column, row_num, ostr, settings);
-        return;
-    }
-
-    size_t ind = row_num;
-    if (ind < subcolumn.getNumberOfDefaultsInPrefix())
-    {
-        /// Suboptimal, but it should happen rarely.
-        auto tmp_column = subcolumn.getLeastCommonType()->createColumn();
-        tmp_column->insertDefault();
-
-        auto info = least_common_type->getSerializationInfo(*tmp_column);
-        auto serialization = least_common_type->getSerialization(*info);
-        if constexpr (pretty_json)
-            serialization->serializeTextJSONPretty(*tmp_column, 0, ostr, settings, indent);
-        else
-            serialization->serializeTextJSON(*tmp_column, 0, ostr, settings);
-        return;
-    }
-
-    ind -= subcolumn.getNumberOfDefaultsInPrefix();
-    for (const auto & part : subcolumn.getData())
-    {
-        if (ind < part->size())
-        {
-            auto part_type = getDataTypeByColumn(*part);
-            auto info = part_type->getSerializationInfo(*part);
-            auto serialization = part_type->getSerialization(*info);
-            if constexpr (pretty_json)
-                serialization->serializeTextJSONPretty(*part, ind, ostr, settings, indent);
-            else
-                serialization->serializeTextJSON(*part, ind, ostr, settings);
-            return;
-        }
-
-        ind -= part->size();
-    }
-
-    throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Index ({}) for text serialization is out of range", row_num);
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeTextImpl(column, row_num, ostr, settings);
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    WriteBufferFromOwnString ostr_str;
-    serializeTextImpl(column, row_num, ostr_str, settings);
-    writeEscapedString(ostr_str.str(), ostr);
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    WriteBufferFromOwnString ostr_str;
-    serializeTextImpl(column, row_num, ostr_str, settings);
-    writeQuotedString(ostr_str.str(), ostr);
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeTextImpl(column, row_num, ostr, settings);
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    WriteBufferFromOwnString ostr_str;
-    serializeTextImpl(column, row_num, ostr_str, settings);
-    writeCSVString(ostr_str.str(), ostr);
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::serializeTextMarkdown(
-    const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    if (settings.markdown.escape_special_characters)
-    {
-        WriteBufferFromOwnString ostr_str;
-        serializeTextImpl(column, row_num, ostr_str, settings);
-        writeMarkdownEscapedString(ostr_str.str(), ostr);
-    }
-    else
-    {
-        serializeTextEscaped(column, row_num, ostr, settings);
-    }
-}
-
-template <typename Parser>
-void SerializationObjectDeprecated<Parser>::serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const
-{
-    const auto & column_object = assert_cast<const ColumnObjectDeprecated &>(column);
-    const auto & subcolumns = column_object.getSubcolumns();
-
-    writeCString("{\n", ostr);
-    for (auto it = subcolumns.begin(); it != subcolumns.end(); ++it)
-    {
-        const auto & entry = *it;
-        if (it != subcolumns.begin())
-            writeCString(",\n", ostr);
-
-        writeChar(' ', (indent + 1) * 4, ostr);
-        writeDoubleQuoted(entry->path.getPath(), ostr);
-        writeCString(": ", ostr);
-        serializeTextFromSubcolumn<true>(entry->data, row_num, ostr, settings, indent + 1);
-    }
-    writeChar('\n', ostr);
-    writeChar(' ', indent * 4, ostr);
-    writeChar('}', ostr);
-}
-
-
-SerializationPtr getObjectSerialization(const String & schema_format)
-{
-    if (schema_format == "json")
-    {
-#if USE_SIMDJSON
-        return std::make_shared<SerializationObjectDeprecated<JSONDataParser<SimdJSONParser>>>();
-#elif USE_RAPIDJSON
-        return std::make_shared<SerializationObjectDeprecated<JSONDataParser<RapidJSONParser>>>();
-#else
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-            "To use data type Object with JSON format ClickHouse should be built with Simdjson or Rapidjson");
-#endif
-    }
-
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Unknown schema format '{}'", schema_format);
-}
-
-}
diff --git a/src/DataTypes/Serializations/SerializationObjectDeprecated.h b/src/DataTypes/Serializations/SerializationObjectDeprecated.h
deleted file mode 100644
index c209f946850..00000000000
--- a/src/DataTypes/Serializations/SerializationObjectDeprecated.h
+++ /dev/null
@@ -1,121 +0,0 @@
-#pragma once
-
-#include <Columns/ColumnObjectDeprecated.h>
-#include <DataTypes/Serializations/SimpleTextSerialization.h>
-#include <Common/ObjectPool.h>
-
-namespace DB
-{
-
-/** Serialization for data type Object (deprecated).
-  * Supported only text serialization/deserialization.
-  * and binary bulk serialization/deserialization without position independent
-  * encoding, i.e. serialization/deserialization into Native format.
-  */
-template <typename Parser>
-class SerializationObjectDeprecated : public ISerialization
-{
-public:
-    /** In Native format ColumnObjectDeprecated can be serialized
-      * in two formats: as Tuple or as String.
-      * The format is the following:
-      *
-      * <serialization_kind> 1 byte -- 0 if Tuple, 1 if String.
-      * [type_name] -- Only for tuple serialization.
-      * ... data of internal column ...
-      *
-      * ClickHouse client serializazes objects as tuples.
-      * String serialization exists for clients, which cannot
-      * do parsing by themselves and they can send raw data as
-      * string. It will be parsed on the server side.
-      */
-
-    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,
-        SubstreamsDeserializeStatesCache * cache) 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 &) const override;
-    void deserializeBinary(Field & field, ReadBuffer & istr, const FormatSettings &) const override;
-    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;
-
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
-    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
-    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
-    void serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const override;
-    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
-    void serializeTextMarkdown(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;
-    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
-
-private:
-    enum class BinarySerializationKind : UInt8
-    {
-        TUPLE = 0,
-        STRING = 1,
-    };
-
-    struct SerializeStateObject;
-    struct DeserializeStateObject;
-
-    void deserializeBinaryBulkFromString(
-        ColumnObjectDeprecated & column_object,
-        size_t limit,
-        DeserializeBinaryBulkSettings & settings,
-        DeserializeStateObject & state,
-        SubstreamsCache * cache) const;
-
-    void deserializeBinaryBulkFromTuple(
-        ColumnObjectDeprecated & column_object,
-        size_t limit,
-        DeserializeBinaryBulkSettings & settings,
-        DeserializeStateObject & state,
-        SubstreamsCache * cache) const;
-
-    template <typename TSettings>
-    void checkSerializationIsSupported(const TSettings & settings) const;
-
-    template <typename Reader>
-    void deserializeTextImpl(IColumn & column, Reader && reader) const;
-
-    void serializeTextImpl(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const;
-
-    template <bool pretty_json = false>
-    void serializeTextFromSubcolumn(const ColumnObjectDeprecated::Subcolumn & subcolumn, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent = 0) const;
-
-    /// Pool of parser objects to make SerializationObjectDeprecated thread safe.
-    mutable SimpleObjectPool<Parser> parsers_pool;
-};
-
-SerializationPtr getObjectSerialization(const String & schema_format);
-
-}
diff --git a/src/DataTypes/Serializations/SerializationObjectDynamicPath.cpp b/src/DataTypes/Serializations/SerializationObjectDynamicPath.cpp
deleted file mode 100644
index 5323079c54b..00000000000
--- a/src/DataTypes/Serializations/SerializationObjectDynamicPath.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-#include <Columns/ColumnDynamic.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypeVariant.h>
-#include <DataTypes/Serializations/SerializationObject.h>
-#include <DataTypes/Serializations/SerializationObjectDynamicPath.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-SerializationObjectDynamicPath::SerializationObjectDynamicPath(
-    const DB::SerializationPtr & nested_, const String & path_, const String & path_subcolumn_, size_t max_dynamic_types_)
-    : SerializationWrapper(nested_)
-    , path(path_)
-    , path_subcolumn(path_subcolumn_)
-    , dynamic_serialization(std::make_shared<SerializationDynamic>())
-    , shared_data_serialization(SerializationObject::getTypeOfSharedData()->getDefaultSerialization())
-    , max_dynamic_types(max_dynamic_types_)
-{
-}
-
-struct DeserializeBinaryBulkStateObjectDynamicPath : public ISerialization::DeserializeBinaryBulkState
-{
-    ISerialization::DeserializeBinaryBulkStatePtr structure_state;
-    ISerialization::DeserializeBinaryBulkStatePtr nested_state;
-    bool read_from_shared_data;
-    ColumnPtr shared_data;
-};
-
-void SerializationObjectDynamicPath::enumerateStreams(
-    DB::ISerialization::EnumerateStreamsSettings & settings,
-    const DB::ISerialization::StreamCallback & callback,
-    const DB::ISerialization::SubstreamData & data) const
-{
-    settings.path.push_back(Substream::ObjectStructure);
-    callback(settings.path);
-    settings.path.pop_back();
-
-    const auto * deserialize_state = data.deserialize_state ? checkAndGetState<DeserializeBinaryBulkStateObjectDynamicPath>(data.deserialize_state) : nullptr;
-
-    /// We cannot enumerate anything if we don't have deserialization state, as we don't know the dynamic structure.
-    if (!deserialize_state)
-        return;
-
-    settings.path.push_back(Substream::ObjectData);
-    const auto * structure_state = checkAndGetState<SerializationObject::DeserializeBinaryBulkStateObjectStructure>(deserialize_state->structure_state);
-    /// Check if we have our path in dynamic paths.
-    if (structure_state->dynamic_paths.contains(path))
-    {
-        settings.path.push_back(Substream::ObjectDynamicPath);
-        settings.path.back().object_path_name = path;
-        auto path_data = SubstreamData(nested_serialization)
-                             .withType(data.type)
-                             .withColumn(data.column)
-                             .withSerializationInfo(data.serialization_info)
-                             .withDeserializeState(deserialize_state->nested_state);
-        settings.path.back().data = path_data;
-        nested_serialization->enumerateStreams(settings, callback, path_data);
-        settings.path.pop_back();
-    }
-    /// Otherwise we will have to read all shared data and try to find our path there.
-    else
-    {
-        settings.path.push_back(Substream::ObjectSharedData);
-        auto shared_data_substream_data = SubstreamData(shared_data_serialization)
-                                              .withType(data.type ? SerializationObject::getTypeOfSharedData() : nullptr)
-                                              .withColumn(data.column ? SerializationObject::getTypeOfSharedData()->createColumn() : nullptr)
-                                              .withSerializationInfo(data.serialization_info)
-                                              .withDeserializeState(deserialize_state->nested_state);
-        settings.path.back().data = shared_data_substream_data;
-        shared_data_serialization->enumerateStreams(settings, callback, shared_data_substream_data);
-        settings.path.pop_back();
-    }
-
-    settings.path.pop_back();
-}
-
-void SerializationObjectDynamicPath::serializeBinaryBulkStatePrefix(const IColumn &, SerializeBinaryBulkSettings &, SerializeBinaryBulkStatePtr &) const
-{
-    throw Exception(
-        ErrorCodes::NOT_IMPLEMENTED, "Method serializeBinaryBulkStatePrefix is not implemented for SerializationObjectDynamicPath");
-}
-
-void SerializationObjectDynamicPath::serializeBinaryBulkStateSuffix(SerializeBinaryBulkSettings &, SerializeBinaryBulkStatePtr &) const
-{
-    throw Exception(
-        ErrorCodes::NOT_IMPLEMENTED, "Method serializeBinaryBulkStateSuffix is not implemented for SerializationObjectDynamicPath");
-}
-
-void SerializationObjectDynamicPath::deserializeBinaryBulkStatePrefix(
-    DeserializeBinaryBulkSettings & settings, DeserializeBinaryBulkStatePtr & state, SubstreamsDeserializeStatesCache * cache) const
-{
-    auto structure_state = SerializationObject::deserializeObjectStructureStatePrefix(settings, cache);
-    if (!structure_state)
-        return;
-
-    auto dynamic_path_state = std::make_shared<DeserializeBinaryBulkStateObjectDynamicPath>();
-    dynamic_path_state->structure_state = std::move(structure_state);
-    /// Remember if we need to read from shared data or we have this path in dynamic paths.
-    dynamic_path_state->read_from_shared_data = !checkAndGetState<SerializationObject::DeserializeBinaryBulkStateObjectStructure>(dynamic_path_state->structure_state)->dynamic_paths.contains(path);
-    settings.path.push_back(Substream::ObjectData);
-    if (dynamic_path_state->read_from_shared_data)
-    {
-        settings.path.push_back(Substream::ObjectSharedData);
-        shared_data_serialization->deserializeBinaryBulkStatePrefix(settings, dynamic_path_state->nested_state, cache);
-        settings.path.pop_back();
-    }
-    else
-    {
-        settings.path.push_back(Substream::ObjectDynamicPath);
-        settings.path.back().object_path_name = path;
-        nested_serialization->deserializeBinaryBulkStatePrefix(settings, dynamic_path_state->nested_state, cache);
-        settings.path.pop_back();
-    }
-
-    settings.path.pop_back();
-    state = std::move(dynamic_path_state);
-}
-
-void SerializationObjectDynamicPath::serializeBinaryBulkWithMultipleStreams(const IColumn &, size_t, size_t, SerializeBinaryBulkSettings &, SerializeBinaryBulkStatePtr &) const
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method serializeBinaryBulkWithMultipleStreams is not implemented for SerializationObjectDynamicPath");
-}
-
-void SerializationObjectDynamicPath::deserializeBinaryBulkWithMultipleStreams(
-    ColumnPtr & result_column,
-    size_t limit,
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state,
-    SubstreamsCache * cache) const
-{
-    if (!state)
-        return;
-
-    auto * dynamic_path_state = checkAndGetState<DeserializeBinaryBulkStateObjectDynamicPath>(state);
-    settings.path.push_back(Substream::ObjectData);
-    /// Check if we don't need to read shared data. In this case just read data from dynamic path.
-    if (!dynamic_path_state->read_from_shared_data)
-    {
-        settings.path.push_back(Substream::ObjectDynamicPath);
-        settings.path.back().object_path_name = path;
-        nested_serialization->deserializeBinaryBulkWithMultipleStreams(result_column, limit, settings, dynamic_path_state->nested_state, cache);
-        settings.path.pop_back();
-    }
-    /// Otherwise, read the whole shared data column and extract requested path from it.
-    /// TODO: We can read several subcolumns of the same path located in the shared data
-    ///       and right now we extract the whole path column from shared data every time
-    ///       and then extract the requested subcolumns. We can optimize it and use substreams
-    ///       cache here to avoid extracting the same path from shared data several times.
-    ///
-    /// TODO: We can change the serialization of shared data to optimize reading paths from it.
-    ///       Right now we cannot know if shared data contains our path in current range or not,
-    ///       but we can change the serialization and write the list of all paths stored in shared
-    ///       data before each granule, and then replace the column that stores paths with column
-    ///       with indexes in this list. It can also reduce the storage, because we will store
-    ///       each path only once and can replace UInt64 string offset column with indexes column
-    ///       that can have smaller type depending on the number of paths in the list.
-    else
-    {
-        settings.path.push_back(Substream::ObjectSharedData);
-        /// Initialize shared_data column if needed.
-        if (result_column->empty())
-            dynamic_path_state->shared_data = SerializationObject::getTypeOfSharedData()->createColumn();
-        size_t prev_size = result_column->size();
-        shared_data_serialization->deserializeBinaryBulkWithMultipleStreams(dynamic_path_state->shared_data, limit, settings, dynamic_path_state->nested_state, cache);
-        /// If we need to read a subcolumn from Dynamic column, create an empty Dynamic column, fill it and extract subcolumn.
-        MutableColumnPtr dynamic_column = path_subcolumn.empty() ? result_column->assumeMutable() : ColumnDynamic::create(max_dynamic_types)->getPtr();
-        /// Check if we don't have any paths in shared data in current range.
-        const auto & offsets = assert_cast<const ColumnArray &>(*dynamic_path_state->shared_data).getOffsets();
-        if (offsets.back() == offsets[ssize_t(prev_size) - 1])
-            dynamic_column->insertManyDefaults(limit);
-        else
-            ColumnObject::fillPathColumnFromSharedData(*dynamic_column, path, dynamic_path_state->shared_data, prev_size, dynamic_path_state->shared_data->size());
-
-        /// Extract subcolumn from Dynamic column if needed.
-        if (!path_subcolumn.empty())
-        {
-            auto subcolumn = std::make_shared<DataTypeDynamic>(max_dynamic_types)->getSubcolumn(path_subcolumn, dynamic_column->getPtr());
-            result_column->assumeMutable()->insertRangeFrom(*subcolumn, 0, subcolumn->size());
-        }
-
-        settings.path.pop_back();
-    }
-
-    settings.path.pop_back();
-}
-
-}
diff --git a/src/DataTypes/Serializations/SerializationObjectDynamicPath.h b/src/DataTypes/Serializations/SerializationObjectDynamicPath.h
deleted file mode 100644
index e11d0cded73..00000000000
--- a/src/DataTypes/Serializations/SerializationObjectDynamicPath.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include <DataTypes/Serializations/SerializationWrapper.h>
-
-namespace DB
-{
-
-/// Serialization of dynamic Object paths.
-/// For example, if we have type JSON(a.b UInt32, b.c String) and data {"a" : {"b" : 42}, "b" : {"c" : "Hello}, "c" : {"d" : [1, 2, 3]}, "d" : 42}
-/// this class will be responsible for reading dynamic paths 'c.d' and 'd' as subcolumns.
-/// Typed paths 'a.b' and 'b.c' are serialized in SerializationObjectTypedPath.
-class SerializationObjectDynamicPath final : public SerializationWrapper
-{
-public:
-    SerializationObjectDynamicPath(const SerializationPtr & nested_, const String & path_, const String & path_subcolumn_, size_t max_dynamic_types_);
-
-    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,
-        SubstreamsDeserializeStatesCache * cache) 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:
-    String path;
-    String path_subcolumn;
-    SerializationPtr dynamic_serialization;
-    SerializationPtr shared_data_serialization;
-    size_t max_dynamic_types;
-};
-
-}
diff --git a/src/DataTypes/Serializations/SerializationObjectTypedPath.cpp b/src/DataTypes/Serializations/SerializationObjectTypedPath.cpp
deleted file mode 100644
index ef086d486f7..00000000000
--- a/src/DataTypes/Serializations/SerializationObjectTypedPath.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <Columns/ColumnDynamic.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypeVariant.h>
-#include <DataTypes/Serializations/SerializationObject.h>
-#include <DataTypes/Serializations/SerializationObjectTypedPath.h>
-#include <IO/ReadHelpers.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-
-void SerializationObjectTypedPath::enumerateStreams(
-    DB::ISerialization::EnumerateStreamsSettings & settings,
-    const DB::ISerialization::StreamCallback & callback,
-    const DB::ISerialization::SubstreamData & data) const
-{
-    settings.path.push_back(Substream::ObjectData);
-    settings.path.push_back(Substream::ObjectTypedPath);
-    settings.path.back().object_path_name = path;
-    auto path_data = SubstreamData(nested_serialization)
-                         .withType(data.type)
-                         .withColumn(data.column)
-                         .withSerializationInfo(data.serialization_info)
-                         .withDeserializeState(data.deserialize_state);
-    nested_serialization->enumerateStreams(settings, callback, path_data);
-    settings.path.pop_back();
-    settings.path.pop_back();
-}
-
-void SerializationObjectTypedPath::serializeBinaryBulkStatePrefix(const IColumn &, SerializeBinaryBulkSettings &, SerializeBinaryBulkStatePtr &) const
-{
-    throw Exception(
-        ErrorCodes::NOT_IMPLEMENTED, "Method serializeBinaryBulkStatePrefix is not implemented for SerializationObjectTypedPath");
-}
-
-void SerializationObjectTypedPath::serializeBinaryBulkStateSuffix(SerializeBinaryBulkSettings &, SerializeBinaryBulkStatePtr &) const
-{
-    throw Exception(
-        ErrorCodes::NOT_IMPLEMENTED, "Method serializeBinaryBulkStateSuffix is not implemented for SerializationObjectTypedPath");
-}
-
-void SerializationObjectTypedPath::deserializeBinaryBulkStatePrefix(
-    DeserializeBinaryBulkSettings & settings, DeserializeBinaryBulkStatePtr & state, SubstreamsDeserializeStatesCache * cache) const
-{
-    settings.path.push_back(Substream::ObjectData);
-    settings.path.push_back(Substream::ObjectTypedPath);
-    settings.path.back().object_path_name = path;
-    nested_serialization->deserializeBinaryBulkStatePrefix(settings, state, cache);
-    settings.path.pop_back();
-    settings.path.pop_back();
-}
-
-void SerializationObjectTypedPath::serializeBinaryBulkWithMultipleStreams(const IColumn &, size_t, size_t, SerializeBinaryBulkSettings &, SerializeBinaryBulkStatePtr &) const
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method serializeBinaryBulkWithMultipleStreams is not implemented for SerializationObjectTypedPath");
-}
-
-void SerializationObjectTypedPath::deserializeBinaryBulkWithMultipleStreams(
-    ColumnPtr & result_column,
-    size_t limit,
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state,
-    SubstreamsCache * cache) const
-{
-    settings.path.push_back(Substream::ObjectData);
-    settings.path.push_back(Substream::ObjectTypedPath);
-    settings.path.back().object_path_name = path;
-    nested_serialization->deserializeBinaryBulkWithMultipleStreams(result_column, limit, settings, state, cache);
-    settings.path.pop_back();
-    settings.path.pop_back();
-}
-
-}
diff --git a/src/DataTypes/Serializations/SerializationObjectTypedPath.h b/src/DataTypes/Serializations/SerializationObjectTypedPath.h
deleted file mode 100644
index 997e14bd145..00000000000
--- a/src/DataTypes/Serializations/SerializationObjectTypedPath.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#pragma once
-
-#include <DataTypes/Serializations/SerializationWrapper.h>
-
-namespace DB
-{
-
-/// Serialization of typed Object paths.
-/// For example, for type JSON(a.b UInt32, b.c String) this serialization
-/// will be used to read paths 'a.b' and 'b.c' as subcolumns.
-class SerializationObjectTypedPath final : public SerializationWrapper
-{
-public:
-    SerializationObjectTypedPath(const SerializationPtr & nested_, const String & path_)
-        : SerializationWrapper(nested_)
-        , path(path_)
-    {
-    }
-
-    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,
-        SubstreamsDeserializeStatesCache * cache) 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:
-    String path;
-};
-
-}
diff --git a/src/DataTypes/Serializations/SerializationString.cpp b/src/DataTypes/Serializations/SerializationString.cpp
index ac5d4e3e128..9e523d0d745 100644
--- a/src/DataTypes/Serializations/SerializationString.cpp
+++ b/src/DataTypes/Serializations/SerializationString.cpp
@@ -32,7 +32,7 @@ namespace ErrorCodes
 
 void SerializationString::serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings & settings) const
 {
-    const String & s = field.safeGet<const String &>();
+    const String & s = field.get<const String &>();
     if (settings.binary.max_binary_string_size && s.size() > settings.binary.max_binary_string_size)
         throw Exception(
             ErrorCodes::TOO_LARGE_STRING_SIZE,
@@ -59,7 +59,7 @@ void SerializationString::deserializeBinary(Field & field, ReadBuffer & istr, co
             settings.binary.max_binary_string_size);
 
     field = String();
-    String & s = field.safeGet<String &>();
+    String & s = field.get<String &>();
     s.resize(size);
     istr.readStrict(s.data(), size);
 }
diff --git a/src/DataTypes/Serializations/SerializationSubObject.cpp b/src/DataTypes/Serializations/SerializationSubObject.cpp
deleted file mode 100644
index 9084d46f9b2..00000000000
--- a/src/DataTypes/Serializations/SerializationSubObject.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-#include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypeVariant.h>
-#include <DataTypes/Serializations/SerializationObject.h>
-#include <DataTypes/Serializations/SerializationSubObject.h>
-#include <Common/logger_useful.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-SerializationSubObject::SerializationSubObject(
-    const String & path_prefix_, const std::unordered_map<String, SerializationPtr> & typed_paths_serializations_)
-    : path_prefix(path_prefix_)
-    , typed_paths_serializations(typed_paths_serializations_)
-    , dynamic_serialization(std::make_shared<SerializationDynamic>())
-    , shared_data_serialization(SerializationObject::getTypeOfSharedData()->getDefaultSerialization())
-{
-}
-
-struct DeserializeBinaryBulkStateSubObject : public ISerialization::DeserializeBinaryBulkState
-{
-    std::unordered_map<String, ISerialization::DeserializeBinaryBulkStatePtr> typed_path_states;
-    std::unordered_map<String, ISerialization::DeserializeBinaryBulkStatePtr> dynamic_path_states;
-    std::vector<String> dynamic_paths;
-    std::vector<String> dynamic_sub_paths;
-    ISerialization::DeserializeBinaryBulkStatePtr shared_data_state;
-    ColumnPtr shared_data;
-};
-
-void SerializationSubObject::enumerateStreams(
-    DB::ISerialization::EnumerateStreamsSettings & settings,
-    const DB::ISerialization::StreamCallback & callback,
-    const DB::ISerialization::SubstreamData & data) const
-{
-    settings.path.push_back(Substream::ObjectStructure);
-    callback(settings.path);
-    settings.path.pop_back();
-
-    const auto * column_object = data.column ? &assert_cast<const ColumnObject &>(*data.column) : nullptr;
-    const auto * type_object = data.type ? &assert_cast<const DataTypeObject &>(*data.type) : nullptr;
-    const auto * deserialize_state = data.deserialize_state ? checkAndGetState<DeserializeBinaryBulkStateSubObject>(data.deserialize_state) : nullptr;
-
-    settings.path.push_back(Substream::ObjectData);
-
-    /// typed_paths_serializations contains only typed paths with requested prefix from original Object column.
-    for (const auto & [path, serialization] : typed_paths_serializations)
-    {
-        settings.path.push_back(Substream::ObjectTypedPath);
-        settings.path.back().object_path_name = path;
-        auto path_data = SubstreamData(serialization)
-                             .withType(type_object ? type_object->getTypedPaths().at(path.substr(path_prefix.size() + 1)) : nullptr)
-                             .withColumn(column_object ? column_object->getTypedPaths().at(path.substr(path_prefix.size() + 1)) : nullptr)
-                             .withSerializationInfo(data.serialization_info)
-                             .withDeserializeState(deserialize_state ? deserialize_state->typed_path_states.at(path) : nullptr);
-        settings.path.back().data = path_data;
-        serialization->enumerateStreams(settings, callback, path_data);
-        settings.path.pop_back();
-    }
-
-    /// We will need to read shared data to find all paths with requested prefix.
-    settings.path.push_back(Substream::ObjectSharedData);
-    auto shared_data_substream_data = SubstreamData(shared_data_serialization)
-                                          .withType(data.type ? SerializationObject::getTypeOfSharedData() : nullptr)
-                                          .withColumn(data.column ? SerializationObject::getTypeOfSharedData()->createColumn() : nullptr)
-                                          .withSerializationInfo(data.serialization_info)
-                                          .withDeserializeState(deserialize_state ? deserialize_state->shared_data_state : nullptr);
-    settings.path.back().data = shared_data_substream_data;
-    shared_data_serialization->enumerateStreams(settings, callback, shared_data_substream_data);
-    settings.path.pop_back();
-
-    /// If deserialize state is provided, enumerate streams for dynamic paths.
-    if (deserialize_state)
-    {
-        DataTypePtr type = std::make_shared<DataTypeDynamic>();
-        for (const auto & [path, state] : deserialize_state->dynamic_path_states)
-        {
-            settings.path.push_back(Substream::ObjectDynamicPath);
-            settings.path.back().object_path_name = path;
-            auto path_data = SubstreamData(dynamic_serialization)
-                                 .withType(type_object ? type : nullptr)
-                                 .withColumn(nullptr)
-                                 .withSerializationInfo(data.serialization_info)
-                                 .withDeserializeState(state);
-            settings.path.back().data = path_data;
-            dynamic_serialization->enumerateStreams(settings, callback, path_data);
-            settings.path.pop_back();
-        }
-    }
-
-    settings.path.pop_back();
-}
-
-void SerializationSubObject::serializeBinaryBulkStatePrefix(const IColumn &, SerializeBinaryBulkSettings &, SerializeBinaryBulkStatePtr &) const
-{
-    throw Exception(
-        ErrorCodes::NOT_IMPLEMENTED, "Method serializeBinaryBulkStatePrefix is not implemented for SerializationSubObject");
-}
-
-void SerializationSubObject::serializeBinaryBulkStateSuffix(SerializeBinaryBulkSettings &, SerializeBinaryBulkStatePtr &) const
-{
-    throw Exception(
-        ErrorCodes::NOT_IMPLEMENTED, "Method serializeBinaryBulkStateSuffix is not implemented for SerializationSubObject");
-}
-
-namespace
-{
-
-/// Return sub-path by specified prefix.
-/// For example, for prefix a.b:
-/// a.b.c.d -> c.d, a.b.c -> c
-String getSubPath(const String & path, const String & prefix)
-{
-    return path.substr(prefix.size() + 1);
-}
-
-std::string_view getSubPath(const std::string_view & path, const String & prefix)
-{
-    return path.substr(prefix.size() + 1);
-}
-
-}
-
-void SerializationSubObject::deserializeBinaryBulkStatePrefix(
-    DeserializeBinaryBulkSettings & settings, DeserializeBinaryBulkStatePtr & state, SubstreamsDeserializeStatesCache * cache) const
-{
-    auto structure_state = SerializationObject::deserializeObjectStructureStatePrefix(settings, cache);
-    if (!structure_state)
-        return;
-
-    auto sub_object_state = std::make_shared<DeserializeBinaryBulkStateSubObject>();
-    settings.path.push_back(Substream::ObjectData);
-    for (const auto & [path, serialization] : typed_paths_serializations)
-    {
-        settings.path.push_back(Substream::ObjectTypedPath);
-        settings.path.back().object_path_name = path;
-        serialization->deserializeBinaryBulkStatePrefix(settings, sub_object_state->typed_path_states[path], cache);
-        settings.path.pop_back();
-    }
-
-    for (const auto & dynamic_path : checkAndGetState<SerializationObject::DeserializeBinaryBulkStateObjectStructure>(structure_state)->sorted_dynamic_paths)
-    {
-        /// Save only dynamic paths with requested prefix.
-        if (dynamic_path.starts_with(path_prefix) && dynamic_path.size() != path_prefix.size())
-        {
-            settings.path.push_back(Substream::ObjectDynamicPath);
-            settings.path.back().object_path_name = dynamic_path;
-            dynamic_serialization->deserializeBinaryBulkStatePrefix(settings, sub_object_state->dynamic_path_states[dynamic_path], cache);
-            settings.path.pop_back();
-            sub_object_state->dynamic_paths.push_back(dynamic_path);
-            sub_object_state->dynamic_sub_paths.push_back(getSubPath(dynamic_path, path_prefix));
-        }
-    }
-
-    settings.path.push_back(Substream::ObjectSharedData);
-    shared_data_serialization->deserializeBinaryBulkStatePrefix(settings, sub_object_state->shared_data_state, cache);
-    settings.path.pop_back();
-
-    settings.path.pop_back();
-    state = std::move(sub_object_state);
-}
-
-void SerializationSubObject::serializeBinaryBulkWithMultipleStreams(const IColumn &, size_t, size_t, SerializeBinaryBulkSettings &, SerializeBinaryBulkStatePtr &) const
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method serializeBinaryBulkWithMultipleStreams is not implemented for SerializationSubObject");
-}
-
-void SerializationSubObject::deserializeBinaryBulkWithMultipleStreams(
-    ColumnPtr & result_column,
-    size_t limit,
-    DeserializeBinaryBulkSettings & settings,
-    DeserializeBinaryBulkStatePtr & state,
-    SubstreamsCache * cache) const
-{
-    if (!state)
-        return;
-
-    auto * sub_object_state = checkAndGetState<DeserializeBinaryBulkStateSubObject>(state);
-    auto mutable_column = result_column->assumeMutable();
-    auto & column_object = assert_cast<ColumnObject &>(*mutable_column);
-    /// If it's a new object column, set dynamic paths and statistics.
-    if (column_object.empty())
-        column_object.setDynamicPaths(sub_object_state->dynamic_sub_paths);
-
-    auto & typed_paths = column_object.getTypedPaths();
-    auto & dynamic_paths = column_object.getDynamicPaths();
-
-    settings.path.push_back(Substream::ObjectData);
-    for (const auto & [path, serialization] : typed_paths_serializations)
-    {
-        settings.path.push_back(Substream::ObjectTypedPath);
-        settings.path.back().object_path_name = path;
-        serialization->deserializeBinaryBulkWithMultipleStreams(typed_paths[getSubPath(path, path_prefix)], limit, settings, sub_object_state->typed_path_states[path], cache);
-        settings.path.pop_back();
-    }
-
-    for (const auto & path : sub_object_state->dynamic_paths)
-    {
-        settings.path.push_back(Substream::ObjectDynamicPath);
-        settings.path.back().object_path_name = path;
-        dynamic_serialization->deserializeBinaryBulkWithMultipleStreams(dynamic_paths[getSubPath(path, path_prefix)], limit, settings, sub_object_state->dynamic_path_states[path], cache);
-        settings.path.pop_back();
-    }
-
-    settings.path.push_back(Substream::ObjectSharedData);
-    /// If it's a new object column, reinitialize column for shared data.
-    if (result_column->empty())
-        sub_object_state->shared_data = SerializationObject::getTypeOfSharedData()->createColumn();
-    size_t prev_size = column_object.size();
-    shared_data_serialization->deserializeBinaryBulkWithMultipleStreams(sub_object_state->shared_data, limit, settings, sub_object_state->shared_data_state, cache);
-    settings.path.pop_back();
-
-    auto & sub_object_shared_data = column_object.getSharedDataColumn();
-    const auto & offsets = assert_cast<const ColumnArray &>(*sub_object_state->shared_data).getOffsets();
-    /// Check if there is no data in shared data in current range.
-    if (offsets.back() == offsets[ssize_t(prev_size) - 1])
-    {
-        sub_object_shared_data.insertManyDefaults(limit);
-    }
-    else
-    {
-        const auto & shared_data_array = assert_cast<const ColumnArray &>(*sub_object_state->shared_data);
-        const auto & shared_data_offsets = shared_data_array.getOffsets();
-        const auto & shared_data_tuple = assert_cast<const ColumnTuple &>(shared_data_array.getData());
-        const auto & shared_data_paths = assert_cast<const ColumnString &>(shared_data_tuple.getColumn(0));
-        const auto & shared_data_values = assert_cast<const ColumnString &>(shared_data_tuple.getColumn(1));
-
-        auto & sub_object_data_offsets = column_object.getSharedDataOffsets();
-        auto [sub_object_shared_data_paths, sub_object_shared_data_values] = column_object.getSharedDataPathsAndValues();
-        StringRef prefix_ref(path_prefix);
-        for (size_t i = prev_size; i != shared_data_offsets.size(); ++i)
-        {
-            size_t start = shared_data_offsets[ssize_t(i) - 1];
-            size_t end = shared_data_offsets[ssize_t(i)];
-            size_t lower_bound_index = ColumnObject::findPathLowerBoundInSharedData(prefix_ref, shared_data_paths, start, end);
-            for (; lower_bound_index != end; ++lower_bound_index)
-            {
-                auto path = shared_data_paths.getDataAt(lower_bound_index).toView();
-                if (!path.starts_with(path_prefix))
-                    break;
-
-                /// Don't include path that is equal to the prefix.
-                if (path.size() != path_prefix.size())
-                {
-                    auto sub_path = getSubPath(path, path_prefix);
-                    sub_object_shared_data_paths->insertData(sub_path.data(), sub_path.size());
-                    sub_object_shared_data_values->insertFrom(shared_data_values, lower_bound_index);
-                }
-            }
-            sub_object_data_offsets.push_back(sub_object_shared_data_paths->size());
-        }
-    }
-    settings.path.pop_back();
-}
-
-}
diff --git a/src/DataTypes/Serializations/SerializationSubObject.h b/src/DataTypes/Serializations/SerializationSubObject.h
deleted file mode 100644
index 10973b48957..00000000000
--- a/src/DataTypes/Serializations/SerializationSubObject.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#pragma once
-
-#include <DataTypes/Serializations/ISerialization.h>
-#include <DataTypes/Serializations/SimpleTextSerialization.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-/// Serialization of a sub-object Object subcolumns.
-/// For example, if we have type JSON and data {"a" : {"b" : {"c" : 42, "d" : "Hello"}}, "c" : [1, 2, 3], "d" : 42}
-/// this class will be responsible for reading sub-object a.b and will read JSON column with data {"c" : 43, "d" : "Hello"}.
-class SerializationSubObject final : public SimpleTextSerialization
-{
-public:
-    SerializationSubObject(const String & path_prefix_, const std::unordered_map<String, SerializationPtr> & typed_paths_serializations_);
-
-    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,
-        SubstreamsDeserializeStatesCache * cache) 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 &, WriteBuffer &, const FormatSettings &) const override { throwNoSerialization(); }
-    void deserializeBinary(Field &, ReadBuffer &, const FormatSettings &) const override { throwNoSerialization(); }
-    void serializeBinary(const IColumn &, size_t, WriteBuffer &, const FormatSettings &) const override { throwNoSerialization(); }
-    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(); }
-
-private:
-    [[noreturn]] static void throwNoSerialization()
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Text/binary serialization is not implemented for object sub-object subcolumn");
-    }
-
-    String path_prefix;
-    std::unordered_map<String, SerializationPtr> typed_paths_serializations;
-    SerializationPtr dynamic_serialization;
-    SerializationPtr shared_data_serialization;
-};
-
-}
diff --git a/src/DataTypes/Serializations/SerializationTuple.cpp b/src/DataTypes/Serializations/SerializationTuple.cpp
index 594a23ab507..7a5227ca752 100644
--- a/src/DataTypes/Serializations/SerializationTuple.cpp
+++ b/src/DataTypes/Serializations/SerializationTuple.cpp
@@ -34,7 +34,7 @@ static inline const IColumn & extractElementColumn(const IColumn & column, size_
 
 void SerializationTuple::serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings & settings) const
 {
-    const auto & tuple = field.safeGet<const Tuple &>();
+    const auto & tuple = field.get<const Tuple &>();
     for (size_t element_index = 0; element_index < elems.size(); ++element_index)
     {
         const auto & serialization = elems[element_index];
@@ -47,7 +47,7 @@ void SerializationTuple::deserializeBinary(Field & field, ReadBuffer & istr, con
     const size_t size = elems.size();
 
     field = Tuple();
-    Tuple & tuple = field.safeGet<Tuple &>();
+    Tuple & tuple = field.get<Tuple &>();
     tuple.reserve(size);
     for (size_t i = 0; i < size; ++i)
         elems[i]->deserializeBinary(tuple.emplace_back(), istr, settings);
diff --git a/src/DataTypes/Serializations/SerializationUUID.cpp b/src/DataTypes/Serializations/SerializationUUID.cpp
index f18466ad8ad..58178a896dc 100644
--- a/src/DataTypes/Serializations/SerializationUUID.cpp
+++ b/src/DataTypes/Serializations/SerializationUUID.cpp
@@ -137,7 +137,7 @@ bool SerializationUUID::tryDeserializeTextCSV(IColumn & column, ReadBuffer & ist
 
 void SerializationUUID::serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings &) const
 {
-    UUID x = field.safeGet<UUID>();
+    UUID x = field.get<UUID>();
     writeBinaryLittleEndian(x, ostr);
 }
 
diff --git a/src/DataTypes/Serializations/SerializationVariant.cpp b/src/DataTypes/Serializations/SerializationVariant.cpp
index 0f6a17ef167..e4d71e84cc7 100644
--- a/src/DataTypes/Serializations/SerializationVariant.cpp
+++ b/src/DataTypes/Serializations/SerializationVariant.cpp
@@ -218,8 +218,7 @@ void SerializationVariant::serializeBinaryBulkWithMultipleStreamsAndUpdateVarian
     size_t limit,
     SerializeBinaryBulkSettings & settings,
     SerializeBinaryBulkStatePtr & state,
-    std::unordered_map<String, size_t> & variants_statistics,
-    size_t & total_size_of_variants) const
+    std::unordered_map<String, size_t> & variants_statistics) const
 {
     const ColumnVariant & col = assert_cast<const ColumnVariant &>(column);
     if (const size_t size = col.size(); limit == 0 || offset + limit > size)
@@ -266,7 +265,6 @@ void SerializationVariant::serializeBinaryBulkWithMultipleStreamsAndUpdateVarian
         /// 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->variant_states[non_empty_global_discr]);
         variants_statistics[variant_names[non_empty_global_discr]] += limit;
-        total_size_of_variants += limit;
         settings.path.pop_back();
         settings.path.pop_back();
         return;
@@ -317,9 +315,7 @@ void SerializationVariant::serializeBinaryBulkWithMultipleStreamsAndUpdateVarian
         {
             addVariantElementToPath(settings.path, i);
             variants[i]->serializeBinaryBulkWithMultipleStreams(col.getVariantByGlobalDiscriminator(i), 0, 0, settings, variant_state->variant_states[i]);
-            size_t variant_size = col.getVariantByGlobalDiscriminator(i).size();
-            variants_statistics[variant_names[i]] += variant_size;
-            total_size_of_variants += variant_size;
+            variants_statistics[variant_names[i]] += col.getVariantByGlobalDiscriminator(i).size();
             settings.path.pop_back();
         }
         settings.path.pop_back();
@@ -390,7 +386,6 @@ void SerializationVariant::serializeBinaryBulkWithMultipleStreamsAndUpdateVarian
                 settings,
                 variant_state->variant_states[i]);
             variants_statistics[variant_names[i]] += variant_offsets_and_limits[i].second;
-            total_size_of_variants += variant_offsets_and_limits[i].second;
             settings.path.pop_back();
         }
     }
@@ -405,8 +400,7 @@ void SerializationVariant::serializeBinaryBulkWithMultipleStreams(
     DB::ISerialization::SerializeBinaryBulkStatePtr & state) const
 {
     std::unordered_map<String, size_t> tmp_statistics;
-    size_t tmp_size;
-    serializeBinaryBulkWithMultipleStreamsAndUpdateVariantStatistics(column, offset, limit, settings, state, tmp_statistics, tmp_size);
+    serializeBinaryBulkWithMultipleStreamsAndUpdateVariantStatistics(column, offset, limit, settings, state, tmp_statistics);
 }
 
 void SerializationVariant::deserializeBinaryBulkWithMultipleStreams(
@@ -1074,16 +1068,6 @@ void SerializationVariant::serializeTextJSON(const IColumn & column, size_t row_
         variants[global_discr]->serializeTextJSON(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
 }
 
-void SerializationVariant::serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) 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]->serializeTextJSONPretty(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings, indent);
-}
-
 bool SerializationVariant::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
     String field;
diff --git a/src/DataTypes/Serializations/SerializationVariant.h b/src/DataTypes/Serializations/SerializationVariant.h
index a76a211e897..af89632cf81 100644
--- a/src/DataTypes/Serializations/SerializationVariant.h
+++ b/src/DataTypes/Serializations/SerializationVariant.h
@@ -113,8 +113,7 @@ public:
         size_t limit,
         SerializeBinaryBulkSettings & settings,
         SerializeBinaryBulkStatePtr & state,
-        std::unordered_map<String, size_t> & variants_statistics,
-        size_t & total_size_of_variants) const;
+        std::unordered_map<String, size_t> & variants_statistics) const;
 
     void deserializeBinaryBulkWithMultipleStreams(
         ColumnPtr & column,
@@ -146,7 +145,6 @@ public:
     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 serializeTextJSONPretty(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings, size_t indent) const override;
     void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
     bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
 
diff --git a/src/DataTypes/Serializations/SerializationVariantElement.cpp b/src/DataTypes/Serializations/SerializationVariantElement.cpp
index 9ad183a159e..03b5d9584e0 100644
--- a/src/DataTypes/Serializations/SerializationVariantElement.cpp
+++ b/src/DataTypes/Serializations/SerializationVariantElement.cpp
@@ -193,6 +193,16 @@ void SerializationVariantElement::deserializeBinaryBulkWithMultipleStreams(
     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(num_new_discriminators);
+        return;
+    }
+
     /// If there was nothing to deserialize or nothing was actually deserialized when variant_limit > 0, just insert defaults.
     /// The second case means that we don't have a stream for such sub-column. It may happen during ALTER MODIFY column with Variant extension.
     if (variant_limit == 0 || variant_element_state->variant->empty())
@@ -295,10 +305,8 @@ SerializationVariantElement::VariantSubcolumnCreator::VariantSubcolumnCreator(
     const String & variant_element_name_,
     ColumnVariant::Discriminator global_variant_discriminator_,
     ColumnVariant::Discriminator local_variant_discriminator_,
-    bool make_nullable_,
-    const ColumnPtr & null_map_)
+    bool make_nullable_)
     : local_discriminators(local_discriminators_)
-    , null_map(null_map_)
     , variant_element_name(variant_element_name_)
     , global_variant_discriminator(global_variant_discriminator_)
     , local_variant_discriminator(local_variant_discriminator_)
@@ -306,13 +314,12 @@ SerializationVariantElement::VariantSubcolumnCreator::VariantSubcolumnCreator(
 {
 }
 
-
-DataTypePtr SerializationVariantElement::VariantSubcolumnCreator::create(const DataTypePtr & prev) const
+DataTypePtr SerializationVariantElement::VariantSubcolumnCreator::create(const DB::DataTypePtr & prev) const
 {
     return make_nullable ? makeNullableOrLowCardinalityNullableSafe(prev) : prev;
 }
 
-SerializationPtr SerializationVariantElement::VariantSubcolumnCreator::create(const SerializationPtr & prev) const
+SerializationPtr SerializationVariantElement::VariantSubcolumnCreator::create(const DB::SerializationPtr & prev) const
 {
     return std::make_shared<SerializationVariantElement>(prev, variant_element_name, global_variant_discriminator);
 }
@@ -332,16 +339,12 @@ ColumnPtr SerializationVariantElement::VariantSubcolumnCreator::create(const DB:
         return res;
     }
 
-    /// In general case we should iterate through discriminators and create null-map for our variant if we don't already have it.
-    std::optional<NullMap> null_map_from_discriminators;
-    if (!null_map)
-    {
-        null_map_from_discriminators = NullMap();
-        null_map_from_discriminators->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_from_discriminators->push_back(local_discr != local_variant_discriminator);
-    }
+    /// 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);
@@ -353,21 +356,13 @@ ColumnPtr SerializationVariantElement::VariantSubcolumnCreator::create(const DB:
     if (make_nullable && prev->lowCardinality())
         res_column = assert_cast<ColumnLowCardinality &>(*res_column).cloneNullable();
 
-    if (null_map_from_discriminators)
-        res_column->expand(*null_map_from_discriminators, /*inverted = */ true);
-    else
-        res_column->expand(assert_cast<const ColumnUInt8 &>(*null_map).getData(), /*inverted = */ true);
+    res_column->expand(null_map, /*inverted = */ true);
 
     if (make_nullable && prev->canBeInsideNullable())
     {
-        if (null_map_from_discriminators)
-        {
-            auto null_map_col = ColumnUInt8::create();
-            null_map_col->getData() = std::move(*null_map_from_discriminators);
-            return ColumnNullable::create(std::move(res_column), std::move(null_map_col));
-        }
-
-        return ColumnNullable::create(std::move(res_column), null_map->assumeMutable());
+        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
index 64f86eb2190..69101aea0f5 100644
--- a/src/DataTypes/Serializations/SerializationVariantElement.h
+++ b/src/DataTypes/Serializations/SerializationVariantElement.h
@@ -63,22 +63,18 @@ public:
 
     struct VariantSubcolumnCreator : public ISubcolumnCreator
     {
-    private:
         const ColumnPtr local_discriminators;
-        const ColumnPtr null_map; /// optional
         const String variant_element_name;
         const ColumnVariant::Discriminator global_variant_discriminator;
         const ColumnVariant::Discriminator local_variant_discriminator;
         bool make_nullable;
 
-    public:
         VariantSubcolumnCreator(
             const ColumnPtr & local_discriminators_,
             const String & variant_element_name_,
             ColumnVariant::Discriminator global_variant_discriminator_,
             ColumnVariant::Discriminator local_variant_discriminator_,
-            bool make_nullable_,
-            const ColumnPtr & null_map_ = nullptr);
+            bool make_nullable_);
 
         DataTypePtr create(const DataTypePtr & prev) const override;
         ColumnPtr create(const ColumnPtr & prev) const override;
diff --git a/src/DataTypes/Serializations/tests/gtest_deprecated_object_serialization.cpp b/src/DataTypes/Serializations/tests/gtest_deprecated_object_serialization.cpp
deleted file mode 100644
index ec53df18297..00000000000
--- a/src/DataTypes/Serializations/tests/gtest_deprecated_object_serialization.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-#include <Columns/ColumnObjectDeprecated.h>
-#include <Columns/ColumnString.h>
-#include <DataTypes/DataTypeObjectDeprecated.h>
-#include <DataTypes/Serializations/SerializationObjectDeprecated.h>
-#include <DataTypes/Serializations/SerializationString.h>
-#include <IO/ReadBufferFromString.h>
-#include <IO/WriteBufferFromString.h>
-#include <IO/WriteHelpers.h>
-#include <Common/FieldVisitorToString.h>
-
-#include <gtest/gtest.h>
-
-#if USE_SIMDJSON
-
-using namespace DB;
-
-TEST(SerializationObjectDeprecated, FromString)
-{
-    WriteBufferFromOwnString out;
-
-    auto column_string = ColumnString::create();
-    column_string->insert(R"({"k1" : 1, "k2" : [{"k3" : "aa", "k4" : 2}, {"k3": "bb", "k4": 3}]})");
-    column_string->insert(R"({"k1" : 2, "k2" : [{"k3" : "cc", "k5" : 4}, {"k4": 5}, {"k4": 6}]})");
-
-    {
-        auto serialization = std::make_shared<SerializationString>();
-
-        ISerialization::SerializeBinaryBulkSettings settings;
-        ISerialization::SerializeBinaryBulkStatePtr state;
-        settings.position_independent_encoding = false;
-        settings.getter = [&out](const auto &) { return &out; };
-
-        writeIntBinary(static_cast<UInt8>(1), out);
-        serialization->serializeBinaryBulkStatePrefix(*column_string, settings, state);
-        serialization->serializeBinaryBulkWithMultipleStreams(*column_string, 0, column_string->size(), settings, state);
-        serialization->serializeBinaryBulkStateSuffix(settings, state);
-    }
-
-    auto type_object = std::make_shared<DataTypeObjectDeprecated>("json", false);
-    ColumnPtr result_column = type_object->createColumn();
-
-    ReadBufferFromOwnString in(out.str());
-
-    {
-        auto serialization = type_object->getDefaultSerialization();
-
-        ISerialization::DeserializeBinaryBulkSettings settings;
-        ISerialization::DeserializeBinaryBulkStatePtr state;
-        settings.position_independent_encoding = false;
-        settings.getter = [&in](const auto &) { return &in; };
-
-        serialization->deserializeBinaryBulkStatePrefix(settings, state, nullptr);
-        serialization->deserializeBinaryBulkWithMultipleStreams(result_column, column_string->size(), settings, state, nullptr);
-    }
-
-    auto & column_object = assert_cast<ColumnObjectDeprecated &>(*result_column->assumeMutable());
-    column_object.finalize();
-
-    ASSERT_TRUE(column_object.size() == 2);
-    ASSERT_TRUE(column_object.getSubcolumns().size() == 4);
-
-    auto check_subcolumn = [&](const auto & name, const auto & type_name, const std::vector<Field> & expected)
-    {
-        const auto & subcolumn = column_object.getSubcolumn(PathInData{name});
-        ASSERT_EQ(subcolumn.getLeastCommonType()->getName(), type_name);
-
-        const auto & data = subcolumn.getFinalizedColumn();
-        for (size_t i = 0; i < expected.size(); ++i)
-            ASSERT_EQ(
-                applyVisitor(FieldVisitorToString(), data[i]),
-                applyVisitor(FieldVisitorToString(), expected[i]));
-    };
-
-    check_subcolumn("k1", "Int8", {1, 2});
-    check_subcolumn("k2.k3", "Array(String)", {Array{"aa", "bb"}, Array{"cc", "", ""}});
-    check_subcolumn("k2.k4", "Array(Int8)", {Array{2, 3}, Array{0, 5, 6}});
-    check_subcolumn("k2.k5", "Array(Int8)", {Array{0, 0}, Array{4, 0, 0}});
-}
-
-#endif
diff --git a/src/DataTypes/Serializations/tests/gtest_object_serialization.cpp b/src/DataTypes/Serializations/tests/gtest_object_serialization.cpp
index f104b75af9b..c6337a31fce 100644
--- a/src/DataTypes/Serializations/tests/gtest_object_serialization.cpp
+++ b/src/DataTypes/Serializations/tests/gtest_object_serialization.cpp
@@ -1,98 +1,80 @@
-#include <Columns/ColumnObject.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/Serializations/SerializationObject.h>
+#include <DataTypes/Serializations/SerializationString.h>
 #include <IO/ReadBufferFromString.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+#include <DataTypes/DataTypeObject.h>
+#include <DataTypes/Serializations/SerializationObject.h>
+#include <Columns/ColumnObject.h>
+#include <Columns/ColumnString.h>
+#include <Common/FieldVisitorToString.h>
 
 #include <gtest/gtest.h>
 
+#if USE_SIMDJSON
+
 using namespace DB;
 
-TEST(ObjectSerialization, FieldBinarySerialization)
+TEST(SerializationObject, FromString)
 {
-    auto type = DataTypeFactory::instance().get("JSON(max_dynamic_types=10, max_dynamic_paths=2, a.b UInt32, a.c Array(String))");
-    auto serialization = type->getDefaultSerialization();
-    Object object1 = Object{{"a.c", Array{"Str1", "Str2"}}, {"a.d", Field(42)}, {"a.e", Tuple{Field(43), "Str3"}}};
-    WriteBufferFromOwnString ostr;
-    serialization->serializeBinary(object1, ostr, FormatSettings());
-    ReadBufferFromString istr(ostr.str());
-    Field object2;
-    serialization->deserializeBinary(object2, istr, FormatSettings());
-    ASSERT_EQ(object1, object2.safeGet<Object>());
+    WriteBufferFromOwnString out;
+
+    auto column_string = ColumnString::create();
+    column_string->insert(R"({"k1" : 1, "k2" : [{"k3" : "aa", "k4" : 2}, {"k3": "bb", "k4": 3}]})");
+    column_string->insert(R"({"k1" : 2, "k2" : [{"k3" : "cc", "k5" : 4}, {"k4": 5}, {"k4": 6}]})");
+
+    {
+        auto serialization = std::make_shared<SerializationString>();
+
+        ISerialization::SerializeBinaryBulkSettings settings;
+        ISerialization::SerializeBinaryBulkStatePtr state;
+        settings.position_independent_encoding = false;
+        settings.getter = [&out](const auto &) { return &out; };
+
+        writeIntBinary(static_cast<UInt8>(1), out);
+        serialization->serializeBinaryBulkStatePrefix(*column_string, settings, state);
+        serialization->serializeBinaryBulkWithMultipleStreams(*column_string, 0, column_string->size(), settings, state);
+        serialization->serializeBinaryBulkStateSuffix(settings, state);
+    }
+
+    auto type_object = std::make_shared<DataTypeObject>("json", false);
+    ColumnPtr result_column = type_object->createColumn();
+
+    ReadBufferFromOwnString in(out.str());
+
+    {
+        auto serialization = type_object->getDefaultSerialization();
+
+        ISerialization::DeserializeBinaryBulkSettings settings;
+        ISerialization::DeserializeBinaryBulkStatePtr state;
+        settings.position_independent_encoding = false;
+        settings.getter = [&in](const auto &) { return &in; };
+
+        serialization->deserializeBinaryBulkStatePrefix(settings, state, nullptr);
+        serialization->deserializeBinaryBulkWithMultipleStreams(result_column, column_string->size(), settings, state, nullptr);
+    }
+
+    auto & column_object = assert_cast<ColumnObject &>(*result_column->assumeMutable());
+    column_object.finalize();
+
+    ASSERT_TRUE(column_object.size() == 2);
+    ASSERT_TRUE(column_object.getSubcolumns().size() == 4);
+
+    auto check_subcolumn = [&](const auto & name, const auto & type_name, const std::vector<Field> & expected)
+    {
+        const auto & subcolumn = column_object.getSubcolumn(PathInData{name});
+        ASSERT_EQ(subcolumn.getLeastCommonType()->getName(), type_name);
+
+        const auto & data = subcolumn.getFinalizedColumn();
+        for (size_t i = 0; i < expected.size(); ++i)
+            ASSERT_EQ(
+                applyVisitor(FieldVisitorToString(), data[i]),
+                applyVisitor(FieldVisitorToString(), expected[i]));
+    };
+
+    check_subcolumn("k1", "Int8", {1, 2});
+    check_subcolumn("k2.k3", "Array(String)", {Array{"aa", "bb"}, Array{"cc", "", ""}});
+    check_subcolumn("k2.k4", "Array(Int8)", {Array{2, 3}, Array{0, 5, 6}});
+    check_subcolumn("k2.k5", "Array(Int8)", {Array{0, 0}, Array{4, 0, 0}});
 }
 
-
-TEST(ObjectSerialization, ColumnBinarySerialization)
-{
-    auto type = DataTypeFactory::instance().get("JSON(max_dynamic_types=10, max_dynamic_paths=2, a.b UInt32, a.c Array(String))");
-    auto serialization = type->getDefaultSerialization();
-    auto col = type->createColumn();
-    auto & col_object = assert_cast<ColumnObject &>(*col);
-    col_object.insert(Object{{"a.c", Array{"Str1", "Str2"}}, {"a.d", Field(42)}, {"a.e", Tuple{Field(43), "Str3"}}});
-    WriteBufferFromOwnString ostr1;
-    serialization->serializeBinary(col_object, 0, ostr1, FormatSettings());
-    ReadBufferFromString istr1(ostr1.str());
-    serialization->deserializeBinary(col_object, istr1, FormatSettings());
-    ASSERT_EQ(col_object[0], col_object[1]);
-    col_object.insert(Object{{"a.c", Array{"Str1", "Str2"}}, {"a.e", Field(42)}, {"b.d", Field(42)}, {"b.e", Tuple{Field(43), "Str3"}}, {"b.g", Field("Str4")}});
-    WriteBufferFromOwnString ostr2;
-    serialization->serializeBinary(col_object, 2, ostr2, FormatSettings());
-    ReadBufferFromString istr2(ostr2.str());
-    serialization->deserializeBinary(col_object, istr2, FormatSettings());
-    ASSERT_EQ(col_object[2], col_object[3]);
-}
-
-TEST(ObjectSerialization, JSONSerialization)
-{
-    auto type = DataTypeFactory::instance().get("JSON(max_dynamic_types=10, max_dynamic_paths=2, a.b UInt32, a.c Array(String))");
-    auto serialization = type->getDefaultSerialization();
-    auto col = type->createColumn();
-    auto & col_object = assert_cast<ColumnObject &>(*col);
-    col_object.insert(Object{{"a.c", Array{"Str1", "Str2"}}, {"a.d", Field(42)}, {"a.e", Tuple{Field(43), "Str3"}}});
-    col_object.insert(Object{{"a.c", Array{"Str1", "Str2"}}, {"a", Tuple{Field(43), "Str3"}}, {"a.b.c", Field(42)}, {"a.b.e", Field(43)}, {"b.c.d.e", Field(42)}, {"b.c.d.g", Field(43)}, {"b.c.h.r", Field(44)}, {"c.g.h.t", Array{Field("Str"), Field("Str2")}}, {"h", Field("Str")}, {"j", Field("Str")}});
-    WriteBufferFromOwnString buf1;
-    serialization->serializeTextJSON(col_object, 1, buf1, FormatSettings());
-    ASSERT_EQ(buf1.str(), R"({"a":[43,"Str3"],"a":{"b":0,"b":{"c":42,"e":43},"c":["Str1","Str2"]},"b":{"c":{"d":{"e":42,"g":43},"h":{"r":44}}},"c":{"g":{"h":{"t":["Str","Str2"]}}},"h":"Str","j":"Str"})");
-    WriteBufferFromOwnString buf2;
-    serialization->serializeTextJSONPretty(col_object, 1, buf2, FormatSettings(), 0);
-    ASSERT_EQ(buf2.str(), R"({
-    "a" : [
-        43,
-        "Str3"
-    ],
-    "a" : {
-        "b" : 0,
-        "b" : {
-            "c" : 42,
-            "e" : 43
-        },
-        "c" : [
-            "Str1",
-            "Str2"
-        ]
-    },
-    "b" : {
-        "c" : {
-            "d" : {
-                "e" : 42,
-                "g" : 43
-            },
-            "h" : {
-                "r" : 44
-            }
-        }
-    },
-    "c" : {
-        "g" : {
-            "h" : {
-                "t" : [
-                    "Str",
-                    "Str2"
-                ]
-            }
-        }
-    },
-    "h" : "Str",
-    "j" : "Str"
-})");
-
-}
+#endif
diff --git a/src/DataTypes/Utils.cpp b/src/DataTypes/Utils.cpp
index a6e9452d7ef..e7e69e379af 100644
--- a/src/DataTypes/Utils.cpp
+++ b/src/DataTypes/Utils.cpp
@@ -216,7 +216,6 @@ bool canBeSafelyCasted(const DataTypePtr & from_type, const DataTypePtr & to_typ
             return false;
         }
         case TypeIndex::String:
-        case TypeIndex::ObjectDeprecated:
         case TypeIndex::Object:
         case TypeIndex::Set:
         case TypeIndex::Interval:
diff --git a/src/DataTypes/fuzzers/CMakeLists.txt b/src/DataTypes/fuzzers/CMakeLists.txt
index e54ef0a860c..939bf5f5e3f 100644
--- a/src/DataTypes/fuzzers/CMakeLists.txt
+++ b/src/DataTypes/fuzzers/CMakeLists.txt
@@ -1,2 +1,2 @@
 clickhouse_add_executable(data_type_deserialization_fuzzer data_type_deserialization_fuzzer.cpp ${SRCS})
-target_link_libraries(data_type_deserialization_fuzzer PRIVATE clickhouse_functions clickhouse_aggregate_functions)
+target_link_libraries(data_type_deserialization_fuzzer PRIVATE dbms clickhouse_aggregate_functions)
diff --git a/src/DataTypes/fuzzers/data_type_deserialization_fuzzer.cpp b/src/DataTypes/fuzzers/data_type_deserialization_fuzzer.cpp
index f9a733647e1..033a6ea8a4a 100644
--- a/src/DataTypes/fuzzers/data_type_deserialization_fuzzer.cpp
+++ b/src/DataTypes/fuzzers/data_type_deserialization_fuzzer.cpp
@@ -12,30 +12,35 @@
 
 #include <AggregateFunctions/registerAggregateFunctions.h>
 
-using namespace DB;
-
-
-ContextMutablePtr context;
-
-extern "C" int LLVMFuzzerInitialize(int *, char ***)
-{
-    if (context)
-        return true;
-
-    SharedContextHolder shared_context = Context::createShared();
-    context = Context::createGlobal(shared_context.get());
-    context->makeGlobalContext();
-
-    MainThreadStatus::getInstance();
-
-    registerAggregateFunctions();
-    return 0;
-}
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 {
     try
     {
+        using namespace DB;
+
+        static SharedContextHolder shared_context;
+        static ContextMutablePtr context;
+
+        auto initialize = [&]() mutable
+        {
+            if (context)
+                return true;
+
+            shared_context = Context::createShared();
+            context = Context::createGlobal(shared_context.get());
+            context->makeGlobalContext();
+            context->setApplicationType(Context::ApplicationType::LOCAL);
+
+            MainThreadStatus::getInstance();
+
+            registerAggregateFunctions();
+            return true;
+        };
+
+        static bool initialized = initialize();
+        (void) initialized;
+
         total_memory_tracker.resetCounters();
         total_memory_tracker.setHardLimit(1_GiB);
         CurrentThread::get().memory_tracker.resetCounters();
diff --git a/src/DataTypes/getLeastSupertype.cpp b/src/DataTypes/getLeastSupertype.cpp
index 65df529e78b..a71b19d6c92 100644
--- a/src/DataTypes/getLeastSupertype.cpp
+++ b/src/DataTypes/getLeastSupertype.cpp
@@ -228,39 +228,6 @@ void convertUInt64toInt64IfPossible(const DataTypes & types, TypeIndexSet & type
     }
 }
 
-DataTypePtr findSmallestIntervalSuperType(const DataTypes &types, TypeIndexSet &types_set)
-{
-    auto min_interval = IntervalKind::Kind::Year;
-    DataTypePtr smallest_type;
-
-    bool is_higher_interval = false; // For Years, Quarters and Months
-
-    for (const auto &type : types)
-    {
-        if (const auto * interval_type = typeid_cast<const DataTypeInterval *>(type.get()))
-        {
-            auto current_interval = interval_type->getKind().kind;
-            if (current_interval > IntervalKind::Kind::Week)
-                is_higher_interval = true;
-            if (current_interval < min_interval)
-            {
-                min_interval = current_interval;
-                smallest_type = type;
-            }
-        }
-    }
-
-    if (is_higher_interval && min_interval <= IntervalKind::Kind::Week)
-        throw Exception(ErrorCodes::NO_COMMON_TYPE, "Cannot compare intervals {} and {} because the number of days in a month is not fixed", types[0]->getName(), types[1]->getName());
-
-    if (smallest_type)
-    {
-        types_set.clear();
-        types_set.insert(smallest_type->getTypeId());
-    }
-
-    return smallest_type;
-}
 }
 
 template <LeastSupertypeOnError on_error>
@@ -685,13 +652,6 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
             return numeric_type;
     }
 
-    /// For interval data types.
-    {
-        auto res = findSmallestIntervalSuperType(types, type_ids);
-        if (res)
-            return res;
-    }
-
     /// All other data types (UUID, AggregateFunction, Enum...) are compatible only if they are the same (checked in trivial cases).
     return throwOrReturn<on_error>(types, "", ErrorCodes::NO_COMMON_TYPE);
 }
diff --git a/src/DataTypes/getLeastSupertype.h b/src/DataTypes/getLeastSupertype.h
index 55d8e8fff0d..2ae1e52ca96 100644
--- a/src/DataTypes/getLeastSupertype.h
+++ b/src/DataTypes/getLeastSupertype.h
@@ -1,7 +1,5 @@
 #pragma once
 #include <DataTypes/IDataType.h>
-#include <DataTypes/DataTypeInterval.h>
-#include <Common/IntervalKind.h>
 
 namespace DB
 {
@@ -50,7 +48,4 @@ DataTypePtr getLeastSupertypeOrString(const TypeIndexSet & types);
 
 DataTypePtr tryGetLeastSupertype(const TypeIndexSet & types);
 
-/// A vector that shows the conversion rates to the next Interval type starting from NanoSecond
-static std::vector<int> interval_conversions = {1, 1000, 1000, 1000, 60, 60, 24, 7, 4, 3, 4};
-
 }
diff --git a/src/DataTypes/registerDataTypeDateTime.cpp b/src/DataTypes/registerDataTypeDateTime.cpp
index 9a632bd381b..84a52d4affb 100644
--- a/src/DataTypes/registerDataTypeDateTime.cpp
+++ b/src/DataTypes/registerDataTypeDateTime.cpp
@@ -55,7 +55,7 @@ getArgument(const ASTPtr & arguments, size_t argument_index, const char * argume
         }
     }
 
-    return argument->value.safeGet<NearestResultType>();
+    return argument->value.get<NearestResultType>();
 }
 
 static DataTypePtr create(const ASTPtr & arguments)
diff --git a/src/DataTypes/tests/gtest_data_types_binary_encoding.cpp b/src/DataTypes/tests/gtest_data_types_binary_encoding.cpp
index 789aeac566f..4d0bfc67183 100644
--- a/src/DataTypes/tests/gtest_data_types_binary_encoding.cpp
+++ b/src/DataTypes/tests/gtest_data_types_binary_encoding.cpp
@@ -126,7 +126,4 @@ GTEST_TEST(DataTypesBinaryEncoding, EncodeAndDecode)
     check(DataTypeFactory::instance().get("Polygon"));
     check(DataTypeFactory::instance().get("MultiPolygon"));
     check(DataTypeFactory::instance().get("Tuple(Map(LowCardinality(String), Array(AggregateFunction(2, quantiles(0.1, 0.2), Float32))), Array(Array(Tuple(UInt32, Tuple(a Map(String, String), b Nullable(Date), c Variant(Tuple(g String, d Array(UInt32)), Date, Map(String, String)))))))"));
-    check(DataTypeFactory::instance().get("JSON"));
-    check(DataTypeFactory::instance().get("JSON(max_dynamic_paths=10)"));
-    check(DataTypeFactory::instance().get("JSON(max_dynamic_paths=10, max_dynamic_types=10, a.b.c UInt32, SKIP a.c, b.g String, SKIP l.d.f)"));
 }
diff --git a/src/Databases/DDLLoadingDependencyVisitor.cpp b/src/Databases/DDLLoadingDependencyVisitor.cpp
index b91aa84ecd3..67bce915168 100644
--- a/src/Databases/DDLLoadingDependencyVisitor.cpp
+++ b/src/Databases/DDLLoadingDependencyVisitor.cpp
@@ -183,7 +183,7 @@ void DDLLoadingDependencyVisitor::extractTableNameFromArgument(const ASTFunction
         if (name->value.getType() != Field::Types::String)
             return;
 
-        auto maybe_qualified_name = QualifiedTableName::tryParseFromString(name->value.safeGet<String>());
+        auto maybe_qualified_name = QualifiedTableName::tryParseFromString(name->value.get<String>());
         if (!maybe_qualified_name)
             return;
 
@@ -194,7 +194,7 @@ void DDLLoadingDependencyVisitor::extractTableNameFromArgument(const ASTFunction
         if (literal->value.getType() != Field::Types::String)
             return;
 
-        auto maybe_qualified_name = QualifiedTableName::tryParseFromString(literal->value.safeGet<String>());
+        auto maybe_qualified_name = QualifiedTableName::tryParseFromString(literal->value.get<String>());
         /// Just return if name if invalid
         if (!maybe_qualified_name)
             return;
diff --git a/src/Databases/DDLRenamingVisitor.cpp b/src/Databases/DDLRenamingVisitor.cpp
index 7556223b30e..38e100e2470 100644
--- a/src/Databases/DDLRenamingVisitor.cpp
+++ b/src/Databases/DDLRenamingVisitor.cpp
@@ -180,7 +180,7 @@ namespace
 
         if (database_name_field && table_name_field)
         {
-            QualifiedTableName qualified_name{database_name_field->safeGet<String>(), table_name_field->safeGet<String>()};
+            QualifiedTableName qualified_name{database_name_field->get<String>(), table_name_field->get<String>()};
             if (!qualified_name.database.empty() && !qualified_name.table.empty())
             {
                 auto new_qualified_name = data.renaming_map.getNewTableName(qualified_name);
@@ -207,7 +207,7 @@ namespace
             if (literal->value.getType() != Field::Types::String)
                 return;
 
-            auto maybe_qualified_name = QualifiedTableName::tryParseFromString(literal->value.safeGet<String>());
+            auto maybe_qualified_name = QualifiedTableName::tryParseFromString(literal->value.get<String>());
             /// Just return if name if invalid
             if (!maybe_qualified_name || maybe_qualified_name->database.empty() || maybe_qualified_name->table.empty())
                 return;
@@ -247,7 +247,7 @@ namespace
         if (!literal || (literal->value.getType() != Field::Types::String))
             return;
 
-        auto database_name = literal->value.safeGet<String>();
+        auto database_name = literal->value.get<String>();
         if (database_name.empty())
             return;
 
diff --git a/src/Databases/DatabaseDictionary.cpp b/src/Databases/DatabaseDictionary.cpp
index f3cfdd4fd12..942ffe6fd62 100644
--- a/src/Databases/DatabaseDictionary.cpp
+++ b/src/Databases/DatabaseDictionary.cpp
@@ -111,7 +111,7 @@ ASTPtr DatabaseDictionary::getCreateTableQueryImpl(const String & table_name, Co
         buffer << ") Engine = Dictionary(" << backQuoteIfNeed(table_name) << ")";
     }
 
-    const auto & settings = getContext()->getSettingsRef();
+    auto settings = getContext()->getSettingsRef();
     ParserCreateQuery parser;
     const char * pos = query.data();
     std::string error_message;
@@ -133,7 +133,7 @@ ASTPtr DatabaseDictionary::getCreateDatabaseQuery() const
         if (const auto comment_value = getDatabaseComment(); !comment_value.empty())
             buffer << " COMMENT " << backQuote(comment_value);
     }
-    const auto & settings = getContext()->getSettingsRef();
+    auto settings = getContext()->getSettingsRef();
     ParserCreateQuery parser;
     return parseQuery(parser, query.data(), query.data() + query.size(), "", 0, settings.max_parser_depth, settings.max_parser_backtracks);
 }
diff --git a/src/Databases/DatabaseHDFS.cpp b/src/Databases/DatabaseHDFS.cpp
index 7fa67a5678e..eccaae5f22e 100644
--- a/src/Databases/DatabaseHDFS.cpp
+++ b/src/Databases/DatabaseHDFS.cpp
@@ -51,7 +51,7 @@ DatabaseHDFS::DatabaseHDFS(const String & name_, const String & source_url, Cont
     if (!source.empty())
     {
         if (!re2::RE2::FullMatch(source, std::string(HDFS_HOST_REGEXP)))
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad HDFS host: {}. "
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad hdfs host: {}. "
                             "It should have structure 'hdfs://<host_name>:<port>'", source);
 
         context_->getGlobalContext()->getRemoteHostFilter().checkURL(Poco::URI(source));
@@ -75,8 +75,8 @@ std::string DatabaseHDFS::getTablePath(const std::string & table_name) const
         return table_name;
 
     if (source.empty())
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad HDFS URL: {}. "
-            "It should have the following structure 'hdfs://<host_name>:<port>/path'", table_name);
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad hdfs url: {}. "
+                        "It should have structure 'hdfs://<host_name>:<port>/path'", table_name);
 
     return fs::path(source) / table_name;
 }
diff --git a/src/Databases/DatabaseLazy.cpp b/src/Databases/DatabaseLazy.cpp
index 2ccdd8510a8..ca30ee6db15 100644
--- a/src/Databases/DatabaseLazy.cpp
+++ b/src/Databases/DatabaseLazy.cpp
@@ -44,7 +44,7 @@ namespace ErrorCodes
 
 
 DatabaseLazy::DatabaseLazy(const String & name_, const String & metadata_path_, time_t expiration_time_, ContextPtr context_)
-    : DatabaseOnDisk(name_, metadata_path_, std::filesystem::path("data") / escapeForFileName(name_) / "", "DatabaseLazy (" + name_ + ")", context_)
+    : DatabaseOnDisk(name_, metadata_path_, "data/" + escapeForFileName(name_) + "/", "DatabaseLazy (" + name_ + ")", context_)
     , expiration_time(expiration_time_)
 {
 }
@@ -52,7 +52,7 @@ DatabaseLazy::DatabaseLazy(const String & name_, const String & metadata_path_,
 
 void DatabaseLazy::loadStoredObjects(ContextMutablePtr local_context, LoadingStrictnessLevel /*mode*/)
 {
-    iterateMetadataFiles([this, &local_context](const String & file_name)
+    iterateMetadataFiles(local_context, [this, &local_context](const String & file_name)
     {
         const std::string table_name = unescapeForFileName(file_name.substr(0, file_name.size() - 4));
 
diff --git a/src/Databases/DatabaseLazy.h b/src/Databases/DatabaseLazy.h
index aeac130594f..4347649117d 100644
--- a/src/Databases/DatabaseLazy.h
+++ b/src/Databases/DatabaseLazy.h
@@ -12,7 +12,7 @@ class DatabaseLazyIterator;
 class Context;
 
 /** Lazy engine of databases.
-  * Works like DatabaseOrdinary, but stores only recently accessed tables in memory.
+  * Works like DatabaseOrdinary, but stores in memory only cache.
   * Can be used only with *Log engines.
   */
 class DatabaseLazy final : public DatabaseOnDisk
diff --git a/src/Databases/DatabaseOnDisk.cpp b/src/Databases/DatabaseOnDisk.cpp
index 81378fc1c64..42730cfd53d 100644
--- a/src/Databases/DatabaseOnDisk.cpp
+++ b/src/Databases/DatabaseOnDisk.cpp
@@ -313,7 +313,7 @@ void DatabaseOnDisk::detachTablePermanently(ContextPtr query_context, const Stri
         std::lock_guard lock(mutex);
         if (const auto it = snapshot_detached_tables.find(table_name); it == snapshot_detached_tables.end())
         {
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Snapshot doesn't contain info about detached table `{}`", table_name);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Snapshot doesn't contain info about detached table={}", table_name);
         }
         else
         {
@@ -504,7 +504,7 @@ void DatabaseOnDisk::renameTable(
 }
 
 
-/// It returns the create table statement (even if table is detached)
+/// It returns create table statement (even if table is detached)
 ASTPtr DatabaseOnDisk::getCreateTableQueryImpl(const String & table_name, ContextPtr, bool throw_on_error) const
 {
     ASTPtr ast;
@@ -534,7 +534,7 @@ ASTPtr DatabaseOnDisk::getCreateDatabaseQuery() const
 {
     ASTPtr ast;
 
-    const auto & settings = getContext()->getSettingsRef();
+    auto settings = getContext()->getSettingsRef();
     {
         std::lock_guard lock(mutex);
         auto database_metadata_path = getContext()->getPath() + "metadata/" + escapeForFileName(database_name) + ".sql";
@@ -568,14 +568,14 @@ void DatabaseOnDisk::drop(ContextPtr local_context)
     assert(TSA_SUPPRESS_WARNING_FOR_READ(tables).empty());
     if (local_context->getSettingsRef().force_remove_data_recursively_on_drop)
     {
-        (void)fs::remove_all(std::filesystem::path(getContext()->getPath()) / data_path);
+        (void)fs::remove_all(local_context->getPath() + getDataPath());
         (void)fs::remove_all(getMetadataPath());
     }
     else
     {
         try
         {
-            (void)fs::remove(std::filesystem::path(getContext()->getPath()) / data_path);
+            (void)fs::remove(local_context->getPath() + getDataPath());
             (void)fs::remove(getMetadataPath());
         }
         catch (const fs::filesystem_error & e)
@@ -613,7 +613,7 @@ time_t DatabaseOnDisk::getObjectMetadataModificationTime(const String & object_n
     }
 }
 
-void DatabaseOnDisk::iterateMetadataFiles(const IteratingFunction & process_metadata_file) const
+void DatabaseOnDisk::iterateMetadataFiles(ContextPtr local_context, const IteratingFunction & process_metadata_file) const
 {
     auto process_tmp_drop_metadata_file = [&](const String & file_name)
     {
@@ -621,7 +621,7 @@ void DatabaseOnDisk::iterateMetadataFiles(const IteratingFunction & process_meta
         static const char * tmp_drop_ext = ".sql.tmp_drop";
         const std::string object_name = file_name.substr(0, file_name.size() - strlen(tmp_drop_ext));
 
-        if (fs::exists(std::filesystem::path(getContext()->getPath()) / data_path / object_name))
+        if (fs::exists(local_context->getPath() + getDataPath() + '/' + object_name))
         {
             fs::rename(getMetadataPath() + file_name, getMetadataPath() + object_name + ".sql");
             LOG_WARNING(log, "Object {} was not dropped previously and will be restored", backQuote(object_name));
@@ -638,7 +638,7 @@ void DatabaseOnDisk::iterateMetadataFiles(const IteratingFunction & process_meta
     std::vector<std::pair<String, bool>> metadata_files;
 
     fs::directory_iterator dir_end;
-    for (fs::directory_iterator dir_it(metadata_path); dir_it != dir_end; ++dir_it)
+    for (fs::directory_iterator dir_it(getMetadataPath()); dir_it != dir_end; ++dir_it)
     {
         String file_name = dir_it->path().filename();
         /// For '.svn', '.gitignore' directory and similar.
@@ -733,7 +733,7 @@ ASTPtr DatabaseOnDisk::parseQueryFromMetadata(
         return nullptr;
     }
 
-    const auto & settings = local_context->getSettingsRef();
+    auto settings = local_context->getSettingsRef();
     ParserCreateQuery parser;
     const char * pos = query.data();
     std::string error_message;
diff --git a/src/Databases/DatabaseOnDisk.h b/src/Databases/DatabaseOnDisk.h
index ffc95a7c128..12656068643 100644
--- a/src/Databases/DatabaseOnDisk.h
+++ b/src/Databases/DatabaseOnDisk.h
@@ -64,7 +64,7 @@ public:
     time_t getObjectMetadataModificationTime(const String & object_name) const override;
 
     String getDataPath() const override { return data_path; }
-    String getTableDataPath(const String & table_name) const override { return std::filesystem::path(data_path) / escapeForFileName(table_name) / ""; }
+    String getTableDataPath(const String & table_name) const override { return data_path + escapeForFileName(table_name) + "/"; }
     String getTableDataPath(const ASTCreateQuery & query) const override { return getTableDataPath(query.getTable()); }
     String getMetadataPath() const override { return metadata_path; }
 
@@ -83,7 +83,7 @@ protected:
 
     using IteratingFunction = std::function<void(const String &)>;
 
-    void iterateMetadataFiles(const IteratingFunction & process_metadata_file) const;
+    void iterateMetadataFiles(ContextPtr context, const IteratingFunction & process_metadata_file) const;
 
     ASTPtr getCreateTableQueryImpl(
         const String & table_name,
diff --git a/src/Databases/DatabaseOrdinary.cpp b/src/Databases/DatabaseOrdinary.cpp
index dd8a3f42ea8..8808261654f 100644
--- a/src/Databases/DatabaseOrdinary.cpp
+++ b/src/Databases/DatabaseOrdinary.cpp
@@ -55,7 +55,7 @@ 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_, std::filesystem::path("data") / escapeForFileName(name_) / "", "DatabaseOrdinary (" + name_ + ")", context_)
+    : DatabaseOrdinary(name_, metadata_path_, "data/" + escapeForFileName(name_) + "/", "DatabaseOrdinary (" + name_ + ")", context_)
 {
 }
 
@@ -265,7 +265,7 @@ void DatabaseOrdinary::loadTablesMetadata(ContextPtr local_context, ParsedTables
         }
     };
 
-    iterateMetadataFiles(process_metadata);
+    iterateMetadataFiles(local_context, process_metadata);
 
     size_t objects_in_database = metadata.parsed_tables.size() - prev_tables_count;
     size_t dictionaries_in_database = metadata.total_dictionaries - prev_total_dictionaries;
diff --git a/src/Databases/DatabaseReplicated.cpp b/src/Databases/DatabaseReplicated.cpp
index 3d64c82ba7d..4c079ae5300 100644
--- a/src/Databases/DatabaseReplicated.cpp
+++ b/src/Databases/DatabaseReplicated.cpp
@@ -12,7 +12,6 @@
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/ZooKeeper/Types.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
-#include <Common/ZooKeeper/IKeeper.h>
 #include <Common/PoolId.h>
 #include <Core/ServerSettings.h>
 #include <Core/Settings.h>
@@ -21,7 +20,6 @@
 #include <Databases/DatabaseReplicatedWorker.h>
 #include <Databases/DDLDependencyVisitor.h>
 #include <Databases/TablesDependencyGraph.h>
-#include <Databases/enableAllExperimentalSettings.h>
 #include <Interpreters/Cluster.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/DatabaseCatalog.h>
@@ -63,7 +61,6 @@ namespace ErrorCodes
     extern const int NO_ACTIVE_REPLICAS;
     extern const int CANNOT_GET_REPLICATED_DATABASE_SNAPSHOT;
     extern const int CANNOT_RESTORE_TABLE;
-    extern const int SUPPORT_IS_DISABLED;
 }
 
 static constexpr const char * REPLICATED_DATABASE_MARK = "DatabaseReplicated";
@@ -341,12 +338,9 @@ ClusterPtr DatabaseReplicated::getClusterImpl(bool all_groups) const
     return std::make_shared<Cluster>(getContext()->getSettingsRef(), shards, params);
 }
 
-ReplicasInfo DatabaseReplicated::tryGetReplicasInfo(const ClusterPtr & cluster_) const
+std::vector<UInt8> DatabaseReplicated::tryGetAreReplicasActive(const ClusterPtr & cluster_) const
 {
     Strings paths;
-
-    paths.emplace_back(fs::path(zookeeper_path) / "max_log_ptr");
-
     const auto & addresses_with_failover = cluster_->getShardsAddresses();
     const auto & shards_info = cluster_->getShardsInfo();
     for (size_t shard_index = 0; shard_index < shards_info.size(); ++shard_index)
@@ -355,50 +349,22 @@ ReplicasInfo DatabaseReplicated::tryGetReplicasInfo(const ClusterPtr & cluster_)
         {
             String full_name = getFullReplicaName(replica.database_shard_name, replica.database_replica_name);
             paths.emplace_back(fs::path(zookeeper_path) / "replicas" / full_name / "active");
-            paths.emplace_back(fs::path(zookeeper_path) / "replicas" / full_name / "log_ptr");
         }
     }
 
     try
     {
         auto current_zookeeper = getZooKeeper();
-        auto zk_res = current_zookeeper->tryGet(paths);
+        auto res = current_zookeeper->exists(paths);
 
-        auto max_log_ptr_zk = zk_res[0];
-        if (max_log_ptr_zk.error != Coordination::Error::ZOK)
-            throw Coordination::Exception(max_log_ptr_zk.error);
+        std::vector<UInt8> statuses;
+        statuses.resize(paths.size());
 
-        UInt32 max_log_ptr = parse<UInt32>(max_log_ptr_zk.data);
+        for (size_t i = 0; i < res.size(); ++i)
+            if (res[i].error == Coordination::Error::ZOK)
+                statuses[i] = 1;
 
-        ReplicasInfo replicas_info;
-        replicas_info.resize((zk_res.size() - 1) / 2);
-
-        size_t global_replica_index = 0;
-        for (size_t shard_index = 0; shard_index < shards_info.size(); ++shard_index)
-        {
-            for (const auto & replica : addresses_with_failover[shard_index])
-            {
-                auto replica_active = zk_res[2 * global_replica_index + 1];
-                auto replica_log_ptr = zk_res[2 * global_replica_index + 2];
-
-                UInt64 recovery_time = 0;
-                {
-                    std::lock_guard lock(ddl_worker_mutex);
-                    if (replica.is_local && ddl_worker)
-                        recovery_time = ddl_worker->getCurrentInitializationDurationMs();
-                }
-
-                replicas_info[global_replica_index] = ReplicaInfo{
-                    .is_active = replica_active.error == Coordination::Error::ZOK,
-                    .replication_lag = replica_log_ptr.error != Coordination::Error::ZNONODE ? std::optional(max_log_ptr - parse<UInt32>(replica_log_ptr.data)) : std::nullopt,
-                    .recovery_time = recovery_time,
-                };
-
-                ++global_replica_index;
-            }
-        }
-
-        return replicas_info;
+        return statuses;
     }
     catch (...)
     {
@@ -407,6 +373,7 @@ ReplicasInfo DatabaseReplicated::tryGetReplicasInfo(const ClusterPtr & cluster_)
     }
 }
 
+
 void DatabaseReplicated::fillClusterAuthInfo(String collection_name, const Poco::Util::AbstractConfiguration & config_ref)
 {
     const auto & config_prefix = fmt::format("named_collections.{}", collection_name);
@@ -442,8 +409,7 @@ void DatabaseReplicated::tryConnectToZooKeeperAndInitDatabase(LoadingStrictnessL
         bool is_create_query = mode == LoadingStrictnessLevel::CREATE;
 
         String replica_host_id;
-        bool replica_exists_in_zk = current_zookeeper->tryGet(replica_path, replica_host_id);
-        if (replica_exists_in_zk)
+        if (current_zookeeper->tryGet(replica_path, replica_host_id))
         {
             if (replica_host_id == DROPPED_MARK && !is_create_query)
             {
@@ -456,7 +422,7 @@ void DatabaseReplicated::tryConnectToZooKeeperAndInitDatabase(LoadingStrictnessL
             String host_id = getHostID(getContext(), db_uuid, cluster_auth_info.cluster_secure_connection);
             String host_id_default = getHostID(getContext(), db_uuid, false);
 
-            if (replica_host_id != host_id && replica_host_id != host_id_default)
+            if (is_create_query || (replica_host_id != host_id && replica_host_id != host_id_default))
             {
                 throw Exception(
                     ErrorCodes::REPLICA_ALREADY_EXISTS,
@@ -486,20 +452,13 @@ void DatabaseReplicated::tryConnectToZooKeeperAndInitDatabase(LoadingStrictnessL
                 current_zookeeper->set(replica_path + "/replica_group", replica_group_name, -1);
                 createEmptyLogEntry(current_zookeeper);
             }
-
-            /// Needed to mark all the queries
-            /// in the range (max log ptr at replica ZooKeeper nodes creation, max log ptr after replica recovery] as successful.
-            String max_log_ptr_at_creation_str;
-            if (current_zookeeper->tryGet(replica_path + "/max_log_ptr_at_creation", max_log_ptr_at_creation_str))
-                max_log_ptr_at_creation = parse<UInt32>(max_log_ptr_at_creation_str);
         }
-
-        if (is_create_query)
+        else if (is_create_query)
         {
-            /// Create replica nodes in ZooKeeper. If newly initialized nodes already exist, reuse them.
+            /// Create new replica. Throws if replica with the same name already exists
             createReplicaNodesInZooKeeper(current_zookeeper);
         }
-        else if (!replica_exists_in_zk)
+        else
         {
             /// It's not CREATE query, but replica does not exist. Probably it was dropped.
             /// Do not create anything, continue as readonly.
@@ -600,11 +559,8 @@ void DatabaseReplicated::createEmptyLogEntry(const ZooKeeperPtr & current_zookee
 
 bool DatabaseReplicated::waitForReplicaToProcessAllEntries(UInt64 timeout_ms)
 {
-    {
-        std::lock_guard lock{ddl_worker_mutex};
-        if (!ddl_worker || is_probably_dropped)
-            return false;
-    }
+    if (!ddl_worker || is_probably_dropped)
+        return false;
     return ddl_worker->waitForReplicaToProcessAllEntries(timeout_ms);
 }
 
@@ -615,84 +571,37 @@ void DatabaseReplicated::createReplicaNodesInZooKeeper(const zkutil::ZooKeeperPt
                         "already contains some data and it does not look like Replicated database path.", zookeeper_path);
 
     /// Write host name to replica_path, it will protect from multiple replicas with the same name
-    const auto host_id = getHostID(getContext(), db_uuid, cluster_auth_info.cluster_secure_connection);
-
-    const std::vector<String> check_paths = {
-        replica_path,
-        replica_path + "/replica_group",
-        replica_path + "/digest",
-    };
-    bool nodes_exist = true;
-    auto check_responses = current_zookeeper->tryGet(check_paths);
-    for (size_t i = 0; i < check_responses.size(); ++i)
-    {
-        const auto response = check_responses[i];
-
-        if (response.error == Coordination::Error::ZNONODE)
-        {
-            nodes_exist = false;
-            break;
-        } else if (response.error != Coordination::Error::ZOK)
-        {
-            throw zkutil::KeeperException::fromPath(response.error, check_paths[i]);
-        }
-    }
-
-    if (nodes_exist)
-    {
-        const std::vector<String> expected_data = {
-            host_id,
-            replica_group_name,
-            "0",
-        };
-        for (size_t i = 0; i != expected_data.size(); ++i)
-        {
-            if (check_responses[i].data != expected_data[i])
-            {
-                throw Exception(
-                    ErrorCodes::REPLICA_ALREADY_EXISTS,
-                    "Replica node {} in ZooKeeper already exists and contains unexpected value: {}",
-                    quoteString(check_paths[i]), quoteString(check_responses[i].data));
-            }
-        }
-
-        LOG_DEBUG(log, "Newly initialized replica nodes found in ZooKeeper, reusing them");
-        createEmptyLogEntry(current_zookeeper);
-        return;
-    }
+    auto host_id = getHostID(getContext(), db_uuid, cluster_auth_info.cluster_secure_connection);
 
     for (int attempts = 10; attempts > 0; --attempts)
     {
         Coordination::Stat stat;
-        const String max_log_ptr_str = current_zookeeper->get(zookeeper_path + "/max_log_ptr", &stat);
+        String max_log_ptr_str = current_zookeeper->get(zookeeper_path + "/max_log_ptr", &stat);
 
-        const Coordination::Requests ops = {
-            zkutil::makeCreateRequest(replica_path, host_id, zkutil::CreateMode::Persistent),
-            zkutil::makeCreateRequest(replica_path + "/log_ptr", "0", zkutil::CreateMode::Persistent),
-            zkutil::makeCreateRequest(replica_path + "/digest", "0", zkutil::CreateMode::Persistent),
-            zkutil::makeCreateRequest(replica_path + "/replica_group", replica_group_name, zkutil::CreateMode::Persistent),
-
-            /// Previously, this method was not idempotent and max_log_ptr_at_creation could be stored in memory.
-            /// we need to store max_log_ptr_at_creation in ZooKeeper to make this method idempotent during replica creation.
-            zkutil::makeCreateRequest(replica_path + "/max_log_ptr_at_creation", max_log_ptr_str, zkutil::CreateMode::Persistent),
-            zkutil::makeCheckRequest(zookeeper_path + "/max_log_ptr", stat.version),
-        };
-
-        Coordination::Responses ops_responses;
-        const auto code = current_zookeeper->tryMulti(ops, ops_responses);
+        Coordination::Requests ops;
+        ops.emplace_back(zkutil::makeCreateRequest(replica_path, host_id, zkutil::CreateMode::Persistent));
+        ops.emplace_back(zkutil::makeCreateRequest(replica_path + "/log_ptr", "0", zkutil::CreateMode::Persistent));
+        ops.emplace_back(zkutil::makeCreateRequest(replica_path + "/digest", "0", zkutil::CreateMode::Persistent));
+        ops.emplace_back(zkutil::makeCreateRequest(replica_path + "/replica_group", replica_group_name, zkutil::CreateMode::Persistent));
+        /// In addition to creating the replica nodes, we record the max_log_ptr at the instant where
+        /// we declared ourself as an existing replica. We'll need this during recoverLostReplica to
+        /// notify other nodes that issued new queries while this node was recovering.
+        ops.emplace_back(zkutil::makeCheckRequest(zookeeper_path + "/max_log_ptr", stat.version));
 
+        Coordination::Responses responses;
+        const auto code = current_zookeeper->tryMulti(ops, responses);
         if (code == Coordination::Error::ZOK)
         {
             max_log_ptr_at_creation = parse<UInt32>(max_log_ptr_str);
-            createEmptyLogEntry(current_zookeeper);
-            return;
+            break;
         }
-
-        if (attempts == 1)
+        else if (code == Coordination::Error::ZNODEEXISTS || attempts == 1)
         {
-            zkutil::KeeperMultiException::check(code, ops, ops_responses);
+            /// If its our last attempt, or if the replica already exists, fail immediately.
+            zkutil::KeeperMultiException::check(code, ops, responses);
         }
     }
+    createEmptyLogEntry(current_zookeeper);
 }
 
 void DatabaseReplicated::beforeLoadingMetadata(ContextMutablePtr context_, LoadingStrictnessLevel mode)
@@ -732,16 +641,12 @@ LoadTaskPtr DatabaseReplicated::startupDatabaseAsync(AsyncLoader & async_loader,
             if (is_probably_dropped)
                 return;
 
-            {
-                std::lock_guard lock{ddl_worker_mutex};
-                ddl_worker = std::make_unique<DatabaseReplicatedDDLWorker>(this, getContext());
-                ddl_worker->startup();
-                ddl_worker_initialized = true;
-            }
+            ddl_worker = std::make_unique<DatabaseReplicatedDDLWorker>(this, getContext());
+            ddl_worker->startup();
+            ddl_worker_initialized = true;
         });
     std::scoped_lock lock(mutex);
-    startup_replicated_database_task = makeLoadTask(async_loader, {job});
-    return startup_replicated_database_task;
+    return startup_replicated_database_task = makeLoadTask(async_loader, {job});
 }
 
 void DatabaseReplicated::waitDatabaseStarted() const
@@ -766,168 +671,6 @@ void DatabaseReplicated::stopLoading()
     DatabaseAtomic::stopLoading();
 }
 
-void DatabaseReplicated::dumpLocalTablesForDebugOnly(const ContextPtr & local_context) const
-{
-    auto table_names = getAllTableNames(context.lock());
-    for (const auto & table_name : table_names)
-    {
-        auto ast_ptr = tryGetCreateTableQuery(table_name, local_context);
-        if (ast_ptr)
-            LOG_DEBUG(log, "[local] Table {} create query is {}", table_name, queryToString(ast_ptr));
-        else
-            LOG_DEBUG(log, "[local] Table {} has no create query", table_name);
-    }
-}
-
-void DatabaseReplicated::dumpTablesInZooKeeperForDebugOnly() const
-{
-    UInt32 max_log_ptr;
-    auto table_name_to_metadata = tryGetConsistentMetadataSnapshot(getZooKeeper(), max_log_ptr);
-    for (const auto & [table_name, create_table_query] : table_name_to_metadata)
-    {
-        auto query_ast = parseQueryFromMetadataInZooKeeper(table_name, create_table_query);
-        if (query_ast)
-        {
-            LOG_DEBUG(log, "[zookeeper] Table {} create query is {}", table_name, queryToString(query_ast));
-        }
-        else
-        {
-            LOG_DEBUG(log, "[zookeeper] Table {} has no create query", table_name);
-        }
-    }
-}
-
-void DatabaseReplicated::tryCompareLocalAndZooKeeperTablesAndDumpDiffForDebugOnly(const ContextPtr & local_context) const
-{
-    UInt32 max_log_ptr;
-    auto table_name_to_metadata_in_zk = tryGetConsistentMetadataSnapshot(getZooKeeper(), max_log_ptr);
-    auto table_names_local = getAllTableNames(local_context);
-
-    if (table_name_to_metadata_in_zk.size() != table_names_local.size())
-        LOG_DEBUG(log, "Amount of tables in zk {} locally {}", table_name_to_metadata_in_zk.size(), table_names_local.size());
-
-    std::unordered_set<std::string> checked_tables;
-
-    for (const auto & table_name : table_names_local)
-    {
-        auto local_ast_ptr = tryGetCreateTableQuery(table_name, local_context);
-        if (table_name_to_metadata_in_zk.contains(table_name))
-        {
-            checked_tables.insert(table_name);
-            auto create_table_query_in_zk = table_name_to_metadata_in_zk[table_name];
-            auto zk_ast_ptr = parseQueryFromMetadataInZooKeeper(table_name, create_table_query_in_zk);
-
-            if (local_ast_ptr == nullptr && zk_ast_ptr == nullptr)
-            {
-                LOG_DEBUG(log, "AST for table {} is the same (nullptr) in local and ZK", table_name);
-            }
-            else if (local_ast_ptr != nullptr && zk_ast_ptr != nullptr && queryToString(local_ast_ptr) != queryToString(zk_ast_ptr))
-            {
-                LOG_DEBUG(log, "AST differs for table {}, local {}, in zookeeper {}", table_name, queryToString(local_ast_ptr), queryToString(zk_ast_ptr));
-            }
-            else if (local_ast_ptr == nullptr)
-            {
-                LOG_DEBUG(log, "AST differs for table {}, local nullptr, in zookeeper {}", table_name, queryToString(zk_ast_ptr));
-            }
-            else if (zk_ast_ptr == nullptr)
-            {
-                LOG_DEBUG(log, "AST differs for table {}, local {}, in zookeeper nullptr", table_name, queryToString(local_ast_ptr));
-            }
-            else
-            {
-                LOG_DEBUG(log, "AST for table {} is the same in local and ZK", table_name);
-            }
-        }
-        else
-        {
-            if (local_ast_ptr == nullptr)
-                LOG_DEBUG(log, "Table {} exists locally, but missing in ZK", table_name);
-            else
-                LOG_DEBUG(log, "Table {} exists locally with AST {}, but missing in ZK", table_name, queryToString(local_ast_ptr));
-        }
-    }
-    for (const auto & [table_name, table_metadata] : table_name_to_metadata_in_zk)
-    {
-        if (!checked_tables.contains(table_name))
-        {
-            auto zk_ast_ptr = parseQueryFromMetadataInZooKeeper(table_name, table_metadata);
-            if (zk_ast_ptr == nullptr)
-                LOG_DEBUG(log, "Table {} exists in ZK with AST {}, but missing locally", table_name, queryToString(zk_ast_ptr));
-            else
-                LOG_DEBUG(log, "Table {} exists in ZK, but missing locally", table_name);
-        }
-    }
-}
-
-void DatabaseReplicated::checkTableEngine(const ASTCreateQuery & query, ASTStorage & storage, ContextPtr query_context) const
-{
-    bool replicated_table = storage.engine &&
-        (startsWith(storage.engine->name, "Replicated") || startsWith(storage.engine->name, "Shared"));
-    if (!replicated_table || !storage.engine->arguments)
-        return;
-
-    ASTs & args_ref = storage.engine->arguments->children;
-    ASTs args = args_ref;
-    if (args.size() < 2)
-        return;
-
-    /// It can be a constant expression. Try to evaluate it, ignore exception if we cannot.
-    bool has_expression_argument = args_ref[0]->as<ASTFunction>() || args_ref[1]->as<ASTFunction>();
-    if (has_expression_argument)
-    {
-        try
-        {
-            args[0] = evaluateConstantExpressionAsLiteral(args_ref[0]->clone(), query_context);
-            args[1] = evaluateConstantExpressionAsLiteral(args_ref[1]->clone(), query_context);
-        }
-        catch (...) // NOLINT(bugprone-empty-catch)
-        {
-        }
-    }
-
-    ASTLiteral * arg1 = args[0]->as<ASTLiteral>();
-    ASTLiteral * arg2 = args[1]->as<ASTLiteral>();
-    if (!arg1 || !arg2 || arg1->value.getType() != Field::Types::String || arg2->value.getType() != Field::Types::String)
-        return;
-
-    String maybe_path = arg1->value.safeGet<String>();
-    String maybe_replica = arg2->value.safeGet<String>();
-
-    /// Looks like it's ReplicatedMergeTree with explicit zookeeper_path and replica_name arguments.
-    /// Let's ensure that some macros are used.
-    /// NOTE: we cannot check here that substituted values will be actually different on shards and replicas.
-
-    Macros::MacroExpansionInfo info;
-    info.table_id = {getDatabaseName(), query.getTable(), query.uuid};
-    info.shard = getShardName();
-    info.replica = getReplicaName();
-    query_context->getMacros()->expand(maybe_path, info);
-    bool maybe_shard_macros = info.expanded_other;
-    info.expanded_other = false;
-    query_context->getMacros()->expand(maybe_replica, info);
-    bool maybe_replica_macros = info.expanded_other;
-    bool enable_functional_tests_helper = getContext()->getConfigRef().has("_functional_tests_helper_database_replicated_replace_args_macros");
-
-    if (maybe_shard_macros && maybe_replica_macros)
-        return;
-
-    if (enable_functional_tests_helper && !has_expression_argument)
-    {
-        if (maybe_path.empty() || maybe_path.back() != '/')
-            maybe_path += '/';
-        args_ref[0]->as<ASTLiteral>()->value = maybe_path + "auto_{shard}";
-        args_ref[1]->as<ASTLiteral>()->value = maybe_replica + "auto_{replica}";
-        return;
-    }
-
-    /// We will replace it with default arguments if the setting is 2
-    if (query_context->getSettingsRef().database_replicated_allow_replicated_engine_arguments != 2)
-        throw Exception(ErrorCodes::INCORRECT_QUERY,
-                    "Explicit zookeeper_path and replica_name are specified in ReplicatedMergeTree arguments. "
-                    "If you really want to specify it explicitly, then you should use some macros "
-                    "to distinguish different shards and replicas");
-}
-
 bool DatabaseReplicated::checkDigestValid(const ContextPtr & local_context, bool debug_check /* = true */) const
 {
     if (debug_check)
@@ -953,13 +696,6 @@ bool DatabaseReplicated::checkDigestValid(const ContextPtr & local_context, bool
     if (local_digest != tables_metadata_digest)
     {
         LOG_ERROR(log, "Digest of local metadata ({}) is not equal to in-memory digest ({})", local_digest, tables_metadata_digest);
-
-#ifndef NDEBUG
-        dumpLocalTablesForDebugOnly(local_context);
-        dumpTablesInZooKeeperForDebugOnly();
-        tryCompareLocalAndZooKeeperTablesAndDumpDiffForDebugOnly(local_context);
-#endif
-
         return false;
     }
 
@@ -976,11 +712,6 @@ bool DatabaseReplicated::checkDigestValid(const ContextPtr & local_context, bool
     if (zk_digest != local_digest_str)
     {
         LOG_ERROR(log, "Digest of local metadata ({}) is not equal to digest in Keeper ({})", local_digest_str, zk_digest);
-#ifndef NDEBUG
-        dumpLocalTablesForDebugOnly(local_context);
-        dumpTablesInZooKeeperForDebugOnly();
-        tryCompareLocalAndZooKeeperTablesAndDumpDiffForDebugOnly(local_context);
-#endif
         return false;
     }
 
@@ -1029,6 +760,85 @@ void DatabaseReplicated::checkQueryValid(const ASTPtr & query, ContextPtr query_
     }
 }
 
+void DatabaseReplicated::checkTableEngine(const ASTCreateQuery & query, ASTStorage & storage, ContextPtr query_context) const
+{
+    bool replicated_table = storage.engine &&
+        (startsWith(storage.engine->name, "Replicated") || startsWith(storage.engine->name, "Shared"));
+    if (!replicated_table || !storage.engine->arguments)
+        return;
+
+    ASTs & args_ref = storage.engine->arguments->children;
+    ASTs args = args_ref;
+    if (args.size() < 2)
+        return;
+
+    /// It can be a constant expression. Try to evaluate it, ignore exception if we cannot.
+    bool has_expression_argument = args_ref[0]->as<ASTFunction>() || args_ref[1]->as<ASTFunction>();
+    if (has_expression_argument)
+    {
+        try
+        {
+            args[0] = evaluateConstantExpressionAsLiteral(args_ref[0]->clone(), query_context);
+            args[1] = evaluateConstantExpressionAsLiteral(args_ref[1]->clone(), query_context);
+        }
+        catch (...) // NOLINT(bugprone-empty-catch)
+        {
+        }
+    }
+
+    ASTLiteral * arg1 = args[0]->as<ASTLiteral>();
+    ASTLiteral * arg2 = args[1]->as<ASTLiteral>();
+    if (!arg1 || !arg2 || arg1->value.getType() != Field::Types::String || arg2->value.getType() != Field::Types::String)
+        return;
+
+    String maybe_path = arg1->value.get<String>();
+    String maybe_replica = arg2->value.get<String>();
+
+    /// Looks like it's ReplicatedMergeTree with explicit zookeeper_path and replica_name arguments.
+    /// Let's ensure that some macros are used.
+    /// NOTE: we cannot check here that substituted values will be actually different on shards and replicas.
+
+    Macros::MacroExpansionInfo info;
+    info.table_id = {getDatabaseName(), query.getTable(), query.uuid};
+    info.shard = getShardName();
+    info.replica = getReplicaName();
+    query_context->getMacros()->expand(maybe_path, info);
+    bool maybe_shard_macros = info.expanded_other;
+    info.expanded_other = false;
+    query_context->getMacros()->expand(maybe_replica, info);
+    bool maybe_replica_macros = info.expanded_other;
+    bool enable_functional_tests_helper = getContext()->getConfigRef().has("_functional_tests_helper_database_replicated_replace_args_macros");
+
+    if (!enable_functional_tests_helper)
+    {
+        if (query_context->getSettingsRef().database_replicated_allow_replicated_engine_arguments)
+            LOG_WARNING(log, "It's not recommended to explicitly specify zookeeper_path and replica_name in ReplicatedMergeTree arguments");
+        else
+            throw Exception(ErrorCodes::INCORRECT_QUERY,
+                            "It's not allowed to specify explicit zookeeper_path and replica_name "
+                            "for ReplicatedMergeTree arguments in Replicated database. If you really want to "
+                            "specify them explicitly, enable setting "
+                            "database_replicated_allow_replicated_engine_arguments.");
+    }
+
+    if (maybe_shard_macros && maybe_replica_macros)
+        return;
+
+    if (enable_functional_tests_helper && !has_expression_argument)
+    {
+        if (maybe_path.empty() || maybe_path.back() != '/')
+            maybe_path += '/';
+        args_ref[0]->as<ASTLiteral>()->value = maybe_path + "auto_{shard}";
+        args_ref[1]->as<ASTLiteral>()->value = maybe_replica + "auto_{replica}";
+        return;
+    }
+
+    throw Exception(ErrorCodes::INCORRECT_QUERY,
+                    "Explicit zookeeper_path and replica_name are specified in ReplicatedMergeTree arguments. "
+                    "If you really want to specify it explicitly, then you should use some macros "
+                    "to distinguish different shards and replicas");
+}
+
 BlockIO DatabaseReplicated::tryEnqueueReplicatedDDL(const ASTPtr & query, ContextPtr query_context, QueryFlags flags)
 {
     waitDatabaseStarted();
@@ -1189,10 +999,39 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
 
         /// We will execute some CREATE queries for recovery (not ATTACH queries),
         /// so we need to allow experimental features that can be used in a CREATE query
-        enableAllExperimentalSettings(query_context);
+        query_context->setSetting("allow_experimental_inverted_index", 1);
+        query_context->setSetting("allow_experimental_full_text_index", 1);
+        query_context->setSetting("allow_experimental_codecs", 1);
+        query_context->setSetting("allow_experimental_live_view", 1);
+        query_context->setSetting("allow_experimental_window_view", 1);
+        query_context->setSetting("allow_experimental_funnel_functions", 1);
+        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_dynamic_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);
+        query_context->setSetting("allow_experimental_window_functions", 1);
+        query_context->setSetting("allow_experimental_geo_types", 1);
+        query_context->setSetting("allow_experimental_map_type", 1);
+        query_context->setSetting("allow_deprecated_error_prone_window_functions", 1);
 
-        query_context->setSetting("database_replicated_allow_explicit_uuid", 3);
-        query_context->setSetting("database_replicated_allow_replicated_engine_arguments", 3);
+        query_context->setSetting("allow_suspicious_low_cardinality_types", 1);
+        query_context->setSetting("allow_suspicious_fixed_string_types", 1);
+        query_context->setSetting("allow_suspicious_indices", 1);
+        query_context->setSetting("allow_suspicious_codecs", 1);
+        query_context->setSetting("allow_hyperscan", 1);
+        query_context->setSetting("allow_simdjson", 1);
+        query_context->setSetting("allow_deprecated_syntax_for_merge_tree", 1);
+        query_context->setSetting("allow_suspicious_primary_key", 1);
+        query_context->setSetting("allow_suspicious_ttl_expressions", 1);
+        query_context->setSetting("allow_suspicious_variant_types", 1);
+        query_context->setSetting("enable_deflate_qpl_codec", 1);
+        query_context->setSetting("enable_zstd_qat_codec", 1);
+        query_context->setSetting("allow_create_index_without_type", 1);
+        query_context->setSetting("allow_experimental_s3queue", 1);
 
         auto txn = std::make_shared<ZooKeeperMetadataTransaction>(current_zookeeper, zookeeper_path, false, "");
         query_context->initZooKeeperMetadataTransaction(txn);
@@ -1414,7 +1253,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
     current_zookeeper->set(replica_path + "/digest", toString(tables_metadata_digest));
 }
 
-std::map<String, String> DatabaseReplicated::tryGetConsistentMetadataSnapshot(const ZooKeeperPtr & zookeeper, UInt32 & max_log_ptr) const
+std::map<String, String> DatabaseReplicated::tryGetConsistentMetadataSnapshot(const ZooKeeperPtr & zookeeper, UInt32 & max_log_ptr)
 {
     return getConsistentMetadataSnapshotImpl(zookeeper, {}, /* max_retries= */ 10, max_log_ptr);
 }
@@ -1475,7 +1314,7 @@ std::map<String, String> DatabaseReplicated::getConsistentMetadataSnapshotImpl(
     return table_name_to_metadata;
 }
 
-ASTPtr DatabaseReplicated::parseQueryFromMetadataInZooKeeper(const String & node_name, const String & query) const
+ASTPtr DatabaseReplicated::parseQueryFromMetadataInZooKeeper(const String & node_name, const String & query)
 {
     ParserCreateQuery parser;
     String description = "in ZooKeeper " + zookeeper_path + "/metadata/" + node_name;
@@ -1572,7 +1411,6 @@ void DatabaseReplicated::renameDatabase(ContextPtr query_context, const String &
 
 void DatabaseReplicated::stopReplication()
 {
-    std::lock_guard lock{ddl_worker_mutex};
     if (ddl_worker)
         ddl_worker->shutdown();
 }
@@ -1580,11 +1418,8 @@ void DatabaseReplicated::stopReplication()
 void DatabaseReplicated::shutdown()
 {
     stopReplication();
-    {
-        std::lock_guard lock{ddl_worker_mutex};
-        ddl_worker_initialized = false;
-        ddl_worker = nullptr;
-    }
+    ddl_worker_initialized = false;
+    ddl_worker = nullptr;
     DatabaseAtomic::shutdown();
 }
 
@@ -1602,8 +1437,6 @@ void DatabaseReplicated::dropTable(ContextPtr local_context, const String & tabl
     }
 
     auto table = tryGetTable(table_name, getContext());
-    if (!table)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Table {} doesn't exist", table_name);
     if (table->getName() == "MaterializedView" || table->getName() == "WindowView")
     {
         /// Avoid recursive locking of metadata_mutex
@@ -1734,7 +1567,6 @@ bool DatabaseReplicated::canExecuteReplicatedMetadataAlter() const
     /// It may update the metadata digest (both locally and in ZooKeeper)
     /// before DatabaseReplicatedDDLWorker::initializeReplication() has finished.
     /// We should not update metadata until the database is initialized.
-    std::lock_guard lock{ddl_worker_mutex};
     return ddl_worker_initialized && ddl_worker->isCurrentlyActive();
 }
 
@@ -1742,9 +1574,6 @@ void DatabaseReplicated::detachTablePermanently(ContextPtr local_context, const
 {
     waitDatabaseStarted();
 
-    if (!local_context->getServerSettings().database_replicated_allow_detach_permanently)
-        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Support for DETACH TABLE PERMANENTLY is disabled");
-
     auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn);
     if (txn && txn->isInitialQuery())
diff --git a/src/Databases/DatabaseReplicated.h b/src/Databases/DatabaseReplicated.h
index db683be8f36..8c3fa7c87f6 100644
--- a/src/Databases/DatabaseReplicated.h
+++ b/src/Databases/DatabaseReplicated.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <optional>
-
 #include <Databases/DatabaseAtomic.h>
 #include <Databases/DatabaseReplicatedSettings.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
@@ -19,14 +17,6 @@ using ZooKeeperPtr = std::shared_ptr<zkutil::ZooKeeper>;
 class Cluster;
 using ClusterPtr = std::shared_ptr<Cluster>;
 
-struct ReplicaInfo
-{
-    bool is_active;
-    std::optional<UInt32> replication_lag;
-    UInt64 recovery_time;
-};
-using ReplicasInfo = std::vector<ReplicaInfo>;
-
 class DatabaseReplicated : public DatabaseAtomic
 {
 public:
@@ -94,7 +84,7 @@ public:
 
     static void dropReplica(DatabaseReplicated * database, const String & database_zookeeper_path, const String & shard, const String & replica, bool throw_if_noop);
 
-    ReplicasInfo tryGetReplicasInfo(const ClusterPtr & cluster_) const;
+    std::vector<UInt8> tryGetAreReplicasActive(const ClusterPtr & cluster_) const;
 
     void renameDatabase(ContextPtr query_context, const String & new_name) override;
 
@@ -119,15 +109,14 @@ private:
     void checkQueryValid(const ASTPtr & query, ContextPtr query_context) const;
     void checkTableEngine(const ASTCreateQuery & query, ASTStorage & storage, ContextPtr query_context) const;
 
-
     void recoverLostReplica(const ZooKeeperPtr & current_zookeeper, UInt32 our_log_ptr, UInt32 & max_log_ptr);
 
-    std::map<String, String> tryGetConsistentMetadataSnapshot(const ZooKeeperPtr & zookeeper, UInt32 & max_log_ptr) const;
+    std::map<String, String> tryGetConsistentMetadataSnapshot(const ZooKeeperPtr & zookeeper, UInt32 & max_log_ptr);
 
     std::map<String, String> getConsistentMetadataSnapshotImpl(const ZooKeeperPtr & zookeeper, const FilterByNameFunction & filter_by_table_name,
                                                                size_t max_retries, UInt32 & max_log_ptr) const;
 
-    ASTPtr parseQueryFromMetadataInZooKeeper(const String & node_name, const String & query) const;
+    ASTPtr parseQueryFromMetadataInZooKeeper(const String & node_name, const String & query);
     String readMetadataFile(const String & table_name) const;
 
     ClusterPtr getClusterImpl(bool all_groups = false) const;
@@ -143,11 +132,6 @@ private:
     UInt64 getMetadataHash(const String & table_name) const;
     bool checkDigestValid(const ContextPtr & local_context, bool debug_check = true) const TSA_REQUIRES(metadata_mutex);
 
-    /// For debug purposes only, don't use in production code
-    void dumpLocalTablesForDebugOnly(const ContextPtr & local_context) const;
-    void dumpTablesInZooKeeperForDebugOnly() const;
-    void tryCompareLocalAndZooKeeperTablesAndDumpDiffForDebugOnly(const ContextPtr & local_context) const;
-
     void waitDatabaseStarted() const override;
     void stopLoading() override;
 
@@ -165,7 +149,6 @@ private:
     std::atomic_bool is_recovering = false;
     std::atomic_bool ddl_worker_initialized = false;
     std::unique_ptr<DatabaseReplicatedDDLWorker> ddl_worker;
-    mutable std::mutex ddl_worker_mutex;
     UInt32 max_log_ptr_at_creation = 0;
 
     /// Usually operation with metadata are single-threaded because of the way replication works,
diff --git a/src/Databases/DatabaseReplicatedWorker.cpp b/src/Databases/DatabaseReplicatedWorker.cpp
index 4e7408aa96e..1ef88dc03bc 100644
--- a/src/Databases/DatabaseReplicatedWorker.cpp
+++ b/src/Databases/DatabaseReplicatedWorker.cpp
@@ -32,12 +32,6 @@ DatabaseReplicatedDDLWorker::DatabaseReplicatedDDLWorker(DatabaseReplicated * db
 
 bool DatabaseReplicatedDDLWorker::initializeMainThread()
 {
-    {
-        std::lock_guard lock(initialization_duration_timer_mutex);
-        initialization_duration_timer.emplace();
-        initialization_duration_timer->start();
-    }
-
     while (!stop_flag)
     {
         try
@@ -75,10 +69,6 @@ bool DatabaseReplicatedDDLWorker::initializeMainThread()
 
             initializeReplication();
             initialized = true;
-            {
-                std::lock_guard lock(initialization_duration_timer_mutex);
-                initialization_duration_timer.reset();
-            }
             return true;
         }
         catch (...)
@@ -88,11 +78,6 @@ bool DatabaseReplicatedDDLWorker::initializeMainThread()
         }
     }
 
-    {
-        std::lock_guard lock(initialization_duration_timer_mutex);
-        initialization_duration_timer.reset();
-    }
-
     return false;
 }
 
@@ -474,10 +459,4 @@ UInt32 DatabaseReplicatedDDLWorker::getLogPointer() const
     return max_id.load();
 }
 
-UInt64 DatabaseReplicatedDDLWorker::getCurrentInitializationDurationMs() const
-{
-    std::lock_guard lock(initialization_duration_timer_mutex);
-    return initialization_duration_timer ? initialization_duration_timer->elapsedMilliseconds() : 0;
-}
-
 }
diff --git a/src/Databases/DatabaseReplicatedWorker.h b/src/Databases/DatabaseReplicatedWorker.h
index 2309c831839..41edf2221b8 100644
--- a/src/Databases/DatabaseReplicatedWorker.h
+++ b/src/Databases/DatabaseReplicatedWorker.h
@@ -36,8 +36,6 @@ public:
                                    DatabaseReplicated * const database, bool committed = false); /// NOLINT
 
     UInt32 getLogPointer() const;
-
-    UInt64 getCurrentInitializationDurationMs() const;
 private:
     bool initializeMainThread() override;
     void initializeReplication();
@@ -58,9 +56,6 @@ private:
     ZooKeeperPtr active_node_holder_zookeeper;
     /// It will remove "active" node when database is detached
     zkutil::EphemeralNodeHolderPtr active_node_holder;
-
-    std::optional<Stopwatch> initialization_duration_timer;
-    mutable std::mutex initialization_duration_timer_mutex;
 };
 
 }
diff --git a/src/Databases/DatabasesCommon.cpp b/src/Databases/DatabasesCommon.cpp
index d8151cf340a..6ccaf811764 100644
--- a/src/Databases/DatabasesCommon.cpp
+++ b/src/Databases/DatabasesCommon.cpp
@@ -149,7 +149,7 @@ ASTPtr getCreateQueryFromStorage(const StoragePtr & storage, const ASTPtr & ast_
             columns = metadata_ptr->columns.getAll();
         for (const auto & column_name_and_type: columns)
         {
-            const auto ast_column_declaration = std::make_shared<ASTColumnDeclaration>();
+            const auto & ast_column_declaration = std::make_shared<ASTColumnDeclaration>();
             ast_column_declaration->name = column_name_and_type.name;
             /// parser typename
             {
@@ -164,7 +164,7 @@ ASTPtr getCreateQueryFromStorage(const StoragePtr & storage, const ASTPtr & ast_
                 if (!parser.parse(pos, ast_type, expected))
                 {
                     if (throw_on_error)
-                        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot parse metadata of {}.{}",
+                        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot parser metadata of {}.{}",
                                         backQuote(table_id.database_name), backQuote(table_id.table_name));
                     else
                         return nullptr;
@@ -289,11 +289,8 @@ StoragePtr DatabaseWithOwnTablesBase::detachTableUnlocked(const String & table_n
     tables.erase(it);
     table_storage->is_detached = true;
 
-    if (!table_storage->isSystemStorage() && !DatabaseCatalog::isPredefinedDatabase(database_name))
-    {
-        LOG_TEST(log, "Counting detached table {} to database {}", table_name, database_name);
+    if (!table_storage->isSystemStorage() && database_name != DatabaseCatalog::SYSTEM_DATABASE)
         CurrentMetrics::sub(getAttachedCounterForStorage(table_storage));
-    }
 
     auto table_id = table_storage->getStorageID();
     if (table_id.hasUUID())
@@ -337,11 +334,8 @@ void DatabaseWithOwnTablesBase::attachTableUnlocked(const String & table_name, c
     /// non-Atomic database the is_detached is set to true before RENAME.
     table->is_detached = false;
 
-    if (!table->isSystemStorage() && !DatabaseCatalog::isPredefinedDatabase(database_name))
-    {
-        LOG_TEST(log, "Counting attached table {} to database {}", table_name, database_name);
+    if (!table->isSystemStorage() && table_id.database_name != DatabaseCatalog::SYSTEM_DATABASE)
         CurrentMetrics::add(getAttachedCounterForStorage(table));
-    }
 }
 
 void DatabaseWithOwnTablesBase::shutdown()
diff --git a/src/Databases/DatabasesOverlay.cpp b/src/Databases/DatabasesOverlay.cpp
index 495733e15fd..801356b3dd7 100644
--- a/src/Databases/DatabasesOverlay.cpp
+++ b/src/Databases/DatabasesOverlay.cpp
@@ -14,8 +14,6 @@ namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int CANNOT_GET_CREATE_TABLE_QUERY;
-    extern const int BAD_ARGUMENTS;
-    extern const int UNKNOWN_TABLE;
 }
 
 DatabasesOverlay::DatabasesOverlay(const String & name_, ContextPtr context_)
@@ -126,39 +124,6 @@ StoragePtr DatabasesOverlay::detachTable(ContextPtr context_, const String & tab
         getEngineName());
 }
 
-void DatabasesOverlay::renameTable(
-    ContextPtr current_context,
-    const String & name,
-    IDatabase & to_database,
-    const String & to_name,
-    bool exchange,
-    bool dictionary)
-{
-    for (auto & db : databases)
-    {
-        if (db->isTableExist(name, current_context))
-        {
-            if (DatabasesOverlay * to_overlay_database = typeid_cast<DatabasesOverlay *>(&to_database))
-            {
-                /// Renaming from Overlay database inside itself or into another Overlay database.
-                /// Just use the first database in the overlay as a destination.
-                if (to_overlay_database->databases.empty())
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "The destination Overlay database {} does not have any members", to_database.getDatabaseName());
-
-                db->renameTable(current_context, name, *to_overlay_database->databases[0], to_name, exchange, dictionary);
-            }
-            else
-            {
-                /// Renaming into a different type of database. E.g. from Overlay on top of Atomic database into just Atomic database.
-                db->renameTable(current_context, name, to_database, to_name, exchange, dictionary);
-            }
-
-            return;
-        }
-    }
-    throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {}.{} doesn't exist", backQuote(getDatabaseName()), backQuote(name));
-}
-
 ASTPtr DatabasesOverlay::getCreateTableQueryImpl(const String & name, ContextPtr context_, bool throw_on_error) const
 {
     ASTPtr result = nullptr;
@@ -213,18 +178,6 @@ String DatabasesOverlay::getTableDataPath(const ASTCreateQuery & query) const
     return result;
 }
 
-UUID DatabasesOverlay::getUUID() const
-{
-    UUID result = UUIDHelpers::Nil;
-    for (const auto & db : databases)
-    {
-        result = db->getUUID();
-        if (result != UUIDHelpers::Nil)
-            break;
-    }
-    return result;
-}
-
 UUID DatabasesOverlay::tryGetTableUUID(const String & table_name) const
 {
     UUID result = UUIDHelpers::Nil;
diff --git a/src/Databases/DatabasesOverlay.h b/src/Databases/DatabasesOverlay.h
index 40c653e5cb5..b0c7e7e4032 100644
--- a/src/Databases/DatabasesOverlay.h
+++ b/src/Databases/DatabasesOverlay.h
@@ -35,21 +35,12 @@ public:
 
     StoragePtr detachTable(ContextPtr context, const String & table_name) override;
 
-    void renameTable(
-        ContextPtr current_context,
-        const String & name,
-        IDatabase & to_database,
-        const String & to_name,
-        bool exchange,
-        bool dictionary) override;
-
     ASTPtr getCreateTableQueryImpl(const String & name, ContextPtr context, bool throw_on_error) const override;
     ASTPtr getCreateDatabaseQuery() const override;
 
     String getTableDataPath(const String & table_name) const override;
     String getTableDataPath(const ASTCreateQuery & query) const override;
 
-    UUID getUUID() const override;
     UUID tryGetTableUUID(const String & table_name) const override;
 
     void drop(ContextPtr context) override;
diff --git a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
index 1364e9ae2b2..2c342755337 100644
--- a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
+++ b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
@@ -89,7 +89,7 @@ static constexpr auto MYSQL_BACKGROUND_THREAD_NAME = "MySQLDBSync";
 
 static ContextMutablePtr createQueryContext(ContextPtr context)
 {
-    Settings new_query_settings = context->getSettingsCopy();
+    Settings new_query_settings = context->getSettings();
     new_query_settings.insert_allow_materialized_columns = true;
 
     /// To avoid call AST::format
@@ -736,11 +736,11 @@ static void writeFieldsToColumn(
         {
             for (size_t index = 0; index < rows_data.size(); ++index)
             {
-                const Tuple & row_data = rows_data[index].safeGet<const Tuple &>();
+                const Tuple & row_data = rows_data[index].get<const Tuple &>();
                 const Field & value = row_data[column_index];
 
                 if (write_data_to_null_map(value, index))
-                    casted_column->insertValue(static_cast<decltype(to_type)>(value.template safeGet<decltype(from_type)>()));
+                    casted_column->insertValue(static_cast<decltype(to_type)>(value.template get<decltype(from_type)>()));
             }
         };
 
@@ -776,17 +776,17 @@ static void writeFieldsToColumn(
         {
             for (size_t index = 0; index < rows_data.size(); ++index)
             {
-                const Tuple & row_data = rows_data[index].safeGet<const Tuple &>();
+                const Tuple & row_data = rows_data[index].get<const Tuple &>();
                 const Field & value = row_data[column_index];
 
                 if (write_data_to_null_map(value, index))
                 {
                     if (value.getType() == Field::Types::UInt64)
-                        casted_int32_column->insertValue(static_cast<Int32>(value.safeGet<Int32>()));
+                        casted_int32_column->insertValue(static_cast<Int32>(value.get<Int32>()));
                     else if (value.getType() == Field::Types::Int64)
                     {
                         /// For MYSQL_TYPE_INT24
-                        const Int32 & num = static_cast<Int32>(value.safeGet<Int32>());
+                        const Int32 & num = static_cast<Int32>(value.get<Int32>());
                         casted_int32_column->insertValue(num & 0x800000 ? num | 0xFF000000 : num);
                     }
                     else
@@ -798,7 +798,7 @@ static void writeFieldsToColumn(
         {
             for (size_t index = 0; index < rows_data.size(); ++index)
             {
-                const Tuple & row_data = rows_data[index].safeGet<const Tuple &>();
+                const Tuple & row_data = rows_data[index].get<const Tuple &>();
                 const Field & value = row_data[column_index];
 
                 if (write_data_to_null_map(value, index))
@@ -812,12 +812,12 @@ static void writeFieldsToColumn(
         {
             for (size_t index = 0; index < rows_data.size(); ++index)
             {
-                const Tuple & row_data = rows_data[index].safeGet<const Tuple &>();
+                const Tuple & row_data = rows_data[index].get<const Tuple &>();
                 const Field & value = row_data[column_index];
 
                 if (write_data_to_null_map(value, index))
                 {
-                    const String & data = value.safeGet<const String &>();
+                    const String & data = value.get<const String &>();
                     casted_fixed_string_column->insertData(data.data(), data.size());
                 }
             }
@@ -864,7 +864,7 @@ static inline size_t onUpdateData(const Row & rows_data, Block & buffer, size_t
     {
         writeable_rows_mask[index + 1] = true;
         writeable_rows_mask[index] = differenceSortingKeys(
-            rows_data[index].safeGet<const Tuple &>(), rows_data[index + 1].safeGet<const Tuple &>(), sorting_columns_index);
+            rows_data[index].get<const Tuple &>(), rows_data[index + 1].get<const Tuple &>(), sorting_columns_index);
     }
 
     for (size_t column = 0; column < buffer.columns() - 2; ++column)
diff --git a/src/Databases/MySQL/tests/gtest_mysql_binlog.cpp b/src/Databases/MySQL/tests/gtest_mysql_binlog.cpp
index 6f1ba26ee33..11299c5b8b1 100644
--- a/src/Databases/MySQL/tests/gtest_mysql_binlog.cpp
+++ b/src/Databases/MySQL/tests/gtest_mysql_binlog.cpp
@@ -281,12 +281,12 @@ static void testFile1(IBinlog & binlog, UInt64 timeout, bool filtered = false)
     ASSERT_EQ(write_event->table, "a");
     ASSERT_EQ(write_event->rows.size(), 1);
     ASSERT_EQ(write_event->rows[0].getType(), Field::Types::Tuple);
-    auto row_data = write_event->rows[0].safeGet<const Tuple &>();
+    auto row_data = write_event->rows[0].get<const Tuple &>();
     ASSERT_EQ(row_data.size(), 4u);
-    ASSERT_EQ(row_data[0].safeGet<UInt64>(), 1u);
-    ASSERT_EQ(row_data[1].safeGet<UInt64>(), 1u);
-    ASSERT_EQ(row_data[2].safeGet<UInt64>(), 1u);
-    ASSERT_EQ(row_data[3].safeGet<UInt64>(), 1u);
+    ASSERT_EQ(row_data[0].get<UInt64>(), 1u);
+    ASSERT_EQ(row_data[1].get<UInt64>(), 1u);
+    ASSERT_EQ(row_data[2].get<UInt64>(), 1u);
+    ASSERT_EQ(row_data[3].get<UInt64>(), 1u);
 
     ASSERT_TRUE(binlog.tryReadEvent(event, timeout));
     ++count;
@@ -342,18 +342,18 @@ static void testFile1(IBinlog & binlog, UInt64 timeout, bool filtered = false)
     ASSERT_EQ(update_event->table, "a");
     ASSERT_EQ(update_event->rows.size(), 2);
     ASSERT_EQ(update_event->rows[0].getType(), Field::Types::Tuple);
-    row_data = update_event->rows[0].safeGet<const Tuple &>();
+    row_data = update_event->rows[0].get<const Tuple &>();
     ASSERT_EQ(row_data.size(), 4u);
-    ASSERT_EQ(row_data[0].safeGet<UInt64>(), 1u);
-    ASSERT_EQ(row_data[1].safeGet<UInt64>(), 1u);
-    ASSERT_EQ(row_data[2].safeGet<UInt64>(), 1u);
-    ASSERT_EQ(row_data[3].safeGet<UInt64>(), 1u);
-    row_data = update_event->rows[1].safeGet<const Tuple &>();
+    ASSERT_EQ(row_data[0].get<UInt64>(), 1u);
+    ASSERT_EQ(row_data[1].get<UInt64>(), 1u);
+    ASSERT_EQ(row_data[2].get<UInt64>(), 1u);
+    ASSERT_EQ(row_data[3].get<UInt64>(), 1u);
+    row_data = update_event->rows[1].get<const Tuple &>();
     ASSERT_EQ(row_data.size(), 4u);
-    ASSERT_EQ(row_data[0].safeGet<UInt64>(), 1u);
-    ASSERT_EQ(row_data[1].safeGet<UInt64>(), 2u);
-    ASSERT_EQ(row_data[2].safeGet<UInt64>(), 1u);
-    ASSERT_EQ(row_data[3].safeGet<UInt64>(), 1u);
+    ASSERT_EQ(row_data[0].get<UInt64>(), 1u);
+    ASSERT_EQ(row_data[1].get<UInt64>(), 2u);
+    ASSERT_EQ(row_data[2].get<UInt64>(), 1u);
+    ASSERT_EQ(row_data[3].get<UInt64>(), 1u);
 
     ASSERT_TRUE(binlog.tryReadEvent(event, timeout));
     ++count;
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
index 032fc33ea16..a846e23cd4f 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
@@ -12,9 +12,9 @@
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTDataType.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/parseQuery.h>
+#include <Parsers/queryToString.h>
 #include <Common/escapeForFileName.h>
 #include <Common/parseRemoteDescription.h>
 #include <Databases/DatabaseFactory.h>
@@ -25,7 +25,6 @@
 #include <Core/Settings.h>
 #include <filesystem>
 
-
 namespace fs = std::filesystem;
 
 namespace DB
@@ -433,7 +432,7 @@ ASTPtr DatabasePostgreSQL::getCreateTableQueryImpl(const String & table_name, Co
     auto metadata_snapshot = storage->getInMemoryMetadataPtr();
     for (const auto & column_type_and_name : metadata_snapshot->getColumns().getOrdinary())
     {
-        const auto column_declaration = std::make_shared<ASTColumnDeclaration>();
+        const auto & column_declaration = std::make_shared<ASTColumnDeclaration>();
         column_declaration->name = column_type_and_name.name;
         column_declaration->type = getColumnDeclaration(column_type_and_name.type);
         columns_expression_list->children.emplace_back(column_declaration);
@@ -471,15 +470,17 @@ ASTPtr DatabasePostgreSQL::getColumnDeclaration(const DataTypePtr & data_type) c
     WhichDataType which(data_type);
 
     if (which.isNullable())
-        return makeASTDataType("Nullable", getColumnDeclaration(typeid_cast<const DataTypeNullable *>(data_type.get())->getNestedType()));
+        return makeASTFunction("Nullable", getColumnDeclaration(typeid_cast<const DataTypeNullable *>(data_type.get())->getNestedType()));
 
     if (which.isArray())
-        return makeASTDataType("Array", getColumnDeclaration(typeid_cast<const DataTypeArray *>(data_type.get())->getNestedType()));
+        return makeASTFunction("Array", getColumnDeclaration(typeid_cast<const DataTypeArray *>(data_type.get())->getNestedType()));
 
     if (which.isDateTime64())
-        return makeASTDataType("DateTime64", std::make_shared<ASTLiteral>(static_cast<UInt32>(6)));
+    {
+        return makeASTFunction("DateTime64", std::make_shared<ASTLiteral>(static_cast<UInt32>(6)));
+    }
 
-    return makeASTDataType(data_type->getName());
+    return std::make_shared<ASTIdentifier>(data_type->getName());
 }
 
 void registerDatabasePostgreSQL(DatabaseFactory & factory)
diff --git a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
index b9fd9c325f8..943f3ae502e 100644
--- a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
+++ b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
@@ -196,7 +196,7 @@ PostgreSQLTableStructure::ColumnsInfoPtr readNamesAndTypesList(
             }
             else
             {
-                std::tuple<std::string, std::string, std::string, uint16_t, std::string, std::string, std::string, std::string> row;
+                std::tuple<std::string, std::string, std::string, uint16_t, std::string, std::string, std::string> row;
                 while (stream >> row)
                 {
                     const auto column_name = std::get<0>(row);
@@ -206,14 +206,13 @@ PostgreSQLTableStructure::ColumnsInfoPtr readNamesAndTypesList(
                         std::get<3>(row));
 
                     columns.push_back(NameAndTypePair(column_name, data_type));
-                    auto attgenerated = std::get<7>(row);
+                    auto attgenerated = std::get<6>(row);
 
                     attributes.emplace(
                         column_name,
                         PostgreSQLTableStructure::PGAttribute{
                             .atttypid = parse<int>(std::get<4>(row)),
                             .atttypmod = parse<int>(std::get<5>(row)),
-                            .attnum = parse<int>(std::get<6>(row)),
                             .atthasdef = false,
                             .attgenerated = attgenerated.empty() ? char{} : char(attgenerated[0]),
                             .attr_def = {}
@@ -309,7 +308,6 @@ PostgreSQLTableStructure fetchPostgreSQLTableStructure(
            "attndims AS dims, " /// array dimensions
            "atttypid as type_id, "
            "atttypmod as type_modifier, "
-           "attnum as att_num, "
            "attgenerated as generated " /// if column has GENERATED
            "FROM pg_attribute "
            "WHERE attrelid = (SELECT oid FROM pg_class WHERE {}) "
@@ -340,29 +338,17 @@ PostgreSQLTableStructure fetchPostgreSQLTableStructure(
             "WHERE adrelid = (SELECT oid FROM pg_class WHERE {});", where);
 
         pqxx::result result{tx.exec(attrdef_query)};
-        if (static_cast<uint64_t>(result.size()) > table.physical_columns->names.size())
+        for (const auto row : result)
         {
-            throw Exception(ErrorCodes::LOGICAL_ERROR,
-                            "Received {} attrdef, but currently fetched columns list has {} columns",
-                            result.size(), table.physical_columns->attributes.size());
-        }
-
-        for (const auto & column_attrs : table.physical_columns->attributes)
-        {
-            if (column_attrs.second.attgenerated != 's') /// e.g. not a generated column
+            size_t adnum = row[0].as<int>();
+            if (!adnum || adnum > table.physical_columns->names.size())
             {
-                continue;
-            }
-
-            for (const auto row : result)
-            {
-                int adnum = row[0].as<int>();
-                if (column_attrs.second.attnum == adnum)
-                {
-                    table.physical_columns->attributes.at(column_attrs.first).attr_def = row[1].as<std::string>();
-                    break;
-                }
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                "Received adnum {}, but currently fetched columns list has {} columns",
+                                adnum, table.physical_columns->attributes.size());
             }
+            const auto column_name = table.physical_columns->names[adnum - 1];
+            table.physical_columns->attributes.at(column_name).attr_def = row[1].as<std::string>();
         }
     }
 
diff --git a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h
index 25ece6909fd..81bf7b278fc 100644
--- a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h
+++ b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h
@@ -16,7 +16,6 @@ struct PostgreSQLTableStructure
     {
         Int32 atttypid;
         Int32 atttypmod;
-        Int32 attnum;
         bool atthasdef;
         char attgenerated;
         std::string attr_def;
diff --git a/src/Databases/SQLite/DatabaseSQLite.cpp b/src/Databases/SQLite/DatabaseSQLite.cpp
index 471730fce29..132a978140c 100644
--- a/src/Databases/SQLite/DatabaseSQLite.cpp
+++ b/src/Databases/SQLite/DatabaseSQLite.cpp
@@ -154,7 +154,6 @@ StoragePtr DatabaseSQLite::fetchTable(const String & table_name, ContextPtr loca
         table_name,
         ColumnsDescription{*columns},
         ConstraintsDescription{},
-        /* comment = */ "",
         local_context);
 
     return storage;
diff --git a/src/Databases/TablesLoader.h b/src/Databases/TablesLoader.h
index bf469d83245..26b5777f1a9 100644
--- a/src/Databases/TablesLoader.h
+++ b/src/Databases/TablesLoader.h
@@ -1,5 +1,4 @@
 #pragma once
-
 #include <map>
 #include <mutex>
 #include <unordered_map>
diff --git a/src/Databases/enableAllExperimentalSettings.cpp b/src/Databases/enableAllExperimentalSettings.cpp
deleted file mode 100644
index 9abe05d7bce..00000000000
--- a/src/Databases/enableAllExperimentalSettings.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <Interpreters/Context.h>
-
-namespace DB
-{
-
-/*
- * Enables all settings that allow the use of experimental, deprecated, or potentially unsafe features
- * in a CREATE query. This function is used in DatabaseReplicated::recoverLostReplica() to create tables
- * when the original settings used to create the table are not available.
- */
-
-void enableAllExperimentalSettings(ContextMutablePtr context)
-{
-    context->setSetting("allow_experimental_inverted_index", 1);
-    context->setSetting("allow_experimental_full_text_index", 1);
-    context->setSetting("allow_experimental_codecs", 1);
-    context->setSetting("allow_experimental_live_view", 1);
-    context->setSetting("allow_experimental_window_view", 1);
-    context->setSetting("allow_experimental_funnel_functions", 1);
-    context->setSetting("allow_experimental_nlp_functions", 1);
-    context->setSetting("allow_experimental_hash_functions", 1);
-    context->setSetting("allow_experimental_object_type", 1);
-    context->setSetting("allow_experimental_variant_type", 1);
-    context->setSetting("allow_experimental_dynamic_type", 1);
-    context->setSetting("allow_experimental_json_type", 1);
-    context->setSetting("allow_experimental_vector_similarity_index", 1);
-    context->setSetting("allow_experimental_bigint_types", 1);
-    context->setSetting("allow_experimental_window_functions", 1);
-    context->setSetting("allow_experimental_geo_types", 1);
-    context->setSetting("allow_experimental_map_type", 1);
-    context->setSetting("allow_deprecated_error_prone_window_functions", 1);
-
-    context->setSetting("allow_suspicious_low_cardinality_types", 1);
-    context->setSetting("allow_suspicious_fixed_string_types", 1);
-    context->setSetting("allow_suspicious_indices", 1);
-    context->setSetting("allow_suspicious_codecs", 1);
-    context->setSetting("allow_hyperscan", 1);
-    context->setSetting("allow_simdjson", 1);
-    context->setSetting("allow_deprecated_syntax_for_merge_tree", 1);
-    context->setSetting("allow_suspicious_primary_key", 1);
-    context->setSetting("allow_suspicious_ttl_expressions", 1);
-    context->setSetting("allow_suspicious_variant_types", 1);
-    context->setSetting("enable_deflate_qpl_codec", 1);
-    context->setSetting("enable_zstd_qat_codec", 1);
-    context->setSetting("allow_create_index_without_type", 1);
-    context->setSetting("allow_experimental_s3queue", 1);
-}
-
-}
diff --git a/src/Databases/enableAllExperimentalSettings.h b/src/Databases/enableAllExperimentalSettings.h
deleted file mode 100644
index ec3bfb98843..00000000000
--- a/src/Databases/enableAllExperimentalSettings.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-#include <Interpreters/Context_fwd.h>
-
-namespace DB
-{
-
-/*
- * Enables all settings that allow the use of experimental, deprecated, or potentially unsafe features
- * in a CREATE query. This function is used in DatabaseReplicated::recoverLostReplica() to create tables
- * when the original settings used to create the table are not available.
- */
-
-void enableAllExperimentalSettings(ContextMutablePtr context);
-
-}
diff --git a/src/Dictionaries/CacheDictionaryStorage.h b/src/Dictionaries/CacheDictionaryStorage.h
index 781822533e9..47f99bd1093 100644
--- a/src/Dictionaries/CacheDictionaryStorage.h
+++ b/src/Dictionaries/CacheDictionaryStorage.h
@@ -395,13 +395,13 @@ private:
                         }
                         else if constexpr (std::is_same_v<ElementType, StringRef>)
                         {
-                            const String & string_value = column_value.safeGet<String>();
+                            const String & string_value = column_value.get<String>();
                             StringRef inserted_value = copyStringInArena(arena, string_value);
                             container.back() = inserted_value;
                         }
                         else
                         {
-                            container.back() = static_cast<ElementType>(column_value.safeGet<ElementType>());
+                            container.back() = static_cast<ElementType>(column_value.get<ElementType>());
                         }
                     });
                 }
@@ -441,7 +441,7 @@ private:
                         }
                         else if constexpr (std::is_same_v<ElementType, StringRef>)
                         {
-                            const String & string_value = column_value.safeGet<String>();
+                            const String & string_value = column_value.get<String>();
                             StringRef inserted_value = copyStringInArena(arena, string_value);
 
                             if (!cell_was_default)
@@ -454,7 +454,7 @@ private:
                         }
                         else
                         {
-                            container[index_to_use] = static_cast<ElementType>(column_value.safeGet<ElementType>());
+                            container[index_to_use] = static_cast<ElementType>(column_value.get<ElementType>());
                         }
                     });
                 }
@@ -651,12 +651,12 @@ private:
                 }
                 else if constexpr (std::is_same_v<ValueType, StringRef>)
                 {
-                    auto & value = default_value.safeGet<String>();
+                    auto & value = default_value.get<String>();
                     value_setter(value);
                 }
                 else
                 {
-                    value_setter(default_value.safeGet<ValueType>());
+                    value_setter(default_value.get<ValueType>());
                 }
             }
             else
diff --git a/src/Dictionaries/ClickHouseDictionarySource.cpp b/src/Dictionaries/ClickHouseDictionarySource.cpp
index b36d53a6159..bf16f315ddf 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.cpp
+++ b/src/Dictionaries/ClickHouseDictionarySource.cpp
@@ -51,8 +51,6 @@ namespace
             configuration.db,
             configuration.user,
             configuration.password,
-            configuration.proto_send_chunked,
-            configuration.proto_recv_chunked,
             configuration.quota_key,
             "", /* cluster */
             "", /* cluster_secret */
@@ -224,7 +222,7 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
         {
             validateNamedCollection(
                 *named_collection, {}, ValidateKeysMultiset<ExternalDatabaseEqualKeysSet>{
-                    "secure", "host", "hostname", "port", "user", "username", "password", "proto_send_chunked", "proto_recv_chunked", "quota_key", "name",
+                    "secure", "host", "hostname", "port", "user", "username", "password", "quota_key", "name",
                     "db", "database", "table","query", "where", "invalidate_query", "update_field", "update_lag"});
 
             const auto secure = named_collection->getOrDefault("secure", false);
@@ -236,8 +234,6 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
                 .host = host,
                 .user = named_collection->getAnyOrDefault<String>({"user", "username"}, "default"),
                 .password = named_collection->getOrDefault<String>("password", ""),
-                .proto_send_chunked = named_collection->getOrDefault<String>("proto_send_chunked", "notchunked"),
-                .proto_recv_chunked = named_collection->getOrDefault<String>("proto_recv_chunked", "notchunked"),
                 .quota_key = named_collection->getOrDefault<String>("quota_key", ""),
                 .db = named_collection->getAnyOrDefault<String>({"db", "database"}, default_database),
                 .table = named_collection->getOrDefault<String>("table", ""),
@@ -262,8 +258,6 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
                 .host = host,
                 .user = config.getString(settings_config_prefix + ".user", "default"),
                 .password = config.getString(settings_config_prefix + ".password", ""),
-                .proto_send_chunked = config.getString(settings_config_prefix + ".proto_caps.send", "notchunked"),
-                .proto_recv_chunked = config.getString(settings_config_prefix + ".proto_caps.recv", "notchunked"),
                 .quota_key = config.getString(settings_config_prefix + ".quota_key", ""),
                 .db = config.getString(settings_config_prefix + ".db", default_database),
                 .table = config.getString(settings_config_prefix + ".table", ""),
diff --git a/src/Dictionaries/ClickHouseDictionarySource.h b/src/Dictionaries/ClickHouseDictionarySource.h
index faf9e5f8009..3357514eab2 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.h
+++ b/src/Dictionaries/ClickHouseDictionarySource.h
@@ -23,8 +23,6 @@ public:
         const std::string host;
         const std::string user;
         const std::string password;
-        const std::string proto_send_chunked;
-        const std::string proto_recv_chunked;
         const std::string quota_key;
         const std::string db;
         const std::string table;
diff --git a/src/Dictionaries/DictionaryHelpers.h b/src/Dictionaries/DictionaryHelpers.h
index 43fd39640c3..64fc05e99ab 100644
--- a/src/Dictionaries/DictionaryHelpers.h
+++ b/src/Dictionaries/DictionaryHelpers.h
@@ -345,7 +345,7 @@ public:
             if (attribute_default_value.isNull())
                 default_value_is_null = true;
             else
-                default_value = static_cast<DictionaryAttributeType>(attribute_default_value.safeGet<DictionaryAttributeType>());
+                default_value = static_cast<DictionaryAttributeType>(attribute_default_value.get<DictionaryAttributeType>());
         }
         else
         {
@@ -377,7 +377,7 @@ public:
         if constexpr (std::is_same_v<DefaultColumnType, ColumnArray>)
         {
             Field field = (*default_values_column)[row];
-            return field.safeGet<Array>();
+            return field.get<Array>();
         }
         else if constexpr (std::is_same_v<DefaultColumnType, ColumnString>)
             return default_values_column->getDataAt(row);
diff --git a/src/Dictionaries/Embedded/RegionsNames.h b/src/Dictionaries/Embedded/RegionsNames.h
index 73b432fb30d..0e4c1fe8b88 100644
--- a/src/Dictionaries/Embedded/RegionsNames.h
+++ b/src/Dictionaries/Embedded/RegionsNames.h
@@ -35,10 +35,9 @@ class RegionsNames
     M(et, ru, 11) \
     M(pt, en, 12) \
     M(he, en, 13) \
-    M(vi, en, 14) \
-    M(es, en, 15)
+    M(vi, en, 14)
 
-    static constexpr size_t total_languages = 16;
+    static constexpr size_t total_languages = 15;
 
 public:
     enum class Language : size_t
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index b0233766741..999160226d9 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -245,7 +245,7 @@ ColumnPtr FlatDictionary::getHierarchy(ColumnPtr key_column, const DataTypePtr &
     std::optional<UInt64> null_value;
 
     if (!dictionary_attribute.null_value.isNull())
-        null_value = dictionary_attribute.null_value.safeGet<UInt64>();
+        null_value = dictionary_attribute.null_value.get<UInt64>();
 
     const ContainerType<UInt64> & parent_keys = std::get<ContainerType<UInt64>>(hierarchical_attribute.container);
 
@@ -300,7 +300,7 @@ ColumnUInt8::Ptr FlatDictionary::isInHierarchy(
     std::optional<UInt64> null_value;
 
     if (!dictionary_attribute.null_value.isNull())
-        null_value = dictionary_attribute.null_value.safeGet<UInt64>();
+        null_value = dictionary_attribute.null_value.get<UInt64>();
 
     const ContainerType<UInt64> & parent_keys = std::get<ContainerType<UInt64>>(hierarchical_attribute.container);
 
@@ -701,7 +701,7 @@ void FlatDictionary::setAttributeValue(Attribute & attribute, const UInt64 key,
             return;
         }
 
-        auto & attribute_value = value.safeGet<AttributeType>();
+        auto & attribute_value = value.get<AttributeType>();
 
         auto & container = std::get<ContainerType<ValueType>>(attribute.container);
         loaded_keys[key] = true;
diff --git a/src/Dictionaries/HTTPDictionarySource.cpp b/src/Dictionaries/HTTPDictionarySource.cpp
index bf19f912723..663c63dd6c6 100644
--- a/src/Dictionaries/HTTPDictionarySource.cpp
+++ b/src/Dictionaries/HTTPDictionarySource.cpp
@@ -8,12 +8,12 @@
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
 #include <Processors/Formats/IInputFormat.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Common/logger_useful.h>
 #include "DictionarySourceFactory.h"
 #include "DictionarySourceHelpers.h"
 #include "DictionaryStructure.h"
-#include <Storages/NamedCollectionsHelpers.h>
 #include "registerDictionaries.h"
 
 
@@ -223,23 +223,21 @@ void registerDictionarySourceHTTP(DictionarySourceFactory & factory)
         String endpoint;
         String format;
 
-        auto named_collection = created_from_ddl ? tryGetNamedCollectionWithOverrides(config, settings_config_prefix, global_context) : nullptr;
+        auto named_collection = created_from_ddl
+                            ? getURLBasedDataSourceConfiguration(config, settings_config_prefix, global_context)
+                            : std::nullopt;
         if (named_collection)
         {
-            validateNamedCollection(
-                *named_collection,
-                /* required_keys */{},
-                /* optional_keys */ValidateKeysMultiset<ExternalDatabaseEqualKeysSet>{
-                "url", "endpoint", "user", "credentials.user", "password", "credentials.password", "format", "compression_method", "structure", "name"});
+            url = named_collection->configuration.url;
+            endpoint = named_collection->configuration.endpoint;
+            format = named_collection->configuration.format;
 
-            url = named_collection->getOrDefault<String>("url", "");
-            endpoint = named_collection->getOrDefault<String>("endpoint", "");
-            format = named_collection->getOrDefault<String>("format", "");
+            credentials.setUsername(named_collection->configuration.user);
+            credentials.setPassword(named_collection->configuration.password);
 
-            credentials.setUsername(named_collection->getAnyOrDefault<String>({"user", "credentials.user"}, ""));
-            credentials.setPassword(named_collection->getAnyOrDefault<String>({"password", "credentials.password"}, ""));
-
-            header_entries = getHeadersFromNamedCollection(*named_collection);
+            header_entries.reserve(named_collection->configuration.headers.size());
+            for (const auto & [key, value] : named_collection->configuration.headers)
+                header_entries.emplace_back(key, value);
         }
         else
         {
diff --git a/src/Dictionaries/HashedArrayDictionary.cpp b/src/Dictionaries/HashedArrayDictionary.cpp
index 8768be8e5ec..d7d50dfb0a6 100644
--- a/src/Dictionaries/HashedArrayDictionary.cpp
+++ b/src/Dictionaries/HashedArrayDictionary.cpp
@@ -240,7 +240,7 @@ ColumnPtr HashedArrayDictionary<dictionary_key_type, sharded>::getHierarchy(Colu
         std::optional<UInt64> null_value;
 
         if (!dictionary_attribute.null_value.isNull())
-            null_value = dictionary_attribute.null_value.safeGet<UInt64>();
+            null_value = dictionary_attribute.null_value.get<UInt64>();
 
 
         auto is_key_valid_func = [&, this](auto & key)
@@ -313,7 +313,7 @@ ColumnUInt8::Ptr HashedArrayDictionary<dictionary_key_type, sharded>::isInHierar
         std::optional<UInt64> null_value;
 
         if (!dictionary_attribute.null_value.isNull())
-            null_value = dictionary_attribute.null_value.safeGet<UInt64>();
+            null_value = dictionary_attribute.null_value.get<UInt64>();
 
 
         auto is_key_valid_func = [&](auto & key)
@@ -581,13 +581,13 @@ void HashedArrayDictionary<dictionary_key_type, sharded>::blockToAttributes(cons
 
                 if constexpr (std::is_same_v<AttributeValueType, StringRef>)
                 {
-                    String & value_to_insert = column_value_to_insert.safeGet<String>();
+                    String & value_to_insert = column_value_to_insert.get<String>();
                     StringRef string_in_arena_reference = copyStringInArena(*string_arenas[shard], value_to_insert);
                     attribute_container.back() = string_in_arena_reference;
                 }
                 else
                 {
-                    auto value_to_insert = static_cast<AttributeValueType>(column_value_to_insert.safeGet<AttributeValueType>());
+                    auto value_to_insert = static_cast<AttributeValueType>(column_value_to_insert.get<AttributeValueType>());
                     attribute_container.back() = value_to_insert;
                 }
             };
diff --git a/src/Dictionaries/HashedDictionary.h b/src/Dictionaries/HashedDictionary.h
index 7e935fe4855..3a2b61e5149 100644
--- a/src/Dictionaries/HashedDictionary.h
+++ b/src/Dictionaries/HashedDictionary.h
@@ -636,7 +636,7 @@ ColumnPtr HashedDictionary<dictionary_key_type, sparse, sharded>::getHierarchy(C
         std::optional<UInt64> null_value;
 
         if (!dictionary_attribute.null_value.isNull())
-            null_value = dictionary_attribute.null_value.safeGet<UInt64>();
+            null_value = dictionary_attribute.null_value.get<UInt64>();
 
         const CollectionsHolder<UInt64> & child_key_to_parent_key_maps = std::get<CollectionsHolder<UInt64>>(hierarchical_attribute.containers);
 
@@ -710,7 +710,7 @@ ColumnUInt8::Ptr HashedDictionary<dictionary_key_type, sparse, sharded>::isInHie
         std::optional<UInt64> null_value;
 
         if (!dictionary_attribute.null_value.isNull())
-            null_value = dictionary_attribute.null_value.safeGet<UInt64>();
+            null_value = dictionary_attribute.null_value.get<UInt64>();
 
         const CollectionsHolder<UInt64> & child_key_to_parent_key_maps = std::get<CollectionsHolder<UInt64>>(hierarchical_attribute.containers);
 
@@ -1004,13 +1004,13 @@ void HashedDictionary<dictionary_key_type, sparse, sharded>::blockToAttributes(c
 
                 if constexpr (std::is_same_v<AttributeValueType, StringRef>)
                 {
-                    String & value_to_insert = column_value_to_insert.safeGet<String>();
+                    String & value_to_insert = column_value_to_insert.get<String>();
                     StringRef arena_value = copyStringInArena(*string_arenas[shard], value_to_insert);
                     container.insert({key, arena_value});
                 }
                 else
                 {
-                    auto value_to_insert = static_cast<AttributeValueType>(column_value_to_insert.safeGet<AttributeValueType>());
+                    auto value_to_insert = static_cast<AttributeValueType>(column_value_to_insert.get<AttributeValueType>());
                     container.insert({key, value_to_insert});
                 }
 
diff --git a/src/Dictionaries/HierarchyDictionariesUtils.cpp b/src/Dictionaries/HierarchyDictionariesUtils.cpp
index de532ade26d..e1119982a34 100644
--- a/src/Dictionaries/HierarchyDictionariesUtils.cpp
+++ b/src/Dictionaries/HierarchyDictionariesUtils.cpp
@@ -50,7 +50,7 @@ namespace
         std::optional<UInt64> null_value;
 
         if (!hierarchical_attribute.null_value.isNull())
-            null_value = hierarchical_attribute.null_value.safeGet<UInt64>();
+            null_value = hierarchical_attribute.null_value.get<UInt64>();
 
         ColumnPtr key_to_request_column = ColumnVector<UInt64>::create();
         auto * key_to_request_column_typed = static_cast<ColumnVector<UInt64> *>(key_to_request_column->assumeMutable().get());
@@ -190,7 +190,7 @@ ColumnPtr getKeysHierarchyDefaultImplementation(
     std::optional<UInt64> null_value;
 
     if (!hierarchical_attribute.null_value.isNull())
-        null_value = hierarchical_attribute.null_value.safeGet<UInt64>();
+        null_value = hierarchical_attribute.null_value.get<UInt64>();
 
     auto get_parent_key_func = [&](auto & key)
     {
@@ -252,7 +252,7 @@ ColumnUInt8::Ptr getKeysIsInHierarchyDefaultImplementation(
     std::optional<UInt64> null_value;
 
     if (!hierarchical_attribute.null_value.isNull())
-        null_value = hierarchical_attribute.null_value.safeGet<UInt64>();
+        null_value = hierarchical_attribute.null_value.get<UInt64>();
 
     auto get_parent_key_func = [&](auto & key)
     {
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index 4f9e991752f..41fafcc162b 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -613,14 +613,14 @@ void IPAddressDictionary::calculateBytesAllocated()
 template <typename T>
 void IPAddressDictionary::createAttributeImpl(Attribute & attribute, const Field & null_value)
 {
-    attribute.null_values = null_value.isNull() ? T{} : T(null_value.safeGet<T>());
+    attribute.null_values = null_value.isNull() ? T{} : T(null_value.get<T>());
     attribute.maps.emplace<ContainerType<T>>();
 }
 
 template <>
 void IPAddressDictionary::createAttributeImpl<String>(Attribute & attribute, const Field & null_value)
 {
-    attribute.null_values = null_value.isNull() ? String() : null_value.safeGet<String>();
+    attribute.null_values = null_value.isNull() ? String() : null_value.get<String>();
     attribute.maps.emplace<ContainerType<StringRef>>();
     attribute.string_arena = std::make_unique<Arena>();
 }
@@ -976,13 +976,13 @@ void IPAddressDictionary::setAttributeValue(Attribute & attribute, const Field &
 
         if constexpr (std::is_same_v<AttributeType, String>)
         {
-            const auto & string = value.safeGet<String>();
+            const auto & string = value.get<String>();
             const auto * string_in_arena = attribute.string_arena->insert(string.data(), string.size());
             setAttributeValueImpl<StringRef>(attribute, StringRef{string_in_arena, string.size()});
         }
         else
         {
-            setAttributeValueImpl<AttributeType>(attribute, static_cast<AttributeType>(value.safeGet<AttributeType>()));
+            setAttributeValueImpl<AttributeType>(attribute, static_cast<AttributeType>(value.get<AttributeType>()));
         }
     };
 
diff --git a/src/Dictionaries/MongoDBDictionarySource.cpp b/src/Dictionaries/MongoDBDictionarySource.cpp
index 7bacfdab3d2..46910fa9f6a 100644
--- a/src/Dictionaries/MongoDBDictionarySource.cpp
+++ b/src/Dictionaries/MongoDBDictionarySource.cpp
@@ -1,12 +1,16 @@
 #include "MongoDBDictionarySource.h"
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
+#include "registerDictionaries.h"
+#include <Storages/ExternalDataSourceConfiguration.h>
 #include <Storages/StorageMongoDBSocketFactory.h>
-#include <Storages/NamedCollectionsHelpers.h>
 
 namespace DB
 {
 
+static const std::unordered_set<std::string_view> dictionary_allowed_keys = {
+    "host", "port", "user", "password", "db", "database", "uri", "collection", "name", "method", "options"};
+
 void registerDictionarySourceMongoDB(DictionarySourceFactory & factory)
 {
     auto create_mongo_db_dictionary = [](
@@ -19,53 +23,35 @@ void registerDictionarySourceMongoDB(DictionarySourceFactory & factory)
         bool created_from_ddl)
     {
         const auto config_prefix = root_config_prefix + ".mongodb";
-        auto named_collection = created_from_ddl ? tryGetNamedCollectionWithOverrides(config, config_prefix, context) : nullptr;
-
-        String host, username, password, database, method, options, collection;
-        UInt16 port;
+        ExternalDataSourceConfiguration configuration;
+        auto has_config_key = [](const String & key) { return dictionary_allowed_keys.contains(key); };
+        auto named_collection = getExternalDataSourceConfiguration(config, config_prefix, context, has_config_key);
         if (named_collection)
         {
-            validateNamedCollection(
-                *named_collection,
-                /* required_keys */{"collection"},
-                /* optional_keys */ValidateKeysMultiset<ExternalDatabaseEqualKeysSet>{
-                "host", "port", "user", "password", "db", "database", "uri", "name", "method", "options"});
-
-            host = named_collection->getOrDefault<String>("host", "");
-            port = static_cast<UInt16>(named_collection->getOrDefault<UInt64>("port", 0));
-            username = named_collection->getOrDefault<String>("user", "");
-            password = named_collection->getOrDefault<String>("password", "");
-            database = named_collection->getAnyOrDefault<String>({"db", "database"}, "");
-            method = named_collection->getOrDefault<String>("method", "");
-            collection = named_collection->getOrDefault<String>("collection", "");
-            options = named_collection->getOrDefault<String>("options", "");
+            configuration = named_collection->configuration;
         }
         else
         {
-            host = config.getString(config_prefix + ".host", "");
-            port = config.getUInt(config_prefix + ".port", 0);
-            username = config.getString(config_prefix + ".user", "");
-            password = config.getString(config_prefix + ".password", "");
-            database = config.getString(config_prefix + ".db", "");
-            method = config.getString(config_prefix + ".method", "");
-            collection = config.getString(config_prefix + ".collection");
-            options = config.getString(config_prefix + ".options", "");
+            configuration.host = config.getString(config_prefix + ".host", "");
+            configuration.port = config.getUInt(config_prefix + ".port", 0);
+            configuration.username = config.getString(config_prefix + ".user", "");
+            configuration.password = config.getString(config_prefix + ".password", "");
+            configuration.database = config.getString(config_prefix + ".db", "");
         }
 
         if (created_from_ddl)
-            context->getRemoteHostFilter().checkHostAndPort(host, toString(port));
+            context->getRemoteHostFilter().checkHostAndPort(configuration.host, toString(configuration.port));
 
-        return std::make_unique<MongoDBDictionarySource>(
-            dict_struct,
+        return std::make_unique<MongoDBDictionarySource>(dict_struct,
             config.getString(config_prefix + ".uri", ""),
-            host,
-            port,
-            username,
-            password,
-            method,
-            database,
-            collection,
-            options,
+            configuration.host,
+            configuration.port,
+            configuration.username,
+            configuration.password,
+            config.getString(config_prefix + ".method", ""),
+            configuration.database,
+            config.getString(config_prefix + ".collection"),
+            config.getString(config_prefix + ".options", ""),
             sample_block);
     };
 
@@ -247,7 +233,7 @@ QueryPipeline MongoDBDictionarySource::loadKeys(const Columns & key_columns, con
                 }
                 case AttributeUnderlyingType::String:
                 {
-                    String loaded_str((*key_columns[attribute_index])[row_idx].safeGet<String>());
+                    String loaded_str((*key_columns[attribute_index])[row_idx].get<String>());
                     /// Convert string to ObjectID
                     if (key_attribute.is_object_id)
                     {
diff --git a/src/Dictionaries/PolygonDictionary.cpp b/src/Dictionaries/PolygonDictionary.cpp
index ff29ca1f6b8..dfc920623e3 100644
--- a/src/Dictionaries/PolygonDictionary.cpp
+++ b/src/Dictionaries/PolygonDictionary.cpp
@@ -141,7 +141,7 @@ ColumnPtr IPolygonDictionary::getColumn(
                 {
                     getItemsShortCircuitImpl<ValueType>(
                         requested_key_points,
-                        [&](size_t row) { return (*attribute_values_column)[row].safeGet<Array>(); },
+                        [&](size_t row) { return (*attribute_values_column)[row].get<Array>(); },
                         [&](Array & value) { result_column_typed.insert(value); },
                         default_mask.value());
                 }
@@ -149,7 +149,7 @@ ColumnPtr IPolygonDictionary::getColumn(
                 {
                     getItemsImpl<ValueType>(
                         requested_key_points,
-                        [&](size_t row) { return (*attribute_values_column)[row].safeGet<Array>(); },
+                        [&](size_t row) { return (*attribute_values_column)[row].get<Array>(); },
                         [&](Array & value) { result_column_typed.insert(value); },
                         default_value_provider.value());
                 }
@@ -432,16 +432,16 @@ void IPolygonDictionary::getItemsImpl(
             }
             else if constexpr (std::is_same_v<AttributeType, Array>)
             {
-                set_value(default_value.safeGet<Array>());
+                set_value(default_value.get<Array>());
             }
             else if constexpr (std::is_same_v<AttributeType, StringRef>)
             {
-                auto default_value_string = default_value.safeGet<String>();
+                auto default_value_string = default_value.get<String>();
                 set_value(default_value_string);
             }
             else
             {
-                set_value(default_value.safeGet<NearestFieldType<AttributeType>>());
+                set_value(default_value.get<NearestFieldType<AttributeType>>());
             }
         }
     }
diff --git a/src/Dictionaries/PostgreSQLDictionarySource.cpp b/src/Dictionaries/PostgreSQLDictionarySource.cpp
index b1bab17e2e9..f62a9a009d8 100644
--- a/src/Dictionaries/PostgreSQLDictionarySource.cpp
+++ b/src/Dictionaries/PostgreSQLDictionarySource.cpp
@@ -4,7 +4,6 @@
 #include <Core/QualifiedTableName.h>
 #include <Core/Settings.h>
 #include "DictionarySourceFactory.h"
-#include <Storages/NamedCollectionsHelpers.h>
 #include "registerDictionaries.h"
 
 #if USE_LIBPQXX
@@ -14,6 +13,7 @@
 #include "readInvalidateQuery.h"
 #include <Interpreters/Context.h>
 #include <QueryPipeline/QueryPipeline.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 #include <Common/logger_useful.h>
 #endif
 
@@ -24,17 +24,16 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int SUPPORT_IS_DISABLED;
-    extern const int BAD_ARGUMENTS;
 }
 
-static const ValidateKeysMultiset<ExternalDatabaseEqualKeysSet> dictionary_allowed_keys = {
-    "host", "port", "user", "password", "db", "database", "table", "schema",
-    "update_field", "update_lag", "invalidate_query", "query", "where", "name", "priority"};
-
 #if USE_LIBPQXX
 
 static const UInt64 max_block_size = 8192;
 
+static const std::unordered_set<std::string_view> dictionary_allowed_keys = {
+    "host", "port", "user", "password", "db", "database", "table", "schema",
+    "update_field", "update_lag", "invalidate_query", "query", "where", "name", "priority"};
+
 namespace
 {
     ExternalQueryBuilder makeExternalQueryBuilder(const DictionaryStructure & dict_struct, const String & schema, const String & table, const String & query, const String & where)
@@ -178,19 +177,6 @@ std::string PostgreSQLDictionarySource::toString() const
     return "PostgreSQL: " + configuration.db + '.' + configuration.table + (where.empty() ? "" : ", where: " + where);
 }
 
-static void validateConfigKeys(
-    const Poco::Util::AbstractConfiguration & dict_config, const String & config_prefix)
-{
-    Poco::Util::AbstractConfiguration::Keys config_keys;
-    dict_config.keys(config_prefix, config_keys);
-    for (const auto & config_key : config_keys)
-    {
-        if (dictionary_allowed_keys.contains(config_key) || startsWith(config_key, "replica"))
-            continue;
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unexpected key `{}` in dictionary source configuration", config_key);
-    }
-}
-
 #endif
 
 void registerDictionarySourcePostgreSQL(DictionarySourceFactory & factory)
@@ -205,117 +191,38 @@ void registerDictionarySourcePostgreSQL(DictionarySourceFactory & factory)
     {
 #if USE_LIBPQXX
         const auto settings_config_prefix = config_prefix + ".postgresql";
+        auto has_config_key = [](const String & key) { return dictionary_allowed_keys.contains(key) || key.starts_with("replica"); };
+        auto configuration = getExternalDataSourceConfigurationByPriority(config, settings_config_prefix, context, has_config_key);
         const auto & settings = context->getSettingsRef();
 
-        std::optional<PostgreSQLDictionarySource::Configuration> dictionary_configuration;
-        postgres::PoolWithFailover::ReplicasConfigurationByPriority replicas_by_priority;
-
-        auto named_collection = created_from_ddl ? tryGetNamedCollectionWithOverrides(config, settings_config_prefix, context) : nullptr;
-        if (named_collection)
-        {
-            validateNamedCollection<ValidateKeysMultiset<ExternalDatabaseEqualKeysSet>>(*named_collection, {}, dictionary_allowed_keys);
-
-            StoragePostgreSQL::Configuration common_configuration;
-            common_configuration.host = named_collection->getOrDefault<String>("host", "");
-            common_configuration.port = named_collection->getOrDefault<UInt64>("port", 0);
-            common_configuration.username = named_collection->getOrDefault<String>("user", "");
-            common_configuration.password = named_collection->getOrDefault<String>("password", "");
-            common_configuration.database = named_collection->getAnyOrDefault<String>({"database", "db"}, "");
-            common_configuration.schema = named_collection->getOrDefault<String>("schema", "");
-            common_configuration.table = named_collection->getOrDefault<String>("table", "");
-
-            dictionary_configuration.emplace(PostgreSQLDictionarySource::Configuration{
-                .db = common_configuration.database,
-                .schema = common_configuration.schema,
-                .table = common_configuration.table,
-                .query = named_collection->getOrDefault<String>("query", ""),
-                .where = named_collection->getOrDefault<String>("where", ""),
-                .invalidate_query = named_collection->getOrDefault<String>("invalidate_query", ""),
-                .update_field = named_collection->getOrDefault<String>("update_field", ""),
-                .update_lag = named_collection->getOrDefault<UInt64>("update_lag", 1),
-            });
-
-            replicas_by_priority[0].emplace_back(common_configuration);
-        }
-        else
-        {
-            validateConfigKeys(config, settings_config_prefix);
-
-            StoragePostgreSQL::Configuration common_configuration;
-            common_configuration.host = config.getString(settings_config_prefix + ".host", "");
-            common_configuration.port = config.getUInt(settings_config_prefix + ".port", 0);
-            common_configuration.username = config.getString(settings_config_prefix + ".user", "");
-            common_configuration.password = config.getString(settings_config_prefix + ".password", "");
-            common_configuration.database = config.getString(fmt::format("{}.database", settings_config_prefix), config.getString(fmt::format("{}.db", settings_config_prefix), ""));
-            common_configuration.schema = config.getString(fmt::format("{}.schema", settings_config_prefix), "");
-            common_configuration.table = config.getString(fmt::format("{}.table", settings_config_prefix), "");
-
-            dictionary_configuration.emplace(PostgreSQLDictionarySource::Configuration
-            {
-                .db = common_configuration.database,
-                .schema = common_configuration.schema,
-                .table = common_configuration.table,
-                .query = config.getString(fmt::format("{}.query", settings_config_prefix), ""),
-                .where = config.getString(fmt::format("{}.where", settings_config_prefix), ""),
-                .invalidate_query = config.getString(fmt::format("{}.invalidate_query", settings_config_prefix), ""),
-                .update_field = config.getString(fmt::format("{}.update_field", settings_config_prefix), ""),
-                .update_lag = config.getUInt64(fmt::format("{}.update_lag", settings_config_prefix), 1)
-            });
-
-
-            if (config.has(settings_config_prefix + ".replica"))
-            {
-                Poco::Util::AbstractConfiguration::Keys config_keys;
-                config.keys(settings_config_prefix, config_keys);
-
-                for (const auto & config_key : config_keys)
-                {
-                    if (config_key.starts_with("replica"))
-                    {
-                        String replica_name = settings_config_prefix + "." + config_key;
-                        StoragePostgreSQL::Configuration replica_configuration{common_configuration};
-
-                        size_t priority = config.getInt(replica_name + ".priority", 0);
-                        replica_configuration.host = config.getString(replica_name + ".host", common_configuration.host);
-                        replica_configuration.port = config.getUInt(replica_name + ".port", common_configuration.port);
-                        replica_configuration.username = config.getString(replica_name + ".user", common_configuration.username);
-                        replica_configuration.password = config.getString(replica_name + ".password", common_configuration.password);
-
-                        if (replica_configuration.host.empty() || replica_configuration.port == 0
-                            || replica_configuration.username.empty() || replica_configuration.password.empty())
-                        {
-                            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                                            "Named collection of connection parameters is missing some "
-                                            "of the parameters and no other dictionary parameters are added");
-                        }
-
-                        replicas_by_priority[priority].emplace_back(replica_configuration);
-                    }
-                }
-            }
-            else
-            {
-                replicas_by_priority[0].emplace_back(common_configuration);
-            }
-        }
         if (created_from_ddl)
         {
-            for (const auto & [_, replicas] : replicas_by_priority)
-                for (const auto & replica : replicas)
+            for (const auto & replicas : configuration.replicas_configurations)
+                for (const auto & replica : replicas.second)
                     context->getRemoteHostFilter().checkHostAndPort(replica.host, toString(replica.port));
         }
 
-
         auto pool = std::make_shared<postgres::PoolWithFailover>(
-            replicas_by_priority,
+            configuration.replicas_configurations,
             settings.postgresql_connection_pool_size,
             settings.postgresql_connection_pool_wait_timeout,
             settings.postgresql_connection_pool_retries,
             settings.postgresql_connection_pool_auto_close_connection,
             settings.postgresql_connection_attempt_timeout);
 
+        PostgreSQLDictionarySource::Configuration dictionary_configuration
+        {
+            .db = configuration.database,
+            .schema = configuration.schema,
+            .table = configuration.table,
+            .query = config.getString(fmt::format("{}.query", settings_config_prefix), ""),
+            .where = config.getString(fmt::format("{}.where", settings_config_prefix), ""),
+            .invalidate_query = config.getString(fmt::format("{}.invalidate_query", settings_config_prefix), ""),
+            .update_field = config.getString(fmt::format("{}.update_field", settings_config_prefix), ""),
+            .update_lag = config.getUInt64(fmt::format("{}.update_lag", settings_config_prefix), 1)
+        };
 
-        return std::make_unique<PostgreSQLDictionarySource>(dict_struct, dictionary_configuration.value(), pool, sample_block);
+        return std::make_unique<PostgreSQLDictionarySource>(dict_struct, dictionary_configuration, pool, sample_block);
 #else
         (void)dict_struct;
         (void)config;
diff --git a/src/Dictionaries/RangeHashedDictionary.h b/src/Dictionaries/RangeHashedDictionary.h
index c264b480bcb..fc6c98990d0 100644
--- a/src/Dictionaries/RangeHashedDictionary.h
+++ b/src/Dictionaries/RangeHashedDictionary.h
@@ -906,13 +906,13 @@ void RangeHashedDictionary<dictionary_key_type>::setAttributeValue(Attribute & a
 
         if constexpr (std::is_same_v<AttributeType, String>)
         {
-            const auto & string = value.safeGet<String>();
+            const auto & string = value.get<String>();
             StringRef string_ref = copyStringInArena(string_arena, string);
             value_to_insert = string_ref;
         }
         else
         {
-            value_to_insert = static_cast<ValueType>(value.safeGet<ValueType>());
+            value_to_insert = static_cast<ValueType>(value.get<ValueType>());
         }
 
         container.back() = value_to_insert;
diff --git a/src/Dictionaries/RedisDictionarySource.cpp b/src/Dictionaries/RedisDictionarySource.cpp
index 9db639a0ca4..1736cdff306 100644
--- a/src/Dictionaries/RedisDictionarySource.cpp
+++ b/src/Dictionaries/RedisDictionarySource.cpp
@@ -1,6 +1,7 @@
 #include "RedisDictionarySource.h"
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
+#include "registerDictionaries.h"
 
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Interpreters/Context.h>
@@ -159,7 +160,7 @@ namespace DB
                 if (isInteger(type))
                     key << DB::toString(key_columns[i]->get64(row));
                 else if (isString(type))
-                    key << (*key_columns[i])[row].safeGet<const String &>();
+                    key << (*key_columns[i])[row].get<const String &>();
                 else
                     throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected type of key in Redis dictionary");
             }
diff --git a/src/Disks/DiskFomAST.cpp b/src/Disks/DiskFomAST.cpp
deleted file mode 100644
index 5329ff8748a..00000000000
--- a/src/Disks/DiskFomAST.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-#include <Disks/DiskFomAST.h>
-#include <Common/assert_cast.h>
-#include <Common/filesystemHelpers.h>
-#include <Disks/getDiskConfigurationFromAST.h>
-#include <Disks/DiskSelector.h>
-#include <Parsers/formatAST.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/isDiskFunction.h>
-#include <Interpreters/Context.h>
-#include <Parsers/IAST.h>
-#include <Interpreters/InDepthNodeVisitor.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-}
-
-std::string getOrCreateCustomDisk(DiskConfigurationPtr config, const std::string & serialization, ContextPtr context, bool attach)
-{
-    Poco::Util::AbstractConfiguration::Keys disk_settings_keys;
-    config->keys(disk_settings_keys);
-    /// Check that no settings are defined when disk from the config is referred.
-    if (disk_settings_keys.empty())
-        throw Exception(
-            ErrorCodes::BAD_ARGUMENTS,
-            "Disk function must have arguments. Invalid disk description.");
-
-    if (disk_settings_keys.size() == 1 && disk_settings_keys.front() == "name" && !attach)
-        throw Exception(
-            ErrorCodes::BAD_ARGUMENTS,
-            "Disk function `{}` must have other arguments apart from `name`, which describe disk configuration. Invalid disk description.",
-            serialization);
-
-    auto disk_settings_hash = sipHash128(serialization.data(), serialization.size());
-
-    std::string disk_name;
-    if (config->has("name"))
-    {
-        disk_name = config->getString("name");
-    }
-    else
-    {
-        /// We need a unique name for a created custom disk, but it needs to be the same
-        /// after table is reattached or server is restarted, so take a hash of the disk
-        /// configuration serialized ast as a disk name suffix.
-        disk_name = DiskSelector::TMP_INTERNAL_DISK_PREFIX + toString(disk_settings_hash);
-    }
-
-
-    auto disk = context->getOrCreateDisk(disk_name, [&](const DisksMap & disks_map) -> DiskPtr {
-        auto result = DiskFactory::instance().create(
-            disk_name, *config, /* config_path */"", context, disks_map, /* attach */attach, /* custom_disk */true);
-        /// Mark that disk can be used without storage policy.
-        result->markDiskAsCustom(disk_settings_hash);
-        return result;
-    });
-
-    if (!disk->isCustomDisk())
-        throw Exception(ErrorCodes::BAD_ARGUMENTS,
-            "Disk `{}` already exists and is described by the config."
-            " It is impossible to redefine it.",
-            disk_name);
-
-    if (disk->getCustomDiskSettings() != disk_settings_hash && !attach)
-        throw Exception(
-                ErrorCodes::BAD_ARGUMENTS,
-                "The disk `{}` is already configured as a custom disk in another table. It can't be redefined with different settings.",
-                disk_name);
-
-    if (!attach && !disk->isRemote())
-    {
-        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_local_disks_base_dir_in_config);
-
-        if (!pathStartsWith(disk->getPath(), disk_path_expected_prefix))
-            throw Exception(
-                ErrorCodes::BAD_ARGUMENTS,
-                "Path of the custom local disk must be inside `{}` directory",
-                disk_path_expected_prefix);
-    }
-
-    return disk_name;
-}
-
-class DiskConfigurationFlattener
-{
-public:
-    struct Data
-    {
-        ContextPtr context;
-        bool attach;
-    };
-
-    static bool needChildVisit(const ASTPtr &, const ASTPtr &) { return true; }
-
-    static void visit(ASTPtr & ast, Data & data)
-    {
-        if (isDiskFunction(ast))
-        {
-            const auto * function = ast->as<ASTFunction>();
-            const auto * function_args_expr = assert_cast<const ASTExpressionList *>(function->arguments.get());
-            const auto & function_args = function_args_expr->children;
-            auto config = getDiskConfigurationFromAST(function_args, data.context);
-            auto disk_setting_string = serializeAST(*function);
-            auto disk_name = getOrCreateCustomDisk(config, disk_setting_string, data.context, data.attach);
-            ast = std::make_shared<ASTLiteral>(disk_name);
-        }
-    }
-};
-
-
-std::string DiskFomAST::createCustomDisk(const ASTPtr & disk_function_ast, ContextPtr context, bool attach)
-{
-    if (!isDiskFunction(disk_function_ast))
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected a disk function");
-
-    auto ast = disk_function_ast->clone();
-
-    using FlattenDiskConfigurationVisitor = InDepthNodeVisitor<DiskConfigurationFlattener, false>;
-    FlattenDiskConfigurationVisitor::Data data{context, attach};
-    FlattenDiskConfigurationVisitor{data}.visit(ast);
-
-    return assert_cast<const ASTLiteral &>(*ast).value.safeGet<String>();
-}
-
-void DiskFomAST::ensureDiskIsNotCustom(const std::string & disk_name, ContextPtr context)
-{
-    auto disk = context->getDisk(disk_name);
-
-    if (disk->isCustomDisk())
-        throw Exception(
-            ErrorCodes::BAD_ARGUMENTS,
-            "Disk name `{}` is a custom disk that is used in other table. "
-            "That disk could not be used by a reference by other tables. The custom disk should be fully specified with a disk function.",
-            disk_name);
-}
-
-}
diff --git a/src/Disks/DiskFomAST.h b/src/Disks/DiskFomAST.h
deleted file mode 100644
index 0a30834533e..00000000000
--- a/src/Disks/DiskFomAST.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-#include <string>
-#include <Interpreters/Context_fwd.h>
-#include <Parsers/IAST_fwd.h>
-
-namespace DB
-{
-
-namespace DiskFomAST
-{
-    void ensureDiskIsNotCustom(const std::string & name, ContextPtr context);
-    std::string createCustomDisk(const ASTPtr & disk_function, ContextPtr context, bool attach);
-}
-
-}
diff --git a/src/Disks/DiskLocal.cpp b/src/Disks/DiskLocal.cpp
index 12a5b615234..d1f0a928b1d 100644
--- a/src/Disks/DiskLocal.cpp
+++ b/src/Disks/DiskLocal.cpp
@@ -339,15 +339,7 @@ DiskLocal::writeFile(const String & path, size_t buf_size, WriteMode mode, const
 {
     int flags = (mode == WriteMode::Append) ? (O_APPEND | O_CREAT | O_WRONLY) : -1;
     return std::make_unique<WriteBufferFromFile>(
-        fs::path(disk_path) / path,
-        buf_size,
-        flags,
-        settings.local_throttler,
-        0666,
-        nullptr,
-        0,
-        settings.use_adaptive_write_buffer,
-        settings.adaptive_write_buffer_initial_size);
+        fs::path(disk_path) / path, buf_size, flags, settings.local_throttler);
 }
 
 std::vector<String> DiskLocal::getBlobPath(const String & path) const
diff --git a/src/Disks/DiskSelector.h b/src/Disks/DiskSelector.h
index e6e2c257911..49a1be5cf50 100644
--- a/src/Disks/DiskSelector.h
+++ b/src/Disks/DiskSelector.h
@@ -6,8 +6,6 @@
 #include <Poco/Util/AbstractConfiguration.h>
 
 #include <map>
-#include <sstream>
-#include <string_view>
 
 namespace DB
 {
diff --git a/src/Disks/IDisk.h b/src/Disks/IDisk.h
index 78d5f37e3a7..412ad27e94f 100644
--- a/src/Disks/IDisk.h
+++ b/src/Disks/IDisk.h
@@ -464,9 +464,9 @@ public:
     virtual void chmod(const String & /*path*/, mode_t /*mode*/) { throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk does not support chmod"); }
 
     /// Was disk created to be used without storage configuration?
-    bool isCustomDisk() const { return custom_disk_settings_hash != 0; }
-    UInt128 getCustomDiskSettings() const { return custom_disk_settings_hash; }
-    void markDiskAsCustom(UInt128 settings_hash) { custom_disk_settings_hash = settings_hash; }
+    bool isCustomDisk() const { return is_custom_disk; }
+
+    void markDiskAsCustom() { is_custom_disk = true; }
 
     virtual DiskPtr getDelegateDiskIfExists() const { return nullptr; }
 
@@ -504,8 +504,7 @@ protected:
 
 private:
     ThreadPool copying_thread_pool;
-    // 0 means the disk is not custom, the disk is predefined in the config
-    UInt128 custom_disk_settings_hash = 0;
+    bool is_custom_disk = false;
 
     /// Check access to the disk.
     void checkAccess();
diff --git a/src/Disks/IO/AsynchronousBoundedReadBuffer.h b/src/Disks/IO/AsynchronousBoundedReadBuffer.h
index 3dc8fcc39cb..9a802348998 100644
--- a/src/Disks/IO/AsynchronousBoundedReadBuffer.h
+++ b/src/Disks/IO/AsynchronousBoundedReadBuffer.h
@@ -34,7 +34,7 @@ public:
 
     String getFileName() const override { return impl->getFileName(); }
 
-    std::optional<size_t> tryGetFileSize() override { return impl->tryGetFileSize(); }
+    size_t getFileSize() override { return impl->getFileSize(); }
 
     String getInfoForLog() override { return impl->getInfoForLog(); }
 
diff --git a/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp b/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp
index 56bfa019819..198f6c0ea04 100644
--- a/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp
+++ b/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp
@@ -135,11 +135,8 @@ bool CachedOnDiskReadBufferFromFile::nextFileSegmentsBatch()
     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, user);
+        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();
 }
 
@@ -161,8 +158,8 @@ void CachedOnDiskReadBufferFromFile::initialize()
 
     LOG_TEST(
         log,
-        "Having {} file segments to read: {}, current read range: [{}, {})",
-        file_segments->size(), file_segments->toString(), file_offset_of_buffer_end, read_until_position);
+        "Having {} file segments to read: {}, current offset: {}",
+        file_segments->size(), file_segments->toString(), file_offset_of_buffer_end);
 
     initialized = true;
 }
@@ -645,9 +642,8 @@ void CachedOnDiskReadBufferFromFile::predownload(FileSegment & file_segment)
 
             ProfileEvents::increment(ProfileEvents::CachedReadBufferReadFromSourceBytes, current_impl_buffer_size);
 
-            std::string failure_reason;
             bool continue_predownload = file_segment.reserve(
-                current_predownload_size, settings.filesystem_cache_reserve_space_wait_lock_timeout_milliseconds, failure_reason);
+                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);
@@ -814,7 +810,6 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
 {
     last_caller_id = FileSegment::getCallerId();
 
-    chassert(file_offset_of_buffer_end <= read_until_position);
     if (file_offset_of_buffer_end == read_until_position)
         return false;
 
@@ -1003,8 +998,7 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
         {
             chassert(file_offset_of_buffer_end + size - 1 <= file_segment.range().right);
 
-            std::string failure_reason;
-            bool success = file_segment.reserve(size, settings.filesystem_cache_reserve_space_wait_lock_timeout_milliseconds, failure_reason);
+            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()));
@@ -1030,8 +1024,7 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
                     LOG_TRACE(log, "Bypassing cache because writeCache method failed");
             }
             else
-                LOG_TRACE(log, "No space left in cache to reserve {} bytes, reason: {}, "
-                          "will continue without cache download", size, failure_reason);
+                LOG_TRACE(log, "No space left in cache to reserve {} bytes, will continue without cache download", size);
 
             if (!success)
             {
@@ -1049,10 +1042,6 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
         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;
-
-            LOG_TEST(log, "Remaining size to read: {}, read: {}. Resizing buffer to {}",
-                     remaining_size_to_read, size, nextimpl_working_buffer_offset + std::min(size, remaining_size_to_read));
-
             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);
@@ -1062,11 +1051,7 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
 
         if (download_current_segment && download_current_segment_succeeded)
             chassert(file_segment.getCurrentWriteOffset() >= file_offset_of_buffer_end);
-
-        chassert(
-            file_offset_of_buffer_end <= read_until_position,
-            fmt::format("Expected {} <= {} (size: {}, read range: {}, hold file segments: {} ({}))",
-                        file_offset_of_buffer_end, read_until_position, size, current_read_range.toString(), file_segments->size(), file_segments->toString(true)));
+        chassert(file_offset_of_buffer_end <= read_until_position);
     }
 
     swap(*implementation_buffer);
diff --git a/src/Disks/IO/CachedOnDiskWriteBufferFromFile.cpp b/src/Disks/IO/CachedOnDiskWriteBufferFromFile.cpp
index 103ae0e1832..382c4a80cc4 100644
--- a/src/Disks/IO/CachedOnDiskWriteBufferFromFile.cpp
+++ b/src/Disks/IO/CachedOnDiskWriteBufferFromFile.cpp
@@ -91,8 +91,7 @@ bool FileSegmentRangeWriter::write(char * data, size_t size, size_t offset, File
 
         size_t size_to_write = std::min(available_size, size);
 
-        std::string failure_reason;
-        bool reserved = file_segment->reserve(size_to_write, reserve_space_lock_wait_timeout_milliseconds, failure_reason);
+        bool reserved = file_segment->reserve(size_to_write, reserve_space_lock_wait_timeout_milliseconds);
         if (!reserved)
         {
             appendFilesystemCacheLog(*file_segment);
diff --git a/src/Disks/IO/ReadBufferFromAzureBlobStorage.cpp b/src/Disks/IO/ReadBufferFromAzureBlobStorage.cpp
index dc547c5a8e8..da1ea65f2ea 100644
--- a/src/Disks/IO/ReadBufferFromAzureBlobStorage.cpp
+++ b/src/Disks/IO/ReadBufferFromAzureBlobStorage.cpp
@@ -8,7 +8,6 @@
 #include <IO/ReadBufferFromString.h>
 #include <Common/logger_useful.h>
 #include <Common/Throttler.h>
-#include <Common/Scheduler/ResourceGuard.h>
 #include <base/sleep.h>
 #include <Common/ProfileEvents.h>
 #include <IO/SeekableReadBuffer.h>
@@ -114,9 +113,7 @@ bool ReadBufferFromAzureBlobStorage::nextImpl()
     {
         try
         {
-            ResourceGuard rlock(ResourceGuard::Metrics::getIORead(), read_settings.io_scheduling.read_resource_link, to_read_bytes);
             bytes_read = data_stream->ReadToCount(reinterpret_cast<uint8_t *>(data_ptr), to_read_bytes);
-            rlock.unlock(bytes_read); // Do not hold resource under bandwidth throttler
             if (read_settings.remote_throttler)
                 read_settings.remote_throttler->add(bytes_read, ProfileEvents::RemoteReadThrottlerBytes, ProfileEvents::RemoteReadThrottlerSleepMicroseconds);
             break;
@@ -256,15 +253,16 @@ void ReadBufferFromAzureBlobStorage::initialize()
     initialized = true;
 }
 
-std::optional<size_t> ReadBufferFromAzureBlobStorage::tryGetFileSize()
+size_t ReadBufferFromAzureBlobStorage::getFileSize()
 {
     if (!blob_client)
         blob_client = std::make_unique<Azure::Storage::Blobs::BlobClient>(blob_container_client->GetBlobClient(path));
 
-    if (!file_size)
-        file_size = blob_client->GetProperties().Value.BlobSize;
+    if (file_size.has_value())
+        return *file_size;
 
-    return file_size;
+    file_size = blob_client->GetProperties().Value.BlobSize;
+    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
diff --git a/src/Disks/IO/ReadBufferFromAzureBlobStorage.h b/src/Disks/IO/ReadBufferFromAzureBlobStorage.h
index f407f27e099..d328195cc26 100644
--- a/src/Disks/IO/ReadBufferFromAzureBlobStorage.h
+++ b/src/Disks/IO/ReadBufferFromAzureBlobStorage.h
@@ -42,7 +42,7 @@ public:
 
     bool supportsRightBoundedReads() const override { return true; }
 
-    std::optional<size_t> tryGetFileSize() override;
+    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;
 
diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp b/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
index c96f5f0c931..bb9761a3905 100644
--- a/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
+++ b/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
@@ -80,27 +80,20 @@ SeekableReadBufferPtr ReadBufferFromRemoteFSGather::createImplementationBuffer(c
 
     if (with_file_cache)
     {
-        if (settings.remote_fs_cache->isInitialized())
-        {
-            auto cache_key = settings.remote_fs_cache->createKeyForPath(object_path);
-            buf = std::make_unique<CachedOnDiskReadBufferFromFile>(
-                object_path,
-                cache_key,
-                settings.remote_fs_cache,
-                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::nullopt,
-                cache_log);
-        }
-        else
-        {
-            settings.remote_fs_cache->throwInitExceptionIfNeeded();
-        }
+        auto cache_key = settings.remote_fs_cache->createKeyForPath(object_path);
+        buf = std::make_unique<CachedOnDiskReadBufferFromFile>(
+            object_path,
+            cache_key,
+            settings.remote_fs_cache,
+            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::nullopt,
+            cache_log);
     }
 
     /// Can't wrap CachedOnDiskReadBufferFromFile in CachedInMemoryReadBufferFromFile because the
diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.h b/src/Disks/IO/ReadBufferFromRemoteFSGather.h
index 9f1cb681f1a..e36365a8174 100644
--- a/src/Disks/IO/ReadBufferFromRemoteFSGather.h
+++ b/src/Disks/IO/ReadBufferFromRemoteFSGather.h
@@ -41,7 +41,7 @@ public:
 
     void setReadUntilEnd() override { setReadUntilPosition(getFileSize()); }
 
-    std::optional<size_t> tryGetFileSize() override { return getTotalSize(blobs_to_read); }
+    size_t getFileSize() override { return getTotalSize(blobs_to_read); }
 
     size_t getFileOffsetOfBufferEnd() const override { return file_offset_of_buffer_end; }
 
diff --git a/src/Disks/IO/WriteBufferFromAzureBlobStorage.cpp b/src/Disks/IO/WriteBufferFromAzureBlobStorage.cpp
index 5315e331dbd..60fa2997c50 100644
--- a/src/Disks/IO/WriteBufferFromAzureBlobStorage.cpp
+++ b/src/Disks/IO/WriteBufferFromAzureBlobStorage.cpp
@@ -59,7 +59,7 @@ WriteBufferFromAzureBlobStorage::WriteBufferFromAzureBlobStorage(
     const WriteSettings & write_settings_,
     std::shared_ptr<const AzureBlobStorage::RequestSettings> settings_,
     ThreadPoolCallbackRunnerUnsafe<void> schedule_)
-    : WriteBufferFromFileBase(std::min(buf_size_, static_cast<size_t>(DBMS_DEFAULT_BUFFER_SIZE)), nullptr, 0)
+    : WriteBufferFromFileBase(buf_size_, nullptr, 0)
     , log(getLogger("WriteBufferFromAzureBlobStorage"))
     , buffer_allocation_policy(createBufferAllocationPolicy(*settings_))
     , max_single_part_upload_size(settings_->max_single_part_upload_size)
@@ -101,13 +101,15 @@ void WriteBufferFromAzureBlobStorage::execWithRetry(std::function<void()> func,
     {
         try
         {
-            ResourceGuard rlock(ResourceGuard::Metrics::getIOWrite(), write_settings.io_scheduling.write_resource_link, cost); // Note that zero-cost requests are ignored
+            ResourceGuard rlock(write_settings.resource_link, cost); // Note that zero-cost requests are ignored
             func();
-            rlock.unlock(cost);
             break;
         }
         catch (const Azure::Core::RequestFailedException & e)
         {
+            if (cost)
+                write_settings.resource_link.accumulate(cost); // Accumulate resource for later use, because we have failed to consume it
+
             if (i == num_tries - 1 || !isRetryableAzureException(e))
                 throw;
 
@@ -115,6 +117,8 @@ void WriteBufferFromAzureBlobStorage::execWithRetry(std::function<void()> func,
         }
         catch (...)
         {
+            if (cost)
+                write_settings.resource_link.accumulate(cost); // We assume no resource was used in case of failure
             throw;
         }
     }
@@ -244,21 +248,11 @@ void WriteBufferFromAzureBlobStorage::allocateBuffer()
     buffer_allocation_policy->nextBuffer();
     chassert(0 == hidden_size);
 
-    /// First buffer was already allocated in BufferWithOwnMemory constructor with buffer size provided in constructor.
-    /// It will be reallocated in subsequent nextImpl calls up to the desired buffer size from buffer_allocation_policy.
-    if (buffer_allocation_policy->getBufferNumber() == 1)
-    {
-        /// Reduce memory size if initial size was larger then desired size from buffer_allocation_policy.
-        /// Usually it doesn't happen but we have it in unit tests.
-        if (memory.size() > buffer_allocation_policy->getBufferSize())
-        {
-            memory.resize(buffer_allocation_policy->getBufferSize());
-            WriteBuffer::set(memory.data(), memory.size());
-        }
-        return;
-    }
-
     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());
 }
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp
index 1a0b6157a86..0aa3b9c40b5 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp
@@ -11,14 +11,6 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Interpreters/Context.h>
 
-namespace ProfileEvents
-{
-    extern const Event AzureGetProperties;
-    extern const Event DiskAzureGetProperties;
-    extern const Event AzureCreateContainer;
-    extern const Event DiskAzureCreateContainer;
-}
-
 namespace DB
 {
 
@@ -222,53 +214,20 @@ void processURL(const String & url, const String & container_name, Endpoint & en
     }
 }
 
-static bool containerExists(const ContainerClient & client)
-{
-    ProfileEvents::increment(ProfileEvents::AzureGetProperties);
-    if (client.GetClickhouseOptions().IsClientForDisk)
-        ProfileEvents::increment(ProfileEvents::DiskAzureGetProperties);
-
-    try
-    {
-        client.GetProperties();
-        return true;
-    }
-    catch (const Azure::Storage::StorageException & e)
-    {
-        if (e.StatusCode == Azure::Core::Http::HttpStatusCode::NotFound)
-            return false;
-        throw;
-    }
-}
-
 std::unique_ptr<ContainerClient> getContainerClient(const ConnectionParams & params, bool readonly)
 {
     if (params.endpoint.container_already_exists.value_or(false) || readonly)
-    {
         return params.createForContainer();
-    }
-
-    if (!params.endpoint.container_already_exists.has_value())
-    {
-        auto container_client = params.createForContainer();
-        if (containerExists(*container_client))
-            return container_client;
-    }
 
     try
     {
         auto service_client = params.createForService();
-
-        ProfileEvents::increment(ProfileEvents::AzureCreateContainer);
-        if (params.client_options.ClickhouseOptions.IsClientForDisk)
-            ProfileEvents::increment(ProfileEvents::DiskAzureCreateContainer);
-
         return std::make_unique<ContainerClient>(service_client->CreateBlobContainer(params.endpoint.container_name).Value);
     }
     catch (const Azure::Storage::StorageException & e)
     {
-        /// If container_already_exists is not set (in config), ignore already exists error. Conflict - The specified container already exists.
-        /// To avoid race with creation of container, handle this error despite that we have already checked the existence of container.
+        /// If container_already_exists is not set (in config), ignore already exists error.
+        /// (Conflict - The specified container already exists)
         if (!params.endpoint.container_already_exists.has_value() && e.StatusCode == Azure::Core::Http::HttpStatusCode::Conflict)
             return params.createForContainer();
         throw;
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
index fa48825e1a6..bc16955143b 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
@@ -1,4 +1,3 @@
-#include <optional>
 #include <Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h>
 #include "Common/Exception.h"
 
@@ -86,7 +85,6 @@ private:
                     Poco::Timestamp::fromEpochTime(
                         std::chrono::duration_cast<std::chrono::seconds>(
                             static_cast<std::chrono::system_clock::time_point>(blob.Details.LastModified).time_since_epoch()).count()),
-                    blob.Details.ETag.ToString(),
                     {}}));
         }
 
@@ -119,8 +117,7 @@ AzureObjectStorage::AzureObjectStorage(
 {
 }
 
-ObjectStorageKey
-AzureObjectStorage::generateObjectKeyForPath(const std::string & /* path */, const std::optional<std::string> & /* key_prefix */) const
+ObjectStorageKey AzureObjectStorage::generateObjectKeyForPath(const std::string & /* path */) const
 {
     return ObjectStorageKey::createAsRelative(getRandomASCIIString(32));
 }
@@ -187,7 +184,6 @@ void AzureObjectStorage::listObjects(const std::string & path, RelativePathsWith
                     Poco::Timestamp::fromEpochTime(
                         std::chrono::duration_cast<std::chrono::seconds>(
                             static_cast<std::chrono::system_clock::time_point>(blob.Details.LastModified).time_since_epoch()).count()),
-                    blob.Details.ETag.ToString(),
                     {}}));
         }
 
@@ -289,7 +285,7 @@ std::unique_ptr<WriteBufferFromFileBase> AzureObjectStorage::writeObject( /// NO
     return std::make_unique<WriteBufferFromAzureBlobStorage>(
         client.get(),
         object.remote_path,
-        write_settings.use_adaptive_write_buffer ? write_settings.adaptive_write_buffer_initial_size : buf_size,
+        buf_size,
         patchSettings(write_settings),
         settings.get(),
         std::move(scheduler));
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
index bc90b05e64d..2c7ce5e18dc 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
@@ -101,7 +101,7 @@ public:
         const std::string & config_prefix,
         ContextPtr context) override;
 
-    ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) const override;
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path) const override;
 
     bool isRemote() const override { return true; }
 
diff --git a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
index ab0d357119c..a3b6e25e8ea 100644
--- a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
@@ -34,16 +34,14 @@ FileCache::Key CachedObjectStorage::getCacheKey(const std::string & path) const
     return cache->createKeyForPath(path);
 }
 
-ObjectStorageKey
-CachedObjectStorage::generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) const
+ObjectStorageKey CachedObjectStorage::generateObjectKeyForPath(const std::string & path) const
 {
-    return object_storage->generateObjectKeyForPath(path, key_prefix);
+    return object_storage->generateObjectKeyForPath(path);
 }
 
-ObjectStorageKey
-CachedObjectStorage::generateObjectKeyPrefixForDirectoryPath(const std::string & path, const std::optional<std::string> & key_prefix) const
+ObjectStorageKey CachedObjectStorage::generateObjectKeyPrefixForDirectoryPath(const std::string & path) const
 {
-    return object_storage->generateObjectKeyPrefixForDirectoryPath(path, key_prefix);
+    return object_storage->generateObjectKeyPrefixForDirectoryPath(path);
 }
 
 ReadSettings CachedObjectStorage::patchSettings(const ReadSettings & read_settings) const
@@ -99,7 +97,7 @@ std::unique_ptr<WriteBufferFromFileBase> CachedObjectStorage::writeObject( /// N
     /// Need to remove even if cache_on_write == false.
     removeCacheIfExists(object.remote_path);
 
-    if (cache_on_write && cache->isInitialized())
+    if (cache_on_write)
     {
         auto key = getCacheKey(object.remote_path);
         return std::make_unique<CachedOnDiskWriteBufferFromFile>(
@@ -122,8 +120,7 @@ void CachedObjectStorage::removeCacheIfExists(const std::string & path_key_for_c
         return;
 
     /// Add try catch?
-    if (cache->isInitialized())
-        cache->removeKeyIfExists(getCacheKey(path_key_for_cache), FileCache::getCommonUser().user_id);
+    cache->removeKeyIfExists(getCacheKey(path_key_for_cache), FileCache::getCommonUser().user_id);
 }
 
 void CachedObjectStorage::removeObject(const StoredObject & object)
diff --git a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
index efcdbfebabf..93ef2659cbb 100644
--- a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
+++ b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
@@ -98,10 +98,9 @@ public:
 
     const std::string & getCacheName() const override { return cache_config_name; }
 
-    ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) const override;
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path) const override;
 
-    ObjectStorageKey
-    generateObjectKeyPrefixForDirectoryPath(const std::string & path, const std::optional<std::string> & key_prefix) const override;
+    ObjectStorageKey generateObjectKeyPrefixForDirectoryPath(const std::string & path) const override;
 
     void setKeysGenerator(ObjectStorageKeysGeneratorPtr gen) override { object_storage->setKeysGenerator(gen); }
 
diff --git a/src/Disks/ObjectStorages/CommonPathPrefixKeyGenerator.cpp b/src/Disks/ObjectStorages/CommonPathPrefixKeyGenerator.cpp
index 521d5c037ab..e321c8a3c5a 100644
--- a/src/Disks/ObjectStorages/CommonPathPrefixKeyGenerator.cpp
+++ b/src/Disks/ObjectStorages/CommonPathPrefixKeyGenerator.cpp
@@ -1,7 +1,5 @@
-#include <Disks/ObjectStorages/CommonPathPrefixKeyGenerator.h>
-#include <Disks/ObjectStorages/InMemoryPathMap.h>
+#include "CommonPathPrefixKeyGenerator.h"
 
-#include <Common/SharedLockGuard.h>
 #include <Common/getRandomASCIIString.h>
 
 #include <deque>
@@ -11,22 +9,21 @@
 namespace DB
 {
 
-CommonPathPrefixKeyGenerator::CommonPathPrefixKeyGenerator(String key_prefix_, std::weak_ptr<InMemoryPathMap> path_map_)
-    : storage_key_prefix(key_prefix_), path_map(std::move(path_map_))
+CommonPathPrefixKeyGenerator::CommonPathPrefixKeyGenerator(
+    String key_prefix_, SharedMutex & shared_mutex_, std::weak_ptr<PathMap> path_map_)
+    : storage_key_prefix(key_prefix_), shared_mutex(shared_mutex_), path_map(std::move(path_map_))
 {
 }
 
-ObjectStorageKey
-CommonPathPrefixKeyGenerator::generate(const String & path, bool is_directory, const std::optional<String> & key_prefix) const
+ObjectStorageKey CommonPathPrefixKeyGenerator::generate(const String & path, bool is_directory) const
 {
-    const auto & [object_key_prefix, suffix_parts]
-        = getLongestObjectKeyPrefix(is_directory ? std::filesystem::path(path).parent_path().string() : path);
+    const auto & [object_key_prefix, suffix_parts] = getLongestObjectKeyPrefix(path);
 
-    auto key = std::filesystem::path(object_key_prefix);
+    auto key = std::filesystem::path(object_key_prefix.empty() ? storage_key_prefix : object_key_prefix);
 
     /// The longest prefix is the same as path, meaning that the  path is already mapped.
     if (suffix_parts.empty())
-        return ObjectStorageKey::createAsRelative(key_prefix.has_value() ? *key_prefix : storage_key_prefix, std::move(key));
+        return ObjectStorageKey::createAsRelative(std::move(key));
 
     /// File and top-level directory paths are mapped as is.
     if (!is_directory || object_key_prefix.empty())
@@ -42,7 +39,7 @@ CommonPathPrefixKeyGenerator::generate(const String & path, bool is_directory, c
         key /= getRandomASCIIString(part_size);
     }
 
-    return ObjectStorageKey::createAsRelative(key_prefix.has_value() ? *key_prefix : storage_key_prefix, key);
+    return ObjectStorageKey::createAsRelative(key);
 }
 
 std::tuple<std::string, std::vector<std::string>> CommonPathPrefixKeyGenerator::getLongestObjectKeyPrefix(const std::string & path) const
@@ -50,13 +47,14 @@ std::tuple<std::string, std::vector<std::string>> CommonPathPrefixKeyGenerator::
     std::filesystem::path p(path);
     std::deque<std::string> dq;
 
-    const auto ptr = path_map.lock();
-    SharedLockGuard lock(ptr->mutex);
+    std::shared_lock lock(shared_mutex);
+
+    auto ptr = path_map.lock();
 
     while (p != p.root_path())
     {
-        auto it = ptr->map.find(p);
-        if (it != ptr->map.end())
+        auto it = ptr->find(p / "");
+        if (it != ptr->end())
         {
             std::vector<std::string> vec(std::make_move_iterator(dq.begin()), std::make_move_iterator(dq.end()));
             return std::make_tuple(it->second, std::move(vec));
diff --git a/src/Disks/ObjectStorages/CommonPathPrefixKeyGenerator.h b/src/Disks/ObjectStorages/CommonPathPrefixKeyGenerator.h
index ea91d78600d..fb1140de908 100644
--- a/src/Disks/ObjectStorages/CommonPathPrefixKeyGenerator.h
+++ b/src/Disks/ObjectStorages/CommonPathPrefixKeyGenerator.h
@@ -1,15 +1,14 @@
 #pragma once
 
 #include <Common/ObjectStorageKeyGenerator.h>
+#include <Common/SharedMutex.h>
 
 #include <filesystem>
 #include <map>
-#include <optional>
 
 namespace DB
 {
 
-/// Deprecated. Used for backward compatibility with plain rewritable disks without a separate metadata layout.
 /// Object storage key generator used specifically with the
 /// MetadataStorageFromPlainObjectStorage if multiple writes are allowed.
 
@@ -19,16 +18,15 @@ namespace DB
 ///
 /// The key generator ensures that the original directory hierarchy is
 /// preserved, which is required for the MergeTree family.
-
-struct InMemoryPathMap;
 class CommonPathPrefixKeyGenerator : public IObjectStorageKeysGenerator
 {
 public:
     /// Local to remote path map. Leverages filesystem::path comparator for paths.
+    using PathMap = std::map<std::filesystem::path, std::string>;
 
-    explicit CommonPathPrefixKeyGenerator(String key_prefix_, std::weak_ptr<InMemoryPathMap> path_map_);
+    explicit CommonPathPrefixKeyGenerator(String key_prefix_, SharedMutex & shared_mutex_, std::weak_ptr<PathMap> path_map_);
 
-    ObjectStorageKey generate(const String & path, bool is_directory, const std::optional<String> & key_prefix) const override;
+    ObjectStorageKey generate(const String & path, bool is_directory) const override;
 
 private:
     /// Longest key prefix and unresolved parts of the source path.
@@ -36,7 +34,8 @@ private:
 
     const String storage_key_prefix;
 
-    std::weak_ptr<InMemoryPathMap> path_map;
+    SharedMutex & shared_mutex;
+    std::weak_ptr<PathMap> path_map;
 };
 
 }
diff --git a/src/Disks/ObjectStorages/DiskObjectStorage.cpp b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
index 07e2edac129..4de6d78e952 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
@@ -461,17 +461,14 @@ DiskObjectStoragePtr DiskObjectStorage::createDiskObjectStorage()
 }
 
 template <class Settings>
-static inline Settings updateIOSchedulingSettings(const Settings & settings, const String & read_resource_name, const String & write_resource_name)
+static inline Settings updateResourceLink(const Settings & settings, const String & resource_name)
 {
-    if (read_resource_name.empty() && write_resource_name.empty())
+    if (resource_name.empty())
         return settings;
     if (auto query_context = CurrentThread::getQueryContext())
     {
         Settings result(settings);
-        if (!read_resource_name.empty())
-            result.io_scheduling.read_resource_link = query_context->getWorkloadClassifier()->get(read_resource_name);
-        if (!write_resource_name.empty())
-            result.io_scheduling.write_resource_link = query_context->getWorkloadClassifier()->get(write_resource_name);
+        result.resource_link = query_context->getWorkloadClassifier()->get(resource_name);
         return result;
     }
     return settings;
@@ -503,7 +500,7 @@ std::unique_ptr<ReadBufferFromFileBase> DiskObjectStorage::readFile(
 
     return object_storage->readObjects(
         storage_objects,
-        updateIOSchedulingSettings(settings, getReadResourceName(), getWriteResourceName()),
+        updateResourceLink(settings, getReadResourceName()),
         read_hint,
         file_size);
 }
@@ -516,7 +513,7 @@ std::unique_ptr<WriteBufferFromFileBase> DiskObjectStorage::writeFile(
 {
     LOG_TEST(log, "Write file: {}", path);
 
-    WriteSettings write_settings = updateIOSchedulingSettings(settings, getReadResourceName(), getWriteResourceName());
+    WriteSettings write_settings = updateResourceLink(settings, getWriteResourceName());
     auto transaction = createObjectStorageTransaction();
     return transaction->writeFile(path, buf_size, mode, write_settings);
 }
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageMetadata.cpp b/src/Disks/ObjectStorages/DiskObjectStorageMetadata.cpp
index 233b13fb908..56d5d11ef8a 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageMetadata.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorageMetadata.cpp
@@ -205,7 +205,7 @@ void DiskObjectStorageMetadata::addObject(ObjectStorageKey key, size_t size)
     }
 
     total_size += size;
-    keys_with_meta.emplace_back(std::move(key), ObjectMetadata{size, {}, {}, {}});
+    keys_with_meta.emplace_back(std::move(key), ObjectMetadata{size, {}, {}});
 }
 
 ObjectKeyWithMetadata DiskObjectStorageMetadata::popLastObject()
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
index 880911b9958..e7c85bea1c6 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
@@ -537,7 +537,7 @@ struct CopyFileObjectStorageOperation final : public IDiskObjectStorageOperation
 
         for (const auto & object_from : source_blobs)
         {
-            auto object_key = destination_object_storage.generateObjectKeyForPath(to_path, std::nullopt /* key_prefix */);
+            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);
@@ -738,7 +738,7 @@ std::unique_ptr<WriteBufferFromFileBase> DiskObjectStorageTransaction::writeFile
     const WriteSettings & settings,
     bool autocommit)
 {
-    auto object_key = object_storage.generateObjectKeyForPath(path, std::nullopt /* key_prefix */);
+    auto object_key = object_storage.generateObjectKeyForPath(path);
     std::optional<ObjectAttributes> object_attributes;
 
     if (metadata_helper)
@@ -835,7 +835,7 @@ void DiskObjectStorageTransaction::writeFileUsingBlobWritingFunction(
     const String & path, WriteMode mode, WriteBlobFunction && write_blob_function)
 {
     /// This function is a simplified and adapted version of DiskObjectStorageTransaction::writeFile().
-    auto object_key = object_storage.generateObjectKeyForPath(path, std::nullopt /* key_prefix */);
+    auto object_key = object_storage.generateObjectKeyForPath(path);
     std::optional<ObjectAttributes> object_attributes;
 
     if (metadata_helper)
@@ -874,9 +874,7 @@ void DiskObjectStorageTransaction::writeFileUsingBlobWritingFunction(
     /// Create metadata (see create_metadata_callback in DiskObjectStorageTransaction::writeFile()).
     if (mode == WriteMode::Rewrite)
     {
-        /// Otherwise we will produce lost blobs which nobody points to
-        /// WriteOnce storages are not affected by the issue
-        if (!object_storage.isPlain() && metadata_storage.exists(path))
+        if (!object_storage.isWriteOnce() && metadata_storage.exists(path))
             object_storage.removeObjectsIfExist(metadata_storage.getStorageObjects(path));
 
         metadata_transaction->createMetadataFile(path, std::move(object_key), object_size);
diff --git a/src/Disks/ObjectStorages/FlatDirectoryStructureKeyGenerator.cpp b/src/Disks/ObjectStorages/FlatDirectoryStructureKeyGenerator.cpp
deleted file mode 100644
index 0f35bfd2427..00000000000
--- a/src/Disks/ObjectStorages/FlatDirectoryStructureKeyGenerator.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "FlatDirectoryStructureKeyGenerator.h"
-#include <Disks/ObjectStorages/InMemoryPathMap.h>
-#include "Common/ObjectStorageKey.h"
-#include <Common/SharedLockGuard.h>
-#include <Common/SharedMutex.h>
-#include <Common/getRandomASCIIString.h>
-
-#include <optional>
-#include <shared_mutex>
-#include <string>
-
-namespace DB
-{
-
-FlatDirectoryStructureKeyGenerator::FlatDirectoryStructureKeyGenerator(String storage_key_prefix_, std::weak_ptr<InMemoryPathMap> path_map_)
-    : storage_key_prefix(storage_key_prefix_), path_map(std::move(path_map_))
-{
-}
-
-ObjectStorageKey FlatDirectoryStructureKeyGenerator::generate(const String & path, bool is_directory, const std::optional<String> & key_prefix) const
-{
-    if (is_directory)
-        chassert(path.ends_with('/'));
-
-    const auto p = std::filesystem::path(path);
-    auto directory = p.parent_path();
-
-    std::optional<std::filesystem::path> remote_path;
-    {
-        const auto ptr = path_map.lock();
-        SharedLockGuard lock(ptr->mutex);
-        auto it = ptr->map.find(p);
-        if (it != ptr->map.end())
-            return ObjectStorageKey::createAsRelative(key_prefix.has_value() ? *key_prefix : storage_key_prefix, it->second);
-
-        it = ptr->map.find(directory);
-        if (it != ptr->map.end())
-            remote_path = it->second;
-    }
-    constexpr size_t part_size = 32;
-    std::filesystem::path key = remote_path.has_value() ? *remote_path
-        : is_directory                                  ? std::filesystem::path(getRandomASCIIString(part_size))
-                                                        : directory;
-
-    if (!is_directory)
-        key /= p.filename();
-
-    return ObjectStorageKey::createAsRelative(key_prefix.has_value() ? *key_prefix : storage_key_prefix, key);
-}
-
-}
diff --git a/src/Disks/ObjectStorages/FlatDirectoryStructureKeyGenerator.h b/src/Disks/ObjectStorages/FlatDirectoryStructureKeyGenerator.h
deleted file mode 100644
index 4dbac5d3003..00000000000
--- a/src/Disks/ObjectStorages/FlatDirectoryStructureKeyGenerator.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include <Common/ObjectStorageKeyGenerator.h>
-
-#include <memory>
-namespace DB
-{
-
-struct InMemoryPathMap;
-class FlatDirectoryStructureKeyGenerator : public IObjectStorageKeysGenerator
-{
-public:
-    explicit FlatDirectoryStructureKeyGenerator(String storage_key_prefix_, std::weak_ptr<InMemoryPathMap> path_map_);
-
-    ObjectStorageKey generate(const String & path, bool is_directory, const std::optional<String> & key_prefix) const override;
-
-private:
-    const String storage_key_prefix;
-
-    std::weak_ptr<InMemoryPathMap> path_map;
-};
-
-}
diff --git a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
index 512cc34ef44..dcb2af9d4d3 100644
--- a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
@@ -4,8 +4,8 @@
 #include <Storages/ObjectStorage/HDFS/WriteBufferFromHDFS.h>
 #include <Storages/ObjectStorage/HDFS/HDFSCommon.h>
 
-#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
 #include <Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.h>
+#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
 #include <Common/getRandomASCIIString.h>
 #include <Common/logger_useful.h>
 
@@ -53,8 +53,7 @@ std::string HDFSObjectStorage::extractObjectKeyFromURL(const StoredObject & obje
     return path;
 }
 
-ObjectStorageKey
-HDFSObjectStorage::generateObjectKeyForPath(const std::string & /* path */, const std::optional<std::string> & /* key_prefix */) const
+ObjectStorageKey HDFSObjectStorage::generateObjectKeyForPath(const std::string & /* path */) const
 {
     initializeHDFSFS();
     /// what ever data_source_description.description value is, consider that key as relative key
@@ -222,7 +221,6 @@ void HDFSObjectStorage::listObjects(const std::string & path, RelativePathsWithM
                 ObjectMetadata{
                     static_cast<uint64_t>(ls.file_info[i].mSize),
                     Poco::Timestamp::fromEpochTime(ls.file_info[i].mLastMod),
-                    "",
                     {}}));
         }
 
diff --git a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
index 0cb31eb8b8b..8aae90d0721 100644
--- a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
+++ b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
@@ -111,7 +111,7 @@ public:
         const std::string & config_prefix,
         ContextPtr context) override;
 
-    ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) const override;
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path) const override;
 
     bool isRemote() const override { return true; }
 
diff --git a/src/Disks/ObjectStorages/IObjectStorage.h b/src/Disks/ObjectStorages/IObjectStorage.h
index f3c587a1188..ceea4d5a2bb 100644
--- a/src/Disks/ObjectStorages/IObjectStorage.h
+++ b/src/Disks/ObjectStorages/IObjectStorage.h
@@ -54,7 +54,6 @@ struct ObjectMetadata
 {
     uint64_t size_bytes = 0;
     Poco::Timestamp last_modified;
-    std::string etag;
     ObjectAttributes attributes;
 };
 
@@ -233,11 +232,10 @@ public:
 
     /// Generate blob name for passed absolute local path.
     /// Path can be generated either independently or based on `path`.
-    virtual ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) const = 0;
+    virtual ObjectStorageKey generateObjectKeyForPath(const std::string & path) const = 0;
 
     /// Object key prefix for local paths in the directory 'path'.
-    virtual ObjectStorageKey
-    generateObjectKeyPrefixForDirectoryPath(const std::string & /* path */, const std::optional<std::string> & /* key_prefix */) const
+    virtual ObjectStorageKey generateObjectKeyPrefixForDirectoryPath(const std::string & /* path */) const
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method 'generateObjectKeyPrefixForDirectoryPath' is not implemented");
     }
diff --git a/src/Disks/ObjectStorages/InMemoryPathMap.h b/src/Disks/ObjectStorages/InMemoryPathMap.h
deleted file mode 100644
index a9859d5e2b8..00000000000
--- a/src/Disks/ObjectStorages/InMemoryPathMap.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include <filesystem>
-#include <map>
-#include <base/defines.h>
-#include <Common/SharedMutex.h>
-
-namespace DB
-{
-
-
-struct InMemoryPathMap
-{
-    struct PathComparator
-    {
-        bool operator()(const std::filesystem::path & path1, const std::filesystem::path & path2) const
-        {
-            auto d1 = std::distance(path1.begin(), path1.end());
-            auto d2 = std::distance(path2.begin(), path2.end());
-            if (d1 != d2)
-                return d1 < d2;
-            return path1 < path2;
-        }
-    };
-    /// Local -> Remote path.
-    using Map = std::map<std::filesystem::path, std::string, PathComparator>;
-    mutable SharedMutex mutex;
-
-#ifdef OS_LINUX
-    Map TSA_GUARDED_BY(mutex) map;
-/// std::shared_mutex may not be annotated with the 'capability' attribute in libcxx.
-#else
-    Map map;
-#endif
-};
-
-}
diff --git a/src/Disks/ObjectStorages/Local/LocalObjectStorage.cpp b/src/Disks/ObjectStorages/Local/LocalObjectStorage.cpp
index 3b650adb71f..a247d86ddce 100644
--- a/src/Disks/ObjectStorages/Local/LocalObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/Local/LocalObjectStorage.cpp
@@ -1,15 +1,15 @@
 #include <Disks/ObjectStorages/Local/LocalObjectStorage.h>
 
-#include <filesystem>
-#include <Disks/IO/AsynchronousBoundedReadBuffer.h>
-#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
-#include <Disks/IO/createReadBufferFromFileBase.h>
-#include <IO/WriteBufferFromFile.h>
-#include <IO/copyData.h>
 #include <Interpreters/Context.h>
 #include <Common/filesystemHelpers.h>
-#include <Common/getRandomASCIIString.h>
 #include <Common/logger_useful.h>
+#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
+#include <Disks/IO/createReadBufferFromFileBase.h>
+#include <Disks/IO/AsynchronousBoundedReadBuffer.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/copyData.h>
+#include <Common/getRandomASCIIString.h>
+#include <filesystem>
 
 namespace fs = std::filesystem;
 
@@ -43,21 +43,39 @@ bool LocalObjectStorage::exists(const StoredObject & object) const
 std::unique_ptr<ReadBufferFromFileBase> LocalObjectStorage::readObjects( /// NOLINT
     const StoredObjects & objects,
     const ReadSettings & read_settings,
-    std::optional<size_t>,
-    std::optional<size_t>) const
+    std::optional<size_t> read_hint,
+    std::optional<size_t> file_size) const
 {
     auto modified_settings = patchSettings(read_settings);
     auto global_context = Context::getGlobalContextInstance();
-    auto read_buffer_creator = [=](bool /* restricted_seek */, const StoredObject & object) -> std::unique_ptr<ReadBufferFromFileBase>
-    { return std::make_unique<ReadBufferFromFile>(object.remote_path); };
+    auto read_buffer_creator =
+        [=] (bool /* restricted_seek */, const StoredObject & object)
+        -> std::unique_ptr<ReadBufferFromFileBase>
+    {
+        return createReadBufferFromFileBase(object.remote_path, modified_settings, read_hint, file_size);
+    };
 
-    return std::make_unique<ReadBufferFromRemoteFSGather>(
-        std::move(read_buffer_creator),
-        objects,
-        "file:",
-        modified_settings,
-        global_context->getFilesystemCacheLog(),
-        /* use_external_buffer */ false);
+    switch (read_settings.remote_fs_method)
+    {
+        case RemoteFSReadMethod::read:
+        {
+            return std::make_unique<ReadBufferFromRemoteFSGather>(
+                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, "file:", modified_settings,
+                global_context->getFilesystemCacheLog(), /* use_external_buffer */true);
+
+            auto & reader = global_context->getThreadPoolReader(FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER);
+            return std::make_unique<AsynchronousBoundedReadBuffer>(
+                std::move(impl), reader, read_settings,
+                global_context->getAsyncReadCounters(),
+                global_context->getFilesystemReadPrefetchesLog());
+        }
+    }
 }
 
 ReadSettings LocalObjectStorage::patchSettings(const ReadSettings & read_settings) const
@@ -204,8 +222,7 @@ std::unique_ptr<IObjectStorage> LocalObjectStorage::cloneObjectStorage(
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "cloneObjectStorage() is not implemented for LocalObjectStorage");
 }
 
-ObjectStorageKey
-LocalObjectStorage::generateObjectKeyForPath(const std::string & /* path */, const std::optional<std::string> & /* key_prefix */) const
+ObjectStorageKey LocalObjectStorage::generateObjectKeyForPath(const std::string & /* path */) const
 {
     constexpr size_t key_name_total_size = 32;
     return ObjectStorageKey::createAsRelative(key_prefix, getRandomASCIIString(key_name_total_size));
diff --git a/src/Disks/ObjectStorages/Local/LocalObjectStorage.h b/src/Disks/ObjectStorages/Local/LocalObjectStorage.h
index 564d49bf876..371cd37f8b2 100644
--- a/src/Disks/ObjectStorages/Local/LocalObjectStorage.h
+++ b/src/Disks/ObjectStorages/Local/LocalObjectStorage.h
@@ -81,7 +81,7 @@ public:
         const std::string & config_prefix,
         ContextPtr context) override;
 
-    ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) const override;
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path) const override;
 
     bool isRemote() const override { return false; }
 
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
index 2036208c389..30111d04d20 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
@@ -1,6 +1,5 @@
 #include "MetadataStorageFromPlainObjectStorage.h"
 #include <Disks/IDisk.h>
-#include <Disks/ObjectStorages/InMemoryPathMap.h>
 #include <Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.h>
 #include <Disks/ObjectStorages/StaticDirectoryIterator.h>
 
@@ -8,7 +7,6 @@
 
 #include <filesystem>
 #include <tuple>
-#include <unordered_set>
 
 namespace DB
 {
@@ -43,7 +41,7 @@ bool MetadataStorageFromPlainObjectStorage::exists(const std::string & path) con
 {
     /// NOTE: exists() cannot be used here since it works only for existing
     /// key, and does not work for some intermediate path.
-    auto object_key = object_storage->generateObjectKeyForPath(path, std::nullopt /* key_prefix */);
+    auto object_key = object_storage->generateObjectKeyForPath(path);
     return object_storage->existsOrHasAnyChild(object_key.serialize());
 }
 
@@ -55,7 +53,7 @@ bool MetadataStorageFromPlainObjectStorage::isFile(const std::string & path) con
 
 bool MetadataStorageFromPlainObjectStorage::isDirectory(const std::string & path) const
 {
-    auto key_prefix = object_storage->generateObjectKeyForPath(path, std::nullopt /* key_prefix */).serialize();
+    auto key_prefix = object_storage->generateObjectKeyForPath(path).serialize();
     auto directory = std::filesystem::path(std::move(key_prefix)) / "";
 
     return object_storage->existsOrHasAnyChild(directory);
@@ -63,7 +61,7 @@ bool MetadataStorageFromPlainObjectStorage::isDirectory(const std::string & path
 
 uint64_t MetadataStorageFromPlainObjectStorage::getFileSize(const String & path) const
 {
-    auto object_key = object_storage->generateObjectKeyForPath(path, std::nullopt /* key_prefix */);
+    auto object_key = object_storage->generateObjectKeyForPath(path);
     auto metadata = object_storage->tryGetObjectMetadata(object_key.serialize());
     if (metadata)
         return metadata->size_bytes;
@@ -72,7 +70,7 @@ uint64_t MetadataStorageFromPlainObjectStorage::getFileSize(const String & path)
 
 std::vector<std::string> MetadataStorageFromPlainObjectStorage::listDirectory(const std::string & path) const
 {
-    auto key_prefix = object_storage->generateObjectKeyForPath(path, std::nullopt /* key_prefix */).serialize();
+    auto key_prefix = object_storage->generateObjectKeyForPath(path).serialize();
 
     RelativePathsWithMetadata files;
     std::string abs_key = key_prefix;
@@ -81,27 +79,14 @@ std::vector<std::string> MetadataStorageFromPlainObjectStorage::listDirectory(co
 
     object_storage->listObjects(abs_key, files, 0);
 
-    std::unordered_set<std::string> result;
-    for (const auto & elem : files)
-    {
-        const auto & p = elem->relative_path;
-        chassert(p.find(abs_key) == 0);
-        const auto child_pos = abs_key.size();
-        /// string::npos is ok.
-        const auto slash_pos = p.find('/', child_pos);
-        if (slash_pos == std::string::npos)
-            result.emplace(p.substr(child_pos));
-        else
-            result.emplace(p.substr(child_pos, slash_pos - child_pos));
-    }
-    return std::vector<std::string>(std::make_move_iterator(result.begin()), std::make_move_iterator(result.end()));
+    return getDirectChildrenOnDisk(abs_key, files, path);
 }
 
 DirectoryIteratorPtr MetadataStorageFromPlainObjectStorage::iterateDirectory(const std::string & path) const
 {
     /// Required for MergeTree
     auto paths = listDirectory(path);
-    /// Prepend path, since iterateDirectory() includes path, unlike listDirectory()
+    // 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));
@@ -110,10 +95,29 @@ DirectoryIteratorPtr MetadataStorageFromPlainObjectStorage::iterateDirectory(con
 StoredObjects MetadataStorageFromPlainObjectStorage::getStorageObjects(const std::string & path) const
 {
     size_t object_size = getFileSize(path);
-    auto object_key = object_storage->generateObjectKeyForPath(path, std::nullopt /* key_prefix */);
+    auto object_key = object_storage->generateObjectKeyForPath(path);
     return {StoredObject(object_key.serialize(), path, object_size)};
 }
 
+std::vector<std::string> MetadataStorageFromPlainObjectStorage::getDirectChildrenOnDisk(
+    const std::string & storage_key, const RelativePathsWithMetadata & remote_paths, const std::string & /* local_path */) const
+{
+    std::unordered_set<std::string> duplicates_filter;
+    for (const auto & elem : remote_paths)
+    {
+        const auto & path = elem->relative_path;
+        chassert(path.find(storage_key) == 0);
+        const auto child_pos = storage_key.size();
+        /// string::npos is ok.
+        const auto slash_pos = path.find('/', child_pos);
+        if (slash_pos == std::string::npos)
+            duplicates_filter.emplace(path.substr(child_pos));
+        else
+            duplicates_filter.emplace(path.substr(child_pos, slash_pos - child_pos));
+    }
+    return std::vector<std::string>(std::make_move_iterator(duplicates_filter.begin()), std::make_move_iterator(duplicates_filter.end()));
+}
+
 const IMetadataStorage & MetadataStorageFromPlainObjectStorageTransaction::getStorageForNonTransactionalReads() const
 {
     return metadata_storage;
@@ -121,7 +125,7 @@ const IMetadataStorage & MetadataStorageFromPlainObjectStorageTransaction::getSt
 
 void MetadataStorageFromPlainObjectStorageTransaction::unlinkFile(const std::string & path)
 {
-    auto object_key = metadata_storage.object_storage->generateObjectKeyForPath(path, std::nullopt /* key_prefix */);
+    auto object_key = metadata_storage.object_storage->generateObjectKeyForPath(path);
     auto object = StoredObject(object_key.serialize());
     metadata_storage.object_storage->removeObject(object);
 }
@@ -136,7 +140,7 @@ void MetadataStorageFromPlainObjectStorageTransaction::removeDirectory(const std
     else
     {
         addOperation(std::make_unique<MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation>(
-            normalizeDirectoryPath(path), *metadata_storage.getPathMap(), object_storage, metadata_storage.getMetadataKeyPrefix()));
+            normalizeDirectoryPath(path), *metadata_storage.getPathMap(), object_storage));
     }
 }
 
@@ -146,11 +150,9 @@ void MetadataStorageFromPlainObjectStorageTransaction::createDirectory(const std
         return;
 
     auto normalized_path = normalizeDirectoryPath(path);
+    auto key_prefix = object_storage->generateObjectKeyPrefixForDirectoryPath(normalized_path).serialize();
     auto op = std::make_unique<MetadataStorageFromPlainObjectStorageCreateDirectoryOperation>(
-        std::move(normalized_path),
-        *metadata_storage.getPathMap(),
-        object_storage,
-        metadata_storage.getMetadataKeyPrefix());
+        std::move(normalized_path), std::move(key_prefix), *metadata_storage.getPathMap(), object_storage);
     addOperation(std::move(op));
 }
 
@@ -165,11 +167,7 @@ void MetadataStorageFromPlainObjectStorageTransaction::moveDirectory(const std::
         throwNotImplemented();
 
     addOperation(std::make_unique<MetadataStorageFromPlainObjectStorageMoveDirectoryOperation>(
-        normalizeDirectoryPath(path_from),
-        normalizeDirectoryPath(path_to),
-        *metadata_storage.getPathMap(),
-        object_storage,
-        metadata_storage.getMetadataKeyPrefix()));
+        normalizeDirectoryPath(path_from), normalizeDirectoryPath(path_to), *metadata_storage.getPathMap(), object_storage));
 }
 
 void MetadataStorageFromPlainObjectStorageTransaction::addBlobToMetadata(
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h
index 2aac7158bd5..66da0f2431e 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h
@@ -2,18 +2,14 @@
 
 #include <Disks/IDisk.h>
 #include <Disks/ObjectStorages/IMetadataStorage.h>
-#include <Disks/ObjectStorages/InMemoryPathMap.h>
 #include <Disks/ObjectStorages/MetadataOperationsHolder.h>
 #include <Disks/ObjectStorages/MetadataStorageTransactionState.h>
 
 #include <map>
-#include <string>
-#include <unordered_set>
 
 namespace DB
 {
 
-struct InMemoryPathMap;
 struct UnlinkMetadataFileOperationOutcome;
 using UnlinkMetadataFileOperationOutcomePtr = std::shared_ptr<UnlinkMetadataFileOperationOutcome>;
 
@@ -29,6 +25,10 @@ using UnlinkMetadataFileOperationOutcomePtr = std::shared_ptr<UnlinkMetadataFile
 /// structure as on disk MergeTree, and does not require metadata from a local disk to restore.
 class MetadataStorageFromPlainObjectStorage : public IMetadataStorage
 {
+public:
+    /// Local path prefixes mapped to storage key prefixes.
+    using PathMap = std::map<std::filesystem::path, std::string>;
+
 private:
     friend class MetadataStorageFromPlainObjectStorageTransaction;
 
@@ -78,11 +78,10 @@ public:
     bool supportsStat() const override { return false; }
 
 protected:
-    /// Get the object storage prefix for storing metadata files.
-    virtual std::string getMetadataKeyPrefix() const { return object_storage->getCommonKeyPrefix(); }
+    virtual std::shared_ptr<PathMap> getPathMap() const { throwNotImplemented(); }
 
-    /// Returns a map of virtual filesystem paths to paths in the object storage.
-    virtual std::shared_ptr<InMemoryPathMap> getPathMap() const { throwNotImplemented(); }
+    virtual std::vector<std::string> getDirectChildrenOnDisk(
+        const std::string & storage_key, const RelativePathsWithMetadata & remote_paths, const std::string & local_path) const;
 };
 
 class MetadataStorageFromPlainObjectStorageTransaction final : public IMetadataTransaction, private MetadataOperationsHolder
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.cpp b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.cpp
index bfd203ef2e0..7e4b1f69962 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.cpp
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.cpp
@@ -1,10 +1,8 @@
 #include "MetadataStorageFromPlainObjectStorageOperations.h"
-#include <Disks/ObjectStorages/InMemoryPathMap.h>
 
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Common/Exception.h>
-#include <Common/SharedLockGuard.h>
 #include <Common/logger_useful.h>
 
 namespace DB
@@ -22,45 +20,29 @@ namespace
 
 constexpr auto PREFIX_PATH_FILE_NAME = "prefix.path";
 
-ObjectStorageKey createMetadataObjectKey(const std::string & object_key_prefix, const std::string & metadata_key_prefix)
-{
-    auto prefix = std::filesystem::path(metadata_key_prefix) / object_key_prefix;
-    return ObjectStorageKey::createAsRelative(prefix.string(), PREFIX_PATH_FILE_NAME);
-}
 }
 
 MetadataStorageFromPlainObjectStorageCreateDirectoryOperation::MetadataStorageFromPlainObjectStorageCreateDirectoryOperation(
-    std::filesystem::path && path_, InMemoryPathMap & path_map_, ObjectStoragePtr object_storage_, const std::string & metadata_key_prefix_)
-    : path(std::move(path_))
-    , path_map(path_map_)
-    , object_storage(object_storage_)
-    , metadata_key_prefix(metadata_key_prefix_)
-    , object_key_prefix(object_storage->generateObjectKeyPrefixForDirectoryPath(path, "" /* object_key_prefix */).serialize())
+    std::filesystem::path && path_,
+    std::string && key_prefix_,
+    MetadataStorageFromPlainObjectStorage::PathMap & path_map_,
+    ObjectStoragePtr object_storage_)
+    : path(std::move(path_)), key_prefix(key_prefix_), path_map(path_map_), object_storage(object_storage_)
 {
-    chassert(path.string().ends_with('/'));
 }
 
 void MetadataStorageFromPlainObjectStorageCreateDirectoryOperation::execute(std::unique_lock<SharedMutex> &)
 {
-    /// parent_path() removes the trailing '/'
-    const auto base_path = path.parent_path();
-    {
-        SharedLockGuard lock(path_map.mutex);
-        if (path_map.map.contains(base_path))
-            return;
-    }
+    if (path_map.contains(path))
+        return;
 
-    auto metadata_object_key = createMetadataObjectKey(object_key_prefix, metadata_key_prefix);
+    LOG_TRACE(getLogger("MetadataStorageFromPlainObjectStorageCreateDirectoryOperation"), "Creating metadata for directory '{}'", path);
 
-    LOG_TRACE(
-        getLogger("MetadataStorageFromPlainObjectStorageCreateDirectoryOperation"),
-        "Creating metadata for directory '{}' with remote path='{}'",
-        path,
-        metadata_object_key.serialize());
+    auto object_key = ObjectStorageKey::createAsRelative(key_prefix, PREFIX_PATH_FILE_NAME);
 
-    auto metadata_object = StoredObject(/*remote_path*/ metadata_object_key.serialize(), /*local_path*/ path / PREFIX_PATH_FILE_NAME);
+    auto object = StoredObject(object_key.serialize(), path / PREFIX_PATH_FILE_NAME);
     auto buf = object_storage->writeObject(
-        metadata_object,
+        object,
         WriteMode::Rewrite,
         /* object_attributes */ std::nullopt,
         /* buf_size */ DBMS_DEFAULT_BUFFER_SIZE,
@@ -68,12 +50,8 @@ void MetadataStorageFromPlainObjectStorageCreateDirectoryOperation::execute(std:
 
     write_created = true;
 
-    {
-        std::lock_guard lock(path_map.mutex);
-        auto & map = path_map.map;
-        [[maybe_unused]] auto result = map.emplace(base_path, object_key_prefix);
-        chassert(result.second);
-    }
+    [[maybe_unused]] auto result = path_map.emplace(path, std::move(key_prefix));
+    chassert(result.second);
     auto metric = object_storage->getMetadataStorageMetrics().directory_map_size;
     CurrentMetrics::add(metric, 1);
 
@@ -88,81 +66,58 @@ void MetadataStorageFromPlainObjectStorageCreateDirectoryOperation::execute(std:
 
 void MetadataStorageFromPlainObjectStorageCreateDirectoryOperation::undo(std::unique_lock<SharedMutex> &)
 {
-    auto metadata_object_key = createMetadataObjectKey(object_key_prefix, metadata_key_prefix);
-
+    auto object_key = ObjectStorageKey::createAsRelative(key_prefix, PREFIX_PATH_FILE_NAME);
     if (write_finalized)
     {
-        const auto base_path = path.parent_path();
-        {
-            std::lock_guard lock(path_map.mutex);
-            path_map.map.erase(base_path);
-        }
+        path_map.erase(path);
         auto metric = object_storage->getMetadataStorageMetrics().directory_map_size;
         CurrentMetrics::sub(metric, 1);
 
-        object_storage->removeObject(StoredObject(metadata_object_key.serialize(), path / PREFIX_PATH_FILE_NAME));
+        object_storage->removeObject(StoredObject(object_key.serialize(), path / PREFIX_PATH_FILE_NAME));
     }
     else if (write_created)
-        object_storage->removeObjectIfExists(StoredObject(metadata_object_key.serialize(), path / PREFIX_PATH_FILE_NAME));
+        object_storage->removeObjectIfExists(StoredObject(object_key.serialize(), path / PREFIX_PATH_FILE_NAME));
 }
 
 MetadataStorageFromPlainObjectStorageMoveDirectoryOperation::MetadataStorageFromPlainObjectStorageMoveDirectoryOperation(
     std::filesystem::path && path_from_,
     std::filesystem::path && path_to_,
-    InMemoryPathMap & path_map_,
-    ObjectStoragePtr object_storage_,
-    const std::string & metadata_key_prefix_)
-    : path_from(std::move(path_from_))
-    , path_to(std::move(path_to_))
-    , path_map(path_map_)
-    , object_storage(object_storage_)
-    , metadata_key_prefix(metadata_key_prefix_)
+    MetadataStorageFromPlainObjectStorage::PathMap & path_map_,
+    ObjectStoragePtr object_storage_)
+    : path_from(std::move(path_from_)), path_to(std::move(path_to_)), path_map(path_map_), object_storage(object_storage_)
 {
-    chassert(path_from.string().ends_with('/'));
-    chassert(path_to.string().ends_with('/'));
 }
 
 std::unique_ptr<WriteBufferFromFileBase> MetadataStorageFromPlainObjectStorageMoveDirectoryOperation::createWriteBuf(
     const std::filesystem::path & expected_path, const std::filesystem::path & new_path, bool validate_content)
 {
-    std::filesystem::path remote_path;
-    {
-        SharedLockGuard lock(path_map.mutex);
-        auto & map = path_map.map;
-        /// parent_path() removes the trailing '/'.
-        auto expected_it = map.find(expected_path.parent_path());
-        if (expected_it == map.end())
-            throw Exception(
-                ErrorCodes::FILE_DOESNT_EXIST, "Metadata object for the expected (source) path '{}' does not exist", expected_path);
+    auto expected_it = path_map.find(expected_path);
+    if (expected_it == path_map.end())
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "Metadata object for the expected (source) path '{}' does not exist", expected_path);
 
-        if (map.contains(new_path.parent_path()))
-            throw Exception(
-                ErrorCodes::FILE_ALREADY_EXISTS, "Metadata object for the new (destination) path '{}' already exists", new_path);
+    if (path_map.contains(new_path))
+        throw Exception(ErrorCodes::FILE_ALREADY_EXISTS, "Metadata object for the new (destination) path '{}' already exists", new_path);
 
-        remote_path = expected_it->second;
-    }
+    auto object_key = ObjectStorageKey::createAsRelative(expected_it->second, PREFIX_PATH_FILE_NAME);
 
-    auto metadata_object_key = createMetadataObjectKey(remote_path, metadata_key_prefix);
-
-    auto metadata_object
-        = StoredObject(/*remote_path*/ metadata_object_key.serialize(), /*local_path*/ expected_path / PREFIX_PATH_FILE_NAME);
+    auto object = StoredObject(object_key.serialize(), expected_path / PREFIX_PATH_FILE_NAME);
 
     if (validate_content)
     {
         std::string data;
-        auto read_buf = object_storage->readObject(metadata_object);
+        auto read_buf = object_storage->readObject(object);
         readStringUntilEOF(data, *read_buf);
         if (data != path_from)
             throw Exception(
                 ErrorCodes::INCORRECT_DATA,
                 "Incorrect data for object key {}, expected {}, got {}",
-                metadata_object_key.serialize(),
+                object_key.serialize(),
                 expected_path,
                 data);
     }
 
     auto write_buf = object_storage->writeObject(
-        metadata_object,
+        object,
         WriteMode::Rewrite,
         /* object_attributes */ std::nullopt,
         /*buf_size*/ DBMS_DEFAULT_BUFFER_SIZE,
@@ -181,16 +136,8 @@ void MetadataStorageFromPlainObjectStorageMoveDirectoryOperation::execute(std::u
     writeString(path_to.string(), *write_buf);
     write_buf->finalize();
 
-    /// parent_path() removes the trailing '/'.
-    auto base_path_to = path_to.parent_path();
-    auto base_path_from = path_from.parent_path();
-
-    {
-        std::lock_guard lock(path_map.mutex);
-        auto & map = path_map.map;
-        [[maybe_unused]] auto result = map.emplace(base_path_to, map.extract(base_path_from).mapped());
-        chassert(result.second);
-    }
+    [[maybe_unused]] auto result = path_map.emplace(path_to, path_map.extract(path_from).mapped());
+    chassert(result.second);
 
     write_finalized = true;
 }
@@ -198,11 +145,7 @@ void MetadataStorageFromPlainObjectStorageMoveDirectoryOperation::execute(std::u
 void MetadataStorageFromPlainObjectStorageMoveDirectoryOperation::undo(std::unique_lock<SharedMutex> &)
 {
     if (write_finalized)
-    {
-        std::lock_guard lock(path_map.mutex);
-        auto & map = path_map.map;
-        map.emplace(path_from.parent_path(), map.extract(path_to.parent_path()).mapped());
-    }
+        path_map.emplace(path_from, path_map.extract(path_to).mapped());
 
     if (write_created)
     {
@@ -213,37 +156,25 @@ void MetadataStorageFromPlainObjectStorageMoveDirectoryOperation::undo(std::uniq
 }
 
 MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation::MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation(
-    std::filesystem::path && path_, InMemoryPathMap & path_map_, ObjectStoragePtr object_storage_, const std::string & metadata_key_prefix_)
-    : path(std::move(path_)), path_map(path_map_), object_storage(object_storage_), metadata_key_prefix(metadata_key_prefix_)
+    std::filesystem::path && path_, MetadataStorageFromPlainObjectStorage::PathMap & path_map_, ObjectStoragePtr object_storage_)
+    : path(std::move(path_)), path_map(path_map_), object_storage(object_storage_)
 {
-    chassert(path.string().ends_with('/'));
 }
 
 void MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation::execute(std::unique_lock<SharedMutex> & /* metadata_lock */)
 {
-    /// parent_path() removes the trailing '/'
-    const auto base_path = path.parent_path();
-    {
-        SharedLockGuard lock(path_map.mutex);
-        auto & map = path_map.map;
-        auto path_it = map.find(base_path);
-        if (path_it == map.end())
-            return;
-        key_prefix = path_it->second;
-    }
+    auto path_it = path_map.find(path);
+    if (path_it == path_map.end())
+        return;
 
     LOG_TRACE(getLogger("MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation"), "Removing directory '{}'", path);
 
-    auto metadata_object_key = createMetadataObjectKey(key_prefix, metadata_key_prefix);
-    auto metadata_object = StoredObject(/*remote_path*/ metadata_object_key.serialize(), /*local_path*/ path / PREFIX_PATH_FILE_NAME);
-    object_storage->removeObject(metadata_object);
-
-    {
-        std::lock_guard lock(path_map.mutex);
-        auto & map = path_map.map;
-        map.erase(base_path);
-    }
+    key_prefix = path_it->second;
+    auto object_key = ObjectStorageKey::createAsRelative(key_prefix, PREFIX_PATH_FILE_NAME);
+    auto object = StoredObject(object_key.serialize(), path / PREFIX_PATH_FILE_NAME);
+    object_storage->removeObject(object);
 
+    path_map.erase(path_it);
     auto metric = object_storage->getMetadataStorageMetrics().directory_map_size;
     CurrentMetrics::sub(metric, 1);
 
@@ -258,10 +189,10 @@ void MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation::undo(std::un
     if (!removed)
         return;
 
-    auto metadata_object_key = createMetadataObjectKey(key_prefix, metadata_key_prefix);
-    auto metadata_object = StoredObject(metadata_object_key.serialize(), path / PREFIX_PATH_FILE_NAME);
+    auto object_key = ObjectStorageKey::createAsRelative(key_prefix, PREFIX_PATH_FILE_NAME);
+    auto object = StoredObject(object_key.serialize(), path / PREFIX_PATH_FILE_NAME);
     auto buf = object_storage->writeObject(
-        metadata_object,
+        object,
         WriteMode::Rewrite,
         /* object_attributes */ std::nullopt,
         /* buf_size */ DBMS_DEFAULT_BUFFER_SIZE,
@@ -269,11 +200,7 @@ void MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation::undo(std::un
     writeString(path.string(), *buf);
     buf->finalize();
 
-    {
-        std::lock_guard lock(path_map.mutex);
-        auto & map = path_map.map;
-        map.emplace(path.parent_path(), std::move(key_prefix));
-    }
+    path_map.emplace(path, std::move(key_prefix));
     auto metric = object_storage->getMetadataStorageMetrics().directory_map_size;
     CurrentMetrics::add(metric, 1);
 }
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.h b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.h
index 93ebe668d56..4b196f787fd 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.h
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Disks/ObjectStorages/IMetadataOperation.h>
-#include <Disks/ObjectStorages/InMemoryPathMap.h>
 #include <Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h>
 
 #include <filesystem>
@@ -14,21 +13,20 @@ class MetadataStorageFromPlainObjectStorageCreateDirectoryOperation final : publ
 {
 private:
     std::filesystem::path path;
-    InMemoryPathMap & path_map;
+    std::string key_prefix;
+    MetadataStorageFromPlainObjectStorage::PathMap & path_map;
     ObjectStoragePtr object_storage;
-    const std::string metadata_key_prefix;
-    const std::string object_key_prefix;
 
     bool write_created = false;
     bool write_finalized = false;
 
 public:
+    // Assuming that paths are normalized.
     MetadataStorageFromPlainObjectStorageCreateDirectoryOperation(
-        /// path_ must end with a trailing '/'.
         std::filesystem::path && path_,
-        InMemoryPathMap & path_map_,
-        ObjectStoragePtr object_storage_,
-        const std::string & metadata_key_prefix_);
+        std::string && key_prefix_,
+        MetadataStorageFromPlainObjectStorage::PathMap & path_map_,
+        ObjectStoragePtr object_storage_);
 
     void execute(std::unique_lock<SharedMutex> & metadata_lock) override;
     void undo(std::unique_lock<SharedMutex> & metadata_lock) override;
@@ -39,9 +37,8 @@ class MetadataStorageFromPlainObjectStorageMoveDirectoryOperation final : public
 private:
     std::filesystem::path path_from;
     std::filesystem::path path_to;
-    InMemoryPathMap & path_map;
+    MetadataStorageFromPlainObjectStorage::PathMap & path_map;
     ObjectStoragePtr object_storage;
-    const std::string metadata_key_prefix;
 
     bool write_created = false;
     bool write_finalized = false;
@@ -51,12 +48,10 @@ private:
 
 public:
     MetadataStorageFromPlainObjectStorageMoveDirectoryOperation(
-        /// Both path_from_ and path_to_ must end with a trailing '/'.
         std::filesystem::path && path_from_,
         std::filesystem::path && path_to_,
-        InMemoryPathMap & path_map_,
-        ObjectStoragePtr object_storage_,
-        const std::string & metadata_key_prefix_);
+        MetadataStorageFromPlainObjectStorage::PathMap & path_map_,
+        ObjectStoragePtr object_storage_);
 
     void execute(std::unique_lock<SharedMutex> & metadata_lock) override;
 
@@ -68,20 +63,15 @@ class MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation final : publ
 private:
     std::filesystem::path path;
 
-    InMemoryPathMap & path_map;
+    MetadataStorageFromPlainObjectStorage::PathMap & path_map;
     ObjectStoragePtr object_storage;
-    const std::string metadata_key_prefix;
 
     std::string key_prefix;
     bool removed = false;
 
 public:
     MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation(
-        /// path_ must end with a trailing '/'.
-        std::filesystem::path && path_,
-        InMemoryPathMap & path_map_,
-        ObjectStoragePtr object_storage_,
-        const std::string & metadata_key_prefix_);
+        std::filesystem::path && path_, MetadataStorageFromPlainObjectStorage::PathMap & path_map_, ObjectStoragePtr object_storage_);
 
     void execute(std::unique_lock<SharedMutex> & metadata_lock) override;
     void undo(std::unique_lock<SharedMutex> & metadata_lock) override;
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.cpp b/src/Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.cpp
index 39b11d9a3e3..7718fba9c28 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.cpp
@@ -1,14 +1,9 @@
-#include <Disks/ObjectStorages/FlatDirectoryStructureKeyGenerator.h>
-#include <Disks/ObjectStorages/InMemoryPathMap.h>
 #include <Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.h>
 #include <Disks/ObjectStorages/ObjectStorageIterator.h>
 
-#include <unordered_set>
 #include <IO/ReadHelpers.h>
-#include <IO/S3Common.h>
 #include <IO/SharedThreadPools.h>
-#include "Common/SharedLockGuard.h"
-#include "Common/SharedMutex.h"
+#include <IO/S3Common.h>
 #include <Common/ErrorCodes.h>
 #include <Common/logger_useful.h>
 #include "CommonPathPrefixKeyGenerator.h"
@@ -26,28 +21,14 @@ namespace
 {
 
 constexpr auto PREFIX_PATH_FILE_NAME = "prefix.path";
-constexpr auto METADATA_PATH_TOKEN = "__meta/";
 
-/// Use a separate layout for metadata if:
-/// 1. The disk endpoint does not contain any objects yet (empty), OR
-/// 2. The metadata is already stored behind a separate endpoint.
-/// Otherwise, store metadata along with regular data for backward compatibility.
-std::string getMetadataKeyPrefix(ObjectStoragePtr object_storage)
+MetadataStorageFromPlainObjectStorage::PathMap loadPathPrefixMap(const std::string & root, ObjectStoragePtr object_storage)
 {
-    const auto common_key_prefix = std::filesystem::path(object_storage->getCommonKeyPrefix());
-    const auto metadata_key_prefix = std::filesystem::path(common_key_prefix) / METADATA_PATH_TOKEN;
-    return !object_storage->existsOrHasAnyChild(metadata_key_prefix / "") && object_storage->existsOrHasAnyChild(common_key_prefix / "")
-        ? common_key_prefix
-        : metadata_key_prefix;
-}
-
-std::shared_ptr<InMemoryPathMap> loadPathPrefixMap(const std::string & metadata_key_prefix, ObjectStoragePtr object_storage)
-{
-    auto result = std::make_shared<InMemoryPathMap>();
-    using Map = InMemoryPathMap::Map;
+    MetadataStorageFromPlainObjectStorage::PathMap result;
 
     ThreadPool & pool = getIOThreadPool().get();
     ThreadPoolCallbackRunnerLocal<void> runner(pool, "PlainRWMetaLoad");
+    std::mutex mutex;
 
     LoggerPtr log = getLogger("MetadataStorageFromPlainObjectStorage");
 
@@ -58,107 +39,102 @@ std::shared_ptr<InMemoryPathMap> loadPathPrefixMap(const std::string & metadata_
 
     LOG_DEBUG(log, "Loading metadata");
     size_t num_files = 0;
-    for (auto iterator = object_storage->iterate(metadata_key_prefix, 0); iterator->isValid(); iterator->next())
+    for (auto iterator = object_storage->iterate(root, 0); iterator->isValid(); iterator->next())
     {
         ++num_files;
         auto file = iterator->current();
         String path = file->getPath();
-        auto remote_metadata_path = std::filesystem::path(path);
-        if (remote_metadata_path.filename() != PREFIX_PATH_FILE_NAME)
+        auto remote_path = std::filesystem::path(path);
+        if (remote_path.filename() != PREFIX_PATH_FILE_NAME)
             continue;
 
-        runner(
-            [remote_metadata_path, path, &object_storage, &result, &log, &settings, &metadata_key_prefix]
+        runner([remote_path, path, &object_storage, &result, &mutex, &log, &settings]
+        {
+            setThreadName("PlainRWMetaLoad");
+
+            StoredObject object{path};
+            String local_path;
+
+            try
             {
-                setThreadName("PlainRWMetaLoad");
-
-                StoredObject object{path};
-                String local_path;
-
-                try
-                {
-                    auto read_buf = object_storage->readObject(object, settings);
-                    readStringUntilEOF(local_path, *read_buf);
-                }
+                auto read_buf = object_storage->readObject(object, settings);
+                readStringUntilEOF(local_path, *read_buf);
+            }
 #if USE_AWS_S3
-                catch (const S3Exception & e)
-                {
-                    /// It is ok if a directory was removed just now.
-                    /// We support attaching a filesystem that is concurrently modified by someone else.
-                    if (e.getS3ErrorCode() == Aws::S3::S3Errors::NO_SUCH_KEY)
-                        return;
-                    throw;
-                }
+            catch (const S3Exception & e)
+            {
+                /// It is ok if a directory was removed just now.
+                /// We support attaching a filesystem that is concurrently modified by someone else.
+                if (e.getS3ErrorCode() == Aws::S3::S3Errors::NO_SUCH_KEY)
+                    return;
+                throw;
+            }
 #endif
-                catch (...)
-                {
-                    throw;
-                }
+            catch (...)
+            {
+                throw;
+            }
 
-                chassert(remote_metadata_path.has_parent_path());
-                chassert(remote_metadata_path.string().starts_with(metadata_key_prefix));
-                auto suffix = remote_metadata_path.string().substr(metadata_key_prefix.size());
-                auto remote_path = std::filesystem::path(std::move(suffix));
-                std::pair<Map::iterator, bool> res;
-                {
-                    std::lock_guard lock(result->mutex);
-                    res = result->map.emplace(std::filesystem::path(local_path).parent_path(), remote_path.parent_path());
-                }
+            chassert(remote_path.has_parent_path());
+            std::pair<MetadataStorageFromPlainObjectStorage::PathMap::iterator, bool> res;
+            {
+                std::lock_guard lock(mutex);
+                res = result.emplace(local_path, remote_path.parent_path());
+            }
 
-                /// This can happen if table replication is enabled, then the same local path is written
-                /// in `prefix.path` of each replica.
-                /// TODO: should replicated tables (e.g., RMT) be explicitly disallowed?
-                if (!res.second)
-                    LOG_WARNING(
-                        log,
-                        "The local path '{}' is already mapped to a remote path '{}', ignoring: '{}'",
-                        local_path,
-                        res.first->second,
-                        remote_path.parent_path().string());
-            });
+            /// This can happen if table replication is enabled, then the same local path is written
+            /// in `prefix.path` of each replica.
+            /// TODO: should replicated tables (e.g., RMT) be explicitly disallowed?
+            if (!res.second)
+                LOG_WARNING(
+                    log,
+                    "The local path '{}' is already mapped to a remote path '{}', ignoring: '{}'",
+                    local_path,
+                    res.first->second,
+                    remote_path.parent_path().string());
+        });
     }
 
     runner.waitForAllToFinishAndRethrowFirstError();
-    {
-        SharedLockGuard lock(result->mutex);
-        LOG_DEBUG(log, "Loaded metadata for {} files, found {} directories", num_files, result->map.size());
+    LOG_DEBUG(log, "Loaded metadata for {} files, found {} directories", num_files, result.size());
 
-        auto metric = object_storage->getMetadataStorageMetrics().directory_map_size;
-        CurrentMetrics::add(metric, result->map.size());
-    }
+    auto metric = object_storage->getMetadataStorageMetrics().directory_map_size;
+    CurrentMetrics::add(metric, result.size());
     return result;
 }
 
-void getDirectChildrenOnDiskImpl(
+std::vector<std::string> getDirectChildrenOnRewritableDisk(
     const std::string & storage_key,
     const RelativePathsWithMetadata & remote_paths,
     const std::string & local_path,
-    const InMemoryPathMap & path_map,
-    std::unordered_set<std::string> & result)
+    const MetadataStorageFromPlainObjectStorage::PathMap & local_path_prefixes,
+    SharedMutex & shared_mutex)
 {
-    /// Directories are retrieved from the in-memory path map.
+    using PathMap = MetadataStorageFromPlainObjectStorage::PathMap;
+
+    std::unordered_set<std::string> duplicates_filter;
+
+    /// Map remote paths into local subdirectories.
+    std::unordered_map<PathMap::mapped_type, PathMap::key_type> remote_to_local_subdir;
+
     {
-        SharedLockGuard lock(path_map.mutex);
-        const auto & local_path_prefixes = path_map.map;
-        const auto end_it = local_path_prefixes.end();
+        std::shared_lock lock(shared_mutex);
+        auto end_it = local_path_prefixes.end();
         for (auto it = local_path_prefixes.lower_bound(local_path); it != end_it; ++it)
         {
-            const auto & [k, _] = std::make_tuple(it->first.string(), it->second);
+            const auto & [k, v] = std::make_tuple(it->first.string(), it->second);
             if (!k.starts_with(local_path))
                 break;
 
             auto slash_num = count(k.begin() + local_path.size(), k.end(), '/');
-            /// The local_path_prefixes comparator ensures that the paths with the smallest number of
-            /// hops from the local_path are iterated first. The paths do not end with '/', hence
-            /// break the loop if the number of slashes is greater than 0.
-            if (slash_num != 0)
-                break;
+            if (slash_num != 1)
+                continue;
 
-            result.emplace(std::string(k.begin() + local_path.size(), k.end()) + "/");
+            chassert(k.back() == '/');
+            remote_to_local_subdir.emplace(v, std::string(k.begin() + local_path.size(), k.end() - 1));
         }
     }
 
-    /// Files.
     auto skip_list = std::set<std::string>{PREFIX_PATH_FILE_NAME};
     for (const auto & elem : remote_paths)
     {
@@ -173,9 +149,22 @@ void getDirectChildrenOnDiskImpl(
             /// File names.
             auto filename = path.substr(child_pos);
             if (!skip_list.contains(filename))
-                result.emplace(std::move(filename));
+                duplicates_filter.emplace(std::move(filename));
+        }
+        else
+        {
+            /// Subdirectories.
+            auto it = remote_to_local_subdir.find(path.substr(0, slash_pos));
+            /// Mapped subdirectories.
+            if (it != remote_to_local_subdir.end())
+                duplicates_filter.emplace(it->second);
+            /// The remote subdirectory name is the same as the local subdirectory.
+            else
+                duplicates_filter.emplace(path.substr(child_pos, slash_pos - child_pos));
         }
     }
+
+    return std::vector<std::string>(std::make_move_iterator(duplicates_filter.begin()), std::make_move_iterator(duplicates_filter.end()));
 }
 
 }
@@ -183,8 +172,7 @@ void getDirectChildrenOnDiskImpl(
 MetadataStorageFromPlainRewritableObjectStorage::MetadataStorageFromPlainRewritableObjectStorage(
     ObjectStoragePtr object_storage_, String storage_path_prefix_)
     : MetadataStorageFromPlainObjectStorage(object_storage_, storage_path_prefix_)
-    , metadata_key_prefix(DB::getMetadataKeyPrefix(object_storage))
-    , path_map(loadPathPrefixMap(metadata_key_prefix, object_storage))
+    , path_map(std::make_shared<PathMap>(loadPathPrefixMap(object_storage->getCommonKeyPrefix(), object_storage)))
 {
     if (object_storage->isWriteOnce())
         throw Exception(
@@ -192,85 +180,20 @@ MetadataStorageFromPlainRewritableObjectStorage::MetadataStorageFromPlainRewrita
             "MetadataStorageFromPlainRewritableObjectStorage is not compatible with write-once storage '{}'",
             object_storage->getName());
 
-    if (useSeparateLayoutForMetadata())
-    {
-        /// Use flat directory structure if the metadata is stored separately from the table data.
-        auto keys_gen = std::make_shared<FlatDirectoryStructureKeyGenerator>(object_storage->getCommonKeyPrefix(), path_map);
-        object_storage->setKeysGenerator(keys_gen);
-    }
-    else
-    {
-        auto keys_gen = std::make_shared<CommonPathPrefixKeyGenerator>(object_storage->getCommonKeyPrefix(), path_map);
-        object_storage->setKeysGenerator(keys_gen);
-    }
+    auto keys_gen = std::make_shared<CommonPathPrefixKeyGenerator>(object_storage->getCommonKeyPrefix(), metadata_mutex, path_map);
+    object_storage->setKeysGenerator(keys_gen);
 }
 
 MetadataStorageFromPlainRewritableObjectStorage::~MetadataStorageFromPlainRewritableObjectStorage()
 {
     auto metric = object_storage->getMetadataStorageMetrics().directory_map_size;
-    CurrentMetrics::sub(metric, path_map->map.size());
+    CurrentMetrics::sub(metric, path_map->size());
 }
 
-bool MetadataStorageFromPlainRewritableObjectStorage::exists(const std::string & path) const
+std::vector<std::string> MetadataStorageFromPlainRewritableObjectStorage::getDirectChildrenOnDisk(
+    const std::string & storage_key, const RelativePathsWithMetadata & remote_paths, const std::string & local_path) const
 {
-    if (MetadataStorageFromPlainObjectStorage::exists(path))
-        return true;
-
-    if (useSeparateLayoutForMetadata())
-    {
-        auto key_prefix = object_storage->generateObjectKeyForPath(path, getMetadataKeyPrefix()).serialize();
-        return object_storage->existsOrHasAnyChild(key_prefix);
-    }
-
-    return false;
+    return getDirectChildrenOnRewritableDisk(storage_key, remote_paths, local_path, *getPathMap(), metadata_mutex);
 }
 
-bool MetadataStorageFromPlainRewritableObjectStorage::isDirectory(const std::string & path) const
-{
-    if (useSeparateLayoutForMetadata())
-    {
-        auto directory = std::filesystem::path(object_storage->generateObjectKeyForPath(path, getMetadataKeyPrefix()).serialize()) / "";
-        return object_storage->existsOrHasAnyChild(directory);
-    }
-    else
-        return MetadataStorageFromPlainObjectStorage::isDirectory(path);
-}
-
-std::vector<std::string> MetadataStorageFromPlainRewritableObjectStorage::listDirectory(const std::string & path) const
-{
-    auto key_prefix = object_storage->generateObjectKeyForPath(path, "" /* key_prefix */).serialize();
-
-    RelativePathsWithMetadata files;
-    auto abs_key = std::filesystem::path(object_storage->getCommonKeyPrefix()) / key_prefix / "";
-
-    object_storage->listObjects(abs_key, files, 0);
-
-    std::unordered_set<std::string> directories;
-    getDirectChildrenOnDisk(abs_key, files, std::filesystem::path(path) / "", directories);
-    /// List empty directories that are identified by the `prefix.path` metadata files. This is required to, e.g., remove
-    /// metadata along with regular files.
-    if (useSeparateLayoutForMetadata())
-    {
-        auto metadata_key = std::filesystem::path(getMetadataKeyPrefix()) / key_prefix / "";
-        RelativePathsWithMetadata metadata_files;
-        object_storage->listObjects(metadata_key, metadata_files, 0);
-        getDirectChildrenOnDisk(metadata_key, metadata_files, std::filesystem::path(path) / "", directories);
-    }
-
-    return std::vector<std::string>(std::make_move_iterator(directories.begin()), std::make_move_iterator(directories.end()));
-}
-
-void MetadataStorageFromPlainRewritableObjectStorage::getDirectChildrenOnDisk(
-    const std::string & storage_key,
-    const RelativePathsWithMetadata & remote_paths,
-    const std::string & local_path,
-    std::unordered_set<std::string> & result) const
-{
-    getDirectChildrenOnDiskImpl(storage_key, remote_paths, local_path, *getPathMap(), result);
-}
-
-bool MetadataStorageFromPlainRewritableObjectStorage::useSeparateLayoutForMetadata() const
-{
-    return getMetadataKeyPrefix() != object_storage->getCommonKeyPrefix();
-}
 }
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.h b/src/Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.h
index 82d93e3e7ae..a5394b9428d 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.h
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.h
@@ -3,7 +3,6 @@
 #include <Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h>
 
 #include <memory>
-#include <unordered_set>
 
 
 namespace DB
@@ -12,29 +11,18 @@ namespace DB
 class MetadataStorageFromPlainRewritableObjectStorage final : public MetadataStorageFromPlainObjectStorage
 {
 private:
-    const std::string metadata_key_prefix;
-    std::shared_ptr<InMemoryPathMap> path_map;
+    std::shared_ptr<PathMap> path_map;
 
 public:
     MetadataStorageFromPlainRewritableObjectStorage(ObjectStoragePtr object_storage_, String storage_path_prefix_);
     ~MetadataStorageFromPlainRewritableObjectStorage() override;
 
     MetadataStorageType getType() const override { return MetadataStorageType::PlainRewritable; }
-    bool exists(const std::string & path) const override;
-    bool isDirectory(const std::string & path) const override;
-    std::vector<std::string> listDirectory(const std::string & path) const override;
 
 protected:
-    std::string getMetadataKeyPrefix() const override { return metadata_key_prefix; }
-    std::shared_ptr<InMemoryPathMap> getPathMap() const override { return path_map; }
-    void getDirectChildrenOnDisk(
-        const std::string & storage_key,
-        const RelativePathsWithMetadata & remote_paths,
-        const std::string & local_path,
-        std::unordered_set<std::string> & result) const;
-
-private:
-    bool useSeparateLayoutForMetadata() const;
+    std::shared_ptr<PathMap> getPathMap() const override { return path_map; }
+    std::vector<std::string> getDirectChildrenOnDisk(
+        const std::string & storage_key, const RelativePathsWithMetadata & remote_paths, const std::string & local_path) const override;
 };
 
 }
diff --git a/src/Disks/ObjectStorages/PlainObjectStorage.h b/src/Disks/ObjectStorages/PlainObjectStorage.h
index 805b3436fce..e0907d0b4d8 100644
--- a/src/Disks/ObjectStorages/PlainObjectStorage.h
+++ b/src/Disks/ObjectStorages/PlainObjectStorage.h
@@ -26,7 +26,7 @@ public:
 
     bool isPlain() const override { return true; }
 
-    ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & /* key_prefix */) const override
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path) const override
     {
         return ObjectStorageKey::createAsRelative(BaseObjectStorage::getCommonKeyPrefix(), path);
     }
diff --git a/src/Disks/ObjectStorages/PlainRewritableObjectStorage.h b/src/Disks/ObjectStorages/PlainRewritableObjectStorage.h
index dcea5964fc5..5f000afe625 100644
--- a/src/Disks/ObjectStorages/PlainRewritableObjectStorage.h
+++ b/src/Disks/ObjectStorages/PlainRewritableObjectStorage.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <optional>
-#include <string>
 #include <Disks/ObjectStorages/IObjectStorage.h>
 #include <Common/ObjectStorageKeyGenerator.h>
 #include "CommonPathPrefixKeyGenerator.h"
@@ -35,10 +33,9 @@ public:
 
     bool isPlain() const override { return true; }
 
-    ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) const override;
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path) const override;
 
-    ObjectStorageKey
-    generateObjectKeyPrefixForDirectoryPath(const std::string & path, const std::optional<std::string> & key_prefix) const override;
+    ObjectStorageKey generateObjectKeyPrefixForDirectoryPath(const std::string & path) const override;
 
     void setKeysGenerator(ObjectStorageKeysGeneratorPtr gen) override { key_generator = gen; }
 
@@ -49,22 +46,20 @@ private:
 
 
 template <typename BaseObjectStorage>
-ObjectStorageKey PlainRewritableObjectStorage<BaseObjectStorage>::generateObjectKeyForPath(
-    const std::string & path, const std::optional<std::string> & key_prefix) const
+ObjectStorageKey PlainRewritableObjectStorage<BaseObjectStorage>::generateObjectKeyForPath(const std::string & path) const
 {
     if (!key_generator)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Key generator is not set");
 
-    return key_generator->generate(path, /* is_directory */ false, key_prefix);
+    return key_generator->generate(path, /* is_directory */ false);
 }
 
 template <typename BaseObjectStorage>
-ObjectStorageKey PlainRewritableObjectStorage<BaseObjectStorage>::generateObjectKeyPrefixForDirectoryPath(
-    const std::string & path, const std::optional<std::string> & key_prefix) const
+ObjectStorageKey PlainRewritableObjectStorage<BaseObjectStorage>::generateObjectKeyPrefixForDirectoryPath(const std::string & path) const
 {
     if (!key_generator)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Key generator is not set");
 
-    return key_generator->generate(path, /* is_directory */ true, key_prefix);
+    return key_generator->generate(path, /* is_directory */ true);
 }
 }
diff --git a/src/Disks/ObjectStorages/S3/DiskS3Utils.cpp b/src/Disks/ObjectStorages/S3/DiskS3Utils.cpp
index b20a2940e47..63e7ebb00c5 100644
--- a/src/Disks/ObjectStorages/S3/DiskS3Utils.cpp
+++ b/src/Disks/ObjectStorages/S3/DiskS3Utils.cpp
@@ -79,7 +79,7 @@ bool checkBatchRemove(S3ObjectStorage & storage)
     /// 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, {} /* key_prefix */);
+    const auto key = storage.generateObjectKeyForPath(path);
     StoredObject object(key.serialize(), path);
     try
     {
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
index f26a3a8bd9d..a6672e14e10 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
@@ -63,7 +63,7 @@ void throwIfError(const Aws::Utils::Outcome<Result, Error> & response)
     {
         const auto & err = response.GetError();
         throw S3Exception(
-            fmt::format("{} (Code: {}, S3 exception: '{}')",
+            fmt::format("{} (Code: {}, s3 exception: {})",
                         err.GetMessage(), static_cast<size_t>(err.GetErrorType()), err.GetExceptionName()),
             err.GetErrorType());
     }
@@ -146,7 +146,7 @@ private:
             auto objects = outcome.GetResult().GetContents();
             for (const auto & object : objects)
             {
-                ObjectMetadata metadata{static_cast<uint64_t>(object.GetSize()), Poco::Timestamp::fromEpochTime(object.GetLastModified().Seconds()), object.GetETag(), {}};
+                ObjectMetadata metadata{static_cast<uint64_t>(object.GetSize()), Poco::Timestamp::fromEpochTime(object.GetLastModified().Seconds()), {}};
                 batch.emplace_back(std::make_shared<RelativePathWithMetadata>(object.GetKey(), std::move(metadata)));
             }
 
@@ -282,7 +282,7 @@ std::unique_ptr<WriteBufferFromFileBase> S3ObjectStorage::writeObject( /// NOLIN
         client.get(),
         uri.bucket,
         object.remote_path,
-        write_settings.use_adaptive_write_buffer ? write_settings.adaptive_write_buffer_initial_size : buf_size,
+        buf_size,
         request_settings,
         std::move(blob_storage_log),
         attributes,
@@ -305,8 +305,7 @@ void S3ObjectStorage::listObjects(const std::string & path, RelativePathsWithMet
 
     S3::ListObjectsV2Request request;
     request.SetBucket(uri.bucket);
-    if (path != "/")
-        request.SetPrefix(path);
+    request.SetPrefix(path);
     if (max_keys)
         request.SetMaxKeys(static_cast<int>(max_keys));
     else
@@ -333,7 +332,6 @@ void S3ObjectStorage::listObjects(const std::string & path, RelativePathsWithMet
                 ObjectMetadata{
                     static_cast<uint64_t>(object.GetSize()),
                     Poco::Timestamp::fromEpochTime(object.GetLastModified().Seconds()),
-                    object.GetETag(),
                     {}}));
 
         if (max_keys)
@@ -481,7 +479,6 @@ ObjectMetadata S3ObjectStorage::getObjectMetadata(const std::string & path) cons
     ObjectMetadata result;
     result.size_bytes = object_info.size;
     result.last_modified = Poco::Timestamp::fromEpochTime(object_info.last_modification_time);
-    result.etag = object_info.etag;
     result.attributes = object_info.metadata;
 
     return result;
@@ -627,12 +624,12 @@ std::unique_ptr<IObjectStorage> S3ObjectStorage::cloneObjectStorage(
         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 std::optional<std::string> & key_prefix) const
+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, /* is_directory */ false, key_prefix);
+    return key_generator->generate(path, /* is_directory */ false);
 }
 
 std::shared_ptr<const S3::Client> S3ObjectStorage::getS3StorageClient()
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.h b/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
index d786a6b37f3..cbe004bc298 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
@@ -164,7 +164,7 @@ public:
 
     bool supportParallelWrite() const override { return true; }
 
-    ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) const override;
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path) const override;
 
     bool isReadOnly() const override { return s3_settings.get()->read_only; }
 
diff --git a/src/Disks/ObjectStorages/Web/WebObjectStorage.h b/src/Disks/ObjectStorages/Web/WebObjectStorage.h
index ab357d6f50d..9ca2950dae0 100644
--- a/src/Disks/ObjectStorages/Web/WebObjectStorage.h
+++ b/src/Disks/ObjectStorages/Web/WebObjectStorage.h
@@ -82,7 +82,7 @@ public:
         const std::string & config_prefix,
         ContextPtr context) override;
 
-    ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & /* key_prefix */) const override
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path) const override
     {
         return ObjectStorageKey::createAsRelative(path);
     }
diff --git a/src/Disks/StoragePolicy.h b/src/Disks/StoragePolicy.h
index 8e49ed910e3..501e033abc3 100644
--- a/src/Disks/StoragePolicy.h
+++ b/src/Disks/StoragePolicy.h
@@ -12,6 +12,7 @@
 #include <Common/formatReadable.h>
 
 #include <memory>
+#include <mutex>
 #include <unordered_map>
 #include <unistd.h>
 #include <boost/noncopyable.hpp>
diff --git a/src/Disks/TemporaryFileOnDisk.cpp b/src/Disks/TemporaryFileOnDisk.cpp
index 88674e068d9..91eb214d941 100644
--- a/src/Disks/TemporaryFileOnDisk.cpp
+++ b/src/Disks/TemporaryFileOnDisk.cpp
@@ -58,8 +58,7 @@ TemporaryFileOnDisk::~TemporaryFileOnDisk()
 
         if (!disk->exists(relative_path))
         {
-            if (show_warning_if_removed)
-                LOG_WARNING(getLogger("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/TemporaryFileOnDisk.h b/src/Disks/TemporaryFileOnDisk.h
index d0ff44c6f03..cccfc82cf9e 100644
--- a/src/Disks/TemporaryFileOnDisk.h
+++ b/src/Disks/TemporaryFileOnDisk.h
@@ -27,19 +27,12 @@ public:
     /// Return relative path (without disk)
     const String & getRelativePath() const { return relative_path; }
 
-    /// Sets whether the destructor should show a warning if the temporary file has been already removed.
-    /// By default a warning is shown.
-    void setShowWarningIfRemoved(bool show_warning_if_removed_) { show_warning_if_removed = show_warning_if_removed_; }
-
 private:
     DiskPtr disk;
 
     /// Relative path in disk to the temporary file or directory
     String relative_path;
 
-    /// Whether the destructor should show a warning if the temporary file has been already removed.
-    bool show_warning_if_removed = true;
-
     CurrentMetrics::Increment metric_increment;
 
     /// Specified if we know what for file is used (sort/aggregate/join).
diff --git a/src/Disks/getOrCreateDiskFromAST.cpp b/src/Disks/getOrCreateDiskFromAST.cpp
new file mode 100644
index 00000000000..fd43f31a009
--- /dev/null
+++ b/src/Disks/getOrCreateDiskFromAST.cpp
@@ -0,0 +1,121 @@
+#include <Disks/getOrCreateDiskFromAST.h>
+#include <Common/logger_useful.h>
+#include <Common/assert_cast.h>
+#include <Common/filesystemHelpers.h>
+#include <Disks/getDiskConfigurationFromAST.h>
+#include <Disks/DiskSelector.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/isDiskFunction.h>
+#include <Interpreters/Context.h>
+#include <Parsers/IAST.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+namespace
+{
+    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;
+        auto config = getDiskConfigurationFromAST(function_args, context);
+
+        std::string disk_name;
+        if (config->has("name"))
+        {
+            disk_name = config->getString("name");
+        }
+        else
+        {
+            /// We need a unique name for a created custom disk, but it needs to be the same
+            /// after table is reattached or server is restarted, so take a hash of the disk
+            /// configuration serialized ast as a disk name suffix.
+            auto disk_setting_string = serializeAST(function);
+            disk_name = DiskSelector::TMP_INTERNAL_DISK_PREFIX
+                + toString(sipHash128(disk_setting_string.data(), disk_setting_string.size()));
+        }
+
+        auto result_disk = context->getOrCreateDisk(disk_name, [&](const DisksMap & disks_map) -> DiskPtr {
+            auto disk = DiskFactory::instance().create(
+                disk_name, *config, /* config_path */"", context, disks_map, /* attach */attach, /* custom_disk */true);
+            /// Mark that disk can be used without storage policy.
+            disk->markDiskAsCustom();
+            return disk;
+        });
+
+        if (!result_disk->isCustomDisk())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Disk with name `{}` already exist", disk_name);
+
+        if (!attach && !result_disk->isRemote())
+        {
+            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_local_disks_base_dir_in_config);
+
+            if (!pathStartsWith(result_disk->getPath(), disk_path_expected_prefix))
+                throw Exception(
+                    ErrorCodes::BAD_ARGUMENTS,
+                    "Path of the custom local disk must be inside `{}` directory",
+                    disk_path_expected_prefix);
+        }
+
+        return disk_name;
+    }
+
+    class DiskConfigurationFlattener
+    {
+    public:
+        struct Data
+        {
+            ContextPtr context;
+            bool attach;
+        };
+
+        static bool needChildVisit(const ASTPtr &, const ASTPtr &) { return true; }
+
+        static void visit(ASTPtr & ast, Data & data)
+        {
+            if (isDiskFunction(ast))
+            {
+                auto disk_name = getOrCreateDiskFromDiskAST(*ast->as<ASTFunction>(), data.context, data.attach);
+                ast = std::make_shared<ASTLiteral>(disk_name);
+            }
+        }
+    };
+
+    /// Visits children first.
+    using FlattenDiskConfigurationVisitor = InDepthNodeVisitor<DiskConfigurationFlattener, false>;
+}
+
+
+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, attach};
+    FlattenDiskConfigurationVisitor{data}.visit(ast);
+
+    auto disk_name = assert_cast<const ASTLiteral &>(*ast).value.get<String>();
+    LOG_TRACE(getLogger("getOrCreateDiskFromDiskAST"), "Result disk name: {}", disk_name);
+    return disk_name;
+}
+
+}
diff --git a/src/Disks/getOrCreateDiskFromAST.h b/src/Disks/getOrCreateDiskFromAST.h
new file mode 100644
index 00000000000..61e1decbee9
--- /dev/null
+++ b/src/Disks/getOrCreateDiskFromAST.h
@@ -0,0 +1,18 @@
+#pragma once
+#include <string>
+#include <Interpreters/Context_fwd.h>
+#include <Parsers/IAST_fwd.h>
+
+namespace DB
+{
+
+class ASTFunction;
+
+/**
+ * Create a DiskPtr from disk AST function like disk(<disk_configuration>),
+ * 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, bool attach);
+
+}
diff --git a/src/Formats/EscapingRuleUtils.cpp b/src/Formats/EscapingRuleUtils.cpp
index 50a46d2334d..58407a810c5 100644
--- a/src/Formats/EscapingRuleUtils.cpp
+++ b/src/Formats/EscapingRuleUtils.cpp
@@ -302,12 +302,8 @@ DataTypePtr tryInferDataTypeByEscapingRule(const String & field, const FormatSet
                 /// Try to determine the type of value inside quotes
                 auto type = tryInferDataTypeForSingleField(data, format_settings);
 
-                /// Return String type if one of the following conditions apply
-                ///  - we couldn't infer any type
-                ///  - it's a number and csv.try_infer_numbers_from_strings = 0
-                ///  - it's a tuple and try_infer_strings_from_quoted_tuples = 0
-                ///  - it's a Bool type (we don't allow reading bool values from strings)
-                if (!type || (format_settings.csv.try_infer_strings_from_quoted_tuples && isTuple(type)) || (!format_settings.csv.try_infer_numbers_from_strings && isNumber(type)) || isBool(type))
+                /// 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 || (format_settings.csv.try_infer_strings_from_quoted_tuples && isTuple(type)) || (!format_settings.csv.try_infer_numbers_from_strings && isNumber(type)))
                     return std::make_shared<DataTypeString>();
 
                 return type;
@@ -423,11 +419,10 @@ String getAdditionalFormatInfoByEscapingRule(const FormatSettings & settings, Fo
     String result = getAdditionalFormatInfoForAllRowBasedFormats(settings);
     /// First, settings that are common for all text formats:
     result += fmt::format(
-        ", try_infer_integers={}, try_infer_dates={}, try_infer_datetimes={}, try_infer_datetimes_only_datetime64={}",
+        ", try_infer_integers={}, try_infer_dates={}, try_infer_datetimes={}",
         settings.try_infer_integers,
         settings.try_infer_dates,
-        settings.try_infer_datetimes,
-        settings.try_infer_datetimes_only_datetime64);
+        settings.try_infer_datetimes);
 
     /// Second, format-specific settings:
     switch (escaping_rule)
@@ -468,7 +463,7 @@ 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_deprecated_object_type,
+                settings.json.allow_object_type,
                 settings.json.use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects);
             break;
         default:
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index f9eb586d647..a3465e9f8ca 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -123,7 +123,6 @@ FormatSettings getFormatSettings(const ContextPtr & context, const Settings & se
     format_settings.import_nested_json = settings.input_format_import_nested_json;
     format_settings.input_allow_errors_num = settings.input_format_allow_errors_num;
     format_settings.input_allow_errors_ratio = settings.input_format_allow_errors_ratio;
-    format_settings.json.max_depth = settings.input_format_json_max_depth;
     format_settings.json.array_of_rows = settings.output_format_json_array_of_rows;
     format_settings.json.escape_forward_slashes = settings.output_format_json_escape_forward_slashes;
     format_settings.json.write_named_tuples_as_objects = settings.output_format_json_named_tuples_as_objects;
@@ -146,13 +145,12 @@ FormatSettings getFormatSettings(const ContextPtr & context, const Settings & se
     format_settings.json.validate_types_from_metadata = settings.input_format_json_validate_types_from_metadata;
     format_settings.json.validate_utf8 = settings.output_format_json_validate_utf8;
     format_settings.json_object_each_row.column_for_object_name = settings.format_json_object_each_row_column_for_object_name;
-    format_settings.json.allow_deprecated_object_type = context->getSettingsRef().allow_experimental_object_type;
-    format_settings.json.allow_json_type = context->getSettingsRef().allow_experimental_json_type;
+    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.json.ignore_unnecessary_fields = settings.input_format_json_ignore_unnecessary_fields;
-    format_settings.json.type_json_skip_duplicated_paths = settings.type_json_skip_duplicated_paths;
+    format_settings.json.case_insensitive_column_matching = settings.input_format_json_case_insensitive_column_matching;
     format_settings.null_as_default = settings.input_format_null_as_default;
     format_settings.force_null_for_omitted_fields = settings.input_format_force_null_for_omitted_fields;
     format_settings.decimal_trailing_zeros = settings.output_format_decimal_trailing_zeros;
@@ -217,6 +215,7 @@ FormatSettings getFormatSettings(const ContextPtr & context, const Settings & se
     format_settings.tsv.allow_variable_number_of_columns = settings.input_format_tsv_allow_variable_number_of_columns;
     format_settings.tsv.crlf_end_of_line_input = settings.input_format_tsv_crlf_end_of_line;
     format_settings.values.accurate_types_of_literals = settings.input_format_values_accurate_types_of_literals;
+    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;
@@ -254,7 +253,7 @@ FormatSettings getFormatSettings(const ContextPtr & context, const Settings & se
     format_settings.msgpack.number_of_columns = settings.input_format_msgpack_number_of_columns;
     format_settings.msgpack.output_uuid_representation = settings.output_format_msgpack_uuid_representation;
     format_settings.max_rows_to_read_for_schema_inference = settings.input_format_max_rows_to_read_for_schema_inference;
-    format_settings.max_bytes_to_read_for_schema_inference = settings.input_format_max_bytes_to_read_for_schema_inference;
+    format_settings.max_bytes_to_read_for_schema_inference = settings.input_format_max_rows_to_read_for_schema_inference;
     format_settings.column_names_for_schema_inference = settings.column_names_for_schema_inference;
     format_settings.schema_inference_hints = settings.schema_inference_hints;
     format_settings.schema_inference_make_columns_nullable = settings.schema_inference_make_columns_nullable.valueOr(2);
@@ -268,7 +267,6 @@ FormatSettings getFormatSettings(const ContextPtr & context, const Settings & se
     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_datetimes_only_datetime64 = settings.input_format_try_infer_datetimes_only_datetime64;
     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;
@@ -283,7 +281,6 @@ FormatSettings getFormatSettings(const ContextPtr & context, const Settings & se
     format_settings.max_parser_depth = context->getSettingsRef().max_parser_depth;
     format_settings.client_protocol_version = context->getClientProtocolVersion();
     format_settings.date_time_overflow_behavior = settings.date_time_overflow_behavior;
-    format_settings.try_infer_variant = settings.input_format_try_infer_variants;
 
     /// Validate avro_schema_registry_url with RemoteHostFilter when non-empty and in Server context
     if (format_settings.schema.is_server)
diff --git a/src/Formats/FormatSettings.h b/src/Formats/FormatSettings.h
index 8b489812662..b668d750515 100644
--- a/src/Formats/FormatSettings.h
+++ b/src/Formats/FormatSettings.h
@@ -35,7 +35,6 @@ struct FormatSettings
     bool decimal_trailing_zeros = false;
     bool defaults_for_omitted_fields = true;
     bool is_writing_to_terminal = false;
-    bool try_infer_variant = false;
 
     bool seekable_read = true;
     UInt64 max_rows_to_read_for_schema_inference = 25000;
@@ -47,7 +46,6 @@ struct FormatSettings
     bool try_infer_integers = true;
     bool try_infer_dates = true;
     bool try_infer_datetimes = true;
-    bool try_infer_datetimes_only_datetime64 = false;
     bool try_infer_exponent_floats = false;
 
     enum class DateTimeInputFormat : uint8_t
@@ -207,7 +205,6 @@ struct FormatSettings
 
     struct JSON
     {
-        size_t max_depth = 1000;
         bool array_of_rows = false;
         bool quote_64bit_integers = true;
         bool quote_64bit_floats = false;
@@ -229,15 +226,14 @@ struct FormatSettings
         bool try_infer_numbers_from_strings = false;
         bool validate_types_from_metadata = true;
         bool validate_utf8 = false;
-        bool allow_deprecated_object_type = false;
-        bool allow_json_type = false;
+        bool allow_object_type = false;
         bool valid_output_on_exception = false;
         bool compact_allow_variable_number_of_columns = false;
         bool try_infer_objects_as_tuples = false;
         bool infer_incomplete_types_as_strings = true;
         bool throw_on_bad_escape_sequence = true;
         bool ignore_unnecessary_fields = true;
-        bool type_json_skip_duplicated_paths = false;
+        bool case_insensitive_column_matching = false;
     } json{};
 
     struct
diff --git a/src/Formats/JSONExtractTree.cpp b/src/Formats/JSONExtractTree.cpp
index 9ea335ee7fe..242d2dc9f80 100644
--- a/src/Formats/JSONExtractTree.cpp
+++ b/src/Formats/JSONExtractTree.cpp
@@ -8,6 +8,7 @@
 #if USE_RAPIDJSON
 #include <Common/JSONParsers/RapidJSONParser.h>
 #endif
+
 #include <Common/JSONParsers/DummyJSONParser.h>
 
 #include <Columns/ColumnArray.h>
@@ -21,7 +22,6 @@
 #include <Columns/ColumnVariant.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnsDateTime.h>
-#include <Columns/ColumnObject.h>
 
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDateTime.h>
@@ -38,10 +38,8 @@
 #include <DataTypes/DataTypeVariant.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeObject.h>
 #include <DataTypes/Serializations/SerializationDecimal.h>
 #include <DataTypes/Serializations/SerializationVariant.h>
-#include <DataTypes/Serializations/SerializationObject.h>
 
 
 #include <IO/ReadBufferFromMemory.h>
@@ -55,7 +53,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int INCORRECT_DATA;
 }
 
 template <typename JSONParser>
@@ -126,7 +123,7 @@ void jsonElementToString(const typename JSONParser::Element & element, WriteBuff
 
 template <typename JSONParser, typename NumberType>
 bool tryGetNumericValueFromJSONElement(
-    NumberType & value, const typename JSONParser::Element & element, bool convert_bool_to_integer, bool allow_type_conversion, String & error)
+    NumberType & value, const typename JSONParser::Element & element, bool convert_bool_to_integer, String & error)
 {
     switch (element.type())
     {
@@ -138,7 +135,7 @@ bool tryGetNumericValueFromJSONElement(
                 /// But it will be more convenient for user to perform conversion.
                 value = static_cast<NumberType>(element.getDouble());
             }
-            else if (!allow_type_conversion || !accurate::convertNumeric<Float64, NumberType, false>(element.getDouble(), value))
+            else if (!accurate::convertNumeric<Float64, NumberType, false>(element.getDouble(), value))
             {
                 error = fmt::format("cannot convert double value {} to {}", element.getDouble(), TypeName<NumberType>);
                 return false;
@@ -161,7 +158,7 @@ bool tryGetNumericValueFromJSONElement(
         case ElementType::BOOL:
             if constexpr (is_integer<NumberType>)
             {
-                if (convert_bool_to_integer && allow_type_conversion)
+                if (convert_bool_to_integer)
                 {
                     value = static_cast<NumberType>(element.getBool());
                     break;
@@ -169,17 +166,13 @@ bool tryGetNumericValueFromJSONElement(
             }
             error = fmt::format("cannot convert bool value to {}", TypeName<NumberType>);
             return false;
-        case ElementType::STRING:
-        {
-            if (!allow_type_conversion)
-                return false;
-
+        case ElementType::STRING: {
             auto rb = ReadBufferFromMemory{element.getString()};
             if constexpr (std::is_floating_point_v<NumberType>)
             {
                 if (!tryReadFloatText(value, rb) || !rb.eof())
                 {
-                    error = fmt::format("cannot parse {} value here: \"{}\"", TypeName<NumberType>, element.getString());
+                    error = fmt::format("cannot parse {} value here: {}", TypeName<NumberType>, element.getString());
                     return false;
                 }
             }
@@ -193,13 +186,13 @@ bool tryGetNumericValueFromJSONElement(
                 rb.position() = rb.buffer().begin();
                 if (!tryReadFloatText(tmp_float, rb) || !rb.eof())
                 {
-                    error = fmt::format("cannot parse {} value here: \"{}\"", TypeName<NumberType>, element.getString());
+                    error = fmt::format("cannot parse {} value here: {}", TypeName<NumberType>, element.getString());
                     return false;
                 }
 
                 if (!accurate::convertNumeric<Float64, NumberType, false>(tmp_float, value))
                 {
-                    error = fmt::format("cannot parse {} value here: \"{}\"", TypeName<NumberType>, element.getString());
+                    error = fmt::format("cannot parse {} value here: {}", TypeName<NumberType>, element.getString());
                     return false;
                 }
             }
@@ -248,16 +241,8 @@ public:
             return false;
         }
 
-        if (is_bool_type && !insert_settings.allow_type_conversion)
-        {
-            if (!element.isBool())
-                return false;
-            assert_cast<ColumnVector<NumberType> &>(column).insertValue(element.getBool());
-            return true;
-        }
-
         NumberType value;
-        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, insert_settings.convert_bool_to_integer || is_bool_type, insert_settings.allow_type_conversion, error))
+        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, insert_settings.convert_bool_to_integer || is_bool_type, error))
         {
             if (error.empty())
                 error = fmt::format("cannot read {} value from JSON element: {}", TypeName<NumberType>, jsonElementToString<JSONParser>(element, format_settings));
@@ -304,17 +289,8 @@ public:
             return false;
         }
 
-        if (this->is_bool_type && !insert_settings.allow_type_conversion)
-        {
-            if (!element.isBool())
-                return false;
-            UInt8 value = element.getBool();
-            assert_cast<ColumnLowCardinality &>(column).insertData(reinterpret_cast<const char *>(&value), sizeof(value));
-            return true;
-        }
-
         NumberType value;
-        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, insert_settings.convert_bool_to_integer || this->is_bool_type, insert_settings.allow_type_conversion, error))
+        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, insert_settings.convert_bool_to_integer || this->is_bool_type, error))
         {
             if (error.empty())
                 error = fmt::format("cannot read {} value from JSON element: {}", TypeName<NumberType>, jsonElementToString<JSONParser>(element, format_settings));
@@ -340,7 +316,7 @@ public:
     bool insertResultToColumn(
         IColumn & column,
         const typename JSONParser::Element & element,
-        const JSONExtractInsertSettings & insert_settings,
+        const JSONExtractInsertSettings &,
         const FormatSettings & format_settings,
         String & error) const override
     {
@@ -357,9 +333,6 @@ public:
 
         if (!element.isString())
         {
-            if (!insert_settings.allow_type_conversion)
-                return false;
-
             auto & col_str = assert_cast<ColumnString &>(column);
             auto & chars = col_str.getChars();
             WriteBufferFromVector<ColumnString::Chars> buf(chars, AppendModeTag());
@@ -387,7 +360,7 @@ public:
     bool insertResultToColumn(
         IColumn & column,
         const typename JSONParser::Element & element,
-        const JSONExtractInsertSettings & insert_settings,
+        const JSONExtractInsertSettings &,
         const FormatSettings & format_settings,
         String & error) const override
     {
@@ -405,9 +378,6 @@ public:
 
         if (!element.isString())
         {
-            if (!insert_settings.allow_type_conversion)
-                return false;
-
             auto value = jsonElementToString<JSONParser>(element, format_settings);
             assert_cast<ColumnLowCardinality &>(column).insertData(value.data(), value.size());
         }
@@ -432,7 +402,7 @@ public:
     bool insertResultToColumn(
         IColumn & column,
         const typename JSONParser::Element & element,
-        const JSONExtractInsertSettings & insert_settings,
+        const JSONExtractInsertSettings &,
         const FormatSettings & format_settings,
         String & error) const override
     {
@@ -449,11 +419,7 @@ public:
         }
 
         if (!element.isString())
-        {
-            if (!insert_settings.allow_type_conversion)
-                return false;
             return checkValueSizeAndInsert(column, jsonElementToString<JSONParser>(element, format_settings), error);
-        }
         return checkValueSizeAndInsert(column, element.getString(), error);
     }
 
@@ -484,7 +450,7 @@ public:
     bool insertResultToColumn(
         IColumn & column,
         const typename JSONParser::Element & element,
-        const JSONExtractInsertSettings & insert_settings,
+        const JSONExtractInsertSettings &,
         const FormatSettings & format_settings,
         String & error) const override
     {
@@ -500,11 +466,7 @@ public:
         }
 
         if (!element.isString())
-        {
-            if (!insert_settings.allow_type_conversion)
-                return false;
             return checkValueSizeAndInsert(column, jsonElementToString<JSONParser>(element, format_settings), error);
-        }
         return checkValueSizeAndInsert(column, element.getString(), error);
     }
 
@@ -668,7 +630,7 @@ public:
     bool insertResultToColumn(
         IColumn & column,
         const typename JSONParser::Element & element,
-        const JSONExtractInsertSettings & insert_settings,
+        const JSONExtractInsertSettings &,
         const FormatSettings & format_settings,
         String & error) const override
     {
@@ -687,7 +649,7 @@ public:
                 return false;
             }
         }
-        else if (element.isUInt64() && insert_settings.allow_type_conversion)
+        else if (element.isUInt64())
         {
             value = element.getUInt64();
         }
@@ -750,8 +712,7 @@ public:
             case ElementType::INT64:
                 value = convertToDecimal<DataTypeNumber<Int64>, DataTypeDecimal<DecimalType>>(element.getInt64(), scale);
                 break;
-            case ElementType::STRING:
-            {
+            case ElementType::STRING: {
                 auto rb = ReadBufferFromMemory{element.getString()};
                 if (!SerializationDecimal<DecimalType>::tryReadText(value, rb, DecimalUtils::max_precision<DecimalType>, scale))
                 {
@@ -760,8 +721,7 @@ public:
                 }
                 break;
             }
-            case ElementType::NULL_VALUE:
-            {
+            case ElementType::NULL_VALUE: {
                 if (!format_settings.null_as_default)
                 {
                     error = "cannot convert null to Decimal value";
@@ -796,7 +756,7 @@ public:
     bool insertResultToColumn(
         IColumn & column,
         const typename JSONParser::Element & element,
-        const JSONExtractInsertSettings & insert_settings,
+        const JSONExtractInsertSettings &,
         const FormatSettings & format_settings,
         String & error) const override
     {
@@ -817,9 +777,6 @@ public:
         }
         else
         {
-            if (!insert_settings.allow_type_conversion)
-                return false;
-
             switch (element.type())
             {
                 case ElementType::DOUBLE:
@@ -1147,7 +1104,7 @@ public:
             }
         }
 
-        if (data.size() != old_size && !were_valid_elements)
+        if (!were_valid_elements)
         {
             data.popBack(data.size() - old_size);
             return false;
@@ -1179,12 +1136,6 @@ public:
         const FormatSettings & format_settings,
         String & error) const override
     {
-        if (element.isNull() && format_settings.null_as_default)
-        {
-            column.insertDefault();
-            return true;
-        }
-
         auto & tuple = assert_cast<ColumnTuple &>(column);
         size_t old_size = column.size();
         bool were_valid_elements = false;
@@ -1223,7 +1174,7 @@ public:
                 else
                 {
                     set_size(old_size);
-                    error += fmt::format(" (during reading tuple {} element)", index);
+                    error += fmt::format("(during reading tuple {} element)", index);
                     return false;
                 }
             }
@@ -1251,7 +1202,7 @@ public:
                     else
                     {
                         set_size(old_size);
-                        error += fmt::format(" (during reading tuple {} element)", index);
+                        error += fmt::format("(during reading tuple {} element)", index);
                         return false;
                     }
                 }
@@ -1270,7 +1221,7 @@ public:
                         else if (!insert_settings.insert_default_on_invalid_elements_in_complex_types)
                         {
                             set_size(old_size);
-                            error += fmt::format(" (during reading tuple element \"{}\")", key);
+                            error += fmt::format("(during reading tuple element \"{}\")", key);
                             return false;
                         }
                     }
@@ -1304,12 +1255,6 @@ public:
         const FormatSettings & format_settings,
         String & error) const override
     {
-        if (element.isNull() && format_settings.null_as_default)
-        {
-            column.insertDefault();
-            return true;
-        }
-
         if (!element.isObject())
         {
             error = fmt::format("cannot read Map value from JSON element: {}", jsonElementToString<JSONParser>(element, format_settings));
@@ -1343,7 +1288,7 @@ public:
                 {
                     key_col.popBack(key_col.size() - offsets.back());
                     value_col.popBack(value_col.size() - offsets.back());
-                    error += fmt::format(" (during reading value of key \"{}\")", pair.first);
+                    error += fmt::format("(during reading value of key \"{}\")", pair.first);
                     return false;
                 }
             }
@@ -1374,14 +1319,6 @@ public:
         String & error) const override
     {
         auto & column_variant = assert_cast<ColumnVariant &>(column);
-
-        /// Check if element is NULL.
-        if (element.isNull())
-        {
-            column_variant.insertDefault();
-            return true;
-        }
-
         for (size_t i : order)
         {
             auto & variant = column_variant.getVariantByGlobalDiscriminator(i);
@@ -1409,13 +1346,6 @@ template <typename JSONParser>
 class DynamicNode : public JSONExtractTreeNode<JSONParser>
 {
 public:
-    explicit DynamicNode(
-        size_t max_dynamic_paths_for_object_ = DataTypeObject::DEFAULT_MAX_SEPARATELY_STORED_PATHS,
-        size_t max_dynamic_types_for_object_ = DataTypeDynamic::DEFAULT_MAX_DYNAMIC_TYPES)
-        :  max_dynamic_paths_for_object(max_dynamic_paths_for_object_), max_dynamic_types_for_object(max_dynamic_types_for_object_)
-    {
-    }
-
     bool insertResultToColumn(
         IColumn & column,
         const typename JSONParser::Element & element,
@@ -1424,7 +1354,7 @@ public:
         String & error) const override
     {
         auto & column_dynamic = assert_cast<ColumnDynamic &>(column);
-        /// Check if element is NULL.
+        /// First, check if element is NULL.
         if (element.isNull())
         {
             column_dynamic.insertDefault();
@@ -1432,86 +1362,59 @@ public:
         }
 
         auto & variant_column = column_dynamic.getVariantColumn();
-        const auto & variant_info = column_dynamic.getVariantInfo();
-        const auto & variant_types = assert_cast<const DataTypeVariant &>(*variant_info.variant_type).getVariants();
-
-        /// Try to insert element into current variants but with no types conversion.
-        /// We want to avoid inferring the type on each row, so if we can insert this element into
-        /// any existing variant with no types conversion (like Integer -> String, Double -> Integer, etc)
-        /// we will do it and won't try to infer the type.
-        auto shared_variant_discr = column_dynamic.getSharedVariantDiscriminator();
-        auto insert_settings_with_no_type_conversion = insert_settings;
-        insert_settings_with_no_type_conversion.allow_type_conversion = false;
-        for (size_t i = 0; i != variant_info.variant_names.size(); ++i)
+        auto variant_info = column_dynamic.getVariantInfo();
+        /// Second, infer ClickHouse type for this element and add it as a new variant.
+        auto element_type = elementToDataType(element, format_settings);
+        if (column_dynamic.addNewVariant(element_type))
         {
-            if (i != shared_variant_discr)
-            {
-                auto it = json_extract_nodes_cache.find(variant_info.variant_names[i]);
-                if (it == json_extract_nodes_cache.end())
-                    it = json_extract_nodes_cache.emplace(variant_info.variant_names[i], buildJSONExtractTree<JSONParser>(variant_types[i], "Dynamic inference")).first;
-
-                if (it->second->insertResultToColumn(variant_column.getVariantByGlobalDiscriminator(i), element, insert_settings_with_no_type_conversion, format_settings, error))
-                {
-                    variant_column.getLocalDiscriminators().push_back(variant_column.localDiscriminatorByGlobal(i));
-                    variant_column.getOffsets().push_back(variant_column.getVariantByGlobalDiscriminator(i).size() - 1);
-                    return true;
-                }
-            }
-        }
-
-        /// We couldn't insert element into current variants, infer ClickHouse type for this element and add it as a new variant.
-        auto element_type = removeNullable(elementToDataType(element, format_settings));
-        if (!checkIfTypeIsComplete(element_type))
-        {
-            throw Exception(
-                ErrorCodes::INCORRECT_DATA,
-                "Cannot infer the type of JSON element {}, because it contains only nulls. To use String type for elements with incomplete "
-                "type, enable setting input_format_json_infer_incomplete_types_as_strings",
-                jsonElementToString<JSONParser>(element, format_settings));
-        }
-
-        auto element_type_name = element_type->getName();
-        if (column_dynamic.addNewVariant(element_type, element_type_name))
-        {
-            auto it = json_extract_nodes_cache.find(element_type_name);
-            if (it == json_extract_nodes_cache.end())
-                it = json_extract_nodes_cache.emplace(element_type_name, buildJSONExtractTree<JSONParser>(element_type, "Dynamic inference")).first;
-            auto global_discriminator = variant_info.variant_name_to_discriminator.at(element_type_name);
+            auto node = buildJSONExtractTree<JSONParser>(element_type, "Dynamic inference");
+            auto global_discriminator = variant_info.variant_name_to_discriminator[element_type->getName()];
             auto & variant = variant_column.getVariantByGlobalDiscriminator(global_discriminator);
-            if (!it->second->insertResultToColumn(variant, element, insert_settings, format_settings, error))
+            if (!node->insertResultToColumn(variant, element, insert_settings, format_settings, error))
                 return false;
             variant_column.getLocalDiscriminators().push_back(variant_column.localDiscriminatorByGlobal(global_discriminator));
             variant_column.getOffsets().push_back(variant.size() - 1);
             return true;
         }
 
-        /// We couldn't add this variant, insert it into shared variant.
-        auto tmp_variant_column = element_type->createColumn();
-        auto node = buildJSONExtractTree<JSONParser>(element_type, "Dynamic inference");
-        if (!node->insertResultToColumn(*tmp_variant_column, element, insert_settings, format_settings, error))
-            return false;
+        /// We couldn't add new variant. Try to insert element into current variants.
+        auto variant_node = buildJSONExtractTree<JSONParser>(variant_info.variant_type, "Dynamic inference");
+        if (variant_node->insertResultToColumn(variant_column, element, insert_settings, format_settings, error))
+            return true;
 
-        column_dynamic.insertValueIntoSharedVariant(*tmp_variant_column, element_type, element_type_name, 0);
+        /// We couldn't insert element into any existing variant, add String variant and read value as String.
+        column_dynamic.addStringVariant();
+        auto string_global_discriminator = variant_info.variant_name_to_discriminator["String"];
+        auto & string_column = variant_column.getVariantByGlobalDiscriminator(string_global_discriminator);
+        if (!getStringNode()->insertResultToColumn(string_column, element, insert_settings, format_settings, error))
+            return false;
+        variant_column.getLocalDiscriminators().push_back(variant_column.localDiscriminatorByGlobal(string_global_discriminator));
+        variant_column.getOffsets().push_back(string_column.size() - 1);
         return true;
     }
 
-    DataTypePtr elementToDataType(const typename JSONParser::Element & element, const FormatSettings & format_settings) const
+    static const std::unique_ptr<JSONExtractTreeNode<JSONParser>> & getStringNode()
+    {
+        static const std::unique_ptr<JSONExtractTreeNode<JSONParser>> string_node
+            = buildJSONExtractTree<JSONParser>(std::make_shared<DataTypeString>(), "Dynamic inference");
+        return string_node;
+    }
+
+    static DataTypePtr elementToDataType(const typename JSONParser::Element & element, const FormatSettings & format_settings)
     {
         JSONInferenceInfo json_inference_info;
         auto type = elementToDataTypeImpl(element, format_settings, json_inference_info);
         transformFinalInferredJSONTypeIfNeeded(type, format_settings, &json_inference_info);
-        if (format_settings.schema_inference_make_columns_nullable && type->haveSubtypes())
-            type = makeNullableRecursively(type);
         return type;
     }
 
 private:
-    DataTypePtr elementToDataTypeImpl(const typename JSONParser::Element & element, const FormatSettings & format_settings, JSONInferenceInfo & json_inference_info) const
+    static DataTypePtr elementToDataTypeImpl(const typename JSONParser::Element & element, const FormatSettings & format_settings, JSONInferenceInfo & json_inference_info)
     {
         switch (element.type())
         {
             case ElementType::NULL_VALUE:
-                return std::make_shared<DataTypeNullable>(std::make_shared<DataTypeNothing>());
+                return makeNullable(std::make_shared<DataTypeNothing>());
             case ElementType::BOOL:
                 return DataTypeFactory::instance().get("Bool");
             case ElementType::INT64:
@@ -1549,10 +1452,10 @@ private:
                 DataTypes types;
                 types.reserve(array.size());
                 for (auto value : array)
-                    types.push_back(elementToDataTypeImpl(value, format_settings, json_inference_info));
+                    types.push_back(makeNullableSafe(elementToDataTypeImpl(value, format_settings, json_inference_info)));
 
                 if (types.empty())
-                    return std::make_shared<DataTypeArray>(std::make_shared<DataTypeNothing>());
+                    return std::make_shared<DataTypeArray>(makeNullable(std::make_shared<DataTypeNothing>()));
 
                 if (checkIfTypesAreEqual(types))
                     return std::make_shared<DataTypeArray>(types.back());
@@ -1579,238 +1482,12 @@ private:
 
                 return std::make_shared<DataTypeTuple>(types);
             }
-            case ElementType::OBJECT:
-            {
-                return std::make_shared<DataTypeObject>(DataTypeObject::SchemaFormat::JSON, max_dynamic_paths_for_object, max_dynamic_types_for_object);
+            case ElementType::OBJECT: {
+                /// TODO: Use new JSON type here when it's ready.
+                return std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), makeNullable(std::make_shared<DataTypeString>()));
             }
         }
     }
-
-    size_t max_dynamic_paths_for_object;
-    size_t max_dynamic_types_for_object;
-
-    /// Avoid building JSONExtractTreeNode for the same data types on each row by using cache.
-    mutable std::unordered_map<String, std::unique_ptr<JSONExtractTreeNode<JSONParser>>> json_extract_nodes_cache;
-};
-
-template <typename JSONParser>
-class ObjectJSONNode : public JSONExtractTreeNode<JSONParser>
-{
-public:
-    ObjectJSONNode(
-        std::unordered_map<String, std::unique_ptr<JSONExtractTreeNode<JSONParser>>> typed_path_nodes_,
-        const std::unordered_set<String> & paths_to_skip_,
-        const std::vector<String> & path_regexps_to_skip_,
-        size_t max_dynamic_paths_,
-        size_t max_dynamic_types_)
-        : typed_path_nodes(std::move(typed_path_nodes_))
-        , paths_to_skip(paths_to_skip_)
-        , dynamic_node(std::make_unique<DynamicNode<JSONParser>>(
-              max_dynamic_paths_ / DataTypeObject::NESTED_OBJECT_MAX_DYNAMIC_PATHS_REDUCE_FACTOR,
-              max_dynamic_types_ / DataTypeObject::NESTED_OBJECT_MAX_DYNAMIC_TYPES_REDUCE_FACTOR))
-        , dynamic_serialization(std::make_shared<SerializationDynamic>())
-    {
-        sorted_paths_to_skip.assign(paths_to_skip.begin(), paths_to_skip.end());
-        std::sort(sorted_paths_to_skip.begin(), sorted_paths_to_skip.end());
-        for (const auto & regexp : path_regexps_to_skip_)
-            path_regexps_to_skip.emplace_back(regexp);
-    }
-
-    bool insertResultToColumn(IColumn & column, const typename JSONParser::Element & element, const JSONExtractInsertSettings & insert_settings, const FormatSettings & format_settings, String & error) const override
-    {
-        if (element.isNull() && format_settings.null_as_default)
-        {
-            column.insertDefault();
-            return true;
-        }
-
-        if (!element.isObject())
-        {
-            error = fmt::format("Cannot read JSON object from JSON element: {}", jsonElementToString<JSONParser>(element, format_settings));
-            return false;
-        }
-
-        auto & column_object = assert_cast<ColumnObject &>(column);
-        size_t prev_size = column_object.size();
-
-        /// Paths in shared data should be sorted, so we cannot insert paths there during traverse.
-        /// Instead we collect all paths and values that should go to shared data, sort them and insert later.
-        /// It's not optimal, but it's a price we pay for faster reading of subcolumns.
-        std::vector<std::pair<String, String>> paths_and_values_for_shared_data;
-        if (!traverseAndInsert(column_object, element, "", insert_settings, format_settings, paths_and_values_for_shared_data, prev_size, error))
-        {
-            /// If there was an error, restore previous state.
-            SerializationObject::restoreColumnObject(column_object, prev_size);
-            return false;
-        }
-
-        /// Fill shared data.
-        auto [shared_data_paths, shared_data_values] = column_object.getSharedDataPathsAndValues();
-        std::sort(paths_and_values_for_shared_data.begin(), paths_and_values_for_shared_data.end());
-        for (size_t i = 0; i != paths_and_values_for_shared_data.size(); ++i)
-        {
-            const auto & [path, value] = paths_and_values_for_shared_data[i];
-            /// Check if we duplicated paths.
-            if (i != 0 && path == paths_and_values_for_shared_data[i - 1].first)
-            {
-                if (!format_settings.json.type_json_skip_duplicated_paths)
-                {
-                    error = fmt::format("Duplicate path found during parsing JSON object: {}. You can enable setting type_json_skip_duplicated_paths to skip duplicated paths during insert", path);
-                    SerializationObject::restoreColumnObject(column_object, prev_size);
-                    return false;
-                }
-            }
-            else
-            {
-                shared_data_paths->insertData(path.data(), path.size());
-                shared_data_values->insertData(value.data(), value.size());
-            }
-        }
-        column_object.getSharedDataOffsets().push_back(shared_data_paths->size());
-
-        /// Fill remaining typed and dynamic paths.
-        for (auto & [_, typed_column] : column_object.getTypedPaths())
-        {
-            if (typed_column->size() == prev_size)
-                typed_column->insertDefault();
-        }
-
-        for (auto & [_, dynamic_column] : column_object.getDynamicPathsPtrs())
-        {
-            if (dynamic_column->size() == prev_size)
-                dynamic_column->insertDefault();
-        }
-
-        return true;
-    }
-
-private:
-    bool traverseAndInsert(
-        ColumnObject & column_object,
-        const typename JSONParser::Element & element,
-        const String & current_path,
-        const JSONExtractInsertSettings & insert_settings,
-        const FormatSettings & format_settings,
-        std::vector<std::pair<String, String>> & paths_and_values_for_shared_data,
-        size_t current_size,
-        String & error) const
-    {
-        if (shouldSkipPath(current_path))
-            return true;
-
-        if (element.isObject() && !typed_path_nodes.contains(current_path))
-        {
-            for (auto [key, value] : element.getObject())
-            {
-                String path = current_path;
-                if (!path.empty())
-                    path.append(".");
-                path += key;
-                if (!traverseAndInsert(column_object, value, path, insert_settings, format_settings, paths_and_values_for_shared_data, current_size, error))
-                    return false;
-            }
-
-            return true;
-        }
-
-        auto & typed_paths = column_object.getTypedPaths();
-        auto & dynamic_paths_ptrs = column_object.getDynamicPathsPtrs();
-        /// Check if we have this path in typed paths.
-        if (auto typed_it = typed_paths.find(current_path); typed_it != typed_paths.end())
-        {
-            /// Check if we already had this path.
-            if (typed_it->second->size() > current_size)
-            {
-                if (!format_settings.json.type_json_skip_duplicated_paths)
-                {
-                    error = fmt::format("Duplicate path found during parsing JSON object: {}. You can enable setting type_json_skip_duplicated_paths to skip duplicated paths during insert", current_path);
-                    return false;
-                }
-            }
-            else if (!typed_path_nodes.at(current_path)->insertResultToColumn(*typed_it->second, element, insert_settings, format_settings, error))
-            {
-                error += fmt::format(" (while reading path {})", current_path);
-                return false;
-            }
-        }
-        /// Check if we have this path in dynamic paths.
-        else if (auto dynamic_it = dynamic_paths_ptrs.find(current_path); dynamic_it != dynamic_paths_ptrs.end())
-        {
-            /// Check if we already had this path.
-            if (dynamic_it->second->size() > current_size)
-            {
-                if (!format_settings.json.type_json_skip_duplicated_paths)
-                {
-                    error = fmt::format("Duplicate path found during parsing JSON object: {}. You can enable setting type_json_skip_duplicated_paths to skip duplicated paths during insert", current_path);
-                    return false;
-                }
-            }
-            else if (!dynamic_node->insertResultToColumn(*dynamic_it->second, element, insert_settings, format_settings, error))
-            {
-                error += fmt::format(" (while reading path {})", current_path);
-                return false;
-            }
-        }
-        /// Don't create new dynamic paths for null and don't insert null values into shared data.
-        /// We consider null equivalent to the absence of this path.
-        else if (element.isNull())
-        {
-        }
-        /// Try to add a new dynamic path.
-        else if (auto * dynamic_column = column_object.tryToAddNewDynamicPath(current_path))
-        {
-            if (!dynamic_node->insertResultToColumn(*dynamic_column, element, insert_settings, format_settings, error))
-            {
-                error += fmt::format(" (while reading path {})", current_path);
-                return false;
-            }
-        }
-        /// Otherwise this path should go to the shared data.
-        else
-        {
-            auto tmp_dynamic_column = ColumnDynamic::create();
-            tmp_dynamic_column->reserve(1);
-            if (!dynamic_node->insertResultToColumn(*tmp_dynamic_column, element, insert_settings, format_settings, error))
-            {
-                error += fmt::format(" (while reading path {})", current_path);
-                return false;
-            }
-
-            paths_and_values_for_shared_data.emplace_back(current_path, "");
-            WriteBufferFromString buf(paths_and_values_for_shared_data.back().second);
-            dynamic_serialization->serializeBinary(*tmp_dynamic_column, 0, buf, format_settings);
-        }
-
-        return true;
-    }
-
-    bool shouldSkipPath(const String & path) const
-    {
-        if (paths_to_skip.contains(path))
-            return true;
-
-        if (!sorted_paths_to_skip.empty())
-        {
-            auto it = std::lower_bound(sorted_paths_to_skip.begin(), sorted_paths_to_skip.end(), path);
-            if (it != sorted_paths_to_skip.begin() && path.starts_with(*std::prev(it)))
-                return true;
-        }
-
-        for (const auto & regexp : path_regexps_to_skip)
-        {
-            if (re2::RE2::FullMatch(path, regexp))
-                return true;
-        }
-
-        return false;
-    }
-
-    std::unordered_map<String, std::unique_ptr<JSONExtractTreeNode<JSONParser>>> typed_path_nodes;
-    std::unordered_set<String> paths_to_skip;
-    std::vector<String> sorted_paths_to_skip;
-    std::list<re2::RE2> path_regexps_to_skip;
-    std::unique_ptr<DynamicNode<JSONParser>> dynamic_node;
-    std::shared_ptr<SerializationDynamic> dynamic_serialization;
 };
 
 }
@@ -1957,26 +1634,6 @@ std::unique_ptr<JSONExtractTreeNode<JSONParser>> buildJSONExtractTree(const Data
         }
         case TypeIndex::Dynamic:
             return std::make_unique<DynamicNode<JSONParser>>();
-        case TypeIndex::Object:
-        {
-            const auto & object_type = assert_cast<const DataTypeObject &>(*type);
-            const auto & typed_paths = object_type.getTypedPaths();
-            std::unordered_map<String, std::unique_ptr<JSONExtractTreeNode<JSONParser>>> typed_path_nodes;
-            typed_path_nodes.reserve(typed_paths.size());
-            for (const auto & [path, path_type] : typed_paths)
-                typed_path_nodes[path] = buildJSONExtractTree<JSONParser>(path_type, source_for_exception_message);
-
-            switch (object_type.getSchemaFormat())
-            {
-                case DataTypeObject::SchemaFormat::JSON:
-                    return std::make_unique<ObjectJSONNode<JSONParser>>(
-                        std::move(typed_path_nodes),
-                        object_type.getPathsToSkip(),
-                        object_type.getPathRegexpsToSkip(),
-                        object_type.getMaxDynamicPaths(),
-                        object_type.getMaxDynamicTypes());
-            }
-        }
         default:
             throw Exception(
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
@@ -1994,7 +1651,7 @@ template std::unique_ptr<JSONExtractTreeNode<SimdJSONParser>> buildJSONExtractTr
 #if USE_RAPIDJSON
 template void jsonElementToString<RapidJSONParser>(const RapidJSONParser::Element & element, WriteBuffer & buf, const FormatSettings & format_settings);
 template std::unique_ptr<JSONExtractTreeNode<RapidJSONParser>> buildJSONExtractTree<RapidJSONParser>(const DataTypePtr & type, const char * source_for_exception_message);
-template bool tryGetNumericValueFromJSONElement<RapidJSONParser, Float64>(Float64 & value, const RapidJSONParser::Element & element, bool convert_bool_to_integer, bool allow_type_conversion, String & error);
+template bool tryGetNumericValueFromJSONElement<RapidJSONParser, Float64>(Float64 & value, const RapidJSONParser::Element & element, bool convert_bool_to_integer, String & error);
 #else
 template void jsonElementToString<DummyJSONParser>(const DummyJSONParser::Element & element, WriteBuffer & buf, const FormatSettings & format_settings);
 template std::unique_ptr<JSONExtractTreeNode<DummyJSONParser>> buildJSONExtractTree<DummyJSONParser>(const DataTypePtr & type, const char * source_for_exception_message);
diff --git a/src/Formats/JSONExtractTree.h b/src/Formats/JSONExtractTree.h
index 89f2d191dfb..b5e82506548 100644
--- a/src/Formats/JSONExtractTree.h
+++ b/src/Formats/JSONExtractTree.h
@@ -17,9 +17,6 @@ struct JSONExtractInsertSettings
     /// For example, if we have [1, "hello", 2] and type Array(UInt32),
     /// we will insert [1, 0, 2] in the column. Used in all JSONExtract functions.
     bool insert_default_on_invalid_elements_in_complex_types = false;
-    /// If false, JSON value will be inserted into column only if type of the value is
-    /// the same as column type (no conversions like Integer -> String, Integer -> Float, etc).
-    bool allow_type_conversion = true;
 };
 
 template <typename JSONParser>
@@ -39,6 +36,6 @@ template <typename JSONParser>
 void jsonElementToString(const typename JSONParser::Element & element, WriteBuffer & buf, const FormatSettings & format_settings);
 
 template <typename JSONParser, typename NumberType>
-bool tryGetNumericValueFromJSONElement(NumberType & value, const typename JSONParser::Element & element, bool convert_bool_to_integer, bool allow_type_conversion, String & error);
+bool tryGetNumericValueFromJSONElement(NumberType & value, const typename JSONParser::Element & element, bool convert_bool_to_integer, String & error);
 
 }
diff --git a/src/Formats/JSONUtils.cpp b/src/Formats/JSONUtils.cpp
index 123f2e4f608..f0985f4a6b7 100644
--- a/src/Formats/JSONUtils.cpp
+++ b/src/Formats/JSONUtils.cpp
@@ -6,7 +6,7 @@
 #include <IO/WriteBufferValidUTF8.h>
 #include <DataTypes/Serializations/SerializationNullable.h>
 #include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeObjectDeprecated.h>
+#include <DataTypes/DataTypeObject.h>
 #include <DataTypes/DataTypeFactory.h>
 
 #include <base/find_symbols.h>
@@ -483,39 +483,10 @@ namespace JSONUtils
         writeArrayEnd(out, 1);
     }
 
-
-    void writeCompactMetadata(const Names & names, const DataTypes & types, const FormatSettings & settings, WriteBuffer & out)
-    {
-        writeCompactArrayStart(out, 0, "meta");
-
-        for (size_t i = 0; i < names.size(); ++i)
-        {
-            writeCompactObjectStart(out);
-            writeTitle("name", out, 0, "");
-
-            /// The field names are pre-escaped to be put into JSON string literal.
-            writeChar('"', out);
-            writeString(names[i], out);
-            writeChar('"', out);
-
-            writeFieldCompactDelimiter(out);
-            writeTitle("type", out, 0, "");
-            writeJSONString(types[i]->getName(), out, settings);
-            writeCompactObjectEnd(out);
-
-            if (i + 1 < names.size())
-                writeFieldCompactDelimiter(out);
-        }
-
-        writeCompactArrayEnd(out);
-    }
-
     void writeAdditionalInfo(
         size_t rows,
         size_t rows_before_limit,
         bool applied_limit,
-        size_t rows_before_aggregation,
-        bool applied_aggregation,
         const Stopwatch & watch,
         const Progress & progress,
         bool write_statistics,
@@ -531,12 +502,7 @@ namespace JSONUtils
             writeTitle("rows_before_limit_at_least", out, 1, " ");
             writeIntText(rows_before_limit, out);
         }
-        if (applied_aggregation)
-        {
-            writeFieldDelimiter(out, 2);
-            writeTitle("rows_before_aggregation", out, 1, " ");
-            writeIntText(rows_before_aggregation, out);
-        }
+
         if (write_statistics)
         {
             writeFieldDelimiter(out, 2);
@@ -557,45 +523,6 @@ namespace JSONUtils
         }
     }
 
-    void writeCompactAdditionalInfo(
-        size_t rows,
-        size_t rows_before_limit,
-        bool applied_limit,
-        const Stopwatch & watch,
-        const Progress & progress,
-        bool write_statistics,
-        WriteBuffer & out)
-    {
-        writeCompactObjectStart(out);
-        writeCompactObjectStart(out, 0, "statistics");
-        writeTitle("rows", out, 0, "");
-        writeIntText(rows, out);
-
-        if (applied_limit)
-        {
-            writeFieldCompactDelimiter(out);
-            writeTitle("rows_before_limit_at_least", out, 0, "");
-            writeIntText(rows_before_limit, out);
-        }
-
-        if (write_statistics)
-        {
-            writeFieldCompactDelimiter(out);
-            writeTitle("elapsed", out, 0, "");
-            writeText(watch.elapsedSeconds(), out);
-            writeFieldCompactDelimiter(out);
-
-            writeTitle("rows_read", out, 0, "");
-            writeText(progress.read_rows.load(), out);
-            writeFieldCompactDelimiter(out);
-
-            writeTitle("bytes_read", out, 0, "");
-            writeText(progress.read_bytes.load(), out);
-        }
-        writeCompactObjectEnd(out);
-        writeCompactObjectEnd(out);
-    }
-
     void writeException(const String & exception_message, WriteBuffer & out, const FormatSettings & settings, size_t indent)
     {
         writeTitle("exception", out, indent, " ");
diff --git a/src/Formats/JSONUtils.h b/src/Formats/JSONUtils.h
index 622703947b9..7ee111c1285 100644
--- a/src/Formats/JSONUtils.h
+++ b/src/Formats/JSONUtils.h
@@ -99,20 +99,8 @@ namespace JSONUtils
         WriteBuffer & out);
 
     void writeMetadata(const Names & names, const DataTypes & types, const FormatSettings & settings, WriteBuffer & out);
-    void writeCompactMetadata(const Names & names, const DataTypes & types, const FormatSettings & settings, WriteBuffer & out);
 
     void writeAdditionalInfo(
-        size_t rows,
-        size_t rows_before_limit,
-        bool applied_limit,
-        size_t rows_before_aggregation,
-        bool applied_aggregation,
-        const Stopwatch & watch,
-        const Progress & progress,
-        bool write_statistics,
-        WriteBuffer & out);
-
-    void writeCompactAdditionalInfo(
         size_t rows,
         size_t rows_before_limit,
         bool applied_limit,
diff --git a/src/Formats/ReadSchemaUtils.cpp b/src/Formats/ReadSchemaUtils.cpp
index dbbd728ed72..617595c19a2 100644
--- a/src/Formats/ReadSchemaUtils.cpp
+++ b/src/Formats/ReadSchemaUtils.cpp
@@ -164,7 +164,7 @@ try
                         return {*iterator_data.cached_columns, *format_name};
                     }
 
-                    schemas_for_union_mode.emplace_back(iterator_data.cached_columns->getAll(), read_buffer_iterator.getLastFilePath());
+                    schemas_for_union_mode.emplace_back(iterator_data.cached_columns->getAll(), read_buffer_iterator.getLastFileName());
                     continue;
                 }
 
@@ -250,7 +250,7 @@ try
 
                     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.getLastFilePath());
+                    schemas_for_union_mode.emplace_back(names_and_types, read_buffer_iterator.getLastFileName());
                 }
                 catch (...)
                 {
@@ -411,7 +411,7 @@ try
                         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.getLastFilePath());
+                    schemas_for_union_mode.emplace_back(names_and_types, read_buffer_iterator.getLastFileName());
                 }
 
                 if (format_name && mode == SchemaInferenceMode::DEFAULT)
@@ -527,9 +527,9 @@ try
 }
 catch (Exception & e)
 {
-    auto file_path = read_buffer_iterator.getLastFilePath();
-    if (!file_path.empty())
-        e.addMessage(fmt::format("(in file/uri {})", file_path));
+    auto file_name = read_buffer_iterator.getLastFileName();
+    if (!file_name.empty())
+        e.addMessage(fmt::format("(in file/uri {})", file_name));
     throw;
 }
 
diff --git a/src/Formats/ReadSchemaUtils.h b/src/Formats/ReadSchemaUtils.h
index 7168e7f0817..bb5e068f696 100644
--- a/src/Formats/ReadSchemaUtils.h
+++ b/src/Formats/ReadSchemaUtils.h
@@ -56,8 +56,8 @@ struct IReadBufferIterator
     /// Set auto detected format name.
     virtual void setFormatName(const String & /*format_name*/) {}
 
-    /// Get last processed file path for better exception messages.
-    virtual String getLastFilePath() const { return ""; }
+    /// 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; }
diff --git a/src/Formats/SchemaInferenceUtils.cpp b/src/Formats/SchemaInferenceUtils.cpp
index f805149e892..c04682e8765 100644
--- a/src/Formats/SchemaInferenceUtils.cpp
+++ b/src/Formats/SchemaInferenceUtils.cpp
@@ -7,12 +7,11 @@
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeTuple.h>
-#include <DataTypes/DataTypeVariant.h>
 #include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeNothing.h>
 #include <DataTypes/transformTypesRecursively.h>
-#include <DataTypes/DataTypeObjectDeprecated.h>
+#include <DataTypes/DataTypeObject.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
@@ -307,72 +306,37 @@ namespace
         type_indexes.erase(TypeIndex::UInt64);
     }
 
-    /// if setting 'try_infer_variant' is true then we convert to type variant.
-    void transformVariant(DataTypes & data_types, TypeIndexesSet & type_indexes)
-    {
-        if (checkIfTypesAreEqual(data_types))
-            return;
-
-        DataTypes variant_types;
-        for (const auto & type : data_types)
-        {
-            if (const auto * variant_type = typeid_cast<const DataTypeVariant *>(type.get()))
-            {
-                const auto & current_variants = variant_type->getVariants();
-                variant_types.insert(variant_types.end(), current_variants.begin(), current_variants.end());
-            }
-            else
-            {
-                variant_types.push_back(type);
-            }
-        }
-
-        auto variant_type = std::make_shared<DataTypeVariant>(variant_types);
-
-        for (auto & type : data_types)
-            type = variant_type;
-        type_indexes = {TypeIndex::Variant};
-    }
-
-    /// If we have only date/datetimes types (Date/DateTime/DateTime64), convert all of them to the common type,
-    /// otherwise, convert all Date, DateTime and DateTime64 to String.
+    /// If we have only Date and DateTime types, convert Date to DateTime,
+    /// otherwise, convert all Date and DateTime to String.
     void transformDatesAndDateTimes(DataTypes & data_types, TypeIndexesSet & type_indexes)
     {
         bool have_dates = type_indexes.contains(TypeIndex::Date);
-        bool have_datetimes = type_indexes.contains(TypeIndex::DateTime);
-        bool have_datetimes64 = type_indexes.contains(TypeIndex::DateTime64);
-        bool all_dates_or_datetimes = (type_indexes.size() == (static_cast<size_t>(have_dates) + static_cast<size_t>(have_datetimes) + static_cast<size_t>(have_datetimes64)));
+        bool have_datetimes = type_indexes.contains(TypeIndex::DateTime64);
+        bool all_dates_or_datetimes = (type_indexes.size() == (static_cast<size_t>(have_dates) + static_cast<size_t>(have_datetimes)));
 
-        if (!all_dates_or_datetimes && (have_dates || have_datetimes || have_datetimes64))
+        if (!all_dates_or_datetimes && (have_dates || have_datetimes))
         {
             for (auto & type : data_types)
             {
-                if (isDate(type) || isDateTime(type) || isDateTime64(type))
+                if (isDate(type) || isDateTime64(type))
                     type = std::make_shared<DataTypeString>();
             }
 
             type_indexes.erase(TypeIndex::Date);
             type_indexes.erase(TypeIndex::DateTime);
-            type_indexes.erase(TypeIndex::DateTime64);
             type_indexes.insert(TypeIndex::String);
             return;
         }
 
-        for (auto & type : data_types)
+        if (have_dates && have_datetimes)
         {
-            if (isDate(type) && (have_datetimes || have_datetimes64))
+            for (auto & type : data_types)
             {
-                if (have_datetimes64)
+                if (isDate(type))
                     type = std::make_shared<DataTypeDateTime64>(9);
-                else
-                    type = std::make_shared<DataTypeDateTime>();
-                type_indexes.erase(TypeIndex::Date);
-            }
-            else if (isDateTime(type) && have_datetimes64)
-            {
-                type = std::make_shared<DataTypeDateTime64>(9);
-                type_indexes.erase(TypeIndex::DateTime);
             }
+
+            type_indexes.erase(TypeIndex::Date);
         }
     }
 
@@ -680,11 +644,7 @@ namespace
                 transformDatesAndDateTimes(data_types, type_indexes);
 
             if constexpr (!is_json)
-            {
-                if (settings.try_infer_variant)
-                    transformVariant(data_types, type_indexes);
                 return;
-            }
 
             /// Check settings specific for JSON formats.
 
@@ -702,10 +662,6 @@ namespace
 
             if (settings.json.try_infer_objects_as_tuples)
                 mergeJSONPaths(data_types, type_indexes, settings, json_info);
-
-            if (settings.try_infer_variant)
-                transformVariant(data_types, type_indexes);
-
         };
 
         auto transform_complex_types = [&](DataTypes & data_types, TypeIndexesSet & type_indexes)
@@ -718,11 +674,7 @@ namespace
             transformNothingComplexTypes(data_types, type_indexes);
 
             if constexpr (!is_json)
-            {
-                if (settings.try_infer_variant)
-                    transformVariant(data_types, type_indexes);
                 return;
-            }
 
             /// Convert JSON tuples with same nested types to arrays.
             transformTuplesWithEqualNestedTypesToArrays(data_types, type_indexes);
@@ -735,9 +687,6 @@ namespace
 
             if (json_info && json_info->allow_merging_named_tuples)
                 mergeNamedTuples(data_types, type_indexes, settings, json_info);
-
-            if (settings.try_infer_variant)
-                transformVariant(data_types, type_indexes);
         };
 
         transformTypesRecursively(types, transform_simple_types, transform_complex_types);
@@ -748,87 +697,55 @@ namespace
 
     bool tryInferDate(std::string_view field)
     {
-        /// Minimum length of Date text representation is 8 (YYYY-M-D) and maximum is 10 (YYYY-MM-DD)
-        if (field.size() < 8 || field.size() > 10)
+        if (field.empty())
             return false;
 
-        /// Check if it's just a number, and if so, don't try to infer Date from it,
-        /// because we can interpret this number as a Date (for example 20000101 will be 2000-01-01)
-        /// and it will lead to inferring Date instead of simple Int64/UInt64 in some cases.
-        if (std::all_of(field.begin(), field.end(), isNumericASCII))
-            return false;
-
-        ReadBufferFromString buf(field);
-        DayNum tmp;
-        return tryReadDateText(tmp, buf, DateLUT::instance(), /*allowed_delimiters=*/"-/:") && buf.eof();
-    }
-
-    DataTypePtr tryInferDateTimeOrDateTime64(std::string_view field, const FormatSettings & settings)
-    {
-        /// Don't try to infer DateTime if string is too long.
-        /// It's difficult to say what is the real maximum length of
-        /// DateTime we can parse using BestEffort approach.
-        /// 50 symbols is more or less valid limit for date times that makes sense.
-        if (field.empty() || field.size() > 50)
-            return nullptr;
-
-        /// Check that we have at least one digit, don't infer datetime form strings like "Apr"/"May"/etc.
-        if (!std::any_of(field.begin(), field.end(), isNumericASCII))
-            return nullptr;
-
-        /// Check if it's just a number, and if so, don't try to infer DateTime from it,
-        /// because we can interpret this number as a timestamp and it will lead to
-        /// inferring DateTime instead of simple Int64 in some cases.
-        if (std::all_of(field.begin(), field.end(), isNumericASCII))
-            return nullptr;
-
         ReadBufferFromString buf(field);
         Float64 tmp_float;
-        /// Check if it's a float value, and if so, don't try to infer DateTime from it,
-        /// because it will lead to inferring DateTime instead of simple Float64 in some cases.
+        /// Check if it's just a number, and if so, don't try to infer Date from it,
+        /// because we can interpret this number as a Date (for example 20000101 will be 2000-01-01)
+        /// and it will lead to inferring Date instead of simple Int64/UInt64 in some cases.
         if (tryReadFloatText(tmp_float, buf) && buf.eof())
-            return nullptr;
+            return false;
 
         buf.seek(0, SEEK_SET); /// Return position to the beginning
-        if (!settings.try_infer_datetimes_only_datetime64)
-        {
-            time_t tmp;
-            switch (settings.date_time_input_format)
-            {
-                case FormatSettings::DateTimeInputFormat::Basic:
-                    if (tryReadDateTimeText(tmp, buf, DateLUT::instance(), /*allowed_date_delimiters=*/"-/:", /*allowed_time_delimiters=*/":") && buf.eof())
-                        return std::make_shared<DataTypeDateTime>();
-                    break;
-                case FormatSettings::DateTimeInputFormat::BestEffort:
-                    if (tryParseDateTimeBestEffortStrict(tmp, buf, DateLUT::instance(), DateLUT::instance("UTC"), /*allowed_date_delimiters=*/"-/:") && buf.eof())
-                        return std::make_shared<DataTypeDateTime>();
-                    break;
-                case FormatSettings::DateTimeInputFormat::BestEffortUS:
-                    if (tryParseDateTimeBestEffortUSStrict(tmp, buf, DateLUT::instance(), DateLUT::instance("UTC"), /*allowed_date_delimiters=*/"-/:") && buf.eof())
-                        return std::make_shared<DataTypeDateTime>();
-                    break;
-            }
-        }
+
+        DayNum tmp;
+        return tryReadDateText(tmp, buf) && buf.eof();
+    }
+
+    bool tryInferDateTime(std::string_view field, const FormatSettings & settings)
+    {
+        if (field.empty())
+            return false;
+
+        ReadBufferFromString buf(field);
+        Float64 tmp_float;
+        /// Check if it's just a number, and if so, don't try to infer DateTime from it,
+        /// because we can interpret this number as a timestamp and it will lead to
+        /// inferring DateTime instead of simple Int64/Float64 in some cases.
+        if (tryReadFloatText(tmp_float, buf) && buf.eof())
+            return false;
 
         buf.seek(0, SEEK_SET); /// Return position to the beginning
         DateTime64 tmp;
         switch (settings.date_time_input_format)
         {
             case FormatSettings::DateTimeInputFormat::Basic:
-                if (tryReadDateTime64Text(tmp, 9, buf, DateLUT::instance(), /*allowed_date_delimiters=*/"-/:", /*allowed_time_delimiters=*/":") && buf.eof())
-                    return std::make_shared<DataTypeDateTime64>(9);
+                if (tryReadDateTime64Text(tmp, 9, buf) && buf.eof())
+                    return true;
                 break;
             case FormatSettings::DateTimeInputFormat::BestEffort:
-                if (tryParseDateTime64BestEffortStrict(tmp, 9, buf, DateLUT::instance(), DateLUT::instance("UTC"), /*allowed_date_delimiters=*/"-/:") && buf.eof())
-                    return std::make_shared<DataTypeDateTime64>(9);
+                if (tryParseDateTime64BestEffort(tmp, 9, buf, DateLUT::instance(), DateLUT::instance("UTC")) && buf.eof())
+                    return true;
                 break;
             case FormatSettings::DateTimeInputFormat::BestEffortUS:
-                if (tryParseDateTime64BestEffortUSStrict(tmp, 9, buf, DateLUT::instance(), DateLUT::instance("UTC"), /*allowed_date_delimiters=*/"-/:") && buf.eof())
-                    return std::make_shared<DataTypeDateTime64>(9);
+                if (tryParseDateTime64BestEffortUS(tmp, 9, buf, DateLUT::instance(), DateLUT::instance("UTC")) && buf.eof())
+                    return true;
                 break;
         }
 
-        return nullptr;
+        return false;
     }
 
     template <bool is_json>
@@ -904,6 +821,7 @@ namespace
 
             if (checkIfTypesAreEqual(nested_types_copy))
                 return std::make_shared<DataTypeArray>(nested_types_copy.back());
+
             return std::make_shared<DataTypeTuple>(nested_types);
         }
         else
@@ -1258,8 +1176,8 @@ namespace
         {
             if constexpr (is_json)
             {
-                if (settings.json.allow_deprecated_object_type)
-                    return std::make_shared<DataTypeObjectDeprecated>("json", true);
+                if (settings.json.allow_object_type)
+                    return std::make_shared<DataTypeObject>("json", true);
             }
 
             /// Empty Map is Map(Nothing, Nothing)
@@ -1268,8 +1186,8 @@ namespace
 
         if constexpr (is_json)
         {
-            if (settings.json.allow_deprecated_object_type)
-                return std::make_shared<DataTypeObjectDeprecated>("json", true);
+            if (settings.json.allow_object_type)
+                return std::make_shared<DataTypeObject>("json", true);
 
             if (settings.json.read_objects_as_strings)
                 return std::make_shared<DataTypeString>();
@@ -1324,7 +1242,7 @@ namespace
         {
             if constexpr (is_json)
             {
-                if (!settings.json.allow_deprecated_object_type && settings.json.try_infer_objects_as_tuples)
+                if (!settings.json.allow_object_type && settings.json.try_infer_objects_as_tuples)
                     return tryInferJSONPaths(buf, settings, json_info, depth);
             }
 
@@ -1502,15 +1420,6 @@ void transformFinalInferredJSONTypeIfNeededImpl(DataTypePtr & data_type, const F
 
         return;
     }
-
-    if (const auto * variant_type = typeid_cast<const DataTypeVariant *>(data_type.get()))
-    {
-        auto nested_types = variant_type->getVariants();
-        for (auto & nested_type : nested_types)
-            transformFinalInferredJSONTypeIfNeededImpl(nested_type, settings, json_info, remain_nothing_types);
-        data_type = std::make_shared<DataTypeVariant>(nested_types);
-        return;
-    }
 }
 
 void transformFinalInferredJSONTypeIfNeeded(DataTypePtr & data_type, const FormatSettings & settings, JSONInferenceInfo * json_info)
@@ -1534,11 +1443,8 @@ DataTypePtr tryInferDateOrDateTimeFromString(std::string_view field, const Forma
     if (settings.try_infer_dates && tryInferDate(field))
         return std::make_shared<DataTypeDate>();
 
-    if (settings.try_infer_datetimes)
-    {
-        if (auto type = tryInferDateTimeOrDateTime64(field, settings))
-            return type;
-    }
+    if (settings.try_infer_datetimes && tryInferDateTime(field, settings))
+        return std::make_shared<DataTypeDateTime64>(9);
 
     return nullptr;
 }
@@ -1590,20 +1496,6 @@ DataTypePtr makeNullableRecursively(DataTypePtr type)
         return nested_type ? std::make_shared<DataTypeArray>(nested_type) : nullptr;
     }
 
-    if (which.isVariant())
-    {
-        const auto * variant_type = assert_cast<const DataTypeVariant *>(type.get());
-        DataTypes nested_types;
-        for (const auto & nested_type: variant_type->getVariants())
-        {
-            if (!nested_type->lowCardinality() && nested_type->haveSubtypes())
-                nested_types.push_back(makeNullableRecursively(nested_type));
-            else
-                nested_types.push_back(nested_type);
-        }
-        return std::make_shared<DataTypeVariant>(nested_types);
-    }
-
     if (which.isTuple())
     {
         const auto * tuple_type = assert_cast<const DataTypeTuple *>(type.get());
@@ -1637,15 +1529,15 @@ DataTypePtr makeNullableRecursively(DataTypePtr type)
         return nested_type ? std::make_shared<DataTypeLowCardinality>(nested_type) : nullptr;
     }
 
-    if (which.isObjectDeprecated())
+    if (which.isObject())
     {
-        const auto * object_type = assert_cast<const DataTypeObjectDeprecated *>(type.get());
+        const auto * object_type = assert_cast<const DataTypeObject *>(type.get());
         if (object_type->hasNullableSubcolumns())
             return type;
-        return std::make_shared<DataTypeObjectDeprecated>(object_type->getSchemaFormat(), true);
+        return std::make_shared<DataTypeObject>(object_type->getSchemaFormat(), true);
     }
 
-    return makeNullableSafe(type);
+    return makeNullable(type);
 }
 
 NamesAndTypesList getNamesAndRecursivelyNullableTypes(const Block & header)
diff --git a/src/Formats/fuzzers/CMakeLists.txt b/src/Formats/fuzzers/CMakeLists.txt
index b8a7e78b6e2..38009aeec1d 100644
--- a/src/Formats/fuzzers/CMakeLists.txt
+++ b/src/Formats/fuzzers/CMakeLists.txt
@@ -1,2 +1,2 @@
 clickhouse_add_executable(format_fuzzer format_fuzzer.cpp ${SRCS})
-target_link_libraries(format_fuzzer PRIVATE clickhouse_functions clickhouse_aggregate_functions)
+target_link_libraries(format_fuzzer PRIVATE dbms clickhouse_aggregate_functions)
diff --git a/src/Formats/fuzzers/format_fuzzer.cpp b/src/Formats/fuzzers/format_fuzzer.cpp
index 12cd40f9442..46661e4828c 100644
--- a/src/Formats/fuzzers/format_fuzzer.cpp
+++ b/src/Formats/fuzzers/format_fuzzer.cpp
@@ -3,6 +3,7 @@
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/ReadHelpers.h>
 
+#include <Formats/FormatFactory.h>
 #include <Formats/registerFormats.h>
 
 #include <QueryPipeline/Pipe.h>
@@ -19,32 +20,37 @@
 
 #include <AggregateFunctions/registerAggregateFunctions.h>
 
-using namespace DB;
-
-
-ContextMutablePtr context;
-
-extern "C" int LLVMFuzzerInitialize(int *, char ***)
-{
-    if (context)
-        return true;
-
-    SharedContextHolder shared_context = Context::createShared();
-    context = Context::createGlobal(shared_context.get());
-    context->makeGlobalContext();
-
-    MainThreadStatus::getInstance();
-
-    registerAggregateFunctions();
-    registerFormats();
-
-    return 0;
-}
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 {
     try
     {
+        using namespace DB;
+
+        static SharedContextHolder shared_context;
+        static ContextMutablePtr context;
+
+        auto initialize = [&]() mutable
+        {
+            if (context)
+                return true;
+
+            shared_context = Context::createShared();
+            context = Context::createGlobal(shared_context.get());
+            context->makeGlobalContext();
+            context->setApplicationType(Context::ApplicationType::LOCAL);
+
+            MainThreadStatus::getInstance();
+
+            registerAggregateFunctions();
+            registerFormats();
+
+            return true;
+        };
+
+        static bool initialized = initialize();
+        (void) initialized;
+
         total_memory_tracker.resetCounters();
         total_memory_tracker.setHardLimit(1_GiB);
         CurrentThread::get().memory_tracker.resetCounters();
diff --git a/src/Formats/registerFormats.cpp b/src/Formats/registerFormats.cpp
index 770b747fafd..57ca1bb49c8 100644
--- a/src/Formats/registerFormats.cpp
+++ b/src/Formats/registerFormats.cpp
@@ -95,7 +95,6 @@ void registerOutputFormatMarkdown(FormatFactory & factory);
 void registerOutputFormatPostgreSQLWire(FormatFactory & factory);
 void registerOutputFormatPrometheus(FormatFactory & factory);
 void registerOutputFormatSQLInsert(FormatFactory & factory);
-void registerOutputFormatJSONCompactWithProgress(FormatFactory & factory);
 
 /// Input only formats.
 
@@ -243,7 +242,6 @@ void registerFormats()
     registerOutputFormatCapnProto(factory);
     registerOutputFormatPrometheus(factory);
     registerOutputFormatSQLInsert(factory);
-    registerOutputFormatJSONCompactWithProgress(factory);
 
     registerInputFormatRegexp(factory);
     registerInputFormatJSONAsString(factory);
diff --git a/src/Functions/CRC.cpp b/src/Functions/CRC.cpp
index 73318d523b5..0ba976669a3 100644
--- a/src/Functions/CRC.cpp
+++ b/src/Functions/CRC.cpp
@@ -81,43 +81,46 @@ struct CRCFunctionWrapper
     static constexpr auto is_fixed_to_constant = true;
     using ReturnType = typename Impl::ReturnType;
 
-    static void vector(const ColumnString::Chars & data, const ColumnString::Offsets & offsets, PaddedPODArray<ReturnType> & res, size_t input_rows_count)
+    static void vector(const ColumnString::Chars & data, const ColumnString::Offsets & offsets, PaddedPODArray<ReturnType> & res)
     {
+        size_t size = offsets.size();
+
         ColumnString::Offset prev_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             res[i] = doCRC(data, prev_offset, offsets[i] - prev_offset - 1);
             prev_offset = offsets[i];
         }
     }
 
-    static void vectorFixedToConstant(const ColumnString::Chars & data, size_t n, ReturnType & res, size_t)
-    {
-        res = doCRC(data, 0, n);
-    }
+    static void vectorFixedToConstant(const ColumnString::Chars & data, size_t n, ReturnType & res) { res = doCRC(data, 0, n); }
 
-    static void vectorFixedToVector(const ColumnString::Chars & data, size_t n, PaddedPODArray<ReturnType> & res, size_t input_rows_count)
+    static void vectorFixedToVector(const ColumnString::Chars & data, size_t n, PaddedPODArray<ReturnType> & res)
     {
-        for (size_t i = 0; i < input_rows_count; ++i)
+        size_t size = data.size() / n;
+
+        for (size_t i = 0; i < size; ++i)
+        {
             res[i] = doCRC(data, i * n, n);
+        }
     }
 
-    [[noreturn]] static void array(const ColumnString::Offsets &, PaddedPODArray<ReturnType> &, size_t)
+    [[noreturn]] static void array(const ColumnString::Offsets & /*offsets*/, PaddedPODArray<ReturnType> & /*res*/)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function {} to Array argument", std::string(Impl::name));
     }
 
-    [[noreturn]] static void uuid(const ColumnUUID::Container &, size_t, PaddedPODArray<ReturnType> &, size_t)
+    [[noreturn]] static void uuid(const ColumnUUID::Container & /*offsets*/, size_t /*n*/, PaddedPODArray<ReturnType> & /*res*/)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function {} to UUID argument", std::string(Impl::name));
     }
 
-    [[noreturn]] static void ipv6(const ColumnIPv6::Container &, size_t, PaddedPODArray<ReturnType> &, size_t)
+    [[noreturn]] static void ipv6(const ColumnIPv6::Container & /*offsets*/, size_t /*n*/, PaddedPODArray<ReturnType> & /*res*/)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function {} to IPv6 argument", std::string(Impl::name));
     }
 
-    [[noreturn]] static void ipv4(const ColumnIPv4::Container &, size_t, PaddedPODArray<ReturnType> &, size_t)
+    [[noreturn]] static void ipv4(const ColumnIPv4::Container & /*offsets*/, size_t /*n*/, PaddedPODArray<ReturnType> & /*res*/)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function {} to IPv4 argument", std::string(Impl::name));
     }
diff --git a/src/Functions/CastOverloadResolver.cpp b/src/Functions/CastOverloadResolver.cpp
index 6cb4d492fd8..49f63073aaf 100644
--- a/src/Functions/CastOverloadResolver.cpp
+++ b/src/Functions/CastOverloadResolver.cpp
@@ -3,7 +3,6 @@
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeString.h>
 #include <Columns/ColumnString.h>
 #include <Core/Settings.h>
 #include <Interpreters/parseColumnsListForTableFunction.h>
@@ -36,7 +35,7 @@ FunctionBasePtr createFunctionBaseCast(
 class CastOverloadResolverImpl : public IFunctionOverloadResolver
 {
 public:
-    static const char * getNameImpl(CastType cast_type, bool internal)
+    const char * getNameImpl() const
     {
         if (cast_type == CastType::accurate)
             return "accurateCast";
@@ -50,7 +49,7 @@ public:
 
     String getName() const override
     {
-        return getNameImpl(cast_type, internal);
+        return getNameImpl();
     }
 
     size_t getNumberOfArguments() const override { return 2; }
@@ -80,22 +79,10 @@ public:
         }
     }
 
-    static FunctionBasePtr createInternalCast(ColumnWithTypeAndName from, DataTypePtr to, CastType cast_type, std::optional<CastDiagnostic> diagnostic)
-    {
-        if (cast_type == CastType::accurateOrNull && !isVariant(to))
-            to = makeNullable(to);
-
-        ColumnsWithTypeAndName arguments;
-        arguments.emplace_back(std::move(from));
-        arguments.emplace_back().type = std::make_unique<DataTypeString>();
-
-        return createFunctionBaseCast(nullptr, getNameImpl(cast_type, true), arguments, to, diagnostic, cast_type);
-    }
-
 protected:
     FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
     {
-        return createFunctionBaseCast(context, getNameImpl(cast_type, internal), arguments, return_type, diagnostic, cast_type);
+        return createFunctionBaseCast(context, getNameImpl(), arguments, return_type, diagnostic, cast_type);
     }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
@@ -143,9 +130,9 @@ private:
 };
 
 
-FunctionBasePtr createInternalCast(ColumnWithTypeAndName from, DataTypePtr to, CastType cast_type, std::optional<CastDiagnostic> diagnostic)
+FunctionOverloadResolverPtr createInternalCastOverloadResolver(CastType type, std::optional<CastDiagnostic> diagnostic)
 {
-    return CastOverloadResolverImpl::createInternalCast(std::move(from), std::move(to), cast_type, std::move(diagnostic));
+    return CastOverloadResolverImpl::create(ContextPtr{}, type, true, diagnostic);
 }
 
 REGISTER_FUNCTION(CastOverloadResolvers)
diff --git a/src/Functions/CastOverloadResolver.h b/src/Functions/CastOverloadResolver.h
index 66f9d6cfcaf..7d98f774812 100644
--- a/src/Functions/CastOverloadResolver.h
+++ b/src/Functions/CastOverloadResolver.h
@@ -3,7 +3,6 @@
 #include <memory>
 #include <optional>
 #include <Interpreters/Context_fwd.h>
-#include <Core/ColumnWithTypeAndName.h>
 
 
 namespace DB
@@ -12,9 +11,6 @@ namespace DB
 class IFunctionOverloadResolver;
 using FunctionOverloadResolverPtr = std::shared_ptr<IFunctionOverloadResolver>;
 
-class IFunctionBase;
-using FunctionBasePtr = std::shared_ptr<const IFunctionBase>;
-
 enum class CastType : uint8_t
 {
     nonAccurate,
@@ -28,6 +24,6 @@ struct CastDiagnostic
     std::string column_to;
 };
 
-FunctionBasePtr createInternalCast(ColumnWithTypeAndName from, DataTypePtr to, CastType cast_type, std::optional<CastDiagnostic> diagnostic);
+FunctionOverloadResolverPtr createInternalCastOverloadResolver(CastType type, std::optional<CastDiagnostic> diagnostic);
 
 }
diff --git a/src/Functions/CountSubstringsImpl.h b/src/Functions/CountSubstringsImpl.h
index b1cefae6f1d..9ff3e4e1f2a 100644
--- a/src/Functions/CountSubstringsImpl.h
+++ b/src/Functions/CountSubstringsImpl.h
@@ -37,11 +37,10 @@ struct CountSubstringsImpl
         const std::string & needle,
         const ColumnPtr & start_pos,
         PaddedPODArray<UInt64> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null,
-        size_t input_rows_count)
+        [[maybe_unused]] ColumnUInt8 * res_null)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
-        chassert(!res_null);
+        assert(!res_null);
 
         const UInt8 * const begin = haystack_data.data();
         const UInt8 * const end = haystack_data.data() + haystack_data.size();
@@ -81,8 +80,6 @@ struct CountSubstringsImpl
             }
             pos = begin + haystack_offsets[i];
             ++i;
-
-            chassert(i < input_rows_count);
         }
     }
 
@@ -118,7 +115,7 @@ struct CountSubstringsImpl
         [[maybe_unused]] ColumnUInt8 * res_null)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
-        chassert(!res_null);
+        assert(!res_null);
 
         Impl::toLowerIfNeed(haystack);
         Impl::toLowerIfNeed(needle);
@@ -153,18 +150,17 @@ struct CountSubstringsImpl
         const ColumnString::Offsets & needle_offsets,
         const ColumnPtr & start_pos,
         PaddedPODArray<UInt64> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null,
-        size_t input_rows_count)
+        [[maybe_unused]] ColumnUInt8 * res_null)
     {
-        chassert(input_rows_count == haystack_offsets.size());
-
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
-        chassert(!res_null);
+        assert(!res_null);
 
         ColumnString::Offset prev_haystack_offset = 0;
         ColumnString::Offset prev_needle_offset = 0;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        size_t size = haystack_offsets.size();
+
+        for (size_t i = 0; i < size; ++i)
         {
             size_t needle_size = needle_offsets[i] - prev_needle_offset - 1;
             size_t haystack_size = haystack_offsets[i] - prev_haystack_offset - 1;
@@ -211,18 +207,17 @@ struct CountSubstringsImpl
         const ColumnString::Offsets & needle_offsets,
         const ColumnPtr & start_pos,
         PaddedPODArray<UInt64> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null,
-        size_t input_rows_count)
+        [[maybe_unused]] ColumnUInt8 * res_null)
     {
-        chassert(input_rows_count == needle_offsets.size());
-
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
-        chassert(!res_null);
+        assert(!res_null);
 
         /// NOTE You could use haystack indexing. But this is a rare case.
         ColumnString::Offset prev_needle_offset = 0;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        size_t size = needle_offsets.size();
+
+        for (size_t i = 0; i < size; ++i)
         {
             res[i] = 0;
             auto start = start_pos != nullptr ? std::max(start_pos->getUInt(i), UInt64(1)) : UInt64(1);
diff --git a/src/Functions/CustomWeekTransforms.h b/src/Functions/CustomWeekTransforms.h
index 5b4de765362..75fb3c32f16 100644
--- a/src/Functions/CustomWeekTransforms.h
+++ b/src/Functions/CustomWeekTransforms.h
@@ -32,12 +32,13 @@ struct WeekTransformer
     {}
 
     template <typename FromVectorType, typename ToVectorType>
-    void vector(const FromVectorType & vec_from, ToVectorType & vec_to, UInt8 week_mode, const DateLUTImpl & time_zone, size_t input_rows_count) const
+    void vector(const FromVectorType & vec_from, ToVectorType & vec_to, UInt8 week_mode, const DateLUTImpl & time_zone) const
     {
         using ValueType = typename ToVectorType::value_type;
-        vec_to.resize(input_rows_count);
+        size_t size = vec_from.size();
+        vec_to.resize(size);
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             if constexpr (is_extended_result)
                 vec_to[i] = static_cast<ValueType>(transform.executeExtendedResult(vec_from[i], week_mode, time_zone));
@@ -55,7 +56,7 @@ template <typename FromDataType, typename ToDataType, bool is_extended_result =
 struct CustomWeekTransformImpl
 {
     template <typename Transform>
-    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count, Transform 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>{transform};
 
@@ -76,9 +77,9 @@ struct CustomWeekTransformImpl
             const auto * sources = checkAndGetColumn<DataTypeString::ColumnType>(source_col.get());
 
             auto col_to = ToDataType::ColumnType::create();
-            col_to->getData().resize(input_rows_count);
+            col_to->getData().resize(sources->size());
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < sources->size(); ++i)
             {
                 DateTime64 dt64;
                 ReadBufferFromString buf(sources->getDataAt(i).toView());
@@ -91,7 +92,7 @@ struct CustomWeekTransformImpl
         else if (const auto * sources = checkAndGetColumn<typename FromDataType::ColumnType>(source_col.get()))
         {
             auto col_to = ToDataType::ColumnType::create();
-            op.vector(sources->getData(), col_to->getData(), week_mode, time_zone, input_rows_count);
+            op.vector(sources->getData(), col_to->getData(), week_mode, time_zone);
             return col_to;
         }
         else
diff --git a/src/Functions/DateTimeTransforms.h b/src/Functions/DateTimeTransforms.h
index d6d533f16ed..5f745f3ccad 100644
--- a/src/Functions/DateTimeTransforms.h
+++ b/src/Functions/DateTimeTransforms.h
@@ -381,13 +381,11 @@ struct ToStartOfWeekImpl
 
     static UInt16 execute(Int64 t, UInt8 week_mode, const DateLUTImpl & time_zone)
     {
-        const int res = time_zone.toFirstDayNumOfWeek(time_zone.toDayNum(t), week_mode);
-        return std::max(res, 0);
+        return time_zone.toFirstDayNumOfWeek(time_zone.toDayNum(t), week_mode);
     }
     static UInt16 execute(UInt32 t, UInt8 week_mode, const DateLUTImpl & time_zone)
     {
-        const int res = time_zone.toFirstDayNumOfWeek(time_zone.toDayNum(t), week_mode);
-        return std::max(res, 0);
+        return time_zone.toFirstDayNumOfWeek(time_zone.toDayNum(t), week_mode);
     }
     static UInt16 execute(Int32 d, UInt8 week_mode, const DateLUTImpl & time_zone)
     {
@@ -492,7 +490,7 @@ struct ToStartOfInterval<IntervalKind::Kind::Nanosecond>
     {
         throwDateTimeIsNotSupported(TO_START_OF_INTERVAL_NAME);
     }
-    static Int64 execute(Int64 t, Int64 nanoseconds, const DateLUTImpl &, Int64 scale_multiplier, Int64 /*origin*/ = 0)
+    static Int64 execute(Int64 t, Int64 nanoseconds, const DateLUTImpl &, Int64 scale_multiplier)
     {
         if (scale_multiplier < 1000000000)
         {
@@ -527,7 +525,7 @@ struct ToStartOfInterval<IntervalKind::Kind::Microsecond>
     {
         throwDateTimeIsNotSupported(TO_START_OF_INTERVAL_NAME);
     }
-    static Int64 execute(Int64 t, Int64 microseconds, const DateLUTImpl &, Int64 scale_multiplier, Int64 /*origin*/ = 0)
+    static Int64 execute(Int64 t, Int64 microseconds, const DateLUTImpl &, Int64 scale_multiplier)
     {
         if (scale_multiplier < 1000000)
         {
@@ -570,7 +568,7 @@ struct ToStartOfInterval<IntervalKind::Kind::Millisecond>
     {
         throwDateTimeIsNotSupported(TO_START_OF_INTERVAL_NAME);
     }
-    static Int64 execute(Int64 t, Int64 milliseconds, const DateLUTImpl &, Int64 scale_multiplier, Int64 /*origin*/ = 0)
+    static Int64 execute(Int64 t, Int64 milliseconds, const DateLUTImpl &, Int64 scale_multiplier)
     {
         if (scale_multiplier < 1000)
         {
@@ -613,7 +611,7 @@ struct ToStartOfInterval<IntervalKind::Kind::Second>
     {
         return time_zone.toStartOfSecondInterval(t, seconds);
     }
-    static Int64 execute(Int64 t, Int64 seconds, const DateLUTImpl & time_zone, Int64 scale_multiplier, Int64 /*origin*/ = 0)
+    static Int64 execute(Int64 t, Int64 seconds, const DateLUTImpl & time_zone, Int64 scale_multiplier)
     {
         return time_zone.toStartOfSecondInterval(t / scale_multiplier, seconds);
     }
@@ -634,7 +632,7 @@ struct ToStartOfInterval<IntervalKind::Kind::Minute>
     {
         return time_zone.toStartOfMinuteInterval(t, minutes);
     }
-    static Int64 execute(Int64 t, Int64 minutes, const DateLUTImpl & time_zone, Int64 scale_multiplier, Int64 /*origin*/ = 0)
+    static Int64 execute(Int64 t, Int64 minutes, const DateLUTImpl & time_zone, Int64 scale_multiplier)
     {
         return time_zone.toStartOfMinuteInterval(t / scale_multiplier, minutes);
     }
@@ -655,7 +653,7 @@ struct ToStartOfInterval<IntervalKind::Kind::Hour>
     {
         return time_zone.toStartOfHourInterval(t, hours);
     }
-    static Int64 execute(Int64 t, Int64 hours, const DateLUTImpl & time_zone, Int64 scale_multiplier, Int64 /*origin*/ = 0)
+    static Int64 execute(Int64 t, Int64 hours, const DateLUTImpl & time_zone, Int64 scale_multiplier)
     {
         return time_zone.toStartOfHourInterval(t / scale_multiplier, hours);
     }
@@ -676,7 +674,7 @@ struct ToStartOfInterval<IntervalKind::Kind::Day>
     {
         return static_cast<UInt32>(time_zone.toStartOfDayInterval(time_zone.toDayNum(t), days));
     }
-    static Int64 execute(Int64 t, Int64 days, const DateLUTImpl & time_zone, Int64 scale_multiplier, Int64 /*origin*/ = 0)
+    static Int64 execute(Int64 t, Int64 days, const DateLUTImpl & time_zone, Int64 scale_multiplier)
     {
         return time_zone.toStartOfDayInterval(time_zone.toDayNum(t / scale_multiplier), days);
     }
@@ -697,13 +695,9 @@ struct ToStartOfInterval<IntervalKind::Kind::Week>
     {
         return time_zone.toStartOfWeekInterval(time_zone.toDayNum(t), weeks);
     }
-    static Int64 execute(Int64 t, Int64 weeks, const DateLUTImpl & time_zone, Int64 scale_multiplier, Int64 origin = 0)
+    static UInt16 execute(Int64 t, Int64 weeks, const DateLUTImpl & time_zone, Int64 scale_multiplier)
     {
-        if (origin == 0)
-            return time_zone.toStartOfWeekInterval(time_zone.toDayNum(t / scale_multiplier), weeks);
-        else
-            return ToStartOfInterval<IntervalKind::Kind::Day>::execute(t, weeks * 7, time_zone, scale_multiplier, origin);
-
+        return time_zone.toStartOfWeekInterval(time_zone.toDayNum(t / scale_multiplier), weeks);
     }
 };
 
@@ -722,23 +716,9 @@ struct ToStartOfInterval<IntervalKind::Kind::Month>
     {
         return time_zone.toStartOfMonthInterval(time_zone.toDayNum(t), months);
     }
-    static Int64 execute(Int64 t, Int64 months, const DateLUTImpl & time_zone, Int64 scale_multiplier, Int64 origin = 0)
+    static UInt16 execute(Int64 t, Int64 months, const DateLUTImpl & time_zone, Int64 scale_multiplier)
     {
-        const Int64 scaled_time = t / scale_multiplier;
-        if (origin == 0)
-            return time_zone.toStartOfMonthInterval(time_zone.toDayNum(scaled_time), months);
-        else
-        {
-            const Int64 scaled_origin = origin / scale_multiplier;
-            const Int64 days = time_zone.toDayOfMonth(scaled_time + scaled_origin) - time_zone.toDayOfMonth(scaled_origin);
-            Int64 months_to_add = time_zone.toMonth(scaled_time + scaled_origin) - time_zone.toMonth(scaled_origin);
-            const Int64 years = time_zone.toYear(scaled_time + scaled_origin) - time_zone.toYear(scaled_origin);
-            months_to_add = days < 0 ? months_to_add - 1 : months_to_add;
-            months_to_add += years * 12;
-            Int64 month_multiplier = (months_to_add / months) * months;
-
-            return (time_zone.addMonths(time_zone.toDate(scaled_origin), month_multiplier) - time_zone.toDate(scaled_origin));
-        }
+        return time_zone.toStartOfMonthInterval(time_zone.toDayNum(t / scale_multiplier), months);
     }
 };
 
@@ -757,12 +737,9 @@ struct ToStartOfInterval<IntervalKind::Kind::Quarter>
     {
         return time_zone.toStartOfQuarterInterval(time_zone.toDayNum(t), quarters);
     }
-    static Int64 execute(Int64 t, Int64 quarters, const DateLUTImpl & time_zone, Int64 scale_multiplier, Int64 origin = 0)
+    static UInt16 execute(Int64 t, Int64 quarters, const DateLUTImpl & time_zone, Int64 scale_multiplier)
     {
-        if (origin == 0)
-            return time_zone.toStartOfQuarterInterval(time_zone.toDayNum(t / scale_multiplier), quarters);
-        else
-            return ToStartOfInterval<IntervalKind::Kind::Month>::execute(t, quarters * 3, time_zone, scale_multiplier, origin);
+        return time_zone.toStartOfQuarterInterval(time_zone.toDayNum(t / scale_multiplier), quarters);
     }
 };
 
@@ -781,12 +758,9 @@ struct ToStartOfInterval<IntervalKind::Kind::Year>
     {
         return time_zone.toStartOfYearInterval(time_zone.toDayNum(t), years);
     }
-    static Int64 execute(Int64 t, Int64 years, const DateLUTImpl & time_zone, Int64 scale_multiplier, Int64 origin = 0)
+    static UInt16 execute(Int64 t, Int64 years, const DateLUTImpl & time_zone, Int64 scale_multiplier)
     {
-        if (origin == 0)
-            return time_zone.toStartOfYearInterval(time_zone.toDayNum(t / scale_multiplier), years);
-        else
-            return ToStartOfInterval<IntervalKind::Kind::Month>::execute(t, years * 12, time_zone, scale_multiplier, origin);
+        return time_zone.toStartOfYearInterval(time_zone.toDayNum(t / scale_multiplier), years);
     }
 };
 
@@ -1222,7 +1196,7 @@ struct ToYearImpl
     {
         if (point.getType() != Field::Types::UInt64) return std::nullopt;
 
-        auto year = point.safeGet<UInt64>();
+        auto year = point.get<UInt64>();
         if (year < DATE_LUT_MIN_YEAR || year >= DATE_LUT_MAX_YEAR) return std::nullopt;
 
         const DateLUTImpl & date_lut = DateLUT::instance("UTC");
@@ -2027,7 +2001,7 @@ struct ToYYYYMMImpl
     {
         if (point.getType() != Field::Types::UInt64) return std::nullopt;
 
-        auto year_month = point.safeGet<UInt64>();
+        auto year_month = point.get<UInt64>();
         auto year = year_month / 100;
         auto month = year_month % 100;
 
@@ -2160,22 +2134,20 @@ struct Transformer
 {
     template <typename FromTypeVector, typename ToTypeVector>
     static void vector(const FromTypeVector & vec_from, ToTypeVector & vec_to, const DateLUTImpl & time_zone, const Transform & transform,
-        [[maybe_unused]] ColumnUInt8::Container * vec_null_map_to, size_t input_rows_count)
+        [[maybe_unused]] ColumnUInt8::Container * vec_null_map_to)
     {
         using ValueType = typename ToTypeVector::value_type;
-        vec_to.resize(input_rows_count);
+        size_t size = vec_from.size();
+        vec_to.resize(size);
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             if constexpr (std::is_same_v<ToType, DataTypeDate> || std::is_same_v<ToType, DataTypeDateTime>)
             {
                 if constexpr (std::is_same_v<Additions, DateTimeAccurateConvertStrategyAdditions>
                     || std::is_same_v<Additions, DateTimeAccurateOrNullConvertStrategyAdditions>)
                 {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wimplicit-const-int-float-conversion"
                     bool is_valid_input = vec_from[i] >= 0 && vec_from[i] <= 0xFFFFFFFFL;
-#pragma clang diagnostic pop
                     if (!is_valid_input)
                     {
                         if constexpr (std::is_same_v<Additions, DateTimeAccurateOrNullConvertStrategyAdditions>)
@@ -2206,7 +2178,7 @@ struct DateTimeTransformImpl
 {
     template <typename Additions = void *>
     static ColumnPtr execute(
-        const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, const Transform & transform = {})
+        const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/, const Transform & transform = {})
     {
         using Op = Transformer<FromDataType, ToDataType, Transform, is_extended_result, Additions>;
 
@@ -2228,7 +2200,7 @@ struct DateTimeTransformImpl
             if (result_data_type.isDateTime() || result_data_type.isDateTime64())
             {
                 const auto & time_zone = dynamic_cast<const TimezoneMixin &>(*result_type).getTimeZone();
-                Op::vector(sources->getData(), col_to->getData(), time_zone, transform, vec_null_map_to, input_rows_count);
+                Op::vector(sources->getData(), col_to->getData(), time_zone, transform, vec_null_map_to);
             }
             else
             {
@@ -2237,13 +2209,15 @@ struct DateTimeTransformImpl
                     time_zone_argument_position = 2;
 
                 const DateLUTImpl & time_zone = extractTimeZoneFromFunctionArguments(arguments, time_zone_argument_position, 0);
-                Op::vector(sources->getData(), col_to->getData(), time_zone, transform, vec_null_map_to, input_rows_count);
+                Op::vector(sources->getData(), col_to->getData(), time_zone, transform, vec_null_map_to);
             }
 
             if constexpr (std::is_same_v<Additions, DateTimeAccurateOrNullConvertStrategyAdditions>)
             {
                 if (vec_null_map_to)
+                {
                     return ColumnNullable::create(std::move(mutable_result_col), std::move(col_null_map_to));
+                }
             }
 
             return mutable_result_col;
diff --git a/src/Functions/EmptyImpl.h b/src/Functions/EmptyImpl.h
index 03675254eb6..d3b2dda024b 100644
--- a/src/Functions/EmptyImpl.h
+++ b/src/Functions/EmptyImpl.h
@@ -21,10 +21,11 @@ struct EmptyImpl
     /// If the function will return constant value for FixedString data type.
     static constexpr auto is_fixed_to_constant = false;
 
-    static void vector(const ColumnString::Chars & /*data*/, const ColumnString::Offsets & offsets, PaddedPODArray<UInt8> & res, size_t input_rows_count)
+    static void vector(const ColumnString::Chars & /*data*/, const ColumnString::Offsets & offsets, PaddedPODArray<UInt8> & res)
     {
+        size_t size = offsets.size();
         ColumnString::Offset prev_offset = 1;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             res[i] = negative ^ (offsets[i] == prev_offset);
             prev_offset = offsets[i] + 1;
@@ -32,40 +33,42 @@ struct EmptyImpl
     }
 
     /// Only make sense if is_fixed_to_constant.
-    static void vectorFixedToConstant(const ColumnString::Chars &, size_t, UInt8 &, size_t)
+    static void vectorFixedToConstant(const ColumnString::Chars & /*data*/, size_t /*n*/, UInt8 & /*res*/)
     {
         throw Exception(ErrorCodes::LOGICAL_ERROR, "'vectorFixedToConstant method' is called");
     }
 
-    static void vectorFixedToVector(const ColumnString::Chars & data, size_t n, PaddedPODArray<UInt8> & res, size_t input_rows_count)
+    static void vectorFixedToVector(const ColumnString::Chars & data, size_t n, PaddedPODArray<UInt8> & res)
     {
-        for (size_t i = 0; i < input_rows_count; ++i)
+        size_t size = data.size() / n;
+        for (size_t i = 0; i < size; ++i)
             res[i] = negative ^ memoryIsZeroSmallAllowOverflow15(data.data() + i * n, n);
     }
 
-    static void array(const ColumnString::Offsets & offsets, PaddedPODArray<UInt8> & res, size_t input_rows_count)
+    static void array(const ColumnString::Offsets & offsets, PaddedPODArray<UInt8> & res)
     {
+        size_t size = offsets.size();
         ColumnString::Offset prev_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             res[i] = negative ^ (offsets[i] == prev_offset);
             prev_offset = offsets[i];
         }
     }
 
-    static void uuid(const ColumnUUID::Container & container, size_t n, PaddedPODArray<UInt8> & res, size_t)
+    static void uuid(const ColumnUUID::Container & container, size_t n, PaddedPODArray<UInt8> & res)
     {
         for (size_t i = 0; i < n; ++i)
             res[i] = negative ^ (container[i].toUnderType() == 0);
     }
 
-    static void ipv6(const ColumnIPv6::Container & container, size_t n, PaddedPODArray<UInt8> & res, size_t)
+    static void ipv6(const ColumnIPv6::Container & container, size_t n, PaddedPODArray<UInt8> & res)
     {
         for (size_t i = 0; i < n; ++i)
             res[i] = negative ^ (container[i].toUnderType() == 0);
     }
 
-    static void ipv4(const ColumnIPv4::Container & container, size_t n, PaddedPODArray<UInt8> & res, size_t)
+    static void ipv4(const ColumnIPv4::Container & container, size_t n, PaddedPODArray<UInt8> & res)
     {
         for (size_t i = 0; i < n; ++i)
             res[i] = negative ^ (container[i].toUnderType() == 0);
diff --git a/src/Functions/ExtractString.h b/src/Functions/ExtractString.h
index 9f039f86b18..6beb8be830a 100644
--- a/src/Functions/ExtractString.h
+++ b/src/Functions/ExtractString.h
@@ -20,7 +20,7 @@ namespace DB
 // includes extracting ASCII ngram, UTF8 ngram, ASCII word and UTF8 word
 struct ExtractStringImpl
 {
-    static const UInt8 * readOneWord(const UInt8 *& pos, const UInt8 * end)
+    static ALWAYS_INLINE inline const UInt8 * readOneWord(const UInt8 *& pos, const UInt8 * end)
     {
         // jump separators
         while (pos < end && isUTF8Sep(*pos))
diff --git a/src/Functions/FunctionBase58Conversion.h b/src/Functions/FunctionBase58Conversion.h
index a34a36d8b81..e519f9768cc 100644
--- a/src/Functions/FunctionBase58Conversion.h
+++ b/src/Functions/FunctionBase58Conversion.h
@@ -18,7 +18,6 @@ namespace ErrorCodes
     extern const int ILLEGAL_COLUMN;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int BAD_ARGUMENTS;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
 struct Base58Encode
@@ -136,7 +135,7 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         if (arguments.size() != 1)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Wrong number of arguments for function {}: 1 expected.", getName());
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Wrong number of arguments for function {}: 1 expected.", getName());
 
         if (!isString(arguments[0].type))
             throw Exception(
diff --git a/src/Functions/FunctionBitTestMany.h b/src/Functions/FunctionBitTestMany.h
index 514b78ce59f..950e4ab4ea8 100644
--- a/src/Functions/FunctionBitTestMany.h
+++ b/src/Functions/FunctionBitTestMany.h
@@ -46,7 +46,7 @@ public:
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of first argument of function {}", first_arg->getName(), getName());
 
 
-        for (size_t i = 1; i < arguments.size(); ++i)
+        for (const auto i : collections::range(1, arguments.size()))
         {
             const auto & pos_arg = arguments[i];
 
@@ -57,19 +57,19 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    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
     {
         const auto * value_col = arguments.front().column.get();
 
         ColumnPtr res;
-        if (!((res = execute<UInt8>(arguments, result_type, value_col, input_rows_count))
-            || (res = execute<UInt16>(arguments, result_type, value_col, input_rows_count))
-            || (res = execute<UInt32>(arguments, result_type, value_col, input_rows_count))
-            || (res = execute<UInt64>(arguments, result_type, value_col, input_rows_count))
-            || (res = execute<Int8>(arguments, result_type, value_col, input_rows_count))
-            || (res = execute<Int16>(arguments, result_type, value_col, input_rows_count))
-            || (res = execute<Int32>(arguments, result_type, value_col, input_rows_count))
-            || (res = execute<Int64>(arguments, result_type, value_col, input_rows_count))))
+        if (!((res = execute<UInt8>(arguments, result_type, value_col))
+            || (res = execute<UInt16>(arguments, result_type, value_col))
+            || (res = execute<UInt32>(arguments, result_type, value_col))
+            || (res = execute<UInt64>(arguments, result_type, value_col))
+            || (res = execute<Int8>(arguments, result_type, value_col))
+            || (res = execute<Int16>(arguments, result_type, value_col))
+            || (res = execute<Int32>(arguments, result_type, value_col))
+            || (res = execute<Int64>(arguments, result_type, value_col))))
             throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of argument of function {}", value_col->getName(), getName());
 
         return res;
@@ -79,28 +79,28 @@ private:
     template <typename T>
     ColumnPtr execute(
             const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
-            const IColumn * const value_col_untyped,
-            size_t input_rows_count) const
+            const IColumn * const value_col_untyped) const
     {
         if (const auto value_col = checkAndGetColumn<ColumnVector<T>>(value_col_untyped))
         {
+            const auto size = value_col->size();
             bool is_const;
             const auto const_mask = createConstMaskIfConst<T>(arguments, is_const);
             const auto & val = value_col->getData();
 
-            auto out_col = ColumnVector<UInt8>::create(input_rows_count);
+            auto out_col = ColumnVector<UInt8>::create(size);
             auto & out = out_col->getData();
 
             if (is_const)
             {
-                for (size_t i = 0; i < input_rows_count; ++i)
+                for (const auto i : collections::range(0, size))
                     out[i] = Impl::apply(val[i], const_mask);
             }
             else
             {
-                const auto mask = createMask<T>(input_rows_count, arguments);
+                const auto mask = createMask<T>(size, arguments);
 
-                for (size_t i = 0; i < input_rows_count; ++i)
+                for (const auto i : collections::range(0, size))
                     out[i] = Impl::apply(val[i], mask[i]);
             }
 
@@ -108,22 +108,23 @@ private:
         }
         else if (const auto value_col_const = checkAndGetColumnConst<ColumnVector<T>>(value_col_untyped))
         {
+            const auto size = value_col_const->size();
             bool is_const;
             const auto const_mask = createConstMaskIfConst<T>(arguments, is_const);
             const auto val = value_col_const->template getValue<T>();
 
             if (is_const)
             {
-                return result_type->createColumnConst(input_rows_count, toField(Impl::apply(val, const_mask)));
+                return result_type->createColumnConst(size, toField(Impl::apply(val, const_mask)));
             }
             else
             {
-                const auto mask = createMask<T>(input_rows_count, arguments);
-                auto out_col = ColumnVector<UInt8>::create(input_rows_count);
+                const auto mask = createMask<T>(size, arguments);
+                auto out_col = ColumnVector<UInt8>::create(size);
 
                 auto & out = out_col->getData();
 
-                for (size_t i = 0; i < input_rows_count; ++i)
+                for (const auto i : collections::range(0, size))
                     out[i] = Impl::apply(val, mask[i]);
 
                 return out_col;
@@ -139,7 +140,7 @@ private:
         out_is_const = true;
         ValueType mask = 0;
 
-        for (size_t i = 1; i < arguments.size(); ++i)
+        for (const auto i : collections::range(1, arguments.size()))
         {
             if (auto pos_col_const = checkAndGetColumnConst<ColumnVector<ValueType>>(arguments[i].column.get()))
             {
@@ -165,7 +166,7 @@ private:
     {
         PaddedPODArray<ValueType> mask(size, ValueType{});
 
-        for (size_t i = 1; i < arguments.size(); ++i)
+        for (const auto i : collections::range(1, arguments.size()))
         {
             const auto * pos_col = arguments[i].column.get();
 
@@ -186,7 +187,7 @@ private:
         {
             const auto & pos = pos_col->getData();
 
-            for (size_t i = 0; i < mask.size(); ++i)
+            for (const auto i : collections::range(0, mask.size()))
                 if (pos[i] < 8 * sizeof(ValueType))
                     mask[i] = mask[i] | (ValueType(1) << pos[i]);
                 else
@@ -204,7 +205,7 @@ private:
 
             const auto new_mask = ValueType(1) << pos;
 
-            for (size_t i = 0; i < mask.size(); ++i)
+            for (const auto i : collections::range(0, mask.size()))
                 mask[i] = mask[i] | new_mask;
 
             return true;
diff --git a/src/Functions/FunctionChar.cpp b/src/Functions/FunctionChar.cpp
index dbdb7692177..0ebe1442f08 100644
--- a/src/Functions/FunctionChar.cpp
+++ b/src/Functions/FunctionChar.cpp
@@ -15,7 +15,6 @@ namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int ILLEGAL_COLUMN;
-    extern const int TOO_FEW_ARGUMENTS_FOR_FUNCTION;
 }
 
 class FunctionChar : public IFunction
@@ -37,7 +36,7 @@ public:
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (arguments.empty())
-            throw Exception(ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION,
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                             "Number of arguments for function {} can't be {}, should be at least 1",
                             getName(), arguments.size());
 
@@ -103,11 +102,14 @@ private:
         const ColumnVector<T> * src_data_concrete = checkAndGetColumn<ColumnVector<T>>(&src_data);
 
         if (!src_data_concrete)
+        {
             return false;
+        }
 
         for (size_t row = 0; row < rows; ++row)
+        {
             out_vec[row * size_per_row + column_idx] = static_cast<char>(src_data_concrete->getInt(row));
-
+        }
         return true;
     }
 };
diff --git a/src/Functions/FunctionDateOrDateTimeAddInterval.h b/src/Functions/FunctionDateOrDateTimeAddInterval.h
index 25231b8887b..f50b1415622 100644
--- a/src/Functions/FunctionDateOrDateTimeAddInterval.h
+++ b/src/Functions/FunctionDateOrDateTimeAddInterval.h
@@ -428,17 +428,19 @@ struct Processor
     {}
 
     template <typename FromColumnType, typename ToColumnType>
-    void NO_INLINE vectorConstant(const FromColumnType & col_from, ToColumnType & col_to, Int64 delta, const DateLUTImpl & time_zone, UInt16 scale, size_t input_rows_count) const
+    void NO_INLINE vectorConstant(const FromColumnType & col_from, ToColumnType & col_to, Int64 delta, const DateLUTImpl & time_zone, UInt16 scale) const
     {
         static const DateLUTImpl & utc_time_zone = DateLUT::instance("UTC");
 
         if constexpr (std::is_same_v<FromColumnType, ColumnString>)
         {
+            const auto & offsets_from = col_from.getOffsets();
             auto & vec_to = col_to.getData();
 
-            vec_to.resize(input_rows_count);
+            size_t size = offsets_from.size();
+            vec_to.resize(size);
 
-            for (size_t i = 0 ; i < input_rows_count; ++i)
+            for (size_t i = 0 ; i < size; ++i)
             {
                 std::string_view from = col_from.getDataAt(i).toView();
                 vec_to[i] = transform.execute(from, checkOverflow(delta), time_zone, utc_time_zone, scale);
@@ -449,31 +451,32 @@ struct Processor
             const auto & vec_from = col_from.getData();
             auto & vec_to = col_to.getData();
 
-            vec_to.resize(input_rows_count);
+            size_t size = vec_from.size();
+            vec_to.resize(size);
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
                 vec_to[i] = transform.execute(vec_from[i], checkOverflow(delta), time_zone, utc_time_zone, scale);
         }
     }
 
     template <typename FromColumnType, typename ToColumnType>
-    void vectorVector(const FromColumnType & col_from, ToColumnType & col_to, const IColumn & delta, const DateLUTImpl & time_zone, UInt16 scale, size_t input_rows_count) const
+    void vectorVector(const FromColumnType & col_from, ToColumnType & col_to, const IColumn & delta, const DateLUTImpl & time_zone, UInt16 scale) const
     {
         castTypeToEither<
             ColumnUInt8, ColumnUInt16, ColumnUInt32, ColumnUInt64,
             ColumnInt8, ColumnInt16, ColumnInt32, ColumnInt64,
             ColumnFloat32, ColumnFloat64>(
-            &delta, [&](const auto & column){ vectorVector(col_from, col_to, column, time_zone, scale, input_rows_count); return true; });
+            &delta, [&](const auto & column){ vectorVector(col_from, col_to, column, time_zone, scale); return true; });
     }
 
     template <typename FromType, typename ToColumnType>
-    void constantVector(const FromType & from, ToColumnType & col_to, const IColumn & delta, const DateLUTImpl & time_zone, UInt16 scale, size_t input_rows_count) const
+    void constantVector(const FromType & from, ToColumnType & col_to, const IColumn & delta, const DateLUTImpl & time_zone, UInt16 scale) const
     {
         castTypeToEither<
             ColumnUInt8, ColumnUInt16, ColumnUInt32, ColumnUInt64,
             ColumnInt8, ColumnInt16, ColumnInt32, ColumnInt64,
             ColumnFloat32, ColumnFloat64>(
-            &delta, [&](const auto & column){ constantVector(from, col_to, column, time_zone, scale, input_rows_count); return true; });
+            &delta, [&](const auto & column){ constantVector(from, col_to, column, time_zone, scale); return true; });
     }
 
 private:
@@ -488,17 +491,19 @@ private:
 
     template <typename FromColumnType, typename ToColumnType, typename DeltaColumnType>
     NO_INLINE NO_SANITIZE_UNDEFINED void vectorVector(
-        const FromColumnType & col_from, ToColumnType & col_to, const DeltaColumnType & delta, const DateLUTImpl & time_zone, UInt16 scale, size_t input_rows_count) const
+        const FromColumnType & col_from, ToColumnType & col_to, const DeltaColumnType & delta, const DateLUTImpl & time_zone, UInt16 scale) const
     {
         static const DateLUTImpl & utc_time_zone = DateLUT::instance("UTC");
 
         if constexpr (std::is_same_v<FromColumnType, ColumnString>)
         {
+            const auto & offsets_from = col_from.getOffsets();
             auto & vec_to = col_to.getData();
 
-            vec_to.resize(input_rows_count);
+            size_t size = offsets_from.size();
+            vec_to.resize(size);
 
-            for (size_t i = 0 ; i < input_rows_count; ++i)
+            for (size_t i = 0 ; i < size; ++i)
             {
                 std::string_view from = col_from.getDataAt(i).toView();
                 vec_to[i] = transform.execute(from, checkOverflow(delta.getData()[i]), time_zone, utc_time_zone, scale);
@@ -509,24 +514,26 @@ private:
             const auto & vec_from = col_from.getData();
             auto & vec_to = col_to.getData();
 
-            vec_to.resize(input_rows_count);
+            size_t size = vec_from.size();
+            vec_to.resize(size);
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
                 vec_to[i] = transform.execute(vec_from[i], checkOverflow(delta.getData()[i]), time_zone, utc_time_zone, scale);
         }
     }
 
     template <typename FromType, typename ToColumnType, typename DeltaColumnType>
     NO_INLINE NO_SANITIZE_UNDEFINED void constantVector(
-        const FromType & from, ToColumnType & col_to, const DeltaColumnType & delta, const DateLUTImpl & time_zone, UInt16 scale, size_t input_rows_count) const
+        const FromType & from, ToColumnType & col_to, const DeltaColumnType & delta, const DateLUTImpl & time_zone, UInt16 scale) const
     {
         static const DateLUTImpl & utc_time_zone = DateLUT::instance("UTC");
 
         auto & vec_to = col_to.getData();
 
-        vec_to.resize(input_rows_count);
+        size_t size = delta.size();
+        vec_to.resize(size);
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
             vec_to[i] = transform.execute(from, checkOverflow(delta.getData()[i]), time_zone, utc_time_zone, scale);
     }
 };
@@ -535,7 +542,7 @@ private:
 template <typename FromDataType, typename ToDataType, typename Transform>
 struct DateTimeAddIntervalImpl
 {
-    static ColumnPtr execute(Transform transform, const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, UInt16 scale, size_t input_rows_count)
+    static ColumnPtr execute(Transform transform, const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, UInt16 scale)
     {
         using FromValueType = typename FromDataType::FieldType;
         using FromColumnType = typename FromDataType::ColumnType;
@@ -554,15 +561,15 @@ struct DateTimeAddIntervalImpl
         if (const auto * sources = checkAndGetColumn<FromColumnType>(&source_column))
         {
             if (const auto * delta_const_column = typeid_cast<const ColumnConst *>(&delta_column))
-                processor.vectorConstant(*sources, *col_to, delta_const_column->getInt(0), time_zone, scale, input_rows_count);
+                processor.vectorConstant(*sources, *col_to, delta_const_column->getInt(0), time_zone, scale);
             else
-                processor.vectorVector(*sources, *col_to, delta_column, time_zone, scale, input_rows_count);
+                processor.vectorVector(*sources, *col_to, delta_column, time_zone, scale);
         }
         else if (const auto * sources_const = checkAndGetColumnConst<FromColumnType>(&source_column))
         {
             processor.constantVector(
                 sources_const->template getValue<FromValueType>(),
-                *col_to, delta_column, time_zone, scale, input_rows_count);
+                *col_to, delta_column, time_zone, scale);
         }
         else
         {
@@ -701,25 +708,25 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {2}; }
 
-    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
     {
         const IDataType * from_type = arguments[0].type.get();
         WhichDataType which(from_type);
 
         if (which.isDate())
-            return DateTimeAddIntervalImpl<DataTypeDate, TransformResultDataType<DataTypeDate>, Transform>::execute(Transform{}, arguments, result_type, 0, input_rows_count);
+            return DateTimeAddIntervalImpl<DataTypeDate, TransformResultDataType<DataTypeDate>, Transform>::execute(Transform{}, arguments, result_type, 0);
         else if (which.isDate32())
-            return DateTimeAddIntervalImpl<DataTypeDate32, TransformResultDataType<DataTypeDate32>, Transform>::execute(Transform{}, arguments, result_type, 0, input_rows_count);
+            return DateTimeAddIntervalImpl<DataTypeDate32, TransformResultDataType<DataTypeDate32>, Transform>::execute(Transform{}, arguments, result_type, 0);
         else if (which.isDateTime())
-            return DateTimeAddIntervalImpl<DataTypeDateTime, TransformResultDataType<DataTypeDateTime>, Transform>::execute(Transform{}, arguments, result_type, 0, input_rows_count);
+            return DateTimeAddIntervalImpl<DataTypeDateTime, TransformResultDataType<DataTypeDateTime>, Transform>::execute(Transform{}, arguments, result_type, 0);
         else if (which.isDateTime64())
         {
             const auto * datetime64_type = assert_cast<const DataTypeDateTime64 *>(from_type);
             auto from_scale = datetime64_type->getScale();
-            return DateTimeAddIntervalImpl<DataTypeDateTime64, TransformResultDataType<DataTypeDateTime64>, Transform>::execute(Transform{}, arguments, result_type, from_scale, input_rows_count);
+            return DateTimeAddIntervalImpl<DataTypeDateTime64, TransformResultDataType<DataTypeDateTime64>, Transform>::execute(Transform{}, arguments, result_type, from_scale);
         }
         else if (which.isString())
-            return DateTimeAddIntervalImpl<DataTypeString, DataTypeDateTime64, Transform>::execute(Transform{}, arguments, result_type, 3, input_rows_count);
+            return DateTimeAddIntervalImpl<DataTypeString, DataTypeDateTime64, Transform>::execute(Transform{}, arguments, result_type, 3);
         else
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of first argument of function {}", arguments[0].type->getName(), getName());
     }
diff --git a/src/Functions/FunctionMathBinaryFloat64.h b/src/Functions/FunctionMathBinaryFloat64.h
index 82ff6ae7fbf..1b75ee688f4 100644
--- a/src/Functions/FunctionMathBinaryFloat64.h
+++ b/src/Functions/FunctionMathBinaryFloat64.h
@@ -54,7 +54,7 @@ private:
     }
 
     template <typename LeftType, typename RightType>
-    static ColumnPtr executeTyped(const ColumnConst * left_arg, const IColumn * right_arg, size_t input_rows_count)
+    static ColumnPtr executeTyped(const ColumnConst * left_arg, const IColumn * right_arg)
     {
         if (const auto right_arg_typed = checkAndGetColumn<ColumnVector<RightType>>(right_arg))
         {
@@ -63,11 +63,12 @@ private:
             LeftType left_src_data[Impl::rows_per_iteration];
             std::fill(std::begin(left_src_data), std::end(left_src_data), left_arg->template getValue<LeftType>());
             const auto & right_src_data = right_arg_typed->getData();
+            const auto src_size = right_src_data.size();
             auto & dst_data = dst->getData();
-            dst_data.resize(input_rows_count);
+            dst_data.resize(src_size);
 
-            const auto rows_remaining = input_rows_count % Impl::rows_per_iteration;
-            const auto rows_size = input_rows_count - rows_remaining;
+            const auto rows_remaining = src_size % Impl::rows_per_iteration;
+            const auto rows_size = src_size - rows_remaining;
 
             for (size_t i = 0; i < rows_size; i += Impl::rows_per_iteration)
                 Impl::execute(left_src_data, &right_src_data[i], &dst_data[i]);
@@ -91,7 +92,7 @@ private:
     }
 
     template <typename LeftType, typename RightType>
-    static ColumnPtr executeTyped(const ColumnVector<LeftType> * left_arg, const IColumn * right_arg, size_t input_rows_count)
+    static ColumnPtr executeTyped(const ColumnVector<LeftType> * left_arg, const IColumn * right_arg)
     {
         if (const auto right_arg_typed = checkAndGetColumn<ColumnVector<RightType>>(right_arg))
         {
@@ -99,11 +100,12 @@ private:
 
             const auto & left_src_data = left_arg->getData();
             const auto & right_src_data = right_arg_typed->getData();
+            const auto src_size = left_src_data.size();
             auto & dst_data = dst->getData();
-            dst_data.resize(input_rows_count);
+            dst_data.resize(src_size);
 
-            const auto rows_remaining = input_rows_count % Impl::rows_per_iteration;
-            const auto rows_size = input_rows_count - rows_remaining;
+            const auto rows_remaining = src_size % Impl::rows_per_iteration;
+            const auto rows_size = src_size - rows_remaining;
 
             for (size_t i = 0; i < rows_size; i += Impl::rows_per_iteration)
                 Impl::execute(&left_src_data[i], &right_src_data[i], &dst_data[i]);
@@ -134,11 +136,12 @@ private:
             const auto & left_src_data = left_arg->getData();
             RightType right_src_data[Impl::rows_per_iteration];
             std::fill(std::begin(right_src_data), std::end(right_src_data), right_arg_typed->template getValue<RightType>());
+            const auto src_size = left_src_data.size();
             auto & dst_data = dst->getData();
-            dst_data.resize(input_rows_count);
+            dst_data.resize(src_size);
 
-            const auto rows_remaining = input_rows_count % Impl::rows_per_iteration;
-            const auto rows_size = input_rows_count - rows_remaining;
+            const auto rows_remaining = src_size % Impl::rows_per_iteration;
+            const auto rows_size = src_size - rows_remaining;
 
             for (size_t i = 0; i < rows_size; i += Impl::rows_per_iteration)
                 Impl::execute(&left_src_data[i], right_src_data, &dst_data[i]);
@@ -162,7 +165,7 @@ private:
         return nullptr;
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnWithTypeAndName & col_left = arguments[0];
         const ColumnWithTypeAndName & col_right = arguments[1];
@@ -199,7 +202,7 @@ private:
 
             if (const auto left_arg_typed = checkAndGetColumn<ColVecLeft>(left_arg))
             {
-                if ((res = executeTyped<LeftType, RightType>(left_arg_typed, right_arg, input_rows_count)))
+                if ((res = executeTyped<LeftType, RightType>(left_arg_typed, right_arg)))
                     return true;
 
                 throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of second argument of function {}",
@@ -207,7 +210,7 @@ private:
             }
             if (const auto left_arg_typed = checkAndGetColumnConst<ColVecLeft>(left_arg))
             {
-                if ((res = executeTyped<LeftType, RightType>(left_arg_typed, right_arg, input_rows_count)))
+                if ((res = executeTyped<LeftType, RightType>(left_arg_typed, right_arg)))
                     return true;
 
                 throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of second argument of function {}",
diff --git a/src/Functions/FunctionMathUnary.h b/src/Functions/FunctionMathUnary.h
index 3cc8bf391b4..9f400932356 100644
--- a/src/Functions/FunctionMathUnary.h
+++ b/src/Functions/FunctionMathUnary.h
@@ -106,40 +106,42 @@ private:
     }
 
     template <typename T, typename ReturnType>
-    static ColumnPtr execute(const ColumnVector<T> * col, size_t input_rows_count)
+    static ColumnPtr execute(const ColumnVector<T> * col)
     {
         const auto & src_data = col->getData();
+        const size_t size = src_data.size();
 
         auto dst = ColumnVector<ReturnType>::create();
         auto & dst_data = dst->getData();
-        dst_data.resize(input_rows_count);
+        dst_data.resize(size);
 
-        executeInIterations(src_data.data(), dst_data.data(), input_rows_count);
+        executeInIterations(src_data.data(), dst_data.data(), size);
 
         return dst;
     }
 
     template <typename T, typename ReturnType>
-    static ColumnPtr execute(const ColumnDecimal<T> * col, size_t input_rows_count)
+    static ColumnPtr execute(const ColumnDecimal<T> * col)
     {
         const auto & src_data = col->getData();
+        const size_t size = src_data.size();
         UInt32 scale = col->getScale();
 
         auto dst = ColumnVector<ReturnType>::create();
         auto & dst_data = dst->getData();
-        dst_data.resize(input_rows_count);
+        dst_data.resize(size);
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
             dst_data[i] = DecimalUtils::convertTo<ReturnType>(src_data[i], scale);
 
-        executeInIterations(dst_data.data(), dst_data.data(), input_rows_count);
+        executeInIterations(dst_data.data(), dst_data.data(), size);
 
         return dst;
     }
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnWithTypeAndName & col = arguments[0];
         ColumnPtr res;
@@ -154,7 +156,7 @@ private:
             const auto col_vec = checkAndGetColumn<ColVecType>(col.column.get());
             if (col_vec == nullptr)
                 return false;
-            return (res = execute<Type, ReturnType>(col_vec, input_rows_count)) != nullptr;
+            return (res = execute<Type, ReturnType>(col_vec)) != nullptr;
         };
 
         if (!callOnBasicType<void, true, true, true, false>(col.type->getTypeId(), call))
diff --git a/src/Functions/FunctionNumericPredicate.h b/src/Functions/FunctionNumericPredicate.h
index 97a3639734b..fd495d7e8e7 100644
--- a/src/Functions/FunctionNumericPredicate.h
+++ b/src/Functions/FunctionNumericPredicate.h
@@ -53,37 +53,39 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const auto * in = arguments.front().column.get();
 
         ColumnPtr res;
-        if (!((res = execute<UInt8>(in, input_rows_count))
-            || (res = execute<UInt16>(in, input_rows_count))
-            || (res = execute<UInt32>(in, input_rows_count))
-            || (res = execute<UInt64>(in, input_rows_count))
-            || (res = execute<Int8>(in, input_rows_count))
-            || (res = execute<Int16>(in, input_rows_count))
-            || (res = execute<Int32>(in, input_rows_count))
-            || (res = execute<Int64>(in, input_rows_count))
-            || (res = execute<Float32>(in, input_rows_count))
-            || (res = execute<Float64>(in, input_rows_count))))
+        if (!((res = execute<UInt8>(in))
+            || (res = execute<UInt16>(in))
+            || (res = execute<UInt32>(in))
+            || (res = execute<UInt64>(in))
+            || (res = execute<Int8>(in))
+            || (res = execute<Int16>(in))
+            || (res = execute<Int32>(in))
+            || (res = execute<Int64>(in))
+            || (res = execute<Float32>(in))
+            || (res = execute<Float64>(in))))
             throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}", in->getName(), getName());
 
         return res;
     }
 
     template <typename T>
-    ColumnPtr execute(const IColumn * in_untyped, size_t input_rows_count) const
+    ColumnPtr execute(const IColumn * in_untyped) const
     {
         if (const auto in = checkAndGetColumn<ColumnVector<T>>(in_untyped))
         {
-            auto out = ColumnUInt8::create(input_rows_count);
+            const auto size = in->size();
+
+            auto out = ColumnUInt8::create(size);
 
             const auto & in_data = in->getData();
             auto & out_data = out->getData();
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (const auto i : collections::range(0, size))
                 out_data[i] = Impl::execute(in_data[i]);
 
             return out;
diff --git a/src/Functions/FunctionSQLJSON.h b/src/Functions/FunctionSQLJSON.h
index 4721f858f5c..83ed874c47b 100644
--- a/src/Functions/FunctionSQLJSON.h
+++ b/src/Functions/FunctionSQLJSON.h
@@ -123,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, uint32_t parse_backtracks, bool function_json_value_return_type_allow_complex)
+        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);
@@ -191,7 +191,7 @@ public:
                 {
                     /// Instead of creating a new generator for each row, we can reuse the same one.
                     generator_json_path.reinitialize();
-                    added_to_column = impl.insertResultToColumn(*to, document, generator_json_path, function_json_value_return_type_allow_complex);
+                    added_to_column = impl.insertResultToColumn(*to, document, generator_json_path, context);
                 }
                 if (!added_to_column)
                 {
@@ -204,18 +204,11 @@ public:
 };
 
 template <typename Name, template <typename, typename> typename Impl>
-class FunctionSQLJSON : public IFunction
+class FunctionSQLJSON : public IFunction, WithConstContext
 {
 public:
     static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionSQLJSON>(context_); }
-    explicit FunctionSQLJSON(ContextPtr context_)
-        : max_parser_depth(context_->getSettingsRef().max_parser_depth),
-          max_parser_backtracks(context_->getSettingsRef().max_parser_backtracks),
-          allow_simdjson(context_->getSettingsRef().allow_simdjson),
-          function_json_value_return_type_allow_complex(context_->getSettingsRef().function_json_value_return_type_allow_complex),
-          function_json_value_return_type_allow_nullable(context_->getSettingsRef().function_json_value_return_type_allow_nullable)
-    {
-    }
+    explicit FunctionSQLJSON(ContextPtr context_) : WithConstContext(context_) { }
 
     static constexpr auto name = Name::name;
     String getName() const override { return Name::name; }
@@ -228,7 +221,7 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         return Impl<DummyJSONParser, DefaultJSONStringSerializer<DummyJSONParser::Element>>::getReturnType(
-            Name::name, arguments, function_json_value_return_type_allow_nullable);
+            Name::name, arguments, getContext());
     }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
@@ -238,25 +231,19 @@ public:
         /// 2. Create ASTPtr
         /// 3. Parser(Tokens, ASTPtr) -> complete AST
         /// 4. Execute functions: call getNextItem on generator and handle each item
-        unsigned parse_depth = static_cast<unsigned>(max_parser_depth);
-        unsigned parse_backtracks = static_cast<unsigned>(max_parser_backtracks);
+        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 (allow_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, parse_backtracks, function_json_value_return_type_allow_complex);
+                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, parse_backtracks, function_json_value_return_type_allow_complex);
+                arguments, result_type, input_rows_count, parse_depth, parse_backtracks, getContext());
     }
-private:
-    const size_t max_parser_depth;
-    const size_t max_parser_backtracks;
-    const bool allow_simdjson;
-    const bool function_json_value_return_type_allow_complex;
-    const bool function_json_value_return_type_allow_nullable;
 };
 
 struct NameJSONExists
@@ -280,11 +267,11 @@ class JSONExistsImpl
 public:
     using Element = typename JSONParser::Element;
 
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &, bool) { return std::make_shared<DataTypeUInt8>(); }
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &, const ContextPtr &) { return std::make_shared<DataTypeUInt8>(); }
 
     static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
 
-    static bool insertResultToColumn(IColumn & dest, const Element & root, GeneratorJSONPath<JSONParser> & generator_json_path, bool)
+    static bool insertResultToColumn(IColumn & dest, const Element & root, GeneratorJSONPath<JSONParser> & generator_json_path, const ContextPtr &)
     {
         Element current_element = root;
         VisitorStatus status;
@@ -318,9 +305,9 @@ class JSONValueImpl
 public:
     using Element = typename JSONParser::Element;
 
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &, bool function_json_value_return_type_allow_nullable)
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &, const ContextPtr & context)
     {
-        if (function_json_value_return_type_allow_nullable)
+        if (context->getSettingsRef().function_json_value_return_type_allow_nullable)
         {
             DataTypePtr string_type = std::make_shared<DataTypeString>();
             return std::make_shared<DataTypeNullable>(string_type);
@@ -333,7 +320,7 @@ public:
 
     static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
 
-    static bool insertResultToColumn(IColumn & dest, const Element & root, GeneratorJSONPath<JSONParser> & generator_json_path, bool function_json_value_return_type_allow_complex)
+    static bool insertResultToColumn(IColumn & dest, const Element & root, GeneratorJSONPath<JSONParser> & generator_json_path, const ContextPtr & context)
     {
         Element current_element = root;
         VisitorStatus status;
@@ -342,7 +329,7 @@ public:
         {
             if (status == VisitorStatus::Ok)
             {
-                if (function_json_value_return_type_allow_complex)
+                if (context->getSettingsRef().function_json_value_return_type_allow_complex)
                 {
                     break;
                 }
@@ -396,11 +383,11 @@ class JSONQueryImpl
 public:
     using Element = typename JSONParser::Element;
 
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &, bool) { return std::make_shared<DataTypeString>(); }
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &, const ContextPtr &) { return std::make_shared<DataTypeString>(); }
 
     static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
 
-    static bool insertResultToColumn(IColumn & dest, const Element & root, GeneratorJSONPath<JSONParser> & generator_json_path, bool)
+    static bool insertResultToColumn(IColumn & dest, const Element & root, GeneratorJSONPath<JSONParser> & generator_json_path, const ContextPtr &)
     {
         ColumnString & col_str = assert_cast<ColumnString &>(dest);
 
diff --git a/src/Functions/FunctionSpaceFillingCurve.h b/src/Functions/FunctionSpaceFillingCurve.h
index 76f6678e847..ac9215f88e1 100644
--- a/src/Functions/FunctionSpaceFillingCurve.h
+++ b/src/Functions/FunctionSpaceFillingCurve.h
@@ -132,7 +132,9 @@ public:
         }
         DataTypes types(tuple_size);
         for (size_t i = 0; i < tuple_size; i++)
+        {
             types[i] = std::make_shared<DataTypeUInt64>();
+        }
         return std::make_shared<DataTypeTuple>(types);
     }
 };
diff --git a/src/Functions/FunctionStringOrArrayToT.h b/src/Functions/FunctionStringOrArrayToT.h
index 40f780d82a8..26c740f1fac 100644
--- a/src/Functions/FunctionStringOrArrayToT.h
+++ b/src/Functions/FunctionStringOrArrayToT.h
@@ -71,7 +71,7 @@ public:
 
             typename ColumnVector<ResultType>::Container & vec_res = col_res->getData();
             vec_res.resize(col->size());
-            Impl::vector(col->getChars(), col->getOffsets(), vec_res, input_rows_count);
+            Impl::vector(col->getChars(), col->getOffsets(), vec_res);
 
             return col_res;
         }
@@ -80,7 +80,7 @@ public:
             if (Impl::is_fixed_to_constant)
             {
                 ResultType res = 0;
-                Impl::vectorFixedToConstant(col_fixed->getChars(), col_fixed->getN(), res, input_rows_count);
+                Impl::vectorFixedToConstant(col_fixed->getChars(), col_fixed->getN(), res);
 
                 return result_type->createColumnConst(col_fixed->size(), toField(res));
             }
@@ -90,7 +90,7 @@ public:
 
                 typename ColumnVector<ResultType>::Container & vec_res = col_res->getData();
                 vec_res.resize(col_fixed->size());
-                Impl::vectorFixedToVector(col_fixed->getChars(), col_fixed->getN(), vec_res, input_rows_count);
+                Impl::vectorFixedToVector(col_fixed->getChars(), col_fixed->getN(), vec_res);
 
                 return col_res;
             }
@@ -101,7 +101,7 @@ public:
 
             typename ColumnVector<ResultType>::Container & vec_res = col_res->getData();
             vec_res.resize(col_arr->size());
-            Impl::array(col_arr->getOffsets(), vec_res, input_rows_count);
+            Impl::array(col_arr->getOffsets(), vec_res);
 
             return col_res;
         }
@@ -112,7 +112,7 @@ public:
             vec_res.resize(col_map->size());
             const auto & col_nested = col_map->getNestedColumn();
 
-            Impl::array(col_nested.getOffsets(), vec_res, input_rows_count);
+            Impl::array(col_nested.getOffsets(), vec_res);
             return col_res;
         }
         else if (const ColumnUUID * col_uuid = checkAndGetColumn<ColumnUUID>(column.get()))
@@ -120,7 +120,7 @@ public:
             auto col_res = ColumnVector<ResultType>::create();
             typename ColumnVector<ResultType>::Container & vec_res = col_res->getData();
             vec_res.resize(col_uuid->size());
-            Impl::uuid(col_uuid->getData(), input_rows_count, vec_res, input_rows_count);
+            Impl::uuid(col_uuid->getData(), input_rows_count, vec_res);
             return col_res;
         }
         else if (const ColumnIPv6 * col_ipv6 = checkAndGetColumn<ColumnIPv6>(column.get()))
@@ -128,7 +128,7 @@ public:
             auto col_res = ColumnVector<ResultType>::create();
             typename ColumnVector<ResultType>::Container & vec_res = col_res->getData();
             vec_res.resize(col_ipv6->size());
-            Impl::ipv6(col_ipv6->getData(), input_rows_count, vec_res, input_rows_count);
+            Impl::ipv6(col_ipv6->getData(), input_rows_count, vec_res);
             return col_res;
         }
         else if (const ColumnIPv4 * col_ipv4 = checkAndGetColumn<ColumnIPv4>(column.get()))
@@ -136,7 +136,7 @@ public:
             auto col_res = ColumnVector<ResultType>::create();
             typename ColumnVector<ResultType>::Container & vec_res = col_res->getData();
             vec_res.resize(col_ipv4->size());
-            Impl::ipv4(col_ipv4->getData(), input_rows_count, vec_res, input_rows_count);
+            Impl::ipv4(col_ipv4->getData(), input_rows_count, vec_res);
             return col_res;
         }
         else
diff --git a/src/Functions/FunctionStringReplace.h b/src/Functions/FunctionStringReplace.h
index 432e03bfe9e..b4bcfa514a8 100644
--- a/src/Functions/FunctionStringReplace.h
+++ b/src/Functions/FunctionStringReplace.h
@@ -45,7 +45,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         ColumnPtr column_haystack = arguments[0].column;
         column_haystack = column_haystack->convertToFullColumnIfConst();
@@ -70,8 +70,7 @@ public:
                 col_haystack->getChars(), col_haystack->getOffsets(),
                 col_needle_const->getValue<String>(),
                 col_replacement_const->getValue<String>(),
-                col_res->getChars(), col_res->getOffsets(),
-                input_rows_count);
+                col_res->getChars(), col_res->getOffsets());
             return col_res;
         }
         else if (col_haystack && col_needle_vector && col_replacement_const)
@@ -80,8 +79,7 @@ public:
                 col_haystack->getChars(), col_haystack->getOffsets(),
                 col_needle_vector->getChars(), col_needle_vector->getOffsets(),
                 col_replacement_const->getValue<String>(),
-                col_res->getChars(), col_res->getOffsets(),
-                input_rows_count);
+                col_res->getChars(), col_res->getOffsets());
             return col_res;
         }
         else if (col_haystack && col_needle_const && col_replacement_vector)
@@ -90,8 +88,7 @@ public:
                 col_haystack->getChars(), col_haystack->getOffsets(),
                 col_needle_const->getValue<String>(),
                 col_replacement_vector->getChars(), col_replacement_vector->getOffsets(),
-                col_res->getChars(), col_res->getOffsets(),
-                input_rows_count);
+                col_res->getChars(), col_res->getOffsets());
             return col_res;
         }
         else if (col_haystack && col_needle_vector && col_replacement_vector)
@@ -100,8 +97,7 @@ public:
                 col_haystack->getChars(), col_haystack->getOffsets(),
                 col_needle_vector->getChars(), col_needle_vector->getOffsets(),
                 col_replacement_vector->getChars(), col_replacement_vector->getOffsets(),
-                col_res->getChars(), col_res->getOffsets(),
-                input_rows_count);
+                col_res->getChars(), col_res->getOffsets());
             return col_res;
         }
         else if (col_haystack_fixed && col_needle_const && col_replacement_const)
@@ -110,8 +106,7 @@ public:
                 col_haystack_fixed->getChars(), col_haystack_fixed->getN(),
                 col_needle_const->getValue<String>(),
                 col_replacement_const->getValue<String>(),
-                col_res->getChars(), col_res->getOffsets(),
-                input_rows_count);
+                col_res->getChars(), col_res->getOffsets());
             return col_res;
         }
         else
diff --git a/src/Functions/FunctionStringToString.h b/src/Functions/FunctionStringToString.h
index e0e64e47b49..62d7b09f79e 100644
--- a/src/Functions/FunctionStringToString.h
+++ b/src/Functions/FunctionStringToString.h
@@ -59,19 +59,19 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr column = arguments[0].column;
         if (const ColumnString * col = checkAndGetColumn<ColumnString>(column.get()))
         {
             auto col_res = ColumnString::create();
-            Impl::vector(col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets(), input_rows_count);
+            Impl::vector(col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets());
             return col_res;
         }
         else if (const ColumnFixedString * col_fixed = checkAndGetColumn<ColumnFixedString>(column.get()))
         {
             auto col_res = ColumnFixedString::create(col_fixed->getN());
-            Impl::vectorFixed(col_fixed->getChars(), col_fixed->getN(), col_res->getChars(), input_rows_count);
+            Impl::vectorFixed(col_fixed->getChars(), col_fixed->getN(), col_res->getChars());
             return col_res;
         }
         else
diff --git a/src/Functions/FunctionTokens.h b/src/Functions/FunctionTokens.h
index b6d8e9ee589..f1435ca5651 100644
--- a/src/Functions/FunctionTokens.h
+++ b/src/Functions/FunctionTokens.h
@@ -84,7 +84,7 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>());
     }
 
-    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
     {
         Generator generator;
         generator.init(arguments, max_substrings_includes_remaining_string);
@@ -107,17 +107,18 @@ public:
             const ColumnString::Chars & src_chars = col_str->getChars();
             const ColumnString::Offsets & src_offsets = col_str->getOffsets();
 
-            res_offsets.reserve(input_rows_count);
-            res_strings_offsets.reserve(input_rows_count * 5);    /// Constant 5 - at random.
+            res_offsets.reserve(src_offsets.size());
+            res_strings_offsets.reserve(src_offsets.size() * 5);    /// Constant 5 - at random.
             res_strings_chars.reserve(src_chars.size());
 
             Pos token_begin = nullptr;
             Pos token_end = nullptr;
 
+            size_t size = src_offsets.size();
             ColumnString::Offset current_src_offset = 0;
             ColumnArray::Offset current_dst_offset = 0;
             ColumnString::Offset current_dst_strings_offset = 0;
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 Pos pos = reinterpret_cast<Pos>(&src_chars[current_src_offset]);
                 current_src_offset = src_offsets[i];
diff --git a/src/Functions/FunctionsBinaryRepresentation.cpp b/src/Functions/FunctionsBinaryRepresentation.cpp
index b3861f0394d..f77d2f1f350 100644
--- a/src/Functions/FunctionsBinaryRepresentation.cpp
+++ b/src/Functions/FunctionsBinaryRepresentation.cpp
@@ -632,7 +632,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr & column = arguments[0].column;
 
@@ -646,10 +646,11 @@ public:
             const ColumnString::Chars & in_vec = col->getChars();
             const ColumnString::Offsets & in_offsets = col->getOffsets();
 
-            out_offsets.resize(input_rows_count);
+            size_t size = in_offsets.size();
+            out_offsets.resize(size);
 
             size_t max_out_len = 0;
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < in_offsets.size(); ++i)
             {
                 const size_t len = in_offsets[i] - (i == 0 ? 0 : in_offsets[i - 1])
                     - /* trailing zero symbol that is always added in ColumnString and that is ignored while decoding */ 1;
@@ -661,7 +662,7 @@ public:
             char * pos = begin;
             size_t prev_offset = 0;
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 size_t new_offset = in_offsets[i];
 
@@ -690,14 +691,15 @@ public:
             const ColumnString::Chars & in_vec = col_fix_string->getChars();
             const size_t n = col_fix_string->getN();
 
-            out_offsets.resize(input_rows_count);
-            out_vec.resize(((n + word_size - 1) / word_size + /* trailing zero symbol that is always added by Impl::decode */ 1) * input_rows_count);
+            size_t size = col_fix_string->size();
+            out_offsets.resize(size);
+            out_vec.resize(((n + word_size - 1) / word_size + /* trailing zero symbol that is always added by Impl::decode */ 1) * size);
 
             char * begin = reinterpret_cast<char *>(out_vec.data());
             char * pos = begin;
             size_t prev_offset = 0;
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 size_t new_offset = prev_offset + n;
 
diff --git a/src/Functions/FunctionsBitToArray.cpp b/src/Functions/FunctionsBitToArray.cpp
index 0a14516268a..beaaccad6db 100644
--- a/src/Functions/FunctionsBitToArray.cpp
+++ b/src/Functions/FunctionsBitToArray.cpp
@@ -60,17 +60,17 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         ColumnPtr res;
-        if (!((res = executeType<UInt8>(arguments, input_rows_count))
-            || (res = executeType<UInt16>(arguments, input_rows_count))
-            || (res = executeType<UInt32>(arguments, input_rows_count))
-            || (res = executeType<UInt64>(arguments, input_rows_count))
-            || (res = executeType<Int8>(arguments, input_rows_count))
-            || (res = executeType<Int16>(arguments, input_rows_count))
-            || (res = executeType<Int32>(arguments, input_rows_count))
-            || (res = executeType<Int64>(arguments, input_rows_count))))
+        if (!((res = executeType<UInt8>(arguments))
+            || (res = executeType<UInt16>(arguments))
+            || (res = executeType<UInt32>(arguments))
+            || (res = executeType<UInt64>(arguments))
+            || (res = executeType<Int8>(arguments))
+            || (res = executeType<Int16>(arguments))
+            || (res = executeType<Int32>(arguments))
+            || (res = executeType<Int64>(arguments))))
             throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of argument of function {}",
                             arguments[0].column->getName(), getName());
 
@@ -98,7 +98,7 @@ private:
     }
 
     template <typename T>
-    ColumnPtr executeType(const ColumnsWithTypeAndName & columns, size_t input_rows_count) const
+    ColumnPtr executeType(const ColumnsWithTypeAndName & columns) const
     {
         if (const ColumnVector<T> * col_from = checkAndGetColumn<ColumnVector<T>>(columns[0].column.get()))
         {
@@ -107,12 +107,13 @@ private:
             const typename ColumnVector<T>::Container & vec_from = col_from->getData();
             ColumnString::Chars & data_to = col_to->getChars();
             ColumnString::Offsets & offsets_to = col_to->getOffsets();
-            data_to.resize(input_rows_count * 2);
-            offsets_to.resize(input_rows_count);
+            size_t size = vec_from.size();
+            data_to.resize(size * 2);
+            offsets_to.resize(size);
 
             WriteBufferFromVector<ColumnString::Chars> buf_to(data_to);
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 writeBitmask<T>(vec_from[i], buf_to);
                 writeChar(0, buf_to);
@@ -243,7 +244,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
 
     template <typename T>
-    ColumnPtr executeType(const IColumn * column, size_t input_rows_count) const
+    ColumnPtr executeType(const IColumn * column) const
     {
         const ColumnVector<T> * col_from = checkAndGetColumn<ColumnVector<T>>(column);
         if (!col_from)
@@ -256,12 +257,13 @@ public:
         auto & result_array_offsets_data = result_array_offsets->getData();
 
         auto & vec_from = col_from->getData();
-        result_array_offsets_data.resize(input_rows_count);
-        result_array_values_data.reserve(input_rows_count * 2);
+        size_t size = vec_from.size();
+        result_array_offsets_data.resize(size);
+        result_array_values_data.reserve(size * 2);
 
         using UnsignedType = make_unsigned_t<T>;
 
-        for (size_t row = 0; row < input_rows_count; ++row)
+        for (size_t row = 0; row < size; ++row)
         {
             UnsignedType x = static_cast<UnsignedType>(vec_from[row]);
 
@@ -300,24 +302,24 @@ public:
         return result_column;
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const IColumn * in_column = arguments[0].column.get();
         ColumnPtr result_column;
 
-        if (!((result_column = executeType<UInt8>(in_column, input_rows_count))
-              || (result_column = executeType<UInt16>(in_column, input_rows_count))
-              || (result_column = executeType<UInt32>(in_column, input_rows_count))
-              || (result_column = executeType<UInt32>(in_column, input_rows_count))
-              || (result_column = executeType<UInt64>(in_column, input_rows_count))
-              || (result_column = executeType<UInt128>(in_column, input_rows_count))
-              || (result_column = executeType<UInt256>(in_column, input_rows_count))
-              || (result_column = executeType<Int8>(in_column, input_rows_count))
-              || (result_column = executeType<Int16>(in_column, input_rows_count))
-              || (result_column = executeType<Int32>(in_column, input_rows_count))
-              || (result_column = executeType<Int64>(in_column, input_rows_count))
-              || (result_column = executeType<Int128>(in_column, input_rows_count))
-              || (result_column = executeType<Int256>(in_column, input_rows_count))))
+        if (!((result_column = executeType<UInt8>(in_column))
+              || (result_column = executeType<UInt16>(in_column))
+              || (result_column = executeType<UInt32>(in_column))
+              || (result_column = executeType<UInt32>(in_column))
+              || (result_column = executeType<UInt64>(in_column))
+              || (result_column = executeType<UInt128>(in_column))
+              || (result_column = executeType<UInt256>(in_column))
+              || (result_column = executeType<Int8>(in_column))
+              || (result_column = executeType<Int16>(in_column))
+              || (result_column = executeType<Int32>(in_column))
+              || (result_column = executeType<Int64>(in_column))
+              || (result_column = executeType<Int128>(in_column))
+              || (result_column = executeType<Int256>(in_column))))
         {
             throw Exception(ErrorCodes::ILLEGAL_COLUMN,
                             "Illegal column {} of first argument of function {}",
diff --git a/src/Functions/FunctionsBitmap.h b/src/Functions/FunctionsBitmap.h
index 12b2b1a662a..92ec71a3118 100644
--- a/src/Functions/FunctionsBitmap.h
+++ b/src/Functions/FunctionsBitmap.h
@@ -155,7 +155,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /* input_rows_count */) const override
     {
         const IDataType * from_type = arguments[0].type.get();
         const auto * array_type = typeid_cast<const DataTypeArray *>(from_type);
@@ -165,21 +165,21 @@ public:
 
         WhichDataType which(nested_type);
         if (which.isUInt8())
-            return executeBitmapData<UInt8>(argument_types, arguments, input_rows_count);
+            return executeBitmapData<UInt8>(argument_types, arguments);
         else if (which.isUInt16())
-            return executeBitmapData<UInt16>(argument_types, arguments, input_rows_count);
+            return executeBitmapData<UInt16>(argument_types, arguments);
         else if (which.isUInt32())
-            return executeBitmapData<UInt32>(argument_types, arguments, input_rows_count);
+            return executeBitmapData<UInt32>(argument_types, arguments);
         else if (which.isUInt64())
-            return executeBitmapData<UInt64>(argument_types, arguments, input_rows_count);
+            return executeBitmapData<UInt64>(argument_types, arguments);
         else if (which.isInt8())
-            return executeBitmapData<Int8>(argument_types, arguments, input_rows_count);
+            return executeBitmapData<Int8>(argument_types, arguments);
         else if (which.isInt16())
-            return executeBitmapData<Int16>(argument_types, arguments, input_rows_count);
+            return executeBitmapData<Int16>(argument_types, arguments);
         else if (which.isInt32())
-            return executeBitmapData<Int32>(argument_types, arguments, input_rows_count);
+            return executeBitmapData<Int32>(argument_types, arguments);
         else if (which.isInt64())
-            return executeBitmapData<Int64>(argument_types, arguments, input_rows_count);
+            return executeBitmapData<Int64>(argument_types, arguments);
         else
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Unexpected type {} of argument of function {}",
                 from_type->getName(), getName());
@@ -187,7 +187,7 @@ public:
 
 private:
     template <typename T>
-    ColumnPtr executeBitmapData(DataTypes & argument_types, const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
+    ColumnPtr executeBitmapData(DataTypes & argument_types, const ColumnsWithTypeAndName & arguments) const
     {
         // input data
         const ColumnArray * array = typeid_cast<const ColumnArray *>(arguments[0].column.get());
@@ -203,10 +203,10 @@ private:
         AggregateFunctionPtr bitmap_function = AggregateFunctionFactory::instance().get(
             AggregateFunctionGroupBitmapData<T>::name(), action, argument_types, params_row, properties);
         auto col_to = ColumnAggregateFunction::create(bitmap_function);
-        col_to->reserve(input_rows_count);
+        col_to->reserve(offsets.size());
 
         size_t pos = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < offsets.size(); ++i)
         {
             col_to->insertDefault();
             AggregateFunctionGroupBitmapData<T> & bitmap_data
diff --git a/src/Functions/FunctionsCharsetClassification.cpp b/src/Functions/FunctionsCharsetClassification.cpp
index f01ede64cc0..0a332ab70a9 100644
--- a/src/Functions/FunctionsCharsetClassification.cpp
+++ b/src/Functions/FunctionsCharsetClassification.cpp
@@ -23,7 +23,7 @@ namespace
     constexpr size_t max_string_size = 1UL << 15;
 
     template <typename ModelMap>
-    Float64 naiveBayes(
+    ALWAYS_INLINE inline Float64 naiveBayes(
         const FrequencyHolder::EncodingMap & standard,
         const ModelMap & model,
         Float64 max_result)
@@ -51,7 +51,7 @@ namespace
 
     /// Count how many times each bigram occurs in the text.
     template <typename ModelMap>
-    void calculateStats(
+    ALWAYS_INLINE inline void calculateStats(
         const UInt8 * data,
         const size_t size,
         ModelMap & model)
@@ -77,25 +77,24 @@ struct CharsetClassificationImpl
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         const auto & encodings_freq = FrequencyHolder::getInstance().getEncodingsFrequency();
 
         if constexpr (detect_language)
             /// 2 chars for ISO code + 1 zero byte
-            res_data.reserve(input_rows_count * 3);
+            res_data.reserve(offsets.size() * 3);
         else
             /// Mean charset length is 8
-            res_data.reserve(input_rows_count * 8);
+            res_data.reserve(offsets.size() * 8);
 
-        res_offsets.resize(input_rows_count);
+        res_offsets.resize(offsets.size());
 
         size_t current_result_offset = 0;
 
         double zero_frequency_log = log(zero_frequency);
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < offsets.size(); ++i)
         {
             const UInt8 * str = data.data() + offsets[i - 1];
             const size_t str_len = offsets[i] - offsets[i - 1] - 1;
diff --git a/src/Functions/FunctionsCodingIP.cpp b/src/Functions/FunctionsCodingIP.cpp
index 0416df8f462..0a97d029f84 100644
--- a/src/Functions/FunctionsCodingIP.cpp
+++ b/src/Functions/FunctionsCodingIP.cpp
@@ -341,7 +341,7 @@ class FunctionIPv4NumToString : public IFunction
 {
 private:
     template <typename ArgType>
-    ColumnPtr executeTyped(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const
+    ColumnPtr executeTyped(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const
     {
         using ColumnType = ColumnVector<ArgType>;
 
@@ -356,12 +356,12 @@ private:
             ColumnString::Chars & vec_res = col_res->getChars();
             ColumnString::Offsets & offsets_res = col_res->getOffsets();
 
-            vec_res.resize(input_rows_count * (IPV4_MAX_TEXT_LENGTH + 1)); /// the longest value is: 255.255.255.255\0
-            offsets_res.resize(input_rows_count);
+            vec_res.resize(vec_in.size() * (IPV4_MAX_TEXT_LENGTH + 1)); /// the longest value is: 255.255.255.255\0
+            offsets_res.resize(vec_in.size());
             char * begin = reinterpret_cast<char *>(vec_res.data());
             char * pos = begin;
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < vec_in.size(); ++i)
             {
                 DB::formatIPv4(reinterpret_cast<const unsigned char*>(&vec_in[i]), sizeof(ArgType), pos, mask_tail_octets, "xxx");
                 offsets_res[i] = pos - begin;
@@ -532,7 +532,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const auto & col_type_name = arguments[0];
         const ColumnPtr & column = col_type_name.column;
@@ -542,11 +542,11 @@ public:
             auto col_res = ColumnIPv6::create();
 
             auto & vec_res = col_res->getData();
-            vec_res.resize(input_rows_count);
+            vec_res.resize(col_in->size());
 
             const auto & vec_in = col_in->getData();
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < vec_res.size(); ++i)
                 mapIPv4ToIPv6(vec_in[i], reinterpret_cast<UInt8 *>(&vec_res[i].toUnderType()));
 
             return col_res;
@@ -557,7 +557,7 @@ public:
             auto col_res = ColumnFixedString::create(IPV6_BINARY_LENGTH);
 
             auto & vec_res = col_res->getChars();
-            vec_res.resize(input_rows_count * IPV6_BINARY_LENGTH);
+            vec_res.resize(col_in->size() * IPV6_BINARY_LENGTH);
 
             const auto & vec_in = col_in->getData();
 
@@ -742,7 +742,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr & column = arguments[0].column;
 
@@ -751,13 +751,13 @@ public:
             auto col_res = ColumnUInt64::create();
 
             ColumnUInt64::Container & vec_res = col_res->getData();
-            vec_res.resize(input_rows_count);
+            vec_res.resize(col->size());
 
             const ColumnString::Chars & vec_src = col->getChars();
             const ColumnString::Offsets & offsets_src = col->getOffsets();
             size_t prev_offset = 0;
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < vec_res.size(); ++i)
             {
                 size_t current_offset = offsets_src[i];
                 size_t string_size = current_offset - prev_offset - 1; /// mind the terminating zero byte
@@ -1054,7 +1054,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnString * input_column = checkAndGetColumn<ColumnString>(arguments[0].column.get());
 
@@ -1067,14 +1067,14 @@ public:
         auto col_res = ColumnUInt8::create();
 
         ColumnUInt8::Container & vec_res = col_res->getData();
-        vec_res.resize(input_rows_count);
+        vec_res.resize(input_column->size());
 
         const ColumnString::Chars & vec_src = input_column->getChars();
         const ColumnString::Offsets & offsets_src = input_column->getOffsets();
         size_t prev_offset = 0;
         UInt32 result = 0;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < vec_res.size(); ++i)
         {
             vec_res[i] = DB::parseIPv4whole(reinterpret_cast<const char *>(&vec_src[prev_offset]), reinterpret_cast<unsigned char *>(&result));
             prev_offset = offsets_src[i];
@@ -1110,7 +1110,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnString * input_column = checkAndGetColumn<ColumnString>(arguments[0].column.get());
         if (!input_column)
@@ -1122,14 +1122,14 @@ public:
         auto col_res = ColumnUInt8::create();
 
         ColumnUInt8::Container & vec_res = col_res->getData();
-        vec_res.resize(input_rows_count);
+        vec_res.resize(input_column->size());
 
         const ColumnString::Chars & vec_src = input_column->getChars();
         const ColumnString::Offsets & offsets_src = input_column->getOffsets();
         size_t prev_offset = 0;
         char buffer[IPV6_BINARY_LENGTH];
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < vec_res.size(); ++i)
         {
             vec_res[i] = DB::parseIPv6whole(reinterpret_cast<const char *>(&vec_src[prev_offset]),
                                             reinterpret_cast<const char *>(&vec_src[offsets_src[i] - 1]),
diff --git a/src/Functions/FunctionsCodingUUID.cpp b/src/Functions/FunctionsCodingUUID.cpp
index 179ba1bf97a..83fdcbc4af9 100644
--- a/src/Functions/FunctionsCodingUUID.cpp
+++ b/src/Functions/FunctionsCodingUUID.cpp
@@ -177,7 +177,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnWithTypeAndName & col_type_name = arguments[0];
         const ColumnPtr & column = col_type_name.column;
@@ -189,20 +189,21 @@ public:
                                 "Illegal type {} of column {} argument of function {}, expected FixedString({})",
                                 col_type_name.type->getName(), col_in->getName(), getName(), uuid_bytes_length);
 
+            const auto size = col_in->size();
             const auto & vec_in = col_in->getChars();
 
             auto col_res = ColumnString::create();
 
             ColumnString::Chars & vec_res = col_res->getChars();
             ColumnString::Offsets & offsets_res = col_res->getOffsets();
-            vec_res.resize(input_rows_count * (uuid_text_length + 1));
-            offsets_res.resize(input_rows_count);
+            vec_res.resize(size * (uuid_text_length + 1));
+            offsets_res.resize(size);
 
             size_t src_offset = 0;
             size_t dst_offset = 0;
 
             const UUIDSerializer uuid_serializer(variant);
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 uuid_serializer.deserialize(&vec_in[src_offset], &vec_res[dst_offset]);
                 src_offset += uuid_bytes_length;
@@ -255,7 +256,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnWithTypeAndName & col_type_name = arguments[0];
         const ColumnPtr & column = col_type_name.column;
@@ -265,16 +266,17 @@ public:
         {
             const auto & vec_in = col_in->getChars();
             const auto & offsets_in = col_in->getOffsets();
+            const size_t size = offsets_in.size();
 
             auto col_res = ColumnFixedString::create(uuid_bytes_length);
 
             ColumnString::Chars & vec_res = col_res->getChars();
-            vec_res.resize(input_rows_count * uuid_bytes_length);
+            vec_res.resize(size * uuid_bytes_length);
 
             size_t src_offset = 0;
             size_t dst_offset = 0;
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 /// If string has incorrect length - then return zero UUID.
                 /// If string has correct length but contains something not like UUID - implementation specific behaviour.
@@ -298,17 +300,18 @@ public:
                                 "Illegal type {} of column {} argument of function {}, expected FixedString({})",
                                 col_type_name.type->getName(), col_in_fixed->getName(), getName(), uuid_text_length);
 
+            const auto size = col_in_fixed->size();
             const auto & vec_in = col_in_fixed->getChars();
 
             auto col_res = ColumnFixedString::create(uuid_bytes_length);
 
             ColumnString::Chars & vec_res = col_res->getChars();
-            vec_res.resize(input_rows_count * uuid_bytes_length);
+            vec_res.resize(size * uuid_bytes_length);
 
             size_t src_offset = 0;
             size_t dst_offset = 0;
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 uuid_serializer.serialize(&vec_in[src_offset], &vec_res[dst_offset]);
                 src_offset += uuid_text_length;
@@ -356,7 +359,7 @@ public:
         return std::make_shared<DataTypeFixedString>(uuid_bytes_length);
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnWithTypeAndName & col_type_name = arguments[0];
         const ColumnPtr & column = col_type_name.column;
@@ -367,15 +370,16 @@ public:
         {
             const auto & vec_in = col_in->getData();
             const UUID * uuids = vec_in.data();
+            const size_t size = vec_in.size();
 
             auto col_res = ColumnFixedString::create(uuid_bytes_length);
 
             ColumnString::Chars & vec_res = col_res->getChars();
-            vec_res.resize(input_rows_count * uuid_bytes_length);
+            vec_res.resize(size * uuid_bytes_length);
 
             size_t dst_offset = 0;
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 uint64_t hiBytes = DB::UUIDHelpers::getHighBytes(uuids[i]);
                 uint64_t loBytes = DB::UUIDHelpers::getLowBytes(uuids[i]);
@@ -444,7 +448,7 @@ public:
         return std::make_shared<DataTypeDateTime64>(datetime_scale, timezone);
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnWithTypeAndName & col_type_name = arguments[0];
         const ColumnPtr & column = col_type_name.column;
@@ -453,11 +457,12 @@ public:
         {
             const auto & vec_in = col_in->getData();
             const UUID * uuids = vec_in.data();
+            const size_t size = vec_in.size();
 
-            auto col_res = ColumnDateTime64::create(input_rows_count, datetime_scale);
+            auto col_res = ColumnDateTime64::create(size, datetime_scale);
             auto & vec_res = col_res->getData();
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 const uint64_t hiBytes = DB::UUIDHelpers::getHighBytes(uuids[i]);
                 const uint64_t ms = ((hiBytes & 0xf000) == 0x7000) ? (hiBytes >> 16) : 0;
diff --git a/src/Functions/FunctionsConsistentHashing.h b/src/Functions/FunctionsConsistentHashing.h
index 210bb69e16d..306b6395dc5 100644
--- a/src/Functions/FunctionsConsistentHashing.h
+++ b/src/Functions/FunctionsConsistentHashing.h
@@ -101,9 +101,9 @@ private:
         BucketsType num_buckets;
 
         if (buckets_field.getType() == Field::Types::Int64)
-            num_buckets = checkBucketsRange(buckets_field.safeGet<Int64>());
+            num_buckets = checkBucketsRange(buckets_field.get<Int64>());
         else if (buckets_field.getType() == Field::Types::UInt64)
-            num_buckets = checkBucketsRange(buckets_field.safeGet<UInt64>());
+            num_buckets = checkBucketsRange(buckets_field.get<UInt64>());
         else
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                 "Illegal type {} of the second argument of function {}",
diff --git a/src/Functions/FunctionsConversion.cpp b/src/Functions/FunctionsConversion.cpp
index 271daa99d0c..675283d011e 100644
--- a/src/Functions/FunctionsConversion.cpp
+++ b/src/Functions/FunctionsConversion.cpp
@@ -9,7 +9,6 @@
 #include <Columns/ColumnMap.h>
 #include <Columns/ColumnNothing.h>
 #include <Columns/ColumnNullable.h>
-#include <Columns/ColumnObjectDeprecated.h>
 #include <Columns/ColumnObject.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnStringHelpers.h>
@@ -36,7 +35,6 @@
 #include <DataTypes/DataTypeNested.h>
 #include <DataTypes/DataTypeNothing.h>
 #include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeObjectDeprecated.h>
 #include <DataTypes/DataTypeObject.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeTuple.h>
@@ -45,10 +43,8 @@
 #include <DataTypes/DataTypeDynamic.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypesBinaryEncoding.h>
 #include <DataTypes/ObjectUtils.h>
 #include <DataTypes/Serializations/SerializationDecimal.h>
-#include <DataTypes/getLeastSupertype.h>
 #include <Formats/FormatSettings.h>
 #include <Formats/FormatFactory.h>
 #include <Functions/CastOverloadResolver.h>
@@ -121,7 +117,7 @@ UInt32 extractToDecimalScale(const ColumnWithTypeAndName & named_column)
 
     Field field;
     named_column.column->get(0, field);
-    return static_cast<UInt32>(field.safeGet<UInt32>());
+    return static_cast<UInt32>(field.get<UInt32>());
 }
 
 
@@ -1577,35 +1573,6 @@ struct ConvertImpl
                         arguments, result_type, input_rows_count, additions);
             }
         }
-        else if constexpr (std::is_same_v<FromDataType, DataTypeInterval> && std::is_same_v<ToDataType, DataTypeInterval>)
-        {
-            IntervalKind to = typeid_cast<const DataTypeInterval *>(result_type.get())->getKind();
-            IntervalKind from = typeid_cast<const DataTypeInterval *>(arguments[0].type.get())->getKind();
-
-            if (from == to || arguments[0].column->empty())
-                return arguments[0].column;
-
-            Int64 conversion_factor = 1;
-            Int64 result_value;
-
-            int from_position = static_cast<int>(from.kind);
-            int to_position = static_cast<int>(to.kind); /// Positions of each interval according to granularity map
-
-            if (from_position < to_position)
-            {
-                for (int i = from_position; i < to_position; ++i)
-                    conversion_factor *= interval_conversions[i];
-                result_value = arguments[0].column->getInt(0) / conversion_factor;
-            }
-            else
-            {
-                for (int i = from_position; i > to_position; --i)
-                    conversion_factor *= interval_conversions[i];
-                result_value = arguments[0].column->getInt(0) * conversion_factor;
-            }
-
-            return ColumnConst::create(ColumnInt64::create(1, result_value), input_rows_count);
-        }
         else
         {
             using FromFieldType = typename FromDataType::FieldType;
@@ -2214,7 +2181,7 @@ private:
         const DataTypePtr from_type = removeNullable(arguments[0].type);
         ColumnPtr result_column;
 
-        FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior = default_date_time_overflow_behavior;
+        [[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;
@@ -2310,7 +2277,7 @@ private:
                 }
             }
             else
-                result_column = ConvertImpl<LeftDataType, RightDataType, Name>::execute(arguments, result_type, input_rows_count, from_string_tag);
+                  result_column = ConvertImpl<LeftDataType, RightDataType, Name>::execute(arguments, result_type, input_rows_count, from_string_tag);
 
             return true;
         };
@@ -2367,10 +2334,6 @@ private:
                 else
                     done = callOnIndexAndDataType<ToDataType>(from_type->getTypeId(), call, BehaviourOnErrorFromString::ConvertDefaultBehaviorTag);
             }
-
-            if constexpr (std::is_same_v<ToDataType, DataTypeInterval>)
-                if (WhichDataType(from_type).isInterval())
-                    done = callOnIndexAndDataType<ToDataType>(from_type->getTypeId(), call, BehaviourOnErrorFromString::ConvertDefaultBehaviorTag);
         }
 
         if (!done)
@@ -2641,8 +2604,8 @@ struct ToNumberMonotonicity
             if (left.isNull() || right.isNull())
                 return {};
 
-            Float64 left_float = left.safeGet<Float64>();
-            Float64 right_float = right.safeGet<Float64>();
+            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())
@@ -2670,11 +2633,11 @@ struct ToNumberMonotonicity
 
         const bool left_in_first_half = left.isNull()
             ? from_is_unsigned
-            : (left.safeGet<Int64>() >= 0);
+            : (left.get<Int64>() >= 0);
 
         const bool right_in_first_half = right.isNull()
             ? !from_is_unsigned
-            : (right.safeGet<Int64>() >= 0);
+            : (right.get<Int64>() >= 0);
 
         /// Size of type is the same.
         if (size_of_from == size_of_to)
@@ -2712,7 +2675,7 @@ struct ToNumberMonotonicity
                 return {};
 
             /// Function cannot be monotonic when left and right are not on the same ranges.
-            if (divideByRangeOfType(left.safeGet<UInt64>()) != divideByRangeOfType(right.safeGet<UInt64>()))
+            if (divideByRangeOfType(left.get<UInt64>()) != divideByRangeOfType(right.get<UInt64>()))
                 return {};
 
             if (to_is_unsigned)
@@ -2720,7 +2683,7 @@ struct ToNumberMonotonicity
             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.safeGet<UInt64>()) >= 0) == (T(right.safeGet<UInt64>()) >= 0);
+                const bool is_monotonic = (T(left.get<UInt64>()) >= 0) == (T(right.get<UInt64>()) >= 0);
 
                 return { .is_monotonic = is_monotonic };
             }
@@ -2744,13 +2707,13 @@ struct ToDateMonotonicity
         }
         else if (
             ((left.getType() == Field::Types::UInt64 || left.isNull()) && (right.getType() == Field::Types::UInt64 || right.isNull())
-             && ((left.isNull() || left.safeGet<UInt64>() < 0xFFFF) && (right.isNull() || right.safeGet<UInt64>() >= 0xFFFF)))
+             && ((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.safeGet<Int64>() < 0xFFFF) && (right.isNull() || right.safeGet<Int64>() >= 0xFFFF)))
+                && ((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.safeGet<Float64>() < 0xFFFF) && (right.isNull() || right.safeGet<Float64>() >= 0xFFFF))))
+                && ((left.isNull() || left.get<Float64>() < 0xFFFF) && (right.isNull() || right.get<Float64>() >= 0xFFFF))))
             || !isNativeNumber(type))
         {
             return {};
@@ -2805,16 +2768,16 @@ struct ToStringMonotonicity
         if (left.getType() == Field::Types::UInt64
             && right.getType() == Field::Types::UInt64)
         {
-            return (left.safeGet<Int64>() == 0 && right.safeGet<Int64>() == 0)
-                || (floor(log10(left.safeGet<UInt64>())) == floor(log10(right.safeGet<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.safeGet<Int64>() == 0 && right.safeGet<Int64>() == 0)
-                || (left.safeGet<Int64>() > 0 && right.safeGet<Int64>() > 0 && floor(log10(left.safeGet<Int64>())) == floor(log10(right.safeGet<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;
         }
 
@@ -3916,7 +3879,7 @@ private:
                     "Expected tuple with {} subcolumn, but got {} subcolumns",
                     tuple_size, column_tuple.getColumns().size());
 
-            auto res = ColumnObjectDeprecated::create(has_nullable_subcolumns);
+            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], "" }};
@@ -3993,7 +3956,7 @@ private:
                         subcolumn->insertDefault();
             }
 
-            auto column_object = ColumnObjectDeprecated::create(has_nullable_subcolumns);
+            auto column_object = ColumnObject::create(has_nullable_subcolumns);
             for (auto && [key, subcolumn] : subcolumns)
             {
                 PathInData path(key.toView());
@@ -4004,7 +3967,7 @@ private:
         };
     }
 
-    WrapperType createObjectDeprecatedWrapper(const DataTypePtr & from_type, const DataTypeObjectDeprecated * to_type) const
+    WrapperType createObjectWrapper(const DataTypePtr & from_type, const DataTypeObject * to_type) const
     {
         if (const auto * from_tuple = checkAndGetDataType<DataTypeTuple>(from_type.get()))
         {
@@ -4023,12 +3986,12 @@ private:
                 return res;
             };
         }
-        else if (checkAndGetDataType<DataTypeObjectDeprecated>(from_type.get()))
+        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 ColumnObjectDeprecated &>(*arguments.front().column);
-                auto res = ColumnObjectDeprecated::create(is_nullable);
+                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]);
 
@@ -4041,25 +4004,6 @@ private:
             "Cast to Object can be performed only from flatten named Tuple, Map or String. Got: {}", from_type->getName());
     }
 
-    WrapperType createObjectWrapper(const DataTypePtr & from_type, const DataTypeObject * to_object) const
-    {
-        if (checkAndGetDataType<DataTypeString>(from_type.get()))
-        {
-            return [this](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, context)->assumeMutable();
-                res->finalize();
-                return res;
-            };
-        }
-
-        /// TODO: support CAST between JSON types with different parameters
-        ///       support CAST from Map to JSON
-        ///       support CAST from Tuple to JSON
-        ///       support CAST from Object('json') to JSON
-        throw Exception(ErrorCodes::TYPE_MISMATCH, "Cast to {} can be performed only from String. Got: {}", magic_enum::enum_name(to_object->getSchemaFormat()), 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.
@@ -4134,29 +4078,6 @@ private:
         };
     }
 
-    /// Create wrapper only if we support this conversion.
-    WrapperType createWrapperIfCanConvert(const DataTypePtr & from, const DataTypePtr & to) const
-    {
-        try
-        {
-            /// We can avoid try/catch here if we will implement check that 2 types can be casted, but it
-            /// requires quite a lot of work. By now let's simply use try/catch.
-            /// First, check that we can create a wrapper.
-            WrapperType wrapper = prepareUnpackDictionaries(from, to);
-            /// Second, check if we can perform a conversion on column with default value.
-            /// (we cannot just check empty column as we do some checks only during iteration over rows).
-            auto test_col = from->createColumn();
-            test_col->insertDefault();
-            ColumnsWithTypeAndName column_from = {{test_col->getPtr(), from, "" }};
-            wrapper(column_from, to, nullptr, 1);
-            return wrapper;
-        }
-        catch (const Exception &)
-        {
-            return {};
-        }
-    }
-
     WrapperType createVariantToColumnWrapper(const DataTypeVariant & from_variant, const DataTypePtr & to_type) const
     {
         const auto & variant_types = from_variant.getVariants();
@@ -4165,19 +4086,7 @@ private:
 
         /// Create conversion wrapper for each variant.
         for (const auto & variant_type : variant_types)
-        {
-            WrapperType wrapper;
-            if (cast_type == CastType::accurateOrNull)
-            {
-                /// Create wrapper only if we support conversion from variant to the resulting type.
-                wrapper = createWrapperIfCanConvert(variant_type, to_type);
-            }
-            else
-            {
-                wrapper = prepareUnpackDictionaries(variant_type, to_type);
-            }
-            variant_wrappers.push_back(wrapper);
-        }
+            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
@@ -4192,11 +4101,7 @@ private:
                 auto variant_col = column_variant.getVariantPtrByGlobalDiscriminator(i);
                 ColumnsWithTypeAndName variant = {{variant_col, variant_types[i], "" }};
                 const auto & variant_wrapper = variant_wrappers[i];
-                ColumnPtr casted_variant;
-                /// Check if we have wrapper for this variant.
-                if (variant_wrapper)
-                    casted_variant = variant_wrapper(variant, result_type, nullptr, variant_col->size());
-                casted_variant_columns.push_back(std::move(casted_variant));
+                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.
@@ -4206,7 +4111,7 @@ private:
             for (size_t i = 0; i != input_rows_count; ++i)
             {
                 auto global_discr = column_variant.globalDiscriminatorByLocal(local_discriminators[i]);
-                if (global_discr == ColumnVariant::NULL_DISCRIMINATOR || !casted_variant_columns[global_discr])
+                if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
                     res->insertDefault();
                 else
                     res->insertFrom(*casted_variant_columns[global_discr], column_variant.offsetAt(i));
@@ -4382,137 +4287,13 @@ private:
     WrapperType createDynamicToColumnWrapper(const DataTypePtr &) const
     {
         return [this]
-               (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count) -> ColumnPtr
+               (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable * col_nullable, size_t input_rows_count) -> ColumnPtr
         {
-            /// When casting Dynamic to regular column we should cast all variants from current Dynamic column
-            /// and construct the result based on discriminators.
             const auto & column_dynamic = assert_cast<const ColumnDynamic &>(*arguments.front().column.get());
-            const auto & variant_column = column_dynamic.getVariantColumn();
             const auto & variant_info = column_dynamic.getVariantInfo();
-
-            /// First, cast usual variants to result type.
-            const auto & variant_types = assert_cast<const DataTypeVariant &>(*variant_info.variant_type).getVariants();
-            std::vector<ColumnPtr> casted_variant_columns;
-            casted_variant_columns.reserve(variant_types.size());
-            for (size_t i = 0; i != variant_types.size(); ++i)
-            {
-                /// Skip shared variant, it will be processed later.
-                if (i == column_dynamic.getSharedVariantDiscriminator())
-                {
-                    casted_variant_columns.push_back(nullptr);
-                    continue;
-                }
-
-                const auto & variant_col = variant_column.getVariantPtrByGlobalDiscriminator(i);
-                ColumnsWithTypeAndName variant = {{variant_col, variant_types[i], ""}};
-                WrapperType variant_wrapper;
-                if (cast_type == CastType::accurateOrNull)
-                    /// Create wrapper only if we support conversion from variant to the resulting type.
-                    variant_wrapper = createWrapperIfCanConvert(variant_types[i], result_type);
-                else
-                    variant_wrapper = prepareUnpackDictionaries(variant_types[i], result_type);
-
-                ColumnPtr casted_variant;
-                /// Check if we have wrapper for this variant.
-                if (variant_wrapper)
-                    casted_variant = variant_wrapper(variant, result_type, nullptr, variant_col->size());
-                casted_variant_columns.push_back(casted_variant);
-            }
-
-            /// Second, collect all variants stored in shared variant and cast them to result type.
-            std::vector<MutableColumnPtr> variant_columns_from_shared_variant;
-            DataTypes variant_types_from_shared_variant;
-            /// We will need to know what variant to use when we see discriminator of a shared variant.
-            /// To do it, we remember what variant was extracted from each row and what was it's offset.
-            PaddedPODArray<UInt64> shared_variant_indexes;
-            PaddedPODArray<UInt64> shared_variant_offsets;
-            std::unordered_map<String, UInt64> shared_variant_to_index;
-            const auto & shared_variant = column_dynamic.getSharedVariant();
-            const auto shared_variant_discr = column_dynamic.getSharedVariantDiscriminator();
-            const auto & local_discriminators = variant_column.getLocalDiscriminators();
-            const auto & offsets = variant_column.getOffsets();
-            if (!shared_variant.empty())
-            {
-                shared_variant_indexes.reserve(input_rows_count);
-                shared_variant_offsets.reserve(input_rows_count);
-                FormatSettings format_settings;
-                const auto shared_variant_local_discr = variant_column.localDiscriminatorByGlobal(shared_variant_discr);
-                for (size_t i = 0; i != input_rows_count; ++i)
-                {
-                    if (local_discriminators[i] == shared_variant_local_discr)
-                    {
-                        auto value = shared_variant.getDataAt(offsets[i]);
-                        ReadBufferFromMemory buf(value.data, value.size);
-                        auto type = decodeDataType(buf);
-                        auto type_name = type->getName();
-                        auto it = shared_variant_to_index.find(type_name);
-                        /// Check if we didn't create column for this variant yet.
-                        if (it == shared_variant_to_index.end())
-                        {
-                            it = shared_variant_to_index.emplace(type_name, variant_columns_from_shared_variant.size()).first;
-                            variant_columns_from_shared_variant.push_back(type->createColumn());
-                            variant_types_from_shared_variant.push_back(type);
-                        }
-
-                        shared_variant_indexes.push_back(it->second);
-                        shared_variant_offsets.push_back(variant_columns_from_shared_variant[it->second]->size());
-                        type->getDefaultSerialization()->deserializeBinary(*variant_columns_from_shared_variant[it->second], buf, format_settings);
-                    }
-                    else
-                    {
-                        shared_variant_indexes.emplace_back();
-                        shared_variant_offsets.emplace_back();
-                    }
-                }
-            }
-
-            /// Cast all extracted variants into result type.
-            std::vector<ColumnPtr> casted_shared_variant_columns;
-            casted_shared_variant_columns.reserve(variant_types_from_shared_variant.size());
-            for (size_t i = 0; i != variant_types_from_shared_variant.size(); ++i)
-            {
-                ColumnsWithTypeAndName variant = {{variant_columns_from_shared_variant[i]->getPtr(), variant_types_from_shared_variant[i], ""}};
-                WrapperType variant_wrapper;
-                if (cast_type == CastType::accurateOrNull)
-                    /// Create wrapper only if we support conversion from variant to the resulting type.
-                    variant_wrapper = createWrapperIfCanConvert(variant_types_from_shared_variant[i], result_type);
-                else
-                    variant_wrapper = prepareUnpackDictionaries(variant_types_from_shared_variant[i], result_type);
-
-                ColumnPtr casted_variant;
-                /// Check if we have wrapper for this variant.
-                if (variant_wrapper)
-                    casted_variant = variant_wrapper(variant, result_type, nullptr, variant_columns_from_shared_variant[i]->size());
-                casted_shared_variant_columns.push_back(casted_variant);
-            }
-
-            /// Construct result column from all casted variants.
-            auto res = result_type->createColumn();
-            res->reserve(input_rows_count);
-            for (size_t i = 0; i != input_rows_count; ++i)
-            {
-                auto global_discr = variant_column.globalDiscriminatorByLocal(local_discriminators[i]);
-                if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
-                {
-                    res->insertDefault();
-                }
-                else if (global_discr == shared_variant_discr)
-                {
-                    if (casted_shared_variant_columns[shared_variant_indexes[i]])
-                        res->insertFrom(*casted_shared_variant_columns[shared_variant_indexes[i]], shared_variant_offsets[i]);
-                    else
-                        res->insertDefault();
-                }
-                else
-                {
-                    if (casted_variant_columns[global_discr])
-                        res->insertFrom(*casted_variant_columns[global_discr], offsets[i]);
-                    else
-                        res->insertDefault();
-                }
-            }
-
-            return res;
+            auto variant_wrapper = createVariantToColumnWrapper(assert_cast<const DataTypeVariant &>(*variant_info.variant_type), result_type);
+            ColumnsWithTypeAndName args = {ColumnWithTypeAndName(column_dynamic.getVariantColumnPtr(), variant_info.variant_type, "")};
+            return variant_wrapper(args, result_type, col_nullable, input_rows_count);
         };
     }
 
@@ -4539,51 +4320,200 @@ private:
         };
     }
 
-    WrapperType createVariantToDynamicWrapper(const DataTypeVariant & from_variant_type, const DataTypeDynamic & dynamic_type) const
+    std::pair<ColumnPtr, DataTypePtr> getReducedVariant(
+        const ColumnVariant & variant_column,
+        const DataTypePtr & variant_type,
+        const std::unordered_map<String, ColumnVariant::Discriminator> & variant_name_to_discriminator,
+        size_t max_result_num_variants,
+        const ColumnDynamic::Statistics & statistics = {}) const
     {
-        /// First create extended Variant with shared variant type and cast this Variant to it.
-        auto variants_for_dynamic = from_variant_type.getVariants();
-        size_t number_of_variants = variants_for_dynamic.size();
-        variants_for_dynamic.push_back(ColumnDynamic::getSharedVariantDataType());
-        const auto & variant_type_for_dynamic = std::make_shared<DataTypeVariant>(variants_for_dynamic);
-        auto old_to_new_variant_wrapper = createVariantToVariantWrapper(from_variant_type, *variant_type_for_dynamic);
-        auto max_dynamic_types = dynamic_type.getMaxDynamicTypes();
-        return [old_to_new_variant_wrapper, variant_type_for_dynamic, number_of_variants, max_dynamic_types]
-               (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable * col_nullable, size_t input_rows_count) -> ColumnPtr
-        {
-            auto variant_column_for_dynamic = old_to_new_variant_wrapper(arguments, result_type, col_nullable, input_rows_count);
-            /// If resulting Dynamic column can contain all variants from this Variant column, just create Dynamic column from it.
-            if (max_dynamic_types >= number_of_variants)
-                return ColumnDynamic::create(variant_column_for_dynamic, variant_type_for_dynamic, max_dynamic_types, max_dynamic_types);
+        const auto & variant_types = assert_cast<const DataTypeVariant &>(*variant_type).getVariants();
+        /// First check if we don't exceed the limit in current Variant column.
+        if (variant_types.size() < max_result_num_variants || (variant_types.size() == max_result_num_variants && variant_name_to_discriminator.contains("String")))
+            return {variant_column.getPtr(), variant_type};
 
-            /// Otherwise some variants should go to the shared variant. Create temporary Dynamic column from this Variant and insert
-            /// all data to the resulting Dynamic column, this insertion will do all the logic with shared variant.
-            auto tmp_dynamic_column = ColumnDynamic::create(variant_column_for_dynamic, variant_type_for_dynamic, number_of_variants, number_of_variants);
-            auto result_dynamic_column = ColumnDynamic::create(max_dynamic_types);
-            result_dynamic_column->insertRangeFrom(*tmp_dynamic_column, 0, tmp_dynamic_column->size());
-            return result_dynamic_column;
+        /// We want to keep the most frequent variants and convert to string the rarest.
+        std::vector<std::pair<size_t, ColumnVariant::Discriminator>> variant_sizes;
+        variant_sizes.reserve(variant_types.size());
+        std::optional<ColumnVariant::Discriminator> old_string_discriminator;
+        /// List of variants that should be converted to a single String variant.
+        std::vector<ColumnVariant::Discriminator> variants_to_convert_to_string;
+        for (size_t i = 0; i != variant_types.size(); ++i)
+        {
+            /// String variant won't be removed.
+            String variant_name = variant_types[i]->getName();
+
+            if (variant_name == "String")
+            {
+                old_string_discriminator = i;
+                /// For simplicity, add this variant to the list that will be converted to string,
+                /// so we will process it with other variants when constructing the new String variant.
+                variants_to_convert_to_string.push_back(i);
+            }
+            else
+            {
+                size_t size = 0;
+                if (statistics.data.empty())
+                    size = variant_column.getVariantByGlobalDiscriminator(i).size();
+                else
+                    size = statistics.data.at(variant_name);
+                variant_sizes.emplace_back(size, i);
+            }
+        }
+
+        /// Sort variants by sizes, so we will keep the most frequent.
+        std::sort(variant_sizes.begin(), variant_sizes.end(), std::greater());
+
+        DataTypes remaining_variants;
+        remaining_variants.reserve(max_result_num_variants);
+        /// Add String variant in advance.
+        remaining_variants.push_back(std::make_shared<DataTypeString>());
+        for (auto [_, discr] : variant_sizes)
+        {
+            if (remaining_variants.size() != max_result_num_variants)
+                remaining_variants.push_back(variant_types[discr]);
+            else
+                variants_to_convert_to_string.push_back(discr);
+        }
+
+        auto reduced_variant = std::make_shared<DataTypeVariant>(remaining_variants);
+        const auto & new_variants = reduced_variant->getVariants();
+        /// To construct reduced variant column we will need mapping from old to new discriminators.
+        std::vector<ColumnVariant::Discriminator> old_to_new_discriminators_mapping;
+        old_to_new_discriminators_mapping.resize(variant_types.size());
+        ColumnVariant::Discriminator string_variant_discriminator = 0;
+        for (size_t i = 0; i != new_variants.size(); ++i)
+        {
+            String variant_name = new_variants[i]->getName();
+            if (variant_name == "String")
+            {
+                string_variant_discriminator = i;
+                for (auto discr : variants_to_convert_to_string)
+                    old_to_new_discriminators_mapping[discr] = i;
+            }
+            else
+            {
+                auto old_discr = variant_name_to_discriminator.at(variant_name);
+                old_to_new_discriminators_mapping[old_discr] = i;
+            }
+        }
+
+        /// Convert all reduced variants to String.
+        std::unordered_map<ColumnVariant::Discriminator, ColumnPtr> variants_converted_to_string;
+        variants_converted_to_string.reserve(variants_to_convert_to_string.size());
+        size_t string_variant_size = 0;
+        for (auto discr : variants_to_convert_to_string)
+        {
+            auto string_type = std::make_shared<DataTypeString>();
+            auto string_wrapper = prepareUnpackDictionaries(variant_types[discr], string_type);
+            auto column_to_convert = ColumnWithTypeAndName(variant_column.getVariantPtrByGlobalDiscriminator(discr), variant_types[discr], "");
+            ColumnsWithTypeAndName args = {column_to_convert};
+            auto variant_string_column = string_wrapper(args, string_type, nullptr, column_to_convert.column->size());
+            string_variant_size += variant_string_column->size();
+            variants_converted_to_string[discr] = variant_string_column;
+        }
+
+        /// Create new discriminators and offsets and fill new String variant according to old discriminators.
+        auto string_variant = ColumnString::create();
+        string_variant->reserve(string_variant_size);
+        auto new_discriminators_column = variant_column.getLocalDiscriminatorsPtr()->cloneEmpty();
+        auto & new_discriminators_data = assert_cast<ColumnVariant::ColumnDiscriminators &>(*new_discriminators_column).getData();
+        new_discriminators_data.reserve(variant_column.size());
+        auto new_offsets = variant_column.getOffsetsPtr()->cloneEmpty();
+        auto & new_offsets_data = assert_cast<ColumnVariant::ColumnOffsets &>(*new_offsets).getData();
+        new_offsets_data.reserve(variant_column.size());
+        const auto & old_local_discriminators = variant_column.getLocalDiscriminators();
+        const auto & old_offsets = variant_column.getOffsets();
+        for (size_t i = 0; i != old_local_discriminators.size(); ++i)
+        {
+            auto old_discr = variant_column.globalDiscriminatorByLocal(old_local_discriminators[i]);
+
+            if (old_discr == ColumnVariant::NULL_DISCRIMINATOR)
+            {
+                new_discriminators_data.push_back(ColumnVariant::NULL_DISCRIMINATOR);
+                new_offsets_data.push_back(0);
+                continue;
+            }
+
+            auto new_discr = old_to_new_discriminators_mapping[old_discr];
+            new_discriminators_data.push_back(new_discr);
+            if (new_discr != string_variant_discriminator)
+            {
+                new_offsets_data.push_back(old_offsets[i]);
+            }
+            else
+            {
+                new_offsets_data.push_back(string_variant->size());
+                string_variant->insertFrom(*variants_converted_to_string[old_discr], old_offsets[i]);
+            }
+        }
+
+        /// Create new list of variant columns.
+        Columns new_variant_columns;
+        new_variant_columns.resize(new_variants.size());
+        for (size_t i = 0; i != variant_types.size(); ++i)
+        {
+            auto new_discr = old_to_new_discriminators_mapping[i];
+            if (new_discr != string_variant_discriminator)
+                new_variant_columns[new_discr] = variant_column.getVariantPtrByGlobalDiscriminator(i);
+        }
+        new_variant_columns[string_variant_discriminator] = std::move(string_variant);
+        return {ColumnVariant::create(std::move(new_discriminators_column), std::move(new_offsets), new_variant_columns), reduced_variant};
+    }
+
+    WrapperType createVariantToDynamicWrapper(const DataTypePtr & from_type, const DataTypeDynamic & dynamic_type) const
+    {
+        const auto & from_variant_type = assert_cast<const DataTypeVariant &>(*from_type);
+        size_t max_dynamic_types = dynamic_type.getMaxDynamicTypes();
+        const auto & variants = from_variant_type.getVariants();
+        std::unordered_map<String, ColumnVariant::Discriminator> variant_name_to_discriminator;
+        variant_name_to_discriminator.reserve(variants.size());
+        for (size_t i = 0; i != variants.size(); ++i)
+            variant_name_to_discriminator[variants[i]->getName()] = i;
+
+        return [from_type, max_dynamic_types, variant_name_to_discriminator, this]
+               (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable *, size_t) -> ColumnPtr
+        {
+            const auto & variant_column = assert_cast<const ColumnVariant &>(*arguments.front().column);
+            auto [reduced_variant_column, reduced_variant_type] = getReducedVariant(variant_column, from_type, variant_name_to_discriminator, max_dynamic_types);
+            return ColumnDynamic::create(reduced_variant_column, reduced_variant_type, max_dynamic_types);
         };
     }
 
     WrapperType createColumnToDynamicWrapper(const DataTypePtr & from_type, const DataTypeDynamic & dynamic_type) const
     {
         if (const auto * variant_type = typeid_cast<const DataTypeVariant *>(from_type.get()))
-            return createVariantToDynamicWrapper(*variant_type, dynamic_type);
+            return createVariantToDynamicWrapper(from_type, dynamic_type);
+
+        if (dynamic_type.getMaxDynamicTypes() == 1)
+        {
+            DataTypePtr string_type = std::make_shared<DataTypeString>();
+            if (from_type->isNullable())
+                string_type = makeNullable(string_type);
+            auto string_wrapper = prepareUnpackDictionaries(from_type, string_type);
+            auto variant_type = std::make_shared<DataTypeVariant>(DataTypes{removeNullable(string_type)});
+            auto variant_wrapper = createColumnToVariantWrapper(string_type, *variant_type);
+            return [string_wrapper, variant_wrapper, string_type, variant_type, max_dynamic_types=dynamic_type.getMaxDynamicTypes()]
+                   (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * col_nullable, size_t input_rows_count) -> ColumnPtr
+            {
+                auto string_column = string_wrapper(arguments, string_type, col_nullable, input_rows_count);
+                auto column = ColumnWithTypeAndName(string_column, string_type, "");
+                ColumnsWithTypeAndName args = {column};
+                auto variant_column = variant_wrapper(args, variant_type, nullptr, string_column->size());
+                return ColumnDynamic::create(variant_column, variant_type, max_dynamic_types);
+            };
+        }
 
         if (context && context->getSettingsRef().cast_string_to_dynamic_use_inference && isStringOrFixedString(removeNullable(removeLowCardinality(from_type))))
             return createStringToDynamicThroughParsingWrapper();
 
-        /// First, cast column to Variant with 2 variants - the type of the column we cast and shared variant type.
         auto variant_type = std::make_shared<DataTypeVariant>(DataTypes{removeNullableOrLowCardinalityNullable(from_type)});
-        auto column_to_variant_wrapper = createColumnToVariantWrapper(from_type, *variant_type);
-        /// Second, cast this Variant to Dynamic.
-        auto variant_to_dynamic_wrapper = createVariantToDynamicWrapper(*variant_type, dynamic_type);
-        return [column_to_variant_wrapper, variant_to_dynamic_wrapper, variant_type]
-               (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable * col_nullable, size_t input_rows_count) -> ColumnPtr
+        auto variant_wrapper = createColumnToVariantWrapper(from_type, *variant_type);
+        return [variant_wrapper, variant_type, max_dynamic_types=dynamic_type.getMaxDynamicTypes()]
+               (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * col_nullable, size_t input_rows_count) -> ColumnPtr
         {
-            auto variant_res = column_to_variant_wrapper(arguments, variant_type, col_nullable, input_rows_count);
-            ColumnsWithTypeAndName args = {{variant_res, variant_type, ""}};
-            return variant_to_dynamic_wrapper(args, result_type, nullptr, input_rows_count);
+            auto variant_res = variant_wrapper(arguments, variant_type, col_nullable, input_rows_count);
+            return ColumnDynamic::create(variant_res, variant_type, max_dynamic_types);
         };
     }
 
@@ -4600,26 +4530,21 @@ private:
                    (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable *, size_t) -> ColumnPtr
             {
                 const auto & column_dynamic = assert_cast<const ColumnDynamic &>(*arguments[0].column);
-                /// We should use the same limit as already used in column and change only global limit.
-                /// It's needed because shared variant should contain values only when limit is exceeded,
-                /// so if there are already some data, we cannot increase the limit.
-                return ColumnDynamic::create(column_dynamic.getVariantColumnPtr(), column_dynamic.getVariantInfo(), column_dynamic.getMaxDynamicTypes(), to_max_types);
+                return ColumnDynamic::create(column_dynamic.getVariantColumnPtr(), column_dynamic.getVariantInfo(), to_max_types);
             };
         }
 
-        return [to_max_types]
+        return [to_max_types, this]
                (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable *, size_t) -> ColumnPtr
         {
             const auto & column_dynamic = assert_cast<const ColumnDynamic &>(*arguments[0].column);
-            /// If real limit in the column is not greater than desired, just use the same variant column.
-            if (column_dynamic.getMaxDynamicTypes() <= to_max_types)
-                return ColumnDynamic::create(column_dynamic.getVariantColumnPtr(), column_dynamic.getVariantInfo(), column_dynamic.getMaxDynamicTypes(), to_max_types);
-
-            /// Otherwise some variants should go to the shared variant. In this case we can just insert all
-            /// the data into resulting column and it will do all the logic with shared variant.
-            auto result_dynamic_column = ColumnDynamic::create(to_max_types);
-            result_dynamic_column->insertRangeFrom(column_dynamic, 0, column_dynamic.size());
-            return result_dynamic_column;
+            auto [reduced_variant_column, reduced_variant_type] = getReducedVariant(
+                column_dynamic.getVariantColumn(),
+                column_dynamic.getVariantInfo().variant_type,
+                column_dynamic.getVariantInfo().variant_name_to_discriminator,
+                to_max_types,
+                column_dynamic.getStatistics());
+            return ColumnDynamic::create(reduced_variant_column, reduced_variant_type, to_max_types);
         };
     }
 
@@ -4748,7 +4673,7 @@ private:
         return [function_name] (
             ColumnsWithTypeAndName & arguments, const DataTypePtr & res_type, const ColumnNullable * nullable_col, size_t /*input_rows_count*/)
         {
-            using ColumnEnumType = typename EnumType::ColumnType;
+            using ColumnEnumType = EnumType::ColumnType;
 
             const auto & first_col = arguments.front().column.get();
             const auto & first_type = arguments.front().type.get();
@@ -5212,8 +5137,6 @@ private:
                 return createTupleWrapper(from_type, checkAndGetDataType<DataTypeTuple>(to_type.get()));
             case TypeIndex::Map:
                 return createMapWrapper(from_type, checkAndGetDataType<DataTypeMap>(to_type.get()));
-            case TypeIndex::ObjectDeprecated:
-                return createObjectDeprecatedWrapper(from_type, checkAndGetDataType<DataTypeObjectDeprecated>(to_type.get()));
             case TypeIndex::Object:
                 return createObjectWrapper(from_type, checkAndGetDataType<DataTypeObject>(to_type.get()));
             case TypeIndex::AggregateFunction:
diff --git a/src/Functions/FunctionsDecimalArithmetics.h b/src/Functions/FunctionsDecimalArithmetics.h
index 9b9045f7c69..e26ad7362b3 100644
--- a/src/Functions/FunctionsDecimalArithmetics.h
+++ b/src/Functions/FunctionsDecimalArithmetics.h
@@ -151,36 +151,36 @@ struct Processor
     template <typename FirstArgVectorType, typename SecondArgType>
     void NO_INLINE
     vectorConstant(const FirstArgVectorType & vec_first, const SecondArgType second_value,
-                   PaddedPODArray<typename ResultType::FieldType> & vec_to, UInt16 scale_a, UInt16 scale_b, UInt16 result_scale,
-                   size_t input_rows_count) const
+                   PaddedPODArray<typename ResultType::FieldType> & vec_to, UInt16 scale_a, UInt16 scale_b, UInt16 result_scale) const
     {
-        vec_to.resize(input_rows_count);
+        size_t size = vec_first.size();
+        vec_to.resize(size);
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
             vec_to[i] = transform.execute(vec_first[i], second_value, scale_a, scale_b, result_scale);
     }
 
     template <typename FirstArgVectorType, typename SecondArgVectorType>
     void NO_INLINE
     vectorVector(const FirstArgVectorType & vec_first, const SecondArgVectorType & vec_second,
-                 PaddedPODArray<typename ResultType::FieldType> & vec_to, UInt16 scale_a, UInt16 scale_b, UInt16 result_scale,
-                 size_t input_rows_count) const
+                 PaddedPODArray<typename ResultType::FieldType> & vec_to, UInt16 scale_a, UInt16 scale_b, UInt16 result_scale) const
     {
-        vec_to.resize(input_rows_count);
+        size_t size = vec_first.size();
+        vec_to.resize(size);
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
             vec_to[i] = transform.execute(vec_first[i], vec_second[i], scale_a, scale_b, result_scale);
     }
 
     template <typename FirstArgType, typename SecondArgVectorType>
     void NO_INLINE
     constantVector(const FirstArgType & first_value, const SecondArgVectorType & vec_second,
-                   PaddedPODArray<typename ResultType::FieldType> & vec_to, UInt16 scale_a, UInt16 scale_b, UInt16 result_scale,
-                   size_t input_rows_count) const
+                   PaddedPODArray<typename ResultType::FieldType> & vec_to, UInt16 scale_a, UInt16 scale_b, UInt16 result_scale) const
     {
-        vec_to.resize(input_rows_count);
+        size_t size = vec_second.size();
+        vec_to.resize(size);
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
             vec_to[i] = transform.execute(first_value, vec_second[i], scale_a, scale_b, result_scale);
     }
 };
@@ -189,7 +189,7 @@ struct Processor
 template <typename FirstArgType, typename SecondArgType, typename ResultType, typename Transform>
 struct DecimalArithmeticsImpl
 {
-    static ColumnPtr execute(Transform transform, const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count)
+    static ColumnPtr execute(Transform transform, const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type)
     {
         using FirstArgValueType = typename FirstArgType::FieldType;
         using FirstArgColumnType = typename FirstArgType::ColumnType;
@@ -214,13 +214,13 @@ struct DecimalArithmeticsImpl
         if (first_col)
         {
             if (second_col_const)
-                op.vectorConstant(first_col->getData(), second_col_const->template getValue<SecondArgValueType>(), col_to->getData(), scale_a, scale_b, result_scale, input_rows_count);
+                op.vectorConstant(first_col->getData(), second_col_const->template getValue<SecondArgValueType>(), col_to->getData(), scale_a, scale_b, result_scale);
             else
-                op.vectorVector(first_col->getData(), second_col->getData(), col_to->getData(), scale_a, scale_b, result_scale, input_rows_count);
+                op.vectorVector(first_col->getData(), second_col->getData(), col_to->getData(), scale_a, scale_b, result_scale);
         }
         else if (first_col_const)
         {
-            op.constantVector(first_col_const->template getValue<FirstArgValueType>(), second_col->getData(), col_to->getData(), scale_a, scale_b, result_scale, input_rows_count);
+            op.constantVector(first_col_const->template getValue<FirstArgValueType>(), second_col->getData(), col_to->getData(), scale_a, scale_b, result_scale);
         }
         else
         {
@@ -293,14 +293,14 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {2}; }
 
-    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
     {
-        return resolveOverload(arguments, result_type, input_rows_count);
+        return resolveOverload(arguments, result_type);
     }
 
 private:
     // long resolver to call proper templated func
-    ColumnPtr resolveOverload(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+    ColumnPtr resolveOverload(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const
     {
         WhichDataType which_dividend(arguments[0].type.get());
         WhichDataType which_divisor(arguments[1].type.get());
@@ -309,26 +309,26 @@ private:
         {
             using DividendType = DataTypeDecimal32;
             if (which_divisor.isDecimal32())
-                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal32, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type, input_rows_count);
+                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal32, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type);
             else if (which_divisor.isDecimal64())
-                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal64, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type, input_rows_count);
+                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal64, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type);
             else if (which_divisor.isDecimal128())
-                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal128, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type, input_rows_count);
+                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal128, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type);
             else if (which_divisor.isDecimal256())
-                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal256, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type, input_rows_count);
+                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal256, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type);
         }
 
         else if (which_dividend.isDecimal64())
         {
             using DividendType = DataTypeDecimal64;
             if (which_divisor.isDecimal32())
-                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal32, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type, input_rows_count);
+                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal32, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type);
             else if (which_divisor.isDecimal64())
-                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal64, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type, input_rows_count);
+                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal64, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type);
             else if (which_divisor.isDecimal128())
-                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal128, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type, input_rows_count);
+                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal128, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type);
             else if (which_divisor.isDecimal256())
-                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal256, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type, input_rows_count);
+                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal256, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type);
 
         }
 
@@ -336,13 +336,13 @@ private:
         {
             using DividendType = DataTypeDecimal128;
             if (which_divisor.isDecimal32())
-                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal32, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type, input_rows_count);
+                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal32, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type);
             else if (which_divisor.isDecimal64())
-                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal64, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type, input_rows_count);
+                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal64, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type);
             else if (which_divisor.isDecimal128())
-                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal128, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type, input_rows_count);
+                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal128, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type);
             else if (which_divisor.isDecimal256())
-                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal256, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type, input_rows_count);
+                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal256, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type);
 
         }
 
@@ -350,13 +350,13 @@ private:
         {
             using DividendType = DataTypeDecimal256;
             if (which_divisor.isDecimal32())
-                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal32, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type, input_rows_count);
+                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal32, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type);
             else if (which_divisor.isDecimal64())
-                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal64, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type, input_rows_count);
+                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal64, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type);
             else if (which_divisor.isDecimal128())
-                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal128, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type, input_rows_count);
+                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal128, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type);
             else if (which_divisor.isDecimal256())
-                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal256, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type, input_rows_count);
+                return DecimalArithmeticsImpl<DividendType, DataTypeDecimal256, DataTypeDecimal256, Transform>::execute(Transform{}, arguments, result_type);
 
         }
 
diff --git a/src/Functions/FunctionsEmbeddedDictionaries.h b/src/Functions/FunctionsEmbeddedDictionaries.h
index f27934ce5a9..2f270bf999a 100644
--- a/src/Functions/FunctionsEmbeddedDictionaries.h
+++ b/src/Functions/FunctionsEmbeddedDictionaries.h
@@ -181,7 +181,7 @@ public:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         /// The dictionary key that defines the "point of view".
         std::string dict_key;
@@ -205,9 +205,10 @@ public:
 
             const typename ColumnVector<T>::Container & vec_from = col_from->getData();
             typename ColumnVector<T>::Container & vec_to = col_to->getData();
-            vec_to.resize(input_rows_count);
+            size_t size = vec_from.size();
+            vec_to.resize(size);
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
                 vec_to[i] = Transform::apply(vec_from[i], dict);
 
             return col_to;
@@ -272,7 +273,7 @@ public:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         /// The dictionary key that defines the "point of view".
         std::string dict_key;
@@ -302,9 +303,10 @@ public:
             const typename ColumnVector<T>::Container & vec_from1 = col_vec1->getData();
             const typename ColumnVector<T>::Container & vec_from2 = col_vec2->getData();
             typename ColumnUInt8::Container & vec_to = col_to->getData();
-            vec_to.resize(input_rows_count);
+            size_t size = vec_from1.size();
+            vec_to.resize(size);
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
                 vec_to[i] = Transform::apply(vec_from1[i], vec_from2[i], dict);
 
             return col_to;
@@ -316,9 +318,10 @@ public:
             const typename ColumnVector<T>::Container & vec_from1 = col_vec1->getData();
             const T const_from2 = col_const2->template getValue<T>();
             typename ColumnUInt8::Container & vec_to = col_to->getData();
-            vec_to.resize(input_rows_count);
+            size_t size = vec_from1.size();
+            vec_to.resize(size);
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
                 vec_to[i] = Transform::apply(vec_from1[i], const_from2, dict);
 
             return col_to;
@@ -330,9 +333,10 @@ public:
             const T const_from1 = col_const1->template getValue<T>();
             const typename ColumnVector<T>::Container & vec_from2 = col_vec2->getData();
             typename ColumnUInt8::Container & vec_to = col_to->getData();
-            vec_to.resize(input_rows_count);
+            size_t size = vec_from2.size();
+            vec_to.resize(size);
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
                 vec_to[i] = Transform::apply(const_from1, vec_from2[i], dict);
 
             return col_to;
@@ -401,7 +405,7 @@ public:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         /// The dictionary key that defines the "point of view".
         std::string dict_key;
@@ -428,10 +432,11 @@ public:
             auto & res_values = col_values->getData();
 
             const typename ColumnVector<T>::Container & vec_from = col_from->getData();
-            res_offsets.resize(input_rows_count);
-            res_values.reserve(input_rows_count * 4);
+            size_t size = vec_from.size();
+            res_offsets.resize(size);
+            res_values.reserve(size * 4);
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 T cur = vec_from[i];
                 for (size_t depth = 0; cur && depth < DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH; ++depth)
diff --git a/src/Functions/FunctionsHashing.h b/src/Functions/FunctionsHashing.h
index d18a375c248..3da0b2cd9be 100644
--- a/src/Functions/FunctionsHashing.h
+++ b/src/Functions/FunctionsHashing.h
@@ -19,9 +19,7 @@
 #include <Common/HashTable/Hash.h>
 
 #if USE_SSL
-#    include <openssl/evp.h>
 #    include <openssl/md5.h>
-#    include <openssl/ripemd.h>
 #endif
 
 #include <bit>
@@ -198,34 +196,6 @@ T combineHashesFunc(T t1, T t2)
     return HashFunction::apply(reinterpret_cast<const char *>(hashes), sizeof(hashes));
 }
 
-#if USE_SSL
-struct RipeMD160Impl
-{
-    static constexpr auto name = "ripeMD160";
-    using ReturnType = UInt256;
-
-    static UInt256 apply(const char * begin, size_t size)
-    {
-        UInt8 digest[RIPEMD160_DIGEST_LENGTH];
-
-        RIPEMD160(reinterpret_cast<const unsigned char *>(begin), size, reinterpret_cast<unsigned char *>(digest));
-
-        std::reverse(digest, digest + RIPEMD160_DIGEST_LENGTH);
-
-        UInt256 res = 0;
-        std::memcpy(&res, digest, RIPEMD160_DIGEST_LENGTH);
-
-        return res;
-    }
-
-    static UInt256 combineHashes(UInt256 h1, UInt256 h2)
-    {
-        return combineHashesFunc<UInt256, RipeMD160Impl>(h1, h2);
-    }
-
-    static constexpr bool use_int_hash_for_pods = false;
-};
-#endif
 
 struct SipHash64Impl
 {
@@ -1654,7 +1624,6 @@ using FunctionIntHash32 = FunctionIntHash<IntHash32Impl, NameIntHash32>;
 using FunctionIntHash64 = FunctionIntHash<IntHash64Impl, NameIntHash64>;
 #if USE_SSL
 using FunctionHalfMD5 = FunctionAnyHash<HalfMD5Impl>;
-using FunctionRipeMD160Hash = FunctionAnyHash<RipeMD160Impl>;
 #endif
 using FunctionSipHash128 = FunctionAnyHash<SipHash128Impl>;
 using FunctionSipHash128Keyed = FunctionAnyHash<SipHash128KeyedImpl, true, SipHash128KeyedImpl::Key, SipHash128KeyedImpl::KeyColumns>;
@@ -1683,7 +1652,6 @@ using FunctionXxHash64 = FunctionAnyHash<ImplXxHash64>;
 using FunctionXXH3 = FunctionAnyHash<ImplXXH3>;
 
 using FunctionWyHash64 = FunctionAnyHash<ImplWyHash64>;
-
 }
 
 #pragma clang diagnostic pop
diff --git a/src/Functions/FunctionsHashingRipe.cpp b/src/Functions/FunctionsHashingRipe.cpp
deleted file mode 100644
index 315296b7690..00000000000
--- a/src/Functions/FunctionsHashingRipe.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "FunctionsHashing.h"
-
-#include <Functions/FunctionFactory.h>
-
-/// FunctionsHashing instantiations are separated into files FunctionsHashing*.cpp
-/// to better parallelize the build procedure and avoid MSan build failure
-/// due to excessive resource consumption.
-namespace DB
-{
-#if USE_SSL
-REGISTER_FUNCTION(HashingRipe)
-{
-    factory.registerFunction<FunctionRipeMD160Hash>(FunctionDocumentation{
-        .description = "RIPEMD-160 hash function, primarily used in Bitcoin address generation.",
-        .examples{{"", "SELECT hex(ripeMD160('The quick brown fox jumps over the lazy dog'));", R"(
-            ┌─hex(ripeMD160('The quick brown fox jumps over the lazy dog'))─┐
-            │ 37F332F68DB77BD9D7EDD4969571AD671CF9DD3B                      │
-            └───────────────────────────────────────────────────────────────┘
-        )"}},
-        .categories{"Hash"}});
-}
-#endif
-}
diff --git a/src/Functions/FunctionsJSON.cpp b/src/Functions/FunctionsJSON.cpp
index e6892642d56..848856c500f 100644
--- a/src/Functions/FunctionsJSON.cpp
+++ b/src/Functions/FunctionsJSON.cpp
@@ -125,7 +125,7 @@ public:
             }
 
             String error;
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (const auto i : collections::range(0, input_rows_count))
             {
                 if (!col_json_const)
                 {
@@ -243,7 +243,7 @@ private:
                 }
                 case MoveType::Index:
                 {
-                    Int64 index = (*arguments[j + 1].column)[row].safeGet<Int64>();
+                    Int64 index = (*arguments[j + 1].column)[row].get<Int64>();
                     if (!moveToElementByIndex<JSONParser>(res_element, static_cast<int>(index), key))
                         return false;
                     break;
@@ -314,7 +314,7 @@ private:
     static size_t calculateMaxSize(const ColumnString::Offsets & offsets)
     {
         size_t max_size = 0;
-        for (size_t i = 0; i < offsets.size(); ++i)
+        for (const auto i : collections::range(0, offsets.size()))
         {
             size_t size = offsets[i] - offsets[i - 1];
             max_size = std::max(max_size, size);
@@ -739,7 +739,7 @@ public:
     {
         NumberType value;
 
-        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, convert_bool_to_integer, /*allow_type_conversion=*/true, error))
+        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, convert_bool_to_integer, error))
             return false;
         auto & col_vec = assert_cast<ColumnVector<NumberType> &>(dest);
         col_vec.insertValue(value);
diff --git a/src/Functions/FunctionsLanguageClassification.cpp b/src/Functions/FunctionsLanguageClassification.cpp
index 410eea0f437..55485d41ce0 100644
--- a/src/Functions/FunctionsLanguageClassification.cpp
+++ b/src/Functions/FunctionsLanguageClassification.cpp
@@ -31,7 +31,7 @@ extern const int SUPPORT_IS_DISABLED;
 
 struct FunctionDetectLanguageImpl
 {
-    static std::string_view codeISO(std::string_view code_string)
+    static ALWAYS_INLINE inline std::string_view codeISO(std::string_view code_string)
     {
         if (code_string.ends_with("-Latn"))
             code_string.remove_suffix(code_string.size() - 5);
@@ -63,17 +63,16 @@ struct FunctionDetectLanguageImpl
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         /// Constant 3 is based on the fact that in general we need 2 characters for ISO code + 1 zero byte
-        res_data.reserve(input_rows_count * 3);
-        res_offsets.resize(input_rows_count);
+        res_data.reserve(offsets.size() * 3);
+        res_offsets.resize(offsets.size());
 
         bool is_reliable;
         size_t res_offset = 0;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < offsets.size(); ++i)
         {
             const UInt8 * str = data.data() + offsets[i - 1];
             const size_t str_len = offsets[i] - offsets[i - 1] - 1;
diff --git a/src/Functions/FunctionsLogical.cpp b/src/Functions/FunctionsLogical.cpp
index ff0cff09c9e..e1814150da6 100644
--- a/src/Functions/FunctionsLogical.cpp
+++ b/src/Functions/FunctionsLogical.cpp
@@ -48,7 +48,7 @@ using UInt8Container = ColumnUInt8::Container;
 using UInt8ColumnPtrs = std::vector<const ColumnUInt8 *>;
 
 
-MutableColumnPtr buildColumnFromTernaryData(const UInt8Container & ternary_data, bool make_nullable)
+MutableColumnPtr buildColumnFromTernaryData(const UInt8Container & ternary_data, const bool make_nullable)
 {
     const size_t rows_count = ternary_data.size();
 
@@ -701,11 +701,11 @@ ColumnPtr FunctionAnyArityLogical<Impl, Name>::getConstantResultForNonConstArgum
         bool constant_value_bool = false;
 
         if (field_type == Field::Types::Float64)
-            constant_value_bool = static_cast<bool>(constant_field_value.safeGet<Float64>());
+            constant_value_bool = static_cast<bool>(constant_field_value.get<Float64>());
         else if (field_type == Field::Types::Int64)
-            constant_value_bool = static_cast<bool>(constant_field_value.safeGet<Int64>());
+            constant_value_bool = static_cast<bool>(constant_field_value.get<Int64>());
         else if (field_type == Field::Types::UInt64)
-            constant_value_bool = static_cast<bool>(constant_field_value.safeGet<UInt64>());
+            constant_value_bool = static_cast<bool>(constant_field_value.get<UInt64>());
 
         has_true_constant = has_true_constant || constant_value_bool;
         has_false_constant = has_false_constant || !constant_value_bool;
diff --git a/src/Functions/FunctionsMultiStringFuzzySearch.h b/src/Functions/FunctionsMultiStringFuzzySearch.h
index 8346380c35d..a92a6570279 100644
--- a/src/Functions/FunctionsMultiStringFuzzySearch.h
+++ b/src/Functions/FunctionsMultiStringFuzzySearch.h
@@ -71,7 +71,7 @@ public:
         return Impl::getReturnType();
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr & haystack_ptr = arguments[0].column;
         const ColumnPtr & edit_distance_ptr = arguments[1].column;
@@ -114,16 +114,14 @@ public:
                 col_needles_const->getValue<Array>(),
                 vec_res, offsets_res,
                 edit_distance,
-                allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps,
-                input_rows_count);
+                allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps);
         else
             Impl::vectorVector(
                 col_haystack_vector->getChars(), col_haystack_vector->getOffsets(),
                 col_needles_vector->getData(), col_needles_vector->getOffsets(),
                 vec_res, offsets_res,
                 edit_distance,
-                allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps,
-                input_rows_count);
+                allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps);
 
         // the combination of const haystack + const needle is not implemented because
         // useDefaultImplementationForConstants() == true makes upper layers convert both to
diff --git a/src/Functions/FunctionsMultiStringSearch.h b/src/Functions/FunctionsMultiStringSearch.h
index 6bcc8581a38..03db2651fd0 100644
--- a/src/Functions/FunctionsMultiStringSearch.h
+++ b/src/Functions/FunctionsMultiStringSearch.h
@@ -81,7 +81,7 @@ public:
         return Impl::getReturnType();
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr & haystack_ptr = arguments[0].column;
         const ColumnPtr & needles_ptr = arguments[1].column;
@@ -110,15 +110,13 @@ public:
                 col_haystack_vector->getChars(), col_haystack_vector->getOffsets(),
                 col_needles_const->getValue<Array>(),
                 vec_res, offsets_res,
-                allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps,
-                input_rows_count);
+                allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps);
         else
             Impl::vectorVector(
                 col_haystack_vector->getChars(), col_haystack_vector->getOffsets(),
                 col_needles_vector->getData(), col_needles_vector->getOffsets(),
                 vec_res, offsets_res,
-                allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps,
-                input_rows_count);
+                allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps);
 
         // the combination of const haystack + const needle is not implemented because
         // useDefaultImplementationForConstants() == true makes upper layers convert both to
diff --git a/src/Functions/FunctionsProgrammingClassification.cpp b/src/Functions/FunctionsProgrammingClassification.cpp
index bbedef024d5..c01e47ad0d7 100644
--- a/src/Functions/FunctionsProgrammingClassification.cpp
+++ b/src/Functions/FunctionsProgrammingClassification.cpp
@@ -40,18 +40,17 @@ struct FunctionDetectProgrammingLanguageImpl
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         const auto & programming_freq = FrequencyHolder::getInstance().getProgrammingFrequency();
 
         /// Constant 5 is arbitrary
-        res_data.reserve(input_rows_count * 5);
-        res_offsets.resize(input_rows_count);
+        res_data.reserve(offsets.size() * 5);
+        res_offsets.resize(offsets.size());
 
         size_t res_offset = 0;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < offsets.size(); ++i)
         {
             const UInt8 * str = data.data() + offsets[i - 1];
             const size_t str_len = offsets[i] - offsets[i - 1] - 1;
diff --git a/src/Functions/FunctionsRandom.h b/src/Functions/FunctionsRandom.h
index 83075ca01cb..36448c6f689 100644
--- a/src/Functions/FunctionsRandom.h
+++ b/src/Functions/FunctionsRandom.h
@@ -80,7 +80,8 @@ public:
         auto col_to = ColumnVector<ToType>::create();
         typename ColumnVector<ToType>::Container & vec_to = col_to->getData();
 
-        vec_to.resize(input_rows_count);
+        size_t size = input_rows_count;
+        vec_to.resize(size);
         RandImpl::execute(reinterpret_cast<char *>(vec_to.data()), vec_to.size() * sizeof(ToType));
 
         return col_to;
diff --git a/src/Functions/FunctionsRound.h b/src/Functions/FunctionsRound.h
index ed7fe1a5de1..6b65a5feaec 100644
--- a/src/Functions/FunctionsRound.h
+++ b/src/Functions/FunctionsRound.h
@@ -500,7 +500,7 @@ inline Scale getScaleArg(const ColumnConst* scale_col)
 {
     const auto & scale_field = scale_col->getField();
 
-    Int64 scale64 = scale_field.safeGet<Int64>();
+    Int64 scale64 = scale_field.get<Int64>();
     validateScale(scale64);
 
     return scale64;
@@ -632,7 +632,7 @@ public:
                         Scale raw_scale = scale64;
 
                         DecimalRoundingImpl<T, rounding_mode, tie_breaking_mode>::applyOne(value_col_typed->getElement(i), value_col_typed->getScale(),
-                            reinterpret_cast<typename ColumnDecimal<T>::NativeT&>(col_res->getElement(i)), raw_scale);
+                            reinterpret_cast<ColumnDecimal<T>::NativeT&>(col_res->getElement(i)), raw_scale);
                     }
                 }
             }
@@ -854,7 +854,7 @@ private:
         using ValueType = typename Container::value_type;
         std::vector<ValueType> boundary_values(boundaries.size());
         for (size_t i = 0; i < boundaries.size(); ++i)
-            boundary_values[i] = static_cast<ValueType>(boundaries[i].safeGet<ValueType>());
+            boundary_values[i] = static_cast<ValueType>(boundaries[i].get<ValueType>());
 
         ::sort(boundary_values.begin(), boundary_values.end());
         boundary_values.erase(std::unique(boundary_values.begin(), boundary_values.end()), boundary_values.end());
diff --git a/src/Functions/FunctionsStringDistance.cpp b/src/Functions/FunctionsStringDistance.cpp
index 5aae92a8141..48f4aaf4e09 100644
--- a/src/Functions/FunctionsStringDistance.cpp
+++ b/src/Functions/FunctionsStringDistance.cpp
@@ -37,12 +37,12 @@ struct FunctionStringDistanceImpl
         const ColumnString::Offsets & haystack_offsets,
         const ColumnString::Chars & needle_data,
         const ColumnString::Offsets & needle_offsets,
-        PaddedPODArray<ResultType> & res,
-        size_t input_rows_count)
+        PaddedPODArray<ResultType> & res)
     {
+        size_t size = res.size();
         const char * haystack = reinterpret_cast<const char *>(haystack_data.data());
         const char * needle = reinterpret_cast<const char *>(needle_data.data());
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             res[i] = Op::process(
                 haystack + haystack_offsets[i - 1],
@@ -56,13 +56,13 @@ struct FunctionStringDistanceImpl
         const String & haystack,
         const ColumnString::Chars & needle_data,
         const ColumnString::Offsets & needle_offsets,
-        PaddedPODArray<ResultType> & res,
-        size_t input_rows_count)
+        PaddedPODArray<ResultType> & res)
     {
         const char * haystack_data = haystack.data();
         size_t haystack_size = haystack.size();
         const char * needle = reinterpret_cast<const char *>(needle_data.data());
-        for (size_t i = 0; i < input_rows_count; ++i)
+        size_t size = res.size();
+        for (size_t i = 0; i < size; ++i)
         {
             res[i] = Op::process(haystack_data, haystack_size,
                 needle + needle_offsets[i - 1], needle_offsets[i] - needle_offsets[i - 1] - 1);
@@ -73,10 +73,9 @@ struct FunctionStringDistanceImpl
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         const String & needle,
-        PaddedPODArray<ResultType> & res,
-        size_t input_rows_count)
+        PaddedPODArray<ResultType> & res)
     {
-        constantVector(needle, data, offsets, res, input_rows_count);
+        constantVector(needle, data, offsets, res);
     }
 
 };
diff --git a/src/Functions/FunctionsStringHash.cpp b/src/Functions/FunctionsStringHash.cpp
index bd7d45d781a..0bf6e39e651 100644
--- a/src/Functions/FunctionsStringHash.cpp
+++ b/src/Functions/FunctionsStringHash.cpp
@@ -315,9 +315,9 @@ struct SimHashImpl
         return getSimHash(finger_vec);
     }
 
-    static void apply(const ColumnString::Chars & data, const ColumnString::Offsets & offsets, size_t shingle_size, PaddedPODArray<UInt64> & res, size_t input_rows_count)
+    static void apply(const ColumnString::Chars & data, const ColumnString::Offsets & offsets, size_t shingle_size, PaddedPODArray<UInt64> & res)
     {
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < offsets.size(); ++i)
         {
             const UInt8 * one_data = &data[offsets[i - 1]];
             const size_t data_size = offsets[i] - offsets[i - 1] - 1;
@@ -543,13 +543,12 @@ struct MinHashImpl
         PaddedPODArray<UInt64> * res1,
         PaddedPODArray<UInt64> * res2,
         ColumnTuple * res1_strings,
-        ColumnTuple * res2_strings,
-        size_t input_rows_count)
+        ColumnTuple * res2_strings)
     {
         MinHeap min_heap;
         MaxHeap max_heap;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < offsets.size(); ++i)
         {
             const UInt8 * one_data = &data[offsets[i - 1]];
             const size_t data_size = offsets[i] - offsets[i - 1] - 1;
diff --git a/src/Functions/FunctionsStringHash.h b/src/Functions/FunctionsStringHash.h
index f790c660e21..fcd4c970a47 100644
--- a/src/Functions/FunctionsStringHash.h
+++ b/src/Functions/FunctionsStringHash.h
@@ -135,7 +135,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         const ColumnPtr & column = arguments[0].column;
 
@@ -152,9 +152,9 @@ public:
         {
             auto col_res = ColumnVector<UInt64>::create();
             auto & vec_res = col_res->getData();
-            vec_res.resize(input_rows_count);
+            vec_res.resize(column->size());
             const ColumnString & col_str_vector = checkAndGetColumn<ColumnString>(*column);
-            Impl::apply(col_str_vector.getChars(), col_str_vector.getOffsets(), shingle_size, vec_res, input_rows_count);
+            Impl::apply(col_str_vector.getChars(), col_str_vector.getOffsets(), shingle_size, vec_res);
             return col_res;
         }
         else if constexpr (is_arg) // Min hash arg
@@ -171,7 +171,7 @@ public:
             auto max_tuple = ColumnTuple::create(std::move(max_columns));
 
             const ColumnString & col_str_vector = checkAndGetColumn<ColumnString>(*column);
-            Impl::apply(col_str_vector.getChars(), col_str_vector.getOffsets(), shingle_size, num_hashes, nullptr, nullptr, min_tuple.get(), max_tuple.get(), input_rows_count);
+            Impl::apply(col_str_vector.getChars(), col_str_vector.getOffsets(), shingle_size, num_hashes, nullptr, nullptr, min_tuple.get(), max_tuple.get());
 
             MutableColumns tuple_columns;
             tuple_columns.emplace_back(std::move(min_tuple));
@@ -184,10 +184,10 @@ public:
             auto col_h2 = ColumnVector<UInt64>::create();
             auto & vec_h1 = col_h1->getData();
             auto & vec_h2 = col_h2->getData();
-            vec_h1.resize(input_rows_count);
-            vec_h2.resize(input_rows_count);
+            vec_h1.resize(column->size());
+            vec_h2.resize(column->size());
             const ColumnString & col_str_vector = checkAndGetColumn<ColumnString>(*column);
-            Impl::apply(col_str_vector.getChars(), col_str_vector.getOffsets(), shingle_size, num_hashes, &vec_h1, &vec_h2, nullptr, nullptr, input_rows_count);
+            Impl::apply(col_str_vector.getChars(), col_str_vector.getOffsets(), shingle_size, num_hashes, &vec_h1, &vec_h2, nullptr, nullptr);
             MutableColumns tuple_columns;
             tuple_columns.emplace_back(std::move(col_h1));
             tuple_columns.emplace_back(std::move(col_h2));
diff --git a/src/Functions/FunctionsStringHashFixedString.cpp b/src/Functions/FunctionsStringHashFixedString.cpp
index 9474fe2629e..01e989a7f2c 100644
--- a/src/Functions/FunctionsStringHashFixedString.cpp
+++ b/src/Functions/FunctionsStringHashFixedString.cpp
@@ -224,7 +224,7 @@ public:
 
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         if (const ColumnString * col_from = checkAndGetColumn<ColumnString>(arguments[0].column.get()))
         {
@@ -233,10 +233,11 @@ public:
             const typename ColumnString::Chars & data = col_from->getChars();
             const typename ColumnString::Offsets & offsets = col_from->getOffsets();
             auto & chars_to = col_to->getChars();
-            chars_to.resize(input_rows_count * Impl::length);
+            const auto size = offsets.size();
+            chars_to.resize(size * Impl::length);
 
             ColumnString::Offset current_offset = 0;
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 Impl::apply(
                     reinterpret_cast<const char *>(&data[current_offset]),
@@ -252,10 +253,11 @@ public:
         {
             auto col_to = ColumnFixedString::create(Impl::length);
             const typename ColumnFixedString::Chars & data = col_from_fix->getChars();
+            const auto size = col_from_fix->size();
             auto & chars_to = col_to->getChars();
             const auto length = col_from_fix->getN();
-            chars_to.resize(input_rows_count * Impl::length);
-            for (size_t i = 0; i < input_rows_count; ++i)
+            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]));
@@ -266,10 +268,11 @@ public:
         {
             auto col_to = ColumnFixedString::create(Impl::length);
             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 = sizeof(IPv6::UnderlyingType);
-            chars_to.resize(input_rows_count * Impl::length);
-            for (size_t i = 0; i < input_rows_count; ++i)
+            chars_to.resize(size * Impl::length);
+            for (size_t i = 0; i < size; ++i)
             {
                 Impl::apply(
                     reinterpret_cast<const char *>(&data[i]), length, reinterpret_cast<uint8_t *>(&chars_to[i * Impl::length]));
diff --git a/src/Functions/FunctionsStringSearch.h b/src/Functions/FunctionsStringSearch.h
index 7ec0076e395..fba6336ebff 100644
--- a/src/Functions/FunctionsStringSearch.h
+++ b/src/Functions/FunctionsStringSearch.h
@@ -163,7 +163,7 @@ public:
         return return_type;
     }
 
-    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
     {
         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;
@@ -236,8 +236,7 @@ public:
                 col_needle_vector->getOffsets(),
                 column_start_pos,
                 vec_res,
-                null_map.get(),
-                input_rows_count);
+                null_map.get());
         else if (col_haystack_vector && col_needle_const)
             Impl::vectorConstant(
                 col_haystack_vector->getChars(),
@@ -245,8 +244,7 @@ public:
                 col_needle_const->getValue<String>(),
                 column_start_pos,
                 vec_res,
-                null_map.get(),
-                input_rows_count);
+                null_map.get());
         else if (col_haystack_vector_fixed && col_needle_vector)
             Impl::vectorFixedVector(
                 col_haystack_vector_fixed->getChars(),
@@ -255,16 +253,14 @@ public:
                 col_needle_vector->getOffsets(),
                 column_start_pos,
                 vec_res,
-                null_map.get(),
-                input_rows_count);
+                null_map.get());
         else if (col_haystack_vector_fixed && col_needle_const)
             Impl::vectorFixedConstant(
                 col_haystack_vector_fixed->getChars(),
                 col_haystack_vector_fixed->getN(),
                 col_needle_const->getValue<String>(),
                 vec_res,
-                null_map.get(),
-                input_rows_count);
+                null_map.get());
         else if (col_haystack_const && col_needle_vector)
             Impl::constantVector(
                 col_haystack_const->getValue<String>(),
@@ -272,8 +268,7 @@ public:
                 col_needle_vector->getOffsets(),
                 column_start_pos,
                 vec_res,
-                null_map.get(),
-                input_rows_count);
+                null_map.get());
         else
             throw Exception(
                 ErrorCodes::ILLEGAL_COLUMN,
diff --git a/src/Functions/FunctionsStringSearchToString.h b/src/Functions/FunctionsStringSearchToString.h
index c889cf062a3..978a84de472 100644
--- a/src/Functions/FunctionsStringSearchToString.h
+++ b/src/Functions/FunctionsStringSearchToString.h
@@ -60,7 +60,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr column = arguments[0].column;
         const ColumnPtr column_needle = arguments[1].column;
@@ -75,7 +75,7 @@ public:
 
             ColumnString::Chars & vec_res = col_res->getChars();
             ColumnString::Offsets & offsets_res = col_res->getOffsets();
-            Impl::vector(col->getChars(), col->getOffsets(), col_needle->getValue<String>(), vec_res, offsets_res, input_rows_count);
+            Impl::vector(col->getChars(), col->getOffsets(), col_needle->getValue<String>(), vec_res, offsets_res);
 
             return col_res;
         }
diff --git a/src/Functions/FunctionsStringSimilarity.cpp b/src/Functions/FunctionsStringSimilarity.cpp
index 5e26e4ad482..7b3f2337c89 100644
--- a/src/Functions/FunctionsStringSimilarity.cpp
+++ b/src/Functions/FunctionsStringSimilarity.cpp
@@ -90,7 +90,7 @@ struct NgramDistanceImpl
         ((cont[Offset + I] = std::tolower(cont[Offset + I])), ...);
     }
 
-    static size_t readASCIICodePoints(CodePoint * code_points, const char *& pos, const char * end)
+    static ALWAYS_INLINE size_t readASCIICodePoints(CodePoint * code_points, const char *& pos, const char * end)
     {
         /// Offset before which we copy some data.
         constexpr size_t padding_offset = default_padding - N + 1;
@@ -120,7 +120,7 @@ struct NgramDistanceImpl
         return default_padding;
     }
 
-    static size_t readUTF8CodePoints(CodePoint * code_points, const char *& pos, const char * end)
+    static ALWAYS_INLINE size_t readUTF8CodePoints(CodePoint * code_points, const char *& pos, const char * end)
     {
         /// The same copying as described in the function above.
         memcpy(code_points, code_points + default_padding - N + 1, roundUpToPowerOfTwoOrZero(N - 1) * sizeof(CodePoint));
@@ -195,7 +195,7 @@ struct NgramDistanceImpl
     }
 
     template <bool save_ngrams>
-    static inline size_t calculateNeedleStats(
+    static ALWAYS_INLINE inline size_t calculateNeedleStats(
         const char * data,
         const size_t size,
         NgramCount * ngram_stats,
@@ -228,7 +228,7 @@ struct NgramDistanceImpl
     }
 
     template <bool reuse_stats>
-    static inline UInt64 calculateHaystackStatsAndMetric(
+    static ALWAYS_INLINE inline UInt64 calculateHaystackStatsAndMetric(
         const char * data,
         const size_t size,
         NgramCount * ngram_stats,
@@ -318,9 +318,9 @@ struct NgramDistanceImpl
         const ColumnString::Offsets & haystack_offsets,
         const ColumnString::Chars & needle_data,
         const ColumnString::Offsets & needle_offsets,
-        PaddedPODArray<Float32> & res,
-        size_t input_rows_count)
+        PaddedPODArray<Float32> & res)
     {
+        const size_t haystack_offsets_size = haystack_offsets.size();
         size_t prev_haystack_offset = 0;
         size_t prev_needle_offset = 0;
 
@@ -331,7 +331,7 @@ struct NgramDistanceImpl
         std::unique_ptr<UInt16[]> needle_ngram_storage(new UInt16[max_string_size]);
         std::unique_ptr<UInt16[]> haystack_ngram_storage(new UInt16[max_string_size]);
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_offsets_size; ++i)
         {
             const char * haystack = reinterpret_cast<const char *>(&haystack_data[prev_haystack_offset]);
             const size_t haystack_size = haystack_offsets[i] - prev_haystack_offset - 1;
@@ -391,13 +391,12 @@ struct NgramDistanceImpl
         std::string haystack,
         const ColumnString::Chars & needle_data,
         const ColumnString::Offsets & needle_offsets,
-        PaddedPODArray<Float32> & res,
-        size_t input_rows_count)
+        PaddedPODArray<Float32> & res)
     {
         /// For symmetric version it is better to use vector_constant
         if constexpr (symmetric)
         {
-            vectorConstant(needle_data, needle_offsets, std::move(haystack), res, input_rows_count);
+            vectorConstant(needle_data, needle_offsets, std::move(haystack), res);
         }
         else
         {
@@ -405,6 +404,7 @@ struct NgramDistanceImpl
             haystack.resize(haystack_size + default_padding);
 
             /// For logic explanation see vector_vector function.
+            const size_t needle_offsets_size = needle_offsets.size();
             size_t prev_offset = 0;
 
             std::unique_ptr<NgramCount[]> common_stats{new NgramCount[map_size]{}};
@@ -412,7 +412,7 @@ struct NgramDistanceImpl
             std::unique_ptr<UInt16[]> needle_ngram_storage(new UInt16[max_string_size]);
             std::unique_ptr<UInt16[]> haystack_ngram_storage(new UInt16[max_string_size]);
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < needle_offsets_size; ++i)
             {
                 const char * needle = reinterpret_cast<const char *>(&needle_data[prev_offset]);
                 const size_t needle_size = needle_offsets[i] - prev_offset - 1;
@@ -456,8 +456,7 @@ struct NgramDistanceImpl
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         std::string needle,
-        PaddedPODArray<Float32> & res,
-        size_t input_rows_count)
+        PaddedPODArray<Float32> & res)
     {
         /// zeroing our map
         std::unique_ptr<NgramCount[]> common_stats{new NgramCount[map_size]{}};
@@ -473,7 +472,7 @@ struct NgramDistanceImpl
 
         size_t distance = needle_stats_size;
         size_t prev_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < offsets.size(); ++i)
         {
             const UInt8 * haystack = &data[prev_offset];
             const size_t haystack_size = offsets[i] - prev_offset - 1;
diff --git a/src/Functions/FunctionsStringSimilarity.h b/src/Functions/FunctionsStringSimilarity.h
index c2cf7137286..e148730054d 100644
--- a/src/Functions/FunctionsStringSimilarity.h
+++ b/src/Functions/FunctionsStringSimilarity.h
@@ -57,7 +57,7 @@ public:
         return std::make_shared<DataTypeNumber<typename Impl::ResultType>>();
     }
 
-    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
     {
         using ResultType = typename Impl::ResultType;
 
@@ -90,7 +90,7 @@ public:
         auto col_res = ColumnVector<ResultType>::create();
 
         typename ColumnVector<ResultType>::Container & vec_res = col_res->getData();
-        vec_res.resize(input_rows_count);
+        vec_res.resize(column_haystack->size());
 
         const ColumnString * col_haystack_vector = checkAndGetColumn<ColumnString>(&*column_haystack);
         const ColumnString * col_needle_vector = checkAndGetColumn<ColumnString>(&*column_needle);
@@ -110,7 +110,7 @@ public:
                         Impl::max_string_size);
                 }
             }
-            Impl::vectorConstant(col_haystack_vector->getChars(), col_haystack_vector->getOffsets(), needle, vec_res, input_rows_count);
+            Impl::vectorConstant(col_haystack_vector->getChars(), col_haystack_vector->getOffsets(), needle, vec_res);
         }
         else if (col_haystack_vector && col_needle_vector)
         {
@@ -119,8 +119,7 @@ public:
                 col_haystack_vector->getOffsets(),
                 col_needle_vector->getChars(),
                 col_needle_vector->getOffsets(),
-                vec_res,
-                input_rows_count);
+                vec_res);
         }
         else if (col_haystack_const && col_needle_vector)
         {
@@ -137,7 +136,7 @@ public:
                         Impl::max_string_size);
                 }
             }
-            Impl::constantVector(haystack, col_needle_vector->getChars(), col_needle_vector->getOffsets(), vec_res, input_rows_count);
+            Impl::constantVector(haystack, col_needle_vector->getChars(), col_needle_vector->getOffsets(), vec_res);
         }
         else
         {
diff --git a/src/Functions/FunctionsTextClassification.h b/src/Functions/FunctionsTextClassification.h
index d5cba690f81..90e8af06ccc 100644
--- a/src/Functions/FunctionsTextClassification.h
+++ b/src/Functions/FunctionsTextClassification.h
@@ -55,7 +55,7 @@ public:
         return arguments[0];
     }
 
-    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
     {
         const ColumnPtr & column = arguments[0].column;
         const ColumnString * col = checkAndGetColumn<ColumnString>(column.get());
@@ -65,7 +65,7 @@ public:
                 arguments[0].column->getName(), getName());
 
         auto col_res = ColumnString::create();
-        Impl::vector(col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets(), input_rows_count);
+        Impl::vector(col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets());
         return col_res;
     }
 };
@@ -104,7 +104,7 @@ public:
         return std::make_shared<DataTypeFloat32>();
     }
 
-    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
     {
         const ColumnPtr & column = arguments[0].column;
         const ColumnString * col = checkAndGetColumn<ColumnString>(column.get());
@@ -115,9 +115,9 @@ public:
 
         auto col_res = ColumnVector<Float32>::create();
         ColumnVector<Float32>::Container & vec_res = col_res->getData();
-        vec_res.resize(input_rows_count);
+        vec_res.resize(col->size());
 
-        Impl::vector(col->getChars(), col->getOffsets(), vec_res, input_rows_count);
+        Impl::vector(col->getChars(), col->getOffsets(), vec_res);
         return col_res;
     }
 };
diff --git a/src/Functions/FunctionsTimeWindow.cpp b/src/Functions/FunctionsTimeWindow.cpp
index 88b85c48326..bb78e49a5ea 100644
--- a/src/Functions/FunctionsTimeWindow.cpp
+++ b/src/Functions/FunctionsTimeWindow.cpp
@@ -130,7 +130,7 @@ struct TimeWindowImpl
 
     static DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments, const String & function_name);
 
-    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name, size_t input_rows_count);
+    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name);
 };
 
 template <TimeWindowFunctionName type>
@@ -196,7 +196,7 @@ struct TimeWindowImpl<TUMBLE>
         return std::make_shared<DataTypeTuple>(DataTypes{data_type, data_type});
     }
 
-    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name, size_t input_rows_count)
+    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
     {
         const auto & time_column = arguments[0];
         const auto & interval_column = arguments[1];
@@ -214,37 +214,38 @@ struct TimeWindowImpl<TUMBLE>
         {
             /// 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, input_rows_count);
+                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, input_rows_count);
+                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, input_rows_count);
+                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, input_rows_count);
+                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, input_rows_count);
+                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, input_rows_count);
+                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, input_rows_count);
+                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, input_rows_count);
+                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");
         }
     }
 
     template <typename ToType, IntervalKind::Kind unit>
-    static ColumnPtr executeTumble(const ColumnDateTime & time_column, UInt64 num_units, const DateLUTImpl & time_zone, size_t input_rows_count)
+    static ColumnPtr executeTumble(const ColumnDateTime & time_column, UInt64 num_units, const DateLUTImpl & time_zone)
     {
         const auto & time_data = time_column.getData();
+        size_t size = time_column.size();
         auto start = ColumnVector<ToType>::create();
         auto end = ColumnVector<ToType>::create();
         auto & start_data = start->getData();
         auto & end_data = end->getData();
-        start_data.resize(input_rows_count);
-        end_data.resize(input_rows_count);
-        for (size_t i = 0; i != input_rows_count; ++i)
+        start_data.resize(size);
+        end_data.resize(size);
+        for (size_t i = 0; i != size; ++i)
         {
             start_data[i] = ToStartOfTransform<unit>::execute(time_data[i], num_units, time_zone);
             end_data[i] = AddTime<unit>::execute(start_data[i], num_units, time_zone);
@@ -287,7 +288,7 @@ struct TimeWindowImpl<TUMBLE_START>
         }
     }
 
-    [[maybe_unused]] static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name, size_t input_rows_count)
+    [[maybe_unused]] static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
     {
         const auto & time_column = arguments[0];
         const auto which_type = WhichDataType(time_column.type);
@@ -300,7 +301,7 @@ struct TimeWindowImpl<TUMBLE_START>
                 result_column = time_column.column;
         }
         else
-            result_column = TimeWindowImpl<TUMBLE>::dispatchForColumns(arguments, function_name, input_rows_count);
+            result_column = TimeWindowImpl<TUMBLE>::dispatchForColumns(arguments, function_name);
         return executeWindowBound(result_column, 0, function_name);
     }
 };
@@ -315,7 +316,7 @@ struct TimeWindowImpl<TUMBLE_END>
         return TimeWindowImpl<TUMBLE_START>::getReturnType(arguments, function_name);
     }
 
-    [[maybe_unused]] static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String& function_name, size_t input_rows_count)
+    [[maybe_unused]] static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String& function_name)
     {
         const auto & time_column = arguments[0];
         const auto which_type = WhichDataType(time_column.type);
@@ -328,7 +329,7 @@ struct TimeWindowImpl<TUMBLE_END>
                 result_column = time_column.column;
         }
         else
-            result_column = TimeWindowImpl<TUMBLE>::dispatchForColumns(arguments, function_name, input_rows_count);
+            result_column = TimeWindowImpl<TUMBLE>::dispatchForColumns(arguments, function_name);
         return executeWindowBound(result_column, 1, function_name);
     }
 };
@@ -376,7 +377,7 @@ struct TimeWindowImpl<HOP>
         return std::make_shared<DataTypeTuple>(DataTypes{data_type, data_type});
     }
 
-    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name, size_t input_rows_count)
+    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
     {
         const auto & time_column = arguments[0];
         const auto & hop_interval_column = arguments[1];
@@ -400,28 +401,28 @@ struct TimeWindowImpl<HOP>
             /// 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, input_rows_count);
+                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
             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, input_rows_count);
+                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
             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, input_rows_count);
+                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
             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, input_rows_count);
+                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
             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, input_rows_count);
+                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
             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, input_rows_count);
+                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
             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, input_rows_count);
+                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
             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, input_rows_count);
+                    *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");
         }
@@ -429,17 +430,18 @@ struct TimeWindowImpl<HOP>
 
     template <typename ToType, IntervalKind::Kind kind>
     static ColumnPtr
-    executeHop(const ColumnDateTime & time_column, UInt64 hop_num_units, UInt64 window_num_units, const DateLUTImpl & time_zone, size_t input_rows_count)
+    executeHop(const ColumnDateTime & time_column, UInt64 hop_num_units, UInt64 window_num_units, const DateLUTImpl & time_zone)
     {
         const auto & time_data = time_column.getData();
+        size_t size = time_column.size();
         auto start = ColumnVector<ToType>::create();
         auto end = ColumnVector<ToType>::create();
         auto & start_data = start->getData();
         auto & end_data = end->getData();
-        start_data.resize(input_rows_count);
-        end_data.resize(input_rows_count);
+        start_data.resize(size);
+        end_data.resize(size);
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             ToType wstart = ToStartOfTransform<kind>::execute(time_data[i], hop_num_units, time_zone);
             ToType wend = AddTime<kind>::execute(wstart, hop_num_units, time_zone);
@@ -512,7 +514,7 @@ struct TimeWindowImpl<WINDOW_ID>
             return std::make_shared<DataTypeUInt32>();
     }
 
-    static ColumnPtr dispatchForHopColumns(const ColumnsWithTypeAndName & arguments, const String & function_name, size_t input_rows_count)
+    static ColumnPtr dispatchForHopColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
     {
         const auto & time_column = arguments[0];
         const auto & hop_interval_column = arguments[1];
@@ -536,28 +538,28 @@ struct TimeWindowImpl<WINDOW_ID>
             /// 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, input_rows_count);
+                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
             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, input_rows_count);
+                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
             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, input_rows_count);
+                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
             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, input_rows_count);
+                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
             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, input_rows_count);
+                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
             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, input_rows_count);
+                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
             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, input_rows_count);
+                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
             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, input_rows_count);
+                    *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");
         }
@@ -566,16 +568,17 @@ struct TimeWindowImpl<WINDOW_ID>
 
     template <typename ToType, IntervalKind::Kind kind>
     static ColumnPtr
-    executeHopSlice(const ColumnDateTime & time_column, UInt64 hop_num_units, UInt64 window_num_units, const DateLUTImpl & time_zone, size_t input_rows_count)
+    executeHopSlice(const ColumnDateTime & time_column, UInt64 hop_num_units, UInt64 window_num_units, const DateLUTImpl & time_zone)
     {
         Int64 gcd_num_units = std::gcd(hop_num_units, window_num_units);
 
         const auto & time_data = time_column.getData();
+        size_t size = time_column.size();
 
         auto end = ColumnVector<ToType>::create();
         auto & end_data = end->getData();
-        end_data.resize(input_rows_count);
-        for (size_t i = 0; i < input_rows_count; ++i)
+        end_data.resize(size);
+        for (size_t i = 0; i < size; ++i)
         {
             ToType wstart = ToStartOfTransform<kind>::execute(time_data[i], hop_num_units, time_zone);
             ToType wend = AddTime<kind>::execute(wstart, hop_num_units, time_zone);
@@ -595,23 +598,23 @@ struct TimeWindowImpl<WINDOW_ID>
         return end;
     }
 
-    static ColumnPtr dispatchForTumbleColumns(const ColumnsWithTypeAndName & arguments, const String & function_name, size_t input_rows_count)
+    static ColumnPtr dispatchForTumbleColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
     {
-        ColumnPtr column = TimeWindowImpl<TUMBLE>::dispatchForColumns(arguments, function_name, input_rows_count);
+        ColumnPtr column = TimeWindowImpl<TUMBLE>::dispatchForColumns(arguments, function_name);
         return executeWindowBound(column, 1, function_name);
     }
 
-    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name, size_t input_rows_count)
+    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
     {
         if (arguments.size() == 2)
-            return dispatchForTumbleColumns(arguments, function_name, input_rows_count);
+            return dispatchForTumbleColumns(arguments, function_name);
         else
         {
             const auto & third_column = arguments[2];
             if (arguments.size() == 3 && WhichDataType(third_column.type).isString())
-                return dispatchForTumbleColumns(arguments, function_name, input_rows_count);
+                return dispatchForTumbleColumns(arguments, function_name);
             else
-                return dispatchForHopColumns(arguments, function_name, input_rows_count);
+                return dispatchForHopColumns(arguments, function_name);
         }
     }
 };
@@ -646,7 +649,7 @@ struct TimeWindowImpl<HOP_START>
         }
     }
 
-    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name, size_t input_rows_count)
+    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
     {
         const auto & time_column = arguments[0];
         const auto which_type = WhichDataType(time_column.type);
@@ -659,7 +662,7 @@ struct TimeWindowImpl<HOP_START>
                 result_column = time_column.column;
         }
         else
-            result_column = TimeWindowImpl<HOP>::dispatchForColumns(arguments, function_name, input_rows_count);
+            result_column = TimeWindowImpl<HOP>::dispatchForColumns(arguments, function_name);
         return executeWindowBound(result_column, 0, function_name);
     }
 };
@@ -674,7 +677,7 @@ struct TimeWindowImpl<HOP_END>
         return TimeWindowImpl<HOP_START>::getReturnType(arguments, function_name);
     }
 
-    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name, size_t input_rows_count)
+    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
     {
         const auto & time_column = arguments[0];
         const auto which_type = WhichDataType(time_column.type);
@@ -687,7 +690,7 @@ struct TimeWindowImpl<HOP_END>
                 result_column = time_column.column;
         }
         else
-            result_column = TimeWindowImpl<HOP>::dispatchForColumns(arguments, function_name, input_rows_count);
+            result_column = TimeWindowImpl<HOP>::dispatchForColumns(arguments, function_name);
 
         return executeWindowBound(result_column, 1, function_name);
     }
@@ -700,9 +703,9 @@ DataTypePtr FunctionTimeWindow<type>::getReturnTypeImpl(const ColumnsWithTypeAnd
 }
 
 template <TimeWindowFunctionName type>
-ColumnPtr FunctionTimeWindow<type>::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const
+ColumnPtr FunctionTimeWindow<type>::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t /*input_rows_count*/) const
 {
-    return TimeWindowImpl<type>::dispatchForColumns(arguments, name, input_rows_count);
+    return TimeWindowImpl<type>::dispatchForColumns(arguments, name);
 }
 
 }
diff --git a/src/Functions/FunctionsTonalityClassification.cpp b/src/Functions/FunctionsTonalityClassification.cpp
index 7627c68c057..a9321819a26 100644
--- a/src/Functions/FunctionsTonalityClassification.cpp
+++ b/src/Functions/FunctionsTonalityClassification.cpp
@@ -18,7 +18,7 @@ namespace DB
   */
 struct FunctionDetectTonalityImpl
 {
-    static Float32 detectTonality(
+    static ALWAYS_INLINE inline Float32 detectTonality(
         const UInt8 * str,
         const size_t str_len,
         const FrequencyHolder::Map & emotional_dict)
@@ -63,13 +63,13 @@ struct FunctionDetectTonalityImpl
     static void vector(
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
-        PaddedPODArray<Float32> & res,
-        size_t input_rows_count)
+        PaddedPODArray<Float32> & res)
     {
         const auto & emotional_dict = FrequencyHolder::getInstance().getEmotionalDict();
 
+        size_t size = offsets.size();
         size_t prev_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             res[i] = detectTonality(data.data() + prev_offset, offsets[i] - 1 - prev_offset, emotional_dict);
             prev_offset = offsets[i];
diff --git a/src/Functions/FunctionsVisitParam.h b/src/Functions/FunctionsVisitParam.h
index a77fa740f9c..5e13fbbad5c 100644
--- a/src/Functions/FunctionsVisitParam.h
+++ b/src/Functions/FunctionsVisitParam.h
@@ -93,8 +93,7 @@ struct ExtractParamImpl
         std::string needle,
         const ColumnPtr & start_pos,
         PaddedPODArray<ResultType> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null,
-        size_t /*input_rows_count*/)
+        [[maybe_unused]] ColumnUInt8 * res_null)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
         assert(!res_null);
@@ -169,12 +168,11 @@ struct ExtractParamToStringImpl
 {
     static void vector(const ColumnString::Chars & haystack_data, const ColumnString::Offsets & haystack_offsets,
                        std::string needle,
-                       ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets,
-                       size_t input_rows_count)
+                       ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets)
     {
         /// Constant 5 is taken from a function that performs a similar task FunctionsStringSearch.h::ExtractImpl
         res_data.reserve(haystack_data.size() / 5);
-        res_offsets.resize(input_rows_count);
+        res_offsets.resize(haystack_offsets.size());
 
         /// We are looking for a parameter simply as a substring of the form "name"
         needle = "\"" + needle + "\":";
diff --git a/src/Functions/HasTokenImpl.h b/src/Functions/HasTokenImpl.h
index 4943bf708c5..a4ff49859cc 100644
--- a/src/Functions/HasTokenImpl.h
+++ b/src/Functions/HasTokenImpl.h
@@ -35,13 +35,12 @@ struct HasTokenImpl
         const std::string & pattern,
         const ColumnPtr & start_pos,
         PaddedPODArray<UInt8> & res,
-        ColumnUInt8 * res_null,
-        size_t input_rows_count)
+        ColumnUInt8 * res_null)
     {
         if (start_pos != nullptr)
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function '{}' does not support start_pos argument", name);
 
-        if (input_rows_count == 0)
+        if (haystack_offsets.empty())
             return;
 
         const UInt8 * const begin = haystack_data.data();
diff --git a/src/Functions/IFunction.cpp b/src/Functions/IFunction.cpp
index 31695fc95d5..8b092ba9b6e 100644
--- a/src/Functions/IFunction.cpp
+++ b/src/Functions/IFunction.cpp
@@ -47,54 +47,85 @@ bool allArgumentsAreConstants(const ColumnsWithTypeAndName & args)
     return true;
 }
 
+/// Replaces single low cardinality column in a function call by its dictionary
+/// This can only happen after the arguments have been adapted in IFunctionOverloadResolver::getReturnType
+/// as it's only possible if there is one low cardinality column and, optionally, const columns
 ColumnPtr replaceLowCardinalityColumnsByNestedAndGetDictionaryIndexes(
     ColumnsWithTypeAndName & args, bool can_be_executed_on_default_arguments, size_t input_rows_count)
 {
-    size_t num_rows = input_rows_count;
+    /// We return the LC indexes so the LC can be reconstructed with the function result
     ColumnPtr indexes;
 
-    /// Find first LowCardinality column and replace it to nested dictionary.
-    for (auto & column : args)
+    size_t number_low_cardinality_columns = 0;
+    size_t last_low_cardinality = 0;
+    size_t number_const_columns = 0;
+    size_t number_full_columns = 0;
+
+    for (size_t i = 0; i < args.size(); i++)
     {
-        if (const auto * low_cardinality_column = checkAndGetColumn<ColumnLowCardinality>(column.column.get()))
+        auto const & arg = args[i];
+        if (checkAndGetColumn<ColumnLowCardinality>(arg.column.get()))
         {
-            /// Single LowCardinality column is supported now.
-            if (indexes)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected single dictionary argument for function.");
-
-            const auto * low_cardinality_type = checkAndGetDataType<DataTypeLowCardinality>(column.type.get());
-
-            if (!low_cardinality_type)
-                throw Exception(ErrorCodes::LOGICAL_ERROR,
-                    "Incompatible type for LowCardinality column: {}",
-                    column.type->getName());
-
-            if (can_be_executed_on_default_arguments)
-            {
-                /// Normal case, when function can be executed on values' default.
-                column.column = low_cardinality_column->getDictionary().getNestedColumn();
-                indexes = low_cardinality_column->getIndexesPtr();
-            }
-            else
-            {
-                /// Special case when default value can't be used. Example: 1 % LowCardinality(Int).
-                /// LowCardinality always contains default, so 1 % 0 will throw exception in normal case.
-                auto dict_encoded = low_cardinality_column->getMinimalDictionaryEncodedColumn(0, low_cardinality_column->size());
-                column.column = dict_encoded.dictionary;
-                indexes = dict_encoded.indexes;
-            }
-
-            num_rows = column.column->size();
-            column.type = low_cardinality_type->getDictionaryType();
+            number_low_cardinality_columns++;
+            last_low_cardinality = i;
         }
+        else if (checkAndGetColumn<ColumnConst>(arg.column.get()))
+            number_const_columns++;
+        else
+            number_full_columns++;
     }
 
-    /// Change size of constants.
+    if (!number_low_cardinality_columns && !number_const_columns)
+        return nullptr;
+
+    if (number_full_columns > 0 || number_low_cardinality_columns > 1)
+    {
+        /// This should not be possible but currently there are multiple tests in CI failing because of it
+        /// TODO: Fix those cases, then enable this exception
+#if 0
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected low cardinality types found. Low cardinality: {}. Full {}. Const {}",
+                number_low_cardinality_columns, number_full_columns, number_const_columns);
+#else
+        return nullptr;
+#endif
+    }
+    else if (number_low_cardinality_columns == 1)
+    {
+        auto & lc_arg = args[last_low_cardinality];
+
+        const auto * low_cardinality_type = checkAndGetDataType<DataTypeLowCardinality>(lc_arg.type.get());
+        if (!low_cardinality_type)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Incompatible type for LowCardinality column: {}", lc_arg.type->getName());
+
+        const auto * low_cardinality_column = checkAndGetColumn<ColumnLowCardinality>(lc_arg.column.get());
+        chassert(low_cardinality_column);
+
+        if (can_be_executed_on_default_arguments)
+        {
+            /// Normal case, when function can be executed on values' default.
+            lc_arg.column = low_cardinality_column->getDictionary().getNestedColumn();
+            indexes = low_cardinality_column->getIndexesPtr();
+        }
+        else
+        {
+            /// Special case when default value can't be used. Example: 1 % LowCardinality(Int).
+            /// LowCardinality always contains default, so 1 % 0 will throw exception in normal case.
+            auto dict_encoded = low_cardinality_column->getMinimalDictionaryEncodedColumn(0, low_cardinality_column->size());
+            lc_arg.column = dict_encoded.dictionary;
+            indexes = dict_encoded.indexes;
+        }
+
+        /// The new column will have a different number of rows, normally less but occasionally it might be more (NULL)
+        input_rows_count = lc_arg.column->size();
+        lc_arg.type = low_cardinality_type->getDictionaryType();
+    }
+
+    /// Change size of constants
     for (auto & column : args)
     {
         if (const auto * column_const = checkAndGetColumn<ColumnConst>(column.column.get()))
         {
-            column.column = ColumnConst::create(recursiveRemoveLowCardinality(column_const->getDataColumnPtr()), num_rows);
+            column.column = ColumnConst::create(recursiveRemoveLowCardinality(column_const->getDataColumnPtr()), input_rows_count);
             column.type = recursiveRemoveLowCardinality(column.type);
         }
     }
@@ -270,6 +301,8 @@ ColumnPtr IExecutableFunction::executeWithoutSparseColumns(const ColumnsWithType
             bool can_be_executed_on_default_arguments = canBeExecutedOnDefaultArguments();
 
             const auto & dictionary_type = res_low_cardinality_type->getDictionaryType();
+            /// The arguments should have been adapted in IFunctionOverloadResolver::getReturnType
+            /// So there is only one low cardinality column (and optionally some const columns) and no full column
             ColumnPtr indexes = replaceLowCardinalityColumnsByNestedAndGetDictionaryIndexes(
                     columns_without_low_cardinality, can_be_executed_on_default_arguments, input_rows_count);
 
diff --git a/src/Functions/IFunctionCustomWeek.h b/src/Functions/IFunctionCustomWeek.h
index ba0baa35819..51542c9cab1 100644
--- a/src/Functions/IFunctionCustomWeek.h
+++ b/src/Functions/IFunctionCustomWeek.h
@@ -50,15 +50,15 @@ public:
 
         if (checkAndGetDataType<DataTypeDate>(&type))
         {
-            return Transform::FactorTransform::execute(UInt16(left.safeGet<UInt64>()), date_lut)
-                    == Transform::FactorTransform::execute(UInt16(right.safeGet<UInt64>()), date_lut)
+            return Transform::FactorTransform::execute(UInt16(left.get<UInt64>()), date_lut)
+                    == Transform::FactorTransform::execute(UInt16(right.get<UInt64>()), date_lut)
                 ? is_monotonic
                 : is_not_monotonic;
         }
         else
         {
-            return Transform::FactorTransform::execute(UInt32(left.safeGet<UInt64>()), date_lut)
-                    == Transform::FactorTransform::execute(UInt32(right.safeGet<UInt64>()), date_lut)
+            return Transform::FactorTransform::execute(UInt32(left.get<UInt64>()), date_lut)
+                    == Transform::FactorTransform::execute(UInt32(right.get<UInt64>()), date_lut)
                 ? is_monotonic
                 : is_not_monotonic;
         }
diff --git a/src/Functions/IFunctionDateOrDateTime.h b/src/Functions/IFunctionDateOrDateTime.h
index 899aa2c305d..762b79bfafc 100644
--- a/src/Functions/IFunctionDateOrDateTime.h
+++ b/src/Functions/IFunctionDateOrDateTime.h
@@ -72,30 +72,30 @@ public:
 
             if (checkAndGetDataType<DataTypeDate>(type_ptr))
             {
-                return Transform::FactorTransform::execute(UInt16(left.safeGet<UInt64>()), *date_lut)
-                    == Transform::FactorTransform::execute(UInt16(right.safeGet<UInt64>()), *date_lut)
+                return Transform::FactorTransform::execute(UInt16(left.get<UInt64>()), *date_lut)
+                    == Transform::FactorTransform::execute(UInt16(right.get<UInt64>()), *date_lut)
                     ? is_monotonic : is_not_monotonic;
             }
             else if (checkAndGetDataType<DataTypeDate32>(type_ptr))
             {
-                return Transform::FactorTransform::execute(Int32(left.safeGet<UInt64>()), *date_lut)
-                       == Transform::FactorTransform::execute(Int32(right.safeGet<UInt64>()), *date_lut)
+                return Transform::FactorTransform::execute(Int32(left.get<UInt64>()), *date_lut)
+                       == Transform::FactorTransform::execute(Int32(right.get<UInt64>()), *date_lut)
                        ? is_monotonic : is_not_monotonic;
             }
             else if (checkAndGetDataType<DataTypeDateTime>(type_ptr))
             {
-                return Transform::FactorTransform::execute(UInt32(left.safeGet<UInt64>()), *date_lut)
-                    == Transform::FactorTransform::execute(UInt32(right.safeGet<UInt64>()), *date_lut)
+                return Transform::FactorTransform::execute(UInt32(left.get<UInt64>()), *date_lut)
+                    == Transform::FactorTransform::execute(UInt32(right.get<UInt64>()), *date_lut)
                     ? is_monotonic : is_not_monotonic;
             }
             else
             {
                 assert(checkAndGetDataType<DataTypeDateTime64>(type_ptr));
 
-                const auto & left_date_time = left.safeGet<DateTime64>();
+                const auto & left_date_time = left.get<DateTime64>();
                 TransformDateTime64<typename Transform::FactorTransform> transformer_left(left_date_time.getScale());
 
-                const auto & right_date_time = right.safeGet<DateTime64>();
+                const auto & right_date_time = right.get<DateTime64>();
                 TransformDateTime64<typename Transform::FactorTransform> transformer_right(right_date_time.getScale());
 
                 return transformer_left.execute(left_date_time.getValue(), *date_lut)
diff --git a/src/Functions/JSONPath/Parsers/ParserJSONPathRange.cpp b/src/Functions/JSONPath/Parsers/ParserJSONPathRange.cpp
index 84ac0ff08f3..fb74018b330 100644
--- a/src/Functions/JSONPath/Parsers/ParserJSONPathRange.cpp
+++ b/src/Functions/JSONPath/Parsers/ParserJSONPathRange.cpp
@@ -46,7 +46,7 @@ bool ParserJSONPathRange::parseImpl(Pos & pos, ASTPtr & node, Expected & expecte
         {
             return false;
         }
-        range_indices.first = static_cast<UInt32>(number_ptr->as<ASTLiteral>()->value.safeGet<UInt32>());
+        range_indices.first = static_cast<UInt32>(number_ptr->as<ASTLiteral>()->value.get<UInt32>());
 
         if (pos->type == TokenType::Comma || pos->type == TokenType::ClosingSquareBracket)
         {
@@ -63,7 +63,7 @@ bool ParserJSONPathRange::parseImpl(Pos & pos, ASTPtr & node, Expected & expecte
             {
                 return false;
             }
-            range_indices.second = static_cast<UInt32>(number_ptr->as<ASTLiteral>()->value.safeGet<UInt32>());
+            range_indices.second = static_cast<UInt32>(number_ptr->as<ASTLiteral>()->value.get<UInt32>());
         }
         else
         {
diff --git a/src/Functions/JSONPaths.cpp b/src/Functions/JSONPaths.cpp
deleted file mode 100644
index dfb0386e370..00000000000
--- a/src/Functions/JSONPaths.cpp
+++ /dev/null
@@ -1,518 +0,0 @@
-#include <Functions/IFunction.h>
-#include <Functions/FunctionHelpers.h>
-#include <Functions/FunctionFactory.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeMap.h>
-#include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypeObject.h>
-#include <Core/ColumnNumbers.h>
-#include <Columns/ColumnObject.h>
-#include <Columns/ColumnMap.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnArray.h>
-#include <DataTypes/DataTypesBinaryEncoding.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int BAD_ARGUMENTS;
-}
-
-namespace
-{
-
-enum class PathsMode
-{
-    ALL_PATHS,
-    DYNAMIC_PATHS,
-    SHARED_DATA_PATHS,
-};
-
-struct JSONAllPathsImpl
-{
-    static constexpr auto name = "JSONAllPaths";
-    static constexpr auto paths_mode = PathsMode::ALL_PATHS;
-    static constexpr auto with_types = false;
-};
-
-struct JSONAllPathsWithTypesImpl
-{
-    static constexpr auto name = "JSONAllPathsWithTypes";
-    static constexpr auto paths_mode = PathsMode::ALL_PATHS;
-    static constexpr auto with_types = true;
-};
-
-struct JSONDynamicPathsImpl
-{
-    static constexpr auto name = "JSONDynamicPaths";
-    static constexpr auto paths_mode = PathsMode::DYNAMIC_PATHS;
-    static constexpr auto with_types = false;
-};
-
-struct JSONDynamicPathsWithTypesImpl
-{
-    static constexpr auto name = "JSONDynamicPathsWithTypes";
-    static constexpr auto paths_mode = PathsMode::DYNAMIC_PATHS;
-    static constexpr auto with_types = true;
-};
-
-struct JSONSharedDataPathsImpl
-{
-    static constexpr auto name = "JSONSharedDataPaths";
-    static constexpr auto paths_mode = PathsMode::SHARED_DATA_PATHS;
-    static constexpr auto with_types = false;
-};
-
-struct JSONSharedDataPathsWithTypesImpl
-{
-    static constexpr auto name = "JSONSharedDataPathsWithTypes";
-    static constexpr auto paths_mode = PathsMode::SHARED_DATA_PATHS;
-    static constexpr auto with_types = true;
-};
-
-/// Implements functions that extracts paths and types from JSON object column.
-/// Used for introspection of the content of the JSON object column.
-template <typename Impl>
-class FunctionJSONPaths : public IFunction
-{
-public:
-    static constexpr auto name = Impl::name;
-
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionJSONPaths>(); }
-
-    std::string getName() const override
-    {
-        return name;
-    }
-
-    size_t getNumberOfArguments() const override { return 1; }
-    bool useDefaultImplementationForConstants() const override { return true; }
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & data_types) const override
-    {
-        if (data_types.size() != 1)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} requires single argument with type JSON", getName());
-
-        if (data_types[0]->getTypeId() != TypeIndex::Object)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} requires argument with type JSON, got: {}", getName(),data_types[0]->getName());
-
-        if constexpr (Impl::with_types)
-            return std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeString>());
-        return std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>());
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
-    {
-        const ColumnWithTypeAndName & elem = arguments[0];
-        const auto * column_object = typeid_cast<const ColumnObject *>(elem.column.get());
-        if (!column_object)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unexpected column type in function {}. Expected Object column, got {}", getName(), elem.column->getName());
-
-        const auto & type_object = assert_cast<const DataTypeObject &>(*elem.type);
-        if constexpr (Impl::with_types)
-            return executeWithTypes(*column_object, type_object);
-        return executeWithoutTypes(*column_object);
-    }
-
-private:
-    ColumnPtr executeWithoutTypes(const ColumnObject & column_object) const
-    {
-        if constexpr (Impl::paths_mode == PathsMode::SHARED_DATA_PATHS)
-        {
-            /// No need to do anything, we already have a column with all sorted paths in shared data.
-            const auto & shared_data_array = column_object.getSharedDataNestedColumn();
-            const auto & shared_data_paths = assert_cast<const ColumnTuple &>(shared_data_array.getData()).getColumnPtr(0);
-            return ColumnArray::create(shared_data_paths, shared_data_array.getOffsetsPtr());
-        }
-
-        auto res = ColumnArray::create(ColumnString::create());
-        auto & offsets = res->getOffsets();
-        ColumnString & data = assert_cast<ColumnString &>(res->getData());
-
-        if constexpr (Impl::paths_mode == PathsMode::DYNAMIC_PATHS)
-        {
-            /// Collect all dynamic paths.
-            const auto & dynamic_path_columns = column_object.getDynamicPaths();
-            std::vector<std::string_view> dynamic_paths;
-            dynamic_paths.reserve(dynamic_path_columns.size());
-            for (const auto & [path, _] : dynamic_path_columns)
-                dynamic_paths.push_back(path);
-            /// We want the resulting arrays of paths to be sorted for consistency.
-            std::sort(dynamic_paths.begin(), dynamic_paths.end());
-
-            size_t size = column_object.size();
-            for (size_t i = 0; i != size; ++i)
-            {
-                for (const auto path : dynamic_paths)
-                {
-                    /// Don't include path if it contains NULL, because we consider
-                    /// it to be equivalent to the absence of this path in this row.
-                    if (!dynamic_path_columns.find(path)->second->isNullAt(i))
-                        data.insertData(path.data(), path.size());
-                }
-                offsets.push_back(data.size());
-            }
-            return res;
-        }
-
-        /// Collect all paths: typed, dynamic and paths from shared data.
-        std::vector<std::string_view> sorted_dynamic_and_typed_paths;
-        const auto & typed_path_columns = column_object.getTypedPaths();
-        const auto & dynamic_path_columns = column_object.getDynamicPaths();
-        sorted_dynamic_and_typed_paths.reserve(typed_path_columns.size() + dynamic_path_columns.size());
-        for (const auto & [path, _] : typed_path_columns)
-            sorted_dynamic_and_typed_paths.push_back(path);
-        for (const auto & [path, _] : dynamic_path_columns)
-            sorted_dynamic_and_typed_paths.push_back(path);
-
-        /// We want the resulting arrays of paths to be sorted for consistency.
-        std::sort(sorted_dynamic_and_typed_paths.begin(), sorted_dynamic_and_typed_paths.end());
-
-        const auto & shared_data_offsets = column_object.getSharedDataOffsets();
-        const auto [shared_data_paths, _] = column_object.getSharedDataPathsAndValues();
-        for (size_t i = 0; i != shared_data_offsets.size(); ++i)
-        {
-            size_t start = shared_data_offsets[static_cast<ssize_t>(i) - 1];
-            size_t end = shared_data_offsets[static_cast<ssize_t>(i)];
-            /// Merge sorted list of paths from shared data and sorted_dynamic_and_typed_paths
-            size_t sorted_paths_index = 0;
-            for (size_t j = start; j != end; ++j)
-            {
-                auto shared_data_path = shared_data_paths->getDataAt(j).toView();
-                while (sorted_paths_index != sorted_dynamic_and_typed_paths.size() && sorted_dynamic_and_typed_paths[sorted_paths_index] < shared_data_path)
-                {
-                    const auto path = sorted_dynamic_and_typed_paths[sorted_paths_index];
-                    /// If it's dynamic path include it only if it's not NULL.
-                    if (auto it = dynamic_path_columns.find(path); it == dynamic_path_columns.end() || !it->second->isNullAt(i))
-                        data.insertData(path.data(), path.size());
-                    ++sorted_paths_index;
-                }
-
-                data.insertData(shared_data_path.data(), shared_data_path.size());
-            }
-
-            for (; sorted_paths_index != sorted_dynamic_and_typed_paths.size(); ++sorted_paths_index)
-            {
-                const auto path = sorted_dynamic_and_typed_paths[sorted_paths_index];
-                if (auto it = dynamic_path_columns.find(path); it == dynamic_path_columns.end() || !it->second->isNullAt(i))
-                    data.insertData(path.data(), path.size());
-            }
-
-            offsets.push_back(data.size());
-        }
-
-        return res;
-    }
-
-    ColumnPtr executeWithTypes(const ColumnObject & column_object, const DataTypeObject & type_object) const
-    {
-        auto offsets_column = ColumnArray::ColumnOffsets::create();
-        auto & offsets = offsets_column->getData();
-        auto paths_column = ColumnString::create();
-        auto types_column = ColumnString::create();
-
-        if constexpr (Impl::paths_mode == PathsMode::DYNAMIC_PATHS)
-        {
-            const auto & dynamic_path_columns = column_object.getDynamicPaths();
-            std::vector<std::string_view> sorted_dynamic_paths;
-            sorted_dynamic_paths.reserve(dynamic_path_columns.size());
-            for (const auto & [path, _] : dynamic_path_columns)
-                sorted_dynamic_paths.push_back(path);
-            /// We want the resulting arrays of paths and values to be sorted for consistency.
-            std::sort(sorted_dynamic_paths.begin(), sorted_dynamic_paths.end());
-
-            /// Iterate over all rows and extract types from dynamic columns.
-            for (size_t i = 0; i != column_object.size(); ++i)
-            {
-                for (const auto path : sorted_dynamic_paths)
-                {
-                    const auto & column = dynamic_path_columns.find(path)->second;
-                    if (!column->isNullAt(i))
-                    {
-                        auto type = getDynamicValueType(column, i);
-                        paths_column->insertData(path.data(), path.size());
-                        types_column->insertData(type.data(), type.size());
-                    }
-                }
-
-                offsets.push_back(paths_column->size());
-            }
-
-            return ColumnMap::create(ColumnPtr(std::move(paths_column)), ColumnPtr(std::move(types_column)), ColumnPtr(std::move(offsets_column)));
-        }
-
-        if constexpr (Impl::paths_mode == PathsMode::SHARED_DATA_PATHS)
-        {
-            const auto & shared_data_offsets = column_object.getSharedDataOffsets();
-            const auto [shared_data_paths, shared_data_values] = column_object.getSharedDataPathsAndValues();
-            /// Iterate over all rows and extract types from dynamic values in shared data.
-            for (size_t i = 0; i != shared_data_offsets.size(); ++i)
-            {
-                size_t start = shared_data_offsets[static_cast<ssize_t>(i) - 1];
-                size_t end = shared_data_offsets[static_cast<ssize_t>(i)];
-                for (size_t j = start; j != end; ++j)
-                {
-                    if (auto type_name = getDynamicValueTypeFromSharedData(shared_data_values->getDataAt(j)))
-                    {
-                        paths_column->insertFrom(*shared_data_paths, j);
-                        types_column->insertData(type_name->data(), type_name->size());
-                    }
-                }
-
-                offsets.push_back(paths_column->size());
-            }
-
-            return ColumnMap::create(ColumnPtr(std::move(paths_column)), ColumnPtr(std::move(types_column)), ColumnPtr(std::move(offsets_column)));
-        }
-
-        /// Iterate over all rows and extract types from dynamic columns from dynamic paths and from values in shared data.
-        std::vector<std::pair<std::string_view, String>> sorted_typed_and_dynamic_paths_with_types;
-        const auto & typed_path_types = type_object.getTypedPaths();
-        const auto & dynamic_path_columns = column_object.getDynamicPaths();
-        sorted_typed_and_dynamic_paths_with_types.reserve(typed_path_types.size() + dynamic_path_columns.size());
-        for (const auto & [path, type] : typed_path_types)
-            sorted_typed_and_dynamic_paths_with_types.emplace_back(path, type->getName());
-        for (const auto & [path, _] : dynamic_path_columns)
-            sorted_typed_and_dynamic_paths_with_types.emplace_back(path, "");
-
-        /// We want the resulting arrays of paths and values to be sorted for consistency.
-        std::sort(sorted_typed_and_dynamic_paths_with_types.begin(), sorted_typed_and_dynamic_paths_with_types.end());
-
-        const auto & shared_data_offsets = column_object.getSharedDataOffsets();
-        const auto [shared_data_paths, shared_data_values] = column_object.getSharedDataPathsAndValues();
-        for (size_t i = 0; i != shared_data_offsets.size(); ++i)
-        {
-            size_t start = shared_data_offsets[static_cast<ssize_t>(i) - 1];
-            size_t end = shared_data_offsets[static_cast<ssize_t>(i)];
-            /// Merge sorted list of paths and values from shared data and sorted_typed_and_dynamic_paths_with_types
-            size_t sorted_paths_index = 0;
-            for (size_t j = start; j != end; ++j)
-            {
-                auto shared_data_path = shared_data_paths->getDataAt(j).toView();
-                auto type_name = getDynamicValueTypeFromSharedData(shared_data_values->getDataAt(j));
-                /// Skip NULL values.
-                if (!type_name)
-                    continue;
-
-                while (sorted_paths_index != sorted_typed_and_dynamic_paths_with_types.size() && sorted_typed_and_dynamic_paths_with_types[sorted_paths_index].first < shared_data_path)
-                {
-                    auto & [path, type] = sorted_typed_and_dynamic_paths_with_types[sorted_paths_index];
-                    /// Update type for path from dynamic paths.
-                    if (auto it = dynamic_path_columns.find(path); it != dynamic_path_columns.end())
-                    {
-                        /// Skip NULL values.
-                        if (it->second->isNullAt(i))
-                        {
-                            ++sorted_paths_index;
-                            continue;
-                        }
-                        type = getDynamicValueType(it->second, i);
-                    }
-                    paths_column->insertData(path.data(), path.size());
-                    types_column->insertData(type.data(), type.size());
-                    ++sorted_paths_index;
-                }
-
-                paths_column->insertData(shared_data_path.data(), shared_data_path.size());
-                types_column->insertData(type_name->data(), type_name->size());
-            }
-
-            for (; sorted_paths_index != sorted_typed_and_dynamic_paths_with_types.size(); ++sorted_paths_index)
-            {
-                auto & [path, type] = sorted_typed_and_dynamic_paths_with_types[sorted_paths_index];
-                if (auto it = dynamic_path_columns.find(path); it != dynamic_path_columns.end())
-                {
-                    /// Skip NULL values.
-                    if (it->second->isNullAt(i))
-                        continue;
-                    type = getDynamicValueType(it->second, i);
-                }
-                paths_column->insertData(path.data(), path.size());
-                types_column->insertData(type.data(), type.size());
-            }
-
-            offsets.push_back(paths_column->size());
-        }
-
-        return ColumnMap::create(ColumnPtr(std::move(paths_column)), ColumnPtr(std::move(types_column)), ColumnPtr(std::move(offsets_column)));
-    }
-
-    String getDynamicValueType(const ColumnPtr & column, size_t i) const
-    {
-        const ColumnDynamic * dynamic_column = checkAndGetColumn<ColumnDynamic>(column.get());
-        const auto & variant_info = dynamic_column->getVariantInfo();
-        const auto & variant_column = dynamic_column->getVariantColumn();
-        auto global_discr = variant_column.globalDiscriminatorAt(i);
-        /// We don't output path with NULL values. It should be checked before calling getDynamicValueType.
-        chassert(global_discr != ColumnVariant::NULL_DISCRIMINATOR);
-        if (global_discr == dynamic_column->getSharedVariantDiscriminator())
-        {
-            auto value = dynamic_column->getSharedVariant().getDataAt(variant_column.offsetAt(i));
-            ReadBufferFromMemory buf(value.data, value.size);
-            auto type = decodeDataType(buf);
-            return type->getName();
-        }
-
-        return variant_info.variant_names[global_discr];
-    }
-
-    std::optional<String> getDynamicValueTypeFromSharedData(StringRef value) const
-    {
-        ReadBufferFromMemory buf(value.data, value.size);
-        auto type = decodeDataType(buf);
-        if (isNothing(type))
-            return std::nullopt;
-        return type->getName();
-    }
-};
-
-}
-
-REGISTER_FUNCTION(JSONPaths)
-{
-    factory.registerFunction<FunctionJSONPaths<JSONAllPathsImpl>>(FunctionDocumentation{
-        .description = R"(
-Returns the list of all paths stored in each row in JSON column.
-)",
-        .syntax = {"JSONAllPaths(json)"},
-        .arguments = {{"json", "JSON column"}},
-        .examples = {{{
-            "Example",
-            R"(
-CREATE TABLE test (json JSON(max_dynamic_paths=1)) ENGINE = Memory;
-INSERT INTO test FORMAT JSONEachRow {"json" : {"a" : 42}}, {"json" : {"b" : "Hello"}}, {"json" : {"a" : [1, 2, 3], "c" : "2020-01-01"}}
-SELECT json, JSONAllPaths(json) FROM test;
-)",
-            R"(
-┌─json─────────────────────────────────┬─JSONAllPaths(json)─┐
-│ {"a":"42"}                           │ ['a']              │
-│ {"b":"Hello"}                        │ ['b']              │
-│ {"a":["1","2","3"],"c":"2020-01-01"} │ ['a','c']          │
-└──────────────────────────────────────┴────────────────────┘
-)"}}},
-        .categories{"JSON"},
-    });
-
-    factory.registerFunction<FunctionJSONPaths<JSONAllPathsWithTypesImpl>>(FunctionDocumentation{
-        .description = R"(
-Returns the list of all paths and their data types stored in each row in JSON column.
-)",
-        .syntax = {"JSONAllPathsWithTypes(json)"},
-        .arguments = {{"json", "JSON column"}},
-        .examples = {{{
-            "Example",
-            R"(
-CREATE TABLE test (json JSON(max_dynamic_paths=1)) ENGINE = Memory;
-INSERT INTO test FORMAT JSONEachRow {"json" : {"a" : 42}}, {"json" : {"b" : "Hello"}}, {"json" : {"a" : [1, 2, 3], "c" : "2020-01-01"}}
-SELECT json, JSONAllPathsWithTypes(json) FROM test;
-)",
-            R"(
-┌─json─────────────────────────────────┬─JSONAllPathsWithTypes(json)───────────────┐
-│ {"a":"42"}                           │ {'a':'Int64'}                             │
-│ {"b":"Hello"}                        │ {'b':'String'}                            │
-│ {"a":["1","2","3"],"c":"2020-01-01"} │ {'a':'Array(Nullable(Int64))','c':'Date'} │
-└──────────────────────────────────────┴───────────────────────────────────────────┘
-)"}}},
-        .categories{"JSON"},
-    });
-
-    factory.registerFunction<FunctionJSONPaths<JSONDynamicPathsImpl>>(FunctionDocumentation{
-        .description = R"(
-Returns the list of dynamic paths that are stored as separate subcolumns in JSON column.
-)",
-        .syntax = {"JSONDynamicPaths(json)"},
-        .arguments = {{"json", "JSON column"}},
-        .examples = {{{
-            "Example",
-            R"(
-CREATE TABLE test (json JSON(max_dynamic_paths=1)) ENGINE = Memory;
-INSERT INTO test FORMAT JSONEachRow {"json" : {"a" : 42}}, {"json" : {"b" : "Hello"}}, {"json" : {"a" : [1, 2, 3], "c" : "2020-01-01"}}
-SELECT json, JSONDynamicPaths(json) FROM test;
-)",
-            R"(
-┌─json─────────────────────────────────┬─JSONDynamicPaths(json)─┐
-│ {"a":"42"}                           │ ['a']                  │
-│ {"b":"Hello"}                        │ []                     │
-│ {"a":["1","2","3"],"c":"2020-01-01"} │ ['a']                  │
-└──────────────────────────────────────┴────────────────────────┘
-)"}}},
-        .categories{"JSON"},
-    });
-
-    factory.registerFunction<FunctionJSONPaths<JSONDynamicPathsWithTypesImpl>>(FunctionDocumentation{
-        .description = R"(
-Returns the list of dynamic paths that are stored as separate subcolumns and their types in each row in JSON column.
-)",
-        .syntax = {"JSONDynamicPathsWithTypes(json)"},
-        .arguments = {{"json", "JSON column"}},
-        .examples = {{{
-            "Example",
-            R"(
-CREATE TABLE test (json JSON(max_dynamic_paths=1)) ENGINE = Memory;
-INSERT INTO test FORMAT JSONEachRow {"json" : {"a" : 42}}, {"json" : {"b" : "Hello"}}, {"json" : {"a" : [1, 2, 3], "c" : "2020-01-01"}}
-SELECT json, JSONDynamicPathsWithTypes(json) FROM test;
-)",
-            R"(
-┌─json─────────────────────────────────┬─JSONDynamicPathsWithTypes(json)─┐
-│ {"a":"42"}                           │ {'a':'Int64'}                   │
-│ {"b":"Hello"}                        │ {}                              │
-│ {"a":["1","2","3"],"c":"2020-01-01"} │ {'a':'Array(Nullable(Int64))'}  │
-└──────────────────────────────────────┴─────────────────────────────────┘
-)"}}},
-        .categories{"JSON"},
-    });
-
-    factory.registerFunction<FunctionJSONPaths<JSONSharedDataPathsImpl>>(FunctionDocumentation{
-        .description = R"(
-Returns the list of paths that are stored in shared data structure in JSON column.
-)",
-        .syntax = {"JSONDynamicPaths(json)"},
-        .arguments = {{"json", "JSON column"}},
-        .examples = {{{
-            "Example",
-            R"(
-CREATE TABLE test (json JSON(max_dynamic_paths=1)) ENGINE = Memory;
-INSERT INTO test FORMAT JSONEachRow {"json" : {"a" : 42}}, {"json" : {"b" : "Hello"}}, {"json" : {"a" : [1, 2, 3], "c" : "2020-01-01"}}
-SELECT json, JSONSharedDataPaths(json) FROM test;
-)",
-            R"(
-┌─json─────────────────────────────────┬─JSONSharedDataPaths(json)─┐
-│ {"a":"42"}                           │ []                        │
-│ {"b":"Hello"}                        │ ['b']                     │
-│ {"a":["1","2","3"],"c":"2020-01-01"} │ ['c']                     │
-└──────────────────────────────────────┴───────────────────────────┘
-)"}}},
-        .categories{"JSON"},
-    });
-
-    factory.registerFunction<FunctionJSONPaths<JSONSharedDataPathsWithTypesImpl>>(FunctionDocumentation{
-        .description = R"(
-Returns the list of paths that are stored in shared data structure and their types in each row in JSON column.
-)",
-        .syntax = {"JSONDynamicPathsWithTypes(json)"},
-        .arguments = {{"json", "JSON column"}},
-        .examples = {{{
-            "Example",
-            R"(
-CREATE TABLE test (json JSON(max_dynamic_paths=1)) ENGINE = Memory;
-INSERT INTO test FORMAT JSONEachRow {"json" : {"a" : 42}}, {"json" : {"b" : "Hello"}}, {"json" : {"a" : [1, 2, 3], "c" : "2020-01-01"}}
-SELECT json, JSONDynamicPathsWithTypes(json) FROM test;
-)",
-            R"(
-┌─json─────────────────────────────────┬─JSONDynamicPathsWithTypes(json)─┐
-│ {"a":"42"}                           │ {'a':'Int64'}                   │
-│ {"b":"Hello"}                        │ {}                              │
-│ {"a":["1","2","3"],"c":"2020-01-01"} │ {'a':'Array(Nullable(Int64))'}  │
-└──────────────────────────────────────┴─────────────────────────────────┘
-)"}}},
-        .categories{"JSON"},
-    });
-}
-
-}
diff --git a/src/Functions/Kusto/KqlArraySort.cpp b/src/Functions/Kusto/KqlArraySort.cpp
index fb3e6259ee4..11157aa53e6 100644
--- a/src/Functions/Kusto/KqlArraySort.cpp
+++ b/src/Functions/Kusto/KqlArraySort.cpp
@@ -73,11 +73,13 @@ public:
         size_t array_count = arguments.size();
         const auto & last_arg = arguments[array_count - 1];
 
+        size_t input_rows_count_local = input_rows_count;
+
         bool null_last = true;
         if (!isArray(last_arg.type))
         {
             --array_count;
-            null_last = check_condition(last_arg, context, input_rows_count);
+            null_last = check_condition(last_arg, context, input_rows_count_local);
         }
 
         ColumnsWithTypeAndName new_args;
@@ -117,11 +119,11 @@ public:
         }
 
         auto zipped
-            = FunctionFactory::instance().get("arrayZip", context)->build(new_args)->execute(new_args, result_type, input_rows_count);
+            = FunctionFactory::instance().get("arrayZip", context)->build(new_args)->execute(new_args, result_type, input_rows_count_local);
 
         ColumnsWithTypeAndName sort_arg({{zipped, std::make_shared<DataTypeArray>(result_type), "zipped"}});
         auto sorted_tuple
-            = FunctionFactory::instance().get(sort_function, context)->build(sort_arg)->execute(sort_arg, result_type, input_rows_count);
+            = FunctionFactory::instance().get(sort_function, context)->build(sort_arg)->execute(sort_arg, result_type, input_rows_count_local);
 
         auto null_type = std::make_shared<DataTypeNullable>(std::make_shared<DataTypeInt8>());
 
@@ -137,10 +139,10 @@ public:
                     = std::make_shared<DataTypeArray>(makeNullable(nested_types[i]));
 
                 ColumnsWithTypeAndName null_array_arg({
-                    {null_type->createColumnConstWithDefaultValue(input_rows_count), null_type, "NULL"},
+                    {null_type->createColumnConstWithDefaultValue(input_rows_count_local), null_type, "NULL"},
                 });
 
-                tuple_columns[i] = fun_array->build(null_array_arg)->execute(null_array_arg, arg_type, input_rows_count);
+                tuple_columns[i] = fun_array->build(null_array_arg)->execute(null_array_arg, arg_type, input_rows_count_local);
                 tuple_columns[i] = tuple_columns[i]->convertToFullColumnIfConst();
             }
             else
@@ -151,7 +153,7 @@ public:
                 auto tuple_coulmn = FunctionFactory::instance()
                                         .get("tupleElement", context)
                                         ->build(untuple_args)
-                                        ->execute(untuple_args, result_type, input_rows_count);
+                                        ->execute(untuple_args, result_type, input_rows_count_local);
 
                 auto out_tmp = ColumnArray::create(nested_types[i]->createColumn());
 
@@ -181,7 +183,7 @@ public:
             auto inside_null_type = nested_types[0];
             ColumnsWithTypeAndName indexof_args({
                 arg_of_index,
-                {inside_null_type->createColumnConstWithDefaultValue(input_rows_count), inside_null_type, "NULL"},
+                {inside_null_type->createColumnConstWithDefaultValue(input_rows_count_local), inside_null_type, "NULL"},
             });
 
             auto null_index_datetype = std::make_shared<DataTypeUInt64>();
@@ -190,7 +192,7 @@ public:
             slice_index.column = FunctionFactory::instance()
                                      .get("indexOf", context)
                                      ->build(indexof_args)
-                                     ->execute(indexof_args, result_type, input_rows_count);
+                                     ->execute(indexof_args, result_type, input_rows_count_local);
 
             auto null_index_in_array = slice_index.column->get64(0);
             if (null_index_in_array > 0)
@@ -218,15 +220,15 @@ public:
                         ColumnsWithTypeAndName slice_args_right(
                             {{ColumnWithTypeAndName(tuple_columns[i], arg_type, "array")}, slice_index});
                         ColumnWithTypeAndName arr_left{
-                            fun_slice->build(slice_args_left)->execute(slice_args_left, arg_type, input_rows_count), arg_type, ""};
+                            fun_slice->build(slice_args_left)->execute(slice_args_left, arg_type, input_rows_count_local), arg_type, ""};
                         ColumnWithTypeAndName arr_right{
-                            fun_slice->build(slice_args_right)->execute(slice_args_right, arg_type, input_rows_count), arg_type, ""};
+                            fun_slice->build(slice_args_right)->execute(slice_args_right, arg_type, input_rows_count_local), arg_type, ""};
 
                         ColumnsWithTypeAndName arr_cancat({arr_right, arr_left});
                         auto out_tmp = FunctionFactory::instance()
                                            .get("arrayConcat", context)
                                            ->build(arr_cancat)
-                                           ->execute(arr_cancat, arg_type, input_rows_count);
+                                           ->execute(arr_cancat, arg_type, input_rows_count_local);
                         adjusted_columns[i] = std::move(out_tmp);
                     }
                 }
diff --git a/src/Functions/LowerUpperImpl.h b/src/Functions/LowerUpperImpl.h
index a52703d10c8..72b3ce1ca34 100644
--- a/src/Functions/LowerUpperImpl.h
+++ b/src/Functions/LowerUpperImpl.h
@@ -1,25 +1,24 @@
 #pragma once
 #include <Columns/ColumnString.h>
 
+
 namespace DB
 {
 
 template <char not_case_lower_bound, char not_case_upper_bound>
 struct LowerUpperImpl
 {
-    static void vector(
-        const ColumnString::Chars & data,
+    static void vector(const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t /*input_rows_count*/)
+        ColumnString::Offsets & res_offsets)
     {
         res_data.resize_exact(data.size());
         res_offsets.assign(offsets);
         array(data.data(), data.data() + data.size(), res_data.data());
     }
 
-    static void vectorFixed(const ColumnString::Chars & data, size_t /*n*/, ColumnString::Chars & res_data, size_t /*input_rows_count*/)
+    static void vectorFixed(const ColumnString::Chars & data, size_t /*n*/, ColumnString::Chars & res_data)
     {
         res_data.resize_exact(data.size());
         array(data.data(), data.data() + data.size(), res_data.data());
diff --git a/src/Functions/LowerUpperUTF8Impl.h b/src/Functions/LowerUpperUTF8Impl.h
index f174bcd5f3e..eebba7b9d5f 100644
--- a/src/Functions/LowerUpperUTF8Impl.h
+++ b/src/Functions/LowerUpperUTF8Impl.h
@@ -1,111 +1,281 @@
 #pragma once
+#include <Columns/ColumnString.h>
+#include <Functions/LowerUpperImpl.h>
+#include <base/defines.h>
+#include <Poco/UTF8Encoding.h>
+#include <Common/StringUtils.h>
+#include <Common/UTF8Helpers.h>
 
-#include "config.h"
+#ifdef __SSE2__
+#include <emmintrin.h>
+#endif
 
-#if USE_ICU
-
-#    include <Columns/ColumnString.h>
-#    include <Functions/LowerUpperImpl.h>
-#    include <base/scope_guard.h>
-#    include <unicode/ucasemap.h>
-#    include <unicode/unistr.h>
-#    include <unicode/urename.h>
-#    include <unicode/utypes.h>
-#    include <Common/StringUtils.h>
 
 namespace DB
 {
 
 namespace ErrorCodes
 {
-extern const int BAD_ARGUMENTS;
-extern const int LOGICAL_ERROR;
+    extern const int BAD_ARGUMENTS;
 }
 
-template <char not_case_lower_bound, char not_case_upper_bound, bool upper>
+/// xor or do nothing
+template <bool>
+UInt8 xor_or_identity(const UInt8 c, const int mask)
+{
+    return c ^ mask;
+}
+
+template <>
+inline UInt8 xor_or_identity<false>(const UInt8 c, const int)
+{
+    return c;
+}
+
+/// It is caller's responsibility to ensure the presence of a valid cyrillic sequence in array
+template <bool to_lower>
+inline void UTF8CyrillicToCase(const UInt8 *& src, UInt8 *& dst)
+{
+    if (src[0] == 0xD0u && (src[1] >= 0x80u && src[1] <= 0x8Fu))
+    {
+        /// ЀЁЂЃЄЅІЇЈЉЊЋЌЍЎЏ
+        *dst++ = xor_or_identity<to_lower>(*src++, 0x1);
+        *dst++ = xor_or_identity<to_lower>(*src++, 0x10);
+    }
+    else if (src[0] == 0xD1u && (src[1] >= 0x90u && src[1] <= 0x9Fu))
+    {
+        /// ѐёђѓєѕіїјљњћќѝўџ
+        *dst++ = xor_or_identity<!to_lower>(*src++, 0x1);
+        *dst++ = xor_or_identity<!to_lower>(*src++, 0x10);
+    }
+    else if (src[0] == 0xD0u && (src[1] >= 0x90u && src[1] <= 0x9Fu))
+    {
+        /// А-П
+        *dst++ = *src++;
+        *dst++ = xor_or_identity<to_lower>(*src++, 0x20);
+    }
+    else if (src[0] == 0xD0u && (src[1] >= 0xB0u && src[1] <= 0xBFu))
+    {
+        /// а-п
+        *dst++ = *src++;
+        *dst++ = xor_or_identity<!to_lower>(*src++, 0x20);
+    }
+    else if (src[0] == 0xD0u && (src[1] >= 0xA0u && src[1] <= 0xAFu))
+    {
+        /// Р-Я
+        *dst++ = xor_or_identity<to_lower>(*src++, 0x1);
+        *dst++ = xor_or_identity<to_lower>(*src++, 0x20);
+    }
+    else if (src[0] == 0xD1u && (src[1] >= 0x80u && src[1] <= 0x8Fu))
+    {
+        /// р-я
+        *dst++ = xor_or_identity<!to_lower>(*src++, 0x1);
+        *dst++ = xor_or_identity<!to_lower>(*src++, 0x20);
+    }
+}
+
+
+/** If the string contains UTF-8 encoded text, convert it to the lower (upper) case.
+  * Note: It is assumed that after the character is converted to another case,
+  *  the length of its multibyte sequence in UTF-8 does not change.
+  * Otherwise, the behavior is undefined.
+  */
+template <char not_case_lower_bound,
+    char not_case_upper_bound,
+    int to_case(int),
+    void cyrillic_to_case(const UInt8 *&, UInt8 *&)>
 struct LowerUpperUTF8Impl
 {
     static void vector(
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
-        if (input_rows_count == 0)
+        if (data.empty())
             return;
 
         bool all_ascii = isAllASCII(data.data(), data.size());
         if (all_ascii)
         {
-            LowerUpperImpl<not_case_lower_bound, not_case_upper_bound>::vector(data, offsets, res_data, res_offsets, input_rows_count);
+            LowerUpperImpl<not_case_lower_bound, not_case_upper_bound>::vector(data, offsets, res_data, res_offsets);
             return;
         }
 
-        res_data.resize(data.size());
-        res_offsets.resize_exact(input_rows_count);
-
-        UErrorCode error_code = U_ZERO_ERROR;
-        UCaseMap * case_map = ucasemap_open("", U_FOLD_CASE_DEFAULT, &error_code);
-        if (U_FAILURE(error_code))
-            throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "Error calling ucasemap_open: {}", u_errorName(error_code));
-
-        SCOPE_EXIT(
-        {
-            ucasemap_close(case_map);
-        });
-
-        size_t curr_offset = 0;
-        for (size_t row_i = 0; row_i < input_rows_count; ++row_i)
-        {
-            const auto * src = reinterpret_cast<const char *>(&data[offsets[row_i - 1]]);
-            size_t src_size = offsets[row_i] - offsets[row_i - 1] - 1;
-
-            int32_t dst_size;
-            if constexpr (upper)
-                dst_size = ucasemap_utf8ToUpper(
-                    case_map, reinterpret_cast<char *>(&res_data[curr_offset]), res_data.size() - curr_offset, src, src_size, &error_code);
-            else
-                dst_size = ucasemap_utf8ToLower(
-                    case_map, reinterpret_cast<char *>(&res_data[curr_offset]), res_data.size() - curr_offset, src, src_size, &error_code);
-
-            if (error_code == U_BUFFER_OVERFLOW_ERROR || error_code == U_STRING_NOT_TERMINATED_WARNING)
-            {
-                size_t new_size = curr_offset + dst_size + 1;
-                res_data.resize(new_size);
-
-                error_code = U_ZERO_ERROR;
-                if constexpr (upper)
-                    dst_size = ucasemap_utf8ToUpper(
-                        case_map, reinterpret_cast<char *>(&res_data[curr_offset]), res_data.size() - curr_offset, src, src_size, &error_code);
-                else
-                    dst_size = ucasemap_utf8ToLower(
-                        case_map, reinterpret_cast<char *>(&res_data[curr_offset]), res_data.size() - curr_offset, src, src_size, &error_code);
-            }
-
-            if (error_code != U_ZERO_ERROR)
-                throw DB::Exception(
-                    ErrorCodes::LOGICAL_ERROR,
-                    "Error calling {}: {} input: {} input_size: {}",
-                    upper ? "ucasemap_utf8ToUpper" : "ucasemap_utf8ToLower",
-                    u_errorName(error_code),
-                    std::string_view(src, src_size),
-                    src_size);
-
-            res_data[curr_offset + dst_size] = 0;
-            curr_offset += dst_size + 1;
-            res_offsets[row_i] = curr_offset;
-        }
-
-        res_data.resize(curr_offset);
+        res_data.resize_exact(data.size());
+        res_offsets.assign(offsets);
+        array(data.data(), data.data() + data.size(), offsets, res_data.data());
     }
 
-    static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+    static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Functions lowerUTF8 and upperUTF8 cannot work with FixedString argument");
     }
+
+    /** Converts a single code point starting at `src` to desired case, storing result starting at `dst`.
+     *    `src` and `dst` are incremented by corresponding sequence lengths. */
+    static bool toCase(const UInt8 *& src, const UInt8 * src_end, UInt8 *& dst, bool partial)
+    {
+        if (src[0] <= ascii_upper_bound)
+        {
+            if (*src >= not_case_lower_bound && *src <= not_case_upper_bound)
+                *dst++ = *src++ ^ flip_case_mask;
+            else
+                *dst++ = *src++;
+        }
+        else if (src + 1 < src_end
+            && ((src[0] == 0xD0u && (src[1] >= 0x80u && src[1] <= 0xBFu)) || (src[0] == 0xD1u && (src[1] >= 0x80u && src[1] <= 0x9Fu))))
+        {
+            cyrillic_to_case(src, dst);
+        }
+        else if (src + 1 < src_end && src[0] == 0xC2u)
+        {
+            /// Punctuation U+0080 - U+00BF, UTF-8: C2 80 - C2 BF
+            *dst++ = *src++;
+            *dst++ = *src++;
+        }
+        else if (src + 2 < src_end && src[0] == 0xE2u)
+        {
+            /// Characters U+2000 - U+2FFF, UTF-8: E2 80 80 - E2 BF BF
+            *dst++ = *src++;
+            *dst++ = *src++;
+            *dst++ = *src++;
+        }
+        else
+        {
+            size_t src_sequence_length = UTF8::seqLength(*src);
+            /// In case partial buffer was passed (due to SSE optimization)
+            /// we cannot convert it with current src_end, but we may have more
+            /// bytes to convert and eventually got correct symbol.
+            if (partial && src_sequence_length > static_cast<size_t>(src_end - src))
+                return false;
+
+            auto src_code_point = UTF8::convertUTF8ToCodePoint(src, src_end - src);
+            if (src_code_point)
+            {
+                int dst_code_point = to_case(*src_code_point);
+                if (dst_code_point > 0)
+                {
+                    size_t dst_sequence_length = UTF8::convertCodePointToUTF8(dst_code_point, dst, src_end - src);
+                    assert(dst_sequence_length <= 4);
+
+                    /// We don't support cases when lowercase and uppercase characters occupy different number of bytes in UTF-8.
+                    /// As an example, this happens for ß and ẞ.
+                    if (dst_sequence_length == src_sequence_length)
+                    {
+                        src += dst_sequence_length;
+                        dst += dst_sequence_length;
+                        return true;
+                    }
+                }
+            }
+
+            *dst = *src;
+            ++dst;
+            ++src;
+        }
+
+        return true;
+    }
+
+private:
+    static constexpr auto ascii_upper_bound = '\x7f';
+    static constexpr auto flip_case_mask = 'A' ^ 'a';
+
+    static void array(const UInt8 * src, const UInt8 * src_end, const ColumnString::Offsets & offsets, UInt8 * dst)
+    {
+        const auto * offset_it = offsets.begin();
+        const UInt8 * begin = src;
+
+#ifdef __SSE2__
+        static constexpr auto bytes_sse = sizeof(__m128i);
+
+        /// If we are before this position, we can still read at least bytes_sse.
+        const auto * src_end_sse = src_end - bytes_sse + 1;
+
+        /// SSE2 packed comparison operate on signed types, hence compare (c < 0) instead of (c > 0x7f)
+        const auto v_zero = _mm_setzero_si128();
+        const auto v_not_case_lower_bound = _mm_set1_epi8(not_case_lower_bound - 1);
+        const auto v_not_case_upper_bound = _mm_set1_epi8(not_case_upper_bound + 1);
+        const auto v_flip_case_mask = _mm_set1_epi8(flip_case_mask);
+
+        while (src < src_end_sse)
+        {
+            const auto chars = _mm_loadu_si128(reinterpret_cast<const __m128i *>(src));
+
+            /// check for ASCII
+            const auto is_not_ascii = _mm_cmplt_epi8(chars, v_zero);
+            const auto mask_is_not_ascii = _mm_movemask_epi8(is_not_ascii);
+
+            /// ASCII
+            if (mask_is_not_ascii == 0)
+            {
+                const auto is_not_case
+                    = _mm_and_si128(_mm_cmpgt_epi8(chars, v_not_case_lower_bound), _mm_cmplt_epi8(chars, v_not_case_upper_bound));
+                const auto mask_is_not_case = _mm_movemask_epi8(is_not_case);
+
+                /// everything in correct case ASCII
+                if (mask_is_not_case == 0)
+                    _mm_storeu_si128(reinterpret_cast<__m128i *>(dst), chars);
+                else
+                {
+                    /// ASCII in mixed case
+                    /// keep `flip_case_mask` only where necessary, zero out elsewhere
+                    const auto xor_mask = _mm_and_si128(v_flip_case_mask, is_not_case);
+
+                    /// flip case by applying calculated mask
+                    const auto cased_chars = _mm_xor_si128(chars, xor_mask);
+
+                    /// store result back to destination
+                    _mm_storeu_si128(reinterpret_cast<__m128i *>(dst), cased_chars);
+                }
+
+                src += bytes_sse;
+                dst += bytes_sse;
+            }
+            else
+            {
+                /// UTF-8
+
+                /// Find the offset of the next string after src
+                size_t offset_from_begin = src - begin;
+                while (offset_from_begin >= *offset_it)
+                    ++offset_it;
+
+                /// Do not allow one row influence another (since row may have invalid sequence, and break the next)
+                const UInt8 * row_end = begin + *offset_it;
+                chassert(row_end >= src);
+                const UInt8 * expected_end = std::min(src + bytes_sse, row_end);
+
+                while (src < expected_end)
+                {
+                    if (!toCase(src, expected_end, dst, /* partial= */ true))
+                    {
+                        /// Fallback to handling byte by byte.
+                        src_end_sse = src;
+                        break;
+                    }
+                }
+            }
+        }
+
+        /// Find the offset of the next string after src
+        size_t offset_from_begin = src - begin;
+        while (offset_it != offsets.end() && offset_from_begin >= *offset_it)
+            ++offset_it;
+#endif
+
+        /// handle remaining symbols, row by row (to avoid influence of bad UTF8 symbols from one row, to another)
+        while (src < src_end)
+        {
+            const UInt8 * row_end = begin + *offset_it;
+            chassert(row_end >= src);
+
+            while (src < row_end)
+                toCase(src, row_end, dst, /* partial= */ false);
+            ++offset_it;
+        }
+    }
 };
 
 }
-
-#endif
diff --git a/src/Functions/MatchImpl.h b/src/Functions/MatchImpl.h
index 7dc93ba79e0..55b2fee5400 100644
--- a/src/Functions/MatchImpl.h
+++ b/src/Functions/MatchImpl.h
@@ -127,17 +127,17 @@ struct MatchImpl
         const String & needle,
         [[maybe_unused]] const ColumnPtr & start_pos_,
         PaddedPODArray<UInt8> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null,
-        size_t input_rows_count)
+        [[maybe_unused]] ColumnUInt8 * res_null)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
-        chassert(!res_null);
+        assert(!res_null);
 
-        chassert(res.size() == haystack_offsets.size());
-        chassert(res.size() == input_rows_count);
-        chassert(start_pos_ == nullptr);
+        const size_t haystack_size = haystack_offsets.size();
 
-        if (input_rows_count == 0)
+        assert(haystack_size == res.size());
+        assert(start_pos_ == nullptr);
+
+        if (haystack_offsets.empty())
             return;
 
         /// Shortcut for the silly but practical case that the pattern matches everything/nothing independently of the haystack:
@@ -202,11 +202,11 @@ struct MatchImpl
         if (required_substring.empty())
         {
             if (!regexp.getRE2()) /// An empty regexp. Always matches.
-                memset(res.data(), !negate, input_rows_count * sizeof(res[0]));
+                memset(res.data(), !negate, haystack_size * sizeof(res[0]));
             else
             {
                 size_t prev_offset = 0;
-                for (size_t i = 0; i < input_rows_count; ++i)
+                for (size_t i = 0; i < haystack_size; ++i)
                 {
                     const bool match = regexp.getRE2()->Match(
                             {reinterpret_cast<const char *>(&haystack_data[prev_offset]), haystack_offsets[i] - prev_offset - 1},
@@ -291,16 +291,16 @@ struct MatchImpl
         size_t N,
         const String & needle,
         PaddedPODArray<UInt8> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null,
-        size_t input_rows_count)
+        [[maybe_unused]] ColumnUInt8 * res_null)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
-        chassert(!res_null);
+        assert(!res_null);
 
-        chassert(res.size() == haystack.size() / N);
-        chassert(res.size() == input_rows_count);
+        const size_t haystack_size = haystack.size() / N;
 
-        if (input_rows_count == 0)
+        assert(haystack_size == res.size());
+
+        if (haystack.empty())
             return;
 
         /// Shortcut for the silly but practical case that the pattern matches everything/nothing independently of the haystack:
@@ -370,11 +370,11 @@ struct MatchImpl
         if (required_substring.empty())
         {
             if (!regexp.getRE2()) /// An empty regexp. Always matches.
-                memset(res.data(), !negate, input_rows_count * sizeof(res[0]));
+                memset(res.data(), !negate, haystack_size * sizeof(res[0]));
             else
             {
                 size_t offset = 0;
-                for (size_t i = 0; i < input_rows_count; ++i)
+                for (size_t i = 0; i < haystack_size; ++i)
                 {
                     const bool match = regexp.getRE2()->Match(
                             {reinterpret_cast<const char *>(&haystack[offset]), N},
@@ -464,18 +464,18 @@ struct MatchImpl
         const ColumnString::Offsets & needle_offset,
         [[maybe_unused]] const ColumnPtr & start_pos_,
         PaddedPODArray<UInt8> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null,
-        size_t input_rows_count)
+        [[maybe_unused]] ColumnUInt8 * res_null)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
-        chassert(!res_null);
+        assert(!res_null);
 
-        chassert(haystack_offsets.size() == needle_offset.size());
-        chassert(res.size() == haystack_offsets.size());
-        chassert(res.size() == input_rows_count);
-        chassert(start_pos_ == nullptr);
+        const size_t haystack_size = haystack_offsets.size();
 
-        if (input_rows_count == 0)
+        assert(haystack_size == needle_offset.size());
+        assert(haystack_size == res.size());
+        assert(start_pos_ == nullptr);
+
+        if (haystack_offsets.empty())
             return;
 
         String required_substr;
@@ -488,7 +488,7 @@ struct MatchImpl
         Regexps::LocalCacheTable cache;
         Regexps::RegexpPtr regexp;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_size; ++i)
         {
             const auto * const cur_haystack_data = &haystack_data[prev_haystack_offset];
             const size_t cur_haystack_length = haystack_offsets[i] - prev_haystack_offset - 1;
@@ -573,16 +573,16 @@ struct MatchImpl
         const ColumnString::Offsets & needle_offset,
         [[maybe_unused]] const ColumnPtr & start_pos_,
         PaddedPODArray<UInt8> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null,
-        size_t input_rows_count)
+        [[maybe_unused]] ColumnUInt8 * res_null)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
-        chassert(!res_null);
+        assert(!res_null);
 
-        chassert(res.size() == input_rows_count);
-        chassert(res.size() == haystack.size() / N);
-        chassert(res.size() == needle_offset.size());
-        chassert(start_pos_ == nullptr);
+        const size_t haystack_size = haystack.size()/N;
+
+        assert(haystack_size == needle_offset.size());
+        assert(haystack_size == res.size());
+        assert(start_pos_ == nullptr);
 
         if (haystack.empty())
             return;
@@ -597,7 +597,7 @@ struct MatchImpl
         Regexps::LocalCacheTable cache;
         Regexps::RegexpPtr regexp;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_size; ++i)
         {
             const auto * const cur_haystack_data = &haystack[prev_haystack_offset];
             const size_t cur_haystack_length = N;
diff --git a/src/Functions/MultiMatchAllIndicesImpl.h b/src/Functions/MultiMatchAllIndicesImpl.h
index e7c3aebf794..3e9c8fba215 100644
--- a/src/Functions/MultiMatchAllIndicesImpl.h
+++ b/src/Functions/MultiMatchAllIndicesImpl.h
@@ -52,10 +52,9 @@ struct MultiMatchAllIndicesImpl
         bool allow_hyperscan,
         size_t max_hyperscan_regexp_length,
         size_t max_hyperscan_regexp_total_length,
-        bool reject_expensive_hyperscan_regexps,
-        size_t input_rows_count)
+        bool reject_expensive_hyperscan_regexps)
     {
-        vectorConstant(haystack_data, haystack_offsets, needles_arr, res, offsets, std::nullopt, allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps, input_rows_count);
+        vectorConstant(haystack_data, haystack_offsets, needles_arr, res, offsets, std::nullopt, allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps);
     }
 
     static void vectorConstant(
@@ -68,8 +67,7 @@ struct MultiMatchAllIndicesImpl
         bool allow_hyperscan,
         size_t max_hyperscan_regexp_length,
         size_t max_hyperscan_regexp_total_length,
-        bool reject_expensive_hyperscan_regexps,
-        size_t input_rows_count)
+        bool reject_expensive_hyperscan_regexps)
     {
         if (!allow_hyperscan)
             throw Exception(ErrorCodes::FUNCTION_NOT_ALLOWED, "Hyperscan functions are disabled, because setting 'allow_hyperscan' is set to 0");
@@ -77,7 +75,7 @@ struct MultiMatchAllIndicesImpl
         std::vector<std::string_view> needles;
         needles.reserve(needles_arr.size());
         for (const auto & needle : needles_arr)
-            needles.emplace_back(needle.safeGet<String>());
+            needles.emplace_back(needle.get<String>());
 
         checkHyperscanRegexp(needles, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length);
 
@@ -89,7 +87,7 @@ struct MultiMatchAllIndicesImpl
                     throw Exception(ErrorCodes::HYPERSCAN_CANNOT_SCAN_TEXT, "Regular expression evaluation in vectorscan will be too slow. To ignore this error, disable setting 'reject_expensive_hyperscan_regexps'.");
         }
 
-        offsets.resize(input_rows_count);
+        offsets.resize(haystack_offsets.size());
 
         if (needles_arr.empty())
         {
@@ -116,8 +114,9 @@ struct MultiMatchAllIndicesImpl
             static_cast<PaddedPODArray<ResultType>*>(context)->push_back(id);
             return 0;
         };
+        const size_t haystack_offsets_size = haystack_offsets.size();
         UInt64 offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_offsets_size; ++i)
         {
             UInt64 length = haystack_offsets[i] - offset - 1;
             /// vectorscan restriction.
@@ -147,7 +146,6 @@ struct MultiMatchAllIndicesImpl
         (void)max_hyperscan_regexp_length;
         (void)max_hyperscan_regexp_total_length;
         (void)reject_expensive_hyperscan_regexps;
-        (void)input_rows_count;
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "multi-search all indices is not implemented when vectorscan is off");
 #endif // USE_VECTORSCAN
     }
@@ -162,10 +160,9 @@ struct MultiMatchAllIndicesImpl
         bool allow_hyperscan,
         size_t max_hyperscan_regexp_length,
         size_t max_hyperscan_regexp_total_length,
-        bool reject_expensive_hyperscan_regexps,
-        size_t input_rows_count)
+        bool reject_expensive_hyperscan_regexps)
     {
-        vectorVector(haystack_data, haystack_offsets, needles_data, needles_offsets, res, offsets, std::nullopt, allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps, input_rows_count);
+        vectorVector(haystack_data, haystack_offsets, needles_data, needles_offsets, res, offsets, std::nullopt, allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps);
     }
 
     static void vectorVector(
@@ -179,13 +176,12 @@ struct MultiMatchAllIndicesImpl
         bool allow_hyperscan,
         size_t max_hyperscan_regexp_length,
         size_t max_hyperscan_regexp_total_length,
-        bool reject_expensive_hyperscan_regexps,
-        size_t input_rows_count)
+        bool reject_expensive_hyperscan_regexps)
     {
         if (!allow_hyperscan)
             throw Exception(ErrorCodes::FUNCTION_NOT_ALLOWED, "Hyperscan functions are disabled, because setting 'allow_hyperscan' is set to 0");
 #if USE_VECTORSCAN
-        offsets.resize(input_rows_count);
+        offsets.resize(haystack_offsets.size());
         size_t prev_haystack_offset = 0;
         size_t prev_needles_offset = 0;
 
@@ -193,7 +189,7 @@ struct MultiMatchAllIndicesImpl
 
         std::vector<std::string_view> needles;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_offsets.size(); ++i)
         {
             needles.reserve(needles_offsets[i] - prev_needles_offset);
 
@@ -275,7 +271,6 @@ struct MultiMatchAllIndicesImpl
         (void)max_hyperscan_regexp_length;
         (void)max_hyperscan_regexp_total_length;
         (void)reject_expensive_hyperscan_regexps;
-        (void)input_rows_count;
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "multi-search all indices is not implemented when vectorscan is off");
 #endif // USE_VECTORSCAN
     }
diff --git a/src/Functions/MultiMatchAnyImpl.h b/src/Functions/MultiMatchAnyImpl.h
index 54413cbc1cd..20b2150048b 100644
--- a/src/Functions/MultiMatchAnyImpl.h
+++ b/src/Functions/MultiMatchAnyImpl.h
@@ -66,10 +66,9 @@ struct MultiMatchAnyImpl
         bool allow_hyperscan,
         size_t max_hyperscan_regexp_length,
         size_t max_hyperscan_regexp_total_length,
-        bool reject_expensive_hyperscan_regexps,
-        size_t input_rows_count)
+        bool reject_expensive_hyperscan_regexps)
     {
-        vectorConstant(haystack_data, haystack_offsets, needles_arr, res, offsets, std::nullopt, allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps, input_rows_count);
+        vectorConstant(haystack_data, haystack_offsets, needles_arr, res, offsets, std::nullopt, allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps);
     }
 
     static void vectorConstant(
@@ -82,8 +81,7 @@ struct MultiMatchAnyImpl
         bool allow_hyperscan,
         size_t max_hyperscan_regexp_length,
         size_t max_hyperscan_regexp_total_length,
-        bool reject_expensive_hyperscan_regexps,
-        size_t input_rows_count)
+        bool reject_expensive_hyperscan_regexps)
     {
         if (!allow_hyperscan)
             throw Exception(ErrorCodes::FUNCTION_NOT_ALLOWED, "Hyperscan functions are disabled, because setting 'allow_hyperscan' is set to 0");
@@ -91,7 +89,7 @@ struct MultiMatchAnyImpl
         std::vector<std::string_view> needles;
         needles.reserve(needles_arr.size());
         for (const auto & needle : needles_arr)
-            needles.emplace_back(needle.safeGet<String>());
+            needles.emplace_back(needle.get<String>());
 
         checkHyperscanRegexp(needles, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length);
 
@@ -103,7 +101,7 @@ struct MultiMatchAnyImpl
                     throw Exception(ErrorCodes::HYPERSCAN_CANNOT_SCAN_TEXT, "Regular expression evaluation in vectorscan will be too slow. To ignore this error, disable setting 'reject_expensive_hyperscan_regexps'.");
         }
 
-        res.resize(input_rows_count);
+        res.resize(haystack_offsets.size());
 
         if (needles_arr.empty())
         {
@@ -135,8 +133,9 @@ struct MultiMatchAnyImpl
             /// Once we hit the callback, there is no need to search for others.
             return 1;
         };
+        const size_t haystack_offsets_size = haystack_offsets.size();
         UInt64 offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_offsets_size; ++i)
         {
             UInt64 length = haystack_offsets[i] - offset - 1;
             /// vectorscan restriction.
@@ -165,7 +164,7 @@ struct MultiMatchAnyImpl
         memset(accum.data(), 0, accum.size());
         for (size_t j = 0; j < needles.size(); ++j)
         {
-            MatchImpl<Name, MatchTraits::Syntax::Re2, MatchTraits::Case::Sensitive, MatchTraits::Result::DontNegate>::vectorConstant(haystack_data, haystack_offsets, String(needles[j].data(), needles[j].size()), nullptr, accum, nullptr, input_rows_count);
+            MatchImpl<Name, MatchTraits::Syntax::Re2, MatchTraits::Case::Sensitive, MatchTraits::Result::DontNegate>::vectorConstant(haystack_data, haystack_offsets, String(needles[j].data(), needles[j].size()), nullptr, accum, nullptr);
             for (size_t i = 0; i < res.size(); ++i)
             {
                 if constexpr (FindAny)
@@ -187,10 +186,9 @@ struct MultiMatchAnyImpl
         bool allow_hyperscan,
         size_t max_hyperscan_regexp_length,
         size_t max_hyperscan_regexp_total_length,
-        bool reject_expensive_hyperscan_regexps,
-        size_t input_rows_count)
+        bool reject_expensive_hyperscan_regexps)
     {
-        vectorVector(haystack_data, haystack_offsets, needles_data, needles_offsets, res, offsets, std::nullopt, allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps, input_rows_count);
+        vectorVector(haystack_data, haystack_offsets, needles_data, needles_offsets, res, offsets, std::nullopt, allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps);
     }
 
     static void vectorVector(
@@ -204,13 +202,12 @@ struct MultiMatchAnyImpl
         bool allow_hyperscan,
         size_t max_hyperscan_regexp_length,
         size_t max_hyperscan_regexp_total_length,
-        bool reject_expensive_hyperscan_regexps,
-        size_t input_rows_count)
+        bool reject_expensive_hyperscan_regexps)
     {
         if (!allow_hyperscan)
             throw Exception(ErrorCodes::FUNCTION_NOT_ALLOWED, "Hyperscan functions are disabled, because setting 'allow_hyperscan' is set to 0");
 
-        res.resize(input_rows_count);
+        res.resize(haystack_offsets.size());
 #if USE_VECTORSCAN
         size_t prev_haystack_offset = 0;
         size_t prev_needles_offset = 0;
@@ -219,7 +216,7 @@ struct MultiMatchAnyImpl
 
         std::vector<std::string_view> needles;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_offsets.size(); ++i)
         {
             needles.reserve(needles_offsets[i] - prev_needles_offset);
 
@@ -309,7 +306,7 @@ struct MultiMatchAnyImpl
 
         std::vector<std::string_view> needles;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_offsets.size(); ++i)
         {
             const auto * const cur_haystack_data = &haystack_data[prev_haystack_offset];
             const size_t cur_haystack_length = haystack_offsets[i] - prev_haystack_offset - 1;
diff --git a/src/Functions/MultiSearchAllPositionsImpl.h b/src/Functions/MultiSearchAllPositionsImpl.h
index 6c2cd215638..cfe60e51bcd 100644
--- a/src/Functions/MultiSearchAllPositionsImpl.h
+++ b/src/Functions/MultiSearchAllPositionsImpl.h
@@ -33,7 +33,7 @@ struct MultiSearchAllPositionsImpl
         std::vector<std::string_view> needles;
         needles.reserve(needles_arr.size());
         for (const auto & needle : needles_arr)
-            needles.emplace_back(needle.safeGet<String>());
+            needles.emplace_back(needle.get<String>());
 
         auto res_callback = [](const UInt8 * start, const UInt8 * end) -> UInt64
         {
diff --git a/src/Functions/MultiSearchFirstIndexImpl.h b/src/Functions/MultiSearchFirstIndexImpl.h
index f1dc9ab9e11..36a5fd514d9 100644
--- a/src/Functions/MultiSearchFirstIndexImpl.h
+++ b/src/Functions/MultiSearchFirstIndexImpl.h
@@ -33,8 +33,7 @@ struct MultiSearchFirstIndexImpl
         bool /*allow_hyperscan*/,
         size_t /*max_hyperscan_regexp_length*/,
         size_t /*max_hyperscan_regexp_total_length*/,
-        bool /*reject_expensive_hyperscan_regexps*/,
-        size_t input_rows_count)
+        bool /*reject_expensive_hyperscan_regexps*/)
     {
         // For performance of Volnitsky search, it is crucial to save only one byte for pattern number.
         if (needles_arr.size() > std::numeric_limits<UInt8>::max())
@@ -45,17 +44,18 @@ struct MultiSearchFirstIndexImpl
         std::vector<std::string_view> needles;
         needles.reserve(needles_arr.size());
         for (const auto & needle : needles_arr)
-            needles.emplace_back(needle.safeGet<String>());
+            needles.emplace_back(needle.get<String>());
 
         auto searcher = Impl::createMultiSearcherInBigHaystack(needles);
 
-        res.resize(input_rows_count);
+        const size_t haystack_size = haystack_offsets.size();
+        res.resize(haystack_size);
 
         size_t iteration = 0;
         while (searcher.hasMoreToSearch())
         {
             size_t prev_haystack_offset = 0;
-            for (size_t j = 0; j < input_rows_count; ++j)
+            for (size_t j = 0; j < haystack_size; ++j)
             {
                 const auto * haystack = &haystack_data[prev_haystack_offset];
                 const auto * haystack_end = haystack + haystack_offsets[j] - prev_haystack_offset - 1;
@@ -80,10 +80,10 @@ struct MultiSearchFirstIndexImpl
         bool /*allow_hyperscan*/,
         size_t /*max_hyperscan_regexp_length*/,
         size_t /*max_hyperscan_regexp_total_length*/,
-        bool /*reject_expensive_hyperscan_regexps*/,
-        size_t input_rows_count)
+        bool /*reject_expensive_hyperscan_regexps*/)
     {
-        res.resize(input_rows_count);
+        const size_t haystack_size = haystack_offsets.size();
+        res.resize(haystack_size);
 
         size_t prev_haystack_offset = 0;
         size_t prev_needles_offset = 0;
@@ -92,7 +92,7 @@ struct MultiSearchFirstIndexImpl
 
         std::vector<std::string_view> needles;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_size; ++i)
         {
             needles.reserve(needles_offsets[i] - prev_needles_offset);
 
diff --git a/src/Functions/MultiSearchFirstPositionImpl.h b/src/Functions/MultiSearchFirstPositionImpl.h
index 4380eeb1b29..ccdd82a0ee5 100644
--- a/src/Functions/MultiSearchFirstPositionImpl.h
+++ b/src/Functions/MultiSearchFirstPositionImpl.h
@@ -33,8 +33,7 @@ struct MultiSearchFirstPositionImpl
         bool /*allow_hyperscan*/,
         size_t /*max_hyperscan_regexp_length*/,
         size_t /*max_hyperscan_regexp_total_length*/,
-        bool /*reject_expensive_hyperscan_regexps*/,
-        size_t input_rows_count)
+        bool /*reject_expensive_hyperscan_regexps*/)
     {
         // For performance of Volnitsky search, it is crucial to save only one byte for pattern number.
         if (needles_arr.size() > std::numeric_limits<UInt8>::max())
@@ -45,7 +44,7 @@ struct MultiSearchFirstPositionImpl
         std::vector<std::string_view> needles;
         needles.reserve(needles_arr.size());
         for (const auto & needle : needles_arr)
-            needles.emplace_back(needle.safeGet<String>());
+            needles.emplace_back(needle.get<String>());
 
         auto res_callback = [](const UInt8 * start, const UInt8 * end) -> UInt64
         {
@@ -53,13 +52,14 @@ struct MultiSearchFirstPositionImpl
         };
         auto searcher = Impl::createMultiSearcherInBigHaystack(needles);
 
-        res.resize(input_rows_count);
+        const size_t haystack_size = haystack_offsets.size();
+        res.resize(haystack_size);
 
         size_t iteration = 0;
         while (searcher.hasMoreToSearch())
         {
             size_t prev_haystack_offset = 0;
-            for (size_t j = 0; j < input_rows_count; ++j)
+            for (size_t j = 0; j < haystack_size; ++j)
             {
                 const auto * haystack = &haystack_data[prev_haystack_offset];
                 const auto * haystack_end = haystack + haystack_offsets[j] - prev_haystack_offset - 1;
@@ -89,10 +89,10 @@ struct MultiSearchFirstPositionImpl
         bool /*allow_hyperscan*/,
         size_t /*max_hyperscan_regexp_length*/,
         size_t /*max_hyperscan_regexp_total_length*/,
-        bool /*reject_expensive_hyperscan_regexps*/,
-        size_t input_rows_count)
+        bool /*reject_expensive_hyperscan_regexps*/)
     {
-        res.resize(input_rows_count);
+        const size_t haystack_size = haystack_offsets.size();
+        res.resize(haystack_size);
 
         size_t prev_haystack_offset = 0;
         size_t prev_needles_offset = 0;
@@ -106,12 +106,14 @@ struct MultiSearchFirstPositionImpl
             return 1 + Impl::countChars(reinterpret_cast<const char *>(start), reinterpret_cast<const char *>(end));
         };
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_size; ++i)
         {
             needles.reserve(needles_offsets[i] - prev_needles_offset);
 
             for (size_t j = prev_needles_offset; j < needles_offsets[i]; ++j)
+            {
                 needles.emplace_back(needles_data_string.getDataAt(j).toView());
+            }
 
             auto searcher = Impl::createMultiSearcherInBigHaystack(needles); // sub-optimal
 
diff --git a/src/Functions/MultiSearchImpl.h b/src/Functions/MultiSearchImpl.h
index 5c652ddcb74..467cc96a95f 100644
--- a/src/Functions/MultiSearchImpl.h
+++ b/src/Functions/MultiSearchImpl.h
@@ -33,8 +33,7 @@ struct MultiSearchImpl
         bool /*allow_hyperscan*/,
         size_t /*max_hyperscan_regexp_length*/,
         size_t /*max_hyperscan_regexp_total_length*/,
-        bool /*reject_expensive_hyperscan_regexps*/,
-        size_t input_rows_count)
+        bool /*reject_expensive_hyperscan_regexps*/)
     {
         // For performance of Volnitsky search, it is crucial to save only one byte for pattern number.
         if (needles_arr.size() > std::numeric_limits<UInt8>::max())
@@ -45,17 +44,18 @@ struct MultiSearchImpl
         std::vector<std::string_view> needles;
         needles.reserve(needles_arr.size());
         for (const auto & needle : needles_arr)
-            needles.emplace_back(needle.safeGet<String>());
+            needles.emplace_back(needle.get<String>());
 
         auto searcher = Impl::createMultiSearcherInBigHaystack(needles);
 
-        res.resize(input_rows_count);
+        const size_t haystack_size = haystack_offsets.size();
+        res.resize(haystack_size);
 
         size_t iteration = 0;
         while (searcher.hasMoreToSearch())
         {
             size_t prev_haystack_offset = 0;
-            for (size_t j = 0; j < input_rows_count; ++j)
+            for (size_t j = 0; j < haystack_size; ++j)
             {
                 const auto * haystack = &haystack_data[prev_haystack_offset];
                 const auto * haystack_end = haystack + haystack_offsets[j] - prev_haystack_offset - 1;
@@ -79,10 +79,10 @@ struct MultiSearchImpl
         bool /*allow_hyperscan*/,
         size_t /*max_hyperscan_regexp_length*/,
         size_t /*max_hyperscan_regexp_total_length*/,
-        bool /*reject_expensive_hyperscan_regexps*/,
-        size_t input_rows_count)
+        bool /*reject_expensive_hyperscan_regexps*/)
     {
-        res.resize(input_rows_count);
+        const size_t haystack_size = haystack_offsets.size();
+        res.resize(haystack_size);
 
         size_t prev_haystack_offset = 0;
         size_t prev_needles_offset = 0;
@@ -91,12 +91,14 @@ struct MultiSearchImpl
 
         std::vector<std::string_view> needles;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_size; ++i)
         {
             needles.reserve(needles_offsets[i] - prev_needles_offset);
 
             for (size_t j = prev_needles_offset; j < needles_offsets[i]; ++j)
+            {
                 needles.emplace_back(needles_data_string.getDataAt(j).toView());
+            }
 
             const auto * const haystack = &haystack_data[prev_haystack_offset];
             const size_t haystack_length = haystack_offsets[i] - prev_haystack_offset - 1;
diff --git a/src/Functions/PolygonUtils.h b/src/Functions/PolygonUtils.h
index bf8241774a6..57f1243537d 100644
--- a/src/Functions/PolygonUtils.h
+++ b/src/Functions/PolygonUtils.h
@@ -124,7 +124,7 @@ public:
 
     bool hasEmptyBound() const { return has_empty_bound; }
 
-    inline bool contains(CoordinateType x, CoordinateType y) const
+    inline bool ALWAYS_INLINE contains(CoordinateType x, CoordinateType y) const
     {
         Point point(x, y);
 
@@ -167,7 +167,7 @@ public:
 
     UInt64 getAllocatedBytes() const;
 
-    bool contains(CoordinateType x, CoordinateType y) const;
+    inline bool ALWAYS_INLINE contains(CoordinateType x, CoordinateType y) const;
 
 private:
     enum class CellType : uint8_t
@@ -199,7 +199,7 @@ private:
         }
 
         /// Inner part of the HalfPlane is the left side of initialized vector.
-        bool contains(CoordinateType x, CoordinateType y) const { return a * x + b * y + c >= 0; }
+        bool ALWAYS_INLINE contains(CoordinateType x, CoordinateType y) const { return a * x + b * y + c >= 0; }
     };
 
     struct Cell
@@ -233,7 +233,7 @@ private:
     void calcGridAttributes(Box & box);
 
     template <typename T>
-    T getCellIndex(T row, T col) const { return row * grid_size + col; }
+    T ALWAYS_INLINE getCellIndex(T row, T col) const { return row * grid_size + col; }
 
     /// Complex case. Will check intersection directly.
     inline void addComplexPolygonCell(size_t index, const Box & box);
diff --git a/src/Functions/PositionImpl.h b/src/Functions/PositionImpl.h
index e525b5fab57..eeb9d8b6a59 100644
--- a/src/Functions/PositionImpl.h
+++ b/src/Functions/PositionImpl.h
@@ -193,8 +193,7 @@ struct PositionImpl
         const std::string & needle,
         const ColumnPtr & start_pos,
         PaddedPODArray<UInt64> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null,
-        size_t input_rows_count)
+        [[maybe_unused]] ColumnUInt8 * res_null)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
         assert(!res_null);
@@ -215,12 +214,13 @@ struct PositionImpl
             }
 
             ColumnString::Offset prev_offset = 0;
+            size_t rows = haystack_offsets.size();
 
             if (const ColumnConst * start_pos_const = typeid_cast<const ColumnConst *>(&*start_pos))
             {
                 /// Needle is empty and start_pos is constant
                 UInt64 start = std::max(start_pos_const->getUInt(0), static_cast<UInt64>(1));
-                for (size_t i = 0; i < input_rows_count; ++i)
+                for (size_t i = 0; i < rows; ++i)
                 {
                     size_t haystack_size = Impl::countChars(
                         reinterpret_cast<const char *>(pos), reinterpret_cast<const char *>(pos + haystack_offsets[i] - prev_offset - 1));
@@ -234,7 +234,7 @@ struct PositionImpl
             else
             {
                 /// Needle is empty and start_pos is not constant
-                for (size_t i = 0; i < input_rows_count; ++i)
+                for (size_t i = 0; i < rows; ++i)
                 {
                     size_t haystack_size = Impl::countChars(
                         reinterpret_cast<const char *>(pos), reinterpret_cast<const char *>(pos + haystack_offsets[i] - prev_offset - 1));
@@ -359,8 +359,7 @@ struct PositionImpl
         const ColumnString::Offsets & needle_offsets,
         const ColumnPtr & start_pos,
         PaddedPODArray<UInt64> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null,
-        size_t input_rows_count)
+        [[maybe_unused]] ColumnUInt8 * res_null)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
         assert(!res_null);
@@ -368,7 +367,9 @@ struct PositionImpl
         ColumnString::Offset prev_haystack_offset = 0;
         ColumnString::Offset prev_needle_offset = 0;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        size_t size = haystack_offsets.size();
+
+        for (size_t i = 0; i < size; ++i)
         {
             size_t needle_size = needle_offsets[i] - prev_needle_offset - 1;
             size_t haystack_size = haystack_offsets[i] - prev_haystack_offset - 1;
@@ -422,8 +423,7 @@ struct PositionImpl
         const ColumnString::Offsets & needle_offsets,
         const ColumnPtr & start_pos,
         PaddedPODArray<UInt64> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null,
-        size_t input_rows_count)
+        [[maybe_unused]] ColumnUInt8 * res_null)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
         assert(!res_null);
@@ -431,7 +431,9 @@ struct PositionImpl
         /// NOTE You could use haystack indexing. But this is a rare case.
         ColumnString::Offset prev_needle_offset = 0;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        size_t size = needle_offsets.size();
+
+        for (size_t i = 0; i < size; ++i)
         {
             size_t needle_size = needle_offsets[i] - prev_needle_offset - 1;
 
diff --git a/src/Functions/ReplaceRegexpImpl.h b/src/Functions/ReplaceRegexpImpl.h
index 14f5a2d7932..f5fb08f71d2 100644
--- a/src/Functions/ReplaceRegexpImpl.h
+++ b/src/Functions/ReplaceRegexpImpl.h
@@ -201,15 +201,15 @@ struct ReplaceRegexpImpl
         const String & needle,
         const String & replacement,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         if (needle.empty())
             throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Length of the pattern argument in function {} must be greater than 0.", name);
 
         ColumnString::Offset res_offset = 0;
         res_data.reserve(haystack_data.size());
-        res_offsets.resize(input_rows_count);
+        size_t haystack_size = haystack_offsets.size();
+        res_offsets.resize(haystack_size);
 
         re2::RE2::Options regexp_options;
         regexp_options.set_log_errors(false); /// don't write error messages to stderr
@@ -232,13 +232,13 @@ struct ReplaceRegexpImpl
                     case ReplaceRegexpTraits::Replace::All:   return ReplaceStringTraits::Replace::All;
                 }
             };
-            ReplaceStringImpl<Name, convertTrait(replace)>::vectorConstantConstant(haystack_data, haystack_offsets, needle, replacement, res_data, res_offsets, input_rows_count);
+            ReplaceStringImpl<Name, convertTrait(replace)>::vectorConstantConstant(haystack_data, haystack_offsets, needle, replacement, res_data, res_offsets);
             return;
         }
 
         Instructions instructions = createInstructions(replacement, num_captures);
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_size; ++i)
         {
             size_t from = i > 0 ? haystack_offsets[i - 1] : 0;
 
@@ -257,19 +257,19 @@ struct ReplaceRegexpImpl
         const ColumnString::Offsets & needle_offsets,
         const String & replacement,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         assert(haystack_offsets.size() == needle_offsets.size());
 
         ColumnString::Offset res_offset = 0;
         res_data.reserve(haystack_data.size());
-        res_offsets.resize(input_rows_count);
+        size_t haystack_size = haystack_offsets.size();
+        res_offsets.resize(haystack_size);
 
         re2::RE2::Options regexp_options;
         regexp_options.set_log_errors(false); /// don't write error messages to stderr
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_size; ++i)
         {
             size_t hs_from = i > 0 ? haystack_offsets[i - 1] : 0;
             const char * hs_data = reinterpret_cast<const char *>(haystack_data.data() + hs_from);
@@ -302,8 +302,7 @@ struct ReplaceRegexpImpl
         const ColumnString::Chars & replacement_data,
         const ColumnString::Offsets & replacement_offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         assert(haystack_offsets.size() == replacement_offsets.size());
 
@@ -312,7 +311,8 @@ struct ReplaceRegexpImpl
 
         ColumnString::Offset res_offset = 0;
         res_data.reserve(haystack_data.size());
-        res_offsets.resize(input_rows_count);
+        size_t haystack_size = haystack_offsets.size();
+        res_offsets.resize(haystack_size);
 
         re2::RE2::Options regexp_options;
         regexp_options.set_log_errors(false); /// don't write error messages to stderr
@@ -323,7 +323,7 @@ struct ReplaceRegexpImpl
 
         int num_captures = std::min(searcher.NumberOfCapturingGroups() + 1, max_captures);
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_size; ++i)
         {
             size_t hs_from = i > 0 ? haystack_offsets[i - 1] : 0;
             const char * hs_data = reinterpret_cast<const char *>(haystack_data.data() + hs_from);
@@ -349,20 +349,20 @@ struct ReplaceRegexpImpl
         const ColumnString::Chars & replacement_data,
         const ColumnString::Offsets & replacement_offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         assert(haystack_offsets.size() == needle_offsets.size());
         assert(needle_offsets.size() == replacement_offsets.size());
 
         ColumnString::Offset res_offset = 0;
         res_data.reserve(haystack_data.size());
-        res_offsets.resize(input_rows_count);
+        size_t haystack_size = haystack_offsets.size();
+        res_offsets.resize(haystack_size);
 
         re2::RE2::Options regexp_options;
         regexp_options.set_log_errors(false); /// don't write error messages to stderr
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_size; ++i)
         {
             size_t hs_from = i > 0 ? haystack_offsets[i - 1] : 0;
             const char * hs_data = reinterpret_cast<const char *>(haystack_data.data() + hs_from);
@@ -399,15 +399,15 @@ struct ReplaceRegexpImpl
         const String & needle,
         const String & replacement,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         if (needle.empty())
             throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Length of the pattern argument in function {} must be greater than 0.", name);
 
         ColumnString::Offset res_offset = 0;
+        size_t haystack_size = haystack_data.size() / n;
         res_data.reserve(haystack_data.size());
-        res_offsets.resize(input_rows_count);
+        res_offsets.resize(haystack_size);
 
         re2::RE2::Options regexp_options;
         regexp_options.set_log_errors(false); /// don't write error messages to stderr
@@ -419,7 +419,7 @@ struct ReplaceRegexpImpl
         int num_captures = std::min(searcher.NumberOfCapturingGroups() + 1, max_captures);
         Instructions instructions = createInstructions(replacement, num_captures);
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_size; ++i)
         {
             size_t from = i * n;
             const char * hs_data = reinterpret_cast<const char *>(haystack_data.data() + from);
diff --git a/src/Functions/ReplaceStringImpl.h b/src/Functions/ReplaceStringImpl.h
index 7c56d657b3e..de3942acbd8 100644
--- a/src/Functions/ReplaceStringImpl.h
+++ b/src/Functions/ReplaceStringImpl.h
@@ -35,8 +35,7 @@ struct ReplaceStringImpl
         const String & needle,
         const String & replacement,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         if (needle.empty())
             throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Length of the pattern argument in function {} must be greater than 0.", name);
@@ -47,7 +46,8 @@ struct ReplaceStringImpl
 
         ColumnString::Offset res_offset = 0;
         res_data.reserve(haystack_data.size());
-        res_offsets.resize(input_rows_count);
+        const size_t haystack_size = haystack_offsets.size();
+        res_offsets.resize(haystack_size);
 
         /// The current index in the array of strings.
         size_t i = 0;
@@ -124,20 +124,21 @@ struct ReplaceStringImpl
         const ColumnString::Offsets & needle_offsets,
         const String & replacement,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         chassert(haystack_offsets.size() == needle_offsets.size());
 
+        const size_t haystack_size = haystack_offsets.size();
+
         res_data.reserve(haystack_data.size());
-        res_offsets.resize(input_rows_count);
+        res_offsets.resize(haystack_size);
 
         ColumnString::Offset res_offset = 0;
 
         size_t prev_haystack_offset = 0;
         size_t prev_needle_offset = 0;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_size; ++i)
         {
             const auto * const cur_haystack_data = &haystack_data[prev_haystack_offset];
             const size_t cur_haystack_length = haystack_offsets[i] - prev_haystack_offset - 1;
@@ -194,23 +195,24 @@ struct ReplaceStringImpl
         const ColumnString::Chars & replacement_data,
         const ColumnString::Offsets & replacement_offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         chassert(haystack_offsets.size() == replacement_offsets.size());
 
         if (needle.empty())
             throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Length of the pattern argument in function {} must be greater than 0.", name);
 
+        const size_t haystack_size = haystack_offsets.size();
+
         res_data.reserve(haystack_data.size());
-        res_offsets.resize(input_rows_count);
+        res_offsets.resize(haystack_size);
 
         ColumnString::Offset res_offset = 0;
 
         size_t prev_haystack_offset = 0;
         size_t prev_replacement_offset = 0;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_size; ++i)
         {
             const auto * const cur_haystack_data = &haystack_data[prev_haystack_offset];
             const size_t cur_haystack_length = haystack_offsets[i] - prev_haystack_offset - 1;
@@ -265,14 +267,15 @@ struct ReplaceStringImpl
         const ColumnString::Chars & replacement_data,
         const ColumnString::Offsets & replacement_offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         chassert(haystack_offsets.size() == needle_offsets.size());
         chassert(needle_offsets.size() == replacement_offsets.size());
 
+        const size_t haystack_size = haystack_offsets.size();
+
         res_data.reserve(haystack_data.size());
-        res_offsets.resize(input_rows_count);
+        res_offsets.resize(haystack_size);
 
         ColumnString::Offset res_offset = 0;
 
@@ -280,7 +283,7 @@ struct ReplaceStringImpl
         size_t prev_needle_offset = 0;
         size_t prev_replacement_offset = 0;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < haystack_size; ++i)
         {
             const auto * const cur_haystack_data = &haystack_data[prev_haystack_offset];
             const size_t cur_haystack_length = haystack_offsets[i] - prev_haystack_offset - 1;
@@ -342,8 +345,7 @@ struct ReplaceStringImpl
         const String & needle,
         const String & replacement,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         if (needle.empty())
             throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Length of the pattern argument in function {} must be greater than 0.", name);
@@ -353,8 +355,9 @@ struct ReplaceStringImpl
         const UInt8 * pos = begin;
 
         ColumnString::Offset res_offset = 0;
+        size_t haystack_size = haystack_data.size() / n;
         res_data.reserve(haystack_data.size());
-        res_offsets.resize(input_rows_count);
+        res_offsets.resize(haystack_size);
 
         /// The current index in the string array.
         size_t i = 0;
@@ -381,13 +384,13 @@ struct ReplaceStringImpl
 
             /// Copy skipped strings without any changes but
             /// add zero byte to the end of each string.
-            while (i < input_rows_count && begin + n * (i + 1) <= match)
+            while (i < haystack_size && begin + n * (i + 1) <= match)
             {
                 COPY_REST_OF_CURRENT_STRING();
             }
 
             /// If you have reached the end, it's time to stop
-            if (i == input_rows_count)
+            if (i == haystack_size)
                 break;
 
             /// Copy unchanged part of current string.
diff --git a/src/Functions/StringHelpers.h b/src/Functions/StringHelpers.h
index 24d8fe86c62..8f3a87d5d0e 100644
--- a/src/Functions/StringHelpers.h
+++ b/src/Functions/StringHelpers.h
@@ -62,13 +62,12 @@ using Pos = const char *;
 template <typename Extractor>
 struct ExtractSubstringImpl
 {
-    static void vector(
-        const ColumnString::Chars & data, const ColumnString::Offsets & offsets,
-        ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+    static void vector(const ColumnString::Chars & data, const ColumnString::Offsets & offsets,
+        ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets)
     {
-        res_offsets.resize(input_rows_count);
-        res_data.reserve(input_rows_count * Extractor::getReserveLengthForElement());
+        size_t size = offsets.size();
+        res_offsets.resize(size);
+        res_data.reserve(size * Extractor::getReserveLengthForElement());
 
         size_t prev_offset = 0;
         size_t res_offset = 0;
@@ -77,7 +76,7 @@ struct ExtractSubstringImpl
         Pos start;
         size_t length;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             Extractor::execute(reinterpret_cast<const char *>(&data[prev_offset]), offsets[i] - prev_offset - 1, start, length);
 
@@ -100,7 +99,7 @@ struct ExtractSubstringImpl
         res_data.assign(start, length);
     }
 
-    static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+    static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
         throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Column of type FixedString is not supported by this function");
     }
@@ -112,13 +111,12 @@ struct ExtractSubstringImpl
 template <typename Extractor>
 struct CutSubstringImpl
 {
-    static void vector(
-        const ColumnString::Chars & data, const ColumnString::Offsets & offsets,
-        ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+    static void vector(const ColumnString::Chars & data, const ColumnString::Offsets & offsets,
+        ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets)
     {
         res_data.reserve(data.size());
-        res_offsets.resize(input_rows_count);
+        size_t size = offsets.size();
+        res_offsets.resize(size);
 
         size_t prev_offset = 0;
         size_t res_offset = 0;
@@ -127,7 +125,7 @@ struct CutSubstringImpl
         Pos start;
         size_t length;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             const char * current = reinterpret_cast<const char *>(&data[prev_offset]);
             Extractor::execute(current, offsets[i] - prev_offset - 1, start, length);
@@ -156,7 +154,7 @@ struct CutSubstringImpl
         res_data.append(start + length, data.data() + data.size());
     }
 
-    static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+    static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
         throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Column of type FixedString is not supported by this function");
     }
diff --git a/src/Functions/URL/ExtractFirstSignificantSubdomain.h b/src/Functions/URL/ExtractFirstSignificantSubdomain.h
index 4316fd2fc3a..0d1b1cac8ef 100644
--- a/src/Functions/URL/ExtractFirstSignificantSubdomain.h
+++ b/src/Functions/URL/ExtractFirstSignificantSubdomain.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <base/find_symbols.h>
-#include <Functions/URL/domain.h>
-#include <Functions/URL/tldLookup.h>
+#include "domain.h"
+#include "tldLookup.h"
 #include <Common/TLDListsHolder.h> /// TLDType
 
 namespace DB
diff --git a/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h b/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h
index 22fec17654c..68582198ea3 100644
--- a/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h
+++ b/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h
@@ -64,7 +64,7 @@ public:
         return arguments[0].type;
     }
 
-    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
     {
         const ColumnConst * column_tld_list_name = checkAndGetColumnConstStringOrFixedString(arguments[1].column.get());
         FirstSignificantSubdomainCustomLookup tld_lookup(column_tld_list_name->getValue<String>());
@@ -72,7 +72,7 @@ public:
         if (const ColumnString * col = checkAndGetColumn<ColumnString>(&*arguments[0].column))
         {
             auto col_res = ColumnString::create();
-            vector(tld_lookup, col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets(), input_rows_count);
+            vector(tld_lookup, col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets());
             return col_res;
         }
         else
@@ -82,11 +82,11 @@ public:
 
     static void vector(FirstSignificantSubdomainCustomLookup & tld_lookup,
         const ColumnString::Chars & data, const ColumnString::Offsets & offsets,
-        ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets)
     {
-        res_offsets.resize(input_rows_count);
-        res_data.reserve(input_rows_count * Extractor::getReserveLengthForElement());
+        size_t size = offsets.size();
+        res_offsets.resize(size);
+        res_data.reserve(size * Extractor::getReserveLengthForElement());
 
         size_t prev_offset = 0;
         size_t res_offset = 0;
@@ -95,7 +95,7 @@ public:
         Pos start;
         size_t length;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             Extractor::execute(tld_lookup, reinterpret_cast<const char *>(&data[prev_offset]), offsets[i] - prev_offset - 1, start, length);
 
diff --git a/src/Functions/URL/cutFragment.cpp b/src/Functions/URL/cutFragment.cpp
index b32c4410190..3b99edf61a3 100644
--- a/src/Functions/URL/cutFragment.cpp
+++ b/src/Functions/URL/cutFragment.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
+#include "fragment.h"
 #include <Functions/FunctionStringToString.h>
-#include <Functions/URL/fragment.h>
 
 namespace DB
 {
diff --git a/src/Functions/URL/cutQueryString.cpp b/src/Functions/URL/cutQueryString.cpp
index d2fa4a004f2..2886adc2e36 100644
--- a/src/Functions/URL/cutQueryString.cpp
+++ b/src/Functions/URL/cutQueryString.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
+#include "queryString.h"
 #include <Functions/FunctionStringToString.h>
-#include <Functions/URL/queryString.h>
 
 namespace DB
 {
diff --git a/src/Functions/URL/cutQueryStringAndFragment.cpp b/src/Functions/URL/cutQueryStringAndFragment.cpp
index ff427beb277..4116b352542 100644
--- a/src/Functions/URL/cutQueryStringAndFragment.cpp
+++ b/src/Functions/URL/cutQueryStringAndFragment.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
+#include "queryStringAndFragment.h"
 #include <Functions/FunctionStringToString.h>
-#include <Functions/URL/queryStringAndFragment.h>
 
 namespace DB
 {
diff --git a/src/Functions/URL/cutToFirstSignificantSubdomain.cpp b/src/Functions/URL/cutToFirstSignificantSubdomain.cpp
index 454a241c54f..6e64b0b6ab8 100644
--- a/src/Functions/URL/cutToFirstSignificantSubdomain.cpp
+++ b/src/Functions/URL/cutToFirstSignificantSubdomain.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <Functions/URL/ExtractFirstSignificantSubdomain.h>
+#include "ExtractFirstSignificantSubdomain.h"
 
 
 namespace DB
diff --git a/src/Functions/URL/cutToFirstSignificantSubdomainCustom.cpp b/src/Functions/URL/cutToFirstSignificantSubdomainCustom.cpp
index 7612b6ea4af..77f40e465a6 100644
--- a/src/Functions/URL/cutToFirstSignificantSubdomainCustom.cpp
+++ b/src/Functions/URL/cutToFirstSignificantSubdomainCustom.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
-#include <Functions/URL/ExtractFirstSignificantSubdomain.h>
-#include <Functions/URL/FirstSignificantSubdomainCustomImpl.h>
+#include "ExtractFirstSignificantSubdomain.h"
+#include "FirstSignificantSubdomainCustomImpl.h"
 
 namespace DB
 {
diff --git a/src/Functions/URL/cutURLParameter.cpp b/src/Functions/URL/cutURLParameter.cpp
index 4439e79e962..7a2b96ec874 100644
--- a/src/Functions/URL/cutURLParameter.cpp
+++ b/src/Functions/URL/cutURLParameter.cpp
@@ -44,7 +44,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr column = arguments[0].column;
         const ColumnPtr column_needle = arguments[1].column;
@@ -71,7 +71,7 @@ public:
 
             ColumnString::Chars & vec_res = col_res->getChars();
             ColumnString::Offsets & offsets_res = col_res->getOffsets();
-            vector(col->getChars(), col->getOffsets(), col_needle, col_needle_const_array, vec_res, offsets_res, input_rows_count);
+            vector(col->getChars(), col->getOffsets(), col_needle, col_needle_const_array, vec_res, offsets_res);
             return col_res;
         }
         else
@@ -130,8 +130,7 @@ public:
         const ColumnString::Offsets & offsets,
         const ColumnConst * col_needle,
         const ColumnArray * col_needle_const_array,
-        ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets)
     {
         res_data.reserve(data.size());
         res_offsets.resize(offsets.size());
@@ -142,7 +141,7 @@ public:
         size_t res_offset = 0;
         size_t cur_res_offset;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < offsets.size(); ++i)
         {
             cur_offset = offsets[i];
             cur_len = cur_offset - prev_offset;
@@ -156,7 +155,7 @@ public:
                 for (size_t j = 0; j < num_needles; ++j)
                 {
                     auto field = col_needle_const_array->getData()[j];
-                    cutURL(res_data, field.safeGet<String>(), res_offset, cur_res_offset);
+                    cutURL(res_data, field.get<String>(), res_offset, cur_res_offset);
                 }
             }
             else
diff --git a/src/Functions/URL/cutWWW.cpp b/src/Functions/URL/cutWWW.cpp
index ab3fae6b094..992d5128440 100644
--- a/src/Functions/URL/cutWWW.cpp
+++ b/src/Functions/URL/cutWWW.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <Functions/URL/protocol.h>
+#include "protocol.h"
 #include <base/find_symbols.h>
 
 
diff --git a/src/Functions/URL/decodeURLComponent.cpp b/src/Functions/URL/decodeURLComponent.cpp
index bf4aaa6d5e3..05e3fbea3fd 100644
--- a/src/Functions/URL/decodeURLComponent.cpp
+++ b/src/Functions/URL/decodeURLComponent.cpp
@@ -1,7 +1,7 @@
+#include <base/hex.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
 #include <base/find_symbols.h>
-#include <base/hex.h>
 
 
 namespace DB
@@ -121,10 +121,8 @@ enum URLCodeStrategy
 template <URLCodeStrategy code_strategy, bool space_as_plus>
 struct CodeURLComponentImpl
 {
-    static void vector(
-        const ColumnString::Chars & data, const ColumnString::Offsets & offsets,
-        ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+    static void vector(const ColumnString::Chars & data, const ColumnString::Offsets & offsets,
+        ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets)
     {
         if (code_strategy == encode)
         {
@@ -136,12 +134,13 @@ struct CodeURLComponentImpl
             res_data.resize(data.size());
         }
 
-        res_offsets.resize(input_rows_count);
+        size_t size = offsets.size();
+        res_offsets.resize(size);
 
         size_t prev_offset = 0;
         size_t res_offset = 0;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             const char * src_data = reinterpret_cast<const char *>(&data[prev_offset]);
             size_t src_size = offsets[i] - prev_offset;
@@ -166,7 +165,7 @@ struct CodeURLComponentImpl
         res_data.resize(res_offset);
     }
 
-    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
         throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Column of type FixedString is not supported by URL functions");
     }
diff --git a/src/Functions/URL/domain.cpp b/src/Functions/URL/domain.cpp
index 68724b57a70..443a3323075 100644
--- a/src/Functions/URL/domain.cpp
+++ b/src/Functions/URL/domain.cpp
@@ -1,4 +1,5 @@
-#include <Functions/URL/domain.h>
+#include "domain.h"
+
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
 
diff --git a/src/Functions/URL/domain.h b/src/Functions/URL/domain.h
index 328df76b570..936fb9d5f00 100644
--- a/src/Functions/URL/domain.h
+++ b/src/Functions/URL/domain.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include <Common/StringUtils.h>
-#include <Functions/URL/protocol.h>
+#include "protocol.h"
 #include <base/find_symbols.h>
-
 #include <cstring>
+#include <Common/StringUtils.h>
 
 namespace DB
 {
diff --git a/src/Functions/URL/domainWithoutWWW.cpp b/src/Functions/URL/domainWithoutWWW.cpp
index 436aad01b82..f6c8b5c84fc 100644
--- a/src/Functions/URL/domainWithoutWWW.cpp
+++ b/src/Functions/URL/domainWithoutWWW.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <Functions/URL/domain.h>
+#include "domain.h"
 
 namespace DB
 {
diff --git a/src/Functions/URL/extractURLParameter.cpp b/src/Functions/URL/extractURLParameter.cpp
index 590c2779d9c..f75875e0200 100644
--- a/src/Functions/URL/extractURLParameter.cpp
+++ b/src/Functions/URL/extractURLParameter.cpp
@@ -10,11 +10,10 @@ struct ExtractURLParameterImpl
     static void vector(const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         std::string pattern,
-        ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets)
     {
         res_data.reserve(data.size() / 5);
-        res_offsets.resize(input_rows_count);
+        res_offsets.resize(offsets.size());
 
         pattern += '=';
         const char * param_str = pattern.c_str();
@@ -23,7 +22,7 @@ struct ExtractURLParameterImpl
         ColumnString::Offset prev_offset = 0;
         ColumnString::Offset res_offset = 0;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < offsets.size(); ++i)
         {
             ColumnString::Offset cur_offset = offsets[i];
 
diff --git a/src/Functions/URL/firstSignificantSubdomain.cpp b/src/Functions/URL/firstSignificantSubdomain.cpp
index e929aefbc27..b04f6d882ef 100644
--- a/src/Functions/URL/firstSignificantSubdomain.cpp
+++ b/src/Functions/URL/firstSignificantSubdomain.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <Functions/URL/ExtractFirstSignificantSubdomain.h>
+#include "ExtractFirstSignificantSubdomain.h"
 
 
 namespace DB
diff --git a/src/Functions/URL/firstSignificantSubdomainCustom.cpp b/src/Functions/URL/firstSignificantSubdomainCustom.cpp
index 95e5142667b..c07aa2b3ac8 100644
--- a/src/Functions/URL/firstSignificantSubdomainCustom.cpp
+++ b/src/Functions/URL/firstSignificantSubdomainCustom.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
-#include <Functions/URL/ExtractFirstSignificantSubdomain.h>
-#include <Functions/URL/FirstSignificantSubdomainCustomImpl.h>
+#include "ExtractFirstSignificantSubdomain.h"
+#include "FirstSignificantSubdomainCustomImpl.h"
 
 
 namespace DB
diff --git a/src/Functions/URL/fragment.cpp b/src/Functions/URL/fragment.cpp
index 66da5529d84..262c1a4c7a6 100644
--- a/src/Functions/URL/fragment.cpp
+++ b/src/Functions/URL/fragment.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <Functions/URL/fragment.h>
+#include "fragment.h"
 
 namespace DB
 {
diff --git a/src/Functions/URL/path.cpp b/src/Functions/URL/path.cpp
index 6de8e4fbf95..8d609f43191 100644
--- a/src/Functions/URL/path.cpp
+++ b/src/Functions/URL/path.cpp
@@ -1,7 +1,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
 #include <Functions/StringHelpers.h>
-#include <Functions/URL/path.h>
+#include "path.h"
 #include <base/find_symbols.h>
 
 
diff --git a/src/Functions/URL/pathFull.cpp b/src/Functions/URL/pathFull.cpp
index deea617eb29..9aacee21fed 100644
--- a/src/Functions/URL/pathFull.cpp
+++ b/src/Functions/URL/pathFull.cpp
@@ -1,7 +1,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
 #include <Functions/StringHelpers.h>
-#include <Functions/URL/path.h>
+#include "path.h"
 #include <base/find_symbols.h>
 
 namespace DB
diff --git a/src/Functions/URL/port.cpp b/src/Functions/URL/port.cpp
index 7492ebcb4e9..c8f50f10a56 100644
--- a/src/Functions/URL/port.cpp
+++ b/src/Functions/URL/port.cpp
@@ -5,7 +5,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnConst.h>
-#include <Functions/URL/domain.h>
+#include "domain.h"
 
 
 namespace DB
@@ -46,7 +46,7 @@ struct FunctionPortImpl : public IFunction
     }
 
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         UInt16 default_port = 0;
         if (arguments.size() == 2)
@@ -64,7 +64,7 @@ struct FunctionPortImpl : public IFunction
             typename ColumnVector<UInt16>::Container & vec_res = col_res->getData();
             vec_res.resize(url_column->size());
 
-            vector(default_port, url_strs->getChars(), url_strs->getOffsets(), vec_res, input_rows_count);
+            vector(default_port, url_strs->getChars(), url_strs->getOffsets(), vec_res);
             return col_res;
         }
         else
@@ -73,10 +73,12 @@ struct FunctionPortImpl : public IFunction
 }
 
 private:
-    static void vector(UInt16 default_port, const ColumnString::Chars & data, const ColumnString::Offsets & offsets, PaddedPODArray<UInt16> & res, size_t input_rows_count)
+    static void vector(UInt16 default_port, const ColumnString::Chars & data, const ColumnString::Offsets & offsets, PaddedPODArray<UInt16> & res)
     {
+        size_t size = offsets.size();
+
         ColumnString::Offset prev_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             res[i] = extractPort(default_port, data, prev_offset, offsets[i] - prev_offset - 1);
             prev_offset = offsets[i];
diff --git a/src/Functions/URL/protocol.cpp b/src/Functions/URL/protocol.cpp
index 1ac395dc554..6bed71207f6 100644
--- a/src/Functions/URL/protocol.cpp
+++ b/src/Functions/URL/protocol.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <Functions/URL/protocol.h>
+#include "protocol.h"
 
 
 namespace DB
diff --git a/src/Functions/URL/queryString.cpp b/src/Functions/URL/queryString.cpp
index f6aaf40fc96..7069ce46b38 100644
--- a/src/Functions/URL/queryString.cpp
+++ b/src/Functions/URL/queryString.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <Functions/URL/queryString.h>
+#include "queryString.h"
 
 namespace DB
 {
diff --git a/src/Functions/URL/queryStringAndFragment.cpp b/src/Functions/URL/queryStringAndFragment.cpp
index 94f1dfa41e3..367a95acbdc 100644
--- a/src/Functions/URL/queryStringAndFragment.cpp
+++ b/src/Functions/URL/queryStringAndFragment.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <Functions/URL/queryStringAndFragment.h>
+#include "queryStringAndFragment.h"
 
 namespace DB
 {
diff --git a/src/Functions/URL/topLevelDomain.cpp b/src/Functions/URL/topLevelDomain.cpp
index b3e88832350..25e9f383f60 100644
--- a/src/Functions/URL/topLevelDomain.cpp
+++ b/src/Functions/URL/topLevelDomain.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <Functions/URL/domain.h>
+#include "domain.h"
 
 namespace DB
 {
diff --git a/src/Functions/UTCTimestampTransform.cpp b/src/Functions/UTCTimestampTransform.cpp
index 35015188078..36ec520068f 100644
--- a/src/Functions/UTCTimestampTransform.cpp
+++ b/src/Functions/UTCTimestampTransform.cpp
@@ -67,7 +67,7 @@ namespace
             return date_time_type;
         }
 
-        ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+        ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
         {
             if (arguments.size() != 2)
                 throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {}'s arguments number must be 2.", name);
@@ -81,10 +81,11 @@ namespace
             if (WhichDataType(arg1.type).isDateTime())
             {
                 const auto & date_time_col = checkAndGetColumn<ColumnDateTime>(*arg1.column);
+                size_t col_size = date_time_col.size();
                 using ColVecTo = DataTypeDateTime::ColumnType;
-                typename ColVecTo::MutablePtr result_column = ColVecTo::create(input_rows_count);
+                typename ColVecTo::MutablePtr result_column = ColVecTo::create(col_size);
                 typename ColVecTo::Container & result_data = result_column->getData();
-                for (size_t i = 0; i < input_rows_count; ++i)
+                for (size_t i = 0; i < col_size; ++i)
                 {
                     UInt32 date_time_val = date_time_col.getElement(i);
                     LocalDateTime date_time(date_time_val, Name::to ? utc_time_zone : DateLUT::instance(time_zone_val));
@@ -96,13 +97,14 @@ namespace
             else if (WhichDataType(arg1.type).isDateTime64())
             {
                 const auto & date_time_col = checkAndGetColumn<ColumnDateTime64>(*arg1.column);
+                size_t col_size = date_time_col.size();
                 const DataTypeDateTime64 * date_time_type = static_cast<const DataTypeDateTime64 *>(arg1.type.get());
                 UInt32 col_scale = date_time_type->getScale();
                 Int64 scale_multiplier = DecimalUtils::scaleMultiplier<Int64>(col_scale);
                 using ColDecimalTo = DataTypeDateTime64::ColumnType;
-                typename ColDecimalTo::MutablePtr result_column = ColDecimalTo::create(input_rows_count, col_scale);
+                typename ColDecimalTo::MutablePtr result_column = ColDecimalTo::create(col_size, col_scale);
                 typename ColDecimalTo::Container & result_data = result_column->getData();
-                for (size_t i = 0; i < input_rows_count; ++i)
+                for (size_t i = 0; i < col_size; ++i)
                 {
                     DateTime64 date_time_val = date_time_col.getElement(i);
                     Int64 seconds = date_time_val.value / scale_multiplier;
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.cpp b/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.cpp
index 5c039ecbd60..12c1302a3fe 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.cpp
@@ -406,7 +406,7 @@ void UserDefinedSQLObjectsZooKeeperStorage::syncObjects(const zkutil::ZooKeeperP
     LOG_DEBUG(log, "Syncing user-defined {} objects", object_type);
     Strings object_names = getObjectNamesAndSetWatch(zookeeper, object_type);
 
-    auto lock = getLock();
+    getLock();
 
     /// Remove stale objects
     removeAllObjectsExcept(object_names);
diff --git a/src/Functions/array/array.cpp b/src/Functions/array/array.cpp
index d2aedd57f99..dfe589fb74f 100644
--- a/src/Functions/array/array.cpp
+++ b/src/Functions/array/array.cpp
@@ -1,15 +1,11 @@
-#include <Columns/ColumnArray.h>
-#include <Columns/ColumnDecimal.h>
-#include <Columns/ColumnFixedString.h>
-#include <Columns/ColumnNullable.h>
-#include <Columns/ColumnString.h>
-#include <Core/Settings.h>
+#include <Functions/IFunction.h>
+#include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/getLeastSupertype.h>
-#include <Functions/FunctionFactory.h>
-#include <Functions/IFunction.h>
-#include <Interpreters/Context.h>
+#include <Columns/ColumnArray.h>
+#include <Core/Settings.h>
 #include <Interpreters/castColumn.h>
+#include <Interpreters/Context.h>
 
 
 namespace DB
@@ -48,13 +44,11 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
-        const size_t num_elements = arguments.size();
+        size_t num_elements = arguments.size();
 
         if (num_elements == 0)
-        {
             /// We should return constant empty array.
             return result_type->createColumnConstWithDefaultValue(input_rows_count);
-        }
 
         const DataTypePtr & elem_type = static_cast<const DataTypeArray &>(*result_type).getNestedType();
 
@@ -66,6 +60,7 @@ public:
 
         Columns columns_holder(num_elements);
         ColumnRawPtrs column_ptrs(num_elements);
+
         for (size_t i = 0; i < num_elements; ++i)
         {
             const auto & arg = arguments[i];
@@ -82,199 +77,35 @@ public:
         }
 
         /// Create and fill the result array.
+
         auto out = ColumnArray::create(elem_type->createColumn());
         IColumn & out_data = out->getData();
         IColumn::Offsets & out_offsets = out->getOffsets();
 
-        /// Fill out_offsets
-        out_offsets.resize_exact(input_rows_count);
+        out_data.reserve(input_rows_count * num_elements);
+        out_offsets.resize(input_rows_count);
+
         IColumn::Offset current_offset = 0;
         for (size_t i = 0; i < input_rows_count; ++i)
         {
+            for (size_t j = 0; j < num_elements; ++j)
+                out_data.insertFrom(*column_ptrs[j], i);
+
             current_offset += num_elements;
             out_offsets[i] = current_offset;
         }
 
-        /// Fill out_data
-        out_data.reserve(input_rows_count * num_elements);
-        if (num_elements == 1)
-            out_data.insertRangeFrom(*column_ptrs[0], 0, input_rows_count);
-        else
-            execute(column_ptrs, out_data, input_rows_count);
         return out;
     }
 
 private:
-    bool execute(const ColumnRawPtrs & columns, IColumn & out_data, size_t input_rows_count) const
-    {
-        return executeNumber<UInt8>(columns, out_data, input_rows_count) || executeNumber<UInt16>(columns, out_data, input_rows_count)
-            || executeNumber<UInt32>(columns, out_data, input_rows_count) || executeNumber<UInt64>(columns, out_data, input_rows_count)
-            || executeNumber<UInt128>(columns, out_data, input_rows_count) || executeNumber<UInt256>(columns, out_data, input_rows_count)
-            || executeNumber<Int8>(columns, out_data, input_rows_count) || executeNumber<Int16>(columns, out_data, input_rows_count)
-            || executeNumber<Int32>(columns, out_data, input_rows_count) || executeNumber<Int64>(columns, out_data, input_rows_count)
-            || executeNumber<Int128>(columns, out_data, input_rows_count) || executeNumber<Int256>(columns, out_data, input_rows_count)
-            || executeNumber<Float32>(columns, out_data, input_rows_count) || executeNumber<Float64>(columns, out_data, input_rows_count)
-            || executeNumber<Decimal32>(columns, out_data, input_rows_count)
-            || executeNumber<Decimal64>(columns, out_data, input_rows_count)
-            || executeNumber<Decimal128>(columns, out_data, input_rows_count)
-            || executeNumber<Decimal256>(columns, out_data, input_rows_count)
-            || executeNumber<DateTime64>(columns, out_data, input_rows_count) || executeString(columns, out_data, input_rows_count)
-            || executeNullable(columns, out_data, input_rows_count) || executeTuple(columns, out_data, input_rows_count)
-            || executeFixedString(columns, out_data, input_rows_count) || executeGeneric(columns, out_data, input_rows_count);
-    }
-
-    template <typename T>
-    bool executeNumber(const ColumnRawPtrs & columns, IColumn & out_data, size_t input_rows_count) const
-    {
-        using Container = ColumnVectorOrDecimal<T>::Container;
-        std::vector<const Container *> containers(columns.size(), nullptr);
-        for (size_t i = 0; i < columns.size(); ++i)
-        {
-            const ColumnVectorOrDecimal<T> * concrete_column = checkAndGetColumn<ColumnVectorOrDecimal<T>>(columns[i]);
-            if (!concrete_column)
-                return false;
-
-            containers[i] = &concrete_column->getData();
-        }
-
-        ColumnVectorOrDecimal<T> & concrete_out_data = assert_cast<ColumnVectorOrDecimal<T> &>(out_data);
-        Container & out_container = concrete_out_data.getData();
-        out_container.resize_exact(columns.size() * input_rows_count);
-
-        for (size_t row_i = 0; row_i < input_rows_count; ++row_i)
-        {
-            const size_t base = row_i * columns.size();
-            for (size_t col_i = 0; col_i < columns.size(); ++col_i)
-                out_container[base + col_i] = (*containers[col_i])[row_i];
-        }
-        return true;
-    }
-
-    bool executeString(const ColumnRawPtrs & columns, IColumn & out_data, size_t input_rows_count) const
-    {
-        size_t total_bytes = 0;
-        std::vector<const ColumnString *> concrete_columns(columns.size(), nullptr);
-        for (size_t i = 0; i < columns.size(); ++i)
-        {
-            const ColumnString * concrete_column = checkAndGetColumn<ColumnString>(columns[i]);
-            if (!concrete_column)
-                return false;
-
-            total_bytes += concrete_column->getChars().size();
-            concrete_columns[i] = concrete_column;
-        }
-
-        ColumnString & concrete_out_data = assert_cast<ColumnString &>(out_data);
-        auto & out_chars = concrete_out_data.getChars();
-        auto & out_offsets = concrete_out_data.getOffsets();
-        out_chars.resize_exact(total_bytes);
-        out_offsets.resize_exact(input_rows_count * columns.size());
-
-        size_t cur_out_offset = 0;
-        for (size_t row_i = 0; row_i < input_rows_count; ++row_i)
-        {
-            const size_t base = row_i * columns.size();
-            for (size_t col_i = 0; col_i < columns.size(); ++col_i)
-            {
-                StringRef ref = concrete_columns[col_i]->getDataAt(row_i);
-                memcpySmallAllowReadWriteOverflow15(&out_chars[cur_out_offset], ref.data, ref.size);
-                out_chars[cur_out_offset + ref.size] = 0;
-
-                cur_out_offset += ref.size + 1;
-                out_offsets[base + col_i] = cur_out_offset;
-            }
-        }
-        return true;
-    }
-
-    bool executeFixedString(const ColumnRawPtrs & columns, IColumn & out_data, size_t input_rows_count) const
-    {
-        std::vector<const ColumnFixedString *> concrete_columns(columns.size(), nullptr);
-        for (size_t i = 0; i < columns.size(); ++i)
-        {
-            const ColumnFixedString * concrete_column = checkAndGetColumn<ColumnFixedString>(columns[i]);
-            if (!concrete_column)
-                return false;
-
-            concrete_columns[i] = concrete_column;
-        }
-
-        ColumnFixedString & concrete_out_data = assert_cast<ColumnFixedString &>(out_data);
-        auto & out_chars = concrete_out_data.getChars();
-
-        const size_t n = concrete_out_data.getN();
-        size_t total_bytes = n * columns.size() * input_rows_count;
-        out_chars.resize_exact(total_bytes);
-
-        size_t curr_out_offset = 0;
-        for (size_t row_i = 0; row_i < input_rows_count; ++row_i)
-        {
-            for (size_t col_i = 0; col_i < columns.size(); ++col_i)
-            {
-                StringRef ref = concrete_columns[col_i]->getDataAt(row_i);
-                memcpySmallAllowReadWriteOverflow15(&out_chars[curr_out_offset], ref.data, n);
-                curr_out_offset += n;
-            }
-        }
-        return true;
-    }
-
-    bool executeNullable(const ColumnRawPtrs & columns, IColumn & out_data, size_t input_rows_count) const
-    {
-        ColumnRawPtrs null_maps(columns.size(), nullptr);
-        ColumnRawPtrs nested_columns(columns.size(), nullptr);
-        for (size_t i = 0; i < columns.size(); ++i)
-        {
-            const ColumnNullable * concrete_column = checkAndGetColumn<ColumnNullable>(columns[i]);
-            if (!concrete_column)
-                return false;
-
-            null_maps[i] = &concrete_column->getNullMapColumn();
-            nested_columns[i] = &concrete_column->getNestedColumn();
-        }
-
-        ColumnNullable & concrete_out_data = assert_cast<ColumnNullable &>(out_data);
-        auto & out_null_map = concrete_out_data.getNullMapColumn();
-        auto & out_nested_column = concrete_out_data.getNestedColumn();
-        execute(null_maps, out_null_map, input_rows_count);
-        execute(nested_columns, out_nested_column, input_rows_count);
-        return true;
-    }
-
-    bool executeTuple(const ColumnRawPtrs & columns, IColumn & out_data, size_t input_rows_count) const
-    {
-        ColumnTuple * concrete_out_data = typeid_cast<ColumnTuple *>(&out_data);
-        if (!concrete_out_data)
-            return false;
-
-        const size_t tuple_size = concrete_out_data->tupleSize();
-        for (size_t i = 0; i < tuple_size; ++i)
-        {
-            ColumnRawPtrs elem_columns(columns.size(), nullptr);
-            for (size_t j = 0; j < columns.size(); ++j)
-            {
-                const ColumnTuple * concrete_column = assert_cast<const ColumnTuple *>(columns[j]);
-                elem_columns[j] = &concrete_column->getColumn(i);
-            }
-            execute(elem_columns, concrete_out_data->getColumn(i), input_rows_count);
-        }
-        return true;
-    }
-
-    bool executeGeneric(const ColumnRawPtrs & columns, IColumn & out_data, size_t input_rows_count) const
-    {
-        for (size_t i = 0; i < input_rows_count; ++i)
-            for (const auto * column : columns)
-                out_data.insertFrom(*column, i);
-        return true;
-    }
-
-
     String getName() const override
     {
         return name;
     }
 
+    bool addField(DataTypePtr type_res, const Field & f, Array & arr) const;
+
     bool use_variant_as_common_type = false;
 };
 
diff --git a/src/Functions/array/arrayAUC.cpp b/src/Functions/array/arrayAUC.cpp
index 7a61c9d368f..3e2a3bf6863 100644
--- a/src/Functions/array/arrayAUC.cpp
+++ b/src/Functions/array/arrayAUC.cpp
@@ -143,13 +143,13 @@ private:
         const IColumn & scores,
         const IColumn & labels,
         const ColumnArray::Offsets & offsets,
-        PaddedPODArray<Float64> & result,
-        size_t input_rows_count)
+        PaddedPODArray<Float64> & result)
     {
-        result.resize(input_rows_count);
+        size_t size = offsets.size();
+        result.resize(size);
 
         ColumnArray::Offset current_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             auto next_offset = offsets[i];
             result[i] = apply(scores, labels, current_offset, next_offset);
@@ -179,7 +179,7 @@ public:
         return std::make_shared<DataTypeFloat64>();
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         ColumnPtr col1 = arguments[0].column->convertToFullColumnIfConst();
         ColumnPtr col2 = arguments[1].column->convertToFullColumnIfConst();
@@ -203,8 +203,7 @@ public:
             col_array1->getData(),
             col_array2->getData(),
             col_array1->getOffsets(),
-            col_res->getData(),
-            input_rows_count);
+            col_res->getData());
 
         return col_res;
     }
diff --git a/src/Functions/array/arrayConcat.cpp b/src/Functions/array/arrayConcat.cpp
index 768877bac99..cdb361b73b9 100644
--- a/src/Functions/array/arrayConcat.cpp
+++ b/src/Functions/array/arrayConcat.cpp
@@ -40,6 +40,7 @@ ColumnPtr FunctionArrayConcat::executeImpl(const ColumnsWithTypeAndName & argume
     if (result_type->onlyNull())
         return result_type->createColumnConstWithDefaultValue(input_rows_count);
 
+    size_t rows = input_rows_count;
     size_t num_args = arguments.size();
 
     Columns preprocessed_columns(num_args);
@@ -68,7 +69,7 @@ ColumnPtr FunctionArrayConcat::executeImpl(const ColumnsWithTypeAndName & argume
         }
 
         if (const auto * argument_column_array = typeid_cast<const ColumnArray *>(argument_column.get()))
-            sources.emplace_back(GatherUtils::createArraySource(*argument_column_array, is_const, input_rows_count));
+            sources.emplace_back(GatherUtils::createArraySource(*argument_column_array, is_const, rows));
         else
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Arguments for function {} must be arrays.", getName());
     }
diff --git a/src/Functions/array/arrayElement.cpp b/src/Functions/array/arrayElement.cpp
index d0b2b49cc1c..227b29d5d9f 100644
--- a/src/Functions/array/arrayElement.cpp
+++ b/src/Functions/array/arrayElement.cpp
@@ -904,10 +904,10 @@ ColumnPtr FunctionArrayElement::executeNumberConst(
         return nullptr;
 
     if (index.getType() == Field::Types::UInt64
-        || (index.getType() == Field::Types::Int64 && index.safeGet<Int64>() >= 0))
+        || (index.getType() == Field::Types::Int64 && index.get<Int64>() >= 0))
     {
         ArrayElementNumImpl<DataType>::template vectorConst<false>(
-            col_nested->getData(), col_array->getOffsets(), index.safeGet<UInt64>() - 1, col_res_vec->getData(), builder);
+            col_nested->getData(), col_array->getOffsets(), index.get<UInt64>() - 1, col_res_vec->getData(), builder);
     }
     else if (index.getType() == Field::Types::Int64)
     {
@@ -972,14 +972,14 @@ FunctionArrayElement::executeStringConst(const ColumnsWithTypeAndName & argument
     auto col_res = ColumnString::create();
 
     if (index.getType() == Field::Types::UInt64
-        || (index.getType() == Field::Types::Int64 && index.safeGet<Int64>() >= 0))
+        || (index.getType() == Field::Types::Int64 && index.get<Int64>() >= 0))
     {
         if (builder)
             ArrayElementStringImpl::vectorConst<false, true>(
                 col_nested->getChars(),
                 col_array->getOffsets(),
                 col_nested->getOffsets(),
-                index.safeGet<UInt64>() - 1,
+                index.get<UInt64>() - 1,
                 col_res->getChars(),
                 col_res->getOffsets(),
                 builder);
@@ -988,7 +988,7 @@ FunctionArrayElement::executeStringConst(const ColumnsWithTypeAndName & argument
                 col_nested->getChars(),
                 col_array->getOffsets(),
                 col_nested->getOffsets(),
-                index.safeGet<UInt64>() - 1,
+                index.get<UInt64>() - 1,
                 col_res->getChars(),
                 col_res->getOffsets(),
                 builder);
@@ -1000,7 +1000,7 @@ FunctionArrayElement::executeStringConst(const ColumnsWithTypeAndName & argument
                 col_nested->getChars(),
                 col_array->getOffsets(),
                 col_nested->getOffsets(),
-                -(UInt64(index.safeGet<Int64>()) + 1),
+                -(UInt64(index.get<Int64>()) + 1),
                 col_res->getChars(),
                 col_res->getOffsets(),
                 builder);
@@ -1009,7 +1009,7 @@ FunctionArrayElement::executeStringConst(const ColumnsWithTypeAndName & argument
                 col_nested->getChars(),
                 col_array->getOffsets(),
                 col_nested->getOffsets(),
-                -(UInt64(index.safeGet<Int64>()) + 1),
+                -(UInt64(index.get<Int64>()) + 1),
                 col_res->getChars(),
                 col_res->getOffsets(),
                 builder);
@@ -1046,7 +1046,7 @@ ColumnPtr FunctionArrayElement::executeArrayStringConst(
     auto res_offsets = ColumnArray::ColumnOffsets::create();
     auto res_string_null_map = col_nullable ? ColumnUInt8::create() : nullptr;
     if (index.getType() == Field::Types::UInt64
-        || (index.getType() == Field::Types::Int64 && index.safeGet<Int64>() >= 0))
+        || (index.getType() == Field::Types::Int64 && index.get<Int64>() >= 0))
     {
         if (col_nullable)
             ArrayElementArrayStringImpl::vectorConst<false, true>(
@@ -1055,7 +1055,7 @@ ColumnPtr FunctionArrayElement::executeArrayStringConst(
                 col_nested_array->getOffsets(),
                 col_nested_elem->getOffsets(),
                 &string_null_map->getData(),
-                index.safeGet<UInt64>() - 1,
+                index.get<UInt64>() - 1,
                 res_string->getChars(),
                 res_offsets->getData(),
                 res_string->getOffsets(),
@@ -1068,7 +1068,7 @@ ColumnPtr FunctionArrayElement::executeArrayStringConst(
                 col_nested_array->getOffsets(),
                 col_nested_elem->getOffsets(),
                 nullptr,
-                index.safeGet<UInt64>() - 1,
+                index.get<UInt64>() - 1,
                 res_string->getChars(),
                 res_offsets->getData(),
                 res_string->getOffsets(),
@@ -1084,7 +1084,7 @@ ColumnPtr FunctionArrayElement::executeArrayStringConst(
                 col_nested_array->getOffsets(),
                 col_nested_elem->getOffsets(),
                 &string_null_map->getData(),
-                -(UInt64(index.safeGet<Int64>()) + 1),
+                -(UInt64(index.get<Int64>()) + 1),
                 res_string->getChars(),
                 res_offsets->getData(),
                 res_string->getOffsets(),
@@ -1097,7 +1097,7 @@ ColumnPtr FunctionArrayElement::executeArrayStringConst(
                 col_nested_array->getOffsets(),
                 col_nested_elem->getOffsets(),
                 nullptr,
-                -(UInt64(index.safeGet<Int64>()) + 1),
+                -(UInt64(index.get<Int64>()) + 1),
                 res_string->getChars(),
                 res_offsets->getData(),
                 res_string->getOffsets(),
@@ -1153,7 +1153,7 @@ ColumnPtr FunctionArrayElement::executeArrayNumberConst(
     auto & res_offsets = res_array->getOffsets();
     NullMap * res_null_map = res_nullable ? &res_nullable->getNullMapData() : nullptr;
 
-    if (index.getType() == Field::Types::UInt64 || (index.getType() == Field::Types::Int64 && index.safeGet<Int64>() >= 0))
+    if (index.getType() == Field::Types::UInt64 || (index.getType() == Field::Types::Int64 && index.get<Int64>() >= 0))
     {
         if (col_nullable)
             ArrayElementArrayNumImpl<DataType>::template vectorConst<false, true>(
@@ -1161,7 +1161,7 @@ ColumnPtr FunctionArrayElement::executeArrayNumberConst(
                 col_array->getOffsets(),
                 col_nested_array->getOffsets(),
                 null_map,
-                index.safeGet<UInt64>() - 1,
+                index.get<UInt64>() - 1,
                 res_data->getData(),
                 res_offsets,
                 res_null_map,
@@ -1172,7 +1172,7 @@ ColumnPtr FunctionArrayElement::executeArrayNumberConst(
                 col_array->getOffsets(),
                 col_nested_array->getOffsets(),
                 null_map,
-                index.safeGet<UInt64>() - 1,
+                index.get<UInt64>() - 1,
                 res_data->getData(),
                 res_offsets,
                 res_null_map,
@@ -1392,12 +1392,12 @@ ColumnPtr FunctionArrayElement::executeGenericConst(
     auto col_res = col_nested.cloneEmpty();
 
     if (index.getType() == Field::Types::UInt64
-        || (index.getType() == Field::Types::Int64 && index.safeGet<Int64>() >= 0))
+        || (index.getType() == Field::Types::Int64 && index.get<Int64>() >= 0))
         ArrayElementGenericImpl::vectorConst<false>(
-            col_nested, col_array->getOffsets(), index.safeGet<UInt64>() - 1, *col_res, builder);
+            col_nested, col_array->getOffsets(), index.get<UInt64>() - 1, *col_res, builder);
     else if (index.getType() == Field::Types::Int64)
         ArrayElementGenericImpl::vectorConst<true>(
-            col_nested, col_array->getOffsets(), -(static_cast<UInt64>(index.safeGet<Int64>() + 1)), *col_res, builder);
+            col_nested, col_array->getOffsets(), -(static_cast<UInt64>(index.get<Int64>() + 1)), *col_res, builder);
     else
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Illegal type of array index");
 
@@ -1598,9 +1598,6 @@ ColumnPtr FunctionArrayElement::executeTuple(const ColumnsWithTypeAndName & argu
     const auto & tuple_columns = col_nested->getColumns();
     size_t tuple_size = tuple_columns.size();
 
-    if (tuple_size == 0)
-        return ColumnTuple::create(input_rows_count);
-
     const DataTypes & tuple_types = typeid_cast<const DataTypeTuple &>(
         *typeid_cast<const DataTypeArray &>(*arguments[0].type).getNestedType()).getElements();
 
@@ -1792,7 +1789,7 @@ bool FunctionArrayElement::matchKeyToIndexStringConst(
         using DataColumn = std::decay_t<decltype(data_column)>;
         if (index.getType() != Field::Types::String)
             return false;
-        MatcherStringConst<DataColumn> matcher{data_column, index.safeGet<const String &>()};
+        MatcherStringConst<DataColumn> matcher{data_column, index.get<const String &>()};
         executeMatchKeyToIndex(offsets, matched_idxs, matcher);
         return true;
     });
diff --git a/src/Functions/array/arrayEnumerateRanked.h b/src/Functions/array/arrayEnumerateRanked.h
index 269a7db6e92..ad325fe542a 100644
--- a/src/Functions/array/arrayEnumerateRanked.h
+++ b/src/Functions/array/arrayEnumerateRanked.h
@@ -132,7 +132,7 @@ private:
 
 
 /// Hash a set of keys into a UInt128 value.
-static UInt128 hash128depths(const std::vector<size_t> & indices, const ColumnRawPtrs & key_columns)
+static inline UInt128 ALWAYS_INLINE hash128depths(const std::vector<size_t> & indices, const ColumnRawPtrs & key_columns)
 {
     SipHash hash;
     for (size_t j = 0, keys_size = key_columns.size(); j < keys_size; ++j)
diff --git a/src/Functions/array/arrayWithConstant.cpp b/src/Functions/array/arrayWithConstant.cpp
index 4cbc6404b9b..48262870553 100644
--- a/src/Functions/array/arrayWithConstant.cpp
+++ b/src/Functions/array/arrayWithConstant.cpp
@@ -1,9 +1,9 @@
 #include <Functions/IFunction.h>
+#include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnArray.h>
-#include <base/arithmeticOverflow.h>
 
 
 namespace DB
@@ -15,8 +15,7 @@ namespace ErrorCodes
     extern const int TOO_LARGE_ARRAY_SIZE;
 }
 
-/// Reasonable thresholds.
-static constexpr Int64 max_array_size_in_columns_bytes = 1000000000;
+/// Reasonable threshold.
 static constexpr size_t max_arrays_size_in_columns = 1000000000;
 
 
@@ -64,19 +63,12 @@ public:
             auto array_size = col_num->getInt(i);
 
             if (unlikely(array_size < 0))
-                throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Array size {} cannot be negative: while executing function {}", array_size, getName());
-
-            Int64 estimated_size = 0;
-            if (unlikely(common::mulOverflow(array_size, col_value->byteSize(), estimated_size)))
-                throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Array size {} with element size {} bytes is too large: while executing function {}", array_size, col_value->byteSize(), getName());
-
-            if (unlikely(estimated_size > max_array_size_in_columns_bytes))
-                throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Array size {} with element size {} bytes is too large: while executing function {}", array_size, col_value->byteSize(), getName());
+                throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Array size cannot be negative: while executing function {}", getName());
 
             offset += array_size;
 
             if (unlikely(offset > max_arrays_size_in_columns))
-                throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size {} (will generate at least {} elements) while executing function {}", array_size, offset, getName());
+                throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size while executing function {}", getName());
 
             offsets.push_back(offset);
         }
diff --git a/src/Functions/array/arrayZip.cpp b/src/Functions/array/arrayZip.cpp
index 6e1cc0f7788..6c6fff5926b 100644
--- a/src/Functions/array/arrayZip.cpp
+++ b/src/Functions/array/arrayZip.cpp
@@ -1,8 +1,7 @@
-#include <Columns/ColumnArray.h>
-#include <Columns/ColumnNullable.h>
 #include <Columns/ColumnTuple.h>
-#include <DataTypes/DataTypeArray.h>
+#include <Columns/ColumnArray.h>
 #include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeArray.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <IO/WriteHelpers.h>
@@ -13,22 +12,23 @@ namespace DB
 
 namespace ErrorCodes
 {
-extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-extern const int SIZES_OF_ARRAYS_DONT_MATCH;
-extern const int TOO_FEW_ARGUMENTS_FOR_FUNCTION;
-extern const int ILLEGAL_COLUMN;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int SIZES_OF_ARRAYS_DONT_MATCH;
+    extern const int TOO_FEW_ARGUMENTS_FOR_FUNCTION;
+    extern const int ILLEGAL_COLUMN;
 }
 
 /// arrayZip(['a', 'b', 'c'], ['d', 'e', 'f']) = [('a', 'd'), ('b', 'e'), ('c', 'f')]
-/// arrayZipUnaligned(['a', 'b', 'c'], ['d', 'e']) = [('a', 'd'), ('b', 'e'), ('c', null)]
-template <bool allow_unaligned>
 class FunctionArrayZip : public IFunction
 {
 public:
-    static constexpr auto name = allow_unaligned ? "arrayZipUnaligned" : "arrayZip";
+    static constexpr auto name = "arrayZip";
     static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayZip>(); }
 
-    String getName() const override { return name; }
+    String getName() const override
+    {
+        return name;
+    }
 
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
@@ -39,11 +39,8 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         if (arguments.empty())
-            throw Exception(
-                ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION,
-                "Function {} needs at least one argument; passed {}.",
-                getName(),
-                arguments.size());
+            throw Exception(ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION,
+                "Function {} needs at least one argument; passed {}." , getName(), arguments.size());
 
         DataTypes arguments_types;
         for (size_t index = 0; index < arguments.size(); ++index)
@@ -51,142 +48,56 @@ public:
             const DataTypeArray * array_type = checkAndGetDataType<DataTypeArray>(arguments[index].type.get());
 
             if (!array_type)
-                throw Exception(
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Argument {} of function {} must be array. Found {} instead.",
-                    toString(index + 1),
-                    getName(),
-                    arguments[0].type->getName());
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument {} of function {} must be array. Found {} instead.",
+                    toString(index + 1), getName(), arguments[0].type->getName());
 
-            auto nested_type = array_type->getNestedType();
-            if constexpr (allow_unaligned)
-                nested_type = makeNullable(nested_type);
-            arguments_types.emplace_back(nested_type);
+            arguments_types.emplace_back(array_type->getNestedType());
         }
 
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeTuple>(arguments_types));
     }
 
-    ColumnPtr
-    executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         size_t num_arguments = arguments.size();
-        Columns holders(num_arguments);
+
+        ColumnPtr first_array_column;
         Columns tuple_columns(num_arguments);
 
-        bool has_unaligned = false;
-        size_t unaligned_index = 0;
         for (size_t i = 0; i < num_arguments; ++i)
         {
             /// Constant columns cannot be inside tuple. It's only possible to have constant tuple as a whole.
             ColumnPtr holder = arguments[i].column->convertToFullColumnIfConst();
-            holders[i] = holder;
 
             const ColumnArray * column_array = checkAndGetColumn<ColumnArray>(holder.get());
+
             if (!column_array)
-                throw Exception(
-                    ErrorCodes::ILLEGAL_COLUMN,
-                    "Argument {} of function {} must be array. Found column {} instead.",
-                    i + 1,
-                    getName(),
-                    holder->getName());
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Argument {} of function {} must be array. Found column {} instead.",
+                    i + 1, getName(), holder->getName());
+
+            if (i == 0)
+            {
+                first_array_column = holder;
+            }
+            else if (!column_array->hasEqualOffsets(static_cast<const ColumnArray &>(*first_array_column)))
+            {
+                throw Exception(ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH,
+                                "The argument 1 and argument {} of function {} have different array sizes",
+                                i + 1, getName());
+            }
+
             tuple_columns[i] = column_array->getDataPtr();
-
-            if (i && !column_array->hasEqualOffsets(static_cast<const ColumnArray &>(*holders[0])))
-            {
-                has_unaligned = true;
-                unaligned_index = i;
-            }
         }
 
-        if constexpr (!allow_unaligned)
-        {
-            if (has_unaligned)
-                throw Exception(
-                    ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH,
-                    "The argument 1 and argument {} of function {} have different array sizes",
-                    unaligned_index + 1,
-                    getName());
-            else
-                return ColumnArray::create(
-                    ColumnTuple::create(std::move(tuple_columns)), static_cast<const ColumnArray &>(*holders[0]).getOffsetsPtr());
-        }
-        else
-            return executeUnaligned(holders, tuple_columns, input_rows_count, has_unaligned);
-    }
-
-private:
-    ColumnPtr executeUnaligned(const Columns & holders, Columns & tuple_columns, size_t input_rows_count, bool has_unaligned) const
-    {
-        std::vector<const ColumnArray *> array_columns(holders.size());
-        for (size_t i = 0; i < holders.size(); ++i)
-            array_columns[i] = checkAndGetColumn<ColumnArray>(holders[i].get());
-
-        for (auto & tuple_column : tuple_columns)
-            tuple_column = makeNullable(tuple_column);
-
-        if (!has_unaligned)
-            return ColumnArray::create(ColumnTuple::create(std::move(tuple_columns)), array_columns[0]->getOffsetsPtr());
-
-        MutableColumns res_tuple_columns(tuple_columns.size());
-        for (size_t i = 0; i < tuple_columns.size(); ++i)
-        {
-            res_tuple_columns[i] = tuple_columns[i]->cloneEmpty();
-            res_tuple_columns[i]->reserve(tuple_columns[i]->size());
-        }
-
-        auto res_offsets_column = ColumnArray::ColumnOffsets::create(input_rows_count);
-        auto & res_offsets = assert_cast<ColumnArray::ColumnOffsets &>(*res_offsets_column).getData();
-        size_t curr_offset = 0;
-        for (size_t row_i = 0; row_i < input_rows_count; ++row_i)
-        {
-            size_t max_size = 0;
-            for (size_t arg_i = 0; arg_i < holders.size(); ++arg_i)
-            {
-                const auto * array_column = array_columns[arg_i];
-                const auto & offsets = array_column->getOffsets();
-                size_t array_offset = offsets[row_i - 1];
-                size_t array_size = offsets[row_i] - array_offset;
-
-                res_tuple_columns[arg_i]->insertRangeFrom(*tuple_columns[arg_i], array_offset, array_size);
-                max_size = std::max(max_size, array_size);
-            }
-
-            for (size_t arg_i = 0; arg_i < holders.size(); ++arg_i)
-            {
-                const auto * array_column = array_columns[arg_i];
-                const auto & offsets = array_column->getOffsets();
-                size_t array_offset = offsets[row_i - 1];
-                size_t array_size = offsets[row_i] - array_offset;
-
-                res_tuple_columns[arg_i]->insertManyDefaults(max_size - array_size);
-            }
-
-            curr_offset += max_size;
-            res_offsets[row_i] = curr_offset;
-        }
-
-        return ColumnArray::create(ColumnTuple::create(std::move(res_tuple_columns)), std::move(res_offsets_column));
+        return ColumnArray::create(
+            ColumnTuple::create(tuple_columns), static_cast<const ColumnArray &>(*first_array_column).getOffsetsPtr());
     }
 };
 
 REGISTER_FUNCTION(ArrayZip)
 {
-    factory.registerFunction<FunctionArrayZip<false>>(
-        {.description = R"(
-Combines multiple arrays into a single array. The resulting array contains the corresponding elements of the source arrays grouped into tuples in the listed order of arguments.
-)",
-         .categories{"String"}});
-
-    factory.registerFunction<FunctionArrayZip<true>>(
-        {.description = R"(
-Combines multiple arrays into a single array, allowing for unaligned arrays. The resulting array contains the corresponding elements of the source arrays grouped into tuples in the listed order of arguments.
-
-If the arrays have different sizes, the shorter arrays will be padded with `null` values.
-)",
-         .categories{"String"}}
-
-    );
+    factory.registerFunction<FunctionArrayZip>();
 }
 
 }
+
diff --git a/src/Functions/array/length.cpp b/src/Functions/array/length.cpp
index 760506194fa..d81c071b55e 100644
--- a/src/Functions/array/length.cpp
+++ b/src/Functions/array/length.cpp
@@ -16,38 +16,40 @@ struct LengthImpl
 {
     static constexpr auto is_fixed_to_constant = true;
 
-    static void vector(const ColumnString::Chars & /*data*/, const ColumnString::Offsets & offsets, PaddedPODArray<UInt64> & res, size_t input_rows_count)
+    static void vector(const ColumnString::Chars & /*data*/, const ColumnString::Offsets & offsets, PaddedPODArray<UInt64> & res)
     {
-        for (size_t i = 0; i < input_rows_count; ++i)
+        size_t size = offsets.size();
+        for (size_t i = 0; i < size; ++i)
             res[i] = offsets[i] - 1 - offsets[i - 1];
     }
 
-    static void vectorFixedToConstant(const ColumnString::Chars & /*data*/, size_t n, UInt64 & res, size_t)
+    static void vectorFixedToConstant(const ColumnString::Chars & /*data*/, size_t n, UInt64 & res)
     {
         res = n;
     }
 
-    static void vectorFixedToVector(const ColumnString::Chars & /*data*/, size_t /*n*/, PaddedPODArray<UInt64> & /*res*/, size_t)
+    static void vectorFixedToVector(const ColumnString::Chars & /*data*/, size_t /*n*/, PaddedPODArray<UInt64> & /*res*/)
     {
     }
 
-    static void array(const ColumnString::Offsets & offsets, PaddedPODArray<UInt64> & res, size_t input_rows_count)
+    static void array(const ColumnString::Offsets & offsets, PaddedPODArray<UInt64> & res)
     {
-        for (size_t i = 0; i < input_rows_count; ++i)
+        size_t size = offsets.size();
+        for (size_t i = 0; i < size; ++i)
             res[i] = offsets[i] - offsets[i - 1];
     }
 
-    [[noreturn]] static void uuid(const ColumnUUID::Container &, size_t &, PaddedPODArray<UInt64> &, size_t)
+    [[noreturn]] static void uuid(const ColumnUUID::Container &, size_t &, PaddedPODArray<UInt64> &)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function length to UUID argument");
     }
 
-    [[noreturn]] static void ipv6(const ColumnIPv6::Container &, size_t &, PaddedPODArray<UInt64> &, size_t)
+    [[noreturn]] static void ipv6(const ColumnIPv6::Container &, size_t &, PaddedPODArray<UInt64> &)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function length to IPv6 argument");
     }
 
-    [[noreturn]] static void ipv4(const ColumnIPv4::Container &, size_t &, PaddedPODArray<UInt64> &, size_t)
+    [[noreturn]] static void ipv4(const ColumnIPv4::Container &, size_t &, PaddedPODArray<UInt64> &)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function length to IPv4 argument");
     }
diff --git a/src/Functions/array/mapOp.cpp b/src/Functions/array/mapOp.cpp
index 614b01c2ac8..86797cb5db0 100644
--- a/src/Functions/array/mapOp.cpp
+++ b/src/Functions/array/mapOp.cpp
@@ -237,7 +237,7 @@ private:
                     }
 
                     arg.val_column->get(offset + j, temp_val);
-                    ValType value = temp_val.safeGet<ValType>();
+                    ValType value = temp_val.get<ValType>();
 
                     if constexpr (op_type == OpTypes::ADD)
                     {
diff --git a/src/Functions/ascii.cpp b/src/Functions/ascii.cpp
index e65996a90e1..0d50e5d203b 100644
--- a/src/Functions/ascii.cpp
+++ b/src/Functions/ascii.cpp
@@ -23,43 +23,47 @@ struct AsciiImpl
     using ReturnType = Int32;
 
 
-    static void vector(const ColumnString::Chars & data, const ColumnString::Offsets & offsets, PaddedPODArray<ReturnType> & res, size_t input_rows_count)
+    static void vector(const ColumnString::Chars & data, const ColumnString::Offsets & offsets, PaddedPODArray<ReturnType> & res)
     {
+        size_t size = offsets.size();
+
         ColumnString::Offset prev_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             res[i] = doAscii(data, prev_offset, offsets[i] - prev_offset - 1);
             prev_offset = offsets[i];
         }
     }
 
-    [[noreturn]] static void vectorFixedToConstant(const ColumnString::Chars &, size_t, Int32 &, size_t)
+    [[noreturn]] static void vectorFixedToConstant(const ColumnString::Chars &  /*data*/, size_t  /*n*/, Int32 &  /*res*/)
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "vectorFixedToConstant not implemented for function {}", AsciiName::name);
     }
 
-    static void vectorFixedToVector(const ColumnString::Chars & data, size_t n, PaddedPODArray<ReturnType> & res, size_t input_rows_count)
+    static void vectorFixedToVector(const ColumnString::Chars & data, size_t n, PaddedPODArray<ReturnType> & res)
     {
-        for (size_t i = 0; i < input_rows_count; ++i)
+        size_t size = data.size() / n;
+
+        for (size_t i = 0; i < size; ++i)
             res[i] = doAscii(data, i * n, n);
     }
 
-    [[noreturn]] static void array(const ColumnString::Offsets &, PaddedPODArray<ReturnType> &, size_t)
+    [[noreturn]] static void array(const ColumnString::Offsets & /*offsets*/, PaddedPODArray<ReturnType> & /*res*/)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function {} to Array argument", AsciiName::name);
     }
 
-    [[noreturn]] static void uuid(const ColumnUUID::Container &, size_t, PaddedPODArray<ReturnType> &, size_t)
+    [[noreturn]] static void uuid(const ColumnUUID::Container & /*offsets*/, size_t /*n*/, PaddedPODArray<ReturnType> & /*res*/)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function {} to UUID argument", AsciiName::name);
     }
 
-    [[noreturn]] static void ipv6(const ColumnIPv6::Container &, size_t, PaddedPODArray<ReturnType> &, size_t)
+    [[noreturn]] static void ipv6(const ColumnIPv6::Container & /*offsets*/, size_t /*n*/, PaddedPODArray<ReturnType> & /*res*/)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function {} to IPv6 argument", AsciiName::name);
     }
 
-    [[noreturn]] static void ipv4(const ColumnIPv4::Container &, size_t, PaddedPODArray<ReturnType> &, size_t)
+    [[noreturn]] static void ipv4(const ColumnIPv4::Container & /*offsets*/, size_t /*n*/, PaddedPODArray<ReturnType> & /*res*/)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function {} to IPv4 argument", AsciiName::name);
     }
diff --git a/src/Functions/bitSlice.cpp b/src/Functions/bitSlice.cpp
index 908c534b228..e2b455846d8 100644
--- a/src/Functions/bitSlice.cpp
+++ b/src/Functions/bitSlice.cpp
@@ -18,7 +18,9 @@ using namespace GatherUtils;
 namespace ErrorCodes
 {
     extern const int ILLEGAL_COLUMN;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int ZERO_ARRAY_OR_TUPLE_INDEX;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
 class FunctionBitSlice : public IFunction
@@ -38,22 +40,28 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
-        FunctionArgumentDescriptors mandatory_args{
-            {"s", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), nullptr, "String"},
-            {"offset", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNativeNumber), nullptr, "(U)Int8/16/32/64 or Float"},
-        };
+        const size_t number_of_arguments = arguments.size();
 
-        FunctionArgumentDescriptors optional_args{
-            {"length", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNativeNumber), nullptr, "(U)Int8/16/32/64 or Float"},
-        };
+        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);
 
-        validateFunctionArguments(*this, arguments, mandatory_args, optional_args);
+        if (!isString(arguments[0]) && !isStringOrFixedString(arguments[0]))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {}",
+                arguments[0]->getName(), getName());
+        if (arguments[0]->onlyNull())
+            return arguments[0];
 
-        const auto & type = arguments[0].type;
-        if (type->onlyNull())
-            return type;
+        if (!isNativeNumber(arguments[1]))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of second argument of function {}",
+                arguments[1]->getName(), getName());
+
+        if (number_of_arguments == 3 && !isNativeNumber(arguments[2]))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of second argument of function {}",
+                arguments[2]->getName(), getName());
 
         return std::make_shared<DataTypeString>();
     }
diff --git a/src/Functions/date_trunc.cpp b/src/Functions/date_trunc.cpp
index 15d50724506..dd3ea0b877b 100644
--- a/src/Functions/date_trunc.cpp
+++ b/src/Functions/date_trunc.cpp
@@ -2,7 +2,6 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypeDate.h>
-#include <DataTypes/DataTypeDate32.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeInterval.h>
 #include <Formats/FormatSettings.h>
@@ -44,7 +43,6 @@ public:
         enum ResultType
         {
             Date,
-            Date32,
             DateTime,
             DateTime64,
         };
@@ -77,15 +75,15 @@ public:
 
         bool second_argument_is_date = false;
         auto check_second_argument = [&] {
-            if (!isDateOrDate32(arguments[1].type) && !isDateTime(arguments[1].type) && !isDateTime64(arguments[1].type))
+            if (!isDate(arguments[1].type) && !isDateTime(arguments[1].type) && !isDateTime64(arguments[1].type))
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of 2nd argument of function {}. "
                     "Should be a date or a date with time", arguments[1].type->getName(), getName());
 
-            second_argument_is_date = isDateOrDate32(arguments[1].type);
+            second_argument_is_date = isDate(arguments[1].type);
 
             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 {} of argument for function {}", arguments[1].type->getName(), getName());
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type Date of argument for function {}", getName());
         };
 
         auto check_timezone_argument = [&] {
@@ -121,8 +119,6 @@ public:
 
         if (result_type == ResultType::Date)
             return std::make_shared<DataTypeDate>();
-        if (result_type == ResultType::Date32)
-            return std::make_shared<DataTypeDate32>();
         else if (result_type == ResultType::DateTime)
             return std::make_shared<DataTypeDateTime>(extractTimeZoneNameFromFunctionArguments(arguments, 2, 1, false));
         else
diff --git a/src/Functions/decodeHTMLComponent.cpp b/src/Functions/decodeHTMLComponent.cpp
index d36bee534a8..00a601b77a6 100644
--- a/src/Functions/decodeHTMLComponent.cpp
+++ b/src/Functions/decodeHTMLComponent.cpp
@@ -28,20 +28,20 @@ namespace
             const ColumnString::Chars & data,
             const ColumnString::Offsets & offsets,
             ColumnString::Chars & res_data,
-            ColumnString::Offsets & res_offsets,
-            size_t input_rows_count)
+            ColumnString::Offsets & res_offsets)
         {
             /// The size of result is always not more than the size of source.
             /// Because entities decodes to the shorter byte sequence.
             /// Example: &#xx... &#xx... will decode to UTF-8 byte sequence not longer than 4 bytes.
             res_data.resize(data.size());
 
-            res_offsets.resize(input_rows_count);
+            size_t size = offsets.size();
+            res_offsets.resize(size);
 
             size_t prev_offset = 0;
             size_t res_offset = 0;
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 const char * src_data = reinterpret_cast<const char *>(&data[prev_offset]);
                 size_t src_size = offsets[i] - prev_offset;
@@ -55,7 +55,7 @@ namespace
             res_data.resize(res_offset);
         }
 
-        [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+        [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
         {
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function decodeHTMLComponent cannot work with FixedString argument");
         }
@@ -64,6 +64,7 @@ namespace
         static const int max_legal_unicode_value = 0x10FFFF;
         static const int max_decimal_length_of_unicode_point = 7; /// 1114111
 
+
         static size_t execute(const char * src, size_t src_size, char * dst)
         {
             const char * src_pos = src;
diff --git a/src/Functions/decodeXMLComponent.cpp b/src/Functions/decodeXMLComponent.cpp
index 8743aa4759d..cbbe46fcb8c 100644
--- a/src/Functions/decodeXMLComponent.cpp
+++ b/src/Functions/decodeXMLComponent.cpp
@@ -27,20 +27,20 @@ namespace
             const ColumnString::Chars & data,
             const ColumnString::Offsets & offsets,
             ColumnString::Chars & res_data,
-            ColumnString::Offsets & res_offsets,
-            size_t input_rows_count)
+            ColumnString::Offsets & res_offsets)
         {
             /// The size of result is always not more than the size of source.
             /// Because entities decodes to the shorter byte sequence.
             /// Example: &#xx... &#xx... will decode to UTF-8 byte sequence not longer than 4 bytes.
             res_data.resize(data.size());
 
-            res_offsets.resize(input_rows_count);
+            size_t size = offsets.size();
+            res_offsets.resize(size);
 
             size_t prev_offset = 0;
             size_t res_offset = 0;
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 const char * src_data = reinterpret_cast<const char *>(&data[prev_offset]);
                 size_t src_size = offsets[i] - prev_offset;
@@ -54,7 +54,7 @@ namespace
             res_data.resize(res_offset);
         }
 
-        [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+        [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
         {
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function decodeXMLComponent cannot work with FixedString argument");
         }
diff --git a/src/Functions/dynamicType.cpp b/src/Functions/dynamicType.cpp
index 327cdfe1616..e8ca73597d6 100644
--- a/src/Functions/dynamicType.cpp
+++ b/src/Functions/dynamicType.cpp
@@ -2,14 +2,10 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/IDataType.h>
-#include <DataTypes/DataTypesBinaryEncoding.h>
-#include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Columns/ColumnVariant.h>
 #include <Columns/ColumnDynamic.h>
-#include <Columns/ColumnsNumber.h>
-#include <IO/ReadBufferFromMemory.h>
 #include <Common/assert_cast.h>
 
 
@@ -69,15 +65,11 @@ public:
         const auto & variant_column = dynamic_column->getVariantColumn();
         auto res = result_type->createColumn();
         String element_type;
-        auto shared_variant_discr = dynamic_column->getSharedVariantDiscriminator();
-        const auto & shared_variant = dynamic_column->getSharedVariant();
         for (size_t i = 0; i != input_rows_count; ++i)
         {
             auto global_discr = variant_column.globalDiscriminatorAt(i);
             if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
                 element_type = name_for_null;
-            else if (global_discr == shared_variant_discr)
-                element_type = getTypeNameFromSharedVariantValue(shared_variant.getDataAt(variant_column.offsetAt(i)));
             else
                 element_type = variant_info.variant_names[global_discr];
 
@@ -86,63 +78,6 @@ public:
 
         return res;
     }
-
-    String getTypeNameFromSharedVariantValue(StringRef value) const
-    {
-        ReadBufferFromMemory buf(value.data, value.size);
-        return decodeDataType(buf)->getName();
-    }
-};
-
-class FunctionIsDynamicElementInSharedData : public IFunction
-{
-public:
-    static constexpr auto name = "isDynamicElementInSharedData";
-
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIsDynamicElementInSharedData>(); }
-    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());
-
-        if (!isDynamic(arguments[0].type.get()))
-            throw Exception(
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "First argument for function {} must be Dynamic, got {} instead",
-                getName(), arguments[0].type->getName());
-
-        return DataTypeFactory::instance().get("Bool");
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        const ColumnDynamic * dynamic_column = checkAndGetColumn<ColumnDynamic>(arguments[0].column.get());
-        if (!dynamic_column)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                            "First argument for function {} must be Dynamic, got {} instead",
-                            getName(), arguments[0].type->getName());
-
-        const auto & variant_column = dynamic_column->getVariantColumn();
-        const auto & local_discriminators = variant_column.getLocalDiscriminators();
-        auto res = result_type->createColumn();
-        auto & res_data = assert_cast<ColumnUInt8 &>(*res).getData();
-        res_data.reserve(dynamic_column->size());
-        auto shared_variant_local_discr = variant_column.localDiscriminatorByGlobal(dynamic_column->getSharedVariantDiscriminator());
-        for (size_t i = 0; i != input_rows_count; ++i)
-            res_data.push_back(local_discriminators[i] == shared_variant_local_discr);
-
-        return res;
-    }
 };
 
 }
@@ -153,7 +88,7 @@ REGISTER_FUNCTION(DynamicType)
         .description = R"(
 Returns the variant type name for each row of `Dynamic` column. If row contains NULL, it returns 'None' for it.
 )",
-        .syntax = {"dynamicType(dynamic)"},
+        .syntax = {"dynamicType(variant)"},
         .arguments = {{"dynamic", "Dynamic column"}},
         .examples = {{{
             "Example",
@@ -169,30 +104,6 @@ SELECT d, dynamicType(d) FROM test;
 │ Hello, World! │ String         │
 │ [1,2,3]       │ Array(Int64)   │
 └───────────────┴────────────────┘
-)"}}},
-        .categories{"Variant"},
-    });
-
-    factory.registerFunction<FunctionIsDynamicElementInSharedData>(FunctionDocumentation{
-        .description = R"(
-Returns true for rows in Dynamic column that are not separated into subcolumns and stored inside shared variant in binary form.
-)",
-        .syntax = {"isDynamicElementInSharedData(dynamic)"},
-        .arguments = {{"dynamic", "Dynamic column"}},
-        .examples = {{{
-            "Example",
-            R"(
-CREATE TABLE test (d Dynamic(max_types=2)) ENGINE = Memory;
-INSERT INTO test VALUES (NULL), (42), ('Hello, World!'), ([1, 2, 3]);
-SELECT d, isDynamicElementInSharedData(d) FROM test;
-)",
-            R"(
-┌─d─────────────┬─isDynamicElementInSharedData(d)─┐
-│ ᴺᵁᴸᴸ          │ false              │
-│ 42            │ false              │
-│ Hello, World! │ true               │
-│ [1,2,3]       │ true               │
-└───────────────┴────────────────────┘
 )"}}},
         .categories{"Variant"},
     });
diff --git a/src/Functions/empty.cpp b/src/Functions/empty.cpp
index ddb503668cf..51811d21a0c 100644
--- a/src/Functions/empty.cpp
+++ b/src/Functions/empty.cpp
@@ -2,18 +2,10 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringOrArrayToT.h>
 #include <Functions/EmptyImpl.h>
-#include <Columns/ColumnObject.h>
 
 
 namespace DB
 {
-
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-}
-
 namespace
 {
 
@@ -21,135 +13,13 @@ struct NameEmpty
 {
     static constexpr auto name = "empty";
 };
-
 using FunctionEmpty = FunctionStringOrArrayToT<EmptyImpl<false>, NameEmpty, UInt8, false>;
 
-/// Implements the empty function for JSON type.
-class ExecutableFunctionJSONEmpty : public IExecutableFunction
-{
-public:
-    std::string getName() const override { return NameEmpty::name; }
-
-private:
-    bool useDefaultImplementationForConstants() const override { return true; }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
-    {
-        const ColumnWithTypeAndName & elem = arguments[0];
-        const auto * object_column = typeid_cast<const ColumnObject *>(elem.column.get());
-        if (!object_column)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unexpected column type in function {}. Expected Object column, got {}", getName(), elem.column->getName());
-
-        auto res = DataTypeUInt8().createColumn();
-        auto & data = typeid_cast<ColumnUInt8 &>(*res).getData();
-        const auto & typed_paths = object_column->getTypedPaths();
-        size_t size = object_column->size();
-        /// If object column has at least 1 typed path, it will never be empty, because these paths always have values.
-        if (!typed_paths.empty())
-        {
-            data.resize_fill(size, 0);
-            return res;
-        }
-
-        const auto & dynamic_paths = object_column->getDynamicPaths();
-        const auto & shared_data = object_column->getSharedDataPtr();
-        data.reserve(size);
-        for (size_t i = 0; i != size; ++i)
-        {
-            bool empty = true;
-            /// Check if there is no paths in shared data.
-            if (!shared_data->isDefaultAt(i))
-            {
-                empty = false;
-            }
-            /// Check that all dynamic paths have NULL value in this row.
-            else
-            {
-                for (const auto & [path, column] : dynamic_paths)
-                {
-                    if (!column->isNullAt(i))
-                    {
-                        empty = false;
-                        break;
-                    }
-                }
-            }
-
-            data.push_back(empty);
-        }
-
-        return res;
-    }
-};
-
-class FunctionEmptyJSON final : public IFunctionBase
-{
-public:
-    FunctionEmptyJSON(const DataTypes & argument_types_, const DataTypePtr & return_type_) : argument_types(argument_types_), return_type(return_type_) {}
-
-    String getName() const override { return NameEmpty::name; }
-
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
-
-    const DataTypes & getArgumentTypes() const override { return argument_types; }
-    const DataTypePtr & getResultType() const override { return return_type; }
-
-    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
-    {
-        return std::make_unique<ExecutableFunctionJSONEmpty>();
-    }
-
-private:
-    DataTypes argument_types;
-    DataTypePtr return_type;
-};
-
-class FunctionEmptyOverloadResolver final : public IFunctionOverloadResolver
-{
-public:
-    static constexpr auto name = NameEmpty::name;
-
-    static FunctionOverloadResolverPtr create(ContextPtr)
-    {
-        return std::make_unique<FunctionEmptyOverloadResolver>();
-    }
-
-    String getName() const override { return NameEmpty::name; }
-    size_t getNumberOfArguments() const override { return 1; }
-
-    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
-    {
-        DataTypes argument_types;
-        argument_types.reserve(arguments.size());
-        for (const auto & arg : arguments)
-            argument_types.push_back(arg.type);
-
-        if (argument_types.size() == 1 && isObject(argument_types[0]))
-            return std::make_shared<FunctionEmptyJSON>(argument_types, return_type);
-
-        return std::make_shared<FunctionToFunctionBaseAdaptor>(std::make_shared<FunctionEmpty>(), argument_types, return_type);
-    }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
-    {
-        if (!isStringOrFixedString(arguments[0])
-            && !isArray(arguments[0])
-            && !isMap(arguments[0])
-            && !isUUID(arguments[0])
-            && !isIPv6(arguments[0])
-            && !isIPv4(arguments[0])
-            && !isObject(arguments[0]))
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {}", arguments[0]->getName(), getName());
-
-        return std::make_shared<DataTypeUInt8>();
-    }
-};
-
 }
 
 REGISTER_FUNCTION(Empty)
 {
-    factory.registerFunction<FunctionEmptyOverloadResolver>();
+    factory.registerFunction<FunctionEmpty>();
 }
 
 }
diff --git a/src/Functions/encodeXMLComponent.cpp b/src/Functions/encodeXMLComponent.cpp
index a22917838b7..64d85ecaeb8 100644
--- a/src/Functions/encodeXMLComponent.cpp
+++ b/src/Functions/encodeXMLComponent.cpp
@@ -25,17 +25,17 @@ namespace
             const ColumnString::Chars & data,
             const ColumnString::Offsets & offsets,
             ColumnString::Chars & res_data,
-            ColumnString::Offsets & res_offsets,
-            size_t input_rows_count)
+            ColumnString::Offsets & res_offsets)
         {
             /// 6 is the maximum size amplification (the maximum length of encoded entity: &quot;)
             res_data.resize(data.size() * 6);
-            res_offsets.resize(input_rows_count);
+            size_t size = offsets.size();
+            res_offsets.resize(size);
 
             size_t prev_offset = 0;
             size_t res_offset = 0;
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 const char * src_data = reinterpret_cast<const char *>(&data[prev_offset]);
                 size_t src_size = offsets[i] - prev_offset;
@@ -49,7 +49,7 @@ namespace
             res_data.resize(res_offset);
         }
 
-        [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+        [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
         {
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function encodeXML cannot work with FixedString argument");
         }
diff --git a/src/Functions/extract.cpp b/src/Functions/extract.cpp
index c78ee9898b7..6bbdaff0e3f 100644
--- a/src/Functions/extract.cpp
+++ b/src/Functions/extract.cpp
@@ -16,11 +16,10 @@ struct ExtractImpl
         const ColumnString::Offsets & offsets,
         const std::string & pattern,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         res_data.reserve(data.size() / 5);
-        res_offsets.resize(input_rows_count);
+        res_offsets.resize(offsets.size());
 
         const OptimizedRegularExpression regexp = Regexps::createRegexp<false, false, false>(pattern);
 
@@ -30,7 +29,7 @@ struct ExtractImpl
         size_t prev_offset = 0;
         size_t res_offset = 0;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < offsets.size(); ++i)
         {
             size_t cur_offset = offsets[i];
 
diff --git a/src/Functions/formatQuery.cpp b/src/Functions/formatQuery.cpp
index be633bdfe37..4e3f302ce36 100644
--- a/src/Functions/formatQuery.cpp
+++ b/src/Functions/formatQuery.cpp
@@ -39,11 +39,10 @@ public:
     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->getSettingsRef();
+        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;
-        print_pretty_type_names = settings.print_pretty_type_names;
     }
 
     String getName() const override { return name; }
@@ -139,11 +138,7 @@ private:
                 }
             }
 
-            IAST::FormatSettings settings(buf, output_formatting == OutputFormatting::SingleLine, /*hilite*/ false);
-            settings.show_secrets = true;
-            settings.print_pretty_type_names = print_pretty_type_names;
-            ast->format(settings);
-
+            formatAST(*ast, buf, /*hilite*/ false, /*single_line*/ output_formatting == OutputFormatting::SingleLine);
             auto formatted = buf.stringView();
 
             const size_t res_data_new_size = res_data_size + formatted.size() + 1;
@@ -170,7 +165,6 @@ private:
     size_t max_query_size;
     size_t max_parser_depth;
     size_t max_parser_backtracks;
-    bool print_pretty_type_names;
 };
 
 }
diff --git a/src/Functions/geometryConverters.h b/src/Functions/geometryConverters.h
index f1156d81f01..03831d37e0c 100644
--- a/src/Functions/geometryConverters.h
+++ b/src/Functions/geometryConverters.h
@@ -31,9 +31,6 @@ namespace ErrorCodes
 template <typename Point>
 using LineString = boost::geometry::model::linestring<Point>;
 
-template <typename Point>
-using MultiLineString = boost::geometry::model::multi_linestring<LineString<Point>>;
-
 template <typename Point>
 using Ring = boost::geometry::model::ring<Point>;
 
@@ -45,14 +42,12 @@ using MultiPolygon = boost::geometry::model::multi_polygon<Polygon<Point>>;
 
 using CartesianPoint = boost::geometry::model::d2::point_xy<Float64>;
 using CartesianLineString = LineString<CartesianPoint>;
-using CartesianMultiLineString = MultiLineString<CartesianPoint>;
 using CartesianRing = Ring<CartesianPoint>;
 using CartesianPolygon = Polygon<CartesianPoint>;
 using CartesianMultiPolygon = MultiPolygon<CartesianPoint>;
 
 using SphericalPoint = boost::geometry::model::point<Float64, 2, boost::geometry::cs::spherical_equatorial<boost::geometry::degree>>;
 using SphericalLineString = LineString<SphericalPoint>;
-using SphericalMultiLineString = MultiLineString<SphericalPoint>;
 using SphericalRing = Ring<SphericalPoint>;
 using SphericalPolygon = Polygon<SphericalPoint>;
 using SphericalMultiPolygon = MultiPolygon<SphericalPoint>;
@@ -118,28 +113,6 @@ struct ColumnToLineStringsConverter
     }
 };
 
-/**
- * Class which converts Column with type Array(Array(Tuple(Float64, Float64))) to a vector of boost multi_linestring type.
-*/
-template <typename Point>
-struct ColumnToMultiLineStringsConverter
-{
-    static std::vector<MultiLineString<Point>> convert(ColumnPtr col)
-    {
-        const IColumn::Offsets & offsets = typeid_cast<const ColumnArray &>(*col).getOffsets();
-        size_t prev_offset = 0;
-        std::vector<MultiLineString<Point>> answer(offsets.size());
-        auto all_linestrings = ColumnToLineStringsConverter<Point>::convert(typeid_cast<const ColumnArray &>(*col).getDataPtr());
-        for (size_t iter = 0; iter < offsets.size() && iter < all_linestrings.size(); ++iter)
-        {
-            for (size_t linestring_iter = prev_offset; linestring_iter < offsets[iter]; ++linestring_iter)
-                answer[iter].emplace_back(std::move(all_linestrings[linestring_iter]));
-            prev_offset = offsets[iter];
-        }
-        return answer;
-    }
-};
-
 /**
  * Class which converts Column with type Array(Tuple(Float64, Float64)) to a vector of boost ring type.
 */
@@ -295,38 +268,6 @@ private:
     ColumnUInt64::MutablePtr offsets;
 };
 
-/// Serialize Point, MultiLineString as MultiLineString
-template <typename Point>
-class MultiLineStringSerializer
-{
-public:
-    MultiLineStringSerializer()
-        : offsets(ColumnUInt64::create())
-    {}
-
-    explicit MultiLineStringSerializer(size_t n)
-        : offsets(ColumnUInt64::create(n))
-    {}
-
-    void add(const MultiLineString<Point> & multilinestring)
-    {
-        size += multilinestring.size();
-        offsets->insertValue(size);
-        for (const auto & linestring : multilinestring)
-            linestring_serializer.add(linestring);
-    }
-
-    ColumnPtr finalize()
-    {
-        return ColumnArray::create(linestring_serializer.finalize(), std::move(offsets));
-    }
-
-private:
-    size_t size = 0;
-    LineStringSerializer<Point> linestring_serializer;
-    ColumnUInt64::MutablePtr offsets;
-};
-
 /// Almost the same as LineStringSerializer
 /// Serialize Point, Ring as Ring
 template <typename Point>
@@ -470,11 +411,6 @@ static void callOnGeometryDataType(DataTypePtr type, F && f)
     else if (factory.get("LineString")->equals(*type) && type->getCustomName() && type->getCustomName()->getName() == "LineString")
         return f(ConverterType<ColumnToLineStringsConverter<Point>>());
 
-    /// We should take the name into consideration to avoid ambiguity.
-    /// Because for example both MultiLineString and Polygon are resolved to Array(Array(Point)).
-    else if (factory.get("MultiLineString")->equals(*type) && type->getCustomName() && type->getCustomName()->getName() == "MultiLineString")
-        return f(ConverterType<ColumnToMultiLineStringsConverter<Point>>());
-
     /// For backward compatibility if we call this function not on a custom type, we will consider Array(Tuple(Point)) as type Ring.
     else if (factory.get("Ring")->equals(*type))
         return f(ConverterType<ColumnToRingsConverter<Point>>());
diff --git a/src/Functions/getClientHTTPHeader.cpp b/src/Functions/getClientHTTPHeader.cpp
index 50a6275fc82..140f39d03b8 100644
--- a/src/Functions/getClientHTTPHeader.cpp
+++ b/src/Functions/getClientHTTPHeader.cpp
@@ -58,7 +58,7 @@ public:
         {
             Field header;
             source->get(row, header);
-            if (auto it = client_info.http_headers.find(header.safeGet<String>()); it != client_info.http_headers.end())
+            if (auto it = client_info.http_headers.find(header.get<String>()); it != client_info.http_headers.end())
                 result->insert(it->second);
             else
                 result->insertDefault();
diff --git a/src/Functions/hasColumnInTable.cpp b/src/Functions/hasColumnInTable.cpp
index cc496270b01..00714997b4a 100644
--- a/src/Functions/hasColumnInTable.cpp
+++ b/src/Functions/hasColumnInTable.cpp
@@ -143,7 +143,7 @@ ColumnPtr FunctionHasColumnInTable::executeImpl(const ColumnsWithTypeAndName & a
             /* cluster_name= */ "",
             /* password= */ ""
         };
-        auto cluster = std::make_shared<Cluster>(getContext()->getSettingsRef(), host_names, params);
+        auto cluster = std::make_shared<Cluster>(getContext()->getSettings(), host_names, params);
 
         // FIXME this (probably) needs a non-constant access to query context,
         // because it might initialized a storage. Ideally, the tables required
diff --git a/src/Functions/hilbertEncode.cpp b/src/Functions/hilbertEncode.cpp
index a4e3cc59b76..13512d0d36c 100644
--- a/src/Functions/hilbertEncode.cpp
+++ b/src/Functions/hilbertEncode.cpp
@@ -11,8 +11,8 @@ namespace DB
 
 namespace ErrorCodes
 {
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int ARGUMENT_OUT_OF_BOUND;
-    extern const int TOO_MANY_ARGUMENTS_FOR_FUNCTION;
 }
 
 
@@ -87,7 +87,7 @@ public:
             return col_res;
         }
 
-        throw Exception(ErrorCodes::TOO_MANY_ARGUMENTS_FOR_FUNCTION,
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                         "Illegal number of UInt arguments of function {}: should be not more than 2 dimensions",
                         getName());
     }
diff --git a/src/Functions/idna.cpp b/src/Functions/idna.cpp
index cf9e855c912..5a7ae3485ba 100644
--- a/src/Functions/idna.cpp
+++ b/src/Functions/idna.cpp
@@ -44,15 +44,15 @@ struct IdnaEncode
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
+        const size_t rows = offsets.size();
         res_data.reserve(data.size()); /// just a guess, assuming the input is all-ASCII
-        res_offsets.reserve(input_rows_count);
+        res_offsets.reserve(rows);
 
         size_t prev_offset = 0;
         std::string ascii;
-        for (size_t row = 0; row < input_rows_count; ++row)
+        for (size_t row = 0; row < rows; ++row)
         {
             const char * value = reinterpret_cast<const char *>(&data[prev_offset]);
             const size_t value_length = offsets[row] - prev_offset - 1;
@@ -85,7 +85,7 @@ struct IdnaEncode
         }
     }
 
-    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Arguments of type FixedString are not allowed");
     }
@@ -99,15 +99,15 @@ struct IdnaDecode
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
+        const size_t rows = offsets.size();
         res_data.reserve(data.size()); /// just a guess, assuming the input is all-ASCII
-        res_offsets.reserve(input_rows_count);
+        res_offsets.reserve(rows);
 
         size_t prev_offset = 0;
         std::string unicode;
-        for (size_t row = 0; row < input_rows_count; ++row)
+        for (size_t row = 0; row < rows; ++row)
         {
             const char * ascii = reinterpret_cast<const char *>(&data[prev_offset]);
             const size_t ascii_length = offsets[row] - prev_offset - 1;
@@ -124,7 +124,7 @@ struct IdnaDecode
         }
     }
 
-    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Arguments of type FixedString are not allowed");
     }
diff --git a/src/Functions/if.cpp b/src/Functions/if.cpp
index 8829b3c4ff1..07dbee27a9d 100644
--- a/src/Functions/if.cpp
+++ b/src/Functions/if.cpp
@@ -1233,12 +1233,6 @@ public:
             throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}. "
                 "Must be ColumnUInt8 or ColumnConstUInt8.", arg_cond.column->getName(), getName());
 
-        /// If result is Variant, always use generic implementation.
-        /// Using typed implementations may lead to incorrect result column type when
-        /// resulting Variant is created by use_variant_when_no_common_type.
-        if (isVariant(result_type))
-            return executeGeneric(cond_col, arguments, input_rows_count, use_variant_when_no_common_type);
-
         auto call = [&](const auto & types) -> bool
         {
             using Types = std::decay_t<decltype(types)>;
diff --git a/src/Functions/indexHint.h b/src/Functions/indexHint.h
index bc788601cd0..a71e1555c78 100644
--- a/src/Functions/indexHint.h
+++ b/src/Functions/indexHint.h
@@ -2,12 +2,14 @@
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <Interpreters/ActionsDAG.h>
 
 
 namespace DB
 {
 
+class ActionsDAG;
+using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
+
 /** The `indexHint` function takes any number of any arguments and always returns one.
   *
   * This function has a special meaning (see ExpressionAnalyzer, KeyCondition)
@@ -62,11 +64,11 @@ public:
         return DataTypeUInt8().createColumnConst(input_rows_count, 1u);
     }
 
-    void setActions(ActionsDAG actions_) { actions = std::move(actions_); }
-    const ActionsDAG & getActions() const { return actions; }
+    void setActions(ActionsDAGPtr actions_) { actions = std::move(actions_); }
+    const ActionsDAGPtr & getActions() const { return actions; }
 
 private:
-    ActionsDAG actions;
+    ActionsDAGPtr actions;
 };
 
 }
diff --git a/src/Functions/initcap.cpp b/src/Functions/initcap.cpp
index 00414b22344..4661ce117c0 100644
--- a/src/Functions/initcap.cpp
+++ b/src/Functions/initcap.cpp
@@ -9,12 +9,10 @@ namespace
 
 struct InitcapImpl
 {
-    static void vector(
-        const ColumnString::Chars & data,
+    static void vector(const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t /*input_rows_count*/)
+        ColumnString::Offsets & res_offsets)
     {
         if (data.empty())
             return;
@@ -23,7 +21,7 @@ struct InitcapImpl
         array(data.data(), data.data() + data.size(), res_data.data());
     }
 
-    static void vectorFixed(const ColumnString::Chars & data, size_t /*n*/, ColumnString::Chars & res_data, size_t)
+    static void vectorFixed(const ColumnString::Chars & data, size_t /*n*/, ColumnString::Chars & res_data)
     {
         res_data.resize(data.size());
         array(data.data(), data.data() + data.size(), res_data.data());
diff --git a/src/Functions/initcapUTF8.cpp b/src/Functions/initcapUTF8.cpp
index 004586dce26..076dcff6622 100644
--- a/src/Functions/initcapUTF8.cpp
+++ b/src/Functions/initcapUTF8.cpp
@@ -1,8 +1,9 @@
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionStringToString.h>
+#include <Functions/LowerUpperUTF8Impl.h>
 #include <Functions/FunctionFactory.h>
 #include <Poco/Unicode.h>
-#include <Common/UTF8Helpers.h>
+
 
 namespace DB
 {
@@ -21,8 +22,7 @@ struct InitcapUTF8Impl
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t /*input_rows_count*/)
+        ColumnString::Offsets & res_offsets)
     {
         if (data.empty())
             return;
@@ -31,7 +31,7 @@ struct InitcapUTF8Impl
         array(data.data(), data.data() + data.size(), offsets, res_data.data());
     }
 
-    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Function initcapUTF8 cannot work with FixedString argument");
     }
diff --git a/src/Functions/isValidUTF8.cpp b/src/Functions/isValidUTF8.cpp
index 1959502af06..d5f5e6a8986 100644
--- a/src/Functions/isValidUTF8.cpp
+++ b/src/Functions/isValidUTF8.cpp
@@ -219,42 +219,42 @@ SOFTWARE.
 
     static constexpr bool is_fixed_to_constant = false;
 
-    static void vector(const ColumnString::Chars & data, const ColumnString::Offsets & offsets, PaddedPODArray<UInt8> & res, size_t input_rows_count)
+    static void vector(const ColumnString::Chars & data, const ColumnString::Offsets & offsets, PaddedPODArray<UInt8> & res)
     {
+        size_t size = offsets.size();
         size_t prev_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             res[i] = isValidUTF8(data.data() + prev_offset, offsets[i] - 1 - prev_offset);
             prev_offset = offsets[i];
         }
     }
 
-    static void vectorFixedToConstant(const ColumnString::Chars &, size_t, UInt8 &, size_t)
-    {
-    }
+    static void vectorFixedToConstant(const ColumnString::Chars & /*data*/, size_t /*n*/, UInt8 & /*res*/) {}
 
-    static void vectorFixedToVector(const ColumnString::Chars & data, size_t n, PaddedPODArray<UInt8> & res, size_t input_rows_count)
+    static void vectorFixedToVector(const ColumnString::Chars & data, size_t n, PaddedPODArray<UInt8> & res)
     {
-        for (size_t i = 0; i < input_rows_count; ++i)
+        size_t size = data.size() / n;
+        for (size_t i = 0; i < size; ++i)
             res[i] = isValidUTF8(data.data() + i * n, n);
     }
 
-    [[noreturn]] static void array(const ColumnString::Offsets &, PaddedPODArray<UInt8> &, size_t)
+    [[noreturn]] static void array(const ColumnString::Offsets &, PaddedPODArray<UInt8> &)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function isValidUTF8 to Array argument");
     }
 
-    [[noreturn]] static void uuid(const ColumnUUID::Container &, size_t &, PaddedPODArray<UInt8> &, size_t)
+    [[noreturn]] static void uuid(const ColumnUUID::Container &, size_t &, PaddedPODArray<UInt8> &)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function isValidUTF8 to UUID argument");
     }
 
-    [[noreturn]] static void ipv6(const ColumnIPv6::Container &, size_t &, PaddedPODArray<UInt8> &, size_t)
+    [[noreturn]] static void ipv6(const ColumnIPv6::Container &, size_t &, PaddedPODArray<UInt8> &)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function isValidUTF8 to IPv6 argument");
     }
 
-    [[noreturn]] static void ipv4(const ColumnIPv4::Container &, size_t &, PaddedPODArray<UInt8> &, size_t)
+    [[noreturn]] static void ipv4(const ColumnIPv4::Container &, size_t &, PaddedPODArray<UInt8> &)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function isValidUTF8 to IPv4 argument");
     }
diff --git a/src/Functions/keyvaluepair/extractKeyValuePairs.cpp b/src/Functions/keyvaluepair/extractKeyValuePairs.cpp
index cc9e57ac186..1c5164e132d 100644
--- a/src/Functions/keyvaluepair/extractKeyValuePairs.cpp
+++ b/src/Functions/keyvaluepair/extractKeyValuePairs.cpp
@@ -54,7 +54,7 @@ class ExtractKeyValuePairs : public IFunction
         return builder.build();
     }
 
-    ColumnPtr extract(ColumnPtr data_column, std::shared_ptr<KeyValuePairExtractor> extractor, size_t input_rows_count) const
+    ColumnPtr extract(ColumnPtr data_column, std::shared_ptr<KeyValuePairExtractor> extractor) const
     {
         auto offsets = ColumnUInt64::create();
 
@@ -63,7 +63,7 @@ class ExtractKeyValuePairs : public IFunction
 
         uint64_t offset = 0u;
 
-        for (auto i = 0u; i < input_rows_count; i++)
+        for (auto i = 0u; i < data_column->size(); i++)
         {
             auto row = data_column->getDataAt(i).toView();
 
@@ -97,13 +97,13 @@ public:
         return std::make_shared<ExtractKeyValuePairs>(context);
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         auto parsed_arguments = ArgumentExtractor::extract(arguments);
 
         auto extractor = getExtractor(parsed_arguments);
 
-        return extract(parsed_arguments.data_column, extractor, input_rows_count);
+        return extract(parsed_arguments.data_column, extractor);
     }
 
     DataTypePtr getReturnTypeImpl(const DataTypes &) const override
diff --git a/src/Functions/lengthUTF8.cpp b/src/Functions/lengthUTF8.cpp
index 97a42816674..59a0d532602 100644
--- a/src/Functions/lengthUTF8.cpp
+++ b/src/Functions/lengthUTF8.cpp
@@ -23,42 +23,48 @@ struct LengthUTF8Impl
 {
     static constexpr auto is_fixed_to_constant = false;
 
-    static void vector(const ColumnString::Chars & data, const ColumnString::Offsets & offsets, PaddedPODArray<UInt64> & res, size_t input_rows_count)
+    static void vector(const ColumnString::Chars & data, const ColumnString::Offsets & offsets, PaddedPODArray<UInt64> & res)
     {
+        size_t size = offsets.size();
+
         ColumnString::Offset prev_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             res[i] = UTF8::countCodePoints(&data[prev_offset], offsets[i] - prev_offset - 1);
             prev_offset = offsets[i];
         }
     }
 
-    static void vectorFixedToConstant(const ColumnString::Chars & /*data*/, size_t /*n*/, UInt64 & /*res*/, size_t)
+    static void vectorFixedToConstant(const ColumnString::Chars & /*data*/, size_t /*n*/, UInt64 & /*res*/)
     {
     }
 
-    static void vectorFixedToVector(const ColumnString::Chars & data, size_t n, PaddedPODArray<UInt64> & res, size_t input_rows_count)
+    static void vectorFixedToVector(const ColumnString::Chars & data, size_t n, PaddedPODArray<UInt64> & res)
     {
-        for (size_t i = 0; i < input_rows_count; ++i)
+        size_t size = data.size() / n;
+
+        for (size_t i = 0; i < size; ++i)
+        {
             res[i] = UTF8::countCodePoints(&data[i * n], n);
+        }
     }
 
-    [[noreturn]] static void array(const ColumnString::Offsets &, PaddedPODArray<UInt64> &, size_t)
+    [[noreturn]] static void array(const ColumnString::Offsets &, PaddedPODArray<UInt64> &)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function lengthUTF8 to Array argument");
     }
 
-    [[noreturn]] static void uuid(const ColumnUUID::Container &, size_t &, PaddedPODArray<UInt64> &, size_t)
+    [[noreturn]] static void uuid(const ColumnUUID::Container &, size_t &, PaddedPODArray<UInt64> &)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function lengthUTF8 to UUID argument");
     }
 
-    [[noreturn]] static void ipv6(const ColumnIPv6::Container &, size_t &, PaddedPODArray<UInt64> &, size_t)
+    [[noreturn]] static void ipv6(const ColumnIPv6::Container &, size_t &, PaddedPODArray<UInt64> &)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function lengthUTF8 to IPv6 argument");
     }
 
-    [[noreturn]] static void ipv4(const ColumnIPv4::Container &, size_t &, PaddedPODArray<UInt64> &, size_t)
+    [[noreturn]] static void ipv4(const ColumnIPv4::Container &, size_t &, PaddedPODArray<UInt64> &)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Cannot apply function lengthUTF8 to IPv4 argument");
     }
diff --git a/src/Functions/lowerUTF8.cpp b/src/Functions/lowerUTF8.cpp
index e2f7cb84730..7adb0069121 100644
--- a/src/Functions/lowerUTF8.cpp
+++ b/src/Functions/lowerUTF8.cpp
@@ -1,10 +1,9 @@
-#include "config.h"
-
-#if USE_ICU
-
-#include <Functions/FunctionFactory.h>
+#include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionStringToString.h>
 #include <Functions/LowerUpperUTF8Impl.h>
+#include <Functions/FunctionFactory.h>
+#include <Poco/Unicode.h>
+
 
 namespace DB
 {
@@ -16,25 +15,13 @@ struct NameLowerUTF8
     static constexpr auto name = "lowerUTF8";
 };
 
-using FunctionLowerUTF8 = FunctionStringToString<LowerUpperUTF8Impl<'A', 'Z', false>, NameLowerUTF8>;
+using FunctionLowerUTF8 = FunctionStringToString<LowerUpperUTF8Impl<'A', 'Z', Poco::Unicode::toLower, UTF8CyrillicToCase<true>>, NameLowerUTF8>;
 
 }
 
 REGISTER_FUNCTION(LowerUTF8)
 {
-    FunctionDocumentation::Description description
-        = R"(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.)";
-    FunctionDocumentation::Syntax syntax = "lowerUTF8(input)";
-    FunctionDocumentation::Arguments arguments = {{"input", "Input with String type"}};
-    FunctionDocumentation::ReturnedValue returned_value = "A String data type value";
-    FunctionDocumentation::Examples examples = {
-        {"first", "SELECT lowerUTF8('München') as Lowerutf8;", "münchen"},
-    };
-    FunctionDocumentation::Categories categories = {"String"};
-
-    factory.registerFunction<FunctionLowerUTF8>({description, syntax, arguments, returned_value, examples, categories});
+    factory.registerFunction<FunctionLowerUTF8>();
 }
 
 }
-
-#endif
diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index 14672cfd568..0d42ce2abe1 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -1,20 +1,16 @@
-#include <Columns/ColumnLowCardinality.h>
-#include <Columns/ColumnMap.h>
-#include <Columns/ColumnNullable.h>
-#include <Columns/ColumnsCommon.h>
-#include <Columns/ColumnsNumber.h>
-#include <Core/Settings.h>
-#include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeMap.h>
-#include <DataTypes/DataTypeTuple.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/getLeastSupertype.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunction.h>
-#include <Interpreters/Context.h>
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/getLeastSupertype.h>
+#include <Columns/ColumnMap.h>
 #include <Interpreters/castColumn.h>
+#include <Interpreters/Context.h>
 #include <Common/HashTable/HashSet.h>
+#include <Core/Settings.h>
 
 
 namespace DB
@@ -25,7 +21,6 @@ namespace ErrorCodes
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int SIZES_OF_ARRAYS_DONT_MATCH;
     extern const int ILLEGAL_COLUMN;
-    extern const int BAD_ARGUMENTS;
 }
 
 namespace
@@ -37,18 +32,11 @@ class FunctionMap : public IFunction
 public:
     static constexpr auto name = "map";
 
-    explicit FunctionMap(ContextPtr context_)
-        : context(context_)
-        , use_variant_as_common_type(
-              context->getSettingsRef().allow_experimental_variant_type && context->getSettingsRef().use_variant_as_common_type)
-        , function_array(FunctionFactory::instance().get("array", context))
-        , function_map_from_arrays(FunctionFactory::instance().get("mapFromArrays", context))
-    {
-    }
+    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>(context);
+        return std::make_shared<FunctionMap>(context->getSettingsRef().allow_experimental_variant_type && context->getSettingsRef().use_variant_as_common_type);
     }
 
     String getName() const override
@@ -109,41 +97,65 @@ public:
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         size_t num_elements = arguments.size();
+
         if (num_elements == 0)
             return result_type->createColumnConstWithDefaultValue(input_rows_count);
 
-        ColumnsWithTypeAndName key_args;
-        ColumnsWithTypeAndName value_args;
-        for (size_t i = 0; i < num_elements; i += 2)
-        {
-            key_args.emplace_back(arguments[i]);
-            value_args.emplace_back(arguments[i+1]);
-        }
-
         const auto & result_type_map = static_cast<const DataTypeMap &>(*result_type);
         const DataTypePtr & key_type = result_type_map.getKeyType();
         const DataTypePtr & value_type = result_type_map.getValueType();
-        const DataTypePtr & key_array_type = std::make_shared<DataTypeArray>(key_type);
-        const DataTypePtr & value_array_type = std::make_shared<DataTypeArray>(value_type);
 
-        /// key_array = array(args[0], args[2]...)
-        ColumnPtr key_array = function_array->build(key_args)->execute(key_args, key_array_type, input_rows_count);
-        /// value_array = array(args[1], args[3]...)
-        ColumnPtr value_array = function_array->build(value_args)->execute(value_args, value_array_type, input_rows_count);
+        Columns columns_holder(num_elements);
+        ColumnRawPtrs column_ptrs(num_elements);
 
-        /// result = mapFromArrays(key_array, value_array)
-        ColumnsWithTypeAndName map_args{{key_array, key_array_type, ""}, {value_array, value_array_type, ""}};
-        return function_map_from_arrays->build(map_args)->execute(map_args, result_type, input_rows_count);
+        for (size_t i = 0; i < num_elements; ++i)
+        {
+            const auto & arg = arguments[i];
+            const auto to_type = i % 2 == 0 ? key_type : value_type;
+
+            ColumnPtr preprocessed_column = castColumn(arg, to_type);
+            preprocessed_column = preprocessed_column->convertToFullColumnIfConst();
+
+            columns_holder[i] = std::move(preprocessed_column);
+            column_ptrs[i] = columns_holder[i].get();
+        }
+
+        /// Create and fill the result map.
+
+        MutableColumnPtr keys_data = key_type->createColumn();
+        MutableColumnPtr values_data = value_type->createColumn();
+        MutableColumnPtr offsets = DataTypeNumber<IColumn::Offset>().createColumn();
+
+        size_t total_elements = input_rows_count * num_elements / 2;
+        keys_data->reserve(total_elements);
+        values_data->reserve(total_elements);
+        offsets->reserve(input_rows_count);
+
+        IColumn::Offset current_offset = 0;
+        for (size_t i = 0; i < input_rows_count; ++i)
+        {
+            for (size_t j = 0; j < num_elements; j += 2)
+            {
+                keys_data->insertFrom(*column_ptrs[j], i);
+                values_data->insertFrom(*column_ptrs[j + 1], i);
+            }
+
+            current_offset += num_elements / 2;
+            offsets->insert(current_offset);
+        }
+
+        auto nested_column = ColumnArray::create(
+            ColumnTuple::create(Columns{std::move(keys_data), std::move(values_data)}),
+            std::move(offsets));
+
+        return ColumnMap::create(nested_column);
     }
 
 private:
-    ContextPtr context;
     bool use_variant_as_common_type = false;
-    FunctionOverloadResolverPtr function_array;
-    FunctionOverloadResolverPtr function_map_from_arrays;
 };
 
-/// mapFromArrays(keys, values) is a function that allows you to make key-value pair from a pair of arrays or maps
+/// mapFromArrays(keys, values) is a function that allows you to make key-value pair from a pair of arrays
 class FunctionMapFromArrays : public IFunction
 {
 public:
@@ -157,7 +169,6 @@ public:
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
-    bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -168,28 +179,21 @@ public:
                 getName(),
                 arguments.size());
 
-        auto get_nested_type = [&](const DataTypePtr & type)
-        {
-            DataTypePtr nested;
-            if (const auto * type_as_array = checkAndGetDataType<DataTypeArray>(type.get()))
-                nested = type_as_array->getNestedType();
-            else if (const auto * type_as_map = checkAndGetDataType<DataTypeMap>(type.get()))
-                nested = std::make_shared<DataTypeTuple>(type_as_map->getKeyValueTypes());
-            else
-                throw Exception(
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Arguments of function {} must be Array or Map, but {} is given",
-                    getName(),
-                    type->getName());
+        /// The first argument should always be Array.
+        /// Because key type can not be nested type of Map, which is Tuple
+        DataTypePtr key_type;
+        if (const auto * keys_type = checkAndGetDataType<DataTypeArray>(arguments[0].get()))
+            key_type = keys_type->getNestedType();
+        else
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "First argument for function {} must be an Array", getName());
 
-            return nested;
-        };
-
-        auto key_type = get_nested_type(arguments[0]);
-        auto value_type = get_nested_type(arguments[1]);
-
-        /// We accept Array(Nullable(T)) or Array(LowCardinality(Nullable(T))) as key types as long as the actual array doesn't contain NULL value(this is checked in executeImpl).
-        key_type = removeNullableOrLowCardinalityNullable(key_type);
+        DataTypePtr value_type;
+        if (const auto * value_array_type = checkAndGetDataType<DataTypeArray>(arguments[1].get()))
+            value_type = value_array_type->getNestedType();
+        else if (const auto * value_map_type = checkAndGetDataType<DataTypeMap>(arguments[1].get()))
+            value_type = std::make_shared<DataTypeTuple>(value_map_type->getKeyValueTypes());
+        else
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Second argument for function {} must be Array or Map", getName());
 
         DataTypes key_value_types{key_type, value_type};
         return std::make_shared<DataTypeMap>(key_value_types);
@@ -198,59 +202,44 @@ public:
     ColumnPtr executeImpl(
         const ColumnsWithTypeAndName & arguments, const DataTypePtr & /* result_type */, size_t /* input_rows_count */) const override
     {
-        auto get_array_column = [&](const ColumnPtr & column) -> std::pair<const ColumnArray *, ColumnPtr>
+        bool is_keys_const = isColumnConst(*arguments[0].column);
+        ColumnPtr holder_keys;
+        const ColumnArray * col_keys;
+        if (is_keys_const)
         {
-            bool is_const = isColumnConst(*column);
-            ColumnPtr holder = is_const ? column->convertToFullColumnIfConst() : column;
-
-            const ColumnArray * col_res = nullptr;
-            if (const auto * col_array = checkAndGetColumn<ColumnArray>(holder.get()))
-                col_res = col_array;
-            else if (const auto * col_map = checkAndGetColumn<ColumnMap>(holder.get()))
-                col_res = &col_map->getNestedColumn();
-            else
-                throw Exception(
-                    ErrorCodes::ILLEGAL_COLUMN,
-                    "Argument columns of function {} must be Array or Map, but {} is given",
-                    getName(),
-                    holder->getName());
-
-            return {col_res, holder};
-        };
-
-        auto [col_keys, key_holder] = get_array_column(arguments[0].column);
-        auto [col_values, values_holder] = get_array_column(arguments[1].column);
-
-        /// Nullable(T) or LowCardinality(Nullable(T)) are okay as nested key types but actual NULL values are not okay.
-        ColumnPtr data_keys = col_keys->getDataPtr();
-        if (isColumnNullableOrLowCardinalityNullable(*data_keys))
+            holder_keys = arguments[0].column->convertToFullColumnIfConst();
+            col_keys = checkAndGetColumn<ColumnArray>(holder_keys.get());
+        }
+        else
         {
-            const NullMap * null_map = nullptr;
-            if (const auto * nullable = checkAndGetColumn<ColumnNullable>(data_keys.get()))
-            {
-                null_map = &nullable->getNullMapData();
-                data_keys = nullable->getNestedColumnPtr();
-            }
-            else if (const auto * low_cardinality = checkAndGetColumn<ColumnLowCardinality>(data_keys.get()))
-            {
-                if (const auto * nullable_dict = checkAndGetColumn<ColumnNullable>(low_cardinality->getDictionaryPtr().get()))
-                {
-                    null_map = &nullable_dict->getNullMapData();
-                    data_keys = ColumnLowCardinality::create(nullable_dict->getNestedColumnPtr(), low_cardinality->getIndexesPtr());
-                }
-            }
-
-            if (null_map && !memoryIsZero(null_map->data(), 0, null_map->size()))
-                throw Exception(
-                    ErrorCodes::BAD_ARGUMENTS, "The nested column of first argument in function {} must not contain NULLs", getName());
+            col_keys = checkAndGetColumn<ColumnArray>(arguments[0].column.get());
         }
 
-        if (!col_keys->hasEqualOffsets(*col_values))
-            throw Exception(ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH, "Two arguments of function {} must have equal sizes", getName());
+        if (!col_keys)
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "The first argument of function {} must be Array", getName());
 
+        bool is_values_const = isColumnConst(*arguments[1].column);
+        ColumnPtr holder_values;
+        if (is_values_const)
+            holder_values = arguments[1].column->convertToFullColumnIfConst();
+        else
+            holder_values = arguments[1].column;
+
+        const ColumnArray * col_values;
+        if (const auto * col_values_array = checkAndGetColumn<ColumnArray>(holder_values.get()))
+            col_values = col_values_array;
+        else if (const auto * col_values_map = checkAndGetColumn<ColumnMap>(holder_values.get()))
+            col_values = &col_values_map->getNestedColumn();
+        else
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "The second arguments of function {} must be Array or Map", getName());
+
+        if (!col_keys->hasEqualOffsets(*col_values))
+            throw Exception(ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH, "Two arguments for function {} must have equal sizes", getName());
+
+        const auto & data_keys = col_keys->getDataPtr();
         const auto & data_values = col_values->getDataPtr();
         const auto & offsets = col_keys->getOffsetsPtr();
-        auto nested_column = ColumnArray::create(ColumnTuple::create(Columns{std::move(data_keys), data_values}), offsets);
+        auto nested_column = ColumnArray::create(ColumnTuple::create(Columns{data_keys, data_values}), offsets);
         return ColumnMap::create(nested_column);
     }
 };
@@ -261,7 +250,10 @@ public:
     static constexpr auto name = "mapUpdate";
     static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMapUpdate>(); }
 
-    String getName() const override { return name; }
+    String getName() const override
+    {
+        return name;
+    }
 
     size_t getNumberOfArguments() const override { return 2; }
 
@@ -270,11 +262,9 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         if (arguments.size() != 2)
-            throw Exception(
-                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
                 "Number of arguments for function {} doesn't match: passed {}, should be 2",
-                getName(),
-                arguments.size());
+                getName(), arguments.size());
 
         const auto * left = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
         const auto * right = checkAndGetDataType<DataTypeMap>(arguments[1].type.get());
@@ -390,6 +380,7 @@ public:
         return ColumnMap::create(nested_column);
     }
 };
+
 }
 
 REGISTER_FUNCTION(Map)
diff --git a/src/Functions/materialize.h b/src/Functions/materialize.h
index 571391faba7..41994509745 100644
--- a/src/Functions/materialize.h
+++ b/src/Functions/materialize.h
@@ -2,7 +2,7 @@
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Columns/ColumnLowCardinality.h>
-#include <Columns/ColumnSparse.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 
 namespace DB
 {
@@ -18,6 +18,11 @@ public:
         return std::make_shared<FunctionMaterialize>();
     }
 
+    bool useDefaultImplementationForNulls() const override
+    {
+        return false;
+    }
+
     /// Get the function name.
     String getName() const override
     {
@@ -29,16 +34,8 @@ public:
         return true;
     }
 
-    bool useDefaultImplementationForNulls() const override { return false; }
-
-    bool useDefaultImplementationForNothing() const override { return false; }
-
-    bool useDefaultImplementationForConstants() const override { return false; }
-
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
 
-    bool useDefaultImplementationForSparseColumns() const override { return false; }
-
     bool isSuitableForConstantFolding() const override { return false; }
 
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
@@ -55,7 +52,7 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
-        return recursiveRemoveSparse(arguments[0].column->convertToFullColumnIfConst());
+        return arguments[0].column->convertToFullColumnIfConst();
     }
 
     bool hasInformationAboutMonotonicity() const override { return true; }
diff --git a/src/Functions/mortonEncode.cpp b/src/Functions/mortonEncode.cpp
index 8cf0f18dbfe..0c19c7c3134 100644
--- a/src/Functions/mortonEncode.cpp
+++ b/src/Functions/mortonEncode.cpp
@@ -16,8 +16,8 @@ namespace DB
 
 namespace ErrorCodes
 {
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int ARGUMENT_OUT_OF_BOUND;
-    extern const int TOO_MANY_ARGUMENTS_FOR_FUNCTION;
 }
 
 #define EXTRACT_VECTOR(INDEX) \
@@ -130,7 +130,7 @@ namespace ErrorCodes
            MASK(8, 6, col6->getUInt(i)), \
            MASK(8, 7, col7->getUInt(i))) \
      \
-    throw Exception(ErrorCodes::TOO_MANY_ARGUMENTS_FOR_FUNCTION, \
+    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, \
                     "Illegal number of UInt arguments of function {}, max: 8", \
                     getName()); \
 
diff --git a/src/Functions/multiIf.cpp b/src/Functions/multiIf.cpp
index 14b8b70b22c..c4b675fcf6c 100644
--- a/src/Functions/multiIf.cpp
+++ b/src/Functions/multiIf.cpp
@@ -200,7 +200,7 @@ public:
 
                     if (value.isNull())
                         continue;
-                    if (value.safeGet<UInt64>() == 0)
+                    if (value.get<UInt64>() == 0)
                         continue;
 
                     instruction.condition_always_true = true;
diff --git a/src/Functions/nested.cpp b/src/Functions/nested.cpp
index 85c342b5e7c..bdaf57d65c9 100644
--- a/src/Functions/nested.cpp
+++ b/src/Functions/nested.cpp
@@ -145,7 +145,7 @@ private:
         if (nested_names_field.getType() != Field::Types::Array)
             return {};
 
-        const auto & nested_names_array = nested_names_field.safeGet<const Array &>();
+        const auto & nested_names_array = nested_names_field.get<const Array &>();
 
         Names nested_names;
         nested_names.reserve(nested_names_array.size());
@@ -155,7 +155,7 @@ private:
             if (nested_name_field.getType() != Field::Types::String)
                 return {};
 
-            nested_names.push_back(nested_name_field.safeGet<const String &>());
+            nested_names.push_back(nested_name_field.get<const String &>());
         }
 
         return nested_names;
diff --git a/src/Functions/normalizeQuery.cpp b/src/Functions/normalizeQuery.cpp
index 1a78bce7d29..ad9a8903733 100644
--- a/src/Functions/normalizeQuery.cpp
+++ b/src/Functions/normalizeQuery.cpp
@@ -19,19 +19,17 @@ template <bool keep_names>
 struct Impl
 {
     static constexpr auto name = keep_names ? "normalizeQueryKeepNames" : "normalizeQuery";
-
-    static void vector(
-        const ColumnString::Chars & data,
+    static void vector(const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
-        res_offsets.resize(input_rows_count);
+        size_t size = offsets.size();
+        res_offsets.resize(size);
         res_data.reserve(data.size());
 
         ColumnString::Offset prev_src_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             ColumnString::Offset curr_src_offset = offsets[i];
 
@@ -45,7 +43,7 @@ struct Impl
         }
     }
 
-    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
         throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot apply function normalizeQuery to fixed string.");
     }
diff --git a/src/Functions/normalizeString.cpp b/src/Functions/normalizeString.cpp
index c56508ced0e..92411490eaa 100644
--- a/src/Functions/normalizeString.cpp
+++ b/src/Functions/normalizeString.cpp
@@ -84,8 +84,7 @@ struct NormalizeUTF8Impl
     static void vector(const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         UErrorCode err = U_ZERO_ERROR;
 
@@ -93,7 +92,8 @@ struct NormalizeUTF8Impl
         if (U_FAILURE(err))
             throw Exception(ErrorCodes::CANNOT_NORMALIZE_STRING, "Normalization failed (getNormalizer): {}", u_errorName(err));
 
-        res_offsets.resize(input_rows_count);
+        size_t size = offsets.size();
+        res_offsets.resize(size);
 
         res_data.reserve(data.size() * 2);
 
@@ -103,7 +103,7 @@ struct NormalizeUTF8Impl
         PODArray<UChar> from_uchars;
         PODArray<UChar> to_uchars;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             size_t from_size = offsets[i] - current_from_offset - 1;
 
@@ -157,7 +157,7 @@ struct NormalizeUTF8Impl
         res_data.resize(current_to_offset);
     }
 
-    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
         throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot apply function normalizeUTF8 to fixed string.");
     }
diff --git a/src/Functions/normalizedQueryHash.cpp b/src/Functions/normalizedQueryHash.cpp
index 3dbe3ff9847..63218f28af5 100644
--- a/src/Functions/normalizedQueryHash.cpp
+++ b/src/Functions/normalizedQueryHash.cpp
@@ -27,13 +27,13 @@ struct Impl
     static void vector(
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
-        PaddedPODArray<UInt64> & res_data,
-        size_t input_rows_count)
+        PaddedPODArray<UInt64> & res_data)
     {
-        res_data.resize(input_rows_count);
+        size_t size = offsets.size();
+        res_data.resize(size);
 
         ColumnString::Offset prev_src_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             ColumnString::Offset curr_src_offset = offsets[i];
             res_data[i] = normalizedQueryHash(
@@ -77,15 +77,15 @@ public:
 
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr column = arguments[0].column;
         if (const ColumnString * col = checkAndGetColumn<ColumnString>(column.get()))
         {
             auto col_res = ColumnUInt64::create();
             typename ColumnUInt64::Container & vec_res = col_res->getData();
-            vec_res.resize(input_rows_count);
-            Impl<keep_names>::vector(col->getChars(), col->getOffsets(), vec_res, input_rows_count);
+            vec_res.resize(col->size());
+            Impl<keep_names>::vector(col->getChars(), col->getOffsets(), vec_res);
             return col_res;
         }
         else
diff --git a/src/Functions/overlay.cpp b/src/Functions/overlay.cpp
deleted file mode 100644
index eddb7590cab..00000000000
--- a/src/Functions/overlay.cpp
+++ /dev/null
@@ -1,720 +0,0 @@
-#include <Columns/ColumnConst.h>
-#include <Columns/ColumnString.h>
-#include <Common/StringUtils.h>
-#include <Common/UTF8Helpers.h>
-#include <DataTypes/DataTypeString.h>
-#include <Functions/FunctionFactory.h>
-#include <Functions/FunctionHelpers.h>
-#include <Functions/GatherUtils/Sources.h>
-#include <Functions/IFunction.h>
-
-namespace DB
-{
-
-namespace
-{
-
-/// If 'is_utf8' - measure offset and length in code points instead of bytes.
-/// Syntax:
-/// - overlay(s, replace, offset[, length])
-/// - overlayUTF8(s, replace, offset[, length]) - measure offset and length in code points instead of bytes
-template <bool is_utf8>
-class FunctionOverlay : public IFunction
-{
-public:
-    static constexpr auto name = is_utf8 ? "overlayUTF8" : "overlay";
-
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionOverlay>(); }
-    String getName() const override { return name; }
-    bool isVariadic() const override { return true; }
-    size_t getNumberOfArguments() const override { return 0; }
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
-    bool useDefaultImplementationForConstants() const override { return true; }
-
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
-    {
-        FunctionArgumentDescriptors mandatory_args{
-            {"s", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"},
-            {"replace", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"},
-            {"offset", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNativeInteger), nullptr, "(U)Int8/16/32/64"},
-        };
-
-        FunctionArgumentDescriptors optional_args{
-            {"length", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNativeInteger), nullptr, "(U)Int8/16/32/64"},
-        };
-
-        validateFunctionArguments(*this, arguments, mandatory_args, optional_args);
-
-        return std::make_shared<DataTypeString>();
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
-    {
-        if (input_rows_count == 0)
-            return ColumnString::create();
-
-        bool has_four_args = (arguments.size() == 4);
-
-        ColumnPtr col_input = arguments[0].column;
-        const auto * col_input_const = checkAndGetColumn<ColumnConst>(col_input.get());
-        const auto * col_input_string = checkAndGetColumn<ColumnString>(col_input.get());
-        bool input_is_const = (col_input_const != nullptr);
-
-        ColumnPtr col_replace = arguments[1].column;
-        const auto * col_replace_const = checkAndGetColumn<ColumnConst>(col_replace.get());
-        const auto * col_replace_string = checkAndGetColumn<ColumnString>(col_replace.get());
-        bool replace_is_const = (col_replace_const != nullptr);
-
-        ColumnPtr col_offset = arguments[2].column;
-        const ColumnConst * col_offset_const = checkAndGetColumn<ColumnConst>(col_offset.get());
-        bool offset_is_const = false;
-        Int64 offset = -1;
-        if (col_offset_const)
-        {
-            offset = col_offset_const->getInt(0);
-            offset_is_const = true;
-        }
-
-        ColumnPtr col_length = has_four_args ? arguments[3].column : nullptr;
-        const ColumnConst * col_length_const = has_four_args ? checkAndGetColumn<ColumnConst>(col_length.get()) : nullptr;
-        bool length_is_const = false;
-        Int64 length = -1;
-        if (col_length_const)
-        {
-            length = col_length_const->getInt(0);
-            length_is_const = true;
-        }
-
-        auto res_col = ColumnString::create();
-        auto & res_data = res_col->getChars();
-        auto & res_offsets = res_col->getOffsets();
-
-        res_offsets.resize_exact(input_rows_count);
-        if (col_input_const)
-        {
-            StringRef input = col_input_const->getDataAt(0);
-            res_data.reserve((input.size + 1) * input_rows_count);
-        }
-        else
-        {
-            res_data.reserve(col_input_string->getChars().size());
-        }
-
-#define OVERLAY_EXECUTE_CASE(HAS_FOUR_ARGS, OFFSET_IS_CONST, LENGTH_IS_CONST) \
-    if (input_is_const && replace_is_const) \
-        constantConstant<HAS_FOUR_ARGS, OFFSET_IS_CONST, LENGTH_IS_CONST>( \
-            input_rows_count, \
-            col_input_const->getDataAt(0), \
-            col_replace_const->getDataAt(0), \
-            col_offset, \
-            col_length, \
-            offset, \
-            length, \
-            res_data, \
-            res_offsets); \
-    else if (input_is_const && !replace_is_const) \
-        constantVector<HAS_FOUR_ARGS, OFFSET_IS_CONST, LENGTH_IS_CONST>( \
-            input_rows_count, \
-            col_input_const->getDataAt(0), \
-            col_replace_string->getChars(), \
-            col_replace_string->getOffsets(), \
-            col_offset, \
-            col_length, \
-            offset, \
-            length, \
-            res_data, \
-            res_offsets); \
-    else if (!input_is_const && replace_is_const) \
-        vectorConstant<HAS_FOUR_ARGS, OFFSET_IS_CONST, LENGTH_IS_CONST>( \
-            input_rows_count, \
-            col_input_string->getChars(), \
-            col_input_string->getOffsets(), \
-            col_replace_const->getDataAt(0), \
-            col_offset, \
-            col_length, \
-            offset, \
-            length, \
-            res_data, \
-            res_offsets); \
-    else \
-        vectorVector<HAS_FOUR_ARGS, OFFSET_IS_CONST, LENGTH_IS_CONST>( \
-            input_rows_count, \
-            col_input_string->getChars(), \
-            col_input_string->getOffsets(), \
-            col_replace_string->getChars(), \
-            col_replace_string->getOffsets(), \
-            col_offset, \
-            col_length, \
-            offset, \
-            length, \
-            res_data, \
-            res_offsets);
-
-        if (!has_four_args)
-        {
-            if (offset_is_const)
-            {
-                OVERLAY_EXECUTE_CASE(false, true, false)
-            }
-            else
-            {
-                OVERLAY_EXECUTE_CASE(false, false, false)
-            }
-        }
-        else
-        {
-            if (offset_is_const && length_is_const)
-            {
-                OVERLAY_EXECUTE_CASE(true, true, true)
-            }
-            else if (offset_is_const && !length_is_const)
-            {
-                OVERLAY_EXECUTE_CASE(true, true, false)
-            }
-            else if (!offset_is_const && length_is_const)
-            {
-                OVERLAY_EXECUTE_CASE(true, false, true)
-            }
-            else
-            {
-                OVERLAY_EXECUTE_CASE(true, false, false)
-            }
-        }
-#undef OVERLAY_EXECUTE_CASE
-
-        return res_col;
-    }
-
-private:
-    /// input offset is 1-based, maybe negative
-    /// output result is 0-based valid offset, within [0, input_size]
-    static size_t getValidOffset(Int64 offset, size_t input_size)
-    {
-        if (offset > 0)
-        {
-            if (static_cast<size_t>(offset) > input_size + 1)
-                return input_size;
-            else
-                return offset - 1;
-        }
-        else
-        {
-            if (input_size < -static_cast<size_t>(offset))
-                return 0;
-            else
-                return input_size + offset;
-        }
-    }
-
-    /// get character count of a slice [data, data+bytes)
-    static size_t getSliceSize(const UInt8 * data, size_t bytes)
-    {
-        if constexpr (is_utf8)
-            return UTF8::countCodePoints(data, bytes);
-        else
-            return bytes;
-    }
-
-    template <bool has_four_args, bool offset_is_const, bool length_is_const>
-    void constantConstant(
-        size_t rows,
-        const StringRef & input,
-        const StringRef & replace,
-        const ColumnPtr & column_offset,
-        const ColumnPtr & column_length,
-        Int64 const_offset,
-        Int64 const_length,
-        ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets) const
-    {
-        /// Free us from handling negative length in the code below
-        if (has_four_args && length_is_const && const_length < 0)
-        {
-            constantConstant<true, offset_is_const, false>(
-                rows, input, replace, column_offset, column_length, const_offset, -1, res_data, res_offsets);
-            return;
-        }
-
-        size_t input_size = getSliceSize(reinterpret_cast<const UInt8 *>(input.data), input.size);
-        size_t valid_offset = 0; // start from 0, not negative
-        if constexpr (offset_is_const)
-            valid_offset = getValidOffset(const_offset, input_size);
-
-        size_t replace_size = getSliceSize(reinterpret_cast<const UInt8 *>(replace.data), replace.size);
-        size_t valid_length = 0; // not negative
-        if constexpr (has_four_args && length_is_const)
-        {
-            assert(const_length >= 0);
-            valid_length = const_length;
-        }
-        else if constexpr (!has_four_args)
-        {
-            valid_length = replace_size;
-        }
-
-        Int64 offset = 0; // start from 1, maybe negative
-        Int64 length = 0; // maybe negative
-        const UInt8 * input_begin = reinterpret_cast<const UInt8 *>(input.data);
-        const UInt8 * input_end = reinterpret_cast<const UInt8 *>(input.data + input.size);
-        size_t res_offset = 0;
-        for (size_t i = 0; i < rows; ++i)
-        {
-            if constexpr (!offset_is_const)
-            {
-                offset = column_offset->getInt(i);
-                valid_offset = getValidOffset(offset, input_size);
-            }
-
-            if constexpr (has_four_args && !length_is_const)
-            {
-                length = column_length->getInt(i);
-                valid_length = length >= 0 ? length : replace_size;
-            }
-
-            size_t prefix_size = valid_offset;
-            size_t suffix_size = (prefix_size + valid_length > input_size) ? 0 : (input_size - prefix_size - valid_length);
-
-            if constexpr (!is_utf8)
-            {
-                size_t new_res_size = res_data.size() + prefix_size + replace_size + suffix_size + 1; /// +1 for zero terminator
-                res_data.resize(new_res_size);
-
-                /// copy prefix before replaced region
-                memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], input.data, prefix_size);
-                res_offset += prefix_size;
-
-                /// copy replace
-                memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], replace.data, replace_size);
-                res_offset += replace_size;
-
-                /// copy suffix after replaced region. It is not necessary to copy if suffix_size is zero.
-                if (suffix_size)
-                {
-                    memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], input.data + prefix_size + valid_length, suffix_size);
-                    res_offset += suffix_size;
-                }
-            }
-            else
-            {
-                const auto * prefix_end = GatherUtils::UTF8StringSource::skipCodePointsForward(input_begin, prefix_size, input_end);
-                size_t prefix_bytes = prefix_end > input_end ? input.size : prefix_end - input_begin;
-
-                const auto * suffix_begin = GatherUtils::UTF8StringSource::skipCodePointsBackward(input_end, suffix_size, input_begin);
-                size_t suffix_bytes = input_end - suffix_begin;
-
-                size_t new_res_size = res_data.size() + prefix_bytes + replace.size + suffix_bytes + 1; /// +1 for zero terminator
-                res_data.resize(new_res_size);
-
-                /// copy prefix before replaced region
-                memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], input_begin, prefix_bytes);
-                res_offset += prefix_bytes;
-
-                /// copy replace
-                memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], replace.data, replace.size);
-                res_offset += replace.size;
-
-                /// copy suffix after replaced region. It is not necessary to copy if suffix_bytes is zero.
-                if (suffix_bytes)
-                {
-                    memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], suffix_begin, suffix_bytes);
-                    res_offset += suffix_bytes;
-                }
-            }
-
-            /// add zero terminator
-            res_data[res_offset] = 0;
-            ++res_offset;
-
-            res_offsets[i] = res_offset;
-        }
-    }
-
-    template <bool has_four_args, bool offset_is_const, bool length_is_const>
-    void vectorConstant(
-        size_t rows,
-        const ColumnString::Chars & input_data,
-        const ColumnString::Offsets & input_offsets,
-        const StringRef & replace,
-        const ColumnPtr & column_offset,
-        const ColumnPtr & column_length,
-        Int64 const_offset,
-        Int64 const_length,
-        ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets) const
-    {
-        /// Free us from handling negative length in the code below
-        if (has_four_args && length_is_const && const_length < 0)
-        {
-            vectorConstant<true, offset_is_const, false>(
-                rows, input_data, input_offsets, replace, column_offset, column_length, const_offset, -1, res_data, res_offsets);
-            return;
-        }
-
-        size_t replace_size = getSliceSize(reinterpret_cast<const UInt8 *>(replace.data), replace.size);
-        Int64 length = 0; // maybe negative
-        size_t valid_length = 0; // not negative
-        if constexpr (has_four_args && length_is_const)
-        {
-            assert(const_length >= 0);
-            valid_length = const_length;
-        }
-        else if constexpr (!has_four_args)
-        {
-            valid_length = replace_size;
-        }
-
-        Int64 offset = 0; // start from 1, maybe negative
-        size_t valid_offset = 0; // start from 0, not negative
-        size_t res_offset = 0;
-        for (size_t i = 0; i < rows; ++i)
-        {
-            size_t input_offset = input_offsets[i - 1];
-            size_t input_bytes = input_offsets[i] - input_offsets[i - 1] - 1;
-            size_t input_size = getSliceSize(&input_data[input_offset], input_bytes);
-
-            if constexpr (offset_is_const)
-            {
-                valid_offset = getValidOffset(const_offset, input_size);
-            }
-            else
-            {
-                offset = column_offset->getInt(i);
-                valid_offset = getValidOffset(offset, input_size);
-            }
-
-            if constexpr (has_four_args && !length_is_const)
-            {
-                length = column_length->getInt(i);
-                valid_length = length >= 0 ? length : replace_size;
-            }
-
-            size_t prefix_size = valid_offset;
-            size_t suffix_size = (prefix_size + valid_length > input_size) ? 0 : (input_size - prefix_size - valid_length);
-
-            if constexpr (!is_utf8)
-            {
-                size_t new_res_size = res_data.size() + prefix_size + replace_size + suffix_size + 1; /// +1 for zero terminator
-                res_data.resize(new_res_size);
-
-                /// copy prefix before replaced region
-                memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], &input_data[input_offset], prefix_size);
-                res_offset += prefix_size;
-
-                /// copy replace
-                memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], replace.data, replace_size);
-                res_offset += replace_size;
-
-                /// copy suffix after replaced region. It is not necessary to copy if suffix_size is zero.
-                if (suffix_size)
-                {
-                    memcpySmallAllowReadWriteOverflow15(
-                        &res_data[res_offset], &input_data[input_offset + prefix_size + valid_length], suffix_size);
-                    res_offset += suffix_size;
-                }
-            }
-            else
-            {
-                const auto * input_begin = &input_data[input_offset];
-                const auto * input_end = &input_data[input_offset + input_bytes];
-                const auto * prefix_end = GatherUtils::UTF8StringSource::skipCodePointsForward(input_begin, prefix_size, input_end);
-                size_t prefix_bytes = prefix_end > input_end ? input_bytes : prefix_end - input_begin;
-                const auto * suffix_begin = GatherUtils::UTF8StringSource::skipCodePointsBackward(input_end, suffix_size, input_begin);
-                size_t suffix_bytes = input_end - suffix_begin;
-
-                size_t new_res_size = res_data.size() + prefix_bytes + replace.size + suffix_bytes + 1; /// +1 for zero terminator
-                res_data.resize(new_res_size);
-
-                /// copy prefix before replaced region
-                memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], &input_data[input_offset], prefix_bytes);
-                res_offset += prefix_bytes;
-
-                /// copy replace
-                memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], replace.data, replace.size);
-                res_offset += replace.size;
-
-                /// copy suffix after replaced region. It is not necessary to copy if suffix_bytes is zero.
-                if (suffix_bytes)
-                {
-                    memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], suffix_begin, suffix_bytes);
-                    res_offset += suffix_bytes;
-                }
-            }
-
-            /// add zero terminator
-            res_data[res_offset] = 0;
-            ++res_offset;
-
-            res_offsets[i] = res_offset;
-        }
-    }
-
-    template <bool has_four_args, bool offset_is_const, bool length_is_const>
-    void constantVector(
-        size_t rows,
-        const StringRef & input,
-        const ColumnString::Chars & replace_data,
-        const ColumnString::Offsets & replace_offsets,
-        const ColumnPtr & column_offset,
-        const ColumnPtr & column_length,
-        Int64 const_offset,
-        Int64 const_length,
-        ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets) const
-    {
-        /// Free us from handling negative length in the code below
-        if (has_four_args && length_is_const && const_length < 0)
-        {
-            constantVector<true, offset_is_const, false>(
-                rows, input, replace_data, replace_offsets, column_offset, column_length, const_offset, -1, res_data, res_offsets);
-            return;
-        }
-
-        size_t input_size = getSliceSize(reinterpret_cast<const UInt8 *>(input.data), input.size);
-        size_t valid_offset = 0; // start from 0, not negative
-        if constexpr (offset_is_const)
-            valid_offset = getValidOffset(const_offset, input_size);
-
-        Int64 length = 0; // maybe negative
-        size_t valid_length = 0; // not negative
-        if constexpr (has_four_args && length_is_const)
-        {
-            assert(const_length >= 0);
-            valid_length = const_length;
-        }
-
-        const auto * input_begin = reinterpret_cast<const UInt8 *>(input.data);
-        const auto * input_end = reinterpret_cast<const UInt8 *>(input.data + input.size);
-        Int64 offset = 0; // start from 1, maybe negative
-        size_t res_offset = 0;
-        for (size_t i = 0; i < rows; ++i)
-        {
-            size_t replace_offset = replace_offsets[i - 1];
-            size_t replace_bytes = replace_offsets[i] - replace_offsets[i - 1] - 1;
-            size_t replace_size = getSliceSize(&replace_data[replace_offset], replace_bytes);
-
-            if constexpr (!offset_is_const)
-            {
-                offset = column_offset->getInt(i);
-                valid_offset = getValidOffset(offset, input_size);
-            }
-
-            if constexpr (!has_four_args)
-            {
-                valid_length = replace_size;
-            }
-            else if constexpr (!length_is_const)
-            {
-                length = column_length->getInt(i);
-                valid_length = length >= 0 ? length : replace_size;
-            }
-
-            size_t prefix_size = valid_offset;
-            size_t suffix_size = (prefix_size + valid_length > input_size) ? 0 : (input_size - prefix_size - valid_length);
-
-            if constexpr (!is_utf8)
-            {
-                size_t new_res_size = res_data.size() + prefix_size + replace_size + suffix_size + 1; /// +1 for zero terminator
-                res_data.resize(new_res_size);
-
-                /// copy prefix before replaced region
-                memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], input.data, prefix_size);
-                res_offset += prefix_size;
-
-                /// copy replace
-                memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], &replace_data[replace_offset], replace_size);
-                res_offset += replace_size;
-
-                /// copy suffix after replaced region. It is not necessary to copy if suffix_size is zero.
-                if (suffix_size)
-                {
-                    memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], input.data + prefix_size + valid_length, suffix_size);
-                    res_offset += suffix_size;
-                }
-            }
-            else
-            {
-                const auto * prefix_end = GatherUtils::UTF8StringSource::skipCodePointsForward(input_begin, prefix_size, input_end);
-                size_t prefix_bytes = prefix_end > input_end ? input.size : prefix_end - input_begin;
-                const auto * suffix_begin = GatherUtils::UTF8StringSource::skipCodePointsBackward(input_end, suffix_size, input_begin);
-                size_t suffix_bytes = input_end - suffix_begin;
-                size_t new_res_size = res_data.size() + prefix_bytes + replace_bytes + suffix_bytes + 1; /// +1 for zero terminator
-                res_data.resize(new_res_size);
-
-                /// copy prefix before replaced region
-                memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], input_begin, prefix_bytes);
-                res_offset += prefix_bytes;
-
-                /// copy replace
-                memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], &replace_data[replace_offset], replace_bytes);
-                res_offset += replace_bytes;
-
-                /// copy suffix after replaced region. It is not necessary to copy if suffix_bytes is zero
-                if (suffix_bytes)
-                {
-                    memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], suffix_begin, suffix_bytes);
-                    res_offset += suffix_bytes;
-                }
-            }
-
-            /// add zero terminator
-            res_data[res_offset] = 0;
-            ++res_offset;
-
-            res_offsets[i] = res_offset;
-        }
-    }
-
-    template <bool has_four_args, bool offset_is_const, bool length_is_const>
-    void vectorVector(
-        size_t rows,
-        const ColumnString::Chars & input_data,
-        const ColumnString::Offsets & input_offsets,
-        const ColumnString::Chars & replace_data,
-        const ColumnString::Offsets & replace_offsets,
-        const ColumnPtr & column_offset,
-        const ColumnPtr & column_length,
-        Int64 const_offset,
-        Int64 const_length,
-        ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets) const
-    {
-        /// Free us from handling negative length in the code below
-        if (has_four_args && length_is_const && const_length < 0)
-        {
-            vectorVector<true, offset_is_const, false>(
-                rows,
-                input_data,
-                input_offsets,
-                replace_data,
-                replace_offsets,
-                column_offset,
-                column_length,
-                const_offset,
-                -1,
-                res_data,
-                res_offsets);
-            return;
-        }
-
-        Int64 length = 0; // maybe negative
-        size_t valid_length = 0; // not negative
-        if constexpr (has_four_args && length_is_const)
-        {
-            assert(const_length >= 0);
-            valid_length = const_length;
-        }
-
-        Int64 offset = 0; // start from 1, maybe negative
-        size_t valid_offset = 0; // start from 0, not negative
-        size_t res_offset = 0;
-        for (size_t i = 0; i < rows; ++i)
-        {
-            size_t input_offset = input_offsets[i - 1];
-            size_t input_bytes = input_offsets[i] - input_offsets[i - 1] - 1;
-            size_t input_size = getSliceSize(&input_data[input_offset], input_bytes);
-
-            size_t replace_offset = replace_offsets[i - 1];
-            size_t replace_bytes = replace_offsets[i] - replace_offsets[i - 1] - 1;
-            size_t replace_size = getSliceSize(&replace_data[replace_offset], replace_bytes);
-
-            if constexpr (offset_is_const)
-            {
-                valid_offset = getValidOffset(const_offset, input_size);
-            }
-            else
-            {
-                offset = column_offset->getInt(i);
-                valid_offset = getValidOffset(offset, input_size);
-            }
-
-            if constexpr (!has_four_args)
-            {
-                valid_length = replace_size;
-            }
-            else if constexpr (!length_is_const)
-            {
-                length = column_length->getInt(i);
-                valid_length = length >= 0 ? length : replace_size;
-            }
-
-            size_t prefix_size = valid_offset;
-            size_t suffix_size = (prefix_size + valid_length > input_size) ? 0 : (input_size - prefix_size - valid_length);
-
-            if constexpr (!is_utf8)
-            {
-                size_t new_res_size = res_data.size() + prefix_size + replace_size + suffix_size + 1; /// +1 for zero terminator
-                res_data.resize(new_res_size);
-
-                /// copy prefix before replaced region
-                memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], &input_data[input_offset], prefix_size);
-                res_offset += prefix_size;
-
-                /// copy replace
-                memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], &replace_data[replace_offset], replace_size);
-                res_offset += replace_size;
-
-                /// copy suffix after replaced region. It is not necessary to copy if suffix_size is zero.
-                if (suffix_size)
-                {
-                    memcpySmallAllowReadWriteOverflow15(
-                        &res_data[res_offset], &input_data[input_offset + prefix_size + valid_length], suffix_size);
-                    res_offset += suffix_size;
-                }
-            }
-            else
-            {
-                const auto * input_begin = &input_data[input_offset];
-                const auto * input_end = &input_data[input_offset + input_bytes];
-                const auto * prefix_end = GatherUtils::UTF8StringSource::skipCodePointsForward(input_begin, prefix_size, input_end);
-                size_t prefix_bytes = prefix_end > input_end ? input_bytes : prefix_end - input_begin;
-                const auto * suffix_begin = GatherUtils::UTF8StringSource::skipCodePointsBackward(input_end, suffix_size, input_begin);
-                size_t suffix_bytes = input_end - suffix_begin;
-                size_t new_res_size = res_data.size() + prefix_bytes + replace_bytes + suffix_bytes + 1; /// +1 for zero terminator
-                res_data.resize(new_res_size);
-
-                /// copy prefix before replaced region
-                memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], input_begin, prefix_bytes);
-                res_offset += prefix_bytes;
-
-                /// copy replace
-                memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], &replace_data[replace_offset], replace_bytes);
-                res_offset += replace_bytes;
-
-                /// copy suffix after replaced region. It is not necessary to copy if suffix_bytes is zero.
-                if (suffix_bytes)
-                {
-                    memcpySmallAllowReadWriteOverflow15(&res_data[res_offset], suffix_begin, suffix_bytes);
-                    res_offset += suffix_bytes;
-                }
-            }
-
-            /// add zero terminator
-            res_data[res_offset] = 0;
-            ++res_offset;
-
-            res_offsets[i] = res_offset;
-        }
-    }
-};
-
-}
-
-REGISTER_FUNCTION(Overlay)
-{
-    factory.registerFunction<FunctionOverlay<false>>(
-        {.description = R"(
-Replace a part of a string `input` with another string `replace`, starting at 1-based index `offset`. By default, the number of bytes removed from `input` equals the length of `replace`. If `length` (the optional fourth argument) is specified, a different number of bytes is removed.
-)",
-         .categories{"String"}},
-        FunctionFactory::Case::Insensitive);
-
-    factory.registerFunction<FunctionOverlay<true>>(
-        {.description = R"(
-Replace a part of a string `input` with another string `replace`, starting at 1-based index `offset`. By default, the number of characters removed from `input` equals the length of `replace`. If `length` (the optional fourth argument) is specified, a different number of characters is removed.
-
-Assumes that the string contains valid UTF-8 encoded text. If this assumption is violated, no exception is thrown and the result is undefined.
-)",
-         .categories{"String"}},
-        FunctionFactory::Case::Sensitive);
-}
-}
diff --git a/src/Functions/parseDateTime.cpp b/src/Functions/parseDateTime.cpp
index 7ca10677be7..bdca0151bba 100644
--- a/src/Functions/parseDateTime.cpp
+++ b/src/Functions/parseDateTime.cpp
@@ -582,11 +582,11 @@ namespace
         DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
         {
             FunctionArgumentDescriptors mandatory_args{
-                {"time", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"}
+                {"time", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"},
+                {"format", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"}
             };
 
             FunctionArgumentDescriptors optional_args{
-                {"format", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"},
                 {"timezone", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), &isColumnConst, "const String"}
             };
 
@@ -2029,24 +2029,14 @@ namespace
 
         String getFormat(const ColumnsWithTypeAndName & arguments) const
         {
-            if (arguments.size() == 1)
-            {
-                if constexpr (parse_syntax == ParseSyntax::MySQL)
-                    return "%Y-%m-%d %H:%i:%s";
-                else
-                    return "yyyy-MM-dd HH:mm:ss";
-            }
-            else
-            {
-                const auto * col_format = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
-                if (!col_format)
-                    throw Exception(
-                        ErrorCodes::ILLEGAL_COLUMN,
-                        "Illegal column {} of second ('format') argument of function {}. Must be constant string.",
-                        arguments[1].column->getName(),
-                        getName());
-                return col_format->getValue<String>();
-            }
+            const auto * format_column = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
+            if (!format_column)
+                throw Exception(
+                    ErrorCodes::ILLEGAL_COLUMN,
+                    "Illegal column {} of second ('format') argument of function {}. Must be constant string.",
+                    arguments[1].column->getName(),
+                    getName());
+            return format_column->getValue<String>();
         }
 
         const DateLUTImpl & getTimeZone(const ColumnsWithTypeAndName & arguments) const
diff --git a/src/Functions/parseReadableSize.cpp b/src/Functions/parseReadableSize.cpp
index 4f6afb939a5..1abcf7f164f 100644
--- a/src/Functions/parseReadableSize.cpp
+++ b/src/Functions/parseReadableSize.cpp
@@ -217,10 +217,7 @@ private:
         }
 
         Float64 num_bytes_with_decimals = base * iter->second;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wimplicit-const-int-float-conversion"
         if (num_bytes_with_decimals > std::numeric_limits<UInt64>::max())
-#pragma clang diagnostic pop
         {
             throw Exception(
                 ErrorCodes::BAD_ARGUMENTS,
diff --git a/src/Functions/pointInEllipses.cpp b/src/Functions/pointInEllipses.cpp
index ac7a8cc4204..2147428cee3 100644
--- a/src/Functions/pointInEllipses.cpp
+++ b/src/Functions/pointInEllipses.cpp
@@ -91,6 +91,8 @@ private:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
+        const auto size = input_rows_count;
+
         /// Prepare array of ellipses.
         size_t ellipses_count = (arguments.size() - 2) / 4;
         std::vector<Ellipse> ellipses(ellipses_count);
@@ -139,11 +141,13 @@ private:
 
                 auto dst = ColumnVector<UInt8>::create();
                 auto & dst_data = dst->getData();
-                dst_data.resize(input_rows_count);
+                dst_data.resize(size);
 
                 size_t start_index = 0;
-                for (size_t row = 0; row < input_rows_count; ++row)
+                for (const auto row : collections::range(0, size))
+                {
                     dst_data[row] = isPointInEllipses(col_vec_x->getData()[row], col_vec_y->getData()[row], ellipses.data(), ellipses_count, start_index);
+                }
 
                 return dst;
         }
@@ -153,7 +157,7 @@ private:
             const auto * col_const_y = assert_cast<const ColumnConst *> (col_y);
             size_t start_index = 0;
             UInt8 res = isPointInEllipses(col_const_x->getValue<Float64>(), col_const_y->getValue<Float64>(), ellipses.data(), ellipses_count, start_index);
-            return DataTypeUInt8().createColumnConst(input_rows_count, res);
+            return DataTypeUInt8().createColumnConst(size, res);
         }
         else
         {
diff --git a/src/Functions/polygonsIntersection.cpp b/src/Functions/polygonsIntersection.cpp
index 43ab03f8c1f..329242e762e 100644
--- a/src/Functions/polygonsIntersection.cpp
+++ b/src/Functions/polygonsIntersection.cpp
@@ -75,8 +75,6 @@ public:
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Any argument of function {} must not be Point", getName());
             else if constexpr (std::is_same_v<ColumnToLineStringsConverter<Point>, LeftConverter> || std::is_same_v<ColumnToLineStringsConverter<Point>, RightConverter>)
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Any argument of function {} must not be LineString", getName());
-            else if constexpr (std::is_same_v<ColumnToMultiLineStringsConverter<Point>, LeftConverter> || std::is_same_v<ColumnToMultiLineStringsConverter<Point>, RightConverter>)
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Any argument of function {} must not be MultiLineString", getName());
             else
             {
                 auto first = LeftConverter::convert(arguments[0].column->convertToFullColumnIfConst());
diff --git a/src/Functions/polygonsSymDifference.cpp b/src/Functions/polygonsSymDifference.cpp
index 6faec95bb7b..3c219d0facb 100644
--- a/src/Functions/polygonsSymDifference.cpp
+++ b/src/Functions/polygonsSymDifference.cpp
@@ -73,8 +73,6 @@ public:
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Any argument of function {} must not be Point", getName());
             else if constexpr (std::is_same_v<ColumnToLineStringsConverter<Point>, LeftConverter> || std::is_same_v<ColumnToLineStringsConverter<Point>, RightConverter>)
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Any argument of function {} must not be LineString", getName());
-            else if constexpr (std::is_same_v<ColumnToMultiLineStringsConverter<Point>, LeftConverter> || std::is_same_v<ColumnToMultiLineStringsConverter<Point>, RightConverter>)
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Any argument of function {} must not be MultiLineString", getName());
             else
             {
                 auto first = LeftConverter::convert(arguments[0].column->convertToFullColumnIfConst());
diff --git a/src/Functions/polygonsUnion.cpp b/src/Functions/polygonsUnion.cpp
index 5378ff636f8..969eb2f78fb 100644
--- a/src/Functions/polygonsUnion.cpp
+++ b/src/Functions/polygonsUnion.cpp
@@ -73,8 +73,6 @@ public:
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Any argument of function {} must not be Point", getName());
             else if constexpr (std::is_same_v<ColumnToLineStringsConverter<Point>, LeftConverter> || std::is_same_v<ColumnToLineStringsConverter<Point>, RightConverter>)
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Any argument of function {} must not be LineString", getName());
-            else if constexpr (std::is_same_v<ColumnToMultiLineStringsConverter<Point>, LeftConverter> || std::is_same_v<ColumnToMultiLineStringsConverter<Point>, RightConverter>)
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Any argument of function {} must not be MultiLineString", getName());
             else
             {
                 auto first = LeftConverter::convert(arguments[0].column->convertToFullColumnIfConst());
diff --git a/src/Functions/polygonsWithin.cpp b/src/Functions/polygonsWithin.cpp
index dacd1c0e18f..c63ad5ef868 100644
--- a/src/Functions/polygonsWithin.cpp
+++ b/src/Functions/polygonsWithin.cpp
@@ -77,8 +77,6 @@ public:
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Any argument of function {} must not be Point", getName());
             else if constexpr (std::is_same_v<ColumnToLineStringsConverter<Point>, LeftConverter> || std::is_same_v<ColumnToLineStringsConverter<Point>, RightConverter>)
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Any argument of function {} must not be LineString", getName());
-            else if constexpr (std::is_same_v<ColumnToMultiLineStringsConverter<Point>, LeftConverter> || std::is_same_v<ColumnToMultiLineStringsConverter<Point>, RightConverter>)
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Any argument of function {} must not be MultiLineString", getName());
             else
             {
                 auto first = LeftConverter::convert(arguments[0].column->convertToFullColumnIfConst());
diff --git a/src/Functions/printf.cpp b/src/Functions/printf.cpp
deleted file mode 100644
index 3cf3efaf534..00000000000
--- a/src/Functions/printf.cpp
+++ /dev/null
@@ -1,364 +0,0 @@
-#include <Columns/ColumnFixedString.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnStringHelpers.h>
-#include <DataTypes/DataTypeString.h>
-#include <Functions/FunctionFactory.h>
-#include <Functions/FunctionHelpers.h>
-#include <Functions/IFunction.h>
-#include <Functions/formatString.h>
-#include <IO/Operators.h>
-#include <IO/WriteHelpers.h>
-
-#include <memory>
-#include <vector>
-#include <fmt/format.h>
-#include <fmt/printf.h>
-
-namespace DB
-{
-namespace ErrorCodes
-{
-extern const int ILLEGAL_COLUMN;
-extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-extern const int BAD_ARGUMENTS;
-}
-
-namespace
-{
-
-class FunctionPrintf : public IFunction
-{
-private:
-    ContextPtr context;
-    FunctionOverloadResolverPtr function_concat;
-
-    struct Instruction
-    {
-        std::string_view format;
-        size_t rows;
-        bool is_literal; /// format is literal string without any argument
-        ColumnWithTypeAndName input; /// Only used when is_literal is false
-
-        ColumnWithTypeAndName execute() const
-        {
-            if (is_literal)
-                return executeLiteral(format);
-            else if (isColumnConst(*input.column))
-                return executeConstant(input);
-            else
-                return executeNonconstant(input);
-        }
-
-        [[maybe_unused]] String toString() const
-        {
-            WriteBufferFromOwnString buf;
-            buf << "format:" << format << ", rows:" << rows << ", is_literal:" << is_literal << ", input:" << input.dumpStructure() << "\n";
-            return buf.str();
-        }
-
-    private:
-        ColumnWithTypeAndName executeLiteral(std::string_view literal) const
-        {
-            ColumnWithTypeAndName res;
-            auto str_col = ColumnString::create();
-            str_col->insert(fmt::sprintf(literal));
-            res.column = ColumnConst::create(std::move(str_col), rows);
-            res.type = std::make_shared<DataTypeString>();
-            return res;
-        }
-
-        ColumnWithTypeAndName executeConstant(const ColumnWithTypeAndName & arg) const
-        {
-            ColumnWithTypeAndName tmp_arg = arg;
-            const auto & const_col = static_cast<const ColumnConst &>(*arg.column);
-            tmp_arg.column = const_col.getDataColumnPtr();
-
-            ColumnWithTypeAndName tmp_res = executeNonconstant(tmp_arg);
-            return ColumnWithTypeAndName{ColumnConst::create(tmp_res.column, arg.column->size()), tmp_res.type, tmp_res.name};
-        }
-
-        template <typename T>
-        bool executeNumber(const IColumn & column, ColumnString::Chars & res_chars, ColumnString::Offsets & res_offsets) const
-        {
-            const ColumnVector<T> * concrete_column = checkAndGetColumn<ColumnVector<T>>(&column);
-            if (!concrete_column)
-                return false;
-
-            String s;
-            size_t curr_offset = 0;
-            const auto & data = concrete_column->getData();
-            for (size_t i = 0; i < data.size(); ++i)
-            {
-                T a = data[i];
-                s = fmt::sprintf(format, static_cast<NearestFieldType<T>>(a));
-
-                res_chars.resize(curr_offset + s.size() + 1);
-                memcpy(&res_chars[curr_offset], s.data(), s.size());
-                res_chars[curr_offset + s.size()] = 0;
-
-                curr_offset += s.size() + 1;
-                res_offsets[i] = curr_offset;
-            }
-            return true;
-        }
-
-        template <typename COLUMN>
-        bool executeString(const IColumn & column, ColumnString::Chars & res_chars, ColumnString::Offsets & res_offsets) const
-        {
-            const COLUMN * concrete_column = checkAndGetColumn<COLUMN>(&column);
-            if (!concrete_column)
-                return false;
-
-            String s;
-            size_t curr_offset = 0;
-            for (size_t i = 0; i < concrete_column->size(); ++i)
-            {
-                auto a = concrete_column->getDataAt(i).toView();
-                s = fmt::sprintf(format, a);
-
-                res_chars.resize(curr_offset + s.size() + 1);
-                memcpy(&res_chars[curr_offset], s.data(), s.size());
-                res_chars[curr_offset + s.size()] = 0;
-
-                curr_offset += s.size() + 1;
-                res_offsets[i] = curr_offset;
-            }
-            return true;
-        }
-
-        ColumnWithTypeAndName executeNonconstant(const ColumnWithTypeAndName & arg) const
-        {
-            size_t size = arg.column->size();
-            auto res_col = ColumnString::create();
-            auto & res_str = static_cast<ColumnString &>(*res_col);
-            auto & res_offsets = res_str.getOffsets();
-            auto & res_chars = res_str.getChars();
-            res_offsets.resize_exact(size);
-            res_chars.reserve(format.size() * size);
-
-            WhichDataType which(arg.type);
-            if (which.isNativeNumber()
-                && (executeNumber<UInt8>(*arg.column, res_chars, res_offsets) || executeNumber<UInt16>(*arg.column, res_chars, res_offsets)
-                    || executeNumber<UInt32>(*arg.column, res_chars, res_offsets)
-                    || executeNumber<UInt64>(*arg.column, res_chars, res_offsets)
-                    || executeNumber<Int8>(*arg.column, res_chars, res_offsets) || executeNumber<Int16>(*arg.column, res_chars, res_offsets)
-                    || executeNumber<Int32>(*arg.column, res_chars, res_offsets)
-                    || executeNumber<Int64>(*arg.column, res_chars, res_offsets)
-                    || executeNumber<Float32>(*arg.column, res_chars, res_offsets)
-                    || executeNumber<Float64>(*arg.column, res_chars, res_offsets)))
-            {
-                return {std::move(res_col), std::make_shared<DataTypeString>(), arg.name};
-            }
-            else if (
-                which.isStringOrFixedString()
-                && (executeString<ColumnString>(*arg.column, res_chars, res_offsets)
-                    || executeString<ColumnFixedString>(*arg.column, res_chars, res_offsets)))
-            {
-                return {std::move(res_col), std::make_shared<DataTypeString>(), arg.name};
-            }
-            else
-                throw Exception(
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "The argument type of function {} is {}, but native numeric or string type is expected",
-                    FunctionPrintf::name,
-                    arg.type->getName());
-        }
-    };
-
-public:
-    static constexpr auto name = "printf";
-
-    static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionPrintf>(context); }
-
-    explicit FunctionPrintf(ContextPtr context_)
-        : context(context_), function_concat(FunctionFactory::instance().get("concat", context)) { }
-
-    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 false; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
-    {
-        if (arguments.empty())
-            throw Exception(
-                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                "Number of arguments for function {} doesn't match: passed {}, should be at least 1",
-                getName(),
-                arguments.size());
-
-        /// First pattern argument must have string type
-        if (!isString(arguments[0]))
-            throw Exception(
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "The first argument type of function {} is {}, but String type is expected",
-                getName(),
-                arguments[0]->getName());
-
-        for (size_t i = 1; i < arguments.size(); ++i)
-        {
-            if (!isNativeNumber(arguments[i]) && !isStringOrFixedString(arguments[i]))
-                throw Exception(
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "The {}-th argument type of function {} is {}, but native numeric or string type is expected",
-                    i + 1,
-                    getName(),
-                    arguments[i]->getName());
-        }
-        return std::make_shared<DataTypeString>();
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
-    {
-        const ColumnPtr & c0 = arguments[0].column;
-        const ColumnConst * c0_const_string = typeid_cast<const ColumnConst *>(&*c0);
-        if (!c0_const_string)
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "First argument of function {} must be constant string", getName());
-
-        String format = c0_const_string->getValue<String>();
-        auto instructions = buildInstructions(format, arguments, input_rows_count);
-
-        ColumnsWithTypeAndName concat_args(instructions.size());
-        for (size_t i = 0; i < instructions.size(); ++i)
-        {
-            const auto & instruction = instructions[i];
-            try
-            {
-                // std::cout << "instruction[" << i << "]:" << instructions[i].toString() << std::endl;
-                concat_args[i] = instruction.execute();
-                // std::cout << "concat_args[" << i << "]:" << concat_args[i].dumpStructure() << std::endl;
-            }
-            catch (const fmt::v9::format_error & e)
-            {
-                if (instruction.is_literal)
-                    throw Exception(
-                        ErrorCodes::BAD_ARGUMENTS,
-                        "Bad format {} in function {} without input argument, reason: {}",
-                        instruction.format,
-                        getName(),
-                        e.what());
-                else
-                    throw Exception(
-                        ErrorCodes::BAD_ARGUMENTS,
-                        "Bad format {} in function {} with {} as input argument, reason: {}",
-                        instructions[i].format,
-                        getName(),
-                        instruction.input.dumpStructure(),
-                        e.what());
-            }
-        }
-
-        auto res = function_concat->build(concat_args)->execute(concat_args, std::make_shared<DataTypeString>(), input_rows_count);
-        return res;
-    }
-
-private:
-    std::vector<Instruction>
-    buildInstructions(const String & format, const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
-    {
-        std::vector<Instruction> instructions;
-        instructions.reserve(arguments.size());
-
-        auto append_instruction = [&](const char * begin, const char * end, const ColumnWithTypeAndName & arg)
-        {
-            Instruction instr;
-            instr.rows = input_rows_count;
-            instr.format = std::string_view(begin, end - begin);
-
-            size_t size = end - begin;
-            if (size > 1 && begin[0] == '%' and begin[1] != '%')
-            {
-                instr.is_literal = false;
-                instr.input = arg;
-            }
-            else
-            {
-                instr.is_literal = true;
-            }
-            instructions.emplace_back(std::move(instr));
-        };
-
-        auto check_index_range = [&](size_t idx)
-        {
-            if (idx >= arguments.size())
-                throw Exception(
-                    ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                    "Number of arguments for function {} doesn't match: passed {}, but format is {}",
-                    getName(),
-                    arguments.size(),
-                    format);
-        };
-
-        const char * begin = format.data();
-        const char * end = format.data() + format.size();
-        const char * curr = begin;
-        size_t idx = 0;
-        while (curr < end)
-        {
-            const char * tmp = curr;
-            bool is_first = curr == begin; /// If current instruction is the first one
-            bool is_literal = false; /// If current instruction is literal string without any argument
-            if (is_first)
-            {
-                if (*curr != '%')
-                    is_literal = true;
-                else if (curr + 1 < end && *(curr + 1) == '%')
-                    is_literal = true;
-                else
-                    ++idx; /// Skip first argument if first instruction is not literal
-            }
-
-            if (!is_literal)
-                ++curr;
-
-            while (curr < end)
-            {
-                if (*curr != '%')
-                    ++curr;
-                else if (curr + 1 < end && *(curr + 1) == '%')
-                    curr += 2;
-                else
-                {
-                    check_index_range(idx);
-                    append_instruction(tmp, curr, arguments[idx]);
-                    ++idx;
-                    break;
-                }
-            }
-
-            if (curr == end)
-            {
-                check_index_range(idx);
-                append_instruction(tmp, curr, arguments[idx]);
-                ++idx;
-            }
-        }
-
-        /// Check if all arguments are used
-        if (idx != arguments.size())
-            throw Exception(
-                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                "Number of arguments for function {} doesn't match: passed {}, but format is {}",
-                getName(),
-                arguments.size(),
-                format);
-
-        return instructions;
-    }
-};
-
-}
-
-REGISTER_FUNCTION(Printf)
-{
-    factory.registerFunction<FunctionPrintf>();
-}
-
-}
diff --git a/src/Functions/punycode.cpp b/src/Functions/punycode.cpp
index ec1fcfd0a70..8004e3731b5 100644
--- a/src/Functions/punycode.cpp
+++ b/src/Functions/punycode.cpp
@@ -6,11 +6,11 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnewline-eof"
-#include <ada/idna/punycode.h>
-#include <ada/idna/unicode_transcoding.h>
-#pragma clang diagnostic pop
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wnewline-eof"
+#    include <ada/idna/punycode.h>
+#    include <ada/idna/unicode_transcoding.h>
+#    pragma clang diagnostic pop
 
 namespace DB
 {
@@ -38,16 +38,16 @@ struct PunycodeEncode
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
+        const size_t rows = offsets.size();
         res_data.reserve(data.size()); /// just a guess, assuming the input is all-ASCII
-        res_offsets.reserve(input_rows_count);
+        res_offsets.reserve(rows);
 
         size_t prev_offset = 0;
         std::u32string value_utf32;
         std::string value_puny;
-        for (size_t row = 0; row < input_rows_count; ++row)
+        for (size_t row = 0; row < rows; ++row)
         {
             const char * value = reinterpret_cast<const char *>(&data[prev_offset]);
             const size_t value_length = offsets[row] - prev_offset - 1;
@@ -72,7 +72,7 @@ struct PunycodeEncode
         }
     }
 
-    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Arguments of type FixedString are not allowed");
     }
@@ -86,16 +86,16 @@ struct PunycodeDecode
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
+        const size_t rows = offsets.size();
         res_data.reserve(data.size()); /// just a guess, assuming the input is all-ASCII
-        res_offsets.reserve(input_rows_count);
+        res_offsets.reserve(rows);
 
         size_t prev_offset = 0;
         std::u32string value_utf32;
         std::string value_utf8;
-        for (size_t row = 0; row < input_rows_count; ++row)
+        for (size_t row = 0; row < rows; ++row)
         {
             const char * value = reinterpret_cast<const char *>(&data[prev_offset]);
             const size_t value_length = offsets[row] - prev_offset - 1;
@@ -129,7 +129,7 @@ struct PunycodeDecode
         }
     }
 
-    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Arguments of type FixedString are not allowed");
     }
diff --git a/src/Functions/randDistribution.cpp b/src/Functions/randDistribution.cpp
index dc2ddf2ef24..4e616ada697 100644
--- a/src/Functions/randDistribution.cpp
+++ b/src/Functions/randDistribution.cpp
@@ -24,7 +24,6 @@ namespace ErrorCodes
     extern const int ILLEGAL_COLUMN;
     extern const int BAD_ARGUMENTS;
     extern const int LOGICAL_ERROR;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
 namespace
@@ -93,9 +92,6 @@ struct ChiSquaredDistribution
 
     static void generate(Float64 degree_of_freedom, ColumnFloat64::Container & container)
     {
-        if (degree_of_freedom <= 0)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Argument (degrees of freedom) of function {} should be greater than zero", getName());
-
         auto distribution = std::chi_squared_distribution<>(degree_of_freedom);
         for (auto & elem : container)
             elem = distribution(thread_local_rng);
@@ -110,9 +106,6 @@ struct StudentTDistribution
 
     static void generate(Float64 degree_of_freedom, ColumnFloat64::Container & container)
     {
-        if (degree_of_freedom <= 0)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Argument (degrees of freedom) of function {} should be greater than zero", getName());
-
         auto distribution = std::student_t_distribution<>(degree_of_freedom);
         for (auto & elem : container)
             elem = distribution(thread_local_rng);
@@ -127,9 +120,6 @@ struct FisherFDistribution
 
     static void generate(Float64 d1, Float64 d2, ColumnFloat64::Container & container)
     {
-        if (d1 <= 0 || d2 <= 0)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Argument (degrees of freedom) of function {} should be greater than zero", getName());
-
         auto distribution = std::fisher_f_distribution<>(d1, d2);
         for (auto & elem : container)
             elem = distribution(thread_local_rng);
@@ -256,7 +246,7 @@ public:
     {
         auto desired = Distribution::getNumberOfArguments();
         if (arguments.size() != desired && arguments.size() != desired + 1)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
                             "Wrong number of arguments for function {}. Should be {} or {}",
                             getName(), desired, desired + 1);
 
@@ -309,7 +299,7 @@ public:
             }
             else
             {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "More than two arguments specified for function {}", getName());
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "More than two argument specified for function {}", getName());
             }
 
             return res_column;
diff --git a/src/Functions/readWkt.cpp b/src/Functions/readWkt.cpp
index 2010b5167e7..eb262777b0d 100644
--- a/src/Functions/readWkt.cpp
+++ b/src/Functions/readWkt.cpp
@@ -87,11 +87,6 @@ struct ReadWKTLineStringNameHolder
     static constexpr const char * name = "readWKTLineString";
 };
 
-struct ReadWKTMultiLineStringNameHolder
-{
-    static constexpr const char * name = "readWKTMultiLineString";
-};
-
 struct ReadWKTRingNameHolder
 {
     static constexpr const char * name = "readWKTRing";
@@ -136,31 +131,6 @@ Parses a Well-Known Text (WKT) representation of a LineString geometry and retur
         },
         .categories{"Unique identifiers"}
     });
-    factory.registerFunction<FunctionReadWKT<DataTypeMultiLineStringName, CartesianMultiLineString, MultiLineStringSerializer<CartesianPoint>, ReadWKTMultiLineStringNameHolder>>(FunctionDocumentation
-    {
-        .description=R"(
-Parses a Well-Known Text (WKT) representation of a MultiLineString geometry and returns it in the internal ClickHouse format.
-)",
-        .syntax = "readWKTMultiLineString(wkt_string)",
-        .arguments{
-            {"wkt_string", "The input WKT string representing a MultiLineString geometry."}
-        },
-        .returned_value = "The function returns a ClickHouse internal representation of the multilinestring geometry.",
-        .examples{
-            {"first call", "SELECT readWKTMultiLineString('MULTILINESTRING ((1 1, 2 2, 3 3), (4 4, 5 5, 6 6))');", R"(
-┌─readWKTMultiLineString('MULTILINESTRING ((1 1, 2 2, 3 3), (4 4, 5 5, 6 6))')─┐
-│ [[(1,1),(2,2),(3,3)],[(4,4),(5,5),(6,6)]]                                    │
-└──────────────────────────────────────────────────────────────────────────────┘
-
-            )"},
-            {"second call", "SELECT toTypeName(readWKTLineString('MULTILINESTRING ((1 1, 2 2, 3 3, 1 1))'));", R"(
-┌─toTypeName(readWKTLineString('MULTILINESTRING ((1 1, 2 2, 3 3, 1 1))'))─┐
-│ MultiLineString                                                         │
-└─────────────────────────────────────────────────────────────────────────┘
-            )"},
-        },
-        .categories{"Unique identifiers"}
-    });
     factory.registerFunction<FunctionReadWKT<DataTypeRingName, CartesianRing, RingSerializer<CartesianPoint>, ReadWKTRingNameHolder>>();
     factory.registerFunction<FunctionReadWKT<DataTypePolygonName, CartesianPolygon, PolygonSerializer<CartesianPoint>, ReadWKTPolygonNameHolder>>();
     factory.registerFunction<FunctionReadWKT<DataTypeMultiPolygonName, CartesianMultiPolygon, MultiPolygonSerializer<CartesianPoint>, ReadWKTMultiPolygonNameHolder>>();
diff --git a/src/Functions/reinterpretAs.cpp b/src/Functions/reinterpretAs.cpp
index 81c9d20ce82..5293b688678 100644
--- a/src/Functions/reinterpretAs.cpp
+++ b/src/Functions/reinterpretAs.cpp
@@ -114,7 +114,7 @@ public:
         return to_type;
     }
 
-    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
     {
         auto from_type = arguments[0].type;
 
@@ -136,9 +136,9 @@ public:
                 ColumnFixedString * dst_concrete = assert_cast<ColumnFixedString *>(dst.get());
 
                 if (src.isFixedAndContiguous() && src.sizeOfValueIfFixed() == dst_concrete->getN())
-                    executeContiguousToFixedString(src, *dst_concrete, dst_concrete->getN(), input_rows_count);
+                    executeContiguousToFixedString(src, *dst_concrete, dst_concrete->getN());
                 else
-                    executeToFixedString(src, *dst_concrete, dst_concrete->getN(), input_rows_count);
+                    executeToFixedString(src, *dst_concrete, dst_concrete->getN());
 
                 result = std::move(dst);
 
@@ -156,7 +156,7 @@ public:
                 MutableColumnPtr dst = result_type->createColumn();
 
                 ColumnString * dst_concrete = assert_cast<ColumnString *>(dst.get());
-                executeToString(src, *dst_concrete, input_rows_count);
+                executeToString(src, *dst_concrete);
 
                 result = std::move(dst);
 
@@ -174,11 +174,12 @@ public:
 
                     const auto & data_from = col_from->getChars();
                     const auto & offsets_from = col_from->getOffsets();
+                    size_t size = offsets_from.size();
                     auto & vec_res = col_res->getData();
-                    vec_res.resize_fill(input_rows_count);
+                    vec_res.resize_fill(size);
 
                     size_t offset = 0;
-                    for (size_t i = 0; i < input_rows_count; ++i)
+                    for (size_t i = 0; i < size; ++i)
                     {
                         size_t copy_size = std::min(static_cast<UInt64>(sizeof(ToFieldType)), offsets_from[i] - offset - 1);
                         if constexpr (std::endian::native == std::endian::little)
@@ -208,6 +209,7 @@ public:
 
                     const auto& data_from = col_from_fixed->getChars();
                     size_t step = col_from_fixed->getN();
+                    size_t size = data_from.size() / step;
                     auto & vec_res = col_res->getData();
 
                     size_t offset = 0;
@@ -215,11 +217,11 @@ public:
                     size_t index = data_from.size() - copy_size;
 
                     if (sizeof(ToFieldType) <= step)
-                        vec_res.resize(input_rows_count);
+                        vec_res.resize(size);
                     else
-                        vec_res.resize_fill(input_rows_count);
+                        vec_res.resize_fill(size);
 
-                    for (size_t i = 0; i < input_rows_count; ++i)
+                    for (size_t i = 0; i < size; ++i)
                     {
                         if constexpr (std::endian::native == std::endian::little)
                             memcpy(&vec_res[i], &data_from[offset], copy_size);
@@ -249,11 +251,12 @@ public:
                     auto & from = column_from->getData();
                     auto & to = column_to->getData();
 
-                    to.resize_fill(input_rows_count);
+                    size_t size = from.size();
+                    to.resize_fill(size);
 
                     static constexpr size_t copy_size = std::min(sizeof(From), sizeof(To));
 
-                    for (size_t i = 0; i < input_rows_count; ++i)
+                    for (size_t i = 0; i < size; ++i)
                     {
                         if constexpr (std::endian::native == std::endian::little)
                             memcpy(static_cast<void*>(&to[i]), static_cast<const void*>(&from[i]), copy_size);
@@ -304,13 +307,14 @@ private:
             type.isDecimal();
     }
 
-    static void NO_INLINE executeToFixedString(const IColumn & src, ColumnFixedString & dst, size_t n, size_t input_rows_count)
+    static void NO_INLINE executeToFixedString(const IColumn & src, ColumnFixedString & dst, size_t n)
     {
+        size_t rows = src.size();
         ColumnFixedString::Chars & data_to = dst.getChars();
-        data_to.resize_fill(n * input_rows_count);
+        data_to.resize_fill(n * rows);
 
         ColumnFixedString::Offset offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < rows; ++i)
         {
             std::string_view data = src.getDataAt(i).toView();
 
@@ -323,10 +327,11 @@ private:
         }
     }
 
-    static void NO_INLINE executeContiguousToFixedString(const IColumn & src, ColumnFixedString & dst, size_t n, size_t input_rows_count)
+    static void NO_INLINE executeContiguousToFixedString(const IColumn & src, ColumnFixedString & dst, size_t n)
     {
+        size_t rows = src.size();
         ColumnFixedString::Chars & data_to = dst.getChars();
-        data_to.resize(n * input_rows_count);
+        data_to.resize(n * rows);
 
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
         memcpy(data_to.data(), src.getRawData().data(), data_to.size());
@@ -335,14 +340,15 @@ private:
 #endif
     }
 
-    static void NO_INLINE executeToString(const IColumn & src, ColumnString & dst, size_t input_rows_count)
+    static void NO_INLINE executeToString(const IColumn & src, ColumnString & dst)
     {
+        size_t rows = src.size();
         ColumnString::Chars & data_to = dst.getChars();
         ColumnString::Offsets & offsets_to = dst.getOffsets();
-        offsets_to.resize(input_rows_count);
+        offsets_to.resize(rows);
 
         ColumnString::Offset offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < rows; ++i)
         {
             StringRef data = src.getDataAt(i);
 
diff --git a/src/Functions/reverse.cpp b/src/Functions/reverse.cpp
index 94b6634ffbd..d23e48b8d42 100644
--- a/src/Functions/reverse.cpp
+++ b/src/Functions/reverse.cpp
@@ -55,19 +55,19 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         const ColumnPtr column = arguments[0].column;
         if (const ColumnString * col = checkAndGetColumn<ColumnString>(column.get()))
         {
             auto col_res = ColumnString::create();
-            ReverseImpl::vector(col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets(), input_rows_count);
+            ReverseImpl::vector(col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets());
             return col_res;
         }
         else if (const ColumnFixedString * col_fixed = checkAndGetColumn<ColumnFixedString>(column.get()))
         {
             auto col_res = ColumnFixedString::create(col_fixed->getN());
-            ReverseImpl::vectorFixed(col_fixed->getChars(), col_fixed->getN(), col_res->getChars(), input_rows_count);
+            ReverseImpl::vectorFixed(col_fixed->getChars(), col_fixed->getN(), col_res->getChars());
             return col_res;
         }
         else
diff --git a/src/Functions/reverse.h b/src/Functions/reverse.h
index 7c18d72769a..5f999af4297 100644
--- a/src/Functions/reverse.h
+++ b/src/Functions/reverse.h
@@ -9,18 +9,17 @@ namespace DB
   */
 struct ReverseImpl
 {
-    static void vector(
-        const ColumnString::Chars & data,
+    static void vector(const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         res_data.resize_exact(data.size());
         res_offsets.assign(offsets);
+        size_t size = offsets.size();
 
         ColumnString::Offset prev_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             for (size_t j = prev_offset; j < offsets[i] - 1; ++j)
                 res_data[j] = data[offsets[i] + prev_offset - 2 - j];
@@ -29,15 +28,12 @@ struct ReverseImpl
         }
     }
 
-    static void vectorFixed(
-        const ColumnString::Chars & data,
-        size_t n,
-        ColumnString::Chars & res_data,
-        size_t input_rows_count)
+    static void vectorFixed(const ColumnString::Chars & data, size_t n, ColumnString::Chars & res_data)
     {
         res_data.resize_exact(data.size());
+        size_t size = data.size() / n;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
             for (size_t j = i * n; j < (i + 1) * n; ++j)
                 res_data[j] = data[(i * 2 + 1) * n - j - 1];
     }
diff --git a/src/Functions/reverseUTF8.cpp b/src/Functions/reverseUTF8.cpp
index ca57d946b19..1aee349fa8d 100644
--- a/src/Functions/reverseUTF8.cpp
+++ b/src/Functions/reverseUTF8.cpp
@@ -23,25 +23,25 @@ namespace
   */
 struct ReverseUTF8Impl
 {
-    static void vector(
-        const ColumnString::Chars & data,
+    static void vector(const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         bool all_ascii = isAllASCII(data.data(), data.size());
         if (all_ascii)
         {
-            ReverseImpl::vector(data, offsets, res_data, res_offsets, input_rows_count);
+            ReverseImpl::vector(data, offsets, res_data, res_offsets);
             return;
         }
 
         res_data.resize(data.size());
         res_offsets.assign(offsets);
+        size_t size = offsets.size();
+
 
         ColumnString::Offset prev_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             ColumnString::Offset j = prev_offset;
             while (j < offsets[i] - 1)
@@ -73,7 +73,7 @@ struct ReverseUTF8Impl
         }
     }
 
-    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
         throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot apply function reverseUTF8 to fixed string.");
     }
diff --git a/src/Functions/seriesDecomposeSTL.cpp b/src/Functions/seriesDecomposeSTL.cpp
index 1e1c41cafad..720aa1e0799 100644
--- a/src/Functions/seriesDecomposeSTL.cpp
+++ b/src/Functions/seriesDecomposeSTL.cpp
@@ -50,7 +50,7 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeArray>(std::make_shared<DataTypeFloat32>()));
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         ColumnPtr array_ptr = arguments[0].column;
         const ColumnArray * array = checkAndGetColumn<ColumnArray>(array_ptr.get());
@@ -79,7 +79,7 @@ public:
 
         ColumnArray::Offset prev_src_offset = 0;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < src_offsets.size(); ++i)
         {
             UInt64 period;
             auto period_ptr = arguments[1].column->convertToFullColumnIfConst();
diff --git a/src/Functions/seriesPeriodDetectFFT.cpp b/src/Functions/seriesPeriodDetectFFT.cpp
index ecf8398bbd5..471354235d5 100644
--- a/src/Functions/seriesPeriodDetectFFT.cpp
+++ b/src/Functions/seriesPeriodDetectFFT.cpp
@@ -153,8 +153,12 @@ public:
             return true;
         }
 
+        std::vector<double> xfreq(spec_len);
         double step = 0.5 / (spec_len - 1);
-        auto freq = idx * step;
+        for (size_t i = 0; i < spec_len; ++i)
+            xfreq[i] = i * step;
+
+        auto freq = xfreq[idx];
 
         period = std::round(1 / freq);
         return true;
diff --git a/src/Functions/sleep.h b/src/Functions/sleep.h
index b6e4b36ee64..62ee19fa904 100644
--- a/src/Functions/sleep.h
+++ b/src/Functions/sleep.h
@@ -7,7 +7,6 @@
 #include <Common/FieldVisitorConvertToNumber.h>
 #include <Common/ProfileEvents.h>
 #include <Common/assert_cast.h>
-#include <Common/FailPoint.h>
 #include <Core/Settings.h>
 #include <base/sleep.h>
 #include <IO/WriteHelpers.h>
@@ -33,11 +32,6 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-namespace FailPoints
-{
-    extern const char infinite_sleep[];
-}
-
 /** sleep(seconds) - the specified number of seconds sleeps each columns.
   */
 
@@ -113,8 +107,6 @@ public:
         {
             /// When sleeping, the query cannot be cancelled. For ability to cancel query, we limit sleep time.
             UInt64 microseconds = static_cast<UInt64>(seconds * 1e6);
-            FailPointInjection::pauseFailPoint(FailPoints::infinite_sleep);
-
             if (max_microseconds && microseconds > max_microseconds)
                 throw Exception(ErrorCodes::TOO_SLOW, "The maximum sleep time is {} microseconds. Requested: {} microseconds",
                     max_microseconds, microseconds);
diff --git a/src/Functions/soundex.cpp b/src/Functions/soundex.cpp
index e8bd1b664e3..fcf1523d1a3 100644
--- a/src/Functions/soundex.cpp
+++ b/src/Functions/soundex.cpp
@@ -79,14 +79,14 @@ struct SoundexImpl
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
-        res_data.resize(input_rows_count * (length + 1));
-        res_offsets.resize(input_rows_count);
+        const size_t size = offsets.size();
+        res_data.resize(size * (length + 1));
+        res_offsets.resize(size);
 
         size_t prev_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             const char * value = reinterpret_cast<const char *>(&data[prev_offset]);
             const size_t value_length = offsets[i] - prev_offset - 1;
@@ -98,7 +98,7 @@ struct SoundexImpl
         }
     }
 
-    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
         throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Column of type FixedString is not supported by soundex function");
     }
diff --git a/src/Functions/space.cpp b/src/Functions/space.cpp
index cf1634e0319..cd6ca73c088 100644
--- a/src/Functions/space.cpp
+++ b/src/Functions/space.cpp
@@ -55,7 +55,7 @@ public:
 
 
     template <typename DataType>
-    bool executeConstant(ColumnPtr col_times, ColumnString::Offsets & res_offsets, ColumnString::Chars & res_chars, size_t input_rows_count) const
+    bool executeConstant(ColumnPtr col_times, ColumnString::Offsets & res_offsets, ColumnString::Chars & res_chars) const
     {
         const ColumnConst & col_times_const = checkAndGetColumn<ColumnConst>(*col_times);
 
@@ -71,12 +71,12 @@ public:
 
         checkRepeatTime(times);
 
-        res_offsets.resize(input_rows_count);
-        res_chars.resize(input_rows_count * (times + 1));
+        res_offsets.resize(col_times->size());
+        res_chars.resize(col_times->size() * (times + 1));
 
         size_t pos = 0;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < col_times->size(); ++i)
         {
             memset(res_chars.begin() + pos, space, times);
             pos += times;
@@ -92,20 +92,20 @@ public:
 
 
     template <typename DataType>
-    bool executeVector(ColumnPtr col_times_, ColumnString::Offsets & res_offsets, ColumnString::Chars & res_chars, size_t input_rows_count) const
+    bool executeVector(ColumnPtr col_times_, ColumnString::Offsets & res_offsets, ColumnString::Chars & res_chars) const
     {
         auto * col_times = checkAndGetColumn<typename DataType::ColumnType>(col_times_.get());
         if (!col_times)
             return false;
 
-        res_offsets.resize(input_rows_count);
-        res_chars.resize(input_rows_count * 10); /// heuristic
+        res_offsets.resize(col_times->size());
+        res_chars.resize(col_times->size() * 10); /// heuristic
 
         const PaddedPODArray<typename DataType::FieldType> & times_data = col_times->getData();
 
         size_t pos = 0;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < col_times->size(); ++i)
         {
             typename DataType::FieldType times = times_data[i];
 
@@ -132,7 +132,7 @@ public:
     }
 
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const auto & col_num = arguments[0].column;
 
@@ -143,26 +143,26 @@ public:
 
         if (const ColumnConst * col_num_const = checkAndGetColumn<ColumnConst>(col_num.get()))
         {
-            if ((executeConstant<DataTypeUInt8>(col_num, res_offsets, res_chars, input_rows_count))
-                || (executeConstant<DataTypeUInt16>(col_num, res_offsets, res_chars, input_rows_count))
-                || (executeConstant<DataTypeUInt32>(col_num, res_offsets, res_chars, input_rows_count))
-                || (executeConstant<DataTypeUInt64>(col_num, res_offsets, res_chars, input_rows_count))
-                || (executeConstant<DataTypeInt8>(col_num, res_offsets, res_chars, input_rows_count))
-                || (executeConstant<DataTypeInt16>(col_num, res_offsets, res_chars, input_rows_count))
-                || (executeConstant<DataTypeInt32>(col_num, res_offsets, res_chars, input_rows_count))
-                || (executeConstant<DataTypeInt64>(col_num, res_offsets, res_chars, input_rows_count)))
+            if ((executeConstant<DataTypeUInt8>(col_num, res_offsets, res_chars))
+                || (executeConstant<DataTypeUInt16>(col_num, res_offsets, res_chars))
+                || (executeConstant<DataTypeUInt32>(col_num, res_offsets, res_chars))
+                || (executeConstant<DataTypeUInt64>(col_num, res_offsets, res_chars))
+                || (executeConstant<DataTypeInt8>(col_num, res_offsets, res_chars))
+                || (executeConstant<DataTypeInt16>(col_num, res_offsets, res_chars))
+                || (executeConstant<DataTypeInt32>(col_num, res_offsets, res_chars))
+                || (executeConstant<DataTypeInt64>(col_num, res_offsets, res_chars)))
                 return col_res;
         }
         else
         {
-            if ((executeVector<DataTypeUInt8>(col_num, res_offsets, res_chars, input_rows_count))
-                || (executeVector<DataTypeUInt16>(col_num, res_offsets, res_chars, input_rows_count))
-                || (executeVector<DataTypeUInt32>(col_num, res_offsets, res_chars, input_rows_count))
-                || (executeVector<DataTypeUInt64>(col_num, res_offsets, res_chars, input_rows_count))
-                || (executeVector<DataTypeInt8>(col_num, res_offsets, res_chars, input_rows_count))
-                || (executeVector<DataTypeInt16>(col_num, res_offsets, res_chars, input_rows_count))
-                || (executeVector<DataTypeInt32>(col_num, res_offsets, res_chars, input_rows_count))
-                || (executeVector<DataTypeInt64>(col_num, res_offsets, res_chars, input_rows_count)))
+            if ((executeVector<DataTypeUInt8>(col_num, res_offsets, res_chars))
+                || (executeVector<DataTypeUInt16>(col_num, res_offsets, res_chars))
+                || (executeVector<DataTypeUInt32>(col_num, res_offsets, res_chars))
+                || (executeVector<DataTypeUInt64>(col_num, res_offsets, res_chars))
+                || (executeVector<DataTypeInt8>(col_num, res_offsets, res_chars))
+                || (executeVector<DataTypeInt16>(col_num, res_offsets, res_chars))
+                || (executeVector<DataTypeInt32>(col_num, res_offsets, res_chars))
+                || (executeVector<DataTypeInt64>(col_num, res_offsets, res_chars)))
                 return col_res;
         }
 
diff --git a/src/Functions/stem.cpp b/src/Functions/stem.cpp
index b3be40f4022..5b845cf332b 100644
--- a/src/Functions/stem.cpp
+++ b/src/Functions/stem.cpp
@@ -32,8 +32,7 @@ struct StemImpl
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
         ColumnString::Offsets & res_offsets,
-        const String & language,
-        size_t input_rows_count)
+        const String & language)
     {
         sb_stemmer * stemmer = sb_stemmer_new(language.data(), "UTF_8");
 
@@ -46,7 +45,7 @@ struct StemImpl
         res_offsets.assign(offsets);
 
         UInt64 data_size = 0;
-        for (UInt64 i = 0; i < input_rows_count; ++i)
+        for (UInt64 i = 0; i < offsets.size(); ++i)
         {
             /// Note that accessing -1th element is valid for PaddedPODArray.
             size_t original_size = offsets[i] - offsets[i - 1];
@@ -102,7 +101,7 @@ public:
 
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         const auto & langcolumn = arguments[0].column;
         const auto & strcolumn = arguments[1].column;
@@ -120,7 +119,7 @@ public:
         String language = lang_col->getValue<String>();
 
         auto col_res = ColumnString::create();
-        StemImpl::vector(words_col->getChars(), words_col->getOffsets(), col_res->getChars(), col_res->getOffsets(), language, input_rows_count);
+        StemImpl::vector(words_col->getChars(), words_col->getOffsets(), col_res->getChars(), col_res->getOffsets(), language);
         return col_res;
     }
 };
diff --git a/src/Functions/stringCutToZero.cpp b/src/Functions/stringCutToZero.cpp
index 16e57d741fa..b9f742cd8bc 100644
--- a/src/Functions/stringCutToZero.cpp
+++ b/src/Functions/stringCutToZero.cpp
@@ -40,7 +40,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    static bool tryExecuteString(const IColumn * col, ColumnPtr & col_res, size_t input_rows_count)
+    static bool tryExecuteString(const IColumn * col, ColumnPtr & col_res)
     {
         const ColumnString * col_str_in = checkAndGetColumn<ColumnString>(col);
 
@@ -53,7 +53,8 @@ public:
             const ColumnString::Chars & in_vec = col_str_in->getChars();
             const ColumnString::Offsets & in_offsets = col_str_in->getOffsets();
 
-            out_offsets.resize(input_rows_count);
+            size_t size = in_offsets.size();
+            out_offsets.resize(size);
             out_vec.resize(in_vec.size());
 
             char * begin = reinterpret_cast<char *>(out_vec.data());
@@ -61,7 +62,7 @@ public:
 
             ColumnString::Offset current_in_offset = 0;
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 const char * pos_in = reinterpret_cast<const char *>(&in_vec[current_in_offset]);
                 size_t current_size = strlen(pos_in);
@@ -86,7 +87,7 @@ public:
         }
     }
 
-    static bool tryExecuteFixedString(const IColumn * col, ColumnPtr & col_res, size_t input_rows_count)
+    static bool tryExecuteFixedString(const IColumn * col, ColumnPtr & col_res)
     {
         const ColumnFixedString * col_fstr_in = checkAndGetColumn<ColumnFixedString>(col);
 
@@ -98,8 +99,10 @@ public:
 
             const ColumnString::Chars & in_vec = col_fstr_in->getChars();
 
-            out_offsets.resize(input_rows_count);
-            out_vec.resize(in_vec.size() + input_rows_count);
+            size_t size = col_fstr_in->size();
+
+            out_offsets.resize(size);
+            out_vec.resize(in_vec.size() + size);
 
             char * begin = reinterpret_cast<char *>(out_vec.data());
             char * pos = begin;
@@ -107,7 +110,7 @@ public:
 
             size_t n = col_fstr_in->getN();
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 size_t current_size = strnlen(pos_in, n);
                 memcpySmallAllowReadWriteOverflow15(pos, pos_in, current_size);
@@ -130,12 +133,12 @@ public:
         }
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const IColumn * column = arguments[0].column.get();
         ColumnPtr res_column;
 
-        if (tryExecuteFixedString(column, res_column, input_rows_count) || tryExecuteString(column, res_column, input_rows_count))
+        if (tryExecuteFixedString(column, res_column) || tryExecuteString(column, res_column))
             return res_column;
 
         throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of argument of function {}",
diff --git a/src/Functions/substringIndex.cpp b/src/Functions/substringIndex.cpp
index dc12ae193ff..eccd849059b 100644
--- a/src/Functions/substringIndex.cpp
+++ b/src/Functions/substringIndex.cpp
@@ -68,7 +68,7 @@ namespace
             return std::make_shared<DataTypeString>();
         }
 
-        ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+        ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
         {
             ColumnPtr column_string = arguments[0].column;
             ColumnPtr column_delim = arguments[1].column;
@@ -110,10 +110,10 @@ namespace
                 if (is_count_const)
                 {
                     Int64 count = column_count->getInt(0);
-                    vectorConstant(col_str, delim, count, vec_res, offsets_res, input_rows_count);
+                    vectorConstant(col_str, delim, count, vec_res, offsets_res);
                 }
                 else
-                    vectorVector(col_str, delim, column_count.get(), vec_res, offsets_res, input_rows_count);
+                    vectorVector(col_str, delim, column_count.get(), vec_res, offsets_res);
             }
             return column_res;
         }
@@ -124,18 +124,18 @@ namespace
             const String & delim,
             const IColumn * count_column,
             ColumnString::Chars & res_data,
-            ColumnString::Offsets & res_offsets,
-            size_t input_rows_count)
+            ColumnString::Offsets & res_offsets)
         {
+            size_t rows = str_column->size();
             res_data.reserve(str_column->getChars().size() / 2);
-            res_offsets.reserve(input_rows_count);
+            res_offsets.reserve(rows);
 
             bool all_ascii = isAllASCII(str_column->getChars().data(), str_column->getChars().size())
                 && isAllASCII(reinterpret_cast<const UInt8 *>(delim.data()), delim.size());
             std::unique_ptr<PositionCaseSensitiveUTF8::SearcherInBigHaystack> searcher
                 = !is_utf8 || all_ascii ? nullptr : std::make_unique<PositionCaseSensitiveUTF8::SearcherInBigHaystack>(delim.data(), delim.size());
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < rows; ++i)
             {
                 StringRef str_ref = str_column->getDataAt(i);
                 Int64 count = count_column->getInt(i);
@@ -157,18 +157,18 @@ namespace
             const String & delim,
             Int64 count,
             ColumnString::Chars & res_data,
-            ColumnString::Offsets & res_offsets,
-            size_t input_rows_count)
+            ColumnString::Offsets & res_offsets)
         {
+            size_t rows = str_column->size();
             res_data.reserve(str_column->getChars().size() / 2);
-            res_offsets.reserve(input_rows_count);
+            res_offsets.reserve(rows);
 
             bool all_ascii = isAllASCII(str_column->getChars().data(), str_column->getChars().size())
                 && isAllASCII(reinterpret_cast<const UInt8 *>(delim.data()), delim.size());
             std::unique_ptr<PositionCaseSensitiveUTF8::SearcherInBigHaystack> searcher
                 = !is_utf8 || all_ascii ? nullptr : std::make_unique<PositionCaseSensitiveUTF8::SearcherInBigHaystack>(delim.data(), delim.size());
 
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < rows; ++i)
             {
                 StringRef str_ref = str_column->getDataAt(i);
 
diff --git a/src/Functions/subtractNanoseconds.cpp b/src/Functions/subtractNanoseconds.cpp
index 360c5ecd9cb..fffb4eae37a 100644
--- a/src/Functions/subtractNanoseconds.cpp
+++ b/src/Functions/subtractNanoseconds.cpp
@@ -6,7 +6,6 @@ namespace DB
 {
 
 using FunctionSubtractNanoseconds = FunctionDateOrDateTimeAddInterval<SubtractNanosecondsImpl>;
-
 REGISTER_FUNCTION(SubtractNanoseconds)
 {
     factory.registerFunction<FunctionSubtractNanoseconds>();
diff --git a/src/Functions/throwIf.cpp b/src/Functions/throwIf.cpp
index e317c65c622..becc6d2f772 100644
--- a/src/Functions/throwIf.cpp
+++ b/src/Functions/throwIf.cpp
@@ -152,7 +152,7 @@ private:
         return nullptr;
     }
 
-    const bool allow_custom_error_code_argument;
+    bool allow_custom_error_code_argument;
 };
 
 }
diff --git a/src/Functions/timeSlots.cpp b/src/Functions/timeSlots.cpp
index b62bb20c64e..040495ab023 100644
--- a/src/Functions/timeSlots.cpp
+++ b/src/Functions/timeSlots.cpp
@@ -41,17 +41,18 @@ struct TimeSlotsImpl
     /// The following three methods process DateTime type
     static void vectorVector(
         const PaddedPODArray<UInt32> & starts, const PaddedPODArray<UInt32> & durations, UInt32 time_slot_size,
-        PaddedPODArray<UInt32> & result_values, ColumnArray::Offsets & result_offsets,
-        size_t input_rows_count)
+        PaddedPODArray<UInt32> & result_values, ColumnArray::Offsets & result_offsets)
     {
         if (time_slot_size == 0)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Time slot size cannot be zero");
 
-        result_offsets.resize(input_rows_count);
-        result_values.reserve(input_rows_count);
+        size_t size = starts.size();
+
+        result_offsets.resize(size);
+        result_values.reserve(size);
 
         ColumnArray::Offset current_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             for (UInt32 value = starts[i] / time_slot_size, end = (starts[i] + durations[i]) / time_slot_size; value <= end; ++value)
             {
@@ -65,17 +66,18 @@ struct TimeSlotsImpl
 
     static void vectorConstant(
         const PaddedPODArray<UInt32> & starts, UInt32 duration, UInt32 time_slot_size,
-        PaddedPODArray<UInt32> & result_values, ColumnArray::Offsets & result_offsets,
-        size_t input_rows_count)
+        PaddedPODArray<UInt32> & result_values, ColumnArray::Offsets & result_offsets)
     {
         if (time_slot_size == 0)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Time slot size cannot be zero");
 
-        result_offsets.resize(input_rows_count);
-        result_values.reserve(input_rows_count);
+        size_t size = starts.size();
+
+        result_offsets.resize(size);
+        result_values.reserve(size);
 
         ColumnArray::Offset current_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             for (UInt32 value = starts[i] / time_slot_size, end = (starts[i] + duration) / time_slot_size; value <= end; ++value)
             {
@@ -89,17 +91,18 @@ struct TimeSlotsImpl
 
     static void constantVector(
         UInt32 start, const PaddedPODArray<UInt32> & durations, UInt32 time_slot_size,
-        PaddedPODArray<UInt32> & result_values, ColumnArray::Offsets & result_offsets,
-        size_t input_rows_count)
+        PaddedPODArray<UInt32> & result_values, ColumnArray::Offsets & result_offsets)
     {
         if (time_slot_size == 0)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Time slot size cannot be zero");
 
-        result_offsets.resize(input_rows_count);
-        result_values.reserve(input_rows_count);
+        size_t size = durations.size();
+
+        result_offsets.resize(size);
+        result_values.reserve(size);
 
         ColumnArray::Offset current_offset = 0;
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             for (UInt32 value = start / time_slot_size, end = (start + durations[i]) / time_slot_size; value <= end; ++value)
             {
@@ -117,11 +120,12 @@ struct TimeSlotsImpl
     */
     static NO_SANITIZE_UNDEFINED void vectorVector(
         const PaddedPODArray<DateTime64> & starts, const PaddedPODArray<Decimal64> & durations, Decimal64 time_slot_size,
-        PaddedPODArray<DateTime64> & result_values, ColumnArray::Offsets & result_offsets, UInt16 dt_scale, UInt16 duration_scale, UInt16 time_slot_scale,
-        size_t input_rows_count)
+        PaddedPODArray<DateTime64> & result_values, ColumnArray::Offsets & result_offsets, UInt16 dt_scale, UInt16 duration_scale, UInt16 time_slot_scale)
     {
-        result_offsets.resize(input_rows_count);
-        result_values.reserve(input_rows_count);
+        size_t size = starts.size();
+
+        result_offsets.resize(size);
+        result_values.reserve(size);
 
         /// Modify all units to have same scale
         UInt16 max_scale = std::max({dt_scale, duration_scale, time_slot_scale});
@@ -135,7 +139,7 @@ struct TimeSlotsImpl
         if (time_slot_size == 0)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Time slot size cannot be zero");
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             for (DateTime64 value = (starts[i] * dt_multiplier) / time_slot_size, end = (starts[i] * dt_multiplier + durations[i] * dur_multiplier) / time_slot_size; value <= end; value += 1)
             {
@@ -148,11 +152,12 @@ struct TimeSlotsImpl
 
     static NO_SANITIZE_UNDEFINED void vectorConstant(
         const PaddedPODArray<DateTime64> & starts, Decimal64 duration, Decimal64 time_slot_size,
-        PaddedPODArray<DateTime64> & result_values, ColumnArray::Offsets & result_offsets, UInt16 dt_scale, UInt16 duration_scale, UInt16 time_slot_scale,
-        size_t input_rows_count)
+        PaddedPODArray<DateTime64> & result_values, ColumnArray::Offsets & result_offsets, UInt16 dt_scale, UInt16 duration_scale, UInt16 time_slot_scale)
     {
-        result_offsets.resize(input_rows_count);
-        result_values.reserve(input_rows_count);
+        size_t size = starts.size();
+
+        result_offsets.resize(size);
+        result_values.reserve(size);
 
         /// Modify all units to have same scale
         UInt16 max_scale = std::max({dt_scale, duration_scale, time_slot_scale});
@@ -167,7 +172,7 @@ struct TimeSlotsImpl
         if (time_slot_size == 0)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Time slot size cannot be zero");
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             for (DateTime64 value = (starts[i] * dt_multiplier) / time_slot_size, end = (starts[i] * dt_multiplier + duration) / time_slot_size; value <= end; value += 1)
             {
@@ -180,11 +185,12 @@ struct TimeSlotsImpl
 
     static NO_SANITIZE_UNDEFINED void constantVector(
         DateTime64 start, const PaddedPODArray<Decimal64> & durations, Decimal64 time_slot_size,
-        PaddedPODArray<DateTime64> & result_values, ColumnArray::Offsets & result_offsets, UInt16 dt_scale, UInt16 duration_scale, UInt16 time_slot_scale,
-        size_t input_rows_count)
+        PaddedPODArray<DateTime64> & result_values, ColumnArray::Offsets & result_offsets, UInt16 dt_scale, UInt16 duration_scale, UInt16 time_slot_scale)
     {
-        result_offsets.resize(input_rows_count);
-        result_values.reserve(input_rows_count);
+        size_t size = durations.size();
+
+        result_offsets.resize(size);
+        result_values.reserve(size);
 
         /// Modify all units to have same scale
         UInt16 max_scale = std::max({dt_scale, duration_scale, time_slot_scale});
@@ -199,7 +205,7 @@ struct TimeSlotsImpl
         if (time_slot_size == 0)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Time slot size cannot be zero");
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             for (DateTime64 value = start / time_slot_size, end = (start + durations[i] * dur_multiplier) / time_slot_size; value <= end; value += 1)
             {
@@ -276,7 +282,7 @@ public:
 
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         if (WhichDataType(arguments[0].type).isDateTime())
         {
@@ -302,17 +308,17 @@ public:
 
             if (dt_starts && durations)
             {
-                TimeSlotsImpl::vectorVector(dt_starts->getData(), durations->getData(), time_slot_size, res_values, res->getOffsets(), input_rows_count);
+                TimeSlotsImpl::vectorVector(dt_starts->getData(), durations->getData(), time_slot_size, res_values, res->getOffsets());
                 return res;
             }
             else if (dt_starts && const_durations)
             {
-                TimeSlotsImpl::vectorConstant(dt_starts->getData(), const_durations->getValue<UInt32>(), time_slot_size, res_values, res->getOffsets(), input_rows_count);
+                TimeSlotsImpl::vectorConstant(dt_starts->getData(), const_durations->getValue<UInt32>(), time_slot_size, res_values, res->getOffsets());
                 return res;
             }
             else if (dt_const_starts && durations)
             {
-                TimeSlotsImpl::constantVector(dt_const_starts->getValue<UInt32>(), durations->getData(), time_slot_size, res_values, res->getOffsets(), input_rows_count);
+                TimeSlotsImpl::constantVector(dt_const_starts->getValue<UInt32>(), durations->getData(), time_slot_size, res_values, res->getOffsets());
                 return res;
             }
         }
@@ -347,21 +353,21 @@ public:
             if (starts && durations)
             {
                 TimeSlotsImpl::vectorVector(starts->getData(), durations->getData(), time_slot_size, res_values, res->getOffsets(),
-                    start_time_scale, duration_scale, time_slot_scale, input_rows_count);
+                    start_time_scale, duration_scale, time_slot_scale);
                 return res;
             }
             else if (starts && const_durations)
             {
                 TimeSlotsImpl::vectorConstant(
                     starts->getData(), const_durations->getValue<Decimal64>(), time_slot_size, res_values, res->getOffsets(),
-                    start_time_scale, duration_scale, time_slot_scale, input_rows_count);
+                    start_time_scale, duration_scale, time_slot_scale);
                 return res;
             }
             else if (const_starts && durations)
             {
                 TimeSlotsImpl::constantVector(
                     const_starts->getValue<DateTime64>(), durations->getData(), time_slot_size, res_values, res->getOffsets(),
-                    start_time_scale, duration_scale, time_slot_scale, input_rows_count);
+                    start_time_scale, duration_scale, time_slot_scale);
                 return res;
             }
         }
diff --git a/src/Functions/toBool.cpp b/src/Functions/toBool.cpp
index ac595d313e3..6f2c436c1ea 100644
--- a/src/Functions/toBool.cpp
+++ b/src/Functions/toBool.cpp
@@ -54,7 +54,8 @@ namespace
                 }
             };
 
-            auto func_cast = createInternalCast(arguments[0], result_type, CastType::nonAccurate, {});
+            FunctionOverloadResolverPtr func_builder_cast = createInternalCastOverloadResolver(CastType::nonAccurate, {});
+            auto func_cast = func_builder_cast->build(cast_args);
             return func_cast->execute(cast_args, result_type, arguments[0].column->size());
         }
     };
diff --git a/src/Functions/toDecimalString.cpp b/src/Functions/toDecimalString.cpp
index 3566ebc93ad..523948a5396 100644
--- a/src/Functions/toDecimalString.cpp
+++ b/src/Functions/toDecimalString.cpp
@@ -54,9 +54,9 @@ private:
     /// For operations with Integer/Float
     template <typename FromVectorType>
     void vectorConstant(const FromVectorType & vec_from, UInt8 precision,
-                        ColumnString::Chars & vec_to, ColumnString::Offsets & result_offsets,
-                        size_t input_rows_count) const
+                        ColumnString::Chars & vec_to, ColumnString::Offsets & result_offsets) const
     {
+        size_t input_rows_count = vec_from.size();
         result_offsets.resize(input_rows_count);
 
         /// Buffer is used here and in functions below because resulting size cannot be precisely anticipated,
@@ -74,9 +74,9 @@ private:
 
     template <typename FirstArgVectorType>
     void vectorVector(const FirstArgVectorType & vec_from, const ColumnVector<UInt8>::Container & vec_precision,
-                      ColumnString::Chars & vec_to, ColumnString::Offsets & result_offsets,
-                      size_t input_rows_count) const
+                      ColumnString::Chars & vec_to, ColumnString::Offsets & result_offsets) const
     {
+        size_t input_rows_count = vec_from.size();
         result_offsets.resize(input_rows_count);
 
         WriteBufferFromVector<ColumnString::Chars> buf_to(vec_to);
@@ -98,8 +98,7 @@ private:
     /// For operations with Decimal
     template <typename FirstArgVectorType>
     void vectorConstant(const FirstArgVectorType & vec_from, UInt8 precision,
-                        ColumnString::Chars & vec_to, ColumnString::Offsets & result_offsets, UInt8 from_scale,
-                        size_t input_rows_count) const
+                        ColumnString::Chars & vec_to, ColumnString::Offsets & result_offsets, UInt8 from_scale) const
     {
         /// There are no more than 77 meaning digits (as it is the max length of UInt256). So we can limit it with 77.
         constexpr size_t max_digits = std::numeric_limits<UInt256>::digits10;
@@ -108,6 +107,7 @@ private:
                                 "Too many fractional digits requested for Decimal, must not be more than {}", max_digits);
 
         WriteBufferFromVector<ColumnString::Chars> buf_to(vec_to);
+        size_t input_rows_count = vec_from.size();
         result_offsets.resize(input_rows_count);
 
         for (size_t i = 0; i < input_rows_count; ++i)
@@ -121,9 +121,9 @@ private:
 
     template <typename FirstArgVectorType>
     void vectorVector(const FirstArgVectorType & vec_from, const ColumnVector<UInt8>::Container & vec_precision,
-                      ColumnString::Chars & vec_to, ColumnString::Offsets & result_offsets, UInt8 from_scale,
-                      size_t input_rows_count) const
+                      ColumnString::Chars & vec_to, ColumnString::Offsets & result_offsets, UInt8 from_scale) const
     {
+        size_t input_rows_count = vec_from.size();
         result_offsets.resize(input_rows_count);
 
         WriteBufferFromVector<ColumnString::Chars> buf_to(vec_to);
@@ -182,28 +182,28 @@ private:
     }
 
 public:
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         switch (arguments[0].type->getTypeId())
         {
-            case TypeIndex::UInt8:      return executeType<UInt8>(arguments, input_rows_count);
-            case TypeIndex::UInt16:     return executeType<UInt16>(arguments, input_rows_count);
-            case TypeIndex::UInt32:     return executeType<UInt32>(arguments, input_rows_count);
-            case TypeIndex::UInt64:     return executeType<UInt64>(arguments, input_rows_count);
-            case TypeIndex::UInt128:    return executeType<UInt128>(arguments, input_rows_count);
-            case TypeIndex::UInt256:    return executeType<UInt256>(arguments, input_rows_count);
-            case TypeIndex::Int8:       return executeType<Int8>(arguments, input_rows_count);
-            case TypeIndex::Int16:      return executeType<Int16>(arguments, input_rows_count);
-            case TypeIndex::Int32:      return executeType<Int32>(arguments, input_rows_count);
-            case TypeIndex::Int64:      return executeType<Int64>(arguments, input_rows_count);
-            case TypeIndex::Int128:     return executeType<Int128>(arguments, input_rows_count);
-            case TypeIndex::Int256:     return executeType<Int256>(arguments, input_rows_count);
-            case TypeIndex::Float32:    return executeType<Float32>(arguments, input_rows_count);
-            case TypeIndex::Float64:    return executeType<Float64>(arguments, input_rows_count);
-            case TypeIndex::Decimal32:  return executeType<Decimal32>(arguments, input_rows_count);
-            case TypeIndex::Decimal64:  return executeType<Decimal64>(arguments, input_rows_count);
-            case TypeIndex::Decimal128: return executeType<Decimal128>(arguments, input_rows_count);
-            case TypeIndex::Decimal256: return executeType<Decimal256>(arguments, input_rows_count);
+            case TypeIndex::UInt8:      return executeType<UInt8>(arguments);
+            case TypeIndex::UInt16:     return executeType<UInt16>(arguments);
+            case TypeIndex::UInt32:     return executeType<UInt32>(arguments);
+            case TypeIndex::UInt64:     return executeType<UInt64>(arguments);
+            case TypeIndex::UInt128:    return executeType<UInt128>(arguments);
+            case TypeIndex::UInt256:    return executeType<UInt256>(arguments);
+            case TypeIndex::Int8:       return executeType<Int8>(arguments);
+            case TypeIndex::Int16:      return executeType<Int16>(arguments);
+            case TypeIndex::Int32:      return executeType<Int32>(arguments);
+            case TypeIndex::Int64:      return executeType<Int64>(arguments);
+            case TypeIndex::Int128:     return executeType<Int128>(arguments);
+            case TypeIndex::Int256:     return executeType<Int256>(arguments);
+            case TypeIndex::Float32:    return executeType<Float32>(arguments);
+            case TypeIndex::Float64:    return executeType<Float64>(arguments);
+            case TypeIndex::Decimal32:  return executeType<Decimal32>(arguments);
+            case TypeIndex::Decimal64:  return executeType<Decimal64>(arguments);
+            case TypeIndex::Decimal128: return executeType<Decimal128>(arguments);
+            case TypeIndex::Decimal256: return executeType<Decimal256>(arguments);
             default:
                 throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of argument of function {}",
                                 arguments[0].column->getName(), getName());
@@ -212,7 +212,7 @@ public:
 
 private:
     template <typename T>
-    ColumnPtr executeType(const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
+    ColumnPtr executeType(const ColumnsWithTypeAndName & arguments) const
     {
         const auto * precision_col = checkAndGetColumn<ColumnVector<UInt8>>(arguments[1].column.get());
         const auto * precision_col_const = checkAndGetColumnConst<ColumnVector<UInt8>>(arguments[1].column.get());
@@ -230,9 +230,9 @@ private:
             {
                 UInt8 from_scale = from_col->getScale();
                 if (precision_col_const)
-                    vectorConstant(from_col->getData(), precision_col_const->template getValue<UInt8>(), result_chars, result_offsets, from_scale, input_rows_count);
+                    vectorConstant(from_col->getData(), precision_col_const->template getValue<UInt8>(), result_chars, result_offsets, from_scale);
                 else if (precision_col)
-                    vectorVector(from_col->getData(), precision_col->getData(), result_chars, result_offsets, from_scale, input_rows_count);
+                    vectorVector(from_col->getData(), precision_col->getData(), result_chars, result_offsets, from_scale);
                 else
                     throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of second argument of function formatDecimal", arguments[1].column->getName());
             }
@@ -245,9 +245,9 @@ private:
             if (from_col)
             {
                 if (precision_col_const)
-                    vectorConstant(from_col->getData(), precision_col_const->template getValue<UInt8>(), result_chars, result_offsets, input_rows_count);
+                    vectorConstant(from_col->getData(), precision_col_const->template getValue<UInt8>(), result_chars, result_offsets);
                 else if (precision_col)
-                    vectorVector(from_col->getData(), precision_col->getData(), result_chars, result_offsets, input_rows_count);
+                    vectorVector(from_col->getData(), precision_col->getData(), result_chars, result_offsets);
                 else
                     throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of second argument of function formatDecimal", arguments[1].column->getName());
 
diff --git a/src/Functions/toStartOfInterval.cpp b/src/Functions/toStartOfInterval.cpp
index 6573fef6634..50442d1b448 100644
--- a/src/Functions/toStartOfInterval.cpp
+++ b/src/Functions/toStartOfInterval.cpp
@@ -10,31 +10,21 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
-#include <algorithm>
 
 
 namespace DB
 {
 namespace ErrorCodes
 {
-    extern const int ARGUMENT_OUT_OF_BOUND;
-    extern const int BAD_ARGUMENTS;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_COLUMN;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int ARGUMENT_OUT_OF_BOUND;
 }
 
 
 class FunctionToStartOfInterval : public IFunction
 {
-private:
-    enum class Overload
-    {
-        Default,    /// toStartOfInterval(time, interval) or toStartOfInterval(time, interval, timezone)
-        Origin      /// toStartOfInterval(time, interval, origin) or toStartOfInterval(time, interval, origin, timezone)
-    };
-    mutable Overload overload;
-
 public:
     static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionToStartOfInterval>(); }
 
@@ -44,7 +34,7 @@ public:
     size_t getNumberOfArguments() const override { return 0; }
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2, 3}; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2}; }
     bool hasInformationAboutMonotonicity() const override { return true; }
     Monotonicity getMonotonicityForRange(const IDataType &, const Field &, const Field &) const override { return { .is_monotonic = true, .is_always_monotonic = true }; }
 
@@ -54,9 +44,9 @@ public:
         auto check_first_argument = [&]
         {
             const DataTypePtr & type_arg1 = arguments[0].type;
-            if (!isDateOrDate32(type_arg1) && !isDateTime(type_arg1) && !isDateTime64(type_arg1))
+            if (!isDate(type_arg1) && !isDateTime(type_arg1) && !isDateTime64(type_arg1))
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Illegal type {} of 1st argument of function {}, expected a Date, Date32, DateTime or DateTime64",
+                    "Illegal type {} of 1st argument of function {}, expected a Date, DateTime or DateTime64",
                     type_arg1->getName(), getName());
             value_is_date = isDate(type_arg1);
         };
@@ -66,7 +56,6 @@ public:
         enum class ResultType : uint8_t
         {
             Date,
-            Date32,
             DateTime,
             DateTime64
         };
@@ -82,9 +71,6 @@ public:
                     "Illegal type {} of 2nd argument of function {}, expected a time interval",
                     type_arg2->getName(), getName());
 
-            overload = Overload::Default;
-
-            /// Determine result type for default overload (no origin)
             switch (interval_type->getKind()) // NOLINT(bugprone-switch-missing-default-case)
             {
                 case IntervalKind::Kind::Nanosecond:
@@ -110,49 +96,13 @@ public:
         auto check_third_argument = [&]
         {
             const DataTypePtr & type_arg3 = arguments[2].type;
-            if (isString(type_arg3))
-            {
-                if (value_is_date && result_type == ResultType::Date)
-                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                        "A timezone argument of function {} with interval type {} is allowed only when the 1st argument has the type DateTime or DateTime64",
-                        getName(), interval_type->getKind().toString());
-            }
-            else if (isDateOrDate32OrDateTimeOrDateTime64(type_arg3))
-            {
-                overload = Overload::Origin;
-                const DataTypePtr & type_arg1 = arguments[0].type;
-                if (isDate(type_arg1) && isDate(type_arg3))
-                    result_type = ResultType::Date;
-                else if (isDate32(type_arg1) && isDate32(type_arg3))
-                    result_type = ResultType::Date32;
-                else if (isDateTime(type_arg1) && isDateTime(type_arg3))
-                    result_type = ResultType::DateTime;
-                else if (isDateTime64(type_arg1) && isDateTime64(type_arg3))
-                    result_type = ResultType::DateTime64;
-                else
-                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Datetime argument and origin argument for function {} must have the same type", getName());
-            }
-            else
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of 3rd argument of function {}. "
-                    "This argument is optional and must be a constant String with timezone name or a Date/Date32/DateTime/DateTime64 with a constant origin",
-                    type_arg3->getName(), getName());
-        };
-
-        auto check_fourth_argument = [&]
-        {
-            if (overload != Overload::Origin) /// sanity check
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of 3rd argument of function {}. "
-                    "The third argument must a Date/Date32/DateTime/DateTime64 with a constant origin",
-                    arguments[2].type->getName(), getName());
-
-            const DataTypePtr & type_arg4 = arguments[3].type;
-            if (!isString(type_arg4))
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of 4th argument of function {}. "
-                    "This argument is optional and must be a constant String with timezone name",
-                    type_arg4->getName(), getName());
-            if (value_is_date && result_type == ResultType::Date)
+            if (!isString(type_arg3))
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "A timezone argument of function {} with interval type {} is allowed only when the 1st argument has the type DateTime or DateTime64",
+                    "Illegal type {} of 3rd argument of function {}, expected a constant timezone string",
+                    type_arg3->getName(), getName());
+            if (value_is_date && result_type == ResultType::Date) /// weird why this is && instead of || but too afraid to change it
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "The timezone argument of function {} with interval type {} is allowed only when the 1st argument has type DateTime or DateTimt64",
                     getName(), interval_type->getKind().toString());
         };
 
@@ -167,17 +117,10 @@ public:
             check_second_argument();
             check_third_argument();
         }
-        else if (arguments.size() == 4)
-        {
-            check_first_argument();
-            check_second_argument();
-            check_third_argument();
-            check_fourth_argument();
-        }
         else
         {
             throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                "Number of arguments for function {} doesn't match: passed {}, must be 2, 3 or 4",
+                "Number of arguments for function {} doesn't match: passed {}, should be 2 or 3",
                 getName(), arguments.size());
         }
 
@@ -185,22 +128,11 @@ public:
         {
             case ResultType::Date:
                 return std::make_shared<DataTypeDate>();
-            case ResultType::Date32:
-                return std::make_shared<DataTypeDate32>();
             case ResultType::DateTime:
-            {
-                const size_t time_zone_arg_num = (overload == Overload::Default) ? 2 : 3;
-                return std::make_shared<DataTypeDateTime>(extractTimeZoneNameFromFunctionArguments(arguments, time_zone_arg_num, 0, false));
-            }
+                return std::make_shared<DataTypeDateTime>(extractTimeZoneNameFromFunctionArguments(arguments, 2, 0, false));
             case ResultType::DateTime64:
             {
                 UInt32 scale = 0;
-                if (isDateTime64(arguments[0].type) && overload == Overload::Origin)
-                {
-                    scale = assert_cast<const DataTypeDateTime64 &>(*arguments[0].type.get()).getScale();
-                    if (assert_cast<const DataTypeDateTime64 &>(*arguments[2].type.get()).getScale() != scale)
-                        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Datetime argument and origin argument for function {} must have the same scale", getName());
-                }
                 if (interval_type->getKind() == IntervalKind::Kind::Nanosecond)
                     scale = 9;
                 else if (interval_type->getKind() == IntervalKind::Kind::Microsecond)
@@ -208,8 +140,7 @@ public:
                 else if (interval_type->getKind() == IntervalKind::Kind::Millisecond)
                     scale = 3;
 
-                const size_t time_zone_arg_num = (overload == Overload::Default) ? 2 : 3;
-                return std::make_shared<DataTypeDateTime64>(scale, extractTimeZoneNameFromFunctionArguments(arguments, time_zone_arg_num, 0, false));
+                return std::make_shared<DataTypeDateTime64>(scale, extractTimeZoneNameFromFunctionArguments(arguments, 2, 0, false));
             }
         }
 
@@ -220,91 +151,51 @@ public:
     {
         const auto & time_column = arguments[0];
         const auto & interval_column = arguments[1];
-
-        ColumnWithTypeAndName origin_column;
-        if (overload == Overload::Origin)
-            origin_column = arguments[2];
-
-        const size_t time_zone_arg_num = (overload == Overload::Default) ? 2 : 3;
-        const auto & time_zone = extractTimeZoneFromFunctionArguments(arguments, time_zone_arg_num, 0);
-
-        ColumnPtr result_column;
-        if (isDate(result_type))
-            result_column = dispatchForTimeColumn<DataTypeDate>(time_column, interval_column, origin_column, result_type, time_zone);
-        else if (isDate32(result_type))
-            result_column = dispatchForTimeColumn<DataTypeDate32>(time_column, interval_column, origin_column, result_type, time_zone);
-        else if (isDateTime(result_type))
-            result_column = dispatchForTimeColumn<DataTypeDateTime>(time_column, interval_column, origin_column, result_type, time_zone);
-        else if (isDateTime64(result_type))
-            result_column = dispatchForTimeColumn<DataTypeDateTime64>(time_column, interval_column, origin_column, result_type, time_zone);
+        const auto & time_zone = extractTimeZoneFromFunctionArguments(arguments, 2, 0);
+        auto result_column = dispatchForTimeColumn(time_column, interval_column, result_type, time_zone);
         return result_column;
     }
 
 private:
-    template <typename ReturnType>
     ColumnPtr dispatchForTimeColumn(
-        const ColumnWithTypeAndName & time_column, const ColumnWithTypeAndName & interval_column, const ColumnWithTypeAndName & origin_column, const DataTypePtr & result_type, const DateLUTImpl & time_zone) const
+        const ColumnWithTypeAndName & time_column, const ColumnWithTypeAndName & interval_column,
+        const DataTypePtr & result_type, const DateLUTImpl & time_zone) const
     {
         const auto & time_column_type = *time_column.type.get();
         const auto & time_column_col = *time_column.column.get();
 
-        if (isDate(time_column_type))
-        {
-            const auto * time_column_vec = checkAndGetColumn<ColumnDate>(&time_column_col);
-
-            if (time_column_vec)
-                return dispatchForIntervalColumn<ReturnType, DataTypeDate, ColumnDate>(assert_cast<const DataTypeDate &>(time_column_type), *time_column_vec, interval_column, origin_column, result_type, time_zone);
-        }
-        else if (isDate32(time_column_type))
-        {
-            const auto * time_column_vec = checkAndGetColumn<ColumnDate32>(&time_column_col);
-            if (time_column_vec)
-                return dispatchForIntervalColumn<ReturnType, DataTypeDate32, ColumnDate32>(assert_cast<const DataTypeDate32 &>(time_column_type), *time_column_vec, interval_column, origin_column, result_type, time_zone);
-        }
-        else if (isDateTime(time_column_type))
-        {
-            const auto * time_column_vec = checkAndGetColumn<ColumnDateTime>(&time_column_col);
-            if (time_column_vec)
-                return dispatchForIntervalColumn<ReturnType, DataTypeDateTime, ColumnDateTime>(assert_cast<const DataTypeDateTime &>(time_column_type), *time_column_vec, interval_column, origin_column, result_type, time_zone);
-        }
-        else if (isDateTime64(time_column_type))
+        if (isDateTime64(time_column_type))
         {
             const auto * time_column_vec = checkAndGetColumn<ColumnDateTime64>(&time_column_col);
             auto scale = assert_cast<const DataTypeDateTime64 &>(time_column_type).getScale();
 
             if (time_column_vec)
-                return dispatchForIntervalColumn<ReturnType, DataTypeDateTime64, ColumnDateTime64>(assert_cast<const DataTypeDateTime64 &>(time_column_type), *time_column_vec, interval_column, origin_column, result_type, time_zone, scale);
+                return dispatchForIntervalColumn(assert_cast<const DataTypeDateTime64 &>(time_column_type), *time_column_vec, interval_column, result_type, time_zone, scale);
         }
-        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal column for 1st argument of function {}, expected a Date, Date32, DateTime or DateTime64", getName());
+        else if (isDateTime(time_column_type))
+        {
+            const auto * time_column_vec = checkAndGetColumn<ColumnDateTime>(&time_column_col);
+            if (time_column_vec)
+                return dispatchForIntervalColumn(assert_cast<const DataTypeDateTime &>(time_column_type), *time_column_vec, interval_column, result_type, time_zone);
+        }
+        else if (isDate(time_column_type))
+        {
+            const auto * time_column_vec = checkAndGetColumn<ColumnDate>(&time_column_col);
+            if (time_column_vec)
+                return dispatchForIntervalColumn(assert_cast<const DataTypeDate &>(time_column_type), *time_column_vec, interval_column, result_type, time_zone);
+        }
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal column for 1st argument of function {}, expected a Date, DateTime or DateTime64", getName());
     }
 
-    template <typename ReturnType, typename TimeDataType, typename TimeColumnType>
+    template <typename TimeDataType, typename TimeColumnType>
     ColumnPtr dispatchForIntervalColumn(
-        const TimeDataType & time_data_type, const TimeColumnType & time_column, const ColumnWithTypeAndName & interval_column, const ColumnWithTypeAndName & origin_column,
+        const TimeDataType & time_data_type, const TimeColumnType & time_column, const ColumnWithTypeAndName & interval_column,
         const DataTypePtr & result_type, const DateLUTImpl & time_zone, UInt16 scale = 1) const
     {
         const auto * interval_type = checkAndGetDataType<DataTypeInterval>(interval_column.type.get());
         if (!interval_type)
             throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column for 2nd argument of function {}, must be a time interval", getName());
 
-        switch (interval_type->getKind()) // NOLINT(bugprone-switch-missing-default-case)
-        {
-            case IntervalKind::Kind::Nanosecond:
-            case IntervalKind::Kind::Microsecond:
-            case IntervalKind::Kind::Millisecond:
-                if (isDateOrDate32(time_data_type) || isDateTime(time_data_type))
-                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal interval kind for argument data type {}", isDate(time_data_type) ? "Date" : "DateTime");
-                break;
-            case IntervalKind::Kind::Second:
-            case IntervalKind::Kind::Minute:
-            case IntervalKind::Kind::Hour:
-                if (isDateOrDate32(time_data_type))
-                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal interval kind for argument data type Date");
-                break;
-            default:
-                break;
-        }
-
         const auto * interval_column_const_int64 = checkAndGetColumnConst<ColumnInt64>(interval_column.column.get());
         if (!interval_column_const_int64)
             throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column for 2nd argument of function {}, must be a const time interval", getName());
@@ -316,36 +207,39 @@ private:
         switch (interval_type->getKind()) // NOLINT(bugprone-switch-missing-default-case)
         {
             case IntervalKind::Kind::Nanosecond:
-                return execute<ReturnType, TimeDataType, TimeColumnType, IntervalKind::Kind::Nanosecond>(time_data_type, time_column, num_units, origin_column, result_type, time_zone, scale);
+                return execute<TimeDataType, TimeColumnType, DataTypeDateTime64, IntervalKind::Kind::Nanosecond>(time_data_type, time_column, num_units, result_type, time_zone, scale);
             case IntervalKind::Kind::Microsecond:
-                return execute<ReturnType, TimeDataType, TimeColumnType, IntervalKind::Kind::Microsecond>(time_data_type, time_column, num_units, origin_column, result_type, time_zone, scale);
+                return execute<TimeDataType, TimeColumnType, DataTypeDateTime64, IntervalKind::Kind::Microsecond>(time_data_type, time_column, num_units, result_type, time_zone, scale);
             case IntervalKind::Kind::Millisecond:
-                return execute<ReturnType, TimeDataType, TimeColumnType, IntervalKind::Kind::Millisecond>(time_data_type, time_column, num_units, origin_column, result_type, time_zone, scale);
+                return execute<TimeDataType, TimeColumnType, DataTypeDateTime64, IntervalKind::Kind::Millisecond>(time_data_type, time_column, num_units, result_type, time_zone, scale);
             case IntervalKind::Kind::Second:
-                return execute<ReturnType, TimeDataType, TimeColumnType, IntervalKind::Kind::Second>(time_data_type, time_column, num_units, origin_column, result_type, time_zone, scale);
+                return execute<TimeDataType, TimeColumnType, DataTypeDateTime, IntervalKind::Kind::Second>(time_data_type, time_column, num_units, result_type, time_zone, scale);
             case IntervalKind::Kind::Minute:
-                return execute<ReturnType, TimeDataType, TimeColumnType, IntervalKind::Kind::Minute>(time_data_type, time_column, num_units, origin_column, result_type, time_zone, scale);
+                return execute<TimeDataType, TimeColumnType, DataTypeDateTime, IntervalKind::Kind::Minute>(time_data_type, time_column, num_units, result_type, time_zone, scale);
             case IntervalKind::Kind::Hour:
-                return execute<ReturnType, TimeDataType, TimeColumnType, IntervalKind::Kind::Hour>(time_data_type, time_column, num_units, origin_column, result_type, time_zone, scale);
+                return execute<TimeDataType, TimeColumnType, DataTypeDateTime, IntervalKind::Kind::Hour>(time_data_type, time_column, num_units, result_type, time_zone, scale);
             case IntervalKind::Kind::Day:
-                return execute<ReturnType, TimeDataType, TimeColumnType, IntervalKind::Kind::Day>(time_data_type, time_column, num_units, origin_column, result_type, time_zone, scale);
+                return execute<TimeDataType, TimeColumnType, DataTypeDateTime, IntervalKind::Kind::Day>(time_data_type, time_column, num_units, result_type, time_zone, scale);
             case IntervalKind::Kind::Week:
-                return execute<ReturnType, TimeDataType, TimeColumnType, IntervalKind::Kind::Week>(time_data_type, time_column, num_units, origin_column, result_type, time_zone, scale);
+                return execute<TimeDataType, TimeColumnType, DataTypeDate, IntervalKind::Kind::Week>(time_data_type, time_column, num_units, result_type, time_zone, scale);
             case IntervalKind::Kind::Month:
-                return execute<ReturnType, TimeDataType, TimeColumnType, IntervalKind::Kind::Month>(time_data_type, time_column, num_units, origin_column, result_type, time_zone, scale);
+                return execute<TimeDataType, TimeColumnType, DataTypeDate, IntervalKind::Kind::Month>(time_data_type, time_column, num_units, result_type, time_zone, scale);
             case IntervalKind::Kind::Quarter:
-                return execute<ReturnType, TimeDataType, TimeColumnType, IntervalKind::Kind::Quarter>(time_data_type, time_column, num_units, origin_column, result_type, time_zone, scale);
+                return execute<TimeDataType, TimeColumnType, DataTypeDate, IntervalKind::Kind::Quarter>(time_data_type, time_column, num_units, result_type, time_zone, scale);
             case IntervalKind::Kind::Year:
-                return execute<ReturnType, TimeDataType, TimeColumnType, IntervalKind::Kind::Year>(time_data_type, time_column, num_units, origin_column, result_type, time_zone, scale);
+                return execute<TimeDataType, TimeColumnType, DataTypeDate, IntervalKind::Kind::Year>(time_data_type, time_column, num_units, result_type, time_zone, scale);
         }
 
         std::unreachable();
     }
 
-    template <typename ResultDataType, typename TimeDataType, typename TimeColumnType, IntervalKind::Kind unit>
-    ColumnPtr execute(const TimeDataType &, const TimeColumnType & time_column_type, Int64 num_units, const ColumnWithTypeAndName & origin_column, const DataTypePtr & result_type, const DateLUTImpl & time_zone, UInt16 scale) const
+    template <typename TimeDataType, typename TimeColumnType, typename ResultDataType, IntervalKind::Kind unit>
+    ColumnPtr execute(
+        const TimeDataType &, const TimeColumnType & time_column_type, Int64 num_units,
+        const DataTypePtr & result_type, const DateLUTImpl & time_zone, UInt16 scale) const
     {
         using ResultColumnType = typename ResultDataType::ColumnType;
+        using ResultFieldType = typename ResultDataType::FieldType;
 
         const auto & time_data = time_column_type.getData();
         size_t size = time_data.size();
@@ -357,61 +251,8 @@ private:
 
         Int64 scale_multiplier = DecimalUtils::scaleMultiplier<DateTime64>(scale);
 
-        if (origin_column.column) // Overload: Origin
-        {
-            const bool is_small_interval = (unit == IntervalKind::Kind::Nanosecond || unit == IntervalKind::Kind::Microsecond || unit == IntervalKind::Kind::Millisecond);
-            const bool is_result_date = isDateOrDate32(result_type);
-
-            Int64 result_scale = scale_multiplier;
-            Int64 origin_scale = 1;
-
-            if (isDateTime64(result_type)) /// We have origin scale only in case if arguments are DateTime64.
-                origin_scale = assert_cast<const DataTypeDateTime64 &>(*origin_column.type).getScaleMultiplier();
-            else if (!is_small_interval) /// In case of large interval and arguments are not DateTime64, we should not have scale in result.
-                result_scale = 1;
-
-            if (is_small_interval)
-                result_scale = assert_cast<const DataTypeDateTime64 &>(*result_type).getScaleMultiplier();
-
-            /// In case if we have a difference between time arguments and Interval, we need to calculate the difference between them
-            /// to get the right precision for the result. In case of large intervals, we should not have scale difference.
-            Int64 scale_diff = is_small_interval ? std::max(result_scale / origin_scale, origin_scale / result_scale) : 1;
-
-            static constexpr Int64 SECONDS_PER_DAY = 86'400;
-
-            UInt64 origin = origin_column.column->get64(0);
-            for (size_t i = 0; i != size; ++i)
-            {
-                UInt64 time_arg = time_data[i];
-                if (origin > static_cast<size_t>(time_arg))
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "The origin must be before the end date / date with time");
-
-                if (is_result_date) /// All internal calculations of ToStartOfInterval<...> expect arguments to be seconds or milli-, micro-, nanoseconds.
-                {
-                    time_arg *= SECONDS_PER_DAY;
-                    origin *= SECONDS_PER_DAY;
-                }
-
-                Int64 offset = ToStartOfInterval<unit>::execute(time_arg - origin, num_units, time_zone, result_scale, origin);
-
-                /// In case if arguments are DateTime64 with large interval, we should apply scale on it.
-                offset *= (!is_small_interval) ? result_scale : 1;
-
-                if (is_result_date) /// Convert back to date after calculations.
-                {
-                    offset /= SECONDS_PER_DAY;
-                    origin /= SECONDS_PER_DAY;
-                }
-
-                result_data[i] = 0;
-                result_data[i] += (result_scale < origin_scale) ? (origin + offset) / scale_diff : (origin + offset) * scale_diff;
-            }
-        }
-        else // Overload: Default
-        {
-            for (size_t i = 0; i != size; ++i)
-                result_data[i] = static_cast<typename ResultDataType::FieldType>(ToStartOfInterval<unit>::execute(time_data[i], num_units, time_zone, scale_multiplier));
-        }
+        for (size_t i = 0; i != size; ++i)
+            result_data[i] = static_cast<ResultFieldType>(ToStartOfInterval<unit>::execute(time_data[i], num_units, time_zone, scale_multiplier));
 
         return result_col;
     }
diff --git a/src/Functions/toValidUTF8.cpp b/src/Functions/toValidUTF8.cpp
index 376732256b0..41d29d9c494 100644
--- a/src/Functions/toValidUTF8.cpp
+++ b/src/Functions/toValidUTF8.cpp
@@ -128,16 +128,16 @@ struct ToValidUTF8Impl
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
+        const size_t offsets_size = offsets.size();
         /// It can be larger than that, but we believe it is unlikely to happen.
         res_data.resize(data.size());
-        res_offsets.resize(input_rows_count);
+        res_offsets.resize(offsets_size);
 
         size_t prev_offset = 0;
         WriteBufferFromVector<ColumnString::Chars> write_buffer(res_data);
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < offsets_size; ++i)
         {
             const char * haystack_data = reinterpret_cast<const char *>(&data[prev_offset]);
             const size_t haystack_size = offsets[i] - prev_offset - 1;
@@ -149,7 +149,7 @@ struct ToValidUTF8Impl
         write_buffer.finalize();
     }
 
-    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
         throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Column of type FixedString is not supported by toValidUTF8 function");
     }
diff --git a/src/Functions/tokenExtractors.cpp b/src/Functions/tokenExtractors.cpp
index 1bbf313fbae..e7dcb5cced3 100644
--- a/src/Functions/tokenExtractors.cpp
+++ b/src/Functions/tokenExtractors.cpp
@@ -73,7 +73,7 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>());
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         auto column_offsets = ColumnArray::ColumnOffsets::create();
 
@@ -90,9 +90,9 @@ public:
             auto input_column = arguments[0].column;
 
             if (const auto * column_string = checkAndGetColumn<ColumnString>(input_column.get()))
-                executeImpl(extractor, *column_string, *result_column_string, *column_offsets, input_rows_count);
+                executeImpl(extractor, *column_string, *result_column_string, *column_offsets);
             else if (const auto * column_fixed_string = checkAndGetColumn<ColumnFixedString>(input_column.get()))
-                executeImpl(extractor, *column_fixed_string, *result_column_string, *column_offsets, input_rows_count);
+                executeImpl(extractor, *column_fixed_string, *result_column_string, *column_offsets);
 
             return ColumnArray::create(std::move(result_column_string), std::move(column_offsets));
         }
@@ -105,9 +105,9 @@ public:
             auto input_column = arguments[0].column;
 
             if (const auto * column_string = checkAndGetColumn<ColumnString>(input_column.get()))
-                executeImpl(extractor, *column_string, *result_column_string, *column_offsets, input_rows_count);
+                executeImpl(extractor, *column_string, *result_column_string, *column_offsets);
             else if (const auto * column_fixed_string = checkAndGetColumn<ColumnFixedString>(input_column.get()))
-                executeImpl(extractor, *column_fixed_string, *result_column_string, *column_offsets, input_rows_count);
+                executeImpl(extractor, *column_fixed_string, *result_column_string, *column_offsets);
 
             return ColumnArray::create(std::move(result_column_string), std::move(column_offsets));
         }
@@ -120,15 +120,15 @@ private:
         const ExtractorType & extractor,
         StringColumnType & input_data_column,
         ResultStringColumnType & result_data_column,
-        ColumnArray::ColumnOffsets & offsets_column,
-        size_t input_rows_count) const
+        ColumnArray::ColumnOffsets & offsets_column) const
     {
         size_t current_tokens_size = 0;
         auto & offsets_data = offsets_column.getData();
 
-        offsets_data.resize(input_rows_count);
+        size_t column_size = input_data_column.size();
+        offsets_data.resize(column_size);
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < column_size; ++i)
         {
             auto data = input_data_column.getDataAt(i);
 
diff --git a/src/Functions/transform.cpp b/src/Functions/transform.cpp
index 0dfc9197845..68500779f93 100644
--- a/src/Functions/transform.cpp
+++ b/src/Functions/transform.cpp
@@ -173,30 +173,30 @@ namespace
             }
             else if (cache.table_num_to_idx)
             {
-                if (!executeNum<ColumnVector<UInt8>>(in, *column_result, default_non_const, *in_casted, input_rows_count)
-                    && !executeNum<ColumnVector<UInt16>>(in, *column_result, default_non_const, *in_casted, input_rows_count)
-                    && !executeNum<ColumnVector<UInt32>>(in, *column_result, default_non_const, *in_casted, input_rows_count)
-                    && !executeNum<ColumnVector<UInt64>>(in, *column_result, default_non_const, *in_casted, input_rows_count)
-                    && !executeNum<ColumnVector<Int8>>(in, *column_result, default_non_const, *in_casted, input_rows_count)
-                    && !executeNum<ColumnVector<Int16>>(in, *column_result, default_non_const, *in_casted, input_rows_count)
-                    && !executeNum<ColumnVector<Int32>>(in, *column_result, default_non_const, *in_casted, input_rows_count)
-                    && !executeNum<ColumnVector<Int64>>(in, *column_result, default_non_const, *in_casted, input_rows_count)
-                    && !executeNum<ColumnVector<Float32>>(in, *column_result, default_non_const, *in_casted, input_rows_count)
-                    && !executeNum<ColumnVector<Float64>>(in, *column_result, default_non_const, *in_casted, input_rows_count)
-                    && !executeNum<ColumnDecimal<Decimal32>>(in, *column_result, default_non_const, *in_casted, input_rows_count)
-                    && !executeNum<ColumnDecimal<Decimal64>>(in, *column_result, default_non_const, *in_casted, input_rows_count))
+                if (!executeNum<ColumnVector<UInt8>>(in, *column_result, default_non_const, *in_casted)
+                    && !executeNum<ColumnVector<UInt16>>(in, *column_result, default_non_const, *in_casted)
+                    && !executeNum<ColumnVector<UInt32>>(in, *column_result, default_non_const, *in_casted)
+                    && !executeNum<ColumnVector<UInt64>>(in, *column_result, default_non_const, *in_casted)
+                    && !executeNum<ColumnVector<Int8>>(in, *column_result, default_non_const, *in_casted)
+                    && !executeNum<ColumnVector<Int16>>(in, *column_result, default_non_const, *in_casted)
+                    && !executeNum<ColumnVector<Int32>>(in, *column_result, default_non_const, *in_casted)
+                    && !executeNum<ColumnVector<Int64>>(in, *column_result, default_non_const, *in_casted)
+                    && !executeNum<ColumnVector<Float32>>(in, *column_result, default_non_const, *in_casted)
+                    && !executeNum<ColumnVector<Float64>>(in, *column_result, default_non_const, *in_casted)
+                    && !executeNum<ColumnDecimal<Decimal32>>(in, *column_result, default_non_const, *in_casted)
+                    && !executeNum<ColumnDecimal<Decimal64>>(in, *column_result, default_non_const, *in_casted))
                 {
                     throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}", in->getName(), getName());
                 }
             }
             else if (cache.table_string_to_idx)
             {
-                if (!executeString(in, *column_result, default_non_const, *in_casted, input_rows_count))
-                    executeContiguous(in, *column_result, default_non_const, *in_casted, input_rows_count);
+                if (!executeString(in, *column_result, default_non_const, *in_casted))
+                    executeContiguous(in, *column_result, default_non_const, *in_casted);
             }
             else if (cache.table_anything_to_idx)
             {
-                executeAnything(in, *column_result, default_non_const, *in_casted, input_rows_count);
+                executeAnything(in, *column_result, default_non_const, *in_casted);
             }
             else
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "State of the function `transform` is not initialized");
@@ -217,11 +217,12 @@ namespace
             return impl->execute(args, result_type, input_rows_count);
         }
 
-        void executeAnything(const IColumn * in, IColumn & column_result, const ColumnPtr default_non_const, const IColumn & in_casted, size_t input_rows_count) const
+        void executeAnything(const IColumn * in, IColumn & column_result, const ColumnPtr default_non_const, const IColumn & in_casted) const
         {
+            const size_t size = in->size();
             const auto & table = *cache.table_anything_to_idx;
-            column_result.reserve(input_rows_count);
-            for (size_t i = 0; i < input_rows_count; ++i)
+            column_result.reserve(size);
+            for (size_t i = 0; i < size; ++i)
             {
                 SipHash hash;
                 in->updateHashWithValue(i, hash);
@@ -238,11 +239,12 @@ namespace
             }
         }
 
-        void executeContiguous(const IColumn * in, IColumn & column_result, const ColumnPtr default_non_const, const IColumn & in_casted, size_t input_rows_count) const
+        void executeContiguous(const IColumn * in, IColumn & column_result, const ColumnPtr default_non_const, const IColumn & in_casted) const
         {
+            const size_t size = in->size();
             const auto & table = *cache.table_string_to_idx;
-            column_result.reserve(input_rows_count);
-            for (size_t i = 0; i < input_rows_count; ++i)
+            column_result.reserve(size);
+            for (size_t i = 0; i < size; ++i)
             {
                 const auto * it = table.find(in->getDataAt(i));
                 if (it)
@@ -257,7 +259,7 @@ namespace
         }
 
         template <typename T>
-        bool executeNum(const IColumn * in_untyped, IColumn & column_result, const ColumnPtr default_non_const, const IColumn & in_casted, size_t input_rows_count) const
+        bool executeNum(const IColumn * in_untyped, IColumn & column_result, const ColumnPtr default_non_const, const IColumn & in_casted) const
         {
             const auto * const in = checkAndGetColumn<T>(in_untyped);
             if (!in)
@@ -267,23 +269,24 @@ namespace
             if constexpr (std::is_same_v<ColumnDecimal<Decimal32>, T> || std::is_same_v<ColumnDecimal<Decimal64>, T>)
                 in_scale = in->getScale();
 
-            if (!executeNumToString(pod, column_result, default_non_const, input_rows_count)
-                && !executeNumToNum<ColumnVector<UInt8>>(pod, column_result, default_non_const, in_scale, input_rows_count)
-                && !executeNumToNum<ColumnVector<UInt16>>(pod, column_result, default_non_const, in_scale, input_rows_count)
-                && !executeNumToNum<ColumnVector<UInt32>>(pod, column_result, default_non_const, in_scale, input_rows_count)
-                && !executeNumToNum<ColumnVector<UInt64>>(pod, column_result, default_non_const, in_scale, input_rows_count)
-                && !executeNumToNum<ColumnVector<Int8>>(pod, column_result, default_non_const, in_scale, input_rows_count)
-                && !executeNumToNum<ColumnVector<Int16>>(pod, column_result, default_non_const, in_scale, input_rows_count)
-                && !executeNumToNum<ColumnVector<Int32>>(pod, column_result, default_non_const, in_scale, input_rows_count)
-                && !executeNumToNum<ColumnVector<Int64>>(pod, column_result, default_non_const, in_scale, input_rows_count)
-                && !executeNumToNum<ColumnVector<Float32>>(pod, column_result, default_non_const, in_scale, input_rows_count)
-                && !executeNumToNum<ColumnVector<Float64>>(pod, column_result, default_non_const, in_scale, input_rows_count)
-                && !executeNumToNum<ColumnDecimal<Decimal32>>(pod, column_result, default_non_const, in_scale, input_rows_count)
-                && !executeNumToNum<ColumnDecimal<Decimal64>>(pod, column_result, default_non_const, in_scale, input_rows_count))
+            if (!executeNumToString(pod, column_result, default_non_const)
+                && !executeNumToNum<ColumnVector<UInt8>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<UInt16>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<UInt32>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<UInt64>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<Int8>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<Int16>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<Int32>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<Int64>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<Float32>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnVector<Float64>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnDecimal<Decimal32>>(pod, column_result, default_non_const, in_scale)
+                && !executeNumToNum<ColumnDecimal<Decimal64>>(pod, column_result, default_non_const, in_scale))
             {
+                const size_t size = pod.size();
                 const auto & table = *cache.table_num_to_idx;
-                column_result.reserve(input_rows_count);
-                for (size_t i = 0; i < input_rows_count; ++i)
+                column_result.reserve(size);
+                for (size_t i = 0; i < size; ++i)
                 {
                     const auto * it = table.find(bit_cast<UInt64>(pod[i]));
                     if (it)
@@ -300,13 +303,14 @@ namespace
         }
 
         template <typename T>
-        bool executeNumToString(const PaddedPODArray<T> & pod, IColumn & column_result, const ColumnPtr default_non_const, size_t input_rows_count) const
+        bool executeNumToString(const PaddedPODArray<T> & pod, IColumn & column_result, const ColumnPtr default_non_const) const
         {
             auto * out = typeid_cast<ColumnString *>(&column_result);
             if (!out)
                 return false;
             auto & out_offs = out->getOffsets();
-            out_offs.resize(input_rows_count);
+            const size_t size = pod.size();
+            out_offs.resize(size);
             auto & out_chars = out->getChars();
 
             const auto * to_col = assert_cast<const ColumnString *>(cache.to_column.get());
@@ -321,14 +325,14 @@ namespace
                 const auto & def_offs = def->getOffsets();
                 const auto * def_data = def_chars.data();
                 auto def_size = def_offs[0];
-                executeNumToStringHelper(table, pod, out_chars, out_offs, to_chars, to_offs, def_data, def_size, input_rows_count);
+                executeNumToStringHelper(table, pod, out_chars, out_offs, to_chars, to_offs, def_data, def_size, size);
             }
             else
             {
                 const auto * def = assert_cast<const ColumnString *>(default_non_const.get());
                 const auto & def_chars = def->getChars();
                 const auto & def_offs = def->getOffsets();
-                executeNumToStringHelper(table, pod, out_chars, out_offs, to_chars, to_offs, def_chars, def_offs, input_rows_count);
+                executeNumToStringHelper(table, pod, out_chars, out_offs, to_chars, to_offs, def_chars, def_offs, size);
             }
             return true;
         }
@@ -343,10 +347,10 @@ namespace
             const ColumnString::Offsets & to_offsets,
             const DefData & def_data,
             const DefOffs & def_offsets,
-            size_t input_rows_count) const
+            const size_t size) const
         {
             size_t out_cur_off = 0;
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 const char8_t * to = nullptr;
                 size_t to_size = 0;
@@ -378,13 +382,14 @@ namespace
 
         template <typename T, typename U>
         bool executeNumToNum(
-            const PaddedPODArray<U> & pod, IColumn & column_result, ColumnPtr default_non_const, UInt32 in_scale, size_t input_rows_count) const
+            const PaddedPODArray<U> & pod, IColumn & column_result, const ColumnPtr default_non_const, const UInt32 in_scale) const
         {
             auto * out = typeid_cast<T *>(&column_result);
             if (!out)
                 return false;
             auto & out_pod = out->getData();
-            out_pod.resize(input_rows_count);
+            const size_t size = pod.size();
+            out_pod.resize(size);
             UInt32 out_scale = 0;
             if constexpr (std::is_same_v<ColumnDecimal<Decimal32>, T> || std::is_same_v<ColumnDecimal<Decimal64>, T>)
                 out_scale = out->getScale();
@@ -394,15 +399,15 @@ namespace
             if (cache.default_column)
             {
                 const auto const_def = assert_cast<const T *>(cache.default_column.get())->getData()[0];
-                executeNumToNumHelper(table, pod, out_pod, to_pod, const_def, input_rows_count, out_scale, out_scale);
+                executeNumToNumHelper(table, pod, out_pod, to_pod, const_def, size, out_scale, out_scale);
             }
             else if (default_non_const)
             {
                 const auto & nconst_def = assert_cast<const T *>(default_non_const.get())->getData();
-                executeNumToNumHelper(table, pod, out_pod, to_pod, nconst_def, input_rows_count, out_scale, out_scale);
+                executeNumToNumHelper(table, pod, out_pod, to_pod, nconst_def, size, out_scale, out_scale);
             }
             else
-                executeNumToNumHelper(table, pod, out_pod, to_pod, pod, input_rows_count, out_scale, in_scale);
+                executeNumToNumHelper(table, pod, out_pod, to_pod, pod, size, out_scale, in_scale);
             return true;
         }
 
@@ -413,11 +418,11 @@ namespace
             PaddedPODArray<Out> & out_pod,
             const PaddedPODArray<Out> & to_pod,
             const Def & def,
-            size_t input_rows_count,
-            UInt32 out_scale,
-            UInt32 def_scale) const
+            const size_t size,
+            const UInt32 out_scale,
+            const UInt32 def_scale) const
         {
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 const auto * it = table.find(bit_cast<UInt64>(pod[i]));
                 if (it)
@@ -445,7 +450,7 @@ namespace
             }
         }
 
-        bool executeString(const IColumn * in_untyped, IColumn & column_result, const ColumnPtr default_non_const, const IColumn & in_casted, size_t input_rows_count) const
+        bool executeString(const IColumn * in_untyped, IColumn & column_result, const ColumnPtr default_non_const, const IColumn & in_casted) const
         {
             const auto * const in = checkAndGetColumn<ColumnString>(in_untyped);
             if (!in)
@@ -453,19 +458,19 @@ namespace
             const auto & data = in->getChars();
             const auto & offsets = in->getOffsets();
 
-            if (!executeStringToString(data, offsets, column_result, default_non_const, input_rows_count)
-                && !executeStringToNum<ColumnVector<UInt8>>(data, offsets, column_result, default_non_const, input_rows_count)
-                && !executeStringToNum<ColumnVector<UInt16>>(data, offsets, column_result, default_non_const, input_rows_count)
-                && !executeStringToNum<ColumnVector<UInt32>>(data, offsets, column_result, default_non_const, input_rows_count)
-                && !executeStringToNum<ColumnVector<UInt64>>(data, offsets, column_result, default_non_const, input_rows_count)
-                && !executeStringToNum<ColumnVector<Int8>>(data, offsets, column_result, default_non_const, input_rows_count)
-                && !executeStringToNum<ColumnVector<Int16>>(data, offsets, column_result, default_non_const, input_rows_count)
-                && !executeStringToNum<ColumnVector<Int32>>(data, offsets, column_result, default_non_const, input_rows_count)
-                && !executeStringToNum<ColumnVector<Int64>>(data, offsets, column_result, default_non_const, input_rows_count)
-                && !executeStringToNum<ColumnVector<Float32>>(data, offsets, column_result, default_non_const, input_rows_count)
-                && !executeStringToNum<ColumnVector<Float64>>(data, offsets, column_result, default_non_const, input_rows_count)
-                && !executeStringToNum<ColumnDecimal<Decimal32>>(data, offsets, column_result, default_non_const, input_rows_count)
-                && !executeStringToNum<ColumnDecimal<Decimal64>>(data, offsets, column_result, default_non_const, input_rows_count))
+            if (!executeStringToString(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<UInt8>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<UInt16>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<UInt32>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<UInt64>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<Int8>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<Int16>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<Int32>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<Int64>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<Float32>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnVector<Float64>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnDecimal<Decimal32>>(data, offsets, column_result, default_non_const)
+                && !executeStringToNum<ColumnDecimal<Decimal64>>(data, offsets, column_result, default_non_const))
             {
                 const size_t size = offsets.size();
                 const auto & table = *cache.table_string_to_idx;
@@ -492,14 +497,14 @@ namespace
             const ColumnString::Chars & data,
             const ColumnString::Offsets & offsets,
             IColumn & column_result,
-            const ColumnPtr default_non_const,
-            size_t input_rows_count) const
+            const ColumnPtr default_non_const) const
         {
             auto * out = typeid_cast<ColumnString *>(&column_result);
             if (!out)
                 return false;
             auto & out_offs = out->getOffsets();
-            out_offs.resize(input_rows_count);
+            const size_t size = offsets.size();
+            out_offs.resize(size);
             auto & out_chars = out->getChars();
 
             const auto * to_col = assert_cast<const ColumnString *>(cache.to_column.get());
@@ -514,18 +519,18 @@ namespace
                 const auto & def_offs = def->getOffsets();
                 const auto * def_data = def_chars.data();
                 auto def_size = def_offs[0];
-                executeStringToStringHelper(table, data, offsets, out_chars, out_offs, to_chars, to_offs, def_data, def_size, input_rows_count);
+                executeStringToStringHelper(table, data, offsets, out_chars, out_offs, to_chars, to_offs, def_data, def_size, size);
             }
             else if (default_non_const)
             {
                 const auto * def = assert_cast<const ColumnString *>(default_non_const.get());
                 const auto & def_chars = def->getChars();
                 const auto & def_offs = def->getOffsets();
-                executeStringToStringHelper(table, data, offsets, out_chars, out_offs, to_chars, to_offs, def_chars, def_offs, input_rows_count);
+                executeStringToStringHelper(table, data, offsets, out_chars, out_offs, to_chars, to_offs, def_chars, def_offs, size);
             }
             else
             {
-                executeStringToStringHelper(table, data, offsets, out_chars, out_offs, to_chars, to_offs, data, offsets, input_rows_count);
+                executeStringToStringHelper(table, data, offsets, out_chars, out_offs, to_chars, to_offs, data, offsets, size);
             }
             return true;
         }
@@ -541,11 +546,11 @@ namespace
             const ColumnString::Offsets & to_offsets,
             const DefData & def_data,
             const DefOffs & def_offsets,
-            size_t input_rows_count) const
+            const size_t size) const
         {
             ColumnString::Offset current_offset = 0;
             size_t out_cur_off = 0;
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 const char8_t * to = nullptr;
                 size_t to_size = 0;
@@ -582,26 +587,26 @@ namespace
             const ColumnString::Chars & data,
             const ColumnString::Offsets & offsets,
             IColumn & column_result,
-            const ColumnPtr default_non_const,
-            size_t input_rows_count) const
+            const ColumnPtr default_non_const) const
         {
             auto * out = typeid_cast<T *>(&column_result);
             if (!out)
                 return false;
             auto & out_pod = out->getData();
-            out_pod.resize(input_rows_count);
+            const size_t size = offsets.size();
+            out_pod.resize(size);
 
             const auto & to_pod = assert_cast<const T *>(cache.to_column.get())->getData();
             const auto & table = *cache.table_string_to_idx;
             if (cache.default_column)
             {
                 const auto const_def = assert_cast<const T *>(cache.default_column.get())->getData()[0];
-                executeStringToNumHelper(table, data, offsets, out_pod, to_pod, const_def, input_rows_count);
+                executeStringToNumHelper(table, data, offsets, out_pod, to_pod, const_def, size);
             }
             else
             {
                 const auto & nconst_def = assert_cast<const T *>(default_non_const.get())->getData();
-                executeStringToNumHelper(table, data, offsets, out_pod, to_pod, nconst_def, input_rows_count);
+                executeStringToNumHelper(table, data, offsets, out_pod, to_pod, nconst_def, size);
             }
             return true;
         }
@@ -614,10 +619,10 @@ namespace
             PaddedPODArray<Out> & out_pod,
             const PaddedPODArray<Out> & to_pod,
             const Def & def,
-            size_t input_rows_count) const
+            const size_t size) const
         {
             ColumnString::Offset current_offset = 0;
-            for (size_t i = 0; i < input_rows_count; ++i)
+            for (size_t i = 0; i < size; ++i)
             {
                 const StringRef ref{&data[current_offset], offsets[i] - current_offset - 1};
                 current_offset = offsets[i];
diff --git a/src/Functions/translate.cpp b/src/Functions/translate.cpp
index 366640d7d20..2df08a5664e 100644
--- a/src/Functions/translate.cpp
+++ b/src/Functions/translate.cpp
@@ -52,8 +52,7 @@ struct TranslateImpl
         const std::string & map_from,
         const std::string & map_to,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         Map map;
         fillMapWithValues(map, map_from, map_to);
@@ -63,7 +62,7 @@ struct TranslateImpl
 
         UInt8 * dst = res_data.data();
 
-        for (UInt64 i = 0; i < input_rows_count; ++i)
+        for (UInt64 i = 0; i < offsets.size(); ++i)
         {
             const UInt8 * src = data.data() + offsets[i - 1];
             const UInt8 * src_end = data.data() + offsets[i] - 1;
@@ -176,20 +175,19 @@ struct TranslateUTF8Impl
         const std::string & map_from,
         const std::string & map_to,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
         MapASCII map_ascii;
         MapUTF8 map;
         fillMapWithValues(map_ascii, map, map_from, map_to);
 
         res_data.resize(data.size());
-        res_offsets.resize(input_rows_count);
+        res_offsets.resize(offsets.size());
 
         UInt8 * dst = res_data.data();
         UInt64 data_size = 0;
 
-        for (UInt64 i = 0; i < input_rows_count; ++i)
+        for (UInt64 i = 0; i < offsets.size(); ++i)
         {
             const UInt8 * src = data.data() + offsets[i - 1];
             const UInt8 * src_end = data.data() + offsets[i] - 1;
@@ -313,7 +311,7 @@ public:
         }
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr column_src = arguments[0].column;
         const ColumnPtr column_map_from = arguments[1].column;
@@ -332,7 +330,7 @@ public:
         if (const ColumnString * col = checkAndGetColumn<ColumnString>(column_src.get()))
         {
             auto col_res = ColumnString::create();
-            Impl::vector(col->getChars(), col->getOffsets(), map_from, map_to, col_res->getChars(), col_res->getOffsets(), input_rows_count);
+            Impl::vector(col->getChars(), col->getOffsets(), map_from, map_to, col_res->getChars(), col_res->getOffsets());
             return col_res;
         }
         else if (const ColumnFixedString * col_fixed = checkAndGetColumn<ColumnFixedString>(column_src.get()))
diff --git a/src/Functions/trim.cpp b/src/Functions/trim.cpp
index 5703e871423..1f0011b8e99 100644
--- a/src/Functions/trim.cpp
+++ b/src/Functions/trim.cpp
@@ -43,10 +43,10 @@ public:
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets,
-        size_t input_rows_count)
+        ColumnString::Offsets & res_offsets)
     {
-        res_offsets.resize_exact(input_rows_count);
+        size_t size = offsets.size();
+        res_offsets.resize_exact(size);
         res_data.reserve_exact(data.size());
 
         size_t prev_offset = 0;
@@ -55,7 +55,7 @@ public:
         const UInt8 * start;
         size_t length;
 
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             execute(reinterpret_cast<const UInt8 *>(&data[prev_offset]), offsets[i] - prev_offset - 1, start, length);
 
@@ -69,7 +69,7 @@ public:
         }
     }
 
-    static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &, size_t)
+    static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
     {
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Functions trimLeft, trimRight and trimBoth cannot work with FixedString argument");
     }
diff --git a/src/Functions/tupleToNameValuePairs.cpp b/src/Functions/tupleToNameValuePairs.cpp
index 92734d3d1fc..998e0da4f0c 100644
--- a/src/Functions/tupleToNameValuePairs.cpp
+++ b/src/Functions/tupleToNameValuePairs.cpp
@@ -99,16 +99,16 @@ public:
         return std::make_shared<DataTypeArray>(item_data_type);
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const IColumn * tuple_col = arguments[0].column.get();
         const DataTypeTuple * tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
-        const auto * tuple_col_concrete = assert_cast<const ColumnTuple *>(tuple_col);
+        const auto * tuple_col_concrete = assert_cast<const ColumnTuple*>(tuple_col);
 
         auto keys = ColumnString::create();
         MutableColumnPtr values = tuple_col_concrete->getColumn(0).cloneEmpty();
         auto offsets = ColumnVector<UInt64>::create();
-        for (size_t row = 0; row < input_rows_count; ++row)
+        for (size_t row = 0; row < tuple_col_concrete->size(); ++row)
         {
             for (size_t col = 0; col < tuple_col_concrete->tupleSize(); ++col)
             {
diff --git a/src/Functions/upperUTF8.cpp b/src/Functions/upperUTF8.cpp
index ef26430331f..659e67f0ef3 100644
--- a/src/Functions/upperUTF8.cpp
+++ b/src/Functions/upperUTF8.cpp
@@ -1,10 +1,8 @@
-#include "config.h"
-
-#if USE_ICU
-
-#include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
 #include <Functions/LowerUpperUTF8Impl.h>
+#include <Functions/FunctionFactory.h>
+#include <Poco/Unicode.h>
+
 
 namespace DB
 {
@@ -16,25 +14,13 @@ struct NameUpperUTF8
     static constexpr auto name = "upperUTF8";
 };
 
-using FunctionUpperUTF8 = FunctionStringToString<LowerUpperUTF8Impl<'a', 'z', true>, NameUpperUTF8>;
+using FunctionUpperUTF8 = FunctionStringToString<LowerUpperUTF8Impl<'a', 'z', Poco::Unicode::toUpper, UTF8CyrillicToCase<false>>, NameUpperUTF8>;
 
 }
 
 REGISTER_FUNCTION(UpperUTF8)
 {
-    FunctionDocumentation::Description description
-        = R"(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.)";
-    FunctionDocumentation::Syntax syntax = "upperUTF8(input)";
-    FunctionDocumentation::Arguments arguments = {{"input", "Input with String type"}};
-    FunctionDocumentation::ReturnedValue returned_value = "A String data type value";
-    FunctionDocumentation::Examples examples = {
-        {"first", "SELECT upperUTF8('München') as Upperutf8;", "MÜNCHEN"},
-    };
-    FunctionDocumentation::Categories categories = {"String"};
-
-    factory.registerFunction<FunctionUpperUTF8>({description, syntax, arguments, returned_value, examples, categories});
+    factory.registerFunction<FunctionUpperUTF8>();
 }
 
 }
-
-#endif
diff --git a/src/Functions/visibleWidth.cpp b/src/Functions/visibleWidth.cpp
index 3e70418a456..ebd4a1ff713 100644
--- a/src/Functions/visibleWidth.cpp
+++ b/src/Functions/visibleWidth.cpp
@@ -66,8 +66,9 @@ public:
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto & src = arguments[0];
+        size_t size = input_rows_count;
 
-        auto res_col = ColumnUInt64::create(input_rows_count);
+        auto res_col = ColumnUInt64::create(size);
         auto & res_data = assert_cast<ColumnUInt64 &>(*res_col).getData();
 
         /// For simplicity reasons, the function is implemented by serializing into temporary buffer.
@@ -75,7 +76,7 @@ public:
         String tmp;
         FormatSettings format_settings;
         auto serialization = src.type->getDefaultSerialization();
-        for (size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < size; ++i)
         {
             {
                 WriteBufferFromString out(tmp);
diff --git a/src/Functions/widthBucket.cpp b/src/Functions/widthBucket.cpp
index ba24362034f..d007cc968f0 100644
--- a/src/Functions/widthBucket.cpp
+++ b/src/Functions/widthBucket.cpp
@@ -166,12 +166,12 @@ class FunctionWidthBucket : public IFunction
         result_column->reserve(1);
         auto & result_data = result_column->getData();
 
-        for (size_t row = 0; row < input_rows_count; ++row)
+        for (const auto row_index : collections::range(0, input_rows_count))
         {
-            const auto operand = getValue<Float64>(operands_col_const, operands_vec, row);
-            const auto low = getValue<Float64>(lows_col_const, lows_vec, row);
-            const auto high = getValue<Float64>(highs_col_const, highs_vec, row);
-            const auto count = getValue<TCountType>(counts_col_const, counts_vec, row);
+            const auto operand = getValue<Float64>(operands_col_const, operands_vec, row_index);
+            const auto low = getValue<Float64>(lows_col_const, lows_vec, row_index);
+            const auto high = getValue<Float64>(highs_col_const, highs_vec, row_index);
+            const auto count = getValue<TCountType>(counts_col_const, counts_vec, row_index);
             result_data.push_back(calculate<ResultType>(operand, low, high, count));
         }
 
diff --git a/src/IO/Archives/LibArchiveReader.cpp b/src/IO/Archives/LibArchiveReader.cpp
index 31bad4d6638..e3fe63fa40d 100644
--- a/src/IO/Archives/LibArchiveReader.cpp
+++ b/src/IO/Archives/LibArchiveReader.cpp
@@ -321,7 +321,7 @@ public:
     off_t getPosition() override { throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "getPosition not supported when reading from archive"); }
     String getFileName() const override { return handle.getFileName(); }
 
-    std::optional<size_t> tryGetFileSize() override { return handle.getFileInfo().uncompressed_size; }
+    size_t getFileSize() override { return handle.getFileInfo().uncompressed_size; }
 
     Handle releaseHandle() && { return std::move(handle); }
 
diff --git a/src/IO/Archives/ZipArchiveReader.cpp b/src/IO/Archives/ZipArchiveReader.cpp
index 12b07d550c2..2a9b7a43519 100644
--- a/src/IO/Archives/ZipArchiveReader.cpp
+++ b/src/IO/Archives/ZipArchiveReader.cpp
@@ -317,7 +317,7 @@ public:
 
     String getFileName() const override { return handle.getFileName(); }
 
-    std::optional<size_t> tryGetFileSize() override { return handle.getFileInfo().uncompressed_size; }
+    size_t getFileSize() override { return handle.getFileInfo().uncompressed_size; }
 
     /// Releases owned handle to pass it to an enumerator.
     HandleHolder releaseHandle() &&
diff --git a/src/IO/AsynchronousReadBufferFromFile.cpp b/src/IO/AsynchronousReadBufferFromFile.cpp
index 4d148a5c9f9..c6fe16a7f14 100644
--- a/src/IO/AsynchronousReadBufferFromFile.cpp
+++ b/src/IO/AsynchronousReadBufferFromFile.cpp
@@ -93,10 +93,7 @@ void AsynchronousReadBufferFromFile::close()
         return;
 
     if (0 != ::close(fd))
-    {
-        fd = -1;
         throw Exception(ErrorCodes::CANNOT_CLOSE_FILE, "Cannot close file");
-    }
 
     fd = -1;
 }
diff --git a/src/IO/AsynchronousReadBufferFromFileDescriptor.cpp b/src/IO/AsynchronousReadBufferFromFileDescriptor.cpp
index 6c4bd09b76f..f8c00d62732 100644
--- a/src/IO/AsynchronousReadBufferFromFileDescriptor.cpp
+++ b/src/IO/AsynchronousReadBufferFromFileDescriptor.cpp
@@ -244,7 +244,7 @@ void AsynchronousReadBufferFromFileDescriptor::rewind()
     file_offset_of_buffer_end = 0;
 }
 
-std::optional<size_t> AsynchronousReadBufferFromFileDescriptor::tryGetFileSize()
+size_t AsynchronousReadBufferFromFileDescriptor::getFileSize()
 {
     return getSizeFromFileDescriptor(fd, getFileName());
 }
diff --git a/src/IO/AsynchronousReadBufferFromFileDescriptor.h b/src/IO/AsynchronousReadBufferFromFileDescriptor.h
index 097979fbe00..82659b1aca7 100644
--- a/src/IO/AsynchronousReadBufferFromFileDescriptor.h
+++ b/src/IO/AsynchronousReadBufferFromFileDescriptor.h
@@ -68,7 +68,7 @@ public:
     /// Seek to the beginning, discarding already read data if any. Useful to reread file that changes on every read.
     void rewind();
 
-    std::optional<size_t> tryGetFileSize() override;
+    size_t getFileSize() override;
 
     size_t getFileOffsetOfBufferEnd() const override { return file_offset_of_buffer_end; }
 
diff --git a/src/IO/ConcatSeekableReadBuffer.h b/src/IO/ConcatSeekableReadBuffer.h
index 609f0dc25b8..c8c16c5d887 100644
--- a/src/IO/ConcatSeekableReadBuffer.h
+++ b/src/IO/ConcatSeekableReadBuffer.h
@@ -21,7 +21,7 @@ public:
     off_t seek(off_t off, int whence) override;
     off_t getPosition() override;
 
-    std::optional<size_t> tryGetFileSize() override { return total_size; }
+    size_t getFileSize() override { return total_size; }
 
 private:
     bool nextImpl() override;
diff --git a/src/IO/HTTPCommon.cpp b/src/IO/HTTPCommon.cpp
index fcd96e97b4e..9704d034b2a 100644
--- a/src/IO/HTTPCommon.cpp
+++ b/src/IO/HTTPCommon.cpp
@@ -34,20 +34,14 @@ namespace ErrorCodes
     extern const int RECEIVED_ERROR_TOO_MANY_REQUESTS;
 }
 
-void setResponseDefaultHeaders(HTTPServerResponse & response)
+void setResponseDefaultHeaders(HTTPServerResponse & response, size_t keep_alive_timeout)
 {
     if (!response.getKeepAlive())
         return;
 
-    const size_t keep_alive_timeout = response.getSession().getKeepAliveTimeout();
-    const size_t keep_alive_max_requests = response.getSession().getMaxKeepAliveRequests();
-    if (keep_alive_timeout)
-    {
-        if (keep_alive_max_requests)
-            response.set("Keep-Alive", fmt::format("timeout={}, max={}", keep_alive_timeout, keep_alive_max_requests));
-        else
-            response.set("Keep-Alive", fmt::format("timeout={}", keep_alive_timeout));
-    }
+    Poco::Timespan timeout(keep_alive_timeout, 0);
+    if (timeout.totalSeconds())
+        response.set("Keep-Alive", "timeout=" + std::to_string(timeout.totalSeconds()));
 }
 
 HTTPSessionPtr makeHTTPSession(
diff --git a/src/IO/HTTPCommon.h b/src/IO/HTTPCommon.h
index 4d0580acaba..3a1fa5bebee 100644
--- a/src/IO/HTTPCommon.h
+++ b/src/IO/HTTPCommon.h
@@ -54,7 +54,7 @@ private:
 
 using HTTPSessionPtr = std::shared_ptr<Poco::Net::HTTPClientSession>;
 
-void setResponseDefaultHeaders(HTTPServerResponse & response);
+void setResponseDefaultHeaders(HTTPServerResponse & response, size_t keep_alive_timeout);
 
 /// Create session object to perform requests and set required parameters.
 HTTPSessionPtr makeHTTPSession(
diff --git a/src/IO/MMapReadBufferFromFile.cpp b/src/IO/MMapReadBufferFromFile.cpp
index d0865269f1b..d3eb11c920d 100644
--- a/src/IO/MMapReadBufferFromFile.cpp
+++ b/src/IO/MMapReadBufferFromFile.cpp
@@ -77,10 +77,7 @@ void MMapReadBufferFromFile::close()
     finish();
 
     if (0 != ::close(fd))
-    {
-        fd = -1;
         throw Exception(ErrorCodes::CANNOT_CLOSE_FILE, "Cannot close file");
-    }
 
     fd = -1;
     metric_increment.destroy();
diff --git a/src/IO/MMapReadBufferFromFileDescriptor.cpp b/src/IO/MMapReadBufferFromFileDescriptor.cpp
index 83dd192de54..f27828f71b2 100644
--- a/src/IO/MMapReadBufferFromFileDescriptor.cpp
+++ b/src/IO/MMapReadBufferFromFileDescriptor.cpp
@@ -87,7 +87,7 @@ off_t MMapReadBufferFromFileDescriptor::seek(off_t offset, int whence)
     return new_pos;
 }
 
-std::optional<size_t> MMapReadBufferFromFileDescriptor::tryGetFileSize()
+size_t MMapReadBufferFromFileDescriptor::getFileSize()
 {
     return getSizeFromFileDescriptor(getFD(), getFileName());
 }
diff --git a/src/IO/MMapReadBufferFromFileDescriptor.h b/src/IO/MMapReadBufferFromFileDescriptor.h
index de44ec3f9d8..f774538374a 100644
--- a/src/IO/MMapReadBufferFromFileDescriptor.h
+++ b/src/IO/MMapReadBufferFromFileDescriptor.h
@@ -38,7 +38,7 @@ public:
 
     int getFD() const;
 
-    std::optional<size_t> tryGetFileSize() override;
+    size_t getFileSize() 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/MMappedFile.cpp b/src/IO/MMappedFile.cpp
index 26949061274..7249a25decb 100644
--- a/src/IO/MMappedFile.cpp
+++ b/src/IO/MMappedFile.cpp
@@ -69,10 +69,7 @@ void MMappedFile::close()
     finish();
 
     if (0 != ::close(fd))
-    {
-        fd = -1;
         throw Exception(ErrorCodes::CANNOT_CLOSE_FILE, "Cannot close file");
-    }
 
     fd = -1;
     metric_increment.destroy();
diff --git a/src/IO/MMappedFileDescriptor.cpp b/src/IO/MMappedFileDescriptor.cpp
index 47f80005c9d..a7eb8e4ede5 100644
--- a/src/IO/MMappedFileDescriptor.cpp
+++ b/src/IO/MMappedFileDescriptor.cpp
@@ -3,6 +3,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <fmt/format.h>
+
 #include <Common/formatReadable.h>
 #include <Common/Exception.h>
 #include <base/getPageSize.h>
diff --git a/src/IO/NetUtils.h b/src/IO/NetUtils.h
deleted file mode 100644
index 12f09524ae7..00000000000
--- a/src/IO/NetUtils.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include <concepts>
-#include <bit>
-
-
-namespace DB
-{
-
-template<std::integral T>
-constexpr T netToHost(T value) noexcept
-{
-    if constexpr (std::endian::native != std::endian::big)
-        return std::byteswap(value);
-    return value;
-}
-
-template<std::integral T>
-constexpr T hostToNet(T value) noexcept
-{
-    if constexpr (std::endian::native != std::endian::big)
-        return std::byteswap(value);
-    return value;
-}
-
-template<std::integral T>
-constexpr T toLittleEndian(T value) noexcept
-{
-    if constexpr (std::endian::native == std::endian::big)
-        return std::byteswap(value);
-    return value;
-}
-
-template<std::integral T>
-constexpr T toBigEndian(T value) noexcept
-{
-    if constexpr (std::endian::native != std::endian::big)
-        return std::byteswap(value);
-    return value;
-}
-
-template<std::integral T>
-constexpr T fromLittleEndian(T value) noexcept
-{
-    if constexpr (std::endian::native == std::endian::big)
-        return std::byteswap(value);
-    return value;
-}
-
-template<std::integral T>
-constexpr T fromBigEndian(T value) noexcept
-{
-    if constexpr (std::endian::native != std::endian::big)
-        return std::byteswap(value);
-    return value;
-}
-
-}
diff --git a/src/IO/OpenedFile.cpp b/src/IO/OpenedFile.cpp
index c51dc430b35..4677a8259db 100644
--- a/src/IO/OpenedFile.cpp
+++ b/src/IO/OpenedFile.cpp
@@ -67,13 +67,11 @@ void OpenedFile::close()
         return;
 
     if (0 != ::close(fd))
-    {
-        fd = -1;
         throw Exception(ErrorCodes::CANNOT_CLOSE_FILE, "Cannot close file");
-    }
 
     fd = -1;
     metric_increment.destroy();
 }
 
 }
+
diff --git a/src/IO/ParallelReadBuffer.cpp b/src/IO/ParallelReadBuffer.cpp
index 89cff670e37..e6771235a8e 100644
--- a/src/IO/ParallelReadBuffer.cpp
+++ b/src/IO/ParallelReadBuffer.cpp
@@ -152,7 +152,7 @@ off_t ParallelReadBuffer::seek(off_t offset, int whence)
     return offset;
 }
 
-std::optional<size_t> ParallelReadBuffer::tryGetFileSize()
+size_t ParallelReadBuffer::getFileSize()
 {
     return file_size;
 }
diff --git a/src/IO/ParallelReadBuffer.h b/src/IO/ParallelReadBuffer.h
index 8852472a8bc..cfeec2b3677 100644
--- a/src/IO/ParallelReadBuffer.h
+++ b/src/IO/ParallelReadBuffer.h
@@ -33,7 +33,7 @@ public:
     ~ParallelReadBuffer() override { finishAndWait(); }
 
     off_t seek(off_t off, int whence) override;
-    std::optional<size_t> tryGetFileSize() override;
+    size_t getFileSize() override;
     off_t getPosition() override;
 
     const SeekableReadBuffer & getReadBuffer() const { return input; }
diff --git a/src/IO/Progress.cpp b/src/IO/Progress.cpp
index 179c7f7f807..c5bcd0c490a 100644
--- a/src/IO/Progress.cpp
+++ b/src/IO/Progress.cpp
@@ -91,8 +91,6 @@ void ProgressValues::writeJSON(WriteBuffer & out) const
     writeText(result_bytes, out);
     writeCString("\",\"elapsed_ns\":\"", out);
     writeText(elapsed_ns, out);
-    writeCString("\",\"real_time_microseconds\":\"", out);
-    writeText(real_time_microseconds, out);
     writeCString("\"", out);
     writeCString("}", out);
 }
@@ -112,7 +110,6 @@ bool Progress::incrementPiecewiseAtomically(const Progress & rhs)
     result_bytes += rhs.result_bytes;
 
     elapsed_ns += rhs.elapsed_ns;
-    real_time_microseconds += rhs.real_time_microseconds;
 
     return rhs.read_rows || rhs.written_rows;
 }
@@ -132,7 +129,6 @@ void Progress::reset()
     result_bytes = 0;
 
     elapsed_ns = 0;
-    real_time_microseconds = 0;
 }
 
 ProgressValues Progress::getValues() const
@@ -152,7 +148,6 @@ ProgressValues Progress::getValues() const
     res.result_bytes = result_bytes.load(std::memory_order_relaxed);
 
     res.elapsed_ns = elapsed_ns.load(std::memory_order_relaxed);
-    res.real_time_microseconds = real_time_microseconds.load(std::memory_order_relaxed);
 
     return res;
 }
@@ -174,7 +169,6 @@ ProgressValues Progress::fetchValuesAndResetPiecewiseAtomically()
     res.result_bytes = result_bytes.fetch_and(0);
 
     res.elapsed_ns = elapsed_ns.fetch_and(0);
-    res.real_time_microseconds = real_time_microseconds.fetch_and(0);
 
     return res;
 }
@@ -196,7 +190,6 @@ Progress Progress::fetchAndResetPiecewiseAtomically()
     res.result_bytes = result_bytes.fetch_and(0);
 
     res.elapsed_ns = elapsed_ns.fetch_and(0);
-    res.real_time_microseconds = real_time_microseconds.fetch_and(0);
 
     return res;
 }
@@ -216,7 +209,6 @@ Progress & Progress::operator=(Progress && other) noexcept
     result_bytes = other.result_bytes.load(std::memory_order_relaxed);
 
     elapsed_ns = other.elapsed_ns.load(std::memory_order_relaxed);
-    real_time_microseconds = other.real_time_microseconds.load(std::memory_order_relaxed);
 
     return *this;
 }
@@ -252,9 +244,4 @@ void Progress::incrementElapsedNs(UInt64 elapsed_ns_)
     elapsed_ns.fetch_add(elapsed_ns_, std::memory_order_relaxed);
 }
 
-void Progress::incrementRealTimeMicroseconds(UInt64 microseconds)
-{
-    real_time_microseconds.fetch_add(microseconds, std::memory_order_relaxed);
-}
-
 }
diff --git a/src/IO/Progress.h b/src/IO/Progress.h
index 223496166ec..d0afc9d845f 100644
--- a/src/IO/Progress.h
+++ b/src/IO/Progress.h
@@ -28,7 +28,6 @@ struct ProgressValues
     UInt64 result_bytes = 0;
 
     UInt64 elapsed_ns = 0;
-    UInt64 real_time_microseconds = 0;
 
     void read(ReadBuffer & in, UInt64 server_revision);
     void write(WriteBuffer & out, UInt64 client_revision) const;
@@ -41,7 +40,6 @@ struct ReadProgress
     UInt64 read_bytes = 0;
     UInt64 total_rows_to_read = 0;
     UInt64 total_bytes_to_read = 0;
-    UInt64 real_time_microseconds = 0;
 
     ReadProgress(UInt64 read_rows_, UInt64 read_bytes_, UInt64 total_rows_to_read_ = 0, UInt64 total_bytes_to_read_ = 0)
         : read_rows(read_rows_), read_bytes(read_bytes_), total_rows_to_read(total_rows_to_read_), total_bytes_to_read(total_bytes_to_read_) {}
@@ -98,8 +96,6 @@ struct Progress
 
     std::atomic<UInt64> elapsed_ns {0};
 
-    std::atomic<UInt64> real_time_microseconds {0};
-
     Progress() = default;
 
     Progress(UInt64 read_rows_, UInt64 read_bytes_, UInt64 total_rows_to_read_ = 0, UInt64 total_bytes_to_read_ = 0)
@@ -129,8 +125,6 @@ struct Progress
 
     void incrementElapsedNs(UInt64 elapsed_ns_);
 
-    void incrementRealTimeMicroseconds(UInt64 microseconds);
-
     void reset();
 
     ProgressValues getValues() const;
diff --git a/src/IO/Protobuf/ProtobufZeroCopyInputStreamFromReadBuffer.cpp b/src/IO/Protobuf/ProtobufZeroCopyInputStreamFromReadBuffer.cpp
deleted file mode 100644
index 86b7eb4d7f7..00000000000
--- a/src/IO/Protobuf/ProtobufZeroCopyInputStreamFromReadBuffer.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "config.h"
-
-#if USE_PROTOBUF
-#include <IO/Protobuf/ProtobufZeroCopyInputStreamFromReadBuffer.h>
-#include <IO/ReadBuffer.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-ProtobufZeroCopyInputStreamFromReadBuffer::ProtobufZeroCopyInputStreamFromReadBuffer(std::unique_ptr<ReadBuffer> in_) : in(std::move(in_))
-{
-}
-
-ProtobufZeroCopyInputStreamFromReadBuffer::~ProtobufZeroCopyInputStreamFromReadBuffer() = default;
-
-bool ProtobufZeroCopyInputStreamFromReadBuffer::Next(const void ** data, int * size)
-{
-    if (in->eof())
-        return false;
-    *data = in->position();
-    *size = static_cast<int>(in->available());
-    in->position() += *size;
-    return true;
-}
-
-void ProtobufZeroCopyInputStreamFromReadBuffer::BackUp(int count)
-{
-    if (static_cast<Int64>(in->offset()) < count)
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "ProtobufZeroCopyInputStreamFromReadBuffer::BackUp() cannot back up {} bytes (max = {} bytes)",
-            count,
-            in->offset());
-
-    in->position() -= count;
-}
-
-bool ProtobufZeroCopyInputStreamFromReadBuffer::Skip(int count)
-{
-    return static_cast<Int64>(in->tryIgnore(count)) == count;
-}
-
-int64_t ProtobufZeroCopyInputStreamFromReadBuffer::ByteCount() const
-{
-    return in->count();
-}
-
-}
-
-#endif
diff --git a/src/IO/Protobuf/ProtobufZeroCopyInputStreamFromReadBuffer.h b/src/IO/Protobuf/ProtobufZeroCopyInputStreamFromReadBuffer.h
deleted file mode 100644
index 3f86815ef3f..00000000000
--- a/src/IO/Protobuf/ProtobufZeroCopyInputStreamFromReadBuffer.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#include "config.h"
-#if USE_PROTOBUF
-
-#include <google/protobuf/io/zero_copy_stream.h>
-
-
-namespace DB
-{
-class ReadBuffer;
-
-class ProtobufZeroCopyInputStreamFromReadBuffer : public google::protobuf::io::ZeroCopyInputStream
-{
-public:
-    explicit ProtobufZeroCopyInputStreamFromReadBuffer(std::unique_ptr<ReadBuffer> in_);
-    ~ProtobufZeroCopyInputStreamFromReadBuffer() override;
-
-    // Obtains a chunk of data from the stream.
-    bool Next(const void ** data, int * size) override;
-
-    // Backs up a number of bytes, so that the next call to Next() returns
-    // data again that was already returned by the last call to Next().
-    void BackUp(int count) override;
-
-    // Skips a number of bytes.
-    bool Skip(int count) override;
-
-    // Returns the total number of bytes read since this object was created.
-    int64_t ByteCount() const override;
-
-private:
-    std::unique_ptr<ReadBuffer> in;
-};
-
-}
-
-#endif
diff --git a/src/IO/Protobuf/ProtobufZeroCopyOutputStreamFromWriteBuffer.cpp b/src/IO/Protobuf/ProtobufZeroCopyOutputStreamFromWriteBuffer.cpp
deleted file mode 100644
index d1e02b436f3..00000000000
--- a/src/IO/Protobuf/ProtobufZeroCopyOutputStreamFromWriteBuffer.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "config.h"
-
-#if USE_PROTOBUF
-#include <IO/Protobuf/ProtobufZeroCopyOutputStreamFromWriteBuffer.h>
-#include <IO/WriteBuffer.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-ProtobufZeroCopyOutputStreamFromWriteBuffer::ProtobufZeroCopyOutputStreamFromWriteBuffer(WriteBuffer & out_) : out(&out_)
-{
-}
-
-ProtobufZeroCopyOutputStreamFromWriteBuffer::ProtobufZeroCopyOutputStreamFromWriteBuffer(std::unique_ptr<WriteBuffer> out_)
-    : ProtobufZeroCopyOutputStreamFromWriteBuffer(*out_)
-{
-    out_holder = std::move(out_);
-}
-
-ProtobufZeroCopyOutputStreamFromWriteBuffer::~ProtobufZeroCopyOutputStreamFromWriteBuffer() = default;
-
-bool ProtobufZeroCopyOutputStreamFromWriteBuffer::Next(void ** data, int * size)
-{
-    *data = out->position();
-    *size = static_cast<int>(out->available());
-    out->position() += *size;
-    return true;
-}
-
-void ProtobufZeroCopyOutputStreamFromWriteBuffer::BackUp(int count)
-{
-    if (static_cast<Int64>(out->offset()) < count)
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "ProtobufZeroCopyOutputStreamFromWriteBuffer::BackUp() cannot back up {} bytes (max = {} bytes)",
-            count,
-            out->offset());
-
-    out->position() -= count;
-}
-
-int64_t ProtobufZeroCopyOutputStreamFromWriteBuffer::ByteCount() const
-{
-    return out->count();
-}
-
-void ProtobufZeroCopyOutputStreamFromWriteBuffer::finalize()
-{
-    out->finalize();
-}
-
-}
-
-#endif
diff --git a/src/IO/Protobuf/ProtobufZeroCopyOutputStreamFromWriteBuffer.h b/src/IO/Protobuf/ProtobufZeroCopyOutputStreamFromWriteBuffer.h
deleted file mode 100644
index c47cef9ff4d..00000000000
--- a/src/IO/Protobuf/ProtobufZeroCopyOutputStreamFromWriteBuffer.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#include "config.h"
-#if USE_PROTOBUF
-
-#include <google/protobuf/io/zero_copy_stream.h>
-
-
-namespace DB
-{
-class WriteBuffer;
-
-class ProtobufZeroCopyOutputStreamFromWriteBuffer : public google::protobuf::io::ZeroCopyOutputStream
-{
-public:
-    explicit ProtobufZeroCopyOutputStreamFromWriteBuffer(WriteBuffer & out_);
-    explicit ProtobufZeroCopyOutputStreamFromWriteBuffer(std::unique_ptr<WriteBuffer> out_);
-
-    ~ProtobufZeroCopyOutputStreamFromWriteBuffer() override;
-
-    // Obtains a buffer into which data can be written.
-    bool Next(void ** data, int * size) override;
-
-    // Backs up a number of bytes, so that the end of the last buffer returned
-    // by Next() is not actually written.
-    void BackUp(int count) override;
-
-    // Returns the total number of bytes written since this object was created.
-    int64_t ByteCount() const override;
-
-    void finalize();
-
-private:
-    WriteBuffer * out;
-    std::unique_ptr<WriteBuffer> out_holder;
-};
-
-}
-
-#endif
diff --git a/src/IO/ReadBufferFromEmptyFile.h b/src/IO/ReadBufferFromEmptyFile.h
index 7808ef62fd9..f21f2f507dc 100644
--- a/src/IO/ReadBufferFromEmptyFile.h
+++ b/src/IO/ReadBufferFromEmptyFile.h
@@ -19,8 +19,7 @@ private:
     std::string getFileName() const override { return "<empty>"; }
     off_t seek(off_t /*off*/, int /*whence*/) override { return 0; }
     off_t getPosition() override { return 0; }
-    std::optional<size_t> tryGetFileSize() override { return 0; }
-    size_t getFileOffsetOfBufferEnd() const override { return 0; }
+    size_t getFileSize() override { return 0; }
 };
 
 }
diff --git a/src/IO/ReadBufferFromEncryptedFile.h b/src/IO/ReadBufferFromEncryptedFile.h
index 213d242bb91..3626daccb3e 100644
--- a/src/IO/ReadBufferFromEncryptedFile.h
+++ b/src/IO/ReadBufferFromEncryptedFile.h
@@ -30,7 +30,7 @@ public:
 
     void setReadUntilEnd() override { in->setReadUntilEnd(); }
 
-    std::optional<size_t> tryGetFileSize() override { return in->tryGetFileSize(); }
+    size_t getFileSize() override { return in->getFileSize(); }
 
 private:
     bool nextImpl() override;
diff --git a/src/IO/ReadBufferFromFile.cpp b/src/IO/ReadBufferFromFile.cpp
index 2e5b9fcf753..cb987171bad 100644
--- a/src/IO/ReadBufferFromFile.cpp
+++ b/src/IO/ReadBufferFromFile.cpp
@@ -88,10 +88,7 @@ void ReadBufferFromFile::close()
         return;
 
     if (0 != ::close(fd))
-    {
-        fd = -1;
         throw Exception(ErrorCodes::CANNOT_CLOSE_FILE, "Cannot close file");
-    }
 
     fd = -1;
     metric_increment.destroy();
diff --git a/src/IO/ReadBufferFromFileBase.cpp b/src/IO/ReadBufferFromFileBase.cpp
index b7a1438cff8..4ac3f984f78 100644
--- a/src/IO/ReadBufferFromFileBase.cpp
+++ b/src/IO/ReadBufferFromFileBase.cpp
@@ -5,6 +5,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int UNKNOWN_FILE_SIZE;
+}
+
 ReadBufferFromFileBase::ReadBufferFromFileBase() : BufferWithOwnMemory<SeekableReadBuffer>(0)
 {
 }
@@ -21,9 +26,11 @@ ReadBufferFromFileBase::ReadBufferFromFileBase(
 
 ReadBufferFromFileBase::~ReadBufferFromFileBase() = default;
 
-std::optional<size_t> ReadBufferFromFileBase::tryGetFileSize()
+size_t ReadBufferFromFileBase::getFileSize()
 {
-    return file_size;
+    if (file_size)
+        return *file_size;
+    throw Exception(ErrorCodes::UNKNOWN_FILE_SIZE, "Cannot find out file size for read buffer");
 }
 
 void ReadBufferFromFileBase::setProgressCallback(ContextPtr context)
diff --git a/src/IO/ReadBufferFromFileBase.h b/src/IO/ReadBufferFromFileBase.h
index c98dcd5a93e..9870d8bbe43 100644
--- a/src/IO/ReadBufferFromFileBase.h
+++ b/src/IO/ReadBufferFromFileBase.h
@@ -50,7 +50,7 @@ public:
         clock_type = clock_type_;
     }
 
-    std::optional<size_t> tryGetFileSize() override;
+    size_t getFileSize() override;
 
     void setProgressCallback(ContextPtr context);
 
diff --git a/src/IO/ReadBufferFromFileDecorator.cpp b/src/IO/ReadBufferFromFileDecorator.cpp
index 8a6468b9bd0..9ac0fb4e475 100644
--- a/src/IO/ReadBufferFromFileDecorator.cpp
+++ b/src/IO/ReadBufferFromFileDecorator.cpp
@@ -52,9 +52,9 @@ bool ReadBufferFromFileDecorator::nextImpl()
     return result;
 }
 
-std::optional<size_t> ReadBufferFromFileDecorator::tryGetFileSize()
+size_t ReadBufferFromFileDecorator::getFileSize()
 {
-    return tryGetFileSizeFromReadBuffer(*impl);
+    return getFileSizeFromReadBuffer(*impl);
 }
 
 }
diff --git a/src/IO/ReadBufferFromFileDecorator.h b/src/IO/ReadBufferFromFileDecorator.h
index 69f029c5cf7..6e62c7f741b 100644
--- a/src/IO/ReadBufferFromFileDecorator.h
+++ b/src/IO/ReadBufferFromFileDecorator.h
@@ -27,7 +27,7 @@ public:
 
     ReadBuffer & getWrappedReadBuffer() { return *impl; }
 
-    std::optional<size_t> tryGetFileSize() override;
+    size_t getFileSize() override;
 
 protected:
     std::unique_ptr<SeekableReadBuffer> impl;
diff --git a/src/IO/ReadBufferFromFileDescriptor.cpp b/src/IO/ReadBufferFromFileDescriptor.cpp
index 51a1a5d8d93..76a80f145e7 100644
--- a/src/IO/ReadBufferFromFileDescriptor.cpp
+++ b/src/IO/ReadBufferFromFileDescriptor.cpp
@@ -253,7 +253,7 @@ void ReadBufferFromFileDescriptor::rewind()
     file_offset_of_buffer_end = 0;
 }
 
-std::optional<size_t> ReadBufferFromFileDescriptor::tryGetFileSize()
+size_t ReadBufferFromFileDescriptor::getFileSize()
 {
     return getSizeFromFileDescriptor(fd, getFileName());
 }
diff --git a/src/IO/ReadBufferFromFileDescriptor.h b/src/IO/ReadBufferFromFileDescriptor.h
index 6083e744c95..db256ef91c7 100644
--- a/src/IO/ReadBufferFromFileDescriptor.h
+++ b/src/IO/ReadBufferFromFileDescriptor.h
@@ -69,7 +69,7 @@ public:
     /// Seek to the beginning, discarding already read data if any. Useful to reread file that changes on every read.
     void rewind();
 
-    std::optional<size_t> tryGetFileSize() override;
+    size_t getFileSize() override;
 
     bool checkIfActuallySeekable() override;
 
diff --git a/src/IO/ReadBufferFromPocoSocket.cpp b/src/IO/ReadBufferFromPocoSocket.cpp
index bbf9f96404f..26cdee4140c 100644
--- a/src/IO/ReadBufferFromPocoSocket.cpp
+++ b/src/IO/ReadBufferFromPocoSocket.cpp
@@ -32,7 +32,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-ssize_t ReadBufferFromPocoSocketBase::socketReceiveBytesImpl(char * ptr, size_t size)
+bool ReadBufferFromPocoSocket::nextImpl()
 {
     ssize_t bytes_read = 0;
     Stopwatch watch;
@@ -43,11 +43,14 @@ ssize_t ReadBufferFromPocoSocketBase::socketReceiveBytesImpl(char * ptr, size_t
         ProfileEvents::increment(ProfileEvents::NetworkReceiveBytes, bytes_read);
     });
 
-    CurrentMetrics::Increment metric_increment(CurrentMetrics::NetworkReceive);
-
     /// Add more details to exceptions.
     try
     {
+        CurrentMetrics::Increment metric_increment(CurrentMetrics::NetworkReceive);
+
+        if (internal_buffer.size() > INT_MAX)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Buffer overflow");
+
         /// If async_callback is specified, set socket to non-blocking mode
         /// and try to read data from it, if socket is not ready for reading,
         /// run async_callback and try again later.
@@ -58,7 +61,7 @@ ssize_t ReadBufferFromPocoSocketBase::socketReceiveBytesImpl(char * ptr, size_t
             socket.setBlocking(false);
             SCOPE_EXIT(socket.setBlocking(true));
             bool secure = socket.secure();
-            bytes_read = socket.impl()->receiveBytes(ptr, static_cast<int>(size));
+            bytes_read = socket.impl()->receiveBytes(internal_buffer.begin(), static_cast<int>(internal_buffer.size()));
 
             /// Check EAGAIN and ERR_SSL_WANT_READ/ERR_SSL_WANT_WRITE for secure socket (reading from secure socket can write too).
             while (bytes_read < 0 && (errno == EAGAIN || (secure && (checkSSLWantRead(bytes_read) || checkSSLWantWrite(bytes_read)))))
@@ -70,12 +73,12 @@ ssize_t ReadBufferFromPocoSocketBase::socketReceiveBytesImpl(char * ptr, size_t
                     async_callback(socket.impl()->sockfd(), socket.getReceiveTimeout(), AsyncEventTimeoutType::RECEIVE, socket_description, AsyncTaskExecutor::Event::READ | AsyncTaskExecutor::Event::ERROR);
 
                 /// Try to read again.
-                bytes_read = socket.impl()->receiveBytes(ptr, static_cast<int>(size));
+                bytes_read = socket.impl()->receiveBytes(internal_buffer.begin(), static_cast<int>(internal_buffer.size()));
             }
         }
         else
         {
-            bytes_read = socket.impl()->receiveBytes(ptr, static_cast<int>(size));
+            bytes_read = socket.impl()->receiveBytes(internal_buffer.begin(), static_cast<int>(internal_buffer.size()));
         }
     }
     catch (const Poco::Net::NetException & e)
@@ -96,16 +99,6 @@ ssize_t ReadBufferFromPocoSocketBase::socketReceiveBytesImpl(char * ptr, size_t
     if (bytes_read < 0)
         throw NetException(ErrorCodes::CANNOT_READ_FROM_SOCKET, "Cannot read from socket (peer: {}, local: {})", peer_address.toString(), socket.address().toString());
 
-    return bytes_read;
-}
-
-bool ReadBufferFromPocoSocketBase::nextImpl()
-{
-    if (internal_buffer.size() > INT_MAX)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Buffer overflow");
-
-    ssize_t bytes_read = socketReceiveBytesImpl(internal_buffer.begin(), internal_buffer.size());
-
     if (read_event != ProfileEvents::end())
         ProfileEvents::increment(read_event, bytes_read);
 
@@ -117,7 +110,7 @@ bool ReadBufferFromPocoSocketBase::nextImpl()
     return true;
 }
 
-ReadBufferFromPocoSocketBase::ReadBufferFromPocoSocketBase(Poco::Net::Socket & socket_, size_t buf_size)
+ReadBufferFromPocoSocket::ReadBufferFromPocoSocket(Poco::Net::Socket & socket_, size_t buf_size)
     : BufferWithOwnMemory<ReadBuffer>(buf_size)
     , socket(socket_)
     , peer_address(socket.peerAddress())
@@ -126,22 +119,19 @@ ReadBufferFromPocoSocketBase::ReadBufferFromPocoSocketBase(Poco::Net::Socket & s
 {
 }
 
-ReadBufferFromPocoSocketBase::ReadBufferFromPocoSocketBase(Poco::Net::Socket & socket_, const ProfileEvents::Event & read_event_, size_t buf_size)
-    : ReadBufferFromPocoSocketBase(socket_, buf_size)
+ReadBufferFromPocoSocket::ReadBufferFromPocoSocket(Poco::Net::Socket & socket_, const ProfileEvents::Event & read_event_, size_t buf_size)
+    : ReadBufferFromPocoSocket(socket_, buf_size)
 {
     read_event = read_event_;
 }
 
-bool ReadBufferFromPocoSocketBase::poll(size_t timeout_microseconds) const
+bool ReadBufferFromPocoSocket::poll(size_t timeout_microseconds) const
 {
-    /// For secure socket it is important to check if any remaining data available in underlying decryption buffer -
-    /// read always retrieves the whole encrypted frame from the wire and puts it into underlying buffer while returning only requested size -
-    /// further poll() can block though there is still data to read in the underlying decryption buffer.
-    if (available() || socket.impl()->available())
+    if (available())
         return true;
 
     Stopwatch watch;
-    bool res = socket.impl()->poll(timeout_microseconds, Poco::Net::Socket::SELECT_READ | Poco::Net::Socket::SELECT_ERROR);
+    bool res = socket.poll(timeout_microseconds, Poco::Net::Socket::SELECT_READ | Poco::Net::Socket::SELECT_ERROR);
     ProfileEvents::increment(ProfileEvents::NetworkReceiveElapsedMicroseconds, watch.elapsedMicroseconds());
     return res;
 }
diff --git a/src/IO/ReadBufferFromPocoSocket.h b/src/IO/ReadBufferFromPocoSocket.h
index 912388adaac..76156612764 100644
--- a/src/IO/ReadBufferFromPocoSocket.h
+++ b/src/IO/ReadBufferFromPocoSocket.h
@@ -9,7 +9,7 @@ namespace DB
 {
 
 /// Works with the ready Poco::Net::Socket. Blocking operations.
-class ReadBufferFromPocoSocketBase : public BufferWithOwnMemory<ReadBuffer>
+class ReadBufferFromPocoSocket : public BufferWithOwnMemory<ReadBuffer>
 {
 protected:
     Poco::Net::Socket & socket;
@@ -25,29 +25,16 @@ protected:
     bool nextImpl() override;
 
 public:
-    explicit ReadBufferFromPocoSocketBase(Poco::Net::Socket & socket_, size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE);
-    explicit ReadBufferFromPocoSocketBase(Poco::Net::Socket & socket_, const ProfileEvents::Event & read_event_, size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE);
+    explicit ReadBufferFromPocoSocket(Poco::Net::Socket & socket_, size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE);
+    explicit ReadBufferFromPocoSocket(Poco::Net::Socket & socket_, const ProfileEvents::Event & read_event_, size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE);
 
     bool poll(size_t timeout_microseconds) const;
 
     void setAsyncCallback(AsyncCallback async_callback_) { async_callback = std::move(async_callback_); }
 
-    ssize_t socketReceiveBytesImpl(char * ptr, size_t size);
-
 private:
     AsyncCallback async_callback;
     std::string socket_description;
 };
 
-class ReadBufferFromPocoSocket : public ReadBufferFromPocoSocketBase
-{
-public:
-    explicit ReadBufferFromPocoSocket(Poco::Net::Socket & socket_, size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE)
-        : ReadBufferFromPocoSocketBase(socket_, buf_size)
-    {}
-    explicit ReadBufferFromPocoSocket(Poco::Net::Socket & socket_, const ProfileEvents::Event & read_event_, size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE)
-        : ReadBufferFromPocoSocketBase(socket_, read_event_, buf_size)
-    {}
-};
-
 }
diff --git a/src/IO/ReadBufferFromPocoSocketChunked.cpp b/src/IO/ReadBufferFromPocoSocketChunked.cpp
deleted file mode 100644
index 4a1e3732a55..00000000000
--- a/src/IO/ReadBufferFromPocoSocketChunked.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-#include <IO/ReadBufferFromPocoSocketChunked.h>
-#include <Common/logger_useful.h>
-#include <IO/NetUtils.h>
-
-
-namespace DB::ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-namespace DB
-{
-
-ReadBufferFromPocoSocketChunked::ReadBufferFromPocoSocketChunked(Poco::Net::Socket & socket_, size_t buf_size)
-    : ReadBufferFromPocoSocketChunked(socket_, ProfileEvents::end(), buf_size)
-{}
-
-ReadBufferFromPocoSocketChunked::ReadBufferFromPocoSocketChunked(Poco::Net::Socket & socket_, const ProfileEvents::Event & read_event_, size_t buf_size)
-    : ReadBufferFromPocoSocketBase(
-        socket_, read_event_,
-        std::min(buf_size, static_cast<size_t>(std::numeric_limits<decltype(chunk_left)>::max()))),
-        our_address(socket_.address()), log(getLogger("Protocol"))
-{}
-
-void ReadBufferFromPocoSocketChunked::enableChunked()
-{
-    if (chunked)
-        return;
-    chunked = 1;
-    data_end = buffer().end();
-    /// Resize working buffer so any next read will call nextImpl
-    working_buffer.resize(offset());
-    chunk_left = 0;
-    next_chunk = 0;
-}
-
-bool ReadBufferFromPocoSocketChunked::hasBufferedData() const
-{
-    if (available())
-        return true;
-
-    return chunked && (static_cast<size_t>(data_end - working_buffer.end()) > sizeof(next_chunk));
-}
-
-bool ReadBufferFromPocoSocketChunked::poll(size_t timeout_microseconds) const
-{
-    if (chunked)
-        if (available() || static_cast<size_t>(data_end - working_buffer.end()) > sizeof(next_chunk))
-            return true;
-
-    return ReadBufferFromPocoSocketBase::poll(timeout_microseconds);
-}
-
-
-bool ReadBufferFromPocoSocketChunked::loadNextChunk(Position c_pos, bool cont)
-{
-    auto buffered = std::min(static_cast<size_t>(data_end - c_pos), sizeof(next_chunk));
-
-    if (buffered)
-        std::memcpy(&next_chunk, c_pos, buffered);
-    if (buffered < sizeof(next_chunk))
-        if (socketReceiveBytesImpl(reinterpret_cast<char *>(&next_chunk) + buffered, sizeof(next_chunk) - buffered) < static_cast<ssize_t>(sizeof(next_chunk) - buffered))
-            return false;
-    next_chunk = fromLittleEndian(next_chunk);
-
-    if (next_chunk)
-    {
-        if (cont)
-            LOG_TEST(log, "{} <- {} Chunk receive continued. Size {}", ourAddress().toString(), peerAddress().toString(), next_chunk);
-    }
-    else
-        LOG_TEST(log, "{} <- {} Chunk receive ended.", ourAddress().toString(), peerAddress().toString());
-
-    return true;
-}
-
-bool ReadBufferFromPocoSocketChunked::processChunkLeft(Position c_pos)
-{
-    if (data_end - c_pos < chunk_left)
-    {
-        working_buffer.resize(data_end - buffer().begin());
-        nextimpl_working_buffer_offset = c_pos - buffer().begin();
-        chunk_left -= (data_end - c_pos);
-        return true;
-    }
-
-    nextimpl_working_buffer_offset = c_pos - buffer().begin();
-    working_buffer.resize(nextimpl_working_buffer_offset + chunk_left);
-
-    c_pos += chunk_left;
-
-    if (!loadNextChunk(c_pos, true))
-        return false;
-
-    chunk_left = 0;
-    return true;
-}
-
-
-bool ReadBufferFromPocoSocketChunked::nextImpl()
-{
-    if (!chunked)
-        return ReadBufferFromPocoSocketBase::nextImpl();
-
-    auto * c_pos = pos;
-
-    if (chunk_left == 0)
-    {
-        if (next_chunk == 0)
-        {
-            if (chunked == 1)
-                chunked = 2; // first chunked block - no end marker
-            else
-                c_pos = pos + sizeof(next_chunk); // bypass chunk end marker
-
-            if (c_pos > data_end)
-                c_pos = data_end;
-
-            if (!loadNextChunk(c_pos))
-                return false;
-
-            chunk_left = next_chunk;
-            next_chunk = 0;
-
-            if (chunk_left == 0)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Native protocol: empty chunk received");
-
-            c_pos += sizeof(next_chunk);
-
-            if (c_pos >= data_end)
-            {
-                if (!ReadBufferFromPocoSocketBase::nextImpl())
-                    return false;
-                data_end = buffer().end();
-                c_pos = buffer().begin();
-            }
-
-            LOG_TEST(log, "{} <- {} Chunk receive started. Message {}, size {}", ourAddress().toString(), peerAddress().toString(), static_cast<unsigned int>(*c_pos), chunk_left);
-        }
-        else
-        {
-            c_pos += sizeof(next_chunk);
-            if (c_pos >= data_end)
-            {
-                if (!ReadBufferFromPocoSocketBase::nextImpl())
-                    return false;
-                data_end = buffer().end();
-                c_pos = buffer().begin();
-            }
-
-            chunk_left = next_chunk;
-            next_chunk = 0;
-        }
-    }
-    else
-    {
-        if (!ReadBufferFromPocoSocketBase::nextImpl())
-            return false;
-        data_end = buffer().end();
-        c_pos = buffer().begin();
-    }
-
-    return processChunkLeft(c_pos);
-}
-
-}
diff --git a/src/IO/ReadBufferFromPocoSocketChunked.h b/src/IO/ReadBufferFromPocoSocketChunked.h
deleted file mode 100644
index 8bc4024b978..00000000000
--- a/src/IO/ReadBufferFromPocoSocketChunked.h
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma once
-
-#include <IO/ReadBuffer.h>
-#include <IO/ReadBufferFromPocoSocket.h>
-
-/*
-
-Handshake              +=============
-                       | 'Hello' type
-                       |   handshake exchange
-                       |     chunked protocol negotiation
-                       +=============
-
-
-Basic chunk:
-                       +=============
-Chunk begins           | 0x12345678      chunk size, 4 bytes little endian
-                       +-------------
-                       | Packet type     always follows beginning of the chunk
-                       |   packet data
-                       +-------------
-Chunk ends             | 0x00000000      4 zero bytes
-                       +=============
-
-
-Datastream chunk:
-                       +=============
-Chunk begins           | 0x12345678
-                       +-------------
-                       | Packet type
-                       |   packet data
-                       +-------------
-                       | Packet type
-                       |   packet data
-                       +-------------
-...arbitrary number        .....
-of packets...              .....
-                       +-------------
-                       | Packet type
-                       |   packet data
-                       +-------------
-Chunk ends             | 0x00000000
-                       +=============
-
-
-Multipart chunk:
-                       +=============
-Chunk begins           | 0x12345678      chunk part size, 4 bytes little endian
-                       +-------------
-                       | Packet type
-                       |   packet data
-                       +-------------
-                       | Packet type
-                       |   (partial) packet data
-                       +=============
-Chunk continues        | 0x12345678      chunk next part size, 4 bytes little endian
-                       +=============
-                       |   possibly previous packet's data
-                       +-------------
-                       | Packet type
-                       |   packet data
-                       +-------------
-...arbitrary number        .....
-of chunk parts...          .....
-                       +-------------
-                       | Packet type
-                       |   packet data
-                       +-------------
-Chunk ends             | 0x00000000
-                       +=============
-
-*/
-
-namespace DB
-{
-
-class ReadBufferFromPocoSocketChunked: public ReadBufferFromPocoSocketBase
-{
-public:
-    using ReadBufferFromPocoSocketBase::setAsyncCallback;
-
-    explicit ReadBufferFromPocoSocketChunked(Poco::Net::Socket & socket_, size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE);
-    explicit ReadBufferFromPocoSocketChunked(Poco::Net::Socket & socket_, const ProfileEvents::Event & read_event_, size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE);
-
-    void enableChunked();
-
-    bool hasBufferedData() const;
-
-    bool poll(size_t timeout_microseconds) const;
-
-    Poco::Net::SocketAddress peerAddress() { return peer_address; }
-    Poco::Net::SocketAddress ourAddress() { return our_address; }
-
-protected:
-    bool loadNextChunk(Position c_pos, bool cont = false);
-    bool processChunkLeft(Position c_pos);
-    bool nextImpl() override;
-
-    Poco::Net::SocketAddress our_address;
-
-private:
-    LoggerPtr log;
-    Position data_end = nullptr; // end position of data in the internal_buffer
-    UInt32 chunk_left = 0;       // chunk left to read from socket
-    UInt32 next_chunk = 0;       // size of the next cnunk
-    UInt8 chunked = 0;           // 0 - disabled; 1 - started; 2 - enabled;
-};
-
-}
diff --git a/src/IO/ReadBufferFromS3.cpp b/src/IO/ReadBufferFromS3.cpp
index a6176723497..bf97e959ee0 100644
--- a/src/IO/ReadBufferFromS3.cpp
+++ b/src/IO/ReadBufferFromS3.cpp
@@ -6,6 +6,7 @@
 
 #include <IO/ReadBufferFromIStream.h>
 #include <IO/ReadBufferFromS3.h>
+#include <Common/Scheduler/ResourceGuard.h>
 #include <IO/S3/getObjectInfo.h>
 #include <IO/S3/Requests.h>
 
@@ -310,15 +311,15 @@ off_t ReadBufferFromS3::seek(off_t offset_, int whence)
     return offset;
 }
 
-std::optional<size_t> ReadBufferFromS3::tryGetFileSize()
+size_t ReadBufferFromS3::getFileSize()
 {
     if (file_size)
-        return file_size;
+        return *file_size;
 
     auto object_size = S3::getObjectSize(*client_ptr, bucket, key, version_id);
 
     file_size = object_size;
-    return file_size;
+    return *file_size;
 }
 
 off_t ReadBufferFromS3::getPosition()
@@ -422,13 +423,22 @@ Aws::S3::Model::GetObjectResult ReadBufferFromS3::sendRequest(size_t attempt, si
     ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::ReadBufferFromS3InitMicroseconds);
 
     // We do not know in advance how many bytes we are going to consume, to avoid blocking estimated it from below
-    CurrentThread::IOScope io_scope(read_settings.io_scheduling);
+    constexpr ResourceCost estimated_cost = 1;
+    ResourceGuard rlock(read_settings.resource_link, estimated_cost);
+
     Aws::S3::Model::GetObjectOutcome outcome = client_ptr->GetObject(req);
 
+    rlock.unlock();
+
     if (outcome.IsSuccess())
+    {
+        ResourceCost bytes_read = outcome.GetResult().GetContentLength();
+        read_settings.resource_link.adjust(estimated_cost, bytes_read);
         return outcome.GetResultWithOwnership();
+    }
     else
     {
+        read_settings.resource_link.accumulate(estimated_cost);
         const auto & error = outcome.GetError();
         throw S3Exception(error.GetMessage(), error.GetErrorType());
     }
diff --git a/src/IO/ReadBufferFromS3.h b/src/IO/ReadBufferFromS3.h
index ff04f78ce7b..c6625c2d632 100644
--- a/src/IO/ReadBufferFromS3.h
+++ b/src/IO/ReadBufferFromS3.h
@@ -63,7 +63,7 @@ public:
 
     off_t getPosition() override;
 
-    std::optional<size_t> tryGetFileSize() override;
+    size_t getFileSize() override;
 
     void setReadUntilPosition(size_t position) override;
     void setReadUntilEnd() override;
diff --git a/src/IO/ReadHelpers.cpp b/src/IO/ReadHelpers.cpp
index a38dc1ecefb..c771fced73a 100644
--- a/src/IO/ReadHelpers.cpp
+++ b/src/IO/ReadHelpers.cpp
@@ -3,16 +3,15 @@
 #include <Common/PODArray.h>
 #include <Common/StringUtils.h>
 #include <Common/memcpySmall.h>
-#include <Common/checkStackSize.h>
 #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>
 #include <cstdlib>
 #include <bit>
-#include <utility>
 
 #include <base/simd.h>
 
@@ -40,7 +39,6 @@ namespace ErrorCodes
     extern const int ATTEMPT_TO_READ_AFTER_EOF;
     extern const int LOGICAL_ERROR;
     extern const int BAD_ARGUMENTS;
-    extern const int TOO_DEEP_RECURSION;
 }
 
 template <size_t num_bytes, typename IteratorSrc, typename IteratorDst>
@@ -856,12 +854,6 @@ void readBackQuotedString(String & s, ReadBuffer & buf)
     readBackQuotedStringInto<false>(s, buf);
 }
 
-bool tryReadBackQuotedString(String & s, ReadBuffer & buf)
-{
-    s.clear();
-    return readAnyQuotedStringInto<'`', false, String, bool>(s, buf);
-}
-
 void readBackQuotedStringWithSQLStyle(String & s, ReadBuffer & buf)
 {
     s.clear();
@@ -1277,83 +1269,8 @@ ReturnType readJSONArrayInto(Vector & 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);
 
-std::string_view readJSONObjectAsViewPossiblyInvalid(ReadBuffer & buf, String & object_buffer)
-{
-    if (buf.eof() || *buf.position() != '{')
-        throw Exception(ErrorCodes::INCORRECT_DATA, "JSON object should start with '{{'");
-
-    char * start = buf.position();
-    bool use_object_buffer = false;
-    object_buffer.clear();
-
-    ++buf.position();
-    Int64 balance = 1;
-    bool quotes = false;
-
-    while (true)
-    {
-        if (!buf.hasPendingData() && !use_object_buffer)
-        {
-            use_object_buffer = true;
-            object_buffer.append(start, buf.position() - start);
-        }
-
-        if (buf.eof())
-            throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected EOF while reading JSON object");
-
-        char * next_pos = find_first_symbols<'\\', '{', '}', '"'>(buf.position(), buf.buffer().end());
-        if (use_object_buffer)
-            object_buffer.append(buf.position(), next_pos - buf.position());
-        buf.position() = next_pos;
-
-        if (!buf.hasPendingData())
-            continue;
-
-        if (use_object_buffer)
-            object_buffer.push_back(*buf.position());
-
-        if (*buf.position() == '\\')
-        {
-            ++buf.position();
-            if (!buf.hasPendingData() && !use_object_buffer)
-            {
-                use_object_buffer = true;
-                object_buffer.append(start, buf.position() - start);
-            }
-
-            if (buf.eof())
-                throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected EOF while reading JSON object");
-
-            if (use_object_buffer)
-                object_buffer.push_back(*buf.position());
-            ++buf.position();
-
-            continue;
-        }
-
-        if (*buf.position() == '"')
-            quotes = !quotes;
-        else if (!quotes) // can be only opening_bracket or closing_bracket
-            balance += *buf.position() == '{' ? 1 : -1;
-
-        ++buf.position();
-
-        if (balance == 0)
-        {
-            if (use_object_buffer)
-                return object_buffer;
-            return {start, buf.position()};
-        }
-
-        if (balance < 0)
-            break;
-    }
-
-    throw Exception(ErrorCodes::INCORRECT_DATA, "JSON object should have equal number of opening and closing brackets");
-}
-
 template <typename ReturnType>
-ReturnType readDateTextFallback(LocalDate & date, ReadBuffer & buf, const char * allowed_delimiters)
+ReturnType readDateTextFallback(LocalDate & date, ReadBuffer & buf)
 {
     static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
 
@@ -1400,9 +1317,6 @@ ReturnType readDateTextFallback(LocalDate & date, ReadBuffer & buf, const char *
     }
     else
     {
-        if (!isSymbolIn(*buf.position(), allowed_delimiters))
-            return error();
-
         ++buf.position();
 
         if (!append_digit(month))
@@ -1410,11 +1324,7 @@ ReturnType readDateTextFallback(LocalDate & date, ReadBuffer & buf, const char *
         append_digit(month);
 
         if (!buf.eof() && !isNumericASCII(*buf.position()))
-        {
-            if (!isSymbolIn(*buf.position(), allowed_delimiters))
-                return error();
             ++buf.position();
-        }
         else
             return error();
 
@@ -1427,12 +1337,12 @@ ReturnType readDateTextFallback(LocalDate & date, ReadBuffer & buf, const char *
     return ReturnType(true);
 }
 
-template void readDateTextFallback<void>(LocalDate &, ReadBuffer &, const char * allowed_delimiters);
-template bool readDateTextFallback<bool>(LocalDate &, ReadBuffer &, const char * allowed_delimiters);
+template void readDateTextFallback<void>(LocalDate &, ReadBuffer &);
+template bool readDateTextFallback<bool>(LocalDate &, ReadBuffer &);
 
 
 template <typename ReturnType, bool dt64_mode>
-ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_date_delimiters, const char * allowed_time_delimiters)
+ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & date_lut)
 {
     static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
 
@@ -1489,8 +1399,10 @@ ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const D
         size_t size = buf.read(s_pos, remaining_date_size);
         if (size != remaining_date_size)
         {
+            s_pos[size] = 0;
+
             if constexpr (throw_exception)
-                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot parse DateTime {}", std::string_view(s, already_read_length + size));
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot parse DateTime {}", s);
             else
                 return false;
         }
@@ -1500,9 +1412,6 @@ ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const D
             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;
-
-            if (!isSymbolIn(s[4], allowed_date_delimiters) || !isSymbolIn(s[7], allowed_date_delimiters))
-                return false;
         }
 
         UInt16 year = (s[0] - '0') * 1000 + (s[1] - '0') * 100 + (s[2] - '0') * 10 + (s[3] - '0');
@@ -1520,8 +1429,10 @@ ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const D
 
             if (size != time_broken_down_length)
             {
+                s_pos[size] = 0;
+
                 if constexpr (throw_exception)
-                    throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot parse time component of DateTime {}", std::string_view(s, size));
+                    throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot parse time component of DateTime {}", s);
                 else
                     return false;
             }
@@ -1531,9 +1442,6 @@ ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const D
                 if (!isNumericASCII(s[0]) || !isNumericASCII(s[1]) || !isNumericASCII(s[3]) || !isNumericASCII(s[4])
                     || !isNumericASCII(s[6]) || !isNumericASCII(s[7]))
                     return false;
-
-                if (!isSymbolIn(s[2], allowed_time_delimiters) || !isSymbolIn(s[5], allowed_time_delimiters))
-                    return false;
             }
 
             hour = (s[0] - '0') * 10 + (s[1] - '0');
@@ -1579,27 +1487,17 @@ ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const D
     return ReturnType(true);
 }
 
-template void readDateTimeTextFallback<void, false>(time_t &, ReadBuffer &, const DateLUTImpl &, const char *, const char *);
-template void readDateTimeTextFallback<void, true>(time_t &, ReadBuffer &, const DateLUTImpl &, const char *, const char *);
-template bool readDateTimeTextFallback<bool, false>(time_t &, ReadBuffer &, const DateLUTImpl &, const char *, const char *);
-template bool readDateTimeTextFallback<bool, true>(time_t &, ReadBuffer &, const DateLUTImpl &, const char *, const char *);
+template void readDateTimeTextFallback<void, false>(time_t &, ReadBuffer &, const DateLUTImpl &);
+template void readDateTimeTextFallback<void, true>(time_t &, ReadBuffer &, const DateLUTImpl &);
+template bool readDateTimeTextFallback<bool, false>(time_t &, ReadBuffer &, const DateLUTImpl &);
+template bool readDateTimeTextFallback<bool, true>(time_t &, ReadBuffer &, const DateLUTImpl &);
 
 
 template <typename ReturnType>
-ReturnType skipJSONFieldImpl(ReadBuffer & buf, StringRef name_of_field, const FormatSettings::JSON & settings, size_t current_depth)
+ReturnType skipJSONFieldImpl(ReadBuffer & buf, StringRef name_of_field, const FormatSettings::JSON & settings)
 {
     static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
 
-    if (unlikely(current_depth > settings.max_depth))
-    {
-        if constexpr (throw_exception)
-            throw Exception(ErrorCodes::TOO_DEEP_RECURSION, "JSON is too deep for key '{}'", name_of_field.toString());
-        return ReturnType(false);
-    }
-
-    if (unlikely(current_depth > 0 && current_depth % 1024 == 0))
-        checkStackSize();
-
     if (buf.eof())
     {
         if constexpr (throw_exception)
@@ -1662,8 +1560,8 @@ ReturnType skipJSONFieldImpl(ReadBuffer & buf, StringRef name_of_field, const Fo
         while (true)
         {
             if constexpr (throw_exception)
-                skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings, current_depth + 1);
-            else if (!skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings, current_depth + 1))
+                skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings);
+            else if (!skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings))
                 return ReturnType(false);
 
             skipWhitespaceIfAny(buf);
@@ -1721,8 +1619,8 @@ ReturnType skipJSONFieldImpl(ReadBuffer & buf, StringRef name_of_field, const Fo
             skipWhitespaceIfAny(buf);
 
             if constexpr (throw_exception)
-                skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings, current_depth + 1);
-            else if (!skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings, current_depth + 1))
+                skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings);
+            else if (!skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings))
                 return ReturnType(false);
 
             skipWhitespaceIfAny(buf);
@@ -1761,12 +1659,12 @@ ReturnType skipJSONFieldImpl(ReadBuffer & buf, StringRef name_of_field, const Fo
 
 void skipJSONField(ReadBuffer & buf, StringRef name_of_field, const FormatSettings::JSON & settings)
 {
-    skipJSONFieldImpl<void>(buf, name_of_field, settings, 0);
+    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, 0);
+    return skipJSONFieldImpl<bool>(buf, name_of_field, settings);
 }
 
 
@@ -1996,11 +1894,6 @@ static ReturnType readParsedValueInto(Vector & s, ReadBuffer & buf, ParseFunc pa
     return ReturnType(true);
 }
 
-void readParsedValueIntoString(String & s, ReadBuffer & buf, std::function<void(ReadBuffer &)> parse_func)
-{
-    readParsedValueInto<void>(s, buf, std::move(parse_func));
-}
-
 template <typename ReturnType = void, typename Vector>
 static ReturnType readQuotedStringFieldInto(Vector & s, ReadBuffer & buf)
 {
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index 05198361ca2..ffba4fafb5c 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -258,20 +258,6 @@ inline void readBoolText(bool & x, ReadBuffer & buf)
     char tmp = '0';
     readChar(tmp, buf);
     x = tmp != '0';
-
-    if (!buf.eof() && isAlphaASCII(tmp))
-    {
-        if (tmp == 't' || tmp == 'T')
-        {
-            assertStringCaseInsensitive("rue", buf);
-            x = true;
-        }
-        else if (tmp == 'f' || tmp == 'F')
-        {
-            assertStringCaseInsensitive("alse", buf);
-            x = false;
-        }
-    }
 }
 
 template <typename ReturnType = void>
@@ -614,7 +600,6 @@ bool tryReadDoubleQuotedStringWithSQLStyle(String & s, ReadBuffer & buf);
 void readJSONString(String & s, ReadBuffer & buf, const FormatSettings::JSON & settings);
 
 void readBackQuotedString(String & s, ReadBuffer & buf);
-bool tryReadBackQuotedString(String & s, ReadBuffer & buf);
 void readBackQuotedStringWithSQLStyle(String & s, ReadBuffer & buf);
 
 void readStringUntilEOF(String & s, ReadBuffer & buf);
@@ -702,10 +687,6 @@ ReturnType readJSONObjectPossiblyInvalid(Vector & s, ReadBuffer & buf);
 template <typename Vector, typename ReturnType = void>
 ReturnType readJSONArrayInto(Vector & s, ReadBuffer & buf);
 
-/// Similar to readJSONObjectPossiblyInvalid but avoids copying the data if JSON object fits into current read buffer
-/// If copying is unavoidable, it copies data into provided object_buffer and returns string_view to it.
-std::string_view readJSONObjectAsViewPossiblyInvalid(ReadBuffer & buf, String & object_buffer);
-
 template <typename Vector>
 void readStringUntilWhitespaceInto(Vector & s, ReadBuffer & buf);
 
@@ -722,28 +703,13 @@ struct NullOutput
 };
 
 template <typename ReturnType>
-ReturnType readDateTextFallback(LocalDate & date, ReadBuffer & buf, const char * allowed_delimiters);
-
-inline bool isSymbolIn(char symbol, const char * symbols)
-{
-    if (symbols == nullptr)
-        return true;
-
-    const char * pos = symbols;
-    while (*pos)
-    {
-        if (*pos == symbol)
-            return true;
-        ++pos;
-    }
-    return false;
-}
+ReturnType readDateTextFallback(LocalDate & date, ReadBuffer & buf);
 
 /// In YYYY-MM-DD format.
 /// For convenience, Month and Day parts can have single digit instead of two digits.
 /// Any separators other than '-' are supported.
 template <typename ReturnType = void>
-inline ReturnType readDateTextImpl(LocalDate & date, ReadBuffer & buf, const char * allowed_delimiters = nullptr)
+inline ReturnType readDateTextImpl(LocalDate & date, ReadBuffer & buf)
 {
     static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
 
@@ -787,9 +753,6 @@ inline ReturnType readDateTextImpl(LocalDate & date, ReadBuffer & buf, const cha
         }
         else
         {
-            if (!isSymbolIn(pos[-1], allowed_delimiters))
-                return error();
-
             if (!isNumericASCII(pos[0]))
                 return error();
 
@@ -805,9 +768,6 @@ inline ReturnType readDateTextImpl(LocalDate & date, ReadBuffer & buf, const cha
             if (isNumericASCII(pos[-1]) || !isNumericASCII(pos[0]))
                 return error();
 
-            if (!isSymbolIn(pos[-1], allowed_delimiters))
-                return error();
-
             day = pos[0] - '0';
             if (isNumericASCII(pos[1]))
             {
@@ -823,7 +783,7 @@ inline ReturnType readDateTextImpl(LocalDate & date, ReadBuffer & buf, const cha
         return ReturnType(true);
     }
     else
-        return readDateTextFallback<ReturnType>(date, buf, allowed_delimiters);
+        return readDateTextFallback<ReturnType>(date, buf);
 }
 
 inline void convertToDayNum(DayNum & date, ExtendedDayNum & from)
@@ -837,15 +797,15 @@ inline void convertToDayNum(DayNum & date, ExtendedDayNum & from)
 }
 
 template <typename ReturnType = void>
-inline ReturnType readDateTextImpl(DayNum & date, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_delimiters = nullptr)
+inline ReturnType readDateTextImpl(DayNum & date, ReadBuffer & buf, const DateLUTImpl & date_lut)
 {
     static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
 
     LocalDate local_date;
 
     if constexpr (throw_exception)
-        readDateTextImpl<ReturnType>(local_date, buf, allowed_delimiters);
-    else if (!readDateTextImpl<ReturnType>(local_date, buf, allowed_delimiters))
+        readDateTextImpl<ReturnType>(local_date, buf);
+    else if (!readDateTextImpl<ReturnType>(local_date, buf))
         return false;
 
     ExtendedDayNum ret = date_lut.makeDayNum(local_date.year(), local_date.month(), local_date.day());
@@ -854,15 +814,15 @@ inline ReturnType readDateTextImpl(DayNum & date, ReadBuffer & buf, const DateLU
 }
 
 template <typename ReturnType = void>
-inline ReturnType readDateTextImpl(ExtendedDayNum & date, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_delimiters = nullptr)
+inline ReturnType readDateTextImpl(ExtendedDayNum & date, ReadBuffer & buf, const DateLUTImpl & date_lut)
 {
     static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
 
     LocalDate local_date;
 
     if constexpr (throw_exception)
-        readDateTextImpl<ReturnType>(local_date, buf, allowed_delimiters);
-    else if (!readDateTextImpl<ReturnType>(local_date, buf, allowed_delimiters))
+        readDateTextImpl<ReturnType>(local_date, buf);
+    else if (!readDateTextImpl<ReturnType>(local_date, buf))
         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.
@@ -886,19 +846,19 @@ inline void readDateText(ExtendedDayNum & date, ReadBuffer & buf, const DateLUTI
     readDateTextImpl<void>(date, buf, date_lut);
 }
 
-inline bool tryReadDateText(LocalDate & date, ReadBuffer & buf, const char * allowed_delimiters = nullptr)
+inline bool tryReadDateText(LocalDate & date, ReadBuffer & buf)
 {
-    return readDateTextImpl<bool>(date, buf, allowed_delimiters);
+    return readDateTextImpl<bool>(date, buf);
 }
 
-inline bool tryReadDateText(DayNum & date, ReadBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance(), const char * allowed_delimiters = nullptr)
+inline bool tryReadDateText(DayNum & date, ReadBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance())
 {
-    return readDateTextImpl<bool>(date, buf, time_zone, allowed_delimiters);
+    return readDateTextImpl<bool>(date, buf, time_zone);
 }
 
-inline bool tryReadDateText(ExtendedDayNum & date, ReadBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance(), const char * allowed_delimiters = nullptr)
+inline bool tryReadDateText(ExtendedDayNum & date, ReadBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance())
 {
-    return readDateTextImpl<bool>(date, buf, time_zone, allowed_delimiters);
+    return readDateTextImpl<bool>(date, buf, time_zone);
 }
 
 UUID parseUUID(std::span<const UInt8> src);
@@ -1015,13 +975,13 @@ inline T parseFromString(std::string_view str)
 
 
 template <typename ReturnType = void, bool dt64_mode = false>
-ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr);
+ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & date_lut);
 
 /** In YYYY-MM-DD hh:mm:ss or YYYY-MM-DD format, according to specified time zone.
   * As an exception, also supported parsing of unix timestamp in form of decimal number.
   */
 template <typename ReturnType = void, bool dt64_mode = false>
-inline ReturnType readDateTimeTextImpl(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr)
+inline ReturnType readDateTimeTextImpl(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & date_lut)
 {
     static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
 
@@ -1054,9 +1014,6 @@ inline ReturnType readDateTimeTextImpl(time_t & datetime, ReadBuffer & buf, cons
                 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);
-
-                if (!isSymbolIn(s[4], allowed_date_delimiters) || !isSymbolIn(s[7], allowed_date_delimiters))
-                    return ReturnType(false);
             }
 
             UInt16 year = (s[0] - '0') * 1000 + (s[1] - '0') * 100 + (s[2] - '0') * 10 + (s[3] - '0');
@@ -1076,9 +1033,6 @@ inline ReturnType readDateTimeTextImpl(time_t & datetime, ReadBuffer & buf, cons
                     if (!isNumericASCII(s[11]) || !isNumericASCII(s[12]) || !isNumericASCII(s[14]) || !isNumericASCII(s[15])
                         || !isNumericASCII(s[17]) || !isNumericASCII(s[18]))
                         return ReturnType(false);
-
-                    if (!isSymbolIn(s[13], allowed_time_delimiters) || !isSymbolIn(s[16], allowed_time_delimiters))
-                        return ReturnType(false);
                 }
 
                 hour = (s[11] - '0') * 10 + (s[12] - '0');
@@ -1103,11 +1057,11 @@ inline ReturnType readDateTimeTextImpl(time_t & datetime, ReadBuffer & buf, cons
             return readIntTextImpl<time_t, ReturnType, ReadIntTextCheckOverflow::CHECK_OVERFLOW>(datetime, buf);
     }
     else
-        return readDateTimeTextFallback<ReturnType, dt64_mode>(datetime, buf, date_lut, allowed_date_delimiters, allowed_time_delimiters);
+        return readDateTimeTextFallback<ReturnType, dt64_mode>(datetime, buf, date_lut);
 }
 
 template <typename ReturnType>
-inline ReturnType readDateTimeTextImpl(DateTime64 & datetime64, UInt32 scale, ReadBuffer & buf, const DateLUTImpl & date_lut, const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr)
+inline ReturnType readDateTimeTextImpl(DateTime64 & datetime64, UInt32 scale, ReadBuffer & buf, const DateLUTImpl & date_lut)
 {
     static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
 
@@ -1121,7 +1075,7 @@ inline ReturnType readDateTimeTextImpl(DateTime64 & datetime64, UInt32 scale, Re
         {
             try
             {
-                readDateTimeTextImpl<ReturnType, true>(whole, buf, date_lut, allowed_date_delimiters, allowed_time_delimiters);
+                readDateTimeTextImpl<ReturnType, true>(whole, buf, date_lut);
             }
             catch (const DB::Exception &)
             {
@@ -1131,7 +1085,7 @@ inline ReturnType readDateTimeTextImpl(DateTime64 & datetime64, UInt32 scale, Re
         }
         else
         {
-            auto ok = readDateTimeTextImpl<ReturnType, true>(whole, buf, date_lut, allowed_date_delimiters, allowed_time_delimiters);
+            auto ok = readDateTimeTextImpl<ReturnType, true>(whole, buf, date_lut);
             if (!ok && (buf.eof() || *buf.position() != '.'))
                 return ReturnType(false);
         }
@@ -1214,14 +1168,14 @@ inline void readDateTime64Text(DateTime64 & datetime64, UInt32 scale, ReadBuffer
     readDateTimeTextImpl<void>(datetime64, scale, buf, date_lut);
 }
 
-inline bool tryReadDateTimeText(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance(), const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr)
+inline bool tryReadDateTimeText(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance())
 {
-    return readDateTimeTextImpl<bool>(datetime, buf, time_zone, allowed_date_delimiters, allowed_time_delimiters);
+    return readDateTimeTextImpl<bool>(datetime, buf, time_zone);
 }
 
-inline bool tryReadDateTime64Text(DateTime64 & datetime64, UInt32 scale, ReadBuffer & buf, const DateLUTImpl & date_lut = DateLUT::instance(), const char * allowed_date_delimiters = nullptr, const char * allowed_time_delimiters = nullptr)
+inline bool tryReadDateTime64Text(DateTime64 & datetime64, UInt32 scale, ReadBuffer & buf, const DateLUTImpl & date_lut = DateLUT::instance())
 {
-    return readDateTimeTextImpl<bool>(datetime64, scale, buf, date_lut, allowed_date_delimiters, allowed_time_delimiters);
+    return readDateTimeTextImpl<bool>(datetime64, scale, buf, date_lut);
 }
 
 inline void readDateTimeText(LocalDateTime & datetime, ReadBuffer & buf)
@@ -1754,7 +1708,6 @@ inline T parse(const char * data, size_t size)
     T res;
     ReadBufferFromMemory buf(data, size);
     readText(res, buf);
-    assertEOF(buf);
     return res;
 }
 
@@ -1762,9 +1715,7 @@ template <typename T>
 inline bool tryParse(T & res, const char * data, size_t size)
 {
     ReadBufferFromMemory buf(data, size);
-    if (!tryReadText(res, buf))
-        return false;
-    return buf.eof();
+    return tryReadText(res, buf);
 }
 
 template <typename T>
@@ -1942,8 +1893,6 @@ struct PcgDeserializer
     }
 };
 
-void readParsedValueIntoString(String & s, ReadBuffer & buf, std::function<void(ReadBuffer &)> parse_func);
-
 template <typename ReturnType = void, typename Vector>
 ReturnType readQuotedFieldInto(Vector & s, ReadBuffer & buf);
 
diff --git a/src/IO/ReadSettings.h b/src/IO/ReadSettings.h
index 7c22682dc76..e73a9054928 100644
--- a/src/IO/ReadSettings.h
+++ b/src/IO/ReadSettings.h
@@ -118,7 +118,8 @@ struct ReadSettings
     ThrottlerPtr remote_throttler;
     ThrottlerPtr local_throttler;
 
-    IOSchedulingSettings io_scheduling;
+    // Resource to be used during reading
+    ResourceLink resource_link;
 
     size_t http_max_tries = 10;
     size_t http_retry_initial_backoff_ms = 100;
diff --git a/src/IO/ReadWriteBufferFromHTTP.cpp b/src/IO/ReadWriteBufferFromHTTP.cpp
index 826862bb5b3..b753e66da48 100644
--- a/src/IO/ReadWriteBufferFromHTTP.cpp
+++ b/src/IO/ReadWriteBufferFromHTTP.cpp
@@ -72,6 +72,7 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int CANNOT_SEEK_THROUGH_FILE;
     extern const int SEEK_POSITION_OUT_OF_BOUND;
+    extern const int UNKNOWN_FILE_SIZE;
 }
 
 std::unique_ptr<ReadBuffer> ReadWriteBufferFromHTTP::CallResult::transformToReadBuffer(size_t buf_size) &&
@@ -120,33 +121,15 @@ void ReadWriteBufferFromHTTP::prepareRequest(Poco::Net::HTTPRequest & request, s
         credentials.authenticate(request);
 }
 
-std::optional<size_t> ReadWriteBufferFromHTTP::tryGetFileSize()
+size_t ReadWriteBufferFromHTTP::getFileSize()
 {
     if (!file_info)
-    {
-        try
-        {
-            file_info = getFileInfo();
-        }
-        catch (const HTTPException &)
-        {
-            return std::nullopt;
-        }
-        catch (const NetException &)
-        {
-            return std::nullopt;
-        }
-        catch (const Poco::Net::NetException &)
-        {
-            return std::nullopt;
-        }
-        catch (const Poco::IOException &)
-        {
-            return std::nullopt;
-        }
-    }
+        file_info = getFileInfo();
 
-    return file_info->file_size;
+    if (file_info->file_size)
+        return *file_info->file_size;
+
+    throw Exception(ErrorCodes::UNKNOWN_FILE_SIZE, "Cannot find out file size for: {}", initial_uri.toString());
 }
 
 bool ReadWriteBufferFromHTTP::supportsReadAt()
@@ -238,7 +221,7 @@ ReadWriteBufferFromHTTP::ReadWriteBufferFromHTTP(
 
     if (iter == http_header_entries.end())
     {
-        http_header_entries.emplace_back(user_agent, fmt::format("ClickHouse/{}{}", VERSION_STRING, VERSION_OFFICIAL));
+        http_header_entries.emplace_back(user_agent, fmt::format("ClickHouse/{}", VERSION_STRING));
     }
 
     if (!delay_initialization && use_external_buffer)
@@ -328,12 +311,12 @@ void ReadWriteBufferFromHTTP::doWithRetries(std::function<void()> && callable,
             error_message = e.displayText();
             exception = std::current_exception();
         }
-        catch (NetException & e)
+        catch (DB::NetException & e)
         {
             error_message = e.displayText();
             exception = std::current_exception();
         }
-        catch (HTTPException & e)
+        catch (DB::HTTPException & e)
         {
             if (!isRetriableError(e.getHTTPStatus()))
                 is_retriable = false;
@@ -341,7 +324,7 @@ void ReadWriteBufferFromHTTP::doWithRetries(std::function<void()> && callable,
             error_message = e.displayText();
             exception = std::current_exception();
         }
-        catch (Exception & e)
+        catch (DB::Exception & e)
         {
             is_retriable = false;
 
@@ -443,7 +426,6 @@ std::unique_ptr<ReadBuffer> ReadWriteBufferFromHTTP::initialize()
     }
 
     response.getCookies(cookies);
-    response.getHeaders(response_headers);
     content_encoding = response.get("Content-Encoding", "");
 
     // Remember file size. It'll be used to report eof in next nextImpl() call.
@@ -681,19 +663,6 @@ std::string ReadWriteBufferFromHTTP::getResponseCookie(const std::string & name,
     return def;
 }
 
-Map ReadWriteBufferFromHTTP::getResponseHeaders() const
-{
-    Map map;
-    for (const auto & header : response_headers)
-    {
-        Tuple elem;
-        elem.emplace_back(header.first);
-        elem.emplace_back(header.second);
-        map.emplace_back(elem);
-    }
-    return map;
-}
-
 void ReadWriteBufferFromHTTP::setNextCallback(NextCallback next_callback_)
 {
     next_callback = next_callback_;
@@ -714,19 +683,7 @@ std::optional<time_t> ReadWriteBufferFromHTTP::tryGetLastModificationTime()
         {
             file_info = getFileInfo();
         }
-        catch (const HTTPException &)
-        {
-            return std::nullopt;
-        }
-        catch (const NetException &)
-        {
-            return std::nullopt;
-        }
-        catch (const Poco::Net::NetException &)
-        {
-            return std::nullopt;
-        }
-        catch (const Poco::IOException &)
+        catch (...)
         {
             return std::nullopt;
         }
@@ -747,7 +704,7 @@ ReadWriteBufferFromHTTP::HTTPFileInfo ReadWriteBufferFromHTTP::getFileInfo()
     {
         getHeadResponse(response);
     }
-    catch (const HTTPException & e)
+    catch (HTTPException & e)
     {
         /// Maybe the web server doesn't support HEAD requests.
         /// E.g. webhdfs reports status 400.
diff --git a/src/IO/ReadWriteBufferFromHTTP.h b/src/IO/ReadWriteBufferFromHTTP.h
index cca22c64317..f496fe3ddcd 100644
--- a/src/IO/ReadWriteBufferFromHTTP.h
+++ b/src/IO/ReadWriteBufferFromHTTP.h
@@ -90,9 +90,6 @@ private:
     std::unique_ptr<ReadBuffer> impl;
 
     std::vector<Poco::Net::HTTPCookie> cookies;
-
-    std::map<String, String> response_headers;
-
     HTTPHeaderEntries http_header_entries;
     std::function<void(size_t)> next_callback;
 
@@ -121,7 +118,7 @@ private:
 
     std::unique_ptr<ReadBuffer> initialize();
 
-    std::optional<size_t> tryGetFileSize() override;
+    size_t getFileSize() override;
 
     bool supportsReadAt() override;
 
@@ -190,8 +187,6 @@ public:
 
     HTTPFileInfo getFileInfo();
     static HTTPFileInfo parseFileInfo(const Poco::Net::HTTPResponse & response, size_t requested_range_begin);
-
-    Map getResponseHeaders() const;
 };
 
 using ReadWriteBufferFromHTTPPtr = std::unique_ptr<ReadWriteBufferFromHTTP>;
diff --git a/src/IO/S3/Client.cpp b/src/IO/S3/Client.cpp
index d4c41a3f2cd..6e659c82def 100644
--- a/src/IO/S3/Client.cpp
+++ b/src/IO/S3/Client.cpp
@@ -24,7 +24,6 @@
 
 #include <Common/assert_cast.h>
 #include <Common/logger_useful.h>
-#include <Common/CurrentMetrics.h>
 #include <Common/ProxyConfigurationResolverProvider.h>
 
 #include <Core/Settings.h>
@@ -44,11 +43,6 @@ namespace ProfileEvents
     extern const Event TinyS3Clients;
 }
 
-namespace CurrentMetrics
-{
-    extern const Metric DiskS3NoSuchKeyErrors;
-}
-
 namespace DB
 {
 
@@ -387,7 +381,7 @@ Model::HeadObjectOutcome Client::HeadObject(HeadObjectRequest & request) const
 
     /// The next call is NOT a recurcive call
     /// This is a virtuall call Aws::S3::S3Client::HeadObject(const Model::HeadObjectRequest&)
-    return processRequestResult(
+    return enrichErrorMessage(
         HeadObject(static_cast<const Model::HeadObjectRequest&>(request)));
 }
 
@@ -408,7 +402,7 @@ Model::ListObjectsOutcome Client::ListObjects(ListObjectsRequest & request) cons
 
 Model::GetObjectOutcome Client::GetObject(GetObjectRequest & request) const
 {
-    return processRequestResult(
+    return enrichErrorMessage(
         doRequest(request, [this](const Model::GetObjectRequest & req) { return GetObject(req); }));
 }
 
@@ -695,14 +689,11 @@ Client::doRequestWithRetryNetworkErrors(RequestType & request, RequestFn request
 }
 
 template <typename RequestResult>
-RequestResult Client::processRequestResult(RequestResult && outcome) const
+RequestResult Client::enrichErrorMessage(RequestResult && outcome) const
 {
     if (outcome.IsSuccess() || !isClientForDisk())
         return std::forward<RequestResult>(outcome);
 
-    if (outcome.GetError().GetErrorType() == Aws::S3::S3Errors::NO_SUCH_KEY)
-        CurrentMetrics::add(CurrentMetrics::DiskS3NoSuchKeyErrors);
-
     String enriched_message = fmt::format(
         "{} {}",
         outcome.GetError().GetMessage(),
@@ -982,10 +973,10 @@ PocoHTTPClientConfiguration ClientFactory::createClientConfiguration( // NOLINT
 {
     auto context = Context::getGlobalContextInstance();
     chassert(context);
-    auto proxy_configuration_resolver = ProxyConfigurationResolverProvider::get(ProxyConfiguration::protocolFromString(protocol), context->getConfigRef());
+    auto proxy_configuration_resolver = DB::ProxyConfigurationResolverProvider::get(DB::ProxyConfiguration::protocolFromString(protocol), context->getConfigRef());
 
-    auto per_request_configuration = [=]{ return proxy_configuration_resolver->resolve(); };
-    auto error_report = [=](const ProxyConfiguration & req) { proxy_configuration_resolver->errorReport(req); };
+    auto per_request_configuration = [=] () { return proxy_configuration_resolver->resolve(); };
+    auto error_report = [=] (const DB::ProxyConfiguration & req) { proxy_configuration_resolver->errorReport(req); };
 
     auto config = PocoHTTPClientConfiguration(
         per_request_configuration,
diff --git a/src/IO/S3/Client.h b/src/IO/S3/Client.h
index 36b793876d6..de554e75d67 100644
--- a/src/IO/S3/Client.h
+++ b/src/IO/S3/Client.h
@@ -271,7 +271,7 @@ private:
     void insertRegionOverride(const std::string & bucket, const std::string & region) const;
 
     template <typename RequestResult>
-    RequestResult processRequestResult(RequestResult && outcome) const;
+    RequestResult enrichErrorMessage(RequestResult && outcome) const;
 
     String initial_endpoint;
     std::shared_ptr<Aws::Auth::AWSCredentialsProvider> credentials_provider;
diff --git a/src/IO/S3/Credentials.cpp b/src/IO/S3/Credentials.cpp
index fab3a0111eb..dfb7727fca4 100644
--- a/src/IO/S3/Credentials.cpp
+++ b/src/IO/S3/Credentials.cpp
@@ -145,16 +145,12 @@ Aws::String AWSEC2MetadataClient::getDefaultCredentialsSecurely() const
 {
     String user_agent_string = awsComputeUserAgentString();
     auto [new_token, response_code] = getEC2MetadataToken(user_agent_string);
-    if (response_code == Aws::Http::HttpResponseCode::BAD_REQUEST
-        || response_code == Aws::Http::HttpResponseCode::REQUEST_NOT_MADE)
-    {
-        /// At least the host should be available and reply, otherwise neither IMDSv2 nor IMDSv1 are usable.
+    if (response_code == Aws::Http::HttpResponseCode::BAD_REQUEST)
         return {};
-    }
     else if (response_code != Aws::Http::HttpResponseCode::OK || new_token.empty())
     {
         LOG_TRACE(logger, "Calling EC2MetadataService to get token failed, "
-                  "falling back to a less secure way. HTTP response code: {}", response_code);
+                  "falling back to less secure way. HTTP response code: {}", response_code);
         return getDefaultCredentials();
     }
 
@@ -251,7 +247,7 @@ static Aws::String getAWSMetadataEndpoint()
     return ec2_metadata_service_endpoint;
 }
 
-std::shared_ptr<AWSEC2MetadataClient> createEC2MetadataClient(const Aws::Client::ClientConfiguration & client_configuration)
+std::shared_ptr<AWSEC2MetadataClient> InitEC2MetadataClient(const Aws::Client::ClientConfiguration & client_configuration)
 {
     auto endpoint = getAWSMetadataEndpoint();
     return std::make_shared<AWSEC2MetadataClient>(client_configuration, endpoint.c_str());
@@ -785,13 +781,11 @@ S3CredentialsProviderChain::S3CredentialsProviderChain(
 
             /// EC2MetadataService throttles by delaying the response so the service client should set a large read timeout.
             /// EC2MetadataService delay is in order of seconds so it only make sense to retry after a couple of seconds.
-            /// But the connection timeout should be small because there is the case when there is no IMDS at all,
-            /// like outside of the cloud, on your own machines.
-            aws_client_configuration.connectTimeoutMs = 50;
+            aws_client_configuration.connectTimeoutMs = 1000;
             aws_client_configuration.requestTimeoutMs = 1000;
 
             aws_client_configuration.retryStrategy = std::make_shared<Aws::Client::DefaultRetryStrategy>(1, 1000);
-            auto ec2_metadata_client = createEC2MetadataClient(aws_client_configuration);
+            auto ec2_metadata_client = InitEC2MetadataClient(aws_client_configuration);
             auto config_loader = std::make_shared<AWSEC2InstanceProfileConfigLoader>(ec2_metadata_client, !credentials_configuration.use_insecure_imds_request);
 
             AddProvider(std::make_shared<AWSInstanceProfileCredentialsProvider>(config_loader));
diff --git a/src/IO/S3/Credentials.h b/src/IO/S3/Credentials.h
index 042c48ec15a..95297ab0538 100644
--- a/src/IO/S3/Credentials.h
+++ b/src/IO/S3/Credentials.h
@@ -70,7 +70,7 @@ private:
     LoggerPtr logger;
 };
 
-std::shared_ptr<AWSEC2MetadataClient> createEC2MetadataClient(const Aws::Client::ClientConfiguration & client_configuration);
+std::shared_ptr<AWSEC2MetadataClient> InitEC2MetadataClient(const Aws::Client::ClientConfiguration & client_configuration);
 
 class AWSEC2InstanceProfileConfigLoader : public Aws::Config::AWSProfileConfigLoader
 {
diff --git a/src/IO/S3/PocoHTTPClient.cpp b/src/IO/S3/PocoHTTPClient.cpp
index 3e060e21c51..aab7a39534d 100644
--- a/src/IO/S3/PocoHTTPClient.cpp
+++ b/src/IO/S3/PocoHTTPClient.cpp
@@ -1,5 +1,4 @@
 #include <Poco/Timespan.h>
-#include <Common/config_version.h>
 #include "config.h"
 
 #if USE_AWS_S3
@@ -18,7 +17,6 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 #include <IO/S3/ProviderType.h>
-#include <Interpreters/Context.h>
 
 #include <aws/core/http/HttpRequest.h>
 #include <aws/core/http/HttpResponse.h>
@@ -31,7 +29,6 @@
 
 #include <boost/algorithm/string.hpp>
 
-
 static const int SUCCESS_RESPONSE_MIN = 200;
 static const int SUCCESS_RESPONSE_MAX = 299;
 
@@ -87,7 +84,7 @@ namespace DB::S3
 {
 
 PocoHTTPClientConfiguration::PocoHTTPClientConfiguration(
-        std::function<ProxyConfiguration()> per_request_configuration_,
+        std::function<DB::ProxyConfiguration()> per_request_configuration_,
         const String & force_region_,
         const RemoteHostFilter & remote_host_filter_,
         unsigned int s3_max_redirects_,
@@ -97,7 +94,7 @@ PocoHTTPClientConfiguration::PocoHTTPClientConfiguration(
         bool s3_use_adaptive_timeouts_,
         const ThrottlerPtr & get_request_throttler_,
         const ThrottlerPtr & put_request_throttler_,
-        std::function<void(const ProxyConfiguration &)> error_report_)
+        std::function<void(const DB::ProxyConfiguration &)> error_report_)
     : per_request_configuration(per_request_configuration_)
     , force_region(force_region_)
     , remote_host_filter(remote_host_filter_)
@@ -110,8 +107,6 @@ PocoHTTPClientConfiguration::PocoHTTPClientConfiguration(
     , s3_use_adaptive_timeouts(s3_use_adaptive_timeouts_)
     , error_report(error_report_)
 {
-    /// This is used to identify configurations created by us.
-    userAgent = std::string(VERSION_FULL) + VERSION_OFFICIAL;
 }
 
 void PocoHTTPClientConfiguration::updateSchemeAndRegion()
@@ -133,7 +128,7 @@ void PocoHTTPClientConfiguration::updateSchemeAndRegion()
             }
             else
             {
-                /// In global mode AWS C++ SDK sends `us-east-1` but accepts switching to another one if being suggested.
+                /// In global mode AWS C++ SDK send `us-east-1` but accept switching to another one if being suggested.
                 region = Aws::Region::AWS_GLOBAL;
             }
         }
@@ -171,17 +166,6 @@ PocoHTTPClient::PocoHTTPClient(const PocoHTTPClientConfiguration & client_config
 {
 }
 
-PocoHTTPClient::PocoHTTPClient(const Aws::Client::ClientConfiguration & client_configuration)
-    : timeouts(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))),
-    remote_host_filter(Context::getGlobalContextInstance()->getRemoteHostFilter())
-{
-}
-
 std::shared_ptr<Aws::Http::HttpResponse> PocoHTTPClient::MakeRequest(
     const std::shared_ptr<Aws::Http::HttpRequest> & request,
     Aws::Utils::RateLimits::RateLimiterInterface * readLimiter,
@@ -397,11 +381,8 @@ void PocoHTTPClient::makeRequestInternalImpl(
 
     try
     {
-        ProxyConfiguration proxy_configuration;
-        if (per_request_configuration)
-            proxy_configuration = per_request_configuration();
-
-        for (size_t attempt = 0; attempt <= s3_max_redirects; ++attempt)
+        const auto proxy_configuration = per_request_configuration();
+        for (unsigned int attempt = 0; attempt <= s3_max_redirects; ++attempt)
         {
             Poco::URI target_uri(uri);
 
@@ -519,6 +500,7 @@ void PocoHTTPClient::makeRequestInternalImpl(
                     LOG_TEST(log, "Redirecting request to new location: {}", location);
 
                 addMetric(request, S3MetricType::Redirects);
+
                 continue;
             }
 
@@ -566,9 +548,9 @@ void PocoHTTPClient::makeRequestInternalImpl(
             }
             else
             {
+
                 if (status_code == 429 || status_code == 503)
-                {
-                    /// API throttling
+                { // API throttling
                     addMetric(request, S3MetricType::Throttling);
                 }
                 else if (status_code >= 300)
diff --git a/src/IO/S3/PocoHTTPClient.h b/src/IO/S3/PocoHTTPClient.h
index eb65460ce13..88251b964e2 100644
--- a/src/IO/S3/PocoHTTPClient.h
+++ b/src/IO/S3/PocoHTTPClient.h
@@ -20,7 +20,6 @@
 #include <aws/core/http/HttpRequest.h>
 #include <aws/core/http/standard/StandardHttpResponse.h>
 
-
 namespace Aws::Http::Standard
 {
 class StandardHttpResponse;
@@ -28,20 +27,18 @@ class StandardHttpResponse;
 
 namespace DB
 {
+
 class Context;
 }
 
-
 namespace DB::S3
 {
-
 class ClientFactory;
 class PocoHTTPClient;
 
-
 struct PocoHTTPClientConfiguration : public Aws::Client::ClientConfiguration
 {
-    std::function<ProxyConfiguration()> per_request_configuration;
+    std::function<DB::ProxyConfiguration()> per_request_configuration;
     String force_region;
     const RemoteHostFilter & remote_host_filter;
     unsigned int s3_max_redirects;
@@ -57,13 +54,13 @@ struct PocoHTTPClientConfiguration : public Aws::Client::ClientConfiguration
     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 ProxyConfiguration &)> error_report;
+    std::function<void(const DB::ProxyConfiguration &)> error_report;
 
     void updateSchemeAndRegion();
 
 private:
     PocoHTTPClientConfiguration(
-        std::function<ProxyConfiguration()> per_request_configuration_,
+        std::function<DB::ProxyConfiguration()> per_request_configuration_,
         const String & force_region_,
         const RemoteHostFilter & remote_host_filter_,
         unsigned int s3_max_redirects_,
@@ -73,13 +70,13 @@ private:
         bool s3_use_adaptive_timeouts_,
         const ThrottlerPtr & get_request_throttler_,
         const ThrottlerPtr & put_request_throttler_,
-        std::function<void(const ProxyConfiguration &)> error_report_);
+        std::function<void(const DB::ProxyConfiguration &)> error_report_
+    );
 
     /// Constructor of Aws::Client::ClientConfiguration must be called after AWS SDK initialization.
     friend ClientFactory;
 };
 
-
 class PocoHTTPResponse : public Aws::Http::Standard::StandardHttpResponse
 {
 public:
@@ -119,12 +116,10 @@ private:
     Aws::Utils::Stream::ResponseStream body_stream;
 };
 
-
 class PocoHTTPClient : public Aws::Http::HttpClient
 {
 public:
     explicit PocoHTTPClient(const PocoHTTPClientConfiguration & client_configuration);
-    explicit PocoHTTPClient(const Aws::Client::ClientConfiguration & client_configuration);
     ~PocoHTTPClient() override = default;
 
     std::shared_ptr<Aws::Http::HttpResponse> MakeRequest(
@@ -171,14 +166,14 @@ protected:
     static S3MetricKind getMetricKind(const Aws::Http::HttpRequest & request);
     void addMetric(const Aws::Http::HttpRequest & request, S3MetricType type, ProfileEvents::Count amount = 1) const;
 
-    std::function<ProxyConfiguration()> per_request_configuration;
-    std::function<void(const ProxyConfiguration &)> error_report;
+    std::function<DB::ProxyConfiguration()> per_request_configuration;
+    std::function<void(const DB::ProxyConfiguration &)> error_report;
     ConnectionTimeouts timeouts;
     const RemoteHostFilter & remote_host_filter;
-    unsigned int s3_max_redirects = 0;
+    unsigned int s3_max_redirects;
     bool s3_use_adaptive_timeouts = true;
-    bool enable_s3_requests_logging = false;
-    bool for_disk_s3 = false;
+    bool enable_s3_requests_logging;
+    bool for_disk_s3;
 
     /// Limits get request per second rate for GET, SELECT and all other requests, excluding throttled by put throttler
     /// (i.e. throttles GetObject, HeadObject)
diff --git a/src/IO/S3/PocoHTTPClientFactory.cpp b/src/IO/S3/PocoHTTPClientFactory.cpp
index abec907778c..ef7af2d01ba 100644
--- a/src/IO/S3/PocoHTTPClientFactory.cpp
+++ b/src/IO/S3/PocoHTTPClientFactory.cpp
@@ -15,10 +15,7 @@ namespace DB::S3
 std::shared_ptr<Aws::Http::HttpClient>
 PocoHTTPClientFactory::CreateHttpClient(const Aws::Client::ClientConfiguration & client_configuration) const
 {
-    if (client_configuration.userAgent.starts_with("ClickHouse"))
-        return std::make_shared<PocoHTTPClient>(static_cast<const PocoHTTPClientConfiguration &>(client_configuration));
-    else /// This client is created inside the AWS SDK with default settings to obtain ECS credentials from localhost.
-        return std::make_shared<PocoHTTPClient>(client_configuration);
+    return std::make_shared<PocoHTTPClient>(static_cast<const PocoHTTPClientConfiguration &>(client_configuration));
 }
 
 std::shared_ptr<Aws::Http::HttpRequest> PocoHTTPClientFactory::CreateHttpRequest(
diff --git a/src/IO/S3/URI.cpp b/src/IO/S3/URI.cpp
index 73bbba055d0..fead18315d8 100644
--- a/src/IO/S3/URI.cpp
+++ b/src/IO/S3/URI.cpp
@@ -1,8 +1,8 @@
 #include <IO/S3/URI.h>
-
-#if USE_AWS_S3
 #include <Interpreters/Context.h>
-#include <Common/Macros.h>
+#include <Storages/NamedCollectionsHelpers.h>
+#include "Common/Macros.h"
+#if USE_AWS_S3
 #include <Common/Exception.h>
 #include <Common/quoteString.h>
 #include <Common/re2.h>
@@ -10,7 +10,6 @@
 
 #include <boost/algorithm/string/case_conv.hpp>
 
-
 namespace DB
 {
 
@@ -36,18 +35,26 @@ URI::URI(const std::string & uri_, bool allow_archive_path_syntax)
     /// Case when bucket name represented in domain name of S3 URL.
     /// 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"(([^.]+)\.(s3express[\-a-z0-9]+|s3|cos|obs|.*oss[^\/]*|eos)([.\-][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})?)");
+    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 the path of S3 URL.
+    /// Case when bucket name and key represented in path of S3 URL.
     /// 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";
+
     if (allow_archive_path_syntax)
         std::tie(uri_str, archive_pattern) = getURIAndArchivePattern(uri_);
     else
@@ -78,7 +85,7 @@ URI::URI(const std::string & uri_, bool allow_archive_path_syntax)
             URIConverter::modifyURI(uri, mapper);
     }
 
-    storage_name = "S3";
+    storage_name = S3;
 
     if (uri.getHost().empty())
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Host is empty in S3 URI.");
@@ -86,13 +93,11 @@ URI::URI(const std::string & uri_, bool allow_archive_path_syntax)
     /// Extract object version ID from query string.
     bool has_version_id = false;
     for (const auto & [query_key, query_value] : uri.getQueryParameters())
-    {
         if (query_key == "versionId")
         {
             version_id = query_value;
             has_version_id = true;
         }
-    }
 
     /// Poco::URI will ignore '?' when parsing the path, but if there is a versionId in the http parameter,
     /// '?' can not be used as a wildcard, otherwise it will be ambiguous.
@@ -124,8 +129,15 @@ URI::URI(const std::string & uri_, bool allow_archive_path_syntax)
         }
 
         boost::to_upper(name);
-        if (name == "COS")
-            storage_name = "COSN";
+        /// 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 == COS)
+            storage_name = COSN;
         else
             storage_name = name;
     }
@@ -136,22 +148,13 @@ URI::URI(const std::string & uri_, bool allow_archive_path_syntax)
         validateBucket(bucket, uri);
     }
     else
-    {
-        /// Custom endpoint, e.g. a public domain of Cloudflare R2,
-        /// which could be served by a custom server-side code.
-        storage_name = "S3";
-        bucket = "default";
-        is_virtual_hosted_style = false;
-        endpoint = uri.getScheme() + "://" + uri.getAuthority();
-        if (!uri.getPath().empty())
-            key = uri.getPath().substr(1);
-    }
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bucket or key name are invalid in S3 URI.");
 }
 
 void URI::addRegionToURI(const std::string &region)
 {
-    if (auto pos = endpoint.find(".amazonaws.com"); pos != std::string::npos)
-        endpoint = endpoint.substr(0, pos) + "." + region + endpoint.substr(pos);
+    if (auto pos = endpoint.find("amazonaws.com"); pos != std::string::npos)
+        endpoint = endpoint.substr(0, pos) + region + "." + endpoint.substr(pos);
 }
 
 void URI::validateBucket(const String & bucket, const Poco::URI & uri)
diff --git a/src/IO/S3/URI.h b/src/IO/S3/URI.h
index c8d0b28cd15..80e2da96cd4 100644
--- a/src/IO/S3/URI.h
+++ b/src/IO/S3/URI.h
@@ -1,14 +1,14 @@
 #pragma once
 
+#include <optional>
+#include <string>
+
 #include "config.h"
 
 #if USE_AWS_S3
 
-#include <optional>
-#include <string>
 #include <Poco/URI.h>
 
-
 namespace DB::S3
 {
 
@@ -23,7 +23,7 @@ namespace DB::S3
 struct URI
 {
     Poco::URI uri;
-    // Custom endpoint if URI scheme, if not S3.
+    // Custom endpoint if URI scheme is not S3.
     std::string endpoint;
     std::string bucket;
     std::string key;
diff --git a/src/IO/S3/getObjectInfo.cpp b/src/IO/S3/getObjectInfo.cpp
index a21fb9fce54..9271ad820e4 100644
--- a/src/IO/S3/getObjectInfo.cpp
+++ b/src/IO/S3/getObjectInfo.cpp
@@ -54,7 +54,6 @@ namespace
         ObjectInfo object_info;
         object_info.size = static_cast<size_t>(result.GetContentLength());
         object_info.last_modification_time = result.GetLastModified().Seconds();
-        object_info.etag = result.GetETag();
 
         if (with_metadata)
             object_info.metadata = result.GetMetadata();
diff --git a/src/IO/S3/getObjectInfo.h b/src/IO/S3/getObjectInfo.h
index 30d4c627d37..32f34f74069 100644
--- a/src/IO/S3/getObjectInfo.h
+++ b/src/IO/S3/getObjectInfo.h
@@ -15,7 +15,6 @@ struct ObjectInfo
 {
     size_t size = 0;
     time_t last_modification_time = 0;
-    String etag;
 
     std::map<String, String> metadata = {}; /// Set only if getObjectInfo() is called with `with_metadata = true`.
 };
diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index 59040bf1fea..a794cdbcf05 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -294,21 +294,21 @@ void RequestSettings::finishInit(const DB::Settings & settings, bool validate_se
     /// to avoid losing token bucket state on every config reload,
     /// which could lead to exceeding limit for short time.
     /// But it is good enough unless very high `burst` values are used.
-    if (UInt64 max_get_rps = isChanged("max_get_rps") ? get("max_get_rps").safeGet<UInt64>() : settings.s3_max_get_rps)
+    if (UInt64 max_get_rps = isChanged("max_get_rps") ? get("max_get_rps").get<UInt64>() : settings.s3_max_get_rps)
     {
         size_t default_max_get_burst = settings.s3_max_get_burst
             ? settings.s3_max_get_burst
             : (Throttler::default_burst_seconds * max_get_rps);
 
-        size_t max_get_burst = isChanged("max_get_burts") ? get("max_get_burst").safeGet<UInt64>() : default_max_get_burst;
+        size_t max_get_burst = isChanged("max_get_burts") ? get("max_get_burst").get<UInt64>() : default_max_get_burst;
         get_request_throttler = std::make_shared<Throttler>(max_get_rps, max_get_burst);
     }
-    if (UInt64 max_put_rps = isChanged("max_put_rps") ? get("max_put_rps").safeGet<UInt64>() : settings.s3_max_put_rps)
+    if (UInt64 max_put_rps = isChanged("max_put_rps") ? get("max_put_rps").get<UInt64>() : settings.s3_max_put_rps)
     {
         size_t default_max_put_burst = settings.s3_max_put_burst
             ? settings.s3_max_put_burst
             : (Throttler::default_burst_seconds * max_put_rps);
-        size_t max_put_burst = isChanged("max_put_burts") ? get("max_put_burst").safeGet<UInt64>() : default_max_put_burst;
+        size_t max_put_burst = isChanged("max_put_burts") ? get("max_put_burst").get<UInt64>() : default_max_put_burst;
         put_request_throttler = std::make_shared<Throttler>(max_put_rps, max_put_burst);
     }
 }
diff --git a/src/IO/SharedThreadPools.cpp b/src/IO/SharedThreadPools.cpp
index cda7bc01bbf..3606ddd984c 100644
--- a/src/IO/SharedThreadPools.cpp
+++ b/src/IO/SharedThreadPools.cpp
@@ -23,9 +23,6 @@ namespace CurrentMetrics
     extern const Metric MergeTreeUnexpectedPartsLoaderThreads;
     extern const Metric MergeTreeUnexpectedPartsLoaderThreadsActive;
     extern const Metric MergeTreeUnexpectedPartsLoaderThreadsScheduled;
-    extern const Metric DatabaseCatalogThreads;
-    extern const Metric DatabaseCatalogThreadsActive;
-    extern const Metric DatabaseCatalogThreadsScheduled;
     extern const Metric DatabaseReplicatedCreateTablesThreads;
     extern const Metric DatabaseReplicatedCreateTablesThreadsActive;
     extern const Metric DatabaseReplicatedCreateTablesThreadsScheduled;
@@ -169,11 +166,4 @@ StaticThreadPool & getDatabaseReplicatedCreateTablesThreadPool()
     return instance;
 }
 
-/// ThreadPool used for dropping tables.
-StaticThreadPool & getDatabaseCatalogDropTablesThreadPool()
-{
-    static StaticThreadPool instance("DropTablesThreadPool", CurrentMetrics::DatabaseCatalogThreads, CurrentMetrics::DatabaseCatalogThreadsActive, CurrentMetrics::DatabaseCatalogThreadsScheduled);
-    return instance;
-}
-
 }
diff --git a/src/IO/SharedThreadPools.h b/src/IO/SharedThreadPools.h
index 06ccebd20b2..50adc70c9a0 100644
--- a/src/IO/SharedThreadPools.h
+++ b/src/IO/SharedThreadPools.h
@@ -69,7 +69,4 @@ StaticThreadPool & getUnexpectedPartsLoadingThreadPool();
 /// ThreadPool used for creating tables in DatabaseReplicated.
 StaticThreadPool & getDatabaseReplicatedCreateTablesThreadPool();
 
-/// ThreadPool used for dropping tables.
-StaticThreadPool & getDatabaseCatalogDropTablesThreadPool();
-
 }
diff --git a/src/IO/SnappyWriteBuffer.cpp b/src/IO/SnappyWriteBuffer.cpp
index 0e02b48e1e0..ca40d0656d1 100644
--- a/src/IO/SnappyWriteBuffer.cpp
+++ b/src/IO/SnappyWriteBuffer.cpp
@@ -16,13 +16,7 @@ namespace ErrorCodes
 }
 
 SnappyWriteBuffer::SnappyWriteBuffer(std::unique_ptr<WriteBuffer> out_, size_t buf_size, char * existing_memory, size_t alignment)
-    : SnappyWriteBuffer(*out_, buf_size, existing_memory, alignment)
-{
-    out_holder = std::move(out_);
-}
-
-SnappyWriteBuffer::SnappyWriteBuffer(WriteBuffer & out_, size_t buf_size, char * existing_memory, size_t alignment)
-    : BufferWithOwnMemory<WriteBuffer>(buf_size, existing_memory, alignment), out(&out_)
+    : BufferWithOwnMemory<WriteBuffer>(buf_size, existing_memory, alignment), out(std::move(out_))
 {
 }
 
diff --git a/src/IO/SnappyWriteBuffer.h b/src/IO/SnappyWriteBuffer.h
index b7a084d0f80..2ff86fb64ef 100644
--- a/src/IO/SnappyWriteBuffer.h
+++ b/src/IO/SnappyWriteBuffer.h
@@ -18,12 +18,6 @@ public:
         char * existing_memory = nullptr,
         size_t alignment = 0);
 
-    explicit SnappyWriteBuffer(
-        WriteBuffer & out_,
-        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
-        char * existing_memory = nullptr,
-        size_t alignment = 0);
-
     ~SnappyWriteBuffer() override;
 
     void finalizeImpl() override { finish(); }
@@ -34,9 +28,7 @@ private:
     void finishImpl();
     void finish();
 
-    WriteBuffer * out;
-    std::unique_ptr<WriteBuffer> out_holder;
-
+    std::unique_ptr<WriteBuffer> out;
     bool finished = false;
 
     String uncompress_buffer;
diff --git a/src/IO/WithFileSize.cpp b/src/IO/WithFileSize.cpp
index 54747cef8af..3660d962c08 100644
--- a/src/IO/WithFileSize.cpp
+++ b/src/IO/WithFileSize.cpp
@@ -5,7 +5,6 @@
 #include <IO/ReadBufferFromFileDecorator.h>
 #include <IO/PeekableReadBuffer.h>
 
-
 namespace DB
 {
 
@@ -14,47 +13,41 @@ namespace ErrorCodes
     extern const int UNKNOWN_FILE_SIZE;
 }
 
-size_t WithFileSize::getFileSize()
-{
-    if (auto maybe_size = tryGetFileSize())
-        return *maybe_size;
-
-    throw Exception(ErrorCodes::UNKNOWN_FILE_SIZE, "Cannot find out file size");
-}
-
-template <typename T>
-static std::optional<size_t> tryGetFileSize(T & in)
-{
-    if (auto * with_file_size = dynamic_cast<WithFileSize *>(&in))
-        return with_file_size->tryGetFileSize();
-
-    return std::nullopt;
-}
-
 template <typename T>
 static size_t getFileSize(T & in)
 {
-    if (auto maybe_size = tryGetFileSize(in))
-        return *maybe_size;
+    if (auto * with_file_size = dynamic_cast<WithFileSize *>(&in))
+    {
+        return with_file_size->getFileSize();
+    }
 
     throw Exception(ErrorCodes::UNKNOWN_FILE_SIZE, "Cannot find out file size");
 }
 
-std::optional<size_t> tryGetFileSizeFromReadBuffer(ReadBuffer & in)
-{
-    if (auto * delegate = dynamic_cast<ReadBufferFromFileDecorator *>(&in))
-        return tryGetFileSize(delegate->getWrappedReadBuffer());
-    else if (auto * compressed = dynamic_cast<CompressedReadBufferWrapper *>(&in))
-        return tryGetFileSize(compressed->getWrappedReadBuffer());
-    return tryGetFileSize(in);
-}
-
 size_t getFileSizeFromReadBuffer(ReadBuffer & in)
 {
-    if (auto maybe_size = tryGetFileSizeFromReadBuffer(in))
-        return *maybe_size;
+    if (auto * delegate = dynamic_cast<ReadBufferFromFileDecorator *>(&in))
+    {
+        return getFileSize(delegate->getWrappedReadBuffer());
+    }
+    else if (auto * compressed = dynamic_cast<CompressedReadBufferWrapper *>(&in))
+    {
+        return getFileSize(compressed->getWrappedReadBuffer());
+    }
 
-    throw Exception(ErrorCodes::UNKNOWN_FILE_SIZE, "Cannot find out file size");
+    return getFileSize(in);
+}
+
+std::optional<size_t> tryGetFileSizeFromReadBuffer(ReadBuffer & in)
+{
+    try
+    {
+        return getFileSizeFromReadBuffer(in);
+    }
+    catch (...)
+    {
+        return std::nullopt;
+    }
 }
 
 bool isBufferWithFileSize(const ReadBuffer & in)
@@ -89,4 +82,5 @@ size_t getDataOffsetMaybeCompressed(const ReadBuffer & in)
     return in.count();
 }
 
+
 }
diff --git a/src/IO/WithFileSize.h b/src/IO/WithFileSize.h
index e5dc383fab0..0ae3af98ea0 100644
--- a/src/IO/WithFileSize.h
+++ b/src/IO/WithFileSize.h
@@ -10,16 +10,15 @@ class ReadBuffer;
 class WithFileSize
 {
 public:
-    /// Returns nullopt if couldn't find out file size;
-    virtual std::optional<size_t> tryGetFileSize() = 0;
+    virtual size_t getFileSize() = 0;
     virtual ~WithFileSize() = default;
-
-    size_t getFileSize();
 };
 
 bool isBufferWithFileSize(const ReadBuffer & in);
 
 size_t getFileSizeFromReadBuffer(ReadBuffer & in);
+
+/// Return nullopt if couldn't find out file size;
 std::optional<size_t> tryGetFileSizeFromReadBuffer(ReadBuffer & in);
 
 size_t getDataOffsetMaybeCompressed(const ReadBuffer & in);
diff --git a/src/IO/WriteBuffer.h b/src/IO/WriteBuffer.h
index 84b1079b824..4759f96a235 100644
--- a/src/IO/WriteBuffer.h
+++ b/src/IO/WriteBuffer.h
@@ -64,8 +64,7 @@ public:
         }
 
         bytes += bytes_in_buffer;
-        pos = working_buffer.begin() + nextimpl_working_buffer_offset;
-        nextimpl_working_buffer_offset = 0;
+        pos = working_buffer.begin();
     }
 
     /// Calling finalize() in the destructor of derived classes is a bad practice.
@@ -165,11 +164,6 @@ protected:
     bool finalized = false;
     bool canceled = false;
 
-    /// The number of bytes to preserve from the initial position of `working_buffer`
-    /// buffer. Apparently this is an additional out-parameter for nextImpl(),
-    /// not a real field.
-    size_t nextimpl_working_buffer_offset = 0;
-
 private:
     /** Write the data in the buffer (from the beginning of the buffer to the current position).
       * Throw an exception if something is wrong.
diff --git a/src/IO/WriteBufferFromFile.cpp b/src/IO/WriteBufferFromFile.cpp
index d68203029c1..37b1161356f 100644
--- a/src/IO/WriteBufferFromFile.cpp
+++ b/src/IO/WriteBufferFromFile.cpp
@@ -32,10 +32,8 @@ WriteBufferFromFile::WriteBufferFromFile(
     ThrottlerPtr throttler_,
     mode_t mode,
     char * existing_memory,
-    size_t alignment,
-    bool use_adaptive_buffer_size_,
-    size_t adaptive_buffer_initial_size)
-    : WriteBufferFromFileDescriptor(-1, buf_size, existing_memory, throttler_, alignment, file_name_, use_adaptive_buffer_size_, adaptive_buffer_initial_size)
+    size_t alignment)
+    : WriteBufferFromFileDescriptor(-1, buf_size, existing_memory, throttler_, alignment, file_name_)
 {
     ProfileEvents::increment(ProfileEvents::FileOpen);
 
@@ -68,10 +66,8 @@ WriteBufferFromFile::WriteBufferFromFile(
     size_t buf_size,
     ThrottlerPtr throttler_,
     char * existing_memory,
-    size_t alignment,
-    bool use_adaptive_buffer_size_,
-    size_t adaptive_buffer_initial_size)
-    : WriteBufferFromFileDescriptor(fd_, buf_size, existing_memory, throttler_, alignment, original_file_name, use_adaptive_buffer_size_, adaptive_buffer_initial_size)
+    size_t alignment)
+    : WriteBufferFromFileDescriptor(fd_, buf_size, existing_memory, throttler_, alignment, original_file_name)
 {
     fd_ = -1;
 }
@@ -120,10 +116,7 @@ void WriteBufferFromFile::close()
         finalize();
 
     if (0 != ::close(fd))
-    {
-        fd = -1;
         throw Exception(ErrorCodes::CANNOT_CLOSE_FILE, "Cannot close file");
-    }
 
     fd = -1;
     metric_increment.destroy();
diff --git a/src/IO/WriteBufferFromFile.h b/src/IO/WriteBufferFromFile.h
index c0fa7f0b233..57847d893af 100644
--- a/src/IO/WriteBufferFromFile.h
+++ b/src/IO/WriteBufferFromFile.h
@@ -36,9 +36,7 @@ public:
         ThrottlerPtr throttler_ = {},
         mode_t mode = 0666,
         char * existing_memory = nullptr,
-        size_t alignment = 0,
-        bool use_adaptive_buffer_size_ = false,
-        size_t adaptive_buffer_initial_size = DBMS_DEFAULT_INITIAL_ADAPTIVE_BUFFER_SIZE);
+        size_t alignment = 0);
 
     /// Use pre-opened file descriptor.
     explicit WriteBufferFromFile(
@@ -47,9 +45,7 @@ public:
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         ThrottlerPtr throttler_ = {},
         char * existing_memory = nullptr,
-        size_t alignment = 0,
-        bool use_adaptive_buffer_size_ = false,
-        size_t adaptive_buffer_initial_size = DBMS_DEFAULT_INITIAL_ADAPTIVE_BUFFER_SIZE);
+        size_t alignment = 0);
 
     ~WriteBufferFromFile() override;
 
diff --git a/src/IO/WriteBufferFromFileDescriptor.cpp b/src/IO/WriteBufferFromFileDescriptor.cpp
index b60a792e11c..f1207edc55b 100644
--- a/src/IO/WriteBufferFromFileDescriptor.cpp
+++ b/src/IO/WriteBufferFromFileDescriptor.cpp
@@ -83,13 +83,6 @@ void WriteBufferFromFileDescriptor::nextImpl()
 
     ProfileEvents::increment(ProfileEvents::DiskWriteElapsedMicroseconds, watch.elapsedMicroseconds());
     ProfileEvents::increment(ProfileEvents::WriteBufferFromFileDescriptorWriteBytes, bytes_written);
-
-    /// Increase buffer size for next data if adaptive buffer size is used and nextImpl was called because of end of buffer.
-    if (!available() && use_adaptive_buffer_size && memory.size() < adaptive_max_buffer_size)
-    {
-        memory.resize(std::min(memory.size() * 2, adaptive_max_buffer_size));
-        BufferBase::set(memory.data(), memory.size(), 0);
-    }
 }
 
 /// NOTE: This class can be used as a very low-level building block, for example
@@ -101,15 +94,11 @@ WriteBufferFromFileDescriptor::WriteBufferFromFileDescriptor(
     char * existing_memory,
     ThrottlerPtr throttler_,
     size_t alignment,
-    std::string file_name_,
-    bool use_adaptive_buffer_size_,
-    size_t adaptive_buffer_initial_size)
-    : WriteBufferFromFileBase(use_adaptive_buffer_size_ ? adaptive_buffer_initial_size : buf_size, existing_memory, alignment)
+    std::string file_name_)
+    : WriteBufferFromFileBase(buf_size, existing_memory, alignment)
     , fd(fd_)
     , throttler(throttler_)
     , file_name(std::move(file_name_))
-    , use_adaptive_buffer_size(use_adaptive_buffer_size_)
-    , adaptive_max_buffer_size(buf_size)
 {
 }
 
@@ -135,7 +124,6 @@ void WriteBufferFromFileDescriptor::finalizeImpl()
         return;
     }
 
-    use_adaptive_buffer_size = false;
     next();
 }
 
diff --git a/src/IO/WriteBufferFromFileDescriptor.h b/src/IO/WriteBufferFromFileDescriptor.h
index e893ecd80fb..cb73b1e1d08 100644
--- a/src/IO/WriteBufferFromFileDescriptor.h
+++ b/src/IO/WriteBufferFromFileDescriptor.h
@@ -18,9 +18,7 @@ public:
         char * existing_memory = nullptr,
         ThrottlerPtr throttler_ = {},
         size_t alignment = 0,
-        std::string file_name_ = "",
-        bool use_adaptive_buffer_size_ = false,
-        size_t adaptive_buffer_initial_size = DBMS_DEFAULT_INITIAL_ADAPTIVE_BUFFER_SIZE);
+        std::string file_name_ = "");
 
     /** Could be used before initialization if needed 'fd' was not passed to constructor.
       * It's not possible to change 'fd' during work.
@@ -58,12 +56,6 @@ protected:
     /// If file has name contains filename, otherwise contains string "(fd=...)"
     std::string file_name;
 
-    /// If true, the size of internal buffer will be exponentially increased up to
-    /// adaptive_buffer_max_size after each nextImpl call. It can be used to avoid
-    /// large buffer allocation when actual size of written data is small.
-    bool use_adaptive_buffer_size;
-    size_t adaptive_max_buffer_size;
-
     void finalizeImpl() override;
 };
 
diff --git a/src/IO/WriteBufferFromPocoSocket.cpp b/src/IO/WriteBufferFromPocoSocket.cpp
index ffb38a384a0..5ed4dbdc787 100644
--- a/src/IO/WriteBufferFromPocoSocket.cpp
+++ b/src/IO/WriteBufferFromPocoSocket.cpp
@@ -183,7 +183,6 @@ WriteBufferFromPocoSocket::WriteBufferFromPocoSocket(Poco::Net::Socket & socket_
     , socket(socket_)
     , peer_address(socket.peerAddress())
     , our_address(socket.address())
-    , write_event(ProfileEvents::end())
     , socket_description("socket (" + peer_address.toString() + ")")
 {
 }
diff --git a/src/IO/WriteBufferFromPocoSocketChunked.cpp b/src/IO/WriteBufferFromPocoSocketChunked.cpp
deleted file mode 100644
index 9da46ee2d10..00000000000
--- a/src/IO/WriteBufferFromPocoSocketChunked.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-#include <IO/WriteBufferFromPocoSocketChunked.h>
-#include <Common/logger_useful.h>
-#include <IO/NetUtils.h>
-
-
-namespace
-{
-
-template <typename T>
-void setValue(T * typed_ptr, std::type_identity_t<T> val)
-{
-    memcpy(static_cast<void*>(typed_ptr), &val, sizeof(T));
-}
-
-}
-
-namespace DB
-{
-
-WriteBufferFromPocoSocketChunked::WriteBufferFromPocoSocketChunked(Poco::Net::Socket & socket_, size_t buf_size)
-    : WriteBufferFromPocoSocketChunked(socket_, ProfileEvents::end(), buf_size)
-{}
-
-WriteBufferFromPocoSocketChunked::WriteBufferFromPocoSocketChunked(Poco::Net::Socket & socket_, const ProfileEvents::Event & write_event_, size_t buf_size)
-    : WriteBufferFromPocoSocket(
-        socket_, write_event_,
-        std::clamp(buf_size, sizeof(*chunk_size_ptr) + 1, static_cast<size_t>(std::numeric_limits<std::remove_reference_t<decltype(*chunk_size_ptr)>>::max()))),
-        log(getLogger("Protocol"))
-{}
-
-void WriteBufferFromPocoSocketChunked::enableChunked()
-{
-    chunked = true;
-    /// Initialize next chunk
-    chunk_size_ptr = reinterpret_cast<decltype(chunk_size_ptr)>(pos);
-    pos += std::min(available(), sizeof(*chunk_size_ptr));
-    /// Pretend finishChunk() was just called to prevent sending empty chunk if finishChunk() called immediately
-    last_finish_chunk = chunk_size_ptr;
-}
-
-void WriteBufferFromPocoSocketChunked::finishChunk()
-{
-    if (!chunked)
-        return;
-
-    if (pos <= reinterpret_cast<Position>(chunk_size_ptr) + sizeof(*chunk_size_ptr))
-    {
-        /// Prevent duplicate finish chunk (and finish chunk right after enableChunked())
-        if (chunk_size_ptr == last_finish_chunk)
-            return;
-
-        /// If current chunk is empty it means we are finishing a chunk previously sent by next(),
-        /// we want to convert current chunk header into end-of-chunk marker and initialize next chunk.
-        /// We don't need to worry about if it's the end of the buffer because next() always sends the whole buffer
-        /// so it should be a beginning of the buffer.
-
-        chassert(reinterpret_cast<Position>(chunk_size_ptr) == working_buffer.begin());
-
-        setValue(chunk_size_ptr, 0);
-        /// Initialize next chunk
-        chunk_size_ptr = reinterpret_cast<decltype(chunk_size_ptr)>(pos);
-        pos += std::min(available(), sizeof(*chunk_size_ptr));
-
-        last_finish_chunk = chunk_size_ptr;
-
-        return;
-    }
-
-    /// Previously finished chunk wasn't sent yet
-    if (last_finish_chunk == chunk_size_ptr)
-    {
-        chunk_started = false;
-        LOG_TEST(log, "{} -> {} Chunk send ended.", ourAddress().toString(), peerAddress().toString());
-    }
-
-    /// Fill up current chunk size
-    setValue(chunk_size_ptr, toLittleEndian(static_cast<UInt32>(pos - reinterpret_cast<Position>(chunk_size_ptr) - sizeof(*chunk_size_ptr))));
-
-    if (!chunk_started)
-        LOG_TEST(log, "{} -> {} Chunk send started. Message {}, size {}",
-                ourAddress().toString(), peerAddress().toString(),
-                static_cast<unsigned int>(*(reinterpret_cast<char *>(chunk_size_ptr) + sizeof(*chunk_size_ptr))),
-                *chunk_size_ptr);
-    else
-    {
-        chunk_started = false;
-        LOG_TEST(log, "{} -> {} Chunk send continued. Size {}", ourAddress().toString(), peerAddress().toString(), *chunk_size_ptr);
-    }
-
-    LOG_TEST(log, "{} -> {} Chunk send ended.", ourAddress().toString(), peerAddress().toString());
-
-    if (available() < sizeof(*chunk_size_ptr))
-    {
-        finishing = available();
-        pos += available();
-        chunk_size_ptr = reinterpret_cast<decltype(chunk_size_ptr)>(pos);
-        last_finish_chunk = chunk_size_ptr;
-        return;
-    }
-
-    /// Buffer end-of-chunk
-    setValue(reinterpret_cast<decltype(chunk_size_ptr)>(pos), 0);
-    pos += sizeof(*chunk_size_ptr);
-    /// Initialize next chunk
-    chunk_size_ptr = reinterpret_cast<decltype(chunk_size_ptr)>(pos);
-    pos += std::min(available(), sizeof(*chunk_size_ptr));
-
-    last_finish_chunk = chunk_size_ptr;
-}
-
-WriteBufferFromPocoSocketChunked::~WriteBufferFromPocoSocketChunked()
-{
-    try
-    {
-        finalize();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-    }
-}
-
-void WriteBufferFromPocoSocketChunked::nextImpl()
-{
-    if (!chunked)
-    {
-        WriteBufferFromPocoSocket::nextImpl();
-        return;
-    }
-
-    /// next() after finishChunk at the end of the buffer
-    if (finishing < sizeof(*chunk_size_ptr))
-    {
-        pos -= finishing;
-        /// Send current chunk
-        WriteBufferFromPocoSocket::nextImpl();
-        /// Send end-of-chunk directly
-        UInt32 s = 0;
-        socketSendBytes(reinterpret_cast<const char *>(&s), sizeof(s));
-
-        finishing = sizeof(*chunk_size_ptr);
-
-        /// Initialize next chunk
-        chunk_size_ptr = reinterpret_cast<decltype(chunk_size_ptr)>(working_buffer.begin());
-        nextimpl_working_buffer_offset = sizeof(*chunk_size_ptr);
-
-        last_finish_chunk = chunk_size_ptr;
-
-        return;
-    }
-
-    /// Prevent sending empty chunk
-    if (offset() == sizeof(*chunk_size_ptr))
-    {
-        nextimpl_working_buffer_offset = sizeof(*chunk_size_ptr);
-        return;
-    }
-
-    /// Finish chunk at the end of the buffer
-    if (working_buffer.end() - reinterpret_cast<Position>(chunk_size_ptr) <= static_cast<std::ptrdiff_t>(sizeof(*chunk_size_ptr)))
-    {
-        pos = reinterpret_cast<Position>(chunk_size_ptr);
-        /// Send current chunk
-        WriteBufferFromPocoSocket::nextImpl();
-        /// Initialize next chunk
-        chunk_size_ptr = reinterpret_cast<decltype(chunk_size_ptr)>(working_buffer.begin());
-        nextimpl_working_buffer_offset = sizeof(*chunk_size_ptr);
-
-        last_finish_chunk = nullptr;
-
-        return;
-    }
-
-    bool initialize_last_finish_chunk = false;
-    if (pos - reinterpret_cast<Position>(chunk_size_ptr) == sizeof(*chunk_size_ptr)) // next() after finishChunk
-    {
-        pos -= sizeof(*chunk_size_ptr);
-        initialize_last_finish_chunk = true;
-    }
-    else // fill up current chunk size
-    {
-        setValue(chunk_size_ptr, toLittleEndian(static_cast<UInt32>(pos - reinterpret_cast<Position>(chunk_size_ptr) - sizeof(*chunk_size_ptr))));
-        if (!chunk_started)
-        {
-            chunk_started = true;
-            LOG_TEST(log, "{} -> {} Chunk send started. Message {}, size {}",
-                    ourAddress().toString(), peerAddress().toString(),
-                    static_cast<unsigned int>(*(reinterpret_cast<char *>(chunk_size_ptr) + sizeof(*chunk_size_ptr))),
-                    *chunk_size_ptr);
-        }
-        else
-            LOG_TEST(log, "{} -> {} Chunk send continued. Size {}", ourAddress().toString(), peerAddress().toString(), *chunk_size_ptr);
-    }
-    /// Send current chunk
-    WriteBufferFromPocoSocket::nextImpl();
-    /// Initialize next chunk
-    chunk_size_ptr = reinterpret_cast<decltype(chunk_size_ptr)>(working_buffer.begin());
-    nextimpl_working_buffer_offset = sizeof(*chunk_size_ptr);
-
-    last_finish_chunk = initialize_last_finish_chunk ? chunk_size_ptr : nullptr;
-}
-
-void WriteBufferFromPocoSocketChunked::finalizeImpl()
-{
-    if (chunked && offset() == sizeof(*chunk_size_ptr))
-        pos -= sizeof(*chunk_size_ptr);
-    WriteBufferFromPocoSocket::finalizeImpl();
-}
-
-}
diff --git a/src/IO/WriteBufferFromPocoSocketChunked.h b/src/IO/WriteBufferFromPocoSocketChunked.h
deleted file mode 100644
index 13a277e3bfb..00000000000
--- a/src/IO/WriteBufferFromPocoSocketChunked.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include <Common/logger_useful.h>
-#include <IO/WriteBufferFromPocoSocket.h>
-#include <algorithm>
-
-
-namespace DB
-{
-
-class WriteBufferFromPocoSocketChunked: public WriteBufferFromPocoSocket
-{
-public:
-    explicit WriteBufferFromPocoSocketChunked(Poco::Net::Socket & socket_, size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE);
-    explicit WriteBufferFromPocoSocketChunked(Poco::Net::Socket & socket_, const ProfileEvents::Event & write_event_, size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE);
-
-    void enableChunked();
-    void finishChunk();
-    ~WriteBufferFromPocoSocketChunked() override;
-
-protected:
-    void nextImpl() override;
-    void finalizeImpl() override;
-    Poco::Net::SocketAddress peerAddress() const { return peer_address; }
-    Poco::Net::SocketAddress ourAddress() const { return our_address; }
-
-private:
-    LoggerPtr log;
-    bool chunked = false;
-    UInt32 * last_finish_chunk = nullptr;       // pointer to the last chunk header created by finishChunk
-    bool chunk_started = false;                 // chunk started flag
-    UInt32 * chunk_size_ptr = nullptr;          // pointer to the chunk size holder in the buffer
-    size_t finishing = sizeof(*chunk_size_ptr); // indicates not enough buffer for end-of-chunk marker
-};
-
-}
diff --git a/src/IO/WriteBufferFromS3.cpp b/src/IO/WriteBufferFromS3.cpp
index d03b486ec52..3682e49b018 100644
--- a/src/IO/WriteBufferFromS3.cpp
+++ b/src/IO/WriteBufferFromS3.cpp
@@ -11,6 +11,7 @@
 #include <Common/Throttler.h>
 #include <Interpreters/Cache/FileCache.h>
 
+#include <Common/Scheduler/ResourceGuard.h>
 #include <IO/WriteHelpers.h>
 #include <IO/S3Common.h>
 #include <IO/S3/Requests.h>
@@ -95,7 +96,7 @@ WriteBufferFromS3::WriteBufferFromS3(
     std::optional<std::map<String, String>> object_metadata_,
     ThreadPoolCallbackRunnerUnsafe<void> schedule_,
     const WriteSettings & write_settings_)
-    : WriteBufferFromFileBase(std::min(buf_size_, static_cast<size_t>(DBMS_DEFAULT_BUFFER_SIZE)), nullptr, 0)
+    : WriteBufferFromFileBase(buf_size_, nullptr, 0)
     , bucket(bucket_)
     , key(key_)
     , request_settings(request_settings_)
@@ -276,10 +277,12 @@ WriteBufferFromS3::~WriteBufferFromS3()
             "The file might not be written to S3. "
             "{}.",
             getVerboseLogDetails());
+        return;
     }
-    else if (!finalized)
+
+    /// That destructor could be call with finalized=false in case of exceptions
+    if (!finalized && !canceled)
     {
-        /// That destructor could be call with finalized=false in case of exceptions
         LOG_INFO(
             log,
             "WriteBufferFromS3 is not finalized in destructor. "
@@ -288,10 +291,9 @@ WriteBufferFromS3::~WriteBufferFromS3()
             getVerboseLogDetails());
     }
 
-    /// Wait for all tasks, because they contain reference to this write buffer.
     task_tracker->safeWaitAll();
 
-    if (!canceled && !multipart_upload_id.empty() && !multipart_upload_finished)
+    if (!multipart_upload_id.empty() && !multipart_upload_finished)
     {
         LOG_WARNING(log, "WriteBufferFromS3 was neither finished nor aborted, try to abort upload in destructor. {}.", getVerboseLogDetails());
         tryToAbortMultipartUpload();
@@ -351,17 +353,9 @@ void WriteBufferFromS3::allocateBuffer()
     buffer_allocation_policy->nextBuffer();
     chassert(0 == hidden_size);
 
-    /// First buffer was already allocated in BufferWithOwnMemory constructor with provided in constructor buffer size.
-    /// It will be reallocated in subsequent nextImpl calls up to the desired buffer size from buffer_allocation_policy.
     if (buffer_allocation_policy->getBufferNumber() == 1)
     {
-        /// Reduce memory size if initial size was larger then desired size from buffer_allocation_policy.
-        /// Usually it doesn't happen but we have it in unit tests.
-        if (memory.size() > buffer_allocation_policy->getBufferSize())
-        {
-            memory.resize(buffer_allocation_policy->getBufferSize());
-            WriteBuffer::set(memory.data(), memory.size());
-        }
+        allocateFirstBuffer();
         return;
     }
 
@@ -369,6 +363,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));
@@ -557,11 +559,12 @@ void WriteBufferFromS3::writePart(WriteBufferFromS3::PartData && data)
 
         auto & request = std::get<0>(*worker_data);
 
-        CurrentThread::IOScope io_scope(write_settings.io_scheduling);
-
+        ResourceCost cost = request.GetContentLength();
+        ResourceGuard rlock(write_settings.resource_link, cost);
         Stopwatch watch;
         auto outcome = client_ptr->UploadPart(request);
         watch.stop();
+        rlock.unlock(); // Avoid acquiring other locks under resource lock
 
         ProfileEvents::increment(ProfileEvents::WriteBufferFromS3Microseconds, watch.elapsedMicroseconds());
 
@@ -575,6 +578,7 @@ void WriteBufferFromS3::writePart(WriteBufferFromS3::PartData && data)
         if (!outcome.IsSuccess())
         {
             ProfileEvents::increment(ProfileEvents::WriteBufferFromS3RequestsErrors, 1);
+            write_settings.resource_link.accumulate(cost); // We assume no resource was used in case of failure
             throw S3Exception(outcome.GetError().GetMessage(), outcome.GetError().GetErrorType());
         }
 
@@ -712,11 +716,12 @@ void WriteBufferFromS3::makeSinglepartUpload(WriteBufferFromS3::PartData && data
             if (client_ptr->isClientForDisk())
                 ProfileEvents::increment(ProfileEvents::DiskS3PutObject);
 
-            CurrentThread::IOScope io_scope(write_settings.io_scheduling);
-
+            ResourceCost cost = request.GetContentLength();
+            ResourceGuard rlock(write_settings.resource_link, cost);
             Stopwatch watch;
             auto outcome = client_ptr->PutObject(request);
             watch.stop();
+            rlock.unlock();
 
             ProfileEvents::increment(ProfileEvents::WriteBufferFromS3Microseconds, watch.elapsedMicroseconds());
             if (blob_log)
@@ -730,6 +735,7 @@ void WriteBufferFromS3::makeSinglepartUpload(WriteBufferFromS3::PartData && data
             }
 
             ProfileEvents::increment(ProfileEvents::WriteBufferFromS3RequestsErrors, 1);
+            write_settings.resource_link.accumulate(cost); // We assume no resource was used in case of failure
 
             if (outcome.GetError().GetErrorType() == Aws::S3::S3Errors::NO_SUCH_KEY)
             {
diff --git a/src/IO/WriteBufferFromS3.h b/src/IO/WriteBufferFromS3.h
index 604f036fcb8..b026da607c5 100644
--- a/src/IO/WriteBufferFromS3.h
+++ b/src/IO/WriteBufferFromS3.h
@@ -64,6 +64,7 @@ private:
     void reallocateFirstBuffer();
     void detachBuffer();
     void allocateBuffer();
+    void allocateFirstBuffer();
     void setFakeBufferWhenPreFinalized();
 
     S3::UploadPartRequest getUploadRequest(size_t part_number, PartData & data);
diff --git a/src/IO/WriteBufferValidUTF8.cpp b/src/IO/WriteBufferValidUTF8.cpp
index 2a86f8c2801..d611befac37 100644
--- a/src/IO/WriteBufferValidUTF8.cpp
+++ b/src/IO/WriteBufferValidUTF8.cpp
@@ -54,7 +54,7 @@ inline void WriteBufferValidUTF8::putReplacement()
 }
 
 
-inline void WriteBufferValidUTF8::putValid(const char *data, size_t len)
+inline void WriteBufferValidUTF8::putValid(char *data, size_t len)
 {
     if (len == 0)
         return;
@@ -149,34 +149,9 @@ void WriteBufferValidUTF8::finalizeImpl()
     /// Write all complete sequences from buffer.
     nextImpl();
 
-    /// Handle remaining bytes if we have an incomplete sequence
+    /// If unfinished sequence at end, then write replacement.
     if (working_buffer.begin() != memory.data())
-    {
-        const char * p = memory.data();
-
-        while (p < pos)
-        {
-            UInt8 len = length_of_utf8_sequence[static_cast<const unsigned char>(*p)];
-            if (p + len > pos)
-            {
-                /// Incomplete sequence. Skip one byte.
-                putReplacement();
-                ++p;
-            }
-            else if (Poco::UTF8Encoding::isLegal(reinterpret_cast<const unsigned char *>(p), len))
-            {
-                /// Valid sequence
-                putValid(p, len);
-                p += len;
-            }
-            else
-            {
-                /// Invalid sequence, skip first byte.
-                putReplacement();
-                ++p;
-            }
-        }
-    }
+        putReplacement();
 }
 
 }
diff --git a/src/IO/WriteBufferValidUTF8.h b/src/IO/WriteBufferValidUTF8.h
index a398b8ded01..daaf0427f88 100644
--- a/src/IO/WriteBufferValidUTF8.h
+++ b/src/IO/WriteBufferValidUTF8.h
@@ -26,7 +26,7 @@ public:
 
 private:
     void putReplacement();
-    void putValid(const char * data, size_t len);
+    void putValid(char * data, size_t len);
 
     void nextImpl() override;
     void finalizeImpl() override;
diff --git a/src/IO/WriteSettings.h b/src/IO/WriteSettings.h
index 6b3d04f4e5c..84bb25439b5 100644
--- a/src/IO/WriteSettings.h
+++ b/src/IO/WriteSettings.h
@@ -13,7 +13,8 @@ struct WriteSettings
     ThrottlerPtr remote_throttler;
     ThrottlerPtr local_throttler;
 
-    IOSchedulingSettings io_scheduling;
+    // Resource to be used during reading
+    ResourceLink resource_link;
 
     /// Filesystem cache settings
     bool enable_filesystem_cache_on_write_operations = false;
@@ -24,9 +25,6 @@ struct WriteSettings
     bool s3_allow_parallel_part_upload = true;
     bool azure_allow_parallel_part_upload = true;
 
-    bool use_adaptive_write_buffer = false;
-    size_t adaptive_write_buffer_initial_size = 16 * 1024;
-
     bool operator==(const WriteSettings & other) const = default;
 };
 
diff --git a/src/IO/examples/CMakeLists.txt b/src/IO/examples/CMakeLists.txt
index bfd171a3d00..fc9d9c7dcd1 100644
--- a/src/IO/examples/CMakeLists.txt
+++ b/src/IO/examples/CMakeLists.txt
@@ -1,77 +1,77 @@
 clickhouse_add_executable (read_buffer read_buffer.cpp)
-target_link_libraries (read_buffer PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (read_buffer PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (read_buffer_perf read_buffer_perf.cpp)
-target_link_libraries (read_buffer_perf PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (read_buffer_perf PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (read_float_perf read_float_perf.cpp)
-target_link_libraries (read_float_perf PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (read_float_perf PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (write_buffer write_buffer.cpp)
-target_link_libraries (write_buffer PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (write_buffer PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (write_buffer_perf write_buffer_perf.cpp)
-target_link_libraries (write_buffer_perf PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (write_buffer_perf PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (valid_utf8_perf valid_utf8_perf.cpp)
-target_link_libraries (valid_utf8_perf PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (valid_utf8_perf PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (valid_utf8 valid_utf8.cpp)
-target_link_libraries (valid_utf8 PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (valid_utf8 PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (var_uint var_uint.cpp)
-target_link_libraries (var_uint PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (var_uint PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (read_escaped_string read_escaped_string.cpp)
-target_link_libraries (read_escaped_string PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (read_escaped_string PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (parse_int_perf parse_int_perf.cpp)
-target_link_libraries (parse_int_perf PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (parse_int_perf PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (parse_int_perf2 parse_int_perf2.cpp)
-target_link_libraries (parse_int_perf2 PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (parse_int_perf2 PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (read_write_int read_write_int.cpp)
-target_link_libraries (read_write_int PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (read_write_int PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (o_direct_and_dirty_pages o_direct_and_dirty_pages.cpp)
-target_link_libraries (o_direct_and_dirty_pages PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (o_direct_and_dirty_pages PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (io_operators io_operators.cpp)
-target_link_libraries (io_operators PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (io_operators PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (write_int write_int.cpp)
-target_link_libraries (write_int PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (write_int PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (zlib_buffers zlib_buffers.cpp)
-target_link_libraries (zlib_buffers PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (zlib_buffers PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (lzma_buffers lzma_buffers.cpp)
-target_link_libraries (lzma_buffers PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (lzma_buffers PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (limit_read_buffer limit_read_buffer.cpp)
-target_link_libraries (limit_read_buffer PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (limit_read_buffer PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (limit_read_buffer2 limit_read_buffer2.cpp)
-target_link_libraries (limit_read_buffer2 PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (limit_read_buffer2 PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (parse_date_time_best_effort parse_date_time_best_effort.cpp)
-target_link_libraries (parse_date_time_best_effort PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (parse_date_time_best_effort PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (zlib_ng_bug zlib_ng_bug.cpp)
-target_link_libraries (zlib_ng_bug PRIVATE ch_contrib::zlib clickhouse_common_io clickhouse_common_config)
+target_link_libraries (zlib_ng_bug PRIVATE ch_contrib::zlib clickhouse_common_io)
 
 clickhouse_add_executable (dragonbox_test dragonbox_test.cpp)
-target_link_libraries (dragonbox_test PRIVATE ch_contrib::dragonbox_to_chars clickhouse_common_io clickhouse_common_config)
+target_link_libraries (dragonbox_test PRIVATE ch_contrib::dragonbox_to_chars clickhouse_common_io)
 
 clickhouse_add_executable (zstd_buffers zstd_buffers.cpp)
-target_link_libraries (zstd_buffers PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (zstd_buffers PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (snappy_read_buffer snappy_read_buffer.cpp)
-target_link_libraries (snappy_read_buffer PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (snappy_read_buffer PRIVATE clickhouse_common_io)
 
 clickhouse_add_executable (hadoop_snappy_read_buffer hadoop_snappy_read_buffer.cpp)
-target_link_libraries (hadoop_snappy_read_buffer PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries (hadoop_snappy_read_buffer PRIVATE clickhouse_common_io)
 
 if (TARGET ch_contrib::hdfs)
     clickhouse_add_executable (read_buffer_from_hdfs read_buffer_from_hdfs.cpp)
diff --git a/src/IO/parseDateTimeBestEffort.cpp b/src/IO/parseDateTimeBestEffort.cpp
index 52bcdc6bbb4..e046e837689 100644
--- a/src/IO/parseDateTimeBestEffort.cpp
+++ b/src/IO/parseDateTimeBestEffort.cpp
@@ -82,14 +82,13 @@ struct DateTimeSubsecondPart
     UInt8 digits;
 };
 
-template <typename ReturnType, bool is_us_style, bool strict = false, bool is_64 = false>
+template <typename ReturnType, bool is_us_style>
 ReturnType parseDateTimeBestEffortImpl(
     time_t & res,
     ReadBuffer & in,
     const DateLUTImpl & local_time_zone,
     const DateLUTImpl & utc_time_zone,
-    DateTimeSubsecondPart * fractional,
-    const char * allowed_date_delimiters = nullptr)
+    DateTimeSubsecondPart * fractional)
 {
     auto on_error = [&]<typename... FmtArgs>(int error_code [[maybe_unused]],
                                              FormatStringHelper<FmtArgs...> fmt_string [[maybe_unused]],
@@ -171,36 +170,22 @@ ReturnType parseDateTimeBestEffortImpl(
                     fractional->digits = 3;
                     readDecimalNumber<3>(fractional->value, digits + 10);
                 }
-                else if constexpr (strict)
-                {
-                    /// Fractional part is not allowed.
-                    return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot read DateTime: unexpected fractional part");
-                }
                 return ReturnType(true);
             }
             else if (num_digits == 10 && !year && !has_time)
             {
-                if (strict)
-                    return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Strict best effort parsing doesn't allow timestamps");
-
                 /// This is unix timestamp.
                 readDecimalNumber<10>(res, digits);
                 return ReturnType(true);
             }
             else if (num_digits == 9 && !year && !has_time)
             {
-                if (strict)
-                    return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Strict best effort parsing doesn't allow timestamps");
-
                 /// This is unix timestamp.
                 readDecimalNumber<9>(res, digits);
                 return ReturnType(true);
             }
             else if (num_digits == 14 && !year && !has_time)
             {
-                if (strict)
-                    return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Strict best effort parsing doesn't allow date times without separators");
-
                 /// This is YYYYMMDDhhmmss
                 readDecimalNumber<4>(year, digits);
                 readDecimalNumber<2>(month, digits + 4);
@@ -212,9 +197,6 @@ ReturnType parseDateTimeBestEffortImpl(
             }
             else if (num_digits == 8 && !year)
             {
-                if (strict)
-                    return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Strict best effort parsing doesn't allow date times without separators");
-
                 /// This is YYYYMMDD
                 readDecimalNumber<4>(year, digits);
                 readDecimalNumber<2>(month, digits + 4);
@@ -222,9 +204,6 @@ ReturnType parseDateTimeBestEffortImpl(
             }
             else if (num_digits == 6)
             {
-                if (strict)
-                    return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Strict best effort parsing doesn't allow date times without separators");
-
                 /// This is YYYYMM or hhmmss
                 if (!year && !month)
                 {
@@ -293,9 +272,6 @@ ReturnType parseDateTimeBestEffortImpl(
                         else
                             return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot read DateTime: unexpected number of decimal digits after year and month: {}", num_digits);
                     }
-
-                    if (!isSymbolIn(delimiter_after_year, allowed_date_delimiters))
-                        return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot read DateTime: '{}' delimiter between date parts is not allowed", delimiter_after_year);
                 }
             }
             else if (num_digits == 2 || num_digits == 1)
@@ -353,7 +329,7 @@ ReturnType parseDateTimeBestEffortImpl(
                     if (month && !day_of_month)
                         day_of_month = hour_or_day_of_month_or_month;
                 }
-                else if ((!in.eof() && isSymbolIn(*in.position(), allowed_date_delimiters)) && (checkChar('/', in) || checkChar('.', in) || checkChar('-', in)))
+                else if (checkChar('/', in) || checkChar('.', in) || checkChar('-', in))
                 {
                     if (day_of_month)
                         return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot read DateTime: day of month is duplicated");
@@ -402,7 +378,7 @@ ReturnType parseDateTimeBestEffortImpl(
                     if (month > 12)
                         std::swap(month, day_of_month);
 
-                    if ((!in.eof() && isSymbolIn(*in.position(), allowed_date_delimiters)) && (checkChar('/', in) || checkChar('.', in) || checkChar('-', in)))
+                    if (checkChar('/', in) || checkChar('.', in) || checkChar('-', in))
                     {
                         if (year)
                             return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot read DateTime: year component is duplicated");
@@ -427,16 +403,9 @@ ReturnType parseDateTimeBestEffortImpl(
                 else
                 {
                     if (day_of_month)
-                    {
-                        if (strict && hour)
-                            return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot read DateTime: hour component is duplicated");
-
                         hour = hour_or_day_of_month_or_month;
-                    }
                     else
-                    {
                         day_of_month = hour_or_day_of_month_or_month;
-                    }
                 }
             }
             else if (num_digits != 0)
@@ -477,11 +446,6 @@ ReturnType parseDateTimeBestEffortImpl(
                     fractional->digits = num_digits;
                     readDecimalNumber(fractional->value, num_digits, digits);
                 }
-                else if (strict)
-                {
-                    /// Fractional part is not allowed.
-                    return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot read DateTime: unexpected fractional part");
-                }
             }
             else if (c == '+' || c == '-')
             {
@@ -618,24 +582,12 @@ ReturnType parseDateTimeBestEffortImpl(
         return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot read DateTime: neither Date nor Time was parsed successfully");
 
     if (!day_of_month)
-    {
-        if constexpr (strict)
-            return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot read DateTime: day of month is required");
         day_of_month = 1;
-    }
-
     if (!month)
-    {
-        if constexpr (strict)
-            return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot read DateTime: month is required");
         month = 1;
-    }
 
     if (!year)
     {
-        if constexpr (strict)
-            return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot read DateTime: year is required");
-
         /// 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".
@@ -689,20 +641,6 @@ ReturnType parseDateTimeBestEffortImpl(
         }
     };
 
-    if constexpr (strict)
-    {
-        if constexpr (is_64)
-        {
-            if (year < 1900)
-                return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot read DateTime64: year {} is less than minimum supported year 1900", year);
-        }
-        else
-        {
-            if (year < 1970)
-                return on_error(ErrorCodes::CANNOT_PARSE_DATETIME, "Cannot read DateTime: year {} is less than minimum supported year 1970", year);
-        }
-    }
-
     if (has_time_zone_offset)
     {
         res = utc_time_zone.makeDateTime(year, month, day_of_month, hour, minute, second);
@@ -716,20 +654,20 @@ ReturnType parseDateTimeBestEffortImpl(
     return ReturnType(true);
 }
 
-template <typename ReturnType, bool is_us_style, bool strict = false>
-ReturnType parseDateTime64BestEffortImpl(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone, const char * allowed_date_delimiters = nullptr)
+template <typename ReturnType, bool is_us_style>
+ReturnType parseDateTime64BestEffortImpl(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone)
 {
     time_t whole;
     DateTimeSubsecondPart subsecond = {0, 0}; // needs to be explicitly initialized sine it could be missing from input string
 
     if constexpr (std::is_same_v<ReturnType, bool>)
     {
-        if (!parseDateTimeBestEffortImpl<bool, is_us_style, strict, true>(whole, in, local_time_zone, utc_time_zone, &subsecond, allowed_date_delimiters))
+        if (!parseDateTimeBestEffortImpl<bool, is_us_style>(whole, in, local_time_zone, utc_time_zone, &subsecond))
             return false;
     }
     else
     {
-        parseDateTimeBestEffortImpl<ReturnType, is_us_style, strict, true>(whole, in, local_time_zone, utc_time_zone, &subsecond, allowed_date_delimiters);
+        parseDateTimeBestEffortImpl<ReturnType, is_us_style>(whole, in, local_time_zone, utc_time_zone, &subsecond);
     }
 
 
@@ -792,24 +730,4 @@ bool tryParseDateTime64BestEffortUS(DateTime64 & res, UInt32 scale, ReadBuffer &
     return parseDateTime64BestEffortImpl<bool, true>(res, scale, in, local_time_zone, utc_time_zone);
 }
 
-bool tryParseDateTimeBestEffortStrict(time_t & res, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone, const char * allowed_date_delimiters)
-{
-    return parseDateTimeBestEffortImpl<bool, false, true>(res, in, local_time_zone, utc_time_zone, nullptr, allowed_date_delimiters);
-}
-
-bool tryParseDateTimeBestEffortUSStrict(time_t & res, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone, const char * allowed_date_delimiters)
-{
-    return parseDateTimeBestEffortImpl<bool, true, true>(res, in, local_time_zone, utc_time_zone, nullptr, allowed_date_delimiters);
-}
-
-bool tryParseDateTime64BestEffortStrict(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone, const char * allowed_date_delimiters)
-{
-    return parseDateTime64BestEffortImpl<bool, false, true>(res, scale, in, local_time_zone, utc_time_zone, allowed_date_delimiters);
-}
-
-bool tryParseDateTime64BestEffortUSStrict(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone, const char * allowed_date_delimiters)
-{
-    return parseDateTime64BestEffortImpl<bool, true, true>(res, scale, in, local_time_zone, utc_time_zone, allowed_date_delimiters);
-}
-
 }
diff --git a/src/IO/parseDateTimeBestEffort.h b/src/IO/parseDateTimeBestEffort.h
index 6dd052b67a3..22af44f9e76 100644
--- a/src/IO/parseDateTimeBestEffort.h
+++ b/src/IO/parseDateTimeBestEffort.h
@@ -63,12 +63,4 @@ void parseDateTime64BestEffort(DateTime64 & res, UInt32 scale, ReadBuffer & in,
 bool tryParseDateTime64BestEffort(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
 void parseDateTime64BestEffortUS(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
 bool tryParseDateTime64BestEffortUS(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
-
-/// More strict version of best effort parsing. Requires day, month and year to be present, checks for allowed
-/// delimiters between date components, makes additional correctness checks. Used in schema inference if date times.
-bool tryParseDateTimeBestEffortStrict(time_t & res, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone, const char * allowed_date_delimiters);
-bool tryParseDateTimeBestEffortUSStrict(time_t & res, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone, const char * allowed_date_delimiters);
-bool tryParseDateTime64BestEffortStrict(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone, const char * allowed_date_delimiters);
-bool tryParseDateTime64BestEffortUSStrict(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone, const char * allowed_date_delimiters);
-
 }
diff --git a/src/IO/tests/gtest_archive_reader_and_writer.cpp b/src/IO/tests/gtest_archive_reader_and_writer.cpp
index 06f8f53546b..898c7017e7d 100644
--- a/src/IO/tests/gtest_archive_reader_and_writer.cpp
+++ b/src/IO/tests/gtest_archive_reader_and_writer.cpp
@@ -492,6 +492,48 @@ TEST_P(ArchiveReaderAndWriterTest, ManyFilesOnDisk)
     }
 }
 
+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();
+    }
+
+    /// Read the archive.
+    auto reader = createArchiveReader(getPathToArchive());
+
+    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);
+
+    {
+        auto in = reader->readFile("a.txt", /*throw_on_not_found=*/true);
+        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(TarArchiveReaderTest, FileExists)
 {
     String archive_path = "archive.tar";
diff --git a/src/IO/tests/gtest_s3_uri.cpp b/src/IO/tests/gtest_s3_uri.cpp
index abe80db7ba5..0ec28f80072 100644
--- a/src/IO/tests/gtest_s3_uri.cpp
+++ b/src/IO/tests/gtest_s3_uri.cpp
@@ -204,14 +204,11 @@ TEST(S3UriTest, validPatterns)
         ASSERT_EQ("", uri.version_id);
         ASSERT_EQ(true, uri.is_virtual_hosted_style);
     }
-    {
-        S3::URI uri("https://bucket-test.cn-beijing-internal.oss-data-acc.aliyuncs.com/cc-2zeh496zqm0g6e09g");
-        ASSERT_EQ("https://cn-beijing-internal.oss-data-acc.aliyuncs.com", uri.endpoint);
-        ASSERT_EQ("bucket-test", uri.bucket);
-        ASSERT_EQ("cc-2zeh496zqm0g6e09g", uri.key);
-        ASSERT_EQ("", uri.version_id);
-        ASSERT_EQ(true, uri.is_virtual_hosted_style);
-    }
+}
+
+TEST_P(S3UriTest, invalidPatterns)
+{
+    ASSERT_ANY_THROW(S3::URI new_uri(GetParam()));
 }
 
 TEST(S3UriTest, versionIdChecks)
@@ -226,5 +223,19 @@ TEST(S3UriTest, versionIdChecks)
     }
 }
 
+INSTANTIATE_TEST_SUITE_P(
+    S3,
+    S3UriTest,
+    testing::Values(
+        "https:///",
+        "https://.s3.amazonaws.com/key",
+        "https://s3.amazonaws.com/key",
+        "https://jokserfn.s3amazonaws.com/key",
+        "https://s3.amazonaws.com//",
+        "https://amazonaws.com/",
+        "https://amazonaws.com//",
+        "https://amazonaws.com//key"));
+
 }
+
 #endif
diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 9ebc73260b6..34f3e0a98bd 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -100,13 +100,6 @@ bool isConstantFromScalarSubquery(const ActionsDAG::Node * node)
 
 }
 
-bool ActionsDAG::Node::isDeterministic() const
-{
-    bool deterministic_if_func = type != ActionType::FUNCTION || function_base->isDeterministic();
-    bool deterministic_if_const = type != ActionType::COLUMN || is_deterministic_constant;
-    return deterministic_if_func && deterministic_if_const;
-}
-
 void ActionsDAG::Node::toTree(JSONBuilder::JSONMap & map) const
 {
     map.add("Node Type", magic_enum::enum_name(type));
@@ -301,11 +294,11 @@ const ActionsDAG::Node & ActionsDAG::addCast(const Node & node_to_cast, const Da
     column.column = DataTypeString().createColumnConst(0, cast_type_constant_value);
     column.type = std::make_shared<DataTypeString>();
 
-    const auto * cast_type_constant_node = &addColumn(column);
+    const auto * cast_type_constant_node = &addColumn(std::move(column));
     ActionsDAG::NodeRawConstPtrs children = {&node_to_cast, cast_type_constant_node};
-    auto func_base_cast = createInternalCast(ColumnWithTypeAndName{node_to_cast.result_type, node_to_cast.result_name}, cast_type, CastType::nonAccurate, {});
+    FunctionOverloadResolverPtr func_builder_cast = createInternalCastOverloadResolver(CastType::nonAccurate, {});
 
-    return addFunction(func_base_cast, std::move(children), result_name);
+    return addFunction(func_builder_cast, std::move(children), result_name);
 }
 
 const ActionsDAG::Node & ActionsDAG::addFunctionImpl(
@@ -325,6 +318,7 @@ const ActionsDAG::Node & ActionsDAG::addFunctionImpl(
     node.function_base = function_base;
     node.result_type = result_type;
     node.function = node.function_base->prepare(arguments);
+    node.is_deterministic = node.function_base->isDeterministic();
 
     /// If all arguments are constants, and function is suitable to be executed in 'prepare' stage - execute function.
     if (node.function_base->isSuitableForConstantFolding())
@@ -396,7 +390,7 @@ const ActionsDAG::Node * ActionsDAG::tryFindInOutputs(const std::string & name)
     return nullptr;
 }
 
-ActionsDAG::NodeRawConstPtrs ActionsDAG::findInOutputs(const Names & names) const
+ActionsDAG::NodeRawConstPtrs ActionsDAG::findInOutpus(const Names & names) const
 {
     NodeRawConstPtrs required_nodes;
     required_nodes.reserve(names.size());
@@ -524,7 +518,7 @@ void ActionsDAG::removeUnusedActions(const NameSet & required_names, bool allow_
 
 void ActionsDAG::removeUnusedActions(const Names & required_names, bool allow_remove_inputs, bool allow_constant_folding)
 {
-    auto required_nodes = findInOutputs(required_names);
+    auto required_nodes = findInOutpus(required_names);
     outputs.swap(required_nodes);
     removeUnusedActions(allow_remove_inputs, allow_constant_folding);
 }
@@ -542,99 +536,64 @@ void ActionsDAG::removeUnusedActions(bool allow_remove_inputs, bool allow_consta
 
 void ActionsDAG::removeUnusedActions(const std::unordered_set<const Node *> & used_inputs, bool allow_constant_folding)
 {
-    NodeRawConstPtrs roots;
-    roots.reserve(outputs.size() + used_inputs.size());
-    roots = outputs;
+    std::unordered_set<const Node *> visited_nodes;
+    std::stack<Node *> stack;
+
+    for (const auto * node : outputs)
+    {
+        visited_nodes.insert(node);
+        stack.push(const_cast<Node *>(node));
+    }
 
     for (auto & node : nodes)
     {
         /// We cannot remove arrayJoin because it changes the number of rows.
-        if (node.type == ActionType::ARRAY_JOIN)
-            roots.push_back(&node);
+        bool is_array_join = node.type == ActionType::ARRAY_JOIN;
+
+        if (is_array_join && !visited_nodes.contains(&node))
+        {
+            visited_nodes.insert(&node);
+            stack.push(&node);
+        }
 
         if (node.type == ActionType::INPUT && used_inputs.contains(&node))
-            roots.push_back(&node);
+            visited_nodes.insert(&node);
     }
 
-    std::unordered_set<const Node *> required_nodes;
-    std::unordered_set<const Node *> non_deterministic_nodes;
-
-    struct Frame
+    while (!stack.empty())
     {
-        const ActionsDAG::Node * node;
-        size_t next_child_to_visit = 0;
-    };
+        auto * node = stack.top();
+        stack.pop();
 
-    std::stack<Frame> stack;
-
-    enum class VisitStage { NonDeterministic, Required };
-
-    for (auto stage : {VisitStage::NonDeterministic, VisitStage::Required})
-    {
-        required_nodes.clear();
-
-        for (const auto * root : roots)
+        /// Constant folding.
+        if (allow_constant_folding && !node->children.empty() && node->column && isColumnConst(*node->column))
         {
-            if (!required_nodes.contains(root))
+            node->type = ActionsDAG::ActionType::COLUMN;
+
+            for (const auto & child : node->children)
             {
-                required_nodes.insert(root);
-                stack.push({.node = root});
+                if (!child->is_deterministic)
+                {
+                    node->is_deterministic = false;
+                    break;
+                }
             }
 
-            while (!stack.empty())
+            node->children.clear();
+        }
+
+        for (const auto * child : node->children)
+        {
+            if (!visited_nodes.contains(child))
             {
-                auto & frame = stack.top();
-                auto * node = const_cast<Node *>(frame.node);
-
-                while (frame.next_child_to_visit < node->children.size())
-                {
-                    const auto * child = node->children[frame.next_child_to_visit];
-                    ++frame.next_child_to_visit;
-
-                    if (!required_nodes.contains(child))
-                    {
-                        required_nodes.insert(child);
-                        stack.push({.node = child});
-                        break;
-                    }
-                }
-
-                if (stack.top().node != node)
-                    continue;
-
-                stack.pop();
-
-                if (stage == VisitStage::Required)
-                    continue;
-
-                if (!node->isDeterministic())
-                    non_deterministic_nodes.insert(node);
-                else
-                {
-                    for (const auto * child : node->children)
-                    {
-                        if (non_deterministic_nodes.contains(child))
-                        {
-                            non_deterministic_nodes.insert(node);
-                            break;
-                        }
-                    }
-                }
-
-                /// Constant folding.
-                if (allow_constant_folding && !node->children.empty()
-                    && node->column && isColumnConst(*node->column))
-                {
-                    node->type = ActionsDAG::ActionType::COLUMN;
-                    node->children.clear();
-                    node->is_deterministic_constant = !non_deterministic_nodes.contains(node);
-                }
+                stack.push(const_cast<Node *>(child));
+                visited_nodes.insert(child);
             }
         }
     }
 
-    std::erase_if(nodes, [&](const Node & node) { return !required_nodes.contains(&node); });
-    std::erase_if(inputs, [&](const Node * node) { return !required_nodes.contains(node); });
+    std::erase_if(nodes, [&](const Node & node) { return !visited_nodes.contains(&node); });
+    std::erase_if(inputs, [&](const Node * node) { return !visited_nodes.contains(node); });
 }
 
 
@@ -665,9 +624,9 @@ void ActionsDAG::removeAliasesForFilter(const std::string & filter_name)
     }
 }
 
-ActionsDAG ActionsDAG::cloneSubDAG(const NodeRawConstPtrs & outputs, bool remove_aliases)
+ActionsDAGPtr ActionsDAG::cloneSubDAG(const NodeRawConstPtrs & outputs, bool remove_aliases)
 {
-    ActionsDAG actions;
+    auto actions = std::make_shared<ActionsDAG>();
     std::unordered_map<const Node *, Node *> copy_map;
 
     struct Frame
@@ -702,21 +661,21 @@ ActionsDAG ActionsDAG::cloneSubDAG(const NodeRawConstPtrs & outputs, bool remove
             if (remove_aliases && frame.node->type == ActionType::ALIAS)
                 copy_node = copy_map[frame.node->children.front()];
             else
-                copy_node = &actions.nodes.emplace_back(*frame.node);
+                copy_node = &actions->nodes.emplace_back(*frame.node);
 
             if (frame.node->type == ActionType::INPUT)
-                actions.inputs.push_back(copy_node);
+                actions->inputs.push_back(copy_node);
 
             stack.pop();
         }
     }
 
-    for (auto & node : actions.nodes)
+    for (auto & node : actions->nodes)
         for (auto & child : node.children)
             child = copy_map[child];
 
     for (const auto * output : outputs)
-        actions.outputs.push_back(copy_map[output]);
+        actions->outputs.push_back(copy_map[output]);
 
     return actions;
 }
@@ -1002,9 +961,9 @@ NameSet ActionsDAG::foldActionsByProjection(
 }
 
 
-ActionsDAG ActionsDAG::foldActionsByProjection(const std::unordered_map<const Node *, const Node *> & new_inputs, const NodeRawConstPtrs & required_outputs)
+ActionsDAGPtr ActionsDAG::foldActionsByProjection(const std::unordered_map<const Node *, const Node *> & new_inputs, const NodeRawConstPtrs & required_outputs)
 {
-    ActionsDAG dag;
+    auto dag = std::make_unique<ActionsDAG>();
     std::unordered_map<const Node *, const Node *> inputs_mapping;
     std::unordered_map<const Node *, const Node *> mapping;
     struct Frame
@@ -1044,9 +1003,9 @@ ActionsDAG ActionsDAG::foldActionsByProjection(const std::unordered_map<const No
                         {
                             bool should_rename = new_input->result_name != rename->result_name;
                             const auto & input_name = should_rename ? rename->result_name : new_input->result_name;
-                            mapped_input = &dag.addInput(input_name, new_input->result_type);
+                            mapped_input = &dag->addInput(input_name, new_input->result_type);
                             if (should_rename)
-                                mapped_input = &dag.addAlias(*mapped_input, new_input->result_name);
+                                mapped_input = &dag->addAlias(*mapped_input, new_input->result_name);
                         }
 
                         node = mapped_input;
@@ -1075,7 +1034,7 @@ ActionsDAG ActionsDAG::foldActionsByProjection(const std::unordered_map<const No
                     "Cannot fold actions for projection. Node {} requires input {} which does not belong to projection",
                     stack.front().node->result_name, frame.node->result_name);
 
-            auto & node = dag.nodes.emplace_back(*frame.node);
+            auto & node = dag->nodes.emplace_back(*frame.node);
             for (auto & child : node.children)
                 child = mapping[child];
 
@@ -1090,8 +1049,8 @@ ActionsDAG ActionsDAG::foldActionsByProjection(const std::unordered_map<const No
         /// Add an alias if the mapped node has a different result name.
         const auto * mapped_output = mapping[output];
         if (output->result_name != mapped_output->result_name)
-            mapped_output = &dag.addAlias(*mapped_output, output->result_name);
-        dag.outputs.push_back(mapped_output);
+            mapped_output = &dag->addAlias(*mapped_output, output->result_name);
+        dag->outputs.push_back(mapped_output);
     }
 
     return dag;
@@ -1287,31 +1246,27 @@ bool ActionsDAG::removeUnusedResult(const std::string & column_name)
     return true;
 }
 
-ActionsDAG ActionsDAG::clone() const
+ActionsDAGPtr ActionsDAG::clone() const
 {
-    std::unordered_map<const Node *, Node *> old_to_new_nodes;
-    return clone(old_to_new_nodes);
-}
+    auto actions = std::make_shared<ActionsDAG>();
 
-ActionsDAG ActionsDAG::clone(std::unordered_map<const Node *, Node *> & old_to_new_nodes) const
-{
-    ActionsDAG actions;
+    std::unordered_map<const Node *, Node *> copy_map;
 
     for (const auto & node : nodes)
     {
-        auto & copy_node = actions.nodes.emplace_back(node);
-        old_to_new_nodes[&node] = &copy_node;
+        auto & copy_node = actions->nodes.emplace_back(node);
+        copy_map[&node] = &copy_node;
     }
 
-    for (auto & node : actions.nodes)
+    for (auto & node : actions->nodes)
         for (auto & child : node.children)
-            child = old_to_new_nodes[child];
+            child = copy_map[child];
 
     for (const auto & output_node : outputs)
-        actions.outputs.push_back(old_to_new_nodes[output_node]);
+        actions->outputs.push_back(copy_map[output_node]);
 
     for (const auto & input_node : inputs)
-        actions.inputs.push_back(old_to_new_nodes[input_node]);
+        actions->inputs.push_back(copy_map[input_node]);
 
     return actions;
 }
@@ -1420,7 +1375,7 @@ bool ActionsDAG::trivial() const
 void ActionsDAG::assertDeterministic() const
 {
     for (const auto & node : nodes)
-        if (!node.isDeterministic())
+        if (!node.is_deterministic)
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Expression must be deterministic but it contains non-deterministic part `{}`", node.result_name);
 }
@@ -1428,7 +1383,7 @@ void ActionsDAG::assertDeterministic() const
 bool ActionsDAG::hasNonDeterministic() const
 {
     for (const auto & node : nodes)
-        if (!node.isDeterministic())
+        if (!node.is_deterministic)
             return true;
     return false;
 }
@@ -1449,7 +1404,7 @@ const ActionsDAG::Node & ActionsDAG::materializeNode(const Node & node)
     return addAlias(*func, name);
 }
 
-ActionsDAG ActionsDAG::makeConvertingActions(
+ActionsDAGPtr ActionsDAG::makeConvertingActions(
     const ColumnsWithTypeAndName & source,
     const ColumnsWithTypeAndName & result,
     MatchColumnsMode mode,
@@ -1466,7 +1421,7 @@ ActionsDAG ActionsDAG::makeConvertingActions(
     if (add_casted_columns && mode != MatchColumnsMode::Name)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Converting with add_casted_columns supported only for MatchColumnsMode::Name");
 
-    ActionsDAG actions_dag(source);
+    auto actions_dag = std::make_shared<ActionsDAG>(source);
     NodeRawConstPtrs projection(num_result_columns);
 
     FunctionOverloadResolverPtr func_builder_materialize = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionMaterialize>());
@@ -1474,9 +1429,9 @@ ActionsDAG ActionsDAG::makeConvertingActions(
     std::unordered_map<std::string_view, std::list<size_t>> inputs;
     if (mode == MatchColumnsMode::Name)
     {
-        size_t input_nodes_size = actions_dag.inputs.size();
+        size_t input_nodes_size = actions_dag->inputs.size();
         for (size_t pos = 0; pos < input_nodes_size; ++pos)
-            inputs[actions_dag.inputs[pos]->result_name].push_back(pos);
+            inputs[actions_dag->inputs[pos]->result_name].push_back(pos);
     }
 
     for (size_t result_col_num = 0; result_col_num < num_result_columns; ++result_col_num)
@@ -1489,7 +1444,7 @@ ActionsDAG ActionsDAG::makeConvertingActions(
         {
             case MatchColumnsMode::Position:
             {
-                src_node = dst_node = actions_dag.inputs[result_col_num];
+                src_node = dst_node = actions_dag->inputs[result_col_num];
                 break;
             }
 
@@ -1500,7 +1455,7 @@ ActionsDAG ActionsDAG::makeConvertingActions(
                 {
                     const auto * res_const = typeid_cast<const ColumnConst *>(res_elem.column.get());
                     if (ignore_constant_values && res_const)
-                        src_node = dst_node = &actions_dag.addColumn(res_elem);
+                        src_node = dst_node = &actions_dag->addColumn(res_elem);
                     else
                         throw Exception(ErrorCodes::THERE_IS_NO_COLUMN,
                                         "Cannot find column `{}` in source stream, there are only columns: [{}]",
@@ -1508,7 +1463,7 @@ ActionsDAG ActionsDAG::makeConvertingActions(
                 }
                 else
                 {
-                    src_node = dst_node = actions_dag.inputs[input.front()];
+                    src_node = dst_node = actions_dag->inputs[input.front()];
                     input.pop_front();
                 }
                 break;
@@ -1521,7 +1476,7 @@ ActionsDAG ActionsDAG::makeConvertingActions(
             if (const auto * src_const = typeid_cast<const ColumnConst *>(dst_node->column.get()))
             {
                 if (ignore_constant_values)
-                    dst_node = &actions_dag.addColumn(res_elem);
+                    dst_node = &actions_dag->addColumn(res_elem);
                 else if (res_const->getField() != src_const->getField())
                     throw Exception(
                         ErrorCodes::ILLEGAL_COLUMN,
@@ -1543,21 +1498,21 @@ ActionsDAG ActionsDAG::makeConvertingActions(
             column.column = DataTypeString().createColumnConst(0, column.name);
             column.type = std::make_shared<DataTypeString>();
 
-            const auto * right_arg = &actions_dag.addColumn(std::move(column));
+            const auto * right_arg = &actions_dag->addColumn(std::move(column));
             const auto * left_arg = dst_node;
 
             CastDiagnostic diagnostic = {dst_node->result_name, res_elem.name};
-            ColumnWithTypeAndName left_column{nullptr, dst_node->result_type, {}};
-            auto func_base_cast = createInternalCast(std::move(left_column), res_elem.type, CastType::nonAccurate, std::move(diagnostic));
+            FunctionOverloadResolverPtr func_builder_cast
+                = createInternalCastOverloadResolver(CastType::nonAccurate, std::move(diagnostic));
 
             NodeRawConstPtrs children = { left_arg, right_arg };
-            dst_node = &actions_dag.addFunction(func_base_cast, std::move(children), {});
+            dst_node = &actions_dag->addFunction(func_builder_cast, std::move(children), {});
         }
 
         if (dst_node->column && isColumnConst(*dst_node->column) && !(res_elem.column && isColumnConst(*res_elem.column)))
         {
             NodeRawConstPtrs children = {dst_node};
-            dst_node = &actions_dag.addFunction(func_builder_materialize, std::move(children), {});
+            dst_node = &actions_dag->addFunction(func_builder_materialize, std::move(children), {});
         }
 
         if (dst_node->result_name != res_elem.name)
@@ -1576,7 +1531,7 @@ ActionsDAG ActionsDAG::makeConvertingActions(
             }
             else
             {
-                dst_node = &actions_dag.addAlias(*dst_node, res_elem.name);
+                dst_node = &actions_dag->addAlias(*dst_node, res_elem.name);
                 projection[result_col_num] = dst_node;
             }
         }
@@ -1586,36 +1541,36 @@ ActionsDAG ActionsDAG::makeConvertingActions(
         }
     }
 
-    actions_dag.outputs.swap(projection);
-    actions_dag.removeUnusedActions(false);
+    actions_dag->outputs.swap(projection);
+    actions_dag->removeUnusedActions(false);
 
     return actions_dag;
 }
 
-ActionsDAG ActionsDAG::makeAddingColumnActions(ColumnWithTypeAndName column)
+ActionsDAGPtr ActionsDAG::makeAddingColumnActions(ColumnWithTypeAndName column)
 {
-    ActionsDAG adding_column_action;
+    auto adding_column_action = std::make_shared<ActionsDAG>();
     FunctionOverloadResolverPtr func_builder_materialize
         = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionMaterialize>());
 
     auto column_name = column.name;
-    const auto * column_node = &adding_column_action.addColumn(std::move(column));
+    const auto * column_node = &adding_column_action->addColumn(std::move(column));
     NodeRawConstPtrs inputs = {column_node};
-    const auto & function_node = adding_column_action.addFunction(func_builder_materialize, std::move(inputs), {});
-    const auto & alias_node = adding_column_action.addAlias(function_node, std::move(column_name));
+    const auto & function_node = adding_column_action->addFunction(func_builder_materialize, std::move(inputs), {});
+    const auto & alias_node = adding_column_action->addAlias(function_node, std::move(column_name));
 
-    adding_column_action.outputs.push_back(&alias_node);
+    adding_column_action->outputs.push_back(&alias_node);
     return adding_column_action;
 }
 
-ActionsDAG ActionsDAG::merge(ActionsDAG && first, ActionsDAG && second)
+ActionsDAGPtr ActionsDAG::merge(ActionsDAG && first, ActionsDAG && second)
 {
     first.mergeInplace(std::move(second));
 
     /// Some actions could become unused. Do not drop inputs to preserve the header.
     first.removeUnusedActions(false);
 
-    return std::move(first);
+    return std::make_shared<ActionsDAG>(std::move(first));
 }
 
 void ActionsDAG::mergeInplace(ActionsDAG && second)
@@ -2008,15 +1963,15 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
             second_inputs.push_back(cur.to_second);
     }
 
-    ActionsDAG first_actions;
-    first_actions.nodes.swap(first_nodes);
-    first_actions.outputs.swap(first_outputs);
-    first_actions.inputs.swap(first_inputs);
+    auto first_actions = std::make_shared<ActionsDAG>();
+    first_actions->nodes.swap(first_nodes);
+    first_actions->outputs.swap(first_outputs);
+    first_actions->inputs.swap(first_inputs);
 
-    ActionsDAG second_actions;
-    second_actions.nodes.swap(second_nodes);
-    second_actions.outputs.swap(second_outputs);
-    second_actions.inputs.swap(second_inputs);
+    auto second_actions = std::make_shared<ActionsDAG>();
+    second_actions->nodes.swap(second_nodes);
+    second_actions->outputs.swap(second_outputs);
+    second_actions->inputs.swap(second_inputs);
 
     std::unordered_map<const Node *, const Node *> split_nodes_mapping;
     if (create_split_nodes_mapping)
@@ -2136,7 +2091,7 @@ ActionsDAG::SplitResult ActionsDAG::splitActionsBySortingDescription(const NameS
     return res;
 }
 
-bool ActionsDAG::isFilterAlwaysFalseForDefaultValueInputs(const std::string & filter_name, const Block & input_stream_header) const
+bool ActionsDAG::isFilterAlwaysFalseForDefaultValueInputs(const std::string & filter_name, const Block & input_stream_header)
 {
     const auto * filter_node = tryFindInOutputs(filter_name);
     if (!filter_node)
@@ -2160,7 +2115,7 @@ bool ActionsDAG::isFilterAlwaysFalseForDefaultValueInputs(const std::string & fi
         input_node_name_to_default_input_column.emplace(input->result_name, std::move(constant_column_with_type_and_name));
     }
 
-    std::optional<ActionsDAG> filter_with_default_value_inputs;
+    ActionsDAGPtr filter_with_default_value_inputs;
 
     try
     {
@@ -2342,12 +2297,12 @@ ColumnsWithTypeAndName prepareFunctionArguments(const ActionsDAG::NodeRawConstPt
 ///
 /// Result actions add single column with conjunction result (it is always first in outputs).
 /// No other columns are added or removed.
-std::optional<ActionsDAG> ActionsDAG::createActionsForConjunction(NodeRawConstPtrs conjunction, const ColumnsWithTypeAndName & all_inputs)
+ActionsDAGPtr ActionsDAG::createActionsForConjunction(NodeRawConstPtrs conjunction, const ColumnsWithTypeAndName & all_inputs)
 {
     if (conjunction.empty())
-        return {};
+        return nullptr;
 
-    ActionsDAG actions;
+    auto actions = std::make_shared<ActionsDAG>();
 
     FunctionOverloadResolverPtr func_builder_and = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionAnd>());
 
@@ -2388,7 +2343,7 @@ std::optional<ActionsDAG> ActionsDAG::createActionsForConjunction(NodeRawConstPt
 
             if (cur.next_child_to_visit == cur.node->children.size())
             {
-                auto & node = actions.nodes.emplace_back(*cur.node);
+                auto & node = actions->nodes.emplace_back(*cur.node);
                 nodes_mapping[cur.node] = &node;
 
                 for (auto & child : node.children)
@@ -2411,33 +2366,33 @@ std::optional<ActionsDAG> ActionsDAG::createActionsForConjunction(NodeRawConstPt
         for (const auto * predicate : conjunction)
             args.emplace_back(nodes_mapping[predicate]);
 
-        result_predicate = &actions.addFunction(func_builder_and, std::move(args), {});
+        result_predicate = &actions->addFunction(func_builder_and, std::move(args), {});
     }
 
-    actions.outputs.push_back(result_predicate);
+    actions->outputs.push_back(result_predicate);
 
     for (const auto & col : all_inputs)
     {
         const Node * input;
         auto & list = required_inputs[col.name];
         if (list.empty())
-            input = &actions.addInput(col);
+            input = &actions->addInput(col);
         else
         {
             input = list.front();
             list.pop_front();
-            actions.inputs.push_back(input);
+            actions->inputs.push_back(input);
         }
 
         /// We should not add result_predicate into the outputs for the second time.
         if (input->result_name != result_predicate->result_name)
-            actions.outputs.push_back(input);
+            actions->outputs.push_back(input);
     }
 
     return actions;
 }
 
-std::optional<ActionsDAG> ActionsDAG::splitActionsForFilterPushDown(
+ActionsDAGPtr ActionsDAG::splitActionsForFilterPushDown(
     const std::string & filter_name,
     bool removes_filter,
     const Names & available_inputs,
@@ -2453,7 +2408,7 @@ std::optional<ActionsDAG> ActionsDAG::splitActionsForFilterPushDown(
     /// If condition is constant let's do nothing.
     /// It means there is nothing to push down or optimization was already applied.
     if (predicate->type == ActionType::COLUMN)
-        return {};
+        return nullptr;
 
     std::unordered_set<const Node *> allowed_nodes;
 
@@ -2477,7 +2432,7 @@ std::optional<ActionsDAG> ActionsDAG::splitActionsForFilterPushDown(
     auto conjunction = getConjunctionNodes(predicate, allowed_nodes);
 
     if (conjunction.allowed.empty())
-        return {};
+        return nullptr;
 
     chassert(predicate->result_type);
 
@@ -2489,13 +2444,13 @@ std::optional<ActionsDAG> ActionsDAG::splitActionsForFilterPushDown(
             && !conjunction.rejected.front()->result_type->equals(*predicate->result_type))
         {
             /// No further optimization can be done
-            return {};
+            return nullptr;
         }
     }
 
     auto actions = createActionsForConjunction(conjunction.allowed, all_inputs);
     if (!actions)
-        return {};
+        return nullptr;
 
     /// Now, when actions are created, update the current DAG.
     removeUnusedConjunctions(std::move(conjunction.rejected), predicate, removes_filter);
@@ -2600,11 +2555,11 @@ ActionsDAG::ActionsForJOINFilterPushDown ActionsDAG::splitActionsForJOINFilterPu
     auto left_stream_filter_to_push_down = createActionsForConjunction(left_stream_allowed_conjunctions, left_stream_header.getColumnsWithTypeAndName());
     auto right_stream_filter_to_push_down = createActionsForConjunction(right_stream_allowed_conjunctions, right_stream_header.getColumnsWithTypeAndName());
 
-    auto replace_equivalent_columns_in_filter = [](const ActionsDAG & filter,
+    auto replace_equivalent_columns_in_filter = [](const ActionsDAGPtr & filter,
         const Block & stream_header,
         const std::unordered_map<std::string, ColumnWithTypeAndName> & columns_to_replace)
     {
-        auto updated_filter = ActionsDAG::buildFilterActionsDAG({filter.getOutputs()[0]}, columns_to_replace);
+        auto updated_filter = ActionsDAG::buildFilterActionsDAG({filter->getOutputs()[0]}, columns_to_replace);
         chassert(updated_filter->getOutputs().size() == 1);
 
         /** If result filter to left or right stream has column that is one of the stream inputs, we need distinguish filter column from
@@ -2625,7 +2580,7 @@ ActionsDAG::ActionsForJOINFilterPushDown ActionsDAG::splitActionsForJOINFilterPu
         for (const auto & input : updated_filter->getInputs())
             updated_filter_inputs[input->result_name].push_back(input);
 
-        for (const auto & input : filter.getInputs())
+        for (const auto & input : filter->getInputs())
         {
             if (updated_filter_inputs.contains(input->result_name))
                 continue;
@@ -2663,12 +2618,12 @@ ActionsDAG::ActionsForJOINFilterPushDown ActionsDAG::splitActionsForJOINFilterPu
     };
 
     if (left_stream_filter_to_push_down)
-        left_stream_filter_to_push_down = replace_equivalent_columns_in_filter(*left_stream_filter_to_push_down,
+        left_stream_filter_to_push_down = replace_equivalent_columns_in_filter(left_stream_filter_to_push_down,
             left_stream_header,
             equivalent_right_stream_column_to_left_stream_column);
 
     if (right_stream_filter_to_push_down)
-        right_stream_filter_to_push_down = replace_equivalent_columns_in_filter(*right_stream_filter_to_push_down,
+        right_stream_filter_to_push_down = replace_equivalent_columns_in_filter(right_stream_filter_to_push_down,
             right_stream_header,
             equivalent_left_stream_column_to_right_stream_column);
 
@@ -2897,13 +2852,13 @@ bool ActionsDAG::isSortingPreserved(
     return true;
 }
 
-std::optional<ActionsDAG> ActionsDAG::buildFilterActionsDAG(
+ActionsDAGPtr ActionsDAG::buildFilterActionsDAG(
     const NodeRawConstPtrs & filter_nodes,
     const std::unordered_map<std::string, ColumnWithTypeAndName> & node_name_to_input_node_column,
     bool single_output_condition_node)
 {
     if (filter_nodes.empty())
-        return {};
+        return nullptr;
 
     struct Frame
     {
@@ -2911,7 +2866,7 @@ std::optional<ActionsDAG> ActionsDAG::buildFilterActionsDAG(
         bool visited_children = false;
     };
 
-    ActionsDAG result_dag;
+    auto result_dag = std::make_shared<ActionsDAG>();
     std::unordered_map<std::string, const ActionsDAG::Node *> result_inputs;
     std::unordered_map<const ActionsDAG::Node *, const ActionsDAG::Node *> node_to_result_node;
 
@@ -2942,7 +2897,7 @@ std::optional<ActionsDAG> ActionsDAG::buildFilterActionsDAG(
         {
             auto & result_input = result_inputs[input_node_it->second.name];
             if (!result_input)
-                result_input = &result_dag.addInput(input_node_it->second);
+                result_input = &result_dag->addInput(input_node_it->second);
 
             node_to_result_node.emplace(node, result_input);
             nodes_to_process.pop_back();
@@ -2969,25 +2924,25 @@ std::optional<ActionsDAG> ActionsDAG::buildFilterActionsDAG(
             {
                 auto & result_input = result_inputs[node->result_name];
                 if (!result_input)
-                    result_input = &result_dag.addInput({node->column, node->result_type, node->result_name});
+                    result_input = &result_dag->addInput({node->column, node->result_type, node->result_name});
                 result_node = result_input;
                 break;
             }
             case ActionsDAG::ActionType::COLUMN:
             {
-                result_node = &result_dag.addColumn({node->column, node->result_type, node->result_name});
+                result_node = &result_dag->addColumn({node->column, node->result_type, node->result_name});
                 break;
             }
             case ActionsDAG::ActionType::ALIAS:
             {
                 const auto * child = node->children.front();
-                result_node = &result_dag.addAlias(*(node_to_result_node.find(child)->second), node->result_name);
+                result_node = &result_dag->addAlias(*(node_to_result_node.find(child)->second), node->result_name);
                 break;
             }
             case ActionsDAG::ActionType::ARRAY_JOIN:
             {
                 const auto * child = node->children.front();
-                result_node = &result_dag.addArrayJoin(*(node_to_result_node.find(child)->second), {});
+                result_node = &result_dag->addArrayJoin(*(node_to_result_node.find(child)->second), {});
                 break;
             }
             case ActionsDAG::ActionType::FUNCTION:
@@ -3005,11 +2960,13 @@ std::optional<ActionsDAG> ActionsDAG::buildFilterActionsDAG(
                     {
                         if (const auto * index_hint = typeid_cast<const FunctionIndexHint *>(adaptor->getFunction().get()))
                         {
-                            ActionsDAG index_hint_filter_dag;
-                            const auto & index_hint_args = index_hint->getActions().getOutputs();
+                            ActionsDAGPtr index_hint_filter_dag;
+                            const auto & index_hint_args = index_hint->getActions()->getOutputs();
 
-                            if (!index_hint_args.empty())
-                                index_hint_filter_dag = *buildFilterActionsDAG(index_hint_args,
+                            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*/);
 
@@ -3031,7 +2988,7 @@ std::optional<ActionsDAG> ActionsDAG::buildFilterActionsDAG(
                 auto [arguments, all_const] = getFunctionArguments(function_children);
                 auto function_base = function_overload_resolver ? function_overload_resolver->build(arguments) : node->function_base;
 
-                result_node = &result_dag.addFunctionImpl(
+                result_node = &result_dag->addFunctionImpl(
                     function_base,
                     std::move(function_children),
                     std::move(arguments),
@@ -3046,7 +3003,7 @@ std::optional<ActionsDAG> ActionsDAG::buildFilterActionsDAG(
         nodes_to_process.pop_back();
     }
 
-    auto & result_dag_outputs = result_dag.getOutputs();
+    auto & result_dag_outputs = result_dag->getOutputs();
     result_dag_outputs.reserve(filter_nodes_size);
 
     for (const auto & node : filter_nodes)
@@ -3055,7 +3012,7 @@ std::optional<ActionsDAG> ActionsDAG::buildFilterActionsDAG(
     if (result_dag_outputs.size() > 1 && single_output_condition_node)
     {
         FunctionOverloadResolverPtr func_builder_and = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionAnd>());
-        result_dag_outputs = { &result_dag.addFunction(func_builder_and, result_dag_outputs, {}) };
+        result_dag_outputs = { &result_dag->addFunction(func_builder_and, result_dag_outputs, {}) };
     }
 
     return result_dag;
@@ -3151,9 +3108,10 @@ ActionsDAG::NodeRawConstPtrs ActionsDAG::filterNodesByAllowedInputs(
     return nodes;
 }
 
-FindOriginalNodeForOutputName::FindOriginalNodeForOutputName(const ActionsDAG & actions_)
+FindOriginalNodeForOutputName::FindOriginalNodeForOutputName(const ActionsDAGPtr & actions_)
+    :actions(actions_)
 {
-    const auto & actions_outputs = actions_.getOutputs();
+    const auto & actions_outputs = actions->getOutputs();
     for (const auto * output_node : actions_outputs)
     {
         /// find input node which refers to the output node
@@ -3189,9 +3147,10 @@ const ActionsDAG::Node * FindOriginalNodeForOutputName::find(const String & outp
     return it->second;
 }
 
-FindAliasForInputName::FindAliasForInputName(const ActionsDAG & actions_)
+FindAliasForInputName::FindAliasForInputName(const ActionsDAGPtr & actions_)
+    :actions(actions_)
 {
-    const auto & actions_outputs = actions_.getOutputs();
+    const auto & actions_outputs = actions->getOutputs();
     for (const auto * output_node : actions_outputs)
     {
         /// find input node which corresponds to alias
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index 2459878ce20..c9974fd849c 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -11,6 +11,9 @@
 namespace DB
 {
 
+class ActionsDAG;
+using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
+
 class IExecutableFunction;
 using ExecutableFunctionPtr = std::shared_ptr<IExecutableFunction>;
 
@@ -80,15 +83,13 @@ public:
         ExecutableFunctionPtr function;
         /// If function is a compiled statement.
         bool is_function_compiled = false;
-
-        /// It is a constant calculated from deterministic functions (See IFunction::isDeterministic).
+        /// It is deterministic (See IFunction::isDeterministic).
         /// This property is kept after constant folding of non-deterministic functions like 'now', 'today'.
-        bool is_deterministic_constant = true;
+        bool is_deterministic = true;
+
         /// For COLUMN node and propagated constants.
         ColumnPtr column;
 
-        /// If result of this not is deterministic. Checks only this node, not a subtree.
-        bool isDeterministic() const;
         void toTree(JSONBuilder::JSONMap & map) const;
     };
 
@@ -156,7 +157,7 @@ public:
     const Node * tryFindInOutputs(const std::string & name) const;
 
     /// Same, but for the list of names.
-    NodeRawConstPtrs findInOutputs(const Names & names) const;
+    NodeRawConstPtrs findInOutpus(const Names & names) const;
 
     /// Find first node with the same name in output nodes and replace it.
     /// If was not found, add node to outputs end.
@@ -246,7 +247,7 @@ public:
     ///        c * d       e
     ///            \      /
     ///            c * d - e
-    static ActionsDAG foldActionsByProjection(
+    static ActionsDAGPtr foldActionsByProjection(
         const std::unordered_map<const Node *, const Node *> & new_inputs,
         const NodeRawConstPtrs & required_outputs);
 
@@ -260,10 +261,9 @@ public:
     void compileExpressions(size_t min_count_to_compile_expression, const std::unordered_set<const Node *> & lazy_executed_nodes = {});
 #endif
 
-    ActionsDAG clone(std::unordered_map<const Node *, Node *> & old_to_new_nodes) const;
-    ActionsDAG clone() const;
+    ActionsDAGPtr clone() const;
 
-    static ActionsDAG cloneSubDAG(const NodeRawConstPtrs & outputs, bool remove_aliases);
+    static ActionsDAGPtr cloneSubDAG(const NodeRawConstPtrs & outputs, bool remove_aliases);
 
     /// Execute actions for header. Input block must have empty columns.
     /// Result should be equal to the execution of ExpressionActions built from this DAG.
@@ -301,7 +301,7 @@ public:
     /// @param ignore_constant_values - Do not check that constants are same. Use value from result_header.
     /// @param add_casted_columns - Create new columns with converted values instead of replacing original.
     /// @param new_names - Output parameter for new column names when add_casted_columns is used.
-    static ActionsDAG makeConvertingActions(
+    static ActionsDAGPtr makeConvertingActions(
         const ColumnsWithTypeAndName & source,
         const ColumnsWithTypeAndName & result,
         MatchColumnsMode mode,
@@ -310,13 +310,13 @@ public:
         NameToNameMap * new_names = nullptr);
 
     /// Create expression which add const column and then materialize it.
-    static ActionsDAG makeAddingColumnActions(ColumnWithTypeAndName column);
+    static ActionsDAGPtr makeAddingColumnActions(ColumnWithTypeAndName column);
 
     /// Create ActionsDAG which represents expression equivalent to applying first and second actions consequently.
     /// Is used to replace `(first -> second)` expression chain to single `merge(first, second)` expression.
     /// If first.settings.project_input is set, then outputs of `first` must include inputs of `second`.
     /// Otherwise, any two actions may be combined.
-    static ActionsDAG merge(ActionsDAG && first, ActionsDAG && second);
+    static ActionsDAGPtr merge(ActionsDAG && first, ActionsDAG && second);
 
     /// The result is similar to merge(*this, second);
     /// Invariant : no nodes are removed from the first (this) DAG.
@@ -327,7 +327,12 @@ public:
     /// *out_outputs is filled with pointers to the nodes corresponding to second.getOutputs().
     void mergeNodes(ActionsDAG && second, NodeRawConstPtrs * out_outputs = nullptr);
 
-    struct SplitResult;
+    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.
@@ -355,7 +360,7 @@ public:
       * @param filter_name - name of filter node in current DAG.
       * @param input_stream_header - input stream header.
       */
-    bool isFilterAlwaysFalseForDefaultValueInputs(const std::string & filter_name, const Block & input_stream_header) const;
+    bool isFilterAlwaysFalseForDefaultValueInputs(const std::string & filter_name, const Block & input_stream_header);
 
     /// Create actions which may calculate part of filter using only available_inputs.
     /// If nothing may be calculated, returns nullptr.
@@ -374,13 +379,19 @@ public:
     /// columns will be transformed like `x, y, z` -> `z > 0, z, x, y` -(remove filter)-> `z, x, y`.
     /// To avoid it, add inputs from `all_inputs` list,
     /// so actions `x, y, z -> z > 0, x, y, z` -(remove filter)-> `x, y, z` will not change columns order.
-    std::optional<ActionsDAG> splitActionsForFilterPushDown(
+    ActionsDAGPtr splitActionsForFilterPushDown(
         const std::string & filter_name,
         bool removes_filter,
         const Names & available_inputs,
         const ColumnsWithTypeAndName & all_inputs);
 
-    struct ActionsForJOINFilterPushDown;
+    struct ActionsForJOINFilterPushDown
+    {
+        ActionsDAGPtr left_stream_filter_to_push_down;
+        bool left_stream_filter_removes_filter;
+        ActionsDAGPtr right_stream_filter_to_push_down;
+        bool right_stream_filter_removes_filter;
+    };
 
     /** Split actions for JOIN filter push down.
       *
@@ -427,7 +438,7 @@ public:
       *
       * If single_output_condition_node = false, result dag has multiple output nodes.
       */
-    static std::optional<ActionsDAG> buildFilterActionsDAG(
+    static ActionsDAGPtr buildFilterActionsDAG(
         const NodeRawConstPtrs & filter_nodes,
         const std::unordered_map<std::string, ColumnWithTypeAndName> & node_name_to_input_node_column = {},
         bool single_output_condition_node = true);
@@ -436,7 +447,7 @@ public:
     /// Returns a list of nodes representing atomic predicates.
     static NodeRawConstPtrs extractConjunctionAtoms(const Node * predicate);
 
-    /// Get a list of nodes. For every node, check if it can be computed using allowed subset of inputs.
+    /// Get a list of nodes. For every node, check if it can be compused using allowed subset of inputs.
     /// Returns only those nodes from the list which can be computed.
     static NodeRawConstPtrs filterNodesByAllowedInputs(
         NodeRawConstPtrs nodes,
@@ -459,35 +470,21 @@ private:
     void compileFunctions(size_t min_count_to_compile_expression, const std::unordered_set<const Node *> & lazy_executed_nodes = {});
 #endif
 
-    static std::optional<ActionsDAG> createActionsForConjunction(NodeRawConstPtrs conjunction, const ColumnsWithTypeAndName & all_inputs);
+    static ActionsDAGPtr createActionsForConjunction(NodeRawConstPtrs conjunction, const ColumnsWithTypeAndName & all_inputs);
 
     void removeUnusedConjunctions(NodeRawConstPtrs rejected_conjunctions, Node * predicate, bool removes_filter);
 };
 
-struct ActionsDAG::SplitResult
-{
-    ActionsDAG first;
-    ActionsDAG second;
-    std::unordered_map<const Node *, const Node *> split_nodes_mapping;
-};
-
-struct ActionsDAG::ActionsForJOINFilterPushDown
-{
-    std::optional<ActionsDAG> left_stream_filter_to_push_down;
-    bool left_stream_filter_removes_filter;
-    std::optional<ActionsDAG> right_stream_filter_to_push_down;
-    bool right_stream_filter_removes_filter;
-};
-
 class FindOriginalNodeForOutputName
 {
     using NameToNodeIndex = std::unordered_map<std::string_view, const ActionsDAG::Node *>;
 
 public:
-    explicit FindOriginalNodeForOutputName(const ActionsDAG & actions);
+    explicit FindOriginalNodeForOutputName(const ActionsDAGPtr & actions);
     const ActionsDAG::Node * find(const String & output_name);
 
 private:
+    ActionsDAGPtr actions;
     NameToNodeIndex index;
 };
 
@@ -496,10 +493,11 @@ class FindAliasForInputName
     using NameToNodeIndex = std::unordered_map<std::string_view, const ActionsDAG::Node *>;
 
 public:
-    explicit FindAliasForInputName(const ActionsDAG & actions);
+    explicit FindAliasForInputName(const ActionsDAGPtr & actions);
     const ActionsDAG::Node * find(const String & name);
 
 private:
+    ActionsDAGPtr actions;
     NameToNodeIndex index;
 };
 
diff --git a/src/Interpreters/ActionsVisitor.cpp b/src/Interpreters/ActionsVisitor.cpp
index 368eb8174f0..a874067e43c 100644
--- a/src/Interpreters/ActionsVisitor.cpp
+++ b/src/Interpreters/ActionsVisitor.cpp
@@ -131,7 +131,7 @@ static Block createBlockFromCollection(const Collection & collection, const Data
                 throw Exception(ErrorCodes::INCORRECT_ELEMENT_OF_SET, "Invalid type in set. Expected tuple, got {}",
                     String(value.getTypeName()));
 
-            const auto & tuple = value.template safeGet<const Tuple &>();
+            const auto & tuple = value.template get<const Tuple &>();
             size_t tuple_size = tuple.size();
             if (tuple_size != columns_num)
                 throw Exception(ErrorCodes::INCORRECT_ELEMENT_OF_SET, "Incorrect size of tuple in set: {} instead of {}",
@@ -233,7 +233,7 @@ static Block createBlockFromAST(const ASTPtr & node, const DataTypes & types, Co
                         "Invalid type of set. Expected tuple, got {}",
                         function_result.getTypeName());
 
-                tuple = &function_result.safeGet<Tuple>();
+                tuple = &function_result.get<Tuple>();
             }
 
             /// Tuple can be represented as a literal in AST.
@@ -246,7 +246,7 @@ static Block createBlockFromAST(const ASTPtr & node, const DataTypes & types, Co
                         "Invalid type in set. Expected tuple, got {}",
                         literal->value.getTypeName());
 
-                tuple = &literal->value.safeGet<Tuple>();
+                tuple = &literal->value.get<Tuple>();
             }
 
             assert(tuple || func);
@@ -332,14 +332,14 @@ Block createBlockForSet(
         if (type_index == TypeIndex::Tuple)
         {
             const DataTypes & value_types = assert_cast<const DataTypeTuple *>(right_arg_type.get())->getElements();
-            block = createBlockFromCollection(right_arg_value.safeGet<const Tuple &>(), value_types, set_element_types, tranform_null_in);
+            block = createBlockFromCollection(right_arg_value.get<const Tuple &>(), value_types, set_element_types, tranform_null_in);
         }
         else if (type_index == TypeIndex::Array)
         {
             const auto* right_arg_array_type =  assert_cast<const DataTypeArray *>(right_arg_type.get());
-            size_t right_arg_array_size = right_arg_value.safeGet<const Array &>().size();
+            size_t right_arg_array_size = right_arg_value.get<const Array &>().size();
             DataTypes value_types(right_arg_array_size, right_arg_array_type->getNestedType());
-            block = createBlockFromCollection(right_arg_value.safeGet<const Array &>(), value_types, set_element_types, tranform_null_in);
+            block = createBlockFromCollection(right_arg_value.get<const Array &>(), value_types, set_element_types, tranform_null_in);
         }
         else
             throw_unsupported_type(right_arg_type);
@@ -1024,7 +1024,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
         dag.project(args);
 
         auto index_hint = std::make_shared<FunctionIndexHint>();
-        index_hint->setActions(std::move(dag));
+        index_hint->setActions(std::make_shared<ActionsDAG>(std::move(dag)));
 
         // Arguments are removed. We add function instead of constant column to avoid constant folding.
         data.addFunction(std::make_unique<FunctionToOverloadResolverAdaptor>(index_hint), {}, column_name);
@@ -1287,7 +1287,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
                     lambda_dag.removeUnusedActions(Names(1, result_name));
 
                     auto lambda_actions = std::make_shared<ExpressionActions>(
-                        std::move(lambda_dag),
+                        std::make_shared<ActionsDAG>(std::move(lambda_dag)),
                         ExpressionActionsSettings::fromContext(data.getContext(), CompileExpressions::yes));
 
                     DataTypePtr result_type = lambda_actions->getSampleBlock().getByName(result_name).type;
diff --git a/src/Interpreters/ActionsVisitor.h b/src/Interpreters/ActionsVisitor.h
index 5b638fc14c8..46d2d60e461 100644
--- a/src/Interpreters/ActionsVisitor.h
+++ b/src/Interpreters/ActionsVisitor.h
@@ -18,6 +18,12 @@ namespace DB
 class ASTExpressionList;
 class ASTFunction;
 
+class ExpressionActions;
+using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
+
+class ActionsDAG;
+using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
+
 class IFunctionOverloadResolver;
 using FunctionOverloadResolverPtr = std::shared_ptr<IFunctionOverloadResolver>;
 
@@ -26,7 +32,7 @@ FutureSetPtr makeExplicitSet(
     const ASTFunction * node, const ActionsDAG & actions, ContextPtr context, PreparedSets & prepared_sets);
 
 /** For ActionsVisitor
-  * A stack of ActionsDAG corresponding to nested lambda expressions.
+  * A stack of ExpressionActions corresponding to nested lambda expressions.
   * The new action should be added to the highest possible level.
   * For example, in the expression "select arrayMap(x -> x + column1 * column2, array1)"
   *  calculation of the product must be done outside the lambda expression (it does not depend on x),
diff --git a/src/Interpreters/AddDefaultDatabaseVisitor.h b/src/Interpreters/AddDefaultDatabaseVisitor.h
index d59fd35df77..a28c7c1bff3 100644
--- a/src/Interpreters/AddDefaultDatabaseVisitor.h
+++ b/src/Interpreters/AddDefaultDatabaseVisitor.h
@@ -210,7 +210,7 @@ private:
                             if (literal_value.getType() != Field::Types::String)
                                 continue;
 
-                            auto dictionary_name = literal_value.safeGet<String>();
+                            auto dictionary_name = literal_value.get<String>();
                             auto qualified_dictionary_name = context->getExternalDictionariesLoader().qualifyDictionaryNameWithDatabase(dictionary_name, context);
                             literal_value = qualified_dictionary_name.getFullName();
                         }
diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp
index aff06c490c5..e073b7a49b6 100644
--- a/src/Interpreters/Aggregator.cpp
+++ b/src/Interpreters/Aggregator.cpp
@@ -2371,7 +2371,7 @@ void NO_INLINE Aggregator::mergeDataNullKey(
 
 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, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled) const
+    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);
@@ -2410,7 +2410,7 @@ void NO_INLINE Aggregator::mergeDataImpl(
         {
             if (!is_aggregate_function_compiled[i])
                 aggregate_functions[i]->mergeAndDestroyBatch(
-                    dst_places.data(), src_places.data(), dst_places.size(), offsets_of_aggregate_states[i], thread_pool, is_cancelled, arena);
+                    dst_places.data(), src_places.data(), dst_places.size(), offsets_of_aggregate_states[i], arena);
         }
 
         return;
@@ -2420,7 +2420,7 @@ void NO_INLINE Aggregator::mergeDataImpl(
     for (size_t i = 0; i < params.aggregates_size; ++i)
     {
         aggregate_functions[i]->mergeAndDestroyBatch(
-            dst_places.data(), src_places.data(), dst_places.size(), offsets_of_aggregate_states[i], thread_pool, is_cancelled, arena);
+            dst_places.data(), src_places.data(), dst_places.size(), offsets_of_aggregate_states[i], arena);
     }
 }
 
@@ -2535,10 +2535,8 @@ void NO_INLINE Aggregator::mergeWithoutKeyDataImpl(
 
 template <typename Method>
 void NO_INLINE Aggregator::mergeSingleLevelDataImpl(
-    ManyAggregatedDataVariants & non_empty_data, std::atomic<bool> & is_cancelled) const
+    ManyAggregatedDataVariants & non_empty_data) const
 {
-    ThreadPool thread_pool{CurrentMetrics::AggregatorThreads, CurrentMetrics::AggregatorThreadsActive, CurrentMetrics::AggregatorThreadsScheduled, params.max_threads};
-
     AggregatedDataVariantsPtr & res = non_empty_data[0];
     bool no_more_keys = false;
 
@@ -2559,13 +2557,13 @@ void NO_INLINE Aggregator::mergeSingleLevelDataImpl(
             if (compiled_aggregate_functions_holder)
             {
                 mergeDataImpl<Method>(
-                    getDataVariant<Method>(*res).data, getDataVariant<Method>(current).data, res->aggregates_pool, true, prefetch, thread_pool, is_cancelled);
+                    getDataVariant<Method>(*res).data, getDataVariant<Method>(current).data, res->aggregates_pool, true, prefetch);
             }
             else
 #endif
             {
                 mergeDataImpl<Method>(
-                    getDataVariant<Method>(*res).data, getDataVariant<Method>(current).data, res->aggregates_pool, false, prefetch, thread_pool, is_cancelled);
+                    getDataVariant<Method>(*res).data, getDataVariant<Method>(current).data, res->aggregates_pool, false, prefetch);
             }
         }
         else if (res->without_key)
@@ -2591,7 +2589,7 @@ void NO_INLINE Aggregator::mergeSingleLevelDataImpl(
 
 #define M(NAME) \
     template void NO_INLINE Aggregator::mergeSingleLevelDataImpl<decltype(AggregatedDataVariants::NAME)::element_type>( \
-        ManyAggregatedDataVariants & non_empty_data, std::atomic<bool> & is_cancelled) const;
+        ManyAggregatedDataVariants & non_empty_data) const;
     APPLY_FOR_VARIANTS_SINGLE_LEVEL(M)
 #undef M
 
@@ -2599,8 +2597,6 @@ template <typename Method>
 void NO_INLINE Aggregator::mergeBucketImpl(
     ManyAggregatedDataVariants & data, Int32 bucket, Arena * arena, std::atomic<bool> & is_cancelled) const
 {
-    ThreadPool thread_pool{CurrentMetrics::AggregatorThreads, CurrentMetrics::AggregatorThreadsActive, CurrentMetrics::AggregatorThreadsScheduled, params.max_threads};
-
     /// We merge all aggregation results to the first.
     AggregatedDataVariantsPtr & res = data[0];
 
@@ -2617,7 +2613,7 @@ void NO_INLINE Aggregator::mergeBucketImpl(
         if (compiled_aggregate_functions_holder)
         {
             mergeDataImpl<Method>(
-                getDataVariant<Method>(*res).data.impls[bucket], getDataVariant<Method>(current).data.impls[bucket], arena, true, prefetch, thread_pool, is_cancelled);
+                getDataVariant<Method>(*res).data.impls[bucket], getDataVariant<Method>(current).data.impls[bucket], arena, true, prefetch);
         }
         else
 #endif
@@ -2627,9 +2623,7 @@ void NO_INLINE Aggregator::mergeBucketImpl(
                 getDataVariant<Method>(current).data.impls[bucket],
                 arena,
                 false,
-                prefetch,
-                thread_pool,
-                is_cancelled);
+                prefetch);
         }
     }
 }
@@ -3003,11 +2997,7 @@ void Aggregator::mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVari
 
         std::unique_ptr<ThreadPool> thread_pool;
         if (max_threads > 1 && total_input_rows > 100000)    /// TODO Make a custom threshold.
-            thread_pool = std::make_unique<ThreadPool>(
-                CurrentMetrics::AggregatorThreads,
-                CurrentMetrics::AggregatorThreadsActive,
-                CurrentMetrics::AggregatorThreadsScheduled,
-                max_threads);
+            thread_pool = std::make_unique<ThreadPool>(CurrentMetrics::AggregatorThreads, CurrentMetrics::AggregatorThreadsActive, CurrentMetrics::AggregatorThreadsScheduled, max_threads);
 
         for (const auto & bucket_blocks : bucket_to_blocks)
         {
@@ -3019,10 +3009,7 @@ void Aggregator::mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVari
             result.aggregates_pools.push_back(std::make_shared<Arena>());
             Arena * aggregates_pool = result.aggregates_pools.back().get();
 
-            /// if we don't use thread pool we don't need to attach and definitely don't want to detach from the thread group
-            /// because this thread is already attached
-            auto task = [group = thread_pool != nullptr ? CurrentThread::getGroup() : nullptr, bucket, &merge_bucket, aggregates_pool]
-            { merge_bucket(bucket, aggregates_pool, group); };
+            auto task = [group = CurrentThread::getGroup(), bucket, &merge_bucket, aggregates_pool]{ merge_bucket(bucket, aggregates_pool, group); };
 
             if (thread_pool)
                 thread_pool->scheduleOrThrowOnError(task);
@@ -3313,17 +3300,6 @@ void NO_INLINE Aggregator::destroyImpl(Table & table) const
 
         data = nullptr;
     });
-
-    if constexpr (Method::low_cardinality_optimization || Method::one_key_nullable_optimization)
-    {
-        if (table.getNullKeyData() != nullptr)
-        {
-            for (size_t i = 0; i < params.aggregates_size; ++i)
-                aggregate_functions[i]->destroy(table.getNullKeyData() + offsets_of_aggregate_states[i]);
-
-            table.getNullKeyData() = nullptr;
-        }
-    }
 }
 
 
diff --git a/src/Interpreters/Aggregator.h b/src/Interpreters/Aggregator.h
index 4de0a640219..2cb04fc7c51 100644
--- a/src/Interpreters/Aggregator.h
+++ b/src/Interpreters/Aggregator.h
@@ -467,7 +467,7 @@ private:
 
     /// Merge data from hash table `src` into `dst`.
     template <typename Method, typename Table>
-    void mergeDataImpl(Table & table_dst, Table & table_src, Arena * arena, bool use_compiled_functions, bool prefetch, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled) const;
+    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>
@@ -490,7 +490,7 @@ private:
 
     template <typename Method>
     void mergeSingleLevelDataImpl(
-        ManyAggregatedDataVariants & non_empty_data, std::atomic<bool> & is_cancelled) const;
+        ManyAggregatedDataVariants & non_empty_data) const;
 
     template <bool return_single_block>
     using ConvertToBlockRes = std::conditional_t<return_single_block, Block, BlocksList>;
diff --git a/src/Interpreters/AsynchronousInsertQueue.cpp b/src/Interpreters/AsynchronousInsertQueue.cpp
index 25cd1d0bfa2..c9137f39426 100644
--- a/src/Interpreters/AsynchronousInsertQueue.cpp
+++ b/src/Interpreters/AsynchronousInsertQueue.cpp
@@ -33,8 +33,6 @@
 #include <Common/SensitiveDataMasker.h>
 #include <Common/SipHash.h>
 #include <Common/logger_useful.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTIdentifier.h>
 
 namespace CurrentMetrics
 {
@@ -310,32 +308,16 @@ void AsynchronousInsertQueue::preprocessInsertQuery(const ASTPtr & query, const
         /* no_squash */ false,
         /* no_destination */ false,
         /* async_insert */ false);
-
     auto table = interpreter.getTable(insert_query);
     auto sample_block = InterpreterInsertQuery::getSampleBlock(insert_query, table, table->getInMemoryMetadataPtr(), query_context);
 
     if (!FormatFactory::instance().isInputFormat(insert_query.format))
-    {
-        if (insert_query.format.empty() && insert_query.infile)
-        {
-            const auto & in_file_node = insert_query.infile->as<ASTLiteral &>();
-            const auto in_file = in_file_node.value.safeGet<std::string>();
-            const auto in_file_format = FormatFactory::instance().getFormatFromFileName(in_file);
-            if (!FormatFactory::instance().isInputFormat(in_file_format))
-                throw Exception(ErrorCodes::UNKNOWN_FORMAT, "Unknown input INFILE format {}", in_file_format);
-        }
-        else
-            throw Exception(ErrorCodes::UNKNOWN_FORMAT, "Unknown input format {}", insert_query.format);
-    }
+        throw Exception(ErrorCodes::UNKNOWN_FORMAT, "Unknown input format {}", insert_query.format);
 
     /// For table functions we check access while executing
     /// InterpreterInsertQuery::getTable() -> ITableFunction::execute().
     if (insert_query.table_id)
         query_context->checkAccess(AccessType::INSERT, insert_query.table_id, sample_block.getNames());
-
-    insert_query.columns = std::make_shared<ASTExpressionList>();
-    for (const auto & column : sample_block)
-        insert_query.columns->children.push_back(std::make_shared<ASTIdentifier>(column.name));
 }
 
 AsynchronousInsertQueue::PushResult
@@ -407,10 +389,6 @@ AsynchronousInsertQueue::pushDataChunk(ASTPtr query, DataChunk chunk, ContextPtr
     if (data_kind == DataKind::Preprocessed)
         insert_query.format = "Native";
 
-    /// Query parameters make sense only for format Values.
-    if (insert_query.format == "Values")
-        entry->query_parameters = query_context->getQueryParameters();
-
     InsertQuery key{query, query_context->getUserID(), query_context->getCurrentRoles(), settings, data_kind};
     InsertDataPtr data_to_process;
     std::future<void> insert_future;
@@ -714,17 +692,6 @@ catch (...)
     tryLogCurrentException("AsynchronousInsertQueue", "Failed to add elements to AsynchronousInsertLog");
 }
 
-void convertBlockToHeader(Block & block, const Block & header)
-{
-    auto converting_dag = ActionsDAG::makeConvertingActions(
-        block.getColumnsWithTypeAndName(),
-        header.getColumnsWithTypeAndName(),
-        ActionsDAG::MatchColumnsMode::Name);
-
-    auto converting_actions = std::make_shared<ExpressionActions>(std::move(converting_dag));
-    converting_actions->execute(block);
-}
-
 String serializeQuery(const IAST & query, size_t max_length)
 {
     return query.hasSecretParts()
@@ -820,61 +787,6 @@ try
     if (async_insert_log)
         log_elements.reserve(data->entries.size());
 
-    auto add_entry_to_asynchronous_insert_log = [&, query_by_format = NameToNameMap{}](
-        const InsertData::EntryPtr & entry,
-        const String & parsing_exception,
-        size_t num_rows,
-        size_t num_bytes) mutable
-    {
-        if (!async_insert_log)
-            return;
-
-        AsynchronousInsertLogElement elem;
-        elem.event_time = timeInSeconds(entry->create_time);
-        elem.event_time_microseconds = timeInMicroseconds(entry->create_time);
-        elem.database = query_database;
-        elem.table = query_table;
-        elem.format = entry->format;
-        elem.query_id = entry->query_id;
-        elem.bytes = num_bytes;
-        elem.rows = num_rows;
-        elem.exception = parsing_exception;
-        elem.data_kind = entry->chunk.getDataKind();
-        elem.timeout_milliseconds = data->timeout_ms.count();
-        elem.flush_query_id = insert_query_id;
-
-        auto get_query_by_format = [&](const String & format) -> const String &
-        {
-            auto [it, inserted] = query_by_format.try_emplace(format);
-            if (!inserted)
-                return it->second;
-
-            auto query = key.query->clone();
-            assert_cast<ASTInsertQuery &>(*query).format = format;
-            it->second = serializeQuery(*query, insert_context->getSettingsRef().log_queries_cut_to_length);
-            return it->second;
-        };
-
-        if (entry->chunk.getDataKind() == DataKind::Parsed)
-            elem.query_for_logging = key.query_str;
-        else
-            elem.query_for_logging = get_query_by_format(entry->format);
-
-        /// If there was a parsing error,
-        /// the entry won't be flushed anyway,
-        /// so add the log element immediately.
-        if (!elem.exception.empty())
-        {
-            elem.status = AsynchronousInsertLogElement::ParsingError;
-            async_insert_log->add(std::move(elem));
-        }
-        else
-        {
-            elem.status = AsynchronousInsertLogElement::Ok;
-            log_elements.push_back(std::move(elem));
-        }
-    };
-
     try
     {
         interpreter = std::make_unique<InterpreterInsertQuery>(
@@ -903,20 +815,49 @@ try
     catch (...)
     {
         logExceptionBeforeStart(query_for_logging, insert_context, key.query, query_span, start_watch.elapsedMilliseconds());
-
-        if (async_insert_log)
-        {
-            for (const auto & entry : data->entries)
-                add_entry_to_asynchronous_insert_log(entry, /*parsing_exception=*/ "", /*num_rows=*/ 0, entry->chunk.byteSize());
-
-            auto exception = getCurrentExceptionMessage(false);
-            auto flush_time = std::chrono::system_clock::now();
-            appendElementsToLogSafe(*async_insert_log, std::move(log_elements), flush_time, exception);
-        }
         throw;
     }
 
-    auto finish_entries = [&](size_t num_rows, size_t num_bytes)
+    auto add_entry_to_asynchronous_insert_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;
+
+        AsynchronousInsertLogElement elem;
+        elem.event_time = timeInSeconds(entry->create_time);
+        elem.event_time_microseconds = timeInMicroseconds(entry->create_time);
+        elem.query_for_logging = entry_query_for_logging;
+        elem.database = query_database;
+        elem.table = query_table;
+        elem.format = entry->format;
+        elem.query_id = entry->query_id;
+        elem.bytes = num_bytes;
+        elem.rows = num_rows;
+        elem.exception = exception;
+        elem.data_kind = entry->chunk.getDataKind();
+        elem.timeout_milliseconds = timeout_ms.count();
+        elem.flush_query_id = insert_query_id;
+
+        /// If there was a parsing error,
+        /// the entry won't be flushed anyway,
+        /// so add the log element immediately.
+        if (!elem.exception.empty())
+        {
+            elem.status = AsynchronousInsertLogElement::ParsingError;
+            async_insert_log->add(std::move(elem));
+        }
+        else
+        {
+            log_elements.push_back(elem);
+        }
+    };
+
+    auto finish_entries = [&]
     {
         for (const auto & entry : data->entries)
         {
@@ -929,7 +870,20 @@ try
             auto flush_time = std::chrono::system_clock::now();
             appendElementsToLogSafe(*async_insert_log, std::move(log_elements), flush_time, "");
         }
+    };
 
+    Chunk chunk;
+    auto header = pipeline.getHeader();
+
+    if (key.data_kind == DataKind::Parsed)
+        chunk = processEntriesWithParsing(key, data, header, insert_context, log, add_entry_to_asynchronous_insert_log);
+    else
+        chunk = processPreprocessedEntries(key, data, header, insert_context, add_entry_to_asynchronous_insert_log);
+
+    ProfileEvents::increment(ProfileEvents::AsyncInsertRows, chunk.getNumRows());
+
+    auto log_and_add_finish_to_query_log = [&](size_t num_rows, size_t num_bytes)
+    {
         LOG_DEBUG(log, "Flushed {} rows, {} bytes for query '{}'", num_rows, num_bytes, key.query_str);
         queue_shard_flush_time_history.updateWithCurrentTime();
 
@@ -938,24 +892,16 @@ try
             query_log_elem, insert_context, key.query, pipeline, pulling_pipeline, query_span, QueryCache::Usage::None, internal);
     };
 
+
+    if (chunk.getNumRows() == 0)
+    {
+        finish_entries();
+        log_and_add_finish_to_query_log(0, 0);
+        return;
+    }
+
     try
     {
-        Chunk chunk;
-        auto header = pipeline.getHeader();
-
-        if (key.data_kind == DataKind::Parsed)
-            chunk = processEntriesWithParsing(key, data, header, insert_context, log, add_entry_to_asynchronous_insert_log);
-        else
-            chunk = processPreprocessedEntries(data, header, add_entry_to_asynchronous_insert_log);
-
-        ProfileEvents::increment(ProfileEvents::AsyncInsertRows, chunk.getNumRows());
-
-        if (chunk.getNumRows() == 0)
-        {
-            finish_entries(/*num_rows=*/ 0, /*num_bytes=*/ 0);
-            return;
-        }
-
         size_t num_rows = chunk.getNumRows();
         size_t num_bytes = chunk.bytes();
 
@@ -965,7 +911,7 @@ try
         CompletedPipelineExecutor completed_executor(pipeline);
         completed_executor.execute();
 
-        finish_entries(num_rows, num_bytes);
+        log_and_add_finish_to_query_log(num_rows, num_bytes);
     }
     catch (...)
     {
@@ -979,6 +925,8 @@ try
         }
         throw;
     }
+
+    finish_entries();
 }
 catch (const Exception & e)
 {
@@ -1039,6 +987,7 @@ Chunk AsynchronousInsertQueue::processEntriesWithParsing(
 
     StreamingFormatExecutor executor(header, format, std::move(on_error), std::move(adding_defaults_transform));
     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 : data->entries)
     {
@@ -1050,14 +999,12 @@ Chunk AsynchronousInsertQueue::processEntriesWithParsing(
                 "Expected entry with data kind Parsed. Got: {}", entry->chunk.getDataKind());
 
         auto buffer = std::make_unique<ReadBufferFromString>(*bytes);
-        executor.setQueryParameters(entry->query_parameters);
 
         size_t num_bytes = bytes->size();
         size_t num_rows = executor.execute(*buffer);
 
         total_rows += num_rows;
-
-        /// For some reason, client can pass zero rows and bytes to server.
+        /// for some reason, client can pass zero rows and bytes to server.
         /// We don't update offsets in this case, because we assume every insert has some rows during dedup
         /// but we have nothing to deduplicate for this insert.
         if (num_rows > 0)
@@ -1066,7 +1013,8 @@ Chunk AsynchronousInsertQueue::processEntriesWithParsing(
             chunk_info->tokens.push_back(entry->async_dedup_token);
         }
 
-        add_to_async_insert_log(entry, 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();
     }
@@ -1078,14 +1026,30 @@ Chunk AsynchronousInsertQueue::processEntriesWithParsing(
 
 template <typename LogFunc>
 Chunk AsynchronousInsertQueue::processPreprocessedEntries(
+    const InsertQuery & key,
     const InsertDataPtr & data,
     const Block & header,
+    const ContextPtr & insert_context,
     LogFunc && add_to_async_insert_log)
 {
     size_t total_rows = 0;
     auto chunk_info = std::make_shared<AsyncInsertInfo>();
     auto result_columns = header.cloneEmptyColumns();
 
+    std::unordered_map<String, String> format_to_query;
+
+    auto get_query_by_format = [&](const String & format) -> const String &
+    {
+        auto [it, inserted] = format_to_query.try_emplace(format);
+        if (!inserted)
+            return it->second;
+
+        auto query = key.query->clone();
+        assert_cast<ASTInsertQuery &>(*query).format = format;
+        it->second = serializeQuery(*query, insert_context->getSettingsRef().log_queries_cut_to_length);
+        return it->second;
+    };
+
     for (const auto & entry : data->entries)
     {
         const auto * block = entry->chunk.asBlock();
@@ -1093,26 +1057,23 @@ Chunk AsynchronousInsertQueue::processPreprocessedEntries(
             throw Exception(ErrorCodes::LOGICAL_ERROR,
                 "Expected entry with data kind Preprocessed. Got: {}", entry->chunk.getDataKind());
 
-        Block block_to_insert = *block;
-        if (!isCompatibleHeader(block_to_insert, header))
-            convertBlockToHeader(block_to_insert, header);
-
-        auto columns = block_to_insert.getColumns();
+        auto columns = block->getColumns();
         for (size_t i = 0, s = columns.size(); i < s; ++i)
             result_columns[i]->insertRangeFrom(*columns[i], 0, columns[i]->size());
 
-        total_rows += block_to_insert.rows();
-
-        /// For some reason, client can pass zero rows and bytes to server.
+        total_rows += block->rows();
+        /// for some reason, client can pass zero rows and bytes to server.
         /// We don't update offsets in this case, because we assume every insert has some rows during dedup,
         /// but we have nothing to deduplicate for this insert.
-        if (block_to_insert.rows() > 0)
+        if (block->rows())
         {
             chunk_info->offsets.push_back(total_rows);
             chunk_info->tokens.push_back(entry->async_dedup_token);
         }
 
-        add_to_async_insert_log(entry, /*parsing_exception=*/ "", block_to_insert.rows(), block_to_insert.bytes());
+        const auto & query_for_logging = get_query_by_format(entry->format);
+        add_to_async_insert_log(entry, query_for_logging, "", block->rows(), block->bytes(), data->timeout_ms);
+
         entry->resetChunk();
     }
 
diff --git a/src/Interpreters/AsynchronousInsertQueue.h b/src/Interpreters/AsynchronousInsertQueue.h
index ecb7757d406..da14b43d276 100644
--- a/src/Interpreters/AsynchronousInsertQueue.h
+++ b/src/Interpreters/AsynchronousInsertQueue.h
@@ -147,7 +147,6 @@ private:
             const String format;
             MemoryTracker * const user_memory_tracker;
             const std::chrono::time_point<std::chrono::system_clock> create_time;
-            NameToNameMap query_parameters;
 
             Entry(
                 DataChunk && chunk_,
@@ -288,8 +287,10 @@ private:
 
     template <typename LogFunc>
     static Chunk processPreprocessedEntries(
+        const InsertQuery & key,
         const InsertDataPtr & data,
         const Block & header,
+        const ContextPtr & insert_context,
         LogFunc && add_to_async_insert_log);
 
     template <typename E>
diff --git a/src/Interpreters/Cache/FileCache.cpp b/src/Interpreters/Cache/FileCache.cpp
index 60db406ca72..a88c0de2cfe 100644
--- a/src/Interpreters/Cache/FileCache.cpp
+++ b/src/Interpreters/Cache/FileCache.cpp
@@ -11,15 +11,11 @@
 #include <Interpreters/Cache/EvictionCandidates.h>
 #include <Interpreters/Context.h>
 #include <base/hex.h>
-#include <Common/callOnce.h>
-#include <Common/Exception.h>
 #include <Common/ThreadPool.h>
 #include <Common/ElapsedTimeProfileEventIncrement.h>
 #include <Core/ServerUUID.h>
 
-#include <exception>
 #include <filesystem>
-#include <mutex>
 
 
 namespace fs = std::filesystem;
@@ -92,7 +88,6 @@ 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)
-    , load_metadata_asynchronously(settings.load_metadata_asynchronously)
     , write_cache_per_user_directory(settings.write_cache_per_user_id_directory)
     , keep_current_size_to_max_ratio(1 - settings.keep_free_space_size_ratio)
     , keep_current_elements_to_max_ratio(1 - settings.keep_free_space_elements_ratio)
@@ -141,17 +136,7 @@ const FileCache::UserInfo & FileCache::getInternalUser()
 
 bool FileCache::isInitialized() const
 {
-    return is_initialized;
-}
-
-void FileCache::throwInitExceptionIfNeeded()
-{
-    if (load_metadata_asynchronously)
-        return;
-
-    std::lock_guard lock(init_mutex);
-    if (init_exception)
-        std::rethrow_exception(init_exception);
+    return is_initialized.load(std::memory_order_seq_cst);
 }
 
 const String & FileCache::getBasePath() const
@@ -185,35 +170,6 @@ void FileCache::assertInitialized() const
 }
 
 void FileCache::initialize()
-{
-    // Prevent initialize() from running twice. This may be caused by two cache disks being created with the same path (see integration/test_filesystem_cache).
-    callOnce(initialize_called, [&] {
-        bool need_to_load_metadata = fs::exists(getBasePath());
-        try
-        {
-            if (!need_to_load_metadata)
-                fs::create_directories(getBasePath());
-            status_file = make_unique<StatusFile>(fs::path(getBasePath()) / "status", StatusFile::write_full_info);
-        }
-        catch (...)
-        {
-            init_exception = std::current_exception();
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-            throw;
-        }
-
-        if (load_metadata_asynchronously)
-        {
-            load_metadata_main_thread = ThreadFromGlobalPool([this, need_to_load_metadata] { initializeImpl(need_to_load_metadata); });
-        }
-        else
-        {
-            initializeImpl(need_to_load_metadata);
-        }
-    });
-}
-
-void FileCache::initializeImpl(bool load_metadata)
 {
     std::lock_guard lock(init_mutex);
 
@@ -222,10 +178,16 @@ void FileCache::initializeImpl(bool load_metadata)
 
     try
     {
-        if (load_metadata)
+        if (fs::exists(getBasePath()))
+        {
             loadMetadata();
+        }
+        else
+        {
+            fs::create_directories(getBasePath());
+        }
 
-        metadata.startup();
+        status_file = make_unique<StatusFile>(fs::path(getBasePath()) / "status", StatusFile::write_full_info);
     }
     catch (...)
     {
@@ -234,6 +196,8 @@ void FileCache::initializeImpl(bool load_metadata)
         throw;
     }
 
+    metadata.startup();
+
     if (keep_current_size_to_max_ratio != 1 || keep_current_elements_to_max_ratio != 1)
     {
         keep_up_free_space_ratio_task = Context::getGlobalContextInstance()->getSchedulePool().createTask(log->name(), [this] { freeSpaceRatioKeepingThreadFunc(); });
@@ -241,7 +205,6 @@ void FileCache::initializeImpl(bool load_metadata)
     }
 
     is_initialized = true;
-    LOG_TEST(log, "Initialized cache from {}", metadata.getBaseDirectory());
 }
 
 CachePriorityGuard::Lock FileCache::lockCache() const
@@ -353,39 +316,14 @@ FileSegments FileCache::getImpl(const LockedKey & locked_key, const FileSegment:
     return result;
 }
 
-std::vector<FileSegment::Range> FileCache::splitRange(size_t offset, size_t size, size_t aligned_size)
+std::vector<FileSegment::Range> FileCache::splitRange(size_t offset, size_t size)
 {
-    chassert(size > 0);
-    chassert(size <= aligned_size);
-
-    /// Consider this example to understand why we need to account here for both `size` and `aligned_size`.
-    /// [________________]__________________] <-- requested range
-    ///                  ^                  ^
-    ///                right offset         aligned_right_offset
-    /// [_________]                           <-- last cached file segment, e.g. we have uncovered suffix of the requested range
-    ///           ^
-    ///           last_file_segment_right_offset
-    /// [________________]
-    ///        size
-    /// [____________________________________]
-    ///        aligned_size
-    ///
-    /// So it is possible that we split this hole range into sub-segments by `max_file_segment_size`
-    /// and get something like this:
-    ///
-    /// [________________________]
-    ///          ^               ^
-    ///          |               last_file_segment_right_offset + max_file_segment_size
-    ///          last_file_segment_right_offset
-    /// e.g. there is no need to create sub-segment for range (last_file_segment_right_offset + max_file_segment_size, aligned_right_offset].
-    /// Because its left offset would be bigger than right_offset.
-    /// Therefore, we set end_pos_non_included as offset+size, but remaining_size as aligned_size.
-
+    assert(size > 0);
     std::vector<FileSegment::Range> ranges;
 
     size_t current_pos = offset;
     size_t end_pos_non_included = offset + size;
-    size_t remaining_size = aligned_size;
+    size_t remaining_size = size;
 
     FileSegments file_segments;
     const size_t max_size = max_file_segment_size.load();
@@ -401,30 +339,43 @@ std::vector<FileSegment::Range> FileCache::splitRange(size_t offset, size_t size
     return ranges;
 }
 
-FileSegments FileCache::createFileSegmentsFromRanges(
+FileSegments FileCache::splitRangeIntoFileSegments(
     LockedKey & locked_key,
-    const std::vector<FileSegment::Range> & ranges,
-    size_t & file_segments_count,
+    size_t offset,
+    size_t size,
+    FileSegment::State state,
     size_t file_segments_limit,
     const CreateFileSegmentSettings & create_settings)
 {
-    FileSegments result;
-    for (const auto & r : ranges)
+    assert(size > 0);
+
+    auto current_pos = offset;
+    auto end_pos_non_included = offset + size;
+
+    size_t current_file_segment_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 && (!file_segments_limit || file_segments.size() < file_segments_limit))
     {
-        if (file_segments_limit && file_segments_count >= file_segments_limit)
-            break;
-        auto metadata_it = addFileSegment(locked_key, r.left, r.size(), FileSegment::State::EMPTY, create_settings, nullptr);
-        result.push_back(metadata_it->second->file_segment);
-        ++file_segments_count;
+        current_file_segment_size = std::min(remaining_size, max_size);
+        remaining_size -= current_file_segment_size;
+
+        auto file_segment_metadata_it = addFileSegment(
+            locked_key, current_pos, current_file_segment_size, state, create_settings, nullptr);
+        file_segments.push_back(file_segment_metadata_it->second->file_segment);
+
+        current_pos += current_file_segment_size;
     }
-    return result;
+
+    return file_segments;
 }
 
 void FileCache::fillHolesWithEmptyFileSegments(
     LockedKey & locked_key,
     FileSegments & file_segments,
     const FileSegment::Range & range,
-    size_t non_aligned_right_offset,
     size_t file_segments_limit,
     bool fill_with_detached_file_segments,
     const CreateFileSegmentSettings & create_settings)
@@ -491,9 +442,18 @@ void FileCache::fillHolesWithEmptyFileSegments(
         }
         else
         {
-            const auto ranges = splitRange(current_pos, hole_size, hole_size);
-            auto hole_segments = createFileSegmentsFromRanges(locked_key, ranges, processed_count, file_segments_limit, create_settings);
-            file_segments.splice(it, std::move(hole_segments));
+            auto ranges = splitRange(current_pos, hole_size);
+            FileSegments hole;
+            for (const auto & r : ranges)
+            {
+                auto metadata_it = addFileSegment(locked_key, r.left, r.size(), FileSegment::State::EMPTY, create_settings, nullptr);
+                hole.push_back(metadata_it->second->file_segment);
+                ++processed_count;
+
+                if (is_limit_reached())
+                    break;
+            }
+            file_segments.splice(it, std::move(hole));
         }
 
         if (is_limit_reached())
@@ -519,7 +479,7 @@ void FileCache::fillHolesWithEmptyFileSegments(
 
     chassert(!file_segments_limit || file_segments.size() < file_segments_limit);
 
-    if (current_pos <= non_aligned_right_offset)
+    if (current_pos <= range.right)
     {
         ///   ________]     -- requested range
         ///   _____]
@@ -527,20 +487,28 @@ void FileCache::fillHolesWithEmptyFileSegments(
         /// segmentN
 
         auto hole_size = range.right - current_pos + 1;
-        auto non_aligned_hole_size = non_aligned_right_offset - current_pos + 1;
 
         if (fill_with_detached_file_segments)
         {
             auto file_segment = std::make_shared<FileSegment>(
-                locked_key.getKey(), current_pos, non_aligned_hole_size, FileSegment::State::DETACHED, create_settings);
+                locked_key.getKey(), current_pos, hole_size, FileSegment::State::DETACHED, create_settings);
 
             file_segments.insert(file_segments.end(), file_segment);
         }
         else
         {
-            const auto ranges = splitRange(current_pos, non_aligned_hole_size, hole_size);
-            auto hole_segments = createFileSegmentsFromRanges(locked_key, ranges, processed_count, file_segments_limit, create_settings);
-            file_segments.splice(it, std::move(hole_segments));
+            auto ranges = splitRange(current_pos, hole_size);
+            FileSegments hole;
+            for (const auto & r : ranges)
+            {
+                auto metadata_it = addFileSegment(locked_key, r.left, r.size(), FileSegment::State::EMPTY, create_settings, nullptr);
+                hole.push_back(metadata_it->second->file_segment);
+                ++processed_count;
+
+                if (is_limit_reached())
+                    break;
+            }
+            file_segments.splice(it, std::move(hole));
 
             if (is_limit_reached())
                 erase_unprocessed();
@@ -573,9 +541,8 @@ FileSegmentsHolderPtr FileCache::set(
     }
     else
     {
-        const auto ranges = splitRange(offset, size, size);
-        size_t file_segments_count = 0;
-        file_segments = createFileSegmentsFromRanges(*locked_key, ranges, file_segments_count, /* file_segments_limit */0, create_settings);
+        file_segments = splitRangeIntoFileSegments(
+            *locked_key, offset, size, FileSegment::State::EMPTY, /* file_segments_limit */0, create_settings);
     }
 
     return std::make_unique<FileSegmentsHolder>(std::move(file_segments));
@@ -595,27 +562,23 @@ FileCache::getOrSet(
 
     assertInitialized();
 
-    FileSegment::Range initial_range(offset, offset + size - 1);
-    /// result_range is initial range, which will be adjusted according to
-    /// 1. aligned_offset, aligned_end_offset
-    /// 2. max_file_segments_limit
-    FileSegment::Range result_range = initial_range;
+    FileSegment::Range range(offset, offset + size - 1);
 
-    const auto aligned_offset = roundDownToMultiple(initial_range.left, boundary_alignment);
-    auto aligned_end_offset = std::min(roundUpToMultiple(initial_range.right + 1, boundary_alignment), file_size) - 1;
+    const auto aligned_offset = roundDownToMultiple(range.left, boundary_alignment);
+    auto aligned_end_offset = std::min(roundUpToMultiple(offset + size, boundary_alignment), file_size) - 1;
 
-    chassert(aligned_offset <= initial_range.left);
-    chassert(aligned_end_offset >= initial_range.right);
+    chassert(aligned_offset <= range.left);
+    chassert(aligned_end_offset >= range.right);
 
     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, initial_range, file_segments_limit);
+    auto file_segments = getImpl(*locked_key, range, file_segments_limit);
 
     if (file_segments_limit)
     {
         chassert(file_segments.size() <= file_segments_limit);
         if (file_segments.size() == file_segments_limit)
-            result_range.right = aligned_end_offset = file_segments.back()->range().right;
+            range.right = aligned_end_offset = file_segments.back()->range().right;
     }
 
     /// Check case if we have uncovered prefix, e.g.
@@ -627,11 +590,11 @@ FileCache::getOrSet(
     ///   [    ]
     ///   ^----^
     ///   uncovered prefix.
-    const bool has_uncovered_prefix = file_segments.empty() || result_range.left < file_segments.front()->range().left;
+    const bool has_uncovered_prefix = file_segments.empty() || range.left < file_segments.front()->range().left;
 
-    if (aligned_offset < result_range.left && has_uncovered_prefix)
+    if (aligned_offset < range.left && has_uncovered_prefix)
     {
-        auto prefix_range = FileSegment::Range(aligned_offset, file_segments.empty() ? result_range.left - 1 : file_segments.front()->range().left - 1);
+        auto prefix_range = FileSegment::Range(aligned_offset, file_segments.empty() ? range.left - 1 : file_segments.front()->range().left - 1);
         auto prefix_file_segments = getImpl(*locked_key, prefix_range, /* file_segments_limit */0);
 
         if (prefix_file_segments.empty())
@@ -640,7 +603,7 @@ FileCache::getOrSet(
             ///   ^                     ^               ^
             ///   aligned_offset        range.left      range.right
             ///                             [___] [__________]         <-- current cache (example)
-            result_range.left = aligned_offset;
+            range.left = aligned_offset;
         }
         else
         {
@@ -651,10 +614,10 @@ FileCache::getOrSet(
             ///                  ^
             ///                  prefix_file_segments.back().right
 
-            chassert(prefix_file_segments.back()->range().right < result_range.left);
+            chassert(prefix_file_segments.back()->range().right < range.left);
             chassert(prefix_file_segments.back()->range().right >= aligned_offset);
 
-            result_range.left = prefix_file_segments.back()->range().right + 1;
+            range.left = prefix_file_segments.back()->range().right + 1;
         }
     }
 
@@ -667,11 +630,11 @@ FileCache::getOrSet(
     ///                   [___]
     ///                   ^---^
     ///                    uncovered_suffix
-    const bool has_uncovered_suffix = file_segments.empty() || file_segments.back()->range().right < result_range.right;
+    const bool has_uncovered_suffix = file_segments.empty() || file_segments.back()->range().right < range.right;
 
-    if (result_range.right < aligned_end_offset && has_uncovered_suffix)
+    if (range.right < aligned_end_offset && has_uncovered_suffix)
     {
-        auto suffix_range = FileSegment::Range(result_range.right, aligned_end_offset);
+        auto suffix_range = FileSegment::Range(range.right, aligned_end_offset);
         /// We need to get 1 file segment, so file_segments_limit = 1 here.
         auto suffix_file_segments = getImpl(*locked_key, suffix_range, /* file_segments_limit */1);
 
@@ -682,7 +645,7 @@ FileCache::getOrSet(
             ///   range.left         range.right              aligned_end_offset
             ///      [___]   [___]                                    <-- current cache (example)
 
-            result_range.right = aligned_end_offset;
+            range.right = aligned_end_offset;
         }
         else
         {
@@ -692,33 +655,31 @@ FileCache::getOrSet(
             ///      [___]   [___]          [_________]               <-- current cache (example)
             ///                             ^
             ///                             suffix_file_segments.front().left
-            result_range.right = suffix_file_segments.front()->range().left - 1;
+            range.right = suffix_file_segments.front()->range().left - 1;
         }
     }
 
     if (file_segments.empty())
     {
-        auto ranges = splitRange(result_range.left, initial_range.size() + (initial_range.left - result_range.left), result_range.size());
-        size_t file_segments_count = file_segments.size();
-        file_segments.splice(file_segments.end(), createFileSegmentsFromRanges(*locked_key, ranges, file_segments_count, file_segments_limit, create_settings));
+        file_segments = splitRangeIntoFileSegments(*locked_key, range.left, range.size(), FileSegment::State::EMPTY, file_segments_limit, create_settings);
     }
     else
     {
-        chassert(file_segments.front()->range().right >= result_range.left);
-        chassert(file_segments.back()->range().left <= result_range.right);
+        chassert(file_segments.front()->range().right >= range.left);
+        chassert(file_segments.back()->range().left <= range.right);
 
         fillHolesWithEmptyFileSegments(
-            *locked_key, file_segments, result_range, offset + size - 1, file_segments_limit, /* fill_with_detached */false, create_settings);
+            *locked_key, file_segments, range, file_segments_limit, /* fill_with_detached */false, create_settings);
 
-        if (!file_segments.front()->range().contains(result_range.left))
+        if (!file_segments.front()->range().contains(offset))
         {
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected {} to include {} "
                             "(end offset: {}, aligned offset: {}, aligned end offset: {})",
-                            file_segments.front()->range().toString(), offset, result_range.right, aligned_offset, aligned_end_offset);
+                            file_segments.front()->range().toString(), offset, range.right, aligned_offset, aligned_end_offset);
         }
     }
 
-    chassert(file_segments_limit ? file_segments.back()->range().left <= result_range.right : file_segments.back()->range().contains(result_range.right));
+    chassert(file_segments_limit ? file_segments.back()->range().left <= range.right : file_segments.back()->range().contains(range.right));
     chassert(!file_segments_limit || file_segments.size() <= file_segments_limit);
 
     return std::make_unique<FileSegmentsHolder>(std::move(file_segments));
@@ -752,7 +713,7 @@ FileSegmentsHolderPtr FileCache::get(
             }
 
             fillHolesWithEmptyFileSegments(
-                *locked_key, file_segments, range, offset + size - 1, file_segments_limit, /* fill_with_detached */true, CreateFileSegmentSettings{});
+                *locked_key, file_segments, range, file_segments_limit, /* fill_with_detached */true, CreateFileSegmentSettings{});
 
             chassert(!file_segments_limit || file_segments.size() <= file_segments_limit);
             return std::make_unique<FileSegmentsHolder>(std::move(file_segments));
@@ -841,8 +802,7 @@ bool FileCache::tryReserve(
     const size_t size,
     FileCacheReserveStat & reserve_stat,
     const UserInfo & user,
-    size_t lock_wait_timeout_milliseconds,
-    std::string & failure_reason)
+    size_t lock_wait_timeout_milliseconds)
 {
     ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::FilesystemCacheReserveMicroseconds);
 
@@ -855,7 +815,6 @@ bool FileCache::tryReserve(
     if (cache_is_being_resized.load(std::memory_order_relaxed))
     {
         ProfileEvents::increment(ProfileEvents::FilesystemCacheFailToReserveSpaceBecauseOfCacheResize);
-        failure_reason = "cache is being resized";
         return false;
     }
 
@@ -863,7 +822,6 @@ bool FileCache::tryReserve(
     if (!cache_lock)
     {
         ProfileEvents::increment(ProfileEvents::FilesystemCacheFailToReserveSpaceBecauseOfLockContention);
-        failure_reason = "cache contention";
         return false;
     }
 
@@ -887,7 +845,6 @@ bool FileCache::tryReserve(
             LOG_TEST(log, "Query limit exceeded, space reservation failed, "
                      "recache_on_query_limit_exceeded is disabled (while reserving for {}:{})",
                      file_segment.key(), file_segment.offset());
-            failure_reason = "query limit exceeded";
             return false;
         }
 
@@ -918,7 +875,6 @@ bool FileCache::tryReserve(
         if (!query_priority->collectCandidatesForEviction(
                 size, required_elements_num, reserve_stat, eviction_candidates, {}, user.user_id, cache_lock))
         {
-            failure_reason = "cannot evict enough space for query limit";
             return false;
         }
 
@@ -933,15 +889,11 @@ bool FileCache::tryReserve(
     if (!main_priority->collectCandidatesForEviction(
             size, required_elements_num, reserve_stat, eviction_candidates, queue_iterator, user.user_id, cache_lock))
     {
-        failure_reason = "cannot evict enough space";
         return false;
     }
 
     if (!file_segment.getKeyMetadata()->createBaseDirectory())
-    {
-        failure_reason = "not enough space on device";
         return false;
-    }
 
     if (eviction_candidates.size() > 0)
     {
@@ -1046,19 +998,18 @@ void FileCache::freeSpaceRatioKeepingThreadFunc()
     FileCacheReserveStat stat;
     EvictionCandidates eviction_candidates;
 
-    IFileCachePriority::CollectStatus desired_size_status;
+    bool limits_satisfied = true;
     try
     {
         /// Collect at most `keep_up_free_space_remove_batch` elements to evict,
         /// (we use batches to make sure we do not block cache for too long,
         /// by default the batch size is quite small).
-        desired_size_status = main_priority->collectCandidatesForEviction(
+        limits_satisfied = main_priority->collectCandidatesForEviction(
             desired_size, desired_elements_num, keep_up_free_space_remove_batch, stat, eviction_candidates, lock);
 
 #ifdef DEBUG_OR_SANITIZER_BUILD
         /// Let's make sure that we correctly processed the limits.
-        if (desired_size_status == IFileCachePriority::CollectStatus::SUCCESS
-            && eviction_candidates.size() < keep_up_free_space_remove_batch)
+        if (limits_satisfied && eviction_candidates.size() < keep_up_free_space_remove_batch)
         {
             const auto current_size = main_priority->getSize(lock);
             chassert(current_size >= stat.total_stat.releasable_size);
@@ -1112,24 +1063,13 @@ void FileCache::freeSpaceRatioKeepingThreadFunc()
     watch.stop();
     ProfileEvents::increment(ProfileEvents::FilesystemCacheFreeSpaceKeepingThreadWorkMilliseconds, watch.elapsedMilliseconds());
 
-    LOG_TRACE(log, "Free space ratio keeping thread finished in {} ms (status: {})",
-              watch.elapsedMilliseconds(), desired_size_status);
+    LOG_TRACE(log, "Free space ratio keeping thread finished in {} ms", watch.elapsedMilliseconds());
 
     [[maybe_unused]] bool scheduled = false;
-    switch (desired_size_status)
-    {
-        case IFileCachePriority::CollectStatus::SUCCESS: [[fallthrough]];
-        case IFileCachePriority::CollectStatus::CANNOT_EVICT:
-        {
-            scheduled = keep_up_free_space_ratio_task->scheduleAfter(general_reschedule_ms);
-            break;
-        }
-        case IFileCachePriority::CollectStatus::REACHED_MAX_CANDIDATES_LIMIT:
-        {
-            scheduled = keep_up_free_space_ratio_task->schedule();
-            break;
-        }
-    }
+    if (limits_satisfied)
+        scheduled = keep_up_free_space_ratio_task->scheduleAfter(general_reschedule_ms);
+    else
+        scheduled = keep_up_free_space_ratio_task->schedule();
     chassert(scheduled);
 }
 
@@ -1234,6 +1174,7 @@ void FileCache::loadMetadataImpl()
     std::vector<ThreadFromGlobalPool> loading_threads;
     std::exception_ptr first_exception;
     std::mutex set_exception_mutex;
+    std::atomic<bool> stop_loading = false;
 
     LOG_INFO(log, "Loading filesystem cache with {} threads from {}", load_metadata_threads, metadata.getBaseDirectory());
 
@@ -1243,7 +1184,7 @@ void FileCache::loadMetadataImpl()
         {
             loading_threads.emplace_back([&]
             {
-                while (!stop_loading_metadata)
+                while (!stop_loading)
                 {
                     try
                     {
@@ -1260,7 +1201,7 @@ void FileCache::loadMetadataImpl()
                             if (!first_exception)
                                 first_exception = std::current_exception();
                         }
-                        stop_loading_metadata = true;
+                        stop_loading = true;
                         return;
                     }
                 }
@@ -1273,7 +1214,7 @@ void FileCache::loadMetadataImpl()
                 if (!first_exception)
                     first_exception = std::current_exception();
             }
-            stop_loading_metadata = true;
+            stop_loading = true;
             break;
         }
     }
@@ -1460,11 +1401,6 @@ FileCache::~FileCache()
 void FileCache::deactivateBackgroundOperations()
 {
     shutdown.store(true);
-
-    stop_loading_metadata = true;
-    if (load_metadata_main_thread.joinable())
-        load_metadata_main_thread.join();
-
     metadata.shutdown();
     if (keep_up_free_space_ratio_task)
         keep_up_free_space_ratio_task->deactivate();
@@ -1610,7 +1546,7 @@ void FileCache::applySettingsIfPossible(const FileCacheSettings & new_settings,
             FileCacheReserveStat stat;
             if (main_priority->collectCandidatesForEviction(
                     new_settings.max_size, new_settings.max_elements, 0/* max_candidates_to_evict */,
-                    stat, eviction_candidates, cache_lock) == IFileCachePriority::CollectStatus::SUCCESS)
+                    stat, eviction_candidates, cache_lock))
             {
                 if (eviction_candidates.size() == 0)
                 {
diff --git a/src/Interpreters/Cache/FileCache.h b/src/Interpreters/Cache/FileCache.h
index 8e8f01ff39e..527fd9d5edf 100644
--- a/src/Interpreters/Cache/FileCache.h
+++ b/src/Interpreters/Cache/FileCache.h
@@ -8,7 +8,6 @@
 
 #include <IO/ReadSettings.h>
 
-#include <Common/callOnce.h>
 #include <Common/ThreadPool.h>
 #include <Common/StatusFile.h>
 #include <Interpreters/Cache/LRUFileCachePriority.h>
@@ -83,9 +82,6 @@ public:
 
     bool isInitialized() const;
 
-    /// Throws if `!load_metadata_asynchronously` and there is an exception in `init_exception`
-    void throwInitExceptionIfNeeded();
-
     const String & getBasePath() const;
 
     static Key createKeyForPath(const String & path);
@@ -169,8 +165,7 @@ public:
         size_t size,
         FileCacheReserveStat & stat,
         const UserInfo & user,
-        size_t lock_wait_timeout_milliseconds,
-        std::string & failure_reason);
+        size_t lock_wait_timeout_milliseconds);
 
     std::vector<FileSegment::Info> getFileSegmentInfos(const UserID & user_id);
 
@@ -203,9 +198,6 @@ private:
     const size_t bypass_cache_threshold;
     const size_t boundary_alignment;
     size_t load_metadata_threads;
-    const bool load_metadata_asynchronously;
-    std::atomic<bool> stop_loading_metadata = false;
-    ThreadFromGlobalPool load_metadata_main_thread;
     const bool write_cache_per_user_directory;
 
     BackgroundSchedulePool::TaskHolder keep_up_free_space_ratio_task;
@@ -217,7 +209,6 @@ private:
 
     std::exception_ptr init_exception;
     std::atomic<bool> is_initialized = false;
-    OnceFlag initialize_called;
     mutable std::mutex init_mutex;
     std::unique_ptr<StatusFile> status_file;
     std::atomic<bool> shutdown = false;
@@ -255,8 +246,6 @@ private:
      */
     FileCacheQueryLimitPtr query_limit;
 
-    void initializeImpl(bool load_metadata);
-
     void assertInitialized() const;
     void assertCacheCorrectness();
 
@@ -274,12 +263,17 @@ private:
 
     /// Split range into subranges by max_file_segment_size,
     /// each subrange size must be less or equal to max_file_segment_size.
-    std::vector<FileSegment::Range> splitRange(size_t offset, size_t size, size_t aligned_size);
+    std::vector<FileSegment::Range> splitRange(size_t offset, size_t size);
 
-    FileSegments createFileSegmentsFromRanges(
+    /// Split range into subranges by max_file_segment_size (same as in splitRange())
+    /// and create a new file segment for each subrange.
+    /// If `file_segments_limit` > 0, create no more than first file_segments_limit
+    /// file segments.
+    FileSegments splitRangeIntoFileSegments(
         LockedKey & locked_key,
-        const std::vector<FileSegment::Range> & ranges,
-        size_t & file_segments_count,
+        size_t offset,
+        size_t size,
+        FileSegment::State state,
         size_t file_segments_limit,
         const CreateFileSegmentSettings & create_settings);
 
@@ -287,7 +281,6 @@ private:
         LockedKey & locked_key,
         FileSegments & file_segments,
         const FileSegment::Range & range,
-        size_t non_aligned_right_offset,
         size_t file_segments_limit,
         bool fill_with_detached_file_segments,
         const CreateFileSegmentSettings & settings);
diff --git a/src/Interpreters/Cache/FileCacheSettings.cpp b/src/Interpreters/Cache/FileCacheSettings.cpp
index e162d6b7551..c68ff3183c6 100644
--- a/src/Interpreters/Cache/FileCacheSettings.cpp
+++ b/src/Interpreters/Cache/FileCacheSettings.cpp
@@ -65,9 +65,6 @@ void FileCacheSettings::loadImpl(FuncHas has, FuncGetUInt get_uint, FuncGetStrin
     if (has("load_metadata_threads"))
         load_metadata_threads = get_uint("load_metadata_threads");
 
-    if (has("load_metadata_asynchronously"))
-        load_metadata_asynchronously = get_uint("load_metadata_asynchronously");
-
     if (boundary_alignment > max_file_segment_size)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Setting `boundary_alignment` cannot exceed `max_file_segment_size`");
 
diff --git a/src/Interpreters/Cache/FileCacheSettings.h b/src/Interpreters/Cache/FileCacheSettings.h
index 72a2b6c3369..93ded202947 100644
--- a/src/Interpreters/Cache/FileCacheSettings.h
+++ b/src/Interpreters/Cache/FileCacheSettings.h
@@ -32,7 +32,6 @@ struct FileCacheSettings
     size_t background_download_queue_size_limit = FILECACHE_DEFAULT_BACKGROUND_DOWNLOAD_QUEUE_SIZE_LIMIT;
 
     size_t load_metadata_threads = FILECACHE_DEFAULT_LOAD_METADATA_THREADS;
-    bool load_metadata_asynchronously = false;
 
     bool write_cache_per_user_id_directory = false;
 
diff --git a/src/Interpreters/Cache/FileSegment.cpp b/src/Interpreters/Cache/FileSegment.cpp
index cfbdfbaa257..1664a91b694 100644
--- a/src/Interpreters/Cache/FileSegment.cpp
+++ b/src/Interpreters/Cache/FileSegment.cpp
@@ -502,11 +502,7 @@ LockedKeyPtr FileSegment::lockKeyMetadata(bool assert_exists) const
     return metadata->tryLock();
 }
 
-bool FileSegment::reserve(
-    size_t size_to_reserve,
-    size_t lock_wait_timeout_milliseconds,
-    std::string & failure_reason,
-    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");
@@ -558,7 +554,7 @@ bool FileSegment::reserve(
     if (!reserve_stat)
         reserve_stat = &dummy_stat;
 
-    bool reserved = cache->tryReserve(*this, size_to_reserve, *reserve_stat, getKeyMetadata()->user, lock_wait_timeout_milliseconds, failure_reason);
+    bool reserved = cache->tryReserve(*this, size_to_reserve, *reserve_stat, getKeyMetadata()->user, lock_wait_timeout_milliseconds);
 
     if (!reserved)
         setDownloadFailedUnlocked(lock());
@@ -1012,12 +1008,7 @@ FileSegment & FileSegmentsHolder::add(FileSegmentPtr && file_segment)
     return *file_segments.back();
 }
 
-String FileSegmentsHolder::toString(bool with_state)
-{
-    return DB::toString(file_segments, with_state);
-}
-
-String toString(const FileSegments & file_segments, bool with_state)
+String FileSegmentsHolder::toString()
 {
     String ranges;
     for (const auto & file_segment : file_segments)
@@ -1027,8 +1018,6 @@ String toString(const FileSegments & file_segments, bool with_state)
         ranges += file_segment->range().toString();
         if (file_segment->isUnbound())
             ranges += "(unbound)";
-        if (with_state)
-            ranges += "(" + FileSegment::stateToString(file_segment->state()) + ")";
     }
     return ranges;
 }
diff --git a/src/Interpreters/Cache/FileSegment.h b/src/Interpreters/Cache/FileSegment.h
index e90ebdbf8fe..d6b37b60dc1 100644
--- a/src/Interpreters/Cache/FileSegment.h
+++ b/src/Interpreters/Cache/FileSegment.h
@@ -201,11 +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,
-        size_t lock_wait_timeout_milliseconds,
-        std::string & failure_reason,
-        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(char * from, size_t size, size_t offset_in_file);
@@ -295,7 +291,7 @@ struct FileSegmentsHolder : private boost::noncopyable
 
     size_t size() const { return file_segments.size(); }
 
-    String toString(bool with_state = false);
+    String toString();
 
     void popFront() { completeAndPopFrontImpl(); }
 
@@ -321,6 +317,4 @@ private:
 
 using FileSegmentsHolderPtr = std::unique_ptr<FileSegmentsHolder>;
 
-String toString(const FileSegments & file_segments, bool with_state = false);
-
 }
diff --git a/src/Interpreters/Cache/IFileCachePriority.h b/src/Interpreters/Cache/IFileCachePriority.h
index 6970d02473a..5d8eb9dd54a 100644
--- a/src/Interpreters/Cache/IFileCachePriority.h
+++ b/src/Interpreters/Cache/IFileCachePriority.h
@@ -150,14 +150,8 @@ public:
     /// Collect eviction candidates sufficient to have `desired_size`
     /// and `desired_elements_num` as current cache state.
     /// Collect no more than `max_candidates_to_evict` elements.
-    /// Return SUCCESS status if the first condition is satisfied.
-    enum class CollectStatus
-    {
-        SUCCESS,
-        CANNOT_EVICT,
-        REACHED_MAX_CANDIDATES_LIMIT,
-    };
-    virtual CollectStatus collectCandidatesForEviction(
+    /// Return `true` if the first condition is satisfied.
+    virtual bool collectCandidatesForEviction(
         size_t desired_size,
         size_t desired_elements_count,
         size_t max_candidates_to_evict,
diff --git a/src/Interpreters/Cache/LRUFileCachePriority.cpp b/src/Interpreters/Cache/LRUFileCachePriority.cpp
index 0e0170c76e3..ec96eb14a8a 100644
--- a/src/Interpreters/Cache/LRUFileCachePriority.cpp
+++ b/src/Interpreters/Cache/LRUFileCachePriority.cpp
@@ -323,7 +323,7 @@ bool LRUFileCachePriority::collectCandidatesForEviction(
     }
 }
 
-IFileCachePriority::CollectStatus LRUFileCachePriority::collectCandidatesForEviction(
+bool LRUFileCachePriority::collectCandidatesForEviction(
     size_t desired_size,
     size_t desired_elements_count,
     size_t max_candidates_to_evict,
@@ -336,24 +336,12 @@ IFileCachePriority::CollectStatus LRUFileCachePriority::collectCandidatesForEvic
         return canFit(0, 0, stat.total_stat.releasable_size, stat.total_stat.releasable_count,
                       lock, &desired_size, &desired_elements_count);
     };
-    auto status = CollectStatus::CANNOT_EVICT;
     auto stop_condition = [&]()
     {
-        if (desired_limits_satisfied())
-        {
-            status = CollectStatus::SUCCESS;
-            return true;
-        }
-        if (max_candidates_to_evict && res.size() >= max_candidates_to_evict)
-        {
-            status = CollectStatus::REACHED_MAX_CANDIDATES_LIMIT;
-            return true;
-        }
-        return false;
+        return desired_limits_satisfied() || (max_candidates_to_evict && res.size() >= max_candidates_to_evict);
     };
     iterateForEviction(res, stat, stop_condition, lock);
-    chassert(status != CollectStatus::SUCCESS || stop_condition());
-    return status;
+    return desired_limits_satisfied();
 }
 
 void LRUFileCachePriority::iterateForEviction(
@@ -362,9 +350,6 @@ void LRUFileCachePriority::iterateForEviction(
     StopConditionFunc stop_condition,
     const CachePriorityGuard::Lock & lock)
 {
-    if (stop_condition())
-        return;
-
     ProfileEvents::increment(ProfileEvents::FilesystemCacheEvictionTries);
 
     IterateFunc iterate_func = [&](LockedKey & locked_key, const FileSegmentMetadataPtr & segment_metadata)
diff --git a/src/Interpreters/Cache/LRUFileCachePriority.h b/src/Interpreters/Cache/LRUFileCachePriority.h
index 0ca62b19d37..e0691cade43 100644
--- a/src/Interpreters/Cache/LRUFileCachePriority.h
+++ b/src/Interpreters/Cache/LRUFileCachePriority.h
@@ -63,7 +63,7 @@ public:
         const UserID & user_id,
         const CachePriorityGuard::Lock &) override;
 
-    CollectStatus collectCandidatesForEviction(
+    bool collectCandidatesForEviction(
         size_t desired_size,
         size_t desired_elements_count,
         size_t max_candidates_to_evict,
diff --git a/src/Interpreters/Cache/Metadata.cpp b/src/Interpreters/Cache/Metadata.cpp
index 6399691bcf6..7e4b76d3cc6 100644
--- a/src/Interpreters/Cache/Metadata.cpp
+++ b/src/Interpreters/Cache/Metadata.cpp
@@ -705,8 +705,7 @@ void CacheMetadata::downloadImpl(FileSegment & file_segment, std::optional<Memor
     {
         auto size = reader->available();
 
-        std::string failure_reason;
-        if (!file_segment.reserve(size, reserve_space_lock_wait_timeout_milliseconds, failure_reason))
+        if (!file_segment.reserve(size, reserve_space_lock_wait_timeout_milliseconds))
         {
             LOG_TEST(
                 log, "Failed to reserve space during background download "
diff --git a/src/Interpreters/Cache/QueryCache.cpp b/src/Interpreters/Cache/QueryCache.cpp
index 4312b35e18c..a3fe8c2e779 100644
--- a/src/Interpreters/Cache/QueryCache.cpp
+++ b/src/Interpreters/Cache/QueryCache.cpp
@@ -128,7 +128,7 @@ namespace
 
 bool isQueryCacheRelatedSetting(const String & setting_name)
 {
-    return (setting_name.starts_with("query_cache_") || setting_name.ends_with("_query_cache")) && setting_name != "query_cache_tag";
+    return setting_name.starts_with("query_cache_") || setting_name.ends_with("_query_cache");
 }
 
 class RemoveQueryCacheSettingsMatcher
@@ -242,18 +242,11 @@ QueryCache::Key::Key(
     , expires_at(expires_at_)
     , is_compressed(is_compressed_)
     , query_string(queryStringFromAST(ast_))
-    , tag(settings.query_cache_tag)
 {
 }
 
-QueryCache::Key::Key(
-    ASTPtr ast_,
-    const String & current_database,
-    const Settings & settings,
-    std::optional<UUID> user_id_,
-    const std::vector<UUID> & current_user_roles_)
-    : QueryCache::Key(ast_, current_database, settings, {}, user_id_, current_user_roles_, false, std::chrono::system_clock::from_time_t(1), false)
-    /// ^^ dummy values for everything != AST, current database, user name/roles
+QueryCache::Key::Key(ASTPtr ast_, const String & current_database, const Settings & settings, std::optional<UUID> user_id_, const std::vector<UUID> & current_user_roles_)
+    : QueryCache::Key(ast_, current_database, settings, {}, user_id_, current_user_roles_, false, std::chrono::system_clock::from_time_t(1), false) /// dummy values for everything != AST, current database, user name/roles
 {
 }
 
@@ -619,18 +612,9 @@ QueryCache::Writer QueryCache::createWriter(const Key & key, std::chrono::millis
     return Writer(cache, key, max_entry_size_in_bytes, max_entry_size_in_rows, min_query_runtime, squash_partial_results, max_block_size);
 }
 
-void QueryCache::clear(const std::optional<String> & tag)
+void QueryCache::clear()
 {
-    if (tag)
-    {
-        auto predicate = [tag](const Key & key, const Cache::MappedPtr &) { return key.tag == tag.value(); };
-        cache.remove(predicate);
-    }
-    else
-    {
-        cache.clear();
-    }
-
+    cache.clear();
     std::lock_guard lock(mutex);
     times_executed.clear();
 }
diff --git a/src/Interpreters/Cache/QueryCache.h b/src/Interpreters/Cache/QueryCache.h
index 64407633a8d..461197cac32 100644
--- a/src/Interpreters/Cache/QueryCache.h
+++ b/src/Interpreters/Cache/QueryCache.h
@@ -88,11 +88,6 @@ public:
         /// SYSTEM.QUERY_CACHE.
         const String query_string;
 
-        /// A tag (namespace) for distinguish multiple entries of the same query.
-        /// This member has currently no use besides that SYSTEM.QUERY_CACHE can populate the 'tag' column conveniently without having to
-        /// compute the tag from the query AST.
-        const String tag;
-
         /// Ctor to construct a Key for writing into query cache.
         Key(ASTPtr ast_,
             const String & current_database,
@@ -104,10 +99,7 @@ public:
             bool is_compressed);
 
         /// Ctor to construct a Key for reading from query cache (this operation only needs the AST + user name).
-        Key(ASTPtr ast_,
-            const String & current_database,
-            const Settings & settings,
-            std::optional<UUID> user_id_, const std::vector<UUID> & current_user_roles_);
+        Key(ASTPtr ast_, const String & current_database, const Settings & settings, std::optional<UUID> user_id_, const std::vector<UUID> & current_user_roles_);
 
         bool operator==(const Key & other) const;
     };
@@ -211,7 +203,7 @@ public:
     Reader createReader(const Key & key);
     Writer createWriter(const Key & key, std::chrono::milliseconds min_query_runtime, bool squash_partial_results, size_t max_block_size, size_t max_query_cache_size_in_bytes_quota, size_t max_query_cache_entries_quota);
 
-    void clear(const std::optional<String> & tag);
+    void clear();
 
     size_t sizeInBytes() const;
     size_t count() const;
diff --git a/src/Interpreters/Cache/SLRUFileCachePriority.cpp b/src/Interpreters/Cache/SLRUFileCachePriority.cpp
index f5ea519d7d4..7a3fdf5160e 100644
--- a/src/Interpreters/Cache/SLRUFileCachePriority.cpp
+++ b/src/Interpreters/Cache/SLRUFileCachePriority.cpp
@@ -256,7 +256,7 @@ bool SLRUFileCachePriority::collectCandidatesForEvictionInProtected(
     return true;
 }
 
-IFileCachePriority::CollectStatus SLRUFileCachePriority::collectCandidatesForEviction(
+bool SLRUFileCachePriority::collectCandidatesForEviction(
     size_t desired_size,
     size_t desired_elements_count,
     size_t max_candidates_to_evict,
@@ -268,7 +268,7 @@ IFileCachePriority::CollectStatus SLRUFileCachePriority::collectCandidatesForEvi
     const auto desired_probationary_elements_num = getRatio(desired_elements_count, 1 - size_ratio);
 
     FileCacheReserveStat probationary_stat;
-    const auto probationary_desired_size_status = probationary_queue.collectCandidatesForEviction(
+    const bool probationary_limit_satisfied = probationary_queue.collectCandidatesForEviction(
         desired_probationary_size, desired_probationary_elements_num,
         max_candidates_to_evict, probationary_stat, res, lock);
 
@@ -285,14 +285,14 @@ IFileCachePriority::CollectStatus SLRUFileCachePriority::collectCandidatesForEvi
     chassert(!max_candidates_to_evict || res.size() <= max_candidates_to_evict);
     chassert(res.size() == stat.total_stat.releasable_count);
 
-    if (probationary_desired_size_status == CollectStatus::REACHED_MAX_CANDIDATES_LIMIT)
-        return probationary_desired_size_status;
+    if (max_candidates_to_evict && res.size() >= max_candidates_to_evict)
+        return probationary_limit_satisfied;
 
     const auto desired_protected_size = getRatio(desired_size, size_ratio);
     const auto desired_protected_elements_num = getRatio(desired_elements_count, size_ratio);
 
     FileCacheReserveStat protected_stat;
-    const auto protected_desired_size_status = protected_queue.collectCandidatesForEviction(
+    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);
 
@@ -306,10 +306,7 @@ IFileCachePriority::CollectStatus SLRUFileCachePriority::collectCandidatesForEvi
              desired_protected_size, desired_protected_elements_num,
              protected_queue.getStateInfoForLog(lock));
 
-    if (probationary_desired_size_status == CollectStatus::SUCCESS)
-        return protected_desired_size_status;
-    else
-        return probationary_desired_size_status;
+    return probationary_limit_satisfied && protected_limit_satisfied;
 }
 
 void SLRUFileCachePriority::downgrade(IteratorPtr iterator, const CachePriorityGuard::Lock & lock)
diff --git a/src/Interpreters/Cache/SLRUFileCachePriority.h b/src/Interpreters/Cache/SLRUFileCachePriority.h
index 23bc8c0908b..2102a0ec558 100644
--- a/src/Interpreters/Cache/SLRUFileCachePriority.h
+++ b/src/Interpreters/Cache/SLRUFileCachePriority.h
@@ -58,7 +58,7 @@ public:
         const UserID & user_id,
         const CachePriorityGuard::Lock &) override;
 
-    CollectStatus collectCandidatesForEviction(
+    bool collectCandidatesForEviction(
         size_t desired_size,
         size_t desired_elements_count,
         size_t max_candidates_to_evict,
diff --git a/src/Interpreters/Cache/WriteBufferToFileSegment.cpp b/src/Interpreters/Cache/WriteBufferToFileSegment.cpp
index e43bbacdbc5..e6ebf6ad50c 100644
--- a/src/Interpreters/Cache/WriteBufferToFileSegment.cpp
+++ b/src/Interpreters/Cache/WriteBufferToFileSegment.cpp
@@ -75,8 +75,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.
-    std::string failure_reason;
-    bool ok = file_segment->reserve(bytes_to_write, reserve_space_lock_wait_timeout_milliseconds, failure_reason, &reserve_stat);
+    bool ok = file_segment->reserve(bytes_to_write, reserve_space_lock_wait_timeout_milliseconds, &reserve_stat);
 
     if (!ok)
     {
@@ -85,10 +84,9 @@ void WriteBufferToFileSegment::nextImpl()
             reserve_stat_msg += fmt::format("{} hold {}, can release {}; ",
                 toString(kind), ReadableSize(stat.non_releasable_size), ReadableSize(stat.releasable_size));
 
-        throw Exception(ErrorCodes::NOT_ENOUGH_SPACE, "Failed to reserve {} bytes for {}: reason {}, {}(segment info: {})",
+        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",
-            failure_reason,
             reserve_stat_msg,
             file_segment->getInfoForLog()
         );
diff --git a/src/Interpreters/ClientInfo.cpp b/src/Interpreters/ClientInfo.cpp
index daf1e300046..39fdef23baa 100644
--- a/src/Interpreters/ClientInfo.cpp
+++ b/src/Interpreters/ClientInfo.cpp
@@ -254,8 +254,6 @@ String toString(ClientInfo::Interface interface)
             return "LOCAL";
         case ClientInfo::Interface::TCP_INTERSERVER:
             return "TCP_INTERSERVER";
-        case ClientInfo::Interface::PROMETHEUS:
-            return "PROMETHEUS";
     }
 
     return std::format("Unknown server interface ({}).", static_cast<int>(interface));
diff --git a/src/Interpreters/ClientInfo.h b/src/Interpreters/ClientInfo.h
index 48dea3cc3ea..ca32b4c5cfa 100644
--- a/src/Interpreters/ClientInfo.h
+++ b/src/Interpreters/ClientInfo.h
@@ -38,7 +38,6 @@ public:
         POSTGRESQL = 5,
         LOCAL = 6,
         TCP_INTERSERVER = 7,
-        PROMETHEUS = 8,
     };
 
     enum class HTTPMethod : uint8_t
diff --git a/src/Interpreters/Cluster.cpp b/src/Interpreters/Cluster.cpp
index 7b7bedc850d..59c98491c14 100644
--- a/src/Interpreters/Cluster.cpp
+++ b/src/Interpreters/Cluster.cpp
@@ -113,9 +113,6 @@ Cluster::Address::Address(
     secure = ConfigHelper::getBool(config, config_prefix + ".secure", false, /* empty_as */true) ? Protocol::Secure::Enable : Protocol::Secure::Disable;
     priority = Priority{config.getInt(config_prefix + ".priority", 1)};
 
-    proto_send_chunked = config.getString(config_prefix + ".proto_caps.send", "notchunked");
-    proto_recv_chunked = config.getString(config_prefix + ".proto_caps.recv", "notchunked");
-
     const char * port_type = secure == Protocol::Secure::Enable ? "tcp_port_secure" : "tcp_port";
     auto default_port = config.getInt(port_type, 0);
 
@@ -230,37 +227,21 @@ String Cluster::Address::toFullString(bool use_compact_format) const
     }
 }
 
-Cluster::Address Cluster::Address::fromFullString(std::string_view full_string)
+Cluster::Address Cluster::Address::fromFullString(const String & full_string)
 {
-    std::string_view user_password;
-    if (auto pos = full_string.find('@'); pos != std::string_view::npos)
-        user_password = full_string.substr(pos + 1);
+    const char * address_begin = full_string.data();
+    const char * address_end = address_begin + full_string.size();
+
+    const char * user_pw_end = strchr(full_string.data(), '@');
 
     /// parsing with the new shard{shard_index}[_replica{replica_index}] format
-    if (user_password.empty() && full_string.starts_with("shard"))
+    if (!user_pw_end && startsWith(full_string, "shard"))
     {
+        const char * underscore = strchr(full_string.data(), '_');
+
         Address address;
-
-        if (auto underscore_pos = full_string.find('_'); underscore_pos != std::string_view::npos)
-        {
-            address.shard_index = parse<UInt32>(full_string.substr(0, underscore_pos).substr(strlen("shard")));
-
-            if (full_string.substr(underscore_pos + 1).starts_with("replica"))
-            {
-                address.replica_index = parse<UInt32>(full_string.substr(underscore_pos + 1 + strlen("replica")));
-            }
-            else if (full_string.substr(underscore_pos + 1).starts_with("all_replicas"))
-            {
-                address.replica_index = 0;
-            }
-            else
-                throw Exception(ErrorCodes::SYNTAX_ERROR, "Incorrect address '{}', should be in a form of `shardN_all_replicas` or `shardN_replicaM`", full_string);
-        }
-        else
-        {
-            address.shard_index = parse<UInt32>(full_string.substr(strlen("shard")));
-            address.replica_index = 0;
-        }
+        address.shard_index = parse<UInt32>(address_begin + strlen("shard"));
+        address.replica_index = underscore ? parse<UInt32>(underscore + strlen("_replica")) : 0;
 
         return address;
     }
@@ -271,13 +252,9 @@ Cluster::Address Cluster::Address::fromFullString(std::string_view full_string)
         /// - credentials are exposed in file name;
         /// - the file name can be too long.
 
-        const char * address_begin = full_string.data();
-        const char * address_end = address_begin + full_string.size();
-        const char * user_pw_end = strchr(address_begin, '@');
-
         Protocol::Secure secure = Protocol::Secure::Disable;
         const char * secure_tag = "+secure";
-        if (full_string.ends_with(secure_tag))
+        if (endsWith(full_string, secure_tag))
         {
             address_end -= strlen(secure_tag);
             secure = Protocol::Secure::Enable;
@@ -448,9 +425,7 @@ Cluster::Cluster(const Poco::Util::AbstractConfiguration & config,
             auto pool = ConnectionPoolFactory::instance().get(
                 static_cast<unsigned>(settings.distributed_connections_pool_size),
                 address.host_name, address.port,
-                address.default_database, address.user, address.password,
-                address.proto_send_chunked, address.proto_recv_chunked,
-                address.quota_key,
+                address.default_database, address.user, address.password, address.quota_key,
                 address.cluster, address.cluster_secret,
                 "server", address.compression,
                 address.secure, address.priority);
@@ -614,8 +589,6 @@ void Cluster::addShard(
             replica.default_database,
             replica.user,
             replica.password,
-            replica.proto_send_chunked,
-            replica.proto_recv_chunked,
             replica.quota_key,
             replica.cluster,
             replica.cluster_secret,
@@ -771,8 +744,6 @@ Cluster::Cluster(Cluster::ReplicasAsShardsTag, const Cluster & from, const Setti
                     address.default_database,
                     address.user,
                     address.password,
-                    address.proto_send_chunked,
-                    address.proto_recv_chunked,
                     address.quota_key,
                     address.cluster,
                     address.cluster_secret,
diff --git a/src/Interpreters/Cluster.h b/src/Interpreters/Cluster.h
index 82d77941b76..dc5790ac339 100644
--- a/src/Interpreters/Cluster.h
+++ b/src/Interpreters/Cluster.h
@@ -114,8 +114,6 @@ public:
         UInt16 port{0};
         String user;
         String password;
-        String proto_send_chunked = "notchunked";
-        String proto_recv_chunked = "notchunked";
         String quota_key;
 
         /// For inter-server authorization
@@ -168,7 +166,7 @@ public:
         String toFullString(bool use_compact_format) const;
 
         /// Returns address with only shard index and replica index or full address without shard index and replica index
-        static Address fromFullString(std::string_view full_string);
+        static Address fromFullString(const String & address_full_string);
 
         /// Returns resolved address if it does resolve.
         std::optional<Poco::Net::SocketAddress> getResolvedAddress() const;
diff --git a/src/Interpreters/ClusterProxy/executeQuery.cpp b/src/Interpreters/ClusterProxy/executeQuery.cpp
index 771c6a89caa..5d56ef09127 100644
--- a/src/Interpreters/ClusterProxy/executeQuery.cpp
+++ b/src/Interpreters/ClusterProxy/executeQuery.cpp
@@ -24,11 +24,11 @@
 #include <Processors/Sources/NullSource.h>
 #include <QueryPipeline/Pipe.h>
 #include <Storages/Distributed/DistributedSettings.h>
+#include <Storages/MergeTree/ParallelReplicasReadingCoordinator.h>
 #include <Storages/SelectQueryInfo.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/StorageSnapshot.h>
 #include <Storages/buildQueryTreeForShard.h>
-#include <Processors/QueryPlan/ParallelReplicasLocalPlan.h>
 #include <Storages/getStructureOfRemoteTable.h>
 
 namespace DB
@@ -39,7 +39,6 @@ namespace ErrorCodes
     extern const int TOO_LARGE_DISTRIBUTED_DEPTH;
     extern const int LOGICAL_ERROR;
     extern const int UNEXPECTED_CLUSTER;
-    extern const int INCONSISTENT_CLUSTER_DEFINITION;
 }
 
 namespace ClusterProxy
@@ -441,8 +440,7 @@ void executeQueryWithParallelReplicas(
     QueryProcessingStage::Enum processed_stage,
     const ASTPtr & query_ast,
     ContextPtr context,
-    std::shared_ptr<const StorageLimitsList> storage_limits,
-    QueryPlanStepPtr analyzed_read_from_merge_tree)
+    std::shared_ptr<const StorageLimitsList> storage_limits)
 {
     auto logger = getLogger("executeQueryWithParallelReplicas");
     LOG_DEBUG(logger, "Executing read from {}, header {}, query ({}), stage {} with parallel replicas",
@@ -488,12 +486,12 @@ void executeQueryWithParallelReplicas(
         shard_num = column->getUInt(0);
     }
 
+    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,
@@ -519,147 +517,24 @@ void executeQueryWithParallelReplicas(
                 "`cluster_for_parallel_replicas` setting refers to cluster with several shards. Expected a cluster with one shard");
     }
 
-    const auto & shard = new_cluster->getShardsInfo().at(0);
-    size_t max_replicas_to_use = settings.max_parallel_replicas;
-    if (max_replicas_to_use > shard.getAllNodeCount())
-    {
-        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.",
-            settings.max_parallel_replicas,
-            shard.getAllNodeCount());
-        max_replicas_to_use = shard.getAllNodeCount();
-    }
-
-    auto coordinator = std::make_shared<ParallelReplicasReadingCoordinator>(max_replicas_to_use, 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,
+        new_cluster,
+        storage_id,
+        std::move(coordinator),
+        header,
+        processed_stage,
+        new_context,
+        getThrottler(new_context),
+        std::move(scalars),
+        std::move(external_tables),
+        getLogger("ReadFromParallelRemoteReplicasStep"),
+        std::move(storage_limits));
 
-    std::vector<ConnectionPoolWithFailover::Base::ShuffledPool> shuffled_pool;
-    if (max_replicas_to_use < shard.getAllNodeCount())
-    {
-        // will be shuffled according to `load_balancing` setting
-        shuffled_pool = shard.pool->getShuffledPools(settings);
-    }
-    else
-    {
-        /// If all replicas in cluster are used for query execution,
-        /// try to preserve replicas order as in cluster definition.
-        /// It's important for data locality during query execution
-        /// independently of the query initiator
-        auto priority_func = [](size_t i) { return Priority{static_cast<Int64>(i)}; };
-        shuffled_pool = shard.pool->getShuffledPools(settings, priority_func);
-    }
-
-    std::vector<ConnectionPoolPtr> pools_to_use;
-    pools_to_use.reserve(shuffled_pool.size());
-    for (auto & pool : shuffled_pool)
-        pools_to_use.emplace_back(std::move(pool.pool));
-
-    /// do not build local plan for distributed queries for now (address it later)
-    if (settings.allow_experimental_analyzer && settings.parallel_replicas_local_plan && !shard_num)
-    {
-        /// find local replica index in pool
-        std::optional<size_t> local_replica_index;
-        for (size_t i = 0, s = pools_to_use.size(); i < s; ++i)
-        {
-            const auto & hostname = pools_to_use[i]->getHost();
-            const auto found = std::find_if(
-                begin(shard.local_addresses),
-                end(shard.local_addresses),
-                [&hostname](const Cluster::Address & local_addr) { return hostname == local_addr.host_name; });
-            if (found != shard.local_addresses.end())
-            {
-                local_replica_index = i;
-                break;
-            }
-        }
-        if (!local_replica_index)
-            throw Exception(
-                ErrorCodes::INCONSISTENT_CLUSTER_DEFINITION,
-                "Local replica is not found in '{}' cluster definition, see 'cluster_for_parallel_replicas' setting",
-                new_cluster->getName());
-
-        // resize the pool but keep local replicas in it (and update its index)
-        chassert(max_replicas_to_use <= pools_to_use.size());
-        if (local_replica_index >= max_replicas_to_use)
-        {
-            std::swap(pools_to_use[max_replicas_to_use - 1], pools_to_use[local_replica_index.value()]);
-            local_replica_index = max_replicas_to_use - 1;
-        }
-        pools_to_use.resize(max_replicas_to_use);
-
-        auto [local_plan, with_parallel_replicas] = createLocalPlanForParallelReplicas(
-            query_ast,
-            header,
-            new_context,
-            processed_stage,
-            coordinator,
-            std::move(analyzed_read_from_merge_tree),
-            local_replica_index.value());
-
-        if (!with_parallel_replicas)
-        {
-            query_plan = std::move(*local_plan);
-            return;
-        }
-
-        LOG_DEBUG(logger, "Local replica got replica number {}", local_replica_index.value());
-
-        auto read_from_remote = std::make_unique<ReadFromParallelRemoteReplicasStep>(
-            query_ast,
-            new_cluster,
-            storage_id,
-            coordinator,
-            header,
-            processed_stage,
-            new_context,
-            getThrottler(new_context),
-            std::move(scalars),
-            std::move(external_tables),
-            getLogger("ReadFromParallelRemoteReplicasStep"),
-            std::move(storage_limits),
-            std::move(pools_to_use),
-            local_replica_index);
-
-        auto remote_plan = std::make_unique<QueryPlan>();
-        remote_plan->addStep(std::move(read_from_remote));
-
-        DataStreams input_streams;
-        input_streams.reserve(2);
-        input_streams.emplace_back(local_plan->getCurrentDataStream());
-        input_streams.emplace_back(remote_plan->getCurrentDataStream());
-
-        std::vector<QueryPlanPtr> plans;
-        plans.emplace_back(std::move(local_plan));
-        plans.emplace_back(std::move(remote_plan));
-
-        auto union_step = std::make_unique<UnionStep>(std::move(input_streams));
-        query_plan.unitePlans(std::move(union_step), std::move(plans));
-    }
-    else
-    {
-        chassert(max_replicas_to_use <= pools_to_use.size());
-        pools_to_use.resize(max_replicas_to_use);
-
-        auto read_from_remote = std::make_unique<ReadFromParallelRemoteReplicasStep>(
-            query_ast,
-            new_cluster,
-            storage_id,
-            std::move(coordinator),
-            header,
-            processed_stage,
-            new_context,
-            getThrottler(new_context),
-            std::move(scalars),
-            std::move(external_tables),
-            getLogger("ReadFromParallelRemoteReplicasStep"),
-            std::move(storage_limits),
-            std::move(pools_to_use));
-
-        query_plan.addStep(std::move(read_from_remote));
-    }
+    query_plan.addStep(std::move(read_from_remote));
 }
 
 void executeQueryWithParallelReplicas(
@@ -669,8 +544,7 @@ void executeQueryWithParallelReplicas(
     const QueryTreeNodePtr & query_tree,
     const PlannerContextPtr & planner_context,
     ContextPtr context,
-    std::shared_ptr<const StorageLimitsList> storage_limits,
-    QueryPlanStepPtr analyzed_read_from_merge_tree)
+    std::shared_ptr<const StorageLimitsList> storage_limits)
 {
     QueryTreeNodePtr modified_query_tree = query_tree->clone();
     rewriteJoinToGlobalJoin(modified_query_tree, context);
@@ -680,8 +554,7 @@ void executeQueryWithParallelReplicas(
         = InterpreterSelectQueryAnalyzer::getSampleBlock(modified_query_tree, context, SelectQueryOptions(processed_stage).analyze());
     auto modified_query_ast = queryNodeToDistributedSelectQuery(modified_query_tree);
 
-    executeQueryWithParallelReplicas(
-        query_plan, storage_id, header, processed_stage, modified_query_ast, context, storage_limits, std::move(analyzed_read_from_merge_tree));
+    executeQueryWithParallelReplicas(query_plan, storage_id, header, processed_stage, modified_query_ast, context, storage_limits);
 }
 
 void executeQueryWithParallelReplicas(
@@ -777,49 +650,6 @@ void executeQueryWithParallelReplicasCustomKey(
         context, query_info.query, storage_id.getDatabaseName(), storage_id.getTableName(), /*table_function_ptr=*/nullptr);
     executeQueryWithParallelReplicasCustomKey(query_plan, storage_id, query_info, columns, snapshot, processed_stage, header, context);
 }
-
-bool canUseParallelReplicasOnInitiator(const ContextPtr & context)
-{
-    if (!context->canUseParallelReplicasOnInitiator())
-        return false;
-
-    auto cluster = context->getClusterForParallelReplicas();
-    if (cluster->getShardCount() == 1)
-        return cluster->getShardsInfo()[0].getAllNodeCount() > 1;
-
-    /// parallel replicas with distributed table
-    auto scalars = context->hasQueryContext() ? context->getQueryContext()->getScalars() : Scalars{};
-    UInt64 shard_num = 0; /// shard_num is 1-based, so 0 - no shard specified
-    const auto it = scalars.find("_shard_num");
-    if (it != scalars.end())
-    {
-        const Block & block = it->second;
-        const auto & column = block.safeGetByPosition(0).column;
-        shard_num = column->getUInt(0);
-    }
-    if (shard_num > 0)
-    {
-        const auto shard_count = cluster->getShardCount();
-        if (shard_num > shard_count)
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "Shard number is greater than shard count: shard_num={} shard_count={} cluster={}",
-                shard_num,
-                shard_count,
-                cluster->getName());
-
-        return cluster->getShardsInfo().at(shard_num - 1).getAllNodeCount() > 1;
-    }
-
-    if (cluster->getShardCount() > 1)
-        throw DB::Exception(
-            ErrorCodes::UNEXPECTED_CLUSTER,
-            "`cluster_for_parallel_replicas` setting refers to cluster with {} shards. Expected a cluster with one shard",
-            cluster->getShardCount());
-
-    return false;
-}
-
 }
 
 }
diff --git a/src/Interpreters/ClusterProxy/executeQuery.h b/src/Interpreters/ClusterProxy/executeQuery.h
index 2a21f3e8255..c22fcd24f03 100644
--- a/src/Interpreters/ClusterProxy/executeQuery.h
+++ b/src/Interpreters/ClusterProxy/executeQuery.h
@@ -35,9 +35,6 @@ using QueryTreeNodePtr = std::shared_ptr<IQueryTreeNode>;
 class PlannerContext;
 using PlannerContextPtr = std::shared_ptr<PlannerContext>;
 
-class IQueryPlanStep;
-using QueryPlanStepPtr = std::unique_ptr<IQueryPlanStep>;
-
 namespace ClusterProxy
 {
 
@@ -58,8 +55,6 @@ using AdditionalShardFilterGenerator = std::function<ASTPtr(uint64_t)>;
 AdditionalShardFilterGenerator
 getShardFilterGeneratorForCustomKey(const Cluster & cluster, ContextPtr context, const ColumnsDescription & columns);
 
-bool canUseParallelReplicasOnInitiator(const ContextPtr & context);
-
 /// Execute a distributed query, creating a query plan, from which the query pipeline can be built.
 /// `stream_factory` object encapsulates the logic of creating plans for a different type of query
 /// (currently SELECT, DESCRIBE).
@@ -86,8 +81,7 @@ void executeQueryWithParallelReplicas(
     QueryProcessingStage::Enum processed_stage,
     const ASTPtr & query_ast,
     ContextPtr context,
-    std::shared_ptr<const StorageLimitsList> storage_limits,
-    QueryPlanStepPtr read_from_merge_tree = nullptr);
+    std::shared_ptr<const StorageLimitsList> storage_limits);
 
 void executeQueryWithParallelReplicas(
     QueryPlan & query_plan,
@@ -104,8 +98,7 @@ void executeQueryWithParallelReplicas(
     const QueryTreeNodePtr & query_tree,
     const PlannerContextPtr & planner_context,
     ContextPtr context,
-    std::shared_ptr<const StorageLimitsList> storage_limits,
-    QueryPlanStepPtr read_from_merge_tree);
+    std::shared_ptr<const StorageLimitsList> storage_limits);
 
 void executeQueryWithParallelReplicasCustomKey(
     QueryPlan & query_plan,
diff --git a/src/Interpreters/ComparisonTupleEliminationVisitor.cpp b/src/Interpreters/ComparisonTupleEliminationVisitor.cpp
index b9f7f37b338..4f06f345b96 100644
--- a/src/Interpreters/ComparisonTupleEliminationVisitor.cpp
+++ b/src/Interpreters/ComparisonTupleEliminationVisitor.cpp
@@ -22,7 +22,7 @@ ASTs splitTuple(const ASTPtr & node)
     if (const auto * literal = node->as<ASTLiteral>(); literal && literal->value.getType() == Field::Types::Tuple)
     {
         ASTs result;
-        const auto & tuple = literal->value.safeGet<const Tuple &>();
+        const auto & tuple = literal->value.get<const Tuple &>();
         for (const auto & child : tuple)
             result.emplace_back(std::make_shared<ASTLiteral>(child));
         return result;
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 7adfb42fb51..48878733a00 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -5,7 +5,6 @@
 #include <Poco/UUID.h>
 #include <Poco/Util/Application.h>
 #include <Common/AsyncLoader.h>
-#include <Common/CgroupsMemoryUsageObserver.h>
 #include <Common/PoolId.h>
 #include <Common/SensitiveDataMasker.h>
 #include <Common/Macros.h>
@@ -100,7 +99,6 @@
 #include <Common/logger_useful.h>
 #include <Common/RemoteHostFilter.h>
 #include <Common/HTTPHeaderFilter.h>
-#include <Interpreters/SystemLog.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 #include <Interpreters/AsynchronousInsertQueue.h>
 #include <Interpreters/DatabaseCatalog.h>
@@ -381,10 +379,6 @@ struct ContextSharedPart : boost::noncopyable
     ActionLocksManagerPtr action_locks_manager;             /// Set of storages' action lockers
     OnceFlag system_logs_initialized;
     std::unique_ptr<SystemLogs> system_logs TSA_GUARDED_BY(mutex);                /// Used to log queries and operations on parts
-
-    mutable std::mutex dashboard_mutex;
-    std::optional<Context::Dashboards> dashboards;
-
     std::optional<S3SettingsByEndpoint> storage_s3_settings TSA_GUARDED_BY(mutex);   /// Settings of S3 storage
     std::vector<String> warnings TSA_GUARDED_BY(mutex);                           /// Store warning messages about server configuration.
 
@@ -620,7 +614,7 @@ struct ContextSharedPart : boost::noncopyable
         /**  After system_logs have been shut down it is guaranteed that no system table gets created or written to.
           *  Note that part changes at shutdown won't be logged to part log.
           */
-        SHUTDOWN(log, "system logs", system_logs, flushAndShutdown());
+        SHUTDOWN(log, "system logs", system_logs, shutdown());
 
         LOG_TRACE(log, "Shutting down database catalog");
         DatabaseCatalog::shutdown();
@@ -894,12 +888,6 @@ ContextData::ContextData(const ContextData &o) :
 {
 }
 
-void ContextData::resetSharedContext()
-{
-    std::lock_guard<std::mutex> lock(mutex_shared_context);
-    shared = nullptr;
-}
-
 Context::Context() = default;
 Context::Context(const Context & rhs) : ContextData(rhs), std::enable_shared_from_this<Context>(rhs) {}
 
@@ -921,6 +909,14 @@ ContextMutablePtr Context::createGlobal(ContextSharedPart * shared_part)
     return res;
 }
 
+void Context::initGlobal()
+{
+    assert(!global_context_instance);
+    global_context_instance = shared_from_this();
+    DatabaseCatalog::init(shared_from_this());
+    EventNotifier::init();
+}
+
 SharedContextHolder Context::createShared()
 {
     return SharedContextHolder(std::make_unique<ContextSharedPart>());
@@ -2270,7 +2266,7 @@ bool Context::displaySecretsInShowAndSelect() const
     return shared->server_settings.display_secrets_in_show_and_select;
 }
 
-Settings Context::getSettingsCopy() const
+Settings Context::getSettings() const
 {
     SharedLockGuard lock(mutex);
     return *settings;
@@ -2691,11 +2687,7 @@ void Context::makeSessionContext()
 
 void Context::makeGlobalContext()
 {
-    assert(!global_context_instance);
-    global_context_instance = shared_from_this();
-    DatabaseCatalog::init(shared_from_this());
-    EventNotifier::init();
-
+    initGlobal();
     global_context = shared_from_this();
 }
 
@@ -2960,9 +2952,6 @@ ProgressCallback Context::getProgressCallback() const
 
 void Context::setProcessListElement(QueryStatusPtr elem)
 {
-    if (isGlobalContext())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Global context cannot have process list element");
-
     /// Set to a session or query. In the session, only one query is processed at a time. Therefore, the lock is not needed.
     process_list_elem = elem;
     has_process_list_elem = elem.get();
@@ -3231,12 +3220,12 @@ QueryCachePtr Context::getQueryCache() const
     return shared->query_cache;
 }
 
-void Context::clearQueryCache(const std::optional<String> & tag) const
+void Context::clearQueryCache() const
 {
     std::lock_guard lock(shared->mutex);
 
     if (shared->query_cache)
-        shared->query_cache->clear(tag);
+        shared->query_cache->clear();
 }
 
 void Context::clearCaches() const
@@ -4091,13 +4080,8 @@ void Context::initializeTraceCollector()
 }
 
 /// Call after unexpected crash happen.
-void Context::handleCrash() const
+void Context::handleCrash() const TSA_NO_THREAD_SAFETY_ANALYSIS
 {
-    std::lock_guard<std::mutex> lock(mutex_shared_context);
-    if (!shared)
-        return;
-
-    SharedLockGuard lock2(shared->mutex);
     if (shared->system_logs)
         shared->system_logs->handleCrash();
 }
@@ -4267,7 +4251,7 @@ std::shared_ptr<ObjectStorageQueueLog> Context::getS3QueueLog() const
     if (!shared->system_logs)
         return {};
 
-    return shared->system_logs->s3queue_log;
+    return shared->system_logs->s3_queue_log;
 }
 
 std::shared_ptr<ObjectStorageQueueLog> Context::getAzureQueueLog() const
@@ -4324,60 +4308,15 @@ std::shared_ptr<BlobStorageLog> Context::getBlobStorageLog() const
     return shared->system_logs->blob_storage_log;
 }
 
-SystemLogs Context::getSystemLogs() const
+std::vector<ISystemLog *> Context::getSystemLogs() const
 {
     SharedLockGuard lock(shared->mutex);
 
     if (!shared->system_logs)
         return {};
-    return *shared->system_logs;
+    return shared->system_logs->logs;
 }
 
-std::optional<Context::Dashboards> Context::getDashboards() const
-{
-    std::lock_guard lock(shared->dashboard_mutex);
-
-    if (!shared->dashboards)
-        return {};
-    return shared->dashboards;
-}
-
-namespace
-{
-
-String trim(const String & text)
-{
-    std::string_view view(text);
-    ::trim(view, '\n');
-    return String(view);
-}
-
-}
-
-void Context::setDashboardsConfig(const ConfigurationPtr & config)
-{
-    Poco::Util::AbstractConfiguration::Keys keys;
-    config->keys("dashboards", keys);
-
-    Dashboards dashboards;
-    for (const auto & key : keys)
-    {
-        const auto & prefix = "dashboards." + key + ".";
-        dashboards.push_back({
-            { "dashboard", config->getString(prefix + "dashboard") },
-            { "title",     config->getString(prefix + "title") },
-            { "query",     trim(config->getString(prefix + "query")) },
-        });
-    }
-
-    {
-        std::lock_guard lock(shared->dashboard_mutex);
-        if (!dashboards.empty())
-            shared->dashboards.emplace(std::move(dashboards));
-        else
-            shared->dashboards.reset();
-    }
-}
 
 CompressionCodecPtr Context::chooseCompressionCodec(size_t part_size, double part_size_ratio) const
 {
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 858b4a78430..cb553d07513 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -48,8 +48,6 @@ namespace DB
 
 class ASTSelectQuery;
 
-class SystemLogs;
-
 struct ContextSharedPart;
 class ContextAccess;
 class ContextAccessWrapper;
@@ -152,7 +150,6 @@ class ServerType;
 template <class Queue>
 class MergeTreeBackgroundExecutor;
 class AsyncLoader;
-struct ICgroupsReader;
 
 struct TemporaryTableHolder;
 using TemporaryTablesMapping = std::map<String, std::shared_ptr<TemporaryTableHolder>>;
@@ -493,8 +490,6 @@ public:
 
     KitchenSink kitchen_sink;
 
-    void resetSharedContext();
-
 protected:
     using SampleBlockCache = std::unordered_map<std::string, Block>;
     mutable SampleBlockCache sample_block_cache;
@@ -532,10 +527,6 @@ protected:
     mutable ThrottlerPtr local_write_query_throttler;       /// A query-wide throttler for local IO writes
 
     mutable ThrottlerPtr backups_query_throttler;           /// A query-wide throttler for BACKUPs
-
-    mutable std::mutex mutex_shared_context;    /// mutex to avoid accessing destroyed shared context pointer
-                                                /// some Context methods can be called after the shared context is destroyed
-                                                /// example, Context::handleCrash() method - called from signal handler
 };
 
 /** A set of known objects that can be used in the query.
@@ -838,8 +829,7 @@ public:
     void setMacros(std::unique_ptr<Macros> && macros);
 
     bool displaySecretsInShowAndSelect() const;
-    Settings getSettingsCopy() const;
-    const Settings & getSettingsRef() const { return *settings; }
+    Settings getSettings() const;
     void setSettings(const Settings & settings_);
 
     /// Set settings by name.
@@ -964,6 +954,8 @@ public:
     void makeSessionContext();
     void makeGlobalContext();
 
+    const Settings & getSettingsRef() const { return *settings; }
+
     void setProgressCallback(ProgressCallback callback);
     /// Used in executeQuery() to pass it to the QueryPipeline.
     ProgressCallback getProgressCallback() const;
@@ -1075,7 +1067,7 @@ public:
     void setQueryCache(size_t max_size_in_bytes, size_t max_entries, size_t max_entry_size_in_bytes, size_t max_entry_size_in_rows);
     void updateQueryCacheConfiguration(const Poco::Util::AbstractConfiguration & config);
     std::shared_ptr<QueryCache> getQueryCache() const;
-    void clearQueryCache(const std::optional<String> & tag) const;
+    void clearQueryCache() const;
 
     /** Clear the caches of the uncompressed blocks and marks.
       * This is usually done when renaming tables, changing the type of columns, deleting a table.
@@ -1159,11 +1151,7 @@ public:
     std::shared_ptr<BackupLog> getBackupLog() const;
     std::shared_ptr<BlobStorageLog> getBlobStorageLog() const;
 
-    SystemLogs getSystemLogs() const;
-
-    using Dashboards = std::vector<std::map<String, String>>;
-    std::optional<Dashboards> getDashboards() const;
-    void setDashboardsConfig(const ConfigurationPtr & config);
+    std::vector<ISystemLog *> getSystemLogs() const;
 
     /// Returns an object used to log operations with parts if it possible.
     /// Provide table name to make required checks.
@@ -1394,6 +1382,8 @@ private:
 
     ExternalUserDefinedExecutableFunctionsLoader & getExternalUserDefinedExecutableFunctionsLoaderWithLock(const std::lock_guard<std::mutex> & lock);
 
+    void initGlobal();
+
     void setUserID(const UUID & user_id_);
     void setCurrentRolesImpl(const std::vector<UUID> & new_current_roles, bool throw_if_not_granted, bool skip_if_not_granted, const std::shared_ptr<const User> & user);
 
diff --git a/src/Interpreters/ConvertFunctionOrLikeVisitor.cpp b/src/Interpreters/ConvertFunctionOrLikeVisitor.cpp
index 220355e0741..084bb0a1bb9 100644
--- a/src/Interpreters/ConvertFunctionOrLikeVisitor.cpp
+++ b/src/Interpreters/ConvertFunctionOrLikeVisitor.cpp
@@ -45,7 +45,7 @@ void ConvertFunctionOrLikeData::visit(ASTFunction & function, ASTPtr &)
                     if (!identifier || !literal || literal->value.getType() != Field::Types::String)
                         continue;
 
-                    String regexp = likePatternToRegexp(literal->value.safeGet<String>());
+                    String regexp = likePatternToRegexp(literal->value.get<String>());
                     /// Case insensitive. Works with UTF-8 as well.
                     if (is_ilike)
                         regexp = "(?i)" + regexp;
@@ -61,7 +61,7 @@ void ConvertFunctionOrLikeData::visit(ASTFunction & function, ASTPtr &)
                         match->arguments->children.push_back(it->second);
                         unique_elems.push_back(std::move(match));
                     }
-                    it->second->value.safeGet<Array>().push_back(regexp);
+                    it->second->value.get<Array>().push_back(regexp);
                 }
             }
 
diff --git a/src/Interpreters/ConvertStringsToEnumVisitor.cpp b/src/Interpreters/ConvertStringsToEnumVisitor.cpp
index d35baa92900..7cc95dc521b 100644
--- a/src/Interpreters/ConvertStringsToEnumVisitor.cpp
+++ b/src/Interpreters/ConvertStringsToEnumVisitor.cpp
@@ -33,8 +33,8 @@ String makeStringsEnum(const std::set<String> & values)
 
 void changeIfArguments(ASTPtr & first, ASTPtr & second)
 {
-    String first_value = first->as<ASTLiteral>()->value.safeGet<String>();
-    String second_value = second->as<ASTLiteral>()->value.safeGet<String>();
+    String first_value = first->as<ASTLiteral>()->value.get<String>();
+    String second_value = second->as<ASTLiteral>()->value.get<String>();
 
     std::set<String> values;
     values.insert(first_value);
@@ -59,9 +59,9 @@ void changeTransformArguments(ASTPtr & array_to, ASTPtr & other)
 {
     std::set<String> values;
 
-    for (const auto & item : array_to->as<ASTLiteral>()->value.safeGet<Array>())
-        values.insert(item.safeGet<String>());
-    values.insert(other->as<ASTLiteral>()->value.safeGet<String>());
+    for (const auto & item : array_to->as<ASTLiteral>()->value.get<Array>())
+        values.insert(item.get<String>());
+    values.insert(other->as<ASTLiteral>()->value.get<String>());
 
     String enum_string = makeStringsEnum(values);
 
@@ -168,7 +168,7 @@ void ConvertStringsToEnumMatcher::visit(ASTFunction & function_node, Data & data
         if (literal_to->value.getTypeName() != "Array" || literal_other->value.getTypeName() != "String")
             return;
 
-        Array array_to = literal_to->value.safeGet<Array>();
+        Array array_to = literal_to->value.get<Array>();
         if (array_to.empty())
             return;
 
diff --git a/src/Interpreters/DDLTask.cpp b/src/Interpreters/DDLTask.cpp
index 6e08dd5e2cc..fa197d59c13 100644
--- a/src/Interpreters/DDLTask.cpp
+++ b/src/Interpreters/DDLTask.cpp
@@ -538,7 +538,7 @@ void DatabaseReplicatedTask::createSyncedNodeIfNeed(const ZooKeeperPtr & zookeep
 
     /// Bool type is really weird, sometimes it's Bool and sometimes it's UInt64...
     assert(value.getType() == Field::Types::Bool || value.getType() == Field::Types::UInt64);
-    if (!value.safeGet<UInt64>())
+    if (!value.get<UInt64>())
         return;
 
     zookeeper->createIfNotExists(getSyncedNodePath(), "");
diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index fb4fad85f66..bb2dd158710 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -19,8 +19,6 @@
 #include <IO/ReadHelpers.h>
 #include <Poco/DirectoryIterator.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <Core/ServerSettings.h>
-#include <IO/SharedThreadPools.h>
 #include <Common/Exception.h>
 #include <Common/quoteString.h>
 #include <Common/atomicRename.h>
@@ -50,6 +48,9 @@
 namespace CurrentMetrics
 {
     extern const Metric TablesToDropQueueSize;
+    extern const Metric DatabaseCatalogThreads;
+    extern const Metric DatabaseCatalogThreadsActive;
+    extern const Metric DatabaseCatalogThreadsScheduled;
 }
 
 namespace DB
@@ -188,6 +189,13 @@ StoragePtr TemporaryTableHolder::getTable() const
 
 void DatabaseCatalog::initializeAndLoadTemporaryDatabase()
 {
+    drop_delay_sec = getContext()->getConfigRef().getInt("database_atomic_delay_before_drop_table_sec", default_drop_delay_sec);
+    unused_dir_hide_timeout_sec = getContext()->getConfigRef().getInt64("database_catalog_unused_dir_hide_timeout_sec", unused_dir_hide_timeout_sec);
+    unused_dir_rm_timeout_sec = getContext()->getConfigRef().getInt64("database_catalog_unused_dir_rm_timeout_sec", unused_dir_rm_timeout_sec);
+    unused_dir_cleanup_period_sec = getContext()->getConfigRef().getInt64("database_catalog_unused_dir_cleanup_period_sec", unused_dir_cleanup_period_sec);
+    drop_error_cooldown_sec = getContext()->getConfigRef().getInt64("database_catalog_drop_error_cooldown_sec", drop_error_cooldown_sec);
+    drop_table_concurrency = getContext()->getConfigRef().getInt64("database_catalog_drop_table_concurrency", drop_table_concurrency);
+
     auto db_for_temporary_and_external_tables = std::make_shared<DatabaseMemory>(TEMPORARY_DATABASE, getContext());
     attachDatabase(TEMPORARY_DATABASE, db_for_temporary_and_external_tables);
 }
@@ -195,7 +203,7 @@ void DatabaseCatalog::initializeAndLoadTemporaryDatabase()
 void DatabaseCatalog::createBackgroundTasks()
 {
     /// It has to be done before databases are loaded (to avoid a race condition on initialization)
-    if (Context::getGlobalContextInstance()->getApplicationType() == Context::ApplicationType::SERVER && getContext()->getServerSettings().database_catalog_unused_dir_cleanup_period_sec)
+    if (Context::getGlobalContextInstance()->getApplicationType() == Context::ApplicationType::SERVER && unused_dir_cleanup_period_sec)
     {
         auto cleanup_task_holder
             = getContext()->getSchedulePool().createTask("DatabaseCatalogCleanupStoreDirectoryTask", [this]() { this->cleanupStoreDirectoryTask(); });
@@ -216,7 +224,7 @@ void DatabaseCatalog::startupBackgroundTasks()
     {
         (*cleanup_task)->activate();
         /// Do not start task immediately on server startup, it's not urgent.
-        (*cleanup_task)->scheduleAfter(static_cast<time_t>(getContext()->getServerSettings().database_catalog_unused_dir_hide_timeout_sec) * 1000);
+        (*cleanup_task)->scheduleAfter(unused_dir_hide_timeout_sec * 1000);
     }
 
     (*drop_task)->activate();
@@ -1030,12 +1038,15 @@ void DatabaseCatalog::loadMarkedAsDroppedTables()
 
     LOG_INFO(log, "Found {} partially dropped tables. Will load them and retry removal.", dropped_metadata.size());
 
-    ThreadPoolCallbackRunnerLocal<void> runner(getDatabaseCatalogDropTablesThreadPool().get(), "DropTables");
+    ThreadPool pool(CurrentMetrics::DatabaseCatalogThreads, CurrentMetrics::DatabaseCatalogThreadsActive, CurrentMetrics::DatabaseCatalogThreadsScheduled);
     for (const auto & elem : dropped_metadata)
     {
-        runner([this, &elem](){ this->enqueueDroppedTableCleanup(elem.second, nullptr, elem.first); });
+        pool.scheduleOrThrowOnError([&]()
+        {
+            this->enqueueDroppedTableCleanup(elem.second, nullptr, elem.first);
+        });
     }
-    runner.waitForAllToFinishAndRethrowFirstError();
+    pool.wait();
 }
 
 String DatabaseCatalog::getPathForDroppedMetadata(const StorageID & table_id) const
@@ -1124,13 +1135,7 @@ void DatabaseCatalog::enqueueDroppedTableCleanup(StorageID table_id, StoragePtr
     }
     else
     {
-        tables_marked_dropped.push_back
-        ({
-            table_id,
-            table,
-            dropped_metadata_path,
-            drop_time + static_cast<time_t>(getContext()->getServerSettings().database_atomic_delay_before_drop_table_sec)
-        });
+        tables_marked_dropped.push_back({table_id, table, dropped_metadata_path, drop_time + drop_delay_sec});
         if (first_async_drop_in_queue == tables_marked_dropped.end())
             --first_async_drop_in_queue;
     }
@@ -1284,7 +1289,13 @@ void DatabaseCatalog::dropTablesParallel(std::vector<DatabaseCatalog::TablesMark
     if (tables_to_drop.empty())
         return;
 
-    ThreadPoolCallbackRunnerLocal<void> runner(getDatabaseCatalogDropTablesThreadPool().get(), "DropTables");
+    ThreadPool pool(
+        CurrentMetrics::DatabaseCatalogThreads,
+        CurrentMetrics::DatabaseCatalogThreadsActive,
+        CurrentMetrics::DatabaseCatalogThreadsScheduled,
+        /* max_threads */drop_table_concurrency,
+        /* max_free_threads */0,
+        /* queue_size */tables_to_drop.size());
 
     for (const auto & item : tables_to_drop)
     {
@@ -1321,7 +1332,7 @@ void DatabaseCatalog::dropTablesParallel(std::vector<DatabaseCatalog::TablesMark
                         ++first_async_drop_in_queue;
 
                     tables_marked_dropped.splice(tables_marked_dropped.end(), tables_marked_dropped, table_iterator);
-                    table_iterator->drop_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()) + getContext()->getServerSettings().database_catalog_drop_error_cooldown_sec;
+                    table_iterator->drop_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()) + drop_error_cooldown_sec;
 
                     if (first_async_drop_in_queue == tables_marked_dropped.end())
                         --first_async_drop_in_queue;
@@ -1329,10 +1340,25 @@ void DatabaseCatalog::dropTablesParallel(std::vector<DatabaseCatalog::TablesMark
             }
         };
 
-        runner(std::move(job));
+        try
+        {
+            pool.scheduleOrThrowOnError(std::move(job));
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, "Cannot drop tables. Will retry later.");
+            break;
+        }
     }
 
-    runner.waitForAllToFinishAndRethrowFirstError();
+    try
+    {
+        pool.wait();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log, "Cannot drop tables. Will retry later.");
+    }
 }
 
 void DatabaseCatalog::dropTableDataTask()
@@ -1349,15 +1375,7 @@ void DatabaseCatalog::dropTableDataTask()
         LOG_INFO(log, "Have {} tables in drop queue ({} of them are in use), will try drop {} tables",
             drop_tables_count, drop_tables_in_use_count, tables_to_drop.size());
 
-        try
-        {
-            dropTablesParallel(tables_to_drop);
-        }
-        catch (...)
-        {
-            /// We don't re-throw exception, because we are in a background pool.
-            tryLogCurrentException(log, "Cannot drop tables. Will retry later.");
-        }
+        dropTablesParallel(tables_to_drop);
     }
 
     rescheduleDropTableTask();
@@ -1407,10 +1425,7 @@ void DatabaseCatalog::waitTableFinallyDropped(const UUID & uuid)
     });
 
     /// TSA doesn't support unique_lock
-    const bool has_table = TSA_SUPPRESS_WARNING_FOR_READ(tables_marked_dropped_ids).contains(uuid);
-    LOG_DEBUG(log, "Done waiting for the table {} to be dropped. The outcome: {}", toString(uuid), has_table ? "table still exists" : "table dropped successfully");
-
-    if (has_table)
+    if (TSA_SUPPRESS_WARNING_FOR_READ(tables_marked_dropped_ids).contains(uuid))
         throw Exception(ErrorCodes::UNFINISHED, "Did not finish dropping the table with UUID {} because the server is shutting down, "
                                                 "will finish after restart", uuid);
 }
@@ -1703,7 +1718,7 @@ void DatabaseCatalog::cleanupStoreDirectoryTask()
             LOG_TEST(log, "Nothing to clean up from store/ on disk {}", disk_name);
     }
 
-    (*cleanup_task)->scheduleAfter(static_cast<time_t>(getContext()->getServerSettings().database_catalog_unused_dir_cleanup_period_sec) * 1000);
+    (*cleanup_task)->scheduleAfter(unused_dir_cleanup_period_sec * 1000);
 }
 
 bool DatabaseCatalog::maybeRemoveDirectory(const String & disk_name, const DiskPtr & disk, const String & unused_dir)
@@ -1727,7 +1742,7 @@ bool DatabaseCatalog::maybeRemoveDirectory(const String & disk_name, const DiskP
         time_t current_time = time(nullptr);
         if (st.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO))
         {
-            if (current_time <= max_modification_time + static_cast<time_t>(getContext()->getServerSettings().database_catalog_unused_dir_hide_timeout_sec))
+            if (current_time <= max_modification_time + unused_dir_hide_timeout_sec)
                 return false;
 
             LOG_INFO(log, "Removing access rights for unused directory {} from disk {} (will remove it when timeout exceed)", unused_dir, disk_name);
@@ -1743,8 +1758,6 @@ bool DatabaseCatalog::maybeRemoveDirectory(const String & disk_name, const DiskP
         }
         else
         {
-            auto unused_dir_rm_timeout_sec = static_cast<time_t>(getContext()->getServerSettings().database_catalog_unused_dir_rm_timeout_sec);
-
             if (!unused_dir_rm_timeout_sec)
                 return false;
 
diff --git a/src/Interpreters/DatabaseCatalog.h b/src/Interpreters/DatabaseCatalog.h
index 83a302f117d..23e38a6445e 100644
--- a/src/Interpreters/DatabaseCatalog.h
+++ b/src/Interpreters/DatabaseCatalog.h
@@ -354,8 +354,23 @@ private:
     mutable std::mutex tables_marked_dropped_mutex;
 
     std::unique_ptr<BackgroundSchedulePoolTaskHolder> drop_task;
+    static constexpr time_t default_drop_delay_sec = 8 * 60;
+    time_t drop_delay_sec = default_drop_delay_sec;
     std::condition_variable wait_table_finally_dropped;
+
     std::unique_ptr<BackgroundSchedulePoolTaskHolder> cleanup_task;
+    static constexpr time_t default_unused_dir_hide_timeout_sec = 60 * 60;              /// 1 hour
+    time_t unused_dir_hide_timeout_sec = default_unused_dir_hide_timeout_sec;
+    static constexpr time_t default_unused_dir_rm_timeout_sec = 30 * 24 * 60 * 60;      /// 30 days
+    time_t unused_dir_rm_timeout_sec = default_unused_dir_rm_timeout_sec;
+    static constexpr time_t default_unused_dir_cleanup_period_sec = 24 * 60 * 60;       /// 1 day
+    time_t unused_dir_cleanup_period_sec = default_unused_dir_cleanup_period_sec;
+
+    static constexpr time_t default_drop_error_cooldown_sec = 5;
+    time_t drop_error_cooldown_sec = default_drop_error_cooldown_sec;
+
+    static constexpr size_t default_drop_table_concurrency = 10;
+    size_t drop_table_concurrency = default_drop_table_concurrency;
 
     std::unique_ptr<BackgroundSchedulePoolTaskHolder> reload_disks_task;
     std::mutex reload_disks_mutex;
diff --git a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
index 1ca8c40460c..4bd1c47d5a0 100644
--- a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
+++ b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
@@ -74,7 +74,7 @@ void ExecuteScalarSubqueriesMatcher::visit(ASTPtr & ast, Data & data)
 static auto getQueryInterpreter(const ASTSubquery & subquery, ExecuteScalarSubqueriesMatcher::Data & data)
 {
     auto subquery_context = Context::createCopy(data.getContext());
-    Settings subquery_settings = data.getContext()->getSettingsCopy();
+    Settings subquery_settings = data.getContext()->getSettings();
     subquery_settings.max_result_rows = 1;
     subquery_settings.extremes = false;
     subquery_context->setSettings(subquery_settings);
diff --git a/src/Interpreters/ExpressionActions.cpp b/src/Interpreters/ExpressionActions.cpp
index 4c313b3c9a8..8993830af14 100644
--- a/src/Interpreters/ExpressionActions.cpp
+++ b/src/Interpreters/ExpressionActions.cpp
@@ -49,17 +49,18 @@ namespace ErrorCodes
 
 static std::unordered_set<const ActionsDAG::Node *> processShortCircuitFunctions(const ActionsDAG & actions_dag, ShortCircuitFunctionEvaluation short_circuit_function_evaluation);
 
-ExpressionActions::ExpressionActions(ActionsDAG actions_dag_, const ExpressionActionsSettings & settings_, bool project_inputs_)
-    : actions_dag(std::move(actions_dag_))
-    , project_inputs(project_inputs_)
+ExpressionActions::ExpressionActions(ActionsDAGPtr actions_dag_, const ExpressionActionsSettings & settings_, bool project_inputs_)
+    : project_inputs(project_inputs_)
     , settings(settings_)
 {
+    actions_dag = actions_dag_->clone();
+
     /// It's important to determine lazy executed nodes before compiling expressions.
-    std::unordered_set<const ActionsDAG::Node *> lazy_executed_nodes = processShortCircuitFunctions(actions_dag, settings.short_circuit_function_evaluation);
+    std::unordered_set<const ActionsDAG::Node *> lazy_executed_nodes = processShortCircuitFunctions(*actions_dag, settings.short_circuit_function_evaluation);
 
 #if USE_EMBEDDED_COMPILER
     if (settings.can_compile_expressions && settings.compile_expressions == CompileExpressions::yes)
-        actions_dag.compileExpressions(settings.min_count_to_compile_expression, lazy_executed_nodes);
+        actions_dag->compileExpressions(settings.min_count_to_compile_expression, lazy_executed_nodes);
 #endif
 
     linearizeActions(lazy_executed_nodes);
@@ -67,32 +68,12 @@ ExpressionActions::ExpressionActions(ActionsDAG actions_dag_, const ExpressionAc
     if (settings.max_temporary_columns && num_columns > settings.max_temporary_columns)
         throw Exception(ErrorCodes::TOO_MANY_TEMPORARY_COLUMNS,
                         "Too many temporary columns: {}. Maximum: {}",
-                        actions_dag.dumpNames(), settings.max_temporary_columns);
+                        actions_dag->dumpNames(), settings.max_temporary_columns);
 }
 
 ExpressionActionsPtr ExpressionActions::clone() const
 {
-    auto copy = std::make_shared<ExpressionActions>(ExpressionActions());
-
-    std::unordered_map<const Node *, Node *> copy_map;
-    copy->actions_dag = actions_dag.clone(copy_map);
-    copy->actions = actions;
-    for (auto & action : copy->actions)
-        action.node = copy_map[action.node];
-
-    for (const auto * input : copy->actions_dag.getInputs())
-        copy->input_positions.emplace(input->result_name, input_positions.at(input->result_name));
-
-    copy->num_columns = num_columns;
-
-    copy->required_columns = required_columns;
-    copy->result_positions = result_positions;
-    copy->sample_block = sample_block;
-
-    copy->project_inputs = project_inputs;
-    copy->settings = settings;
-
-    return copy;
+    return std::make_shared<ExpressionActions>(*this);
 }
 
 namespace
@@ -356,8 +337,8 @@ void ExpressionActions::linearizeActions(const std::unordered_set<const ActionsD
     };
 
     const auto & nodes = getNodes();
-    const auto & outputs = actions_dag.getOutputs();
-    const auto & inputs = actions_dag.getInputs();
+    const auto & outputs = actions_dag->getOutputs();
+    const auto & inputs = actions_dag->getInputs();
 
     auto reverse_info = getActionsDAGReverseInfo(nodes, outputs);
     std::vector<Data> data;
diff --git a/src/Interpreters/ExpressionActions.h b/src/Interpreters/ExpressionActions.h
index 7652fe49eab..ddffe022215 100644
--- a/src/Interpreters/ExpressionActions.h
+++ b/src/Interpreters/ExpressionActions.h
@@ -70,7 +70,7 @@ public:
     using NameToInputMap = std::unordered_map<std::string_view, std::list<size_t>>;
 
 private:
-    ActionsDAG actions_dag;
+    ActionsDAGPtr actions_dag;
     Actions actions;
     size_t num_columns = 0;
 
@@ -84,13 +84,14 @@ private:
     ExpressionActionsSettings settings;
 
 public:
-    explicit ExpressionActions(ActionsDAG actions_dag_, const ExpressionActionsSettings & settings_ = {}, bool project_inputs_ = false);
-    ExpressionActions(ExpressionActions &&) = default;
-    ExpressionActions & operator=(ExpressionActions &&) = default;
+    ExpressionActions() = delete;
+    explicit ExpressionActions(ActionsDAGPtr actions_dag_, const ExpressionActionsSettings & settings_ = {}, bool project_inputs_ = false);
+    ExpressionActions(const ExpressionActions &) = default;
+    ExpressionActions & operator=(const ExpressionActions &) = default;
 
     const Actions & getActions() const { return actions; }
-    const std::list<Node> & getNodes() const { return actions_dag.getNodes(); }
-    const ActionsDAG & getActionsDAG() const { return actions_dag; }
+    const std::list<Node> & getNodes() const { return actions_dag->getNodes(); }
+    const ActionsDAG & getActionsDAG() const { return *actions_dag; }
     const ColumnNumbers & getResultPositions() const { return result_positions; }
     const ExpressionActionsSettings & getSettings() const { return settings; }
 
@@ -102,7 +103,7 @@ public:
     ///
     /// @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 (filterBlockWithExpression()), because they just
+    /// 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;
@@ -130,7 +131,6 @@ public:
     ExpressionActionsPtr clone() const;
 
 private:
-    ExpressionActions() = default;
     void checkLimits(const ColumnsWithTypeAndName & columns) const;
 
     void linearizeActions(const std::unordered_set<const Node *> & lazy_executed_nodes);
diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index 7063b2162a0..31090070742 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -172,7 +172,7 @@ ExpressionAnalyzer::ExpressionAnalyzer(
     PreparedSetsPtr prepared_sets_,
     bool is_create_parameterized_view_)
     : WithContext(context_)
-    , query(query_), settings(getContext()->getSettingsRef())
+    , query(query_), settings(getContext()->getSettings())
     , subquery_depth(subquery_depth_)
     , syntax(syntax_analyzer_result_)
     , is_create_parameterized_view(is_create_parameterized_view_)
@@ -660,7 +660,7 @@ void ExpressionAnalyzer::makeWindowDescriptionFromAST(const Context & context_,
                     with_alias->getColumnName(), 1 /* direction */,
                     1 /* nulls_direction */));
 
-            auto actions_dag = std::make_unique<ActionsDAG>(aggregated_columns);
+            auto actions_dag = std::make_shared<ActionsDAG>(aggregated_columns);
             getRootActions(column_ast, false, *actions_dag);
             desc.partition_by_actions.push_back(std::move(actions_dag));
         }
@@ -681,7 +681,7 @@ void ExpressionAnalyzer::makeWindowDescriptionFromAST(const Context & context_,
                     order_by_element.direction,
                     order_by_element.nulls_direction));
 
-            auto actions_dag = std::make_unique<ActionsDAG>(aggregated_columns);
+            auto actions_dag = std::make_shared<ActionsDAG>(aggregated_columns);
             getRootActions(column_ast, false, *actions_dag);
             desc.order_by_actions.push_back(std::move(actions_dag));
         }
@@ -839,14 +839,13 @@ void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAG & actions)
             makeWindowDescriptionFromAST(*current_context, window_descriptions,
                 window_function.aggregate_function, desc, &definition);
 
-            auto full_sort_description = desc.full_sort_description;
-
             auto [it, inserted] = window_descriptions.insert(
                 {desc.window_name, std::move(desc)});
 
             if (!inserted)
             {
-                assert(it->second.full_sort_description == full_sort_description);
+                assert(it->second.full_sort_description
+                    == desc.full_sort_description);
             }
 
             it->second.window_functions.push_back(window_function);
@@ -944,7 +943,7 @@ JoinPtr SelectQueryExpressionAnalyzer::appendJoin(
 {
     const ColumnsWithTypeAndName & left_sample_columns = chain.getLastStep().getResultColumns();
 
-    std::optional<ActionsDAG> converting_actions;
+    ActionsDAGPtr converting_actions;
     JoinPtr join = makeJoin(*syntax->ast_join, left_sample_columns, converting_actions);
 
     if (converting_actions)
@@ -1000,7 +999,7 @@ static std::shared_ptr<IJoin> tryCreateJoin(
         algorithm == JoinAlgorithm::PARALLEL_HASH ||
         algorithm == JoinAlgorithm::DEFAULT)
     {
-        const auto & settings = context->getSettingsRef();
+        const auto & settings = context->getSettings();
 
         if (analyzed_join->allowParallelHashJoin())
             return std::make_shared<ConcurrentHashJoin>(
@@ -1056,7 +1055,7 @@ static std::unique_ptr<QueryPlan> buildJoinedPlan(
     /// Actions which need to be calculated on joined block.
     auto joined_block_actions = analyzed_join.createJoinedBlockActions(context);
     NamesWithAliases required_columns_with_aliases = analyzed_join.getRequiredColumns(
-        Block(joined_block_actions.getResultColumns()), joined_block_actions.getRequiredColumns().getNames());
+        Block(joined_block_actions->getResultColumns()), joined_block_actions->getRequiredColumns().getNames());
 
     Names original_right_column_names;
     for (auto & pr : required_columns_with_aliases)
@@ -1077,17 +1076,17 @@ static std::unique_ptr<QueryPlan> buildJoinedPlan(
     interpreter->buildQueryPlan(*joined_plan);
     {
         Block original_right_columns = interpreter->getSampleBlock();
-        ActionsDAG rename_dag(original_right_columns.getColumnsWithTypeAndName());
+        auto rename_dag = std::make_unique<ActionsDAG>(original_right_columns.getColumnsWithTypeAndName());
         for (const auto & name_with_alias : required_columns_with_aliases)
         {
             if (name_with_alias.first != name_with_alias.second && original_right_columns.has(name_with_alias.first))
             {
                 auto pos = original_right_columns.getPositionByName(name_with_alias.first);
-                const auto & alias = rename_dag.addAlias(*rename_dag.getInputs()[pos], name_with_alias.second);
-                rename_dag.getOutputs()[pos] = &alias;
+                const auto & alias = rename_dag->addAlias(*rename_dag->getInputs()[pos], name_with_alias.second);
+                rename_dag->getOutputs()[pos] = &alias;
             }
         }
-        rename_dag.appendInputsForUnusedColumns(joined_plan->getCurrentDataStream().header);
+        rename_dag->appendInputsForUnusedColumns(joined_plan->getCurrentDataStream().header);
         auto rename_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), std::move(rename_dag));
         rename_step->setStepDescription("Rename joined columns");
         joined_plan->addStep(std::move(rename_step));
@@ -1147,14 +1146,14 @@ std::shared_ptr<DirectKeyValueJoin> tryKeyValueJoin(std::shared_ptr<TableJoin> a
 JoinPtr SelectQueryExpressionAnalyzer::makeJoin(
     const ASTTablesInSelectQueryElement & join_element,
     const ColumnsWithTypeAndName & left_columns,
-    std::optional<ActionsDAG> & left_convert_actions)
+    ActionsDAGPtr & left_convert_actions)
 {
     /// Two JOINs are not supported with the same subquery, but different USINGs.
 
     if (joined_plan)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Table join was already created for query");
 
-    std::optional<ActionsDAG> right_convert_actions;
+    ActionsDAGPtr right_convert_actions = nullptr;
 
     const auto & analyzed_join = syntax->analyzed_join;
 
@@ -1162,7 +1161,7 @@ JoinPtr SelectQueryExpressionAnalyzer::makeJoin(
     {
         auto joined_block_actions = analyzed_join->createJoinedBlockActions(getContext());
         NamesWithAliases required_columns_with_aliases = analyzed_join->getRequiredColumns(
-            Block(joined_block_actions.getResultColumns()), joined_block_actions.getRequiredColumns().getNames());
+            Block(joined_block_actions->getResultColumns()), joined_block_actions->getRequiredColumns().getNames());
 
         Names original_right_column_names;
         for (auto & pr : required_columns_with_aliases)
@@ -1179,7 +1178,7 @@ JoinPtr SelectQueryExpressionAnalyzer::makeJoin(
     std::tie(left_convert_actions, right_convert_actions) = analyzed_join->createConvertingActions(left_columns, right_columns);
     if (right_convert_actions)
     {
-        auto converting_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), std::move(*right_convert_actions));
+        auto converting_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), right_convert_actions);
         converting_step->setStepDescription("Convert joined columns");
         joined_plan->addStep(std::move(converting_step));
     }
@@ -1371,10 +1370,10 @@ bool SelectQueryExpressionAnalyzer::appendGroupBy(ExpressionActionsChain & chain
     {
         for (auto & child : asts)
         {
-            ActionsDAG actions_dag(columns_after_join);
-            getRootActions(child, only_types, actions_dag);
+            auto actions_dag = std::make_shared<ActionsDAG>(columns_after_join);
+            getRootActions(child, only_types, *actions_dag);
             group_by_elements_actions.emplace_back(
-                std::make_shared<ExpressionActions>(std::move(actions_dag), ExpressionActionsSettings::fromContext(getContext(), CompileExpressions::yes)));
+                std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(getContext(), CompileExpressions::yes)));
         }
     }
 
@@ -1488,7 +1487,7 @@ void SelectQueryExpressionAnalyzer::appendGroupByModifiers(ActionsDAG & before_a
     ExpressionActionsChain::Step & step = chain.addStep(before_aggregation.getNamesAndTypesList());
     step.required_output = std::move(required_output);
 
-    step.actions()->dag = ActionsDAG::makeConvertingActions(source_columns, result_columns, ActionsDAG::MatchColumnsMode::Position);
+    step.actions()->dag = std::move(*ActionsDAG::makeConvertingActions(source_columns, result_columns, ActionsDAG::MatchColumnsMode::Position));
 }
 
 void SelectQueryExpressionAnalyzer::appendSelectSkipWindowExpressions(ExpressionActionsChain::Step & step, ASTPtr const & node)
@@ -1624,10 +1623,10 @@ ActionsAndProjectInputsFlagPtr SelectQueryExpressionAnalyzer::appendOrderBy(Expr
     {
         for (const auto & child : select_query->orderBy()->children)
         {
-            ActionsDAG actions_dag(columns_after_join);
-            getRootActions(child, only_types, actions_dag);
+            auto actions_dag = std::make_shared<ActionsDAG>(columns_after_join);
+            getRootActions(child, only_types, *actions_dag);
             order_by_elements_actions.emplace_back(
-                std::make_shared<ExpressionActions>(std::move(actions_dag), ExpressionActionsSettings::fromContext(getContext(), CompileExpressions::yes)));
+                std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(getContext(), CompileExpressions::yes)));
         }
     }
 
@@ -1754,7 +1753,7 @@ void ExpressionAnalyzer::appendExpression(ExpressionActionsChain & chain, const
     step.addRequiredOutput(expr->getColumnName());
 }
 
-ActionsDAG ExpressionAnalyzer::getActionsDAG(bool add_aliases, bool remove_unused_result)
+ActionsDAGPtr ExpressionAnalyzer::getActionsDAG(bool add_aliases, bool remove_unused_result)
 {
     ActionsDAG actions_dag(aggregated_columns);
     NamesWithAliases result_columns;
@@ -1806,7 +1805,7 @@ ActionsDAG ExpressionAnalyzer::getActionsDAG(bool add_aliases, bool remove_unuse
         actions_dag.removeUnusedActions(name_set);
     }
 
-    return actions_dag;
+    return std::make_unique<ActionsDAG>(std::move(actions_dag));
 }
 
 ExpressionActionsPtr ExpressionAnalyzer::getActions(bool add_aliases, bool remove_unused_result, CompileExpressions compile_expressions)
@@ -1815,17 +1814,17 @@ ExpressionActionsPtr ExpressionAnalyzer::getActions(bool add_aliases, bool remov
         getActionsDAG(add_aliases, remove_unused_result), ExpressionActionsSettings::fromContext(getContext(), compile_expressions), add_aliases && remove_unused_result);
 }
 
-ActionsDAG ExpressionAnalyzer::getConstActionsDAG(const ColumnsWithTypeAndName & constant_inputs)
+ActionsDAGPtr ExpressionAnalyzer::getConstActionsDAG(const ColumnsWithTypeAndName & constant_inputs)
 {
-    ActionsDAG actions(constant_inputs);
-    getRootActions(query, true /* no_makeset_for_subqueries */, actions, true /* only_consts */);
+    auto actions = std::make_shared<ActionsDAG>(constant_inputs);
+    getRootActions(query, true /* no_makeset_for_subqueries */, *actions, true /* only_consts */);
     return actions;
 }
 
 ExpressionActionsPtr ExpressionAnalyzer::getConstActions(const ColumnsWithTypeAndName & constant_inputs)
 {
     auto actions = getConstActionsDAG(constant_inputs);
-    return std::make_shared<ExpressionActions>(std::move(actions), ExpressionActionsSettings::fromContext(getContext()));
+    return std::make_shared<ExpressionActions>(actions, ExpressionActionsSettings::fromContext(getContext()));
 }
 
 std::unique_ptr<QueryPlan> SelectQueryExpressionAnalyzer::getJoinedPlan()
@@ -1896,7 +1895,8 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
 
         if (prewhere_dag_and_flags)
         {
-            prewhere_info = std::make_shared<PrewhereInfo>(std::move(prewhere_dag_and_flags->dag), query.prewhere()->getColumnName());
+            auto dag = std::make_shared<ActionsDAG>(std::move(prewhere_dag_and_flags->dag));
+            prewhere_info = std::make_shared<PrewhereInfo>(std::move(dag), query.prewhere()->getColumnName());
             prewhere_dag_and_flags.reset();
         }
 
@@ -1939,7 +1939,7 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
 
         if (storage && additional_filter)
         {
-            Names columns_for_additional_filter = additional_filter->actions.getRequiredColumnsNames();
+            Names columns_for_additional_filter = additional_filter->actions->getRequiredColumnsNames();
             additional_required_columns_after_prewhere.insert(additional_required_columns_after_prewhere.end(),
                 columns_for_additional_filter.begin(), columns_for_additional_filter.end());
         }
@@ -1960,7 +1960,10 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
                 Block before_prewhere_sample = source_header;
                 if (sanitizeBlock(before_prewhere_sample))
                 {
-                    before_prewhere_sample = prewhere_dag_and_flags->dag.updateHeader(before_prewhere_sample);
+                    auto dag = prewhere_dag_and_flags->dag.clone();
+                    ExpressionActions(
+                        dag,
+                        ExpressionActionsSettings::fromSettings(context->getSettingsRef())).execute(before_prewhere_sample);
                     auto & column_elem = before_prewhere_sample.getByName(query.prewhere()->getColumnName());
                     /// If the filter column is a constant, record it.
                     if (column_elem.column)
@@ -1992,7 +1995,9 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
                     before_where_sample = source_header;
                 if (sanitizeBlock(before_where_sample))
                 {
-                    before_where_sample = before_where->dag.updateHeader(before_where_sample);
+                    ExpressionActions(
+                        before_where->dag.clone(),
+                        ExpressionActionsSettings::fromSettings(context->getSettingsRef())).execute(before_where_sample);
 
                     auto & column_elem
                         = before_where_sample.getByName(query.where()->getColumnName());
@@ -2065,7 +2070,7 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
 
                     auto & step = chain.lastStep(query_analyzer.aggregated_columns);
                     auto & actions = step.actions()->dag;
-                    actions = ActionsDAG::merge(std::move(actions), std::move(converting));
+                    actions = std::move(*ActionsDAG::merge(std::move(actions), std::move(*converting)));
                 }
             }
 
@@ -2246,11 +2251,12 @@ void ExpressionAnalysisResult::checkActions() const
     /// Check that PREWHERE doesn't contain unusual actions. Unusual actions are that can change number of rows.
     if (hasPrewhere())
     {
-        auto check_actions = [](ActionsDAG & actions)
+        auto check_actions = [](const ActionsDAGPtr & actions)
         {
-            for (const auto & node : actions.getNodes())
-                if (node.type == ActionsDAG::ActionType::ARRAY_JOIN)
-                    throw Exception(ErrorCodes::ILLEGAL_PREWHERE, "PREWHERE cannot contain ARRAY JOIN action");
+            if (actions)
+                for (const auto & node : actions->getNodes())
+                    if (node.type == ActionsDAG::ActionType::ARRAY_JOIN)
+                        throw Exception(ErrorCodes::ILLEGAL_PREWHERE, "PREWHERE cannot contain ARRAY JOIN action");
         };
 
         check_actions(prewhere_info->prewhere_actions);
diff --git a/src/Interpreters/ExpressionAnalyzer.h b/src/Interpreters/ExpressionAnalyzer.h
index dc038e10594..ff3f185bea9 100644
--- a/src/Interpreters/ExpressionAnalyzer.h
+++ b/src/Interpreters/ExpressionAnalyzer.h
@@ -38,6 +38,9 @@ using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
 class ArrayJoinAction;
 using ArrayJoinActionPtr = std::shared_ptr<ArrayJoinAction>;
 
+class ActionsDAG;
+using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
+
 /// Create columns in block or return false if not possible
 bool sanitizeBlock(Block & block, bool throw_if_cannot_create_column = false);
 
@@ -114,12 +117,12 @@ public:
     /// If add_aliases, only the calculated values in the desired order and add aliases.
     ///     If also remove_unused_result, than only aliases remain in the output block.
     /// Otherwise, only temporary columns will be deleted from the block.
-    ActionsDAG getActionsDAG(bool add_aliases, bool remove_unused_result = true);
+    ActionsDAGPtr getActionsDAG(bool add_aliases, bool remove_unused_result = true);
     ExpressionActionsPtr getActions(bool add_aliases, bool remove_unused_result = true, CompileExpressions compile_expressions = CompileExpressions::no);
 
     /// Get actions to evaluate a constant expression. The function adds constants and applies functions that depend only on constants.
     /// Does not execute subqueries.
-    ActionsDAG getConstActionsDAG(const ColumnsWithTypeAndName & constant_inputs = {});
+    ActionsDAGPtr getConstActionsDAG(const ColumnsWithTypeAndName & constant_inputs = {});
     ExpressionActionsPtr getConstActions(const ColumnsWithTypeAndName & constant_inputs = {});
 
     /** Sets that require a subquery to be create.
@@ -369,7 +372,7 @@ private:
     JoinPtr makeJoin(
         const ASTTablesInSelectQueryElement & join_element,
         const ColumnsWithTypeAndName & left_columns,
-        std::optional<ActionsDAG> & left_convert_actions);
+        ActionsDAGPtr & left_convert_actions);
 
     const ASTSelectQuery * getAggregatingQuery() const;
 
diff --git a/src/Interpreters/ExternalLoader.cpp b/src/Interpreters/ExternalLoader.cpp
index 511300be2e0..96405f35f3f 100644
--- a/src/Interpreters/ExternalLoader.cpp
+++ b/src/Interpreters/ExternalLoader.cpp
@@ -922,16 +922,7 @@ private:
         if (enable_async_loading)
         {
             /// Put a job to the thread pool for the loading.
-            ThreadFromGlobalPool thread;
-            try
-            {
-                thread = ThreadFromGlobalPool{&LoadingDispatcher::doLoading, this, info.name, loading_id, forced_to_reload, min_id_to_finish_loading_dependencies_, true, CurrentThread::getGroup()};
-            }
-            catch (...)
-            {
-                cancelLoading(info);
-                throw;
-            }
+            auto thread = ThreadFromGlobalPool{&LoadingDispatcher::doLoading, this, info.name, loading_id, forced_to_reload, min_id_to_finish_loading_dependencies_, true, CurrentThread::getGroup()};
             loading_threads.try_emplace(loading_id, std::move(thread));
         }
         else
diff --git a/src/Interpreters/GlobalSubqueriesVisitor.h b/src/Interpreters/GlobalSubqueriesVisitor.h
index b1745ea8956..986134a6998 100644
--- a/src/Interpreters/GlobalSubqueriesVisitor.h
+++ b/src/Interpreters/GlobalSubqueriesVisitor.h
@@ -296,7 +296,7 @@ private:
             {
                 auto joined_block_actions = data.table_join->createJoinedBlockActions(data.getContext());
                 NamesWithAliases required_columns_with_aliases = data.table_join->getRequiredColumns(
-                    Block(joined_block_actions.getResultColumns()), joined_block_actions.getRequiredColumns().getNames());
+                    Block(joined_block_actions->getResultColumns()), joined_block_actions->getRequiredColumns().getNames());
 
                 for (auto & pr : required_columns_with_aliases)
                     required_columns.push_back(pr.first);
diff --git a/src/Interpreters/HashJoin/AddedColumns.cpp b/src/Interpreters/HashJoin/AddedColumns.cpp
index 2e1ecb0da72..930a352744d 100644
--- a/src/Interpreters/HashJoin/AddedColumns.cpp
+++ b/src/Interpreters/HashJoin/AddedColumns.cpp
@@ -15,132 +15,48 @@ JoinOnKeyColumns::JoinOnKeyColumns(const Block & block, const Names & key_names_
 {
 }
 
-template<>
-void AddedColumns<false>::buildOutput() {}
-
-template<>
-void AddedColumns<false>::buildJoinGetOutput() {}
-
-template<>
-template<bool from_row_list>
-void AddedColumns<false>::buildOutputFromBlocks() {}
+template<> void AddedColumns<false>::buildOutput()
+{
+}
 
 template<>
 void AddedColumns<true>::buildOutput()
-{
-    if (!output_by_row_list)
-        buildOutputFromBlocks<false>();
-    else
-    {
-        if (join_data_avg_perkey_rows < output_by_row_list_threshold)
-            buildOutputFromBlocks<true>();
-        else if (join_data_sorted)
-        {
-            for (size_t i = 0; i < this->size(); ++i)
-            {
-                auto & col = columns[i];
-                for (auto row_ref_i : lazy_output.row_refs)
-                {
-                    if (row_ref_i)
-                    {
-                        const RowRefList * row_ref_list = reinterpret_cast<const RowRefList *>(row_ref_i);
-                        col->insertRangeFrom(*row_ref_list->block->getByPosition(right_indexes[i]).column, row_ref_list->row_num, row_ref_list->rows);
-                    }
-                    else
-                        type_name[i].type->insertDefaultInto(*col);
-                }
-            }
-        }
-        else
-        {
-            for (size_t i = 0; i < this->size(); ++i)
-            {
-                auto & col = columns[i];
-                for (auto row_ref_i : lazy_output.row_refs)
-                {
-                    if (row_ref_i)
-                    {
-                        const RowRefList * row_ref_list = reinterpret_cast<const RowRefList *>(row_ref_i);
-                        for (auto it = row_ref_list->begin(); it.ok(); ++it)
-                            col->insertFrom(*it->block->getByPosition(right_indexes[i]).column, it->row_num);
-                    }
-                    else
-                        type_name[i].type->insertDefaultInto(*col);
-                }
-            }
-        }
-    }
-}
-
-template<>
-void AddedColumns<true>::buildJoinGetOutput()
 {
     for (size_t i = 0; i < this->size(); ++i)
     {
-        auto & col = columns[i];
-        for (auto row_ref_i : lazy_output.row_refs)
+        auto& col = columns[i];
+        size_t default_count = 0;
+        auto apply_default = [&]()
         {
-            if (!row_ref_i)
+            if (default_count > 0)
             {
-                type_name[i].type->insertDefaultInto(*col);
+                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;
             }
-            const auto * row_ref = reinterpret_cast<const RowRef *>(row_ref_i);
-            const auto & column_from_block = row_ref->block->getByPosition(right_indexes[i]);
-            if (auto * nullable_col = typeid_cast<ColumnNullable *>(col.get()); nullable_col && !column_from_block.column->isNullable())
-                nullable_col->insertFromNotNullable(*column_from_block.column, row_ref->row_num);
-            else
-                col->insertFrom(*column_from_block.column, row_ref->row_num);
-        }
-    }
-}
-
-template<>
-template<bool from_row_list>
-void AddedColumns<true>::buildOutputFromBlocks()
-{
-    if (this->size() == 0)
-        return;
-    std::vector<const Block *> blocks;
-    std::vector<UInt32> row_nums;
-    blocks.reserve(lazy_output.row_refs.size());
-    row_nums.reserve(lazy_output.row_refs.size());
-    for (auto row_ref_i : lazy_output.row_refs)
-    {
-        if (row_ref_i)
-        {
-            if constexpr (from_row_list)
+            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)
             {
-                const RowRefList * row_ref_list = reinterpret_cast<const RowRefList *>(row_ref_i);
-                for (auto it = row_ref_list->begin(); it.ok(); ++it)
+                if (auto * nullable_col = typeid_cast<ColumnNullable *>(col.get());
+                    nullable_col && !column_from_block.column->isNullable())
                 {
-                    blocks.emplace_back(it->block);
-                    row_nums.emplace_back(it->row_num);
+                    nullable_col->insertFromNotNullable(*column_from_block.column, lazy_output.row_nums[j]);
+                    continue;
                 }
             }
-            else
-            {
-                const RowRef * row_ref = reinterpret_cast<const RowRefList *>(row_ref_i);
-                blocks.emplace_back(row_ref->block);
-                row_nums.emplace_back(row_ref->row_num);
-            }
-        }
-        else
-        {
-            blocks.emplace_back(nullptr);
-            row_nums.emplace_back(0);
-        }
-    }
-    for (size_t i = 0; i < this->size(); ++i)
-    {
-        auto & col = columns[i];
-        for (size_t j = 0; j < blocks.size(); ++j)
-        {
-            if (blocks[j])
-                col->insertFrom(*blocks[j]->getByPosition(right_indexes[i]).column, row_nums[j]);
-            else
-                type_name[i].type->insertDefaultInto(*col);
+            col->insertFrom(*column_from_block.column, lazy_output.row_nums[j]);
         }
+        apply_default();
     }
 }
 
@@ -156,27 +72,29 @@ void AddedColumns<false>::applyLazyDefaults()
 }
 
 template<>
-void AddedColumns<true>::applyLazyDefaults() {}
+void AddedColumns<true>::applyLazyDefaults()
+{
+}
 
 template <>
-void AddedColumns<false>::appendFromBlock(const RowRef * row_ref, const bool has_defaults)
+void AddedColumns<false>::appendFromBlock(const Block & block, size_t row_num,const bool has_defaults)
 {
     if (has_defaults)
         applyLazyDefaults();
 
 #ifndef NDEBUG
-    checkBlock(*row_ref->block);
+    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 = row_ref->block->getByPosition(right_indexes[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_ref->row_num);
+                nullable_col->insertFromNotNullable(*column_from_block.column, row_num);
             else
-                columns[j]->insertFrom(*column_from_block.column, row_ref->row_num);
+                columns[j]->insertFrom(*column_from_block.column, row_num);
         }
     }
     else
@@ -184,21 +102,22 @@ void AddedColumns<false>::appendFromBlock(const RowRef * row_ref, const bool has
         size_t right_indexes_size = right_indexes.size();
         for (size_t j = 0; j < right_indexes_size; ++j)
         {
-            const auto & column_from_block = row_ref->block->getByPosition(right_indexes[j]);
-            columns[j]->insertFrom(*column_from_block.column, row_ref->row_num);
+            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 RowRef * row_ref, bool)
+void AddedColumns<true>::appendFromBlock(const Block & block, size_t row_num, bool)
 {
 #ifndef NDEBUG
-    checkBlock(*row_ref->block);
+    checkBlock(block);
 #endif
     if (has_columns_to_add)
     {
-        lazy_output.row_refs.emplace_back(reinterpret_cast<UInt64>(row_ref));
+        lazy_output.blocks.emplace_back(reinterpret_cast<UInt64>(&block));
+        lazy_output.row_nums.emplace_back(static_cast<uint32_t>(row_num));
     }
 }
 template<>
@@ -212,7 +131,8 @@ void AddedColumns<true>::appendDefaultRow()
 {
     if (has_columns_to_add)
     {
-        lazy_output.row_refs.emplace_back(0);
+        lazy_output.blocks.emplace_back(0);
+        lazy_output.row_nums.emplace_back(0);
     }
 }
 }
diff --git a/src/Interpreters/HashJoin/AddedColumns.h b/src/Interpreters/HashJoin/AddedColumns.h
index 4603d493329..13a7df6f498 100644
--- a/src/Interpreters/HashJoin/AddedColumns.h
+++ b/src/Interpreters/HashJoin/AddedColumns.h
@@ -50,7 +50,8 @@ public:
 
     struct LazyOutput
     {
-        PaddedPODArray<UInt64> row_refs;
+        PaddedPODArray<UInt64> blocks;
+        PaddedPODArray<UInt32> row_nums;
     };
 
     AddedColumns(
@@ -66,9 +67,6 @@ public:
         , join_on_keys(join_on_keys_)
         , additional_filter_expression(additional_filter_expression_)
         , rows_to_add(left_block.rows())
-        , join_data_avg_perkey_rows(join.getJoinedData()->avgPerKeyRows())
-        , output_by_row_list_threshold(join.getTableJoin().outputByRowListPerkeyRowsThreshold())
-        , join_data_sorted(join.getJoinedData()->sorted)
         , is_join_get(is_join_get_)
     {
         size_t num_columns_to_add = block_with_columns_to_add.columns();
@@ -78,7 +76,8 @@ public:
         if constexpr (lazy)
         {
             has_columns_to_add = num_columns_to_add > 0;
-            lazy_output.row_refs.reserve(rows_to_add);
+            lazy_output.blocks.reserve(rows_to_add);
+            lazy_output.row_nums.reserve(rows_to_add);
         }
 
         columns.reserve(num_columns_to_add);
@@ -122,14 +121,12 @@ public:
 
     void buildOutput();
 
-    void buildJoinGetOutput();
-
     ColumnWithTypeAndName moveColumn(size_t i)
     {
         return ColumnWithTypeAndName(std::move(columns[i]), type_name[i].type, type_name[i].qualified_name);
     }
 
-    void appendFromBlock(const RowRef * row_ref, bool has_default);
+    void appendFromBlock(const Block & block, size_t row_num, bool has_default);
 
     void appendDefaultRow();
 
@@ -137,8 +134,6 @@ public:
 
     const IColumn & leftAsofKey() const { return *left_asof_key; }
 
-    static constexpr bool isLazy() { return lazy; }
-
     Block left_block;
     std::vector<JoinOnKeyColumns> join_on_keys;
     ExpressionActionsPtr additional_filter_expression;
@@ -147,10 +142,6 @@ public:
     size_t rows_to_add;
     std::unique_ptr<IColumn::Offsets> offsets_to_replicate;
     bool need_filter = false;
-    bool output_by_row_list = false;
-    size_t join_data_avg_perkey_rows = 0;
-    size_t output_by_row_list_threshold = 0;
-    bool join_data_sorted = false;
     IColumn::Filter filter;
 
     void reserve(bool need_replicate)
@@ -221,22 +212,15 @@ private:
         columns.back()->reserve(src_column.column->size());
         type_name.emplace_back(src_column.type, src_column.name, qualified_name);
     }
-
-    /** Build output from the blocks that extract from `RowRef` or `RowRefList`, to avoid block cache miss which may cause performance slow down.
-     *  And This problem would happen it we directly build output from `RowRef` or `RowRefList`.
-     */
-    template<bool from_row_list>
-    void buildOutputFromBlocks();
 };
 
 /// Adapter class to pass into addFoundRowAll
 /// In joinRightColumnsWithAdditionalFilter we don't want to add rows directly into AddedColumns,
 /// because they need to be filtered by additional_filter_expression.
-class PreSelectedRows : public std::vector<const RowRef *>
+class PreSelectedRows : public std::vector<RowRef>
 {
 public:
-    void appendFromBlock(const RowRef * row_ref, bool /* has_default */) { this->emplace_back(row_ref); }
-    static constexpr bool isLazy() { return false; }
+    void appendFromBlock(const Block & block, size_t row_num, bool /* has_default */) { this->emplace_back(&block, row_num); }
 };
 
 }
diff --git a/src/Interpreters/HashJoin/FullHashJoin.cpp b/src/Interpreters/HashJoin/FullHashJoin.cpp
index 4cdb2e757a4..5d058d10fc2 100644
--- a/src/Interpreters/HashJoin/FullHashJoin.cpp
+++ b/src/Interpreters/HashJoin/FullHashJoin.cpp
@@ -1,4 +1,4 @@
-#include <Interpreters/HashJoin/HashJoinMethodsImpl.h>
+#include <Interpreters/HashJoin/HashJoinMethods.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/HashJoin/HashJoin.cpp b/src/Interpreters/HashJoin/HashJoin.cpp
index 1b8b45b94ea..0c7cad4360d 100644
--- a/src/Interpreters/HashJoin/HashJoin.cpp
+++ b/src/Interpreters/HashJoin/HashJoin.cpp
@@ -291,13 +291,12 @@ void HashJoin::dataMapInit(MapsVariant & map)
 {
     if (kind == JoinKind::Cross)
         return;
-    auto prefer_use_maps_all = table_join->getMixedJoinExpression() != nullptr;
-    joinDispatchInit(kind, strictness, map, prefer_use_maps_all);
-    joinDispatch(kind, strictness, map, prefer_use_maps_all, [&](auto, auto, auto & map_) { map_.create(data->type); });
+    joinDispatchInit(kind, strictness, map);
+    joinDispatch(kind, strictness, map, [&](auto, auto, auto & map_) { map_.create(data->type); });
 
     if (reserve_num)
     {
-        joinDispatch(kind, strictness, map, prefer_use_maps_all, [&](auto, auto, auto & map_) { map_.reserve(data->type, reserve_num); });
+        joinDispatch(kind, strictness, map, [&](auto, auto, auto & map_) { map_.reserve(data->type, reserve_num); });
     }
 
     if (!data)
@@ -328,10 +327,9 @@ size_t HashJoin::getTotalRowCount() const
     }
     else
     {
-        auto prefer_use_maps_all = table_join->getMixedJoinExpression() != nullptr;
         for (const auto & map : data->maps)
         {
-            joinDispatch(kind, strictness, map, prefer_use_maps_all, [&](auto, auto, auto & map_) { res += map_.getTotalRowCount(data->type); });
+            joinDispatch(kind, strictness, map, [&](auto, auto, auto & map_) { res += map_.getTotalRowCount(data->type); });
         }
     }
 
@@ -369,10 +367,9 @@ size_t HashJoin::getTotalByteCount() const
 
     if (data->type != Type::CROSS)
     {
-        auto prefer_use_maps_all = table_join->getMixedJoinExpression() != nullptr;
         for (const auto & map : data->maps)
         {
-            joinDispatch(kind, strictness, map, prefer_use_maps_all, [&](auto, auto, auto & map_) { res += map_.getTotalByteCountImpl(data->type); });
+            joinDispatch(kind, strictness, map, [&](auto, auto, auto & map_) { res += map_.getTotalByteCountImpl(data->type); });
         }
     }
     return res;
@@ -495,7 +492,7 @@ bool HashJoin::addBlockToJoin(const Block & source_block_, bool check_limits)
     }
 
     size_t rows = source_block.rows();
-    data->rows_to_join += rows;
+
     const auto & right_key_names = table_join->getAllNames(JoinTableSide::Right);
     ColumnPtrMap all_key_columns(right_key_names.size());
     for (const auto & column_name : right_key_names)
@@ -523,8 +520,6 @@ bool HashJoin::addBlockToJoin(const Block & source_block_, bool check_limits)
         return true;
     }
 
-    bool prefer_use_maps_all = table_join->getMixedJoinExpression() != nullptr;
-
     size_t total_rows = 0;
     size_t total_bytes = 0;
     {
@@ -597,7 +592,7 @@ bool HashJoin::addBlockToJoin(const Block & source_block_, bool check_limits)
             bool is_inserted = false;
             if (kind != JoinKind::Cross)
             {
-                joinDispatch(kind, strictness, data->maps[onexpr_idx], prefer_use_maps_all, [&](auto kind_, auto strictness_, auto & map)
+                joinDispatch(kind, strictness, data->maps[onexpr_idx], [&](auto kind_, auto strictness_, auto & map)
                 {
                     size_t size = HashJoinMethods<kind_, strictness_, std::decay_t<decltype(map)>>::insertFromBlockImpl(
                             *this,
@@ -613,10 +608,10 @@ bool HashJoin::addBlockToJoin(const Block & source_block_, bool check_limits)
                             is_inserted);
 
                     if (flag_per_row)
-                        used_flags->reinit<kind_, strictness_, std::is_same_v<std::decay_t<decltype(map)>, MapsAll>>(stored_block);
+                        used_flags->reinit<kind_, strictness_>(stored_block);
                     else if (is_inserted)
                         /// Number of buckets + 1 value from zero storage
-                        used_flags->reinit<kind_, strictness_, std::is_same_v<std::decay_t<decltype(map)>, MapsAll>>(size + 1);
+                        used_flags->reinit<kind_, strictness_>(size + 1);
                 });
             }
 
@@ -647,13 +642,16 @@ bool HashJoin::addBlockToJoin(const Block & source_block_, bool check_limits)
             total_bytes = getTotalByteCount();
         }
     }
-    data->keys_to_join = total_rows;
+
     shrinkStoredBlocksToFit(total_bytes);
+
     return table_join->sizeLimits().check(total_rows, total_bytes, "JOIN", ErrorCodes::SET_SIZE_LIMIT_EXCEEDED);
 }
 
-void HashJoin::shrinkStoredBlocksToFit(size_t & total_bytes_in_join, bool force_optimize)
+void HashJoin::shrinkStoredBlocksToFit(size_t & total_bytes_in_join)
 {
+    if (shrink_blocks)
+        return; /// Already shrunk
 
     Int64 current_memory_usage = getCurrentQueryMemoryUsage();
     Int64 query_memory_usage_delta = current_memory_usage - memory_usage_before_adding_blocks;
@@ -661,21 +659,15 @@ void HashJoin::shrinkStoredBlocksToFit(size_t & total_bytes_in_join, bool force_
 
     auto max_total_bytes_in_join = table_join->sizeLimits().max_bytes;
 
-    if (!force_optimize)
-    {
-        if (shrink_blocks)
-            return; /// Already shrunk
-
-        /** If accounted data size is more than half of `max_bytes_in_join`
-        * or query memory consumption growth from the beginning of adding blocks (estimation of memory consumed by join using memory tracker)
-        * is bigger than half of all memory available for query,
-        * then shrink stored blocks to fit.
-        */
-        shrink_blocks = (max_total_bytes_in_join && total_bytes_in_join > max_total_bytes_in_join / 2) ||
-                        (max_total_bytes_for_query && query_memory_usage_delta > max_total_bytes_for_query / 2);
-        if (!shrink_blocks)
-            return;
-    }
+    /** If accounted data size is more than half of `max_bytes_in_join`
+      * or query memory consumption growth from the beginning of adding blocks (estimation of memory consumed by join using memory tracker)
+      * is bigger than half of all memory available for query,
+      * then shrink stored blocks to fit.
+      */
+    shrink_blocks = (max_total_bytes_in_join && total_bytes_in_join > max_total_bytes_in_join / 2) ||
+                    (max_total_bytes_for_query && query_memory_usage_delta > max_total_bytes_for_query / 2);
+    if (!shrink_blocks)
+        return;
 
     LOG_DEBUG(log, "Shrinking stored blocks, memory consumption is {} {} calculated by join, {} {} by memory tracker",
         ReadableSize(total_bytes_in_join), max_total_bytes_in_join ? fmt::format("/ {}", ReadableSize(max_total_bytes_in_join)) : "",
@@ -877,7 +869,7 @@ ColumnWithTypeAndName HashJoin::joinGet(const Block & block, const Block & block
         keys.insert(std::move(key));
     }
 
-    static_assert(!MapGetter<JoinKind::Left, JoinStrictness::Any, false>::flagged,
+    static_assert(!MapGetter<JoinKind::Left, JoinStrictness::Any>::flagged,
                   "joinGet are not protected from hash table changes between block processing");
 
     std::vector<const MapsOne *> maps_vector;
@@ -918,34 +910,16 @@ void HashJoin::joinBlock(Block & block, ExtraBlockPtr & not_processed)
         materializeBlockInplace(block);
     }
 
-    bool prefer_use_maps_all = table_join->getMixedJoinExpression() != nullptr;
     {
         std::vector<const std::decay_t<decltype(data->maps[0])> * > maps_vector;
         for (size_t i = 0; i < table_join->getClauses().size(); ++i)
             maps_vector.push_back(&data->maps[i]);
 
-        if (joinDispatch(kind, strictness, maps_vector, prefer_use_maps_all, [&](auto kind_, auto strictness_, auto & maps_vector_)
+        if (joinDispatch(kind, strictness, maps_vector, [&](auto kind_, auto strictness_, auto & maps_vector_)
         {
-            Block remaining_block;
-            if constexpr (std::is_same_v<std::decay_t<decltype(maps_vector_)>, std::vector<const MapsAll *>>)
-            {
-                remaining_block = HashJoinMethods<kind_, strictness_, MapsAll>::joinBlockImpl(
-                    *this, block, sample_block_with_columns_to_add, maps_vector_);
-            }
-            else if constexpr (std::is_same_v<std::decay_t<decltype(maps_vector_)>, std::vector<const MapsOne *>>)
-            {
-                remaining_block = HashJoinMethods<kind_, strictness_, MapsOne>::joinBlockImpl(
-                    *this, block, sample_block_with_columns_to_add, maps_vector_);
-            }
-            else if constexpr (std::is_same_v<std::decay_t<decltype(maps_vector_)>, std::vector<const MapsAsof *>>)
-            {
-                remaining_block = HashJoinMethods<kind_, strictness_, MapsAsof>::joinBlockImpl(
-                    *this, block, sample_block_with_columns_to_add, maps_vector_);
-            }
-            else
-            {
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown maps type");
-            }
+            using MapType = typename MapGetter<kind_, strictness_>::Map;
+            Block remaining_block = HashJoinMethods<kind_, strictness_, MapType>::joinBlockImpl(
+                *this, block, sample_block_with_columns_to_add, maps_vector_);
             if (remaining_block.rows())
                 not_processed = std::make_shared<ExtraBlock>(ExtraBlock{std::move(remaining_block)});
             else
@@ -1045,8 +1019,7 @@ public:
                 rows_added = fillColumnsFromMap(map, columns_right);
             };
 
-            bool prefer_use_maps_all = parent.table_join->getMixedJoinExpression() != nullptr;
-            if (!joinDispatch(parent.kind, parent.strictness, parent.data->maps.front(), prefer_use_maps_all, fill_callback))
+            if (!joinDispatch(parent.kind, parent.strictness, parent.data->maps.front(), fill_callback))
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown JOIN strictness '{}' (must be on of: ANY, ALL, ASOF)", parent.strictness);
         }
 
@@ -1243,12 +1216,11 @@ void HashJoin::reuseJoinedData(const HashJoin & join)
     if (flag_per_row)
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "StorageJoin with ORs is not supported");
 
-    bool prefer_use_maps_all = join.table_join->getMixedJoinExpression() != nullptr;
     for (auto & map : data->maps)
     {
-        joinDispatch(kind, strictness, map, prefer_use_maps_all, [this](auto kind_, auto strictness_, auto & map_)
+        joinDispatch(kind, strictness, map, [this](auto kind_, auto strictness_, auto & map_)
         {
-            used_flags->reinit<kind_, strictness_, std::is_same_v<std::decay_t<decltype(map_)>, MapsAll>>(map_.getBufferSizeInCells(data->type) + 1);
+            used_flags->reinit<kind_, strictness_>(map_.getBufferSizeInCells(data->type) + 1);
         });
     }
 }
@@ -1328,9 +1300,7 @@ void HashJoin::validateAdditionalFilterExpression(ExpressionActionsPtr additiona
             additional_filter_expression->dumpActions());
     }
 
-    bool is_supported = ((strictness == JoinStrictness::All) && (isInnerOrLeft(kind) || isRightOrFull(kind)))
-        || ((strictness == JoinStrictness::Semi || strictness == JoinStrictness::Any || strictness == JoinStrictness::Anti)
-                && (isLeft(kind) || isRight(kind))) || (strictness == JoinStrictness::Any && (isInner(kind)));
+    bool is_supported = (strictness == JoinStrictness::All) && (isInnerOrLeft(kind) || isRightOrFull(kind));
     if (!is_supported)
     {
         throw Exception(ErrorCodes::INVALID_JOIN_ON_EXPRESSION,
@@ -1360,96 +1330,4 @@ bool HashJoin::needUsedFlagsForPerRightTableRow(std::shared_ptr<TableJoin> table
     return false;
 }
 
-template <JoinKind KIND, typename Map, JoinStrictness STRICTNESS>
-void HashJoin::tryRerangeRightTableDataImpl(Map & map [[maybe_unused]])
-{
-    constexpr JoinFeatures<KIND, STRICTNESS, Map> join_features;
-    if constexpr (!join_features.is_all_join || (!join_features.left && !join_features.inner))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Only left or inner join table can be reranged.");
-    else
-    {
-        auto merge_rows_into_one_block = [&](BlocksList & blocks, RowRefList & rows_ref)
-        {
-            auto it = rows_ref.begin();
-            if (it.ok())
-            {
-                if (blocks.empty() || blocks.back().rows() >= DEFAULT_BLOCK_SIZE)
-                    blocks.emplace_back(it->block->cloneEmpty());
-            }
-            else
-            {
-                return;
-            }
-            auto & block = blocks.back();
-            size_t start_row = block.rows();
-            for (; it.ok(); ++it)
-            {
-                for (size_t i = 0; i < block.columns(); ++i)
-                {
-                    auto & col = block.getByPosition(i).column->assumeMutableRef();
-                    col.insertFrom(*it->block->getByPosition(i).column, it->row_num);
-                }
-            }
-            if (block.rows() > start_row)
-            {
-                RowRefList new_rows_ref(&block, start_row, block.rows() - start_row);
-                rows_ref = std::move(new_rows_ref);
-            }
-        };
-
-        auto visit_rows_map = [&](BlocksList & blocks, MapsAll & rows_map)
-        {
-            switch (data->type)
-            {
-        #define M(TYPE) \
-                case Type::TYPE: \
-                {\
-                    rows_map.TYPE->forEachMapped([&](RowRefList & rows_ref) { merge_rows_into_one_block(blocks, rows_ref); }); \
-                    break; \
-                }
-                APPLY_FOR_JOIN_VARIANTS(M)
-        #undef M
-                default:
-                    break;
-            }
-        };
-        BlocksList sorted_blocks;
-        visit_rows_map(sorted_blocks, map);
-        data->blocks.swap(sorted_blocks);
-    }
-}
-
-void HashJoin::tryRerangeRightTableData()
-{
-    if (!table_join->allowJoinSorting() || table_join->getMixedJoinExpression() || !isInnerOrLeft(kind) || strictness != JoinStrictness::All)
-        return;
-
-    /// We should not rerange the right table on such conditions:
-    /// 1. the right table is already reranged by key or it is empty.
-    /// 2. the join clauses size is greater than 1, like `...join on a.key1=b.key1 or a.key2=b.key2`, we can not rerange the right table on different set of keys.
-    /// 3. the number of right table rows exceed the threshold, which may result in a significant cost for reranging and lead to performance degradation.
-    /// 4. the keys of right table is very sparse, which may result in insignificant performance improvement after reranging by key.
-    if (!data || data->sorted || data->blocks.empty() || data->maps.size() > 1 || data->rows_to_join > table_join->sortRightMaximumTableRows() ||  data->avgPerKeyRows() < table_join->sortRightMinimumPerkeyRows())
-        return;
-
-    if (data->keys_to_join == 0)
-        data->keys_to_join = getTotalRowCount();
-
-    /// If the there is no columns to add, means no columns to output, then the rerange would not improve performance by using column's `insertRangeFrom`
-    /// to replace column's `insertFrom` to make the output.
-    if (sample_block_with_columns_to_add.columns() == 0)
-    {
-        LOG_DEBUG(log, "The joined right table total rows :{}, total keys :{}", data->rows_to_join, data->keys_to_join);
-        return;
-    }
-    [[maybe_unused]] bool result = joinDispatch(
-        kind,
-        strictness,
-        data->maps.front(),
-        /*prefer_use_maps_all*/ false,
-        [&](auto kind_, auto strictness_, auto & map_) { tryRerangeRightTableDataImpl<kind_, decltype(map_), strictness_>(map_); });
-    chassert(result);
-    data->sorted = true;
-}
-
 }
diff --git a/src/Interpreters/HashJoin/HashJoin.h b/src/Interpreters/HashJoin/HashJoin.h
index 230343691ea..0b115b9fdbb 100644
--- a/src/Interpreters/HashJoin/HashJoin.h
+++ b/src/Interpreters/HashJoin/HashJoin.h
@@ -345,19 +345,6 @@ public:
 
         size_t blocks_allocated_size = 0;
         size_t blocks_nullmaps_allocated_size = 0;
-        /// Number of rows of right table to join
-        size_t rows_to_join = 0;
-        /// Number of keys of right table to join
-        size_t keys_to_join = 0;
-        /// Whether the right table reranged by key
-        bool sorted = false;
-
-        size_t avgPerKeyRows() const
-        {
-            if (keys_to_join == 0)
-                return 0;
-            return rows_to_join / keys_to_join;
-        }
     };
 
     using RightTableDataPtr = std::shared_ptr<RightTableData>;
@@ -385,7 +372,7 @@ public:
 
     void debugKeys() const;
 
-    void shrinkStoredBlocksToFit(size_t & total_bytes_in_join, bool force_optimize = false);
+    void shrinkStoredBlocksToFit(size_t & total_bytes_in_join);
 
     void setMaxJoinedBlockRows(size_t value) { max_joined_block_rows = value; }
 
@@ -466,10 +453,6 @@ private:
 
     void validateAdditionalFilterExpression(std::shared_ptr<ExpressionActions> additional_filter_expression);
     bool needUsedFlagsForPerRightTableRow(std::shared_ptr<TableJoin> table_join_) const;
-
-    void tryRerangeRightTableData() override;
-    template <JoinKind KIND, typename Map, JoinStrictness STRICTNESS>
-    void tryRerangeRightTableDataImpl(Map & map);
 };
 
 }
diff --git a/src/Interpreters/HashJoin/HashJoinMethods.h b/src/Interpreters/HashJoin/HashJoinMethods.h
index c5b54a62f36..0dfafa94efc 100644
--- a/src/Interpreters/HashJoin/HashJoinMethods.h
+++ b/src/Interpreters/HashJoin/HashJoinMethods.h
@@ -12,8 +12,15 @@
 #include <Poco/Logger.h>
 #include <Common/logger_useful.h>
 
+
 namespace DB
 {
+namespace ErrorCodes
+{
+    extern const int UNSUPPORTED_JOIN_KEYS;
+    extern const int LOGICAL_ERROR;
+}
+
 /// Inserting an element into a hash table of the form `key -> reference to a string`, which will then be used by JOIN.
 template <typename HashMap, typename KeyGetter>
 struct Inserter
@@ -57,6 +64,7 @@ struct Inserter
     }
 };
 
+
 /// MapsTemplate is one of MapsOne, MapsAll and MapsAsof
 template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
 class HashJoinMethods
@@ -73,7 +81,27 @@ public:
         ConstNullMapPtr null_map,
         UInt8ColumnDataPtr join_mask,
         Arena & pool,
-        bool & is_inserted);
+        bool & is_inserted)
+    {
+        switch (type)
+        {
+            case HashJoin::Type::EMPTY:
+                [[fallthrough]];
+            case HashJoin::Type::CROSS:
+                /// Do nothing. We will only save block, and it is enough
+                is_inserted = true;
+                return 0;
+
+        #define M(TYPE) \
+            case HashJoin::Type::TYPE: \
+                return insertFromBlockImplTypeCase<typename KeyGetterForType<HashJoin::Type::TYPE, std::remove_reference_t<decltype(*maps.TYPE)>>::Type>(\
+                    join, *maps.TYPE, rows, key_columns, key_sizes, stored_block, null_map, join_mask, pool, is_inserted); \
+                break;
+
+            APPLY_FOR_JOIN_VARIANTS(M)
+        #undef M
+        }
+    }
 
     using MapsTemplateVector = std::vector<const MapsTemplate *>;
 
@@ -82,36 +110,280 @@ public:
         Block & block,
         const Block & block_with_columns_to_add,
         const MapsTemplateVector & maps_,
-        bool is_join_get = false);
+        bool is_join_get = false)
+    {
+        constexpr JoinFeatures<KIND, STRICTNESS> join_features;
+
+        std::vector<JoinOnKeyColumns> join_on_keys;
+        const auto & onexprs = join.table_join->getClauses();
+        for (size_t i = 0; i < onexprs.size(); ++i)
+        {
+            const auto & key_names = !is_join_get ? onexprs[i].key_names_left : onexprs[i].key_names_right;
+            join_on_keys.emplace_back(block, key_names, onexprs[i].condColumnNames().first, join.key_sizes[i]);
+        }
+        size_t existing_columns = block.columns();
+
+        /** If you use FULL or RIGHT JOIN, then the columns from the "left" table must be materialized.
+          * Because if they are constants, then in the "not joined" rows, they may have different values
+          *  - default values, which can differ from the values of these constants.
+          */
+        if constexpr (join_features.right || join_features.full)
+        {
+            materializeBlockInplace(block);
+        }
+
+        /** For LEFT/INNER JOIN, the saved blocks do not contain keys.
+          * For FULL/RIGHT JOIN, the saved blocks contain keys;
+          *  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<!join_features.is_any_join> added_columns(
+            block,
+            block_with_columns_to_add,
+            join.savedBlockSample(),
+            join,
+            std::move(join_on_keys),
+            join.table_join->getMixedJoinExpression(),
+            join_features.is_asof_join,
+            is_join_get);
+
+        bool has_required_right_keys = (join.required_right_keys.columns() != 0);
+        added_columns.need_filter = join_features.need_filter || has_required_right_keys;
+        added_columns.max_joined_block_rows = join.max_joined_block_rows;
+        if (!added_columns.max_joined_block_rows)
+            added_columns.max_joined_block_rows = std::numeric_limits<size_t>::max();
+        else
+            added_columns.reserve(join_features.need_replication);
+
+        size_t num_joined = switchJoinRightColumns(maps_, added_columns, join.data->type, *join.used_flags);
+        /// Do not hold memory for join_on_keys anymore
+        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));
+
+        std::vector<size_t> right_keys_to_replicate [[maybe_unused]];
+
+        if constexpr (join_features.need_filter)
+        {
+            /// If ANY INNER | RIGHT JOIN - filter all the columns except the new ones.
+            for (size_t i = 0; i < existing_columns; ++i)
+                block.safeGetByPosition(i).column = block.safeGetByPosition(i).column->filter(added_columns.filter, -1);
+
+            /// Add join key columns from right block if needed using value from left table because of equality
+            for (size_t i = 0; i < join.required_right_keys.columns(); ++i)
+            {
+                const auto & right_key = join.required_right_keys.getByPosition(i);
+                /// asof column is already in block.
+                if (join_features.is_asof_join && right_key.name == join.table_join->getOnlyClause().key_names_right.back())
+                    continue;
+
+                const auto & left_column = block.getByName(join.required_right_keys_sources[i]);
+                const auto & right_col_name = join.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)
+        {
+            /// Add join key columns from right block if needed.
+            for (size_t i = 0; i < join.required_right_keys.columns(); ++i)
+            {
+                const auto & right_key = join.required_right_keys.getByPosition(i);
+                auto right_col_name = join.getTableJoin().renamedRightColumnName(right_key.name);
+                /// asof column is already in block.
+                if (join_features.is_asof_join && right_key.name == join.table_join->getOnlyClause().key_names_right.back())
+                    continue;
+
+                const auto & left_column = block.getByName(join.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)
+        {
+            std::unique_ptr<IColumn::Offsets> & offsets_to_replicate = added_columns.offsets_to_replicate;
+
+            /// If ALL ... JOIN - we replicate all the columns except the new ones.
+            for (size_t i = 0; i < existing_columns; ++i)
+            {
+                block.safeGetByPosition(i).column = block.safeGetByPosition(i).column->replicate(*offsets_to_replicate);
+            }
+
+            /// Replicate additional right keys
+            for (size_t pos : right_keys_to_replicate)
+            {
+               block.safeGetByPosition(pos).column = block.safeGetByPosition(pos).column->replicate(*offsets_to_replicate);
+            }
+        }
+
+        return remaining_block;
+    }
+
 private:
     template <typename KeyGetter, bool is_asof_join>
-    static KeyGetter createKeyGetter(const ColumnRawPtrs & key_columns, const Sizes & key_sizes);
+    static KeyGetter createKeyGetter(const ColumnRawPtrs & key_columns, const Sizes & key_sizes)
+    {
+        if constexpr (is_asof_join)
+        {
+            auto key_column_copy = key_columns;
+            auto key_size_copy = key_sizes;
+            key_column_copy.pop_back();
+            key_size_copy.pop_back();
+            return KeyGetter(key_column_copy, key_size_copy, nullptr);
+        }
+        else
+            return KeyGetter(key_columns, key_sizes, nullptr);
+    }
 
     template <typename KeyGetter, typename HashMap>
-    static size_t insertFromBlockImplTypeCase(
+    static size_t NO_INLINE insertFromBlockImplTypeCase(
         HashJoin & join, HashMap & map, size_t rows, const ColumnRawPtrs & key_columns,
-        const Sizes & key_sizes, Block * stored_block, ConstNullMapPtr null_map, UInt8ColumnDataPtr join_mask, Arena & pool, bool & is_inserted);
+        const Sizes & key_sizes, Block * stored_block, ConstNullMapPtr null_map, UInt8ColumnDataPtr join_mask, Arena & pool, bool & is_inserted)
+    {
+        [[maybe_unused]] constexpr bool mapped_one = std::is_same_v<typename HashMap::mapped_type, RowRef>;
+        constexpr bool is_asof_join = STRICTNESS == JoinStrictness::Asof;
+
+        const IColumn * asof_column [[maybe_unused]] = nullptr;
+        if constexpr (is_asof_join)
+            asof_column = key_columns.back();
+
+        auto key_getter = createKeyGetter<KeyGetter, is_asof_join>(key_columns, key_sizes);
+
+        /// For ALL and ASOF join always insert values
+        is_inserted = !mapped_one || is_asof_join;
+
+        for (size_t i = 0; i < rows; ++i)
+        {
+            if (null_map && (*null_map)[i])
+            {
+                /// nulls are not inserted into hash table,
+                /// keep them for RIGHT and FULL joins
+                is_inserted = true;
+                continue;
+            }
+
+            /// Check condition for right table from ON section
+            if (join_mask && !(*join_mask)[i])
+                continue;
+
+            if constexpr (is_asof_join)
+                Inserter<HashMap, KeyGetter>::insertAsof(join, map, key_getter, stored_block, i, pool, *asof_column);
+            else if constexpr (mapped_one)
+                is_inserted |= Inserter<HashMap, KeyGetter>::insertOne(join, map, key_getter, stored_block, i, pool);
+            else
+                Inserter<HashMap, KeyGetter>::insertAll(join, map, key_getter, stored_block, i, pool);
+        }
+        return map.getBufferSizeInCells();
+    }
 
     template <typename AddedColumns>
     static size_t switchJoinRightColumns(
         const std::vector<const MapsTemplate *> & mapv,
         AddedColumns & added_columns,
         HashJoin::Type type,
-        JoinStuff::JoinUsedFlags & used_flags);
+        JoinStuff::JoinUsedFlags & used_flags)
+    {
+        constexpr bool is_asof_join = STRICTNESS == JoinStrictness::Asof;
+        switch (type)
+        {
+            case HashJoin::Type::EMPTY: {
+                if constexpr (!is_asof_join)
+                {
+                    using KeyGetter = KeyGetterEmpty<typename MapsTemplate::MappedType>;
+                    std::vector<KeyGetter> key_getter_vector;
+                    key_getter_vector.emplace_back();
+
+                    using MapTypeVal = typename KeyGetter::MappedType;
+                    std::vector<const MapTypeVal *> a_map_type_vector;
+                    a_map_type_vector.emplace_back();
+                    return joinRightColumnsSwitchNullability<KeyGetter>(
+                        std::move(key_getter_vector), a_map_type_vector, added_columns, used_flags);
+                }
+                throw Exception(ErrorCodes::UNSUPPORTED_JOIN_KEYS, "Unsupported JOIN keys. Type: {}", type);
+            }
+        #define M(TYPE) \
+            case HashJoin::Type::TYPE: \
+            {                                                           \
+                using MapTypeVal = const typename std::remove_reference_t<decltype(MapsTemplate::TYPE)>::element_type; \
+                using KeyGetter = typename KeyGetterForType<HashJoin::Type::TYPE, MapTypeVal>::Type; \
+                std::vector<const MapTypeVal *> a_map_type_vector(mapv.size()); \
+                std::vector<KeyGetter> key_getter_vector;                     \
+                for (size_t d = 0; d < added_columns.join_on_keys.size(); ++d)                   \
+                {       \
+                    const auto & join_on_key = added_columns.join_on_keys[d];     \
+                    a_map_type_vector[d] = mapv[d]->TYPE.get();              \
+                    key_getter_vector.push_back(std::move(createKeyGetter<KeyGetter, is_asof_join>(join_on_key.key_columns, join_on_key.key_sizes))); \
+                }                                                           \
+                return joinRightColumnsSwitchNullability<KeyGetter>( \
+                                std::move(key_getter_vector), a_map_type_vector, added_columns, used_flags); \
+            }
+            APPLY_FOR_JOIN_VARIANTS(M)
+        #undef M
+
+        default:
+            throw Exception(ErrorCodes::UNSUPPORTED_JOIN_KEYS, "Unsupported JOIN keys (type: {})", type);
+        }
+    }
 
     template <typename KeyGetter, typename Map, typename AddedColumns>
     static size_t joinRightColumnsSwitchNullability(
         std::vector<KeyGetter> && key_getter_vector,
         const std::vector<const Map *> & mapv,
         AddedColumns & added_columns,
-        JoinStuff::JoinUsedFlags & used_flags);
+        JoinStuff::JoinUsedFlags & used_flags)
+    {
+        if (added_columns.need_filter)
+        {
+            return joinRightColumnsSwitchMultipleDisjuncts<KeyGetter, Map, true>(
+            std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags);
+        }
+        else
+        {
+            return joinRightColumnsSwitchMultipleDisjuncts<KeyGetter, Map, false>(
+            std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags);
+        }
+    }
 
     template <typename KeyGetter, typename Map, bool need_filter, typename AddedColumns>
     static size_t joinRightColumnsSwitchMultipleDisjuncts(
         std::vector<KeyGetter> && key_getter_vector,
         const std::vector<const Map *> & mapv,
         AddedColumns & added_columns,
-        JoinStuff::JoinUsedFlags & used_flags);
+        JoinStuff::JoinUsedFlags & used_flags)
+    {
+        constexpr JoinFeatures<KIND, STRICTNESS> join_features;
+        if constexpr (join_features.is_all_join)
+        {
+        if (added_columns.additional_filter_expression)
+        {
+            bool mark_per_row_used = join_features.right || join_features.full || mapv.size() > 1;
+            return joinRightColumnsWithAddtitionalFilter<KeyGetter, Map, join_features.need_replication>(
+                std::forward<std::vector<KeyGetter>>(key_getter_vector),
+                mapv,
+                added_columns,
+                used_flags,
+                need_filter,
+                join_features.need_flags,
+                join_features.add_missing,
+                mark_per_row_used);
+        }
+        }
+
+        if (added_columns.additional_filter_expression)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Additional filter expression is not supported for this JOIN");
+
+        return mapv.size() > 1 ? joinRightColumns<KeyGetter, Map, need_filter, true>(
+                   std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags)
+                               : joinRightColumns<KeyGetter, Map, need_filter, false>(
+                                   std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags);
+    }
 
     /// 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).
@@ -120,30 +392,464 @@ private:
         std::vector<KeyGetter> && key_getter_vector,
         const std::vector<const Map *> & mapv,
         AddedColumns & added_columns,
-        JoinStuff::JoinUsedFlags & used_flags);
+        JoinStuff::JoinUsedFlags & used_flags)
+    {
+        constexpr JoinFeatures<KIND, STRICTNESS> join_features;
+
+        size_t rows = added_columns.rows_to_add;
+        if constexpr (need_filter)
+            added_columns.filter = IColumn::Filter(rows, 0);
+
+        Arena pool;
+
+        if constexpr (join_features.need_replication)
+            added_columns.offsets_to_replicate = std::make_unique<IColumn::Offsets>(rows);
+
+        IColumn::Offset current_offset = 0;
+        size_t max_joined_block_rows = added_columns.max_joined_block_rows;
+        size_t i = 0;
+        for (; i < rows; ++i)
+        {
+            if constexpr (join_features.need_replication)
+            {
+                if (unlikely(current_offset >= max_joined_block_rows))
+                {
+                    added_columns.offsets_to_replicate->resize_assume_reserved(i);
+                    added_columns.filter.resize_assume_reserved(i);
+                    break;
+                }
+            }
+
+            bool right_row_found = false;
+
+            KnownRowsHolder<flag_per_row> known_rows;
+            for (size_t onexpr_idx = 0; onexpr_idx < added_columns.join_on_keys.size(); ++onexpr_idx)
+            {
+                const auto & join_keys = added_columns.join_on_keys[onexpr_idx];
+                if (join_keys.null_map && (*join_keys.null_map)[i])
+                        continue;
+
+                bool row_acceptable = !join_keys.isRowFiltered(i);
+                using FindResult = typename KeyGetter::FindResult;
+                auto find_result = row_acceptable ? key_getter_vector[onexpr_idx].findKey(*(mapv[onexpr_idx]), i, pool) : FindResult();
+
+                if (find_result.isFound())
+                {
+                    right_row_found = true;
+                    auto & mapped = find_result.getMapped();
+                    if constexpr (join_features.is_asof_join)
+                    {
+                        const IColumn & left_asof_key = added_columns.leftAsofKey();
+
+                        auto row_ref = mapped->findAsof(left_asof_key, i);
+                        if (row_ref.block)
+                        {
+                            setUsed<need_filter>(added_columns.filter, i);
+                            if constexpr (flag_per_row)
+                                used_flags.template setUsed<join_features.need_flags, flag_per_row>(row_ref.block, row_ref.row_num, 0);
+                            else
+                                used_flags.template setUsed<join_features.need_flags, flag_per_row>(find_result);
+
+                            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);
+                    }
+                    else if constexpr (join_features.is_all_join)
+                    {
+                        setUsed<need_filter>(added_columns.filter, i);
+                        used_flags.template setUsed<join_features.need_flags, flag_per_row>(find_result);
+                        auto used_flags_opt = join_features.need_flags ? &used_flags : nullptr;
+                        addFoundRowAll<Map, join_features.add_missing>(mapped, added_columns, current_offset, known_rows, used_flags_opt);
+                    }
+                    else if constexpr ((join_features.is_any_join || join_features.is_semi_join) && join_features.right)
+                    {
+                        /// Use first appeared left key + it needs left columns replication
+                        bool used_once = used_flags.template setUsedOnce<join_features.need_flags, flag_per_row>(find_result);
+                        if (used_once)
+                        {
+                            auto used_flags_opt = join_features.need_flags ? &used_flags : nullptr;
+                            setUsed<need_filter>(added_columns.filter, i);
+                            addFoundRowAll<Map, join_features.add_missing>(
+                                mapped, added_columns, current_offset, known_rows, used_flags_opt);
+                        }
+                    }
+                    else if constexpr (join_features.is_any_join && KIND == JoinKind::Inner)
+                    {
+                        bool used_once = used_flags.template setUsedOnce<join_features.need_flags, flag_per_row>(find_result);
+
+                        /// Use first appeared left key only
+                        if (used_once)
+                        {
+                            setUsed<need_filter>(added_columns.filter, i);
+                            added_columns.appendFromBlock(*mapped.block, mapped.row_num, join_features.add_missing);
+                        }
+
+                        break;
+                    }
+                    else if constexpr (join_features.is_any_join && join_features.full)
+                    {
+                        /// TODO
+                    }
+                    else if constexpr (join_features.is_anti_join)
+                    {
+                        if constexpr (join_features.right && join_features.need_flags)
+                            used_flags.template setUsed<join_features.need_flags, flag_per_row>(find_result);
+                    }
+                    else /// ANY LEFT, SEMI LEFT, old ANY (RightAny)
+                    {
+                        setUsed<need_filter>(added_columns.filter, i);
+                        used_flags.template setUsed<join_features.need_flags, flag_per_row>(find_result);
+                        added_columns.appendFromBlock(*mapped.block, mapped.row_num, join_features.add_missing);
+
+                        if (join_features.is_any_or_semi_join)
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (!right_row_found)
+            {
+                if constexpr (join_features.is_anti_join && join_features.left)
+                    setUsed<need_filter>(added_columns.filter, i);
+                addNotFoundRow<join_features.add_missing, join_features.need_replication>(added_columns, current_offset);
+            }
+
+            if constexpr (join_features.need_replication)
+            {
+                (*added_columns.offsets_to_replicate)[i] = current_offset;
+            }
+        }
+
+        added_columns.applyLazyDefaults();
+        return i;
+    }
 
     template <bool need_filter>
-    static void setUsed(IColumn::Filter & filter [[maybe_unused]], size_t pos [[maybe_unused]]);
+    static void setUsed(IColumn::Filter & filter [[maybe_unused]], size_t pos [[maybe_unused]])
+    {
+        if constexpr (need_filter)
+            filter[pos] = 1;
+    }
 
     template <typename AddedColumns>
     static ColumnPtr buildAdditionalFilter(
         size_t left_start_row,
-        const std::vector<const RowRef *> & selected_rows,
+        const std::vector<RowRef> & selected_rows,
         const std::vector<size_t> & row_replicate_offset,
-        AddedColumns & added_columns);
+        AddedColumns & added_columns)
+    {
+        ColumnPtr result_column;
+        do
+        {
+            if (selected_rows.empty())
+            {
+                result_column = ColumnUInt8::create();
+                break;
+            }
+            const Block & sample_right_block = *selected_rows.begin()->block;
+            if (!sample_right_block || !added_columns.additional_filter_expression)
+            {
+                auto filter = ColumnUInt8::create();
+                filter->insertMany(1, selected_rows.size());
+                result_column = std::move(filter);
+                break;
+            }
+
+            auto required_cols = added_columns.additional_filter_expression->getRequiredColumnsWithTypes();
+            if (required_cols.empty())
+            {
+                Block block;
+                added_columns.additional_filter_expression->execute(block);
+                result_column = block.getByPosition(0).column->cloneResized(selected_rows.size());
+                break;
+            }
+            NameSet required_column_names;
+            for (auto & col : required_cols)
+                required_column_names.insert(col.name);
+
+            Block executed_block;
+            size_t right_col_pos = 0;
+            for (const auto & col : sample_right_block.getColumnsWithTypeAndName())
+            {
+                if (required_column_names.contains(col.name))
+                {
+                    auto new_col = col.column->cloneEmpty();
+                    for (const auto & selected_row : selected_rows)
+                    {
+                        const auto & src_col = selected_row.block->getByPosition(right_col_pos);
+                        new_col->insertFrom(*src_col.column, selected_row.row_num);
+                    }
+                    executed_block.insert({std::move(new_col), col.type, col.name});
+                }
+                right_col_pos += 1;
+            }
+            if (!executed_block)
+            {
+                result_column = ColumnUInt8::create();
+                break;
+            }
+
+            for (const auto & col_name : required_column_names)
+            {
+                const auto * src_col = added_columns.left_block.findByName(col_name);
+                if (!src_col)
+                    continue;
+                auto new_col = src_col->column->cloneEmpty();
+                size_t prev_left_offset = 0;
+                for (size_t i = 1; i < row_replicate_offset.size(); ++i)
+                {
+                    const size_t & left_offset = row_replicate_offset[i];
+                    size_t rows = left_offset - prev_left_offset;
+                    if (rows)
+                        new_col->insertManyFrom(*src_col->column, left_start_row + i - 1, rows);
+                    prev_left_offset = left_offset;
+                }
+                executed_block.insert({std::move(new_col), src_col->type, col_name});
+            }
+            if (!executed_block)
+            {
+                throw Exception(
+                    ErrorCodes::LOGICAL_ERROR,
+                    "required columns: [{}], but not found any in left/right table. right table: {}, left table: {}",
+                    required_cols.toString(),
+                    sample_right_block.dumpNames(),
+                    added_columns.left_block.dumpNames());
+            }
+
+            for (const auto & col : executed_block.getColumnsWithTypeAndName())
+                if (!col.column || !col.type)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Illegal nullptr column in input block: {}", executed_block.dumpStructure());
+
+            added_columns.additional_filter_expression->execute(executed_block);
+            result_column = executed_block.getByPosition(0).column->convertToFullColumnIfConst();
+            executed_block.clear();
+        } while (false);
+
+        result_column = result_column->convertToFullIfNeeded();
+        if (result_column->isNullable())
+        {
+            /// Convert Nullable(UInt8) to UInt8 ensuring that nulls are zeros
+            /// Trying to avoid copying data, since we are the only owner of the column.
+            ColumnPtr mask_column = assert_cast<const ColumnNullable &>(*result_column).getNullMapColumnPtr();
+
+            MutableColumnPtr mutable_column;
+            {
+                ColumnPtr nested_column = assert_cast<const ColumnNullable &>(*result_column).getNestedColumnPtr();
+                result_column.reset();
+                mutable_column = IColumn::mutate(std::move(nested_column));
+            }
+
+            auto & column_data = assert_cast<ColumnUInt8 &>(*mutable_column).getData();
+            const auto & mask_column_data = assert_cast<const ColumnUInt8 &>(*mask_column).getData();
+            for (size_t i = 0; i < column_data.size(); ++i)
+            {
+                if (mask_column_data[i])
+                    column_data[i] = 0;
+            }
+            return mutable_column;
+        }
+        return result_column;
+    }
 
     /// First to collect all matched rows refs by join keys, then filter out rows which are not true in additional filter expression.
-    template <typename KeyGetter, typename Map, typename AddedColumns>
+    template <typename KeyGetter, typename Map, bool need_replication, typename AddedColumns>
     static size_t joinRightColumnsWithAddtitionalFilter(
         std::vector<KeyGetter> && key_getter_vector,
         const std::vector<const Map *> & mapv,
         AddedColumns & added_columns,
         JoinStuff::JoinUsedFlags & used_flags [[maybe_unused]],
         bool need_filter [[maybe_unused]],
-        bool flag_per_row [[maybe_unused]]);
+        bool need_flags [[maybe_unused]],
+        bool add_missing [[maybe_unused]],
+        bool flag_per_row [[maybe_unused]])
+    {
+        size_t left_block_rows = added_columns.rows_to_add;
+        if (need_filter)
+            added_columns.filter = IColumn::Filter(left_block_rows, 0);
+
+        std::unique_ptr<Arena> pool;
+
+        if constexpr (need_replication)
+            added_columns.offsets_to_replicate = std::make_unique<IColumn::Offsets>(left_block_rows);
+
+        std::vector<size_t> row_replicate_offset;
+        row_replicate_offset.reserve(left_block_rows);
+
+        using FindResult = typename KeyGetter::FindResult;
+        size_t max_joined_block_rows = added_columns.max_joined_block_rows;
+        size_t left_row_iter = 0;
+        PreSelectedRows selected_rows;
+        selected_rows.reserve(left_block_rows);
+        std::vector<FindResult> find_results;
+        find_results.reserve(left_block_rows);
+        bool exceeded_max_block_rows = false;
+        IColumn::Offset total_added_rows = 0;
+        IColumn::Offset current_added_rows = 0;
+
+        auto collect_keys_matched_rows_refs = [&]()
+        {
+            pool = std::make_unique<Arena>();
+            find_results.clear();
+            row_replicate_offset.clear();
+            row_replicate_offset.push_back(0);
+            current_added_rows = 0;
+            selected_rows.clear();
+            for (; left_row_iter < left_block_rows; ++left_row_iter)
+            {
+                if constexpr (need_replication)
+                {
+                    if (unlikely(total_added_rows + current_added_rows >= max_joined_block_rows))
+                    {
+                        break;
+                    }
+                }
+                KnownRowsHolder<true> all_flag_known_rows;
+                KnownRowsHolder<false> single_flag_know_rows;
+                for (size_t join_clause_idx = 0; join_clause_idx < added_columns.join_on_keys.size(); ++join_clause_idx)
+                {
+                    const auto & join_keys = added_columns.join_on_keys[join_clause_idx];
+                    if (join_keys.null_map && (*join_keys.null_map)[left_row_iter])
+                        continue;
+
+                    bool row_acceptable = !join_keys.isRowFiltered(left_row_iter);
+                    auto find_result = row_acceptable
+                        ? key_getter_vector[join_clause_idx].findKey(*(mapv[join_clause_idx]), left_row_iter, *pool)
+                        : FindResult();
+
+                    if (find_result.isFound())
+                    {
+                        auto & mapped = find_result.getMapped();
+                        find_results.push_back(find_result);
+                        if (flag_per_row)
+                            addFoundRowAll<Map, false, true>(mapped, selected_rows, current_added_rows, all_flag_known_rows, nullptr);
+                        else
+                            addFoundRowAll<Map, false, false>(mapped, selected_rows, current_added_rows, single_flag_know_rows, nullptr);
+                    }
+                }
+                row_replicate_offset.push_back(current_added_rows);
+            }
+        };
+
+        auto copy_final_matched_rows = [&](size_t left_start_row, ColumnPtr filter_col)
+        {
+            const PaddedPODArray<UInt8> & filter_flags = assert_cast<const ColumnUInt8 &>(*filter_col).getData();
+
+            size_t prev_replicated_row = 0;
+            auto selected_right_row_it = selected_rows.begin();
+            size_t find_result_index = 0;
+            for (size_t i = 1, n = row_replicate_offset.size(); i < n; ++i)
+            {
+                bool any_matched = false;
+                /// For all right join, flag_per_row is true, we need mark used flags for each row.
+                if (flag_per_row)
+                {
+                    for (size_t replicated_row = prev_replicated_row; replicated_row < row_replicate_offset[i]; ++replicated_row)
+                    {
+                        if (filter_flags[replicated_row])
+                        {
+                            any_matched = true;
+                            added_columns.appendFromBlock(*selected_right_row_it->block, selected_right_row_it->row_num, add_missing);
+                            total_added_rows += 1;
+                            if (need_flags)
+                                used_flags.template setUsed<true, true>(selected_right_row_it->block, selected_right_row_it->row_num, 0);
+                        }
+                        ++selected_right_row_it;
+                    }
+                }
+                else
+                {
+                    for (size_t replicated_row = prev_replicated_row; replicated_row < row_replicate_offset[i]; ++replicated_row)
+                    {
+                        if (filter_flags[replicated_row])
+                        {
+                            any_matched = true;
+                            added_columns.appendFromBlock(*selected_right_row_it->block, selected_right_row_it->row_num, add_missing);
+                            total_added_rows += 1;
+                        }
+                        ++selected_right_row_it;
+                    }
+                }
+                if (!any_matched)
+                {
+                    if (add_missing)
+                        addNotFoundRow<true, need_replication>(added_columns, total_added_rows);
+                    else
+                        addNotFoundRow<false, need_replication>(added_columns, total_added_rows);
+                }
+                else
+                {
+                    if (!flag_per_row && need_flags)
+                        used_flags.template setUsed<true, false>(find_results[find_result_index]);
+                    if (need_filter)
+                        setUsed<true>(added_columns.filter, left_start_row + i - 1);
+                    if (add_missing)
+                        added_columns.applyLazyDefaults();
+                }
+                find_result_index += (prev_replicated_row != row_replicate_offset[i]);
+
+                if constexpr (need_replication)
+                {
+                    (*added_columns.offsets_to_replicate)[left_start_row + i - 1] = total_added_rows;
+                }
+                prev_replicated_row = row_replicate_offset[i];
+            }
+        };
+
+        while (left_row_iter < left_block_rows && !exceeded_max_block_rows)
+        {
+            auto left_start_row = left_row_iter;
+            collect_keys_matched_rows_refs();
+            if (selected_rows.size() != current_added_rows || row_replicate_offset.size() != left_row_iter - left_start_row + 1)
+            {
+                throw Exception(
+                    ErrorCodes::LOGICAL_ERROR,
+                    "Sizes are mismatched. selected_rows.size:{}, current_added_rows:{}, row_replicate_offset.size:{}, left_row_iter: {}, "
+                    "left_start_row: {}",
+                    selected_rows.size(),
+                    current_added_rows,
+                    row_replicate_offset.size(),
+                    left_row_iter,
+                    left_start_row);
+            }
+            auto filter_col = buildAdditionalFilter(left_start_row, selected_rows, row_replicate_offset, added_columns);
+            copy_final_matched_rows(left_start_row, filter_col);
+
+            if constexpr (need_replication)
+            {
+                // Add a check for current_added_rows to avoid run the filter expression on too small size batch.
+                if (total_added_rows >= max_joined_block_rows || current_added_rows < 1024)
+                    exceeded_max_block_rows = true;
+            }
+        }
+
+        if constexpr (need_replication)
+        {
+            added_columns.offsets_to_replicate->resize_assume_reserved(left_row_iter);
+            added_columns.filter.resize_assume_reserved(left_row_iter);
+        }
+        added_columns.applyLazyDefaults();
+        return left_row_iter;
+    }
 
     /// Cut first num_rows rows from block in place and returns block with remaining rows
-    static Block sliceBlock(Block & block, size_t num_rows);
+    static Block sliceBlock(Block & block, size_t num_rows)
+    {
+        size_t total_rows = block.rows();
+        if (num_rows >= total_rows)
+            return {};
+        size_t remaining_rows = total_rows - num_rows;
+        Block remaining_block = block.cloneEmpty();
+        for (size_t i = 0; i < block.columns(); ++i)
+        {
+            auto & col = block.getByPosition(i);
+            remaining_block.getByPosition(i).column = col.column->cut(num_rows, remaining_rows);
+            col.column = col.column->cut(0, num_rows);
+        }
+        return remaining_block;
+    }
 
     /** Since we do not store right key columns,
       * this function is used to copy left key columns to right key columns.
@@ -158,22 +864,70 @@ private:
         const DataTypePtr & right_key_type,
         const String & renamed_right_column,
         const ColumnWithTypeAndName & left_column,
-        const IColumn::Filter * null_map_filter = nullptr);
+        const IColumn::Filter * null_map_filter = nullptr)
+    {
+        ColumnWithTypeAndName right_column = left_column;
+        right_column.name = renamed_right_column;
 
-    static void correctNullabilityInplace(ColumnWithTypeAndName & column, bool nullable);
+        if (null_map_filter)
+            right_column.column = JoinCommon::filterWithBlanks(right_column.column, *null_map_filter);
 
-    static void correctNullabilityInplace(ColumnWithTypeAndName & column, bool nullable, const IColumn::Filter & negative_null_map);
+        bool should_be_nullable = isNullableOrLowCardinalityNullable(right_key_type);
+        if (null_map_filter)
+            correctNullabilityInplace(right_column, should_be_nullable, *null_map_filter);
+        else
+            correctNullabilityInplace(right_column, should_be_nullable);
+
+        if (!right_column.type->equals(*right_key_type))
+        {
+            right_column.column = castColumnAccurate(right_column, right_key_type);
+            right_column.type = right_key_type;
+        }
+
+        right_column.column = right_column.column->convertToFullColumnIfConst();
+        return right_column;
+    }
+
+    static void correctNullabilityInplace(ColumnWithTypeAndName & column, bool nullable)
+    {
+        if (nullable)
+        {
+            JoinCommon::convertColumnToNullable(column);
+        }
+        else
+        {
+            /// We have to replace values masked by NULLs with defaults.
+            if (column.column)
+                if (const auto * nullable_column = checkAndGetColumn<ColumnNullable>(&*column.column))
+                    column.column = JoinCommon::filterWithBlanks(column.column, nullable_column->getNullMapColumn().getData(), true);
+
+            JoinCommon::removeColumnNullability(column);
+        }
+    }
+
+    static void correctNullabilityInplace(ColumnWithTypeAndName & column, bool nullable, const IColumn::Filter & negative_null_map)
+    {
+        if (nullable)
+        {
+            JoinCommon::convertColumnToNullable(column);
+            if (column.type->isNullable() && !negative_null_map.empty())
+            {
+                MutableColumnPtr mutable_column = IColumn::mutate(std::move(column.column));
+                assert_cast<ColumnNullable &>(*mutable_column).applyNegatedNullMap(negative_null_map);
+                column.column = std::move(mutable_column);
+            }
+        }
+        else
+            JoinCommon::removeColumnNullability(column);
+    }
 };
 
 /// Instantiate template class ahead in different .cpp files to avoid `too large translation unit`.
 extern template class HashJoinMethods<JoinKind::Left, JoinStrictness::RightAny, HashJoin::MapsOne>;
 extern template class HashJoinMethods<JoinKind::Left, JoinStrictness::Any, HashJoin::MapsOne>;
-extern template class HashJoinMethods<JoinKind::Left, JoinStrictness::Any, HashJoin::MapsAll>;
 extern template class HashJoinMethods<JoinKind::Left, JoinStrictness::All, HashJoin::MapsAll>;
 extern template class HashJoinMethods<JoinKind::Left, JoinStrictness::Semi, HashJoin::MapsOne>;
-extern template class HashJoinMethods<JoinKind::Left, JoinStrictness::Semi, HashJoin::MapsAll>;
 extern template class HashJoinMethods<JoinKind::Left, JoinStrictness::Anti, HashJoin::MapsOne>;
-extern template class HashJoinMethods<JoinKind::Left, JoinStrictness::Anti, HashJoin::MapsAll>;
 extern template class HashJoinMethods<JoinKind::Left, JoinStrictness::Asof, HashJoin::MapsAsof>;
 
 extern template class HashJoinMethods<JoinKind::Right, JoinStrictness::RightAny, HashJoin::MapsOne>;
@@ -185,7 +939,6 @@ extern template class HashJoinMethods<JoinKind::Right, JoinStrictness::Asof, Has
 
 extern template class HashJoinMethods<JoinKind::Inner, JoinStrictness::RightAny, HashJoin::MapsOne>;
 extern template class HashJoinMethods<JoinKind::Inner, JoinStrictness::Any, HashJoin::MapsOne>;
-extern template class HashJoinMethods<JoinKind::Inner, JoinStrictness::Any, HashJoin::MapsAll>;
 extern template class HashJoinMethods<JoinKind::Inner, JoinStrictness::All, HashJoin::MapsAll>;
 extern template class HashJoinMethods<JoinKind::Inner, JoinStrictness::Semi, HashJoin::MapsOne>;
 extern template class HashJoinMethods<JoinKind::Inner, JoinStrictness::Anti, HashJoin::MapsOne>;
@@ -198,3 +951,4 @@ extern template class HashJoinMethods<JoinKind::Full, JoinStrictness::Semi, Hash
 extern template class HashJoinMethods<JoinKind::Full, JoinStrictness::Anti, HashJoin::MapsOne>;
 extern template class HashJoinMethods<JoinKind::Full, JoinStrictness::Asof, HashJoin::MapsAsof>;
 }
+
diff --git a/src/Interpreters/HashJoin/HashJoinMethodsImpl.h b/src/Interpreters/HashJoin/HashJoinMethodsImpl.h
deleted file mode 100644
index 320c8851ce4..00000000000
--- a/src/Interpreters/HashJoin/HashJoinMethodsImpl.h
+++ /dev/null
@@ -1,935 +0,0 @@
-#pragma once
-#include <Interpreters/HashJoin/HashJoinMethods.h>
-
-namespace DB
-{
-namespace ErrorCodes
-{
-extern const int UNSUPPORTED_JOIN_KEYS;
-extern const int LOGICAL_ERROR;
-}
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
-size_t HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::insertFromBlockImpl(
-    HashJoin & join,
-    HashJoin::Type type,
-    MapsTemplate & maps,
-    size_t rows,
-    const ColumnRawPtrs & key_columns,
-    const Sizes & key_sizes,
-    Block * stored_block,
-    ConstNullMapPtr null_map,
-    UInt8ColumnDataPtr join_mask,
-    Arena & pool,
-    bool & is_inserted)
-{
-    switch (type)
-    {
-        case HashJoin::Type::EMPTY:
-            [[fallthrough]];
-        case HashJoin::Type::CROSS:
-            /// Do nothing. We will only save block, and it is enough
-            is_inserted = true;
-            return 0;
-
-#define M(TYPE) \
-    case HashJoin::Type::TYPE: \
-        return insertFromBlockImplTypeCase< \
-            typename KeyGetterForType<HashJoin::Type::TYPE, std::remove_reference_t<decltype(*maps.TYPE)>>::Type>( \
-            join, *maps.TYPE, rows, key_columns, key_sizes, stored_block, null_map, join_mask, pool, is_inserted); \
-        break;
-
-            APPLY_FOR_JOIN_VARIANTS(M)
-#undef M
-    }
-}
-
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
-Block HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinBlockImpl(
-    const HashJoin & join, Block & block, const Block & block_with_columns_to_add, const MapsTemplateVector & maps_, bool is_join_get)
-{
-    constexpr JoinFeatures<KIND, STRICTNESS, MapsTemplate> join_features;
-
-    std::vector<JoinOnKeyColumns> join_on_keys;
-    const auto & onexprs = join.table_join->getClauses();
-    for (size_t i = 0; i < onexprs.size(); ++i)
-    {
-        const auto & key_names = !is_join_get ? onexprs[i].key_names_left : onexprs[i].key_names_right;
-        join_on_keys.emplace_back(block, key_names, onexprs[i].condColumnNames().first, join.key_sizes[i]);
-    }
-    size_t existing_columns = block.columns();
-
-    /** If you use FULL or RIGHT JOIN, then the columns from the "left" table must be materialized.
-      * Because if they are constants, then in the "not joined" rows, they may have different values
-      *  - default values, which can differ from the values of these constants.
-      */
-    if constexpr (join_features.right || join_features.full)
-    {
-        materializeBlockInplace(block);
-    }
-
-    /** For LEFT/INNER JOIN, the saved blocks do not contain keys.
-      * For FULL/RIGHT JOIN, the saved blocks contain keys;
-      *  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<!join_features.is_any_join> added_columns(
-        block,
-        block_with_columns_to_add,
-        join.savedBlockSample(),
-        join,
-        std::move(join_on_keys),
-        join.table_join->getMixedJoinExpression(),
-        join_features.is_asof_join,
-        is_join_get);
-
-    bool has_required_right_keys = (join.required_right_keys.columns() != 0);
-    added_columns.need_filter = join_features.need_filter || has_required_right_keys;
-    added_columns.max_joined_block_rows = join.max_joined_block_rows;
-    if (!added_columns.max_joined_block_rows)
-        added_columns.max_joined_block_rows = std::numeric_limits<size_t>::max();
-    else
-        added_columns.reserve(join_features.need_replication);
-
-    size_t num_joined = switchJoinRightColumns(maps_, added_columns, join.data->type, *join.used_flags);
-    /// Do not hold memory for join_on_keys anymore
-    added_columns.join_on_keys.clear();
-    Block remaining_block = sliceBlock(block, num_joined);
-
-    if (is_join_get)
-        added_columns.buildJoinGetOutput();
-    else
-        added_columns.buildOutput();
-    for (size_t i = 0; i < added_columns.size(); ++i)
-        block.insert(added_columns.moveColumn(i));
-
-    std::vector<size_t> right_keys_to_replicate [[maybe_unused]];
-
-    if constexpr (join_features.need_filter)
-    {
-        /// If ANY INNER | RIGHT JOIN - filter all the columns except the new ones.
-        for (size_t i = 0; i < existing_columns; ++i)
-            block.safeGetByPosition(i).column = block.safeGetByPosition(i).column->filter(added_columns.filter, -1);
-
-        /// Add join key columns from right block if needed using value from left table because of equality
-        for (size_t i = 0; i < join.required_right_keys.columns(); ++i)
-        {
-            const auto & right_key = join.required_right_keys.getByPosition(i);
-            /// asof column is already in block.
-            if (join_features.is_asof_join && right_key.name == join.table_join->getOnlyClause().key_names_right.back())
-                continue;
-
-            const auto & left_column = block.getByName(join.required_right_keys_sources[i]);
-            const auto & right_col_name = join.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)
-    {
-        /// Add join key columns from right block if needed.
-        for (size_t i = 0; i < join.required_right_keys.columns(); ++i)
-        {
-            const auto & right_key = join.required_right_keys.getByPosition(i);
-            auto right_col_name = join.getTableJoin().renamedRightColumnName(right_key.name);
-            /// asof column is already in block.
-            if (join_features.is_asof_join && right_key.name == join.table_join->getOnlyClause().key_names_right.back())
-                continue;
-
-            const auto & left_column = block.getByName(join.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)
-    {
-        std::unique_ptr<IColumn::Offsets> & offsets_to_replicate = added_columns.offsets_to_replicate;
-
-        /// If ALL ... JOIN - we replicate all the columns except the new ones.
-        for (size_t i = 0; i < existing_columns; ++i)
-        {
-            block.safeGetByPosition(i).column = block.safeGetByPosition(i).column->replicate(*offsets_to_replicate);
-        }
-
-        /// Replicate additional right keys
-        for (size_t pos : right_keys_to_replicate)
-        {
-            block.safeGetByPosition(pos).column = block.safeGetByPosition(pos).column->replicate(*offsets_to_replicate);
-        }
-    }
-    return remaining_block;
-}
-
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
-template <typename KeyGetter, bool is_asof_join>
-KeyGetter HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::createKeyGetter(const ColumnRawPtrs & key_columns, const Sizes & key_sizes)
-{
-    if constexpr (is_asof_join)
-    {
-        auto key_column_copy = key_columns;
-        auto key_size_copy = key_sizes;
-        key_column_copy.pop_back();
-        key_size_copy.pop_back();
-        return KeyGetter(key_column_copy, key_size_copy, nullptr);
-    }
-    else
-        return KeyGetter(key_columns, key_sizes, nullptr);
-}
-
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
-template <typename KeyGetter, typename HashMap>
-size_t HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::insertFromBlockImplTypeCase(
-    HashJoin & join,
-    HashMap & map,
-    size_t rows,
-    const ColumnRawPtrs & key_columns,
-    const Sizes & key_sizes,
-    Block * stored_block,
-    ConstNullMapPtr null_map,
-    UInt8ColumnDataPtr join_mask,
-    Arena & pool,
-    bool & is_inserted)
-{
-    [[maybe_unused]] constexpr bool mapped_one = std::is_same_v<typename HashMap::mapped_type, RowRef>;
-    constexpr bool is_asof_join = STRICTNESS == JoinStrictness::Asof;
-
-    const IColumn * asof_column [[maybe_unused]] = nullptr;
-    if constexpr (is_asof_join)
-        asof_column = key_columns.back();
-
-    auto key_getter = createKeyGetter<KeyGetter, is_asof_join>(key_columns, key_sizes);
-
-    /// For ALL and ASOF join always insert values
-    is_inserted = !mapped_one || is_asof_join;
-
-    for (size_t i = 0; i < rows; ++i)
-    {
-        if (null_map && (*null_map)[i])
-        {
-            /// nulls are not inserted into hash table,
-            /// keep them for RIGHT and FULL joins
-            is_inserted = true;
-            continue;
-        }
-
-        /// Check condition for right table from ON section
-        if (join_mask && !(*join_mask)[i])
-            continue;
-
-        if constexpr (is_asof_join)
-            Inserter<HashMap, KeyGetter>::insertAsof(join, map, key_getter, stored_block, i, pool, *asof_column);
-        else if constexpr (mapped_one)
-            is_inserted |= Inserter<HashMap, KeyGetter>::insertOne(join, map, key_getter, stored_block, i, pool);
-        else
-            Inserter<HashMap, KeyGetter>::insertAll(join, map, key_getter, stored_block, i, pool);
-    }
-    return map.getBufferSizeInCells();
-}
-
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
-template <typename AddedColumns>
-size_t HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::switchJoinRightColumns(
-    const std::vector<const MapsTemplate *> & mapv,
-    AddedColumns & added_columns,
-    HashJoin::Type type,
-    JoinStuff::JoinUsedFlags & used_flags)
-{
-    constexpr bool is_asof_join = STRICTNESS == JoinStrictness::Asof;
-    switch (type)
-    {
-        case HashJoin::Type::EMPTY: {
-            if constexpr (!is_asof_join)
-            {
-                using KeyGetter = KeyGetterEmpty<typename MapsTemplate::MappedType>;
-                std::vector<KeyGetter> key_getter_vector;
-                key_getter_vector.emplace_back();
-
-                using MapTypeVal = typename KeyGetter::MappedType;
-                std::vector<const MapTypeVal *> a_map_type_vector;
-                a_map_type_vector.emplace_back();
-                return joinRightColumnsSwitchNullability<KeyGetter>(
-                    std::move(key_getter_vector), a_map_type_vector, added_columns, used_flags);
-            }
-            throw Exception(ErrorCodes::UNSUPPORTED_JOIN_KEYS, "Unsupported JOIN keys. Type: {}", type);
-        }
-#define M(TYPE) \
-    case HashJoin::Type::TYPE: { \
-        using MapTypeVal = const typename std::remove_reference_t<decltype(MapsTemplate::TYPE)>::element_type; \
-        using KeyGetter = typename KeyGetterForType<HashJoin::Type::TYPE, MapTypeVal>::Type; \
-        std::vector<const MapTypeVal *> a_map_type_vector(mapv.size()); \
-        std::vector<KeyGetter> key_getter_vector; \
-        for (size_t d = 0; d < added_columns.join_on_keys.size(); ++d) \
-        { \
-            const auto & join_on_key = added_columns.join_on_keys[d]; \
-            a_map_type_vector[d] = mapv[d]->TYPE.get(); \
-            key_getter_vector.push_back( \
-                std::move(createKeyGetter<KeyGetter, is_asof_join>(join_on_key.key_columns, join_on_key.key_sizes))); \
-        } \
-        return joinRightColumnsSwitchNullability<KeyGetter>(std::move(key_getter_vector), a_map_type_vector, added_columns, used_flags); \
-    }
-            APPLY_FOR_JOIN_VARIANTS(M)
-#undef M
-
-        default:
-            throw Exception(ErrorCodes::UNSUPPORTED_JOIN_KEYS, "Unsupported JOIN keys (type: {})", type);
-    }
-}
-
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
-template <typename KeyGetter, typename Map, typename AddedColumns>
-size_t HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsSwitchNullability(
-    std::vector<KeyGetter> && key_getter_vector,
-    const std::vector<const Map *> & mapv,
-    AddedColumns & added_columns,
-    JoinStuff::JoinUsedFlags & used_flags)
-{
-    if (added_columns.need_filter)
-    {
-        return joinRightColumnsSwitchMultipleDisjuncts<KeyGetter, Map, true>(
-            std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags);
-    }
-    else
-    {
-        return joinRightColumnsSwitchMultipleDisjuncts<KeyGetter, Map, false>(
-            std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags);
-    }
-}
-
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
-template <typename KeyGetter, typename Map, bool need_filter, typename AddedColumns>
-size_t HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsSwitchMultipleDisjuncts(
-    std::vector<KeyGetter> && key_getter_vector,
-    const std::vector<const Map *> & mapv,
-    AddedColumns & added_columns,
-    JoinStuff::JoinUsedFlags & used_flags)
-{
-    constexpr JoinFeatures<KIND, STRICTNESS, MapsTemplate> join_features;
-    if constexpr (join_features.is_maps_all)
-    {
-        if (added_columns.additional_filter_expression)
-        {
-            bool mark_per_row_used = join_features.right || join_features.full || mapv.size() > 1;
-            return joinRightColumnsWithAddtitionalFilter<KeyGetter, Map>(
-                std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags, need_filter, mark_per_row_used);
-        }
-    }
-
-    if (added_columns.additional_filter_expression)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Additional filter expression is not supported for this JOIN");
-
-    return mapv.size() > 1 ? joinRightColumns<KeyGetter, Map, need_filter, true>(
-               std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags)
-                           : joinRightColumns<KeyGetter, Map, need_filter, false>(
-                               std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags);
-}
-
-
-/// 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 MapsTemplate>
-template <typename KeyGetter, typename Map, bool need_filter, bool flag_per_row, typename AddedColumns>
-size_t HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumns(
-    std::vector<KeyGetter> && key_getter_vector,
-    const std::vector<const Map *> & mapv,
-    AddedColumns & added_columns,
-    JoinStuff::JoinUsedFlags & used_flags)
-{
-    constexpr JoinFeatures<KIND, STRICTNESS, MapsTemplate> join_features;
-
-    size_t rows = added_columns.rows_to_add;
-    if constexpr (need_filter)
-        added_columns.filter = IColumn::Filter(rows, 0);
-    if constexpr (!flag_per_row && (STRICTNESS == JoinStrictness::All || (STRICTNESS == JoinStrictness::Semi && KIND == JoinKind::Right)))
-        added_columns.output_by_row_list = true;
-
-    Arena pool;
-
-    if constexpr (join_features.need_replication)
-        added_columns.offsets_to_replicate = std::make_unique<IColumn::Offsets>(rows);
-
-    IColumn::Offset current_offset = 0;
-    size_t max_joined_block_rows = added_columns.max_joined_block_rows;
-    size_t i = 0;
-    for (; i < rows; ++i)
-    {
-        if constexpr (join_features.need_replication)
-        {
-            if (unlikely(current_offset >= max_joined_block_rows))
-            {
-                added_columns.offsets_to_replicate->resize(i);
-                added_columns.filter.resize(i);
-                break;
-            }
-        }
-
-        bool right_row_found = false;
-        KnownRowsHolder<flag_per_row> known_rows;
-        for (size_t onexpr_idx = 0; onexpr_idx < added_columns.join_on_keys.size(); ++onexpr_idx)
-        {
-            const auto & join_keys = added_columns.join_on_keys[onexpr_idx];
-            if (join_keys.null_map && (*join_keys.null_map)[i])
-                continue;
-
-            bool row_acceptable = !join_keys.isRowFiltered(i);
-            using FindResult = typename KeyGetter::FindResult;
-            auto find_result = row_acceptable ? key_getter_vector[onexpr_idx].findKey(*(mapv[onexpr_idx]), i, pool) : FindResult();
-
-            if (find_result.isFound())
-            {
-                right_row_found = true;
-                auto & mapped = find_result.getMapped();
-                if constexpr (join_features.is_asof_join)
-                {
-                    const IColumn & left_asof_key = added_columns.leftAsofKey();
-
-                    auto row_ref = mapped->findAsof(left_asof_key, i);
-                    if (row_ref && row_ref->block)
-                    {
-                        setUsed<need_filter>(added_columns.filter, i);
-                        if constexpr (flag_per_row)
-                            used_flags.template setUsed<join_features.need_flags, flag_per_row>(row_ref->block, row_ref->row_num, 0);
-                        else
-                            used_flags.template setUsed<join_features.need_flags, flag_per_row>(find_result);
-
-                        added_columns.appendFromBlock(row_ref, join_features.add_missing);
-                    }
-                    else
-                        addNotFoundRow<join_features.add_missing, join_features.need_replication>(added_columns, current_offset);
-                }
-                else if constexpr (join_features.is_all_join)
-                {
-                    setUsed<need_filter>(added_columns.filter, i);
-                    used_flags.template setUsed<join_features.need_flags, flag_per_row>(find_result);
-                    auto used_flags_opt = join_features.need_flags ? &used_flags : nullptr;
-                    addFoundRowAll<Map, join_features.add_missing>(mapped, added_columns, current_offset, known_rows, used_flags_opt);
-                }
-                else if constexpr ((join_features.is_any_join || join_features.is_semi_join) && join_features.right)
-                {
-                    /// Use first appeared left key + it needs left columns replication
-                    bool used_once = used_flags.template setUsedOnce<join_features.need_flags, flag_per_row>(find_result);
-                    if (used_once)
-                    {
-                        auto used_flags_opt = join_features.need_flags ? &used_flags : nullptr;
-                        setUsed<need_filter>(added_columns.filter, i);
-                        addFoundRowAll<Map, join_features.add_missing>(mapped, added_columns, current_offset, known_rows, used_flags_opt);
-                    }
-                }
-                else if constexpr (join_features.is_any_join && join_features.inner)
-                {
-                    bool used_once = used_flags.template setUsedOnce<join_features.need_flags, flag_per_row>(find_result);
-
-                    /// Use first appeared left key only
-                    if (used_once)
-                    {
-                        setUsed<need_filter>(added_columns.filter, i);
-                        added_columns.appendFromBlock(&mapped, join_features.add_missing);
-                    }
-
-                    break;
-                }
-                else if constexpr (join_features.is_any_join && join_features.full)
-                {
-                    /// TODO
-                }
-                else if constexpr (join_features.is_anti_join)
-                {
-                    if constexpr (join_features.right && join_features.need_flags)
-                        used_flags.template setUsed<join_features.need_flags, flag_per_row>(find_result);
-                }
-                else /// ANY LEFT, SEMI LEFT, old ANY (RightAny)
-                {
-                    setUsed<need_filter>(added_columns.filter, i);
-                    used_flags.template setUsed<join_features.need_flags, flag_per_row>(find_result);
-                    added_columns.appendFromBlock(&mapped, join_features.add_missing);
-
-                    if (join_features.is_any_or_semi_join)
-                    {
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (!right_row_found)
-        {
-            if constexpr (join_features.is_anti_join && join_features.left)
-                setUsed<need_filter>(added_columns.filter, i);
-            addNotFoundRow<join_features.add_missing, join_features.need_replication>(added_columns, current_offset);
-        }
-
-        if constexpr (join_features.need_replication)
-        {
-            (*added_columns.offsets_to_replicate)[i] = current_offset;
-        }
-    }
-
-    added_columns.applyLazyDefaults();
-    return i;
-}
-
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
-template <bool need_filter>
-void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::setUsed(IColumn::Filter & filter [[maybe_unused]], size_t pos [[maybe_unused]])
-{
-    if constexpr (need_filter)
-        filter[pos] = 1;
-}
-
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
-template <typename AddedColumns>
-ColumnPtr HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::buildAdditionalFilter(
-    size_t left_start_row,
-    const std::vector<const RowRef *> & selected_rows,
-    const std::vector<size_t> & row_replicate_offset,
-    AddedColumns & added_columns)
-{
-    ColumnPtr result_column;
-    do
-    {
-        if (selected_rows.empty())
-        {
-            result_column = ColumnUInt8::create();
-            break;
-        }
-        const Block & sample_right_block = *((*selected_rows.begin())->block);
-        if (!sample_right_block || !added_columns.additional_filter_expression)
-        {
-            auto filter = ColumnUInt8::create();
-            filter->insertMany(1, selected_rows.size());
-            result_column = std::move(filter);
-            break;
-        }
-
-        auto required_cols = added_columns.additional_filter_expression->getRequiredColumnsWithTypes();
-        if (required_cols.empty())
-        {
-            Block block;
-            added_columns.additional_filter_expression->execute(block);
-            result_column = block.getByPosition(0).column->cloneResized(selected_rows.size());
-            break;
-        }
-        NameSet required_column_names;
-        for (auto & col : required_cols)
-            required_column_names.insert(col.name);
-
-        Block executed_block;
-        size_t right_col_pos = 0;
-        for (const auto & col : sample_right_block.getColumnsWithTypeAndName())
-        {
-            if (required_column_names.contains(col.name))
-            {
-                auto new_col = col.column->cloneEmpty();
-                for (const auto & selected_row : selected_rows)
-                {
-                    const auto & src_col = selected_row->block->getByPosition(right_col_pos);
-                    new_col->insertFrom(*src_col.column, selected_row->row_num);
-                }
-                executed_block.insert({std::move(new_col), col.type, col.name});
-            }
-            right_col_pos += 1;
-        }
-        if (!executed_block)
-        {
-            result_column = ColumnUInt8::create();
-            break;
-        }
-
-        for (const auto & col_name : required_column_names)
-        {
-            const auto * src_col = added_columns.left_block.findByName(col_name);
-            if (!src_col)
-                continue;
-            auto new_col = src_col->column->cloneEmpty();
-            size_t prev_left_offset = 0;
-            for (size_t i = 1; i < row_replicate_offset.size(); ++i)
-            {
-                const size_t & left_offset = row_replicate_offset[i];
-                size_t rows = left_offset - prev_left_offset;
-                if (rows)
-                    new_col->insertManyFrom(*src_col->column, left_start_row + i - 1, rows);
-                prev_left_offset = left_offset;
-            }
-            executed_block.insert({std::move(new_col), src_col->type, col_name});
-        }
-        if (!executed_block)
-        {
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "required columns: [{}], but not found any in left/right table. right table: {}, left table: {}",
-                required_cols.toString(),
-                sample_right_block.dumpNames(),
-                added_columns.left_block.dumpNames());
-        }
-
-        for (const auto & col : executed_block.getColumnsWithTypeAndName())
-            if (!col.column || !col.type)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Illegal nullptr column in input block: {}", executed_block.dumpStructure());
-
-        added_columns.additional_filter_expression->execute(executed_block);
-        result_column = executed_block.getByPosition(0).column->convertToFullColumnIfConst();
-        executed_block.clear();
-    } while (false);
-
-    result_column = result_column->convertToFullIfNeeded();
-    if (result_column->isNullable())
-    {
-        /// Convert Nullable(UInt8) to UInt8 ensuring that nulls are zeros
-        /// Trying to avoid copying data, since we are the only owner of the column.
-        ColumnPtr mask_column = assert_cast<const ColumnNullable &>(*result_column).getNullMapColumnPtr();
-
-        MutableColumnPtr mutable_column;
-        {
-            ColumnPtr nested_column = assert_cast<const ColumnNullable &>(*result_column).getNestedColumnPtr();
-            result_column.reset();
-            mutable_column = IColumn::mutate(std::move(nested_column));
-        }
-
-        auto & column_data = assert_cast<ColumnUInt8 &>(*mutable_column).getData();
-        const auto & mask_column_data = assert_cast<const ColumnUInt8 &>(*mask_column).getData();
-        for (size_t i = 0; i < column_data.size(); ++i)
-        {
-            if (mask_column_data[i])
-                column_data[i] = 0;
-        }
-        return mutable_column;
-    }
-    return result_column;
-}
-
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
-template <typename KeyGetter, typename Map, typename AddedColumns>
-size_t HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::joinRightColumnsWithAddtitionalFilter(
-    std::vector<KeyGetter> && key_getter_vector,
-    const std::vector<const Map *> & mapv,
-    AddedColumns & added_columns,
-    JoinStuff::JoinUsedFlags & used_flags [[maybe_unused]],
-    bool need_filter [[maybe_unused]],
-    bool flag_per_row [[maybe_unused]])
-{
-    constexpr JoinFeatures<KIND, STRICTNESS, MapsTemplate> join_features;
-    size_t left_block_rows = added_columns.rows_to_add;
-    if (need_filter)
-        added_columns.filter = IColumn::Filter(left_block_rows, 0);
-
-    std::unique_ptr<Arena> pool;
-
-    if constexpr (join_features.need_replication)
-        added_columns.offsets_to_replicate = std::make_unique<IColumn::Offsets>(left_block_rows);
-
-    std::vector<size_t> row_replicate_offset;
-    row_replicate_offset.reserve(left_block_rows);
-
-    using FindResult = typename KeyGetter::FindResult;
-    size_t max_joined_block_rows = added_columns.max_joined_block_rows;
-    size_t left_row_iter = 0;
-    PreSelectedRows selected_rows;
-    selected_rows.reserve(left_block_rows);
-    std::vector<FindResult> find_results;
-    find_results.reserve(left_block_rows);
-    bool exceeded_max_block_rows = false;
-    IColumn::Offset total_added_rows = 0;
-    IColumn::Offset current_added_rows = 0;
-
-    auto collect_keys_matched_rows_refs = [&]()
-    {
-        pool = std::make_unique<Arena>();
-        find_results.clear();
-        row_replicate_offset.clear();
-        row_replicate_offset.push_back(0);
-        current_added_rows = 0;
-        selected_rows.clear();
-        for (; left_row_iter < left_block_rows; ++left_row_iter)
-        {
-            if constexpr (join_features.need_replication)
-            {
-                if (unlikely(total_added_rows + current_added_rows >= max_joined_block_rows))
-                {
-                    break;
-                }
-            }
-            KnownRowsHolder<true> all_flag_known_rows;
-            KnownRowsHolder<false> single_flag_know_rows;
-            for (size_t join_clause_idx = 0; join_clause_idx < added_columns.join_on_keys.size(); ++join_clause_idx)
-            {
-                const auto & join_keys = added_columns.join_on_keys[join_clause_idx];
-                if (join_keys.null_map && (*join_keys.null_map)[left_row_iter])
-                    continue;
-
-                bool row_acceptable = !join_keys.isRowFiltered(left_row_iter);
-                auto find_result = row_acceptable
-                    ? key_getter_vector[join_clause_idx].findKey(*(mapv[join_clause_idx]), left_row_iter, *pool)
-                    : FindResult();
-
-                if (find_result.isFound())
-                {
-                    auto & mapped = find_result.getMapped();
-                    find_results.push_back(find_result);
-                    /// We don't add missing in addFoundRowAll here. we will add it after filter is applied.
-                    /// it's different from `joinRightColumns`.
-                    if (flag_per_row)
-                        addFoundRowAll<Map, false, true>(mapped, selected_rows, current_added_rows, all_flag_known_rows, nullptr);
-                    else
-                        addFoundRowAll<Map, false, false>(mapped, selected_rows, current_added_rows, single_flag_know_rows, nullptr);
-                }
-            }
-            row_replicate_offset.push_back(current_added_rows);
-        }
-    };
-
-    auto copy_final_matched_rows = [&](size_t left_start_row, ColumnPtr filter_col)
-    {
-        const PaddedPODArray<UInt8> & filter_flags = assert_cast<const ColumnUInt8 &>(*filter_col).getData();
-
-        size_t prev_replicated_row = 0;
-        auto selected_right_row_it = selected_rows.begin();
-        size_t find_result_index = 0;
-        for (size_t i = 1, n = row_replicate_offset.size(); i < n; ++i)
-        {
-            bool any_matched = false;
-            /// right/full join or multiple disjuncts, we need to mark used flags for each row.
-            if (flag_per_row)
-            {
-                for (size_t replicated_row = prev_replicated_row; replicated_row < row_replicate_offset[i]; ++replicated_row)
-                {
-                    if (filter_flags[replicated_row])
-                    {
-                        if constexpr (join_features.is_semi_join || join_features.is_any_join)
-                        {
-                            /// For LEFT/INNER SEMI/ANY JOIN, we need to add only first appeared row from left,
-                            if constexpr (join_features.left || join_features.inner)
-                            {
-                                if (!any_matched)
-                                {
-                                    // For inner join, we need mark each right row'flag, because we only use each right row once.
-                                    auto used_once = used_flags.template setUsedOnce<join_features.need_flags, true>(
-                                        (*selected_right_row_it)->block, (*selected_right_row_it)->row_num, 0);
-                                    if (used_once)
-                                    {
-                                        any_matched = true;
-                                        total_added_rows += 1;
-                                        added_columns.appendFromBlock(*selected_right_row_it, join_features.add_missing);
-                                    }
-                                }
-                            }
-                            else
-                            {
-                                auto used_once = used_flags.template setUsedOnce<join_features.need_flags, true>(
-                                    (*selected_right_row_it)->block, (*selected_right_row_it)->row_num, 0);
-                                if (used_once)
-                                {
-                                    any_matched = true;
-                                    total_added_rows += 1;
-                                    added_columns.appendFromBlock(*selected_right_row_it, join_features.add_missing);
-                                }
-                            }
-                        }
-                        else if constexpr (join_features.is_anti_join)
-                        {
-                            any_matched = true;
-                            if constexpr (join_features.right && join_features.need_flags)
-                                used_flags.template setUsed<true, true>((*selected_right_row_it)->block, (*selected_right_row_it)->row_num, 0);
-                        }
-                        else
-                        {
-                            any_matched = true;
-                            total_added_rows += 1;
-                            added_columns.appendFromBlock(*selected_right_row_it, join_features.add_missing);
-                            used_flags.template setUsed<join_features.need_flags, true>((*selected_right_row_it)->block, (*selected_right_row_it)->row_num, 0);
-                        }
-                    }
-
-                    ++selected_right_row_it;
-                }
-            }
-            else
-            {
-                for (size_t replicated_row = prev_replicated_row; replicated_row < row_replicate_offset[i]; ++replicated_row)
-                {
-                    if constexpr (join_features.is_anti_join)
-                    {
-                        any_matched |= filter_flags[replicated_row];
-                    }
-                    else if constexpr (join_features.need_replication)
-                    {
-                        if (filter_flags[replicated_row])
-                        {
-                            any_matched = true;
-                            added_columns.appendFromBlock(*selected_right_row_it, join_features.add_missing);
-                            total_added_rows += 1;
-                        }
-                        ++selected_right_row_it;
-                    }
-                    else
-                    {
-                        if (filter_flags[replicated_row])
-                        {
-                            any_matched = true;
-                            added_columns.appendFromBlock(*selected_right_row_it, join_features.add_missing);
-                            total_added_rows += 1;
-                            selected_right_row_it = selected_right_row_it + row_replicate_offset[i] - replicated_row;
-                            break;
-                        }
-                        else
-                            ++selected_right_row_it;
-                    }
-                }
-            }
-
-
-            if constexpr (join_features.is_anti_join)
-            {
-                if (!any_matched)
-                {
-                    if constexpr (join_features.left)
-                        if (need_filter)
-                            setUsed<true>(added_columns.filter, left_start_row + i - 1);
-                    addNotFoundRow<join_features.add_missing, join_features.need_replication>(added_columns, total_added_rows);
-                }
-            }
-            else
-            {
-                if (!any_matched)
-                {
-                    addNotFoundRow<join_features.add_missing, join_features.need_replication>(added_columns, total_added_rows);
-                }
-                else
-                {
-                    if (!flag_per_row)
-                        used_flags.template setUsed<join_features.need_flags, false>(find_results[find_result_index]);
-                    if (need_filter)
-                        setUsed<true>(added_columns.filter, left_start_row + i - 1);
-                    if constexpr (join_features.add_missing)
-                        added_columns.applyLazyDefaults();
-                }
-            }
-            find_result_index += (prev_replicated_row != row_replicate_offset[i]);
-
-            if constexpr (join_features.need_replication)
-            {
-                (*added_columns.offsets_to_replicate)[left_start_row + i - 1] = total_added_rows;
-            }
-            prev_replicated_row = row_replicate_offset[i];
-        }
-    };
-
-    while (left_row_iter < left_block_rows && !exceeded_max_block_rows)
-    {
-        auto left_start_row = left_row_iter;
-        collect_keys_matched_rows_refs();
-        if (selected_rows.size() != current_added_rows || row_replicate_offset.size() != left_row_iter - left_start_row + 1)
-        {
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "Sizes are mismatched. selected_rows.size:{}, current_added_rows:{}, row_replicate_offset.size:{}, left_row_iter: {}, "
-                "left_start_row: {}",
-                selected_rows.size(),
-                current_added_rows,
-                row_replicate_offset.size(),
-                left_row_iter,
-                left_start_row);
-        }
-        auto filter_col = buildAdditionalFilter(left_start_row, selected_rows, row_replicate_offset, added_columns);
-        copy_final_matched_rows(left_start_row, filter_col);
-
-        if constexpr (join_features.need_replication)
-        {
-            // Add a check for current_added_rows to avoid run the filter expression on too small size batch.
-            if (total_added_rows >= max_joined_block_rows || current_added_rows < 1024)
-                exceeded_max_block_rows = true;
-        }
-    }
-
-    if constexpr (join_features.need_replication)
-    {
-        added_columns.offsets_to_replicate->resize_assume_reserved(left_row_iter);
-        added_columns.filter.resize_assume_reserved(left_row_iter);
-    }
-    added_columns.applyLazyDefaults();
-    return left_row_iter;
-}
-
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
-Block HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::sliceBlock(Block & block, size_t num_rows)
-{
-    size_t total_rows = block.rows();
-    if (num_rows >= total_rows)
-        return {};
-    size_t remaining_rows = total_rows - num_rows;
-    Block remaining_block = block.cloneEmpty();
-    for (size_t i = 0; i < block.columns(); ++i)
-    {
-        auto & col = block.getByPosition(i);
-        remaining_block.getByPosition(i).column = col.column->cut(num_rows, remaining_rows);
-        col.column = col.column->cut(0, num_rows);
-    }
-    return remaining_block;
-}
-
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
-ColumnWithTypeAndName HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::copyLeftKeyColumnToRight(
-    const DataTypePtr & right_key_type,
-    const String & renamed_right_column,
-    const ColumnWithTypeAndName & left_column,
-    const IColumn::Filter * null_map_filter)
-{
-    ColumnWithTypeAndName right_column = left_column;
-    right_column.name = renamed_right_column;
-
-    if (null_map_filter)
-        right_column.column = JoinCommon::filterWithBlanks(right_column.column, *null_map_filter);
-
-    bool should_be_nullable = isNullableOrLowCardinalityNullable(right_key_type);
-    if (null_map_filter)
-        correctNullabilityInplace(right_column, should_be_nullable, *null_map_filter);
-    else
-        correctNullabilityInplace(right_column, should_be_nullable);
-
-    if (!right_column.type->equals(*right_key_type))
-    {
-        right_column.column = castColumnAccurate(right_column, right_key_type);
-        right_column.type = right_key_type;
-    }
-
-    right_column.column = right_column.column->convertToFullColumnIfConst();
-    return right_column;
-}
-
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
-void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::correctNullabilityInplace(ColumnWithTypeAndName & column, bool nullable)
-{
-    if (nullable)
-    {
-        JoinCommon::convertColumnToNullable(column);
-    }
-    else
-    {
-        /// We have to replace values masked by NULLs with defaults.
-        if (column.column)
-            if (const auto * nullable_column = checkAndGetColumn<ColumnNullable>(&*column.column))
-                column.column = JoinCommon::filterWithBlanks(column.column, nullable_column->getNullMapColumn().getData(), true);
-
-        JoinCommon::removeColumnNullability(column);
-    }
-}
-
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename MapsTemplate>
-void HashJoinMethods<KIND, STRICTNESS, MapsTemplate>::correctNullabilityInplace(
-    ColumnWithTypeAndName & column, bool nullable, const IColumn::Filter & negative_null_map)
-{
-    if (nullable)
-    {
-        JoinCommon::convertColumnToNullable(column);
-        if (column.type->isNullable() && !negative_null_map.empty())
-        {
-            MutableColumnPtr mutable_column = IColumn::mutate(std::move(column.column));
-            assert_cast<ColumnNullable &>(*mutable_column).applyNegatedNullMap(negative_null_map);
-            column.column = std::move(mutable_column);
-        }
-    }
-    else
-        JoinCommon::removeColumnNullability(column);
-}
-}
diff --git a/src/Interpreters/HashJoin/InnerHashJoin.cpp b/src/Interpreters/HashJoin/InnerHashJoin.cpp
index 69f4c620cb8..85aedf3a8e5 100644
--- a/src/Interpreters/HashJoin/InnerHashJoin.cpp
+++ b/src/Interpreters/HashJoin/InnerHashJoin.cpp
@@ -1,11 +1,10 @@
 
-#include <Interpreters/HashJoin/HashJoinMethodsImpl.h>
+#include <Interpreters/HashJoin/HashJoinMethods.h>
 
 namespace DB
 {
 template class HashJoinMethods<JoinKind::Inner, JoinStrictness::RightAny, HashJoin::MapsOne>;
 template class HashJoinMethods<JoinKind::Inner, JoinStrictness::Any, HashJoin::MapsOne>;
-template class HashJoinMethods<JoinKind::Inner, JoinStrictness::Any, HashJoin::MapsAll>;
 template class HashJoinMethods<JoinKind::Inner, JoinStrictness::All, HashJoin::MapsAll>;
 template class HashJoinMethods<JoinKind::Inner, JoinStrictness::Semi, HashJoin::MapsOne>;
 template class HashJoinMethods<JoinKind::Inner, JoinStrictness::Anti, HashJoin::MapsOne>;
diff --git a/src/Interpreters/HashJoin/JoinFeatures.h b/src/Interpreters/HashJoin/JoinFeatures.h
index b39593e7cac..2f2bd1e29a2 100644
--- a/src/Interpreters/HashJoin/JoinFeatures.h
+++ b/src/Interpreters/HashJoin/JoinFeatures.h
@@ -3,41 +3,26 @@
 #include <Interpreters/joinDispatch.h>
 namespace DB
 {
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename Map>
+template <JoinKind KIND, JoinStrictness STRICTNESS>
 struct JoinFeatures
 {
     static constexpr bool is_any_join = STRICTNESS == JoinStrictness::Any;
+    static constexpr bool is_any_or_semi_join = STRICTNESS == JoinStrictness::Any || STRICTNESS == JoinStrictness::RightAny || (STRICTNESS == JoinStrictness::Semi && KIND == JoinKind::Left);
     static constexpr bool is_all_join = STRICTNESS == JoinStrictness::All;
     static constexpr bool is_asof_join = STRICTNESS == JoinStrictness::Asof;
     static constexpr bool is_semi_join = STRICTNESS == JoinStrictness::Semi;
     static constexpr bool is_anti_join = STRICTNESS == JoinStrictness::Anti;
-    static constexpr bool is_any_or_semi_join = is_any_join || STRICTNESS == JoinStrictness::RightAny || (is_semi_join && KIND == JoinKind::Left);
 
     static constexpr bool left = KIND == JoinKind::Left;
     static constexpr bool right = KIND == JoinKind::Right;
     static constexpr bool inner = KIND == JoinKind::Inner;
     static constexpr bool full = KIND == JoinKind::Full;
 
-    /** Whether we may need duplicate rows from the left table.
-      * For example, when we have row (key1, attr1) in left table
-      * and rows (key1, attr2), (key1, attr3) in right table,
-      * then we need to duplicate row (key1, attr1) for each of joined rows from right table, so result will be
-      * (key1, attr1, key1, attr2)
-      * (key1, attr1, key1, attr3)
-      */
     static constexpr bool need_replication = is_all_join || (is_any_join && right) || (is_semi_join && right);
-
-    /// Whether we need to filter rows from the left table that do not have matches in the right table.
     static constexpr bool need_filter = !need_replication && (inner || right || (is_semi_join && left) || (is_anti_join && left));
-
-    /// Whether we need to add default values for columns from the left table.
     static constexpr bool add_missing = (left || full) && !is_semi_join;
 
-    /// Whether we need to store flags for rows from the right table table
-    /// that indicates if they have matches in the left table.
-    static constexpr bool need_flags = MapGetter<KIND, STRICTNESS, std::is_same_v<std::decay_t<Map>, HashJoin::MapsAll>>::flagged;
-
-    static constexpr bool is_maps_all = std::is_same_v<std::decay_t<Map>, HashJoin::MapsAll>;
+    static constexpr bool need_flags = MapGetter<KIND, STRICTNESS>::flagged;
 };
 
 }
diff --git a/src/Interpreters/HashJoin/JoinUsedFlags.h b/src/Interpreters/HashJoin/JoinUsedFlags.h
index c84c6ec3fea..bd41ba2073f 100644
--- a/src/Interpreters/HashJoin/JoinUsedFlags.h
+++ b/src/Interpreters/HashJoin/JoinUsedFlags.h
@@ -26,10 +26,10 @@ public:
     /// Update size for vector with flags.
     /// Calling this method invalidates existing flags.
     /// It can be called several times, but all of them should happen before using this structure.
-    template <JoinKind KIND, JoinStrictness STRICTNESS, bool prefer_use_maps_all>
+    template <JoinKind KIND, JoinStrictness STRICTNESS>
     void reinit(size_t size)
     {
-        if constexpr (MapGetter<KIND, STRICTNESS, prefer_use_maps_all>::flagged)
+        if constexpr (MapGetter<KIND, STRICTNESS>::flagged)
         {
             assert(flags[nullptr].size() <= size);
             need_flags = true;
@@ -43,10 +43,10 @@ public:
         }
     }
 
-    template <JoinKind KIND, JoinStrictness STRICTNESS, bool prefer_use_maps_all>
+    template <JoinKind KIND, JoinStrictness STRICTNESS>
     void reinit(const Block * block_ptr)
     {
-        if constexpr (MapGetter<KIND, STRICTNESS, prefer_use_maps_all>::flagged)
+        if constexpr (MapGetter<KIND, STRICTNESS>::flagged)
         {
             assert(flags[block_ptr].size() <= block_ptr->rows());
             need_flags = true;
@@ -148,31 +148,6 @@ public:
         }
 
     }
-    template <bool use_flags, bool flag_per_row>
-    bool setUsedOnce(const Block * block, size_t row_num, size_t offset)
-    {
-        if constexpr (!use_flags)
-            return true;
-
-        if constexpr (flag_per_row)
-        {
-            /// fast check to prevent heavy CAS with seq_cst order
-            if (flags[block][row_num].load(std::memory_order_relaxed))
-                return false;
-
-            bool expected = false;
-            return flags[block][row_num].compare_exchange_strong(expected, true);
-        }
-        else
-        {
-            /// fast check to prevent heavy CAS with seq_cst order
-            if (flags[nullptr][offset].load(std::memory_order_relaxed))
-                return false;
-
-            bool expected = false;
-            return flags[nullptr][offset].compare_exchange_strong(expected, true);
-        }
-    }
 };
 
 }
diff --git a/src/Interpreters/HashJoin/KnowRowsHolder.h b/src/Interpreters/HashJoin/KnowRowsHolder.h
index 9223e98d13c..d51c96893c5 100644
--- a/src/Interpreters/HashJoin/KnowRowsHolder.h
+++ b/src/Interpreters/HashJoin/KnowRowsHolder.h
@@ -104,7 +104,7 @@ void addFoundRowAll(
         {
             if (!known_rows.isKnown(std::make_pair(it->block, it->row_num)))
             {
-                added.appendFromBlock(*it, false);
+                added.appendFromBlock(*it->block, it->row_num, false);
                 ++current_offset;
                 if (!new_known_rows_ptr)
                 {
@@ -124,16 +124,11 @@ void addFoundRowAll(
             known_rows.add(std::cbegin(*new_known_rows_ptr), std::cend(*new_known_rows_ptr));
         }
     }
-    else if constexpr (AddedColumns::isLazy())
-    {
-        added.appendFromBlock(&mapped, false);
-        current_offset += mapped.rows;
-    }
     else
     {
         for (auto it = mapped.begin(); it.ok(); ++it)
         {
-            added.appendFromBlock(*it, false);
+            added.appendFromBlock(*it->block, it->row_num, false);
             ++current_offset;
         }
     }
diff --git a/src/Interpreters/HashJoin/LeftHashJoin.cpp b/src/Interpreters/HashJoin/LeftHashJoin.cpp
index 4e06789570e..69e17ff70bd 100644
--- a/src/Interpreters/HashJoin/LeftHashJoin.cpp
+++ b/src/Interpreters/HashJoin/LeftHashJoin.cpp
@@ -1,14 +1,11 @@
-#include <Interpreters/HashJoin/HashJoinMethodsImpl.h>
+#include <Interpreters/HashJoin/HashJoinMethods.h>
 
 namespace DB
 {
 template class HashJoinMethods<JoinKind::Left, JoinStrictness::RightAny, HashJoin::MapsOne>;
 template class HashJoinMethods<JoinKind::Left, JoinStrictness::Any, HashJoin::MapsOne>;
-template class HashJoinMethods<JoinKind::Left, JoinStrictness::Any, HashJoin::MapsAll>;
 template class HashJoinMethods<JoinKind::Left, JoinStrictness::All, HashJoin::MapsAll>;
 template class HashJoinMethods<JoinKind::Left, JoinStrictness::Semi, HashJoin::MapsOne>;
-template class HashJoinMethods<JoinKind::Left, JoinStrictness::Semi, HashJoin::MapsAll>;
 template class HashJoinMethods<JoinKind::Left, JoinStrictness::Anti, HashJoin::MapsOne>;
-template class HashJoinMethods<JoinKind::Left, JoinStrictness::Anti, HashJoin::MapsAll>;
 template class HashJoinMethods<JoinKind::Left, JoinStrictness::Asof, HashJoin::MapsAsof>;
 }
diff --git a/src/Interpreters/HashJoin/RightHashJoin.cpp b/src/Interpreters/HashJoin/RightHashJoin.cpp
index d9d41d7d63c..8e304754f5c 100644
--- a/src/Interpreters/HashJoin/RightHashJoin.cpp
+++ b/src/Interpreters/HashJoin/RightHashJoin.cpp
@@ -1,4 +1,4 @@
-#include <Interpreters/HashJoin/HashJoinMethodsImpl.h>
+#include <Interpreters/HashJoin/HashJoinMethods.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
index 0034b50f02c..d8f6df05ca4 100644
--- a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
+++ b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
@@ -17,19 +17,13 @@
 namespace DB
 {
 
-IInterpreterUnionOrSelectQuery::IInterpreterUnionOrSelectQuery(const ASTPtr & query_ptr_,
-    const ContextMutablePtr & context_, const SelectQueryOptions & options_)
-    : query_ptr(query_ptr_)
-    , context(context_)
-    , options(options_)
-    , max_streams(context->getSettingsRef().max_threads)
+IInterpreterUnionOrSelectQuery::IInterpreterUnionOrSelectQuery(const DB::ASTPtr& query_ptr_,
+        const DB::ContextMutablePtr& context_, const DB::SelectQueryOptions& options_)
+        : query_ptr(query_ptr_)
+        , context(context_)
+        , options(options_)
+        , max_streams(context->getSettingsRef().max_threads)
 {
-    /// FIXME All code here will work with the old analyzer, however for views over Distributed tables
-    /// it's possible that new analyzer will be enabled in ::getQueryProcessingStage method
-    /// of the underlying storage when all other parts of infrastructure are not ready for it
-    /// (built with old analyzer).
-    context->setSetting("allow_experimental_analyzer", false);
-
     if (options.shard_num)
         context->addSpecialScalar(
                 "_shard_num",
@@ -124,16 +118,16 @@ static ASTPtr parseAdditionalPostFilter(const Context & context)
                 "additional filter", settings.max_query_size, settings.max_parser_depth, settings.max_parser_backtracks);
 }
 
-static ActionsDAG makeAdditionalPostFilter(ASTPtr & ast, ContextPtr context, const Block & header)
+static ActionsDAGPtr makeAdditionalPostFilter(ASTPtr & ast, ContextPtr context, const Block & header)
 {
     auto syntax_result = TreeRewriter(context).analyze(ast, header.getNamesAndTypesList());
     String result_column_name = ast->getColumnName();
     auto dag = ExpressionAnalyzer(ast, syntax_result, context).getActionsDAG(false, false);
-    const ActionsDAG::Node * result_node = &dag.findInOutputs(result_column_name);
-    auto & outputs = dag.getOutputs();
+    const ActionsDAG::Node * result_node = &dag->findInOutputs(result_column_name);
+    auto & outputs = dag->getOutputs();
     outputs.clear();
-    outputs.reserve(dag.getInputs().size() + 1);
-    for (const auto * node : dag.getInputs())
+    outputs.reserve(dag->getInputs().size() + 1);
+    for (const auto * node : dag->getInputs())
         outputs.push_back(node);
 
     outputs.push_back(result_node);
@@ -151,7 +145,7 @@ void IInterpreterUnionOrSelectQuery::addAdditionalPostFilter(QueryPlan & plan) c
         return;
 
     auto dag = makeAdditionalPostFilter(ast, context, plan.getCurrentDataStream().header);
-    std::string filter_name = dag.getOutputs().back()->result_name;
+    std::string filter_name = dag->getOutputs().back()->result_name;
     auto filter_step = std::make_unique<FilterStep>(
         plan.getCurrentDataStream(), std::move(dag), std::move(filter_name), true);
     filter_step->setStepDescription("Additional result filter");
diff --git a/src/Interpreters/IJoin.h b/src/Interpreters/IJoin.h
index 8f648de2538..7374348da50 100644
--- a/src/Interpreters/IJoin.h
+++ b/src/Interpreters/IJoin.h
@@ -115,7 +115,6 @@ public:
     /// Peek next stream of delayed joined blocks.
     virtual IBlocksStreamPtr getDelayedBlocks() { return nullptr; }
     virtual bool hasDelayedBlocks() const { return false; }
-    virtual void tryRerangeRightTableData() {}
 
     virtual IBlocksStreamPtr
         getNonJoinedBlocks(const Block & left_sample_block, const Block & result_sample_block, UInt64 max_block_size) const = 0;
diff --git a/src/Interpreters/InterpreterAlterQuery.cpp b/src/Interpreters/InterpreterAlterQuery.cpp
index 9b5b5dfc20a..8f9c6bc533e 100644
--- a/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/src/Interpreters/InterpreterAlterQuery.cpp
@@ -5,7 +5,6 @@
 #include <Access/Common/AccessRightsElement.h>
 #include <Common/typeid_cast.h>
 #include <Core/Settings.h>
-#include <Core/ServerSettings.h>
 #include <Databases/DatabaseFactory.h>
 #include <Databases/DatabaseReplicated.h>
 #include <Databases/IDatabase.h>
@@ -48,7 +47,6 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int UNKNOWN_TABLE;
     extern const int UNKNOWN_DATABASE;
-    extern const int QUERY_IS_PROHIBITED;
 }
 
 
@@ -193,12 +191,6 @@ BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
                                                          "to execute ALTERs of different types (replicated and non replicated) in single query");
     }
 
-    if (mutation_commands.hasNonEmptyMutationCommands() || !partition_commands.empty())
-    {
-        if (getContext()->getServerSettings().disable_insertion_and_mutation)
-            throw Exception(ErrorCodes::QUERY_IS_PROHIBITED, "Mutations are prohibited");
-    }
-
     if (!alter_commands.empty())
     {
         auto alter_lock = table->lockForAlter(getContext()->getSettingsRef().lock_acquire_timeout);
diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index fb0b01e6199..427378decd5 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -37,7 +37,6 @@
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageInMemoryMetadata.h>
 #include <Storages/StorageReplicatedMergeTree.h>
-#include <Storages/StorageTimeSeries.h>
 #include <Storages/WindowView/StorageWindowView.h>
 
 #include <Interpreters/Context.h>
@@ -121,7 +120,6 @@ namespace ErrorCodes
     extern const int SUPPORT_IS_DISABLED;
     extern const int TOO_MANY_TABLES;
     extern const int TOO_MANY_DATABASES;
-    extern const int THERE_IS_NO_COLUMN;
 }
 
 namespace fs = std::filesystem;
@@ -228,8 +226,8 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
 
         metadata_path = metadata_path / "store" / DatabaseCatalog::getPathForUUID(create.uuid);
 
-        if (!create.attach && fs::exists(metadata_path) && !fs::is_empty(metadata_path))
-            throw Exception(ErrorCodes::DATABASE_ALREADY_EXISTS, "Metadata directory {} already exists and is not empty", metadata_path.string());
+        if (!create.attach && fs::exists(metadata_path))
+            throw Exception(ErrorCodes::DATABASE_ALREADY_EXISTS, "Metadata directory {} already exists", metadata_path.string());
     }
     else if (create.storage->engine->name == "MaterializeMySQL"
         || create.storage->engine->name == "MaterializedMySQL")
@@ -329,9 +327,6 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         writeChar('\n', statement_buf);
         String statement = statement_buf.str();
 
-        /// Needed to make database creation retriable if it fails after the file is created
-        fs::remove(metadata_file_tmp_path);
-
         /// Exclusive flag guarantees, that database is not created right now in another thread.
         WriteBufferFromFile out(metadata_file_tmp_path, statement.size(), O_WRONLY | O_CREAT | O_EXCL);
         writeString(statement, out);
@@ -353,23 +348,31 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         DatabaseCatalog::instance().attachDatabase(database_name, database);
         added = true;
 
+        if (need_write_metadata)
+        {
+            /// Prevents from overwriting metadata of detached database
+            renameNoReplace(metadata_file_tmp_path, metadata_file_path);
+            renamed = true;
+        }
+
         if (!load_database_without_tables)
         {
             /// We use global context here, because storages lifetime is bigger than query context lifetime
             TablesLoader loader{getContext()->getGlobalContext(), {{database_name, database}}, mode};
             auto load_tasks = loader.loadTablesAsync();
             auto startup_tasks = loader.startupTablesAsync();
-            /// First prioritize, schedule and wait all the load table tasks
-            waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), load_tasks);
-            /// Only then prioritize, schedule and wait all the startup tasks
-            waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), startup_tasks);
-        }
-
-        if (need_write_metadata)
-        {
-            /// Prevents from overwriting metadata of detached database
-            renameNoReplace(metadata_file_tmp_path, metadata_file_path);
-            renamed = true;
+            if (getContext()->getGlobalContext()->getServerSettings().async_load_databases)
+            {
+                scheduleLoad(load_tasks);
+                scheduleLoad(startup_tasks);
+            }
+            else
+            {
+                /// First prioritize, schedule and wait all the load table tasks
+                waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), load_tasks);
+                /// Only then prioritize, schedule and wait all the startup tasks
+                waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), startup_tasks);
+            }
         }
     }
     catch (...)
@@ -694,7 +697,7 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Neither default value expression nor type is provided for a column");
 
         if (col_decl.comment)
-            column.comment = col_decl.comment->as<ASTLiteral &>().value.safeGet<String>();
+            column.comment = col_decl.comment->as<ASTLiteral &>().value.get<String>();
 
         if (col_decl.codec)
         {
@@ -704,6 +707,7 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
                 col_decl.codec, column.type, sanity_check_compression_codecs, allow_experimental_codecs, enable_deflate_qpl_codec, enable_zstd_qat_codec);
         }
 
+        column.statistics.column_name = column.name; /// We assign column name here for better exception error message.
         if (col_decl.statistics_desc)
         {
             if (!skip_checks && !context_->getSettingsRef().allow_experimental_statistics)
@@ -755,10 +759,6 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::getTableProperti
     if (create.storage && create.storage->engine)
         getContext()->checkAccess(AccessType::TABLE_ENGINE, create.storage->engine->name);
 
-    /// If this is a TimeSeries table then we need to normalize list of columns (add missing columns and reorder), and also set inner table engines.
-    if (create.is_time_series_table && (mode < LoadingStrictnessLevel::ATTACH))
-        StorageTimeSeries::normalizeTableDefinition(create, getContext());
-
     TableProperties properties;
     TableLockHolder as_storage_lock;
 
@@ -784,14 +784,16 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::getTableProperti
 
                 const auto & settings = getContext()->getSettingsRef();
                 if (index_desc.type == FULL_TEXT_INDEX_NAME && !settings.allow_experimental_full_text_index)
-                    throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Experimental full-text index feature is disabled. Turn on setting 'allow_experimental_full_text_index'");
+                    throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Experimental full-text index feature is not enabled (the setting 'allow_experimental_full_text_index')");
                 /// ----
                 /// Temporary check during a transition period. Please remove at the end of 2024.
                 if (index_desc.type == INVERTED_INDEX_NAME && !settings.allow_experimental_inverted_index)
                     throw Exception(ErrorCodes::ILLEGAL_INDEX, "Please use index type 'full_text' instead of 'inverted'");
                 /// ----
-                if (index_desc.type == "vector_similarity" && !settings.allow_experimental_vector_similarity_index)
-                    throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Experimental vector similarity index is disabled. Turn on setting 'allow_experimental_vector_similarity_index'");
+                if (index_desc.type == "annoy" && !settings.allow_experimental_annoy_index)
+                    throw Exception(ErrorCodes::INCORRECT_QUERY, "Annoy index is disabled. Turn on allow_experimental_annoy_index");
+                if (index_desc.type == "usearch" && !settings.allow_experimental_usearch_index)
+                    throw Exception(ErrorCodes::INCORRECT_QUERY, "USearch index is disabled. Turn on allow_experimental_usearch_index");
 
                 properties.indices.push_back(index_desc);
             }
@@ -850,7 +852,6 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::getTableProperti
         }
 
         properties.columns = ColumnsDescription(as_select_sample.getNamesAndTypesList());
-        properties.columns_inferred_from_select_query = true;
     }
     else if (create.as_table_function)
     {
@@ -940,105 +941,6 @@ void validateVirtualColumns(const IStorage & storage)
     }
 }
 
-void InterpreterCreateQuery::validateMaterializedViewColumnsAndEngine(const ASTCreateQuery & create, const TableProperties & properties, const DatabasePtr & database)
-{
-    /// This is not strict validation, just catches common errors that would make the view not work.
-    /// It's possible to circumvent these checks by ALTERing the view or target table after creation;
-    /// we should probably do some of these checks on ALTER as well.
-
-    NamesAndTypesList all_output_columns;
-    bool check_columns = false;
-    if (create.hasTargetTableID(ViewTarget::To))
-     {
-        if (StoragePtr to_table = DatabaseCatalog::instance().tryGetTable(
-                create.getTargetTableID(ViewTarget::To), getContext()))
-        {
-            all_output_columns = to_table->getInMemoryMetadataPtr()->getSampleBlock().getNamesAndTypesList();
-            check_columns = true;
-        }
-    }
-    else if (!properties.columns_inferred_from_select_query)
-    {
-        all_output_columns = properties.columns.getInsertable();
-        check_columns = true;
-    }
-
-    if (create.refresh_strategy && !create.refresh_strategy->append)
-    {
-        if (database && database->getEngineName() != "Atomic")
-            throw Exception(ErrorCodes::INCORRECT_QUERY,
-                "Refreshable materialized views (except with APPEND) only support Atomic database engine, but database {} has engine {}", create.getDatabase(), database->getEngineName());
-    }
-
-    Block input_block;
-
-    if (check_columns)
-    {
-        try
-        {
-            if (getContext()->getSettingsRef().allow_experimental_analyzer)
-            {
-                input_block = InterpreterSelectQueryAnalyzer::getSampleBlock(create.select->clone(), getContext());
-            }
-            else
-            {
-                input_block = InterpreterSelectWithUnionQuery(create.select->clone(),
-                    getContext(),
-                    SelectQueryOptions().analyze()).getSampleBlock();
-            }
-        }
-        catch (Exception &)
-        {
-            if (!getContext()->getSettingsRef().allow_materialized_view_with_bad_select)
-                throw;
-            check_columns = false;
-        }
-    }
-
-    if (check_columns)
-    {
-        std::unordered_map<std::string_view, DataTypePtr> output_types;
-        for (const NameAndTypePair & nt : all_output_columns)
-            output_types[nt.name] = nt.type;
-
-        ColumnsWithTypeAndName input_columns;
-        ColumnsWithTypeAndName output_columns;
-        for (const auto & input_column : input_block)
-        {
-            auto it = output_types.find(input_column.name);
-            if (it != output_types.end())
-            {
-                input_columns.push_back(input_column.cloneEmpty());
-                output_columns.push_back(ColumnWithTypeAndName(it->second->createColumn(), it->second, input_column.name));
-            }
-            else if (create.refresh_strategy)
-            {
-                /// Unrecognized columns produced by SELECT query are allowed by regular materialized
-                /// views, but not by refreshable ones. This is in part because it was easier to
-                /// implement, in part because refreshable views have less concern about ALTERing target
-                /// tables.
-                ///
-                /// The motivating scenario for allowing this in regular MV is ALTERing the table+query.
-                /// Suppose the user removes a column from target table, then a minute later
-                /// correspondingly updates the view's query to not produce that column.
-                /// If MV didn't allow unrecognized columns then during that minute all INSERTs into the
-                /// source table would fail - unacceptable.
-                /// For refreshable views, during that minute refreshes will fail - acceptable.
-                throw Exception(ErrorCodes::THERE_IS_NO_COLUMN, "SELECT query outputs column with name '{}', which is not found in the target table. Use 'AS' to assign alias that matches a column name.", input_column.name);
-            }
-        }
-
-        if (input_columns.empty())
-            throw Exception(ErrorCodes::THERE_IS_NO_COLUMN, "None of the columns produced by the SELECT query are present in the target table. Use 'AS' to assign aliases that match column names.");
-
-        ActionsDAG::makeConvertingActions(
-            input_columns,
-            output_columns,
-            ActionsDAG::MatchColumnsMode::Position
-        );
-    }
-}
-
 namespace
 {
     void checkTemporaryTableEngineName(const String & name)
@@ -1057,45 +959,12 @@ namespace
         engine_ast->no_empty_args = true;
         storage.set(storage.engine, engine_ast);
     }
-
-    void setNullTableEngine(ASTStorage & storage)
-    {
-        storage.forEachPointerToChild([](void ** ptr) mutable
-        {
-            *ptr = nullptr;
-        });
-
-        auto engine_ast = std::make_shared<ASTFunction>();
-        engine_ast->name = "Null";
-        engine_ast->no_empty_args = true;
-        storage.set(storage.engine, engine_ast);
-    }
-
 }
 
 void InterpreterCreateQuery::setEngine(ASTCreateQuery & create) const
 {
     if (create.as_table_function)
-    {
-        if (getContext()->getSettingsRef().restore_replace_external_table_functions_to_null)
-        {
-            const auto & factory = TableFunctionFactory::instance();
-
-            auto properties = factory.tryGetProperties(create.as_table_function->as<ASTFunction>()->name);
-            if (properties && properties->allow_readonly)
-                return;
-            if (!create.storage)
-            {
-                auto storage_ast = std::make_shared<ASTStorage>();
-                create.set(create.storage, storage_ast);
-            }
-            else
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Storage should not be created yet, it's a bug.");
-            create.as_table_function = nullptr;
-            setNullTableEngine(*create.storage);
-        }
         return;
-    }
 
     if (create.is_dictionary || create.is_ordinary_view || create.is_live_view || create.is_window_view)
         return;
@@ -1146,15 +1015,6 @@ void InterpreterCreateQuery::setEngine(ASTCreateQuery & create) const
             /// Some part of storage definition (such as PARTITION BY) is specified, but ENGINE is not: just set default one.
             setDefaultTableEngine(*create.storage, getContext()->getSettingsRef().default_table_engine.value);
         }
-        /// For external tables with restore_replace_external_engine_to_null setting we replace external engines to
-        /// Null table engine.
-        else if (getContext()->getSettingsRef().restore_replace_external_engines_to_null)
-        {
-            if (StorageFactory::instance().getStorageFeatures(create.storage->engine->name).source_access_type != AccessType::NONE)
-            {
-                setNullTableEngine(*create.storage);
-            }
-        }
         return;
     }
 
@@ -1206,7 +1066,6 @@ void InterpreterCreateQuery::setEngine(ASTCreateQuery & create) const
         else if (as_create.storage)
         {
             storage_def = typeid_cast<std::shared_ptr<ASTStorage>>(as_create.storage->ptr());
-            create.is_time_series_table = as_create.is_time_series_table;
         }
         else
         {
@@ -1236,33 +1095,19 @@ void InterpreterCreateQuery::assertOrSetUUID(ASTCreateQuery & create, const Data
     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" && create.uuid != UUIDHelpers::Nil && !is_replicated_database_internal && !is_on_cluster && !create.attach)
-    {
-        if (getContext()->getSettingsRef().database_replicated_allow_explicit_uuid == 0)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "It's not allowed to explicitly specify UUIDs for tables in Replicated databases, "
-                                                       "see database_replicated_allow_explicit_uuid");
-        }
-        else if (getContext()->getSettingsRef().database_replicated_allow_explicit_uuid == 1)
-        {
-            LOG_WARNING(&Poco::Logger::get("InterpreterCreateQuery"), "It's not recommended to explicitly specify UUIDs for tables in Replicated databases");
-        }
-        else if (getContext()->getSettingsRef().database_replicated_allow_explicit_uuid == 2)
-        {
-            UUID old_uuid = create.uuid;
-            create.uuid = UUIDHelpers::Nil;
-            create.generateRandomUUIDs();
-            LOG_WARNING(&Poco::Logger::get("InterpreterCreateQuery"), "Replaced a user-provided UUID ({}) with a random one ({}) "
-                                                                   "to make sure it's unique", old_uuid, create.uuid);
-        }
-    }
-
     if (is_replicated_database_internal && !internal)
     {
         if (create.uuid == UUIDHelpers::Nil)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Table UUID is not specified in DDL log");
     }
 
+    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)
     {
         if (create.attach && !from_path && create.uuid == UUIDHelpers::Nil)
@@ -1483,16 +1328,51 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
     /// Set and retrieve list of columns, indices and constraints. Set table engine if needed. Rewrite query in canonical way.
     TableProperties properties = getTablePropertiesAndNormalizeCreateQuery(create, mode);
 
+    /// Check type compatible for materialized dest table and select columns
+    if (create.is_materialized_view_with_external_target() && create.select && mode <= LoadingStrictnessLevel::CREATE)
+    {
+        if (StoragePtr to_table = DatabaseCatalog::instance().tryGetTable(create.getTargetTableID(ViewTarget::To), getContext()))
+        {
+            Block input_block;
+
+            if (getContext()->getSettingsRef().allow_experimental_analyzer)
+            {
+                input_block = InterpreterSelectQueryAnalyzer::getSampleBlock(create.select->clone(), getContext());
+            }
+            else
+            {
+                input_block = InterpreterSelectWithUnionQuery(create.select->clone(),
+                    getContext(),
+                    SelectQueryOptions().analyze()).getSampleBlock();
+            }
+
+            Block output_block = to_table->getInMemoryMetadataPtr()->getSampleBlock();
+
+            ColumnsWithTypeAndName input_columns;
+            ColumnsWithTypeAndName output_columns;
+            for (const auto & input_column : input_block)
+            {
+                if (const auto * output_column = output_block.findByName(input_column.name))
+                {
+                    input_columns.push_back(input_column.cloneEmpty());
+                    output_columns.push_back(output_column->cloneEmpty());
+                }
+            }
+
+            ActionsDAG::makeConvertingActions(
+                input_columns,
+                output_columns,
+                ActionsDAG::MatchColumnsMode::Position
+            );
+        }
+    }
+
     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);
 
-    /// Check type compatible for materialized dest table and select columns
-    if (create.select && create.is_materialized_view && mode <= LoadingStrictnessLevel::CREATE)
-        validateMaterializedViewColumnsAndEngine(create, properties, database);
-
     bool allow_heavy_populate = getContext()->getSettingsRef().database_replicated_allow_heavy_create && create.is_populate;
     if (!allow_heavy_populate && database && database->getEngineName() == "Replicated" && (create.select || create.is_populate))
     {
@@ -2003,7 +1883,7 @@ void InterpreterCreateQuery::prepareOnClusterQuery(ASTCreateQuery & create, Cont
 
         if (has_explicit_zk_path_arg)
         {
-            String zk_path = create.storage->engine->arguments->children[0]->as<ASTLiteral>()->value.safeGet<String>();
+            String zk_path = create.storage->engine->arguments->children[0]->as<ASTLiteral>()->value.get<String>();
             Macros::MacroExpansionInfo info;
             info.table_id.uuid = create.uuid;
             info.ignore_unknown = true;
@@ -2033,8 +1913,6 @@ BlockIO InterpreterCreateQuery::execute()
     FunctionNameNormalizer::visit(query_ptr.get());
     auto & create = query_ptr->as<ASTCreateQuery &>();
 
-    create.if_not_exists |= getContext()->getSettingsRef().create_if_not_exists;
-
     bool is_create_database = create.database && !create.table;
     if (!create.cluster.empty() && !maybeRemoveOnCluster(query_ptr, getContext()))
     {
diff --git a/src/Interpreters/InterpreterCreateQuery.h b/src/Interpreters/InterpreterCreateQuery.h
index 5047c372c71..3982ea2cabc 100644
--- a/src/Interpreters/InterpreterCreateQuery.h
+++ b/src/Interpreters/InterpreterCreateQuery.h
@@ -90,7 +90,6 @@ private:
         IndicesDescription indices;
         ConstraintsDescription constraints;
         ProjectionsDescription projections;
-        bool columns_inferred_from_select_query = false;
     };
 
     BlockIO createDatabase(ASTCreateQuery & create);
@@ -99,7 +98,6 @@ private:
     /// Calculate list of columns, constraints, indices, etc... of table. Rewrite query in canonical way.
     TableProperties getTablePropertiesAndNormalizeCreateQuery(ASTCreateQuery & create, LoadingStrictnessLevel mode) const;
     void validateTableStructure(const ASTCreateQuery & create, const TableProperties & properties) const;
-    void validateMaterializedViewColumnsAndEngine(const ASTCreateQuery & create, const TableProperties & properties, const DatabasePtr & database);
     void setEngine(ASTCreateQuery & create) const;
     AccessRightsElements getRequiredAccess() const;
 
diff --git a/src/Interpreters/InterpreterDeleteQuery.cpp b/src/Interpreters/InterpreterDeleteQuery.cpp
index 5cbfdad4ff9..84fe0a9f4ae 100644
--- a/src/Interpreters/InterpreterDeleteQuery.cpp
+++ b/src/Interpreters/InterpreterDeleteQuery.cpp
@@ -3,7 +3,6 @@
 
 #include <Access/ContextAccess.h>
 #include <Core/Settings.h>
-#include <Core/ServerSettings.h>
 #include <Databases/DatabaseReplicated.h>
 #include <Databases/IDatabase.h>
 #include <Interpreters/Context.h>
@@ -17,7 +16,6 @@
 #include <Storages/AlterCommands.h>
 #include <Storages/IStorage.h>
 #include <Storages/MutationCommands.h>
-#include <Storages/MergeTree/MergeTreeSettings.h>
 
 
 namespace DB
@@ -28,7 +26,7 @@ namespace ErrorCodes
     extern const int TABLE_IS_READ_ONLY;
     extern const int SUPPORT_IS_DISABLED;
     extern const int BAD_ARGUMENTS;
-    extern const int QUERY_IS_PROHIBITED;
+    extern const int NOT_IMPLEMENTED;
 }
 
 
@@ -53,9 +51,6 @@ BlockIO InterpreterDeleteQuery::execute()
     if (table->isStaticStorage())
         throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is read-only");
 
-    if (getContext()->getGlobalContext()->getServerSettings().disable_insertion_and_mutation)
-        throw Exception(ErrorCodes::QUERY_IS_PROHIBITED, "Delete queries are prohibited");
-
     DatabasePtr database = DatabaseCatalog::instance().getDatabase(table_id.database_name);
     if (database->shouldReplicateQuery(getContext(), query_ptr))
     {
@@ -67,6 +62,35 @@ BlockIO InterpreterDeleteQuery::execute()
     auto table_lock = table->lockForShare(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
     auto metadata_snapshot = table->getInMemoryMetadataPtr();
 
+    auto lightweightDelete = [&]()
+    {
+        if (!getContext()->getSettingsRef().enable_lightweight_delete)
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+                            "Lightweight delete mutate is disabled. "
+                            "Set `enable_lightweight_delete` setting to enable it");
+
+        /// Build "ALTER ... UPDATE _row_exists = 0 WHERE predicate" query
+        String alter_query =
+            "ALTER TABLE " + table->getStorageID().getFullTableName()
+            + (delete_query.cluster.empty() ? "" : " ON CLUSTER " + backQuoteIfNeed(delete_query.cluster))
+            + " UPDATE `_row_exists` = 0 WHERE " + serializeAST(*delete_query.predicate);
+
+        ParserAlterQuery parser;
+        ASTPtr alter_ast = parseQuery(
+            parser,
+            alter_query.data(),
+            alter_query.data() + alter_query.size(),
+            "ALTER query",
+            0,
+            DBMS_DEFAULT_MAX_PARSER_DEPTH,
+            DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
+
+        auto context = Context::createCopy(getContext());
+        context->setSetting("mutations_sync", Field(context->getSettingsRef().lightweight_deletes_sync));
+        InterpreterAlterQuery alter_interpreter(alter_ast, context);
+        return alter_interpreter.execute();
+    };
+
     if (table->supportsDelete())
     {
         /// Convert to MutationCommand
@@ -86,48 +110,58 @@ BlockIO InterpreterDeleteQuery::execute()
     }
     else if (table->supportsLightweightDelete())
     {
-        if (!getContext()->getSettingsRef().enable_lightweight_delete)
-            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
-                            "Lightweight delete mutate is disabled. "
-                            "Set `enable_lightweight_delete` setting to enable it");
-
-        if (metadata_snapshot->hasProjections())
-        {
-            if (const auto * merge_tree_data = dynamic_cast<const MergeTreeData *>(table.get()))
-                if (merge_tree_data->getSettings()->lightweight_mutation_projection_mode == LightweightMutationProjectionMode::THROW)
-                    throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
-                        "DELETE query is not allowed for table {} because as it has projections and setting "
-                        "lightweight_mutation_projection_mode is set to THROW. "
-                        "User should change lightweight_mutation_projection_mode OR "
-                        "drop all the projections manually before running the query",
-                        table_id.getFullTableName());
-        }
-
-        /// Build "ALTER ... UPDATE _row_exists = 0 WHERE predicate" query
-        String alter_query =
-            "ALTER TABLE " + table->getStorageID().getFullTableName()
-            + (delete_query.cluster.empty() ? "" : " ON CLUSTER " + backQuoteIfNeed(delete_query.cluster))
-            + " UPDATE `_row_exists` = 0"
-            + (delete_query.partition ? " IN PARTITION " + serializeAST(*delete_query.partition) : "")
-            + " WHERE " + serializeAST(*delete_query.predicate);
-
-        ParserAlterQuery parser;
-        ASTPtr alter_ast = parseQuery(
-            parser,
-            alter_query.data(),
-            alter_query.data() + alter_query.size(),
-            "ALTER query",
-            0,
-            DBMS_DEFAULT_MAX_PARSER_DEPTH,
-            DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
-
-        auto context = Context::createCopy(getContext());
-        context->setSetting("mutations_sync", Field(context->getSettingsRef().lightweight_deletes_sync));
-        InterpreterAlterQuery alter_interpreter(alter_ast, context);
-        return alter_interpreter.execute();
+        return lightweightDelete();
     }
     else
     {
+        if (table->hasProjection())
+        {
+            auto context = Context::createCopy(getContext());
+            auto mode = context->getSettingsRef().lightweight_mutation_projection_mode;
+            if (mode == LightweightMutationProjectionMode::THROW)
+            {
+                throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+                    "DELETE query is not supported for table {} as it has projections. "
+                    "User should drop all the projections manually before running the query",
+                    table->getStorageID().getFullTableName());
+            }
+            else if (mode == LightweightMutationProjectionMode::DROP)
+            {
+                std::vector<String> all_projections = metadata_snapshot->projections.getAllRegisteredNames();
+
+                context->setSetting("mutations_sync", Field(context->getSettingsRef().lightweight_deletes_sync));
+
+                /// Drop projections first so that lightweight delete can be performed.
+                for (const auto & projection : all_projections)
+                {
+                    String alter_query =
+                        "ALTER TABLE " + table->getStorageID().getFullTableName()
+                        + (delete_query.cluster.empty() ? "" : " ON CLUSTER " + backQuoteIfNeed(delete_query.cluster))
+                        + " DROP PROJECTION IF EXISTS " + projection;
+
+                    ParserAlterQuery parser;
+                    ASTPtr alter_ast = parseQuery(
+                        parser,
+                        alter_query.data(),
+                        alter_query.data() + alter_query.size(),
+                        "ALTER query",
+                        0,
+                        DBMS_DEFAULT_MAX_PARSER_DEPTH,
+                        DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
+
+                    InterpreterAlterQuery alter_interpreter(alter_ast, context);
+                    alter_interpreter.execute();
+                }
+            }
+            else
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Unrecognized lightweight_mutation_projection_mode, only throw and drop are allowed.");
+            }
+
+            return lightweightDelete();
+        }
+
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
             "DELETE query is not supported for table {}",
             table->getStorageID().getFullTableName());
diff --git a/src/Interpreters/InterpreterDescribeCacheQuery.cpp b/src/Interpreters/InterpreterDescribeCacheQuery.cpp
index c7464dc6b77..c7e863bf260 100644
--- a/src/Interpreters/InterpreterDescribeCacheQuery.cpp
+++ b/src/Interpreters/InterpreterDescribeCacheQuery.cpp
@@ -20,7 +20,6 @@ static Block getSampleBlock()
         ColumnWithTypeAndName{std::make_shared<DataTypeUInt64>(), "max_size"},
         ColumnWithTypeAndName{std::make_shared<DataTypeUInt64>(), "max_elements"},
         ColumnWithTypeAndName{std::make_shared<DataTypeUInt64>(), "max_file_segment_size"},
-        ColumnWithTypeAndName{std::make_shared<DataTypeUInt8>(), "is_initialized"},
         ColumnWithTypeAndName{std::make_shared<DataTypeUInt64>(), "boundary_alignment"},
         ColumnWithTypeAndName{std::make_shared<DataTypeNumber<UInt8>>(), "cache_on_write_operations"},
         ColumnWithTypeAndName{std::make_shared<DataTypeNumber<UInt8>>(), "cache_hits_threshold"},
@@ -51,7 +50,6 @@ BlockIO InterpreterDescribeCacheQuery::execute()
     res_columns[i++]->insert(settings.max_size);
     res_columns[i++]->insert(settings.max_elements);
     res_columns[i++]->insert(settings.max_file_segment_size);
-    res_columns[i++]->insert(cache->isInitialized());
     res_columns[i++]->insert(settings.boundary_alignment);
     res_columns[i++]->insert(settings.cache_on_write_operations);
     res_columns[i++]->insert(settings.cache_hits_threshold);
diff --git a/src/Interpreters/InterpreterDropQuery.cpp b/src/Interpreters/InterpreterDropQuery.cpp
index ef560ec3405..bad3e5277db 100644
--- a/src/Interpreters/InterpreterDropQuery.cpp
+++ b/src/Interpreters/InterpreterDropQuery.cpp
@@ -6,7 +6,6 @@
 #include <Interpreters/InterpreterDropQuery.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
 #include <Interpreters/QueryLog.h>
-#include <IO/SharedThreadPools.h>
 #include <Access/Common/AccessRightsElement.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTIdentifier.h>
@@ -425,29 +424,18 @@ BlockIO InterpreterDropQuery::executeToDatabaseImpl(const ASTDropQuery & query,
                 auto table_context = Context::createCopy(getContext());
                 table_context->setInternalQuery(true);
                 /// Do not hold extra shared pointers to tables
-                std::vector<std::pair<StorageID, bool>> tables_to_drop;
+                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();
-                    tables_to_drop.push_back({table_ptr->getStorageID(), table_ptr->isDictionary()});
+                    table_ptr->flushAndPrepareForShutdown();
+                    tables_to_drop.push_back({iterator->name(), table_ptr->isDictionary()});
                 }
 
-                /// Prepare tables for shutdown in parallel.
-                ThreadPoolCallbackRunnerLocal<void> runner(getDatabaseCatalogDropTablesThreadPool().get(), "DropTables");
-                for (const auto & [name, _] : tables_to_drop)
-                {
-                    auto table_ptr = DatabaseCatalog::instance().getTable(name, table_context);
-                    runner([my_table_ptr = std::move(table_ptr)]()
-                    {
-                        my_table_ptr->flushAndPrepareForShutdown();
-                    });
-                }
-                runner.waitForAllToFinishAndRethrowFirstError();
-
                 for (const auto & table : tables_to_drop)
                 {
-                    query_for_table.setTable(table.first.getTableName());
+                    query_for_table.setTable(table.first);
                     query_for_table.is_dictionary = table.second;
                     DatabasePtr db;
                     UUID table_to_wait = UUIDHelpers::Nil;
diff --git a/src/Interpreters/InterpreterExplainQuery.cpp b/src/Interpreters/InterpreterExplainQuery.cpp
index c820f999e0c..bedd9cb4a80 100644
--- a/src/Interpreters/InterpreterExplainQuery.cpp
+++ b/src/Interpreters/InterpreterExplainQuery.cpp
@@ -332,7 +332,7 @@ ExplainSettings<Settings> checkAndGetSettings(const ASTPtr & ast_settings)
 
         if (settings.hasBooleanSetting(change.name))
         {
-            auto value = change.value.safeGet<UInt64>();
+            auto value = change.value.get<UInt64>();
             if (value > 1)
                 throw Exception(ErrorCodes::INVALID_SETTING_VALUE, "Invalid value {} for setting \"{}\". "
                                 "Expected boolean type", value, change.name);
@@ -341,7 +341,7 @@ ExplainSettings<Settings> checkAndGetSettings(const ASTPtr & ast_settings)
         }
         else
         {
-            auto value = change.value.safeGet<UInt64>();
+            auto value = change.value.get<UInt64>();
             settings.setIntegerSetting(change.name, value);
         }
     }
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index c97593a1781..3906cef1995 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -6,7 +6,6 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <Columns/ColumnNullable.h>
 #include <Core/Settings.h>
-#include <Core/ServerSettings.h>
 #include <Processors/Transforms/buildPushingToViewsChain.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Interpreters/DatabaseCatalog.h>
@@ -61,7 +60,6 @@ namespace ErrorCodes
     extern const int NO_SUCH_COLUMN_IN_TABLE;
     extern const int ILLEGAL_COLUMN;
     extern const int DUPLICATE_COLUMN;
-    extern const int QUERY_IS_PROHIBITED;
 }
 
 InterpreterInsertQuery::InterpreterInsertQuery(
@@ -392,7 +390,7 @@ Chain InterpreterInsertQuery::buildPreSinkChain(
         context_ptr,
         null_as_default);
 
-    auto adding_missing_defaults_actions = std::make_shared<ExpressionActions>(std::move(adding_missing_defaults_dag));
+    auto adding_missing_defaults_actions = std::make_shared<ExpressionActions>(adding_missing_defaults_dag);
 
     /// Actually we don't know structure of input blocks from query/table,
     /// because some clients break insertion protocol (columns != header)
@@ -466,7 +464,7 @@ QueryPipeline InterpreterInsertQuery::buildInsertSelectPipeline(ASTInsertQuery &
             * to avoid unnecessary squashing.
             */
 
-        Settings new_settings = select_context->getSettingsCopy();
+        Settings new_settings = select_context->getSettings();
 
         new_settings.max_threads = std::max<UInt64>(1, settings.max_insert_threads);
 
@@ -538,7 +536,7 @@ QueryPipeline InterpreterInsertQuery::buildInsertSelectPipeline(ASTInsertQuery &
             pipeline.getHeader().getColumnsWithTypeAndName(),
             query_sample_block.getColumnsWithTypeAndName(),
             ActionsDAG::MatchColumnsMode::Position);
-    auto actions = std::make_shared<ExpressionActions>(std::move(actions_dag), ExpressionActionsSettings::fromContext(getContext(), CompileExpressions::yes));
+    auto actions = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(getContext(), CompileExpressions::yes));
 
     pipeline.addSimpleTransform([&](const Block & in_header) -> ProcessorPtr
     {
@@ -734,9 +732,6 @@ BlockIO InterpreterInsertQuery::execute()
     const Settings & settings = getContext()->getSettingsRef();
     auto & query = query_ptr->as<ASTInsertQuery &>();
 
-    if (getContext()->getServerSettings().disable_insertion_and_mutation
-        && query.table_id.database_name != DatabaseCatalog::SYSTEM_DATABASE)
-        throw Exception(ErrorCodes::QUERY_IS_PROHIBITED, "Insert queries are prohibited");
 
     StoragePtr table = getTable(query);
     checkStorageSupportsTransactionsIfNeeded(table, getContext());
diff --git a/src/Interpreters/InterpreterKillQueryQuery.cpp b/src/Interpreters/InterpreterKillQueryQuery.cpp
index 2c579f3b468..7eb487ba7b3 100644
--- a/src/Interpreters/InterpreterKillQueryQuery.cpp
+++ b/src/Interpreters/InterpreterKillQueryQuery.cpp
@@ -334,7 +334,7 @@ BlockIO InterpreterKillQueryQuery::execute()
         for (size_t i = 0; i < moves_block.rows(); ++i)
         {
             table_id = StorageID{database_col.getDataAt(i).toString(), table_col.getDataAt(i).toString()};
-            auto task_uuid = task_uuid_col[i].safeGet<UUID>();
+            auto task_uuid = task_uuid_col[i].get<UUID>();
 
             CancellationCode code = CancellationCode::Unknown;
 
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index ca0e84a5267..3f21e183b58 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -75,6 +75,7 @@
 
 #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>
@@ -177,15 +178,15 @@ FilterDAGInfoPtr generateFilterActions(
     /// Using separate expression analyzer to prevent any possible alias injection
     auto syntax_result = TreeRewriter(context).analyzeSelect(query_ast, TreeRewriterResult({}, storage, storage_snapshot));
     SelectQueryExpressionAnalyzer analyzer(query_ast, syntax_result, context, metadata_snapshot, {}, false, {}, prepared_sets);
-    filter_info->actions = std::move(analyzer.simpleSelectActions()->dag);
+    filter_info->actions = std::make_unique<ActionsDAG>(std::move(analyzer.simpleSelectActions()->dag));
 
     filter_info->column_name = expr_list->children.at(0)->getColumnName();
-    filter_info->actions.removeUnusedActions(NameSet{filter_info->column_name});
+    filter_info->actions->removeUnusedActions(NameSet{filter_info->column_name});
 
-    for (const auto * node : filter_info->actions.getInputs())
-        filter_info->actions.getOutputs().push_back(node);
+    for (const auto * node : filter_info->actions->getInputs())
+        filter_info->actions->getOutputs().push_back(node);
 
-    auto required_columns_from_filter = filter_info->actions.getRequiredColumns();
+    auto required_columns_from_filter = filter_info->actions->getRequiredColumns();
 
     for (const auto & column : required_columns_from_filter)
     {
@@ -213,11 +214,11 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 {}
 
 InterpreterSelectQuery::InterpreterSelectQuery(
-    const ASTPtr & query_ptr_,
-    const ContextPtr & context_,
-    Pipe input_pipe_,
-    const SelectQueryOptions & options_)
-    : InterpreterSelectQuery(query_ptr_, context_, std::move(input_pipe_), nullptr, options_.copy().noSubquery())
+        const ASTPtr & query_ptr_,
+        const ContextPtr & context_,
+        Pipe input_pipe_,
+        const SelectQueryOptions & options_)
+        : InterpreterSelectQuery(query_ptr_, context_, std::move(input_pipe_), nullptr, options_.copy().noSubquery())
 {}
 
 InterpreterSelectQuery::InterpreterSelectQuery(
@@ -226,15 +227,18 @@ 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_,
     const ContextPtr & context_,
     const SelectQueryOptions & options_,
     PreparedSetsPtr prepared_sets_)
-    : InterpreterSelectQuery(query_ptr_, context_, std::nullopt, nullptr, options_, {}, {}, prepared_sets_)
+    : InterpreterSelectQuery(
+        query_ptr_, context_, std::nullopt, nullptr, options_, {}, {}, prepared_sets_)
 {}
 
 InterpreterSelectQuery::~InterpreterSelectQuery() = default;
@@ -249,7 +253,7 @@ namespace
 ContextPtr getSubqueryContext(const ContextPtr & context)
 {
     auto subquery_context = Context::createCopy(context);
-    Settings subquery_settings = context->getSettingsCopy();
+    Settings subquery_settings = context->getSettings();
     subquery_settings.max_result_rows = 0;
     subquery_settings.max_result_bytes = 0;
     /// The calculation of extremes does not make sense and is not necessary (if you do it, then the extremes of the subquery can be taken for whole query).
@@ -958,7 +962,7 @@ bool InterpreterSelectQuery::adjustParallelReplicasAfterAnalysis()
     {
         {
             const auto & node
-                = query_info_copy.prewhere_info->prewhere_actions.findInOutputs(query_info_copy.prewhere_info->prewhere_column_name);
+                = query_info_copy.prewhere_info->prewhere_actions->findInOutputs(query_info_copy.prewhere_info->prewhere_column_name);
             added_filter_nodes.nodes.push_back(&node);
         }
 
@@ -970,8 +974,7 @@ bool InterpreterSelectQuery::adjustParallelReplicasAfterAnalysis()
         }
     }
 
-    if (auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes))
-        query_info_copy.filter_actions_dag = std::make_shared<const ActionsDAG>(std::move(*filter_actions_dag));
+    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;
@@ -1006,7 +1009,7 @@ void InterpreterSelectQuery::buildQueryPlan(QueryPlan & query_plan)
             ActionsDAG::MatchColumnsMode::Name,
             true);
 
-        auto converting = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), std::move(convert_actions_dag));
+        auto converting = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), convert_actions_dag);
         query_plan.addStep(std::move(converting));
     }
 
@@ -1079,7 +1082,7 @@ Block InterpreterSelectQuery::getSampleBlockImpl()
 
         if (analysis_result.prewhere_info)
         {
-            header = analysis_result.prewhere_info->prewhere_actions.updateHeader(header);
+            header = analysis_result.prewhere_info->prewhere_actions->updateHeader(header);
             if (analysis_result.prewhere_info->remove_prewhere_column)
                 header.erase(analysis_result.prewhere_info->prewhere_column_name);
         }
@@ -1253,7 +1256,7 @@ SortDescription InterpreterSelectQuery::getSortDescription(const ASTSelectQuery
 
         std::shared_ptr<Collator> collator;
         if (order_by_elem.getCollation())
-            collator = std::make_shared<Collator>(order_by_elem.getCollation()->as<ASTLiteral &>().value.safeGet<String>());
+            collator = std::make_shared<Collator>(order_by_elem.getCollation()->as<ASTLiteral &>().value.get<String>());
 
         if (order_by_elem.with_fill)
         {
@@ -1330,12 +1333,12 @@ static InterpolateDescriptionPtr getInterpolateDescription(
 
         auto syntax_result = TreeRewriter(context).analyze(exprs, source_columns);
         ExpressionAnalyzer analyzer(exprs, syntax_result, context);
-        ActionsDAG actions = analyzer.getActionsDAG(true);
-        ActionsDAG conv_dag = ActionsDAG::makeConvertingActions(actions.getResultColumns(),
+        ActionsDAGPtr actions = analyzer.getActionsDAG(true);
+        ActionsDAGPtr conv_dag = ActionsDAG::makeConvertingActions(actions->getResultColumns(),
             result_columns, ActionsDAG::MatchColumnsMode::Position, true);
-        ActionsDAG merge_dag = ActionsDAG::merge(std::move(actions), std::move(conv_dag));
+        ActionsDAGPtr merge_dag = ActionsDAG::merge(std::move(*actions->clone()), std::move(*conv_dag));
 
-        interpolate_descr = std::make_shared<InterpolateDescription>(std::move(merge_dag), aliases);
+        interpolate_descr = std::make_shared<InterpolateDescription>(merge_dag, aliases);
     }
 
     return interpolate_descr;
@@ -1518,7 +1521,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
         {
             auto row_level_security_step = std::make_unique<FilterStep>(
                 query_plan.getCurrentDataStream(),
-                expressions.filter_info->actions.clone(),
+                expressions.filter_info->actions,
                 expressions.filter_info->column_name,
                 expressions.filter_info->do_remove_column);
 
@@ -1532,7 +1535,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
             {
                 auto row_level_filter_step = std::make_unique<FilterStep>(
                     query_plan.getCurrentDataStream(),
-                    expressions.prewhere_info->row_level_filter->clone(),
+                    expressions.prewhere_info->row_level_filter,
                     expressions.prewhere_info->row_level_column_name,
                     true);
 
@@ -1542,7 +1545,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
 
             auto prewhere_step = std::make_unique<FilterStep>(
                 query_plan.getCurrentDataStream(),
-                expressions.prewhere_info->prewhere_actions.clone(),
+                expressions.prewhere_info->prewhere_actions,
                 expressions.prewhere_info->prewhere_column_name,
                 expressions.prewhere_info->remove_prewhere_column);
 
@@ -1644,7 +1647,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
             {
                 auto row_level_security_step = std::make_unique<FilterStep>(
                     query_plan.getCurrentDataStream(),
-                    expressions.filter_info->actions.clone(),
+                    expressions.filter_info->actions,
                     expressions.filter_info->column_name,
                     expressions.filter_info->do_remove_column);
 
@@ -1652,11 +1655,11 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
                 query_plan.addStep(std::move(row_level_security_step));
             }
 
-            const auto add_filter_step = [&](auto & new_filter_info, const std::string & description)
+            const auto add_filter_step = [&](const auto & new_filter_info, const std::string & description)
             {
                 auto filter_step = std::make_unique<FilterStep>(
                     query_plan.getCurrentDataStream(),
-                    std::move(new_filter_info->actions),
+                    new_filter_info->actions,
                     new_filter_info->column_name,
                     new_filter_info->do_remove_column);
 
@@ -2079,20 +2082,18 @@ void InterpreterSelectQuery::addEmptySourceToQueryPlan(QueryPlan & query_plan, c
 
         if (prewhere_info.row_level_filter)
         {
-            auto row_level_actions = std::make_shared<ExpressionActions>(prewhere_info.row_level_filter->clone());
             pipe.addSimpleTransform([&](const Block & header)
             {
                 return std::make_shared<FilterTransform>(header,
-                    row_level_actions,
+                    std::make_shared<ExpressionActions>(prewhere_info.row_level_filter),
                     prewhere_info.row_level_column_name, true);
             });
         }
 
-        auto filter_actions = std::make_shared<ExpressionActions>(prewhere_info.prewhere_actions.clone());
         pipe.addSimpleTransform([&](const Block & header)
         {
             return std::make_shared<FilterTransform>(
-                header, filter_actions,
+                header, std::make_shared<ExpressionActions>(prewhere_info.prewhere_actions),
                 prewhere_info.prewhere_column_name, prewhere_info.remove_prewhere_column);
         });
     }
@@ -2136,8 +2137,8 @@ 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), analysis.filter_info->column_name);
-            analysis.prewhere_info->remove_prewhere_column = std::move(analysis.filter_info->do_remove_column);
+            analysis.prewhere_info = std::make_shared<PrewhereInfo>(analysis.filter_info->actions, analysis.filter_info->column_name);
+            analysis.prewhere_info->remove_prewhere_column = analysis.filter_info->do_remove_column;
             analysis.prewhere_info->need_filter = true;
             analysis.filter_info = nullptr;
         }
@@ -2145,8 +2146,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.filter_info = nullptr;
     }
 }
@@ -2179,7 +2180,7 @@ void InterpreterSelectQuery::addPrewhereAliasActions()
         if (prewhere_info)
         {
             /// Get some columns directly from PREWHERE expression actions
-            auto prewhere_required_columns = prewhere_info->prewhere_actions.getRequiredColumns().getNames();
+            auto prewhere_required_columns = prewhere_info->prewhere_actions->getRequiredColumns().getNames();
             columns.insert(prewhere_required_columns.begin(), prewhere_required_columns.end());
 
             if (prewhere_info->row_level_filter)
@@ -2251,7 +2252,7 @@ void InterpreterSelectQuery::addPrewhereAliasActions()
         if (prewhere_info)
         {
             NameSet columns_to_remove(columns_to_remove_after_prewhere.begin(), columns_to_remove_after_prewhere.end());
-            Block prewhere_actions_result = prewhere_info->prewhere_actions.getResultColumns();
+            Block prewhere_actions_result = prewhere_info->prewhere_actions->getResultColumns();
 
             /// Populate required columns with the columns, added by PREWHERE actions and not removed afterwards.
             /// XXX: looks hacky that we already know which columns after PREWHERE we won't need for sure.
@@ -2290,7 +2291,7 @@ void InterpreterSelectQuery::addPrewhereAliasActions()
         {
             /// Don't remove columns which are needed to be aliased.
             for (const auto & name : required_columns)
-                prewhere_info->prewhere_actions.tryRestoreColumn(name);
+                prewhere_info->prewhere_actions->tryRestoreColumn(name);
 
             /// Add physical columns required by prewhere actions.
             for (const auto & column : required_columns_from_prewhere)
@@ -2348,7 +2349,7 @@ std::optional<UInt64> InterpreterSelectQuery::getTrivialCount(UInt64 max_paralle
         if (analysis_result.hasPrewhere())
         {
             auto & prewhere_info = analysis_result.prewhere_info;
-            filter_nodes.push_back(&prewhere_info->prewhere_actions.findInOutputs(prewhere_info->prewhere_column_name));
+            filter_nodes.push_back(&prewhere_info->prewhere_actions->findInOutputs(prewhere_info->prewhere_column_name));
 
             if (prewhere_info->row_level_filter)
                 filter_nodes.push_back(&prewhere_info->row_level_filter->findInOutputs(prewhere_info->row_level_column_name));
@@ -2362,7 +2363,7 @@ std::optional<UInt64> InterpreterSelectQuery::getTrivialCount(UInt64 max_paralle
         if (!filter_actions_dag)
             return {};
 
-        return storage->totalRowsByPartitionPredicate(*filter_actions_dag, context);
+        return storage->totalRowsByPartitionPredicate(filter_actions_dag, context);
     }
 }
 
@@ -2612,7 +2613,7 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
     /// Aliases in table declaration.
     if (processing_stage == QueryProcessingStage::FetchColumns && alias_actions)
     {
-        auto table_aliases = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), alias_actions->clone());
+        auto table_aliases = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), alias_actions);
         table_aliases->setStepDescription("Add table aliases");
         query_plan.addStep(std::move(table_aliases));
     }
@@ -2622,7 +2623,7 @@ void InterpreterSelectQuery::executeWhere(QueryPlan & query_plan, const ActionsA
 {
     auto dag = expression->dag.clone();
     if (expression->project_input)
-        dag.appendInputsForUnusedColumns(query_plan.getCurrentDataStream().header);
+        dag->appendInputsForUnusedColumns(query_plan.getCurrentDataStream().header);
 
     auto where_step = std::make_unique<FilterStep>(
         query_plan.getCurrentDataStream(), std::move(dag), getSelectQuery().where()->getColumnName(), remove_filter);
@@ -2773,7 +2774,7 @@ void InterpreterSelectQuery::executeHaving(QueryPlan & query_plan, const Actions
 {
     auto dag = expression->dag.clone();
     if (expression->project_input)
-        dag.appendInputsForUnusedColumns(query_plan.getCurrentDataStream().header);
+        dag->appendInputsForUnusedColumns(query_plan.getCurrentDataStream().header);
 
     auto having_step
         = std::make_unique<FilterStep>(query_plan.getCurrentDataStream(), std::move(dag), getSelectQuery().having()->getColumnName(), remove_filter);
@@ -2786,7 +2787,7 @@ void InterpreterSelectQuery::executeHaving(QueryPlan & query_plan, const Actions
 void InterpreterSelectQuery::executeTotalsAndHaving(
     QueryPlan & query_plan, bool has_having, const ActionsAndProjectInputsFlagPtr & expression, bool remove_filter, bool overflow_row, bool final)
 {
-    std::optional<ActionsDAG> dag;
+    ActionsDAGPtr dag;
     if (expression)
     {
         dag = expression->dag.clone();
@@ -2840,7 +2841,7 @@ void InterpreterSelectQuery::executeExpression(QueryPlan & query_plan, const Act
 
     auto dag = expression->dag.clone();
     if (expression->project_input)
-        dag.appendInputsForUnusedColumns(query_plan.getCurrentDataStream().header);
+        dag->appendInputsForUnusedColumns(query_plan.getCurrentDataStream().header);
 
     auto expression_step = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), std::move(dag));
 
diff --git a/src/Interpreters/InterpreterSelectQuery.h b/src/Interpreters/InterpreterSelectQuery.h
index a01a390f3c7..d4ed19d45ea 100644
--- a/src/Interpreters/InterpreterSelectQuery.h
+++ b/src/Interpreters/InterpreterSelectQuery.h
@@ -26,6 +26,7 @@ class Logger;
 namespace DB
 {
 
+class SubqueryForSet;
 class InterpreterSelectWithUnionQuery;
 class Context;
 class QueryPlan;
@@ -239,7 +240,7 @@ private:
     Block source_header;
 
     /// Actions to calculate ALIAS if required.
-    std::optional<ActionsDAG> alias_actions;
+    ActionsDAGPtr alias_actions;
 
     /// The subquery interpreter, if the subquery
     std::unique_ptr<InterpreterSelectWithUnionQuery> interpreter_subquery;
diff --git a/src/Interpreters/InterpreterShowColumnsQuery.cpp b/src/Interpreters/InterpreterShowColumnsQuery.cpp
index 472cdedf3ae..d8fff4e6026 100644
--- a/src/Interpreters/InterpreterShowColumnsQuery.cpp
+++ b/src/Interpreters/InterpreterShowColumnsQuery.cpp
@@ -68,7 +68,6 @@ WITH map(
         'Map',         'JSON',
         'Tuple',       'JSON',
         'Object',      'JSON',
-        'JSON',        'JSON',
         'String',      '{}',
         'FixedString', '{}') AS native_to_mysql_mapping,
         )",
diff --git a/src/Interpreters/InterpreterShowCreateQuery.cpp b/src/Interpreters/InterpreterShowCreateQuery.cpp
index 3de6b755609..16add79d226 100644
--- a/src/Interpreters/InterpreterShowCreateQuery.cpp
+++ b/src/Interpreters/InterpreterShowCreateQuery.cpp
@@ -1,7 +1,9 @@
 #include <Storages/IStorage.h>
 #include <Parsers/TablePropertiesQueriesASTs.h>
+#include <Parsers/formatAST.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <QueryPipeline/BlockIO.h>
+#include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeString.h>
 #include <Columns/ColumnString.h>
 #include <Common/typeid_cast.h>
@@ -97,12 +99,7 @@ QueryPipeline InterpreterShowCreateQuery::executeImpl()
     }
 
     MutableColumnPtr column = ColumnString::create();
-    column->insert(format(
-    {
-        .ctx = getContext(),
-        .query = *create_query,
-        .one_line = false
-    }));
+    column->insert(format({.ctx = getContext(), .query = *create_query, .one_line = false}));
 
     return QueryPipeline(std::make_shared<SourceFromSingleChunk>(Block{{
         std::move(column),
diff --git a/src/Interpreters/InterpreterSystemQuery.cpp b/src/Interpreters/InterpreterSystemQuery.cpp
index d4e2f22036c..c284acfa308 100644
--- a/src/Interpreters/InterpreterSystemQuery.cpp
+++ b/src/Interpreters/InterpreterSystemQuery.cpp
@@ -369,12 +369,9 @@ BlockIO InterpreterSystemQuery::execute()
             system_context->clearMMappedFileCache();
             break;
         case Type::DROP_QUERY_CACHE:
-        {
             getContext()->checkAccess(AccessType::SYSTEM_DROP_QUERY_CACHE);
-            getContext()->clearQueryCache(query.query_cache_tag);
+            getContext()->clearQueryCache();
             break;
-        }
-
         case Type::DROP_COMPILED_EXPRESSION_CACHE:
 #if USE_EMBEDDED_COMPILER
             getContext()->checkAccess(AccessType::SYSTEM_DROP_COMPILED_EXPRESSION_CACHE);
@@ -666,20 +663,13 @@ BlockIO InterpreterSystemQuery::execute()
             startStopAction(ActionLocks::ViewRefresh, false);
             break;
         case Type::REFRESH_VIEW:
-            for (const auto & task : getRefreshTasks())
-                task->run();
-            break;
-        case Type::WAIT_VIEW:
-            for (const auto & task : getRefreshTasks())
-                task->wait();
+            getRefreshTask()->run();
             break;
         case Type::CANCEL_VIEW:
-            for (const auto & task : getRefreshTasks())
-                task->cancel();
+            getRefreshTask()->cancel();
             break;
         case Type::TEST_VIEW:
-            for (const auto & task : getRefreshTasks())
-                task->setFakeTime(query.fake_time_for_view);
+            getRefreshTask()->setFakeTime(query.fake_time_for_view);
             break;
         case Type::DROP_REPLICA:
             dropReplica(query);
@@ -720,8 +710,14 @@ BlockIO InterpreterSystemQuery::execute()
         case Type::FLUSH_LOGS:
         {
             getContext()->checkAccess(AccessType::SYSTEM_FLUSH_LOGS);
-            auto system_logs = getContext()->getSystemLogs();
-            system_logs.flush(true);
+
+            auto logs = getContext()->getSystemLogs();
+            std::vector<std::function<void()>> commands;
+            commands.reserve(logs.size());
+            for (auto * system_log : logs)
+                commands.emplace_back([system_log] { system_log->flush(true); });
+
+            executeCommandsAndThrowIfError(commands);
             break;
         }
         case Type::STOP_LISTEN:
@@ -1252,15 +1248,15 @@ void InterpreterSystemQuery::flushDistributed(ASTSystemQuery & query)
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "SYSTEM RESTART DISK is not supported");
 }
 
-RefreshTaskList InterpreterSystemQuery::getRefreshTasks()
+RefreshTaskHolder InterpreterSystemQuery::getRefreshTask()
 {
     auto ctx = getContext();
     ctx->checkAccess(AccessType::SYSTEM_VIEWS);
-    auto tasks = ctx->getRefreshSet().findTasks(table_id);
-    if (tasks.empty())
+    auto task = ctx->getRefreshSet().getTask(table_id);
+    if (!task)
         throw Exception(
             ErrorCodes::BAD_ARGUMENTS, "Refreshable view {} doesn't exist", table_id.getNameForLogs());
-    return tasks;
+    return task;
 }
 
 
@@ -1416,7 +1412,6 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
             break;
         }
         case Type::REFRESH_VIEW:
-        case Type::WAIT_VIEW:
         case Type::START_VIEW:
         case Type::START_VIEWS:
         case Type::STOP_VIEW:
diff --git a/src/Interpreters/InterpreterSystemQuery.h b/src/Interpreters/InterpreterSystemQuery.h
index f44fe930b04..776dd7915f0 100644
--- a/src/Interpreters/InterpreterSystemQuery.h
+++ b/src/Interpreters/InterpreterSystemQuery.h
@@ -74,7 +74,7 @@ private:
     void flushDistributed(ASTSystemQuery & query);
     [[noreturn]] void restartDisk(String & name);
 
-    RefreshTaskList getRefreshTasks();
+    RefreshTaskHolder getRefreshTask();
 
     AccessRightsElements getRequiredAccessForDDLOnCluster() const;
     void startStopAction(StorageActionBlockType action_type, bool start);
diff --git a/src/Interpreters/JoinedTables.cpp b/src/Interpreters/JoinedTables.cpp
index c5226107f8d..0de2bf9cb1f 100644
--- a/src/Interpreters/JoinedTables.cpp
+++ b/src/Interpreters/JoinedTables.cpp
@@ -308,7 +308,7 @@ std::shared_ptr<TableJoin> JoinedTables::makeTableJoin(const ASTSelectQuery & se
     if (tables_with_columns.size() < 2)
         return {};
 
-    const auto & settings = context->getSettingsRef();
+    auto settings = context->getSettingsRef();
     MultiEnum<JoinAlgorithm> join_algorithm = settings.join_algorithm;
     bool try_use_direct_join = join_algorithm.isSet(JoinAlgorithm::DIRECT) || join_algorithm.isSet(JoinAlgorithm::DEFAULT);
     auto table_join = std::make_shared<TableJoin>(settings, context->getGlobalTemporaryVolume(), context->getTempDataOnDisk());
diff --git a/src/Interpreters/Lemmatizers.cpp b/src/Interpreters/Lemmatizers.cpp
index c583108cf69..c24679de76e 100644
--- a/src/Interpreters/Lemmatizers.cpp
+++ b/src/Interpreters/Lemmatizers.cpp
@@ -33,19 +33,25 @@ public:
     }
 };
 
+/// Duplicate of code from StringUtils.h. Copied here for less dependencies.
+static bool startsWith(const std::string & s, const char * prefix)
+{
+    return s.size() >= strlen(prefix) && 0 == memcmp(s.data(), prefix, strlen(prefix));
+}
+
 Lemmatizers::Lemmatizers(const Poco::Util::AbstractConfiguration & config)
 {
-    const String prefix = "lemmatizers";
+    String prefix = "lemmatizers";
+    Poco::Util::AbstractConfiguration::Keys keys;
 
     if (!config.has(prefix))
-        return;
+        throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "No lemmatizers specified in server config on prefix '{}'", prefix);
 
-    Poco::Util::AbstractConfiguration::Keys keys;
     config.keys(prefix, keys);
 
     for (const auto & key : keys)
     {
-        if (key.starts_with("lemmatizer"))
+        if (startsWith(key, "lemmatizer"))
         {
             const auto & lemm_name = config.getString(prefix + "." + key + ".lang", "");
             const auto & lemm_path = config.getString(prefix + "." + key + ".path", "");
@@ -75,13 +81,13 @@ Lemmatizers::LemmPtr Lemmatizers::getLemmatizer(const String & name)
     if (paths.find(name) != paths.end())
     {
         if (!std::filesystem::exists(paths[name]))
-            throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Path to lemmatizer does not exist: {}", paths[name]);
+            throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Incorrect path to lemmatizer: {}", paths[name]);
 
         lemmatizers[name] = std::make_shared<Lemmatizer>(paths[name]);
         return lemmatizers[name];
     }
 
-    throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Lemmatizer with the name '{}' was not found in the configuration", name);
+    throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Lemmatizer named: '{}' is not found", name);
 }
 
 }
diff --git a/src/Interpreters/MutationsInterpreter.cpp b/src/Interpreters/MutationsInterpreter.cpp
index 916dee01431..30813d5e5af 100644
--- a/src/Interpreters/MutationsInterpreter.cpp
+++ b/src/Interpreters/MutationsInterpreter.cpp
@@ -147,7 +147,6 @@ ColumnDependencies getAllColumnDependencies(
 
 bool isStorageTouchedByMutations(
     MergeTreeData::DataPartPtr source_part,
-    MergeTreeData::MutationsSnapshotPtr mutations_snapshot,
     const StorageMetadataPtr & metadata_snapshot,
     const std::vector<MutationCommand> & commands,
     ContextPtr context)
@@ -155,7 +154,7 @@ bool isStorageTouchedByMutations(
     if (commands.empty())
         return false;
 
-    auto storage_from_part = std::make_shared<StorageFromMergeTreeDataPart>(source_part, mutations_snapshot);
+    auto storage_from_part = std::make_shared<StorageFromMergeTreeDataPart>(source_part);
     bool all_commands_can_be_skipped = true;
 
     for (const auto & command : commands)
@@ -220,7 +219,7 @@ bool isStorageTouchedByMutations(
     Block tmp_block;
     while (executor.pull(tmp_block));
 
-    auto count = (*block.getByName("count()").column)[0].safeGet<UInt64>();
+    auto count = (*block.getByName("count()").column)[0].get<UInt64>();
     return count != 0;
 }
 
@@ -286,13 +285,8 @@ MutationsInterpreter::Source::Source(StoragePtr storage_) : storage(std::move(st
 {
 }
 
-MutationsInterpreter::Source::Source(
-    MergeTreeData & storage_,
-    MergeTreeData::DataPartPtr source_part_,
-    AlterConversionsPtr alter_conversions_)
-    : data(&storage_)
-    , part(std::move(source_part_))
-    , alter_conversions(std::move(alter_conversions_))
+MutationsInterpreter::Source::Source(MergeTreeData & storage_, MergeTreeData::DataPartPtr source_part_)
+    : data(&storage_), part(std::move(source_part_))
 {
 }
 
@@ -392,14 +386,13 @@ MutationsInterpreter::MutationsInterpreter(
 MutationsInterpreter::MutationsInterpreter(
     MergeTreeData & storage_,
     MergeTreeData::DataPartPtr source_part_,
-    AlterConversionsPtr alter_conversions_,
     StorageMetadataPtr metadata_snapshot_,
     MutationCommands commands_,
     Names available_columns_,
     ContextPtr context_,
     Settings settings_)
     : MutationsInterpreter(
-        Source(storage_, std::move(source_part_), std::move(alter_conversions_)),
+        Source(storage_, std::move(source_part_)),
         std::move(metadata_snapshot_), std::move(commands_),
         std::move(available_columns_), std::move(context_), std::move(settings_))
 {
@@ -507,12 +500,6 @@ static void validateUpdateColumns(
                 throw Exception(ErrorCodes::NO_SUCH_COLUMN_IN_TABLE, "There is no column {} in table", backQuote(column_name));
             }
         }
-        else if (storage_columns.getColumn(GetColumnsOptions::Ordinary, column_name).type->hasDynamicSubcolumns())
-        {
-            throw Exception(ErrorCodes::CANNOT_UPDATE_COLUMN,
-                            "Cannot update column {} with type {}: updates of columns with dynamic subcolumns are not supported",
-                            backQuote(column_name), storage_columns.getColumn(GetColumnsOptions::Ordinary, column_name).type->getName());
-        }
     }
 }
 
@@ -1212,7 +1199,7 @@ void MutationsInterpreter::Source::read(
         const auto & names = first_stage.filter_column_names;
         size_t num_filters = names.size();
 
-        std::optional<ActionsDAG> filter;
+        ActionsDAGPtr filter;
         if (!first_stage.filter_column_names.empty())
         {
             ActionsDAG::NodeRawConstPtrs nodes(num_filters);
@@ -1224,18 +1211,9 @@ void MutationsInterpreter::Source::read(
 
         createReadFromPartStep(
             MergeTreeSequentialSourceType::Mutation,
-            plan,
-            *data,
-            storage_snapshot,
-            part,
-            alter_conversions,
-            required_columns,
-            nullptr,
-            apply_deleted_mask_,
-            std::move(filter),
-            false,
-            false,
-            context_,
+            plan, *data, storage_snapshot,
+            part, required_columns,
+            apply_deleted_mask_, filter, context_,
             getLogger("MutationsInterpreter"));
     }
     else
@@ -1304,17 +1282,17 @@ QueryPipelineBuilder MutationsInterpreter::addStreamsForLaterStages(const std::v
             {
                 auto dag = step->actions()->dag.clone();
                 if (step->actions()->project_input)
-                    dag.appendInputsForUnusedColumns(plan.getCurrentDataStream().header);
+                    dag->appendInputsForUnusedColumns(plan.getCurrentDataStream().header);
                 /// Execute DELETEs.
-                plan.addStep(std::make_unique<FilterStep>(plan.getCurrentDataStream(), std::move(dag), stage.filter_column_names[i], false));
+                plan.addStep(std::make_unique<FilterStep>(plan.getCurrentDataStream(), dag, stage.filter_column_names[i], false));
             }
             else
             {
                 auto dag = step->actions()->dag.clone();
                 if (step->actions()->project_input)
-                    dag.appendInputsForUnusedColumns(plan.getCurrentDataStream().header);
+                    dag->appendInputsForUnusedColumns(plan.getCurrentDataStream().header);
                 /// Execute UPDATE or final projection.
-                plan.addStep(std::make_unique<ExpressionStep>(plan.getCurrentDataStream(), std::move(dag)));
+                plan.addStep(std::make_unique<ExpressionStep>(plan.getCurrentDataStream(), dag));
             }
         }
 
diff --git a/src/Interpreters/MutationsInterpreter.h b/src/Interpreters/MutationsInterpreter.h
index 8601558b788..57863e9ae73 100644
--- a/src/Interpreters/MutationsInterpreter.h
+++ b/src/Interpreters/MutationsInterpreter.h
@@ -20,7 +20,6 @@ using QueryPipelineBuilderPtr = std::unique_ptr<QueryPipelineBuilder>;
 /// Return false if the data isn't going to be changed by mutations.
 bool isStorageTouchedByMutations(
     MergeTreeData::DataPartPtr source_part,
-    MergeTreeData::MutationsSnapshotPtr mutations_snapshot,
     const StorageMetadataPtr & metadata_snapshot,
     const std::vector<MutationCommand> & commands,
     ContextPtr context
@@ -71,7 +70,6 @@ public:
     MutationsInterpreter(
         MergeTreeData & storage_,
         MergeTreeData::DataPartPtr source_part_,
-        AlterConversionsPtr alter_conversions_,
         StorageMetadataPtr metadata_snapshot_,
         MutationCommands commands_,
         Names available_columns_,
@@ -139,7 +137,7 @@ public:
             bool can_execute_) const;
 
         explicit Source(StoragePtr storage_);
-        Source(MergeTreeData & storage_, MergeTreeData::DataPartPtr source_part_, AlterConversionsPtr alter_conversions_);
+        Source(MergeTreeData & storage_, MergeTreeData::DataPartPtr source_part_);
 
     private:
         StoragePtr storage;
@@ -147,7 +145,6 @@ public:
         /// Special case for *MergeTree.
         MergeTreeData * data = nullptr;
         MergeTreeData::DataPartPtr part;
-        AlterConversionsPtr alter_conversions;
     };
 
 private:
diff --git a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
index 7296bdaf383..4821d607d0e 100644
--- a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
+++ b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
@@ -3,7 +3,6 @@
 #include <Parsers/IAST.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTDataType.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTAlterQuery.h>
 #include <Parsers/ASTCreateQuery.h>
@@ -17,6 +16,7 @@
 #include <Parsers/MySQL/ASTCreateDefines.h>
 
 #include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Parsers/MySQL/ASTDeclareIndex.h>
 #include <Common/quoteString.h>
@@ -29,7 +29,6 @@
 #include <Interpreters/applyTableOverride.h>
 #include <Storages/IStorage.h>
 
-
 namespace DB
 {
 
@@ -96,22 +95,22 @@ NamesAndTypesList getColumnsList(const ASTExpressionList * columns_definition)
         }
 
         ASTPtr data_type = declare_column->data_type;
-        auto * data_type_node = data_type->as<ASTDataType>();
+        auto * data_type_function = data_type->as<ASTFunction>();
 
-        if (data_type_node)
+        if (data_type_function)
         {
-            String type_name_upper = Poco::toUpper(data_type_node->name);
+            String type_name_upper = Poco::toUpper(data_type_function->name);
 
             if (is_unsigned)
             {
                 /// For example(in MySQL): CREATE TABLE test(column_name INT NOT NULL ... UNSIGNED)
                 if (type_name_upper.find("INT") != String::npos && !endsWith(type_name_upper, "SIGNED")
                     && !endsWith(type_name_upper, "UNSIGNED"))
-                    data_type_node->name = type_name_upper + " UNSIGNED";
+                    data_type_function->name = type_name_upper + " UNSIGNED";
             }
 
             if (type_name_upper == "SET")
-                data_type_node->arguments.reset();
+                data_type_function->arguments.reset();
 
             /// Transforms MySQL ENUM's list of strings to ClickHouse string-integer pairs
             /// For example ENUM('a', 'b', 'c') -> ENUM('a'=1, 'b'=2, 'c'=3)
@@ -120,7 +119,7 @@ NamesAndTypesList getColumnsList(const ASTExpressionList * columns_definition)
             if (type_name_upper.find("ENUM") != String::npos)
             {
                 UInt16 i = 0;
-                for (ASTPtr & child : data_type_node->arguments->children)
+                for (ASTPtr & child : data_type_function->arguments->children)
                 {
                     auto new_child = std::make_shared<ASTFunction>();
                     new_child->name = "equals";
@@ -134,10 +133,10 @@ NamesAndTypesList getColumnsList(const ASTExpressionList * columns_definition)
             }
 
             if (type_name_upper == "DATE")
-                data_type_node->name = "Date32";
+                data_type_function->name = "Date32";
         }
         if (is_nullable)
-            data_type = makeASTDataType("Nullable", data_type);
+            data_type = makeASTFunction("Nullable", data_type);
 
         columns_name_and_type.emplace_back(declare_column->name, DataTypeFactory::instance().get(data_type));
     }
@@ -157,7 +156,7 @@ static ColumnsDescription createColumnsDescription(const NamesAndTypesList & col
     /// (see git blame for details).
     auto column_name_and_type = columns_name_and_type.begin();
     const auto * declare_column_ast = columns_definition->children.begin();
-    for (; column_name_and_type != columns_name_and_type.end(); ++column_name_and_type, ++declare_column_ast)
+    for (; column_name_and_type != columns_name_and_type.end(); column_name_and_type++, declare_column_ast++)
     {
         const auto & declare_column = (*declare_column_ast)->as<MySQLParser::ASTDeclareColumn>();
         String comment;
@@ -183,7 +182,7 @@ static NamesAndTypesList getNames(const ASTFunction & expr, ContextPtr context,
 
     ASTPtr temp_ast = expr.clone();
     auto syntax = TreeRewriter(context).analyze(temp_ast, columns);
-    auto required_columns = ExpressionAnalyzer(temp_ast, syntax, context).getActionsDAG(false).getRequiredColumns();
+    auto required_columns = ExpressionAnalyzer(temp_ast, syntax, context).getActionsDAG(false)->getRequiredColumns();
     return required_columns;
 }
 
@@ -483,7 +482,7 @@ ASTs InterpreterCreateImpl::getRewrittenQueries(
     {
         auto column_declaration = std::make_shared<ASTColumnDeclaration>();
         column_declaration->name = name;
-        column_declaration->type = makeASTDataType(type);
+        column_declaration->type = makeASTFunction(type);
         column_declaration->default_specifier = "MATERIALIZED";
         column_declaration->default_expression = std::make_shared<ASTLiteral>(default_value);
         column_declaration->children.emplace_back(column_declaration->type);
diff --git a/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp b/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp
index 81e6e6a8761..6d6077a0295 100644
--- a/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp
+++ b/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp
@@ -2,10 +2,12 @@
 
 #include <gtest/gtest.h>
 
+#include <Parsers/IAST.h>
 #include <Parsers/queryToString.h>
 #include <Parsers/ASTExternalDDLQuery.h>
 #include <Parsers/ParserExternalDDLQuery.h>
 #include <Parsers/parseQuery.h>
+#include <Interpreters/Context.h>
 #include <Interpreters/MySQL/InterpretersMySQLDDLQuery.h>
 #include <Common/tests/gtest_global_context.h>
 #include <Common/tests/gtest_global_register.h>
@@ -24,8 +26,8 @@ static inline ASTPtr tryRewrittenCreateQuery(const String & query, ContextPtr co
         context, "test_database", "test_database")[0];
 }
 
-static const char MATERIALIZEDMYSQL_TABLE_COLUMNS[] = ", `_sign` Int8 MATERIALIZED 1"
-                                                     ", `_version` UInt64 MATERIALIZED 1"
+static const char MATERIALIZEDMYSQL_TABLE_COLUMNS[] = ", `_sign` Int8() MATERIALIZED 1"
+                                                     ", `_version` UInt64() MATERIALIZED 1"
                                                      ", INDEX _version _version TYPE minmax GRANULARITY 1";
 
 TEST(MySQLCreateRewritten, ColumnsDataType)
diff --git a/src/Interpreters/OptimizeDateOrDateTimeConverterWithPreimageVisitor.cpp b/src/Interpreters/OptimizeDateOrDateTimeConverterWithPreimageVisitor.cpp
index 913f9900b77..dd205ae6508 100644
--- a/src/Interpreters/OptimizeDateOrDateTimeConverterWithPreimageVisitor.cpp
+++ b/src/Interpreters/OptimizeDateOrDateTimeConverterWithPreimageVisitor.cpp
@@ -42,13 +42,13 @@ ASTPtr generateOptimizedDateFilterAST(const String & comparator, const NameAndTy
 
     if (isDateOrDate32(column.type.get()))
     {
-        start_date_or_date_time = date_lut.dateToString(range.first.safeGet<DateLUTImpl::Time>());
-        end_date_or_date_time = date_lut.dateToString(range.second.safeGet<DateLUTImpl::Time>());
+        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.type.get()) || isDateTime64(column.type.get()))
     {
-        start_date_or_date_time = date_lut.timeToString(range.first.safeGet<DateLUTImpl::Time>());
-        end_date_or_date_time = date_lut.timeToString(range.second.safeGet<DateLUTImpl::Time>());
+        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 {};
 
diff --git a/src/Interpreters/OptimizeIfWithConstantConditionVisitor.cpp b/src/Interpreters/OptimizeIfWithConstantConditionVisitor.cpp
index e9a663d53b0..48c9988b6fc 100644
--- a/src/Interpreters/OptimizeIfWithConstantConditionVisitor.cpp
+++ b/src/Interpreters/OptimizeIfWithConstantConditionVisitor.cpp
@@ -24,7 +24,7 @@ static bool tryExtractConstValueFromCondition(const ASTPtr & condition, bool & v
         if (literal->value.getType() == Field::Types::Int64 ||
             literal->value.getType() == Field::Types::UInt64)
         {
-            value = literal->value.safeGet<Int64>();
+            value = literal->value.get<Int64>();
             return true;
         }
         if (literal->value.getType() == Field::Types::Null)
@@ -51,7 +51,7 @@ static bool tryExtractConstValueFromCondition(const ASTPtr & condition, bool & v
                 {
                     if (type_literal->value.getType() == Field::Types::String)
                     {
-                        const auto & type_str = type_literal->value.safeGet<std::string>();
+                        const auto & type_str = type_literal->value.get<std::string>();
                         if (type_str == "UInt8" || type_str == "Nullable(UInt8)")
                             return tryExtractConstValueFromCondition(expr_list->children.at(0), value);
                     }
diff --git a/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.cpp b/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.cpp
index 86cec8659f5..54515ea072a 100644
--- a/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.cpp
+++ b/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.cpp
@@ -72,7 +72,7 @@ bool shardContains(
     if (sharding_value.isNull())
         return false;
 
-    UInt64 value = sharding_value.safeGet<UInt64>();
+    UInt64 value = sharding_value.get<UInt64>();
     const auto shard_num = data.slots[value % data.slots.size()] + 1;
     return data.shard_info.shard_num == shard_num;
 }
@@ -120,20 +120,11 @@ void OptimizeShardingKeyRewriteInMatcher::visit(ASTFunction & function, Data & d
     else if (auto * tuple_literal = right->as<ASTLiteral>();
         tuple_literal && tuple_literal->value.getType() == Field::Types::Tuple)
     {
-        auto & tuple = tuple_literal->value.safeGet<Tuple>();
-        if (tuple.size() > 1)
+        auto & tuple = tuple_literal->value.get<Tuple &>();
+        std::erase_if(tuple, [&](auto & child)
         {
-            Tuple new_tuple;
-
-            for (auto & child : tuple)
-                if (shardContains(child, name, data))
-                    new_tuple.emplace_back(std::move(child));
-
-            if (new_tuple.empty())
-                new_tuple.emplace_back(std::move(tuple.back()));
-
-            tuple_literal->value = std::move(new_tuple);
-        }
+            return tuple.size() > 1 && !shardContains(child, name, data);
+        });
     }
 }
 
@@ -168,7 +159,7 @@ public:
         {
             if (isTuple(constant->getResultType()))
             {
-                const auto & tuple = constant->getValue().safeGet<Tuple &>();
+                const auto & tuple = constant->getValue().get<Tuple &>();
                 Tuple new_tuple;
                 new_tuple.reserve(tuple.size());
 
diff --git a/src/Interpreters/PeriodicLog.cpp b/src/Interpreters/PeriodicLog.cpp
index 22bc14856c4..9d2891e11eb 100644
--- a/src/Interpreters/PeriodicLog.cpp
+++ b/src/Interpreters/PeriodicLog.cpp
@@ -10,7 +10,7 @@ void PeriodicLog<LogElement>::startCollect(size_t collect_interval_milliseconds_
 {
     collect_interval_milliseconds = collect_interval_milliseconds_;
     is_shutdown_metric_thread = false;
-    collecting_thread = std::make_unique<ThreadFromGlobalPool>([this] { threadFunction(); });
+    flush_thread = std::make_unique<ThreadFromGlobalPool>([this] { threadFunction(); });
 }
 
 template <typename LogElement>
@@ -19,15 +19,15 @@ void PeriodicLog<LogElement>::stopCollect()
     bool old_val = false;
     if (!is_shutdown_metric_thread.compare_exchange_strong(old_val, true))
         return;
-    if (collecting_thread)
-        collecting_thread->join();
+    if (flush_thread)
+        flush_thread->join();
 }
 
 template <typename LogElement>
 void PeriodicLog<LogElement>::shutdown()
 {
     stopCollect();
-    Base::shutdown();
+    this->stopFlushThread();
 }
 
 template <typename LogElement>
diff --git a/src/Interpreters/PeriodicLog.h b/src/Interpreters/PeriodicLog.h
index 8254a02434a..08c3f7eb23f 100644
--- a/src/Interpreters/PeriodicLog.h
+++ b/src/Interpreters/PeriodicLog.h
@@ -17,7 +17,6 @@ template <typename LogElement>
 class PeriodicLog : public SystemLog<LogElement>
 {
     using SystemLog<LogElement>::SystemLog;
-    using Base = SystemLog<LogElement>;
 
 public:
     using TimePoint = std::chrono::system_clock::time_point;
@@ -25,18 +24,18 @@ public:
     /// Launches a background thread to collect metrics with interval
     void startCollect(size_t collect_interval_milliseconds_);
 
-    void shutdown() final;
-
-protected:
     /// Stop background thread
     void stopCollect();
 
+    void shutdown() final;
+
+protected:
     virtual void stepFunction(TimePoint current_time) = 0;
 
 private:
     void threadFunction();
 
-    std::unique_ptr<ThreadFromGlobalPool> collecting_thread;
+    std::unique_ptr<ThreadFromGlobalPool> flush_thread;
     size_t collect_interval_milliseconds;
     std::atomic<bool> is_shutdown_metric_thread{false};
 };
diff --git a/src/Interpreters/ProcessList.cpp b/src/Interpreters/ProcessList.cpp
index f8a808f6c68..5b07852d9e3 100644
--- a/src/Interpreters/ProcessList.cpp
+++ b/src/Interpreters/ProcessList.cpp
@@ -258,7 +258,7 @@ ProcessList::insert(const String & query_, const IAST * ast, ContextMutablePtr q
                 query_context,
                 query_,
                 client_info,
-                priorities.insert(settings.priority),
+                priorities.insert(static_cast<int>(settings.priority)),
                 std::move(thread_group),
                 query_kind,
                 settings,
@@ -657,7 +657,7 @@ QueryStatusInfo QueryStatus::getInfo(bool get_thread_list, bool get_profile_even
     {
         if (auto ctx = context.lock())
         {
-            res.query_settings = std::make_shared<Settings>(ctx->getSettingsCopy());
+            res.query_settings = std::make_shared<Settings>(ctx->getSettings());
             res.current_database = ctx->getCurrentDatabase();
         }
     }
diff --git a/src/Interpreters/ProcessorsProfileLog.cpp b/src/Interpreters/ProcessorsProfileLog.cpp
index 8a646b5d0e7..7dec2a3163a 100644
--- a/src/Interpreters/ProcessorsProfileLog.cpp
+++ b/src/Interpreters/ProcessorsProfileLog.cpp
@@ -30,8 +30,6 @@ ColumnsDescription ProcessorProfileLogElement::getColumnsDescription()
         {"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_step_name", std::make_shared<DataTypeString>(), "Name of the query plan step which created this processor. The value is empty if the processor was not added from any step."},
-        {"plan_step_description", std::make_shared<DataTypeString>(), "Description of the query plan step which created this processor. The value is empty 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>(), "ID of the initial query (for distributed query execution)."},
@@ -66,8 +64,6 @@ void ProcessorProfileLogElement::appendToBlock(MutableColumns & columns) const
     }
 
     columns[i++]->insert(plan_step);
-    columns[i++]->insert(plan_step_name);
-    columns[i++]->insert(plan_step_description);
     columns[i++]->insert(plan_group);
     columns[i++]->insertData(initial_query_id.data(), initial_query_id.size());
     columns[i++]->insertData(query_id.data(), query_id.size());
diff --git a/src/Interpreters/ProcessorsProfileLog.h b/src/Interpreters/ProcessorsProfileLog.h
index fbf52f45f56..abece2604f2 100644
--- a/src/Interpreters/ProcessorsProfileLog.h
+++ b/src/Interpreters/ProcessorsProfileLog.h
@@ -19,8 +19,6 @@ struct ProcessorProfileLogElement
 
     UInt64 plan_step{};
     UInt64 plan_group{};
-    String plan_step_name;
-    String plan_step_description;
 
     String initial_query_id;
     String query_id;
diff --git a/src/Interpreters/QueryPriorities.h b/src/Interpreters/QueryPriorities.h
index 7601c7ba6eb..9e18e7bcff3 100644
--- a/src/Interpreters/QueryPriorities.h
+++ b/src/Interpreters/QueryPriorities.h
@@ -31,7 +31,7 @@ namespace DB
 class QueryPriorities
 {
 public:
-    using Priority = size_t;
+    using Priority = int;
 
 private:
     friend struct Handle;
diff --git a/src/Interpreters/RewriteCountVariantsVisitor.cpp b/src/Interpreters/RewriteCountVariantsVisitor.cpp
index 272e1ac735f..4a541c3765a 100644
--- a/src/Interpreters/RewriteCountVariantsVisitor.cpp
+++ b/src/Interpreters/RewriteCountVariantsVisitor.cpp
@@ -53,7 +53,7 @@ void RewriteCountVariantsVisitor::visit(ASTFunction & func)
     {
         if (first_arg_literal->value.getType() == Field::Types::UInt64)
         {
-            auto constant = first_arg_literal->value.safeGet<UInt64>();
+            auto constant = first_arg_literal->value.get<UInt64>();
             if (constant == 1 && !context->getSettingsRef().aggregate_functions_null_for_empty)
                 transform = true;
         }
diff --git a/src/Interpreters/RowRefs.cpp b/src/Interpreters/RowRefs.cpp
index 1b397ab56ef..9785ba46dab 100644
--- a/src/Interpreters/RowRefs.cpp
+++ b/src/Interpreters/RowRefs.cpp
@@ -144,7 +144,7 @@ public:
         return low;
     }
 
-    RowRef * findAsof(const IColumn & asof_column, size_t row_num) override
+    RowRef findAsof(const IColumn & asof_column, size_t row_num) override
     {
         sort();
 
@@ -156,10 +156,10 @@ public:
         if (pos != entries.size())
         {
             size_t row_ref_index = entries[pos].row_ref_index;
-            return &row_refs[row_ref_index];
+            return row_refs[row_ref_index];
         }
 
-        return nullptr;
+        return {nullptr, 0};
     }
 
 private:
diff --git a/src/Interpreters/RowRefs.h b/src/Interpreters/RowRefs.h
index f8ac68191d6..650b2311ba7 100644
--- a/src/Interpreters/RowRefs.h
+++ b/src/Interpreters/RowRefs.h
@@ -122,8 +122,7 @@ struct RowRefList : RowRef
     };
 
     RowRefList() {} /// NOLINT
-    RowRefList(const Block * block_, size_t row_num_) : RowRef(block_, row_num_), rows(1) {}
-    RowRefList(const Block * block_, size_t row_start_, size_t rows_) : RowRef(block_, row_start_), rows(static_cast<SizeT>(rows_)) {}
+    RowRefList(const Block * block_, size_t row_num_) : RowRef(block_, row_num_) {}
 
     ForwardIterator begin() const { return ForwardIterator(this); }
 
@@ -136,11 +135,8 @@ struct RowRefList : RowRef
             *next = Batch(nullptr);
         }
         next = next->insert(std::move(row_ref), pool);
-        ++rows;
     }
 
-public:
-    SizeT rows = 0;
 private:
     Batch * next = nullptr;
 };
@@ -162,7 +158,7 @@ struct SortedLookupVectorBase
     virtual void insert(const IColumn &, const Block *, size_t) = 0;
 
     // This needs to be synchronized internally
-    virtual RowRef * findAsof(const IColumn &, size_t) = 0;
+    virtual RowRef findAsof(const IColumn &, size_t) = 0;
 };
 
 
diff --git a/src/Interpreters/ServerAsynchronousMetrics.cpp b/src/Interpreters/ServerAsynchronousMetrics.cpp
index 079029695c9..872a9f864df 100644
--- a/src/Interpreters/ServerAsynchronousMetrics.cpp
+++ b/src/Interpreters/ServerAsynchronousMetrics.cpp
@@ -55,11 +55,9 @@ ServerAsynchronousMetrics::ServerAsynchronousMetrics(
     ContextPtr global_context_,
     unsigned update_period_seconds,
     unsigned heavy_metrics_update_period_seconds,
-    const ProtocolServerMetricsFunc & protocol_server_metrics_func_,
-    bool update_jemalloc_epoch_,
-    bool update_rss_)
+    const ProtocolServerMetricsFunc & protocol_server_metrics_func_)
     : WithContext(global_context_)
-    , AsynchronousMetrics(update_period_seconds, protocol_server_metrics_func_, update_jemalloc_epoch_, update_rss_)
+    , AsynchronousMetrics(update_period_seconds, protocol_server_metrics_func_)
     , heavy_metric_update_period(heavy_metrics_update_period_seconds)
 {
     /// sanity check
diff --git a/src/Interpreters/ServerAsynchronousMetrics.h b/src/Interpreters/ServerAsynchronousMetrics.h
index 5fab419a32b..e3c83dc748e 100644
--- a/src/Interpreters/ServerAsynchronousMetrics.h
+++ b/src/Interpreters/ServerAsynchronousMetrics.h
@@ -14,10 +14,7 @@ public:
         ContextPtr global_context_,
         unsigned update_period_seconds,
         unsigned heavy_metrics_update_period_seconds,
-        const ProtocolServerMetricsFunc & protocol_server_metrics_func_,
-        bool update_jemalloc_epoch_,
-        bool update_rss_);
-
+        const ProtocolServerMetricsFunc & protocol_server_metrics_func_);
     ~ServerAsynchronousMetrics() override;
 
 private:
diff --git a/src/Interpreters/SessionLog.cpp b/src/Interpreters/SessionLog.cpp
index 866f5ba8c0a..0615a2a1d62 100644
--- a/src/Interpreters/SessionLog.cpp
+++ b/src/Interpreters/SessionLog.cpp
@@ -105,10 +105,9 @@ ColumnsDescription SessionLogElement::getColumnsDescription()
             {"MySQL",                  static_cast<Int8>(Interface::MYSQL)},
             {"PostgreSQL",             static_cast<Int8>(Interface::POSTGRESQL)},
             {"Local",                  static_cast<Int8>(Interface::LOCAL)},
-            {"TCP_Interserver",        static_cast<Int8>(Interface::TCP_INTERSERVER)},
-            {"Prometheus",             static_cast<Int8>(Interface::PROMETHEUS)},
+            {"TCP_Interserver",        static_cast<Int8>(Interface::TCP_INTERSERVER)}
         });
-    static_assert(magic_enum::enum_count<Interface>() == 8);
+    static_assert(magic_enum::enum_count<Interface>() == 7);
 
     auto lc_string_datatype = std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>());
 
diff --git a/src/Interpreters/Squashing.cpp b/src/Interpreters/Squashing.cpp
index c656a1a797b..ef6b749136c 100644
--- a/src/Interpreters/Squashing.cpp
+++ b/src/Interpreters/Squashing.cpp
@@ -5,6 +5,7 @@
 #include <Common/CurrentThread.h>
 #include <base/defines.h>
 
+
 namespace DB
 {
 
@@ -105,17 +106,6 @@ Chunk Squashing::convertToChunk(CurrentData && data) const
 
 Chunk Squashing::squash(std::vector<Chunk> && input_chunks, Chunk::ChunkInfoCollection && infos)
 {
-    if (input_chunks.size() == 1)
-    {
-        /// this is just optimization, no logic changes
-        Chunk result = std::move(input_chunks.front());
-        infos.appendIfUniq(std::move(result.getChunkInfos()));
-        result.setChunkInfos(infos);
-
-        chassert(result);
-        return result;
-    }
-
     std::vector<IColumn::MutablePtr> mutable_columns = {};
     size_t rows = 0;
     for (const Chunk & chunk : input_chunks)
@@ -124,32 +114,20 @@ Chunk Squashing::squash(std::vector<Chunk> && input_chunks, Chunk::ChunkInfoColl
     {
         auto & first_chunk = input_chunks[0];
         Columns columns = first_chunk.detachColumns();
-        mutable_columns.reserve(columns.size());
         for (auto & column : columns)
+        {
             mutable_columns.push_back(IColumn::mutate(std::move(column)));
+            mutable_columns.back()->reserve(rows);
+        }
     }
 
-    size_t num_columns = mutable_columns.size();
-    /// Collect the list of source columns for each column.
-    std::vector<Columns> source_columns_list(num_columns, Columns{});
-    for (size_t i = 0; i != num_columns; ++i)
-        source_columns_list[i].reserve(input_chunks.size() - 1);
-
     for (size_t i = 1; i < input_chunks.size(); ++i) // We've already processed the first chunk above
     {
-        auto columns = input_chunks[i].detachColumns();
-        for (size_t j = 0; j != num_columns; ++j)
-            source_columns_list[j].emplace_back(std::move(columns[j]));
-    }
-
-    for (size_t i = 0; i != num_columns; ++i)
-    {
-        /// We know all the data we will insert in advance and can make all necessary pre-allocations.
-        mutable_columns[i]->prepareForSquashing(source_columns_list[i]);
-        for (auto & source_column : source_columns_list[i])
+        Columns columns = input_chunks[i].detachColumns();
+        for (size_t j = 0, size = mutable_columns.size(); j < size; ++j)
         {
-            auto column = std::move(source_column);
-            mutable_columns[i]->insertRangeFrom(*column, 0, column->size());
+            const auto source_column = columns[j];
+            mutable_columns[j]->insertRangeFrom(*source_column, 0, source_column->size());
         }
     }
 
diff --git a/src/Interpreters/StorageID.h b/src/Interpreters/StorageID.h
index ad55d16e284..f9afbc7b98d 100644
--- a/src/Interpreters/StorageID.h
+++ b/src/Interpreters/StorageID.h
@@ -27,6 +27,7 @@ class ASTQueryWithTableAndOutput;
 class ASTTableIdentifier;
 class Context;
 
+// TODO(ilezhankin): refactor and merge |ASTTableIdentifier|
 struct StorageID
 {
     String database_name;
diff --git a/src/Interpreters/SubstituteColumnOptimizer.cpp b/src/Interpreters/SubstituteColumnOptimizer.cpp
index 925ded15857..c4aef89fed2 100644
--- a/src/Interpreters/SubstituteColumnOptimizer.cpp
+++ b/src/Interpreters/SubstituteColumnOptimizer.cpp
@@ -13,6 +13,10 @@
 
 namespace DB
 {
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
 
 namespace
 {
@@ -233,8 +237,16 @@ void SubstituteColumnOptimizer::perform()
 
     const auto & compare_graph = metadata_snapshot->getConstraints().getGraph();
 
-    if (compare_graph.getNumOfComponents() == 0)
-        return;
+    // Fill aliases
+    if (select_query->select())
+    {
+        auto * list = select_query->refSelect()->as<ASTExpressionList>();
+        if (!list)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "List of selected columns must be ASTExpressionList");
+
+        for (ASTPtr & ast : list->children)
+            ast->setAlias(ast->getAliasOrColumnName());
+    }
 
     auto run_for_all = [&](const auto func)
     {
diff --git a/src/Interpreters/SubstituteColumnOptimizer.h b/src/Interpreters/SubstituteColumnOptimizer.h
index ecb65cd7707..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 (according to compressed and uncompressed sizes).
+/// 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 6a3ec197c6e..572481e6b12 100644
--- a/src/Interpreters/SystemLog.cpp
+++ b/src/Interpreters/SystemLog.cpp
@@ -1,7 +1,6 @@
 #include <Interpreters/SystemLog.h>
 
 #include <base/scope_guard.h>
-#include <Common/SystemLogBase.h>
 #include <Common/logger_useful.h>
 #include <Common/MemoryTrackerBlockerInThread.h>
 #include <Common/quoteString.h>
@@ -50,7 +49,6 @@
 
 #include <fmt/core.h>
 
-
 namespace DB
 {
 
@@ -284,21 +282,85 @@ ASTPtr getCreateTableQueryClean(const StorageID & table_id, ContextPtr context)
 
 SystemLogs::SystemLogs(ContextPtr global_context, const Poco::Util::AbstractConfiguration & config)
 {
-/// NOLINTBEGIN(bugprone-macro-parentheses)
-#define CREATE_PUBLIC_MEMBERS(log_type, member, descr) \
-    member = createSystemLog<log_type>(global_context, "system", #member, config, #member, descr); \
-
-    LIST_OF_ALL_SYSTEM_LOGS(CREATE_PUBLIC_MEMBERS)
-#undef CREATE_PUBLIC_MEMBERS
-/// NOLINTEND(bugprone-macro-parentheses)
+    query_log = createSystemLog<QueryLog>(global_context, "system", "query_log", config, "query_log", "Contains information about executed queries, for example, start time, duration of processing, error messages.");
+    query_thread_log = createSystemLog<QueryThreadLog>(global_context, "system", "query_thread_log", config, "query_thread_log", "Contains information about threads that execute queries, for example, thread name, thread start time, duration of query processing.");
+    part_log = createSystemLog<PartLog>(global_context, "system", "part_log", config, "part_log", "This table contains information about events that occurred with data parts in the MergeTree family tables, such as adding or merging data.");
+    trace_log = createSystemLog<TraceLog>(global_context, "system", "trace_log", config, "trace_log", "Contains stack traces collected by the sampling query profiler.");
+    crash_log = createSystemLog<CrashLog>(global_context, "system", "crash_log", config, "crash_log", "Contains information about stack traces for fatal errors. The table does not exist in the database by default, it is created only when fatal errors occur.");
+    text_log = createSystemLog<TextLog>(global_context, "system", "text_log", config, "text_log", "Contains logging entries which are normally written to a log file or to stdout.");
+    metric_log = createSystemLog<MetricLog>(global_context, "system", "metric_log", config, "metric_log", "Contains history of metrics values from tables system.metrics and system.events, periodically flushed to disk.");
+    error_log = createSystemLog<ErrorLog>(global_context, "system", "error_log", config, "error_log", "Contains history of error values from table system.errors, periodically flushed to disk.");
+    filesystem_cache_log = createSystemLog<FilesystemCacheLog>(global_context, "system", "filesystem_cache_log", config, "filesystem_cache_log", "Contains a history of all events occurred with filesystem cache for objects on a remote filesystem.");
+    filesystem_read_prefetches_log = createSystemLog<FilesystemReadPrefetchesLog>(
+        global_context, "system", "filesystem_read_prefetches_log", config, "filesystem_read_prefetches_log", "Contains a history of all prefetches done during reading from MergeTables backed by a remote filesystem.");
+    asynchronous_metric_log = createSystemLog<AsynchronousMetricLog>(
+        global_context, "system", "asynchronous_metric_log", config,
+        "asynchronous_metric_log", "Contains the historical values for system.asynchronous_metrics, once per time interval (one second by default).");
+    opentelemetry_span_log = createSystemLog<OpenTelemetrySpanLog>(
+        global_context, "system", "opentelemetry_span_log", config,
+        "opentelemetry_span_log", "Contains information about trace spans for executed queries.");
+    query_views_log = createSystemLog<QueryViewsLog>(global_context, "system", "query_views_log", config, "query_views_log", "Contains information about the dependent views executed when running a query, for example, the view type or the execution time.");
+    zookeeper_log = createSystemLog<ZooKeeperLog>(global_context, "system", "zookeeper_log", config, "zookeeper_log", "This table contains information about the parameters of the request to the ZooKeeper server and the response from it.");
+    session_log = createSystemLog<SessionLog>(global_context, "system", "session_log", config, "session_log", "Contains information about all successful and failed login and logout events.");
+    transactions_info_log = createSystemLog<TransactionsInfoLog>(
+        global_context, "system", "transactions_info_log", config, "transactions_info_log", "Contains information about all transactions executed on a current server.");
+    processors_profile_log = createSystemLog<ProcessorsProfileLog>(global_context, "system", "processors_profile_log", config, "processors_profile_log", "Contains profiling information on processors level (building blocks for a pipeline for query execution.");
+    asynchronous_insert_log = createSystemLog<AsynchronousInsertLog>(global_context, "system", "asynchronous_insert_log", config, "asynchronous_insert_log", "Contains a history for all asynchronous inserts executed on current server.");
+    backup_log = createSystemLog<BackupLog>(global_context, "system", "backup_log", config, "backup_log", "Contains logging entries with the information about BACKUP and RESTORE operations.");
+    s3_queue_log = createSystemLog<ObjectStorageQueueLog>(global_context, "system", "s3queue_log", config, "s3queue_log", "Contains logging entries with the information files processes by S3Queue engine.");
+    azure_queue_log = createSystemLog<ObjectStorageQueueLog>(global_context, "system", "azure_queue_log", config, "azure_queue_log", "Contains logging entries with the information files processes by S3Queue engine.");
+    blob_storage_log = createSystemLog<BlobStorageLog>(global_context, "system", "blob_storage_log", config, "blob_storage_log", "Contains logging entries with information about various blob storage operations such as uploads and deletes.");
 
+    if (query_log)
+        logs.emplace_back(query_log.get());
+    if (query_thread_log)
+        logs.emplace_back(query_thread_log.get());
+    if (part_log)
+        logs.emplace_back(part_log.get());
+    if (trace_log)
+        logs.emplace_back(trace_log.get());
+    if (crash_log)
+        logs.emplace_back(crash_log.get());
+    if (text_log)
+        logs.emplace_back(text_log.get());
+    if (metric_log)
+        logs.emplace_back(metric_log.get());
+    if (error_log)
+        logs.emplace_back(error_log.get());
+    if (asynchronous_metric_log)
+        logs.emplace_back(asynchronous_metric_log.get());
+    if (opentelemetry_span_log)
+        logs.emplace_back(opentelemetry_span_log.get());
+    if (query_views_log)
+        logs.emplace_back(query_views_log.get());
+    if (zookeeper_log)
+        logs.emplace_back(zookeeper_log.get());
     if (session_log)
+    {
+        logs.emplace_back(session_log.get());
         global_context->addWarningMessage("Table system.session_log is enabled. It's unreliable and may contain garbage. Do not use it for any kind of security monitoring.");
+    }
+    if (transactions_info_log)
+        logs.emplace_back(transactions_info_log.get());
+    if (processors_profile_log)
+        logs.emplace_back(processors_profile_log.get());
+    if (filesystem_cache_log)
+        logs.emplace_back(filesystem_cache_log.get());
+    if (filesystem_read_prefetches_log)
+        logs.emplace_back(filesystem_read_prefetches_log.get());
+    if (asynchronous_insert_log)
+        logs.emplace_back(asynchronous_insert_log.get());
+    if (backup_log)
+        logs.emplace_back(backup_log.get());
+    if (s3_queue_log)
+        logs.emplace_back(s3_queue_log.get());
+    if (blob_storage_log)
+        logs.emplace_back(blob_storage_log.get());
 
     bool should_prepare = global_context->getServerSettings().prepare_system_log_tables_on_startup;
     try
     {
-        for (auto & log : getAllLogs())
+        for (auto & log : logs)
         {
             log->startup();
             if (should_prepare)
@@ -332,54 +394,20 @@ SystemLogs::SystemLogs(ContextPtr global_context, const Poco::Util::AbstractConf
     }
 }
 
-std::vector<ISystemLog *> SystemLogs::getAllLogs() const
+
+SystemLogs::~SystemLogs()
 {
-#define GET_RAW_POINTERS(log_type, member, descr) \
-    (member).get(), \
-
-    std::vector<ISystemLog *> result = {
-        LIST_OF_ALL_SYSTEM_LOGS(GET_RAW_POINTERS)
-    };
-#undef GET_RAW_POINTERS
-
-    auto last_it = std::remove(result.begin(), result.end(), nullptr);
-    result.erase(last_it, result.end());
-
-    return result;
-}
-
-void SystemLogs::flush(bool should_prepare_tables_anyway)
-{
-    auto logs = getAllLogs();
-    std::vector<ISystemLog::Index> logs_indexes(logs.size(), 0);
-
-    for (size_t i = 0; i < logs.size(); ++i)
-    {
-        auto last_log_index = logs[i]->getLastLogIndex();
-        logs_indexes[i] = last_log_index;
-        logs[i]->notifyFlush(last_log_index, should_prepare_tables_anyway);
-    }
-
-    for (size_t i = 0; i < logs.size(); ++i)
-        logs[i]->flush(logs_indexes[i], should_prepare_tables_anyway);
-}
-
-void SystemLogs::flushAndShutdown()
-{
-    flush(/* should_prepare_tables_anyway */ false);
     shutdown();
 }
 
 void SystemLogs::shutdown()
 {
-    auto logs = getAllLogs();
     for (auto & log : logs)
         log->shutdown();
 }
 
 void SystemLogs::handleCrash()
 {
-    auto logs = getAllLogs();
     for (auto & log : logs)
         log->handleCrash();
 }
@@ -402,39 +430,65 @@ SystemLog<LogElement>::SystemLog(
 template <typename LogElement>
 void SystemLog<LogElement>::shutdown()
 {
-    Base::stopFlushThread();
+    stopFlushThread();
 
     auto table = DatabaseCatalog::instance().tryGetTable(table_id, getContext());
     if (table)
         table->flushAndShutdown();
 }
 
+template <typename LogElement>
+void SystemLog<LogElement>::stopFlushThread()
+{
+    {
+        std::lock_guard lock(thread_mutex);
+
+        if (!saving_thread || !saving_thread->joinable())
+            return;
+
+        if (is_shutdown)
+            return;
+
+        is_shutdown = true;
+        queue->shutdown();
+    }
+
+    saving_thread->join();
+}
+
 
 template <typename LogElement>
 void SystemLog<LogElement>::savingThreadFunction()
 {
     setThreadName("SystemLogFlush");
 
-    while (true)
+    std::vector<LogElement> to_flush;
+    bool exit_this_thread = false;
+    while (!exit_this_thread)
     {
         try
         {
-            auto result = queue->pop();
+            // The end index (exclusive, like std end()) of the messages we are
+            // going to flush.
+            uint64_t to_flush_end = 0;
+            // Should we prepare table even if there are no new messages.
+            bool should_prepare_tables_anyway = false;
 
-            if (result.is_shutdown)
-            {
-                LOG_TRACE(log, "Terminating");
-                return;
-            }
+            to_flush_end = queue->pop(to_flush, should_prepare_tables_anyway, exit_this_thread);
 
-            if (!result.logs.empty())
+            if (to_flush.empty())
             {
-                flushImpl(result.logs, result.last_log_index);
+                if (should_prepare_tables_anyway)
+                {
+                    prepareTable();
+                    LOG_TRACE(log, "Table created (force)");
+
+                    queue->confirm(to_flush_end);
+                }
             }
-            else if (result.create_table_force)
+            else
             {
-                prepareTable();
-                queue->confirm(result.last_log_index);
+                flushImpl(to_flush, to_flush_end);
             }
         }
         catch (...)
@@ -442,6 +496,7 @@ void SystemLog<LogElement>::savingThreadFunction()
             tryLogCurrentException(__PRETTY_FUNCTION__);
         }
     }
+    LOG_TRACE(log, "Terminating");
 }
 
 
diff --git a/src/Interpreters/SystemLog.h b/src/Interpreters/SystemLog.h
index c03f9370068..0ac468b15ec 100644
--- a/src/Interpreters/SystemLog.h
+++ b/src/Interpreters/SystemLog.h
@@ -5,32 +5,6 @@
 #include <Parsers/IAST.h>
 
 #include <boost/noncopyable.hpp>
-#include <vector>
-
-#define LIST_OF_ALL_SYSTEM_LOGS(M) \
-    M(QueryLog,              query_log,            "Contains information about executed queries, for example, start time, duration of processing, error messages.") \
-    M(QueryThreadLog,        query_thread_log,     "Contains information about threads that execute queries, for example, thread name, thread start time, duration of query processing.") \
-    M(PartLog,               part_log,             "This table contains information about events that occurred with data parts in the MergeTree family tables, such as adding or merging data.") \
-    M(TraceLog,              trace_log,            "Contains stack traces collected by the sampling query profiler.") \
-    M(CrashLog,              crash_log,            "Contains information about stack traces for fatal errors. The table does not exist in the database by default, it is created only when fatal errors occur.") \
-    M(TextLog,               text_log,             "Contains logging entries which are normally written to a log file or to stdout.") \
-    M(MetricLog,             metric_log,           "Contains history of metrics values from tables system.metrics and system.events, periodically flushed to disk.") \
-    M(ErrorLog,              error_log,            "Contains history of error values from table system.errors, periodically flushed to disk.") \
-    M(FilesystemCacheLog,    filesystem_cache_log, "Contains a history of all events occurred with filesystem cache for objects on a remote filesystem.") \
-    M(FilesystemReadPrefetchesLog, filesystem_read_prefetches_log, "Contains a history of all prefetches done during reading from MergeTables backed by a remote filesystem.") \
-    M(ObjectStorageQueueLog, s3queue_log,          "Contains logging entries with the information files processes by S3Queue engine.") \
-    M(ObjectStorageQueueLog, azure_queue_log,      "Contains logging entries with the information files processes by S3Queue engine.") \
-    M(AsynchronousMetricLog, asynchronous_metric_log, "Contains the historical values for system.asynchronous_metrics, once per time interval (one second by default).") \
-    M(OpenTelemetrySpanLog,  opentelemetry_span_log, "Contains information about trace spans for executed queries.") \
-    M(QueryViewsLog,         query_views_log,      "Contains information about the dependent views executed when running a query, for example, the view type or the execution time.") \
-    M(ZooKeeperLog,          zookeeper_log,        "This table contains information about the parameters of the request to the ZooKeeper server and the response from it.") \
-    M(SessionLog,            session_log,          "Contains information about all successful and failed login and logout events.") \
-    M(TransactionsInfoLog,   transactions_info_log, "Contains information about all transactions executed on a current server.") \
-    M(ProcessorsProfileLog,  processors_profile_log, "Contains profiling information on processors level (building blocks for a pipeline for query execution.") \
-    M(AsynchronousInsertLog, asynchronous_insert_log, "Contains a history for all asynchronous inserts executed on current server.") \
-    M(BackupLog,             backup_log,           "Contains logging entries with the information about BACKUP and RESTORE operations.") \
-    M(BlobStorageLog,        blob_storage_log,     "Contains logging entries with information about various blob storage operations such as uploads and deletes.") \
-
 
 namespace DB
 {
@@ -60,37 +34,71 @@ namespace DB
     };
     */
 
-/// NOLINTBEGIN(bugprone-macro-parentheses)
-#define FORWARD_DECLARATION(log_type, member, descr) \
-    class log_type; \
-
-LIST_OF_ALL_SYSTEM_LOGS(FORWARD_DECLARATION)
-#undef FORWARD_DECLARATION
-/// NOLINTEND(bugprone-macro-parentheses)
-
+class QueryLog;
+class QueryThreadLog;
+class PartLog;
+class TextLog;
+class TraceLog;
+class CrashLog;
+class ErrorLog;
+class MetricLog;
+class AsynchronousMetricLog;
+class OpenTelemetrySpanLog;
+class QueryViewsLog;
+class ZooKeeperLog;
+class SessionLog;
+class TransactionsInfoLog;
+class ProcessorsProfileLog;
+class FilesystemCacheLog;
+class FilesystemReadPrefetchesLog;
+class AsynchronousInsertLog;
+class BackupLog;
+class ObjectStorageQueueLog;
+class BlobStorageLog;
 
 /// System logs should be destroyed in destructor of the last Context and before tables,
 ///  because SystemLog destruction makes insert query while flushing data into underlying tables
-class SystemLogs
+struct SystemLogs
 {
-public:
-    SystemLogs() = default;
     SystemLogs(ContextPtr global_context, const Poco::Util::AbstractConfiguration & config);
-    SystemLogs(const SystemLogs & other) = default;
+    ~SystemLogs();
 
-    void flush(bool should_prepare_tables_anyway);
-    void flushAndShutdown();
     void shutdown();
     void handleCrash();
 
-#define DECLARE_PUBLIC_MEMBERS(log_type, member, descr) \
-    std::shared_ptr<log_type> member; \
+    std::shared_ptr<QueryLog> query_log;                /// Used to log queries.
+    std::shared_ptr<QueryThreadLog> query_thread_log;   /// Used to log query threads.
+    std::shared_ptr<PartLog> part_log;                  /// Used to log operations with parts
+    std::shared_ptr<TraceLog> trace_log;                /// Used to log traces from query profiler
+    std::shared_ptr<CrashLog> crash_log;                /// Used to log server crashes.
+    std::shared_ptr<TextLog> text_log;                  /// Used to log all text messages.
+    std::shared_ptr<MetricLog> metric_log;              /// Used to log all metrics.
+    std::shared_ptr<ErrorLog> error_log;                /// Used to log errors.
+    std::shared_ptr<FilesystemCacheLog> filesystem_cache_log;
+    std::shared_ptr<FilesystemReadPrefetchesLog> filesystem_read_prefetches_log;
+    std::shared_ptr<ObjectStorageQueueLog> s3_queue_log;
+    std::shared_ptr<ObjectStorageQueueLog> azure_queue_log;
+    /// Metrics from system.asynchronous_metrics.
+    std::shared_ptr<AsynchronousMetricLog> asynchronous_metric_log;
+    /// OpenTelemetry trace spans.
+    std::shared_ptr<OpenTelemetrySpanLog> opentelemetry_span_log;
+    /// Used to log queries of materialized and live views
+    std::shared_ptr<QueryViewsLog> query_views_log;
+    /// Used to log all actions of ZooKeeper client
+    std::shared_ptr<ZooKeeperLog> zookeeper_log;
+    /// Login, LogOut and Login failure events
+    std::shared_ptr<SessionLog> session_log;
+    /// Events related to transactions
+    std::shared_ptr<TransactionsInfoLog> transactions_info_log;
+    /// Used to log processors profiling
+    std::shared_ptr<ProcessorsProfileLog> processors_profile_log;
+    std::shared_ptr<AsynchronousInsertLog> asynchronous_insert_log;
+    /// Backup and restore events
+    std::shared_ptr<BackupLog> backup_log;
+    /// Log blob storage operations
+    std::shared_ptr<BlobStorageLog> blob_storage_log;
 
-    LIST_OF_ALL_SYSTEM_LOGS(DECLARE_PUBLIC_MEMBERS)
-#undef DECLARE_PUBLIC_MEMBERS
-
-private:
-    std::vector<ISystemLog *> getAllLogs() const;
+    std::vector<ISystemLog *> logs;
 };
 
 struct SystemLogSettings
@@ -125,6 +133,8 @@ public:
 
     void shutdown() override;
 
+    void stopFlushThread() override;
+
     /** Creates new table if it does not exist.
       * Renames old table if its structure is not suitable.
       * This cannot be done in constructor to avoid deadlock while renaming a table under locked Context when SystemLog object is created.
@@ -134,6 +144,9 @@ public:
 protected:
     LoggerPtr log;
 
+    using ISystemLog::is_shutdown;
+    using ISystemLog::saving_thread;
+    using ISystemLog::thread_mutex;
     using Base::queue;
 
     StoragePtr getStorage() const;
diff --git a/src/Interpreters/TableJoin.cpp b/src/Interpreters/TableJoin.cpp
index 59a0374051f..6191eb73fd4 100644
--- a/src/Interpreters/TableJoin.cpp
+++ b/src/Interpreters/TableJoin.cpp
@@ -115,10 +115,6 @@ TableJoin::TableJoin(const Settings & settings, VolumePtr tmp_volume_, Temporary
     , partial_merge_join_left_table_buffer_bytes(settings.partial_merge_join_left_table_buffer_bytes)
     , max_files_to_merge(settings.join_on_disk_max_files_to_merge)
     , temporary_files_codec(settings.temporary_files_codec)
-    , output_by_rowlist_perkey_rows_threshold(settings.join_output_by_rowlist_perkey_rows_threshold)
-    , sort_right_minimum_perkey_rows(settings.join_to_sort_minimum_perkey_rows)
-    , sort_right_maximum_table_rows(settings.join_to_sort_maximum_table_rows)
-    , allow_join_sorting(settings.allow_experimental_join_right_table_sorting)
     , max_memory_usage(settings.max_memory_usage)
     , tmp_volume(tmp_volume_)
     , tmp_data(tmp_data_)
@@ -466,19 +462,19 @@ static void makeColumnNameUnique(const ColumnsWithTypeAndName & source_columns,
     }
 }
 
-static std::optional<ActionsDAG> createWrapWithTupleActions(
+static ActionsDAGPtr createWrapWithTupleActions(
     const ColumnsWithTypeAndName & source_columns,
     std::unordered_set<std::string_view> && column_names_to_wrap,
     NameToNameMap & new_names)
 {
     if (column_names_to_wrap.empty())
-        return {};
+        return nullptr;
 
-    ActionsDAG actions_dag(source_columns);
+    auto actions_dag = std::make_shared<ActionsDAG>(source_columns);
 
     FunctionOverloadResolverPtr func_builder = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionTuple>());
 
-    for (const auto * input_node : actions_dag.getInputs())
+    for (const auto * input_node : actions_dag->getInputs())
     {
         const auto & column_name = input_node->result_name;
         auto it = column_names_to_wrap.find(column_name);
@@ -489,9 +485,9 @@ static std::optional<ActionsDAG> createWrapWithTupleActions(
         String node_name = "__wrapNullsafe(" + column_name + ")";
         makeColumnNameUnique(source_columns, node_name);
 
-        const auto & dst_node = actions_dag.addFunction(func_builder, {input_node}, node_name);
+        const auto & dst_node = actions_dag->addFunction(func_builder, {input_node}, node_name);
         new_names[column_name] = dst_node.result_name;
-        actions_dag.addOrReplaceInOutputs(dst_node);
+        actions_dag->addOrReplaceInOutputs(dst_node);
     }
 
     if (!column_names_to_wrap.empty())
@@ -541,23 +537,21 @@ std::pair<NameSet, NameSet> TableJoin::getKeysForNullSafeComparion(const Columns
     return {left_keys_to_wrap, right_keys_to_wrap};
 }
 
-static void mergeDags(std::optional<ActionsDAG> & result_dag, std::optional<ActionsDAG> && new_dag)
+static void mergeDags(ActionsDAGPtr & result_dag, ActionsDAGPtr && new_dag)
 {
-    if (!new_dag)
-        return;
     if (result_dag)
         result_dag->mergeInplace(std::move(*new_dag));
     else
         result_dag = std::move(new_dag);
 }
 
-std::pair<std::optional<ActionsDAG>, std::optional<ActionsDAG>>
+std::pair<ActionsDAGPtr, ActionsDAGPtr>
 TableJoin::createConvertingActions(
     const ColumnsWithTypeAndName & left_sample_columns,
     const ColumnsWithTypeAndName & right_sample_columns)
 {
-    std::optional<ActionsDAG> left_dag;
-    std::optional<ActionsDAG> right_dag;
+    ActionsDAGPtr left_dag = nullptr;
+    ActionsDAGPtr right_dag = nullptr;
     /** If the types are not equal, we need to convert them to a common type.
       * Example:
       *   SELECT * FROM t1 JOIN t2 ON t1.a = t2.b
@@ -622,7 +616,7 @@ TableJoin::createConvertingActions(
         mergeDags(right_dag, std::move(new_right_dag));
     }
 
-    return {std::move(left_dag), std::move(right_dag)};
+    return {left_dag, right_dag};
 }
 
 template <typename LeftNamesAndTypes, typename RightNamesAndTypes>
@@ -699,7 +693,7 @@ void TableJoin::inferJoinKeyCommonType(const LeftNamesAndTypes & left, const Rig
     }
 }
 
-static std::optional<ActionsDAG> changeKeyTypes(const ColumnsWithTypeAndName & cols_src,
+static ActionsDAGPtr changeKeyTypes(const ColumnsWithTypeAndName & cols_src,
                                     const TableJoin::NameToTypeMap & type_mapping,
                                     bool add_new_cols,
                                     NameToNameMap & key_column_rename)
@@ -716,7 +710,7 @@ static std::optional<ActionsDAG> changeKeyTypes(const ColumnsWithTypeAndName & c
         }
     }
     if (!has_some_to_do)
-        return {};
+        return nullptr;
 
     return ActionsDAG::makeConvertingActions(
         /* source= */ cols_src,
@@ -727,7 +721,7 @@ static std::optional<ActionsDAG> changeKeyTypes(const ColumnsWithTypeAndName & c
         /* new_names= */ &key_column_rename);
 }
 
-static std::optional<ActionsDAG> changeTypesToNullable(
+static ActionsDAGPtr changeTypesToNullable(
     const ColumnsWithTypeAndName & cols_src,
     const NameSet & exception_cols)
 {
@@ -743,7 +737,7 @@ static std::optional<ActionsDAG> changeTypesToNullable(
     }
 
     if (!has_some_to_do)
-        return {};
+        return nullptr;
 
     return ActionsDAG::makeConvertingActions(
         /* source= */ cols_src,
@@ -754,29 +748,29 @@ static std::optional<ActionsDAG> changeTypesToNullable(
         /* new_names= */ nullptr);
 }
 
-std::optional<ActionsDAG> TableJoin::applyKeyConvertToTable(
+ActionsDAGPtr TableJoin::applyKeyConvertToTable(
     const ColumnsWithTypeAndName & cols_src,
     const NameToTypeMap & type_mapping,
     JoinTableSide table_side,
     NameToNameMap & key_column_rename)
 {
     if (type_mapping.empty())
-        return {};
+        return nullptr;
 
     /// Create DAG to convert key columns
-    auto convert_dag = changeKeyTypes(cols_src, type_mapping, !hasUsing(), key_column_rename);
+    ActionsDAGPtr convert_dag = changeKeyTypes(cols_src, type_mapping, !hasUsing(), key_column_rename);
     applyRename(table_side, key_column_rename);
     return convert_dag;
 }
 
-std::optional<ActionsDAG> TableJoin::applyNullsafeWrapper(
+ActionsDAGPtr TableJoin::applyNullsafeWrapper(
     const ColumnsWithTypeAndName & cols_src,
     const NameSet & columns_for_nullsafe_comparison,
     JoinTableSide table_side,
     NameToNameMap & key_column_rename)
 {
     if (columns_for_nullsafe_comparison.empty())
-        return {};
+        return nullptr;
 
     std::unordered_set<std::string_view> column_names_to_wrap;
     for (const auto & name : columns_for_nullsafe_comparison)
@@ -790,7 +784,7 @@ std::optional<ActionsDAG> TableJoin::applyNullsafeWrapper(
     }
 
     /// Create DAG to wrap keys with tuple for null-safe comparison
-    auto null_safe_wrap_dag = createWrapWithTupleActions(cols_src, std::move(column_names_to_wrap), key_column_rename);
+    ActionsDAGPtr null_safe_wrap_dag = createWrapWithTupleActions(cols_src, std::move(column_names_to_wrap), key_column_rename);
     for (auto & clause : clauses)
     {
         for (size_t i : clause.nullsafe_compare_key_indexes)
@@ -805,7 +799,7 @@ std::optional<ActionsDAG> TableJoin::applyNullsafeWrapper(
     return null_safe_wrap_dag;
 }
 
-std::optional<ActionsDAG> TableJoin::applyJoinUseNullsConversion(
+ActionsDAGPtr TableJoin::applyJoinUseNullsConversion(
     const ColumnsWithTypeAndName & cols_src,
     const NameToNameMap & key_column_rename)
 {
@@ -815,7 +809,8 @@ std::optional<ActionsDAG> TableJoin::applyJoinUseNullsConversion(
         exclude_columns.insert(it.second);
 
     /// Create DAG to make columns nullable if needed
-    return changeTypesToNullable(cols_src, exclude_columns);
+    ActionsDAGPtr add_nullable_dag = changeTypesToNullable(cols_src, exclude_columns);
+    return add_nullable_dag;
 }
 
 void TableJoin::setStorageJoin(std::shared_ptr<const IKeyValueEntity> storage)
@@ -962,7 +957,7 @@ bool TableJoin::allowParallelHashJoin() const
     return true;
 }
 
-ActionsDAG TableJoin::createJoinedBlockActions(ContextPtr context) const
+ActionsDAGPtr TableJoin::createJoinedBlockActions(ContextPtr context) const
 {
     ASTPtr expression_list = rightKeysList();
     auto syntax_result = TreeRewriter(context).analyze(expression_list, columnsFromJoinedTable());
diff --git a/src/Interpreters/TableJoin.h b/src/Interpreters/TableJoin.h
index e1bae55a4ed..ed14fe4273c 100644
--- a/src/Interpreters/TableJoin.h
+++ b/src/Interpreters/TableJoin.h
@@ -148,10 +148,6 @@ private:
     const size_t partial_merge_join_left_table_buffer_bytes = 0;
     const size_t max_files_to_merge = 0;
     const String temporary_files_codec = "LZ4";
-    const size_t output_by_rowlist_perkey_rows_threshold = 0;
-    const size_t sort_right_minimum_perkey_rows = 0;
-    const size_t sort_right_maximum_table_rows = 0;
-    const bool allow_join_sorting = false;
 
     /// Value if setting max_memory_usage for query, can be used when max_bytes_in_join is not specified.
     size_t max_memory_usage = 0;
@@ -205,19 +201,19 @@ private:
     Names requiredJoinedNames() const;
 
     /// Create converting actions and change key column names if required
-    std::optional<ActionsDAG> applyKeyConvertToTable(
+    ActionsDAGPtr applyKeyConvertToTable(
         const ColumnsWithTypeAndName & cols_src,
         const NameToTypeMap & type_mapping,
         JoinTableSide table_side,
         NameToNameMap & key_column_rename);
 
-    std::optional<ActionsDAG> applyNullsafeWrapper(
+    ActionsDAGPtr applyNullsafeWrapper(
         const ColumnsWithTypeAndName & cols_src,
         const NameSet & columns_for_nullsafe_comparison,
         JoinTableSide table_side,
         NameToNameMap & key_column_rename);
 
-    std::optional<ActionsDAG> applyJoinUseNullsConversion(
+    ActionsDAGPtr applyJoinUseNullsConversion(
         const ColumnsWithTypeAndName & cols_src,
         const NameToNameMap & key_column_rename);
 
@@ -267,7 +263,7 @@ public:
 
     TemporaryDataOnDiskScopePtr getTempDataOnDisk() { return tmp_data; }
 
-    ActionsDAG createJoinedBlockActions(ContextPtr context) const;
+    ActionsDAGPtr createJoinedBlockActions(ContextPtr context) const;
 
     const std::vector<JoinAlgorithm> & getEnabledJoinAlgorithms() const { return join_algorithm; }
 
@@ -299,10 +295,6 @@ public:
         return join_use_nulls && isRightOrFull(kind());
     }
 
-    size_t outputByRowListPerkeyRowsThreshold() const { return output_by_rowlist_perkey_rows_threshold; }
-    size_t sortRightMinimumPerkeyRows() const { return sort_right_minimum_perkey_rows; }
-    size_t sortRightMaximumTableRows() const { return sort_right_maximum_table_rows; }
-    bool allowJoinSorting() const { return allow_join_sorting; }
     size_t defaultMaxBytes() const { return default_max_bytes; }
     size_t maxJoinedBlockRows() const { return max_joined_block_rows; }
     size_t maxRowsInRightBlock() const { return partial_merge_join_rows_in_right_blocks; }
@@ -386,7 +378,7 @@ public:
     /// Calculate converting actions, rename key columns in required
     /// For `USING` join we will convert key columns inplace and affect into types in the result table
     /// For `JOIN ON` we will create new columns with converted keys to join by.
-    std::pair<std::optional<ActionsDAG>, std::optional<ActionsDAG>>
+    std::pair<ActionsDAGPtr, ActionsDAGPtr>
     createConvertingActions(
         const ColumnsWithTypeAndName & left_sample_columns,
         const ColumnsWithTypeAndName & right_sample_columns);
diff --git a/src/Interpreters/TemporaryDataOnDisk.cpp b/src/Interpreters/TemporaryDataOnDisk.cpp
index 3259d7b67d6..7f0fb8cd6ca 100644
--- a/src/Interpreters/TemporaryDataOnDisk.cpp
+++ b/src/Interpreters/TemporaryDataOnDisk.cpp
@@ -65,7 +65,7 @@ TemporaryDataOnDisk::TemporaryDataOnDisk(TemporaryDataOnDiskScopePtr parent_, Cu
 
 std::unique_ptr<WriteBufferFromFileBase> TemporaryDataOnDisk::createRawStream(size_t max_file_size)
 {
-    if (file_cache && file_cache->isInitialized())
+    if (file_cache)
     {
         auto holder = createCacheFile(max_file_size);
         return std::make_unique<WriteBufferToFileSegment>(std::move(holder));
@@ -81,7 +81,7 @@ std::unique_ptr<WriteBufferFromFileBase> TemporaryDataOnDisk::createRawStream(si
 
 TemporaryFileStream & TemporaryDataOnDisk::createStream(const Block & header, size_t max_file_size)
 {
-    if (file_cache && file_cache->isInitialized())
+    if (file_cache)
     {
         auto holder = createCacheFile(max_file_size);
 
diff --git a/src/Interpreters/ThreadStatusExt.cpp b/src/Interpreters/ThreadStatusExt.cpp
index ca8f8d235fa..1f7c6b1fe68 100644
--- a/src/Interpreters/ThreadStatusExt.cpp
+++ b/src/Interpreters/ThreadStatusExt.cpp
@@ -473,11 +473,11 @@ void ThreadStatus::initGlobalProfiler([[maybe_unused]] UInt64 global_profiler_re
     {
         if (global_profiler_real_time_period > 0)
             query_profiler_real = std::make_unique<QueryProfilerReal>(thread_id,
-                /* period= */ global_profiler_real_time_period);
+                /* 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= */ global_profiler_cpu_time_period);
+                /* period= */ static_cast<UInt32>(global_profiler_cpu_time_period));
     }
     catch (...)
     {
@@ -506,18 +506,18 @@ void ThreadStatus::initQueryProfiler()
         {
             if (!query_profiler_real)
                 query_profiler_real = std::make_unique<QueryProfilerReal>(thread_id,
-                   /* period= */ settings.query_profiler_real_time_period_ns);
+                   /* period= */ static_cast<UInt32>(settings.query_profiler_real_time_period_ns));
             else
-                query_profiler_real->setPeriod(settings.query_profiler_real_time_period_ns);
+                query_profiler_real->setPeriod(static_cast<UInt32>(settings.query_profiler_real_time_period_ns));
         }
 
         if (settings.query_profiler_cpu_time_period_ns > 0)
         {
             if (!query_profiler_cpu)
                 query_profiler_cpu = std::make_unique<QueryProfilerCPU>(thread_id,
-                  /* period= */ settings.query_profiler_cpu_time_period_ns);
+                  /* period= */ static_cast<UInt32>(settings.query_profiler_cpu_time_period_ns));
             else
-                query_profiler_cpu->setPeriod(settings.query_profiler_cpu_time_period_ns);
+                query_profiler_cpu->setPeriod(static_cast<UInt32>(settings.query_profiler_cpu_time_period_ns));
         }
     }
     catch (...)
diff --git a/src/Interpreters/TreeOptimizer.cpp b/src/Interpreters/TreeOptimizer.cpp
index 6483dd3be48..b872eb94fde 100644
--- a/src/Interpreters/TreeOptimizer.cpp
+++ b/src/Interpreters/TreeOptimizer.cpp
@@ -184,7 +184,7 @@ void optimizeGroupBy(ASTSelectQuery * select_query, ContextPtr context)
                 const auto & value = group_exprs[i]->as<ASTLiteral>()->value;
                 if (value.getType() == Field::Types::UInt64)
                 {
-                    auto pos = value.safeGet<UInt64>();
+                    auto pos = value.get<UInt64>();
                     if (pos > 0 && pos <= select_query->select()->children.size())
                         keep_position = true;
                 }
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index f31522ae649..6ce6f5e454e 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -47,10 +47,10 @@
 #include <Parsers/queryToString.h>
 #include <Parsers/ASTCreateQuery.h>
 
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeObjectDeprecated.h>
 #include <DataTypes/NestedUtils.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeObject.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 
 #include <IO/WriteHelpers.h>
 #include <Storages/IStorage.h>
@@ -1158,8 +1158,7 @@ bool TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
             }
         }
 
-        has_virtual_shard_num
-            = is_remote_storage && storage->isVirtualColumn("_shard_num", storage_snapshot->metadata) && virtuals->has("_shard_num");
+        has_virtual_shard_num = is_remote_storage && storage->isVirtualColumn("_shard_num", storage_snapshot->getMetadataForQuery()) && virtuals->has("_shard_num");
     }
 
     /// Collect missed object subcolumns
@@ -1173,9 +1172,9 @@ bool TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
                 if (object_pos != std::string::npos)
                 {
                     String object_name = it->substr(0, object_pos);
-                    if (pair.name == object_name && pair.type->getTypeId() == TypeIndex::ObjectDeprecated)
+                    if (pair.name == object_name && pair.type->getTypeId() == TypeIndex::Object)
                     {
-                        const auto * object_type = typeid_cast<const DataTypeObjectDeprecated *>(pair.type.get());
+                        const auto * object_type = typeid_cast<const DataTypeObject *>(pair.type.get());
                         if (object_type->getSchemaFormat() == "json" && object_type->hasNullableSubcolumns())
                         {
                             missed_subcolumns.insert(*it);
diff --git a/src/Interpreters/WindowDescription.cpp b/src/Interpreters/WindowDescription.cpp
index b1e12ff8048..31a881001e3 100644
--- a/src/Interpreters/WindowDescription.cpp
+++ b/src/Interpreters/WindowDescription.cpp
@@ -94,8 +94,8 @@ void WindowFrame::checkValid() const
     if (begin_type == BoundaryType::Offset
         && !((begin_offset.getType() == Field::Types::UInt64
                 || begin_offset.getType() == Field::Types::Int64)
-            && begin_offset.safeGet<Int64>() >= 0
-            && begin_offset.safeGet<Int64>() < INT_MAX))
+            && begin_offset.get<Int64>() >= 0
+            && begin_offset.get<Int64>() < INT_MAX))
     {
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
             "Frame start offset for '{}' frame must be a nonnegative 32-bit integer, '{}' of type '{}' given",
@@ -107,8 +107,8 @@ void WindowFrame::checkValid() const
     if (end_type == BoundaryType::Offset
         && !((end_offset.getType() == Field::Types::UInt64
                 || end_offset.getType() == Field::Types::Int64)
-            && end_offset.safeGet<Int64>() >= 0
-            && end_offset.safeGet<Int64>() < INT_MAX))
+            && end_offset.get<Int64>() >= 0
+            && end_offset.get<Int64>() < INT_MAX))
     {
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
             "Frame end offset for '{}' frame must be a nonnegative 32-bit integer, '{}' of type '{}' given",
diff --git a/src/Interpreters/WindowDescription.h b/src/Interpreters/WindowDescription.h
index d51d9ca94d8..c26e4517c9a 100644
--- a/src/Interpreters/WindowDescription.h
+++ b/src/Interpreters/WindowDescription.h
@@ -14,6 +14,7 @@ namespace DB
 class ASTFunction;
 
 class ActionsDAG;
+using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
 
 struct WindowFunctionDescription
 {
@@ -92,8 +93,8 @@ struct WindowDescription
     // then by ORDER BY. This field holds this combined sort order.
     SortDescription full_sort_description;
 
-    std::vector<std::shared_ptr<const ActionsDAG>> partition_by_actions;
-    std::vector<std::shared_ptr<const ActionsDAG>> order_by_actions;
+    std::vector<ActionsDAGPtr> partition_by_actions;
+    std::vector<ActionsDAGPtr> order_by_actions;
 
     WindowFrame frame;
 
diff --git a/src/Interpreters/ZooKeeperLog.cpp b/src/Interpreters/ZooKeeperLog.cpp
index 769757a5fba..0d3063a569e 100644
--- a/src/Interpreters/ZooKeeperLog.cpp
+++ b/src/Interpreters/ZooKeeperLog.cpp
@@ -93,7 +93,6 @@ ColumnsDescription ZooKeeperLogElement::getColumnsDescription()
                 {"FilteredList",        static_cast<Int16>(Coordination::OpNum::FilteredList)},
                 {"CheckNotExists",      static_cast<Int16>(Coordination::OpNum::CheckNotExists)},
                 {"CreateIfNotExists",   static_cast<Int16>(Coordination::OpNum::CreateIfNotExists)},
-                {"RemoveRecursive",     static_cast<Int16>(Coordination::OpNum::RemoveRecursive)},
             });
 
     auto error_enum = getCoordinationErrorCodesEnumType();
diff --git a/src/Interpreters/addMissingDefaults.cpp b/src/Interpreters/addMissingDefaults.cpp
index 27d79e86622..fbf17d7efb7 100644
--- a/src/Interpreters/addMissingDefaults.cpp
+++ b/src/Interpreters/addMissingDefaults.cpp
@@ -14,15 +14,15 @@
 namespace DB
 {
 
-ActionsDAG addMissingDefaults(
+ActionsDAGPtr addMissingDefaults(
     const Block & header,
     const NamesAndTypesList & required_columns,
     const ColumnsDescription & columns,
     ContextPtr context,
     bool null_as_default)
 {
-    ActionsDAG actions(header.getColumnsWithTypeAndName());
-    auto & index = actions.getOutputs();
+    auto actions = std::make_shared<ActionsDAG>(header.getColumnsWithTypeAndName());
+    auto & index = actions->getOutputs();
 
     /// For missing columns of nested structure, you need to create not a column of empty arrays, but a column of arrays of correct lengths.
     /// First, remember the offset columns for all arrays in the block.
@@ -40,7 +40,7 @@ ActionsDAG addMissingDefaults(
             if (group.empty())
                 group.push_back(nullptr);
 
-            group.push_back(actions.getInputs()[i]);
+            group.push_back(actions->getInputs()[i]);
         }
     }
 
@@ -62,11 +62,11 @@ ActionsDAG addMissingDefaults(
         {
             const auto & nested_type = array_type->getNestedType();
             ColumnPtr nested_column = nested_type->createColumnConstWithDefaultValue(0);
-            const auto & constant = actions.addColumn({nested_column, nested_type, column.name});
+            const auto & constant = actions->addColumn({nested_column, nested_type, column.name});
 
             auto & group = nested_groups[offsets_name];
             group[0] = &constant;
-            index.push_back(&actions.addFunction(func_builder_replicate, group, constant.result_name));
+            index.push_back(&actions->addFunction(func_builder_replicate, group, constant.result_name));
 
             continue;
         }
@@ -75,17 +75,17 @@ ActionsDAG addMissingDefaults(
         *  it can be full (or the interpreter may decide that it is constant everywhere).
         */
         auto new_column = column.type->createColumnConstWithDefaultValue(0);
-        const auto * col = &actions.addColumn({new_column, column.type, column.name});
-        index.push_back(&actions.materializeNode(*col));
+        const auto * col = &actions->addColumn({new_column, column.type, column.name});
+        index.push_back(&actions->materializeNode(*col));
     }
 
     /// Computes explicitly specified values by default and materialized columns.
-    if (auto dag = evaluateMissingDefaults(actions.getResultColumns(), required_columns, columns, context, true, null_as_default))
-        actions = ActionsDAG::merge(std::move(actions), std::move(*dag));
+    if (auto dag = evaluateMissingDefaults(actions->getResultColumns(), required_columns, columns, context, true, null_as_default))
+        actions = ActionsDAG::merge(std::move(*actions), std::move(*dag));
 
     /// Removes unused columns and reorders result.
-    actions.removeUnusedActions(required_columns.getNames(), false);
-    actions.addMaterializingOutputActions();
+    actions->removeUnusedActions(required_columns.getNames(), false);
+    actions->addMaterializingOutputActions();
 
     return actions;
 }
diff --git a/src/Interpreters/addMissingDefaults.h b/src/Interpreters/addMissingDefaults.h
index 551583a0006..0a3d4de478c 100644
--- a/src/Interpreters/addMissingDefaults.h
+++ b/src/Interpreters/addMissingDefaults.h
@@ -2,6 +2,11 @@
 
 #include <Interpreters/Context_fwd.h>
 
+#include <memory>
+#include <string>
+#include <unordered_map>
+
+
 namespace DB
 {
 
@@ -10,6 +15,7 @@ class NamesAndTypesList;
 class ColumnsDescription;
 
 class ActionsDAG;
+using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
 
 /** Adds three types of columns into block
   * 1. Columns, that are missed inside request, but present in table without defaults (missed columns)
@@ -18,7 +24,7 @@ class ActionsDAG;
   * Also can substitute NULL with DEFAULT value in case of INSERT SELECT query (null_as_default) if according setting is 1.
   * All three types of columns are materialized (not constants).
   */
-ActionsDAG addMissingDefaults(
+ActionsDAGPtr addMissingDefaults(
     const Block & header, const NamesAndTypesList & required_columns,
     const ColumnsDescription & columns, ContextPtr context, bool null_as_default = false);
 }
diff --git a/src/Interpreters/castColumn.cpp b/src/Interpreters/castColumn.cpp
index a779c9bc34d..906dfb84b14 100644
--- a/src/Interpreters/castColumn.cpp
+++ b/src/Interpreters/castColumn.cpp
@@ -26,9 +26,11 @@ static ColumnPtr castColumn(CastType cast_type, const ColumnWithTypeAndName & ar
             ""
         }
     };
-    auto get_cast_func = [from = arg, to = type, cast_type]
+    auto get_cast_func = [cast_type, &arguments]
     {
-        return createInternalCast(from, to, cast_type, {});
+
+        FunctionOverloadResolverPtr func_builder_cast = createInternalCastOverloadResolver(cast_type, {});
+        return func_builder_cast->build(arguments);
     };
 
     FunctionBasePtr func_cast = cache ? cache->getOrSet(cast_type, from_name, to_name, std::move(get_cast_func)) : get_cast_func();
diff --git a/src/Interpreters/convertFieldToType.cpp b/src/Interpreters/convertFieldToType.cpp
index 737353095b8..d87d4a73e37 100644
--- a/src/Interpreters/convertFieldToType.cpp
+++ b/src/Interpreters/convertFieldToType.cpp
@@ -57,7 +57,7 @@ template <typename From, typename To>
 Field convertNumericTypeImpl(const Field & from)
 {
     To result;
-    if (!accurate::convertNumeric(from.safeGet<From>(), result))
+    if (!accurate::convertNumeric(from.get<From>(), result))
         return {};
     return result;
 }
@@ -88,7 +88,7 @@ Field convertNumericType(const Field & from, const IDataType & type)
 template <typename From, typename T>
 Field convertIntToDecimalType(const Field & from, const DataTypeDecimal<T> & type)
 {
-    From value = from.safeGet<From>();
+    From value = from.get<From>();
     if (!type.canStoreWhole(value))
         throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Number is too big to place in {}", type.getName());
 
@@ -100,7 +100,7 @@ Field convertIntToDecimalType(const Field & from, const DataTypeDecimal<T> & typ
 template <typename T>
 Field convertStringToDecimalType(const Field & from, const DataTypeDecimal<T> & type)
 {
-    const String & str_value = from.safeGet<String>();
+    const String & str_value = from.get<String>();
     T value = type.parseFromString(str_value);
     return DecimalField<T>(value, type.getScale());
 }
@@ -108,7 +108,7 @@ Field convertStringToDecimalType(const Field & from, const DataTypeDecimal<T> &
 template <typename From, typename T>
 Field convertDecimalToDecimalType(const Field & from, const DataTypeDecimal<T> & type)
 {
-    auto field = from.safeGet<DecimalField<From>>();
+    auto field = from.get<DecimalField<From>>();
     T value = convertDecimals<DataTypeDecimal<From>, DataTypeDecimal<T>>(field.getValue(), field.getScale(), type.getScale());
     return DecimalField<T>(value, type.getScale());
 }
@@ -116,7 +116,7 @@ Field convertDecimalToDecimalType(const Field & from, const DataTypeDecimal<T> &
 template <typename From, typename T>
 Field convertFloatToDecimalType(const Field & from, const DataTypeDecimal<T> & type)
 {
-    From value = from.safeGet<From>();
+    From value = from.get<From>();
     if (!type.canStoreWhole(value))
         throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Number is too big to place in {}", type.getName());
 
@@ -164,7 +164,7 @@ Field convertDecimalType(const Field & from, const To & type)
 }
 
 
-Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const IDataType * from_type_hint, const FormatSettings & format_settings)
+Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const IDataType * from_type_hint)
 {
     if (from_type_hint && from_type_hint->equals(type))
     {
@@ -182,24 +182,24 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
     /// Conversion between Date and DateTime and vice versa.
     if (which_type.isDate() && which_from_type.isDateTime())
     {
-        return static_cast<UInt16>(static_cast<const DataTypeDateTime &>(*from_type_hint).getTimeZone().toDayNum(src.safeGet<UInt64>()).toUnderType());
+        return static_cast<UInt16>(static_cast<const DataTypeDateTime &>(*from_type_hint).getTimeZone().toDayNum(src.get<UInt64>()).toUnderType());
     }
     else if (which_type.isDate32() && which_from_type.isDateTime())
     {
-        return static_cast<Int32>(static_cast<const DataTypeDateTime &>(*from_type_hint).getTimeZone().toDayNum(src.safeGet<UInt64>()).toUnderType());
+        return static_cast<Int32>(static_cast<const DataTypeDateTime &>(*from_type_hint).getTimeZone().toDayNum(src.get<UInt64>()).toUnderType());
     }
     else if (which_type.isDateTime() && which_from_type.isDate())
     {
-        return static_cast<const DataTypeDateTime &>(type).getTimeZone().fromDayNum(DayNum(src.safeGet<UInt64>()));
+        return static_cast<const DataTypeDateTime &>(type).getTimeZone().fromDayNum(DayNum(src.get<UInt64>()));
     }
     else if (which_type.isDateTime() && which_from_type.isDate32())
     {
-        return static_cast<const DataTypeDateTime &>(type).getTimeZone().fromDayNum(DayNum(src.safeGet<Int32>()));
+        return static_cast<const DataTypeDateTime &>(type).getTimeZone().fromDayNum(DayNum(src.get<Int32>()));
     }
     else if (which_type.isDateTime64() && which_from_type.isDate())
     {
         const auto & date_time64_type = static_cast<const DataTypeDateTime64 &>(type);
-        const auto value = date_time64_type.getTimeZone().fromDayNum(DayNum(src.safeGet<UInt16>()));
+        const auto value = date_time64_type.getTimeZone().fromDayNum(DayNum(src.get<UInt16>()));
         return DecimalField(
             DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(value, 0, date_time64_type.getScaleMultiplier()),
             date_time64_type.getScale());
@@ -207,7 +207,7 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
     else if (which_type.isDateTime64() && which_from_type.isDate32())
     {
         const auto & date_time64_type = static_cast<const DataTypeDateTime64 &>(type);
-        const auto value = date_time64_type.getTimeZone().fromDayNum(ExtendedDayNum(static_cast<Int32>(src.safeGet<Int32>())));
+        const auto value = date_time64_type.getTimeZone().fromDayNum(ExtendedDayNum(static_cast<Int32>(src.get<Int32>())));
         return DecimalField(
             DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(value, 0, date_time64_type.getScaleMultiplier()),
             date_time64_type.getScale());
@@ -257,7 +257,7 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
 
         if (which_type.isDateTime64() && src.getType() == Field::Types::Decimal64)
         {
-            const auto & from_type = src.safeGet<Decimal64>();
+            const auto & from_type = src.get<Decimal64>();
             const auto & to_type = static_cast<const DataTypeDateTime64 &>(type);
 
             const auto scale_from = from_type.getScale();
@@ -304,8 +304,8 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
         }
         if (which_type.isIPv4() && src.getType() == Field::Types::UInt64)
         {
-            /// convert through UInt32 which is the underlying type for native IPv4
-            return static_cast<IPv4>(convertNumericType<UInt32>(src, type).safeGet<UInt32>());
+            /// convert to UInt32 which is the underlying type for native IPv4
+            return convertNumericType<UInt32>(src, type);
         }
     }
     else if (which_type.isUUID() && src.getType() == Field::Types::UUID)
@@ -322,7 +322,7 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
         if (which_from_type.isFixedString() && assert_cast<const DataTypeFixedString *>(from_type_hint)->getN() == IPV6_BINARY_LENGTH)
         {
             const auto col = type.createColumn();
-            ReadBufferFromString in_buffer(src.safeGet<String>());
+            ReadBufferFromString in_buffer(src.get<String>());
             type.getDefaultSerialization()->deserializeBinary(*col, in_buffer, {});
             return (*col)[0];
         }
@@ -334,7 +334,7 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
             if (which_type.isFixedString())
             {
                 size_t n = assert_cast<const DataTypeFixedString &>(type).getN();
-                const auto & src_str = src.safeGet<String>();
+                const auto & src_str = src.get<String>();
                 if (src_str.size() < n)
                 {
                     String src_str_extended = src_str;
@@ -351,7 +351,7 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
     {
         if (src.getType() == Field::Types::Array)
         {
-            const Array & src_arr = src.safeGet<Array>();
+            const Array & src_arr = src.get<Array>();
             size_t src_arr_size = src_arr.size();
 
             const auto & element_type = *(type_array->getNestedType());
@@ -359,8 +359,8 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
             Array res(src_arr_size);
             for (size_t i = 0; i < src_arr_size; ++i)
             {
-                res[i] = convertFieldToType(src_arr[i], element_type, nullptr, format_settings);
-                if (res[i].isNull() && !canContainNull(element_type))
+                res[i] = convertFieldToType(src_arr[i], element_type);
+                if (res[i].isNull() && !element_type.isNullable())
                 {
                     // See the comment for Tuples below.
                     have_unconvertible_element = true;
@@ -374,7 +374,7 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
     {
         if (src.getType() == Field::Types::Tuple)
         {
-            const auto & src_tuple = src.safeGet<Tuple>();
+            const auto & src_tuple = src.get<Tuple>();
             size_t src_tuple_size = src_tuple.size();
             size_t dst_tuple_size = type_tuple->getElements().size();
 
@@ -387,26 +387,26 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
             for (size_t i = 0; i < dst_tuple_size; ++i)
             {
                 const auto & element_type = *(type_tuple->getElements()[i]);
-                res[i] = convertFieldToType(src_tuple[i], element_type, nullptr, format_settings);
-                if (res[i].isNull() && !canContainNull(element_type))
-                {
-                    /*
-                     * Either the source element was Null, or the conversion did not
-                     * succeed, because the source and the requested types of the
-                     * element are compatible, but the value is not convertible
-                     * (e.g. trying to convert -1 from Int8 to UInt8). In these
-                     * cases, consider the whole tuple also compatible but not
-                     * convertible. According to the specification of this function,
-                     * we must return Null in this case.
-                     *
-                     * The following elements might be not even compatible, so it
-                     * makes sense to check them to detect user errors. Remember
-                     * that there is an unconvertible element, and try to process
-                     * the remaining ones. The convertFieldToType for each element
-                     * will throw if it detects incompatibility.
-                     */
-                    have_unconvertible_element = true;
-                }
+                res[i] = convertFieldToType(src_tuple[i], element_type);
+                if (!res[i].isNull() || element_type.isNullable())
+                    continue;
+
+                /*
+                 * Either the source element was Null, or the conversion did not
+                 * succeed, because the source and the requested types of the
+                 * element are compatible, but the value is not convertible
+                 * (e.g. trying to convert -1 from Int8 to UInt8). In these
+                 * cases, consider the whole tuple also compatible but not
+                 * convertible. According to the specification of this function,
+                 * we must return Null in this case.
+                 *
+                 * The following elements might be not even compatible, so it
+                 * makes sense to check them to detect user errors. Remember
+                 * that there is an unconvertible element, and try to process
+                 * the remaining ones. The convertFieldToType for each element
+                 * will throw if it detects incompatibility.
+                 */
+                have_unconvertible_element = true;
             }
 
             return have_unconvertible_element ? Field(Null()) : Field(res);
@@ -419,7 +419,7 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
             const auto & key_type = *type_map->getKeyType();
             const auto & value_type = *type_map->getValueType();
 
-            const auto & map = src.safeGet<Map>();
+            const auto & map = src.get<Map>();
             size_t map_size = map.size();
 
             Map res(map_size);
@@ -428,20 +428,20 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
 
             for (size_t i = 0; i < map_size; ++i)
             {
-                const auto & map_entry = map[i].safeGet<Tuple>();
+                const auto & map_entry = map[i].get<Tuple>();
 
                 const auto & key = map_entry[0];
                 const auto & value = map_entry[1];
 
                 Tuple updated_entry(2);
 
-                updated_entry[0] = convertFieldToType(key, key_type, nullptr, format_settings);
+                updated_entry[0] = convertFieldToType(key, key_type);
 
-                if (updated_entry[0].isNull() && !canContainNull(key_type))
+                if (updated_entry[0].isNull() && !key_type.isNullable())
                     have_unconvertible_element = true;
 
-                updated_entry[1] = convertFieldToType(value, value_type, nullptr, format_settings);
-                if (updated_entry[1].isNull() && !canContainNull(value_type))
+                updated_entry[1] = convertFieldToType(value, value_type);
+                if (updated_entry[1].isNull() && !value_type.isNullable())
                     have_unconvertible_element = true;
 
                 res[i] = updated_entry;
@@ -457,13 +457,13 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
                 "Cannot convert {} to {}",
                 src.getTypeName(), agg_func_type->getName());
 
-        const auto & name = src.safeGet<AggregateFunctionStateData>().name;
+        const auto & name = src.get<AggregateFunctionStateData>().name;
         if (agg_func_type->getName() != name)
             throw Exception(ErrorCodes::TYPE_MISMATCH, "Cannot convert {} to {}", name, agg_func_type->getName());
 
         return src;
     }
-    else if (isObjectDeprecated(type))
+    else if (isObject(type))
     {
         if (src.getType() == Field::Types::Object)
             return src;  /// Already in needed type.
@@ -472,7 +472,7 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
         if (src.getType() == Field::Types::Tuple && from_type_tuple && from_type_tuple->haveExplicitNames())
         {
             const auto & names = from_type_tuple->getElementNames();
-            const auto & tuple = src.safeGet<const Tuple &>();
+            const auto & tuple = src.get<const Tuple &>();
 
             if (names.size() != tuple.size())
                 throw Exception(ErrorCodes::TYPE_MISMATCH,
@@ -489,10 +489,10 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
         if (src.getType() == Field::Types::Map)
         {
             Object object;
-            const auto & map = src.safeGet<const Map &>();
+            const auto & map = src.get<const Map &>();
             for (const auto & element : map)
             {
-                const auto & map_entry = element.safeGet<Tuple>();
+                const auto & map_entry = element.get<Tuple>();
                 const auto & key = map_entry[0];
                 const auto & value = map_entry[1];
 
@@ -500,7 +500,7 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
                     throw Exception(ErrorCodes::TYPE_MISMATCH,
                         "Cannot convert from Map with key of type {} to Object", key.getTypeName());
 
-                object[key.safeGet<const String &>()] = value;
+                object[key.get<const String &>()] = value;
             }
 
             return object;
@@ -523,13 +523,6 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
         /// We can insert any field to Dynamic column.
         return src;
     }
-    else if (isObject(type))
-    {
-        if (src.getType() == Field::Types::Object)
-            return src;  /// Already in needed type.
-
-        /// TODO: add conversion from Map/Tuple to Object.
-    }
 
     /// Conversion from string by parsing.
     if (src.getType() == Field::Types::String)
@@ -548,22 +541,22 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
         }
 
         const auto col = type_to_parse->createColumn();
-        ReadBufferFromString in_buffer(src.safeGet<String>());
+        ReadBufferFromString in_buffer(src.get<String>());
         try
         {
-            type_to_parse->getDefaultSerialization()->deserializeWholeText(*col, in_buffer, format_settings);
+            type_to_parse->getDefaultSerialization()->deserializeWholeText(*col, in_buffer, FormatSettings{});
         }
         catch (Exception & e)
         {
             if (e.code() == ErrorCodes::UNEXPECTED_DATA_AFTER_PARSED_VALUE)
-                throw Exception(ErrorCodes::TYPE_MISMATCH, "Cannot convert string '{}' to type {}", src.safeGet<String>(), type.getName());
+                throw Exception(ErrorCodes::TYPE_MISMATCH, "Cannot convert string {} to type {}", src.get<String>(), type.getName());
 
-            e.addMessage(fmt::format("while converting '{}' to {}", src.safeGet<String>(), type.getName()));
+            e.addMessage(fmt::format("while converting '{}' to {}", src.get<String>(), type.getName()));
             throw;
         }
 
         Field parsed = (*col)[0];
-        return convertFieldToType(parsed, type, from_type_hint, format_settings);
+        return convertFieldToType(parsed, type, from_type_hint);
     }
 
     throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch in IN or VALUES section. Expected: {}. Got: {}",
@@ -573,7 +566,7 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
 }
 
 
-Field convertFieldToType(const Field & from_value, const IDataType & to_type, const IDataType * from_type_hint, const FormatSettings & format_settings)
+Field convertFieldToType(const Field & from_value, const IDataType & to_type, const IDataType * from_type_hint)
 {
     if (from_value.isNull())
         return from_value;
@@ -582,7 +575,7 @@ Field convertFieldToType(const Field & from_value, const IDataType & to_type, co
         return from_value;
 
     if (const auto * low_cardinality_type = typeid_cast<const DataTypeLowCardinality *>(&to_type))
-        return convertFieldToType(from_value, *low_cardinality_type->getDictionaryType(), from_type_hint, format_settings);
+        return convertFieldToType(from_value, *low_cardinality_type->getDictionaryType(), from_type_hint);
     else if (const auto * nullable_type = typeid_cast<const DataTypeNullable *>(&to_type))
     {
         const IDataType & nested_type = *nullable_type->getNestedType();
@@ -593,20 +586,20 @@ Field convertFieldToType(const Field & from_value, const IDataType & to_type, co
 
         if (from_type_hint && from_type_hint->equals(nested_type))
             return from_value;
-        return convertFieldToTypeImpl(from_value, nested_type, from_type_hint, format_settings);
+        return convertFieldToTypeImpl(from_value, nested_type, from_type_hint);
     }
     else
-        return convertFieldToTypeImpl(from_value, to_type, from_type_hint, format_settings);
+        return convertFieldToTypeImpl(from_value, to_type, from_type_hint);
 }
 
 
-Field convertFieldToTypeOrThrow(const Field & from_value, const IDataType & to_type, const IDataType * from_type_hint, const FormatSettings & format_settings)
+Field convertFieldToTypeOrThrow(const Field & from_value, const IDataType & to_type, const IDataType * from_type_hint)
 {
     bool is_null = from_value.isNull();
-    if (is_null && !canContainNull(to_type))
+    if (is_null && !to_type.isNullable() && !to_type.isLowCardinalityNullable())
         throw Exception(ErrorCodes::TYPE_MISMATCH, "Cannot convert NULL to {}", to_type.getName());
 
-    Field converted = convertFieldToType(from_value, to_type, from_type_hint, format_settings);
+    Field converted = convertFieldToType(from_value, to_type, from_type_hint);
 
     if (!is_null && converted.isNull())
         throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND,
@@ -621,14 +614,14 @@ Field convertFieldToTypeOrThrow(const Field & from_value, const IDataType & to_t
 template <typename T>
 static bool decimalEqualsFloat(Field field, Float64 float_value)
 {
-    auto decimal_field = field.safeGet<DecimalField<T>>();
+    auto decimal_field = field.get<DecimalField<T>>();
     auto decimal_to_float = DecimalUtils::convertTo<Float64>(decimal_field.getValue(), decimal_field.getScale());
     return decimal_to_float == float_value;
 }
 
-std::optional<Field> convertFieldToTypeStrict(const Field & from_value, const IDataType & from_type, const IDataType & to_type, const FormatSettings & format_settings)
+std::optional<Field> convertFieldToTypeStrict(const Field & from_value, const IDataType & from_type, const IDataType & to_type)
 {
-    Field result_value = convertFieldToType(from_value, to_type, &from_type, format_settings);
+    Field result_value = convertFieldToType(from_value, to_type, &from_type);
 
     if (Field::isDecimal(from_value.getType()) && Field::isDecimal(result_value.getType()))
     {
@@ -640,13 +633,13 @@ std::optional<Field> convertFieldToTypeStrict(const Field & from_value, const ID
     {
         /// Convert back to Float64 and compare
         if (result_value.getType() == Field::Types::Decimal32)
-            return decimalEqualsFloat<Decimal32>(result_value, from_value.safeGet<Float64>()) ? result_value : std::optional<Field>{};
+            return decimalEqualsFloat<Decimal32>(result_value, from_value.get<Float64>()) ? result_value : std::optional<Field>{};
         if (result_value.getType() == Field::Types::Decimal64)
-            return decimalEqualsFloat<Decimal64>(result_value, from_value.safeGet<Float64>()) ? result_value : std::optional<Field>{};
+            return decimalEqualsFloat<Decimal64>(result_value, from_value.get<Float64>()) ? result_value : std::optional<Field>{};
         if (result_value.getType() == Field::Types::Decimal128)
-            return decimalEqualsFloat<Decimal128>(result_value, from_value.safeGet<Float64>()) ? result_value : std::optional<Field>{};
+            return decimalEqualsFloat<Decimal128>(result_value, from_value.get<Float64>()) ? result_value : std::optional<Field>{};
         if (result_value.getType() == Field::Types::Decimal256)
-            return decimalEqualsFloat<Decimal256>(result_value, from_value.safeGet<Float64>()) ? result_value : std::optional<Field>{};
+            return decimalEqualsFloat<Decimal256>(result_value, from_value.get<Float64>()) ? result_value : std::optional<Field>{};
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown decimal type {}", result_value.getTypeName());
     }
 
diff --git a/src/Interpreters/convertFieldToType.h b/src/Interpreters/convertFieldToType.h
index c3c6271a157..4aa09f8619e 100644
--- a/src/Interpreters/convertFieldToType.h
+++ b/src/Interpreters/convertFieldToType.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Core/Field.h>
-#include <Formats/FormatSettings.h>
 
 
 namespace DB
@@ -16,13 +15,13 @@ class IDataType;
   * Checks for the compatibility of types, checks values fall in the range of valid values of the type, makes type conversion.
   * If the value does not fall into the range - returns Null.
   */
-Field convertFieldToType(const Field & from_value, const IDataType & to_type, const IDataType * from_type_hint = nullptr, const FormatSettings & format_settings = {});
+Field convertFieldToType(const Field & from_value, const IDataType & to_type, const IDataType * from_type_hint = nullptr);
 
 /// Does the same, but throws ARGUMENT_OUT_OF_BOUND if value does not fall into the range.
-Field convertFieldToTypeOrThrow(const Field & from_value, const IDataType & to_type, const IDataType * from_type_hint = nullptr, const FormatSettings & format_settings = {});
+Field convertFieldToTypeOrThrow(const Field & from_value, const IDataType & to_type, const IDataType * from_type_hint = nullptr);
 
 /// Applies stricter rules than convertFieldToType, doesn't allow loss of precision converting to Decimal.
 /// Returns `Field` if the conversion was successful and the result is equal to the original value, otherwise returns nullopt.
-std::optional<Field> convertFieldToTypeStrict(const Field & from_value, const IDataType & from_type, const IDataType & to_type, const FormatSettings & format_settings = {});
+std::optional<Field> convertFieldToTypeStrict(const Field & from_value, const IDataType & from_type, const IDataType & to_type);
 
 }
diff --git a/src/Interpreters/evaluateConstantExpression.cpp b/src/Interpreters/evaluateConstantExpression.cpp
index d4bb0cc2f8a..ac80ad2fb68 100644
--- a/src/Interpreters/evaluateConstantExpression.cpp
+++ b/src/Interpreters/evaluateConstantExpression.cpp
@@ -91,7 +91,7 @@ std::optional<EvaluateConstantExpressionResult> evaluateConstantExpressionImpl(c
     ColumnPtr result_column;
     DataTypePtr result_type;
     String result_name = ast->getColumnName();
-    for (const auto & action_node : actions.getOutputs())
+    for (const auto & action_node : actions->getOutputs())
     {
         if ((action_node->result_name == result_name) && action_node->column)
         {
@@ -297,7 +297,7 @@ namespace
             {
                 if (tuple_literal->value.getType() == Field::Types::Tuple)
                 {
-                    const auto & tuple = tuple_literal->value.safeGet<const Tuple &>();
+                    const auto & tuple = tuple_literal->value.get<const Tuple &>();
                     for (const auto & child : tuple)
                     {
                         const auto dnf = analyzeEquals(identifier, child, expr);
@@ -679,9 +679,9 @@ std::optional<ConstantVariants> evaluateExpressionOverConstantCondition(
     size_t max_elements)
 {
     auto inverted_dag = KeyCondition::cloneASTWithInversionPushDown({predicate}, context);
-    auto matches = matchTrees(expr, inverted_dag, false);
+    auto matches = matchTrees(expr, *inverted_dag, false);
 
-    auto predicates = analyze(inverted_dag.getOutputs().at(0), matches, context, max_elements);
+    auto predicates = analyze(inverted_dag->getOutputs().at(0), matches, context, max_elements);
 
     if (!predicates)
         return {};
@@ -792,7 +792,7 @@ std::optional<Blocks> evaluateExpressionOverConstantCondition(const ASTPtr & nod
     else if (const auto * literal = node->as<ASTLiteral>())
     {
         // Check if it's always true or false.
-        if (literal->value.getType() == Field::Types::UInt64 && literal->value.safeGet<UInt64>() == 0)
+        if (literal->value.getType() == Field::Types::UInt64 && literal->value.get<UInt64>() == 0)
             return {result};
         else
             return {};
diff --git a/src/Interpreters/examples/CMakeLists.txt b/src/Interpreters/examples/CMakeLists.txt
index 4b1ec970b26..8bb7f9eeb98 100644
--- a/src/Interpreters/examples/CMakeLists.txt
+++ b/src/Interpreters/examples/CMakeLists.txt
@@ -2,34 +2,34 @@ clickhouse_add_executable (hash_map hash_map.cpp)
 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 clickhouse_common_io clickhouse_common_config clickhouse_compression)
+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 clickhouse_common_io clickhouse_common_config clickhouse_compression 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 clickhouse_common_io clickhouse_common_config clickhouse_compression 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 clickhouse_common_io clickhouse_common_config clickhouse_compression)
+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 clickhouse_common_io clickhouse_common_config clickhouse_compression 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 clickhouse_common_io clickhouse_common_config clickhouse_compression 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 clickhouse_common_io clickhouse_common_config clickhouse_compression 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 clickhouse_common_io clickhouse_common_config clickhouse_compression)
+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 clickhouse_common_io clickhouse_common_config clickhouse_compression)
+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 clickhouse_common_io clickhouse_common_config clickhouse_compression 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/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index be9423852c1..d9d3ba58160 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -90,7 +90,6 @@ namespace ProfileEvents
     extern const Event SelectQueryTimeMicroseconds;
     extern const Event InsertQueryTimeMicroseconds;
     extern const Event OtherQueryTimeMicroseconds;
-    extern const Event RealTimeMicroseconds;
 }
 
 namespace DB
@@ -399,14 +398,9 @@ void logQueryFinish(
         /// Update performance counters before logging to query_log
         CurrentThread::finalizePerformanceCounters();
 
-        std::shared_ptr<ProfileEvents::Counters::Snapshot> profile_counters;
-        QueryStatusInfo info = process_list_elem->getInfo(true, true);
-        if (context->getSettingsRef().log_profile_events)
-            profile_counters = info.profile_counters;
-        else
-            profile_counters.swap(info.profile_counters);
-
+        QueryStatusInfo info = process_list_elem->getInfo(true, context->getSettingsRef().log_profile_events);
         elem.type = QueryLogElementType::QUERY_FINISH;
+
         addStatusInfoToQueryLogElement(elem, info, query_ast, context);
 
         if (pulling_pipeline)
@@ -425,7 +419,6 @@ void logQueryFinish(
         {
             Progress p;
             p.incrementPiecewiseAtomically(Progress{ResultProgress{elem.result_rows, elem.result_bytes}});
-            p.incrementRealTimeMicroseconds((*profile_counters)[ProfileEvents::RealTimeMicroseconds]);
             progress_callback(p);
         }
 
@@ -478,8 +471,6 @@ void logQueryFinish(
                     processor_elem.parent_ids = std::move(parents);
 
                     processor_elem.plan_step = reinterpret_cast<std::uintptr_t>(processor->getQueryPlanStep());
-                    processor_elem.plan_step_name = processor->getPlanStepName();
-                    processor_elem.plan_step_description = processor->getPlanStepDescription();
                     processor_elem.plan_group = processor->getQueryPlanStepGroup();
 
                     processor_elem.processor_name = processor->getName();
@@ -699,12 +690,6 @@ void validateAnalyzerSettings(ASTPtr ast, bool context_value)
                 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);
             }
-
-            if (auto * value = set_query->changes.tryGet("enable_analyzer"))
-            {
-                if (top_level != value->safeGet<bool>())
-                    throw Exception(ErrorCodes::INCORRECT_QUERY, "Setting 'enable_analyzer' is changed in the subquery. Top level value: {}", top_level);
-            }
         }
 
         for (auto child : node->children)
@@ -795,7 +780,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             /// 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, false, false, IdentifierQuotingStyle::Backticks);
+            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;
@@ -811,16 +796,17 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             catch (const Exception & e)
             {
                 if (e.code() == ErrorCodes::SYNTAX_ERROR)
+                    /// Don't print the original query text because it may contain sensitive data.
                     throw Exception(ErrorCodes::LOGICAL_ERROR,
-                        "Inconsistent AST formatting: the query:\n{}\ncannot parse query back from {}",
-                        formatted1, std::string_view(begin, end-begin));
+                        "Inconsistent AST formatting: the query:\n{}\ncannot parse.",
+                        formatted1);
                 else
                     throw;
             }
 
             chassert(ast2);
 
-            String formatted2 = ast2->formatWithPossiblyHidingSensitiveData(0, true, true, false, false, IdentifierQuotingStyle::Backticks);
+            String formatted2 = ast2->formatWithPossiblyHidingSensitiveData(0, true, true);
 
             if (formatted1 != formatted2)
                 throw Exception(ErrorCodes::LOGICAL_ERROR,
@@ -1062,14 +1048,14 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             /// 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 deterministic so each time we retry mini-INSERTs the resulting
+            /// 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 in dependent materialized view cannot work together with async inserts. "\
-                        "Please disable either `deduplicate_blocks_in_dependent_materialized_views` or `async_insert` setting.");
+                        "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)
@@ -1118,19 +1104,6 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             && settings.use_query_cache
             && !internal
             && client_info.query_kind == ClientInfo::QueryKind::INITIAL_QUERY
-            /// Bug 67476: Avoid that the query cache stores truncated results if the query ran with a non-THROW overflow mode and hit a limit.
-            /// This is more workaround than a fix ... unfortunately it is hard to detect from the perspective of the query cache that the
-            /// query result is truncated.
-            && (settings.read_overflow_mode == OverflowMode::THROW
-                && settings.read_overflow_mode_leaf == OverflowMode::THROW
-                && settings.group_by_overflow_mode == OverflowMode::THROW
-                && settings.sort_overflow_mode == OverflowMode::THROW
-                && settings.result_overflow_mode == OverflowMode::THROW
-                && settings.timeout_overflow_mode == OverflowMode::THROW
-                && settings.set_overflow_mode == OverflowMode::THROW
-                && settings.join_overflow_mode == OverflowMode::THROW
-                && settings.transfer_overflow_mode == OverflowMode::THROW
-                && settings.distinct_overflow_mode == OverflowMode::THROW)
             && (ast->as<ASTSelectQuery>() || ast->as<ASTSelectWithUnionQuery>());
         QueryCache::Usage query_cache_usage = QueryCache::Usage::None;
 
diff --git a/src/Interpreters/formatWithPossiblyHidingSecrets.h b/src/Interpreters/formatWithPossiblyHidingSecrets.h
index 61f689fb821..039bcbc2bca 100644
--- a/src/Interpreters/formatWithPossiblyHidingSecrets.h
+++ b/src/Interpreters/formatWithPossiblyHidingSecrets.h
@@ -1,14 +1,11 @@
 #pragma once
-
-#include <Access/ContextAccess.h>
-#include <Interpreters/Context.h>
-
+#include "Access/ContextAccess.h"
+#include "Interpreters/Context.h"
 
 #include <Core/Settings.h>
 
 namespace DB
 {
-
 struct SecretHidingFormatSettings
 {
     // We can't store const Context& as there's a dangerous usage {.ctx = *getContext()}
@@ -25,13 +22,6 @@ inline String format(const SecretHidingFormatSettings & settings)
         && settings.ctx->getSettingsRef().format_display_secrets_in_show_and_select
         && settings.ctx->getAccess()->isGranted(AccessType::displaySecretsInShowAndSelect);
 
-    return settings.query.formatWithPossiblyHidingSensitiveData(
-        settings.max_length,
-        settings.one_line,
-        show_secrets,
-        settings.ctx->getSettingsRef().print_pretty_type_names,
-        settings.ctx->getSettingsRef().output_format_always_quote_identifiers,
-        settings.ctx->getSettingsRef().output_format_identifier_quoting_style);
+    return settings.query.formatWithPossiblyHidingSensitiveData(settings.max_length, settings.one_line, show_secrets);
 }
-
 }
diff --git a/src/Interpreters/fuzzers/execute_query_fuzzer.cpp b/src/Interpreters/fuzzers/execute_query_fuzzer.cpp
index c29efae1e7d..a02ce66e6b5 100644
--- a/src/Interpreters/fuzzers/execute_query_fuzzer.cpp
+++ b/src/Interpreters/fuzzers/execute_query_fuzzer.cpp
@@ -14,37 +14,41 @@
 
 using namespace DB;
 
-
-ContextMutablePtr context;
-
-extern "C" int LLVMFuzzerInitialize(int *, char ***)
-{
-    if (context)
-        return true;
-
-    SharedContextHolder shared_context = Context::createShared();
-    context = Context::createGlobal(shared_context.get());
-    context->makeGlobalContext();
-
-    registerInterpreters();
-    registerFunctions();
-    registerAggregateFunctions();
-    registerTableFunctions();
-    registerDatabases();
-    registerStorages();
-    registerDictionaries();
-    registerDisks(/* global_skip_access_check= */ true);
-    registerFormats();
-
-    return 0;
-}
-
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 {
     try
     {
         std::string input = std::string(reinterpret_cast<const char*>(data), size);
 
+        static SharedContextHolder shared_context;
+        static ContextMutablePtr context;
+
+        auto initialize = [&]() mutable
+        {
+            if (context)
+                return true;
+
+            shared_context = Context::createShared();
+            context = Context::createGlobal(shared_context.get());
+            context->makeGlobalContext();
+            context->setApplicationType(Context::ApplicationType::LOCAL);
+
+            registerInterpreters();
+            registerFunctions();
+            registerAggregateFunctions();
+            registerTableFunctions();
+            registerDatabases();
+            registerStorages();
+            registerDictionaries();
+            registerDisks(/* global_skip_access_check= */ true);
+            registerFormats();
+
+            return true;
+        };
+
+        static bool initialized = initialize();
+        (void) initialized;
+
         auto io = DB::executeQuery(input, context, QueryFlags{ .internal = true }, QueryProcessingStage::Complete).second;
 
         PullingPipelineExecutor executor(io.pipeline);
diff --git a/src/Interpreters/inplaceBlockConversions.cpp b/src/Interpreters/inplaceBlockConversions.cpp
index 68254768a7d..e48e41295f6 100644
--- a/src/Interpreters/inplaceBlockConversions.cpp
+++ b/src/Interpreters/inplaceBlockConversions.cpp
@@ -158,20 +158,22 @@ ASTPtr convertRequiredExpressions(Block & block, const NamesAndTypesList & requi
     return conversion_expr_list;
 }
 
-std::optional<ActionsDAG> createExpressions(
+ActionsDAGPtr createExpressions(
     const Block & header,
     ASTPtr expr_list,
     bool save_unneeded_columns,
     ContextPtr context)
 {
     if (!expr_list)
-        return {};
+        return nullptr;
 
     auto syntax_result = TreeRewriter(context).analyze(expr_list, header.getNamesAndTypesList());
     auto expression_analyzer = ExpressionAnalyzer{expr_list, syntax_result, context};
-    ActionsDAG dag(header.getNamesAndTypesList());
+    auto dag = std::make_shared<ActionsDAG>(header.getNamesAndTypesList());
     auto actions = expression_analyzer.getActionsDAG(true, !save_unneeded_columns);
-    return ActionsDAG::merge(std::move(dag), std::move(actions));
+    dag = ActionsDAG::merge(std::move(*dag), std::move(*actions));
+
+    return dag;
 }
 
 }
@@ -184,7 +186,7 @@ void performRequiredConversions(Block & block, const NamesAndTypesList & require
 
     if (auto dag = createExpressions(block, conversion_expr_list, true, context))
     {
-        auto expression = std::make_shared<ExpressionActions>(std::move(*dag), ExpressionActionsSettings::fromContext(context));
+        auto expression = std::make_shared<ExpressionActions>(std::move(dag), ExpressionActionsSettings::fromContext(context));
         expression->execute(block);
     }
 }
@@ -199,7 +201,7 @@ bool needConvertAnyNullToDefault(const Block & header, const NamesAndTypesList &
     return false;
 }
 
-std::optional<ActionsDAG> evaluateMissingDefaults(
+ActionsDAGPtr evaluateMissingDefaults(
     const Block & header,
     const NamesAndTypesList & required_columns,
     const ColumnsDescription & columns,
@@ -208,7 +210,7 @@ std::optional<ActionsDAG> evaluateMissingDefaults(
     bool null_as_default)
 {
     if (!columns.hasDefaults() && (!null_as_default || !needConvertAnyNullToDefault(header, required_columns, columns)))
-        return {};
+        return nullptr;
 
     ASTPtr expr_list = defaultRequiredExpressions(header, required_columns, columns, null_as_default);
     return createExpressions(header, expr_list, save_unneeded_columns, context);
diff --git a/src/Interpreters/inplaceBlockConversions.h b/src/Interpreters/inplaceBlockConversions.h
index 570eb75dd4a..bea44bf6db9 100644
--- a/src/Interpreters/inplaceBlockConversions.h
+++ b/src/Interpreters/inplaceBlockConversions.h
@@ -5,6 +5,9 @@
 #include <Common/COW.h>
 
 #include <memory>
+#include <string>
+#include <unordered_map>
+
 
 namespace DB
 {
@@ -21,11 +24,12 @@ struct StorageInMemoryMetadata;
 using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
 
 class ActionsDAG;
+using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
 
 /// Create actions which adds missing defaults to block according to required_columns using columns description
 /// or substitute NULL into DEFAULT value in case of INSERT SELECT query (null_as_default) if according setting is 1.
 /// Return nullptr if no actions required.
-std::optional<ActionsDAG> evaluateMissingDefaults(
+ActionsDAGPtr evaluateMissingDefaults(
     const Block & header,
     const NamesAndTypesList & required_columns,
     const ColumnsDescription & columns,
diff --git a/src/Interpreters/interpretSubquery.cpp b/src/Interpreters/interpretSubquery.cpp
index 909875b99a0..340f6d1d805 100644
--- a/src/Interpreters/interpretSubquery.cpp
+++ b/src/Interpreters/interpretSubquery.cpp
@@ -62,7 +62,7 @@ std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
       *  which are checked separately (in the Set, Join objects).
       */
     auto subquery_context = Context::createCopy(context);
-    Settings subquery_settings = context->getSettingsCopy();
+    Settings subquery_settings = context->getSettings();
     subquery_settings.max_result_rows = 0;
     subquery_settings.max_result_bytes = 0;
     /// The calculation of `extremes` does not make sense and is not necessary (if you do it, then the `extremes` of the subquery can be taken instead of the whole query).
diff --git a/src/Interpreters/joinDispatch.h b/src/Interpreters/joinDispatch.h
index 4aabc49c29b..54c5c7dc83a 100644
--- a/src/Interpreters/joinDispatch.h
+++ b/src/Interpreters/joinDispatch.h
@@ -12,53 +12,38 @@
 namespace DB
 {
 
-/// HashJoin::MapsOne is more efficient, it only store one row for each key in the map. It is recommended to use it whenever possible.
-/// When only need to match only one row from right table, use HashJoin::MapsOne. For example, LEFT ANY/SEMI/ANTI.
-///
-/// HashJoin::MapsAll will store all rows for each key in the map. It is used when need to match multiple rows from right table.
-/// For example, LEFT ALL, INNER ALL, RIGHT ALL/ANY.
-///
-/// prefer_use_maps_all is true when there is mixed inequal condition in the join condition. For example, `t1.a = t2.a AND t1.b > t2.b`.
-/// In this case, we need to use HashJoin::MapsAll to store all rows for each key in the map. We will select all matched rows from the map
-/// and filter them by `t1.b > t2.b`.
-///
-/// flagged indicates whether we need to store flags for each row whether it has been used in the join. See JoinUsedFlags.h.
-template <JoinKind kind, JoinStrictness join_strictness, bool prefer_use_maps_all>
+template <JoinKind kind, JoinStrictness join_strictness>
 struct MapGetter;
 
-template <bool prefer_use_maps_all> struct MapGetter<JoinKind::Left, JoinStrictness::RightAny, prefer_use_maps_all>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
-template <bool prefer_use_maps_all> struct MapGetter<JoinKind::Inner, JoinStrictness::RightAny, prefer_use_maps_all> { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
-template <bool prefer_use_maps_all> struct MapGetter<JoinKind::Right, JoinStrictness::RightAny, prefer_use_maps_all> { using Map = HashJoin::MapsOne; static constexpr bool flagged = true; };
-template <bool prefer_use_maps_all> struct MapGetter<JoinKind::Full, JoinStrictness::RightAny, prefer_use_maps_all>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Left, JoinStrictness::RightAny>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Inner, JoinStrictness::RightAny> { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Right, JoinStrictness::RightAny> { using Map = HashJoin::MapsOne; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Full, JoinStrictness::RightAny>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = true; };
 
-template <> struct MapGetter<JoinKind::Left, JoinStrictness::Any, false>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
-template <> struct MapGetter<JoinKind::Left, JoinStrictness::Any, true>  { using Map = HashJoin::MapsAll; static constexpr bool flagged = false; };
-template <> struct MapGetter<JoinKind::Inner, JoinStrictness::Any, true> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
-template <> struct MapGetter<JoinKind::Inner, JoinStrictness::Any, false> { using Map = HashJoin::MapsOne; static constexpr bool flagged = true; };
-template <bool prefer_use_maps_all> struct MapGetter<JoinKind::Right, JoinStrictness::Any, prefer_use_maps_all> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
-template <bool prefer_use_maps_all> struct MapGetter<JoinKind::Full, JoinStrictness::Any, prefer_use_maps_all>  { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Left, JoinStrictness::Any>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Inner, JoinStrictness::Any> { using Map = HashJoin::MapsOne; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Right, JoinStrictness::Any> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Full, JoinStrictness::Any>  { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
 
-template <bool prefer_use_maps_all> struct MapGetter<JoinKind::Left, JoinStrictness::All, prefer_use_maps_all>  { using Map = HashJoin::MapsAll; static constexpr bool flagged = false; };
-template <bool prefer_use_maps_all> struct MapGetter<JoinKind::Inner, JoinStrictness::All, prefer_use_maps_all> { using Map = HashJoin::MapsAll; static constexpr bool flagged = false; };
-template <bool prefer_use_maps_all> struct MapGetter<JoinKind::Right, JoinStrictness::All, prefer_use_maps_all> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
-template <bool prefer_use_maps_all> struct MapGetter<JoinKind::Full, JoinStrictness::All, prefer_use_maps_all>  { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Left, JoinStrictness::All>  { using Map = HashJoin::MapsAll; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Inner, JoinStrictness::All> { using Map = HashJoin::MapsAll; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Right, JoinStrictness::All> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Full, JoinStrictness::All>  { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
 
 /// Only SEMI LEFT and SEMI RIGHT are valid. INNER and FULL are here for templates instantiation.
-template <> struct MapGetter<JoinKind::Left, JoinStrictness::Semi, false>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
-template <> struct MapGetter<JoinKind::Left, JoinStrictness::Semi, true>  { using Map = HashJoin::MapsAll; static constexpr bool flagged = false; };
-template <bool prefer_use_maps_all> struct MapGetter<JoinKind::Inner, JoinStrictness::Semi, prefer_use_maps_all> { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
-template <bool prefer_use_maps_all> struct MapGetter<JoinKind::Right, JoinStrictness::Semi, prefer_use_maps_all> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
-template <bool prefer_use_maps_all> struct MapGetter<JoinKind::Full, JoinStrictness::Semi, prefer_use_maps_all>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Left, JoinStrictness::Semi>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Inner, JoinStrictness::Semi> { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Right, JoinStrictness::Semi> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Full, JoinStrictness::Semi>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
 
-/// Only ANTI LEFT and ANTI RIGHT are valid. INNER and FULL are here for templates instantiation.
-template <> struct MapGetter<JoinKind::Left, JoinStrictness::Anti, false>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
-template <> struct MapGetter<JoinKind::Left, JoinStrictness::Anti, true>  { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
-template <bool prefer_use_maps_all> struct MapGetter<JoinKind::Inner, JoinStrictness::Anti, prefer_use_maps_all> { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
-template <bool prefer_use_maps_all> struct MapGetter<JoinKind::Right, JoinStrictness::Anti, prefer_use_maps_all> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
-template <bool prefer_use_maps_all> struct MapGetter<JoinKind::Full, JoinStrictness::Anti, prefer_use_maps_all>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+/// Only SEMI LEFT and SEMI RIGHT are valid. INNER and FULL are here for templates instantiation.
+template <> struct MapGetter<JoinKind::Left, JoinStrictness::Anti>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Inner, JoinStrictness::Anti> { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Right, JoinStrictness::Anti> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Full, JoinStrictness::Anti>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
 
-template <JoinKind kind, bool prefer_use_maps_all>
-struct MapGetter<kind, JoinStrictness::Asof, prefer_use_maps_all> { using Map = HashJoin::MapsAsof; static constexpr bool flagged = false; };
+template <JoinKind kind>
+struct MapGetter<kind, JoinStrictness::Asof> { using Map = HashJoin::MapsAsof; static constexpr bool flagged = false; };
 
 static constexpr std::array<JoinStrictness, 6> STRICTNESSES = {
     JoinStrictness::RightAny,
@@ -77,7 +62,7 @@ static constexpr std::array<JoinKind, 4> KINDS = {
 };
 
 /// Init specified join map
-inline bool joinDispatchInit(JoinKind kind, JoinStrictness strictness, HashJoin::MapsVariant & maps, bool prefer_use_maps_all = false)
+inline bool joinDispatchInit(JoinKind kind, JoinStrictness strictness, HashJoin::MapsVariant & maps)
 {
     return static_for<0, KINDS.size() * STRICTNESSES.size()>([&](auto ij)
     {
@@ -85,10 +70,7 @@ inline bool joinDispatchInit(JoinKind kind, JoinStrictness strictness, HashJoin:
         constexpr auto j = ij % STRICTNESSES.size();
         if (kind == KINDS[i] && strictness == STRICTNESSES[j])
         {
-            if (prefer_use_maps_all)
-                maps = typename MapGetter<KINDS[i], STRICTNESSES[j], true>::Map();
-            else
-                maps = typename MapGetter<KINDS[i], STRICTNESSES[j], false>::Map();
+            maps = typename MapGetter<KINDS[i], STRICTNESSES[j]>::Map();
             return true;
         }
         return false;
@@ -97,7 +79,7 @@ inline bool joinDispatchInit(JoinKind kind, JoinStrictness strictness, HashJoin:
 
 /// Call function on specified join map
 template <typename MapsVariant, typename Func>
-inline bool joinDispatch(JoinKind kind, JoinStrictness strictness, MapsVariant & maps, bool prefer_use_maps_all, Func && func)
+inline bool joinDispatch(JoinKind kind, JoinStrictness strictness, MapsVariant & maps, Func && func)
 {
     return static_for<0, KINDS.size() * STRICTNESSES.size()>([&](auto ij)
     {
@@ -107,16 +89,10 @@ inline bool joinDispatch(JoinKind kind, JoinStrictness strictness, MapsVariant &
         constexpr auto j = ij % STRICTNESSES.size();
         if (kind == KINDS[i] && strictness == STRICTNESSES[j])
         {
-            if (prefer_use_maps_all)
-                func(
-                    std::integral_constant<JoinKind, KINDS[i]>(),
-                    std::integral_constant<JoinStrictness, STRICTNESSES[j]>(),
-                    std::get<typename MapGetter<KINDS[i], STRICTNESSES[j], true>::Map>(maps));
-            else
-                func(
-                    std::integral_constant<JoinKind, KINDS[i]>(),
-                    std::integral_constant<JoinStrictness, STRICTNESSES[j]>(),
-                    std::get<typename MapGetter<KINDS[i], STRICTNESSES[j], false>::Map>(maps));
+            func(
+                std::integral_constant<JoinKind, KINDS[i]>(),
+                std::integral_constant<JoinStrictness, STRICTNESSES[j]>(),
+                std::get<typename MapGetter<KINDS[i], STRICTNESSES[j]>::Map>(maps));
             return true;
         }
         return false;
@@ -125,7 +101,7 @@ inline bool joinDispatch(JoinKind kind, JoinStrictness strictness, MapsVariant &
 
 /// Call function on specified join map
 template <typename MapsVariant, typename Func>
-inline bool joinDispatch(JoinKind kind, JoinStrictness strictness, std::vector<const MapsVariant *> & mapsv, bool prefer_use_maps_all, Func && func)
+inline bool joinDispatch(JoinKind kind, JoinStrictness strictness, std::vector<const MapsVariant *> & mapsv, Func && func)
 {
     return static_for<0, KINDS.size() * STRICTNESSES.size()>([&](auto ij)
     {
@@ -135,31 +111,17 @@ inline bool joinDispatch(JoinKind kind, JoinStrictness strictness, std::vector<c
         constexpr auto j = ij % STRICTNESSES.size();
         if (kind == KINDS[i] && strictness == STRICTNESSES[j])
         {
-            if (prefer_use_maps_all)
-            {
-                using MapType = typename MapGetter<KINDS[i], STRICTNESSES[j], true>::Map;
-                std::vector<const MapType *> v;
-                v.reserve(mapsv.size());
-                for (const auto & el : mapsv)
-                    v.push_back(&std::get<MapType>(*el));
+            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]>(), std::integral_constant<JoinStrictness, STRICTNESSES[j]>(), v
-                    /*std::get<typename MapGetter<KINDS[i], STRICTNESSES[j]>::Map>(maps)*/);
-            }
-            else
-            {
-                using MapType = typename MapGetter<KINDS[i], STRICTNESSES[j], false>::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]>(), std::integral_constant<JoinStrictness, STRICTNESSES[j]>(), v
-                    /*std::get<typename MapGetter<KINDS[i], STRICTNESSES[j]>::Map>(maps)*/);
-
-            }
+            func(
+                std::integral_constant<JoinKind, KINDS[i]>(),
+                std::integral_constant<JoinStrictness, STRICTNESSES[j]>(),
+                v
+                /*std::get<typename MapGetter<KINDS[i], STRICTNESSES[j]>::Map>(maps)*/);
             return true;
         }
         return false;
diff --git a/src/Interpreters/parseColumnsListForTableFunction.cpp b/src/Interpreters/parseColumnsListForTableFunction.cpp
index 0c6d18dca70..b9fdaabede1 100644
--- a/src/Interpreters/parseColumnsListForTableFunction.cpp
+++ b/src/Interpreters/parseColumnsListForTableFunction.cpp
@@ -3,7 +3,6 @@
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeVariant.h>
-#include <DataTypes/DataTypeObject.h>
 #include <DataTypes/getLeastSupertype.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterCreateQuery.h>
@@ -31,7 +30,6 @@ DataTypeValidationSettings::DataTypeValidationSettings(const DB::Settings& setti
         , allow_suspicious_variant_types(settings.allow_suspicious_variant_types)
         , validate_nested_types(settings.validate_experimental_and_suspicious_types_inside_nested_types)
         , allow_experimental_dynamic_type(settings.allow_experimental_dynamic_type)
-        , allow_experimental_json_type(settings.allow_experimental_json_type)
 {
 }
 
@@ -125,7 +123,7 @@ void validateDataType(const DataTypePtr & type_to_check, const DataTypeValidatio
 
         if (!settings.allow_experimental_dynamic_type)
         {
-            if (isDynamic(data_type))
+            if (data_type.hasDynamicSubcolumns())
             {
                 throw Exception(
                     ErrorCodes::ILLEGAL_COLUMN,
@@ -134,19 +132,6 @@ void validateDataType(const DataTypePtr & type_to_check, const DataTypeValidatio
                     data_type.getName());
             }
         }
-
-        if (!settings.allow_experimental_json_type)
-        {
-            const auto * object_type = typeid_cast<const DataTypeObject *>(&data_type);
-            if (object_type && object_type->getSchemaFormat() == DataTypeObject::SchemaFormat::JSON)
-            {
-                throw Exception(
-                    ErrorCodes::ILLEGAL_COLUMN,
-                    "Cannot create column with type '{}' because experimental JSON type is not allowed. "
-                    "Set setting allow_experimental_json_type = 1 in order to allow it",
-                    data_type.getName());
-            }
-        }
     };
 
     validate_callback(*type_to_check);
diff --git a/src/Interpreters/parseColumnsListForTableFunction.h b/src/Interpreters/parseColumnsListForTableFunction.h
index 6e00492c0ad..6f15c585e4f 100644
--- a/src/Interpreters/parseColumnsListForTableFunction.h
+++ b/src/Interpreters/parseColumnsListForTableFunction.h
@@ -23,7 +23,6 @@ struct DataTypeValidationSettings
     bool allow_suspicious_variant_types = true;
     bool validate_nested_types = true;
     bool allow_experimental_dynamic_type = true;
-    bool allow_experimental_json_type = true;
 };
 
 void validateDataType(const DataTypePtr & type, const DataTypeValidationSettings & settings);
diff --git a/src/Interpreters/replaceForPositionalArguments.cpp b/src/Interpreters/replaceForPositionalArguments.cpp
index ee967f45c74..3d60723a167 100644
--- a/src/Interpreters/replaceForPositionalArguments.cpp
+++ b/src/Interpreters/replaceForPositionalArguments.cpp
@@ -35,11 +35,11 @@ bool replaceForPositionalArguments(ASTPtr & argument, const ASTSelectQuery * sel
 
     if (which == Field::Types::UInt64)
     {
-        pos = ast_literal->value.safeGet<UInt64>();
+        pos = ast_literal->value.get<UInt64>();
     }
     else if (which == Field::Types::Int64)
     {
-        auto value = ast_literal->value.safeGet<Int64>();
+        auto value = ast_literal->value.get<Int64>();
         if (value > 0)
             pos = value;
         else
diff --git a/src/Interpreters/tests/gtest_comparison_graph.cpp b/src/Interpreters/tests/gtest_comparison_graph.cpp
index 5f93bb983c1..ac24a8de368 100644
--- a/src/Interpreters/tests/gtest_comparison_graph.cpp
+++ b/src/Interpreters/tests/gtest_comparison_graph.cpp
@@ -29,7 +29,7 @@ TEST(ComparisonGraph, Bounds)
 
         const auto & [lower, strict] = *res;
 
-        ASSERT_EQ(lower.safeGet<UInt64>(), 3);
+        ASSERT_EQ(lower.get<UInt64>(), 3);
         ASSERT_TRUE(strict);
     }
 
@@ -39,7 +39,7 @@ TEST(ComparisonGraph, Bounds)
 
         const auto & [upper, strict] = *res;
 
-        ASSERT_EQ(upper.safeGet<UInt64>(), 7);
+        ASSERT_EQ(upper.get<UInt64>(), 7);
         ASSERT_TRUE(strict);
     }
 
diff --git a/src/Interpreters/tests/gtest_convertFieldToType.cpp b/src/Interpreters/tests/gtest_convertFieldToType.cpp
index 0cac9a3b59d..c8a9d5aa2c0 100644
--- a/src/Interpreters/tests/gtest_convertFieldToType.cpp
+++ b/src/Interpreters/tests/gtest_convertFieldToType.cpp
@@ -147,7 +147,7 @@ INSTANTIATE_TEST_SUITE_P(
             DecimalField(DateTime64(123 * Day * 1'000'000), 6)
         }
     })
-);
+    );
 
 INSTANTIATE_TEST_SUITE_P(
     DateTimeToDateTime64,
@@ -179,84 +179,3 @@ INSTANTIATE_TEST_SUITE_P(
         },
     })
 );
-
-INSTANTIATE_TEST_SUITE_P(
-    StringToNumber,
-    ConvertFieldToTypeTest,
-    ::testing::ValuesIn(std::initializer_list<ConvertFieldToTypeTestParams>{
-        {
-            "String",
-            Field("1"),
-            "Int8",
-            Field(1)
-        },
-        {
-            "String",
-            Field("256"),
-            "Int8",
-            Field()
-        },
-        {
-            "String",
-            Field("not a number"),
-            "Int8",
-            {}
-        },
-        {
-            "String",
-            Field("1.1"),
-            "Int8",
-            {} /// we can not convert '1.1' to Int8
-        },
-        {
-            "String",
-            Field("1.1"),
-            "Float64",
-            Field(1.1)
-        },
-    })
-);
-
-INSTANTIATE_TEST_SUITE_P(
-    NumberToString,
-    ConvertFieldToTypeTest,
-    ::testing::ValuesIn(std::initializer_list<ConvertFieldToTypeTestParams>{
-        {
-            "Int8",
-            Field(1),
-            "String",
-            Field("1")
-        },
-        {
-            "Int8",
-            Field(-1),
-            "String",
-            Field("-1")
-        },
-        {
-            "Float64",
-            Field(1.1),
-            "String",
-            Field("1.1")
-        },
-    })
-);
-
-INSTANTIATE_TEST_SUITE_P(
-    StringToDate,
-    ConvertFieldToTypeTest,
-    ::testing::ValuesIn(std::initializer_list<ConvertFieldToTypeTestParams>{
-        {
-            "String",
-            Field("2024-07-12"),
-            "Date",
-            Field(static_cast<UInt16>(19916))
-        },
-        {
-            "String",
-            Field("not a date"),
-            "Date",
-            {}
-        },
-    })
-);
diff --git a/src/Interpreters/tests/gtest_filecache.cpp b/src/Interpreters/tests/gtest_filecache.cpp
index bb3df734b2a..36acc319f4e 100644
--- a/src/Interpreters/tests/gtest_filecache.cpp
+++ b/src/Interpreters/tests/gtest_filecache.cpp
@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <numeric>
 #include <thread>
-#include <chrono>
 
 #include <Core/ServerUUID.h>
 #include <Common/iota.h>
@@ -43,7 +42,6 @@
 #include <Interpreters/DatabaseCatalog.h>
 #include <base/scope_guard.h>
 
-using namespace std::chrono_literals;
 namespace fs = std::filesystem;
 using namespace DB;
 
@@ -248,8 +246,7 @@ void download(FileSegment & file_segment)
     ASSERT_EQ(file_segment.state(), State::DOWNLOADING);
     ASSERT_EQ(file_segment.getDownloadedSize(), 0);
 
-    std::string failure_reason;
-    ASSERT_TRUE(file_segment.reserve(file_segment.range().size(), 1000, failure_reason));
+    ASSERT_TRUE(file_segment.reserve(file_segment.range().size(), 1000));
     download(cache_base_path, file_segment);
     ASSERT_EQ(file_segment.state(), State::DOWNLOADING);
 
@@ -261,8 +258,7 @@ void assertDownloadFails(FileSegment & file_segment)
 {
     ASSERT_EQ(file_segment.getOrSetDownloader(), FileSegment::getCallerId());
     ASSERT_EQ(file_segment.getDownloadedSize(), 0);
-    std::string failure_reason;
-    ASSERT_FALSE(file_segment.reserve(file_segment.range().size(), 1000, failure_reason));
+    ASSERT_FALSE(file_segment.reserve(file_segment.range().size(), 1000));
     file_segment.complete();
 }
 
@@ -362,11 +358,9 @@ TEST_F(FileCacheTest, LRUPolicy)
     settings.max_size = 30;
     settings.max_elements = 5;
     settings.boundary_alignment = 1;
-    settings.load_metadata_asynchronously = false;
 
     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";
@@ -821,7 +815,6 @@ TEST_F(FileCacheTest, writeBuffer)
     settings.max_elements = 5;
     settings.max_file_segment_size = 5;
     settings.base_path = cache_base_path;
-    settings.load_metadata_asynchronously = false;
 
     FileCache cache("6", settings);
     cache.initialize();
@@ -953,7 +946,6 @@ TEST_F(FileCacheTest, temporaryData)
     settings.max_size = 10_KiB;
     settings.max_file_segment_size = 1_KiB;
     settings.base_path = cache_base_path;
-    settings.load_metadata_asynchronously = false;
 
     DB::FileCache file_cache("7", settings);
     file_cache.initialize();
@@ -965,11 +957,10 @@ TEST_F(FileCacheTest, temporaryData)
 
     {
         ASSERT_EQ(some_data_holder->size(), 5);
-        std::string failure_reason;
         for (auto & segment : *some_data_holder)
         {
             ASSERT_TRUE(segment->getOrSetDownloader() == DB::FileSegment::getCallerId());
-            ASSERT_TRUE(segment->reserve(segment->range().size(), 1000, failure_reason));
+            ASSERT_TRUE(segment->reserve(segment->range().size(), 1000));
             download(*segment);
             segment->complete();
         }
@@ -1082,7 +1073,6 @@ TEST_F(FileCacheTest, CachedReadBuffer)
     settings.max_size = 30;
     settings.max_elements = 10;
     settings.boundary_alignment = 1;
-    settings.load_metadata_asynchronously = false;
 
     ReadSettings read_settings;
     read_settings.enable_filesystem_cache = true;
@@ -1102,7 +1092,6 @@ 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();
 
@@ -1143,7 +1132,6 @@ TEST_F(FileCacheTest, TemporaryDataReadBufferSize)
         settings.max_size = 10_KiB;
         settings.max_file_segment_size = 1_KiB;
         settings.base_path = cache_base_path;
-        settings.load_metadata_asynchronously = false;
 
         DB::FileCache file_cache("cache", settings);
         file_cache.initialize();
@@ -1207,7 +1195,6 @@ TEST_F(FileCacheTest, SLRUPolicy)
     settings.max_size = 40;
     settings.max_elements = 6;
     settings.boundary_alignment = 1;
-    settings.load_metadata_asynchronously = false;
 
     settings.cache_policy = "SLRU";
     settings.slru_size_ratio = 0.5;
@@ -1320,7 +1307,6 @@ TEST_F(FileCacheTest, SLRUPolicy)
         settings2.boundary_alignment = 1;
         settings2.cache_policy = "SLRU";
         settings2.slru_size_ratio = 0.5;
-        settings.load_metadata_asynchronously = false;
 
         auto cache = std::make_shared<DB::FileCache>("slru_2", settings2);
         cache->initialize();
diff --git a/src/Loggers/OwnSplitChannel.cpp b/src/Loggers/OwnSplitChannel.cpp
index c1594361b2c..dc51a13e01f 100644
--- a/src/Loggers/OwnSplitChannel.cpp
+++ b/src/Loggers/OwnSplitChannel.cpp
@@ -18,9 +18,6 @@ namespace DB
 
 void OwnSplitChannel::log(const Poco::Message & msg)
 {
-    if (!isLoggingEnabled())
-        return;
-
 #ifndef WITHOUT_TEXT_LOG
     auto logs_queue = CurrentThread::getInternalTextLogsQueue();
 
diff --git a/src/Parsers/ASTColumnDeclaration.cpp b/src/Parsers/ASTColumnDeclaration.cpp
index d7728462df3..4a8a3d2967d 100644
--- a/src/Parsers/ASTColumnDeclaration.cpp
+++ b/src/Parsers/ASTColumnDeclaration.cpp
@@ -1,6 +1,8 @@
 #include <Parsers/ASTColumnDeclaration.h>
 #include <Common/quoteString.h>
 #include <IO/Operators.h>
+#include <Parsers/ASTLiteral.h>
+#include <DataTypes/DataTypeFactory.h>
 
 
 namespace DB
@@ -13,6 +15,8 @@ ASTPtr ASTColumnDeclaration::clone() const
 
     if (type)
     {
+        // Type may be an ASTFunction (e.g. `create table t (a Decimal(9,0))`),
+        // so we have to clone it properly as well.
         res->type = type->clone();
         res->children.push_back(res->type);
     }
@@ -66,13 +70,17 @@ void ASTColumnDeclaration::formatImpl(const FormatSettings & format_settings, Fo
 {
     frame.need_parens = false;
 
-    /// We have to always quote column names to avoid ambiguity with INDEX and other declarations in CREATE query.
-    format_settings.quoteIdentifier(name);
+    /// We have to always backquote column names to avoid ambiguouty with INDEX and other declarations in CREATE query.
+    format_settings.ostr << backQuote(name);
 
     if (type)
     {
         format_settings.ostr << ' ';
-        type->formatImpl(format_settings, state, frame);
+
+        FormatStateStacked type_frame = frame;
+        type_frame.indent = 0;
+
+        type->formatImpl(format_settings, state, type_frame);
     }
 
     if (null_modifier)
diff --git a/src/Parsers/ASTColumnsTransformers.cpp b/src/Parsers/ASTColumnsTransformers.cpp
index 332ebca3bdb..2a61892f8cc 100644
--- a/src/Parsers/ASTColumnsTransformers.cpp
+++ b/src/Parsers/ASTColumnsTransformers.cpp
@@ -323,7 +323,9 @@ void ASTColumnsReplaceTransformer::formatImpl(const FormatSettings & settings, F
 {
     settings.ostr << (settings.hilite ? hilite_keyword : "") << "REPLACE" << (is_strict ? " STRICT " : " ") << (settings.hilite ? hilite_none : "");
 
-    settings.ostr << "(";
+    if (children.size() > 1)
+        settings.ostr << "(";
+
     for (ASTs::const_iterator it = children.begin(); it != children.end(); ++it)
     {
         if (it != children.begin())
@@ -331,7 +333,9 @@ void ASTColumnsReplaceTransformer::formatImpl(const FormatSettings & settings, F
 
         (*it)->formatImpl(settings, state, frame);
     }
-    settings.ostr << ")";
+
+    if (children.size() > 1)
+        settings.ostr << ")";
 }
 
 void ASTColumnsReplaceTransformer::appendColumnName(WriteBuffer & ostr) const
diff --git a/src/Parsers/ASTCreateQuery.cpp b/src/Parsers/ASTCreateQuery.cpp
index d7f5b8f9702..f0f782c0a63 100644
--- a/src/Parsers/ASTCreateQuery.cpp
+++ b/src/Parsers/ASTCreateQuery.cpp
@@ -256,8 +256,6 @@ ASTPtr ASTCreateQuery::clone() const
         res->set(res->dictionary, dictionary->clone());
     }
 
-    if (refresh_strategy)
-        res->set(res->refresh_strategy, refresh_strategy->clone());
     if (as_table_function)
         res->set(res->as_table_function, as_table_function->clone());
     if (comment)
@@ -485,13 +483,6 @@ void ASTCreateQuery::formatQueryImpl(const FormatSettings & settings, FormatStat
     if (auto to_storage = getTargetInnerEngine(ViewTarget::To))
         to_storage->formatImpl(settings, state, frame);
 
-    if (targets)
-    {
-        targets->formatTarget(ViewTarget::Data, settings, state, frame);
-        targets->formatTarget(ViewTarget::Tags, settings, state, frame);
-        targets->formatTarget(ViewTarget::Metrics, settings, state, frame);
-    }
-
     if (dictionary)
         dictionary->formatImpl(settings, state, frame);
 
diff --git a/src/Parsers/ASTCreateQuery.h b/src/Parsers/ASTCreateQuery.h
index 6be0fa78903..a95010aea31 100644
--- a/src/Parsers/ASTCreateQuery.h
+++ b/src/Parsers/ASTCreateQuery.h
@@ -97,7 +97,6 @@ public:
     bool is_materialized_view{false};
     bool is_live_view{false};
     bool is_window_view{false};
-    bool is_time_series_table{false}; /// CREATE TABLE ... ENGINE=TimeSeries() ...
     bool is_populate{false};
     bool is_create_empty{false};    /// CREATE TABLE ... EMPTY AS SELECT ...
     bool replace_view{false}; /// CREATE OR REPLACE VIEW
diff --git a/src/Parsers/ASTDataType.cpp b/src/Parsers/ASTDataType.cpp
deleted file mode 100644
index 4211347fb74..00000000000
--- a/src/Parsers/ASTDataType.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include <Parsers/ASTDataType.h>
-#include <Common/SipHash.h>
-#include <IO/Operators.h>
-
-
-namespace DB
-{
-
-String ASTDataType::getID(char delim) const
-{
-    return "DataType" + (delim + name);
-}
-
-ASTPtr ASTDataType::clone() const
-{
-    auto res = std::make_shared<ASTDataType>(*this);
-    res->children.clear();
-
-    if (arguments)
-    {
-        res->arguments = arguments->clone();
-        res->children.push_back(res->arguments);
-    }
-
-    return res;
-}
-
-void ASTDataType::updateTreeHashImpl(SipHash & hash_state, bool) const
-{
-    hash_state.update(name.size());
-    hash_state.update(name);
-    /// Children are hashed automatically.
-}
-
-void ASTDataType::formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
-{
-    settings.ostr << (settings.hilite ? hilite_function : "") << name;
-
-    if (arguments && !arguments->children.empty())
-    {
-        settings.ostr << '(' << (settings.hilite ? hilite_none : "");
-
-        if (!settings.one_line && settings.print_pretty_type_names && name == "Tuple")
-        {
-            ++frame.indent;
-            std::string indent_str = settings.one_line ? "" : "\n" + std::string(4 * frame.indent, ' ');
-            for (size_t i = 0, size = arguments->children.size(); i < size; ++i)
-            {
-                if (i != 0)
-                    settings.ostr << ',';
-                settings.ostr << indent_str;
-                arguments->children[i]->formatImpl(settings, state, frame);
-            }
-        }
-        else
-        {
-            frame.expression_list_prepend_whitespace = false;
-            arguments->formatImpl(settings, state, frame);
-        }
-
-        settings.ostr << (settings.hilite ? hilite_function : "") << ')';
-    }
-
-    settings.ostr << (settings.hilite ? hilite_none : "");
-}
-
-}
diff --git a/src/Parsers/ASTDataType.h b/src/Parsers/ASTDataType.h
deleted file mode 100644
index 71d3aeaa4eb..00000000000
--- a/src/Parsers/ASTDataType.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#include <Parsers/ASTExpressionList.h>
-
-
-namespace DB
-{
-
-/// AST for data types, e.g. UInt8 or Tuple(x UInt8, y Enum(a = 1))
-class ASTDataType : public IAST
-{
-public:
-    String name;
-    ASTPtr arguments;
-
-    String getID(char delim) const override;
-    ASTPtr clone() const override;
-    void updateTreeHashImpl(SipHash & hash_state, bool ignore_aliases) const override;
-    void formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
-};
-
-template <typename... Args>
-std::shared_ptr<ASTDataType> makeASTDataType(const String & name, Args &&... args)
-{
-    auto data_type = std::make_shared<ASTDataType>();
-    data_type->name = name;
-
-    if constexpr (sizeof...(args))
-    {
-        data_type->arguments = std::make_shared<ASTExpressionList>();
-        data_type->children.push_back(data_type->arguments);
-        data_type->arguments->children = { std::forward<Args>(args)... };
-    }
-
-    return data_type;
-}
-
-}
diff --git a/src/Parsers/ASTDeleteQuery.cpp b/src/Parsers/ASTDeleteQuery.cpp
index 434cc344a5a..67f3a85c9a5 100644
--- a/src/Parsers/ASTDeleteQuery.cpp
+++ b/src/Parsers/ASTDeleteQuery.cpp
@@ -45,12 +45,6 @@ void ASTDeleteQuery::formatQueryImpl(const FormatSettings & settings, FormatStat
 
     formatOnCluster(settings);
 
-    if (partition)
-    {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << " IN PARTITION " << (settings.hilite ? hilite_none : "");
-        partition->formatImpl(settings, state, frame);
-    }
-
     settings.ostr << (settings.hilite ? hilite_keyword : "") << " WHERE " << (settings.hilite ? hilite_none : "");
     predicate->formatImpl(settings, state, frame);
 }
diff --git a/src/Parsers/ASTDeleteQuery.h b/src/Parsers/ASTDeleteQuery.h
index fcbeafac294..cc115a366db 100644
--- a/src/Parsers/ASTDeleteQuery.h
+++ b/src/Parsers/ASTDeleteQuery.h
@@ -19,11 +19,6 @@ public:
         return removeOnCluster<ASTDeleteQuery>(clone(), params.default_database);
     }
 
-    /** Used in DELETE FROM queries.
-     *  The value or ID of the partition is stored here.
-     */
-    ASTPtr partition;
-
     ASTPtr predicate;
 
 protected:
diff --git a/src/Parsers/ASTDictionaryAttributeDeclaration.cpp b/src/Parsers/ASTDictionaryAttributeDeclaration.cpp
index a600987dc45..daf708c9478 100644
--- a/src/Parsers/ASTDictionaryAttributeDeclaration.cpp
+++ b/src/Parsers/ASTDictionaryAttributeDeclaration.cpp
@@ -35,7 +35,7 @@ void ASTDictionaryAttributeDeclaration::formatImpl(const FormatSettings & settin
 {
     frame.need_parens = false;
 
-    settings.quoteIdentifier(name);
+    settings.ostr << backQuote(name);
 
     if (type)
     {
diff --git a/src/Parsers/ASTExpressionList.cpp b/src/Parsers/ASTExpressionList.cpp
index f345b0c6a6f..61ac482af82 100644
--- a/src/Parsers/ASTExpressionList.cpp
+++ b/src/Parsers/ASTExpressionList.cpp
@@ -42,8 +42,7 @@ void ASTExpressionList::formatImpl(const FormatSettings & settings, FormatState
 
 void ASTExpressionList::formatImplMultiline(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
 {
-    ++frame.indent;
-    std::string indent_str = "\n" + std::string(4 * frame.indent, ' ');
+    std::string indent_str = "\n" + std::string(4 * (frame.indent + 1), ' ');
 
     if (frame.expression_list_prepend_whitespace)
     {
@@ -51,6 +50,8 @@ void ASTExpressionList::formatImplMultiline(const FormatSettings & settings, For
             settings.ostr << ' ';
     }
 
+    ++frame.indent;
+
     for (size_t i = 0, size = children.size(); i < size; ++i)
     {
         if (i && separator)
diff --git a/src/Parsers/ASTFunction.cpp b/src/Parsers/ASTFunction.cpp
index d42728addb7..230d4c778e8 100644
--- a/src/Parsers/ASTFunction.cpp
+++ b/src/Parsers/ASTFunction.cpp
@@ -285,8 +285,6 @@ static bool formatNamedArgWithHiddenValue(IAST * arg, const IAST::FormatSettings
 void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
 {
     frame.expression_list_prepend_whitespace = false;
-    if (kind == Kind::CODEC || kind == Kind::STATISTICS || kind == Kind::BACKUP_NAME)
-        frame.allow_operators = false;
     FormatStateStacked nested_need_parens = frame;
     FormatStateStacked nested_dont_need_parens = frame;
     nested_need_parens.need_parens = true;
@@ -310,7 +308,7 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
 
     /// Should this function to be written as operator?
     bool written = false;
-    if (arguments && !parameters && frame.allow_operators && nulls_action == NullsAction::EMPTY)
+    if (arguments && !parameters && nulls_action == NullsAction::EMPTY)
     {
         /// Unary prefix operators.
         if (arguments->children.size() == 1)
@@ -522,7 +520,7 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
                 if (tuple_arguments_valid && lit_right)
                 {
                     if (isInt64OrUInt64FieldType(lit_right->value.getType())
-                        && lit_right->value.safeGet<Int64>() >= 0)
+                        && lit_right->value.get<Int64>() >= 0)
                     {
                         if (frame.need_parens)
                             settings.ostr << '(';
diff --git a/src/Parsers/ASTFunction.h b/src/Parsers/ASTFunction.h
index 1b4a5928d1c..3a94691f25d 100644
--- a/src/Parsers/ASTFunction.h
+++ b/src/Parsers/ASTFunction.h
@@ -46,7 +46,7 @@ public:
 
     NullsAction nulls_action = NullsAction::EMPTY;
 
-    /// do not print empty parentheses if there are no args - compatibility with engine names.
+    /// do not print empty parentheses if there are no args - compatibility with new AST for data types and engine names.
     bool no_empty_args = false;
 
     /// Specifies where this function-like expression is used.
@@ -58,8 +58,6 @@ public:
         TABLE_ENGINE,
         DATABASE_ENGINE,
         BACKUP_NAME,
-        CODEC,
-        STATISTICS,
     };
     Kind kind = Kind::ORDINARY_FUNCTION;
 
diff --git a/src/Parsers/ASTIndexDeclaration.cpp b/src/Parsers/ASTIndexDeclaration.cpp
index 1e39eacaac7..0c36644356f 100644
--- a/src/Parsers/ASTIndexDeclaration.cpp
+++ b/src/Parsers/ASTIndexDeclaration.cpp
@@ -79,7 +79,7 @@ void ASTIndexDeclaration::formatImpl(const FormatSettings & s, FormatState & sta
         }
         else
         {
-            s.writeIdentifier(name);
+            s.ostr << backQuoteIfNeed(name);
             s.ostr << " ";
             expr->formatImpl(s, state, frame);
         }
diff --git a/src/Parsers/ASTIndexDeclaration.h b/src/Parsers/ASTIndexDeclaration.h
index 72f3f017a99..dd05ad08184 100644
--- a/src/Parsers/ASTIndexDeclaration.h
+++ b/src/Parsers/ASTIndexDeclaration.h
@@ -13,7 +13,8 @@ class ASTIndexDeclaration : public IAST
 {
 public:
     static const auto DEFAULT_INDEX_GRANULARITY = 1uz;
-    static const auto DEFAULT_VECTOR_SIMILARITY_INDEX_GRANULARITY = 100'000'000uz;
+    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_);
 
diff --git a/src/Parsers/ASTLiteral.cpp b/src/Parsers/ASTLiteral.cpp
index 515f4f0cb9f..8dedc5dc95d 100644
--- a/src/Parsers/ASTLiteral.cpp
+++ b/src/Parsers/ASTLiteral.cpp
@@ -73,8 +73,8 @@ void ASTLiteral::appendColumnNameImpl(WriteBuffer & ostr) const
     /// Special case for very large arrays and tuples. Instead of listing all elements, will use hash of them.
     /// (Otherwise column name will be too long, that will lead to significant slowdown of expression analysis.)
     auto type = value.getType();
-    if ((type == Field::Types::Array && value.safeGet<const Array &>().size() > min_elements_for_hashing)
-        || (type == Field::Types::Tuple && value.safeGet<const Tuple &>().size() > min_elements_for_hashing))
+    if ((type == Field::Types::Array && value.get<const Array &>().size() > min_elements_for_hashing)
+        || (type == Field::Types::Tuple && value.get<const Tuple &>().size() > min_elements_for_hashing))
     {
         SipHash hash;
         applyVisitor(FieldVisitorHash(hash), value);
@@ -92,7 +92,7 @@ void ASTLiteral::appendColumnNameImpl(WriteBuffer & ostr) const
         /// for tons of literals as it creates temporary String.
         if (value.getType() == Field::Types::String)
         {
-            writeQuoted(value.safeGet<String>(), ostr);
+            writeQuoted(value.get<String>(), ostr);
         }
         else
         {
@@ -110,7 +110,7 @@ void ASTLiteral::appendColumnNameImplLegacy(WriteBuffer & ostr) const
     /// Special case for very large arrays. Instead of listing all elements, will use hash of them.
     /// (Otherwise column name will be too long, that will lead to significant slowdown of expression analysis.)
     auto type = value.getType();
-    if ((type == Field::Types::Array && value.safeGet<const Array &>().size() > min_elements_for_hashing))
+    if ((type == Field::Types::Array && value.get<const Array &>().size() > min_elements_for_hashing))
     {
         SipHash hash;
         applyVisitor(FieldVisitorHash(hash), value);
diff --git a/src/Parsers/ASTNameTypePair.cpp b/src/Parsers/ASTNameTypePair.cpp
index 1515700365f..e4066081a9b 100644
--- a/src/Parsers/ASTNameTypePair.cpp
+++ b/src/Parsers/ASTNameTypePair.cpp
@@ -23,8 +23,12 @@ ASTPtr ASTNameTypePair::clone() const
 
 void ASTNameTypePair::formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
 {
-    settings.ostr << backQuoteIfNeed(name) << ' ';
+    std::string indent_str = settings.one_line ? "" : std::string(4 * frame.indent, ' ');
+
+    settings.ostr << indent_str << backQuoteIfNeed(name) << ' ';
     type->formatImpl(settings, state, frame);
 }
 
 }
+
+
diff --git a/src/Parsers/ASTObjectTypeArgument.cpp b/src/Parsers/ASTObjectTypeArgument.cpp
deleted file mode 100644
index 975f0389505..00000000000
--- a/src/Parsers/ASTObjectTypeArgument.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#include <IO/Operators.h>
-#include <Parsers/ASTObjectTypeArgument.h>
-#include <Parsers/CommonParsers.h>
-
-
-namespace DB
-{
-
-ASTPtr ASTObjectTypeArgument::clone() const
-{
-    auto res = std::make_shared<ASTObjectTypeArgument>(*this);
-    res->children.clear();
-
-    if (path_with_type)
-    {
-        res->path_with_type = path_with_type->clone();
-        res->children.push_back(res->path_with_type);
-    }
-    else if (skip_path)
-    {
-        res->skip_path = skip_path->clone();
-        res->children.push_back(res->skip_path);
-    }
-    else if (skip_path_regexp)
-    {
-        res->skip_path_regexp = skip_path_regexp->clone();
-        res->children.push_back(res->skip_path_regexp);
-    }
-    else if (parameter)
-    {
-        res->parameter = parameter->clone();
-        res->children.push_back(res->parameter);
-    }
-
-    return res;
-}
-
-void ASTObjectTypeArgument::formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
-{
-    if (path_with_type)
-    {
-        path_with_type->formatImpl(settings, state, frame);
-    }
-    else if (parameter)
-    {
-        parameter->formatImpl(settings, state, frame);
-    }
-    else if (skip_path)
-    {
-        std::string indent_str = settings.one_line ? "" : std::string(4 * frame.indent, ' ');
-        settings.ostr << indent_str << "SKIP" << ' ';
-        skip_path->formatImpl(settings, state, frame);
-    }
-    else if (skip_path_regexp)
-    {
-        std::string indent_str = settings.one_line ? "" : std::string(4 * frame.indent, ' ');
-        settings.ostr << indent_str << "SKIP REGEXP" << ' ';
-        skip_path_regexp->formatImpl(settings, state, frame);
-    }
-}
-
-}
-
-
diff --git a/src/Parsers/ASTObjectTypeArgument.h b/src/Parsers/ASTObjectTypeArgument.h
deleted file mode 100644
index ab18d00d770..00000000000
--- a/src/Parsers/ASTObjectTypeArgument.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <Parsers/IAST.h>
-
-
-namespace DB
-{
-
-/** An argument of Object data type declaration (for example for JSON). Can contain one of:
- *  - pair (path, data type)
- *  - path that should be skipped
- *  - path regexp for paths that should be skipped
- *  - setting in a form of `setting=N`
- */
-class ASTObjectTypeArgument : public IAST
-{
-public:
-    ASTPtr path_with_type;
-    ASTPtr skip_path;
-    ASTPtr skip_path_regexp;
-    ASTPtr parameter;
-
-    /** Get the text that identifies this element. */
-    String getID(char) const override { return "ASTObjectTypeArgument"; }
-    ASTPtr clone() const override;
-
-protected:
-    void formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
-};
-
-
-}
-
diff --git a/src/Parsers/ASTProjectionDeclaration.cpp b/src/Parsers/ASTProjectionDeclaration.cpp
index af79745a88e..60050986161 100644
--- a/src/Parsers/ASTProjectionDeclaration.cpp
+++ b/src/Parsers/ASTProjectionDeclaration.cpp
@@ -17,7 +17,7 @@ ASTPtr ASTProjectionDeclaration::clone() const
 
 void ASTProjectionDeclaration::formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
 {
-    settings.writeIdentifier(name);
+    settings.ostr << backQuoteIfNeed(name);
     std::string indent_str = settings.one_line ? "" : std::string(4u * frame.indent, ' ');
     std::string nl_or_nothing = settings.one_line ? "" : "\n";
     settings.ostr << settings.nl_or_ws << indent_str << "(" << nl_or_nothing;
diff --git a/src/Parsers/ASTRefreshStrategy.cpp b/src/Parsers/ASTRefreshStrategy.cpp
index d10c1b4e7f5..2e0c6ee4638 100644
--- a/src/Parsers/ASTRefreshStrategy.cpp
+++ b/src/Parsers/ASTRefreshStrategy.cpp
@@ -20,6 +20,7 @@ ASTPtr ASTRefreshStrategy::clone() const
         res->set(res->settings, settings->clone());
     if (dependencies)
         res->set(res->dependencies, dependencies->clone());
+    res->schedule_kind = schedule_kind;
     return res;
 }
 
@@ -65,8 +66,6 @@ void ASTRefreshStrategy::formatImpl(
         f_settings.ostr << (f_settings.hilite ? hilite_keyword : "") << " SETTINGS " << (f_settings.hilite ? hilite_none : "");
         settings->formatImpl(f_settings, state, frame);
     }
-    if (append)
-        f_settings.ostr << (f_settings.hilite ? hilite_keyword : "") << " APPEND" << (f_settings.hilite ? hilite_none : "");
 }
 
 }
diff --git a/src/Parsers/ASTRefreshStrategy.h b/src/Parsers/ASTRefreshStrategy.h
index bb5ac97c054..ca248b76b40 100644
--- a/src/Parsers/ASTRefreshStrategy.h
+++ b/src/Parsers/ASTRefreshStrategy.h
@@ -24,7 +24,6 @@ public:
     ASTTimeInterval * offset = nullptr;
     ASTTimeInterval * spread = nullptr;
     RefreshScheduleKind schedule_kind{RefreshScheduleKind::UNKNOWN};
-    bool append = false;
 
     String getID(char) const override { return "Refresh strategy definition"; }
 
diff --git a/src/Parsers/ASTRenameQuery.h b/src/Parsers/ASTRenameQuery.h
index 39fc4f787ec..d51c382f374 100644
--- a/src/Parsers/ASTRenameQuery.h
+++ b/src/Parsers/ASTRenameQuery.h
@@ -141,19 +141,6 @@ public:
 
     QueryKind getQueryKind() const override { return QueryKind::Rename; }
 
-    void addElement(const String & from_db, const String & from_table, const String & to_db, const String & to_table)
-    {
-        auto identifier = [&](const String & name) -> ASTPtr
-        {
-            if (name.empty())
-                return nullptr;
-            ASTPtr ast = std::make_shared<ASTIdentifier>(name);
-            children.push_back(ast);
-            return ast;
-        };
-        elements.push_back(Element {.from = Table {.database = identifier(from_db), .table = identifier(from_table)}, .to = Table {.database = identifier(to_db), .table = identifier(to_table)}});
-    }
-
 protected:
     void formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override
     {
diff --git a/src/Parsers/ASTSystemQuery.cpp b/src/Parsers/ASTSystemQuery.cpp
index b5e5e0f208d..7780544d5c2 100644
--- a/src/Parsers/ASTSystemQuery.cpp
+++ b/src/Parsers/ASTSystemQuery.cpp
@@ -376,7 +376,6 @@ void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState & s
         case Type::START_VIEW:
         case Type::STOP_VIEW:
         case Type::CANCEL_VIEW:
-        case Type::WAIT_VIEW:
         {
             settings.ostr << ' ';
             print_database_table();
diff --git a/src/Parsers/ASTSystemQuery.h b/src/Parsers/ASTSystemQuery.h
index d9f5b425182..167e724dcee 100644
--- a/src/Parsers/ASTSystemQuery.h
+++ b/src/Parsers/ASTSystemQuery.h
@@ -95,7 +95,6 @@ public:
         START_CLEANUP,
         RESET_COVERAGE,
         REFRESH_VIEW,
-        WAIT_VIEW,
         START_VIEW,
         START_VIEWS,
         STOP_VIEW,
@@ -131,8 +130,6 @@ public:
     String disk;
     UInt64 seconds{};
 
-    std::optional<String> query_cache_tag;
-
     String filesystem_cache_name;
     std::string key_to_drop;
     std::optional<size_t> offset_to_drop;
diff --git a/src/Parsers/ASTTableOverrides.cpp b/src/Parsers/ASTTableOverrides.cpp
index 8352e68b156..ccb485f6c69 100644
--- a/src/Parsers/ASTTableOverrides.cpp
+++ b/src/Parsers/ASTTableOverrides.cpp
@@ -22,8 +22,10 @@ ASTPtr ASTTableOverride::clone() const
     return res;
 }
 
-void ASTTableOverride::formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
+void ASTTableOverride::formatImpl(const FormatSettings & settings_, FormatState & state, FormatStateStacked frame) const
 {
+    FormatSettings settings = settings_;
+    settings.always_quote_identifiers = true;
     String nl_or_nothing = settings.one_line ? "" : "\n";
     String nl_or_ws = settings.one_line ? " " : "\n";
     String hl_keyword = settings.hilite ? hilite_keyword : "";
diff --git a/src/Parsers/ASTTablesInSelectQuery.cpp b/src/Parsers/ASTTablesInSelectQuery.cpp
index b6d42513aa7..d22a4eca0fc 100644
--- a/src/Parsers/ASTTablesInSelectQuery.cpp
+++ b/src/Parsers/ASTTablesInSelectQuery.cpp
@@ -235,13 +235,7 @@ void ASTTableJoin::formatImplAfterTable(const FormatSettings & settings, FormatS
     else if (on_expression)
     {
         settings.ostr << (settings.hilite ? hilite_keyword : "") << " ON " << (settings.hilite ? hilite_none : "");
-        /// If there is an alias for the whole expression parens should be added, otherwise it will be invalid syntax
-        bool on_has_alias = !on_expression->tryGetAlias().empty();
-        if (on_has_alias)
-            settings.ostr << "(";
         on_expression->formatImpl(settings, state, frame);
-        if (on_has_alias)
-            settings.ostr << ")";
     }
 }
 
diff --git a/src/Parsers/ASTViewTargets.cpp b/src/Parsers/ASTViewTargets.cpp
index ffd746cc38a..8ee98e704df 100644
--- a/src/Parsers/ASTViewTargets.cpp
+++ b/src/Parsers/ASTViewTargets.cpp
@@ -21,9 +21,6 @@ std::string_view toString(ViewTarget::Kind kind)
     {
         case ViewTarget::To:      return "to";
         case ViewTarget::Inner:   return "inner";
-        case ViewTarget::Data:    return "data";
-        case ViewTarget::Tags:    return "tags";
-        case ViewTarget::Metrics: return "metrics";
     }
     throw Exception(ErrorCodes::LOGICAL_ERROR, "{} doesn't support kind {}", __FUNCTION__, kind);
 }
@@ -257,9 +254,6 @@ std::optional<Keyword> ASTViewTargets::getKeywordForTableID(ViewTarget::Kind kin
     {
         case ViewTarget::To:      return Keyword::TO;      /// TO mydb.mydata
         case ViewTarget::Inner:   return std::nullopt;
-        case ViewTarget::Data:    return Keyword::DATA;    /// DATA mydb.mydata
-        case ViewTarget::Tags:    return Keyword::TAGS;    /// TAGS mydb.mytags
-        case ViewTarget::Metrics: return Keyword::METRICS; /// METRICS mydb.mymetrics
     }
     UNREACHABLE();
 }
@@ -270,9 +264,6 @@ std::optional<Keyword> ASTViewTargets::getKeywordForInnerStorage(ViewTarget::Kin
     {
         case ViewTarget::To:      return std::nullopt;      /// ENGINE = MergeTree()
         case ViewTarget::Inner:   return Keyword::INNER;    /// INNER ENGINE = MergeTree()
-        case ViewTarget::Data:    return Keyword::DATA;     /// DATA ENGINE = MergeTree()
-        case ViewTarget::Tags:    return Keyword::TAGS;     /// TAGS ENGINE = MergeTree()
-        case ViewTarget::Metrics: return Keyword::METRICS;  /// METRICS ENGINE = MergeTree()
     }
     UNREACHABLE();
 }
@@ -283,9 +274,6 @@ std::optional<Keyword> ASTViewTargets::getKeywordForInnerUUID(ViewTarget::Kind k
     {
         case ViewTarget::To:      return Keyword::TO_INNER_UUID;       /// TO INNER UUID 'XXX'
         case ViewTarget::Inner:   return std::nullopt;
-        case ViewTarget::Data:    return Keyword::DATA_INNER_UUID;     /// DATA INNER UUID 'XXX'
-        case ViewTarget::Tags:    return Keyword::TAGS_INNER_UUID;     /// TAGS INNER UUID 'XXX'
-        case ViewTarget::Metrics: return Keyword::METRICS_INNER_UUID;  /// METRICS INNER UUID 'XXX'
     }
     UNREACHABLE();
 }
diff --git a/src/Parsers/ASTViewTargets.h b/src/Parsers/ASTViewTargets.h
index 7814dd5249c..12182919f0e 100644
--- a/src/Parsers/ASTViewTargets.h
+++ b/src/Parsers/ASTViewTargets.h
@@ -9,7 +9,7 @@ namespace DB
 class ASTStorage;
 enum class Keyword : size_t;
 
-/// Information about target tables (external or inner) of a materialized view or a window view or a TimeSeries table.
+/// Information about target tables (external or inner) of a materialized view or a window view.
 /// See ASTViewTargets for more details.
 struct ViewTarget
 {
@@ -24,15 +24,6 @@ struct ViewTarget
         /// If `kind == ViewTarget::Inner` then `ViewTarget` contains information about the "INNER" table of a window view:
         ///     CREATE WINDOW VIEW db.wv_name {INNER ENGINE inner_engine} AS SELECT ...
         Inner,
-
-        /// The "data" table for a TimeSeries table, contains time series.
-        Data,
-
-        /// The "tags" table for a TimeSeries table, contains identifiers for each combination of a metric name and tags (labels).
-        Tags,
-
-        /// The "metrics" table for a TimeSeries table, contains general information (metadata) about metrics.
-        Metrics,
     };
 
     Kind kind = To;
diff --git a/src/Parsers/Access/ASTGrantQuery.cpp b/src/Parsers/Access/ASTGrantQuery.cpp
index eac88c75513..f60fa7e4a23 100644
--- a/src/Parsers/Access/ASTGrantQuery.cpp
+++ b/src/Parsers/Access/ASTGrantQuery.cpp
@@ -97,9 +97,24 @@ namespace
 
     void formatCurrentGrantsElements(const AccessRightsElements & elements, const IAST::FormatSettings & settings)
     {
-        settings.ostr << "(";
-        formatElementsWithoutOptions(elements, settings);
-        settings.ostr << ")";
+        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);
+            }
+        }
     }
 }
 
diff --git a/src/Parsers/Access/ParserCreateQuotaQuery.cpp b/src/Parsers/Access/ParserCreateQuotaQuery.cpp
index ddf4e9ecda5..ddfdbe38903 100644
--- a/src/Parsers/Access/ParserCreateQuotaQuery.cpp
+++ b/src/Parsers/Access/ParserCreateQuotaQuery.cpp
@@ -114,7 +114,7 @@ namespace
     T fieldToNumber(const Field & f)
     {
         if (f.getType() == Field::Types::String)
-            return parseWithSizeSuffix<QuotaValue>(boost::algorithm::trim_copy(f.safeGet<std::string>()));
+            return parseWithSizeSuffix<QuotaValue>(boost::algorithm::trim_copy(f.get<std::string>()));
         else
             return applyVisitor(FieldVisitorConvertToNumber<T>(), f);
     }
diff --git a/src/Parsers/CommonParsers.h b/src/Parsers/CommonParsers.h
index ab0e70eb0e5..0ae9ee4833c 100644
--- a/src/Parsers/CommonParsers.h
+++ b/src/Parsers/CommonParsers.h
@@ -116,8 +116,6 @@ namespace DB
     MR_MACROS(CURRENT_TRANSACTION, "CURRENT TRANSACTION") \
     MR_MACROS(CURRENTUSER, "CURRENTUSER") \
     MR_MACROS(D, "D") \
-    MR_MACROS(DATA, "DATA") \
-    MR_MACROS(DATA_INNER_UUID, "DATA INNER UUID") \
     MR_MACROS(DATABASE, "DATABASE") \
     MR_MACROS(DATABASES, "DATABASES") \
     MR_MACROS(DATE, "DATE") \
@@ -290,8 +288,6 @@ namespace DB
     MR_MACROS(MCS, "MCS") \
     MR_MACROS(MEMORY, "MEMORY") \
     MR_MACROS(MERGES, "MERGES") \
-    MR_MACROS(METRICS, "METRICS") \
-    MR_MACROS(METRICS_INNER_UUID, "METRICS INNER UUID") \
     MR_MACROS(MI, "MI") \
     MR_MACROS(MICROSECOND, "MICROSECOND") \
     MR_MACROS(MICROSECONDS, "MICROSECONDS") \
@@ -371,7 +367,6 @@ namespace DB
     MR_MACROS(POPULATE, "POPULATE") \
     MR_MACROS(PRECEDING, "PRECEDING") \
     MR_MACROS(PRECISION, "PRECISION") \
-    MR_MACROS(PREFIX, "PREFIX") \
     MR_MACROS(PREWHERE, "PREWHERE") \
     MR_MACROS(PRIMARY_KEY, "PRIMARY KEY") \
     MR_MACROS(PRIMARY, "PRIMARY") \
@@ -450,7 +445,6 @@ namespace DB
     MR_MACROS(SHOW, "SHOW") \
     MR_MACROS(SIGNED, "SIGNED") \
     MR_MACROS(SIMPLE, "SIMPLE") \
-    MR_MACROS(SKIP, "SKIP") \
     MR_MACROS(SOURCE, "SOURCE") \
     MR_MACROS(SPATIAL, "SPATIAL") \
     MR_MACROS(SQL_SECURITY, "SQL SECURITY") \
@@ -470,9 +464,6 @@ namespace DB
     MR_MACROS(TABLE_OVERRIDE, "TABLE OVERRIDE") \
     MR_MACROS(TABLE, "TABLE") \
     MR_MACROS(TABLES, "TABLES") \
-    MR_MACROS(TAG, "TAG") \
-    MR_MACROS(TAGS, "TAGS") \
-    MR_MACROS(TAGS_INNER_UUID, "TAGS INNER UUID") \
     MR_MACROS(TEMPORARY_TABLE, "TEMPORARY TABLE") \
     MR_MACROS(TEMPORARY, "TEMPORARY") \
     MR_MACROS(TEST, "TEST") \
@@ -644,32 +635,6 @@ protected:
     }
 };
 
-class ParserTokenSequence : public IParserBase
-{
-private:
-    std::vector<TokenType> token_types;
-public:
-    ParserTokenSequence(const std::vector<TokenType> & token_types_) : token_types(token_types_) {} /// NOLINT
-
-protected:
-    const char * getName() const override { return "token sequence"; }
-
-    bool parseImpl(Pos & pos, ASTPtr & /*node*/, Expected & expected) override
-    {
-        for (auto token_type : token_types)
-        {
-            if (pos->type != token_type)
-            {
-                expected.add(pos, getTokenName(token_type));
-                return false;
-            }
-
-            ++pos;
-        }
-
-        return true;
-    }
-};
 
 // Parser always returns true and do nothing.
 class ParserNothing : public IParserBase
diff --git a/src/Parsers/CreateQueryUUIDs.cpp b/src/Parsers/CreateQueryUUIDs.cpp
index fbdc6161408..4dfee67b537 100644
--- a/src/Parsers/CreateQueryUUIDs.cpp
+++ b/src/Parsers/CreateQueryUUIDs.cpp
@@ -45,13 +45,6 @@ CreateQueryUUIDs::CreateQueryUUIDs(const ASTCreateQuery & query, bool generate_r
             /// then MV will create inner table. We should generate UUID of inner table here.
             if (query.is_materialized_view)
                 generate_target_uuid(ViewTarget::To);
-
-            if (query.is_time_series_table)
-            {
-                generate_target_uuid(ViewTarget::Data);
-                generate_target_uuid(ViewTarget::Tags);
-                generate_target_uuid(ViewTarget::Metrics);
-            }
         }
     }
 }
diff --git a/src/Parsers/ExpressionElementParsers.cpp b/src/Parsers/ExpressionElementParsers.cpp
index 61b5723072e..d4fc9a4bc4d 100644
--- a/src/Parsers/ExpressionElementParsers.cpp
+++ b/src/Parsers/ExpressionElementParsers.cpp
@@ -9,8 +9,8 @@
 #include <Common/PODArray.h>
 #include <Common/StringUtils.h>
 #include <Common/typeid_cast.h>
+#include "Parsers/CommonParsers.h"
 
-#include <Parsers/CommonParsers.h>
 #include <Parsers/DumpASTNode.h>
 #include <Parsers/ASTAsterisk.h>
 #include <Parsers/ASTCollation.h>
@@ -282,106 +282,22 @@ bool ParserTableAsStringLiteralIdentifier::parseImpl(Pos & pos, ASTPtr & node, E
     return true;
 }
 
-namespace
-{
-
-/// Parser of syntax sugar for reading JSON subcolumns of type Array(JSON):
-/// json.a.b[][].c -> json.a.b.:Array(Array(JSON)).c
-class ParserArrayOfJSONIdentifierAddition : public IParserBase
-{
-public:
-    String getLastArrayOfJSONSubcolumnIdentifier() const
-    {
-        String subcolumn = ":`";
-        for (size_t i = 0; i != last_array_level; ++i)
-            subcolumn += "Array(";
-        subcolumn += "JSON";
-        for (size_t i = 0; i != last_array_level; ++i)
-            subcolumn += ")";
-        return subcolumn + "`";
-    }
-
-protected:
-    const char * getName() const override { return "ParserArrayOfJSONIdentifierDelimiter"; }
-
-    bool parseImpl(Pos & pos, ASTPtr & /*node*/, Expected & expected) override
-    {
-        last_array_level = 0;
-        ParserTokenSequence brackets_parser(std::vector<TokenType>{TokenType::OpeningSquareBracket, TokenType::ClosingSquareBracket});
-        if (!brackets_parser.check(pos, expected))
-            return false;
-        ++last_array_level;
-        while (brackets_parser.check(pos, expected))
-            ++last_array_level;
-        return true;
-    }
-
-private:
-    size_t last_array_level;
-};
-
-}
 
 bool ParserCompoundIdentifier::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    auto element_parser = std::make_unique<ParserIdentifier>(allow_query_parameter, highlight_type);
-    std::vector<std::pair<ParserPtr, SpecialDelimiter>> delimiter_parsers;
-    delimiter_parsers.emplace_back(std::make_unique<ParserTokenSequence>(std::vector<TokenType>{TokenType::Dot, TokenType::Colon}), SpecialDelimiter::JSON_PATH_DYNAMIC_TYPE);
-    delimiter_parsers.emplace_back(std::make_unique<ParserTokenSequence>(std::vector<TokenType>{TokenType::Dot, TokenType::Caret}), SpecialDelimiter::JSON_PATH_PREFIX);
-    delimiter_parsers.emplace_back(std::make_unique<ParserToken>(TokenType::Dot), SpecialDelimiter::NONE);
-    ParserArrayOfJSONIdentifierAddition array_of_json_identifier_addition;
+    ASTPtr id_list;
+    if (!ParserList(std::make_unique<ParserIdentifier>(allow_query_parameter, highlight_type), std::make_unique<ParserToken>(TokenType::Dot), false)
+             .parse(pos, id_list, expected))
+        return false;
 
     std::vector<String> parts;
-    SpecialDelimiter last_special_delimiter = SpecialDelimiter::NONE;
     ASTs params;
-
-    bool is_first = true;
-    Pos begin = pos;
-    while (true)
+    const auto & list = id_list->as<ASTExpressionList &>();
+    for (const auto & child : list.children)
     {
-        ASTPtr element;
-        if (!element_parser->parse(pos, element, expected))
-        {
-            if (is_first)
-                return false;
-            pos = begin;
-            break;
-        }
-
-        if (last_special_delimiter != SpecialDelimiter::NONE)
-        {
-            parts.push_back(static_cast<char>(last_special_delimiter) + backQuote(getIdentifierName(element)));
-        }
-        else
-        {
-            parts.push_back(getIdentifierName(element));
-            /// Check if we have Array of JSON subcolumn additioon after identifier
-            /// and replace it with corresponding type subcolumn.
-            if (!is_first && array_of_json_identifier_addition.check(pos, expected))
-                parts.push_back(array_of_json_identifier_addition.getLastArrayOfJSONSubcolumnIdentifier());
-        }
-
+        parts.emplace_back(getIdentifierName(child));
         if (parts.back().empty())
-            params.push_back(element->as<ASTIdentifier>()->getParam());
-
-        is_first = false;
-        begin = pos;
-        bool parsed_delimiter = false;
-        for (const auto & [parser, special_delimiter] : delimiter_parsers)
-        {
-            if (parser->check(pos, expected))
-            {
-                parsed_delimiter = true;
-                last_special_delimiter = special_delimiter;
-                break;
-            }
-        }
-
-        if (!parsed_delimiter)
-        {
-            pos = begin;
-            break;
-        }
+            params.push_back(child->as<ASTIdentifier>()->getParam());
     }
 
     ParserKeyword s_uuid(Keyword::UUID);
@@ -398,7 +314,7 @@ bool ParserCompoundIdentifier::parseImpl(Pos & pos, ASTPtr & node, Expected & ex
             ASTPtr ast_uuid;
             if (!uuid_p.parse(pos, ast_uuid, expected))
                 return false;
-            uuid = parseFromString<UUID>(ast_uuid->as<ASTLiteral>()->value.safeGet<String>());
+            uuid = parseFromString<UUID>(ast_uuid->as<ASTLiteral>()->value.get<String>());
         }
 
         if (parts.size() == 1) node = std::make_shared<ASTTableIdentifier>(parts[0], std::move(params));
@@ -780,7 +696,6 @@ bool ParserCodec::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     auto function_node = std::make_shared<ASTFunction>();
     function_node->name = "CODEC";
-    function_node->kind = ASTFunction::Kind::CODEC;
     function_node->arguments = expr_list_args;
     function_node->children.push_back(function_node->arguments);
 
@@ -808,9 +723,9 @@ bool ParserStatisticsType::parseImpl(Pos & pos, ASTPtr & node, Expected & expect
 
     auto function_node = std::make_shared<ASTFunction>();
     function_node->name = "STATISTICS";
-    function_node->kind = ASTFunction::Kind::STATISTICS;
     function_node->arguments = stat_type;
     function_node->children.push_back(function_node->arguments);
+
     node = function_node;
     return true;
 }
@@ -853,10 +768,9 @@ bool ParserCastOperator::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 
     /// Parse numbers (including decimals), strings, arrays and tuples of them.
 
-    Pos begin = pos;
     const char * data_begin = pos->begin;
     const char * data_end = pos->end;
-    ASTPtr string_literal;
+    bool is_string_literal = pos->type == StringLiteral;
 
     if (pos->type == Minus)
     {
@@ -867,15 +781,10 @@ bool ParserCastOperator::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
         data_end = pos->end;
         ++pos;
     }
-    else if (pos->type == Number)
+    else if (pos->type == Number || is_string_literal)
     {
         ++pos;
     }
-    else if (pos->type == StringLiteral)
-    {
-        if (!ParserStringLiteral().parse(begin, string_literal, expected))
-            return false;
-    }
     else if (isOneOf<OpeningSquareBracket, OpeningRoundBracket>(pos->type))
     {
         TokenType last_token = OpeningSquareBracket;
@@ -943,18 +852,20 @@ bool ParserCastOperator::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     if (ParserToken(DoubleColon).ignore(pos, expected)
         && ParserDataType().parse(pos, type_ast, expected))
     {
+        String s;
         size_t data_size = data_end - data_begin;
-        if (string_literal)
+        if (is_string_literal)
         {
-            node = createFunctionCast(string_literal, type_ast);
-            return true;
+            ReadBufferFromMemory buf(data_begin, data_size);
+            readQuotedStringWithSQLStyle(s, buf);
+            assert(buf.count() == data_size);
         }
         else
-        {
-            auto literal = std::make_shared<ASTLiteral>(String(data_begin, data_size));
-            node = createFunctionCast(literal, type_ast);
-            return true;
-        }
+            s = String(data_begin, data_size);
+
+        auto literal = std::make_shared<ASTLiteral>(std::move(s));
+        node = createFunctionCast(literal, type_ast);
+        return true;
     }
 
     return false;
@@ -1714,7 +1625,7 @@ bool ParserColumnsTransformers::parseImpl(Pos & pos, ASTPtr & node, Expected & e
             if (!parser_string_literal.parse(pos, ast_prefix_name, expected))
                 return false;
 
-            column_name_prefix = ast_prefix_name->as<ASTLiteral &>().value.safeGet<const String &>();
+            column_name_prefix = ast_prefix_name->as<ASTLiteral &>().value.get<const String &>();
         }
 
         if (with_open_round_bracket)
@@ -1777,7 +1688,7 @@ bool ParserColumnsTransformers::parseImpl(Pos & pos, ASTPtr & node, Expected & e
 
         auto res = std::make_shared<ASTColumnsExceptTransformer>();
         if (regexp_node)
-            res->setPattern(regexp_node->as<ASTLiteral &>().value.safeGet<String>());
+            res->setPattern(regexp_node->as<ASTLiteral &>().value.get<String>());
         else
             res->children = std::move(identifiers);
         res->is_strict = is_strict;
@@ -1949,7 +1860,7 @@ static bool parseColumnsMatcherBody(IParser::Pos & pos, ASTPtr & node, Expected
     else
     {
         auto regexp_matcher = std::make_shared<ASTColumnsRegexpMatcher>();
-        regexp_matcher->setPattern(regexp_node->as<ASTLiteral &>().value.safeGet<String>());
+        regexp_matcher->setPattern(regexp_node->as<ASTLiteral &>().value.get<String>());
 
         if (!transformers->children.empty())
         {
@@ -2398,7 +2309,7 @@ bool ParserTTLElement::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         if (!parser_string_literal.parse(pos, ast_space_name, expected))
             return false;
 
-        destination_name = ast_space_name->as<ASTLiteral &>().value.safeGet<const String &>();
+        destination_name = ast_space_name->as<ASTLiteral &>().value.get<const String &>();
     }
     else if (mode == TTLMode::GROUP_BY)
     {
diff --git a/src/Parsers/ExpressionElementParsers.h b/src/Parsers/ExpressionElementParsers.h
index 903111f32db..4e3f29bfe0c 100644
--- a/src/Parsers/ExpressionElementParsers.h
+++ b/src/Parsers/ExpressionElementParsers.h
@@ -9,7 +9,7 @@ namespace DB
 {
 
 
-/** The SELECT subquery, in parentheses.
+/** The SELECT subquery is in parenthesis.
   */
 class ParserSubquery : public IParserBase
 {
@@ -52,22 +52,11 @@ protected:
 
 
 /** An identifier, possibly containing a dot, for example, x_yz123 or `something special` or Hits.EventTime,
- *  possibly with UUID clause like `db name`.`table name` UUID 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'.
- *  There is also special delimiters `.:` and `.^` for JSON type subcolumns. In case of special delimiter
- *  the next identifier part after it will include special delimiter and be back quoted always: json.a.b.:UInt32 -> ['json', 'a', 'b', ':`UInt32`'].
- *  It's needed to distinguish identifiers json.a.b.:UInt32 and json.a.b.`:UInt32`.
- *  There is also a special syntax sugar for reading JSON subcolumns of type Array(JSON): json.a.b[][].c -> json.a.b.:Array(Array(JSON)).c
+ *  possibly with UUID clause like `db name`.`table name` UUID 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
   */
 class ParserCompoundIdentifier : public IParserBase
 {
 public:
-    enum class SpecialDelimiter : char
-    {
-        NONE = '\0',
-        JSON_PATH_DYNAMIC_TYPE = ':',
-        JSON_PATH_PREFIX = '^',
-    };
-
     explicit ParserCompoundIdentifier(bool table_name_with_optional_uuid_ = false, bool allow_query_parameter_ = false, Highlight highlight_type_ = Highlight::identifier)
         : table_name_with_optional_uuid(table_name_with_optional_uuid_), allow_query_parameter(allow_query_parameter_), highlight_type(highlight_type_)
     {
diff --git a/src/Parsers/ExpressionListParsers.cpp b/src/Parsers/ExpressionListParsers.cpp
index ad6b8e13ea6..f97c042e91e 100644
--- a/src/Parsers/ExpressionListParsers.cpp
+++ b/src/Parsers/ExpressionListParsers.cpp
@@ -2388,24 +2388,6 @@ bool ParserFunction::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     }
 }
 
-bool ParserExpressionWithOptionalArguments::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
-{
-    ParserIdentifier id_p;
-    ParserFunction func_p;
-
-    if (ParserFunction(false, false).parse(pos, node, expected))
-        return true;
-
-    if (ParserIdentifier().parse(pos, node, expected))
-    {
-        node = makeASTFunction(node->as<ASTIdentifier>()->name());
-        node->as<ASTFunction &>().no_empty_args = true;
-        return true;
-    }
-
-    return false;
-}
-
 const std::vector<std::pair<std::string_view, Operator>> ParserExpressionImpl::operators_table
 {
     {"->",            Operator("lambda",          1,  2, OperatorType::Lambda)},
@@ -2811,8 +2793,8 @@ Action ParserExpressionImpl::tryParseOperator(Layers & layers, IParser::Pos & po
     if (op.type == OperatorType::TupleElement)
     {
         ASTPtr tmp;
-        if (asterisk_parser.parse(pos, tmp, expected)
-            || columns_matcher_parser.parse(pos, tmp, expected))
+        if (asterisk_parser.parse(pos, tmp, expected) ||
+            columns_matcher_parser.parse(pos, tmp, expected))
         {
             if (auto * asterisk = tmp->as<ASTAsterisk>())
             {
@@ -2833,17 +2815,6 @@ Action ParserExpressionImpl::tryParseOperator(Layers & layers, IParser::Pos & po
             layers.back()->pushOperand(std::move(tmp));
             return Action::OPERATOR;
         }
-
-        /// If it is an identifier,
-        /// replace it with literal, because an expression `expr().elem`
-        /// should be transformed to `tupleElement(expr(), 'elem')` for query analysis,
-        /// otherwise the identifier `elem` will not be found.
-        if (ParserIdentifier().parse(pos, tmp, expected))
-        {
-            layers.back()->pushOperator(op);
-            layers.back()->pushOperand(std::make_shared<ASTLiteral>(tmp->as<ASTIdentifier>()->name()));
-            return Action::OPERATOR;
-        }
     }
 
     /// isNull & isNotNull are postfix unary operators
@@ -2874,7 +2845,7 @@ Action ParserExpressionImpl::tryParseOperator(Layers & layers, IParser::Pos & po
         layers.push_back(std::make_unique<ArrayElementLayer>());
 
     if (op.type == OperatorType::StartBetween || op.type == OperatorType::StartNotBetween)
-        ++layers.back()->between_counter;
+        layers.back()->between_counter++;
 
     return Action::OPERAND;
 }
diff --git a/src/Parsers/ExpressionListParsers.h b/src/Parsers/ExpressionListParsers.h
index 6ab38416f32..235d5782630 100644
--- a/src/Parsers/ExpressionListParsers.h
+++ b/src/Parsers/ExpressionListParsers.h
@@ -144,16 +144,6 @@ protected:
 };
 
 
-/** Similar to ParserFunction (and yields ASTFunction), but can also parse identifiers without braces.
-  */
-class ParserExpressionWithOptionalArguments : public IParserBase
-{
-protected:
-    const char * getName() const override { return "expression with optional parameters"; }
-    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
-};
-
-
 /** An expression with an infix binary left-associative operator.
   * For example, a + b - c + d.
   */
diff --git a/src/Parsers/FieldFromAST.cpp b/src/Parsers/FieldFromAST.cpp
index 64aeae1b570..ad1eab49eeb 100644
--- a/src/Parsers/FieldFromAST.cpp
+++ b/src/Parsers/FieldFromAST.cpp
@@ -1,4 +1,5 @@
 #include <Parsers/FieldFromAST.h>
+#include <Disks/getOrCreateDiskFromAST.h>
 #include <Parsers/formatAST.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
diff --git a/src/Parsers/FunctionSecretArgumentsFinderAST.h b/src/Parsers/FunctionSecretArgumentsFinderAST.h
index 94da30922cc..5b77485afb0 100644
--- a/src/Parsers/FunctionSecretArgumentsFinderAST.h
+++ b/src/Parsers/FunctionSecretArgumentsFinderAST.h
@@ -33,9 +33,7 @@ public:
         {
             case ASTFunction::Kind::ORDINARY_FUNCTION: findOrdinaryFunctionSecretArguments(); break;
             case ASTFunction::Kind::WINDOW_FUNCTION: break;
-            case ASTFunction::Kind::LAMBDA_FUNCTION: break;
-            case ASTFunction::Kind::CODEC: break;
-            case ASTFunction::Kind::STATISTICS: 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;
diff --git a/src/Parsers/IAST.cpp b/src/Parsers/IAST.cpp
index 54b11f2888e..37d7f458d61 100644
--- a/src/Parsers/IAST.cpp
+++ b/src/Parsers/IAST.cpp
@@ -165,21 +165,11 @@ size_t IAST::checkDepthImpl(size_t max_depth) const
     return res;
 }
 
-String IAST::formatWithPossiblyHidingSensitiveData(
-    size_t max_length,
-    bool one_line,
-    bool show_secrets,
-    bool print_pretty_type_names,
-    bool always_quote_identifiers,
-    IdentifierQuotingStyle identifier_quoting_style) const
+String IAST::formatWithPossiblyHidingSensitiveData(size_t max_length, bool one_line, bool show_secrets) const
 {
-
     WriteBufferFromOwnString buf;
     FormatSettings settings(buf, one_line);
     settings.show_secrets = show_secrets;
-    settings.print_pretty_type_names = print_pretty_type_names;
-    settings.always_quote_identifiers = always_quote_identifiers;
-    settings.identifier_quoting_style = identifier_quoting_style;
     format(settings);
     return wipeSensitiveDataAndCutToLength(buf.str(), max_length);
 }
@@ -257,34 +247,6 @@ void IAST::FormatSettings::writeIdentifier(const String & name) const
     }
 }
 
-
-void IAST::FormatSettings::quoteIdentifier(const String & name) const
-{
-    switch (identifier_quoting_style)
-    {
-        case IdentifierQuotingStyle::None:
-        {
-            writeBackQuotedString(name, ostr);
-            break;
-        }
-        case IdentifierQuotingStyle::Backticks:
-        {
-            writeBackQuotedString(name, ostr);
-            break;
-        }
-        case IdentifierQuotingStyle::DoubleQuotes:
-        {
-            writeDoubleQuotedString(name, ostr);
-            break;
-        }
-        case IdentifierQuotingStyle::BackticksMySQL:
-        {
-            writeBackQuotedStringMySQL(name, ostr);
-            break;
-        }
-    }
-}
-
 void IAST::dumpTree(WriteBuffer & ostr, size_t indent) const
 {
     String indent_str(indent, '-');
diff --git a/src/Parsers/IAST.h b/src/Parsers/IAST.h
index dfb6a6cbeba..ee70fed0f07 100644
--- a/src/Parsers/IAST.h
+++ b/src/Parsers/IAST.h
@@ -66,7 +66,7 @@ public:
     /** Set the alias. */
     virtual void setAlias(const String & /*to*/)
     {
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't set alias of {} of {}", getColumnName(), getID());
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't set alias of {}", getColumnName());
     }
 
     /** Get the text that identifies this element. */
@@ -201,7 +201,6 @@ public:
         bool show_secrets; /// Show secret parts of the AST (e.g. passwords, encryption keys).
         char nl_or_ws; /// Newline or whitespace.
         LiteralEscapingStyle literal_escaping_style;
-        bool print_pretty_type_names;
 
         explicit FormatSettings(
             WriteBuffer & ostr_,
@@ -210,8 +209,7 @@ public:
             bool always_quote_identifiers_ = false,
             IdentifierQuotingStyle identifier_quoting_style_ = IdentifierQuotingStyle::Backticks,
             bool show_secrets_ = true,
-            LiteralEscapingStyle literal_escaping_style_ = LiteralEscapingStyle::Regular,
-            bool print_pretty_type_names_ = false)
+            LiteralEscapingStyle literal_escaping_style_ = LiteralEscapingStyle::Regular)
             : ostr(ostr_)
             , one_line(one_line_)
             , hilite(hilite_)
@@ -220,7 +218,6 @@ public:
             , show_secrets(show_secrets_)
             , nl_or_ws(one_line ? ' ' : '\n')
             , literal_escaping_style(literal_escaping_style_)
-            , print_pretty_type_names(print_pretty_type_names_)
         {
         }
 
@@ -233,14 +230,10 @@ public:
             , show_secrets(other.show_secrets)
             , nl_or_ws(other.nl_or_ws)
             , literal_escaping_style(other.literal_escaping_style)
-            , print_pretty_type_names(other.print_pretty_type_names)
         {
         }
 
         void writeIdentifier(const String & name) const;
-        // Quote identifier `name` even when `always_quote_identifiers` is false.
-        // If `identifier_quoting_style` is `IdentifierQuotingStyle::None`, quote it with `IdentifierQuotingStyle::Backticks`
-        void quoteIdentifier(const String & name) const;
     };
 
     /// State. For example, a set of nodes can be remembered, which we already walk through.
@@ -258,12 +251,11 @@ public:
     /// The state that is copied when each node is formatted. For example, nesting level.
     struct FormatStateStacked
     {
-        UInt16 indent = 0;
+        UInt8 indent = 0;
         bool need_parens = false;
         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;
-        bool allow_operators = true; /// Format some functions, such as "plus", "in", etc. as operators.
         size_t list_element_index = 0;
         const IAST * current_select = nullptr;
     };
@@ -279,29 +271,24 @@ public:
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown element in AST: {}", getID());
     }
 
-    /// Secrets are displayed regarding show_secrets, then SensitiveDataMasker is applied.
-    /// You can use Interpreters/formatWithPossiblyHidingSecrets.h for convenience.
-    String formatWithPossiblyHidingSensitiveData(
-        size_t max_length,
-        bool one_line,
-        bool show_secrets,
-        bool print_pretty_type_names,
-        bool always_quote_identifiers,
-        IdentifierQuotingStyle identifier_quoting_style) const;
+    // Secrets are displayed regarding show_secrets, then SensitiveDataMasker is applied.
+    // You can use Interpreters/formatWithPossiblyHidingSecrets.h for convenience.
+    String formatWithPossiblyHidingSensitiveData(size_t max_length, bool one_line, bool show_secrets) const;
 
-    /** formatForLogging and formatForErrorMessage always hide secrets. This inconsistent
-      * behaviour is due to the fact such functions are called from Client which knows nothing about
-      * access rights and settings. Moreover, the only use case for displaying secrets are backups,
-      * and backup tools use only direct input and ignore logs and error messages.
-      */
+    /*
+     * formatForLogging and formatForErrorMessage always hide secrets. This inconsistent
+     * behaviour is due to the fact such functions are called from Client which knows nothing about
+     * access rights and settings. Moreover, the only use case for displaying secrets are backups,
+     * and backup tools use only direct input and ignore logs and error messages.
+     */
     String formatForLogging(size_t max_length = 0) const
     {
-        return formatWithPossiblyHidingSensitiveData(max_length, true, false, false, false, IdentifierQuotingStyle::Backticks);
+        return formatWithPossiblyHidingSensitiveData(max_length, true, false);
     }
 
     String formatForErrorMessage() const
     {
-        return formatWithPossiblyHidingSensitiveData(0, true, false, false, false, IdentifierQuotingStyle::Backticks);
+        return formatWithPossiblyHidingSensitiveData(0, true, false);
     }
 
     virtual bool hasSecretParts() const { return childrenHaveSecretParts(); }
diff --git a/src/Parsers/Lexer.cpp b/src/Parsers/Lexer.cpp
index 43c4ab867d1..b4601389696 100644
--- a/src/Parsers/Lexer.cpp
+++ b/src/Parsers/Lexer.cpp
@@ -423,8 +423,6 @@ Token Lexer::nextTokenImpl()
         }
         case '?':
             return Token(TokenType::QuestionMark, token_begin, ++pos);
-        case '^':
-            return Token(TokenType::Caret, token_begin, ++pos);
         case ':':
         {
             ++pos;
diff --git a/src/Parsers/Lexer.h b/src/Parsers/Lexer.h
index 9dc0850abfd..6f31d56292d 100644
--- a/src/Parsers/Lexer.h
+++ b/src/Parsers/Lexer.h
@@ -45,7 +45,6 @@ namespace DB
     M(Arrow)                  /** ->. Should be distinguished from minus operator. */ \
     M(QuestionMark) \
     M(Colon) \
-    M(Caret) \
     M(DoubleColon) \
     M(Equals) \
     M(NotEquals) \
diff --git a/src/Parsers/MySQL/tests/gtest_column_parser.cpp b/src/Parsers/MySQL/tests/gtest_column_parser.cpp
index 3a9a0690f06..21c37e4ee2e 100644
--- a/src/Parsers/MySQL/tests/gtest_column_parser.cpp
+++ b/src/Parsers/MySQL/tests/gtest_column_parser.cpp
@@ -1,14 +1,13 @@
 #include <gtest/gtest.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTDataType.h>
+#include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/MySQL/ASTDeclareColumn.h>
 #include <Parsers/MySQL/ASTDeclareOption.h>
 #include <Parsers/MySQL/ASTDeclareReference.h>
 #include <Parsers/MySQL/ASTDeclareConstraint.h>
 
-
 using namespace DB;
 using namespace DB::MySQLParser;
 
@@ -20,8 +19,8 @@ TEST(ParserColumn, AllNonGeneratedColumnOption)
                    "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, 0);
     EXPECT_EQ(ast->as<ASTDeclareColumn>()->name, "col_01");
-    EXPECT_EQ(ast->as<ASTDeclareColumn>()->data_type->as<ASTDataType>()->name, "VARCHAR");
-    EXPECT_EQ(ast->as<ASTDeclareColumn>()->data_type->as<ASTDataType>()->arguments->children[0]->as<ASTLiteral>()->value.safeGet<UInt64>(), 100);
+    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);
 
     ASTDeclareOptions * declare_options = ast->as<ASTDeclareColumn>()->column_options->as<ASTDeclareOptions>();
     EXPECT_EQ(declare_options->changes["is_null"]->as<ASTLiteral>()->value.safeGet<UInt64>(), 0);
@@ -45,8 +44,8 @@ TEST(ParserColumn, AllGeneratedColumnOption)
                    "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, 0);
     EXPECT_EQ(ast->as<ASTDeclareColumn>()->name, "col_01");
-    EXPECT_EQ(ast->as<ASTDeclareColumn>()->data_type->as<ASTDataType>()->name, "VARCHAR");
-    EXPECT_EQ(ast->as<ASTDeclareColumn>()->data_type->as<ASTDataType>()->arguments->children[0]->as<ASTLiteral>()->value.safeGet<UInt64>(), 100);
+    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);
 
     ASTDeclareOptions * declare_options = ast->as<ASTDeclareColumn>()->column_options->as<ASTDeclareOptions>();
     EXPECT_EQ(declare_options->changes["is_null"]->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
diff --git a/src/Parsers/ParserAlterQuery.cpp b/src/Parsers/ParserAlterQuery.cpp
index 0c8f05c90d2..28dbf781011 100644
--- a/src/Parsers/ParserAlterQuery.cpp
+++ b/src/Parsers/ParserAlterQuery.cpp
@@ -1,8 +1,6 @@
+#include <Common/typeid_cast.h>
+#include <Parsers/ParserStringAndSubstitution.h>
 #include <Parsers/ParserAlterQuery.h>
-
-#include <Parsers/ASTAlterQuery.h>
-#include <Parsers/ASTColumnDeclaration.h>
-#include <Parsers/ASTLiteral.h>
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/ExpressionListParsers.h>
@@ -11,19 +9,16 @@
 #include <Parsers/ParserRefreshStrategy.h>
 #include <Parsers/ParserSelectWithUnionQuery.h>
 #include <Parsers/ParserSetQuery.h>
-#include <Parsers/ParserStringAndSubstitution.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTIndexDeclaration.h>
+#include <Parsers/ASTAlterQuery.h>
+#include <Parsers/ASTLiteral.h>
 #include <Parsers/parseDatabaseAndTableName.h>
-#include <Common/typeid_cast.h>
 
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-extern const int SYNTAX_ERROR;
-}
-
 bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     auto command = std::make_shared<ASTAlterCommand>();
@@ -129,6 +124,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     ParserCompoundIdentifier parser_name;
     ParserStringLiteral parser_string_literal;
     ParserStringAndSubstitution parser_string_and_substituion;
+    ParserIdentifier parser_remove_property;
     ParserCompoundColumnDeclaration parser_col_decl;
     ParserIndexDeclaration parser_idx_decl;
     ParserStatisticsDeclaration parser_stat_decl;
@@ -523,7 +519,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (!parser_string_literal.parse(pos, ast_space_name, expected))
                     return false;
 
-                command->move_destination_name = ast_space_name->as<ASTLiteral &>().value.safeGet<const String &>();
+                command->move_destination_name = ast_space_name->as<ASTLiteral &>().value.get<const String &>();
             }
             else if (s_move_partition.ignore(pos, expected))
             {
@@ -551,7 +547,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                     if (!parser_string_literal.parse(pos, ast_space_name, expected))
                         return false;
 
-                    command->move_destination_name = ast_space_name->as<ASTLiteral &>().value.safeGet<const String &>();
+                    command->move_destination_name = ast_space_name->as<ASTLiteral &>().value.get<const String &>();
                 }
             }
             else if (s_add_constraint.ignore(pos, expected))
@@ -644,7 +640,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (!parser_string_literal.parse(pos, ast_from, expected))
                     return false;
 
-                command->from = ast_from->as<ASTLiteral &>().value.safeGet<const String &>();
+                command->from = ast_from->as<ASTLiteral &>().value.get<const String &>();
                 command->type = ASTAlterCommand::FETCH_PARTITION;
             }
             else if (s_fetch_part.ignore(pos, expected))
@@ -658,7 +654,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 ASTPtr ast_from;
                 if (!parser_string_literal.parse(pos, ast_from, expected))
                     return false;
-                command->from = ast_from->as<ASTLiteral &>().value.safeGet<const String &>();
+                command->from = ast_from->as<ASTLiteral &>().value.get<const String &>();
                 command->part = true;
                 command->type = ASTAlterCommand::FETCH_PARTITION;
             }
@@ -686,7 +682,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                     if (!parser_string_literal.parse(pos, ast_with_name, expected))
                         return false;
 
-                    command->with_name = ast_with_name->as<ASTLiteral &>().value.safeGet<const String &>();
+                    command->with_name = ast_with_name->as<ASTLiteral &>().value.get<const String &>();
                 }
             }
             else if (s_unfreeze.ignore(pos, expected))
@@ -713,7 +709,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                     if (!parser_string_literal.parse(pos, ast_with_name, expected))
                         return false;
 
-                    command->with_name = ast_with_name->as<ASTLiteral &>().value.safeGet<const String &>();
+                    command->with_name = ast_with_name->as<ASTLiteral &>().value.get<const String &>();
                 }
                 else
                 {
@@ -731,21 +727,8 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (!parser_modify_col_decl.parse(pos, command_col_decl, expected))
                     return false;
 
-                auto check_no_type = [&](const std::string_view keyword)
-                {
-                    const auto & column_decl = command_col_decl->as<const ASTColumnDeclaration &>();
-
-                    if (!column_decl.children.empty() || column_decl.null_modifier.has_value() || !column_decl.default_specifier.empty()
-                        || column_decl.ephemeral_default || column_decl.primary_key_specifier)
-                    {
-                        throw Exception(ErrorCodes::SYNTAX_ERROR, "Cannot specify column properties before '{}'", keyword);
-                    }
-                };
-
                 if (s_remove.ignore(pos, expected))
                 {
-                    check_no_type(s_remove.getName());
-
                     if (s_default.ignore(pos, expected))
                         command->remove_property = toStringView(Keyword::DEFAULT);
                     else if (s_materialized.ignore(pos, expected))
@@ -765,15 +748,11 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 }
                 else if (s_modify_setting.ignore(pos, expected))
                 {
-                    check_no_type(s_modify_setting.getName());
-
                     if (!parser_settings.parse(pos, command_settings_changes, expected))
                         return false;
                 }
                 else if (s_reset_setting.ignore(pos, expected))
                 {
-                    check_no_type(s_reset_setting.getName());
-
                     if (!parser_reset_setting.parse(pos, command_settings_resets, expected))
                         return false;
                 }
@@ -788,11 +767,6 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                     }
                 }
                 command->type = ASTAlterCommand::MODIFY_COLUMN;
-
-                /// Make sure that type is not populated when REMOVE/MODIFY SETTING/RESET SETTING is used, because we wouldn't modify the type, which can be confusing
-                chassert(
-                    nullptr == command_col_decl->as<const ASTColumnDeclaration &>().type
-                    || (command->remove_property.empty() && nullptr == command_settings_changes && nullptr == command_settings_resets));
             }
             else if (s_modify_order_by.ignore(pos, expected))
             {
diff --git a/src/Parsers/ParserCheckQuery.cpp b/src/Parsers/ParserCheckQuery.cpp
index 33b6a5a1ac2..42716ba7f2c 100644
--- a/src/Parsers/ParserCheckQuery.cpp
+++ b/src/Parsers/ParserCheckQuery.cpp
@@ -55,7 +55,7 @@ bool ParserCheckQuery::parseCheckTable(Pos & pos, ASTPtr & node, Expected & expe
         const auto * ast_literal = ast_part_name->as<ASTLiteral>();
         if (!ast_literal || ast_literal->value.getType() != Field::Types::String)
             return false;
-        query->part_name = ast_literal->value.safeGet<const String &>();
+        query->part_name = ast_literal->value.get<const String &>();
     }
 
     if (query->database)
diff --git a/src/Parsers/ParserCreateIndexQuery.cpp b/src/Parsers/ParserCreateIndexQuery.cpp
index ed89b80edca..2fa34696c58 100644
--- a/src/Parsers/ParserCreateIndexQuery.cpp
+++ b/src/Parsers/ParserCreateIndexQuery.cpp
@@ -7,9 +7,9 @@
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ExpressionListParsers.h>
+#include <Parsers/ParserDataType.h>
 #include <Parsers/parseDatabaseAndTableName.h>
 
-
 namespace DB
 {
 
@@ -21,7 +21,7 @@ bool ParserCreateIndexDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected
     ParserToken close_p(TokenType::ClosingRoundBracket);
     ParserOrderByExpressionList order_list_p;
 
-    ParserExpressionWithOptionalArguments type_p;
+    ParserDataType data_type_p;
     ParserExpression expression_p;
     ParserUnsignedInteger granularity_p;
 
@@ -68,7 +68,7 @@ bool ParserCreateIndexDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected
 
     if (s_type.ignore(pos, expected))
     {
-        if (!type_p.parse(pos, type, expected))
+        if (!data_type_p.parse(pos, type, expected))
             return false;
     }
 
@@ -89,8 +89,10 @@ bool ParserCreateIndexDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected
     else
     {
         auto index_type = index->getType();
-        if (index_type && index_type->name == "vector_similarity")
-            index->granularity = ASTIndexDeclaration::DEFAULT_VECTOR_SIMILARITY_INDEX_GRANULARITY;
+        if (index_type && index_type->name == "annoy")
+            index->granularity = ASTIndexDeclaration::DEFAULT_ANNOY_INDEX_GRANULARITY;
+        else if (index_type && index_type->name == "usearch")
+            index->granularity = ASTIndexDeclaration::DEFAULT_USEARCH_INDEX_GRANULARITY;
         else
             index->granularity = ASTIndexDeclaration::DEFAULT_INDEX_GRANULARITY;
     }
diff --git a/src/Parsers/ParserCreateQuery.cpp b/src/Parsers/ParserCreateQuery.cpp
index 31dc2075db4..41379a845e7 100644
--- a/src/Parsers/ParserCreateQuery.cpp
+++ b/src/Parsers/ParserCreateQuery.cpp
@@ -5,7 +5,6 @@
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTForeignKeyDeclaration.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTDataType.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTIndexDeclaration.h>
 #include <Parsers/ASTStatisticsDeclaration.h>
@@ -53,6 +52,40 @@ ASTPtr parseComment(IParser::Pos & pos, Expected & expected)
 
 }
 
+
+bool ParserNestedTable::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    ParserToken open(TokenType::OpeningRoundBracket);
+    ParserToken close(TokenType::ClosingRoundBracket);
+    ParserIdentifier name_p;
+    ParserNameTypePairList columns_p;
+
+    ASTPtr name;
+    ASTPtr columns;
+
+    /// For now `name == 'Nested'`, probably alternative nested data structures will appear
+    if (!name_p.parse(pos, name, expected))
+        return false;
+
+    if (!open.ignore(pos, expected))
+        return false;
+
+    if (!columns_p.parse(pos, columns, expected))
+        return false;
+
+    if (!close.ignore(pos, expected))
+        return false;
+
+    auto func = std::make_shared<ASTFunction>();
+    tryGetIdentifierNameInto(name, func->name);
+    // FIXME(ilezhankin): func->no_empty_args = true; ?
+    func->arguments = columns;
+    func->children.push_back(columns);
+    node = func;
+
+    return true;
+}
+
 bool ParserSQLSecurity::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     ParserToken s_eq(TokenType::Equals);
@@ -146,7 +179,7 @@ bool ParserIndexDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     ParserKeyword s_granularity(Keyword::GRANULARITY);
 
     ParserIdentifier name_p;
-    ParserExpressionWithOptionalArguments type_p;
+    ParserDataType data_type_p;
     ParserExpression expression_p;
     ParserUnsignedInteger granularity_p;
 
@@ -164,7 +197,7 @@ bool ParserIndexDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     if (!s_type.ignore(pos, expected))
         return false;
 
-    if (!type_p.parse(pos, type, expected))
+    if (!data_type_p.parse(pos, type, expected))
         return false;
 
     if (s_granularity.ignore(pos, expected))
@@ -180,8 +213,10 @@ bool ParserIndexDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     else
     {
         auto index_type = index->getType();
-        if (index_type->name == "vector_similarity")
-            index->granularity = ASTIndexDeclaration::DEFAULT_VECTOR_SIMILARITY_INDEX_GRANULARITY;
+        if (index_type->name == "annoy")
+            index->granularity = ASTIndexDeclaration::DEFAULT_ANNOY_INDEX_GRANULARITY;
+        else if (index_type->name == "usearch")
+            index->granularity = ASTIndexDeclaration::DEFAULT_USEARCH_INDEX_GRANULARITY;
         else
             index->granularity = ASTIndexDeclaration::DEFAULT_INDEX_GRANULARITY;
     }
@@ -196,7 +231,7 @@ bool ParserStatisticsDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected &
     ParserKeyword s_type(Keyword::TYPE);
 
     ParserList columns_p(std::make_unique<ParserIdentifier>(), std::make_unique<ParserToken>(TokenType::Comma), false);
-    ParserList types_p(std::make_unique<ParserExpressionWithOptionalArguments>(), std::make_unique<ParserToken>(TokenType::Comma), false);
+    ParserList types_p(std::make_unique<ParserDataType>(), std::make_unique<ParserToken>(TokenType::Comma), false);
 
     ASTPtr columns;
     ASTPtr types;
@@ -660,7 +695,6 @@ bool ParserCreateTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     ASTPtr table;
     ASTPtr columns_list;
     std::shared_ptr<ASTStorage> storage;
-    bool is_time_series_table = false;
     ASTPtr targets;
     ASTPtr as_database;
     ASTPtr as_table;
@@ -717,7 +751,7 @@ bool ParserCreateTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
 
     auto * table_id = table->as<ASTTableIdentifier>();
 
-    /// A shortcut for ATTACH a previously detached table.
+    // Shortcut for ATTACH a previously detached table
     bool short_attach = attach && !from_path;
     if (short_attach && (!pos.isValid() || pos.get().type == TokenType::Semicolon))
     {
@@ -749,13 +783,6 @@ bool ParserCreateTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
             return false;
 
         storage = typeid_cast<std::shared_ptr<ASTStorage>>(ast);
-
-        if (storage && storage->engine && (storage->engine->name == "TimeSeries"))
-        {
-            is_time_series_table = true;
-            ParserViewTargets({ViewTarget::Data, ViewTarget::Tags, ViewTarget::Metrics}).parse(pos, targets, expected);
-        }
-
         return true;
     };
 
@@ -845,7 +872,6 @@ bool ParserCreateTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     query->create_or_replace = or_replace;
     query->if_not_exists = if_not_exists;
     query->temporary = is_temporary;
-    query->is_time_series_table = is_time_series_table;
 
     query->database = table_id->getDatabase();
     query->table = table_id->getTable();
@@ -895,7 +921,7 @@ bool ParserCreateTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     query->is_create_empty = is_create_empty;
 
     if (from_path)
-        query->attach_from_path = from_path->as<ASTLiteral &>().value.safeGet<String>();
+        query->attach_from_path = from_path->as<ASTLiteral &>().value.get<String>();
 
     return true;
 }
@@ -1181,7 +1207,6 @@ bool ParserCreateWindowViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
     if (!select_p.parse(pos, select, expected))
         return false;
 
-    auto comment = parseComment(pos, expected);
 
     auto query = std::make_shared<ASTCreateQuery>();
     node = query;
@@ -1200,8 +1225,6 @@ bool ParserCreateWindowViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
         query->children.push_back(query->database);
     if (query->table)
         query->children.push_back(query->table);
-    if (comment)
-        query->set(query->comment, comment);
 
     query->set(query->columns_list, columns_list);
 
@@ -1404,7 +1427,7 @@ bool ParserCreateDatabaseQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & e
         ASTPtr ast_uuid;
         if (!uuid_p.parse(pos, ast_uuid, expected))
             return false;
-        uuid = parseFromString<UUID>(ast_uuid->as<ASTLiteral>()->value.safeGet<String>());
+        uuid = parseFromString<UUID>(ast_uuid->as<ASTLiteral>()->value.get<String>());
     }
 
     if (s_on.ignore(pos, expected))
diff --git a/src/Parsers/ParserCreateQuery.h b/src/Parsers/ParserCreateQuery.h
index 82da2e7ea0b..bb37491a366 100644
--- a/src/Parsers/ParserCreateQuery.h
+++ b/src/Parsers/ParserCreateQuery.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTDataType.h>
 #include <Parsers/ASTColumnDeclaration.h>
 #include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTLiteral.h>
@@ -14,10 +13,18 @@
 #include <Parsers/ParserSetQuery.h>
 #include <Poco/String.h>
 
-
 namespace DB
 {
 
+/** A nested table. For example, Nested(UInt32 CounterID, FixedString(2) UserAgentMajor)
+  */
+class ParserNestedTable : public IParserBase
+{
+protected:
+    const char * getName() const override { return "nested table"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+
 /** Parses sql security option. DEFINER = user_name SQL SECURITY DEFINER
  */
 class ParserSQLSecurity : public IParserBase
@@ -94,15 +101,17 @@ class IParserColumnDeclaration : public IParserBase
 {
 public:
     explicit IParserColumnDeclaration(bool require_type_ = true, bool allow_null_modifiers_ = false, bool check_keywords_after_name_ = false)
-        : require_type(require_type_)
-        , allow_null_modifiers(allow_null_modifiers_)
-        , check_keywords_after_name(check_keywords_after_name_)
+    : require_type(require_type_)
+    , allow_null_modifiers(allow_null_modifiers_)
+    , check_keywords_after_name(check_keywords_after_name_)
     {
     }
 
     void enableCheckTypeKeyword() { check_type_keyword = true; }
 
 protected:
+    using ASTDeclarePtr = std::shared_ptr<ASTColumnDeclaration>;
+
     const char * getName() const  override{ return "column declaration"; }
 
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
@@ -261,8 +270,9 @@ bool IParserColumnDeclaration<NameParser>::parseImpl(Pos & pos, ASTPtr & node, E
             auto default_function = std::make_shared<ASTFunction>();
             default_function->name = "defaultValueOfTypeName";
             default_function->arguments = std::make_shared<ASTExpressionList>();
-            /// Ephemeral columns don't really have secrets but we need to format into a String, hence the strange call
-            default_function->arguments->children.emplace_back(std::make_shared<ASTLiteral>(type->as<ASTDataType>()->formatForLogging()));
+            // Ephemeral columns don't really have secrets but we need to format
+            // into a String, hence the strange call
+            default_function->arguments->children.emplace_back(std::make_shared<ASTLiteral>(type->as<ASTFunction>()->formatForLogging()));
             default_expression = default_function;
         }
 
diff --git a/src/Parsers/ParserDataType.cpp b/src/Parsers/ParserDataType.cpp
index d86b659df90..ad33c7e4558 100644
--- a/src/Parsers/ParserDataType.cpp
+++ b/src/Parsers/ParserDataType.cpp
@@ -1,10 +1,9 @@
 #include <Parsers/ParserDataType.h>
 
 #include <boost/algorithm/string/case_conv.hpp>
-#include <Parsers/ASTDataType.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTIdentifier_fwd.h>
-#include <Parsers/ASTObjectTypeArgument.h>
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/ParserCreateQuery.h>
@@ -17,8 +16,8 @@ namespace DB
 namespace
 {
 
-/// Parser of Dynamic type argument: Dynamic(max_types=N)
-class DynamicArgumentParser : public IParserBase
+/// Parser of Dynamic type arguments: Dynamic(max_types=N)
+class DynamicArgumentsParser : public IParserBase
 {
 private:
     const char * getName() const override { return "Dynamic data type optional argument"; }
@@ -47,84 +46,56 @@ private:
     }
 };
 
-/// Parser of Object type argument. For example: JSON(some_parameter=N, some.path SomeType, SKIP skip.path, ...)
-class ObjectArgumentParser : public IParserBase
+/// Wrapper to allow mixed lists of nested and normal types.
+/// Parameters are either:
+/// - Nested table elements;
+/// - Enum element in form of 'a' = 1;
+/// - literal;
+/// - Dynamic type arguments;
+/// - another data type (or identifier);
+class ParserDataTypeArgument : public IParserBase
 {
+public:
+    explicit ParserDataTypeArgument(std::string_view type_name_) : type_name(type_name_)
+    {
+    }
+
 private:
-    const char * getName() const override { return "JSON data type optional argument"; }
+    const char * getName() const override { return "data type argument"; }
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override
     {
-        auto argument = std::make_shared<ASTObjectTypeArgument>();
-
-        /// SKIP arguments
-        if (ParserKeyword(Keyword::SKIP).ignore(pos))
+        if (type_name == "Dynamic")
         {
-            /// SKIP REGEXP '<some_regexp>'
-            if (ParserKeyword(Keyword::REGEXP).ignore(pos))
-            {
-                ParserStringLiteral literal_parser;
-                ASTPtr literal;
-                if (!literal_parser.parse(pos, literal, expected))
-                    return false;
-                argument->skip_path_regexp = literal;
-                argument->children.push_back(argument->skip_path_regexp);
-            }
-            /// SKIP some.path
-            else
-            {
-                ParserCompoundIdentifier compound_identifier_parser;
-                ASTPtr compound_identifier;
-                if (!compound_identifier_parser.parse(pos, compound_identifier, expected))
-                    return false;
-
-                argument->skip_path = compound_identifier;
-                argument->children.push_back(argument->skip_path);
-            }
-
-            node = argument;
-            return true;
+            DynamicArgumentsParser parser;
+            return parser.parse(pos, node, expected);
         }
 
-        ParserCompoundIdentifier compound_identifier_parser;
-        ASTPtr identifier;
-        if (!compound_identifier_parser.parse(pos, identifier, expected))
-            return false;
+        ParserNestedTable nested_parser;
+        ParserDataType data_type_parser;
+        ParserAllCollectionsOfLiterals literal_parser(false);
 
-        /// some_parameter=N
-        if (pos->type == TokenType::Equals)
-        {
-            ++pos;
-            ASTPtr number;
-            ParserNumber number_parser;
-            if (!number_parser.parse(pos, number, expected))
-                return false;
+        const char * operators[] = {"=", "equals", nullptr};
+        ParserLeftAssociativeBinaryOperatorList enum_parser(operators, std::make_unique<ParserLiteral>());
 
-            argument->parameter = makeASTFunction("equals", identifier, number);
-            argument->children.push_back(argument->parameter);
-            node = argument;
-            return true;
-        }
+        if (pos->type == TokenType::BareWord && std::string_view(pos->begin, pos->size()) == "Nested")
+            return nested_parser.parse(pos, node, expected);
 
-        ParserDataType type_parser;
-        ASTPtr type;
-        if (!type_parser.parse(pos, type, expected))
-            return false;
-
-        auto name_and_type = std::make_shared<ASTNameTypePair>();
-        name_and_type->name = getIdentifierName(identifier);
-        name_and_type->type = type;
-        name_and_type->children.push_back(name_and_type->type);
-        argument->path_with_type = name_and_type;
-        argument->children.push_back(argument->path_with_type);
-        node = argument;
-        return true;
+        return enum_parser.parse(pos, node, expected)
+            || literal_parser.parse(pos, node, expected)
+            || data_type_parser.parse(pos, node, expected);
     }
+
+    std::string_view type_name;
 };
 
 }
 
 bool ParserDataType::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
+    ParserNestedTable nested;
+    if (nested.parse(pos, node, expected))
+        return true;
+
     String type_name;
 
     ParserIdentifier name_parser;
@@ -227,123 +198,34 @@ bool ParserDataType::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         }
     }
 
-    auto data_type_node = std::make_shared<ASTDataType>();
-    data_type_node->name = type_name;
+    auto function_node = std::make_shared<ASTFunction>();
+    function_node->name = type_name;
+    function_node->no_empty_args = true;
 
     if (pos->type != TokenType::OpeningRoundBracket)
     {
-        node = data_type_node;
+        node = function_node;
         return true;
     }
     ++pos;
 
     /// Parse optional parameters
-    ASTPtr expr_list_args = std::make_shared<ASTExpressionList>();
-
-    /// Allow mixed lists of nested and normal types.
-    /// Parameters are either:
-    /// - Nested table element;
-    /// - Tuple element
-    /// - Enum element in form of 'a' = 1;
-    /// - literal;
-    /// - Dynamic type argument;
-    /// - JSON type argument;
-    /// - another data type (or identifier);
-
-    size_t arg_num = 0;
-    bool have_version_of_aggregate_function = false;
-    while (true)
-    {
-        if (arg_num > 0)
-        {
-            if (pos->type == TokenType::Comma)
-                ++pos;
-            else
-                break;
-        }
-
-        ASTPtr arg;
-        if (type_name == "Dynamic")
-        {
-            DynamicArgumentParser parser;
-            parser.parse(pos, arg, expected);
-        }
-        else if (type_name == "JSON")
-        {
-            ObjectArgumentParser parser;
-            parser.parse(pos, arg, expected);
-        }
-        else if (type_name == "Nested")
-        {
-            ParserNameTypePair name_and_type_parser;
-            name_and_type_parser.parse(pos, arg, expected);
-        }
-        else if (type_name == "Tuple")
-        {
-            ParserNameTypePair name_and_type_parser;
-            ParserDataType only_type_parser;
-            name_and_type_parser.parse(pos, arg, expected) || only_type_parser.parse(pos, arg, expected);
-        }
-        else if (type_name == "AggregateFunction" || type_name == "SimpleAggregateFunction")
-        {
-            /// This is less trivial.
-            /// The first optional argument for AggregateFunction is a numeric literal, defining the version.
-            /// The next argument is the function name, optionally with parameters.
-            /// Subsequent arguments are data types.
-
-            if (arg_num == 0 && type_name == "AggregateFunction")
-            {
-                ParserUnsignedInteger version_parser;
-                if (version_parser.parse(pos, arg, expected))
-                {
-                    have_version_of_aggregate_function = true;
-                    expr_list_args->children.emplace_back(std::move(arg));
-                    ++arg_num;
-                    continue;
-                }
-            }
-
-            if (arg_num == (have_version_of_aggregate_function ? 1 : 0))
-            {
-                ParserFunction function_parser;
-                ParserIdentifier identifier_parser;
-                function_parser.parse(pos, arg, expected)
-                    || identifier_parser.parse(pos, arg, expected);
-            }
-            else
-            {
-                ParserDataType data_type_parser;
-                data_type_parser.parse(pos, arg, expected);
-            }
-        }
-        else
-        {
-            ParserDataType data_type_parser;
-            ParserAllCollectionsOfLiterals literal_parser(false);
-
-            const char * operators[] = {"=", "equals", nullptr};
-            ParserLeftAssociativeBinaryOperatorList enum_parser(operators, std::make_unique<ParserLiteral>());
-
-            enum_parser.parse(pos, arg, expected)
-               || literal_parser.parse(pos, arg, expected)
-               || data_type_parser.parse(pos, arg, expected);
-        }
-
-        if (!arg)
-            break;
-
-        expr_list_args->children.emplace_back(std::move(arg));
-        ++arg_num;
-    }
+    ParserList args_parser(std::make_unique<ParserDataTypeArgument>(type_name), std::make_unique<ParserToken>(TokenType::Comma));
+    ASTPtr expr_list_args;
 
+    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;
 
-    data_type_node->arguments = expr_list_args;
-    data_type_node->children.push_back(data_type_node->arguments);
+    function_node->arguments = expr_list_args;
+    function_node->children.push_back(function_node->arguments);
 
-    node = data_type_node;
+    node = function_node;
     return true;
 }
 
diff --git a/src/Parsers/ParserDeleteQuery.cpp b/src/Parsers/ParserDeleteQuery.cpp
index d7cdcd920ad..00fac45c8ed 100644
--- a/src/Parsers/ParserDeleteQuery.cpp
+++ b/src/Parsers/ParserDeleteQuery.cpp
@@ -3,7 +3,6 @@
 #include <Parsers/parseDatabaseAndTableName.h>
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/ParserSetQuery.h>
-#include <Parsers/ParserPartition.h>
 
 
 namespace DB
@@ -16,14 +15,11 @@ bool ParserDeleteQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     ParserKeyword s_delete(Keyword::DELETE);
     ParserKeyword s_from(Keyword::FROM);
-    ParserKeyword s_in_partition(Keyword::IN_PARTITION);
     ParserKeyword s_where(Keyword::WHERE);
     ParserExpression parser_exp_elem;
     ParserKeyword s_settings(Keyword::SETTINGS);
     ParserKeyword s_on{Keyword::ON};
 
-    ParserPartition parser_partition;
-
     if (s_delete.ignore(pos, expected))
     {
         if (!s_from.ignore(pos, expected))
@@ -40,12 +36,6 @@ bool ParserDeleteQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             query->cluster = cluster_str;
         }
 
-        if (s_in_partition.ignore(pos, expected))
-        {
-            if (!parser_partition.parse(pos, query->partition, expected))
-                return false;
-        }
-
         if (!s_where.ignore(pos, expected))
             return false;
 
@@ -63,9 +53,6 @@ bool ParserDeleteQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     else
         return false;
 
-    if (query->partition)
-        query->children.push_back(query->partition);
-
     if (query->predicate)
         query->children.push_back(query->predicate);
 
diff --git a/src/Parsers/ParserDescribeTableQuery.cpp b/src/Parsers/ParserDescribeTableQuery.cpp
index 22bbfdb03e1..92c0cfacd9b 100644
--- a/src/Parsers/ParserDescribeTableQuery.cpp
+++ b/src/Parsers/ParserDescribeTableQuery.cpp
@@ -11,12 +11,15 @@
 namespace DB
 {
 
+
 bool ParserDescribeTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     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);
 
     ASTPtr database;
@@ -50,4 +53,5 @@ bool ParserDescribeTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & ex
     return true;
 }
 
+
 }
diff --git a/src/Parsers/ParserDictionary.cpp b/src/Parsers/ParserDictionary.cpp
index ce38d1b54d1..83a006231d9 100644
--- a/src/Parsers/ParserDictionary.cpp
+++ b/src/Parsers/ParserDictionary.cpp
@@ -33,7 +33,7 @@ bool ParserDictionaryLifetime::parseImpl(Pos & pos, ASTPtr & node, Expected & ex
         if (literal.value.getType() != Field::Types::UInt64)
             return false;
 
-        res->max_sec = literal.value.safeGet<UInt64>();
+        res->max_sec = literal.value.get<UInt64>();
         node = res;
         return true;
     }
@@ -58,10 +58,10 @@ bool ParserDictionaryLifetime::parseImpl(Pos & pos, ASTPtr & node, Expected & ex
             return false;
 
         if (pair.first == "min")
-            res->min_sec = literal->value.safeGet<UInt64>();
+            res->min_sec = literal->value.get<UInt64>();
         else if (pair.first == "max")
         {
-            res->max_sec = literal->value.safeGet<UInt64>();
+            res->max_sec = literal->value.get<UInt64>();
             initialized_max = true;
         }
         else
diff --git a/src/Parsers/ParserPartition.cpp b/src/Parsers/ParserPartition.cpp
index ab97b3d0e3b..80a28f4803e 100644
--- a/src/Parsers/ParserPartition.cpp
+++ b/src/Parsers/ParserPartition.cpp
@@ -65,7 +65,7 @@ bool ParserPartition::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             {
                 if (literal_ast->value.getType() == Field::Types::Tuple)
                 {
-                    fields_count = literal_ast->value.safeGet<const Tuple &>().size();
+                    fields_count = literal_ast->value.get<const Tuple &>().size();
                 }
                 else
                 {
diff --git a/src/Parsers/ParserRefreshStrategy.cpp b/src/Parsers/ParserRefreshStrategy.cpp
index 4f3b7c66558..e7912293d85 100644
--- a/src/Parsers/ParserRefreshStrategy.cpp
+++ b/src/Parsers/ParserRefreshStrategy.cpp
@@ -96,10 +96,6 @@ bool ParserRefreshStrategy::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
             return false;
         refresh->set(refresh->settings, settings);
     }
-
-    if (ParserKeyword{Keyword::APPEND}.ignore(pos, expected))
-        refresh->append = true;
-
     node = refresh;
     return true;
 }
diff --git a/src/Parsers/ParserSystemQuery.cpp b/src/Parsers/ParserSystemQuery.cpp
index af84dd10bfa..0545c3e5568 100644
--- a/src/Parsers/ParserSystemQuery.cpp
+++ b/src/Parsers/ParserSystemQuery.cpp
@@ -421,7 +421,6 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
             break;
 
         case Type::REFRESH_VIEW:
-        case Type::WAIT_VIEW:
         case Type::START_VIEW:
         case Type::STOP_VIEW:
         case Type::CANCEL_VIEW:
@@ -446,7 +445,7 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
             ASTPtr ast;
             if (!ParserStringLiteral{}.parse(pos, ast, expected))
                 return false;
-            String time_str = ast->as<ASTLiteral &>().value.safeGet<const String &>();
+            String time_str = ast->as<ASTLiteral &>().value.get<const String &>();
             ReadBufferFromString buf(time_str);
             time_t time;
             readDateTimeText(time, buf);
@@ -468,17 +467,7 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
                 return false;
             }
 
-            res->seconds = seconds->as<ASTLiteral>()->value.safeGet<UInt64>();
-            break;
-        }
-        case Type::DROP_QUERY_CACHE:
-        {
-            ParserLiteral tag_parser;
-            ASTPtr ast;
-            if (ParserKeyword{Keyword::TAG}.ignore(pos, expected) && tag_parser.parse(pos, ast, expected))
-                res->query_cache_tag = std::make_optional<String>(ast->as<ASTLiteral>()->value.safeGet<String>());
-            if (!parseQueryWithOnCluster(res, pos, expected))
-                return false;
+            res->seconds = seconds->as<ASTLiteral>()->value.get<UInt64>();
             break;
         }
         case Type::DROP_FILESYSTEM_CACHE:
@@ -549,7 +538,7 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
             ASTPtr ast;
             if (ParserKeyword{Keyword::WITH_NAME}.ignore(pos, expected) && ParserStringLiteral{}.parse(pos, ast, expected))
             {
-                res->backup_name = ast->as<ASTLiteral &>().value.safeGet<const String &>();
+                res->backup_name = ast->as<ASTLiteral &>().value.get<const String &>();
             }
             else
             {
@@ -588,7 +577,7 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
                     if (!ParserStringLiteral{}.parse(pos, ast, expected))
                         return false;
 
-                    custom_name = ast->as<ASTLiteral &>().value.safeGet<const String &>();
+                    custom_name = ast->as<ASTLiteral &>().value.get<const String &>();
                 }
 
                 return true;
diff --git a/src/Parsers/ParserUndropQuery.cpp b/src/Parsers/ParserUndropQuery.cpp
index 57da47df70d..07ca8a3b5fd 100644
--- a/src/Parsers/ParserUndropQuery.cpp
+++ b/src/Parsers/ParserUndropQuery.cpp
@@ -41,7 +41,7 @@ bool parseUndropQuery(IParser::Pos & pos, ASTPtr & node, Expected & expected)
         ASTPtr ast_uuid;
         if (!uuid_p.parse(pos, ast_uuid, expected))
             return false;
-        uuid = parseFromString<UUID>(ast_uuid->as<ASTLiteral>()->value.safeGet<String>());
+        uuid = parseFromString<UUID>(ast_uuid->as<ASTLiteral>()->value.get<String>());
     }
     if (ParserKeyword{Keyword::ON}.ignore(pos, expected))
     {
diff --git a/src/Parsers/examples/CMakeLists.txt b/src/Parsers/examples/CMakeLists.txt
index 07f60601acd..261f234081c 100644
--- a/src/Parsers/examples/CMakeLists.txt
+++ b/src/Parsers/examples/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(SRCS)
 
 clickhouse_add_executable(lexer lexer.cpp ${SRCS})
-target_link_libraries(lexer PRIVATE clickhouse_parsers clickhouse_common_config)
+target_link_libraries(lexer PRIVATE clickhouse_parsers)
 
 clickhouse_add_executable(select_parser select_parser.cpp ${SRCS} "../../Server/ServerType.cpp")
 target_link_libraries(select_parser PRIVATE dbms)
diff --git a/src/Parsers/fuzzers/codegen_fuzzer/CMakeLists.txt b/src/Parsers/fuzzers/codegen_fuzzer/CMakeLists.txt
index 74fdcff79f7..20fd951d390 100644
--- a/src/Parsers/fuzzers/codegen_fuzzer/CMakeLists.txt
+++ b/src/Parsers/fuzzers/codegen_fuzzer/CMakeLists.txt
@@ -39,7 +39,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 
 clickhouse_add_executable(codegen_select_fuzzer ${FUZZER_SRCS})
 
-set_source_files_properties("${PROTO_SRCS}" "out.cpp" PROPERTIES COMPILE_FLAGS "-Wno-reserved-identifier -Wno-extra-semi-stmt -Wno-used-but-marked-unused")
+set_source_files_properties("${PROTO_SRCS}" "out.cpp" PROPERTIES COMPILE_FLAGS "-Wno-reserved-identifier")
 
 # contrib/libprotobuf-mutator/src/libfuzzer/libfuzzer_macro.h:143:44: error: no newline at end of file [-Werror,-Wnewline-eof]
 target_compile_options (codegen_select_fuzzer PRIVATE -Wno-newline-eof)
diff --git a/src/Parsers/fuzzers/codegen_fuzzer/codegen_select_fuzzer.cpp b/src/Parsers/fuzzers/codegen_fuzzer/codegen_select_fuzzer.cpp
index 09af67c337c..9310d7d59f7 100644
--- a/src/Parsers/fuzzers/codegen_fuzzer/codegen_select_fuzzer.cpp
+++ b/src/Parsers/fuzzers/codegen_fuzzer/codegen_select_fuzzer.cpp
@@ -27,8 +27,7 @@ DEFINE_BINARY_PROTO_FUZZER(const Sentence& main)
         DB::ParserQueryWithOutput parser(input.data() + input.size());
         try
         {
-            DB::ASTPtr ast
-                = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0, DB::DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
+            DB::ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
 
             DB::WriteBufferFromOStream out(std::cerr, 4096);
             DB::formatAST(*ast, out);
diff --git a/src/Parsers/fuzzers/create_parser_fuzzer.cpp b/src/Parsers/fuzzers/create_parser_fuzzer.cpp
index bab8db5671d..854885ad33b 100644
--- a/src/Parsers/fuzzers/create_parser_fuzzer.cpp
+++ b/src/Parsers/fuzzers/create_parser_fuzzer.cpp
@@ -14,7 +14,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
         std::string input = std::string(reinterpret_cast<const char*>(data), size);
 
         DB::ParserCreateQuery parser;
-        DB::ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 1000, DB::DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
+        DB::ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 1000);
 
         const UInt64 max_ast_depth = 1000;
         ast->checkDepth(max_ast_depth);
diff --git a/src/Parsers/tests/gtest_Parser.cpp b/src/Parsers/tests/gtest_Parser.cpp
index 47f7a54389b..f0abc68f966 100644
--- a/src/Parsers/tests/gtest_Parser.cpp
+++ b/src/Parsers/tests/gtest_Parser.cpp
@@ -231,47 +231,47 @@ INSTANTIATE_TEST_SUITE_P(ParserCreateDatabaseQuery, ParserTest,
         },
         {
             "CREATE DATABASE db ENGINE=MaterializeMySQL('addr:port', 'db', 'user', 'pw') TABLE OVERRIDE `tbl`\n(PARTITION BY toYYYYMM(created))",
-            "CREATE DATABASE db\nENGINE = MaterializeMySQL('addr:port', 'db', 'user', 'pw')\nTABLE OVERRIDE tbl\n(\n    PARTITION BY toYYYYMM(created)\n)"
+            "CREATE DATABASE db\nENGINE = MaterializeMySQL('addr:port', 'db', 'user', 'pw')\nTABLE OVERRIDE `tbl`\n(\n    PARTITION BY toYYYYMM(`created`)\n)"
         },
         {
             "CREATE DATABASE db ENGINE=Foo TABLE OVERRIDE `tbl` (), TABLE OVERRIDE a (COLUMNS (_created DateTime MATERIALIZED now())), TABLE OVERRIDE b (PARTITION BY rand())",
-            "CREATE DATABASE db\nENGINE = Foo\nTABLE OVERRIDE tbl\n(\n\n),\nTABLE OVERRIDE a\n(\n    COLUMNS\n    (\n        `_created` DateTime MATERIALIZED now()\n    )\n),\nTABLE OVERRIDE b\n(\n    PARTITION BY rand()\n)"
+            "CREATE DATABASE db\nENGINE = Foo\nTABLE OVERRIDE `tbl`\n(\n\n),\nTABLE OVERRIDE `a`\n(\n    COLUMNS\n    (\n        `_created` DateTime MATERIALIZED now()\n    )\n),\nTABLE OVERRIDE `b`\n(\n    PARTITION BY rand()\n)"
         },
         {
             "CREATE DATABASE db ENGINE=MaterializeMySQL('addr:port', 'db', 'user', 'pw') TABLE OVERRIDE tbl (COLUMNS (id UUID) PARTITION BY toYYYYMM(created))",
-            "CREATE DATABASE db\nENGINE = MaterializeMySQL('addr:port', 'db', 'user', 'pw')\nTABLE OVERRIDE tbl\n(\n    COLUMNS\n    (\n        `id` UUID\n    )\n    PARTITION BY toYYYYMM(created)\n)"
+            "CREATE DATABASE db\nENGINE = MaterializeMySQL('addr:port', 'db', 'user', 'pw')\nTABLE OVERRIDE `tbl`\n(\n    COLUMNS\n    (\n        `id` UUID\n    )\n    PARTITION BY toYYYYMM(`created`)\n)"
         },
         {
             "CREATE DATABASE db TABLE OVERRIDE tbl (COLUMNS (INDEX foo foo TYPE minmax GRANULARITY 1) PARTITION BY if(_staged = 1, 'staging', toYYYYMM(created)))",
-            "CREATE DATABASE db\nTABLE OVERRIDE tbl\n(\n    COLUMNS\n    (\n        INDEX foo foo TYPE minmax GRANULARITY 1\n    )\n    PARTITION BY if(_staged = 1, 'staging', toYYYYMM(created))\n)"
+            "CREATE DATABASE db\nTABLE OVERRIDE `tbl`\n(\n    COLUMNS\n    (\n        INDEX foo `foo` TYPE minmax GRANULARITY 1\n    )\n    PARTITION BY if(`_staged` = 1, 'staging', toYYYYMM(`created`))\n)"
         },
         {
             "CREATE DATABASE db TABLE OVERRIDE t1 (TTL inserted + INTERVAL 1 MONTH DELETE), TABLE OVERRIDE t2 (TTL `inserted` + INTERVAL 2 MONTH DELETE)",
-            "CREATE DATABASE db\nTABLE OVERRIDE t1\n(\n    TTL inserted + toIntervalMonth(1)\n),\nTABLE OVERRIDE t2\n(\n    TTL inserted + toIntervalMonth(2)\n)"
+            "CREATE DATABASE db\nTABLE OVERRIDE `t1`\n(\n    TTL `inserted` + toIntervalMonth(1)\n),\nTABLE OVERRIDE `t2`\n(\n    TTL `inserted` + toIntervalMonth(2)\n)"
         },
         {
             "CREATE DATABASE db ENGINE = MaterializeMySQL('127.0.0.1:3306', 'db', 'root', 'pw') SETTINGS allows_query_when_mysql_lost = 1 TABLE OVERRIDE tab3 (COLUMNS (_staged UInt8 MATERIALIZED 1) PARTITION BY (c3) TTL c3 + INTERVAL 10 minute), TABLE OVERRIDE tab5 (PARTITION BY (c3) TTL c3 + INTERVAL 10 minute)",
-            "CREATE DATABASE db\nENGINE = MaterializeMySQL('127.0.0.1:3306', 'db', 'root', 'pw')\nSETTINGS allows_query_when_mysql_lost = 1\nTABLE OVERRIDE tab3\n(\n    COLUMNS\n    (\n        `_staged` UInt8 MATERIALIZED 1\n    )\n    PARTITION BY c3\n    TTL c3 + toIntervalMinute(10)\n),\nTABLE OVERRIDE tab5\n(\n    PARTITION BY c3\n    TTL c3 + toIntervalMinute(10)\n)"
+            "CREATE DATABASE db\nENGINE = MaterializeMySQL('127.0.0.1:3306', 'db', 'root', 'pw')\nSETTINGS allows_query_when_mysql_lost = 1\nTABLE OVERRIDE `tab3`\n(\n    COLUMNS\n    (\n        `_staged` UInt8 MATERIALIZED 1\n    )\n    PARTITION BY `c3`\n    TTL `c3` + toIntervalMinute(10)\n),\nTABLE OVERRIDE `tab5`\n(\n    PARTITION BY `c3`\n    TTL `c3` + toIntervalMinute(10)\n)"
         },
         {
             "CREATE DATABASE db TABLE OVERRIDE tbl (PARTITION BY toYYYYMM(created) COLUMNS (created DateTime CODEC(Delta)))",
-            "CREATE DATABASE db\nTABLE OVERRIDE tbl\n(\n    COLUMNS\n    (\n        `created` DateTime CODEC(Delta)\n    )\n    PARTITION BY toYYYYMM(created)\n)"
+            "CREATE DATABASE db\nTABLE OVERRIDE `tbl`\n(\n    COLUMNS\n    (\n        `created` DateTime CODEC(Delta)\n    )\n    PARTITION BY toYYYYMM(`created`)\n)"
         },
         {
-            "CREATE DATABASE db ENGINE = Foo() SETTINGS a = 1", 
+            "CREATE DATABASE db ENGINE = Foo() SETTINGS a = 1",
             "CREATE DATABASE db\nENGINE = Foo\nSETTINGS a = 1"
         },
         {
-            "CREATE DATABASE db ENGINE = Foo() SETTINGS a = 1, b = 2", 
+            "CREATE DATABASE db ENGINE = Foo() SETTINGS a = 1, b = 2",
             "CREATE DATABASE db\nENGINE = Foo\nSETTINGS a = 1, b = 2"
         },
         {
             "CREATE DATABASE db ENGINE = Foo() SETTINGS a = 1, b = 2 TABLE OVERRIDE a (ORDER BY (id, version))",
-            "CREATE DATABASE db\nENGINE = Foo\nSETTINGS a = 1, b = 2\nTABLE OVERRIDE a\n(\n    ORDER BY (id, version)\n)"
+            "CREATE DATABASE db\nENGINE = Foo\nSETTINGS a = 1, b = 2\nTABLE OVERRIDE `a`\n(\n    ORDER BY (`id`, `version`)\n)"
         },
         {
             "CREATE DATABASE db ENGINE = Foo() SETTINGS a = 1, b = 2 COMMENT 'db comment' TABLE OVERRIDE a (ORDER BY (id, version))",
-            "CREATE DATABASE db\nENGINE = Foo\nSETTINGS a = 1, b = 2\nTABLE OVERRIDE a\n(\n    ORDER BY (id, version)\n)\nCOMMENT 'db comment'"
+            "CREATE DATABASE db\nENGINE = Foo\nSETTINGS a = 1, b = 2\nTABLE OVERRIDE `a`\n(\n    ORDER BY (`id`, `version`)\n)\nCOMMENT 'db comment'"
         }
 })));
 
diff --git a/src/Parsers/tests/gtest_dictionary_parser.cpp b/src/Parsers/tests/gtest_dictionary_parser.cpp
index af3591750a1..a1ba46125a7 100644
--- a/src/Parsers/tests/gtest_dictionary_parser.cpp
+++ b/src/Parsers/tests/gtest_dictionary_parser.cpp
@@ -56,21 +56,21 @@ TEST(ParserDictionaryDDL, SimpleDictionary)
     EXPECT_EQ(create->dictionary->source->name, "clickhouse");
     auto children = create->dictionary->source->elements->children;
     EXPECT_EQ(children[0]->as<ASTPair>() -> first, "host");
-    EXPECT_EQ(children[0]->as<ASTPair>()->second->as<ASTLiteral>()->value.safeGet<String>(), "localhost");
+    EXPECT_EQ(children[0]->as<ASTPair>()->second->as<ASTLiteral>()->value.get<String>(), "localhost");
 
     EXPECT_EQ(children[1]->as<ASTPair>()->first, "port");
-    EXPECT_EQ(children[1]->as<ASTPair>()->second->as<ASTLiteral>()->value.safeGet<UInt64>(), 9000);
+    EXPECT_EQ(children[1]->as<ASTPair>()->second->as<ASTLiteral>()->value.get<UInt64>(), 9000);
 
     EXPECT_EQ(children[2]->as<ASTPair>()->first, "user");
-    EXPECT_EQ(children[2]->as<ASTPair>()->second->as<ASTLiteral>()->value.safeGet<String>(), "default");
+    EXPECT_EQ(children[2]->as<ASTPair>()->second->as<ASTLiteral>()->value.get<String>(), "default");
     EXPECT_EQ(children[3]->as<ASTPair>()->first, "password");
-    EXPECT_EQ(children[3]->as<ASTPair>()->second->as<ASTLiteral>()->value.safeGet<String>(), "");
+    EXPECT_EQ(children[3]->as<ASTPair>()->second->as<ASTLiteral>()->value.get<String>(), "");
 
     EXPECT_EQ(children[4]->as<ASTPair>()->first, "db");
-    EXPECT_EQ(children[4]->as<ASTPair>()->second->as<ASTLiteral>()->value.safeGet<String>(), "test");
+    EXPECT_EQ(children[4]->as<ASTPair>()->second->as<ASTLiteral>()->value.get<String>(), "test");
 
     EXPECT_EQ(children[5]->as<ASTPair>()->first, "table");
-    EXPECT_EQ(children[5]->as<ASTPair>()->second->as<ASTLiteral>()->value.safeGet<String>(), "table_for_dict");
+    EXPECT_EQ(children[5]->as<ASTPair>()->second->as<ASTLiteral>()->value.get<String>(), "table_for_dict");
 
     /// layout test
     auto * layout = create->dictionary->layout;
@@ -102,9 +102,9 @@ TEST(ParserDictionaryDDL, SimpleDictionary)
     EXPECT_EQ(attributes_children[1]->as<ASTDictionaryAttributeDeclaration>()->name, "second_column");
     EXPECT_EQ(attributes_children[2]->as<ASTDictionaryAttributeDeclaration>()->name, "third_column");
 
-    EXPECT_EQ(attributes_children[0]->as<ASTDictionaryAttributeDeclaration>()->default_value->as<ASTLiteral>()->value.safeGet<UInt64>(), 0);
-    EXPECT_EQ(attributes_children[1]->as<ASTDictionaryAttributeDeclaration>()->default_value->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
-    EXPECT_EQ(attributes_children[2]->as<ASTDictionaryAttributeDeclaration>()->default_value->as<ASTLiteral>()->value.safeGet<UInt64>(), 2);
+    EXPECT_EQ(attributes_children[0]->as<ASTDictionaryAttributeDeclaration>()->default_value->as<ASTLiteral>()->value.get<UInt64>(), 0);
+    EXPECT_EQ(attributes_children[1]->as<ASTDictionaryAttributeDeclaration>()->default_value->as<ASTLiteral>()->value.get<UInt64>(), 1);
+    EXPECT_EQ(attributes_children[2]->as<ASTDictionaryAttributeDeclaration>()->default_value->as<ASTLiteral>()->value.get<UInt64>(), 2);
 
     EXPECT_EQ(attributes_children[0]->as<ASTDictionaryAttributeDeclaration>()->expression, nullptr);
     EXPECT_EQ(attributes_children[1]->as<ASTDictionaryAttributeDeclaration>()->expression, nullptr);
@@ -150,8 +150,8 @@ TEST(ParserDictionaryDDL, AttributesWithMultipleProperties)
     EXPECT_EQ(attributes_children[2]->as<ASTDictionaryAttributeDeclaration>()->name, "third_column");
 
     EXPECT_EQ(attributes_children[0]->as<ASTDictionaryAttributeDeclaration>()->default_value, nullptr);
-    EXPECT_EQ(attributes_children[1]->as<ASTDictionaryAttributeDeclaration>()->default_value->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
-    EXPECT_EQ(attributes_children[2]->as<ASTDictionaryAttributeDeclaration>()->default_value->as<ASTLiteral>()->value.safeGet<UInt64>(), 2);
+    EXPECT_EQ(attributes_children[1]->as<ASTDictionaryAttributeDeclaration>()->default_value->as<ASTLiteral>()->value.get<UInt64>(), 1);
+    EXPECT_EQ(attributes_children[2]->as<ASTDictionaryAttributeDeclaration>()->default_value->as<ASTLiteral>()->value.get<UInt64>(), 2);
 
     EXPECT_EQ(attributes_children[0]->as<ASTDictionaryAttributeDeclaration>()->expression, nullptr);
     EXPECT_EQ(attributes_children[1]->as<ASTDictionaryAttributeDeclaration>()->expression, nullptr);
@@ -195,9 +195,9 @@ TEST(ParserDictionaryDDL, CustomAttributePropertiesOrder)
     EXPECT_EQ(attributes_children[1]->as<ASTDictionaryAttributeDeclaration>()->name, "second_column");
     EXPECT_EQ(attributes_children[2]->as<ASTDictionaryAttributeDeclaration>()->name, "third_column");
 
-    EXPECT_EQ(attributes_children[0]->as<ASTDictionaryAttributeDeclaration>()->default_value->as<ASTLiteral>()->value.safeGet<UInt64>(), 100);
-    EXPECT_EQ(attributes_children[1]->as<ASTDictionaryAttributeDeclaration>()->default_value->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
-    EXPECT_EQ(attributes_children[2]->as<ASTDictionaryAttributeDeclaration>()->default_value->as<ASTLiteral>()->value.safeGet<UInt64>(), 2);
+    EXPECT_EQ(attributes_children[0]->as<ASTDictionaryAttributeDeclaration>()->default_value->as<ASTLiteral>()->value.get<UInt64>(), 100);
+    EXPECT_EQ(attributes_children[1]->as<ASTDictionaryAttributeDeclaration>()->default_value->as<ASTLiteral>()->value.get<UInt64>(), 1);
+    EXPECT_EQ(attributes_children[2]->as<ASTDictionaryAttributeDeclaration>()->default_value->as<ASTLiteral>()->value.get<UInt64>(), 2);
 
     EXPECT_EQ(attributes_children[0]->as<ASTDictionaryAttributeDeclaration>()->expression, nullptr);
     EXPECT_EQ(attributes_children[1]->as<ASTDictionaryAttributeDeclaration>()->expression, nullptr);
@@ -248,25 +248,25 @@ TEST(ParserDictionaryDDL, NestedSource)
     auto children = create->dictionary->source->elements->children;
 
     EXPECT_EQ(children[0]->as<ASTPair>()->first, "host");
-    EXPECT_EQ(children[0]->as<ASTPair>()->second->as<ASTLiteral>()->value.safeGet<String>(), "localhost");
+    EXPECT_EQ(children[0]->as<ASTPair>()->second->as<ASTLiteral>()->value.get<String>(), "localhost");
 
     EXPECT_EQ(children[1]->as<ASTPair>()->first, "port");
-    EXPECT_EQ(children[1]->as<ASTPair>()->second->as<ASTLiteral>()->value.safeGet<UInt64>(), 9000);
+    EXPECT_EQ(children[1]->as<ASTPair>()->second->as<ASTLiteral>()->value.get<UInt64>(), 9000);
 
     EXPECT_EQ(children[2]->as<ASTPair>()->first, "user");
-    EXPECT_EQ(children[2]->as<ASTPair>()->second->as<ASTLiteral>()->value.safeGet<String>(), "default");
+    EXPECT_EQ(children[2]->as<ASTPair>()->second->as<ASTLiteral>()->value.get<String>(), "default");
 
     EXPECT_EQ(children[3]->as<ASTPair>()->first, "replica");
     auto replica = children[3]->as<ASTPair>()->second->children;
 
     EXPECT_EQ(replica[0]->as<ASTPair>()->first, "host");
-    EXPECT_EQ(replica[0]->as<ASTPair>()->second->as<ASTLiteral>()->value.safeGet<String>(), "127.0.0.1");
+    EXPECT_EQ(replica[0]->as<ASTPair>()->second->as<ASTLiteral>()->value.get<String>(), "127.0.0.1");
 
     EXPECT_EQ(replica[1]->as<ASTPair>()->first, "priority");
-    EXPECT_EQ(replica[1]->as<ASTPair>()->second->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
+    EXPECT_EQ(replica[1]->as<ASTPair>()->second->as<ASTLiteral>()->value.get<UInt64>(), 1);
 
     EXPECT_EQ(children[4]->as<ASTPair>()->first, "password");
-    EXPECT_EQ(children[4]->as<ASTPair>()->second->as<ASTLiteral>()->value.safeGet<String>(), "");
+    EXPECT_EQ(children[4]->as<ASTPair>()->second->as<ASTLiteral>()->value.get<String>(), "");
 }
 
 
diff --git a/src/Planner/CollectTableExpressionData.cpp b/src/Planner/CollectTableExpressionData.cpp
index c48813a4ed4..d5e39a9f123 100644
--- a/src/Planner/CollectTableExpressionData.cpp
+++ b/src/Planner/CollectTableExpressionData.cpp
@@ -46,7 +46,7 @@ public:
         auto column_source_node = column_node->getColumnSource();
         auto column_source_node_type = column_source_node->getNodeType();
 
-        if (column_source_node_type == QueryTreeNodeType::LAMBDA || column_source_node_type == QueryTreeNodeType::INTERPOLATE)
+        if (column_source_node_type == QueryTreeNodeType::LAMBDA)
             return;
 
         /// JOIN using expression
@@ -88,16 +88,16 @@ public:
 
                 auto column_identifier = planner_context->getGlobalPlannerContext()->createColumnIdentifier(node);
 
-                ActionsDAG alias_column_actions_dag;
+                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());
+                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, std::move(alias_column_actions_dag), select_added_columns);
+                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);
             }
 
             return;
@@ -335,22 +335,22 @@ void collectTableExpressionData(QueryTreeNodePtr & query_node, PlannerContextPtr
         collect_source_columns_visitor.setKeepAliasColumns(false);
         collect_source_columns_visitor.visit(query_node_typed.getPrewhere());
 
-        ActionsDAG prewhere_actions_dag;
+        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_tree_node);
+        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.back());
+        prewhere_actions_dag->getOutputs().push_back(expression_nodes.back());
 
-        for (const auto & prewhere_input_node : prewhere_actions_dag.getInputs())
+        for (const auto & prewhere_input_node : prewhere_actions_dag->getInputs())
             if (required_column_names_without_prewhere.contains(prewhere_input_node->result_name))
-                prewhere_actions_dag.getOutputs().push_back(prewhere_input_node);
+                prewhere_actions_dag->getOutputs().push_back(prewhere_input_node);
 
         table_expression_data.setPrewhereFilterActions(std::move(prewhere_actions_dag));
     }
diff --git a/src/Planner/Planner.cpp b/src/Planner/Planner.cpp
index 7ed16f17087..7baefccd38b 100644
--- a/src/Planner/Planner.cpp
+++ b/src/Planner/Planner.cpp
@@ -12,6 +12,7 @@
 
 #include <Functions/FunctionFactory.h>
 #include <Functions/CastOverloadResolver.h>
+#include <Functions/indexHint.h>
 
 #include <QueryPipeline/Pipe.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
@@ -216,11 +217,9 @@ FiltersForTableExpressionMap collectFiltersForAnalysis(const QueryTreeNodePtr &
         if (!read_from_dummy)
             continue;
 
-        if (auto filter_actions = read_from_dummy->detachFilterActionsDAG())
-        {
-            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()};
-        }
+        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;
@@ -334,34 +333,34 @@ public:
 };
 
 void addExpressionStep(QueryPlan & query_plan,
-    ActionsAndProjectInputsFlagPtr & expression_actions,
+    const ActionsAndProjectInputsFlagPtr & expression_actions,
     const std::string & step_description,
-    UsefulSets & useful_sets)
+    std::vector<ActionsDAGPtr> & result_actions_to_execute)
 {
-    auto actions = std::move(expression_actions->dag);
+    auto actions = expression_actions->dag.clone();
     if (expression_actions->project_input)
-        actions.appendInputsForUnusedColumns(query_plan.getCurrentDataStream().header);
+        actions->appendInputsForUnusedColumns(query_plan.getCurrentDataStream().header);
 
-    auto expression_step = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), std::move(actions));
-    appendSetsFromActionsDAG(expression_step->getExpression(), useful_sets);
+    result_actions_to_execute.push_back(actions);
+    auto expression_step = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), actions);
     expression_step->setStepDescription(step_description);
     query_plan.addStep(std::move(expression_step));
 }
 
 void addFilterStep(QueryPlan & query_plan,
-    FilterAnalysisResult & filter_analysis_result,
+    const FilterAnalysisResult & filter_analysis_result,
     const std::string & step_description,
-    UsefulSets & useful_sets)
+    std::vector<ActionsDAGPtr> & result_actions_to_execute)
 {
-    auto actions = std::move(filter_analysis_result.filter_actions->dag);
+    auto actions = filter_analysis_result.filter_actions->dag.clone();
     if (filter_analysis_result.filter_actions->project_input)
-        actions.appendInputsForUnusedColumns(query_plan.getCurrentDataStream().header);
+        actions->appendInputsForUnusedColumns(query_plan.getCurrentDataStream().header);
 
+    result_actions_to_execute.push_back(actions);
     auto where_step = std::make_unique<FilterStep>(query_plan.getCurrentDataStream(),
-        std::move(actions),
+        actions,
         filter_analysis_result.filter_column_name,
         filter_analysis_result.remove_filter_column);
-    appendSetsFromActionsDAG(where_step->getExpression(), useful_sets);
     where_step->setStepDescription(step_description);
     query_plan.addStep(std::move(where_step));
 }
@@ -544,41 +543,39 @@ void addMergingAggregatedStep(QueryPlan & query_plan,
 }
 
 void addTotalsHavingStep(QueryPlan & query_plan,
-    PlannerExpressionsAnalysisResult & expression_analysis_result,
+    const PlannerExpressionsAnalysisResult & expression_analysis_result,
     const QueryAnalysisResult & query_analysis_result,
     const PlannerContextPtr & planner_context,
     const QueryNode & query_node,
-    UsefulSets & useful_sets)
+    std::vector<ActionsDAGPtr> & result_actions_to_execute)
 {
     const auto & query_context = planner_context->getQueryContext();
     const auto & settings = query_context->getSettingsRef();
 
-    auto & aggregation_analysis_result = expression_analysis_result.getAggregation();
-    auto & having_analysis_result = expression_analysis_result.getHaving();
+    const auto & aggregation_analysis_result = expression_analysis_result.getAggregation();
+    const auto & having_analysis_result = expression_analysis_result.getHaving();
     bool need_finalize = !query_node.isGroupByWithRollup() && !query_node.isGroupByWithCube();
 
-    std::optional<ActionsDAG> actions;
+    ActionsDAGPtr actions;
     if (having_analysis_result.filter_actions)
     {
-        actions = std::move(having_analysis_result.filter_actions->dag);
+        actions = having_analysis_result.filter_actions->dag.clone();
         if (having_analysis_result.filter_actions->project_input)
             actions->appendInputsForUnusedColumns(query_plan.getCurrentDataStream().header);
+
+        result_actions_to_execute.push_back(actions);
     }
 
     auto totals_having_step = std::make_unique<TotalsHavingStep>(
         query_plan.getCurrentDataStream(),
         aggregation_analysis_result.aggregate_descriptions,
         query_analysis_result.aggregate_overflow_row,
-        std::move(actions),
+        actions,
         having_analysis_result.filter_column_name,
         having_analysis_result.remove_filter_column,
         settings.totals_mode,
         settings.totals_auto_threshold,
         need_finalize);
-
-    if (having_analysis_result.filter_actions)
-        appendSetsFromActionsDAG(*totals_having_step->getActions(), useful_sets);
-
     query_plan.addStep(std::move(totals_having_step));
 }
 
@@ -720,13 +717,13 @@ void addWithFillStepIfNeeded(QueryPlan & query_plan,
 
     if (query_node.hasInterpolate())
     {
-        ActionsDAG interpolate_actions_dag;
+        auto interpolate_actions_dag = std::make_shared<ActionsDAG>();
         auto query_plan_columns = query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName();
         for (auto & query_plan_column : query_plan_columns)
         {
             /// INTERPOLATE actions dag input columns must be non constant
             query_plan_column.column = nullptr;
-            interpolate_actions_dag.addInput(query_plan_column);
+            interpolate_actions_dag->addInput(query_plan_column);
         }
 
         auto & interpolate_list_node = query_node.getInterpolate()->as<ListNode &>();
@@ -734,29 +731,32 @@ void addWithFillStepIfNeeded(QueryPlan & query_plan,
 
         if (interpolate_list_nodes.empty())
         {
-            for (const auto * input_node : interpolate_actions_dag.getInputs())
+            for (const auto * input_node : interpolate_actions_dag->getInputs())
             {
                 if (column_names_with_fill.contains(input_node->result_name))
                     continue;
 
-                interpolate_actions_dag.getOutputs().push_back(input_node);
+                interpolate_actions_dag->getOutputs().push_back(input_node);
             }
         }
         else
         {
-            ActionsDAG rename_dag;
-
             for (auto & interpolate_node : interpolate_list_nodes)
             {
                 auto & interpolate_node_typed = interpolate_node->as<InterpolateNode &>();
 
-                PlannerActionsVisitor planner_actions_visitor(planner_context);
-                auto expression_to_interpolate_expression_nodes = planner_actions_visitor.visit(interpolate_actions_dag,
+                PlannerActionsVisitor planner_actions_visitor(
+                    planner_context,
+                    /* use_column_identifier_as_action_node_name_, (default value)*/ true,
+                    /// Prefer the INPUT to CONSTANT nodes (actions must be non constant)
+                    /* always_use_const_column_for_constant_nodes */ false);
+
+                auto expression_to_interpolate_expression_nodes = planner_actions_visitor.visit(*interpolate_actions_dag,
                     interpolate_node_typed.getExpression());
                 if (expression_to_interpolate_expression_nodes.size() != 1)
                     throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expression to interpolate expected to have single action node");
 
-                auto interpolate_expression_nodes = planner_actions_visitor.visit(interpolate_actions_dag,
+                auto interpolate_expression_nodes = planner_actions_visitor.visit(*interpolate_actions_dag,
                     interpolate_node_typed.getInterpolateExpression());
                 if (interpolate_expression_nodes.size() != 1)
                     throw Exception(ErrorCodes::BAD_ARGUMENTS, "Interpolate expression expected to have single action node");
@@ -767,36 +767,16 @@ void addWithFillStepIfNeeded(QueryPlan & query_plan,
                 const auto * interpolate_expression = interpolate_expression_nodes[0];
                 if (!interpolate_expression->result_type->equals(*expression_to_interpolate->result_type))
                 {
-                    interpolate_expression = &interpolate_actions_dag.addCast(*interpolate_expression,
+                    interpolate_expression = &interpolate_actions_dag->addCast(*interpolate_expression,
                         expression_to_interpolate->result_type,
                         interpolate_expression->result_name);
                 }
 
-                const auto * alias_node = &interpolate_actions_dag.addAlias(*interpolate_expression, expression_to_interpolate_name);
-                interpolate_actions_dag.getOutputs().push_back(alias_node);
-
-                /// Here we fix INTERPOLATE by constant expression.
-                /// Example from 02336_sort_optimization_with_fill:
-                ///
-                /// SELECT 5 AS x, 'Hello' AS s ORDER BY x WITH FILL FROM 1 TO 10 INTERPOLATE (s AS s||'A')
-                ///
-                /// For this query, INTERPOLATE_EXPRESSION would be : s AS concat(s, 'A'),
-                /// so that interpolate_actions_dag would have INPUT `s`.
-                ///
-                /// However, INPUT `s` does not exist. Instead, we have a constant with execution name 'Hello'_String.
-                /// To fix this, we prepend a rename : 'Hello'_String -> s
-                if (const auto * constant_node = interpolate_node_typed.getExpression()->as<const ConstantNode>())
-                {
-                    const auto * node = &rename_dag.addInput(alias_node->result_name, alias_node->result_type);
-                    node = &rename_dag.addAlias(*node, interpolate_node_typed.getExpressionName());
-                    rename_dag.getOutputs().push_back(node);
-                }
+                const auto * alias_node = &interpolate_actions_dag->addAlias(*interpolate_expression, expression_to_interpolate_name);
+                interpolate_actions_dag->getOutputs().push_back(alias_node);
             }
 
-            if (!rename_dag.getOutputs().empty())
-                interpolate_actions_dag = ActionsDAG::merge(std::move(rename_dag), std::move(interpolate_actions_dag));
-
-            interpolate_actions_dag.removeUnusedActions();
+            interpolate_actions_dag->removeUnusedActions();
         }
 
         Aliases empty_aliases;
@@ -908,12 +888,12 @@ bool addPreliminaryLimitOptimizationStepIfNeeded(QueryPlan & query_plan,
   * WINDOW functions.
   */
 void addPreliminarySortOrDistinctOrLimitStepsIfNeeded(QueryPlan & query_plan,
-    PlannerExpressionsAnalysisResult & expressions_analysis_result,
+    const PlannerExpressionsAnalysisResult & expressions_analysis_result,
     const QueryAnalysisResult & query_analysis_result,
     const PlannerContextPtr & planner_context,
     const PlannerQueryProcessingInfo & query_processing_info,
     const QueryTreeNodePtr & query_tree,
-    UsefulSets & useful_sets)
+    std::vector<ActionsDAGPtr> & result_actions_to_execute)
 {
     const auto & query_node = query_tree->as<QueryNode &>();
 
@@ -944,8 +924,8 @@ void addPreliminarySortOrDistinctOrLimitStepsIfNeeded(QueryPlan & query_plan,
 
     if (expressions_analysis_result.hasLimitBy())
     {
-        auto & limit_by_analysis_result = expressions_analysis_result.getLimitBy();
-        addExpressionStep(query_plan, limit_by_analysis_result.before_limit_by_actions, "Before LIMIT BY", useful_sets);
+        const auto & limit_by_analysis_result = expressions_analysis_result.getLimitBy();
+        addExpressionStep(query_plan, limit_by_analysis_result.before_limit_by_actions, "Before LIMIT BY", result_actions_to_execute);
         addLimitByStep(query_plan, limit_by_analysis_result, query_node);
     }
 
@@ -955,12 +935,12 @@ void addPreliminarySortOrDistinctOrLimitStepsIfNeeded(QueryPlan & query_plan,
 
 void addWindowSteps(QueryPlan & query_plan,
     const PlannerContextPtr & planner_context,
-    WindowAnalysisResult & window_analysis_result)
+    const WindowAnalysisResult & window_analysis_result)
 {
     const auto & query_context = planner_context->getQueryContext();
     const auto & settings = query_context->getSettingsRef();
 
-    auto & window_descriptions = window_analysis_result.window_descriptions;
+    auto window_descriptions = window_analysis_result.window_descriptions;
     sortWindowDescriptions(window_descriptions);
 
     size_t window_descriptions_size = window_descriptions.size();
@@ -1082,15 +1062,47 @@ void addOffsetStep(QueryPlan & query_plan, const QueryAnalysisResult & query_ana
     }
 }
 
+void collectSetsFromActionsDAG(const ActionsDAGPtr & dag, std::unordered_set<const FutureSet *> & useful_sets)
+{
+    for (const auto & node : dag->getNodes())
+    {
+        if (node.column)
+        {
+            const IColumn * column = node.column.get();
+            if (const auto * column_const = typeid_cast<const ColumnConst *>(column))
+                column = &column_const->getDataColumn();
+
+            if (const auto * column_set = typeid_cast<const ColumnSet *>(column))
+                useful_sets.insert(column_set->getData().get());
+        }
+
+        if (node.type == ActionsDAG::ActionType::FUNCTION && node.function_base->getName() == "indexHint")
+        {
+            ActionsDAG::NodeRawConstPtrs children;
+            if (const auto * adaptor = typeid_cast<const FunctionToFunctionBaseAdaptor *>(node.function_base.get()))
+            {
+                if (const auto * index_hint = typeid_cast<const FunctionIndexHint *>(adaptor->getFunction().get()))
+                {
+                    collectSetsFromActionsDAG(index_hint->getActions(), useful_sets);
+                }
+            }
+        }
+    }
+}
+
 void addBuildSubqueriesForSetsStepIfNeeded(
     QueryPlan & query_plan,
     const SelectQueryOptions & select_query_options,
     const PlannerContextPtr & planner_context,
-    const UsefulSets & useful_sets)
+    const std::vector<ActionsDAGPtr> & result_actions_to_execute)
 {
     auto subqueries = planner_context->getPreparedSets().getSubqueries();
+    std::unordered_set<const FutureSet *> useful_sets;
 
-    auto predicate = [&useful_sets](const auto & set) { return !useful_sets.contains(set); };
+    for (const auto & actions_to_execute : result_actions_to_execute)
+        collectSetsFromActionsDAG(actions_to_execute, useful_sets);
+
+    auto predicate = [&useful_sets](const auto & set) { return !useful_sets.contains(set.get()); };
     auto it = std::remove_if(subqueries.begin(), subqueries.end(), std::move(predicate));
     subqueries.erase(it, subqueries.end());
 
@@ -1152,11 +1164,11 @@ void addAdditionalFilterStepIfNeeded(QueryPlan & query_plan,
     auto fake_table_expression = std::make_shared<TableNode>(std::move(storage), query_context);
 
     auto filter_info = buildFilterInfo(additional_result_filter_ast, fake_table_expression, planner_context, std::move(fake_name_set));
-    if (!query_plan.isInitialized())
+    if (!filter_info.actions || !query_plan.isInitialized())
         return;
 
     auto filter_step = std::make_unique<FilterStep>(query_plan.getCurrentDataStream(),
-        std::move(filter_info.actions),
+        filter_info.actions,
         filter_info.column_name,
         filter_info.do_remove_column);
     filter_step->setStepDescription("additional result filter");
@@ -1437,7 +1449,7 @@ void Planner::buildPlanForQueryNode()
     checkStoragesSupportTransactions(planner_context);
 
     const auto & table_filters = planner_context->getGlobalPlannerContext()->filters_for_table_expressions;
-    if (!select_query_options.only_analyze && !table_filters.empty())
+    if (!select_query_options.only_analyze && !table_filters.empty()) // && top_level)
     {
         for (auto & [table_node, table_expression_data] : planner_context->getTableExpressionNodeToData())
         {
@@ -1445,7 +1457,7 @@ void Planner::buildPlanForQueryNode()
             if (it != table_filters.end())
             {
                 const auto & filters = it->second;
-                table_expression_data.setFilterActions(filters.filter_actions->clone());
+                table_expression_data.setFilterActions(filters.filter_actions);
                 table_expression_data.setPrewhereInfo(filters.prewhere_info);
             }
         }
@@ -1536,15 +1548,15 @@ void Planner::buildPlanForQueryNode()
         planner_context,
         query_processing_info);
 
-    auto useful_sets = std::move(join_tree_query_plan.useful_sets);
+    std::vector<ActionsDAGPtr> result_actions_to_execute = std::move(join_tree_query_plan.actions_dags);
 
     for (auto & [_, table_expression_data] : planner_context->getTableExpressionNodeToData())
     {
         if (table_expression_data.getPrewhereFilterActions())
-            appendSetsFromActionsDAG(*table_expression_data.getPrewhereFilterActions(), useful_sets);
+            result_actions_to_execute.push_back(table_expression_data.getPrewhereFilterActions());
 
         if (table_expression_data.getRowLevelFilterActions())
-            appendSetsFromActionsDAG(*table_expression_data.getRowLevelFilterActions(), useful_sets);
+            result_actions_to_execute.push_back(table_expression_data.getRowLevelFilterActions());
     }
 
     if (query_processing_info.isIntermediateStage())
@@ -1555,7 +1567,7 @@ void Planner::buildPlanForQueryNode()
             planner_context,
             query_processing_info,
             query_tree,
-            useful_sets);
+            result_actions_to_execute);
 
         if (expression_analysis_result.hasAggregation())
         {
@@ -1567,13 +1579,13 @@ void Planner::buildPlanForQueryNode()
     if (query_processing_info.isFirstStage())
     {
         if (expression_analysis_result.hasWhere())
-            addFilterStep(query_plan, expression_analysis_result.getWhere(), "WHERE", useful_sets);
+            addFilterStep(query_plan, expression_analysis_result.getWhere(), "WHERE", result_actions_to_execute);
 
         if (expression_analysis_result.hasAggregation())
         {
-            auto & aggregation_analysis_result = expression_analysis_result.getAggregation();
+            const auto & aggregation_analysis_result = expression_analysis_result.getAggregation();
             if (aggregation_analysis_result.before_aggregation_actions)
-                addExpressionStep(query_plan, aggregation_analysis_result.before_aggregation_actions, "Before GROUP BY", useful_sets);
+                addExpressionStep(query_plan, aggregation_analysis_result.before_aggregation_actions, "Before GROUP BY", result_actions_to_execute);
 
             addAggregationStep(query_plan, aggregation_analysis_result, query_analysis_result, planner_context, select_query_info);
         }
@@ -1590,9 +1602,9 @@ void Planner::buildPlanForQueryNode()
                   * window functions, we can't execute ORDER BY and DISTINCT
                   * now, on shard (first_stage).
                   */
-                auto & window_analysis_result = expression_analysis_result.getWindow();
+                const auto & window_analysis_result = expression_analysis_result.getWindow();
                 if (window_analysis_result.before_window_actions)
-                    addExpressionStep(query_plan, window_analysis_result.before_window_actions, "Before WINDOW", useful_sets);
+                    addExpressionStep(query_plan, window_analysis_result.before_window_actions, "Before WINDOW", result_actions_to_execute);
             }
             else
             {
@@ -1600,8 +1612,8 @@ void Planner::buildPlanForQueryNode()
                   * Projection expressions, preliminary DISTINCT and before ORDER BY expressions
                   * now, on shards (first_stage).
                   */
-                auto & projection_analysis_result = expression_analysis_result.getProjection();
-                addExpressionStep(query_plan, projection_analysis_result.projection_actions, "Projection", useful_sets);
+                const auto & projection_analysis_result = expression_analysis_result.getProjection();
+                addExpressionStep(query_plan, projection_analysis_result.projection_actions, "Projection", result_actions_to_execute);
 
                 if (query_node.isDistinct())
                 {
@@ -1616,8 +1628,8 @@ void Planner::buildPlanForQueryNode()
 
                 if (expression_analysis_result.hasSort())
                 {
-                    auto & sort_analysis_result = expression_analysis_result.getSort();
-                    addExpressionStep(query_plan, sort_analysis_result.before_order_by_actions, "Before ORDER BY", useful_sets);
+                    const auto & sort_analysis_result = expression_analysis_result.getSort();
+                    addExpressionStep(query_plan, sort_analysis_result.before_order_by_actions, "Before ORDER BY", result_actions_to_execute);
                 }
             }
         }
@@ -1628,7 +1640,7 @@ void Planner::buildPlanForQueryNode()
             planner_context,
             query_processing_info,
             query_tree,
-            useful_sets);
+            result_actions_to_execute);
     }
 
     if (query_processing_info.isSecondStage() || query_processing_info.isFromAggregationState())
@@ -1650,14 +1662,14 @@ void Planner::buildPlanForQueryNode()
 
             if (query_node.isGroupByWithTotals())
             {
-                addTotalsHavingStep(query_plan, expression_analysis_result, query_analysis_result, planner_context, query_node, useful_sets);
+                addTotalsHavingStep(query_plan, expression_analysis_result, query_analysis_result, planner_context, query_node, result_actions_to_execute);
                 having_executed = true;
             }
 
             addCubeOrRollupStepIfNeeded(query_plan, aggregation_analysis_result, query_analysis_result, planner_context, select_query_info, query_node);
 
             if (!having_executed && expression_analysis_result.hasHaving())
-                addFilterStep(query_plan, expression_analysis_result.getHaving(), "HAVING", useful_sets);
+                addFilterStep(query_plan, expression_analysis_result.getHaving(), "HAVING", result_actions_to_execute);
         }
 
         if (query_processing_info.isFromAggregationState())
@@ -1670,18 +1682,18 @@ void Planner::buildPlanForQueryNode()
         {
             if (expression_analysis_result.hasWindow())
             {
-                auto & window_analysis_result = expression_analysis_result.getWindow();
+                const auto & window_analysis_result = expression_analysis_result.getWindow();
                 if (expression_analysis_result.hasAggregation())
-                    addExpressionStep(query_plan, window_analysis_result.before_window_actions, "Before window functions", useful_sets);
+                    addExpressionStep(query_plan, window_analysis_result.before_window_actions, "Before window functions", result_actions_to_execute);
 
                 addWindowSteps(query_plan, planner_context, window_analysis_result);
             }
 
             if (expression_analysis_result.hasQualify())
-                addFilterStep(query_plan, expression_analysis_result.getQualify(), "QUALIFY", useful_sets);
+                addFilterStep(query_plan, expression_analysis_result.getQualify(), "QUALIFY", result_actions_to_execute);
 
-            auto & projection_analysis_result = expression_analysis_result.getProjection();
-            addExpressionStep(query_plan, projection_analysis_result.projection_actions, "Projection", useful_sets);
+            const auto & projection_analysis_result = expression_analysis_result.getProjection();
+            addExpressionStep(query_plan, projection_analysis_result.projection_actions, "Projection", result_actions_to_execute);
 
             if (query_node.isDistinct())
             {
@@ -1696,8 +1708,8 @@ void Planner::buildPlanForQueryNode()
 
             if (expression_analysis_result.hasSort())
             {
-                auto & sort_analysis_result = expression_analysis_result.getSort();
-                addExpressionStep(query_plan, sort_analysis_result.before_order_by_actions, "Before ORDER BY", useful_sets);
+                const auto & sort_analysis_result = expression_analysis_result.getSort();
+                addExpressionStep(query_plan, sort_analysis_result.before_order_by_actions, "Before ORDER BY", result_actions_to_execute);
             }
         }
         else
@@ -1749,8 +1761,8 @@ void Planner::buildPlanForQueryNode()
 
         if (!query_processing_info.isFromAggregationState() && expression_analysis_result.hasLimitBy())
         {
-            auto & limit_by_analysis_result = expression_analysis_result.getLimitBy();
-            addExpressionStep(query_plan, limit_by_analysis_result.before_limit_by_actions, "Before LIMIT BY", useful_sets);
+            const auto & limit_by_analysis_result = expression_analysis_result.getLimitBy();
+            addExpressionStep(query_plan, limit_by_analysis_result.before_limit_by_actions, "Before LIMIT BY", result_actions_to_execute);
             addLimitByStep(query_plan, limit_by_analysis_result, query_node);
         }
 
@@ -1781,8 +1793,8 @@ void Planner::buildPlanForQueryNode()
         /// Project names is not done on shards, because initiator will not find columns in blocks
         if (!query_processing_info.isToAggregationState())
         {
-            auto & projection_analysis_result = expression_analysis_result.getProjection();
-            addExpressionStep(query_plan, projection_analysis_result.project_names_actions, "Project names", useful_sets);
+            const auto & projection_analysis_result = expression_analysis_result.getProjection();
+            addExpressionStep(query_plan, projection_analysis_result.project_names_actions, "Project names", result_actions_to_execute);
         }
 
         // For additional_result_filter setting
@@ -1790,7 +1802,7 @@ void Planner::buildPlanForQueryNode()
     }
 
     if (!select_query_options.only_analyze)
-        addBuildSubqueriesForSetsStepIfNeeded(query_plan, select_query_options, planner_context, useful_sets);
+        addBuildSubqueriesForSetsStepIfNeeded(query_plan, select_query_options, planner_context, result_actions_to_execute);
 
     query_node_to_plan_step_mapping[&query_node] = query_plan.getRootNode();
 }
diff --git a/src/Planner/PlannerActionsVisitor.cpp b/src/Planner/PlannerActionsVisitor.cpp
index 43177fc73c0..0b1be32d987 100644
--- a/src/Planner/PlannerActionsVisitor.cpp
+++ b/src/Planner/PlannerActionsVisitor.cpp
@@ -459,25 +459,33 @@ public:
         return node;
     }
 
-    const ActionsDAG::Node * addConstantIfNecessary(const std::string & node_name, const ColumnWithTypeAndName & column)
+    [[nodiscard]] String addConstantIfNecessary(
+        const std::string & node_name, const ColumnWithTypeAndName & column, bool always_use_const_column_for_constant_nodes)
     {
+        chassert(column.column != nullptr);
         auto it = node_name_to_node.find(node_name);
+        if (it != node_name_to_node.end() && (!always_use_const_column_for_constant_nodes || it->second->column))
+            return {node_name};
+
         if (it != node_name_to_node.end())
         {
-            /// It is possible that ActionsDAG already has an input with the same name as constant.
-            /// In this case, prefer constant to input.
-            /// Constatns affect function return type, which should be consistent with QueryTree.
-            /// Query example:
-            /// SELECT materialize(toLowCardinality('b')) || 'a' FROM remote('127.0.0.{1,2}', system, one) GROUP BY 'a'
-            bool materialized_input = it->second->type == ActionsDAG::ActionType::INPUT && !it->second->column;
-            if (!materialized_input)
-                return it->second;
+            /// There is a node with this name, but it doesn't have a column
+            /// This likely happens because we executed the query until WithMergeableState with a const node in the
+            /// WHERE clause and, as the results of headers are materialized, the column was removed
+            /// Let's add a new column and keep this
+            String dupped_name{node_name + "_dupped"};
+            if (node_name_to_node.find(dupped_name) != node_name_to_node.end())
+                return dupped_name;
+
+            const auto * node = &actions_dag.addColumn(column);
+            node_name_to_node[dupped_name] = node;
+            return dupped_name;
         }
 
         const auto * node = &actions_dag.addColumn(column);
         node_name_to_node[node->result_name] = node;
 
-        return node;
+        return {node_name};
     }
 
     template <typename FunctionOrOverloadResolver>
@@ -506,7 +514,7 @@ public:
     }
 
 private:
-    std::unordered_map<std::string_view, const ActionsDAG::Node *> node_name_to_node;
+    std::unordered_map<String, const ActionsDAG::Node *> node_name_to_node;
     ActionsDAG & actions_dag;
     QueryTreeNodePtr scope_node;
 };
@@ -514,9 +522,11 @@ private:
 class PlannerActionsVisitorImpl
 {
 public:
-    PlannerActionsVisitorImpl(ActionsDAG & actions_dag,
+    PlannerActionsVisitorImpl(
+        ActionsDAG & actions_dag,
         const PlannerContextPtr & planner_context_,
-        bool use_column_identifier_as_action_node_name_);
+        bool use_column_identifier_as_action_node_name_,
+        bool always_use_const_column_for_constant_nodes_);
 
     ActionsDAG::NodeRawConstPtrs visit(QueryTreeNodePtr expression_node);
 
@@ -576,14 +586,18 @@ private:
     const PlannerContextPtr planner_context;
     ActionNodeNameHelper action_node_name_helper;
     bool use_column_identifier_as_action_node_name;
+    bool always_use_const_column_for_constant_nodes;
 };
 
-PlannerActionsVisitorImpl::PlannerActionsVisitorImpl(ActionsDAG & actions_dag,
+PlannerActionsVisitorImpl::PlannerActionsVisitorImpl(
+    ActionsDAG & actions_dag,
     const PlannerContextPtr & planner_context_,
-    bool use_column_identifier_as_action_node_name_)
+    bool use_column_identifier_as_action_node_name_,
+    bool always_use_const_column_for_constant_nodes_)
     : 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_)
+    , always_use_const_column_for_constant_nodes(always_use_const_column_for_constant_nodes_)
 {
     actions_stack.emplace_back(actions_dag, nullptr);
 }
@@ -706,17 +720,16 @@ PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::vi
     column.type = constant_type;
     column.column = column.type->createColumnConst(1, constant_literal);
 
-    actions_stack[0].addConstantIfNecessary(constant_node_name, column);
+    String final_name = actions_stack[0].addConstantIfNecessary(constant_node_name, column, always_use_const_column_for_constant_nodes);
 
     size_t actions_stack_size = actions_stack.size();
     for (size_t i = 1; i < actions_stack_size; ++i)
     {
         auto & actions_stack_node = actions_stack[i];
-        actions_stack_node.addInputConstantColumnIfNecessary(constant_node_name, column);
+        actions_stack_node.addInputConstantColumnIfNecessary(final_name, column);
     }
 
-    return {constant_node_name, Levels(0)};
-
+    return {final_name, Levels(0)};
 }
 
 PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::visitLambda(const QueryTreeNodePtr & node)
@@ -740,15 +753,15 @@ PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::vi
         lambda_arguments_names_and_types.emplace_back(lambda_argument_name, std::move(lambda_argument_type));
     }
 
-    ActionsDAG lambda_actions_dag;
-    actions_stack.emplace_back(lambda_actions_dag, node);
+    auto lambda_actions_dag = std::make_shared<ActionsDAG>();
+    actions_stack.emplace_back(*lambda_actions_dag, node);
 
     auto [lambda_expression_node_name, levels] = visitImpl(lambda_node.getExpression());
-    lambda_actions_dag.getOutputs().push_back(actions_stack.back().getNodeOrThrow(lambda_expression_node_name));
-    lambda_actions_dag.removeUnusedActions(Names(1, lambda_expression_node_name));
+    lambda_actions_dag->getOutputs().push_back(actions_stack.back().getNodeOrThrow(lambda_expression_node_name));
+    lambda_actions_dag->removeUnusedActions(Names(1, lambda_expression_node_name));
 
     auto expression_actions_settings = ExpressionActionsSettings::fromContext(planner_context->getQueryContext(), CompileExpressions::yes);
-    auto lambda_actions = std::make_shared<ExpressionActions>(std::move(lambda_actions_dag), expression_actions_settings);
+    auto lambda_actions = std::make_shared<ExpressionActions>(lambda_actions_dag, expression_actions_settings);
 
     Names captured_column_names;
     ActionsDAG::NodeRawConstPtrs lambda_children;
@@ -845,16 +858,16 @@ PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::ma
     else
         column.column = std::move(column_set);
 
-    actions_stack[0].addConstantIfNecessary(column.name, column);
+    String final_name = actions_stack[0].addConstantIfNecessary(column.name, column, always_use_const_column_for_constant_nodes);
 
     size_t actions_stack_size = actions_stack.size();
     for (size_t i = 1; i < actions_stack_size; ++i)
     {
         auto & actions_stack_node = actions_stack[i];
-        actions_stack_node.addInputConstantColumnIfNecessary(column.name, column);
+        actions_stack_node.addInputConstantColumnIfNecessary(final_name, column);
     }
 
-    return {column.name, Levels(0)};
+    return {final_name, Levels(0)};
 }
 
 PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::visitIndexHintFunction(const QueryTreeNodePtr & node)
@@ -862,14 +875,14 @@ PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::vi
     const auto & function_node = node->as<FunctionNode &>();
     auto function_node_name = action_node_name_helper.calculateActionNodeName(node);
 
-    ActionsDAG index_hint_actions_dag;
-    auto & index_hint_actions_dag_outputs = index_hint_actions_dag.getOutputs();
+    auto index_hint_actions_dag = std::make_shared<ActionsDAG>();
+    auto & index_hint_actions_dag_outputs = index_hint_actions_dag->getOutputs();
     std::unordered_set<std::string_view> index_hint_actions_dag_output_node_names;
     PlannerActionsVisitor actions_visitor(planner_context);
 
     for (const auto & argument : function_node.getArguments())
     {
-        auto index_hint_argument_expression_dag_nodes = actions_visitor.visit(index_hint_actions_dag, argument);
+        auto index_hint_argument_expression_dag_nodes = actions_visitor.visit(*index_hint_actions_dag, argument);
 
         for (auto & expression_dag_node : index_hint_argument_expression_dag_nodes)
         {
@@ -991,14 +1004,19 @@ PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::vi
 
 }
 
-PlannerActionsVisitor::PlannerActionsVisitor(const PlannerContextPtr & planner_context_, bool use_column_identifier_as_action_node_name_)
+PlannerActionsVisitor::PlannerActionsVisitor(
+    const PlannerContextPtr & planner_context_,
+    bool use_column_identifier_as_action_node_name_,
+    bool always_use_const_column_for_constant_nodes_)
     : planner_context(planner_context_)
     , use_column_identifier_as_action_node_name(use_column_identifier_as_action_node_name_)
+    , always_use_const_column_for_constant_nodes(always_use_const_column_for_constant_nodes_)
 {}
 
 ActionsDAG::NodeRawConstPtrs PlannerActionsVisitor::visit(ActionsDAG & actions_dag, QueryTreeNodePtr expression_node)
 {
-    PlannerActionsVisitorImpl actions_visitor_impl(actions_dag, planner_context, use_column_identifier_as_action_node_name);
+    PlannerActionsVisitorImpl actions_visitor_impl(
+        actions_dag, planner_context, use_column_identifier_as_action_node_name, always_use_const_column_for_constant_nodes);
     return actions_visitor_impl.visit(expression_node);
 }
 
diff --git a/src/Planner/PlannerActionsVisitor.h b/src/Planner/PlannerActionsVisitor.h
index 4f608ad3f7b..45d21ce68a5 100644
--- a/src/Planner/PlannerActionsVisitor.h
+++ b/src/Planner/PlannerActionsVisitor.h
@@ -29,11 +29,17 @@ using PlannerContextPtr = std::shared_ptr<PlannerContext>;
   * During actions build, there is special handling for following functions:
   * 1. Aggregate functions are added in actions dag as INPUT nodes. Aggregate functions arguments are not added.
   * 2. For function `in` and its variants, already collected sets from planner context are used.
+  * 3. When building actions that use CONSTANT nodes, by default we ignore pre-existing INPUTs if those don't have
+  * a column (a const column always has a column). This is for compatibility with previous headers. We disable this
+  * behaviour when we explicitly want to override CONSTANT nodes with the input (resolving InterpolateNode for example)
   */
 class PlannerActionsVisitor
 {
 public:
-    explicit PlannerActionsVisitor(const PlannerContextPtr & planner_context_, bool use_column_identifier_as_action_node_name_ = true);
+    explicit PlannerActionsVisitor(
+        const PlannerContextPtr & planner_context_,
+        bool use_column_identifier_as_action_node_name_ = true,
+        bool always_use_const_column_for_constant_nodes_ = true);
 
     /** Add actions necessary to calculate expression node into expression dag.
       * Necessary actions are not added in actions dag output.
@@ -44,6 +50,7 @@ public:
 private:
     const PlannerContextPtr planner_context;
     bool use_column_identifier_as_action_node_name = true;
+    bool always_use_const_column_for_constant_nodes = true;
 };
 
 /** Calculate query tree expression node action dag name and add them into node to name map.
diff --git a/src/Planner/PlannerContext.h b/src/Planner/PlannerContext.h
index f35772ef7c0..418240fa34e 100644
--- a/src/Planner/PlannerContext.h
+++ b/src/Planner/PlannerContext.h
@@ -25,7 +25,7 @@ class TableNode;
 
 struct FiltersForTableExpression
 {
-    std::optional<ActionsDAG> filter_actions;
+    ActionsDAGPtr filter_actions;
     PrewhereInfoPtr prewhere_info;
 };
 
diff --git a/src/Planner/PlannerExpressionAnalysis.cpp b/src/Planner/PlannerExpressionAnalysis.cpp
index ed3f78193ee..2b67c96d843 100644
--- a/src/Planner/PlannerExpressionAnalysis.cpp
+++ b/src/Planner/PlannerExpressionAnalysis.cpp
@@ -462,9 +462,6 @@ SortAnalysisResult analyzeSort(const QueryNode & query_node,
         for (auto & interpolate_node : interpolate_list_node.getNodes())
         {
             auto & interpolate_node_typed = interpolate_node->as<InterpolateNode &>();
-            if (interpolate_node_typed.getExpression()->getNodeType() == QueryTreeNodeType::CONSTANT)
-               continue;
-
             interpolate_actions_visitor.visit(interpolate_actions_dag, interpolate_node_typed.getInterpolateExpression());
         }
 
diff --git a/src/Planner/PlannerExpressionAnalysis.h b/src/Planner/PlannerExpressionAnalysis.h
index 283fcac7aba..820df7131a7 100644
--- a/src/Planner/PlannerExpressionAnalysis.h
+++ b/src/Planner/PlannerExpressionAnalysis.h
@@ -64,7 +64,7 @@ public:
         : projection_analysis_result(std::move(projection_analysis_result_))
     {}
 
-    ProjectionAnalysisResult & getProjection()
+    const ProjectionAnalysisResult & getProjection() const
     {
         return projection_analysis_result;
     }
@@ -74,7 +74,7 @@ public:
         return where_analysis_result.filter_actions != nullptr;
     }
 
-    FilterAnalysisResult & getWhere()
+    const FilterAnalysisResult & getWhere() const
     {
         return where_analysis_result;
     }
@@ -89,7 +89,7 @@ public:
         return !aggregation_analysis_result.aggregation_keys.empty() || !aggregation_analysis_result.aggregate_descriptions.empty();
     }
 
-    AggregationAnalysisResult & getAggregation()
+    const AggregationAnalysisResult & getAggregation() const
     {
         return aggregation_analysis_result;
     }
@@ -104,7 +104,7 @@ public:
         return having_analysis_result.filter_actions != nullptr;
     }
 
-    FilterAnalysisResult & getHaving()
+    const FilterAnalysisResult & getHaving() const
     {
         return having_analysis_result;
     }
@@ -119,7 +119,7 @@ public:
         return !window_analysis_result.window_descriptions.empty();
     }
 
-    WindowAnalysisResult & getWindow()
+    const WindowAnalysisResult & getWindow() const
     {
         return window_analysis_result;
     }
@@ -134,7 +134,7 @@ public:
         return qualify_analysis_result.filter_actions != nullptr;
     }
 
-    FilterAnalysisResult & getQualify()
+    const FilterAnalysisResult & getQualify() const
     {
         return qualify_analysis_result;
     }
@@ -149,7 +149,7 @@ public:
         return sort_analysis_result.before_order_by_actions != nullptr;
     }
 
-    SortAnalysisResult & getSort()
+    const SortAnalysisResult & getSort() const
     {
         return sort_analysis_result;
     }
@@ -164,7 +164,7 @@ public:
         return limit_by_analysis_result.before_limit_by_actions != nullptr;
     }
 
-    LimitByAnalysisResult & getLimitBy()
+    const LimitByAnalysisResult & getLimitBy() const
     {
         return limit_by_analysis_result;
     }
diff --git a/src/Planner/PlannerJoinTree.cpp b/src/Planner/PlannerJoinTree.cpp
index 76583c82583..4fedacbb48a 100644
--- a/src/Planner/PlannerJoinTree.cpp
+++ b/src/Planner/PlannerJoinTree.cpp
@@ -417,27 +417,27 @@ void updatePrewhereOutputsIfNeeded(SelectQueryInfo & table_expression_query_info
             /// We evaluate sampling for Merge lazily so we need to get all the columns
             if (storage_snapshot->storage.getName() == "Merge")
             {
-                const auto columns = storage_snapshot->metadata->getColumns().getAll();
+                const auto columns = storage_snapshot->getMetadataForQuery()->getColumns().getAll();
                 for (const auto & column : columns)
                     required_columns.insert(column.name);
             }
             else
             {
-                auto columns_required_for_sampling = storage_snapshot->metadata->getColumnsRequiredForSampling();
+                auto columns_required_for_sampling = storage_snapshot->getMetadataForQuery()->getColumnsRequiredForSampling();
                 required_columns.insert(columns_required_for_sampling.begin(), columns_required_for_sampling.end());
             }
         }
 
         if (table_expression_modifiers->hasFinal())
         {
-            auto columns_required_for_final = storage_snapshot->metadata->getColumnsRequiredForFinal();
+            auto columns_required_for_final = storage_snapshot->getMetadataForQuery()->getColumnsRequiredForFinal();
             required_columns.insert(columns_required_for_final.begin(), columns_required_for_final.end());
         }
     }
 
     std::unordered_set<const ActionsDAG::Node *> required_output_nodes;
 
-    for (const auto * input : prewhere_actions.getInputs())
+    for (const auto * input : prewhere_actions->getInputs())
     {
         if (required_columns.contains(input->result_name))
             required_output_nodes.insert(input);
@@ -446,7 +446,7 @@ void updatePrewhereOutputsIfNeeded(SelectQueryInfo & table_expression_query_info
     if (required_output_nodes.empty())
         return;
 
-    auto & prewhere_outputs = prewhere_actions.getOutputs();
+    auto & prewhere_outputs = prewhere_actions->getOutputs();
     for (const auto & output : prewhere_outputs)
     {
         auto required_output_node_it = required_output_nodes.find(output);
@@ -459,7 +459,7 @@ void updatePrewhereOutputsIfNeeded(SelectQueryInfo & table_expression_query_info
     prewhere_outputs.insert(prewhere_outputs.end(), required_output_nodes.begin(), required_output_nodes.end());
 }
 
-std::optional<FilterDAGInfo> buildRowPolicyFilterIfNeeded(const StoragePtr & storage,
+FilterDAGInfo buildRowPolicyFilterIfNeeded(const StoragePtr & storage,
     SelectQueryInfo & table_expression_query_info,
     PlannerContextPtr & planner_context,
     std::set<std::string> & used_row_policies)
@@ -480,7 +480,7 @@ std::optional<FilterDAGInfo> buildRowPolicyFilterIfNeeded(const StoragePtr & sto
     return buildFilterInfo(row_policy_filter->expression, table_expression_query_info.table_expression, planner_context);
 }
 
-std::optional<FilterDAGInfo> buildCustomKeyFilterIfNeeded(const StoragePtr & storage,
+FilterDAGInfo buildCustomKeyFilterIfNeeded(const StoragePtr & storage,
     SelectQueryInfo & table_expression_query_info,
     PlannerContextPtr & planner_context)
 {
@@ -514,7 +514,7 @@ std::optional<FilterDAGInfo> buildCustomKeyFilterIfNeeded(const StoragePtr & sto
 }
 
 /// Apply filters from additional_table_filters setting
-std::optional<FilterDAGInfo> buildAdditionalFiltersIfNeeded(const StoragePtr & storage,
+FilterDAGInfo buildAdditionalFiltersIfNeeded(const StoragePtr & storage,
     const String & table_expression_alias,
     SelectQueryInfo & table_expression_query_info,
     PlannerContextPtr & planner_context)
@@ -590,21 +590,21 @@ UInt64 mainQueryNodeBlockSizeByLimit(const SelectQueryInfo & select_query_info)
 }
 
 std::unique_ptr<ExpressionStep> createComputeAliasColumnsStep(
-    std::unordered_map<std::string, ActionsDAG> & alias_column_expressions, const DataStream & current_data_stream)
+    const std::unordered_map<std::string, ActionsDAGPtr> & alias_column_expressions, const DataStream & current_data_stream)
 {
-    ActionsDAG merged_alias_columns_actions_dag(current_data_stream.header.getColumnsWithTypeAndName());
-    ActionsDAG::NodeRawConstPtrs action_dag_outputs = merged_alias_columns_actions_dag.getInputs();
+    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 (auto & [column_name, alias_column_actions_dag] : alias_column_expressions)
+    for (const auto & [column_name, alias_column_actions_dag] : alias_column_expressions)
     {
-        const auto & current_outputs = alias_column_actions_dag.getOutputs();
+        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));
+        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);
+        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");
@@ -647,8 +647,7 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
 
         auto table_expression_query_info = select_query_info;
         table_expression_query_info.table_expression = table_expression;
-        if (const auto & filter_actions = table_expression_data.getFilterActions())
-            table_expression_query_info.filter_actions_dag = std::make_shared<const ActionsDAG>(filter_actions->clone());
+        table_expression_query_info.filter_actions_dag = table_expression_data.getFilterActions();
         table_expression_query_info.current_table_chosen_for_reading_with_parallel_replicas
             = table_node == planner_context->getGlobalPlannerContext()->parallel_replicas_table;
 
@@ -779,7 +778,7 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
                 if (prewhere_actions)
                 {
                     prewhere_info = std::make_shared<PrewhereInfo>();
-                    prewhere_info->prewhere_actions = prewhere_actions->clone();
+                    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;
@@ -790,8 +789,11 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
                 const auto & columns_names = table_expression_data.getColumnNames();
 
                 std::vector<std::pair<FilterDAGInfo, std::string>> where_filters;
-                const auto add_filter = [&](FilterDAGInfo & filter_info, std::string description)
+                const auto add_filter = [&](const FilterDAGInfo & filter_info, std::string description)
                 {
+                    if (!filter_info.actions)
+                        return;
+
                     bool is_final = table_expression_query_info.table_expression_modifiers
                         && table_expression_query_info.table_expression_modifiers->hasFinal();
                     bool optimize_move_to_prewhere
@@ -801,45 +803,46 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
                     if (storage->canMoveConditionsToPrewhere() && optimize_move_to_prewhere && (!supported_prewhere_columns || supported_prewhere_columns->contains(filter_info.column_name)))
                     {
                         if (!prewhere_info)
-                        {
                             prewhere_info = std::make_shared<PrewhereInfo>();
-                            prewhere_info->prewhere_actions = std::move(filter_info.actions);
+
+                        if (!prewhere_info->prewhere_actions)
+                        {
+                            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 = std::move(filter_info.actions);
+                            prewhere_info->row_level_filter = filter_info.actions;
                             prewhere_info->row_level_column_name = filter_info.column_name;
                             prewhere_info->need_filter = true;
                         }
                         else
                         {
-                            where_filters.emplace_back(std::move(filter_info), std::move(description));
+                            where_filters.emplace_back(filter_info, std::move(description));
                         }
 
                     }
                     else
                     {
-                        where_filters.emplace_back(std::move(filter_info), std::move(description));
+                        where_filters.emplace_back(filter_info, std::move(description));
                     }
                 };
 
                 auto row_policy_filter_info
                     = buildRowPolicyFilterIfNeeded(storage, table_expression_query_info, planner_context, used_row_policies);
-                if (row_policy_filter_info)
-                {
-                    table_expression_data.setRowLevelFilterActions(row_policy_filter_info->actions.clone());
-                    add_filter(*row_policy_filter_info, "Row-level security filter");
-                }
+                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);
 
                 if (query_context->canUseParallelReplicasCustomKey())
                 {
                     if (settings.parallel_replicas_count > 1)
                     {
-                        if (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");
+                        auto parallel_replicas_custom_key_filter_info
+                            = buildCustomKeyFilterIfNeeded(storage, table_expression_query_info, planner_context);
+                        add_filter(parallel_replicas_custom_key_filter_info, "Parallel replicas custom key filter");
                     }
                     else if (auto * distributed = typeid_cast<StorageDistributed *>(storage.get());
                              distributed && query_context->canUseParallelReplicasCustomKeyForCluster(*distributed->getCluster()))
@@ -854,8 +857,9 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
                 }
 
                 const auto & table_expression_alias = table_expression->getOriginalAlias();
-                if (auto additional_filters_info = buildAdditionalFiltersIfNeeded(storage, table_expression_alias, table_expression_query_info, planner_context))
-                    add_filter(*additional_filters_info, "additional filter");
+                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);
@@ -893,6 +897,31 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
                 /// query_plan can be empty if there is nothing to read
                 if (query_plan.isInitialized() && parallel_replicas_enabled_for_storage(storage, settings))
                 {
+                    // (1) find read step
+                    QueryPlan::Node * node = query_plan.getRootNode();
+                    ReadFromMergeTree * reading = nullptr;
+                    while (node)
+                    {
+                        reading = typeid_cast<ReadFromMergeTree *>(node->step.get());
+                        if (reading)
+                            break;
+
+                        QueryPlan::Node * prev_node = node;
+                        if (!node->children.empty())
+                        {
+                            chassert(node->children.size() == 1);
+                            node = node->children.at(0);
+                        }
+                        else
+                        {
+                            throw Exception(
+                                ErrorCodes::LOGICAL_ERROR,
+                                "Step is expected to be ReadFromMergeTree but it's {}",
+                                prev_node->step->getName());
+                        }
+                    }
+
+                    chassert(reading);
                     if (query_context->canUseParallelReplicasCustomKey() && query_context->getClientInfo().distributed_depth == 0)
                     {
                         if (auto cluster = query_context->getClusterForParallelReplicas();
@@ -915,50 +944,21 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
                             query_plan = std::move(query_plan_parallel_replicas);
                         }
                     }
-                    else if (ClusterProxy::canUseParallelReplicasOnInitiator(query_context))
+                    else if (query_context->canUseParallelReplicasOnInitiator())
                     {
-                        // (1) find read step
-                        QueryPlan::Node * node = query_plan.getRootNode();
-                        ReadFromMergeTree * reading = nullptr;
-                        while (node)
-                        {
-                            reading = typeid_cast<ReadFromMergeTree *>(node->step.get());
-                            if (reading)
-                                break;
-
-                            QueryPlan::Node * prev_node = node;
-                            if (!node->children.empty())
-                            {
-                                chassert(node->children.size() == 1);
-                                node = node->children.at(0);
-                            }
-                            else
-                            {
-                                throw Exception(
-                                    ErrorCodes::LOGICAL_ERROR,
-                                    "Step is expected to be ReadFromMergeTree but it's {}",
-                                    prev_node->step->getName());
-                            }
-                        }
-
-                        chassert(reading);
-
                         // (2) if it's ReadFromMergeTree - run index analysis and check number of rows to read
                         if (settings.parallel_replicas_min_number_of_rows_per_replica > 0)
                         {
                             auto result_ptr = reading->selectRangesToRead();
+
                             UInt64 rows_to_read = result_ptr->selected_rows;
-
-                            reading->setAnalyzedResult(std::move(result_ptr));
-
                             if (table_expression_query_info.trivial_limit > 0 && table_expression_query_info.trivial_limit < rows_to_read)
                                 rows_to_read = table_expression_query_info.trivial_limit;
 
                             if (max_block_size_limited && (max_block_size_limited < rows_to_read))
                                 rows_to_read = max_block_size_limited;
 
-                            const size_t number_of_replicas_to_use
-                                = rows_to_read / settings.parallel_replicas_min_number_of_rows_per_replica;
+                            const size_t number_of_replicas_to_use = rows_to_read / settings.parallel_replicas_min_number_of_rows_per_replica;
                             LOG_TRACE(
                                 getLogger("Planner"),
                                 "Estimated {} rows to read. It is enough work for {} parallel replicas",
@@ -984,7 +984,6 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
                         {
                             from_stage = QueryProcessingStage::WithMergeableState;
                             QueryPlan query_plan_parallel_replicas;
-                            QueryPlanStepPtr reading_step = std::move(node->step);
                             ClusterProxy::executeQueryWithParallelReplicas(
                                 query_plan_parallel_replicas,
                                 storage->getStorageID(),
@@ -992,41 +991,28 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
                                 table_expression_query_info.query_tree,
                                 table_expression_query_info.planner_context,
                                 query_context,
-                                table_expression_query_info.storage_limits,
-                                std::move(reading_step));
+                                table_expression_query_info.storage_limits);
                             query_plan = std::move(query_plan_parallel_replicas);
                         }
-                        else
-                        {
-                            QueryPlan query_plan_no_parallel_replicas;
-                            storage->read(
-                                query_plan_no_parallel_replicas,
-                                columns_names,
-                                storage_snapshot,
-                                table_expression_query_info,
-                                query_context,
-                                from_stage,
-                                max_block_size,
-                                max_streams);
-                            query_plan = std::move(query_plan_no_parallel_replicas);
-                        }
                     }
                 }
 
-                auto & alias_column_expressions = table_expression_data.getAliasColumnExpressions();
+                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 (auto && [filter_info, description] : where_filters)
+                for (const auto & filter_info_and_description : where_filters)
                 {
+                    const auto & [filter_info, description] = filter_info_and_description;
                     if (query_plan.isInitialized() &&
-                        from_stage == QueryProcessingStage::FetchColumns)
+                        from_stage == QueryProcessingStage::FetchColumns &&
+                        filter_info.actions)
                     {
                         auto filter_step = std::make_unique<FilterStep>(query_plan.getCurrentDataStream(),
-                            std::move(filter_info.actions),
+                            filter_info.actions,
                             filter_info.column_name,
                             filter_info.do_remove_column);
                         filter_step->setStepDescription(description);
@@ -1102,7 +1088,7 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
             query_plan = std::move(subquery_planner).extractQueryPlan();
         }
 
-        auto & alias_column_expressions = table_expression_data.getAliasColumnExpressions();
+        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());
@@ -1117,21 +1103,21 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
 
     if (from_stage == QueryProcessingStage::FetchColumns)
     {
-        ActionsDAG rename_actions_dag(query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName());
+        auto rename_actions_dag = std::make_shared<ActionsDAG>(query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName());
         ActionsDAG::NodeRawConstPtrs updated_actions_dag_outputs;
 
-        for (auto & output_node : rename_actions_dag.getOutputs())
+        for (auto & output_node : rename_actions_dag->getOutputs())
         {
             const auto * column_identifier = table_expression_data.getColumnIdentifierOrNull(output_node->result_name);
             if (!column_identifier)
                 continue;
 
-            updated_actions_dag_outputs.push_back(&rename_actions_dag.addAlias(*output_node, *column_identifier));
+            updated_actions_dag_outputs.push_back(&rename_actions_dag->addAlias(*output_node, *column_identifier));
         }
 
-        rename_actions_dag.getOutputs() = std::move(updated_actions_dag_outputs);
+        rename_actions_dag->getOutputs() = std::move(updated_actions_dag_outputs);
 
-        auto rename_step = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), std::move(rename_actions_dag));
+        auto rename_step = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), rename_actions_dag);
         rename_step->setStepDescription("Change column names to column identifiers");
         query_plan.addStep(std::move(rename_step));
     }
@@ -1171,9 +1157,9 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
 
 void joinCastPlanColumnsToNullable(QueryPlan & plan_to_add_cast, PlannerContextPtr & planner_context, const FunctionOverloadResolverPtr & to_nullable_function)
 {
-    ActionsDAG cast_actions_dag(plan_to_add_cast.getCurrentDataStream().header.getColumnsWithTypeAndName());
+    auto cast_actions_dag = std::make_shared<ActionsDAG>(plan_to_add_cast.getCurrentDataStream().header.getColumnsWithTypeAndName());
 
-    for (auto & output_node : cast_actions_dag.getOutputs())
+    for (auto & output_node : cast_actions_dag->getOutputs())
     {
         if (planner_context->getGlobalPlannerContext()->hasColumnIdentifier(output_node->result_name))
         {
@@ -1182,11 +1168,11 @@ void joinCastPlanColumnsToNullable(QueryPlan & plan_to_add_cast, PlannerContextP
                 type_to_check = type_to_check_low_cardinality->getDictionaryType();
 
             if (type_to_check->canBeInsideNullable())
-                output_node = &cast_actions_dag.addFunction(to_nullable_function, {output_node}, output_node->result_name);
+                output_node = &cast_actions_dag->addFunction(to_nullable_function, {output_node}, output_node->result_name);
         }
     }
 
-    cast_actions_dag.appendInputsForUnusedColumns(plan_to_add_cast.getCurrentDataStream().header);
+    cast_actions_dag->appendInputsForUnusedColumns(plan_to_add_cast.getCurrentDataStream().header);
     auto cast_join_columns_step = std::make_unique<ExpressionStep>(plan_to_add_cast.getCurrentDataStream(), std::move(cast_actions_dag));
     cast_join_columns_step->setStepDescription("Cast JOIN columns to Nullable");
     plan_to_add_cast.addStep(std::move(cast_join_columns_step));
@@ -1232,16 +1218,14 @@ JoinTreeQueryPlan buildQueryPlanForJoinNode(const QueryTreeNodePtr & join_table_
             join_table_expression,
             planner_context);
 
-        join_clauses_and_actions.left_join_expressions_actions.appendInputsForUnusedColumns(left_plan.getCurrentDataStream().header);
-        auto left_join_expressions_actions_step = std::make_unique<ExpressionStep>(left_plan.getCurrentDataStream(), std::move(join_clauses_and_actions.left_join_expressions_actions));
+        join_clauses_and_actions.left_join_expressions_actions->appendInputsForUnusedColumns(left_plan.getCurrentDataStream().header);
+        auto left_join_expressions_actions_step = std::make_unique<ExpressionStep>(left_plan.getCurrentDataStream(), join_clauses_and_actions.left_join_expressions_actions);
         left_join_expressions_actions_step->setStepDescription("JOIN actions");
-        appendSetsFromActionsDAG(left_join_expressions_actions_step->getExpression(), left_join_tree_query_plan.useful_sets);
         left_plan.addStep(std::move(left_join_expressions_actions_step));
 
-        join_clauses_and_actions.right_join_expressions_actions.appendInputsForUnusedColumns(right_plan.getCurrentDataStream().header);
-        auto right_join_expressions_actions_step = std::make_unique<ExpressionStep>(right_plan.getCurrentDataStream(), std::move(join_clauses_and_actions.right_join_expressions_actions));
+        join_clauses_and_actions.right_join_expressions_actions->appendInputsForUnusedColumns(right_plan.getCurrentDataStream().header);
+        auto right_join_expressions_actions_step = std::make_unique<ExpressionStep>(right_plan.getCurrentDataStream(), join_clauses_and_actions.right_join_expressions_actions);
         right_join_expressions_actions_step->setStepDescription("JOIN actions");
-        appendSetsFromActionsDAG(right_join_expressions_actions_step->getExpression(), right_join_tree_query_plan.useful_sets);
         right_plan.addStep(std::move(right_join_expressions_actions_step));
     }
 
@@ -1279,19 +1263,19 @@ JoinTreeQueryPlan buildQueryPlanForJoinNode(const QueryTreeNodePtr & join_table_
 
     auto join_cast_plan_output_nodes = [&](QueryPlan & plan_to_add_cast, std::unordered_map<std::string, DataTypePtr> & plan_column_name_to_cast_type)
     {
-        ActionsDAG cast_actions_dag(plan_to_add_cast.getCurrentDataStream().header.getColumnsWithTypeAndName());
+        auto cast_actions_dag = std::make_shared<ActionsDAG>(plan_to_add_cast.getCurrentDataStream().header.getColumnsWithTypeAndName());
 
-        for (auto & output_node : cast_actions_dag.getOutputs())
+        for (auto & output_node : cast_actions_dag->getOutputs())
         {
             auto it = plan_column_name_to_cast_type.find(output_node->result_name);
             if (it == plan_column_name_to_cast_type.end())
                 continue;
 
             const auto & cast_type = it->second;
-            output_node = &cast_actions_dag.addCast(*output_node, cast_type, output_node->result_name);
+            output_node = &cast_actions_dag->addCast(*output_node, cast_type, output_node->result_name);
         }
 
-        cast_actions_dag.appendInputsForUnusedColumns(plan_to_add_cast.getCurrentDataStream().header);
+        cast_actions_dag->appendInputsForUnusedColumns(plan_to_add_cast.getCurrentDataStream().header);
         auto cast_join_columns_step
             = std::make_unique<ExpressionStep>(plan_to_add_cast.getCurrentDataStream(), std::move(cast_actions_dag));
         cast_join_columns_step->setStepDescription("Cast JOIN USING columns");
@@ -1434,10 +1418,8 @@ JoinTreeQueryPlan buildQueryPlanForJoinNode(const QueryTreeNodePtr & join_table_
         {
             ExpressionActionsPtr & mixed_join_expression = table_join->getMixedJoinExpression();
             mixed_join_expression = std::make_shared<ExpressionActions>(
-                std::move(*join_clauses_and_actions.mixed_join_expressions_actions),
+                join_clauses_and_actions.mixed_join_expressions_actions,
                 ExpressionActionsSettings::fromContext(planner_context->getQueryContext()));
-
-            appendSetsFromActionsDAG(mixed_join_expression->getActionsDAG(), left_join_tree_query_plan.useful_sets);
         }
     }
     else if (join_node.isUsingJoinExpression())
@@ -1483,8 +1465,7 @@ JoinTreeQueryPlan buildQueryPlanForJoinNode(const QueryTreeNodePtr & join_table_
 
     auto result_plan = QueryPlan();
 
-    bool is_filled_join = join_algorithm->isFilled();
-    if (is_filled_join)
+    if (join_algorithm->isFilled())
     {
         auto filled_join_step = std::make_unique<FilledJoinStep>(
             left_plan.getCurrentDataStream(),
@@ -1593,12 +1574,12 @@ JoinTreeQueryPlan buildQueryPlanForJoinNode(const QueryTreeNodePtr & join_table_
         result_plan.unitePlans(std::move(join_step), {std::move(plans)});
     }
 
-    ActionsDAG drop_unused_columns_after_join_actions_dag(result_plan.getCurrentDataStream().header.getColumnsWithTypeAndName());
+    auto drop_unused_columns_after_join_actions_dag = std::make_shared<ActionsDAG>(result_plan.getCurrentDataStream().header.getColumnsWithTypeAndName());
     ActionsDAG::NodeRawConstPtrs drop_unused_columns_after_join_actions_dag_updated_outputs;
     std::unordered_set<std::string_view> drop_unused_columns_after_join_actions_dag_updated_outputs_names;
     std::optional<size_t> first_skipped_column_node_index;
 
-    auto & drop_unused_columns_after_join_actions_dag_outputs = drop_unused_columns_after_join_actions_dag.getOutputs();
+    auto & drop_unused_columns_after_join_actions_dag_outputs = drop_unused_columns_after_join_actions_dag->getOutputs();
     size_t drop_unused_columns_after_join_actions_dag_outputs_size = drop_unused_columns_after_join_actions_dag_outputs.size();
 
     for (size_t i = 0; i < drop_unused_columns_after_join_actions_dag_outputs_size; ++i)
@@ -1637,10 +1618,15 @@ JoinTreeQueryPlan buildQueryPlanForJoinNode(const QueryTreeNodePtr & join_table_
     for (const auto & right_join_tree_query_plan_row_policy : right_join_tree_query_plan.used_row_policies)
         left_join_tree_query_plan.used_row_policies.insert(right_join_tree_query_plan_row_policy);
 
-    /// Collect all required actions sets in `left_join_tree_query_plan.useful_sets`
-    if (!is_filled_join)
-        for (const auto & useful_set : right_join_tree_query_plan.useful_sets)
-            left_join_tree_query_plan.useful_sets.insert(useful_set);
+    /// Collect all required actions dags in `left_join_tree_query_plan.actions_dags`
+    for (auto && action_dag : right_join_tree_query_plan.actions_dags)
+        left_join_tree_query_plan.actions_dags.emplace_back(action_dag);
+    if (join_clauses_and_actions.left_join_expressions_actions)
+        left_join_tree_query_plan.actions_dags.emplace_back(std::move(join_clauses_and_actions.left_join_expressions_actions));
+    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));
+    if (join_clauses_and_actions.mixed_join_expressions_actions)
+        left_join_tree_query_plan.actions_dags.push_back(join_clauses_and_actions.mixed_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;
@@ -1650,7 +1636,7 @@ JoinTreeQueryPlan buildQueryPlanForJoinNode(const QueryTreeNodePtr & join_table_
         .query_plan = std::move(result_plan),
         .from_stage = QueryProcessingStage::FetchColumns,
         .used_row_policies = std::move(left_join_tree_query_plan.used_row_policies),
-        .useful_sets = std::move(left_join_tree_query_plan.useful_sets),
+        .actions_dags = std::move(left_join_tree_query_plan.actions_dags),
         .query_node_to_plan_step_mapping = std::move(mapping),
     };
 }
@@ -1670,7 +1656,7 @@ JoinTreeQueryPlan buildQueryPlanForArrayJoinNode(const QueryTreeNodePtr & array_
     auto plan = std::move(join_tree_query_plan.query_plan);
     auto plan_output_columns = plan.getCurrentDataStream().header.getColumnsWithTypeAndName();
 
-    ActionsDAG array_join_action_dag(plan_output_columns);
+    ActionsDAGPtr array_join_action_dag = std::make_shared<ActionsDAG>(plan_output_columns);
     PlannerActionsVisitor actions_visitor(planner_context);
     std::unordered_set<std::string> array_join_expressions_output_nodes;
 
@@ -1681,28 +1667,29 @@ JoinTreeQueryPlan buildQueryPlanForArrayJoinNode(const QueryTreeNodePtr & array_
         array_join_column_names.insert(array_join_column_identifier);
 
         auto & array_join_expression_column = array_join_expression->as<ColumnNode &>();
-        auto expression_dag_index_nodes = actions_visitor.visit(array_join_action_dag, array_join_expression_column.getExpressionOrThrow());
+        auto expression_dag_index_nodes = actions_visitor.visit(*array_join_action_dag, array_join_expression_column.getExpressionOrThrow());
 
         for (auto & expression_dag_index_node : expression_dag_index_nodes)
         {
-            const auto * array_join_column_node = &array_join_action_dag.addAlias(*expression_dag_index_node, array_join_column_identifier);
-            array_join_action_dag.getOutputs().push_back(array_join_column_node);
+            const auto * array_join_column_node = &array_join_action_dag->addAlias(*expression_dag_index_node, array_join_column_identifier);
+            array_join_action_dag->getOutputs().push_back(array_join_column_node);
             array_join_expressions_output_nodes.insert(array_join_column_node->result_name);
         }
     }
 
-    array_join_action_dag.appendInputsForUnusedColumns(plan.getCurrentDataStream().header);
+    array_join_action_dag->appendInputsForUnusedColumns(plan.getCurrentDataStream().header);
 
-    auto array_join_actions = std::make_unique<ExpressionStep>(plan.getCurrentDataStream(), std::move(array_join_action_dag));
+    join_tree_query_plan.actions_dags.push_back(array_join_action_dag);
+
+    auto array_join_actions = std::make_unique<ExpressionStep>(plan.getCurrentDataStream(), array_join_action_dag);
     array_join_actions->setStepDescription("ARRAY JOIN actions");
-    appendSetsFromActionsDAG(array_join_actions->getExpression(), join_tree_query_plan.useful_sets);
     plan.addStep(std::move(array_join_actions));
 
-    ActionsDAG drop_unused_columns_before_array_join_actions_dag(plan.getCurrentDataStream().header.getColumnsWithTypeAndName());
+    auto drop_unused_columns_before_array_join_actions_dag = std::make_shared<ActionsDAG>(plan.getCurrentDataStream().header.getColumnsWithTypeAndName());
     ActionsDAG::NodeRawConstPtrs drop_unused_columns_before_array_join_actions_dag_updated_outputs;
     std::unordered_set<std::string_view> drop_unused_columns_before_array_join_actions_dag_updated_outputs_names;
 
-    auto & drop_unused_columns_before_array_join_actions_dag_outputs = drop_unused_columns_before_array_join_actions_dag.getOutputs();
+    auto & drop_unused_columns_before_array_join_actions_dag_outputs = drop_unused_columns_before_array_join_actions_dag->getOutputs();
     size_t drop_unused_columns_before_array_join_actions_dag_outputs_size = drop_unused_columns_before_array_join_actions_dag_outputs.size();
 
     for (size_t i = 0; i < drop_unused_columns_before_array_join_actions_dag_outputs_size; ++i)
@@ -1736,7 +1723,7 @@ JoinTreeQueryPlan buildQueryPlanForArrayJoinNode(const QueryTreeNodePtr & array_
         .query_plan = std::move(plan),
         .from_stage = QueryProcessingStage::FetchColumns,
         .used_row_policies = std::move(join_tree_query_plan.used_row_policies),
-        .useful_sets = std::move(join_tree_query_plan.useful_sets),
+        .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 259622b1d50..9110b2bfef9 100644
--- a/src/Planner/PlannerJoinTree.h
+++ b/src/Planner/PlannerJoinTree.h
@@ -11,14 +11,12 @@
 namespace DB
 {
 
-using UsefulSets = std::unordered_set<FutureSetPtr>;
-
 struct JoinTreeQueryPlan
 {
     QueryPlan query_plan;
     QueryProcessingStage::Enum from_stage;
     std::set<std::string> used_row_policies{};
-    UsefulSets useful_sets{};
+    std::vector<ActionsDAGPtr> actions_dags{};
     std::unordered_map<const QueryNode *, const QueryPlan::Node *> query_node_to_plan_step_mapping{};
 };
 
diff --git a/src/Planner/PlannerJoins.cpp b/src/Planner/PlannerJoins.cpp
index 42aeb2b9b1d..d9360a58240 100644
--- a/src/Planner/PlannerJoins.cpp
+++ b/src/Planner/PlannerJoins.cpp
@@ -180,13 +180,13 @@ std::set<JoinTableSide> extractJoinTableSidesFromExpression(//const ActionsDAG::
 }
 
 const ActionsDAG::Node * appendExpression(
-    ActionsDAG & dag,
+    ActionsDAGPtr & dag,
     const QueryTreeNodePtr & expression,
     const PlannerContextPtr & planner_context,
     const JoinNode & join_node)
 {
     PlannerActionsVisitor join_expression_visitor(planner_context);
-    auto join_expression_dag_node_raw_pointers = join_expression_visitor.visit(dag, expression);
+    auto join_expression_dag_node_raw_pointers = join_expression_visitor.visit(*dag, expression);
     if (join_expression_dag_node_raw_pointers.size() != 1)
         throw Exception(ErrorCodes::LOGICAL_ERROR,
             "JOIN {} ON clause contains multiple expressions",
@@ -196,9 +196,9 @@ const ActionsDAG::Node * appendExpression(
 }
 
 void buildJoinClause(
-    ActionsDAG & left_dag,
-    ActionsDAG & right_dag,
-    ActionsDAG & mixed_dag,
+    ActionsDAGPtr & left_dag,
+    ActionsDAGPtr & right_dag,
+    ActionsDAGPtr & mixed_dag,
     const PlannerContextPtr & planner_context,
     const QueryTreeNodePtr & join_expression,
     const TableExpressionSet & left_table_expressions,
@@ -379,8 +379,8 @@ JoinClausesAndActions buildJoinClausesAndActions(
     const JoinNode & join_node,
     const PlannerContextPtr & planner_context)
 {
-    ActionsDAG left_join_actions(left_table_expression_columns);
-    ActionsDAG right_join_actions(right_table_expression_columns);
+    ActionsDAGPtr left_join_actions = std::make_shared<ActionsDAG>(left_table_expression_columns);
+    ActionsDAGPtr right_join_actions = std::make_shared<ActionsDAG>(right_table_expression_columns);
     ColumnsWithTypeAndName mixed_table_expression_columns;
     for (const auto & left_column : left_table_expression_columns)
     {
@@ -390,7 +390,7 @@ JoinClausesAndActions buildJoinClausesAndActions(
     {
         mixed_table_expression_columns.push_back(right_column);
     }
-    ActionsDAG mixed_join_actions(mixed_table_expression_columns);
+    ActionsDAGPtr mixed_join_actions = std::make_shared<ActionsDAG>(mixed_table_expression_columns);
 
     /** It is possible to have constant value in JOIN ON section, that we need to ignore during DAG construction.
       * If we do not ignore it, this function will be replaced by underlying constant.
@@ -494,12 +494,6 @@ JoinClausesAndActions buildJoinClausesAndActions(
             necessary_names.push_back(name);
     };
 
-    bool is_join_with_special_storage = false;
-    if (const auto * right_table_node = join_node.getRightTableExpression()->as<TableNode>())
-    {
-        is_join_with_special_storage = dynamic_cast<const StorageJoin *>(right_table_node->getStorage().get());
-    }
-
     for (auto & join_clause : result.join_clauses)
     {
         const auto & left_filter_condition_nodes = join_clause.getLeftFilterConditionNodes();
@@ -507,12 +501,12 @@ JoinClausesAndActions buildJoinClausesAndActions(
         {
             const ActionsDAG::Node * dag_filter_condition_node = nullptr;
             if (left_filter_condition_nodes.size() > 1)
-                dag_filter_condition_node = &left_join_actions.addFunction(and_function, left_filter_condition_nodes, {});
+                dag_filter_condition_node = &left_join_actions->addFunction(and_function, left_filter_condition_nodes, {});
             else
                 dag_filter_condition_node = left_filter_condition_nodes[0];
 
             join_clause.getLeftFilterConditionNodes() = {dag_filter_condition_node};
-            left_join_actions.addOrReplaceInOutputs(*dag_filter_condition_node);
+            left_join_actions->addOrReplaceInOutputs(*dag_filter_condition_node);
 
             add_necessary_name_if_needed(JoinTableSide::Left, dag_filter_condition_node->result_name);
         }
@@ -523,12 +517,12 @@ JoinClausesAndActions buildJoinClausesAndActions(
             const ActionsDAG::Node * dag_filter_condition_node = nullptr;
 
             if (right_filter_condition_nodes.size() > 1)
-                dag_filter_condition_node = &right_join_actions.addFunction(and_function, right_filter_condition_nodes, {});
+                dag_filter_condition_node = &right_join_actions->addFunction(and_function, right_filter_condition_nodes, {});
             else
                 dag_filter_condition_node = right_filter_condition_nodes[0];
 
             join_clause.getRightFilterConditionNodes() = {dag_filter_condition_node};
-            right_join_actions.addOrReplaceInOutputs(*dag_filter_condition_node);
+            right_join_actions->addOrReplaceInOutputs(*dag_filter_condition_node);
 
             add_necessary_name_if_needed(JoinTableSide::Right, dag_filter_condition_node->result_name);
         }
@@ -565,10 +559,10 @@ JoinClausesAndActions buildJoinClausesAndActions(
                 }
 
                 if (!left_key_node->result_type->equals(*common_type))
-                    left_key_node = &left_join_actions.addCast(*left_key_node, common_type, {});
+                    left_key_node = &left_join_actions->addCast(*left_key_node, common_type, {});
 
-                if (!is_join_with_special_storage && !right_key_node->result_type->equals(*common_type))
-                    right_key_node = &right_join_actions.addCast(*right_key_node, common_type, {});
+                if (!right_key_node->result_type->equals(*common_type))
+                    right_key_node = &right_join_actions->addCast(*right_key_node, common_type, {});
             }
 
             if (join_clause.isNullsafeCompareKey(i) && left_key_node->result_type->isNullable() && right_key_node->result_type->isNullable())
@@ -585,24 +579,24 @@ JoinClausesAndActions buildJoinClausesAndActions(
                   *   SELECT * FROM t1 JOIN t2 ON tuple(t1.a) == tuple(t2.b)
                   */
                 auto wrap_nullsafe_function = FunctionFactory::instance().get("tuple", planner_context->getQueryContext());
-                left_key_node = &left_join_actions.addFunction(wrap_nullsafe_function, {left_key_node}, {});
-                right_key_node = &right_join_actions.addFunction(wrap_nullsafe_function, {right_key_node}, {});
+                left_key_node = &left_join_actions->addFunction(wrap_nullsafe_function, {left_key_node}, {});
+                right_key_node = &right_join_actions->addFunction(wrap_nullsafe_function, {right_key_node}, {});
             }
 
-            left_join_actions.addOrReplaceInOutputs(*left_key_node);
-            right_join_actions.addOrReplaceInOutputs(*right_key_node);
+            left_join_actions->addOrReplaceInOutputs(*left_key_node);
+            right_join_actions->addOrReplaceInOutputs(*right_key_node);
 
             add_necessary_name_if_needed(JoinTableSide::Left, left_key_node->result_name);
             add_necessary_name_if_needed(JoinTableSide::Right, right_key_node->result_name);
         }
     }
 
-    result.left_join_expressions_actions = left_join_actions.clone();
+    result.left_join_expressions_actions = left_join_actions->clone();
     result.left_join_tmp_expression_actions = std::move(left_join_actions);
-    result.left_join_expressions_actions.removeUnusedActions(join_left_actions_names);
-    result.right_join_expressions_actions = right_join_actions.clone();
+    result.left_join_expressions_actions->removeUnusedActions(join_left_actions_names);
+    result.right_join_expressions_actions = right_join_actions->clone();
     result.right_join_tmp_expression_actions = std::move(right_join_actions);
-    result.right_join_expressions_actions.removeUnusedActions(join_right_actions_names);
+    result.right_join_expressions_actions->removeUnusedActions(join_right_actions_names);
 
     if (is_inequal_join)
     {
@@ -610,24 +604,24 @@ JoinClausesAndActions buildJoinClausesAndActions(
         /// So, for each column, we recalculate the value of the whole expression from JOIN ON to check if rows should be joined.
         if (result.join_clauses.size() > 1)
         {
-            ActionsDAG mixed_join_expressions_actions(mixed_table_expression_columns);
+            auto mixed_join_expressions_actions = std::make_shared<ActionsDAG>(mixed_table_expression_columns);
             PlannerActionsVisitor join_expression_visitor(planner_context);
-            auto join_expression_dag_node_raw_pointers = join_expression_visitor.visit(mixed_join_expressions_actions, join_expression);
+            auto join_expression_dag_node_raw_pointers = join_expression_visitor.visit(*mixed_join_expressions_actions, join_expression);
             if (join_expression_dag_node_raw_pointers.size() != 1)
                 throw Exception(
                     ErrorCodes::LOGICAL_ERROR, "JOIN {} ON clause contains multiple expressions", join_node.formatASTForErrorMessage());
 
-            mixed_join_expressions_actions.addOrReplaceInOutputs(*join_expression_dag_node_raw_pointers[0]);
+            mixed_join_expressions_actions->addOrReplaceInOutputs(*join_expression_dag_node_raw_pointers[0]);
             Names required_names{join_expression_dag_node_raw_pointers[0]->result_name};
-            mixed_join_expressions_actions.removeUnusedActions(required_names);
-            result.mixed_join_expressions_actions = std::move(mixed_join_expressions_actions);
+            mixed_join_expressions_actions->removeUnusedActions(required_names);
+            result.mixed_join_expressions_actions = mixed_join_expressions_actions;
         }
         else
         {
             const auto & join_clause = result.join_clauses.front();
             const auto & mixed_filter_condition_nodes = join_clause.getMixedFilterConditionNodes();
             auto mixed_join_expressions_actions = ActionsDAG::buildFilterActionsDAG(mixed_filter_condition_nodes, {}, true);
-            result.mixed_join_expressions_actions = std::move(mixed_join_expressions_actions);
+            result.mixed_join_expressions_actions = mixed_join_expressions_actions;
         }
         auto outputs = result.mixed_join_expressions_actions->getOutputs();
         if (outputs.size() != 1)
diff --git a/src/Planner/PlannerJoins.h b/src/Planner/PlannerJoins.h
index d8665ab7739..8adf6edd7ea 100644
--- a/src/Planner/PlannerJoins.h
+++ b/src/Planner/PlannerJoins.h
@@ -182,15 +182,15 @@ struct JoinClausesAndActions
     /// Join clauses. Actions dag nodes point into join_expression_actions.
     JoinClauses join_clauses;
     /// Whole JOIN ON section expressions
-    ActionsDAG left_join_tmp_expression_actions;
-    ActionsDAG right_join_tmp_expression_actions;
+    ActionsDAGPtr left_join_tmp_expression_actions;
+    ActionsDAGPtr right_join_tmp_expression_actions;
     /// Left join expressions actions
-    ActionsDAG left_join_expressions_actions;
+    ActionsDAGPtr left_join_expressions_actions;
     /// Right join expressions actions
-    ActionsDAG right_join_expressions_actions;
+    ActionsDAGPtr right_join_expressions_actions;
     /// Originally used for inequal join. it's the total join expression.
     /// If there is no inequal join conditions, it's null.
-    std::optional<ActionsDAG> mixed_join_expressions_actions;
+    ActionsDAGPtr mixed_join_expressions_actions;
 };
 
 /** Calculate join clauses and actions for JOIN ON section.
diff --git a/src/Planner/TableExpressionData.h b/src/Planner/TableExpressionData.h
index 72412a869e4..9723a00a356 100644
--- a/src/Planner/TableExpressionData.h
+++ b/src/Planner/TableExpressionData.h
@@ -73,7 +73,7 @@ public:
     }
 
     /// Add alias column
-    void addAliasColumn(const NameAndTypePair & column, const ColumnIdentifier & column_identifier, ActionsDAG actions_dag, bool is_selected_column = true)
+    void addAliasColumn(const NameAndTypePair & column, const ColumnIdentifier & column_identifier, ActionsDAGPtr actions_dag, bool is_selected_column = true)
     {
         alias_column_expressions.emplace(column.name, std::move(actions_dag));
         addColumnImpl(column, column_identifier, is_selected_column);
@@ -94,7 +94,7 @@ public:
     }
 
     /// Get ALIAS columns names mapped to expressions
-    std::unordered_map<std::string, ActionsDAG> & getAliasColumnExpressions()
+    const std::unordered_map<std::string, ActionsDAGPtr> & getAliasColumnExpressions() const
     {
         return alias_column_expressions;
     }
@@ -211,32 +211,32 @@ public:
         is_merge_tree = is_merge_tree_value;
     }
 
-    const std::optional<ActionsDAG> & getPrewhereFilterActions() const
+    const ActionsDAGPtr & getPrewhereFilterActions() const
     {
         return prewhere_filter_actions;
     }
 
-    void setRowLevelFilterActions(ActionsDAG row_level_filter_actions_value)
+    void setRowLevelFilterActions(ActionsDAGPtr row_level_filter_actions_value)
     {
         row_level_filter_actions = std::move(row_level_filter_actions_value);
     }
 
-    const std::optional<ActionsDAG> & getRowLevelFilterActions() const
+    const ActionsDAGPtr & getRowLevelFilterActions() const
     {
         return row_level_filter_actions;
     }
 
-    void setPrewhereFilterActions(ActionsDAG prewhere_filter_actions_value)
+    void setPrewhereFilterActions(ActionsDAGPtr prewhere_filter_actions_value)
     {
         prewhere_filter_actions = std::move(prewhere_filter_actions_value);
     }
 
-    const std::optional<ActionsDAG> & getFilterActions() const
+    const ActionsDAGPtr & getFilterActions() const
     {
         return filter_actions;
     }
 
-    void setFilterActions(ActionsDAG filter_actions_value)
+    void setFilterActions(ActionsDAGPtr filter_actions_value)
     {
         filter_actions = std::move(filter_actions_value);
     }
@@ -277,7 +277,7 @@ private:
     NameSet selected_column_names_set;
 
     /// Expression to calculate ALIAS columns
-    std::unordered_map<std::string, ActionsDAG> alias_column_expressions;
+    std::unordered_map<std::string, ActionsDAGPtr> alias_column_expressions;
 
     /// Valid for table, table function, array join, query, union nodes
     ColumnNameToColumn column_name_to_column;
@@ -289,16 +289,16 @@ private:
     ColumnIdentifierToColumnName column_identifier_to_column_name;
 
     /// Valid for table, table function
-    std::optional<ActionsDAG> filter_actions;
+    ActionsDAGPtr filter_actions;
 
     /// Valid for table, table function
     PrewhereInfoPtr prewhere_info;
 
     /// Valid for table, table function
-    std::optional<ActionsDAG> prewhere_filter_actions;
+    ActionsDAGPtr prewhere_filter_actions;
 
     /// Valid for table, table function
-    std::optional<ActionsDAG> row_level_filter_actions;
+    ActionsDAGPtr row_level_filter_actions;
 
     /// Is storage remote
     bool is_remote = false;
diff --git a/src/Planner/Utils.cpp b/src/Planner/Utils.cpp
index 822a3e9465e..1cfb878d338 100644
--- a/src/Planner/Utils.cpp
+++ b/src/Planner/Utils.cpp
@@ -11,12 +11,10 @@
 #include <DataTypes/DataTypeNullable.h>
 
 #include <Columns/getLeastSuperColumn.h>
-#include <Columns/ColumnSet.h>
 
 #include <IO/WriteBufferFromString.h>
 
 #include <Functions/FunctionFactory.h>
-#include <Functions/indexHint.h>
 
 #include <Storages/StorageDummy.h>
 
@@ -447,22 +445,22 @@ FilterDAGInfo buildFilterInfo(QueryTreeNodePtr filter_query_tree,
     collectSourceColumns(filter_query_tree, planner_context, false /*keep_alias_columns*/);
     collectSets(filter_query_tree, *planner_context);
 
-    ActionsDAG filter_actions_dag;
+    auto filter_actions_dag = std::make_shared<ActionsDAG>();
 
     PlannerActionsVisitor actions_visitor(planner_context, false /*use_column_identifier_as_action_node_name*/);
-    auto expression_nodes = actions_visitor.visit(filter_actions_dag, filter_query_tree);
+    auto expression_nodes = actions_visitor.visit(*filter_actions_dag, filter_query_tree);
     if (expression_nodes.size() != 1)
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
             "Filter actions must return single output node. Actual {}",
             expression_nodes.size());
 
-    auto & filter_actions_outputs = filter_actions_dag.getOutputs();
+    auto & filter_actions_outputs = filter_actions_dag->getOutputs();
     filter_actions_outputs = std::move(expression_nodes);
 
     std::string filter_node_name = filter_actions_outputs[0]->result_name;
     bool remove_filter_column = true;
 
-    for (const auto & filter_input_node : filter_actions_dag.getInputs())
+    for (const auto & filter_input_node : filter_actions_dag->getInputs())
         if (table_expression_required_names_without_filter.contains(filter_input_node->result_name))
             filter_actions_outputs.push_back(filter_input_node);
 
@@ -482,34 +480,6 @@ ASTPtr parseAdditionalResultFilter(const Settings & settings)
     return additional_result_filter_ast;
 }
 
-void appendSetsFromActionsDAG(const ActionsDAG & dag, UsefulSets & useful_sets)
-{
-    for (const auto & node : dag.getNodes())
-    {
-        if (node.column)
-        {
-            const IColumn * column = node.column.get();
-            if (const auto * column_const = typeid_cast<const ColumnConst *>(column))
-                column = &column_const->getDataColumn();
-
-            if (const auto * column_set = typeid_cast<const ColumnSet *>(column))
-                useful_sets.insert(column_set->getData());
-        }
-
-        if (node.type == ActionsDAG::ActionType::FUNCTION && node.function_base->getName() == "indexHint")
-        {
-            ActionsDAG::NodeRawConstPtrs children;
-            if (const auto * adaptor = typeid_cast<const FunctionToFunctionBaseAdaptor *>(node.function_base.get()))
-            {
-                if (const auto * index_hint = typeid_cast<const FunctionIndexHint *>(adaptor->getFunction().get()))
-                {
-                    appendSetsFromActionsDAG(index_hint->getActions(), useful_sets);
-                }
-            }
-        }
-    }
-}
-
 std::optional<WindowFrame> extractWindowFrame(const FunctionNode & node)
 {
     if (!node.isWindowFunction())
diff --git a/src/Planner/Utils.h b/src/Planner/Utils.h
index 254b8f4eae1..e33ff4cc4e2 100644
--- a/src/Planner/Utils.h
+++ b/src/Planner/Utils.h
@@ -90,9 +90,6 @@ FilterDAGInfo buildFilterInfo(QueryTreeNodePtr filter_query_tree,
 
 ASTPtr parseAdditionalResultFilter(const Settings & settings);
 
-using UsefulSets = std::unordered_set<FutureSetPtr>;
-void appendSetsFromActionsDAG(const ActionsDAG & dag, UsefulSets & useful_sets);
-
 /// If the window frame is not set in sql, try to use the default frame from window function
 /// if it have any one. Otherwise return empty.
 /// If the window frame is set in sql, use it anyway.
diff --git a/src/Planner/findParallelReplicasQuery.cpp b/src/Planner/findParallelReplicasQuery.cpp
index 25481d06670..39edb1e6516 100644
--- a/src/Planner/findParallelReplicasQuery.cpp
+++ b/src/Planner/findParallelReplicasQuery.cpp
@@ -52,13 +52,7 @@ std::stack<const QueryNode *> getSupportingParallelReplicasQuery(const IQueryTre
                 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()))
-                {
-                    /// parallel replicas is not supported with FINAL
-                    if (table_node.getTableExpressionModifiers() && table_node.getTableExpressionModifiers()->hasFinal())
-                        return {};
-
                     return res;
-                }
 
                 return {};
             }
diff --git a/src/Processors/Chunk.h b/src/Processors/Chunk.h
index f45e2c4619e..1348966c0d3 100644
--- a/src/Processors/Chunk.h
+++ b/src/Processors/Chunk.h
@@ -22,7 +22,7 @@ public:
 };
 
 
-template <typename Derived>
+template<class Derived>
 class ChunkInfoCloneable : public ChunkInfo
 {
 public:
diff --git a/src/Processors/Executors/CompletedPipelineExecutor.cpp b/src/Processors/Executors/CompletedPipelineExecutor.cpp
index 888835c9beb..598a51bf0c7 100644
--- a/src/Processors/Executors/CompletedPipelineExecutor.cpp
+++ b/src/Processors/Executors/CompletedPipelineExecutor.cpp
@@ -97,9 +97,7 @@ void CompletedPipelineExecutor::execute()
                 break;
 
             if (is_cancelled_callback())
-            {
                 data->executor->cancel();
-            }
         }
 
         if (data->has_exception)
@@ -118,9 +116,7 @@ CompletedPipelineExecutor::~CompletedPipelineExecutor()
     try
     {
         if (data && data->executor)
-        {
             data->executor->cancel();
-        }
     }
     catch (...)
     {
diff --git a/src/Processors/Executors/ExecutingGraph.cpp b/src/Processors/Executors/ExecutingGraph.cpp
index f2927d4145c..6d5b60d8159 100644
--- a/src/Processors/Executors/ExecutingGraph.cpp
+++ b/src/Processors/Executors/ExecutingGraph.cpp
@@ -96,7 +96,7 @@ bool ExecutingGraph::addEdges(uint64_t node)
     return was_edge_added;
 }
 
-ExecutingGraph::UpdateNodeStatus ExecutingGraph::expandPipeline(std::stack<uint64_t> & stack, uint64_t pid)
+bool ExecutingGraph::expandPipeline(std::stack<uint64_t> & stack, uint64_t pid)
 {
     auto & cur_node = *nodes[pid];
     Processors new_processors;
@@ -108,7 +108,7 @@ ExecutingGraph::UpdateNodeStatus ExecutingGraph::expandPipeline(std::stack<uint6
     catch (...)
     {
         cur_node.exception = std::current_exception();
-        return UpdateNodeStatus::Exception;
+        return false;
     }
 
     {
@@ -118,7 +118,7 @@ ExecutingGraph::UpdateNodeStatus ExecutingGraph::expandPipeline(std::stack<uint6
         {
             for (auto & processor : new_processors)
                 processor->cancel();
-            return UpdateNodeStatus::Cancelled;
+            return false;
         }
         processors->insert(processors->end(), new_processors.begin(), new_processors.end());
 
@@ -178,7 +178,7 @@ ExecutingGraph::UpdateNodeStatus ExecutingGraph::expandPipeline(std::stack<uint6
         }
     }
 
-    return UpdateNodeStatus::Done;
+    return true;
 }
 
 void ExecutingGraph::initializeExecution(Queue & queue)
@@ -213,7 +213,7 @@ void ExecutingGraph::initializeExecution(Queue & queue)
 }
 
 
-ExecutingGraph::UpdateNodeStatus ExecutingGraph::updateNode(uint64_t pid, Queue & queue, Queue & async_queue)
+bool ExecutingGraph::updateNode(uint64_t pid, Queue & queue, Queue & async_queue)
 {
     std::stack<Edge *> updated_edges;
     std::stack<uint64_t> updated_processors;
@@ -279,7 +279,7 @@ ExecutingGraph::UpdateNodeStatus ExecutingGraph::updateNode(uint64_t pid, Queue
                 try
                 {
                     auto & processor = *node.processor;
-                    const auto last_status = node.last_processor_status;
+                    IProcessor::Status last_status = node.last_processor_status;
                     IProcessor::Status status = processor.prepare(node.updated_input_ports, node.updated_output_ports);
                     node.last_processor_status = status;
 
@@ -309,7 +309,7 @@ ExecutingGraph::UpdateNodeStatus ExecutingGraph::updateNode(uint64_t pid, Queue
                 catch (...)
                 {
                     node.exception = std::current_exception();
-                    return UpdateNodeStatus::Exception;
+                    return false;
                 }
 
 #ifndef NDEBUG
@@ -319,7 +319,7 @@ ExecutingGraph::UpdateNodeStatus ExecutingGraph::updateNode(uint64_t pid, Queue
                 node.updated_input_ports.clear();
                 node.updated_output_ports.clear();
 
-                switch (*node.last_processor_status)
+                switch (node.last_processor_status)
                 {
                     case IProcessor::Status::NeedData:
                     case IProcessor::Status::PortFull:
@@ -386,9 +386,8 @@ ExecutingGraph::UpdateNodeStatus ExecutingGraph::updateNode(uint64_t pid, Queue
                 read_lock.unlock();
                 {
                     std::unique_lock lock(nodes_mutex);
-                    auto status = expandPipeline(updated_processors, pid);
-                    if (status != UpdateNodeStatus::Done)
-                        return status;
+                    if (!expandPipeline(updated_processors, pid))
+                        return false;
                 }
                 read_lock.lock();
 
@@ -398,7 +397,7 @@ ExecutingGraph::UpdateNodeStatus ExecutingGraph::updateNode(uint64_t pid, Queue
         }
     }
 
-    return UpdateNodeStatus::Done;
+    return true;
 }
 
 void ExecutingGraph::cancel(bool cancel_all_processors)
diff --git a/src/Processors/Executors/ExecutingGraph.h b/src/Processors/Executors/ExecutingGraph.h
index 8d8ba722b3e..71dcd360a2c 100644
--- a/src/Processors/Executors/ExecutingGraph.h
+++ b/src/Processors/Executors/ExecutingGraph.h
@@ -92,7 +92,7 @@ public:
         std::exception_ptr exception;
 
         /// Last state for profiling.
-        std::optional<IProcessor::Status> last_processor_status;
+        IProcessor::Status last_processor_status = IProcessor::Status::NeedData;
 
         /// Ports which have changed their state since last processor->prepare() call.
         /// They changed when neighbour processors interact with connected ports.
@@ -138,17 +138,10 @@ public:
     /// Traverse graph the first time to update all the childless nodes.
     void initializeExecution(Queue & queue);
 
-    enum class UpdateNodeStatus
-    {
-        Done,
-        Exception,
-        Cancelled,
-    };
-
     /// Update processor with pid number (call IProcessor::prepare).
     /// Check parents and children of current processor and push them to stacks if they also need to be updated.
     /// If processor wants to be expanded, lock will be upgraded to get write access to pipeline.
-    UpdateNodeStatus updateNode(uint64_t pid, Queue & queue, Queue & async_queue);
+    bool updateNode(uint64_t pid, Queue & queue, Queue & async_queue);
 
     void cancel(bool cancel_all_processors = true);
 
@@ -162,7 +155,7 @@ private:
 
     /// Update graph after processor (pid) returned ExpandPipeline status.
     /// All new nodes and nodes with updated ports are pushed into stack.
-    UpdateNodeStatus expandPipeline(std::stack<uint64_t> & stack, uint64_t pid);
+    bool expandPipeline(std::stack<uint64_t> & stack, uint64_t pid);
 
     std::shared_ptr<Processors> processors;
     std::vector<bool> source_processors;
diff --git a/src/Processors/Executors/ExecutorTasks.cpp b/src/Processors/Executors/ExecutorTasks.cpp
index d045f59a2e2..7e3bee239ef 100644
--- a/src/Processors/Executors/ExecutorTasks.cpp
+++ b/src/Processors/Executors/ExecutorTasks.cpp
@@ -204,8 +204,6 @@ void ExecutorTasks::processAsyncTasks()
         while (auto task = async_task_queue.wait(lock))
         {
             auto * node = static_cast<ExecutingGraph::Node *>(task.data);
-            node->processor->onAsyncJobReady();
-
             executor_contexts[task.thread_num]->pushAsyncTask(node);
             ++num_waiting_async_tasks;
 
diff --git a/src/Processors/Executors/ExecutorTasks.h b/src/Processors/Executors/ExecutorTasks.h
index b2201873edf..202ca253c6c 100644
--- a/src/Processors/Executors/ExecutorTasks.h
+++ b/src/Processors/Executors/ExecutorTasks.h
@@ -28,7 +28,7 @@ class ExecutorTasks
     TaskQueue<ExecutingGraph::Node> task_queue;
 
     /// Queue which stores tasks where processors returned Async status after prepare.
-    /// If multiple threads are used, main thread will wait for async tasks.
+    /// If multiple threads are using, main thread will wait for async tasks.
     /// For single thread, will wait for async tasks only when task_queue is empty.
     PollingQueue async_task_queue;
 
diff --git a/src/Processors/Executors/PipelineExecutor.cpp b/src/Processors/Executors/PipelineExecutor.cpp
index 72e1afaafaa..82cad471a29 100644
--- a/src/Processors/Executors/PipelineExecutor.cpp
+++ b/src/Processors/Executors/PipelineExecutor.cpp
@@ -77,13 +77,9 @@ const Processors & PipelineExecutor::getProcessors() const
     return graph->getProcessors();
 }
 
-void PipelineExecutor::cancel(ExecutionStatus reason)
+void PipelineExecutor::cancel()
 {
-    /// It is allowed to cancel not started query by user.
-    if (reason == ExecutionStatus::CancelledByUser)
-        tryUpdateExecutionStatus(ExecutionStatus::NotStarted, reason);
-
-    tryUpdateExecutionStatus(ExecutionStatus::Executing, reason);
+    cancelled = true;
     finish();
     graph->cancel();
 }
@@ -102,11 +98,6 @@ void PipelineExecutor::finish()
     tasks.finish();
 }
 
-bool PipelineExecutor::tryUpdateExecutionStatus(ExecutionStatus expected, ExecutionStatus desired)
-{
-    return execution_status.compare_exchange_strong(expected, desired);
-}
-
 void PipelineExecutor::execute(size_t num_threads, bool concurrency_control)
 {
     checkTimeLimit();
@@ -129,7 +120,7 @@ void PipelineExecutor::execute(size_t num_threads, bool concurrency_control)
     }
     catch (...)
     {
-        span.addAttribute(DB::ExecutionStatus::fromCurrentException());
+        span.addAttribute(ExecutionStatus::fromCurrentException());
 
 #ifndef NDEBUG
         LOG_TRACE(log, "Exception while executing query. Current state:\n{}", dumpPipeline());
@@ -178,7 +169,7 @@ bool PipelineExecutor::checkTimeLimitSoft()
         // We call cancel here so that all processors are notified and tasks waken up
         // so that the "break" is faster and doesn't wait for long events
         if (!continuing)
-            cancel(ExecutionStatus::CancelledByTimeout);
+            cancel();
 
         return continuing;
     }
@@ -204,8 +195,7 @@ void PipelineExecutor::finalizeExecution()
 {
     checkTimeLimit();
 
-    auto status = execution_status.load();
-    if (status == ExecutionStatus::CancelledByTimeout || status == ExecutionStatus::CancelledByUser)
+    if (cancelled)
         return;
 
     bool all_processors_finished = true;
@@ -281,7 +271,7 @@ void PipelineExecutor::executeStepImpl(size_t thread_num, std::atomic_bool * yie
                 break;
 
             if (!context.executeTask())
-                cancel(ExecutionStatus::Exception);
+                cancel();
 
             if (tasks.isFinished())
                 break;
@@ -299,13 +289,11 @@ void PipelineExecutor::executeStepImpl(size_t thread_num, std::atomic_bool * yie
                 Queue async_queue;
 
                 /// Prepare processor after execution.
-                auto status = graph->updateNode(context.getProcessorID(), queue, async_queue);
-                if (status == ExecutingGraph::UpdateNodeStatus::Exception)
-                    cancel(ExecutionStatus::Exception);
+                if (!graph->updateNode(context.getProcessorID(), queue, async_queue))
+                    cancel();
 
                 /// Push other tasks to global queue.
-                if (status == ExecutingGraph::UpdateNodeStatus::Done)
-                    tasks.pushTasks(queue, async_queue, context);
+                tasks.pushTasks(queue, async_queue, context);
             }
 
 #ifndef NDEBUG
@@ -321,7 +309,7 @@ void PipelineExecutor::executeStepImpl(size_t thread_num, std::atomic_bool * yie
             {
                 /// spawnThreads can throw an exception, for example CANNOT_SCHEDULE_TASK.
                 /// We should cancel execution properly before rethrow.
-                cancel(ExecutionStatus::Exception);
+                cancel();
                 throw;
             }
 
@@ -340,7 +328,6 @@ void PipelineExecutor::executeStepImpl(size_t thread_num, std::atomic_bool * yie
 void PipelineExecutor::initializeExecution(size_t num_threads, bool concurrency_control)
 {
     is_execution_initialized = true;
-    tryUpdateExecutionStatus(ExecutionStatus::NotStarted, ExecutionStatus::Executing);
 
     size_t use_threads = num_threads;
 
@@ -406,7 +393,7 @@ void PipelineExecutor::executeImpl(size_t num_threads, bool concurrency_control)
         {
             /// If finished_flag is not set, there was an exception.
             /// Cancel execution in this case.
-            cancel(ExecutionStatus::Exception);
+            cancel();
             if (pool)
                 pool->wait();
         }
@@ -445,7 +432,7 @@ String PipelineExecutor::dumpPipeline() const
         }
     }
 
-    std::vector<std::optional<IProcessor::Status>> statuses;
+    std::vector<IProcessor::Status> statuses;
     std::vector<IProcessor *> proc_list;
     statuses.reserve(graph->nodes.size());
     proc_list.reserve(graph->nodes.size());
diff --git a/src/Processors/Executors/PipelineExecutor.h b/src/Processors/Executors/PipelineExecutor.h
index 79d0a29d4e1..03f0f7f1a0a 100644
--- a/src/Processors/Executors/PipelineExecutor.h
+++ b/src/Processors/Executors/PipelineExecutor.h
@@ -9,6 +9,7 @@
 
 #include <deque>
 #include <queue>
+#include <mutex>
 #include <memory>
 
 
@@ -48,20 +49,8 @@ public:
 
     const Processors & getProcessors() const;
 
-    enum class ExecutionStatus
-    {
-        NotStarted,
-        Executing,
-        Finished,
-        Exception,
-        CancelledByUser,
-        CancelledByTimeout,
-    };
-
     /// Cancel execution. May be called from another thread.
-    void cancel() { cancel(ExecutionStatus::CancelledByUser); }
-
-    ExecutionStatus getExecutionStatus() const { return execution_status.load(); }
+    void cancel();
 
     /// Cancel processors which only read data from source. May be called from another thread.
     void cancelReading();
@@ -93,7 +82,7 @@ private:
     /// system.opentelemetry_span_log
     bool trace_processors = false;
 
-    std::atomic<ExecutionStatus> execution_status = ExecutionStatus::NotStarted;
+    std::atomic_bool cancelled = false;
     std::atomic_bool cancelled_reading = false;
 
     LoggerPtr log = getLogger("PipelineExecutor");
@@ -117,10 +106,6 @@ private:
     void executeStepImpl(size_t thread_num, std::atomic_bool * yield_flag = nullptr);
     void executeSingleThread(size_t thread_num);
     void finish();
-    void cancel(ExecutionStatus reason);
-
-    /// If execution_status == from, change it to desired.
-    bool tryUpdateExecutionStatus(ExecutionStatus expected, ExecutionStatus desired);
 
     String dumpPipeline() const;
 };
diff --git a/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp b/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp
index 866d224a08d..830a96533ed 100644
--- a/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp
+++ b/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp
@@ -15,7 +15,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
-    extern const int QUERY_WAS_CANCELLED;
 }
 
 class PushingAsyncSource : public ISource
@@ -177,16 +176,6 @@ void PushingAsyncPipelineExecutor::start()
     data->thread = ThreadFromGlobalPool(std::move(func));
 }
 
-[[noreturn]] static void throwOnExecutionStatus(PipelineExecutor::ExecutionStatus status)
-{
-    if (status == PipelineExecutor::ExecutionStatus::CancelledByTimeout
-        || status == PipelineExecutor::ExecutionStatus::CancelledByUser)
-        throw Exception(ErrorCodes::QUERY_WAS_CANCELLED, "Query was cancelled");
-
-    throw Exception(ErrorCodes::LOGICAL_ERROR,
-        "Pipeline for PushingPipelineExecutor was finished before all data was inserted");
-}
-
 void PushingAsyncPipelineExecutor::push(Chunk chunk)
 {
     if (!started)
@@ -196,7 +185,8 @@ void PushingAsyncPipelineExecutor::push(Chunk chunk)
     data->rethrowExceptionIfHas();
 
     if (!is_pushed)
-        throwOnExecutionStatus(data->executor->getExecutionStatus());
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Pipeline for PushingAsyncPipelineExecutor was finished before all data was inserted");
 }
 
 void PushingAsyncPipelineExecutor::push(Block block)
diff --git a/src/Processors/Executors/PushingPipelineExecutor.cpp b/src/Processors/Executors/PushingPipelineExecutor.cpp
index 7a1c0111a3a..696932932df 100644
--- a/src/Processors/Executors/PushingPipelineExecutor.cpp
+++ b/src/Processors/Executors/PushingPipelineExecutor.cpp
@@ -11,7 +11,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
-    extern const int QUERY_WAS_CANCELLED;
 }
 
 class PushingSource : public ISource
@@ -81,15 +80,6 @@ const Block & PushingPipelineExecutor::getHeader() const
     return pushing_source->getPort().getHeader();
 }
 
-[[noreturn]] static void throwOnExecutionStatus(PipelineExecutor::ExecutionStatus status)
-{
-    if (status == PipelineExecutor::ExecutionStatus::CancelledByTimeout
-        || status == PipelineExecutor::ExecutionStatus::CancelledByUser)
-        throw Exception(ErrorCodes::QUERY_WAS_CANCELLED, "Query was cancelled");
-
-    throw Exception(ErrorCodes::LOGICAL_ERROR,
-        "Pipeline for PushingPipelineExecutor was finished before all data was inserted");
-}
 
 void PushingPipelineExecutor::start()
 {
@@ -101,7 +91,8 @@ void PushingPipelineExecutor::start()
     executor->setReadProgressCallback(pipeline.getReadProgressCallback());
 
     if (!executor->executeStep(&input_wait_flag))
-        throwOnExecutionStatus(executor->getExecutionStatus());
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Pipeline for PushingPipelineExecutor was finished before all data was inserted");
 }
 
 void PushingPipelineExecutor::push(Chunk chunk)
@@ -112,7 +103,8 @@ void PushingPipelineExecutor::push(Chunk chunk)
     pushing_source->setData(std::move(chunk));
 
     if (!executor->executeStep(&input_wait_flag))
-        throwOnExecutionStatus(executor->getExecutionStatus());
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Pipeline for PushingPipelineExecutor was finished before all data was inserted");
 }
 
 void PushingPipelineExecutor::push(Block block)
diff --git a/src/Processors/Executors/StreamingFormatExecutor.cpp b/src/Processors/Executors/StreamingFormatExecutor.cpp
index 10a7b7fd7f5..12dd685a735 100644
--- a/src/Processors/Executors/StreamingFormatExecutor.cpp
+++ b/src/Processors/Executors/StreamingFormatExecutor.cpp
@@ -1,6 +1,5 @@
 #include <Processors/Executors/StreamingFormatExecutor.h>
 #include <Processors/Transforms/AddingDefaultsTransform.h>
-#include <Processors/Formats/Impl/ValuesBlockInputFormat.h>
 
 namespace DB
 {
@@ -33,13 +32,6 @@ MutableColumns StreamingFormatExecutor::getResultColumns()
     return ret_columns;
 }
 
-void StreamingFormatExecutor::setQueryParameters(const NameToNameMap & parameters)
-{
-    /// Query parameters make sense only for format Values.
-    if (auto * values_format = typeid_cast<ValuesBlockInputFormat *>(format.get()))
-        values_format->setQueryParameters(parameters);
-}
-
 size_t StreamingFormatExecutor::execute(ReadBuffer & buffer)
 {
     format->setReadBuffer(buffer);
diff --git a/src/Processors/Executors/StreamingFormatExecutor.h b/src/Processors/Executors/StreamingFormatExecutor.h
index f159178df8c..3aa90ab0360 100644
--- a/src/Processors/Executors/StreamingFormatExecutor.h
+++ b/src/Processors/Executors/StreamingFormatExecutor.h
@@ -39,9 +39,6 @@ public:
     /// Releases currently accumulated columns.
     MutableColumns getResultColumns();
 
-    /// Sets query parameters for input format if applicable.
-    void setQueryParameters(const NameToNameMap & parameters);
-
 private:
     const Block header;
     const InputFormatPtr format;
diff --git a/src/Processors/Formats/IOutputFormat.cpp b/src/Processors/Formats/IOutputFormat.cpp
index 97628778adb..88a6fb1e92f 100644
--- a/src/Processors/Formats/IOutputFormat.cpp
+++ b/src/Processors/Formats/IOutputFormat.cpp
@@ -69,10 +69,9 @@ void IOutputFormat::work()
 
     if (finished && !finalized)
     {
-        if (rows_before_limit_counter && rows_before_limit_counter->hasAppliedStep())
+        if (rows_before_limit_counter && rows_before_limit_counter->hasAppliedLimit())
             setRowsBeforeLimit(rows_before_limit_counter->get());
-        if (rows_before_aggregation_counter && rows_before_aggregation_counter->hasAppliedStep())
-            setRowsBeforeAggregation(rows_before_aggregation_counter->get());
+
         finalize();
         if (auto_flush)
             flush();
diff --git a/src/Processors/Formats/IOutputFormat.h b/src/Processors/Formats/IOutputFormat.h
index e9af4ca7cf5..cae2ab7691e 100644
--- a/src/Processors/Formats/IOutputFormat.h
+++ b/src/Processors/Formats/IOutputFormat.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <string>
-#include <IO/Progress.h>
 #include <Processors/IProcessor.h>
-#include <Processors/RowsBeforeStepCounter.h>
+#include <Processors/RowsBeforeLimitCounter.h>
+#include <IO/Progress.h>
 #include <Common/Stopwatch.h>
 
 namespace DB
@@ -36,20 +36,14 @@ public:
     void setAutoFlush() { auto_flush = true; }
 
     /// Value for rows_before_limit_at_least field.
-    virtual void setRowsBeforeLimit(size_t /*rows_before_limit*/) { }
+    virtual void setRowsBeforeLimit(size_t /*rows_before_limit*/) {}
 
     /// Counter to calculate rows_before_limit_at_least in processors pipeline.
-    void setRowsBeforeLimitCounter(RowsBeforeStepCounterPtr counter) override { rows_before_limit_counter.swap(counter); }
-
-    /// Value for rows_before_aggregation field.
-    virtual void setRowsBeforeAggregation(size_t /*rows_before_aggregation*/) { }
-
-    /// Counter to calculate rows_before_aggregation in processors pipeline.
-    void setRowsBeforeAggregationCounter(RowsBeforeStepCounterPtr counter) override { rows_before_aggregation_counter.swap(counter); }
+    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) override { rows_before_limit_counter.swap(counter); }
 
     /// Notify about progress. Method could be called from different threads.
     /// Passed value are delta, that must be summarized.
-    virtual void onProgress(const Progress & /*progress*/) { }
+    virtual void onProgress(const Progress & /*progress*/) {}
 
     /// Content-Type to set when sending HTTP response.
     virtual std::string getContentType() const { return "text/plain; charset=UTF-8"; }
@@ -157,8 +151,6 @@ protected:
         Progress progress;
         bool applied_limit = false;
         size_t rows_before_limit = 0;
-        bool applied_aggregation = false;
-        size_t rows_before_aggregation = 0;
         Chunk totals;
         Chunk extremes;
     };
@@ -192,8 +184,7 @@ protected:
     bool need_write_prefix  = true;
     bool need_write_suffix = true;
 
-    RowsBeforeStepCounterPtr rows_before_limit_counter;
-    RowsBeforeStepCounterPtr rows_before_aggregation_counter;
+    RowsBeforeLimitCounterPtr rows_before_limit_counter;
     Statistics statistics;
 
 private:
diff --git a/src/Processors/Formats/Impl/ArrowBlockInputFormat.h b/src/Processors/Formats/Impl/ArrowBlockInputFormat.h
index cb74a9dd93e..cdbc5e57e4e 100644
--- a/src/Processors/Formats/Impl/ArrowBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ArrowBlockInputFormat.h
@@ -32,7 +32,7 @@ public:
 private:
     Chunk read() override;
 
-    void onCancel() noexcept override
+    void onCancel() override
     {
         is_stopped = 1;
     }
diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
index c9ca9efabee..496468277c9 100644
--- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
+++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
@@ -133,31 +133,16 @@ static ColumnWithTypeAndName readColumnWithStringData(const std::shared_ptr<arro
         std::shared_ptr<arrow::Buffer> buffer = chunk.value_data();
         const size_t chunk_length = chunk.length();
 
-        const size_t null_count = chunk.null_count();
-        if (null_count == 0)
+        for (size_t offset_i = 0; offset_i != chunk_length; ++offset_i)
         {
-            for (size_t offset_i = 0; offset_i != chunk_length; ++offset_i)
+            if (!chunk.IsNull(offset_i) && buffer)
             {
                 const auto * raw_data = buffer->data() + chunk.value_offset(offset_i);
                 column_chars_t.insert_assume_reserved(raw_data, raw_data + chunk.value_length(offset_i));
-                column_chars_t.emplace_back('\0');
-
-                column_offsets.emplace_back(column_chars_t.size());
             }
-        }
-        else
-        {
-            for (size_t offset_i = 0; offset_i != chunk_length; ++offset_i)
-            {
-                if (!chunk.IsNull(offset_i) && buffer)
-                {
-                    const auto * raw_data = buffer->data() + chunk.value_offset(offset_i);
-                    column_chars_t.insert_assume_reserved(raw_data, raw_data + chunk.value_length(offset_i));
-                }
-                column_chars_t.emplace_back('\0');
+            column_chars_t.emplace_back('\0');
 
-                column_offsets.emplace_back(column_chars_t.size());
-            }
+            column_offsets.emplace_back(column_chars_t.size());
         }
     }
     return {std::move(internal_column), std::move(internal_type), column_name};
diff --git a/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp b/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp
index b549f2de975..c5336f3bcc7 100644
--- a/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp
@@ -15,8 +15,8 @@ namespace ErrorCodes
 }
 
 template <bool with_defaults>
-BinaryRowInputFormat<with_defaults>::BinaryRowInputFormat(ReadBuffer & in_, const Block & header, IRowInputFormat::Params params_, bool with_names_, bool with_types_, const FormatSettings & format_settings_)
-    : RowInputFormatWithNamesAndTypes<BinaryFormatReader<with_defaults>>(
+BinaryRowInputFormat<with_defaults>::BinaryRowInputFormat(ReadBuffer & in_, const Block & header, Params params_, bool with_names_, bool with_types_, const FormatSettings & format_settings_)
+    : RowInputFormatWithNamesAndTypes(
         header,
         in_,
         params_,
diff --git a/src/Processors/Formats/Impl/BinaryRowInputFormat.h b/src/Processors/Formats/Impl/BinaryRowInputFormat.h
index 6a4ca8f6418..6f2042d1315 100644
--- a/src/Processors/Formats/Impl/BinaryRowInputFormat.h
+++ b/src/Processors/Formats/Impl/BinaryRowInputFormat.h
@@ -10,16 +10,13 @@ namespace DB
 
 class ReadBuffer;
 
-template <bool>
-class BinaryFormatReader;
-
 /** A stream for inputting data in a binary line-by-line format.
   */
 template <bool with_defaults = false>
-class BinaryRowInputFormat final : public RowInputFormatWithNamesAndTypes<BinaryFormatReader<with_defaults>>
+class BinaryRowInputFormat final : public RowInputFormatWithNamesAndTypes
 {
 public:
-    BinaryRowInputFormat(ReadBuffer & in_, const Block & header, IRowInputFormat::Params params_, bool with_names_, bool with_types_, const FormatSettings & format_settings_);
+    BinaryRowInputFormat(ReadBuffer & in_, const Block & header, Params params_, bool with_names_, bool with_types_, const FormatSettings & format_settings_);
 
     String getName() const override { return "BinaryRowInputFormat"; }
 
diff --git a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
index 30301b242db..58bf4c1a2fc 100644
--- a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
+++ b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
@@ -185,7 +185,7 @@ namespace DB
             }
             else
             {
-                auto value = static_cast<Int64>(column[value_i].safeGet<DecimalField<DateTime64>>().getValue());
+                auto value = static_cast<Int64>(column[value_i].get<DecimalField<DateTime64>>().getValue());
                 if (need_rescale)
                 {
                     if (common::mulOverflow(value, rescale_multiplier, value))
diff --git a/src/Processors/Formats/Impl/CSVRowInputFormat.cpp b/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
index cf58a4057c8..b7f84748f61 100644
--- a/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
@@ -61,7 +61,7 @@ CSVRowInputFormat::CSVRowInputFormat(
     bool with_names_,
     bool with_types_,
     const FormatSettings & format_settings_,
-    std::unique_ptr<CSVFormatReader> format_reader_)
+    std::unique_ptr<FormatWithNamesAndTypesReader> format_reader_)
     : RowInputFormatWithNamesAndTypes(
         header_,
         *in_,
diff --git a/src/Processors/Formats/Impl/CSVRowInputFormat.h b/src/Processors/Formats/Impl/CSVRowInputFormat.h
index 86af5028438..fe4d4e3be08 100644
--- a/src/Processors/Formats/Impl/CSVRowInputFormat.h
+++ b/src/Processors/Formats/Impl/CSVRowInputFormat.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <optional>
+#include <unordered_map>
 
 #include <Core/Block.h>
 #include <Processors/Formats/RowInputFormatWithNamesAndTypes.h>
@@ -12,12 +13,10 @@
 namespace DB
 {
 
-class CSVFormatReader;
-
 /** A stream for inputting data in csv format.
   * Does not conform with https://tools.ietf.org/html/rfc4180 because it skips spaces and tabs between values.
   */
-class CSVRowInputFormat : public RowInputFormatWithNamesAndTypes<CSVFormatReader>
+class CSVRowInputFormat : public RowInputFormatWithNamesAndTypes
 {
 public:
     /** with_names - in the first line the header with column names
@@ -33,7 +32,7 @@ public:
 
 protected:
     CSVRowInputFormat(const Block & header_, std::shared_ptr<PeekableReadBuffer> in_, const Params & params_,
-                               bool with_names_, bool with_types_, const FormatSettings & format_settings_, std::unique_ptr<CSVFormatReader> format_reader_);
+                               bool with_names_, bool with_types_, const FormatSettings & format_settings_, std::unique_ptr<FormatWithNamesAndTypesReader> format_reader_);
 
     CSVRowInputFormat(const Block & header_, std::shared_ptr<PeekableReadBuffer> in_buf_, const Params & params_,
                       bool with_names_, bool with_types_, const FormatSettings & format_settings_);
diff --git a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
index 566a036d79c..06e8668cd7c 100644
--- a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
+++ b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
@@ -208,20 +208,20 @@ private:
             /// Do not replace empty array and array of NULLs
             if (literal->value.getType() == Field::Types::Array)
             {
-                const Array & array = literal->value.safeGet<Array>();
+                const Array & array = literal->value.get<Array>();
                 auto not_null = std::find_if_not(array.begin(), array.end(), [](const auto & elem) { return elem.isNull(); });
                 if (not_null == array.end())
                     return true;
             }
             else if (literal->value.getType() == Field::Types::Map)
             {
-                const Map & map = literal->value.safeGet<Map>();
+                const Map & map = literal->value.get<Map>();
                 if (map.size() % 2)
                     return false;
             }
             else if (literal->value.getType() == Field::Types::Tuple)
             {
-                const Tuple & tuple = literal->value.safeGet<Tuple>();
+                const Tuple & tuple = literal->value.get<Tuple>();
 
                 for (const auto & value : tuple)
                     if (value.isNull())
diff --git a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h
index b1d35947ba8..58f78e5af42 100644
--- a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h
+++ b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h
@@ -9,8 +9,7 @@
 namespace DB
 {
 
-class CustomSeparatedFormatReader;
-class CustomSeparatedRowInputFormat final : public RowInputFormatWithNamesAndTypes<CustomSeparatedFormatReader>
+class CustomSeparatedRowInputFormat final : public RowInputFormatWithNamesAndTypes
 {
 public:
     CustomSeparatedRowInputFormat(
diff --git a/src/Processors/Formats/Impl/DWARFBlockInputFormat.h b/src/Processors/Formats/Impl/DWARFBlockInputFormat.h
index 2d94d166708..d8f5fc3d896 100644
--- a/src/Processors/Formats/Impl/DWARFBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/DWARFBlockInputFormat.h
@@ -32,7 +32,7 @@ public:
 protected:
     Chunk read() override;
 
-    void onCancel() noexcept override
+    void onCancel() override
     {
         is_stopped = 1;
     }
diff --git a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp
index a72c6037619..f57e62adba9 100644
--- a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp
@@ -15,8 +15,11 @@ namespace ErrorCodes
     extern const int ILLEGAL_COLUMN;
 }
 
-JSONAsRowInputFormat::JSONAsRowInputFormat(const Block & header_, ReadBuffer & in_, Params params_, const FormatSettings & format_settings_) :
-    JSONEachRowRowInputFormat(in_, header_, std::move(params_), format_settings_, false)
+JSONAsRowInputFormat::JSONAsRowInputFormat(const Block & header_, ReadBuffer & in_, Params params_, const FormatSettings & format_settings_)
+    : JSONAsRowInputFormat(header_, std::make_unique<PeekableReadBuffer>(in_), params_, format_settings_) {}
+
+JSONAsRowInputFormat::JSONAsRowInputFormat(const Block & header_, std::unique_ptr<PeekableReadBuffer> buf_, Params params_, const FormatSettings & format_settings_) :
+    JSONEachRowRowInputFormat(*buf_, header_, std::move(params_), format_settings_, false), buf(std::move(buf_))
 {
     if (header_.columns() > 1)
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
@@ -24,6 +27,19 @@ JSONAsRowInputFormat::JSONAsRowInputFormat(const Block & header_, ReadBuffer & i
             header_.columns());
 }
 
+
+void JSONAsRowInputFormat::setReadBuffer(ReadBuffer & in_)
+{
+    buf = std::make_unique<PeekableReadBuffer>(in_);
+    JSONEachRowRowInputFormat::setReadBuffer(*buf);
+}
+
+void JSONAsRowInputFormat::resetReadBuffer()
+{
+    buf.reset();
+    JSONEachRowRowInputFormat::resetReadBuffer();
+}
+
 bool JSONAsRowInputFormat::readRow(MutableColumns & columns, RowReadExtension &)
 {
     assert(columns.size() == 1);
@@ -32,41 +48,35 @@ bool JSONAsRowInputFormat::readRow(MutableColumns & columns, RowReadExtension &)
     if (!allow_new_rows)
         return false;
 
-    skipWhitespaceIfAny(*in);
-    if (!in->eof())
+    skipWhitespaceIfAny(*buf);
+    if (!buf->eof())
     {
-        if (!data_in_square_brackets && *in->position() == ';')
+        if (!data_in_square_brackets && *buf->position() == ';')
         {
             /// ';' means the end of query, but it cannot be before ']'.
             return allow_new_rows = false;
         }
-        else if (data_in_square_brackets && *in->position() == ']')
+        else if (data_in_square_brackets && *buf->position() == ']')
         {
             /// ']' means the end of query.
             return allow_new_rows = false;
         }
     }
 
-    if (!in->eof())
+    if (!buf->eof())
         readJSONObject(*columns[0]);
 
-    skipWhitespaceIfAny(*in);
-    if (!in->eof() && *in->position() == ',')
-        ++in->position();
-    skipWhitespaceIfAny(*in);
+    skipWhitespaceIfAny(*buf);
+    if (!buf->eof() && *buf->position() == ',')
+        ++buf->position();
+    skipWhitespaceIfAny(*buf);
 
-    return !in->eof();
+    return !buf->eof();
 }
 
 JSONAsStringRowInputFormat::JSONAsStringRowInputFormat(
-    const Block & header_, ReadBuffer & in_, IRowInputFormat::Params params_, const FormatSettings & format_settings_)
-    : JSONAsStringRowInputFormat(header_, std::make_unique<PeekableReadBuffer>(in_), params_, format_settings_)
-{
-}
-
-JSONAsStringRowInputFormat::JSONAsStringRowInputFormat(
-    const Block & header_, std::unique_ptr<PeekableReadBuffer> buf_, Params params_, const FormatSettings & format_settings_)
-    : JSONAsRowInputFormat(header_, *buf_, params_, format_settings_), buf(std::move(buf_))
+    const Block & header_, ReadBuffer & in_, Params params_, const FormatSettings & format_settings_)
+    : JSONAsRowInputFormat(header_, in_, params_, format_settings_)
 {
     if (!isString(removeNullable(removeLowCardinality(header_.getByPosition(0).type))))
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
@@ -74,18 +84,6 @@ JSONAsStringRowInputFormat::JSONAsStringRowInputFormat(
             header_.getByPosition(0).type->getName());
 }
 
-void JSONAsStringRowInputFormat::setReadBuffer(ReadBuffer & in_)
-{
-    buf = std::make_unique<PeekableReadBuffer>(in_);
-    JSONAsRowInputFormat::setReadBuffer(*buf);
-}
-
-void JSONAsStringRowInputFormat::resetReadBuffer()
-{
-    buf.reset();
-    JSONAsRowInputFormat::resetReadBuffer();
-}
-
 void JSONAsStringRowInputFormat::readJSONObject(IColumn & column)
 {
     PeekableReadBufferCheckpoint checkpoint{*buf};
@@ -168,16 +166,15 @@ JSONAsObjectRowInputFormat::JSONAsObjectRowInputFormat(
     const Block & header_, ReadBuffer & in_, Params params_, const FormatSettings & format_settings_)
     : JSONAsRowInputFormat(header_, in_, params_, format_settings_)
 {
-    const auto & type = header_.getByPosition(0).type;
-    if (!isObject(type) && !isObjectDeprecated(type))
+    if (!isObject(header_.getByPosition(0).type))
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
-            "Input format JSONAsObject is only suitable for tables with a single column of type Object/JSON but the column type is {}",
-            type->getName());
+            "Input format JSONAsObject is only suitable for tables with a single column of type Object but the column type is {}",
+            header_.getByPosition(0).type->getName());
 }
 
 void JSONAsObjectRowInputFormat::readJSONObject(IColumn & column)
 {
-    serializations[0]->deserializeTextJSON(column, *in, format_settings);
+    serializations[0]->deserializeTextJSON(column, *buf, format_settings);
 }
 
 Chunk JSONAsObjectRowInputFormat::getChunkForCount(size_t rows)
@@ -187,13 +184,13 @@ Chunk JSONAsObjectRowInputFormat::getChunkForCount(size_t rows)
     return Chunk({std::move(column)}, rows);
 }
 
-JSONAsObjectExternalSchemaReader::JSONAsObjectExternalSchemaReader(const FormatSettings & settings_) : settings(settings_)
+JSONAsObjectExternalSchemaReader::JSONAsObjectExternalSchemaReader(const FormatSettings & settings)
 {
-    if (!settings.json.allow_deprecated_object_type && !settings.json.allow_json_type)
+    if (!settings.json.allow_object_type)
         throw Exception(
             ErrorCodes::ILLEGAL_COLUMN,
-            "Cannot infer the data structure in JSONAsObject format because experimental Object/JSON type is not allowed. Set setting "
-            "allow_experimental_object_type = 1 or allow_experimental_json_type=1 in order to allow it");
+            "Cannot infer the data structure in JSONAsObject format because experimental Object type is not allowed. Set setting "
+            "allow_experimental_object_type = 1 in order to allow it");
 }
 
 void registerInputFormatJSONAsString(FormatFactory & factory)
diff --git a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.h b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.h
index f33108472de..16112325a97 100644
--- a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.h
@@ -5,7 +5,6 @@
 #include <Formats/FormatFactory.h>
 #include <IO/PeekableReadBuffer.h>
 #include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypeObjectDeprecated.h>
 #include <DataTypes/DataTypeObject.h>
 
 namespace DB
@@ -19,11 +18,17 @@ class JSONAsRowInputFormat : public JSONEachRowRowInputFormat
 public:
     JSONAsRowInputFormat(const Block & header_, ReadBuffer & in_, Params params_, const FormatSettings & format_settings);
 
+    void setReadBuffer(ReadBuffer & in_) override;
+    void resetReadBuffer() override;
+
 private:
+    JSONAsRowInputFormat(const Block & header_, std::unique_ptr<PeekableReadBuffer> buf_, Params params_, const FormatSettings & format_settings);
+
     bool readRow(MutableColumns & columns, RowReadExtension & ext) override;
 
 protected:
     virtual void readJSONObject(IColumn & column) = 0;
+    std::unique_ptr<PeekableReadBuffer> buf;
 };
 
 /// Each JSON object is parsed as a whole to string.
@@ -31,18 +36,11 @@ protected:
 class JSONAsStringRowInputFormat final : public JSONAsRowInputFormat
 {
 public:
-    JSONAsStringRowInputFormat(const Block & header_, ReadBuffer & in_, Params params_, const FormatSettings & format_settings_);
+    JSONAsStringRowInputFormat(const Block & header_, ReadBuffer & in_, Params params_, const FormatSettings & format_settings);
     String getName() const override { return "JSONAsStringRowInputFormat"; }
 
-    void setReadBuffer(ReadBuffer & in_) override;
-    void resetReadBuffer() override;
-
 private:
-    JSONAsStringRowInputFormat(const Block & header_, std::unique_ptr<PeekableReadBuffer> buf_, Params params_, const FormatSettings & format_settings_);
-
     void readJSONObject(IColumn & column) override;
-
-    std::unique_ptr<PeekableReadBuffer> buf;
 };
 
 
@@ -71,17 +69,12 @@ public:
 class JSONAsObjectExternalSchemaReader : public IExternalSchemaReader
 {
 public:
-    explicit JSONAsObjectExternalSchemaReader(const FormatSettings & settings_);
+    explicit JSONAsObjectExternalSchemaReader(const FormatSettings & settings);
 
     NamesAndTypesList readSchema() override
     {
-        if (settings.json.allow_json_type)
-            return {{"json", std::make_shared<DataTypeObject>(DataTypeObject::SchemaFormat::JSON)}};
-        return {{"json", std::make_shared<DataTypeObjectDeprecated>("json", false)}};
+        return {{"json", std::make_shared<DataTypeObject>("json", false)}};
     }
-
-private:
-    FormatSettings settings;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/JSONColumnsWithMetadataBlockOutputFormat.cpp b/src/Processors/Formats/Impl/JSONColumnsWithMetadataBlockOutputFormat.cpp
index 2f285e3d202..1e8f57aa9a6 100644
--- a/src/Processors/Formats/Impl/JSONColumnsWithMetadataBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONColumnsWithMetadataBlockOutputFormat.cpp
@@ -81,8 +81,6 @@ void JSONColumnsWithMetadataBlockOutputFormat::finalizeImpl()
         rows,
         statistics.rows_before_limit,
         statistics.applied_limit,
-        statistics.rows_before_aggregation,
-        statistics.applied_aggregation,
         statistics.watch,
         statistics.progress,
         format_settings.write_statistics,
diff --git a/src/Processors/Formats/Impl/JSONColumnsWithMetadataBlockOutputFormat.h b/src/Processors/Formats/Impl/JSONColumnsWithMetadataBlockOutputFormat.h
index e5208440483..c72b4d87234 100644
--- a/src/Processors/Formats/Impl/JSONColumnsWithMetadataBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/JSONColumnsWithMetadataBlockOutputFormat.h
@@ -44,11 +44,6 @@ public:
     String getName() const override { return "JSONCompactColumnsBlockOutputFormat"; }
 
     void setRowsBeforeLimit(size_t rows_before_limit_) override { statistics.rows_before_limit = rows_before_limit_; statistics.applied_limit = true; }
-    void setRowsBeforeAggregation(size_t rows_before_aggregation_) override
-    {
-        statistics.rows_before_aggregation = rows_before_aggregation_;
-        statistics.applied_aggregation = true;
-    }
     void onProgress(const Progress & progress_) override { statistics.progress.incrementPiecewiseAtomically(progress_); }
 
 protected:
diff --git a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.h b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.h
index 50589329073..ebeb939e7fa 100644
--- a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.h
@@ -11,7 +11,7 @@ namespace DB
 {
 
 class ReadBuffer;
-class JSONCompactEachRowFormatReader;
+
 
 /** A stream for reading data in a bunch of formats:
  *  - JSONCompactEachRow
@@ -20,7 +20,7 @@ class JSONCompactEachRowFormatReader;
  *  - JSONCompactStringsEachRowWithNamesAndTypes
  *
 */
-class JSONCompactEachRowRowInputFormat final : public RowInputFormatWithNamesAndTypes<JSONCompactEachRowFormatReader>
+class JSONCompactEachRowRowInputFormat final : public RowInputFormatWithNamesAndTypes
 {
 public:
     JSONCompactEachRowRowInputFormat(
diff --git a/src/Processors/Formats/Impl/JSONCompactRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactRowInputFormat.cpp
index 63ced05dd3a..63066fc8220 100644
--- a/src/Processors/Formats/Impl/JSONCompactRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONCompactRowInputFormat.cpp
@@ -14,7 +14,7 @@ namespace ErrorCodes
 
 JSONCompactRowInputFormat::JSONCompactRowInputFormat(
     const Block & header_, ReadBuffer & in_, Params params_, const FormatSettings & format_settings_)
-    : RowInputFormatWithNamesAndTypes<JSONCompactFormatReader>(
+    : RowInputFormatWithNamesAndTypes(
         header_, in_, params_, false, false, false, format_settings_, std::make_unique<JSONCompactFormatReader>(in_, format_settings_))
 {
 }
diff --git a/src/Processors/Formats/Impl/JSONCompactRowInputFormat.h b/src/Processors/Formats/Impl/JSONCompactRowInputFormat.h
index eb70f6ec2a3..3a93e7149b0 100644
--- a/src/Processors/Formats/Impl/JSONCompactRowInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONCompactRowInputFormat.h
@@ -5,8 +5,8 @@
 
 namespace DB
 {
-class JSONCompactFormatReader;
-class JSONCompactRowInputFormat final : public RowInputFormatWithNamesAndTypes<JSONCompactFormatReader>
+
+class JSONCompactRowInputFormat final : public RowInputFormatWithNamesAndTypes
 {
 public:
     JSONCompactRowInputFormat(const Block & header_, ReadBuffer & in_, Params params_, const FormatSettings & format_settings_);
diff --git a/src/Processors/Formats/Impl/JSONCompactWithProgressRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactWithProgressRowOutputFormat.cpp
deleted file mode 100644
index e90864ecdf3..00000000000
--- a/src/Processors/Formats/Impl/JSONCompactWithProgressRowOutputFormat.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-#include <Formats/FormatFactory.h>
-#include <Formats/JSONUtils.h>
-#include <Processors/Formats/Impl/JSONCompactWithProgressRowOutputFormat.h>
-
-#include <IO/WriteHelpers.h>
-
-
-namespace DB
-{
-
-JSONCompactWithProgressRowOutputFormat::JSONCompactWithProgressRowOutputFormat(
-    WriteBuffer & out_, const Block & header, const FormatSettings & settings_, bool yield_strings_)
-    : JSONRowOutputFormat(out_, header, settings_, yield_strings_)
-{
-}
-
-void JSONCompactWithProgressRowOutputFormat::writePrefix()
-{
-    JSONUtils::writeCompactObjectStart(*ostr);
-    JSONUtils::writeCompactMetadata(names, types, settings, *ostr);
-    JSONUtils::writeCompactObjectEnd(*ostr);
-    writeCString("\n", *ostr);
-}
-
-void JSONCompactWithProgressRowOutputFormat::writeField(const IColumn & column, const ISerialization & serialization, size_t row_num)
-{
-    JSONUtils::writeFieldFromColumn(column, serialization, row_num, yield_strings, settings, *ostr);
-    ++field_number;
-}
-
-void JSONCompactWithProgressRowOutputFormat::writeFieldDelimiter()
-{
-    JSONUtils::writeFieldCompactDelimiter(*ostr);
-}
-
-void JSONCompactWithProgressRowOutputFormat::writeRowStartDelimiter()
-{
-    if (has_progress)
-        writeProgress();
-    writeCString("{\"data\":", *ostr);
-    JSONUtils::writeCompactArrayStart(*ostr);
-}
-
-void JSONCompactWithProgressRowOutputFormat::writeRowEndDelimiter()
-{
-    JSONUtils::writeCompactArrayEnd(*ostr);
-    writeCString("}\n", *ostr);
-    field_number = 0;
-    ++row_count;
-}
-
-void JSONCompactWithProgressRowOutputFormat::writeRowBetweenDelimiter()
-{
-}
-
-void JSONCompactWithProgressRowOutputFormat::writeBeforeTotals()
-{
-    JSONUtils::writeCompactObjectStart(*ostr);
-    JSONUtils::writeCompactArrayStart(*ostr, 0, "totals");
-}
-
-void JSONCompactWithProgressRowOutputFormat::writeTotals(const Columns & columns, size_t row_num)
-{
-    JSONUtils::writeCompactColumns(columns, serializations, row_num, yield_strings, settings, *ostr);
-}
-
-void JSONCompactWithProgressRowOutputFormat::writeAfterTotals()
-{
-    JSONUtils::writeCompactArrayEnd(*ostr);
-    JSONUtils::writeCompactObjectEnd(*ostr);
-    writeCString("\n", *ostr);
-}
-
-void JSONCompactWithProgressRowOutputFormat::writeExtremesElement(const char * title, const Columns & columns, size_t row_num)
-{
-    JSONUtils::writeCompactArrayStart(*ostr, 2, title);
-    JSONUtils::writeCompactColumns(columns, serializations, row_num, yield_strings, settings, *ostr);
-    JSONUtils::writeCompactArrayEnd(*ostr);
-}
-
-void JSONCompactWithProgressRowOutputFormat::onProgress(const Progress & value)
-{
-    statistics.progress.incrementPiecewiseAtomically(value);
-    String progress_line;
-    WriteBufferFromString buf(progress_line);
-    writeCString("{\"progress\":", buf);
-    statistics.progress.writeJSON(buf);
-    writeCString("}\n", buf);
-    buf.finalize();
-    std::lock_guard lock(progress_lines_mutex);
-    progress_lines.emplace_back(std::move(progress_line));
-    has_progress = true;
-}
-
-
-void JSONCompactWithProgressRowOutputFormat::flush()
-{
-    if (has_progress)
-        writeProgress();
-    JSONRowOutputFormat::flush();
-}
-
-void JSONCompactWithProgressRowOutputFormat::writeSuffix()
-{
-    if (has_progress)
-        writeProgress();
-}
-
-void JSONCompactWithProgressRowOutputFormat::writeProgress()
-{
-    std::lock_guard lock(progress_lines_mutex);
-    for (const auto & progress_line : progress_lines)
-        writeString(progress_line, *ostr);
-    progress_lines.clear();
-    has_progress = false;
-}
-
-void JSONCompactWithProgressRowOutputFormat::finalizeImpl()
-{
-    if (exception_message.empty())
-    {
-        JSONUtils::writeCompactAdditionalInfo(
-            row_count,
-            statistics.rows_before_limit,
-            statistics.applied_limit,
-            statistics.watch,
-            statistics.progress,
-            settings.write_statistics,
-            *ostr);
-    }
-    else
-    {
-        JSONUtils::writeCompactObjectStart(*ostr);
-        JSONUtils::writeException(exception_message, *ostr, settings, 0);
-        JSONUtils::writeCompactObjectEnd(*ostr);
-    }
-    writeCString("\n", *ostr);
-    ostr->next();
-}
-
-void registerOutputFormatJSONCompactWithProgress(FormatFactory & factory)
-{
-    factory.registerOutputFormat(
-        "JSONCompactWithProgress",
-        [](WriteBuffer & buf, const Block & sample, const FormatSettings & format_settings)
-        { return std::make_shared<JSONCompactWithProgressRowOutputFormat>(buf, sample, format_settings, false); });
-
-    factory.registerOutputFormat(
-        "JSONCompactWithProgressStrings",
-        [](WriteBuffer & buf, const Block & sample, const FormatSettings & format_settings)
-        { return std::make_shared<JSONCompactWithProgressRowOutputFormat>(buf, sample, format_settings, true); });
-}
-
-}
diff --git a/src/Processors/Formats/Impl/JSONCompactWithProgressRowOutputFormat.h b/src/Processors/Formats/Impl/JSONCompactWithProgressRowOutputFormat.h
deleted file mode 100644
index 1c21914d8cb..00000000000
--- a/src/Processors/Formats/Impl/JSONCompactWithProgressRowOutputFormat.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-#include <Core/Block.h>
-#include <IO/WriteBuffer.h>
-#include <IO/WriteBufferValidUTF8.h>
-#include <Processors/Formats/Impl/JSONRowOutputFormat.h>
-
-
-namespace DB
-{
-
-struct FormatSettings;
-
-class JSONCompactWithProgressRowOutputFormat final : public JSONRowOutputFormat
-{
-public:
-    JSONCompactWithProgressRowOutputFormat(WriteBuffer & out_, const Block & header, const FormatSettings & settings_, bool yield_strings_);
-
-    String getName() const override { return "JSONCompactWithProgressRowOutputFormat"; }
-
-    void onProgress(const Progress & value) override;
-    void flush() override;
-
-private:
-    void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) override;
-    void writeFieldDelimiter() override;
-    void writeRowStartDelimiter() override;
-    void writeRowEndDelimiter() override;
-    void writeRowBetweenDelimiter() override;
-    bool supportTotals() const override { return true; }
-    bool supportExtremes() const override { return true; }
-    void writeBeforeTotals() override;
-    void writeAfterTotals() override;
-    void writeExtremesElement(const char * title, const Columns & columns, size_t row_num) override;
-    void writeTotals(const Columns & columns, size_t row_num) override;
-
-    void writeProgress();
-    void writePrefix() override;
-    void writeSuffix() override;
-    void finalizeImpl() override;
-
-
-    std::vector<String> progress_lines;
-    std::mutex progress_lines_mutex;
-    /// To not lock mutex and check progress_lines every row,
-    /// we will use atomic flag that progress_lines is not empty.
-    std::atomic_bool has_progress = false;
-};
-
-}
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
index 8855a1bc28d..0e3972e8c45 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
@@ -46,6 +46,15 @@ JSONEachRowRowInputFormat::JSONEachRowRowInputFormat(
 {
     const auto & header = getPort().getHeader();
     name_map = header.getNamesToIndexesMap();
+    if (format_settings_.json.case_insensitive_column_matching)
+    {
+        for (auto & it : name_map)
+        {
+            StringRef key = it.first;
+            String lower_case_key = transformFieldNameToLowerCase(key);
+            lower_case_name_map[lower_case_key] = key;
+        }
+    }
     if (format_settings_.import_nested_json)
     {
         for (size_t i = 0; i != header.columns(); ++i)
@@ -171,7 +180,15 @@ void JSONEachRowRowInputFormat::readJSONObject(MutableColumns & columns)
             skipUnknownField(name_ref);
             continue;
         }
-        const size_t column_index = columnIndex(name_ref, key_index);
+        size_t column_index = 0;
+        if (format_settings.json.case_insensitive_column_matching)
+        {
+            String lower_case_name = transformFieldNameToLowerCase(name_ref);
+            StringRef field_name_ref = lower_case_name_map[lower_case_name];
+            column_index = columnIndex(field_name_ref, key_index);
+        }
+        else
+            column_index = columnIndex(name_ref, key_index);
 
         if (unlikely(ssize_t(column_index) < 0))
         {
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.h b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.h
index d97aa2dad8d..8a1cef8fa9f 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.h
@@ -55,7 +55,13 @@ private:
 
     virtual void readRowStart(MutableColumns &) {}
     virtual void skipRowStart() {}
-
+    String transformFieldNameToLowerCase(const StringRef & field_name)
+    {
+        String field_name_str = field_name.toString();
+        std::transform(field_name_str.begin(), field_name_str.end(), field_name_str.begin(),
+            [](unsigned char c) { return std::tolower(c); });
+        return field_name_str;
+    }
     /// Buffer for the read from the stream field name. Used when you have to copy it.
     /// Also, if processing of Nested data is in progress, it holds the common prefix
     /// of the nested column names (so that appending the field name to it produces
@@ -74,7 +80,8 @@ private:
 
     /// Hash table match `field name -> position in the block`. NOTE You can use perfect hash map.
     Block::NameMap name_map;
-
+    /// Hash table match `lower_case field name -> field name in the block`.
+    std::unordered_map<String, StringRef> lower_case_name_map;
     /// Cached search results for previous row (keyed as index in JSON object) - used as a hint.
     std::vector<Block::NameMap::const_iterator> prev_positions;
 
diff --git a/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp
index fec24b10c11..20182d84917 100644
--- a/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp
@@ -116,8 +116,6 @@ void JSONRowOutputFormat::finalizeImpl()
         row_count,
         statistics.rows_before_limit,
         statistics.applied_limit,
-        statistics.rows_before_aggregation,
-        statistics.applied_aggregation,
         statistics.watch,
         statistics.progress,
         settings.write_statistics && exception_message.empty(),
diff --git a/src/Processors/Formats/Impl/JSONRowOutputFormat.h b/src/Processors/Formats/Impl/JSONRowOutputFormat.h
index c36adb5ee3e..a38cd0e8db9 100644
--- a/src/Processors/Formats/Impl/JSONRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/JSONRowOutputFormat.h
@@ -35,11 +35,6 @@ public:
         statistics.applied_limit = true;
         statistics.rows_before_limit = rows_before_limit_;
     }
-    void setRowsBeforeAggregation(size_t rows_before_aggregation_) override
-    {
-        statistics.applied_aggregation = true;
-        statistics.rows_before_aggregation = rows_before_aggregation_;
-    }
 
 protected:
     void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) override;
diff --git a/src/Processors/Formats/Impl/NativeORCBlockInputFormat.cpp b/src/Processors/Formats/Impl/NativeORCBlockInputFormat.cpp
index 79dd6e1d35b..147aea0b73f 100644
--- a/src/Processors/Formats/Impl/NativeORCBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/NativeORCBlockInputFormat.cpp
@@ -262,7 +262,7 @@ convertFieldToORCLiteral(const orc::Type & orc_type, const Field & field, DataTy
         {
             case orc::BOOLEAN: {
                 /// May throw exception
-                auto val = field.safeGet<UInt64>();
+                auto val = field.get<UInt64>();
                 return orc::Literal(val != 0);
             }
             case orc::BYTE:
@@ -275,7 +275,7 @@ convertFieldToORCLiteral(const orc::Type & orc_type, const Field & field, DataTy
                 ///   SELECT * FROM file('t.orc', ORC, 'x UInt8') WHERE x > 10
                 /// We have to reject this, otherwise it would miss values > 127 (because
                 /// they're treated as negative by ORC).
-                auto val = field.safeGet<Int64>();
+                auto val = field.get<Int64>();
                 return orc::Literal(val);
             }
             case orc::FLOAT:
@@ -1143,42 +1143,24 @@ readColumnWithStringData(const orc::ColumnVectorBatch * orc_column, const orc::T
         reserver_size += 1;
     }
 
-    column_chars_t.resize_exact(reserver_size);
-    column_offsets.resize_exact(orc_str_column->numElements);
+    column_chars_t.reserve(reserver_size);
+    column_offsets.reserve(orc_str_column->numElements);
 
     size_t curr_offset = 0;
-    if (!orc_str_column->hasNulls)
+    for (size_t i = 0; i < orc_str_column->numElements; ++i)
     {
-        for (size_t i = 0; i < orc_str_column->numElements; ++i)
+        if (!orc_str_column->hasNulls || orc_str_column->notNull[i])
         {
             const auto * buf = orc_str_column->data[i];
             size_t buf_size = orc_str_column->length[i];
-            memcpy(&column_chars_t[curr_offset], buf, buf_size);
+            column_chars_t.insert_assume_reserved(buf, buf + buf_size);
             curr_offset += buf_size;
-
-            column_chars_t[curr_offset] = 0;
-            ++curr_offset;
-
-            column_offsets[i] = curr_offset;
         }
-    }
-    else
-    {
-        for (size_t i = 0; i < orc_str_column->numElements; ++i)
-        {
-            if (orc_str_column->notNull[i])
-            {
-                const auto * buf = orc_str_column->data[i];
-                size_t buf_size = orc_str_column->length[i];
-                memcpy(&column_chars_t[curr_offset], buf, buf_size);
-                curr_offset += buf_size;
-            }
 
-            column_chars_t[curr_offset] = 0;
-            ++curr_offset;
+        column_chars_t.push_back(0);
+        ++curr_offset;
 
-            column_offsets[i] = curr_offset;
-        }
+        column_offsets.push_back(curr_offset);
     }
     return {std::move(internal_column), std::move(internal_type), column_name};
 }
diff --git a/src/Processors/Formats/Impl/NativeORCBlockInputFormat.h b/src/Processors/Formats/Impl/NativeORCBlockInputFormat.h
index e4f2ef9ebe3..a3ef9ed4b8f 100644
--- a/src/Processors/Formats/Impl/NativeORCBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/NativeORCBlockInputFormat.h
@@ -64,7 +64,7 @@ public:
 protected:
     Chunk read() override;
 
-    void onCancel() noexcept override { is_stopped = 1; }
+    void onCancel() override { is_stopped = 1; }
 
 private:
     void prepareFileReader();
diff --git a/src/Processors/Formats/Impl/ORCBlockInputFormat.h b/src/Processors/Formats/Impl/ORCBlockInputFormat.h
index 85f1636d3dc..34630345849 100644
--- a/src/Processors/Formats/Impl/ORCBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ORCBlockInputFormat.h
@@ -34,7 +34,7 @@ public:
 protected:
     Chunk read() override;
 
-    void onCancel() noexcept override
+    void onCancel() override
     {
         is_stopped = 1;
     }
diff --git a/src/Processors/Formats/Impl/ORCBlockOutputFormat.cpp b/src/Processors/Formats/Impl/ORCBlockOutputFormat.cpp
index 4a7a23158ff..6f543a05fba 100644
--- a/src/Processors/Formats/Impl/ORCBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ORCBlockOutputFormat.cpp
@@ -12,7 +12,6 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnMap.h>
-#include <Columns/ColumnsCommon.h>
 
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
@@ -204,15 +203,25 @@ template <typename NumberType, typename NumberVectorBatch, typename ConvertFunc>
 void ORCBlockOutputFormat::writeNumbers(
         orc::ColumnVectorBatch & orc_column,
         const IColumn & column,
-        const PaddedPODArray<UInt8> * /*null_bytemap*/,
+        const PaddedPODArray<UInt8> * null_bytemap,
         ConvertFunc convert)
 {
     NumberVectorBatch & number_orc_column = dynamic_cast<NumberVectorBatch &>(orc_column);
     const auto & number_column = assert_cast<const ColumnVector<NumberType> &>(column);
+    number_orc_column.resize(number_column.size());
 
-    number_orc_column.data.resize(number_column.size());
     for (size_t i = 0; i != number_column.size(); ++i)
+    {
+        if (null_bytemap && (*null_bytemap)[i])
+        {
+            number_orc_column.notNull[i] = 0;
+            continue;
+        }
+
+        number_orc_column.notNull[i] = 1;
         number_orc_column.data[i] = convert(number_column.getElement(i));
+    }
+    number_orc_column.numElements = number_column.size();
 }
 
 template <typename Decimal, typename DecimalVectorBatch, typename ConvertFunc>
@@ -220,7 +229,7 @@ void ORCBlockOutputFormat::writeDecimals(
         orc::ColumnVectorBatch & orc_column,
         const IColumn & column,
         DataTypePtr & type,
-        const PaddedPODArray<UInt8> * /*null_bytemap*/,
+        const PaddedPODArray<UInt8> * null_bytemap,
         ConvertFunc convert)
 {
     DecimalVectorBatch & decimal_orc_column = dynamic_cast<DecimalVectorBatch &>(orc_column);
@@ -229,49 +238,71 @@ void ORCBlockOutputFormat::writeDecimals(
     decimal_orc_column.precision = decimal_type->getPrecision();
     decimal_orc_column.scale = decimal_type->getScale();
     decimal_orc_column.resize(decimal_column.size());
-
-    decimal_orc_column.values.resize(decimal_column.size());
     for (size_t i = 0; i != decimal_column.size(); ++i)
+    {
+        if (null_bytemap && (*null_bytemap)[i])
+        {
+            decimal_orc_column.notNull[i] = 0;
+            continue;
+        }
+
+        decimal_orc_column.notNull[i] = 1;
         decimal_orc_column.values[i] = convert(decimal_column.getElement(i).value);
+    }
+    decimal_orc_column.numElements = decimal_column.size();
 }
 
 template <typename ColumnType>
 void ORCBlockOutputFormat::writeStrings(
         orc::ColumnVectorBatch & orc_column,
         const IColumn & column,
-        const PaddedPODArray<UInt8> * /*null_bytemap*/)
+        const PaddedPODArray<UInt8> * null_bytemap)
 {
     orc::StringVectorBatch & string_orc_column = dynamic_cast<orc::StringVectorBatch &>(orc_column);
     const auto & string_column = assert_cast<const ColumnType &>(column);
+    string_orc_column.resize(string_column.size());
 
-    string_orc_column.data.resize(string_column.size());
-    string_orc_column.length.resize(string_column.size());
     for (size_t i = 0; i != string_column.size(); ++i)
     {
+        if (null_bytemap && (*null_bytemap)[i])
+        {
+            string_orc_column.notNull[i] = 0;
+            continue;
+        }
+
+        string_orc_column.notNull[i] = 1;
         const std::string_view & string = string_column.getDataAt(i).toView();
         string_orc_column.data[i] = const_cast<char *>(string.data());
         string_orc_column.length[i] = string.size();
     }
+    string_orc_column.numElements = string_column.size();
 }
 
 template <typename ColumnType, typename GetSecondsFunc, typename GetNanosecondsFunc>
 void ORCBlockOutputFormat::writeDateTimes(
         orc::ColumnVectorBatch & orc_column,
         const IColumn & column,
-        const PaddedPODArray<UInt8> * /*null_bytemap*/,
+        const PaddedPODArray<UInt8> * null_bytemap,
         GetSecondsFunc get_seconds,
         GetNanosecondsFunc get_nanoseconds)
 {
     orc::TimestampVectorBatch & timestamp_orc_column = dynamic_cast<orc::TimestampVectorBatch &>(orc_column);
     const auto & timestamp_column = assert_cast<const ColumnType &>(column);
+    timestamp_orc_column.resize(timestamp_column.size());
 
-    timestamp_orc_column.data.resize(timestamp_column.size());
-    timestamp_orc_column.nanoseconds.resize(timestamp_column.size());
     for (size_t i = 0; i != timestamp_column.size(); ++i)
     {
+        if (null_bytemap && (*null_bytemap)[i])
+        {
+            timestamp_orc_column.notNull[i] = 0;
+            continue;
+        }
+
+        timestamp_orc_column.notNull[i] = 1;
         timestamp_orc_column.data[i] = static_cast<int64_t>(get_seconds(timestamp_column.getElement(i)));
         timestamp_orc_column.nanoseconds[i] = static_cast<int64_t>(get_nanoseconds(timestamp_column.getElement(i)));
     }
+    timestamp_orc_column.numElements = timestamp_column.size();
 }
 
 void ORCBlockOutputFormat::writeColumn(
@@ -280,27 +311,9 @@ void ORCBlockOutputFormat::writeColumn(
     DataTypePtr & type,
     const PaddedPODArray<UInt8> * null_bytemap)
 {
-    size_t rows = column.size();
-    orc_column.resize(rows);
-    orc_column.numElements = rows;
-
-    /// Calculate orc_column.hasNulls
+    orc_column.notNull.resize(column.size());
     if (null_bytemap)
-        orc_column.hasNulls = !memoryIsZero(null_bytemap->data(), 0, null_bytemap->size());
-    else
-        orc_column.hasNulls = false;
-
-    /// Fill orc_column.notNull
-    if (orc_column.hasNulls)
-    {
-        for (size_t i = 0; i < rows; ++i)
-            orc_column.notNull[i] = !(*null_bytemap)[i];
-    }
-    else
-    {
-        for (size_t i = 0; i < rows; ++i)
-            orc_column.notNull[i] = 1;
-    }
+        orc_column.hasNulls = true;
 
     /// ORC doesn't have unsigned types, so cast everything to signed and sign-extend to Int64 to
     /// make the ORC library calculate min and max correctly.
@@ -458,7 +471,6 @@ void ORCBlockOutputFormat::writeColumn(
         }
         case TypeIndex::Nullable:
         {
-            chassert(!null_bytemap);
             const auto & nullable_column = assert_cast<const ColumnNullable &>(column);
             const PaddedPODArray<UInt8> & new_null_bytemap = assert_cast<const ColumnVector<UInt8> &>(*nullable_column.getNullMapColumnPtr()).getData();
             auto nested_type = removeNullable(type);
@@ -473,15 +485,19 @@ void ORCBlockOutputFormat::writeColumn(
             const ColumnArray::Offsets & offsets = list_column.getOffsets();
 
             size_t column_size = list_column.size();
-            list_orc_column.offsets.resize(column_size + 1);
+            list_orc_column.resize(column_size);
 
             /// The length of list i in ListVectorBatch is offsets[i+1] - offsets[i].
             list_orc_column.offsets[0] = 0;
             for (size_t i = 0; i != column_size; ++i)
+            {
                 list_orc_column.offsets[i + 1] = offsets[i];
+                list_orc_column.notNull[i] = 1;
+            }
 
             orc::ColumnVectorBatch & nested_orc_column = *list_orc_column.elements;
-            writeColumn(nested_orc_column, list_column.getData(), nested_type, nullptr);
+            writeColumn(nested_orc_column, list_column.getData(), nested_type, null_bytemap);
+            list_orc_column.numElements = column_size;
             break;
         }
         case TypeIndex::Tuple:
@@ -489,8 +505,10 @@ void ORCBlockOutputFormat::writeColumn(
             orc::StructVectorBatch & struct_orc_column = dynamic_cast<orc::StructVectorBatch &>(orc_column);
             const auto & tuple_column = assert_cast<const ColumnTuple &>(column);
             auto nested_types = assert_cast<const DataTypeTuple *>(type.get())->getElements();
+            for (size_t i = 0; i != tuple_column.size(); ++i)
+                struct_orc_column.notNull[i] = 1;
             for (size_t i = 0; i != tuple_column.tupleSize(); ++i)
-                writeColumn(*struct_orc_column.fields[i], tuple_column.getColumn(i), nested_types[i], nullptr);
+                writeColumn(*struct_orc_column.fields[i], tuple_column.getColumn(i), nested_types[i], null_bytemap);
             break;
         }
         case TypeIndex::Map:
@@ -502,21 +520,25 @@ void ORCBlockOutputFormat::writeColumn(
 
             size_t column_size = list_column.size();
 
-            map_orc_column.offsets.resize(column_size + 1);
+            map_orc_column.resize(list_column.size());
             /// The length of list i in ListVectorBatch is offsets[i+1] - offsets[i].
             map_orc_column.offsets[0] = 0;
             for (size_t i = 0; i != column_size; ++i)
+            {
                 map_orc_column.offsets[i + 1] = offsets[i];
-
+                map_orc_column.notNull[i] = 1;
+            }
             const auto nested_columns = assert_cast<const ColumnTuple *>(list_column.getDataPtr().get())->getColumns();
 
             orc::ColumnVectorBatch & keys_orc_column = *map_orc_column.keys;
             auto key_type = map_type.getKeyType();
-            writeColumn(keys_orc_column, *nested_columns[0], key_type, nullptr);
+            writeColumn(keys_orc_column, *nested_columns[0], key_type, null_bytemap);
 
             orc::ColumnVectorBatch & values_orc_column = *map_orc_column.elements;
             auto value_type = map_type.getValueType();
-            writeColumn(values_orc_column, *nested_columns[1], value_type, nullptr);
+            writeColumn(values_orc_column, *nested_columns[1], value_type, null_bytemap);
+
+            map_orc_column.numElements = column_size;
             break;
         }
         default:
@@ -524,6 +546,27 @@ void ORCBlockOutputFormat::writeColumn(
     }
 }
 
+size_t ORCBlockOutputFormat::getColumnSize(const IColumn & column, DataTypePtr & type)
+{
+    if (type->getTypeId() == TypeIndex::Array)
+    {
+        auto nested_type = assert_cast<const DataTypeArray &>(*type).getNestedType();
+        const IColumn & nested_column = assert_cast<const ColumnArray &>(column).getData();
+        return std::max(column.size(), getColumnSize(nested_column, nested_type));
+    }
+
+    return column.size();
+}
+
+size_t ORCBlockOutputFormat::getMaxColumnSize(Chunk & chunk)
+{
+    size_t columns_num = chunk.getNumColumns();
+    size_t max_column_size = 0;
+    for (size_t i = 0; i != columns_num; ++i)
+        max_column_size = std::max(max_column_size, getColumnSize(*chunk.getColumns()[i], data_types[i]));
+    return max_column_size;
+}
+
 void ORCBlockOutputFormat::consume(Chunk chunk)
 {
     if (!writer)
@@ -532,7 +575,10 @@ void ORCBlockOutputFormat::consume(Chunk chunk)
     size_t columns_num = chunk.getNumColumns();
     size_t rows_num = chunk.getNumRows();
 
-    std::unique_ptr<orc::ColumnVectorBatch> batch = writer->createRowBatch(chunk.getNumRows());
+    /// getMaxColumnSize is needed to write arrays.
+    /// The size of the batch must be no less than total amount of array elements
+    /// and no less than the number of rows (ORC writes a null bit for every row).
+    std::unique_ptr<orc::ColumnVectorBatch> batch = writer->createRowBatch(getMaxColumnSize(chunk));
     orc::StructVectorBatch & root = dynamic_cast<orc::StructVectorBatch &>(*batch);
 
     auto columns = chunk.detachColumns();
diff --git a/src/Processors/Formats/Impl/ORCBlockOutputFormat.h b/src/Processors/Formats/Impl/ORCBlockOutputFormat.h
index 06ecac9b820..28837193d1a 100644
--- a/src/Processors/Formats/Impl/ORCBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/ORCBlockOutputFormat.h
@@ -69,6 +69,11 @@ private:
 
     void writeColumn(orc::ColumnVectorBatch & orc_column, const IColumn & column, DataTypePtr & type, const PaddedPODArray<UInt8> * null_bytemap);
 
+    /// These two functions are needed to know maximum nested size of arrays to
+    /// create an ORC Batch with the appropriate size
+    size_t getColumnSize(const IColumn & column, DataTypePtr & type);
+    size_t getMaxColumnSize(Chunk & chunk);
+
     void prepareWriter();
 
     const FormatSettings format_settings;
diff --git a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.cpp b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.cpp
index 5d404d493a6..b2871310be5 100644
--- a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.cpp
@@ -96,7 +96,7 @@ namespace DB
     }
 
 
-    void ParallelFormattingOutputFormat::finishAndWait() noexcept
+    void ParallelFormattingOutputFormat::finishAndWait()
     {
         emergency_stop = true;
 
diff --git a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
index 02c74742226..341141dd633 100644
--- a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
+++ b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
@@ -122,7 +122,7 @@ public:
         started_prefix = true;
     }
 
-    void onCancel() noexcept override
+    void onCancel() override
     {
         finishAndWait();
     }
@@ -268,7 +268,7 @@ private:
     bool collected_suffix = false;
     bool collected_finalize = false;
 
-    void finishAndWait() noexcept;
+    void finishAndWait();
 
     void onBackgroundException()
     {
@@ -313,12 +313,6 @@ private:
         statistics.rows_before_limit = rows_before_limit;
         statistics.applied_limit = true;
     }
-    void setRowsBeforeAggregation(size_t rows_before_aggregation) override
-    {
-        std::lock_guard lock(statistics_mutex);
-        statistics.rows_before_aggregation = rows_before_aggregation;
-        statistics.applied_aggregation = true;
-    }
 };
 
 }
diff --git a/src/Processors/Formats/Impl/ParallelParsingInputFormat.h b/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
index b97bf5213e6..963ccd88def 100644
--- a/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
+++ b/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
@@ -137,7 +137,7 @@ private:
 
     Chunk read() final;
 
-    void onCancel() noexcept final
+    void onCancel() final
     {
         /*
          * The format parsers themselves are not being cancelled here, so we'll
@@ -292,7 +292,7 @@ private:
             first_parser_finished.wait();
     }
 
-    void finishAndWait() noexcept
+    void finishAndWait()
     {
         /// Defending concurrent segmentator thread join
         std::lock_guard finish_and_wait_lock(finish_and_wait_mutex);
diff --git a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
index 002348f5456..77aacec941e 100644
--- a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
@@ -286,9 +286,6 @@ static std::vector<Range> getHyperrectangleForRowGroup(const parquet::FileMetaDa
         if (!s)
             continue;
 
-        if (s->descr()->schema_node()->is_repeated())
-            continue;
-
         auto path = c->path_in_schema()->ToDotVector();
         if (path.size() != 1)
             continue; // compound types not supported
@@ -479,7 +476,7 @@ void ParquetBlockInputFormat::initializeIfNeeded()
     int num_row_groups = metadata->num_row_groups();
     row_group_batches.reserve(num_row_groups);
 
-    auto adaptive_chunk_size = [&](int row_group_idx) -> size_t
+    auto adative_chunk_size = [&](int row_group_idx) -> size_t
     {
         size_t total_size = 0;
         auto row_group_meta = metadata->RowGroup(row_group_idx);
@@ -516,7 +513,7 @@ void ParquetBlockInputFormat::initializeIfNeeded()
         row_group_batches.back().row_groups_idxs.push_back(row_group);
         row_group_batches.back().total_rows += metadata->RowGroup(row_group)->num_rows();
         row_group_batches.back().total_bytes_compressed += metadata->RowGroup(row_group)->total_compressed_size();
-        auto rows = adaptive_chunk_size(row_group);
+        auto rows = adative_chunk_size(row_group);
         row_group_batches.back().adaptive_chunk_size = rows ? rows : format_settings.parquet.max_block_size;
     }
 }
diff --git a/src/Processors/Formats/Impl/ParquetBlockInputFormat.h b/src/Processors/Formats/Impl/ParquetBlockInputFormat.h
index ed528cc077c..24735ee4371 100644
--- a/src/Processors/Formats/Impl/ParquetBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ParquetBlockInputFormat.h
@@ -68,7 +68,7 @@ public:
 private:
     Chunk read() override;
 
-    void onCancel() noexcept override
+    void onCancel() override
     {
         is_stopped = 1;
     }
diff --git a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
index 645f16c6abe..9e499e2c400 100644
--- a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
@@ -270,7 +270,7 @@ void ParquetBlockOutputFormat::resetFormatterImpl()
     staging_bytes = 0;
 }
 
-void ParquetBlockOutputFormat::onCancel() noexcept
+void ParquetBlockOutputFormat::onCancel()
 {
     is_stopped = true;
 }
diff --git a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h
index f8f5d2556a5..422bae5c315 100644
--- a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h
@@ -112,7 +112,7 @@ private:
     void consume(Chunk) override;
     void finalizeImpl() override;
     void resetFormatterImpl() override;
-    void onCancel() noexcept override;
+    void onCancel() override;
 
     void writeRowGroup(std::vector<Chunk> chunks);
     void writeUsingArrow(std::vector<Chunk> chunks);
diff --git a/src/Processors/Formats/Impl/ParquetMetadataInputFormat.h b/src/Processors/Formats/Impl/ParquetMetadataInputFormat.h
index 5d2d8989859..ff63d78fa44 100644
--- a/src/Processors/Formats/Impl/ParquetMetadataInputFormat.h
+++ b/src/Processors/Formats/Impl/ParquetMetadataInputFormat.h
@@ -65,7 +65,7 @@ public:
 private:
     Chunk read() override;
 
-    void onCancel() noexcept override
+    void onCancel() override
     {
         is_stopped = 1;
     }
diff --git a/src/Processors/Formats/Impl/PrometheusTextOutputFormat.cpp b/src/Processors/Formats/Impl/PrometheusTextOutputFormat.cpp
index b43c195f201..3578401a0f8 100644
--- a/src/Processors/Formats/Impl/PrometheusTextOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrometheusTextOutputFormat.cpp
@@ -286,10 +286,10 @@ static void columnMapToContainer(const ColumnMap * col_map, size_t row_num, Cont
 {
     Field field;
     col_map->get(row_num, field);
-    const auto & map_field = field.safeGet<Map>();
+    const auto & map_field = field.get<Map>();
     for (const auto & map_element : map_field)
     {
-        const auto & map_entry = map_element.safeGet<Tuple>();
+        const auto & map_entry = map_element.get<Tuple>();
 
         String entry_key;
         String entry_value;
diff --git a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.h b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.h
index 3c6efe9ac4c..32abd532a52 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.h
+++ b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.h
@@ -10,11 +10,9 @@
 namespace DB
 {
 
-class TabSeparatedFormatReader;
-
 /** A stream to input data in tsv format.
   */
-class TabSeparatedRowInputFormat final : public RowInputFormatWithNamesAndTypes<TabSeparatedFormatReader>
+class TabSeparatedRowInputFormat final : public RowInputFormatWithNamesAndTypes
 {
 public:
     /** with_names - the first line is the header with the names of the columns
diff --git a/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp b/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp
index 5d6db17aaa2..1c43a0fa331 100644
--- a/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp
@@ -42,11 +42,9 @@ TemplateBlockOutputFormat::TemplateBlockOutputFormat(const Block & header_, Writ
             case static_cast<size_t>(ResultsetPart::TimeElapsed):
             case static_cast<size_t>(ResultsetPart::RowsRead):
             case static_cast<size_t>(ResultsetPart::BytesRead):
-            case static_cast<size_t>(ResultsetPart::RowsBeforeAggregation):
                 if (format.escaping_rules[i] == EscapingRule::None)
-                    format.throwInvalidFormat(
-                        "Serialization type for output part rows, rows, time, "
-                        "rows_read or bytes_read is not specified", i);
+                    format.throwInvalidFormat("Serialization type for output part rows, rows_before_limit, time, "
+                                              "rows_read or bytes_read is not specified", i);
                 break;
             default:
                 format.throwInvalidFormat("Invalid output part", i);
@@ -90,8 +88,6 @@ TemplateBlockOutputFormat::ResultsetPart TemplateBlockOutputFormat::stringToResu
         return ResultsetPart::RowsRead;
     else if (part == "bytes_read")
         return ResultsetPart::BytesRead;
-    else if (part == "rows_before_aggregation")
-        return ResultsetPart::RowsBeforeAggregation;
     else
         throw Exception(ErrorCodes::SYNTAX_ERROR, "Unknown output part {}", part);
 }
@@ -177,11 +173,6 @@ void TemplateBlockOutputFormat::finalizeImpl()
             case ResultsetPart::BytesRead:
                 writeValue<size_t, DataTypeUInt64>(statistics.progress.read_bytes.load(), format.escaping_rules[i]);
                 break;
-            case ResultsetPart::RowsBeforeAggregation:
-                if (!statistics.applied_aggregation)
-                    format.throwInvalidFormat("Cannot print rows_before_aggregation for this request", i);
-                writeValue<size_t, DataTypeUInt64>(statistics.rows_before_aggregation, format.escaping_rules[i]);
-                break;
             default:
                 break;
         }
diff --git a/src/Processors/Formats/Impl/TemplateBlockOutputFormat.h b/src/Processors/Formats/Impl/TemplateBlockOutputFormat.h
index 5e88d79b4a8..53d98849482 100644
--- a/src/Processors/Formats/Impl/TemplateBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/TemplateBlockOutputFormat.h
@@ -21,11 +21,6 @@ public:
     String getName() const override { return "TemplateBlockOutputFormat"; }
 
     void setRowsBeforeLimit(size_t rows_before_limit_) override { statistics.rows_before_limit = rows_before_limit_; statistics.applied_limit = true; }
-    void setRowsBeforeAggregation(size_t rows_before_aggregation_) override
-    {
-        statistics.rows_before_aggregation = rows_before_aggregation_;
-        statistics.applied_aggregation = true;
-    }
     void onProgress(const Progress & progress_) override { statistics.progress.incrementPiecewiseAtomically(progress_); }
 
     enum class ResultsetPart : size_t
@@ -38,8 +33,7 @@ public:
         RowsBeforeLimit,
         TimeElapsed,
         RowsRead,
-        BytesRead,
-        RowsBeforeAggregation
+        BytesRead
     };
 
     static ResultsetPart stringToResultsetPart(const String & part);
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
index 16b88d0b8dc..c23d717d52f 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
@@ -333,7 +333,7 @@ namespace
         {
             const DataTypeTuple & type_tuple = static_cast<const DataTypeTuple &>(data_type);
 
-            Tuple & tuple_value = value.safeGet<Tuple>();
+            Tuple & tuple_value = value.get<Tuple>();
 
             size_t src_tuple_size = tuple_value.size();
             size_t dst_tuple_size = type_tuple.getElements().size();
@@ -360,7 +360,7 @@ namespace
             if (element_type.isNullable())
                 return;
 
-            Array & array_value = value.safeGet<Array>();
+            Array & array_value = value.get<Array>();
             size_t array_value_size = array_value.size();
 
             for (size_t i = 0; i < array_value_size; ++i)
@@ -378,12 +378,12 @@ namespace
             const auto & key_type = *type_map.getKeyType();
             const auto & value_type = *type_map.getValueType();
 
-            auto & map = value.safeGet<Map>();
+            auto & map = value.get<Map>();
             size_t map_size = map.size();
 
             for (size_t i = 0; i < map_size; ++i)
             {
-                auto & map_entry = map[i].safeGet<Tuple>();
+                auto & map_entry = map[i].get<Tuple>();
 
                 auto & entry_key = map_entry[0];
                 auto & entry_value = map_entry[1];
@@ -406,7 +406,7 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
 {
     const Block & header = getPort().getHeader();
     const IDataType & type = *header.getByPosition(column_idx).type;
-    const auto & settings = context->getSettingsRef();
+    auto settings = context->getSettingsRef();
 
     /// Advance the token iterator until the start of the column expression
     readUntilTheEndOfRowAndReTokenize(column_idx);
@@ -542,7 +542,7 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
     if (format_settings.null_as_default)
         tryToReplaceNullFieldsInComplexTypesWithDefaultValues(expression_value, type);
 
-    Field value = convertFieldToType(expression_value, type, value_raw.second.get(), format_settings);
+    Field value = convertFieldToType(expression_value, type, value_raw.second.get());
 
     /// Check that we are indeed allowed to insert a NULL.
     if (value.isNull() && !type.isNullable() && !type.isLowCardinalityNullable())
@@ -625,6 +625,8 @@ void ValuesBlockInputFormat::readSuffix()
         skipWhitespaceIfAny(*buf);
         if (buf->hasUnreadData())
             throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Cannot read data after semicolon");
+        if (!format_settings.values.allow_data_after_semicolon && !buf->eof())
+            throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Cannot read data after semicolon (and input_format_values_allow_data_after_semicolon=0)");
         return;
     }
 
@@ -663,16 +665,6 @@ void ValuesBlockInputFormat::resetReadBuffer()
     IInputFormat::resetReadBuffer();
 }
 
-void ValuesBlockInputFormat::setQueryParameters(const NameToNameMap & parameters)
-{
-    if (parameters == context->getQueryParameters())
-        return;
-
-    auto context_copy = Context::createCopy(context);
-    context_copy->setQueryParameters(parameters);
-    context = std::move(context_copy);
-}
-
 ValuesSchemaReader::ValuesSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_)
     : IRowSchemaReader(buf, format_settings_), buf(in_)
 {
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.h b/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
index 228e8d0d572..0abafc896ff 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
@@ -38,7 +38,6 @@ public:
 
     /// TODO: remove context somehow.
     void setContext(const ContextPtr & context_) { context = Context::createCopy(context_); }
-    void setQueryParameters(const NameToNameMap & parameters);
 
     const BlockMissingValues & getMissingValues() const override { return block_missing_values; }
 
diff --git a/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp b/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp
index b19fcfd4a4a..52c161c3208 100644
--- a/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp
@@ -191,7 +191,6 @@ void XMLRowOutputFormat::finalizeImpl()
 
 
     writeRowsBeforeLimitAtLeast();
-    writeRowsBeforeAggregationAtLeast();
 
     if (!exception_message.empty())
         writeException();
@@ -220,16 +219,6 @@ void XMLRowOutputFormat::writeRowsBeforeLimitAtLeast()
     }
 }
 
-void XMLRowOutputFormat::writeRowsBeforeAggregationAtLeast()
-{
-    if (statistics.applied_aggregation)
-    {
-        writeCString("\t<rows_before_aggregation>", *ostr);
-        writeIntText(statistics.rows_before_aggregation, *ostr);
-        writeCString("</rows_before_aggregation>\n", *ostr);
-    }
-}
-
 void XMLRowOutputFormat::writeStatistics()
 {
     writeCString("\t<statistics>\n", *ostr);
diff --git a/src/Processors/Formats/Impl/XMLRowOutputFormat.h b/src/Processors/Formats/Impl/XMLRowOutputFormat.h
index 792acd118c8..daf03539d0b 100644
--- a/src/Processors/Formats/Impl/XMLRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/XMLRowOutputFormat.h
@@ -48,11 +48,6 @@ private:
         statistics.rows_before_limit = rows_before_limit_;
     }
 
-    void setRowsBeforeAggregation(size_t rows_before_aggregation_) override
-    {
-        statistics.applied_aggregation = true;
-        statistics.rows_before_aggregation = rows_before_aggregation_;
-    }
     void onRowsReadBeforeUpdate() override { row_count = getRowsReadBefore(); }
 
     void onProgress(const Progress & value) override;
@@ -61,7 +56,6 @@ private:
 
     void writeExtremesElement(const char * title, const Columns & columns, size_t row_num);
     void writeRowsBeforeLimitAtLeast();
-    void writeRowsBeforeAggregationAtLeast();
     void writeStatistics();
     void writeException();
 
diff --git a/src/Processors/Formats/LazyOutputFormat.cpp b/src/Processors/Formats/LazyOutputFormat.cpp
index dc099765870..4f6b10dd068 100644
--- a/src/Processors/Formats/LazyOutputFormat.cpp
+++ b/src/Processors/Formats/LazyOutputFormat.cpp
@@ -45,8 +45,4 @@ void LazyOutputFormat::setRowsBeforeLimit(size_t rows_before_limit)
     info.setRowsBeforeLimit(rows_before_limit);
 }
 
-void LazyOutputFormat::setRowsBeforeAggregation(size_t rows_before_aggregation)
-{
-    info.setRowsBeforeAggregation(rows_before_aggregation);
-}
 }
diff --git a/src/Processors/Formats/LazyOutputFormat.h b/src/Processors/Formats/LazyOutputFormat.h
index 5acb6cf3bf3..9cf609ed2d7 100644
--- a/src/Processors/Formats/LazyOutputFormat.h
+++ b/src/Processors/Formats/LazyOutputFormat.h
@@ -28,9 +28,8 @@ public:
     ProfileInfo & getProfileInfo() { return info; }
 
     void setRowsBeforeLimit(size_t rows_before_limit) override;
-    void setRowsBeforeAggregation(size_t rows_before_aggregation) override;
 
-    void onCancel() noexcept override
+    void onCancel() override
     {
         queue.clearAndFinish();
     }
diff --git a/src/Processors/Formats/PullingOutputFormat.cpp b/src/Processors/Formats/PullingOutputFormat.cpp
index 37050fb9675..b2378e62d34 100644
--- a/src/Processors/Formats/PullingOutputFormat.cpp
+++ b/src/Processors/Formats/PullingOutputFormat.cpp
@@ -42,8 +42,5 @@ void PullingOutputFormat::setRowsBeforeLimit(size_t rows_before_limit)
 {
     info.setRowsBeforeLimit(rows_before_limit);
 }
-void PullingOutputFormat::setRowsBeforeAggregation(size_t rows_before_aggregation)
-{
-    info.setRowsBeforeAggregation(rows_before_aggregation);
-}
+
 }
diff --git a/src/Processors/Formats/PullingOutputFormat.h b/src/Processors/Formats/PullingOutputFormat.h
index f2546cca180..a8efb8dd962 100644
--- a/src/Processors/Formats/PullingOutputFormat.h
+++ b/src/Processors/Formats/PullingOutputFormat.h
@@ -22,7 +22,6 @@ public:
     ProfileInfo & getProfileInfo() { return info; }
 
     void setRowsBeforeLimit(size_t rows_before_limit) override;
-    void setRowsBeforeAggregation(size_t rows_before_aggregation) override;
 
     bool expectMaterializedColumns() const override { return false; }
 
diff --git a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.cpp b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.cpp
index 5701b80ecc2..ae30d741c2f 100644
--- a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.cpp
+++ b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.cpp
@@ -1,20 +1,14 @@
-#include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypeLowCardinality.h>
+#include <Processors/Formats/RowInputFormatWithNamesAndTypes.h>
+#include <Processors/Formats/ISchemaReader.h>
 #include <DataTypes/DataTypeNothing.h>
 #include <DataTypes/DataTypeNullable.h>
-#include <Formats/EscapingRuleUtils.h>
-#include <IO/Operators.h>
-#include <IO/PeekableReadBuffer.h>
-#include <IO/ReadBufferFromString.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 #include <IO/ReadHelpers.h>
-#include <Processors/Formats/ISchemaReader.h>
-#include <Processors/Formats/Impl/BinaryRowInputFormat.h>
-#include <Processors/Formats/Impl/CSVRowInputFormat.h>
-#include <Processors/Formats/Impl/CustomSeparatedRowInputFormat.h>
-#include <Processors/Formats/Impl/HiveTextRowInputFormat.h>
-#include <Processors/Formats/Impl/JSONCompactRowInputFormat.h>
-#include <Processors/Formats/Impl/TabSeparatedRowInputFormat.h>
-#include <Processors/Formats/RowInputFormatWithNamesAndTypes.h>
+#include <IO/Operators.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/PeekableReadBuffer.h>
+#include <Formats/EscapingRuleUtils.h>
 
 
 namespace DB
@@ -50,8 +44,7 @@ namespace
     }
 }
 
-template <typename FormatReaderImpl>
-RowInputFormatWithNamesAndTypes<FormatReaderImpl>::RowInputFormatWithNamesAndTypes(
+RowInputFormatWithNamesAndTypes::RowInputFormatWithNamesAndTypes(
     const Block & header_,
     ReadBuffer & in_,
     const Params & params_,
@@ -59,7 +52,7 @@ RowInputFormatWithNamesAndTypes<FormatReaderImpl>::RowInputFormatWithNamesAndTyp
     bool with_names_,
     bool with_types_,
     const FormatSettings & format_settings_,
-    std::unique_ptr<FormatReaderImpl> format_reader_,
+    std::unique_ptr<FormatWithNamesAndTypesReader> format_reader_,
     bool try_detect_header_)
     : RowInputFormatWithDiagnosticInfo(header_, in_, params_)
     , format_settings(format_settings_)
@@ -73,8 +66,7 @@ RowInputFormatWithNamesAndTypes<FormatReaderImpl>::RowInputFormatWithNamesAndTyp
     column_indexes_by_names = getPort().getHeader().getNamesToIndexesMap();
 }
 
-template <typename FormatReaderImpl>
-void RowInputFormatWithNamesAndTypes<FormatReaderImpl>::readPrefix()
+void RowInputFormatWithNamesAndTypes::readPrefix()
 {
     /// Search and remove BOM only in textual formats (CSV, TSV etc), not in binary ones (RowBinary*).
     /// Also, we assume that column name or type cannot contain BOM, so, if format has header,
@@ -146,8 +138,7 @@ void RowInputFormatWithNamesAndTypes<FormatReaderImpl>::readPrefix()
     }
 }
 
-template <typename FormatReaderImpl>
-void RowInputFormatWithNamesAndTypes<FormatReaderImpl>::tryDetectHeader(std::vector<String> & column_names_out, std::vector<String> & type_names_out)
+void RowInputFormatWithNamesAndTypes::tryDetectHeader(std::vector<String> & column_names_out, std::vector<String> & type_names_out)
 {
     auto & read_buf = getReadBuffer();
     PeekableReadBuffer * peekable_buf = dynamic_cast<PeekableReadBuffer *>(&read_buf);
@@ -210,8 +201,7 @@ void RowInputFormatWithNamesAndTypes<FormatReaderImpl>::tryDetectHeader(std::vec
     peekable_buf->dropCheckpoint();
 }
 
-template <typename FormatReaderImpl>
-bool RowInputFormatWithNamesAndTypes<FormatReaderImpl>::readRow(MutableColumns & columns, RowReadExtension & ext)
+bool RowInputFormatWithNamesAndTypes::readRow(MutableColumns & columns, RowReadExtension & ext)
 {
     if (unlikely(end_of_stream))
         return false;
@@ -290,8 +280,7 @@ bool RowInputFormatWithNamesAndTypes<FormatReaderImpl>::readRow(MutableColumns &
     return true;
 }
 
-template <typename FormatReaderImpl>
-size_t RowInputFormatWithNamesAndTypes<FormatReaderImpl>::countRows(size_t max_block_size)
+size_t RowInputFormatWithNamesAndTypes::countRows(size_t max_block_size)
 {
     if (unlikely(end_of_stream))
         return 0;
@@ -315,8 +304,7 @@ size_t RowInputFormatWithNamesAndTypes<FormatReaderImpl>::countRows(size_t max_b
     return num_rows;
 }
 
-template <typename FormatReaderImpl>
-void RowInputFormatWithNamesAndTypes<FormatReaderImpl>::resetParser()
+void RowInputFormatWithNamesAndTypes::resetParser()
 {
     RowInputFormatWithDiagnosticInfo::resetParser();
     column_mapping->column_indexes_for_input_fields.clear();
@@ -325,8 +313,7 @@ void RowInputFormatWithNamesAndTypes<FormatReaderImpl>::resetParser()
     end_of_stream = false;
 }
 
-template <typename FormatReaderImpl>
-void RowInputFormatWithNamesAndTypes<FormatReaderImpl>::tryDeserializeField(const DataTypePtr & type, IColumn & column, size_t file_column)
+void RowInputFormatWithNamesAndTypes::tryDeserializeField(const DataTypePtr & type, IColumn & column, size_t file_column)
 {
     const auto & index = column_mapping->column_indexes_for_input_fields[file_column];
     if (index)
@@ -341,8 +328,7 @@ void RowInputFormatWithNamesAndTypes<FormatReaderImpl>::tryDeserializeField(cons
     }
 }
 
-template <typename FormatReaderImpl>
-bool RowInputFormatWithNamesAndTypes<FormatReaderImpl>::parseRowAndPrintDiagnosticInfo(MutableColumns & columns, WriteBuffer & out)
+bool RowInputFormatWithNamesAndTypes::parseRowAndPrintDiagnosticInfo(MutableColumns & columns, WriteBuffer & out)
 {
     if (in->eof())
     {
@@ -388,14 +374,12 @@ bool RowInputFormatWithNamesAndTypes<FormatReaderImpl>::parseRowAndPrintDiagnost
     return format_reader->parseRowEndWithDiagnosticInfo(out);
 }
 
-template <typename FormatReaderImpl>
-bool RowInputFormatWithNamesAndTypes<FormatReaderImpl>::isGarbageAfterField(size_t index, ReadBuffer::Position pos)
+bool RowInputFormatWithNamesAndTypes::isGarbageAfterField(size_t index, ReadBuffer::Position pos)
 {
     return format_reader->isGarbageAfterField(index, pos);
 }
 
-template <typename FormatReaderImpl>
-void RowInputFormatWithNamesAndTypes<FormatReaderImpl>::setReadBuffer(ReadBuffer & in_)
+void RowInputFormatWithNamesAndTypes::setReadBuffer(ReadBuffer & in_)
 {
     format_reader->setReadBuffer(in_);
     IInputFormat::setReadBuffer(in_);
@@ -598,12 +582,5 @@ void FormatWithNamesAndTypesSchemaReader::transformTypesIfNeeded(DB::DataTypePtr
     transformInferredTypesIfNeeded(type, new_type, format_settings);
 }
 
-template class RowInputFormatWithNamesAndTypes<JSONCompactFormatReader>;
-template class RowInputFormatWithNamesAndTypes<JSONCompactEachRowFormatReader>;
-template class RowInputFormatWithNamesAndTypes<TabSeparatedFormatReader>;
-template class RowInputFormatWithNamesAndTypes<CSVFormatReader>;
-template class RowInputFormatWithNamesAndTypes<CustomSeparatedFormatReader>;
-template class RowInputFormatWithNamesAndTypes<BinaryFormatReader<true>>;
-template class RowInputFormatWithNamesAndTypes<BinaryFormatReader<false>>;
 }
 
diff --git a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h
index cd836cb00dc..b7d9507151e 100644
--- a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h
+++ b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h
@@ -26,7 +26,6 @@ class FormatWithNamesAndTypesReader;
 ///    will be compared types from header.
 /// It's important that firstly this class reads/skips names and only
 /// then reads/skips types. So you can this invariant.
-template <typename FormatReaderImpl>
 class RowInputFormatWithNamesAndTypes : public RowInputFormatWithDiagnosticInfo
 {
 protected:
@@ -42,7 +41,7 @@ protected:
         bool with_names_,
         bool with_types_,
         const FormatSettings & format_settings_,
-        std::unique_ptr<FormatReaderImpl> format_reader_,
+        std::unique_ptr<FormatWithNamesAndTypesReader> format_reader_,
         bool try_detect_header_ = false);
 
     void resetParser() override;
@@ -71,7 +70,7 @@ private:
     bool is_header_detected = false;
 
 protected:
-    std::unique_ptr<FormatReaderImpl> format_reader;
+    std::unique_ptr<FormatWithNamesAndTypesReader> format_reader;
     Block::NameMap column_indexes_by_names;
 };
 
diff --git a/src/Processors/IProcessor.cpp b/src/Processors/IProcessor.cpp
index d9bd5074c09..f403aca2280 100644
--- a/src/Processors/IProcessor.cpp
+++ b/src/Processors/IProcessor.cpp
@@ -1,6 +1,5 @@
 #include <iostream>
 #include <Processors/IProcessor.h>
-#include <Processors/QueryPlan/IQueryPlanStep.h>
 
 #include <Common/logger_useful.h>
 #include <IO/WriteHelpers.h>
@@ -10,18 +9,7 @@
 namespace DB
 {
 
-void IProcessor::setQueryPlanStep(IQueryPlanStep * step, size_t group)
-{
-    query_plan_step = step;
-    query_plan_step_group = group;
-    if (step)
-    {
-        plan_step_name = step->getName();
-        plan_step_description = step->getStepDescription();
-    }
-}
-
-void IProcessor::cancel() noexcept
+void IProcessor::cancel()
 {
 
     bool already_cancelled = is_cancelled.exchange(true, std::memory_order_acq_rel);
@@ -67,12 +55,9 @@ void IProcessor::dump() const
 }
 
 
-std::string IProcessor::statusToName(std::optional<Status> status)
+std::string IProcessor::statusToName(Status status)
 {
-    if (status == std::nullopt)
-        return "NotStarted";
-
-    switch (*status)
+    switch (status)
     {
         case Status::NeedData:
             return "NeedData";
diff --git a/src/Processors/IProcessor.h b/src/Processors/IProcessor.h
index fd75eb530aa..02f7b6b3d12 100644
--- a/src/Processors/IProcessor.h
+++ b/src/Processors/IProcessor.h
@@ -21,8 +21,8 @@ class IQueryPlanStep;
 struct StorageLimits;
 using StorageLimitsList = std::list<StorageLimits>;
 
-class RowsBeforeStepCounter;
-using RowsBeforeStepCounterPtr = std::shared_ptr<RowsBeforeStepCounter>;
+class RowsBeforeLimitCounter;
+using RowsBeforeLimitCounterPtr = std::shared_ptr<RowsBeforeLimitCounter>;
 
 class IProcessor;
 using ProcessorPtr = std::shared_ptr<IProcessor>;
@@ -162,7 +162,7 @@ public:
         ExpandPipeline,
     };
 
-    static std::string statusToName(std::optional<Status> status);
+    static std::string statusToName(Status status);
 
     /** Method 'prepare' is responsible for all cheap ("instantaneous": O(1) of data volume, no wait) calculations.
       *
@@ -221,23 +221,6 @@ public:
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method 'schedule' is not implemented for {} processor", getName());
     }
 
-    /* The method is called right after asynchronous job is done
-     * i.e. when file descriptor returned by schedule() is readable.
-     * The sequence of method calls:
-     * ... prepare() -> schedule() -> onAsyncJobReady() -> work() ...
-     * See also comment to schedule() method
-     *
-     * It allows doing some preprocessing immediately after asynchronous job is done.
-     * The implementation should return control quickly, to avoid blocking another asynchronous completed jobs
-     * created by the same pipeline.
-     *
-     * Example, scheduling tasks for remote workers (file descriptor in this case is a socket)
-     * When the remote worker asks for the next task, doing it in onAsyncJobReady() we can provide it immediately.
-     * Otherwise, the returning of the next task for the remote worker can be delayed by current work done in the pipeline
-     * (by other processors), which will create unnecessary latency in query processing by remote workers
-     */
-    virtual void onAsyncJobReady() {}
-
     /** You must call this method if 'prepare' returned ExpandPipeline.
       * This method cannot access any port, but it can create new ports for current processor.
       *
@@ -255,7 +238,7 @@ public:
     /// In case if query was cancelled executor will wait till all processors finish their jobs.
     /// Generally, there is no reason to check this flag. However, it may be reasonable for long operations (e.g. i/o).
     bool isCancelled() const { return is_cancelled.load(std::memory_order_acquire); }
-    void cancel() noexcept;
+    void cancel();
 
     /// Additional method which is called in case if ports were updated while work() method.
     /// May be used to stop execution in rare cases.
@@ -311,12 +294,14 @@ public:
     constexpr static size_t NO_STREAM = std::numeric_limits<size_t>::max();
 
     /// Step of QueryPlan from which processor was created.
-    void setQueryPlanStep(IQueryPlanStep * step, size_t group = 0);
+    void setQueryPlanStep(IQueryPlanStep * step, size_t group = 0)
+    {
+        query_plan_step = step;
+        query_plan_step_group = group;
+    }
 
     IQueryPlanStep * getQueryPlanStep() const { return query_plan_step; }
     size_t getQueryPlanStepGroup() const { return query_plan_step_group; }
-    const String & getPlanStepName() const { return plan_step_name; }
-    const String & getPlanStepDescription() const { return plan_step_description; }
 
     uint64_t getElapsedNs() const { return elapsed_ns; }
     uint64_t getInputWaitElapsedNs() const { return input_wait_elapsed_ns; }
@@ -375,14 +360,10 @@ public:
 
     /// Set rows_before_limit counter for current processor.
     /// This counter is used to calculate the number of rows right before any filtration of LimitTransform.
-    virtual void setRowsBeforeLimitCounter(RowsBeforeStepCounterPtr /* counter */) { }
-
-    /// Set rows_before_aggregation counter for current processor.
-    /// This counter is used to calculate the number of rows right before AggregatingTransform.
-    virtual void setRowsBeforeAggregationCounter(RowsBeforeStepCounterPtr /* counter */) { }
+    virtual void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr /* counter */) {}
 
 protected:
-    virtual void onCancel() noexcept {}
+    virtual void onCancel() {}
 
     std::atomic<bool> is_cancelled{false};
 
@@ -408,8 +389,6 @@ private:
 
     IQueryPlanStep * query_plan_step = nullptr;
     size_t query_plan_step_group = 0;
-    String plan_step_name;
-    String plan_step_description;
 };
 
 
diff --git a/src/Processors/LimitTransform.h b/src/Processors/LimitTransform.h
index 45ae5b0ce81..33ff968985f 100644
--- a/src/Processors/LimitTransform.h
+++ b/src/Processors/LimitTransform.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <Core/SortDescription.h>
 #include <Processors/IProcessor.h>
-#include <Processors/RowsBeforeStepCounter.h>
+#include <Processors/RowsBeforeLimitCounter.h>
+#include <Core/SortDescription.h>
 
 namespace DB
 {
@@ -30,7 +30,7 @@ private:
     std::vector<size_t> sort_column_positions;
 
     UInt64 rows_read = 0; /// including the last read block
-    RowsBeforeStepCounterPtr rows_before_limit_at_least;
+    RowsBeforeLimitCounterPtr rows_before_limit_at_least;
 
     /// State of port's pair.
     /// Chunks from different port pairs are not mixed for better cache locality.
@@ -71,7 +71,7 @@ public:
     InputPort & getInputPort() { return inputs.front(); }
     OutputPort & getOutputPort() { return outputs.front(); }
 
-    void setRowsBeforeLimitCounter(RowsBeforeStepCounterPtr counter) override { rows_before_limit_at_least.swap(counter); }
+    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) override { rows_before_limit_at_least.swap(counter); }
     void setInputPortHasCounter(size_t pos) { ports_data[pos].input_port_has_counter = true; }
 };
 
diff --git a/src/Processors/Merges/AggregatingSortedTransform.h b/src/Processors/Merges/AggregatingSortedTransform.h
index c96ad3db525..c6d7e844c65 100644
--- a/src/Processors/Merges/AggregatingSortedTransform.h
+++ b/src/Processors/Merges/AggregatingSortedTransform.h
@@ -3,11 +3,6 @@
 #include <Processors/Merges/IMergingTransform.h>
 #include <Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h>
 
-namespace ProfileEvents
-{
-    extern const Event AggregatingSortedMilliseconds;
-}
-
 namespace DB
 {
 
@@ -34,11 +29,6 @@ public:
     }
 
     String getName() const override { return "AggregatingSortedTransform"; }
-
-    void onFinish() override
-    {
-        logMergedStats(ProfileEvents::AggregatingSortedMilliseconds, "Aggregated sorted", getLogger("AggregatingSortedTransform"));
-    }
 };
 
 }
diff --git a/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h
index 908994e1851..53c103e7038 100644
--- a/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h
@@ -30,8 +30,6 @@ public:
     void consume(Input & input, size_t source_num) override;
     Status merge() override;
 
-    MergedStats getMergedStats() const override { return merged_data.getMergedStats(); }
-
     /// Stores information for aggregation of SimpleAggregateFunction columns
     struct SimpleAggregateDescription
     {
diff --git a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
index 477566d8a94..86675bcb237 100644
--- a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
@@ -126,9 +126,6 @@ IMergingAlgorithm::Status FinishAggregatingInOrderAlgorithm::merge()
 
 Chunk FinishAggregatingInOrderAlgorithm::prepareToMerge()
 {
-    total_merged_rows += accumulated_rows;
-    total_merged_bytes += accumulated_bytes;
-
     accumulated_rows = 0;
     accumulated_bytes = 0;
 
diff --git a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h
index c34028b1cba..cc6578e79be 100644
--- a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h
@@ -50,8 +50,6 @@ public:
     void consume(Input & input, size_t source_num) override;
     Status merge() override;
 
-    MergedStats getMergedStats() const override { return {.bytes = accumulated_bytes, .rows = accumulated_rows, .blocks = chunk_num}; }
-
 private:
     Chunk prepareToMerge();
     void addToAggregation();
@@ -94,9 +92,6 @@ private:
     UInt64 chunk_num = 0;
     size_t accumulated_rows = 0;
     size_t accumulated_bytes = 0;
-
-    size_t total_merged_rows = 0;
-    size_t total_merged_bytes = 0;
 };
 
 }
diff --git a/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.h b/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.h
index cb2775c968d..aaa3859efb6 100644
--- a/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.h
@@ -33,8 +33,6 @@ public:
     const char * getName() const override { return "GraphiteRollupSortedAlgorithm"; }
     Status merge() override;
 
-    MergedStats getMergedStats() const override { return merged_data->getMergedStats(); }
-
     struct ColumnsDefinition
     {
         size_t path_column_num;
diff --git a/src/Processors/Merges/Algorithms/IMergingAlgorithm.h b/src/Processors/Merges/Algorithms/IMergingAlgorithm.h
index 83f11232b71..9a1c7c24270 100644
--- a/src/Processors/Merges/Algorithms/IMergingAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/IMergingAlgorithm.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Processors/Chunk.h>
-#include <Common/ProfileEvents.h>
+#include <variant>
 
 namespace DB
 {
@@ -65,15 +65,6 @@ public:
 
     IMergingAlgorithm() = default;
     virtual ~IMergingAlgorithm() = default;
-
-    struct MergedStats
-    {
-        UInt64 bytes = 0;
-        UInt64 rows = 0;
-        UInt64 blocks = 0;
-    };
-
-    virtual MergedStats getMergedStats() const = 0;
 };
 
 // TODO: use when compile with clang which could support it
diff --git a/src/Processors/Merges/Algorithms/IMergingAlgorithmWithSharedChunks.h b/src/Processors/Merges/Algorithms/IMergingAlgorithmWithSharedChunks.h
index 1725108ac5d..bc1aafe93f7 100644
--- a/src/Processors/Merges/Algorithms/IMergingAlgorithmWithSharedChunks.h
+++ b/src/Processors/Merges/Algorithms/IMergingAlgorithmWithSharedChunks.h
@@ -16,8 +16,6 @@ public:
     void initialize(Inputs inputs) override;
     void consume(Input & input, size_t source_num) override;
 
-    MergedStats getMergedStats() const override { return merged_data->getMergedStats(); }
-
 private:
     Block header;
     SortDescription description;
diff --git a/src/Processors/Merges/Algorithms/MergedData.h b/src/Processors/Merges/Algorithms/MergedData.h
index 8f47f89d8ee..c5bb074bb0c 100644
--- a/src/Processors/Merges/Algorithms/MergedData.h
+++ b/src/Processors/Merges/Algorithms/MergedData.h
@@ -183,8 +183,6 @@ public:
     UInt64 totalAllocatedBytes() const { return total_allocated_bytes; }
     UInt64 maxBlockSize() const { return max_block_size; }
 
-    IMergingAlgorithm::MergedStats getMergedStats() const { return {.bytes = total_allocated_bytes, .rows = total_merged_rows, .blocks = total_chunks}; }
-
     virtual ~MergedData() = default;
 
 protected:
diff --git a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.h
index c889668a38e..bcb111baadf 100644
--- a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.h
@@ -31,7 +31,7 @@ public:
     void consume(Input & input, size_t source_num) override;
     Status merge() override;
 
-    MergedStats getMergedStats() const override { return merged_data.getMergedStats(); }
+    const MergedData & getMergedData() const { return merged_data; }
 
 private:
     Block header;
diff --git a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
index 80c00f91d82..e2c6371c44f 100644
--- a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
@@ -127,14 +127,14 @@ static bool mergeMap(const SummingSortedAlgorithm::MapDescription & desc,
     Row right(left.size());
 
     for (size_t col_num : desc.key_col_nums)
-        right[col_num] = (*raw_columns[col_num])[row_number].template safeGet<Array>();
+        right[col_num] = (*raw_columns[col_num])[row_number].template get<Array>();
 
     for (size_t col_num : desc.val_col_nums)
-        right[col_num] = (*raw_columns[col_num])[row_number].template safeGet<Array>();
+        right[col_num] = (*raw_columns[col_num])[row_number].template get<Array>();
 
     auto at_ith_column_jth_row = [&](const Row & matrix, size_t i, size_t j) -> const Field &
     {
-        return matrix[i].safeGet<Array>()[j];
+        return matrix[i].get<Array>()[j];
     };
 
     auto tuple_of_nth_columns_at_jth_row = [&](const Row & matrix, const ColumnNumbers & col_nums, size_t j) -> Array
@@ -160,7 +160,7 @@ static bool mergeMap(const SummingSortedAlgorithm::MapDescription & desc,
 
     auto merge = [&](const Row & matrix)
     {
-        size_t rows = matrix[desc.key_col_nums[0]].safeGet<Array>().size();
+        size_t rows = matrix[desc.key_col_nums[0]].get<Array>().size();
 
         for (size_t j = 0; j < rows; ++j)
         {
@@ -190,10 +190,10 @@ static bool mergeMap(const SummingSortedAlgorithm::MapDescription & desc,
     for (const auto & key_value : merged)
     {
         for (size_t col_num_index = 0, size = desc.key_col_nums.size(); col_num_index < size; ++col_num_index)
-            row[desc.key_col_nums[col_num_index]].safeGet<Array>()[row_num] = key_value.first[col_num_index];
+            row[desc.key_col_nums[col_num_index]].get<Array>()[row_num] = key_value.first[col_num_index];
 
         for (size_t col_num_index = 0, size = desc.val_col_nums.size(); col_num_index < size; ++col_num_index)
-            row[desc.val_col_nums[col_num_index]].safeGet<Array>()[row_num] = key_value.second[col_num_index];
+            row[desc.val_col_nums[col_num_index]].get<Array>()[row_num] = key_value.second[col_num_index];
 
         ++row_num;
     }
diff --git a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.h
index 74b4e397831..664b171c4b9 100644
--- a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.h
@@ -30,8 +30,6 @@ public:
     void consume(Input & input, size_t source_num) override;
     Status merge() override;
 
-    MergedStats getMergedStats() const override { return merged_data.getMergedStats(); }
-
     struct AggregateDescription;
     struct MapDescription;
 
diff --git a/src/Processors/Merges/CollapsingSortedTransform.h b/src/Processors/Merges/CollapsingSortedTransform.h
index 99fb700abf1..4479ac82f66 100644
--- a/src/Processors/Merges/CollapsingSortedTransform.h
+++ b/src/Processors/Merges/CollapsingSortedTransform.h
@@ -3,11 +3,6 @@
 #include <Processors/Merges/IMergingTransform.h>
 #include <Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h>
 
-namespace ProfileEvents
-{
-    extern const Event CollapsingSortedMilliseconds;
-}
-
 namespace DB
 {
 
@@ -41,11 +36,6 @@ public:
     }
 
     String getName() const override { return "CollapsingSortedTransform"; }
-
-    void onFinish() override
-    {
-        logMergedStats(ProfileEvents::CollapsingSortedMilliseconds, "Collapsed sorted", getLogger("CollapsingSortedTransform"));
-    }
 };
 
 }
diff --git a/src/Processors/Merges/IMergingTransform.h b/src/Processors/Merges/IMergingTransform.h
index e5cd3bdde46..be629271736 100644
--- a/src/Processors/Merges/IMergingTransform.h
+++ b/src/Processors/Merges/IMergingTransform.h
@@ -2,10 +2,7 @@
 
 #include <Processors/Merges/Algorithms/IMergingAlgorithm.h>
 #include <Processors/IProcessor.h>
-#include <Common/ProfileEvents.h>
 #include <Common/Stopwatch.h>
-#include <Common/logger_useful.h>
-#include <Common/formatReadable.h>
 
 namespace DB
 {
@@ -113,8 +110,6 @@ public:
 
     void work() override
     {
-        Stopwatch watch{CLOCK_MONOTONIC_COARSE};
-
         if (!state.init_chunks.empty())
             algorithm.initialize(std::move(state.init_chunks));
 
@@ -152,8 +147,6 @@ public:
             // std::cerr << "Finished" << std::endl;
             state.is_finished = true;
         }
-
-        merging_elapsed_ns += watch.elapsedNanoseconds();
     }
 
 protected:
@@ -163,33 +156,7 @@ protected:
     Algorithm algorithm;
 
     /// Profile info.
-    UInt64 merging_elapsed_ns = 0;
-
-    void logMergedStats(ProfileEvents::Event elapsed_ms_event, std::string_view transform_message, LoggerPtr log) const
-    {
-        auto stats = algorithm.getMergedStats();
-
-        UInt64 elapsed_ms = merging_elapsed_ns / 1000000LL;
-        ProfileEvents::increment(elapsed_ms_event, elapsed_ms);
-
-        /// Don't print info for small parts (< 1M rows)
-        if (stats.rows < 1000000)
-            return;
-
-        double seconds = static_cast<double>(merging_elapsed_ns) / 1000000000ULL;
-
-        if (seconds == 0.0)
-        {
-            LOG_DEBUG(log, "{}, {} blocks, {} rows, {} bytes in 0 sec.",
-                transform_message, stats.blocks, stats.rows, stats.bytes);
-        }
-        else
-        {
-            LOG_DEBUG(log, "{}, {} blocks, {} rows, {} bytes in {} sec., {} rows/sec., {}/sec.",
-                transform_message, stats.blocks, stats.rows, stats.bytes,
-                seconds, stats.rows / seconds, ReadableSize(stats.bytes / seconds));
-        }
-    }
+    Stopwatch total_stopwatch {CLOCK_MONOTONIC_COARSE};
 
 private:
     using IMergingTransformBase::state;
diff --git a/src/Processors/Merges/MergingSortedTransform.cpp b/src/Processors/Merges/MergingSortedTransform.cpp
index d2895a2a2e9..338b1ff7935 100644
--- a/src/Processors/Merges/MergingSortedTransform.cpp
+++ b/src/Processors/Merges/MergingSortedTransform.cpp
@@ -1,12 +1,9 @@
 #include <Processors/Merges/MergingSortedTransform.h>
 #include <Processors/Transforms/ColumnGathererTransform.h>
 #include <IO/WriteBuffer.h>
-#include <Common/logger_useful.h>
 
-namespace ProfileEvents
-{
-    extern const Event MergingSortedMilliseconds;
-}
+#include <Common/logger_useful.h>
+#include <Common/formatReadable.h>
 
 namespace DB
 {
@@ -21,6 +18,7 @@ MergingSortedTransform::MergingSortedTransform(
     UInt64 limit_,
     bool always_read_till_end_,
     WriteBuffer * out_row_sources_buf_,
+    bool quiet_,
     bool use_average_block_sizes,
     bool have_all_inputs_)
     : IMergingTransform(
@@ -39,6 +37,7 @@ MergingSortedTransform::MergingSortedTransform(
         limit_,
         out_row_sources_buf_,
         use_average_block_sizes)
+    , quiet(quiet_)
 {
 }
 
@@ -49,7 +48,22 @@ void MergingSortedTransform::onNewInput()
 
 void MergingSortedTransform::onFinish()
 {
-    logMergedStats(ProfileEvents::MergingSortedMilliseconds, "Merged sorted", getLogger("MergingSortedTransform"));
+    if (quiet)
+        return;
+
+    const auto & merged_data = algorithm.getMergedData();
+
+    auto log = getLogger("MergingSortedTransform");
+
+    double seconds = total_stopwatch.elapsedSeconds();
+
+    if (seconds == 0.0)
+        LOG_DEBUG(log, "Merge sorted {} blocks, {} rows in 0 sec.", merged_data.totalChunks(), merged_data.totalMergedRows());
+    else
+        LOG_DEBUG(log, "Merge sorted {} blocks, {} rows in {} sec., {} rows/sec., {}/sec",
+            merged_data.totalChunks(), merged_data.totalMergedRows(), seconds,
+            merged_data.totalMergedRows() / seconds,
+            ReadableSize(merged_data.totalAllocatedBytes() / seconds));
 }
 
 }
diff --git a/src/Processors/Merges/MergingSortedTransform.h b/src/Processors/Merges/MergingSortedTransform.h
index 6e52450efa7..2b53939f309 100644
--- a/src/Processors/Merges/MergingSortedTransform.h
+++ b/src/Processors/Merges/MergingSortedTransform.h
@@ -21,6 +21,7 @@ public:
         UInt64 limit_ = 0,
         bool always_read_till_end_ = false,
         WriteBuffer * out_row_sources_buf_ = nullptr,
+        bool quiet_ = false,
         bool use_average_block_sizes = false,
         bool have_all_inputs_ = true);
 
@@ -29,6 +30,9 @@ public:
 protected:
     void onNewInput() override;
     void onFinish() override;
+
+private:
+    bool quiet = false;
 };
 
 }
diff --git a/src/Processors/Merges/ReplacingSortedTransform.h b/src/Processors/Merges/ReplacingSortedTransform.h
index dc262aab9ee..2657987f161 100644
--- a/src/Processors/Merges/ReplacingSortedTransform.h
+++ b/src/Processors/Merges/ReplacingSortedTransform.h
@@ -3,10 +3,6 @@
 #include <Processors/Merges/IMergingTransform.h>
 #include <Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h>
 
-namespace ProfileEvents
-{
-    extern const Event ReplacingSortedMilliseconds;
-}
 
 namespace DB
 {
@@ -42,11 +38,6 @@ public:
     }
 
     String getName() const override { return "ReplacingSorted"; }
-
-    void onFinish() override
-    {
-        logMergedStats(ProfileEvents::ReplacingSortedMilliseconds, "Replaced sorted", getLogger("ReplacingSortedTransform"));
-    }
 };
 
 }
diff --git a/src/Processors/Merges/SummingSortedTransform.h b/src/Processors/Merges/SummingSortedTransform.h
index d7c20223d7e..70ddebfea95 100644
--- a/src/Processors/Merges/SummingSortedTransform.h
+++ b/src/Processors/Merges/SummingSortedTransform.h
@@ -3,11 +3,6 @@
 #include <Processors/Merges/IMergingTransform.h>
 #include <Processors/Merges/Algorithms/SummingSortedAlgorithm.h>
 
-namespace ProfileEvents
-{
-    extern const Event SummingSortedMilliseconds;
-}
-
 namespace DB
 {
 
@@ -38,11 +33,6 @@ public:
     }
 
     String getName() const override { return "SummingSortedTransform"; }
-
-    void onFinish() override
-    {
-        logMergedStats(ProfileEvents::SummingSortedMilliseconds, "Summed sorted", getLogger("SummingSortedTransform"));
-    }
 };
 
 }
diff --git a/src/Processors/Merges/VersionedCollapsingTransform.h b/src/Processors/Merges/VersionedCollapsingTransform.h
index 32b5d7bf343..18244469bd7 100644
--- a/src/Processors/Merges/VersionedCollapsingTransform.h
+++ b/src/Processors/Merges/VersionedCollapsingTransform.h
@@ -3,10 +3,6 @@
 #include <Processors/Merges/IMergingTransform.h>
 #include <Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.h>
 
-namespace ProfileEvents
-{
-    extern const Event VersionedCollapsingSortedMilliseconds;
-}
 
 namespace DB
 {
@@ -37,11 +33,6 @@ public:
     }
 
     String getName() const override { return "VersionedCollapsingTransform"; }
-
-    void onFinish() override
-    {
-        logMergedStats(ProfileEvents::VersionedCollapsingSortedMilliseconds, "Versioned collapsed sorted", getLogger("VersionedCollapsingTransform"));
-    }
 };
 
 }
diff --git a/src/Processors/OffsetTransform.h b/src/Processors/OffsetTransform.h
index 04486a6c940..79a7d15fe0b 100644
--- a/src/Processors/OffsetTransform.h
+++ b/src/Processors/OffsetTransform.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <Core/SortDescription.h>
 #include <Processors/IProcessor.h>
-#include <Processors/RowsBeforeStepCounter.h>
+#include <Processors/RowsBeforeLimitCounter.h>
+#include <Core/SortDescription.h>
 
 namespace DB
 {
@@ -16,7 +16,7 @@ private:
     UInt64 offset;
     UInt64 rows_read = 0; /// including the last read block
 
-    RowsBeforeStepCounterPtr rows_before_limit_at_least;
+    RowsBeforeLimitCounterPtr rows_before_limit_at_least;
 
     /// State of port's pair.
     /// Chunks from different port pairs are not mixed for better cache locality.
@@ -45,7 +45,7 @@ public:
     InputPort & getInputPort() { return inputs.front(); }
     OutputPort & getOutputPort() { return outputs.front(); }
 
-    void setRowsBeforeLimitCounter(RowsBeforeStepCounterPtr counter) override { rows_before_limit_at_least.swap(counter); }
+    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) override { rows_before_limit_at_least.swap(counter); }
 };
 
 }
diff --git a/src/Processors/QueryPlan/AggregatingStep.cpp b/src/Processors/QueryPlan/AggregatingStep.cpp
index a4d707704b1..a9d9902b051 100644
--- a/src/Processors/QueryPlan/AggregatingStep.cpp
+++ b/src/Processors/QueryPlan/AggregatingStep.cpp
@@ -134,6 +134,7 @@ AggregatingStep::AggregatingStep(
     {
         output_stream->sort_description = group_by_sort_description;
         output_stream->sort_scope = DataStream::SortScope::Global;
+        output_stream->has_single_port = true;
     }
 }
 
@@ -146,12 +147,13 @@ void AggregatingStep::applyOrder(SortDescription sort_description_for_merging_,
     {
         output_stream->sort_description = group_by_sort_description;
         output_stream->sort_scope = DataStream::SortScope::Global;
+        output_stream->has_single_port = true;
     }
 
     explicit_sorting_required_for_aggregation_in_order = false;
 }
 
-ActionsDAG AggregatingStep::makeCreatingMissingKeysForGroupingSetDAG(
+ActionsDAGPtr AggregatingStep::makeCreatingMissingKeysForGroupingSetDAG(
     const Block & in_header,
     const Block & out_header,
     const GroupingSetsParamsList & grouping_sets_params,
@@ -159,15 +161,15 @@ ActionsDAG AggregatingStep::makeCreatingMissingKeysForGroupingSetDAG(
     bool group_by_use_nulls)
 {
     /// Here we create a DAG which fills missing keys and adds `__grouping_set` column
-    ActionsDAG dag(in_header.getColumnsWithTypeAndName());
+    auto dag = std::make_shared<ActionsDAG>(in_header.getColumnsWithTypeAndName());
     ActionsDAG::NodeRawConstPtrs outputs;
     outputs.reserve(out_header.columns() + 1);
 
     auto grouping_col = ColumnConst::create(ColumnUInt64::create(1, group), 0);
-    const auto * grouping_node = &dag.addColumn(
+    const auto * grouping_node = &dag->addColumn(
         {ColumnPtr(std::move(grouping_col)), std::make_shared<DataTypeUInt64>(), "__grouping_set"});
 
-    grouping_node = &dag.materializeNode(*grouping_node);
+    grouping_node = &dag->materializeNode(*grouping_node);
     outputs.push_back(grouping_node);
 
     const auto & missing_columns = grouping_sets_params[group].missing_keys;
@@ -188,21 +190,21 @@ ActionsDAG AggregatingStep::makeCreatingMissingKeysForGroupingSetDAG(
             column_with_default->finalize();
 
             auto column = ColumnConst::create(std::move(column_with_default), 0);
-            const auto * node = &dag.addColumn({ColumnPtr(std::move(column)), col.type, col.name});
-            node = &dag.materializeNode(*node);
+            const auto * node = &dag->addColumn({ColumnPtr(std::move(column)), col.type, col.name});
+            node = &dag->materializeNode(*node);
             outputs.push_back(node);
         }
         else
         {
-            const auto * column_node = dag.getOutputs()[in_header.getPositionByName(col.name)];
+            const auto * column_node = dag->getOutputs()[in_header.getPositionByName(col.name)];
             if (used_it != used_keys.end() && group_by_use_nulls && column_node->result_type->canBeInsideNullable())
-                outputs.push_back(&dag.addFunction(to_nullable_function, { column_node }, col.name));
+                outputs.push_back(&dag->addFunction(to_nullable_function, { column_node }, col.name));
             else
                 outputs.push_back(column_node);
         }
     }
 
-    dag.getOutputs().swap(outputs);
+    dag->getOutputs().swap(outputs);
     return dag;
 }
 
diff --git a/src/Processors/QueryPlan/AggregatingStep.h b/src/Processors/QueryPlan/AggregatingStep.h
index 4e4078047f1..60b25a1c06e 100644
--- a/src/Processors/QueryPlan/AggregatingStep.h
+++ b/src/Processors/QueryPlan/AggregatingStep.h
@@ -65,7 +65,7 @@ public:
     /// Argument input_stream would be the second input (from projection).
     std::unique_ptr<AggregatingProjectionStep> convertToAggregatingProjection(const DataStream & input_stream) const;
 
-    static ActionsDAG makeCreatingMissingKeysForGroupingSetDAG(
+    static ActionsDAGPtr makeCreatingMissingKeysForGroupingSetDAG(
         const Block & in_header,
         const Block & out_header,
         const GroupingSetsParamsList & grouping_sets_params,
diff --git a/src/Processors/QueryPlan/BuildQueryPipelineSettings.h b/src/Processors/QueryPlan/BuildQueryPipelineSettings.h
index d99f9a7d1f1..3b5e4e06953 100644
--- a/src/Processors/QueryPlan/BuildQueryPipelineSettings.h
+++ b/src/Processors/QueryPlan/BuildQueryPipelineSettings.h
@@ -12,15 +12,12 @@ namespace DB
 struct Settings;
 class QueryStatus;
 using QueryStatusPtr = std::shared_ptr<QueryStatus>;
-struct ITemporaryFileLookup;
-using TemporaryFileLookupPtr = std::shared_ptr<ITemporaryFileLookup>;
 
 struct BuildQueryPipelineSettings
 {
     ExpressionActionsSettings actions_settings;
     QueryStatusPtr process_list_element;
     ProgressCallback progress_callback = nullptr;
-    TemporaryFileLookupPtr temporary_file_lookup;
 
     const ExpressionActionsSettings & getActionsSettings() const { return actions_settings; }
     static BuildQueryPipelineSettings fromContext(ContextPtr from);
diff --git a/src/Processors/QueryPlan/ConvertingActions.cpp b/src/Processors/QueryPlan/ConvertingActions.cpp
deleted file mode 100644
index b9703ef59cd..00000000000
--- a/src/Processors/QueryPlan/ConvertingActions.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <Processors/QueryPlan/QueryPlan.h>
-#include <Interpreters/ActionsDAG.h>
-#include <Processors/QueryPlan/ExpressionStep.h>
-
-namespace DB
-{
-
-void addConvertingActions(QueryPlan & plan, const Block & header, bool has_missing_objects)
-{
-    if (blocksHaveEqualStructure(plan.getCurrentDataStream().header, header))
-        return;
-
-    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.
-        /// It is needed for functions like `now64()` or `randConstant()` because their values may be different.
-        return ActionsDAG::makeConvertingActions(
-            block_.getColumnsWithTypeAndName(),
-            header_.getColumnsWithTypeAndName(),
-            mode,
-            true);
-    };
-
-    auto convert_actions_dag = get_converting_dag(plan.getCurrentDataStream().header, header);
-    auto converting = std::make_unique<ExpressionStep>(plan.getCurrentDataStream(), std::move(convert_actions_dag));
-    plan.addStep(std::move(converting));
-}
-
-}
diff --git a/src/Processors/QueryPlan/ConvertingActions.h b/src/Processors/QueryPlan/ConvertingActions.h
deleted file mode 100644
index 6bdf9b8af9a..00000000000
--- a/src/Processors/QueryPlan/ConvertingActions.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-namespace DB
-{
-class QueryPlan;
-class Block;
-
-void addConvertingActions(QueryPlan & plan, const Block & header, bool has_missing_objects);
-}
diff --git a/src/Processors/QueryPlan/CubeStep.cpp b/src/Processors/QueryPlan/CubeStep.cpp
index 3a98f8e4612..d010a3327a6 100644
--- a/src/Processors/QueryPlan/CubeStep.cpp
+++ b/src/Processors/QueryPlan/CubeStep.cpp
@@ -36,30 +36,30 @@ CubeStep::CubeStep(const DataStream & input_stream_, Aggregator::Params params_,
 
 ProcessorPtr addGroupingSetForTotals(const Block & header, const Names & keys, bool use_nulls, const BuildQueryPipelineSettings & settings, UInt64 grouping_set_number)
 {
-    ActionsDAG dag(header.getColumnsWithTypeAndName());
-    auto & outputs = dag.getOutputs();
+    auto dag = std::make_shared<ActionsDAG>(header.getColumnsWithTypeAndName());
+    auto & outputs = dag->getOutputs();
 
     if (use_nulls)
     {
         auto to_nullable = FunctionFactory::instance().get("toNullable", nullptr);
         for (const auto & key : keys)
         {
-            const auto * node = dag.getOutputs()[header.getPositionByName(key)];
+            const auto * node = dag->getOutputs()[header.getPositionByName(key)];
             if (node->result_type->canBeInsideNullable())
             {
-                dag.addOrReplaceInOutputs(dag.addFunction(to_nullable, { node }, node->result_name));
+                dag->addOrReplaceInOutputs(dag->addFunction(to_nullable, { node }, node->result_name));
             }
         }
     }
 
     auto grouping_col = ColumnUInt64::create(1, grouping_set_number);
-    const auto * grouping_node = &dag.addColumn(
+    const auto * grouping_node = &dag->addColumn(
         {ColumnPtr(std::move(grouping_col)), std::make_shared<DataTypeUInt64>(), "__grouping_set"});
 
-    grouping_node = &dag.materializeNode(*grouping_node);
+    grouping_node = &dag->materializeNode(*grouping_node);
     outputs.insert(outputs.begin(), grouping_node);
 
-    auto expression = std::make_shared<ExpressionActions>(std::move(dag), settings.getActionsSettings());
+    auto expression = std::make_shared<ExpressionActions>(dag, settings.getActionsSettings());
     return std::make_shared<ExpressionTransform>(header, expression);
 }
 
diff --git a/src/Processors/QueryPlan/DistinctStep.cpp b/src/Processors/QueryPlan/DistinctStep.cpp
index b1c24fc01ce..a481454139d 100644
--- a/src/Processors/QueryPlan/DistinctStep.cpp
+++ b/src/Processors/QueryPlan/DistinctStep.cpp
@@ -10,11 +10,6 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
 static ITransformingStep::Traits getTraits(bool pre_distinct)
 {
     const bool preserves_number_of_streams = pre_distinct;
@@ -95,8 +90,7 @@ void DistinctStep::transformPipeline(QueryPipelineBuilder & pipeline, const Buil
             /// final distinct for sorted stream (sorting inside and among chunks)
             if (input_stream.sort_scope == DataStream::SortScope::Global)
             {
-                if (pipeline.getNumStreams() != 1)
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "DistinctStep with in-order expects single input");
+                assert(input_stream.has_single_port);
 
                 if (distinct_sort_desc.size() < columns.size())
                 {
diff --git a/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp b/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp
index eb699858bdf..14f58585d3d 100644
--- a/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp
+++ b/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp
@@ -2,13 +2,43 @@
 
 #include <Common/checkStackSize.h>
 #include <Core/Settings.h>
+#include <Interpreters/ActionsDAG.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
-#include <Processors/QueryPlan/ConvertingActions.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
 
 namespace DB
 {
 
+namespace
+{
+
+void addConvertingActions(QueryPlan & plan, const Block & header, bool has_missing_objects)
+{
+    if (blocksHaveEqualStructure(plan.getCurrentDataStream().header, header))
+        return;
+
+    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.
+        /// It is needed for functions like `now64()` or `randConstant()` because their values may be different.
+        return ActionsDAG::makeConvertingActions(
+            block_.getColumnsWithTypeAndName(),
+            header_.getColumnsWithTypeAndName(),
+            mode,
+            true);
+    };
+
+    auto convert_actions_dag = get_converting_dag(plan.getCurrentDataStream().header, header);
+    auto converting = std::make_unique<ExpressionStep>(plan.getCurrentDataStream(), convert_actions_dag);
+    plan.addStep(std::move(converting));
+}
+
+}
+
 std::unique_ptr<QueryPlan> createLocalPlan(
     const ASTPtr & query_ast,
     const Block & header,
diff --git a/src/Processors/QueryPlan/ExpressionStep.cpp b/src/Processors/QueryPlan/ExpressionStep.cpp
index 6f88c4527a4..0ccb0c4492a 100644
--- a/src/Processors/QueryPlan/ExpressionStep.cpp
+++ b/src/Processors/QueryPlan/ExpressionStep.cpp
@@ -10,33 +10,33 @@
 namespace DB
 {
 
-static ITransformingStep::Traits getTraits(const ActionsDAG & actions, const Block & header, const SortDescription & sort_description)
+static ITransformingStep::Traits getTraits(const ActionsDAGPtr & actions, const Block & header, const SortDescription & sort_description)
 {
     return ITransformingStep::Traits
     {
         {
             .returns_single_stream = false,
             .preserves_number_of_streams = true,
-            .preserves_sorting = actions.isSortingPreserved(header, sort_description),
+            .preserves_sorting = actions->isSortingPreserved(header, sort_description),
         },
         {
-            .preserves_number_of_rows = !actions.hasArrayJoin(),
+            .preserves_number_of_rows = !actions->hasArrayJoin(),
         }
     };
 }
 
-ExpressionStep::ExpressionStep(const DataStream & input_stream_, ActionsDAG actions_dag_)
+ExpressionStep::ExpressionStep(const DataStream & input_stream_, const ActionsDAGPtr & actions_dag_)
     : ITransformingStep(
         input_stream_,
-        ExpressionTransform::transformHeader(input_stream_.header, actions_dag_),
+        ExpressionTransform::transformHeader(input_stream_.header, *actions_dag_),
         getTraits(actions_dag_, input_stream_.header, input_stream_.sort_description))
-    , actions_dag(std::move(actions_dag_))
+    , actions_dag(actions_dag_)
 {
 }
 
 void ExpressionStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings)
 {
-    auto expression = std::make_shared<ExpressionActions>(std::move(actions_dag), settings.getActionsSettings());
+    auto expression = std::make_shared<ExpressionActions>(actions_dag, settings.getActionsSettings());
 
     pipeline.addSimpleTransform([&](const Block & header)
     {
@@ -49,7 +49,7 @@ void ExpressionStep::transformPipeline(QueryPipelineBuilder & pipeline, const Bu
                 pipeline.getHeader().getColumnsWithTypeAndName(),
                 output_stream->header.getColumnsWithTypeAndName(),
                 ActionsDAG::MatchColumnsMode::Name);
-        auto convert_actions = std::make_shared<ExpressionActions>(std::move(convert_actions_dag), settings.getActionsSettings());
+        auto convert_actions = std::make_shared<ExpressionActions>(convert_actions_dag, settings.getActionsSettings());
 
         pipeline.addSimpleTransform([&](const Block & header)
         {
@@ -61,20 +61,20 @@ void ExpressionStep::transformPipeline(QueryPipelineBuilder & pipeline, const Bu
 void ExpressionStep::describeActions(FormatSettings & settings) const
 {
     String prefix(settings.offset, settings.indent_char);
-    auto expression = std::make_shared<ExpressionActions>(actions_dag.clone());
+    auto expression = std::make_shared<ExpressionActions>(actions_dag);
     expression->describeActions(settings.out, prefix);
 }
 
 void ExpressionStep::describeActions(JSONBuilder::JSONMap & map) const
 {
-    auto expression = std::make_shared<ExpressionActions>(actions_dag.clone());
+    auto expression = std::make_shared<ExpressionActions>(actions_dag);
     map.add("Expression", expression->toTree());
 }
 
 void ExpressionStep::updateOutputStream()
 {
     output_stream = createOutputStream(
-        input_streams.front(), ExpressionTransform::transformHeader(input_streams.front().header, actions_dag), getDataStreamTraits());
+        input_streams.front(), ExpressionTransform::transformHeader(input_streams.front().header, *actions_dag), getDataStreamTraits());
 
     if (!getDataStreamTraits().preserves_sorting)
         return;
diff --git a/src/Processors/QueryPlan/ExpressionStep.h b/src/Processors/QueryPlan/ExpressionStep.h
index f2926318cbc..3eef14ac129 100644
--- a/src/Processors/QueryPlan/ExpressionStep.h
+++ b/src/Processors/QueryPlan/ExpressionStep.h
@@ -1,10 +1,12 @@
 #pragma once
 #include <Processors/QueryPlan/ITransformingStep.h>
-#include <Interpreters/ActionsDAG.h>
 
 namespace DB
 {
 
+class ActionsDAG;
+using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
+
 class ExpressionTransform;
 class JoiningTransform;
 
@@ -13,22 +15,21 @@ class ExpressionStep : public ITransformingStep
 {
 public:
 
-    explicit ExpressionStep(const DataStream & input_stream_, ActionsDAG actions_dag_);
+    explicit ExpressionStep(const DataStream & input_stream_, const ActionsDAGPtr & actions_dag_);
     String getName() const override { return "Expression"; }
 
     void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings) override;
 
     void describeActions(FormatSettings & settings) const override;
 
-    ActionsDAG & getExpression() { return actions_dag; }
-    const ActionsDAG & getExpression() const { return actions_dag; }
+    const ActionsDAGPtr & getExpression() const { return actions_dag; }
 
     void describeActions(JSONBuilder::JSONMap & map) const override;
 
 private:
     void updateOutputStream() override;
 
-    ActionsDAG actions_dag;
+    ActionsDAGPtr actions_dag;
 };
 
 }
diff --git a/src/Processors/QueryPlan/FillingStep.cpp b/src/Processors/QueryPlan/FillingStep.cpp
index 8687886447a..65c9cf11661 100644
--- a/src/Processors/QueryPlan/FillingStep.cpp
+++ b/src/Processors/QueryPlan/FillingStep.cpp
@@ -2,7 +2,6 @@
 #include <Processors/Transforms/FillingTransform.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <IO/Operators.h>
-#include <Interpreters/ExpressionActions.h>
 #include <Common/JSONBuilder.h>
 
 namespace DB
@@ -40,13 +39,12 @@ FillingStep::FillingStep(
     , interpolate_description(interpolate_description_)
     , use_with_fill_by_sorting_prefix(use_with_fill_by_sorting_prefix_)
 {
+    if (!input_stream_.has_single_port)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "FillingStep expects single input");
 }
 
 void FillingStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
-    if (pipeline.getNumStreams() != 1)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "FillingStep expects single input");
-
     pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
     {
         if (stream_type == QueryPipelineBuilder::StreamType::Totals)
@@ -59,29 +57,21 @@ void FillingStep::transformPipeline(QueryPipelineBuilder & pipeline, const Build
 
 void FillingStep::describeActions(FormatSettings & settings) const
 {
-    String prefix(settings.offset, settings.indent_char);
-    settings.out << prefix;
+    settings.out << String(settings.offset, ' ');
     dumpSortDescription(sort_description, settings.out);
     settings.out << '\n';
-    if (interpolate_description)
-    {
-        auto expression = std::make_shared<ExpressionActions>(interpolate_description->actions.clone());
-        expression->describeActions(settings.out, prefix);
-    }
 }
 
 void FillingStep::describeActions(JSONBuilder::JSONMap & map) const
 {
     map.add("Sort Description", explainSortDescription(sort_description));
-    if (interpolate_description)
-    {
-        auto expression = std::make_shared<ExpressionActions>(interpolate_description->actions.clone());
-        map.add("Expression", expression->toTree());
-    }
 }
 
 void FillingStep::updateOutputStream()
 {
+    if (!input_streams.front().has_single_port)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "FillingStep expects single input");
+
     output_stream = createOutputStream(
         input_streams.front(), FillingTransform::transformHeader(input_streams.front().header, sort_description), getDataStreamTraits());
 }
diff --git a/src/Processors/QueryPlan/FilterStep.cpp b/src/Processors/QueryPlan/FilterStep.cpp
index 0c6b71387b7..72934665b5c 100644
--- a/src/Processors/QueryPlan/FilterStep.cpp
+++ b/src/Processors/QueryPlan/FilterStep.cpp
@@ -9,9 +9,9 @@
 namespace DB
 {
 
-static ITransformingStep::Traits getTraits(const ActionsDAG & expression, const Block & header, const SortDescription & sort_description, bool remove_filter_column, const String & filter_column_name)
+static ITransformingStep::Traits getTraits(const ActionsDAGPtr & expression, const Block & header, const SortDescription & sort_description, bool remove_filter_column, const String & filter_column_name)
 {
-    bool preserves_sorting = expression.isSortingPreserved(header, sort_description, remove_filter_column ? filter_column_name : "");
+    bool preserves_sorting = expression->isSortingPreserved(header, sort_description, remove_filter_column ? filter_column_name : "");
     if (remove_filter_column)
     {
         preserves_sorting &= std::find_if(
@@ -35,27 +35,28 @@ static ITransformingStep::Traits getTraits(const ActionsDAG & expression, const
 
 FilterStep::FilterStep(
     const DataStream & input_stream_,
-    ActionsDAG actions_dag_,
+    const ActionsDAGPtr & actions_dag_,
     String filter_column_name_,
     bool remove_filter_column_)
     : ITransformingStep(
         input_stream_,
         FilterTransform::transformHeader(
             input_stream_.header,
-            &actions_dag_,
+            actions_dag_.get(),
             filter_column_name_,
             remove_filter_column_),
         getTraits(actions_dag_, input_stream_.header, input_stream_.sort_description, remove_filter_column_, filter_column_name_))
-    , actions_dag(std::move(actions_dag_))
+    , actions_dag(actions_dag_)
     , filter_column_name(std::move(filter_column_name_))
     , remove_filter_column(remove_filter_column_)
 {
-    actions_dag.removeAliasesForFilter(filter_column_name);
+    actions_dag = actions_dag->clone();
+    actions_dag->removeAliasesForFilter(filter_column_name);
 }
 
 void FilterStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings)
 {
-    auto expression = std::make_shared<ExpressionActions>(std::move(actions_dag), settings.getActionsSettings());
+    auto expression = std::make_shared<ExpressionActions>(actions_dag, settings.getActionsSettings());
 
     pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type)
     {
@@ -69,7 +70,7 @@ void FilterStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQ
                 pipeline.getHeader().getColumnsWithTypeAndName(),
                 output_stream->header.getColumnsWithTypeAndName(),
                 ActionsDAG::MatchColumnsMode::Name);
-        auto convert_actions = std::make_shared<ExpressionActions>(std::move(convert_actions_dag), settings.getActionsSettings());
+        auto convert_actions = std::make_shared<ExpressionActions>(convert_actions_dag, settings.getActionsSettings());
 
         pipeline.addSimpleTransform([&](const Block & header)
         {
@@ -87,7 +88,7 @@ void FilterStep::describeActions(FormatSettings & settings) const
         settings.out << " (removed)";
     settings.out << '\n';
 
-    auto expression = std::make_shared<ExpressionActions>(actions_dag.clone());
+    auto expression = std::make_shared<ExpressionActions>(actions_dag);
     expression->describeActions(settings.out, prefix);
 }
 
@@ -96,7 +97,7 @@ void FilterStep::describeActions(JSONBuilder::JSONMap & map) const
     map.add("Filter Column", filter_column_name);
     map.add("Removes Filter", remove_filter_column);
 
-    auto expression = std::make_shared<ExpressionActions>(actions_dag.clone());
+    auto expression = std::make_shared<ExpressionActions>(actions_dag);
     map.add("Expression", expression->toTree());
 }
 
@@ -104,7 +105,7 @@ void FilterStep::updateOutputStream()
 {
     output_stream = createOutputStream(
         input_streams.front(),
-        FilterTransform::transformHeader(input_streams.front().header, &actions_dag, filter_column_name, remove_filter_column),
+        FilterTransform::transformHeader(input_streams.front().header, actions_dag.get(), filter_column_name, remove_filter_column),
         getDataStreamTraits());
 
     if (!getDataStreamTraits().preserves_sorting)
diff --git a/src/Processors/QueryPlan/FilterStep.h b/src/Processors/QueryPlan/FilterStep.h
index b5a31bef5fc..939d0900c86 100644
--- a/src/Processors/QueryPlan/FilterStep.h
+++ b/src/Processors/QueryPlan/FilterStep.h
@@ -1,17 +1,19 @@
 #pragma once
 #include <Processors/QueryPlan/ITransformingStep.h>
-#include <Interpreters/ActionsDAG.h>
 
 namespace DB
 {
 
+class ActionsDAG;
+using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
+
 /// Implements WHERE, HAVING operations. See FilterTransform.
 class FilterStep : public ITransformingStep
 {
 public:
     FilterStep(
         const DataStream & input_stream_,
-        ActionsDAG actions_dag_,
+        const ActionsDAGPtr & actions_dag_,
         String filter_column_name_,
         bool remove_filter_column_);
 
@@ -21,15 +23,15 @@ public:
     void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
 
-    const ActionsDAG & getExpression() const { return actions_dag; }
-    ActionsDAG & getExpression() { return actions_dag; }
+    const ActionsDAGPtr & getExpression() const { return actions_dag; }
+    ActionsDAGPtr & getExpression() { return actions_dag; }
     const String & getFilterColumnName() const { return filter_column_name; }
     bool removesFilterColumn() const { return remove_filter_column; }
 
 private:
     void updateOutputStream() override;
 
-    ActionsDAG actions_dag;
+    ActionsDAGPtr actions_dag;
     String filter_column_name;
     bool remove_filter_column;
 };
diff --git a/src/Processors/QueryPlan/IQueryPlanStep.h b/src/Processors/QueryPlan/IQueryPlanStep.h
index 44eb7ea0c59..daca88fcceb 100644
--- a/src/Processors/QueryPlan/IQueryPlanStep.h
+++ b/src/Processors/QueryPlan/IQueryPlanStep.h
@@ -28,6 +28,9 @@ class DataStream
 public:
     Block header;
 
+    /// QueryPipeline has single port. Totals or extremes ports are not counted.
+    bool has_single_port = false;
+
     /// Sorting scope. Please keep the mutual order (more strong mode should have greater value).
     enum class SortScope : uint8_t
     {
@@ -48,7 +51,8 @@ public:
 
     bool hasEqualPropertiesWith(const DataStream & other) const
     {
-        return sort_description == other.sort_description
+        return has_single_port == other.has_single_port
+            && sort_description == other.sort_description
             && (sort_description.empty() || sort_scope == other.sort_scope);
     }
 
diff --git a/src/Processors/QueryPlan/ITransformingStep.cpp b/src/Processors/QueryPlan/ITransformingStep.cpp
index 3fa9d1b8308..9ecfdb0af22 100644
--- a/src/Processors/QueryPlan/ITransformingStep.cpp
+++ b/src/Processors/QueryPlan/ITransformingStep.cpp
@@ -20,6 +20,9 @@ DataStream ITransformingStep::createOutputStream(
 {
     DataStream output_stream{.header = std::move(output_header)};
 
+    output_stream.has_single_port = stream_traits.returns_single_stream
+                                     || (input_stream.has_single_port && stream_traits.preserves_number_of_streams);
+
     if (stream_traits.preserves_sorting)
     {
         output_stream.sort_description = input_stream.sort_description;
diff --git a/src/Processors/QueryPlan/Optimizations/convertOuterJoinToInnerJoin.cpp b/src/Processors/QueryPlan/Optimizations/convertOuterJoinToInnerJoin.cpp
index 0c708599398..d9296f10a98 100644
--- a/src/Processors/QueryPlan/Optimizations/convertOuterJoinToInnerJoin.cpp
+++ b/src/Processors/QueryPlan/Optimizations/convertOuterJoinToInnerJoin.cpp
@@ -48,10 +48,10 @@ size_t tryConvertOuterJoinToInnerJoin(QueryPlan::Node * parent_node, QueryPlan::
     bool right_stream_safe = true;
 
     if (check_left_stream)
-        left_stream_safe = filter_dag.isFilterAlwaysFalseForDefaultValueInputs(filter_column_name, left_stream_input_header);
+        left_stream_safe = filter_dag->isFilterAlwaysFalseForDefaultValueInputs(filter_column_name, left_stream_input_header);
 
     if (check_right_stream)
-        right_stream_safe = filter_dag.isFilterAlwaysFalseForDefaultValueInputs(filter_column_name, right_stream_input_header);
+        right_stream_safe = filter_dag->isFilterAlwaysFalseForDefaultValueInputs(filter_column_name, right_stream_input_header);
 
     if (!left_stream_safe || !right_stream_safe)
         return 0;
diff --git a/src/Processors/QueryPlan/Optimizations/distinctReadInOrder.cpp b/src/Processors/QueryPlan/Optimizations/distinctReadInOrder.cpp
index 37e61a6c388..0a3a4094a66 100644
--- a/src/Processors/QueryPlan/Optimizations/distinctReadInOrder.cpp
+++ b/src/Processors/QueryPlan/Optimizations/distinctReadInOrder.cpp
@@ -10,27 +10,27 @@
 namespace DB::QueryPlanOptimizations
 {
 /// build actions DAG from stack of steps
-static std::optional<ActionsDAG> buildActionsForPlanPath(std::vector<const ActionsDAG *> & dag_stack)
+static ActionsDAGPtr buildActionsForPlanPath(std::vector<ActionsDAGPtr> & dag_stack)
 {
     if (dag_stack.empty())
-        return {};
+        return nullptr;
 
-    ActionsDAG path_actions = dag_stack.back()->clone();
+    ActionsDAGPtr path_actions = dag_stack.back()->clone();
     dag_stack.pop_back();
     while (!dag_stack.empty())
     {
-        ActionsDAG clone = dag_stack.back()->clone();
+        ActionsDAGPtr clone = dag_stack.back()->clone();
         dag_stack.pop_back();
-        path_actions.mergeInplace(std::move(clone));
+        path_actions->mergeInplace(std::move(*clone));
     }
     return path_actions;
 }
 
 static std::set<std::string>
-getOriginalDistinctColumns(const ColumnsWithTypeAndName & distinct_columns, std::vector<const ActionsDAG *> & dag_stack)
+getOriginalDistinctColumns(const ColumnsWithTypeAndName & distinct_columns, std::vector<ActionsDAGPtr> & dag_stack)
 {
     auto actions = buildActionsForPlanPath(dag_stack);
-    FindOriginalNodeForOutputName original_node_finder(*actions);
+    FindOriginalNodeForOutputName original_node_finder(actions);
     std::set<std::string> original_distinct_columns;
     for (const auto & column : distinct_columns)
     {
@@ -65,7 +65,7 @@ size_t tryDistinctReadInOrder(QueryPlan::Node * parent_node)
     /// (3) gather actions DAG to find original names for columns in distinct step later
     std::vector<ITransformingStep *> steps_to_update;
     QueryPlan::Node * node = parent_node;
-    std::vector<const ActionsDAG *> dag_stack;
+    std::vector<ActionsDAGPtr> dag_stack;
     while (!node->children.empty())
     {
         auto * step = dynamic_cast<ITransformingStep *>(node->step.get());
@@ -79,9 +79,9 @@ size_t tryDistinctReadInOrder(QueryPlan::Node * parent_node)
         steps_to_update.push_back(step);
 
         if (const auto * const expr = typeid_cast<const ExpressionStep *>(step); expr)
-            dag_stack.push_back(&expr->getExpression());
+            dag_stack.push_back(expr->getExpression());
         else if (const auto * const filter = typeid_cast<const FilterStep *>(step); filter)
-            dag_stack.push_back(&filter->getExpression());
+            dag_stack.push_back(filter->getExpression());
 
         node = node->children.front();
     }
diff --git a/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp b/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
index b71326ff75b..263598bdca7 100644
--- a/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
+++ b/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
@@ -101,7 +101,7 @@ static NameSet findIdentifiersOfNode(const ActionsDAG::Node * node)
     return res;
 }
 
-static std::optional<ActionsDAG> splitFilter(QueryPlan::Node * parent_node, const Names & available_inputs, size_t child_idx = 0)
+static ActionsDAGPtr splitFilter(QueryPlan::Node * parent_node, const Names & available_inputs, size_t child_idx = 0)
 {
     QueryPlan::Node * child_node = parent_node->children.front();
     checkChildrenSize(child_node, child_idx + 1);
@@ -110,16 +110,16 @@ static std::optional<ActionsDAG> splitFilter(QueryPlan::Node * parent_node, cons
     auto & child = child_node->step;
 
     auto * filter = assert_cast<FilterStep *>(parent.get());
-    auto & expression = filter->getExpression();
+    const auto & expression = filter->getExpression();
     const auto & filter_column_name = filter->getFilterColumnName();
     bool removes_filter = filter->removesFilterColumn();
 
     const auto & all_inputs = child->getInputStreams()[child_idx].header.getColumnsWithTypeAndName();
-    return expression.splitActionsForFilterPushDown(filter_column_name, removes_filter, available_inputs, all_inputs);
+    return expression->splitActionsForFilterPushDown(filter_column_name, removes_filter, available_inputs, all_inputs);
 }
 
 static size_t
-addNewFilterStepOrThrow(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes, ActionsDAG split_filter,
+addNewFilterStepOrThrow(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes, const ActionsDAGPtr & split_filter,
                     bool can_remove_filter = true, size_t child_idx = 0, bool update_parent_filter = true)
 {
     QueryPlan::Node * child_node = parent_node->children.front();
@@ -129,14 +129,14 @@ addNewFilterStepOrThrow(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes,
     auto & child = child_node->step;
 
     auto * filter = assert_cast<FilterStep *>(parent.get());
-    auto & expression = filter->getExpression();
+    const auto & expression = filter->getExpression();
     const auto & filter_column_name = filter->getFilterColumnName();
 
-    const auto * filter_node = expression.tryFindInOutputs(filter_column_name);
+    const auto * filter_node = expression->tryFindInOutputs(filter_column_name);
     if (update_parent_filter && !filter_node && !filter->removesFilterColumn())
         throw Exception(ErrorCodes::LOGICAL_ERROR,
                         "Filter column {} was removed from ActionsDAG but it is needed in result. DAG:\n{}",
-                        filter_column_name, expression.dumpDAG());
+                        filter_column_name, expression->dumpDAG());
 
     /// Add new Filter step before Child.
     /// Expression/Filter -> Child -> Something
@@ -147,10 +147,10 @@ addNewFilterStepOrThrow(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes,
     /// Expression/Filter -> Child -> Filter -> Something
 
     /// New filter column is the first one.
-    String split_filter_column_name = split_filter.getOutputs().front()->result_name;
+    String split_filter_column_name = split_filter->getOutputs().front()->result_name;
 
     node.step = std::make_unique<FilterStep>(
-        node.children.at(0)->step->getOutputStream(), std::move(split_filter), std::move(split_filter_column_name), can_remove_filter);
+        node.children.at(0)->step->getOutputStream(), split_filter, std::move(split_filter_column_name), can_remove_filter);
 
     if (auto * transforming_step = dynamic_cast<ITransformingStep *>(child.get()))
     {
@@ -176,7 +176,7 @@ addNewFilterStepOrThrow(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes,
         {
             /// This means that all predicates of filter were pushed down.
             /// Replace current actions to expression, as we don't need to filter anything.
-            parent = std::make_unique<ExpressionStep>(child->getOutputStream(), std::move(expression));
+            parent = std::make_unique<ExpressionStep>(child->getOutputStream(), expression);
         }
         else
         {
@@ -192,7 +192,7 @@ tryAddNewFilterStep(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes, con
                     bool can_remove_filter = true, size_t child_idx = 0)
 {
     if (auto split_filter = splitFilter(parent_node, allowed_inputs, child_idx))
-        return addNewFilterStepOrThrow(parent_node, nodes, std::move(*split_filter), can_remove_filter, child_idx);
+        return addNewFilterStepOrThrow(parent_node, nodes, split_filter, can_remove_filter, child_idx);
     return 0;
 }
 
@@ -332,7 +332,7 @@ static size_t tryPushDownOverJoinStep(QueryPlan::Node * parent_node, QueryPlan::
     Names left_stream_available_columns_to_push_down = get_available_columns_for_filter(true /*push_to_left_stream*/, left_stream_filter_push_down_input_columns_available);
     Names right_stream_available_columns_to_push_down = get_available_columns_for_filter(false /*push_to_left_stream*/, right_stream_filter_push_down_input_columns_available);
 
-    auto join_filter_push_down_actions = filter->getExpression().splitActionsForJOINFilterPushDown(filter->getFilterColumnName(),
+    auto join_filter_push_down_actions = filter->getExpression()->splitActionsForJOINFilterPushDown(filter->getFilterColumnName(),
         filter->removesFilterColumn(),
         left_stream_available_columns_to_push_down,
         left_stream_input_header,
@@ -346,44 +346,42 @@ static size_t tryPushDownOverJoinStep(QueryPlan::Node * parent_node, QueryPlan::
 
     if (join_filter_push_down_actions.left_stream_filter_to_push_down)
     {
-        const auto & result_name = join_filter_push_down_actions.left_stream_filter_to_push_down->getOutputs()[0]->result_name;
         updated_steps += addNewFilterStepOrThrow(parent_node,
             nodes,
-            std::move(*join_filter_push_down_actions.left_stream_filter_to_push_down),
+            join_filter_push_down_actions.left_stream_filter_to_push_down,
             join_filter_push_down_actions.left_stream_filter_removes_filter,
             0 /*child_idx*/,
             false /*update_parent_filter*/);
         LOG_DEBUG(&Poco::Logger::get("QueryPlanOptimizations"),
             "Pushed down filter {} to the {} side of join",
-            result_name,
+            join_filter_push_down_actions.left_stream_filter_to_push_down->getOutputs()[0]->result_name,
             JoinKind::Left);
     }
 
     if (join_filter_push_down_actions.right_stream_filter_to_push_down && allow_push_down_to_right)
     {
-        const auto & result_name = join_filter_push_down_actions.right_stream_filter_to_push_down->getOutputs()[0]->result_name;
         updated_steps += addNewFilterStepOrThrow(parent_node,
             nodes,
-            std::move(*join_filter_push_down_actions.right_stream_filter_to_push_down),
+            join_filter_push_down_actions.right_stream_filter_to_push_down,
             join_filter_push_down_actions.right_stream_filter_removes_filter,
             1 /*child_idx*/,
             false /*update_parent_filter*/);
         LOG_DEBUG(&Poco::Logger::get("QueryPlanOptimizations"),
             "Pushed down filter {} to the {} side of join",
-            result_name,
+            join_filter_push_down_actions.right_stream_filter_to_push_down->getOutputs()[0]->result_name,
             JoinKind::Right);
     }
 
     if (updated_steps > 0)
     {
         const auto & filter_column_name = filter->getFilterColumnName();
-        auto & filter_expression = filter->getExpression();
+        const auto & filter_expression = filter->getExpression();
 
-        const auto * filter_node = filter_expression.tryFindInOutputs(filter_column_name);
+        const auto * filter_node = filter_expression->tryFindInOutputs(filter_column_name);
         if (!filter_node && !filter->removesFilterColumn())
             throw Exception(ErrorCodes::LOGICAL_ERROR,
                         "Filter column {} was removed from ActionsDAG but it is needed in result. DAG:\n{}",
-                        filter_column_name, filter_expression.dumpDAG());
+                        filter_column_name, filter_expression->dumpDAG());
 
 
         /// Filter column was replaced to constant.
@@ -393,7 +391,7 @@ static size_t tryPushDownOverJoinStep(QueryPlan::Node * parent_node, QueryPlan::
         {
             /// This means that all predicates of filter were pushed down.
             /// Replace current actions to expression, as we don't need to filter anything.
-            parent = std::make_unique<ExpressionStep>(child->getOutputStream(), std::move(filter_expression));
+            parent = std::make_unique<ExpressionStep>(child->getOutputStream(), filter_expression);
         }
         else
         {
@@ -418,7 +416,7 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
     if (!filter)
         return 0;
 
-    if (filter->getExpression().hasStatefulFunctions())
+    if (filter->getExpression()->hasStatefulFunctions())
         return 0;
 
     if (auto * aggregating = typeid_cast<AggregatingStep *>(child.get()))
@@ -432,7 +430,7 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
                 return 0;
 
             const auto & actions = filter->getExpression();
-            const auto & filter_node = actions.findInOutputs(filter->getFilterColumnName());
+            const auto & filter_node = actions->findInOutputs(filter->getFilterColumnName());
 
             auto identifiers_in_predicate = findIdentifiersOfNode(&filter_node);
 
@@ -442,15 +440,6 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
 
         const auto & params = aggregating->getParams();
         const auto & keys = params.keys;
-        /** The filter is applied either to aggregation keys or aggregation result
-          * (columns under aggregation is not available in outer scope, so we can't have a filter for them).
-          * The filter for the aggregation result is not pushed down, so the only valid case is filtering aggregation keys.
-          * In case keys are empty, do not push down the filter.
-          * Also with empty keys we can have an issue with `empty_result_for_aggregation_by_empty_set`,
-          * since we can gen a result row when everything is filtered.
-          */
-        if (keys.empty())
-            return 0;
 
         const bool filter_column_is_not_among_aggregation_keys
             = std::find(keys.begin(), keys.end(), filter->getFilterColumnName()) == keys.end();
@@ -608,7 +597,7 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
 
             filter_node.step = std::make_unique<FilterStep>(
                 filter_node.children.front()->step->getOutputStream(),
-                filter->getExpression().clone(),
+                filter->getExpression()->clone(),
                 filter->getFilterColumnName(),
                 filter->removesFilterColumn());
         }
@@ -622,7 +611,7 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
 
     if (auto * read_from_merge = typeid_cast<ReadFromMerge *>(child.get()))
     {
-        FilterDAGInfo info{filter->getExpression().clone(), filter->getFilterColumnName(), filter->removesFilterColumn()};
+        FilterDAGInfo info{filter->getExpression(), filter->getFilterColumnName(), filter->removesFilterColumn()};
         read_from_merge->addFilter(std::move(info));
         std::swap(*parent_node, *child_node);
         return 1;
diff --git a/src/Processors/QueryPlan/Optimizations/liftUpArrayJoin.cpp b/src/Processors/QueryPlan/Optimizations/liftUpArrayJoin.cpp
index 0d4f2330119..36aab41df49 100644
--- a/src/Processors/QueryPlan/Optimizations/liftUpArrayJoin.cpp
+++ b/src/Processors/QueryPlan/Optimizations/liftUpArrayJoin.cpp
@@ -28,10 +28,10 @@ size_t tryLiftUpArrayJoin(QueryPlan::Node * parent_node, QueryPlan::Nodes & node
     const auto & expression = expression_step ? expression_step->getExpression()
                                               : filter_step->getExpression();
 
-    auto split_actions = expression.splitActionsBeforeArrayJoin(array_join->columns);
+    auto split_actions = expression->splitActionsBeforeArrayJoin(array_join->columns);
 
     /// No actions can be moved before ARRAY JOIN.
-    if (split_actions.first.trivial())
+    if (split_actions.first->trivial())
         return 0;
 
     auto description = parent->getStepDescription();
@@ -49,9 +49,9 @@ size_t tryLiftUpArrayJoin(QueryPlan::Node * parent_node, QueryPlan::Nodes & node
     array_join_step->updateInputStream(node.step->getOutputStream());
 
     if (expression_step)
-        parent = std::make_unique<ExpressionStep>(array_join_step->getOutputStream(), std::move(split_actions.second));
+        parent = std::make_unique<ExpressionStep>(array_join_step->getOutputStream(), split_actions.second);
     else
-        parent = std::make_unique<FilterStep>(array_join_step->getOutputStream(), std::move(split_actions.second),
+        parent = std::make_unique<FilterStep>(array_join_step->getOutputStream(), split_actions.second,
                                               filter_step->getFilterColumnName(), filter_step->removesFilterColumn());
 
     parent->setStepDescription(description + " [split]");
diff --git a/src/Processors/QueryPlan/Optimizations/liftUpFunctions.cpp b/src/Processors/QueryPlan/Optimizations/liftUpFunctions.cpp
index 7794ddae8fa..b280e2d3cc6 100644
--- a/src/Processors/QueryPlan/Optimizations/liftUpFunctions.cpp
+++ b/src/Processors/QueryPlan/Optimizations/liftUpFunctions.cpp
@@ -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())
+    if (unneeded_for_sorting->trivial())
         return 0;
 
-    if (!areNodesConvertableToBlock(needed_for_sorting.getOutputs()) || !areNodesConvertableToBlock(unneeded_for_sorting.getInputs()))
+    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/liftUpUnion.cpp b/src/Processors/QueryPlan/Optimizations/liftUpUnion.cpp
index 43cf166002e..35d8b1a35e4 100644
--- a/src/Processors/QueryPlan/Optimizations/liftUpUnion.cpp
+++ b/src/Processors/QueryPlan/Optimizations/liftUpUnion.cpp
@@ -49,8 +49,7 @@ size_t tryLiftUpUnion(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes)
 
             expr_node.step = std::make_unique<ExpressionStep>(
                 expr_node.children.front()->step->getOutputStream(),
-                expression->getExpression().clone());
-            expr_node.step->setStepDescription(expression->getStepDescription());
+                expression->getExpression()->clone());
         }
 
         ///       - Expression - Something
diff --git a/src/Processors/QueryPlan/Optimizations/mergeExpressions.cpp b/src/Processors/QueryPlan/Optimizations/mergeExpressions.cpp
index fb4cb90c4ca..118abdd701f 100644
--- a/src/Processors/QueryPlan/Optimizations/mergeExpressions.cpp
+++ b/src/Processors/QueryPlan/Optimizations/mergeExpressions.cpp
@@ -37,18 +37,18 @@ size_t tryMergeExpressions(QueryPlan::Node * parent_node, QueryPlan::Nodes &)
 
     if (parent_expr && child_expr)
     {
-        auto & child_actions = child_expr->getExpression();
-        auto & parent_actions = parent_expr->getExpression();
+        const auto & child_actions = child_expr->getExpression();
+        const auto & parent_actions = parent_expr->getExpression();
 
         /// We cannot combine actions with arrayJoin and stateful function because we not always can reorder them.
         /// Example: select rowNumberInBlock() from (select arrayJoin([1, 2]))
         /// Such a query will return two zeroes if we combine actions together.
-        if (child_actions.hasArrayJoin() && parent_actions.hasStatefulFunctions())
+        if (child_actions->hasArrayJoin() && parent_actions->hasStatefulFunctions())
             return 0;
 
-        auto merged = ActionsDAG::merge(std::move(child_actions), std::move(parent_actions));
+        auto merged = ActionsDAG::merge(std::move(*child_actions), std::move(*parent_actions));
 
-        auto expr = std::make_unique<ExpressionStep>(child_expr->getInputStreams().front(), std::move(merged));
+        auto expr = std::make_unique<ExpressionStep>(child_expr->getInputStreams().front(), merged);
         expr->setStepDescription("(" + parent_expr->getStepDescription() + " + " + child_expr->getStepDescription() + ")");
 
         parent_node->step = std::move(expr);
@@ -57,16 +57,16 @@ size_t tryMergeExpressions(QueryPlan::Node * parent_node, QueryPlan::Nodes &)
     }
     else if (parent_filter && child_expr)
     {
-        auto & child_actions = child_expr->getExpression();
-        auto & parent_actions = parent_filter->getExpression();
+        const auto & child_actions = child_expr->getExpression();
+        const auto & parent_actions = parent_filter->getExpression();
 
-        if (child_actions.hasArrayJoin() && parent_actions.hasStatefulFunctions())
+        if (child_actions->hasArrayJoin() && parent_actions->hasStatefulFunctions())
             return 0;
 
-        auto merged = ActionsDAG::merge(std::move(child_actions), std::move(parent_actions));
+        auto merged = ActionsDAG::merge(std::move(*child_actions), std::move(*parent_actions));
 
         auto filter = std::make_unique<FilterStep>(child_expr->getInputStreams().front(),
-                                                   std::move(merged),
+                                                   merged,
                                                    parent_filter->getFilterColumnName(),
                                                    parent_filter->removesFilterColumn());
         filter->setStepDescription("(" + parent_filter->getStepDescription() + " + " + child_expr->getStepDescription() + ")");
@@ -93,31 +93,32 @@ size_t tryMergeFilters(QueryPlan::Node * parent_node, QueryPlan::Nodes &)
 
     if (parent_filter && child_filter)
     {
-        auto & child_actions = child_filter->getExpression();
-        auto & parent_actions = parent_filter->getExpression();
+        const auto & child_actions = child_filter->getExpression();
+        const auto & parent_actions = parent_filter->getExpression();
 
-        if (child_actions.hasArrayJoin())
+        if (child_actions->hasArrayJoin())
             return 0;
 
-        const auto & child_filter_node = child_actions.findInOutputs(child_filter->getFilterColumnName());
+        auto actions = child_actions->clone();
+        const auto & child_filter_node = actions->findInOutputs(child_filter->getFilterColumnName());
         if (child_filter->removesFilterColumn())
-            removeFromOutputs(child_actions, child_filter_node);
+            removeFromOutputs(*actions, child_filter_node);
 
-        child_actions.mergeInplace(std::move(parent_actions));
+        actions->mergeInplace(std::move(*parent_actions->clone()));
 
-        const auto & parent_filter_node = child_actions.findInOutputs(parent_filter->getFilterColumnName());
+        const auto & parent_filter_node = actions->findInOutputs(parent_filter->getFilterColumnName());
         if (parent_filter->removesFilterColumn())
-            removeFromOutputs(child_actions, parent_filter_node);
+            removeFromOutputs(*actions, parent_filter_node);
 
         FunctionOverloadResolverPtr func_builder_and = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionAnd>());
-        const auto & condition = child_actions.addFunction(func_builder_and, {&child_filter_node, &parent_filter_node}, {});
-        auto & outputs = child_actions.getOutputs();
+        const auto & condition = actions->addFunction(func_builder_and, {&child_filter_node, &parent_filter_node}, {});
+        auto & outputs = actions->getOutputs();
         outputs.insert(outputs.begin(), &condition);
 
-        child_actions.removeUnusedActions(false);
+        actions->removeUnusedActions(false);
 
         auto filter = std::make_unique<FilterStep>(child_filter->getInputStreams().front(),
-                                                   std::move(child_actions),
+                                                   actions,
                                                    condition.result_name,
                                                    true);
         filter->setStepDescription("(" + parent_filter->getStepDescription() + " + " + child_filter->getStepDescription() + ")");
diff --git a/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp b/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp
index dc73521210a..3cb7f8a5d83 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp
@@ -56,12 +56,12 @@ void optimizePrewhere(Stack & stack, QueryPlan::Nodes &)
         return;
 
     const auto & storage_prewhere_info = source_step_with_filter->getPrewhereInfo();
-    if (storage_prewhere_info)
+    if (storage_prewhere_info && storage_prewhere_info->prewhere_actions)
         return;
 
     /// TODO: We can also check for UnionStep, such as StorageBuffer and local distributed plans.
     QueryPlan::Node * filter_node = (stack.rbegin() + 1)->node;
-    auto * filter_step = typeid_cast<FilterStep *>(filter_node->step.get());
+    const auto * filter_step = typeid_cast<FilterStep *>(filter_node->step.get());
     if (!filter_step)
         return;
 
@@ -85,11 +85,10 @@ void optimizePrewhere(Stack & stack, QueryPlan::Nodes &)
 
     Names queried_columns = source_step_with_filter->requiredSourceColumns();
 
-    const auto & source_filter_actions_dag = source_step_with_filter->getFilterActionsDAG();
     MergeTreeWhereOptimizer where_optimizer{
         std::move(column_compressed_sizes),
         storage_metadata,
-        storage.getConditionSelectivityEstimatorByPredicate(storage_snapshot, source_filter_actions_dag ? &*source_filter_actions_dag : nullptr, context),
+        storage.getConditionSelectivityEstimatorByPredicate(storage_snapshot, source_step_with_filter->getFilterActionsDAG(), context),
         queried_columns,
         storage.supportedPrewhereColumns(),
         getLogger("QueryPlanOptimizePrewhere")};
@@ -111,20 +110,20 @@ void optimizePrewhere(Stack & stack, QueryPlan::Nodes &)
     prewhere_info->need_filter = true;
     prewhere_info->remove_prewhere_column = optimize_result.fully_moved_to_prewhere && filter_step->removesFilterColumn();
 
-    auto filter_expression = std::move(filter_step->getExpression());
+    auto filter_expression = filter_step->getExpression();
     const auto & filter_column_name = filter_step->getFilterColumnName();
 
     if (prewhere_info->remove_prewhere_column)
     {
-        removeFromOutput(filter_expression, filter_column_name);
-        auto & outputs = filter_expression.getOutputs();
+        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);
+        filter_expression->removeUnusedActions(false);
         outputs.resize(size);
     }
 
-    auto split_result = filter_expression.split(optimize_result.prewhere_nodes, true, true);
+    auto split_result = filter_step->getExpression()->split(optimize_result.prewhere_nodes, true, true);
 
     /// This is the leak of abstraction.
     /// Splited actions may have inputs which are needed only for PREWHERE.
@@ -140,15 +139,15 @@ void optimizePrewhere(Stack & stack, QueryPlan::Nodes &)
     /// 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())
+            split_result.first->getOutputs().begin(), split_result.first->getOutputs().end());
+        for (const auto * input : split_result.first->getInputs())
         {
             if (!first_outputs.contains(input))
             {
-                split_result.first.getOutputs().push_back(input);
+                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);
+                split_result.second->addInput(input->result_name, input->result_type);
             }
         }
     }
@@ -165,16 +164,16 @@ void optimizePrewhere(Stack & stack, QueryPlan::Nodes &)
     {
         prewhere_info->prewhere_column_name = conditions.front()->result_name;
         if (prewhere_info->remove_prewhere_column)
-            prewhere_info->prewhere_actions.getOutputs().push_back(conditions.front());
+            prewhere_info->prewhere_actions->getOutputs().push_back(conditions.front());
     }
     else
     {
         prewhere_info->remove_prewhere_column = 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), {});
+        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);
+        prewhere_info->prewhere_actions->getOutputs().push_back(node);
     }
 
     source_step_with_filter->updatePrewhereInfo(prewhere_info);
diff --git a/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyConditionAndLimit.cpp b/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyConditionAndLimit.cpp
index 490b79fbf8d..da4e104d18b 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyConditionAndLimit.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyConditionAndLimit.cpp
@@ -18,16 +18,16 @@ void optimizePrimaryKeyConditionAndLimit(const Stack & stack)
     const auto & storage_prewhere_info = source_step_with_filter->getPrewhereInfo();
     if (storage_prewhere_info)
     {
-        source_step_with_filter->addFilter(storage_prewhere_info->prewhere_actions.clone(), storage_prewhere_info->prewhere_column_name);
+        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->clone(), storage_prewhere_info->row_level_column_name);
+            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()))
         {
-            source_step_with_filter->addFilter(filter_step->getExpression().clone(), filter_step->getFilterColumnName());
+            source_step_with_filter->addFilter(filter_step->getExpression(), filter_step->getFilterColumnName());
         }
         else if (auto * limit_step = typeid_cast<LimitStep *>(iter->node->step.get()))
         {
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp b/src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp
index ac7fcdcf83f..28eb4da2e17 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp
@@ -18,7 +18,6 @@
 #include <Processors/QueryPlan/Optimizations/Optimizations.h>
 #include <Processors/QueryPlan/Optimizations/actionsDAGUtils.h>
 #include <Processors/QueryPlan/ReadFromMergeTree.h>
-#include <Processors/QueryPlan/ReadFromRemote.h>
 #include <Processors/QueryPlan/SortingStep.h>
 #include <Processors/QueryPlan/TotalsHavingStep.h>
 #include <Processors/QueryPlan/UnionStep.h>
@@ -172,17 +171,17 @@ static void appendFixedColumnsFromFilterExpression(const ActionsDAG::Node & filt
     }
 }
 
-static void appendExpression(std::optional<ActionsDAG> & dag, const ActionsDAG & expression)
+static void appendExpression(ActionsDAGPtr & dag, const ActionsDAGPtr & expression)
 {
     if (dag)
-        dag->mergeInplace(expression.clone());
+        dag->mergeInplace(std::move(*expression->clone()));
     else
-        dag = expression.clone();
+        dag = expression->clone();
 }
 
 /// This function builds a common DAG which is a merge of DAGs from Filter and Expression steps chain.
 /// Additionally, build a set of fixed columns.
-void buildSortingDAG(QueryPlan::Node & node, std::optional<ActionsDAG> & dag, FixedColumns & fixed_columns, size_t & limit)
+void buildSortingDAG(QueryPlan::Node & node, ActionsDAGPtr & dag, FixedColumns & fixed_columns, size_t & limit)
 {
     IQueryPlanStep * step = node.step.get();
     if (auto * reading = typeid_cast<ReadFromMergeTree *>(step))
@@ -192,11 +191,13 @@ void buildSortingDAG(QueryPlan::Node & node, std::optional<ActionsDAG> & dag, Fi
             /// Should ignore limit if there is filtering.
             limit = 0;
 
-            //std::cerr << "====== Adding prewhere " << std::endl;
-            appendExpression(dag, prewhere_info->prewhere_actions);
-            if (const auto * filter_expression = dag->tryFindInOutputs(prewhere_info->prewhere_column_name))
-                appendFixedColumnsFromFilterExpression(*filter_expression, fixed_columns);
-
+            if (prewhere_info->prewhere_actions)
+            {
+                //std::cerr << "====== Adding prewhere " << std::endl;
+                appendExpression(dag, prewhere_info->prewhere_actions);
+                if (const auto * filter_expression = dag->tryFindInOutputs(prewhere_info->prewhere_column_name))
+                    appendFixedColumnsFromFilterExpression(*filter_expression, fixed_columns);
+            }
         }
         return;
     }
@@ -211,7 +212,7 @@ void buildSortingDAG(QueryPlan::Node & node, std::optional<ActionsDAG> & dag, Fi
         const auto & actions = expression->getExpression();
 
         /// Should ignore limit because arrayJoin() can reduce the number of rows in case of empty array.
-        if (actions.hasArrayJoin())
+        if (actions->hasArrayJoin())
             limit = 0;
 
         appendExpression(dag, actions);
@@ -256,7 +257,7 @@ void buildSortingDAG(QueryPlan::Node & node, std::optional<ActionsDAG> & dag, Fi
 
 /// Add more functions to fixed columns.
 /// Functions result is fixed if all arguments are fixed or constants.
-void enrichFixedColumns(const ActionsDAG & dag, FixedColumns & fixed_columns)
+void enreachFixedColumns(const ActionsDAG & dag, FixedColumns & fixed_columns)
 {
     struct Frame
     {
@@ -301,20 +302,20 @@ void enrichFixedColumns(const ActionsDAG & dag, FixedColumns & fixed_columns)
                     {
                         if (frame.node->function_base->isDeterministicInScopeOfQuery())
                         {
-                            //std::cerr << "*** enrichFixedColumns check " << frame.node->result_name << std::endl;
+                            //std::cerr << "*** enreachFixedColumns check " << frame.node->result_name << std::endl;
                             bool all_args_fixed_or_const = true;
                             for (const auto * child : frame.node->children)
                             {
                                 if (!child->column && !fixed_columns.contains(child))
                                 {
-                                    //std::cerr << "*** enrichFixedColumns fail " << child->result_name <<  ' ' << static_cast<const void *>(child) << std::endl;
+                                    //std::cerr << "*** enreachFixedColumns fail " << child->result_name <<  ' ' << static_cast<const void *>(child) << std::endl;
                                     all_args_fixed_or_const = false;
                                 }
                             }
 
                             if (all_args_fixed_or_const)
                             {
-                                //std::cerr << "*** enrichFixedColumns add " << frame.node->result_name << ' ' << static_cast<const void *>(frame.node) << std::endl;
+                                //std::cerr << "*** enreachFixedColumns add " << frame.node->result_name << ' ' << static_cast<const void *>(frame.node) << std::endl;
                                 fixed_columns.insert(frame.node);
                             }
                         }
@@ -329,7 +330,7 @@ void enrichFixedColumns(const ActionsDAG & dag, FixedColumns & fixed_columns)
 
 InputOrderInfoPtr buildInputOrderInfo(
     const FixedColumns & fixed_columns,
-    const std::optional<ActionsDAG> & dag,
+    const ActionsDAGPtr & dag,
     const SortDescription & description,
     const KeyDescription & sorting_key,
     size_t limit)
@@ -358,7 +359,7 @@ InputOrderInfoPtr buildInputOrderInfo(
             }
         }
 
-        enrichFixedColumns(sorting_key_dag, fixed_key_columns);
+        enreachFixedColumns(sorting_key_dag, fixed_key_columns);
     }
 
     /// This is a result direction we will read from MergeTree
@@ -506,7 +507,7 @@ struct AggregationInputOrder
 
 AggregationInputOrder buildInputOrderInfo(
     const FixedColumns & fixed_columns,
-    const std::optional<ActionsDAG> & dag,
+    const ActionsDAGPtr & dag,
     const Names & group_by_keys,
     const ActionsDAG & sorting_key_dag,
     const Names & sorting_key_columns)
@@ -531,7 +532,7 @@ AggregationInputOrder buildInputOrderInfo(
             }
         }
 
-        enrichFixedColumns(sorting_key_dag, fixed_key_columns);
+        enreachFixedColumns(sorting_key_dag, fixed_key_columns);
 
         for (const auto * output : dag->getOutputs())
         {
@@ -692,7 +693,7 @@ AggregationInputOrder buildInputOrderInfo(
 InputOrderInfoPtr buildInputOrderInfo(
     const ReadFromMergeTree * reading,
     const FixedColumns & fixed_columns,
-    const std::optional<ActionsDAG> & dag,
+    const ActionsDAGPtr & dag,
     const SortDescription & description,
     size_t limit)
 {
@@ -708,7 +709,7 @@ InputOrderInfoPtr buildInputOrderInfo(
 InputOrderInfoPtr buildInputOrderInfo(
     ReadFromMerge * merge,
     const FixedColumns & fixed_columns,
-    const std::optional<ActionsDAG> & dag,
+    const ActionsDAGPtr & dag,
     const SortDescription & description,
     size_t limit)
 {
@@ -744,7 +745,7 @@ InputOrderInfoPtr buildInputOrderInfo(
 AggregationInputOrder buildInputOrderInfo(
     ReadFromMergeTree * reading,
     const FixedColumns & fixed_columns,
-    const std::optional<ActionsDAG> & dag,
+    const ActionsDAGPtr & dag,
     const Names & group_by_keys)
 {
     const auto & sorting_key = reading->getStorageMetadata()->getSortingKey();
@@ -759,7 +760,7 @@ AggregationInputOrder buildInputOrderInfo(
 AggregationInputOrder buildInputOrderInfo(
     ReadFromMerge * merge,
     const FixedColumns & fixed_columns,
-    const std::optional<ActionsDAG> & dag,
+    const ActionsDAGPtr & dag,
     const Names & group_by_keys)
 {
     const auto & tables = merge->getSelectedTables();
@@ -800,12 +801,12 @@ InputOrderInfoPtr buildInputOrderInfo(SortingStep & sorting, QueryPlan::Node & n
     const auto & description = sorting.getSortDescription();
     size_t limit = sorting.getLimit();
 
-    std::optional<ActionsDAG> dag;
+    ActionsDAGPtr dag;
     FixedColumns fixed_columns;
     buildSortingDAG(node, dag, fixed_columns, limit);
 
     if (dag && !fixed_columns.empty())
-        enrichFixedColumns(*dag, fixed_columns);
+        enreachFixedColumns(*dag, fixed_columns);
 
     if (auto * reading = typeid_cast<ReadFromMergeTree *>(reading_node->step.get()))
     {
@@ -854,12 +855,12 @@ AggregationInputOrder buildInputOrderInfo(AggregatingStep & aggregating, QueryPl
     const auto & keys = aggregating.getParams().keys;
     size_t limit = 0;
 
-    std::optional<ActionsDAG> dag;
+    ActionsDAGPtr dag;
     FixedColumns fixed_columns;
     buildSortingDAG(node, dag, fixed_columns, limit);
 
     if (dag && !fixed_columns.empty())
-        enrichFixedColumns(*dag, fixed_columns);
+        enreachFixedColumns(*dag, fixed_columns);
 
     if (auto * reading = typeid_cast<ReadFromMergeTree *>(reading_node->step.get()))
     {
@@ -900,18 +901,6 @@ AggregationInputOrder buildInputOrderInfo(AggregatingStep & aggregating, QueryPl
     return {};
 }
 
-static bool readingFromParallelReplicas(const QueryPlan::Node * node)
-{
-    IQueryPlanStep * step = node->step.get();
-    while (!node->children.empty())
-    {
-        step = node->children.front()->step.get();
-        node = node->children.front();
-    }
-
-    return typeid_cast<const ReadFromParallelRemoteReplicasStep *>(step);
-}
-
 void optimizeReadInOrder(QueryPlan::Node & node, QueryPlan::Nodes & nodes)
 {
     if (node.children.size() != 1)
@@ -937,16 +926,6 @@ void optimizeReadInOrder(QueryPlan::Node & node, QueryPlan::Nodes & nodes)
         std::vector<InputOrderInfoPtr> infos;
         infos.reserve(node.children.size());
 
-        for (const auto * child : union_node->children)
-        {
-            /// in case of parallel replicas
-            /// avoid applying read-in-order optimization for local replica
-            /// since it will lead to different parallel replicas modes
-            /// between local and remote nodes
-            if (readingFromParallelReplicas(child))
-                return;
-        }
-
         for (auto * child : union_node->children)
         {
             infos.push_back(buildInputOrderInfo(*sorting, *child, steps_to_update));
@@ -1078,7 +1057,7 @@ size_t tryReuseStorageOrderingForWindowFunctions(QueryPlan::Node * parent_node,
     }
 
     auto context = read_from_merge_tree->getContext();
-    const auto & settings = context->getSettingsRef();
+    const auto & settings = context->getSettings();
     if (!settings.optimize_read_in_window_order || (settings.optimize_read_in_order && settings.query_plan_read_in_order) || context->getSettingsRef().allow_experimental_analyzer)
     {
         return 0;
@@ -1097,13 +1076,13 @@ size_t tryReuseStorageOrderingForWindowFunctions(QueryPlan::Node * parent_node,
     for (const auto & actions_dag : window_desc.partition_by_actions)
     {
         order_by_elements_actions.emplace_back(
-            std::make_shared<ExpressionActions>(actions_dag->clone(), ExpressionActionsSettings::fromContext(context, CompileExpressions::yes)));
+            std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(context, CompileExpressions::yes)));
     }
 
     for (const auto & actions_dag : window_desc.order_by_actions)
     {
         order_by_elements_actions.emplace_back(
-            std::make_shared<ExpressionActions>(actions_dag->clone(), ExpressionActionsSettings::fromContext(context, CompileExpressions::yes)));
+            std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(context, CompileExpressions::yes)));
     }
 
     auto order_optimizer = std::make_shared<ReadInOrderOptimizer>(
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp b/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp
index 35ac2c220ff..9e2c2dcc96d 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp
@@ -43,7 +43,7 @@ static DAGIndex buildDAGIndex(const ActionsDAG & dag)
 /// Required analysis info from aggregate projection.
 struct AggregateProjectionInfo
 {
-    std::optional<ActionsDAG> before_aggregation;
+    ActionsDAGPtr before_aggregation;
     Names keys;
     AggregateDescriptions aggregates;
 
@@ -255,19 +255,26 @@ static void appendAggregateFunctions(
 
         const auto * node = input;
 
-        if (!DataTypeAggregateFunction::strictEquals(type, node->result_type))
-            /// Cast to aggregate types specified in query if it's not
-            /// strictly the same as the one specified in projection. This
-            /// is required to generate correct results during finalization.
-            node = &proj_dag.addCast(*node, type, aggregate.column_name);
-        else if (node->result_name != aggregate.column_name)
-            node = &proj_dag.addAlias(*node, aggregate.column_name);
+        if (node->result_name != aggregate.column_name)
+        {
+            if (DataTypeAggregateFunction::strictEquals(type, node->result_type))
+            {
+                node = &proj_dag.addAlias(*node, aggregate.column_name);
+            }
+            else
+            {
+                /// Cast to aggregate types specified in query if it's not
+                /// strictly the same as the one specified in projection. This
+                /// is required to generate correct results during finalization.
+                node = &proj_dag.addCast(*node, type, aggregate.column_name);
+            }
+        }
 
         proj_dag_outputs.push_back(node);
     }
 }
 
-std::optional<ActionsDAG> analyzeAggregateProjection(
+ActionsDAGPtr analyzeAggregateProjection(
     const AggregateProjectionInfo & info,
     const QueryDAG & query,
     const DAGIndex & query_index,
@@ -387,7 +394,7 @@ std::optional<ActionsDAG> analyzeAggregateProjection(
     // 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);
+    appendAggregateFunctions(*proj_dag, aggregates, *matched_aggregates);
     return proj_dag;
 }
 
@@ -399,7 +406,7 @@ struct AggregateProjectionCandidate : public ProjectionCandidate
 
     /// Actions which need to be applied to columns from projection
     /// in order to get all the columns required for aggregation.
-    ActionsDAG dag;
+    ActionsDAGPtr dag;
 };
 
 struct MinMaxProjectionCandidate
@@ -474,13 +481,13 @@ AggregateProjectionCandidates getAggregateProjectionCandidates(
         if (auto proj_dag = analyzeAggregateProjection(info, dag, query_index, keys, aggregates))
         {
             // LOG_TRACE(getLogger("optimizeUseProjections"), "Projection analyzed DAG {}", proj_dag->dumpDAG());
-            AggregateProjectionCandidate candidate{.info = std::move(info), .dag = std::move(*proj_dag)};
+            AggregateProjectionCandidate candidate{.info = std::move(info), .dag = std::move(proj_dag)};
 
             // LOG_TRACE(getLogger("optimizeUseProjections"), "Projection sample block {}", sample_block.dumpStructure());
             auto block = reading.getMergeTreeData().getMinMaxCountProjectionBlock(
                 metadata,
-                candidate.dag.getRequiredColumnsNames(),
-                (dag.filter_node ? &*dag.dag : nullptr),
+                candidate.dag->getRequiredColumnsNames(),
+                (dag.filter_node ? dag.dag : nullptr),
                 parts,
                 max_added_blocks.get(),
                 context);
@@ -531,7 +538,7 @@ AggregateProjectionCandidates getAggregateProjectionCandidates(
             if (auto proj_dag = analyzeAggregateProjection(info, dag, query_index, keys, aggregates))
             {
                 // LOG_TRACE(getLogger("optimizeUseProjections"), "Projection analyzed DAG {}", proj_dag->dumpDAG());
-                AggregateProjectionCandidate candidate{.info = std::move(info), .dag = std::move(*proj_dag)};
+                AggregateProjectionCandidate candidate{.info = std::move(info), .dag = std::move(proj_dag)};
                 candidate.projection = projection;
                 candidates.real.emplace_back(std::move(candidate));
             }
@@ -659,7 +666,7 @@ std::optional<String> optimizeUseAggregateProjections(QueryPlan::Node & node, Qu
         /// Selecting best candidate.
         for (auto & candidate : candidates.real)
         {
-            auto required_column_names = candidate.dag.getRequiredColumnsNames();
+            auto required_column_names = candidate.dag->getRequiredColumnsNames();
 
             bool analyzed = analyzeProjectionCandidate(
                 candidate,
@@ -670,7 +677,7 @@ std::optional<String> optimizeUseAggregateProjections(QueryPlan::Node & node, Qu
                 query_info,
                 context,
                 max_added_blocks,
-                &candidate.dag);
+                candidate.dag);
 
             if (!analyzed)
                 continue;
@@ -750,15 +757,17 @@ std::optional<String> optimizeUseAggregateProjections(QueryPlan::Node & node, Qu
     else
     {
         auto storage_snapshot = reading->getStorageSnapshot();
-        auto proj_snapshot = std::make_shared<StorageSnapshot>(storage_snapshot->storage, best_candidate->projection->metadata);
+        auto proj_snapshot = std::make_shared<StorageSnapshot>(storage_snapshot->storage, storage_snapshot->metadata);
+        proj_snapshot->addProjection(best_candidate->projection);
+
         auto projection_query_info = query_info;
         projection_query_info.prewhere_info = nullptr;
         projection_query_info.filter_actions_dag = nullptr;
 
         projection_reading = reader.readFromParts(
             /* parts = */ {},
-            reading->getMutationsSnapshot()->cloneEmpty(),
-            best_candidate->dag.getRequiredColumnsNames(),
+            /* alter_conversions = */ {},
+            best_candidate->dag->getRequiredColumnsNames(),
             proj_snapshot,
             projection_query_info,
             context,
@@ -770,7 +779,7 @@ std::optional<String> optimizeUseAggregateProjections(QueryPlan::Node & node, Qu
 
         if (!projection_reading)
         {
-            auto header = proj_snapshot->getSampleBlockForColumns(best_candidate->dag.getRequiredColumnsNames());
+            auto header = proj_snapshot->getSampleBlockForColumns(best_candidate->dag->getRequiredColumnsNames());
             Pipe pipe(std::make_shared<NullSource>(std::move(header)));
             projection_reading = std::make_unique<ReadFromPreparedSource>(std::move(pipe));
         }
@@ -801,19 +810,17 @@ std::optional<String> optimizeUseAggregateProjections(QueryPlan::Node & node, Qu
     if (best_candidate)
     {
         aggregate_projection_node = &nodes.emplace_back();
-
         if (candidates.has_filter)
         {
-            const auto & result_name = best_candidate->dag.getOutputs().front()->result_name;
             aggregate_projection_node->step = std::make_unique<FilterStep>(
                 projection_reading_node.step->getOutputStream(),
-                std::move(best_candidate->dag),
-                result_name,
+                best_candidate->dag,
+                best_candidate->dag->getOutputs().front()->result_name,
                 true);
         }
         else
             aggregate_projection_node->step
-                = std::make_unique<ExpressionStep>(projection_reading_node.step->getOutputStream(), std::move(best_candidate->dag));
+                = std::make_unique<ExpressionStep>(projection_reading_node.step->getOutputStream(), best_candidate->dag);
 
         aggregate_projection_node->children.push_back(&projection_reading_node);
     }
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp b/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp
index 654046cda89..291800c2c86 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp
@@ -25,7 +25,7 @@ struct NormalProjectionCandidate : public ProjectionCandidate
 {
 };
 
-static std::optional<ActionsDAG> makeMaterializingDAG(const Block & proj_header, const Block main_header)
+static ActionsDAGPtr makeMaterializingDAG(const Block & proj_header, const Block main_header)
 {
     /// Materialize constants in case we don't have it in output header.
     /// This may happen e.g. if we have PREWHERE.
@@ -33,7 +33,7 @@ static std::optional<ActionsDAG> makeMaterializingDAG(const Block & proj_header,
     size_t num_columns = main_header.columns();
     /// This is a error; will have block structure mismatch later.
     if (proj_header.columns() != num_columns)
-        return {};
+        return nullptr;
 
     std::vector<size_t> const_positions;
     for (size_t i = 0; i < num_columns; ++i)
@@ -47,17 +47,17 @@ static std::optional<ActionsDAG> makeMaterializingDAG(const Block & proj_header,
     }
 
     if (const_positions.empty())
-        return {};
+        return nullptr;
 
-    ActionsDAG dag;
-    auto & outputs = dag.getOutputs();
+    ActionsDAGPtr dag = std::make_unique<ActionsDAG>();
+    auto & outputs = dag->getOutputs();
     for (const auto & col : proj_header.getColumnsWithTypeAndName())
-        outputs.push_back(&dag.addInput(col));
+        outputs.push_back(&dag->addInput(col));
 
     for (auto pos : const_positions)
     {
         auto & output = outputs[pos];
-        output = &dag.materializeNode(*output);
+        output = &dag->materializeNode(*output);
     }
 
     return dag;
@@ -174,7 +174,7 @@ std::optional<String> optimizeUseNormalProjections(Stack & stack, QueryPlan::Nod
             query_info,
             context,
             max_added_blocks,
-            query.filter_node ? &*query.dag : nullptr);
+            query.filter_node ? query.dag : nullptr);
 
         if (!analyzed)
             continue;
@@ -193,13 +193,15 @@ std::optional<String> optimizeUseNormalProjections(Stack & stack, QueryPlan::Nod
     }
 
     auto storage_snapshot = reading->getStorageSnapshot();
-    auto proj_snapshot = std::make_shared<StorageSnapshot>(storage_snapshot->storage, best_candidate->projection->metadata);
+    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_reading = reader.readFromParts(
         /*parts=*/ {},
-        reading->getMutationsSnapshot()->cloneEmpty(),
+        /*alter_conversions=*/ {},
         required_columns,
         proj_snapshot,
         query_info_copy,
@@ -242,14 +244,14 @@ std::optional<String> optimizeUseNormalProjections(Stack & stack, QueryPlan::Nod
         {
             expr_or_filter_node.step = std::make_unique<FilterStep>(
                 projection_reading_node.step->getOutputStream(),
-                std::move(*query.dag),
+                query.dag,
                 query.filter_node->result_name,
                 true);
         }
         else
             expr_or_filter_node.step = std::make_unique<ExpressionStep>(
                 projection_reading_node.step->getOutputStream(),
-                std::move(*query.dag));
+                query.dag);
 
         expr_or_filter_node.children.push_back(&projection_reading_node);
         next_node = &expr_or_filter_node;
@@ -267,7 +269,7 @@ std::optional<String> optimizeUseNormalProjections(Stack & stack, QueryPlan::Nod
 
         if (auto materializing = makeMaterializingDAG(proj_stream->header, main_stream.header))
         {
-            auto converting = std::make_unique<ExpressionStep>(*proj_stream, std::move(*materializing));
+            auto converting = std::make_unique<ExpressionStep>(*proj_stream, materializing);
             proj_stream = &converting->getOutputStream();
             auto & expr_node = nodes.emplace_back();
             expr_node.step = std::move(converting);
diff --git a/src/Processors/QueryPlan/Optimizations/projectionsCommon.cpp b/src/Processors/QueryPlan/Optimizations/projectionsCommon.cpp
index 998b606ec57..4d60a1135a6 100644
--- a/src/Processors/QueryPlan/Optimizations/projectionsCommon.cpp
+++ b/src/Processors/QueryPlan/Optimizations/projectionsCommon.cpp
@@ -41,19 +41,12 @@ bool canUseProjectionForReadingStep(ReadFromMergeTree * reading)
     if (reading->readsInOrder())
         return false;
 
-    const auto & query_settings = reading->getContext()->getSettingsRef();
-
     // Currently projection don't support deduplication when moving parts between shards.
-    if (query_settings.allow_experimental_query_deduplication)
+    if (reading->getContext()->getSettingsRef().allow_experimental_query_deduplication)
         return false;
 
     // Currently projection don't support settings which implicitly modify aggregate functions.
-    if (query_settings.aggregate_functions_null_for_empty)
-        return false;
-
-    /// Don't use projections if have mutations to apply
-    /// because we need to apply them on original data.
-    if (query_settings.apply_mutations_on_fly && reading->getMutationsSnapshot()->hasDataMutations())
+    if (reading->getContext()->getSettingsRef().aggregate_functions_null_for_empty)
         return false;
 
     return true;
@@ -72,12 +65,12 @@ std::shared_ptr<PartitionIdToMaxBlock> getMaxAddedBlocks(ReadFromMergeTree * rea
     return {};
 }
 
-void QueryDAG::appendExpression(const ActionsDAG & expression)
+void QueryDAG::appendExpression(const ActionsDAGPtr & expression)
 {
     if (dag)
-        dag->mergeInplace(expression.clone());
+        dag->mergeInplace(std::move(*expression->clone()));
     else
-        dag = expression.clone();
+        dag = expression->clone();
 }
 
 const ActionsDAG::Node * findInOutputs(ActionsDAG & dag, const std::string & name, bool remove)
@@ -128,19 +121,22 @@ bool QueryDAG::buildImpl(QueryPlan::Node & node, ActionsDAG::NodeRawConstPtrs &
         {
             if (prewhere_info->row_level_filter)
             {
-                appendExpression(*prewhere_info->row_level_filter);
+                appendExpression(prewhere_info->row_level_filter);
                 if (const auto * filter_expression = findInOutputs(*dag, prewhere_info->row_level_column_name, false))
                     filter_nodes.push_back(filter_expression);
                 else
                     return false;
             }
 
-            appendExpression(prewhere_info->prewhere_actions);
-            if (const auto * filter_expression
-                = findInOutputs(*dag, prewhere_info->prewhere_column_name, prewhere_info->remove_prewhere_column))
-                filter_nodes.push_back(filter_expression);
-            else
-                return false;
+            if (prewhere_info->prewhere_actions)
+            {
+                appendExpression(prewhere_info->prewhere_actions);
+                if (const auto * filter_expression
+                    = findInOutputs(*dag, prewhere_info->prewhere_column_name, prewhere_info->remove_prewhere_column))
+                    filter_nodes.push_back(filter_expression);
+                else
+                    return false;
+            }
         }
         return true;
     }
@@ -154,7 +150,7 @@ bool QueryDAG::buildImpl(QueryPlan::Node & node, ActionsDAG::NodeRawConstPtrs &
     if (auto * expression = typeid_cast<ExpressionStep *>(step))
     {
         const auto & actions = expression->getExpression();
-        if (actions.hasArrayJoin())
+        if (actions->hasArrayJoin())
             return false;
 
         appendExpression(actions);
@@ -164,7 +160,7 @@ bool QueryDAG::buildImpl(QueryPlan::Node & node, ActionsDAG::NodeRawConstPtrs &
     if (auto * filter = typeid_cast<FilterStep *>(step))
     {
         const auto & actions = filter->getExpression();
-        if (actions.hasArrayJoin())
+        if (actions->hasArrayJoin())
             return false;
 
         appendExpression(actions);
@@ -218,19 +214,24 @@ bool analyzeProjectionCandidate(
     const SelectQueryInfo & query_info,
     const ContextPtr & context,
     const std::shared_ptr<PartitionIdToMaxBlock> & max_added_blocks,
-    const ActionsDAG * dag)
+    const ActionsDAGPtr & dag)
 {
     MergeTreeData::DataPartsVector projection_parts;
     MergeTreeData::DataPartsVector normal_parts;
-
+    std::vector<AlterConversionsPtr> alter_conversions;
     for (const auto & part_with_ranges : parts_with_ranges)
     {
         const auto & created_projections = part_with_ranges.data_part->getProjectionParts();
         auto it = created_projections.find(candidate.projection->name);
         if (it != created_projections.end() && !it->second->is_broken)
+        {
             projection_parts.push_back(it->second);
+        }
         else
+        {
             normal_parts.push_back(part_with_ranges.data_part);
+            alter_conversions.push_back(part_with_ranges.alter_conversions);
+        }
     }
 
     if (projection_parts.empty())
@@ -238,12 +239,10 @@ bool analyzeProjectionCandidate(
 
     auto projection_query_info = query_info;
     projection_query_info.prewhere_info = nullptr;
-    if (dag)
-        projection_query_info.filter_actions_dag = std::make_unique<ActionsDAG>(dag->clone());
+    projection_query_info.filter_actions_dag = dag;
 
     auto projection_result_ptr = reader.estimateNumMarksToRead(
         std::move(projection_parts),
-        reading.getMutationsSnapshot()->cloneEmpty(),
         required_column_names,
         candidate.projection->metadata,
         projection_query_info,
@@ -257,7 +256,7 @@ bool analyzeProjectionCandidate(
     if (!normal_parts.empty())
     {
         /// TODO: We can reuse existing analysis_result by filtering out projection parts
-        auto normal_result_ptr = reading.selectRangesToRead(std::move(normal_parts));
+        auto normal_result_ptr = reading.selectRangesToRead(std::move(normal_parts), std::move(alter_conversions));
 
         if (normal_result_ptr->selected_marks != 0)
         {
diff --git a/src/Processors/QueryPlan/Optimizations/projectionsCommon.h b/src/Processors/QueryPlan/Optimizations/projectionsCommon.h
index ee0dfddc326..e1e106b988e 100644
--- a/src/Processors/QueryPlan/Optimizations/projectionsCommon.h
+++ b/src/Processors/QueryPlan/Optimizations/projectionsCommon.h
@@ -25,14 +25,14 @@ std::shared_ptr<PartitionIdToMaxBlock> getMaxAddedBlocks(ReadFromMergeTree * rea
 /// Additionally, for all the Filter steps, we collect filter conditions into filter_nodes.
 struct QueryDAG
 {
-    std::optional<ActionsDAG> dag;
+    ActionsDAGPtr dag;
     const ActionsDAG::Node * filter_node = nullptr;
 
     bool build(QueryPlan::Node & node);
 
 private:
     bool buildImpl(QueryPlan::Node & node, ActionsDAG::NodeRawConstPtrs & filter_nodes);
-    void appendExpression(const ActionsDAG & expression);
+    void appendExpression(const ActionsDAGPtr & expression);
 };
 
 struct ProjectionCandidate
@@ -60,6 +60,6 @@ bool analyzeProjectionCandidate(
     const SelectQueryInfo & query_info,
     const ContextPtr & context,
     const std::shared_ptr<PartitionIdToMaxBlock> & max_added_blocks,
-    const ActionsDAG * dag);
+    const ActionsDAGPtr & dag);
 
 }
diff --git a/src/Processors/QueryPlan/Optimizations/removeRedundantDistinct.cpp b/src/Processors/QueryPlan/Optimizations/removeRedundantDistinct.cpp
index 7664822cc7e..51df25b35f4 100644
--- a/src/Processors/QueryPlan/Optimizations/removeRedundantDistinct.cpp
+++ b/src/Processors/QueryPlan/Optimizations/removeRedundantDistinct.cpp
@@ -43,10 +43,10 @@ namespace
         }
     }
 
-    void logActionsDAG(const String & prefix, const ActionsDAG & actions)
+    void logActionsDAG(const String & prefix, const ActionsDAGPtr & actions)
     {
         if constexpr (debug_logging_enabled)
-            LOG_DEBUG(getLogger("redundantDistinct"), "{} :\n{}", prefix, actions.dumpDAG());
+            LOG_DEBUG(getLogger("redundantDistinct"), "{} :\n{}", prefix, actions->dumpDAG());
     }
 
     using DistinctColumns = std::set<std::string_view>;
@@ -65,25 +65,25 @@ namespace
     }
 
     /// build actions DAG from stack of steps
-    std::optional<ActionsDAG> buildActionsForPlanPath(std::vector<const ActionsDAG *> & dag_stack)
+    ActionsDAGPtr buildActionsForPlanPath(std::vector<ActionsDAGPtr> & dag_stack)
     {
         if (dag_stack.empty())
-            return {};
+            return nullptr;
 
-        ActionsDAG path_actions = dag_stack.back()->clone();
+        ActionsDAGPtr path_actions = dag_stack.back()->clone();
         dag_stack.pop_back();
         while (!dag_stack.empty())
         {
-            ActionsDAG clone = dag_stack.back()->clone();
+            ActionsDAGPtr clone = dag_stack.back()->clone();
             logActionsDAG("DAG to merge", clone);
             dag_stack.pop_back();
-            path_actions.mergeInplace(std::move(clone));
+            path_actions->mergeInplace(std::move(*clone));
         }
         return path_actions;
     }
 
     bool compareAggregationKeysWithDistinctColumns(
-        const Names & aggregation_keys, const DistinctColumns & distinct_columns, std::vector<std::vector<const ActionsDAG *>> actions_chain)
+        const Names & aggregation_keys, const DistinctColumns & distinct_columns, std::vector<std::vector<ActionsDAGPtr>> actions_chain)
     {
         logDebug("aggregation_keys", aggregation_keys);
         logDebug("aggregation_keys size", aggregation_keys.size());
@@ -93,8 +93,7 @@ namespace
         std::set<String> source_columns;
         for (auto & actions : actions_chain)
         {
-            auto tmp_actions = buildActionsForPlanPath(actions);
-            FindOriginalNodeForOutputName original_node_finder(*tmp_actions);
+            FindOriginalNodeForOutputName original_node_finder(buildActionsForPlanPath(actions));
             for (const auto & column : current_columns)
             {
                 logDebug("distinct column name", column);
@@ -132,10 +131,10 @@ namespace
             return true;
 
         if (const auto * const expr = typeid_cast<const ExpressionStep *>(step); expr)
-            return !expr->getExpression().hasArrayJoin();
+            return !expr->getExpression()->hasArrayJoin();
 
         if (const auto * const filter = typeid_cast<const FilterStep *>(step); filter)
-            return !filter->getExpression().hasArrayJoin();
+            return !filter->getExpression()->hasArrayJoin();
 
         if (typeid_cast<const LimitStep *>(step) || typeid_cast<const LimitByStep *>(step) || typeid_cast<const SortingStep *>(step)
             || typeid_cast<const WindowStep *>(step))
@@ -153,8 +152,8 @@ namespace
         const DistinctStep * distinct_step = typeid_cast<DistinctStep *>(distinct_node->step.get());
         chassert(distinct_step);
 
-        std::vector<const ActionsDAG *> dag_stack;
-        std::vector<std::vector<const ActionsDAG *>> actions_chain;
+        std::vector<ActionsDAGPtr> dag_stack;
+        std::vector<std::vector<ActionsDAGPtr>> actions_chain;
         const DistinctStep * inner_distinct_step = nullptr;
         const IQueryPlanStep * aggregation_before_distinct = nullptr;
         const QueryPlan::Node * node = distinct_node;
@@ -183,9 +182,9 @@ namespace
             }
 
             if (const auto * const expr = typeid_cast<const ExpressionStep *>(current_step); expr)
-                dag_stack.push_back(&expr->getExpression());
+                dag_stack.push_back(expr->getExpression());
             else if (const auto * const filter = typeid_cast<const FilterStep *>(current_step); filter)
-                dag_stack.push_back(&filter->getExpression());
+                dag_stack.push_back(filter->getExpression());
 
             node = node->children.front();
             if (inner_distinct_step = typeid_cast<DistinctStep *>(node->step.get()); inner_distinct_step)
@@ -223,7 +222,7 @@ namespace
         chassert(distinct_step);
         const auto distinct_columns = getDistinctColumns(distinct_step);
 
-        std::vector<const ActionsDAG *> dag_stack;
+        std::vector<ActionsDAGPtr> dag_stack;
         const DistinctStep * inner_distinct_step = nullptr;
         const QueryPlan::Node * node = distinct_node;
         while (!node->children.empty())
@@ -236,9 +235,9 @@ namespace
             }
 
             if (const auto * const expr = typeid_cast<const ExpressionStep *>(current_step); expr)
-                dag_stack.push_back(&expr->getExpression());
+                dag_stack.push_back(expr->getExpression());
             else if (const auto * const filter = typeid_cast<const FilterStep *>(current_step); filter)
-                dag_stack.push_back(&filter->getExpression());
+                dag_stack.push_back(filter->getExpression());
 
             node = node->children.front();
             inner_distinct_step = typeid_cast<DistinctStep *>(node->step.get());
@@ -260,11 +259,11 @@ namespace
         if (distinct_columns.size() != inner_distinct_columns.size())
             return false;
 
-        ActionsDAG path_actions;
+        ActionsDAGPtr path_actions;
         if (!dag_stack.empty())
         {
             /// build actions DAG to find original column names
-            path_actions = std::move(*buildActionsForPlanPath(dag_stack));
+            path_actions = buildActionsForPlanPath(dag_stack);
             logActionsDAG("distinct pass: merged DAG", path_actions);
 
             /// compare columns of two DISTINCTs
diff --git a/src/Processors/QueryPlan/Optimizations/removeRedundantSorting.cpp b/src/Processors/QueryPlan/Optimizations/removeRedundantSorting.cpp
index f0094f0f8d2..e35cd20f102 100644
--- a/src/Processors/QueryPlan/Optimizations/removeRedundantSorting.cpp
+++ b/src/Processors/QueryPlan/Optimizations/removeRedundantSorting.cpp
@@ -215,12 +215,12 @@ private:
             logStep("checking for stateful function", node);
             if (const auto * expr = typeid_cast<const ExpressionStep *>(step); expr)
             {
-                if (expr->getExpression().hasStatefulFunctions())
+                if (expr->getExpression()->hasStatefulFunctions())
                     return false;
             }
             else if (const auto * filter = typeid_cast<const FilterStep *>(step); filter)
             {
-                if (filter->getExpression().hasStatefulFunctions())
+                if (filter->getExpression()->hasStatefulFunctions())
                     return false;
             }
             else
diff --git a/src/Processors/QueryPlan/Optimizations/splitFilter.cpp b/src/Processors/QueryPlan/Optimizations/splitFilter.cpp
index 6aed57634b0..561ad7302c6 100644
--- a/src/Processors/QueryPlan/Optimizations/splitFilter.cpp
+++ b/src/Processors/QueryPlan/Optimizations/splitFilter.cpp
@@ -17,13 +17,13 @@ size_t trySplitFilter(QueryPlan::Node * node, QueryPlan::Nodes & nodes)
     const std::string & filter_column_name = filter_step->getFilterColumnName();
 
     /// Do not split if there are function like runningDifference.
-    if (expr.hasStatefulFunctions())
+    if (expr->hasStatefulFunctions())
         return 0;
 
     bool filter_name_clashs_with_input = false;
     if (filter_step->removesFilterColumn())
     {
-        for (const auto * input : expr.getInputs())
+        for (const auto * input : expr->getInputs())
         {
             if (input->result_name == filter_column_name)
             {
@@ -33,14 +33,14 @@ size_t trySplitFilter(QueryPlan::Node * node, QueryPlan::Nodes & nodes)
         }
     }
 
-    auto split = expr.splitActionsForFilter(filter_column_name);
+    auto split = expr->splitActionsForFilter(filter_column_name);
 
-    if (split.second.trivial())
+    if (split.second->trivial())
         return 0;
 
     bool remove_filter = false;
     if (filter_step->removesFilterColumn())
-        remove_filter = split.second.removeUnusedResult(filter_column_name);
+        remove_filter = split.second->removeUnusedResult(filter_column_name);
 
     auto description = filter_step->getStepDescription();
 
@@ -53,11 +53,11 @@ size_t trySplitFilter(QueryPlan::Node * node, QueryPlan::Nodes & nodes)
     {
         split_filter_name = "__split_filter";
 
-        for (auto & filter_output : split.first.getOutputs())
+        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);
+                filter_output = &split.first->addAlias(*filter_output, split_filter_name);
                 break;
             }
         }
diff --git a/src/Processors/QueryPlan/Optimizations/useDataParallelAggregation.cpp b/src/Processors/QueryPlan/Optimizations/useDataParallelAggregation.cpp
index d943fea785b..124cb735d5a 100644
--- a/src/Processors/QueryPlan/Optimizations/useDataParallelAggregation.cpp
+++ b/src/Processors/QueryPlan/Optimizations/useDataParallelAggregation.cpp
@@ -74,11 +74,11 @@ void removeInjectiveFunctionsFromResultsRecursively(const ActionsDAG::Node * nod
 /// Our objective is to replace injective function nodes in `actions` results with its children
 /// until only the irreducible subset of nodes remains. Against these set of nodes we will match partition key expression
 /// to determine if it maps all rows with the same value of group by key to the same partition.
-NodeSet removeInjectiveFunctionsFromResultsRecursively(const ActionsDAG & actions)
+NodeSet removeInjectiveFunctionsFromResultsRecursively(const ActionsDAGPtr & actions)
 {
     NodeSet irreducible;
     NodeSet visited;
-    for (const auto & node : actions.getOutputs())
+    for (const auto & node : actions->getOutputs())
         removeInjectiveFunctionsFromResultsRecursively(node, irreducible, visited);
     return irreducible;
 }
@@ -146,19 +146,19 @@ bool allOutputsDependsOnlyOnAllowedNodes(
 /// 3. We match partition key actions with group by key actions to find col1', ..., coln' in partition key actions.
 /// 4. We check that partition key is indeed a deterministic function of col1', ..., coln'.
 bool isPartitionKeySuitsGroupByKey(
-    const ReadFromMergeTree & reading, const ActionsDAG & group_by_actions, const AggregatingStep & aggregating)
+    const ReadFromMergeTree & reading, const ActionsDAGPtr & group_by_actions, const AggregatingStep & aggregating)
 {
     if (aggregating.isGroupingSets())
         return false;
 
-    if (group_by_actions.hasArrayJoin() || group_by_actions.hasStatefulFunctions() || group_by_actions.hasNonDeterministic())
+    if (group_by_actions->hasArrayJoin() || group_by_actions->hasStatefulFunctions() || group_by_actions->hasNonDeterministic())
         return false;
 
     /// We are interested only in calculations required to obtain group by keys (and not aggregate function arguments for example).
-    auto key_nodes = group_by_actions.findInOutputs(aggregating.getParams().keys);
+    auto key_nodes = group_by_actions->findInOutpus(aggregating.getParams().keys);
     auto group_by_key_actions = ActionsDAG::cloneSubDAG(key_nodes, /*remove_aliases=*/ true);
 
-    const auto & gb_key_required_columns = group_by_key_actions.getRequiredColumnsNames();
+    const auto & gb_key_required_columns = group_by_key_actions->getRequiredColumnsNames();
 
     const auto & partition_actions = reading.getStorageMetadata()->getPartitionKey().expression->getActionsDAG();
 
@@ -169,7 +169,7 @@ bool isPartitionKeySuitsGroupByKey(
 
     const auto irreducibe_nodes = removeInjectiveFunctionsFromResultsRecursively(group_by_key_actions);
 
-    const auto matches = matchTrees(group_by_key_actions.getOutputs(), partition_actions);
+    const auto matches = matchTrees(group_by_key_actions->getOutputs(), partition_actions);
 
     return allOutputsDependsOnlyOnAllowedNodes(partition_actions, irreducibe_nodes, matches);
 }
diff --git a/src/Processors/QueryPlan/ParallelReplicasLocalPlan.cpp b/src/Processors/QueryPlan/ParallelReplicasLocalPlan.cpp
deleted file mode 100644
index 050044edd3a..00000000000
--- a/src/Processors/QueryPlan/ParallelReplicasLocalPlan.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#include <Processors/QueryPlan/ParallelReplicasLocalPlan.h>
-
-#include <Common/checkStackSize.h>
-#include <Interpreters/ActionsDAG.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/InterpreterSelectQueryAnalyzer.h>
-#include <Interpreters/StorageID.h>
-#include <Parsers/ASTFunction.h>
-#include <Processors/QueryPlan/ConvertingActions.h>
-#include <Processors/QueryPlan/ExpressionStep.h>
-#include <Processors/QueryPlan/ISourceStep.h>
-#include <Processors/QueryPlan/ReadFromMergeTree.h>
-#include <Processors/Sources/NullSource.h>
-#include <Processors/Transforms/ExpressionTransform.h>
-#include <Processors/Transforms/FilterTransform.h>
-#include <QueryPipeline/Pipe.h>
-#include <QueryPipeline/QueryPipelineBuilder.h>
-#include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
-#include <Storages/MergeTree/RequestResponse.h>
-
-namespace DB
-{
-
-std::pair<std::unique_ptr<QueryPlan>, bool> createLocalPlanForParallelReplicas(
-    const ASTPtr & query_ast,
-    const Block & header,
-    ContextPtr context,
-    QueryProcessingStage::Enum processed_stage,
-    ParallelReplicasReadingCoordinatorPtr coordinator,
-    QueryPlanStepPtr analyzed_read_from_merge_tree,
-    size_t replica_number)
-{
-    checkStackSize();
-
-    auto query_plan = std::make_unique<QueryPlan>();
-    auto new_context = Context::createCopy(context);
-
-    /// Do not push down limit to local plan, as it will break `rows_before_limit_at_least` counter.
-    if (processed_stage == QueryProcessingStage::WithMergeableStateAfterAggregationAndLimit)
-        processed_stage = QueryProcessingStage::WithMergeableStateAfterAggregation;
-
-    /// Do not apply AST optimizations, because query
-    /// is already optimized and some optimizations
-    /// can be applied only for non-distributed tables
-    /// and we can produce query, inconsistent with remote plans.
-    auto select_query_options = SelectQueryOptions(processed_stage).ignoreASTOptimizations();
-
-    /// For Analyzer, identifier in GROUP BY/ORDER BY/LIMIT BY lists has been resolved to
-    /// ConstantNode in QueryTree if it is an alias of a constant, so we should not replace
-    /// ConstantNode with ProjectionNode again(https://github.com/ClickHouse/ClickHouse/issues/62289).
-    new_context->setSetting("enable_positional_arguments", Field(false));
-    new_context->setSetting("allow_experimental_parallel_reading_from_replicas", Field(0));
-    auto interpreter = InterpreterSelectQueryAnalyzer(query_ast, new_context, select_query_options);
-    query_plan = std::make_unique<QueryPlan>(std::move(interpreter).extractQueryPlan());
-
-    QueryPlan::Node * node = query_plan->getRootNode();
-    ReadFromMergeTree * reading = nullptr;
-    while (node)
-    {
-        reading = typeid_cast<ReadFromMergeTree *>(node->step.get());
-        if (reading)
-            break;
-
-        if (!node->children.empty())
-            node = node->children.at(0);
-        else
-            node = nullptr;
-    }
-
-    if (!reading)
-        /// it can happened if merge tree table is empty, - it'll be replaced with ReadFromPreparedSource
-        return {std::move(query_plan), false};
-
-    ReadFromMergeTree::AnalysisResultPtr analyzed_result_ptr;
-    if (analyzed_read_from_merge_tree.get())
-    {
-        auto * analyzed_merge_tree = typeid_cast<ReadFromMergeTree *>(analyzed_read_from_merge_tree.get());
-        if (analyzed_merge_tree)
-            analyzed_result_ptr = analyzed_merge_tree->getAnalyzedResult();
-    }
-
-    MergeTreeAllRangesCallback all_ranges_cb = [coordinator](InitialAllRangesAnnouncement announcement)
-    { coordinator->handleInitialAllRangesAnnouncement(std::move(announcement)); };
-
-    MergeTreeReadTaskCallback read_task_cb = [coordinator](ParallelReadRequest req) -> std::optional<ParallelReadResponse>
-    { return coordinator->handleRequest(std::move(req)); };
-
-    auto read_from_merge_tree_parallel_replicas = reading->createLocalParallelReplicasReadingStep(
-        analyzed_result_ptr, std::move(all_ranges_cb), std::move(read_task_cb), replica_number);
-    node->step = std::move(read_from_merge_tree_parallel_replicas);
-
-    addConvertingActions(*query_plan, header, /*has_missing_objects=*/false);
-
-    return {std::move(query_plan), true};
-}
-
-}
diff --git a/src/Processors/QueryPlan/ParallelReplicasLocalPlan.h b/src/Processors/QueryPlan/ParallelReplicasLocalPlan.h
deleted file mode 100644
index ab0bbeaeeff..00000000000
--- a/src/Processors/QueryPlan/ParallelReplicasLocalPlan.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include <Core/QueryProcessingStage.h>
-#include <Parsers/IAST_fwd.h>
-#include <Processors/QueryPlan/QueryPlan.h>
-#include <Storages/MergeTree/ParallelReplicasReadingCoordinator.h>
-
-namespace DB
-{
-
-std::pair<std::unique_ptr<QueryPlan>, bool> createLocalPlanForParallelReplicas(
-    const ASTPtr & query_ast,
-    const Block & header,
-    ContextPtr context,
-    QueryProcessingStage::Enum processed_stage,
-    ParallelReplicasReadingCoordinatorPtr coordinator,
-    QueryPlanStepPtr read_from_merge_tree,
-    size_t replica_number);
-}
diff --git a/src/Processors/QueryPlan/PartsSplitter.cpp b/src/Processors/QueryPlan/PartsSplitter.cpp
index aaa1f53b5ee..ed4b1906635 100644
--- a/src/Processors/QueryPlan/PartsSplitter.cpp
+++ b/src/Processors/QueryPlan/PartsSplitter.cpp
@@ -49,10 +49,7 @@ bool isSafePrimaryDataKeyType(const IDataType & data_type)
         case TypeIndex::Float32:
         case TypeIndex::Float64:
         case TypeIndex::Nullable:
-        case TypeIndex::ObjectDeprecated:
         case TypeIndex::Object:
-        case TypeIndex::Variant:
-        case TypeIndex::Dynamic:
             return false;
         case TypeIndex::Array:
         {
@@ -79,6 +76,16 @@ bool isSafePrimaryDataKeyType(const IDataType & data_type)
             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;
@@ -222,6 +229,7 @@ public:
         {
             ranges_in_data_parts.emplace_back(
                 initial_ranges_in_data_parts[part_index].data_part,
+                initial_ranges_in_data_parts[part_index].alter_conversions,
                 initial_ranges_in_data_parts[part_index].part_index_in_query,
                 MarkRanges{mark_range});
             part_index_to_initial_ranges_in_data_parts_index[it->second] = part_index;
@@ -935,7 +943,7 @@ SplitPartsWithRangesByPrimaryKeyResult splitPartsWithRangesByPrimaryKey(
 
         auto syntax_result = TreeRewriter(context).analyze(filter_function, primary_key.expression->getRequiredColumnsWithTypes());
         auto actions = ExpressionAnalyzer(filter_function, syntax_result, context).getActionsDAG(false);
-        reorderColumns(actions, result.merging_pipes[i].getHeader(), filter_function->getColumnName());
+        reorderColumns(*actions, result.merging_pipes[i].getHeader(), filter_function->getColumnName());
         ExpressionActionsPtr expression_actions = std::make_shared<ExpressionActions>(std::move(actions));
         auto description = fmt::format(
             "filter values in ({}, {}]", i ? ::toString(borders[i - 1]) : "-inf", i < borders.size() ? ::toString(borders[i]) : "+inf");
diff --git a/src/Processors/QueryPlan/ReadFromMemoryStorageStep.cpp b/src/Processors/QueryPlan/ReadFromMemoryStorageStep.cpp
index 538e35ea554..6dc0c021a14 100644
--- a/src/Processors/QueryPlan/ReadFromMemoryStorageStep.cpp
+++ b/src/Processors/QueryPlan/ReadFromMemoryStorageStep.cpp
@@ -173,10 +173,7 @@ Pipe ReadFromMemoryStorageStep::makePipe()
 
     for (size_t stream = 0; stream < num_streams; ++stream)
     {
-        auto source = std::make_shared<MemorySource>(columns_to_read, storage_snapshot, current_data, parallel_execution_index);
-        if (stream == 0)
-            source->addTotalRowsApprox(snapshot_data.rows_approx);
-        pipes.emplace_back(std::move(source));
+        pipes.emplace_back(std::make_shared<MemorySource>(columns_to_read, storage_snapshot, current_data, parallel_execution_index));
     }
     return Pipe::unitePipes(std::move(pipes));
 }
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index 218f0a61a48..6e86d14f5cc 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -24,8 +24,8 @@
 #include <Processors/Transforms/SelectByIndicesTransform.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
-#include <Storages/MergeTree/MergeTreeIndexVectorSimilarity.h>
-#include <Storages/MergeTree/MergeTreeIndexLegacyVectorSimilarity.h>
+#include <Storages/MergeTree/MergeTreeIndexAnnoy.h>
+#include <Storages/MergeTree/MergeTreeIndexUSearch.h>
 #include <Storages/MergeTree/MergeTreeReadPool.h>
 #include <Storages/MergeTree/MergeTreePrefetchedReadPool.h>
 #include <Storages/MergeTree/MergeTreeReadPoolInOrder.h>
@@ -52,8 +52,6 @@
 #include <memory>
 #include <unordered_map>
 
-#include "config.h"
-
 using namespace DB;
 
 namespace
@@ -111,7 +109,8 @@ bool restorePrewhereInputs(PrewhereInfo & info, const NameSet & inputs)
     if (info.row_level_filter)
         added = added || restoreDAGInputs(*info.row_level_filter, inputs);
 
-    added = added || restoreDAGInputs(info.prewhere_actions, inputs);
+    if (info.prewhere_actions)
+        added = added || restoreDAGInputs(*info.prewhere_actions, inputs);
 
     return added;
 }
@@ -121,10 +120,8 @@ bool restorePrewhereInputs(PrewhereInfo & info, const NameSet & inputs)
 namespace ProfileEvents
 {
     extern const Event SelectedParts;
-    extern const Event SelectedPartsTotal;
     extern const Event SelectedRanges;
     extern const Event SelectedMarks;
-    extern const Event SelectedMarksTotal;
     extern const Event SelectQueriesWithPrimaryKeyUsage;
 }
 
@@ -178,6 +175,7 @@ static void updateSortDescriptionForOutputStream(
     Block original_header = output_stream.header.cloneEmpty();
     if (prewhere_info)
     {
+        if (prewhere_info->prewhere_actions)
         {
             FindOriginalNodeForOutputName original_column_finder(prewhere_info->prewhere_actions);
             for (auto & column : original_header)
@@ -190,7 +188,7 @@ static void updateSortDescriptionForOutputStream(
 
         if (prewhere_info->row_level_filter)
         {
-            FindOriginalNodeForOutputName original_column_finder(*prewhere_info->row_level_filter);
+            FindOriginalNodeForOutputName original_column_finder(prewhere_info->row_level_filter);
             for (auto & column : original_header)
             {
                 const auto * original_node = original_column_finder.find(column.name);
@@ -266,7 +264,7 @@ void ReadFromMergeTree::AnalysisResult::checkLimits(const Settings & settings, c
 
 ReadFromMergeTree::ReadFromMergeTree(
     MergeTreeData::DataPartsVector parts_,
-    MergeTreeData::MutationsSnapshotPtr mutations_,
+    std::vector<AlterConversionsPtr> alter_conversions_,
     Names all_column_names_,
     const MergeTreeData & data_,
     const SelectQueryInfo & query_info_,
@@ -277,19 +275,17 @@ ReadFromMergeTree::ReadFromMergeTree(
     std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read_,
     LoggerPtr log_,
     AnalysisResultPtr analyzed_result_ptr_,
-    bool enable_parallel_reading_,
-    std::optional<MergeTreeAllRangesCallback> all_ranges_callback_,
-    std::optional<MergeTreeReadTaskCallback> read_task_callback_,
-    std::optional<size_t> number_of_current_replica_)
+    bool enable_parallel_reading)
     : SourceStepWithFilter(DataStream{.header = MergeTreeSelectProcessor::transformHeader(
         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_))
-    , mutations_snapshot(std::move(mutations_))
+    , alter_conversions_for_parts(std::move(alter_conversions_))
     , all_column_names(std::move(all_column_names_))
     , data(data_)
     , actions_settings(ExpressionActionsSettings::fromContext(context_))
+    , metadata_for_reading(storage_snapshot->getMetadataForQuery())
     , block_size{
         .max_block_size_rows = max_block_size_,
         .preferred_block_size_bytes = context->getSettingsRef().preferred_block_size_bytes,
@@ -298,21 +294,13 @@ ReadFromMergeTree::ReadFromMergeTree(
     , max_block_numbers_to_read(std::move(max_block_numbers_to_read_))
     , log(std::move(log_))
     , analyzed_result_ptr(analyzed_result_ptr_)
-    , is_parallel_reading_from_replicas(enable_parallel_reading_)
+    , is_parallel_reading_from_replicas(enable_parallel_reading)
     , enable_remove_parts_from_snapshot_optimization(query_info_.merge_tree_enable_remove_parts_from_snapshot_optimization)
-    , number_of_current_replica(number_of_current_replica_)
 {
     if (is_parallel_reading_from_replicas)
     {
-        if (all_ranges_callback_.has_value())
-            all_ranges_callback = all_ranges_callback_.value();
-        else
-            all_ranges_callback = context->getMergeTreeAllRangesCallback();
-
-        if (read_task_callback_.has_value())
-            read_task_callback = read_task_callback_.value();
-        else
-            read_task_callback = context->getMergeTreeReadTaskCallback();
+        all_ranges_callback = context->getMergeTreeAllRangesCallback();
+        read_task_callback = context->getMergeTreeReadTaskCallback();
     }
 
     const auto & settings = context->getSettingsRef();
@@ -339,40 +327,18 @@ ReadFromMergeTree::ReadFromMergeTree(
 
     updateSortDescriptionForOutputStream(
         *output_stream,
-        storage_snapshot->metadata->getSortingKeyColumns(),
+        storage_snapshot->getMetadataForQuery()->getSortingKeyColumns(),
         getSortDirection(),
         query_info.input_order_info,
         prewhere_info,
         enable_vertical_final);
 }
 
-std::unique_ptr<ReadFromMergeTree> ReadFromMergeTree::createLocalParallelReplicasReadingStep(
-    AnalysisResultPtr analyzed_result_ptr_,
-    MergeTreeAllRangesCallback all_ranges_callback_,
-    MergeTreeReadTaskCallback read_task_callback_,
-    size_t replica_number)
-{
-    const bool enable_parallel_reading = true;
-    return std::make_unique<ReadFromMergeTree>(
-        prepared_parts,
-        mutations_snapshot,
-        all_column_names,
-        data,
-        getQueryInfo(),
-        getStorageSnapshot(),
-        getContext(),
-        block_size.max_block_size_rows,
-        requested_num_streams,
-        max_block_numbers_to_read,
-        log,
-        std::move(analyzed_result_ptr_),
-        enable_parallel_reading,
-        all_ranges_callback_,
-        read_task_callback_,
-        replica_number);
-}
 
-Pipe ReadFromMergeTree::readFromPoolParallelReplicas(RangesInDataParts parts_with_range, Names required_columns, PoolSettings pool_settings)
+Pipe ReadFromMergeTree::readFromPoolParallelReplicas(
+    RangesInDataParts parts_with_range,
+    Names required_columns,
+    PoolSettings pool_settings)
 {
     const auto & client_info = context->getClientInfo();
 
@@ -380,20 +346,12 @@ Pipe ReadFromMergeTree::readFromPoolParallelReplicas(RangesInDataParts parts_wit
     {
         .all_callback = all_ranges_callback.value(),
         .callback = read_task_callback.value(),
-        .number_of_current_replica = number_of_current_replica.value_or(client_info.number_of_current_replica),
+        .number_of_current_replica = client_info.number_of_current_replica,
     };
 
     /// We have a special logic for local replica. It has to read less data, because in some cases it should
     /// merge states of aggregate functions or do some other important stuff other than reading from Disk.
-    auto multiplier = context->getSettingsRef().parallel_replicas_single_task_marks_count_multiplier;
-    const auto min_marks_for_concurrent_read_limit = std::numeric_limits<Int64>::max() >> 1;
-    if (pool_settings.min_marks_for_concurrent_read > min_marks_for_concurrent_read_limit)
-    {
-        /// limit min marks to read in case it's big, happened in test since due to settings randomzation
-        pool_settings.min_marks_for_concurrent_read = min_marks_for_concurrent_read_limit;
-        multiplier = 1.0f;
-    }
-
+    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
@@ -405,7 +363,6 @@ Pipe ReadFromMergeTree::readFromPoolParallelReplicas(RangesInDataParts parts_wit
     auto pool = std::make_shared<MergeTreeReadPoolParallelReplicas>(
         std::move(extension),
         std::move(parts_with_range),
-        mutations_snapshot,
         shared_virtual_fields,
         storage_snapshot,
         prewhere_info,
@@ -487,7 +444,6 @@ Pipe ReadFromMergeTree::readFromPool(
     {
         pool = std::make_shared<MergeTreePrefetchedReadPool>(
             std::move(parts_with_range),
-            mutations_snapshot,
             shared_virtual_fields,
             storage_snapshot,
             prewhere_info,
@@ -501,7 +457,6 @@ Pipe ReadFromMergeTree::readFromPool(
     {
         pool = std::make_shared<MergeTreeReadPool>(
             std::move(parts_with_range),
-            mutations_snapshot,
             shared_virtual_fields,
             storage_snapshot,
             prewhere_info,
@@ -562,18 +517,10 @@ Pipe ReadFromMergeTree::readInOrder(
         {
             .all_callback = all_ranges_callback.value(),
             .callback = read_task_callback.value(),
-            .number_of_current_replica = number_of_current_replica.value_or(client_info.number_of_current_replica),
+            .number_of_current_replica = client_info.number_of_current_replica,
         };
 
-        auto multiplier = context->getSettingsRef().parallel_replicas_single_task_marks_count_multiplier;
-        const auto min_marks_for_concurrent_read_limit = std::numeric_limits<Int64>::max() >> 1;
-        if (pool_settings.min_marks_for_concurrent_read > min_marks_for_concurrent_read_limit)
-        {
-            /// limit min marks to read in case it's big, happened in test since due to settings randomzation
-            pool_settings.min_marks_for_concurrent_read = min_marks_for_concurrent_read_limit;
-            multiplier = 1.0f;
-        }
-
+        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
@@ -590,7 +537,6 @@ Pipe ReadFromMergeTree::readInOrder(
             std::move(extension),
             mode,
             parts_with_ranges,
-            mutations_snapshot,
             shared_virtual_fields,
             storage_snapshot,
             prewhere_info,
@@ -606,7 +552,6 @@ Pipe ReadFromMergeTree::readInOrder(
             has_limit_below_one_block,
             read_type,
             parts_with_ranges,
-            mutations_snapshot,
             shared_virtual_fields,
             storage_snapshot,
             prewhere_info,
@@ -617,12 +562,11 @@ Pipe ReadFromMergeTree::readInOrder(
             context);
     }
 
-    /// If parallel replicas enabled, set total rows in progress here only on initiator with local plan
-    /// Otherwise rows will counted multiple times
-    const UInt64 in_order_limit = query_info.input_order_info ? query_info.input_order_info->limit : 0;
-    const bool parallel_replicas_local_plan_for_initiator = is_parallel_reading_from_replicas
-        && context->getSettingsRef().parallel_replicas_local_plan && context->canUseParallelReplicasOnInitiator();
-    const bool set_total_rows_approx = !is_parallel_reading_from_replicas || parallel_replicas_local_plan_for_initiator;
+    /// Actually it means that parallel reading from replicas enabled
+    /// and we have to collaborate with initiator.
+    /// In this case we won't set approximate rows, because it will be accounted multiple times.
+    const auto in_order_limit = query_info.input_order_info ? query_info.input_order_info->limit : 0;
+    const bool set_total_rows_approx = !is_parallel_reading_from_replicas;
 
     Pipes pipes;
     for (size_t i = 0; i < parts_with_ranges.size(); ++i)
@@ -838,7 +782,7 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreams(RangesInDataParts && parts_
         Names in_order_column_names_to_read(column_names);
 
         /// Add columns needed to calculate the sorting expression
-        for (const auto & column_name : storage_snapshot->metadata->getColumnsRequiredForSortingKey())
+        for (const auto & column_name : metadata_for_reading->getColumnsRequiredForSortingKey())
         {
             if (column_names_set.contains(column_name))
                 continue;
@@ -858,10 +802,10 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreams(RangesInDataParts && parts_
                 info.use_uncompressed_cache);
         };
 
-        auto sorting_expr = storage_snapshot->metadata->getSortingKey().expression;
+        auto sorting_expr = std::make_shared<ExpressionActions>(metadata_for_reading->getSortingKey().expression->getActionsDAG().clone());
 
         SplitPartsWithRangesByPrimaryKeyResult split_ranges_result = splitPartsWithRangesByPrimaryKey(
-            storage_snapshot->metadata->getPrimaryKey(),
+            metadata_for_reading->getPrimaryKey(),
             std::move(sorting_expr),
             std::move(parts_with_ranges),
             num_streams,
@@ -890,10 +834,10 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreams(RangesInDataParts && parts_
             pipes[0].getHeader().getColumnsWithTypeAndName(),
             pipes[1].getHeader().getColumnsWithTypeAndName(),
             ActionsDAG::MatchColumnsMode::Name);
-        auto converting_expr = std::make_shared<ExpressionActions>(std::move(conversion_action));
         pipes[0].addSimpleTransform(
-            [converting_expr](const Block & header)
+            [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));
@@ -907,16 +851,16 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreams(RangesInDataParts && parts_
         info.use_uncompressed_cache);
 }
 
-static ActionsDAG createProjection(const Block & header)
+static ActionsDAGPtr createProjection(const Block & header)
 {
-    return ActionsDAG(header.getNamesAndTypesList());
+    return std::make_shared<ActionsDAG>(header.getNamesAndTypesList());
 }
 
 Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsWithOrder(
     RangesInDataParts && parts_with_ranges,
     size_t num_streams,
     const Names & column_names,
-    std::optional<ActionsDAG> & out_projection,
+    ActionsDAGPtr & out_projection,
     const InputOrderInfoPtr & input_order_info)
 {
     const auto & settings = context->getSettingsRef();
@@ -939,7 +883,7 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsWithOrder(
     if (prewhere_info)
     {
         NameSet sorting_columns;
-        for (const auto & column : storage_snapshot->metadata->getSortingKey().expression->getRequiredColumnsWithTypes())
+        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);
@@ -999,8 +943,6 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsWithOrder(
 
     PoolSettings pool_settings
     {
-        .threads = num_streams,
-        .sum_marks = parts_with_ranges.getMarksCountAllParts(),
         .min_marks_for_concurrent_read = info.min_marks_for_concurrent_read,
         .preferred_block_size_bytes = settings.preferred_block_size_bytes,
         .use_uncompressed_cache = info.use_uncompressed_cache,
@@ -1077,7 +1019,7 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsWithOrder(
                 }
 
                 ranges_to_get_from_part = split_ranges(ranges_to_get_from_part, input_order_info->direction);
-                new_parts.emplace_back(part.data_part, part.part_index_in_query, std::move(ranges_to_get_from_part));
+                new_parts.emplace_back(part.data_part, part.alter_conversions, part.part_index_in_query, std::move(ranges_to_get_from_part));
             }
 
             splitted_parts_and_ranges.emplace_back(std::move(new_parts));
@@ -1094,12 +1036,12 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsWithOrder(
     if (need_preliminary_merge || output_each_partition_through_separate_port)
     {
         size_t prefix_size = input_order_info->used_prefix_of_sorting_key_size;
-        auto order_key_prefix_ast = storage_snapshot->metadata->getSortingKey().expression_list_ast->clone();
+        auto order_key_prefix_ast = metadata_for_reading->getSortingKey().expression_list_ast->clone();
         order_key_prefix_ast->children.resize(prefix_size);
 
-        auto syntax_result = TreeRewriter(context).analyze(order_key_prefix_ast, storage_snapshot->metadata->getColumns().getAllPhysical());
+        auto syntax_result = TreeRewriter(context).analyze(order_key_prefix_ast, metadata_for_reading->getColumns().getAllPhysical());
         auto sorting_key_prefix_expr = ExpressionAnalyzer(order_key_prefix_ast, syntax_result, context).getActionsDAG(false);
-        const auto & sorting_columns = storage_snapshot->metadata->getSortingKey().column_names;
+        const auto & sorting_columns = metadata_for_reading->getSortingKey().column_names;
 
         SortDescription sort_description;
         sort_description.compile_sort_description = settings.compile_sort_description;
@@ -1108,7 +1050,7 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsWithOrder(
         for (size_t j = 0; j < prefix_size; ++j)
             sort_description.emplace_back(sorting_columns[j], input_order_info->direction);
 
-        auto sorting_key_expr = std::make_shared<ExpressionActions>(std::move(sorting_key_prefix_expr));
+        auto sorting_key_expr = std::make_shared<ExpressionActions>(sorting_key_prefix_expr);
 
         auto merge_streams = [&](Pipe & pipe)
         {
@@ -1206,7 +1148,7 @@ bool ReadFromMergeTree::doNotMergePartsAcrossPartitionsFinal() const
     if (settings.do_not_merge_across_partitions_select_final.changed)
         return settings.do_not_merge_across_partitions_select_final;
 
-    if (!storage_snapshot->metadata->hasPrimaryKey() || !storage_snapshot->metadata->hasPartitionKey())
+    if (!metadata_for_reading->hasPrimaryKey() || !metadata_for_reading->hasPartitionKey())
         return false;
 
     /** To avoid merging parts across partitions we want result of partition key expression for
@@ -1216,11 +1158,11 @@ bool ReadFromMergeTree::doNotMergePartsAcrossPartitionsFinal() const
       * in primary key, then for same primary key column values, result of partition key expression
       * will be the same.
       */
-    const auto & partition_key_expression = storage_snapshot->metadata->getPartitionKey().expression;
+    const auto & partition_key_expression = metadata_for_reading->getPartitionKey().expression;
     if (partition_key_expression->getActionsDAG().hasNonDeterministic())
         return false;
 
-    const auto & primary_key_columns = storage_snapshot->metadata->getPrimaryKey().column_names;
+    const auto & primary_key_columns = metadata_for_reading->getPrimaryKey().column_names;
     NameSet primary_key_columns_set(primary_key_columns.begin(), primary_key_columns.end());
 
     const auto & partition_key_required_columns = partition_key_expression->getRequiredColumns();
@@ -1232,7 +1174,7 @@ bool ReadFromMergeTree::doNotMergePartsAcrossPartitionsFinal() const
 }
 
 Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
-    RangesInDataParts && parts_with_ranges, size_t num_streams, const Names & origin_column_names, const Names & column_names, std::optional<ActionsDAG> & out_projection)
+    RangesInDataParts && parts_with_ranges, size_t num_streams, const Names & origin_column_names, const Names & column_names, ActionsDAGPtr & out_projection)
 {
     const auto & settings = context->getSettingsRef();
     const auto & data_settings = data.getSettings();
@@ -1273,12 +1215,12 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
     /// we will store lonely parts with level > 0 to use parallel select on them.
     RangesInDataParts non_intersecting_parts_by_primary_key;
 
-    auto sorting_expr = storage_snapshot->metadata->getSortingKey().expression;
+    auto sorting_expr = std::make_shared<ExpressionActions>(metadata_for_reading->getSortingKey().expression->getActionsDAG().clone());
 
     if (prewhere_info)
     {
         NameSet sorting_columns;
-        for (const auto & column : storage_snapshot->metadata->getSortingKey().expression->getRequiredColumnsWithTypes())
+        for (const auto & column : metadata_for_reading->getSortingKey().expression->getRequiredColumnsWithTypes())
             sorting_columns.insert(column.name);
         restorePrewhereInputs(*prewhere_info, sorting_columns);
     }
@@ -1304,12 +1246,12 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
             RangesInDataParts new_parts;
 
             for (auto part_it = parts_to_merge_ranges[range_index]; part_it != parts_to_merge_ranges[range_index + 1]; ++part_it)
-                new_parts.emplace_back(part_it->data_part, part_it->part_index_in_query, part_it->ranges);
+                new_parts.emplace_back(part_it->data_part, part_it->alter_conversions, part_it->part_index_in_query, part_it->ranges);
 
             if (new_parts.empty())
                 continue;
 
-            if (num_streams > 1 && storage_snapshot->metadata->hasPrimaryKey())
+            if (num_streams > 1 && metadata_for_reading->hasPrimaryKey())
             {
                 // Let's split parts into non intersecting parts ranges and layers to ensure data parallelism of FINAL.
                 auto in_order_reading_step_getter = [this, &column_names, &info](auto parts)
@@ -1329,7 +1271,7 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
                     data.merging_params.is_deleted_column.empty() && !reader_settings.read_in_order;
 
                 SplitPartsWithRangesByPrimaryKeyResult split_ranges_result = splitPartsWithRangesByPrimaryKey(
-                    storage_snapshot->metadata->getPrimaryKey(),
+                    metadata_for_reading->getPrimaryKey(),
                     sorting_expr,
                     std::move(new_parts),
                     num_streams,
@@ -1361,7 +1303,7 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
         if (pipes.empty())
             continue;
 
-        Names sort_columns = storage_snapshot->metadata->getSortingKeyColumns();
+        Names sort_columns = metadata_for_reading->getSortingKeyColumns();
         SortDescription sort_description;
         sort_description.compile_sort_description = settings.compile_sort_description;
         sort_description.min_count_to_compile_sort_description = settings.min_count_to_compile_sort_description;
@@ -1369,7 +1311,7 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
         size_t sort_columns_size = sort_columns.size();
         sort_description.reserve(sort_columns_size);
 
-        Names partition_key_columns = storage_snapshot->metadata->getPartitionKey().column_names;
+        Names partition_key_columns = metadata_for_reading->getPartitionKey().column_names;
 
         for (size_t i = 0; i < sort_columns_size; ++i)
             sort_description.emplace_back(sort_columns[i], 1, 1);
@@ -1394,7 +1336,7 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
 
     if (!merging_pipes.empty() && !no_merging_pipes.empty())
     {
-        out_projection = {}; /// We do projection here
+        out_projection = nullptr; /// We do projection here
         Pipes pipes;
         pipes.resize(2);
         pipes[0] = Pipe::unitePipes(std::move(merging_pipes));
@@ -1403,10 +1345,10 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
             pipes[0].getHeader().getColumnsWithTypeAndName(),
             pipes[1].getHeader().getColumnsWithTypeAndName(),
             ActionsDAG::MatchColumnsMode::Name);
-        auto converting_expr = std::make_shared<ExpressionActions>(std::move(conversion_action));
         pipes[0].addSimpleTransform(
-            [converting_expr](const Block & header)
+            [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));
@@ -1417,15 +1359,16 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
 
 ReadFromMergeTree::AnalysisResultPtr ReadFromMergeTree::selectRangesToRead(bool find_exact_ranges) const
 {
-    return selectRangesToRead(prepared_parts, find_exact_ranges);
+    return selectRangesToRead(prepared_parts, alter_conversions_for_parts, find_exact_ranges);
 }
 
-ReadFromMergeTree::AnalysisResultPtr ReadFromMergeTree::selectRangesToRead(MergeTreeData::DataPartsVector parts, bool find_exact_ranges) const
+ReadFromMergeTree::AnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
+    MergeTreeData::DataPartsVector parts, std::vector<AlterConversionsPtr> alter_conversions, bool find_exact_ranges) const
 {
     return selectRangesToRead(
         std::move(parts),
-        mutations_snapshot,
-        storage_snapshot->metadata,
+        std::move(alter_conversions),
+        metadata_for_reading,
         query_info,
         context,
         requested_num_streams,
@@ -1439,14 +1382,12 @@ ReadFromMergeTree::AnalysisResultPtr ReadFromMergeTree::selectRangesToRead(Merge
 
 static void buildIndexes(
     std::optional<ReadFromMergeTree::Indexes> & indexes,
-    const ActionsDAG * filter_actions_dag,
+    ActionsDAGPtr filter_actions_dag,
     const MergeTreeData & data,
     const MergeTreeData::DataPartsVector & parts,
-    const MergeTreeData::MutationsSnapshotPtr & mutations_snapshot,
     const ContextPtr & context,
     const SelectQueryInfo & query_info,
-    const StorageMetadataPtr & metadata_snapshot,
-    const LoggerPtr & log)
+    const StorageMetadataPtr & metadata_snapshot)
 {
     indexes.reset();
 
@@ -1456,8 +1397,11 @@ static void buildIndexes(
 
     const auto & settings = context->getSettingsRef();
 
-    indexes.emplace(
-        ReadFromMergeTree::Indexes{KeyCondition{filter_actions_dag, context, primary_key_column_names, primary_key.expression}});
+    indexes.emplace(ReadFromMergeTree::Indexes{{
+        filter_actions_dag,
+        context,
+        primary_key_column_names,
+        primary_key.expression}, {}, {}, {}, {}, false, {}});
 
     if (metadata_snapshot->hasPartitionKey())
     {
@@ -1469,21 +1413,19 @@ static void buildIndexes(
         indexes->partition_pruner.emplace(metadata_snapshot, filter_actions_dag, context, false /* strict */);
     }
 
-    indexes->part_values = MergeTreeDataSelectExecutor::filterPartsByVirtualColumns(metadata_snapshot, data, parts, filter_actions_dag, context);
+    indexes->part_values
+        = MergeTreeDataSelectExecutor::filterPartsByVirtualColumns(metadata_snapshot, data, parts, filter_actions_dag, context);
     MergeTreeDataSelectExecutor::buildKeyConditionFromPartOffset(indexes->part_offset_condition, filter_actions_dag, context);
 
     indexes->use_skip_indexes = settings.use_skip_indexes;
-    if (query_info.isFinal() && !settings.use_skip_indexes_if_final)
+    bool final = query_info.isFinal();
+
+    if (final && !settings.use_skip_indexes_if_final)
         indexes->use_skip_indexes = false;
 
     if (!indexes->use_skip_indexes)
         return;
 
-    const auto & all_indexes = metadata_snapshot->getSecondaryIndices();
-
-    if (all_indexes.empty())
-        return;
-
     std::unordered_set<std::string> ignored_index_names;
 
     if (settings.ignore_data_skipping_indices.changed)
@@ -1508,68 +1450,49 @@ static void buildIndexes(
             throw Exception(ErrorCodes::CANNOT_PARSE_TEXT, "Cannot parse ignore_data_skipping_indices ('{}')", indices);
     }
 
-    auto all_updated_columns = mutations_snapshot->getAllUpdatedColumns();
-
     UsefulSkipIndexes skip_indexes;
     using Key = std::pair<String, size_t>;
     std::map<Key, size_t> merged;
 
-    for (const auto & index : all_indexes)
+    for (const auto & index : metadata_snapshot->getSecondaryIndices())
     {
-        if (ignored_index_names.contains(index.name))
-            continue;
-
-        auto index_helper = MergeTreeIndexFactory::instance().get(index);
-
-        if (!all_updated_columns.empty())
+        if (!ignored_index_names.contains(index.name))
         {
-            auto required_columns = index_helper->getColumnsRequiredForIndexCalc();
-            auto it = std::ranges::find_if(required_columns, [&](const auto & column_name)
+            auto index_helper = MergeTreeIndexFactory::instance().get(index);
+            if (index_helper->isMergeable())
             {
-                return all_updated_columns.contains(column_name);
-            });
+                auto [it, inserted] = merged.emplace(Key{index_helper->index.type, index_helper->getGranularity()}, skip_indexes.merged_indices.size());
+                if (inserted)
+                {
+                    skip_indexes.merged_indices.emplace_back();
+                    skip_indexes.merged_indices.back().condition = index_helper->createIndexMergedCondition(query_info, metadata_snapshot);
+                }
 
-            if (it != required_columns.end())
-            {
-                LOG_TRACE(log, "Index {} is not used because it depends on column {} which will be updated on fly", index.name, *it);
-                continue;
+                skip_indexes.merged_indices[it->second].addIndex(index_helper);
             }
-        }
-
-        if (index_helper->isMergeable())
-        {
-            auto [it, inserted] = merged.emplace(Key{index_helper->index.type, index_helper->getGranularity()}, skip_indexes.merged_indices.size());
-            if (inserted)
+            else
             {
-                skip_indexes.merged_indices.emplace_back();
-                skip_indexes.merged_indices.back().condition = index_helper->createIndexMergedCondition(query_info, metadata_snapshot);
-            }
-
-            skip_indexes.merged_indices[it->second].addIndex(index_helper);
-            continue;
-        }
-
-        MergeTreeIndexConditionPtr condition;
-
-        if (index_helper->isVectorSimilarityIndex())
-        {
-#if USE_USEARCH
-            if (const auto * vector_similarity_index = typeid_cast<const MergeTreeIndexVectorSimilarity *>(index_helper.get()))
-                condition = vector_similarity_index->createIndexCondition(query_info, context);
+                MergeTreeIndexConditionPtr condition;
+                if (index_helper->isVectorSearch())
+                {
+#ifdef ENABLE_ANNOY
+                    if (const auto * annoy = typeid_cast<const MergeTreeIndexAnnoy *>(index_helper.get()))
+                        condition = annoy->createIndexCondition(query_info, context);
 #endif
-            if (const auto * legacy_vector_similarity_index = typeid_cast<const MergeTreeIndexLegacyVectorSimilarity *>(index_helper.get()))
-                condition = legacy_vector_similarity_index->createIndexCondition(query_info, context);
+#ifdef ENABLE_USEARCH
+                    if (const auto * usearch = typeid_cast<const MergeTreeIndexUSearch *>(index_helper.get()))
+                        condition = usearch->createIndexCondition(query_info, context);
+#endif
+                    if (!condition)
+                        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown vector search index {}", index_helper->index.name);
+                }
+                else
+                    condition = index_helper->createIndexCondition(filter_actions_dag, context);
 
-            if (!condition)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown vector search index {}", index_helper->index.name);
+                if (!condition->alwaysUnknownOrTrue())
+                    skip_indexes.useful_indices.emplace_back(index_helper, condition);
+            }
         }
-        else
-        {
-            condition = index_helper->createIndexCondition(filter_actions_dag, context);
-        }
-
-        if (!condition->alwaysUnknownOrTrue())
-            skip_indexes.useful_indices.emplace_back(index_helper, condition);
     }
 
     // move minmax indices to first positions, so they will be applied first as cheapest ones
@@ -1599,25 +1522,22 @@ void ReadFromMergeTree::applyFilters(ActionDAGNodes added_filter_nodes)
         /// (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.
-        if (filter_actions_dag)
-            query_info.filter_actions_dag = std::make_shared<const ActionsDAG>(filter_actions_dag->clone());
+        query_info.filter_actions_dag = filter_actions_dag;
 
         buildIndexes(
             indexes,
-            query_info.filter_actions_dag.get(),
+            filter_actions_dag,
             data,
             prepared_parts,
-            mutations_snapshot,
             context,
             query_info,
-            storage_snapshot->metadata,
-            log);
+            metadata_for_reading);
     }
 }
 
 ReadFromMergeTree::AnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
     MergeTreeData::DataPartsVector parts,
-    MergeTreeData::MutationsSnapshotPtr mutations_snapshot,
+    std::vector<AlterConversionsPtr> alter_conversions,
     const StorageMetadataPtr & metadata_snapshot,
     const SelectQueryInfo & query_info_,
     ContextPtr context_,
@@ -1648,7 +1568,7 @@ ReadFromMergeTree::AnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
     const Names & primary_key_column_names = primary_key.column_names;
 
     if (!indexes)
-        buildIndexes(indexes, query_info_.filter_actions_dag.get(), data, parts, mutations_snapshot, context_, query_info_, metadata_snapshot, log);
+        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));
@@ -1679,9 +1599,10 @@ ReadFromMergeTree::AnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
 
     {
         MergeTreeDataSelectExecutor::filterPartsByPartition(
-            parts,
             indexes->partition_pruner,
             indexes->minmax_idx_condition,
+            parts,
+            alter_conversions,
             indexes->part_values,
             metadata_snapshot,
             data,
@@ -1710,6 +1631,7 @@ ReadFromMergeTree::AnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
         auto reader_settings = getMergeTreeReaderSettings(context_, query_info_);
         result.parts_with_ranges = MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipIndexes(
             std::move(parts),
+            std::move(alter_conversions),
             metadata_snapshot,
             context_,
             indexes->key_condition,
@@ -1778,7 +1700,7 @@ bool ReadFromMergeTree::requestReadingInOrder(size_t prefix_size, int direction,
 
     /// update sort info for output stream
     SortDescription sort_description;
-    const Names & sorting_key_columns = storage_snapshot->metadata->getSortingKeyColumns();
+    const Names & sorting_key_columns = metadata_for_reading->getSortingKeyColumns();
     const Block & header = output_stream->header;
     const int sort_direction = getSortDirection();
     for (const auto & column_name : sorting_key_columns)
@@ -1820,7 +1742,7 @@ void ReadFromMergeTree::updatePrewhereInfo(const PrewhereInfoPtr & prewhere_info
 
     updateSortDescriptionForOutputStream(
         *output_stream,
-        storage_snapshot->metadata->getSortingKeyColumns(),
+        storage_snapshot->getMetadataForQuery()->getSortingKeyColumns(),
         getSortDirection(),
         query_info.input_order_info,
         prewhere_info,
@@ -1914,7 +1836,7 @@ bool ReadFromMergeTree::isQueryWithSampling() const
 }
 
 Pipe ReadFromMergeTree::spreadMarkRanges(
-    RangesInDataParts && parts_with_ranges, size_t num_streams, AnalysisResult & result, std::optional<ActionsDAG> & result_projection)
+    RangesInDataParts && parts_with_ranges, size_t num_streams, AnalysisResult & result, ActionsDAGPtr & result_projection)
 {
     const bool final = isQueryWithFinal();
     Names column_names_to_read = result.column_names_to_read;
@@ -1946,7 +1868,7 @@ Pipe ReadFromMergeTree::spreadMarkRanges(
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Optimization isn't supposed to be used for queries with final");
 
         /// Add columns needed to calculate the sorting expression and the sign.
-        for (const auto & column : storage_snapshot->metadata->getColumnsRequiredForSortingKey())
+        for (const auto & column : metadata_for_reading->getColumnsRequiredForSortingKey())
         {
             if (!names.contains(column))
             {
@@ -1975,7 +1897,7 @@ Pipe ReadFromMergeTree::spreadMarkRanges(
     }
 }
 
-Pipe ReadFromMergeTree::groupStreamsByPartition(AnalysisResult & result, std::optional<ActionsDAG> & result_projection)
+Pipe ReadFromMergeTree::groupStreamsByPartition(AnalysisResult & result, ActionsDAGPtr & result_projection)
 {
     auto && parts_with_ranges = std::move(result.parts_with_ranges);
 
@@ -2009,33 +1931,6 @@ void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, cons
 {
     auto result = getAnalysisResult();
 
-    if (is_parallel_reading_from_replicas && context->canUseParallelReplicasOnInitiator()
-        && context->getSettingsRef().parallel_replicas_local_plan)
-    {
-        CoordinationMode mode = CoordinationMode::Default;
-        switch (result.read_type)
-        {
-            case ReadFromMergeTree::ReadType::Default:
-                mode = CoordinationMode::Default;
-                break;
-            case ReadFromMergeTree::ReadType::InOrder:
-                mode = CoordinationMode::WithOrder;
-                break;
-            case ReadFromMergeTree::ReadType::InReverseOrder:
-                mode = CoordinationMode::ReverseOrder;
-                break;
-            case ReadFromMergeTree::ReadType::ParallelReplicas:
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Read type can't be ParallelReplicas on initiator");
-        }
-
-        chassert(number_of_current_replica.has_value());
-        chassert(all_ranges_callback.has_value());
-
-        /// initialize working set from local replica
-        all_ranges_callback.value()(
-            InitialAllRangesAnnouncement(mode, result.parts_with_ranges.getDescriptions(), number_of_current_replica.value()));
-    }
-
     if (enable_remove_parts_from_snapshot_optimization)
     {
         /// Do not keep data parts in snapshot.
@@ -2067,13 +1962,15 @@ void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, cons
                 fmt::format("{}.{}", data.getStorageID().getFullNameNotQuoted(), part.data_part->info.partition_id));
         }
         context->getQueryContext()->addQueryAccessInfo(partition_names);
+
+        if (storage_snapshot->projection)
+            context->getQueryContext()->addQueryAccessInfo(
+                Context::QualifiedProjectionName{.storage_id = data.getStorageID(), .projection_name = storage_snapshot->projection->name});
     }
 
     ProfileEvents::increment(ProfileEvents::SelectedParts, result.selected_parts);
-    ProfileEvents::increment(ProfileEvents::SelectedPartsTotal, result.total_parts);
     ProfileEvents::increment(ProfileEvents::SelectedRanges, result.selected_ranges);
     ProfileEvents::increment(ProfileEvents::SelectedMarks, result.selected_marks);
-    ProfileEvents::increment(ProfileEvents::SelectedMarksTotal, result.total_marks_pk);
 
     auto query_id_holder = MergeTreeDataSelectExecutor::checkLimits(data, result, context);
 
@@ -2089,7 +1986,7 @@ void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, cons
     /// Projection, that needed to drop columns, which have appeared by execution
     /// of some extra expressions, and to allow execute the same expressions later.
     /// NOTE: It may lead to double computation of expressions.
-    std::optional<ActionsDAG> result_projection;
+    ActionsDAGPtr result_projection;
 
     Pipe pipe = output_each_partition_through_separate_port
         ? groupStreamsByPartition(result, result_projection)
@@ -2106,7 +2003,7 @@ void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, cons
 
     if (result.sampling.use_sampling)
     {
-        auto sampling_actions = std::make_shared<ExpressionActions>(result.sampling.filter_expression->clone());
+        auto sampling_actions = std::make_shared<ExpressionActions>(result.sampling.filter_expression);
         pipe.addSimpleTransform([&](const Block & header)
         {
             return std::make_shared<FilterTransform>(
@@ -2119,12 +2016,12 @@ void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, cons
 
     Block cur_header = pipe.getHeader();
 
-    auto append_actions = [&result_projection](ActionsDAG actions)
+    auto append_actions = [&result_projection](ActionsDAGPtr actions)
     {
         if (!result_projection)
             result_projection = std::move(actions);
         else
-            result_projection = ActionsDAG::merge(std::move(*result_projection), std::move(actions));
+            result_projection = ActionsDAG::merge(std::move(*result_projection), std::move(*actions));
     };
 
     if (result_projection)
@@ -2144,7 +2041,7 @@ void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, cons
 
     if (result_projection)
     {
-        auto projection_actions = std::make_shared<ExpressionActions>(std::move(*result_projection));
+        auto projection_actions = std::make_shared<ExpressionActions>(result_projection);
         pipe.addSimpleTransform([&](const Block & header)
         {
             return std::make_shared<ExpressionTransform>(header, projection_actions);
@@ -2161,7 +2058,7 @@ void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, cons
             ActionsDAG::MatchColumnsMode::Name,
             true);
 
-        auto converting_dag_expr = std::make_shared<ExpressionActions>(std::move(convert_actions_dag));
+        auto converting_dag_expr = std::make_shared<ExpressionActions>(convert_actions_dag);
 
         pipe.addSimpleTransform([&](const Block & header)
         {
@@ -2231,6 +2128,7 @@ void ReadFromMergeTree::describeActions(FormatSettings & format_settings) const
         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;
@@ -2238,7 +2136,7 @@ void ReadFromMergeTree::describeActions(FormatSettings & format_settings) const
                format_settings.out << " (removed)";
             format_settings.out << '\n';
 
-            auto expression = std::make_shared<ExpressionActions>(prewhere_info->prewhere_actions.clone());
+            auto expression = std::make_shared<ExpressionActions>(prewhere_info->prewhere_actions);
             expression->describeActions(format_settings.out, prefix);
         }
 
@@ -2247,7 +2145,7 @@ void ReadFromMergeTree::describeActions(FormatSettings & format_settings) const
             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->clone());
+            auto expression = std::make_shared<ExpressionActions>(prewhere_info->row_level_filter);
             expression->describeActions(format_settings.out, prefix);
         }
     }
@@ -2268,11 +2166,12 @@ void ReadFromMergeTree::describeActions(JSONBuilder::JSONMap & map) const
         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.clone());
+            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));
@@ -2282,7 +2181,7 @@ void ReadFromMergeTree::describeActions(JSONBuilder::JSONMap & map) const
         {
             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->clone());
+            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));
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.h b/src/Processors/QueryPlan/ReadFromMergeTree.h
index 60707c406b3..caa8aa2e1bd 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.h
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.h
@@ -23,7 +23,7 @@ struct MergeTreeDataSelectSamplingData
     bool read_nothing = false;
     Float64 used_sample_factor = 1.0;
     std::shared_ptr<ASTFunction> filter_function;
-    std::shared_ptr<const ActionsDAG> filter_expression;
+    ActionsDAGPtr filter_expression;
 };
 
 struct UsefulSkipIndexes
@@ -110,7 +110,7 @@ public:
 
     ReadFromMergeTree(
         MergeTreeData::DataPartsVector parts_,
-        MergeTreeData::MutationsSnapshotPtr mutations_snapshot_,
+        std::vector<AlterConversionsPtr> alter_conversions_,
         Names all_column_names_,
         const MergeTreeData & data_,
         const SelectQueryInfo & query_info_,
@@ -121,16 +121,7 @@ public:
         std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read_,
         LoggerPtr log_,
         AnalysisResultPtr analyzed_result_ptr_,
-        bool enable_parallel_reading_,
-        std::optional<MergeTreeAllRangesCallback> all_ranges_callback_ = std::nullopt,
-        std::optional<MergeTreeReadTaskCallback> read_task_callback_ = std::nullopt,
-        std::optional<size_t> number_of_current_replica_ = std::nullopt);
-
-    std::unique_ptr<ReadFromMergeTree> createLocalParallelReplicasReadingStep(
-        AnalysisResultPtr analyzed_result_ptr_,
-        MergeTreeAllRangesCallback all_ranges_callback_,
-        MergeTreeReadTaskCallback read_task_callback_,
-        size_t replica_number);
+        bool enable_parallel_reading);
 
     static constexpr auto name = "ReadFromMergeTree";
     String getName() const override { return name; }
@@ -152,11 +143,6 @@ public:
 
     struct Indexes
     {
-        explicit Indexes(KeyCondition key_condition_)
-            : key_condition(std::move(key_condition_))
-            , use_skip_indexes(false)
-        {}
-
         KeyCondition key_condition;
         std::optional<PartitionPruner> partition_pruner;
         std::optional<KeyCondition> minmax_idx_condition;
@@ -168,7 +154,7 @@ public:
 
     static AnalysisResultPtr selectRangesToRead(
         MergeTreeData::DataPartsVector parts,
-        MergeTreeData::MutationsSnapshotPtr mutations_snapshot,
+        std::vector<AlterConversionsPtr> alter_conversions,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
         ContextPtr context,
@@ -180,11 +166,12 @@ public:
         std::optional<Indexes> & indexes,
         bool find_exact_ranges);
 
-    AnalysisResultPtr selectRangesToRead(MergeTreeData::DataPartsVector parts, bool find_exact_ranges = false) const;
+    AnalysisResultPtr selectRangesToRead(
+        MergeTreeData::DataPartsVector parts, std::vector<AlterConversionsPtr> alter_conversions, bool find_exact_ranges = false) const;
 
     AnalysisResultPtr selectRangesToRead(bool find_exact_ranges = false) const;
 
-    StorageMetadataPtr getStorageMetadata() const { return storage_snapshot->metadata; }
+    StorageMetadataPtr getStorageMetadata() const { return metadata_for_reading; }
 
     /// Returns `false` if requested reading cannot be performed.
     bool requestReadingInOrder(size_t prefix_size, int direction, size_t limit);
@@ -201,7 +188,7 @@ public:
     void setAnalyzedResult(AnalysisResultPtr analyzed_result_ptr_) { analyzed_result_ptr = std::move(analyzed_result_ptr_); }
 
     const MergeTreeData::DataPartsVector & getParts() const { return prepared_parts; }
-    MergeTreeData::MutationsSnapshotPtr getMutationsSnapshot() const { return mutations_snapshot; }
+    const std::vector<AlterConversionsPtr> & getAlterConvertionsForParts() const { return alter_conversions_for_parts; }
 
     const MergeTreeData & getMergeTreeData() const { return data; }
     size_t getMaxBlockSize() const { return block_size.max_block_size_rows; }
@@ -222,13 +209,15 @@ private:
     MergeTreeReaderSettings reader_settings;
 
     MergeTreeData::DataPartsVector prepared_parts;
-    MergeTreeData::MutationsSnapshotPtr mutations_snapshot;
+    std::vector<AlterConversionsPtr> alter_conversions_for_parts;
 
     Names all_column_names;
 
     const MergeTreeData & data;
     ExpressionActionsSettings actions_settings;
 
+    StorageMetadataPtr metadata_for_reading;
+
     const MergeTreeReadTask::BlockSizeParams block_size;
 
     size_t requested_num_streams;
@@ -254,9 +243,9 @@ private:
     Pipe readFromPoolParallelReplicas(RangesInDataParts parts_with_range, Names required_columns, PoolSettings pool_settings);
     Pipe readInOrder(RangesInDataParts parts_with_ranges, Names required_columns, PoolSettings pool_settings, ReadType read_type, UInt64 limit);
 
-    Pipe spreadMarkRanges(RangesInDataParts && parts_with_ranges, size_t num_streams, AnalysisResult & result, std::optional<ActionsDAG> & result_projection);
+    Pipe spreadMarkRanges(RangesInDataParts && parts_with_ranges, size_t num_streams, AnalysisResult & result, ActionsDAGPtr & result_projection);
 
-    Pipe groupStreamsByPartition(AnalysisResult & result, std::optional<ActionsDAG> & result_projection);
+    Pipe groupStreamsByPartition(AnalysisResult & result, ActionsDAGPtr & result_projection);
 
     Pipe spreadMarkRangesAmongStreams(RangesInDataParts && parts_with_ranges, size_t num_streams, const Names & column_names);
 
@@ -264,13 +253,13 @@ private:
         RangesInDataParts && parts_with_ranges,
         size_t num_streams,
         const Names & column_names,
-        std::optional<ActionsDAG> & out_projection,
+        ActionsDAGPtr & out_projection,
         const InputOrderInfoPtr & input_order_info);
 
     bool doNotMergePartsAcrossPartitionsFinal() const;
 
     Pipe spreadMarkRangesAmongStreamsFinal(
-        RangesInDataParts && parts, size_t num_streams, const Names & origin_column_names, const Names & column_names, std::optional<ActionsDAG> & out_projection);
+        RangesInDataParts && parts, size_t num_streams, const Names & origin_column_names, const Names & column_names, ActionsDAGPtr & out_projection);
 
     ReadFromMergeTree::AnalysisResult getAnalysisResult() const;
 
@@ -282,7 +271,6 @@ private:
     std::optional<MergeTreeReadTaskCallback> read_task_callback;
     bool enable_vertical_final = false;
     bool enable_remove_parts_from_snapshot_optimization = true;
-    std::optional<size_t> number_of_current_replica;
 };
 
 }
diff --git a/src/Processors/QueryPlan/ReadFromRemote.cpp b/src/Processors/QueryPlan/ReadFromRemote.cpp
index 3df46eb1987..e27515a62a4 100644
--- a/src/Processors/QueryPlan/ReadFromRemote.cpp
+++ b/src/Processors/QueryPlan/ReadFromRemote.cpp
@@ -22,7 +22,7 @@
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Parsers/ASTFunction.h>
 
-#include <fmt/format.h>
+#include <boost/algorithm/string/join.hpp>
 
 namespace DB
 {
@@ -370,9 +370,7 @@ ReadFromParallelRemoteReplicasStep::ReadFromParallelRemoteReplicasStep(
     Scalars scalars_,
     Tables external_tables_,
     LoggerPtr log_,
-    std::shared_ptr<const StorageLimitsList> storage_limits_,
-    std::vector<ConnectionPoolPtr> pools_to_use_,
-    std::optional<size_t> exclude_pool_index_)
+    std::shared_ptr<const StorageLimitsList> storage_limits_)
     : ISourceStep(DataStream{.header = std::move(header_)})
     , cluster(cluster_)
     , query_ast(query_ast_)
@@ -385,24 +383,16 @@ ReadFromParallelRemoteReplicasStep::ReadFromParallelRemoteReplicasStep(
     , external_tables{external_tables_}
     , storage_limits(std::move(storage_limits_))
     , log(log_)
-    , pools_to_use(std::move(pools_to_use_))
-    , exclude_pool_index(exclude_pool_index_)
 {
     chassert(cluster->getShardCount() == 1);
 
-    std::vector<String> replicas;
-    replicas.reserve(pools_to_use.size());
+    std::vector<String> description;
+    description.push_back(fmt::format("query: {}", formattedAST(query_ast)));
 
-    for (size_t i = 0, l = pools_to_use.size(); i < l; ++i)
-    {
-        if (exclude_pool_index.has_value() && i == exclude_pool_index)
-            continue;
+    for (const auto & pool : cluster->getShardsInfo().front().per_replica_pools)
+        description.push_back(fmt::format("Replica: {}", pool->getHost()));
 
-        replicas.push_back(pools_to_use[i]->getAddress());
-    }
-
-    auto description = fmt::format("Query: {} Replicas: {}", formattedAST(query_ast), fmt::join(replicas, ", "));
-    setStepDescription(std::move(description));
+    setStepDescription(boost::algorithm::join(description, ", "));
 }
 
 void ReadFromParallelRemoteReplicasStep::enforceSorting(SortDescription output_sort_description)
@@ -418,29 +408,45 @@ void ReadFromParallelRemoteReplicasStep::enforceAggregationInOrder()
 void ReadFromParallelRemoteReplicasStep::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     Pipes pipes;
+    const Settings & current_settings = context->getSettingsRef();
+    auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(current_settings);
 
-    std::vector<std::string_view> addresses;
-    addresses.reserve(pools_to_use.size());
-    for (size_t i = 0, l = pools_to_use.size(); i < l; ++i)
+    const auto & shard = cluster->getShardsInfo().at(0);
+    size_t max_replicas_to_use = current_settings.max_parallel_replicas;
+    if (max_replicas_to_use > shard.getAllNodeCount())
     {
-        if (exclude_pool_index.has_value() && i == exclude_pool_index)
-            continue;
-
-        addresses.emplace_back(pools_to_use[i]->getAddress());
+        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());
+        max_replicas_to_use = shard.getAllNodeCount();
     }
-    LOG_DEBUG(getLogger("ReadFromParallelRemoteReplicasStep"), "Addresses to use: {}", fmt::join(addresses, ", "));
 
-    for (size_t i = 0, l = pools_to_use.size(); i < l; ++i)
+    std::vector<ConnectionPoolWithFailover::Base::ShuffledPool> shuffled_pool;
+    if (max_replicas_to_use < shard.getAllNodeCount())
     {
-        if (exclude_pool_index.has_value() && i == exclude_pool_index)
-            continue;
+        shuffled_pool = shard.pool->getShuffledPools(current_settings);
+        shuffled_pool.resize(max_replicas_to_use);
+    }
+    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);
+    }
 
-        IConnections::ReplicaInfo replica_info{
+    for (size_t i=0; i < max_replicas_to_use; ++i)
+    {
+        IConnections::ReplicaInfo replica_info
+        {
             /// we should use this number specifically because efficiency of data distribution by consistent hash depends on it.
             .number_of_current_replica = i,
         };
 
-        addPipeForSingeReplica(pipes, pools_to_use[i], replica_info);
+        addPipeForSingeReplica(pipes, shuffled_pool[i].pool, replica_info);
     }
 
     auto pipe = Pipe::unitePipes(std::move(pipes));
diff --git a/src/Processors/QueryPlan/ReadFromRemote.h b/src/Processors/QueryPlan/ReadFromRemote.h
index 74389c8f9eb..eb15269155a 100644
--- a/src/Processors/QueryPlan/ReadFromRemote.h
+++ b/src/Processors/QueryPlan/ReadFromRemote.h
@@ -78,9 +78,7 @@ public:
         Scalars scalars_,
         Tables external_tables_,
         LoggerPtr log_,
-        std::shared_ptr<const StorageLimitsList> storage_limits_,
-        std::vector<ConnectionPoolPtr> pools_to_use,
-        std::optional<size_t> exclude_pool_index_ = std::nullopt);
+        std::shared_ptr<const StorageLimitsList> storage_limits_);
 
     String getName() const override { return "ReadFromRemoteParallelReplicas"; }
 
@@ -103,8 +101,6 @@ private:
     Tables external_tables;
     std::shared_ptr<const StorageLimitsList> storage_limits;
     LoggerPtr log;
-    std::vector<ConnectionPoolPtr> pools_to_use;
-    std::optional<size_t> exclude_pool_index;
 };
 
 }
diff --git a/src/Processors/QueryPlan/ReadFromSystemNumbersStep.cpp b/src/Processors/QueryPlan/ReadFromSystemNumbersStep.cpp
index 596d08845e1..b070bbe739b 100644
--- a/src/Processors/QueryPlan/ReadFromSystemNumbersStep.cpp
+++ b/src/Processors/QueryPlan/ReadFromSystemNumbersStep.cpp
@@ -119,23 +119,23 @@ using RangesWithStep = std::vector<RangeWithStep>;
 
 std::optional<RangeWithStep> steppedRangeFromRange(const Range & r, UInt64 step, UInt64 remainder)
 {
-    if ((r.right.safeGet<UInt64>() == 0) && (!r.right_included))
+    if ((r.right.get<UInt64>() == 0) && (!r.right_included))
         return std::nullopt;
-    UInt64 begin = (r.left.safeGet<UInt64>() / step) * step;
+    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.safeGet<UInt64>()) && (begin <= r.left.safeGet<UInt64>() - r.left_included))
+    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.safeGet<UInt64>()))
+    if ((begin >= r.right_included) && (begin - r.right_included >= r.right.get<UInt64>()))
         return std::nullopt;
-    UInt64 right_edge_included = r.right.safeGet<UInt64>() - (1 - r.right_included);
+    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}};
 }
 
@@ -459,7 +459,7 @@ Pipe ReadFromSystemNumbersStep::makePipe()
     chassert(numbers_storage.step != UInt64{0});
 
     /// Build rpn of query filters
-    KeyCondition condition(filter_actions_dag ? &*filter_actions_dag : nullptr, context, column_names, key_expression);
+    KeyCondition condition(filter_actions_dag, context, column_names, key_expression);
 
     if (condition.extractPlainRanges(ranges))
     {
@@ -596,12 +596,12 @@ Pipe ReadFromSystemNumbersStep::makePipe()
             numbers_storage.step,
             step_between_chunks);
 
-        if (end && i == 0)
+        if (numbers_storage.limit && i == 0)
         {
-            UInt64 rows_approx = itemCountInRange(numbers_storage.offset, *end, numbers_storage.step);
-            if (limit > 0 && limit < rows_approx)
-                rows_approx = query_info_limit;
-            source->addTotalRowsApprox(rows_approx);
+            auto rows_appr = itemCountInRange(numbers_storage.offset, *numbers_storage.limit, numbers_storage.step);
+            if (limit > 0 && limit < rows_appr)
+                rows_appr = query_info_limit;
+            source->addTotalRowsApprox(rows_appr);
         }
 
         pipe.addSource(std::move(source));
diff --git a/src/Processors/QueryPlan/ReadNothingStep.cpp b/src/Processors/QueryPlan/ReadNothingStep.cpp
index 3037172bbd4..253f3a5b980 100644
--- a/src/Processors/QueryPlan/ReadNothingStep.cpp
+++ b/src/Processors/QueryPlan/ReadNothingStep.cpp
@@ -6,7 +6,7 @@ namespace DB
 {
 
 ReadNothingStep::ReadNothingStep(Block output_header)
-    : ISourceStep(DataStream{.header = std::move(output_header)})
+    : ISourceStep(DataStream{.header = std::move(output_header), .has_single_port = true})
 {
 }
 
diff --git a/src/Processors/QueryPlan/SourceStepWithFilter.cpp b/src/Processors/QueryPlan/SourceStepWithFilter.cpp
index 3de9ae37db0..ad0940b90b9 100644
--- a/src/Processors/QueryPlan/SourceStepWithFilter.cpp
+++ b/src/Processors/QueryPlan/SourceStepWithFilter.cpp
@@ -34,8 +34,9 @@ Block SourceStepWithFilter::applyPrewhereActions(Block block, const PrewhereInfo
             block.erase(prewhere_info->row_level_column_name);
         }
 
+        if (prewhere_info->prewhere_actions)
         {
-            block = prewhere_info->prewhere_actions.updateHeader(block);
+            block = prewhere_info->prewhere_actions->updateHeader(block);
 
             auto & prewhere_column = block.getByName(prewhere_info->prewhere_column_name);
             if (!prewhere_column.type->canBeUsedInBooleanContext())
@@ -101,6 +102,7 @@ void SourceStepWithFilter::describeActions(FormatSettings & format_settings) con
         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;
@@ -108,7 +110,7 @@ void SourceStepWithFilter::describeActions(FormatSettings & format_settings) con
                 format_settings.out << " (removed)";
             format_settings.out << '\n';
 
-            auto expression = std::make_shared<ExpressionActions>(prewhere_info->prewhere_actions.clone());
+            auto expression = std::make_shared<ExpressionActions>(prewhere_info->prewhere_actions);
             expression->describeActions(format_settings.out, prefix);
         }
 
@@ -117,7 +119,7 @@ void SourceStepWithFilter::describeActions(FormatSettings & format_settings) con
             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->clone());
+            auto expression = std::make_shared<ExpressionActions>(prewhere_info->row_level_filter);
             expression->describeActions(format_settings.out, prefix);
         }
     }
@@ -130,11 +132,12 @@ void SourceStepWithFilter::describeActions(JSONBuilder::JSONMap & map) const
         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.clone());
+            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));
@@ -144,7 +147,7 @@ void SourceStepWithFilter::describeActions(JSONBuilder::JSONMap & map) const
         {
             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->clone());
+            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));
diff --git a/src/Processors/QueryPlan/SourceStepWithFilter.h b/src/Processors/QueryPlan/SourceStepWithFilter.h
index 6cea5fd7245..ca4ea4f3704 100644
--- a/src/Processors/QueryPlan/SourceStepWithFilter.h
+++ b/src/Processors/QueryPlan/SourceStepWithFilter.h
@@ -33,8 +33,7 @@ public:
     {
     }
 
-    const std::optional<ActionsDAG> & getFilterActionsDAG() const { return filter_actions_dag; }
-    std::optional<ActionsDAG> detachFilterActionsDAG() { return std::move(filter_actions_dag); }
+    const ActionsDAGPtr & getFilterActionsDAG() const { return filter_actions_dag; }
 
     const SelectQueryInfo & getQueryInfo() const { return query_info; }
     const PrewhereInfoPtr & getPrewhereInfo() const { return prewhere_info; }
@@ -45,9 +44,9 @@ public:
 
     const Names & requiredSourceColumns() const { return required_source_columns; }
 
-    void addFilter(ActionsDAG filter_dag, std::string column_name)
+    void addFilter(ActionsDAGPtr filter_dag, std::string column_name)
     {
-        filter_nodes.nodes.push_back(&filter_dag.findInOutputs(column_name));
+        filter_nodes.nodes.push_back(&filter_dag->findInOutputs(column_name));
         filter_dags.push_back(std::move(filter_dag));
     }
 
@@ -60,7 +59,7 @@ public:
     void applyFilters()
     {
         applyFilters(std::move(filter_nodes));
-        filter_dags.clear();
+        filter_dags = {};
     }
 
     virtual void applyFilters(ActionDAGNodes added_filter_nodes);
@@ -81,12 +80,12 @@ protected:
     ContextPtr context;
     std::optional<size_t> limit;
 
-    std::optional<ActionsDAG> filter_actions_dag;
+    ActionsDAGPtr filter_actions_dag;
 
 private:
     /// Will be cleared after applyFilters() is called.
     ActionDAGNodes filter_nodes;
-    std::vector<ActionsDAG> filter_dags;
+    std::vector<ActionsDAGPtr> filter_dags;
 };
 
 }
diff --git a/src/Processors/QueryPlan/TemporaryFiles.h b/src/Processors/QueryPlan/TemporaryFiles.h
deleted file mode 100644
index 943a2c2b0a4..00000000000
--- a/src/Processors/QueryPlan/TemporaryFiles.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <base/types.h>
-#include <boost/noncopyable.hpp>
-#include <vector>
-#include <memory>
-
-namespace DB
-{
-
-class WriteBuffer;
-class ReadBuffer;
-
-/// Interface for accessing temporary files by some logical name (or id).
-/// While building query pipeline processors can lookup temporary files by some id and use them for writing and/or reading temporary data
-/// without knowing what exactly is behind the name: local file, memory buffer, object in cloud storage, etc.
-struct ITemporaryFileLookup : boost::noncopyable
-{
-    virtual ~ITemporaryFileLookup() = default;
-
-    /// Give the caller a temporary write buffer, but don't give away the ownership.
-    virtual WriteBuffer & getTemporaryFileForWriting(const String & file_id) = 0;
-
-    /// Give the caller a temporary read buffer, it exclusively belongs to the caller.
-    /// Other callers can get their own read buffer for the same temporary file.
-    virtual std::unique_ptr<ReadBuffer> getTemporaryFileForReading(const String & file_id) = 0;
-};
-
-using TemporaryFileLookupPtr = std::shared_ptr<ITemporaryFileLookup>;
-
-}
diff --git a/src/Processors/QueryPlan/TotalsHavingStep.cpp b/src/Processors/QueryPlan/TotalsHavingStep.cpp
index 2554053064f..10384f6296a 100644
--- a/src/Processors/QueryPlan/TotalsHavingStep.cpp
+++ b/src/Processors/QueryPlan/TotalsHavingStep.cpp
@@ -29,7 +29,7 @@ TotalsHavingStep::TotalsHavingStep(
     const DataStream & input_stream_,
     const AggregateDescriptions & aggregates_,
     bool overflow_row_,
-    std::optional<ActionsDAG> actions_dag_,
+    const ActionsDAGPtr & actions_dag_,
     const std::string & filter_column_,
     bool remove_filter_,
     TotalsMode totals_mode_,
@@ -39,7 +39,7 @@ TotalsHavingStep::TotalsHavingStep(
         input_stream_,
         TotalsHavingTransform::transformHeader(
             input_stream_.header,
-            actions_dag_ ? &*actions_dag_ : nullptr,
+            actions_dag_.get(),
             filter_column_,
             remove_filter_,
             final_,
@@ -47,7 +47,7 @@ TotalsHavingStep::TotalsHavingStep(
         getTraits(!filter_column_.empty()))
     , aggregates(aggregates_)
     , overflow_row(overflow_row_)
-    , actions_dag(std::move(actions_dag_))
+    , actions_dag(actions_dag_)
     , filter_column_name(filter_column_)
     , remove_filter(remove_filter_)
     , totals_mode(totals_mode_)
@@ -58,7 +58,7 @@ TotalsHavingStep::TotalsHavingStep(
 
 void TotalsHavingStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings)
 {
-    auto expression_actions = actions_dag ? std::make_shared<ExpressionActions>(std::move(*actions_dag), settings.getActionsSettings()) : nullptr;
+    auto expression_actions = actions_dag ? std::make_shared<ExpressionActions>(actions_dag, settings.getActionsSettings()) : nullptr;
 
     auto totals_having = std::make_shared<TotalsHavingTransform>(
         pipeline.getHeader(),
@@ -101,16 +101,13 @@ void TotalsHavingStep::describeActions(FormatSettings & settings) const
     if (actions_dag)
     {
         bool first = true;
-        if (actions_dag)
+        auto expression = std::make_shared<ExpressionActions>(actions_dag);
+        for (const auto & action : expression->getActions())
         {
-            auto expression = std::make_shared<ExpressionActions>(actions_dag->clone());
-            for (const auto & action : expression->getActions())
-            {
-                settings.out << prefix << (first ? "Actions: "
-                                                : "         ");
-                first = false;
-                settings.out << action.toString() << '\n';
-            }
+            settings.out << prefix << (first ? "Actions: "
+                                             : "         ");
+            first = false;
+            settings.out << action.toString() << '\n';
         }
     }
 }
@@ -121,11 +118,8 @@ void TotalsHavingStep::describeActions(JSONBuilder::JSONMap & map) const
     if (actions_dag)
     {
         map.add("Filter column", filter_column_name);
-        if (actions_dag)
-        {
-            auto expression = std::make_shared<ExpressionActions>(actions_dag->clone());
-            map.add("Expression", expression->toTree());
-        }
+        auto expression = std::make_shared<ExpressionActions>(actions_dag);
+        map.add("Expression", expression->toTree());
     }
 }
 
@@ -135,7 +129,7 @@ void TotalsHavingStep::updateOutputStream()
         input_streams.front(),
         TotalsHavingTransform::transformHeader(
             input_streams.front().header,
-            getActions(),
+            actions_dag.get(),
             filter_column_name,
             remove_filter,
             final,
diff --git a/src/Processors/QueryPlan/TotalsHavingStep.h b/src/Processors/QueryPlan/TotalsHavingStep.h
index 4b414d41c57..a81bc7bb1a9 100644
--- a/src/Processors/QueryPlan/TotalsHavingStep.h
+++ b/src/Processors/QueryPlan/TotalsHavingStep.h
@@ -1,11 +1,13 @@
 #pragma once
 #include <Processors/QueryPlan/ITransformingStep.h>
 #include <Processors/Transforms/finalizeChunk.h>
-#include <Interpreters/ActionsDAG.h>
 
 namespace DB
 {
 
+class ActionsDAG;
+using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
+
 enum class TotalsMode : uint8_t;
 
 /// Execute HAVING and calculate totals. See TotalsHavingTransform.
@@ -16,7 +18,7 @@ public:
         const DataStream & input_stream_,
         const AggregateDescriptions & aggregates_,
         bool overflow_row_,
-        std::optional<ActionsDAG> actions_dag_,
+        const ActionsDAGPtr & actions_dag_,
         const std::string & filter_column_,
         bool remove_filter_,
         TotalsMode totals_mode_,
@@ -30,7 +32,7 @@ public:
     void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
 
-    const ActionsDAG * getActions() const { return actions_dag ? &*actions_dag : nullptr; }
+    const ActionsDAGPtr & getActions() const { return actions_dag; }
 
 private:
     void updateOutputStream() override;
@@ -38,7 +40,7 @@ private:
     const AggregateDescriptions aggregates;
 
     bool overflow_row;
-    std::optional<ActionsDAG> actions_dag;
+    ActionsDAGPtr actions_dag;
     String filter_column_name;
     bool remove_filter;
     TotalsMode totals_mode;
diff --git a/src/Processors/QueryPlan/WindowStep.h b/src/Processors/QueryPlan/WindowStep.h
index d79cd7fd45e..74a0e5930c7 100644
--- a/src/Processors/QueryPlan/WindowStep.h
+++ b/src/Processors/QueryPlan/WindowStep.h
@@ -6,6 +6,9 @@
 namespace DB
 {
 
+class ActionsDAG;
+using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
+
 class WindowTransform;
 
 class WindowStep : public ITransformingStep
diff --git a/src/Processors/RowsBeforeLimitCounter.h b/src/Processors/RowsBeforeLimitCounter.h
new file mode 100644
index 00000000000..f5eb40ff84a
--- /dev/null
+++ b/src/Processors/RowsBeforeLimitCounter.h
@@ -0,0 +1,36 @@
+#pragma once
+#include <atomic>
+#include <memory>
+
+namespace DB
+{
+
+/// This class helps to calculate rows_before_limit_at_least.
+class RowsBeforeLimitCounter
+{
+public:
+    void add(uint64_t rows)
+    {
+        setAppliedLimit();
+        rows_before_limit.fetch_add(rows, std::memory_order_release);
+    }
+
+    void set(uint64_t rows)
+    {
+        setAppliedLimit();
+        rows_before_limit.store(rows, std::memory_order_release);
+    }
+
+    uint64_t get() const { return rows_before_limit.load(std::memory_order_acquire); }
+
+    void setAppliedLimit() { has_applied_limit.store(true, std::memory_order_release); }
+    bool hasAppliedLimit() const { return has_applied_limit.load(std::memory_order_acquire); }
+
+private:
+    std::atomic<uint64_t> rows_before_limit = 0;
+    std::atomic_bool has_applied_limit = false;
+};
+
+using RowsBeforeLimitCounterPtr = std::shared_ptr<RowsBeforeLimitCounter>;
+
+}
diff --git a/src/Processors/RowsBeforeStepCounter.h b/src/Processors/RowsBeforeStepCounter.h
deleted file mode 100644
index 789731f82bd..00000000000
--- a/src/Processors/RowsBeforeStepCounter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-#include <atomic>
-#include <memory>
-
-namespace DB
-{
-
-/// This class helps to calculate rows_before_limit_at_least and rows_before_aggregation.
-class RowsBeforeStepCounter
-{
-public:
-    void add(uint64_t rows)
-    {
-        setAppliedStep();
-        rows_before_step.fetch_add(rows, std::memory_order_release);
-    }
-
-    void set(uint64_t rows)
-    {
-        setAppliedStep();
-        rows_before_step.store(rows, std::memory_order_release);
-    }
-
-    uint64_t get() const { return rows_before_step.load(std::memory_order_acquire); }
-
-    void setAppliedStep() { has_applied_step.store(true, std::memory_order_release); }
-    bool hasAppliedStep() const { return has_applied_step.load(std::memory_order_acquire); }
-
-private:
-    std::atomic<uint64_t> rows_before_step = 0;
-    std::atomic_bool has_applied_step = false;
-};
-
-using RowsBeforeStepCounterPtr = std::shared_ptr<RowsBeforeStepCounter>;
-
-}
diff --git a/src/Processors/SourceWithKeyCondition.h b/src/Processors/SourceWithKeyCondition.h
index cfd3eb236b7..ee155d6f78c 100644
--- a/src/Processors/SourceWithKeyCondition.h
+++ b/src/Processors/SourceWithKeyCondition.h
@@ -16,13 +16,13 @@ protected:
     /// Represents pushed down filters in source
     std::shared_ptr<const KeyCondition> key_condition;
 
-    void setKeyConditionImpl(const std::optional<ActionsDAG> & filter_actions_dag, ContextPtr context, const Block & keys)
+    void setKeyConditionImpl(const ActionsDAGPtr & filter_actions_dag, ContextPtr context, const Block & keys)
     {
         key_condition = std::make_shared<const KeyCondition>(
-            filter_actions_dag ? &*filter_actions_dag : nullptr,
+            filter_actions_dag,
             context,
             keys.getNames(),
-            std::make_shared<ExpressionActions>(ActionsDAG(keys.getColumnsWithTypeAndName())));
+            std::make_shared<ExpressionActions>(std::make_shared<ActionsDAG>(keys.getColumnsWithTypeAndName())));
     }
 
 public:
@@ -33,6 +33,6 @@ public:
     virtual void setKeyCondition(const std::shared_ptr<const KeyCondition> & key_condition_) { key_condition = key_condition_; }
 
     /// Set key_condition created by filter_actions_dag and context.
-    virtual void setKeyCondition(const std::optional<ActionsDAG> & /*filter_actions_dag*/, ContextPtr /*context*/) { }
+    virtual void setKeyCondition(const ActionsDAGPtr & /*filter_actions_dag*/, ContextPtr /*context*/) { }
 };
 }
diff --git a/src/Processors/Sources/DelayedSource.cpp b/src/Processors/Sources/DelayedSource.cpp
index 788017e3df0..f7928f89015 100644
--- a/src/Processors/Sources/DelayedSource.cpp
+++ b/src/Processors/Sources/DelayedSource.cpp
@@ -139,12 +139,6 @@ void DelayedSource::work()
             processor->setRowsBeforeLimitCounter(rows_before_limit);
     }
 
-    if (rows_before_aggregation)
-    {
-        for (auto & processor : processors)
-            processor->setRowsBeforeAggregationCounter(rows_before_aggregation);
-    }
-
     synchronizePorts(totals_output, totals, header, processors);
     synchronizePorts(extremes_output, extremes, header, processors);
 }
diff --git a/src/Processors/Sources/DelayedSource.h b/src/Processors/Sources/DelayedSource.h
index 4ee90e34599..0b2751e18a6 100644
--- a/src/Processors/Sources/DelayedSource.h
+++ b/src/Processors/Sources/DelayedSource.h
@@ -30,15 +30,13 @@ public:
     OutputPort * getTotalsPort() { return totals; }
     OutputPort * getExtremesPort() { return extremes; }
 
-    void setRowsBeforeLimitCounter(RowsBeforeStepCounterPtr counter) override { rows_before_limit.swap(counter); }
-    void setRowsBeforeAggregationCounter(RowsBeforeStepCounterPtr counter) override { rows_before_aggregation.swap(counter); }
+    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) override { rows_before_limit.swap(counter); }
 
 private:
     QueryPlanResourceHolder resources;
     Creator creator;
     Processors processors;
-    RowsBeforeStepCounterPtr rows_before_limit;
-    RowsBeforeStepCounterPtr rows_before_aggregation;
+    RowsBeforeLimitCounterPtr rows_before_limit;
 
     /// Outputs for DelayedSource.
     OutputPort * main = nullptr;
diff --git a/src/Processors/Sources/MongoDBSource.cpp b/src/Processors/Sources/MongoDBSource.cpp
index e00a541b300..0d583cf6be5 100644
--- a/src/Processors/Sources/MongoDBSource.cpp
+++ b/src/Processors/Sources/MongoDBSource.cpp
@@ -4,7 +4,6 @@
 #include <vector>
 
 #include <Poco/MongoDB/Array.h>
-#include <Poco/MongoDB/Binary.h>
 #include <Poco/MongoDB/Database.h>
 #include <Poco/MongoDB/Connection.h>
 #include <Poco/MongoDB/Cursor.h>
@@ -18,7 +17,6 @@
 #include <IO/ReadHelpers.h>
 #include <Common/assert_cast.h>
 #include <Common/quoteString.h>
-#include "base/types.h"
 #include <base/range.h>
 #include <Poco/URI.h>
 
@@ -47,28 +45,8 @@ namespace
     using ValueType = ExternalResultDescription::ValueType;
     using ObjectId = Poco::MongoDB::ObjectId;
     using MongoArray = Poco::MongoDB::Array;
-    using MongoUUID = Poco::MongoDB::Binary::Ptr;
 
 
-    UUID parsePocoUUID(const Poco::UUID & src)
-    {
-        UUID uuid;
-
-        std::array<Poco::UInt8, 6> src_node = src.getNode();
-        UInt64 node = 0;
-        node |= UInt64(src_node[0]) << 40;
-        node |= UInt64(src_node[1]) << 32;
-        node |= UInt64(src_node[2]) << 24;
-        node |= UInt64(src_node[3]) << 16;
-        node |= UInt64(src_node[4]) << 8;
-        node |= src_node[5];
-
-        UUIDHelpers::getHighBytes(uuid) = UInt64(src.getTimeLow()) << 32 | UInt32(src.getTimeMid() << 16 | src.getTimeHiAndVersion());
-        UUIDHelpers::getLowBytes(uuid) = UInt64(src.getClockSeq()) << 48 | node;
-
-        return uuid;
-    }
-
     template <typename T>
     Field getNumber(const Poco::MongoDB::Element & value, const std::string & name)
     {
@@ -171,20 +149,12 @@ namespace
         else if (which.isUUID())
             parser = [](const Poco::MongoDB::Element & value, const std::string & name) -> Field
             {
-                if (value.type() == Poco::MongoDB::ElementTraits<String>::TypeId)
-                {
-                    String string = static_cast<const Poco::MongoDB::ConcreteElement<String> &>(value).value();
-                    return parse<UUID>(string);
-                }
-                else if (value.type() == Poco::MongoDB::ElementTraits<MongoUUID>::TypeId)
-                {
-                    const Poco::UUID & poco_uuid = static_cast<const Poco::MongoDB::ConcreteElement<MongoUUID> &>(value).value()->uuid();
-                    return parsePocoUUID(poco_uuid);
-                }
-                else
-                    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch, expected String/UUID, got type id = {} for column {}",
+                if (value.type() != Poco::MongoDB::ElementTraits<String>::TypeId)
+                    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch, expected String (UUID), got type id = {} for column {}",
                                         toString(value.type()), name);
 
+                String string = static_cast<const Poco::MongoDB::ConcreteElement<String> &>(value).value();
+                return parse<UUID>(string);
             };
         else
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Type conversion to {} is not supported", nested->getName());
@@ -316,14 +286,8 @@ namespace
                     String string = static_cast<const Poco::MongoDB::ConcreteElement<String> &>(value).value();
                     assert_cast<ColumnUUID &>(column).getData().push_back(parse<UUID>(string));
                 }
-                else if (value.type() == Poco::MongoDB::ElementTraits<MongoUUID>::TypeId)
-                {
-                    const Poco::UUID & poco_uuid = static_cast<const Poco::MongoDB::ConcreteElement<MongoUUID> &>(value).value()->uuid();
-                    UUID uuid = parsePocoUUID(poco_uuid);
-                    assert_cast<ColumnUUID &>(column).getData().push_back(uuid);
-                }
                 else
-                    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch, expected String/UUID, got type id = {} for column {}",
+                    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch, expected String (UUID), got type id = {} for column {}",
                                         toString(value.type()), name);
                 break;
             }
diff --git a/src/Processors/Sources/MySQLSource.cpp b/src/Processors/Sources/MySQLSource.cpp
index 52be9a6e84a..5d533a7747e 100644
--- a/src/Processors/Sources/MySQLSource.cpp
+++ b/src/Processors/Sources/MySQLSource.cpp
@@ -219,11 +219,11 @@ namespace
                 read_bytes_size += 8;
                 break;
             case ValueType::vtEnum8:
-                assert_cast<ColumnInt8 &>(column).insertValue(assert_cast<const DataTypeEnum<Int8> &>(data_type).castToValue(value.data()).safeGet<Int8>());
+                assert_cast<ColumnInt8 &>(column).insertValue(assert_cast<const DataTypeEnum<Int8> &>(data_type).castToValue(value.data()).get<Int8>());
                 read_bytes_size += assert_cast<ColumnInt8 &>(column).byteSize();
                 break;
             case ValueType::vtEnum16:
-                assert_cast<ColumnInt16 &>(column).insertValue(assert_cast<const DataTypeEnum<Int16> &>(data_type).castToValue(value.data()).safeGet<Int16>());
+                assert_cast<ColumnInt16 &>(column).insertValue(assert_cast<const DataTypeEnum<Int16> &>(data_type).castToValue(value.data()).get<Int16>());
                 read_bytes_size += assert_cast<ColumnInt16 &>(column).byteSize();
                 break;
             case ValueType::vtString:
diff --git a/src/Processors/Sources/RemoteSource.cpp b/src/Processors/Sources/RemoteSource.cpp
index c2da5753a27..1578bd389c9 100644
--- a/src/Processors/Sources/RemoteSource.cpp
+++ b/src/Processors/Sources/RemoteSource.cpp
@@ -4,8 +4,6 @@
 #include <QueryPipeline/StreamLocalLimits.h>
 #include <Processors/Transforms/AggregatingTransform.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
-#include <Common/Exception.h>
-#include <Common/Logger.h>
 
 namespace DB
 {
@@ -37,23 +35,16 @@ RemoteSource::RemoteSource(RemoteQueryExecutorPtr executor, bool add_aggregation
         progress(value.read_rows, value.read_bytes);
     });
 
-    query_executor->setProfileInfoCallback(
-        [this](const ProfileInfo & info)
+    query_executor->setProfileInfoCallback([this](const ProfileInfo & info)
+    {
+        if (rows_before_limit)
         {
-            if (rows_before_limit)
-            {
-                if (info.hasAppliedLimit())
-                    rows_before_limit->add(info.getRowsBeforeLimit());
-                else
-                    manually_add_rows_before_limit_counter = true; /// Remote subquery doesn't contain a limit
-            }
-
-            if (rows_before_aggregation)
-            {
-                if (info.hasAppliedAggregation())
-                    rows_before_aggregation->add(info.getRowsBeforeAggregation());
-            }
-        });
+            if (info.hasAppliedLimit())
+                rows_before_limit->add(info.getRowsBeforeLimit());
+            else
+                manually_add_rows_before_limit_counter = true; /// Remote subquery doesn't contain a limit
+        }
+    });
 }
 
 RemoteSource::~RemoteSource() = default;
@@ -107,29 +98,9 @@ void RemoteSource::work()
         executor_finished = true;
         return;
     }
-
-    if (preprocessed_packet)
-    {
-        preprocessed_packet = false;
-        return;
-    }
-
     ISource::work();
 }
 
-void RemoteSource::onAsyncJobReady()
-{
-    chassert(async_read);
-
-    if (!was_query_sent)
-        return;
-
-    chassert(!preprocessed_packet);
-    preprocessed_packet = query_executor->processParallelReplicaPacketIfAny();
-    if (preprocessed_packet)
-        is_async_state = false;
-}
-
 std::optional<Chunk> RemoteSource::tryGenerate()
 {
     /// onCancel() will do the cancel if the query was sent.
@@ -191,6 +162,7 @@ std::optional<Chunk> RemoteSource::tryGenerate()
     {
         if (manually_add_rows_before_limit_counter)
             rows_before_limit->add(rows);
+
         query_executor->finish();
         return {};
     }
@@ -210,16 +182,9 @@ std::optional<Chunk> RemoteSource::tryGenerate()
     return chunk;
 }
 
-void RemoteSource::onCancel() noexcept
+void RemoteSource::onCancel()
 {
-    try
-    {
-        query_executor->cancel();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(getLogger("RemoteSource"), "Error occurs on cancellation.");
-    }
+    query_executor->cancel();
 }
 
 void RemoteSource::onUpdatePorts()
diff --git a/src/Processors/Sources/RemoteSource.h b/src/Processors/Sources/RemoteSource.h
index c9d1a647779..052567bc261 100644
--- a/src/Processors/Sources/RemoteSource.h
+++ b/src/Processors/Sources/RemoteSource.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <Processors/ISource.h>
-#include <Processors/RowsBeforeStepCounter.h>
+#include <Processors/RowsBeforeLimitCounter.h>
 #include <QueryPipeline/Pipe.h>
-
 #include <Core/UUID.h>
+
 namespace DB
 {
 
@@ -25,21 +25,18 @@ public:
     void work() override;
     String getName() const override { return "Remote"; }
 
-    void setRowsBeforeLimitCounter(RowsBeforeStepCounterPtr counter) override { rows_before_limit.swap(counter); }
-    void setRowsBeforeAggregationCounter(RowsBeforeStepCounterPtr counter) override { rows_before_aggregation.swap(counter); }
+    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) override { rows_before_limit.swap(counter); }
 
     /// Stop reading from stream if output port is finished.
     void onUpdatePorts() override;
 
     int schedule() override { return fd; }
 
-    void onAsyncJobReady() override;
-
     void setStorageLimits(const std::shared_ptr<const StorageLimitsList> & storage_limits_) override;
 
 protected:
     std::optional<Chunk> tryGenerate() override;
-    void onCancel() noexcept override;
+    void onCancel() override;
 
 private:
     bool was_query_sent = false;
@@ -47,8 +44,7 @@ private:
     bool executor_finished = false;
     bool add_aggregation_info = false;
     RemoteQueryExecutorPtr query_executor;
-    RowsBeforeStepCounterPtr rows_before_limit;
-    RowsBeforeStepCounterPtr rows_before_aggregation;
+    RowsBeforeLimitCounterPtr rows_before_limit;
 
     const bool async_read;
     const bool async_query_sending;
@@ -56,7 +52,6 @@ private:
     int fd = -1;
     size_t rows = 0;
     bool manually_add_rows_before_limit_counter = false;
-    bool preprocessed_packet = false;
 };
 
 /// Totals source from RemoteQueryExecutor.
diff --git a/src/Processors/Sources/ShellCommandSource.cpp b/src/Processors/Sources/ShellCommandSource.cpp
index f55a3713215..55eaf67eb3b 100644
--- a/src/Processors/Sources/ShellCommandSource.cpp
+++ b/src/Processors/Sources/ShellCommandSource.cpp
@@ -8,15 +8,13 @@
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
 
-#include <Interpreters/Context.h>
-#include <Processors/Executors/CompletedPipelineExecutor.h>
-#include <Processors/Formats/IOutputFormat.h>
-#include <Processors/ISimpleTransform.h>
 #include <QueryPipeline/Pipe.h>
-
+#include <Processors/ISimpleTransform.h>
+#include <Processors/Formats/IOutputFormat.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
+#include <Interpreters/Context.h>
 #include <boost/circular_buffer.hpp>
 
-#include <ranges>
 
 namespace DB
 {
@@ -70,17 +68,11 @@ static void makeFdBlocking(int fd)
 
 static int pollWithTimeout(pollfd * pfds, size_t num, size_t timeout_milliseconds)
 {
-    auto logger = getLogger("TimeoutReadBufferFromFileDescriptor");
-    auto describe_fd = [](const auto & pollfd) { return fmt::format("(fd={}, flags={})", pollfd.fd, fcntl(pollfd.fd, F_GETFL)); };
-
     int res;
 
     while (true)
     {
         Stopwatch watch;
-
-        LOG_TEST(logger, "Polling descriptors: {}", fmt::join(std::span(pfds, pfds + num) | std::views::transform(describe_fd), ", "));
-
         res = poll(pfds, static_cast<nfds_t>(num), static_cast<int>(timeout_milliseconds));
 
         if (res < 0)
@@ -90,10 +82,7 @@ static int pollWithTimeout(pollfd * pfds, size_t num, size_t timeout_millisecond
 
             const auto elapsed = watch.elapsedMilliseconds();
             if (timeout_milliseconds <= elapsed)
-            {
-                LOG_TEST(logger, "Timeout exceeded: elapsed={}, timeout={}", elapsed, timeout_milliseconds);
                 break;
-            }
             timeout_milliseconds -= elapsed;
         }
         else
@@ -102,12 +91,6 @@ static int pollWithTimeout(pollfd * pfds, size_t num, size_t timeout_millisecond
         }
     }
 
-    LOG_TEST(
-        logger,
-        "Poll for descriptors: {} returned {}",
-        fmt::join(std::span(pfds, pfds + num) | std::views::transform(describe_fd), ", "),
-        res);
-
     return res;
 }
 
@@ -217,6 +200,12 @@ public:
         return true;
     }
 
+    void reset() const
+    {
+        makeFdBlocking(stdout_fd);
+        makeFdBlocking(stderr_fd);
+    }
+
     ~TimeoutReadBufferFromFileDescriptor() override
     {
         tryMakeFdBlocking(stdout_fd);
diff --git a/src/Processors/Transforms/AddingDefaultsTransform.cpp b/src/Processors/Transforms/AddingDefaultsTransform.cpp
index da4d3a0041b..7945b3999c1 100644
--- a/src/Processors/Transforms/AddingDefaultsTransform.cpp
+++ b/src/Processors/Transforms/AddingDefaultsTransform.cpp
@@ -178,7 +178,7 @@ void AddingDefaultsTransform::transform(Chunk & chunk)
     auto dag = evaluateMissingDefaults(evaluate_block, header.getNamesAndTypesList(), columns, context, false);
     if (dag)
     {
-        auto actions = std::make_shared<ExpressionActions>(std::move(*dag), ExpressionActionsSettings::fromContext(context, CompileExpressions::yes), true);
+        auto actions = std::make_shared<ExpressionActions>(std::move(dag), ExpressionActionsSettings::fromContext(context, CompileExpressions::yes), true);
         actions->execute(evaluate_block);
     }
 
diff --git a/src/Processors/Transforms/AggregatingInOrderTransform.cpp b/src/Processors/Transforms/AggregatingInOrderTransform.cpp
index f8bc419b623..45b0960ec8f 100644
--- a/src/Processors/Transforms/AggregatingInOrderTransform.cpp
+++ b/src/Processors/Transforms/AggregatingInOrderTransform.cpp
@@ -81,8 +81,6 @@ void AggregatingInOrderTransform::consume(Chunk chunk)
         is_consume_started = true;
     }
 
-    if (rows_before_aggregation)
-        rows_before_aggregation->add(rows);
     src_rows += rows;
     src_bytes += chunk.bytes();
 
diff --git a/src/Processors/Transforms/AggregatingInOrderTransform.h b/src/Processors/Transforms/AggregatingInOrderTransform.h
index 2ac7ffba1aa..41a0d7fc7f1 100644
--- a/src/Processors/Transforms/AggregatingInOrderTransform.h
+++ b/src/Processors/Transforms/AggregatingInOrderTransform.h
@@ -45,7 +45,6 @@ public:
     void work() override;
 
     void consume(Chunk chunk);
-    void setRowsBeforeAggregationCounter(RowsBeforeStepCounterPtr counter) override { rows_before_aggregation.swap(counter); }
 
 private:
     void generate();
@@ -87,8 +86,6 @@ private:
     Chunk current_chunk;
     Chunk to_push_chunk;
 
-    RowsBeforeStepCounterPtr rows_before_aggregation;
-
     LoggerPtr log = getLogger("AggregatingInOrderTransform");
 };
 
diff --git a/src/Processors/Transforms/AggregatingTransform.cpp b/src/Processors/Transforms/AggregatingTransform.cpp
index 2e21df0f387..fda03174c53 100644
--- a/src/Processors/Transforms/AggregatingTransform.cpp
+++ b/src/Processors/Transforms/AggregatingTransform.cpp
@@ -8,6 +8,7 @@
 #include <Core/ProtocolDefines.h>
 #include <Common/logger_useful.h>
 #include <Common/formatReadable.h>
+
 #include <Processors/Transforms/SquashingTransform.h>
 
 
@@ -366,7 +367,7 @@ public:
         return prepareTwoLevel();
     }
 
-    void onCancel() noexcept override
+    void onCancel() override
     {
         shared_data->is_cancelled.store(true, std::memory_order_seq_cst);
     }
@@ -486,7 +487,7 @@ private:
 
     #define M(NAME) \
                 else if (first->type == AggregatedDataVariants::Type::NAME) \
-                    params->aggregator.mergeSingleLevelDataImpl<decltype(first->NAME)::element_type>(*data, shared_data->is_cancelled);
+                    params->aggregator.mergeSingleLevelDataImpl<decltype(first->NAME)::element_type>(*data);
         if (false) {} // NOLINT
         APPLY_FOR_VARIANTS_SINGLE_LEVEL(M)
     #undef M
@@ -675,8 +676,7 @@ void AggregatingTransform::consume(Chunk chunk)
         LOG_TRACE(log, "Aggregating");
         is_consume_started = true;
     }
-    if (rows_before_aggregation)
-        rows_before_aggregation->add(num_rows);
+
     src_rows += num_rows;
     src_bytes += chunk.bytes();
 
diff --git a/src/Processors/Transforms/AggregatingTransform.h b/src/Processors/Transforms/AggregatingTransform.h
index b9212375c91..95983c39d1e 100644
--- a/src/Processors/Transforms/AggregatingTransform.h
+++ b/src/Processors/Transforms/AggregatingTransform.h
@@ -4,13 +4,11 @@
 #include <Interpreters/Aggregator.h>
 #include <Processors/Chunk.h>
 #include <Processors/IAccumulatingTransform.h>
-#include <Processors/RowsBeforeStepCounter.h>
+#include <Common/Stopwatch.h>
+#include <Common/setThreadName.h>
+#include <Common/scope_guard_safe.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/CurrentThread.h>
-#include <Common/Stopwatch.h>
-#include <Common/scope_guard_safe.h>
-#include <Common/setThreadName.h>
-
 
 namespace CurrentMetrics
 {
@@ -170,7 +168,6 @@ public:
     Status prepare() override;
     void work() override;
     Processors expandPipeline() override;
-    void setRowsBeforeAggregationCounter(RowsBeforeStepCounterPtr counter) override { rows_before_aggregation.swap(counter); }
 
 protected:
     void consume(Chunk chunk);
@@ -214,8 +211,6 @@ private:
 
     bool is_consume_started = false;
 
-    RowsBeforeStepCounterPtr rows_before_aggregation;
-
     void initGenerate();
 };
 
diff --git a/src/Processors/Transforms/ColumnGathererTransform.cpp b/src/Processors/Transforms/ColumnGathererTransform.cpp
index f266d5c2e2f..15f8355bdc7 100644
--- a/src/Processors/Transforms/ColumnGathererTransform.cpp
+++ b/src/Processors/Transforms/ColumnGathererTransform.cpp
@@ -1,15 +1,11 @@
 #include <Processors/Transforms/ColumnGathererTransform.h>
-#include <Common/ProfileEvents.h>
 #include <Common/logger_useful.h>
 #include <Common/typeid_cast.h>
 #include <Common/formatReadable.h>
 #include <Columns/ColumnSparse.h>
 #include <IO/WriteHelpers.h>
+#include <iomanip>
 
-namespace ProfileEvents
-{
-    extern const Event GatheringColumnMilliseconds;
-}
 
 namespace DB
 {
@@ -37,13 +33,6 @@ ColumnGathererStream::ColumnGathererStream(
         throw Exception(ErrorCodes::EMPTY_DATA_PASSED, "There are no streams to gather");
 }
 
-void ColumnGathererStream::updateStats(const IColumn & column)
-{
-    merged_rows += column.size();
-    merged_bytes += column.allocatedBytes();
-    ++merged_blocks;
-}
-
 void ColumnGathererStream::initialize(Inputs inputs)
 {
     Columns source_columns;
@@ -93,9 +82,7 @@ IMergingAlgorithm::Status ColumnGathererStream::merge()
         {
             res.addColumn(source_to_fully_copy->column);
         }
-
-        updateStats(*source_to_fully_copy->column);
-
+        merged_rows += source_to_fully_copy->size;
         source_to_fully_copy->pos = source_to_fully_copy->size;
         source_to_fully_copy = nullptr;
         return Status(std::move(res));
@@ -109,7 +96,8 @@ IMergingAlgorithm::Status ColumnGathererStream::merge()
         {
             next_required_source = 0;
             Chunk res;
-            updateStats(*sources.front().column);
+            merged_rows += sources.front().column->size();
+            merged_bytes += sources.front().column->allocatedBytes();
             res.addColumn(std::move(sources.front().column));
             sources.front().pos = sources.front().size = 0;
             return Status(std::move(res));
@@ -135,8 +123,8 @@ IMergingAlgorithm::Status ColumnGathererStream::merge()
     if (source_to_fully_copy && result_column->empty())
     {
         Chunk res;
-        updateStats(*source_to_fully_copy->column);
-
+        merged_rows += source_to_fully_copy->column->size();
+        merged_bytes += source_to_fully_copy->column->allocatedBytes();
         if (result_column->hasDynamicStructure())
         {
             auto col = result_column->cloneEmpty();
@@ -152,13 +140,13 @@ IMergingAlgorithm::Status ColumnGathererStream::merge()
         return Status(std::move(res));
     }
 
-    auto return_column = result_column->cloneEmpty();
-    result_column.swap(return_column);
+    auto col = result_column->cloneEmpty();
+    result_column.swap(col);
 
     Chunk res;
-    updateStats(*return_column);
-
-    res.addColumn(std::move(return_column));
+    merged_rows += col->size();
+    merged_bytes += col->allocatedBytes();
+    res.addColumn(std::move(col));
     return Status(std::move(res), row_sources_buf.eof() && !source_to_fully_copy);
 }
 
@@ -183,14 +171,13 @@ void ColumnGathererStream::consume(Input & input, size_t source_num)
 ColumnGathererTransform::ColumnGathererTransform(
     const Block & header,
     size_t num_inputs,
-    std::unique_ptr<ReadBuffer> row_sources_buf_,
+    ReadBuffer & row_sources_buf_,
     size_t block_preferred_size_rows_,
     size_t block_preferred_size_bytes_,
     bool is_result_sparse_)
     : 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_rows_, block_preferred_size_bytes_, is_result_sparse_)
-    , row_sources_buf_holder(std::move(row_sources_buf_))
+        num_inputs, row_sources_buf_, block_preferred_size_rows_, block_preferred_size_bytes_, is_result_sparse_)
     , log(getLogger("ColumnGathererStream"))
 {
     if (header.columns() != 1)
@@ -198,10 +185,31 @@ ColumnGathererTransform::ColumnGathererTransform(
             toString(header.columns()));
 }
 
+void ColumnGathererTransform::work()
+{
+    Stopwatch stopwatch;
+    IMergingTransform<ColumnGathererStream>::work();
+    elapsed_ns += stopwatch.elapsedNanoseconds();
+}
+
 void ColumnGathererTransform::onFinish()
 {
+    auto merged_rows = algorithm.getMergedRows();
+    auto merged_bytes = algorithm.getMergedRows();
+    /// Don't print info for small parts (< 10M rows)
+    if (merged_rows < 10000000)
+        return;
+
+    double seconds = static_cast<double>(elapsed_ns) / 1000000000ULL;
     const auto & column_name = getOutputPort().getHeader().getByPosition(0).name;
-    logMergedStats(ProfileEvents::GatheringColumnMilliseconds, fmt::format("Gathered column {}", column_name), log);
+
+    if (seconds == 0.0)
+        LOG_DEBUG(log, "Gathered column {} ({} bytes/elem.) in 0 sec.",
+            column_name, static_cast<double>(merged_bytes) / merged_rows);
+    else
+        LOG_DEBUG(log, "Gathered column {} ({} bytes/elem.) in {} sec., {} rows/sec., {}/sec.",
+            column_name, static_cast<double>(merged_bytes) / merged_rows, seconds,
+            merged_rows / seconds, ReadableSize(merged_bytes / seconds));
 }
 
 }
diff --git a/src/Processors/Transforms/ColumnGathererTransform.h b/src/Processors/Transforms/ColumnGathererTransform.h
index ce2671ce0bf..ec5691316ce 100644
--- a/src/Processors/Transforms/ColumnGathererTransform.h
+++ b/src/Processors/Transforms/ColumnGathererTransform.h
@@ -72,11 +72,10 @@ public:
     template <typename Column>
     void gather(Column & column_res);
 
-    MergedStats getMergedStats() const override { return {.bytes = merged_bytes, .rows = merged_rows, .blocks = merged_blocks}; }
+    UInt64 getMergedRows() const { return merged_rows; }
+    UInt64 getMergedBytes() const { return merged_bytes; }
 
 private:
-    void updateStats(const IColumn & column);
-
     /// Cache required fields
     struct Source
     {
@@ -106,7 +105,6 @@ private:
     ssize_t next_required_source = -1;
     UInt64 merged_rows = 0;
     UInt64 merged_bytes = 0;
-    UInt64 merged_blocks = 0;
 };
 
 class ColumnGathererTransform final : public IMergingTransform<ColumnGathererStream>
@@ -115,17 +113,19 @@ public:
     ColumnGathererTransform(
         const Block & header,
         size_t num_inputs,
-        std::unique_ptr<ReadBuffer> row_sources_buf_,
+        ReadBuffer & row_sources_buf_,
         size_t block_preferred_size_rows_,
         size_t block_preferred_size_bytes_,
         bool is_result_sparse_);
 
     String getName() const override { return "ColumnGathererTransform"; }
 
+    void work() override;
+
 protected:
     void onFinish() override;
+    UInt64 elapsed_ns = 0;
 
-    std::unique_ptr<ReadBuffer> row_sources_buf_holder; /// Keep ownership of row_sources_buf while it's in use by ColumnGathererStream.
     LoggerPtr log;
 };
 
diff --git a/src/Processors/Transforms/ExceptionKeepingTransform.h b/src/Processors/Transforms/ExceptionKeepingTransform.h
index 9aa33a8cbe5..000b5da798a 100644
--- a/src/Processors/Transforms/ExceptionKeepingTransform.h
+++ b/src/Processors/Transforms/ExceptionKeepingTransform.h
@@ -52,7 +52,7 @@ protected:
     virtual void onConsume(Chunk chunk) = 0;
     virtual GenerateResult onGenerate() = 0;
     virtual void onFinish() {}
-    virtual void onException(std::exception_ptr /* exception */) { }
+    virtual void onException(std::exception_ptr /* exception */) {}
 
 public:
     ExceptionKeepingTransform(const Block & in_header, const Block & out_header, bool ignore_on_start_and_finish_ = true);
diff --git a/src/Processors/Transforms/FillingTransform.cpp b/src/Processors/Transforms/FillingTransform.cpp
index 95f4a674ebb..bb38c3e1dc5 100644
--- a/src/Processors/Transforms/FillingTransform.cpp
+++ b/src/Processors/Transforms/FillingTransform.cpp
@@ -62,7 +62,7 @@ static FillColumnDescription::StepFunction getStepFunction(
         case IntervalKind::Kind::NAME: \
             return [step, scale, &date_lut](Field & field) { \
                 field = Add##NAME##sImpl::execute(static_cast<T>(\
-                    field.safeGet<T>()), static_cast<Int32>(step), date_lut, utc_time_zone, scale); };
+                    field.get<T>()), static_cast<Int32>(step), date_lut, utc_time_zone, scale); };
 
         FOR_EACH_INTERVAL_KIND(DECLARE_CASE)
 #undef DECLARE_CASE
@@ -139,21 +139,21 @@ static bool tryConvertFields(FillColumnDescription & descr, const DataTypePtr &
     {
         if (which.isDate() || which.isDate32())
         {
-            Int64 avg_seconds = descr.fill_step.safeGet<Int64>() * descr.step_kind->toAvgSeconds();
+            Int64 avg_seconds = descr.fill_step.get<Int64>() * descr.step_kind->toAvgSeconds();
             if (std::abs(avg_seconds) < 86400)
                 throw Exception(ErrorCodes::INVALID_WITH_FILL_EXPRESSION,
                                 "Value of step is to low ({} seconds). Must be >= 1 day", std::abs(avg_seconds));
         }
 
         if (which.isDate())
-            descr.step_func = getStepFunction<UInt16>(*descr.step_kind, descr.fill_step.safeGet<Int64>(), DateLUT::instance());
+            descr.step_func = getStepFunction<UInt16>(*descr.step_kind, descr.fill_step.get<Int64>(), DateLUT::instance());
         else if (which.isDate32())
-            descr.step_func = getStepFunction<Int32>(*descr.step_kind, descr.fill_step.safeGet<Int64>(), DateLUT::instance());
+            descr.step_func = getStepFunction<Int32>(*descr.step_kind, descr.fill_step.get<Int64>(), DateLUT::instance());
         else if (const auto * date_time = checkAndGetDataType<DataTypeDateTime>(type.get()))
-            descr.step_func = getStepFunction<UInt32>(*descr.step_kind, descr.fill_step.safeGet<Int64>(), date_time->getTimeZone());
+            descr.step_func = getStepFunction<UInt32>(*descr.step_kind, descr.fill_step.get<Int64>(), date_time->getTimeZone());
         else if (const auto * date_time64 = checkAndGetDataType<DataTypeDateTime64>(type.get()))
         {
-            const auto & step_dec = descr.fill_step.safeGet<const DecimalField<Decimal64> &>();
+            const auto & step_dec = descr.fill_step.get<const DecimalField<Decimal64> &>();
             Int64 step = DecimalUtils::convertTo<Int64>(step_dec.getValue(), step_dec.getScale());
             static const DateLUTImpl & utc_time_zone = DateLUT::instance("UTC");
 
@@ -163,7 +163,7 @@ static bool tryConvertFields(FillColumnDescription & descr, const DataTypePtr &
                 case IntervalKind::Kind::NAME: \
                     descr.step_func = [step, &time_zone = date_time64->getTimeZone()](Field & field) \
                     { \
-                        auto field_decimal = field.safeGet<DecimalField<DateTime64>>(); \
+                        auto field_decimal = field.get<DecimalField<DateTime64>>(); \
                         auto res = Add##NAME##sImpl::execute(field_decimal.getValue(), step, time_zone, utc_time_zone, field_decimal.getScale()); \
                         field = DecimalField(res, field_decimal.getScale()); \
                     }; \
@@ -203,7 +203,7 @@ FillingTransform::FillingTransform(
     , use_with_fill_by_sorting_prefix(use_with_fill_by_sorting_prefix_)
 {
     if (interpolate_description)
-        interpolate_actions = std::make_shared<ExpressionActions>(interpolate_description->actions.clone());
+        interpolate_actions = std::make_shared<ExpressionActions>(interpolate_description->actions);
 
     std::vector<bool> is_fill_column(header_.columns());
     for (size_t i = 0, size = fill_description.size(); i < size; ++i)
diff --git a/src/Processors/Transforms/JoiningTransform.cpp b/src/Processors/Transforms/JoiningTransform.cpp
index f2fb6327129..ca204bcb482 100644
--- a/src/Processors/Transforms/JoiningTransform.cpp
+++ b/src/Processors/Transforms/JoiningTransform.cpp
@@ -299,17 +299,13 @@ IProcessor::Status FillingRightJoinSideTransform::prepare()
 
 void FillingRightJoinSideTransform::work()
 {
-    auto & input = inputs.front();
-    auto block = input.getHeader().cloneWithColumns(chunk.detachColumns());
+    auto block = inputs.front().getHeader().cloneWithColumns(chunk.detachColumns());
 
     if (for_totals)
         join->setTotals(block);
     else
         stop_reading = !join->addBlockToJoin(block);
 
-    if (input.isFinished())
-        join->tryRerangeRightTableData();
-
     set_totals = for_totals;
 }
 
diff --git a/src/Processors/Transforms/MergeJoinTransform.cpp b/src/Processors/Transforms/MergeJoinTransform.cpp
index 6abfa0fccd0..e96a75d277b 100644
--- a/src/Processors/Transforms/MergeJoinTransform.cpp
+++ b/src/Processors/Transforms/MergeJoinTransform.cpp
@@ -511,16 +511,6 @@ void MergeJoinAlgorithm::logElapsed(double seconds)
         stat.max_blocks_loaded);
 }
 
-IMergingAlgorithm::MergedStats MergeJoinAlgorithm::getMergedStats() const
-{
-    return
-    {
-        .bytes = stat.num_bytes[0] + stat.num_bytes[1],
-        .rows = stat.num_rows[0] + stat.num_rows[1],
-        .blocks = stat.num_blocks[0] + stat.num_blocks[1],
-    };
-}
-
 static void prepareChunk(Chunk & chunk)
 {
     if (!chunk)
@@ -557,7 +547,6 @@ void MergeJoinAlgorithm::consume(Input & input, size_t source_num)
     {
         stat.num_blocks[source_num] += 1;
         stat.num_rows[source_num] += input.chunk.getNumRows();
-        stat.num_bytes[source_num] += input.chunk.allocatedBytes();
     }
 
     prepareChunk(input.chunk);
@@ -1282,7 +1271,7 @@ MergeJoinTransform::MergeJoinTransform(
 
 void MergeJoinTransform::onFinish()
 {
-    algorithm.logElapsed(static_cast<double>(merging_elapsed_ns) / 1000000000ULL);
+    algorithm.logElapsed(total_stopwatch.elapsedSeconds());
 }
 
 }
diff --git a/src/Processors/Transforms/MergeJoinTransform.h b/src/Processors/Transforms/MergeJoinTransform.h
index 8f74974af0f..d37a0b9f3ae 100644
--- a/src/Processors/Transforms/MergeJoinTransform.h
+++ b/src/Processors/Transforms/MergeJoinTransform.h
@@ -245,8 +245,6 @@ public:
     void setAsofInequality(ASOFJoinInequality asof_inequality_);
 
     void logElapsed(double seconds);
-    MergedStats getMergedStats() const override;
-
 private:
     std::optional<Status> handleAnyJoinState();
     Status anyJoin();
@@ -282,7 +280,6 @@ private:
     {
         size_t num_blocks[2] = {0, 0};
         size_t num_rows[2] = {0, 0};
-        size_t num_bytes[2] = {0, 0};
 
         size_t max_blocks_loaded = 0;
     };
diff --git a/src/Processors/Transforms/MergeSortingTransform.cpp b/src/Processors/Transforms/MergeSortingTransform.cpp
index c45192e7118..ede13b29219 100644
--- a/src/Processors/Transforms/MergeSortingTransform.cpp
+++ b/src/Processors/Transforms/MergeSortingTransform.cpp
@@ -185,6 +185,7 @@ void MergeSortingTransform::consume(Chunk chunk)
 
         if (!external_merging_sorted)
         {
+            bool quiet = false;
             bool have_all_inputs = false;
             bool use_average_block_sizes = false;
 
@@ -198,6 +199,7 @@ void MergeSortingTransform::consume(Chunk chunk)
                     limit,
                     /*always_read_till_end_=*/ false,
                     nullptr,
+                    quiet,
                     use_average_block_sizes,
                     have_all_inputs);
 
diff --git a/src/Processors/Transforms/MergingAggregatedTransform.cpp b/src/Processors/Transforms/MergingAggregatedTransform.cpp
index 9b76acb8081..c4f0952dde7 100644
--- a/src/Processors/Transforms/MergingAggregatedTransform.cpp
+++ b/src/Processors/Transforms/MergingAggregatedTransform.cpp
@@ -29,10 +29,10 @@ Block MergingAggregatedTransform::appendGroupingIfNeeded(const Block & in_header
 /// Initiator creates a separate Aggregator for every group, so should we do here.
 /// Otherwise, two-level aggregation will split the data into different buckets,
 /// and the result may have duplicating rows.
-static ActionsDAG makeReorderingActions(const Block & in_header, const GroupingSetsParams & params)
+static ActionsDAGPtr makeReorderingActions(const Block & in_header, const GroupingSetsParams & params)
 {
-    ActionsDAG reordering(in_header.getColumnsWithTypeAndName());
-    auto & outputs = reordering.getOutputs();
+    auto reordering = std::make_shared<ActionsDAG>(in_header.getColumnsWithTypeAndName());
+    auto & outputs = reordering->getOutputs();
     ActionsDAG::NodeRawConstPtrs new_outputs;
     new_outputs.reserve(in_header.columns() + params.used_keys.size() - params.used_keys.size());
 
@@ -97,7 +97,7 @@ MergingAggregatedTransform::MergingAggregatedTransform(
                 params.max_block_size,
                 params.min_hit_rate_to_use_consecutive_keys_optimization);
 
-            auto transform_params = std::make_shared<AggregatingTransformParams>(reordering.updateHeader(in_header), std::move(set_params), final);
+            auto transform_params = std::make_shared<AggregatingTransformParams>(reordering->updateHeader(in_header), std::move(set_params), final);
 
             auto creating = AggregatingStep::makeCreatingMissingKeysForGroupingSetDAG(
                 transform_params->getHeader(),
diff --git a/src/Processors/Transforms/PartialSortingTransform.h b/src/Processors/Transforms/PartialSortingTransform.h
index 73c490d5b92..8f25c93037f 100644
--- a/src/Processors/Transforms/PartialSortingTransform.h
+++ b/src/Processors/Transforms/PartialSortingTransform.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <Core/SortDescription.h>
 #include <Processors/ISimpleTransform.h>
-#include <Processors/RowsBeforeStepCounter.h>
+#include <Processors/RowsBeforeLimitCounter.h>
+#include <Core/SortDescription.h>
 #include <Common/PODArray.h>
 
 namespace DB
@@ -20,7 +20,7 @@ public:
 
     String getName() const override { return "PartialSortingTransform"; }
 
-    void setRowsBeforeLimitCounter(RowsBeforeStepCounterPtr counter) override { read_rows.swap(counter); }
+    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) override { read_rows.swap(counter); }
 
 protected:
     void transform(Chunk & chunk) override;
@@ -29,7 +29,7 @@ private:
     const SortDescription description;
     SortDescriptionWithPositions description_with_positions;
     const UInt64 limit;
-    RowsBeforeStepCounterPtr read_rows;
+    RowsBeforeLimitCounterPtr read_rows;
 
     Columns sort_description_threshold_columns;
 
diff --git a/src/Processors/Transforms/PasteJoinTransform.cpp b/src/Processors/Transforms/PasteJoinTransform.cpp
index 982a347a70f..d2fa7eed256 100644
--- a/src/Processors/Transforms/PasteJoinTransform.cpp
+++ b/src/Processors/Transforms/PasteJoinTransform.cpp
@@ -58,16 +58,6 @@ static void prepareChunk(Chunk & chunk)
     chunk.setColumns(std::move(columns), num_rows);
 }
 
-IMergingAlgorithm::MergedStats PasteJoinAlgorithm::getMergedStats() const
-{
-    return
-    {
-        .bytes = stat.num_bytes[0] + stat.num_bytes[1],
-        .rows = stat.num_rows[0] + stat.num_rows[1],
-        .blocks = stat.num_blocks[0] + stat.num_blocks[1],
-    };
-}
-
 void PasteJoinAlgorithm::initialize(Inputs inputs)
 {
     if (inputs.size() != 2)
diff --git a/src/Processors/Transforms/PasteJoinTransform.h b/src/Processors/Transforms/PasteJoinTransform.h
index c184f20362d..6a7e65ee27c 100644
--- a/src/Processors/Transforms/PasteJoinTransform.h
+++ b/src/Processors/Transforms/PasteJoinTransform.h
@@ -35,7 +35,8 @@ public:
     void initialize(Inputs inputs) override;
     void consume(Input & input, size_t source_num) override;
     Status merge() override;
-    MergedStats getMergedStats() const override;
+
+    void logElapsed(double seconds);
 
 private:
     Chunk createBlockWithDefaults(size_t source_num);
@@ -54,7 +55,6 @@ private:
     {
         size_t num_blocks[2] = {0, 0};
         size_t num_rows[2] = {0, 0};
-        size_t num_bytes[2] = {0, 0};
 
         size_t max_blocks_loaded = 0;
     };
diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index bd11aa4cd28..d1e8cf66e2d 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -16,9 +16,6 @@
 #include <Common/Arena.h>
 #include <Common/FieldVisitorConvertToNumber.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
-#include <Functions/CastOverloadResolver.h>
-#include <Functions/IFunction.h>
-#include <DataTypes/DataTypeString.h>
 
 #include <Poco/Logger.h>
 #include <Common/logger_useful.h>
@@ -59,10 +56,7 @@ namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
     extern const int NOT_IMPLEMENTED;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int TOO_FEW_ARGUMENTS_FOR_FUNCTION;
-    extern const int TOO_MANY_ARGUMENTS_FOR_FUNCTION;
 }
 
 // Compares ORDER BY column values at given rows to find the boundaries of frame:
@@ -85,7 +79,7 @@ static int compareValuesWithOffset(const IColumn * _compared_column,
     using ValueType = typename ColumnType::ValueType;
     // Note that the storage type of offset returned by get<> is different, so
     // we need to specify the type explicitly.
-    const ValueType offset = static_cast<ValueType>(_offset.safeGet<ValueType>());
+    const ValueType offset = static_cast<ValueType>(_offset.get<ValueType>());
     assert(offset >= 0);
 
     const auto compared_value_data = compared_column->getDataAt(compared_row);
@@ -140,7 +134,7 @@ static int compareValuesWithOffsetFloat(const IColumn * _compared_column,
         _compared_column);
     const auto * reference_column = assert_cast<const ColumnType *>(
         _reference_column);
-    const auto offset = _offset.safeGet<typename ColumnType::ValueType>();
+    const auto offset = _offset.get<typename ColumnType::ValueType>();
     chassert(offset >= 0);
 
     const auto compared_value_data = compared_column->getDataAt(compared_row);
@@ -609,7 +603,7 @@ void WindowTransform::advanceFrameStartRowsOffset()
 {
     // Just recalculate it each time by walking blocks.
     const auto [moved_row, offset_left] = moveRowNumber(current_row,
-        window_description.frame.begin_offset.safeGet<UInt64>()
+        window_description.frame.begin_offset.get<UInt64>()
             * (window_description.frame.begin_preceding ? -1 : 1));
 
     frame_start = moved_row;
@@ -848,7 +842,7 @@ void WindowTransform::advanceFrameEndRowsOffset()
     // Walk the specified offset from the current row. The "+1" is needed
     // because the frame_end is a past-the-end pointer.
     const auto [moved_row, offset_left] = moveRowNumber(current_row,
-        window_description.frame.end_offset.safeGet<UInt64>()
+        window_description.frame.end_offset.get<UInt64>()
             * (window_description.frame.end_preceding ? -1 : 1)
             + 1);
 
@@ -1157,8 +1151,6 @@ void WindowTransform::appendChunk(Chunk & chunk)
         // Initialize output columns.
         for (auto & ws : workspaces)
         {
-            block.casted_columns.push_back(ws.window_function_impl ? ws.window_function_impl->castColumn(block.input_columns, ws.argument_column_indices) : nullptr);
-
             block.output_columns.push_back(ws.aggregate_function->getResultType()
                 ->createColumn());
             block.output_columns.back()->reserve(block.rows);
@@ -1633,7 +1625,7 @@ struct WindowFunctionExponentialTimeDecayedSum final : public StatefulWindowFunc
     {
         if (parameters_.size() != 1)
         {
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Function {} takes exactly one parameter", name_);
         }
         return applyVisitor(FieldVisitorConvertToNumber<Float64>(), parameters_[0]);
@@ -1646,7 +1638,7 @@ struct WindowFunctionExponentialTimeDecayedSum final : public StatefulWindowFunc
     {
         if (argument_types.size() != 2)
         {
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Function {} takes exactly two arguments", name_);
         }
 
@@ -1730,7 +1722,7 @@ struct WindowFunctionExponentialTimeDecayedMax final : public WindowFunction
     {
         if (parameters_.size() != 1)
         {
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Function {} takes exactly one parameter", name_);
         }
         return applyVisitor(FieldVisitorConvertToNumber<Float64>(), parameters_[0]);
@@ -1743,7 +1735,7 @@ struct WindowFunctionExponentialTimeDecayedMax final : public WindowFunction
     {
         if (argument_types.size() != 2)
         {
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Function {} takes exactly two arguments", name_);
         }
 
@@ -1805,7 +1797,7 @@ struct WindowFunctionExponentialTimeDecayedCount final : public StatefulWindowFu
     {
         if (parameters_.size() != 1)
         {
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Function {} takes exactly one parameter", name_);
         }
         return applyVisitor(FieldVisitorConvertToNumber<Float64>(), parameters_[0]);
@@ -1818,7 +1810,7 @@ struct WindowFunctionExponentialTimeDecayedCount final : public StatefulWindowFu
     {
         if (argument_types.size() != 1)
         {
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Function {} takes exactly one argument", name_);
         }
 
@@ -1891,7 +1883,7 @@ struct WindowFunctionExponentialTimeDecayedAvg final : public StatefulWindowFunc
     {
         if (parameters_.size() != 1)
         {
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Function {} takes exactly one parameter", name_);
         }
         return applyVisitor(FieldVisitorConvertToNumber<Float64>(), parameters_[0]);
@@ -1904,7 +1896,7 @@ struct WindowFunctionExponentialTimeDecayedAvg final : public StatefulWindowFunc
     {
         if (argument_types.size() != 2)
         {
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Function {} takes exactly two arguments", name_);
         }
 
@@ -2039,7 +2031,7 @@ struct WindowFunctionNtile final : public StatefulWindowFunction<NtileState>
         : StatefulWindowFunction<NtileState>(name_, argument_types_, parameters_, std::make_shared<DataTypeUInt64>())
     {
         if (argument_types.size() != 1)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} takes exactly one argument", name_);
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Function {} takes exactly one argument", name_);
 
         auto type_id = argument_types[0]->getTypeId();
         if (type_id != TypeIndex::UInt8 && type_id != TypeIndex::UInt16 && type_id != TypeIndex::UInt32 && type_id != TypeIndex::UInt64)
@@ -2104,17 +2096,17 @@ namespace
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Argument of 'ntile' function must be a constant");
             auto type_id = argument_types[0]->getTypeId();
             if (type_id == TypeIndex::UInt8)
-                buckets = arg_col[transform->current_row.row].safeGet<UInt8>();
+                buckets = arg_col[transform->current_row.row].get<UInt8>();
             else if (type_id == TypeIndex::UInt16)
-                buckets = arg_col[transform->current_row.row].safeGet<UInt16>();
+                buckets = arg_col[transform->current_row.row].get<UInt16>();
             else if (type_id == TypeIndex::UInt32)
-                buckets = arg_col[transform->current_row.row].safeGet<UInt32>();
+                buckets = arg_col[transform->current_row.row].get<UInt32>();
             else if (type_id == TypeIndex::UInt64)
-                buckets = arg_col[transform->current_row.row].safeGet<UInt64>();
+                buckets = arg_col[transform->current_row.row].get<UInt64>();
 
             if (!buckets)
             {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Argument of 'ntile' function must be greater than zero");
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Argument of 'ntile' funtcion must be greater than zero");
             }
         }
         // new partition
@@ -2280,8 +2272,6 @@ public:
 template <bool is_lead>
 struct WindowFunctionLagLeadInFrame final : public WindowFunction
 {
-    FunctionBasePtr func_cast = nullptr;
-
     WindowFunctionLagLeadInFrame(const std::string & name_,
             const DataTypes & argument_types_, const Array & parameters_)
         : WindowFunction(name_, argument_types_, parameters_, createResultType(argument_types_, name_))
@@ -2309,17 +2299,7 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
             return;
         }
 
-        if (argument_types.size() > 3)
-        {
-            throw Exception(ErrorCodes::TOO_MANY_ARGUMENTS_FOR_FUNCTION,
-                "Function '{}' accepts at most 3 arguments, {} given",
-                name, argument_types.size());
-        }
-
-        if (argument_types[0]->equals(*argument_types[2]))
-            return;
-
-        const auto supertype = tryGetLeastSupertype(DataTypes{argument_types[0], argument_types[2]});
+        const auto supertype = getLeastSupertype(DataTypes{argument_types[0], argument_types[2]});
         if (!supertype)
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
@@ -2336,38 +2316,19 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
                 argument_types[2]->getName());
         }
 
-        auto get_cast_func = [from = argument_types[2], to = argument_types[0]]
+        if (argument_types.size() > 3)
         {
-            return createInternalCast({from, {}}, to, CastType::accurate, {});
-        };
-
-        func_cast = get_cast_func();
-
-    }
-
-    ColumnPtr castColumn(const Columns & columns, const std::vector<size_t> & idx) override
-    {
-        if (!func_cast)
-            return nullptr;
-
-        ColumnsWithTypeAndName arguments
-        {
-            { columns[idx[2]], argument_types[2], "" },
-            {
-                DataTypeString().createColumnConst(columns[idx[2]]->size(), argument_types[0]->getName()),
-                std::make_shared<DataTypeString>(),
-                ""
-            }
-        };
-
-        return func_cast->execute(arguments, argument_types[0], columns[idx[2]]->size());
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Function '{}' accepts at most 3 arguments, {} given",
+                name, argument_types.size());
+        }
     }
 
     static DataTypePtr createResultType(const DataTypes & argument_types_, const std::string & name_)
     {
         if (argument_types_.empty())
         {
-            throw Exception(ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION,
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Function {} takes at least one argument", name_);
         }
 
@@ -2388,7 +2349,7 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
         {
             offset = (*current_block.input_columns[
                     workspace.argument_column_indices[1]])[
-                        transform->current_row.row].safeGet<Int64>();
+                        transform->current_row.row].get<Int64>();
 
             /// Either overflow or really negative value, both is not acceptable.
             if (offset < 0)
@@ -2410,11 +2371,12 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
             if (argument_types.size() > 2)
             {
                 // Column with default values is specified.
-                const IColumn & default_column =
-                    current_block.casted_columns[function_index] ?
-                        *current_block.casted_columns[function_index].get() :
-                        *current_block.input_columns[workspace.argument_column_indices[2]].get();
-
+                // The conversion through Field is inefficient, but we accept
+                // subtypes of the argument type as a default value (for convenience),
+                // and it's a pain to write conversion that respects ColumnNothing
+                // and ColumnConst and so on.
+                const IColumn & default_column = *current_block.input_columns[
+                    workspace.argument_column_indices[2]].get();
                 to.insert(default_column[transform->current_row.row]);
             }
             else
@@ -2456,7 +2418,7 @@ struct WindowFunctionNthValue final : public WindowFunction
     {
         if (argument_types_.size() != 2)
         {
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Function {} takes exactly two arguments", name_);
         }
 
@@ -2474,7 +2436,7 @@ struct WindowFunctionNthValue final : public WindowFunction
 
         Int64 offset = (*current_block.input_columns[
                 workspace.argument_column_indices[1]])[
-            transform->current_row.row].safeGet<Int64>();
+            transform->current_row.row].get<Int64>();
 
         /// Either overflow or really negative value, both is not acceptable.
         if (offset <= 0)
@@ -2530,7 +2492,7 @@ struct NonNegativeDerivativeParams
 
         if (argument_types.size() != 2 && argument_types.size() != 3)
         {
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
                             "Function {} takes 2 or 3 arguments", name_);
         }
 
@@ -2670,23 +2632,19 @@ void registerWindowFunctions(AggregateFunctionFactory & factory)
                 parameters);
         }, properties}, AggregateFunctionFactory::Case::Insensitive);
 
-    factory.registerFunction("denseRank", {[](const std::string & name,
+    factory.registerFunction("dense_rank", {[](const std::string & name,
             const DataTypes & argument_types, const Array & parameters, const Settings *)
         {
             return std::make_shared<WindowFunctionDenseRank>(name, argument_types,
                 parameters);
-        }, properties});
+        }, properties}, AggregateFunctionFactory::Case::Insensitive);
 
-    factory.registerAlias("dense_rank", "denseRank", AggregateFunctionFactory::Case::Insensitive);
-
-    factory.registerFunction("percentRank", {[](const std::string & name,
+    factory.registerFunction("percent_rank", {[](const std::string & name,
             const DataTypes & argument_types, const Array & parameters, const Settings *)
         {
             return std::make_shared<WindowFunctionPercentRank>(name, argument_types,
                 parameters);
-        }, properties});
-
-    factory.registerAlias("percent_rank", "percentRank", AggregateFunctionFactory::Case::Insensitive);
+        }, properties}, AggregateFunctionFactory::Case::Insensitive);
 
     factory.registerFunction("row_number", {[](const std::string & name,
             const DataTypes & argument_types, const Array & parameters, const Settings *)
diff --git a/src/Processors/Transforms/WindowTransform.h b/src/Processors/Transforms/WindowTransform.h
index cb672ad6841..f8ad3c92ac7 100644
--- a/src/Processors/Transforms/WindowTransform.h
+++ b/src/Processors/Transforms/WindowTransform.h
@@ -27,7 +27,6 @@ struct WindowTransformBlock
 {
     Columns original_input_columns;
     Columns input_columns;
-    Columns casted_columns;
     MutableColumns output_columns;
 
     size_t rows = 0;
diff --git a/src/Processors/tests/gtest_full_sorting_join.cpp b/src/Processors/tests/gtest_full_sorting_join.cpp
index befe5e28b5d..f678d7984e8 100644
--- a/src/Processors/tests/gtest_full_sorting_join.cpp
+++ b/src/Processors/tests/gtest_full_sorting_join.cpp
@@ -208,12 +208,6 @@ Block executePipeline(QueryPipeline && pipeline)
 template <typename T>
 void assertColumnVectorEq(const typename ColumnVector<T>::Container & expected, const Block & block, const std::string & name)
 {
-    if (expected.empty())
-    {
-        ASSERT_TRUE(block.columns() == 0);
-        return;
-    }
-
     const auto * actual = typeid_cast<const ColumnVector<T> *>(block.getByName(name).column.get());
     ASSERT_TRUE(actual) << "unexpected column type: " << block.getByName(name).column->dumpStructure() << "expected: " << typeid(ColumnVector<T>).name();
 
@@ -236,12 +230,6 @@ void assertColumnVectorEq(const typename ColumnVector<T>::Container & expected,
 template <typename T>
 void assertColumnEq(const IColumn & expected, const Block & block, const std::string & name)
 {
-    if (expected.empty())
-    {
-        ASSERT_TRUE(block.columns() == 0);
-        return;
-    }
-
     const ColumnPtr & actual = block.getByName(name).column;
     ASSERT_TRUE(checkColumn<T>(*actual));
     ASSERT_TRUE(checkColumn<T>(expected));
diff --git a/src/QueryPipeline/ProfileInfo.cpp b/src/QueryPipeline/ProfileInfo.cpp
index 69575939edc..ee0ff8c69bf 100644
--- a/src/QueryPipeline/ProfileInfo.cpp
+++ b/src/QueryPipeline/ProfileInfo.cpp
@@ -1,14 +1,14 @@
 #include <QueryPipeline/ProfileInfo.h>
 
-#include <Core/Block.h>
-#include <Core/ProtocolDefines.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 
+#include <Core/Block.h>
+
 namespace DB
 {
 
-void ProfileInfo::read(ReadBuffer & in, UInt64 server_revision)
+void ProfileInfo::read(ReadBuffer & in)
 {
     readVarUInt(rows, in);
     readVarUInt(blocks, in);
@@ -16,15 +16,10 @@ void ProfileInfo::read(ReadBuffer & in, UInt64 server_revision)
     readBinary(applied_limit, in);
     readVarUInt(rows_before_limit, in);
     readBinary(calculated_rows_before_limit, in);
-    if (server_revision >= DBMS_MIN_REVISION_WITH_ROWS_BEFORE_AGGREGATION)
-    {
-        readBinary(applied_aggregation, in);
-        readVarUInt(rows_before_aggregation, in);
-    }
 }
 
 
-void ProfileInfo::write(WriteBuffer & out, UInt64 client_revision) const
+void ProfileInfo::write(WriteBuffer & out) const
 {
     writeVarUInt(rows, out);
     writeVarUInt(blocks, out);
@@ -32,11 +27,6 @@ void ProfileInfo::write(WriteBuffer & out, UInt64 client_revision) const
     writeBinary(hasAppliedLimit(), out);
     writeVarUInt(getRowsBeforeLimit(), out);
     writeBinary(calculated_rows_before_limit, out);
-    if (client_revision >= DBMS_MIN_REVISION_WITH_ROWS_BEFORE_AGGREGATION)
-    {
-        writeBinary(hasAppliedAggregation(), out);
-        writeVarUInt(getRowsBeforeAggregation(), out);
-    }
 }
 
 
@@ -51,8 +41,6 @@ void ProfileInfo::setFrom(const ProfileInfo & rhs, bool skip_block_size_info)
     applied_limit = rhs.applied_limit;
     rows_before_limit = rhs.rows_before_limit;
     calculated_rows_before_limit = rhs.calculated_rows_before_limit;
-    applied_aggregation = rhs.applied_aggregation;
-    rows_before_aggregation = rhs.rows_before_aggregation;
 }
 
 
@@ -69,17 +57,6 @@ bool ProfileInfo::hasAppliedLimit() const
     return applied_limit;
 }
 
-size_t ProfileInfo::getRowsBeforeAggregation() const
-{
-    return rows_before_aggregation;
-}
-
-
-bool ProfileInfo::hasAppliedAggregation() const
-{
-    return applied_aggregation;
-}
-
 
 void ProfileInfo::update(Block & block)
 {
diff --git a/src/QueryPipeline/ProfileInfo.h b/src/QueryPipeline/ProfileInfo.h
index 92c83c8c3be..7a0a0c304e2 100644
--- a/src/QueryPipeline/ProfileInfo.h
+++ b/src/QueryPipeline/ProfileInfo.h
@@ -32,16 +32,13 @@ struct ProfileInfo
     size_t getRowsBeforeLimit() const;
     bool hasAppliedLimit() const;
 
-    size_t getRowsBeforeAggregation() const;
-    bool hasAppliedAggregation() const;
-
     void update(Block & block);
     void update(size_t num_rows, size_t num_bytes);
 
     /// Binary serialization and deserialization of main fields.
     /// Writes only main fields i.e. fields that required by internal transmission protocol.
-    void read(ReadBuffer & in, UInt64 server_revision);
-    void write(WriteBuffer & out, UInt64 client_revision) const;
+    void read(ReadBuffer & in);
+    void write(WriteBuffer & out) const;
 
     /// Sets main fields from other object (see methods above).
     /// If skip_block_size_info if true, then rows, bytes and block fields are ignored.
@@ -54,21 +51,11 @@ struct ProfileInfo
         rows_before_limit = rows_before_limit_;
     }
 
-    /// Only for Processors.
-    void setRowsBeforeAggregation(size_t rows_before_aggregation_)
-    {
-        applied_aggregation = true;
-        rows_before_aggregation = rows_before_aggregation_;
-    }
-
 private:
     /// For these fields we make accessors, because they must be calculated beforehand.
     mutable bool applied_limit = false;                    /// Whether LIMIT was applied
     mutable size_t rows_before_limit = 0;
-    mutable bool calculated_rows_before_limit = false; /// Whether the field rows was calculated
-
-    mutable bool applied_aggregation = false; /// Whether GROUP BY was applied
-    mutable size_t rows_before_aggregation = 0;
+    mutable bool calculated_rows_before_limit = false;    /// Whether the field rows_before_limit was calculated
 };
 
 }
diff --git a/src/QueryPipeline/QueryPipeline.cpp b/src/QueryPipeline/QueryPipeline.cpp
index c9c0bad7553..935c006c217 100644
--- a/src/QueryPipeline/QueryPipeline.cpp
+++ b/src/QueryPipeline/QueryPipeline.cpp
@@ -1,14 +1,15 @@
 #include <QueryPipeline/QueryPipeline.h>
 
 #include <queue>
-#include <Core/Settings.h>
-#include <Interpreters/ActionsDAG.h>
-#include <Interpreters/ExpressionActions.h>
+#include <QueryPipeline/Chain.h>
 #include <Processors/Formats/IOutputFormat.h>
 #include <Processors/IProcessor.h>
-#include <Processors/ISource.h>
 #include <Processors/LimitTransform.h>
-#include <Processors/QueryPlan/ReadFromPreparedSource.h>
+#include <Interpreters/ActionsDAG.h>
+#include <Interpreters/ExpressionActions.h>
+#include <QueryPipeline/ReadProgressCallback.h>
+#include <QueryPipeline/Pipe.h>
+#include <QueryPipeline/printPipeline.h>
 #include <Processors/Sinks/EmptySink.h>
 #include <Processors/Sinks/NullSink.h>
 #include <Processors/Sinks/SinkToStorage.h>
@@ -16,19 +17,15 @@
 #include <Processors/Sources/NullSource.h>
 #include <Processors/Sources/RemoteSource.h>
 #include <Processors/Sources/SourceFromChunks.h>
-#include <Processors/Transforms/AggregatingInOrderTransform.h>
-#include <Processors/Transforms/AggregatingTransform.h>
+#include <Processors/ISource.h>
 #include <Processors/Transforms/CountingTransform.h>
-#include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/Transforms/LimitsCheckingTransform.h>
 #include <Processors/Transforms/MaterializingTransform.h>
 #include <Processors/Transforms/PartialSortingTransform.h>
 #include <Processors/Transforms/StreamInQueryCacheTransform.h>
+#include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/Transforms/TotalsHavingTransform.h>
-#include <QueryPipeline/Chain.h>
-#include <QueryPipeline/Pipe.h>
-#include <QueryPipeline/ReadProgressCallback.h>
-#include <QueryPipeline/printPipeline.h>
+#include <Processors/QueryPlan/ReadFromPreparedSource.h>
 
 
 namespace DB
@@ -142,7 +139,7 @@ static void checkCompleted(Processors & processors)
 
 static void initRowsBeforeLimit(IOutputFormat * output_format)
 {
-    RowsBeforeStepCounterPtr rows_before_limit_at_least;
+    RowsBeforeLimitCounterPtr rows_before_limit_at_least;
     std::vector<IProcessor *> processors;
     std::map<LimitTransform *, std::vector<size_t>> limit_candidates;
     std::unordered_set<IProcessor *> visited;
@@ -264,7 +261,7 @@ static void initRowsBeforeLimit(IOutputFormat * output_format)
 
     if (!processors.empty())
     {
-        rows_before_limit_at_least = std::make_shared<RowsBeforeStepCounter>();
+        rows_before_limit_at_least = std::make_shared<RowsBeforeLimitCounter>();
         for (auto & processor : processors)
             processor->setRowsBeforeLimitCounter(rows_before_limit_at_least);
 
@@ -276,28 +273,7 @@ static void initRowsBeforeLimit(IOutputFormat * output_format)
         output_format->setRowsBeforeLimitCounter(rows_before_limit_at_least);
     }
 }
-static void initRowsBeforeAggregation(std::shared_ptr<Processors> processors, IOutputFormat * output_format)
-{
-    bool has_aggregation = false;
 
-    if (!processors->empty())
-    {
-        RowsBeforeStepCounterPtr rows_before_aggregation = std::make_shared<RowsBeforeStepCounter>();
-        for (const auto & processor : *processors)
-        {
-            if (typeid_cast<AggregatingTransform *>(processor.get()) || typeid_cast<AggregatingInOrderTransform *>(processor.get()))
-            {
-                processor->setRowsBeforeAggregationCounter(rows_before_aggregation);
-                has_aggregation = true;
-            }
-            if (typeid_cast<RemoteSource *>(processor.get()) || typeid_cast<DelayedSource *>(processor.get()))
-                processor->setRowsBeforeAggregationCounter(rows_before_aggregation);
-        }
-        if (has_aggregation)
-            rows_before_aggregation->add(0);
-        output_format->setRowsBeforeAggregationCounter(rows_before_aggregation);
-    }
-}
 
 QueryPipeline::QueryPipeline(
     QueryPlanResourceHolder resources_,
@@ -545,14 +521,6 @@ void QueryPipeline::complete(std::shared_ptr<IOutputFormat> format)
     extremes = nullptr;
 
     initRowsBeforeLimit(format.get());
-    for (const auto & context : resources.interpreter_context)
-    {
-        if (context->getSettingsRef().rows_before_aggregation)
-        {
-            initRowsBeforeAggregation(processors, format.get());
-            break;
-        }
-    }
     output_format = format.get();
 
     processors->emplace_back(std::move(format));
diff --git a/src/QueryPipeline/QueryPipelineBuilder.cpp b/src/QueryPipeline/QueryPipelineBuilder.cpp
index d276fed60a2..803d1686ad7 100644
--- a/src/QueryPipeline/QueryPipelineBuilder.cpp
+++ b/src/QueryPipeline/QueryPipelineBuilder.cpp
@@ -15,7 +15,7 @@
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/ResizeProcessor.h>
-#include <Processors/RowsBeforeStepCounter.h>
+#include <Processors/RowsBeforeLimitCounter.h>
 #include <Processors/Sources/RemoteSource.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Processors/Transforms/CreatingSetsTransform.h>
diff --git a/src/QueryPipeline/RemoteQueryExecutor.cpp b/src/QueryPipeline/RemoteQueryExecutor.cpp
index 6f8b3931803..b08f2002f64 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.cpp
+++ b/src/QueryPipeline/RemoteQueryExecutor.cpp
@@ -89,12 +89,12 @@ RemoteQueryExecutor::RemoteQueryExecutor(
             auto table_name = main_table.getQualifiedName();
 
             ConnectionEstablisher connection_establisher(pool, &timeouts, current_settings, log, &table_name);
-            connection_establisher.run(result, fail_message, /*force_connected=*/ true);
+            connection_establisher.run(result, fail_message);
         }
         else
         {
             ConnectionEstablisher connection_establisher(pool, &timeouts, current_settings, log, nullptr);
-            connection_establisher.run(result, fail_message, /*force_connected=*/ true);
+            connection_establisher.run(result, fail_message);
         }
 
         std::vector<IConnectionPool::Entry> connection_entries;
@@ -488,17 +488,6 @@ RemoteQueryExecutor::ReadResult RemoteQueryExecutor::readAsync()
         if (was_cancelled)
             return ReadResult(Block());
 
-        if (has_postponed_packet)
-        {
-            has_postponed_packet = false;
-            auto read_result = processPacket(read_context->getPacket());
-            if (read_result.getType() == ReadResult::Type::Data || read_result.getType() == ReadResult::Type::ParallelReplicasToken)
-                return read_result;
-
-            if (got_duplicated_part_uuids)
-                break;
-        }
-
         read_context->resume();
 
         if (isReplicaUnavailable() || needToSkipUnavailableShard())
@@ -519,9 +508,10 @@ RemoteQueryExecutor::ReadResult RemoteQueryExecutor::readAsync()
         if (read_context->isInProgress())
             return ReadResult(read_context->getFileDescriptor());
 
-        auto read_result = processPacket(read_context->getPacket());
-        if (read_result.getType() == ReadResult::Type::Data || read_result.getType() == ReadResult::Type::ParallelReplicasToken)
-            return read_result;
+        auto anything = processPacket(read_context->getPacket());
+
+        if (anything.getType() == ReadResult::Type::Data || anything.getType() == ReadResult::Type::ParallelReplicasToken)
+            return anything;
 
         if (got_duplicated_part_uuids)
             break;
@@ -924,37 +914,4 @@ bool RemoteQueryExecutor::needToSkipUnavailableShard() const
     return context->getSettingsRef().skip_unavailable_shards && (0 == connections->size());
 }
 
-bool RemoteQueryExecutor::processParallelReplicaPacketIfAny()
-{
-#if defined(OS_LINUX)
-
-    std::lock_guard lock(was_cancelled_mutex);
-    if (was_cancelled)
-        return false;
-
-    if (!read_context || (resent_query && recreate_read_context))
-    {
-        read_context = std::make_unique<ReadContext>(*this);
-        recreate_read_context = false;
-    }
-
-    chassert(!has_postponed_packet);
-
-    read_context->resume();
-    if (read_context->isInProgress()) // <- nothing to process
-        return false;
-
-    const auto packet_type = read_context->getPacketType();
-    if (packet_type == Protocol::Server::MergeTreeReadTaskRequest || packet_type == Protocol::Server::MergeTreeAllRangesAnnouncement)
-    {
-        processPacket(read_context->getPacket());
-        return true;
-    }
-
-    has_postponed_packet = true;
-
-#endif
-
-    return false;
-}
 }
diff --git a/src/QueryPipeline/RemoteQueryExecutor.h b/src/QueryPipeline/RemoteQueryExecutor.h
index 83f33607dbf..04a59cc3b7e 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.h
+++ b/src/QueryPipeline/RemoteQueryExecutor.h
@@ -8,6 +8,7 @@
 #include <Storages/IStorage_fwd.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/StorageID.h>
+#include <Common/TimerDescriptor.h>
 #include <sys/types.h>
 
 
@@ -221,9 +222,6 @@ public:
 
     bool isReplicaUnavailable() const { return extension && extension->parallel_reading_coordinator && connections->size() == 0; }
 
-    /// return true if parallel replica packet was processed
-    bool processParallelReplicaPacketIfAny();
-
 private:
     RemoteQueryExecutor(
         const String & query_,
@@ -305,8 +303,6 @@ private:
       */
     bool got_duplicated_part_uuids = false;
 
-    bool has_postponed_packet = false;
-
     /// Parts uuids, collected from remote replicas
     std::vector<UUID> duplicated_part_uuids;
 
diff --git a/src/QueryPipeline/RemoteQueryExecutorReadContext.h b/src/QueryPipeline/RemoteQueryExecutorReadContext.h
index ef30971fdbe..b8aa8bb9111 100644
--- a/src/QueryPipeline/RemoteQueryExecutorReadContext.h
+++ b/src/QueryPipeline/RemoteQueryExecutorReadContext.h
@@ -39,8 +39,6 @@ public:
 
     Packet getPacket() { return std::move(packet); }
 
-    UInt64 getPacketType() const { return packet.type; }
-
 private:
     bool checkTimeout(bool blocking = false);
 
@@ -71,7 +69,7 @@ private:
     /// * timer is a timerfd descriptor to manually check socket timeout
     /// * pipe_fd is a pipe we use to cancel query and socket polling by executor.
     /// We put those descriptors into our own epoll which is used by external executor.
-    TimerDescriptor timer;
+    TimerDescriptor timer{CLOCK_MONOTONIC, 0};
     Poco::Timespan timeout;
     AsyncEventTimeoutType timeout_type;
     std::atomic_bool is_timer_alarmed = false;
diff --git a/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp b/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp
index f41a447049c..bc22f249f97 100644
--- a/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp
+++ b/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp
@@ -83,7 +83,7 @@ TEST(MergingSortedTest, SimpleBlockSizeTest)
     EXPECT_EQ(pipe.numOutputPorts(), 3);
 
     auto transform = std::make_shared<MergingSortedTransform>(pipe.getHeader(), pipe.numOutputPorts(), sort_description,
-        8192, /*max_block_size_bytes=*/0, SortingQueueStrategy::Batch, 0, false, nullptr, true);
+        8192, /*max_block_size_bytes=*/0, SortingQueueStrategy::Batch, 0, false, nullptr, false, true);
 
     pipe.addTransform(std::move(transform));
 
@@ -125,7 +125,7 @@ TEST(MergingSortedTest, MoreInterestingBlockSizes)
     EXPECT_EQ(pipe.numOutputPorts(), 3);
 
     auto transform = std::make_shared<MergingSortedTransform>(pipe.getHeader(), pipe.numOutputPorts(), sort_description,
-        8192, /*max_block_size_bytes=*/0, SortingQueueStrategy::Batch, 0, false, nullptr, true);
+        8192, /*max_block_size_bytes=*/0, SortingQueueStrategy::Batch, 0, false, nullptr, false, true);
 
     pipe.addTransform(std::move(transform));
 
diff --git a/src/Server/GRPCServer.cpp b/src/Server/GRPCServer.cpp
index 9c8e0c6bf73..d8a4d7f0e1f 100644
--- a/src/Server/GRPCServer.cpp
+++ b/src/Server/GRPCServer.cpp
@@ -1577,8 +1577,6 @@ namespace
         stats.set_allocated_bytes(info.bytes);
         stats.set_applied_limit(info.hasAppliedLimit());
         stats.set_rows_before_limit(info.getRowsBeforeLimit());
-        stats.set_applied_aggregation(info.hasAppliedAggregation());
-        stats.set_rows_before_aggregation(info.getRowsBeforeAggregation());
     }
 
     void Call::addLogsToResult()
diff --git a/src/Server/HTTP/HTTPServerConnection.cpp b/src/Server/HTTP/HTTPServerConnection.cpp
index 39e066005b9..047db014560 100644
--- a/src/Server/HTTP/HTTPServerConnection.cpp
+++ b/src/Server/HTTP/HTTPServerConnection.cpp
@@ -2,7 +2,6 @@
 #include <Server/TCPServer.h>
 
 #include <Poco/Net/NetException.h>
-#include <Common/logger_useful.h>
 
 namespace DB
 {
@@ -98,21 +97,6 @@ void HTTPServerConnection::run()
         {
             sendErrorResponse(session, Poco::Net::HTTPResponse::HTTP_BAD_REQUEST);
         }
-        catch (const Poco::Net::NetException & e)
-        {
-            /// Do not spam logs with messages related to connection reset by peer.
-            if (e.code() == POCO_ENOTCONN)
-            {
-                LOG_DEBUG(LogFrequencyLimiter(getLogger("HTTPServerConnection"), 10), "Connection reset by peer while processing HTTP request: {}", e.message());
-                break;
-            }
-
-            if (session.networkException())
-                session.networkException()->rethrow();
-            else
-                throw;
-        }
-
         catch (const Poco::Exception &)
         {
             if (session.networkException())
diff --git a/src/Server/HTTP/HTTPServerResponse.h b/src/Server/HTTP/HTTPServerResponse.h
index 51f5814556d..ac4f52e7766 100644
--- a/src/Server/HTTP/HTTPServerResponse.h
+++ b/src/Server/HTTP/HTTPServerResponse.h
@@ -248,8 +248,6 @@ public:
 
     void attachRequest(HTTPServerRequest * request_) { request = request_; }
 
-    const Poco::Net::HTTPServerSession & getSession() const { return session; }
-
 private:
     Poco::Net::HTTPServerSession & session;
     HTTPServerRequest * request = nullptr;
diff --git a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
index 946eaf8aea4..e2098b284bf 100644
--- a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
+++ b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
@@ -30,7 +30,7 @@ void WriteBufferFromHTTPServerResponse::startSendHeaders()
         if (add_cors_header)
             response.set("Access-Control-Allow-Origin", "*");
 
-        setResponseDefaultHeaders(response);
+        setResponseDefaultHeaders(response, keep_alive_timeout);
 
         std::stringstream header; //STYLE_CHECK_ALLOW_STD_STRING_STREAM
         response.beginWrite(header);
@@ -83,11 +83,7 @@ void WriteBufferFromHTTPServerResponse::finishSendHeaders()
         return;
 
     if (!headers_started_sending)
-    {
-        if (compression_method != CompressionMethod::None)
-            response.set("Content-Encoding", toContentEncodingName(compression_method));
         startSendHeaders();
-    }
 
     writeHeaderSummary();
     writeExceptionCode();
@@ -109,13 +105,7 @@ void WriteBufferFromHTTPServerResponse::nextImpl()
         initialized = true;
 
         if (compression_method != CompressionMethod::None)
-        {
-            /// If we've already sent headers, just send the `Content-Encoding` down the socket directly
-            if (headers_started_sending)
-                socketSendStr("Content-Encoding: " + toContentEncodingName(compression_method) + "\r\n");
-            else
-                response.set("Content-Encoding", toContentEncodingName(compression_method));
-        }
+            response.set("Content-Encoding", toContentEncodingName(compression_method));
 
         startSendHeaders();
         finishSendHeaders();
@@ -129,10 +119,12 @@ void WriteBufferFromHTTPServerResponse::nextImpl()
 WriteBufferFromHTTPServerResponse::WriteBufferFromHTTPServerResponse(
     HTTPServerResponse & response_,
     bool is_http_method_head_,
+    UInt64 keep_alive_timeout_,
     const ProfileEvents::Event & write_event_)
     : HTTPWriteBuffer(response_.getSocket(), write_event_)
     , response(response_)
     , is_http_method_head(is_http_method_head_)
+    , keep_alive_timeout(keep_alive_timeout_)
 {
 }
 
@@ -187,12 +179,8 @@ void WriteBufferFromHTTPServerResponse::finalizeImpl()
         /// If no body data just send header
         startSendHeaders();
 
-        /// `finalizeImpl` must be idempotent, so set `initialized` here to not send stuff twice
         if (!initialized && offset() && compression_method != CompressionMethod::None)
-        {
-            initialized = true;
             socketSendStr("Content-Encoding: " + toContentEncodingName(compression_method) + "\r\n");
-        }
 
         finishSendHeaders();
     }
diff --git a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.h b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.h
index f0c80f24582..a3952b7c553 100644
--- a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.h
+++ b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.h
@@ -29,6 +29,7 @@ public:
     WriteBufferFromHTTPServerResponse(
         HTTPServerResponse & response_,
         bool is_http_method_head_,
+        UInt64 keep_alive_timeout_,
         const ProfileEvents::Event & write_event_ = ProfileEvents::end());
 
     ~WriteBufferFromHTTPServerResponse() override;
@@ -90,6 +91,7 @@ private:
 
     bool is_http_method_head;
     bool add_cors_header = false;
+    size_t keep_alive_timeout = 0;
 
     bool initialized = false;
 
diff --git a/src/Server/HTTP/checkHTTPHeader.cpp b/src/Server/HTTP/checkHTTPHeader.cpp
deleted file mode 100644
index 812adde022a..00000000000
--- a/src/Server/HTTP/checkHTTPHeader.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Server/HTTP/checkHTTPHeader.h>
-
-#include <Common/Exception.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int UNEXPECTED_HTTP_HEADERS;
-}
-
-void checkHTTPHeader(const HTTPRequest & request, const String & header_name, const String & expected_value)
-{
-    if (!request.has(header_name))
-        throw Exception(ErrorCodes::UNEXPECTED_HTTP_HEADERS, "No HTTP header {}", header_name);
-    if (request.get(header_name) != expected_value)
-        throw Exception(ErrorCodes::UNEXPECTED_HTTP_HEADERS, "HTTP header {} has unexpected value '{}' (instead of '{}')", header_name, request.get(header_name), expected_value);
-}
-
-}
diff --git a/src/Server/HTTP/checkHTTPHeader.h b/src/Server/HTTP/checkHTTPHeader.h
deleted file mode 100644
index 956599ae66b..00000000000
--- a/src/Server/HTTP/checkHTTPHeader.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <Server/HTTP/HTTPRequest.h>
-#include <base/types.h>
-
-
-namespace DB
-{
-
-/// Checks that the HTTP request has a specified header with a specified value.
-void checkHTTPHeader(const HTTPRequest & request, const String & header_name, const String & expected_value);
-
-}
diff --git a/src/Server/HTTP/sendExceptionToHTTPClient.cpp b/src/Server/HTTP/sendExceptionToHTTPClient.cpp
index 07a649dc396..022a763a9a2 100644
--- a/src/Server/HTTP/sendExceptionToHTTPClient.cpp
+++ b/src/Server/HTTP/sendExceptionToHTTPClient.cpp
@@ -29,7 +29,7 @@ void sendExceptionToHTTPClient(
     if (!out)
     {
         /// If nothing was sent yet.
-        WriteBufferFromHTTPServerResponse out_for_message{response, request.getMethod() == HTTPRequest::HTTP_HEAD};
+        WriteBufferFromHTTPServerResponse out_for_message{response, request.getMethod() == HTTPRequest::HTTP_HEAD, DEFAULT_HTTP_KEEP_ALIVE_TIMEOUT};
 
         out_for_message.writeln(exception_message);
         out_for_message.finalize();
@@ -43,6 +43,7 @@ void sendExceptionToHTTPClient(
             out->position() = out->buffer().begin();
 
         out->writeln(exception_message);
+        out->finalize();
     }
 }
 
diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp
index d2bc22e98cc..c8a58527f2c 100644
--- a/src/Server/HTTPHandler.cpp
+++ b/src/Server/HTTPHandler.cpp
@@ -266,6 +266,7 @@ void HTTPHandler::processQuery(
         std::make_shared<WriteBufferFromHTTPServerResponse>(
             response,
             request.getMethod() == HTTPRequest::HTTP_HEAD,
+            context->getServerSettings().keep_alive_timeout.totalSeconds(),
             write_event);
     used_output.out = used_output.out_holder;
     used_output.out_maybe_compressed = used_output.out_holder;
@@ -557,7 +558,7 @@ try
     if (!used_output.out_holder && !used_output.exception_is_written)
     {
         /// If nothing was sent yet and we don't even know if we must compress the response.
-        WriteBufferFromHTTPServerResponse(response, request.getMethod() == HTTPRequest::HTTP_HEAD).writeln(s);
+        WriteBufferFromHTTPServerResponse(response, request.getMethod() == HTTPRequest::HTTP_HEAD, DEFAULT_HTTP_KEEP_ALIVE_TIMEOUT).writeln(s);
     }
     else if (used_output.out_maybe_compressed)
     {
diff --git a/src/Server/HTTPHandlerFactory.cpp b/src/Server/HTTPHandlerFactory.cpp
index fc31ad2874e..5344b2d024b 100644
--- a/src/Server/HTTPHandlerFactory.cpp
+++ b/src/Server/HTTPHandlerFactory.cpp
@@ -1,16 +1,18 @@
+#include <memory>
 #include <Server/HTTPHandlerFactory.h>
 
 #include <Server/HTTP/HTTPRequestHandler.h>
-#include <Server/PrometheusMetricsWriter.h>
-#include <Server/PrometheusRequestHandlerFactory.h>
 #include <Server/IServer.h>
+#include <Access/Credentials.h>
 
 #include <Poco/Util/AbstractConfiguration.h>
 
 #include "HTTPHandler.h"
+#include "Server/PrometheusMetricsWriter.h"
 #include "StaticRequestHandler.h"
 #include "ReplicasStatusHandler.h"
 #include "InterserverIOHTTPHandler.h"
+#include "PrometheusRequestHandler.h"
 #include "WebUIRequestHandler.h"
 
 
@@ -122,8 +124,7 @@ static inline auto createHandlersFactoryFromConfig(
             }
             else if (handler_type == "prometheus")
             {
-                main_handler_factory->addHandler(
-                    createPrometheusHandlerFactoryForHTTPRule(server, config, prefix + "." + key, async_metrics));
+                main_handler_factory->addHandler(createPrometheusHandlerFactory(server, config, async_metrics, prefix + "." + key));
             }
             else if (handler_type == "replicas_status")
             {
@@ -200,7 +201,10 @@ HTTPRequestHandlerFactoryPtr createHandlerFactory(IServer & server, const Poco::
     else if (name == "InterserverIOHTTPHandler-factory" || name == "InterserverIOHTTPSHandler-factory")
         return createInterserverHTTPHandlerFactory(server, name);
     else if (name == "PrometheusHandler-factory")
-        return createPrometheusHandlerFactory(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, "Unknown HTTP handler factory name.");
 }
@@ -287,9 +291,20 @@ void addDefaultHandlersFactory(
     );
     factory.addHandler(query_handler);
 
-    /// createPrometheusHandlerFactoryForHTTPRuleDefaults() can return nullptr if prometheus protocols must not be served on http port.
-    if (auto prometheus_handler = createPrometheusHandlerFactoryForHTTPRuleDefaults(server, config, async_metrics))
+    /// We check that prometheus handler will be served on current (default) port.
+    /// Otherwise it will be created separately, see createHandlerFactory(...).
+    if (config.has("prometheus") && config.getInt("prometheus.port", 0) == 0)
+    {
+        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);
+        };
+        auto prometheus_handler = std::make_shared<HandlingRuleHTTPHandlerFactory<PrometheusRequestHandler>>(std::move(creator));
+        prometheus_handler->attachStrictPath(config.getString("prometheus.endpoint", "/metrics"));
+        prometheus_handler->allowGetAndHeadRequest();
         factory.addHandler(prometheus_handler);
+    }
 }
 
 }
diff --git a/src/Server/HTTPHandlerFactory.h b/src/Server/HTTPHandlerFactory.h
index db4bb73cbc4..b4c32366463 100644
--- a/src/Server/HTTPHandlerFactory.h
+++ b/src/Server/HTTPHandlerFactory.h
@@ -1,11 +1,14 @@
 #pragma once
 
+#include <Common/AsynchronousMetrics.h>
+#include <Server/HTTP/HTMLForm.h>
 #include <Server/HTTP/HTTPRequestHandlerFactory.h>
 #include <Server/HTTPHandlerRequestFilter.h>
 #include <Server/HTTPRequestHandlerFactoryMain.h>
 #include <Common/StringUtils.h>
-#include <Poco/Util/AbstractConfiguration.h>
+#include <Server/PrometheusMetricsWriter.h>
 
+#include <Poco/Util/AbstractConfiguration.h>
 
 namespace DB
 {
@@ -16,7 +19,6 @@ namespace ErrorCodes
 }
 
 class IServer;
-class AsynchronousMetrics;
 
 template <typename TEndpoint>
 class HandlingRuleHTTPHandlerFactory : public HTTPRequestHandlerFactory
@@ -124,6 +126,18 @@ HTTPRequestHandlerFactoryPtr createReplicasStatusHandlerFactory(IServer & server
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix);
 
+HTTPRequestHandlerFactoryPtr
+createPrometheusHandlerFactory(IServer & server,
+    const Poco::Util::AbstractConfiguration & config,
+    AsynchronousMetrics & async_metrics,
+    const std::string & config_prefix);
+
+HTTPRequestHandlerFactoryPtr createPrometheusMainHandlerFactory(
+    IServer & server,
+    const Poco::Util::AbstractConfiguration & config,
+    PrometheusMetricsWriterPtr metrics_writer,
+    const std::string & name);
+
 /// @param server - used in handlers to check IServer::isCancelled()
 /// @param config - not the same as server.config(), since it can be newer
 /// @param async_metrics - used for prometheus (in case of prometheus.asynchronous_metrics=true)
diff --git a/src/Server/InterserverIOHTTPHandler.cpp b/src/Server/InterserverIOHTTPHandler.cpp
index 59852c79139..e46021c8e68 100644
--- a/src/Server/InterserverIOHTTPHandler.cpp
+++ b/src/Server/InterserverIOHTTPHandler.cpp
@@ -87,8 +87,9 @@ void InterserverIOHTTPHandler::handleRequest(HTTPServerRequest & request, HTTPSe
         response.setChunkedTransferEncoding(true);
 
     Output used_output;
+    const auto keep_alive_timeout = server.context()->getServerSettings().keep_alive_timeout.totalSeconds();
     used_output.out = std::make_shared<WriteBufferFromHTTPServerResponse>(
-        response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, write_event);
+        response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout, write_event);
 
     auto finalize_output = [&]
     {
diff --git a/src/Server/MySQLHandler.cpp b/src/Server/MySQLHandler.cpp
index 3deb09bae88..b6d795b1e69 100644
--- a/src/Server/MySQLHandler.cpp
+++ b/src/Server/MySQLHandler.cpp
@@ -473,7 +473,7 @@ void MySQLHandler::comQuery(ReadBuffer & payload, bool binary_protocol)
         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->getSettingsCopy();
+        auto settings = query_context->getSettings();
         settings.prefer_column_name_to_alias = true;
         query_context->setSettings(settings);
 
diff --git a/src/Server/PrometheusMetricsWriter.cpp b/src/Server/PrometheusMetricsWriter.cpp
index 43370116015..85eafbe4808 100644
--- a/src/Server/PrometheusMetricsWriter.cpp
+++ b/src/Server/PrometheusMetricsWriter.cpp
@@ -1,27 +1,13 @@
 #include "PrometheusMetricsWriter.h"
 
-#include <Common/AsynchronousMetrics.h>
-#include <Common/CurrentMetrics.h>
+#include <IO/WriteHelpers.h>
 #include <Common/ErrorCodes.h>
 #include <Common/re2.h>
-#include <IO/WriteHelpers.h>
+
+#include <algorithm>
 
 #include "config.h"
 
-
-#if USE_NURAFT
-namespace ProfileEvents
-{
-    extern const std::vector<Event> keeper_profile_events;
-}
-
-namespace CurrentMetrics
-{
-    extern const std::vector<Metric> keeper_metrics;
-}
-#endif
-
-
 namespace
 {
 
@@ -121,84 +107,100 @@ void writeAsyncMetrics(DB::WriteBuffer & wb, const DB::AsynchronousMetricValues
 
 }
 
+#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
 {
 
-void PrometheusMetricsWriter::writeEvents(WriteBuffer & wb) const
+PrometheusMetricsWriter::PrometheusMetricsWriter(
+    const Poco::Util::AbstractConfiguration & config, const std::string & config_name,
+    const AsynchronousMetrics & async_metrics_)
+    : async_metrics(async_metrics_)
+    , send_events(config.getBool(config_name + ".events", true))
+    , send_metrics(config.getBool(config_name + ".metrics", true))
+    , send_asynchronous_metrics(config.getBool(config_name + ".asynchronous_metrics", true))
+    , send_errors(config.getBool(config_name + ".errors", true))
 {
-    for (ProfileEvents::Event i = ProfileEvents::Event(0), end = ProfileEvents::end(); i < end; ++i)
-        writeEvent(wb, i);
 }
 
-void PrometheusMetricsWriter::writeMetrics(WriteBuffer & wb) const
+void PrometheusMetricsWriter::write(WriteBuffer & wb) const
 {
-    for (size_t i = 0, end = CurrentMetrics::end(); i < end; ++i)
-        writeMetric(wb, i);
-}
-
-void PrometheusMetricsWriter::writeAsynchronousMetrics(WriteBuffer & wb, const AsynchronousMetrics & async_metrics) const
-{
-    writeAsyncMetrics(wb, async_metrics.getValues());
-}
-
-void PrometheusMetricsWriter::writeErrors(WriteBuffer & wb) const
-{
-    size_t total_count = 0;
-
-    for (size_t i = 0, end = ErrorCodes::end(); i < end; ++i)
+    if (send_events)
     {
-        const auto & error = ErrorCodes::values[i].get();
-        std::string_view name = ErrorCodes::getName(static_cast<ErrorCodes::ErrorCode>(i));
-
-        if (name.empty())
-            continue;
-
-        std::string key{error_metrics_prefix + toString(name)};
-        std::string help = fmt::format("The number of {} errors since last server restart", name);
-
-        writeOutLine(wb, "# HELP", key, help);
-        writeOutLine(wb, "# TYPE", key, "counter");
-        /// We are interested in errors which are happened only on this server.
-        writeOutLine(wb, key, error.local.count);
-
-        total_count += error.local.count;
+        for (ProfileEvents::Event i = ProfileEvents::Event(0), end = ProfileEvents::end(); i < end; ++i)
+            writeEvent(wb, i);
+    }
+
+    if (send_metrics)
+    {
+        for (size_t i = 0, end = CurrentMetrics::end(); i < end; ++i)
+            writeMetric(wb, i);
+    }
+
+    if (send_asynchronous_metrics)
+        writeAsyncMetrics(wb, async_metrics.getValues());
+
+    if (send_errors)
+    {
+        size_t total_count = 0;
+
+        for (size_t i = 0, end = ErrorCodes::end(); i < end; ++i)
+        {
+            const auto & error = ErrorCodes::values[i].get();
+            std::string_view name = ErrorCodes::getName(static_cast<ErrorCodes::ErrorCode>(i));
+
+            if (name.empty())
+                continue;
+
+            std::string key{error_metrics_prefix + toString(name)};
+            std::string help = fmt::format("The number of {} errors since last server restart", name);
+
+            writeOutLine(wb, "# HELP", key, help);
+            writeOutLine(wb, "# TYPE", key, "counter");
+            /// We are interested in errors which are happened only on this server.
+            writeOutLine(wb, key, error.local.count);
+
+            total_count += error.local.count;
+        }
+
+        /// Write the total number of errors as a separate metric
+        std::string key{error_metrics_prefix + toString("ALL")};
+        writeOutLine(wb, "# HELP", key, "The total number of errors since last server restart");
+        writeOutLine(wb, "# TYPE", key, "counter");
+        writeOutLine(wb, key, total_count);
     }
 
-    /// Write the total number of errors as a separate metric
-    std::string key{error_metrics_prefix + toString("ALL")};
-    writeOutLine(wb, "# HELP", key, "The total number of errors since last server restart");
-    writeOutLine(wb, "# TYPE", key, "counter");
-    writeOutLine(wb, key, total_count);
 }
 
-
-void KeeperPrometheusMetricsWriter::writeEvents([[maybe_unused]] WriteBuffer & wb) const
+void KeeperPrometheusMetricsWriter::write([[maybe_unused]] WriteBuffer & wb) const
 {
 #if USE_NURAFT
-    for (auto event : ProfileEvents::keeper_profile_events)
-        writeEvent(wb, event);
+    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
 }
 
-void KeeperPrometheusMetricsWriter::writeMetrics([[maybe_unused]] WriteBuffer & wb) const
-{
-#if USE_NURAFT
-    for (auto metric : CurrentMetrics::keeper_metrics)
-        writeMetric(wb, metric);
-#endif
-}
-
-void KeeperPrometheusMetricsWriter::writeAsynchronousMetrics([[maybe_unused]] WriteBuffer & wb,
-                                                             [[maybe_unused]] const AsynchronousMetrics & async_metrics) const
-{
-#if USE_NURAFT
-    writeAsyncMetrics(wb, async_metrics.getValues());
-#endif
-}
-
-void KeeperPrometheusMetricsWriter::writeErrors(WriteBuffer &) const
-{
-}
-
 }
diff --git a/src/Server/PrometheusMetricsWriter.h b/src/Server/PrometheusMetricsWriter.h
index cf2587d80b8..933ad909ee0 100644
--- a/src/Server/PrometheusMetricsWriter.h
+++ b/src/Server/PrometheusMetricsWriter.h
@@ -1,33 +1,44 @@
 #pragma once
 
-#include <memory>
+#include <string>
+
+#include <Common/AsynchronousMetrics.h>
+#include <Common/ProfileEvents.h>
+#include <IO/WriteBuffer.h>
+
+#include <Poco/Util/AbstractConfiguration.h>
 
 
 namespace DB
 {
-class AsynchronousMetrics;
-class WriteBuffer;
 
 /// Write metrics in Prometheus format
 class PrometheusMetricsWriter
 {
 public:
+    PrometheusMetricsWriter(
+        const Poco::Util::AbstractConfiguration & config, const std::string & config_name,
+        const AsynchronousMetrics & async_metrics_);
+
+    virtual void write(WriteBuffer & wb) const;
+
     virtual ~PrometheusMetricsWriter() = default;
 
-    virtual void writeMetrics(WriteBuffer & wb) const;
-    virtual void writeAsynchronousMetrics(WriteBuffer & wb, const AsynchronousMetrics & async_metrics) const;
-    virtual void writeEvents(WriteBuffer & wb) const;
-    virtual void writeErrors(WriteBuffer & wb) const;
+protected:
+    const AsynchronousMetrics & async_metrics;
+    const bool send_events;
+    const bool send_metrics;
+    const bool send_asynchronous_metrics;
+    const bool send_errors;
 };
 
-
 class KeeperPrometheusMetricsWriter : public PrometheusMetricsWriter
 {
-public:
-    void writeMetrics(WriteBuffer & wb) const override;
-    void writeAsynchronousMetrics(WriteBuffer & wb, const AsynchronousMetrics & async_metrics) const override;
-    void writeEvents(WriteBuffer & wb) const override;
-    void writeErrors(WriteBuffer & wb) const override;
+    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 ae1fb6d629e..87c106c3fc0 100644
--- a/src/Server/PrometheusRequestHandler.cpp
+++ b/src/Server/PrometheusRequestHandler.cpp
@@ -1,447 +1,74 @@
 #include <Server/PrometheusRequestHandler.h>
 
-#include <Common/logger_useful.h>
-#include <Common/setThreadName.h>
 #include <IO/HTTPCommon.h>
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
-#include <Server/HTTP/sendExceptionToHTTPClient.h>
+#include <Server/HTTPHandlerFactory.h>
 #include <Server/IServer.h>
-#include <Server/PrometheusMetricsWriter.h>
-#include "config.h"
+#include <Common/CurrentMetrics.h>
+#include <Common/Exception.h>
+#include <Common/ProfileEvents.h>
+#include "Server/PrometheusMetricsWriter.h"
 
-#include <Access/Credentials.h>
-#include <Common/CurrentThread.h>
-#include <IO/SnappyReadBuffer.h>
-#include <IO/SnappyWriteBuffer.h>
-#include <IO/Protobuf/ProtobufZeroCopyInputStreamFromReadBuffer.h>
-#include <IO/Protobuf/ProtobufZeroCopyOutputStreamFromWriteBuffer.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/DatabaseCatalog.h>
-#include <Interpreters/Session.h>
-#include <Server/HTTP/HTMLForm.h>
-#include <Server/HTTP/authenticateUserByHTTP.h>
-#include <Server/HTTP/checkHTTPHeader.h>
-#include <Server/HTTP/setReadOnlyIfHTTPMethodIdempotent.h>
-#include <Storages/TimeSeries/PrometheusRemoteReadProtocol.h>
-#include <Storages/TimeSeries/PrometheusRemoteWriteProtocol.h>
+#include <Poco/Util/LayeredConfiguration.h>
 
 
 namespace DB
 {
-
-namespace ErrorCodes
+void PrometheusRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event)
 {
-    extern const int BAD_ARGUMENTS;
-    extern const int SUPPORT_IS_DISABLED;
-    extern const int LOGICAL_ERROR;
-}
-
-/// Base implementation of a prometheus protocol.
-class PrometheusRequestHandler::Impl
-{
-public:
-    explicit Impl(PrometheusRequestHandler & parent) : parent_ref(parent) {}
-    virtual ~Impl() = default;
-    virtual void beforeHandlingRequest(HTTPServerRequest & /* request */) {}
-    virtual void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response) = 0;
-    virtual void onException() {}
-
-protected:
-    PrometheusRequestHandler & parent() { return parent_ref; }
-    IServer & server() { return parent().server; }
-    const PrometheusRequestHandlerConfig & config() { return parent().config; }
-    PrometheusMetricsWriter & metrics_writer() { return *parent().metrics_writer; }
-    LoggerPtr log() { return parent().log; }
-    WriteBuffer & getOutputStream(HTTPServerResponse & response) { return parent().getOutputStream(response); }
-
-private:
-    PrometheusRequestHandler & parent_ref;
-};
-
-
-/// Implementation of the exposing metrics protocol.
-class PrometheusRequestHandler::ExposeMetricsImpl : public Impl
-{
-public:
-    explicit ExposeMetricsImpl(PrometheusRequestHandler & parent) : Impl(parent) {}
-
-    void beforeHandlingRequest(HTTPServerRequest & request) override
-    {
-        LOG_INFO(log(), "Handling metrics request from {}", request.get("User-Agent"));
-        chassert(config().type == PrometheusRequestHandlerConfig::Type::ExposeMetrics);
-    }
-
-    void handleRequest(HTTPServerRequest & /* request */, HTTPServerResponse & response) override
-    {
-        response.setContentType("text/plain; version=0.0.4; charset=UTF-8");
-        auto & out = getOutputStream(response);
-
-        if (config().expose_events)
-            metrics_writer().writeEvents(out);
-
-        if (config().expose_metrics)
-            metrics_writer().writeMetrics(out);
-
-        if (config().expose_asynchronous_metrics)
-            metrics_writer().writeAsynchronousMetrics(out, parent().async_metrics);
-
-        if (config().expose_errors)
-            metrics_writer().writeErrors(out);
-    }
-};
-
-
-/// Base implementation of a protocol with Context and authentication.
-class PrometheusRequestHandler::ImplWithContext : public Impl
-{
-public:
-    explicit ImplWithContext(PrometheusRequestHandler & parent) : Impl(parent), default_settings(server().context()->getSettingsRef()) { }
-
-    virtual void handlingRequestWithContext(HTTPServerRequest & request, HTTPServerResponse & response) = 0;
-
-protected:
-    void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response) override
-    {
-        SCOPE_EXIT({
-            request_credentials.reset();
-            context.reset();
-            session.reset();
-            params.reset();
-        });
-
-        params = std::make_unique<HTMLForm>(default_settings, request);
-        parent().send_stacktrace = config().is_stacktrace_enabled && params->getParsed<bool>("stacktrace", false);
-
-        if (!authenticateUserAndMakeContext(request, response))
-            return; /// The user is not authenticated yet, and the HTTP_UNAUTHORIZED response is sent with the "WWW-Authenticate" header,
-                    /// and `request_credentials` must be preserved until the next request or until any exception.
-
-        /// Initialize query scope.
-        std::optional<CurrentThread::QueryScope> query_scope;
-        if (context)
-            query_scope.emplace(context);
-
-        handlingRequestWithContext(request, response);
-    }
-
-    bool authenticateUserAndMakeContext(HTTPServerRequest & request, HTTPServerResponse & response)
-    {
-        session = std::make_unique<Session>(server().context(), ClientInfo::Interface::PROMETHEUS, request.isSecure());
-
-        if (!authenticateUser(request, response))
-            return false;
-
-        makeContext(request);
-        return true;
-    }
-
-    bool authenticateUser(HTTPServerRequest & request, HTTPServerResponse & response)
-    {
-        return authenticateUserByHTTP(request, *params, response, *session, request_credentials, server().context(), log());
-    }
-
-    void makeContext(HTTPServerRequest & request)
-    {
-        context = session->makeQueryContext();
-
-        /// Anything else beside HTTP POST should be readonly queries.
-        setReadOnlyIfHTTPMethodIdempotent(context, request.getMethod());
-
-        auto roles = params->getAll("role");
-        if (!roles.empty())
-            context->setCurrentRoles(roles);
-
-        /// Settings can be overridden in the URL query.
-        auto is_setting_like_parameter = [&] (const String & name)
-        {
-            /// Empty parameter appears when URL like ?&a=b or a=b&&c=d. Just skip them for user's convenience.
-            if (name.empty())
-                return false;
-
-            /// Some parameters (database, default_format, everything used in the code above) do not
-            /// belong to the Settings class.
-            static const NameSet reserved_param_names{"user", "password", "quota_key", "stacktrace", "role", "query_id"};
-            return !reserved_param_names.contains(name);
-        };
-
-        SettingsChanges settings_changes;
-        for (const auto & [key, value] : *params)
-        {
-            if (is_setting_like_parameter(key))
-            {
-                /// This query parameter should be considered as a ClickHouse setting.
-                settings_changes.push_back({key, value});
-            }
-        }
-
-        context->checkSettingsConstraints(settings_changes, SettingSource::QUERY);
-        context->applySettingsChanges(settings_changes);
-
-        /// Set the query id supplied by the user, if any, and also update the OpenTelemetry fields.
-        context->setCurrentQueryId(params->get("query_id", request.get("X-ClickHouse-Query-Id", "")));
-    }
-
-    void onException() override
-    {
-        // So that the next requests on the connection have to always start afresh in case of exceptions.
-        request_credentials.reset();
-    }
-
-    const Settings & default_settings;
-    std::unique_ptr<HTMLForm> params;
-    std::unique_ptr<Session> session;
-    std::unique_ptr<Credentials> request_credentials;
-    ContextMutablePtr context;
-};
-
-
-/// Implementation of the remote-write protocol.
-class PrometheusRequestHandler::RemoteWriteImpl : public ImplWithContext
-{
-public:
-    using ImplWithContext::ImplWithContext;
-
-    void beforeHandlingRequest(HTTPServerRequest & request) override
-    {
-        LOG_INFO(log(), "Handling remote write request from {}", request.get("User-Agent", ""));
-        chassert(config().type == PrometheusRequestHandlerConfig::Type::RemoteWrite);
-    }
-
-    void handlingRequestWithContext([[maybe_unused]] HTTPServerRequest & request, [[maybe_unused]] HTTPServerResponse & response) override
-    {
-#if USE_PROMETHEUS_PROTOBUFS
-        checkHTTPHeader(request, "Content-Type", "application/x-protobuf");
-        checkHTTPHeader(request, "Content-Encoding", "snappy");
-
-        ProtobufZeroCopyInputStreamFromReadBuffer zero_copy_input_stream{
-            std::make_unique<SnappyReadBuffer>(wrapReadBufferReference(request.getStream()))};
-
-        prometheus::WriteRequest write_request;
-        if (!write_request.ParsePartialFromZeroCopyStream(&zero_copy_input_stream))
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot parse WriteRequest");
-
-        auto table = DatabaseCatalog::instance().getTable(StorageID{config().time_series_table_name}, context);
-        PrometheusRemoteWriteProtocol protocol{table, context};
-
-        if (write_request.timeseries_size())
-            protocol.writeTimeSeries(write_request.timeseries());
-
-        if (write_request.metadata_size())
-            protocol.writeMetricsMetadata(write_request.metadata());
-
-        response.setContentType("text/plain; charset=UTF-8");
-        response.send();
-
-#else
-        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Prometheus remote write protocol is disabled");
-#endif
-    }
-};
-
-/// Implementation of the remote-read protocol.
-class PrometheusRequestHandler::RemoteReadImpl : public ImplWithContext
-{
-public:
-    using ImplWithContext::ImplWithContext;
-
-    void beforeHandlingRequest(HTTPServerRequest & request) override
-    {
-        LOG_INFO(log(), "Handling remote read request from {}", request.get("User-Agent", ""));
-        chassert(config().type == PrometheusRequestHandlerConfig::Type::RemoteRead);
-    }
-
-    void handlingRequestWithContext([[maybe_unused]] HTTPServerRequest & request, [[maybe_unused]] HTTPServerResponse & response) override
-    {
-#if USE_PROMETHEUS_PROTOBUFS
-        checkHTTPHeader(request, "Content-Type", "application/x-protobuf");
-        checkHTTPHeader(request, "Content-Encoding", "snappy");
-
-        auto table = DatabaseCatalog::instance().getTable(StorageID{config().time_series_table_name}, context);
-        PrometheusRemoteReadProtocol protocol{table, context};
-
-        ProtobufZeroCopyInputStreamFromReadBuffer zero_copy_input_stream{
-            std::make_unique<SnappyReadBuffer>(wrapReadBufferReference(request.getStream()))};
-
-        prometheus::ReadRequest read_request;
-        if (!read_request.ParseFromZeroCopyStream(&zero_copy_input_stream))
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot parse ReadRequest");
-
-        prometheus::ReadResponse read_response;
-
-        size_t num_queries = read_request.queries_size();
-        for (size_t i = 0; i != num_queries; ++i)
-        {
-            const auto & query = read_request.queries(static_cast<int>(i));
-            auto & new_query_result = *read_response.add_results();
-            protocol.readTimeSeries(
-                *new_query_result.mutable_timeseries(),
-                query.start_timestamp_ms(),
-                query.end_timestamp_ms(),
-                query.matchers(),
-                query.hints());
-        }
-
-#    if 0
-    LOG_DEBUG(log, "ReadResponse = {}", read_response.DebugString());
-#    endif
-
-        response.setContentType("application/x-protobuf");
-        response.set("Content-Encoding", "snappy");
-
-        ProtobufZeroCopyOutputStreamFromWriteBuffer zero_copy_output_stream{std::make_unique<SnappyWriteBuffer>(getOutputStream(response))};
-        read_response.SerializeToZeroCopyStream(&zero_copy_output_stream);
-        zero_copy_output_stream.finalize();
-
-#else
-        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Prometheus remote read protocol is disabled");
-#endif
-    }
-};
-
-
-PrometheusRequestHandler::PrometheusRequestHandler(
-    IServer & server_,
-    const PrometheusRequestHandlerConfig & config_,
-    const AsynchronousMetrics & async_metrics_,
-    std::shared_ptr<PrometheusMetricsWriter> metrics_writer_)
-    : server(server_)
-    , config(config_)
-    , async_metrics(async_metrics_)
-    , metrics_writer(metrics_writer_)
-    , log(getLogger("PrometheusRequestHandler"))
-{
-    createImpl();
-}
-
-PrometheusRequestHandler::~PrometheusRequestHandler() = default;
-
-void PrometheusRequestHandler::createImpl()
-{
-    switch (config.type)
-    {
-        case PrometheusRequestHandlerConfig::Type::ExposeMetrics:
-        {
-            impl = std::make_unique<ExposeMetricsImpl>(*this);
-            return;
-        }
-        case PrometheusRequestHandlerConfig::Type::RemoteWrite:
-        {
-            impl = std::make_unique<RemoteWriteImpl>(*this);
-            return;
-        }
-        case PrometheusRequestHandlerConfig::Type::RemoteRead:
-        {
-            impl = std::make_unique<RemoteReadImpl>(*this);
-            return;
-        }
-    }
-    UNREACHABLE();
-}
-
-void PrometheusRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event_)
-{
-    setThreadName("PrometheusHndlr");
-
     try
     {
-        response_finalized = false;
-        write_event = write_event_;
-        http_method = request.getMethod();
-        chassert(!write_buffer_from_response); /// Nothing is written to the response yet.
+        const auto & config = server.config();
+        unsigned keep_alive_timeout = config.getUInt("keep_alive_timeout", DEFAULT_HTTP_KEEP_ALIVE_TIMEOUT);
 
-        /// Make keep-alive works.
+        /// In order to make keep-alive works.
         if (request.getVersion() == HTTPServerRequest::HTTP_1_1)
             response.setChunkedTransferEncoding(true);
 
-        setResponseDefaultHeaders(response);
+        setResponseDefaultHeaders(response, keep_alive_timeout);
 
-        impl->beforeHandlingRequest(request);
-        impl->handleRequest(request, response);
+        response.setContentType("text/plain; version=0.0.4; charset=UTF-8");
 
-        finalizeResponse(response);
+        WriteBufferFromHTTPServerResponse wb(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout, write_event);
+        metrics_writer->write(wb);
+        wb.finalize();
     }
     catch (...)
     {
-        tryLogCurrentException(log);
-
-        ExecutionStatus status = ExecutionStatus::fromCurrentException("", send_stacktrace);
-        trySendExceptionToClient(status.message, status.code, request, response);
-        tryFinalizeResponse(response);
-
-        tryCallOnException();
+        tryLogCurrentException("PrometheusRequestHandler");
     }
 }
 
-WriteBufferFromHTTPServerResponse & PrometheusRequestHandler::getOutputStream(HTTPServerResponse & response)
+HTTPRequestHandlerFactoryPtr createPrometheusHandlerFactory(
+    IServer & server,
+    const Poco::Util::AbstractConfiguration & config,
+    AsynchronousMetrics & async_metrics,
+    const std::string & config_prefix)
 {
-    if (response_finalized)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "PrometheusRequestHandler: Response already sent");
-    if (write_buffer_from_response)
-        return *write_buffer_from_response;
-    write_buffer_from_response = std::make_unique<WriteBufferFromHTTPServerResponse>(
-        response, http_method == HTTPRequest::HTTP_HEAD, write_event);
-    return *write_buffer_from_response;
+    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);
+    };
+
+    auto factory = std::make_shared<HandlingRuleHTTPHandlerFactory<PrometheusRequestHandler>>(std::move(creator));
+    factory->addFiltersFromConfig(config, config_prefix);
+    return factory;
 }
 
-void PrometheusRequestHandler::finalizeResponse(HTTPServerResponse & response)
+HTTPRequestHandlerFactoryPtr createPrometheusMainHandlerFactory(
+    IServer & server, const Poco::Util::AbstractConfiguration & config, PrometheusMetricsWriterPtr metrics_writer, const std::string & name)
 {
-    if (response_finalized)
+    auto factory = std::make_shared<HTTPRequestHandlerFactoryMain>(name);
+    auto creator = [&server, metrics_writer]
     {
-        /// Response is already finalized or at least tried to. We don't need the write buffer anymore in either case.
-        write_buffer_from_response = nullptr;
-    }
-    else
-    {
-        /// We set `response_finalized = true` before actually calling `write_buffer_from_response->finalize()`
-        /// because we shouldn't call finalize() again even if finalize() throws an exception.
-        response_finalized = true;
+        return std::make_unique<PrometheusRequestHandler>(server, metrics_writer);
+    };
 
-        if (write_buffer_from_response)
-            std::exchange(write_buffer_from_response, {})->finalize();
-        else
-            WriteBufferFromHTTPServerResponse{response, http_method == HTTPRequest::HTTP_HEAD, write_event}.finalize();
-    }
-    chassert(response_finalized && !write_buffer_from_response);
+    auto handler = std::make_shared<HandlingRuleHTTPHandlerFactory<PrometheusRequestHandler>>(std::move(creator));
+    handler->attachStrictPath(config.getString("prometheus.endpoint", "/metrics"));
+    handler->allowGetAndHeadRequest();
+    factory->addHandler(handler);
+    return factory;
 }
-
-void PrometheusRequestHandler::trySendExceptionToClient(const String & exception_message, int exception_code, HTTPServerRequest & request, HTTPServerResponse & response)
-{
-    if (response_finalized)
-        return; /// Response is already finalized (or tried to). We can't write the error message to the response in either case.
-
-    try
-    {
-        sendExceptionToHTTPClient(exception_message, exception_code, request, response, &getOutputStream(response), log);
-    }
-    catch (...)
-    {
-        tryLogCurrentException(log, "Couldn't send exception to client");
-    }
-}
-
-void PrometheusRequestHandler::tryFinalizeResponse(HTTPServerResponse & response)
-{
-    try
-    {
-        finalizeResponse(response);
-    }
-    catch (...)
-    {
-        tryLogCurrentException(log, "Cannot flush data to client (after sending exception)");
-    }
-}
-
-void PrometheusRequestHandler::tryCallOnException()
-{
-    try
-    {
-        if (impl)
-            impl->onException();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(log, "onException");
-    }
-}
-
 }
diff --git a/src/Server/PrometheusRequestHandler.h b/src/Server/PrometheusRequestHandler.h
index 281ecf5260e..d120752c8c5 100644
--- a/src/Server/PrometheusRequestHandler.h
+++ b/src/Server/PrometheusRequestHandler.h
@@ -1,64 +1,28 @@
 #pragma once
 
 #include <Server/HTTP/HTTPRequestHandler.h>
-#include <Server/PrometheusRequestHandlerConfig.h>
 
+#include "PrometheusMetricsWriter.h"
 
 namespace DB
 {
-class AsynchronousMetrics;
-class IServer;
-class PrometheusMetricsWriter;
-class WriteBufferFromHTTPServerResponse;
 
-/// Handles requests for prometheus protocols (expose_metrics, remote_write, remote-read).
+class IServer;
+
 class PrometheusRequestHandler : public HTTPRequestHandler
 {
-public:
-    PrometheusRequestHandler(
-        IServer & server_,
-        const PrometheusRequestHandlerConfig & config_,
-        const AsynchronousMetrics & async_metrics_,
-        std::shared_ptr<PrometheusMetricsWriter> metrics_writer_);
-    ~PrometheusRequestHandler() override;
-
-    void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event_) override;
-
 private:
-    /// Creates an internal implementation based on which PrometheusRequestHandlerConfig::Type is used.
-    void createImpl();
-
-    /// Returns the write buffer used for the current HTTP response.
-    WriteBufferFromHTTPServerResponse & getOutputStream(HTTPServerResponse & response);
-
-    /// Finalizes the output stream and sends the response to the client.
-    void finalizeResponse(HTTPServerResponse & response);
-    void tryFinalizeResponse(HTTPServerResponse & response);
-
-    /// Writes the current exception to the response.
-    void trySendExceptionToClient(const String & exception_message, int exception_code, HTTPServerRequest & request, HTTPServerResponse & response);
-
-    /// Calls onException() in a try-catch block.
-    void tryCallOnException();
-
     IServer & server;
-    const PrometheusRequestHandlerConfig config;
-    const AsynchronousMetrics & async_metrics;
-    const std::shared_ptr<PrometheusMetricsWriter> metrics_writer;
-    const LoggerPtr log;
+    PrometheusMetricsWriterPtr metrics_writer;
 
-    class Impl;
-    class ImplWithContext;
-    class ExposeMetricsImpl;
-    class RemoteWriteImpl;
-    class RemoteReadImpl;
-    std::unique_ptr<Impl> impl;
+public:
+    PrometheusRequestHandler(IServer & server_, PrometheusMetricsWriterPtr metrics_writer_)
+        : server(server_)
+        , metrics_writer(std::move(metrics_writer_))
+    {
+    }
 
-    String http_method;
-    bool send_stacktrace = false;
-    std::unique_ptr<WriteBufferFromHTTPServerResponse> write_buffer_from_response;
-    bool response_finalized = false;
-    ProfileEvents::Event write_event;
+    void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
 };
 
 }
diff --git a/src/Server/PrometheusRequestHandlerConfig.h b/src/Server/PrometheusRequestHandlerConfig.h
deleted file mode 100644
index d01d28f702c..00000000000
--- a/src/Server/PrometheusRequestHandlerConfig.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <Core/QualifiedTableName.h>
-
-
-namespace DB
-{
-
-/// Configuration of a Prometheus protocol handler after it's parsed from a configuration file.
-struct PrometheusRequestHandlerConfig
-{
-    enum class Type
-    {
-        /// Exposes ClickHouse metrics for scraping by Prometheus.
-        ExposeMetrics,
-
-        /// Handles Prometheus remote-write protocol.
-        RemoteWrite,
-
-        /// Handles Prometheus remote-read protocol.
-        RemoteRead,
-    };
-
-    Type type = Type::ExposeMetrics;
-
-    /// Settings for type ExposeMetrics:
-    bool expose_metrics = false;
-    bool expose_asynchronous_metrics = false;
-    bool expose_events = false;
-    bool expose_errors = false;
-
-    /// Settings for types RemoteWrite, RemoteRead:
-    QualifiedTableName time_series_table_name;
-
-    size_t keep_alive_timeout = 0;
-    bool is_stacktrace_enabled = true;
-};
-
-}
diff --git a/src/Server/PrometheusRequestHandlerFactory.cpp b/src/Server/PrometheusRequestHandlerFactory.cpp
deleted file mode 100644
index 52f1d3b64c1..00000000000
--- a/src/Server/PrometheusRequestHandlerFactory.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-#include <Server/PrometheusRequestHandlerFactory.h>
-
-#include <Server/HTTPHandlerFactory.h>
-#include <Server/PrometheusMetricsWriter.h>
-#include <Server/PrometheusRequestHandler.h>
-#include <Server/PrometheusRequestHandlerConfig.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int UNKNOWN_ELEMENT_IN_CONFIG;
-}
-
-namespace
-{
-    /// Parses common configuration which is attached to any other configuration. The common configuration looks like this:
-    /// <prometheus>
-    ///     <enable_stacktrace>true</enable_stacktrace>
-    /// </prometheus>
-    /// <keep_alive_timeout>30</keep_alive_timeout>
-    void parseCommonConfig(const Poco::Util::AbstractConfiguration & config, PrometheusRequestHandlerConfig & res)
-    {
-        res.is_stacktrace_enabled = config.getBool("prometheus.enable_stacktrace", true);
-        res.keep_alive_timeout = config.getUInt("keep_alive_timeout", DEFAULT_HTTP_KEEP_ALIVE_TIMEOUT);
-    }
-
-    /// Parses a configuration like this:
-    /// <!-- <type>expose_metrics</type> (Implied, not actually parsed) -->
-    /// <metrics>true</metrics>
-    /// <asynchronous_metrics>true</asynchronous_metrics>
-    /// <events>true</events>
-    /// <errors>true</errors>
-    PrometheusRequestHandlerConfig parseExposeMetricsConfig(const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
-    {
-        PrometheusRequestHandlerConfig res;
-        res.type = PrometheusRequestHandlerConfig::Type::ExposeMetrics;
-        res.expose_metrics = config.getBool(config_prefix + ".metrics", true);
-        res.expose_asynchronous_metrics = config.getBool(config_prefix + ".asynchronous_metrics", true);
-        res.expose_events = config.getBool(config_prefix + ".events", true);
-        res.expose_errors = config.getBool(config_prefix + ".errors", true);
-        parseCommonConfig(config, res);
-        return res;
-    }
-
-    /// Extracts a qualified table name from the config. It can be set either as
-    ///     <table>mydb.prometheus</table>
-    /// or
-    ///     <database>mydb</database>
-    ///     <table>prometheus</table>
-    QualifiedTableName parseTableNameFromConfig(const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
-    {
-        QualifiedTableName res;
-        res.table = config.getString(config_prefix + ".table", "prometheus");
-        res.database = config.getString(config_prefix + ".database", "");
-        if (res.database.empty())
-            res = QualifiedTableName::parseFromString(res.table);
-        if (res.database.empty())
-            res.database = "default";
-        return res;
-    }
-
-    /// Parses a configuration like this:
-    /// <!-- <type>remote_write</type> (Implied, not actually parsed) -->
-    /// <table>db.time_series_table_name</table>
-    PrometheusRequestHandlerConfig parseRemoteWriteConfig(const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
-    {
-        PrometheusRequestHandlerConfig res;
-        res.type = PrometheusRequestHandlerConfig::Type::RemoteWrite;
-        res.time_series_table_name = parseTableNameFromConfig(config, config_prefix);
-        parseCommonConfig(config, res);
-        return res;
-    }
-
-    /// Parses a configuration like this:
-    /// <!-- <type>remote_read</type> (Implied, not actually parsed) -->
-    /// <table>db.time_series_table_name</table>
-    PrometheusRequestHandlerConfig parseRemoteReadConfig(const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
-    {
-        PrometheusRequestHandlerConfig res;
-        res.type = PrometheusRequestHandlerConfig::Type::RemoteRead;
-        res.time_series_table_name = parseTableNameFromConfig(config, config_prefix);
-        parseCommonConfig(config, res);
-        return res;
-    }
-
-    /// Parses a configuration like this:
-    /// <type>expose_metrics</type>
-    /// <metrics>true</metrics>
-    /// <asynchronous_metrics>true</asynchronous_metrics>
-    /// <events>true</events>
-    /// <errors>true</errors>
-    /// -OR-
-    /// <type>remote_write</type>
-    /// <table>db.time_series_table_name</table>
-    PrometheusRequestHandlerConfig parseHandlerConfig(const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
-    {
-        String type = config.getString(config_prefix + ".type");
-
-        if (type == "expose_metrics")
-            return parseExposeMetricsConfig(config, config_prefix);
-        else if (type == "remote_write")
-            return parseRemoteWriteConfig(config, config_prefix);
-        else if (type == "remote_read")
-            return parseRemoteReadConfig(config, config_prefix);
-        else
-            throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG, "Unknown type {} is specified in the configuration for a prometheus protocol", type);
-    }
-
-    /// Returns true if the protocol represented by a passed config can be handled.
-    bool canBeHandled(const PrometheusRequestHandlerConfig & config, bool for_keeper)
-    {
-        /// The standalone ClickHouse Keeper can only expose its metrics.
-        /// It can't handle other Prometheus protocols.
-        return !for_keeper || (config.type == PrometheusRequestHandlerConfig::Type::ExposeMetrics);
-    }
-
-    /// Creates a writer which serializes exposing metrics.
-    std::shared_ptr<PrometheusMetricsWriter> createPrometheusMetricWriter(bool for_keeper)
-    {
-        if (for_keeper)
-            return std::make_unique<KeeperPrometheusMetricsWriter>();
-        else
-            return std::make_unique<PrometheusMetricsWriter>();
-    }
-
-    /// Base function for making a factory for PrometheusRequestHandler. This function can return nullptr.
-    std::shared_ptr<HandlingRuleHTTPHandlerFactory<PrometheusRequestHandler>> createPrometheusHandlerFactoryFromConfig(
-        IServer & server,
-        const AsynchronousMetrics & async_metrics,
-        const PrometheusRequestHandlerConfig & config,
-        bool for_keeper)
-    {
-        if (!canBeHandled(config, for_keeper))
-            return nullptr;
-        auto metric_writer = createPrometheusMetricWriter(for_keeper);
-        auto creator = [&server, &async_metrics, config, metric_writer]() -> std::unique_ptr<PrometheusRequestHandler>
-        {
-            return std::make_unique<PrometheusRequestHandler>(server, config, async_metrics, metric_writer);
-        };
-        return std::make_shared<HandlingRuleHTTPHandlerFactory<PrometheusRequestHandler>>(std::move(creator));
-    }
-
-    /// Generic function for createPrometheusHandlerFactory() and createKeeperPrometheusHandlerFactory().
-    HTTPRequestHandlerFactoryPtr createPrometheusHandlerFactoryImpl(
-        IServer & server,
-        const Poco::Util::AbstractConfiguration & config,
-        const AsynchronousMetrics & asynchronous_metrics,
-        const String & name,
-        bool for_keeper)
-    {
-        auto factory = std::make_shared<HTTPRequestHandlerFactoryMain>(name);
-
-        if (config.has("prometheus.handlers"))
-        {
-            Strings keys;
-            config.keys("prometheus.handlers", keys);
-            for (const String & key : keys)
-            {
-                String prefix = "prometheus.handlers." + key;
-                auto parsed_config = parseHandlerConfig(config, prefix + ".handler");
-                if (auto handler = createPrometheusHandlerFactoryFromConfig(server, asynchronous_metrics, parsed_config, for_keeper))
-                {
-                    handler->addFiltersFromConfig(config, prefix);
-                    factory->addHandler(handler);
-                }
-            }
-        }
-        else
-        {
-            auto parsed_config = parseExposeMetricsConfig(config, "prometheus");
-            if (auto handler = createPrometheusHandlerFactoryFromConfig(server, asynchronous_metrics, parsed_config, for_keeper))
-            {
-                String endpoint = config.getString("prometheus.endpoint", "/metrics");
-                handler->attachStrictPath(endpoint);
-                handler->allowGetAndHeadRequest();
-                factory->addHandler(handler);
-            }
-        }
-
-        return factory;
-    }
-
-}
-
-
-HTTPRequestHandlerFactoryPtr createPrometheusHandlerFactory(
-    IServer & server,
-    const Poco::Util::AbstractConfiguration & config,
-    const AsynchronousMetrics & asynchronous_metrics,
-    const String & name)
-{
-    return createPrometheusHandlerFactoryImpl(server, config, asynchronous_metrics, name, /* for_keeper= */ false);
-}
-
-
-HTTPRequestHandlerFactoryPtr createPrometheusHandlerFactoryForHTTPRule(
-    IServer & server,
-    const Poco::Util::AbstractConfiguration & config,
-    const String & config_prefix,
-    const AsynchronousMetrics & asynchronous_metrics)
-{
-    auto parsed_config = parseExposeMetricsConfig(config, config_prefix + ".handler");
-    auto handler = createPrometheusHandlerFactoryFromConfig(server, asynchronous_metrics, parsed_config, /* for_keeper= */ false);
-    chassert(handler);  /// `handler` can't be nullptr here because `for_keeper` is false.
-    handler->addFiltersFromConfig(config, config_prefix);
-    return handler;
-}
-
-
-HTTPRequestHandlerFactoryPtr createPrometheusHandlerFactoryForHTTPRuleDefaults(
-    IServer & server,
-    const Poco::Util::AbstractConfiguration & config,
-    const AsynchronousMetrics & asynchronous_metrics)
-{
-    /// The "defaults" HTTP handler should serve the prometheus exposing metrics protocol on the http port
-    /// only if it isn't already served on its own port <prometheus.port> and if there is no <prometheus.handlers> section.
-    if (!config.has("prometheus") || config.getInt("prometheus.port", 0) || config.has("prometheus.handlers"))
-        return nullptr;
-
-    auto parsed_config = parseExposeMetricsConfig(config, "prometheus");
-    String endpoint = config.getString("prometheus.endpoint", "/metrics");
-    auto handler = createPrometheusHandlerFactoryFromConfig(server, asynchronous_metrics, parsed_config, /* for_keeper= */ false);
-    chassert(handler);  /// `handler` can't be nullptr here because `for_keeper` is false.
-    handler->attachStrictPath(endpoint);
-    handler->allowGetAndHeadRequest();
-    return handler;
-}
-
-
-HTTPRequestHandlerFactoryPtr createKeeperPrometheusHandlerFactory(
-    IServer & server,
-    const Poco::Util::AbstractConfiguration & config,
-    const AsynchronousMetrics & asynchronous_metrics,
-    const String & name)
-{
-    return createPrometheusHandlerFactoryImpl(server, config, asynchronous_metrics, name, /* for_keeper= */ true);
-}
-
-}
diff --git a/src/Server/PrometheusRequestHandlerFactory.h b/src/Server/PrometheusRequestHandlerFactory.h
deleted file mode 100644
index c52395ca93f..00000000000
--- a/src/Server/PrometheusRequestHandlerFactory.h
+++ /dev/null
@@ -1,130 +0,0 @@
-#pragma once
-
-#include <base/types.h>
-#include <memory>
-
-
-namespace Poco::Util { class AbstractConfiguration; }
-
-namespace DB
-{
-
-class IServer;
-class HTTPRequestHandlerFactory;
-using HTTPRequestHandlerFactoryPtr = std::shared_ptr<HTTPRequestHandlerFactory>;
-class AsynchronousMetrics;
-
-/// Makes a handler factory to handle prometheus protocols.
-/// Expects a configuration like this:
-///
-/// <prometheus>
-///     <port>1234</port>
-///     <endpoint>/metric</endpoint>
-///     <metrics>true</metrics>
-///     <asynchronous_metrics>true</asynchronous_metrics>
-///     <events>true</events>
-///     <errors>true</errors>
-/// </prometheus>
-///
-/// More prometheus protocols can be supported with using a different configuration <prometheus.handlers>
-/// (which is similar to the <http_handlers> section):
-///
-/// <prometheus>
-///     <port>1234</port>
-///     <handlers>
-///         <my_rule1>
-///             <url>/metrics</url>
-///             <handler>
-///                 <type>expose_metrics</type>
-///                 <metrics>true</metrics>
-///                 <asynchronous_metrics>true</asynchronous_metrics>
-///                 <events>true</events>
-///                 <errors>true</errors>
-///             </handler>
-///         </my_rule1>
-///    </handlers>
-/// </prometheus>
-///
-/// An alternative port to serve prometheus protocols can be specified in the <protocols> section:
-///
-/// <protocols>
-///     <my_protocol_1>
-///         <port>4321</port>
-///         <type>prometheus</type>
-///     </my_protocol_1>
-/// </protocols>
-HTTPRequestHandlerFactoryPtr createPrometheusHandlerFactory(
-    IServer & server,
-    const Poco::Util::AbstractConfiguration & config,
-    const AsynchronousMetrics & asynchronous_metrics,
-    const String & name);
-
-/// Makes a HTTP handler factory to handle requests for prometheus metrics for a HTTP rule in the <http_handlers> section.
-/// Expects a configuration like this:
-///
-/// <http_port>8123</http_port>
-/// <http_handlers>
-///     <my_rule_1>
-///         <url>/metrics</url>
-///         <handler>
-///             <type>prometheus</type>
-///             <metrics>true</metrics>
-///             <asynchronous_metrics>true</asynchronous_metrics>
-///             <events>true</events>
-///             <errors>true</errors>
-///         </handler>
-///     </my_rule_1>
-///     <my_rule2>
-///         <url>/write</url>
-///         <handler>
-///             <type>remote_write</type>
-///             <table>db.time_series_table_name</table>
-///         </handler>
-///     </my_rule2>
-///     <my_rule3>
-///         <url>/read</url>
-///         <handler>
-///             <type>remote_read</type>
-///             <table>db.time_series_table_name</table>
-///         </handler>
-///     </my_rule3>
-/// </http_handlers>
-HTTPRequestHandlerFactoryPtr createPrometheusHandlerFactoryForHTTPRule(
-    IServer & server,
-    const Poco::Util::AbstractConfiguration & config,
-    const String & config_prefix, /// path to "http_handlers.my_handler_1"
-    const AsynchronousMetrics & asynchronous_metrics);
-
-/// Makes a HTTP Handler factory to handle requests for prometheus metrics as a part of the default HTTP rule in the <http_handlers> section.
-/// Expects a configuration like this:
-///
-/// <http_port>8123</http_port>
-/// <http_handlers>
-///     <defaults/>
-/// </http_handlers>
-/// <prometheus>
-///     <endpoint>/metric</endpoint>
-///     <metrics>true</metrics>
-///     <asynchronous_metrics>true</asynchronous_metrics>
-///     <events>true</events>
-///     <errors>true</errors>
-/// </prometheus>
-///
-/// The "defaults" HTTP handler should serve the prometheus exposing metrics protocol on the http port
-/// only if it isn't already served on its own port <prometheus.port>,
-/// and also if there is no <prometheus.handlers> section in the configuration
-/// (because if that section exists then it must be in charge of how prometheus protocols are handled).
-HTTPRequestHandlerFactoryPtr createPrometheusHandlerFactoryForHTTPRuleDefaults(
-    IServer & server,
-    const Poco::Util::AbstractConfiguration & config,
-    const AsynchronousMetrics & asynchronous_metrics);
-
-/// Makes a handler factory to handle prometheus protocols.
-/// Supports the "expose_metrics" protocol only.
-HTTPRequestHandlerFactoryPtr createKeeperPrometheusHandlerFactory(
-    IServer & server,
-    const Poco::Util::AbstractConfiguration & config,
-    const AsynchronousMetrics & asynchronous_metrics,
-    const String & name);
-
-}
diff --git a/src/Server/ProtocolServerAdapter.cpp b/src/Server/ProtocolServerAdapter.cpp
index 6b723bc8d87..b41ad2376f1 100644
--- a/src/Server/ProtocolServerAdapter.cpp
+++ b/src/Server/ProtocolServerAdapter.cpp
@@ -20,7 +20,6 @@ public:
     UInt16 portNumber() const override { return tcp_server->portNumber(); }
     size_t currentConnections() const override { return tcp_server->currentConnections(); }
     size_t currentThreads() const override { return tcp_server->currentThreads(); }
-    size_t refusedConnections() const override { return tcp_server->refusedConnections(); }
 
 private:
     std::unique_ptr<TCPServer> tcp_server;
@@ -55,7 +54,6 @@ public:
     UInt16 portNumber() const override { return grpc_server->portNumber(); }
     size_t currentConnections() const override { return grpc_server->currentConnections(); }
     size_t currentThreads() const override { return grpc_server->currentThreads(); }
-    size_t refusedConnections() const override { return 0; }
 
 private:
     std::unique_ptr<GRPCServer> grpc_server;
diff --git a/src/Server/ProtocolServerAdapter.h b/src/Server/ProtocolServerAdapter.h
index 4a0b0cae8e7..76a6776ed9c 100644
--- a/src/Server/ProtocolServerAdapter.h
+++ b/src/Server/ProtocolServerAdapter.h
@@ -38,8 +38,6 @@ public:
     /// Returns the number of currently handled connections.
     size_t currentConnections() const { return impl->currentConnections(); }
 
-    size_t refusedConnections() const { return impl->refusedConnections(); }
-
     /// Returns the number of current threads.
     size_t currentThreads() const { return impl->currentThreads(); }
 
@@ -63,7 +61,6 @@ private:
         virtual UInt16 portNumber() const = 0;
         virtual size_t currentConnections() const = 0;
         virtual size_t currentThreads() const = 0;
-        virtual size_t refusedConnections() const = 0;
     };
     class TCPServerAdapterImpl;
     class GRPCServerAdapterImpl;
diff --git a/src/Server/ReplicasStatusHandler.cpp b/src/Server/ReplicasStatusHandler.cpp
index 419ad635d0d..f43357db0a8 100644
--- a/src/Server/ReplicasStatusHandler.cpp
+++ b/src/Server/ReplicasStatusHandler.cpp
@@ -89,7 +89,8 @@ void ReplicasStatusHandler::handleRequest(HTTPServerRequest & request, HTTPServe
             }
         }
 
-        setResponseDefaultHeaders(response);
+        const auto & server_settings = getContext()->getServerSettings();
+        setResponseDefaultHeaders(response, server_settings.keep_alive_timeout.totalSeconds());
 
         if (!ok)
         {
diff --git a/src/Server/StaticRequestHandler.cpp b/src/Server/StaticRequestHandler.cpp
index d8c0765bca4..f3981dea9fb 100644
--- a/src/Server/StaticRequestHandler.cpp
+++ b/src/Server/StaticRequestHandler.cpp
@@ -35,9 +35,10 @@ namespace ErrorCodes
     extern const int INVALID_CONFIG_PARAMETER;
 }
 
-static inline std::unique_ptr<WriteBuffer> responseWriteBuffer(HTTPServerRequest & request, HTTPServerResponse & response)
+static inline std::unique_ptr<WriteBuffer>
+responseWriteBuffer(HTTPServerRequest & request, HTTPServerResponse & response, UInt64 keep_alive_timeout)
 {
-    auto buf = std::unique_ptr<WriteBuffer>(new WriteBufferFromHTTPServerResponse(response, request.getMethod() == HTTPRequest::HTTP_HEAD));
+    auto buf = std::unique_ptr<WriteBuffer>(new WriteBufferFromHTTPServerResponse(response, request.getMethod() == HTTPRequest::HTTP_HEAD, keep_alive_timeout));
 
     /// The client can pass a HTTP header indicating supported compression method (gzip or deflate).
     String http_response_compression_methods = request.get("Accept-Encoding", "");
@@ -90,7 +91,8 @@ static inline void trySendExceptionToClient(
 
 void StaticRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & /*write_event*/)
 {
-    auto out = responseWriteBuffer(request, response);
+    auto keep_alive_timeout = server.context()->getServerSettings().keep_alive_timeout.totalSeconds();
+    auto out = responseWriteBuffer(request, response, keep_alive_timeout);
 
     try
     {
@@ -105,7 +107,7 @@ void StaticRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServer
                             "The Transfer-Encoding is not chunked and there "
                             "is no Content-Length header for POST request");
 
-        setResponseDefaultHeaders(response);
+        setResponseDefaultHeaders(response, keep_alive_timeout);
         response.setStatusAndReason(Poco::Net::HTTPResponse::HTTPStatus(status));
         writeResponse(*out);
     }
diff --git a/src/Server/TCPHandler.cpp b/src/Server/TCPHandler.cpp
index 8083f7da24d..29568baba58 100644
--- a/src/Server/TCPHandler.cpp
+++ b/src/Server/TCPHandler.cpp
@@ -103,7 +103,6 @@ namespace DB::ErrorCodes
     extern const int SUPPORT_IS_DISABLED;
     extern const int UNSUPPORTED_METHOD;
     extern const int USER_EXPIRED;
-    extern const int NETWORK_ERROR;
 }
 
 namespace
@@ -255,8 +254,8 @@ void TCPHandler::runImpl()
     socket().setSendTimeout(send_timeout);
     socket().setNoDelay(true);
 
-    in = std::make_shared<ReadBufferFromPocoSocketChunked>(socket(), read_event);
-    out = std::make_shared<WriteBufferFromPocoSocketChunked>(socket(), write_event);
+    in = std::make_shared<ReadBufferFromPocoSocket>(socket(), read_event);
+    out = std::make_shared<WriteBufferFromPocoSocket>(socket(), write_event);
 
     /// Support for PROXY protocol
     if (parse_proxy_protocol && !receiveProxyHeader())
@@ -281,48 +280,6 @@ void TCPHandler::runImpl()
         if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_ADDENDUM)
             receiveAddendum();
 
-        {
-            /// Server side of chunked protocol negotiation.
-            /// Server advertises its protocol capabilities (separate for send and receive channels) by sending
-            /// in its 'Hello' response one of four types - chunked, notchunked, chunked_optional, notchunked_optional.
-            /// Not optional types are strict meaning that server only supports this type, optional means that
-            /// server prefer this type but capable to work in opposite.
-            /// Client selects which type it is going to communicate based on the settings from config or arguments,
-            /// and sends either "chunked" or "notchunked" protocol request in addendum section of handshake.
-            /// Client can detect if server's protocol capabilities are not compatible with client's settings (for example
-            /// server strictly requires chunked protocol but client's settings only allows notchunked protocol) - in such case
-            /// client should interrupt this connection. However if client continues with incompatible protocol type request, server
-            /// will send appropriate exception and disconnect client.
-
-            auto is_chunked = [](const String & chunked_srv_str, const String & chunked_cl_str, const String & direction)
-            {
-                bool chunked_srv = chunked_srv_str.starts_with("chunked");
-                bool optional_srv = chunked_srv_str.ends_with("_optional");
-                bool chunked_cl = chunked_cl_str.starts_with("chunked");
-
-                if (optional_srv)
-                    return chunked_cl;
-
-                if (chunked_cl != chunked_srv)
-                    throw NetException(
-                        ErrorCodes::NETWORK_ERROR,
-                        "Incompatible protocol: {} is {}, client requested {}",
-                        direction,
-                        chunked_srv ? "chunked" : "notchunked",
-                        chunked_cl ? "chunked" : "notchunked");
-
-                return chunked_srv;
-            };
-
-            bool out_chunked = is_chunked(server.config().getString("proto_caps.send", "notchunked"), proto_recv_chunked_cl, "send");
-            bool in_chunked = is_chunked(server.config().getString("proto_caps.recv", "notchunked"), proto_send_chunked_cl, "recv");
-
-            if (out_chunked)
-                out->enableChunked();
-            if (in_chunked)
-                in->enableChunked();
-        }
-
         if (!is_interserver_mode)
         {
             /// If session created, then settings in session context has been updated.
@@ -364,7 +321,7 @@ void TCPHandler::runImpl()
         {
             Stopwatch idle_time;
             UInt64 timeout_ms = std::min(poll_interval, idle_connection_timeout) * 1000000;
-            while (tcp_server.isOpen() && !server.isCancelled() && !in->poll(timeout_ms))
+            while (tcp_server.isOpen() && !server.isCancelled() && !static_cast<ReadBufferFromPocoSocket &>(*in).poll(timeout_ms))
             {
                 if (idle_time.elapsedSeconds() > idle_connection_timeout)
                 {
@@ -408,6 +365,9 @@ void TCPHandler::runImpl()
 
         try
         {
+            /// If a user passed query-local timeouts, reset socket to initial state at the end of the query
+            SCOPE_EXIT({state.timeout_setter.reset();});
+
             /** If Query - process it. If Ping or Cancel - go back to the beginning.
              *  There may come settings for a separate query that modify `query_context`.
              *  It's possible to receive part uuids packet before the query, so then receivePacket has to be called twice.
@@ -437,8 +397,7 @@ void TCPHandler::runImpl()
             /// So it's better to update the connection settings for flexibility.
             extractConnectionSettingsFromContext(query_context);
 
-            /// Sync timeouts on client and server during current query to avoid dangling queries on server.
-            /// It should be reset at the end of query.
+            /// Sync timeouts on client and server during current query to avoid dangling queries on server
             state.timeout_setter = std::make_unique<TimeoutSetter>(socket(), send_timeout, receive_timeout);
 
             /// Should we send internal logs to client?
@@ -599,9 +558,7 @@ void TCPHandler::runImpl()
                             std::scoped_lock lock(out_mutex, task_callback_mutex);
 
                             if (getQueryCancellationStatus() == CancellationStatus::FULLY_CANCELLED)
-                            {
                                 return true;
-                            }
 
                             sendProgress();
                             sendSelectProfileEvents();
@@ -648,7 +605,6 @@ void TCPHandler::runImpl()
             /// QueryState should be cleared before QueryScope, since otherwise
             /// the MemoryTracker will be wrong for possible deallocations.
             /// (i.e. deallocations from the Aggregator with two-level aggregation)
-            /// Also it resets socket's timeouts.
             state.reset();
             last_sent_snapshots = ProfileEvents::ThreadIdToCountersSnapshot{};
             query_scope.reset();
@@ -674,9 +630,6 @@ void TCPHandler::runImpl()
             state.io.onException();
             exception.reset(e.clone());
 
-            /// In case of exception state was not reset, so socket's timouts must be reset explicitly
-            state.timeout_setter.reset();
-
             if (e.code() == ErrorCodes::UNKNOWN_PACKET_FROM_CLIENT)
                 throw;
 
@@ -735,9 +688,6 @@ void TCPHandler::runImpl()
             exception = std::make_unique<DB::Exception>(Exception(ErrorCodes::UNKNOWN_EXCEPTION, "Unknown exception"));
         }
 
-        /// In case of exception state was not reset, so socket's timouts must be reset explicitly
-        state.timeout_setter.reset();
-
         try
         {
             if (exception)
@@ -839,7 +789,7 @@ bool TCPHandler::readDataNext()
     /// We are waiting for a packet from the client. Thus, every `POLL_INTERVAL` seconds check whether we need to shut down.
     while (true)
     {
-        if (in->poll(timeout_us))
+        if (static_cast<ReadBufferFromPocoSocket &>(*in).poll(timeout_us))
         {
             /// If client disconnected.
             if (in->eof())
@@ -1013,8 +963,8 @@ void TCPHandler::processInsertQuery()
         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 in dependent materialized view cannot work together with async inserts. "\
-                    "Please disable either `deduplicate_blocks_in_dependent_materialized_views` or `async_insert` setting.");
+                    "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)
@@ -1229,8 +1179,6 @@ void TCPHandler::processTablesStatusRequest()
     }
 
     response.write(*out, client_tcp_protocol_version);
-
-    out->finishChunk();
 }
 
 void TCPHandler::receiveUnexpectedTablesStatusRequest()
@@ -1251,8 +1199,6 @@ void TCPHandler::sendPartUUIDs()
 
         writeVarUInt(Protocol::Server::PartUUIDs, *out);
         writeVectorBinary(uuids, *out);
-
-        out->finishChunk();
         out->next();
     }
 }
@@ -1261,8 +1207,6 @@ void TCPHandler::sendPartUUIDs()
 void TCPHandler::sendReadTaskRequestAssumeLocked()
 {
     writeVarUInt(Protocol::Server::ReadTaskRequest, *out);
-
-    out->finishChunk();
     out->next();
 }
 
@@ -1271,8 +1215,6 @@ void TCPHandler::sendMergeTreeAllRangesAnnouncementAssumeLocked(InitialAllRanges
 {
     writeVarUInt(Protocol::Server::MergeTreeAllRangesAnnouncement, *out);
     announcement.serialize(*out);
-
-    out->finishChunk();
     out->next();
 }
 
@@ -1281,8 +1223,6 @@ void TCPHandler::sendMergeTreeReadTaskRequestAssumeLocked(ParallelReadRequest re
 {
     writeVarUInt(Protocol::Server::MergeTreeReadTaskRequest, *out);
     request.serialize(*out);
-
-    out->finishChunk();
     out->next();
 }
 
@@ -1290,9 +1230,7 @@ void TCPHandler::sendMergeTreeReadTaskRequestAssumeLocked(ParallelReadRequest re
 void TCPHandler::sendProfileInfo(const ProfileInfo & info)
 {
     writeVarUInt(Protocol::Server::ProfileInfo, *out);
-    info.write(*out, client_tcp_protocol_version);
-
-    out->finishChunk();
+    info.write(*out);
     out->next();
 }
 
@@ -1308,8 +1246,6 @@ void TCPHandler::sendTotals(const Block & totals)
 
         state.block_out->write(totals);
         state.maybe_compressed_out->next();
-
-        out->finishChunk();
         out->next();
     }
 }
@@ -1326,8 +1262,6 @@ void TCPHandler::sendExtremes(const Block & extremes)
 
         state.block_out->write(extremes);
         state.maybe_compressed_out->next();
-
-        out->finishChunk();
         out->next();
     }
 }
@@ -1345,8 +1279,6 @@ void TCPHandler::sendProfileEvents()
         writeStringBinary("", *out);
 
         state.profile_events_block_out->write(block);
-
-        out->finishChunk();
         out->next();
 
         auto elapsed_milliseconds = stopwatch.elapsedMilliseconds();
@@ -1384,8 +1316,6 @@ void TCPHandler::sendTimezone()
     LOG_DEBUG(log, "TCPHandler::sendTimezone(): {}", tz);
     writeVarUInt(Protocol::Server::TimezoneUpdate, *out);
     writeStringBinary(tz, *out);
-
-    out->finishChunk();
     out->next();
 }
 
@@ -1646,12 +1576,6 @@ void TCPHandler::receiveAddendum()
 
     if (!is_interserver_mode)
         session->setQuotaClientKey(quota_key);
-
-    if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_CHUNKED_PACKETS)
-    {
-        readStringBinary(proto_send_chunked_cl, *in);
-        readStringBinary(proto_recv_chunked_cl, *in);
-    }
 }
 
 
@@ -1685,11 +1609,6 @@ void TCPHandler::sendHello()
         writeStringBinary(server_display_name, *out);
     if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_VERSION_PATCH)
         writeVarUInt(VERSION_PATCH, *out);
-    if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_CHUNKED_PACKETS)
-    {
-        writeStringBinary(server.config().getString("proto_caps.send", "notchunked"), *out);
-        writeStringBinary(server.config().getString("proto_caps.recv", "notchunked"), *out);
-    }
     if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_PASSWORD_COMPLEXITY_RULES)
     {
         auto rules = server.context()->getAccessControl().getPasswordComplexityRules();
@@ -1742,7 +1661,6 @@ bool TCPHandler::receivePacket()
 
         case Protocol::Client::Ping:
             writeVarUInt(Protocol::Server::Pong, *out);
-            out->finishChunk();
             out->next();
             return false;
 
@@ -2133,7 +2051,7 @@ bool TCPHandler::receiveUnexpectedData(bool throw_exception)
 
     std::shared_ptr<ReadBuffer> maybe_compressed_in;
     if (last_block_in.compression == Protocol::Compression::Enable)
-        maybe_compressed_in = std::make_shared<CompressedReadBuffer>(*in, /* allow_different_codecs */ true, /* external_data */ query_kind != ClientInfo::QueryKind::SECONDARY_QUERY);
+        maybe_compressed_in = std::make_shared<CompressedReadBuffer>(*in, /* allow_different_codecs */ true);
     else
         maybe_compressed_in = in;
 
@@ -2157,7 +2075,7 @@ void TCPHandler::initBlockInput()
         /// with another codec that the rest of the data. Example: data sent by Distributed tables.
 
         if (state.compression == Protocol::Compression::Enable)
-            state.maybe_compressed_in = std::make_shared<CompressedReadBuffer>(*in, /* allow_different_codecs */ true, /* external_data */ query_kind != ClientInfo::QueryKind::SECONDARY_QUERY);
+            state.maybe_compressed_in = std::make_shared<CompressedReadBuffer>(*in, /* allow_different_codecs */ true);
         else
             state.maybe_compressed_in = in;
 
@@ -2272,7 +2190,7 @@ QueryState::CancellationStatus TCPHandler::getQueryCancellationStatus()
     after_check_cancelled.restart();
 
     /// During request execution the only packet that can come from the client is stopping the query.
-    if (in->poll(0))
+    if (static_cast<ReadBufferFromPocoSocket &>(*in).poll(0))
     {
         if (in->eof())
         {
@@ -2323,33 +2241,19 @@ void TCPHandler::sendData(const Block & block)
         }
 
         writeVarUInt(Protocol::Server::Data, *out);
+        /// Send external table name (empty name is the main table)
+        writeStringBinary("", *out);
 
         /// For testing hedged requests
         if (block.rows() > 0 && query_context->getSettingsRef().sleep_in_send_data_ms.totalMilliseconds())
         {
-            /// This strange sequence is needed in case of chunked protocol is enabled, in order for client not to
-            /// hang on receiving of at least packet type - chunk will not be processed unless either chunk footer
-            /// or chunk continuation header is received - first 'next' is sending starting chunk containing packet type
-            /// and second 'next' is sending chunk continuation header.
-            out->next();
-            /// Send external table name (empty name is the main table)
-            writeStringBinary("", *out);
             out->next();
             std::chrono::milliseconds ms(query_context->getSettingsRef().sleep_in_send_data_ms.totalMilliseconds());
             std::this_thread::sleep_for(ms);
         }
-        else
-        {
-            /// Send external table name (empty name is the main table)
-            writeStringBinary("", *out);
-        }
 
         state.block_out->write(block);
-
-        if (state.maybe_compressed_out != out)
-            state.maybe_compressed_out->next();
-
-        out->finishChunk();
+        state.maybe_compressed_out->next();
         out->next();
     }
     catch (...)
@@ -2385,8 +2289,6 @@ void TCPHandler::sendLogData(const Block & block)
     writeStringBinary("", *out);
 
     state.logs_block_out->write(block);
-
-    out->finishChunk();
     out->next();
 }
 
@@ -2398,7 +2300,6 @@ void TCPHandler::sendTableColumns(const ColumnsDescription & columns)
     writeStringBinary("", *out);
     writeStringBinary(columns.toString(), *out);
 
-    out->finishChunk();
     out->next();
 }
 
@@ -2408,8 +2309,6 @@ void TCPHandler::sendException(const Exception & e, bool with_stack_trace)
 
     writeVarUInt(Protocol::Server::Exception, *out);
     writeException(e, *out, with_stack_trace);
-
-    out->finishChunk();
     out->next();
 }
 
@@ -2420,8 +2319,6 @@ void TCPHandler::sendEndOfStream()
     state.io.setAllDataSent();
 
     writeVarUInt(Protocol::Server::EndOfStream, *out);
-
-    out->finishChunk();
     out->next();
 }
 
@@ -2440,8 +2337,6 @@ void TCPHandler::sendProgress()
     increment.elapsed_ns = current_elapsed_ns - state.prev_elapsed_ns;
     state.prev_elapsed_ns = current_elapsed_ns;
     increment.write(*out, client_tcp_protocol_version);
-
-    out->finishChunk();
     out->next();
 }
 
diff --git a/src/Server/TCPHandler.h b/src/Server/TCPHandler.h
index dca40e98920..74afb5a14a5 100644
--- a/src/Server/TCPHandler.h
+++ b/src/Server/TCPHandler.h
@@ -18,8 +18,6 @@
 #include <Interpreters/ProfileEventsExt.h>
 #include <Formats/NativeReader.h>
 #include <Formats/NativeWriter.h>
-#include <IO/ReadBufferFromPocoSocketChunked.h>
-#include <IO/WriteBufferFromPocoSocketChunked.h>
 
 #include "Core/Types.h"
 #include "IServer.h"
@@ -188,8 +186,6 @@ private:
     UInt64 client_version_minor = 0;
     UInt64 client_version_patch = 0;
     UInt32 client_tcp_protocol_version = 0;
-    String proto_send_chunked_cl = "notchunked";
-    String proto_recv_chunked_cl = "notchunked";
     String quota_key;
 
     /// Connection settings, which are extracted from a context.
@@ -208,8 +204,8 @@ private:
     ClientInfo::QueryKind query_kind = ClientInfo::QueryKind::NO_QUERY;
 
     /// Streams for reading/writing from/to client connection socket.
-    std::shared_ptr<ReadBufferFromPocoSocketChunked> in;
-    std::shared_ptr<WriteBufferFromPocoSocketChunked> out;
+    std::shared_ptr<ReadBuffer> in;
+    std::shared_ptr<WriteBuffer> out;
 
     ProfileEvents::Event read_event;
     ProfileEvents::Event write_event;
diff --git a/src/Server/WebUIRequestHandler.cpp b/src/Server/WebUIRequestHandler.cpp
index c04d7a3f2a0..a3d098014e7 100644
--- a/src/Server/WebUIRequestHandler.cpp
+++ b/src/Server/WebUIRequestHandler.cpp
@@ -30,20 +30,23 @@ DashboardWebUIRequestHandler::DashboardWebUIRequestHandler(IServer & server_) :
 BinaryWebUIRequestHandler::BinaryWebUIRequestHandler(IServer & server_) : server(server_) {}
 JavaScriptWebUIRequestHandler::JavaScriptWebUIRequestHandler(IServer & server_) : server(server_) {}
 
-static void handle(HTTPServerRequest & request, HTTPServerResponse & response, std::string_view html)
+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);
+    setResponseDefaultHeaders(response, keep_alive_timeout);
     response.setStatusAndReason(Poco::Net::HTTPResponse::HTTP_OK);
-    WriteBufferFromHTTPServerResponse(response, request.getMethod() == HTTPRequest::HTTP_HEAD).write(html.data(), html.size());
+    WriteBufferFromHTTPServerResponse(response, request.getMethod() == HTTPRequest::HTTP_HEAD, keep_alive_timeout).write(html.data(), html.size());
+
 }
 
 void PlayWebUIRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event &)
 {
-    handle(request, response, {reinterpret_cast<const char *>(gresource_play_htmlData), gresource_play_htmlSize});
+    handle(server, request, response, {reinterpret_cast<const char *>(gresource_play_htmlData), gresource_play_htmlSize});
 }
 
 void DashboardWebUIRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event &)
@@ -61,23 +64,23 @@ void DashboardWebUIRequestHandler::handleRequest(HTTPServerRequest & request, HT
     static re2::RE2 lz_string_url = R"(https://[^\s"'`]+lz-string[^\s"'`]*\.js)";
     RE2::Replace(&html, lz_string_url, "/js/lz-string.js");
 
-    handle(request, response, html);
+    handle(server, request, response, html);
 }
 
 void BinaryWebUIRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event &)
 {
-    handle(request, response, {reinterpret_cast<const char *>(gresource_binary_htmlData), gresource_binary_htmlSize});
+    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")
     {
-        handle(request, response, {reinterpret_cast<const char *>(gresource_uplot_jsData), gresource_uplot_jsSize});
+        handle(server, request, response, {reinterpret_cast<const char *>(gresource_uplot_jsData), gresource_uplot_jsSize});
     }
     else if (request.getURI() == "/js/lz-string.js")
     {
-        handle(request, response, {reinterpret_cast<const char *>(gresource_lz_string_jsData), gresource_lz_string_jsSize});
+        handle(server, request, response, {reinterpret_cast<const char *>(gresource_lz_string_jsData), gresource_lz_string_jsSize});
     }
     else
     {
@@ -85,7 +88,7 @@ void JavaScriptWebUIRequestHandler::handleRequest(HTTPServerRequest & request, H
         *response.send() << "Not found.\n";
     }
 
-    handle(request, response, {reinterpret_cast<const char *>(gresource_binary_htmlData), gresource_binary_htmlSize});
+    handle(server, request, response, {reinterpret_cast<const char *>(gresource_binary_htmlData), gresource_binary_htmlSize});
 }
 
 }
diff --git a/src/Server/grpc_protos/clickhouse_grpc.proto b/src/Server/grpc_protos/clickhouse_grpc.proto
index 7836e88f2af..dc17570f833 100644
--- a/src/Server/grpc_protos/clickhouse_grpc.proto
+++ b/src/Server/grpc_protos/clickhouse_grpc.proto
@@ -180,8 +180,6 @@ message Stats {
    uint64 allocated_bytes = 3;
    bool applied_limit = 4;
    uint64 rows_before_limit = 5;
-   bool applied_aggregation = 6;
-   uint64 rows_before_aggregation = 7;
 }
 
 message Exception {
diff --git a/src/Storages/AlterCommands.cpp b/src/Storages/AlterCommands.cpp
index ef76bc691ec..dfb388ffdb2 100644
--- a/src/Storages/AlterCommands.cpp
+++ b/src/Storages/AlterCommands.cpp
@@ -7,7 +7,6 @@
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeObject.h>
 #include <DataTypes/NestedUtils.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ExpressionActions.h>
@@ -111,7 +110,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
         if (ast_col_decl.comment)
         {
             const auto & ast_comment = typeid_cast<ASTLiteral &>(*ast_col_decl.comment);
-            command.comment = ast_comment.value.safeGet<String>();
+            command.comment = ast_comment.value.get<String>();
         }
 
         if (ast_col_decl.codec)
@@ -169,7 +168,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
         if (ast_col_decl.comment)
         {
             const auto & ast_comment = ast_col_decl.comment->as<ASTLiteral &>();
-            command.comment.emplace(ast_comment.value.safeGet<String>());
+            command.comment.emplace(ast_comment.value.get<String>());
         }
 
         if (ast_col_decl.ttl)
@@ -212,7 +211,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
         command.type = COMMENT_COLUMN;
         command.column_name = getIdentifierName(command_ast->column);
         const auto & ast_comment = command_ast->comment->as<ASTLiteral &>();
-        command.comment = ast_comment.value.safeGet<String>();
+        command.comment = ast_comment.value.get<String>();
         command.if_exists = command_ast->if_exists;
         return command;
     }
@@ -222,7 +221,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
         command.ast = command_ast->clone();
         command.type = COMMENT_TABLE;
         const auto & ast_comment = command_ast->comment->as<ASTLiteral &>();
-        command.comment = ast_comment.value.safeGet<String>();
+        command.comment = ast_comment.value.get<String>();
         return command;
     }
     else if (command_ast->type == ASTAlterCommand::MODIFY_ORDER_BY)
@@ -706,9 +705,9 @@ void AlterCommand::apply(StorageInMemoryMetadata & metadata, ContextPtr context)
         }
 
         auto stats_vec = ColumnStatisticsDescription::fromAST(statistics_decl, metadata.columns);
-        for (const auto & [stats_column_name, stats] : stats_vec)
+        for (const auto & stats : stats_vec)
         {
-            metadata.columns.modify(stats_column_name,
+            metadata.columns.modify(stats.column_name,
                 [&](ColumnDescription & column) { column.statistics.merge(stats, column.name, column.type, if_not_exists); });
         }
     }
@@ -735,14 +734,14 @@ void AlterCommand::apply(StorageInMemoryMetadata & metadata, ContextPtr context)
         {
             if (!metadata.columns.has(statistics_column_name))
             {
-                throw Exception(ErrorCodes::ILLEGAL_STATISTICS, "Cannot modify statistics for column {}: this column is not found", statistics_column_name);
+                throw Exception(ErrorCodes::ILLEGAL_STATISTICS, "Cannot add statistics for column {}: this column is not found", statistics_column_name);
             }
         }
 
         auto stats_vec = ColumnStatisticsDescription::fromAST(statistics_decl, metadata.columns);
-        for (const auto & [stats_column_name, stats] : stats_vec)
+        for (const auto & stats : stats_vec)
         {
-            metadata.columns.modify(stats_column_name,
+            metadata.columns.modify(stats.column_name,
                 [&](ColumnDescription & column) { column.statistics.assign(stats); });
         }
     }
@@ -867,6 +866,8 @@ void AlterCommand::apply(StorageInMemoryMetadata & metadata, ContextPtr context)
                     rename_visitor.visit(column_to_modify.default_desc.expression);
                 if (column_to_modify.ttl)
                     rename_visitor.visit(column_to_modify.ttl);
+                if (column_to_modify.name == column_name && !column_to_modify.statistics.empty())
+                    column_to_modify.statistics.column_name = rename_to;
             });
         }
         if (metadata.table_ttl.definition_ast)
@@ -1142,16 +1143,6 @@ bool AlterCommands::hasFullTextIndex(const StorageInMemoryMetadata & metadata)
     return false;
 }
 
-bool AlterCommands::hasVectorSimilarityIndex(const StorageInMemoryMetadata & metadata)
-{
-    for (const auto & index : metadata.secondary_indices)
-    {
-        if (index.type == "vector_similarity")
-            return true;
-    }
-    return false;
-}
-
 void AlterCommands::apply(StorageInMemoryMetadata & metadata, ContextPtr context) const
 {
     if (!prepared)
@@ -1255,13 +1246,6 @@ void AlterCommands::prepare(const StorageInMemoryMetadata & metadata)
 {
     auto columns = metadata.columns;
 
-    auto ast_to_str = [](const ASTPtr & query) -> String
-    {
-        if (!query)
-            return "";
-        return queryToString(query);
-    };
-
     for (size_t i = 0; i < size(); ++i)
     {
         auto & command = (*this)[i];
@@ -1294,11 +1278,6 @@ void AlterCommands::prepare(const StorageInMemoryMetadata & metadata)
             if (!has_column && command.if_exists)
                 command.ignore = true;
         }
-        else if (command.type == AlterCommand::MODIFY_ORDER_BY)
-        {
-            if (ast_to_str(command.order_by) == ast_to_str(metadata.sorting_key.definition_ast))
-                command.ignore = true;
-        }
     }
 
     prepared = true;
@@ -1424,22 +1403,14 @@ void AlterCommands::validate(const StoragePtr & table, ContextPtr context) const
                 const GetColumnsOptions options(GetColumnsOptions::All);
                 const auto old_data_type = all_columns.getColumn(options, column_name).type;
 
-                bool new_type_has_deprecated_object = command.data_type->hasDynamicSubcolumnsDeprecated();
-                bool old_type_has_deprecated_object = old_data_type->hasDynamicSubcolumnsDeprecated();
+                bool new_type_has_object = command.data_type->hasDynamicSubcolumnsDeprecated();
+                bool old_type_has_object = old_data_type->hasDynamicSubcolumnsDeprecated();
 
-                if (new_type_has_deprecated_object || old_type_has_deprecated_object)
+                if (new_type_has_object || old_type_has_object)
                     throw Exception(
                         ErrorCodes::BAD_ARGUMENTS,
                         "The change of data type {} of column {} to {} is not allowed. It has known bugs",
                         old_data_type->getName(), backQuote(column_name), command.data_type->getName());
-
-                bool has_object_type = isObject(command.data_type);
-                command.data_type->forEachChild([&](const IDataType & type){ has_object_type |= isObject(type); });
-                if (has_object_type)
-                    throw Exception(
-                        ErrorCodes::BAD_ARGUMENTS,
-                        "The change of data type {} of column {} to {} is not supported.",
-                        old_data_type->getName(), backQuote(column_name), command.data_type->getName());
             }
 
             if (command.isRemovingProperty())
diff --git a/src/Storages/AlterCommands.h b/src/Storages/AlterCommands.h
index c4c792e7dec..a91bac10214 100644
--- a/src/Storages/AlterCommands.h
+++ b/src/Storages/AlterCommands.h
@@ -237,9 +237,6 @@ public:
 
     /// Check if commands have any full-text index
     static bool hasFullTextIndex(const StorageInMemoryMetadata & metadata);
-
-    /// Check if commands have any vector similarity index
-    static bool hasVectorSimilarityIndex(const StorageInMemoryMetadata & metadata);
 };
 
 }
diff --git a/src/Storages/Cache/ExternalDataSourceCache.cpp b/src/Storages/Cache/ExternalDataSourceCache.cpp
index 8c778fd511a..cffb1dc9ca3 100644
--- a/src/Storages/Cache/ExternalDataSourceCache.cpp
+++ b/src/Storages/Cache/ExternalDataSourceCache.cpp
@@ -57,15 +57,8 @@ LocalFileHolder::~LocalFileHolder()
 {
     if (original_readbuffer)
     {
-        try
-        {
-            assert_cast<SeekableReadBuffer *>(original_readbuffer.get())->seek(0, SEEK_SET);
-            file_cache_controller->value().startBackgroundDownload(std::move(original_readbuffer), *thread_pool);
-        }
-        catch (...)
-        {
-            tryLogCurrentException(getLogger("LocalFileHolder"), "Exception during destructor of LocalFileHolder.");
-        }
+        assert_cast<SeekableReadBuffer *>(original_readbuffer.get())->seek(0, SEEK_SET);
+        file_cache_controller->value().startBackgroundDownload(std::move(original_readbuffer), *thread_pool);
     }
 }
 
diff --git a/src/Storages/Cache/ExternalDataSourceCache.h b/src/Storages/Cache/ExternalDataSourceCache.h
index 3b4eff28307..4c8c7974005 100644
--- a/src/Storages/Cache/ExternalDataSourceCache.h
+++ b/src/Storages/Cache/ExternalDataSourceCache.h
@@ -53,7 +53,7 @@ public:
     bool nextImpl() override;
     off_t seek(off_t off, int whence) override;
     off_t getPosition() override;
-    std::optional<size_t> tryGetFileSize() override { return remote_file_size; }
+    size_t getFileSize() override { return remote_file_size; }
 
 private:
     std::unique_ptr<LocalFileHolder> local_file_holder;
diff --git a/src/Storages/ColumnsDescription.cpp b/src/Storages/ColumnsDescription.cpp
index 0de9fec3bb2..da749812167 100644
--- a/src/Storages/ColumnsDescription.cpp
+++ b/src/Storages/ColumnsDescription.cpp
@@ -113,15 +113,7 @@ bool ColumnDescription::operator==(const ColumnDescription & other) const
         && ast_to_str(ttl) == ast_to_str(other.ttl);
 }
 
-String formatASTStateAware(IAST & ast, IAST::FormatState & state)
-{
-    WriteBufferFromOwnString buf;
-    IAST::FormatSettings settings(buf, true, false);
-    ast.formatImpl(settings, state, IAST::FormatStateStacked());
-    return buf.str();
-}
-
-void ColumnDescription::writeText(WriteBuffer & buf, IAST::FormatState & state, bool include_comment) const
+void ColumnDescription::writeText(WriteBuffer & buf) const
 {
     /// NOTE: Serialization format is insane.
 
@@ -134,21 +126,20 @@ void ColumnDescription::writeText(WriteBuffer & buf, IAST::FormatState & state,
         writeChar('\t', buf);
         DB::writeText(DB::toString(default_desc.kind), buf);
         writeChar('\t', buf);
-        writeEscapedString(formatASTStateAware(*default_desc.expression, state), buf);
+        writeEscapedString(queryToString(default_desc.expression), buf);
     }
 
-    if (!comment.empty() && include_comment)
+    if (!comment.empty())
     {
         writeChar('\t', buf);
         DB::writeText("COMMENT ", buf);
-        auto ast = ASTLiteral(Field(comment));
-        writeEscapedString(formatASTStateAware(ast, state), buf);
+        writeEscapedString(queryToString(ASTLiteral(Field(comment))), buf);
     }
 
     if (codec)
     {
         writeChar('\t', buf);
-        writeEscapedString(formatASTStateAware(*codec, state), buf);
+        writeEscapedString(queryToString(codec), buf);
     }
 
     if (!settings.empty())
@@ -159,21 +150,21 @@ void ColumnDescription::writeText(WriteBuffer & buf, IAST::FormatState & state,
         ASTSetQuery ast;
         ast.is_standalone = false;
         ast.changes = settings;
-        writeEscapedString(formatASTStateAware(ast, state), buf);
+        writeEscapedString(queryToString(ast), buf);
         DB::writeText(")", buf);
     }
 
     if (!statistics.empty())
     {
         writeChar('\t', buf);
-        writeEscapedString(formatASTStateAware(*statistics.getAST(), state), buf);
+        writeEscapedString(queryToString(statistics.getAST()), buf);
     }
 
     if (ttl)
     {
         writeChar('\t', buf);
         DB::writeText("TTL ", buf);
-        writeEscapedString(formatASTStateAware(*ttl, state), buf);
+        writeEscapedString(queryToString(ttl), buf);
     }
 
     writeChar('\n', buf);
@@ -206,7 +197,7 @@ void ColumnDescription::readText(ReadBuffer & buf)
             }
 
             if (col_ast->comment)
-                comment = col_ast->comment->as<ASTLiteral &>().value.safeGet<String>();
+                comment = col_ast->comment->as<ASTLiteral &>().value.get<String>();
 
             if (col_ast->codec)
                 codec = CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(col_ast->codec, type, false, true, true, true);
@@ -218,7 +209,11 @@ void ColumnDescription::readText(ReadBuffer & buf)
                 settings = col_ast->settings->as<ASTSetQuery &>().changes;
 
             if (col_ast->statistics_desc)
+            {
                 statistics = ColumnStatisticsDescription::fromColumnDeclaration(*col_ast, type);
+                /// every column has name `x` here, so we have to set the name manually.
+                statistics.column_name = name;
+            }
         }
         else
             throw Exception(ErrorCodes::CANNOT_PARSE_TEXT, "Cannot parse column description");
@@ -900,17 +895,16 @@ void ColumnsDescription::resetColumnTTLs()
 }
 
 
-String ColumnsDescription::toString(bool include_comments) const
+String ColumnsDescription::toString() const
 {
     WriteBufferFromOwnString buf;
-    IAST::FormatState ast_format_state;
 
     writeCString("columns format version: 1\n", buf);
     DB::writeText(columns.size(), buf);
     writeCString(" columns:\n", buf);
 
     for (const ColumnDescription & column : columns)
-        column.writeText(buf, ast_format_state, include_comments);
+        column.writeText(buf);
 
     return buf.str();
 }
diff --git a/src/Storages/ColumnsDescription.h b/src/Storages/ColumnsDescription.h
index c89c26501e8..f0760160f0a 100644
--- a/src/Storages/ColumnsDescription.h
+++ b/src/Storages/ColumnsDescription.h
@@ -104,7 +104,7 @@ struct ColumnDescription
     bool operator==(const ColumnDescription & other) const;
     bool operator!=(const ColumnDescription & other) const { return !(*this == other); }
 
-    void writeText(WriteBuffer & buf, IAST::FormatState & state, bool include_comment) const;
+    void writeText(WriteBuffer & buf) const;
     void readText(ReadBuffer & buf);
 };
 
@@ -137,7 +137,7 @@ public:
     /// NOTE Must correspond with Nested::flatten function.
     void flattenNested(); /// TODO: remove, insert already flattened Nested columns.
 
-    bool operator==(const ColumnsDescription & other) const { return toString(false) == other.toString(false); }
+    bool operator==(const ColumnsDescription & other) const { return columns == other.columns; }
     bool operator!=(const ColumnsDescription & other) const { return !(*this == other); }
 
     auto begin() const { return columns.begin(); }
@@ -221,7 +221,7 @@ public:
     /// Does column has non default specified compression codec
     bool hasCompressionCodec(const String & column_name) const;
 
-    String toString(bool include_comments = true) const;
+    String toString() const;
     static ColumnsDescription parse(const String & str);
 
     size_t size() const
diff --git a/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp b/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
index 625c64128e7..f1166b5544b 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
+++ b/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
@@ -28,6 +28,7 @@ namespace ErrorCodes
     extern const int TOO_MANY_PARTITIONS;
     extern const int DISTRIBUTED_TOO_MANY_PENDING_BYTES;
     extern const int ARGUMENT_OUT_OF_BOUND;
+    extern const int LOGICAL_ERROR;
 }
 
 /// Can the batch be split and send files from batch one-by-one instead?
diff --git a/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
index 7f368102dfd..f86951de60a 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
+++ b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
@@ -273,8 +273,6 @@ ConnectionPoolWithFailoverPtr DistributedAsyncInsertDirectoryQueue::createPool(c
             address.default_database,
             address.user,
             address.password,
-            address.proto_send_chunked,
-            address.proto_recv_chunked,
             address.quota_key,
             address.cluster,
             address.cluster_secret,
@@ -285,7 +283,7 @@ ConnectionPoolWithFailoverPtr DistributedAsyncInsertDirectoryQueue::createPool(c
 
     auto pools = createPoolsForAddresses(addresses, pool_factory, storage.log);
 
-    const auto & settings = storage.getContext()->getSettingsRef();
+    const auto settings = storage.getContext()->getSettings();
     return std::make_shared<ConnectionPoolWithFailover>(std::move(pools),
         settings.load_balancing,
         settings.distributed_replica_error_half_life.totalSeconds(),
diff --git a/src/Storages/Distributed/DistributedSink.cpp b/src/Storages/Distributed/DistributedSink.cpp
index f01ea10065c..3c282cd6e6f 100644
--- a/src/Storages/Distributed/DistributedSink.cpp
+++ b/src/Storages/Distributed/DistributedSink.cpp
@@ -347,7 +347,7 @@ DistributedSink::runWritingJob(JobReplica & job, const Block & current_block, si
         }
 
         const Block & shard_block = (num_shards > 1) ? job.current_shard_block : current_block;
-        const Settings settings = context->getSettingsCopy();
+        const Settings & settings = context->getSettingsRef();
 
         size_t rows = shard_block.rows();
 
@@ -604,7 +604,7 @@ void DistributedSink::onFinish()
     }
 }
 
-void DistributedSink::onCancel() noexcept
+void DistributedSink::onCancel()
 {
     std::lock_guard lock(execution_mutex);
     if (pool && !pool->finished())
@@ -615,26 +615,14 @@ void DistributedSink::onCancel() noexcept
         }
         catch (...)
         {
-            tryLogCurrentException(storage.log, "Error occurs on cancellation.");
+            tryLogCurrentException(storage.log);
         }
     }
 
     for (auto & shard_jobs : per_shard_jobs)
-    {
         for (JobReplica & job : shard_jobs.replicas_jobs)
-        {
-            try
-            {
-                if (job.executor)
-                    job.executor->cancel();
-            }
-            catch (...)
-            {
-                tryLogCurrentException(storage.log, "Error occurs on cancellation.");
-            }
-        }
-    }
-
+            if (job.executor)
+                job.executor->cancel();
 }
 
 
diff --git a/src/Storages/Distributed/DistributedSink.h b/src/Storages/Distributed/DistributedSink.h
index 33e580e00fa..5b7396f2c6f 100644
--- a/src/Storages/Distributed/DistributedSink.h
+++ b/src/Storages/Distributed/DistributedSink.h
@@ -53,7 +53,7 @@ public:
     void onFinish() override;
 
 private:
-    void onCancel() noexcept override;
+    void onCancel() override;
 
     IColumn::Selector createSelector(const Block & source_block) const;
 
diff --git a/src/Storages/ExternalDataSourceConfiguration.cpp b/src/Storages/ExternalDataSourceConfiguration.cpp
new file mode 100644
index 00000000000..41979f8d91c
--- /dev/null
+++ b/src/Storages/ExternalDataSourceConfiguration.cpp
@@ -0,0 +1,288 @@
+#include "ExternalDataSourceConfiguration.h"
+
+#include <Interpreters/Context.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <IO/WriteBufferFromString.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+IMPLEMENT_SETTINGS_TRAITS(EmptySettingsTraits, EMPTY_SETTINGS)
+
+static const std::unordered_set<std::string_view> dictionary_allowed_keys = {
+    "host", "port", "user", "password", "quota_key", "db",
+    "database", "table", "schema", "replica",
+    "update_field", "update_lag", "invalidate_query", "query",
+    "where", "name", "secure", "uri", "collection"};
+
+
+template<typename T>
+SettingsChanges getSettingsChangesFromConfig(
+    const BaseSettings<T> & settings, const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
+{
+    SettingsChanges config_settings;
+    for (const auto & setting : settings.all())
+    {
+        const auto & setting_name = setting.getName();
+        auto setting_value = config.getString(config_prefix + '.' + setting_name, "");
+        if (!setting_value.empty())
+            config_settings.emplace_back(setting_name, setting_value);
+    }
+    return config_settings;
+}
+
+
+String ExternalDataSourceConfiguration::toString() const
+{
+    WriteBufferFromOwnString configuration_info;
+    configuration_info << "username: " << username << "\t";
+    if (addresses.empty())
+    {
+        configuration_info << "host: " << host << "\t";
+        configuration_info << "port: " << port << "\t";
+    }
+    else
+    {
+        for (const auto & [replica_host, replica_port] : addresses)
+        {
+            configuration_info << "host: " << replica_host << "\t";
+            configuration_info << "port: " << replica_port << "\t";
+        }
+    }
+    return configuration_info.str();
+}
+
+
+void ExternalDataSourceConfiguration::set(const ExternalDataSourceConfiguration & conf)
+{
+    host = conf.host;
+    port = conf.port;
+    username = conf.username;
+    password = conf.password;
+    quota_key = conf.quota_key;
+    database = conf.database;
+    table = conf.table;
+    schema = conf.schema;
+    addresses = conf.addresses;
+    addresses_expr = conf.addresses_expr;
+}
+
+
+static void validateConfigKeys(
+    const Poco::Util::AbstractConfiguration & dict_config, const String & config_prefix, HasConfigKeyFunc has_config_key_func)
+{
+    Poco::Util::AbstractConfiguration::Keys config_keys;
+    dict_config.keys(config_prefix, config_keys);
+    for (const auto & config_key : config_keys)
+    {
+        if (!has_config_key_func(config_key))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unexpected key `{}` in dictionary source configuration", config_key);
+    }
+}
+
+template <typename T>
+std::optional<ExternalDataSourceInfo> getExternalDataSourceConfiguration(
+    const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix,
+    ContextPtr context, HasConfigKeyFunc has_config_key, const BaseSettings<T> & settings)
+{
+    validateConfigKeys(dict_config, dict_config_prefix, has_config_key);
+    ExternalDataSourceConfiguration configuration;
+
+    auto collection_name = dict_config.getString(dict_config_prefix + ".name", "");
+    if (!collection_name.empty())
+    {
+        const auto & config = context->getConfigRef();
+        const auto & collection_prefix = fmt::format("named_collections.{}", collection_name);
+        validateConfigKeys(dict_config, collection_prefix, has_config_key);
+        auto config_settings = getSettingsChangesFromConfig(settings, config, collection_prefix);
+        auto dict_settings = getSettingsChangesFromConfig(settings, dict_config, dict_config_prefix);
+        /// dictionary config settings override collection settings.
+        config_settings.insert(config_settings.end(), dict_settings.begin(), dict_settings.end());
+
+        if (!config.has(collection_prefix))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no collection named `{}` in config", collection_name);
+
+        configuration.host = dict_config.getString(dict_config_prefix + ".host", config.getString(collection_prefix + ".host", ""));
+        configuration.port = dict_config.getInt(dict_config_prefix + ".port", config.getUInt(collection_prefix + ".port", 0));
+        configuration.username = dict_config.getString(dict_config_prefix + ".user", config.getString(collection_prefix + ".user", ""));
+        configuration.password = dict_config.getString(dict_config_prefix + ".password", config.getString(collection_prefix + ".password", ""));
+        configuration.quota_key = dict_config.getString(dict_config_prefix + ".quota_key", config.getString(collection_prefix + ".quota_key", ""));
+        configuration.database = dict_config.getString(dict_config_prefix + ".db", config.getString(dict_config_prefix + ".database",
+            config.getString(collection_prefix + ".db", config.getString(collection_prefix + ".database", ""))));
+        configuration.table = dict_config.getString(dict_config_prefix + ".table", config.getString(collection_prefix + ".table", ""));
+        configuration.schema = dict_config.getString(dict_config_prefix + ".schema", config.getString(collection_prefix + ".schema", ""));
+
+        if (configuration.host.empty() || configuration.port == 0 || configuration.username.empty() || configuration.table.empty())
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "Named collection of connection parameters is missing some "
+                            "of the parameters and dictionary parameters are not added");
+        }
+        return ExternalDataSourceInfo{.configuration = configuration, .settings_changes = config_settings};
+    }
+    return std::nullopt;
+}
+
+std::optional<URLBasedDataSourceConfig> getURLBasedDataSourceConfiguration(
+    const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix, ContextPtr context)
+{
+    URLBasedDataSourceConfiguration configuration;
+    auto collection_name = dict_config.getString(dict_config_prefix + ".name", "");
+    if (!collection_name.empty())
+    {
+        const auto & config = context->getConfigRef();
+        const auto & collection_prefix = fmt::format("named_collections.{}", collection_name);
+
+        if (!config.has(collection_prefix))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no collection named `{}` in config", collection_name);
+
+        configuration.url =
+            dict_config.getString(dict_config_prefix + ".url", config.getString(collection_prefix + ".url", ""));
+        configuration.endpoint =
+            dict_config.getString(dict_config_prefix + ".endpoint", config.getString(collection_prefix + ".endpoint", ""));
+        configuration.format =
+            dict_config.getString(dict_config_prefix + ".format", config.getString(collection_prefix + ".format", ""));
+        configuration.compression_method =
+            dict_config.getString(dict_config_prefix + ".compression", config.getString(collection_prefix + ".compression_method", ""));
+        configuration.structure =
+            dict_config.getString(dict_config_prefix + ".structure", config.getString(collection_prefix + ".structure", ""));
+        configuration.user =
+            dict_config.getString(dict_config_prefix + ".credentials.user", config.getString(collection_prefix + ".credentials.user", ""));
+        configuration.password =
+            dict_config.getString(dict_config_prefix + ".credentials.password", config.getString(collection_prefix + ".credentials.password", ""));
+
+        String headers_prefix;
+        const Poco::Util::AbstractConfiguration *headers_config = nullptr;
+        if (dict_config.has(dict_config_prefix + ".headers"))
+        {
+            headers_prefix = dict_config_prefix + ".headers";
+            headers_config = &dict_config;
+        }
+        else
+        {
+            headers_prefix = collection_prefix + ".headers";
+            headers_config = &config;
+        }
+
+        if (headers_config)
+        {
+            Poco::Util::AbstractConfiguration::Keys header_keys;
+            headers_config->keys(headers_prefix, header_keys);
+            headers_prefix += ".";
+            for (const auto & header : header_keys)
+            {
+                const auto header_prefix = headers_prefix + header;
+                configuration.headers.emplace_back(
+                    headers_config->getString(header_prefix + ".name"),
+                    headers_config->getString(header_prefix + ".value"));
+            }
+        }
+
+        return URLBasedDataSourceConfig{ .configuration = configuration };
+    }
+
+    return std::nullopt;
+}
+
+ExternalDataSourcesByPriority getExternalDataSourceConfigurationByPriority(
+    const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix, ContextPtr context, HasConfigKeyFunc has_config_key)
+{
+    validateConfigKeys(dict_config, dict_config_prefix, has_config_key);
+    ExternalDataSourceConfiguration common_configuration;
+
+    auto named_collection = getExternalDataSourceConfiguration(dict_config, dict_config_prefix, context, has_config_key);
+    if (named_collection)
+    {
+        common_configuration = named_collection->configuration;
+    }
+    else
+    {
+        common_configuration.host = dict_config.getString(dict_config_prefix + ".host", "");
+        common_configuration.port = dict_config.getUInt(dict_config_prefix + ".port", 0);
+        common_configuration.username = dict_config.getString(dict_config_prefix + ".user", "");
+        common_configuration.password = dict_config.getString(dict_config_prefix + ".password", "");
+        common_configuration.quota_key = dict_config.getString(dict_config_prefix + ".quota_key", "");
+        common_configuration.database = dict_config.getString(dict_config_prefix + ".db", dict_config.getString(dict_config_prefix + ".database", ""));
+        common_configuration.table = dict_config.getString(fmt::format("{}.table", dict_config_prefix), "");
+        common_configuration.schema = dict_config.getString(fmt::format("{}.schema", dict_config_prefix), "");
+    }
+
+    ExternalDataSourcesByPriority configuration
+    {
+        .database = common_configuration.database,
+        .table = common_configuration.table,
+        .schema = common_configuration.schema,
+        .replicas_configurations = {}
+    };
+
+    if (dict_config.has(dict_config_prefix + ".replica"))
+    {
+        Poco::Util::AbstractConfiguration::Keys config_keys;
+        dict_config.keys(dict_config_prefix, config_keys);
+
+        for (const auto & config_key : config_keys)
+        {
+            if (config_key.starts_with("replica"))
+            {
+                ExternalDataSourceConfiguration replica_configuration(common_configuration);
+                String replica_name = dict_config_prefix + "." + config_key;
+                validateConfigKeys(dict_config, replica_name, has_config_key);
+
+                size_t priority = dict_config.getInt(replica_name + ".priority", 0);
+                replica_configuration.host = dict_config.getString(replica_name + ".host", common_configuration.host);
+                replica_configuration.port = dict_config.getUInt(replica_name + ".port", common_configuration.port);
+                replica_configuration.username = dict_config.getString(replica_name + ".user", common_configuration.username);
+                replica_configuration.password = dict_config.getString(replica_name + ".password", common_configuration.password);
+                replica_configuration.quota_key = dict_config.getString(replica_name + ".quota_key", common_configuration.quota_key);
+
+                if (replica_configuration.host.empty() || replica_configuration.port == 0
+                    || replica_configuration.username.empty() || replica_configuration.password.empty())
+                {
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                    "Named collection of connection parameters is missing some "
+                                    "of the parameters and no other dictionary parameters are added");
+                }
+
+                configuration.replicas_configurations[priority].emplace_back(replica_configuration);
+            }
+        }
+    }
+    else
+    {
+        configuration.replicas_configurations[0].emplace_back(common_configuration);
+    }
+
+    return configuration;
+}
+
+
+void URLBasedDataSourceConfiguration::set(const URLBasedDataSourceConfiguration & conf)
+{
+    url = conf.url;
+    format = conf.format;
+    compression_method = conf.compression_method;
+    structure = conf.structure;
+    http_method = conf.http_method;
+    headers = conf.headers;
+}
+
+template
+std::optional<ExternalDataSourceInfo> getExternalDataSourceConfiguration(
+    const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix,
+    ContextPtr context, HasConfigKeyFunc has_config_key, const BaseSettings<EmptySettingsTraits> & settings);
+
+template
+SettingsChanges getSettingsChangesFromConfig(
+    const BaseSettings<EmptySettingsTraits> & settings, const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
+
+}
diff --git a/src/Storages/ExternalDataSourceConfiguration.h b/src/Storages/ExternalDataSourceConfiguration.h
new file mode 100644
index 00000000000..c703c9ce999
--- /dev/null
+++ b/src/Storages/ExternalDataSourceConfiguration.h
@@ -0,0 +1,92 @@
+#pragma once
+
+#include <Interpreters/Context.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <IO/S3Settings.h>
+#include <IO/HTTPHeaderEntries.h>
+
+
+namespace DB
+{
+
+#define EMPTY_SETTINGS(M, ALIAS)
+DECLARE_SETTINGS_TRAITS(EmptySettingsTraits, EMPTY_SETTINGS)
+
+struct EmptySettings : public BaseSettings<EmptySettingsTraits> {};
+
+struct ExternalDataSourceConfiguration
+{
+    String host;
+    UInt16 port = 0;
+    String username = "default";
+    String password;
+    String quota_key;
+    String database;
+    String table;
+    String schema;
+
+    std::vector<std::pair<String, UInt16>> addresses; /// Failover replicas.
+    String addresses_expr;
+
+    String toString() const;
+
+    void set(const ExternalDataSourceConfiguration & conf);
+};
+
+
+using StorageSpecificArgs = std::vector<std::pair<String, ASTPtr>>;
+
+struct ExternalDataSourceInfo
+{
+    ExternalDataSourceConfiguration configuration;
+    SettingsChanges settings_changes;
+};
+
+using HasConfigKeyFunc = std::function<bool(const String &)>;
+
+template <typename T = EmptySettingsTraits>
+std::optional<ExternalDataSourceInfo> getExternalDataSourceConfiguration(
+    const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix,
+    ContextPtr context, HasConfigKeyFunc has_config_key, const BaseSettings<T> & settings = {});
+
+
+/// Highest priority is 0, the bigger the number in map, the less the priority.
+using ExternalDataSourcesConfigurationByPriority = std::map<size_t, std::vector<ExternalDataSourceConfiguration>>;
+
+struct ExternalDataSourcesByPriority
+{
+    String database;
+    String table;
+    String schema;
+    ExternalDataSourcesConfigurationByPriority replicas_configurations;
+};
+
+ExternalDataSourcesByPriority
+getExternalDataSourceConfigurationByPriority(const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix, ContextPtr context, HasConfigKeyFunc has_config_key);
+
+struct URLBasedDataSourceConfiguration
+{
+    String url;
+    String endpoint;
+    String format = "auto";
+    String compression_method = "auto";
+    String structure = "auto";
+
+    String user;
+    String password;
+
+    HTTPHeaderEntries headers;
+    String http_method;
+
+    void set(const URLBasedDataSourceConfiguration & conf);
+};
+
+struct URLBasedDataSourceConfig
+{
+    URLBasedDataSourceConfiguration configuration;
+};
+
+std::optional<URLBasedDataSourceConfig> getURLBasedDataSourceConfiguration(
+    const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix, ContextPtr context);
+
+}
diff --git a/src/Storages/Hive/StorageHive.cpp b/src/Storages/Hive/StorageHive.cpp
index ea2e9e3eece..9063437c065 100644
--- a/src/Storages/Hive/StorageHive.cpp
+++ b/src/Storages/Hive/StorageHive.cpp
@@ -444,8 +444,8 @@ StorageHive::StorageHive(
     storage_metadata.setComment(comment_);
     storage_metadata.partition_key = KeyDescription::getKeyFromAST(partition_by_ast, storage_metadata.columns, getContext());
 
-    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.columns, getContext()));
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 }
 
 void StorageHive::lazyInitialize()
@@ -516,7 +516,7 @@ void StorageHive::initMinMaxIndexExpression()
         partition_names = partition_name_types.getNames();
         partition_types = partition_name_types.getTypes();
         partition_minmax_idx_expr = std::make_shared<ExpressionActions>(
-            ActionsDAG(partition_name_types), ExpressionActionsSettings::fromContext(getContext()));
+            std::make_shared<ActionsDAG>(partition_name_types), ExpressionActionsSettings::fromContext(getContext()));
     }
 
     NamesAndTypesList all_name_types = metadata_snapshot->getColumns().getAllPhysical();
@@ -526,7 +526,7 @@ void StorageHive::initMinMaxIndexExpression()
             hivefile_name_types.push_back(column);
     }
     hivefile_minmax_idx_expr = std::make_shared<ExpressionActions>(
-        ActionsDAG(hivefile_name_types), ExpressionActionsSettings::fromContext(getContext()));
+        std::make_shared<ActionsDAG>(hivefile_name_types), ExpressionActionsSettings::fromContext(getContext()));
 }
 
 ASTPtr StorageHive::extractKeyExpressionList(const ASTPtr & node)
@@ -583,7 +583,7 @@ static HiveFilePtr createHiveFile(
 
 HiveFiles StorageHive::collectHiveFilesFromPartition(
     const Apache::Hadoop::Hive::Partition & partition,
-    const ActionsDAG * filter_actions_dag,
+    const ActionsDAGPtr & filter_actions_dag,
     const HiveTableMetadataPtr & hive_table_metadata,
     const HDFSFSPtr & fs,
     const ContextPtr & context_,
@@ -681,7 +681,7 @@ StorageHive::listDirectory(const String & path, const HiveTableMetadataPtr & hiv
 HiveFilePtr StorageHive::getHiveFileIfNeeded(
     const FileInfo & file_info,
     const FieldVector & fields,
-    const ActionsDAG * filter_actions_dag,
+    const ActionsDAGPtr & filter_actions_dag,
     const HiveTableMetadataPtr & hive_table_metadata,
     const ContextPtr & context_,
     PruneLevel prune_level) const
@@ -828,7 +828,7 @@ void ReadFromHive::createFiles()
     if (hive_files)
         return;
 
-    hive_files = storage->collectHiveFiles(num_streams, filter_actions_dag ? &*filter_actions_dag : nullptr, hive_table_metadata, fs, context);
+    hive_files = storage->collectHiveFiles(num_streams, filter_actions_dag, hive_table_metadata, fs, context);
     LOG_INFO(log, "Collect {} hive files to read", hive_files->size());
 }
 
@@ -950,7 +950,7 @@ void ReadFromHive::initializePipeline(QueryPipelineBuilder & pipeline, const Bui
 
 HiveFiles StorageHive::collectHiveFiles(
     size_t max_threads,
-    const ActionsDAG * filter_actions_dag,
+    const ActionsDAGPtr & filter_actions_dag,
     const HiveTableMetadataPtr & hive_table_metadata,
     const HDFSFSPtr & fs,
     const ContextPtr & context_,
@@ -1023,12 +1023,12 @@ SinkToStoragePtr StorageHive::write(const ASTPtr & /*query*/, const StorageMetad
 std::optional<UInt64> StorageHive::totalRows(const Settings & settings) const
 {
     /// query_info is not used when prune_level == PruneLevel::None
-    return totalRowsImpl(settings, {}, getContext(), PruneLevel::None);
+    return totalRowsImpl(settings, nullptr, getContext(), PruneLevel::None);
 }
 
-std::optional<UInt64> StorageHive::totalRowsByPartitionPredicate(const ActionsDAG & filter_actions_dag, ContextPtr context_) const
+std::optional<UInt64> StorageHive::totalRowsByPartitionPredicate(const ActionsDAGPtr & filter_actions_dag, ContextPtr context_) const
 {
-    return totalRowsImpl(context_->getSettingsRef(), &filter_actions_dag, context_, PruneLevel::Partition);
+    return totalRowsImpl(context_->getSettingsRef(), filter_actions_dag, context_, PruneLevel::Partition);
 }
 
 void StorageHive::checkAlterIsPossible(const AlterCommands & commands, ContextPtr /*local_context*/) const
@@ -1043,7 +1043,7 @@ void StorageHive::checkAlterIsPossible(const AlterCommands & commands, ContextPt
 }
 
 std::optional<UInt64>
-StorageHive::totalRowsImpl(const Settings & settings, const ActionsDAG * filter_actions_dag, ContextPtr context_, PruneLevel prune_level) const
+StorageHive::totalRowsImpl(const Settings & settings, const ActionsDAGPtr & filter_actions_dag, ContextPtr context_, PruneLevel prune_level) const
 {
     /// Row-based format like Text doesn't support totalRowsByPartitionPredicate
     if (!supportsSubsetOfColumns())
diff --git a/src/Storages/Hive/StorageHive.h b/src/Storages/Hive/StorageHive.h
index e16df22e138..8a457dd6e01 100644
--- a/src/Storages/Hive/StorageHive.h
+++ b/src/Storages/Hive/StorageHive.h
@@ -57,7 +57,7 @@ public:
     bool supportsSubsetOfColumns() const;
 
     std::optional<UInt64> totalRows(const Settings & settings) const override;
-    std::optional<UInt64> totalRowsByPartitionPredicate(const ActionsDAG & filter_actions_dag, ContextPtr context_) const override;
+    std::optional<UInt64> totalRowsByPartitionPredicate(const ActionsDAGPtr & filter_actions_dag, ContextPtr context_) const override;
     void checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const override;
 
 protected:
@@ -90,7 +90,7 @@ private:
 
     HiveFiles collectHiveFiles(
         size_t max_threads,
-        const ActionsDAG * filter_actions_dag,
+        const ActionsDAGPtr & filter_actions_dag,
         const HiveTableMetadataPtr & hive_table_metadata,
         const HDFSFSPtr & fs,
         const ContextPtr & context_,
@@ -98,7 +98,7 @@ private:
 
     HiveFiles collectHiveFilesFromPartition(
         const Apache::Hadoop::Hive::Partition & partition,
-        const ActionsDAG * filter_actions_dag,
+        const ActionsDAGPtr & filter_actions_dag,
         const HiveTableMetadataPtr & hive_table_metadata,
         const HDFSFSPtr & fs,
         const ContextPtr & context_,
@@ -107,7 +107,7 @@ private:
     HiveFilePtr getHiveFileIfNeeded(
         const FileInfo & file_info,
         const FieldVector & fields,
-        const ActionsDAG * filter_actions_dag,
+        const ActionsDAGPtr & filter_actions_dag,
         const HiveTableMetadataPtr & hive_table_metadata,
         const ContextPtr & context_,
         PruneLevel prune_level = PruneLevel::Max) const;
@@ -115,7 +115,7 @@ private:
     void lazyInitialize();
 
     std::optional<UInt64>
-    totalRowsImpl(const Settings & settings, const ActionsDAG * filter_actions_dag, ContextPtr context_, PruneLevel prune_level) const;
+    totalRowsImpl(const Settings & settings, const ActionsDAGPtr & filter_actions_dag, ContextPtr context_, PruneLevel prune_level) const;
 
     String hive_metastore_url;
 
diff --git a/src/Storages/IStorage.cpp b/src/Storages/IStorage.cpp
index 755d71df531..3b9c6ff28fa 100644
--- a/src/Storages/IStorage.cpp
+++ b/src/Storages/IStorage.cpp
@@ -237,7 +237,7 @@ StorageID IStorage::getStorageID() const
     return storage_id;
 }
 
-ConditionSelectivityEstimator IStorage::getConditionSelectivityEstimatorByPredicate(const StorageSnapshotPtr &, const ActionsDAG *, ContextPtr) const
+ConditionSelectivityEstimator IStorage::getConditionSelectivityEstimatorByPredicate(const StorageSnapshotPtr &, const ActionsDAGPtr &, ContextPtr) const
 {
     return {};
 }
@@ -325,8 +325,9 @@ std::string PrewhereInfo::dump() const
         ss << "row_level_filter " << row_level_filter->dumpDAG() << "\n";
     }
 
+    if (prewhere_actions)
     {
-        ss << "prewhere_actions " << prewhere_actions.dumpDAG() << "\n";
+        ss << "prewhere_actions " << prewhere_actions->dumpDAG() << "\n";
     }
 
     ss << "remove_prewhere_column " << remove_prewhere_column
@@ -340,8 +341,10 @@ std::string FilterDAGInfo::dump() const
     WriteBufferFromOwnString ss;
     ss << "FilterDAGInfo for column '" << column_name <<"', do_remove_column "
        << do_remove_column << "\n";
-
-    ss << "actions " << actions.dumpDAG() << "\n";
+    if (actions)
+    {
+        ss << "actions " << actions->dumpDAG() << "\n";
+    }
 
     return ss.str();
 }
diff --git a/src/Storages/IStorage.h b/src/Storages/IStorage.h
index 07058dfb5df..6217470780d 100644
--- a/src/Storages/IStorage.h
+++ b/src/Storages/IStorage.h
@@ -103,7 +103,7 @@ public:
     IStorage(const IStorage &) = delete;
     IStorage & operator=(const IStorage &) = delete;
 
-    /// The main name of the table type (e.g. Memory, MergeTree, CollapsingMergeTree).
+    /// The main name of the table type (for example, StorageMergeTree).
     virtual std::string getName() const = 0;
 
     /// The name of the table.
@@ -135,7 +135,7 @@ public:
     /// Returns true if the storage supports queries with the PREWHERE section.
     virtual bool supportsPrewhere() const { return false; }
 
-    virtual ConditionSelectivityEstimator getConditionSelectivityEstimatorByPredicate(const StorageSnapshotPtr &, const ActionsDAG *, ContextPtr) const;
+    virtual ConditionSelectivityEstimator getConditionSelectivityEstimatorByPredicate(const StorageSnapshotPtr &, const ActionsDAGPtr &, ContextPtr) const;
 
     /// Returns which columns supports PREWHERE, or empty std::nullopt if all columns is supported.
     /// This is needed for engines whose aggregates data from multiple tables, like Merge.
@@ -271,7 +271,6 @@ 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.
-    /// 'storage_snapshot' may be nullptr.
     virtual bool supportsTrivialCountOptimization(const StorageSnapshotPtr & /*storage_snapshot*/, ContextPtr /*query_context*/) const
     {
         return false;
@@ -685,7 +684,7 @@ public:
     virtual std::optional<UInt64> totalRows(const Settings &) const { return {}; }
 
     /// Same as above but also take partition predicate into account.
-    virtual std::optional<UInt64> totalRowsByPartitionPredicate(const ActionsDAG &, ContextPtr) const { return {}; }
+    virtual std::optional<UInt64> totalRowsByPartitionPredicate(const ActionsDAGPtr &, ContextPtr) const { return {}; }
 
     /// If it is possible to quickly determine exact number of bytes for the table on storage:
     /// - memory (approximated, resident)
diff --git a/src/Storages/IndicesDescription.cpp b/src/Storages/IndicesDescription.cpp
index 753fbf1d635..cef8fd85f97 100644
--- a/src/Storages/IndicesDescription.cpp
+++ b/src/Storages/IndicesDescription.cpp
@@ -3,7 +3,6 @@
 #include <Storages/IndicesDescription.h>
 
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTIndexDeclaration.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ParserCreateQuery.h>
@@ -131,15 +130,10 @@ IndexDescription IndexDescription::getIndexFromAST(const ASTPtr & definition_ast
     {
         for (size_t i = 0; i < index_type->arguments->children.size(); ++i)
         {
-            const auto & child = index_type->arguments->children[i];
-            if (const auto * ast_literal = child->as<ASTLiteral>(); ast_literal != nullptr)
-                /// E.g. INDEX index_name column_name TYPE vector_similarity('hnsw', 'f32')
-                result.arguments.emplace_back(ast_literal->value);
-            else if (const auto * ast_identifier = child->as<ASTIdentifier>(); ast_identifier != nullptr)
-                /// E.g. INDEX index_name column_name TYPE vector_similarity(hnsw, f32)
-                result.arguments.emplace_back(ast_identifier->name());
-            else
+            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);
         }
     }
 
diff --git a/src/Storages/KVStorageUtils.cpp b/src/Storages/KVStorageUtils.cpp
index 88783246e10..94319aef3b8 100644
--- a/src/Storages/KVStorageUtils.cpp
+++ b/src/Storages/KVStorageUtils.cpp
@@ -231,7 +231,7 @@ bool traverseDAGFilter(
 }
 
 std::pair<FieldVectorPtr, bool> getFilterKeys(
-    const String & primary_key, const DataTypePtr & primary_key_type, const std::optional<ActionsDAG> & filter_actions_dag, const ContextPtr & context)
+    const String & primary_key, const DataTypePtr & primary_key_type, const ActionsDAGPtr & filter_actions_dag, const ContextPtr & context)
 {
     if (!filter_actions_dag)
         return {{}, true};
diff --git a/src/Storages/KVStorageUtils.h b/src/Storages/KVStorageUtils.h
index 64108290270..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 std::optional<ActionsDAG> & filter_actions_dag, 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/KafkaConfigLoader.cpp b/src/Storages/Kafka/KafkaConfigLoader.cpp
deleted file mode 100644
index df6ccec4b7f..00000000000
--- a/src/Storages/Kafka/KafkaConfigLoader.cpp
+++ /dev/null
@@ -1,480 +0,0 @@
-#include <Storages/Kafka/KafkaConfigLoader.h>
-
-#include <Access/KerberosInit.h>
-#include <Storages/Kafka/StorageKafka.h>
-#include <Storages/Kafka/StorageKafka2.h>
-#include <Storages/Kafka/parseSyslogLevel.h>
-#include <boost/algorithm/string/replace.hpp>
-#include <Common/CurrentMetrics.h>
-#include <Common/NamedCollections/NamedCollectionsFactory.h>
-#include <Common/ThreadStatus.h>
-#include <Common/config_version.h>
-#include <Common/setThreadName.h>
-
-namespace CurrentMetrics
-{
-extern const Metric KafkaLibrdkafkaThreads;
-}
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-template <typename TKafkaStorage>
-struct KafkaInterceptors
-{
-    static rd_kafka_resp_err_t rdKafkaOnThreadStart(rd_kafka_t *, rd_kafka_thread_type_t thread_type, const char *, void * ctx);
-
-    static rd_kafka_resp_err_t rdKafkaOnThreadExit(rd_kafka_t *, rd_kafka_thread_type_t, const char *, void * ctx);
-
-    static rd_kafka_resp_err_t
-    rdKafkaOnNew(rd_kafka_t * rk, const rd_kafka_conf_t *, void * ctx, char * /*errstr*/, size_t /*errstr_size*/);
-
-    static rd_kafka_resp_err_t rdKafkaOnConfDup(
-        rd_kafka_conf_t * new_conf, const rd_kafka_conf_t * /*old_conf*/, size_t /*filter_cnt*/, const char ** /*filter*/, void * ctx);
-};
-
-template <typename TStorageKafka>
-rd_kafka_resp_err_t
-KafkaInterceptors<TStorageKafka>::rdKafkaOnThreadStart(rd_kafka_t *, rd_kafka_thread_type_t thread_type, const char *, void * ctx)
-{
-    TStorageKafka * self = reinterpret_cast<TStorageKafka *>(ctx);
-    CurrentMetrics::add(CurrentMetrics::KafkaLibrdkafkaThreads, 1);
-
-    const auto & storage_id = self->getStorageID();
-    const auto & table = storage_id.getTableName();
-
-    switch (thread_type)
-    {
-        case RD_KAFKA_THREAD_MAIN:
-            setThreadName(("rdk:m/" + table.substr(0, 9)).c_str());
-            break;
-        case RD_KAFKA_THREAD_BACKGROUND:
-            setThreadName(("rdk:bg/" + table.substr(0, 8)).c_str());
-            break;
-        case RD_KAFKA_THREAD_BROKER:
-            setThreadName(("rdk:b/" + table.substr(0, 9)).c_str());
-            break;
-    }
-
-    /// Create ThreadStatus to track memory allocations from librdkafka threads.
-    //
-    /// And store them in a separate list (thread_statuses) to make sure that they will be destroyed,
-    /// regardless how librdkafka calls the hooks.
-    /// But this can trigger use-after-free if librdkafka will not destroy threads after rd_kafka_wait_destroyed()
-    auto thread_status = std::make_shared<ThreadStatus>();
-    std::lock_guard lock(self->thread_statuses_mutex);
-    self->thread_statuses.emplace_back(std::move(thread_status));
-
-    return RD_KAFKA_RESP_ERR_NO_ERROR;
-}
-
-template <typename TStorageKafka>
-rd_kafka_resp_err_t KafkaInterceptors<TStorageKafka>::rdKafkaOnThreadExit(rd_kafka_t *, rd_kafka_thread_type_t, const char *, void * ctx)
-{
-    TStorageKafka * self = reinterpret_cast<TStorageKafka *>(ctx);
-    CurrentMetrics::sub(CurrentMetrics::KafkaLibrdkafkaThreads, 1);
-
-    std::lock_guard lock(self->thread_statuses_mutex);
-    const auto it = std::find_if(
-        self->thread_statuses.begin(),
-        self->thread_statuses.end(),
-        [](const auto & thread_status_ptr) { return thread_status_ptr.get() == current_thread; });
-    if (it == self->thread_statuses.end())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "No thread status for this librdkafka thread.");
-
-    self->thread_statuses.erase(it);
-
-    return RD_KAFKA_RESP_ERR_NO_ERROR;
-}
-
-template <typename TStorageKafka>
-rd_kafka_resp_err_t KafkaInterceptors<TStorageKafka>::rdKafkaOnNew(
-    rd_kafka_t * rk, const rd_kafka_conf_t *, void * ctx, char * /*errstr*/, size_t /*errstr_size*/)
-{
-    TStorageKafka * self = reinterpret_cast<TStorageKafka *>(ctx);
-    rd_kafka_resp_err_t status;
-
-    status = rd_kafka_interceptor_add_on_thread_start(rk, "init-thread", rdKafkaOnThreadStart, ctx);
-    if (status != RD_KAFKA_RESP_ERR_NO_ERROR)
-    {
-        LOG_ERROR(self->log, "Cannot set on thread start interceptor due to {} error", status);
-        return status;
-    }
-
-    status = rd_kafka_interceptor_add_on_thread_exit(rk, "exit-thread", rdKafkaOnThreadExit, ctx);
-    if (status != RD_KAFKA_RESP_ERR_NO_ERROR)
-        LOG_ERROR(self->log, "Cannot set on thread exit interceptor due to {} error", status);
-
-    return status;
-}
-
-template <typename TStorageKafka>
-rd_kafka_resp_err_t KafkaInterceptors<TStorageKafka>::rdKafkaOnConfDup(
-    rd_kafka_conf_t * new_conf, const rd_kafka_conf_t * /*old_conf*/, size_t /*filter_cnt*/, const char ** /*filter*/, void * ctx)
-{
-    TStorageKafka * self = reinterpret_cast<TStorageKafka *>(ctx);
-    rd_kafka_resp_err_t status;
-
-    // cppkafka copies configuration multiple times
-    status = rd_kafka_conf_interceptor_add_on_conf_dup(new_conf, "init", rdKafkaOnConfDup, ctx);
-    if (status != RD_KAFKA_RESP_ERR_NO_ERROR)
-    {
-        LOG_ERROR(self->log, "Cannot set on conf dup interceptor due to {} error", status);
-        return status;
-    }
-
-    status = rd_kafka_conf_interceptor_add_on_new(new_conf, "init", rdKafkaOnNew, ctx);
-    if (status != RD_KAFKA_RESP_ERR_NO_ERROR)
-        LOG_ERROR(self->log, "Cannot set on conf new interceptor due to {} error", status);
-
-    return status;
-}
-
-template struct KafkaInterceptors<StorageKafka>;
-template struct KafkaInterceptors<StorageKafka2>;
-
-namespace
-{
-
-void setKafkaConfigValue(cppkafka::Configuration & kafka_config, const String & key, const String & value)
-{
-    /// "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);
-}
-
-void loadConfigProperty(
-    cppkafka::Configuration & kafka_config,
-    const Poco::Util::AbstractConfiguration & config,
-    const String & config_prefix,
-    const String & tag)
-{
-    const String property_path = config_prefix + "." + tag;
-    const String property_value = config.getString(property_path);
-
-    setKafkaConfigValue(kafka_config, tag, property_value);
-}
-
-void loadNamedCollectionConfig(cppkafka::Configuration & kafka_config, const String & collection_name, const String & config_prefix)
-{
-    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));
-    }
-}
-
-void loadLegacyTopicConfig(
-    cppkafka::Configuration & kafka_config,
-    const Poco::Util::AbstractConfiguration & config,
-    const String & collection_name,
-    const String & config_prefix)
-{
-    if (!collection_name.empty())
-    {
-        loadNamedCollectionConfig(kafka_config, collection_name, config_prefix);
-        return;
-    }
-
-    Poco::Util::AbstractConfiguration::Keys tags;
-    config.keys(config_prefix, tags);
-
-    for (const auto & tag : tags)
-    {
-        loadConfigProperty(kafka_config, config, config_prefix, tag);
-    }
-}
-
-/// 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 & collection_name,
-    const String & config_prefix,
-    const String & topic)
-{
-    if (!collection_name.empty())
-    {
-        const auto topic_prefix = fmt::format("{}.{}", config_prefix, KafkaConfigLoader::CONFIG_KAFKA_TOPIC_TAG);
-        const auto & collection = NamedCollectionFactory::instance().get(collection_name);
-        for (const auto & key : collection->getKeys(1, config_prefix))
-        {
-            /// Only consider key <kafka_topic>. Multiple occurrences given as "kafka_topic", "kafka_topic[1]", etc.
-            if (!key.starts_with(topic_prefix))
-                continue;
-
-            const String kafka_topic_path = config_prefix + "." + key;
-            const String kafka_topic_name_path = kafka_topic_path + "." + KafkaConfigLoader::CONFIG_NAME_TAG;
-            if (topic == collection->get<String>(kafka_topic_name_path))
-                /// Found it! Now read the per-topic configuration into cppkafka.
-                loadNamedCollectionConfig(kafka_config, collection_name, kafka_topic_path);
-        }
-    }
-    else
-    {
-        /// Read all tags one level below <kafka>
-        Poco::Util::AbstractConfiguration::Keys tags;
-        config.keys(config_prefix, tags);
-
-        for (const auto & tag : tags)
-        {
-            if (tag == KafkaConfigLoader::CONFIG_NAME_TAG)
-                continue; // ignore <name>, it is used to match topic configurations
-            loadConfigProperty(kafka_config, config, config_prefix, tag);
-        }
-    }
-}
-
-/// Read server configuration into cppkafka configuration, used by global configuration and by legacy per-topic configuration
-void loadFromConfig(
-    cppkafka::Configuration & kafka_config, const KafkaConfigLoader::LoadConfigParams & params, const String & config_prefix)
-{
-    if (!params.collection_name.empty())
-    {
-        loadNamedCollectionConfig(kafka_config, params.collection_name, config_prefix);
-        return;
-    }
-
-    /// Read all tags one level below <kafka>
-    Poco::Util::AbstractConfiguration::Keys tags;
-    params.config.keys(config_prefix, tags);
-
-    for (const auto & tag : tags)
-    {
-        if (tag == KafkaConfigLoader::CONFIG_KAFKA_PRODUCER_TAG || tag == KafkaConfigLoader::CONFIG_KAFKA_CONSUMER_TAG)
-            /// Do not load consumer/producer properties, since they should be separated by different configuration objects.
-            continue;
-
-        if (tag.starts_with(
-                KafkaConfigLoader::CONFIG_KAFKA_TOPIC_TAG)) /// multiple occurrences given as "kafka_topic", "kafka_topic[1]", etc.
-        {
-            // Update consumer topic-specific configuration (new syntax). Example with topics "football" and "baseball":
-            //     <kafka>
-            //         <kafka_topic>
-            //             <name>football</name>
-            //             <retry_backoff_ms>250</retry_backoff_ms>
-            //             <fetch_min_bytes>5000</fetch_min_bytes>
-            //         </kafka_topic>
-            //         <kafka_topic>
-            //             <name>baseball</name>
-            //             <retry_backoff_ms>300</retry_backoff_ms>
-            //             <fetch_min_bytes>2000</fetch_min_bytes>
-            //         </kafka_topic>
-            //     </kafka>
-            // 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 : params.topics)
-            {
-                /// Read topic name between <name>...</name>
-                const String kafka_topic_path = config_prefix + "." + tag;
-                const String kafka_topic_name_path = kafka_topic_path + "." + KafkaConfigLoader::CONFIG_NAME_TAG;
-                const String topic_name = params.config.getString(kafka_topic_name_path);
-
-                if (topic_name != topic)
-                    continue;
-                loadTopicConfig(kafka_config, params.config, params.collection_name, kafka_topic_path, topic);
-            }
-            continue;
-        }
-        if (tag.starts_with(KafkaConfigLoader::CONFIG_KAFKA_TAG))
-            /// skip legacy configuration per topic e.g. <kafka_TOPIC_NAME>.
-            /// it will be processed is a separate function
-            continue;
-        // Update configuration from the configuration. Example:
-        //     <kafka>
-        //         <retry_backoff_ms>250</retry_backoff_ms>
-        //         <fetch_min_bytes>100000</fetch_min_bytes>
-        //     </kafka>
-        loadConfigProperty(kafka_config, params.config, config_prefix, tag);
-    }
-}
-
-void loadLegacyConfigSyntax(
-    cppkafka::Configuration & kafka_config,
-    const Poco::Util::AbstractConfiguration & config,
-    const String & collection_name,
-    const Names & topics)
-{
-    for (const auto & topic : topics)
-    {
-        const String kafka_topic_path = KafkaConfigLoader::CONFIG_KAFKA_TAG + "." + KafkaConfigLoader::CONFIG_KAFKA_TAG + "_" + topic;
-        loadLegacyTopicConfig(kafka_config, config, collection_name, kafka_topic_path);
-    }
-}
-
-void loadConsumerConfig(cppkafka::Configuration & kafka_config, const KafkaConfigLoader::LoadConfigParams & params)
-{
-    const String consumer_path = KafkaConfigLoader::CONFIG_KAFKA_TAG + "." + KafkaConfigLoader::CONFIG_KAFKA_CONSUMER_TAG;
-    loadLegacyConfigSyntax(kafka_config, params.config, params.collection_name, params.topics);
-    // A new syntax has higher priority
-    loadFromConfig(kafka_config, params, consumer_path);
-}
-
-void loadProducerConfig(cppkafka::Configuration & kafka_config, const KafkaConfigLoader::LoadConfigParams & params)
-{
-    const String producer_path = KafkaConfigLoader::CONFIG_KAFKA_TAG + "." + KafkaConfigLoader::CONFIG_KAFKA_PRODUCER_TAG;
-    loadLegacyConfigSyntax(kafka_config, params.config, params.collection_name, params.topics);
-    // A new syntax has higher priority
-    loadFromConfig(kafka_config, params, producer_path);
-}
-
-template <typename TKafkaStorage>
-void updateGlobalConfiguration(
-    cppkafka::Configuration & kafka_config, TKafkaStorage & storage, const KafkaConfigLoader::LoadConfigParams & params)
-{
-    loadFromConfig(kafka_config, params, KafkaConfigLoader::CONFIG_KAFKA_TAG);
-
-#if USE_KRB5
-    if (kafka_config.has_property("sasl.kerberos.kinit.cmd"))
-        LOG_WARNING(params.log, "sasl.kerberos.kinit.cmd configuration parameter is ignored.");
-
-    kafka_config.set("sasl.kerberos.kinit.cmd", "");
-    kafka_config.set("sasl.kerberos.min.time.before.relogin", "0");
-
-    if (kafka_config.has_property("sasl.kerberos.keytab") && kafka_config.has_property("sasl.kerberos.principal"))
-    {
-        String keytab = kafka_config.get("sasl.kerberos.keytab");
-        String principal = kafka_config.get("sasl.kerberos.principal");
-        LOG_DEBUG(params.log, "Running KerberosInit");
-        try
-        {
-            kerberosInit(keytab, principal);
-        }
-        catch (const Exception & e)
-        {
-            LOG_ERROR(params.log, "KerberosInit failure: {}", getExceptionMessage(e, false));
-        }
-        LOG_DEBUG(params.log, "Finished KerberosInit");
-    }
-#else // USE_KRB5
-    if (kafka_config.has_property("sasl.kerberos.keytab") || kafka_config.has_property("sasl.kerberos.principal"))
-        LOG_WARNING(params.log, "Ignoring Kerberos-related parameters because ClickHouse was built without krb5 library support.");
-#endif // USE_KRB5
-    // No need to add any prefix, messages can be distinguished
-    kafka_config.set_log_callback(
-        [log = params.log](cppkafka::KafkaHandleBase & handle, int level, const std::string & facility, const std::string & message)
-        {
-            auto [poco_level, client_logs_level] = parseSyslogLevel(level);
-            const auto & kafka_object_config = handle.get_configuration();
-            const std::string client_id_key{"client.id"};
-            chassert(kafka_object_config.has_property(client_id_key) && "Kafka configuration doesn't have expected client.id set");
-            LOG_IMPL(
-                log,
-                client_logs_level,
-                poco_level,
-                "[client.id:{}] [rdk:{}] {}",
-                kafka_object_config.get(client_id_key),
-                facility,
-                message);
-        });
-
-    /// NOTE: statistics should be consumed, otherwise it creates too much
-    /// entries in the queue, that leads to memory leak and slow shutdown.
-    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");
-    }
-    // Configure interceptor to change thread name
-    //
-    // TODO: add interceptors support into the cppkafka.
-    // XXX:  rdkafka uses pthread_set_name_np(), but glibc-compatibility overrides it to noop.
-    {
-        // This should be safe, since we wait the rdkafka object anyway.
-        void * self = static_cast<void *>(&storage);
-
-        int status;
-
-        status
-            = rd_kafka_conf_interceptor_add_on_new(kafka_config.get_handle(), "init", KafkaInterceptors<TKafkaStorage>::rdKafkaOnNew, self);
-        if (status != RD_KAFKA_RESP_ERR_NO_ERROR)
-            LOG_ERROR(params.log, "Cannot set new interceptor due to {} error", status);
-
-        // cppkafka always copy the configuration
-        status = rd_kafka_conf_interceptor_add_on_conf_dup(
-            kafka_config.get_handle(), "init", KafkaInterceptors<TKafkaStorage>::rdKafkaOnConfDup, self);
-        if (status != RD_KAFKA_RESP_ERR_NO_ERROR)
-            LOG_ERROR(params.log, "Cannot set dup conf interceptor due to {} error", status);
-    }
-}
-
-}
-
-template <typename TKafkaStorage>
-cppkafka::Configuration KafkaConfigLoader::getConsumerConfiguration(TKafkaStorage & storage, const ConsumerConfigParams & params)
-{
-    cppkafka::Configuration conf;
-
-    conf.set("metadata.broker.list", params.brokers);
-    conf.set("group.id", params.group);
-    if (params.multiple_consumers)
-        conf.set("client.id", fmt::format("{}-{}", params.client_id, params.consumer_number));
-    else
-        conf.set("client.id", params.client_id);
-    conf.set("client.software.name", VERSION_NAME);
-    conf.set("client.software.version", VERSION_DESCRIBE);
-    conf.set("auto.offset.reset", "earliest"); // If no offset stored for this group, read all messages from the start
-
-    // that allows to prevent fast draining of the librdkafka queue
-    // during building of single insert block. Improves performance
-    // significantly, but may lead to bigger memory consumption.
-    size_t default_queued_min_messages = 100000; // must be greater than or equal to default
-    size_t max_allowed_queued_min_messages = 10000000; // must be less than or equal to max allowed value
-    conf.set(
-        "queued.min.messages", std::min(std::max(params.max_block_size, default_queued_min_messages), max_allowed_queued_min_messages));
-
-    updateGlobalConfiguration(conf, storage, params);
-    loadConsumerConfig(conf, params);
-
-    // those settings should not be changed by users.
-    conf.set("enable.auto.commit", "false"); // We manually commit offsets after a stream successfully finished
-    conf.set("enable.auto.offset.store", "false"); // Update offset automatically - to commit them all at once.
-    conf.set("enable.partition.eof", "false"); // Ignore EOF messages
-
-    for (auto & property : conf.get_all())
-    {
-        LOG_TRACE(params.log, "Consumer set property {}:{}", property.first, property.second);
-    }
-
-    return conf;
-}
-
-template cppkafka::Configuration
-KafkaConfigLoader::getConsumerConfiguration<StorageKafka>(StorageKafka & storage, const ConsumerConfigParams & params);
-template cppkafka::Configuration
-KafkaConfigLoader::getConsumerConfiguration<StorageKafka2>(StorageKafka2 & storage, const ConsumerConfigParams & params);
-
-template <typename TKafkaStorage>
-cppkafka::Configuration KafkaConfigLoader::getProducerConfiguration(TKafkaStorage & storage, const ProducerConfigParams & params)
-{
-    cppkafka::Configuration conf;
-    conf.set("metadata.broker.list", params.brokers);
-    conf.set("client.id", params.client_id);
-    conf.set("client.software.name", VERSION_NAME);
-    conf.set("client.software.version", VERSION_DESCRIBE);
-
-    updateGlobalConfiguration(conf, storage, params);
-    loadProducerConfig(conf, params);
-
-    for (auto & property : conf.get_all())
-    {
-        LOG_TRACE(params.log, "Producer set property {}:{}", property.first, property.second);
-    }
-
-    return conf;
-}
-
-template cppkafka::Configuration
-KafkaConfigLoader::getProducerConfiguration<StorageKafka>(StorageKafka & storage, const ProducerConfigParams & params);
-template cppkafka::Configuration
-KafkaConfigLoader::getProducerConfiguration<StorageKafka2>(StorageKafka2 & storage, const ProducerConfigParams & params);
-
-}
diff --git a/src/Storages/Kafka/KafkaConfigLoader.h b/src/Storages/Kafka/KafkaConfigLoader.h
deleted file mode 100644
index f18683c17f0..00000000000
--- a/src/Storages/Kafka/KafkaConfigLoader.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include <base/types.h>
-#include <cppkafka/cppkafka.h>
-#include <Core/Names.h>
-#include <Poco/Util/AbstractConfiguration.h>
-#include <Common/Logger.h>
-
-namespace DB
-{
-struct KafkaSettings;
-class VirtualColumnsDescription;
-
-struct KafkaConfigLoader
-{
-    static inline const String CONFIG_KAFKA_TAG = "kafka";
-    static inline const String CONFIG_KAFKA_TOPIC_TAG = "kafka_topic";
-    static inline const String CONFIG_NAME_TAG = "name";
-    static inline const String CONFIG_KAFKA_CONSUMER_TAG = "consumer";
-    static inline const String CONFIG_KAFKA_PRODUCER_TAG = "producer";
-    using LogCallback = cppkafka::Configuration::LogCallback;
-
-
-    struct LoadConfigParams
-    {
-        const Poco::Util::AbstractConfiguration & config;
-        String & collection_name;
-        const Names & topics;
-        LoggerPtr & log;
-    };
-
-    struct ConsumerConfigParams : public LoadConfigParams
-    {
-        String brokers;
-        String group;
-        bool multiple_consumers;
-        size_t consumer_number;
-        String client_id;
-        size_t max_block_size;
-    };
-
-    struct ProducerConfigParams : public LoadConfigParams
-    {
-        String brokers;
-        String client_id;
-    };
-
-    template <typename TKafkaStorage>
-    static cppkafka::Configuration getConsumerConfiguration(TKafkaStorage & storage, const ConsumerConfigParams & params);
-
-    template <typename TKafkaStorage>
-    static cppkafka::Configuration getProducerConfiguration(TKafkaStorage & storage, const ProducerConfigParams & params);
-};
-}
diff --git a/src/Storages/Kafka/KafkaConsumer.cpp b/src/Storages/Kafka/KafkaConsumer.cpp
index d9256cf39ce..9ba42b9875e 100644
--- a/src/Storages/Kafka/KafkaConsumer.cpp
+++ b/src/Storages/Kafka/KafkaConsumer.cpp
@@ -9,7 +9,6 @@
 #include <algorithm>
 
 #include <Common/CurrentMetrics.h>
-#include <Storages/Kafka/StorageKafkaUtils.h>
 #include <Common/ProfileEvents.h>
 #include <base/defines.h>
 
@@ -21,12 +20,13 @@ namespace CurrentMetrics
 
 namespace ProfileEvents
 {
-extern const Event KafkaRebalanceRevocations;
-extern const Event KafkaRebalanceAssignments;
-extern const Event KafkaRebalanceErrors;
-extern const Event KafkaMessagesPolled;
-extern const Event KafkaCommitFailures;
-extern const Event KafkaCommits;
+    extern const Event KafkaRebalanceRevocations;
+    extern const Event KafkaRebalanceAssignments;
+    extern const Event KafkaRebalanceErrors;
+    extern const Event KafkaMessagesPolled;
+    extern const Event KafkaCommitFailures;
+    extern const Event KafkaCommits;
+    extern const Event KafkaConsumerErrors;
 }
 
 namespace DB
@@ -199,9 +199,44 @@ KafkaConsumer::~KafkaConsumer()
 //     https://github.com/confluentinc/confluent-kafka-go/issues/189 etc.
 void KafkaConsumer::drain()
 {
-    StorageKafkaUtils::drainConsumer(*consumer, DRAIN_TIMEOUT_MS, log, [this](const cppkafka::Error & err) { setExceptionInfo(err); });
+    auto start_time = std::chrono::steady_clock::now();
+    cppkafka::Error last_error(RD_KAFKA_RESP_ERR_NO_ERROR);
+
+    while (true)
+    {
+        auto msg = consumer->poll(100ms);
+        if (!msg)
+            break;
+
+        auto error = msg.get_error();
+
+        if (error)
+        {
+            if (msg.is_eof() || error == last_error)
+            {
+                break;
+            }
+            else
+            {
+                LOG_ERROR(log, "Error during draining: {}", error);
+                setExceptionInfo(error);
+            }
+        }
+
+        // i don't stop draining on first error,
+        // only if it repeats once again sequentially
+        last_error = error;
+
+        auto ts = std::chrono::steady_clock::now();
+        if (std::chrono::duration_cast<std::chrono::milliseconds>(ts-start_time) > DRAIN_TIMEOUT_MS)
+        {
+            LOG_ERROR(log, "Timeout during draining.");
+            break;
+        }
+    }
 }
 
+
 void KafkaConsumer::commit()
 {
     auto print_offsets = [this] (const char * prefix, const cppkafka::TopicPartitionList & offsets)
@@ -374,7 +409,7 @@ void KafkaConsumer::resetToLastCommitted(const char * msg)
 {
     if (!assignment.has_value() || assignment->empty())
     {
-        LOG_TRACE(log, "Not assigned. Can't reset to last committed position.");
+        LOG_TRACE(log, "Not assignned. Can't reset to last committed position.");
         return;
     }
     auto committed_offset = consumer->get_offsets_committed(consumer->get_assignment());
@@ -438,7 +473,7 @@ ReadBufferPtr KafkaConsumer::consume()
             // If we're doing a manual select then it's better to get something after a wait, then immediate nothing.
             if (!assignment.has_value())
             {
-                waited_for_assignment += poll_timeout; // slightly inaccurate, but rough calculation is ok.
+                waited_for_assignment += poll_timeout; // slightly innaccurate, but rough calculation is ok.
                 if (waited_for_assignment < MAX_TIME_TO_WAIT_FOR_ASSIGNMENT_MS)
                 {
                     continue;
@@ -500,12 +535,26 @@ ReadBufferPtr KafkaConsumer::getNextMessage()
     return getNextMessage();
 }
 
-void KafkaConsumer::filterMessageErrors()
+size_t KafkaConsumer::filterMessageErrors()
 {
     assert(current == messages.begin());
 
-    StorageKafkaUtils::eraseMessageErrors(messages, log, [this](const cppkafka::Error & err) { setExceptionInfo(err); });
-    current = messages.begin();
+    size_t skipped = std::erase_if(messages, [this](auto & message)
+    {
+        if (auto error = message.get_error())
+        {
+            ProfileEvents::increment(ProfileEvents::KafkaConsumerErrors);
+            LOG_ERROR(log, "Consumer error: {}", error);
+            setExceptionInfo(error);
+            return true;
+        }
+        return false;
+    });
+
+    if (skipped)
+        LOG_ERROR(log, "There were {} messages with an error", skipped);
+
+    return skipped;
 }
 
 void KafkaConsumer::resetIfStopped()
diff --git a/src/Storages/Kafka/KafkaConsumer.h b/src/Storages/Kafka/KafkaConsumer.h
index 285f3680213..4daf8652c3b 100644
--- a/src/Storages/Kafka/KafkaConsumer.h
+++ b/src/Storages/Kafka/KafkaConsumer.h
@@ -1,12 +1,14 @@
 #pragma once
 
 #include <boost/circular_buffer.hpp>
+#include <fmt/ostream.h>
 
 #include <Core/Names.h>
 #include <base/types.h>
 #include <IO/ReadBuffer.h>
 
 #include <cppkafka/cppkafka.h>
+#include <cppkafka/topic_partition.h>
 #include <Common/CurrentMetrics.h>
 
 namespace CurrentMetrics
@@ -191,8 +193,12 @@ private:
     void drain();
     void cleanUnprocessed();
     void resetIfStopped();
-    void filterMessageErrors();
+    /// Return number of messages with an error.
+    size_t filterMessageErrors();
     ReadBufferPtr getNextMessage();
 };
 
 }
+
+template <> struct fmt::formatter<cppkafka::TopicPartition> : fmt::ostream_formatter {};
+template <> struct fmt::formatter<cppkafka::Error> : fmt::ostream_formatter {};
diff --git a/src/Storages/Kafka/KafkaConsumer2.cpp b/src/Storages/Kafka/KafkaConsumer2.cpp
deleted file mode 100644
index 60626dfa402..00000000000
--- a/src/Storages/Kafka/KafkaConsumer2.cpp
+++ /dev/null
@@ -1,384 +0,0 @@
-#include <Storages/Kafka/KafkaConsumer2.h>
-
-#include <fmt/ranges.h>
-#include <cppkafka/exceptions.h>
-#include <cppkafka/topic_partition.h>
-#include <cppkafka/cppkafka.h>
-#include <cppkafka/topic_partition_list.h>
-#include <fmt/ostream.h>
-#include <boost/algorithm/string/join.hpp>
-
-#include <IO/ReadBufferFromMemory.h>
-#include <Storages/Kafka/StorageKafkaUtils.h>
-#include <Common/logger_useful.h>
-#include <Common/CurrentMetrics.h>
-#include <Common/ProfileEvents.h>
-
-#include <algorithm>
-#include <iterator>
-
-
-namespace CurrentMetrics
-{
-extern const Metric KafkaAssignedPartitions;
-extern const Metric KafkaConsumersWithAssignment;
-}
-
-namespace ProfileEvents
-{
-extern const Event KafkaRebalanceRevocations;
-extern const Event KafkaRebalanceAssignments;
-extern const Event KafkaRebalanceErrors;
-extern const Event KafkaMessagesPolled;
-extern const Event KafkaCommitFailures;
-extern const Event KafkaCommits;
-}
-
-namespace DB
-{
-
-using namespace std::chrono_literals;
-static constexpr auto EVENT_POLL_TIMEOUT = 50ms;
-static constexpr auto DRAIN_TIMEOUT_MS = 5000ms;
-
-
-bool KafkaConsumer2::TopicPartition::operator<(const TopicPartition & other) const
-{
-    return std::tie(topic, partition_id, offset) < std::tie(other.topic, other.partition_id, other.offset);
-}
-
-
-KafkaConsumer2::KafkaConsumer2(
-    ConsumerPtr consumer_,
-    LoggerPtr log_,
-    size_t max_batch_size,
-    size_t poll_timeout_,
-    const std::atomic<bool> & stopped_,
-    const Names & topics_)
-    : consumer(consumer_)
-    , log(log_)
-    , batch_size(max_batch_size)
-    , poll_timeout(poll_timeout_)
-    , stopped(stopped_)
-    , current(messages.begin())
-    , topics(topics_)
-{
-    // called (synchronously, during poll) when we enter the consumer group
-    consumer->set_assignment_callback(
-        [this](const cppkafka::TopicPartitionList & topic_partitions)
-        {
-            CurrentMetrics::add(CurrentMetrics::KafkaAssignedPartitions, topic_partitions.size());
-            ProfileEvents::increment(ProfileEvents::KafkaRebalanceAssignments);
-
-            if (topic_partitions.empty())
-            {
-                LOG_INFO(log, "Got empty assignment: Not enough partitions in the topic for all consumers?");
-            }
-            else
-            {
-                LOG_TRACE(log, "Topics/partitions assigned: {}", topic_partitions);
-                CurrentMetrics::add(CurrentMetrics::KafkaConsumersWithAssignment, 1);
-            }
-
-            chassert(!assignment.has_value());
-
-            assignment.emplace();
-            assignment->reserve(topic_partitions.size());
-            needs_offset_update = true;
-            for (const auto & topic_partition : topic_partitions)
-            {
-                assignment->push_back(
-                    TopicPartition{topic_partition.get_topic(), topic_partition.get_partition(), topic_partition.get_offset()});
-            }
-
-            // We need to initialize the queues here in order to detach them from the consumer queue. Otherwise `pollEvents` might eventually poll actual messages also.
-            initializeQueues(topic_partitions);
-        });
-
-    // called (synchronously, during poll) when we leave the consumer group
-    consumer->set_revocation_callback(
-        [this](const cppkafka::TopicPartitionList & topic_partitions)
-        {
-            CurrentMetrics::sub(CurrentMetrics::KafkaAssignedPartitions, topic_partitions.size());
-            ProfileEvents::increment(ProfileEvents::KafkaRebalanceRevocations);
-
-            // Rebalance is happening now, and now we have a chance to finish the work
-            // with topics/partitions we were working with before rebalance
-            LOG_TRACE(log, "Rebalance initiated. Revoking partitions: {}", topic_partitions);
-
-            if (!topic_partitions.empty())
-            {
-                CurrentMetrics::sub(CurrentMetrics::KafkaConsumersWithAssignment, 1);
-            }
-
-            assignment.reset();
-            queues.clear();
-            needs_offset_update = true;
-        });
-
-    consumer->set_rebalance_error_callback(
-        [this](cppkafka::Error err)
-        {
-            LOG_ERROR(log, "Rebalance error: {}", err);
-            ProfileEvents::increment(ProfileEvents::KafkaRebalanceErrors);
-        });
-}
-
-KafkaConsumer2::~KafkaConsumer2()
-{
-    try
-    {
-        if (!consumer->get_subscription().empty())
-        {
-            try
-            {
-                consumer->unsubscribe();
-            }
-            catch (const cppkafka::HandleException & e)
-            {
-                LOG_ERROR(log, "Error during unsubscribe: {}", e.what());
-            }
-            drainConsumerQueue();
-        }
-    }
-    catch (const cppkafka::HandleException & e)
-    {
-        LOG_ERROR(log, "Error while destructing consumer: {}", e.what());
-    }
-}
-
-// Needed to drain rest of the messages / queued callback calls from the consumer after unsubscribe, otherwise consumer
-// will hang on destruction. Partition queues doesn't have to be attached as events are not handled by those queues.
-// see https://github.com/edenhill/librdkafka/issues/2077
-//     https://github.com/confluentinc/confluent-kafka-go/issues/189 etc.
-void KafkaConsumer2::drainConsumerQueue()
-{
-    StorageKafkaUtils::drainConsumer(*consumer, DRAIN_TIMEOUT_MS, log);
-}
-
-void KafkaConsumer2::pollEvents()
-{
-    static constexpr auto max_tries = 5;
-    for (auto i = 0; i < max_tries; ++i)
-    {
-        auto msg = consumer->poll(EVENT_POLL_TIMEOUT);
-        if (!msg)
-            return;
-        // All the partition queues are detached, so the consumer shouldn't be able to poll any real messages
-        const auto err = msg.get_error();
-        chassert(RD_KAFKA_RESP_ERR_NO_ERROR != err.get_error() && "Consumer returned a message when it was not expected");
-        LOG_ERROR(log, "Consumer received error while polling events, code {}, error '{}'", err.get_error(), err.to_string());
-    }
-};
-
-bool KafkaConsumer2::polledDataUnusable(const TopicPartition & topic_partition) const
-{
-    const auto different_topic_partition = current == messages.end()
-        ? false
-        : (current->get_topic() != topic_partition.topic || current->get_partition() != topic_partition.partition_id);
-    return different_topic_partition;
-}
-
-KafkaConsumer2::TopicPartitions const * KafkaConsumer2::getKafkaAssignment() const
-{
-    if (assignment.has_value())
-    {
-        return &*assignment;
-    }
-
-    return nullptr;
-}
-
-void KafkaConsumer2::updateOffsets(const TopicPartitions & topic_partitions)
-{
-    cppkafka::TopicPartitionList original_topic_partitions;
-    original_topic_partitions.reserve(topic_partitions.size());
-    std::transform(
-        topic_partitions.begin(),
-        topic_partitions.end(),
-        std::back_inserter(original_topic_partitions),
-        [](const TopicPartition & tp)
-        {
-            return cppkafka::TopicPartition{tp.topic, tp.partition_id, tp.offset};
-        });
-    initializeQueues(original_topic_partitions);
-    needs_offset_update = false;
-    stalled_status = StalledStatus::NOT_STALLED;
-}
-
-void KafkaConsumer2::initializeQueues(const cppkafka::TopicPartitionList & topic_partitions)
-{
-    queues.clear();
-    messages.clear();
-    current = messages.end();
-    // cppkafka itself calls assign(), but in order to detach the queues here we have to do the assignment manually. Later on we have to reassign the topic partitions with correct offsets.
-    consumer->assign(topic_partitions);
-    for (const auto & topic_partition : topic_partitions)
-        // This will also detach the partition queues from the consumer, thus the messages won't be forwarded without attaching them manually
-        queues.emplace(
-            TopicPartition{topic_partition.get_topic(), topic_partition.get_partition(), topic_partition.get_offset()},
-            consumer->get_partition_queue(topic_partition));
-}
-
-// it do the poll when needed
-ReadBufferPtr KafkaConsumer2::consume(const TopicPartition & topic_partition, const std::optional<int64_t> & message_count)
-{
-    resetIfStopped();
-
-    if (polledDataUnusable(topic_partition))
-        return nullptr;
-
-    if (hasMorePolledMessages())
-    {
-        if (auto next_message = getNextMessage(); next_message)
-            return next_message;
-    }
-
-    while (true)
-    {
-        stalled_status = StalledStatus::NO_MESSAGES_RETURNED;
-
-        auto & queue_to_poll_from = queues.at(topic_partition);
-        LOG_TRACE(log, "Batch size {}, offset {}", batch_size, topic_partition.offset);
-        const auto messages_to_pull = message_count.value_or(batch_size);
-        /// Don't drop old messages immediately, since we may need them for virtual columns.
-        auto new_messages = queue_to_poll_from.consume_batch(messages_to_pull, std::chrono::milliseconds(poll_timeout));
-
-        resetIfStopped();
-        if (stalled_status == StalledStatus::CONSUMER_STOPPED)
-        {
-            return nullptr;
-        }
-
-        if (new_messages.empty())
-        {
-            LOG_TRACE(log, "Stalled");
-            return nullptr;
-        }
-        else
-        {
-            messages = std::move(new_messages);
-            current = messages.begin();
-            LOG_TRACE(
-                log,
-                "Polled batch of {} messages. Offsets position: {}",
-                messages.size(),
-                consumer->get_offsets_position(consumer->get_assignment()));
-            break;
-        }
-    }
-
-    filterMessageErrors();
-    if (current == messages.end())
-    {
-        LOG_ERROR(log, "Only errors left");
-        stalled_status = StalledStatus::ERRORS_RETURNED;
-        return nullptr;
-    }
-
-    ProfileEvents::increment(ProfileEvents::KafkaMessagesPolled, messages.size());
-
-    stalled_status = StalledStatus::NOT_STALLED;
-    return getNextMessage();
-}
-
-void KafkaConsumer2::commit(const TopicPartition & topic_partition)
-{
-    static constexpr auto max_retries = 5;
-    bool committed = false;
-
-    LOG_TEST(
-        log,
-        "Trying to commit offset {} to Kafka for topic-partition [{}:{}]",
-        topic_partition.offset,
-        topic_partition.topic,
-        topic_partition.partition_id);
-
-    const auto topic_partition_list = std::vector{cppkafka::TopicPartition{
-        topic_partition.topic,
-        topic_partition.partition_id,
-        topic_partition.offset,
-    }};
-    for (auto try_count = 0; try_count < max_retries && !committed; ++try_count)
-    {
-        try
-        {
-            // See https://github.com/edenhill/librdkafka/issues/1470
-            // broker may reject commit if during offsets.commit.timeout.ms (5000 by default),
-            // there were not enough replicas available for the __consumer_offsets topic.
-            // also some other temporary issues like client-server connectivity problems are possible
-
-            consumer->commit(topic_partition_list);
-            committed = true;
-            LOG_INFO(
-                log,
-                "Committed offset {} to Kafka for topic-partition [{}:{}]",
-                topic_partition.offset,
-                topic_partition.topic,
-                topic_partition.partition_id);
-        }
-        catch (const cppkafka::HandleException & e)
-        {
-            // If there were actually no offsets to commit, return. Retrying won't solve
-            // anything here
-            if (e.get_error() == RD_KAFKA_RESP_ERR__NO_OFFSET)
-                committed = true;
-            else
-                LOG_ERROR(log, "Exception during attempt to commit to Kafka: {}", e.what());
-        }
-    }
-
-    if (!committed)
-    {
-        // The failure is not the biggest issue, it only counts when a table is dropped and recreated, otherwise the offsets are taken from keeper.
-        ProfileEvents::increment(ProfileEvents::KafkaCommitFailures);
-        LOG_ERROR(log, "All commit attempts failed");
-    }
-    else
-    {
-        ProfileEvents::increment(ProfileEvents::KafkaCommits);
-    }
-}
-
-void KafkaConsumer2::subscribeIfNotSubscribedYet()
-{
-    if (likely(is_subscribed))
-        return;
-
-    consumer->subscribe(topics);
-    is_subscribed = true;
-    LOG_DEBUG(log, "Subscribed.");
-}
-
-ReadBufferPtr KafkaConsumer2::getNextMessage()
-{
-    while (current != messages.end())
-    {
-        const auto * data = current->get_payload().get_data();
-        size_t size = current->get_payload().get_size();
-        ++current;
-
-        // `data` can be nullptr on case of the Kafka message has empty payload
-        if (data)
-            return std::make_shared<ReadBufferFromMemory>(data, size);
-    }
-
-    return nullptr;
-}
-
-void KafkaConsumer2::filterMessageErrors()
-{
-    assert(current == messages.begin());
-
-    StorageKafkaUtils::eraseMessageErrors(messages, log);
-    current = messages.begin();
-}
-
-void KafkaConsumer2::resetIfStopped()
-{
-    if (stopped)
-    {
-        stalled_status = StalledStatus::CONSUMER_STOPPED;
-    }
-}
-}
diff --git a/src/Storages/Kafka/KafkaConsumer2.h b/src/Storages/Kafka/KafkaConsumer2.h
deleted file mode 100644
index dd2cfe87aa0..00000000000
--- a/src/Storages/Kafka/KafkaConsumer2.h
+++ /dev/null
@@ -1,162 +0,0 @@
-#pragma once
-
-#include <Core/Names.h>
-#include <IO/ReadBuffer.h>
-#include <Common/CurrentMetrics.h>
-#include <Common/SipHash.h>
-
-#include <base/types.h>
-#include <cppkafka/cppkafka.h>
-#include <cppkafka/topic_partition.h>
-#include <cppkafka/topic_partition_list.h>
-
-namespace CurrentMetrics
-{
-extern const Metric KafkaConsumers;
-}
-
-namespace Poco
-{
-class Logger;
-}
-
-namespace DB
-{
-
-using ConsumerPtr = std::shared_ptr<cppkafka::Consumer>;
-
-class KafkaConsumer2
-{
-public:
-    static inline constexpr int INVALID_OFFSET = RD_KAFKA_OFFSET_INVALID;
-    static inline constexpr int BEGINNING_OFFSET = RD_KAFKA_OFFSET_BEGINNING;
-    static inline constexpr int END_OFFSET = RD_KAFKA_OFFSET_END;
-
-    struct TopicPartition
-    {
-        String topic;
-        int32_t partition_id;
-        int64_t offset{INVALID_OFFSET};
-
-        bool operator==(const TopicPartition &) const = default;
-        bool operator<(const TopicPartition & other) const;
-    };
-
-    using TopicPartitions = std::vector<TopicPartition>;
-
-    struct OnlyTopicNameAndPartitionIdHash
-    {
-        std::size_t operator()(const TopicPartition & tp) const
-        {
-            SipHash s;
-            s.update(tp.topic);
-            s.update(tp.partition_id);
-            return s.get64();
-        }
-    };
-
-    struct OnlyTopicNameAndPartitionIdEquality
-    {
-        bool operator()(const TopicPartition & lhs, const TopicPartition & rhs) const
-        {
-            return lhs.topic == rhs.topic && lhs.partition_id == rhs.partition_id;
-        }
-    };
-
-    struct TopicPartitionCount
-    {
-        String topic;
-        size_t partition_count;
-    };
-
-    using TopicPartitionCounts = std::vector<KafkaConsumer2::TopicPartitionCount>;
-
-    KafkaConsumer2(
-        ConsumerPtr consumer_,
-        LoggerPtr log_,
-        size_t max_batch_size,
-        size_t poll_timeout_,
-        const std::atomic<bool> & stopped_,
-        const Names & topics_);
-
-    ~KafkaConsumer2();
-
-    // Poll only the main consumer queue without any topic-partition queues. This is useful to get notified about events, such as rebalance,
-    // new assignment, etc..
-    void pollEvents();
-
-    auto pollTimeout() const { return poll_timeout; }
-
-    inline bool hasMorePolledMessages() const { return (stalled_status == StalledStatus::NOT_STALLED) && (current != messages.end()); }
-
-    inline bool isStalled() const { return stalled_status != StalledStatus::NOT_STALLED; }
-
-    // Returns the topic partitions that the consumer got from rebalancing the consumer group. If the consumer received
-    // no topic partitions or all of them were revoked, it returns a null pointer.
-    TopicPartitions const * getKafkaAssignment() const;
-
-    // As the main source of offsets is not Kafka, the offsets needs to be pushed to the consumer from outside
-    // Returns true if it received new assignment and internal state should be updated by updateOffsets
-    bool needsOffsetUpdate() const { return needs_offset_update; }
-    void updateOffsets(const TopicPartitions & topic_partitions);
-
-    /// Polls batch of messages from the given topic-partition and returns read buffer containing the next message or
-    /// nullptr when there are no messages to process.
-    ReadBufferPtr consume(const TopicPartition & topic_partition, const std::optional<int64_t> & message_count);
-
-    void commit(const TopicPartition & topic_partition);
-
-    // Return values for the message that's being read.
-    String currentTopic() const { return current[-1].get_topic(); }
-    String currentKey() const { return current[-1].get_key(); }
-    auto currentOffset() const { return current[-1].get_offset(); }
-    auto currentPartition() const { return current[-1].get_partition(); }
-    auto currentTimestamp() const { return current[-1].get_timestamp(); }
-    const auto & currentHeaderList() const { return current[-1].get_header_list(); }
-    String currentPayload() const { return current[-1].get_payload(); }
-
-    void subscribeIfNotSubscribedYet();
-
-private:
-    using Messages = std::vector<cppkafka::Message>;
-    CurrentMetrics::Increment metric_increment{CurrentMetrics::KafkaConsumers};
-
-    enum class StalledStatus
-    {
-        NOT_STALLED,
-        NO_MESSAGES_RETURNED,
-        CONSUMER_STOPPED,
-        NO_ASSIGNMENT,
-        ERRORS_RETURNED
-    };
-
-    ConsumerPtr consumer;
-    LoggerPtr log;
-    const size_t batch_size = 1;
-    const size_t poll_timeout = 0;
-
-    StalledStatus stalled_status = StalledStatus::NO_MESSAGES_RETURNED;
-
-    const std::atomic<bool> & stopped;
-    bool is_subscribed = false;
-
-    // order is important, need to be destructed before consumer
-    Messages messages;
-    Messages::const_iterator current;
-
-    // order is important, need to be destructed before consumer
-    std::optional<TopicPartitions> assignment;
-    bool needs_offset_update{false};
-    std::unordered_map<TopicPartition, cppkafka::Queue, OnlyTopicNameAndPartitionIdHash, OnlyTopicNameAndPartitionIdEquality> queues;
-    const Names topics;
-
-    bool polledDataUnusable(const TopicPartition & topic_partition) const;
-    void drainConsumerQueue();
-    void resetIfStopped();
-    void filterMessageErrors();
-    ReadBufferPtr getNextMessage();
-
-    void initializeQueues(const cppkafka::TopicPartitionList & topic_partitions);
-};
-
-}
diff --git a/src/Storages/Kafka/KafkaSettings.h b/src/Storages/Kafka/KafkaSettings.h
index 9ca5e189f0e..0addaf9e3b3 100644
--- a/src/Storages/Kafka/KafkaSettings.h
+++ b/src/Storages/Kafka/KafkaSettings.h
@@ -38,8 +38,6 @@ const auto KAFKA_CONSUMERS_POOL_TTL_MS_MAX = 600'000;
     M(StreamingHandleErrorMode, kafka_handle_error_mode, StreamingHandleErrorMode::DEFAULT, "How to handle errors for Kafka engine. Possible values: default (throw an exception after rabbitmq_skip_broken_messages broken messages), stream (save broken messages and errors in virtual columns _raw_message, _error).", 0) \
     M(Bool, kafka_commit_on_select, false, "Commit messages when select query is made", 0) \
     M(UInt64, kafka_max_rows_per_message, 1, "The maximum number of rows produced in one kafka message for row-based formats.", 0) \
-    M(String, kafka_keeper_path, "", "The path to the table in ClickHouse Keeper", 0) \
-    M(String, kafka_replica_name, "", "The replica name in ClickHouse Keeper", 0) \
 
 #define OBSOLETE_KAFKA_SETTINGS(M, ALIAS) \
     MAKE_OBSOLETE(M, Char, kafka_row_delimiter, '\0') \
diff --git a/src/Storages/Kafka/KafkaSource.cpp b/src/Storages/Kafka/KafkaSource.cpp
index 3ddd0d1be8c..9c68107872e 100644
--- a/src/Storages/Kafka/KafkaSource.cpp
+++ b/src/Storages/Kafka/KafkaSource.cpp
@@ -262,7 +262,7 @@ Chunk KafkaSource::generateImpl()
     // they are not needed here:
     // and it's misleading to use them here,
     // as columns 'materialized' that way stays 'ephemeral'
-    // i.e. will not be stored anywhere
+    // i.e. will not be stored anythere
     // If needed any extra columns can be added using DEFAULT they can be added at MV level if needed.
 
     auto result_block  = non_virtual_header.cloneWithColumns(executor.getResultColumns());
diff --git a/src/Storages/Kafka/StorageKafka.cpp b/src/Storages/Kafka/StorageKafka.cpp
index f4f641d1c68..809401bb279 100644
--- a/src/Storages/Kafka/StorageKafka.cpp
+++ b/src/Storages/Kafka/StorageKafka.cpp
@@ -1,5 +1,13 @@
 #include <Storages/Kafka/StorageKafka.h>
+#include <Storages/Kafka/parseSyslogLevel.h>
 
+#include <DataTypes/DataTypeArray.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 <Formats/FormatFactory.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterInsertQuery.h>
@@ -13,19 +21,18 @@
 #include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/QueryPlan/ISourceStep.h>
 #include <Processors/QueryPlan/QueryPlan.h>
-#include <Processors/QueryPlan/ReadFromStreamLikeEngine.h>
-#include <Storages/Kafka/KafkaConfigLoader.h>
 #include <QueryPipeline/Pipe.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/Kafka/StorageKafkaUtils.h>
 #include <Storages/MessageQueueSink.h>
 #include <Storages/NamedCollectionsHelpers.h>
+#include <Common/NamedCollections/NamedCollectionsFactory.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageMaterializedView.h>
+#include <base/getFQDNOrHostName.h>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>
@@ -34,10 +41,10 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
 #include <Common/Macros.h>
-#include <Common/NamedCollections/NamedCollectionsFactory.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>
@@ -48,8 +55,13 @@
 #include <Common/ProfileEvents.h>
 #include <base/sleep.h>
 
+#if USE_KRB5
+#include <Access/KerberosInit.h>
+#endif // USE_KRB5
+
 namespace CurrentMetrics
 {
+    extern const Metric KafkaLibrdkafkaThreads;
     extern const Metric KafkaBackgroundReads;
     extern const Metric KafkaConsumersInUse;
     extern const Metric KafkaWrites;
@@ -70,10 +82,104 @@ namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
     extern const int LOGICAL_ERROR;
+    extern const int BAD_ARGUMENTS;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int QUERY_NOT_ALLOWED;
     extern const int ABORTED;
 }
 
+struct StorageKafkaInterceptors
+{
+    static rd_kafka_resp_err_t rdKafkaOnThreadStart(rd_kafka_t *, rd_kafka_thread_type_t thread_type, const char *, void * ctx)
+    {
+        StorageKafka * self = reinterpret_cast<StorageKafka *>(ctx);
+        CurrentMetrics::add(CurrentMetrics::KafkaLibrdkafkaThreads, 1);
+
+        const auto & storage_id = self->getStorageID();
+        const auto & table = storage_id.getTableName();
+
+        switch (thread_type)
+        {
+            case RD_KAFKA_THREAD_MAIN:
+                setThreadName(("rdk:m/" + table.substr(0, 9)).c_str());
+                break;
+            case RD_KAFKA_THREAD_BACKGROUND:
+                setThreadName(("rdk:bg/" + table.substr(0, 8)).c_str());
+                break;
+            case RD_KAFKA_THREAD_BROKER:
+                setThreadName(("rdk:b/" + table.substr(0, 9)).c_str());
+                break;
+        }
+
+        /// Create ThreadStatus to track memory allocations from librdkafka threads.
+        //
+        /// And store them in a separate list (thread_statuses) to make sure that they will be destroyed,
+        /// regardless how librdkafka calls the hooks.
+        /// But this can trigger use-after-free if librdkafka will not destroy threads after rd_kafka_wait_destroyed()
+        auto thread_status = std::make_shared<ThreadStatus>();
+        std::lock_guard lock(self->thread_statuses_mutex);
+        self->thread_statuses.emplace_back(std::move(thread_status));
+
+        return RD_KAFKA_RESP_ERR_NO_ERROR;
+    }
+    static rd_kafka_resp_err_t rdKafkaOnThreadExit(rd_kafka_t *, rd_kafka_thread_type_t, const char *, void * ctx)
+    {
+        StorageKafka * self = reinterpret_cast<StorageKafka *>(ctx);
+        CurrentMetrics::sub(CurrentMetrics::KafkaLibrdkafkaThreads, 1);
+
+        std::lock_guard lock(self->thread_statuses_mutex);
+        const auto it = std::find_if(self->thread_statuses.begin(), self->thread_statuses.end(), [](const auto & thread_status_ptr)
+        {
+            return thread_status_ptr.get() == current_thread;
+        });
+        if (it == self->thread_statuses.end())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "No thread status for this librdkafka thread.");
+
+        self->thread_statuses.erase(it);
+
+        return RD_KAFKA_RESP_ERR_NO_ERROR;
+    }
+
+    static rd_kafka_resp_err_t rdKafkaOnNew(rd_kafka_t * rk, const rd_kafka_conf_t *, void * ctx, char * /*errstr*/, size_t /*errstr_size*/)
+    {
+        StorageKafka * self = reinterpret_cast<StorageKafka *>(ctx);
+        rd_kafka_resp_err_t status;
+
+        status = rd_kafka_interceptor_add_on_thread_start(rk, "init-thread", rdKafkaOnThreadStart, ctx);
+        if (status != RD_KAFKA_RESP_ERR_NO_ERROR)
+        {
+            LOG_ERROR(self->log, "Cannot set on thread start interceptor due to {} error", status);
+            return status;
+        }
+
+        status = rd_kafka_interceptor_add_on_thread_exit(rk, "exit-thread", rdKafkaOnThreadExit, ctx);
+        if (status != RD_KAFKA_RESP_ERR_NO_ERROR)
+            LOG_ERROR(self->log, "Cannot set on thread exit interceptor due to {} error", status);
+
+        return status;
+    }
+
+    static rd_kafka_resp_err_t rdKafkaOnConfDup(rd_kafka_conf_t * new_conf, const rd_kafka_conf_t * /*old_conf*/, size_t /*filter_cnt*/, const char ** /*filter*/, void * ctx)
+    {
+        StorageKafka * self = reinterpret_cast<StorageKafka *>(ctx);
+        rd_kafka_resp_err_t status;
+
+        // cppkafka copies configuration multiple times
+        status = rd_kafka_conf_interceptor_add_on_conf_dup(new_conf, "init", rdKafkaOnConfDup, ctx);
+        if (status != RD_KAFKA_RESP_ERR_NO_ERROR)
+        {
+            LOG_ERROR(self->log, "Cannot set on conf dup interceptor due to {} error", status);
+            return status;
+        }
+
+        status = rd_kafka_conf_interceptor_add_on_new(new_conf, "init", rdKafkaOnNew, ctx);
+        if (status != RD_KAFKA_RESP_ERR_NO_ERROR)
+            LOG_ERROR(self->log, "Cannot set on conf new interceptor due to {} error", status);
+
+        return status;
+    }
+};
+
 class ReadFromStorageKafka final : public ReadFromStreamLikeEngine
 {
 public:
@@ -135,31 +241,203 @@ private:
     StorageSnapshotPtr storage_snapshot;
 };
 
+namespace
+{
+    const String CONFIG_KAFKA_TAG = "kafka";
+    const String CONFIG_KAFKA_TOPIC_TAG = "kafka_topic";
+    const String CONFIG_KAFKA_CONSUMER_TAG = "consumer";
+    const String CONFIG_KAFKA_PRODUCER_TAG = "producer";
+    const String CONFIG_NAME_TAG = "name";
+
+    void setKafkaConfigValue(cppkafka::Configuration & kafka_config, const String & key, const String & value)
+   {
+        /// "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);
+    }
+
+    void loadConfigProperty(cppkafka::Configuration & kafka_config, const Poco::Util::AbstractConfiguration & config, const String & config_prefix, const String & tag)
+    {
+        const String property_path = config_prefix + "." + tag;
+        const String property_value = config.getString(property_path);
+
+        setKafkaConfigValue(kafka_config, tag, property_value);
+    }
+
+    void loadNamedCollectionConfig(cppkafka::Configuration & kafka_config, const String & collection_name, const String & config_prefix)
+    {
+        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));
+        }
+    }
+
+    void loadLegacyTopicConfig(cppkafka::Configuration & kafka_config, const Poco::Util::AbstractConfiguration & config, const String & collection_name, const String & config_prefix)
+    {
+        if (!collection_name.empty())
+        {
+            loadNamedCollectionConfig(kafka_config, collection_name, config_prefix);
+            return;
+        }
+
+        Poco::Util::AbstractConfiguration::Keys tags;
+        config.keys(config_prefix, tags);
+
+        for (const auto & tag : tags)
+        {
+            loadConfigProperty(kafka_config, config, config_prefix, tag);
+        }
+    }
+
+    /// 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 & collection_name, const String & config_prefix, const String & topic)
+    {
+        if (!collection_name.empty())
+        {
+            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))
+            {
+                /// Only consider key <kafka_topic>. Multiple occurrences given as "kafka_topic", "kafka_topic[1]", etc.
+                if (!key.starts_with(topic_prefix))
+                    continue;
+
+                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.
+                    loadNamedCollectionConfig(kafka_config, collection_name, kafka_topic_path);
+            }
+        }
+        else
+        {
+            /// Read all tags one level below <kafka>
+            Poco::Util::AbstractConfiguration::Keys tags;
+            config.keys(config_prefix, tags);
+
+            for (const auto & tag : tags)
+            {
+                if (tag == CONFIG_NAME_TAG)
+                    continue; // ignore <name>, it is used to match topic configurations
+                loadConfigProperty(kafka_config, config, config_prefix, tag);
+            }
+        }
+    }
+
+    /// 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 & collection_name, const String & config_prefix, const Names & topics)
+    {
+        if (!collection_name.empty())
+        {
+            loadNamedCollectionConfig(kafka_config, collection_name, config_prefix);
+            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 == CONFIG_KAFKA_PRODUCER_TAG || tag == CONFIG_KAFKA_CONSUMER_TAG)
+                /// Do not load consumer/producer properties, since they should be separated by different configuration objects.
+                continue;
+
+            if (tag.starts_with(CONFIG_KAFKA_TOPIC_TAG)) /// multiple occurrences given as "kafka_topic", "kafka_topic[1]", etc.
+            {
+                // Update consumer topic-specific configuration (new syntax). Example with topics "football" and "baseball":
+                //     <kafka>
+                //         <kafka_topic>
+                //             <name>football</name>
+                //             <retry_backoff_ms>250</retry_backoff_ms>
+                //             <fetch_min_bytes>5000</fetch_min_bytes>
+                //         </kafka_topic>
+                //         <kafka_topic>
+                //             <name>baseball</name>
+                //             <retry_backoff_ms>300</retry_backoff_ms>
+                //             <fetch_min_bytes>2000</fetch_min_bytes>
+                //         </kafka_topic>
+                //     </kafka>
+                // 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)
+                {
+                    /// Read topic name between <name>...</name>
+                    const String kafka_topic_path = config_prefix + "." + tag;
+                    const String kafka_topic_name_path = kafka_topic_path + "." + CONFIG_NAME_TAG;
+                    const String topic_name = config.getString(kafka_topic_name_path);
+
+                    if (topic_name != topic)
+                        continue;
+                    loadTopicConfig(kafka_config, config, collection_name, kafka_topic_path, topic);
+                }
+                continue;
+            }
+            if (tag.starts_with(CONFIG_KAFKA_TAG))
+                /// skip legacy configuration per topic e.g. <kafka_TOPIC_NAME>.
+                /// it will be processed is a separate function
+                continue;
+            // Update configuration from the configuration. Example:
+            //     <kafka>
+            //         <retry_backoff_ms>250</retry_backoff_ms>
+            //         <fetch_min_bytes>100000</fetch_min_bytes>
+            //     </kafka>
+            loadConfigProperty(kafka_config, config, config_prefix, tag);
+        }
+    }
+
+    void loadLegacyConfigSyntax(cppkafka::Configuration & kafka_config, const Poco::Util::AbstractConfiguration & config, const String & collection_name, const String & prefix, const Names & topics)
+    {
+        for (const auto & topic : topics)
+        {
+            const String kafka_topic_path = prefix + "." + CONFIG_KAFKA_TAG + "_" + topic;
+            loadLegacyTopicConfig(kafka_config, config, collection_name, kafka_topic_path);
+        }
+    }
+
+    void loadConsumerConfig(cppkafka::Configuration & kafka_config, const Poco::Util::AbstractConfiguration & config, const String & collection_name, const String & prefix, const Names & topics)
+    {
+        const String consumer_path = prefix + "." + CONFIG_KAFKA_CONSUMER_TAG;
+        loadLegacyConfigSyntax(kafka_config, config, collection_name, prefix, topics);
+        // A new syntax has higher priority
+        loadFromConfig(kafka_config, config, collection_name, consumer_path, topics);
+    }
+
+    void loadProducerConfig(cppkafka::Configuration & kafka_config, const Poco::Util::AbstractConfiguration & config, const String & collection_name, const String & prefix, const Names & topics)
+    {
+        const String producer_path = prefix + "." + CONFIG_KAFKA_PRODUCER_TAG;
+        loadLegacyConfigSyntax(kafka_config, config, collection_name, prefix, topics);
+        // A new syntax has higher priority
+        loadFromConfig(kafka_config, config, collection_name, producer_path, topics);
+
+    }
+}
+
 StorageKafka::StorageKafka(
-    const StorageID & table_id_,
-    ContextPtr context_,
-    const ColumnsDescription & columns_,
-    const String & comment,
-    std::unique_ptr<KafkaSettings> kafka_settings_,
+    const StorageID & table_id_, ContextPtr context_,
+    const ColumnsDescription & columns_, std::unique_ptr<KafkaSettings> kafka_settings_,
     const String & collection_name_)
     : IStorage(table_id_)
     , WithContext(context_->getGlobalContext())
     , kafka_settings(std::move(kafka_settings_))
     , macros_info{.table_id = table_id_}
-    , topics(StorageKafkaUtils::parseTopics(getContext()->getMacros()->expand(kafka_settings->kafka_topic_list.value, macros_info)))
+    , topics(parseTopics(getContext()->getMacros()->expand(kafka_settings->kafka_topic_list.value, macros_info)))
     , brokers(getContext()->getMacros()->expand(kafka_settings->kafka_broker_list.value, macros_info))
     , group(getContext()->getMacros()->expand(kafka_settings->kafka_group_name.value, macros_info))
     , client_id(
-          kafka_settings->kafka_client_id.value.empty()
-              ? StorageKafkaUtils::getDefaultClientId(table_id_)
-              : getContext()->getMacros()->expand(kafka_settings->kafka_client_id.value, macros_info))
+          kafka_settings->kafka_client_id.value.empty() ? getDefaultClientId(table_id_)
+                                                        : getContext()->getMacros()->expand(kafka_settings->kafka_client_id.value, macros_info))
     , format_name(getContext()->getMacros()->expand(kafka_settings->kafka_format.value))
     , 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(getLogger("StorageKafka (" + table_id_.table_name + ")"))
     , intermediate_commit(kafka_settings->kafka_commit_every_batch.value)
-    , settings_adjustments(StorageKafkaUtils::createSettingsAdjustments(*kafka_settings, schema_name))
+    , settings_adjustments(createSettingsAdjustments())
     , thread_per_consumer(kafka_settings->kafka_thread_per_consumer.value)
     , collection_name(collection_name_)
 {
@@ -173,9 +451,8 @@ StorageKafka::StorageKafka(
 
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
-    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
-    setVirtuals(StorageKafkaUtils::createVirtuals(kafka_settings->kafka_handle_error_mode));
+    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)
@@ -200,6 +477,76 @@ 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;
+    // Needed for backward compatibility
+    if (!kafka_settings->input_format_skip_unknown_fields.changed)
+    {
+        // Always skip unknown fields regardless of the context (JSON or TSKV)
+        kafka_settings->input_format_skip_unknown_fields = true;
+    }
+
+    if (!kafka_settings->input_format_allow_errors_ratio.changed)
+    {
+        kafka_settings->input_format_allow_errors_ratio = 0.;
+    }
+
+    if (!kafka_settings->input_format_allow_errors_num.changed)
+    {
+        kafka_settings->input_format_allow_errors_num = kafka_settings->kafka_skip_broken_messages.value;
+    }
+
+    if (!schema_name.empty())
+        result.emplace_back("format_schema", schema_name);
+
+    for (const auto & setting : *kafka_settings)
+    {
+        const auto & name = setting.getName();
+        if (name.find("kafka_") == std::string::npos)
+            result.emplace_back(name, setting.getValue());
+    }
+    return result;
+}
+
+Names StorageKafka::parseTopics(String topic_list)
+{
+    Names result;
+    boost::split(result,topic_list,[](char c){ return c == ','; });
+    for (String & topic : result)
+    {
+        boost::trim(topic);
+    }
+    return result;
+}
+
+String StorageKafka::getDefaultClientId(const StorageID & table_id_)
+{
+    return fmt::format("{}-{}-{}-{}", VERSION_NAME, getFQDNOrHostName(), table_id_.database_name, table_id_.table_name);
+}
+
 void StorageKafka::read(
     QueryPlan & query_plan,
     const Names & column_names,
@@ -400,26 +747,65 @@ KafkaConsumerPtr StorageKafka::createKafkaConsumer(size_t consumer_number)
         topics);
     return kafka_consumer_ptr;
 }
+
 cppkafka::Configuration StorageKafka::getConsumerConfiguration(size_t consumer_number)
 {
-    KafkaConfigLoader::ConsumerConfigParams params{
-        {getContext()->getConfigRef(), collection_name, topics, log},
-        brokers,
-        group,
-        num_consumers > 1,
-        consumer_number,
-        client_id,
-        getMaxBlockSize()};
-    return KafkaConfigLoader::getConsumerConfiguration(*this, params);
+    cppkafka::Configuration conf;
+
+    conf.set("metadata.broker.list", brokers);
+    conf.set("group.id", group);
+    if (num_consumers > 1)
+    {
+        conf.set("client.id", fmt::format("{}-{}", client_id, consumer_number));
+    }
+    else
+    {
+        conf.set("client.id", client_id);
+    }
+    conf.set("client.software.name", VERSION_NAME);
+    conf.set("client.software.version", VERSION_DESCRIBE);
+    conf.set("auto.offset.reset", "earliest");     // If no offset stored for this group, read all messages from the start
+
+    // that allows to prevent fast draining of the librdkafka queue
+    // during building of single insert block. Improves performance
+    // significantly, but may lead to bigger memory consumption.
+    size_t default_queued_min_messages = 100000; // must be greater than or equal to default
+    size_t max_allowed_queued_min_messages = 10000000; // must be less than or equal to max allowed value
+    conf.set("queued.min.messages", std::min(std::max(getMaxBlockSize(), default_queued_min_messages), max_allowed_queued_min_messages));
+
+    updateGlobalConfiguration(conf);
+    updateConsumerConfiguration(conf);
+
+    // those settings should not be changed by users.
+    conf.set("enable.auto.commit", "false");       // We manually commit offsets after a stream successfully finished
+    conf.set("enable.auto.offset.store", "false"); // Update offset automatically - to commit them all at once.
+    conf.set("enable.partition.eof", "false");     // Ignore EOF messages
+
+    for (auto & property : conf.get_all())
+    {
+        LOG_TRACE(log, "Consumer set property {}:{}", property.first, property.second);
+    }
+
+    return conf;
 }
 
 cppkafka::Configuration StorageKafka::getProducerConfiguration()
 {
-    KafkaConfigLoader::ProducerConfigParams params{
-        {getContext()->getConfigRef(), collection_name, topics, log},
-        brokers,
-        client_id};
-    return KafkaConfigLoader::getProducerConfiguration(*this, params);
+    cppkafka::Configuration conf;
+    conf.set("metadata.broker.list", brokers);
+    conf.set("client.id", client_id);
+    conf.set("client.software.name", VERSION_NAME);
+    conf.set("client.software.version", VERSION_DESCRIBE);
+
+    updateGlobalConfiguration(conf);
+    updateProducerConfiguration(conf);
+
+    for (auto & property : conf.get_all())
+    {
+        LOG_TRACE(log, "Producer set property {}:{}", property.first, property.second);
+    }
+
+    return conf;
 }
 
 void StorageKafka::cleanConsumers()
@@ -497,6 +883,126 @@ size_t StorageKafka::getPollTimeoutMillisecond() const
         : getContext()->getSettingsRef().stream_poll_timeout_ms.totalMilliseconds();
 }
 
+void StorageKafka::updateGlobalConfiguration(cppkafka::Configuration & kafka_config)
+{
+    const auto & config = getContext()->getConfigRef();
+    loadFromConfig(kafka_config, config, collection_name, CONFIG_KAFKA_TAG, topics);
+
+#if USE_KRB5
+    if (kafka_config.has_property("sasl.kerberos.kinit.cmd"))
+        LOG_WARNING(log, "sasl.kerberos.kinit.cmd configuration parameter is ignored.");
+
+    kafka_config.set("sasl.kerberos.kinit.cmd","");
+    kafka_config.set("sasl.kerberos.min.time.before.relogin","0");
+
+    if (kafka_config.has_property("sasl.kerberos.keytab") && kafka_config.has_property("sasl.kerberos.principal"))
+    {
+        String keytab = kafka_config.get("sasl.kerberos.keytab");
+        String principal = kafka_config.get("sasl.kerberos.principal");
+        LOG_DEBUG(log, "Running KerberosInit");
+        try
+        {
+            kerberosInit(keytab,principal);
+        }
+        catch (const Exception & e)
+        {
+            LOG_ERROR(log, "KerberosInit failure: {}", getExceptionMessage(e, false));
+        }
+        LOG_DEBUG(log, "Finished KerberosInit");
+    }
+#else // USE_KRB5
+    if (kafka_config.has_property("sasl.kerberos.keytab") || kafka_config.has_property("sasl.kerberos.principal"))
+        LOG_WARNING(log, "Ignoring Kerberos-related parameters because ClickHouse was built without krb5 library support.");
+#endif // USE_KRB5
+
+    // No need to add any prefix, messages can be distinguished
+    kafka_config.set_log_callback(
+        [this](cppkafka::KafkaHandleBase & handle, int level, const std::string & facility, const std::string & message)
+        {
+            auto [poco_level, client_logs_level] = parseSyslogLevel(level);
+            const auto & kafka_object_config = handle.get_configuration();
+            const std::string client_id_key{"client.id"};
+            chassert(kafka_object_config.has_property(client_id_key) && "Kafka configuration doesn't have expected client.id set");
+            LOG_IMPL(
+                log,
+                client_logs_level,
+                poco_level,
+                "[client.id:{}] [rdk:{}] {}",
+                kafka_object_config.get(client_id_key),
+                facility,
+                message);
+        });
+
+    /// NOTE: statistics should be consumed, otherwise it creates too much
+    /// entries in the queue, that leads to memory leak and slow shutdown.
+    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");
+    }
+
+    // Configure interceptor to change thread name
+    //
+    // TODO: add interceptors support into the cppkafka.
+    // XXX:  rdkafka uses pthread_set_name_np(), but glibc-compatibliity overrides it to noop.
+    {
+        // This should be safe, since we wait the rdkafka object anyway.
+        void * self = static_cast<void *>(this);
+
+        int status;
+
+        status = rd_kafka_conf_interceptor_add_on_new(kafka_config.get_handle(),
+            "init", StorageKafkaInterceptors::rdKafkaOnNew, self);
+        if (status != RD_KAFKA_RESP_ERR_NO_ERROR)
+            LOG_ERROR(log, "Cannot set new interceptor due to {} error", status);
+
+        // cppkafka always copy the configuration
+        status = rd_kafka_conf_interceptor_add_on_conf_dup(kafka_config.get_handle(),
+            "init", StorageKafkaInterceptors::rdKafkaOnConfDup, self);
+        if (status != RD_KAFKA_RESP_ERR_NO_ERROR)
+            LOG_ERROR(log, "Cannot set dup conf interceptor due to {} error", status);
+    }
+}
+
+void StorageKafka::updateConsumerConfiguration(cppkafka::Configuration & kafka_config)
+{
+    const auto & config = getContext()->getConfigRef();
+    loadConsumerConfig(kafka_config, config, collection_name, CONFIG_KAFKA_TAG, topics);
+}
+
+void StorageKafka::updateProducerConfiguration(cppkafka::Configuration & kafka_config)
+{
+    const auto & config = getContext()->getConfigRef();
+    loadProducerConfig(kafka_config, config, collection_name, CONFIG_KAFKA_TAG, topics);
+}
+
+bool StorageKafka::checkDependencies(const StorageID & table_id)
+{
+    // Check if all dependencies are attached
+    auto view_ids = DatabaseCatalog::instance().getDependentViews(table_id);
+    if (view_ids.empty())
+        return true;
+
+    // Check the dependencies are ready?
+    for (const auto & view_id : view_ids)
+    {
+        auto view = DatabaseCatalog::instance().tryGetTable(view_id, getContext());
+        if (!view)
+            return false;
+
+        // If it materialized view, check it's target table
+        auto * materialized_view = dynamic_cast<StorageMaterializedView *>(view.get());
+        if (materialized_view && !materialized_view->tryGetTargetTable())
+            return false;
+
+        // Check all its dependencies
+        if (!checkDependencies(view_id))
+            return false;
+    }
+
+    return true;
+}
+
 void StorageKafka::threadFunc(size_t idx)
 {
     assert(idx < tasks.size());
@@ -517,7 +1023,7 @@ void StorageKafka::threadFunc(size_t idx)
             // Keep streaming as long as there are attached views and streaming is not cancelled
             while (!task->stream_cancelled)
             {
-                if (!StorageKafkaUtils::checkDependencies(table_id, getContext()))
+                if (!checkDependencies(table_id))
                     break;
 
                 LOG_DEBUG(log, "Started streaming to {} attached views", num_views);
@@ -599,7 +1105,7 @@ bool StorageKafka::streamToViews()
         /* allow_materialized */ false,
         /* no_squash */ true,
         /* no_destination */ true,
-        /* async_insert */ false);
+        /* async_isnert */ false);
     auto block_io = interpreter.execute();
 
     // Create a stream for each consumer and join them in a union stream
@@ -657,4 +1163,164 @@ bool StorageKafka::streamToViews()
 
     return some_stream_is_stalled;
 }
+
+void registerStorageKafka(StorageFactory & factory)
+{
+    auto creator_fn = [](const StorageFactory::Arguments & args)
+    {
+        ASTs & engine_args = args.engine_args;
+        size_t args_count = engine_args.size();
+        const bool has_settings = args.storage_def->settings;
+
+        auto kafka_settings = std::make_unique<KafkaSettings>();
+        String collection_name;
+        if (auto named_collection = tryGetNamedCollectionWithOverrides(args.engine_args, args.getLocalContext()))
+        {
+            for (const auto & setting : kafka_settings->all())
+            {
+                const auto & setting_name = setting.getName();
+                if (named_collection->has(setting_name))
+                    kafka_settings->set(setting_name, named_collection->get<String>(setting_name));
+            }
+            collection_name = assert_cast<const ASTIdentifier *>(args.engine_args[0].get())->name();
+        }
+
+        if (has_settings)
+        {
+            kafka_settings->loadFromQuery(*args.storage_def);
+        }
+
+        // Check arguments and settings
+        #define CHECK_KAFKA_STORAGE_ARGUMENT(ARG_NUM, PAR_NAME, EVAL)       \
+            /* One of the four required arguments is not specified */       \
+            if (args_count < (ARG_NUM) && (ARG_NUM) <= 4 &&                 \
+                !kafka_settings->PAR_NAME.changed)                          \
+            {                                                               \
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,\
+                    "Required parameter '{}' "                              \
+                    "for storage Kafka not specified",                      \
+                    #PAR_NAME);                                             \
+            }                                                               \
+            if (args_count >= (ARG_NUM))                                    \
+            {                                                               \
+                /* The same argument is given in two places */              \
+                if (has_settings &&                                         \
+                    kafka_settings->PAR_NAME.changed)                       \
+                {                                                           \
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,              \
+                        "The argument №{} of storage Kafka "                \
+                        "and the parameter '{}' "                           \
+                        "in SETTINGS cannot be specified at the same time", \
+                        #ARG_NUM, #PAR_NAME);                               \
+                }                                                           \
+                /* move engine args to settings */                          \
+                else                                                        \
+                {                                                           \
+                    if ((EVAL) == 1)                                        \
+                    {                                                       \
+                        engine_args[(ARG_NUM)-1] =                          \
+                            evaluateConstantExpressionAsLiteral(            \
+                                engine_args[(ARG_NUM)-1],                   \
+                                args.getLocalContext());                    \
+                    }                                                       \
+                    if ((EVAL) == 2)                                        \
+                    {                                                       \
+                        engine_args[(ARG_NUM)-1] =                          \
+                           evaluateConstantExpressionOrIdentifierAsLiteral( \
+                                engine_args[(ARG_NUM)-1],                   \
+                                args.getLocalContext());                    \
+                    }                                                       \
+                    kafka_settings->PAR_NAME =                              \
+                        engine_args[(ARG_NUM)-1]->as<ASTLiteral &>().value; \
+                }                                                           \
+            }
+
+        /** Arguments of engine is following:
+          * - Kafka broker list
+          * - List of topics
+          * - Group ID (may be a constant expression with a string result)
+          * - Message format (string)
+          * - Row delimiter
+          * - Schema (optional, if the format supports it)
+          * - Number of consumers
+          * - Max block size for background consumption
+          * - Skip (at least) unreadable messages number
+          * - Do intermediate commits when the batch consumed and handled
+          */
+
+        /* 0 = raw, 1 = evaluateConstantExpressionAsLiteral, 2=evaluateConstantExpressionOrIdentifierAsLiteral */
+        /// In case of named collection we already validated the arguments.
+        if (collection_name.empty())
+        {
+            CHECK_KAFKA_STORAGE_ARGUMENT(1, kafka_broker_list, 0)
+            CHECK_KAFKA_STORAGE_ARGUMENT(2, kafka_topic_list, 1)
+            CHECK_KAFKA_STORAGE_ARGUMENT(3, kafka_group_name, 2)
+            CHECK_KAFKA_STORAGE_ARGUMENT(4, kafka_format, 2)
+            CHECK_KAFKA_STORAGE_ARGUMENT(5, kafka_row_delimiter, 2)
+            CHECK_KAFKA_STORAGE_ARGUMENT(6, kafka_schema, 2)
+            CHECK_KAFKA_STORAGE_ARGUMENT(7, kafka_num_consumers, 0)
+            CHECK_KAFKA_STORAGE_ARGUMENT(8, kafka_max_block_size, 0)
+            CHECK_KAFKA_STORAGE_ARGUMENT(9, kafka_skip_broken_messages, 0)
+            CHECK_KAFKA_STORAGE_ARGUMENT(10, kafka_commit_every_batch, 0)
+            CHECK_KAFKA_STORAGE_ARGUMENT(11, kafka_client_id, 2)
+            CHECK_KAFKA_STORAGE_ARGUMENT(12, kafka_poll_timeout_ms, 0)
+            CHECK_KAFKA_STORAGE_ARGUMENT(13, kafka_flush_interval_ms, 0)
+            CHECK_KAFKA_STORAGE_ARGUMENT(14, kafka_thread_per_consumer, 0)
+            CHECK_KAFKA_STORAGE_ARGUMENT(15, kafka_handle_error_mode, 0)
+            CHECK_KAFKA_STORAGE_ARGUMENT(16, kafka_commit_on_select, 0)
+            CHECK_KAFKA_STORAGE_ARGUMENT(17, kafka_max_rows_per_message, 0)
+        }
+
+        #undef CHECK_KAFKA_STORAGE_ARGUMENT
+
+        auto num_consumers = kafka_settings->kafka_num_consumers.value;
+        auto max_consumers = std::max<uint32_t>(getNumberOfPhysicalCPUCores(), 16);
+
+        if (!args.getLocalContext()->getSettingsRef().kafka_disable_num_consumers_limit && num_consumers > max_consumers)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "The number of consumers can not be bigger than {}. "
+                            "A single consumer can read any number of partitions. "
+                            "Extra consumers are relatively expensive, "
+                            "and using a lot of them can lead to high memory and CPU usage. "
+                            "To achieve better performance "
+                            "of getting data from Kafka, consider using a setting kafka_thread_per_consumer=1, "
+                            "and ensure you have enough threads "
+                            "in MessageBrokerSchedulePool (background_message_broker_schedule_pool_size). "
+                            "See also https://clickhouse.com/docs/en/integrations/kafka#tuning-performance", max_consumers);
+        }
+        else if (num_consumers < 1)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Number of consumers can not be lower than 1");
+        }
+
+        if (kafka_settings->kafka_max_block_size.changed && kafka_settings->kafka_max_block_size.value < 1)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "kafka_max_block_size can not be lower than 1");
+        }
+
+        if (kafka_settings->kafka_poll_max_batch_size.changed && kafka_settings->kafka_poll_max_batch_size.value < 1)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "kafka_poll_max_batch_size can not be lower than 1");
+        }
+        NamesAndTypesList supported_columns;
+        for (const auto & column : args.columns)
+        {
+            if (column.default_desc.kind == ColumnDefaultKind::Alias)
+                supported_columns.emplace_back(column.name, column.type);
+            if (column.default_desc.kind == ColumnDefaultKind::Default && !column.default_desc.expression)
+                supported_columns.emplace_back(column.name, column.type);
+        }
+        // Kafka engine allows only ordinary columns without default expression or alias columns.
+        if (args.columns.getAll() != supported_columns)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "KafkaEngine doesn't support DEFAULT/MATERIALIZED/EPHEMERAL expressions for columns. "
+                                                       "See https://clickhouse.com/docs/en/engines/table-engines/integrations/kafka/#configuration");
+        }
+
+        return std::make_shared<StorageKafka>(args.table_id, args.getContext(), args.columns, std::move(kafka_settings), collection_name);
+    };
+
+    factory.registerStorage("Kafka", creator_fn, StorageFactory::StorageFeatures{ .supports_settings = true, });
+}
+
 }
diff --git a/src/Storages/Kafka/StorageKafka.h b/src/Storages/Kafka/StorageKafka.h
index 966d818d675..fa4affbda36 100644
--- a/src/Storages/Kafka/StorageKafka.h
+++ b/src/Storages/Kafka/StorageKafka.h
@@ -23,8 +23,7 @@ class ReadFromStorageKafka;
 class StorageSystemKafkaConsumers;
 class ThreadStatus;
 
-template <typename TStorageKafka>
-struct KafkaInterceptors;
+struct StorageKafkaInterceptors;
 
 using KafkaConsumerPtr = std::shared_ptr<KafkaConsumer>;
 using ConsumerPtr = std::shared_ptr<cppkafka::Consumer>;
@@ -34,15 +33,13 @@ using ConsumerPtr = std::shared_ptr<cppkafka::Consumer>;
   */
 class StorageKafka final : public IStorage, WithContext
 {
-    using KafkaInterceptors = KafkaInterceptors<StorageKafka>;
-    friend KafkaInterceptors;
+    friend struct StorageKafkaInterceptors;
 
 public:
     StorageKafka(
         const StorageID & table_id_,
         ContextPtr context_,
         const ColumnsDescription & columns_,
-        const String & comment,
         std::unique_ptr<KafkaSettings> kafka_settings_,
         const String & collection_name_);
 
@@ -135,6 +132,7 @@ private:
     std::mutex thread_statuses_mutex;
     std::list<std::shared_ptr<ThreadStatus>> thread_statuses;
 
+    SettingsChanges createSettingsAdjustments();
     /// Creates KafkaConsumer object without real consumer (cppkafka::Consumer)
     KafkaConsumerPtr createKafkaConsumer(size_t consumer_number);
     /// Returns full consumer related configuration, also the configuration
@@ -149,15 +147,33 @@ private:
 
     std::atomic<bool> shutdown_called = false;
 
+    // Load Kafka global configuration
+    // https://github.com/confluentinc/librdkafka/blob/master/CONFIGURATION.md#global-configuration-properties
+    void updateGlobalConfiguration(cppkafka::Configuration & kafka_config);
+    // Load Kafka properties from consumer configuration
+    // NOTE: librdkafka allow to set a consumer property to a producer and vice versa,
+    //       but a warning will be generated e.g:
+    //       "Configuration property session.timeout.ms is a consumer property and
+    //        will be ignored by this producer instance"
+    void updateConsumerConfiguration(cppkafka::Configuration & kafka_config);
+    // Load Kafka properties from producer configuration
+    void updateProducerConfiguration(cppkafka::Configuration & kafka_config);
+
     void threadFunc(size_t idx);
 
     size_t getPollMaxBatchSize() const;
     size_t getMaxBlockSize() const;
     size_t getPollTimeoutMillisecond() const;
 
+    static Names parseTopics(String topic_list);
+    static String getDefaultClientId(const StorageID & table_id_);
+
     bool streamToViews();
+    bool checkDependencies(const StorageID & table_id);
 
     void cleanConsumers();
+
+    static VirtualColumnsDescription createVirtuals(StreamingHandleErrorMode handle_error_mode);
 };
 
 }
diff --git a/src/Storages/Kafka/StorageKafka2.cpp b/src/Storages/Kafka/StorageKafka2.cpp
deleted file mode 100644
index 3574b46e3b0..00000000000
--- a/src/Storages/Kafka/StorageKafka2.cpp
+++ /dev/null
@@ -1,1289 +0,0 @@
-#include <Storages/Kafka/StorageKafka2.h>
-
-#include <Core/ServerUUID.h>
-#include <Formats/FormatFactory.h>
-#include <IO/EmptyReadBuffer.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/DatabaseCatalog.h>
-#include <Interpreters/InterpreterInsertQuery.h>
-#include <Interpreters/evaluateConstantExpression.h>
-#include <Parsers/ASTCreateQuery.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTInsertQuery.h>
-#include <Parsers/ASTLiteral.h>
-#include <Processors/Executors/CompletedPipelineExecutor.h>
-#include <Processors/Executors/StreamingFormatExecutor.h>
-#include <Processors/Sources/BlocksListSource.h>
-#include <QueryPipeline/Pipe.h>
-#include <QueryPipeline/QueryPipeline.h>
-#include <Storages/ColumnDefault.h>
-#include <Storages/Kafka/KafkaConfigLoader.h>
-#include <Storages/Kafka/KafkaConsumer2.h>
-#include <Storages/Kafka/KafkaProducer.h>
-#include <Storages/Kafka/KafkaSettings.h>
-#include <Storages/Kafka/StorageKafkaUtils.h>
-#include <Storages/MessageQueueSink.h>
-#include <Storages/NamedCollectionsHelpers.h>
-#include <Storages/StorageFactory.h>
-#include <Storages/StorageMaterializedView.h>
-#include <base/scope_guard.h>
-#include <Poco/Util/AbstractConfiguration.h>
-#include <Common/CurrentMetrics.h>
-#include <Common/Exception.h>
-#include <Common/Macros.h>
-#include <Common/ProfileEvents.h>
-#include <Common/ZooKeeper/IKeeper.h>
-#include <Common/ZooKeeper/KeeperException.h>
-#include <Common/ZooKeeper/Types.h>
-#include <Common/ZooKeeper/ZooKeeper.h>
-#include <Common/config_version.h>
-#include <Common/formatReadable.h>
-#include <Common/getNumberOfPhysicalCPUCores.h>
-#include <Common/logger_useful.h>
-#include <Common/quoteString.h>
-#include <Common/setThreadName.h>
-
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string/trim.hpp>
-#include <librdkafka/rdkafka.h>
-
-#include <filesystem>
-#include <string>
-
-namespace CurrentMetrics
-{
-// TODO: Add proper metrics, similar to old StorageKafka
-extern const Metric KafkaBackgroundReads;
-extern const Metric KafkaWrites;
-}
-
-namespace ProfileEvents
-{
-extern const Event KafkaBackgroundReads;
-extern const Event KafkaMessagesRead;
-extern const Event KafkaMessagesFailed;
-extern const Event KafkaRowsRead;
-extern const Event KafkaWrites;
-}
-
-
-namespace DB
-{
-
-namespace fs = std::filesystem;
-
-namespace ErrorCodes
-{
-extern const int NOT_IMPLEMENTED;
-extern const int LOGICAL_ERROR;
-extern const int REPLICA_ALREADY_EXISTS;
-extern const int TABLE_IS_DROPPED;
-extern const int NO_ZOOKEEPER;
-extern const int REPLICA_IS_ALREADY_ACTIVE;
-}
-
-namespace
-{
-constexpr auto MAX_FAILED_POLL_ATTEMPTS = 10;
-constexpr auto MAX_TIME_TO_WAIT_FOR_ASSIGNMENT_MS = 15000;
-}
-
-StorageKafka2::StorageKafka2(
-    const StorageID & table_id_,
-    ContextPtr context_,
-    const ColumnsDescription & columns_,
-    const String & comment,
-    std::unique_ptr<KafkaSettings> kafka_settings_,
-    const String & collection_name_)
-    : IStorage(table_id_)
-    , WithContext(context_->getGlobalContext())
-    , keeper(getContext()->getZooKeeper())
-    , keeper_path(kafka_settings_->kafka_keeper_path.value)
-    , replica_path(keeper_path + "/replicas/" + kafka_settings_->kafka_replica_name.value)
-    , kafka_settings(std::move(kafka_settings_))
-    , macros_info{.table_id = table_id_}
-    , topics(StorageKafkaUtils::parseTopics(getContext()->getMacros()->expand(kafka_settings->kafka_topic_list.value, macros_info)))
-    , brokers(getContext()->getMacros()->expand(kafka_settings->kafka_broker_list.value, macros_info))
-    , group(getContext()->getMacros()->expand(kafka_settings->kafka_group_name.value, macros_info))
-    , client_id(
-          kafka_settings->kafka_client_id.value.empty()
-              ? StorageKafkaUtils::getDefaultClientId(table_id_)
-              : getContext()->getMacros()->expand(kafka_settings->kafka_client_id.value, macros_info))
-    , format_name(getContext()->getMacros()->expand(kafka_settings->kafka_format.value))
-    , 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(getLogger("StorageKafka2 (" + table_id_.getNameForLogs() + ")"))
-    , semaphore(0, static_cast<int>(num_consumers))
-    , settings_adjustments(StorageKafkaUtils::createSettingsAdjustments(*kafka_settings, schema_name))
-    , thread_per_consumer(kafka_settings->kafka_thread_per_consumer.value)
-    , collection_name(collection_name_)
-    , active_node_identifier(toString(ServerUUID::get()))
-{
-    if (kafka_settings->kafka_num_consumers > 1 && !thread_per_consumer)
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "With multiple consumers, it is required to use `kafka_thread_per_consumer` setting");
-
-    if (kafka_settings->kafka_handle_error_mode == StreamingHandleErrorMode::STREAM)
-    {
-        kafka_settings->input_format_allow_errors_num = 0;
-        kafka_settings->input_format_allow_errors_ratio = 0;
-    }
-    StorageInMemoryMetadata storage_metadata;
-    storage_metadata.setColumns(columns_);
-    storage_metadata.setComment(comment);
-    setInMemoryMetadata(storage_metadata);
-    setVirtuals(StorageKafkaUtils::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)
-    {
-        auto task = getContext()->getMessageBrokerSchedulePool().createTask(log->name(), [this, i] { threadFunc(i); });
-        task->deactivate();
-        tasks.emplace_back(std::make_shared<TaskContext>(std::move(task)));
-    }
-
-    const auto first_replica = createTableIfNotExists();
-
-    if (!first_replica)
-        createReplica();
-
-    activating_task = getContext()->getSchedulePool().createTask(log->name() + "(activating task)", [this]() { activateAndReschedule(); });
-    activating_task->deactivate();
-}
-
-void StorageKafka2::partialShutdown()
-{
-    // This is called in a background task within a catch block, thus this function shouldn't throw
-    LOG_TRACE(log, "Cancelling streams");
-    for (auto & task : tasks)
-    {
-        task->stream_cancelled = true;
-    }
-
-    LOG_TRACE(log, "Waiting for cleanup");
-    for (auto & task : tasks)
-    {
-        task->holder->deactivate();
-    }
-    is_active = false;
-}
-
-bool StorageKafka2::activate()
-{
-    LOG_TEST(log, "Activate task");
-    if (is_active && !getZooKeeper()->expired())
-    {
-        LOG_TEST(log, "No need to activate");
-        return true;
-    }
-
-    if (!is_active)
-    {
-        LOG_WARNING(log, "Table was not active. Will try to activate it");
-    }
-    else if (getZooKeeper()->expired())
-    {
-        LOG_WARNING(log, "ZooKeeper session has expired. Switching to a new session");
-        partialShutdown();
-    }
-    else
-    {
-        UNREACHABLE();
-    }
-
-    try
-    {
-        setZooKeeper();
-    }
-    catch (const Coordination::Exception &)
-    {
-        /// The exception when you try to zookeeper_init usually happens if DNS does not work or the connection with ZK fails
-        tryLogCurrentException(log, "Failed to establish a new ZK connection. Will try again");
-        assert(!is_active);
-        return false;
-    }
-
-    if (shutdown_called)
-        return false;
-
-    auto activate_in_keeper = [this]()
-    {
-        try
-        {
-            auto zookeeper = getZooKeeper();
-
-            String is_active_path = fs::path(replica_path) / "is_active";
-            zookeeper->deleteEphemeralNodeIfContentMatches(is_active_path, active_node_identifier);
-
-            try
-            {
-                /// Simultaneously declare that this replica is active, and update the host.
-                zookeeper->create(is_active_path, active_node_identifier, zkutil::CreateMode::Ephemeral);
-            }
-            catch (const Coordination::Exception & e)
-            {
-                if (e.code == Coordination::Error::ZNODEEXISTS)
-                    throw Exception(
-                        ErrorCodes::REPLICA_IS_ALREADY_ACTIVE,
-                        "Replica {} appears to be already active. If you're sure it's not, "
-                        "try again in a minute or remove znode {}/is_active manually",
-                        replica_path,
-                        replica_path);
-
-                throw;
-            }
-            replica_is_active_node = zkutil::EphemeralNodeHolder::existing(is_active_path, *zookeeper);
-
-            return true;
-        }
-        catch (const Coordination::Exception & e)
-        {
-            replica_is_active_node = nullptr;
-            LOG_ERROR(log, "Couldn't start replica: {}. {}", e.what(), DB::getCurrentExceptionMessage(true));
-            return false;
-
-        }
-        catch (const Exception & e)
-        {
-            replica_is_active_node = nullptr;
-            if (e.code() != ErrorCodes::REPLICA_IS_ALREADY_ACTIVE)
-                throw;
-
-            LOG_ERROR(log, "Couldn't start replica: {}. {}", e.what(), DB::getCurrentExceptionMessage(true));
-            return false;
-        }
-    };
-
-    if (!activate_in_keeper())
-    {
-        assert(!is_active);
-        return false;
-    }
-
-    is_active = true;
-
-    // Start the reader threads
-    for (auto & task : tasks)
-    {
-        task->stream_cancelled = false;
-        task->holder->activateAndSchedule();
-    }
-
-    LOG_DEBUG(log, "Table activated successfully");
-    return true;
-}
-
-void StorageKafka2::activateAndReschedule()
-{
-    if (shutdown_called)
-        return;
-
-    /// It would be ideal to introduce a setting for this
-    constexpr static size_t check_period_ms = 60000;
-    /// In case of any exceptions we want to rerun the this task as fast as possible but we also don't want to keep retrying immediately
-    /// in a close loop (as fast as tasks can be processed), so we'll retry in between 100 and 10000 ms
-    const size_t backoff_ms = 100 * ((consecutive_activate_failures + 1) * (consecutive_activate_failures + 2)) / 2;
-    const size_t next_failure_retry_ms = std::min(size_t{10000}, backoff_ms);
-
-    try
-    {
-        bool replica_is_active = activate();
-        if (replica_is_active)
-        {
-            consecutive_activate_failures = 0;
-            activating_task->scheduleAfter(check_period_ms);
-        }
-        else
-        {
-            consecutive_activate_failures++;
-            activating_task->scheduleAfter(next_failure_retry_ms);
-        }
-    }
-    catch (...)
-    {
-        consecutive_activate_failures++;
-        activating_task->scheduleAfter(next_failure_retry_ms);
-
-        /// We couldn't activate table let's set it into readonly mode if necessary
-        /// We do this after scheduling the task in case it throws
-        partialShutdown();
-        tryLogCurrentException(log, "Failed to restart the table. Will try again");
-    }
-}
-
-void StorageKafka2::assertActive() const
-{
-    // TODO(antaljanosbenjamin): change LOGICAL_ERROR to something sensible
-    if (!is_active)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Table is not active (replica path: {})", replica_path);
-}
-
-
-Pipe StorageKafka2::read(
-    const Names & /*column_names */,
-    const StorageSnapshotPtr & /* storage_snapshot */,
-    SelectQueryInfo & /* query_info */,
-    ContextPtr /* local_context */,
-    QueryProcessingStage::Enum /* processed_stage */,
-    size_t /* max_block_size */,
-    size_t /* num_streams */)
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Direct read from the new Kafka storage is not implemented");
-}
-
-
-SinkToStoragePtr
-StorageKafka2::write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context, bool /*async_insert*/)
-{
-    auto modified_context = Context::createCopy(local_context);
-    modified_context->applySettingsChanges(settings_adjustments);
-
-    CurrentMetrics::Increment metric_increment{CurrentMetrics::KafkaWrites};
-    ProfileEvents::increment(ProfileEvents::KafkaWrites);
-
-    if (topics.size() > 1)
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Can't write to Kafka table with multiple topics!");
-
-    cppkafka::Configuration conf = getProducerConfiguration();
-
-    const Settings & settings = getContext()->getSettingsRef();
-    size_t poll_timeout = settings.stream_poll_timeout_ms.totalMilliseconds();
-    const auto & header = metadata_snapshot->getSampleBlockNonMaterialized();
-
-    auto producer = std::make_unique<KafkaProducer>(
-        std::make_shared<cppkafka::Producer>(conf), topics[0], std::chrono::milliseconds(poll_timeout), shutdown_called, header);
-
-    LOG_TRACE(log, "Kafka producer created");
-
-    size_t max_rows = max_rows_per_message;
-    /// Need for backward compatibility.
-    if (format_name == "Avro" && local_context->getSettingsRef().output_format_avro_rows_in_file.changed)
-        max_rows = local_context->getSettingsRef().output_format_avro_rows_in_file.value;
-    return std::make_shared<MessageQueueSink>(header, getFormatName(), max_rows, std::move(producer), getName(), modified_context);
-}
-
-void StorageKafka2::startup()
-{
-    for (size_t i = 0; i < num_consumers; ++i)
-    {
-        try
-        {
-            consumers.push_back(ConsumerAndAssignmentInfo{.consumer = createConsumer(i), .keeper = getZooKeeper()});
-            LOG_DEBUG(log, "Created #{} consumer", num_created_consumers);
-            ++num_created_consumers;
-
-            consumers.back().consumer->subscribeIfNotSubscribedYet();
-        }
-        catch (const cppkafka::Exception &)
-        {
-            tryLogCurrentException(log);
-        }
-    }
-    activating_task->activateAndSchedule();
-}
-
-
-void StorageKafka2::shutdown(bool)
-{
-    shutdown_called = true;
-    activating_task->deactivate();
-    partialShutdown();
-    LOG_TRACE(log, "Closing consumers");
-    consumers.clear();
-    LOG_TRACE(log, "Consumers closed");
-}
-
-void StorageKafka2::drop()
-{
-    dropReplica();
-}
-
-KafkaConsumer2Ptr StorageKafka2::createConsumer(size_t consumer_number)
-{
-    // Create a consumer and subscribe to topics
-    auto consumer_impl = std::make_shared<cppkafka::Consumer>(getConsumerConfiguration(consumer_number));
-    consumer_impl->set_destroy_flags(RD_KAFKA_DESTROY_F_NO_CONSUMER_CLOSE);
-
-    /// NOTE: we pass |stream_cancelled| by reference here, so the buffers should not outlive the storage.
-    chassert((thread_per_consumer || num_consumers == 1) && "StorageKafka2 cannot handle multiple consumers on a single thread");
-    auto & stream_cancelled = tasks[consumer_number]->stream_cancelled;
-    return std::make_shared<KafkaConsumer2>(
-        consumer_impl, log, getPollMaxBatchSize(), getPollTimeoutMillisecond(), stream_cancelled, topics);
-
-}
-
-
-cppkafka::Configuration StorageKafka2::getConsumerConfiguration(size_t consumer_number)
-{
-    KafkaConfigLoader::ConsumerConfigParams params{
-        {getContext()->getConfigRef(), collection_name, topics, log},
-        brokers,
-        group,
-        num_consumers > 1,
-        consumer_number,
-        client_id,
-        getMaxBlockSize()};
-    auto kafka_config = KafkaConfigLoader::getConsumerConfiguration(*this, params);
-    // It is disabled, because in case of no materialized views are attached, it can cause live memory leak. To enable it, a similar cleanup mechanism must be introduced as for StorageKafka.
-    kafka_config.set("statistics.interval.ms", "0");
-    return kafka_config;
-}
-
-cppkafka::Configuration StorageKafka2::getProducerConfiguration()
-{
-    KafkaConfigLoader::ProducerConfigParams params{
-        {getContext()->getConfigRef(), collection_name, topics, log},
-        brokers,
-        client_id};
-    return KafkaConfigLoader::getProducerConfiguration(*this, params);
-}
-
-size_t StorageKafka2::getMaxBlockSize() const
-{
-    return kafka_settings->kafka_max_block_size.changed ? kafka_settings->kafka_max_block_size.value
-                                                        : (getContext()->getSettingsRef().max_insert_block_size.value / num_consumers);
-}
-
-size_t StorageKafka2::getPollMaxBatchSize() const
-{
-    size_t batch_size = kafka_settings->kafka_poll_max_batch_size.changed ? kafka_settings->kafka_poll_max_batch_size.value
-                                                                          : getContext()->getSettingsRef().max_block_size.value;
-
-    return std::min(batch_size, getMaxBlockSize());
-}
-
-size_t StorageKafka2::getPollTimeoutMillisecond() const
-{
-    return kafka_settings->kafka_poll_timeout_ms.changed ? kafka_settings->kafka_poll_timeout_ms.totalMilliseconds()
-                                                         : getContext()->getSettingsRef().stream_poll_timeout_ms.totalMilliseconds();
-}
-
-namespace
-{
-const std::string lock_file_name{"lock"};
-const std::string commit_file_name{"committed"};
-const std::string intent_file_name{"intention"};
-
-std::optional<int64_t> getNumber(zkutil::ZooKeeper & keeper, const fs::path & path)
-{
-    std::string result;
-    if (!keeper.tryGet(path, result))
-        return std::nullopt;
-
-    return DB::parse<int64_t>(result);
-}
-}
-
-bool StorageKafka2::createTableIfNotExists()
-{
-    // Heavily based on StorageReplicatedMergeTree::createTableIfNotExists
-    const auto my_keeper_path = fs::path(keeper_path);
-    const auto replicas_path = my_keeper_path / "replicas";
-
-    for (auto i = 0; i < 1000; ++i)
-    {
-        if (keeper->exists(replicas_path))
-        {
-            LOG_DEBUG(log, "This table {} is already created, will add new replica", keeper_path);
-            return false;
-        }
-
-        /// There are leftovers from incompletely dropped table.
-        if (keeper->exists(my_keeper_path / "dropped"))
-        {
-            /// This condition may happen when the previous drop attempt was not completed
-            ///  or when table is dropped by another replica right now.
-            /// This is Ok because another replica is definitely going to drop the table.
-
-            LOG_WARNING(log, "Removing leftovers from table {}", keeper_path);
-            String drop_lock_path = my_keeper_path / "dropped" / "lock";
-            Coordination::Error code = keeper->tryCreate(drop_lock_path, "", zkutil::CreateMode::Ephemeral);
-
-            if (code == Coordination::Error::ZNONODE || code == Coordination::Error::ZNODEEXISTS)
-            {
-                LOG_WARNING(log, "The leftovers from table {} were removed by another replica", keeper_path);
-            }
-            else if (code != Coordination::Error::ZOK)
-            {
-                throw Coordination::Exception::fromPath(code, drop_lock_path);
-            }
-            else
-            {
-                auto metadata_drop_lock = zkutil::EphemeralNodeHolder::existing(drop_lock_path, *keeper);
-                if (!removeTableNodesFromZooKeeper(keeper, metadata_drop_lock))
-                {
-                    /// Someone is recursively removing table right now, we cannot create new table until old one is removed
-                    continue;
-                }
-            }
-        }
-
-        keeper->createAncestors(keeper_path);
-        Coordination::Requests ops;
-
-        ops.emplace_back(zkutil::makeCreateRequest(keeper_path, "", zkutil::CreateMode::Persistent));
-
-        const auto topics_path = my_keeper_path / "topics";
-        ops.emplace_back(zkutil::makeCreateRequest(topics_path, "", zkutil::CreateMode::Persistent));
-
-        for (const auto & topic : topics)
-        {
-            LOG_DEBUG(log, "Creating path in keeper for topic {}", topic);
-
-            const auto topic_path = topics_path / topic;
-            ops.emplace_back(zkutil::makeCreateRequest(topic_path, "", zkutil::CreateMode::Persistent));
-
-            const auto partitions_path = topic_path / "partitions";
-            ops.emplace_back(zkutil::makeCreateRequest(partitions_path, "", zkutil::CreateMode::Persistent));
-        }
-
-        // Create the first replica
-        ops.emplace_back(zkutil::makeCreateRequest(replicas_path, "", zkutil::CreateMode::Persistent));
-        ops.emplace_back(zkutil::makeCreateRequest(replica_path, "", zkutil::CreateMode::Persistent));
-
-
-        Coordination::Responses responses;
-        const auto code = keeper->tryMulti(ops, responses);
-        if (code == Coordination::Error::ZNODEEXISTS)
-        {
-            LOG_INFO(log, "It looks like the table {} was created by another replica at the same moment, will retry", keeper_path);
-            continue;
-        }
-        else if (code != Coordination::Error::ZOK)
-        {
-            zkutil::KeeperMultiException::check(code, ops, responses);
-        }
-
-        LOG_INFO(log, "Table {} created successfully ", keeper_path);
-
-        return true;
-    }
-
-    throw Exception(
-        ErrorCodes::REPLICA_ALREADY_EXISTS,
-        "Cannot create table, because it is created concurrently every time or because "
-        "of wrong zookeeper_path or because of logical error");
-}
-
-
-bool StorageKafka2::removeTableNodesFromZooKeeper(zkutil::ZooKeeperPtr keeper_to_use, const zkutil::EphemeralNodeHolder::Ptr & drop_lock)
-{
-    bool completely_removed = false;
-
-    Strings children;
-    if (const auto code = keeper_to_use->tryGetChildren(keeper_path, children); code == Coordination::Error::ZNONODE)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "There is a race condition between creation and removal. It's a bug");
-
-    const auto my_keeper_path = fs::path(keeper_path);
-    for (const auto & child : children)
-        if (child != "dropped")
-            keeper_to_use->tryRemoveRecursive(my_keeper_path / child);
-
-    Coordination::Requests ops;
-    Coordination::Responses responses;
-    ops.emplace_back(zkutil::makeRemoveRequest(drop_lock->getPath(), -1));
-    ops.emplace_back(zkutil::makeRemoveRequest(my_keeper_path / "dropped", -1));
-    ops.emplace_back(zkutil::makeRemoveRequest(my_keeper_path, -1));
-    const auto code = keeper_to_use->tryMulti(ops, responses, /* check_session_valid */ true);
-
-    if (code == Coordination::Error::ZNONODE)
-    {
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR, "There is a race condition between creation and removal of replicated table. It's a bug");
-    }
-    else if (code == Coordination::Error::ZNOTEMPTY)
-    {
-        LOG_ERROR(
-            log,
-            "Table was not completely removed from Keeper, {} still exists and may contain some garbage,"
-            "but someone is removing it right now.",
-            keeper_path);
-    }
-    else if (code != Coordination::Error::ZOK)
-    {
-        /// It is still possible that ZooKeeper session is expired or server is killed in the middle of the delete operation.
-        zkutil::KeeperMultiException::check(code, ops, responses);
-    }
-    else
-    {
-        drop_lock->setAlreadyRemoved();
-        completely_removed = true;
-        LOG_INFO(log, "Table {} was successfully removed from ZooKeeper", keeper_path);
-    }
-
-    return completely_removed;
-}
-
-void StorageKafka2::createReplica()
-{
-    LOG_INFO(log, "Creating replica {}", replica_path);
-    // TODO: This can cause issues if a new table is created with the same path. To make this work, we should store some metadata
-    // about the table to be able to identify that the same table is created, not a new one.
-    const auto code = keeper->tryCreate(replica_path, "", zkutil::CreateMode::Persistent);
-
-    switch (code)
-    {
-        case Coordination::Error::ZNODEEXISTS:
-            LOG_INFO(log, "Replica {} already exists, will try to use it", replica_path);
-            break;
-        case Coordination::Error::ZOK:
-            LOG_INFO(log, "Replica {} created", replica_path);
-            break;
-        case Coordination::Error::ZNONODE:
-            throw Exception(ErrorCodes::TABLE_IS_DROPPED, "Table {} was suddenly removed", keeper_path);
-        default:
-            throw Coordination::Exception::fromPath(code, replica_path);
-    }
-}
-
-
-void StorageKafka2::dropReplica()
-{
-    LOG_INFO(log, "Trying to drop replica {}", replica_path);
-    auto my_keeper = getZooKeeperIfTableShutDown();
-
-    LOG_INFO(log, "Removing replica {}", replica_path);
-
-    if (!my_keeper->exists(replica_path))
-    {
-        LOG_INFO(log, "Removing replica {} does not exist", replica_path);
-        return;
-    }
-
-    my_keeper->tryRemoveChildrenRecursive(replica_path);
-
-    if (my_keeper->tryRemove(replica_path) != Coordination::Error::ZOK)
-        LOG_ERROR(log, "Replica was not completely removed from Keeper, {} still exists and may contain some garbage.", replica_path);
-
-    /// Check that `zookeeper_path` exists: it could have been deleted by another replica after execution of previous line.
-    Strings replicas;
-    if (Coordination::Error::ZOK != my_keeper->tryGetChildren(keeper_path + "/replicas", replicas) || !replicas.empty())
-        return;
-
-    LOG_INFO(log, "{} is the last replica, will remove table", replica_path);
-
-    /** At this moment, another replica can be created and we cannot remove the table.
-      * Try to remove /replicas node first. If we successfully removed it,
-      * it guarantees that we are the only replica that proceed to remove the table
-      * and no new replicas can be created after that moment (it requires the existence of /replicas node).
-      * and table cannot be recreated with new /replicas node on another servers while we are removing data,
-      * because table creation is executed in single transaction that will conflict with remaining nodes.
-      */
-
-    /// Node /dropped works like a lock that protects from concurrent removal of old table and creation of new table.
-    /// But recursive removal may fail in the middle of operation leaving some garbage in zookeeper_path, so
-    /// we remove it on table creation if there is /dropped node. Creating thread may remove /dropped node created by
-    /// removing thread, and it causes race condition if removing thread is not finished yet.
-    /// To avoid this we also create ephemeral child before starting recursive removal.
-    /// (The existence of child node does not allow to remove parent node).
-    Coordination::Requests ops;
-    Coordination::Responses responses;
-    fs::path my_keeper_path = keeper_path;
-    String drop_lock_path = my_keeper_path / "dropped" / "lock";
-    ops.emplace_back(zkutil::makeRemoveRequest(my_keeper_path / "replicas", -1));
-    ops.emplace_back(zkutil::makeCreateRequest(my_keeper_path / "dropped", "", zkutil::CreateMode::Persistent));
-    ops.emplace_back(zkutil::makeCreateRequest(drop_lock_path, "", zkutil::CreateMode::Ephemeral));
-    Coordination::Error code = my_keeper->tryMulti(ops, responses);
-
-    if (code == Coordination::Error::ZNONODE || code == Coordination::Error::ZNODEEXISTS)
-    {
-        LOG_WARNING(log, "Table {} is already started to be removing by another replica right now", replica_path);
-    }
-    else if (code == Coordination::Error::ZNOTEMPTY)
-    {
-        LOG_WARNING(log, "Another replica was suddenly created, will keep the table {}", replica_path);
-    }
-    else if (code != Coordination::Error::ZOK)
-    {
-        zkutil::KeeperMultiException::check(code, ops, responses);
-    }
-    else
-    {
-        auto drop_lock = zkutil::EphemeralNodeHolder::existing(drop_lock_path, *my_keeper);
-        LOG_INFO(log, "Removing table {} (this might take several minutes)", keeper_path);
-        removeTableNodesFromZooKeeper(my_keeper, drop_lock);
-    }
-}
-
-std::optional<StorageKafka2::TopicPartitionLocks>
-StorageKafka2::lockTopicPartitions(zkutil::ZooKeeper & keeper_to_use, const TopicPartitions & topic_partitions)
-{
-    std::vector<fs::path> topic_partition_paths;
-    topic_partition_paths.reserve(topic_partitions.size());
-    for (const auto & topic_partition : topic_partitions)
-        topic_partition_paths.emplace_back(getTopicPartitionPath(topic_partition));
-
-    Coordination::Requests ops;
-
-    static constexpr auto ignore_if_exists = true;
-
-    for (const auto & topic_partition_path : topic_partition_paths)
-    {
-        const auto lock_file_path = String(topic_partition_path / lock_file_name);
-        LOG_TRACE(log, "Creating locking ops for: {}", lock_file_path);
-        ops.push_back(zkutil::makeCreateRequest(topic_partition_path, "", zkutil::CreateMode::Persistent, ignore_if_exists));
-        ops.push_back(zkutil::makeCreateRequest(lock_file_path, kafka_settings->kafka_replica_name.value, zkutil::CreateMode::Ephemeral));
-    }
-    Coordination::Responses responses;
-
-    if (const auto code = keeper_to_use.tryMulti(ops, responses); code != Coordination::Error::ZOK)
-    {
-        if (code != Coordination::Error::ZNODEEXISTS)
-            zkutil::KeeperMultiException::check(code, ops, responses);
-
-        // Possible optimization: check the content of lock files, if we locked them, then we can clean them up and retry to lock them.
-        return std::nullopt;
-    }
-
-    // We have the locks, let's gather the information we needed
-    TopicPartitionLocks locks;
-    {
-        auto tp_it = topic_partitions.begin();
-        auto path_it = topic_partition_paths.begin();
-        for (; tp_it != topic_partitions.end(); ++tp_it, ++path_it)
-        {
-            using zkutil::EphemeralNodeHolder;
-            LockedTopicPartitionInfo lock_info{
-                EphemeralNodeHolder::existing(*path_it / lock_file_name, keeper_to_use),
-                getNumber(keeper_to_use, *path_it / commit_file_name),
-                getNumber(keeper_to_use, *path_it / intent_file_name)};
-
-            LOG_TRACE(
-                log,
-                "Locked topic partition: {}:{} at offset {} with intent size {}",
-                tp_it->topic,
-                tp_it->partition_id,
-                lock_info.committed_offset.value_or(0),
-                lock_info.intent_size.value_or(0));
-            locks.emplace(TopicPartition(*tp_it), std::move(lock_info));
-        }
-    }
-
-    return locks;
-}
-
-
-void StorageKafka2::saveCommittedOffset(zkutil::ZooKeeper & keeper_to_use, const TopicPartition & topic_partition)
-{
-    const auto partition_prefix = getTopicPartitionPath(topic_partition);
-    keeper_to_use.createOrUpdate(partition_prefix / commit_file_name, toString(topic_partition.offset), zkutil::CreateMode::Persistent);
-    // This is best effort, if it fails we will try to remove in the next round
-    keeper_to_use.tryRemove(partition_prefix / intent_file_name, -1);
-    LOG_TEST(
-        log, "Saved offset {} for topic-partition [{}:{}]", topic_partition.offset, topic_partition.topic, topic_partition.partition_id);
-}
-
-void StorageKafka2::saveIntent(zkutil::ZooKeeper & keeper_to_use, const TopicPartition & topic_partition, int64_t intent)
-{
-    LOG_TEST(
-        log,
-        "Saving intent of {} for topic-partition [{}:{}] at offset {}",
-        intent,
-        topic_partition.topic,
-        topic_partition.partition_id,
-        topic_partition.offset);
-    keeper_to_use.createOrUpdate(
-        getTopicPartitionPath(topic_partition) / intent_file_name, toString(intent), zkutil::CreateMode::Persistent);
-}
-
-
-StorageKafka2::PolledBatchInfo StorageKafka2::pollConsumer(
-    KafkaConsumer2 & consumer,
-    const TopicPartition & topic_partition,
-    std::optional<int64_t> message_count,
-    Stopwatch & total_stopwatch,
-    const ContextPtr & modified_context)
-{
-    LOG_TEST(log, "Polling consumer");
-    PolledBatchInfo batch_info;
-    auto storage_snapshot = getStorageSnapshot(getInMemoryMetadataPtr(), getContext());
-    Block non_virtual_header(storage_snapshot->metadata->getSampleBlockNonMaterialized());
-    auto virtual_header = getVirtualsHeader();
-
-    // now it's one-time usage InputStream
-    // one block of the needed size (or with desired flush timeout) is formed in one internal iteration
-    // otherwise external iteration will reuse that and logic will became even more fuzzy
-    MutableColumns virtual_columns = virtual_header.cloneEmptyColumns();
-
-    auto put_error_to_stream = kafka_settings->kafka_handle_error_mode == StreamingHandleErrorMode::STREAM;
-
-    EmptyReadBuffer empty_buf;
-    auto input_format = FormatFactory::instance().getInput(
-        getFormatName(), empty_buf, non_virtual_header, modified_context, getMaxBlockSize(), std::nullopt, 1);
-
-    std::optional<std::string> exception_message;
-    size_t total_rows = 0;
-    size_t failed_poll_attempts = 0;
-
-    auto on_error = [&](const MutableColumns & result_columns, Exception & e)
-    {
-        ProfileEvents::increment(ProfileEvents::KafkaMessagesFailed);
-
-        if (put_error_to_stream)
-        {
-            exception_message = e.message();
-            for (const auto & column : result_columns)
-            {
-                // read_kafka_message could already push some rows to result_columns
-                // before exception, we need to fix it.
-                auto cur_rows = column->size();
-                if (cur_rows > total_rows)
-                    column->popBack(cur_rows - total_rows);
-
-                // all data columns will get default value in case of error
-                column->insertDefault();
-            }
-
-            return 1;
-        }
-        else
-        {
-            e.addMessage(
-                "while parsing Kafka message (topic: {}, partition: {}, offset: {})'",
-                consumer.currentTopic(),
-                consumer.currentPartition(),
-                consumer.currentOffset());
-            throw std::move(e);
-        }
-    };
-
-    StreamingFormatExecutor executor(non_virtual_header, input_format, std::move(on_error));
-
-
-    Poco::Timespan max_execution_time = kafka_settings->kafka_flush_interval_ms.changed
-        ? kafka_settings->kafka_flush_interval_ms
-        : getContext()->getSettingsRef().stream_flush_interval_ms;
-
-    const auto check_time_limit = [&max_execution_time, &total_stopwatch]()
-    {
-        if (max_execution_time != 0)
-        {
-            auto elapsed_ns = total_stopwatch.elapsed();
-
-            if (elapsed_ns > static_cast<UInt64>(max_execution_time.totalMicroseconds()) * 1000)
-                return false;
-        }
-
-        return true;
-    };
-
-    while (true)
-    {
-        size_t new_rows = 0;
-        exception_message.reset();
-        if (auto buf = consumer.consume(topic_partition, message_count))
-        {
-            ProfileEvents::increment(ProfileEvents::KafkaMessagesRead);
-            new_rows = executor.execute(*buf);
-        }
-
-        if (new_rows)
-        {
-            ProfileEvents::increment(ProfileEvents::KafkaRowsRead, new_rows);
-
-            const auto & header_list = consumer.currentHeaderList();
-
-            Array headers_names;
-            Array headers_values;
-
-            if (!header_list.empty())
-            {
-                headers_names.reserve(header_list.size());
-                headers_values.reserve(header_list.size());
-                for (const auto & header : header_list)
-                {
-                    headers_names.emplace_back(header.get_name());
-                    headers_values.emplace_back(static_cast<std::string>(header.get_value()));
-                }
-            }
-
-            for (size_t i = 0; i < new_rows; ++i)
-            {
-                virtual_columns[0]->insert(consumer.currentTopic());
-                virtual_columns[1]->insert(consumer.currentKey());
-                virtual_columns[2]->insert(consumer.currentOffset());
-                virtual_columns[3]->insert(consumer.currentPartition());
-
-
-                auto timestamp_raw = consumer.currentTimestamp();
-                if (timestamp_raw)
-                {
-                    auto ts = timestamp_raw->get_timestamp();
-                    virtual_columns[4]->insert(std::chrono::duration_cast<std::chrono::seconds>(ts).count());
-                    virtual_columns[5]->insert(
-                        DecimalField<Decimal64>(std::chrono::duration_cast<std::chrono::milliseconds>(ts).count(), 3));
-                }
-                else
-                {
-                    virtual_columns[4]->insertDefault();
-                    virtual_columns[5]->insertDefault();
-                }
-                virtual_columns[6]->insert(headers_names);
-                virtual_columns[7]->insert(headers_values);
-                if (put_error_to_stream)
-                {
-                    if (exception_message)
-                    {
-                        virtual_columns[8]->insert(consumer.currentPayload());
-                        virtual_columns[9]->insert(*exception_message);
-                    }
-                    else
-                    {
-                        virtual_columns[8]->insertDefault();
-                        virtual_columns[9]->insertDefault();
-                    }
-                }
-            }
-
-            total_rows = total_rows + new_rows;
-            batch_info.last_offset = consumer.currentOffset();
-        }
-        else if (consumer.isStalled())
-        {
-            ++failed_poll_attempts;
-        }
-        else
-        {
-            // We came here in case of tombstone (or sometimes zero-length) messages, and it is not something abnormal
-            // TODO: it seems like in case of put_error_to_stream=true we may need to process those differently
-            // currently we just skip them with note in logs.
-            LOG_DEBUG(
-                log,
-                "Parsing of message (topic: {}, partition: {}, offset: {}) return no rows.",
-                consumer.currentTopic(),
-                consumer.currentPartition(),
-                consumer.currentOffset());
-        }
-
-        if (!consumer.hasMorePolledMessages()
-            && (total_rows >= getMaxBlockSize() || !check_time_limit() || failed_poll_attempts >= MAX_FAILED_POLL_ATTEMPTS
-                || consumer.needsOffsetUpdate()))
-        {
-            LOG_TRACE(
-                log,
-                "Stopped collecting message for current batch. There are {} failed polled attempts, {} total rows and consumer needs "
-                "offset update is {}",
-                failed_poll_attempts,
-                total_rows,
-                consumer.needsOffsetUpdate());
-            break;
-        }
-    }
-
-    if (total_rows == 0)
-        return {};
-
-    /// MATERIALIZED columns can be added here, but I think
-    // they are not needed here:
-    // and it's misleading to use them here,
-    // as columns 'materialized' that way stays 'ephemeral'
-    // i.e. will not be stored anywhere
-    // If needed any extra columns can be added using DEFAULT they can be added at MV level if needed.
-
-    auto result_block = non_virtual_header.cloneWithColumns(executor.getResultColumns());
-    auto virtual_block = virtual_header.cloneWithColumns(std::move(virtual_columns));
-
-    for (const auto & column : virtual_block.getColumnsWithTypeAndName())
-        result_block.insert(column);
-
-    batch_info.blocks.emplace_back(std::move(result_block));
-    return batch_info;
-}
-
-void StorageKafka2::threadFunc(size_t idx)
-{
-    chassert(idx < tasks.size());
-    auto task = tasks[idx];
-    std::optional<StallReason> maybe_stall_reason;
-    try
-    {
-        auto table_id = getStorageID();
-        // Check if at least one direct dependency is attached
-        size_t num_views = DatabaseCatalog::instance().getDependentViews(table_id).size();
-        if (num_views)
-        {
-            auto start_time = std::chrono::steady_clock::now();
-
-            // Keep streaming as long as there are attached views and streaming is not cancelled
-            while (!task->stream_cancelled && num_created_consumers > 0)
-            {
-                maybe_stall_reason.reset();
-                if (!StorageKafkaUtils::checkDependencies(table_id, getContext()))
-                    break;
-
-                LOG_DEBUG(log, "Started streaming to {} attached views", num_views);
-
-                // Exit the loop & reschedule if some stream stalled
-                if (maybe_stall_reason = streamToViews(idx); maybe_stall_reason.has_value())
-                {
-                    LOG_TRACE(log, "Stream stalled.");
-                    break;
-                }
-
-                auto ts = std::chrono::steady_clock::now();
-                auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(ts - start_time);
-                if (duration.count() > KAFKA_MAX_THREAD_WORK_DURATION_MS)
-                {
-                    LOG_TRACE(log, "Thread work duration limit exceeded. Reschedule.");
-                    break;
-                }
-            }
-        }
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-    }
-
-    if (!task->stream_cancelled)
-    {
-        // Keeper related problems should be solved relatively fast, it makes sense wait less time
-        if (maybe_stall_reason.has_value()
-            && (*maybe_stall_reason == StallReason::KeeperSessionEnded || *maybe_stall_reason == StallReason::CouldNotAcquireLocks))
-            task->holder->scheduleAfter(KAFKA_RESCHEDULE_MS / 10);
-        else
-            task->holder->scheduleAfter(KAFKA_RESCHEDULE_MS);
-    }
-}
-
-std::optional<StorageKafka2::StallReason> StorageKafka2::streamToViews(size_t idx)
-{
-    // This function is written assuming that each consumer has their own thread. This means once this is changed, this function should be revisited.
-    // The return values should be revisited, as stalling all consumers because of a single one stalled is not a good idea.
-    auto table_id = getStorageID();
-    auto table = DatabaseCatalog::instance().getTable(table_id, getContext());
-    if (!table)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Engine table {} doesn't exist.", table_id.getNameForLogs());
-
-    CurrentMetrics::Increment metric_increment{CurrentMetrics::KafkaBackgroundReads};
-    ProfileEvents::increment(ProfileEvents::KafkaBackgroundReads);
-
-    auto & consumer_info = consumers[idx];
-    consumer_info.watch.restart();
-    auto & consumer = consumer_info.consumer;
-    // In case the initial subscribe in startup failed, let's subscribe now
-    consumer->subscribeIfNotSubscribedYet();
-
-    // To keep the consumer alive
-    const auto wait_for_assignment = consumer_info.locks.empty();
-    LOG_TRACE(log, "Polling consumer {} for events", idx);
-    consumer->pollEvents();
-
-    if (wait_for_assignment)
-    {
-        while (nullptr == consumer->getKafkaAssignment() && consumer_info.watch.elapsedMilliseconds() < MAX_TIME_TO_WAIT_FOR_ASSIGNMENT_MS)
-            consumer->pollEvents();
-        LOG_INFO(log, "Consumer has assignment: {}", nullptr == consumer->getKafkaAssignment());
-    }
-
-    try
-    {
-        if (consumer->needsOffsetUpdate() || consumer_info.locks.empty())
-        {
-            LOG_TRACE(log, "Consumer needs update offset");
-            // First release the locks so let other consumers acquire them ASAP
-            consumer_info.locks.clear();
-            consumer_info.topic_partitions.clear();
-
-            const auto * current_assignment = consumer->getKafkaAssignment();
-            if (current_assignment == nullptr)
-            {
-                // The consumer lost its assignment and haven't received a new one.
-                // By returning true this function reports the current consumer as a "stalled" stream, which
-                LOG_TRACE(log, "No assignment");
-                return StallReason::NoAssignment;
-            }
-            consumer_info.consume_from_topic_partition_index = 0;
-
-            if (consumer_info.keeper->expired())
-            {
-                consumer_info.keeper = getZooKeeperAndAssertActive();
-                LOG_TEST(log, "Got new zookeeper");
-            }
-
-            auto maybe_locks = lockTopicPartitions(*consumer_info.keeper, *current_assignment);
-
-            if (!maybe_locks.has_value())
-            {
-                // We couldn't acquire locks, probably some other consumers are still holding them.
-                LOG_TRACE(log, "Couldn't acquire locks");
-                return StallReason::CouldNotAcquireLocks;
-            }
-
-            consumer_info.locks = std::move(*maybe_locks);
-
-            consumer_info.topic_partitions.reserve(current_assignment->size());
-            for (const auto & topic_partition : *current_assignment)
-            {
-                TopicPartition topic_partition_copy{topic_partition};
-                if (const auto & maybe_committed_offset = consumer_info.locks.at(topic_partition).committed_offset;
-                    maybe_committed_offset.has_value())
-                {
-                    topic_partition_copy.offset = *maybe_committed_offset;
-                }
-                // in case no saved offset, we will get the offset from Kafka as a best effort. This is important to not to duplicate message when recreating the table.
-
-                consumer_info.topic_partitions.push_back(std::move(topic_partition_copy));
-            }
-            consumer_info.consumer->updateOffsets(consumer_info.topic_partitions);
-        }
-
-        if (consumer_info.topic_partitions.empty())
-        {
-            LOG_TRACE(log, "Consumer {} has assignment, but has no partitions, probably because there are more consumers in the consumer group than partitions.", idx);
-            return StallReason::NoPartitions;
-        }
-        LOG_TRACE(log, "Trying to consume from consumer {}", idx);
-        const auto maybe_rows = streamFromConsumer(consumer_info);
-        if (maybe_rows.has_value())
-        {
-            const auto milliseconds = consumer_info.watch.elapsedMilliseconds();
-            LOG_DEBUG(
-                log, "Pushing {} rows to {} took {} ms.", formatReadableQuantity(*maybe_rows), table_id.getNameForLogs(), milliseconds);
-        }
-        else
-        {
-            LOG_DEBUG(log, "Couldn't stream any messages");
-            return StallReason::NoMessages;
-        }
-    }
-    catch (const zkutil::KeeperException & e)
-    {
-        if (Coordination::isHardwareError(e.code))
-        {
-            LOG_INFO(log, "Cleaning up topic-partitions locks because of exception: {}", e.displayText());
-            consumer_info.locks.clear();
-            activating_task->schedule();
-            return StallReason::KeeperSessionEnded;
-        }
-
-        throw;
-    }
-    return {};
-}
-
-
-std::optional<size_t> StorageKafka2::streamFromConsumer(ConsumerAndAssignmentInfo & consumer_info)
-{
-    // Create an INSERT query for streaming data
-    auto insert = std::make_shared<ASTInsertQuery>();
-    insert->table_id = getStorageID();
-
-    auto kafka_context = Context::createCopy(getContext());
-    kafka_context->makeQueryContext();
-    kafka_context->applySettingsChanges(settings_adjustments);
-
-    // Create a stream for each consumer and join them in a union stream
-    // Only insert into dependent views and expect that input blocks contain virtual columns
-    InterpreterInsertQuery interpreter(
-        insert,
-        kafka_context,
-        /* allow_materialized */ false,
-        /* no_squash */ true,
-        /* no_destination */ true,
-        /* async_insert */ false);
-    auto block_io = interpreter.execute();
-
-    auto & topic_partition = consumer_info.topic_partitions[consumer_info.consume_from_topic_partition_index];
-    LOG_TRACE(
-        log,
-        "Will fetch {}:{} (consume_from_topic_partition_index is {})",
-        topic_partition.topic,
-        topic_partition.partition_id,
-        consumer_info.consume_from_topic_partition_index);
-    consumer_info.consume_from_topic_partition_index
-        = (consumer_info.consume_from_topic_partition_index + 1) % consumer_info.topic_partitions.size();
-
-    bool needs_offset_reset = true;
-    SCOPE_EXIT({
-        if (!needs_offset_reset)
-            return;
-        consumer_info.consumer->updateOffsets(consumer_info.topic_partitions);
-    });
-    auto [blocks, last_read_offset] = pollConsumer(
-        *consumer_info.consumer, topic_partition, consumer_info.locks[topic_partition].intent_size, consumer_info.watch, kafka_context);
-
-    if (blocks.empty())
-    {
-        LOG_TRACE(log, "Didn't get any messages");
-        needs_offset_reset = false;
-        return std::nullopt;
-    }
-
-    auto converting_dag = ActionsDAG::makeConvertingActions(
-        blocks.front().cloneEmpty().getColumnsWithTypeAndName(),
-        block_io.pipeline.getHeader().getColumnsWithTypeAndName(),
-        ActionsDAG::MatchColumnsMode::Name);
-
-    auto converting_actions = std::make_shared<ExpressionActions>(std::move(converting_dag));
-
-    for (auto & block : blocks)
-        converting_actions->execute(block);
-
-    // We can't cancel during copyData, as it's not aware of commits and other kafka-related stuff.
-    // It will be cancelled on underlying layer (kafka buffer)
-
-    auto & keeper_to_use = *consumer_info.keeper;
-    auto & lock_info = consumer_info.locks.at(topic_partition);
-    lock_info.intent_size = last_read_offset - lock_info.committed_offset.value_or(0);
-    saveIntent(keeper_to_use, topic_partition, *lock_info.intent_size);
-    std::atomic_size_t rows = 0;
-    {
-        block_io.pipeline.complete(Pipe{std::make_shared<BlocksListSource>(std::move(blocks))});
-
-        block_io.pipeline.setProgressCallback([&](const Progress & progress) { rows += progress.read_rows.load(); });
-        CompletedPipelineExecutor executor(block_io.pipeline);
-        executor.execute();
-    }
-    lock_info.committed_offset = last_read_offset + 1;
-    topic_partition.offset = last_read_offset + 1;
-    saveCommittedOffset(keeper_to_use, topic_partition);
-    consumer_info.consumer->commit(topic_partition);
-    lock_info.intent_size.reset();
-    needs_offset_reset = false;
-
-    return rows;
-}
-
-void StorageKafka2::setZooKeeper()
-{
-    std::unique_lock lock{keeper_mutex};
-    keeper = getContext()->getZooKeeper();
-}
-
-zkutil::ZooKeeperPtr StorageKafka2::tryGetZooKeeper() const
-{
-    std::unique_lock lock{keeper_mutex};
-    return keeper;
-}
-
-zkutil::ZooKeeperPtr StorageKafka2::getZooKeeper() const
-{
-    auto res = tryGetZooKeeper();
-    if (!res)
-        throw Exception(ErrorCodes::NO_ZOOKEEPER, "Cannot get ZooKeeper");
-    return res;
-}
-
-zkutil::ZooKeeperPtr StorageKafka2::getZooKeeperAndAssertActive() const
-{
-    auto res = getZooKeeper();
-    assertActive();
-    return res;
-}
-
-zkutil::ZooKeeperPtr StorageKafka2::getZooKeeperIfTableShutDown() const
-{
-    zkutil::ZooKeeperPtr new_zookeeper = getContext()->getZooKeeper();
-    new_zookeeper->sync(keeper_path);
-    return new_zookeeper;
-}
-
-fs::path StorageKafka2::getTopicPartitionPath(const TopicPartition & topic_partition)
-{
-    return fs::path(keeper_path) / "topics" / topic_partition.topic / "partitions" / std::to_string(topic_partition.partition_id);
-}
-
-}
diff --git a/src/Storages/Kafka/StorageKafka2.h b/src/Storages/Kafka/StorageKafka2.h
deleted file mode 100644
index f85fedb316a..00000000000
--- a/src/Storages/Kafka/StorageKafka2.h
+++ /dev/null
@@ -1,241 +0,0 @@
-#pragma once
-
-#include <Core/BackgroundSchedulePool.h>
-#include <Core/Block.h>
-#include <Core/Types.h>
-#include <Storages/IStorage.h>
-#include <Storages/Kafka/KafkaConsumer2.h>
-#include <Storages/Kafka/KafkaSettings.h>
-#include <Common/Macros.h>
-#include <Common/SettingsChanges.h>
-#include <Common/ThreadStatus.h>
-#include <Common/ZooKeeper/ZooKeeper.h>
-
-#include <Poco/Semaphore.h>
-
-#include <atomic>
-#include <filesystem>
-#include <list>
-#include <mutex>
-#include <rdkafka.h>
-
-namespace cppkafka
-{
-
-class Configuration;
-
-}
-
-namespace DB
-{
-
-template <typename TStorageKafka>
-struct KafkaInterceptors;
-
-using KafkaConsumer2Ptr = std::shared_ptr<KafkaConsumer2>;
-
-/// Implements a Kafka queue table engine that can be used as a persistent queue / buffer,
-/// or as a basic building block for creating pipelines with a continuous insertion / ETL.
-///
-/// It is similar to the already existing StorageKafka, it instead of storing the offsets
-/// in Kafka, its main source of information about offsets is Keeper. On top of the
-/// offsets, it also stores the number of messages (intent size) it tried to insert from
-/// each topic. By storing the intent sizes it is possible to retry the same batch of
-/// messages in case of any errors and giving deduplication a chance to deduplicate
-/// blocks.
-///
-/// To not complicate things too much, the current implementation makes sure to fetch
-/// messages only from a single topic-partition on a single thread at a time by
-/// manipulating the queues of librdkafka. By pulling from multiple topic-partitions
-/// the order of messages are not guaranteed, therefore they would have different
-/// hashes for deduplication.
-class StorageKafka2 final : public IStorage, WithContext
-{
-    using KafkaInterceptors = KafkaInterceptors<StorageKafka2>;
-    friend KafkaInterceptors;
-
-public:
-    StorageKafka2(
-        const StorageID & table_id_,
-        ContextPtr context_,
-        const ColumnsDescription & columns_,
-        const String & comment,
-        std::unique_ptr<KafkaSettings> kafka_settings_,
-        const String & collection_name_);
-
-    std::string getName() const override { return "Kafka"; }
-
-    bool noPushingToViews() const override { return true; }
-
-    void startup() override;
-    void shutdown(bool is_drop) override;
-
-    void drop() override;
-
-    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;
-
-    SinkToStoragePtr
-    write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context, bool async_insert) override;
-
-    /// We want to control the number of rows in a chunk inserted into Kafka
-    bool prefersLargeBlocks() const override { return false; }
-
-    const auto & getFormatName() const { return format_name; }
-
-    StreamingHandleErrorMode getHandleKafkaErrorMode() const { return kafka_settings->kafka_handle_error_mode; }
-
-private:
-    using TopicPartition = KafkaConsumer2::TopicPartition;
-    using TopicPartitions = KafkaConsumer2::TopicPartitions;
-
-    struct LockedTopicPartitionInfo
-    {
-        zkutil::EphemeralNodeHolderPtr lock;
-        std::optional<int64_t> committed_offset;
-        std::optional<int64_t> intent_size;
-    };
-
-    using TopicPartitionLocks = std::unordered_map<
-        TopicPartition,
-        LockedTopicPartitionInfo,
-        KafkaConsumer2::OnlyTopicNameAndPartitionIdHash,
-        KafkaConsumer2::OnlyTopicNameAndPartitionIdEquality>;
-
-    struct ConsumerAndAssignmentInfo
-    {
-        KafkaConsumer2Ptr consumer;
-        size_t consume_from_topic_partition_index{0};
-        TopicPartitions topic_partitions{};
-        zkutil::ZooKeeperPtr keeper;
-        TopicPartitionLocks locks{};
-        Stopwatch watch{CLOCK_MONOTONIC_COARSE};
-    };
-
-    struct PolledBatchInfo
-    {
-        BlocksList blocks;
-        int64_t last_offset;
-    };
-
-    // Stream thread
-    struct TaskContext
-    {
-        BackgroundSchedulePool::TaskHolder holder;
-        std::atomic<bool> stream_cancelled{false};
-        explicit TaskContext(BackgroundSchedulePool::TaskHolder && task_) : holder(std::move(task_)) { }
-    };
-
-    enum class AssignmentChange
-    {
-        NotChanged,
-        Updated,
-        Lost
-    };
-
-    // Configuration and state
-    mutable std::mutex keeper_mutex;
-    zkutil::ZooKeeperPtr keeper;
-    String keeper_path;
-    String replica_path;
-    std::unique_ptr<KafkaSettings> kafka_settings;
-    Macros::MacroExpansionInfo macros_info;
-    const Names topics;
-    const String brokers;
-    const String group;
-    const String client_id;
-    const String format_name;
-    const size_t max_rows_per_message;
-    const String schema_name;
-    const size_t num_consumers; /// total number of consumers
-    LoggerPtr log;
-    Poco::Semaphore semaphore;
-    const SettingsChanges settings_adjustments;
-    /// Can differ from num_consumers in case of exception in startup() (or if startup() hasn't been called).
-    /// In this case we still need to be able to shutdown() properly.
-    size_t num_created_consumers = 0; /// number of actually created consumers.
-    std::vector<ConsumerAndAssignmentInfo> consumers;
-    std::vector<std::shared_ptr<TaskContext>> tasks;
-    bool thread_per_consumer = false;
-    /// For memory accounting in the librdkafka threads.
-    std::mutex thread_statuses_mutex;
-    std::list<std::shared_ptr<ThreadStatus>> thread_statuses;
-    /// If named_collection is specified.
-    String collection_name;
-    std::atomic<bool> shutdown_called = false;
-
-    // Handling replica activation.
-    std::atomic<bool> is_active = false;
-    zkutil::EphemeralNodeHolderPtr replica_is_active_node;
-    BackgroundSchedulePool::TaskHolder activating_task;
-    String active_node_identifier;
-    UInt64 consecutive_activate_failures = 0;
-    bool activate();
-    void activateAndReschedule();
-    void partialShutdown();
-
-    void assertActive() const;
-    KafkaConsumer2Ptr createConsumer(size_t consumer_number);
-    // Returns full consumer related configuration, also the configuration
-    // contains global kafka properties.
-    cppkafka::Configuration getConsumerConfiguration(size_t consumer_number);
-    // Returns full producer related configuration, also the configuration
-    // contains global kafka properties.
-    cppkafka::Configuration getProducerConfiguration();
-
-    void threadFunc(size_t idx);
-
-    size_t getPollMaxBatchSize() const;
-    size_t getMaxBlockSize() const;
-    size_t getPollTimeoutMillisecond() const;
-
-    enum class StallReason
-    {
-        NoAssignment,
-        CouldNotAcquireLocks,
-        NoPartitions,
-        NoMessages,
-        KeeperSessionEnded,
-    };
-
-    std::optional<StallReason> streamToViews(size_t idx);
-
-    std::optional<size_t> streamFromConsumer(ConsumerAndAssignmentInfo & consumer_info);
-
-    // Returns true if this is the first replica
-    bool createTableIfNotExists();
-    // Returns true if all of the nodes were cleaned up
-    bool removeTableNodesFromZooKeeper(zkutil::ZooKeeperPtr keeper_to_use, const zkutil::EphemeralNodeHolder::Ptr & drop_lock);
-    // Creates only the replica in ZooKeeper. Shouldn't be called on the first replica as it is created in createTableIfNotExists
-    void createReplica();
-    void dropReplica();
-
-    // Takes lock over topic partitions and sets the committed offset in topic_partitions.
-    std::optional<TopicPartitionLocks> lockTopicPartitions(zkutil::ZooKeeper & keeper_to_use, const TopicPartitions & topic_partitions);
-    void saveCommittedOffset(zkutil::ZooKeeper & keeper_to_use, const TopicPartition & topic_partition);
-    void saveIntent(zkutil::ZooKeeper & keeper_to_use, const TopicPartition & topic_partition, int64_t intent);
-
-    PolledBatchInfo pollConsumer(
-        KafkaConsumer2 & consumer,
-        const TopicPartition & topic_partition,
-        std::optional<int64_t> message_count,
-        Stopwatch & watch,
-        const ContextPtr & context);
-
-    void setZooKeeper();
-    zkutil::ZooKeeperPtr tryGetZooKeeper() const;
-    zkutil::ZooKeeperPtr getZooKeeper() const;
-    zkutil::ZooKeeperPtr getZooKeeperAndAssertActive() const;
-    zkutil::ZooKeeperPtr getZooKeeperIfTableShutDown() const;
-
-
-    std::filesystem::path getTopicPartitionPath(const TopicPartition & topic_partition);
-};
-
-}
diff --git a/src/Storages/Kafka/StorageKafkaUtils.cpp b/src/Storages/Kafka/StorageKafkaUtils.cpp
deleted file mode 100644
index cdc32d775eb..00000000000
--- a/src/Storages/Kafka/StorageKafkaUtils.cpp
+++ /dev/null
@@ -1,452 +0,0 @@
-#include <Storages/Kafka/StorageKafkaUtils.h>
-
-
-#include <Databases/DatabaseReplicatedHelpers.h>
-#include <Interpreters/DatabaseCatalog.h>
-#include <Interpreters/evaluateConstantExpression.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Storages/IStorage.h>
-#include <Storages/Kafka/KafkaSettings.h>
-#include <Storages/Kafka/StorageKafka.h>
-#include <Storages/Kafka/StorageKafka2.h>
-#include <Storages/Kafka/parseSyslogLevel.h>
-#include <DataTypes/DataTypeArray.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 <Storages/NamedCollectionsHelpers.h>
-#include <Storages/StorageFactory.h>
-#include <Storages/StorageMaterializedView.h>
-#include <base/getFQDNOrHostName.h>
-#include <Poco/Util/AbstractConfiguration.h>
-#include <Common/CurrentMetrics.h>
-#include <Common/NamedCollections/NamedCollectionsFactory.h>
-#include <Common/ThreadPool.h>
-#include <Common/ThreadStatus.h>
-#include <Common/config_version.h>
-#include <Common/getNumberOfPhysicalCPUCores.h>
-#include <Common/logger_useful.h>
-#include <Common/setThreadName.h>
-
-#include <boost/algorithm/string/replace.hpp>
-#include <cppkafka/cppkafka.h>
-#include <librdkafka/rdkafka.h>
-
-#if USE_KRB5
-#    include <Access/KerberosInit.h>
-#endif // USE_KRB5
-
-namespace ProfileEvents
-{
-extern const Event KafkaConsumerErrors;
-}
-
-namespace DB
-{
-
-using namespace std::chrono_literals;
-
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int SUPPORT_IS_DISABLED;
-}
-
-
-void registerStorageKafka(StorageFactory & factory)
-{
-    auto creator_fn = [](const StorageFactory::Arguments & args) -> std::shared_ptr<IStorage>
-    {
-        ASTs & engine_args = args.engine_args;
-        size_t args_count = engine_args.size();
-        const bool has_settings = args.storage_def->settings;
-
-        auto kafka_settings = std::make_unique<KafkaSettings>();
-        String collection_name;
-        if (auto named_collection = tryGetNamedCollectionWithOverrides(args.engine_args, args.getLocalContext()))
-        {
-            for (const auto & setting : kafka_settings->all())
-            {
-                const auto & setting_name = setting.getName();
-                if (named_collection->has(setting_name))
-                    kafka_settings->set(setting_name, named_collection->get<String>(setting_name));
-            }
-            collection_name = assert_cast<const ASTIdentifier *>(args.engine_args[0].get())->name();
-        }
-
-        if (has_settings)
-        {
-            kafka_settings->loadFromQuery(*args.storage_def);
-        }
-
-// Check arguments and settings
-#define CHECK_KAFKA_STORAGE_ARGUMENT(ARG_NUM, PAR_NAME, EVAL) \
-    /* One of the four required arguments is not specified */ \
-    if (args_count < (ARG_NUM) && (ARG_NUM) <= 4 && !kafka_settings->PAR_NAME.changed) \
-    { \
-        throw Exception( \
-            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, \
-            "Required parameter '{}' " \
-            "for storage Kafka not specified", \
-            #PAR_NAME); \
-    } \
-    if (args_count >= (ARG_NUM)) \
-    { \
-        /* The same argument is given in two places */ \
-        if (has_settings && kafka_settings->PAR_NAME.changed) \
-        { \
-            throw Exception( \
-                ErrorCodes::BAD_ARGUMENTS, \
-                "The argument №{} of storage Kafka " \
-                "and the parameter '{}' " \
-                "in SETTINGS cannot be specified at the same time", \
-                #ARG_NUM, \
-                #PAR_NAME); \
-        } \
-        /* move engine args to settings */ \
-        else \
-        { \
-            if constexpr ((EVAL) == 1) \
-            { \
-                engine_args[(ARG_NUM)-1] = evaluateConstantExpressionAsLiteral(engine_args[(ARG_NUM)-1], args.getLocalContext()); \
-            } \
-            if constexpr ((EVAL) == 2) \
-            { \
-                engine_args[(ARG_NUM)-1] \
-                    = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[(ARG_NUM)-1], args.getLocalContext()); \
-            } \
-            kafka_settings->PAR_NAME = engine_args[(ARG_NUM)-1]->as<ASTLiteral &>().value; \
-        } \
-    }
-
-        /** Arguments of engine is following:
-          * - Kafka broker list
-          * - List of topics
-          * - Group ID (may be a constant expression with a string result)
-          * - Message format (string)
-          * - Row delimiter
-          * - Schema (optional, if the format supports it)
-          * - Number of consumers
-          * - Max block size for background consumption
-          * - Skip (at least) unreadable messages number
-          * - Do intermediate commits when the batch consumed and handled
-          */
-
-        /* 0 = raw, 1 = evaluateConstantExpressionAsLiteral, 2=evaluateConstantExpressionOrIdentifierAsLiteral */
-        /// In case of named collection we already validated the arguments.
-        if (collection_name.empty())
-        {
-            CHECK_KAFKA_STORAGE_ARGUMENT(1, kafka_broker_list, 0)
-            CHECK_KAFKA_STORAGE_ARGUMENT(2, kafka_topic_list, 1)
-            CHECK_KAFKA_STORAGE_ARGUMENT(3, kafka_group_name, 2)
-            CHECK_KAFKA_STORAGE_ARGUMENT(4, kafka_format, 2)
-            CHECK_KAFKA_STORAGE_ARGUMENT(5, kafka_row_delimiter, 2)
-            CHECK_KAFKA_STORAGE_ARGUMENT(6, kafka_schema, 2)
-            CHECK_KAFKA_STORAGE_ARGUMENT(7, kafka_num_consumers, 0)
-            CHECK_KAFKA_STORAGE_ARGUMENT(8, kafka_max_block_size, 0)
-            CHECK_KAFKA_STORAGE_ARGUMENT(9, kafka_skip_broken_messages, 0)
-            CHECK_KAFKA_STORAGE_ARGUMENT(10, kafka_commit_every_batch, 0)
-            CHECK_KAFKA_STORAGE_ARGUMENT(11, kafka_client_id, 2)
-            CHECK_KAFKA_STORAGE_ARGUMENT(12, kafka_poll_timeout_ms, 0)
-            CHECK_KAFKA_STORAGE_ARGUMENT(13, kafka_flush_interval_ms, 0)
-            CHECK_KAFKA_STORAGE_ARGUMENT(14, kafka_thread_per_consumer, 0)
-            CHECK_KAFKA_STORAGE_ARGUMENT(15, kafka_handle_error_mode, 0)
-            CHECK_KAFKA_STORAGE_ARGUMENT(16, kafka_commit_on_select, 0)
-            CHECK_KAFKA_STORAGE_ARGUMENT(17, kafka_max_rows_per_message, 0)
-        }
-
-#undef CHECK_KAFKA_STORAGE_ARGUMENT
-
-        auto num_consumers = kafka_settings->kafka_num_consumers.value;
-        auto max_consumers = std::max<uint32_t>(getNumberOfPhysicalCPUCores(), 16);
-
-        if (!args.getLocalContext()->getSettingsRef().kafka_disable_num_consumers_limit && num_consumers > max_consumers)
-        {
-            throw Exception(
-                ErrorCodes::BAD_ARGUMENTS,
-                "The number of consumers can not be bigger than {}. "
-                "A single consumer can read any number of partitions. "
-                "Extra consumers are relatively expensive, "
-                "and using a lot of them can lead to high memory and CPU usage. "
-                "To achieve better performance "
-                "of getting data from Kafka, consider using a setting kafka_thread_per_consumer=1, "
-                "and ensure you have enough threads "
-                "in MessageBrokerSchedulePool (background_message_broker_schedule_pool_size). "
-                "See also https://clickhouse.com/docs/integrations/kafka/kafka-table-engine#tuning-performance",
-                max_consumers);
-        }
-        else if (num_consumers < 1)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Number of consumers can not be lower than 1");
-        }
-
-        if (kafka_settings->kafka_max_block_size.changed && kafka_settings->kafka_max_block_size.value < 1)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "kafka_max_block_size can not be lower than 1");
-        }
-
-        if (kafka_settings->kafka_poll_max_batch_size.changed && kafka_settings->kafka_poll_max_batch_size.value < 1)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "kafka_poll_max_batch_size can not be lower than 1");
-        }
-        NamesAndTypesList supported_columns;
-        for (const auto & column : args.columns)
-        {
-            if (column.default_desc.kind == ColumnDefaultKind::Alias)
-                supported_columns.emplace_back(column.name, column.type);
-            if (column.default_desc.kind == ColumnDefaultKind::Default && !column.default_desc.expression)
-                supported_columns.emplace_back(column.name, column.type);
-        }
-        // Kafka engine allows only ordinary columns without default expression or alias columns.
-        if (args.columns.getAll() != supported_columns)
-        {
-            throw Exception(
-                ErrorCodes::BAD_ARGUMENTS,
-                "KafkaEngine doesn't support DEFAULT/MATERIALIZED/EPHEMERAL expressions for columns. "
-                "See https://clickhouse.com/docs/en/engines/table-engines/integrations/kafka/#configuration");
-        }
-
-        const auto has_keeper_path = kafka_settings->kafka_keeper_path.changed && !kafka_settings->kafka_keeper_path.value.empty();
-        const auto has_replica_name = kafka_settings->kafka_replica_name.changed && !kafka_settings->kafka_replica_name.value.empty();
-
-        if (!has_keeper_path && !has_replica_name)
-            return std::make_shared<StorageKafka>(
-                args.table_id, args.getContext(), args.columns, args.comment, std::move(kafka_settings), collection_name);
-
-        if (!args.getLocalContext()->getSettingsRef().allow_experimental_kafka_offsets_storage_in_keeper && !args.query.attach)
-            throw Exception(
-                ErrorCodes::SUPPORT_IS_DISABLED,
-                "Storing the Kafka offsets in Keeper is experimental. Set `allow_experimental_kafka_offsets_storage_in_keeper` setting "
-                "to enable it");
-
-        if (!has_keeper_path || !has_replica_name)
-            throw Exception(
-        ErrorCodes::BAD_ARGUMENTS, "Either specify both zookeeper path and replica name or none of them");
-
-        const auto is_on_cluster = args.getLocalContext()->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
-        const auto is_replicated_database = args.getLocalContext()->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY
-            && DatabaseCatalog::instance().getDatabase(args.table_id.database_name)->getEngineName() == "Replicated";
-
-        // UUID macro is only allowed:
-        // - with Atomic database only with ON CLUSTER queries, otherwise it is easy to misuse: each replica would have separate uuid generated.
-        // - with Replicated database
-        // - with attach queries, as those are used on server startup
-        const auto allow_uuid_macro = is_on_cluster || is_replicated_database || args.query.attach;
-
-        auto context = args.getContext();
-        // Unfold {database} and {table} macro on table creation, so table can be renamed.
-        if (args.mode < LoadingStrictnessLevel::ATTACH)
-        {
-            Macros::MacroExpansionInfo info;
-            /// NOTE: it's not recursive
-            info.expand_special_macros_only = true;
-            info.table_id = args.table_id;
-            // We could probably unfold UUID here too, but let's keep it similar to ReplicatedMergeTree, which doesn't do the unfolding.
-            info.table_id.uuid = UUIDHelpers::Nil;
-            kafka_settings->kafka_keeper_path.value = context->getMacros()->expand(kafka_settings->kafka_keeper_path.value, info);
-
-            info.level = 0;
-            kafka_settings->kafka_replica_name.value = context->getMacros()->expand(kafka_settings->kafka_replica_name.value, info);
-        }
-
-
-        auto * settings_query = args.storage_def->settings;
-        chassert(has_settings && "Unexpected settings query in StorageKafka");
-
-        settings_query->changes.setSetting("kafka_keeper_path", kafka_settings->kafka_keeper_path.value);
-        settings_query->changes.setSetting("kafka_replica_name", kafka_settings->kafka_replica_name.value);
-
-        // Expand other macros (such as {replica}). We do not expand them on previous step to make possible copying metadata files between replicas.
-        // Disable expanding {shard} macro, because it can lead to incorrect behavior and it doesn't make sense to shard Kafka tables.
-        Macros::MacroExpansionInfo info;
-        info.table_id = args.table_id;
-        if (is_replicated_database)
-        {
-            auto database = DatabaseCatalog::instance().getDatabase(args.table_id.database_name);
-            info.shard.reset();
-            info.replica = getReplicatedDatabaseReplicaName(database);
-        }
-        if (!allow_uuid_macro)
-            info.table_id.uuid = UUIDHelpers::Nil;
-        kafka_settings->kafka_keeper_path.value = context->getMacros()->expand(kafka_settings->kafka_keeper_path.value, info);
-
-        info.level = 0;
-        info.table_id.uuid = UUIDHelpers::Nil;
-        kafka_settings->kafka_replica_name.value = context->getMacros()->expand(kafka_settings->kafka_replica_name.value, info);
-
-        return std::make_shared<StorageKafka2>(
-            args.table_id, args.getContext(), args.columns, args.comment, std::move(kafka_settings), collection_name);
-    };
-
-    factory.registerStorage(
-        "Kafka",
-        creator_fn,
-        StorageFactory::StorageFeatures{
-            .supports_settings = true,
-        });
-}
-
-namespace StorageKafkaUtils
-{
-Names parseTopics(String topic_list)
-{
-    Names result;
-    boost::split(result, topic_list, [](char c) { return c == ','; });
-    for (String & topic : result)
-        boost::trim(topic);
-    return result;
-}
-
-String getDefaultClientId(const StorageID & table_id)
-{
-    return fmt::format("{}-{}-{}-{}", VERSION_NAME, getFQDNOrHostName(), table_id.database_name, table_id.table_name);
-}
-
-void drainConsumer(
-    cppkafka::Consumer & consumer, const std::chrono::milliseconds drain_timeout, const LoggerPtr & log, ErrorHandler error_handler)
-{
-    auto start_time = std::chrono::steady_clock::now();
-    cppkafka::Error last_error(RD_KAFKA_RESP_ERR_NO_ERROR);
-
-    while (true)
-    {
-        auto msg = consumer.poll(100ms);
-        if (!msg)
-            break;
-
-        auto error = msg.get_error();
-
-        if (error)
-        {
-            if (msg.is_eof() || error == last_error)
-            {
-                break;
-            }
-            else
-            {
-                LOG_ERROR(log, "Error during draining: {}", error);
-                error_handler(error);
-            }
-        }
-
-        // i don't stop draining on first error,
-        // only if it repeats once again sequentially
-        last_error = error;
-
-        auto ts = std::chrono::steady_clock::now();
-        if (std::chrono::duration_cast<std::chrono::milliseconds>(ts - start_time) > drain_timeout)
-        {
-            LOG_ERROR(log, "Timeout during draining.");
-            break;
-        }
-    }
-}
-
-void eraseMessageErrors(Messages & messages, const LoggerPtr & log, ErrorHandler error_handler)
-{
-    size_t skipped = std::erase_if(
-        messages,
-        [&](auto & message)
-        {
-            if (auto error = message.get_error())
-            {
-                ProfileEvents::increment(ProfileEvents::KafkaConsumerErrors);
-                LOG_ERROR(log, "Consumer error: {}", error);
-                error_handler(error);
-                return true;
-            }
-            return false;
-        });
-
-    if (skipped)
-        LOG_ERROR(log, "There were {} messages with an error", skipped);
-}
-
-SettingsChanges createSettingsAdjustments(KafkaSettings & kafka_settings, const String & schema_name)
-{
-    SettingsChanges result;
-    // Needed for backward compatibility
-    if (!kafka_settings.input_format_skip_unknown_fields.changed)
-    {
-        // Always skip unknown fields regardless of the context (JSON or TSKV)
-        kafka_settings.input_format_skip_unknown_fields = true;
-    }
-
-    if (!kafka_settings.input_format_allow_errors_ratio.changed)
-    {
-        kafka_settings.input_format_allow_errors_ratio = 0.;
-    }
-
-    if (!kafka_settings.input_format_allow_errors_num.changed)
-    {
-        kafka_settings.input_format_allow_errors_num = kafka_settings.kafka_skip_broken_messages.value;
-    }
-
-    if (!schema_name.empty())
-        result.emplace_back("format_schema", schema_name);
-
-    for (const auto & setting : kafka_settings)
-    {
-        const auto & name = setting.getName();
-        if (name.find("kafka_") == std::string::npos)
-            result.emplace_back(name, setting.getValue());
-    }
-    return result;
-}
-
-
-bool checkDependencies(const StorageID & table_id, const ContextPtr& context)
-{
-    // Check if all dependencies are attached
-    auto view_ids = DatabaseCatalog::instance().getDependentViews(table_id);
-    if (view_ids.empty())
-        return true;
-
-    // Check the dependencies are ready?
-    for (const auto & view_id : view_ids)
-    {
-        auto view = DatabaseCatalog::instance().tryGetTable(view_id, context);
-        if (!view)
-            return false;
-
-        // If it materialized view, check it's target table
-        auto * materialized_view = dynamic_cast<StorageMaterializedView *>(view.get());
-        if (materialized_view && !materialized_view->tryGetTargetTable())
-            return false;
-
-        // Check all its dependencies
-        if (!checkDependencies(view_id, context))
-            return false;
-    }
-
-    return true;
-}
-
-
-VirtualColumnsDescription 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;
-}
-}
-}
diff --git a/src/Storages/Kafka/StorageKafkaUtils.h b/src/Storages/Kafka/StorageKafkaUtils.h
deleted file mode 100644
index cc956dde78d..00000000000
--- a/src/Storages/Kafka/StorageKafkaUtils.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#pragma once
-
-#include <chrono>
-#include <Core/Names.h>
-#include <Interpreters/Context_fwd.h>
-#include <Interpreters/StorageID.h>
-#include <base/types.h>
-#include <cppkafka/configuration.h>
-#include <cppkafka/cppkafka.h>
-#include <cppkafka/topic_partition.h>
-#include <fmt/ostream.h>
-#include <Core/SettingsEnums.h>
-#include <librdkafka/rdkafka.h>
-#include <Common/SettingsChanges.h>
-
-namespace Poco
-{
-namespace Util
-{
-    class AbstractConfiguration;
-}
-}
-
-namespace DB
-{
-
-class VirtualColumnsDescription;
-struct KafkaSettings;
-
-namespace StorageKafkaUtils
-{
-Names parseTopics(String topic_list);
-String getDefaultClientId(const StorageID & table_id);
-
-using ErrorHandler = std::function<void(const cppkafka::Error &)>;
-
-void drainConsumer(
-    cppkafka::Consumer & consumer,
-    std::chrono::milliseconds drain_timeout,
-    const LoggerPtr & log,
-    ErrorHandler error_handler = [](const cppkafka::Error & /*err*/) {});
-
-using Messages = std::vector<cppkafka::Message>;
-void eraseMessageErrors(Messages & messages, const LoggerPtr & log, ErrorHandler error_handler = [](const cppkafka::Error & /*err*/) {});
-
-SettingsChanges createSettingsAdjustments(KafkaSettings & kafka_settings, const String & schema_name);
-
-bool checkDependencies(const StorageID & table_id, const ContextPtr& context);
-
-VirtualColumnsDescription createVirtuals(StreamingHandleErrorMode handle_error_mode);
-}
-}
-
-template <>
-struct fmt::formatter<cppkafka::TopicPartition> : fmt::ostream_formatter
-{
-};
-template <>
-struct fmt::formatter<cppkafka::Error> : fmt::ostream_formatter
-{
-};
diff --git a/src/Storages/Kafka/parseSyslogLevel.cpp b/src/Storages/Kafka/parseSyslogLevel.cpp
index 828cffc311b..43630a5001f 100644
--- a/src/Storages/Kafka/parseSyslogLevel.cpp
+++ b/src/Storages/Kafka/parseSyslogLevel.cpp
@@ -1,5 +1,4 @@
-#include <Storages/Kafka/parseSyslogLevel.h>
-
+#include "parseSyslogLevel.h"
 #include <sys/syslog.h>
 
 /// Must be in a separate compilation unit due to macros overlaps:
diff --git a/src/Storages/KeyDescription.cpp b/src/Storages/KeyDescription.cpp
index 7e43966556e..2a697fa5654 100644
--- a/src/Storages/KeyDescription.cpp
+++ b/src/Storages/KeyDescription.cpp
@@ -160,7 +160,7 @@ KeyDescription KeyDescription::buildEmptyKey()
 {
     KeyDescription result;
     result.expression_list_ast = std::make_shared<ASTExpressionList>();
-    result.expression = std::make_shared<ExpressionActions>(ActionsDAG(), ExpressionActionsSettings{});
+    result.expression = std::make_shared<ExpressionActions>(std::make_shared<ActionsDAG>(), ExpressionActionsSettings{});
     return result;
 }
 
diff --git a/src/Storages/LiveView/LiveViewEventsSource.h b/src/Storages/LiveView/LiveViewEventsSource.h
index 4210acbc5bc..de10a98e1a2 100644
--- a/src/Storages/LiveView/LiveViewEventsSource.h
+++ b/src/Storages/LiveView/LiveViewEventsSource.h
@@ -54,7 +54,7 @@ public:
 
     String getName() const override { return "LiveViewEventsSource"; }
 
-    void onCancel() noexcept override
+    void onCancel() override
     {
         if (storage->shutdown_called)
             return;
diff --git a/src/Storages/LiveView/LiveViewSource.h b/src/Storages/LiveView/LiveViewSource.h
index 81dd5620e57..f8b428fc04d 100644
--- a/src/Storages/LiveView/LiveViewSource.h
+++ b/src/Storages/LiveView/LiveViewSource.h
@@ -36,7 +36,7 @@ public:
 
     String getName() const override { return "LiveViewSource"; }
 
-    void onCancel() noexcept override
+    void onCancel() override
     {
         if (storage->shutdown_called)
             return;
diff --git a/src/Storages/MaterializedView/RefreshSet.cpp b/src/Storages/MaterializedView/RefreshSet.cpp
index 7536f59c1e4..a3ef327dc24 100644
--- a/src/Storages/MaterializedView/RefreshSet.cpp
+++ b/src/Storages/MaterializedView/RefreshSet.cpp
@@ -9,6 +9,11 @@ namespace CurrentMetrics
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 RefreshSet::Handle::Handle(Handle && other) noexcept
 {
     *this = std::move(other);
@@ -22,7 +27,6 @@ RefreshSet::Handle & RefreshSet::Handle::operator=(Handle && other) noexcept
     parent_set = std::exchange(other.parent_set, nullptr);
     id = std::move(other.id);
     dependencies = std::move(other.dependencies);
-    iter = std::move(other.iter);
     metric_increment = std::move(other.metric_increment);
     return *this;
 }
@@ -35,21 +39,21 @@ RefreshSet::Handle::~Handle()
 void RefreshSet::Handle::rename(StorageID new_id)
 {
     std::lock_guard lock(parent_set->mutex);
-    RefreshTaskHolder task = *iter;
-    parent_set->removeDependenciesLocked(task, dependencies);
-    parent_set->removeTaskLocked(id, iter);
+    parent_set->removeDependenciesLocked(id, dependencies);
+    auto it = parent_set->tasks.find(id);
+    auto task = it->second;
+    parent_set->tasks.erase(it);
     id = new_id;
-    iter = parent_set->addTaskLocked(id, task);
-    parent_set->addDependenciesLocked(task, dependencies);
+    parent_set->tasks.emplace(id, task);
+    parent_set->addDependenciesLocked(id, dependencies);
 }
 
 void RefreshSet::Handle::changeDependencies(std::vector<StorageID> deps)
 {
     std::lock_guard lock(parent_set->mutex);
-    RefreshTaskHolder task = *iter;
-    parent_set->removeDependenciesLocked(task, dependencies);
+    parent_set->removeDependenciesLocked(id, dependencies);
     dependencies = std::move(deps);
-    parent_set->addDependenciesLocked(task, dependencies);
+    parent_set->addDependenciesLocked(id, dependencies);
 }
 
 void RefreshSet::Handle::reset()
@@ -59,8 +63,8 @@ void RefreshSet::Handle::reset()
 
     {
         std::lock_guard lock(parent_set->mutex);
-        parent_set->removeDependenciesLocked(*iter, dependencies);
-        parent_set->removeTaskLocked(id, iter);
+        parent_set->removeDependenciesLocked(id, dependencies);
+        parent_set->tasks.erase(id);
     }
 
     parent_set = nullptr;
@@ -72,50 +76,37 @@ RefreshSet::RefreshSet() = default;
 void RefreshSet::emplace(StorageID id, const std::vector<StorageID> & dependencies, RefreshTaskHolder task)
 {
     std::lock_guard guard(mutex);
-    const auto iter = addTaskLocked(id, task);
-    addDependenciesLocked(task, dependencies);
+    auto [it, is_inserted] = tasks.emplace(id, task);
+    if (!is_inserted)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Refresh set entry already exists for table {}", id.getFullTableName());
+    addDependenciesLocked(id, dependencies);
 
-    task->setRefreshSetHandleUnlock(Handle(this, id, iter, dependencies));
+    task->setRefreshSetHandleUnlock(Handle(this, id, dependencies));
 }
 
-RefreshTaskList::iterator RefreshSet::addTaskLocked(StorageID id, RefreshTaskHolder task)
-{
-    RefreshTaskList & list = tasks[id];
-    list.push_back(task);
-    return std::prev(list.end());
-}
-
-void RefreshSet::removeTaskLocked(StorageID id, RefreshTaskList::iterator iter)
-{
-    const auto it = tasks.find(id);
-    it->second.erase(iter);
-    if (it->second.empty())
-        tasks.erase(it);
-}
-
-void RefreshSet::addDependenciesLocked(RefreshTaskHolder task, const std::vector<StorageID> & dependencies)
+void RefreshSet::addDependenciesLocked(const StorageID & id, const std::vector<StorageID> & dependencies)
 {
     for (const StorageID & dep : dependencies)
-        dependents[dep].insert(task);
+        dependents[dep].insert(id);
 }
 
-void RefreshSet::removeDependenciesLocked(RefreshTaskHolder task, const std::vector<StorageID> & dependencies)
+void RefreshSet::removeDependenciesLocked(const StorageID & id, const std::vector<StorageID> & dependencies)
 {
     for (const StorageID & dep : dependencies)
     {
         auto & set = dependents[dep];
-        set.erase(task);
+        set.erase(id);
         if (set.empty())
             dependents.erase(dep);
     }
 }
 
-RefreshTaskList RefreshSet::findTasks(const StorageID & id) const
+RefreshTaskHolder RefreshSet::getTask(const StorageID & id) const
 {
     std::lock_guard lock(mutex);
-    if (auto it = tasks.find(id); it != tasks.end())
-        return it->second;
-    return {};
+    if (auto task = tasks.find(id); task != tasks.end())
+        return task->second;
+    return nullptr;
 }
 
 RefreshSet::InfoContainer RefreshSet::getInfo() const
@@ -125,23 +116,26 @@ RefreshSet::InfoContainer RefreshSet::getInfo() const
     lock.unlock();
 
     InfoContainer res;
-    for (const auto & [id, list] : tasks_copy)
-        for (const auto & task : list)
-            res.push_back(task->getInfo());
+    for (const auto & [id, task] : tasks_copy)
+        res.push_back(task->getInfo());
     return res;
 }
 
 std::vector<RefreshTaskHolder> RefreshSet::getDependents(const StorageID & id) const
 {
     std::lock_guard lock(mutex);
+    std::vector<RefreshTaskHolder> res;
     auto it = dependents.find(id);
     if (it == dependents.end())
         return {};
-    return std::vector<RefreshTaskHolder>(it->second.begin(), it->second.end());
+    for (const StorageID & dep_id : it->second)
+        if (auto task = tasks.find(dep_id); task != tasks.end())
+            res.push_back(task->second);
+    return res;
 }
 
-RefreshSet::Handle::Handle(RefreshSet * parent_set_, StorageID id_, RefreshTaskList::iterator iter_, std::vector<StorageID> dependencies_)
+RefreshSet::Handle::Handle(RefreshSet * parent_set_, StorageID id_, std::vector<StorageID> dependencies_)
     : parent_set(parent_set_), id(std::move(id_)), dependencies(std::move(dependencies_))
-    , iter(iter_), metric_increment(CurrentMetrics::Increment(CurrentMetrics::RefreshableViews)) {}
+    , metric_increment(CurrentMetrics::Increment(CurrentMetrics::RefreshableViews)) {}
 
 }
diff --git a/src/Storages/MaterializedView/RefreshSet.h b/src/Storages/MaterializedView/RefreshSet.h
index 6141a69996a..eff445023a6 100644
--- a/src/Storages/MaterializedView/RefreshSet.h
+++ b/src/Storages/MaterializedView/RefreshSet.h
@@ -5,12 +5,13 @@
 #include <Storages/IStorage.h>
 #include <Storages/MaterializedView/RefreshTask_fwd.h>
 #include <Common/CurrentMetrics.h>
-#include <list>
 
 namespace DB
 {
 
-enum class RefreshState
+using DatabaseAndTableNameSet = std::unordered_set<StorageID, StorageID::DatabaseAndTableNameHash, StorageID::DatabaseAndTableNameEqual>;
+
+enum class RefreshState : RefreshTaskStateUnderlying
 {
     Disabled = 0,
     Scheduled,
@@ -18,11 +19,11 @@ enum class RefreshState
     Running,
 };
 
-enum class LastRefreshResult
+enum class LastRefreshResult : RefreshTaskStateUnderlying
 {
     Unknown = 0,
     Cancelled,
-    Error,
+    Exception,
     Finished
 };
 
@@ -36,8 +37,7 @@ struct RefreshInfo
     UInt64 last_attempt_duration_ms = 0;
     UInt32 next_refresh_time = 0;
     UInt64 refresh_count = 0;
-    UInt64 retry = 0;
-    String exception_message; // if last_refresh_result is Error
+    String exception_message; // if last_refresh_result is Exception
     std::vector<StorageID> remaining_dependencies;
     ProgressValues progress;
 };
@@ -46,7 +46,8 @@ struct RefreshInfo
 class RefreshSet
 {
 public:
-    /// RAII thing that unregisters a task and its dependencies in destructor. Not thread safe.
+    /// RAII thing that unregisters a task and its dependencies in destructor.
+    /// Storage IDs must be unique. Not thread safe.
     class Handle
     {
         friend class RefreshSet;
@@ -72,10 +73,9 @@ public:
         RefreshSet * parent_set = nullptr;
         StorageID id = StorageID::createEmpty();
         std::vector<StorageID> dependencies;
-        RefreshTaskList::iterator iter; // in parent_set->tasks[id]
         std::optional<CurrentMetrics::Increment> metric_increment;
 
-        Handle(RefreshSet * parent_set_, StorageID id_, RefreshTaskList::iterator iter_, std::vector<StorageID> dependencies_);
+        Handle(RefreshSet * parent_set_, StorageID id_, std::vector<StorageID> dependencies_);
     };
 
     using InfoContainer = std::vector<RefreshInfo>;
@@ -84,9 +84,7 @@ public:
 
     void emplace(StorageID id, const std::vector<StorageID> & dependencies, RefreshTaskHolder task);
 
-    /// Finds active refreshable view(s) by database and table name.
-    /// Normally there's at most one, but we allow name collisions here, just in case.
-    RefreshTaskList findTasks(const StorageID & id) const;
+    RefreshTaskHolder getTask(const StorageID & id) const;
 
     InfoContainer getInfo() const;
 
@@ -94,8 +92,8 @@ public:
     std::vector<RefreshTaskHolder> getDependents(const StorageID & id) const;
 
 private:
-    using TaskMap = std::unordered_map<StorageID, RefreshTaskList, StorageID::DatabaseAndTableNameHash, StorageID::DatabaseAndTableNameEqual>;
-    using DependentsMap = std::unordered_map<StorageID, std::unordered_set<RefreshTaskHolder>, StorageID::DatabaseAndTableNameHash, StorageID::DatabaseAndTableNameEqual>;
+    using TaskMap = std::unordered_map<StorageID, RefreshTaskHolder, StorageID::DatabaseAndTableNameHash, StorageID::DatabaseAndTableNameEqual>;
+    using DependentsMap = std::unordered_map<StorageID, DatabaseAndTableNameSet, StorageID::DatabaseAndTableNameHash, StorageID::DatabaseAndTableNameEqual>;
 
     /// Protects the two maps below, not locked for any nontrivial operations (e.g. operations that
     /// block or lock other mutexes).
@@ -104,10 +102,8 @@ private:
     TaskMap tasks;
     DependentsMap dependents;
 
-    RefreshTaskList::iterator addTaskLocked(StorageID id, RefreshTaskHolder task);
-    void removeTaskLocked(StorageID id, RefreshTaskList::iterator iter);
-    void addDependenciesLocked(RefreshTaskHolder task, const std::vector<StorageID> & dependencies);
-    void removeDependenciesLocked(RefreshTaskHolder task, const std::vector<StorageID> & dependencies);
+    void addDependenciesLocked(const StorageID & id, const std::vector<StorageID> & dependencies);
+    void removeDependenciesLocked(const StorageID & id, const std::vector<StorageID> & dependencies);
 };
 
 }
diff --git a/src/Storages/MaterializedView/RefreshSettings.h b/src/Storages/MaterializedView/RefreshSettings.h
index 23676538788..814c7e52b32 100644
--- a/src/Storages/MaterializedView/RefreshSettings.h
+++ b/src/Storages/MaterializedView/RefreshSettings.h
@@ -6,10 +6,8 @@ namespace DB
 {
 
 #define LIST_OF_REFRESH_SETTINGS(M, ALIAS) \
-    M(Int64, refresh_retries, 0, "How many times to retry refresh query if it fails. If all attempts fail, wait for the next refresh time according to schedule. 0 to disable retries. -1 for infinite retries.", 0) \
-    M(UInt64, refresh_retry_initial_backoff_ms, 100, "Delay before the first retry if refresh query fails (if refresh_retries setting is not zero). Each subsequent retry doubles the delay, up to refresh_retry_max_backoff_ms.", 0) \
-    M(UInt64, refresh_retry_max_backoff_ms, 60'000, "Limit on the exponential growth of delay between refresh attempts, if they keep failing and refresh_retries is positive.", 0) \
-
+    /// TODO: Add settings
+    ///       M(UInt64, name, 42, "...", 0)
 
 DECLARE_SETTINGS_TRAITS(RefreshSettingsTraits, LIST_OF_REFRESH_SETTINGS)
 
diff --git a/src/Storages/MaterializedView/RefreshTask.cpp b/src/Storages/MaterializedView/RefreshTask.cpp
index ed5a6652288..13394690227 100644
--- a/src/Storages/MaterializedView/RefreshTask.cpp
+++ b/src/Storages/MaterializedView/RefreshTask.cpp
@@ -1,5 +1,7 @@
 #include <Storages/MaterializedView/RefreshTask.h>
 
+#include <Storages/StorageMaterializedView.h>
+
 #include <Common/CurrentMetrics.h>
 #include <Core/Settings.h>
 #include <Interpreters/Context.h>
@@ -9,7 +11,6 @@
 #include <Parsers/ASTCreateQuery.h>
 #include <Processors/Executors/PipelineExecutor.h>
 #include <QueryPipeline/ReadProgressCallback.h>
-#include <Storages/StorageMaterializedView.h>
 
 namespace CurrentMetrics
 {
@@ -23,42 +24,43 @@ namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int QUERY_WAS_CANCELLED;
-    extern const int REFRESH_FAILED;
 }
 
 RefreshTask::RefreshTask(
-    StorageMaterializedView * view_, const DB::ASTRefreshStrategy & strategy)
+    const ASTRefreshStrategy & strategy)
     : log(getLogger("RefreshTask"))
-    , view(view_)
     , refresh_schedule(strategy)
-    , refresh_append(strategy.append)
-{
-    if (strategy.settings != nullptr)
-        refresh_settings.applyChanges(strategy.settings->changes);
-}
+{}
 
-OwnedRefreshTask RefreshTask::create(
-    StorageMaterializedView * view,
+RefreshTaskHolder RefreshTask::create(
+    const StorageMaterializedView & view,
     ContextMutablePtr context,
     const DB::ASTRefreshStrategy & strategy)
 {
-    auto task = std::make_shared<RefreshTask>(view, strategy);
+    auto task = std::make_shared<RefreshTask>(strategy);
 
-    task->refresh_task = context->getSchedulePool().createTask("RefreshTask",
-        [self = task.get()] { self->refreshTask(); });
+    task->refresh_task = context->getSchedulePool().createTask("MaterializedViewRefresherTask",
+        [self = task->weak_from_this()]
+        {
+            if (auto t = self.lock())
+                t->refreshTask();
+        });
 
+    std::vector<StorageID> deps;
     if (strategy.dependencies)
         for (auto && dependency : strategy.dependencies->children)
-            task->initial_dependencies.emplace_back(dependency->as<const ASTTableIdentifier &>());
+            deps.emplace_back(dependency->as<const ASTTableIdentifier &>());
 
-    return OwnedRefreshTask(task);
+    context->getRefreshSet().emplace(view.getStorageID(), deps, task);
+
+    return task;
 }
 
-void RefreshTask::initializeAndStart()
+void RefreshTask::initializeAndStart(std::shared_ptr<StorageMaterializedView> view)
 {
+    view_to_refresh = view;
     if (view->getContext()->getSettingsRef().stop_refreshable_materialized_views_on_startup)
         stop_requested = true;
-    view->getContext()->getRefreshSet().emplace(view->getStorageID(), initial_dependencies, shared_from_this());
     populateDependencies();
     advanceNextRefreshTime(currentTime());
     refresh_task->schedule();
@@ -67,8 +69,7 @@ void RefreshTask::initializeAndStart()
 void RefreshTask::rename(StorageID new_id)
 {
     std::lock_guard guard(mutex);
-    if (set_handle)
-        set_handle.rename(new_id);
+    set_handle.rename(new_id);
 }
 
 void RefreshTask::alterRefreshParams(const DB::ASTRefreshStrategy & new_strategy)
@@ -103,11 +104,7 @@ void RefreshTask::alterRefreshParams(const DB::ASTRefreshStrategy & new_strategy
         if (arriveDependency(id) && !std::exchange(refresh_immediately, true))
             refresh_task->schedule();
 
-    refresh_settings = {};
-    if (new_strategy.settings != nullptr)
-        refresh_settings.applyChanges(new_strategy.settings->changes);
-
-    refresh_append = new_strategy.append;
+    /// TODO: Update settings once we have them.
 }
 
 RefreshInfo RefreshTask::getInfo() const
@@ -116,7 +113,7 @@ RefreshInfo RefreshTask::getInfo() const
     auto res = info;
     res.view_id = set_handle.getID();
     res.remaining_dependencies.assign(remaining_dependencies.begin(), remaining_dependencies.end());
-    if (res.last_refresh_result != LastRefreshResult::Error)
+    if (res.last_refresh_result != LastRefreshResult::Exception)
         res.exception_message.clear();
     res.progress = progress.getValues();
     return res;
@@ -144,8 +141,6 @@ void RefreshTask::run()
     std::lock_guard guard(mutex);
     if (std::exchange(refresh_immediately, true))
         return;
-    next_refresh_prescribed = std::chrono::floor<std::chrono::seconds>(currentTime());
-    next_refresh_actual = currentTime();
     refresh_task->schedule();
 }
 
@@ -156,22 +151,10 @@ void RefreshTask::cancel()
     refresh_task->schedule();
 }
 
-void RefreshTask::wait()
-{
-    std::unique_lock lock(mutex);
-    refresh_cv.wait(lock, [&] { return info.state != RefreshState::Running && !refresh_immediately; });
-    if (info.last_refresh_result == LastRefreshResult::Error)
-        throw Exception(ErrorCodes::REFRESH_FAILED, "Refresh failed: {}", info.exception_message);
-}
-
 void RefreshTask::shutdown()
 {
     {
         std::lock_guard guard(mutex);
-
-        if (view == nullptr)
-            return; // already shut down
-
         stop_requested = true;
         interruptExecution();
     }
@@ -185,8 +168,6 @@ void RefreshTask::shutdown()
     /// (Also, RefreshSet holds a shared_ptr to us.)
     std::lock_guard guard(mutex);
     set_handle.reset();
-
-    view = nullptr;
 }
 
 void RefreshTask::notify(const StorageID & parent_id, std::chrono::sys_seconds parent_next_prescribed_time)
@@ -253,7 +234,6 @@ void RefreshTask::refreshTask()
             chassert(lock.owns_lock());
 
             interrupt_execution.store(false);
-            refresh_cv.notify_all(); // we'll assign info.state before unlocking the mutex
 
             if (stop_requested)
             {
@@ -265,7 +245,7 @@ void RefreshTask::refreshTask()
             if (!refresh_immediately)
             {
                 auto now = currentTime();
-                if (now >= next_refresh_actual)
+                if (now >= next_refresh_with_spread)
                 {
                     if (arriveTime())
                         refresh_immediately = true;
@@ -278,7 +258,7 @@ void RefreshTask::refreshTask()
                 else
                 {
                     size_t delay_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
-                        next_refresh_actual - now).count();
+                        next_refresh_with_spread - now).count();
 
                     /// If we're in a test that fakes the clock, poll every 100ms.
                     if (fake_clock.load(std::memory_order_relaxed) != INT64_MIN)
@@ -292,9 +272,19 @@ void RefreshTask::refreshTask()
 
             /// Perform a refresh.
 
-            bool append = refresh_append;
             refresh_immediately = false;
+
+            auto view = lockView();
+            if (!view)
+            {
+                /// The view was dropped. This RefreshTask should be destroyed soon too.
+                /// (Maybe this is unreachable.)
+                info.state = RefreshState::Disabled;
+                break;
+            }
+
             info.state = RefreshState::Running;
+
             CurrentMetrics::Increment metric_inc(CurrentMetrics::RefreshingViews);
 
             lock.unlock();
@@ -305,13 +295,19 @@ void RefreshTask::refreshTask()
 
             try
             {
-                executeRefreshUnlocked(append);
+                executeRefreshUnlocked(view);
                 refreshed = true;
             }
             catch (...)
             {
                 if (!interrupt_execution.load())
-                    exception = getCurrentExceptionMessage(true);
+                {
+                    PreformattedMessage message = getCurrentExceptionMessageAndPattern(true);
+                    auto text = message.text;
+                    message.text = fmt::format("Refresh failed: {}", message.text);
+                    LOG_ERROR(log, message);
+                    exception = text;
+                }
             }
 
             lock.lock();
@@ -323,18 +319,18 @@ void RefreshTask::refreshTask()
 
             if (exception)
             {
-                info.last_refresh_result = LastRefreshResult::Error;
+                info.last_refresh_result = LastRefreshResult::Exception;
                 info.exception_message = *exception;
-                Int64 attempt_number = num_retries + 1;
-                scheduleRetryOrSkipToNextRefresh(now);
-                LOG_ERROR(log, "Refresh view {} failed (attempt {}/{}): {}", view->getStorageID().getFullTableName(), attempt_number, refresh_settings.refresh_retries + 1, *exception);
+
+                /// TODO: Do a few retries with exponential backoff.
+                advanceNextRefreshTime(now);
             }
             else if (!refreshed)
             {
                 info.last_refresh_result = LastRefreshResult::Cancelled;
 
                 /// Make sure we don't just start another refresh immediately.
-                if (!stop_requested)
+                if (!stop_requested && now >= next_refresh_with_spread)
                     advanceNextRefreshTime(now);
             }
             else
@@ -367,18 +363,17 @@ void RefreshTask::refreshTask()
     }
 }
 
-void RefreshTask::executeRefreshUnlocked(bool append)
+void RefreshTask::executeRefreshUnlocked(std::shared_ptr<StorageMaterializedView> view)
 {
     LOG_DEBUG(log, "Refreshing view {}", view->getStorageID().getFullTableName());
     progress.reset();
 
-    ContextMutablePtr refresh_context = view->createRefreshContext();
-    std::optional<StorageID> table_to_drop;
+    /// Create a table.
+    auto [refresh_context, refresh_query] = view->prepareRefresh();
+
+    StorageID stale_table = StorageID::createEmpty();
     try
     {
-        /// Create a table.
-        auto refresh_query = view->prepareRefresh(append, refresh_context, table_to_drop);
-
         /// Run the query.
         {
             CurrentThread::QueryScope query_scope(refresh_context); // create a thread group for the query
@@ -436,55 +431,37 @@ void RefreshTask::executeRefreshUnlocked(bool append)
         }
 
         /// Exchange tables.
-        if (!append)
-            table_to_drop = view->exchangeTargetTable(refresh_query->table_id, refresh_context);
+        stale_table = view->exchangeTargetTable(refresh_query->table_id, refresh_context);
     }
     catch (...)
     {
-        if (table_to_drop.has_value())
-            view->dropTempTable(table_to_drop.value(), refresh_context);
+        try
+        {
+            InterpreterDropQuery::executeDropQuery(
+                ASTDropQuery::Kind::Drop, view->getContext(), refresh_context, refresh_query->table_id, /*sync*/ false, /*ignore_sync_setting*/ true);
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, "Failed to drop temporary table after a failed refresh");
+            /// Let's ignore this and keep going, at risk of accumulating many trash tables if this keeps happening.
+        }
         throw;
     }
 
-    if (table_to_drop.has_value())
-        view->dropTempTable(table_to_drop.value(), refresh_context);
+    /// Drop the old table (outside the try-catch so we don't try to drop the other table if this fails).
+    InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind::Drop, view->getContext(), refresh_context, stale_table, /*sync*/ true, /*ignore_sync_setting*/ true);
 }
 
 void RefreshTask::advanceNextRefreshTime(std::chrono::system_clock::time_point now)
 {
     std::chrono::sys_seconds next = refresh_schedule.prescribeNext(next_refresh_prescribed, now);
     next_refresh_prescribed = next;
-    next_refresh_actual = refresh_schedule.addRandomSpread(next);
+    next_refresh_with_spread = refresh_schedule.addRandomSpread(next);
 
-    num_retries = 0;
-    info.retry = num_retries;
-
-    auto secs = std::chrono::floor<std::chrono::seconds>(next_refresh_actual);
+    auto secs = std::chrono::floor<std::chrono::seconds>(next_refresh_with_spread);
     info.next_refresh_time = UInt32(secs.time_since_epoch().count());
 }
 
-void RefreshTask::scheduleRetryOrSkipToNextRefresh(std::chrono::system_clock::time_point now)
-{
-    if (refresh_settings.refresh_retries >= 0 && num_retries >= refresh_settings.refresh_retries)
-    {
-        advanceNextRefreshTime(now);
-        return;
-    }
-
-    num_retries += 1;
-    info.retry = num_retries;
-
-    UInt64 delay_ms;
-    UInt64 multiplier = UInt64(1) << std::min(num_retries - 1, Int64(62));
-    /// Overflow check: a*b <= c iff a <= c/b iff a <= floor(c/b).
-    if (refresh_settings.refresh_retry_initial_backoff_ms <= refresh_settings.refresh_retry_max_backoff_ms / multiplier)
-        delay_ms = refresh_settings.refresh_retry_initial_backoff_ms * multiplier;
-    else
-        delay_ms = refresh_settings.refresh_retry_max_backoff_ms;
-
-    next_refresh_actual = now + std::chrono::milliseconds(delay_ms);
-}
-
 bool RefreshTask::arriveDependency(const StorageID & parent)
 {
     remaining_dependencies.erase(parent);
@@ -525,6 +502,11 @@ void RefreshTask::interruptExecution()
     }
 }
 
+std::shared_ptr<StorageMaterializedView> RefreshTask::lockView()
+{
+    return std::static_pointer_cast<StorageMaterializedView>(view_to_refresh.lock());
+}
+
 std::chrono::system_clock::time_point RefreshTask::currentTime() const
 {
     Int64 fake = fake_clock.load(std::memory_order::relaxed);
diff --git a/src/Storages/MaterializedView/RefreshTask.h b/src/Storages/MaterializedView/RefreshTask.h
index ad9d949e18e..1f050a97cd9 100644
--- a/src/Storages/MaterializedView/RefreshTask.h
+++ b/src/Storages/MaterializedView/RefreshTask.h
@@ -17,21 +17,20 @@ class PipelineExecutor;
 
 class StorageMaterializedView;
 class ASTRefreshStrategy;
-struct OwnedRefreshTask;
 
 class RefreshTask : public std::enable_shared_from_this<RefreshTask>
 {
 public:
     /// Never call it manually, public for shared_ptr construction only
-    RefreshTask(StorageMaterializedView * view_, const ASTRefreshStrategy & strategy);
+    explicit RefreshTask(const ASTRefreshStrategy & strategy);
 
     /// The only proper way to construct task
-    static OwnedRefreshTask create(
-        StorageMaterializedView * view,
+    static RefreshTaskHolder create(
+        const StorageMaterializedView & view,
         ContextMutablePtr context,
         const DB::ASTRefreshStrategy & strategy);
 
-    void initializeAndStart(); // called at most once
+    void initializeAndStart(std::shared_ptr<StorageMaterializedView> view);
 
     /// Call when renaming the materialized view.
     void rename(StorageID new_id);
@@ -53,14 +52,7 @@ public:
     /// Cancel task execution
     void cancel();
 
-    /// Waits for the currently running refresh attempt to complete.
-    /// If the refresh fails, throws an exception.
-    /// If no refresh is running, completes immediately, throwing an exception if previous refresh failed.
-    void wait();
-
     /// Permanently disable task scheduling and remove this table from RefreshSet.
-    /// Ok to call multiple times, but not in parallel.
-    /// Ok to call even if initializeAndStart() wasn't called or failed.
     void shutdown();
 
     /// Notify dependent task
@@ -74,7 +66,7 @@ public:
 
 private:
     LoggerPtr log = nullptr;
-    StorageMaterializedView * view;
+    std::weak_ptr<IStorage> view_to_refresh;
 
     /// Protects interrupt_execution and running_executor.
     /// Can be locked while holding `mutex`.
@@ -91,14 +83,10 @@ private:
     mutable std::mutex mutex;
 
     RefreshSchedule refresh_schedule;
-    RefreshSettings refresh_settings;
-    std::vector<StorageID> initial_dependencies;
-    bool refresh_append;
-
+    RefreshSettings refresh_settings; // TODO: populate, use, update on alter
     RefreshSet::Handle set_handle;
 
     /// StorageIDs of our dependencies that we're waiting for.
-    using DatabaseAndTableNameSet = std::unordered_set<StorageID, StorageID::DatabaseAndTableNameHash, StorageID::DatabaseAndTableNameEqual>;
     DatabaseAndTableNameSet remaining_dependencies;
     bool time_arrived = false;
 
@@ -123,8 +111,7 @@ private:
     ///    E.g. for REFRESH EVERY 1 DAY, yesterday's refresh of the dependency shouldn't trigger today's
     ///    refresh of the dependent even if it happened today (e.g. it was slow or had random spread > 1 day).
     std::chrono::sys_seconds next_refresh_prescribed;
-    std::chrono::system_clock::time_point next_refresh_actual;
-    Int64 num_retries = 0;
+    std::chrono::system_clock::time_point next_refresh_with_spread;
 
     /// Calls refreshTask() from background thread.
     BackgroundSchedulePool::TaskHolder refresh_task;
@@ -135,7 +122,6 @@ private:
     /// Just for observability.
     RefreshInfo info;
     Progress progress;
-    std::condition_variable refresh_cv; // notified when info.state changes
 
     /// The main loop of the refresh task. It examines the state, sees what needs to be
     /// done and does it. If there's nothing to do at the moment, returns; it's then scheduled again,
@@ -147,14 +133,11 @@ private:
 
     /// Perform an actual refresh: create new table, run INSERT SELECT, exchange tables, drop old table.
     /// Mutex must be unlocked. Called only from refresh_task.
-    void executeRefreshUnlocked(bool append);
+    void executeRefreshUnlocked(std::shared_ptr<StorageMaterializedView> view);
 
     /// Assigns next_refresh_*
     void advanceNextRefreshTime(std::chrono::system_clock::time_point now);
 
-    /// Either advances next_refresh_actual using exponential backoff or does advanceNextRefreshTime().
-    void scheduleRetryOrSkipToNextRefresh(std::chrono::system_clock::time_point now);
-
     /// Returns true if all dependencies are fulfilled now. Refills remaining_dependencies in this case.
     bool arriveDependency(const StorageID & parent);
     bool arriveTime();
@@ -162,24 +145,9 @@ private:
 
     void interruptExecution();
 
+    std::shared_ptr<StorageMaterializedView> lockView();
+
     std::chrono::system_clock::time_point currentTime() const;
 };
 
-/// Wrapper around shared_ptr<RefreshTask>, calls shutdown() in destructor.
-struct OwnedRefreshTask
-{
-    RefreshTaskHolder ptr;
-
-    OwnedRefreshTask() = default;
-    explicit OwnedRefreshTask(RefreshTaskHolder p) : ptr(std::move(p)) {}
-    OwnedRefreshTask(OwnedRefreshTask &&) = default;
-    OwnedRefreshTask & operator=(OwnedRefreshTask &&) = default;
-
-    ~OwnedRefreshTask() { if (ptr) ptr->shutdown(); }
-
-    RefreshTask* operator->() const { return ptr.get(); }
-    RefreshTask& operator*() const { return *ptr; }
-    explicit operator bool() const { return ptr != nullptr; }
-};
-
 }
diff --git a/src/Storages/MaterializedView/RefreshTask_fwd.h b/src/Storages/MaterializedView/RefreshTask_fwd.h
index ff17c839dc5..1f366962eb6 100644
--- a/src/Storages/MaterializedView/RefreshTask_fwd.h
+++ b/src/Storages/MaterializedView/RefreshTask_fwd.h
@@ -8,7 +8,8 @@ namespace DB
 
 class RefreshTask;
 
+using RefreshTaskStateUnderlying = UInt8;
 using RefreshTaskHolder = std::shared_ptr<RefreshTask>;
-using RefreshTaskList = std::list<RefreshTaskHolder>;
+using RefreshTaskObserver = std::weak_ptr<RefreshTask>;
 
 }
diff --git a/src/Storages/MergeTree/AlterConversions.cpp b/src/Storages/MergeTree/AlterConversions.cpp
index a36611e3d87..31f8f17e2c1 100644
--- a/src/Storages/MergeTree/AlterConversions.cpp
+++ b/src/Storages/MergeTree/AlterConversions.cpp
@@ -9,15 +9,9 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-bool AlterConversions::isSupportedDataMutation(MutationCommand::Type)
+bool AlterConversions::supportsMutationCommandType(MutationCommand::Type t)
 {
-    /// Currently there is no such mutations. See setting 'apply_mutations_on_fly'.
-    return false;
-}
-
-bool AlterConversions::isSupportedMetadataMutation(MutationCommand::Type type)
-{
-    return type == MutationCommand::Type::RENAME_COLUMN;
+    return t == MutationCommand::Type::RENAME_COLUMN;
 }
 
 void AlterConversions::addMutationCommand(const MutationCommand & command)
diff --git a/src/Storages/MergeTree/AlterConversions.h b/src/Storages/MergeTree/AlterConversions.h
index 046cc1d2491..7bcd4af8b36 100644
--- a/src/Storages/MergeTree/AlterConversions.h
+++ b/src/Storages/MergeTree/AlterConversions.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <Storages/MutationCommands.h>
-#include <Interpreters/Context_fwd.h>
-#include <Storages/StorageInMemoryMetadata.h>
+#include <string>
+#include <unordered_map>
 
 
 namespace DB
@@ -11,17 +11,11 @@ namespace DB
 /// Alter conversions which should be applied on-fly for part.
 /// Built from of the most recent mutation commands for part.
 /// Now only ALTER RENAME COLUMN is applied.
-class AlterConversions : private WithContext, boost::noncopyable
+class AlterConversions : private boost::noncopyable
 {
 public:
     AlterConversions() = default;
 
-    AlterConversions(StorageMetadataPtr metadata_snapshot_, ContextPtr context_)
-        : WithContext(context_)
-        , metadata_snapshot(std::move(metadata_snapshot_))
-    {
-    }
-
     struct RenamePair
     {
         std::string rename_to;
@@ -40,13 +34,11 @@ public:
     /// Get column old name before rename (lookup by key in rename_map)
     std::string getColumnOldName(const std::string & new_name) const;
 
-    static bool isSupportedDataMutation(MutationCommand::Type type);
-    static bool isSupportedMetadataMutation(MutationCommand::Type type);
+    static bool supportsMutationCommandType(MutationCommand::Type);
 
 private:
     /// Rename map new_name -> old_name.
     std::vector<RenamePair> rename_map;
-    StorageMetadataPtr metadata_snapshot;
 };
 
 using AlterConversionsPtr = std::shared_ptr<const AlterConversions>;
diff --git a/src/Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.cpp b/src/Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.cpp
new file mode 100644
index 00000000000..7354243732c
--- /dev/null
+++ b/src/Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.cpp
@@ -0,0 +1,507 @@
+#include <Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.h>
+
+#include <Core/Settings.h>
+#include <Interpreters/Context.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTOrderByElement.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Storages/MergeTree/KeyCondition.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int INCORRECT_QUERY;
+}
+
+namespace
+{
+
+template <typename Literal>
+void extractReferenceVectorFromLiteral(ApproximateNearestNeighborInformation::Embedding & reference_vector, Literal literal)
+{
+    Float64 float_element_of_reference_vector;
+    Int64 int_element_of_reference_vector;
+
+    for (const auto & value : literal.value())
+    {
+        if (value.tryGet(float_element_of_reference_vector))
+            reference_vector.emplace_back(float_element_of_reference_vector);
+        else if (value.tryGet(int_element_of_reference_vector))
+            reference_vector.emplace_back(static_cast<float>(int_element_of_reference_vector));
+        else
+            throw Exception(ErrorCodes::INCORRECT_QUERY, "Wrong type of elements in reference vector. Only float or int are supported.");
+    }
+}
+
+ApproximateNearestNeighborInformation::Metric stringToMetric(std::string_view metric)
+{
+    if (metric == "L2Distance")
+        return ApproximateNearestNeighborInformation::Metric::L2;
+    else if (metric == "LpDistance")
+        return ApproximateNearestNeighborInformation::Metric::Lp;
+    else
+        return ApproximateNearestNeighborInformation::Metric::Unknown;
+}
+
+}
+
+ApproximateNearestNeighborCondition::ApproximateNearestNeighborCondition(const SelectQueryInfo & query_info, ContextPtr context)
+    : block_with_constants(KeyCondition::getBlockWithConstants(query_info.query, query_info.syntax_analyzer_result, context))
+    , index_granularity(context->getMergeTreeSettings().index_granularity)
+    , max_limit_for_ann_queries(context->getSettingsRef().max_limit_for_ann_queries)
+    , index_is_useful(checkQueryStructure(query_info))
+{}
+
+bool ApproximateNearestNeighborCondition::alwaysUnknownOrTrue(String metric) const
+{
+    if (!index_is_useful)
+        return true; // Query isn't supported
+    // If query is supported, check metrics for match
+    return !(stringToMetric(metric) == query_information->metric);
+}
+
+float ApproximateNearestNeighborCondition::getComparisonDistanceForWhereQuery() const
+{
+    if (index_is_useful && query_information.has_value()
+        && query_information->type == ApproximateNearestNeighborInformation::Type::Where)
+        return query_information->distance;
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Not supported method for this query type");
+}
+
+UInt64 ApproximateNearestNeighborCondition::getLimit() const
+{
+    if (index_is_useful && query_information.has_value())
+        return query_information->limit;
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "No LIMIT section in query, not supported");
+}
+
+std::vector<float> ApproximateNearestNeighborCondition::getReferenceVector() const
+{
+    if (index_is_useful && query_information.has_value())
+        return query_information->reference_vector;
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Reference vector was requested for useless or uninitialized index.");
+}
+
+size_t ApproximateNearestNeighborCondition::getDimensions() const
+{
+    if (index_is_useful && query_information.has_value())
+        return query_information->reference_vector.size();
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Number of dimensions was requested for useless or uninitialized index.");
+}
+
+String ApproximateNearestNeighborCondition::getColumnName() const
+{
+    if (index_is_useful && query_information.has_value())
+        return query_information->column_name;
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Column name was requested for useless or uninitialized index.");
+}
+
+ApproximateNearestNeighborInformation::Metric ApproximateNearestNeighborCondition::getMetricType() const
+{
+    if (index_is_useful && query_information.has_value())
+        return query_information->metric;
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Metric name was requested for useless or uninitialized index.");
+}
+
+float ApproximateNearestNeighborCondition::getPValueForLpDistance() const
+{
+    if (index_is_useful && query_information.has_value())
+        return query_information->p_for_lp_dist;
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "P from LPDistance was requested for useless or uninitialized index.");
+}
+
+ApproximateNearestNeighborInformation::Type ApproximateNearestNeighborCondition::getQueryType() const
+{
+    if (index_is_useful && query_information.has_value())
+        return query_information->type;
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Query type was requested for useless or uninitialized index.");
+}
+
+bool ApproximateNearestNeighborCondition::checkQueryStructure(const SelectQueryInfo & query)
+{
+    /// RPN-s for different sections of the query
+    RPN rpn_prewhere_clause;
+    RPN rpn_where_clause;
+    RPN rpn_order_by_clause;
+    RPNElement rpn_limit;
+    UInt64 limit;
+
+    ApproximateNearestNeighborInformation prewhere_info;
+    ApproximateNearestNeighborInformation where_info;
+    ApproximateNearestNeighborInformation order_by_info;
+
+    /// Build rpns for query sections
+    const auto & select = query.query->as<ASTSelectQuery &>();
+
+    /// If query has PREWHERE clause
+    if (select.prewhere())
+        traverseAST(select.prewhere(), rpn_prewhere_clause);
+
+    /// If query has WHERE clause
+    if (select.where())
+        traverseAST(select.where(), rpn_where_clause);
+
+    /// If query has LIMIT clause
+    if (select.limitLength())
+        traverseAtomAST(select.limitLength(), rpn_limit);
+
+    if (select.orderBy()) // If query has ORDERBY clause
+        traverseOrderByAST(select.orderBy(), rpn_order_by_clause);
+
+    /// Reverse RPNs for conveniences during parsing
+    std::reverse(rpn_prewhere_clause.begin(), rpn_prewhere_clause.end());
+    std::reverse(rpn_where_clause.begin(), rpn_where_clause.end());
+    std::reverse(rpn_order_by_clause.begin(), rpn_order_by_clause.end());
+
+    /// Match rpns with supported types and extract information
+    const bool prewhere_is_valid = matchRPNWhere(rpn_prewhere_clause, prewhere_info);
+    const bool where_is_valid = matchRPNWhere(rpn_where_clause, where_info);
+    const bool order_by_is_valid = matchRPNOrderBy(rpn_order_by_clause, order_by_info);
+    const bool limit_is_valid = matchRPNLimit(rpn_limit, limit);
+
+    /// Query without a LIMIT clause or with a limit greater than a restriction is not supported
+    if (!limit_is_valid || max_limit_for_ann_queries < limit)
+        return false;
+
+    /// Search type query in both sections isn't supported
+    if (prewhere_is_valid && where_is_valid)
+        return false;
+
+    /// Search type should be in WHERE or PREWHERE clause
+    if (prewhere_is_valid || where_is_valid)
+        query_information = std::move(prewhere_is_valid ? prewhere_info : where_info);
+
+    if (order_by_is_valid)
+    {
+        /// Query with valid where and order by type is not supported
+        if (query_information.has_value())
+            return false;
+
+        query_information = std::move(order_by_info);
+    }
+
+    if (query_information)
+        query_information->limit = limit;
+
+    return query_information.has_value();
+}
+
+void ApproximateNearestNeighborCondition::traverseAST(const ASTPtr & node, RPN & rpn)
+{
+    // If the node is ASTFunction, it may have children nodes
+    if (const auto * func = node->as<ASTFunction>())
+    {
+        const ASTs & children = func->arguments->children;
+        // Traverse children nodes
+        for (const auto& child : children)
+            traverseAST(child, rpn);
+    }
+
+    RPNElement element;
+    /// Get the data behind node
+    if (!traverseAtomAST(node, element))
+        element.function = RPNElement::FUNCTION_UNKNOWN;
+
+    rpn.emplace_back(std::move(element));
+}
+
+bool ApproximateNearestNeighborCondition::traverseAtomAST(const ASTPtr & node, RPNElement & out)
+{
+    /// Match Functions
+    if (const auto * function = node->as<ASTFunction>())
+    {
+        /// Set the name
+        out.func_name = function->name;
+
+        if (function->name == "L1Distance" ||
+            function->name == "L2Distance" ||
+            function->name == "LinfDistance" ||
+            function->name == "cosineDistance" ||
+            function->name == "dotProduct" ||
+            function->name == "LpDistance")
+            out.function = RPNElement::FUNCTION_DISTANCE;
+        else if (function->name == "tuple")
+            out.function = RPNElement::FUNCTION_TUPLE;
+        else if (function->name == "array")
+            out.function = RPNElement::FUNCTION_ARRAY;
+        else if (function->name == "less" ||
+                 function->name == "greater" ||
+                 function->name == "lessOrEquals" ||
+                 function->name == "greaterOrEquals")
+            out.function = RPNElement::FUNCTION_COMPARISON;
+        else if (function->name == "_CAST")
+            out.function = RPNElement::FUNCTION_CAST;
+        else
+            return false;
+
+        return true;
+    }
+    /// Match identifier
+    else if (const auto * identifier = node->as<ASTIdentifier>())
+    {
+        out.function = RPNElement::FUNCTION_IDENTIFIER;
+        out.identifier.emplace(identifier->name());
+        out.func_name = "column identifier";
+
+        return true;
+    }
+
+    /// Check if we have constants behind the node
+    return tryCastToConstType(node, out);
+}
+
+bool ApproximateNearestNeighborCondition::tryCastToConstType(const ASTPtr & node, RPNElement & out)
+{
+    Field const_value;
+    DataTypePtr const_type;
+
+    if (KeyCondition::getConstant(node, block_with_constants, const_value, const_type))
+    {
+        /// Check for constant types
+        if (const_value.getType() == Field::Types::Float64)
+        {
+            out.function = RPNElement::FUNCTION_FLOAT_LITERAL;
+            out.float_literal.emplace(const_value.get<Float32>());
+            out.func_name = "Float literal";
+            return true;
+        }
+
+        if (const_value.getType() == Field::Types::UInt64)
+        {
+            out.function = RPNElement::FUNCTION_INT_LITERAL;
+            out.int_literal.emplace(const_value.get<UInt64>());
+            out.func_name = "Int literal";
+            return true;
+        }
+
+        if (const_value.getType() == Field::Types::Int64)
+        {
+            out.function = RPNElement::FUNCTION_INT_LITERAL;
+            out.int_literal.emplace(const_value.get<Int64>());
+            out.func_name = "Int literal";
+            return true;
+        }
+
+        if (const_value.getType() == Field::Types::Tuple)
+        {
+            out.function = RPNElement::FUNCTION_LITERAL_TUPLE;
+            out.tuple_literal = const_value.get<Tuple>();
+            out.func_name = "Tuple literal";
+            return true;
+        }
+
+        if (const_value.getType() == Field::Types::Array)
+        {
+            out.function = RPNElement::FUNCTION_LITERAL_ARRAY;
+            out.array_literal = const_value.get<Array>();
+            out.func_name = "Array literal";
+            return true;
+        }
+
+        if (const_value.getType() == Field::Types::String)
+        {
+            out.function = RPNElement::FUNCTION_STRING_LITERAL;
+            out.func_name = const_value.get<String>();
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void ApproximateNearestNeighborCondition::traverseOrderByAST(const ASTPtr & node, RPN & rpn)
+{
+    if (const auto * expr_list = node->as<ASTExpressionList>())
+        if (const auto * order_by_element = expr_list->children.front()->as<ASTOrderByElement>())
+            traverseAST(order_by_element->children.front(), rpn);
+}
+
+/// Returns true and stores ApproximateNearestNeighborInformation if the query has valid WHERE clause
+bool ApproximateNearestNeighborCondition::matchRPNWhere(RPN & rpn, ApproximateNearestNeighborInformation & ann_info)
+{
+    /// Fill query type field
+    ann_info.type = ApproximateNearestNeighborInformation::Type::Where;
+
+    /// WHERE section must have at least 5 expressions
+    /// Operator->Distance(float)->DistanceFunc->Column->Tuple(Array)Func(ReferenceVector(floats))
+    if (rpn.size() < 5)
+        return false;
+
+    auto iter = rpn.begin();
+
+    /// Query starts from operator less
+    if (iter->function != RPNElement::FUNCTION_COMPARISON)
+        return false;
+
+    const bool greater_case = iter->func_name == "greater" || iter->func_name == "greaterOrEquals";
+    const bool less_case = iter->func_name == "less" || iter->func_name == "lessOrEquals";
+
+    ++iter;
+
+    if (less_case)
+    {
+        if (iter->function != RPNElement::FUNCTION_FLOAT_LITERAL)
+            return false;
+
+        ann_info.distance = getFloatOrIntLiteralOrPanic(iter);
+        if (ann_info.distance < 0)
+            throw Exception(ErrorCodes::INCORRECT_QUERY, "Distance can't be negative. Got {}", ann_info.distance);
+
+        ++iter;
+
+    }
+    else if (!greater_case)
+        return false;
+
+    auto end = rpn.end();
+    if (!matchMainParts(iter, end, ann_info))
+        return false;
+
+    if (greater_case)
+    {
+        if (ann_info.reference_vector.size() < 2)
+            return false;
+        ann_info.distance = ann_info.reference_vector.back();
+        if (ann_info.distance < 0)
+            throw Exception(ErrorCodes::INCORRECT_QUERY, "Distance can't be negative. Got {}", ann_info.distance);
+        ann_info.reference_vector.pop_back();
+    }
+
+    /// query is ok
+    return true;
+}
+
+/// Returns true and stores ANNExpr if the query has valid ORDERBY clause
+bool ApproximateNearestNeighborCondition::matchRPNOrderBy(RPN & rpn, ApproximateNearestNeighborInformation & ann_info)
+{
+    /// Fill query type field
+    ann_info.type = ApproximateNearestNeighborInformation::Type::OrderBy;
+
+    // ORDER BY clause must have at least 3 expressions
+    if (rpn.size() < 3)
+        return false;
+
+    auto iter = rpn.begin();
+    auto end = rpn.end();
+
+    return ApproximateNearestNeighborCondition::matchMainParts(iter, end, ann_info);
+}
+
+/// Returns true and stores Length if we have valid LIMIT clause in query
+bool ApproximateNearestNeighborCondition::matchRPNLimit(RPNElement & rpn, UInt64 & limit)
+{
+    if (rpn.function == RPNElement::FUNCTION_INT_LITERAL)
+    {
+        limit = rpn.int_literal.value();
+        return true;
+    }
+
+    return false;
+}
+
+/// Matches dist function, referencer vector, column name
+bool ApproximateNearestNeighborCondition::matchMainParts(RPN::iterator & iter, const RPN::iterator & end, ApproximateNearestNeighborInformation & ann_info)
+{
+    bool identifier_found = false;
+
+    /// Matches DistanceFunc->[Column]->[Tuple(array)Func]->ReferenceVector(floats)->[Column]
+    if (iter->function != RPNElement::FUNCTION_DISTANCE)
+        return false;
+
+    ann_info.metric = stringToMetric(iter->func_name);
+    ++iter;
+
+    if (ann_info.metric == ApproximateNearestNeighborInformation::Metric::Lp)
+    {
+        if (iter->function != RPNElement::FUNCTION_FLOAT_LITERAL &&
+            iter->function != RPNElement::FUNCTION_INT_LITERAL)
+            return false;
+        ann_info.p_for_lp_dist = getFloatOrIntLiteralOrPanic(iter);
+        ++iter;
+    }
+
+    if (iter->function == RPNElement::FUNCTION_IDENTIFIER)
+    {
+        identifier_found = true;
+        ann_info.column_name = std::move(iter->identifier.value());
+        ++iter;
+    }
+
+    if (iter->function == RPNElement::FUNCTION_TUPLE || iter->function == RPNElement::FUNCTION_ARRAY)
+        ++iter;
+
+    if (iter->function == RPNElement::FUNCTION_LITERAL_TUPLE)
+    {
+        extractReferenceVectorFromLiteral(ann_info.reference_vector, iter->tuple_literal);
+        ++iter;
+    }
+
+    if (iter->function == RPNElement::FUNCTION_LITERAL_ARRAY)
+    {
+        extractReferenceVectorFromLiteral(ann_info.reference_vector, iter->array_literal);
+        ++iter;
+    }
+
+    /// further conditions are possible if there is no tuple or array, or no identifier is found
+    /// the tuple or array can be inside a cast function. For other cases, see the loop after this condition
+    if (iter != end && iter->function == RPNElement::FUNCTION_CAST)
+    {
+        ++iter;
+        /// Cast should be made to array or tuple
+        if (!iter->func_name.starts_with("Array") && !iter->func_name.starts_with("Tuple"))
+            return false;
+        ++iter;
+        if (iter->function == RPNElement::FUNCTION_LITERAL_TUPLE)
+        {
+            extractReferenceVectorFromLiteral(ann_info.reference_vector, iter->tuple_literal);
+            ++iter;
+        }
+        else if (iter->function == RPNElement::FUNCTION_LITERAL_ARRAY)
+        {
+            extractReferenceVectorFromLiteral(ann_info.reference_vector, iter->array_literal);
+            ++iter;
+        }
+        else
+            return false;
+    }
+
+    while (iter != end)
+    {
+        if (iter->function == RPNElement::FUNCTION_FLOAT_LITERAL ||
+            iter->function == RPNElement::FUNCTION_INT_LITERAL)
+            ann_info.reference_vector.emplace_back(getFloatOrIntLiteralOrPanic(iter));
+        else if (iter->function == RPNElement::FUNCTION_IDENTIFIER)
+        {
+            if (identifier_found)
+                return false;
+            ann_info.column_name = std::move(iter->identifier.value());
+            identifier_found = true;
+        }
+        else
+            return false;
+
+        ++iter;
+    }
+
+    /// Final checks of correctness
+    return identifier_found && !ann_info.reference_vector.empty();
+}
+
+/// Gets float or int from AST node
+float ApproximateNearestNeighborCondition::getFloatOrIntLiteralOrPanic(const RPN::iterator& iter)
+{
+    if (iter->float_literal.has_value())
+        return iter->float_literal.value();
+    if (iter->int_literal.has_value())
+        return static_cast<float>(iter->int_literal.value());
+    throw Exception(ErrorCodes::INCORRECT_QUERY, "Wrong parsed AST in buildRPN\n");
+}
+
+}
diff --git a/src/Storages/MergeTree/VectorSimilarityCondition.h b/src/Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.h
similarity index 51%
rename from src/Storages/MergeTree/VectorSimilarityCondition.h
rename to src/Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.h
index 2e9e06a31d0..5da2a714b02 100644
--- a/src/Storages/MergeTree/VectorSimilarityCondition.h
+++ b/src/Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.h
@@ -9,9 +9,52 @@
 namespace DB
 {
 
-/// Class VectorSimilarityCondition is responsible for recognizing if the query can utilize vector similarity indexes.
-/// Method alwaysUnknownOrTrue returns false if we can speed up the query, and true otherwise. It has
-/// only one argument, the name of the distance function with which index was built. Two main patterns of queries are supported
+static constexpr auto DISTANCE_FUNCTION_L2 = "L2Distance";
+static constexpr auto DISTANCE_FUNCTION_COSINE = "cosineDistance";
+
+/// Approximate Nearest Neighbour queries have a similar structure:
+/// - reference vector from which all distances are calculated
+/// - metric name (e.g L2Distance, LpDistance, etc.)
+/// - name of column with embeddings
+/// - type of query
+/// - maximum number of returned elements (LIMIT)
+///
+/// And two optional parameters:
+/// - p for LpDistance function
+/// - distance to compare with (only for where queries)
+///
+/// This struct holds all these components.
+struct ApproximateNearestNeighborInformation
+{
+    using Embedding = std::vector<float>;
+    Embedding reference_vector;
+
+    enum class Metric : uint8_t
+    {
+        Unknown,
+        L2,
+        Lp
+    };
+    Metric metric;
+
+    String column_name;
+    UInt64 limit;
+
+    enum class Type : uint8_t
+    {
+        OrderBy,
+        Where
+    };
+    Type type;
+
+    float p_for_lp_dist = -1.0;
+    float distance = -1.0;
+};
+
+
+// Class ANNCondition, is responsible for recognizing if the query is an ANN queries which can utilize ANN indexes. It parses the SQL query
+/// and checks if it matches ANNIndexes. Method alwaysUnknownOrTrue returns false if we can speed up the query, and true otherwise. It has
+/// only one argument, the name of the metric with which index was built. Two main patterns of queries are supported
 ///
 /// - 1. WHERE queries:
 ///   SELECT * FROM * WHERE DistanceFunc(column, reference_vector) < floatLiteral LIMIT count
@@ -21,14 +64,14 @@ namespace DB
 ///
 /// Queries without LIMIT count are not supported
 /// If the query is both of type 1. and 2., than we can't use the index and alwaysUnknownOrTrue returns true.
-/// reference_vector should have float coordinates, e.g. [0.2, 0.1, .., 0.5]
+/// reference_vector should have float coordinates, e.g. (0.2, 0.1, .., 0.5)
 ///
-/// If the query matches one of these two types, then this class extracts the main information needed for vector similarity indexes from the
-/// query.
+/// If the query matches one of these two types, then this class extracts the main information needed for ANN indexes from the query.
 ///
 /// From matching query it extracts
 /// - referenceVector
-/// - distance function
+/// - metricName(DistanceFunction)
+/// - dimension size if query uses LpDistance
 /// - distance to compare(ONLY for search types, otherwise you get exception)
 /// - spaceDimension(which is referenceVector's components count)
 /// - column
@@ -36,46 +79,35 @@ namespace DB
 /// - queryHasOrderByClause and queryHasWhereClause return true if query matches the type
 ///
 /// Search query type is also recognized for PREWHERE clause
-class VectorSimilarityCondition
+class ApproximateNearestNeighborCondition
 {
 public:
-    VectorSimilarityCondition(const SelectQueryInfo & query_info, ContextPtr context);
-
-    /// Approximate nearest neighbour (ANN) / vector similarity queries have a similar structure:
-    /// - reference vector from which all distances are calculated
-    /// - distance function, e.g L2Distance
-    /// - name of column with embeddings
-    /// - type of query
-    /// - maximum number of returned elements (LIMIT)
-    ///
-    /// And one optional parameter:
-    /// - distance to compare with (only for where queries)
-    ///
-    /// This struct holds all these components.
-    struct Info
-    {
-        enum class DistanceFunction : uint8_t
-        {
-            Unknown,
-            L2,
-            Cosine
-        };
-
-        std::vector<Float64> reference_vector;
-        DistanceFunction distance_function;
-        String column_name;
-        UInt64 limit;
-        float distance = -1.0;
-    };
+    ApproximateNearestNeighborCondition(const SelectQueryInfo & query_info, ContextPtr context);
 
     /// Returns false if query can be speeded up by an ANN index, true otherwise.
-    bool alwaysUnknownOrTrue(const String & distance_function) const;
+    bool alwaysUnknownOrTrue(String metric) const;
 
-    std::vector<Float64> getReferenceVector() const;
+    /// Returns the distance to compare with for search query
+    float getComparisonDistanceForWhereQuery() const;
+
+    /// Distance should be calculated regarding to referenceVector
+    std::vector<float> getReferenceVector() const;
+
+    /// Reference vector's dimension count
     size_t getDimensions() const;
+
     String getColumnName() const;
-    Info::DistanceFunction getDistanceFunction() const;
+
+    ApproximateNearestNeighborInformation::Metric getMetricType() const;
+
+    /// The P- value if the metric is 'LpDistance'
+    float getPValueForLpDistance() const;
+
+    ApproximateNearestNeighborInformation::Type getQueryType() const;
+
     UInt64 getIndexGranularity() const { return index_granularity; }
+
+    /// Length's value from LIMIT clause
     UInt64 getLimit() const;
 
 private:
@@ -86,6 +118,9 @@ private:
             /// DistanceFunctions
             FUNCTION_DISTANCE,
 
+            //tuple(0.1, ..., 0.1)
+            FUNCTION_TUPLE,
+
             //array(0.1, ..., 0.1)
             FUNCTION_ARRAY,
 
@@ -104,6 +139,9 @@ private:
             /// Unknown, can be any value
             FUNCTION_UNKNOWN,
 
+            /// (0.1, ...., 0.1) vector without word 'tuple'
+            FUNCTION_LITERAL_TUPLE,
+
             /// [0.1, ...., 0.1] vector without word 'array'
             FUNCTION_LITERAL_ARRAY,
 
@@ -116,14 +154,19 @@ private:
 
         explicit RPNElement(Function function_ = FUNCTION_UNKNOWN)
             : function(function_)
+            , func_name("Unknown")
+            , float_literal(std::nullopt)
+            , identifier(std::nullopt)
         {}
 
         Function function;
-        String func_name = "Unknown";
+        String func_name;
 
         std::optional<float> float_literal;
         std::optional<String> identifier;
         std::optional<int64_t> int_literal;
+
+        std::optional<Tuple> tuple_literal;
         std::optional<Array> array_literal;
 
         UInt32 dim = 0;
@@ -142,19 +185,25 @@ private:
     /// Traverses the AST of ORDERBY section
     void traverseOrderByAST(const ASTPtr & node, RPN & rpn);
 
+    /// Returns true and stores ANNExpr if the query has valid WHERE section
+    static bool matchRPNWhere(RPN & rpn, ApproximateNearestNeighborInformation & ann_info);
+
     /// Returns true and stores ANNExpr if the query has valid ORDERBY section
-    static bool matchRPNOrderBy(RPN & rpn, Info & info);
+    static bool matchRPNOrderBy(RPN & rpn, ApproximateNearestNeighborInformation & ann_info);
 
     /// Returns true and stores Length if we have valid LIMIT clause in query
     static bool matchRPNLimit(RPNElement & rpn, UInt64 & limit);
 
+    /* Matches dist function, reference vector, column name */
+    static bool matchMainParts(RPN::iterator & iter, const RPN::iterator & end, ApproximateNearestNeighborInformation & ann_info);
+
     /// Gets float or int from AST node
     static float getFloatOrIntLiteralOrPanic(const RPN::iterator& iter);
 
     Block block_with_constants;
 
     /// true if we have one of two supported query types
-    std::optional<Info> query_information;
+    std::optional<ApproximateNearestNeighborInformation> query_information;
 
     // Get from settings ANNIndex parameters
     const UInt64 index_granularity;
@@ -165,4 +214,13 @@ private:
     bool index_is_useful = false;
 };
 
+
+/// Common interface of ANN indexes.
+class IMergeTreeIndexConditionApproximateNearestNeighbor : public IMergeTreeIndexCondition
+{
+public:
+    /// Returns vector of indexes of ranges in granule which are useful for query.
+    virtual std::vector<size_t> getUsefulRanges(MergeTreeIndexGranulePtr idx_granule) const = 0;
+};
+
 }
diff --git a/src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp b/src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp
index df151e8478f..378a1944396 100644
--- a/src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp
+++ b/src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp
@@ -73,7 +73,12 @@ std::optional<String> DataPartStorageOnDiskBase::getRelativePathForPrefix(Logger
 
     for (int try_no = 0; try_no < 10; ++try_no)
     {
-        res = getPartDirForPrefix(prefix, detached, try_no);
+        if (prefix.empty())
+            res = part_dir + (try_no ? "_try" + DB::toString(try_no) : "");
+        else if (prefix.ends_with("_"))
+            res = prefix + part_dir + (try_no ? "_try" + DB::toString(try_no) : "");
+        else
+            res = prefix + "_" + part_dir + (try_no ? "_try" + DB::toString(try_no) : "");
 
         if (!volume->getDisk()->exists(full_relative_path / res))
             return res;
@@ -96,36 +101,6 @@ std::optional<String> DataPartStorageOnDiskBase::getRelativePathForPrefix(Logger
     return res;
 }
 
-String DataPartStorageOnDiskBase::getPartDirForPrefix(const String & prefix, bool detached, int try_no) const
-{
-    /// This function joins `prefix` and the part name and an attempt number returning something like "<prefix>_<part_name>_<tryN>".
-    String res = prefix;
-    if (!prefix.empty() && !prefix.ends_with("_"))
-        res += "_";
-
-    /// During RESTORE temporary part directories are created with names like "tmp_restore_all_2_2_0-XXXXXXXX".
-    /// To detach such a directory we need to rename it replacing "tmp_restore_" with a specified prefix,
-    /// and a random suffix with an attempt number.
-    String part_name;
-    if (detached && part_dir.starts_with("tmp_restore_"))
-    {
-        part_name = part_dir.substr(strlen("tmp_restore_"));
-        size_t endpos = part_name.find('-');
-        if (endpos != String::npos)
-            part_name.erase(endpos, String::npos);
-    }
-
-    if (!part_name.empty())
-        res += part_name;
-    else
-        res += part_dir;
-
-    if (try_no)
-        res += "_try" + DB::toString(try_no);
-
-    return res;
-}
-
 bool DataPartStorageOnDiskBase::looksLikeBrokenDetachedPartHasTheSameContent(const String & detached_part_path,
                                                                          std::optional<String> & original_checksums_content,
                                                                          std::optional<Strings> & original_files_list) const
diff --git a/src/Storages/MergeTree/DataPartStorageOnDiskBase.h b/src/Storages/MergeTree/DataPartStorageOnDiskBase.h
index 1707efc2d4d..81353d4e20b 100644
--- a/src/Storages/MergeTree/DataPartStorageOnDiskBase.h
+++ b/src/Storages/MergeTree/DataPartStorageOnDiskBase.h
@@ -148,9 +148,6 @@ private:
     /// Actual file name may be the same as expected
     /// or be the name of the file with packed data.
     virtual NameSet getActualFileNamesOnDisk(const NameSet & file_names) const = 0;
-
-    /// Returns the destination path for the part directory while copying a detached part.
-    String getPartDirForPrefix(const String & prefix, bool detached, int try_no) const;
 };
 
 }
diff --git a/src/Storages/MergeTree/DataPartStorageOnDiskFull.cpp b/src/Storages/MergeTree/DataPartStorageOnDiskFull.cpp
index bc2bb020836..bfe656111b0 100644
--- a/src/Storages/MergeTree/DataPartStorageOnDiskFull.cpp
+++ b/src/Storages/MergeTree/DataPartStorageOnDiskFull.cpp
@@ -95,18 +95,22 @@ UInt32 DataPartStorageOnDiskFull::getRefCount(const String & file_name) const
     return volume->getDisk()->getRefCount(fs::path(root_path) / part_dir / file_name);
 }
 
-std::vector<std::string> DataPartStorageOnDiskFull::getRemotePaths(const std::string & file_name) const
+std::string DataPartStorageOnDiskFull::getRemotePath(const std::string & file_name, bool if_exists) const
 {
     const std::string path = fs::path(root_path) / part_dir / file_name;
     auto objects = volume->getDisk()->getStorageObjects(path);
 
-    std::vector<std::string> remote_paths;
-    remote_paths.reserve(objects.size());
+    if (objects.empty() && if_exists)
+        return "";
 
-    for (const auto & object : objects)
-        remote_paths.push_back(object.remote_path);
+    if (objects.size() != 1)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "One file must be mapped to one object on blob storage by path {} in MergeTree tables, have {}.",
+                        path, objects.size());
+    }
 
-    return remote_paths;
+    return objects[0].remote_path;
 }
 
 String DataPartStorageOnDiskFull::getUniqueId() const
diff --git a/src/Storages/MergeTree/DataPartStorageOnDiskFull.h b/src/Storages/MergeTree/DataPartStorageOnDiskFull.h
index c76ec41ccb0..ba787809b63 100644
--- a/src/Storages/MergeTree/DataPartStorageOnDiskFull.h
+++ b/src/Storages/MergeTree/DataPartStorageOnDiskFull.h
@@ -23,7 +23,7 @@ public:
     Poco::Timestamp getFileLastModified(const String & file_name) const override;
     size_t getFileSize(const std::string & file_name) const override;
     UInt32 getRefCount(const std::string & file_name) const override;
-    std::vector<std::string> getRemotePaths(const std::string & file_name) const override;
+    std::string getRemotePath(const std::string & file_name, bool if_exists) const override;
     String getUniqueId() const override;
 
     std::unique_ptr<ReadBufferFromFileBase> readFile(
diff --git a/src/Storages/MergeTree/IDataPartStorage.h b/src/Storages/MergeTree/IDataPartStorage.h
index 01670fc5c3e..f6320a7e1e4 100644
--- a/src/Storages/MergeTree/IDataPartStorage.h
+++ b/src/Storages/MergeTree/IDataPartStorage.h
@@ -126,7 +126,7 @@ public:
     virtual UInt32 getRefCount(const std::string & file_name) const = 0;
 
     /// Get path on remote filesystem from file name on local filesystem.
-    virtual std::vector<std::string> getRemotePaths(const std::string & file_name) const = 0;
+    virtual std::string getRemotePath(const std::string & file_name, bool if_exists) const = 0;
 
     virtual UInt64 calculateTotalSizeOnDisk() const = 0;
 
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index f133b280545..312f2b5151b 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -428,7 +428,7 @@ std::pair<DayNum, DayNum> IMergeTreeDataPart::getMinMaxDate() const
     if (storage.minmax_idx_date_column_pos != -1 && minmax_idx->initialized)
     {
         const auto & hyperrectangle = minmax_idx->hyperrectangle[storage.minmax_idx_date_column_pos];
-        return {DayNum(hyperrectangle.left.safeGet<UInt64>()), DayNum(hyperrectangle.right.safeGet<UInt64>())};
+        return {DayNum(hyperrectangle.left.get<UInt64>()), DayNum(hyperrectangle.right.get<UInt64>())};
     }
     else
         return {};
@@ -444,15 +444,15 @@ std::pair<time_t, time_t> IMergeTreeDataPart::getMinMaxTime() const
         if (hyperrectangle.left.getType() == Field::Types::UInt64)
         {
             assert(hyperrectangle.right.getType() == Field::Types::UInt64);
-            return {hyperrectangle.left.safeGet<UInt64>(), hyperrectangle.right.safeGet<UInt64>()};
+            return {hyperrectangle.left.get<UInt64>(), hyperrectangle.right.get<UInt64>()};
         }
         /// The case of DateTime64
         else if (hyperrectangle.left.getType() == Field::Types::Decimal64)
         {
             assert(hyperrectangle.right.getType() == Field::Types::Decimal64);
 
-            auto left = hyperrectangle.left.safeGet<DecimalField<Decimal64>>();
-            auto right = hyperrectangle.right.safeGet<DecimalField<Decimal64>>();
+            auto left = hyperrectangle.left.get<DecimalField<Decimal64>>();
+            auto right = hyperrectangle.right.get<DecimalField<Decimal64>>();
 
             assert(left.getScale() == right.getScale());
 
@@ -739,33 +739,10 @@ void IMergeTreeDataPart::loadColumnsChecksumsIndexes(bool require_columns_checks
     }
     catch (...)
     {
-        /// Don't scare people with broken part error if it's retryable.
+        /// Don't scare people with broken part error
         if (!isRetryableException(std::current_exception()))
-        {
             LOG_ERROR(storage.log, "Part {} is broken and needs manual correction", getDataPartStorage().getFullPath());
 
-            if (Exception * e = exception_cast<Exception *>(std::current_exception()))
-            {
-                /// Probably there is something wrong with files of this part.
-                /// So it can be helpful to add to the error message some information about those files.
-                String files_in_part;
-
-                for (auto it = getDataPartStorage().iterate(); it->isValid(); it->next())
-                {
-                    std::string file_info;
-                    if (!getDataPartStorage().isDirectory(it->name()))
-                        file_info = fmt::format(" ({} bytes)", getDataPartStorage().getFileSize(it->name()));
-
-                    files_in_part += fmt::format("{}{}{}", (files_in_part.empty() ? "" : ", "), it->name(), file_info);
-
-                }
-                if (!files_in_part.empty())
-                    e->addMessage("Part contains files: {}", files_in_part);
-                if (isEmpty())
-                    e->addMessage("Part is empty");
-            }
-        }
-
         // There could be conditions that data part to be loaded is broken, but some of meta infos are already written
         // into metadata before exception, need to clean them all.
         metadata_manager->deleteAll(/*include_projection*/ true);
@@ -807,7 +784,7 @@ MergeTreeDataPartBuilder IMergeTreeDataPart::getProjectionPartBuilder(const Stri
     const char * projection_extension = is_temp_projection ? ".tmp_proj" : ".proj";
     auto projection_storage = getDataPartStorage().getProjection(projection_name + projection_extension, !is_temp_projection);
     MergeTreeDataPartBuilder builder(storage, projection_name, projection_storage);
-    return builder.withPartInfo(MergeListElement::FAKE_RESULT_PART_FOR_PROJECTION).withParentPart(this);
+    return builder.withPartInfo({"all", 0, 0, 0}).withParentPart(this);
 }
 
 void IMergeTreeDataPart::addProjectionPart(
@@ -1651,9 +1628,11 @@ void IMergeTreeDataPart::loadColumns(bool require)
 }
 
 
+/// Project part / part with project parts / compact part doesn't support LWD.
 bool IMergeTreeDataPart::supportLightweightDeleteMutate() const
 {
-    return (part_type == MergeTreeDataPartType::Wide || part_type == MergeTreeDataPartType::Compact);
+    return (part_type == MergeTreeDataPartType::Wide || part_type == MergeTreeDataPartType::Compact) &&
+        parent_part == nullptr && projection_parts.empty();
 }
 
 bool IMergeTreeDataPart::hasLightweightDelete() const
@@ -2137,27 +2116,7 @@ void IMergeTreeDataPart::checkConsistencyBase() const
             }
         }
 
-        const auto & data_part_storage = getDataPartStorage();
-        for (const auto & [filename, checksum] : checksums.files)
-        {
-            try
-            {
-                checksum.checkSize(data_part_storage, filename);
-            }
-            catch (const Exception & ex)
-            {
-                /// For projection parts check will mark them broken in loadProjections
-                if (!parent_part && filename.ends_with(".proj"))
-                {
-                    std::string projection_name = fs::path(filename).stem();
-                    LOG_INFO(storage.log, "Projection {} doesn't exist on start for part {}, marking it as broken", projection_name, name);
-                    if (hasProjection(projection_name))
-                        markProjectionPartAsBroken(projection_name, ex.message(), ex.code());
-                }
-                else
-                    throw;
-            }
-        }
+        checksums.checkSizes(getDataPartStorage());
     }
     else
     {
diff --git a/src/Storages/MergeTree/IMergeTreeDataPartWriter.cpp b/src/Storages/MergeTree/IMergeTreeDataPartWriter.cpp
index c87f66b64f3..6152da78395 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPartWriter.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPartWriter.cpp
@@ -1,5 +1,4 @@
 #include <Storages/MergeTree/IMergeTreeDataPartWriter.h>
-#include <Common/MemoryTrackerBlockerInThread.h>
 
 namespace DB
 {
@@ -72,21 +71,9 @@ IMergeTreeDataPartWriter::IMergeTreeDataPartWriter(
 
 Columns IMergeTreeDataPartWriter::releaseIndexColumns()
 {
-    /// The memory for index was allocated without thread memory tracker.
-    /// We need to deallocate it in shrinkToFit without memory tracker as well.
-    MemoryTrackerBlockerInThread temporarily_disable_memory_tracker;
-
-    Columns result;
-    result.reserve(index_columns.size());
-
-    for (auto & column : index_columns)
-    {
-        column->shrinkToFit();
-        result.push_back(std::move(column));
-    }
-
-    index_columns.clear();
-    return result;
+    return Columns(
+        std::make_move_iterator(index_columns.begin()),
+        std::make_move_iterator(index_columns.end()));
 }
 
 SerializationPtr IMergeTreeDataPartWriter::getSerialization(const String & column_name) const
diff --git a/src/Storages/MergeTree/IMergeTreeReader.cpp b/src/Storages/MergeTree/IMergeTreeReader.cpp
index 1f46d6b8e1b..47ec496b078 100644
--- a/src/Storages/MergeTree/IMergeTreeReader.cpp
+++ b/src/Storages/MergeTree/IMergeTreeReader.cpp
@@ -77,7 +77,7 @@ void IMergeTreeReader::fillVirtualColumns(Columns & columns, size_t rows) const
         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->metadata->getColumns();
+    const auto & storage_columns = storage_snapshot->getMetadataForQuery()->getColumns();
     const auto & virtual_columns = storage_snapshot->virtual_columns;
 
     auto it = requested_columns.begin();
@@ -173,8 +173,8 @@ void IMergeTreeReader::evaluateMissingDefaults(Block additional_columns, Columns
         if (dag)
         {
             dag->addMaterializingOutputActions();
-            auto actions = std::make_shared<ExpressionActions>(
-                std::move(*dag),
+            auto actions = std::make_shared<
+                ExpressionActions>(std::move(dag),
                 ExpressionActionsSettings::fromSettings(data_part_info_for_read->getContext()->getSettingsRef()));
             actions->execute(additional_columns);
         }
diff --git a/src/Storages/MergeTree/KeyCondition.cpp b/src/Storages/MergeTree/KeyCondition.cpp
index 1ed096fae17..40eef8e7431 100644
--- a/src/Storages/MergeTree/KeyCondition.cpp
+++ b/src/Storages/MergeTree/KeyCondition.cpp
@@ -349,7 +349,7 @@ const KeyCondition::AtomMap KeyCondition::atom_map
             if (value.getType() != Field::Types::String)
                 return false;
 
-            String prefix = extractFixedPrefixFromLikePattern(value.safeGet<const String &>(), /*requires_perfect_prefix*/ false);
+            String prefix = extractFixedPrefixFromLikePattern(value.get<const String &>(), /*requires_perfect_prefix*/ false);
             if (prefix.empty())
                 return false;
 
@@ -370,7 +370,7 @@ const KeyCondition::AtomMap KeyCondition::atom_map
             if (value.getType() != Field::Types::String)
                 return false;
 
-            String prefix = extractFixedPrefixFromLikePattern(value.safeGet<const String &>(), /*requires_perfect_prefix*/ true);
+            String prefix = extractFixedPrefixFromLikePattern(value.get<const String &>(), /*requires_perfect_prefix*/ true);
             if (prefix.empty())
                 return false;
 
@@ -391,7 +391,7 @@ const KeyCondition::AtomMap KeyCondition::atom_map
             if (value.getType() != Field::Types::String)
                 return false;
 
-            String prefix = value.safeGet<const String &>();
+            String prefix = value.get<const String &>();
             if (prefix.empty())
                 return false;
 
@@ -412,7 +412,7 @@ const KeyCondition::AtomMap KeyCondition::atom_map
             if (value.getType() != Field::Types::String)
                 return false;
 
-            const String & expression = value.safeGet<const String &>();
+            const String & expression = value.get<const String &>();
 
             /// This optimization can't process alternation - this would require
             /// a comprehensive parsing of regular expression.
@@ -566,7 +566,6 @@ static const ActionsDAG::Node & cloneASTWithInversionPushDown(
     }
 
     const ActionsDAG::Node * res = nullptr;
-    bool handled_inversion = false;
 
     switch (node.type)
     {
@@ -583,7 +582,7 @@ static const ActionsDAG::Node & cloneASTWithInversionPushDown(
                 /// 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 breaks matching by column name sometimes.
-                /// Ideally, we should not compare names, but DAG subtrees instead.
+                /// Ideally, we should not compare manes, but DAG subtrees instead.
                 name = ASTLiteral(column_const->getDataColumn()[0]).getColumnName();
             else
                 name = node.result_name;
@@ -594,9 +593,9 @@ static const ActionsDAG::Node & cloneASTWithInversionPushDown(
         case (ActionsDAG::ActionType::ALIAS):
         {
             /// Ignore aliases
-            res = &cloneASTWithInversionPushDown(*node.children.front(), inverted_dag, to_inverted, context, need_inversion);
-            handled_inversion = true;
-            break;
+            const auto & alias = cloneASTWithInversionPushDown(*node.children.front(), inverted_dag, to_inverted, context, need_inversion);
+            to_inverted[&node] = &alias;
+            return alias;
         }
         case (ActionsDAG::ActionType::ARRAY_JOIN):
         {
@@ -609,10 +608,20 @@ static const ActionsDAG::Node & cloneASTWithInversionPushDown(
             auto name = node.function_base->getName();
             if (name == "not")
             {
-                res = &cloneASTWithInversionPushDown(*node.children.front(), inverted_dag, to_inverted, context, !need_inversion);
-                handled_inversion = true;
+                const auto & arg = cloneASTWithInversionPushDown(*node.children.front(), inverted_dag, to_inverted, context, !need_inversion);
+                to_inverted[&node] = &arg;
+                return arg;
             }
-            else if (name == "indexHint")
+
+            if (name == "materialize")
+            {
+                /// Ignore materialize
+                const auto & arg = cloneASTWithInversionPushDown(*node.children.front(), inverted_dag, to_inverted, context, need_inversion);
+                to_inverted[&node] = &arg;
+                return arg;
+            }
+
+            if (name == "indexHint")
             {
                 ActionsDAG::NodeRawConstPtrs children;
                 if (const auto * adaptor = typeid_cast<const FunctionToFunctionBaseAdaptor *>(node.function_base.get()))
@@ -620,17 +629,19 @@ static const ActionsDAG::Node & cloneASTWithInversionPushDown(
                     if (const auto * index_hint = typeid_cast<const FunctionIndexHint *>(adaptor->getFunction().get()))
                     {
                         const auto & index_hint_dag = index_hint->getActions();
-                        children = index_hint_dag.getOutputs();
+                        children = index_hint_dag->getOutputs();
 
                         for (auto & arg : children)
                             arg = &cloneASTWithInversionPushDown(*arg, inverted_dag, to_inverted, context, need_inversion);
                     }
                 }
 
-                res = &inverted_dag.addFunction(node.function_base, children, "");
-                handled_inversion = true;
+                const auto & func = inverted_dag.addFunction(node.function_base, children, "");
+                to_inverted[&node] = &func;
+                return func;
             }
-            else if (need_inversion && (name == "and" || name == "or"))
+
+            if (need_inversion && (name == "and" || name == "or"))
             {
                 ActionsDAG::NodeRawConstPtrs children(node.children);
 
@@ -648,56 +659,32 @@ static const ActionsDAG::Node & cloneASTWithInversionPushDown(
 
                 /// We match columns by name, so it is important to fill name correctly.
                 /// So, use empty string to make it automatically.
-                res = &inverted_dag.addFunction(function_builder, children, "");
-                handled_inversion = true;
+                const auto & func = inverted_dag.addFunction(function_builder, children, "");
+                to_inverted[&node] = &func;
+                return func;
             }
-            else
+
+            ActionsDAG::NodeRawConstPtrs children(node.children);
+
+            for (auto & arg : children)
+                arg = &cloneASTWithInversionPushDown(*arg, inverted_dag, to_inverted, context, false);
+
+            auto it = inverse_relations.find(name);
+            if (it != inverse_relations.end())
             {
-                ActionsDAG::NodeRawConstPtrs children(node.children);
-
-                for (auto & arg : children)
-                    arg = &cloneASTWithInversionPushDown(*arg, inverted_dag, to_inverted, context, false);
-
-                auto it = inverse_relations.find(name);
-                if (it != inverse_relations.end())
-                {
-                    const auto & func_name = need_inversion ? it->second : it->first;
-                    auto function_builder = FunctionFactory::instance().get(func_name, context);
-                    res = &inverted_dag.addFunction(function_builder, children, "");
-                    handled_inversion = true;
-                }
-                else
-                {
-                    /// Argument types could change slightly because of our transformations, e.g.
-                    /// LowCardinality can be added because some subexpressions became constant
-                    /// (in particular, sets). If that happens, re-run function overload resolver.
-                    /// Otherwise don't re-run it because some functions may not be available
-                    /// through FunctionFactory::get(), e.g. FunctionCapture.
-                    bool types_changed = false;
-                    for (size_t i = 0; i < children.size(); ++i)
-                    {
-                        if (!node.children[i]->result_type->equals(*children[i]->result_type))
-                        {
-                            types_changed = true;
-                            break;
-                        }
-                    }
-
-                    if (types_changed)
-                    {
-                        auto function_builder = FunctionFactory::instance().get(name, context);
-                        res = &inverted_dag.addFunction(function_builder, children, "");
-                    }
-                    else
-                    {
-                        res = &inverted_dag.addFunction(node.function_base, children, "");
-                    }
-                }
+                const auto & func_name = need_inversion ? it->second : it->first;
+                auto function_builder = FunctionFactory::instance().get(func_name, context);
+                const auto & func = inverted_dag.addFunction(function_builder, children, "");
+                to_inverted[&node] = &func;
+                return func;
             }
+
+            res = &inverted_dag.addFunction(node.function_base, children, "");
+            chassert(res->result_type == node.result_type);
         }
     }
 
-    if (!handled_inversion && need_inversion)
+    if (need_inversion)
         res = &inverted_dag.addFunction(FunctionFactory::instance().get("not", context), {res}, "");
 
     to_inverted[&node] = res;
@@ -709,22 +696,22 @@ const std::unordered_map<String, KeyCondition::SpaceFillingCurveType> KeyConditi
     {"hilbertEncode", SpaceFillingCurveType::Hilbert}
 };
 
-ActionsDAG KeyCondition::cloneASTWithInversionPushDown(ActionsDAG::NodeRawConstPtrs nodes, const ContextPtr & context)
+ActionsDAGPtr KeyCondition::cloneASTWithInversionPushDown(ActionsDAG::NodeRawConstPtrs nodes, const ContextPtr & context)
 {
-    ActionsDAG res;
+    auto res = std::make_shared<ActionsDAG>();
 
     std::unordered_map<const ActionsDAG::Node *, const ActionsDAG::Node *> to_inverted;
 
     for (auto & node : nodes)
-        node = &DB::cloneASTWithInversionPushDown(*node, res, to_inverted, context, false);
+        node = &DB::cloneASTWithInversionPushDown(*node, *res, to_inverted, context, false);
 
     if (nodes.size() > 1)
     {
         auto function_builder = FunctionFactory::instance().get("and", context);
-        nodes = {&res.addFunction(function_builder, std::move(nodes), "")};
+        nodes = {&res->addFunction(function_builder, std::move(nodes), "")};
     }
 
-    res.getOutputs().swap(nodes);
+    res->getOutputs().swap(nodes);
 
     return res;
 }
@@ -743,7 +730,7 @@ Block KeyCondition::getBlockWithConstants(
     if (syntax_analyzer_result)
     {
         auto actions = ExpressionAnalyzer(query, syntax_analyzer_result, context).getConstActionsDAG();
-        for (const auto & action_node : actions.getOutputs())
+        for (const auto & action_node : actions->getOutputs())
         {
             if (action_node->column)
                 result.insert(ColumnWithTypeAndName{action_node->column, action_node->result_type, action_node->result_name});
@@ -798,7 +785,7 @@ void KeyCondition::getAllSpaceFillingCurves()
 }
 
 KeyCondition::KeyCondition(
-    const ActionsDAG * filter_dag,
+    ActionsDAGPtr filter_dag,
     ContextPtr context,
     const Names & key_column_names,
     const ExpressionActionsPtr & key_expr_,
@@ -839,9 +826,9 @@ KeyCondition::KeyCondition(
       * are pushed down and applied (when possible) to leaf nodes.
       */
     auto inverted_dag = cloneASTWithInversionPushDown({filter_dag->getOutputs().at(0)}, context);
-    assert(inverted_dag.getOutputs().size() == 1);
+    assert(inverted_dag->getOutputs().size() == 1);
 
-    const auto * inverted_dag_filter_node = inverted_dag.getOutputs()[0];
+    const auto * inverted_dag_filter_node = inverted_dag->getOutputs()[0];
 
     RPNBuilder<RPNElement> builder(inverted_dag_filter_node, context, [&](const RPNBuilderTreeNode & node, RPNElement & out)
     {
@@ -888,22 +875,13 @@ static Field applyFunctionForField(
     return (*col)[0];
 }
 
-/// applyFunction will execute the function with one `field` or the column which `field` refers to.
 static FieldRef applyFunction(const FunctionBasePtr & func, const DataTypePtr & current_type, const FieldRef & field)
 {
-    chassert(func != nullptr);
     /// Fallback for fields without block reference.
     if (field.isExplicit())
         return applyFunctionForField(func, current_type, field);
 
-    /// We will cache the function result inside `field.columns`, because this function will call many times
-    /// from many fields from same column. When the column is huge, for example there are thousands of marks, we need a cache.
-    /// The cache key is like `_[function_pointer]_[param_column_id]` to identify a unique <function, param> pair.
-    WriteBufferFromOwnString buf;
-    writeText("_", buf);
-    writePointerHex(func.get(), buf);
-    writeText("_" + toString(field.column_idx), buf);
-    String result_name = buf.str();
+    String result_name = "_" + func->getName() + "_" + toString(field.column_idx);
     const auto & columns = field.columns;
     size_t result_idx = columns->size();
 
@@ -915,7 +893,6 @@ static FieldRef applyFunction(const FunctionBasePtr & func, const DataTypePtr &
 
     if (result_idx == columns->size())
     {
-        /// When cache is missed, we calculate the whole column where the field comes from. This will avoid repeated calculation.
         ColumnsWithTypeAndName args{(*columns)[field.column_idx]};
         field.columns->emplace_back(ColumnWithTypeAndName {nullptr, func->getResultType(), result_name});
         (*columns)[result_idx].column = func->execute(args, (*columns)[result_idx].type, columns->front().column->size());
@@ -1966,8 +1943,11 @@ bool KeyCondition::extractAtomFromTree(const RPNBuilderTreeNode & node, RPNEleme
                         auto common_type_maybe_nullable = (key_expr_type_is_nullable && !common_type->isNullable())
                             ? DataTypePtr(std::make_shared<DataTypeNullable>(common_type))
                             : common_type;
-
-                        auto func_cast = createInternalCast({key_expr_type, {}}, common_type_maybe_nullable, CastType::nonAccurate, {});
+                        ColumnsWithTypeAndName arguments{
+                            {nullptr, key_expr_type, ""},
+                            {DataTypeString().createColumnConst(1, common_type_maybe_nullable->getName()), common_type_maybe_nullable, ""}};
+                        FunctionOverloadResolverPtr func_builder_cast = createInternalCastOverloadResolver(CastType::nonAccurate, {});
+                        auto func_cast = func_builder_cast->build(arguments);
 
                         /// If we know the given range only contains one value, then we treat all functions as positive monotonic.
                         if (!single_point && !func_cast->hasInformationAboutMonotonicity())
@@ -2938,8 +2918,8 @@ BoolMask KeyCondition::checkInHyperrectangle(
                 /// Let's support only the case of 2d, because I'm not confident in other cases.
                 if (num_dimensions == 2)
                 {
-                    UInt64 left = key_range.left.safeGet<UInt64>();
-                    UInt64 right = key_range.right.safeGet<UInt64>();
+                    UInt64 left = key_range.left.get<UInt64>();
+                    UInt64 right = key_range.right.get<UInt64>();
 
                     BoolMask mask(false, true);
                     auto hyperrectangle_intersection_callback = [&](std::array<std::pair<UInt64, UInt64>, 2> curve_hyperrectangle)
diff --git a/src/Storages/MergeTree/KeyCondition.h b/src/Storages/MergeTree/KeyCondition.h
index 8bbb86aba43..9e2218d7a29 100644
--- a/src/Storages/MergeTree/KeyCondition.h
+++ b/src/Storages/MergeTree/KeyCondition.h
@@ -6,8 +6,6 @@
 #include <Core/Range.h>
 #include <Core/PlainRanges.h>
 
-#include <DataTypes/Serializations/ISerialization.h>
-
 #include <Parsers/ASTExpressionList.h>
 
 #include <Interpreters/Set.h>
@@ -16,6 +14,7 @@
 
 #include <Storages/SelectQueryInfo.h>
 #include <Storages/MergeTree/RPNBuilder.h>
+#include "DataTypes/Serializations/ISerialization.h"
 
 
 namespace DB
@@ -43,7 +42,7 @@ class KeyCondition
 public:
     /// Construct key condition from ActionsDAG nodes
     KeyCondition(
-        const ActionsDAG * filter_dag,
+        ActionsDAGPtr filter_dag,
         ContextPtr context,
         const Names & key_column_names,
         const ExpressionActionsPtr & key_expr,
@@ -135,7 +134,7 @@ public:
         DataTypePtr current_type,
         bool single_point = false);
 
-    static ActionsDAG cloneASTWithInversionPushDown(ActionsDAG::NodeRawConstPtrs nodes, const ContextPtr & context);
+    static ActionsDAGPtr cloneASTWithInversionPushDown(ActionsDAG::NodeRawConstPtrs nodes, const ContextPtr & context);
 
     bool matchesExactContinuousRange() const;
 
diff --git a/src/Storages/MergeTree/MergeList.cpp b/src/Storages/MergeTree/MergeList.cpp
index b80d7fccc91..8fbb163384e 100644
--- a/src/Storages/MergeTree/MergeList.cpp
+++ b/src/Storages/MergeTree/MergeList.cpp
@@ -6,18 +6,10 @@
 #include <Common/CurrentThread.h>
 #include <Common/MemoryTracker.h>
 
-#include <Common/logger_useful.h>
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-const MergeTreePartInfo MergeListElement::FAKE_RESULT_PART_FOR_PROJECTION = {"all", 0, 0, 0};
-
 MergeListElement::MergeListElement(const StorageID & table_id_, FutureMergedMutatedPartPtr future_part, const ContextPtr & context)
     : table_id{table_id_}
     , partition_id{future_part->part_info.partition_id}
@@ -29,23 +21,8 @@ MergeListElement::MergeListElement(const StorageID & table_id_, FutureMergedMuta
     , merge_type{future_part->merge_type}
     , merge_algorithm{MergeAlgorithm::Undecided}
 {
-    auto format_version = MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING;
-    if (result_part_name != result_part_info.getPartNameV1())
-        format_version = MERGE_TREE_DATA_OLD_FORMAT_VERSION;
-
-    /// FIXME why do we need a merge list element for projection parts at all?
-    bool is_fake_projection_part = future_part->part_info == FAKE_RESULT_PART_FOR_PROJECTION;
-
-    size_t normal_parts_count = 0;
     for (const auto & source_part : future_part->parts)
     {
-        if (!is_fake_projection_part && !source_part->getParentPart())
-        {
-            ++normal_parts_count;
-            if (!result_part_info.contains(MergeTreePartInfo::fromPartName(source_part->name, format_version)))
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Source part {} is not covered by result part {}", source_part->name, result_part_info.getPartNameV1());
-        }
-
         source_part_names.emplace_back(source_part->name);
         source_part_paths.emplace_back(source_part->getDataPartStorage().getFullPath());
 
@@ -58,17 +35,13 @@ MergeListElement::MergeListElement(const StorageID & table_id_, FutureMergedMuta
     if (!future_part->parts.empty())
     {
         source_data_version = future_part->parts[0]->info.getDataVersion();
-        is_mutation = (result_part_info.level == future_part->parts[0]->info.level) && !is_fake_projection_part;
+        is_mutation = (result_part_info.getDataVersion() != source_data_version);
 
         WriteBufferFromString out(partition);
         const auto & part = future_part->parts[0];
         part->partition.serializeText(part->storage, out, {});
     }
 
-    if (!is_fake_projection_part && is_mutation && normal_parts_count != 1)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Got {} source parts for mutation {}: {}", future_part->parts.size(),
-                        result_part_info.getPartNameV1(), fmt::join(source_part_names, ", "));
-
     thread_group = ThreadGroup::createForBackgroundProcess(context);
 }
 
diff --git a/src/Storages/MergeTree/MergeList.h b/src/Storages/MergeTree/MergeList.h
index 66190de0ef4..d40af6abf43 100644
--- a/src/Storages/MergeTree/MergeList.h
+++ b/src/Storages/MergeTree/MergeList.h
@@ -66,8 +66,6 @@ struct Settings;
 
 struct MergeListElement : boost::noncopyable
 {
-    static const MergeTreePartInfo FAKE_RESULT_PART_FOR_PROJECTION;
-
     const StorageID table_id;
     std::string partition_id;
     std::string partition;
diff --git a/src/Storages/MergeTree/MergeProgress.h b/src/Storages/MergeTree/MergeProgress.h
index 8562e81e761..dd4922051b5 100644
--- a/src/Storages/MergeTree/MergeProgress.h
+++ b/src/Storages/MergeTree/MergeProgress.h
@@ -8,10 +8,10 @@
 
 namespace ProfileEvents
 {
+    extern const Event MergesTimeMilliseconds;
     extern const Event MergedUncompressedBytes;
     extern const Event MergedRows;
-    extern const Event MutatedRows;
-    extern const Event MutatedUncompressedBytes;
+    extern const Event Merge;
 }
 
 namespace DB
@@ -63,17 +63,18 @@ public:
     void updateWatch()
     {
         UInt64 watch_curr_elapsed = merge_list_element_ptr->watch.elapsed();
+        ProfileEvents::increment(ProfileEvents::MergesTimeMilliseconds, (watch_curr_elapsed - watch_prev_elapsed) / 1000000);
         watch_prev_elapsed = watch_curr_elapsed;
     }
 
-    void operator()(const Progress & value)
+    void operator() (const Progress & value)
     {
-        if (merge_list_element_ptr->is_mutation)
-            updateProfileEvents(value, ProfileEvents::MutatedRows, ProfileEvents::MutatedUncompressedBytes);
-        else
-            updateProfileEvents(value, ProfileEvents::MergedRows, ProfileEvents::MergedUncompressedBytes);
-
-
+        ProfileEvents::increment(ProfileEvents::MergedUncompressedBytes, value.read_bytes);
+        if (stage.is_first)
+        {
+            ProfileEvents::increment(ProfileEvents::MergedRows, value.read_rows);
+            ProfileEvents::increment(ProfileEvents::Merge);
+        }
         updateWatch();
 
         merge_list_element_ptr->bytes_read_uncompressed += value.read_bytes;
@@ -89,14 +90,6 @@ public:
                 std::memory_order_relaxed);
         }
     }
-
-private:
-    void updateProfileEvents(const Progress & value, ProfileEvents::Event rows_event, ProfileEvents::Event bytes_event) const
-    {
-        ProfileEvents::increment(bytes_event, value.read_bytes);
-        if (stage.is_first)
-            ProfileEvents::increment(rows_event, value.read_rows);
-    }
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeProjectionPartsTask.cpp b/src/Storages/MergeTree/MergeProjectionPartsTask.cpp
deleted file mode 100644
index bdc2ba8b9ca..00000000000
--- a/src/Storages/MergeTree/MergeProjectionPartsTask.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-#include <Storages/MergeTree/MergeProjectionPartsTask.h>
-
-#include <Common/TransactionID.h>
-#include <Storages/MergeTree/MergeList.h>
-
-namespace DB
-{
-
-bool MergeProjectionPartsTask::executeStep()
-{
-    auto & current_level_parts = level_parts[current_level];
-    auto & next_level_parts = level_parts[next_level];
-
-    MergeTreeData::MutableDataPartsVector selected_parts;
-    while (selected_parts.size() < max_parts_to_merge_in_one_level && !current_level_parts.empty())
-    {
-        selected_parts.push_back(std::move(current_level_parts.back()));
-        current_level_parts.pop_back();
-    }
-
-    if (selected_parts.empty())
-    {
-        if (next_level_parts.empty())
-        {
-            LOG_WARNING(log, "There is no projection parts merged");
-
-            /// Task is finished
-            return false;
-        }
-        current_level = next_level;
-        ++next_level;
-    }
-    else if (selected_parts.size() == 1)
-    {
-        if (next_level_parts.empty())
-        {
-            LOG_DEBUG(log, "Merged a projection part in level {}", current_level);
-            selected_parts[0]->renameTo(projection.name + ".proj", true);
-            selected_parts[0]->setName(projection.name);
-            selected_parts[0]->is_temp = false;
-            new_data_part->addProjectionPart(name, std::move(selected_parts[0]));
-
-            /// Task is finished
-            return false;
-        }
-        else
-        {
-            LOG_DEBUG(log, "Forwarded part {} in level {} to next level", selected_parts[0]->name, current_level);
-            next_level_parts.push_back(std::move(selected_parts[0]));
-        }
-    }
-    else if (selected_parts.size() > 1)
-    {
-        // Generate a unique part name
-        ++block_num;
-        auto projection_future_part = std::make_shared<FutureMergedMutatedPart>();
-        MergeTreeData::DataPartsVector const_selected_parts(
-            std::make_move_iterator(selected_parts.begin()), std::make_move_iterator(selected_parts.end()));
-        projection_future_part->assign(std::move(const_selected_parts));
-        projection_future_part->name = fmt::format("{}_{}", projection.name, ++block_num);
-        projection_future_part->part_info = {"all", 0, 0, 0};
-
-        MergeTreeData::MergingParams projection_merging_params;
-        projection_merging_params.mode = MergeTreeData::MergingParams::Ordinary;
-        if (projection.type == ProjectionDescription::Type::Aggregate)
-            projection_merging_params.mode = MergeTreeData::MergingParams::Aggregating;
-
-        LOG_DEBUG(log, "Merged {} parts in level {} to {}", selected_parts.size(), current_level, projection_future_part->name);
-        auto tmp_part_merge_task = mutator->mergePartsToTemporaryPart(
-            projection_future_part,
-            projection.metadata,
-            merge_entry,
-            std::make_unique<MergeListElement>((*merge_entry)->table_id, projection_future_part, context),
-            *table_lock_holder,
-            time_of_merge,
-            context,
-            space_reservation,
-            false, // TODO Do we need deduplicate for projections
-            {},
-            false, // no cleanup
-            projection_merging_params,
-            NO_TRANSACTION_PTR,
-            /* need_prefix */ true,
-            new_data_part.get(),
-            ".tmp_proj");
-
-        next_level_parts.push_back(executeHere(tmp_part_merge_task));
-        next_level_parts.back()->is_temp = true;
-    }
-
-    /// Need execute again
-    return true;
-}
-
-}
diff --git a/src/Storages/MergeTree/MergeProjectionPartsTask.h b/src/Storages/MergeTree/MergeProjectionPartsTask.h
deleted file mode 100644
index 47cafe01151..00000000000
--- a/src/Storages/MergeTree/MergeProjectionPartsTask.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#pragma once
-
-#include <Interpreters/StorageID.h>
-#include <Storages/MergeTree/IExecutableTask.h>
-#include <Storages/MergeTree/MergeTreeData.h>
-#include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
-#include <Storages/MergeTree/MergeProgress.h>
-#include <Storages/MergeTree/FutureMergedMutatedPart.h>
-#include <Storages/ProjectionsDescription.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-class MergeProjectionPartsTask : public IExecutableTask
-{
-public:
-
-    MergeProjectionPartsTask(
-        String name_,
-        MergeTreeData::MutableDataPartsVector && parts_,
-        const ProjectionDescription & projection_,
-        size_t & block_num_,
-        ContextPtr context_,
-        TableLockHolder * table_lock_holder_,
-        MergeTreeDataMergerMutator * mutator_,
-        MergeListEntry * merge_entry_,
-        time_t time_of_merge_,
-        MergeTreeData::MutableDataPartPtr new_data_part_,
-        ReservationSharedPtr space_reservation_)
-        : name(std::move(name_))
-        , parts(std::move(parts_))
-        , projection(projection_)
-        , block_num(block_num_)
-        , context(context_)
-        , table_lock_holder(table_lock_holder_)
-        , mutator(mutator_)
-        , merge_entry(merge_entry_)
-        , time_of_merge(time_of_merge_)
-        , new_data_part(new_data_part_)
-        , space_reservation(space_reservation_)
-        , 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);
-        }
-
-    void onCompleted() override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
-    StorageID getStorageID() const override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
-    Priority getPriority() const override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
-    String getQueryId() const override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
-
-    bool executeStep() override;
-
-private:
-    String name;
-    MergeTreeData::MutableDataPartsVector parts;
-    const ProjectionDescription & projection;
-    size_t & block_num;
-
-    ContextPtr context;
-    TableLockHolder * table_lock_holder;
-    MergeTreeDataMergerMutator * mutator;
-    MergeListEntry * merge_entry;
-    time_t time_of_merge;
-
-    MergeTreeData::MutableDataPartPtr new_data_part;
-    ReservationSharedPtr space_reservation;
-
-    LoggerPtr log;
-
-    std::map<size_t, MergeTreeData::MutableDataPartsVector> level_parts;
-    size_t current_level = 0;
-    size_t next_level = 1;
-
-    /// TODO(nikitamikhaylov): make this constant a setting
-    static constexpr size_t max_parts_to_merge_in_one_level = 10;
-};
-
-}
diff --git a/src/Storages/MergeTree/MergeTask.cpp b/src/Storages/MergeTree/MergeTask.cpp
index a7bcaa25ddc..fc64fae9a58 100644
--- a/src/Storages/MergeTree/MergeTask.cpp
+++ b/src/Storages/MergeTree/MergeTask.cpp
@@ -8,21 +8,18 @@
 #include <Common/logger_useful.h>
 #include <Common/ActionBlocker.h>
 #include <Core/Settings.h>
-#include <Common/ProfileEvents.h>
 #include <Processors/Transforms/CheckSortedTransform.h>
 #include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
 #include <Compression/CompressedWriteBuffer.h>
 #include <DataTypes/ObjectUtils.h>
 #include <DataTypes/Serializations/SerializationInfo.h>
-#include <IO/ReadBufferFromEmptyFile.h>
+#include <IO/IReadableWriteBuffer.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Storages/MergeTree/MergeTreeSequentialSource.h>
 #include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/MergeTree/FutureMergedMutatedPart.h>
 #include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
-#include <Storages/MergeTree/MergeTreeDataWriter.h>
-#include <Storages/MergeTree/MergeProjectionPartsTask.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/Transforms/MaterializingTransform.h>
 #include <Processors/Transforms/FilterTransform.h>
@@ -38,28 +35,10 @@
 #include <Processors/Transforms/DistinctSortedTransform.h>
 #include <Processors/Transforms/DistinctTransform.h>
 #include <Processors/QueryPlan/CreatingSetsStep.h>
-#include <Processors/QueryPlan/DistinctStep.h>
-#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
-#include <Processors/QueryPlan/QueryPlan.h>
-#include <Processors/QueryPlan/UnionStep.h>
-#include <Processors/QueryPlan/ExpressionStep.h>
-#include <Processors/QueryPlan/TemporaryFiles.h>
 #include <Interpreters/PreparedSets.h>
 #include <Interpreters/MergeTreeTransaction.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 
-namespace ProfileEvents
-{
-    extern const Event Merge;
-    extern const Event MergedColumns;
-    extern const Event GatheredColumns;
-    extern const Event MergeTotalMilliseconds;
-    extern const Event MergeExecuteMilliseconds;
-    extern const Event MergeHorizontalStageExecuteMilliseconds;
-    extern const Event MergeVerticalStageExecuteMilliseconds;
-    extern const Event MergeProjectionStageExecuteMilliseconds;
-}
-
 namespace DB
 {
 
@@ -71,7 +50,6 @@ namespace ErrorCodes
     extern const int SUPPORT_IS_DISABLED;
 }
 
-
 static ColumnsStatistics getStatisticsForColumns(
     const NamesAndTypesList & columns_to_read,
     const StorageMetadataPtr & metadata_snapshot)
@@ -84,75 +62,13 @@ static ColumnsStatistics getStatisticsForColumns(
         const auto * desc = all_columns.tryGet(column.name);
         if (desc && !desc->statistics.empty())
         {
-            auto statistics = MergeTreeStatisticsFactory::instance().get(*desc);
+            auto statistics = MergeTreeStatisticsFactory::instance().get(desc->statistics);
             all_statistics.push_back(std::move(statistics));
         }
     }
     return all_statistics;
 }
 
-/// Manages the "rows_sources" temporary file that is used during vertical merge.
-class RowsSourcesTemporaryFile : public ITemporaryFileLookup
-{
-public:
-    /// A logical name of the temporary file under which it will be known to the plan steps that use it.
-    static constexpr auto FILE_ID = "rows_sources";
-
-    explicit RowsSourcesTemporaryFile(TemporaryDataOnDiskScopePtr temporary_data_on_disk_)
-        : tmp_disk(std::make_unique<TemporaryDataOnDisk>(temporary_data_on_disk_))
-        , uncompressed_write_buffer(tmp_disk->createRawStream())
-        , tmp_file_name_on_disk(uncompressed_write_buffer->getFileName())
-    {
-    }
-
-    WriteBuffer & getTemporaryFileForWriting(const String & name) override
-    {
-        if (name != FILE_ID)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected temporary file name requested: {}", name);
-
-        if (write_buffer)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Temporary file was already requested for writing, there musto be only one writer");
-
-        write_buffer = (std::make_unique<CompressedWriteBuffer>(*uncompressed_write_buffer));
-        return *write_buffer;
-    }
-
-    std::unique_ptr<ReadBuffer> getTemporaryFileForReading(const String & name) override
-    {
-        if (name != FILE_ID)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected temporary file name requested: {}", name);
-
-        if (!finalized)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Temporary file is not finalized yet");
-
-        /// tmp_disk might not create real file if no data was written to it.
-        if (final_size == 0)
-            return std::make_unique<ReadBufferFromEmptyFile>();
-
-        /// Reopen the file for each read so that multiple reads can be performed in parallel and there is no need to seek to the beginning.
-        auto raw_file_read_buffer = std::make_unique<ReadBufferFromFile>(tmp_file_name_on_disk);
-        return std::make_unique<CompressedReadBufferFromFile>(std::move(raw_file_read_buffer));
-    }
-
-    /// Returns written data size in bytes
-    size_t finalizeWriting()
-    {
-        write_buffer->finalize();
-        uncompressed_write_buffer->finalize();
-        finalized = true;
-        final_size = write_buffer->count();
-        return final_size;
-    }
-
-private:
-    std::unique_ptr<TemporaryDataOnDisk> tmp_disk;
-    std::unique_ptr<WriteBufferFromFileBase> uncompressed_write_buffer;
-    std::unique_ptr<WriteBuffer> write_buffer;
-    const String tmp_file_name_on_disk;
-    bool finalized = false;
-    size_t final_size = 0;
-};
-
 static void addMissedColumnsToSerializationInfos(
     size_t num_rows_in_parts,
     const Names & part_columns,
@@ -226,13 +142,6 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::extractMergingAndGatheringColu
         }
     }
 
-    for (const auto * projection : global_ctx->projections_to_rebuild)
-    {
-        Names projection_columns_vec = projection->getRequiredColumns();
-        std::copy(projection_columns_vec.cbegin(), projection_columns_vec.cend(),
-                  std::inserter(key_columns, key_columns.end()));
-    }
-
     /// TODO: also force "summing" and "aggregating" columns to make Horizontal merge only for such columns
 
     for (const auto & column : global_ctx->storage_columns)
@@ -258,10 +167,8 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::extractMergingAndGatheringColu
     }
 }
 
-bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare() const
+bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
 {
-    ProfileEvents::increment(ProfileEvents::Merge);
-
     String local_tmp_prefix;
     if (global_ctx->need_prefix)
     {
@@ -332,8 +239,6 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare() const
     extendObjectColumns(global_ctx->storage_columns, object_columns, false);
     global_ctx->storage_snapshot = std::make_shared<StorageSnapshot>(*global_ctx->data, global_ctx->metadata_snapshot, std::move(object_columns));
 
-    prepareProjectionsToMergeAndRebuild();
-
     extractMergingAndGatheringColumns();
 
     global_ctx->new_data_part->uuid = global_ctx->future_part->uuid;
@@ -354,14 +259,6 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare() const
     if (enabledBlockOffsetColumn(global_ctx))
         addGatheringColumn(global_ctx, BlockOffsetColumn::name, BlockOffsetColumn::type);
 
-    MergeTreeData::IMutationsSnapshot::Params params
-    {
-        .metadata_version = global_ctx->metadata_snapshot->getMetadataVersion(),
-        .min_part_metadata_version = MergeTreeData::getMinMetadataVersion(global_ctx->future_part->parts),
-    };
-
-    auto mutations_snapshot = global_ctx->data->getMutationsSnapshot(params);
-
     SerializationInfo::Settings info_settings =
     {
         .ratio_of_defaults_for_sparse = global_ctx->data->getSettings()->ratio_of_defaults_for_sparse_serialization,
@@ -369,12 +266,10 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare() const
     };
 
     SerializationInfoByName infos(global_ctx->storage_columns, info_settings);
-    global_ctx->alter_conversions.reserve(global_ctx->future_part->parts.size());
 
     for (const auto & part : global_ctx->future_part->parts)
     {
         global_ctx->new_data_part->ttl_infos.update(part->ttl_infos);
-
         if (global_ctx->metadata_snapshot->hasAnyTTL() && !part->checkAllTTLCalculated(global_ctx->metadata_snapshot))
         {
             LOG_INFO(ctx->log, "Some TTL values were not calculated for part {}. Will calculate them forcefully during merge.", part->name);
@@ -395,8 +290,6 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare() const
 
             infos.add(part_infos);
         }
-
-        global_ctx->alter_conversions.push_back(MergeTreeData::getAlterConversionsForPart(part, mutations_snapshot, global_ctx->metadata_snapshot, global_ctx->context));
     }
 
     const auto & local_part_min_ttl = global_ctx->new_data_part->ttl_infos.part_min_ttl;
@@ -427,6 +320,8 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare() const
     ctx->compression_codec = global_ctx->data->getCompressionCodecForPart(
         global_ctx->merge_list_element_ptr->total_size_bytes_compressed, global_ctx->new_data_part->ttl_infos, global_ctx->time_of_merge);
 
+    ctx->tmp_disk = std::make_unique<TemporaryDataOnDisk>(global_ctx->context->getTempDataOnDisk());
+
     switch (global_ctx->chosen_merge_algorithm)
     {
         case MergeAlgorithm::Horizontal:
@@ -439,7 +334,8 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare() const
         }
         case MergeAlgorithm::Vertical:
         {
-            ctx->rows_sources_temporary_file = std::make_shared<RowsSourcesTemporaryFile>(global_ctx->context->getTempDataOnDisk());
+            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);
 
             std::map<String, UInt64> local_merged_column_to_size;
             for (const auto & part : global_ctx->future_part->parts)
@@ -550,18 +446,13 @@ void MergeTask::addGatheringColumn(GlobalRuntimeContextPtr global_ctx, const Str
 
 MergeTask::StageRuntimeContextPtr MergeTask::ExecuteAndFinalizeHorizontalPart::getContextForNextStage()
 {
-    /// Do not increment for projection stage because time is already accounted in main task.
-    if (global_ctx->parent_part == nullptr)
-    {
-        ProfileEvents::increment(ProfileEvents::MergeExecuteMilliseconds, ctx->elapsed_execute_ns / 1000000UL);
-        ProfileEvents::increment(ProfileEvents::MergeHorizontalStageExecuteMilliseconds, ctx->elapsed_execute_ns / 1000000UL);
-    }
-
     auto new_ctx = std::make_shared<VerticalMergeRuntimeContext>();
 
-    new_ctx->rows_sources_temporary_file = std::move(ctx->rows_sources_temporary_file);
+    new_ctx->rows_sources_write_buf = std::move(ctx->rows_sources_write_buf);
+    new_ctx->rows_sources_uncompressed_write_buf = std::move(ctx->rows_sources_uncompressed_write_buf);
     new_ctx->column_sizes = std::move(ctx->column_sizes);
     new_ctx->compression_codec = std::move(ctx->compression_codec);
+    new_ctx->tmp_disk = std::move(ctx->tmp_disk);
     new_ctx->it_name_and_type = std::move(ctx->it_name_and_type);
     new_ctx->read_with_direct_io = std::move(ctx->read_with_direct_io);
     new_ctx->need_sync = std::move(ctx->need_sync);
@@ -572,14 +463,8 @@ MergeTask::StageRuntimeContextPtr MergeTask::ExecuteAndFinalizeHorizontalPart::g
 
 MergeTask::StageRuntimeContextPtr MergeTask::VerticalMergeStage::getContextForNextStage()
 {
-    /// Do not increment for projection stage because time is already accounted in main task.
-    if (global_ctx->parent_part == nullptr)
-    {
-        ProfileEvents::increment(ProfileEvents::MergeExecuteMilliseconds, ctx->elapsed_execute_ns / 1000000UL);
-        ProfileEvents::increment(ProfileEvents::MergeVerticalStageExecuteMilliseconds, ctx->elapsed_execute_ns / 1000000UL);
-    }
-
     auto new_ctx = std::make_shared<MergeProjectionsRuntimeContext>();
+
     new_ctx->need_sync = std::move(ctx->need_sync);
 
     ctx.reset();
@@ -589,14 +474,9 @@ MergeTask::StageRuntimeContextPtr MergeTask::VerticalMergeStage::getContextForNe
 
 bool MergeTask::ExecuteAndFinalizeHorizontalPart::execute()
 {
-    chassert(subtasks_iterator != subtasks.end());
-
-    Stopwatch watch;
-    bool res = (this->**subtasks_iterator)();
-    ctx->elapsed_execute_ns += watch.elapsedNanoseconds();
-
-    if (res)
-        return res;
+    assert(subtasks_iterator != subtasks.end());
+    if ((this->**subtasks_iterator)())
+        return true;
 
     /// Move to the next subtask in an array of subtasks
     ++subtasks_iterator;
@@ -604,167 +484,14 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::execute()
 }
 
 
-void MergeTask::ExecuteAndFinalizeHorizontalPart::prepareProjectionsToMergeAndRebuild() const
+bool MergeTask::ExecuteAndFinalizeHorizontalPart::executeImpl()
 {
-    const auto mode = global_ctx->data->getSettings()->deduplicate_merge_projection_mode;
-    /// Under throw mode, we still choose to drop projections due to backward compatibility since some
-    /// users might have projections before this change.
-    if (global_ctx->data->merging_params.mode != MergeTreeData::MergingParams::Ordinary
-        && (mode == DeduplicateMergeProjectionMode::THROW || mode == DeduplicateMergeProjectionMode::DROP))
-        return;
-
-    /// These merging modes may or may not reduce number of rows. It's not known until the horizontal stage is finished.
-    const bool merge_may_reduce_rows =
-        global_ctx->cleanup ||
-        global_ctx->deduplicate ||
-        ctx->merging_params.mode == MergeTreeData::MergingParams::Collapsing ||
-        ctx->merging_params.mode == MergeTreeData::MergingParams::Replacing ||
-        ctx->merging_params.mode == MergeTreeData::MergingParams::VersionedCollapsing;
-
-    const auto & projections = global_ctx->metadata_snapshot->getProjections();
-
-    for (const auto & projection : projections)
+    Block block;
+    if (!ctx->is_cancelled() && (global_ctx->merging_executor->pull(block)))
     {
-        if (merge_may_reduce_rows)
-        {
-            global_ctx->projections_to_rebuild.push_back(&projection);
-            continue;
-        }
-
-        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() && !it->second->is_broken)
-                projection_parts.push_back(it->second);
-        }
-        if (projection_parts.size() == global_ctx->future_part->parts.size())
-        {
-            global_ctx->projections_to_merge.push_back(&projection);
-            global_ctx->projections_to_merge_parts[projection.name].assign(projection_parts.begin(), projection_parts.end());
-        }
-        else
-        {
-            chassert(projection_parts.size() < global_ctx->future_part->parts.size());
-            LOG_DEBUG(ctx->log, "Projection {} is not merged because some parts don't have it", projection.name);
-            continue;
-        }
-    }
-
-    const auto & settings = global_ctx->context->getSettingsRef();
-
-    for (const auto * projection : global_ctx->projections_to_rebuild)
-        ctx->projection_squashes.emplace_back(projection->sample_block.cloneEmpty(),
-            settings.min_insert_block_size_rows, settings.min_insert_block_size_bytes);
-}
-
-
-void MergeTask::ExecuteAndFinalizeHorizontalPart::calculateProjections(const Block & block) const
-{
-    for (size_t i = 0, size = global_ctx->projections_to_rebuild.size(); i < size; ++i)
-    {
-        const auto & projection = *global_ctx->projections_to_rebuild[i];
-        Block block_to_squash = projection.calculate(block, global_ctx->context);
-        auto & projection_squash_plan = ctx->projection_squashes[i];
-        projection_squash_plan.setHeader(block_to_squash.cloneEmpty());
-        Chunk squashed_chunk = Squashing::squash(projection_squash_plan.add({block_to_squash.getColumns(), block_to_squash.rows()}));
-        if (squashed_chunk)
-        {
-            auto result = projection_squash_plan.getHeader().cloneWithColumns(squashed_chunk.detachColumns());
-            auto tmp_part = MergeTreeDataWriter::writeTempProjectionPart(
-                *global_ctx->data, ctx->log, result, projection, global_ctx->new_data_part.get(), ++ctx->projection_block_num);
-            tmp_part.finalize();
-            tmp_part.part->getDataPartStorage().commitTransaction();
-            ctx->projection_parts[projection.name].emplace_back(std::move(tmp_part.part));
-        }
-    }
-}
-
-
-void MergeTask::ExecuteAndFinalizeHorizontalPart::finalizeProjections() const
-{
-    for (size_t i = 0, size = global_ctx->projections_to_rebuild.size(); i < size; ++i)
-    {
-        const auto & projection = *global_ctx->projections_to_rebuild[i];
-        auto & projection_squash_plan = ctx->projection_squashes[i];
-        auto squashed_chunk = Squashing::squash(projection_squash_plan.flush());
-        if (squashed_chunk)
-        {
-            auto result = projection_squash_plan.getHeader().cloneWithColumns(squashed_chunk.detachColumns());
-            auto temp_part = MergeTreeDataWriter::writeTempProjectionPart(
-                *global_ctx->data, ctx->log, result, projection, global_ctx->new_data_part.get(), ++ctx->projection_block_num);
-            temp_part.finalize();
-            temp_part.part->getDataPartStorage().commitTransaction();
-            ctx->projection_parts[projection.name].emplace_back(std::move(temp_part.part));
-        }
-    }
-
-    ctx->projection_parts_iterator = std::make_move_iterator(ctx->projection_parts.begin());
-    if (ctx->projection_parts_iterator != std::make_move_iterator(ctx->projection_parts.end()))
-        constructTaskForProjectionPartsMerge();
-}
-
-
-void MergeTask::ExecuteAndFinalizeHorizontalPart::constructTaskForProjectionPartsMerge() const
-{
-    auto && [name, parts] = *ctx->projection_parts_iterator;
-    const auto & projection = global_ctx->metadata_snapshot->projections.get(name);
-
-    ctx->merge_projection_parts_task_ptr = std::make_unique<MergeProjectionPartsTask>
-    (
-        name,
-        std::move(parts),
-        projection,
-        ctx->projection_block_num,
-        global_ctx->context,
-        global_ctx->holder,
-        global_ctx->mutator,
-        global_ctx->merge_entry,
-        global_ctx->time_of_merge,
-        global_ctx->new_data_part,
-        global_ctx->space_reservation
-    );
-}
-
-
-bool MergeTask::ExecuteAndFinalizeHorizontalPart::executeMergeProjections() const
-{
-    /// In case if there are no projections we didn't construct a task
-    if (!ctx->merge_projection_parts_task_ptr)
-        return false;
-
-    if (ctx->merge_projection_parts_task_ptr->executeStep())
-        return true;
-
-    ++ctx->projection_parts_iterator;
-
-    if (ctx->projection_parts_iterator == std::make_move_iterator(ctx->projection_parts.end()))
-        return false;
-
-    constructTaskForProjectionPartsMerge();
-
-    return true;
-}
-
-bool MergeTask::ExecuteAndFinalizeHorizontalPart::executeImpl() const
-{
-    Stopwatch watch(CLOCK_MONOTONIC_COARSE);
-    UInt64 step_time_ms = global_ctx->data->getSettings()->background_task_preferred_step_execution_time_ms.totalMilliseconds();
-
-    do
-    {
-        Block block;
-
-        if (ctx->is_cancelled() || !global_ctx->merging_executor->pull(block))
-        {
-            finalize();
-            return false;
-        }
-
         global_ctx->rows_written += block.rows();
-        const_cast<MergedBlockOutputStream &>(*global_ctx->to).write(block);
 
-        calculateProjections(block);
+        const_cast<MergedBlockOutputStream &>(*global_ctx->to).write(block);
 
         UInt64 result_rows = 0;
         UInt64 result_bytes = 0;
@@ -783,16 +510,11 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::executeImpl() const
 
             global_ctx->space_reservation->update(static_cast<size_t>((1. - progress) * ctx->initial_reservation));
         }
-    } while (watch.elapsedMilliseconds() < step_time_ms);
 
-    /// Need execute again
-    return true;
-}
+        /// Need execute again
+        return true;
+    }
 
-
-void MergeTask::ExecuteAndFinalizeHorizontalPart::finalize() const
-{
-    finalizeProjections();
     global_ctx->merging_executor.reset();
     global_ctx->merged_pipeline.reset();
 
@@ -802,13 +524,17 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::finalize() const
     if (ctx->need_remove_expired_values && global_ctx->ttl_merges_blocker->isCancelled())
         throw Exception(ErrorCodes::ABORTED, "Cancelled merging parts with expired TTL");
 
+    const auto data_settings = global_ctx->data->getSettings();
     const size_t sum_compressed_bytes_upper_bound = global_ctx->merge_list_element_ptr->total_size_bytes_compressed;
-    ctx->need_sync = needSyncPart(ctx->sum_input_rows_upper_bound, sum_compressed_bytes_upper_bound, *global_ctx->data->getSettings());
+    ctx->need_sync = needSyncPart(ctx->sum_input_rows_upper_bound, sum_compressed_bytes_upper_bound, *data_settings);
+
+    return false;
 }
 
+
 bool MergeTask::VerticalMergeStage::prepareVerticalMergeForAllColumns() const
 {
-    /// No need to execute this part if it is horizontal merge.
+     /// No need to execute this part if it is horizontal merge.
     if (global_ctx->chosen_merge_algorithm != MergeAlgorithm::Vertical)
         return false;
 
@@ -818,7 +544,11 @@ bool MergeTask::VerticalMergeStage::prepareVerticalMergeForAllColumns() const
     global_ctx->merge_list_element_ptr->progress.store(ctx->column_sizes->keyColumnsWeight(), std::memory_order_relaxed);
 
     /// Ensure data has written to disk.
-    size_t rows_sources_count = ctx->rows_sources_temporary_file->finalizeWriting();
+    ctx->rows_sources_write_buf->finalize();
+    ctx->rows_sources_uncompressed_write_buf->finalize();
+    ctx->rows_sources_uncompressed_write_buf->finalize();
+
+    size_t rows_sources_count = ctx->rows_sources_write_buf->count();
     /// In special case, when there is only one source part, and no rows were skipped, we may have
     /// skipped writing rows_sources file. Otherwise rows_sources_count must be equal to the total
     /// number of input rows.
@@ -829,6 +559,29 @@ bool MergeTask::VerticalMergeStage::prepareVerticalMergeForAllColumns() const
                         "of bytes written to rows_sources file ({}). It is a bug.",
                         sum_input_rows_exact, input_rows_filtered, rows_sources_count);
 
+    /// TemporaryDataOnDisk::createRawStream returns WriteBufferFromFile implementing IReadableWriteBuffer
+    /// and we expect to get ReadBufferFromFile here.
+    /// So, it's relatively safe to use dynamic_cast here and downcast to ReadBufferFromFile.
+    auto * wbuf_readable = dynamic_cast<IReadableWriteBuffer *>(ctx->rows_sources_uncompressed_write_buf.get());
+    std::unique_ptr<ReadBuffer> reread_buf = wbuf_readable ? wbuf_readable->tryGetReadBuffer() : nullptr;
+    if (!reread_buf)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot read temporary file {}", ctx->rows_sources_uncompressed_write_buf->getFileName());
+
+    auto * reread_buffer_raw = dynamic_cast<ReadBufferFromFileBase *>(reread_buf.get());
+    if (!reread_buffer_raw)
+    {
+        const auto & reread_buf_ref = *reread_buf;
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected ReadBufferFromFileBase, but got {}", demangle(typeid(reread_buf_ref).name()));
+    }
+    /// Move ownership from std::unique_ptr<ReadBuffer> to std::unique_ptr<ReadBufferFromFile> for CompressedReadBufferFromFile.
+    /// First, release ownership from unique_ptr to base type.
+    reread_buf.release(); /// NOLINT(bugprone-unused-return-value,hicpp-ignored-remove-result): we already have the pointer value in `reread_buffer_raw`
+
+    /// Then, move ownership to unique_ptr to concrete type.
+    std::unique_ptr<ReadBufferFromFileBase> reread_buffer_from_file(reread_buffer_raw);
+
+    /// CompressedReadBufferFromFile expects std::unique_ptr<ReadBufferFromFile> as argument.
+    ctx->rows_sources_read_buf = std::make_unique<CompressedReadBufferFromFile>(std::move(reread_buffer_from_file));
     ctx->it_name_and_type = global_ctx->gathering_columns.cbegin();
 
     const auto & settings = global_ctx->context->getSettingsRef();
@@ -848,158 +601,32 @@ bool MergeTask::VerticalMergeStage::prepareVerticalMergeForAllColumns() const
     ctx->use_prefetch = all_parts_on_remote_disks && global_ctx->data->getSettings()->vertical_merge_remote_filesystem_prefetch;
 
     if (ctx->use_prefetch && ctx->it_name_and_type != global_ctx->gathering_columns.end())
-        ctx->prepared_pipeline = createPipelineForReadingOneColumn(ctx->it_name_and_type->name);
+        ctx->prepared_pipe = createPipeForReadingOneColumn(ctx->it_name_and_type->name);
 
     return false;
 }
 
-/// Gathers values from all parts for one column using rows sources temporary file
-class ColumnGathererStep : public ITransformingStep
+Pipe MergeTask::VerticalMergeStage::createPipeForReadingOneColumn(const String & column_name) const
 {
-public:
-    ColumnGathererStep(
-        const DataStream & input_stream_,
-        const String & rows_sources_temporary_file_name_,
-        UInt64 merge_block_size_rows_,
-        UInt64 merge_block_size_bytes_,
-        bool is_result_sparse_)
-        : ITransformingStep(input_stream_, input_stream_.header, getTraits())
-        , rows_sources_temporary_file_name(rows_sources_temporary_file_name_)
-        , merge_block_size_rows(merge_block_size_rows_)
-        , merge_block_size_bytes(merge_block_size_bytes_)
-        , is_result_sparse(is_result_sparse_)
-    {}
-
-    String getName() const override { return "ColumnGatherer"; }
-
-    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & pipeline_settings) override
-    {
-        const auto &header = pipeline.getHeader();
-        const auto input_streams_count = pipeline.getNumStreams();
-
-        if (!pipeline_settings.temporary_file_lookup)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Temporary file lookup is not set in pipeline settings for vertical merge");
-
-        auto rows_sources_read_buf = pipeline_settings.temporary_file_lookup->getTemporaryFileForReading(rows_sources_temporary_file_name);
-
-        auto transform = std::make_unique<ColumnGathererTransform>(
-            header,
-            input_streams_count,
-            std::move(rows_sources_read_buf),
-            merge_block_size_rows,
-            merge_block_size_bytes,
-            is_result_sparse);
-
-        pipeline.addTransform(std::move(transform));
-    }
-
-    void updateOutputStream() override
-    {
-        output_stream = createOutputStream(input_streams.front(), input_streams.front().header, getDataStreamTraits());
-    }
-
-private:
-    static Traits getTraits()
-    {
-        return ITransformingStep::Traits
-        {
-            {
-                .returns_single_stream = true,
-                .preserves_number_of_streams = true,
-                .preserves_sorting = true,
-            },
-            {
-                .preserves_number_of_rows = false,
-            }
-        };
-    }
-
-    MergeTreeData::MergingParams merging_params{};
-    const String rows_sources_temporary_file_name;
-    const UInt64 merge_block_size_rows;
-    const UInt64 merge_block_size_bytes;
-    const bool is_result_sparse;
-};
-
-MergeTask::VerticalMergeRuntimeContext::PreparedColumnPipeline MergeTask::VerticalMergeStage::createPipelineForReadingOneColumn(const String & column_name) const
-{
-    /// Read from all parts
-    std::vector<QueryPlanPtr> plans;
+    Pipes pipes;
     for (size_t part_num = 0; part_num < global_ctx->future_part->parts.size(); ++part_num)
     {
-        auto plan_for_part = std::make_unique<QueryPlan>();
-        createReadFromPartStep(
+        Pipe pipe = createMergeTreeSequentialSource(
             MergeTreeSequentialSourceType::Merge,
-            *plan_for_part,
             *global_ctx->data,
             global_ctx->storage_snapshot,
             global_ctx->future_part->parts[part_num],
-            global_ctx->alter_conversions[part_num],
             Names{column_name},
+            /*mark_ranges=*/ {},
             global_ctx->input_rows_filtered,
             /*apply_deleted_mask=*/ true,
-            std::nullopt,
             ctx->read_with_direct_io,
-            ctx->use_prefetch,
-            global_ctx->context,
-            getLogger("VerticalMergeStage"));
+            ctx->use_prefetch);
 
-        plans.emplace_back(std::move(plan_for_part));
+        pipes.emplace_back(std::move(pipe));
     }
 
-    QueryPlan merge_column_query_plan;
-
-    /// Union of all parts streams
-    {
-        DataStreams input_streams;
-        input_streams.reserve(plans.size());
-        for (auto & plan : plans)
-            input_streams.emplace_back(plan->getCurrentDataStream());
-
-        auto union_step = std::make_unique<UnionStep>(std::move(input_streams));
-        merge_column_query_plan.unitePlans(std::move(union_step), std::move(plans));
-    }
-
-    /// Add column gatherer step
-    {
-        bool is_result_sparse = global_ctx->new_data_part->getSerialization(column_name)->getKind() == ISerialization::Kind::SPARSE;
-        const auto data_settings = global_ctx->data->getSettings();
-        auto merge_step = std::make_unique<ColumnGathererStep>(
-            merge_column_query_plan.getCurrentDataStream(),
-            RowsSourcesTemporaryFile::FILE_ID,
-            data_settings->merge_max_block_size,
-            data_settings->merge_max_block_size_bytes,
-            is_result_sparse);
-        merge_step->setStepDescription("Gather column");
-        merge_column_query_plan.addStep(std::move(merge_step));
-    }
-
-    /// Add expression step for indexes
-    MergeTreeIndices indexes_to_recalc;
-    IndicesDescription indexes_to_recalc_description;
-    {
-        auto indexes_it = global_ctx->skip_indexes_by_column.find(column_name);
-
-        if (indexes_it != global_ctx->skip_indexes_by_column.end())
-        {
-            indexes_to_recalc_description = indexes_it->second;
-            indexes_to_recalc = MergeTreeIndexFactory::instance().getMany(indexes_it->second);
-
-            auto indices_expression_dag = indexes_it->second.getSingleExpressionForIndices(global_ctx->metadata_snapshot->getColumns(), global_ctx->data->getContext())->getActionsDAG().clone();
-            indices_expression_dag.addMaterializingOutputActions(); /// Const columns cannot be written without materialization.
-            auto calculate_indices_expression_step = std::make_unique<ExpressionStep>(
-                merge_column_query_plan.getCurrentDataStream(),
-                std::move(indices_expression_dag));
-            merge_column_query_plan.addStep(std::move(calculate_indices_expression_step));
-        }
-    }
-
-    auto pipeline_settings = BuildQueryPipelineSettings::fromContext(global_ctx->context);
-    pipeline_settings.temporary_file_lookup = ctx->rows_sources_temporary_file;
-    auto optimization_settings = QueryPlanOptimizationSettings::fromContext(global_ctx->context);
-    auto builder = merge_column_query_plan.buildQueryPipeline(optimization_settings, pipeline_settings);
-
-    return {QueryPipelineBuilder::getPipeline(std::move(*builder)), std::move(indexes_to_recalc)};
+    return Pipe::unitePipes(std::move(pipes));
 }
 
 void MergeTask::VerticalMergeStage::prepareVerticalMergeForOneColumn() const
@@ -1009,22 +636,50 @@ void MergeTask::VerticalMergeStage::prepareVerticalMergeForOneColumn() const
     ctx->progress_before = global_ctx->merge_list_element_ptr->progress.load(std::memory_order_relaxed);
     global_ctx->column_progress = std::make_unique<MergeStageProgress>(ctx->progress_before, ctx->column_sizes->columnWeight(column_name));
 
-    VerticalMergeRuntimeContext::PreparedColumnPipeline column_pipepline;
-    if (ctx->prepared_pipeline)
+    Pipe pipe;
+    if (ctx->prepared_pipe)
     {
-        column_pipepline = std::move(*ctx->prepared_pipeline);
+        pipe = std::move(*ctx->prepared_pipe);
 
-        /// Prepare next column pipeline to initiate prefetching
         auto next_column_it = std::next(ctx->it_name_and_type);
         if (next_column_it != global_ctx->gathering_columns.end())
-            ctx->prepared_pipeline = createPipelineForReadingOneColumn(next_column_it->name);
+            ctx->prepared_pipe = createPipeForReadingOneColumn(next_column_it->name);
     }
     else
     {
-        column_pipepline = createPipelineForReadingOneColumn(column_name);
+        pipe = createPipeForReadingOneColumn(column_name);
     }
 
-    ctx->column_parts_pipeline = std::move(column_pipepline.pipeline);
+    ctx->rows_sources_read_buf->seek(0, 0);
+    bool is_result_sparse = global_ctx->new_data_part->getSerialization(column_name)->getKind() == ISerialization::Kind::SPARSE;
+
+    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,
+        is_result_sparse);
+
+    pipe.addTransform(std::move(transform));
+
+    MergeTreeIndices indexes_to_recalc;
+    auto indexes_it = global_ctx->skip_indexes_by_column.find(column_name);
+
+    if (indexes_it != global_ctx->skip_indexes_by_column.end())
+    {
+        indexes_to_recalc = MergeTreeIndexFactory::instance().getMany(indexes_it->second);
+
+        pipe.addTransform(std::make_shared<ExpressionTransform>(
+            pipe.getHeader(),
+            indexes_it->second.getSingleExpressionForIndices(global_ctx->metadata_snapshot->getColumns(),
+            global_ctx->data->getContext())));
+
+        pipe.addTransform(std::make_shared<MaterializingTransform>(pipe.getHeader()));
+    }
+
+    ctx->column_parts_pipeline = QueryPipeline(std::move(pipe));
 
     /// Dereference unique_ptr
     ctx->column_parts_pipeline.setProgressCallback(MergeProgressCallback(
@@ -1042,7 +697,7 @@ void MergeTask::VerticalMergeStage::prepareVerticalMergeForOneColumn() const
         global_ctx->metadata_snapshot,
         columns_list,
         ctx->compression_codec,
-        column_pipepline.indexes_to_recalc,
+        indexes_to_recalc,
         getStatisticsForColumns(columns_list, global_ctx->metadata_snapshot),
         &global_ctx->written_offset_columns,
         global_ctx->to->getIndexGranularity());
@@ -1053,24 +708,17 @@ void MergeTask::VerticalMergeStage::prepareVerticalMergeForOneColumn() const
 
 bool MergeTask::VerticalMergeStage::executeVerticalMergeForOneColumn() const
 {
-    Stopwatch watch(CLOCK_MONOTONIC_COARSE);
-    UInt64 step_time_ms = global_ctx->data->getSettings()->background_task_preferred_step_execution_time_ms.totalMilliseconds();
-
-    do
+    Block block;
+    if (!global_ctx->merges_blocker->isCancelled() && !global_ctx->merge_list_element_ptr->is_cancelled.load(std::memory_order_relaxed)
+        && ctx->executor->pull(block))
     {
-        Block block;
-
-        if (global_ctx->merges_blocker->isCancelled()
-            || global_ctx->merge_list_element_ptr->is_cancelled.load(std::memory_order_relaxed)
-            || !ctx->executor->pull(block))
-            return false;
-
         ctx->column_elems_written += block.rows();
         ctx->column_to->write(block);
-    } while (watch.elapsedMilliseconds() < step_time_ms);
 
-    /// Need execute again
-    return true;
+        /// Need execute again
+        return true;
+    }
+    return false;
 }
 
 
@@ -1136,9 +784,6 @@ bool MergeTask::MergeProjectionsStage::mergeMinMaxIndexAndPrepareProjections() c
 
     /// Print overall profiling info. NOTE: it may duplicates previous messages
     {
-        ProfileEvents::increment(ProfileEvents::MergedColumns, global_ctx->merging_columns.size());
-        ProfileEvents::increment(ProfileEvents::GatheredColumns, global_ctx->gathering_columns.size());
-
         double elapsed_seconds = global_ctx->merge_list_element_ptr->watch.elapsedSeconds();
         LOG_DEBUG(ctx->log,
             "Merge sorted {} rows, containing {} columns ({} merged, {} gathered) in {} sec., {} rows/sec., {}/sec.",
@@ -1151,9 +796,25 @@ bool MergeTask::MergeProjectionsStage::mergeMinMaxIndexAndPrepareProjections() c
             ReadableSize(global_ctx->merge_list_element_ptr->bytes_read_uncompressed / elapsed_seconds));
     }
 
-    for (const auto & projection : global_ctx->projections_to_merge)
+
+    const auto & projections = global_ctx->metadata_snapshot->getProjections();
+
+    for (const auto & projection : projections)
     {
-        MergeTreeData::DataPartsVector projection_parts = global_ctx->projections_to_merge_parts[projection->name];
+        MergeTreeData::DataPartsVector projection_parts;
+        for (const auto & part : global_ctx->future_part->parts)
+        {
+            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())
+        {
+            LOG_DEBUG(ctx->log, "Projection {} is not merged because some parts don't have it", projection.name);
+            continue;
+        }
+
         LOG_DEBUG(
             ctx->log,
             "Selected {} projection_parts from {} to {}",
@@ -1163,25 +824,24 @@ bool MergeTask::MergeProjectionsStage::mergeMinMaxIndexAndPrepareProjections() c
 
         auto projection_future_part = std::make_shared<FutureMergedMutatedPart>();
         projection_future_part->assign(std::move(projection_parts));
-        projection_future_part->name = projection->name;
+        projection_future_part->name = projection.name;
         // TODO (ab): path in future_part is only for merge process introspection, which is not available for merges of projection parts.
         // Let's comment this out to avoid code inconsistency and add it back after we implement projection merge introspection.
         // projection_future_part->path = global_ctx->future_part->path + "/" + projection.name + ".proj/";
-        projection_future_part->part_info = MergeListElement::FAKE_RESULT_PART_FOR_PROJECTION;
+        projection_future_part->part_info = {"all", 0, 0, 0};
 
         MergeTreeData::MergingParams projection_merging_params;
         projection_merging_params.mode = MergeTreeData::MergingParams::Ordinary;
-        if (projection->type == ProjectionDescription::Type::Aggregate)
+        if (projection.type == ProjectionDescription::Type::Aggregate)
             projection_merging_params.mode = MergeTreeData::MergingParams::Aggregating;
 
         ctx->tasks_for_projections.emplace_back(std::make_shared<MergeTask>(
             projection_future_part,
-            projection->metadata,
+            projection.metadata,
             global_ctx->merge_entry,
             std::make_unique<MergeListElement>((*global_ctx->merge_entry)->table_id, projection_future_part, global_ctx->context),
             global_ctx->time_of_merge,
             global_ctx->context,
-            *global_ctx->holder,
             global_ctx->space_reservation,
             global_ctx->deduplicate,
             global_ctx->deduplicate_by_columns,
@@ -1236,29 +896,12 @@ bool MergeTask::MergeProjectionsStage::finalizeProjectionsAndWholeMerge() const
     return false;
 }
 
-MergeTask::StageRuntimeContextPtr MergeTask::MergeProjectionsStage::getContextForNextStage()
-{
-    /// Do not increment for projection stage because time is already accounted in main task.
-    /// The projection stage has its own empty projection stage which may add a drift of several milliseconds.
-    if (global_ctx->parent_part == nullptr)
-    {
-        ProfileEvents::increment(ProfileEvents::MergeExecuteMilliseconds, ctx->elapsed_execute_ns / 1000000UL);
-        ProfileEvents::increment(ProfileEvents::MergeProjectionStageExecuteMilliseconds, ctx->elapsed_execute_ns / 1000000UL);
-    }
-
-    return nullptr;
-}
 
 bool MergeTask::VerticalMergeStage::execute()
 {
-    chassert(subtasks_iterator != subtasks.end());
-
-    Stopwatch watch;
-    bool res = (this->**subtasks_iterator)();
-    ctx->elapsed_execute_ns += watch.elapsedNanoseconds();
-
-    if (res)
-        return res;
+    assert(subtasks_iterator != subtasks.end());
+    if ((this->**subtasks_iterator)())
+        return true;
 
     /// Move to the next subtask in an array of subtasks
     ++subtasks_iterator;
@@ -1267,14 +910,9 @@ bool MergeTask::VerticalMergeStage::execute()
 
 bool MergeTask::MergeProjectionsStage::execute()
 {
-    chassert(subtasks_iterator != subtasks.end());
-
-    Stopwatch watch;
-    bool res = (this->**subtasks_iterator)();
-    ctx->elapsed_execute_ns += watch.elapsedNanoseconds();
-
-    if (res)
-        return res;
+    assert(subtasks_iterator != subtasks.end());
+    if ((this->**subtasks_iterator)())
+        return true;
 
     /// Move to the next subtask in an array of subtasks
     ++subtasks_iterator;
@@ -1321,26 +959,12 @@ bool MergeTask::VerticalMergeStage::executeVerticalMergeForAllColumns() const
 
 bool MergeTask::execute()
 {
-    chassert(stages_iterator != stages.end());
-    const auto & current_stage = *stages_iterator;
-
-    if (current_stage->execute())
+    assert(stages_iterator != stages.end());
+    if ((*stages_iterator)->execute())
         return true;
 
-    /// Stage is finished, need to initialize context for the next stage and update profile events.
-
-    UInt64 current_elapsed_ms = global_ctx->merge_list_element_ptr->watch.elapsedMilliseconds();
-    UInt64 stage_elapsed_ms = current_elapsed_ms - global_ctx->prev_elapsed_ms;
-    global_ctx->prev_elapsed_ms = current_elapsed_ms;
-
-    auto next_stage_context = current_stage->getContextForNextStage();
-
-    /// Do not increment for projection stage because time is already accounted in main task.
-    if (global_ctx->parent_part == nullptr)
-    {
-        ProfileEvents::increment(current_stage->getTotalTimeProfileEvent(), stage_elapsed_ms);
-        ProfileEvents::increment(ProfileEvents::MergeTotalMilliseconds, stage_elapsed_ms);
-    }
+    /// Stage is finished, need initialize context for the next stage
+    auto next_stage_context = (*stages_iterator)->getContextForNextStage();
 
     /// Move to the next stage in an array of stages
     ++stages_iterator;
@@ -1352,208 +976,12 @@ bool MergeTask::execute()
 }
 
 
-/// Apply merge strategy (Ordinary, Colapsing, Aggregating, etc) to the stream
-class MergePartsStep : public ITransformingStep
-{
-public:
-    MergePartsStep(
-        const DataStream & input_stream_,
-        const SortDescription & sort_description_,
-        const Names partition_key_columns_,
-        const MergeTreeData::MergingParams & merging_params_,
-        const String & rows_sources_temporary_file_name_,
-        UInt64 merge_block_size_rows_,
-        UInt64 merge_block_size_bytes_,
-        bool blocks_are_granules_size_,
-        bool cleanup_,
-        time_t time_of_merge_)
-        : ITransformingStep(input_stream_, input_stream_.header, getTraits())
-        , sort_description(sort_description_)
-        , partition_key_columns(partition_key_columns_)
-        , merging_params(merging_params_)
-        , rows_sources_temporary_file_name(rows_sources_temporary_file_name_)
-        , merge_block_size_rows(merge_block_size_rows_)
-        , merge_block_size_bytes(merge_block_size_bytes_)
-        , blocks_are_granules_size(blocks_are_granules_size_)
-        , cleanup(cleanup_)
-        , time_of_merge(time_of_merge_)
-    {}
-
-    String getName() const override { return "MergeParts"; }
-
-    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & pipeline_settings) override
-    {
-        /// The order of the streams is important: when the key is matched, the elements go in the order of the source stream number.
-        /// In the merged part, the lines with the same key must be in the ascending order of the identifier of original part,
-        ///  that is going in insertion order.
-        ProcessorPtr merged_transform;
-
-        const auto &header = pipeline.getHeader();
-        const auto input_streams_count = pipeline.getNumStreams();
-
-        WriteBuffer * rows_sources_write_buf = nullptr;
-        if (!rows_sources_temporary_file_name.empty())
-        {
-            if (!pipeline_settings.temporary_file_lookup)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Temporary file lookup is not set in pipeline settings for vertical merge");
-            rows_sources_write_buf = &pipeline_settings.temporary_file_lookup->getTemporaryFileForWriting(rows_sources_temporary_file_name);
-        }
-
-        switch (merging_params.mode)
-        {
-            case MergeTreeData::MergingParams::Ordinary:
-                merged_transform = std::make_shared<MergingSortedTransform>(
-                    header,
-                    input_streams_count,
-                    sort_description,
-                    merge_block_size_rows,
-                    merge_block_size_bytes,
-                    SortingQueueStrategy::Default,
-                    /* limit_= */0,
-                    /* always_read_till_end_= */false,
-                    rows_sources_write_buf,
-                    blocks_are_granules_size);
-                break;
-
-            case MergeTreeData::MergingParams::Collapsing:
-                merged_transform = std::make_shared<CollapsingSortedTransform>(
-                    header, input_streams_count, sort_description, merging_params.sign_column, false,
-                    merge_block_size_rows, merge_block_size_bytes, rows_sources_write_buf, blocks_are_granules_size);
-                break;
-
-            case MergeTreeData::MergingParams::Summing:
-                merged_transform = std::make_shared<SummingSortedTransform>(
-                    header, input_streams_count, sort_description, merging_params.columns_to_sum, partition_key_columns, merge_block_size_rows, merge_block_size_bytes);
-                break;
-
-            case MergeTreeData::MergingParams::Aggregating:
-                merged_transform = std::make_shared<AggregatingSortedTransform>(header, input_streams_count, sort_description, merge_block_size_rows, merge_block_size_bytes);
-                break;
-
-            case MergeTreeData::MergingParams::Replacing:
-                merged_transform = std::make_shared<ReplacingSortedTransform>(
-                    header, input_streams_count, sort_description, merging_params.is_deleted_column, merging_params.version_column,
-                    merge_block_size_rows, merge_block_size_bytes, rows_sources_write_buf, blocks_are_granules_size,
-                    cleanup);
-                break;
-
-            case MergeTreeData::MergingParams::Graphite:
-                merged_transform = std::make_shared<GraphiteRollupSortedTransform>(
-                    header, input_streams_count, sort_description, merge_block_size_rows, merge_block_size_bytes,
-                    merging_params.graphite_params, time_of_merge);
-                break;
-
-            case MergeTreeData::MergingParams::VersionedCollapsing:
-                merged_transform = std::make_shared<VersionedCollapsingTransform>(
-                    header, input_streams_count, sort_description, merging_params.sign_column,
-                    merge_block_size_rows, merge_block_size_bytes, rows_sources_write_buf, blocks_are_granules_size);
-                break;
-        }
-
-        pipeline.addTransform(std::move(merged_transform));
-
-#ifndef NDEBUG
-        if (!sort_description.empty())
-        {
-            pipeline.addSimpleTransform([&](const Block & header_)
-            {
-                auto transform = std::make_shared<CheckSortedTransform>(header_, sort_description);
-                return transform;
-            });
-        }
-#endif
-    }
-
-    void updateOutputStream() override
-    {
-        output_stream = createOutputStream(input_streams.front(), input_streams.front().header, getDataStreamTraits());
-    }
-
-private:
-    static Traits getTraits()
-    {
-        return ITransformingStep::Traits
-        {
-            {
-                .returns_single_stream = true,
-                .preserves_number_of_streams = true,
-                .preserves_sorting = true,
-            },
-            {
-                .preserves_number_of_rows = false,
-            }
-        };
-    }
-
-    const SortDescription sort_description;
-    const Names partition_key_columns;
-    const MergeTreeData::MergingParams merging_params{};
-    const String rows_sources_temporary_file_name;
-    const UInt64 merge_block_size_rows;
-    const UInt64 merge_block_size_bytes;
-    const bool blocks_are_granules_size;
-    const bool cleanup{false};
-    const time_t time_of_merge{0};
-};
-
-class TTLStep : public ITransformingStep
-{
-public:
-    TTLStep(
-        const DataStream & input_stream_,
-        const ContextPtr & context_,
-        const MergeTreeData & storage_,
-        const StorageMetadataPtr & metadata_snapshot_,
-        const MergeTreeData::MutableDataPartPtr & data_part_,
-        time_t current_time,
-        bool force_)
-        : ITransformingStep(input_stream_, input_stream_.header, getTraits())
-    {
-        transform = std::make_shared<TTLTransform>(context_, input_stream_.header, storage_, metadata_snapshot_, data_part_, current_time, force_);
-        subqueries_for_sets = transform->getSubqueries();
-    }
-
-    String getName() const override { return "TTL"; }
-
-    PreparedSets::Subqueries getSubqueries() { return std::move(subqueries_for_sets); }
-
-    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override
-    {
-        pipeline.addTransform(transform);
-    }
-
-    void updateOutputStream() override
-    {
-        output_stream = createOutputStream(input_streams.front(), input_streams.front().header, getDataStreamTraits());
-    }
-
-private:
-    static Traits getTraits()
-    {
-        return ITransformingStep::Traits
-        {
-            {
-                .returns_single_stream = true,
-                .preserves_number_of_streams = true,
-                .preserves_sorting = true,
-            },
-            {
-                .preserves_number_of_rows = false,
-            }
-        };
-    }
-
-    std::shared_ptr<TTLTransform> transform;
-    PreparedSets::Subqueries subqueries_for_sets;
-};
-
-
-void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream() const
+void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream()
 {
     /** Read from all parts, merge and write into a new one.
       * In passing, we calculate expression for sorting.
       */
-
+    Pipes pipes;
     global_ctx->watch_prev_elapsed = 0;
 
     /// We count total amount of bytes in parts
@@ -1580,92 +1008,143 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream() const
     global_ctx->horizontal_stage_progress = std::make_unique<MergeStageProgress>(
         ctx->column_sizes ? ctx->column_sizes->keyColumnsWeight() : 1.0);
 
-    /// Read from all parts
-    std::vector<QueryPlanPtr> plans;
-    for (size_t i = 0; i < global_ctx->future_part->parts.size(); ++i)
+    for (const auto & part : global_ctx->future_part->parts)
     {
-        if (global_ctx->future_part->parts[i]->getMarksCount() == 0)
-            LOG_TRACE(ctx->log, "Part {} is empty", global_ctx->future_part->parts[i]->name);
-
-        auto plan_for_part = std::make_unique<QueryPlan>();
-        createReadFromPartStep(
+        Pipe pipe = createMergeTreeSequentialSource(
             MergeTreeSequentialSourceType::Merge,
-            *plan_for_part,
             *global_ctx->data,
             global_ctx->storage_snapshot,
-            global_ctx->future_part->parts[i],
-            global_ctx->alter_conversions[i],
+            part,
             global_ctx->merging_columns.getNames(),
+            /*mark_ranges=*/ {},
             global_ctx->input_rows_filtered,
             /*apply_deleted_mask=*/ true,
-            /*filter=*/ std::nullopt,
             ctx->read_with_direct_io,
-            /*prefetch=*/ false,
-            global_ctx->context,
-            ctx->log);
+            /*prefetch=*/ false);
 
-        plans.emplace_back(std::move(plan_for_part));
+        if (global_ctx->metadata_snapshot->hasSortingKey())
+        {
+            pipe.addSimpleTransform([this](const Block & header)
+            {
+                return std::make_shared<ExpressionTransform>(header, global_ctx->metadata_snapshot->getSortingKey().expression);
+            });
+        }
+
+        pipes.emplace_back(std::move(pipe));
     }
 
-    QueryPlan merge_parts_query_plan;
 
-    /// Union of all parts streams
+    Names sort_columns = global_ctx->metadata_snapshot->getSortingKeyColumns();
+    SortDescription sort_description;
+    sort_description.compile_sort_description = global_ctx->data->getContext()->getSettingsRef().compile_sort_description;
+    sort_description.min_count_to_compile_sort_description = global_ctx->data->getContext()->getSettingsRef().min_count_to_compile_sort_description;
+
+    size_t sort_columns_size = sort_columns.size();
+    sort_description.reserve(sort_columns_size);
+
+    Names partition_key_columns = global_ctx->metadata_snapshot->getPartitionKey().column_names;
+
+    Block header = pipes.at(0).getHeader();
+    for (size_t i = 0; i < sort_columns_size; ++i)
+        sort_description.emplace_back(sort_columns[i], 1, 1);
+
+#ifndef NDEBUG
+    if (!sort_description.empty())
     {
-        DataStreams input_streams;
-        input_streams.reserve(plans.size());
-        for (auto & plan : plans)
-            input_streams.emplace_back(plan->getCurrentDataStream());
-
-        auto union_step = std::make_unique<UnionStep>(std::move(input_streams));
-        merge_parts_query_plan.unitePlans(std::move(union_step), std::move(plans));
+        for (size_t i = 0; i < pipes.size(); ++i)
+        {
+            auto & pipe = pipes[i];
+            pipe.addSimpleTransform([&](const Block & header_)
+            {
+                auto transform = std::make_shared<CheckSortedTransform>(header_, sort_description);
+                transform->setDescription(global_ctx->future_part->parts[i]->name);
+                return transform;
+            });
+        }
     }
+#endif
 
-    if (global_ctx->metadata_snapshot->hasSortingKey())
+    /// The order of the streams is important: when the key is matched, the elements go in the order of the source stream number.
+    /// In the merged part, the lines with the same key must be in the ascending order of the identifier of original part,
+    ///  that is going in insertion order.
+    ProcessorPtr merged_transform;
+
+    /// If merge is vertical we cannot calculate it
+    ctx->blocks_are_granules_size = (global_ctx->chosen_merge_algorithm == MergeAlgorithm::Vertical);
+
+    /// There is no sense to have the block size bigger than one granule for merge operations.
+    const UInt64 merge_block_size_rows = data_settings->merge_max_block_size;
+    const UInt64 merge_block_size_bytes = data_settings->merge_max_block_size_bytes;
+
+    switch (ctx->merging_params.mode)
     {
-        /// Calculate sorting key expressions so that they are available for merge sorting.
-        auto sorting_key_expression_dag = global_ctx->metadata_snapshot->getSortingKey().expression->getActionsDAG().clone();
-        auto calculate_sorting_key_expression_step = std::make_unique<ExpressionStep>(
-            merge_parts_query_plan.getCurrentDataStream(),
-            std::move(sorting_key_expression_dag));
-        merge_parts_query_plan.addStep(std::move(calculate_sorting_key_expression_step));
+        case MergeTreeData::MergingParams::Ordinary:
+            merged_transform = std::make_shared<MergingSortedTransform>(
+                header,
+                pipes.size(),
+                sort_description,
+                merge_block_size_rows,
+                merge_block_size_bytes,
+                SortingQueueStrategy::Default,
+                /* limit_= */0,
+                /* always_read_till_end_= */false,
+                ctx->rows_sources_write_buf.get(),
+                true,
+                ctx->blocks_are_granules_size);
+            break;
+
+        case MergeTreeData::MergingParams::Collapsing:
+            merged_transform = std::make_shared<CollapsingSortedTransform>(
+                header, pipes.size(), sort_description, ctx->merging_params.sign_column, false,
+                merge_block_size_rows, merge_block_size_bytes, ctx->rows_sources_write_buf.get(), ctx->blocks_are_granules_size);
+            break;
+
+        case MergeTreeData::MergingParams::Summing:
+            merged_transform = std::make_shared<SummingSortedTransform>(
+                header, pipes.size(), sort_description, ctx->merging_params.columns_to_sum, partition_key_columns, merge_block_size_rows, merge_block_size_bytes);
+            break;
+
+        case MergeTreeData::MergingParams::Aggregating:
+            merged_transform = std::make_shared<AggregatingSortedTransform>(header, pipes.size(), sort_description, merge_block_size_rows, merge_block_size_bytes);
+            break;
+
+        case MergeTreeData::MergingParams::Replacing:
+            if (global_ctx->cleanup && !data_settings->allow_experimental_replacing_merge_with_cleanup)
+                throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Experimental merges with CLEANUP are not allowed");
+
+            merged_transform = std::make_shared<ReplacingSortedTransform>(
+                header, pipes.size(), sort_description, ctx->merging_params.is_deleted_column, ctx->merging_params.version_column,
+                merge_block_size_rows, merge_block_size_bytes, ctx->rows_sources_write_buf.get(), ctx->blocks_are_granules_size,
+                global_ctx->cleanup);
+            break;
+
+        case MergeTreeData::MergingParams::Graphite:
+            merged_transform = std::make_shared<GraphiteRollupSortedTransform>(
+                header, pipes.size(), sort_description, merge_block_size_rows, merge_block_size_bytes,
+                ctx->merging_params.graphite_params, global_ctx->time_of_merge);
+            break;
+
+        case MergeTreeData::MergingParams::VersionedCollapsing:
+            merged_transform = std::make_shared<VersionedCollapsingTransform>(
+                header, pipes.size(), sort_description, ctx->merging_params.sign_column,
+                merge_block_size_rows, merge_block_size_bytes, ctx->rows_sources_write_buf.get(), ctx->blocks_are_granules_size);
+            break;
     }
 
-    /// Merge
+    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())
     {
-        Names sort_columns = global_ctx->metadata_snapshot->getSortingKeyColumns();
-        SortDescription sort_description;
-        sort_description.compile_sort_description = global_ctx->data->getContext()->getSettingsRef().compile_sort_description;
-        sort_description.min_count_to_compile_sort_description = global_ctx->data->getContext()->getSettingsRef().min_count_to_compile_sort_description;
-
-        size_t sort_columns_size = sort_columns.size();
-        sort_description.reserve(sort_columns_size);
-
-        Names partition_key_columns = global_ctx->metadata_snapshot->getPartitionKey().column_names;
-
-        for (size_t i = 0; i < sort_columns_size; ++i)
-            sort_description.emplace_back(sort_columns[i], 1, 1);
-
-        const bool is_vertical_merge = (global_ctx->chosen_merge_algorithm == MergeAlgorithm::Vertical);
-        /// If merge is vertical we cannot calculate it
-        ctx->blocks_are_granules_size = is_vertical_merge;
-
-        if (global_ctx->cleanup && !data_settings->allow_experimental_replacing_merge_with_cleanup)
-            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Experimental merges with CLEANUP are not allowed");
-
-        auto merge_step = std::make_unique<MergePartsStep>(
-            merge_parts_query_plan.getCurrentDataStream(),
-            sort_description,
-            partition_key_columns,
-            ctx->merging_params,
-            (is_vertical_merge ? RowsSourcesTemporaryFile::FILE_ID : ""),  /// rows_sources temporaty file is used only for vertical merge
-            data_settings->merge_max_block_size,
-            data_settings->merge_max_block_size_bytes,
-            ctx->blocks_are_granules_size,
-            global_ctx->cleanup,
-            global_ctx->time_of_merge);
-        merge_step->setStepDescription("Merge sorted parts");
-        merge_parts_query_plan.addStep(std::move(merge_step));
+        builder->addSimpleTransform([&](const Block & header_)
+        {
+            auto transform = std::make_shared<CheckSortedTransform>(header_, sort_description);
+            return transform;
+        });
     }
+#endif
 
     if (global_ctx->deduplicate)
     {
@@ -1684,51 +1163,37 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream() const
             }
         }
 
-        auto deduplication_step = std::make_unique<DistinctStep>(
-            merge_parts_query_plan.getCurrentDataStream(),
-            SizeLimits(), 0 /*limit_hint*/,
-            global_ctx->deduplicate_by_columns,
-            false /*pre_distinct*/,
-            true /*optimize_distinct_in_order TODO: looks like it should be enabled*/);
-        deduplication_step->setStepDescription("Deduplication step");
-        merge_parts_query_plan.addStep(std::move(deduplication_step));
+        if (DistinctSortedTransform::isApplicable(header, sort_description, 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
+            builder->addTransform(std::make_shared<DistinctTransform>(
+                builder->getHeader(), SizeLimits(), 0 /*limit_hint*/, global_ctx->deduplicate_by_columns));
     }
 
     PreparedSets::Subqueries subqueries;
 
-    /// TTL step
     if (ctx->need_remove_expired_values)
     {
-        auto ttl_step = std::make_unique<TTLStep>(
-            merge_parts_query_plan.getCurrentDataStream(), global_ctx->context, *global_ctx->data, global_ctx->metadata_snapshot, global_ctx->new_data_part, global_ctx->time_of_merge, ctx->force_ttl);
-        subqueries = ttl_step->getSubqueries();
-        ttl_step->setStepDescription("TTL step");
-        merge_parts_query_plan.addStep(std::move(ttl_step));
+        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));
     }
 
-    /// Secondary indices expressions
     if (!global_ctx->merging_skip_indexes.empty())
     {
-        auto indices_expression_dag = global_ctx->merging_skip_indexes.getSingleExpressionForIndices(global_ctx->metadata_snapshot->getColumns(), global_ctx->data->getContext())->getActionsDAG().clone();
-        indices_expression_dag.addMaterializingOutputActions(); /// Const columns cannot be written without materialization.
-        auto calculate_indices_expression_step = std::make_unique<ExpressionStep>(
-            merge_parts_query_plan.getCurrentDataStream(),
-            std::move(indices_expression_dag));
-        merge_parts_query_plan.addStep(std::move(calculate_indices_expression_step));
+        builder->addTransform(std::make_shared<ExpressionTransform>(
+            builder->getHeader(),
+            global_ctx->merging_skip_indexes.getSingleExpressionForIndices(global_ctx->metadata_snapshot->getColumns(),
+            global_ctx->data->getContext())));
+
+        builder->addTransform(std::make_shared<MaterializingTransform>(builder->getHeader()));
     }
 
     if (!subqueries.empty())
-        addCreatingSetsStep(merge_parts_query_plan, std::move(subqueries), global_ctx->context);
-
-    {
-        auto pipeline_settings = BuildQueryPipelineSettings::fromContext(global_ctx->context);
-        pipeline_settings.temporary_file_lookup = ctx->rows_sources_temporary_file;
-        auto optimization_settings = QueryPlanOptimizationSettings::fromContext(global_ctx->context);
-        auto builder = merge_parts_query_plan.buildQueryPipeline(optimization_settings, pipeline_settings);
-
-        global_ctx->merged_pipeline = QueryPipelineBuilder::getPipeline(std::move(*builder));
-    }
+        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 ef187e1de2f..8b0f2130e8e 100644
--- a/src/Storages/MergeTree/MergeTask.h
+++ b/src/Storages/MergeTree/MergeTask.h
@@ -3,13 +3,11 @@
 #include <list>
 #include <memory>
 
-#include <Common/ProfileEvents.h>
 #include <Common/filesystemHelpers.h>
 
 #include <Compression/CompressedReadBuffer.h>
 #include <Compression/CompressedReadBufferFromFile.h>
 
-#include <Interpreters/Squashing.h>
 #include <Interpreters/TemporaryDataOnDisk.h>
 
 #include <Processors/Executors/PullingPipelineExecutor.h>
@@ -28,19 +26,12 @@
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/MergeTreeIndices.h>
 
-namespace ProfileEvents
-{
-    extern const Event MergeHorizontalStageTotalMilliseconds;
-    extern const Event MergeVerticalStageTotalMilliseconds;
-    extern const Event MergeProjectionStageTotalMilliseconds;
-}
 
 namespace DB
 {
 
 class MergeTask;
 using MergeTaskPtr = std::shared_ptr<MergeTask>;
-class RowsSourcesTemporaryFile;
 
 /**
  * Overview of the merge algorithm
@@ -74,7 +65,6 @@ public:
         std::unique_ptr<MergeListElement> projection_merge_list_element_,
         time_t time_of_merge_,
         ContextPtr context_,
-        TableLockHolder & holder,
         ReservationSharedPtr space_reservation_,
         bool deduplicate_,
         Names deduplicate_by_columns_,
@@ -99,7 +89,6 @@ public:
                 = global_ctx->projection_merge_list_element ? global_ctx->projection_merge_list_element.get() : (*global_ctx->merge_entry)->ptr();
             global_ctx->time_of_merge = std::move(time_of_merge_);
             global_ctx->context = std::move(context_);
-            global_ctx->holder = &holder;
             global_ctx->space_reservation = std::move(space_reservation_);
             global_ctx->deduplicate = std::move(deduplicate_);
             global_ctx->deduplicate_by_columns = std::move(deduplicate_by_columns_);
@@ -145,7 +134,6 @@ private:
     {
         virtual void setRuntimeContext(StageRuntimeContextPtr local, StageRuntimeContextPtr global) = 0;
         virtual StageRuntimeContextPtr getContextForNextStage() = 0;
-        virtual ProfileEvents::Event getTotalTimeProfileEvent() const = 0;
         virtual bool execute() = 0;
         virtual ~IStage() = default;
     };
@@ -155,7 +143,6 @@ private:
     /// Proper initialization is responsibility of the author
     struct GlobalRuntimeContext : public IStageRuntimeContext
     {
-        TableLockHolder * holder;
         MergeList::Entry * merge_entry{nullptr};
         /// If not null, use this instead of the global MergeList::Entry. This is for merging projections.
         std::unique_ptr<MergeListElement> projection_merge_list_element;
@@ -167,7 +154,6 @@ private:
         StorageSnapshotPtr storage_snapshot{nullptr};
         StorageMetadataPtr metadata_snapshot{nullptr};
         FutureMergedMutatedPartPtr future_part{nullptr};
-        std::vector<AlterConversionsPtr> alter_conversions;
         /// This will be either nullptr or new_data_part, so raw pointer is ok.
         IMergeTreeDataPart * parent_part{nullptr};
         ContextPtr context{nullptr};
@@ -187,10 +173,6 @@ private:
 
         MergeAlgorithm chosen_merge_algorithm{MergeAlgorithm::Undecided};
 
-        std::vector<ProjectionDescriptionRawPtr> projections_to_rebuild{};
-        std::vector<ProjectionDescriptionRawPtr> projections_to_merge{};
-        std::map<String, MergeTreeData::DataPartsVector> projections_to_merge_parts{};
-
         std::unique_ptr<MergeStageProgress> horizontal_stage_progress{nullptr};
         std::unique_ptr<MergeStageProgress> column_progress{nullptr};
 
@@ -213,7 +195,6 @@ private:
         bool need_prefix;
 
         scope_guard temporary_directory_lock;
-        UInt64 prev_elapsed_ms{0};
     };
 
     using GlobalRuntimeContextPtr = std::shared_ptr<GlobalRuntimeContext>;
@@ -228,22 +209,16 @@ private:
         bool need_prefix;
         MergeTreeData::MergingParams merging_params{};
 
+        TemporaryDataOnDiskPtr tmp_disk{nullptr};
         DiskPtr disk{nullptr};
         bool need_remove_expired_values{false};
         bool force_ttl{false};
         CompressionCodecPtr compression_codec{nullptr};
         size_t sum_input_rows_upper_bound{0};
-        std::shared_ptr<RowsSourcesTemporaryFile> rows_sources_temporary_file;
+        std::unique_ptr<WriteBufferFromFileBase> rows_sources_uncompressed_write_buf{nullptr};
+        std::unique_ptr<WriteBuffer> rows_sources_write_buf{nullptr};
         std::optional<ColumnSizeEstimator> column_sizes{};
 
-        /// For projections to rebuild
-        using ProjectionNameToItsBlocks = std::map<String, MergeTreeData::MutableDataPartsVector>;
-        ProjectionNameToItsBlocks projection_parts;
-        std::move_iterator<ProjectionNameToItsBlocks::iterator> projection_parts_iterator;
-        std::vector<Squashing> projection_squashes;
-        size_t projection_block_num = 0;
-        ExecutableTaskPtr merge_projection_parts_task_ptr;
-
         size_t initial_reservation{0};
         bool read_with_direct_io{false};
 
@@ -258,7 +233,6 @@ private:
         /// Dependencies for next stages
         std::list<DB::NameAndTypePair>::const_iterator it_name_and_type;
         bool need_sync{false};
-        UInt64 elapsed_execute_ns{0};
     };
 
     using ExecuteAndFinalizeHorizontalPartRuntimeContextPtr = std::shared_ptr<ExecuteAndFinalizeHorizontalPartRuntimeContext>;
@@ -268,30 +242,23 @@ private:
     {
         bool execute() override;
 
-        bool prepare() const;
-        bool executeImpl() const;
-        void finalize() const;
+        bool prepare();
+        bool executeImpl();
 
         /// NOTE: Using pointer-to-member instead of std::function and lambda makes stacktraces much more concise and readable
-        using ExecuteAndFinalizeHorizontalPartSubtasks = std::array<bool(ExecuteAndFinalizeHorizontalPart::*)()const, 3>;
+        using ExecuteAndFinalizeHorizontalPartSubtasks = std::array<bool(ExecuteAndFinalizeHorizontalPart::*)(), 2>;
 
         const ExecuteAndFinalizeHorizontalPartSubtasks subtasks
         {
             &ExecuteAndFinalizeHorizontalPart::prepare,
-            &ExecuteAndFinalizeHorizontalPart::executeImpl,
-            &ExecuteAndFinalizeHorizontalPart::executeMergeProjections
+            &ExecuteAndFinalizeHorizontalPart::executeImpl
         };
 
         ExecuteAndFinalizeHorizontalPartSubtasks::const_iterator subtasks_iterator = subtasks.begin();
 
-        void prepareProjectionsToMergeAndRebuild() const;
-        void calculateProjections(const Block & block) const;
-        void finalizeProjections() const;
-        void constructTaskForProjectionPartsMerge() const;
-        bool executeMergeProjections() const;
 
         MergeAlgorithm chooseMergeAlgorithm() const;
-        void createMergedStream() const;
+        void createMergedStream();
         void extractMergingAndGatheringColumns() const;
 
         void setRuntimeContext(StageRuntimeContextPtr local, StageRuntimeContextPtr global) override
@@ -301,7 +268,6 @@ private:
         }
 
         StageRuntimeContextPtr getContextForNextStage() override;
-        ProfileEvents::Event getTotalTimeProfileEvent() const override { return ProfileEvents::MergeHorizontalStageTotalMilliseconds; }
 
         ExecuteAndFinalizeHorizontalPartRuntimeContextPtr ctx;
         GlobalRuntimeContextPtr global_ctx;
@@ -313,9 +279,11 @@ private:
     struct VerticalMergeRuntimeContext : public IStageRuntimeContext
     {
         /// Begin dependencies from previous stage
-        std::shared_ptr<RowsSourcesTemporaryFile> rows_sources_temporary_file;
+        std::unique_ptr<WriteBufferFromFileBase> rows_sources_uncompressed_write_buf{nullptr};
+        std::unique_ptr<WriteBuffer> rows_sources_write_buf{nullptr};
         std::optional<ColumnSizeEstimator> column_sizes;
         CompressionCodecPtr compression_codec;
+        TemporaryDataOnDiskPtr tmp_disk{nullptr};
         std::list<DB::NameAndTypePair>::const_iterator it_name_and_type;
         bool read_with_direct_io{false};
         bool need_sync{false};
@@ -331,23 +299,14 @@ private:
 
         Float64 progress_before = 0;
         std::unique_ptr<MergedColumnOnlyOutputStream> column_to{nullptr};
-
-        /// Used for prefetching. Right before starting merge of a column we create a pipeline for the next column
-        /// and it initiates prefetching of the first range of that column.
-        struct PreparedColumnPipeline
-        {
-            QueryPipeline pipeline;
-            MergeTreeIndices indexes_to_recalc;
-        };
-
-        std::optional<PreparedColumnPipeline> prepared_pipeline;
+        std::optional<Pipe> prepared_pipe;
         size_t max_delayed_streams = 0;
         bool use_prefetch = false;
         std::list<std::unique_ptr<MergedColumnOnlyOutputStream>> delayed_streams;
         size_t column_elems_written{0};
         QueryPipeline column_parts_pipeline;
         std::unique_ptr<PullingPipelineExecutor> executor;
-        UInt64 elapsed_execute_ns{0};
+        std::unique_ptr<CompressedReadBufferFromFile> rows_sources_read_buf{nullptr};
     };
 
     using VerticalMergeRuntimeContextPtr = std::shared_ptr<VerticalMergeRuntimeContext>;
@@ -362,7 +321,6 @@ private:
             global_ctx = static_pointer_cast<GlobalRuntimeContext>(global);
         }
         StageRuntimeContextPtr getContextForNextStage() override;
-        ProfileEvents::Event getTotalTimeProfileEvent() const override { return ProfileEvents::MergeVerticalStageTotalMilliseconds; }
 
         bool prepareVerticalMergeForAllColumns() const;
         bool executeVerticalMergeForAllColumns() const;
@@ -384,7 +342,7 @@ private:
         bool executeVerticalMergeForOneColumn() const;
         void finalizeVerticalMergeForOneColumn() const;
 
-        VerticalMergeRuntimeContext::PreparedColumnPipeline createPipelineForReadingOneColumn(const String & column_name) const;
+        Pipe createPipeForReadingOneColumn(const String & column_name) const;
 
         VerticalMergeRuntimeContextPtr ctx;
         GlobalRuntimeContextPtr global_ctx;
@@ -403,7 +361,6 @@ private:
         MergeTasks::iterator projections_iterator;
 
         LoggerPtr log{getLogger("MergeTask::MergeProjectionsStage")};
-        UInt64 elapsed_execute_ns{0};
     };
 
     using MergeProjectionsRuntimeContextPtr = std::shared_ptr<MergeProjectionsRuntimeContext>;
@@ -411,15 +368,12 @@ private:
     struct MergeProjectionsStage : public IStage
     {
         bool execute() override;
-
         void setRuntimeContext(StageRuntimeContextPtr local, StageRuntimeContextPtr global) override
         {
             ctx = static_pointer_cast<MergeProjectionsRuntimeContext>(local);
             global_ctx = static_pointer_cast<GlobalRuntimeContext>(global);
         }
-
-        StageRuntimeContextPtr getContextForNextStage() override;
-        ProfileEvents::Event getTotalTimeProfileEvent() const override { return ProfileEvents::MergeProjectionStageTotalMilliseconds; }
+        StageRuntimeContextPtr getContextForNextStage() override { return nullptr; }
 
         bool mergeMinMaxIndexAndPrepareProjections() const;
         bool executeProjections() const;
diff --git a/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp b/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
index 3dbb9d64f2f..aaa4ecd8eee 100644
--- a/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
+++ b/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
@@ -71,7 +71,8 @@ bool injectRequiredColumnsRecursively(
 
     /// Column doesn't have default value and don't exist in part
     /// don't need to add to required set.
-    const auto column_default = storage_snapshot->metadata->getColumns().getDefault(column_name);
+    auto metadata_snapshot = storage_snapshot->getMetadataForQuery();
+    const auto column_default = metadata_snapshot->getColumns().getDefault(column_name);
     if (!column_default)
         return false;
 
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index ca619d4d208..d56b7ac06d4 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -474,7 +474,7 @@ StoragePolicyPtr MergeTreeData::getStoragePolicy() const
 }
 
 ConditionSelectivityEstimator MergeTreeData::getConditionSelectivityEstimatorByPredicate(
-    const StorageSnapshotPtr & storage_snapshot, const ActionsDAG * filter_dag, ContextPtr local_context) const
+    const StorageSnapshotPtr & storage_snapshot, const ActionsDAGPtr & filter_dag, ContextPtr local_context) const
 {
     if (!local_context->getSettingsRef().allow_statistics_optimize)
         return {};
@@ -499,9 +499,8 @@ ConditionSelectivityEstimator MergeTreeData::getConditionSelectivityEstimatorByP
         {
             auto stats = part->loadStatistics();
             /// TODO: We only have one stats file for every part.
-            result.addRows(part->rows_count);
             for (const auto & stat : stats)
-                result.merge(part->info.getPartNameV1(), stat);
+                result.merge(part->info.getPartNameV1(), part->rows_count, stat);
         }
         catch (...)
         {
@@ -516,9 +515,8 @@ ConditionSelectivityEstimator MergeTreeData::getConditionSelectivityEstimatorByP
             if (!partition_pruner.canBePruned(*part))
             {
                 auto stats = part->loadStatistics();
-                result.addRows(part->rows_count);
                 for (const auto & stat : stats)
-                    result.merge(part->info.getPartNameV1(), stat);
+                    result.merge(part->info.getPartNameV1(), part->rows_count, stat);
             }
         }
         catch (...)
@@ -750,7 +748,7 @@ ExpressionActionsPtr MergeTreeData::getMinMaxExpr(const KeyDescription & partiti
     if (!partition_key.column_names.empty())
         partition_key_columns = partition_key.expression->getRequiredColumnsWithTypes();
 
-    return std::make_shared<ExpressionActions>(ActionsDAG(partition_key_columns), settings);
+    return std::make_shared<ExpressionActions>(std::make_shared<ActionsDAG>(partition_key_columns), settings);
 }
 
 Names MergeTreeData::getMinMaxColumnsNames(const KeyDescription & partition_key)
@@ -1138,7 +1136,7 @@ Block MergeTreeData::getBlockWithVirtualsForFilter(
 
 
 std::optional<UInt64> MergeTreeData::totalRowsByPartitionPredicateImpl(
-    const ActionsDAG & filter_actions_dag, ContextPtr local_context, const DataPartsVector & parts) const
+    const ActionsDAGPtr & filter_actions_dag, ContextPtr local_context, const DataPartsVector & parts) const
 {
     if (parts.empty())
         return 0;
@@ -1146,7 +1144,7 @@ std::optional<UInt64> MergeTreeData::totalRowsByPartitionPredicateImpl(
     auto metadata_snapshot = getInMemoryMetadataPtr();
     auto virtual_columns_block = getBlockWithVirtualsForFilter(metadata_snapshot, {parts[0]});
 
-    auto filter_dag = VirtualColumnUtils::splitFilterDagForAllowedInputs(filter_actions_dag.getOutputs().at(0), nullptr, /*allow_partial_result=*/ false);
+    auto filter_dag = VirtualColumnUtils::splitFilterDagForAllowedInputs(filter_actions_dag->getOutputs().at(0), nullptr, /*allow_partial_result=*/ false);
     if (!filter_dag)
         return {};
 
@@ -1156,7 +1154,7 @@ std::optional<UInt64> MergeTreeData::totalRowsByPartitionPredicateImpl(
         if (!virtual_columns_block.has(input->result_name))
             valid = false;
 
-    PartitionPruner partition_pruner(metadata_snapshot, &*filter_dag, local_context, true /* strict */);
+    PartitionPruner partition_pruner(metadata_snapshot, filter_dag, local_context, true /* strict */);
     if (partition_pruner.isUseless() && !valid)
         return {};
 
@@ -1164,7 +1162,7 @@ std::optional<UInt64> MergeTreeData::totalRowsByPartitionPredicateImpl(
     if (valid)
     {
         virtual_columns_block = getBlockWithVirtualsForFilter(metadata_snapshot, parts);
-        VirtualColumnUtils::filterBlockWithExpression(VirtualColumnUtils::buildFilterExpression(std::move(*filter_dag), local_context), virtual_columns_block);
+        VirtualColumnUtils::filterBlockWithDAG(filter_dag, virtual_columns_block, local_context);
         part_values = VirtualColumnUtils::extractSingleValueFromBlock<String>(virtual_columns_block, "_part");
         if (part_values.empty())
             return 0;
@@ -2351,7 +2349,7 @@ size_t MergeTreeData::clearOldTemporaryDirectories(const String & root_path, siz
                         /// We don't control the amount of refs for temporary parts so we cannot decide can we remove blobs
                         /// or not. So we are not doing it
                         bool keep_shared = false;
-                        if (disk->supportZeroCopyReplication() && settings->allow_remote_fs_zero_copy_replication && supportsReplication())
+                        if (disk->supportZeroCopyReplication() && settings->allow_remote_fs_zero_copy_replication)
                         {
                             LOG_WARNING(log, "Since zero-copy replication is enabled we are not going to remove blobs from shared storage for {}", full_path);
                             keep_shared = true;
@@ -3213,27 +3211,12 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, Context
                             queryToString(mutation_commands.ast()));
     }
 
-    /// Block the case of alter table add projection for special merge trees.
-    if (std::any_of(commands.begin(), commands.end(), [](const AlterCommand & c) { return c.type == AlterCommand::ADD_PROJECTION; }))
-    {
-        if (merging_params.mode != MergingParams::Mode::Ordinary
-            && settings_from_storage->deduplicate_merge_projection_mode == DeduplicateMergeProjectionMode::THROW)
-            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
-                "Projection is fully supported in {} with deduplicate_merge_projection_mode = throw. "
-                "Use 'drop' or 'rebuild' option of deduplicate_merge_projection_mode.",
-                getName());
-    }
-
     commands.apply(new_metadata, local_context);
 
     if (AlterCommands::hasFullTextIndex(new_metadata) && !settings.allow_experimental_full_text_index)
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
                 "Experimental full-text index feature is not enabled (turn on setting 'allow_experimental_full_text_index')");
 
-    if (AlterCommands::hasVectorSimilarityIndex(new_metadata) && !settings.allow_experimental_vector_similarity_index)
-        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
-            "Experimental vector similarity index is disabled (turn on setting 'allow_experimental_vector_similarity_index')");
-
     for (const auto & disk : getDisks())
         if (!disk->supportsHardLinks() && !commands.isSettingsAlter() && !commands.isCommentAlter())
             throw Exception(
@@ -3521,7 +3504,7 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, Context
                         const auto & new_column = new_metadata.getColumns().get(command.column_name);
                         if (!old_column.type->equals(*new_column.type))
                             throw Exception(ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN,
-                                            "ALTER types of column {} with statistics is not safe "
+                                            "ALTER types of column {} with statistics is not not safe "
                                             "because it can change the representation of statistics",
                                             backQuoteIfNeed(command.column_name));
                     }
@@ -4424,25 +4407,25 @@ bool MergeTreeData::tryRemovePartImmediately(DataPartPtr && part)
 
 size_t MergeTreeData::getTotalActiveSizeInBytes() const
 {
-    return total_active_size_bytes.load();
+    return total_active_size_bytes.load(std::memory_order_acquire);
 }
 
 
 size_t MergeTreeData::getTotalActiveSizeInRows() const
 {
-    return total_active_size_rows.load();
+    return total_active_size_rows.load(std::memory_order_acquire);
 }
 
 
 size_t MergeTreeData::getActivePartsCount() const
 {
-    return total_active_size_parts.load();
+    return total_active_size_parts.load(std::memory_order_acquire);
 }
 
 
 size_t MergeTreeData::getOutdatedPartsCount() const
 {
-    return total_outdated_parts_count.load();
+    return total_outdated_parts_count.load(std::memory_order_relaxed);
 }
 
 size_t MergeTreeData::getNumberOfOutdatedPartsWithExpiredRemovalTime() const
@@ -5013,7 +4996,7 @@ void MergeTreeData::checkAlterPartitionIsPossible(
                 const auto * partition_ast = command.partition->as<ASTPartition>();
                 if (partition_ast && partition_ast->all)
                 {
-                    if (command.type != PartitionCommand::DROP_PARTITION && command.type != PartitionCommand::ATTACH_PARTITION && !(command.type == PartitionCommand::REPLACE_PARTITION && !command.replace))
+                    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
@@ -5570,22 +5553,13 @@ public:
         attachIfAllPartsRestored();
     }
 
-    String getTemporaryDirectory(const DiskPtr & disk, const String & part_name)
+    String getTemporaryDirectory(const DiskPtr & disk)
     {
         std::lock_guard lock{mutex};
-        auto it = temp_part_dirs.find(part_name);
-        if (it == temp_part_dirs.end())
-        {
-            auto temp_dir_deleter = std::make_unique<TemporaryFileOnDisk>(disk, fs::path{storage->getRelativeDataPath()} / ("tmp_restore_" + part_name + "-"));
-            auto temp_part_dir = fs::path{temp_dir_deleter->getRelativePath()}.filename();
-            /// Attaching parts will rename them so it's expected for a temporary part directory not to exist anymore in the end.
-            temp_dir_deleter->setShowWarningIfRemoved(false);
-            /// The following holder is needed to prevent clearOldTemporaryDirectories() from clearing `temp_part_dir` before we attach the part.
-            auto temp_dir_holder = storage->getTemporaryPartDirectoryHolder(temp_part_dir);
-            it = temp_part_dirs.emplace(part_name,
-                                        std::make_pair(std::move(temp_dir_deleter), std::move(temp_dir_holder))).first;
-        }
-        return it->second.first->getRelativePath();
+        auto it = temp_dirs.find(disk);
+        if (it == temp_dirs.end())
+            it = temp_dirs.emplace(disk, std::make_shared<TemporaryFileOnDisk>(disk, "tmp/")).first;
+        return it->second->getRelativePath();
     }
 
 private:
@@ -5602,7 +5576,7 @@ private:
 
         storage->attachRestoredParts(std::move(parts));
         parts.clear();
-        temp_part_dirs.clear();
+        temp_dirs.clear();
         num_parts = 0;
     }
 
@@ -5611,7 +5585,7 @@ private:
     size_t num_parts = 0;
     size_t num_broken_parts = 0;
     MutableDataPartsVector parts;
-    std::map<String /* part_name*/, std::pair<std::unique_ptr<TemporaryFileOnDisk>, scope_guard>> temp_part_dirs;
+    std::map<DiskPtr, std::shared_ptr<TemporaryFileOnDisk>> temp_dirs;
     mutable std::mutex mutex;
 };
 
@@ -5664,11 +5638,9 @@ void MergeTreeData::restorePartFromBackup(std::shared_ptr<RestoredPartsHolder> r
     String part_name = part_info.getPartNameAndCheckFormat(format_version);
     auto backup = restored_parts_holder->getBackup();
 
-    /// Find all files of this part in the backup.
-    Strings filenames = backup->listFiles(part_path_in_backup, /* recursive= */ true);
-
     /// Calculate the total size of the part.
     UInt64 total_size_of_part = 0;
+    Strings filenames = backup->listFiles(part_path_in_backup, /* recursive= */ true);
     fs::path part_path_in_backup_fs = part_path_in_backup;
     for (const String & filename : filenames)
         total_size_of_part += backup->getFileSize(part_path_in_backup_fs / filename);
@@ -5678,9 +5650,11 @@ void MergeTreeData::restorePartFromBackup(std::shared_ptr<RestoredPartsHolder> r
     /// Calculate paths, for example:
     /// part_name = 0_1_1_0
     /// part_path_in_backup = /data/test/table/0_1_1_0
-    /// temp_part_dir = /var/lib/clickhouse/data/test/table/tmp_restore_all_0_1_1_0-XXXXXXXX
+    /// tmp_dir = tmp/1aaaaaa
+    /// tmp_part_dir = tmp/1aaaaaa/data/test/table/0_1_1_0
     auto disk = reservation->getDisk();
-    fs::path temp_part_dir = restored_parts_holder->getTemporaryDirectory(disk, part_name);
+    fs::path temp_dir = restored_parts_holder->getTemporaryDirectory(disk);
+    fs::path temp_part_dir = temp_dir / part_path_in_backup_fs.relative_path();
 
     /// Subdirectories in the part's directory. It's used to restore projections.
     std::unordered_set<String> subdirs;
@@ -5707,25 +5681,22 @@ void MergeTreeData::restorePartFromBackup(std::shared_ptr<RestoredPartsHolder> r
         reservation->update(reservation->getSize() - file_size);
     }
 
-    if (auto part = loadPartRestoredFromBackup(part_name, disk, temp_part_dir, detach_if_broken))
+    if (auto part = loadPartRestoredFromBackup(disk, temp_part_dir.parent_path(), part_name, detach_if_broken))
         restored_parts_holder->addPart(part);
     else
         restored_parts_holder->increaseNumBrokenParts();
 }
 
-MergeTreeData::MutableDataPartPtr MergeTreeData::loadPartRestoredFromBackup(const String & part_name, const DiskPtr & disk, const String & temp_part_dir, bool detach_if_broken) const
+MergeTreeData::MutableDataPartPtr MergeTreeData::loadPartRestoredFromBackup(const DiskPtr & disk, const String & temp_dir, const String & part_name, bool detach_if_broken) const
 {
     MutableDataPartPtr part;
 
     auto single_disk_volume = std::make_shared<SingleDiskVolume>(disk->getName(), disk, 0);
-    fs::path full_part_dir{temp_part_dir};
-    String parent_part_dir = full_part_dir.parent_path();
-    String part_dir_name = full_part_dir.filename();
 
-    /// Load this part from the directory `temp_part_dir`.
+    /// Load this part from the directory `tmp_part_dir`.
     auto load_part = [&]
     {
-        MergeTreeDataPartBuilder builder(*this, part_name, single_disk_volume, parent_part_dir, part_dir_name);
+        MergeTreeDataPartBuilder builder(*this, part_name, single_disk_volume, temp_dir, part_name);
         builder.withPartFormatFromDisk();
         part = std::move(builder).build();
         part->version.setCreationTID(Tx::PrehistoricTID, nullptr);
@@ -5740,7 +5711,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeData::loadPartRestoredFromBackup(cons
         if (!part)
         {
             /// Make a fake data part only to copy its files to /detached/.
-            part = MergeTreeDataPartBuilder{*this, part_name, single_disk_volume, parent_part_dir, part_dir_name}
+            part = MergeTreeDataPartBuilder{*this, part_name, single_disk_volume, temp_dir, part_name}
                        .withPartStorageType(MergeTreeDataPartStorageType::Full)
                        .withPartType(MergeTreeDataPartType::Wide)
                        .build();
@@ -5814,7 +5785,7 @@ String MergeTreeData::getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr loc
     const auto & partition_ast = ast->as<ASTPartition &>();
 
     if (partition_ast.all)
-        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Only Support DROP/DETACH/ATTACH PARTITION ALL currently");
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Only Support DETACH PARTITION ALL currently");
 
     if (!partition_ast.value)
     {
@@ -5892,7 +5863,7 @@ String MergeTreeData::getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr loc
         if (partition_lit && partition_lit->value.getType() == Field::Types::String)
         {
             MergeTreePartInfo::validatePartitionID(partition_ast.value->clone(), format_version);
-            return partition_lit->value.safeGet<String>();
+            return partition_lit->value.get<String>();
         }
     }
 
@@ -5955,7 +5926,7 @@ String MergeTreeData::getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr loc
             throw Exception(ErrorCodes::INVALID_PARTITION_VALUE,
                             "Expected tuple for complex partition key, got {}", partition_key_value.getTypeName());
 
-        const Tuple & tuple = partition_key_value.safeGet<Tuple>();
+        const Tuple & tuple = partition_key_value.get<Tuple>();
         if (tuple.size() != fields_count)
             throw Exception(ErrorCodes::LOGICAL_ERROR,
                             "Wrong number of fields in the partition expression: {}, must be: {}", tuple.size(), fields_count);
@@ -6276,13 +6247,10 @@ void MergeTreeData::dropDetached(const ASTPtr & partition, bool part, ContextPtr
     }
     else
     {
-        String partition_id;
-        bool all = partition->as<ASTPartition>()->all;
-        if (!all)
-            partition_id = getPartitionIDFromQuery(partition, local_context);
+        String partition_id = getPartitionIDFromQuery(partition, local_context);
         DetachedPartsInfo detached_parts = getDetachedParts();
         for (const auto & part_info : detached_parts)
-            if (part_info.valid_name && (all || part_info.partition_id == partition_id)
+            if (part_info.valid_name && part_info.partition_id == partition_id
                 && part_info.prefix != "attaching" && part_info.prefix != "deleting")
                 renamed_parts.addPart(part_info.dir_name, "deleting_" + part_info.dir_name, part_info.disk);
     }
@@ -6865,7 +6833,7 @@ using PartitionIdToMaxBlock = std::unordered_map<String, Int64>;
 Block MergeTreeData::getMinMaxCountProjectionBlock(
     const StorageMetadataPtr & metadata_snapshot,
     const Names & required_columns,
-    const ActionsDAG * filter_dag,
+    const ActionsDAGPtr & filter_dag,
     const DataPartsVector & parts,
     const PartitionIdToMaxBlock * max_block_numbers_to_read,
     ContextPtr query_context) const
@@ -6894,7 +6862,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()))
-            AggregateFunctionCount::set(place, value.safeGet<UInt64>());
+            AggregateFunctionCount::set(place, value.get<UInt64>());
         else
         {
             auto value_column = func->getArgumentTypes().front()->createColumnConst(1, value)->convertToFullColumnIfConst();
@@ -7105,7 +7073,7 @@ ActionDAGNodes MergeTreeData::getFiltersForPrimaryKeyAnalysis(const InterpreterS
 
     ActionDAGNodes filter_nodes;
     if (auto additional_filter_info = select.getAdditionalQueryInfo())
-        filter_nodes.nodes.push_back(&additional_filter_info->actions.findInOutputs(additional_filter_info->column_name));
+        filter_nodes.nodes.push_back(&additional_filter_info->actions->findInOutputs(additional_filter_info->column_name));
 
     if (before_where)
         filter_nodes.nodes.push_back(&before_where->dag.findInOutputs(where_column_name));
@@ -7160,12 +7128,12 @@ UInt64 MergeTreeData::estimateNumberOfRowsToRead(
     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;
 
     MergeTreeDataSelectExecutor reader(*this);
     auto result_ptr = reader.estimateNumMarksToRead(
-        snapshot_data.parts,
-        snapshot_data.mutations_snapshot,
-        storage_snapshot->metadata->getColumns().getAll().getNames(),
+        parts,
+        storage_snapshot->getMetadataForQuery()->getColumns().getAll().getNames(),
         storage_snapshot->metadata,
         query_info,
         query_context,
@@ -7537,7 +7505,7 @@ MergeTreeData::MatcherFn MergeTreeData::getPartitionMatcher(const ASTPtr & parti
         if (const auto * partition_lit = partition_ast->as<ASTPartition &>().value->as<ASTLiteral>())
         {
             id = partition_lit->value.getType() == Field::Types::UInt64
-                 ? toString(partition_lit->value.safeGet<UInt64>())
+                 ? toString(partition_lit->value.get<UInt64>())
                  : partition_lit->value.safeGet<String>();
             prefixed = true;
         }
@@ -8183,15 +8151,11 @@ bool MergeTreeData::canUsePolymorphicParts(const MergeTreeSettings & settings, S
     return true;
 }
 
-AlterConversionsPtr MergeTreeData::getAlterConversionsForPart(
-    const MergeTreeDataPartPtr & part,
-    const MutationsSnapshotPtr & mutations,
-    const StorageMetadataPtr & metadata,
-    const ContextPtr & query_context)
+AlterConversionsPtr MergeTreeData::getAlterConversionsForPart(MergeTreeDataPartPtr part) const
 {
-    auto commands = mutations->getAlterMutationCommandsForPart(part);
-    auto result = std::make_shared<AlterConversions>(metadata, query_context);
+    auto commands = getAlterMutationCommandsForPart(part);
 
+    auto result = std::make_shared<AlterConversions>();
     for (const auto & command : commands | std::views::reverse)
         result->addMutationCommand(command);
 
@@ -8215,16 +8179,16 @@ void MergeTreeData::removePartContributionToDataVolume(const DataPartPtr & part)
 
 void MergeTreeData::increaseDataVolume(ssize_t bytes, ssize_t rows, ssize_t parts)
 {
-    total_active_size_bytes.fetch_add(bytes);
-    total_active_size_rows.fetch_add(rows);
-    total_active_size_parts.fetch_add(parts);
+    total_active_size_bytes.fetch_add(bytes, std::memory_order_acq_rel);
+    total_active_size_rows.fetch_add(rows, std::memory_order_acq_rel);
+    total_active_size_parts.fetch_add(parts, std::memory_order_acq_rel);
 }
 
 void MergeTreeData::setDataVolume(size_t bytes, size_t rows, size_t parts)
 {
-    total_active_size_bytes.store(bytes);
-    total_active_size_rows.store(rows);
-    total_active_size_parts.store(parts);
+    total_active_size_bytes.store(bytes, std::memory_order_release);
+    total_active_size_rows.store(rows, std::memory_order_release);
+    total_active_size_parts.store(parts, std::memory_order_release);
 }
 
 bool MergeTreeData::insertQueryIdOrThrow(const String & query_id, size_t max_queries) const
@@ -8483,28 +8447,9 @@ void MergeTreeData::updateObjectColumns(const DataPartPtr & part, const DataPart
     DB::updateObjectColumns(object_columns, columns, part->getColumns());
 }
 
-bool MergeTreeData::supportsTrivialCountOptimization(const StorageSnapshotPtr & storage_snapshot, ContextPtr query_context) const
+bool MergeTreeData::supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const
 {
-    if (hasLightweightDeletedMask())
-        return false;
-
-    if (!storage_snapshot)
-        return !query_context->getSettingsRef().apply_mutations_on_fly;
-
-    const auto & snapshot_data = assert_cast<const MergeTreeData::SnapshotData &>(*storage_snapshot->data);
-    return !snapshot_data.mutations_snapshot->hasDataMutations();
-}
-
-Int64 MergeTreeData::getMinMetadataVersion(const DataPartsVector & parts)
-{
-    Int64 version = -1;
-    for (const auto & part : parts)
-    {
-        Int64 part_version = part->getMetadataVersion();
-        if (version == -1 || part_version < version)
-            version = part_version;
-    }
-    return version;
+    return !hasLightweightDeletedMask();
 }
 
 StorageSnapshotPtr MergeTreeData::getStorageSnapshot(const StorageMetadataPtr & metadata_snapshot, ContextPtr query_context) const
@@ -8518,14 +8463,10 @@ StorageSnapshotPtr MergeTreeData::getStorageSnapshot(const StorageMetadataPtr &
         object_columns_copy = object_columns;
     }
 
-    IMutationsSnapshot::Params params
-    {
-        .metadata_version = metadata_snapshot->getMetadataVersion(),
-        .min_part_metadata_version = getMinMetadataVersion(snapshot_data->parts),
-        .need_data_mutations = query_context->getSettingsRef().apply_mutations_on_fly,
-    };
+    snapshot_data->alter_conversions.reserve(snapshot_data->parts.size());
+    for (const auto & part : snapshot_data->parts)
+        snapshot_data->alter_conversions.push_back(getAlterConversionsForPart(part));
 
-    snapshot_data->mutations_snapshot = getMutationsSnapshot(params);
     return std::make_shared<StorageSnapshot>(*this, metadata_snapshot, std::move(object_columns_copy), std::move(snapshot_data));
 }
 
@@ -8743,57 +8684,28 @@ void MergeTreeData::verifySortingKey(const KeyDescription & sorting_key)
     }
 }
 
-static void updateMutationsCounters(
-    Int64 & num_data_mutations_to_apply,
-    Int64 & num_metadata_mutations_to_apply,
-    const MutationCommands & commands,
-    Int64 increment)
+bool updateAlterConversionsMutations(const MutationCommands & commands, std::atomic<ssize_t> & alter_conversions_mutations, bool remove)
 {
-    if (num_data_mutations_to_apply < 0)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "On-fly data mutations counter is negative ({})", num_data_mutations_to_apply);
-
-    if (num_metadata_mutations_to_apply < 0)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "On-fly metadata mutations counter is negative ({})", num_metadata_mutations_to_apply);
-
-    bool has_data_mutation = false;
-    bool has_metadata_mutation = false;
-
     for (const auto & command : commands)
     {
-        if (!has_data_mutation && AlterConversions::isSupportedDataMutation(command.type))
+        if (AlterConversions::supportsMutationCommandType(command.type))
         {
-            num_data_mutations_to_apply += increment;
-            has_data_mutation = true;
-
-            if (num_data_mutations_to_apply < 0)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "On-fly data mutations counter is negative ({})", num_data_mutations_to_apply);
-        }
-
-        if (!has_metadata_mutation && AlterConversions::isSupportedMetadataMutation(command.type))
-        {
-            num_metadata_mutations_to_apply += increment;
-            has_metadata_mutation = true;
-
-            if (num_metadata_mutations_to_apply < 0)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "On-fly metadata mutations counter is negative ({})", num_metadata_mutations_to_apply);
+            if (remove)
+            {
+                --alter_conversions_mutations;
+                if (alter_conversions_mutations < 0)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "On-fly mutations counter is negative ({})", alter_conversions_mutations);
+            }
+            else
+            {
+                if (alter_conversions_mutations < 0)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "On-fly mutations counter is negative ({})", alter_conversions_mutations);
+                ++alter_conversions_mutations;
+            }
+            return true;
         }
     }
-}
-
-void incrementMutationsCounters(
-    Int64 & num_data_mutations_to_apply,
-    Int64 & num_metadata_mutations_to_apply,
-    const MutationCommands & commands)
-{
-    updateMutationsCounters(num_data_mutations_to_apply, num_metadata_mutations_to_apply, commands, 1);
-}
-
-void decrementMutationsCounters(
-    Int64 & num_data_mutations_to_apply,
-    Int64 & num_metadata_mutations_to_apply,
-    const MutationCommands & commands)
-{
-    updateMutationsCounters(num_data_mutations_to_apply, num_metadata_mutations_to_apply, commands, -1);
+    return false;
 }
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeData.h b/src/Storages/MergeTree/MergeTreeData.h
index dc37d5e7dad..7076b680521 100644
--- a/src/Storages/MergeTree/MergeTreeData.h
+++ b/src/Storages/MergeTree/MergeTreeData.h
@@ -403,7 +403,7 @@ public:
     Block getMinMaxCountProjectionBlock(
         const StorageMetadataPtr & metadata_snapshot,
         const Names & required_columns,
-        const ActionsDAG * filter_dag,
+        const ActionsDAGPtr & filter_dag,
         const DataPartsVector & parts,
         const PartitionIdToMaxBlock * max_block_numbers_to_read,
         ContextPtr query_context) const;
@@ -426,7 +426,7 @@ public:
 
     bool supportsPrewhere() const override { return true; }
 
-    ConditionSelectivityEstimator getConditionSelectivityEstimatorByPredicate(const StorageSnapshotPtr &, const ActionsDAG *, ContextPtr) const override;
+    ConditionSelectivityEstimator getConditionSelectivityEstimatorByPredicate(const StorageSnapshotPtr &, const ActionsDAGPtr &, ContextPtr) const override;
 
     bool supportsFinal() const override;
 
@@ -443,53 +443,14 @@ public:
 
     bool areAsynchronousInsertsEnabled() const override;
 
-    bool supportsTrivialCountOptimization(const StorageSnapshotPtr & storage_snapshot, ContextPtr query_context) const override;
-
-    /// A snapshot of pending mutations that weren't applied to some of the parts yet
-    /// and should be applied on the fly (i.e. when reading from the part).
-    /// Mutations not supported by AlterConversions (supportsMutationCommandType()) can be omitted.
-    struct IMutationsSnapshot
-    {
-        /// Contains info that doesn't depend on state of mutations.
-        struct Params
-        {
-            Int64 metadata_version = -1;
-            Int64 min_part_metadata_version = -1;
-            bool need_data_mutations = false;
-        };
-
-        /// Contains info that depends on state of mutations.
-        struct Info
-        {
-            Int64 num_data_mutations = 0;
-            Int64 num_metadata_mutations = 0;
-        };
-
-        Params params;
-        Info info;
-
-        IMutationsSnapshot() = default;
-        IMutationsSnapshot(Params params_, Info info_): params(std::move(params_)), info(std::move(info_)) {}
-
-        /// Returns mutation commands that are required to be applied to the `part`.
-        /// @return list of mutation commands, in *reverse* order (newest to oldest)
-        virtual MutationCommands getAlterMutationCommandsForPart(const DataPartPtr & part) const = 0;
-        virtual std::shared_ptr<IMutationsSnapshot> cloneEmpty() const = 0;
-        virtual NameSet getAllUpdatedColumns() const = 0;
-
-        bool hasDataMutations() const { return params.need_data_mutations && info.num_data_mutations > 0; }
-
-        virtual ~IMutationsSnapshot() = default;
-    };
-
-    using MutationsSnapshotPtr = std::shared_ptr<const IMutationsSnapshot>;
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override;
 
     /// Snapshot for MergeTree contains the current set of data parts
-    /// and mutations required to be applied at the moment of the start of query.
+    /// at the moment of the start of query.
     struct SnapshotData : public StorageSnapshot::Data
     {
         DataPartsVector parts;
-        MutationsSnapshotPtr mutations_snapshot;
+        std::vector<AlterConversionsPtr> alter_conversions;
     };
 
     StorageSnapshotPtr getStorageSnapshot(const StorageMetadataPtr & metadata_snapshot, ContextPtr query_context) const override;
@@ -968,18 +929,8 @@ public:
 
     Disks getDisks() const { return getStoragePolicy()->getDisks(); }
 
-    /// Returns a snapshot of mutations that probably will be applied on the fly to parts during reading.
-    virtual MutationsSnapshotPtr getMutationsSnapshot(const IMutationsSnapshot::Params & params) const = 0;
-
-    /// Returns the minimum version of metadata among parts.
-    static Int64 getMinMetadataVersion(const DataPartsVector & parts);
-
     /// Return alter conversions for part which must be applied on fly.
-    static AlterConversionsPtr getAlterConversionsForPart(
-        const MergeTreeDataPartPtr & part,
-        const MutationsSnapshotPtr & mutations,
-        const StorageMetadataPtr & metadata,
-        const ContextPtr & query_context);
+    AlterConversionsPtr getAlterConversionsForPart(MergeTreeDataPartPtr part) const;
 
     /// Returns destination disk or volume for the TTL rule according to current storage policy.
     SpacePtr getDestinationForMoveTTL(const TTLDescription & move_ttl) const;
@@ -1276,7 +1227,7 @@ protected:
         boost::iterator_range<DataPartIteratorByStateAndInfo> range, const ColumnsDescription & storage_columns);
 
     std::optional<UInt64> totalRowsByPartitionPredicateImpl(
-        const ActionsDAG & filter_actions_dag, ContextPtr context, const DataPartsVector & parts) const;
+        const ActionsDAGPtr & filter_actions_dag, ContextPtr context, const DataPartsVector & parts) const;
 
     static decltype(auto) getStateModifier(DataPartState state)
     {
@@ -1499,6 +1450,13 @@ protected:
     /// mechanisms for parts locking
     virtual bool partIsAssignedToBackgroundOperation(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
     {
         String part_name;
@@ -1515,7 +1473,7 @@ protected:
     /// Restores the parts of this table from backup.
     void restorePartsFromBackup(RestorerFromBackup & restorer, const String & data_path_in_backup, const std::optional<ASTs> & partitions);
     void restorePartFromBackup(std::shared_ptr<RestoredPartsHolder> restored_parts_holder, const MergeTreePartInfo & part_info, const String & part_path_in_backup, bool detach_if_broken) const;
-    MutableDataPartPtr loadPartRestoredFromBackup(const String & part_name, const DiskPtr & disk, const String & temp_part_dir, bool detach_if_broken) const;
+    MutableDataPartPtr loadPartRestoredFromBackup(const DiskPtr & disk, const String & temp_dir, const String & part_name, bool detach_if_broken) const;
 
     /// Attaches restored parts to the storage.
     virtual void attachRestoredParts(MutableDataPartsVector && parts) = 0;
@@ -1773,14 +1731,7 @@ struct CurrentlySubmergingEmergingTagger
 };
 
 /// Look at MutationCommands if it contains mutations for AlterConversions, update the counter.
-void incrementMutationsCounters(
-    Int64 & num_data_mutations_to_apply,
-    Int64 & num_metadata_mutations_to_apply,
-    const MutationCommands & commands);
-
-void decrementMutationsCounters(
-    Int64 & num_data_mutations_to_apply,
-    Int64 & num_metadata_mutations_to_apply,
-    const MutationCommands & commands);
+/// Return true if the counter had been updated
+bool updateAlterConversionsMutations(const MutationCommands & commands, std::atomic<ssize_t> & alter_conversions_mutations, bool remove);
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
index 5c65dd6c1c1..140a226f2d1 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -671,7 +671,7 @@ MergeTaskPtr MergeTreeDataMergerMutator::mergePartsToTemporaryPart(
     const StorageMetadataPtr & metadata_snapshot,
     MergeList::Entry * merge_entry,
     std::unique_ptr<MergeListElement> projection_merge_list_element,
-    TableLockHolder & holder,
+    TableLockHolder,
     time_t time_of_merge,
     ContextPtr context,
     ReservationSharedPtr space_reservation,
@@ -691,7 +691,6 @@ MergeTaskPtr MergeTreeDataMergerMutator::mergePartsToTemporaryPart(
         std::move(projection_merge_list_element),
         time_of_merge,
         context,
-        holder,
         space_reservation,
         deduplicate,
         deduplicate_by_columns,
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
index c14962d903b..d2852a3a504 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
@@ -159,7 +159,7 @@ public:
         const StorageMetadataPtr & metadata_snapshot,
         MergeListEntry * merge_entry,
         std::unique_ptr<MergeListElement> projection_merge_list_element,
-        TableLockHolder & table_lock_holder,
+        TableLockHolder table_lock_holder,
         time_t time_of_merge,
         ContextPtr context,
         ReservationSharedPtr space_reservation,
diff --git a/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp b/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp
index 3ef36ce364c..b327480fa92 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp
@@ -100,6 +100,12 @@ void MergeTreeDataPartChecksums::checkEqual(const MergeTreeDataPartChecksums & r
     }
 }
 
+void MergeTreeDataPartChecksums::checkSizes(const IDataPartStorage & storage) const
+{
+    for (const auto & [name, checksum] : files)
+        checksum.checkSize(storage, name);
+}
+
 UInt64 MergeTreeDataPartChecksums::getTotalSizeOnDisk() const
 {
     UInt64 res = 0;
diff --git a/src/Storages/MergeTree/MergeTreeDataPartChecksum.h b/src/Storages/MergeTree/MergeTreeDataPartChecksum.h
index dc52f1ada2b..05178dc3a60 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartChecksum.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartChecksum.h
@@ -65,6 +65,9 @@ struct MergeTreeDataPartChecksums
 
     static bool isBadChecksumsErrorCode(int code);
 
+    /// Checks that the directory contains all the needed files of the correct size. Does not check the checksum.
+    void checkSizes(const IDataPartStorage & storage) const;
+
     /// Returns false if the checksum is too old.
     bool read(ReadBuffer & in);
     /// Assume that header with version (the first line) is read
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
index f4be7619fc8..52d12c9db7d 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
@@ -164,7 +164,7 @@ void writeColumnSingleGranule(
     serialize_settings.position_independent_encoding = true;
     serialize_settings.low_cardinality_max_dictionary_size = 0;
     serialize_settings.use_compact_variant_discriminators_serialization = settings.use_compact_variant_discriminators_serialization;
-    serialize_settings.object_and_dynamic_write_statistics = ISerialization::SerializeBinaryBulkSettings::ObjectAndDynamicStatisticsMode::PREFIX;
+    serialize_settings.dynamic_write_statistics = ISerialization::SerializeBinaryBulkSettings::DynamicStatisticsMode::PREFIX;
 
     serialization->serializeBinaryBulkStatePrefix(*column.column, serialize_settings, state);
     serialization->serializeBinaryBulkWithMultipleStreams(*column.column, from_row, number_of_rows, serialize_settings, state);
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
index 9bfc87135d9..46dd766139a 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
@@ -85,11 +85,11 @@ MergeTreeDataPartWriterOnDisk::Stream<false>::Stream(
     marks_file_extension{marks_file_extension_},
     plain_file(data_part_storage->writeFile(data_path_ + data_file_extension, max_compress_block_size_, query_write_settings)),
     plain_hashing(*plain_file),
-    compressor(plain_hashing, compression_codec_, max_compress_block_size_, query_write_settings.use_adaptive_write_buffer, query_write_settings.adaptive_write_buffer_initial_size),
+    compressor(plain_hashing, compression_codec_, max_compress_block_size_),
     compressed_hashing(compressor),
     marks_file(data_part_storage->writeFile(marks_path_ + marks_file_extension, 4096, query_write_settings)),
     marks_hashing(*marks_file),
-    marks_compressor(marks_hashing, marks_compression_codec_, marks_compress_block_size_, query_write_settings.use_adaptive_write_buffer, query_write_settings.adaptive_write_buffer_initial_size),
+    marks_compressor(marks_hashing, marks_compression_codec_, marks_compress_block_size_),
     marks_compressed_hashing(marks_compressor),
     compress_marks(MarkType(marks_file_extension).compressed)
 {
@@ -108,7 +108,7 @@ MergeTreeDataPartWriterOnDisk::Stream<true>::Stream(
     data_file_extension{data_file_extension_},
     plain_file(data_part_storage->writeFile(data_path_ + data_file_extension, max_compress_block_size_, query_write_settings)),
     plain_hashing(*plain_file),
-    compressor(plain_hashing, compression_codec_, max_compress_block_size_, query_write_settings.use_adaptive_write_buffer, query_write_settings.adaptive_write_buffer_initial_size),
+    compressor(plain_hashing, compression_codec_, max_compress_block_size_),
     compressed_hashing(compressor),
     compress_marks(false)
 {
@@ -255,12 +255,6 @@ void MergeTreeDataPartWriterOnDisk::initPrimaryIndex()
             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);
         }
-
-        const auto & primary_key_types = metadata_snapshot->getPrimaryKey().data_types;
-        index_serializations.reserve(primary_key_types.size());
-
-        for (const auto & type : primary_key_types)
-            index_serializations.push_back(type->getDefaultSerialization());
     }
 }
 
@@ -306,30 +300,22 @@ void MergeTreeDataPartWriterOnDisk::initSkipIndices()
             store = std::make_shared<GinIndexStore>(stream_name, data_part_storage, data_part_storage, storage_settings->max_digestion_size_per_segment);
             gin_index_stores[stream_name] = store;
         }
-
         skip_indices_aggregators.push_back(skip_index->createIndexAggregatorForPart(store, settings));
         skip_index_accumulated_marks.push_back(0);
     }
 }
 
-void MergeTreeDataPartWriterOnDisk::calculateAndSerializePrimaryIndexRow(const Block & index_block, size_t row)
-{
-    chassert(index_block.columns() == index_serializations.size());
-    auto & index_stream = compress_primary_key ? *index_source_hashing_stream : *index_file_hashing_stream;
-
-    for (size_t i = 0; i < index_block.columns(); ++i)
-    {
-        const auto & column = index_block.getByPosition(i).column;
-
-        index_columns[i]->insertFrom(*column, row);
-        index_serializations[i]->serializeBinary(*column, row, index_stream, {});
-    }
-}
-
 void MergeTreeDataPartWriterOnDisk::calculateAndSerializePrimaryIndex(const Block & primary_index_block, const Granules & granules_to_write)
 {
-    if (!metadata_snapshot->hasPrimaryKey())
-        return;
+    size_t primary_columns_num = primary_index_block.columns();
+    if (index_columns.empty())
+    {
+        index_types = primary_index_block.getDataTypes();
+        index_columns.resize(primary_columns_num);
+        last_block_index_columns.resize(primary_columns_num);
+        for (size_t i = 0; i < primary_columns_num; ++i)
+            index_columns[i] = primary_index_block.getByPosition(i).column->cloneEmpty();
+    }
 
     {
         /** While filling index (index_columns), disable memory tracker.
@@ -340,20 +326,25 @@ void MergeTreeDataPartWriterOnDisk::calculateAndSerializePrimaryIndex(const Bloc
          */
         MemoryTrackerBlockerInThread temporarily_disable_memory_tracker;
 
-        if (index_columns.empty())
-            index_columns = primary_index_block.cloneEmptyColumns();
-
         /// Write index. The index contains Primary Key value for each `index_granularity` row.
         for (const auto & granule : granules_to_write)
         {
-            if (granule.mark_on_start)
-                calculateAndSerializePrimaryIndexRow(primary_index_block, granule.start_row);
+            if (metadata_snapshot->hasPrimaryKey() && granule.mark_on_start)
+            {
+                for (size_t j = 0; j < primary_columns_num; ++j)
+                {
+                    const auto & primary_column = primary_index_block.getByPosition(j);
+                    index_columns[j]->insertFrom(*primary_column.column, granule.start_row);
+                    primary_column.type->getDefaultSerialization()->serializeBinary(
+                        *primary_column.column, granule.start_row, compress_primary_key ? *index_source_hashing_stream : *index_file_hashing_stream, {});
+                }
+            }
         }
     }
 
-    /// Store block with last index row to write final mark at the end of column
-    if (with_final_mark)
-        last_index_block = primary_index_block;
+    /// store last index row to write final mark at the end of column
+    for (size_t j = 0; j < primary_columns_num; ++j)
+        last_block_index_columns[j] = primary_index_block.getByPosition(j).column;
 }
 
 void MergeTreeDataPartWriterOnDisk::calculateAndSerializeStatistics(const Block & block)
@@ -430,14 +421,19 @@ void MergeTreeDataPartWriterOnDisk::fillPrimaryIndexChecksums(MergeTreeData::Dat
 
     if (index_file_hashing_stream)
     {
-        if (write_final_mark && last_index_block)
+        if (write_final_mark)
         {
-            MemoryTrackerBlockerInThread temporarily_disable_memory_tracker;
-            calculateAndSerializePrimaryIndexRow(last_index_block, last_index_block.rows() - 1);
+            for (size_t j = 0; j < index_columns.size(); ++j)
+            {
+                const auto & column = *last_block_index_columns[j];
+                size_t last_row_number = column.size() - 1;
+                index_columns[j]->insertFrom(column, last_row_number);
+                index_types[j]->getDefaultSerialization()->serializeBinary(
+                    column, last_row_number, compress_primary_key ? *index_source_hashing_stream : *index_file_hashing_stream, {});
+            }
+            last_block_index_columns.clear();
         }
 
-        last_index_block.clear();
-
         if (compress_primary_key)
         {
             index_source_hashing_stream->finalize();
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h
index 8d84442981e..bdf0fdb7f32 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h
@@ -173,10 +173,10 @@ protected:
     std::unique_ptr<HashingWriteBuffer> index_source_hashing_stream;
     bool compress_primary_key;
 
-    /// Last block with index columns.
-    /// It's written to index file in the `writeSuffixAndFinalizePart` method.
-    Block last_index_block;
-    Serializations index_serializations;
+    DataTypes index_types;
+    /// Index columns from the last block
+    /// It's written to index file in the `writeSuffixAndFinalizePart` method
+    Columns last_block_index_columns;
 
     bool data_written = false;
 
@@ -193,7 +193,6 @@ private:
     void initStatistics();
 
     virtual void fillIndexGranularity(size_t index_granularity_for_block, size_t rows_in_block) = 0;
-    void calculateAndSerializePrimaryIndexRow(const Block & index_block, size_t row);
 
     struct ExecutionStatistics
     {
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
index f050accd7a1..43c0afa77e6 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
@@ -132,10 +132,6 @@ void MergeTreeDataPartWriterWide::addStreams(
     {
         assert(!substream_path.empty());
 
-        /// Don't create streams for ephemeral subcolumns that don't store any real data.
-        if (ISerialization::isEphemeralSubcolumn(substream_path, substream_path.size()))
-            return;
-
         auto full_stream_name = ISerialization::getFileNameForStream(name_and_type, substream_path);
 
         String stream_name;
@@ -177,10 +173,6 @@ void MergeTreeDataPartWriterWide::addStreams(
         if (!max_compress_block_size)
             max_compress_block_size = settings.max_compress_block_size;
 
-        WriteSettings query_write_settings = settings.query_write_settings;
-        query_write_settings.use_adaptive_write_buffer = settings.use_adaptive_write_buffer_for_dynamic_subcolumns && ISerialization::isDynamicSubcolumn(substream_path, substream_path.size());
-        query_write_settings.adaptive_write_buffer_initial_size = settings.adaptive_write_buffer_initial_size;
-
         column_streams[stream_name] = std::make_unique<Stream<false>>(
             stream_name,
             data_part_storage,
@@ -190,7 +182,7 @@ void MergeTreeDataPartWriterWide::addStreams(
             max_compress_block_size,
             marks_compression_codec,
             settings.marks_compress_block_size,
-            query_write_settings);
+            settings.query_write_settings);
 
         full_name_to_stream_name.emplace(full_stream_name, stream_name);
         stream_name_to_full_name.emplace(stream_name, full_stream_name);
@@ -213,10 +205,6 @@ ISerialization::OutputStreamGetter MergeTreeDataPartWriterWide::createStreamGett
 {
     return [&, this] (const ISerialization::SubstreamPath & substream_path) -> WriteBuffer *
     {
-        /// Skip ephemeral subcolumns that don't store any real data.
-        if (ISerialization::isEphemeralSubcolumn(substream_path, substream_path.size()))
-            return nullptr;
-
         bool is_offsets = !substream_path.empty() && substream_path.back().type == ISerialization::Substream::ArraySizes;
         auto stream_name = getStreamName(column, substream_path);
 
@@ -379,10 +367,6 @@ StreamsWithMarks MergeTreeDataPartWriterWide::getCurrentMarksForColumn(
         min_compress_block_size = settings.min_compress_block_size;
     getSerialization(name_and_type.name)->enumerateStreams([&] (const ISerialization::SubstreamPath & substream_path)
     {
-       /// Skip ephemeral subcolumns that don't store any real data.
-       if (ISerialization::isEphemeralSubcolumn(substream_path, substream_path.size()))
-           return;
-
         bool is_offsets = !substream_path.empty() && substream_path.back().type == ISerialization::Substream::ArraySizes;
         auto stream_name = getStreamName(name_and_type, substream_path);
 
@@ -421,10 +405,6 @@ void MergeTreeDataPartWriterWide::writeSingleGranule(
     /// So that instead of the marks pointing to the end of the compressed block, there were marks pointing to the beginning of the next one.
     serialization->enumerateStreams([&] (const ISerialization::SubstreamPath & substream_path)
     {
-        /// Skip ephemeral subcolumns that don't store any real data.
-        if (ISerialization::isEphemeralSubcolumn(substream_path, substream_path.size()))
-            return;
-
         bool is_offsets = !substream_path.empty() && substream_path.back().type == ISerialization::Substream::ArraySizes;
         auto stream_name = getStreamName(name_and_type, substream_path);
 
@@ -673,7 +653,7 @@ void MergeTreeDataPartWriterWide::fillDataChecksums(MergeTreeDataPartChecksums &
             if (!serialization_states.empty())
             {
                 serialize_settings.getter = createStreamGetter(*it, written_offset_columns ? *written_offset_columns : offset_columns);
-                serialize_settings.object_and_dynamic_write_statistics = ISerialization::SerializeBinaryBulkSettings::ObjectAndDynamicStatisticsMode::SUFFIX;
+                serialize_settings.dynamic_write_statistics = ISerialization::SerializeBinaryBulkSettings::DynamicStatisticsMode::SUFFIX;
                 getSerialization(it->name)->serializeBinaryBulkStateSuffix(serialize_settings, serialization_states[it->name]);
             }
 
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index 03db96dd016..c5214f0f3d3 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -11,7 +11,6 @@
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
 #include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
 #include <Storages/MergeTree/MergeTreeIndexFullText.h>
-#include <Storages/MergeTree/VectorSimilarityCondition.h>
 #include <Storages/ReadInOrderOptimizer.h>
 #include <Storages/VirtualColumnUtils.h>
 #include <Parsers/ASTIdentifier.h>
@@ -49,6 +48,7 @@
 #include <Functions/IFunction.h>
 
 #include <IO/WriteBufferFromOStream.h>
+#include <Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.h>
 
 namespace CurrentMetrics
 {
@@ -92,14 +92,13 @@ size_t MergeTreeDataSelectExecutor::getApproximateTotalRowsToRead(
     /// We will find out how many rows we would have read without sampling.
     LOG_DEBUG(log, "Preliminary index scan with condition: {}", key_condition.toString());
 
-    MarkRanges exact_ranges;
     for (const auto & part : parts)
     {
-        MarkRanges part_ranges = markRangesFromPKRange(part, metadata_snapshot, key_condition, {}, &exact_ranges, settings, log);
-        for (const auto & range : part_ranges)
+        MarkRanges exact_ranges;
+        markRangesFromPKRange(part, metadata_snapshot, key_condition, {}, &exact_ranges, settings, log);
+        for (const auto & range : exact_ranges)
             rows_count += part->index_granularity.getRowsCountInRange(range);
     }
-    UNUSED(exact_ranges);
 
     return rows_count;
 }
@@ -133,10 +132,12 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
     bool enable_parallel_reading) const
 {
     const auto & snapshot_data = assert_cast<const MergeTreeData::SnapshotData &>(*storage_snapshot->data);
+    const auto & parts = snapshot_data.parts;
+    const auto & alter_conversions = snapshot_data.alter_conversions;
 
     auto step = readFromParts(
-        snapshot_data.parts,
-        snapshot_data.mutations_snapshot,
+        parts,
+        alter_conversions,
         column_names_to_return,
         storage_snapshot,
         query_info,
@@ -368,7 +369,7 @@ MergeTreeDataSelectSamplingData MergeTreeDataSelectExecutor::getSampling(
             /// If sample and final are used together no need to calculate sampling expression twice.
             /// The first time it was calculated for final, because sample key is a part of the PK.
             /// So, assume that we already have calculated column.
-            ASTPtr sampling_key_ast;
+            ASTPtr sampling_key_ast = metadata_snapshot->getSamplingKeyAST();
 
             if (final)
             {
@@ -376,12 +377,6 @@ MergeTreeDataSelectSamplingData MergeTreeDataSelectExecutor::getSampling(
                 /// We do spoil available_real_columns here, but it is not used later.
                 available_real_columns.emplace_back(sampling_key.column_names[0], std::move(sampling_column_type));
             }
-            else
-            {
-                sampling_key_ast = metadata_snapshot->getSamplingKeyAST()->clone();
-            }
-
-            chassert(sampling_key_ast != nullptr);
 
             if (has_lower_limit)
             {
@@ -435,7 +430,7 @@ MergeTreeDataSelectSamplingData MergeTreeDataSelectExecutor::getSampling(
 
             ASTPtr query = sampling.filter_function;
             auto syntax_result = TreeRewriter(context).analyze(query, available_real_columns);
-            sampling.filter_expression = std::make_shared<const ActionsDAG>(ExpressionAnalyzer(sampling.filter_function, syntax_result, context).getActionsDAG(false));
+            sampling.filter_expression = ExpressionAnalyzer(sampling.filter_function, syntax_result, context).getActionsDAG(false);
         }
     }
 
@@ -449,7 +444,7 @@ MergeTreeDataSelectSamplingData MergeTreeDataSelectExecutor::getSampling(
 }
 
 void MergeTreeDataSelectExecutor::buildKeyConditionFromPartOffset(
-    std::optional<KeyCondition> & part_offset_condition, const ActionsDAG * filter_dag, ContextPtr context)
+    std::optional<KeyCondition> & part_offset_condition, const ActionsDAGPtr & filter_dag, ContextPtr context)
 {
     if (!filter_dag)
         return;
@@ -470,10 +465,10 @@ void MergeTreeDataSelectExecutor::buildKeyConditionFromPartOffset(
         return;
 
     part_offset_condition.emplace(KeyCondition{
-        &*dag,
+        dag,
         context,
         sample.getNames(),
-        std::make_shared<ExpressionActions>(ActionsDAG(sample.getColumnsWithTypeAndName()), ExpressionActionsSettings{}),
+        std::make_shared<ExpressionActions>(std::make_shared<ActionsDAG>(sample.getColumnsWithTypeAndName()), ExpressionActionsSettings{}),
         {}});
 }
 
@@ -481,7 +476,7 @@ std::optional<std::unordered_set<String>> MergeTreeDataSelectExecutor::filterPar
     const StorageMetadataPtr & metadata_snapshot,
     const MergeTreeData & data,
     const MergeTreeData::DataPartsVector & parts,
-    const ActionsDAG * filter_dag,
+    const ActionsDAGPtr & filter_dag,
     ContextPtr context)
 {
     if (!filter_dag)
@@ -493,14 +488,15 @@ std::optional<std::unordered_set<String>> MergeTreeDataSelectExecutor::filterPar
         return {};
 
     auto virtual_columns_block = data.getBlockWithVirtualsForFilter(metadata_snapshot, parts);
-    VirtualColumnUtils::filterBlockWithExpression(VirtualColumnUtils::buildFilterExpression(std::move(*dag), context), virtual_columns_block);
+    VirtualColumnUtils::filterBlockWithDAG(dag, virtual_columns_block, context);
     return VirtualColumnUtils::extractSingleValueFromBlock<String>(virtual_columns_block, "_part");
 }
 
 void MergeTreeDataSelectExecutor::filterPartsByPartition(
-    MergeTreeData::DataPartsVector & parts,
     const std::optional<PartitionPruner> & partition_pruner,
     const std::optional<KeyCondition> & minmax_idx_condition,
+    MergeTreeData::DataPartsVector & parts,
+    std::vector<AlterConversionsPtr> & alter_conversions,
     const std::optional<std::unordered_set<String>> & part_values,
     const StorageMetadataPtr & metadata_snapshot,
     const MergeTreeData & data,
@@ -509,6 +505,8 @@ void MergeTreeDataSelectExecutor::filterPartsByPartition(
     LoggerPtr log,
     ReadFromMergeTree::IndexStats & index_stats)
 {
+    chassert(alter_conversions.empty() || parts.size() == alter_conversions.size());
+
     const Settings & settings = context->getSettingsRef();
     DataTypes minmax_columns_types;
 
@@ -532,6 +530,7 @@ void MergeTreeDataSelectExecutor::filterPartsByPartition(
     if (query_context->getSettingsRef().allow_experimental_query_deduplication)
         selectPartsToReadWithUUIDFilter(
             parts,
+            alter_conversions,
             part_values,
             data.getPinnedPartUUIDs(),
             minmax_idx_condition,
@@ -544,6 +543,7 @@ void MergeTreeDataSelectExecutor::filterPartsByPartition(
     else
         selectPartsToRead(
             parts,
+            alter_conversions,
             part_values,
             minmax_idx_condition,
             minmax_columns_types,
@@ -582,6 +582,7 @@ void MergeTreeDataSelectExecutor::filterPartsByPartition(
 
 RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipIndexes(
     MergeTreeData::DataPartsVector && parts,
+    std::vector<AlterConversionsPtr> && alter_conversions,
     StorageMetadataPtr metadata_snapshot,
     const ContextPtr & context,
     const KeyCondition & key_condition,
@@ -594,6 +595,8 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
     bool use_skip_indexes,
     bool find_exact_ranges)
 {
+    chassert(alter_conversions.empty() || parts.size() == alter_conversions.size());
+
     RangesInDataParts parts_with_ranges;
     parts_with_ranges.resize(parts.size());
     const Settings & settings = context->getSettingsRef();
@@ -652,8 +655,11 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
         auto process_part = [&](size_t part_index)
         {
             auto & part = parts[part_index];
+            auto alter_conversions_for_part = !alter_conversions.empty()
+                ? alter_conversions[part_index]
+                : std::make_shared<AlterConversions>();
 
-            RangesInDataPart ranges(part, part_index);
+            RangesInDataPart ranges(part, alter_conversions_for_part, part_index);
             size_t total_marks_count = part->index_granularity.getMarksCountWithoutFinal();
 
             if (metadata_snapshot->hasPrimaryKey() || part_offset_condition)
@@ -891,7 +897,6 @@ std::shared_ptr<QueryIdHolder> MergeTreeDataSelectExecutor::checkLimits(
 
 ReadFromMergeTree::AnalysisResultPtr MergeTreeDataSelectExecutor::estimateNumMarksToRead(
     MergeTreeData::DataPartsVector parts,
-    MergeTreeData::MutationsSnapshotPtr mutations_snapshot,
     const Names & column_names_to_return,
     const StorageMetadataPtr & metadata_snapshot,
     const SelectQueryInfo & query_info,
@@ -904,9 +909,11 @@ ReadFromMergeTree::AnalysisResultPtr MergeTreeDataSelectExecutor::estimateNumMar
         return std::make_shared<ReadFromMergeTree::AnalysisResult>();
 
     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),
-        mutations_snapshot,
+        /*alter_conversions=*/{},
         metadata_snapshot,
         query_info,
         context,
@@ -921,7 +928,7 @@ ReadFromMergeTree::AnalysisResultPtr MergeTreeDataSelectExecutor::estimateNumMar
 
 QueryPlanStepPtr MergeTreeDataSelectExecutor::readFromParts(
     MergeTreeData::DataPartsVector parts,
-    MergeTreeData::MutationsSnapshotPtr mutations_snapshot,
+    std::vector<AlterConversionsPtr> alter_conversions,
     const Names & column_names_to_return,
     const StorageSnapshotPtr & storage_snapshot,
     const SelectQueryInfo & query_info,
@@ -943,7 +950,7 @@ QueryPlanStepPtr MergeTreeDataSelectExecutor::readFromParts(
 
     return std::make_unique<ReadFromMergeTree>(
         std::move(parts),
-        std::move(mutations_snapshot),
+        std::move(alter_conversions),
         column_names_to_return,
         data,
         query_info,
@@ -1399,10 +1406,11 @@ MarkRanges MergeTreeDataSelectExecutor::filterMarksUsingIndex(
             if (index_mark != index_range.begin || !granule || last_index_mark != index_range.begin)
                 reader.read(granule);
 
-            if (index_helper->isVectorSimilarityIndex())
+            auto ann_condition = std::dynamic_pointer_cast<IMergeTreeIndexConditionApproximateNearestNeighbor>(condition);
+            if (ann_condition != nullptr)
             {
                 /// An array of indices of useful ranges.
-                auto result = condition->getUsefulRanges(granule);
+                auto result = ann_condition->getUsefulRanges(granule);
 
                 for (auto range : result)
                 {
@@ -1540,6 +1548,7 @@ MarkRanges MergeTreeDataSelectExecutor::filterMarksUsingMergedIndex(
 
 void MergeTreeDataSelectExecutor::selectPartsToRead(
     MergeTreeData::DataPartsVector & parts,
+    std::vector<AlterConversionsPtr> & alter_conversions,
     const std::optional<std::unordered_set<String>> & part_values,
     const std::optional<KeyCondition> & minmax_idx_condition,
     const DataTypes & minmax_columns_types,
@@ -1548,11 +1557,14 @@ void MergeTreeDataSelectExecutor::selectPartsToRead(
     PartFilterCounters & counters)
 {
     MergeTreeData::DataPartsVector prev_parts;
-    std::swap(prev_parts, parts);
+    std::vector<AlterConversionsPtr> prev_conversions;
 
-    for (const auto & part_or_projection : prev_parts)
+    std::swap(prev_parts, parts);
+    std::swap(prev_conversions, alter_conversions);
+
+    for (size_t i = 0; i < prev_parts.size(); ++i)
     {
-        const auto * part = part_or_projection->isProjectionPart() ? part_or_projection->getParentPart() : part_or_projection.get();
+        const auto * part = prev_parts[i]->isProjectionPart() ? prev_parts[i]->getParentPart() : prev_parts[i].get();
         if (part_values && part_values->find(part->name) == part_values->end())
             continue;
 
@@ -1589,12 +1601,15 @@ void MergeTreeDataSelectExecutor::selectPartsToRead(
         counters.num_parts_after_partition_pruner += 1;
         counters.num_granules_after_partition_pruner += num_granules;
 
-        parts.push_back(part_or_projection);
+        parts.push_back(prev_parts[i]);
+        if (!prev_conversions.empty())
+            alter_conversions.push_back(prev_conversions[i]);
     }
 }
 
 void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
     MergeTreeData::DataPartsVector & parts,
+    std::vector<AlterConversionsPtr> & alter_conversions,
     const std::optional<std::unordered_set<String>> & part_values,
     MergeTreeData::PinnedPartUUIDsPtr pinned_part_uuids,
     const std::optional<KeyCondition> & minmax_idx_condition,
@@ -1607,17 +1622,22 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
 {
     /// process_parts prepare parts that have to be read for the query,
     /// returns false if duplicated parts' UUID have been met
-    auto select_parts = [&](MergeTreeData::DataPartsVector & selected_parts) -> bool
+    auto select_parts = [&] (
+        MergeTreeData::DataPartsVector & selected_parts,
+        std::vector<AlterConversionsPtr> & selected_conversions) -> bool
     {
         auto ignored_part_uuids = query_context->getIgnoredPartUUIDs();
         std::unordered_set<UUID> temp_part_uuids;
 
         MergeTreeData::DataPartsVector prev_parts;
-        std::swap(prev_parts, selected_parts);
+        std::vector<AlterConversionsPtr> prev_conversions;
 
-        for (const auto & part_or_projection : prev_parts)
+        std::swap(prev_parts, selected_parts);
+        std::swap(prev_conversions, selected_conversions);
+
+        for (size_t i = 0; i < prev_parts.size(); ++i)
         {
-            const auto * part = part_or_projection->isProjectionPart() ? part_or_projection->getParentPart() : part_or_projection.get();
+            const auto * part = prev_parts[i]->isProjectionPart() ? prev_parts[i]->getParentPart() : prev_parts[i].get();
             if (part_values && part_values->find(part->name) == part_values->end())
                 continue;
 
@@ -1667,7 +1687,9 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
                     throw Exception(ErrorCodes::LOGICAL_ERROR, "Found a part with the same UUID on the same replica.");
             }
 
-            selected_parts.push_back(part_or_projection);
+            selected_parts.push_back(prev_parts[i]);
+            if (!prev_conversions.empty())
+                selected_conversions.push_back(prev_conversions[i]);
         }
 
         if (!temp_part_uuids.empty())
@@ -1686,7 +1708,7 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
     };
 
     /// Process parts that have to be read for a query.
-    auto needs_retry = !select_parts(parts);
+    auto needs_retry = !select_parts(parts, alter_conversions);
 
     /// If any duplicated part UUIDs met during the first step, try to ignore them in second pass.
     /// This may happen when `prefer_localhost_replica` is set and "distributed" stage runs in the same process with "remote" stage.
@@ -1697,7 +1719,7 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
         counters = PartFilterCounters();
 
         /// Second attempt didn't help, throw an exception
-        if (!select_parts(parts))
+        if (!select_parts(parts, alter_conversions))
             throw Exception(ErrorCodes::DUPLICATED_PART_UUIDS, "Found duplicate UUIDs while processing query.");
     }
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
index 3668eb0ad90..788355c1e59 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
@@ -40,7 +40,7 @@ public:
     /// The same as read, but with specified set of parts.
     QueryPlanStepPtr readFromParts(
         MergeTreeData::DataPartsVector parts,
-        MergeTreeData::MutationsSnapshotPtr mutations_snapshot,
+        std::vector<AlterConversionsPtr> alter_conversions,
         const Names & column_names,
         const StorageSnapshotPtr & storage_snapshot,
         const SelectQueryInfo & query_info,
@@ -56,7 +56,6 @@ public:
     /// This method is used to select best projection for table.
     ReadFromMergeTree::AnalysisResultPtr estimateNumMarksToRead(
         MergeTreeData::DataPartsVector parts,
-        MergeTreeData::MutationsSnapshotPtr mutations_snapshot,
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
@@ -121,6 +120,7 @@ private:
     ///  as well as `max_block_number_to_read`.
     static void selectPartsToRead(
         MergeTreeData::DataPartsVector & parts,
+        std::vector<AlterConversionsPtr> & alter_conversions,
         const std::optional<std::unordered_set<String>> & part_values,
         const std::optional<KeyCondition> & minmax_idx_condition,
         const DataTypes & minmax_columns_types,
@@ -131,6 +131,7 @@ private:
     /// Same as previous but also skip parts uuids if any to the query context, or skip parts which uuids marked as excluded.
     static void selectPartsToReadWithUUIDFilter(
         MergeTreeData::DataPartsVector & parts,
+        std::vector<AlterConversionsPtr> & alter_conversions,
         const std::optional<std::unordered_set<String>> & part_values,
         MergeTreeData::PinnedPartUUIDsPtr pinned_part_uuids,
         const std::optional<KeyCondition> & minmax_idx_condition,
@@ -160,7 +161,7 @@ public:
 
     /// If possible, construct optional key condition from predicates containing _part_offset column.
     static void buildKeyConditionFromPartOffset(
-        std::optional<KeyCondition> & part_offset_condition, const ActionsDAG * filter_dag, ContextPtr context);
+        std::optional<KeyCondition> & part_offset_condition, const ActionsDAGPtr & filter_dag, ContextPtr context);
 
     /// If possible, filter using expression on virtual columns.
     /// Example: SELECT count() FROM table WHERE _part = 'part_name'
@@ -169,14 +170,15 @@ public:
         const StorageMetadataPtr & metadata_snapshot,
         const MergeTreeData & data,
         const MergeTreeData::DataPartsVector & parts,
-        const ActionsDAG * filter_dag,
+        const ActionsDAGPtr & filter_dag,
         ContextPtr context);
 
     /// Filter parts using minmax index and partition key.
     static void filterPartsByPartition(
-        MergeTreeData::DataPartsVector & parts,
         const std::optional<PartitionPruner> & partition_pruner,
         const std::optional<KeyCondition> & minmax_idx_condition,
+        MergeTreeData::DataPartsVector & parts,
+        std::vector<AlterConversionsPtr> & alter_conversions,
         const std::optional<std::unordered_set<String>> & part_values,
         const StorageMetadataPtr & metadata_snapshot,
         const MergeTreeData & data,
@@ -190,6 +192,7 @@ public:
     /// If 'check_limits = true' it will throw exception if the amount of data exceed the limits from settings.
     static RangesInDataParts filterPartsByPrimaryKeyAndSkipIndexes(
         MergeTreeData::DataPartsVector && parts,
+        std::vector<AlterConversionsPtr> && alter_conversions,
         StorageMetadataPtr metadata_snapshot,
         const ContextPtr & context,
         const KeyCondition & key_condition,
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index f29d715e791..ee3ac4207cc 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -240,14 +240,6 @@ std::vector<AsyncInsertInfoPtr> scatterAsyncInsertInfoBySelector(AsyncInsertInfo
             ++offset_idx;
         }
     }
-    if (offset_idx != async_insert_info->offsets.size())
-    {
-        LOG_ERROR(
-            getLogger("MergeTreeDataWriter"),
-            "ChunkInfo of async insert offsets doesn't match the selector size {}. Offsets content is ({})",
-            selector.size(), fmt::join(async_insert_info->offsets.begin(), async_insert_info->offsets.end(), ","));
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected error for async deduplicated insert, please check error logs");
-    }
     return result;
 }
 
@@ -325,10 +317,8 @@ BlocksWithPartition MergeTreeDataWriter::splitBlockIntoParts(
     {
         if (async_insert_info_with_partition[i] == nullptr)
         {
-            LOG_ERROR(
-                getLogger("MergeTreeDataWriter"),
-                "The {}th element in async_insert_info_with_partition is nullptr. There are totally {} partitions in the insert. Selector content is ({}). Offsets content is ({})",
-                i, partitions_count, fmt::join(selector.begin(), selector.end(), ","), fmt::join(async_insert_info->offsets.begin(), async_insert_info->offsets.end(), ","));
+            LOG_ERROR(getLogger("MergeTreeDataWriter"), "The {}th element in async_insert_info_with_partition is nullptr. There are totally {} partitions in the insert. Selector content is {}",
+                      i, partitions_count, fmt::join(selector.begin(), selector.end(), ","));
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected error for async deduplicated insert, please check error logs");
         }
         result[i].offsets = std::move(async_insert_info_with_partition[i]->offsets);
@@ -451,8 +441,8 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPartImpl(
     String part_name;
     if (data.format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
     {
-        DayNum min_date(minmax_idx->hyperrectangle[data.minmax_idx_date_column_pos].left.safeGet<UInt64>());
-        DayNum max_date(minmax_idx->hyperrectangle[data.minmax_idx_date_column_pos].right.safeGet<UInt64>());
+        DayNum min_date(minmax_idx->hyperrectangle[data.minmax_idx_date_column_pos].left.get<UInt64>());
+        DayNum max_date(minmax_idx->hyperrectangle[data.minmax_idx_date_column_pos].right.get<UInt64>());
 
         const auto & date_lut = DateLUT::serverTimezoneInstance();
 
diff --git a/src/Storages/MergeTree/MergeTreeIOSettings.cpp b/src/Storages/MergeTree/MergeTreeIOSettings.cpp
index 19365a90a14..58c3bd28d6a 100644
--- a/src/Storages/MergeTree/MergeTreeIOSettings.cpp
+++ b/src/Storages/MergeTree/MergeTreeIOSettings.cpp
@@ -27,11 +27,10 @@ MergeTreeWriterSettings::MergeTreeWriterSettings(
     , rewrite_primary_key(rewrite_primary_key_)
     , blocks_are_granules_size(blocks_are_granules_size_)
     , query_write_settings(query_write_settings_)
+    , max_threads_for_annoy_index_creation(global_settings.max_threads_for_annoy_index_creation)
     , low_cardinality_max_dictionary_size(global_settings.low_cardinality_max_dictionary_size)
     , low_cardinality_use_single_dictionary_for_part(global_settings.low_cardinality_use_single_dictionary_for_part != 0)
     , use_compact_variant_discriminators_serialization(storage_settings->use_compact_variant_discriminators_serialization)
-    , use_adaptive_write_buffer_for_dynamic_subcolumns(storage_settings->use_adaptive_write_buffer_for_dynamic_subcolumns)
-    , adaptive_write_buffer_initial_size(storage_settings->adaptive_write_buffer_initial_size)
 {
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeIOSettings.h b/src/Storages/MergeTree/MergeTreeIOSettings.h
index fcc72815d8f..c79ca1e66ee 100644
--- a/src/Storages/MergeTree/MergeTreeIOSettings.h
+++ b/src/Storages/MergeTree/MergeTreeIOSettings.h
@@ -77,11 +77,11 @@ struct MergeTreeWriterSettings
     bool blocks_are_granules_size;
     WriteSettings query_write_settings;
 
+    size_t max_threads_for_annoy_index_creation;
+
     size_t low_cardinality_max_dictionary_size;
     bool low_cardinality_use_single_dictionary_for_part;
     bool use_compact_variant_discriminators_serialization;
-    bool use_adaptive_write_buffer_for_dynamic_subcolumns;
-    size_t adaptive_write_buffer_initial_size;
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp b/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp
new file mode 100644
index 00000000000..c66aa2373e7
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp
@@ -0,0 +1,416 @@
+#ifdef ENABLE_ANNOY
+
+#include <Storages/MergeTree/MergeTreeIndexAnnoy.h>
+
+#include <Columns/ColumnArray.h>
+#include <Common/typeid_cast.h>
+#include <Core/Field.h>
+#include <Core/Settings.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/castColumn.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_COLUMN;
+    extern const int INCORRECT_DATA;
+    extern const int INCORRECT_NUMBER_OF_COLUMNS;
+    extern const int INCORRECT_QUERY;
+    extern const int LOGICAL_ERROR;
+    extern const int NOT_IMPLEMENTED;
+}
+
+template <typename Distance>
+AnnoyIndexWithSerialization<Distance>::AnnoyIndexWithSerialization(size_t dimensions)
+    : Base::AnnoyIndex(static_cast<int>(dimensions))
+{
+}
+
+template<typename Distance>
+void AnnoyIndexWithSerialization<Distance>::serialize(WriteBuffer & ostr) const
+{
+    chassert(Base::_built);
+    writeIntBinary(Base::_s, ostr);
+    writeIntBinary(Base::_n_items, ostr);
+    writeIntBinary(Base::_n_nodes, ostr);
+    writeIntBinary(Base::_nodes_size, ostr);
+    writeIntBinary(Base::_K, ostr);
+    writeIntBinary(Base::_seed, ostr);
+    writeVectorBinary(Base::_roots, ostr);
+    ostr.write(reinterpret_cast<const char *>(Base::_nodes), Base::_s * Base::_n_nodes);
+}
+
+template<typename Distance>
+void AnnoyIndexWithSerialization<Distance>::deserialize(ReadBuffer & istr)
+{
+    chassert(!Base::_built);
+    readIntBinary(Base::_s, istr);
+    readIntBinary(Base::_n_items, istr);
+    readIntBinary(Base::_n_nodes, istr);
+    readIntBinary(Base::_nodes_size, istr);
+    readIntBinary(Base::_K, istr);
+    readIntBinary(Base::_seed, istr);
+    readVectorBinary(Base::_roots, istr);
+    Base::_nodes = realloc(Base::_nodes, Base::_s * Base::_n_nodes);
+    istr.readStrict(reinterpret_cast<char *>(Base::_nodes), Base::_s * Base::_n_nodes);
+
+    Base::_fd = 0;
+    // set flags
+    Base::_loaded = false;
+    Base::_verbose = false;
+    Base::_on_disk = false;
+    Base::_built = true;
+}
+
+template<typename Distance>
+size_t AnnoyIndexWithSerialization<Distance>::getDimensions() const
+{
+    return Base::get_f();
+}
+
+
+template <typename Distance>
+MergeTreeIndexGranuleAnnoy<Distance>::MergeTreeIndexGranuleAnnoy(const String & index_name_, const Block & index_sample_block_)
+    : index_name(index_name_)
+    , index_sample_block(index_sample_block_)
+    , index(nullptr)
+{}
+
+template <typename Distance>
+MergeTreeIndexGranuleAnnoy<Distance>::MergeTreeIndexGranuleAnnoy(
+    const String & index_name_,
+    const Block & index_sample_block_,
+    AnnoyIndexWithSerializationPtr<Distance> index_)
+    : index_name(index_name_)
+    , index_sample_block(index_sample_block_)
+    , index(std::move(index_))
+{}
+
+template <typename Distance>
+void MergeTreeIndexGranuleAnnoy<Distance>::serializeBinary(WriteBuffer & ostr) const
+{
+    /// Number of dimensions is required in the index constructor,
+    /// so it must be written and read separately from the other part
+    writeIntBinary(static_cast<UInt64>(index->getDimensions()), ostr); // write dimension
+    index->serialize(ostr);
+}
+
+template <typename Distance>
+void MergeTreeIndexGranuleAnnoy<Distance>::deserializeBinary(ReadBuffer & istr, MergeTreeIndexVersion /*version*/)
+{
+    UInt64 dimension;
+    readIntBinary(dimension, istr);
+    index = std::make_shared<AnnoyIndexWithSerialization<Distance>>(dimension);
+    index->deserialize(istr);
+}
+
+template <typename Distance>
+MergeTreeIndexAggregatorAnnoy<Distance>::MergeTreeIndexAggregatorAnnoy(
+    const String & index_name_,
+    const Block & index_sample_block_,
+    UInt64 trees_,
+    size_t max_threads_for_creation_)
+    : index_name(index_name_)
+    , index_sample_block(index_sample_block_)
+    , trees(trees_)
+    , max_threads_for_creation(max_threads_for_creation_)
+{}
+
+template <typename Distance>
+MergeTreeIndexGranulePtr MergeTreeIndexAggregatorAnnoy<Distance>::getGranuleAndReset()
+{
+    int threads = (max_threads_for_creation == 0) ? -1 : static_cast<int>(max_threads_for_creation);
+    /// clang-tidy reports a false positive: it considers %p with an outdated pointer in fprintf() (used by logging which we don't do) dereferencing
+    index->build(static_cast<int>(trees), threads);
+    auto granule = std::make_shared<MergeTreeIndexGranuleAnnoy<Distance>>(index_name, index_sample_block, index);
+    index = nullptr;
+    return granule;
+}
+
+template <typename Distance>
+void MergeTreeIndexAggregatorAnnoy<Distance>::update(const Block & block, size_t * pos, size_t limit)
+{
+    if (*pos >= block.rows())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "The provided position is not less than the number of block rows. Position: {}, Block rows: {}.",
+            *pos, block.rows());
+
+    size_t rows_read = std::min(limit, block.rows() - *pos);
+
+    if (rows_read == 0)
+        return;
+
+    if (rows_read > std::numeric_limits<uint32_t>::max())
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Index granularity is too big: more than 4B rows per index granule.");
+
+    if (index_sample_block.columns() > 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected block with single column");
+
+    const String & index_column_name = index_sample_block.getByPosition(0).name;
+    ColumnPtr column_cut = block.getByName(index_column_name).column->cut(*pos, rows_read);
+
+    if (const auto & column_array = typeid_cast<const ColumnArray *>(column_cut.get()))
+    {
+        const auto & column_array_data = column_array->getData();
+        const auto & column_array_data_float = typeid_cast<const ColumnFloat32 &>(column_array_data);
+        const auto & column_array_data_float_data = column_array_data_float.getData();
+
+        const auto & column_array_offsets = column_array->getOffsets();
+        const size_t num_rows = column_array_offsets.size();
+
+        if (column_array->empty())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Array is unexpectedly empty");
+
+        /// The Annoy algorithm naturally assumes that the indexed vectors have dimension >= 1. This condition is violated if empty arrays
+        /// are INSERTed into an Annoy-indexed column or if no value was specified at all in which case the arrays take on their default
+        /// value which is also empty.
+        if (column_array->isDefaultAt(0))
+            throw Exception(ErrorCodes::INCORRECT_DATA, "The arrays in column '{}' must not be empty. Did you try to INSERT default values?", index_column_name);
+
+        /// Check all sizes are the same
+        size_t dimension = column_array_offsets[0];
+        for (size_t i = 0; i < num_rows - 1; ++i)
+            if (column_array_offsets[i + 1] - column_array_offsets[i] != dimension)
+                throw Exception(ErrorCodes::INCORRECT_DATA, "All arrays in column '{}' must have equal length", index_column_name);
+
+        /// Also check that previously inserted blocks have the same size as this block.
+        /// Note that this guarantees consistency of dimension only within parts. We are unable to detect inconsistent dimensions across
+        /// parts - for this, a little help from the user is needed, e.g. CONSTRAINT cnstr CHECK length(array) = 42.
+        if (index && index->getDimensions() != dimension)
+            throw Exception(ErrorCodes::INCORRECT_DATA, "All arrays in column '{}' must have equal length", index_column_name);
+
+        if (!index)
+            index = std::make_shared<AnnoyIndexWithSerialization<Distance>>(dimension);
+
+        /// Add all rows of block
+        index->add_item(index->get_n_items(), column_array_data_float_data.data());
+        for (size_t current_row = 1; current_row < num_rows; ++current_row)
+            index->add_item(index->get_n_items(), &column_array_data_float_data[column_array_offsets[current_row - 1]]);
+    }
+    else if (const auto & column_tuple = typeid_cast<const ColumnTuple *>(column_cut.get()))
+    {
+        const auto & column_tuple_columns = column_tuple->getColumns();
+
+        /// TODO check if calling index->add_item() directly on the block's tuples is faster than materializing everything
+        std::vector<std::vector<Float32>> data(column_tuple->size(), std::vector<Float32>());
+        for (const auto & column : column_tuple_columns)
+        {
+            const auto & pod_array = typeid_cast<const ColumnFloat32 *>(column.get())->getData();
+            for (size_t i = 0; i < pod_array.size(); ++i)
+                data[i].push_back(pod_array[i]);
+        }
+
+        if (data.empty())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Tuple has 0 rows, {} rows expected", rows_read);
+
+        if (!index)
+            index = std::make_shared<AnnoyIndexWithSerialization<Distance>>(data[0].size());
+
+        for (const auto & item : data)
+            index->add_item(index->get_n_items(), item.data());
+    }
+    else
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected Array or Tuple column");
+
+    *pos += rows_read;
+}
+
+
+MergeTreeIndexConditionAnnoy::MergeTreeIndexConditionAnnoy(
+    const IndexDescription & /*index_description*/,
+    const SelectQueryInfo & query,
+    const String & distance_function_,
+    ContextPtr context)
+    : ann_condition(query, context)
+    , distance_function(distance_function_)
+    , search_k(context->getSettingsRef().annoy_index_search_k_nodes)
+{}
+
+bool MergeTreeIndexConditionAnnoy::mayBeTrueOnGranule(MergeTreeIndexGranulePtr /*idx_granule*/) const
+{
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "mayBeTrueOnGranule is not supported for ANN skip indexes");
+}
+
+bool MergeTreeIndexConditionAnnoy::alwaysUnknownOrTrue() const
+{
+    return ann_condition.alwaysUnknownOrTrue(distance_function);
+}
+
+std::vector<size_t> MergeTreeIndexConditionAnnoy::getUsefulRanges(MergeTreeIndexGranulePtr idx_granule) const
+{
+    if (distance_function == DISTANCE_FUNCTION_L2)
+        return getUsefulRangesImpl<Annoy::Euclidean>(idx_granule);
+    else if (distance_function == DISTANCE_FUNCTION_COSINE)
+        return getUsefulRangesImpl<Annoy::Angular>(idx_granule);
+    std::unreachable();
+}
+
+template <typename Distance>
+std::vector<size_t> MergeTreeIndexConditionAnnoy::getUsefulRangesImpl(MergeTreeIndexGranulePtr idx_granule) const
+{
+    const UInt64 limit = ann_condition.getLimit();
+    const UInt64 index_granularity = ann_condition.getIndexGranularity();
+    const std::optional<float> comparison_distance = ann_condition.getQueryType() == ApproximateNearestNeighborInformation::Type::Where
+        ? std::optional<float>(ann_condition.getComparisonDistanceForWhereQuery())
+        : std::nullopt;
+
+    if (comparison_distance && comparison_distance.value() < 0)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to optimize query with where without distance");
+
+    const std::vector<float> reference_vector = ann_condition.getReferenceVector();
+
+    const auto granule = std::dynamic_pointer_cast<MergeTreeIndexGranuleAnnoy<Distance>>(idx_granule);
+    if (granule == nullptr)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Granule has the wrong type");
+
+    const AnnoyIndexWithSerializationPtr<Distance> annoy = granule->index;
+
+    if (ann_condition.getDimensions() != annoy->getDimensions())
+        throw Exception(ErrorCodes::INCORRECT_QUERY, "The dimension of the space in the request ({}) "
+                        "does not match the dimension in the index ({})",
+                        ann_condition.getDimensions(), annoy->getDimensions());
+
+    std::vector<UInt64> neighbors; /// indexes of dots which were closest to the reference vector
+    std::vector<Float32> distances;
+    neighbors.reserve(limit);
+    distances.reserve(limit);
+
+    annoy->get_nns_by_vector(reference_vector.data(), limit, static_cast<int>(search_k), &neighbors, &distances);
+
+    chassert(neighbors.size() == distances.size());
+
+    std::vector<size_t> granules;
+    granules.reserve(neighbors.size());
+    for (size_t i = 0; i < neighbors.size(); ++i)
+    {
+        if (comparison_distance && distances[i] > comparison_distance)
+            continue;
+        granules.push_back(neighbors[i] / index_granularity);
+    }
+
+    /// make unique
+    std::sort(granules.begin(), granules.end());
+    granules.erase(std::unique(granules.begin(), granules.end()), granules.end());
+
+    return granules;
+}
+
+MergeTreeIndexAnnoy::MergeTreeIndexAnnoy(const IndexDescription & index_, UInt64 trees_, const String & distance_function_)
+    : IMergeTreeIndex(index_)
+    , trees(trees_)
+    , distance_function(distance_function_)
+{}
+
+MergeTreeIndexGranulePtr MergeTreeIndexAnnoy::createIndexGranule() const
+{
+    if (distance_function == DISTANCE_FUNCTION_L2)
+        return std::make_shared<MergeTreeIndexGranuleAnnoy<Annoy::Euclidean>>(index.name, index.sample_block);
+    else if (distance_function == DISTANCE_FUNCTION_COSINE)
+        return std::make_shared<MergeTreeIndexGranuleAnnoy<Annoy::Angular>>(index.name, index.sample_block);
+    std::unreachable();
+}
+
+MergeTreeIndexAggregatorPtr MergeTreeIndexAnnoy::createIndexAggregator(const MergeTreeWriterSettings & settings) const
+{
+    /// TODO: Support more metrics. Available metrics: https://github.com/spotify/annoy/blob/master/src/annoymodule.cc#L151-L171
+    if (distance_function == DISTANCE_FUNCTION_L2)
+        return std::make_shared<MergeTreeIndexAggregatorAnnoy<Annoy::Euclidean>>(index.name, index.sample_block, trees, settings.max_threads_for_annoy_index_creation);
+    else if (distance_function == DISTANCE_FUNCTION_COSINE)
+        return std::make_shared<MergeTreeIndexAggregatorAnnoy<Annoy::Angular>>(index.name, index.sample_block, trees, settings.max_threads_for_annoy_index_creation);
+    std::unreachable();
+}
+
+MergeTreeIndexConditionPtr MergeTreeIndexAnnoy::createIndexCondition(const SelectQueryInfo & query, ContextPtr context) const
+{
+    return std::make_shared<MergeTreeIndexConditionAnnoy>(index, query, distance_function, context);
+};
+
+MergeTreeIndexConditionPtr MergeTreeIndexAnnoy::createIndexCondition(const ActionsDAGPtr &, ContextPtr) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "MergeTreeIndexAnnoy cannot be created with ActionsDAG");
+}
+
+MergeTreeIndexPtr annoyIndexCreator(const IndexDescription & index)
+{
+    static constexpr auto DEFAULT_DISTANCE_FUNCTION = DISTANCE_FUNCTION_L2;
+    String distance_function = DEFAULT_DISTANCE_FUNCTION;
+    if (!index.arguments.empty())
+        distance_function = index.arguments[0].get<String>();
+
+    static constexpr auto DEFAULT_TREES = 100uz;
+    UInt64 trees = DEFAULT_TREES;
+    if (index.arguments.size() > 1)
+        trees = index.arguments[1].get<UInt64>();
+
+    return std::make_shared<MergeTreeIndexAnnoy>(index, trees, distance_function);
+}
+
+void annoyIndexValidator(const IndexDescription & index, bool /* attach */)
+{
+    /// Check number and type of Annoy index arguments:
+
+    if (index.arguments.size() > 2)
+        throw Exception(ErrorCodes::INCORRECT_QUERY, "Annoy index must not have more than two parameters");
+
+    if (!index.arguments.empty() && index.arguments[0].getType() != Field::Types::String)
+        throw Exception(ErrorCodes::INCORRECT_QUERY, "Distance function argument of Annoy index must be of type String");
+
+    if (index.arguments.size() > 1 && index.arguments[1].getType() != Field::Types::UInt64)
+        throw Exception(ErrorCodes::INCORRECT_QUERY, "Number of trees argument of Annoy index must be of type UInt64");
+
+    /// Check that the index is created on a single column
+
+    if (index.column_names.size() != 1 || index.data_types.size() != 1)
+        throw Exception(ErrorCodes::INCORRECT_NUMBER_OF_COLUMNS, "Annoy indexes must be created on a single column");
+
+    /// Check that a supported metric was passed as first argument
+
+    if (!index.arguments.empty())
+    {
+        String distance_name = index.arguments[0].get<String>();
+        if (distance_name != DISTANCE_FUNCTION_L2 && distance_name != DISTANCE_FUNCTION_COSINE)
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Annoy index only supports distance functions '{}' and '{}'", DISTANCE_FUNCTION_L2, DISTANCE_FUNCTION_COSINE);
+    }
+
+    /// Check data type of indexed column:
+
+    auto throw_unsupported_underlying_column_exception = []()
+    {
+        throw Exception(
+            ErrorCodes::ILLEGAL_COLUMN,
+            "Annoy indexes can only be created on columns of type Array(Float32) and Tuple(Float32[, Float32[, ...]])");
+    };
+
+    DataTypePtr data_type = index.sample_block.getDataTypes()[0];
+
+    if (const auto * data_type_array = typeid_cast<const DataTypeArray *>(data_type.get()))
+    {
+        TypeIndex nested_type_index = data_type_array->getNestedType()->getTypeId();
+        if (!WhichDataType(nested_type_index).isFloat32())
+            throw_unsupported_underlying_column_exception();
+    }
+    else if (const auto * data_type_tuple = typeid_cast<const DataTypeTuple *>(data_type.get()))
+    {
+        const DataTypes & inner_types = data_type_tuple->getElements();
+        for (const auto & inner_type : inner_types)
+        {
+            TypeIndex nested_type_index = inner_type->getTypeId();
+            if (!WhichDataType(nested_type_index).isFloat32())
+                throw_unsupported_underlying_column_exception();
+        }
+    }
+    else
+        throw_unsupported_underlying_column_exception();
+}
+
+}
+
+#endif
diff --git a/src/Storages/MergeTree/MergeTreeIndexAnnoy.h b/src/Storages/MergeTree/MergeTreeIndexAnnoy.h
new file mode 100644
index 00000000000..d511ab84859
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeIndexAnnoy.h
@@ -0,0 +1,112 @@
+#pragma once
+
+#ifdef ENABLE_ANNOY
+
+#include <Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.h>
+
+#include <annoylib.h>
+#include <kissrandom.h>
+
+namespace DB
+{
+
+template <typename Distance>
+class AnnoyIndexWithSerialization : public Annoy::AnnoyIndex<UInt64, Float32, Distance, Annoy::Kiss64Random, Annoy::AnnoyIndexMultiThreadedBuildPolicy>
+{
+    using Base = Annoy::AnnoyIndex<UInt64, Float32, Distance, Annoy::Kiss64Random, Annoy::AnnoyIndexMultiThreadedBuildPolicy>;
+
+public:
+    explicit AnnoyIndexWithSerialization(size_t dimensions);
+    void serialize(WriteBuffer & ostr) const;
+    void deserialize(ReadBuffer & istr);
+    size_t getDimensions() const;
+};
+
+template <typename Distance>
+using AnnoyIndexWithSerializationPtr = std::shared_ptr<AnnoyIndexWithSerialization<Distance>>;
+
+
+template <typename Distance>
+struct MergeTreeIndexGranuleAnnoy final : public IMergeTreeIndexGranule
+{
+    MergeTreeIndexGranuleAnnoy(const String & index_name_, const Block & index_sample_block_);
+    MergeTreeIndexGranuleAnnoy(const String & index_name_, const Block & index_sample_block_, AnnoyIndexWithSerializationPtr<Distance> index_);
+
+    ~MergeTreeIndexGranuleAnnoy() override = default;
+
+    void serializeBinary(WriteBuffer & ostr) const override;
+    void deserializeBinary(ReadBuffer & istr, MergeTreeIndexVersion version) override;
+
+    bool empty() const override { return !index.get(); }
+
+    const String index_name;
+    const Block index_sample_block;
+    AnnoyIndexWithSerializationPtr<Distance> index;
+};
+
+
+template <typename Distance>
+struct MergeTreeIndexAggregatorAnnoy final : IMergeTreeIndexAggregator
+{
+    MergeTreeIndexAggregatorAnnoy(const String & index_name_, const Block & index_sample_block, UInt64 trees, size_t max_threads_for_creation);
+    ~MergeTreeIndexAggregatorAnnoy() override = default;
+
+    bool empty() const override { return !index || index->get_n_items() == 0; }
+    MergeTreeIndexGranulePtr getGranuleAndReset() override;
+    void update(const Block & block, size_t * pos, size_t limit) override;
+
+    const String index_name;
+    const Block index_sample_block;
+    const UInt64 trees;
+    const size_t max_threads_for_creation;
+    AnnoyIndexWithSerializationPtr<Distance> index;
+};
+
+
+class MergeTreeIndexConditionAnnoy final : public IMergeTreeIndexConditionApproximateNearestNeighbor
+{
+public:
+    MergeTreeIndexConditionAnnoy(
+        const IndexDescription & index_description,
+        const SelectQueryInfo & query,
+        const String & distance_function,
+        ContextPtr context);
+
+    ~MergeTreeIndexConditionAnnoy() override = default;
+
+    bool alwaysUnknownOrTrue() const override;
+    bool mayBeTrueOnGranule(MergeTreeIndexGranulePtr idx_granule) const override;
+    std::vector<size_t> getUsefulRanges(MergeTreeIndexGranulePtr idx_granule) const override;
+
+private:
+    template <typename Distance>
+    std::vector<size_t> getUsefulRangesImpl(MergeTreeIndexGranulePtr idx_granule) const;
+
+    const ApproximateNearestNeighborCondition ann_condition;
+    const String distance_function;
+    const Int64 search_k;
+};
+
+
+class MergeTreeIndexAnnoy final : public IMergeTreeIndex
+{
+public:
+
+    MergeTreeIndexAnnoy(const IndexDescription & index_, UInt64 trees_, const String & distance_function_);
+
+    ~MergeTreeIndexAnnoy() override = default;
+
+    MergeTreeIndexGranulePtr createIndexGranule() const override;
+    MergeTreeIndexAggregatorPtr createIndexAggregator(const MergeTreeWriterSettings & settings) const override;
+    MergeTreeIndexConditionPtr createIndexCondition(const SelectQueryInfo & query, ContextPtr context) const;
+    MergeTreeIndexConditionPtr createIndexCondition(const ActionsDAGPtr &, ContextPtr) const override;
+    bool isVectorSearch() const override { return true; }
+
+private:
+    const UInt64 trees;
+    const String distance_function;
+};
+
+}
+
+#endif
diff --git a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
index b796ed7114e..fc5147bb56c 100644
--- a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
@@ -201,7 +201,7 @@ bool maybeTrueOnBloomFilter(const IColumn * hash_column, const BloomFilterPtr &
 }
 
 MergeTreeIndexConditionBloomFilter::MergeTreeIndexConditionBloomFilter(
-    const ActionsDAG * filter_actions_dag, ContextPtr context_, const Block & header_, size_t hash_functions_)
+    const ActionsDAGPtr & filter_actions_dag, ContextPtr context_, const Block & header_, size_t hash_functions_)
     : WithContext(context_), header(header_), hash_functions(hash_functions_)
 {
     if (!filter_actions_dag)
@@ -348,19 +348,19 @@ bool MergeTreeIndexConditionBloomFilter::extractAtomFromTree(const RPNBuilderTre
         {
             if (const_value.getType() == Field::Types::UInt64)
             {
-                out.function = const_value.safeGet<UInt64>() ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
+                out.function = const_value.get<UInt64>() ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
                 return true;
             }
 
             if (const_value.getType() == Field::Types::Int64)
             {
-                out.function = const_value.safeGet<Int64>() ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
+                out.function = const_value.get<Int64>() ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
                 return true;
             }
 
             if (const_value.getType() == Field::Types::Float64)
             {
-                out.function = const_value.safeGet<Float64>() != 0.0 ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
+                out.function = const_value.get<Float64>() != 0.0 ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
                 return true;
             }
         }
@@ -371,78 +371,67 @@ bool MergeTreeIndexConditionBloomFilter::extractAtomFromTree(const RPNBuilderTre
 
 bool MergeTreeIndexConditionBloomFilter::traverseFunction(const RPNBuilderTreeNode & node, RPNElement & out, const RPNBuilderTreeNode * parent)
 {
-    if (!node.isFunction())
-        return false;
+    bool maybe_useful = false;
 
-    const auto function = node.toFunctionNode();
-    auto arguments_size = function.getArgumentsSize();
-    auto function_name = function.getFunctionName();
-
-    if (parent == nullptr)
+    if (node.isFunction())
     {
-        /// Recurse a little bit for indexOf().
+        const auto function = node.toFunctionNode();
+        auto arguments_size = function.getArgumentsSize();
+        auto function_name = function.getFunctionName();
+
         for (size_t i = 0; i < arguments_size; ++i)
         {
             auto argument = function.getArgumentAt(i);
             if (traverseFunction(argument, out, &node))
-                return true;
+                maybe_useful = true;
         }
-    }
 
-    if (arguments_size != 2)
-        return false;
+        if (arguments_size != 2)
+            return false;
 
-    /// indexOf() should be inside comparison function, e.g. greater(indexOf(key, 42), 0).
-    /// Other conditions should be at top level, e.g. equals(key, 42), not equals(equals(key, 42), 1).
-    if ((function_name == "indexOf") != (parent != nullptr))
-        return false;
+        auto lhs_argument = function.getArgumentAt(0);
+        auto rhs_argument = function.getArgumentAt(1);
 
-    auto lhs_argument = function.getArgumentAt(0);
-    auto rhs_argument = function.getArgumentAt(1);
-
-    if (functionIsInOrGlobalInOperator(function_name))
-    {
-        if (auto future_set = rhs_argument.tryGetPreparedSet(); future_set)
+        if (functionIsInOrGlobalInOperator(function_name))
         {
-            if (auto prepared_set = future_set->buildOrderedSetInplace(rhs_argument.getTreeContext().getQueryContext()); prepared_set)
+            if (auto future_set = rhs_argument.tryGetPreparedSet(); future_set)
             {
-                if (prepared_set->hasExplicitSetElements())
+                if (auto prepared_set = future_set->buildOrderedSetInplace(rhs_argument.getTreeContext().getQueryContext()); prepared_set)
                 {
-                    const auto prepared_info = getPreparedSetInfo(prepared_set);
-                    if (traverseTreeIn(function_name, lhs_argument, prepared_set, prepared_info.type, prepared_info.column, out))
-                        return true;
+                    if (prepared_set->hasExplicitSetElements())
+                    {
+                        const auto prepared_info = getPreparedSetInfo(prepared_set);
+                        if (traverseTreeIn(function_name, lhs_argument, prepared_set, prepared_info.type, prepared_info.column, out))
+                            maybe_useful = true;
+                    }
                 }
             }
         }
-        return false;
+        else if (function_name == "equals" ||
+                 function_name == "notEquals" ||
+                 function_name == "has" ||
+                 function_name == "mapContains" ||
+                 function_name == "indexOf" ||
+                 function_name == "hasAny" ||
+                 function_name == "hasAll")
+        {
+            Field const_value;
+            DataTypePtr const_type;
+
+            if (rhs_argument.tryGetConstant(const_value, const_type))
+            {
+                if (traverseTreeEquals(function_name, lhs_argument, const_type, const_value, out, parent))
+                    maybe_useful = true;
+            }
+            else if (lhs_argument.tryGetConstant(const_value, const_type))
+            {
+                if (traverseTreeEquals(function_name, rhs_argument, const_type, const_value, out, parent))
+                    maybe_useful = true;
+            }
+        }
     }
 
-    if (function_name == "equals" ||
-        function_name == "notEquals" ||
-        function_name == "has" ||
-        function_name == "mapContains" ||
-        function_name == "indexOf" ||
-        function_name == "hasAny" ||
-        function_name == "hasAll")
-    {
-        Field const_value;
-        DataTypePtr const_type;
-
-        if (rhs_argument.tryGetConstant(const_value, const_type))
-        {
-            if (traverseTreeEquals(function_name, lhs_argument, const_type, const_value, out, parent))
-                return true;
-        }
-        else if (lhs_argument.tryGetConstant(const_value, const_type) && (function_name == "equals" || function_name == "notEquals"))
-        {
-            if (traverseTreeEquals(function_name, rhs_argument, const_type, const_value, out, parent))
-                return true;
-        }
-
-        return false;
-    }
-
-    return false;
+    return maybe_useful;
 }
 
 bool MergeTreeIndexConditionBloomFilter::traverseTreeIn(
@@ -703,7 +692,7 @@ bool MergeTreeIndexConditionBloomFilter::traverseTreeEquals(
                 const bool is_nullable = actual_type->isNullable();
                 auto mutable_column = actual_type->createColumn();
 
-                for (const auto & f : value_field.safeGet<Array>())
+                for (const auto & f : value_field.get<Array>())
                 {
                     if ((f.isNull() && !is_nullable) || f.isDecimal(f.getType())) /// NOLINT(readability-static-accessed-through-instance)
                         return false;
@@ -774,7 +763,7 @@ bool MergeTreeIndexConditionBloomFilter::traverseTreeEquals(
 
         if (which.isTuple() && key_node_function_name == "tuple")
         {
-            const Tuple & tuple = value_field.safeGet<const Tuple &>();
+            const Tuple & tuple = value_field.get<const Tuple &>();
             const auto * value_tuple_data_type = typeid_cast<const DataTypeTuple *>(value_type.get());
 
             if (tuple.size() != key_node_function_arguments_size)
@@ -908,7 +897,7 @@ MergeTreeIndexAggregatorPtr MergeTreeIndexBloomFilter::createIndexAggregator(con
     return std::make_shared<MergeTreeIndexAggregatorBloomFilter>(bits_per_row, hash_functions, index.column_names);
 }
 
-MergeTreeIndexConditionPtr MergeTreeIndexBloomFilter::createIndexCondition(const ActionsDAG * filter_actions_dag, ContextPtr context) const
+MergeTreeIndexConditionPtr MergeTreeIndexBloomFilter::createIndexCondition(const ActionsDAGPtr & filter_actions_dag, ContextPtr context) const
 {
     return std::make_shared<MergeTreeIndexConditionBloomFilter>(filter_actions_dag, context, index.sample_block, hash_functions);
 }
@@ -963,7 +952,7 @@ void bloomFilterIndexValidator(const IndexDescription & index, bool attach)
     {
         const auto & argument = index.arguments[0];
 
-        if (!attach && (argument.getType() != Field::Types::Float64 || argument.safeGet<Float64>() < 0 || argument.safeGet<Float64>() > 1))
+        if (!attach && (argument.getType() != Field::Types::Float64 || argument.get<Float64>() < 0 || argument.get<Float64>() > 1))
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "The BloomFilter false positive must be a double number between 0 and 1.");
     }
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.h b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.h
index bd1b137176a..d66c4b8b6ca 100644
--- a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.h
+++ b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.h
@@ -69,7 +69,7 @@ public:
         std::vector<std::pair<size_t, ColumnPtr>> predicate;
     };
 
-    MergeTreeIndexConditionBloomFilter(const ActionsDAG * filter_actions_dag, ContextPtr context_, const Block & header_, size_t hash_functions_);
+    MergeTreeIndexConditionBloomFilter(const ActionsDAGPtr & filter_actions_dag, ContextPtr context_, const Block & header_, size_t hash_functions_);
 
     bool alwaysUnknownOrTrue() const override;
 
@@ -142,7 +142,7 @@ public:
 
     MergeTreeIndexAggregatorPtr createIndexAggregator(const MergeTreeWriterSettings & settings) const override;
 
-    MergeTreeIndexConditionPtr createIndexCondition(const ActionsDAG * filter_actions_dag, ContextPtr context) const override;
+    MergeTreeIndexConditionPtr createIndexCondition(const ActionsDAGPtr & filter_actions_dag, ContextPtr context) const override;
 
 private:
     size_t bits_per_row;
diff --git a/src/Storages/MergeTree/MergeTreeIndexBloomFilterText.cpp b/src/Storages/MergeTree/MergeTreeIndexBloomFilterText.cpp
index 857b7903588..8cf58687125 100644
--- a/src/Storages/MergeTree/MergeTreeIndexBloomFilterText.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexBloomFilterText.cpp
@@ -138,7 +138,7 @@ void MergeTreeIndexAggregatorBloomFilterText::update(const Block & block, size_t
 }
 
 MergeTreeConditionBloomFilterText::MergeTreeConditionBloomFilterText(
-    const ActionsDAG * filter_actions_dag,
+    const ActionsDAGPtr & filter_actions_dag,
     ContextPtr context,
     const Block & index_sample_block,
     const BloomFilterParameters & params_,
@@ -341,19 +341,19 @@ bool MergeTreeConditionBloomFilterText::extractAtomFromTree(const RPNBuilderTree
 
             if (const_value.getType() == Field::Types::UInt64)
             {
-                out.function = const_value.safeGet<UInt64>() ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
+                out.function = const_value.get<UInt64>() ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
                 return true;
             }
 
             if (const_value.getType() == Field::Types::Int64)
             {
-                out.function = const_value.safeGet<Int64>() ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
+                out.function = const_value.get<Int64>() ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
                 return true;
             }
 
             if (const_value.getType() == Field::Types::Float64)
             {
-                out.function = const_value.safeGet<Float64>() != 0.0 ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
+                out.function = const_value.get<Float64>() != 0.0 ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
                 return true;
             }
         }
@@ -493,7 +493,7 @@ bool MergeTreeConditionBloomFilterText::traverseTreeEquals(
         out.function = RPNElement::FUNCTION_EQUALS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
 
-        auto value = const_value.safeGet<String>();
+        auto value = const_value.get<String>();
         if (is_case_insensitive_scenario)
             std::ranges::transform(value, value.begin(), [](const auto & c) { return static_cast<char>(std::tolower(c)); });
 
@@ -509,7 +509,7 @@ bool MergeTreeConditionBloomFilterText::traverseTreeEquals(
         out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_HAS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
-        auto & value = const_value.safeGet<String>();
+        auto & value = const_value.get<String>();
         token_extractor->stringToBloomFilter(value.data(), value.size(), *out.bloom_filter);
         return true;
     }
@@ -519,7 +519,7 @@ bool MergeTreeConditionBloomFilterText::traverseTreeEquals(
         out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_HAS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
-        auto & value = const_value.safeGet<String>();
+        auto & value = const_value.get<String>();
         token_extractor->stringToBloomFilter(value.data(), value.size(), *out.bloom_filter);
         return true;
     }
@@ -529,7 +529,7 @@ bool MergeTreeConditionBloomFilterText::traverseTreeEquals(
         out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_NOT_EQUALS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
-        const auto & value = const_value.safeGet<String>();
+        const auto & value = const_value.get<String>();
         token_extractor->stringToBloomFilter(value.data(), value.size(), *out.bloom_filter);
         return true;
     }
@@ -538,7 +538,7 @@ bool MergeTreeConditionBloomFilterText::traverseTreeEquals(
         out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_EQUALS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
-        const auto & value = const_value.safeGet<String>();
+        const auto & value = const_value.get<String>();
         token_extractor->stringToBloomFilter(value.data(), value.size(), *out.bloom_filter);
         return true;
     }
@@ -547,7 +547,7 @@ bool MergeTreeConditionBloomFilterText::traverseTreeEquals(
         out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_EQUALS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
-        const auto & value = const_value.safeGet<String>();
+        const auto & value = const_value.get<String>();
         token_extractor->stringLikeToBloomFilter(value.data(), value.size(), *out.bloom_filter);
         return true;
     }
@@ -556,7 +556,7 @@ bool MergeTreeConditionBloomFilterText::traverseTreeEquals(
         out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_NOT_EQUALS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
-        const auto & value = const_value.safeGet<String>();
+        const auto & value = const_value.get<String>();
         token_extractor->stringLikeToBloomFilter(value.data(), value.size(), *out.bloom_filter);
         return true;
     }
@@ -565,7 +565,7 @@ bool MergeTreeConditionBloomFilterText::traverseTreeEquals(
         out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_EQUALS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
-        const auto & value = const_value.safeGet<String>();
+        const auto & value = const_value.get<String>();
         token_extractor->substringToBloomFilter(value.data(), value.size(), *out.bloom_filter, true, false);
         return true;
     }
@@ -574,7 +574,7 @@ bool MergeTreeConditionBloomFilterText::traverseTreeEquals(
         out.key_column = *key_index;
         out.function = RPNElement::FUNCTION_EQUALS;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
-        const auto & value = const_value.safeGet<String>();
+        const auto & value = const_value.get<String>();
         token_extractor->substringToBloomFilter(value.data(), value.size(), *out.bloom_filter, false, true);
         return true;
     }
@@ -589,13 +589,13 @@ bool MergeTreeConditionBloomFilterText::traverseTreeEquals(
         /// 2d vector is not needed here but is used because already exists for FUNCTION_IN
         std::vector<std::vector<BloomFilter>> bloom_filters;
         bloom_filters.emplace_back();
-        for (const auto & element : const_value.safeGet<Array>())
+        for (const auto & element : const_value.get<Array>())
         {
             if (element.getType() != Field::Types::String)
                 return false;
 
             bloom_filters.back().emplace_back(params);
-            const auto & value = element.safeGet<String>();
+            const auto & value = element.get<String>();
 
             if (function_name == "multiSearchAny")
             {
@@ -615,7 +615,7 @@ bool MergeTreeConditionBloomFilterText::traverseTreeEquals(
         out.function = RPNElement::FUNCTION_MATCH;
         out.bloom_filter = std::make_unique<BloomFilter>(params);
 
-        auto & value = const_value.safeGet<String>();
+        auto & value = const_value.get<String>();
         String required_substring;
         bool dummy_is_trivial, dummy_required_substring_is_prefix;
         std::vector<String> alternatives;
@@ -733,7 +733,7 @@ MergeTreeIndexAggregatorPtr MergeTreeIndexBloomFilterText::createIndexAggregator
 }
 
 MergeTreeIndexConditionPtr MergeTreeIndexBloomFilterText::createIndexCondition(
-        const ActionsDAG * filter_dag, ContextPtr context) const
+        const ActionsDAGPtr & filter_dag, ContextPtr context) const
 {
     return std::make_shared<MergeTreeConditionBloomFilterText>(filter_dag, context, index.sample_block, params, token_extractor.get());
 }
@@ -743,11 +743,11 @@ MergeTreeIndexPtr bloomFilterIndexTextCreator(
 {
     if (index.type == NgramTokenExtractor::getName())
     {
-        size_t n = index.arguments[0].safeGet<size_t>();
+        size_t n = index.arguments[0].get<size_t>();
         BloomFilterParameters params(
-            index.arguments[1].safeGet<size_t>(),
-            index.arguments[2].safeGet<size_t>(),
-            index.arguments[3].safeGet<size_t>());
+            index.arguments[1].get<size_t>(),
+            index.arguments[2].get<size_t>(),
+            index.arguments[3].get<size_t>());
 
         auto tokenizer = std::make_unique<NgramTokenExtractor>(n);
 
@@ -756,9 +756,9 @@ MergeTreeIndexPtr bloomFilterIndexTextCreator(
     else if (index.type == SplitTokenExtractor::getName())
     {
         BloomFilterParameters params(
-            index.arguments[0].safeGet<size_t>(),
-            index.arguments[1].safeGet<size_t>(),
-            index.arguments[2].safeGet<size_t>());
+            index.arguments[0].get<size_t>(),
+            index.arguments[1].get<size_t>(),
+            index.arguments[2].get<size_t>());
 
         auto tokenizer = std::make_unique<SplitTokenExtractor>();
 
@@ -815,9 +815,9 @@ void bloomFilterIndexTextValidator(const IndexDescription & index, bool /*attach
 
     /// Just validate
     BloomFilterParameters params(
-        index.arguments[0].safeGet<size_t>(),
-        index.arguments[1].safeGet<size_t>(),
-        index.arguments[2].safeGet<size_t>());
+        index.arguments[0].get<size_t>(),
+        index.arguments[1].get<size_t>(),
+        index.arguments[2].get<size_t>());
 }
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexBloomFilterText.h b/src/Storages/MergeTree/MergeTreeIndexBloomFilterText.h
index fe042884550..6fd969030df 100644
--- a/src/Storages/MergeTree/MergeTreeIndexBloomFilterText.h
+++ b/src/Storages/MergeTree/MergeTreeIndexBloomFilterText.h
@@ -62,7 +62,7 @@ class MergeTreeConditionBloomFilterText final : public IMergeTreeIndexCondition
 {
 public:
     MergeTreeConditionBloomFilterText(
-            const ActionsDAG * filter_actions_dag,
+            const ActionsDAGPtr & filter_actions_dag,
             ContextPtr context,
             const Block & index_sample_block,
             const BloomFilterParameters & params_,
@@ -163,7 +163,7 @@ public:
     MergeTreeIndexAggregatorPtr createIndexAggregator(const MergeTreeWriterSettings & settings) const override;
 
     MergeTreeIndexConditionPtr createIndexCondition(
-            const ActionsDAG * filter_dag, ContextPtr context) const override;
+            const ActionsDAGPtr & filter_dag, ContextPtr context) const override;
 
     BloomFilterParameters params;
     /// Function for selecting next token.
diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
index ba3ca2f139a..47ce24b91eb 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
@@ -74,7 +74,7 @@ void MergeTreeIndexGranuleFullText::deserializeBinary(ReadBuffer & istr, MergeTr
     for (auto & gin_filter : gin_filters)
     {
         size_serialization->deserializeBinary(field_rows, istr, {});
-        size_t filter_size = field_rows.safeGet<size_t>();
+        size_t filter_size = field_rows.get<size_t>();
         gin_filter.getFilter().resize(filter_size);
 
         if (filter_size == 0)
@@ -128,14 +128,14 @@ void MergeTreeIndexAggregatorFullText::update(const Block & block, size_t * pos,
                 "Position: {}, Block rows: {}.", *pos, block.rows());
 
     size_t rows_read = std::min(limit, block.rows() - *pos);
-    auto start_row_id = store->getNextRowIDRange(rows_read);
+    auto row_id = store->getNextRowIDRange(rows_read);
+    auto start_row_id = row_id;
 
     for (size_t col = 0; col < index_columns.size(); ++col)
     {
         const auto & column_with_type = block.getByName(index_columns[col]);
         const auto & column = column_with_type.column;
         size_t current_position = *pos;
-        auto row_id = start_row_id;
 
         bool need_to_write = false;
         if (isArray(column_with_type.type))
@@ -186,7 +186,7 @@ void MergeTreeIndexAggregatorFullText::update(const Block & block, size_t * pos,
 }
 
 MergeTreeConditionFullText::MergeTreeConditionFullText(
-    const ActionsDAG * filter_actions_dag,
+    const ActionsDAGPtr & filter_actions_dag,
     ContextPtr context_,
     const Block & index_sample_block,
     const GinFilterParameters & params_,
@@ -379,19 +379,19 @@ bool MergeTreeConditionFullText::traverseAtomAST(const RPNBuilderTreeNode & node
             /// Check constant like in KeyCondition
             if (const_value.getType() == Field::Types::UInt64)
             {
-                out.function = const_value.safeGet<UInt64>() ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
+                out.function = const_value.get<UInt64>() ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
                 return true;
             }
 
             if (const_value.getType() == Field::Types::Int64)
             {
-                out.function = const_value.safeGet<Int64>() ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
+                out.function = const_value.get<Int64>() ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
                 return true;
             }
 
             if (const_value.getType() == Field::Types::Float64)
             {
-                out.function = const_value.safeGet<Float64>() != 0.00 ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
+                out.function = const_value.get<Float64>() != 0.00 ? RPNElement::ALWAYS_TRUE : RPNElement::ALWAYS_FALSE;
                 return true;
             }
         }
@@ -530,7 +530,7 @@ bool MergeTreeConditionFullText::traverseASTEquals(
         out.key_column = key_column_num;
         out.function = RPNElement::FUNCTION_HAS;
         out.gin_filter = std::make_unique<GinFilter>(params);
-        auto & value = const_value.safeGet<String>();
+        auto & value = const_value.get<String>();
         token_extractor->stringToGinFilter(value.data(), value.size(), *out.gin_filter);
         return true;
     }
@@ -539,7 +539,7 @@ bool MergeTreeConditionFullText::traverseASTEquals(
         out.key_column = key_column_num;
         out.function = RPNElement::FUNCTION_HAS;
         out.gin_filter = std::make_unique<GinFilter>(params);
-        auto & value = const_value.safeGet<String>();
+        auto & value = const_value.get<String>();
         token_extractor->stringToGinFilter(value.data(), value.size(), *out.gin_filter);
         return true;
     }
@@ -549,7 +549,7 @@ bool MergeTreeConditionFullText::traverseASTEquals(
         out.key_column = key_column_num;
         out.function = RPNElement::FUNCTION_NOT_EQUALS;
         out.gin_filter = std::make_unique<GinFilter>(params);
-        const auto & value = const_value.safeGet<String>();
+        const auto & value = const_value.get<String>();
         token_extractor->stringToGinFilter(value.data(), value.size(), *out.gin_filter);
         return true;
     }
@@ -558,7 +558,7 @@ bool MergeTreeConditionFullText::traverseASTEquals(
         out.key_column = key_column_num;
         out.function = RPNElement::FUNCTION_EQUALS;
         out.gin_filter = std::make_unique<GinFilter>(params);
-        const auto & value = const_value.safeGet<String>();
+        const auto & value = const_value.get<String>();
         token_extractor->stringToGinFilter(value.data(), value.size(), *out.gin_filter);
         return true;
     }
@@ -567,7 +567,7 @@ bool MergeTreeConditionFullText::traverseASTEquals(
         out.key_column = key_column_num;
         out.function = RPNElement::FUNCTION_EQUALS;
         out.gin_filter = std::make_unique<GinFilter>(params);
-        const auto & value = const_value.safeGet<String>();
+        const auto & value = const_value.get<String>();
         token_extractor->stringLikeToGinFilter(value.data(), value.size(), *out.gin_filter);
         return true;
     }
@@ -576,7 +576,7 @@ bool MergeTreeConditionFullText::traverseASTEquals(
         out.key_column = key_column_num;
         out.function = RPNElement::FUNCTION_NOT_EQUALS;
         out.gin_filter = std::make_unique<GinFilter>(params);
-        const auto & value = const_value.safeGet<String>();
+        const auto & value = const_value.get<String>();
         token_extractor->stringLikeToGinFilter(value.data(), value.size(), *out.gin_filter);
         return true;
     }
@@ -585,7 +585,7 @@ bool MergeTreeConditionFullText::traverseASTEquals(
         out.key_column = key_column_num;
         out.function = RPNElement::FUNCTION_EQUALS;
         out.gin_filter = std::make_unique<GinFilter>(params);
-        const auto & value = const_value.safeGet<String>();
+        const auto & value = const_value.get<String>();
         token_extractor->stringToGinFilter(value.data(), value.size(), *out.gin_filter);
         return true;
     }
@@ -594,7 +594,7 @@ bool MergeTreeConditionFullText::traverseASTEquals(
         out.key_column = key_column_num;
         out.function = RPNElement::FUNCTION_EQUALS;
         out.gin_filter = std::make_unique<GinFilter>(params);
-        const auto & value = const_value.safeGet<String>();
+        const auto & value = const_value.get<String>();
         token_extractor->substringToGinFilter(value.data(), value.size(), *out.gin_filter, true, false);
         return true;
     }
@@ -603,7 +603,7 @@ bool MergeTreeConditionFullText::traverseASTEquals(
         out.key_column = key_column_num;
         out.function = RPNElement::FUNCTION_EQUALS;
         out.gin_filter = std::make_unique<GinFilter>(params);
-        const auto & value = const_value.safeGet<String>();
+        const auto & value = const_value.get<String>();
         token_extractor->substringToGinFilter(value.data(), value.size(), *out.gin_filter, false, true);
         return true;
     }
@@ -615,13 +615,13 @@ bool MergeTreeConditionFullText::traverseASTEquals(
         /// 2d vector is not needed here but is used because already exists for FUNCTION_IN
         std::vector<GinFilters> gin_filters;
         gin_filters.emplace_back();
-        for (const auto & element : const_value.safeGet<Array>())
+        for (const auto & element : const_value.get<Array>())
         {
             if (element.getType() != Field::Types::String)
                 return false;
 
             gin_filters.back().emplace_back(params);
-            const auto & value = element.safeGet<String>();
+            const auto & value = element.get<String>();
             token_extractor->substringToGinFilter(value.data(), value.size(), gin_filters.back().back(), false, false);
         }
         out.set_gin_filters = std::move(gin_filters);
@@ -632,7 +632,7 @@ bool MergeTreeConditionFullText::traverseASTEquals(
         out.key_column = key_column_num;
         out.function = RPNElement::FUNCTION_MATCH;
 
-        auto & value = const_value.safeGet<String>();
+        auto & value = const_value.get<String>();
         String required_substring;
         bool dummy_is_trivial, dummy_required_substring_is_prefix;
         std::vector<String> alternatives;
@@ -768,7 +768,7 @@ MergeTreeIndexAggregatorPtr MergeTreeIndexFullText::createIndexAggregatorForPart
 }
 
 MergeTreeIndexConditionPtr MergeTreeIndexFullText::createIndexCondition(
-        const ActionsDAG * filter_actions_dag, ContextPtr context) const
+        const ActionsDAGPtr & filter_actions_dag, ContextPtr context) const
 {
     return std::make_shared<MergeTreeConditionFullText>(filter_actions_dag, context, index.sample_block, params, token_extractor.get());
 };
@@ -776,8 +776,8 @@ MergeTreeIndexConditionPtr MergeTreeIndexFullText::createIndexCondition(
 MergeTreeIndexPtr fullTextIndexCreator(
     const IndexDescription & index)
 {
-    size_t n = index.arguments.empty() ? 0 : index.arguments[0].safeGet<size_t>();
-    UInt64 max_rows = index.arguments.size() < 2 ? DEFAULT_MAX_ROWS_PER_POSTINGS_LIST : index.arguments[1].safeGet<UInt64>();
+    size_t n = index.arguments.empty() ? 0 : index.arguments[0].get<size_t>();
+    UInt64 max_rows = index.arguments.size() < 2 ? DEFAULT_MAX_ROWS_PER_POSTINGS_LIST : index.arguments[1].get<UInt64>();
     GinFilterParameters params(n, max_rows);
 
     /// Use SplitTokenExtractor when n is 0, otherwise use NgramTokenExtractor
@@ -826,12 +826,12 @@ void fullTextIndexValidator(const IndexDescription & index, bool /*attach*/)
     {
         if (index.arguments[1].getType() != Field::Types::UInt64)
             throw Exception(ErrorCodes::INCORRECT_QUERY, "The second full text index argument must be UInt64");
-        if (index.arguments[1].safeGet<UInt64>() != UNLIMITED_ROWS_PER_POSTINGS_LIST && index.arguments[1].safeGet<UInt64>() < MIN_ROWS_PER_POSTINGS_LIST)
+        if (index.arguments[1].get<UInt64>() != UNLIMITED_ROWS_PER_POSTINGS_LIST && index.arguments[1].get<UInt64>() < MIN_ROWS_PER_POSTINGS_LIST)
             throw Exception(ErrorCodes::INCORRECT_QUERY, "The maximum rows per postings list must be no less than {}", MIN_ROWS_PER_POSTINGS_LIST);
     }
     /// Just validate
-    size_t ngrams = index.arguments.empty() ? 0 : index.arguments[0].safeGet<size_t>();
-    UInt64 max_rows_per_postings_list = index.arguments.size() < 2 ? DEFAULT_MAX_ROWS_PER_POSTINGS_LIST : index.arguments[1].safeGet<UInt64>();
+    size_t ngrams = index.arguments.empty() ? 0 : index.arguments[0].get<size_t>();
+    UInt64 max_rows_per_postings_list = index.arguments.size() < 2 ? DEFAULT_MAX_ROWS_PER_POSTINGS_LIST : index.arguments[1].get<UInt64>();
     GinFilterParameters params(ngrams, max_rows_per_postings_list);
 }
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.h b/src/Storages/MergeTree/MergeTreeIndexFullText.h
index 8e0b1a22acb..1a5e848e5ac 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.h
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.h
@@ -63,7 +63,7 @@ class MergeTreeConditionFullText final : public IMergeTreeIndexCondition, WithCo
 {
 public:
     MergeTreeConditionFullText(
-            const ActionsDAG * filter_actions_dag,
+            const ActionsDAGPtr & filter_actions_dag,
             ContextPtr context,
             const Block & index_sample_block,
             const GinFilterParameters & params_,
@@ -170,7 +170,7 @@ public:
     MergeTreeIndexGranulePtr createIndexGranule() const override;
     MergeTreeIndexAggregatorPtr createIndexAggregator(const MergeTreeWriterSettings & settings) const override;
     MergeTreeIndexAggregatorPtr createIndexAggregatorForPart(const GinIndexStorePtr & store, const MergeTreeWriterSettings & /*settings*/) const override;
-    MergeTreeIndexConditionPtr createIndexCondition(const ActionsDAG * filter_actions_dag, ContextPtr context) const override;
+    MergeTreeIndexConditionPtr createIndexCondition(const ActionsDAGPtr & filter_actions_dag, ContextPtr context) const override;
 
     GinFilterParameters params;
     /// Function for selecting next token.
diff --git a/src/Storages/MergeTree/MergeTreeIndexGranularity.cpp b/src/Storages/MergeTree/MergeTreeIndexGranularity.cpp
index 2b924284857..2a45ab1d927 100644
--- a/src/Storages/MergeTree/MergeTreeIndexGranularity.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexGranularity.cpp
@@ -103,19 +103,8 @@ size_t MergeTreeIndexGranularity::countMarksForRows(size_t from_mark, size_t num
 
     /// This is a heuristic to respect min_marks_to_read which is ignored by MergeTreeReadPool in case of remote disk.
     /// See comment in IMergeTreeSelectAlgorithm.
-    if (min_marks_to_read)
-    {
-        // check overflow
-        size_t min_marks_to_read_2 = 0;
-        bool overflow = common::mulOverflow(min_marks_to_read, 2, min_marks_to_read_2);
-
-        size_t to_mark_overwrite = 0;
-        if (!overflow)
-            overflow = common::addOverflow(from_mark, min_marks_to_read_2, to_mark_overwrite);
-
-        if (!overflow && to_mark_overwrite < to_mark)
-            to_mark = to_mark_overwrite;
-    }
+    if (min_marks_to_read && from_mark + 2 * min_marks_to_read <= to_mark)
+        to_mark = from_mark + min_marks_to_read;
 
     return getRowsCountInRange(from_mark, std::max(1UL, to_mark)) - offset_in_rows;
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexHypothesis.cpp b/src/Storages/MergeTree/MergeTreeIndexHypothesis.cpp
index abf3ae56376..0995e2724ec 100644
--- a/src/Storages/MergeTree/MergeTreeIndexHypothesis.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexHypothesis.cpp
@@ -37,7 +37,7 @@ void MergeTreeIndexGranuleHypothesis::deserializeBinary(ReadBuffer & istr, Merge
     Field field_met;
     const auto & size_type = DataTypePtr(std::make_shared<DataTypeUInt8>());
     size_type->getDefaultSerialization()->deserializeBinary(field_met, istr, {});
-    met = field_met.safeGet<UInt8>();
+    met = field_met.get<UInt8>();
     is_empty = false;
 }
 
@@ -79,7 +79,7 @@ MergeTreeIndexAggregatorPtr MergeTreeIndexHypothesis::createIndexAggregator(cons
 }
 
 MergeTreeIndexConditionPtr MergeTreeIndexHypothesis::createIndexCondition(
-    const ActionsDAG *, ContextPtr) const
+    const ActionsDAGPtr &, ContextPtr) const
 {
     throw Exception(ErrorCodes::LOGICAL_ERROR, "Not supported");
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexHypothesis.h b/src/Storages/MergeTree/MergeTreeIndexHypothesis.h
index e60335fe724..130e708d76f 100644
--- a/src/Storages/MergeTree/MergeTreeIndexHypothesis.h
+++ b/src/Storages/MergeTree/MergeTreeIndexHypothesis.h
@@ -69,7 +69,7 @@ public:
     MergeTreeIndexAggregatorPtr createIndexAggregator(const MergeTreeWriterSettings & settings) const override;
 
     MergeTreeIndexConditionPtr createIndexCondition(
-        const ActionsDAG * filter_actions_dag, ContextPtr context) const override;
+        const ActionsDAGPtr & filter_actions_dag, ContextPtr context) const override;
 
     MergeTreeIndexMergedConditionPtr createIndexMergedCondition(
         const SelectQueryInfo & query_info, StorageMetadataPtr storage_metadata) const override;
diff --git a/src/Storages/MergeTree/MergeTreeIndexLegacyVectorSimilarity.cpp b/src/Storages/MergeTree/MergeTreeIndexLegacyVectorSimilarity.cpp
deleted file mode 100644
index 29de109d4fc..00000000000
--- a/src/Storages/MergeTree/MergeTreeIndexLegacyVectorSimilarity.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <Storages/MergeTree/MergeTreeIndexLegacyVectorSimilarity.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int ILLEGAL_INDEX;
-}
-
-MergeTreeIndexLegacyVectorSimilarity::MergeTreeIndexLegacyVectorSimilarity(const IndexDescription & index_)
-    : IMergeTreeIndex(index_)
-{
-}
-
-MergeTreeIndexGranulePtr MergeTreeIndexLegacyVectorSimilarity::createIndexGranule() const
-{
-    throw Exception(ErrorCodes::ILLEGAL_INDEX, "Indexes of type 'annoy' or 'usearch' are no longer supported. Please drop and recreate the index as type 'vector_similarity'");
-}
-
-MergeTreeIndexAggregatorPtr MergeTreeIndexLegacyVectorSimilarity::createIndexAggregator(const MergeTreeWriterSettings &) const
-{
-    throw Exception(ErrorCodes::ILLEGAL_INDEX, "Indexes of type 'annoy' or 'usearch' are no longer supported. Please drop and recreate the index as type 'vector_similarity'");
-}
-
-MergeTreeIndexConditionPtr MergeTreeIndexLegacyVectorSimilarity::createIndexCondition(const SelectQueryInfo &, ContextPtr) const
-{
-    throw Exception(ErrorCodes::ILLEGAL_INDEX, "Indexes of type 'annoy' or 'usearch' are no longer supported. Please drop and recreate the index as type 'vector_similarity'");
-};
-
-MergeTreeIndexConditionPtr MergeTreeIndexLegacyVectorSimilarity::createIndexCondition(const ActionsDAG *, ContextPtr) const
-{
-    throw Exception(ErrorCodes::ILLEGAL_INDEX, "Indexes of type 'annoy' or 'usearch' are no longer supported. Please drop and recreate the index as type 'vector_similarity'");
-}
-
-MergeTreeIndexPtr legacyVectorSimilarityIndexCreator(const IndexDescription & index)
-{
-    return std::make_shared<MergeTreeIndexLegacyVectorSimilarity>(index);
-}
-
-void legacyVectorSimilarityIndexValidator(const IndexDescription &, bool)
-{
-}
-
-}
diff --git a/src/Storages/MergeTree/MergeTreeIndexLegacyVectorSimilarity.h b/src/Storages/MergeTree/MergeTreeIndexLegacyVectorSimilarity.h
deleted file mode 100644
index 1015401823d..00000000000
--- a/src/Storages/MergeTree/MergeTreeIndexLegacyVectorSimilarity.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <Storages/MergeTree/VectorSimilarityCondition.h>
-
-/// Walking corpse implementation for removed skipping index of type "annoy" and "usearch".
-/// Its only purpose is to allow loading old tables with indexes of these types.
-/// Data insertion and index usage/search will throw an exception, suggesting to migrate to "vector_similarity" indexes.
-
-namespace DB
-{
-
-class MergeTreeIndexLegacyVectorSimilarity : public IMergeTreeIndex
-{
-public:
-    explicit MergeTreeIndexLegacyVectorSimilarity(const IndexDescription & index_);
-    ~MergeTreeIndexLegacyVectorSimilarity() override = default;
-
-    MergeTreeIndexGranulePtr createIndexGranule() const override;
-    MergeTreeIndexAggregatorPtr createIndexAggregator(const MergeTreeWriterSettings &) const override;
-    MergeTreeIndexConditionPtr createIndexCondition(const SelectQueryInfo &, ContextPtr) const;
-    MergeTreeIndexConditionPtr createIndexCondition(const ActionsDAG *, ContextPtr) const override;
-
-    bool isVectorSimilarityIndex() const override { return true; }
-};
-
-}
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
index c60d63a59ba..20dfed8cf8f 100644
--- a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
@@ -157,7 +157,7 @@ void MergeTreeIndexAggregatorMinMax::update(const Block & block, size_t * pos, s
 namespace
 {
 
-KeyCondition buildCondition(const IndexDescription & index, const ActionsDAG * filter_actions_dag, ContextPtr context)
+KeyCondition buildCondition(const IndexDescription & index, const ActionsDAGPtr & filter_actions_dag, ContextPtr context)
 {
     return KeyCondition{filter_actions_dag, context, index.column_names, index.expression};
 }
@@ -165,7 +165,7 @@ KeyCondition buildCondition(const IndexDescription & index, const ActionsDAG * f
 }
 
 MergeTreeIndexConditionMinMax::MergeTreeIndexConditionMinMax(
-    const IndexDescription & index, const ActionsDAG * filter_actions_dag, ContextPtr context)
+    const IndexDescription & index, const ActionsDAGPtr & filter_actions_dag, ContextPtr context)
     : index_data_types(index.data_types)
     , condition(buildCondition(index, filter_actions_dag, context))
 {
@@ -198,7 +198,7 @@ MergeTreeIndexAggregatorPtr MergeTreeIndexMinMax::createIndexAggregator(const Me
 }
 
 MergeTreeIndexConditionPtr MergeTreeIndexMinMax::createIndexCondition(
-    const ActionsDAG * filter_actions_dag, ContextPtr context) const
+    const ActionsDAGPtr & filter_actions_dag, ContextPtr context) const
 {
     return std::make_shared<MergeTreeIndexConditionMinMax>(index, filter_actions_dag, context);
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.h b/src/Storages/MergeTree/MergeTreeIndexMinMax.h
index c5031ccbb27..dca26fb7b28 100644
--- a/src/Storages/MergeTree/MergeTreeIndexMinMax.h
+++ b/src/Storages/MergeTree/MergeTreeIndexMinMax.h
@@ -50,7 +50,7 @@ class MergeTreeIndexConditionMinMax final : public IMergeTreeIndexCondition
 public:
     MergeTreeIndexConditionMinMax(
         const IndexDescription & index,
-        const ActionsDAG * filter_actions_dag,
+        const ActionsDAGPtr & filter_actions_dag,
         ContextPtr context);
 
     bool alwaysUnknownOrTrue() const override;
@@ -77,7 +77,7 @@ public:
     MergeTreeIndexAggregatorPtr createIndexAggregator(const MergeTreeWriterSettings & settings) const override;
 
     MergeTreeIndexConditionPtr createIndexCondition(
-        const ActionsDAG * filter_actions_dag, ContextPtr context) const override;
+        const ActionsDAGPtr & filter_actions_dag, ContextPtr context) const override;
 
     const char* getSerializedFileExtension() const override { return ".idx2"; }
     MergeTreeIndexFormat getDeserializedFormat(const IDataPartStorage & data_part_storage, const std::string & path_prefix) const override; /// NOLINT
diff --git a/src/Storages/MergeTree/MergeTreeIndexSet.cpp b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
index fa242fccbc1..284d47ef9e7 100644
--- a/src/Storages/MergeTree/MergeTreeIndexSet.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
@@ -97,7 +97,7 @@ void MergeTreeIndexGranuleSet::deserializeBinary(ReadBuffer & istr, MergeTreeInd
     Field field_rows;
     const auto & size_type = DataTypePtr(std::make_shared<DataTypeUInt64>());
     size_type->getDefaultSerialization()->deserializeBinary(field_rows, istr, {});
-    size_t rows_to_read = field_rows.safeGet<size_t>();
+    size_t rows_to_read = field_rows.get<size_t>();
 
     if (rows_to_read == 0)
         return;
@@ -272,14 +272,14 @@ MergeTreeIndexGranulePtr MergeTreeIndexAggregatorSet::getGranuleAndReset()
     return granule;
 }
 
-KeyCondition buildCondition(const IndexDescription & index, const ActionsDAG * filter_actions_dag, ContextPtr context)
+KeyCondition buildCondition(const IndexDescription & index, const ActionsDAGPtr & filter_actions_dag, ContextPtr context)
 {
     return KeyCondition{filter_actions_dag, context, index.column_names, index.expression};
 }
 
 MergeTreeIndexConditionSet::MergeTreeIndexConditionSet(
     size_t max_rows_,
-    const ActionsDAG * filter_dag,
+    const ActionsDAGPtr & filter_dag,
     ContextPtr context,
     const IndexDescription & index_description)
     : index_name(index_description.name)
@@ -303,15 +303,15 @@ MergeTreeIndexConditionSet::MergeTreeIndexConditionSet(
             return;
 
     auto filter_actions_dag = filter_dag->clone();
-    const auto * filter_actions_dag_node = filter_actions_dag.getOutputs().at(0);
+    const auto * filter_actions_dag_node = filter_actions_dag->getOutputs().at(0);
 
     std::unordered_map<const ActionsDAG::Node *, const ActionsDAG::Node *> node_to_result_node;
-    filter_actions_dag.getOutputs()[0] = &traverseDAG(*filter_actions_dag_node, filter_actions_dag, context, node_to_result_node);
+    filter_actions_dag->getOutputs()[0] = &traverseDAG(*filter_actions_dag_node, filter_actions_dag, context, node_to_result_node);
 
-    filter_actions_dag.removeUnusedActions();
+    filter_actions_dag->removeUnusedActions();
+    actions = std::make_shared<ExpressionActions>(filter_actions_dag);
 
-    actions_output_column_name = filter_actions_dag.getOutputs().at(0)->result_name;
-    actions = std::make_shared<ExpressionActions>(std::move(filter_actions_dag));
+    actions_output_column_name = filter_actions_dag->getOutputs().at(0)->result_name;
 }
 
 bool MergeTreeIndexConditionSet::alwaysUnknownOrTrue() const
@@ -346,7 +346,7 @@ bool MergeTreeIndexConditionSet::mayBeTrueOnGranule(MergeTreeIndexGranulePtr idx
 }
 
 
-static const ActionsDAG::NodeRawConstPtrs & getArguments(const ActionsDAG::Node & node, ActionsDAG * result_dag_or_null, ActionsDAG::NodeRawConstPtrs * storage)
+static const ActionsDAG::NodeRawConstPtrs & getArguments(const ActionsDAG::Node & node, const ActionsDAGPtr & result_dag_or_null, ActionsDAG::NodeRawConstPtrs * storage)
 {
     chassert(node.type == ActionsDAG::ActionType::FUNCTION);
     if (node.function_base->getName() != "indexHint")
@@ -356,17 +356,17 @@ static const ActionsDAG::NodeRawConstPtrs & getArguments(const ActionsDAG::Node
     const auto & adaptor = typeid_cast<const FunctionToFunctionBaseAdaptor &>(*node.function_base);
     const auto & index_hint = typeid_cast<const FunctionIndexHint &>(*adaptor.getFunction());
     if (!result_dag_or_null)
-        return index_hint.getActions().getOutputs();
+        return index_hint.getActions()->getOutputs();
 
     /// Import the DAG and map argument pointers.
-    auto actions_clone = index_hint.getActions().clone();
+    ActionsDAGPtr actions_clone = index_hint.getActions()->clone();
     chassert(storage);
-    result_dag_or_null->mergeNodes(std::move(actions_clone), storage);
+    result_dag_or_null->mergeNodes(std::move(*actions_clone), storage);
     return *storage;
 }
 
 const ActionsDAG::Node & MergeTreeIndexConditionSet::traverseDAG(const ActionsDAG::Node & node,
-    ActionsDAG & result_dag,
+    ActionsDAGPtr & result_dag,
     const ContextPtr & context,
     std::unordered_map<const ActionsDAG::Node *, const ActionsDAG::Node *> & node_to_result_node) const
 {
@@ -388,7 +388,7 @@ const ActionsDAG::Node & MergeTreeIndexConditionSet::traverseDAG(const ActionsDA
             atom_node_ptr->type == ActionsDAG::ActionType::FUNCTION)
         {
             auto bit_wrapper_function = FunctionFactory::instance().get("__bitWrapperFunc", context);
-            result_node = &result_dag.addFunction(bit_wrapper_function, {atom_node_ptr}, {});
+            result_node = &result_dag->addFunction(bit_wrapper_function, {atom_node_ptr}, {});
         }
     }
     else
@@ -399,14 +399,14 @@ const ActionsDAG::Node & MergeTreeIndexConditionSet::traverseDAG(const ActionsDA
         unknown_field_column_with_type.type = std::make_shared<DataTypeUInt8>();
         unknown_field_column_with_type.column = unknown_field_column_with_type.type->createColumnConst(1, UNKNOWN_FIELD);
 
-        result_node = &result_dag.addColumn(unknown_field_column_with_type);
+        result_node = &result_dag->addColumn(unknown_field_column_with_type);
     }
 
     node_to_result_node.emplace(&node, result_node);
     return *result_node;
 }
 
-const ActionsDAG::Node * MergeTreeIndexConditionSet::atomFromDAG(const ActionsDAG::Node & node, ActionsDAG & result_dag, const ContextPtr & context) const
+const ActionsDAG::Node * MergeTreeIndexConditionSet::atomFromDAG(const ActionsDAG::Node & node, ActionsDAGPtr & result_dag, const ContextPtr & context) const
 {
     /// Function, literal or column
 
@@ -426,7 +426,7 @@ const ActionsDAG::Node * MergeTreeIndexConditionSet::atomFromDAG(const ActionsDA
         const auto * result_node = node_to_check;
 
         if (node.type != ActionsDAG::ActionType::INPUT)
-            result_node = &result_dag.addInput(column_name, node.result_type);
+            result_node = &result_dag->addInput(column_name, node.result_type);
 
         return result_node;
     }
@@ -447,11 +447,11 @@ const ActionsDAG::Node * MergeTreeIndexConditionSet::atomFromDAG(const ActionsDA
             return nullptr;
     }
 
-    return &result_dag.addFunction(node.function_base, children, {});
+    return &result_dag->addFunction(node.function_base, children, {});
 }
 
 const ActionsDAG::Node * MergeTreeIndexConditionSet::operatorFromDAG(const ActionsDAG::Node & node,
-    ActionsDAG & result_dag,
+    ActionsDAGPtr & result_dag,
     const ContextPtr & context,
     std::unordered_map<const ActionsDAG::Node *, const ActionsDAG::Node *> & node_to_result_node) const
 {
@@ -469,7 +469,7 @@ const ActionsDAG::Node * MergeTreeIndexConditionSet::operatorFromDAG(const Actio
 
     auto function_name = node_to_check->function->getName();
     ActionsDAG::NodeRawConstPtrs temp_ptrs_to_argument;
-    const auto & arguments = getArguments(*node_to_check, &result_dag, &temp_ptrs_to_argument);
+    const auto & arguments = getArguments(*node_to_check, result_dag, &temp_ptrs_to_argument);
     size_t arguments_size = arguments.size();
 
     if (function_name == "not")
@@ -480,7 +480,7 @@ const ActionsDAG::Node * MergeTreeIndexConditionSet::operatorFromDAG(const Actio
         const ActionsDAG::Node * argument = &traverseDAG(*arguments[0], result_dag, context, node_to_result_node);
 
         auto bit_swap_last_two_function = FunctionFactory::instance().get("__bitSwapLastTwo", context);
-        return &result_dag.addFunction(bit_swap_last_two_function, {argument}, {});
+        return &result_dag->addFunction(bit_swap_last_two_function, {argument}, {});
     }
     else if (function_name == "and" || function_name == "indexHint" || function_name == "or")
     {
@@ -508,7 +508,7 @@ const ActionsDAG::Node * MergeTreeIndexConditionSet::operatorFromDAG(const Actio
             const auto * before_last_argument = children.back();
             children.pop_back();
 
-            last_argument = &result_dag.addFunction(function, {before_last_argument, last_argument}, {});
+            last_argument = &result_dag->addFunction(function, {before_last_argument, last_argument}, {});
         }
 
         return last_argument;
@@ -584,14 +584,14 @@ MergeTreeIndexAggregatorPtr MergeTreeIndexSet::createIndexAggregator(const Merge
 }
 
 MergeTreeIndexConditionPtr MergeTreeIndexSet::createIndexCondition(
-    const ActionsDAG * filter_actions_dag, ContextPtr context) const
+    const ActionsDAGPtr & filter_actions_dag, ContextPtr context) const
 {
     return std::make_shared<MergeTreeIndexConditionSet>(max_rows, filter_actions_dag, context, index);
 }
 
 MergeTreeIndexPtr setIndexCreator(const IndexDescription & index)
 {
-    size_t max_rows = index.arguments[0].safeGet<size_t>();
+    size_t max_rows = index.arguments[0].get<size_t>();
     return std::make_shared<MergeTreeIndexSet>(index, max_rows);
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexSet.h b/src/Storages/MergeTree/MergeTreeIndexSet.h
index ff1f45528d7..168262360fc 100644
--- a/src/Storages/MergeTree/MergeTreeIndexSet.h
+++ b/src/Storages/MergeTree/MergeTreeIndexSet.h
@@ -84,7 +84,7 @@ class MergeTreeIndexConditionSet final : public IMergeTreeIndexCondition
 public:
     MergeTreeIndexConditionSet(
         size_t max_rows_,
-        const ActionsDAG * filter_dag,
+        const ActionsDAGPtr & filter_dag,
         ContextPtr context,
         const IndexDescription & index_description);
 
@@ -95,16 +95,16 @@ public:
     ~MergeTreeIndexConditionSet() override = default;
 private:
     const ActionsDAG::Node & traverseDAG(const ActionsDAG::Node & node,
-        ActionsDAG & result_dag,
+        ActionsDAGPtr & result_dag,
         const ContextPtr & context,
         std::unordered_map<const ActionsDAG::Node *, const ActionsDAG::Node *> & node_to_result_node) const;
 
     const ActionsDAG::Node * atomFromDAG(const ActionsDAG::Node & node,
-        ActionsDAG & result_dag,
+        ActionsDAGPtr & result_dag,
         const ContextPtr & context) const;
 
     const ActionsDAG::Node * operatorFromDAG(const ActionsDAG::Node & node,
-        ActionsDAG & result_dag,
+        ActionsDAGPtr & result_dag,
         const ContextPtr & context,
         std::unordered_map<const ActionsDAG::Node *, const ActionsDAG::Node *> & node_to_result_node) const;
 
@@ -143,7 +143,7 @@ public:
     MergeTreeIndexAggregatorPtr createIndexAggregator(const MergeTreeWriterSettings & settings) const override;
 
     MergeTreeIndexConditionPtr createIndexCondition(
-            const ActionsDAG * filter_actions_dag, ContextPtr context) const override;
+            const ActionsDAGPtr & filter_actions_dag, ContextPtr context) const override;
 
     size_t max_rows = 0;
 };
diff --git a/src/Storages/MergeTree/MergeTreeIndexUSearch.cpp b/src/Storages/MergeTree/MergeTreeIndexUSearch.cpp
new file mode 100644
index 00000000000..c9df7210569
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeIndexUSearch.cpp
@@ -0,0 +1,463 @@
+#ifdef ENABLE_USEARCH
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpass-failed"
+
+#include <Storages/MergeTree/MergeTreeIndexUSearch.h>
+
+#include <Columns/ColumnArray.h>
+#include <Common/typeid_cast.h>
+#include <Core/Field.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/castColumn.h>
+
+namespace ProfileEvents
+{
+    extern const Event USearchAddCount;
+    extern const Event USearchAddVisitedMembers;
+    extern const Event USearchAddComputedDistances;
+    extern const Event USearchSearchCount;
+    extern const Event USearchSearchVisitedMembers;
+    extern const Event USearchSearchComputedDistances;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_ALLOCATE_MEMORY;
+    extern const int ILLEGAL_COLUMN;
+    extern const int INCORRECT_DATA;
+    extern const int INCORRECT_NUMBER_OF_COLUMNS;
+    extern const int INCORRECT_QUERY;
+    extern const int LOGICAL_ERROR;
+    extern const int NOT_IMPLEMENTED;
+}
+
+namespace
+{
+
+std::unordered_map<String, unum::usearch::scalar_kind_t> nameToScalarKind = {
+    {"f64", unum::usearch::scalar_kind_t::f64_k},
+    {"f32", unum::usearch::scalar_kind_t::f32_k},
+    {"f16", unum::usearch::scalar_kind_t::f16_k},
+    {"i8", unum::usearch::scalar_kind_t::i8_k}};
+
+}
+
+template <unum::usearch::metric_kind_t Metric>
+USearchIndexWithSerialization<Metric>::USearchIndexWithSerialization(size_t dimensions, unum::usearch::scalar_kind_t scalar_kind)
+    : Base(Base::make(unum::usearch::metric_punned_t(dimensions, Metric, scalar_kind)))
+{
+}
+
+template <unum::usearch::metric_kind_t Metric>
+void USearchIndexWithSerialization<Metric>::serialize(WriteBuffer & ostr) const
+{
+    auto callback = [&ostr](void * from, size_t n)
+    {
+        ostr.write(reinterpret_cast<const char *>(from), n);
+        return true;
+    };
+
+    Base::save_to_stream(callback);
+}
+
+template <unum::usearch::metric_kind_t Metric>
+void USearchIndexWithSerialization<Metric>::deserialize(ReadBuffer & istr)
+{
+    auto callback = [&istr](void * from, size_t n)
+    {
+        istr.readStrict(reinterpret_cast<char *>(from), n);
+        return true;
+    };
+
+    Base::load_from_stream(callback);
+}
+
+template <unum::usearch::metric_kind_t Metric>
+size_t USearchIndexWithSerialization<Metric>::getDimensions() const
+{
+    return Base::dimensions();
+}
+
+template <unum::usearch::metric_kind_t Metric>
+MergeTreeIndexGranuleUSearch<Metric>::MergeTreeIndexGranuleUSearch(
+    const String & index_name_,
+    const Block & index_sample_block_,
+    unum::usearch::scalar_kind_t scalar_kind_)
+    : index_name(index_name_)
+    , index_sample_block(index_sample_block_)
+    , scalar_kind(scalar_kind_)
+    , index(nullptr)
+{
+}
+
+template <unum::usearch::metric_kind_t Metric>
+MergeTreeIndexGranuleUSearch<Metric>::MergeTreeIndexGranuleUSearch(
+    const String & index_name_,
+    const Block & index_sample_block_,
+    unum::usearch::scalar_kind_t scalar_kind_,
+    USearchIndexWithSerializationPtr<Metric> index_)
+    : index_name(index_name_)
+    , index_sample_block(index_sample_block_)
+    , scalar_kind(scalar_kind_)
+    , index(std::move(index_))
+{
+}
+
+template <unum::usearch::metric_kind_t Metric>
+void MergeTreeIndexGranuleUSearch<Metric>::serializeBinary(WriteBuffer & ostr) const
+{
+    /// Number of dimensions is required in the index constructor,
+    /// so it must be written and read separately from the other part
+    writeIntBinary(static_cast<UInt64>(index->getDimensions()), ostr); // write dimension
+    index->serialize(ostr);
+}
+
+template <unum::usearch::metric_kind_t Metric>
+void MergeTreeIndexGranuleUSearch<Metric>::deserializeBinary(ReadBuffer & istr, MergeTreeIndexVersion /*version*/)
+{
+    UInt64 dimension;
+    readIntBinary(dimension, istr);
+    index = std::make_shared<USearchIndexWithSerialization<Metric>>(dimension, scalar_kind);
+    index->deserialize(istr);
+}
+
+template <unum::usearch::metric_kind_t Metric>
+MergeTreeIndexAggregatorUSearch<Metric>::MergeTreeIndexAggregatorUSearch(
+    const String & index_name_,
+    const Block & index_sample_block_,
+    unum::usearch::scalar_kind_t scalar_kind_)
+    : index_name(index_name_)
+    , index_sample_block(index_sample_block_)
+    , scalar_kind(scalar_kind_)
+{
+}
+
+template <unum::usearch::metric_kind_t Metric>
+MergeTreeIndexGranulePtr MergeTreeIndexAggregatorUSearch<Metric>::getGranuleAndReset()
+{
+    auto granule = std::make_shared<MergeTreeIndexGranuleUSearch<Metric>>(index_name, index_sample_block, scalar_kind, index);
+    index = nullptr;
+    return granule;
+}
+
+template <unum::usearch::metric_kind_t Metric>
+void MergeTreeIndexAggregatorUSearch<Metric>::update(const Block & block, size_t * pos, size_t limit)
+{
+    if (*pos >= block.rows())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "The provided position is not less than the number of block rows. Position: {}, Block rows: {}.",
+            *pos,
+            block.rows());
+
+    size_t rows_read = std::min(limit, block.rows() - *pos);
+
+    if (rows_read == 0)
+        return;
+
+    if (rows_read > std::numeric_limits<uint32_t>::max())
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Index granularity is too big: more than 4B rows per index granule.");
+
+    if (index_sample_block.columns() > 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected block with single column");
+
+    const String & index_column_name = index_sample_block.getByPosition(0).name;
+    ColumnPtr column_cut = block.getByName(index_column_name).column->cut(*pos, rows_read);
+
+    if (const auto & column_array = typeid_cast<const ColumnArray *>(column_cut.get()))
+    {
+        const auto & column_array_data = column_array->getData();
+        const auto & column_array_data_float = typeid_cast<const ColumnFloat32 &>(column_array_data);
+        const auto & column_array_data_float_data = column_array_data_float.getData();
+
+        const auto & column_array_offsets = column_array->getOffsets();
+        const size_t num_rows = column_array_offsets.size();
+
+        if (column_array->empty())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Array is unexpectedly empty");
+
+        /// The Usearch algorithm naturally assumes that the indexed vectors have dimension >= 1. This condition is violated if empty arrays
+        /// are INSERTed into an Usearch-indexed column or if no value was specified at all in which case the arrays take on their default
+        /// values which is also empty.
+        if (column_array->isDefaultAt(0))
+            throw Exception(ErrorCodes::INCORRECT_DATA, "The arrays in column '{}' must not be empty. Did you try to INSERT default values?", index_column_name);
+
+        /// Check all sizes are the same
+        size_t dimension = column_array_offsets[0];
+        for (size_t i = 0; i < num_rows - 1; ++i)
+            if (column_array_offsets[i + 1] - column_array_offsets[i] != dimension)
+                throw Exception(ErrorCodes::INCORRECT_DATA, "All arrays in column '{}' must have equal length", index_column_name);
+
+        /// Also check that previously inserted blocks have the same size as this block.
+        /// Note that this guarantees consistency of dimension only within parts. We are unable to detect inconsistent dimensions across
+        /// parts - for this, a little help from the user is needed, e.g. CONSTRAINT cnstr CHECK length(array) = 42.
+        if (index && index->getDimensions() != dimension)
+            throw Exception(ErrorCodes::INCORRECT_DATA, "All arrays in column '{}' must have equal length", index_column_name);
+
+        if (!index)
+            index = std::make_shared<USearchIndexWithSerialization<Metric>>(dimension, scalar_kind);
+
+        /// Add all rows of block
+        if (!index->reserve(unum::usearch::ceil2(index->size() + num_rows)))
+            throw Exception(ErrorCodes::CANNOT_ALLOCATE_MEMORY, "Could not reserve memory for usearch index");
+
+        for (size_t current_row = 0; current_row < num_rows; ++current_row)
+        {
+            auto rc = index->add(static_cast<uint32_t>(index->size()), &column_array_data_float_data[column_array_offsets[current_row - 1]]);
+            if (!rc)
+                throw Exception::createRuntime(ErrorCodes::INCORRECT_DATA, rc.error.release());
+
+            ProfileEvents::increment(ProfileEvents::USearchAddCount);
+            ProfileEvents::increment(ProfileEvents::USearchAddVisitedMembers, rc.visited_members);
+            ProfileEvents::increment(ProfileEvents::USearchAddComputedDistances, rc.computed_distances);
+        }
+    }
+    else if (const auto & column_tuple = typeid_cast<const ColumnTuple *>(column_cut.get()))
+    {
+        const auto & column_tuple_columns = column_tuple->getColumns();
+        std::vector<std::vector<Float32>> data(column_tuple->size(), std::vector<Float32>());
+        for (const auto & column : column_tuple_columns)
+        {
+            const auto & pod_array = typeid_cast<const ColumnFloat32 *>(column.get())->getData();
+            for (size_t i = 0; i < pod_array.size(); ++i)
+                data[i].push_back(pod_array[i]);
+        }
+
+        if (data.empty())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Tuple has 0 rows, {} rows expected", rows_read);
+
+        if (!index)
+            index = std::make_shared<USearchIndexWithSerialization<Metric>>(data[0].size(), scalar_kind);
+
+        if (!index->reserve(unum::usearch::ceil2(index->size() + data.size())))
+            throw Exception(ErrorCodes::CANNOT_ALLOCATE_MEMORY, "Could not reserve memory for usearch index");
+
+        for (const auto & item : data)
+        {
+            auto rc = index->add(static_cast<uint32_t>(index->size()), item.data());
+            if (!rc)
+                throw Exception::createRuntime(ErrorCodes::INCORRECT_DATA, rc.error.release());
+
+            ProfileEvents::increment(ProfileEvents::USearchAddCount);
+            ProfileEvents::increment(ProfileEvents::USearchAddVisitedMembers, rc.visited_members);
+            ProfileEvents::increment(ProfileEvents::USearchAddComputedDistances, rc.computed_distances);
+        }
+    }
+    else
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected Array or Tuple column");
+
+    *pos += rows_read;
+}
+
+MergeTreeIndexConditionUSearch::MergeTreeIndexConditionUSearch(
+    const IndexDescription & /*index_description*/,
+    const SelectQueryInfo & query,
+    const String & distance_function_,
+    ContextPtr context)
+    : ann_condition(query, context)
+    , distance_function(distance_function_)
+{
+}
+
+bool MergeTreeIndexConditionUSearch::mayBeTrueOnGranule(MergeTreeIndexGranulePtr /*idx_granule*/) const
+{
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "mayBeTrueOnGranule is not supported for ANN skip indexes");
+}
+
+bool MergeTreeIndexConditionUSearch::alwaysUnknownOrTrue() const
+{
+    return ann_condition.alwaysUnknownOrTrue(distance_function);
+}
+
+std::vector<size_t> MergeTreeIndexConditionUSearch::getUsefulRanges(MergeTreeIndexGranulePtr idx_granule) const
+{
+    if (distance_function == DISTANCE_FUNCTION_L2)
+        return getUsefulRangesImpl<unum::usearch::metric_kind_t::l2sq_k>(idx_granule);
+    else if (distance_function == DISTANCE_FUNCTION_COSINE)
+        return getUsefulRangesImpl<unum::usearch::metric_kind_t::cos_k>(idx_granule);
+    std::unreachable();
+}
+
+template <unum::usearch::metric_kind_t Metric>
+std::vector<size_t> MergeTreeIndexConditionUSearch::getUsefulRangesImpl(MergeTreeIndexGranulePtr idx_granule) const
+{
+    const UInt64 limit = ann_condition.getLimit();
+    const UInt64 index_granularity = ann_condition.getIndexGranularity();
+    const std::optional<float> comparison_distance = ann_condition.getQueryType() == ApproximateNearestNeighborInformation::Type::Where
+        ? std::optional<float>(ann_condition.getComparisonDistanceForWhereQuery())
+        : std::nullopt;
+
+    if (comparison_distance && comparison_distance.value() < 0)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to optimize query with where without distance");
+
+    const std::vector<float> reference_vector = ann_condition.getReferenceVector();
+
+    const auto granule = std::dynamic_pointer_cast<MergeTreeIndexGranuleUSearch<Metric>>(idx_granule);
+    if (granule == nullptr)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Granule has the wrong type");
+
+    const USearchIndexWithSerializationPtr<Metric> index = granule->index;
+
+    if (ann_condition.getDimensions() != index->dimensions())
+        throw Exception(ErrorCodes::INCORRECT_QUERY, "The dimension of the space in the request ({}) "
+            "does not match the dimension in the index ({})",
+            ann_condition.getDimensions(), index->dimensions());
+
+    auto result = index->search(reference_vector.data(), limit);
+
+    ProfileEvents::increment(ProfileEvents::USearchSearchCount);
+    ProfileEvents::increment(ProfileEvents::USearchSearchVisitedMembers, result.visited_members);
+    ProfileEvents::increment(ProfileEvents::USearchSearchComputedDistances, result.computed_distances);
+
+    std::vector<UInt32> neighbors(result.size()); /// indexes of dots which were closest to the reference vector
+    std::vector<Float32> distances(result.size());
+    result.dump_to(neighbors.data(), distances.data());
+
+    std::vector<size_t> granules;
+    granules.reserve(neighbors.size());
+    for (size_t i = 0; i < neighbors.size(); ++i)
+    {
+        if (comparison_distance && distances[i] > comparison_distance)
+            continue;
+        granules.push_back(neighbors[i] / index_granularity);
+    }
+
+    /// make unique
+    std::sort(granules.begin(), granules.end());
+    granules.erase(std::unique(granules.begin(), granules.end()), granules.end());
+
+    return granules;
+}
+
+MergeTreeIndexUSearch::MergeTreeIndexUSearch(const IndexDescription & index_, const String & distance_function_, unum::usearch::scalar_kind_t scalar_kind_)
+    : IMergeTreeIndex(index_)
+    , distance_function(distance_function_)
+    , scalar_kind(scalar_kind_)
+{
+}
+
+MergeTreeIndexGranulePtr MergeTreeIndexUSearch::createIndexGranule() const
+{
+    if (distance_function == DISTANCE_FUNCTION_L2)
+        return std::make_shared<MergeTreeIndexGranuleUSearch<unum::usearch::metric_kind_t::l2sq_k>>(index.name, index.sample_block, scalar_kind);
+    else if (distance_function == DISTANCE_FUNCTION_COSINE)
+        return std::make_shared<MergeTreeIndexGranuleUSearch<unum::usearch::metric_kind_t::cos_k>>(index.name, index.sample_block, scalar_kind);
+    std::unreachable();
+}
+
+MergeTreeIndexAggregatorPtr MergeTreeIndexUSearch::createIndexAggregator(const MergeTreeWriterSettings & /*settings*/) const
+{
+    if (distance_function == DISTANCE_FUNCTION_L2)
+        return std::make_shared<MergeTreeIndexAggregatorUSearch<unum::usearch::metric_kind_t::l2sq_k>>(index.name, index.sample_block, scalar_kind);
+    else if (distance_function == DISTANCE_FUNCTION_COSINE)
+        return std::make_shared<MergeTreeIndexAggregatorUSearch<unum::usearch::metric_kind_t::cos_k>>(index.name, index.sample_block, scalar_kind);
+    std::unreachable();
+}
+
+MergeTreeIndexConditionPtr MergeTreeIndexUSearch::createIndexCondition(const SelectQueryInfo & query, ContextPtr context) const
+{
+    return std::make_shared<MergeTreeIndexConditionUSearch>(index, query, distance_function, context);
+};
+
+MergeTreeIndexConditionPtr MergeTreeIndexUSearch::createIndexCondition(const ActionsDAGPtr &, ContextPtr) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "MergeTreeIndexAnnoy cannot be created with ActionsDAG");
+}
+
+MergeTreeIndexPtr usearchIndexCreator(const IndexDescription & index)
+{
+    static constexpr auto default_distance_function = DISTANCE_FUNCTION_L2;
+    String distance_function = default_distance_function;
+    if (!index.arguments.empty())
+        distance_function = index.arguments[0].get<String>();
+
+    static constexpr auto default_scalar_kind = unum::usearch::scalar_kind_t::f16_k;
+    auto scalar_kind = default_scalar_kind;
+    if (index.arguments.size() > 1)
+        scalar_kind = nameToScalarKind.at(index.arguments[1].get<String>());
+
+    return std::make_shared<MergeTreeIndexUSearch>(index, distance_function, scalar_kind);
+}
+
+void usearchIndexValidator(const IndexDescription & index, bool /* attach */)
+{
+    /// Check number and type of USearch index arguments:
+
+    if (index.arguments.size() > 2)
+        throw Exception(ErrorCodes::INCORRECT_QUERY, "USearch index must not have more than one parameters");
+
+    if (!index.arguments.empty() && index.arguments[0].getType() != Field::Types::String)
+        throw Exception(ErrorCodes::INCORRECT_QUERY, "First argument of USearch index (distance function) must be of type String");
+    if (index.arguments.size() > 1 && index.arguments[1].getType() != Field::Types::String)
+        throw Exception(ErrorCodes::INCORRECT_QUERY, "Second argument of USearch index (scalar type) must be of type String");
+
+    /// Check that the index is created on a single column
+
+    if (index.column_names.size() != 1 || index.data_types.size() != 1)
+        throw Exception(ErrorCodes::INCORRECT_NUMBER_OF_COLUMNS, "USearch indexes must be created on a single column");
+
+    /// Check that a supported metric was passed as first argument
+
+    if (!index.arguments.empty())
+    {
+        String distance_name = index.arguments[0].get<String>();
+        if (distance_name != DISTANCE_FUNCTION_L2 && distance_name != DISTANCE_FUNCTION_COSINE)
+            throw Exception(ErrorCodes::INCORRECT_DATA, "USearch index only supports distance functions '{}' and '{}'", DISTANCE_FUNCTION_L2, DISTANCE_FUNCTION_COSINE);
+    }
+
+    /// Check that a supported kind was passed as a second argument
+
+    if (index.arguments.size() > 1 && !nameToScalarKind.contains(index.arguments[1].get<String>()))
+    {
+        String supported_kinds;
+        for (const auto & [name, kind] : nameToScalarKind)
+        {
+            if (!supported_kinds.empty())
+                supported_kinds += ", ";
+            supported_kinds += name;
+        }
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Unrecognized scalar kind (second argument) for USearch index. Supported kinds are: {}", supported_kinds);
+    }
+
+    /// Check data type of indexed column:
+
+    auto throw_unsupported_underlying_column_exception = []()
+    {
+        throw Exception(
+            ErrorCodes::ILLEGAL_COLUMN,
+            "USearch can only be created on columns of type Array(Float32) and Tuple(Float32[, Float32[, ...]])");
+    };
+
+    DataTypePtr data_type = index.sample_block.getDataTypes()[0];
+
+    if (const auto * data_type_array = typeid_cast<const DataTypeArray *>(data_type.get()))
+    {
+        TypeIndex nested_type_index = data_type_array->getNestedType()->getTypeId();
+        if (!WhichDataType(nested_type_index).isFloat32())
+            throw_unsupported_underlying_column_exception();
+    }
+    else if (const auto * data_type_tuple = typeid_cast<const DataTypeTuple *>(data_type.get()))
+    {
+        const DataTypes & inner_types = data_type_tuple->getElements();
+        for (const auto & inner_type : inner_types)
+        {
+            TypeIndex nested_type_index = inner_type->getTypeId();
+            if (!WhichDataType(nested_type_index).isFloat32())
+                throw_unsupported_underlying_column_exception();
+        }
+    }
+    else
+        throw_unsupported_underlying_column_exception();
+}
+
+}
+
+#endif
diff --git a/src/Storages/MergeTree/MergeTreeIndexUSearch.h b/src/Storages/MergeTree/MergeTreeIndexUSearch.h
new file mode 100644
index 00000000000..5107cfee371
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeIndexUSearch.h
@@ -0,0 +1,116 @@
+#pragma once
+
+#ifdef ENABLE_USEARCH
+
+#include <Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.h>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpass-failed"
+#include <usearch/index_dense.hpp>
+#pragma clang diagnostic pop
+
+namespace DB
+{
+
+using USearchImplType = unum::usearch::index_dense_gt</* key_at */ uint32_t, /* compressed_slot_at */ uint32_t>;
+
+template <unum::usearch::metric_kind_t Metric>
+class USearchIndexWithSerialization : public USearchImplType
+{
+    using Base = USearchImplType;
+
+public:
+    USearchIndexWithSerialization(size_t dimensions, unum::usearch::scalar_kind_t scalar_kind);
+    void serialize(WriteBuffer & ostr) const;
+    void deserialize(ReadBuffer & istr);
+    size_t getDimensions() const;
+};
+
+template <unum::usearch::metric_kind_t Metric>
+using USearchIndexWithSerializationPtr = std::shared_ptr<USearchIndexWithSerialization<Metric>>;
+
+
+template <unum::usearch::metric_kind_t Metric>
+struct MergeTreeIndexGranuleUSearch final : public IMergeTreeIndexGranule
+{
+    MergeTreeIndexGranuleUSearch(const String & index_name_, const Block & index_sample_block_, unum::usearch::scalar_kind_t scalar_kind_);
+    MergeTreeIndexGranuleUSearch(const String & index_name_, const Block & index_sample_block_, unum::usearch::scalar_kind_t scalar_kind_, USearchIndexWithSerializationPtr<Metric> index_);
+
+    ~MergeTreeIndexGranuleUSearch() override = default;
+
+    void serializeBinary(WriteBuffer & ostr) const override;
+    void deserializeBinary(ReadBuffer & istr, MergeTreeIndexVersion version) override;
+
+    bool empty() const override { return !index.get(); }
+
+    const String index_name;
+    const Block index_sample_block;
+    const unum::usearch::scalar_kind_t scalar_kind;
+    USearchIndexWithSerializationPtr<Metric> index;
+};
+
+
+template <unum::usearch::metric_kind_t Metric>
+struct MergeTreeIndexAggregatorUSearch final : IMergeTreeIndexAggregator
+{
+    MergeTreeIndexAggregatorUSearch(const String & index_name_, const Block & index_sample_block, unum::usearch::scalar_kind_t scalar_kind_);
+    ~MergeTreeIndexAggregatorUSearch() override = default;
+
+    bool empty() const override { return !index || index->size() == 0; }
+    MergeTreeIndexGranulePtr getGranuleAndReset() override;
+    void update(const Block & block, size_t * pos, size_t limit) override;
+
+    const String index_name;
+    const Block index_sample_block;
+    const unum::usearch::scalar_kind_t scalar_kind;
+    USearchIndexWithSerializationPtr<Metric> index;
+};
+
+
+class MergeTreeIndexConditionUSearch final : public IMergeTreeIndexConditionApproximateNearestNeighbor
+{
+public:
+    MergeTreeIndexConditionUSearch(
+        const IndexDescription & index_description,
+        const SelectQueryInfo & query,
+        const String & distance_function,
+        ContextPtr context);
+
+    ~MergeTreeIndexConditionUSearch() override = default;
+
+    bool alwaysUnknownOrTrue() const override;
+    bool mayBeTrueOnGranule(MergeTreeIndexGranulePtr idx_granule) const override;
+    std::vector<size_t> getUsefulRanges(MergeTreeIndexGranulePtr idx_granule) const override;
+
+private:
+    template <unum::usearch::metric_kind_t Metric>
+    std::vector<size_t> getUsefulRangesImpl(MergeTreeIndexGranulePtr idx_granule) const;
+
+    const ApproximateNearestNeighborCondition ann_condition;
+    const String distance_function;
+};
+
+
+class MergeTreeIndexUSearch : public IMergeTreeIndex
+{
+public:
+    MergeTreeIndexUSearch(const IndexDescription & index_, const String & distance_function_, unum::usearch::scalar_kind_t scalar_kind_);
+
+    ~MergeTreeIndexUSearch() override = default;
+
+    MergeTreeIndexGranulePtr createIndexGranule() const override;
+    MergeTreeIndexAggregatorPtr createIndexAggregator(const MergeTreeWriterSettings & settings) const override;
+    MergeTreeIndexConditionPtr createIndexCondition(const SelectQueryInfo & query, ContextPtr context) const;
+    MergeTreeIndexConditionPtr createIndexCondition(const ActionsDAGPtr &, ContextPtr) const override;
+    bool isVectorSearch() const override { return true; }
+
+private:
+    const String distance_function;
+    const unum::usearch::scalar_kind_t scalar_kind;
+};
+
+}
+
+
+#endif
+
diff --git a/src/Storages/MergeTree/MergeTreeIndexVectorSimilarity.cpp b/src/Storages/MergeTree/MergeTreeIndexVectorSimilarity.cpp
deleted file mode 100644
index 58892d0dbf2..00000000000
--- a/src/Storages/MergeTree/MergeTreeIndexVectorSimilarity.cpp
+++ /dev/null
@@ -1,543 +0,0 @@
-#include <Storages/MergeTree/MergeTreeIndexVectorSimilarity.h>
-
-#if USE_USEARCH
-
-#include <Columns/ColumnArray.h>
-#include <Common/BitHelpers.h>
-#include <Common/formatReadable.h>
-#include <Common/logger_useful.h>
-#include <Common/typeid_cast.h>
-#include <Core/Field.h>
-#include <DataTypes/DataTypeArray.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/castColumn.h>
-
-namespace ProfileEvents
-{
-    extern const Event USearchAddCount;
-    extern const Event USearchAddVisitedMembers;
-    extern const Event USearchAddComputedDistances;
-    extern const Event USearchSearchCount;
-    extern const Event USearchSearchVisitedMembers;
-    extern const Event USearchSearchComputedDistances;
-}
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int CANNOT_ALLOCATE_MEMORY;
-    extern const int FORMAT_VERSION_TOO_OLD;
-    extern const int ILLEGAL_COLUMN;
-    extern const int INCORRECT_DATA;
-    extern const int INCORRECT_NUMBER_OF_COLUMNS;
-    extern const int INCORRECT_QUERY;
-    extern const int LOGICAL_ERROR;
-    extern const int NOT_IMPLEMENTED;
-}
-
-namespace
-{
-
-/// The only indexing method currently supported by USearch
-const std::set<String> methods = {"hnsw"};
-
-/// Maps from user-facing name to internal name
-const std::unordered_map<String, unum::usearch::metric_kind_t> distanceFunctionToMetricKind = {
-    {"L2Distance", unum::usearch::metric_kind_t::l2sq_k},
-    {"cosineDistance", unum::usearch::metric_kind_t::cos_k}};
-
-/// Maps from user-facing name to internal name
-const std::unordered_map<String, unum::usearch::scalar_kind_t> quantizationToScalarKind = {
-    {"f64", unum::usearch::scalar_kind_t::f64_k},
-    {"f32", unum::usearch::scalar_kind_t::f32_k},
-    {"f16", unum::usearch::scalar_kind_t::f16_k},
-    {"bf16", unum::usearch::scalar_kind_t::bf16_k},
-    {"i8", unum::usearch::scalar_kind_t::i8_k}};
-/// Usearch provides more quantizations but ^^ above ones seem the only ones comprehensively supported across all distance functions.
-
-template<typename T>
-concept is_set = std::same_as<T, std::set<typename T::key_type, typename T::key_compare, typename T::allocator_type>>;
-
-template<typename T>
-concept is_unordered_map = std::same_as<T, std::unordered_map<typename T::key_type, typename T::mapped_type, typename T::hasher, typename T::key_equal, typename T::allocator_type>>;
-
-template <typename T>
-String joinByComma(const T & t)
-{
-    if constexpr (is_set<T>)
-    {
-        return fmt::format("{}", fmt::join(t, ", "));
-    }
-    else if constexpr (is_unordered_map<T>)
-    {
-        String joined_keys;
-        for (const auto & [k, _] : t)
-        {
-            if (!joined_keys.empty())
-                joined_keys += ", ";
-            joined_keys += k;
-        }
-        return joined_keys;
-    }
-    /// TODO once our libcxx is recent enough, replace above by
-    ///      return fmt::format("{}", fmt::join(std::views::keys(t)), ", "));
-    std::unreachable();
-}
-
-}
-
-USearchIndexWithSerialization::USearchIndexWithSerialization(
-    size_t dimensions,
-    unum::usearch::metric_kind_t metric_kind,
-    unum::usearch::scalar_kind_t scalar_kind,
-    UsearchHnswParams usearch_hnsw_params)
-{
-    USearchIndex::metric_t metric(dimensions, metric_kind, scalar_kind);
-
-    unum::usearch::index_dense_config_t config(usearch_hnsw_params.m, usearch_hnsw_params.ef_construction, usearch_hnsw_params.ef_search);
-    config.enable_key_lookups = false; /// we don't do row-to-vector lookups
-
-    if (auto result = USearchIndex::make(metric, config); !result)
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Could not create vector similarity index. Error: {}", String(result.error.release()));
-    else
-        swap(result.index);
-}
-
-void USearchIndexWithSerialization::serialize(WriteBuffer & ostr) const
-{
-    auto callback = [&ostr](void * from, size_t n)
-    {
-        ostr.write(reinterpret_cast<const char *>(from), n);
-        return true;
-    };
-
-    if (auto result = Base::save_to_stream(callback); !result)
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Could not save vector similarity index. Error: {}", String(result.error.release()));
-}
-
-void USearchIndexWithSerialization::deserialize(ReadBuffer & istr)
-{
-    auto callback = [&istr](void * from, size_t n)
-    {
-        istr.readStrict(reinterpret_cast<char *>(from), n);
-        return true;
-    };
-
-    if (auto result = Base::load_from_stream(callback); !result)
-        /// See the comment in MergeTreeIndexGranuleVectorSimilarity::deserializeBinary why we throw here
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Could not load vector similarity index. Please drop the index and create it again. Error: {}", String(result.error.release()));
-
-    if (!try_reserve(limits()))
-        throw Exception(ErrorCodes::CANNOT_ALLOCATE_MEMORY, "Could not reserve memory for usearch index");
-}
-
-USearchIndexWithSerialization::Statistics USearchIndexWithSerialization::getStatistics() const
-{
-    USearchIndex::stats_t global_stats = Base::stats();
-
-    Statistics statistics = {
-        .max_level = max_level(),
-        .connectivity = connectivity(),
-        .size = size(),
-        .capacity = capacity(),
-        .memory_usage = memory_usage(),
-        .bytes_per_vector = bytes_per_vector(),
-        .scalar_words = scalar_words(),
-        .nodes = global_stats.nodes,
-        .edges = global_stats.edges,
-        .max_edges = global_stats.max_edges,
-        .level_stats = {}};
-
-    for (size_t i = 0; i < statistics.max_level; ++i)
-        statistics.level_stats.push_back(Base::stats(i));
-
-    return statistics;
-}
-
-String USearchIndexWithSerialization::Statistics::toString() const
-{
-    return fmt::format("max_level = {}, connectivity = {}, size = {}, capacity = {}, memory_usage = {}, bytes_per_vector = {}, scalar_words = {}, nodes = {}, edges = {}, max_edges = {}",
-            max_level, connectivity, size, capacity, ReadableSize(memory_usage), bytes_per_vector, scalar_words, nodes, edges, max_edges);
-
-}
-MergeTreeIndexGranuleVectorSimilarity::MergeTreeIndexGranuleVectorSimilarity(
-    const String & index_name_,
-    const Block & index_sample_block_,
-    unum::usearch::metric_kind_t metric_kind_,
-    unum::usearch::scalar_kind_t scalar_kind_,
-    UsearchHnswParams usearch_hnsw_params_)
-    : MergeTreeIndexGranuleVectorSimilarity(index_name_, index_sample_block_, metric_kind_, scalar_kind_, usearch_hnsw_params_, nullptr)
-{
-}
-
-MergeTreeIndexGranuleVectorSimilarity::MergeTreeIndexGranuleVectorSimilarity(
-    const String & index_name_,
-    const Block & index_sample_block_,
-    unum::usearch::metric_kind_t metric_kind_,
-    unum::usearch::scalar_kind_t scalar_kind_,
-    UsearchHnswParams usearch_hnsw_params_,
-    USearchIndexWithSerializationPtr index_)
-    : index_name(index_name_)
-    , index_sample_block(index_sample_block_)
-    , metric_kind(metric_kind_)
-    , scalar_kind(scalar_kind_)
-    , usearch_hnsw_params(usearch_hnsw_params_)
-    , index(std::move(index_))
-{
-}
-
-void MergeTreeIndexGranuleVectorSimilarity::serializeBinary(WriteBuffer & ostr) const
-{
-    LOG_TRACE(logger, "Start writing vector similarity index");
-
-    if (empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to write empty vector similarity index {}", backQuote(index_name));
-
-    writeIntBinary(FILE_FORMAT_VERSION, ostr);
-
-    /// Number of dimensions is required in the index constructor,
-    /// so it must be written and read separately from the other part
-    writeIntBinary(static_cast<UInt64>(index->dimensions()), ostr);
-
-    index->serialize(ostr);
-
-    auto statistics = index->getStatistics();
-    LOG_TRACE(logger, "Wrote vector similarity index: {}", statistics.toString());
-}
-
-void MergeTreeIndexGranuleVectorSimilarity::deserializeBinary(ReadBuffer & istr, MergeTreeIndexVersion /*version*/)
-{
-    LOG_TRACE(logger, "Start loading vector similarity index");
-
-    UInt64 file_version;
-    readIntBinary(file_version, istr);
-    if (file_version != FILE_FORMAT_VERSION)
-        throw Exception(
-            ErrorCodes::FORMAT_VERSION_TOO_OLD,
-            "Vector similarity index could not be loaded because its version is too old (current version: {}, persisted version: {}). Please drop the index and create it again.",
-            FILE_FORMAT_VERSION, file_version);
-        /// More fancy error handling would be: Set a flag on the index that it failed to load. During usage return all granules, i.e.
-        /// behave as if the index does not exist. Since format changes are expected to happen only rarely and it is "only" an index, keep it simple for now.
-
-    UInt64 dimension;
-    readIntBinary(dimension, istr);
-    index = std::make_shared<USearchIndexWithSerialization>(dimension, metric_kind, scalar_kind, usearch_hnsw_params);
-
-    index->deserialize(istr);
-
-    auto statistics = index->getStatistics();
-    LOG_TRACE(logger, "Loaded vector similarity index: {}", statistics.toString());
-}
-
-MergeTreeIndexAggregatorVectorSimilarity::MergeTreeIndexAggregatorVectorSimilarity(
-    const String & index_name_,
-    const Block & index_sample_block_,
-    unum::usearch::metric_kind_t metric_kind_,
-    unum::usearch::scalar_kind_t scalar_kind_,
-    UsearchHnswParams usearch_hnsw_params_)
-    : index_name(index_name_)
-    , index_sample_block(index_sample_block_)
-    , metric_kind(metric_kind_)
-    , scalar_kind(scalar_kind_)
-    , usearch_hnsw_params(usearch_hnsw_params_)
-{
-}
-
-MergeTreeIndexGranulePtr MergeTreeIndexAggregatorVectorSimilarity::getGranuleAndReset()
-{
-    auto granule = std::make_shared<MergeTreeIndexGranuleVectorSimilarity>(index_name, index_sample_block, metric_kind, scalar_kind, usearch_hnsw_params, index);
-    index = nullptr;
-    return granule;
-}
-
-namespace
-{
-
-template <typename Column>
-void updateImpl(const ColumnArray * column_array, const ColumnArray::Offsets & column_array_offsets, USearchIndexWithSerializationPtr & index, size_t dimensions, size_t rows)
-{
-    const auto & column_array_data = column_array->getData();
-    const auto & column_array_data_float = typeid_cast<const Column &>(column_array_data);
-    const auto & column_array_data_float_data = column_array_data_float.getData();
-
-    /// Check all sizes are the same
-    for (size_t row = 0; row < rows - 1; ++row)
-        if (column_array_offsets[row + 1] - column_array_offsets[row] != dimensions)
-            throw Exception(ErrorCodes::INCORRECT_DATA, "All arrays in column with vector similarity index must have equal length");
-
-    /// Reserving space is mandatory
-    if (!index->try_reserve(roundUpToPowerOfTwoOrZero(index->size() + rows)))
-        throw Exception(ErrorCodes::CANNOT_ALLOCATE_MEMORY, "Could not reserve memory for vector similarity index");
-
-    for (size_t row = 0; row < rows; ++row)
-    {
-        if (auto result = index->add(static_cast<USearchIndex::vector_key_t>(index->size()), &column_array_data_float_data[column_array_offsets[row - 1]]); !result)
-            throw Exception(ErrorCodes::INCORRECT_DATA, "Could not add data to vector similarity index. Error: {}", String(result.error.release()));
-        else
-        {
-            ProfileEvents::increment(ProfileEvents::USearchAddCount);
-            ProfileEvents::increment(ProfileEvents::USearchAddVisitedMembers, result.visited_members);
-            ProfileEvents::increment(ProfileEvents::USearchAddComputedDistances, result.computed_distances);
-        }
-    }
-}
-
-}
-
-void MergeTreeIndexAggregatorVectorSimilarity::update(const Block & block, size_t * pos, size_t limit)
-{
-    if (*pos >= block.rows())
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "The provided position is not less than the number of block rows. Position: {}, Block rows: {}.",
-            *pos, block.rows());
-
-    size_t rows_read = std::min(limit, block.rows() - *pos);
-
-    if (rows_read == 0)
-        return;
-
-    if (rows_read > std::numeric_limits<UInt32>::max())
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Index granularity is too big: more than {} rows per index granule.", std::numeric_limits<UInt32>::max());
-
-    if (index_sample_block.columns() > 1)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected block with single column");
-
-    const String & index_column_name = index_sample_block.getByPosition(0).name;
-    const ColumnPtr & index_column = block.getByName(index_column_name).column;
-    ColumnPtr column_cut = index_column->cut(*pos, rows_read);
-
-    const auto * column_array = typeid_cast<const ColumnArray *>(column_cut.get());
-    if (!column_array)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected Array(Float*) column");
-
-    if (column_array->empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Array is unexpectedly empty");
-
-    /// The vector similarity algorithm naturally assumes that the indexed vectors have dimension >= 1. This condition is violated if empty arrays
-    /// are INSERTed into an vector-similarity-indexed column or if no value was specified at all in which case the arrays take on their default
-    /// values which is also empty.
-    if (column_array->isDefaultAt(0))
-        throw Exception(ErrorCodes::INCORRECT_DATA, "The arrays in column '{}' must not be empty. Did you try to INSERT default values?", index_column_name);
-
-    const size_t rows = column_array->size();
-
-    const auto & column_array_offsets = column_array->getOffsets();
-    const size_t dimensions = column_array_offsets[0];
-
-    if (!index)
-        index = std::make_shared<USearchIndexWithSerialization>(dimensions, metric_kind, scalar_kind, usearch_hnsw_params);
-
-    /// Also check that previously inserted blocks have the same size as this block.
-    /// Note that this guarantees consistency of dimension only within parts. We are unable to detect inconsistent dimensions across
-    /// parts - for this, a little help from the user is needed, e.g. CONSTRAINT cnstr CHECK length(array) = 42.
-    if (index->dimensions() != dimensions)
-        throw Exception(ErrorCodes::INCORRECT_DATA, "All arrays in column with vector similarity index must have equal length");
-
-    /// We use Usearch's index_dense_t as index type which supports only 4 bio entries according to https://github.com/unum-cloud/usearch/tree/main/cpp
-    if (index->size() + rows > std::numeric_limits<UInt32>::max())
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Size of vector similarity index would exceed 4 billion entries");
-
-    DataTypePtr data_type = block.getDataTypes()[0];
-    const auto * data_type_array = typeid_cast<const DataTypeArray *>(data_type.get());
-    if (!data_type_array)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected data type Array(Float*)");
-    const TypeIndex nested_type_index = data_type_array->getNestedType()->getTypeId();
-
-    if (WhichDataType(nested_type_index).isFloat32())
-        updateImpl<ColumnFloat32>(column_array, column_array_offsets, index, dimensions, rows);
-    else if (WhichDataType(nested_type_index).isFloat64())
-        updateImpl<ColumnFloat64>(column_array, column_array_offsets, index, dimensions, rows);
-    else
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected data type Array(Float*)");
-
-
-    *pos += rows_read;
-}
-
-MergeTreeIndexConditionVectorSimilarity::MergeTreeIndexConditionVectorSimilarity(
-    const IndexDescription & /*index_description*/,
-    const SelectQueryInfo & query,
-    unum::usearch::metric_kind_t metric_kind_,
-    ContextPtr context)
-    : vector_similarity_condition(query, context)
-    , metric_kind(metric_kind_)
-{
-}
-
-bool MergeTreeIndexConditionVectorSimilarity::mayBeTrueOnGranule(MergeTreeIndexGranulePtr) const
-{
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "mayBeTrueOnGranule is not supported for ANN skip indexes");
-}
-
-bool MergeTreeIndexConditionVectorSimilarity::alwaysUnknownOrTrue() const
-{
-    String index_distance_function;
-    switch (metric_kind)
-    {
-        case unum::usearch::metric_kind_t::l2sq_k: index_distance_function = "L2Distance"; break;
-        case unum::usearch::metric_kind_t::cos_k:  index_distance_function = "cosineDistance"; break;
-        default: std::unreachable();
-    }
-    return vector_similarity_condition.alwaysUnknownOrTrue(index_distance_function);
-}
-
-std::vector<size_t> MergeTreeIndexConditionVectorSimilarity::getUsefulRanges(MergeTreeIndexGranulePtr granule_) const
-{
-    const UInt64 limit = vector_similarity_condition.getLimit();
-    const UInt64 index_granularity = vector_similarity_condition.getIndexGranularity();
-
-    const auto granule = std::dynamic_pointer_cast<MergeTreeIndexGranuleVectorSimilarity>(granule_);
-    if (granule == nullptr)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Granule has the wrong type");
-
-    const USearchIndexWithSerializationPtr index = granule->index;
-
-    if (vector_similarity_condition.getDimensions() != index->dimensions())
-        throw Exception(ErrorCodes::INCORRECT_QUERY, "The dimension of the space in the request ({}) "
-            "does not match the dimension in the index ({})",
-            vector_similarity_condition.getDimensions(), index->dimensions());
-
-    const std::vector<Float64> reference_vector = vector_similarity_condition.getReferenceVector();
-
-    auto search_result = index->search(reference_vector.data(), limit);
-    if (!search_result)
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Could not search in vector similarity index. Error: {}", String(search_result.error.release()));
-
-    ProfileEvents::increment(ProfileEvents::USearchSearchCount);
-    ProfileEvents::increment(ProfileEvents::USearchSearchVisitedMembers, search_result.visited_members);
-    ProfileEvents::increment(ProfileEvents::USearchSearchComputedDistances, search_result.computed_distances);
-
-    std::vector<USearchIndex::vector_key_t> neighbors(search_result.size()); /// indexes of vectors which were closest to the reference vector
-    search_result.dump_to(neighbors.data());
-
-    std::vector<size_t> granules;
-    granules.reserve(neighbors.size());
-    for (auto neighbor : neighbors)
-        granules.push_back(neighbor / index_granularity);
-
-    /// make unique
-    std::sort(granules.begin(), granules.end());
-    granules.erase(std::unique(granules.begin(), granules.end()), granules.end());
-
-    return granules;
-}
-
-MergeTreeIndexVectorSimilarity::MergeTreeIndexVectorSimilarity(
-    const IndexDescription & index_,
-    unum::usearch::metric_kind_t metric_kind_,
-    unum::usearch::scalar_kind_t scalar_kind_,
-    UsearchHnswParams usearch_hnsw_params_)
-    : IMergeTreeIndex(index_)
-    , metric_kind(metric_kind_)
-    , scalar_kind(scalar_kind_)
-    , usearch_hnsw_params(usearch_hnsw_params_)
-{
-}
-
-MergeTreeIndexGranulePtr MergeTreeIndexVectorSimilarity::createIndexGranule() const
-{
-    return std::make_shared<MergeTreeIndexGranuleVectorSimilarity>(index.name, index.sample_block, metric_kind, scalar_kind, usearch_hnsw_params);
-}
-
-MergeTreeIndexAggregatorPtr MergeTreeIndexVectorSimilarity::createIndexAggregator(const MergeTreeWriterSettings & /*settings*/) const
-{
-    return std::make_shared<MergeTreeIndexAggregatorVectorSimilarity>(index.name, index.sample_block, metric_kind, scalar_kind, usearch_hnsw_params);
-}
-
-MergeTreeIndexConditionPtr MergeTreeIndexVectorSimilarity::createIndexCondition(const SelectQueryInfo & query, ContextPtr context) const
-{
-    return std::make_shared<MergeTreeIndexConditionVectorSimilarity>(index, query, metric_kind, context);
-};
-
-MergeTreeIndexConditionPtr MergeTreeIndexVectorSimilarity::createIndexCondition(const ActionsDAG *, ContextPtr) const
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "MergeTreeIndexAnnoy cannot be created with ActionsDAG");
-}
-
-MergeTreeIndexPtr vectorSimilarityIndexCreator(const IndexDescription & index)
-{
-    /// Default parameters:
-    unum::usearch::metric_kind_t metric_kind = distanceFunctionToMetricKind.at(index.arguments[1].safeGet<String>());
-    unum::usearch::scalar_kind_t scalar_kind = unum::usearch::scalar_kind_t::bf16_k;
-    UsearchHnswParams usearch_hnsw_params;
-
-    /// Optional parameters:
-    const bool has_six_args = (index.arguments.size() == 6);
-    if (has_six_args)
-    {
-        scalar_kind = quantizationToScalarKind.at(index.arguments[2].safeGet<String>());
-        usearch_hnsw_params = {.m               = index.arguments[3].safeGet<UInt64>(),
-                               .ef_construction = index.arguments[4].safeGet<UInt64>(),
-                               .ef_search       = index.arguments[5].safeGet<UInt64>()};
-    }
-
-    return std::make_shared<MergeTreeIndexVectorSimilarity>(index, metric_kind, scalar_kind, usearch_hnsw_params);
-}
-
-void vectorSimilarityIndexValidator(const IndexDescription & index, bool /* attach */)
-{
-    const bool has_two_args = (index.arguments.size() == 2);
-    const bool has_six_args = (index.arguments.size() == 6);
-
-    /// Check number and type of arguments
-    if (!has_two_args && !has_six_args)
-        throw Exception(ErrorCodes::INCORRECT_QUERY, "Vector similarity index must have two or six arguments");
-    if (index.arguments[0].getType() != Field::Types::String)
-        throw Exception(ErrorCodes::INCORRECT_QUERY, "First argument of vector similarity index (method) must be of type String");
-    if (index.arguments[1].getType() != Field::Types::String)
-        throw Exception(ErrorCodes::INCORRECT_QUERY, "Second argument of vector similarity index (metric) must be of type String");
-    if (has_six_args)
-    {
-        if (index.arguments[2].getType() != Field::Types::String)
-            throw Exception(ErrorCodes::INCORRECT_QUERY, "Third argument of vector similarity index (quantization) must be of type String");
-        if (index.arguments[3].getType() != Field::Types::UInt64)
-            throw Exception(ErrorCodes::INCORRECT_QUERY, "Fourth argument of vector similarity index (M) must be of type UInt64");
-        if (index.arguments[4].getType() != Field::Types::UInt64)
-            throw Exception(ErrorCodes::INCORRECT_QUERY, "Fifth argument of vector similarity index (ef_construction) must be of type UInt64");
-        if (index.arguments[5].getType() != Field::Types::UInt64)
-            throw Exception(ErrorCodes::INCORRECT_QUERY, "Sixth argument of vector similarity index (ef_search) must be of type UInt64");
-    }
-
-    /// Check that passed arguments are supported
-    if (!methods.contains(index.arguments[0].safeGet<String>()))
-        throw Exception(ErrorCodes::INCORRECT_DATA, "First argument (method) of vector similarity index is not supported. Supported methods are: {}", joinByComma(methods));
-    if (!distanceFunctionToMetricKind.contains(index.arguments[1].safeGet<String>()))
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Second argument (distance function) of vector similarity index is not supported. Supported distance function are: {}", joinByComma(distanceFunctionToMetricKind));
-    if (has_six_args)
-    {
-        if (!quantizationToScalarKind.contains(index.arguments[2].safeGet<String>()))
-            throw Exception(ErrorCodes::INCORRECT_DATA, "Third argument (quantization) of vector similarity index is not supported. Supported quantizations are: {}", joinByComma(quantizationToScalarKind));
-
-        /// Call Usearch's own parameter validation method for HNSW-specific parameters
-        UInt64 m = index.arguments[3].safeGet<UInt64>();
-        UInt64 ef_construction = index.arguments[4].safeGet<UInt64>();
-        UInt64 ef_search = index.arguments[5].safeGet<UInt64>();
-
-        unum::usearch::index_dense_config_t config(m, ef_construction, ef_search);
-
-        if (auto error = config.validate(); error)
-            throw Exception(ErrorCodes::INCORRECT_DATA, "Invalid parameters passed to vector similarity index. Error: {}", String(error.release()));
-    }
-
-    /// Check that the index is created on a single column
-    if (index.column_names.size() != 1 || index.data_types.size() != 1)
-        throw Exception(ErrorCodes::INCORRECT_NUMBER_OF_COLUMNS, "Vector similarity indexes must be created on a single column");
-
-    /// Check that the data type is Array(Float*)
-    DataTypePtr data_type = index.sample_block.getDataTypes()[0];
-    const auto * data_type_array = typeid_cast<const DataTypeArray *>(data_type.get());
-    if (!data_type_array)
-        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Vector similarity indexes can only be created on columns of type Array(Float*)");
-    TypeIndex nested_type_index = data_type_array->getNestedType()->getTypeId();
-    if (!WhichDataType(nested_type_index).isFloat())
-        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Vector similarity indexes can only be created on columns of type Array(Float*)");
-}
-
-}
-
-#endif
diff --git a/src/Storages/MergeTree/MergeTreeIndexVectorSimilarity.h b/src/Storages/MergeTree/MergeTreeIndexVectorSimilarity.h
deleted file mode 100644
index c4c03254d2d..00000000000
--- a/src/Storages/MergeTree/MergeTreeIndexVectorSimilarity.h
+++ /dev/null
@@ -1,174 +0,0 @@
-#pragma once
-
-#include "config.h"
-
-#if USE_USEARCH
-
-#include <Storages/MergeTree/VectorSimilarityCondition.h>
-#include <Common/Logger.h>
-#include <usearch/index_dense.hpp>
-
-namespace DB
-{
-
-struct UsearchHnswParams
-{
-    size_t m = unum::usearch::default_connectivity();
-    size_t ef_construction = unum::usearch::default_expansion_add();
-    size_t ef_search = unum::usearch::default_expansion_search();
-};
-
-using USearchIndex = unum::usearch::index_dense_t;
-
-class USearchIndexWithSerialization : public USearchIndex
-{
-    using Base = USearchIndex;
-
-public:
-    USearchIndexWithSerialization(
-        size_t dimensions,
-        unum::usearch::metric_kind_t metric_kind,
-        unum::usearch::scalar_kind_t scalar_kind,
-        UsearchHnswParams usearch_hnsw_params);
-
-    void serialize(WriteBuffer & ostr) const;
-    void deserialize(ReadBuffer & istr);
-
-    struct Statistics
-    {
-        size_t max_level;
-        size_t connectivity;
-        size_t size;                /// number of indexed vectors
-        size_t capacity;            /// reserved number of indexed vectors
-        size_t memory_usage;        /// byte size (not exact)
-        size_t bytes_per_vector;
-        size_t scalar_words;
-        size_t nodes;
-        size_t edges;
-        size_t max_edges;
-
-        std::vector<USearchIndex::stats_t> level_stats; /// for debugging, excluded from getStatistics()
-
-        String toString() const;
-    };
-
-    Statistics getStatistics() const;
-};
-
-using USearchIndexWithSerializationPtr = std::shared_ptr<USearchIndexWithSerialization>;
-
-
-struct MergeTreeIndexGranuleVectorSimilarity final : public IMergeTreeIndexGranule
-{
-    MergeTreeIndexGranuleVectorSimilarity(
-        const String & index_name_,
-        const Block & index_sample_block_,
-        unum::usearch::metric_kind_t metric_kind_,
-        unum::usearch::scalar_kind_t scalar_kind_,
-        UsearchHnswParams usearch_hnsw_params_);
-
-    MergeTreeIndexGranuleVectorSimilarity(
-        const String & index_name_,
-        const Block & index_sample_block_,
-        unum::usearch::metric_kind_t metric_kind_,
-        unum::usearch::scalar_kind_t scalar_kind_,
-        UsearchHnswParams usearch_hnsw_params_,
-        USearchIndexWithSerializationPtr index_);
-
-    ~MergeTreeIndexGranuleVectorSimilarity() override = default;
-
-    void serializeBinary(WriteBuffer & ostr) const override;
-    void deserializeBinary(ReadBuffer & istr, MergeTreeIndexVersion version) override;
-
-    bool empty() const override { return !index || index->size() == 0; }
-
-    const String index_name;
-    const Block index_sample_block;
-    const unum::usearch::metric_kind_t metric_kind;
-    const unum::usearch::scalar_kind_t scalar_kind;
-    const UsearchHnswParams usearch_hnsw_params;
-    USearchIndexWithSerializationPtr index;
-
-    LoggerPtr logger = getLogger("VectorSimilarityIndex");
-
-private:
-    /// The version of the persistence format of USearch index. Increment whenever you change the format.
-    /// Note: USearch prefixes the serialized data with its own version header. We can't rely on that because 1. the index in ClickHouse
-    /// is (at least in theory) agnostic of specific vector search libraries, and 2. additional data (e.g. the number of dimensions)
-    /// outside USearch exists which we should version separately.
-    static constexpr UInt64 FILE_FORMAT_VERSION = 1;
-};
-
-
-struct MergeTreeIndexAggregatorVectorSimilarity final : IMergeTreeIndexAggregator
-{
-    MergeTreeIndexAggregatorVectorSimilarity(
-        const String & index_name_,
-        const Block & index_sample_block,
-        unum::usearch::metric_kind_t metric_kind_,
-        unum::usearch::scalar_kind_t scalar_kind_,
-        UsearchHnswParams usearch_hnsw_params_);
-
-    ~MergeTreeIndexAggregatorVectorSimilarity() override = default;
-
-    bool empty() const override { return !index || index->size() == 0; }
-    MergeTreeIndexGranulePtr getGranuleAndReset() override;
-    void update(const Block & block, size_t * pos, size_t limit) override;
-
-    const String index_name;
-    const Block index_sample_block;
-    const unum::usearch::metric_kind_t metric_kind;
-    const unum::usearch::scalar_kind_t scalar_kind;
-    const UsearchHnswParams usearch_hnsw_params;
-    USearchIndexWithSerializationPtr index;
-};
-
-
-class MergeTreeIndexConditionVectorSimilarity final : public IMergeTreeIndexCondition
-{
-public:
-    MergeTreeIndexConditionVectorSimilarity(
-        const IndexDescription & index_description,
-        const SelectQueryInfo & query,
-        unum::usearch::metric_kind_t metric_kind_,
-        ContextPtr context);
-
-    ~MergeTreeIndexConditionVectorSimilarity() override = default;
-
-    bool alwaysUnknownOrTrue() const override;
-    bool mayBeTrueOnGranule(MergeTreeIndexGranulePtr granule) const override;
-    std::vector<size_t> getUsefulRanges(MergeTreeIndexGranulePtr granule) const override;
-
-private:
-    const VectorSimilarityCondition vector_similarity_condition;
-    const unum::usearch::metric_kind_t metric_kind;
-};
-
-
-class MergeTreeIndexVectorSimilarity : public IMergeTreeIndex
-{
-public:
-    MergeTreeIndexVectorSimilarity(
-        const IndexDescription & index_,
-        unum::usearch::metric_kind_t metric_kind_,
-        unum::usearch::scalar_kind_t scalar_kind_,
-        UsearchHnswParams usearch_hnsw_params_);
-
-    ~MergeTreeIndexVectorSimilarity() override = default;
-
-    MergeTreeIndexGranulePtr createIndexGranule() const override;
-    MergeTreeIndexAggregatorPtr createIndexAggregator(const MergeTreeWriterSettings & settings) const override;
-    MergeTreeIndexConditionPtr createIndexCondition(const SelectQueryInfo & query, ContextPtr context) const;
-    MergeTreeIndexConditionPtr createIndexCondition(const ActionsDAG *, ContextPtr) const override;
-    bool isVectorSimilarityIndex() const override { return true; }
-
-private:
-    const unum::usearch::metric_kind_t metric_kind;
-    const unum::usearch::scalar_kind_t scalar_kind;
-    const UsearchHnswParams usearch_hnsw_params;
-};
-
-}
-
-
-#endif
diff --git a/src/Storages/MergeTree/MergeTreeIndices.cpp b/src/Storages/MergeTree/MergeTreeIndices.cpp
index d2fc0e84b56..bded961db8e 100644
--- a/src/Storages/MergeTree/MergeTreeIndices.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndices.cpp
@@ -127,21 +127,15 @@ MergeTreeIndexFactory::MergeTreeIndexFactory()
     registerCreator("hypothesis", hypothesisIndexCreator);
 
     registerValidator("hypothesis", hypothesisIndexValidator);
-
-#if USE_USEARCH
-    registerCreator("vector_similarity", vectorSimilarityIndexCreator);
-    registerValidator("vector_similarity", vectorSimilarityIndexValidator);
+#ifdef ENABLE_ANNOY
+    registerCreator("annoy", annoyIndexCreator);
+    registerValidator("annoy", annoyIndexValidator);
+#endif
+
+#ifdef ENABLE_USEARCH
+    registerCreator("usearch", usearchIndexCreator);
+    registerValidator("usearch", usearchIndexValidator);
 #endif
-    /// ------
-    /// TODO: remove this block at the end of 2024.
-    /// Index types 'annoy' and 'usearch' are no longer supported as of June 2024. Their successor is index type 'vector_similarity'.
-    /// To support loading tables with old indexes during a transition period, register dummy indexes which allow load/attaching but
-    /// throw an exception when the user attempts to use them.
-    registerCreator("annoy", legacyVectorSimilarityIndexCreator);
-    registerValidator("annoy", legacyVectorSimilarityIndexValidator);
-    registerCreator("usearch", legacyVectorSimilarityIndexCreator);
-    registerValidator("usearch", legacyVectorSimilarityIndexValidator);
-    /// ------
 
     registerCreator("inverted", fullTextIndexCreator);
     registerValidator("inverted", fullTextIndexValidator);
diff --git a/src/Storages/MergeTree/MergeTreeIndices.h b/src/Storages/MergeTree/MergeTreeIndices.h
index c52d7ffe131..a9f1fa9378f 100644
--- a/src/Storages/MergeTree/MergeTreeIndices.h
+++ b/src/Storages/MergeTree/MergeTreeIndices.h
@@ -15,7 +15,6 @@
 #include <Interpreters/ExpressionActions.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 
-#include "config.h"
 
 constexpr auto INDEX_FILE_PREFIX = "skp_idx_";
 
@@ -93,13 +92,6 @@ public:
     virtual bool alwaysUnknownOrTrue() const = 0;
 
     virtual bool mayBeTrueOnGranule(MergeTreeIndexGranulePtr granule) const = 0;
-
-    /// Special stuff for vector similarity indexes
-    /// - Returns vector of indexes of ranges in granule which are useful for query.
-    virtual std::vector<size_t> getUsefulRanges(MergeTreeIndexGranulePtr) const
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented for non-vector-similarity indexes.");
-    }
 };
 
 using MergeTreeIndexConditionPtr = std::shared_ptr<IMergeTreeIndexCondition>;
@@ -175,9 +167,9 @@ struct IMergeTreeIndex
     }
 
     virtual MergeTreeIndexConditionPtr createIndexCondition(
-        const ActionsDAG * filter_actions_dag, ContextPtr context) const = 0;
+        const ActionsDAGPtr & filter_actions_dag, ContextPtr context) const = 0;
 
-    virtual bool isVectorSimilarityIndex() const { return false; }
+    virtual bool isVectorSearch() const { return false; }
 
     virtual MergeTreeIndexMergedConditionPtr createIndexMergedCondition(
         const SelectQueryInfo & /*query_info*/, StorageMetadataPtr /*storage_metadata*/) const
@@ -238,15 +230,17 @@ void bloomFilterIndexValidator(const IndexDescription & index, bool attach);
 MergeTreeIndexPtr hypothesisIndexCreator(const IndexDescription & index);
 void hypothesisIndexValidator(const IndexDescription & index, bool attach);
 
-#if USE_USEARCH
-MergeTreeIndexPtr vectorSimilarityIndexCreator(const IndexDescription & index);
-void vectorSimilarityIndexValidator(const IndexDescription & index, bool attach);
+#ifdef ENABLE_ANNOY
+MergeTreeIndexPtr annoyIndexCreator(const IndexDescription & index);
+void annoyIndexValidator(const IndexDescription & index, bool attach);
 #endif
 
-MergeTreeIndexPtr legacyVectorSimilarityIndexCreator(const IndexDescription & index);
-void legacyVectorSimilarityIndexValidator(const IndexDescription & index, bool attach);
+#ifdef ENABLE_USEARCH
+MergeTreeIndexPtr usearchIndexCreator(const IndexDescription& index);
+void usearchIndexValidator(const IndexDescription& index, bool attach);
+#endif
 
-MergeTreeIndexPtr fullTextIndexCreator(const IndexDescription & index);
-void fullTextIndexValidator(const IndexDescription & index, bool attach);
+MergeTreeIndexPtr fullTextIndexCreator(const IndexDescription& index);
+void fullTextIndexValidator(const IndexDescription& index, bool attach);
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeMutationEntry.cpp b/src/Storages/MergeTree/MergeTreeMutationEntry.cpp
index 5970aed497e..4dbccb91620 100644
--- a/src/Storages/MergeTree/MergeTreeMutationEntry.cpp
+++ b/src/Storages/MergeTree/MergeTreeMutationEntry.cpp
@@ -50,7 +50,7 @@ UInt64 MergeTreeMutationEntry::parseFileName(const String & file_name_)
 MergeTreeMutationEntry::MergeTreeMutationEntry(MutationCommands commands_, DiskPtr disk_, const String & path_prefix_, UInt64 tmp_number,
                                                const TransactionID & tid_, const WriteSettings & settings)
     : create_time(time(nullptr))
-    , commands(std::make_shared<MutationCommands>(std::move(commands_)))
+    , commands(std::move(commands_))
     , disk(std::move(disk_))
     , path_prefix(path_prefix_)
     , file_name("tmp_mutation_" + toString(tmp_number) + ".txt")
@@ -63,7 +63,7 @@ MergeTreeMutationEntry::MergeTreeMutationEntry(MutationCommands commands_, DiskP
         *out << "format version: 1\n"
             << "create time: " << LocalDateTime(create_time, DateLUT::serverTimezoneInstance()) << "\n";
         *out << "commands: ";
-        commands->writeText(*out, /* with_pure_metadata_commands = */ false);
+        commands.writeText(*out, /* with_pure_metadata_commands = */ false);
         *out << "\n";
         if (tid.isPrehistoric())
         {
@@ -116,8 +116,7 @@ void MergeTreeMutationEntry::writeCSN(CSN csn_)
 }
 
 MergeTreeMutationEntry::MergeTreeMutationEntry(DiskPtr disk_, const String & path_prefix_, const String & file_name_)
-    : commands(std::make_shared<MutationCommands>())
-    , disk(std::move(disk_))
+    : disk(std::move(disk_))
     , path_prefix(path_prefix_)
     , file_name(file_name_)
     , is_temp(false)
@@ -134,7 +133,7 @@ MergeTreeMutationEntry::MergeTreeMutationEntry(DiskPtr disk_, const String & pat
         create_time_dt.hour(), create_time_dt.minute(), create_time_dt.second());
 
     *buf >> "commands: ";
-    commands->readText(*buf);
+    commands.readText(*buf);
     *buf >> "\n";
 
     if (buf->eof())
@@ -178,7 +177,7 @@ std::shared_ptr<const IBackupEntry> MergeTreeMutationEntry::backup() const
     out << "block number: " << block_number << "\n";
 
     out << "commands: ";
-    commands->writeText(out, /* with_pure_metadata_commands = */ false);
+    commands.writeText(out, /* with_pure_metadata_commands = */ false);
     out << "\n";
 
     return std::make_shared<BackupEntryFromMemory>(out.str());
diff --git a/src/Storages/MergeTree/MergeTreeMutationEntry.h b/src/Storages/MergeTree/MergeTreeMutationEntry.h
index f41ad2a17f8..04297f2852a 100644
--- a/src/Storages/MergeTree/MergeTreeMutationEntry.h
+++ b/src/Storages/MergeTree/MergeTreeMutationEntry.h
@@ -16,7 +16,7 @@ class IBackupEntry;
 struct MergeTreeMutationEntry
 {
     time_t create_time = 0;
-    std::shared_ptr<MutationCommands> commands;
+    MutationCommands commands;
 
     DiskPtr disk;
     String path_prefix;
diff --git a/src/Storages/MergeTree/MergeTreePartition.cpp b/src/Storages/MergeTree/MergeTreePartition.cpp
index 5b5bc244f92..b240f80ee13 100644
--- a/src/Storages/MergeTree/MergeTreePartition.cpp
+++ b/src/Storages/MergeTree/MergeTreePartition.cpp
@@ -241,7 +241,7 @@ String MergeTreePartition::getID(const Block & partition_key_sample) const
             if (typeid_cast<const DataTypeDate *>(partition_key_sample.getByPosition(i).type.get()))
                 result += toString(DateLUT::serverTimezoneInstance().toNumYYYYMMDD(DayNum(value[i].safeGet<UInt64>())));
             else if (typeid_cast<const DataTypeIPv4 *>(partition_key_sample.getByPosition(i).type.get()))
-                result += toString(value[i].safeGet<IPv4>().toUnderType());
+                result += toString(value[i].get<IPv4>().toUnderType());
             else
                 result += applyVisitor(to_string_visitor, value[i]);
 
diff --git a/src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp b/src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp
index 32e84dbcdea..b6f626c992b 100644
--- a/src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp
+++ b/src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp
@@ -85,7 +85,6 @@ MergeTreeReadTask::Readers MergeTreePrefetchedReadPool::PrefetchedReaders::get()
 
 MergeTreePrefetchedReadPool::MergeTreePrefetchedReadPool(
     RangesInDataParts && parts_,
-    MutationsSnapshotPtr mutations_snapshot_,
     VirtualFields shared_virtual_fields_,
     const StorageSnapshotPtr & storage_snapshot_,
     const PrewhereInfoPtr & prewhere_info_,
@@ -96,7 +95,6 @@ MergeTreePrefetchedReadPool::MergeTreePrefetchedReadPool(
     const ContextPtr & context_)
     : MergeTreeReadPoolBase(
         std::move(parts_),
-        std::move(mutations_snapshot_),
         std::move(shared_virtual_fields_),
         storage_snapshot_,
         prewhere_info_,
@@ -105,6 +103,7 @@ MergeTreePrefetchedReadPool::MergeTreePrefetchedReadPool(
         column_names_,
         settings_,
         context_)
+    , WithContext(context_)
     , prefetch_threadpool(getContext()->getPrefetchThreadpool())
     , log(getLogger("MergeTreePrefetchedReadPool(" + (parts_ranges.empty() ? "" : parts_ranges.front().data_part->storage.getStorageID().getNameForLogs()) + ")"))
 {
@@ -330,7 +329,7 @@ void MergeTreePrefetchedReadPool::fillPerPartStatistics()
             part_stat.sum_marks += range.end - range.begin;
 
         const auto & columns = settings.merge_tree_determine_task_size_by_prewhere_columns && prewhere_info
-            ? prewhere_info->prewhere_actions.getRequiredColumnsNames()
+            ? prewhere_info->prewhere_actions->getRequiredColumnsNames()
             : column_names;
 
         part_stat.approx_size_of_mark = getApproximateSizeOfGranule(*read_info.data_part, columns);
@@ -380,6 +379,7 @@ void MergeTreePrefetchedReadPool::fillPerThreadTasks(size_t threads, size_t sum_
     for (const auto & part : per_part_statistics)
         total_size_approx += part.sum_marks * part.approx_size_of_mark;
 
+    size_t min_prefetch_step_marks = pool_settings.min_marks_for_concurrent_read;
     for (size_t i = 0; i < per_part_infos.size(); ++i)
     {
         auto & part_stat = per_part_statistics[i];
@@ -394,11 +394,29 @@ void MergeTreePrefetchedReadPool::fillPerThreadTasks(size_t threads, size_t sum_
                 1, static_cast<size_t>(std::round(static_cast<double>(settings.filesystem_prefetch_step_bytes) / part_stat.approx_size_of_mark)));
         }
 
-        part_stat.prefetch_step_marks = std::max(part_stat.prefetch_step_marks, per_part_infos[i]->min_marks_per_task);
+        /// This limit is important to avoid spikes of slow aws getObject requests when parallelizing within one file.
+        /// (The default is taken from here https://docs.aws.amazon.com/whitepapers/latest/s3-optimizing-performance-best-practices/use-byte-range-fetches.html).
+        if (part_stat.approx_size_of_mark
+            && settings.filesystem_prefetch_min_bytes_for_single_read_task
+            && part_stat.approx_size_of_mark < settings.filesystem_prefetch_min_bytes_for_single_read_task)
+        {
+            const size_t min_prefetch_step_marks_by_total_cols = static_cast<size_t>(
+                std::ceil(static_cast<double>(settings.filesystem_prefetch_min_bytes_for_single_read_task) / part_stat.approx_size_of_mark));
 
-        if (part_stat.prefetch_step_marks == 0)
-            throw Exception(
-                ErrorCodes::BAD_ARGUMENTS, "Chosen number of marks to read is zero (likely because of weird interference of settings)");
+            /// At least one task to start working on it right now and another one to prefetch in the meantime.
+            const size_t new_min_prefetch_step_marks = std::min<size_t>(min_prefetch_step_marks_by_total_cols, sum_marks / threads / 2);
+            if (min_prefetch_step_marks < new_min_prefetch_step_marks)
+            {
+                LOG_DEBUG(log, "Increasing min prefetch step from {} to {}", min_prefetch_step_marks, new_min_prefetch_step_marks);
+                min_prefetch_step_marks = new_min_prefetch_step_marks;
+            }
+        }
+
+        if (part_stat.prefetch_step_marks < min_prefetch_step_marks)
+        {
+            LOG_DEBUG(log, "Increasing prefetch step from {} to {}", part_stat.prefetch_step_marks, min_prefetch_step_marks);
+            part_stat.prefetch_step_marks = min_prefetch_step_marks;
+        }
 
         LOG_DEBUG(
             log,
@@ -415,10 +433,11 @@ void MergeTreePrefetchedReadPool::fillPerThreadTasks(size_t threads, size_t sum_
 
     LOG_DEBUG(
         log,
-        "Sum marks: {}, threads: {}, min_marks_per_thread: {}, prefetches limit: {}, total_size_approx: {}",
+        "Sum marks: {}, threads: {}, min_marks_per_thread: {}, min prefetch step marks: {}, prefetches limit: {}, total_size_approx: {}",
         sum_marks,
         threads,
         min_marks_per_thread,
+        min_prefetch_step_marks,
         settings.filesystem_prefetches_limit,
         total_size_approx);
 
diff --git a/src/Storages/MergeTree/MergeTreePrefetchedReadPool.h b/src/Storages/MergeTree/MergeTreePrefetchedReadPool.h
index 1a709250937..a3a57227630 100644
--- a/src/Storages/MergeTree/MergeTreePrefetchedReadPool.h
+++ b/src/Storages/MergeTree/MergeTreePrefetchedReadPool.h
@@ -14,12 +14,11 @@ using MergeTreeReaderPtr = std::unique_ptr<IMergeTreeReader>;
 /// A class which is responsible for creating read tasks
 /// which are later taken by readers via getTask method.
 /// Does prefetching for the read tasks it creates.
-class MergeTreePrefetchedReadPool : public MergeTreeReadPoolBase
+class MergeTreePrefetchedReadPool : public MergeTreeReadPoolBase, private WithContext
 {
 public:
     MergeTreePrefetchedReadPool(
         RangesInDataParts && parts_,
-        MutationsSnapshotPtr mutations_snapshot_,
         VirtualFields shared_virtual_fields_,
         const StorageSnapshotPtr & storage_snapshot_,
         const PrewhereInfoPtr & prewhere_info_,
diff --git a/src/Storages/MergeTree/MergeTreeReadPool.cpp b/src/Storages/MergeTree/MergeTreeReadPool.cpp
index 23fc44cc98a..1daf46b6e25 100644
--- a/src/Storages/MergeTree/MergeTreeReadPool.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadPool.cpp
@@ -24,12 +24,18 @@ namespace ErrorCodes
 {
 extern const int CANNOT_SCHEDULE_TASK;
 extern const int LOGICAL_ERROR;
-extern const int BAD_ARGUMENTS;
+}
+
+size_t getApproxSizeOfPart(const IMergeTreeDataPart & part, const Names & columns_to_read)
+{
+    ColumnSize columns_size{};
+    for (const auto & col_name : columns_to_read)
+        columns_size.add(part.getColumnSize(col_name));
+    return columns_size.data_compressed;
 }
 
 MergeTreeReadPool::MergeTreeReadPool(
     RangesInDataParts && parts_,
-    MutationsSnapshotPtr mutations_snapshot_,
     VirtualFields shared_virtual_fields_,
     const StorageSnapshotPtr & storage_snapshot_,
     const PrewhereInfoPtr & prewhere_info_,
@@ -40,7 +46,6 @@ MergeTreeReadPool::MergeTreeReadPool(
     const ContextPtr & context_)
     : MergeTreeReadPoolBase(
         std::move(parts_),
-        std::move(mutations_snapshot_),
         std::move(shared_virtual_fields_),
         storage_snapshot_,
         prewhere_info_,
@@ -49,9 +54,37 @@ MergeTreeReadPool::MergeTreeReadPool(
         column_names_,
         settings_,
         context_)
+    , min_marks_for_concurrent_read(pool_settings.min_marks_for_concurrent_read)
     , backoff_settings{context_->getSettingsRef()}
     , backoff_state{pool_settings.threads}
 {
+    if (std::ranges::count(is_part_on_remote_disk, true))
+    {
+        const auto & settings = context_->getSettingsRef();
+
+        size_t total_compressed_bytes = 0;
+        size_t total_marks = 0;
+        for (const auto & part : parts_ranges)
+        {
+            const auto & columns = settings.merge_tree_determine_task_size_by_prewhere_columns && prewhere_info
+                ? prewhere_info->prewhere_actions->getRequiredColumnsNames()
+                : column_names_;
+
+            total_compressed_bytes += getApproxSizeOfPart(*part.data_part, columns);
+            total_marks += part.getMarksCount();
+        }
+
+        if (total_marks)
+        {
+            const auto min_bytes_per_task = settings.merge_tree_min_bytes_per_task_for_remote_reading;
+            const auto avg_mark_bytes = std::max<size_t>(total_compressed_bytes / total_marks, 1);
+            /// We're taking min here because number of tasks shouldn't be too low - it will make task stealing impossible.
+            const auto heuristic_min_marks = std::min<size_t>(total_marks / pool_settings.threads, min_bytes_per_task / avg_mark_bytes);
+
+            min_marks_for_concurrent_read = std::max(heuristic_min_marks, min_marks_for_concurrent_read);
+        }
+    }
+
     fillPerThreadInfo(pool_settings.threads, pool_settings.sum_marks);
 }
 
@@ -96,16 +129,15 @@ MergeTreeReadTaskPtr MergeTreeReadPool::getTask(size_t task_idx, MergeTreeReadTa
 
     const auto part_idx = thread_task.part_idx;
     auto & marks_in_part = thread_tasks.sum_marks_in_parts.back();
-    const auto min_marks_per_task = per_part_infos[part_idx]->min_marks_per_task;
 
     size_t need_marks;
     if (is_part_on_remote_disk[part_idx] && !pool_settings.use_const_size_tasks_for_remote_reading)
         need_marks = marks_in_part;
     else /// Get whole part to read if it is small enough.
-        need_marks = std::min(marks_in_part, min_marks_per_task);
+        need_marks = std::min(marks_in_part, min_marks_for_concurrent_read);
 
     /// Do not leave too little rows in part for next time.
-    if (marks_in_part > need_marks && marks_in_part - need_marks < min_marks_per_task / 2)
+    if (marks_in_part > need_marks && marks_in_part - need_marks < min_marks_for_concurrent_read / 2)
         need_marks = marks_in_part;
 
     MarkRanges ranges_to_get_from_part;
@@ -224,6 +256,8 @@ void MergeTreeReadPool::fillPerThreadInfo(size_t threads, size_t sum_marks)
             parts_queue.push(std::move(info.second));
     }
 
+    LOG_DEBUG(log, "min_marks_for_concurrent_read={}", min_marks_for_concurrent_read);
+
     const size_t min_marks_per_thread = (sum_marks - 1) / threads + 1;
 
     for (size_t i = 0; i < threads && !parts_queue.empty(); ++i)
@@ -236,18 +270,15 @@ void MergeTreeReadPool::fillPerThreadInfo(size_t threads, size_t sum_marks)
             auto & part_with_ranges = current_parts.back().part;
             size_t & marks_in_part = current_parts.back().sum_marks;
             const auto part_idx = current_parts.back().part_idx;
-            const auto min_marks_per_task = per_part_infos[part_idx]->min_marks_per_task;
-
-            if (min_marks_per_task == 0)
-                throw Exception(
-                    ErrorCodes::BAD_ARGUMENTS, "Chosen number of marks to read is zero (likely because of weird interference of settings)");
 
             /// Do not get too few rows from part.
-            if (marks_in_part >= min_marks_per_task && need_marks < min_marks_per_task)
-                need_marks = min_marks_per_task;
+            if (marks_in_part >= min_marks_for_concurrent_read &&
+                need_marks < min_marks_for_concurrent_read)
+                need_marks = min_marks_for_concurrent_read;
 
             /// Do not leave too few rows in part for next time.
-            if (marks_in_part > need_marks && marks_in_part - need_marks < min_marks_per_task)
+            if (marks_in_part > need_marks &&
+                marks_in_part - need_marks < min_marks_for_concurrent_read)
                 need_marks = marks_in_part;
 
             MarkRanges ranges_to_get_from_part;
diff --git a/src/Storages/MergeTree/MergeTreeReadPool.h b/src/Storages/MergeTree/MergeTreeReadPool.h
index c51dca315f9..cd12b9db9fd 100644
--- a/src/Storages/MergeTree/MergeTreeReadPool.h
+++ b/src/Storages/MergeTree/MergeTreeReadPool.h
@@ -26,7 +26,6 @@ public:
 
     MergeTreeReadPool(
         RangesInDataParts && parts_,
-        MutationsSnapshotPtr mutations_snapshot_,
         VirtualFields shared_virtual_fields_,
         const StorageSnapshotPtr & storage_snapshot_,
         const PrewhereInfoPtr & prewhere_info_,
@@ -74,6 +73,7 @@ private:
     void fillPerThreadInfo(size_t threads, size_t sum_marks);
 
     mutable std::mutex mutex;
+    size_t min_marks_for_concurrent_read = 0;
 
     /// State to track numbers of slow reads.
     struct BackoffState
diff --git a/src/Storages/MergeTree/MergeTreeReadPoolBase.cpp b/src/Storages/MergeTree/MergeTreeReadPoolBase.cpp
index 6e9eee3b605..0ea19370d45 100644
--- a/src/Storages/MergeTree/MergeTreeReadPoolBase.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadPoolBase.cpp
@@ -1,8 +1,7 @@
 #include <Storages/MergeTree/MergeTreeReadPoolBase.h>
-
-#include <Core/Settings.h>
-#include <Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h>
 #include <Storages/MergeTree/MergeTreeBlockReadUtils.h>
+#include <Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h>
+
 
 namespace DB
 {
@@ -14,7 +13,6 @@ namespace ErrorCodes
 
 MergeTreeReadPoolBase::MergeTreeReadPoolBase(
     RangesInDataParts && parts_,
-    MutationsSnapshotPtr mutations_snapshot_,
     VirtualFields shared_virtual_fields_,
     const StorageSnapshotPtr & storage_snapshot_,
     const PrewhereInfoPtr & prewhere_info_,
@@ -23,9 +21,7 @@ MergeTreeReadPoolBase::MergeTreeReadPoolBase(
     const Names & column_names_,
     const PoolSettings & pool_settings_,
     const ContextPtr & context_)
-    : WithContext(context_)
-    , parts_ranges(std::move(parts_))
-    , mutations_snapshot(std::move(mutations_snapshot_))
+    : parts_ranges(std::move(parts_))
     , shared_virtual_fields(std::move(shared_virtual_fields_))
     , storage_snapshot(storage_snapshot_)
     , prewhere_info(prewhere_info_)
@@ -38,59 +34,10 @@ MergeTreeReadPoolBase::MergeTreeReadPoolBase(
     , header(storage_snapshot->getSampleBlockForColumns(column_names))
     , profile_callback([this](ReadBufferFromFileBase::ProfileInfo info_) { profileFeedback(info_); })
 {
-    fillPerPartInfos(context_->getSettingsRef());
+    fillPerPartInfos();
 }
 
-static size_t getApproxSizeOfPart(const IMergeTreeDataPart & part, const Names & columns_to_read)
-{
-    ColumnSize columns_size{};
-    for (const auto & col_name : columns_to_read)
-        columns_size.add(part.getColumnSize(col_name));
-    /// For compact parts we don't know individual column sizes, let's use whole part size as approximation
-    return columns_size.data_compressed ? columns_size.data_compressed : part.getBytesOnDisk();
-}
-
-static size_t calculateMinMarksPerTask(
-    const RangesInDataPart & part,
-    const Names & columns_to_read,
-    PrewhereInfoPtr prewhere_info,
-    const MergeTreeReadPoolBase::PoolSettings & pool_settings,
-    const Settings & settings)
-{
-    size_t min_marks_per_task = pool_settings.min_marks_for_concurrent_read;
-    const size_t part_marks_count = part.getMarksCount();
-    if (part_marks_count && part.data_part->isStoredOnRemoteDisk())
-    {
-        /// We assume that most of the time prewhere does it's job good meaning that lion's share of the rows is filtered out.
-        /// Which means in turn that for most of the rows we will read only the columns from prewhere clause.
-        /// So it makes sense to use only them for the estimation.
-        const auto & columns = settings.merge_tree_determine_task_size_by_prewhere_columns && prewhere_info
-            ? prewhere_info->prewhere_actions.getRequiredColumnsNames()
-            : columns_to_read;
-        const size_t part_compressed_bytes = getApproxSizeOfPart(*part.data_part, columns);
-
-        const auto avg_mark_bytes = std::max<size_t>(part_compressed_bytes / part_marks_count, 1);
-        const auto min_bytes_per_task = settings.merge_tree_min_bytes_per_task_for_remote_reading;
-        /// We're taking min here because number of tasks shouldn't be too low - it will make task stealing impossible.
-        /// We also create at least two tasks per thread to have something to steal from a slow thread.
-        const auto heuristic_min_marks
-            = std::min<size_t>(pool_settings.sum_marks / pool_settings.threads / 2, min_bytes_per_task / avg_mark_bytes);
-        if (heuristic_min_marks > min_marks_per_task)
-        {
-            LOG_TEST(
-                &Poco::Logger::get("MergeTreeReadPoolBase"),
-                "Increasing min_marks_per_task from {} to {} based on columns size heuristic",
-                min_marks_per_task,
-                heuristic_min_marks);
-            min_marks_per_task = heuristic_min_marks;
-        }
-    }
-
-    LOG_TEST(&Poco::Logger::get("MergeTreeReadPoolBase"), "Will use min_marks_per_task={}", min_marks_per_task);
-    return min_marks_per_task;
-}
-
-void MergeTreeReadPoolBase::fillPerPartInfos(const Settings & settings)
+void MergeTreeReadPoolBase::fillPerPartInfos()
 {
     per_part_infos.reserve(parts_ranges.size());
     is_part_on_remote_disk.reserve(parts_ranges.size());
@@ -120,9 +67,9 @@ void MergeTreeReadPoolBase::fillPerPartInfos(const Settings & settings)
         }
 
         read_task_info.part_index_in_query = part_with_ranges.part_index_in_query;
-        read_task_info.alter_conversions = MergeTreeData::getAlterConversionsForPart(part_with_ranges.data_part, mutations_snapshot, storage_snapshot->metadata, getContext());
+        read_task_info.alter_conversions = part_with_ranges.alter_conversions;
 
-        LoadedMergeTreeDataPartInfoForReader part_info(part_with_ranges.data_part, read_task_info.alter_conversions);
+        LoadedMergeTreeDataPartInfoForReader part_info(part_with_ranges.data_part, part_with_ranges.alter_conversions);
 
         read_task_info.task_columns = getReadTaskColumns(
             part_info,
@@ -154,8 +101,6 @@ void MergeTreeReadPoolBase::fillPerPartInfos(const Settings & settings)
         }
 
         is_part_on_remote_disk.push_back(part_with_ranges.data_part->isStoredOnRemoteDisk());
-        read_task_info.min_marks_per_task
-            = calculateMinMarksPerTask(part_with_ranges, column_names, prewhere_info, pool_settings, settings);
         per_part_infos.push_back(std::make_shared<MergeTreeReadTaskInfo>(std::move(read_task_info)));
     }
 }
diff --git a/src/Storages/MergeTree/MergeTreeReadPoolBase.h b/src/Storages/MergeTree/MergeTreeReadPoolBase.h
index 7f9106d476e..1b5bfec5898 100644
--- a/src/Storages/MergeTree/MergeTreeReadPoolBase.h
+++ b/src/Storages/MergeTree/MergeTreeReadPoolBase.h
@@ -6,11 +6,9 @@
 namespace DB
 {
 
-class MergeTreeReadPoolBase : public IMergeTreeReadPool, protected WithContext
+class MergeTreeReadPoolBase : public IMergeTreeReadPool
 {
 public:
-    using MutationsSnapshotPtr = MergeTreeData::MutationsSnapshotPtr;
-
     struct PoolSettings
     {
         size_t threads = 0;
@@ -25,7 +23,6 @@ public:
 
     MergeTreeReadPoolBase(
         RangesInDataParts && parts_,
-        MutationsSnapshotPtr mutations_snapshot_,
         VirtualFields shared_virtual_fields_,
         const StorageSnapshotPtr & storage_snapshot_,
         const PrewhereInfoPtr & prewhere_info_,
@@ -40,7 +37,6 @@ public:
 protected:
     /// Initialized in constructor
     const RangesInDataParts parts_ranges;
-    const MutationsSnapshotPtr mutations_snapshot;
     const VirtualFields shared_virtual_fields;
     const StorageSnapshotPtr storage_snapshot;
     const PrewhereInfoPtr prewhere_info;
@@ -52,7 +48,7 @@ protected:
     const UncompressedCachePtr owned_uncompressed_cache;
     const Block header;
 
-    void fillPerPartInfos(const Settings & settings);
+    void fillPerPartInfos();
     std::vector<size_t> getPerPartSumMarks() const;
 
     MergeTreeReadTaskPtr createTask(
diff --git a/src/Storages/MergeTree/MergeTreeReadPoolInOrder.cpp b/src/Storages/MergeTree/MergeTreeReadPoolInOrder.cpp
index 60f127acdae..4c0391ffa57 100644
--- a/src/Storages/MergeTree/MergeTreeReadPoolInOrder.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadPoolInOrder.cpp
@@ -12,7 +12,6 @@ MergeTreeReadPoolInOrder::MergeTreeReadPoolInOrder(
     bool has_limit_below_one_block_,
     MergeTreeReadType read_type_,
     RangesInDataParts parts_,
-    MutationsSnapshotPtr mutations_snapshot_,
     VirtualFields shared_virtual_fields_,
     const StorageSnapshotPtr & storage_snapshot_,
     const PrewhereInfoPtr & prewhere_info_,
@@ -23,7 +22,6 @@ MergeTreeReadPoolInOrder::MergeTreeReadPoolInOrder(
     const ContextPtr & context_)
     : MergeTreeReadPoolBase(
         std::move(parts_),
-        std::move(mutations_snapshot_),
         std::move(shared_virtual_fields_),
         storage_snapshot_,
         prewhere_info_,
diff --git a/src/Storages/MergeTree/MergeTreeReadPoolInOrder.h b/src/Storages/MergeTree/MergeTreeReadPoolInOrder.h
index a3668acb170..9fedf396a6b 100644
--- a/src/Storages/MergeTree/MergeTreeReadPoolInOrder.h
+++ b/src/Storages/MergeTree/MergeTreeReadPoolInOrder.h
@@ -11,7 +11,6 @@ public:
         bool has_limit_below_one_block_,
         MergeTreeReadType read_type_,
         RangesInDataParts parts_,
-        MutationsSnapshotPtr mutations_snapshot_,
         VirtualFields shared_virtual_fields_,
         const StorageSnapshotPtr & storage_snapshot_,
         const PrewhereInfoPtr & prewhere_info_,
diff --git a/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicas.cpp b/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicas.cpp
index c19c2baca5c..38035d97f56 100644
--- a/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicas.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicas.cpp
@@ -8,13 +8,11 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
-    extern const int BAD_ARGUMENTS;
 }
 
 MergeTreeReadPoolParallelReplicas::MergeTreeReadPoolParallelReplicas(
     ParallelReadingExtension extension_,
     RangesInDataParts && parts_,
-    MutationsSnapshotPtr mutations_snapshot_,
     VirtualFields shared_virtual_fields_,
     const StorageSnapshotPtr & storage_snapshot_,
     const PrewhereInfoPtr & prewhere_info_,
@@ -25,7 +23,6 @@ MergeTreeReadPoolParallelReplicas::MergeTreeReadPoolParallelReplicas(
     const ContextPtr & context_)
     : MergeTreeReadPoolBase(
         std::move(parts_),
-        std::move(mutations_snapshot_),
         std::move(shared_virtual_fields_),
         storage_snapshot_,
         prewhere_info_,
@@ -36,15 +33,7 @@ MergeTreeReadPoolParallelReplicas::MergeTreeReadPoolParallelReplicas(
         context_)
     , extension(std::move(extension_))
     , coordination_mode(CoordinationMode::Default)
-    , min_marks_per_task(pool_settings.min_marks_for_concurrent_read)
 {
-    for (const auto & info : per_part_infos)
-        min_marks_per_task = std::max(min_marks_per_task, info->min_marks_per_task);
-
-    if (min_marks_per_task == 0)
-        throw Exception(
-            ErrorCodes::BAD_ARGUMENTS, "Chosen number of marks to read is zero (likely because of weird interference of settings)");
-
     extension.all_callback(
         InitialAllRangesAnnouncement(coordination_mode, parts_ranges.getDescriptions(), extension.number_of_current_replica));
 }
@@ -61,7 +50,7 @@ MergeTreeReadTaskPtr MergeTreeReadPoolParallelReplicas::getTask(size_t /*task_id
         auto result = extension.callback(ParallelReadRequest(
             coordination_mode,
             extension.number_of_current_replica,
-            min_marks_per_task * pool_settings.threads,
+            pool_settings.min_marks_for_concurrent_read * pool_settings.threads,
             /// For Default coordination mode we don't need to pass part names.
             RangesInDataPartsDescription{}));
 
@@ -87,9 +76,9 @@ MergeTreeReadTaskPtr MergeTreeReadPoolParallelReplicas::getTask(size_t /*task_id
 
     MarkRanges ranges_to_read;
     size_t current_sum_marks = 0;
-    while (current_sum_marks < min_marks_per_task && !current_task.ranges.empty())
+    while (current_sum_marks < pool_settings.min_marks_for_concurrent_read && !current_task.ranges.empty())
     {
-        auto diff = min_marks_per_task - current_sum_marks;
+        auto diff = pool_settings.min_marks_for_concurrent_read - current_sum_marks;
         auto range = current_task.ranges.front();
         if (range.getNumberOfMarks() > diff)
         {
diff --git a/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicas.h b/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicas.h
index 987b7f80755..ca159edb91c 100644
--- a/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicas.h
+++ b/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicas.h
@@ -11,7 +11,6 @@ public:
     MergeTreeReadPoolParallelReplicas(
         ParallelReadingExtension extension_,
         RangesInDataParts && parts_,
-        MutationsSnapshotPtr mutations_snapshot_,
         VirtualFields shared_virtual_fields_,
         const StorageSnapshotPtr & storage_snapshot_,
         const PrewhereInfoPtr & prewhere_info_,
@@ -33,7 +32,6 @@ private:
 
     const ParallelReadingExtension extension;
     const CoordinationMode coordination_mode;
-    size_t min_marks_per_task{0};
     RangesInDataPartsDescription buffered_ranges;
     bool no_more_tasks_available{false};
     LoggerPtr log = getLogger("MergeTreeReadPoolParallelReplicas");
diff --git a/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.cpp b/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.cpp
index f726078cfc8..01c0a9f91be 100644
--- a/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.cpp
@@ -6,14 +6,12 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
-    extern const int BAD_ARGUMENTS;
 }
 
 MergeTreeReadPoolParallelReplicasInOrder::MergeTreeReadPoolParallelReplicasInOrder(
     ParallelReadingExtension extension_,
     CoordinationMode mode_,
     RangesInDataParts parts_,
-    MutationsSnapshotPtr mutations_snapshot_,
     VirtualFields shared_virtual_fields_,
     const StorageSnapshotPtr & storage_snapshot_,
     const PrewhereInfoPtr & prewhere_info_,
@@ -24,7 +22,6 @@ MergeTreeReadPoolParallelReplicasInOrder::MergeTreeReadPoolParallelReplicasInOrd
     const ContextPtr & context_)
     : MergeTreeReadPoolBase(
         std::move(parts_),
-        std::move(mutations_snapshot_),
         std::move(shared_virtual_fields_),
         storage_snapshot_,
         prewhere_info_,
@@ -35,15 +32,7 @@ MergeTreeReadPoolParallelReplicasInOrder::MergeTreeReadPoolParallelReplicasInOrd
         context_)
     , extension(std::move(extension_))
     , mode(mode_)
-    , min_marks_per_task(pool_settings.min_marks_for_concurrent_read)
 {
-    for (const auto & info : per_part_infos)
-        min_marks_per_task = std::max(min_marks_per_task, info->min_marks_per_task);
-
-    if (min_marks_per_task == 0)
-        throw Exception(
-            ErrorCodes::BAD_ARGUMENTS, "Chosen number of marks to read is zero (likely because of weird interference of settings)");
-
     for (const auto & part : parts_ranges)
         request.push_back({part.data_part->info, MarkRanges{}});
 
@@ -87,8 +76,12 @@ MergeTreeReadTaskPtr MergeTreeReadPoolParallelReplicasInOrder::getTask(size_t ta
     if (no_more_tasks)
         return nullptr;
 
-    auto response
-        = extension.callback(ParallelReadRequest(mode, extension.number_of_current_replica, min_marks_per_task * request.size(), request));
+    auto response = extension.callback(ParallelReadRequest(
+        mode,
+        extension.number_of_current_replica,
+        pool_settings.min_marks_for_concurrent_read * request.size(),
+        request
+    ));
 
     if (!response || response->description.empty() || response->finish)
     {
diff --git a/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.h b/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.h
index 98a4d95768a..4fe3f7a699c 100644
--- a/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.h
+++ b/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.h
@@ -12,7 +12,6 @@ public:
         ParallelReadingExtension extension_,
         CoordinationMode mode_,
         RangesInDataParts parts_,
-        MutationsSnapshotPtr mutations_snapshot_,
         VirtualFields shared_virtual_fields_,
         const StorageSnapshotPtr & storage_snapshot_,
         const PrewhereInfoPtr & prewhere_info_,
@@ -31,7 +30,6 @@ private:
     const ParallelReadingExtension extension;
     const CoordinationMode mode;
 
-    size_t min_marks_per_task{0};
     bool no_more_tasks{false};
     RangesInDataPartsDescription request;
     RangesInDataPartsDescription buffered_tasks;
diff --git a/src/Storages/MergeTree/MergeTreeReadTask.h b/src/Storages/MergeTree/MergeTreeReadTask.h
index e90a07e0b55..794e70a0fbb 100644
--- a/src/Storages/MergeTree/MergeTreeReadTask.h
+++ b/src/Storages/MergeTree/MergeTreeReadTask.h
@@ -68,8 +68,6 @@ struct MergeTreeReadTaskInfo
     MergeTreeBlockSizePredictorPtr shared_size_predictor;
     /// TODO: comment
     VirtualFields const_virtual_fields;
-    /// The amount of data to read per task based on size of the queried columns.
-    size_t min_marks_per_task = 0;
 };
 
 using MergeTreeReadTaskInfoPtr = std::shared_ptr<const MergeTreeReadTaskInfo>;
diff --git a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
index 7451374070c..69dc2e4b2bb 100644
--- a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
@@ -234,7 +234,7 @@ void MergeTreeReaderCompact::readPrefix(
             serialization = getSerializationInPart(name_and_type);
 
         deserialize_settings.getter = buffer_getter;
-        deserialize_settings.object_and_dynamic_read_statistics = true;
+        deserialize_settings.dynamic_read_statistics = true;
         serialization->deserializeBinaryBulkStatePrefix(deserialize_settings, deserialize_binary_bulk_state_map[name_and_type.name], nullptr);
     }
     catch (Exception & e)
diff --git a/src/Storages/MergeTree/MergeTreeReaderWide.cpp b/src/Storages/MergeTree/MergeTreeReaderWide.cpp
index 898bf5a2933..b6882fdced9 100644
--- a/src/Storages/MergeTree/MergeTreeReaderWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderWide.cpp
@@ -213,10 +213,6 @@ void MergeTreeReaderWide::addStreams(
 
     ISerialization::StreamCallback callback = [&] (const ISerialization::SubstreamPath & substream_path)
     {
-        /// Don't create streams for ephemeral subcolumns that don't store any real data.
-        if (ISerialization::isEphemeralSubcolumn(substream_path, substream_path.size()))
-            return;
-
         auto stream_name = IMergeTreeDataPart::getStreamNameForColumn(name_and_type, substream_path, data_part_info_for_read->getChecksums());
 
         /** If data file is missing then we will not try to open it.
@@ -330,7 +326,7 @@ void MergeTreeReaderWide::deserializePrefix(
     if (!deserialize_binary_bulk_state_map.contains(name))
     {
         ISerialization::DeserializeBinaryBulkSettings deserialize_settings;
-        deserialize_settings.object_and_dynamic_read_statistics = true;
+        deserialize_settings.dynamic_read_statistics = true;
         deserialize_settings.getter = [&](const ISerialization::SubstreamPath & substream_path)
         {
             return getStream(/* seek_to_start = */true, substream_path, data_part_info_for_read->getChecksums(), name_and_type, 0, /* seek_to_mark = */false, current_task_last_mark, cache);
@@ -352,10 +348,6 @@ void MergeTreeReaderWide::prefetchForColumn(
     deserializePrefix(serialization, name_and_type, current_task_last_mark, cache, deserialize_states_cache);
     auto callback = [&](const ISerialization::SubstreamPath & substream_path)
     {
-        /// Skip ephemeral subcolumns that don't store any real data.
-        if (ISerialization::isEphemeralSubcolumn(substream_path, substream_path.size()))
-            return;
-
         auto stream_name = IMergeTreeDataPart::getStreamNameForColumn(name_and_type, substream_path, data_part_info_for_read->getChecksums());
 
         if (stream_name && !prefetched_streams.contains(*stream_name))
diff --git a/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
index 1a0709faf1c..a6298aab3d9 100644
--- a/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
@@ -59,7 +59,7 @@ MergeTreeSelectProcessor::MergeTreeSelectProcessor(
 
     if (prewhere_info)
         LOG_TEST(log, "Original PREWHERE DAG:\n{}\nPREWHERE actions:\n{}",
-            prewhere_info->prewhere_actions.dumpDAG(),
+            (prewhere_info->prewhere_actions ? prewhere_info->prewhere_actions->dumpDAG(): std::string("<nullptr>")),
             (!prewhere_actions.steps.empty() ? prewhere_actions.dump() : std::string("<nullptr>")));
 }
 
@@ -80,7 +80,7 @@ PrewhereExprInfo MergeTreeSelectProcessor::getPrewhereActions(PrewhereInfoPtr pr
             PrewhereExprStep row_level_filter_step
             {
                 .type = PrewhereExprStep::Filter,
-                .actions = std::make_shared<ExpressionActions>(prewhere_info->row_level_filter->clone(), actions_settings),
+                .actions = std::make_shared<ExpressionActions>(prewhere_info->row_level_filter, actions_settings),
                 .filter_column_name = prewhere_info->row_level_column_name,
                 .remove_filter_column = true,
                 .need_filter = true,
@@ -96,7 +96,7 @@ PrewhereExprInfo MergeTreeSelectProcessor::getPrewhereActions(PrewhereInfoPtr pr
             PrewhereExprStep prewhere_step
             {
                 .type = PrewhereExprStep::Filter,
-                .actions = std::make_shared<ExpressionActions>(prewhere_info->prewhere_actions.clone(), actions_settings),
+                .actions = std::make_shared<ExpressionActions>(prewhere_info->prewhere_actions, actions_settings),
                 .filter_column_name = prewhere_info->prewhere_column_name,
                 .remove_filter_column = prewhere_info->remove_prewhere_column,
                 .need_filter = prewhere_info->need_filter,
diff --git a/src/Storages/MergeTree/MergeTreeSelectProcessor.h b/src/Storages/MergeTree/MergeTreeSelectProcessor.h
index 7a9cebbcb2e..03ca30dd5b3 100644
--- a/src/Storages/MergeTree/MergeTreeSelectProcessor.h
+++ b/src/Storages/MergeTree/MergeTreeSelectProcessor.h
@@ -48,7 +48,7 @@ public:
 
     ChunkAndProgress read();
 
-    void cancel() noexcept { is_cancelled = true; }
+    void cancel() { is_cancelled = true; }
 
     const MergeTreeReaderSettings & getSettings() const { return reader_settings; }
 
diff --git a/src/Storages/MergeTree/MergeTreeSequentialSource.cpp b/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
index 78ba02aa7ac..311720728e7 100644
--- a/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
+++ b/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
@@ -34,7 +34,6 @@ public:
         const MergeTreeData & storage_,
         const StorageSnapshotPtr & storage_snapshot_,
         MergeTreeData::DataPartPtr data_part_,
-        AlterConversionsPtr alter_conversions_,
         Names columns_to_read_,
         std::optional<MarkRanges> mark_ranges_,
         bool apply_deleted_mask,
@@ -59,9 +58,6 @@ private:
     /// Data part will not be removed if the pointer owns it
     MergeTreeData::DataPartPtr data_part;
 
-    /// Alter and mutation commands that are required to be applied to the part on-fly.
-    AlterConversionsPtr alter_conversions;
-
     /// Columns we have to read (each Block from read will contain them)
     Names columns_to_read;
 
@@ -91,7 +87,6 @@ MergeTreeSequentialSource::MergeTreeSequentialSource(
     const MergeTreeData & storage_,
     const StorageSnapshotPtr & storage_snapshot_,
     MergeTreeData::DataPartPtr data_part_,
-    AlterConversionsPtr alter_conversions_,
     Names columns_to_read_,
     std::optional<MarkRanges> mark_ranges_,
     bool apply_deleted_mask,
@@ -101,7 +96,6 @@ MergeTreeSequentialSource::MergeTreeSequentialSource(
     , storage(storage_)
     , storage_snapshot(storage_snapshot_)
     , data_part(std::move(data_part_))
-    , alter_conversions(std::move(alter_conversions_))
     , columns_to_read(std::move(columns_to_read_))
     , read_with_direct_io(read_with_direct_io_)
     , mark_ranges(std::move(mark_ranges_))
@@ -115,6 +109,8 @@ MergeTreeSequentialSource::MergeTreeSequentialSource(
         LOG_DEBUG(log, "Reading {} marks from part {}, total {} rows starting from the beginning of the part",
             data_part->getMarksCount(), data_part->name, data_part->rows_count);
 
+    auto alter_conversions = storage.getAlterConversionsForPart(data_part);
+
     /// Note, that we don't check setting collaborate_with_coordinator presence, because this source
     /// is only used in background merges.
     addTotalRowsApprox(data_part->rows_count);
@@ -303,7 +299,6 @@ Pipe createMergeTreeSequentialSource(
     const MergeTreeData & storage,
     const StorageSnapshotPtr & storage_snapshot,
     MergeTreeData::DataPartPtr data_part,
-    AlterConversionsPtr alter_conversions,
     Names columns_to_read,
     std::optional<MarkRanges> mark_ranges,
     std::shared_ptr<std::atomic<size_t>> filtered_rows_count,
@@ -320,8 +315,7 @@ Pipe createMergeTreeSequentialSource(
         columns_to_read.emplace_back(RowExistsColumn::name);
 
     auto column_part_source = std::make_shared<MergeTreeSequentialSource>(type,
-        storage, storage_snapshot, data_part, alter_conversions,
-        columns_to_read, std::move(mark_ranges),
+        storage, storage_snapshot, data_part, columns_to_read, std::move(mark_ranges),
         /*apply_deleted_mask=*/ false, read_with_direct_io, prefetch);
 
     Pipe pipe(std::move(column_part_source));
@@ -352,13 +346,9 @@ public:
         const MergeTreeData & storage_,
         const StorageSnapshotPtr & storage_snapshot_,
         MergeTreeData::DataPartPtr data_part_,
-        AlterConversionsPtr alter_conversions_,
         Names columns_to_read_,
-        std::shared_ptr<std::atomic<size_t>> filtered_rows_count_,
         bool apply_deleted_mask_,
-        std::optional<ActionsDAG> filter_,
-        bool read_with_direct_io_,
-        bool prefetch_,
+        ActionsDAGPtr filter_,
         ContextPtr context_,
         LoggerPtr log_)
         : ISourceStep(DataStream{.header = storage_snapshot_->getSampleBlockForColumns(columns_to_read_)})
@@ -366,13 +356,9 @@ public:
         , storage(storage_)
         , storage_snapshot(storage_snapshot_)
         , data_part(std::move(data_part_))
-        , alter_conversions(std::move(alter_conversions_))
         , columns_to_read(std::move(columns_to_read_))
-        , filtered_rows_count(std::move(filtered_rows_count_))
         , apply_deleted_mask(apply_deleted_mask_)
         , filter(std::move(filter_))
-        , read_with_direct_io(read_with_direct_io_)
-        , prefetch(prefetch_)
         , context(std::move(context_))
         , log(log_)
     {
@@ -389,7 +375,7 @@ public:
         {
             const auto & primary_key = storage_snapshot->metadata->getPrimaryKey();
             const Names & primary_key_column_names = primary_key.column_names;
-            KeyCondition key_condition(&*filter, context, primary_key_column_names, primary_key.expression);
+            KeyCondition key_condition(filter, context, primary_key_column_names, primary_key.expression);
             LOG_DEBUG(log, "Key condition: {}", key_condition.toString());
 
             if (!key_condition.alwaysFalse())
@@ -413,31 +399,26 @@ public:
             storage,
             storage_snapshot,
             data_part,
-            alter_conversions,
             columns_to_read,
             std::move(mark_ranges),
-            filtered_rows_count,
+            /*filtered_rows_count=*/ nullptr,
             apply_deleted_mask,
-            read_with_direct_io,
-            prefetch);
+            /*read_with_direct_io=*/ false,
+            /*prefetch=*/ false);
 
         pipeline.init(Pipe(std::move(source)));
     }
 
 private:
-    const MergeTreeSequentialSourceType type;
+    MergeTreeSequentialSourceType type;
     const MergeTreeData & storage;
-    const StorageSnapshotPtr storage_snapshot;
-    const MergeTreeData::DataPartPtr data_part;
-    const AlterConversionsPtr alter_conversions;
-    const Names columns_to_read;
-    const std::shared_ptr<std::atomic<size_t>> filtered_rows_count;
-    const bool apply_deleted_mask;
-    const std::optional<ActionsDAG> filter;
-    const bool read_with_direct_io;
-    const bool prefetch;
-    const ContextPtr context;
-    const LoggerPtr log;
+    StorageSnapshotPtr storage_snapshot;
+    MergeTreeData::DataPartPtr data_part;
+    Names columns_to_read;
+    bool apply_deleted_mask;
+    ActionsDAGPtr filter;
+    ContextPtr context;
+    LoggerPtr log;
 };
 
 void createReadFromPartStep(
@@ -446,30 +427,16 @@ void createReadFromPartStep(
     const MergeTreeData & storage,
     const StorageSnapshotPtr & storage_snapshot,
     MergeTreeData::DataPartPtr data_part,
-    AlterConversionsPtr alter_conversions,
     Names columns_to_read,
-    std::shared_ptr<std::atomic<size_t>> filtered_rows_count,
     bool apply_deleted_mask,
-    std::optional<ActionsDAG> filter,
-    bool read_with_direct_io,
-    bool prefetch,
+    ActionsDAGPtr filter,
     ContextPtr context,
     LoggerPtr log)
 {
-    auto reading = std::make_unique<ReadFromPart>(
-        type,
-        storage,
-        storage_snapshot,
-        std::move(data_part),
-        std::move(alter_conversions),
-        std::move(columns_to_read),
-        filtered_rows_count,
-        apply_deleted_mask,
-        std::move(filter),
-        read_with_direct_io,
-        prefetch,
-        std::move(context),
-        log);
+    auto reading = std::make_unique<ReadFromPart>(type,
+        storage, storage_snapshot, std::move(data_part),
+        std::move(columns_to_read), apply_deleted_mask,
+        filter, std::move(context), log);
 
     plan.addStep(std::move(reading));
 }
diff --git a/src/Storages/MergeTree/MergeTreeSequentialSource.h b/src/Storages/MergeTree/MergeTreeSequentialSource.h
index d2ed1394dbd..e6f055f776c 100644
--- a/src/Storages/MergeTree/MergeTreeSequentialSource.h
+++ b/src/Storages/MergeTree/MergeTreeSequentialSource.h
@@ -21,7 +21,6 @@ Pipe createMergeTreeSequentialSource(
     const MergeTreeData & storage,
     const StorageSnapshotPtr & storage_snapshot,
     MergeTreeData::DataPartPtr data_part,
-    AlterConversionsPtr alter_conversions,
     Names columns_to_read,
     std::optional<MarkRanges> mark_ranges,
     std::shared_ptr<std::atomic<size_t>> filtered_rows_count,
@@ -37,13 +36,9 @@ void createReadFromPartStep(
     const MergeTreeData & storage,
     const StorageSnapshotPtr & storage_snapshot,
     MergeTreeData::DataPartPtr data_part,
-    AlterConversionsPtr alter_conversions,
     Names columns_to_read,
-    std::shared_ptr<std::atomic<size_t>> filtered_rows_count,
     bool apply_deleted_mask,
-    std::optional<ActionsDAG> filter,
-    bool read_with_direct_io,
-    bool prefetch,
+    ActionsDAGPtr filter,
     ContextPtr context,
     LoggerPtr log);
 
diff --git a/src/Storages/MergeTree/MergeTreeSettings.cpp b/src/Storages/MergeTree/MergeTreeSettings.cpp
index dabb6991b0b..c968ad84936 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.cpp
+++ b/src/Storages/MergeTree/MergeTreeSettings.cpp
@@ -1,6 +1,6 @@
 #include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <Disks/DiskFomAST.h>
+#include <Disks/getOrCreateDiskFromAST.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTFunction.h>
@@ -59,19 +59,15 @@ void MergeTreeSettings::loadFromQuery(ASTStorage & storage_def, ContextPtr conte
                 CustomType custom;
                 if (name == "disk")
                 {
-                    ASTPtr value_as_custom_ast = nullptr;
                     if (value.tryGet<CustomType>(custom) && 0 == strcmp(custom.getTypeName(), "AST"))
-                        value_as_custom_ast = dynamic_cast<const FieldFromASTImpl &>(custom.getImpl()).ast;
-
-                    if (value_as_custom_ast && isDiskFunction(value_as_custom_ast))
                     {
-                        auto disk_name = DiskFomAST::createCustomDisk(value_as_custom_ast, context, is_attach);
-                        LOG_DEBUG(getLogger("MergeTreeSettings"), "Created custom disk {}", disk_name);
-                        value = disk_name;
-                    }
-                    else
-                    {
-                        DiskFomAST::ensureDiskIsNotCustom(value.safeGet<String>(), context);
+                        auto ast = dynamic_cast<const FieldFromASTImpl &>(custom.getImpl()).ast;
+                        if (ast && isDiskFunction(ast))
+                        {
+                            auto disk_name = getOrCreateDiskFromDiskAST(ast, context, is_attach);
+                            LOG_TRACE(getLogger("MergeTreeSettings"), "Created custom disk {}", disk_name);
+                            value = disk_name;
+                        }
                     }
 
                     if (has("storage_policy"))
diff --git a/src/Storages/MergeTree/MergeTreeSettings.h b/src/Storages/MergeTree/MergeTreeSettings.h
index dcb18155114..f5ada81cf55 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.h
+++ b/src/Storages/MergeTree/MergeTreeSettings.h
@@ -67,8 +67,8 @@ struct Settings;
     M(Bool, fsync_part_directory, false, "Do fsync for part directory after all part operations (writes, renames, etc.).", 0) \
     M(UInt64, non_replicated_deduplication_window, 0, "How many last blocks of hashes should be kept on disk (0 - disabled).", 0) \
     M(UInt64, max_parts_to_merge_at_once, 100, "Max amount of parts which can be merged at once (0 - disabled). Doesn't affect OPTIMIZE FINAL query.", 0) \
-    M(UInt64, merge_selecting_sleep_ms, 5000, "Minimum time to wait before trying to select parts to merge again after no parts were selected. A lower setting will trigger selecting tasks in background_schedule_pool frequently which result in large amount of requests to zookeeper in large-scale clusters", 0) \
-    M(UInt64, max_merge_selecting_sleep_ms, 60000, "Maximum time to wait before trying to select parts to merge again after no parts were selected. A lower setting will trigger selecting tasks in background_schedule_pool frequently which result in large amount of requests to zookeeper in large-scale clusters", 0) \
+    M(UInt64, merge_selecting_sleep_ms, 5000, "Maximum sleep time for merge selecting, a lower setting will trigger selecting tasks in background_schedule_pool frequently which result in large amount of requests to zookeeper in large-scale clusters", 0) \
+    M(UInt64, max_merge_selecting_sleep_ms, 60000, "Maximum sleep time for merge selecting, a lower setting will trigger selecting tasks in background_schedule_pool frequently which result in large amount of requests to zookeeper in large-scale clusters", 0) \
     M(Float, merge_selecting_sleep_slowdown_factor, 1.2f, "The sleep time for merge selecting task is multiplied by this factor when there's nothing to merge and divided when a merge was assigned", 0) \
     M(UInt64, merge_tree_clear_old_temporary_directories_interval_seconds, 60, "The period of executing the clear old temporary directories operation in background.", 0) \
     M(UInt64, merge_tree_clear_old_parts_interval_seconds, 1, "The period of executing the clear old parts operation in background.", 0) \
@@ -84,7 +84,6 @@ struct Settings;
     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) \
     M(String, merge_workload, "", "Name of workload to be used to access resources for merges", 0) \
     M(String, mutation_workload, "", "Name of workload to be used to access resources for mutations", 0) \
-    M(Milliseconds, background_task_preferred_step_execution_time_ms, 50, "Target time to execution of one step of merge or mutation. Can be exceeded if one step takes longer time", 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) \
@@ -99,8 +98,6 @@ struct Settings;
     M(Bool, add_implicit_sign_column_constraint_for_collapsing_engine, false, "If true, add implicit constraint for sign column for CollapsingMergeTree engine.", 0) \
     M(Milliseconds, sleep_before_commit_local_part_in_replicated_table_ms, 0, "For testing. Do not change it.", 0) \
     M(Bool, optimize_row_order, false, "Allow reshuffling of rows during part inserts and merges to improve the compressibility of the new part", 0) \
-    M(Bool, use_adaptive_write_buffer_for_dynamic_subcolumns, true, "Allow to use adaptive writer buffers during writing dynamic subcolumns to reduce memory usage", 0) \
-    M(UInt64, adaptive_write_buffer_initial_size, 16 * 1024, "Initial size of an adaptive write buffer", 0) \
     \
     /* Part removal settings. */ \
     M(UInt64, simultaneous_parts_removal_limit, 0, "Maximum number of parts to remove during one CleanupThread iteration (0 means unlimited).", 0) \
@@ -218,8 +215,6 @@ struct Settings;
     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) \
-    M(LightweightMutationProjectionMode, lightweight_mutation_projection_mode, LightweightMutationProjectionMode::THROW, "When lightweight delete happens on a table with projection(s), the possible operations include throw the exception as projection exists, or drop projections of this table's relevant parts, or rebuild the projections.", 0) \
-    M(DeduplicateMergeProjectionMode, deduplicate_merge_projection_mode, DeduplicateMergeProjectionMode::THROW, "Whether to allow create projection for the table with non-classic MergeTree, if allowed, what is the action when merge, drop or rebuild.", 0) \
 
 #define MAKE_OBSOLETE_MERGE_TREE_SETTING(M, TYPE, NAME, DEFAULT) \
     M(TYPE, NAME, DEFAULT, "Obsolete setting, does nothing.", BaseSettingsHelpers::Flags::OBSOLETE)
diff --git a/src/Storages/MergeTree/MergeTreeSink.cpp b/src/Storages/MergeTree/MergeTreeSink.cpp
index 459c5d5f243..0ca4276b858 100644
--- a/src/Storages/MergeTree/MergeTreeSink.cpp
+++ b/src/Storages/MergeTree/MergeTreeSink.cpp
@@ -34,18 +34,7 @@ struct MergeTreeSink::DelayedChunk
 };
 
 
-MergeTreeSink::~MergeTreeSink()
-{
-    if (!delayed_chunk)
-        return;
-
-    for (auto & partition : delayed_chunk->partitions)
-    {
-        partition.temp_part.cancel();
-    }
-
-    delayed_chunk.reset();
-}
+MergeTreeSink::~MergeTreeSink() = default;
 
 MergeTreeSink::MergeTreeSink(
     StorageMergeTree & storage_,
@@ -70,10 +59,13 @@ void MergeTreeSink::onStart()
 
 void MergeTreeSink::onFinish()
 {
-    chassert(!isCancelled());
     finishDelayedChunk();
 }
 
+void MergeTreeSink::onCancel()
+{
+}
+
 void MergeTreeSink::consume(Chunk & chunk)
 {
     if (num_blocks_processed > 0)
diff --git a/src/Storages/MergeTree/MergeTreeSink.h b/src/Storages/MergeTree/MergeTreeSink.h
index 8f065773d6a..90976020d52 100644
--- a/src/Storages/MergeTree/MergeTreeSink.h
+++ b/src/Storages/MergeTree/MergeTreeSink.h
@@ -28,6 +28,7 @@ public:
     void consume(Chunk & chunk) override;
     void onStart() override;
     void onFinish() override;
+    void onCancel() override;
 
 private:
     StorageMergeTree & storage;
diff --git a/src/Storages/MergeTree/MergeTreeSource.cpp b/src/Storages/MergeTree/MergeTreeSource.cpp
index 380c47723bc..e323b9f9ee7 100644
--- a/src/Storages/MergeTree/MergeTreeSource.cpp
+++ b/src/Storages/MergeTree/MergeTreeSource.cpp
@@ -149,7 +149,7 @@ std::string MergeTreeSource::getName() const
     return processor->getName();
 }
 
-void MergeTreeSource::onCancel() noexcept
+void MergeTreeSource::onCancel()
 {
     processor->cancel();
 }
diff --git a/src/Storages/MergeTree/MergeTreeSource.h b/src/Storages/MergeTree/MergeTreeSource.h
index 7506af4f9b8..fc39b4f9b09 100644
--- a/src/Storages/MergeTree/MergeTreeSource.h
+++ b/src/Storages/MergeTree/MergeTreeSource.h
@@ -26,7 +26,7 @@ public:
 protected:
     std::optional<Chunk> tryGenerate() override;
 
-    void onCancel() noexcept override;
+    void onCancel() override;
 
 private:
     MergeTreeSelectProcessorPtr processor;
diff --git a/src/Storages/MergeTree/MergeTreeSplitPrewhereIntoReadSteps.cpp b/src/Storages/MergeTree/MergeTreeSplitPrewhereIntoReadSteps.cpp
index 9c82817e8cb..43e3b0c505a 100644
--- a/src/Storages/MergeTree/MergeTreeSplitPrewhereIntoReadSteps.cpp
+++ b/src/Storages/MergeTree/MergeTreeSplitPrewhereIntoReadSteps.cpp
@@ -10,9 +10,6 @@
 namespace DB
 {
 
-class ActionsDAG;
-using ActionsDAGPtr = std::unique_ptr<ActionsDAG>;
-
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
@@ -53,7 +50,7 @@ void fillRequiredColumns(const ActionsDAG::Node * node, std::unordered_map<const
 /// This allows to avoid cloning the same sub-DAG into multiple step DAGs but reference previously cloned nodes from earlier steps.
 struct DAGNodeRef
 {
-    ActionsDAG * dag;
+    ActionsDAGPtr dag;
     const ActionsDAG::Node * node;
 };
 
@@ -65,7 +62,7 @@ using NodeNameToLastUsedStepMap = std::unordered_map<String, size_t>;
 const ActionsDAG::Node & addClonedDAGToDAG(
     size_t step,
     const ActionsDAG::Node * original_dag_node,
-    const ActionsDAGPtr & new_dag,
+    ActionsDAGPtr new_dag,
     OriginalToNewNodeMap & node_remap,
     NodeNameToLastUsedStepMap & node_to_step_map)
 {
@@ -75,7 +72,7 @@ const ActionsDAG::Node & addClonedDAGToDAG(
     {
         /// If the node is already in the new DAG, return it
         const auto & node_ref = node_remap.at(node_name);
-        if (node_ref.dag == new_dag.get())
+        if (node_ref.dag == new_dag)
             return *node_ref.node;
 
         /// If the node is known from the previous steps, add it as an input, except for constants
@@ -83,7 +80,7 @@ const ActionsDAG::Node & addClonedDAGToDAG(
         {
             node_ref.dag->addOrReplaceInOutputs(*node_ref.node);
             const auto & new_node = new_dag->addInput(node_ref.node->result_name, node_ref.node->result_type);
-            node_remap[node_name] = {new_dag.get(), &new_node}; /// TODO: here we update the node reference. Is it always correct?
+            node_remap[node_name] = {new_dag, &new_node}; /// TODO: here we update the node reference. Is it always correct?
 
             /// Remember the index of the last step which reuses this node.
             /// We cannot remove this node from the outputs before that step.
@@ -96,7 +93,7 @@ const ActionsDAG::Node & addClonedDAGToDAG(
     if (original_dag_node->type == ActionsDAG::ActionType::INPUT)
     {
         const auto & new_node = new_dag->addInput(original_dag_node->result_name, original_dag_node->result_type);
-        node_remap[node_name] = {new_dag.get(), &new_node};
+        node_remap[node_name] = {new_dag, &new_node};
         return new_node;
     }
 
@@ -105,7 +102,7 @@ const ActionsDAG::Node & addClonedDAGToDAG(
     {
         const auto & new_node = new_dag->addColumn(
             ColumnWithTypeAndName(original_dag_node->column, original_dag_node->result_type, original_dag_node->result_name));
-        node_remap[node_name] = {new_dag.get(), &new_node};
+        node_remap[node_name] = {new_dag, &new_node};
         return new_node;
     }
 
@@ -113,7 +110,7 @@ const ActionsDAG::Node & addClonedDAGToDAG(
     {
         const auto & alias_child = addClonedDAGToDAG(step, original_dag_node->children[0], new_dag, node_remap, node_to_step_map);
         const auto & new_node = new_dag->addAlias(alias_child, original_dag_node->result_name);
-        node_remap[node_name] = {new_dag.get(), &new_node};
+        node_remap[node_name] = {new_dag, &new_node};
         return new_node;
     }
 
@@ -128,7 +125,7 @@ const ActionsDAG::Node & addClonedDAGToDAG(
         }
 
         const auto & new_node = new_dag->addFunction(original_dag_node->function_base, new_children, original_dag_node->result_name);
-        node_remap[node_name] = {new_dag.get(), &new_node};
+        node_remap[node_name] = {new_dag, &new_node};
         return new_node;
     }
 
@@ -136,13 +133,13 @@ const ActionsDAG::Node & addClonedDAGToDAG(
 }
 
 const ActionsDAG::Node & addFunction(
-        const ActionsDAGPtr & new_dag,
+        ActionsDAGPtr new_dag,
         const FunctionOverloadResolverPtr & function,
         ActionsDAG::NodeRawConstPtrs children,
         OriginalToNewNodeMap & node_remap)
 {
     const auto & new_node = new_dag->addFunction(function, children, "");
-    node_remap[new_node.result_name] = {new_dag.get(), &new_node};
+    node_remap[new_node.result_name] = {new_dag, &new_node};
     return new_node;
 }
 
@@ -150,17 +147,25 @@ const ActionsDAG::Node & addFunction(
 /// This is different from ActionsDAG::addCast() because it set the name equal to the original name effectively hiding the value before cast,
 /// but it might be required for further steps with its original uncasted type.
 const ActionsDAG::Node & addCast(
-        const ActionsDAGPtr & dag,
+        ActionsDAGPtr dag,
         const ActionsDAG::Node & node_to_cast,
-        const DataTypePtr & to_type,
+        const String & type_name,
         OriginalToNewNodeMap & node_remap)
 {
-    if (!node_to_cast.result_type->equals(*to_type))
+    if (node_to_cast.result_type->getName() == type_name)
         return node_to_cast;
 
-    const auto & new_node = dag->addCast(node_to_cast, to_type, {});
-    node_remap[new_node.result_name] = {dag.get(), &new_node};
-    return new_node;
+    Field cast_type_constant_value(type_name);
+
+    ColumnWithTypeAndName column;
+    column.column = DataTypeString().createColumnConst(0, cast_type_constant_value);
+    column.type = std::make_shared<DataTypeString>();
+
+    const auto * cast_type_constant_node = &dag->addColumn(std::move(column));
+    ActionsDAG::NodeRawConstPtrs children = {&node_to_cast, cast_type_constant_node};
+    FunctionOverloadResolverPtr func_builder_cast = createInternalCastOverloadResolver(CastType::nonAccurate, {});
+
+    return addFunction(dag, func_builder_cast, std::move(children), node_remap);
 }
 
 /// Normalizes the filter node by adding AND with a constant true.
@@ -168,7 +173,7 @@ const ActionsDAG::Node & addCast(
 /// 1. produces a result with the proper Nullable or non-Nullable UInt8 type and
 /// 2. makes sure that the result contains only 0 or 1 values even if the source column contains non-boolean values.
 const ActionsDAG::Node & addAndTrue(
-    const ActionsDAGPtr & dag,
+    ActionsDAGPtr dag,
     const ActionsDAG::Node & filter_node_to_normalize,
     OriginalToNewNodeMap & node_remap)
 {
@@ -208,11 +213,11 @@ const ActionsDAG::Node & addAndTrue(
 /// 8. Add computation of the remaining outputs to the last step with the procedure similar to 4
 bool tryBuildPrewhereSteps(PrewhereInfoPtr prewhere_info, const ExpressionActionsSettings & actions_settings, PrewhereExprInfo & prewhere)
 {
-    if (!prewhere_info)
+    if (!prewhere_info || !prewhere_info->prewhere_actions)
         return true;
 
     /// 1. List all condition nodes that are combined with AND into PREWHERE condition
-    const auto & condition_root = prewhere_info->prewhere_actions.findInOutputs(prewhere_info->prewhere_column_name);
+    const auto & condition_root = prewhere_info->prewhere_actions->findInOutputs(prewhere_info->prewhere_column_name);
     const bool is_conjunction = (condition_root.type == ActionsDAG::ActionType::FUNCTION && condition_root.function_base->getName() == "and");
     if (!is_conjunction)
         return false;
@@ -253,7 +258,7 @@ bool tryBuildPrewhereSteps(PrewhereInfoPtr prewhere_info, const ExpressionAction
     for (size_t step_index = 0; step_index < condition_groups.size(); ++step_index)
     {
         const auto & condition_group = condition_groups[step_index];
-        ActionsDAGPtr step_dag = std::make_unique<ActionsDAG>();
+        ActionsDAGPtr step_dag = std::make_shared<ActionsDAG>();
         String result_name;
 
         std::vector<const ActionsDAG::Node *> new_condition_nodes;
@@ -294,11 +299,11 @@ bool tryBuildPrewhereSteps(PrewhereInfoPtr prewhere_info, const ExpressionAction
             }
         }
 
-        steps.push_back({std::move(step_dag), result_name});
+        steps.push_back({step_dag, result_name});
     }
 
     /// 6. Find all outputs of the original DAG
-    auto original_outputs = prewhere_info->prewhere_actions.getOutputs();
+    auto original_outputs = prewhere_info->prewhere_actions->getOutputs();
     /// 7. Find all outputs that were computed in the already built DAGs, mark these nodes as outputs in the steps where they were computed
     /// 8. Add computation of the remaining outputs to the last step with the procedure similar to 4
     NameSet all_output_names;
@@ -324,7 +329,7 @@ bool tryBuildPrewhereSteps(PrewhereInfoPtr prewhere_info, const ExpressionAction
             /// Build AND(last_step_result_node, true)
             const auto & and_node = addAndTrue(last_step_dag, *last_step_result_node_info.node, node_remap);
             /// Build CAST(and_node, type of PREWHERE column)
-            const auto & cast_node = addCast(last_step_dag, and_node, output->result_type, node_remap);
+            const auto & cast_node = addCast(last_step_dag, and_node, output->result_type->getName(), node_remap);
             /// Add alias for the result with the name of the PREWHERE column
             const auto & prewhere_result_node = last_step_dag->addAlias(cast_node, output->result_name);
             last_step_dag->addOrReplaceInOutputs(prewhere_result_node);
@@ -340,11 +345,11 @@ bool tryBuildPrewhereSteps(PrewhereInfoPtr prewhere_info, const ExpressionAction
     {
         for (size_t step_index = 0; step_index < steps.size(); ++step_index)
         {
-            auto & step = steps[step_index];
+            const auto & step = steps[step_index];
             PrewhereExprStep new_step
             {
                 .type = PrewhereExprStep::Filter,
-                .actions = std::make_shared<ExpressionActions>(std::move(*step.actions), actions_settings),
+                .actions = std::make_shared<ExpressionActions>(step.actions, actions_settings),
                 .filter_column_name = step.column_name,
                 /// Don't remove if it's in the list of original outputs
                 .remove_filter_column =
diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
index f0c26c302e1..44ab12bde2a 100644
--- a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
+++ b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
@@ -113,7 +113,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));
 }
 
-MergeTreeWhereOptimizer::FilterActionsOptimizeResult MergeTreeWhereOptimizer::optimize(const ActionsDAG & filter_dag,
+MergeTreeWhereOptimizer::FilterActionsOptimizeResult MergeTreeWhereOptimizer::optimize(const ActionsDAGPtr & filter_dag,
     const std::string & filter_column_name,
     const ContextPtr & context,
     bool is_final)
@@ -127,7 +127,7 @@ MergeTreeWhereOptimizer::FilterActionsOptimizeResult MergeTreeWhereOptimizer::op
     where_optimizer_context.use_statistics = context->getSettingsRef().allow_statistics_optimize;
 
     RPNBuilderTreeContext tree_context(context);
-    RPNBuilderTreeNode node(&filter_dag.findInOutputs(filter_column_name), tree_context);
+    RPNBuilderTreeNode node(&filter_dag->findInOutputs(filter_column_name), tree_context);
 
     auto optimize_result = optimizeImpl(node, where_optimizer_context);
     if (!optimize_result)
@@ -222,17 +222,17 @@ static bool isConditionGood(const RPNBuilderTreeNode & condition, const NameSet
     /// check the value with respect to threshold
     if (type == Field::Types::UInt64)
     {
-        const auto value = output_value.safeGet<UInt64>();
+        const auto value = output_value.get<UInt64>();
         return value > threshold;
     }
     else if (type == Field::Types::Int64)
     {
-        const auto value = output_value.safeGet<Int64>();
+        const auto value = output_value.get<Int64>();
         return value < -threshold || threshold < value;
     }
     else if (type == Field::Types::Float64)
     {
-        const auto value = output_value.safeGet<Float64>();
+        const auto value = output_value.get<Float64>();
         return value < -threshold || threshold < value;
     }
 
diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.h b/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
index a3d035675c6..ba6b4660924 100644
--- a/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
+++ b/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
@@ -52,7 +52,7 @@ public:
         bool fully_moved_to_prewhere = false;
     };
 
-    FilterActionsOptimizeResult optimize(const ActionsDAG & filter_dag,
+    FilterActionsOptimizeResult optimize(const ActionsDAGPtr & filter_dag,
         const std::string & filter_column_name,
         const ContextPtr & context,
         bool is_final);
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index 4ee68580d3f..38869aebaa5 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -34,7 +34,7 @@ MergedBlockOutputStream::MergedBlockOutputStream(
     , write_settings(write_settings_)
 {
     MergeTreeWriterSettings writer_settings(
-        data_part->storage.getContext()->getSettingsRef(),
+        data_part->storage.getContext()->getSettings(),
         write_settings,
         storage_settings,
         data_part->index_granularity_info.mark_type.adaptive,
diff --git a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
index 05cd77dcd40..c167ac87317 100644
--- a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
@@ -23,7 +23,7 @@ MergedColumnOnlyOutputStream::MergedColumnOnlyOutputStream(
     const MergeTreeIndexGranularityInfo * index_granularity_info)
     : IMergedBlockOutputStream(data_part->storage.getSettings(), data_part->getDataPartStoragePtr(), metadata_snapshot_, columns_list_, /*reset_columns=*/ true)
 {
-    const auto & global_settings = data_part->storage.getContext()->getSettingsRef();
+    const auto & global_settings = data_part->storage.getContext()->getSettings();
 
     MergeTreeWriterSettings writer_settings(
         global_settings,
diff --git a/src/Storages/MergeTree/MutateFromLogEntryTask.cpp b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
index 56f68fd265a..73084f487b9 100644
--- a/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
+++ b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
@@ -254,7 +254,6 @@ bool MutateFromLogEntryTask::finalize(ReplicatedMergeMutateTaskBase::PartLogWrit
             LOG_ERROR(log, "{}. Data after mutation is not byte-identical to data on another replicas. "
                            "We will download merged part from replica to force byte-identical result.", getCurrentExceptionMessage(false));
 
-            mutate_task->updateProfileEvents();
             write_part_log(ExecutionStatus::fromCurrentException("", true));
 
             if (storage.getSettings()->detach_not_byte_identical_parts)
@@ -282,7 +281,6 @@ bool MutateFromLogEntryTask::finalize(ReplicatedMergeMutateTaskBase::PartLogWrit
          */
     finish_callback = [storage_ptr = &storage]() { storage_ptr->merge_selecting_task->schedule(); };
     ProfileEvents::increment(ProfileEvents::ReplicatedPartMutations);
-    mutate_task->updateProfileEvents();
     write_part_log({});
 
     return true;
diff --git a/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp b/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp
index 10461eb5942..9aec074deae 100644
--- a/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp
+++ b/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp
@@ -102,7 +102,6 @@ bool MutatePlainMergeTreeTask::executeStep()
                 transaction.commit();
 
                 storage.updateMutationEntriesErrors(future_part, true, "");
-                mutate_task->updateProfileEvents();
                 write_part_log({});
 
                 state = State::NEED_FINISH;
@@ -115,7 +114,6 @@ bool MutatePlainMergeTreeTask::executeStep()
                 PreformattedMessage exception_message = getCurrentExceptionMessageAndPattern(/* with_stacktrace */ false);
                 LOG_ERROR(getLogger("MutatePlainMergeTreeTask"), exception_message);
                 storage.updateMutationEntriesErrors(future_part, false, exception_message.text);
-                mutate_task->updateProfileEvents();
                 write_part_log(ExecutionStatus::fromCurrentException("", true));
                 tryLogCurrentException(__PRETTY_FUNCTION__);
                 return false;
diff --git a/src/Storages/MergeTree/MutateTask.cpp b/src/Storages/MergeTree/MutateTask.cpp
index 03c7c1b3024..5fcf699de59 100644
--- a/src/Storages/MergeTree/MutateTask.cpp
+++ b/src/Storages/MergeTree/MutateTask.cpp
@@ -24,7 +24,6 @@
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
 #include <Storages/MergeTree/MergeTreeDataWriter.h>
-#include <Storages/MergeTree/MergeProjectionPartsTask.h>
 #include <Storages/MutationCommands.h>
 #include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
 #include <Storages/MergeTree/MergeTreeIndexFullText.h>
@@ -39,13 +38,7 @@
 
 namespace ProfileEvents
 {
-    extern const Event MutationTotalParts;
-    extern const Event MutationUntouchedParts;
-    extern const Event MutationTotalMilliseconds;
-    extern const Event MutationExecuteMilliseconds;
-    extern const Event MutationAllPartColumns;
-    extern const Event MutationSomePartColumns;
-    extern const Event MutateTaskProjectionsCalculationMicroseconds;
+extern const Event MutateTaskProjectionsCalculationMicroseconds;
 }
 
 namespace CurrentMetrics
@@ -115,7 +108,6 @@ static UInt64 getExistingRowsCount(const Block & block)
 static void splitAndModifyMutationCommands(
     MergeTreeData::DataPartPtr part,
     StorageMetadataPtr metadata_snapshot,
-    AlterConversionsPtr alter_conversions,
     const MutationCommands & commands,
     MutationCommands & for_interpreter,
     MutationCommands & for_file_renames,
@@ -181,6 +173,8 @@ static void splitAndModifyMutationCommands(
 
         }
 
+        auto alter_conversions = part->storage.getAlterConversionsForPart(part);
+
         /// We don't add renames from commands, instead we take them from rename_map.
         /// It's important because required renames depend not only on part's data version (i.e. mutation version)
         /// but also on part's metadata version. Why we have such logic only for renames? Because all other types of alter
@@ -296,6 +290,7 @@ static void splitAndModifyMutationCommands(
             }
         }
 
+        auto alter_conversions = part->storage.getAlterConversionsForPart(part);
         /// We don't add renames from commands, instead we take them from rename_map.
         /// It's important because required renames depend not only on part's data version (i.e. mutation version)
         /// but also on part's metadata version. Why we have such logic only for renames? Because all other types of alter
@@ -551,7 +546,7 @@ static std::set<ColumnStatisticsPtr> getStatisticsToRecalculate(const StorageMet
     {
         if (!col_desc.statistics.empty() && materialized_stats.contains(col_desc.name))
         {
-            stats_to_recalc.insert(stats_factory.get(col_desc));
+            stats_to_recalc.insert(stats_factory.get(col_desc.statistics));
         }
     }
     return stats_to_recalc;
@@ -664,7 +659,7 @@ static NameSet collectFilesToSkip(
     const Block & updated_header,
     const std::set<MergeTreeIndexPtr> & indices_to_recalc,
     const String & mrk_extension,
-    const std::set<ProjectionDescriptionRawPtr> & projections_to_skip,
+    const std::set<ProjectionDescriptionRawPtr> & projections_to_recalc,
     const std::set<ColumnStatisticsPtr> & stats_to_recalc)
 {
     NameSet files_to_skip = source_part->getFileNamesWithoutChecksums();
@@ -689,7 +684,7 @@ static NameSet collectFilesToSkip(
         }
     }
 
-    for (const auto & projection : projections_to_skip)
+    for (const auto & projection : projections_to_recalc)
         files_to_skip.insert(projection->getDirectoryName());
 
     for (const auto & stat : stats_to_recalc)
@@ -1051,12 +1046,141 @@ struct MutationContext
 
     /// Whether we need to count lightweight delete rows in this mutation
     bool count_lightweight_deleted_rows;
-    UInt64 execute_elapsed_ns = 0;
 };
 
 using MutationContextPtr = std::shared_ptr<MutationContext>;
 
 
+class MergeProjectionPartsTask : public IExecutableTask
+{
+public:
+
+    MergeProjectionPartsTask(
+        String name_,
+        MergeTreeData::MutableDataPartsVector && parts_,
+        const ProjectionDescription & projection_,
+        size_t & block_num_,
+        MutationContextPtr ctx_)
+        : name(std::move(name_))
+        , parts(std::move(parts_))
+        , projection(projection_)
+        , block_num(block_num_)
+        , ctx(ctx_)
+        , 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);
+        }
+
+    void onCompleted() override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
+    StorageID getStorageID() const override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
+    Priority getPriority() const override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
+    String getQueryId() const override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
+
+    bool executeStep() override
+    {
+        auto & current_level_parts = level_parts[current_level];
+        auto & next_level_parts = level_parts[next_level];
+
+        MergeTreeData::MutableDataPartsVector selected_parts;
+        while (selected_parts.size() < max_parts_to_merge_in_one_level && !current_level_parts.empty())
+        {
+            selected_parts.push_back(std::move(current_level_parts.back()));
+            current_level_parts.pop_back();
+        }
+
+        if (selected_parts.empty())
+        {
+            if (next_level_parts.empty())
+            {
+                LOG_WARNING(log, "There is no projection parts merged");
+
+                /// Task is finished
+                return false;
+            }
+            current_level = next_level;
+            ++next_level;
+        }
+        else if (selected_parts.size() == 1)
+        {
+            if (next_level_parts.empty())
+            {
+                LOG_DEBUG(log, "Merged a projection part in level {}", current_level);
+                selected_parts[0]->renameTo(projection.name + ".proj", true);
+                selected_parts[0]->setName(projection.name);
+                selected_parts[0]->is_temp = false;
+                ctx->new_data_part->addProjectionPart(name, std::move(selected_parts[0]));
+
+                /// Task is finished
+                return false;
+            }
+            else
+            {
+                LOG_DEBUG(log, "Forwarded part {} in level {} to next level", selected_parts[0]->name, current_level);
+                next_level_parts.push_back(std::move(selected_parts[0]));
+            }
+        }
+        else if (selected_parts.size() > 1)
+        {
+            // Generate a unique part name
+            ++block_num;
+            auto projection_future_part = std::make_shared<FutureMergedMutatedPart>();
+            MergeTreeData::DataPartsVector const_selected_parts(
+                std::make_move_iterator(selected_parts.begin()), std::make_move_iterator(selected_parts.end()));
+            projection_future_part->assign(std::move(const_selected_parts));
+            projection_future_part->name = fmt::format("{}_{}", projection.name, ++block_num);
+            projection_future_part->part_info = {"all", 0, 0, 0};
+
+            MergeTreeData::MergingParams projection_merging_params;
+            projection_merging_params.mode = MergeTreeData::MergingParams::Ordinary;
+            if (projection.type == ProjectionDescription::Type::Aggregate)
+                projection_merging_params.mode = MergeTreeData::MergingParams::Aggregating;
+
+            LOG_DEBUG(log, "Merged {} parts in level {} to {}", selected_parts.size(), current_level, projection_future_part->name);
+            auto tmp_part_merge_task = ctx->mutator->mergePartsToTemporaryPart(
+                projection_future_part,
+                projection.metadata,
+                ctx->mutate_entry,
+                std::make_unique<MergeListElement>((*ctx->mutate_entry)->table_id, projection_future_part, ctx->context),
+                *ctx->holder,
+                ctx->time_of_mutation,
+                ctx->context,
+                ctx->space_reservation,
+                false, // TODO Do we need deduplicate for projections
+                {},
+                false, // no cleanup
+                projection_merging_params,
+                NO_TRANSACTION_PTR,
+                /* need_prefix */ true,
+                ctx->new_data_part.get(),
+                ".tmp_proj");
+
+            next_level_parts.push_back(executeHere(tmp_part_merge_task));
+            next_level_parts.back()->is_temp = true;
+        }
+
+        /// Need execute again
+        return true;
+    }
+
+private:
+    String name;
+    MergeTreeData::MutableDataPartsVector parts;
+    const ProjectionDescription & projection;
+    size_t & block_num;
+    MutationContextPtr ctx;
+
+    LoggerPtr log;
+
+    std::map<size_t, MergeTreeData::MutableDataPartsVector> level_parts;
+    size_t current_level = 0;
+    size_t next_level = 1;
+
+    /// TODO(nikitamikhaylov): make this constant a setting
+    static constexpr size_t max_parts_to_merge_in_one_level = 10;
+};
+
+
 // This class is responsible for:
 // 1. get projection pipeline and a sink to write parts
 // 2. build an executor that can write block to the input stream (actually we can write through it to generate as many parts as possible)
@@ -1126,8 +1250,6 @@ public:
 private:
     void prepare();
     bool mutateOriginalPartAndPrepareProjections();
-    void writeTempProjectionPart(size_t projection_idx, Chunk chunk);
-    void finalizeTempProjections();
     bool iterateThroughAllProjections();
     void constructTaskForProjectionPartsMerge();
     void finalize();
@@ -1178,22 +1300,10 @@ void PartMergerWriter::prepare()
 
 bool PartMergerWriter::mutateOriginalPartAndPrepareProjections()
 {
-    Stopwatch watch(CLOCK_MONOTONIC_COARSE);
-    UInt64 step_time_ms = ctx->data->getSettings()->background_task_preferred_step_execution_time_ms.totalMilliseconds();
-
-    do
+    Block cur_block;
+    Block projection_header;
+    if (MutationHelpers::checkOperationIsNotCanceled(*ctx->merges_blocker, ctx->mutate_entry) && ctx->mutating_executor->pull(cur_block))
     {
-        Block cur_block;
-        Block projection_header;
-
-        MutationHelpers::checkOperationIsNotCanceled(*ctx->merges_blocker, ctx->mutate_entry);
-
-        if (!ctx->mutating_executor->pull(cur_block))
-        {
-            finalizeTempProjections();
-            return false;
-        }
-
         if (ctx->minmax_idx)
             ctx->minmax_idx->update(cur_block, MergeTreeData::getMinMaxColumnsNames(ctx->metadata_snapshot->getPartitionKey()));
 
@@ -1205,56 +1315,46 @@ bool PartMergerWriter::mutateOriginalPartAndPrepareProjections()
 
         for (size_t i = 0, size = ctx->projections_to_build.size(); i < size; ++i)
         {
-            Chunk squashed_chunk;
+            const auto & projection = *ctx->projections_to_build[i];
 
-            {
-                ProfileEventTimeIncrement<Microseconds> projection_watch(ProfileEvents::MutateTaskProjectionsCalculationMicroseconds);
-                Block block_to_squash = ctx->projections_to_build[i]->calculate(cur_block, ctx->context);
-
-                projection_squashes[i].setHeader(block_to_squash.cloneEmpty());
-                squashed_chunk = Squashing::squash(projection_squashes[i].add({block_to_squash.getColumns(), block_to_squash.rows()}));
-            }
+            ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::MutateTaskProjectionsCalculationMicroseconds);
+            Block block_to_squash = projection.calculate(cur_block, ctx->context);
+            projection_squashes[i].setHeader(block_to_squash.cloneEmpty());
 
+            Chunk squashed_chunk = Squashing::squash(projection_squashes[i].add({block_to_squash.getColumns(), block_to_squash.rows()}));
             if (squashed_chunk)
-                writeTempProjectionPart(i, std::move(squashed_chunk));
+            {
+                auto result = projection_squashes[i].getHeader().cloneWithColumns(squashed_chunk.detachColumns());
+                auto tmp_part = MergeTreeDataWriter::writeTempProjectionPart(
+                    *ctx->data, ctx->log, result, projection, ctx->new_data_part.get(), ++block_num);
+                tmp_part.finalize();
+                tmp_part.part->getDataPartStorage().commitTransaction();
+                projection_parts[projection.name].emplace_back(std::move(tmp_part.part));
+            }
         }
 
         (*ctx->mutate_entry)->rows_written += cur_block.rows();
         (*ctx->mutate_entry)->bytes_written_uncompressed += cur_block.bytes();
-    } while (watch.elapsedMilliseconds() < step_time_ms);
 
-    /// Need execute again
-    return true;
-}
+        /// Need execute again
+        return true;
+    }
 
-void PartMergerWriter::writeTempProjectionPart(size_t projection_idx, Chunk chunk)
-{
-    const auto & projection = *ctx->projections_to_build[projection_idx];
-    const auto & projection_plan = projection_squashes[projection_idx];
-
-    auto result = projection_plan.getHeader().cloneWithColumns(chunk.detachColumns());
-
-    auto tmp_part = MergeTreeDataWriter::writeTempProjectionPart(
-        *ctx->data,
-        ctx->log,
-        result,
-        projection,
-        ctx->new_data_part.get(),
-        ++block_num);
-
-    tmp_part.finalize();
-    tmp_part.part->getDataPartStorage().commitTransaction();
-    projection_parts[projection.name].emplace_back(std::move(tmp_part.part));
-}
-
-void PartMergerWriter::finalizeTempProjections()
-{
     // Write the last block
     for (size_t i = 0, size = ctx->projections_to_build.size(); i < size; ++i)
     {
-        auto squashed_chunk = Squashing::squash(projection_squashes[i].flush());
+        const auto & projection = *ctx->projections_to_build[i];
+        auto & projection_squash_plan = projection_squashes[i];
+        auto squashed_chunk = Squashing::squash(projection_squash_plan.flush());
         if (squashed_chunk)
-            writeTempProjectionPart(i, std::move(squashed_chunk));
+        {
+            auto result = projection_squash_plan.getHeader().cloneWithColumns(squashed_chunk.detachColumns());
+            auto temp_part = MergeTreeDataWriter::writeTempProjectionPart(
+                *ctx->data, ctx->log, result, projection, ctx->new_data_part.get(), ++block_num);
+            temp_part.finalize();
+            temp_part.part->getDataPartStorage().commitTransaction();
+            projection_parts[projection.name].emplace_back(std::move(temp_part.part));
+        }
     }
 
     projection_parts_iterator = std::make_move_iterator(projection_parts.begin());
@@ -1262,8 +1362,12 @@ void PartMergerWriter::finalizeTempProjections()
     /// Maybe there are no projections ?
     if (projection_parts_iterator != std::make_move_iterator(projection_parts.end()))
         constructTaskForProjectionPartsMerge();
+
+    /// Let's move on to the next stage
+    return false;
 }
 
+
 void PartMergerWriter::constructTaskForProjectionPartsMerge()
 {
     auto && [name, parts] = *projection_parts_iterator;
@@ -1275,13 +1379,7 @@ void PartMergerWriter::constructTaskForProjectionPartsMerge()
         std::move(parts),
         projection,
         block_num,
-        ctx->context,
-        ctx->holder,
-        ctx->mutator,
-        ctx->mutate_entry,
-        ctx->time_of_mutation,
-        ctx->new_data_part,
-        ctx->space_reservation
+        ctx
     );
 }
 
@@ -1432,7 +1530,7 @@ private:
 
             if (ctx->materialized_statistics.contains(col.name))
             {
-                stats_to_rewrite.push_back(MergeTreeStatisticsFactory::instance().get(col));
+                stats_to_rewrite.push_back(MergeTreeStatisticsFactory::instance().get(col.statistics));
             }
             else
             {
@@ -1456,10 +1554,6 @@ private:
                 removed_projections.insert(command.column_name);
         }
 
-        bool lightweight_delete_mode = ctx->updated_header.has(RowExistsColumn::name);
-        bool lightweight_delete_drop = lightweight_delete_mode
-            && ctx->data->getSettings()->lightweight_mutation_projection_mode == LightweightMutationProjectionMode::DROP;
-
         const auto & projections = ctx->metadata_snapshot->getProjections();
         for (const auto & projection : projections)
         {
@@ -1467,11 +1561,10 @@ private:
                 continue;
 
             bool need_recalculate =
-                (ctx->materialized_projections.contains(projection.name)
+                ctx->materialized_projections.contains(projection.name)
                 || (!is_full_part_storage
                     && ctx->source_part->hasProjection(projection.name)
-                    && !ctx->source_part->hasBrokenProjection(projection.name)))
-                && !lightweight_delete_drop;
+                    && !ctx->source_part->hasBrokenProjection(projection.name));
 
             if (need_recalculate)
             {
@@ -1479,7 +1572,7 @@ private:
             }
             else
             {
-                if (!lightweight_delete_mode && ctx->source_part->checksums.has(projection.getDirectoryName()))
+                if (ctx->source_part->checksums.has(projection.getDirectoryName()))
                     entries_to_hardlink.insert(projection.getDirectoryName());
             }
         }
@@ -1924,9 +2017,6 @@ MutateTask::MutateTask(
 
 bool MutateTask::execute()
 {
-    Stopwatch watch;
-    SCOPE_EXIT({ ctx->execute_elapsed_ns += watch.elapsedNanoseconds(); });
-
     switch (state)
     {
         case State::NEED_PREPARE:
@@ -1960,15 +2050,6 @@ bool MutateTask::execute()
     return false;
 }
 
-void MutateTask::updateProfileEvents() const
-{
-    UInt64 total_elapsed_ms = (*ctx->mutate_entry)->watch.elapsedMilliseconds();
-    UInt64 execute_elapsed_ms = ctx->execute_elapsed_ns / 1000000UL;
-
-    ProfileEvents::increment(ProfileEvents::MutationTotalMilliseconds, total_elapsed_ms);
-    ProfileEvents::increment(ProfileEvents::MutationExecuteMilliseconds, execute_elapsed_ms);
-}
-
 static bool canSkipConversionToNullable(const MergeTreeDataPartPtr & part, const MutationCommand & command)
 {
     if (command.type != MutationCommand::READ_COLUMN)
@@ -2031,7 +2112,6 @@ static bool canSkipMutationCommandForPart(const MergeTreeDataPartPtr & part, con
 
 bool MutateTask::prepare()
 {
-    ProfileEvents::increment(ProfileEvents::MutationTotalParts);
     MutationHelpers::checkOperationIsNotCanceled(*ctx->merges_blocker, ctx->mutate_entry);
 
     if (ctx->future_part->parts.size() != 1)
@@ -2040,15 +2120,6 @@ bool MutateTask::prepare()
 
     ctx->num_mutations = std::make_unique<CurrentMetrics::Increment>(CurrentMetrics::PartMutation);
 
-    MergeTreeData::IMutationsSnapshot::Params params
-    {
-        .metadata_version = ctx->metadata_snapshot->getMetadataVersion(),
-        .min_part_metadata_version = ctx->source_part->getMetadataVersion(),
-    };
-
-    auto mutations_snapshot = ctx->data->getMutationsSnapshot(params);
-    auto alter_conversions = MergeTreeData::getAlterConversionsForPart(ctx->source_part, mutations_snapshot, ctx->metadata_snapshot, ctx->context);
-
     auto context_for_reading = Context::createCopy(ctx->context);
 
     /// Allow mutations to work when force_index_by_date or force_primary_key is on.
@@ -2063,7 +2134,7 @@ bool MutateTask::prepare()
             ctx->commands_for_part.emplace_back(command);
 
     if (ctx->source_part->isStoredOnDisk() && !isStorageTouchedByMutations(
-        ctx->source_part, mutations_snapshot, ctx->metadata_snapshot, ctx->commands_for_part, context_for_reading))
+        ctx->source_part, ctx->metadata_snapshot, ctx->commands_for_part, context_for_reading))
     {
         NameSet files_to_copy_instead_of_hardlinks;
         auto settings_ptr = ctx->data->getSettings();
@@ -2103,7 +2174,6 @@ bool MutateTask::prepare()
             ctx->temporary_directory_lock = std::move(lock);
         }
 
-        ProfileEvents::increment(ProfileEvents::MutationUntouchedParts);
         promise.set_value(std::move(part));
         return false;
     }
@@ -2123,18 +2193,11 @@ bool MutateTask::prepare()
     context_for_reading->setSetting("read_from_filesystem_cache_if_exists_otherwise_bypass_cache", 1);
 
     MutationHelpers::splitAndModifyMutationCommands(
-        ctx->source_part,
-        ctx->metadata_snapshot,
-        alter_conversions,
-        ctx->commands_for_part,
-        ctx->for_interpreter,
-        ctx->for_file_renames,
-        ctx->log);
+        ctx->source_part, ctx->metadata_snapshot,
+        ctx->commands_for_part, ctx->for_interpreter, ctx->for_file_renames, ctx->log);
 
     ctx->stage_progress = std::make_unique<MergeStageProgress>(1.0);
 
-    bool lightweight_delete_mode = false;
-
     if (!ctx->for_interpreter.empty())
     {
         /// Always disable filtering in mutations: we want to read and write all rows because for updates we rewrite only some of the
@@ -2143,8 +2206,7 @@ bool MutateTask::prepare()
         settings.apply_deleted_mask = false;
 
         ctx->interpreter = std::make_unique<MutationsInterpreter>(
-            *ctx->data, ctx->source_part, alter_conversions,
-            ctx->metadata_snapshot, ctx->for_interpreter,
+            *ctx->data, ctx->source_part, ctx->metadata_snapshot, ctx->for_interpreter,
             ctx->metadata_snapshot->getColumns().getNamesOfPhysical(), context_for_reading, settings);
 
         ctx->materialized_indices = ctx->interpreter->grabMaterializedIndices();
@@ -2153,21 +2215,6 @@ bool MutateTask::prepare()
         ctx->mutating_pipeline_builder = ctx->interpreter->execute();
         ctx->updated_header = ctx->interpreter->getUpdatedHeader();
         ctx->progress_callback = MergeProgressCallback((*ctx->mutate_entry)->ptr(), ctx->watch_prev_elapsed, *ctx->stage_progress);
-
-        lightweight_delete_mode = ctx->updated_header.has(RowExistsColumn::name);
-        /// If under the condition of lightweight delete mode with rebuild option, add projections again here as we can only know
-        /// the condition as early as from here.
-        if (lightweight_delete_mode
-            && ctx->data->getSettings()->lightweight_mutation_projection_mode == LightweightMutationProjectionMode::REBUILD)
-        {
-            for (const auto & projection : ctx->metadata_snapshot->getProjections())
-            {
-                if (!ctx->source_part->hasProjection(projection.name))
-                    continue;
-
-                ctx->materialized_projections.insert(projection.name);
-            }
-        }
     }
 
     auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + ctx->future_part->name, ctx->space_reservation->getDisk(), 0);
@@ -2209,7 +2256,7 @@ 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 && lightweight_delete_mode)
+    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
@@ -2236,7 +2283,6 @@ bool MutateTask::prepare()
         ctx->new_data_part->remove_tmp_policy = IMergeTreeDataPart::BlobsRemovalPolicyForTemporaryParts::REMOVE_BLOBS;
 
         task = std::make_unique<MutateAllPartColumnsTask>(ctx);
-        ProfileEvents::increment(ProfileEvents::MutationAllPartColumns);
     }
     else /// TODO: check that we modify only non-key columns in this case.
     {
@@ -2247,30 +2293,10 @@ bool MutateTask::prepare()
             ctx->context,
             ctx->materialized_indices);
 
-        auto lightweight_mutation_projection_mode = ctx->data->getSettings()->lightweight_mutation_projection_mode;
-        bool lightweight_delete_drops_projections =
-            lightweight_mutation_projection_mode == LightweightMutationProjectionMode::DROP
-            || lightweight_mutation_projection_mode == LightweightMutationProjectionMode::THROW;
-
-        std::set<ProjectionDescriptionRawPtr> projections_to_skip_container;
-        auto * projections_to_skip = &projections_to_skip_container;
-
-        bool should_create_projections = !(lightweight_delete_mode && lightweight_delete_drops_projections);
-        /// Under lightweight delete mode, if option is drop, projections_to_recalc should be empty.
-        if (should_create_projections)
-        {
-            ctx->projections_to_recalc = MutationHelpers::getProjectionsToRecalculate(
-                ctx->source_part,
-                ctx->metadata_snapshot,
-                ctx->materialized_projections);
-
-            projections_to_skip = &ctx->projections_to_recalc;
-        }
-        else
-        {
-            for (const auto & projection : ctx->metadata_snapshot->getProjections())
-                projections_to_skip->insert(&projection);
-        }
+        ctx->projections_to_recalc = MutationHelpers::getProjectionsToRecalculate(
+            ctx->source_part,
+            ctx->metadata_snapshot,
+            ctx->materialized_projections);
 
         ctx->stats_to_recalc = MutationHelpers::getStatisticsToRecalculate(ctx->metadata_snapshot, ctx->materialized_statistics);
 
@@ -2280,7 +2306,7 @@ bool MutateTask::prepare()
             ctx->updated_header,
             ctx->indices_to_recalc,
             ctx->mrk_extension,
-            *projections_to_skip,
+            ctx->projections_to_recalc,
             ctx->stats_to_recalc);
 
         ctx->files_to_rename = MutationHelpers::collectFilesForRenames(
@@ -2296,7 +2322,6 @@ bool MutateTask::prepare()
         ctx->new_data_part->remove_tmp_policy = IMergeTreeDataPart::BlobsRemovalPolicyForTemporaryParts::ASK_KEEPER;
 
         task = std::make_unique<MutateSomePartColumnsTask>(ctx);
-        ProfileEvents::increment(ProfileEvents::MutationSomePartColumns);
     }
 
     return true;
diff --git a/src/Storages/MergeTree/MutateTask.h b/src/Storages/MergeTree/MutateTask.h
index 08427bff6d8..dc22b90f0e9 100644
--- a/src/Storages/MergeTree/MutateTask.h
+++ b/src/Storages/MergeTree/MutateTask.h
@@ -39,7 +39,6 @@ public:
         bool need_prefix_);
 
     bool execute();
-    void updateProfileEvents() const;
 
     std::future<MergeTreeData::MutableDataPartPtr> getFuture()
     {
diff --git a/src/Storages/MergeTree/ParallelReplicasReadingCoordinator.cpp b/src/Storages/MergeTree/ParallelReplicasReadingCoordinator.cpp
index 8abf735b49f..f46b4de10b7 100644
--- a/src/Storages/MergeTree/ParallelReplicasReadingCoordinator.cpp
+++ b/src/Storages/MergeTree/ParallelReplicasReadingCoordinator.cpp
@@ -185,8 +185,7 @@ public:
     void handleInitialAllRangesAnnouncement(InitialAllRangesAnnouncement announcement)
     {
         if (++sent_initial_requests > replicas_count)
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR, "Initiator received more initial requests than there are replicas: replica_num={}", announcement.replica_num);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Initiator received more initial requests than there are replicas");
 
         doHandleInitialAllRangesAnnouncement(std::move(announcement));
     }
@@ -434,10 +433,10 @@ void DefaultCoordinator::setProgressCallback()
 
 void DefaultCoordinator::doHandleInitialAllRangesAnnouncement(InitialAllRangesAnnouncement announcement)
 {
-    LOG_DEBUG(log, "Initial request: {}", announcement.describe());
-
     const auto replica_num = announcement.replica_num;
 
+    LOG_DEBUG(log, "Initial request from replica {}: {}", announcement.replica_num, announcement.describe());
+
     initializeReadingState(std::move(announcement));
 
     if (replica_num >= stats.size())
@@ -840,7 +839,6 @@ public:
 
     Parts all_parts_to_read;
     size_t total_rows_to_read = 0;
-    bool state_initialized{false};
 
     LoggerPtr log = getLogger(fmt::format("{}{}", magic_enum::enum_name(mode), "Coordinator"));
 };
@@ -860,9 +858,7 @@ void InOrderCoordinator<mode>::markReplicaAsUnavailable(size_t replica_number)
 template <CoordinationMode mode>
 void InOrderCoordinator<mode>::doHandleInitialAllRangesAnnouncement(InitialAllRangesAnnouncement announcement)
 {
-    LOG_TRACE(log, "Received an announcement : {}", announcement.describe());
-
-    ++stats[announcement.replica_num].number_of_requests;
+    LOG_TRACE(log, "Received an announcement {}", announcement.describe());
 
     size_t new_rows_to_read = 0;
 
@@ -872,16 +868,13 @@ void InOrderCoordinator<mode>::doHandleInitialAllRangesAnnouncement(InitialAllRa
         auto the_same_it = std::find_if(all_parts_to_read.begin(), all_parts_to_read.end(),
             [&part] (const Part & other) { return other.description.info == part.info; });
 
-        /// We have the same part - add the info about presence on the corresponding replica to it
+        /// We have the same part - add the info about presence on current replica to it
         if (the_same_it != all_parts_to_read.end())
         {
             the_same_it->replicas.insert(announcement.replica_num);
             continue;
         }
 
-        if (state_initialized)
-            continue;
-
         auto covering_or_the_same_it = std::find_if(all_parts_to_read.begin(), all_parts_to_read.end(),
             [&part] (const Part & other) { return other.description.info.contains(part.info) ||  part.info.contains(other.description.info); });
 
@@ -896,10 +889,9 @@ void InOrderCoordinator<mode>::doHandleInitialAllRangesAnnouncement(InitialAllRa
         std::sort(ranges.begin(), ranges.end());
     }
 
-    state_initialized = true;
+    ++stats[announcement.replica_num].number_of_requests;
 
-    // progress_callback is not set when local plan is used for initiator
-    if (progress_callback && new_rows_to_read > 0)
+    if (new_rows_to_read > 0)
     {
         Progress progress;
         progress.total_rows_to_read = new_rows_to_read;
@@ -919,7 +911,7 @@ ParallelReadResponse InOrderCoordinator<mode>::handleRequest(ParallelReadRequest
             "Replica {} decided to read in {} mode, not in {}. This is a bug",
             request.replica_num, magic_enum::enum_name(request.mode), magic_enum::enum_name(mode));
 
-    LOG_TRACE(log, "Got read request: {}", request.describe());
+    LOG_TRACE(log, "Got request from replica {}, data {}", request.replica_num, request.describe());
 
     ParallelReadResponse response;
     response.description = request.description;
@@ -933,15 +925,8 @@ ParallelReadResponse InOrderCoordinator<mode>::handleRequest(ParallelReadRequest
         if (global_part_it == all_parts_to_read.end())
             continue;
 
-        if (global_part_it->replicas.empty())
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "Part {} requested by replica {} is not registered in working set",
-                part.info.getPartNameV1(),
-                request.replica_num);
-
         if (!global_part_it->replicas.contains(request.replica_num))
-            continue;
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} doesn't exist on replica {} according to the global state", part.info.getPartNameV1(), request.replica_num);
 
         size_t current_mark_size = 0;
 
@@ -1019,10 +1004,6 @@ void ParallelReplicasReadingCoordinator::handleInitialAllRangesAnnouncement(Init
 
 ParallelReadResponse ParallelReplicasReadingCoordinator::handleRequest(ParallelReadRequest request)
 {
-    if (request.min_number_of_marks == 0)
-        throw Exception(
-            ErrorCodes::BAD_ARGUMENTS, "Chosen number of marks to read is zero (likely because of weird interference of settings)");
-
     ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::ParallelReplicasHandleRequestMicroseconds);
 
     std::lock_guard lock(mutex);
@@ -1072,7 +1053,6 @@ void ParallelReplicasReadingCoordinator::initialize(CoordinationMode mode)
             break;
     }
 
-    // progress_callback is not set when local plan is used for initiator
     if (progress_callback)
         pimpl->setProgressCallback(std::move(progress_callback));
 
diff --git a/src/Storages/MergeTree/PartitionPruner.cpp b/src/Storages/MergeTree/PartitionPruner.cpp
index 6df7b5aa054..9de7b238f57 100644
--- a/src/Storages/MergeTree/PartitionPruner.cpp
+++ b/src/Storages/MergeTree/PartitionPruner.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-PartitionPruner::PartitionPruner(const StorageMetadataPtr & metadata, const ActionsDAG * filter_actions_dag, ContextPtr context, bool strict)
+PartitionPruner::PartitionPruner(const StorageMetadataPtr & metadata, ActionsDAGPtr filter_actions_dag, ContextPtr context, bool strict)
     : partition_key(MergeTreePartition::adjustPartitionKey(metadata, context))
     , partition_condition(filter_actions_dag, context, partition_key.column_names, partition_key.expression, true /* single_point */)
     , useless((strict && partition_condition.isRelaxed()) || partition_condition.alwaysUnknownOrTrue())
diff --git a/src/Storages/MergeTree/PartitionPruner.h b/src/Storages/MergeTree/PartitionPruner.h
index d89dfb7b245..ca24559ca01 100644
--- a/src/Storages/MergeTree/PartitionPruner.h
+++ b/src/Storages/MergeTree/PartitionPruner.h
@@ -13,7 +13,7 @@ namespace DB
 class PartitionPruner
 {
 public:
-    PartitionPruner(const StorageMetadataPtr & metadata, const ActionsDAG * filter_actions_dag, ContextPtr context, bool strict = false);
+    PartitionPruner(const StorageMetadataPtr & metadata, ActionsDAGPtr filter_actions_dag, ContextPtr context, bool strict = false);
 
     bool canBePruned(const IMergeTreeDataPart & part) const;
 
diff --git a/src/Storages/MergeTree/RPNBuilder.cpp b/src/Storages/MergeTree/RPNBuilder.cpp
index 6e963066f39..93087b0d3fe 100644
--- a/src/Storages/MergeTree/RPNBuilder.cpp
+++ b/src/Storages/MergeTree/RPNBuilder.cpp
@@ -399,7 +399,7 @@ size_t RPNBuilderFunctionTreeNode::getArgumentsSize() const
         {
             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 index_hint->getActions()->getOutputs().size();
         }
 
         return dag_node->children.size();
@@ -427,7 +427,7 @@ RPNBuilderTreeNode RPNBuilderFunctionTreeNode::getArgumentAt(size_t index) const
         {
             const auto & adaptor = typeid_cast<const FunctionToFunctionBaseAdaptor &>(*dag_node->function_base);
             const auto & index_hint = typeid_cast<const FunctionIndexHint &>(*adaptor.getFunction());
-            return RPNBuilderTreeNode(index_hint.getActions().getOutputs()[index], tree_context);
+            return RPNBuilderTreeNode(index_hint.getActions()->getOutputs()[index], tree_context);
         }
 
         return RPNBuilderTreeNode(dag_node->children[index], tree_context);
diff --git a/src/Storages/MergeTree/RangesInDataPart.h b/src/Storages/MergeTree/RangesInDataPart.h
index 966637d0812..bf9e4c7dfb2 100644
--- a/src/Storages/MergeTree/RangesInDataPart.h
+++ b/src/Storages/MergeTree/RangesInDataPart.h
@@ -42,6 +42,7 @@ struct RangesInDataPartsDescription: public std::deque<RangesInDataPartDescripti
 struct RangesInDataPart
 {
     DataPartPtr data_part;
+    AlterConversionsPtr alter_conversions;
     size_t part_index_in_query;
     MarkRanges ranges;
     MarkRanges exact_ranges;
@@ -50,13 +51,14 @@ struct RangesInDataPart
 
     RangesInDataPart(
         const DataPartPtr & data_part_,
+        const AlterConversionsPtr & alter_conversions_,
         const size_t part_index_in_query_,
         const MarkRanges & ranges_ = MarkRanges{})
         : data_part{data_part_}
+        , alter_conversions{alter_conversions_}
         , part_index_in_query{part_index_in_query_}
         , ranges{ranges_}
-    {
-    }
+    {}
 
     RangesInDataPartDescription getDescription() const;
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
index fc83b374a77..7ff37c609eb 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
@@ -135,6 +135,7 @@ struct ReplicatedMergeTreeLogEntryData
     int alter_version = -1; /// May be equal to -1, if it's normal mutation, not metadata update.
 
     /// only ALTER METADATA command
+    /// NOTE It's never used
     bool have_mutation = false; /// If this alter requires additional mutation step, for data update
 
     String columns_str; /// New columns data corresponding to alter_version
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index 7d8018e7577..627bda3f8bf 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -950,7 +950,7 @@ int32_t ReplicatedMergeTreeQueue::updateMutations(zkutil::ZooKeeperPtr zookeeper
                 {
                     const auto commands = entry.commands;
                     it = mutations_by_znode.erase(it);
-                    decrementMutationsCounters(num_data_mutations_to_apply, num_metadata_mutations_to_apply, commands);
+                    updateAlterConversionsMutations(commands, alter_conversions_mutations, /* remove= */ true);
                 }
                 else
                     it = mutations_by_znode.erase(it);
@@ -999,9 +999,10 @@ int32_t ReplicatedMergeTreeQueue::updateMutations(zkutil::ZooKeeperPtr zookeeper
 
             for (const ReplicatedMergeTreeMutationEntryPtr & entry : new_mutations)
             {
-                auto & mutation = mutations_by_znode.emplace(entry->znode_name, MutationStatus(entry, format_version)).first->second;
-                incrementMutationsCounters(num_data_mutations_to_apply, num_metadata_mutations_to_apply, entry->commands);
+                auto & mutation = mutations_by_znode.emplace(entry->znode_name, MutationStatus(entry, format_version))
+                    .first->second;
 
+                updateAlterConversionsMutations(entry->commands, alter_conversions_mutations, /* remove= */ false);
                 NOEXCEPT_SCOPE({
                     for (const auto & pair : entry->block_numbers)
                     {
@@ -1075,7 +1076,7 @@ ReplicatedMergeTreeMutationEntryPtr ReplicatedMergeTreeQueue::removeMutation(
         }
 
         mutations_by_znode.erase(it);
-        /// decrementMutationsCounters() will be called in updateMutations()
+        /// updateAlterConversionsMutations() will be called in updateMutations()
 
         LOG_DEBUG(log, "Removed mutation {} from local state.", entry->znode_name);
     }
@@ -1900,47 +1901,50 @@ ReplicatedMergeTreeMergePredicate ReplicatedMergeTreeQueue::getMergePredicate(zk
 }
 
 
-MutationCommands ReplicatedMergeTreeQueue::MutationsSnapshot::getAlterMutationCommandsForPart(const MergeTreeData::DataPartPtr & part) const
+MutationCommands ReplicatedMergeTreeQueue::getAlterMutationCommandsForPart(const MergeTreeData::DataPartPtr & part) const
 {
+    int32_t part_metadata_version = part->getMetadataVersion();
+    int32_t metadata_version = storage.getInMemoryMetadataPtr()->getMetadataVersion();
+
+    chassert(alter_conversions_mutations >= 0);
+    /// NOTE: that just checking part_metadata_version is not enough, since we
+    /// need to check for non-metadata mutations as well.
+    if (alter_conversions_mutations == 0 && metadata_version == part_metadata_version)
+        return {};
+
+    std::unique_lock lock(state_mutex);
+
     auto in_partition = mutations_by_partition.find(part->info.partition_id);
     if (in_partition == mutations_by_partition.end())
         return {};
 
     Int64 part_data_version = part->info.getDataVersion();
-    Int64 part_metadata_version = part->getMetadataVersion();
-
     MutationCommands result;
 
-    bool seen_all_data_mutations = !hasDataMutations();
-    bool seen_all_metadata_mutations = part_metadata_version >= params.metadata_version;
-
-    if (seen_all_data_mutations && seen_all_metadata_mutations)
-        return {};
+    bool seen_all_data_mutations = false;
+    bool seen_all_metadata_mutations = false;
 
     auto add_to_result = [&](const ReplicatedMergeTreeMutationEntryPtr & entry)
     {
         for (const auto & command : entry->commands | std::views::reverse)
-        {
-            if (AlterConversions::isSupportedMetadataMutation(command.type))
-                result.push_back(command);
-            else if (params.need_data_mutations && AlterConversions::isSupportedDataMutation(command.type))
-                result.push_back(command);
-        }
+            if (AlterConversions::supportsMutationCommandType(command.type))
+                result.emplace_back(command);
     };
 
     /// Here we return mutation commands for part which has bigger alter version than part metadata version.
     /// Please note, we don't use getDataVersion(). It's because these alter commands are used for in-fly conversions
     /// of part's metadata.
-    for (const auto & [mutation_version, entry] : in_partition->second | std::views::reverse)
+    for (const auto & [mutation_version, mutation_status] : in_partition->second | std::views::reverse)
     {
         if (seen_all_data_mutations && seen_all_metadata_mutations)
             break;
 
-        auto alter_version = entry->alter_version;
+        auto & entry = mutation_status->entry;
 
+        auto alter_version = entry->alter_version;
         if (alter_version != -1)
         {
-            if (seen_all_metadata_mutations || alter_version > params.metadata_version)
+            if (alter_version > metadata_version)
                 continue;
 
             /// We take commands with bigger metadata version
@@ -1949,7 +1953,7 @@ MutationCommands ReplicatedMergeTreeQueue::MutationsSnapshot::getAlterMutationCo
             else
                 seen_all_metadata_mutations = true;
         }
-        else if (!seen_all_data_mutations)
+        else
         {
             if (mutation_version > part_data_version)
                 add_to_result(entry);
@@ -1961,104 +1965,6 @@ MutationCommands ReplicatedMergeTreeQueue::MutationsSnapshot::getAlterMutationCo
     return result;
 }
 
-NameSet ReplicatedMergeTreeQueue::MutationsSnapshot::getAllUpdatedColumns() const
-{
-    if (!hasDataMutations())
-        return {};
-
-    NameSet res;
-    for (const auto & [partition_id, mutations] : mutations_by_partition)
-    {
-        for (const auto & [version, entry] : mutations)
-        {
-            auto names = entry->commands.getAllUpdatedColumns();
-            std::move(names.begin(), names.end(), std::inserter(res, res.end()));
-        }
-    }
-    return res;
-}
-
-MergeTreeData::MutationsSnapshotPtr ReplicatedMergeTreeQueue::getMutationsSnapshot(const MutationsSnapshot::Params & params) const
-{
-    std::lock_guard lock(state_mutex);
-
-    MutationsSnapshot::Info info
-    {
-        .num_data_mutations = num_data_mutations_to_apply,
-        .num_metadata_mutations = num_metadata_mutations_to_apply,
-    };
-
-    auto res = std::make_shared<MutationsSnapshot>(params, std::move(info));
-
-    bool need_data_mutations = res->hasDataMutations();
-    bool need_metatadata_mutations = params.min_part_metadata_version < params.metadata_version;
-
-    if (!need_data_mutations && !need_metatadata_mutations)
-        return res;
-
-    auto is_supported_command = [&](const auto & command)
-    {
-        if (need_data_mutations && AlterConversions::isSupportedDataMutation(command.type))
-            return true;
-
-        if (need_metatadata_mutations && AlterConversions::isSupportedMetadataMutation(command.type))
-            return true;
-
-        return false;
-    };
-
-    for (const auto & [partition_id, mutations] : mutations_by_partition)
-    {
-        auto & in_partition = res->mutations_by_partition[partition_id];
-
-        bool seen_all_data_mutations = !need_data_mutations;
-        bool seen_all_metadata_mutations = !need_metatadata_mutations;
-
-        for (const auto & [mutation_version, status] : mutations | std::views::reverse)
-        {
-            if (seen_all_data_mutations && seen_all_metadata_mutations)
-                break;
-
-            auto alter_version = status->entry->alter_version;
-
-            if (alter_version != -1)
-            {
-                if (seen_all_metadata_mutations || alter_version > params.metadata_version)
-                    continue;
-
-                /// We take commands with bigger metadata version
-                if (alter_version > params.min_part_metadata_version)
-                {
-                    /// Copy a pointer to the whole entry to avoid extracting and copying commands.
-                    /// Required commands will be copied later only for specific parts.
-                    if (std::ranges::any_of(status->entry->commands, is_supported_command))
-                        in_partition.emplace(mutation_version, status->entry);
-                }
-                else
-                {
-                    seen_all_metadata_mutations = true;
-                }
-            }
-            else if (!seen_all_data_mutations)
-            {
-                if (!status->is_done)
-                {
-                    /// Copy a pointer to the whole entry to avoid extracting and copying commands.
-                    /// Required commands will be copied later only for specific parts.
-                    if (std::ranges::any_of(status->entry->commands, is_supported_command))
-                        in_partition.emplace(mutation_version, status->entry);
-                }
-                else
-                {
-                    seen_all_data_mutations = true;
-                }
-            }
-        }
-    }
-
-    return res;
-}
-
 MutationCommands ReplicatedMergeTreeQueue::getMutationCommands(
     const MergeTreeData::DataPartPtr & part, Int64 desired_mutation_version, Strings & mutation_ids) const
 {
@@ -2139,7 +2045,7 @@ bool ReplicatedMergeTreeQueue::tryFinalizeMutations(zkutil::ZooKeeperPtr zookeep
                     mutation.parts_to_do.clear();
                 }
 
-                decrementMutationsCounters(num_data_mutations_to_apply, num_metadata_mutations_to_apply, mutation.entry->commands);
+                updateAlterConversionsMutations(mutation.entry->commands, alter_conversions_mutations, /* remove= */ true);
             }
             else if (mutation.parts_to_do.size() == 0)
             {
@@ -2196,7 +2102,7 @@ bool ReplicatedMergeTreeQueue::tryFinalizeMutations(zkutil::ZooKeeperPtr zookeep
                     LOG_TRACE(log, "Finishing data alter with version {} for entry {}", entry->alter_version, entry->znode_name);
                     alter_sequence.finishDataAlter(entry->alter_version, lock);
                 }
-                decrementMutationsCounters(num_data_mutations_to_apply, num_metadata_mutations_to_apply, entry->commands);
+                updateAlterConversionsMutations(entry->commands, alter_conversions_mutations, /* remove= */ true);
             }
         }
     }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
index 91a23b6a3b6..89ef6240558 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <cstdint>
 #include <optional>
 
 #include <Common/ActionBlocker.h>
@@ -152,11 +151,8 @@ private:
 
     /// Mapping from znode path to Mutations Status
     std::map<String, MutationStatus> mutations_by_znode;
-
-    /// Unfinished mutations that are required for AlterConversions.
-    Int64 num_data_mutations_to_apply = 0;
-    Int64 num_metadata_mutations_to_apply = 0;
-
+    /// Unfinished mutations that is required AlterConversions (see getAlterMutationCommandsForPart())
+    std::atomic<ssize_t> alter_conversions_mutations = 0;
     /// Partition -> (block_number -> MutationStatus)
     std::unordered_map<String, std::map<Int64, MutationStatus *>> mutations_by_partition;
     /// Znode ID of the latest mutation that is done.
@@ -413,26 +409,10 @@ public:
     MutationCommands getMutationCommands(const MergeTreeData::DataPartPtr & part, Int64 desired_mutation_version,
                                          Strings & mutation_ids) const;
 
-    struct MutationsSnapshot : public MergeTreeData::IMutationsSnapshot
-    {
-    public:
-        MutationsSnapshot() = default;
-        MutationsSnapshot(Params params_, Info info_) : IMutationsSnapshot(std::move(params_), std::move(info_)) {}
-
-        using Params = MergeTreeData::IMutationsSnapshot::Params;
-        using MutationsByPartititon = std::unordered_map<String, std::map<Int64, ReplicatedMergeTreeMutationEntryPtr>>;
-
-        MutationsByPartititon mutations_by_partition;
-
-        MutationCommands getAlterMutationCommandsForPart(const MergeTreeData::DataPartPtr & part) const override;
-        std::shared_ptr<MergeTreeData::IMutationsSnapshot> cloneEmpty() const override { return std::make_shared<MutationsSnapshot>(); }
-        NameSet getAllUpdatedColumns() const override;
-    };
-
     /// 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.
-    MergeTreeData::MutationsSnapshotPtr getMutationsSnapshot(const MutationsSnapshot::Params & params) 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.
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
index d3ccda904b6..268cead2a0e 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
@@ -7,6 +7,7 @@
 #include <Interpreters/Context.h>
 #include <Common/FailPoint.h>
 #include <Common/ZooKeeper/KeeperException.h>
+#include <Common/randomSeed.h>
 #include <Core/ServerUUID.h>
 #include <boost/algorithm/string/replace.hpp>
 
@@ -48,20 +49,6 @@ ReplicatedMergeTreeRestartingThread::ReplicatedMergeTreeRestartingThread(Storage
     task = storage.getContext()->getSchedulePool().createTask(log_name, [this]{ run(); });
 }
 
-void ReplicatedMergeTreeRestartingThread::start(bool schedule)
-{
-    LOG_TRACE(log, "Starting the restating thread, schedule: {}", schedule);
-    if (schedule)
-        task->activateAndSchedule();
-    else
-        task->activate();
-}
-
-void ReplicatedMergeTreeRestartingThread::wakeup()
-{
-    task->schedule();
-}
-
 void ReplicatedMergeTreeRestartingThread::run()
 {
     if (need_stop)
@@ -357,7 +344,7 @@ void ReplicatedMergeTreeRestartingThread::partialShutdown(bool part_of_full_shut
 void ReplicatedMergeTreeRestartingThread::shutdown(bool part_of_full_shutdown)
 {
     /// Stop restarting_thread before stopping other tasks - so that it won't restart them again.
-    need_stop = part_of_full_shutdown;
+    need_stop = true;
     task->deactivate();
 
     /// Explicitly set the event, because the restarting thread will not set it again
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
index d719505ae5e..01071d80e8b 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
@@ -24,9 +24,16 @@ class ReplicatedMergeTreeRestartingThread
 public:
     explicit ReplicatedMergeTreeRestartingThread(StorageReplicatedMergeTree & storage_);
 
-    void start(bool schedule);
+    void start(bool schedule = true)
+    {
+        LOG_TRACE(log, "Starting restating thread, schedule: {}", schedule);
+        if (schedule)
+            task->activateAndSchedule();
+        else
+            task->activate();
+    }
 
-    void wakeup();
+    void wakeup() { task->schedule(); }
 
     void shutdown(bool part_of_full_shutdown);
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
index 2f0b71b977e..63e1c12a15f 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
@@ -3,8 +3,8 @@
 #include <Storages/MergeTree/ReplicatedMergeTreeSink.h>
 #include <Storages/MergeTree/InsertBlockInfo.h>
 #include <Interpreters/PartLog.h>
-#include <Common/Exception.h>
 #include <Processors/Transforms/DeduplicationTokenTransforms.h>
+#include "Common/Exception.h"
 #include <Common/FailPoint.h>
 #include <Common/ProfileEventsScope.h>
 #include <Common/SipHash.h>
@@ -155,18 +155,7 @@ ReplicatedMergeTreeSinkImpl<async_insert>::ReplicatedMergeTreeSinkImpl(
 }
 
 template<bool async_insert>
-ReplicatedMergeTreeSinkImpl<async_insert>::~ReplicatedMergeTreeSinkImpl()
-{
-    if (!delayed_chunk)
-        return;
-
-    for (auto & partition : delayed_chunk->partitions)
-    {
-        partition.temp_part.cancel();
-    }
-
-    delayed_chunk.reset();
-}
+ReplicatedMergeTreeSinkImpl<async_insert>::~ReplicatedMergeTreeSinkImpl() = default;
 
 template<bool async_insert>
 size_t ReplicatedMergeTreeSinkImpl<async_insert>::checkQuorumPrecondition(const ZooKeeperWithFaultInjectionPtr & zookeeper)
@@ -1166,9 +1155,8 @@ void ReplicatedMergeTreeSinkImpl<async_insert>::onStart()
 template<bool async_insert>
 void ReplicatedMergeTreeSinkImpl<async_insert>::onFinish()
 {
-    chassert(!isCancelled());
-
     const auto & settings = context->getSettingsRef();
+
     ZooKeeperWithFaultInjectionPtr zookeeper = ZooKeeperWithFaultInjection::createInstance(
         settings.insert_keeper_fault_injection_probability,
         settings.insert_keeper_fault_injection_seed,
diff --git a/src/Storages/MergeTree/RequestResponse.cpp b/src/Storages/MergeTree/RequestResponse.cpp
index bcdeb443a0b..2ce0e20dcd2 100644
--- a/src/Storages/MergeTree/RequestResponse.cpp
+++ b/src/Storages/MergeTree/RequestResponse.cpp
@@ -44,7 +44,9 @@ void ParallelReadRequest::serialize(WriteBuffer & out) const
 
 String ParallelReadRequest::describe() const
 {
-    String result = fmt::format("replica_num {}, min_num_of_marks {}, ", replica_num, min_number_of_marks);
+    String result;
+    result += fmt::format("replica_num: {} \n", replica_num);
+    result += fmt::format("min_num_of_marks: {} \n", min_number_of_marks);
     result += description.describe();
     return result;
 }
@@ -129,7 +131,10 @@ void InitialAllRangesAnnouncement::serialize(WriteBuffer & out) const
 
 String InitialAllRangesAnnouncement::describe()
 {
-    return fmt::format("replica {}, mode {}, {}", replica_num, mode, description.describe());
+    String result;
+    result += description.describe();
+    result += fmt::format("----------\nReceived from {} replica\n", replica_num);
+    return result;
 }
 
 InitialAllRangesAnnouncement InitialAllRangesAnnouncement::deserialize(ReadBuffer & in)
diff --git a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
index 6825752acd7..82ebbf09988 100644
--- a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
@@ -18,12 +18,10 @@ class StorageFromMergeTreeDataPart final : public IStorage
 {
 public:
     /// Used in part mutation.
-    explicit StorageFromMergeTreeDataPart(
-        const MergeTreeData::DataPartPtr & part_,
-        const MergeTreeData::MutationsSnapshotPtr & mutations_snapshot_)
+    explicit StorageFromMergeTreeDataPart(const MergeTreeData::DataPartPtr & part_)
         : IStorage(getIDFromPart(part_))
         , parts({part_})
-        , mutations_snapshot(mutations_snapshot_)
+        , alter_conversions({part_->storage.getAlterConversionsForPart(part_)})
         , storage(part_->storage)
         , partition_id(part_->info.partition_id)
     {
@@ -83,7 +81,7 @@ public:
 
 private:
     const MergeTreeData::DataPartsVector parts;
-    const MergeTreeData::MutationsSnapshotPtr mutations_snapshot;
+    const std::vector<AlterConversionsPtr> alter_conversions;
     const MergeTreeData & storage;
     const String partition_id;
     const ReadFromMergeTree::AnalysisResultPtr analysis_result_ptr;
diff --git a/src/Storages/MergeTree/VectorSimilarityCondition.cpp b/src/Storages/MergeTree/VectorSimilarityCondition.cpp
deleted file mode 100644
index 641b0037e7b..00000000000
--- a/src/Storages/MergeTree/VectorSimilarityCondition.cpp
+++ /dev/null
@@ -1,352 +0,0 @@
-#include <Storages/MergeTree/VectorSimilarityCondition.h>
-
-#include <Core/Settings.h>
-#include <Interpreters/Context.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTOrderByElement.h>
-#include <Parsers/ASTSelectQuery.h>
-#include <Parsers/ASTSetQuery.h>
-#include <Storages/MergeTree/KeyCondition.h>
-#include <Storages/MergeTree/MergeTreeSettings.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-    extern const int INCORRECT_QUERY;
-}
-
-namespace
-{
-
-template <typename Literal>
-void extractReferenceVectorFromLiteral(std::vector<Float64> & reference_vector, Literal literal)
-{
-    Float64 float_element_of_reference_vector;
-    Int64 int_element_of_reference_vector;
-
-    for (const auto & value : literal.value())
-    {
-        if (value.tryGet(float_element_of_reference_vector))
-            reference_vector.emplace_back(float_element_of_reference_vector);
-        else if (value.tryGet(int_element_of_reference_vector))
-            reference_vector.emplace_back(static_cast<float>(int_element_of_reference_vector));
-        else
-            throw Exception(ErrorCodes::INCORRECT_QUERY, "Wrong type of elements in reference vector. Only float or int are supported.");
-    }
-}
-
-VectorSimilarityCondition::Info::DistanceFunction stringToDistanceFunction(const String & distance_function)
-{
-    if (distance_function == "L2Distance")
-        return VectorSimilarityCondition::Info::DistanceFunction::L2;
-    else if (distance_function == "cosineDistance")
-        return VectorSimilarityCondition::Info::DistanceFunction::Cosine;
-    else
-        return VectorSimilarityCondition::Info::DistanceFunction::Unknown;
-}
-
-}
-
-VectorSimilarityCondition::VectorSimilarityCondition(const SelectQueryInfo & query_info, ContextPtr context)
-    : block_with_constants(KeyCondition::getBlockWithConstants(query_info.query, query_info.syntax_analyzer_result, context))
-    , index_granularity(context->getMergeTreeSettings().index_granularity)
-    , max_limit_for_ann_queries(context->getSettingsRef().max_limit_for_ann_queries)
-    , index_is_useful(checkQueryStructure(query_info))
-{}
-
-bool VectorSimilarityCondition::alwaysUnknownOrTrue(const String & distance_function) const
-{
-    if (!index_is_useful)
-        return true; /// query isn't supported
-    /// If query is supported, check if distance function of index is the same as distance function in query
-    return !(stringToDistanceFunction(distance_function) == query_information->distance_function);
-}
-
-UInt64 VectorSimilarityCondition::getLimit() const
-{
-    if (index_is_useful && query_information.has_value())
-        return query_information->limit;
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "No LIMIT section in query, not supported");
-}
-
-std::vector<Float64> VectorSimilarityCondition::getReferenceVector() const
-{
-    if (index_is_useful && query_information.has_value())
-        return query_information->reference_vector;
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Reference vector was requested for useless or uninitialized index.");
-}
-
-size_t VectorSimilarityCondition::getDimensions() const
-{
-    if (index_is_useful && query_information.has_value())
-        return query_information->reference_vector.size();
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Number of dimensions was requested for useless or uninitialized index.");
-}
-
-String VectorSimilarityCondition::getColumnName() const
-{
-    if (index_is_useful && query_information.has_value())
-        return query_information->column_name;
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Column name was requested for useless or uninitialized index.");
-}
-
-VectorSimilarityCondition::Info::DistanceFunction VectorSimilarityCondition::getDistanceFunction() const
-{
-    if (index_is_useful && query_information.has_value())
-        return query_information->distance_function;
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Distance function was requested for useless or uninitialized index.");
-}
-
-bool VectorSimilarityCondition::checkQueryStructure(const SelectQueryInfo & query)
-{
-    Info order_by_info;
-
-    /// Build rpns for query sections
-    const auto & select = query.query->as<ASTSelectQuery &>();
-
-    RPN rpn_order_by;
-    RPNElement rpn_limit;
-    UInt64 limit;
-
-    if (select.limitLength())
-        traverseAtomAST(select.limitLength(), rpn_limit);
-
-    if (select.orderBy())
-        traverseOrderByAST(select.orderBy(), rpn_order_by);
-
-    /// Reverse RPNs for conveniences during parsing
-    std::reverse(rpn_order_by.begin(), rpn_order_by.end());
-
-    const bool order_by_is_valid = matchRPNOrderBy(rpn_order_by, order_by_info);
-    const bool limit_is_valid = matchRPNLimit(rpn_limit, limit);
-
-    if (!limit_is_valid || limit > max_limit_for_ann_queries)
-        return false;
-
-    if (order_by_is_valid)
-    {
-        query_information = std::move(order_by_info);
-        query_information->limit = limit;
-        return true;
-    }
-
-    return false;
-}
-
-void VectorSimilarityCondition::traverseAST(const ASTPtr & node, RPN & rpn)
-{
-    /// If the node is ASTFunction, it may have children nodes
-    if (const auto * func = node->as<ASTFunction>())
-    {
-        const ASTs & children = func->arguments->children;
-        /// Traverse children nodes
-        for (const auto& child : children)
-            traverseAST(child, rpn);
-    }
-
-    RPNElement element;
-    /// Get the data behind node
-    if (!traverseAtomAST(node, element))
-        element.function = RPNElement::FUNCTION_UNKNOWN;
-
-    rpn.emplace_back(std::move(element));
-}
-
-bool VectorSimilarityCondition::traverseAtomAST(const ASTPtr & node, RPNElement & out)
-{
-    /// Match Functions
-    if (const auto * function = node->as<ASTFunction>())
-    {
-        /// Set the name
-        out.func_name = function->name;
-
-        if (function->name == "L1Distance" ||
-            function->name == "L2Distance" ||
-            function->name == "LinfDistance" ||
-            function->name == "cosineDistance" ||
-            function->name == "dotProduct")
-            out.function = RPNElement::FUNCTION_DISTANCE;
-        else if (function->name == "array")
-            out.function = RPNElement::FUNCTION_ARRAY;
-        else if (function->name == "_CAST")
-            out.function = RPNElement::FUNCTION_CAST;
-        else
-            return false;
-
-        return true;
-    }
-    /// Match identifier
-    else if (const auto * identifier = node->as<ASTIdentifier>())
-    {
-        out.function = RPNElement::FUNCTION_IDENTIFIER;
-        out.identifier.emplace(identifier->name());
-        out.func_name = "column identifier";
-
-        return true;
-    }
-
-    /// Check if we have constants behind the node
-    return tryCastToConstType(node, out);
-}
-
-bool VectorSimilarityCondition::tryCastToConstType(const ASTPtr & node, RPNElement & out)
-{
-    Field const_value;
-    DataTypePtr const_type;
-
-    if (KeyCondition::getConstant(node, block_with_constants, const_value, const_type))
-    {
-        /// Check for constant types
-        if (const_value.getType() == Field::Types::Float64)
-        {
-            out.function = RPNElement::FUNCTION_FLOAT_LITERAL;
-            out.float_literal.emplace(const_value.safeGet<Float32>());
-            out.func_name = "Float literal";
-            return true;
-        }
-
-        if (const_value.getType() == Field::Types::UInt64)
-        {
-            out.function = RPNElement::FUNCTION_INT_LITERAL;
-            out.int_literal.emplace(const_value.safeGet<UInt64>());
-            out.func_name = "Int literal";
-            return true;
-        }
-
-        if (const_value.getType() == Field::Types::Int64)
-        {
-            out.function = RPNElement::FUNCTION_INT_LITERAL;
-            out.int_literal.emplace(const_value.safeGet<Int64>());
-            out.func_name = "Int literal";
-            return true;
-        }
-
-        if (const_value.getType() == Field::Types::Array)
-        {
-            out.function = RPNElement::FUNCTION_LITERAL_ARRAY;
-            out.array_literal = const_value.safeGet<Array>();
-            out.func_name = "Array literal";
-            return true;
-        }
-
-        if (const_value.getType() == Field::Types::String)
-        {
-            out.function = RPNElement::FUNCTION_STRING_LITERAL;
-            out.func_name = const_value.safeGet<String>();
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void VectorSimilarityCondition::traverseOrderByAST(const ASTPtr & node, RPN & rpn)
-{
-    if (const auto * expr_list = node->as<ASTExpressionList>())
-        if (const auto * order_by_element = expr_list->children.front()->as<ASTOrderByElement>())
-            traverseAST(order_by_element->children.front(), rpn);
-}
-
-/// Returns true and stores ANNExpr if the query has valid ORDERBY clause
-bool VectorSimilarityCondition::matchRPNOrderBy(RPN & rpn, Info & info)
-{
-    /// ORDER BY clause must have at least 3 expressions
-    if (rpn.size() < 3)
-        return false;
-
-    auto iter = rpn.begin();
-    auto end = rpn.end();
-
-    bool identifier_found = false;
-
-    /// Matches DistanceFunc->[Column]->[ArrayFunc]->ReferenceVector(floats)->[Column]
-    if (iter->function != RPNElement::FUNCTION_DISTANCE)
-        return false;
-
-    info.distance_function = stringToDistanceFunction(iter->func_name);
-    ++iter;
-
-    if (iter->function == RPNElement::FUNCTION_IDENTIFIER)
-    {
-        identifier_found = true;
-        info.column_name = std::move(iter->identifier.value());
-        ++iter;
-    }
-
-    if (iter->function == RPNElement::FUNCTION_ARRAY)
-        ++iter;
-
-    if (iter->function == RPNElement::FUNCTION_LITERAL_ARRAY)
-    {
-        extractReferenceVectorFromLiteral(info.reference_vector, iter->array_literal);
-        ++iter;
-    }
-
-    /// further conditions are possible if there is no array, or no identifier is found
-    /// the array can be inside a cast function. For other cases, see the loop after this condition
-    if (iter != end && iter->function == RPNElement::FUNCTION_CAST)
-    {
-        ++iter;
-        /// Cast should be made to array
-        if (!iter->func_name.starts_with("Array"))
-            return false;
-        ++iter;
-        if (iter->function == RPNElement::FUNCTION_LITERAL_ARRAY)
-        {
-            extractReferenceVectorFromLiteral(info.reference_vector, iter->array_literal);
-            ++iter;
-        }
-        else
-            return false;
-    }
-
-    while (iter != end)
-    {
-        if (iter->function == RPNElement::FUNCTION_FLOAT_LITERAL ||
-            iter->function == RPNElement::FUNCTION_INT_LITERAL)
-            info.reference_vector.emplace_back(getFloatOrIntLiteralOrPanic(iter));
-        else if (iter->function == RPNElement::FUNCTION_IDENTIFIER)
-        {
-            if (identifier_found)
-                return false;
-            info.column_name = std::move(iter->identifier.value());
-            identifier_found = true;
-        }
-        else
-            return false;
-
-        ++iter;
-    }
-
-    /// Final checks of correctness
-    return identifier_found && !info.reference_vector.empty();
-}
-
-/// Returns true and stores Length if we have valid LIMIT clause in query
-bool VectorSimilarityCondition::matchRPNLimit(RPNElement & rpn, UInt64 & limit)
-{
-    if (rpn.function == RPNElement::FUNCTION_INT_LITERAL)
-    {
-        limit = rpn.int_literal.value();
-        return true;
-    }
-
-    return false;
-}
-
-/// Gets float or int from AST node
-float VectorSimilarityCondition::getFloatOrIntLiteralOrPanic(const RPN::iterator& iter)
-{
-    if (iter->float_literal.has_value())
-        return iter->float_literal.value();
-    if (iter->int_literal.has_value())
-        return static_cast<float>(iter->int_literal.value());
-    throw Exception(ErrorCodes::INCORRECT_QUERY, "Wrong parsed AST in buildRPN\n");
-}
-
-}
diff --git a/src/Storages/MergeTree/checkDataPart.cpp b/src/Storages/MergeTree/checkDataPart.cpp
index 0365f875409..fb86d9e7603 100644
--- a/src/Storages/MergeTree/checkDataPart.cpp
+++ b/src/Storages/MergeTree/checkDataPart.cpp
@@ -215,10 +215,6 @@ static IMergeTreeDataPart::Checksums checkDataPart(
         {
             get_serialization(column)->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
             {
-                /// Skip ephemeral subcolumns that don't store any real data.
-                if (ISerialization::isEphemeralSubcolumn(substream_path, substream_path.size()))
-                    return;
-
                 auto stream_name = IMergeTreeDataPart::getStreamNameForColumn(column, substream_path, ".bin", data_part_storage);
 
                 if (!stream_name)
@@ -391,9 +387,17 @@ IMergeTreeDataPart::Checksums checkDataPart(
             auto file_name = it->name();
             if (!data_part_storage.isDirectory(file_name))
             {
-                auto remote_paths = data_part_storage.getRemotePaths(file_name);
-                for (const auto & remote_path : remote_paths)
-                    cache.removePathIfExists(remote_path, FileCache::getCommonUser().user_id);
+                const bool is_projection_part = data_part->isProjectionPart();
+                auto remote_path = data_part_storage.getRemotePath(file_name, /* if_exists */is_projection_part);
+                if (remote_path.empty())
+                {
+                    chassert(is_projection_part);
+                    throw Exception(
+                        ErrorCodes::BROKEN_PROJECTION,
+                        "Remote path for {} does not exist for projection path. Projection {} is broken",
+                        file_name, data_part->name);
+                }
+                cache.removePathIfExists(remote_path, FileCache::getCommonUser().user_id);
             }
         }
 
diff --git a/src/Storages/MergeTree/extractZooKeeperPathFromReplicatedTableDef.h b/src/Storages/MergeTree/extractZooKeeperPathFromReplicatedTableDef.h
index 212dc048868..5ef5e1db62e 100644
--- a/src/Storages/MergeTree/extractZooKeeperPathFromReplicatedTableDef.h
+++ b/src/Storages/MergeTree/extractZooKeeperPathFromReplicatedTableDef.h
@@ -14,6 +14,6 @@ using ContextPtr = std::shared_ptr<const Context>;
 /// Extracts a zookeeper path from a specified CREATE TABLE query.
 /// The function checks the table engine and if it is Replicated*MergeTree then it takes the first argument and expands macros in it.
 /// Returns std::nullopt if the specified CREATE query doesn't describe a Replicated table or its arguments can't be evaluated.
-std::optional<String> extractZooKeeperPathFromReplicatedTableDef(const ASTCreateQuery & create_query, const ContextPtr & local_context);
+std::optional<String> extractZooKeeperPathFromReplicatedTableDef(const ASTCreateQuery & create_query, const ContextPtr & context);
 
 }
diff --git a/src/Storages/MergeTree/registerStorageMergeTree.cpp b/src/Storages/MergeTree/registerStorageMergeTree.cpp
index 18ed7df9b5d..3f0603f6900 100644
--- a/src/Storages/MergeTree/registerStorageMergeTree.cpp
+++ b/src/Storages/MergeTree/registerStorageMergeTree.cpp
@@ -12,7 +12,6 @@
 #include <Common/Macros.h>
 #include <Common/OptimizedRegularExpression.h>
 #include <Common/typeid_cast.h>
-#include <Common/logger_useful.h>
 
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
@@ -35,7 +34,6 @@ namespace ErrorCodes
     extern const int UNKNOWN_STORAGE;
     extern const int NO_REPLICA_NAME_GIVEN;
     extern const int CANNOT_EXTRACT_TABLE_STRUCTURE;
-    extern const int SUPPORT_IS_DISABLED;
 }
 
 
@@ -190,7 +188,7 @@ static void extractZooKeeperPathAndReplicaNameFromEngineArgs(
     const String & engine_name,
     ASTs & engine_args,
     LoadingStrictnessLevel mode,
-    const ContextPtr & local_context,
+    const ContextPtr & context,
     String & zookeeper_path,
     String & replica_name,
     RenamingRestrictions & renaming_restrictions)
@@ -207,11 +205,11 @@ static void extractZooKeeperPathAndReplicaNameFromEngineArgs(
     {
         /// Allow expressions in engine arguments.
         /// In new syntax argument can be literal or identifier or array/tuple of identifiers.
-        evaluateEngineArgs(engine_args, local_context);
+        evaluateEngineArgs(engine_args, context);
     }
 
-    bool is_on_cluster = local_context->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
-    bool is_replicated_database = local_context->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY &&
+    bool is_on_cluster = context->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
+    bool is_replicated_database = context->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY &&
         DatabaseCatalog::instance().getDatabase(table_id.database_name)->getEngineName() == "Replicated";
 
     /// Allow implicit {uuid} macros only for zookeeper_path in ON CLUSTER queries
@@ -231,10 +229,10 @@ static void extractZooKeeperPathAndReplicaNameFromEngineArgs(
             /// We did unfold it in previous versions to make moving table from Atomic to Ordinary database work correctly,
             /// but now it's not allowed (and it was the only reason to unfold {uuid} macro).
             info.table_id.uuid = UUIDHelpers::Nil;
-            zookeeper_path = local_context->getMacros()->expand(zookeeper_path, info);
+            zookeeper_path = context->getMacros()->expand(zookeeper_path, info);
 
             info.level = 0;
-            replica_name = local_context->getMacros()->expand(replica_name, info);
+            replica_name = context->getMacros()->expand(replica_name, info);
         }
 
         ast_zk_path->value = zookeeper_path;
@@ -252,11 +250,11 @@ static void extractZooKeeperPathAndReplicaNameFromEngineArgs(
         }
         if (!allow_uuid_macro)
             info.table_id.uuid = UUIDHelpers::Nil;
-        zookeeper_path = local_context->getMacros()->expand(zookeeper_path, info);
+        zookeeper_path = context->getMacros()->expand(zookeeper_path, info);
 
         info.level = 0;
         info.table_id.uuid = UUIDHelpers::Nil;
-        replica_name = local_context->getMacros()->expand(replica_name, info);
+        replica_name = context->getMacros()->expand(replica_name, info);
 
         /// We do not allow renaming table with these macros in metadata, because zookeeper_path will be broken after RENAME TABLE.
         /// NOTE: it may happen if table was created by older version of ClickHouse (< 20.10) and macros was not unfolded on table creation
@@ -273,24 +271,9 @@ static void extractZooKeeperPathAndReplicaNameFromEngineArgs(
 
     bool has_arguments = (arg_num + 2 <= arg_cnt);
     bool has_valid_arguments = has_arguments && engine_args[arg_num]->as<ASTLiteral>() && engine_args[arg_num + 1]->as<ASTLiteral>();
-    const auto & server_settings = local_context->getServerSettings();
 
     if (has_valid_arguments)
     {
-        if (is_replicated_database && local_context->getSettingsRef().database_replicated_allow_replicated_engine_arguments == 0)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                            "It's not allowed to specify explicit zookeeper_path and replica_name "
-                            "for ReplicatedMergeTree arguments in Replicated database. If you really want to "
-                            "specify them explicitly, enable setting "
-                            "database_replicated_allow_replicated_engine_arguments.");
-        }
-        else if (is_replicated_database && local_context->getSettingsRef().database_replicated_allow_replicated_engine_arguments == 1)
-        {
-            LOG_WARNING(&Poco::Logger::get("registerStorageMergeTree"), "It's not recommended to explicitly specify "
-                                                            "zookeeper_path and replica_name in ReplicatedMergeTree arguments");
-        }
-
         /// Get path and name from engine arguments
         auto * ast_zk_path = engine_args[arg_num]->as<ASTLiteral>();
         if (ast_zk_path && ast_zk_path->value.getType() == Field::Types::String)
@@ -304,15 +287,6 @@ static void extractZooKeeperPathAndReplicaNameFromEngineArgs(
         else
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Replica name must be a string literal{}", verbose_help_message);
 
-
-        if (is_replicated_database && local_context->getSettingsRef().database_replicated_allow_replicated_engine_arguments == 2)
-        {
-            LOG_WARNING(&Poco::Logger::get("registerStorageMergeTree"), "Replacing user-provided ZooKeeper path and replica name ({}, {}) "
-                                                                     "with default arguments", zookeeper_path, replica_name);
-            engine_args[arg_num]->as<ASTLiteral>()->value = zookeeper_path = server_settings.default_replica_path;
-            engine_args[arg_num + 1]->as<ASTLiteral>()->value = replica_name = server_settings.default_replica_name;
-        }
-
         expand_macro(ast_zk_path, ast_replica_name);
     }
     else if (is_extended_storage_def
@@ -322,6 +296,7 @@ static void extractZooKeeperPathAndReplicaNameFromEngineArgs(
     {
         /// Try use default values if arguments are not specified.
         /// Note: {uuid} macro works for ON CLUSTER queries when database engine is Atomic.
+        const auto & server_settings = context->getServerSettings();
         zookeeper_path = server_settings.default_replica_path;
         /// TODO maybe use hostname if {replica} is not defined?
         replica_name = server_settings.default_replica_name;
@@ -346,7 +321,7 @@ static void extractZooKeeperPathAndReplicaNameFromEngineArgs(
 }
 
 /// Extracts a zookeeper path from a specified CREATE TABLE query.
-std::optional<String> extractZooKeeperPathFromReplicatedTableDef(const ASTCreateQuery & query, const ContextPtr & local_context)
+std::optional<String> extractZooKeeperPathFromReplicatedTableDef(const ASTCreateQuery & query, const ContextPtr & context)
 {
     if (!query.storage || !query.storage->engine)
         return {};
@@ -370,7 +345,7 @@ std::optional<String> extractZooKeeperPathFromReplicatedTableDef(const ASTCreate
 
     try
     {
-        extractZooKeeperPathAndReplicaNameFromEngineArgs(query, table_id, engine_name, engine_args, mode, local_context,
+        extractZooKeeperPathAndReplicaNameFromEngineArgs(query, table_id, engine_name, engine_args, mode, context,
                                                          zookeeper_path, replica_name, renaming_restrictions);
     }
     catch (Exception & e)
@@ -562,9 +537,6 @@ static StoragePtr create(const StorageFactory::Arguments & args)
 
         if (replica_name.empty())
             throw Exception(ErrorCodes::NO_REPLICA_NAME_GIVEN, "No replica name in config{}", verbose_help_message);
-        // '\t' and '\n' will interrupt parsing 'source replica' in ReplicatedMergeTreeLogEntryData::readText
-        if (replica_name.find('\t') != String::npos || replica_name.find('\n') != String::npos)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Replica name must not contain '\\t' or '\\n'");
 
         arg_cnt = engine_args.size(); /// Update `arg_cnt` here because extractZooKeeperPathAndReplicaNameFromEngineArgs() could add arguments.
         arg_num = 2;                  /// zookeeper_path and replica_name together are always two arguments.
@@ -619,7 +591,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
             if (ast->value.getType() != Field::Types::String)
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, format_str, error_msg);
 
-            graphite_config_name = ast->value.safeGet<String>();
+            graphite_config_name = ast->value.get<String>();
         }
         else
             throw Exception(ErrorCodes::BAD_ARGUMENTS, format_str, error_msg);
@@ -857,18 +829,6 @@ static StoragePtr create(const StorageFactory::Arguments & args)
                     "Floating point partition key is not supported: {}", metadata.partition_key.column_names[i]);
     }
 
-    if (metadata.hasProjections() && args.mode == LoadingStrictnessLevel::CREATE)
-    {
-        /// Now let's handle the merge tree family. Note we only handle in the mode of CREATE due to backward compatibility.
-        /// Otherwise, it would fail to start in the case of existing projections with special mergetree.
-        if (merging_params.mode != MergeTreeData::MergingParams::Mode::Ordinary
-            && storage_settings->deduplicate_merge_projection_mode == DeduplicateMergeProjectionMode::THROW)
-            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
-                "Projection is fully supported in {}MergeTree with deduplicate_merge_projection_mode = throw. "
-                "Use 'drop' or 'rebuild' option of deduplicate_merge_projection_mode.",
-                merging_params.getModeName());
-    }
-
     if (arg_num != arg_cnt)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Wrong number of engine arguments.");
 
diff --git a/src/Storages/MessageQueueSink.cpp b/src/Storages/MessageQueueSink.cpp
index 8190a375b97..c3b33440569 100644
--- a/src/Storages/MessageQueueSink.cpp
+++ b/src/Storages/MessageQueueSink.cpp
@@ -1,7 +1,6 @@
 #include <Storages/MessageQueueSink.h>
 #include <Formats/FormatFactory.h>
 #include <Processors/Formats/IRowOutputFormat.h>
-#include <Common/Exception.h>
 #include <Common/logger_useful.h>
 
 namespace DB
@@ -81,16 +80,5 @@ void MessageQueueSink::consume(Chunk & chunk)
     }
 }
 
-void MessageQueueSink::onCancel() noexcept
-{
-    try
-    {
-        onFinish();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(getLogger("MessageQueueSink"), "Error occurs on cancellation.");
-    }
-}
 
 }
diff --git a/src/Storages/MessageQueueSink.h b/src/Storages/MessageQueueSink.h
index cb6562185c0..4a9248c6c4d 100644
--- a/src/Storages/MessageQueueSink.h
+++ b/src/Storages/MessageQueueSink.h
@@ -39,7 +39,7 @@ public:
 
     void onStart() override;
     void onFinish() override;
-    void onCancel() noexcept override;
+    void onCancel() override { onFinish(); }
     void onException(std::exception_ptr /* exception */) override { onFinish(); }
 
 protected:
diff --git a/src/Storages/MutationCommands.cpp b/src/Storages/MutationCommands.cpp
index 719ebb06ec7..f736c863eee 100644
--- a/src/Storages/MutationCommands.cpp
+++ b/src/Storages/MutationCommands.cpp
@@ -22,7 +22,6 @@ namespace ErrorCodes
 {
     extern const int UNKNOWN_MUTATION_COMMAND;
     extern const int MULTIPLE_ASSIGNMENTS_TO_COLUMN;
-    extern const int LOGICAL_ERROR;
 }
 
 
@@ -116,17 +115,12 @@ std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command,
         res.column_name = getIdentifierName(command->column);
         return res;
     }
-    /// MODIFY COLUMN x REMOVE MATERIALIZED/RESET SETTING/MODIFY SETTING is a valid alter command, but doesn't have any specified column type,
-    /// thus no mutation is needed
-    else if (
-        parse_alter_commands && command->type == ASTAlterCommand::MODIFY_COLUMN && command->remove_property.empty() && nullptr == command->settings_changes && nullptr == command->settings_resets)
+    else if (parse_alter_commands && command->type == ASTAlterCommand::MODIFY_COLUMN)
     {
         MutationCommand res;
         res.ast = command->ptr();
         res.type = MutationCommand::Type::READ_COLUMN;
         const auto & ast_col_decl = command->col_decl->as<ASTColumnDeclaration &>();
-        if (nullptr == ast_col_decl.type)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "MODIFY COLUMN mutation command doesn't specify type: {}", serializeAST(*command));
         res.column_name = ast_col_decl.name;
         res.data_type = DataTypeFactory::instance().get(ast_col_decl.type);
         return res;
@@ -274,13 +268,4 @@ bool MutationCommands::containBarrierCommand() const
     return false;
 }
 
-NameSet MutationCommands::getAllUpdatedColumns() const
-{
-    NameSet res;
-    for (const auto & command : *this)
-        for (const auto & [column_name, _] : command.column_to_update_expression)
-            res.insert(column_name);
-    return res;
-}
-
 }
diff --git a/src/Storages/MutationCommands.h b/src/Storages/MutationCommands.h
index 5ae537bb657..f999aab1f4d 100644
--- a/src/Storages/MutationCommands.h
+++ b/src/Storages/MutationCommands.h
@@ -92,7 +92,6 @@ public:
     /// stick with other commands. Commands from one set have already been validated
     /// to be executed without issues on the creation state.
     bool containBarrierCommand() const;
-    NameSet getAllUpdatedColumns() const;
 };
 
 using MutationCommandsConstPtr = std::shared_ptr<MutationCommands>;
diff --git a/src/Storages/NATS/StorageNATS.cpp b/src/Storages/NATS/StorageNATS.cpp
index 9d728c3395f..8f0e2d76473 100644
--- a/src/Storages/NATS/StorageNATS.cpp
+++ b/src/Storages/NATS/StorageNATS.cpp
@@ -49,7 +49,6 @@ StorageNATS::StorageNATS(
     const StorageID & table_id_,
     ContextPtr context_,
     const ColumnsDescription & columns_,
-    const String & comment,
     std::unique_ptr<NATSSettings> nats_settings_,
     LoadingStrictnessLevel mode)
     : IStorage(table_id_)
@@ -88,7 +87,6 @@ StorageNATS::StorageNATS(
 
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
-    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
     setVirtuals(createVirtuals(nats_settings->nats_handle_error_mode));
 
@@ -762,7 +760,7 @@ 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, args.comment, std::move(nats_settings), args.mode);
+        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, });
diff --git a/src/Storages/NATS/StorageNATS.h b/src/Storages/NATS/StorageNATS.h
index 5fca8cb0163..41d77acfde6 100644
--- a/src/Storages/NATS/StorageNATS.h
+++ b/src/Storages/NATS/StorageNATS.h
@@ -23,7 +23,6 @@ public:
         const StorageID & table_id_,
         ContextPtr context_,
         const ColumnsDescription & columns_,
-        const String & comment,
         std::unique_ptr<NATSSettings> nats_settings_,
         LoadingStrictnessLevel mode);
 
diff --git a/src/Storages/NamedCollectionsHelpers.h b/src/Storages/NamedCollectionsHelpers.h
index bf2da7235a2..f444a581eb6 100644
--- a/src/Storages/NamedCollectionsHelpers.h
+++ b/src/Storages/NamedCollectionsHelpers.h
@@ -133,7 +133,7 @@ void validateNamedCollection(
         {
              throw Exception(
                  ErrorCodes::BAD_ARGUMENTS,
-                 "Unexpected key `{}` in named collection. Required keys: {}, optional keys: {}",
+                 "Unexpected key {} in named collection. Required keys: {}, optional keys: {}",
                  backQuoteIfNeed(key), fmt::join(required_keys, ", "), fmt::join(optional_keys, ", "));
         }
     }
diff --git a/src/Storages/ObjectStorage/Azure/Configuration.cpp b/src/Storages/ObjectStorage/Azure/Configuration.cpp
index 8121f389a8d..b50b04c280c 100644
--- a/src/Storages/ObjectStorage/Azure/Configuration.cpp
+++ b/src/Storages/ObjectStorage/Azure/Configuration.cpp
@@ -151,7 +151,7 @@ void StorageAzureConfiguration::fromAST(ASTs & engine_args, ContextPtr context,
     {
         throw Exception(
             ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-            "Storage AzureBlobStorage requires 1 to {} arguments. All supported signatures:\n{}",
+            "Storage AzureBlobStorage requires 3 to {} arguments. All supported signatures:\n{}",
             getMaxNumberOfArguments(with_structure),
             getSignatures(with_structure));
     }
diff --git a/src/Storages/ObjectStorage/DataLakes/DeltaLakeMetadata.cpp b/src/Storages/ObjectStorage/DataLakes/DeltaLakeMetadata.cpp
index f04e868ee5a..14b18809a0d 100644
--- a/src/Storages/ObjectStorage/DataLakes/DeltaLakeMetadata.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/DeltaLakeMetadata.cpp
@@ -3,7 +3,7 @@
 #include "config.h"
 #include <set>
 
-#if USE_PARQUET
+#if USE_AWS_S3 && USE_PARQUET
 
 #include <Common/logger_useful.h>
 #include <Columns/ColumnString.h>
@@ -207,28 +207,18 @@ struct DeltaLakeMetadataImpl
             Poco::Dynamic::Var json = parser.parse(json_str);
             Poco::JSON::Object::Ptr object = json.extract<Poco::JSON::Object::Ptr>();
 
-            if (!object)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Failed to parse metadata file");
-
-#ifdef ABORT_ON_LOGICAL_ERROR
             std::ostringstream oss; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
             object->stringify(oss);
             LOG_TEST(log, "Metadata: {}", oss.str());
-#endif
 
             if (object->has("metaData"))
             {
                 const auto metadata_object = object->get("metaData").extract<Poco::JSON::Object::Ptr>();
-                if (!metadata_object)
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Failed to extract `metaData` field");
-
                 const auto schema_object = metadata_object->getValue<String>("schemaString");
 
                 Poco::JSON::Parser p;
                 Poco::Dynamic::Var fields_json = parser.parse(schema_object);
                 const Poco::JSON::Object::Ptr & fields_object = fields_json.extract<Poco::JSON::Object::Ptr>();
-                if (!fields_object)
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Failed to extract `fields` field");
 
                 auto current_schema = parseMetadata(fields_object);
                 if (file_schema.empty())
@@ -247,9 +237,6 @@ struct DeltaLakeMetadataImpl
             if (object->has("add"))
             {
                 auto add_object = object->get("add").extract<Poco::JSON::Object::Ptr>();
-                if (!add_object)
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Failed to extract `add` field");
-
                 auto path = add_object->getValue<String>("path");
                 result.insert(fs::path(configuration->getPath()) / path);
 
@@ -260,9 +247,6 @@ struct DeltaLakeMetadataImpl
                     if (add_object->has("partitionValues"))
                     {
                         auto partition_values = add_object->get("partitionValues").extract<Poco::JSON::Object::Ptr>();
-                        if (!partition_values)
-                            throw Exception(ErrorCodes::LOGICAL_ERROR, "Failed to extract `partitionValues` field");
-
                         if (partition_values->size())
                         {
                             auto & current_partition_columns = file_partition_columns[filename];
@@ -278,11 +262,10 @@ struct DeltaLakeMetadataImpl
                                         partition_name, file_schema.toNamesAndTypesDescription());
                                 }
 
-                                LOG_TEST(log, "Partition {} value is {} (data type: {}, file: {})",
-                                         partition_name, value, name_and_type->type->getName(), filename);
-
                                 auto field = getFieldValue(value, name_and_type->type);
                                 current_partition_columns.emplace_back(*name_and_type, field);
+
+                                LOG_TEST(log, "Partition {} value is {} (for {})", partition_name, value, filename);
                             }
                         }
                     }
@@ -290,11 +273,7 @@ struct DeltaLakeMetadataImpl
             }
             else if (object->has("remove"))
             {
-                auto remove_object = object->get("remove").extract<Poco::JSON::Object::Ptr>();
-                if (!remove_object)
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Failed to extract `remove` field");
-
-                auto path = remove_object->getValue<String>("path");
+                auto path = object->get("remove").extract<Poco::JSON::Object::Ptr>()->getValue<String>("path");
                 result.erase(fs::path(configuration->getPath()) / path);
             }
         }
@@ -353,8 +332,6 @@ struct DeltaLakeMetadataImpl
         WhichDataType which(check_type->getTypeId());
         if (which.isStringOrFixedString())
             return value;
-        else if (isBool(check_type))
-            return parse<bool>(value);
         else if (which.isInt8())
             return parse<Int8>(value);
         else if (which.isUInt8())
diff --git a/src/Storages/ObjectStorage/DataLakes/IStorageDataLake.h b/src/Storages/ObjectStorage/DataLakes/IStorageDataLake.h
index 4b21bdb0494..c8603fccb86 100644
--- a/src/Storages/ObjectStorage/DataLakes/IStorageDataLake.h
+++ b/src/Storages/ObjectStorage/DataLakes/IStorageDataLake.h
@@ -2,7 +2,7 @@
 
 #include "config.h"
 
-#if USE_AVRO
+#if USE_AWS_S3 && USE_AVRO
 
 #include <Formats/FormatFactory.h>
 #include <Storages/IStorage.h>
@@ -91,9 +91,8 @@ public:
         {
             ConfigurationPtr configuration = base_configuration->clone();
             configuration->setPaths(metadata->getDataFiles());
-            std::string sample_path;
             return Storage::resolveSchemaFromData(
-                object_storage_, configuration, format_settings_, sample_path, local_context);
+                object_storage_, configuration, format_settings_, local_context);
         }
     }
 
diff --git a/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.cpp b/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.cpp
index 9b9d92e282c..6d18b13df01 100644
--- a/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.cpp
@@ -1,6 +1,6 @@
 #include "config.h"
 
-#if USE_AVRO
+#if USE_AWS_S3 && USE_AVRO
 
 #include <Common/logger_useful.h>
 #include <Core/Settings.h>
diff --git a/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.h b/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.h
index 7b0deab91c3..9476ac6e7d9 100644
--- a/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.h
+++ b/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#if USE_AVRO /// StorageIceberg depending on Avro to parse metadata with Avro format.
+#if USE_AWS_S3 && USE_AVRO /// StorageIceberg depending on Avro to parse metadata with Avro format.
 
 #include <Interpreters/Context_fwd.h>
 #include <Core/Types.h>
diff --git a/src/Storages/ObjectStorage/DataLakes/registerDataLakeStorages.cpp b/src/Storages/ObjectStorage/DataLakes/registerDataLakeStorages.cpp
index f0bd51de375..0fa6402e892 100644
--- a/src/Storages/ObjectStorage/DataLakes/registerDataLakeStorages.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/registerDataLakeStorages.cpp
@@ -2,12 +2,10 @@
 
 #if USE_AWS_S3
 
-#    include <Storages/ObjectStorage/Azure/Configuration.h>
-#    include <Storages/ObjectStorage/DataLakes/IDataLakeMetadata.h>
-#    include <Storages/ObjectStorage/DataLakes/IStorageDataLake.h>
-#    include <Storages/ObjectStorage/DataLakes/IcebergMetadata.h>
-#    include <Storages/ObjectStorage/Local/Configuration.h>
-#    include <Storages/ObjectStorage/S3/Configuration.h>
+#include <Storages/ObjectStorage/DataLakes/IDataLakeMetadata.h>
+#include <Storages/ObjectStorage/DataLakes/IStorageDataLake.h>
+#include <Storages/ObjectStorage/DataLakes/IcebergMetadata.h>
+#include <Storages/ObjectStorage/S3/Configuration.h>
 
 
 namespace DB
@@ -24,54 +22,6 @@ void registerStorageIceberg(StorageFactory & factory)
             auto configuration = std::make_shared<StorageS3Configuration>();
             StorageObjectStorage::Configuration::initialize(*configuration, args.engine_args, args.getLocalContext(), false);
 
-            return StorageIceberg::create(
-                configuration, args.getContext(), args.table_id, args.columns, args.constraints, args.comment, std::nullopt, args.mode);
-        },
-        {
-            .supports_settings = false,
-            .supports_schema_inference = true,
-            .source_access_type = AccessType::S3,
-        });
-
-    factory.registerStorage(
-        "IcebergS3",
-        [&](const StorageFactory::Arguments & args)
-        {
-            auto configuration = std::make_shared<StorageS3Configuration>();
-            StorageObjectStorage::Configuration::initialize(*configuration, args.engine_args, args.getLocalContext(), false);
-
-            return StorageIceberg::create(
-                configuration, args.getContext(), args.table_id, args.columns, args.constraints, args.comment, std::nullopt, args.mode);
-        },
-        {
-            .supports_settings = false,
-            .supports_schema_inference = true,
-            .source_access_type = AccessType::S3,
-        });
-
-    factory.registerStorage(
-        "IcebergAzure",
-        [&](const StorageFactory::Arguments & args)
-        {
-            auto configuration = std::make_shared<StorageAzureConfiguration>();
-            StorageObjectStorage::Configuration::initialize(*configuration, args.engine_args, args.getLocalContext(), true);
-
-            return StorageIceberg::create(
-                configuration, args.getContext(), args.table_id, args.columns, args.constraints, args.comment, std::nullopt, args.mode);
-        },
-        {
-            .supports_settings = false,
-            .supports_schema_inference = true,
-            .source_access_type = AccessType::AZURE,
-        });
-
-    factory.registerStorage(
-        "IcebergLocal",
-        [&](const StorageFactory::Arguments & args)
-        {
-            auto configuration = std::make_shared<StorageLocalConfiguration>();
-            StorageObjectStorage::Configuration::initialize(*configuration, args.engine_args, args.getLocalContext(), false);
-
             return StorageIceberg::create(
                 configuration, args.getContext(), args.table_id, args.columns,
                 args.constraints, args.comment, std::nullopt, args.mode);
@@ -79,7 +29,7 @@ void registerStorageIceberg(StorageFactory & factory)
         {
             .supports_settings = false,
             .supports_schema_inference = true,
-            .source_access_type = AccessType::FILE,
+            .source_access_type = AccessType::S3,
         });
 }
 
diff --git a/src/Storages/ObjectStorage/HDFS/AsynchronousReadBufferFromHDFS.cpp b/src/Storages/ObjectStorage/HDFS/AsynchronousReadBufferFromHDFS.cpp
index 3bbc4e8a2ea..21df7e35284 100644
--- a/src/Storages/ObjectStorage/HDFS/AsynchronousReadBufferFromHDFS.cpp
+++ b/src/Storages/ObjectStorage/HDFS/AsynchronousReadBufferFromHDFS.cpp
@@ -91,9 +91,9 @@ void AsynchronousReadBufferFromHDFS::prefetch(Priority priority)
 }
 
 
-std::optional<size_t> AsynchronousReadBufferFromHDFS::tryGetFileSize()
+size_t AsynchronousReadBufferFromHDFS::getFileSize()
 {
-    return impl->tryGetFileSize();
+    return impl->getFileSize();
 }
 
 String AsynchronousReadBufferFromHDFS::getFileName() const
diff --git a/src/Storages/ObjectStorage/HDFS/AsynchronousReadBufferFromHDFS.h b/src/Storages/ObjectStorage/HDFS/AsynchronousReadBufferFromHDFS.h
index 9846d74453b..5aef92315a4 100644
--- a/src/Storages/ObjectStorage/HDFS/AsynchronousReadBufferFromHDFS.h
+++ b/src/Storages/ObjectStorage/HDFS/AsynchronousReadBufferFromHDFS.h
@@ -35,7 +35,7 @@ public:
 
     void prefetch(Priority priority) override;
 
-    std::optional<size_t> tryGetFileSize() override;
+    size_t getFileSize() override;
 
     String getFileName() const override;
 
diff --git a/src/Storages/ObjectStorage/HDFS/Configuration.cpp b/src/Storages/ObjectStorage/HDFS/Configuration.cpp
index 9b5bbdeacc1..0360f34c7b8 100644
--- a/src/Storages/ObjectStorage/HDFS/Configuration.cpp
+++ b/src/Storages/ObjectStorage/HDFS/Configuration.cpp
@@ -144,11 +144,11 @@ void StorageHDFSConfiguration::setURL(const std::string & url_)
 {
     auto pos = url_.find("//");
     if (pos == std::string::npos)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad HDFS URL: {}. It should have the following structure 'hdfs://<host_name>:<port>/path'", url_);
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad hdfs url: {}", url_);
 
     pos = url_.find('/', pos + 2);
     if (pos == std::string::npos)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad HDFS URL: {}. It should have the following structure 'hdfs://<host_name>:<port>/path'", url_);
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad hdfs url: {}", url_);
 
     path = url_.substr(pos + 1);
     if (!path.starts_with('/'))
@@ -157,7 +157,7 @@ void StorageHDFSConfiguration::setURL(const std::string & url_)
     url = url_.substr(0, pos);
     paths = {path};
 
-    LOG_TRACE(getLogger("StorageHDFSConfiguration"), "Using URL: {}, path: {}", url, path);
+    LOG_TRACE(getLogger("StorageHDFSConfiguration"), "Using url: {}, path: {}", url, path);
 }
 
 void StorageHDFSConfiguration::addStructureAndFormatToArgsIfNeeded(
diff --git a/src/Storages/ObjectStorage/HDFS/HDFSCommon.cpp b/src/Storages/ObjectStorage/HDFS/HDFSCommon.cpp
index 7f8727eea1c..365828bcc40 100644
--- a/src/Storages/ObjectStorage/HDFS/HDFSCommon.cpp
+++ b/src/Storages/ObjectStorage/HDFS/HDFSCommon.cpp
@@ -192,7 +192,7 @@ String getNameNodeCluster(const String &hdfs_url)
 void checkHDFSURL(const String & url)
 {
     if (!re2::RE2::FullMatch(url, std::string(HDFS_URL_REGEXP)))
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad HDFS URL: {}. It should have structure 'hdfs://<host_name>:<port>/<path>'", url);
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad hdfs url: {}. It should have structure 'hdfs://<host_name>:<port>/<path>'", url);
 }
 
 }
diff --git a/src/Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.cpp b/src/Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.cpp
index 7498e949073..be339d021dc 100644
--- a/src/Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.cpp
+++ b/src/Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.cpp
@@ -31,7 +31,7 @@ namespace ErrorCodes
 }
 
 
-struct ReadBufferFromHDFS::ReadBufferFromHDFSImpl : public BufferWithOwnMemory<SeekableReadBuffer>, public WithFileSize
+struct ReadBufferFromHDFS::ReadBufferFromHDFSImpl : public BufferWithOwnMemory<SeekableReadBuffer>
 {
     String hdfs_uri;
     String hdfs_file_path;
@@ -90,7 +90,7 @@ struct ReadBufferFromHDFS::ReadBufferFromHDFSImpl : public BufferWithOwnMemory<S
         hdfsCloseFile(fs.get(), fin);
     }
 
-    std::optional<size_t> tryGetFileSize() override
+    size_t getFileSize() const
     {
         return file_size;
     }
@@ -119,16 +119,27 @@ struct ReadBufferFromHDFS::ReadBufferFromHDFSImpl : public BufferWithOwnMemory<S
             return false;
         }
 
-        ResourceGuard rlock(ResourceGuard::Metrics::getIORead(), read_settings.io_scheduling.read_resource_link, num_bytes_to_read);
-        int bytes_read = hdfsRead(fs.get(), fin, internal_buffer.begin(), safe_cast<int>(num_bytes_to_read));
-        rlock.unlock(std::max(0, bytes_read));
+        ResourceGuard rlock(read_settings.resource_link, num_bytes_to_read);
+        int bytes_read;
+        try
+        {
+            bytes_read = hdfsRead(fs.get(), fin, internal_buffer.begin(), safe_cast<int>(num_bytes_to_read));
+        }
+        catch (...)
+        {
+            read_settings.resource_link.accumulate(num_bytes_to_read); // We assume no resource was used in case of failure
+            throw;
+        }
+        rlock.unlock();
 
         if (bytes_read < 0)
         {
+            read_settings.resource_link.accumulate(num_bytes_to_read); // We assume no resource was used in case of failure
             throw Exception(ErrorCodes::NETWORK_ERROR,
                 "Fail to read from HDFS: {}, file path: {}. Error: {}",
                 hdfs_uri, hdfs_file_path, std::string(hdfsGetLastError()));
         }
+        read_settings.resource_link.adjust(num_bytes_to_read, bytes_read);
 
         if (bytes_read)
         {
@@ -180,9 +191,9 @@ ReadBufferFromHDFS::ReadBufferFromHDFS(
 
 ReadBufferFromHDFS::~ReadBufferFromHDFS() = default;
 
-std::optional<size_t> ReadBufferFromHDFS::tryGetFileSize()
+size_t ReadBufferFromHDFS::getFileSize()
 {
-    return impl->tryGetFileSize();
+    return impl->getFileSize();
 }
 
 bool ReadBufferFromHDFS::nextImpl()
diff --git a/src/Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.h b/src/Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.h
index 5363f07967b..d9671e7e445 100644
--- a/src/Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.h
+++ b/src/Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.h
@@ -40,7 +40,7 @@ public:
 
     off_t getPosition() override;
 
-    std::optional<size_t> tryGetFileSize() override;
+    size_t getFileSize() override;
 
     size_t getFileOffsetOfBufferEnd() const override;
 
diff --git a/src/Storages/ObjectStorage/HDFS/WriteBufferFromHDFS.cpp b/src/Storages/ObjectStorage/HDFS/WriteBufferFromHDFS.cpp
index 4f6f8c782f2..e2e7f238a5e 100644
--- a/src/Storages/ObjectStorage/HDFS/WriteBufferFromHDFS.cpp
+++ b/src/Storages/ObjectStorage/HDFS/WriteBufferFromHDFS.cpp
@@ -66,12 +66,25 @@ struct WriteBufferFromHDFS::WriteBufferFromHDFSImpl
 
     int write(const char * start, size_t size)
     {
-        ResourceGuard rlock(ResourceGuard::Metrics::getIOWrite(), write_settings.io_scheduling.write_resource_link, size);
-        int bytes_written = hdfsWrite(fs.get(), fout, start, safe_cast<int>(size));
-        rlock.unlock(std::max(0, bytes_written));
+        ResourceGuard rlock(write_settings.resource_link, size);
+        int bytes_written;
+        try
+        {
+            bytes_written = hdfsWrite(fs.get(), fout, start, safe_cast<int>(size));
+        }
+        catch (...)
+        {
+            write_settings.resource_link.accumulate(size); // We assume no resource was used in case of failure
+            throw;
+        }
+        rlock.unlock();
 
         if (bytes_written < 0)
+        {
+            write_settings.resource_link.accumulate(size); // We assume no resource was used in case of failure
             throw Exception(ErrorCodes::NETWORK_ERROR, "Fail to write HDFS file: {} {}", hdfs_uri, std::string(hdfsGetLastError()));
+        }
+        write_settings.resource_link.adjust(size, bytes_written);
 
         if (write_settings.remote_throttler)
             write_settings.remote_throttler->add(bytes_written, ProfileEvents::RemoteWriteThrottlerBytes, ProfileEvents::RemoteWriteThrottlerSleepMicroseconds);
diff --git a/src/Storages/ObjectStorage/Local/Configuration.cpp b/src/Storages/ObjectStorage/Local/Configuration.cpp
deleted file mode 100644
index 0554b9c317c..00000000000
--- a/src/Storages/ObjectStorage/Local/Configuration.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-#include <Core/Settings.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/evaluateConstantExpression.h>
-#include <Storages/ObjectStorage/Local/Configuration.h>
-#include <Storages/checkAndGetLiteralArgument.h>
-#include "Common/NamedCollections/NamedCollections.h"
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-}
-
-void StorageLocalConfiguration::fromNamedCollection(const NamedCollection & collection, ContextPtr)
-{
-    path = collection.get<String>("path");
-    format = collection.getOrDefault<String>("format", "auto");
-    compression_method = collection.getOrDefault<String>("compression_method", collection.getOrDefault<String>("compression", "auto"));
-    structure = collection.getOrDefault<String>("structure", "auto");
-    paths = {path};
-}
-
-
-void StorageLocalConfiguration::fromAST(ASTs & args, ContextPtr context, bool with_structure)
-{
-    if (args.empty() || args.size() > getMaxNumberOfArguments(with_structure))
-        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-            "Storage Local requires 1 to {} arguments. All supported signatures:\n{}",
-            getMaxNumberOfArguments(with_structure),
-            getSignatures(with_structure));
-
-    for (auto & arg : args)
-        arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
-
-    path = checkAndGetLiteralArgument<String>(args[0], "path");
-
-    if (args.size() > 1)
-    {
-        format = checkAndGetLiteralArgument<String>(args[1], "format_name");
-    }
-
-    if (with_structure)
-    {
-        if (args.size() > 2)
-        {
-            structure = checkAndGetLiteralArgument<String>(args[2], "structure");
-        }
-        if (args.size() > 3)
-        {
-            compression_method = checkAndGetLiteralArgument<String>(args[3], "compression_method");
-        }
-    }
-    else if (args.size() > 2)
-    {
-        compression_method = checkAndGetLiteralArgument<String>(args[2], "compression_method");
-    }
-    paths = {path};
-}
-
-StorageObjectStorage::QuerySettings StorageLocalConfiguration::getQuerySettings(const ContextPtr & context) const
-{
-    const auto & settings = context->getSettingsRef();
-    return StorageObjectStorage::QuerySettings{
-        .truncate_on_insert = settings.engine_file_truncate_on_insert,
-        .create_new_file_on_insert = false,
-        .schema_inference_use_cache = settings.schema_inference_use_cache_for_file,
-        .schema_inference_mode = settings.schema_inference_mode,
-        .skip_empty_files = settings.engine_file_skip_empty_files,
-        .list_object_keys_size = 0,
-        .throw_on_zero_files_match = false,
-        .ignore_non_existent_file = false};
-}
-
-}
diff --git a/src/Storages/ObjectStorage/Local/Configuration.h b/src/Storages/ObjectStorage/Local/Configuration.h
deleted file mode 100644
index 84dc3855df3..00000000000
--- a/src/Storages/ObjectStorage/Local/Configuration.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#pragma once
-
-#include <memory>
-#include "Disks/ObjectStorages/Local/LocalObjectStorage.h"
-
-#include <Storages/ObjectStorage/StorageObjectStorage.h>
-
-#include <filesystem>
-
-
-namespace fs = std::filesystem;
-
-namespace DB
-{
-
-class StorageLocalConfiguration : public StorageObjectStorage::Configuration
-{
-public:
-    using ConfigurationPtr = StorageObjectStorage::ConfigurationPtr;
-
-    static constexpr auto type_name = "local";
-    /// All possible signatures for Local engine with structure argument (for example for local table function).
-    static constexpr auto max_number_of_arguments_with_structure = 4;
-    static constexpr auto signatures_with_structure =
-        " - path\n"
-        " - path, format\n"
-        " - path, format, structure\n"
-        " - path, format, structure, compression_method\n";
-
-    /// All possible signatures for S3 engine without structure argument (for example for Local table engine).
-    static constexpr auto max_number_of_arguments_without_structure = 3;
-    static constexpr auto signatures_without_structure =
-        " - path\n"
-        " - path, format\n"
-        " - path, format, compression_method\n";
-
-    StorageLocalConfiguration() = default;
-    StorageLocalConfiguration(const StorageLocalConfiguration & other) = default;
-
-    std::string getTypeName() const override { return type_name; }
-    std::string getEngineName() const override { return "Local"; }
-
-    std::string getSignatures(bool with_structure = true) const { return with_structure ? signatures_with_structure : signatures_without_structure; }
-    size_t getMaxNumberOfArguments(bool with_structure = true) const { return with_structure ? max_number_of_arguments_with_structure : max_number_of_arguments_without_structure; }
-
-    Path getPath() const override { return path; }
-    void setPath(const Path & path_) override { path = path_; }
-
-    const Paths & getPaths() const override { return paths; }
-    void setPaths(const Paths & paths_) override { paths = paths_; }
-
-    String getNamespace() const override { return ""; }
-    String getDataSourceDescription() const override { return ""; }
-    StorageObjectStorage::QuerySettings getQuerySettings(const ContextPtr &) const override;
-
-    ConfigurationPtr clone() override { return std::make_shared<StorageLocalConfiguration>(*this); }
-
-    ObjectStoragePtr createObjectStorage(ContextPtr, bool) override { return std::make_shared<LocalObjectStorage>("/"); }
-
-    void addStructureAndFormatToArgsIfNeeded(ASTs &, const String &, const String &, ContextPtr) override { }
-
-private:
-    void fromNamedCollection(const NamedCollection & collection, ContextPtr context) override;
-    void fromAST(ASTs & args, ContextPtr context, bool with_structure) override;
-    Path path;
-    Paths paths;
-};
-
-}
diff --git a/src/Storages/ObjectStorage/ReadBufferIterator.cpp b/src/Storages/ObjectStorage/ReadBufferIterator.cpp
index fadf683fce7..d739f7a28c9 100644
--- a/src/Storages/ObjectStorage/ReadBufferIterator.cpp
+++ b/src/Storages/ObjectStorage/ReadBufferIterator.cpp
@@ -132,7 +132,7 @@ void ReadBufferIterator::setFormatName(const String & format_name)
     format = format_name;
 }
 
-String ReadBufferIterator::getLastFilePath() const
+String ReadBufferIterator::getLastFileName() const
 {
     if (current_object_info)
         return current_object_info->getPath();
@@ -163,9 +163,7 @@ ReadBufferIterator::Data ReadBufferIterator::next()
         {
             for (const auto & object_info : read_keys)
             {
-                auto format_from_file_name = FormatFactory::instance().tryGetFormatFromFileName(object_info->getFileName());
-                /// Use this format only if we have a schema reader for it.
-                if (format_from_file_name && FormatFactory::instance().checkIfFormatHasAnySchemaReader(*format_from_file_name))
+                if (auto format_from_file_name = FormatFactory::instance().tryGetFormatFromFileName(object_info->getFileName()))
                 {
                     format = format_from_file_name;
                     break;
@@ -223,9 +221,7 @@ ReadBufferIterator::Data ReadBufferIterator::next()
             {
                 for (auto it = read_keys.begin() + prev_read_keys_size; it != read_keys.end(); ++it)
                 {
-                    auto format_from_file_name = FormatFactory::instance().tryGetFormatFromFileName((*it)->getFileName());
-                    /// Use this format only if we have a schema reader for it.
-                    if (format_from_file_name && FormatFactory::instance().checkIfFormatHasAnySchemaReader(*format_from_file_name))
+                    if (auto format_from_file_name = FormatFactory::instance().tryGetFormatFromFileName((*it)->getFileName()))
                     {
                         format = format_from_file_name;
                         break;
diff --git a/src/Storages/ObjectStorage/ReadBufferIterator.h b/src/Storages/ObjectStorage/ReadBufferIterator.h
index b81aebb7b07..6eeb52ec2ed 100644
--- a/src/Storages/ObjectStorage/ReadBufferIterator.h
+++ b/src/Storages/ObjectStorage/ReadBufferIterator.h
@@ -33,7 +33,7 @@ public:
 
     void setResultingSchema(const ColumnsDescription & columns) override;
 
-    String getLastFilePath() const override;
+    String getLastFileName() const override;
 
     void setFormatName(const String & format_name) override;
 
diff --git a/src/Storages/ObjectStorage/StorageObjectStorage.cpp b/src/Storages/ObjectStorage/StorageObjectStorage.cpp
index f0686c144ba..fe675a17d54 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorage.cpp
+++ b/src/Storages/ObjectStorage/StorageObjectStorage.cpp
@@ -1,5 +1,4 @@
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
-#include <Core/ColumnWithTypeAndName.h>
 
 #include <Core/Settings.h>
 #include <Formats/FormatFactory.h>
@@ -34,33 +33,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-String StorageObjectStorage::getPathSample(StorageInMemoryMetadata metadata, ContextPtr context)
-{
-    auto query_settings = configuration->getQuerySettings(context);
-    /// We don't want to throw an exception if there are no files with specified path.
-    query_settings.throw_on_zero_files_match = false;
-
-    bool local_distributed_processing = distributed_processing;
-    if (context->getSettingsRef().use_hive_partitioning)
-        local_distributed_processing = false;
-
-    auto file_iterator = StorageObjectStorageSource::createFileIterator(
-        configuration,
-        query_settings,
-        object_storage,
-        local_distributed_processing,
-        context,
-        {}, // predicate
-        metadata.getColumns().getAll(), // virtual_columns
-        nullptr, // read_keys
-        {} // file_progress_callback
-    );
-
-    if (auto file = file_iterator->next(0))
-        return file->getPath();
-    return "";
-}
-
 StorageObjectStorage::StorageObjectStorage(
     ConfigurationPtr configuration_,
     ObjectStoragePtr object_storage_,
@@ -81,9 +53,7 @@ StorageObjectStorage::StorageObjectStorage(
     , log(getLogger(fmt::format("Storage{}({})", configuration->getEngineName(), table_id_.getFullTableName())))
 {
     ColumnsDescription columns{columns_};
-
-    std::string sample_path;
-    resolveSchemaAndFormat(columns, configuration->format, object_storage, configuration, format_settings, sample_path, context);
+    resolveSchemaAndFormat(columns, configuration->format, object_storage, configuration, format_settings, context);
     configuration->check(context);
 
     StorageInMemoryMetadata metadata;
@@ -91,10 +61,7 @@ StorageObjectStorage::StorageObjectStorage(
     metadata.setConstraints(constraints_);
     metadata.setComment(comment);
 
-    if (sample_path.empty() && context->getSettingsRef().use_hive_partitioning)
-        sample_path = getPathSample(metadata, context);
-
-    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(metadata.columns, context, sample_path, format_settings));
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(metadata.getColumns()));
     setInMemoryMetadata(metadata);
 }
 
@@ -231,7 +198,7 @@ private:
             return;
         auto context = getContext();
         iterator_wrapper = StorageObjectStorageSource::createFileIterator(
-            configuration, configuration->getQuerySettings(context), object_storage, distributed_processing,
+            configuration, object_storage, distributed_processing,
             context, predicate, virtual_columns, nullptr, context->getFileProgressCallback());
     }
 };
@@ -383,7 +350,6 @@ std::unique_ptr<ReadBufferIterator> StorageObjectStorage::createReadBufferIterat
 {
     auto file_iterator = StorageObjectStorageSource::createFileIterator(
         configuration,
-        configuration->getQuerySettings(context),
         object_storage,
         false/* distributed_processing */,
         context,
@@ -400,41 +366,33 @@ ColumnsDescription StorageObjectStorage::resolveSchemaFromData(
     const ObjectStoragePtr & object_storage,
     const ConfigurationPtr & configuration,
     const std::optional<FormatSettings> & format_settings,
-    std::string & sample_path,
     const ContextPtr & context)
 {
     ObjectInfos read_keys;
     auto iterator = createReadBufferIterator(object_storage, configuration, format_settings, read_keys, context);
-    auto schema = readSchemaFromFormat(configuration->format, format_settings, *iterator, context);
-    sample_path = iterator->getLastFilePath();
-    return schema;
+    return readSchemaFromFormat(configuration->format, format_settings, *iterator, context);
 }
 
 std::string StorageObjectStorage::resolveFormatFromData(
     const ObjectStoragePtr & object_storage,
     const ConfigurationPtr & configuration,
     const std::optional<FormatSettings> & format_settings,
-    std::string & sample_path,
     const ContextPtr & context)
 {
     ObjectInfos read_keys;
     auto iterator = createReadBufferIterator(object_storage, configuration, format_settings, read_keys, context);
-    auto format_and_schema = detectFormatAndReadSchema(format_settings, *iterator, context).second;
-    sample_path = iterator->getLastFilePath();
-    return format_and_schema;
+    return detectFormatAndReadSchema(format_settings, *iterator, context).second;
 }
 
 std::pair<ColumnsDescription, std::string> StorageObjectStorage::resolveSchemaAndFormatFromData(
     const ObjectStoragePtr & object_storage,
     const ConfigurationPtr & configuration,
     const std::optional<FormatSettings> & format_settings,
-    std::string & sample_path,
     const ContextPtr & context)
 {
     ObjectInfos read_keys;
     auto iterator = createReadBufferIterator(object_storage, configuration, format_settings, read_keys, context);
     auto [columns, format] = detectFormatAndReadSchema(format_settings, *iterator, context);
-    sample_path = iterator->getLastFilePath();
     configuration->format = format;
     return std::pair(columns, format);
 }
@@ -465,12 +423,6 @@ SchemaCache & StorageObjectStorage::getSchemaCache(const ContextPtr & context, c
                 DEFAULT_SCHEMA_CACHE_ELEMENTS));
         return schema_cache;
     }
-    else if (storage_type_name == "local")
-    {
-        static SchemaCache schema_cache(
-            context->getConfigRef().getUInt("schema_inference_cache_max_elements_for_local", DEFAULT_SCHEMA_CACHE_ELEMENTS));
-        return schema_cache;
-    }
     else
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Unsupported storage type: {}", storage_type_name);
 }
diff --git a/src/Storages/ObjectStorage/StorageObjectStorage.h b/src/Storages/ObjectStorage/StorageObjectStorage.h
index f39586c23b4..b0f2a09e419 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorage.h
+++ b/src/Storages/ObjectStorage/StorageObjectStorage.h
@@ -102,28 +102,23 @@ public:
         const ObjectStoragePtr & object_storage,
         const ConfigurationPtr & configuration,
         const std::optional<FormatSettings> & format_settings,
-        std::string & sample_path,
         const ContextPtr & context);
 
     static std::string resolveFormatFromData(
         const ObjectStoragePtr & object_storage,
         const ConfigurationPtr & configuration,
         const std::optional<FormatSettings> & format_settings,
-        std::string & sample_path,
         const ContextPtr & context);
 
     static std::pair<ColumnsDescription, std::string> resolveSchemaAndFormatFromData(
         const ObjectStoragePtr & object_storage,
         const ConfigurationPtr & configuration,
         const std::optional<FormatSettings> & format_settings,
-        std::string & sample_path,
         const ContextPtr & context);
 
 protected:
     virtual void updateConfiguration(ContextPtr local_context);
 
-    String getPathSample(StorageInMemoryMetadata metadata, ContextPtr context);
-
     virtual ReadFromFormatInfo prepareReadingFromFormat(
         const Strings & requested_columns,
         const StorageSnapshotPtr & storage_snapshot,
@@ -162,7 +157,7 @@ public:
         ContextPtr local_context,
         bool with_table_structure);
 
-    /// Storage type: s3, hdfs, azure, local.
+    /// Storage type: s3, hdfs, azure.
     virtual std::string getTypeName() const = 0;
     /// Engine name: S3, HDFS, Azure.
     virtual std::string getEngineName() const = 0;
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageCluster.cpp b/src/Storages/ObjectStorage/StorageObjectStorageCluster.cpp
index d712e4eec20..220e4a10acb 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageCluster.cpp
+++ b/src/Storages/ObjectStorage/StorageObjectStorageCluster.cpp
@@ -1,8 +1,6 @@
 #include "Storages/ObjectStorage/StorageObjectStorageCluster.h"
 
 #include <Common/Exception.h>
-#include <Core/Settings.h>
-#include <Formats/FormatFactory.h>
 #include <Parsers/queryToString.h>
 #include <Processors/Sources/RemoteSource.h>
 #include <QueryPipeline/RemoteQueryExecutor.h>
@@ -21,28 +19,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-String StorageObjectStorageCluster::getPathSample(StorageInMemoryMetadata metadata, ContextPtr context)
-{
-    auto query_settings = configuration->getQuerySettings(context);
-    /// We don't want to throw an exception if there are no files with specified path.
-    query_settings.throw_on_zero_files_match = false;
-    auto file_iterator = StorageObjectStorageSource::createFileIterator(
-        configuration,
-        query_settings,
-        object_storage,
-        false, // distributed_processing
-        context,
-        {}, // predicate
-        metadata.getColumns().getAll(), // virtual_columns
-        nullptr, // read_keys
-        {} // file_progress_callback
-    );
-
-    if (auto file = file_iterator->next(0))
-        return file->getPath();
-    return "";
-}
-
 StorageObjectStorageCluster::StorageObjectStorageCluster(
     const String & cluster_name_,
     ConfigurationPtr configuration_,
@@ -57,18 +33,14 @@ StorageObjectStorageCluster::StorageObjectStorageCluster(
     , object_storage(object_storage_)
 {
     ColumnsDescription columns{columns_};
-    std::string sample_path;
-    resolveSchemaAndFormat(columns, configuration->format, object_storage, configuration, {}, sample_path, context_);
+    resolveSchemaAndFormat(columns, configuration->format, object_storage, configuration, {}, context_);
     configuration->check(context_);
 
     StorageInMemoryMetadata metadata;
     metadata.setColumns(columns);
     metadata.setConstraints(constraints_);
 
-    if (sample_path.empty() && context_->getSettingsRef().use_hive_partitioning)
-        sample_path = getPathSample(metadata, context_);
-
-    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(metadata.columns, context_, sample_path));
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(metadata.getColumns()));
     setInMemoryMetadata(metadata);
 }
 
@@ -111,8 +83,8 @@ RemoteQueryExecutor::Extension StorageObjectStorageCluster::getTaskIteratorExten
     const ActionsDAG::Node * predicate, const ContextPtr & local_context) const
 {
     auto iterator = StorageObjectStorageSource::createFileIterator(
-        configuration, configuration->getQuerySettings(local_context), object_storage, /* distributed_processing */false,
-        local_context, predicate, virtual_columns, nullptr, local_context->getFileProgressCallback());
+        configuration, object_storage, /* distributed_processing */false, local_context,
+        predicate, virtual_columns, nullptr, local_context->getFileProgressCallback());
 
     auto callback = std::make_shared<std::function<String()>>([iterator]() mutable -> String
     {
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageCluster.h b/src/Storages/ObjectStorage/StorageObjectStorageCluster.h
index 0088ff28fc2..108aa109616 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageCluster.h
+++ b/src/Storages/ObjectStorage/StorageObjectStorageCluster.h
@@ -27,8 +27,6 @@ public:
     RemoteQueryExecutor::Extension getTaskIteratorExtension(
         const ActionsDAG::Node * predicate, const ContextPtr & context) const override;
 
-    String getPathSample(StorageInMemoryMetadata metadata, ContextPtr context);
-
 private:
     void updateQueryToSendIfNeeded(
         ASTPtr & query,
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageSink.cpp b/src/Storages/ObjectStorage/StorageObjectStorageSink.cpp
index 33c96fdfae9..c864fb9a7e2 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageSink.cpp
+++ b/src/Storages/ObjectStorage/StorageObjectStorageSink.cpp
@@ -4,7 +4,6 @@
 #include <Common/isValidUTF8.h>
 #include <Core/Settings.h>
 #include <Storages/ObjectStorage/Utils.h>
-#include <base/defines.h>
 
 namespace DB
 {
@@ -43,16 +42,31 @@ StorageObjectStorageSink::StorageObjectStorageSink(
 
 void StorageObjectStorageSink::consume(Chunk & chunk)
 {
-    if (isCancelled())
+    std::lock_guard lock(cancel_mutex);
+    if (cancelled)
         return;
     writer->write(getHeader().cloneWithColumns(chunk.getColumns()));
 }
 
+void StorageObjectStorageSink::onCancel()
+{
+    std::lock_guard lock(cancel_mutex);
+    cancelBuffers();
+    releaseBuffers();
+    cancelled = true;
+}
+
+void StorageObjectStorageSink::onException(std::exception_ptr)
+{
+    std::lock_guard lock(cancel_mutex);
+    cancelBuffers();
+    releaseBuffers();
+}
+
 void StorageObjectStorageSink::onFinish()
 {
-    chassert(!isCancelled());
+    std::lock_guard lock(cancel_mutex);
     finalizeBuffers();
-    releaseBuffers();
 }
 
 void StorageObjectStorageSink::finalizeBuffers()
@@ -106,12 +120,6 @@ PartitionedStorageObjectStorageSink::PartitionedStorageObjectStorageSink(
 {
 }
 
-StorageObjectStorageSink::~StorageObjectStorageSink()
-{
-    if (isCancelled())
-        cancelBuffers();
-}
-
 SinkPtr PartitionedStorageObjectStorageSink::createSinkForPartition(const String & partition_id)
 {
     auto partition_bucket = replaceWildcards(configuration->getNamespace(), partition_id);
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageSink.h b/src/Storages/ObjectStorage/StorageObjectStorageSink.h
index 97fd3d9b417..6ab531bb21a 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageSink.h
+++ b/src/Storages/ObjectStorage/StorageObjectStorageSink.h
@@ -18,18 +18,22 @@ public:
         ContextPtr context,
         const std::string & blob_path = "");
 
-    ~StorageObjectStorageSink() override;
-
     String getName() const override { return "StorageObjectStorageSink"; }
 
     void consume(Chunk & chunk) override;
 
+    void onCancel() override;
+
+    void onException(std::exception_ptr exception) override;
+
     void onFinish() override;
 
 private:
     const Block sample_block;
     std::unique_ptr<WriteBuffer> write_buf;
     OutputFormatPtr writer;
+    bool cancelled = false;
+    std::mutex cancel_mutex;
 
     void finalizeBuffers();
     void releaseBuffers();
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageSource.cpp b/src/Storages/ObjectStorage/StorageObjectStorageSource.cpp
index 3ae884bf98c..086482e330a 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageSource.cpp
+++ b/src/Storages/ObjectStorage/StorageObjectStorageSource.cpp
@@ -77,7 +77,7 @@ StorageObjectStorageSource::~StorageObjectStorageSource()
     create_reader_pool->wait();
 }
 
-void StorageObjectStorageSource::setKeyCondition(const std::optional<ActionsDAG> & filter_actions_dag, ContextPtr context_)
+void StorageObjectStorageSource::setKeyCondition(const ActionsDAGPtr & filter_actions_dag, ContextPtr context_)
 {
     setKeyConditionImpl(filter_actions_dag, context_, read_from_format_info.format_header);
 }
@@ -99,7 +99,6 @@ std::string StorageObjectStorageSource::getUniqueStoragePathIdentifier(
 
 std::shared_ptr<StorageObjectStorageSource::IIterator> StorageObjectStorageSource::createFileIterator(
     ConfigurationPtr configuration,
-    const StorageObjectStorage::QuerySettings & query_settings,
     ObjectStoragePtr object_storage,
     bool distributed_processing,
     const ContextPtr & local_context,
@@ -117,6 +116,7 @@ std::shared_ptr<StorageObjectStorageSource::IIterator> StorageObjectStorageSourc
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
                         "Expression can not have wildcards inside {} name", configuration->getNamespaceType());
 
+    auto settings = configuration->getQuerySettings(local_context);
     const bool is_archive = configuration->isArchive();
 
     std::unique_ptr<IIterator> iterator;
@@ -125,8 +125,8 @@ std::shared_ptr<StorageObjectStorageSource::IIterator> StorageObjectStorageSourc
         /// Iterate through disclosed globs and make a source for each file
         iterator = std::make_unique<GlobIterator>(
             object_storage, configuration, predicate, virtual_columns,
-            local_context, is_archive ? nullptr : read_keys, query_settings.list_object_keys_size,
-            query_settings.throw_on_zero_files_match, file_progress_callback);
+            local_context, is_archive ? nullptr : read_keys, settings.list_object_keys_size,
+            settings.throw_on_zero_files_match, file_progress_callback);
     }
     else
     {
@@ -139,16 +139,13 @@ std::shared_ptr<StorageObjectStorageSource::IIterator> StorageObjectStorageSourc
             paths.reserve(keys.size());
             for (const auto & key : keys)
                 paths.push_back(fs::path(configuration->getNamespace()) / key);
-
-            VirtualColumnUtils::buildSetsForDAG(*filter_dag, local_context);
-            auto actions = std::make_shared<ExpressionActions>(std::move(*filter_dag));
-            VirtualColumnUtils::filterByPathOrFile(keys, paths, actions, virtual_columns);
+            VirtualColumnUtils::filterByPathOrFile(keys, paths, filter_dag, virtual_columns, local_context);
             copy_configuration->setPaths(keys);
         }
 
         iterator = std::make_unique<KeysIterator>(
             object_storage, copy_configuration, virtual_columns, is_archive ? nullptr : read_keys,
-            query_settings.ignore_non_existent_file, file_progress_callback);
+            settings.ignore_non_existent_file, file_progress_callback);
     }
 
     if (is_archive)
@@ -198,17 +195,13 @@ Chunk StorageObjectStorageSource::generate()
             const auto & object_info = reader.getObjectInfo();
             const auto & filename = object_info->getFileName();
             chassert(object_info->metadata);
-
             VirtualColumnUtils::addRequestedFileLikeStorageVirtualsToChunk(
                 chunk,
                 read_from_format_info.requested_virtual_columns,
-                {
-                  .path = getUniqueStoragePathIdentifier(*configuration, *object_info, false),
-                  .size = object_info->isArchive() ? object_info->fileSizeInArchive() : object_info->metadata->size_bytes,
-                  .filename = &filename,
-                  .last_modified = object_info->metadata->last_modified,
-                  .etag = &(object_info->metadata->etag)
-                }, getContext());
+                {.path = getUniqueStoragePathIdentifier(*configuration, *object_info, false),
+                 .size = object_info->isArchive() ? object_info->fileSizeInArchive() : object_info->metadata->size_bytes,
+                 .filename = &filename,
+                 .last_modified = object_info->metadata->last_modified});
 
             const auto & partition_columns = configuration->getPartitionColumns();
             if (!partition_columns.empty() && chunk_size && chunk.hasColumns())
@@ -280,7 +273,7 @@ StorageObjectStorageSource::ReaderHolder StorageObjectStorageSource::createReade
     const std::shared_ptr<IIterator> & file_iterator,
     const ConfigurationPtr & configuration,
     const ObjectStoragePtr & object_storage,
-    ReadFromFormatInfo & read_from_format_info,
+    const ReadFromFormatInfo & read_from_format_info,
     const std::optional<FormatSettings> & format_settings,
     const std::shared_ptr<const KeyCondition> & key_condition_,
     const ContextPtr & context_,
@@ -417,7 +410,10 @@ std::future<StorageObjectStorageSource::ReaderHolder> StorageObjectStorageSource
 }
 
 std::unique_ptr<ReadBuffer> StorageObjectStorageSource::createReadBuffer(
-    const ObjectInfo & object_info, const ObjectStoragePtr & object_storage, const ContextPtr & context_, const LoggerPtr & log)
+    const ObjectInfo & object_info,
+    const ObjectStoragePtr & object_storage,
+    const ContextPtr & context_,
+    const LoggerPtr & log)
 {
     const auto & object_size = object_info.metadata->size_bytes;
 
@@ -510,11 +506,7 @@ StorageObjectStorageSource::GlobIterator::GlobIterator(
         }
 
         recursive = key_with_globs == "/**";
-        if (auto filter_dag = VirtualColumnUtils::createPathAndFileFilterDAG(predicate, virtual_columns))
-        {
-            VirtualColumnUtils::buildSetsForDAG(*filter_dag, getContext());
-            filter_expr = std::make_shared<ExpressionActions>(std::move(*filter_dag));
-        }
+        filter_dag = VirtualColumnUtils::createPathAndFileFilterDAG(predicate, virtual_columns);
     }
     else
     {
@@ -578,14 +570,14 @@ StorageObjectStorage::ObjectInfoPtr StorageObjectStorageSource::GlobIterator::ne
                     ++it;
             }
 
-            if (filter_expr)
+            if (filter_dag)
             {
                 std::vector<String> paths;
                 paths.reserve(new_batch.size());
                 for (const auto & object_info : new_batch)
                     paths.push_back(getUniqueStoragePathIdentifier(*configuration, *object_info, false));
 
-                VirtualColumnUtils::filterByPathOrFile(new_batch, paths, filter_expr, virtual_columns);
+                VirtualColumnUtils::filterByPathOrFile(new_batch, paths, filter_dag, virtual_columns, getContext());
 
                 LOG_TEST(logger, "Filtered files: {} -> {}", paths.size(), new_batch.size());
             }
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageSource.h b/src/Storages/ObjectStorage/StorageObjectStorageSource.h
index 7ae7a2358e9..271b38fa75c 100644
--- a/src/Storages/ObjectStorage/StorageObjectStorageSource.h
+++ b/src/Storages/ObjectStorage/StorageObjectStorageSource.h
@@ -46,13 +46,12 @@ public:
 
     String getName() const override { return name; }
 
-    void setKeyCondition(const std::optional<ActionsDAG> & filter_actions_dag, ContextPtr context_) override;
+    void setKeyCondition(const ActionsDAGPtr & filter_actions_dag, ContextPtr context_) override;
 
     Chunk generate() override;
 
     static std::shared_ptr<IIterator> createFileIterator(
         ConfigurationPtr configuration,
-        const StorageObjectStorage::QuerySettings & query_settings,
         ObjectStoragePtr object_storage,
         bool distributed_processing,
         const ContextPtr & local_context,
@@ -74,7 +73,7 @@ protected:
     const UInt64 max_block_size;
     const bool need_only_count;
     const size_t max_parsing_threads;
-    ReadFromFormatInfo read_from_format_info;
+    const ReadFromFormatInfo read_from_format_info;
     const std::shared_ptr<ThreadPool> create_reader_pool;
 
     std::shared_ptr<IIterator> file_iterator;
@@ -122,7 +121,7 @@ protected:
         const std::shared_ptr<IIterator> & file_iterator,
         const ConfigurationPtr & configuration,
         const ObjectStoragePtr & object_storage,
-        ReadFromFormatInfo & read_from_format_info,
+        const ReadFromFormatInfo & read_from_format_info,
         const std::optional<FormatSettings> & format_settings,
         const std::shared_ptr<const KeyCondition> & key_condition_,
         const ContextPtr & context_,
@@ -209,7 +208,7 @@ private:
 
     ObjectInfos object_infos;
     ObjectInfos * read_keys;
-    ExpressionActionsPtr filter_expr;
+    ActionsDAGPtr filter_dag;
     ObjectStorageIteratorPtr object_storage_iterator;
     bool recursive{false};
     std::vector<String> expanded_keys;
diff --git a/src/Storages/ObjectStorage/Utils.cpp b/src/Storages/ObjectStorage/Utils.cpp
index 73410d959e0..e49e14d2a0c 100644
--- a/src/Storages/ObjectStorage/Utils.cpp
+++ b/src/Storages/ObjectStorage/Utils.cpp
@@ -49,20 +49,19 @@ void resolveSchemaAndFormat(
     ObjectStoragePtr object_storage,
     const StorageObjectStorage::ConfigurationPtr & configuration,
     std::optional<FormatSettings> format_settings,
-    std::string & sample_path,
     const ContextPtr & context)
 {
     if (columns.empty())
     {
         if (format == "auto")
             std::tie(columns, format) =
-                StorageObjectStorage::resolveSchemaAndFormatFromData(object_storage, configuration, format_settings, sample_path, context);
+                StorageObjectStorage::resolveSchemaAndFormatFromData(object_storage, configuration, format_settings, context);
         else
-            columns = StorageObjectStorage::resolveSchemaFromData(object_storage, configuration, format_settings, sample_path, context);
+            columns = StorageObjectStorage::resolveSchemaFromData(object_storage, configuration, format_settings, context);
     }
     else if (format == "auto")
     {
-        format = StorageObjectStorage::resolveFormatFromData(object_storage, configuration, format_settings, sample_path, context);
+        format = StorageObjectStorage::resolveFormatFromData(object_storage, configuration, format_settings, context);
     }
 
     if (!columns.hasOnlyOrdinary())
diff --git a/src/Storages/ObjectStorage/Utils.h b/src/Storages/ObjectStorage/Utils.h
index 7ee14f50979..2077999df41 100644
--- a/src/Storages/ObjectStorage/Utils.h
+++ b/src/Storages/ObjectStorage/Utils.h
@@ -19,7 +19,6 @@ void resolveSchemaAndFormat(
     ObjectStoragePtr object_storage,
     const StorageObjectStorage::ConfigurationPtr & configuration,
     std::optional<FormatSettings> format_settings,
-    std::string & sample_path,
     const ContextPtr & context);
 
 }
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.cpp b/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.cpp
index 2da4aa6b665..23ac92b667a 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.cpp
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.cpp
@@ -33,6 +33,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int BAD_ARGUMENTS;
     extern const int REPLICA_ALREADY_EXISTS;
+    extern const int INCOMPATIBLE_COLUMNS;
 }
 
 namespace
@@ -107,12 +108,8 @@ private:
     }
 };
 
-ObjectStorageQueueMetadata::ObjectStorageQueueMetadata(
-    const fs::path & zookeeper_path_,
-    const ObjectStorageQueueTableMetadata & table_metadata_,
-    const ObjectStorageQueueSettings & settings_)
+ObjectStorageQueueMetadata::ObjectStorageQueueMetadata(const fs::path & zookeeper_path_, const ObjectStorageQueueSettings & settings_)
     : settings(settings_)
-    , table_metadata(table_metadata_)
     , zookeeper_path(zookeeper_path_)
     , buckets_num(getBucketsNum(settings_))
     , log(getLogger("StorageObjectStorageQueue(" + zookeeper_path_.string() + ")"))
@@ -147,6 +144,11 @@ void ObjectStorageQueueMetadata::shutdown()
         task->deactivate();
 }
 
+void ObjectStorageQueueMetadata::checkSettings(const ObjectStorageQueueSettings & settings_) const
+{
+    ObjectStorageQueueTableMetadata::checkEquals(settings, settings_);
+}
+
 ObjectStorageQueueMetadata::FileStatusPtr ObjectStorageQueueMetadata::getFileStatus(const std::string & path)
 {
     return local_file_statuses->get(path, /* create */false);
@@ -217,14 +219,13 @@ ObjectStorageQueueMetadata::tryAcquireBucket(const Bucket & bucket, const Proces
     return ObjectStorageQueueOrderedFileMetadata::tryAcquireBucket(zookeeper_path, bucket, processor, log);
 }
 
-void ObjectStorageQueueMetadata::syncWithKeeper(
-    const fs::path & zookeeper_path,
-    const ObjectStorageQueueTableMetadata & table_metadata,
-    const ObjectStorageQueueSettings & settings,
-    LoggerPtr log)
+void ObjectStorageQueueMetadata::initialize(
+    const ConfigurationPtr & configuration,
+    const StorageInMemoryMetadata & storage_metadata)
 {
+    const auto metadata_from_table = ObjectStorageQueueTableMetadata(*configuration, settings, storage_metadata);
+    const auto & columns_from_table = storage_metadata.getColumns();
     const auto table_metadata_path = zookeeper_path / "metadata";
-    const auto buckets_num = getBucketsNum(settings);
     const auto metadata_paths = settings.mode == ObjectStorageQueueMode::ORDERED
         ? ObjectStorageQueueOrderedFileMetadata::getMetadataPaths(buckets_num)
         : ObjectStorageQueueUnorderedFileMetadata::getMetadataPaths();
@@ -236,19 +237,24 @@ void ObjectStorageQueueMetadata::syncWithKeeper(
     {
         if (zookeeper->exists(table_metadata_path))
         {
-            const auto metadata_str = zookeeper->get(fs::path(zookeeper_path) / "metadata");
-            const auto metadata_from_zk = ObjectStorageQueueTableMetadata::parse(metadata_str);
+            const auto metadata_from_zk = ObjectStorageQueueTableMetadata::parse(zookeeper->get(fs::path(zookeeper_path) / "metadata"));
+            const auto columns_from_zk = ColumnsDescription::parse(metadata_from_zk.columns);
 
-            LOG_TRACE(log, "Metadata in keeper: {}", metadata_str);
-
-            table_metadata.checkEquals(metadata_from_zk);
+            metadata_from_table.checkEquals(metadata_from_zk);
+            if (columns_from_zk != columns_from_table)
+            {
+                throw Exception(
+                    ErrorCodes::INCOMPATIBLE_COLUMNS,
+                    "Table columns structure in ZooKeeper is different from local table structure. "
+                    "Local columns:\n{}\nZookeeper columns:\n{}",
+                    columns_from_table.toString(), columns_from_zk.toString());
+            }
             return;
         }
 
         Coordination::Requests requests;
         requests.emplace_back(zkutil::makeCreateRequest(zookeeper_path, "", zkutil::CreateMode::Persistent));
-        requests.emplace_back(zkutil::makeCreateRequest(
-                                  table_metadata_path, table_metadata.toString(), zkutil::CreateMode::Persistent));
+        requests.emplace_back(zkutil::makeCreateRequest(table_metadata_path, metadata_from_table.toString(), zkutil::CreateMode::Persistent));
 
         for (const auto & path : metadata_paths)
         {
@@ -257,27 +263,16 @@ void ObjectStorageQueueMetadata::syncWithKeeper(
         }
 
         if (!settings.last_processed_path.value.empty())
-        {
-            ObjectStorageQueueOrderedFileMetadata(
-                zookeeper_path,
-                settings.last_processed_path,
-                std::make_shared<FileStatus>(),
-                /* bucket_info */nullptr,
-                buckets_num,
-                settings.loading_retries,
-                log).setProcessedAtStartRequests(requests, zookeeper);
-        }
+            getFileMetadata(settings.last_processed_path)->setProcessedAtStartRequests(requests, zookeeper);
 
         Coordination::Responses responses;
         auto code = zookeeper->tryMulti(requests, responses);
         if (code == Coordination::Error::ZNODEEXISTS)
         {
             auto exception = zkutil::KeeperMultiException(code, requests, responses);
-
             LOG_INFO(log, "Got code `{}` for path: {}. "
                      "It looks like the table {} was created by another server at the same moment, "
-                     "will retry",
-                     code, exception.getPathForFirstFailedOp(), zookeeper_path.string());
+                     "will retry", code, exception.getPathForFirstFailedOp(), zookeeper_path.string());
             continue;
         }
         else if (code != Coordination::Error::ZOK)
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.h b/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.h
index 71d26ca7c47..e5fae047ac5 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.h
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadata.h
@@ -8,7 +8,6 @@
 #include <Storages/ObjectStorageQueue/ObjectStorageQueueIFileMetadata.h>
 #include <Storages/ObjectStorageQueue/ObjectStorageQueueOrderedFileMetadata.h>
 #include <Storages/ObjectStorageQueue/ObjectStorageQueueSettings.h>
-#include <Storages/ObjectStorageQueue/ObjectStorageQueueTableMetadata.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 
 namespace fs = std::filesystem;
@@ -53,19 +52,11 @@ public:
     using Bucket = size_t;
     using Processor = std::string;
 
-    ObjectStorageQueueMetadata(
-        const fs::path & zookeeper_path_,
-        const ObjectStorageQueueTableMetadata & table_metadata_,
-        const ObjectStorageQueueSettings & settings_);
-
+    ObjectStorageQueueMetadata(const fs::path & zookeeper_path_, const ObjectStorageQueueSettings & settings_);
     ~ObjectStorageQueueMetadata();
 
-    static void syncWithKeeper(
-        const fs::path & zookeeper_path,
-        const ObjectStorageQueueTableMetadata & table_metadata,
-        const ObjectStorageQueueSettings & settings,
-        LoggerPtr log);
-
+    void initialize(const ConfigurationPtr & configuration, const StorageInMemoryMetadata & storage_metadata);
+    void checkSettings(const ObjectStorageQueueSettings & settings) const;
     void shutdown();
 
     FileMetadataPtr getFileMetadata(const std::string & path, ObjectStorageQueueOrderedFileMetadata::BucketInfoPtr bucket_info = {});
@@ -81,17 +72,11 @@ public:
     static size_t getBucketsNum(const ObjectStorageQueueSettings & settings);
     static size_t getBucketsNum(const ObjectStorageQueueTableMetadata & settings);
 
-    void checkTableMetadataEquals(const ObjectStorageQueueMetadata & other);
-
-    const ObjectStorageQueueTableMetadata & getTableMetadata() const { return table_metadata; }
-    ObjectStorageQueueTableMetadata & getTableMetadata() { return table_metadata; }
-
 private:
     void cleanupThreadFunc();
     void cleanupThreadFuncImpl();
 
-    ObjectStorageQueueSettings settings;
-    ObjectStorageQueueTableMetadata table_metadata;
+    const ObjectStorageQueueSettings settings;
     const fs::path zookeeper_path;
     const size_t buckets_num;
 
@@ -104,6 +89,4 @@ private:
     std::shared_ptr<LocalFileStatuses> local_file_statuses;
 };
 
-using ObjectStorageQueueMetadataPtr = std::unique_ptr<ObjectStorageQueueMetadata>;
-
 }
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadataFactory.cpp b/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadataFactory.cpp
index ba98711eff9..ffae33d6f41 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadataFactory.cpp
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadataFactory.cpp
@@ -14,23 +14,19 @@ ObjectStorageQueueMetadataFactory & ObjectStorageQueueMetadataFactory::instance(
     return ret;
 }
 
-ObjectStorageQueueMetadataFactory::FilesMetadataPtr ObjectStorageQueueMetadataFactory::getOrCreate(
-    const std::string & zookeeper_path,
-    ObjectStorageQueueMetadataPtr metadata)
+ObjectStorageQueueMetadataFactory::FilesMetadataPtr
+ObjectStorageQueueMetadataFactory::getOrCreate(const std::string & zookeeper_path, const ObjectStorageQueueSettings & settings)
 {
     std::lock_guard lock(mutex);
     auto it = metadata_by_path.find(zookeeper_path);
     if (it == metadata_by_path.end())
     {
-        it = metadata_by_path.emplace(zookeeper_path, std::move(metadata)).first;
+        auto files_metadata = std::make_shared<ObjectStorageQueueMetadata>(zookeeper_path, settings);
+        it = metadata_by_path.emplace(zookeeper_path, std::move(files_metadata)).first;
     }
     else
     {
-        auto & metadata_from_table = metadata->getTableMetadata();
-        auto & metadata_from_keeper = it->second.metadata->getTableMetadata();
-
-        metadata_from_table.checkEquals(metadata_from_keeper);
-
+        it->second.metadata->checkSettings(settings);
         it->second.ref_count += 1;
     }
     return it->second.metadata;
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadataFactory.h b/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadataFactory.h
index a9975c526ef..a93f5ee3d83 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadataFactory.h
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueMetadataFactory.h
@@ -13,9 +13,7 @@ public:
 
     static ObjectStorageQueueMetadataFactory & instance();
 
-    FilesMetadataPtr getOrCreate(
-        const std::string & zookeeper_path,
-        ObjectStorageQueueMetadataPtr metadata);
+    FilesMetadataPtr getOrCreate(const std::string & zookeeper_path, const ObjectStorageQueueSettings & settings);
 
     void remove(const std::string & zookeeper_path);
 
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueSource.cpp b/src/Storages/ObjectStorageQueue/ObjectStorageQueueSource.cpp
index cde41b4afff..4d921003e04 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueSource.cpp
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueSource.cpp
@@ -524,7 +524,7 @@ Chunk ObjectStorageQueueSource::generateImpl()
                     {
                         .path = path,
                         .size = reader.getObjectInfo()->metadata->size_bytes
-                    }, getContext());
+                    });
 
                 return chunk;
             }
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueSource.h b/src/Storages/ObjectStorageQueue/ObjectStorageQueueSource.h
index c085287e4f3..0f3d0ab2e92 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueSource.h
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueSource.h
@@ -128,7 +128,7 @@ private:
     const std::shared_ptr<FileIterator> file_iterator;
     const ConfigurationPtr configuration;
     const ObjectStoragePtr object_storage;
-    ReadFromFormatInfo read_from_format_info;
+    const ReadFromFormatInfo read_from_format_info;
     const std::optional<FormatSettings> format_settings;
     const ObjectStorageQueueSettings queue_settings;
     const std::shared_ptr<ObjectStorageQueueMetadata> files_metadata;
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueTableMetadata.cpp b/src/Storages/ObjectStorageQueue/ObjectStorageQueueTableMetadata.cpp
index 926d5aacda4..cb9cdf8e186 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueTableMetadata.cpp
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueTableMetadata.cpp
@@ -1,5 +1,6 @@
 #include <config.h>
 
+#include <Poco/JSON/JSON.h>
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Parser.h>
 #include <Storages/ObjectStorageQueue/ObjectStorageQueueSettings.h>
@@ -31,18 +32,18 @@ namespace
 
 
 ObjectStorageQueueTableMetadata::ObjectStorageQueueTableMetadata(
+    const StorageObjectStorage::Configuration & configuration,
     const ObjectStorageQueueSettings & engine_settings,
-    const ColumnsDescription & columns_,
-    const std::string & format_)
-    : format_name(format_)
-    , columns(columns_.toString())
-    , after_processing(engine_settings.after_processing.toString())
-    , mode(engine_settings.mode.toString())
-    , tracked_files_limit(engine_settings.tracked_files_limit)
-    , tracked_file_ttl_sec(engine_settings.tracked_file_ttl_sec)
-    , buckets(engine_settings.buckets)
-    , processing_threads_num(engine_settings.processing_threads_num)
+    const StorageInMemoryMetadata & storage_metadata)
 {
+    format_name = configuration.format;
+    after_processing = engine_settings.after_processing.toString();
+    mode = engine_settings.mode.toString();
+    tracked_files_limit = engine_settings.tracked_files_limit;
+    tracked_file_ttl_sec = engine_settings.tracked_file_ttl_sec;
+    buckets = engine_settings.buckets;
+    processing_threads_num = engine_settings.processing_threads_num;
+    columns = storage_metadata.getColumns().toString();
 }
 
 String ObjectStorageQueueTableMetadata::toString() const
@@ -64,40 +65,48 @@ String ObjectStorageQueueTableMetadata::toString() const
     return oss.str();
 }
 
-template <typename T>
-static auto getOrDefault(
-    const Poco::JSON::Object::Ptr & json,
-    const std::string & setting,
-    const std::string & compatibility_prefix,
-    const T & default_value)
+void ObjectStorageQueueTableMetadata::read(const String & metadata_str)
 {
-    if (!compatibility_prefix.empty() && json->has(compatibility_prefix + setting))
-        return json->getValue<T>(compatibility_prefix + setting);
+    Poco::JSON::Parser parser;
+    auto json = parser.parse(metadata_str).extract<Poco::JSON::Object::Ptr>();
 
-    if (json->has(setting))
-        return json->getValue<T>(setting);
+    after_processing = json->getValue<String>("after_processing");
+    mode = json->getValue<String>("mode");
 
-    return default_value;
-}
+    format_name = json->getValue<String>("format_name");
+    columns = json->getValue<String>("columns");
 
-ObjectStorageQueueTableMetadata::ObjectStorageQueueTableMetadata(const Poco::JSON::Object::Ptr & json)
-    : format_name(json->getValue<String>("format_name"))
-    , columns(json->getValue<String>("columns"))
-    , after_processing(json->getValue<String>("after_processing"))
-    , mode(json->getValue<String>("mode"))
-    , tracked_files_limit(getOrDefault(json, "tracked_files_limit", "s3queue_", 0))
-    , tracked_file_ttl_sec(getOrDefault(json, "tracked_files_ttl_sec", "s3queue_", 0))
-    , buckets(getOrDefault(json, "buckets", "", 0))
-    , processing_threads_num(getOrDefault(json, "processing_threads_num", "s3queue_", 1))
-    , last_processed_path(getOrDefault<String>(json, "last_processed_file", "s3queue_", ""))
-{
+    /// Check with "s3queue_" prefix for compatibility.
+    {
+        if (json->has("s3queue_tracked_files_limit"))
+            tracked_files_limit = json->getValue<UInt64>("s3queue_tracked_files_limit");
+        if (json->has("s3queue_tracked_file_ttl_sec"))
+            tracked_file_ttl_sec = json->getValue<UInt64>("s3queue_tracked_file_ttl_sec");
+        if (json->has("s3queue_processing_threads_num"))
+            processing_threads_num = json->getValue<UInt64>("s3queue_processing_threads_num");
+    }
+
+    if (json->has("tracked_files_limit"))
+        tracked_files_limit = json->getValue<UInt64>("tracked_files_limit");
+
+    if (json->has("tracked_file_ttl_sec"))
+        tracked_file_ttl_sec = json->getValue<UInt64>("tracked_file_ttl_sec");
+
+    if (json->has("last_processed_file"))
+        last_processed_path = json->getValue<String>("last_processed_file");
+
+    if (json->has("processing_threads_num"))
+        processing_threads_num = json->getValue<UInt64>("processing_threads_num");
+
+    if (json->has("buckets"))
+        buckets = json->getValue<UInt64>("buckets");
 }
 
 ObjectStorageQueueTableMetadata ObjectStorageQueueTableMetadata::parse(const String & metadata_str)
 {
-    Poco::JSON::Parser parser;
-    auto json = parser.parse(metadata_str).extract<Poco::JSON::Object::Ptr>();
-    return ObjectStorageQueueTableMetadata(json);
+    ObjectStorageQueueTableMetadata metadata;
+    metadata.read(metadata_str);
+    return metadata;
 }
 
 void ObjectStorageQueueTableMetadata::checkEquals(const ObjectStorageQueueTableMetadata & from_zk) const
@@ -172,17 +181,72 @@ void ObjectStorageQueueTableMetadata::checkImmutableFieldsEquals(const ObjectSto
                 ErrorCodes::METADATA_MISMATCH,
                 "Existing table metadata in ZooKeeper differs in processing buckets. "
                 "Stored in ZooKeeper: {}, local: {}",
-                ObjectStorageQueueMetadata::getBucketsNum(from_zk), ObjectStorageQueueMetadata::getBucketsNum(*this));
+                ObjectStorageQueueMetadata::getBucketsNum(*this), ObjectStorageQueueMetadata::getBucketsNum(from_zk));
         }
     }
+}
 
-    if (columns != from_zk.columns)
+void ObjectStorageQueueTableMetadata::checkEquals(const ObjectStorageQueueSettings & current, const ObjectStorageQueueSettings & expected)
+{
+    if (current.after_processing != expected.after_processing)
         throw Exception(
             ErrorCodes::METADATA_MISMATCH,
-            "Existing table metadata in ZooKeeper differs in columns. "
-            "Stored in ZooKeeper: {}, local: {}",
-            from_zk.columns,
-            columns);
-}
+            "Existing table metadata in ZooKeeper differs "
+            "in action after processing. Stored in ZooKeeper: {}, local: {}",
+            expected.after_processing.toString(),
+            current.after_processing.toString());
 
+    if (current.mode != expected.mode)
+        throw Exception(
+            ErrorCodes::METADATA_MISMATCH,
+            "Existing table metadata in ZooKeeper differs in engine mode. "
+            "Stored in ZooKeeper: {}, local: {}",
+            expected.mode.toString(),
+            current.mode.toString());
+
+    if (current.tracked_files_limit != expected.tracked_files_limit)
+        throw Exception(
+            ErrorCodes::METADATA_MISMATCH,
+            "Existing table metadata in ZooKeeper differs in max set size. "
+            "Stored in ZooKeeper: {}, local: {}",
+            expected.tracked_files_limit,
+            current.tracked_files_limit);
+
+    if (current.tracked_file_ttl_sec != expected.tracked_file_ttl_sec)
+        throw Exception(
+            ErrorCodes::METADATA_MISMATCH,
+            "Existing table metadata in ZooKeeper differs in max set age. "
+            "Stored in ZooKeeper: {}, local: {}",
+            expected.tracked_file_ttl_sec,
+            current.tracked_file_ttl_sec);
+
+    if (current.last_processed_path.value != expected.last_processed_path.value)
+        throw Exception(
+            ErrorCodes::METADATA_MISMATCH,
+            "Existing table metadata in ZooKeeper differs in last_processed_path. "
+            "Stored in ZooKeeper: {}, local: {}",
+            expected.last_processed_path.value,
+            current.last_processed_path.value);
+
+    if (current.mode == ObjectStorageQueueMode::ORDERED)
+    {
+        if (current.buckets != expected.buckets)
+        {
+            throw Exception(
+                ErrorCodes::METADATA_MISMATCH,
+                "Existing table metadata in ZooKeeper differs in buckets setting. "
+                "Stored in ZooKeeper: {}, local: {}",
+                expected.buckets, current.buckets);
+        }
+
+        if (ObjectStorageQueueMetadata::getBucketsNum(current) != ObjectStorageQueueMetadata::getBucketsNum(expected))
+        {
+            throw Exception(
+                ErrorCodes::METADATA_MISMATCH,
+                "Existing table metadata in ZooKeeper differs in processing buckets. "
+                "Stored in ZooKeeper: {}, local: {}",
+                ObjectStorageQueueMetadata::getBucketsNum(current), ObjectStorageQueueMetadata::getBucketsNum(expected));
+        }
+    }
+}
 }
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueTableMetadata.h b/src/Storages/ObjectStorageQueue/ObjectStorageQueueTableMetadata.h
index d70b859ae1d..bbae06b66c6 100644
--- a/src/Storages/ObjectStorageQueue/ObjectStorageQueueTableMetadata.h
+++ b/src/Storages/ObjectStorageQueue/ObjectStorageQueueTableMetadata.h
@@ -3,8 +3,6 @@
 #include <Storages/ObjectStorageQueue/ObjectStorageQueueSettings.h>
 #include <Storages/StorageInMemoryMetadata.h>
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
-#include <Poco/JSON/JSON.h>
-#include <Poco/JSON/Object.h>
 #include <base/types.h>
 
 namespace DB
@@ -18,28 +16,29 @@ class ReadBuffer;
  */
 struct ObjectStorageQueueTableMetadata
 {
-    const String format_name;
-    const String columns;
-    const String after_processing;
-    const String mode;
-    const UInt64 tracked_files_limit;
-    const UInt64 tracked_file_ttl_sec;
-    const UInt64 buckets;
-    const UInt64 processing_threads_num;
-    const String last_processed_path;
+    String format_name;
+    String columns;
+    String after_processing;
+    String mode;
+    UInt64 tracked_files_limit = 0;
+    UInt64 tracked_file_ttl_sec = 0;
+    UInt64 buckets = 0;
+    UInt64 processing_threads_num = 1;
+    String last_processed_path;
 
+    ObjectStorageQueueTableMetadata() = default;
     ObjectStorageQueueTableMetadata(
+        const StorageObjectStorage::Configuration & configuration,
         const ObjectStorageQueueSettings & engine_settings,
-        const ColumnsDescription & columns_,
-        const std::string & format_);
-
-    explicit ObjectStorageQueueTableMetadata(const Poco::JSON::Object::Ptr & json);
+        const StorageInMemoryMetadata & storage_metadata);
 
+    void read(const String & metadata_str);
     static ObjectStorageQueueTableMetadata parse(const String & metadata_str);
 
     String toString() const;
 
     void checkEquals(const ObjectStorageQueueTableMetadata & from_zk) const;
+    static void checkEquals(const ObjectStorageQueueSettings & current, const ObjectStorageQueueSettings & expected);
 
 private:
     void checkImmutableFieldsEquals(const ObjectStorageQueueTableMetadata & from_zk) const;
diff --git a/src/Storages/ObjectStorageQueue/StorageObjectStorageQueue.cpp b/src/Storages/ObjectStorageQueue/StorageObjectStorageQueue.cpp
index 8f11836a11b..eb9a6e6b718 100644
--- a/src/Storages/ObjectStorageQueue/StorageObjectStorageQueue.cpp
+++ b/src/Storages/ObjectStorageQueue/StorageObjectStorageQueue.cpp
@@ -36,7 +36,6 @@ namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int BAD_ARGUMENTS;
-    extern const int BAD_QUERY_PARAMETER;
     extern const int QUERY_NOT_ALLOWED;
 }
 
@@ -85,10 +84,7 @@ namespace
         }
     }
 
-    std::shared_ptr<ObjectStorageQueueLog> getQueueLog(
-        const ObjectStoragePtr & storage,
-        const ContextPtr & context,
-        const ObjectStorageQueueSettings & table_settings)
+    std::shared_ptr<ObjectStorageQueueLog> getQueueLog(const ObjectStoragePtr & storage, const ContextPtr & context, const ObjectStorageQueueSettings & table_settings)
     {
         const auto & settings = context->getSettingsRef();
         switch (storage->getType())
@@ -108,6 +104,7 @@ namespace
             default:
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected object storage type: {}", storage->getType());
         }
+
     }
 }
 
@@ -141,7 +138,7 @@ StorageObjectStorageQueue::StorageObjectStorageQueue(
     }
     else if (!configuration->isPathWithGlobs())
     {
-        throw Exception(ErrorCodes::BAD_QUERY_PARAMETER, "ObjectStorageQueue url must either end with '/' or contain globs");
+        throw Exception(ErrorCodes::QUERY_NOT_ALLOWED, "ObjectStorageQueue url must either end with '/' or contain globs");
     }
 
     checkAndAdjustSettings(*queue_settings, mode > LoadingStrictnessLevel::CREATE);
@@ -151,26 +148,32 @@ StorageObjectStorageQueue::StorageObjectStorageQueue(
     configuration->check(context_);
 
     ColumnsDescription columns{columns_};
-    std::string sample_path;
-    resolveSchemaAndFormat(columns, configuration->format, object_storage, configuration, format_settings, sample_path, context_);
+    resolveSchemaAndFormat(columns, configuration->format, object_storage, configuration, format_settings, context_);
     configuration->check(context_);
 
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns);
     storage_metadata.setConstraints(constraints_);
     storage_metadata.setComment(comment);
-    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.columns, context_));
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
     setInMemoryMetadata(storage_metadata);
 
     LOG_INFO(log, "Using zookeeper path: {}", zk_path.string());
-
-    ObjectStorageQueueTableMetadata table_metadata(*queue_settings, storage_metadata.getColumns(), configuration_->format);
-    ObjectStorageQueueMetadata::syncWithKeeper(zk_path, table_metadata, *queue_settings, log);
-
-    auto queue_metadata = std::make_unique<ObjectStorageQueueMetadata>(zk_path, std::move(table_metadata), *queue_settings);
-    files_metadata = ObjectStorageQueueMetadataFactory::instance().getOrCreate(zk_path, std::move(queue_metadata));
-
     task = getContext()->getSchedulePool().createTask("ObjectStorageQueueStreamingTask", [this] { threadFunc(); });
+
+    /// Get metadata manager from ObjectStorageQueueMetadataFactory,
+    /// it will increase the ref count for the metadata object.
+    /// The ref count is decreased when StorageObjectStorageQueue::drop() method is called.
+    files_metadata = ObjectStorageQueueMetadataFactory::instance().getOrCreate(zk_path, *queue_settings);
+    try
+    {
+        files_metadata->initialize(configuration_, storage_metadata);
+    }
+    catch (...)
+    {
+        ObjectStorageQueueMetadataFactory::instance().remove(zk_path);
+        throw;
+    }
 }
 
 void StorageObjectStorageQueue::startup()
diff --git a/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp b/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp
index 01f78673ed8..f632e553a0d 100644
--- a/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp
+++ b/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp
@@ -659,7 +659,7 @@ void PostgreSQLReplicationHandler::dropReplicationSlot(pqxx::nontransaction & tx
 
 void PostgreSQLReplicationHandler::dropPublication(pqxx::nontransaction & tx)
 {
-    std::string query_str = fmt::format("DROP PUBLICATION IF EXISTS {}", doubleQuoteString(publication_name));
+    std::string query_str = fmt::format("DROP PUBLICATION IF EXISTS {}", publication_name);
     tx.exec(query_str);
     LOG_DEBUG(log, "Dropped publication: {}", publication_name);
 }
@@ -667,7 +667,7 @@ void PostgreSQLReplicationHandler::dropPublication(pqxx::nontransaction & tx)
 
 void PostgreSQLReplicationHandler::addTableToPublication(pqxx::nontransaction & ntx, const String & table_name)
 {
-    std::string query_str = fmt::format("ALTER PUBLICATION {} ADD TABLE ONLY {}", doubleQuoteString(publication_name), doubleQuoteWithSchema(table_name));
+    std::string query_str = fmt::format("ALTER PUBLICATION {} ADD TABLE ONLY {}", publication_name, doubleQuoteWithSchema(table_name));
     ntx.exec(query_str);
     LOG_TRACE(log, "Added table {} to publication `{}`", doubleQuoteWithSchema(table_name), publication_name);
 }
diff --git a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
index a9778d5d04d..a904b29e12f 100644
--- a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
+++ b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
@@ -10,6 +10,7 @@
 #include <Core/Settings.h>
 #include <Core/PostgreSQL/Connection.h>
 
+#include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypesDecimal.h>
@@ -21,7 +22,6 @@
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTDataType.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/ExpressionListParsers.h>
@@ -295,7 +295,7 @@ std::shared_ptr<ASTColumnDeclaration> StorageMaterializedPostgreSQL::getMaterial
     auto column_declaration = std::make_shared<ASTColumnDeclaration>();
 
     column_declaration->name = std::move(name);
-    column_declaration->type = makeASTDataType(type);
+    column_declaration->type = makeASTFunction(type);
 
     column_declaration->default_specifier = "MATERIALIZED";
     column_declaration->default_expression = std::make_shared<ASTLiteral>(default_value);
@@ -312,17 +312,17 @@ ASTPtr StorageMaterializedPostgreSQL::getColumnDeclaration(const DataTypePtr & d
     WhichDataType which(data_type);
 
     if (which.isNullable())
-        return makeASTDataType("Nullable", getColumnDeclaration(typeid_cast<const DataTypeNullable *>(data_type.get())->getNestedType()));
+        return makeASTFunction("Nullable", getColumnDeclaration(typeid_cast<const DataTypeNullable *>(data_type.get())->getNestedType()));
 
     if (which.isArray())
-        return makeASTDataType("Array", getColumnDeclaration(typeid_cast<const DataTypeArray *>(data_type.get())->getNestedType()));
+        return makeASTFunction("Array", getColumnDeclaration(typeid_cast<const DataTypeArray *>(data_type.get())->getNestedType()));
 
     /// getName() for decimal returns 'Decimal(precision, scale)', will get an error with it
     if (which.isDecimal())
     {
         auto make_decimal_expression = [&](std::string type_name)
         {
-            auto ast_expression = std::make_shared<ASTDataType>();
+            auto ast_expression = std::make_shared<ASTFunction>();
 
             ast_expression->name = type_name;
             ast_expression->arguments = std::make_shared<ASTExpressionList>();
@@ -346,7 +346,7 @@ ASTPtr StorageMaterializedPostgreSQL::getColumnDeclaration(const DataTypePtr & d
 
     if (which.isDateTime64())
     {
-        auto ast_expression = std::make_shared<ASTDataType>();
+        auto ast_expression = std::make_shared<ASTFunction>();
 
         ast_expression->name = "DateTime64";
         ast_expression->arguments = std::make_shared<ASTExpressionList>();
@@ -354,7 +354,7 @@ ASTPtr StorageMaterializedPostgreSQL::getColumnDeclaration(const DataTypePtr & d
         return ast_expression;
     }
 
-    return makeASTDataType(data_type->getName());
+    return std::make_shared<ASTIdentifier>(data_type->getName());
 }
 
 
@@ -571,7 +571,6 @@ void registerStorageMaterializedPostgreSQL(StorageFactory & factory)
         StorageInMemoryMetadata metadata;
         metadata.setColumns(args.columns);
         metadata.setConstraints(args.constraints);
-        metadata.setComment(args.comment);
 
         if (args.mode <= LoadingStrictnessLevel::CREATE
             && !args.getLocalContext()->getSettingsRef().allow_experimental_materialized_postgresql_table)
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
index 9e3c40071b5..f3d2aff68c8 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
@@ -70,7 +70,6 @@ StorageRabbitMQ::StorageRabbitMQ(
         const StorageID & table_id_,
         ContextPtr context_,
         const ColumnsDescription & columns_,
-        const String & comment,
         std::unique_ptr<RabbitMQSettings> rabbitmq_settings_,
         LoadingStrictnessLevel mode)
         : IStorage(table_id_)
@@ -146,7 +145,6 @@ StorageRabbitMQ::StorageRabbitMQ(
 
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
-    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
     setVirtuals(createVirtuals(rabbitmq_settings->rabbitmq_handle_error_mode));
 
@@ -1290,7 +1288,7 @@ 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, args.comment, std::move(rabbitmq_settings), args.mode);
+        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, });
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.h b/src/Storages/RabbitMQ/StorageRabbitMQ.h
index fed80a4357b..b8fab5825e4 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.h
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.h
@@ -26,7 +26,6 @@ public:
             const StorageID & table_id_,
             ContextPtr context_,
             const ColumnsDescription & columns_,
-            const String & comment,
             std::unique_ptr<RabbitMQSettings> rabbitmq_settings_,
             LoadingStrictnessLevel mode);
 
diff --git a/src/Storages/ReadFinalForExternalReplicaStorage.cpp b/src/Storages/ReadFinalForExternalReplicaStorage.cpp
index add12413853..5070b4a17d8 100644
--- a/src/Storages/ReadFinalForExternalReplicaStorage.cpp
+++ b/src/Storages/ReadFinalForExternalReplicaStorage.cpp
@@ -80,7 +80,7 @@ void readFinalFromNestedStorage(
 
         auto step = std::make_unique<FilterStep>(
             query_plan.getCurrentDataStream(),
-            std::move(actions),
+            actions,
             filter_column_name,
             false);
 
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
index 50f6266cb2f..409703c84c6 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
@@ -36,12 +36,10 @@
 #include <base/sort.h>
 
 #include <rocksdb/advanced_options.h>
-#include <rocksdb/compression_type.h>
-#include <rocksdb/convenience.h>
 #include <rocksdb/env.h>
 #include <rocksdb/options.h>
-#include <rocksdb/statistics.h>
 #include <rocksdb/table.h>
+#include <rocksdb/convenience.h>
 #include <rocksdb/utilities/db_ttl.h>
 
 #include <cstddef>
@@ -430,7 +428,6 @@ void StorageEmbeddedRocksDB::initDB()
     rocksdb::Options base;
 
     base.create_if_missing = true;
-    base.compression = rocksdb::CompressionType::kZSTD;
     base.statistics = rocksdb::CreateDBStatistics();
     /// It is too verbose by default, and in fact we don't care about rocksdb logs at all.
     base.info_log_level = rocksdb::ERROR_LEVEL;
@@ -442,7 +439,7 @@ void StorageEmbeddedRocksDB::initDB()
     if (config.has("rocksdb.options"))
     {
         auto config_options = getOptionsFromConfig(config, "rocksdb.options");
-        status = rocksdb::GetDBOptionsFromMap({}, merged, config_options, &merged);
+        status = rocksdb::GetDBOptionsFromMap(merged, config_options, &merged);
         if (!status.ok())
         {
             throw Exception(ErrorCodes::ROCKSDB_ERROR, "Fail to merge rocksdb options from 'rocksdb.options' at: {}: {}",
@@ -452,7 +449,7 @@ void StorageEmbeddedRocksDB::initDB()
     if (config.has("rocksdb.column_family_options"))
     {
         auto column_family_options = getOptionsFromConfig(config, "rocksdb.column_family_options");
-        status = rocksdb::GetColumnFamilyOptionsFromMap({}, merged, column_family_options, &merged);
+        status = rocksdb::GetColumnFamilyOptionsFromMap(merged, column_family_options, &merged);
         if (!status.ok())
         {
             throw Exception(ErrorCodes::ROCKSDB_ERROR, "Fail to merge rocksdb options from 'rocksdb.column_family_options' at: {}: {}",
@@ -462,7 +459,7 @@ void StorageEmbeddedRocksDB::initDB()
     if (config.has("rocksdb.block_based_table_options"))
     {
         auto block_based_table_options = getOptionsFromConfig(config, "rocksdb.block_based_table_options");
-        status = rocksdb::GetBlockBasedTableOptionsFromMap({}, table_options, block_based_table_options, &table_options);
+        status = rocksdb::GetBlockBasedTableOptionsFromMap(table_options, block_based_table_options, &table_options);
         if (!status.ok())
         {
             throw Exception(ErrorCodes::ROCKSDB_ERROR, "Fail to merge rocksdb options from 'rocksdb.block_based_table_options' at: {}: {}",
@@ -487,7 +484,7 @@ void StorageEmbeddedRocksDB::initDB()
             if (config.has(config_key))
             {
                 auto table_config_options = getOptionsFromConfig(config, config_key);
-                status = rocksdb::GetDBOptionsFromMap({}, merged, table_config_options, &merged);
+                status = rocksdb::GetDBOptionsFromMap(merged, table_config_options, &merged);
                 if (!status.ok())
                 {
                     throw Exception(ErrorCodes::ROCKSDB_ERROR, "Fail to merge rocksdb options from '{}' at: {}: {}",
@@ -499,7 +496,7 @@ void StorageEmbeddedRocksDB::initDB()
             if (config.has(config_key))
             {
                 auto table_column_family_options = getOptionsFromConfig(config, config_key);
-                status = rocksdb::GetColumnFamilyOptionsFromMap({}, merged, table_column_family_options, &merged);
+                status = rocksdb::GetColumnFamilyOptionsFromMap(merged, table_column_family_options, &merged);
                 if (!status.ok())
                 {
                     throw Exception(ErrorCodes::ROCKSDB_ERROR, "Fail to merge rocksdb options from '{}' at: {}: {}",
@@ -511,7 +508,7 @@ void StorageEmbeddedRocksDB::initDB()
             if (config.has(config_key))
             {
                 auto block_based_table_options = getOptionsFromConfig(config, config_key);
-                status = rocksdb::GetBlockBasedTableOptionsFromMap({}, table_options, block_based_table_options, &table_options);
+                status = rocksdb::GetBlockBasedTableOptionsFromMap(table_options, block_based_table_options, &table_options);
                 if (!status.ok())
                 {
                     throw Exception(ErrorCodes::ROCKSDB_ERROR, "Fail to merge rocksdb options from '{}' at: {}: {}",
@@ -694,7 +691,6 @@ static StoragePtr create(const StorageFactory::Arguments & args)
     StorageInMemoryMetadata metadata;
     metadata.setColumns(args.columns);
     metadata.setConstraints(args.constraints);
-    metadata.setComment(args.comment);
 
     if (!args.storage_def->primary_key)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "StorageEmbeddedRocksDB must require one column in primary key");
diff --git a/src/Storages/SelectQueryInfo.cpp b/src/Storages/SelectQueryInfo.cpp
index c9c96ed5837..d59ccf0dfaf 100644
--- a/src/Storages/SelectQueryInfo.cpp
+++ b/src/Storages/SelectQueryInfo.cpp
@@ -18,7 +18,7 @@ std::unordered_map<std::string, ColumnWithTypeAndName> SelectQueryInfo::buildNod
     std::unordered_map<std::string, ColumnWithTypeAndName> node_name_to_input_node_column;
     if (planner_context)
     {
-        auto & table_expression_data = planner_context->getTableExpressionDataOrThrow(table_expression);
+        const auto & table_expression_data = planner_context->getTableExpressionDataOrThrow(table_expression);
         const auto & alias_column_expressions = table_expression_data.getAliasColumnExpressions();
         for (const auto & [column_identifier, column_name] : table_expression_data.getColumnIdentifierToColumnName())
         {
diff --git a/src/Storages/SelectQueryInfo.h b/src/Storages/SelectQueryInfo.h
index 7ad6a733c6f..848aeb59dad 100644
--- a/src/Storages/SelectQueryInfo.h
+++ b/src/Storages/SelectQueryInfo.h
@@ -18,6 +18,9 @@ namespace DB
 class ExpressionActions;
 using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 
+class ActionsDAG;
+using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
+
 struct PrewhereInfo;
 using PrewhereInfoPtr = std::shared_ptr<PrewhereInfo>;
 
@@ -43,9 +46,9 @@ struct PrewhereInfo
 {
     /// Actions for row level security filter. Applied separately before prewhere_actions.
     /// This actions are separate because prewhere condition should not be executed over filtered rows.
-    std::optional<ActionsDAG> row_level_filter;
+    ActionsDAGPtr row_level_filter;
     /// Actions which are executed on block in order to get filter column for prewhere step.
-    ActionsDAG prewhere_actions;
+    ActionsDAGPtr prewhere_actions;
     String row_level_column_name;
     String prewhere_column_name;
     bool remove_prewhere_column = false;
@@ -53,7 +56,7 @@ struct PrewhereInfo
     bool generated_by_optimizer = false;
 
     PrewhereInfo() = default;
-    explicit PrewhereInfo(ActionsDAG prewhere_actions_, String prewhere_column_name_)
+    explicit PrewhereInfo(ActionsDAGPtr prewhere_actions_, String prewhere_column_name_)
             : prewhere_actions(std::move(prewhere_actions_)), prewhere_column_name(std::move(prewhere_column_name_)) {}
 
     std::string dump() const;
@@ -65,7 +68,8 @@ struct PrewhereInfo
         if (row_level_filter)
             prewhere_info->row_level_filter = row_level_filter->clone();
 
-        prewhere_info->prewhere_actions = prewhere_actions.clone();
+        if (prewhere_actions)
+            prewhere_info->prewhere_actions = prewhere_actions->clone();
 
         prewhere_info->row_level_column_name = row_level_column_name;
         prewhere_info->prewhere_column_name = prewhere_column_name;
@@ -89,7 +93,7 @@ struct FilterInfo
 /// Same as FilterInfo, but with ActionsDAG.
 struct FilterDAGInfo
 {
-    ActionsDAG actions;
+    ActionsDAGPtr actions;
     String column_name;
     bool do_remove_column = false;
 
@@ -198,7 +202,7 @@ struct SelectQueryInfo
     ASTPtr parallel_replica_custom_key_ast;
 
     /// Filter actions dag for current storage
-    std::shared_ptr<const ActionsDAG> filter_actions_dag;
+    ActionsDAGPtr filter_actions_dag;
 
     ReadInOrderOptimizerPtr order_optimizer;
     /// Can be modified while reading from storage
diff --git a/src/Storages/Statistics/ConditionSelectivityEstimator.cpp b/src/Storages/Statistics/ConditionSelectivityEstimator.cpp
index 432659f51f8..757136fdf42 100644
--- a/src/Storages/Statistics/ConditionSelectivityEstimator.cpp
+++ b/src/Storages/Statistics/ConditionSelectivityEstimator.cpp
@@ -16,10 +16,10 @@ void ConditionSelectivityEstimator::ColumnSelectivityEstimator::merge(String par
     part_statistics[part_name] = stats;
 }
 
-Float64 ConditionSelectivityEstimator::ColumnSelectivityEstimator::estimateLess(const Field & val, Float64 rows) const
+Float64 ConditionSelectivityEstimator::ColumnSelectivityEstimator::estimateLess(Float64 val, Float64 rows) const
 {
     if (part_statistics.empty())
-        return default_cond_range_factor * rows;
+        return default_normal_cond_factor * rows;
     Float64 result = 0;
     Float64 part_rows = 0;
     for (const auto & [key, estimator] : part_statistics)
@@ -30,16 +30,19 @@ Float64 ConditionSelectivityEstimator::ColumnSelectivityEstimator::estimateLess(
     return result * rows / part_rows;
 }
 
-Float64 ConditionSelectivityEstimator::ColumnSelectivityEstimator::estimateGreater(const Field & val, Float64 rows) const
+Float64 ConditionSelectivityEstimator::ColumnSelectivityEstimator::estimateGreater(Float64 val, Float64 rows) const
 {
     return rows - estimateLess(val, rows);
 }
 
-Float64 ConditionSelectivityEstimator::ColumnSelectivityEstimator::estimateEqual(const Field & val, Float64 rows) const
+Float64 ConditionSelectivityEstimator::ColumnSelectivityEstimator::estimateEqual(Float64 val, Float64 rows) const
 {
     if (part_statistics.empty())
     {
-        return default_cond_equal_factor * rows;
+        if (val < - threshold || val > threshold)
+            return default_normal_cond_factor * rows;
+        else
+            return default_good_cond_factor * rows;
     }
     Float64 result = 0;
     Float64 partial_cnt = 0;
@@ -84,7 +87,7 @@ static std::pair<String, Int32> tryToExtractSingleColumn(const RPNBuilderTreeNod
     return result;
 }
 
-std::pair<String, Field> ConditionSelectivityEstimator::extractBinaryOp(const RPNBuilderTreeNode & node, const String & column_name) const
+std::pair<String, Float64> ConditionSelectivityEstimator::extractBinaryOp(const RPNBuilderTreeNode & node, const String & column_name) const
 {
     if (!node.isFunction())
         return {};
@@ -120,51 +123,77 @@ std::pair<String, Field> ConditionSelectivityEstimator::extractBinaryOp(const RP
     DataTypePtr output_type;
     if (!constant_node->tryGetConstant(output_value, output_type))
         return {};
-    return std::make_pair(function_name, output_value);
+
+    const auto type = output_value.getType();
+    Float64 value;
+    if (type == Field::Types::Int64)
+        value = output_value.get<Int64>();
+    else if (type == Field::Types::UInt64)
+        value = output_value.get<UInt64>();
+    else if (type == Field::Types::Float64)
+        value = output_value.get<Float64>();
+    else
+        return {};
+    return std::make_pair(function_name, value);
 }
 
 Float64 ConditionSelectivityEstimator::estimateRowCount(const RPNBuilderTreeNode & node) const
 {
     auto result = tryToExtractSingleColumn(node);
     if (result.second != 1)
-        return default_unknown_cond_factor * total_rows;
-
+    {
+        return default_unknown_cond_factor;
+    }
     String col = result.first;
     auto it = column_estimators.find(col);
 
     /// If there the estimator of the column is not found or there are no data at all,
     /// we use dummy estimation.
-    bool dummy = false;
+    bool dummy = total_rows == 0;
     ColumnSelectivityEstimator estimator;
     if (it != column_estimators.end())
-        estimator = it->second;
-    else
-        dummy = true;
-
-    auto [op, val] = extractBinaryOp(node, col);
-
-    if (dummy)
     {
-        if (op == "equals")
-            return default_cond_equal_factor * total_rows;
-        else if (op == "less" || op == "lessOrEquals" || op == "greater" || op == "greaterOrEquals")
-            return default_cond_range_factor * total_rows;
-        else
-            return default_unknown_cond_factor * total_rows;
+        estimator = it->second;
     }
-
+    else
+    {
+        dummy = true;
+    }
+    auto [op, val] = extractBinaryOp(node, col);
     if (op == "equals")
+    {
+        if (dummy)
+        {
+            if (val < - threshold || val > threshold)
+                return default_normal_cond_factor * total_rows;
+            else
+                return default_good_cond_factor * total_rows;
+        }
         return estimator.estimateEqual(val, total_rows);
+    }
     else if (op == "less" || op == "lessOrEquals")
+    {
+        if (dummy)
+            return default_normal_cond_factor * total_rows;
         return estimator.estimateLess(val, total_rows);
+    }
     else if (op == "greater" || op == "greaterOrEquals")
+    {
+        if (dummy)
+            return default_normal_cond_factor * total_rows;
         return estimator.estimateGreater(val, total_rows);
+    }
     else
         return default_unknown_cond_factor * total_rows;
 }
 
-void ConditionSelectivityEstimator::merge(String part_name, ColumnStatisticsPtr column_stat)
+void ConditionSelectivityEstimator::merge(String part_name, UInt64 part_rows, ColumnStatisticsPtr column_stat)
 {
+    if (!part_names.contains(part_name))
+    {
+        total_rows += part_rows;
+        part_names.insert(part_name);
+    }
     if (column_stat != nullptr)
         column_estimators[column_stat->columnName()].merge(part_name, column_stat);
 }
diff --git a/src/Storages/Statistics/ConditionSelectivityEstimator.h b/src/Storages/Statistics/ConditionSelectivityEstimator.h
index 269ee9ac6cb..f0599742276 100644
--- a/src/Storages/Statistics/ConditionSelectivityEstimator.h
+++ b/src/Storages/Statistics/ConditionSelectivityEstimator.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Storages/Statistics/Statistics.h>
-#include <Core/Field.h>
 
 namespace DB
 {
@@ -11,14 +10,6 @@ class RPNBuilderTreeNode;
 /// It estimates the selectivity of a condition.
 class ConditionSelectivityEstimator
 {
-public:
-    /// TODO: Support the condition consists of CNF/DNF like (cond1 and cond2) or (cond3) ...
-    /// Right now we only support simple condition like col = val / col < val
-    Float64 estimateRowCount(const RPNBuilderTreeNode & node) const;
-
-    void merge(String part_name, ColumnStatisticsPtr column_stat);
-    void addRows(UInt64 part_rows) { total_rows += part_rows; }
-
 private:
     friend class ColumnStatistics;
     struct ColumnSelectivityEstimator
@@ -29,22 +20,31 @@ private:
 
         void merge(String part_name, ColumnStatisticsPtr stats);
 
-        Float64 estimateLess(const Field & val, Float64 rows) const;
+        Float64 estimateLess(Float64 val, Float64 rows) const;
 
-        Float64 estimateGreater(const Field & val, Float64 rows) const;
+        Float64 estimateGreater(Float64 val, Float64 rows) const;
 
-        Float64 estimateEqual(const Field & val, Float64 rows) const;
+        Float64 estimateEqual(Float64 val, Float64 rows) const;
     };
 
-    std::pair<String, Field> extractBinaryOp(const RPNBuilderTreeNode & node, const String & column_name) const;
-
-    /// Used to estimate the selectivity of a condition when there is no statistics.
-    static constexpr auto default_cond_range_factor = 0.5;
-    static constexpr auto default_cond_equal_factor = 0.01;
-    static constexpr auto default_unknown_cond_factor = 1;
+    static constexpr auto default_good_cond_factor = 0.1;
+    static constexpr auto default_normal_cond_factor = 0.5;
+    static constexpr auto default_unknown_cond_factor = 1.0;
+    /// Conditions like "x = N" are considered good if abs(N) > threshold.
+    /// This is used to assume that condition is likely to have good selectivity.
+    static constexpr auto threshold = 2;
 
     UInt64 total_rows = 0;
+    std::set<String> part_names;
     std::map<String, ColumnSelectivityEstimator> column_estimators;
+    std::pair<String, Float64> extractBinaryOp(const RPNBuilderTreeNode & node, const String & column_name) const;
+
+public:
+    /// TODO: Support the condition consists of CNF/DNF like (cond1 and cond2) or (cond3) ...
+    /// Right now we only support simple condition like col = val / col < val
+    Float64 estimateRowCount(const RPNBuilderTreeNode & node) const;
+
+    void merge(String part_name, UInt64 part_rows, ColumnStatisticsPtr column_stat);
 };
 
 }
diff --git a/src/Storages/Statistics/Statistics.cpp b/src/Storages/Statistics/Statistics.cpp
index 0557530515f..28e75c6d244 100644
--- a/src/Storages/Statistics/Statistics.cpp
+++ b/src/Storages/Statistics/Statistics.cpp
@@ -1,22 +1,15 @@
 #include <Storages/Statistics/Statistics.h>
-#include <Common/Exception.h>
-#include <Common/FieldVisitorConvertToNumber.h>
-#include <Common/logger_useful.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <Interpreters/convertFieldToType.h>
-#include <Storages/ColumnsDescription.h>
 #include <Storages/Statistics/ConditionSelectivityEstimator.h>
-#include <Storages/Statistics/StatisticsCountMinSketch.h>
-#include <Storages/Statistics/StatisticsMinMax.h>
 #include <Storages/Statistics/StatisticsTDigest.h>
 #include <Storages/Statistics/StatisticsUniq.h>
 #include <Storages/StatisticsDescription.h>
+#include <Storages/ColumnsDescription.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Common/Exception.h>
+#include <Common/logger_useful.h>
 
 
-#include "config.h" /// USE_DATASKETCHES
-
 namespace DB
 {
 
@@ -31,36 +24,13 @@ enum StatisticsFileVersion : UInt16
     V0 = 0,
 };
 
-std::optional<Float64> StatisticsUtils::tryConvertToFloat64(const Field & value, const DataTypePtr & data_type)
-{
-    if (data_type->isValueRepresentedByNumber())
-    {
-        Field value_converted;
-
-        if (isInteger(data_type) && (value.getType() == Field::Types::Float64 || value.getType() == Field::Types::String))
-            /// For case val_int32 < 10.5 or val_int32 < '10.5' we should convert 10.5 to Float64.
-            value_converted = convertFieldToType(value, *DataTypeFactory::instance().get("Float64"));
-        else
-            /// We should convert value to the real column data type and then translate it to Float64.
-            /// For example for expression col_date > '2024-08-07', if we directly convert '2024-08-07' to Float64, we will get null.
-            value_converted = convertFieldToType(value, *data_type);
-
-        if (value_converted.isNull())
-            return {};
-
-        Float64 value_as_float = applyVisitor(FieldVisitorConvertToNumber<Float64>(), value_converted);
-        return value_as_float;
-    }
-    return {};
-}
-
 IStatistics::IStatistics(const SingleStatisticsDescription & stat_)
     : stat(stat_)
 {
 }
 
-ColumnStatistics::ColumnStatistics(const ColumnStatisticsDescription & stats_desc_, const String & column_name_)
-    : stats_desc(stats_desc_), column_name(column_name_)
+ColumnStatistics::ColumnStatistics(const ColumnStatisticsDescription & stats_desc_)
+    : stats_desc(stats_desc_)
 {
 }
 
@@ -76,63 +46,50 @@ UInt64 IStatistics::estimateCardinality() const
     throw Exception(ErrorCodes::LOGICAL_ERROR, "Cardinality estimation is not implemented for this type of statistics");
 }
 
-Float64 IStatistics::estimateEqual(const Field & /*val*/) const
+Float64 IStatistics::estimateEqual(Float64 /*val*/) const
 {
     throw Exception(ErrorCodes::LOGICAL_ERROR, "Equality estimation is not implemented for this type of statistics");
 }
 
-Float64 IStatistics::estimateLess(const Field & /*val*/) const
+Float64 IStatistics::estimateLess(Float64 /*val*/) const
 {
     throw Exception(ErrorCodes::LOGICAL_ERROR, "Less-than estimation is not implemented for this type of statistics");
 }
 
-/// Notes:
-/// - Statistics object usually only support estimation for certain types of predicates, e.g.
-///    - TDigest: '< X' (less-than predicates)
-///    - Count-min sketches: '= X' (equal predicates)
-///    - Uniq (HyperLogLog): 'count distinct(*)' (column cardinality)
-///
-/// If multiple statistics objects in a column support estimating a predicate, we want to try statistics in order of descending accuracy
-/// (e.g. MinMax statistics are simpler than TDigest statistics and thus worse for estimating 'less' predicates).
-///
-/// Sometimes, it is possible to combine multiple statistics in a clever way. For that reason, all estimation are performed in a central
-/// place (here), and we don't simply pass the predicate to the first statistics object that supports it natively.
+/// -------------------------------------
+/// Implementation of the estimation:
+/// Note: Each statistics object supports certain types predicates natively, e.g.
+/// - TDigest: '< X' (less-than predicates)
+/// - Count-min sketches: '= X' (equal predicates)
+/// - Uniq (HyperLogLog): 'count distinct(*)' (column cardinality)
+/// If multiple statistics objects are available per column, it is sometimes also possible to combine them in a clever way.
+/// For that reason, all estimation are performed in a central place (here), and we don't simply pass the predicate to the first statistics
+/// object that supports it natively.
 
-Float64 ColumnStatistics::estimateLess(const Field & val) const
+Float64 ColumnStatistics::estimateLess(Float64 val) const
 {
     if (stats.contains(StatisticsType::TDigest))
         return stats.at(StatisticsType::TDigest)->estimateLess(val);
-    if (stats.contains(StatisticsType::MinMax))
-        return stats.at(StatisticsType::MinMax)->estimateLess(val);
-    return rows * ConditionSelectivityEstimator::default_cond_range_factor;
+    return rows * ConditionSelectivityEstimator::default_normal_cond_factor;
 }
 
-Float64 ColumnStatistics::estimateGreater(const Field & val) const
+Float64 ColumnStatistics::estimateGreater(Float64 val) const
 {
     return rows - estimateLess(val);
 }
 
-Float64 ColumnStatistics::estimateEqual(const Field & val) const
+Float64 ColumnStatistics::estimateEqual(Float64 val) const
 {
-    if (stats_desc.data_type->isValueRepresentedByNumber() && stats.contains(StatisticsType::Uniq) && stats.contains(StatisticsType::TDigest))
+    if (stats.contains(StatisticsType::Uniq) && stats.contains(StatisticsType::TDigest))
     {
         /// 2048 is the default number of buckets in TDigest. In this case, TDigest stores exactly one value (with many rows) for every bucket.
         if (stats.at(StatisticsType::Uniq)->estimateCardinality() < 2048)
             return stats.at(StatisticsType::TDigest)->estimateEqual(val);
     }
-#if USE_DATASKETCHES
-    if (stats.contains(StatisticsType::CountMinSketch))
-        return stats.at(StatisticsType::CountMinSketch)->estimateEqual(val);
-#endif
-    if (stats.contains(StatisticsType::Uniq))
-    {
-        UInt64 cardinality = stats.at(StatisticsType::Uniq)->estimateCardinality();
-        if (cardinality == 0 || rows == 0)
-            return 0;
-        return 1.0 / cardinality * rows; /// assume uniform distribution
-    }
-
-    return rows * ConditionSelectivityEstimator::default_cond_equal_factor;
+    if (val < - ConditionSelectivityEstimator::threshold || val > ConditionSelectivityEstimator::threshold)
+        return rows * ConditionSelectivityEstimator::default_normal_cond_factor;
+    else
+        return rows * ConditionSelectivityEstimator::default_good_cond_factor;
 }
 
 /// -------------------------------------
@@ -187,7 +144,7 @@ String ColumnStatistics::getFileName() const
 
 const String & ColumnStatistics::columnName() const
 {
-    return column_name;
+    return stats_desc.column_name;
 }
 
 UInt64 ColumnStatistics::rowCount() const
@@ -209,19 +166,11 @@ void MergeTreeStatisticsFactory::registerValidator(StatisticsType stats_type, Va
 
 MergeTreeStatisticsFactory::MergeTreeStatisticsFactory()
 {
-    registerValidator(StatisticsType::MinMax, minMaxStatisticsValidator);
-    registerCreator(StatisticsType::MinMax, minMaxStatisticsCreator);
+    registerValidator(StatisticsType::TDigest, TDigestValidator);
+    registerCreator(StatisticsType::TDigest, TDigestCreator);
 
-    registerValidator(StatisticsType::TDigest, tdigestStatisticsValidator);
-    registerCreator(StatisticsType::TDigest, tdigestStatisticsCreator);
-
-    registerValidator(StatisticsType::Uniq, uniqStatisticsValidator);
-    registerCreator(StatisticsType::Uniq, uniqStatisticsCreator);
-
-#if USE_DATASKETCHES
-    registerValidator(StatisticsType::CountMinSketch, countMinSketchStatisticsValidator);
-    registerCreator(StatisticsType::CountMinSketch, countMinSketchStatisticsCreator);
-#endif
+    registerValidator(StatisticsType::Uniq, UniqValidator);
+    registerCreator(StatisticsType::Uniq, UniqCreator);
 }
 
 MergeTreeStatisticsFactory & MergeTreeStatisticsFactory::instance()
@@ -230,7 +179,7 @@ MergeTreeStatisticsFactory & MergeTreeStatisticsFactory::instance()
     return instance;
 }
 
-void MergeTreeStatisticsFactory::validate(const ColumnStatisticsDescription & stats, const DataTypePtr & data_type) const
+void MergeTreeStatisticsFactory::validate(const ColumnStatisticsDescription & stats, DataTypePtr data_type) const
 {
     for (const auto & [type, desc] : stats.types_to_desc)
     {
@@ -241,15 +190,15 @@ void MergeTreeStatisticsFactory::validate(const ColumnStatisticsDescription & st
     }
 }
 
-ColumnStatisticsPtr MergeTreeStatisticsFactory::get(const ColumnDescription & column_desc) const
+ColumnStatisticsPtr MergeTreeStatisticsFactory::get(const ColumnStatisticsDescription & stats) const
 {
-    ColumnStatisticsPtr column_stat = std::make_shared<ColumnStatistics>(column_desc.statistics, column_desc.name);
-    for (const auto & [type, desc] : column_desc.statistics.types_to_desc)
+    ColumnStatisticsPtr column_stat = std::make_shared<ColumnStatistics>(stats);
+    for (const auto & [type, desc] : stats.types_to_desc)
     {
         auto it = creators.find(type);
         if (it == creators.end())
-            throw Exception(ErrorCodes::INCORRECT_QUERY, "Unknown statistic type '{}'. Available types: 'countmin', 'minmax', 'tdigest' and 'uniq'", type);
-        auto stat_ptr = (it->second)(desc, column_desc.type);
+            throw Exception(ErrorCodes::INCORRECT_QUERY, "Unknown statistic type '{}'. Available types: 'tdigest' 'uniq'", type);
+        auto stat_ptr = (it->second)(desc, stats.data_type);
         column_stat->stats[type] = stat_ptr;
     }
     return column_stat;
@@ -260,7 +209,7 @@ ColumnsStatistics MergeTreeStatisticsFactory::getMany(const ColumnsDescription &
     ColumnsStatistics result;
     for (const auto & col : columns)
         if (!col.statistics.empty())
-            result.push_back(get(col));
+            result.push_back(get(col.statistics));
     return result;
 }
 
diff --git a/src/Storages/Statistics/Statistics.h b/src/Storages/Statistics/Statistics.h
index 98666ed73df..d4364075d1c 100644
--- a/src/Storages/Statistics/Statistics.h
+++ b/src/Storages/Statistics/Statistics.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Core/Block.h>
-#include <Core/Field.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
 #include <Storages/StatisticsDescription.h>
@@ -14,13 +13,6 @@ namespace DB
 constexpr auto STATS_FILE_PREFIX = "statistics_";
 constexpr auto STATS_FILE_SUFFIX = ".stats";
 
-struct StatisticsUtils
-{
-    /// Returns std::nullopt if input Field cannot be converted to a concrete value
-    /// - `data_type` is the type of the column on which the statistics object was build on
-    static std::optional<Float64> tryConvertToFloat64(const Field & value, const DataTypePtr & data_type);
-};
-
 /// Statistics describe properties of the values in the column,
 /// e.g. how many unique values exist,
 /// what are the N most frequent values,
@@ -42,8 +34,8 @@ public:
 
     /// Per-value estimations.
     /// Throws if the statistics object is not able to do a meaningful estimation.
-    virtual Float64 estimateEqual(const Field & val) const; /// cardinality of val in the column
-    virtual Float64 estimateLess(const Field & val) const;  /// summarized cardinality of values < val in the column
+    virtual Float64 estimateEqual(Float64 val) const; /// cardinality of val in the column
+    virtual Float64 estimateLess(Float64 val) const;  /// summarized cardinality of values < val in the column
 
 protected:
     SingleStatisticsDescription stat;
@@ -54,7 +46,7 @@ using StatisticsPtr = std::shared_ptr<IStatistics>;
 class ColumnStatistics
 {
 public:
-    explicit ColumnStatistics(const ColumnStatisticsDescription & stats_desc_, const String & column_name_);
+    explicit ColumnStatistics(const ColumnStatisticsDescription & stats_desc_);
 
     void serialize(WriteBuffer & buf);
     void deserialize(ReadBuffer & buf);
@@ -66,19 +58,17 @@ public:
 
     void update(const ColumnPtr & column);
 
-    Float64 estimateLess(const Field & val) const;
-    Float64 estimateGreater(const Field & val) const;
-    Float64 estimateEqual(const Field & val) const;
+    Float64 estimateLess(Float64 val) const;
+    Float64 estimateGreater(Float64 val) const;
+    Float64 estimateEqual(Float64 val) const;
 
 private:
     friend class MergeTreeStatisticsFactory;
     ColumnStatisticsDescription stats_desc;
-    String column_name;
     std::map<StatisticsType, StatisticsPtr> stats;
     UInt64 rows = 0; /// the number of rows in the column
 };
 
-struct ColumnDescription;
 class ColumnsDescription;
 using ColumnStatisticsPtr = std::shared_ptr<ColumnStatistics>;
 using ColumnsStatistics = std::vector<ColumnStatisticsPtr>;
@@ -88,12 +78,12 @@ class MergeTreeStatisticsFactory : private boost::noncopyable
 public:
     static MergeTreeStatisticsFactory & instance();
 
-    void validate(const ColumnStatisticsDescription & stats, const DataTypePtr & data_type) const;
+    void validate(const ColumnStatisticsDescription & stats, DataTypePtr data_type) const;
 
-    using Validator = std::function<void(const SingleStatisticsDescription & stats, const DataTypePtr & data_type)>;
-    using Creator = std::function<StatisticsPtr(const SingleStatisticsDescription & stats, const DataTypePtr & data_type)>;
+    using Validator = std::function<void(const SingleStatisticsDescription & stats, DataTypePtr data_type)>;
+    using Creator = std::function<StatisticsPtr(const SingleStatisticsDescription & stats, DataTypePtr data_type)>;
 
-    ColumnStatisticsPtr get(const ColumnDescription & column_desc) const;
+    ColumnStatisticsPtr get(const ColumnStatisticsDescription & stats) const;
     ColumnsStatistics getMany(const ColumnsDescription & columns) const;
 
     void registerValidator(StatisticsType type, Validator validator);
diff --git a/src/Storages/Statistics/StatisticsCountMinSketch.cpp b/src/Storages/Statistics/StatisticsCountMinSketch.cpp
deleted file mode 100644
index f477181ec2d..00000000000
--- a/src/Storages/Statistics/StatisticsCountMinSketch.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-#include <Storages/Statistics/StatisticsCountMinSketch.h>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <Interpreters/convertFieldToType.h>
-
-#if USE_DATASKETCHES
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-extern const int LOGICAL_ERROR;
-extern const int ILLEGAL_STATISTICS;
-}
-
-/// Constants chosen based on rolling dices.
-/// The values provides:
-///     1. an error tolerance of 0.1% (ε = 0.001)
-///     2. a confidence level of 99.9% (δ = 0.001).
-/// And sketch the size is 152kb.
-static constexpr auto num_hashes = 7uz;
-static constexpr auto num_buckets = 2718uz;
-
-StatisticsCountMinSketch::StatisticsCountMinSketch(const SingleStatisticsDescription & description, const DataTypePtr & data_type_)
-    : IStatistics(description)
-    , sketch(num_hashes, num_buckets)
-    , data_type(data_type_)
-{
-}
-
-Float64 StatisticsCountMinSketch::estimateEqual(const Field & val) const
-{
-    /// Try to convert field to data_type. Converting string to proper data types such as: number, date, datetime, IPv4, Decimal etc.
-    /// Return null if val larger than the range of data_type
-    ///
-    /// For example: if data_type is Int32:
-    ///     1. For 1.0, 1, '1', return Field(1)
-    ///     2. For 1.1, max_value_int64, return null
-    Field val_converted = convertFieldToType(val, *data_type);
-    if (val_converted.isNull())
-        return 0;
-
-    if (data_type->isValueRepresentedByNumber())
-        return sketch.get_estimate(&val_converted, data_type->getSizeOfValueInMemory());
-
-    if (isStringOrFixedString(data_type))
-        return sketch.get_estimate(val.safeGet<String>());
-
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Statistics 'countmin' does not support estimate data type of {}", data_type->getName());
-}
-
-void StatisticsCountMinSketch::update(const ColumnPtr & column)
-{
-    for (size_t row = 0; row < column->size(); ++row)
-    {
-        if (column->isNullAt(row))
-            continue;
-        auto data = column->getDataAt(row);
-        sketch.update(data.data, data.size, 1);
-    }
-}
-
-void StatisticsCountMinSketch::serialize(WriteBuffer & buf)
-{
-    Sketch::vector_bytes bytes = sketch.serialize();
-    writeIntBinary(static_cast<UInt64>(bytes.size()), buf);
-    buf.write(reinterpret_cast<const char *>(bytes.data()), bytes.size());
-}
-
-void StatisticsCountMinSketch::deserialize(ReadBuffer & buf)
-{
-    UInt64 size;
-    readIntBinary(size, buf);
-
-    Sketch::vector_bytes bytes;
-    bytes.resize(size); /// To avoid 'container-overflow' in AddressSanitizer checking
-    buf.readStrict(reinterpret_cast<char *>(bytes.data()), size);
-
-    sketch = Sketch::deserialize(bytes.data(), size);
-}
-
-
-void countMinSketchStatisticsValidator(const SingleStatisticsDescription & /*description*/, const DataTypePtr & data_type)
-{
-    DataTypePtr inner_data_type = removeNullable(data_type);
-    inner_data_type = removeLowCardinalityAndNullable(inner_data_type);
-    if (!inner_data_type->isValueRepresentedByNumber() && !isStringOrFixedString(inner_data_type))
-        throw Exception(ErrorCodes::ILLEGAL_STATISTICS, "Statistics of type 'countmin' does not support type {}", data_type->getName());
-}
-
-StatisticsPtr countMinSketchStatisticsCreator(const SingleStatisticsDescription & description, const DataTypePtr & data_type)
-{
-    return std::make_shared<StatisticsCountMinSketch>(description, data_type);
-}
-
-}
-
-#endif
diff --git a/src/Storages/Statistics/StatisticsCountMinSketch.h b/src/Storages/Statistics/StatisticsCountMinSketch.h
deleted file mode 100644
index d1de1a3aea5..00000000000
--- a/src/Storages/Statistics/StatisticsCountMinSketch.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <Storages/Statistics/Statistics.h>
-
-#include "config.h"
-
-#if USE_DATASKETCHES
-
-#include <count_min.hpp>
-
-namespace DB
-{
-
-class StatisticsCountMinSketch : public IStatistics
-{
-public:
-    StatisticsCountMinSketch(const SingleStatisticsDescription & description, const DataTypePtr & data_type_);
-
-    Float64 estimateEqual(const Field & val) const override;
-
-    void update(const ColumnPtr & column) override;
-
-    void serialize(WriteBuffer & buf) override;
-    void deserialize(ReadBuffer & buf) override;
-
-private:
-    using Sketch = datasketches::count_min_sketch<UInt64>;
-    Sketch sketch;
-
-    DataTypePtr data_type;
-};
-
-
-void countMinSketchStatisticsValidator(const SingleStatisticsDescription & description, const DataTypePtr & data_type);
-StatisticsPtr countMinSketchStatisticsCreator(const SingleStatisticsDescription & description, const DataTypePtr & data_type);
-
-}
-
-#endif
diff --git a/src/Storages/Statistics/StatisticsMinMax.cpp b/src/Storages/Statistics/StatisticsMinMax.cpp
deleted file mode 100644
index 27072d225de..00000000000
--- a/src/Storages/Statistics/StatisticsMinMax.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <Storages/Statistics/StatisticsMinMax.h>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-
-#include <algorithm>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-extern const int ILLEGAL_STATISTICS;
-}
-
-StatisticsMinMax::StatisticsMinMax(const SingleStatisticsDescription & description, const DataTypePtr & data_type_)
-    : IStatistics(description)
-    , data_type(data_type_)
-{
-}
-
-void StatisticsMinMax::update(const ColumnPtr & column)
-{
-    for (size_t row = 0; row < column->size(); ++row)
-    {
-        if (column->isNullAt(row))
-            continue;
-
-        auto value = column->getFloat64(row);
-        min = std::min(value, min);
-        max = std::max(value, max);
-    }
-    row_count += column->size();
-}
-
-void StatisticsMinMax::serialize(WriteBuffer & buf)
-{
-    writeIntBinary(row_count, buf);
-    writeFloatBinary(min, buf);
-    writeFloatBinary(max, buf);
-}
-
-void StatisticsMinMax::deserialize(ReadBuffer & buf)
-{
-    readIntBinary(row_count, buf);
-    readFloatBinary(min, buf);
-    readFloatBinary(max, buf);
-}
-
-Float64 StatisticsMinMax::estimateLess(const Field & val) const
-{
-    if (row_count == 0)
-        return 0;
-
-    auto val_as_float = StatisticsUtils::tryConvertToFloat64(val, data_type);
-    if (!val_as_float.has_value())
-        return 0;
-
-    if (val_as_float < min)
-        return 0;
-
-    if (val_as_float > max)
-        return row_count;
-
-    if (min == max)
-        return (val_as_float != max) ? 0 : row_count;
-
-    return ((*val_as_float - min) / (max - min)) * row_count;
-}
-
-void minMaxStatisticsValidator(const SingleStatisticsDescription & /*description*/, const DataTypePtr & data_type)
-{
-    auto inner_data_type = removeNullable(data_type);
-    inner_data_type = removeLowCardinalityAndNullable(inner_data_type);
-    if (!inner_data_type->isValueRepresentedByNumber())
-        throw Exception(ErrorCodes::ILLEGAL_STATISTICS, "Statistics of type 'minmax' do not support type {}", data_type->getName());
-}
-
-StatisticsPtr minMaxStatisticsCreator(const SingleStatisticsDescription & description, const DataTypePtr & data_type)
-{
-    return std::make_shared<StatisticsMinMax>(description, data_type);
-}
-
-}
diff --git a/src/Storages/Statistics/StatisticsMinMax.h b/src/Storages/Statistics/StatisticsMinMax.h
deleted file mode 100644
index c60fa810c47..00000000000
--- a/src/Storages/Statistics/StatisticsMinMax.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <Storages/Statistics/Statistics.h>
-#include <DataTypes/IDataType.h>
-
-
-namespace DB
-{
-
-class StatisticsMinMax : public IStatistics
-{
-public:
-    StatisticsMinMax(const SingleStatisticsDescription & statistics_description, const DataTypePtr & data_type_);
-
-    void update(const ColumnPtr & column) override;
-
-    void serialize(WriteBuffer & buf) override;
-    void deserialize(ReadBuffer & buf) override;
-
-    Float64 estimateLess(const Field & val) const override;
-
-private:
-    Float64 min = std::numeric_limits<Float64>::max();
-    Float64 max = std::numeric_limits<Float64>::min();
-    UInt64 row_count = 0;
-
-    DataTypePtr data_type;
-};
-
-void minMaxStatisticsValidator(const SingleStatisticsDescription & description, const DataTypePtr & data_type);
-StatisticsPtr minMaxStatisticsCreator(const SingleStatisticsDescription & description, const DataTypePtr & data_type);
-
-}
diff --git a/src/Storages/Statistics/StatisticsTDigest.cpp b/src/Storages/Statistics/StatisticsTDigest.cpp
index 285b779036f..0747197370c 100644
--- a/src/Storages/Statistics/StatisticsTDigest.cpp
+++ b/src/Storages/Statistics/StatisticsTDigest.cpp
@@ -1,29 +1,27 @@
 #include <Storages/Statistics/StatisticsTDigest.h>
-#include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeNullable.h>
 
 namespace DB
 {
 namespace ErrorCodes
 {
-extern const int ILLEGAL_STATISTICS;
+    extern const int ILLEGAL_STATISTICS;
 }
 
-StatisticsTDigest::StatisticsTDigest(const SingleStatisticsDescription & description, const DataTypePtr & data_type_)
-    : IStatistics(description)
-    , data_type(data_type_)
+StatisticsTDigest::StatisticsTDigest(const SingleStatisticsDescription & stat_)
+    : IStatistics(stat_)
 {
 }
 
 void StatisticsTDigest::update(const ColumnPtr & column)
 {
-    for (size_t row = 0; row < column->size(); ++row)
-    {
-        if (column->isNullAt(row))
-            continue;
+    size_t rows = column->size();
 
-        auto data = column->getFloat64(row);
-        t_digest.add(data, 1);
+    for (size_t row = 0; row < rows; ++row)
+    {
+        /// TODO: support more types.
+        Float64 value = column->getFloat64(row);
+        t_digest.add(value, 1);
     }
 }
 
@@ -37,33 +35,26 @@ void StatisticsTDigest::deserialize(ReadBuffer & buf)
     t_digest.deserialize(buf);
 }
 
-Float64 StatisticsTDigest::estimateLess(const Field & val) const
+Float64 StatisticsTDigest::estimateLess(Float64 val) const
 {
-    auto val_as_float = StatisticsUtils::tryConvertToFloat64(val, data_type);
-    if (!val_as_float.has_value())
-        return 0;
-    return t_digest.getCountLessThan(*val_as_float);
+    return t_digest.getCountLessThan(val);
 }
 
-Float64 StatisticsTDigest::estimateEqual(const Field & val) const
+Float64 StatisticsTDigest::estimateEqual(Float64 val) const
 {
-    auto val_as_float = StatisticsUtils::tryConvertToFloat64(val, data_type);
-    if (!val_as_float.has_value())
-        return 0;
-    return t_digest.getCountEqual(*val_as_float);
+    return t_digest.getCountEqual(val);
 }
 
-void tdigestStatisticsValidator(const SingleStatisticsDescription & /*description*/, const DataTypePtr & data_type)
+void TDigestValidator(const SingleStatisticsDescription &, DataTypePtr data_type)
 {
-    DataTypePtr inner_data_type = removeNullable(data_type);
-    inner_data_type = removeLowCardinalityAndNullable(inner_data_type);
-    if (!inner_data_type->isValueRepresentedByNumber())
+    data_type = removeNullable(data_type);
+    if (!data_type->isValueRepresentedByNumber())
         throw Exception(ErrorCodes::ILLEGAL_STATISTICS, "Statistics of type 'tdigest' do not support type {}", data_type->getName());
 }
 
-StatisticsPtr tdigestStatisticsCreator(const SingleStatisticsDescription & description, const DataTypePtr & data_type)
+StatisticsPtr TDigestCreator(const SingleStatisticsDescription & stat, DataTypePtr)
 {
-    return std::make_shared<StatisticsTDigest>(description, data_type);
+    return std::make_shared<StatisticsTDigest>(stat);
 }
 
 }
diff --git a/src/Storages/Statistics/StatisticsTDigest.h b/src/Storages/Statistics/StatisticsTDigest.h
index 5e744fee2ce..d3a3bf115ee 100644
--- a/src/Storages/Statistics/StatisticsTDigest.h
+++ b/src/Storages/Statistics/StatisticsTDigest.h
@@ -9,22 +9,21 @@ namespace DB
 class StatisticsTDigest : public IStatistics
 {
 public:
-    explicit StatisticsTDigest(const SingleStatisticsDescription & description, const DataTypePtr & data_type_);
+    explicit StatisticsTDigest(const SingleStatisticsDescription & stat_);
 
     void update(const ColumnPtr & column) override;
 
     void serialize(WriteBuffer & buf) override;
     void deserialize(ReadBuffer & buf) override;
 
-    Float64 estimateLess(const Field & val) const override;
-    Float64 estimateEqual(const Field & val) const override;
+    Float64 estimateLess(Float64 val) const override;
+    Float64 estimateEqual(Float64 val) const override;
 
 private:
     QuantileTDigest<Float64> t_digest;
-    DataTypePtr data_type;
 };
 
-void tdigestStatisticsValidator(const SingleStatisticsDescription & description, const DataTypePtr & data_type);
-StatisticsPtr tdigestStatisticsCreator(const SingleStatisticsDescription & description, const DataTypePtr & data_type);
+void TDigestValidator(const SingleStatisticsDescription &, DataTypePtr data_type);
+StatisticsPtr TDigestCreator(const SingleStatisticsDescription & stat, DataTypePtr);
 
 }
diff --git a/src/Storages/Statistics/StatisticsUniq.cpp b/src/Storages/Statistics/StatisticsUniq.cpp
index 5e5b7a67b04..bf9a40ea8cb 100644
--- a/src/Storages/Statistics/StatisticsUniq.cpp
+++ b/src/Storages/Statistics/StatisticsUniq.cpp
@@ -1,7 +1,6 @@
 #include <Storages/Statistics/StatisticsUniq.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeLowCardinality.h>
 
 namespace DB
 {
@@ -11,8 +10,8 @@ namespace ErrorCodes
     extern const int ILLEGAL_STATISTICS;
 }
 
-StatisticsUniq::StatisticsUniq(const SingleStatisticsDescription & description, const DataTypePtr & data_type)
-    : IStatistics(description)
+StatisticsUniq::StatisticsUniq(const SingleStatisticsDescription & stat_, const DataTypePtr & data_type)
+    : IStatistics(stat_)
 {
     arena = std::make_unique<Arena>();
     AggregateFunctionProperties properties;
@@ -52,17 +51,16 @@ UInt64 StatisticsUniq::estimateCardinality() const
     return column->getUInt(0);
 }
 
-void uniqStatisticsValidator(const SingleStatisticsDescription & /*description*/, const DataTypePtr & data_type)
+void UniqValidator(const SingleStatisticsDescription &, DataTypePtr data_type)
 {
-    DataTypePtr inner_data_type = removeNullable(data_type);
-    inner_data_type = removeLowCardinalityAndNullable(inner_data_type);
-    if (!inner_data_type->isValueRepresentedByNumber() && !isStringOrFixedString(inner_data_type))
+    data_type = removeNullable(data_type);
+    if (!data_type->isValueRepresentedByNumber())
         throw Exception(ErrorCodes::ILLEGAL_STATISTICS, "Statistics of type 'uniq' do not support type {}", data_type->getName());
 }
 
-StatisticsPtr uniqStatisticsCreator(const SingleStatisticsDescription & description, const DataTypePtr & data_type)
+StatisticsPtr UniqCreator(const SingleStatisticsDescription & stat, DataTypePtr data_type)
 {
-    return std::make_shared<StatisticsUniq>(description, data_type);
+    return std::make_shared<StatisticsUniq>(stat, data_type);
 }
 
 }
diff --git a/src/Storages/Statistics/StatisticsUniq.h b/src/Storages/Statistics/StatisticsUniq.h
index 1fdcab8bd89..5290585bd94 100644
--- a/src/Storages/Statistics/StatisticsUniq.h
+++ b/src/Storages/Statistics/StatisticsUniq.h
@@ -10,7 +10,7 @@ namespace DB
 class StatisticsUniq : public IStatistics
 {
 public:
-    StatisticsUniq(const SingleStatisticsDescription & description, const DataTypePtr & data_type);
+    StatisticsUniq(const SingleStatisticsDescription & stat_, const DataTypePtr & data_type);
     ~StatisticsUniq() override;
 
     void update(const ColumnPtr & column) override;
@@ -27,7 +27,7 @@ private:
 
 };
 
-void uniqStatisticsValidator(const SingleStatisticsDescription & description, const DataTypePtr & data_type);
-StatisticsPtr uniqStatisticsCreator(const SingleStatisticsDescription & description, const DataTypePtr & data_type);
+void UniqValidator(const SingleStatisticsDescription &, DataTypePtr data_type);
+StatisticsPtr UniqCreator(const SingleStatisticsDescription & stat, DataTypePtr data_type);
 
 }
diff --git a/src/Storages/Statistics/tests/gtest_stats.cpp b/src/Storages/Statistics/tests/gtest_stats.cpp
index e55c52c49f3..c3c14632ba1 100644
--- a/src/Storages/Statistics/tests/gtest_stats.cpp
+++ b/src/Storages/Statistics/tests/gtest_stats.cpp
@@ -1,10 +1,6 @@
 #include <gtest/gtest.h>
 
 #include <Storages/Statistics/StatisticsTDigest.h>
-#include <Interpreters/convertFieldToType.h>
-#include <DataTypes/DataTypeFactory.h>
-
-using namespace DB;
 
 TEST(Statistics, TDigestLessThan)
 {
@@ -43,4 +39,6 @@ TEST(Statistics, TDigestLessThan)
 
     std::reverse(data.begin(), data.end());
     test_less_than(data, {-1, 1e9, 50000.0, 3000.0, 30.0}, {0, 100000, 50000, 3000, 30}, {0, 0, 0.001, 0.001, 0.001});
+
+
 }
diff --git a/src/Storages/StatisticsDescription.cpp b/src/Storages/StatisticsDescription.cpp
index ac7fa8898de..f10fb78f933 100644
--- a/src/Storages/StatisticsDescription.cpp
+++ b/src/Storages/StatisticsDescription.cpp
@@ -1,13 +1,19 @@
 #include <Storages/StatisticsDescription.h>
 
+#include <base/defines.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTStatisticsDeclaration.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/parseQuery.h>
 #include <Parsers/queryToString.h>
 #include <Parsers/ParserCreateQuery.h>
+#include <Poco/Logger.h>
+#include <Storages/extractKeyExpressionList.h>
 #include <Storages/ColumnsDescription.h>
 
+#include <Common/logger_useful.h>
 
 namespace DB
 {
@@ -48,11 +54,7 @@ static StatisticsType stringToStatisticsType(String type)
         return StatisticsType::TDigest;
     if (type == "uniq")
         return StatisticsType::Uniq;
-    if (type == "countmin")
-        return StatisticsType::CountMinSketch;
-    if (type == "minmax")
-        return StatisticsType::MinMax;
-    throw Exception(ErrorCodes::INCORRECT_QUERY, "Unknown statistics type: {}. Supported statistics types are 'countmin', 'minmax', 'tdigest' and 'uniq'.", type);
+    throw Exception(ErrorCodes::INCORRECT_QUERY, "Unknown statistics type: {}. Supported statistics types are `tdigest` and `uniq`.", type);
 }
 
 String SingleStatisticsDescription::getTypeName() const
@@ -63,12 +65,8 @@ String SingleStatisticsDescription::getTypeName() const
             return "TDigest";
         case StatisticsType::Uniq:
             return "Uniq";
-        case StatisticsType::CountMinSketch:
-            return "countmin";
-        case StatisticsType::MinMax:
-            return "minmax";
         default:
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown statistics type: {}. Supported statistics types are 'countmin', 'minmax', 'tdigest' and 'uniq'.", type);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown statistics type: {}. Supported statistics types are `tdigest` and `uniq`.", type);
     }
 }
 
@@ -100,13 +98,17 @@ void ColumnStatisticsDescription::merge(const ColumnStatisticsDescription & othe
 {
     chassert(merging_column_type);
 
-    data_type = merging_column_type;
+    if (column_name.empty())
+    {
+        column_name = merging_column_name;
+        data_type = merging_column_type;
+    }
 
     for (const auto & [stats_type, stats_desc]: other.types_to_desc)
     {
         if (!if_not_exists && types_to_desc.contains(stats_type))
         {
-            throw Exception(ErrorCodes::ILLEGAL_STATISTICS, "Statistics type name {} has existed in column {}", stats_type, merging_column_name);
+            throw Exception(ErrorCodes::ILLEGAL_STATISTICS, "Statistics type name {} has existed in column {}", stats_type, column_name);
         }
         else if (!types_to_desc.contains(stats_type))
             types_to_desc.emplace(stats_type, stats_desc);
@@ -115,8 +117,10 @@ void ColumnStatisticsDescription::merge(const ColumnStatisticsDescription & othe
 
 void ColumnStatisticsDescription::assign(const ColumnStatisticsDescription & other)
 {
+    if (other.column_name != column_name)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot assign statistics from column {} to {}", column_name, other.column_name);
+
     types_to_desc = other.types_to_desc;
-    data_type = other.data_type;
 }
 
 void ColumnStatisticsDescription::clear()
@@ -124,7 +128,7 @@ void ColumnStatisticsDescription::clear()
     types_to_desc.clear();
 }
 
-std::vector<std::pair<String, ColumnStatisticsDescription>> ColumnStatisticsDescription::fromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns)
+std::vector<ColumnStatisticsDescription> ColumnStatisticsDescription::fromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns)
 {
     const auto * stat_definition_ast = definition_ast->as<ASTStatisticsDeclaration>();
     if (!stat_definition_ast)
@@ -142,7 +146,7 @@ std::vector<std::pair<String, ColumnStatisticsDescription>> ColumnStatisticsDesc
         statistics_types.emplace(stat.type, stat);
     }
 
-    std::vector<std::pair<String, ColumnStatisticsDescription>> result;
+    std::vector<ColumnStatisticsDescription> result;
     result.reserve(stat_definition_ast->columns->children.size());
 
     for (const auto & column_ast : stat_definition_ast->columns->children)
@@ -154,9 +158,9 @@ std::vector<std::pair<String, ColumnStatisticsDescription>> ColumnStatisticsDesc
             throw Exception(ErrorCodes::INCORRECT_QUERY, "Incorrect column name {}", physical_column_name);
 
         const auto & column = columns.getPhysical(physical_column_name);
-        stats.data_type = column.type;
+        stats.column_name = column.name;
         stats.types_to_desc = statistics_types;
-        result.emplace_back(physical_column_name, stats);
+        result.push_back(stats);
     }
 
     if (result.empty())
@@ -171,13 +175,14 @@ ColumnStatisticsDescription ColumnStatisticsDescription::fromColumnDeclaration(c
     if (stat_type_list_ast->children.empty())
         throw Exception(ErrorCodes::INCORRECT_QUERY, "We expect at least one statistics type for column {}", queryToString(column));
     ColumnStatisticsDescription stats;
+    stats.column_name = column.name;
     for (const auto & ast : stat_type_list_ast->children)
     {
         const auto & stat_type = ast->as<const ASTFunction &>().name;
 
         SingleStatisticsDescription stat(stringToStatisticsType(Poco::toLower(stat_type)), ast->clone());
         if (stats.types_to_desc.contains(stat.type))
-            throw Exception(ErrorCodes::INCORRECT_QUERY, "Column {} already contains statistics type {}", column.name, stat_type);
+            throw Exception(ErrorCodes::INCORRECT_QUERY, "Column {} already contains statistics type {}", stats.column_name, stat_type);
         stats.types_to_desc.emplace(stat.type, std::move(stat));
     }
     stats.data_type = data_type;
@@ -188,7 +193,6 @@ ASTPtr ColumnStatisticsDescription::getAST() const
 {
     auto function_node = std::make_shared<ASTFunction>();
     function_node->name = "STATISTICS";
-    function_node->kind = ASTFunction::Kind::STATISTICS;
     function_node->arguments = std::make_shared<ASTExpressionList>();
     for (const auto & [type, desc] : types_to_desc)
     {
diff --git a/src/Storages/StatisticsDescription.h b/src/Storages/StatisticsDescription.h
index 3780de3e967..4862fb79d45 100644
--- a/src/Storages/StatisticsDescription.h
+++ b/src/Storages/StatisticsDescription.h
@@ -13,8 +13,6 @@ enum class StatisticsType : UInt8
 {
     TDigest = 0,
     Uniq = 1,
-    CountMinSketch = 2,
-    MinMax = 3,
 
     Max = 63,
 };
@@ -56,12 +54,12 @@ struct ColumnStatisticsDescription
 
     ASTPtr getAST() const;
 
-    /// get a vector of <column name, statistics desc> pair
-    static std::vector<std::pair<String, ColumnStatisticsDescription>> fromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns);
+    static std::vector<ColumnStatisticsDescription> fromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns);
     static ColumnStatisticsDescription fromColumnDeclaration(const ASTColumnDeclaration & column, DataTypePtr data_type);
 
     using StatisticsTypeDescMap = std::map<StatisticsType, SingleStatisticsDescription>;
     StatisticsTypeDescMap types_to_desc;
+    String column_name;
     DataTypePtr data_type;
 };
 
diff --git a/src/Storages/StorageBuffer.cpp b/src/Storages/StorageBuffer.cpp
index f753d369d2d..1bcc602f168 100644
--- a/src/Storages/StorageBuffer.cpp
+++ b/src/Storages/StorageBuffer.cpp
@@ -1,7 +1,3 @@
-#include <Storages/StorageBuffer.h>
-
-#include <Analyzer/TableNode.h>
-#include <Analyzer/Utils.h>
 #include <Interpreters/InterpreterInsertQuery.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
@@ -27,6 +23,7 @@
 #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>
@@ -235,12 +232,6 @@ QueryProcessingStage::Enum StorageBuffer::getQueryProcessingStage(
     return QueryProcessingStage::FetchColumns;
 }
 
-bool StorageBuffer::isRemote() const
-{
-    auto destination = getDestinationTable();
-    return destination && destination->isRemote();
-}
-
 void StorageBuffer::read(
     QueryPlan & query_plan,
     const Names & column_names,
@@ -251,29 +242,6 @@ void StorageBuffer::read(
     size_t max_block_size,
     size_t num_streams)
 {
-    bool allow_experimental_analyzer = local_context->getSettingsRef().allow_experimental_analyzer;
-
-    if (allow_experimental_analyzer && processed_stage > QueryProcessingStage::FetchColumns)
-    {
-        /** For query processing stages after FetchColumns, we do not allow using the same table more than once in the query.
-          * For example: SELECT * FROM buffer t1 JOIN buffer t2 USING (column)
-          * In that case, we will execute this query separately for the destination table and for the buffer, resulting in incorrect results.
-          */
-        const auto & current_storage_id = getStorageID();
-        auto table_nodes = extractAllTableReferences(query_info.query_tree);
-        size_t count_of_current_storage = 0;
-        for (const auto & node : table_nodes)
-        {
-            const auto & table_node = node->as<TableNode &>();
-            if (table_node.getStorageID().getFullNameNotQuoted() == current_storage_id.getFullNameNotQuoted())
-            {
-                count_of_current_storage++;
-                if (count_of_current_storage > 1)
-                    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "StorageBuffer over Distributed does not support using the same table more than once in the query");
-            }
-        }
-    }
-
     const auto & metadata_snapshot = storage_snapshot->metadata;
 
     if (auto destination = getDestinationTable())
@@ -345,32 +313,29 @@ void StorageBuffer::read(
                     if (src_table_query_info.prewhere_info->row_level_filter)
                     {
                         src_table_query_info.prewhere_info->row_level_filter = ActionsDAG::merge(
-                            actions_dag.clone(),
+                            std::move(*actions_dag->clone()),
                             std::move(*src_table_query_info.prewhere_info->row_level_filter));
 
                         src_table_query_info.prewhere_info->row_level_filter->removeUnusedActions();
                     }
 
+                    if (src_table_query_info.prewhere_info->prewhere_actions)
                     {
                         src_table_query_info.prewhere_info->prewhere_actions = ActionsDAG::merge(
-                            actions_dag.clone(),
-                            std::move(src_table_query_info.prewhere_info->prewhere_actions));
+                            std::move(*actions_dag->clone()),
+                            std::move(*src_table_query_info.prewhere_info->prewhere_actions));
 
-                        src_table_query_info.prewhere_info->prewhere_actions.removeUnusedActions();
+                        src_table_query_info.prewhere_info->prewhere_actions->removeUnusedActions();
                     }
                 }
 
-                src_table_query_info.merge_storage_snapshot = storage_snapshot;
                 destination->read(
                         query_plan, columns_intersection, destination_snapshot, src_table_query_info,
                         local_context, processed_stage, max_block_size, num_streams);
 
-                if (query_plan.isInitialized() && processed_stage <= QueryProcessingStage::FetchColumns)
+                if (query_plan.isInitialized())
                 {
-                    /** The code below converts columns from metadata_snapshot to columns from destination_metadata_snapshot.
-                      * This conversion is not applicable for processed_stage > FetchColumns.
-                      * Instead, we rely on the converting actions at the end of this function.
-                      */
+
                     auto actions = addMissingDefaults(
                             query_plan.getCurrentDataStream().header,
                             header_after_adding_defaults.getNamesAndTypesList(),
@@ -389,7 +354,7 @@ void StorageBuffer::read(
                             header.getColumnsWithTypeAndName(),
                             ActionsDAG::MatchColumnsMode::Name);
 
-                    auto converting = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), std::move(actions_dag));
+                    auto converting = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), actions_dag);
 
                     converting->setStepDescription("Convert destination table columns to Buffer table structure");
                     query_plan.addStep(std::move(converting));
@@ -433,7 +398,7 @@ void StorageBuffer::read(
     /// TODO: Find a way to support projections for StorageBuffer
     if (processed_stage > QueryProcessingStage::FetchColumns)
     {
-        if (allow_experimental_analyzer)
+        if (local_context->getSettingsRef().allow_experimental_analyzer)
         {
             auto storage = std::make_shared<StorageValues>(
                     getStorageID(),
@@ -464,23 +429,21 @@ void StorageBuffer::read(
 
             if (query_info.prewhere_info->row_level_filter)
             {
-                auto actions = std::make_shared<ExpressionActions>(query_info.prewhere_info->row_level_filter->clone(), actions_settings);
                 pipe_from_buffers.addSimpleTransform([&](const Block & header)
                 {
                     return std::make_shared<FilterTransform>(
                             header,
-                            actions,
+                            std::make_shared<ExpressionActions>(query_info.prewhere_info->row_level_filter, actions_settings),
                             query_info.prewhere_info->row_level_column_name,
                             false);
                 });
             }
 
-            auto actions = std::make_shared<ExpressionActions>(query_info.prewhere_info->prewhere_actions.clone(), actions_settings);
             pipe_from_buffers.addSimpleTransform([&](const Block & header)
             {
                 return std::make_shared<FilterTransform>(
                         header,
-                        actions,
+                        std::make_shared<ExpressionActions>(query_info.prewhere_info->prewhere_actions, actions_settings),
                         query_info.prewhere_info->prewhere_column_name,
                         query_info.prewhere_info->remove_prewhere_column);
             });
@@ -510,7 +473,7 @@ void StorageBuffer::read(
                 result_header.getColumnsWithTypeAndName(),
                 ActionsDAG::MatchColumnsMode::Name);
 
-        auto converting = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), std::move(convert_actions_dag));
+        auto converting = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), convert_actions_dag);
         query_plan.addStep(std::move(converting));
     }
 
diff --git a/src/Storages/StorageBuffer.h b/src/Storages/StorageBuffer.h
index 02376f286b1..cd6dd7b933f 100644
--- a/src/Storages/StorageBuffer.h
+++ b/src/Storages/StorageBuffer.h
@@ -84,7 +84,6 @@ public:
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         size_t num_streams) override;
-    bool isRemote() const override;
 
     bool supportsParallelInsert() const override { return true; }
 
diff --git a/src/Storages/StorageDistributed.cpp b/src/Storages/StorageDistributed.cpp
index 0b80858800b..3d115d3f551 100644
--- a/src/Storages/StorageDistributed.cpp
+++ b/src/Storages/StorageDistributed.cpp
@@ -43,6 +43,7 @@
 #include <Parsers/parseQuery.h>
 #include <Parsers/IAST.h>
 
+#include <Analyzer/Utils.h>
 #include <Analyzer/ColumnNode.h>
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/TableNode.h>
@@ -60,20 +61,26 @@
 #include <Interpreters/ClusterProxy/SelectStreamFactory.h>
 #include <Interpreters/ClusterProxy/executeQuery.h>
 #include <Interpreters/Cluster.h>
+#include <Interpreters/DatabaseAndTableWithAlias.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 #include <Interpreters/InterpreterInsertQuery.h>
 #include <Interpreters/JoinedTables.h>
+#include <Interpreters/TranslateQualifiedNamesVisitor.h>
 #include <Interpreters/AddDefaultDatabaseVisitor.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/createBlockSelector.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/getClusterName.h>
+#include <Interpreters/getTableExpressions.h>
 #include <Interpreters/RequiredSourceColumnsVisitor.h>
+#include <Interpreters/getCustomKeyFilterForParallelReplicas.h>
 #include <Interpreters/getHeaderForProcessingStage.h>
 
+#include <Functions/IFunction.h>
+#include <Functions/FunctionFactory.h>
 #include <TableFunctions/TableFunctionView.h>
 #include <TableFunctions/TableFunctionFactory.h>
 
@@ -83,6 +90,7 @@
 #include <Processors/Executors/PushingPipelineExecutor.h>
 #include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
@@ -312,8 +320,7 @@ StorageDistributed::StorageDistributed(
     const DistributedSettings & distributed_settings_,
     LoadingStrictnessLevel mode,
     ClusterPtr owned_cluster_,
-    ASTPtr remote_table_function_ptr_,
-    bool is_remote_function_)
+    ASTPtr remote_table_function_ptr_)
     : IStorage(id_)
     , WithContext(context_->getGlobalContext())
     , remote_database(remote_database_)
@@ -327,7 +334,6 @@ StorageDistributed::StorageDistributed(
     , relative_data_path(relative_data_path_)
     , distributed_settings(distributed_settings_)
     , rng(randomSeed())
-    , is_remote_function(is_remote_function_)
 {
     if (!distributed_settings.flush_on_detach && distributed_settings.background_insert_batch)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Settings flush_on_detach=0 and background_insert_batch=1 are incompatible");
@@ -379,6 +385,38 @@ StorageDistributed::StorageDistributed(
 }
 
 
+StorageDistributed::StorageDistributed(
+    const StorageID & id_,
+    const ColumnsDescription & columns_,
+    const ConstraintsDescription & constraints_,
+    ASTPtr remote_table_function_ptr_,
+    const String & cluster_name_,
+    ContextPtr context_,
+    const ASTPtr & sharding_key_,
+    const String & storage_policy_name_,
+    const String & relative_data_path_,
+    const DistributedSettings & distributed_settings_,
+    LoadingStrictnessLevel mode,
+    ClusterPtr owned_cluster_)
+    : StorageDistributed(
+        id_,
+        columns_,
+        constraints_,
+        String{},
+        String{},
+        String{},
+        cluster_name_,
+        context_,
+        sharding_key_,
+        storage_policy_name_,
+        relative_data_path_,
+        distributed_settings_,
+        mode,
+        std::move(owned_cluster_),
+        remote_table_function_ptr_)
+{
+}
+
 QueryProcessingStage::Enum StorageDistributed::getQueryProcessingStage(
     ContextPtr local_context,
     QueryProcessingStage::Enum to_stage,
@@ -462,7 +500,7 @@ QueryProcessingStage::Enum StorageDistributed::getQueryProcessingStage(
     }
 
     std::optional<QueryProcessingStage::Enum> optimized_stage;
-    if (query_info.query_tree)
+    if (settings.allow_experimental_analyzer)
         optimized_stage = getOptimizedQueryProcessingStageAnalyzer(query_info, settings);
     else
         optimized_stage = getOptimizedQueryProcessingStage(query_info, settings);
@@ -826,28 +864,31 @@ void StorageDistributed::read(
         modified_query_info.query = queryNodeToDistributedSelectQuery(query_tree_distributed);
 
         modified_query_info.query_tree = std::move(query_tree_distributed);
-
-        /// Return directly (with correct header) if no shard to query.
-        if (modified_query_info.getCluster()->getShardsInfo().empty())
-            return;
     }
     else
     {
         header = InterpreterSelectQuery(modified_query_info.query, local_context, SelectQueryOptions(processed_stage).analyze()).getSampleBlock();
+    }
 
+    if (!settings.allow_experimental_analyzer)
+    {
         modified_query_info.query = ClusterProxy::rewriteSelectQuery(
             local_context, modified_query_info.query,
             remote_database, remote_table, remote_table_function_ptr);
+    }
 
-        if (modified_query_info.getCluster()->getShardsInfo().empty())
-        {
-            Pipe pipe(std::make_shared<NullSource>(header));
-            auto read_from_pipe = std::make_unique<ReadFromPreparedSource>(std::move(pipe));
-            read_from_pipe->setStepDescription("Read from NullSource (Distributed)");
-            query_plan.addStep(std::move(read_from_pipe));
-
+    /// Return directly (with correct header) if no shard to query.
+    if (modified_query_info.getCluster()->getShardsInfo().empty())
+    {
+        if (settings.allow_experimental_analyzer)
             return;
-        }
+
+        Pipe pipe(std::make_shared<NullSource>(header));
+        auto read_from_pipe = std::make_unique<ReadFromPreparedSource>(std::move(pipe));
+        read_from_pipe->setStepDescription("Read from NullSource (Distributed)");
+        query_plan.addStep(std::move(read_from_pipe));
+
+        return;
     }
 
     const auto & snapshot_data = assert_cast<const SnapshotData &>(*storage_snapshot->data);
@@ -875,7 +916,7 @@ void StorageDistributed::read(
         sharding_key_column_name,
         distributed_settings,
         shard_filter_generator,
-        is_remote_function);
+        /* is_remote_function= */ static_cast<bool>(owned_cluster));
 
     /// This is a bug, it is possible only when there is no shards to query, and this is handled earlier.
     if (!query_plan.isInitialized())
@@ -1026,7 +1067,7 @@ std::optional<QueryPipeline> StorageDistributed::distributedWriteBetweenDistribu
     return pipeline;
 }
 
-static std::optional<ActionsDAG> getFilterFromQuery(const ASTPtr & ast, ContextPtr context)
+static ActionsDAGPtr getFilterFromQuery(const ASTPtr & ast, ContextPtr context)
 {
     QueryPlan plan;
     SelectQueryOptions options;
@@ -1070,9 +1111,9 @@ static std::optional<ActionsDAG> getFilterFromQuery(const ASTPtr & ast, ContextP
     }
 
     if (!source)
-        return {};
+        return nullptr;
 
-    return source->detachFilterActionsDAG();
+    return source->getFilterActionsDAG();
 }
 
 
diff --git a/src/Storages/StorageDistributed.h b/src/Storages/StorageDistributed.h
index 8a5585e9fd0..85a8de86953 100644
--- a/src/Storages/StorageDistributed.h
+++ b/src/Storages/StorageDistributed.h
@@ -61,8 +61,21 @@ public:
         const DistributedSettings & distributed_settings_,
         LoadingStrictnessLevel mode,
         ClusterPtr owned_cluster_ = {},
-        ASTPtr remote_table_function_ptr_ = {},
-        bool is_remote_function_ = false);
+        ASTPtr remote_table_function_ptr_ = {});
+
+    StorageDistributed(
+        const StorageID & id_,
+        const ColumnsDescription & columns_,
+        const ConstraintsDescription & constraints_,
+        ASTPtr remote_table_function_ptr_,
+        const String & cluster_name_,
+        ContextPtr context_,
+        const ASTPtr & sharding_key_,
+        const String & storage_policy_name_,
+        const String & relative_data_path_,
+        const DistributedSettings & distributed_settings_,
+        LoadingStrictnessLevel mode,
+        ClusterPtr owned_cluster_ = {});
 
     ~StorageDistributed() override;
 
@@ -274,8 +287,6 @@ private:
     // For random shard index generation
     mutable std::mutex rng_mutex;
     pcg64 rng;
-
-    bool is_remote_function;
 };
 
 }
diff --git a/src/Storages/StorageExecutable.cpp b/src/Storages/StorageExecutable.cpp
index 0094723e3fd..381c20c616d 100644
--- a/src/Storages/StorageExecutable.cpp
+++ b/src/Storages/StorageExecutable.cpp
@@ -77,8 +77,7 @@ StorageExecutable::StorageExecutable(
     const ExecutableSettings & settings_,
     const std::vector<ASTPtr> & input_queries_,
     const ColumnsDescription & columns,
-    const ConstraintsDescription & constraints,
-    const String & comment)
+    const ConstraintsDescription & constraints)
     : IStorage(table_id_)
     , settings(settings_)
     , input_queries(input_queries_)
@@ -87,7 +86,6 @@ StorageExecutable::StorageExecutable(
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns);
     storage_metadata.setConstraints(constraints);
-    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 
     ShellCommandSourceCoordinator::Configuration configuration
@@ -239,7 +237,7 @@ void registerStorageExecutable(StorageFactory & factory)
             settings.loadFromQuery(*args.storage_def);
 
         auto global_context = args.getContext()->getGlobalContext();
-        return std::make_shared<StorageExecutable>(args.table_id, format, settings, input_queries, columns, constraints, args.comment);
+        return std::make_shared<StorageExecutable>(args.table_id, format, settings, input_queries, columns, constraints);
     };
 
     StorageFactory::StorageFeatures storage_features;
@@ -257,3 +255,4 @@ void registerStorageExecutable(StorageFactory & factory)
 }
 
 }
+
diff --git a/src/Storages/StorageExecutable.h b/src/Storages/StorageExecutable.h
index 6748bb3223e..2be2a84ab49 100644
--- a/src/Storages/StorageExecutable.h
+++ b/src/Storages/StorageExecutable.h
@@ -22,8 +22,7 @@ public:
         const ExecutableSettings & settings,
         const std::vector<ASTPtr> & input_queries,
         const ColumnsDescription & columns,
-        const ConstraintsDescription & constraints,
-        const String & comment);
+        const ConstraintsDescription & constraints);
 
     String getName() const override
     {
diff --git a/src/Storages/StorageExternalDistributed.cpp b/src/Storages/StorageExternalDistributed.cpp
index 9fc8b588c89..951c87807bb 100644
--- a/src/Storages/StorageExternalDistributed.cpp
+++ b/src/Storages/StorageExternalDistributed.cpp
@@ -1,4 +1,4 @@
-#include <Storages/StorageExternalDistributed.h>
+#include "StorageExternalDistributed.h"
 
 #include <Core/Settings.h>
 #include <Storages/StorageFactory.h>
@@ -6,8 +6,6 @@
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Core/PostgreSQL/PoolWithFailover.h>
 #include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Common/parseAddress.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Common/parseRemoteDescription.h>
@@ -114,39 +112,14 @@ void registerStorageExternalDistributed(StorageFactory & factory)
         std::unordered_set<StoragePtr> shards;
         ASTs inner_engine_args(engine_args.begin() + 1, engine_args.end());
 
-        ASTPtr * address_arg = nullptr;
-
-        /// If there is a named collection argument, named `addresses_expr`
-        for (auto & node : inner_engine_args)
-        {
-            if (ASTFunction * func = node->as<ASTFunction>(); func && func->name == "equals" && func->arguments)
-            {
-                if (ASTExpressionList * func_args = func->arguments->as<ASTExpressionList>(); func_args && func_args->children.size() == 2)
-                {
-                    if (ASTIdentifier * arg_name = func_args->children[0]->as<ASTIdentifier>(); arg_name && arg_name->name() == "addresses_expr")
-                    {
-                        address_arg = &func_args->children[1];
-                        break;
-                    }
-                }
-            }
-        }
-
-        /// Otherwise it is the first argument.
-        if (!address_arg)
-            address_arg = &inner_engine_args.at(0);
-
-        String addresses_expr = checkAndGetLiteralArgument<String>(*address_arg, "addresses");
-        Strings shards_addresses = get_addresses(addresses_expr);
-
         auto engine_name = checkAndGetLiteralArgument<String>(engine_args[0], "engine_name");
         if (engine_name == "URL")
         {
+            auto configuration = StorageURL::getConfiguration(inner_engine_args, context);
+            auto shards_addresses = get_addresses(configuration.addresses_expr);
             auto format_settings = StorageURL::getFormatSettingsFromArgs(args);
             for (const auto & shard_address : shards_addresses)
             {
-                *address_arg = std::make_shared<ASTLiteral>(shard_address);
-                auto configuration = StorageURL::getConfiguration(inner_engine_args, context);
                 auto uri_options = parseRemoteDescription(shard_address, 0, shard_address.size(), '|', max_addresses);
                 if (uri_options.size() > 1)
                 {
@@ -167,12 +140,13 @@ void registerStorageExternalDistributed(StorageFactory & factory)
         else if (engine_name == "MySQL")
         {
             MySQLSettings mysql_settings;
+            auto configuration = StorageMySQL::getConfiguration(inner_engine_args, context, mysql_settings);
+            auto shards_addresses = get_addresses(configuration.addresses_expr);
             for (const auto & shard_address : shards_addresses)
             {
-                *address_arg = std::make_shared<ASTLiteral>(shard_address);
-                auto configuration = StorageMySQL::getConfiguration(inner_engine_args, context, mysql_settings);
-                configuration.addresses = parseRemoteDescriptionForExternalDatabase(shard_address, max_addresses, 3306);
-                auto pool = createMySQLPoolWithFailover(configuration, mysql_settings);
+                auto current_configuration{configuration};
+                current_configuration.addresses = parseRemoteDescriptionForExternalDatabase(shard_address, max_addresses, 3306);
+                auto pool = createMySQLPoolWithFailover(current_configuration, mysql_settings);
                 shards.insert(std::make_shared<StorageMySQL>(
                     args.table_id, std::move(pool), configuration.database, configuration.table,
                     /* replace_query = */ false, /* on_duplicate_clause = */ "",
@@ -183,13 +157,14 @@ void registerStorageExternalDistributed(StorageFactory & factory)
 #if USE_LIBPQXX
         else if (engine_name == "PostgreSQL")
         {
+            auto configuration = StoragePostgreSQL::getConfiguration(inner_engine_args, context);
+            auto shards_addresses = get_addresses(configuration.addresses_expr);
             for (const auto & shard_address : shards_addresses)
             {
-                *address_arg = std::make_shared<ASTLiteral>(shard_address);
-                auto configuration = StoragePostgreSQL::getConfiguration(inner_engine_args, context);
-                configuration.addresses = parseRemoteDescriptionForExternalDatabase(shard_address, max_addresses, 5432);
+                auto current_configuration{configuration};
+                current_configuration.addresses = parseRemoteDescriptionForExternalDatabase(shard_address, max_addresses, 5432);
                 auto pool = std::make_shared<postgres::PoolWithFailover>(
-                    configuration,
+                    current_configuration,
                     settings.postgresql_connection_pool_size,
                     settings.postgresql_connection_pool_wait_timeout,
                     settings.postgresql_connection_pool_retries,
diff --git a/src/Storages/StorageExternalDistributed.h b/src/Storages/StorageExternalDistributed.h
index 56c7fe86f34..c4d37c3e5cc 100644
--- a/src/Storages/StorageExternalDistributed.h
+++ b/src/Storages/StorageExternalDistributed.h
@@ -8,6 +8,8 @@
 namespace DB
 {
 
+struct ExternalDataSourceConfiguration;
+
 /// Storages MySQL and PostgreSQL use ConnectionPoolWithFailover and support multiple replicas.
 /// This class unites multiple storages with replicas into multiple shards with replicas.
 /// A query to external database is passed to one replica on each shard, the result is united.
diff --git a/src/Storages/StorageFactory.cpp b/src/Storages/StorageFactory.cpp
index b95ccedb093..060b271d8f4 100644
--- a/src/Storages/StorageFactory.cpp
+++ b/src/Storages/StorageFactory.cpp
@@ -203,7 +203,7 @@ StoragePtr StorageFactory::get(
     }
 
     if (query.comment)
-        comment = query.comment->as<ASTLiteral &>().value.safeGet<String>();
+        comment = query.comment->as<ASTLiteral &>().value.get<String>();
 
     ASTs empty_engine_args;
     Arguments arguments{
diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp
index 036a01914cf..0ccc2e1baf4 100644
--- a/src/Storages/StorageFile.cpp
+++ b/src/Storages/StorageFile.cpp
@@ -53,8 +53,6 @@
 #include <Common/logger_useful.h>
 #include <Common/ProfileEvents.h>
 #include <Common/re2.h>
-#include <Formats/SchemaInferenceUtils.h>
-#include "base/defines.h"
 
 #include <Core/Settings.h>
 
@@ -126,7 +124,6 @@ void listFilesWithRegexpMatchingImpl(
             /// Otherwise it will not allow to work with symlinks in `user_files_path` directory.
             fs::canonical(path_for_ls + for_match);
             fs::path absolute_path = fs::absolute(path_for_ls + for_match);
-            absolute_path = absolute_path.lexically_normal(); /// ensure that the resulting path is normalized (e.g., removes any redundant slashes or . and .. segments)
             result.push_back(absolute_path.string());
         }
         catch (const std::exception &) // NOLINT
@@ -431,9 +428,7 @@ namespace
                 {
                     for (const auto & path : paths)
                     {
-                        auto format_from_path = FormatFactory::instance().tryGetFormatFromFileName(path);
-                        /// Use this format only if we have a schema reader for it.
-                        if (format_from_path && FormatFactory::instance().checkIfFormatHasAnySchemaReader(*format_from_path))
+                        if (auto format_from_path = FormatFactory::instance().tryGetFormatFromFileName(path))
                         {
                             format = format_from_path;
                             break;
@@ -518,7 +513,7 @@ namespace
             StorageFile::getSchemaCache(getContext()).addManyColumns(cache_keys, columns);
         }
 
-        String getLastFilePath() const override
+        String getLastFileName() const override
         {
             if (current_index != 0)
                 return paths[current_index - 1];
@@ -722,9 +717,7 @@ namespace
                     /// If format is unknown we can try to determine it by the file name.
                     if (!format)
                     {
-                        auto format_from_file = FormatFactory::instance().tryGetFormatFromFileName(*filename);
-                        /// Use this format only if we have a schema reader for it.
-                        if (format_from_file && FormatFactory::instance().checkIfFormatHasAnySchemaReader(*format_from_file))
+                        if (auto format_from_file = FormatFactory::instance().tryGetFormatFromFileName(*filename))
                             format = format_from_file;
                     }
 
@@ -795,7 +788,7 @@ namespace
             format = format_name;
         }
 
-        String getLastFilePath() const override
+        String getLastFileName() const override
         {
             return last_read_file_path;
         }
@@ -1113,9 +1106,8 @@ void StorageFile::setStorageMetadata(CommonArguments args)
 
     storage_metadata.setConstraints(args.constraints);
     storage_metadata.setComment(args.comment);
-
-    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.columns, args.getContext(), paths.empty() ? "" : paths[0], format_settings));
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 }
 
 
@@ -1139,16 +1131,12 @@ StorageFileSource::FilesIterator::FilesIterator(
     bool distributed_processing_)
     : WithContext(context_), files(files_), archive_info(std::move(archive_info_)), distributed_processing(distributed_processing_)
 {
-    std::optional<ActionsDAG> filter_dag;
+    ActionsDAGPtr filter_dag;
     if (!distributed_processing && !archive_info && !files.empty())
         filter_dag = VirtualColumnUtils::createPathAndFileFilterDAG(predicate, virtual_columns);
 
     if (filter_dag)
-    {
-        VirtualColumnUtils::buildSetsForDAG(*filter_dag, context_);
-        auto actions = std::make_shared<ExpressionActions>(std::move(*filter_dag));
-        VirtualColumnUtils::filterByPathOrFile(files, files, actions, virtual_columns);
-    }
+        VirtualColumnUtils::filterByPathOrFile(files, files, filter_dag, virtual_columns, context_);
 }
 
 String StorageFileSource::FilesIterator::next()
@@ -1257,7 +1245,7 @@ StorageFileSource::~StorageFileSource()
     beforeDestroy();
 }
 
-void StorageFileSource::setKeyCondition(const std::optional<ActionsDAG> & filter_actions_dag, ContextPtr context_)
+void StorageFileSource::setKeyCondition(const ActionsDAGPtr & filter_actions_dag, ContextPtr context_)
 {
     setKeyConditionImpl(filter_actions_dag, context_, block_for_format);
 }
@@ -1469,7 +1457,7 @@ Chunk StorageFileSource::generate()
                     .size = current_file_size,
                     .filename = (filename_override.has_value() ? &filename_override.value() : nullptr),
                     .last_modified = current_file_last_modified
-                }, getContext());
+                });
 
             return chunk;
         }
@@ -1771,12 +1759,6 @@ public:
         initialize();
     }
 
-    ~StorageFileSink() override
-    {
-        if (isCancelled())
-            cancelBuffers();
-    }
-
     void initialize()
     {
         std::unique_ptr<WriteBufferFromFileDescriptor> naked_buffer;
@@ -1810,14 +1792,37 @@ public:
 
     void consume(Chunk & chunk) override
     {
-        if (isCancelled())
+        std::lock_guard cancel_lock(cancel_mutex);
+        if (cancelled)
             return;
         writer->write(getHeader().cloneWithColumns(chunk.getColumns()));
     }
 
+    void onCancel() override
+    {
+        std::lock_guard cancel_lock(cancel_mutex);
+        cancelBuffers();
+        releaseBuffers();
+        cancelled = true;
+    }
+
+    void onException(std::exception_ptr exception) override
+    {
+        std::lock_guard cancel_lock(cancel_mutex);
+        try
+        {
+            std::rethrow_exception(exception);
+        }
+        catch (...)
+        {
+            /// An exception context is needed to proper delete write buffers without finalization
+            releaseBuffers();
+        }
+    }
+
     void onFinish() override
     {
-        chassert(!isCancelled());
+        std::lock_guard cancel_lock(cancel_mutex);
         finalizeBuffers();
     }
 
@@ -1872,6 +1877,9 @@ private:
 
     int flags;
     std::unique_lock<std::shared_timed_mutex> lock;
+
+    std::mutex cancel_mutex;
+    bool cancelled = false;
 };
 
 class PartitionedStorageFileSink : public PartitionedSink
@@ -2188,12 +2196,12 @@ void registerStorageFile(StorageFactory & factory)
             {
                 auto type = literal->value.getType();
                 if (type == Field::Types::Int64)
-                    source_fd = static_cast<int>(literal->value.safeGet<Int64>());
+                    source_fd = static_cast<int>(literal->value.get<Int64>());
                 else if (type == Field::Types::UInt64)
-                    source_fd = static_cast<int>(literal->value.safeGet<UInt64>());
+                    source_fd = static_cast<int>(literal->value.get<UInt64>());
                 else if (type == Field::Types::String)
                     StorageFile::parseFileSource(
-                        literal->value.safeGet<String>(),
+                        literal->value.get<String>(),
                         source_path,
                         storage_args.path_to_archive,
                         factory_args.getLocalContext()->getSettingsRef().allow_archive_path_syntax);
diff --git a/src/Storages/StorageFile.h b/src/Storages/StorageFile.h
index bb969c1877c..1ec237c2579 100644
--- a/src/Storages/StorageFile.h
+++ b/src/Storages/StorageFile.h
@@ -266,7 +266,7 @@ private:
         return storage->getName();
     }
 
-    void setKeyCondition(const std::optional<ActionsDAG> & filter_actions_dag, ContextPtr context_) override;
+    void setKeyCondition(const ActionsDAGPtr & filter_actions_dag, ContextPtr context_) override;
 
     bool tryGetCountFromCache(const struct stat & file_stat);
 
diff --git a/src/Storages/StorageFileCluster.cpp b/src/Storages/StorageFileCluster.cpp
index c01738067c4..d43e242f70c 100644
--- a/src/Storages/StorageFileCluster.cpp
+++ b/src/Storages/StorageFileCluster.cpp
@@ -60,8 +60,8 @@ StorageFileCluster::StorageFileCluster(
     }
 
     storage_metadata.setConstraints(constraints_);
-    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.columns, context, paths.empty() ? "" : paths[0]));
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 }
 
 void StorageFileCluster::updateQueryToSendIfNeeded(DB::ASTPtr & query, const StorageSnapshotPtr & storage_snapshot, const DB::ContextPtr & context)
diff --git a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.cpp b/src/Storages/StorageFromMergeTreeDataPart.cpp
similarity index 98%
rename from src/Storages/MergeTree/StorageFromMergeTreeDataPart.cpp
rename to src/Storages/StorageFromMergeTreeDataPart.cpp
index 280783245a2..481d9e66901 100644
--- a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.cpp
+++ b/src/Storages/StorageFromMergeTreeDataPart.cpp
@@ -30,7 +30,7 @@ void StorageFromMergeTreeDataPart::read(
 {
     query_plan.addStep(MergeTreeDataSelectExecutor(storage).readFromParts(
         parts,
-        mutations_snapshot,
+        alter_conversions,
         column_names,
         storage_snapshot,
         query_info,
diff --git a/src/Storages/StorageFuzzJSON.cpp b/src/Storages/StorageFuzzJSON.cpp
index fc73f246d35..9950d41f1c2 100644
--- a/src/Storages/StorageFuzzJSON.cpp
+++ b/src/Storages/StorageFuzzJSON.cpp
@@ -419,7 +419,7 @@ void fuzzJSONObject(
         if (val.fixed->getType() == Field::Types::Which::String)
         {
             out << fuzzJSONStructure(config, rnd, "\"");
-            writeText(val.fixed->safeGet<String>(), out);
+            writeText(val.fixed->get<String>(), out);
             out << fuzzJSONStructure(config, rnd, "\"");
         }
         else
diff --git a/src/Storages/StorageFuzzQuery.cpp b/src/Storages/StorageFuzzQuery.cpp
deleted file mode 100644
index 6e8f425f8dc..00000000000
--- a/src/Storages/StorageFuzzQuery.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-#include <Storages/StorageFuzzQuery.h>
-
-#include <optional>
-#include <unordered_set>
-#include <Columns/ColumnString.h>
-#include <Interpreters/evaluateConstantExpression.h>
-#include <Storages/NamedCollectionsHelpers.h>
-#include <Storages/StorageFactory.h>
-#include <Storages/checkAndGetLiteralArgument.h>
-#include <Parsers/ParserQuery.h>
-#include <Parsers/parseQuery.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-}
-
-ColumnPtr FuzzQuerySource::createColumn()
-{
-    auto column = ColumnString::create();
-    ColumnString::Chars & data_to = column->getChars();
-    ColumnString::Offsets & offsets_to = column->getOffsets();
-
-    offsets_to.resize(block_size);
-    IColumn::Offset offset = 0;
-
-    auto fuzz_base = query;
-    size_t row_num = 0;
-
-    while (row_num < block_size)
-    {
-        ASTPtr new_query = fuzz_base->clone();
-
-        auto base_before_fuzz = fuzz_base->formatForErrorMessage();
-        fuzzer.fuzzMain(new_query);
-        auto fuzzed_text = new_query->formatForErrorMessage();
-
-        if (base_before_fuzz == fuzzed_text)
-            continue;
-
-        /// AST is too long, will start from the original query.
-        if (config.max_query_length > 500)
-        {
-            fuzz_base = query;
-            continue;
-        }
-
-        IColumn::Offset next_offset = offset + fuzzed_text.size() + 1;
-        data_to.resize(next_offset);
-
-        std::copy(fuzzed_text.begin(), fuzzed_text.end(), &data_to[offset]);
-
-        data_to[offset + fuzzed_text.size()] = 0;
-        offsets_to[row_num] = next_offset;
-
-        offset = next_offset;
-        fuzz_base = new_query;
-        ++row_num;
-    }
-
-    return column;
-}
-
-StorageFuzzQuery::StorageFuzzQuery(
-    const StorageID & table_id_, const ColumnsDescription & columns_, const String & comment_, const Configuration & config_)
-    : IStorage(table_id_), config(config_)
-{
-    StorageInMemoryMetadata storage_metadata;
-    storage_metadata.setColumns(columns_);
-    storage_metadata.setComment(comment_);
-    setInMemoryMetadata(storage_metadata);
-}
-
-Pipe StorageFuzzQuery::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)
-{
-    storage_snapshot->check(column_names);
-
-    Pipes pipes;
-    pipes.reserve(num_streams);
-
-    const ColumnsDescription & our_columns = storage_snapshot->metadata->getColumns();
-    Block block_header;
-    for (const auto & name : column_names)
-    {
-        const auto & name_type = our_columns.get(name);
-        MutableColumnPtr column = name_type.type->createColumn();
-        block_header.insert({std::move(column), name_type.type, name_type.name});
-    }
-
-    const char * begin = config.query.data();
-    const char * end = begin + config.query.size();
-
-    ParserQuery parser(end, false);
-    auto query = parseQuery(parser, begin, end, "", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
-
-    for (UInt64 i = 0; i < num_streams; ++i)
-        pipes.emplace_back(std::make_shared<FuzzQuerySource>(max_block_size, block_header, config, query));
-
-    return Pipe::unitePipes(std::move(pipes));
-}
-
-StorageFuzzQuery::Configuration StorageFuzzQuery::getConfiguration(ASTs & engine_args, ContextPtr local_context)
-{
-    StorageFuzzQuery::Configuration configuration{};
-
-    // Supported signatures:
-    //
-    // FuzzQuery(query)
-    // FuzzQuery(query, max_query_length)
-    // FuzzQuery(query, max_query_length, random_seed)
-    if (engine_args.empty() || engine_args.size() > 3)
-        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "FuzzQuery requires 1 to 3 arguments: query, max_query_length, random_seed");
-
-    for (auto & engine_arg : engine_args)
-        engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, local_context);
-
-    auto first_arg = checkAndGetLiteralArgument<String>(engine_args[0], "query");
-    configuration.query = std::move(first_arg);
-
-    if (engine_args.size() >= 2)
-    {
-        const auto & literal = engine_args[1]->as<const ASTLiteral &>();
-        if (!literal.value.isNull())
-            configuration.max_query_length = checkAndGetLiteralArgument<UInt64>(literal, "max_query_length");
-    }
-
-    if (engine_args.size() == 3)
-    {
-        const auto & literal = engine_args[2]->as<const ASTLiteral &>();
-        if (!literal.value.isNull())
-            configuration.random_seed = checkAndGetLiteralArgument<UInt64>(literal, "random_seed");
-    }
-
-    return configuration;
-}
-
-void registerStorageFuzzQuery(StorageFactory & factory)
-{
-    factory.registerStorage(
-        "FuzzQuery",
-        [](const StorageFactory::Arguments & args) -> std::shared_ptr<StorageFuzzQuery>
-        {
-            ASTs & engine_args = args.engine_args;
-
-            if (engine_args.empty())
-                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Storage FuzzQuery must have arguments.");
-
-            StorageFuzzQuery::Configuration configuration = StorageFuzzQuery::getConfiguration(engine_args, args.getLocalContext());
-
-            for (const auto& col : args.columns)
-                if (col.type->getTypeId() != TypeIndex::String)
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "'StorageFuzzQuery' supports only columns of String type, got {}.", col.type->getName());
-
-            return std::make_shared<StorageFuzzQuery>(args.table_id, args.columns, args.comment, configuration);
-        });
-}
-
-}
diff --git a/src/Storages/StorageFuzzQuery.h b/src/Storages/StorageFuzzQuery.h
deleted file mode 100644
index 125ef960e74..00000000000
--- a/src/Storages/StorageFuzzQuery.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#pragma once
-
-#include <Storages/IStorage.h>
-#include <Storages/StorageConfiguration.h>
-#include <Common/randomSeed.h>
-#include <Common/QueryFuzzer.h>
-
-#include "config.h"
-
-namespace DB
-{
-
-class NamedCollection;
-
-class StorageFuzzQuery final : public IStorage
-{
-public:
-    struct Configuration : public StatelessTableEngineConfiguration
-    {
-        String query;
-        UInt64 max_query_length = 500;
-        UInt64 random_seed = randomSeed();
-    };
-
-    StorageFuzzQuery(
-        const StorageID & table_id_, const ColumnsDescription & columns_, const String & comment_, const Configuration & config_);
-
-    std::string getName() const override { return "FuzzQuery"; }
-
-    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;
-
-    static StorageFuzzQuery::Configuration getConfiguration(ASTs & engine_args, ContextPtr local_context);
-
-private:
-    const Configuration config;
-};
-
-
-class FuzzQuerySource : public ISource
-{
-public:
-    FuzzQuerySource(
-        UInt64 block_size_, Block block_header_, const StorageFuzzQuery::Configuration & config_, ASTPtr query_)
-        : ISource(block_header_)
-        , block_size(block_size_)
-        , block_header(std::move(block_header_))
-        , config(config_)
-        , query(query_)
-        , fuzzer(config_.random_seed)
-    {
-    }
-
-    String getName() const override { return "FuzzQuery"; }
-
-protected:
-    Chunk generate() override
-    {
-        Columns columns;
-        columns.reserve(block_header.columns());
-        for (const auto & col : block_header)
-        {
-            chassert(col.type->getTypeId() == TypeIndex::String);
-            columns.emplace_back(createColumn());
-        }
-
-        return {std::move(columns), block_size};
-    }
-
-private:
-    ColumnPtr createColumn();
-
-    UInt64 block_size;
-    Block block_header;
-
-    StorageFuzzQuery::Configuration config;
-    ASTPtr query;
-
-    QueryFuzzer fuzzer;
-};
-
-}
diff --git a/src/Storages/StorageInMemoryMetadata.cpp b/src/Storages/StorageInMemoryMetadata.cpp
index 4a655cac566..2226de3e64f 100644
--- a/src/Storages/StorageInMemoryMetadata.cpp
+++ b/src/Storages/StorageInMemoryMetadata.cpp
@@ -16,7 +16,6 @@
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <IO/Operators.h>
-#include <Storages/MergeTree/MergeTreeVirtualColumns.h>
 
 
 namespace DB
@@ -335,17 +334,10 @@ ColumnDependencies StorageInMemoryMetadata::getColumnDependencies(
     NameSet required_ttl_columns;
     NameSet updated_ttl_columns;
 
-    auto add_dependent_columns = [&updated_columns](const Names & required_columns, auto & to_set, bool is_projection = false)
+    auto add_dependent_columns = [&updated_columns](const Names & required_columns, auto & to_set)
     {
         for (const auto & dependency : required_columns)
         {
-            /// useful in the case of lightweight delete with wide part and option of rebuild projection
-            if (is_projection && updated_columns.contains(RowExistsColumn::name))
-            {
-                to_set.insert(required_columns.begin(), required_columns.end());
-                return true;
-            }
-
             if (updated_columns.contains(dependency))
             {
                 to_set.insert(required_columns.begin(), required_columns.end());
@@ -365,7 +357,7 @@ ColumnDependencies StorageInMemoryMetadata::getColumnDependencies(
     for (const auto & projection : getProjections())
     {
         if (has_dependency(projection.name, ColumnDependency::PROJECTION))
-            add_dependent_columns(projection.getRequiredColumns(), projections_columns, true);
+            add_dependent_columns(projection.getRequiredColumns(), projections_columns);
     }
 
     auto add_for_rows_ttl = [&](const auto & expression, auto & to_set)
diff --git a/src/Storages/StorageJoin.cpp b/src/Storages/StorageJoin.cpp
index efa15c382dd..a0d6cf11b64 100644
--- a/src/Storages/StorageJoin.cpp
+++ b/src/Storages/StorageJoin.cpp
@@ -75,7 +75,6 @@ StorageJoin::StorageJoin(
     table_join = std::make_shared<TableJoin>(limits, use_nulls, kind, strictness, key_names);
     join = std::make_shared<HashJoin>(table_join, getRightSampleBlock(), overwrite);
     restore();
-    optimizeUnlocked();
 }
 
 RWLockImpl::LockHolder StorageJoin::tryLockTimedWithContext(const RWLock & lock, RWLockImpl::Type type, ContextPtr context) const
@@ -100,47 +99,6 @@ SinkToStoragePtr StorageJoin::write(const ASTPtr & query, const StorageMetadataP
     return StorageSetOrJoinBase::write(query, metadata_snapshot, context, /*async_insert=*/false);
 }
 
-bool StorageJoin::optimize(
-    const ASTPtr & /*query*/,
-    const StorageMetadataPtr & /*metadata_snapshot*/,
-    const ASTPtr & partition,
-    bool final,
-    bool deduplicate,
-    const Names & /* deduplicate_by_columns */,
-    bool cleanup,
-    ContextPtr context)
-{
-
-    if (partition)
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Partition cannot be specified when optimizing table of type Join");
-
-    if (final)
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "FINAL cannot be specified when optimizing table of type Join");
-
-    if (deduplicate)
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "DEDUPLICATE cannot be specified when optimizing table of type Join");
-
-    if (cleanup)
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "CLEANUP cannot be specified when optimizing table of type Join");
-
-    std::lock_guard mutate_lock(mutate_mutex);
-    TableLockHolder lock_holder = tryLockTimedWithContext(rwlock, RWLockImpl::Write, context);
-
-    optimizeUnlocked();
-    return true;
-}
-
-void StorageJoin::optimizeUnlocked()
-{
-    size_t current_bytes = join->getTotalByteCount();
-    size_t dummy = current_bytes;
-    join->shrinkStoredBlocksToFit(dummy, true);
-
-    size_t optimized_bytes = join->getTotalByteCount();
-    if (current_bytes > optimized_bytes)
-        LOG_INFO(getLogger("StorageJoin"), "Optimized Join storage from {} to {} bytes", current_bytes, optimized_bytes);
-}
-
 void StorageJoin::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr context, TableExclusiveLockHolder &)
 {
     std::lock_guard mutate_lock(mutate_mutex);
@@ -383,10 +341,10 @@ void registerStorageJoin(StorageFactory & factory)
                 else if (setting.name == "any_join_distinct_right_table_keys")
                     old_any_join = setting.value;
                 else if (setting.name == "disk")
-                    disk_name = setting.value.safeGet<String>();
+                    disk_name = setting.value.get<String>();
                 else if (setting.name == "persistent")
                 {
-                    persistent = setting.value.safeGet<bool>();
+                    persistent = setting.value.get<bool>();
                 }
                 else
                     throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown setting {} for storage {}", setting.name, args.engine_name);
@@ -546,11 +504,7 @@ protected:
             return {};
 
         Chunk chunk;
-        if (!joinDispatch(
-                join->kind,
-                join->strictness,
-                join->data->maps.front(),
-                join->table_join->getMixedJoinExpression() != nullptr,
+        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, "Unknown JOIN strictness");
         return chunk;
diff --git a/src/Storages/StorageJoin.h b/src/Storages/StorageJoin.h
index 10a551b4063..c76df0cb452 100644
--- a/src/Storages/StorageJoin.h
+++ b/src/Storages/StorageJoin.h
@@ -61,18 +61,6 @@ public:
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr context, bool async_insert) override;
 
-    bool optimize(
-        const ASTPtr & /*query*/,
-        const StorageMetadataPtr & /*metadata_snapshot*/,
-        const ASTPtr & /*partition*/,
-        bool /*final*/,
-        bool /*deduplicate*/,
-        const Names & /* deduplicate_by_columns */,
-        bool /*cleanup*/,
-        ContextPtr /*context*/) override;
-
-    void optimizeUnlocked();
-
     Pipe read(
         const Names & column_names,
         const StorageSnapshotPtr & storage_snapshot,
diff --git a/src/Storages/StorageKeeperMap.cpp b/src/Storages/StorageKeeperMap.cpp
index a6be9f8da04..587cb621362 100644
--- a/src/Storages/StorageKeeperMap.cpp
+++ b/src/Storages/StorageKeeperMap.cpp
@@ -37,13 +37,11 @@
 
 #include <Common/Base64.h>
 #include <Common/Exception.h>
-#include <Common/FailPoint.h>
 #include <Common/ZooKeeper/IKeeper.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/ZooKeeper/Types.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ZooKeeper/ZooKeeperConstants.h>
-#include <Common/ZooKeeper/ZooKeeperRetries.h>
 
 #include <Backups/BackupEntriesCollector.h>
 #include <Backups/IBackupCoordination.h>
@@ -66,11 +64,6 @@
 namespace DB
 {
 
-namespace FailPoints
-{
-    extern const char keepermap_fail_drop_data[];
-}
-
 namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
@@ -79,7 +72,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int LIMIT_EXCEEDED;
     extern const int CANNOT_RESTORE_TABLE;
-    extern const int INVALID_STATE;
 }
 
 namespace
@@ -122,7 +114,7 @@ public:
         : SinkToStorage(header), storage(storage_), context(std::move(context_))
     {
         auto primary_key = storage.getPrimaryKey();
-        chassert(primary_key.size() == 1);
+        assert(primary_key.size() == 1);
         primary_key_pos = getHeader().getPositionByName(primary_key[0]);
     }
 
@@ -173,94 +165,81 @@ public:
     template <bool for_update>
     void finalize(bool strict)
     {
-        const auto & settings = context->getSettingsRef();
+        auto zookeeper = storage.getClient();
 
-        ZooKeeperRetriesControl zk_retry{
-            getName(),
-            getLogger(getName()),
-            ZooKeeperRetriesInfo{
-                settings.insert_keeper_max_retries,
-                settings.insert_keeper_retry_initial_backoff_ms,
-                settings.insert_keeper_retry_max_backoff_ms},
-            context->getProcessListElement()};
+        auto keys_limit = storage.keysLimit();
 
-        zk_retry.retryLoop([&]()
+        size_t current_keys_num = 0;
+        size_t new_keys_num = 0;
+
+        // We use keys limit as a soft limit so we ignore some cases when it can be still exceeded
+        // (e.g if parallel insert queries are being run)
+        if (keys_limit != 0)
         {
-            auto zookeeper = storage.getClient();
-            auto keys_limit = storage.keysLimit();
+            Coordination::Stat data_stat;
+            zookeeper->get(storage.dataPath(), &data_stat);
+            current_keys_num = data_stat.numChildren;
+        }
 
-            size_t current_keys_num = 0;
-            size_t new_keys_num = 0;
+        std::vector<std::string> key_paths;
+        key_paths.reserve(new_values.size());
+        for (const auto & [key, _] : new_values)
+            key_paths.push_back(storage.fullPathForKey(key));
 
-            // We use keys limit as a soft limit so we ignore some cases when it can be still exceeded
-            // (e.g if parallel insert queries are being run)
-            if (keys_limit != 0)
+        zkutil::ZooKeeper::MultiExistsResponse results;
+
+        if constexpr (!for_update)
+        {
+            if (!strict)
+                results = zookeeper->exists(key_paths);
+        }
+
+        Coordination::Requests requests;
+        requests.reserve(key_paths.size());
+        for (size_t i = 0; i < key_paths.size(); ++i)
+        {
+            auto key = fs::path(key_paths[i]).filename();
+
+            if constexpr (for_update)
             {
-                Coordination::Stat data_stat;
-                zookeeper->get(storage.dataPath(), &data_stat);
-                current_keys_num = data_stat.numChildren;
+                int32_t version = -1;
+                if (strict)
+                    version = versions.at(key);
+
+                requests.push_back(zkutil::makeSetRequest(key_paths[i], new_values[key], version));
             }
-
-            std::vector<std::string> key_paths;
-            key_paths.reserve(new_values.size());
-            for (const auto & [key, _] : new_values)
-                key_paths.push_back(storage.fullPathForKey(key));
-
-            zkutil::ZooKeeper::MultiExistsResponse results;
-
-            if constexpr (!for_update)
+            else
             {
-                if (!strict)
-                    results = zookeeper->exists(key_paths);
-            }
-
-            Coordination::Requests requests;
-            requests.reserve(key_paths.size());
-            for (size_t i = 0; i < key_paths.size(); ++i)
-            {
-                auto key = fs::path(key_paths[i]).filename();
-
-                if constexpr (for_update)
+                if (!strict && results[i].error == Coordination::Error::ZOK)
                 {
-                    int32_t version = -1;
-                    if (strict)
-                        version = versions.at(key);
-
-                    requests.push_back(zkutil::makeSetRequest(key_paths[i], new_values[key], version));
+                    requests.push_back(zkutil::makeSetRequest(key_paths[i], new_values[key], -1));
                 }
                 else
                 {
-                    if (!strict && results[i].error == Coordination::Error::ZOK)
-                    {
-                        requests.push_back(zkutil::makeSetRequest(key_paths[i], new_values[key], -1));
-                    }
-                    else
-                    {
-                        requests.push_back(zkutil::makeCreateRequest(key_paths[i], new_values[key], zkutil::CreateMode::Persistent));
-                        ++new_keys_num;
-                    }
+                    requests.push_back(zkutil::makeCreateRequest(key_paths[i], new_values[key], zkutil::CreateMode::Persistent));
+                    ++new_keys_num;
                 }
             }
+        }
 
-            if (new_keys_num != 0)
-            {
-                auto will_be = current_keys_num + new_keys_num;
-                if (keys_limit != 0 && will_be > keys_limit)
-                    throw Exception(
-                        ErrorCodes::LIMIT_EXCEEDED,
-                        "Limit would be exceeded by inserting {} new key(s). Limit is {}, while the number of keys would be {}",
-                        new_keys_num,
-                        keys_limit,
-                        will_be);
-            }
+        if (new_keys_num != 0)
+        {
+            auto will_be = current_keys_num + new_keys_num;
+            if (keys_limit != 0 && will_be > keys_limit)
+                throw Exception(
+                    ErrorCodes::LIMIT_EXCEEDED,
+                    "Limit would be exceeded by inserting {} new key(s). Limit is {}, while the number of keys would be {}",
+                    new_keys_num,
+                    keys_limit,
+                    will_be);
+        }
 
-            zookeeper->multi(requests, /* check_session_valid */ true);
-        });
+        zookeeper->multi(requests, /* check_session_valid */ true);
     }
 };
 
 template <typename KeyContainer>
-class StorageKeeperMapSource : public ISource, WithContext
+class StorageKeeperMapSource : public ISource
 {
     const StorageKeeperMap & storage;
     size_t max_block_size;
@@ -291,15 +270,8 @@ public:
         KeyContainerPtr container_,
         KeyContainerIter begin_,
         KeyContainerIter end_,
-        bool with_version_column_,
-        ContextPtr context_)
-        : ISource(getHeader(header, with_version_column_))
-        , WithContext(std::move(context_))
-        , storage(storage_)
-        , max_block_size(max_block_size_)
-        , container(std::move(container_))
-        , it(begin_)
-        , end(end_)
+        bool with_version_column_)
+        : ISource(getHeader(header, with_version_column_)), storage(storage_), max_block_size(max_block_size_), container(std::move(container_)), it(begin_), end(end_)
         , with_version_column(with_version_column_)
     {
     }
@@ -324,12 +296,12 @@ public:
             for (auto & raw_key : raw_keys)
                 raw_key = base64Encode(raw_key, /* url_encoding */ true);
 
-            return storage.getBySerializedKeys(raw_keys, nullptr, with_version_column, getContext());
+            return storage.getBySerializedKeys(raw_keys, nullptr, with_version_column);
         }
         else
         {
             size_t elem_num = std::min(max_block_size, static_cast<size_t>(end - it));
-            auto chunk = storage.getBySerializedKeys(std::span{it, it + elem_num}, nullptr, with_version_column, getContext());
+            auto chunk = storage.getBySerializedKeys(std::span{it, it + elem_num}, nullptr, with_version_column);
             it += elem_num;
             return chunk;
         }
@@ -408,192 +380,105 @@ StorageKeeperMap::StorageKeeperMap(
 
     if (attach)
     {
-        checkTable<false>(context_);
+        checkTable<false>();
         return;
     }
 
-    const auto & settings = context_->getSettingsRef();
-    ZooKeeperRetriesControl zk_retry{
-        getName(),
-        getLogger(getName()),
-        ZooKeeperRetriesInfo{settings.keeper_max_retries, settings.keeper_retry_initial_backoff_ms, settings.keeper_retry_max_backoff_ms},
-        context_->getProcessListElement()};
+    auto client = getClient();
 
-    zk_retry.retryLoop(
-        [&]
-        {
-            auto client = getClient();
-
-            if (zk_root_path != "/" && !client->exists(zk_root_path))
-            {
-                LOG_TRACE(log, "Creating root path {}", zk_root_path);
-                client->createAncestors(zk_root_path);
-                client->createIfNotExists(zk_root_path, "");
-            }
-        });
-
-    std::shared_ptr<zkutil::EphemeralNodeHolder> metadata_drop_lock;
-    int32_t drop_lock_version = -1;
-    for (size_t i = 0; i < 1000; ++i)
+    if (zk_root_path != "/" && !client->exists(zk_root_path))
     {
-        bool success = false;
-        zk_retry.retryLoop(
-            [&]
-            {
-                auto client = getClient();
-                std::string stored_metadata_string;
-                auto exists = client->tryGet(zk_metadata_path, stored_metadata_string);
-
-                if (exists)
-                {
-                    // this requires same name for columns
-                    // maybe we can do a smarter comparison for columns and primary key expression
-                    if (stored_metadata_string != metadata_string)
-                        throw Exception(
-                            ErrorCodes::BAD_ARGUMENTS,
-                            "Path {} is already used but the stored table definition doesn't match. Stored metadata: {}",
-                            zk_root_path,
-                            stored_metadata_string);
-
-                    auto code = client->tryCreate(zk_table_path, "", zkutil::CreateMode::Persistent);
-
-                    /// A table on the same Keeper path already exists, we just appended our table id to subscribe as a new replica
-                    /// We still don't know if the table matches the expected metadata so table_is_valid is not changed
-                    /// It will be checked lazily on the first operation
-                    if (code == Coordination::Error::ZOK)
-                    {
-                        success = true;
-                        return;
-                    }
-
-                    /// We most likely created the path but got a timeout or disconnect
-                    if (code == Coordination::Error::ZNODEEXISTS && zk_retry.isRetry())
-                    {
-                        success = true;
-                        return;
-                    }
-
-                    if (code != Coordination::Error::ZNONODE)
-                        throw zkutil::KeeperException(
-                            code, "Failed to create table on path {} because a table with same UUID already exists", zk_root_path);
-
-                    /// ZNONODE means we dropped zk_tables_path but didn't finish drop completely
-                }
-
-                if (client->exists(zk_dropped_path))
-                {
-                    LOG_INFO(log, "Removing leftover nodes");
-
-                    bool drop_finished = false;
-                    if (zk_retry.isRetry() && metadata_drop_lock != nullptr && drop_lock_version != -1)
-                    {
-                        /// if we have leftover lock from previous try, we need to recreate the ephemeral with our session
-                        Coordination::Requests drop_lock_requests{
-                            zkutil::makeRemoveRequest(zk_dropped_lock_path, drop_lock_version),
-                            zkutil::makeCreateRequest(zk_dropped_lock_path, "", zkutil::CreateMode::Ephemeral),
-                        };
-
-                        Coordination::Responses drop_lock_responses;
-                        auto lock_code = client->tryMulti(drop_lock_requests, drop_lock_responses);
-                        if (lock_code == Coordination::Error::ZBADVERSION)
-                        {
-                            LOG_INFO(log, "Someone else is removing leftover nodes");
-                            metadata_drop_lock->setAlreadyRemoved();
-                            metadata_drop_lock.reset();
-                            return;
-                        }
-
-                        if (drop_lock_responses[0]->error == Coordination::Error::ZNONODE)
-                        {
-                            /// someone else removed metadata nodes or the previous ephemeral node expired
-                            /// we will try creating dropped lock again to make sure
-                            metadata_drop_lock->setAlreadyRemoved();
-                            metadata_drop_lock.reset();
-                        }
-                        else if (lock_code == Coordination::Error::ZOK)
-                        {
-                            metadata_drop_lock->setAlreadyRemoved();
-                            metadata_drop_lock = zkutil::EphemeralNodeHolder::existing(zk_dropped_lock_path, *client);
-                            drop_lock_version = -1;
-                            Coordination::Stat lock_stat;
-                            client->get(zk_dropped_lock_path, &lock_stat);
-                            drop_lock_version = lock_stat.version;
-                            if (!dropTable(client, metadata_drop_lock))
-                            {
-                                metadata_drop_lock.reset();
-                                return;
-                            }
-                            drop_finished = true;
-                        }
-                    }
-
-                    if (!drop_finished)
-                    {
-                        auto code = client->tryCreate(zk_dropped_lock_path, "", zkutil::CreateMode::Ephemeral);
-
-                        if (code == Coordination::Error::ZNONODE)
-                        {
-                            LOG_INFO(log, "Someone else removed leftover nodes");
-                        }
-                        else if (code == Coordination::Error::ZNODEEXISTS)
-                        {
-                            LOG_INFO(log, "Someone else is removing leftover nodes");
-                            return;
-                        }
-                        else if (code != Coordination::Error::ZOK)
-                        {
-                            throw Coordination::Exception::fromPath(code, zk_dropped_lock_path);
-                        }
-                        else
-                        {
-                            metadata_drop_lock = zkutil::EphemeralNodeHolder::existing(zk_dropped_lock_path, *client);
-                            drop_lock_version = -1;
-                            Coordination::Stat lock_stat;
-                            client->get(zk_dropped_lock_path, &lock_stat);
-                            drop_lock_version = lock_stat.version;
-                            if (!dropTable(client, metadata_drop_lock))
-                            {
-                                metadata_drop_lock.reset();
-                                return;
-                            }
-                        }
-                    }
-                }
-
-                Coordination::Requests create_requests{
-                    zkutil::makeCreateRequest(zk_metadata_path, metadata_string, zkutil::CreateMode::Persistent),
-                    zkutil::makeCreateRequest(zk_data_path, metadata_string, zkutil::CreateMode::Persistent),
-                    zkutil::makeCreateRequest(zk_tables_path, "", zkutil::CreateMode::Persistent),
-                    zkutil::makeCreateRequest(zk_table_path, "", zkutil::CreateMode::Persistent),
-                };
-
-                Coordination::Responses create_responses;
-                auto code = client->tryMulti(create_requests, create_responses);
-                if (code == Coordination::Error::ZNODEEXISTS)
-                {
-                    LOG_INFO(
-                        log, "It looks like a table on path {} was created by another server at the same moment, will retry", zk_root_path);
-                    return;
-                }
-                else if (code != Coordination::Error::ZOK)
-                {
-                    zkutil::KeeperMultiException::check(code, create_requests, create_responses);
-                }
-
-                table_status = TableStatus::VALID;
-                /// we are the first table created for the specified Keeper path, i.e. we are the first replica
-                success = true;
-            });
-
-        if (success)
-            return;
+        LOG_TRACE(log, "Creating root path {}", zk_root_path);
+        client->createAncestors(zk_root_path);
+        client->createIfNotExists(zk_root_path, "");
     }
 
-    throw Exception(
-        ErrorCodes::BAD_ARGUMENTS,
-        "Cannot create metadata for table, because it is removed concurrently or because "
-        "of wrong zk_root_path ({})",
-        zk_root_path);
+    for (size_t i = 0; i < 1000; ++i)
+    {
+        std::string stored_metadata_string;
+        auto exists = client->tryGet(zk_metadata_path, stored_metadata_string);
+
+        if (exists)
+        {
+            // this requires same name for columns
+            // maybe we can do a smarter comparison for columns and primary key expression
+            if (stored_metadata_string != metadata_string)
+                throw Exception(
+                    ErrorCodes::BAD_ARGUMENTS,
+                    "Path {} is already used but the stored table definition doesn't match. Stored metadata: {}",
+                    zk_root_path,
+                    stored_metadata_string);
+
+            auto code = client->tryCreate(zk_table_path, "", zkutil::CreateMode::Persistent);
+
+            // tables_path was removed with drop
+            if (code == Coordination::Error::ZNONODE)
+            {
+                LOG_INFO(log, "Metadata nodes were removed by another server, will retry");
+                continue;
+            }
+            else if (code != Coordination::Error::ZOK)
+            {
+                throw zkutil::KeeperException(code, "Failed to create table on path {} because a table with same UUID already exists", zk_root_path);
+            }
+
+            return;
+        }
+
+        if (client->exists(zk_dropped_path))
+        {
+            LOG_INFO(log, "Removing leftover nodes");
+            auto code = client->tryCreate(zk_dropped_lock_path, "", zkutil::CreateMode::Ephemeral);
+
+            if (code == Coordination::Error::ZNONODE)
+            {
+                LOG_INFO(log, "Someone else removed leftover nodes");
+            }
+            else if (code == Coordination::Error::ZNODEEXISTS)
+            {
+                LOG_INFO(log, "Someone else is removing leftover nodes");
+                continue;
+            }
+            else if (code != Coordination::Error::ZOK)
+            {
+                throw Coordination::Exception::fromPath(code, zk_dropped_lock_path);
+            }
+            else
+            {
+                auto metadata_drop_lock = zkutil::EphemeralNodeHolder::existing(zk_dropped_lock_path, *client);
+                if (!dropTable(client, metadata_drop_lock))
+                    continue;
+            }
+        }
+
+        Coordination::Requests create_requests
+        {
+            zkutil::makeCreateRequest(zk_metadata_path, metadata_string, zkutil::CreateMode::Persistent),
+            zkutil::makeCreateRequest(zk_data_path, metadata_string, zkutil::CreateMode::Persistent),
+            zkutil::makeCreateRequest(zk_tables_path, "", zkutil::CreateMode::Persistent),
+            zkutil::makeCreateRequest(zk_table_path, "", zkutil::CreateMode::Persistent),
+        };
+
+        Coordination::Responses create_responses;
+        auto code = client->tryMulti(create_requests, create_responses);
+        if (code == Coordination::Error::ZNODEEXISTS)
+        {
+            LOG_INFO(log, "It looks like a table on path {} was created by another server at the same moment, will retry", zk_root_path);
+            continue;
+        }
+        else if (code != Coordination::Error::ZOK)
+        {
+            zkutil::KeeperMultiException::check(code, create_requests, create_responses);
+        }
+
+
+        table_is_valid = true;
+        return;
+    }
+
+    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Cannot create metadata for table, because it is removed concurrently or because "
+                    "of wrong zk_root_path ({})", zk_root_path);
 }
 
 
@@ -606,7 +491,7 @@ Pipe StorageKeeperMap::read(
     size_t max_block_size,
     size_t num_streams)
 {
-    checkTable<true>(context_);
+    checkTable<true>();
     storage_snapshot->check(column_names);
 
     FieldVectorPtr filtered_keys;
@@ -639,8 +524,8 @@ Pipe StorageKeeperMap::read(
         size_t num_keys = keys->size();
         size_t num_threads = std::min<size_t>(num_streams, keys->size());
 
-        chassert(num_keys <= std::numeric_limits<uint32_t>::max());
-        chassert(num_threads <= std::numeric_limits<uint32_t>::max());
+        assert(num_keys <= std::numeric_limits<uint32_t>::max());
+        assert(num_threads <= std::numeric_limits<uint32_t>::max());
 
         for (size_t thread_idx = 0; thread_idx < num_threads; ++thread_idx)
         {
@@ -649,67 +534,33 @@ Pipe StorageKeeperMap::read(
 
             using KeyContainer = typename KeyContainerPtr::element_type;
             pipes.emplace_back(std::make_shared<StorageKeeperMapSource<KeyContainer>>(
-                *this, sample_block, max_block_size, keys, keys->begin() + begin, keys->begin() + end, with_version_column, context_));
+                *this, sample_block, max_block_size, keys, keys->begin() + begin, keys->begin() + end, with_version_column));
         }
         return Pipe::unitePipes(std::move(pipes));
     };
 
+    auto client = getClient();
     if (all_scan)
-    {
-        const auto & settings = context_->getSettingsRef();
-        ZooKeeperRetriesControl zk_retry{
-            getName(),
-            getLogger(getName()),
-            ZooKeeperRetriesInfo{
-                settings.keeper_max_retries,
-                settings.keeper_retry_initial_backoff_ms,
-                settings.keeper_retry_max_backoff_ms},
-            context_->getProcessListElement()};
-
-        std::vector<std::string> children;
-        zk_retry.retryLoop([&]
-        {
-            auto client = getClient();
-            children = client->getChildren(zk_data_path);
-        });
-        return process_keys(std::make_shared<std::vector<std::string>>(std::move(children)));
-    }
+        return process_keys(std::make_shared<std::vector<std::string>>(client->getChildren(zk_data_path)));
 
     return process_keys(std::move(filtered_keys));
 }
 
 SinkToStoragePtr StorageKeeperMap::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context, bool /*async_insert*/)
 {
-    checkTable<true>(local_context);
+    checkTable<true>();
     return std::make_shared<StorageKeeperMapSink>(*this, metadata_snapshot->getSampleBlock(), local_context);
 }
 
-void StorageKeeperMap::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr local_context, TableExclusiveLockHolder &)
+void StorageKeeperMap::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &)
 {
-    checkTable<true>(local_context);
-    const auto & settings = local_context->getSettingsRef();
-    ZooKeeperRetriesControl zk_retry{
-        getName(),
-        getLogger(getName()),
-        ZooKeeperRetriesInfo{
-            settings.keeper_max_retries,
-            settings.keeper_retry_initial_backoff_ms,
-            settings.keeper_retry_max_backoff_ms},
-        local_context->getProcessListElement()};
-
-    zk_retry.retryLoop([&]
-    {
-        auto client = getClient();
-        client->tryRemoveChildrenRecursive(zk_data_path, true);
-    });
+    checkTable<true>();
+    auto client = getClient();
+    client->tryRemoveChildrenRecursive(zk_data_path, true);
 }
 
 bool StorageKeeperMap::dropTable(zkutil::ZooKeeperPtr zookeeper, const zkutil::EphemeralNodeHolder::Ptr & metadata_drop_lock)
 {
-    fiu_do_on(FailPoints::keepermap_fail_drop_data,
-    {
-        throw zkutil::KeeperException(Coordination::Error::ZOPERATIONTIMEOUT, "Manually triggered operation timeout");
-    });
     zookeeper->removeChildrenRecursive(zk_data_path);
 
     bool completely_removed = false;
@@ -745,18 +596,7 @@ bool StorageKeeperMap::dropTable(zkutil::ZooKeeperPtr zookeeper, const zkutil::E
 
 void StorageKeeperMap::drop()
 {
-    auto current_table_status = getTableStatus(getContext());
-    if (current_table_status == TableStatus::UNKNOWN)
-    {
-            static constexpr auto error_msg = "Failed to activate table because of connection issues. It will be activated "
-                                              "once a connection is established and metadata is verified";
-            throw Exception(ErrorCodes::INVALID_STATE, error_msg);
-    }
-
-    /// if only column metadata is wrong we can still drop the table correctly
-    if (current_table_status == TableStatus::INVALID_METADATA)
-        return;
-
+    checkTable<true>();
     auto client = getClient();
 
     // we allow ZNONODE in case we got hardware error on previous drop
@@ -1117,91 +957,78 @@ UInt64 StorageKeeperMap::keysLimit() const
     return keys_limit;
 }
 
-StorageKeeperMap::TableStatus StorageKeeperMap::getTableStatus(const ContextPtr & local_context) const
+std::optional<bool> StorageKeeperMap::isTableValid() const
 {
     std::lock_guard lock{init_mutex};
-    if (table_status != TableStatus::UNKNOWN)
-        return table_status;
+    if (table_is_valid.has_value())
+        return table_is_valid;
 
     [&]
     {
         try
         {
-            const auto & settings = local_context->getSettingsRef();
-            ZooKeeperRetriesControl zk_retry{
-                getName(),
-                getLogger(getName()),
-                ZooKeeperRetriesInfo{
-                    settings.keeper_max_retries,
-                    settings.keeper_retry_initial_backoff_ms,
-                    settings.keeper_retry_max_backoff_ms},
-                local_context->getProcessListElement()};
+            auto client = getClient();
 
-            zk_retry.retryLoop([&]
+            Coordination::Stat metadata_stat;
+            auto stored_metadata_string = client->get(zk_metadata_path, &metadata_stat);
+
+            if (metadata_stat.numChildren == 0)
             {
-                auto client = getClient();
+                table_is_valid = false;
+                return;
+            }
 
-                Coordination::Stat metadata_stat;
-                auto stored_metadata_string = client->get(zk_metadata_path, &metadata_stat);
+            if (metadata_string != stored_metadata_string)
+            {
+                LOG_ERROR(
+                    log,
+                    "Table definition does not match to the one stored in the path {}. Stored definition: {}",
+                    zk_root_path,
+                    stored_metadata_string);
+                table_is_valid = false;
+                return;
+            }
 
-                if (metadata_stat.numChildren == 0)
-                {
-                    table_status = TableStatus::INVALID_KEEPER_STRUCTURE;
-                    return;
-                }
+            // validate all metadata and data nodes are present
+            Coordination::Requests requests;
+            requests.push_back(zkutil::makeCheckRequest(zk_table_path, -1));
+            requests.push_back(zkutil::makeCheckRequest(zk_data_path, -1));
+            requests.push_back(zkutil::makeCheckRequest(zk_dropped_path, -1));
 
-                if (metadata_string != stored_metadata_string)
-                {
-                    LOG_ERROR(
-                        log,
-                        "Table definition does not match to the one stored in the path {}. Stored definition: {}",
-                        zk_root_path,
-                        stored_metadata_string);
-                    table_status = TableStatus::INVALID_METADATA;
-                    return;
-                }
+            Coordination::Responses responses;
+            client->tryMulti(requests, responses);
 
-                // validate all metadata and data nodes are present
-                Coordination::Requests requests;
-                requests.push_back(zkutil::makeCheckRequest(zk_table_path, -1));
-                requests.push_back(zkutil::makeCheckRequest(zk_data_path, -1));
-                requests.push_back(zkutil::makeCheckRequest(zk_dropped_path, -1));
+            table_is_valid = false;
+            if (responses[0]->error != Coordination::Error::ZOK)
+            {
+                LOG_ERROR(log, "Table node ({}) is missing", zk_table_path);
+                return;
+            }
 
-                Coordination::Responses responses;
-                client->tryMulti(requests, responses);
+            if (responses[1]->error != Coordination::Error::ZOK)
+            {
+                LOG_ERROR(log, "Data node ({}) is missing", zk_data_path);
+                return;
+            }
 
-                table_status = TableStatus::INVALID_KEEPER_STRUCTURE;
-                if (responses[0]->error != Coordination::Error::ZOK)
-                {
-                    LOG_ERROR(log, "Table node ({}) is missing", zk_table_path);
-                    return;
-                }
+            if (responses[2]->error == Coordination::Error::ZOK)
+            {
+                LOG_ERROR(log, "Tables with root node {} are being dropped", zk_root_path);
+                return;
+            }
 
-                if (responses[1]->error != Coordination::Error::ZOK)
-                {
-                    LOG_ERROR(log, "Data node ({}) is missing", zk_data_path);
-                    return;
-                }
-
-                if (responses[2]->error == Coordination::Error::ZOK)
-                {
-                    LOG_ERROR(log, "Tables with root node {} are being dropped", zk_root_path);
-                    return;
-                }
-
-                table_status = TableStatus::VALID;
-            });
+            table_is_valid = true;
         }
         catch (const Coordination::Exception & e)
         {
             tryLogCurrentException(log);
 
             if (!Coordination::isHardwareError(e.code))
-                table_status = TableStatus::INVALID_KEEPER_STRUCTURE;
+                table_is_valid = false;
         }
     }();
 
-    return table_status;
+    return table_is_valid;
 }
 
 Chunk StorageKeeperMap::getByKeys(const ColumnsWithTypeAndName & keys, PaddedPODArray<UInt8> & null_map, const Names &) const
@@ -1214,11 +1041,10 @@ Chunk StorageKeeperMap::getByKeys(const ColumnsWithTypeAndName & keys, PaddedPOD
     if (raw_keys.size() != keys[0].column->size())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Assertion failed: {} != {}", raw_keys.size(), keys[0].column->size());
 
-    return getBySerializedKeys(raw_keys, &null_map, /* version_column */ false, getContext());
+    return getBySerializedKeys(raw_keys, &null_map, /* version_column */ false);
 }
 
-Chunk StorageKeeperMap::getBySerializedKeys(
-    const std::span<const std::string> keys, PaddedPODArray<UInt8> * null_map, bool with_version, const ContextPtr & local_context) const
+Chunk StorageKeeperMap::getBySerializedKeys(const std::span<const std::string> keys, PaddedPODArray<UInt8> * null_map, bool with_version) const
 {
     Block sample_block = getInMemoryMetadataPtr()->getSampleBlock();
     MutableColumns columns = sample_block.cloneEmptyColumns();
@@ -1235,27 +1061,17 @@ Chunk StorageKeeperMap::getBySerializedKeys(
         null_map->resize_fill(keys.size(), 1);
     }
 
+    auto client = getClient();
+
     Strings full_key_paths;
     full_key_paths.reserve(keys.size());
 
     for (const auto & key : keys)
+    {
         full_key_paths.emplace_back(fullPathForKey(key));
+    }
 
-    const auto & settings = local_context->getSettingsRef();
-    ZooKeeperRetriesControl zk_retry{
-        getName(),
-        getLogger(getName()),
-        ZooKeeperRetriesInfo{
-            settings.keeper_max_retries,
-            settings.keeper_retry_initial_backoff_ms,
-            settings.keeper_retry_max_backoff_ms},
-        local_context->getProcessListElement()};
-
-    zkutil::ZooKeeper::MultiTryGetResponse values;
-    zk_retry.retryLoop([&]{
-        auto client = getClient();
-        values = client->tryGet(full_key_paths);
-    });
+    auto values = client->tryGet(full_key_paths);
 
     for (size_t i = 0; i < keys.size(); ++i)
     {
@@ -1328,14 +1144,14 @@ void StorageKeeperMap::checkMutationIsPossible(const MutationCommands & commands
 
 void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr local_context)
 {
-    checkTable<true>(local_context);
+    checkTable<true>();
 
     if (commands.empty())
         return;
 
     bool strict = local_context->getSettingsRef().keeper_map_strict_mode;
 
-    chassert(commands.size() == 1);
+    assert(commands.size() == 1);
 
     auto metadata_snapshot = getInMemoryMetadataPtr();
     auto storage = getStorageID();
@@ -1343,16 +1159,16 @@ void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr loca
 
     if (commands.front().type == MutationCommand::Type::DELETE)
     {
-        MutationsInterpreter::Settings mutation_settings(true);
-        mutation_settings.return_all_columns = true;
-        mutation_settings.return_mutated_rows = true;
+        MutationsInterpreter::Settings settings(true);
+        settings.return_all_columns = true;
+        settings.return_mutated_rows = true;
 
         auto interpreter = std::make_unique<MutationsInterpreter>(
             storage_ptr,
             metadata_snapshot,
             commands,
             local_context,
-            mutation_settings);
+            settings);
 
         auto pipeline = QueryPipelineBuilder::getPipeline(interpreter->execute());
         PullingPipelineExecutor executor(pipeline);
@@ -1361,6 +1177,8 @@ void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr loca
         auto primary_key_pos = header.getPositionByName(primary_key);
         auto version_position = header.getPositionByName(std::string{version_column_name});
 
+        auto client = getClient();
+
         Block block;
         while (executor.pull(block))
         {
@@ -1388,23 +1206,7 @@ void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr loca
             }
 
             Coordination::Responses responses;
-
-            const auto & settings = local_context->getSettingsRef();
-            ZooKeeperRetriesControl zk_retry{
-                getName(),
-                getLogger(getName()),
-                ZooKeeperRetriesInfo{
-                    settings.keeper_max_retries,
-                    settings.keeper_retry_initial_backoff_ms,
-                    settings.keeper_retry_max_backoff_ms},
-                local_context->getProcessListElement()};
-
-            Coordination::Error status;
-            zk_retry.retryLoop([&]
-            {
-                auto client = getClient();
-                status = client->tryMulti(delete_requests, responses, /* check_session_valid */ true);
-            });
+            auto status = client->tryMulti(delete_requests, responses, /* check_session_valid */ true);
 
             if (status == Coordination::Error::ZOK)
                 return;
@@ -1416,21 +1218,16 @@ void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr loca
 
             for (const auto & delete_request : delete_requests)
             {
-                zk_retry.retryLoop([&]
-                {
-                    auto client = getClient();
-                    status = client->tryRemove(delete_request->getPath());
-                });
-
-                if (status != Coordination::Error::ZOK && status != Coordination::Error::ZNONODE)
-                    throw zkutil::KeeperException::fromPath(status, delete_request->getPath());
+                auto code = client->tryRemove(delete_request->getPath());
+                if (code != Coordination::Error::ZOK && code != Coordination::Error::ZNONODE)
+                    throw zkutil::KeeperException::fromPath(code, delete_request->getPath());
             }
         }
 
         return;
     }
 
-    chassert(commands.front().type == MutationCommand::Type::UPDATE);
+    assert(commands.front().type == MutationCommand::Type::UPDATE);
     if (commands.front().column_to_update_expression.contains(primary_key))
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Primary key cannot be updated (cannot update column {})", primary_key);
 
@@ -1483,7 +1280,6 @@ StoragePtr create(const StorageFactory::Arguments & args)
     StorageInMemoryMetadata metadata;
     metadata.setColumns(args.columns);
     metadata.setConstraints(args.constraints);
-    metadata.setComment(args.comment);
 
     if (!args.storage_def->primary_key)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "StorageKeeperMap requires one column in primary key");
diff --git a/src/Storages/StorageKeeperMap.h b/src/Storages/StorageKeeperMap.h
index 1464eeaabad..d4556792c48 100644
--- a/src/Storages/StorageKeeperMap.h
+++ b/src/Storages/StorageKeeperMap.h
@@ -54,8 +54,7 @@ public:
     Names getPrimaryKey() const override { return {primary_key}; }
 
     Chunk getByKeys(const ColumnsWithTypeAndName & keys, PaddedPODArray<UInt8> & null_map, const Names &) const override;
-    Chunk getBySerializedKeys(
-        std::span<const std::string> keys, PaddedPODArray<UInt8> * null_map, bool with_version, const ContextPtr & local_context) const;
+    Chunk getBySerializedKeys(std::span<const std::string> keys, PaddedPODArray<UInt8> * null_map, bool with_version) const;
 
     Block getSampleBlock(const Names &) const override;
 
@@ -78,10 +77,10 @@ public:
     UInt64 keysLimit() const;
 
     template <bool throw_on_error>
-    void checkTable(const ContextPtr & local_context) const
+    void checkTable() const
     {
-        auto current_table_status = getTableStatus(local_context);
-        if (table_status == TableStatus::UNKNOWN)
+        auto is_table_valid = isTableValid();
+        if (!is_table_valid.has_value())
         {
             static constexpr auto error_msg = "Failed to activate table because of connection issues. It will be activated "
                                                           "once a connection is established and metadata is verified";
@@ -94,10 +93,10 @@ public:
             }
         }
 
-        if (current_table_status != TableStatus::VALID)
+        if (!*is_table_valid)
         {
             static constexpr auto error_msg
-                = "Failed to activate table because of invalid metadata in ZooKeeper. Please DROP/DETACH table";
+                = "Failed to activate table because of invalid metadata in ZooKeeper. Please DETACH table";
             if constexpr (throw_on_error)
                 throw Exception(ErrorCodes::INVALID_STATE, error_msg);
             else
@@ -111,15 +110,7 @@ public:
 private:
     bool dropTable(zkutil::ZooKeeperPtr zookeeper, const zkutil::EphemeralNodeHolder::Ptr & metadata_drop_lock);
 
-    enum class TableStatus : uint8_t
-    {
-        UNKNOWN,
-        INVALID_METADATA,
-        INVALID_KEEPER_STRUCTURE,
-        VALID
-    };
-
-    TableStatus getTableStatus(const ContextPtr & context) const;
+    std::optional<bool> isTableValid() const;
 
     void restoreDataImpl(
         const BackupPtr & backup,
@@ -151,8 +142,7 @@ private:
     mutable zkutil::ZooKeeperPtr zookeeper_client{nullptr};
 
     mutable std::mutex init_mutex;
-
-    mutable TableStatus table_status{TableStatus::UNKNOWN};
+    mutable std::optional<bool> table_is_valid;
 
     LoggerPtr log;
 };
diff --git a/src/Storages/StorageMaterializedView.cpp b/src/Storages/StorageMaterializedView.cpp
index e1256032493..b603d0ecf87 100644
--- a/src/Storages/StorageMaterializedView.cpp
+++ b/src/Storages/StorageMaterializedView.cpp
@@ -3,8 +3,6 @@
 #include <Storages/MaterializedView/RefreshTask.h>
 
 #include <Parsers/ASTSelectWithUnionQuery.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTFunction.h>
 
@@ -16,7 +14,6 @@
 #include <Interpreters/InterpreterInsertQuery.h>
 #include <Interpreters/InterpreterRenameQuery.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
-#include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 #include <Interpreters/getHeaderForProcessingStage.h>
 #include <Interpreters/getTableExpressions.h>
 
@@ -149,13 +146,6 @@ StorageMaterializedView::StorageMaterializedView(
     if (point_to_itself_by_uuid || point_to_itself_by_name)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Materialized view {} cannot point to itself", table_id_.getFullTableName());
 
-    if (query.refresh_strategy)
-    {
-        fixed_uuid = false;
-        refresher = RefreshTask::create(this, getContext(), *query.refresh_strategy);
-        refresh_on_start = mode < LoadingStrictnessLevel::ATTACH && !query.is_create_empty;
-    }
-
     if (!has_inner_table)
     {
         target_table_id = to_table_id;
@@ -208,6 +198,16 @@ StorageMaterializedView::StorageMaterializedView(
 
         target_table_id = DatabaseCatalog::instance().getTable({manual_create_query->getDatabase(), manual_create_query->getTable()}, getContext())->getStorageID();
     }
+
+    if (query.refresh_strategy)
+    {
+        fixed_uuid = false;
+        refresher = RefreshTask::create(
+            *this,
+            getContext(),
+            *query.refresh_strategy);
+        refresh_on_start = mode < LoadingStrictnessLevel::ATTACH && !query.is_create_empty;
+    }
 }
 
 QueryProcessingStage::Enum StorageMaterializedView::getQueryProcessingStage(
@@ -281,8 +281,8 @@ void StorageMaterializedView::read(
              * They may be added in case of distributed query with JOIN.
              * In that case underlying table returns joined columns as well.
              */
-            converting_actions.removeUnusedActions();
-            auto converting_step = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), std::move(converting_actions));
+            converting_actions->removeUnusedActions();
+            auto converting_step = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), converting_actions);
             converting_step->setStepDescription("Convert target table structure to MaterializedView structure");
             query_plan.addStep(std::move(converting_step));
         }
@@ -378,71 +378,44 @@ bool StorageMaterializedView::optimize(
     return storage_ptr->optimize(query, metadata_snapshot, partition, final, deduplicate, deduplicate_by_columns, cleanup, local_context);
 }
 
-ContextMutablePtr StorageMaterializedView::createRefreshContext() const
+std::tuple<ContextMutablePtr, std::shared_ptr<ASTInsertQuery>> StorageMaterializedView::prepareRefresh() const
 {
     auto refresh_context = getInMemoryMetadataPtr()->getSQLSecurityOverriddenContext(getContext());
-    refresh_context->setQueryKind(ClientInfo::QueryKind::INITIAL_QUERY);
     /// Generate a random query id.
     refresh_context->setCurrentQueryId("");
-    /// TODO: Set view's definer as the current user in refresh_context, so that the correct user's
-    ///       quotas and permissions apply for this query.
-    return refresh_context;
-}
 
-std::shared_ptr<ASTInsertQuery> StorageMaterializedView::prepareRefresh(bool append, ContextMutablePtr refresh_context, std::optional<StorageID> & out_temp_table_id) const
-{
+    CurrentThread::QueryScope query_scope(refresh_context);
+
     auto inner_table_id = getTargetTableId();
-    StorageID target_table = inner_table_id;
+    auto new_table_name = ".tmp" + generateInnerTableName(getStorageID());
 
-    if (!append)
-    {
-        CurrentThread::QueryScope query_scope(refresh_context);
+    auto db = DatabaseCatalog::instance().getDatabase(inner_table_id.database_name);
 
-        auto db = DatabaseCatalog::instance().getDatabase(inner_table_id.database_name);
-        String db_name = db->getDatabaseName();
-        auto new_table_name = ".tmp" + generateInnerTableName(getStorageID());
+    auto create_table_query = db->getCreateTableQuery(inner_table_id.table_name, getContext());
+    auto & create_query = create_table_query->as<ASTCreateQuery &>();
+    create_query.setTable(new_table_name);
+    create_query.setDatabase(db->getDatabaseName());
+    create_query.create_or_replace = true;
+    create_query.replace_table = true;
+    create_query.uuid = UUIDHelpers::Nil;
 
-        auto create_table_query = db->getCreateTableQuery(inner_table_id.table_name, getContext());
-        auto & create_query = create_table_query->as<ASTCreateQuery &>();
-        create_query.setTable(new_table_name);
-        create_query.setDatabase(db->getDatabaseName());
-        create_query.create_or_replace = true;
-        create_query.replace_table = true;
-        create_query.uuid = UUIDHelpers::Nil;
+    InterpreterCreateQuery create_interpreter(create_table_query, refresh_context);
+    create_interpreter.setInternal(true);
+    create_interpreter.execute();
 
-        InterpreterCreateQuery create_interpreter(create_table_query, refresh_context);
-        create_interpreter.setInternal(true);
-        create_interpreter.execute();
-
-        target_table = DatabaseCatalog::instance().getTable({db_name, new_table_name}, getContext())->getStorageID();
-        out_temp_table_id = target_table;
-    }
+    StorageID fresh_table = DatabaseCatalog::instance().getTable({create_query.getDatabase(), create_query.getTable()}, getContext())->getStorageID();
 
     auto insert_query = std::make_shared<ASTInsertQuery>();
     insert_query->select = getInMemoryMetadataPtr()->getSelectQuery().select_query;
-    insert_query->setTable(target_table.table_name);
-    insert_query->setDatabase(target_table.database_name);
-    insert_query->table_id = target_table;
+    insert_query->setTable(fresh_table.table_name);
+    insert_query->setDatabase(fresh_table.database_name);
+    insert_query->table_id = fresh_table;
 
-    Block header;
-    if (refresh_context->getSettingsRef().allow_experimental_analyzer)
-        header = InterpreterSelectQueryAnalyzer::getSampleBlock(insert_query->select, refresh_context);
-    else
-        header = InterpreterSelectWithUnionQuery(insert_query->select, refresh_context, SelectQueryOptions()).getSampleBlock();
-
-    auto columns = std::make_shared<ASTExpressionList>(',');
-    for (const String & name : header.getNames())
-        columns->children.push_back(std::make_shared<ASTIdentifier>(name));
-    insert_query->columns = std::move(columns);
-
-    return insert_query;
+    return {refresh_context, insert_query};
 }
 
 StorageID StorageMaterializedView::exchangeTargetTable(StorageID fresh_table, ContextPtr refresh_context)
 {
-    /// Known problem: if the target table was ALTERed during refresh, this will effectively revert
-    /// the ALTER.
-
     auto stale_table_id = getTargetTableId();
 
     auto db = DatabaseCatalog::instance().getDatabase(stale_table_id.database_name);
@@ -450,40 +423,15 @@ StorageID StorageMaterializedView::exchangeTargetTable(StorageID fresh_table, Co
 
     CurrentThread::QueryScope query_scope(refresh_context);
 
-    auto rename_query = std::make_shared<ASTRenameQuery>();
-    rename_query->exchange = true;
-    rename_query->addElement(fresh_table.database_name, fresh_table.table_name, stale_table_id.database_name, stale_table_id.table_name);
-
-    InterpreterRenameQuery(rename_query, refresh_context).execute();
+    target_db->renameTable(
+        refresh_context, fresh_table.table_name, *db, stale_table_id.table_name, /*exchange=*/true, /*dictionary=*/false);
 
     std::swap(stale_table_id.database_name, fresh_table.database_name);
     std::swap(stale_table_id.table_name, fresh_table.table_name);
-
     setTargetTableId(std::move(fresh_table));
     return stale_table_id;
 }
 
-void StorageMaterializedView::dropTempTable(StorageID table_id, ContextMutablePtr refresh_context)
-{
-    CurrentThread::QueryScope query_scope(refresh_context);
-
-    try
-    {
-        auto drop_query = std::make_shared<ASTDropQuery>();
-        drop_query->setDatabase(table_id.database_name);
-        drop_query->setTable(table_id.table_name);
-        drop_query->kind = ASTDropQuery::Kind::Drop;
-        drop_query->if_exists = true;
-        drop_query->sync = false;
-
-        InterpreterDropQuery(drop_query, refresh_context).execute();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(&Poco::Logger::get("StorageMaterializedView"), "Failed to drop temporary table after refresh");
-    }
-}
-
 void StorageMaterializedView::alter(
     const AlterCommands & params,
     ContextPtr local_context,
@@ -583,11 +531,25 @@ void StorageMaterializedView::renameInMemory(const StorageID & new_table_id)
     {
         auto new_target_table_name = generateInnerTableName(new_table_id);
 
+        ASTRenameQuery::Elements rename_elements;
         assert(inner_table_id.database_name == old_table_id.database_name);
 
-        auto rename = std::make_shared<ASTRenameQuery>();
-        rename->addElement(inner_table_id.database_name, inner_table_id.table_name, new_table_id.database_name, new_target_table_name);
+        ASTRenameQuery::Element elem
+        {
+            ASTRenameQuery::Table
+            {
+                inner_table_id.database_name.empty() ? nullptr : std::make_shared<ASTIdentifier>(inner_table_id.database_name),
+                std::make_shared<ASTIdentifier>(inner_table_id.table_name)
+            },
+            ASTRenameQuery::Table
+            {
+                new_table_id.database_name.empty() ? nullptr : std::make_shared<ASTIdentifier>(new_table_id.database_name),
+                std::make_shared<ASTIdentifier>(new_target_table_name)
+            }
+        };
+        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);
     }
@@ -615,7 +577,7 @@ void StorageMaterializedView::startup()
 
     if (refresher)
     {
-        refresher->initializeAndStart();
+        refresher->initializeAndStart(std::static_pointer_cast<StorageMaterializedView>(shared_from_this()));
 
         if (refresh_on_start)
             refresher->run();
diff --git a/src/Storages/StorageMaterializedView.h b/src/Storages/StorageMaterializedView.h
index a09ee07b3f6..5ecd2ec3819 100644
--- a/src/Storages/StorageMaterializedView.h
+++ b/src/Storages/StorageMaterializedView.h
@@ -5,7 +5,7 @@
 #include <Storages/IStorage.h>
 #include <Storages/StorageInMemoryMetadata.h>
 
-#include <Storages/MaterializedView/RefreshTask.h>
+#include <Storages/MaterializedView/RefreshTask_fwd.h>
 
 namespace DB
 {
@@ -106,7 +106,7 @@ private:
     /// Will be initialized in constructor
     StorageID target_table_id = StorageID::createEmpty();
 
-    OwnedRefreshTask refresher;
+    RefreshTaskHolder refresher;
     bool refresh_on_start = false;
 
     bool has_inner_table = false;
@@ -119,14 +119,10 @@ private:
 
     void checkStatementCanBeForwarded() const;
 
-    ContextMutablePtr createRefreshContext() const;
-    /// Prepare to refresh a refreshable materialized view: create temporary table and form the
-    /// insert-select query.
-    /// out_temp_table_id may be assigned before throwing an exception, in which case the caller
-    /// must drop the temp table before rethrowing.
-    std::shared_ptr<ASTInsertQuery> prepareRefresh(bool append, ContextMutablePtr refresh_context, std::optional<StorageID> & out_temp_table_id) const;
+    /// Prepare to refresh a refreshable materialized view: create query context, create temporary
+    /// table, form the insert-select query.
+    std::tuple<ContextMutablePtr, std::shared_ptr<ASTInsertQuery>> prepareRefresh() const;
     StorageID exchangeTargetTable(StorageID fresh_table, ContextPtr refresh_context);
-    void dropTempTable(StorageID table, ContextMutablePtr refresh_context);
 
     void setTargetTableId(StorageID id);
     void updateTargetTableId(std::optional<String> database_name, std::optional<String> table_name);
diff --git a/src/Storages/StorageMemory.cpp b/src/Storages/StorageMemory.cpp
index be7ec5afae7..42bac783618 100644
--- a/src/Storages/StorageMemory.cpp
+++ b/src/Storages/StorageMemory.cpp
@@ -161,9 +161,6 @@ StorageSnapshotPtr StorageMemory::getStorageSnapshot(const StorageMetadataPtr &
 {
     auto snapshot_data = std::make_unique<SnapshotData>();
     snapshot_data->blocks = data.get();
-    /// Not guaranteed to match `blocks`, but that's ok. It would probably be better to move
-    /// rows and bytes counters into the MultiVersion-ed struct, then everything would be consistent.
-    snapshot_data->rows_approx = total_size_rows.load(std::memory_order_relaxed);
 
     if (!hasDynamicSubcolumns(metadata_snapshot->getColumns()))
         return std::make_shared<StorageSnapshot>(*this, metadata_snapshot, ColumnsDescription{}, std::move(snapshot_data));
diff --git a/src/Storages/StorageMemory.h b/src/Storages/StorageMemory.h
index 57fccb98e06..5d269cf814d 100644
--- a/src/Storages/StorageMemory.h
+++ b/src/Storages/StorageMemory.h
@@ -42,7 +42,6 @@ public:
     struct SnapshotData : public StorageSnapshot::Data
     {
         std::shared_ptr<const Blocks> blocks;
-        size_t rows_approx = 0;
     };
 
     StorageSnapshotPtr getStorageSnapshot(const StorageMetadataPtr & metadata_snapshot, ContextPtr query_context) const override;
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index f40aa8ae4e8..118219ab441 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -416,7 +416,7 @@ void ReadFromMerge::addFilter(FilterDAGInfo filter)
 {
     output_stream->header = FilterTransform::transformHeader(
             output_stream->header,
-            &filter.actions,
+            filter.actions.get(),
             filter.column_name,
             filter.do_remove_column);
     pushed_down_filters.push_back(std::move(filter));
@@ -602,7 +602,7 @@ std::vector<ReadFromMerge::ChildPlan> ReadFromMerge::createChildrenPlans(SelectQ
                 ASTPtr required_columns_expr_list = std::make_shared<ASTExpressionList>();
                 ASTPtr column_expr;
 
-                auto sample_block = merge_storage_snapshot->metadata->getSampleBlock();
+                auto sample_block = merge_storage_snapshot->getMetadataForQuery()->getSampleBlock();
 
                 for (const auto & column : real_column_names)
                 {
@@ -637,7 +637,7 @@ std::vector<ReadFromMerge::ChildPlan> ReadFromMerge::createChildrenPlans(SelectQ
 
                 auto alias_actions = ExpressionAnalyzer(required_columns_expr_list, syntax_result, context).getActionsDAG(true);
 
-                column_names_as_aliases = alias_actions.getRequiredColumns().getNames();
+                column_names_as_aliases = alias_actions->getRequiredColumns().getNames();
                 if (column_names_as_aliases.empty())
                     column_names_as_aliases.push_back(ExpressionActions::getSmallestColumn(storage_metadata_snapshot->getColumns().getAllPhysical()).name);
             }
@@ -668,7 +668,7 @@ std::vector<ReadFromMerge::ChildPlan> ReadFromMerge::createChildrenPlans(SelectQ
             {
                 auto filter_step = std::make_unique<FilterStep>(
                     child.plan.getCurrentDataStream(),
-                    filter_info.actions.clone(),
+                    filter_info.actions->clone(),
                     filter_info.column_name,
                     filter_info.do_remove_column);
 
@@ -1069,7 +1069,7 @@ void ReadFromMerge::addVirtualColumns(
             column.column = column.type->createColumnConst(0, Field(database_name));
 
             auto adding_column_dag = ActionsDAG::makeAddingColumnActions(std::move(column));
-            auto expression_step = std::make_unique<ExpressionStep>(child.plan.getCurrentDataStream(), std::move(adding_column_dag));
+            auto expression_step = std::make_unique<ExpressionStep>(child.plan.getCurrentDataStream(), adding_column_dag);
             child.plan.addStep(std::move(expression_step));
             plan_header = child.plan.getCurrentDataStream().header;
         }
@@ -1083,7 +1083,7 @@ void ReadFromMerge::addVirtualColumns(
             column.column = column.type->createColumnConst(0, Field(table_name));
 
             auto adding_column_dag = ActionsDAG::makeAddingColumnActions(std::move(column));
-            auto expression_step = std::make_unique<ExpressionStep>(child.plan.getCurrentDataStream(), std::move(adding_column_dag));
+            auto expression_step = std::make_unique<ExpressionStep>(child.plan.getCurrentDataStream(), adding_column_dag);
             child.plan.addStep(std::move(expression_step));
             plan_header = child.plan.getCurrentDataStream().header;
         }
@@ -1098,7 +1098,7 @@ void ReadFromMerge::addVirtualColumns(
             column.column = column.type->createColumnConst(0, Field(database_name));
 
             auto adding_column_dag = ActionsDAG::makeAddingColumnActions(std::move(column));
-            auto expression_step = std::make_unique<ExpressionStep>(child.plan.getCurrentDataStream(), std::move(adding_column_dag));
+            auto expression_step = std::make_unique<ExpressionStep>(child.plan.getCurrentDataStream(), adding_column_dag);
             child.plan.addStep(std::move(expression_step));
             plan_header = child.plan.getCurrentDataStream().header;
         }
@@ -1111,7 +1111,7 @@ void ReadFromMerge::addVirtualColumns(
             column.column = column.type->createColumnConst(0, Field(table_name));
 
             auto adding_column_dag = ActionsDAG::makeAddingColumnActions(std::move(column));
-            auto expression_step = std::make_unique<ExpressionStep>(child.plan.getCurrentDataStream(), std::move(adding_column_dag));
+            auto expression_step = std::make_unique<ExpressionStep>(child.plan.getCurrentDataStream(), adding_column_dag);
             child.plan.addStep(std::move(expression_step));
             plan_header = child.plan.getCurrentDataStream().header;
         }
@@ -1249,7 +1249,7 @@ ReadFromMerge::RowPolicyData::RowPolicyData(RowPolicyFilterPtr row_policy_filter
     auto expression_analyzer = ExpressionAnalyzer{expr, syntax_result, local_context};
 
     actions_dag = expression_analyzer.getActionsDAG(false /* add_aliases */, false /* project_result */);
-    filter_actions = std::make_shared<ExpressionActions>(actions_dag.clone(),
+    filter_actions = std::make_shared<ExpressionActions>(actions_dag,
         ExpressionActionsSettings::fromContext(local_context, CompileExpressions::yes));
     const auto & required_columns = filter_actions->getRequiredColumnsWithTypes();
     const auto & sample_block_columns = filter_actions->getSampleBlock().getNamesAndTypesList();
@@ -1287,12 +1287,12 @@ void ReadFromMerge::RowPolicyData::extendNames(Names & names) const
 
 void ReadFromMerge::RowPolicyData::addStorageFilter(SourceStepWithFilter * step) const
 {
-    step->addFilter(actions_dag.clone(), filter_column_name);
+    step->addFilter(actions_dag, filter_column_name);
 }
 
 void ReadFromMerge::RowPolicyData::addFilterTransform(QueryPlan & plan) const
 {
-    auto filter_step = std::make_unique<FilterStep>(plan.getCurrentDataStream(), actions_dag.clone(), filter_column_name, true /* remove filter column */);
+    auto filter_step = std::make_unique<FilterStep>(plan.getCurrentDataStream(), actions_dag, filter_column_name, true /* remove filter column */);
     plan.addStep(std::move(filter_step));
 }
 
@@ -1485,7 +1485,7 @@ void ReadFromMerge::convertAndFilterSourceStream(
         {
             pipe_columns.emplace_back(NameAndTypePair(alias.name, alias.type));
 
-            ActionsDAG actions_dag(pipe_columns);
+            auto actions_dag = std::make_shared<ActionsDAG>(pipe_columns);
 
             QueryTreeNodePtr query_tree = buildQueryTree(alias.expression, local_context);
             query_tree->setAlias(alias.name);
@@ -1494,13 +1494,13 @@ void ReadFromMerge::convertAndFilterSourceStream(
             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);
+            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 expression_step = std::make_unique<ExpressionStep>(child.plan.getCurrentDataStream(), std::move(actions_dag));
+            actions_dag->addOrReplaceInOutputs(actions_dag->addAlias(*nodes.front(), alias.name));
+            auto expression_step = std::make_unique<ExpressionStep>(child.plan.getCurrentDataStream(), actions_dag);
             child.plan.addStep(std::move(expression_step));
         }
     }
@@ -1515,7 +1515,7 @@ void ReadFromMerge::convertAndFilterSourceStream(
 
             auto dag = std::make_shared<ActionsDAG>(pipe_columns);
             auto actions_dag = expression_analyzer.getActionsDAG(true, false);
-            auto expression_step = std::make_unique<ExpressionStep>(child.plan.getCurrentDataStream(), std::move(actions_dag));
+            auto expression_step = std::make_unique<ExpressionStep>(child.plan.getCurrentDataStream(), actions_dag);
             child.plan.addStep(std::move(expression_step));
         }
     }
@@ -1533,7 +1533,7 @@ void ReadFromMerge::convertAndFilterSourceStream(
                                                                 header.getColumnsWithTypeAndName(),
                                                                 convert_actions_match_columns_mode);
 
-    auto expression_step = std::make_unique<ExpressionStep>(child.plan.getCurrentDataStream(), std::move(convert_actions_dag));
+    auto expression_step = std::make_unique<ExpressionStep>(child.plan.getCurrentDataStream(), convert_actions_dag);
     child.plan.addStep(std::move(expression_step));
 }
 
@@ -1574,7 +1574,7 @@ bool ReadFromMerge::requestReadingInOrder(InputOrderInfoPtr order_info_)
 void ReadFromMerge::applyFilters(ActionDAGNodes added_filter_nodes)
 {
     for (const auto & filter_info : pushed_down_filters)
-        added_filter_nodes.nodes.push_back(&filter_info.actions.findInOutputs(filter_info.column_name));
+        added_filter_nodes.nodes.push_back(&filter_info.actions->findInOutputs(filter_info.column_name));
 
     SourceStepWithFilter::applyFilters(added_filter_nodes);
 
@@ -1625,11 +1625,9 @@ std::tuple<bool /* is_regexp */, ASTPtr> StorageMerge::evaluateDatabaseName(cons
     return {false, ast};
 }
 
-bool StorageMerge::supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr ctx) const
+bool StorageMerge::supportsTrivialCountOptimization(const StorageSnapshotPtr & storage_snapshot, ContextPtr ctx) const
 {
-    /// Here we actually need storage snapshot of all nested tables.
-    /// But to avoid complexity pass nullptr to make more lightweight check in MergeTreeData.
-    return getFirstTable([&](const auto & table) { return !table->supportsTrivialCountOptimization(nullptr, ctx); }) == nullptr;
+    return getFirstTable([&](const auto & table) { return !table->supportsTrivialCountOptimization(storage_snapshot, ctx); }) == nullptr;
 }
 
 std::optional<UInt64> StorageMerge::totalRows(const Settings & settings) const
diff --git a/src/Storages/StorageMerge.h b/src/Storages/StorageMerge.h
index d6f2deca7fd..94b34256d02 100644
--- a/src/Storages/StorageMerge.h
+++ b/src/Storages/StorageMerge.h
@@ -225,7 +225,7 @@ private:
 
     private:
         std::string filter_column_name; // complex filter, may contain logic operations
-        ActionsDAG actions_dag;
+        ActionsDAGPtr actions_dag;
         ExpressionActionsPtr filter_actions;
         StorageMetadataPtr storage_metadata_snapshot;
     };
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index ae3c0e869ad..444b3fbae4c 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -263,7 +263,7 @@ std::optional<UInt64> StorageMergeTree::totalRows(const Settings &) const
     return getTotalActiveSizeInRows();
 }
 
-std::optional<UInt64> StorageMergeTree::totalRowsByPartitionPredicate(const ActionsDAG & filter_actions_dag, ContextPtr local_context) const
+std::optional<UInt64> StorageMergeTree::totalRowsByPartitionPredicate(const ActionsDAGPtr & filter_actions_dag, ContextPtr local_context) const
 {
     auto parts = getVisibleDataPartsVector(local_context);
     return totalRowsByPartitionPredicateImpl(filter_actions_dag, local_context, parts);
@@ -505,24 +505,31 @@ Int64 StorageMergeTree::startMutation(const MutationCommands & commands, Context
         additional_info = fmt::format(" (TID: {}; TIDH: {})", current_tid, current_tid.getHash());
     }
 
-    MergeTreeMutationEntry entry(commands, disk, relative_data_path, insert_increment.get(), current_tid, getContext()->getWriteSettings());
-    Int64 version = increment.get();
-    entry.commit(version);
-    String mutation_id = entry.file_name;
-    if (txn)
-        txn->addMutation(shared_from_this(), mutation_id);
-
+    Int64 version;
     {
         std::lock_guard lock(currently_processing_in_background_mutex);
 
-        auto [it, inserted] = current_mutations_by_version.try_emplace(version, std::move(entry));
+        MergeTreeMutationEntry entry(commands, disk, relative_data_path, insert_increment.get(), current_tid, getContext()->getWriteSettings());
+        version = increment.get();
+        entry.commit(version);
+        String mutation_id = entry.file_name;
+        if (txn)
+            txn->addMutation(shared_from_this(), mutation_id);
+
+        bool alter_conversions_mutations_updated = updateAlterConversionsMutations(entry.commands, alter_conversions_mutations, /* remove= */ false);
+        bool inserted = current_mutations_by_version.try_emplace(version, std::move(entry)).second;
         if (!inserted)
+        {
+            if (alter_conversions_mutations_updated)
+            {
+                --alter_conversions_mutations;
+                chassert(alter_conversions_mutations >= 0);
+            }
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Mutation {} already exists, it's a bug", version);
+        }
 
-        incrementMutationsCounters(num_data_mutations_to_apply, num_metadata_mutations_to_apply, *it->second.commands);
+        LOG_INFO(log, "Added mutation: {}{}", mutation_id, additional_info);
     }
-
-    LOG_INFO(log, "Added mutation: {}{}", mutation_id, additional_info);
     background_operations_assignee.trigger();
     return version;
 }
@@ -556,7 +563,7 @@ void StorageMergeTree::updateMutationEntriesErrors(FutureMergedMutatedPartPtr re
                     if (static_cast<UInt64>(result_part->part_info.mutation) == it->first)
                         mutation_backoff_policy.removePartFromFailed(failed_part->name);
 
-                    decrementMutationsCounters(num_data_mutations_to_apply, num_metadata_mutations_to_apply, *entry.commands);
+                    updateAlterConversionsMutations(it->second.commands, alter_conversions_mutations, /* remove= */ true);
                 }
             }
             else
@@ -756,15 +763,17 @@ std::map<std::string, MutationCommands> StorageMergeTree::getUnfinishedMutationC
 
     std::map<std::string, MutationCommands> result;
 
-    for (const auto & [mutation_version, entry] : current_mutations_by_version)
+    for (const auto & kv : current_mutations_by_version)
     {
-        const PartVersionWithName needle{static_cast<Int64>(mutation_version), ""};
+        Int64 mutation_version = kv.first;
+        const MergeTreeMutationEntry & entry = kv.second;
+        const PartVersionWithName needle{mutation_version, ""};
         auto versions_it = std::lower_bound(
             part_versions_with_names.begin(), part_versions_with_names.end(), needle, comparator);
 
         size_t parts_to_do = versions_it - part_versions_with_names.begin();
         if (parts_to_do > 0)
-            result.emplace(entry.file_name, *entry.commands);
+            result.emplace(entry.file_name, entry.commands);
     }
     return result;
 }
@@ -797,7 +806,7 @@ std::vector<MergeTreeMutationStatus> StorageMergeTree::getMutationsStatus() cons
 
         std::map<String, Int64> block_numbers_map({{"", entry.block_number}});
 
-        for (const MutationCommand & command : *entry.commands)
+        for (const MutationCommand & command : entry.commands)
         {
             WriteBufferFromOwnString buf;
             formatAST(*command.ast, buf, false, true);
@@ -834,15 +843,20 @@ CancellationCode StorageMergeTree::killMutation(const String & mutation_id)
         auto it = current_mutations_by_version.find(mutation_version);
         if (it != current_mutations_by_version.end())
         {
+            bool mutation_finished = true;
             if (std::optional<Int64> min_version = getMinPartDataVersion())
-            {
-                bool mutation_finished = *min_version > static_cast<Int64>(mutation_version);
-                if (!mutation_finished)
-                    decrementMutationsCounters(num_data_mutations_to_apply, num_metadata_mutations_to_apply, *it->second.commands);
-            }
+                mutation_finished = *min_version > static_cast<Int64>(mutation_version);
 
             to_kill.emplace(std::move(it->second));
-            current_mutations_by_version.erase(it);
+
+            if (!mutation_finished)
+            {
+                const auto commands = it->second.commands;
+                current_mutations_by_version.erase(it);
+                updateAlterConversionsMutations(commands, alter_conversions_mutations, /* remove= */ true);
+            }
+            else
+                current_mutations_by_version.erase(it);
         }
     }
 
@@ -881,7 +895,7 @@ void StorageMergeTree::loadDeduplicationLog()
     std::string path = fs::path(relative_data_path) / "deduplication_logs";
 
     /// If either there is already a deduplication log, or we will be able to use it.
-    if (!disk->isReadOnly() || disk->exists(path))
+    if (disk->exists(path) || !disk->isReadOnly())
     {
         deduplication_log = std::make_unique<MergeTreeDeduplicationLog>(path, settings->non_replicated_deduplication_window, format_version, disk);
         deduplication_log->load();
@@ -890,8 +904,6 @@ void StorageMergeTree::loadDeduplicationLog()
 
 void StorageMergeTree::loadMutations()
 {
-    std::lock_guard lock(currently_processing_in_background_mutex);
-
     for (const auto & disk : getDisks())
     {
         for (auto it = disk->iterateDirectory(relative_data_path); it->isValid(); it->next())
@@ -900,7 +912,7 @@ void StorageMergeTree::loadMutations()
             {
                 MergeTreeMutationEntry entry(disk, relative_data_path, it->name());
                 UInt64 block_number = entry.block_number;
-                LOG_DEBUG(log, "Loading mutation: {} entry, commands size: {}", it->name(), entry.commands->size());
+                LOG_DEBUG(log, "Loading mutation: {} entry, commands size: {}", it->name(), entry.commands.size());
 
                 if (!entry.tid.isPrehistoric() && !entry.csn)
                 {
@@ -919,11 +931,10 @@ void StorageMergeTree::loadMutations()
                     }
                 }
 
-                auto [entry_it, inserted] = current_mutations_by_version.try_emplace(block_number, std::move(entry));
+                auto inserted = current_mutations_by_version.try_emplace(block_number, std::move(entry)).second;
                 if (!inserted)
                     throw Exception(ErrorCodes::LOGICAL_ERROR, "Mutation {} already exists, it's a bug", block_number);
-
-                incrementMutationsCounters(num_data_mutations_to_apply, num_metadata_mutations_to_apply, *entry_it->second.commands);
+                updateAlterConversionsMutations(entry.commands, alter_conversions_mutations, /* remove= */ false);
             }
             else if (startsWith(it->name(), "tmp_mutation_"))
             {
@@ -1271,7 +1282,7 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMutate(
 
             size_t commands_size = 0;
             MutationCommands commands_for_size_validation;
-            for (const auto & command : *it->second.commands)
+            for (const auto & command : it->second.commands)
             {
                 if (command.type != MutationCommand::Type::DROP_COLUMN
                     && command.type != MutationCommand::Type::DROP_INDEX
@@ -1315,11 +1326,11 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMutate(
 
             const auto & single_mutation_commands = it->second.commands;
 
-            if (single_mutation_commands->containBarrierCommand())
+            if (single_mutation_commands.containBarrierCommand())
             {
                 if (commands->empty())
                 {
-                    commands->insert(commands->end(), single_mutation_commands->begin(), single_mutation_commands->end());
+                    commands->insert(commands->end(), single_mutation_commands.begin(), single_mutation_commands.end());
                     last_mutation_to_apply = it;
                 }
                 break;
@@ -1327,7 +1338,7 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMutate(
             else
             {
                 current_ast_elements += commands_size;
-                commands->insert(commands->end(), single_mutation_commands->begin(), single_mutation_commands->end());
+                commands->insert(commands->end(), single_mutation_commands.begin(), single_mutation_commands.end());
                 last_mutation_to_apply = it;
             }
 
@@ -1557,12 +1568,10 @@ bool StorageMergeTree::optimize(
 {
     assertNotReadonly();
 
-    if (deduplicate && getInMemoryMetadataPtr()->hasProjections()
-        && getSettings()->deduplicate_merge_projection_mode == DeduplicateMergeProjectionMode::THROW)
-        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+    if (deduplicate && getInMemoryMetadataPtr()->hasProjections())
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
                     "OPTIMIZE DEDUPLICATE query is not supported for table {} as it has projections. "
-                    "User should drop all the projections manually before running the query, "
-                    "or consider drop or rebuild option of deduplicate_merge_projection_mode",
+                    "User should drop all the projections manually before running the query",
                     getStorageID().getTableName());
 
     if (deduplicate)
@@ -2090,22 +2099,9 @@ void StorageMergeTree::replacePartitionFrom(const StoragePtr & source_table, con
     ProfileEventsScope profile_events_scope;
 
     MergeTreeData & src_data = checkStructureAndGetMergeTreeData(source_table, source_metadata_snapshot, my_metadata_snapshot);
-    DataPartsVector src_parts;
-    String partition_id;
-    bool is_all = partition->as<ASTPartition>()->all;
-    if (is_all)
-    {
-        if (replace)
-            throw DB::Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Only support DROP/DETACH/ATTACH PARTITION ALL currently");
-
-        src_parts = src_data.getVisibleDataPartsVector(local_context);
-    }
-    else
-    {
-        partition_id = getPartitionIDFromQuery(partition, local_context);
-        src_parts = src_data.getVisibleDataPartsVectorInPartition(local_context, partition_id);
-    }
+    String partition_id = getPartitionIDFromQuery(partition, local_context);
 
+    DataPartsVector src_parts = src_data.getVisibleDataPartsVectorInPartition(local_context, partition_id);
     MutableDataPartsVector dst_parts;
     std::vector<scope_guard> dst_parts_locks;
 
@@ -2113,9 +2109,6 @@ void StorageMergeTree::replacePartitionFrom(const StoragePtr & source_table, con
 
     for (const DataPartPtr & src_part : src_parts)
     {
-        if (is_all)
-            partition_id = src_part->partition.getID(src_data);
-
         if (!canReplacePartition(src_part))
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                             "Cannot replace partition '{}' because part '{}' has inconsistent granularity with table",
@@ -2460,82 +2453,34 @@ void StorageMergeTree::attachRestoredParts(MutableDataPartsVector && parts)
     }
 }
 
-MutationCommands StorageMergeTree::MutationsSnapshot::getAlterMutationCommandsForPart(const DataPartPtr & part) const
-{
-    MutationCommands result;
-    UInt64 part_data_version = part->info.getDataVersion();
 
-    for (const auto & [mutation_version, commands] : mutations_by_version | std::views::reverse)
+MutationCommands StorageMergeTree::getAlterMutationCommandsForPart(const DataPartPtr & part) const
+{
+    /// NOTE: there is no need to check part metadata_version, since
+    /// ALTER_METADATA cannot be done asynchronously, like in
+    /// ReplicatedMergeTree.
+    chassert(alter_conversions_mutations >= 0);
+    if (alter_conversions_mutations == 0)
+        return {};
+
+    std::lock_guard lock(currently_processing_in_background_mutex);
+
+    UInt64 part_data_version = part->info.getDataVersion();
+    MutationCommands result;
+
+    for (const auto & [mutation_version, entry] : current_mutations_by_version | std::views::reverse)
     {
         if (mutation_version <= part_data_version)
             break;
 
-        for (const auto & command : *commands | std::views::reverse)
-        {
-            if (params.need_data_mutations && AlterConversions::isSupportedDataMutation(command.type))
-                result.push_back(command);
-            else if (AlterConversions::isSupportedMetadataMutation(command.type))
-                result.push_back(command);
-        }
+        for (const auto & command : entry.commands | std::views::reverse)
+            if (AlterConversions::supportsMutationCommandType(command.type))
+                result.emplace_back(command);
     }
 
     return result;
 }
 
-NameSet StorageMergeTree::MutationsSnapshot::getAllUpdatedColumns() const
-{
-    if (!hasDataMutations())
-        return {};
-
-    NameSet res;
-    for (const auto & [version, commands] : mutations_by_version)
-    {
-        auto names = commands->getAllUpdatedColumns();
-        std::move(names.begin(), names.end(), std::inserter(res, res.end()));
-    }
-    return res;
-}
-
-MergeTreeData::MutationsSnapshotPtr StorageMergeTree::getMutationsSnapshot(const IMutationsSnapshot::Params & params) const
-{
-    std::lock_guard lock(currently_processing_in_background_mutex);
-
-    MutationsSnapshot::Info info
-    {
-        .num_data_mutations = num_data_mutations_to_apply,
-        .num_metadata_mutations = num_metadata_mutations_to_apply,
-    };
-
-    auto res = std::make_shared<MutationsSnapshot>(params, std::move(info));
-
-    bool need_data_mutations = res->hasDataMutations();
-    bool need_metadata_mutations = num_metadata_mutations_to_apply > 0;
-
-    if (!need_data_mutations && !need_metadata_mutations)
-        return res;
-
-    for (const auto & [version, entry] : current_mutations_by_version)
-    {
-        bool has_required_command = std::ranges::any_of(*entry.commands, [&](const auto & command)
-        {
-            if (need_data_mutations && AlterConversions::isSupportedDataMutation(command.type))
-                return true;
-
-            if (need_metadata_mutations && AlterConversions::isSupportedMetadataMutation(command.type))
-                return true;
-
-            return false;
-        });
-
-        /// Copy a pointer to all commands to avoid extracting and copying them.
-        /// Required commands will be copied later only for specific parts.
-        if (has_required_command)
-            res->mutations_by_version.emplace(version, entry.commands);
-    }
-
-    return res;
-}
-
 void StorageMergeTree::startBackgroundMovesIfNeeded()
 {
     if (areBackgroundMovesNeeded())
diff --git a/src/Storages/StorageMergeTree.h b/src/Storages/StorageMergeTree.h
index ef333fe3f18..064b51739bd 100644
--- a/src/Storages/StorageMergeTree.h
+++ b/src/Storages/StorageMergeTree.h
@@ -65,7 +65,7 @@ public:
         size_t num_streams) override;
 
     std::optional<UInt64> totalRows(const Settings &) const override;
-    std::optional<UInt64> totalRowsByPartitionPredicate(const ActionsDAG & filter_actions_dag, ContextPtr) const override;
+    std::optional<UInt64> totalRowsByPartitionPredicate(const ActionsDAGPtr & filter_actions_dag, ContextPtr) const override;
     std::optional<UInt64> totalBytes(const Settings &) const override;
     std::optional<UInt64> totalBytesUncompressed(const Settings &) const override;
 
@@ -147,10 +147,8 @@ private:
     DataParts currently_merging_mutating_parts;
 
     std::map<UInt64, MergeTreeMutationEntry> current_mutations_by_version;
-
-    /// Unfinished mutations that are required for AlterConversions.
-    Int64 num_data_mutations_to_apply = 0;
-    Int64 num_metadata_mutations_to_apply = 0;
+    /// Unfinished mutations that is required AlterConversions (see getAlterMutationCommandsForPart())
+    std::atomic<ssize_t> alter_conversions_mutations = 0;
 
     std::atomic<bool> shutdown_called {false};
     std::atomic<bool> flush_called {false};
@@ -310,20 +308,9 @@ private:
         ContextPtr context;
     };
 
-    struct MutationsSnapshot : public IMutationsSnapshot
-    {
-        MutationsSnapshot() = default;
-        MutationsSnapshot(Params params_, Info info_) : IMutationsSnapshot(std::move(params_), std::move(info_)) {}
-
-        using MutationsByVersion = std::map<UInt64, std::shared_ptr<const MutationCommands>>;
-        MutationsByVersion mutations_by_version;
-
-        MutationCommands getAlterMutationCommandsForPart(const MergeTreeData::DataPartPtr & part) const override;
-        std::shared_ptr<MergeTreeData::IMutationsSnapshot> cloneEmpty() const override { return std::make_shared<MutationsSnapshot>(); }
-        NameSet getAllUpdatedColumns() const override;
-    };
-
-    MutationsSnapshotPtr getMutationsSnapshot(const IMutationsSnapshot::Params & params) const override;
+protected:
+    /// Collect mutations that have to be applied on the fly: currently they are only RENAME COLUMN.
+    MutationCommands getAlterMutationCommandsForPart(const DataPartPtr & part) const override;
 };
 
 }
diff --git a/src/Storages/StorageMergeTreeIndex.cpp b/src/Storages/StorageMergeTreeIndex.cpp
index 15728290f19..af9759ad3f7 100644
--- a/src/Storages/StorageMergeTreeIndex.cpp
+++ b/src/Storages/StorageMergeTreeIndex.cpp
@@ -275,7 +275,7 @@ public:
 private:
     std::shared_ptr<StorageMergeTreeIndex> storage;
     Poco::Logger * log;
-    ExpressionActionsPtr virtual_columns_filter;
+    ActionsDAGPtr virtual_columns_filter;
 };
 
 void ReadFromMergeTreeIndex::applyFilters(ActionDAGNodes added_filter_nodes)
@@ -289,9 +289,10 @@ void ReadFromMergeTreeIndex::applyFilters(ActionDAGNodes added_filter_nodes)
             { {}, std::make_shared<DataTypeString>(), StorageMergeTreeIndex::part_name_column.name },
         };
 
-        auto dag = VirtualColumnUtils::splitFilterDagForAllowedInputs(filter_actions_dag->getOutputs().at(0), &block_to_filter);
-        if (dag)
-            virtual_columns_filter = VirtualColumnUtils::buildFilterExpression(std::move(*dag), context);
+        virtual_columns_filter = VirtualColumnUtils::splitFilterDagForAllowedInputs(filter_actions_dag->getOutputs().at(0), &block_to_filter);
+
+        if (virtual_columns_filter)
+            VirtualColumnUtils::buildSetsForDAG(*virtual_columns_filter, context);
     }
 }
 
@@ -344,7 +345,7 @@ void StorageMergeTreeIndex::read(
 
 void ReadFromMergeTreeIndex::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
-    auto filtered_parts = storage->getFilteredDataParts(virtual_columns_filter);
+    auto filtered_parts = storage->getFilteredDataParts(virtual_columns_filter, context);
 
     LOG_DEBUG(log, "Reading index{}from {} parts of table {}",
         storage->with_marks ? " with marks " : " ",
@@ -354,7 +355,7 @@ void ReadFromMergeTreeIndex::initializePipeline(QueryPipelineBuilder & pipeline,
     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 ExpressionActionsPtr & virtual_columns_filter) const
+MergeTreeData::DataPartsVector StorageMergeTreeIndex::getFilteredDataParts(ActionsDAGPtr virtual_columns_filter, const ContextPtr & context) const
 {
     if (!virtual_columns_filter)
         return data_parts;
@@ -364,7 +365,7 @@ MergeTreeData::DataPartsVector StorageMergeTreeIndex::getFilteredDataParts(const
         all_part_names->insert(part->name);
 
     Block filtered_block{{std::move(all_part_names), std::make_shared<DataTypeString>(), part_name_column.name}};
-    VirtualColumnUtils::filterBlockWithExpression(virtual_columns_filter, filtered_block);
+    VirtualColumnUtils::filterBlockWithDAG(virtual_columns_filter, filtered_block, context);
 
     if (!filtered_block.rows())
         return {};
diff --git a/src/Storages/StorageMergeTreeIndex.h b/src/Storages/StorageMergeTreeIndex.h
index ed8274d7d92..652a2d6eeaf 100644
--- a/src/Storages/StorageMergeTreeIndex.h
+++ b/src/Storages/StorageMergeTreeIndex.h
@@ -36,7 +36,7 @@ public:
 private:
     friend class ReadFromMergeTreeIndex;
 
-    MergeTreeData::DataPartsVector getFilteredDataParts(const ExpressionActionsPtr & virtual_columns_filter) const;
+    MergeTreeData::DataPartsVector getFilteredDataParts(ActionsDAGPtr virtual_columns_filter, const ContextPtr & context) const;
 
     StoragePtr source_table;
     bool with_marks;
diff --git a/src/Storages/StoragePostgreSQL.cpp b/src/Storages/StoragePostgreSQL.cpp
index e0a4af68824..d3214e7ed13 100644
--- a/src/Storages/StoragePostgreSQL.cpp
+++ b/src/Storages/StoragePostgreSQL.cpp
@@ -294,7 +294,7 @@ public:
     {
         const auto * array_type = typeid_cast<const DataTypeArray *>(data_type.get());
         const auto & nested = array_type->getNestedType();
-        const auto & array = array_field.safeGet<Array>();
+        const auto & array = array_field.get<Array>();
 
         if (!isArray(nested))
         {
@@ -312,7 +312,7 @@ public:
 
             if (!isArray(nested_array_type->getNestedType()))
             {
-                parseArrayContent(iter->safeGet<Array>(), nested, ostr);
+                parseArrayContent(iter->get<Array>(), nested, ostr);
             }
             else
             {
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index 865a0cbe506..da379a466af 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -221,17 +221,14 @@ void StorageReplicatedMergeTree::setZooKeeper()
     /// strange effects. So we always use only one session for all tables.
     /// (excluding auxiliary zookeepers)
 
+    std::lock_guard lock(current_zookeeper_mutex);
     if (zookeeper_name == default_zookeeper_name)
     {
-        auto new_keeper = getContext()->getZooKeeper();
-        std::lock_guard lock(current_zookeeper_mutex);
-        current_zookeeper = new_keeper;
+        current_zookeeper = getContext()->getZooKeeper();
     }
     else
     {
-        auto new_keeper = getContext()->getAuxiliaryZooKeeper(zookeeper_name);
-        std::lock_guard lock(current_zookeeper_mutex);
-        current_zookeeper = new_keeper;
+        current_zookeeper = getContext()->getAuxiliaryZooKeeper(zookeeper_name);
     }
 }
 
@@ -368,7 +365,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     bool has_zookeeper = getContext()->hasZooKeeper() || getContext()->hasAuxiliaryZooKeeper(zookeeper_name);
     if (has_zookeeper)
     {
-        /// It's possible for getZooKeeper() to timeout if zookeeper host(s) can't
+        /// It's possible for getZooKeeper() to timeout if  zookeeper host(s) can't
         /// be reached. In such cases Poco::Exception is thrown after a connection
         /// timeout - refer to src/Common/ZooKeeper/ZooKeeperImpl.cpp:866 for more info.
         ///
@@ -803,8 +800,7 @@ void StorageReplicatedMergeTree::createNewZooKeeperNodes()
     {
         auto res = future.get();
         if (res.error != Coordination::Error::ZOK && res.error != Coordination::Error::ZNODEEXISTS)
-            throw Coordination::Exception(res.error, "Failed to create new nodes {} at {} with error {}",
-                res.path_created, zookeeper_path, Coordination::errorMessage(res.error));
+            throw Coordination::Exception(res.error, "Failed to create new nodes {} at {}", res.path_created, zookeeper_path);
     }
 }
 
@@ -5197,16 +5193,17 @@ void StorageReplicatedMergeTree::startupImpl(bool from_attach_thread)
 
         startBeingLeader();
 
+        /// Activate replica in a separate thread if we are not calling from attach thread
+        restarting_thread.start(/*schedule=*/!from_attach_thread);
+
         if (from_attach_thread)
         {
             LOG_TRACE(log, "Trying to startup table from right now");
-            /// Try activating replica in the current thread.
+            /// Try activating replica in current thread.
             restarting_thread.run();
-            restarting_thread.start(false);
         }
         else
         {
-            restarting_thread.start(true);
             /// Wait while restarting_thread finishing initialization.
             /// NOTE It does not mean that replication is actually started after receiving this event.
             /// It only means that an attempt to startup replication was made.
@@ -5227,7 +5224,7 @@ void StorageReplicatedMergeTree::startupImpl(bool from_attach_thread)
         session_expired_callback_handler = EventNotifier::instance().subscribe(Coordination::Error::ZSESSIONEXPIRED, [this]()
         {
             LOG_TEST(log, "Received event for expired session. Waking up restarting thread");
-            restarting_thread.start(true);
+            restarting_thread.start();
         });
 
         startBackgroundMovesIfNeeded();
@@ -5296,6 +5293,7 @@ void StorageReplicatedMergeTree::flushAndPrepareForShutdown()
             LOG_TRACE(log, "The attach thread is shutdown");
         }
 
+
         restarting_thread.shutdown(/* part_of_full_shutdown */true);
         /// Explicitly set the event, because the restarting thread will not set it again
         startup_event.set();
@@ -5606,7 +5604,7 @@ std::optional<UInt64> StorageReplicatedMergeTree::totalRows(const Settings & set
     return res;
 }
 
-std::optional<UInt64> StorageReplicatedMergeTree::totalRowsByPartitionPredicate(const ActionsDAG & filter_actions_dag, ContextPtr local_context) const
+std::optional<UInt64> StorageReplicatedMergeTree::totalRowsByPartitionPredicate(const ActionsDAGPtr & filter_actions_dag, ContextPtr local_context) const
 {
     DataPartsVector parts;
     foreachActiveParts([&](auto & part) { parts.push_back(part); }, local_context->getSettingsRef().select_sequential_consistency);
@@ -5706,8 +5704,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, node.proto_send_chunked, node.proto_recv_chunked,
-                SSHKey(), /*jwt*/"", node.quota_key, node.cluster, node.cluster_secret,
+                node.user, node.password, SSHKey(), /*jwt*/"", node.quota_key, node.cluster, node.cluster_secret,
                 "ParallelInsertSelectInititiator",
                 node.compression,
                 node.secure
@@ -5797,12 +5794,10 @@ bool StorageReplicatedMergeTree::optimize(
     if (!is_leader)
         throw Exception(ErrorCodes::NOT_A_LEADER, "OPTIMIZE cannot be done on this replica because it is not a leader");
 
-    if (deduplicate && getInMemoryMetadataPtr()->hasProjections()
-        && getSettings()->deduplicate_merge_projection_mode == DeduplicateMergeProjectionMode::THROW)
-        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+    if (deduplicate && getInMemoryMetadataPtr()->hasProjections())
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
                     "OPTIMIZE DEDUPLICATE query is not supported for table {} as it has projections. "
-                    "User should drop all the projections manually before running the query, "
-                    "or consider drop or rebuild option of deduplicate_merge_projection_mode",
+                    "User should drop all the projections manually before running the query",
                     getStorageID().getTableName());
 
     if (cleanup)
@@ -8033,77 +8028,24 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
     /// First argument is true, because we possibly will add new data to current table.
     auto lock1 = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
     auto lock2 = source_table->lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
+    auto storage_settings_ptr = getSettings();
 
-    const auto storage_settings_ptr = getSettings();
-    const auto source_metadata_snapshot = source_table->getInMemoryMetadataPtr();
-    const auto metadata_snapshot = getInMemoryMetadataPtr();
-    const MergeTreeData & src_data = checkStructureAndGetMergeTreeData(source_table, source_metadata_snapshot, metadata_snapshot);
+    auto source_metadata_snapshot = source_table->getInMemoryMetadataPtr();
+    auto metadata_snapshot = getInMemoryMetadataPtr();
 
-    std::unordered_set<String> partitions;
-    if (partition->as<ASTPartition>()->all)
-    {
-        if (replace)
-            throw DB::Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Only support DROP/DETACH/ATTACH PARTITION ALL currently");
-
-        partitions = src_data.getAllPartitionIds();
-    }
-    else
-    {
-        partitions = std::unordered_set<String>();
-        partitions.emplace(getPartitionIDFromQuery(partition, query_context));
-    }
-    LOG_INFO(log, "Will try to attach {} partitions", partitions.size());
-
-    const Stopwatch watch;
+    Stopwatch watch;
     ProfileEventsScope profile_events_scope;
-    const auto zookeeper = getZooKeeper();
 
-    const 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;
+    MergeTreeData & src_data = checkStructureAndGetMergeTreeData(source_table, source_metadata_snapshot, metadata_snapshot);
+    String partition_id = getPartitionIDFromQuery(partition, query_context);
 
-    std::unique_ptr<ReplicatedMergeTreeLogEntryData> entries[partitions.size()];
-    size_t idx = 0;
-    for (const auto & partition_id : partitions)
-    {
-        entries[idx] = replacePartitionFromImpl(watch,
-                profile_events_scope,
-                metadata_snapshot,
-                src_data,
-                partition_id,
-                zookeeper,
-                replace,
-                zero_copy_enabled,
-                storage_settings_ptr->always_use_copy_instead_of_hardlinks,
-                query_context);
-        ++idx;
-    }
-
-    for (const auto & entry : entries)
-        waitForLogEntryToBeProcessedIfNecessary(*entry, query_context);
-}
-
-std::unique_ptr<ReplicatedMergeTreeLogEntryData> StorageReplicatedMergeTree::replacePartitionFromImpl(
-    const Stopwatch & watch,
-    ProfileEventsScope & profile_events_scope,
-    const StorageMetadataPtr & metadata_snapshot,
-    const MergeTreeData & src_data,
-    const String & partition_id,
-    const ZooKeeperPtr & zookeeper,
-    bool replace,
-    const bool & zero_copy_enabled,
-    const bool & always_use_copy_instead_of_hardlinks,
-    const ContextPtr & query_context)
-{
     /// NOTE: Some covered parts may be missing in src_all_parts if corresponding log entries are not executed yet.
     DataPartsVector src_all_parts = src_data.getVisibleDataPartsVectorInPartition(query_context, partition_id);
+
     LOG_DEBUG(log, "Cloning {} parts", src_all_parts.size());
 
-    std::optional<ZooKeeperMetadataTransaction> txn;
-    if (auto query_txn = query_context->getZooKeeperMetadataTransaction())
-        txn.emplace(query_txn->getZooKeeper(),
-            query_txn->getDatabaseZooKeeperPath(),
-            query_txn->isInitialQuery(),
-            query_txn->getTaskZooKeeperPath());
+    static const String TMP_PREFIX = "tmp_replace_from_";
+    auto zookeeper = getZooKeeper();
 
     /// Retry if alter_partition_version changes
     for (size_t retry = 0; retry < 1000; ++retry)
@@ -8189,9 +8131,11 @@ std::unique_ptr<ReplicatedMergeTreeLogEntryData> StorageReplicatedMergeTree::rep
             UInt64 index = lock->getNumber();
             MergeTreePartInfo dst_part_info(partition_id, index, index, src_part->info.level);
 
+            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 = always_use_copy_instead_of_hardlinks || (zero_copy_enabled && src_part->isStoredOnRemoteDiskWithZeroCopySupport()),
+                .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()
             };
             if (replace)
@@ -8199,7 +8143,7 @@ std::unique_ptr<ReplicatedMergeTreeLogEntryData> StorageReplicatedMergeTree::rep
                 /// Replace can only work on the same disk
                 auto [dst_part, part_lock] = cloneAndLoadDataPart(
                     src_part,
-                    TMP_PREFIX_REPLACE_PARTITION_FROM,
+                    TMP_PREFIX,
                     dst_part_info,
                     metadata_snapshot,
                     clone_params,
@@ -8214,7 +8158,7 @@ std::unique_ptr<ReplicatedMergeTreeLogEntryData> StorageReplicatedMergeTree::rep
                 /// Attach can work on another disk
                 auto [dst_part, part_lock] = cloneAndLoadDataPart(
                     src_part,
-                    TMP_PREFIX_REPLACE_PARTITION_FROM,
+                    TMP_PREFIX,
                     dst_part_info,
                     metadata_snapshot,
                     clone_params,
@@ -8230,15 +8174,15 @@ std::unique_ptr<ReplicatedMergeTreeLogEntryData> StorageReplicatedMergeTree::rep
             part_checksums.emplace_back(hash_hex);
         }
 
-        auto entry = std::make_unique<ReplicatedMergeTreeLogEntryData>();
+        ReplicatedMergeTreeLogEntryData entry;
         {
             auto src_table_id = src_data.getStorageID();
-            entry->type = ReplicatedMergeTreeLogEntryData::REPLACE_RANGE;
-            entry->source_replica = replica_name;
-            entry->create_time = time(nullptr);
-            entry->replace_range_entry = std::make_shared<ReplicatedMergeTreeLogEntryData::ReplaceRangeEntry>();
+            entry.type = ReplicatedMergeTreeLogEntryData::REPLACE_RANGE;
+            entry.source_replica = replica_name;
+            entry.create_time = time(nullptr);
+            entry.replace_range_entry = std::make_shared<ReplicatedMergeTreeLogEntryData::ReplaceRangeEntry>();
 
-            auto & entry_replace = *entry->replace_range_entry;
+            auto & entry_replace = *entry.replace_range_entry;
             entry_replace.drop_range_part_name = drop_range_fake_part_name;
             entry_replace.from_database = src_table_id.database_name;
             entry_replace.from_table = src_table_id.table_name;
@@ -8271,7 +8215,7 @@ std::unique_ptr<ReplicatedMergeTreeLogEntryData> StorageReplicatedMergeTree::rep
                 ephemeral_locks[i].getUnlockOp(ops);
             }
 
-            if (txn)
+            if (auto txn = query_context->getZooKeeperMetadataTransaction())
                 txn->moveOpsTo(ops);
 
             delimiting_block_lock->getUnlockOp(ops);
@@ -8279,7 +8223,7 @@ std::unique_ptr<ReplicatedMergeTreeLogEntryData> StorageReplicatedMergeTree::rep
             ops.emplace_back(zkutil::makeSetRequest(alter_partition_version_path, "", alter_partition_version_stat.version));
             /// Just update version, because merges assignment relies on it
             ops.emplace_back(zkutil::makeSetRequest(fs::path(zookeeper_path) / "log", "", -1));
-            ops.emplace_back(zkutil::makeCreateRequest(fs::path(zookeeper_path) / "log/log-", entry->toString(), zkutil::CreateMode::PersistentSequential));
+            ops.emplace_back(zkutil::makeCreateRequest(fs::path(zookeeper_path) / "log/log-", entry.toString(), zkutil::CreateMode::PersistentSequential));
 
             Transaction transaction(*this, NO_TRANSACTION_RAW);
             {
@@ -8329,11 +8273,14 @@ std::unique_ptr<ReplicatedMergeTreeLogEntryData> StorageReplicatedMergeTree::rep
         }
 
         String log_znode_path = dynamic_cast<const Coordination::CreateResponse &>(*op_results.back()).path_created;
-        entry->znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
+        entry.znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
 
         for (auto & lock : ephemeral_locks)
             lock.assumeUnlocked();
 
+        lock2.reset();
+        lock1.reset();
+
         /// We need to pull the REPLACE_RANGE before cleaning the replaced parts (otherwise CHeckThread may decide that parts are lost)
         queue.pullLogsToQueue(getZooKeeperAndAssertNotReadonly(), {}, ReplicatedMergeTreeQueue::SYNC);
         // No need to block operations further, especially that in case we have to wait for mutation to finish, the intent would block
@@ -8342,7 +8289,10 @@ std::unique_ptr<ReplicatedMergeTreeLogEntryData> StorageReplicatedMergeTree::rep
         parts_holder.clear();
         cleanup_thread.wakeup();
 
-        return entry;
+
+        waitForLogEntryToBeProcessedIfNecessary(entry, query_context);
+
+        return;
     }
 
     throw Exception(
@@ -9253,11 +9203,13 @@ bool StorageReplicatedMergeTree::canUseAdaptiveGranularity() const
             (!has_non_adaptive_index_granularity_parts && !other_replicas_fixed_granularity));
 }
 
-MergeTreeData::MutationsSnapshotPtr StorageReplicatedMergeTree::getMutationsSnapshot(const IMutationsSnapshot::Params & params) const
+
+MutationCommands StorageReplicatedMergeTree::getAlterMutationCommandsForPart(const DataPartPtr & part) const
 {
-    return queue.getMutationsSnapshot(params);
+    return queue.getAlterMutationCommandsForPart(part);
 }
 
+
 void StorageReplicatedMergeTree::startBackgroundMovesIfNeeded()
 {
     if (areBackgroundMovesNeeded())
diff --git a/src/Storages/StorageReplicatedMergeTree.h b/src/Storages/StorageReplicatedMergeTree.h
index c10f66031ef..f96206ce657 100644
--- a/src/Storages/StorageReplicatedMergeTree.h
+++ b/src/Storages/StorageReplicatedMergeTree.h
@@ -37,7 +37,6 @@
 #include <base/defines.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <QueryPipeline/Pipe.h>
-#include <Common/ProfileEventsScope.h>
 #include <Storages/MergeTree/BackgroundJobsAssignee.h>
 #include <Parsers/SyncReplicaMode.h>
 
@@ -160,7 +159,7 @@ public:
         size_t num_streams) override;
 
     std::optional<UInt64> totalRows(const Settings & settings) const override;
-    std::optional<UInt64> totalRowsByPartitionPredicate(const ActionsDAG & filter_actions_dag, ContextPtr context) const override;
+    std::optional<UInt64> totalRowsByPartitionPredicate(const ActionsDAGPtr & filter_actions_dag, ContextPtr context) const override;
     std::optional<UInt64> totalBytes(const Settings & settings) const override;
     std::optional<UInt64> totalBytesUncompressed(const Settings & settings) const override;
 
@@ -933,7 +932,7 @@ private:
     void waitMutationToFinishOnReplicas(
         const Strings & replicas, const String & mutation_id) const;
 
-    MutationsSnapshotPtr getMutationsSnapshot(const IMutationsSnapshot::Params & params) const override;
+    MutationCommands getAlterMutationCommandsForPart(const DataPartPtr & part) const override;
 
     void startBackgroundMovesIfNeeded() override;
 
@@ -1014,18 +1013,6 @@ private:
         DataPartsVector::const_iterator it;
     };
 
-    const String TMP_PREFIX_REPLACE_PARTITION_FROM = "tmp_replace_from_";
-    std::unique_ptr<ReplicatedMergeTreeLogEntryData> replacePartitionFromImpl(
-        const Stopwatch & watch,
-        ProfileEventsScope & profile_events_scope,
-        const StorageMetadataPtr & metadata_snapshot,
-        const MergeTreeData & src_data,
-        const String & partition_id,
-        const zkutil::ZooKeeperPtr & zookeeper,
-        bool replace,
-        const bool & zero_copy_enabled,
-        const bool & always_use_copy_instead_of_hardlinks,
-        const ContextPtr & query_context);
 };
 
 String getPartNamePossiblyFake(MergeTreeDataFormatVersion format_version, const MergeTreePartInfo & part_info);
diff --git a/src/Storages/StorageSQLite.cpp b/src/Storages/StorageSQLite.cpp
index b90b15f3b99..85417a2f2a4 100644
--- a/src/Storages/StorageSQLite.cpp
+++ b/src/Storages/StorageSQLite.cpp
@@ -50,7 +50,6 @@ StorageSQLite::StorageSQLite(
     const String & remote_table_name_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    const String & comment,
     ContextPtr context_)
     : IStorage(table_id_)
     , WithContext(context_->getGlobalContext())
@@ -72,7 +71,6 @@ StorageSQLite::StorageSQLite(
 
     storage_metadata.setConstraints(constraints_);
     setInMemoryMetadata(storage_metadata);
-    storage_metadata.setComment(comment);
 }
 
 
@@ -213,7 +211,7 @@ void registerStorageSQLite(StorageFactory & factory)
         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.comment, args.getContext());
+                                     table_name, args.columns, args.constraints, args.getContext());
     },
     {
         .supports_schema_inference = true,
diff --git a/src/Storages/StorageSQLite.h b/src/Storages/StorageSQLite.h
index 97638ac04cb..ed673123fe0 100644
--- a/src/Storages/StorageSQLite.h
+++ b/src/Storages/StorageSQLite.h
@@ -27,7 +27,6 @@ public:
         const String & remote_table_name_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        const String & comment,
         ContextPtr context_);
 
     std::string getName() const override { return "SQLite"; }
diff --git a/src/Storages/StorageSnapshot.cpp b/src/Storages/StorageSnapshot.cpp
index 13a46990556..aada25168f8 100644
--- a/src/Storages/StorageSnapshot.cpp
+++ b/src/Storages/StorageSnapshot.cpp
@@ -63,6 +63,7 @@ std::shared_ptr<StorageSnapshot> StorageSnapshot::clone(DataPtr data_) const
 {
     auto res = std::make_shared<StorageSnapshot>(storage, metadata, object_columns);
 
+    res->projection = projection;
     res->data = std::move(data_);
 
     return res;
@@ -78,7 +79,7 @@ ColumnsDescription StorageSnapshot::getAllColumnsDescription() const
 
 NamesAndTypesList StorageSnapshot::getColumns(const GetColumnsOptions & options) const
 {
-    auto all_columns = metadata->getColumns().get(options);
+    auto all_columns = getMetadataForQuery()->getColumns().get(options);
 
     if (options.with_extended_objects)
         extendObjectColumns(all_columns, object_columns, options.with_subcolumns);
@@ -112,7 +113,7 @@ NamesAndTypesList StorageSnapshot::getColumnsByNames(const GetColumnsOptions & o
 
 std::optional<NameAndTypePair> StorageSnapshot::tryGetColumn(const GetColumnsOptions & options, const String & column_name) const
 {
-    const auto & columns = metadata->getColumns();
+    const auto & columns = getMetadataForQuery()->getColumns();
     auto column = columns.tryGetColumn(options, column_name);
     if (column && (!column->type->hasDynamicSubcolumnsDeprecated() || !options.with_extended_objects))
         return column;
@@ -188,7 +189,7 @@ Block StorageSnapshot::getSampleBlockForColumns(const Names & column_names) cons
 {
     Block res;
 
-    const auto & columns = metadata->getColumns();
+    const auto & columns = getMetadataForQuery()->getColumns();
     for (const auto & column_name : column_names)
     {
         auto column = columns.tryGetColumnOrSubcolumn(GetColumnsOptions::All, column_name);
@@ -220,7 +221,7 @@ Block StorageSnapshot::getSampleBlockForColumns(const Names & column_names) cons
 ColumnsDescription StorageSnapshot::getDescriptionForColumns(const Names & column_names) const
 {
     ColumnsDescription res;
-    const auto & columns = metadata->getColumns();
+    const auto & columns = getMetadataForQuery()->getColumns();
     for (const auto & name : column_names)
     {
         auto column = columns.tryGetColumnOrSubcolumnDescription(GetColumnsOptions::All, name);
@@ -256,7 +257,7 @@ namespace
 
 void StorageSnapshot::check(const Names & column_names) const
 {
-    const auto & columns = metadata->getColumns();
+    const auto & columns = getMetadataForQuery()->getColumns();
     auto options = GetColumnsOptions(GetColumnsOptions::AllPhysical).withSubcolumns();
 
     if (column_names.empty())
diff --git a/src/Storages/StorageSnapshot.h b/src/Storages/StorageSnapshot.h
index e94d1fc9a26..89e97f2abb8 100644
--- a/src/Storages/StorageSnapshot.h
+++ b/src/Storages/StorageSnapshot.h
@@ -30,6 +30,9 @@ struct StorageSnapshot
     using DataPtr = std::unique_ptr<Data>;
     DataPtr data;
 
+    /// Projection that is used in query.
+    mutable const ProjectionDescription * projection = nullptr;
+
     StorageSnapshot(
         const IStorage & storage_,
         StorageMetadataPtr metadata_);
@@ -79,6 +82,11 @@ struct StorageSnapshot
     void check(const Names & column_names) const;
 
     DataTypePtr getConcreteType(const String & column_name) const;
+
+    void addProjection(const ProjectionDescription * projection_) const { projection = projection_; }
+
+    /// If we have a projection then we should use its metadata.
+    StorageMetadataPtr getMetadataForQuery() const { return projection ? projection->metadata : metadata; }
 };
 
 using StorageSnapshotPtr = std::shared_ptr<StorageSnapshot>;
diff --git a/src/Storages/StorageTableFunction.h b/src/Storages/StorageTableFunction.h
index 345dd62c687..9507eb6ed8a 100644
--- a/src/Storages/StorageTableFunction.h
+++ b/src/Storages/StorageTableFunction.h
@@ -112,7 +112,7 @@ public:
 
             auto step = std::make_unique<ExpressionStep>(
                 query_plan.getCurrentDataStream(),
-                std::move(convert_actions_dag));
+                convert_actions_dag);
 
             step->setStepDescription("Converting columns");
             query_plan.addStep(std::move(step));
diff --git a/src/Storages/StorageTimeSeries.cpp b/src/Storages/StorageTimeSeries.cpp
deleted file mode 100644
index 3ff57aaf3e5..00000000000
--- a/src/Storages/StorageTimeSeries.cpp
+++ /dev/null
@@ -1,477 +0,0 @@
-#include <Storages/StorageTimeSeries.h>
-
-#include <Core/Settings.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/DatabaseCatalog.h>
-#include <Interpreters/InterpreterDropQuery.h>
-#include <Parsers/ASTDropQuery.h>
-#include <Parsers/ASTViewTargets.h>
-#include <Storages/AlterCommands.h>
-#include <Storages/StorageFactory.h>
-#include <Storages/TimeSeries/TimeSeriesColumnNames.h>
-#include <Storages/TimeSeries/TimeSeriesColumnsValidator.h>
-#include <Storages/TimeSeries/TimeSeriesDefinitionNormalizer.h>
-#include <Storages/TimeSeries/TimeSeriesInnerTablesCreator.h>
-#include <Storages/TimeSeries/TimeSeriesSettings.h>
-
-#include <base/insertAtEnd.h>
-#include <filesystem>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int INCORRECT_QUERY;
-    extern const int LOGICAL_ERROR;
-    extern const int NOT_IMPLEMENTED;
-    extern const int SUPPORT_IS_DISABLED;
-    extern const int UNEXPECTED_TABLE_ENGINE;
-}
-
-
-namespace
-{
-    namespace fs = std::filesystem;
-
-    /// Loads TimeSeries storage settings from a create query.
-    std::shared_ptr<const TimeSeriesSettings> getTimeSeriesSettingsFromQuery(const ASTCreateQuery & query)
-    {
-        auto storage_settings = std::make_shared<TimeSeriesSettings>();
-        if (query.storage)
-            storage_settings->loadFromQuery(*query.storage);
-        return storage_settings;
-    }
-
-    /// Creates an inner target table or just makes its storage ID.
-    /// This function is used by the constructor of StorageTimeSeries to find (or create) its target tables.
-    StorageID initTarget(
-        ViewTarget::Kind kind,
-        const ViewTarget * target_info,
-        const ContextPtr & context,
-        const StorageID & time_series_storage_id,
-        const ColumnsDescription & time_series_columns,
-        const TimeSeriesSettings & time_series_settings,
-        LoadingStrictnessLevel mode)
-    {
-        StorageID target_table_id = StorageID::createEmpty();
-
-        bool is_external_target = target_info && !target_info->table_id.empty();
-        if (is_external_target)
-        {
-            /// A target table is specified.
-            target_table_id = target_info->table_id;
-
-            if (mode < LoadingStrictnessLevel::ATTACH)
-            {
-                /// If it's not an ATTACH request then
-                /// check that the specified target table has all the required columns.
-                auto target_table = DatabaseCatalog::instance().getTable(target_table_id, context);
-                auto target_metadata = target_table->getInMemoryMetadataPtr();
-                const auto & target_columns = target_metadata->columns;
-                TimeSeriesColumnsValidator validator{time_series_storage_id, time_series_settings};
-                validator.validateTargetColumns(kind, target_table_id, target_columns);
-            }
-        }
-        else
-        {
-            TimeSeriesInnerTablesCreator inner_tables_creator{context, time_series_storage_id, time_series_columns, time_series_settings};
-            auto inner_uuid = target_info ? target_info->inner_uuid : UUIDHelpers::Nil;
-
-            /// An inner target table should be used.
-            if (mode >= LoadingStrictnessLevel::ATTACH)
-            {
-                /// If it's an ATTACH request, then the inner target table must be already created.
-                target_table_id = inner_tables_creator.getInnerTableID(kind, inner_uuid);
-            }
-            else
-            {
-                /// Create the inner target table.
-                auto inner_table_engine = target_info ? target_info->inner_engine : nullptr;
-                target_table_id = inner_tables_creator.createInnerTable(kind, inner_uuid, inner_table_engine);
-            }
-        }
-
-        return target_table_id;
-    }
-}
-
-
-void StorageTimeSeries::normalizeTableDefinition(ASTCreateQuery & create_query, const ContextPtr & local_context)
-{
-    StorageID time_series_storage_id{create_query.getDatabase(), create_query.getTable()};
-    TimeSeriesSettings time_series_settings;
-    if (create_query.storage)
-        time_series_settings.loadFromQuery(*create_query.storage);
-    std::shared_ptr<const ASTCreateQuery> as_create_query;
-    if (!create_query.as_table.empty())
-    {
-        auto as_database = local_context->resolveDatabase(create_query.as_database);
-        as_create_query = typeid_cast<std::shared_ptr<const ASTCreateQuery>>(
-            DatabaseCatalog::instance().getDatabase(as_database)->getCreateTableQuery(create_query.as_table, local_context));
-    }
-    TimeSeriesDefinitionNormalizer normalizer{time_series_storage_id, time_series_settings, as_create_query.get()};
-    normalizer.normalize(create_query);
-}
-
-
-StorageTimeSeries::StorageTimeSeries(
-    const StorageID & table_id,
-    const ContextPtr & local_context,
-    LoadingStrictnessLevel mode,
-    const ASTCreateQuery & query,
-    const ColumnsDescription & columns,
-    const String & comment)
-    : IStorage(table_id)
-    , WithContext(local_context->getGlobalContext())
-{
-    if (mode <= LoadingStrictnessLevel::CREATE && !local_context->getSettingsRef().allow_experimental_time_series_table)
-    {
-        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
-                        "Experimental TimeSeries table engine "
-                        "is not enabled (the setting 'allow_experimental_time_series_table')");
-    }
-
-    storage_settings = getTimeSeriesSettingsFromQuery(query);
-
-    if (mode < LoadingStrictnessLevel::ATTACH)
-    {
-        TimeSeriesColumnsValidator validator{table_id, *storage_settings};
-        validator.validateColumns(columns);
-    }
-
-    StorageInMemoryMetadata storage_metadata;
-    storage_metadata.setColumns(columns);
-    if (!comment.empty())
-        storage_metadata.setComment(comment);
-    setInMemoryMetadata(storage_metadata);
-
-    has_inner_tables = false;
-
-    for (auto target_kind : {ViewTarget::Data, ViewTarget::Tags, ViewTarget::Metrics})
-    {
-        const ViewTarget * target_info = query.targets ? query.targets->tryGetTarget(target_kind) : nullptr;
-        auto & target = targets.emplace_back();
-        target.kind = target_kind;
-        target.table_id = initTarget(target_kind, target_info, local_context, getStorageID(), columns, *storage_settings, mode);
-        target.is_inner_table = target_info && target_info->table_id.empty();
-
-        if (target_kind == ViewTarget::Metrics && !target.is_inner_table)
-        {
-            auto table = DatabaseCatalog::instance().tryGetTable(target.table_id, getContext());
-            auto metadata = table->getInMemoryMetadataPtr();
-
-            for (const auto & column : metadata->columns)
-                if (column.type->lowCardinality())
-                    throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "External metrics table cannot have LowCardnality columns for now.");
-        }
-
-        has_inner_tables |= target.is_inner_table;
-    }
-}
-
-
-StorageTimeSeries::~StorageTimeSeries() = default;
-
-
-TimeSeriesSettings StorageTimeSeries::getStorageSettings() const
-{
-    return *getStorageSettingsPtr();
-}
-
-void StorageTimeSeries::startup()
-{
-}
-
-void StorageTimeSeries::shutdown(bool)
-{
-}
-
-
-void StorageTimeSeries::drop()
-{
-    /// Sync flag and the setting make sense for Atomic databases only.
-    /// However, with Atomic databases, IStorage::drop() can be called only from a background task in DatabaseCatalog.
-    /// Running synchronous DROP from that task leads to deadlock.
-    dropInnerTableIfAny(/* sync= */ false, getContext());
-}
-
-void StorageTimeSeries::dropInnerTableIfAny(bool sync, ContextPtr local_context)
-{
-    if (!has_inner_tables)
-        return;
-
-    for (const auto & target : targets)
-    {
-        if (target.is_inner_table && DatabaseCatalog::instance().tryGetTable(target.table_id, getContext()))
-        {
-            /// Best-effort to make them work: the inner table name is almost always less than the TimeSeries name (so it's safe to lock DDLGuard).
-            /// (See the comment in StorageMaterializedView::dropInnerTableIfAny.)
-            bool may_lock_ddl_guard = getStorageID().getQualifiedName() < target.table_id.getQualifiedName();
-            InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind::Drop, getContext(), local_context, target.table_id,
-                                                sync, /* ignore_sync_setting= */ true, may_lock_ddl_guard);
-        }
-    }
-}
-
-void StorageTimeSeries::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr local_context, TableExclusiveLockHolder &)
-{
-    if (!has_inner_tables)
-        return;
-
-    for (const auto & target : targets)
-    {
-        /// We truncate only inner tables here.
-        if (target.is_inner_table)
-            InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind::Truncate, getContext(), local_context, target.table_id, /* sync= */ true);
-    }
-}
-
-
-StorageID StorageTimeSeries::getTargetTableId(ViewTarget::Kind target_kind) const
-{
-    for (const auto & target : targets)
-    {
-        if (target.kind == target_kind)
-            return target.table_id;
-    }
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected target kind {}", toString(target_kind));
-}
-
-StoragePtr StorageTimeSeries::getTargetTable(ViewTarget::Kind target_kind, const ContextPtr & local_context) const
-{
-    return DatabaseCatalog::instance().getTable(getTargetTableId(target_kind), local_context);
-}
-
-StoragePtr StorageTimeSeries::tryGetTargetTable(ViewTarget::Kind target_kind, const ContextPtr & local_context) const
-{
-    return DatabaseCatalog::instance().tryGetTable(getTargetTableId(target_kind), local_context);
-}
-
-
-std::optional<UInt64> StorageTimeSeries::totalRows(const Settings & settings) const
-{
-    UInt64 total_rows = 0;
-    if (has_inner_tables)
-    {
-        for (const auto & target : targets)
-        {
-            if (target.is_inner_table)
-            {
-                auto inner_table = DatabaseCatalog::instance().tryGetTable(target.table_id, getContext());
-                if (!inner_table)
-                    return std::nullopt;
-
-                auto total_rows_in_inner_table = inner_table->totalRows(settings);
-                if (!total_rows_in_inner_table)
-                    return std::nullopt;
-
-                total_rows += *total_rows_in_inner_table;
-            }
-        }
-    }
-    return total_rows;
-}
-
-std::optional<UInt64> StorageTimeSeries::totalBytes(const Settings & settings) const
-{
-    UInt64 total_bytes = 0;
-    if (has_inner_tables)
-    {
-        for (const auto & target : targets)
-        {
-            if (target.is_inner_table)
-            {
-                auto inner_table = DatabaseCatalog::instance().tryGetTable(target.table_id, getContext());
-                if (!inner_table)
-                    return std::nullopt;
-
-                auto total_bytes_in_inner_table = inner_table->totalBytes(settings);
-                if (!total_bytes_in_inner_table)
-                    return std::nullopt;
-
-                total_bytes += *total_bytes_in_inner_table;
-            }
-        }
-    }
-    return total_bytes;
-}
-
-std::optional<UInt64> StorageTimeSeries::totalBytesUncompressed(const Settings & settings) const
-{
-    UInt64 total_bytes = 0;
-    if (has_inner_tables)
-    {
-        for (const auto & target : targets)
-        {
-            if (target.is_inner_table)
-            {
-                auto inner_table = DatabaseCatalog::instance().tryGetTable(target.table_id, getContext());
-                if (!inner_table)
-                    return std::nullopt;
-
-                auto total_bytes_in_inner_table = inner_table->totalBytesUncompressed(settings);
-                if (!total_bytes_in_inner_table)
-                    return std::nullopt;
-
-                total_bytes += *total_bytes_in_inner_table;
-            }
-        }
-    }
-    return total_bytes;
-}
-
-Strings StorageTimeSeries::getDataPaths() const
-{
-    Strings data_paths;
-    for (const auto & target : targets)
-    {
-        auto table = DatabaseCatalog::instance().tryGetTable(target.table_id, getContext());
-        if (!table)
-            continue;
-
-        insertAtEnd(data_paths, table->getDataPaths());
-    }
-    return data_paths;
-}
-
-
-bool StorageTimeSeries::optimize(
-    const ASTPtr & query,
-    const StorageMetadataPtr &,
-    const ASTPtr & partition,
-    bool final,
-    bool deduplicate,
-    const Names & deduplicate_by_columns,
-    bool cleanup,
-    ContextPtr local_context)
-{
-    if (!has_inner_tables)
-    {
-        throw Exception(ErrorCodes::INCORRECT_QUERY, "TimeSeries table {} targets only existing tables. Execute the statement directly on it.",
-                        getStorageID().getNameForLogs());
-    }
-
-    bool optimized = false;
-    for (const auto & target : targets)
-    {
-        if (target.is_inner_table)
-        {
-            auto inner_table = DatabaseCatalog::instance().getTable(target.table_id, local_context);
-            optimized |= inner_table->optimize(query, inner_table->getInMemoryMetadataPtr(), partition, final, deduplicate, deduplicate_by_columns, cleanup, local_context);
-        }
-    }
-
-    return optimized;
-}
-
-
-void StorageTimeSeries::checkAlterIsPossible(const AlterCommands & commands, ContextPtr) 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 StorageTimeSeries::alter(const AlterCommands & params, ContextPtr local_context, AlterLockHolder & table_lock_holder)
-{
-    IStorage::alter(params, local_context, table_lock_holder);
-}
-
-
-void StorageTimeSeries::renameInMemory(const StorageID & /* new_table_id */)
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Renaming is not supported by storage {} yet", getName());
-}
-
-
-void StorageTimeSeries::backupData(BackupEntriesCollector & backup_entries_collector, const String & data_path_in_backup, const std::optional<ASTs> &)
-{
-    for (const auto & target : targets)
-    {
-        /// We backup the target table's data only if it's inner.
-        if (target.is_inner_table)
-        {
-            auto table = DatabaseCatalog::instance().getTable(target.table_id, getContext());
-            table->backupData(backup_entries_collector, fs::path{data_path_in_backup} / toString(target.kind), {});
-        }
-    }
-}
-
-void StorageTimeSeries::restoreDataFromBackup(RestorerFromBackup & restorer, const String & data_path_in_backup, const std::optional<ASTs> &)
-{
-    for (const auto & target : targets)
-    {
-        /// We backup the target table's data only if it's inner.
-        if (target.is_inner_table)
-        {
-            auto table = DatabaseCatalog::instance().getTable(target.table_id, getContext());
-            table->restoreDataFromBackup(restorer, fs::path{data_path_in_backup} / toString(target.kind), {});
-        }
-    }
-}
-
-
-void StorageTimeSeries::read(
-    QueryPlan & /* query_plan */,
-    const Names & /* column_names */,
-    const StorageSnapshotPtr & /* storage_snapshot */,
-    SelectQueryInfo & /* query_info */,
-    ContextPtr /* local_context */,
-    QueryProcessingStage::Enum /* processed_stage */,
-    size_t /* max_block_size */,
-    size_t /* num_streams */)
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "SELECT is not supported by storage {} yet", getName());
-}
-
-
-SinkToStoragePtr StorageTimeSeries::write(
-    const ASTPtr & /* query */, const StorageMetadataPtr & /* metadata_snapshot */, ContextPtr /* local_context */, bool /* async_insert */)
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "INSERT is not supported by storage {} yet", getName());
-}
-
-
-std::shared_ptr<StorageTimeSeries> storagePtrToTimeSeries(StoragePtr storage)
-{
-    if (auto res = typeid_cast<std::shared_ptr<StorageTimeSeries>>(storage))
-        return res;
-
-    throw Exception(
-        ErrorCodes::UNEXPECTED_TABLE_ENGINE,
-        "This operation can be executed on a TimeSeries table only, the engine of table {} is not TimeSeries",
-        storage->getStorageID().getNameForLogs());
-}
-
-std::shared_ptr<const StorageTimeSeries> storagePtrToTimeSeries(ConstStoragePtr storage)
-{
-    if (auto res = typeid_cast<std::shared_ptr<const StorageTimeSeries>>(storage))
-        return res;
-
-    throw Exception(
-        ErrorCodes::UNEXPECTED_TABLE_ENGINE,
-        "This operation can be executed on a TimeSeries table only, the engine of table {} is not TimeSeries",
-        storage->getStorageID().getNameForLogs());
-}
-
-
-void registerStorageTimeSeries(StorageFactory & factory)
-{
-    factory.registerStorage("TimeSeries", [](const StorageFactory::Arguments & args)
-    {
-        /// Pass local_context here to convey setting to inner tables.
-        return std::make_shared<StorageTimeSeries>(
-            args.table_id, args.getLocalContext(), args.mode, args.query, args.columns, args.comment);
-    }
-    ,
-    {
-        .supports_settings = true,
-        .supports_schema_inference = true,
-    });
-}
-
-}
diff --git a/src/Storages/StorageTimeSeries.h b/src/Storages/StorageTimeSeries.h
deleted file mode 100644
index 35db3131a0b..00000000000
--- a/src/Storages/StorageTimeSeries.h
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma once
-
-#include <Parsers/ASTSelectQuery.h>
-#include <Parsers/IAST_fwd.h>
-#include <Storages/IStorage_fwd.h>
-#include <Storages/IStorage.h>
-
-
-namespace DB
-{
-struct TimeSeriesSettings;
-using TimeSeriesSettingsPtr = std::shared_ptr<const TimeSeriesSettings>;
-
-/// Represents a table engine to keep time series received by Prometheus protocols.
-/// Examples of using this table engine:
-///
-/// CREATE TABLE ts ENGINE = TimeSeries()
-/// -OR-
-/// CREATE TABLE ts ENGINE = TimeSeries() DATA [db].table1 TAGS [db].table2 METRICS [db].table3
-/// -OR-
-/// CREATE TABLE ts ENGINE = TimeSeries() DATA ENGINE = MergeTree TAGS ENGINE = ReplacingMergeTree METRICS ENGINE = ReplacingMergeTree
-/// -OR-
-/// CREATE TABLE ts (
-///    id UUID DEFAULT reinterpretAsUUID(sipHash128(metric_name, all_tags)) CODEC(ZSTD(3)),
-///    instance LowCardinality(String),
-///    job String
-///    ) ENGINE = TimeSeries()
-///    SETTINGS tags_to_columns = {'instance': 'instance', 'job': 'job'}
-///    DATA ENGINE = ReplicatedMergeTree('zkpath', 'replica'), ...
-///
-class StorageTimeSeries final : public IStorage, WithContext
-{
-public:
-    /// Adds missing columns and reorder columns, and also adds inner table engines if they aren't specified.
-    static void normalizeTableDefinition(ASTCreateQuery & create_query, const ContextPtr & local_context);
-
-    StorageTimeSeries(const StorageID & table_id, const ContextPtr & local_context, LoadingStrictnessLevel mode,
-                      const ASTCreateQuery & query, const ColumnsDescription & columns, const String & comment);
-
-    ~StorageTimeSeries() override;
-
-    std::string getName() const override { return "TimeSeries"; }
-
-    TimeSeriesSettings getStorageSettings() const;
-    TimeSeriesSettingsPtr getStorageSettingsPtr() const { return storage_settings; }
-
-    StorageID getTargetTableId(ViewTarget::Kind target_kind) const;
-    StoragePtr getTargetTable(ViewTarget::Kind target_kind, const ContextPtr & local_context) const;
-    StoragePtr tryGetTargetTable(ViewTarget::Kind target_kind, const ContextPtr & local_context) const;
-
-    void startup() override;
-    void shutdown(bool is_drop) 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;
-
-    SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr context, bool async_insert) override;
-
-    bool optimize(
-        const ASTPtr & query,
-        const StorageMetadataPtr & metadata_snapshot,
-        const ASTPtr & partition,
-        bool final,
-        bool deduplicate,
-        const Names & deduplicate_by_columns,
-        bool cleanup,
-        ContextPtr local_context) override;
-
-    void drop() override;
-    void dropInnerTableIfAny(bool sync, ContextPtr local_context) override;
-
-    void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &) override;
-
-    void renameInMemory(const StorageID & new_table_id) override;
-
-    void checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const override;
-    void alter(const AlterCommands & params, ContextPtr local_context, AlterLockHolder & table_lock_holder) override;
-
-    void backupData(BackupEntriesCollector & backup_entries_collector, const String & data_path_in_backup, const std::optional<ASTs> & partitions) override;
-    void restoreDataFromBackup(RestorerFromBackup & restorer, const String & data_path_in_backup, const std::optional<ASTs> & partitions) override;
-
-    std::optional<UInt64> totalRows(const Settings & settings) const override;
-    std::optional<UInt64> totalBytes(const Settings & settings) const override;
-    std::optional<UInt64> totalBytesUncompressed(const Settings & settings) const override;
-    Strings getDataPaths() const override;
-
-private:
-    TimeSeriesSettingsPtr storage_settings;
-
-    struct Target
-    {
-        ViewTarget::Kind kind;
-        StorageID table_id = StorageID::createEmpty();
-        bool is_inner_table;
-    };
-
-    std::vector<Target> targets;
-    bool has_inner_tables;
-};
-
-std::shared_ptr<StorageTimeSeries> storagePtrToTimeSeries(StoragePtr storage);
-std::shared_ptr<const StorageTimeSeries> storagePtrToTimeSeries(ConstStoragePtr storage);
-
-}
diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp
index 1c7439f9a55..fd7c3976803 100644
--- a/src/Storages/StorageURL.cpp
+++ b/src/Storages/StorageURL.cpp
@@ -36,19 +36,16 @@
 #include <Common/thread_local_rng.h>
 #include <Common/logger_useful.h>
 #include <Common/re2.h>
-
-#include <Formats/SchemaInferenceUtils.h>
 #include <Core/ServerSettings.h>
 #include <Core/Settings.h>
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/HTTPHeaderEntries.h>
 
 #include <algorithm>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <DataTypes/DataTypeMap.h>
-#include <DataTypes/DataTypeString.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Poco/Net/HTTPRequest.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 
 namespace ProfileEvents
 {
@@ -93,22 +90,11 @@ static const std::vector<std::shared_ptr<re2::RE2>> optional_regex_keys = {
     std::make_shared<re2::RE2>(R"(headers.header\[[0-9]*\].value)"),
 };
 
-bool urlWithGlobs(const String & uri)
+static bool urlWithGlobs(const String & uri)
 {
     return (uri.find('{') != std::string::npos && uri.find('}') != std::string::npos) || uri.find('|') != std::string::npos;
 }
 
-String getSampleURI(String uri, ContextPtr context)
-{
-    if (urlWithGlobs(uri))
-    {
-        auto uris = parseRemoteDescription(uri, 0, uri.size(), ',', context->getSettingsRef().glob_expansion_max_elements);
-        if (!uris.empty())
-            return uris[0];
-    }
-    return uri;
-}
-
 static ConnectionTimeouts getHTTPTimeouts(ContextPtr context)
 {
     return ConnectionTimeouts::getHTTPTimeouts(context->getSettingsRef(), context->getServerSettings().keep_alive_timeout);
@@ -166,21 +152,8 @@ IStorageURLBase::IStorageURLBase(
 
     storage_metadata.setConstraints(constraints_);
     storage_metadata.setComment(comment);
-
-    auto virtual_columns_desc = VirtualColumnUtils::getVirtualsForFileLikeStorage(
-        storage_metadata.columns, context_, getSampleURI(uri, context_), format_settings);
-    if (!storage_metadata.getColumns().has("_headers"))
-    {
-        virtual_columns_desc.addEphemeral(
-            "_headers",
-            std::make_shared<DataTypeMap>(
-                std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()),
-                std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())),
-            "");
-    }
-
-    setVirtuals(virtual_columns_desc);
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 }
 
 
@@ -225,7 +198,7 @@ public:
     {
         uris = parseRemoteDescription(uri_, 0, uri_.size(), ',', max_addresses);
 
-        std::optional<ActionsDAG> filter_dag;
+        ActionsDAGPtr filter_dag;
         if (!uris.empty())
             filter_dag = VirtualColumnUtils::createPathAndFileFilterDAG(predicate, virtual_columns);
 
@@ -236,9 +209,7 @@ public:
             for (const auto & uri : uris)
                 paths.push_back(Poco::URI(uri).getPath());
 
-            VirtualColumnUtils::buildSetsForDAG(*filter_dag, context);
-            auto actions = std::make_shared<ExpressionActions>(std::move(*filter_dag));
-            VirtualColumnUtils::filterByPathOrFile(uris, paths, actions, virtual_columns);
+            VirtualColumnUtils::filterByPathOrFile(uris, paths, filter_dag, virtual_columns, context);
         }
     }
 
@@ -305,13 +276,11 @@ StorageURLSource::StorageURLSource(
     const URIParams & params,
     bool glob_url,
     bool need_only_count_)
-    : SourceWithKeyCondition(info.source_header, false)
-    , WithContext(context_)
+    : SourceWithKeyCondition(info.source_header, false), WithContext(context_)
     , name(std::move(name_))
     , columns_description(info.columns_description)
     , requested_columns(info.requested_columns)
-    , need_headers_virtual_column(info.requested_virtual_columns.contains("_headers"))
-    , requested_virtual_columns(info.requested_virtual_columns.eraseNames({"_headers"}))
+    , requested_virtual_columns(info.requested_virtual_columns)
     , block_for_format(info.format_header)
     , uri_iterator(uri_iterator_)
     , format(format_)
@@ -443,31 +412,13 @@ Chunk StorageURLSource::generate()
             size_t chunk_size = 0;
             if (input_format)
                 chunk_size = input_format->getApproxBytesReadForChunk();
-
             progress(num_rows, chunk_size ? chunk_size : chunk.bytes());
             VirtualColumnUtils::addRequestedFileLikeStorageVirtualsToChunk(
-                chunk,
-                requested_virtual_columns,
+                chunk, requested_virtual_columns,
                 {
                     .path = curr_uri.getPath(),
-                    .size = current_file_size,
-                },
-                getContext());
-            chassert(dynamic_cast<ReadWriteBufferFromHTTP *>(read_buf.get()));
-            if (need_headers_virtual_column)
-            {
-                if (!http_response_headers_initialized)
-                {
-                    http_response_headers = dynamic_cast<ReadWriteBufferFromHTTP *>(read_buf.get())->getResponseHeaders();
-                    http_response_headers_initialized = true;
-                }
-
-                auto type = std::make_shared<DataTypeMap>(
-                    std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()),
-                    std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()));
-
-                chunk.addColumn(type->createColumnConst(chunk.getNumRows(), http_response_headers)->convertToFullColumnIfConst());
-            }
+                    .size = current_file_size
+                });
             return chunk;
         }
 
@@ -478,7 +429,6 @@ Chunk StorageURLSource::generate()
         reader.reset();
         input_format.reset();
         read_buf.reset();
-        http_response_headers_initialized = false;
         total_rows_in_file = 0;
     }
     return {};
@@ -512,7 +462,7 @@ std::pair<Poco::URI, std::unique_ptr<ReadWriteBufferFromHTTP>> StorageURLSource:
 
         setCredentials(credentials, request_uri);
 
-        const auto & settings = context_->getSettingsRef();
+        const auto settings = context_->getSettings();
 
         auto proxy_config = getProxyConfiguration(request_uri.getScheme());
 
@@ -619,15 +569,31 @@ StorageURLSink::StorageURLSink(
 
 void StorageURLSink::consume(Chunk & chunk)
 {
-    if (isCancelled())
+    std::lock_guard lock(cancel_mutex);
+    if (cancelled)
         return;
     writer->write(getHeader().cloneWithColumns(chunk.getColumns()));
 }
 
+void StorageURLSink::onCancel()
+{
+    std::lock_guard lock(cancel_mutex);
+    cancelBuffers();
+    releaseBuffers();
+    cancelled = true;
+}
+
+void StorageURLSink::onException(std::exception_ptr)
+{
+    std::lock_guard lock(cancel_mutex);
+    cancelBuffers();
+    releaseBuffers();
+}
+
 void StorageURLSink::onFinish()
 {
+    std::lock_guard lock(cancel_mutex);
     finalizeBuffers();
-    releaseBuffers();
 }
 
 void StorageURLSink::finalizeBuffers()
@@ -771,9 +737,7 @@ namespace
                     {
                         for (const auto & url : options)
                         {
-                            auto format_from_file_name = FormatFactory::instance().tryGetFormatFromFileName(url);
-                            /// Use this format only if we have a schema reader for it.
-                            if (format_from_file_name && FormatFactory::instance().checkIfFormatHasAnySchemaReader(*format_from_file_name))
+                            if (auto format_from_file_name = FormatFactory::instance().tryGetFormatFromFileName(url))
                             {
                                 format = format_from_file_name;
                                 break;
@@ -887,7 +851,7 @@ namespace
             format = format_name;
         }
 
-        String getLastFilePath() const override { return current_url_option; }
+        String getLastFileName() const override { return current_url_option; }
 
         bool supportsLastReadBufferRecreation() const override { return true; }
 
@@ -1208,7 +1172,6 @@ void ReadFromURL::createIterator(const ActionsDAG::Node * predicate)
 void ReadFromURL::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     createIterator(nullptr);
-    const auto & settings = context->getSettingsRef();
 
     if (is_empty_glob)
     {
@@ -1219,6 +1182,7 @@ void ReadFromURL::initializePipeline(QueryPipelineBuilder & pipeline, const Buil
     Pipes pipes;
     pipes.reserve(num_streams);
 
+    const auto & settings = context->getSettingsRef();
     const size_t max_parsing_threads = num_streams >= settings.max_parsing_threads ? 1 : (settings.max_parsing_threads  / num_streams);
 
     for (size_t i = 0; i < num_streams; ++i)
@@ -1360,7 +1324,7 @@ std::optional<time_t> IStorageURLBase::tryGetLastModificationTime(
     const Poco::Net::HTTPBasicCredentials & credentials,
     const ContextPtr & context)
 {
-    const auto & settings = context->getSettingsRef();
+    auto settings = context->getSettingsRef();
 
     auto uri = Poco::URI(url);
 
@@ -1434,11 +1398,6 @@ StorageURLWithFailover::StorageURLWithFailover(
     }
 }
 
-StorageURLSink::~StorageURLSink()
-{
-    if (isCancelled())
-        cancelBuffers();
-}
 
 FormatSettings StorageURL::getFormatSettingsFromArgs(const StorageFactory::Arguments & args)
 {
@@ -1629,5 +1588,4 @@ void registerStorageURL(StorageFactory & factory)
             .source_access_type = AccessType::URL,
         });
 }
-
 }
diff --git a/src/Storages/StorageURL.h b/src/Storages/StorageURL.h
index 6f1d544629a..1804079e75f 100644
--- a/src/Storages/StorageURL.h
+++ b/src/Storages/StorageURL.h
@@ -141,9 +141,6 @@ private:
     virtual Block getHeaderBlock(const Names & column_names, const StorageSnapshotPtr & storage_snapshot) const = 0;
 };
 
-bool urlWithGlobs(const String & uri);
-
-String getSampleURI(String uri, ContextPtr context);
 
 class StorageURLSource : public SourceWithKeyCondition, WithContext
 {
@@ -188,7 +185,7 @@ public:
 
     String getName() const override { return name; }
 
-    void setKeyCondition(const std::optional<ActionsDAG> & filter_actions_dag, ContextPtr context_) override
+    void setKeyCondition(const ActionsDAGPtr & filter_actions_dag, ContextPtr context_) override
     {
         setKeyConditionImpl(filter_actions_dag, context_, block_for_format);
     }
@@ -220,7 +217,6 @@ private:
     String name;
     ColumnsDescription columns_description;
     NamesAndTypesList requested_columns;
-    bool need_headers_virtual_column;
     NamesAndTypesList requested_virtual_columns;
     Block block_for_format;
     std::shared_ptr<IteratorWrapper> uri_iterator;
@@ -232,15 +228,12 @@ private:
     bool need_only_count;
     size_t total_rows_in_file = 0;
 
-    Poco::Net::HTTPBasicCredentials credentials;
-
-    Map http_response_headers;
-    bool http_response_headers_initialized = false;
-
     std::unique_ptr<ReadBuffer> read_buf;
     std::shared_ptr<IInputFormat> input_format;
     std::unique_ptr<QueryPipeline> pipeline;
     std::unique_ptr<PullingPipelineExecutor> reader;
+
+    Poco::Net::HTTPBasicCredentials credentials;
 };
 
 class StorageURLSink : public SinkToStorage
@@ -257,10 +250,10 @@ public:
         const HTTPHeaderEntries & headers = {},
         const String & method = Poco::Net::HTTPRequest::HTTP_POST);
 
-    ~StorageURLSink() override;
-
     std::string getName() const override { return "StorageURLSink"; }
     void consume(Chunk & chunk) override;
+    void onCancel() override;
+    void onException(std::exception_ptr exception) override;
     void onFinish() override;
 
 private:
@@ -270,6 +263,8 @@ private:
 
     std::unique_ptr<WriteBuffer> write_buf;
     OutputFormatPtr writer;
+    std::mutex cancel_mutex;
+    bool cancelled = false;
 };
 
 class StorageURL : public IStorageURLBase
diff --git a/src/Storages/StorageURLCluster.cpp b/src/Storages/StorageURLCluster.cpp
index 140413d78b0..69041482fd8 100644
--- a/src/Storages/StorageURLCluster.cpp
+++ b/src/Storages/StorageURLCluster.cpp
@@ -75,8 +75,8 @@ StorageURLCluster::StorageURLCluster(
     }
 
     storage_metadata.setConstraints(constraints_);
-    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.columns, context, getSampleURI(uri, context)));
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 }
 
 void StorageURLCluster::updateQueryToSendIfNeeded(ASTPtr & query, const StorageSnapshotPtr & storage_snapshot, const ContextPtr & context)
diff --git a/src/Storages/StorageValues.cpp b/src/Storages/StorageValues.cpp
index c1ca6244866..894b1404a21 100644
--- a/src/Storages/StorageValues.cpp
+++ b/src/Storages/StorageValues.cpp
@@ -48,14 +48,14 @@ Pipe StorageValues::read(
 
     if (!prepared_pipe.empty())
     {
-        ActionsDAG dag(prepared_pipe.getHeader().getColumnsWithTypeAndName());
+        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)]);
+            outputs.push_back(dag->getOutputs()[prepared_pipe.getHeader().getPositionByName(name)]);
 
-        dag.getOutputs().swap(outputs);
-        auto expression = std::make_shared<ExpressionActions>(std::move(dag));
+        dag->getOutputs().swap(outputs);
+        auto expression = std::make_shared<ExpressionActions>(dag);
 
         prepared_pipe.addSimpleTransform([&](const Block & header)
         {
diff --git a/src/Storages/StorageView.cpp b/src/Storages/StorageView.cpp
index 878998ebf12..5f768bce978 100644
--- a/src/Storages/StorageView.cpp
+++ b/src/Storages/StorageView.cpp
@@ -97,7 +97,7 @@ bool hasJoin(const ASTSelectWithUnionQuery & ast)
 ContextPtr getViewContext(ContextPtr context, const StorageSnapshotPtr & storage_snapshot)
 {
     auto view_context = storage_snapshot->metadata->getSQLSecurityOverriddenContext(context);
-    Settings view_settings = view_context->getSettingsCopy();
+    Settings view_settings = view_context->getSettings();
     view_settings.max_result_rows = 0;
     view_settings.max_result_bytes = 0;
     view_settings.extremes = false;
@@ -179,8 +179,8 @@ void StorageView::read(
 
     /// It's expected that the columns read from storage are not constant.
     /// Because method 'getSampleBlockForColumns' is used to obtain a structure of result in InterpreterSelectQuery.
-    ActionsDAG materializing_actions(query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName());
-    materializing_actions.addMaterializingOutputActions();
+    auto materializing_actions = std::make_shared<ActionsDAG>(query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName());
+    materializing_actions->addMaterializingOutputActions();
 
     auto materializing = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), std::move(materializing_actions));
     materializing->setStepDescription("Materialize constants after VIEW subquery");
@@ -205,7 +205,7 @@ void StorageView::read(
             expected_header.getColumnsWithTypeAndName(),
             ActionsDAG::MatchColumnsMode::Name);
 
-    auto converting = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), std::move(convert_actions_dag));
+    auto converting = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), convert_actions_dag);
     converting->setStepDescription("Convert VIEW subquery result to VIEW table structure");
     query_plan.addStep(std::move(converting));
 }
diff --git a/src/Storages/System/IStorageSystemOneBlock.cpp b/src/Storages/System/IStorageSystemOneBlock.cpp
index b8f32fcdb83..d932dc902d4 100644
--- a/src/Storages/System/IStorageSystemOneBlock.cpp
+++ b/src/Storages/System/IStorageSystemOneBlock.cpp
@@ -45,7 +45,7 @@ public:
 private:
     std::shared_ptr<IStorageSystemOneBlock> storage;
     std::vector<UInt8> columns_mask;
-    std::optional<ActionsDAG> filter;
+    ActionsDAGPtr filter;
 };
 
 void IStorageSystemOneBlock::read(
diff --git a/src/Storages/System/StorageSystemBuildOptions.cpp.in b/src/Storages/System/StorageSystemBuildOptions.cpp.in
index 9e5adbfe825..a81bcb08bfc 100644
--- a/src/Storages/System/StorageSystemBuildOptions.cpp.in
+++ b/src/Storages/System/StorageSystemBuildOptions.cpp.in
@@ -21,7 +21,7 @@ const char * auto_config_build[]
     "BUILD_COMPILE_DEFINITIONS", "@BUILD_COMPILE_DEFINITIONS@",
     "USE_EMBEDDED_COMPILER", "@USE_EMBEDDED_COMPILER@",
     "USE_GLIBC_COMPATIBILITY", "@GLIBC_COMPATIBILITY@",
-    "USE_JEMALLOC", "@USE_JEMALLOC@",
+    "USE_JEMALLOC", "@ENABLE_JEMALLOC@",
     "USE_ICU", "@USE_ICU@",
     "USE_H3", "@USE_H3@",
     "USE_MYSQL", "@USE_MYSQL@",
@@ -36,7 +36,7 @@ const char * auto_config_build[]
     "USE_SSL", "@USE_SSL@",
     "OPENSSL_VERSION", "@OPENSSL_VERSION@",
     "OPENSSL_IS_BORING_SSL", "@OPENSSL_IS_BORING_SSL@",
-    "USE_VECTORSCAN", "@USE_VECTORSCAN@",
+    "USE_VECTORSCAN", "@ENABLE_VECTORSCAN@",
     "USE_SIMDJSON", "@USE_SIMDJSON@",
     "USE_ODBC", "@USE_ODBC@",
     "USE_GRPC", "@USE_GRPC@",
@@ -62,8 +62,8 @@ const char * auto_config_build[]
     "USE_ARROW", "@USE_ARROW@",
     "USE_ORC", "@USE_ORC@",
     "USE_MSGPACK", "@USE_MSGPACK@",
-    "USE_QPL", "@USE_QPL@",
-    "USE_QATLIB", "@USE_QATLIB@",
+    "USE_QPL", "@ENABLE_QPL@",
+    "USE_QAT", "@ENABLE_QATLIB@",
     "GIT_HASH", "@GIT_HASH@",
     "GIT_BRANCH", R"IRjaNsZIL9Yh7FQ4(@GIT_BRANCH@)IRjaNsZIL9Yh7FQ4",
     "GIT_DATE", "@GIT_DATE@",
diff --git a/src/Storages/System/StorageSystemClusters.cpp b/src/Storages/System/StorageSystemClusters.cpp
index 9493d2c97ab..160c8d6270e 100644
--- a/src/Storages/System/StorageSystemClusters.cpp
+++ b/src/Storages/System/StorageSystemClusters.cpp
@@ -1,4 +1,3 @@
-#include <optional>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
@@ -32,8 +31,6 @@ ColumnsDescription StorageSystemClusters::getColumnsDescription()
         {"database_shard_name", std::make_shared<DataTypeString>(), "The name of the `Replicated` database shard (for clusters that belong to a `Replicated` database)."},
         {"database_replica_name", std::make_shared<DataTypeString>(), "The name of the `Replicated` database replica (for clusters that belong to a `Replicated` database)."},
         {"is_active", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt8>()), "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'."},
-        {"replication_lag", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt32>()), "The replication lag of the `Replicated` database replica (for clusters that belong to a Replicated database)."},
-        {"recovery_time", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()), "The recovery time of the `Replicated` database replica (for clusters that belong to a Replicated database), in milliseconds."},
     };
 
     description.setAliases({
@@ -43,10 +40,10 @@ ColumnsDescription StorageSystemClusters::getColumnsDescription()
     return description;
 }
 
-void StorageSystemClusters::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8> columns_mask) 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, columns_mask, name_and_cluster, /* replicated= */ nullptr);
+        writeCluster(res_columns, name_and_cluster, {});
 
     const auto databases = DatabaseCatalog::instance().getDatabases();
     for (const auto & name_and_database : databases)
@@ -55,26 +52,24 @@ void StorageSystemClusters::fillData(MutableColumns & res_columns, ContextPtr co
         {
 
             if (auto database_cluster = replicated->tryGetCluster())
-                writeCluster(res_columns, columns_mask, {name_and_database.first, database_cluster}, replicated);
+                writeCluster(res_columns, {name_and_database.first, database_cluster},
+                             replicated->tryGetAreReplicasActive(database_cluster));
 
             if (auto database_cluster = replicated->tryGetAllGroupsCluster())
-                writeCluster(res_columns, columns_mask, {DatabaseReplicated::ALL_GROUPS_CLUSTER_PREFIX + name_and_database.first, database_cluster}, replicated);
+                writeCluster(res_columns, {DatabaseReplicated::ALL_GROUPS_CLUSTER_PREFIX + name_and_database.first, database_cluster},
+                             replicated->tryGetAreReplicasActive(database_cluster));
         }
     }
 }
 
-void StorageSystemClusters::writeCluster(MutableColumns & res_columns, const std::vector<UInt8> & columns_mask, const NameAndCluster & name_and_cluster, const DatabaseReplicated * replicated)
+void StorageSystemClusters::writeCluster(MutableColumns & res_columns, const NameAndCluster & name_and_cluster,
+                                         const std::vector<UInt8> & is_active)
 {
     const String & cluster_name = name_and_cluster.first;
     const ClusterPtr & cluster = name_and_cluster.second;
     const auto & shards_info = cluster->getShardsInfo();
     const auto & addresses_with_failover = cluster->getShardsAddresses();
 
-    size_t recovery_time_column_idx = columns_mask.size() - 1, replication_lag_column_idx = columns_mask.size() - 2, is_active_column_idx = columns_mask.size() - 3;
-    ReplicasInfo replicas_info;
-    if (replicated && (columns_mask[recovery_time_column_idx] || columns_mask[replication_lag_column_idx] || columns_mask[is_active_column_idx]))
-        replicas_info = replicated->tryGetReplicasInfo(name_and_cluster.second);
-
     size_t replica_idx = 0;
     for (size_t shard_index = 0; shard_index < shards_info.size(); ++shard_index)
     {
@@ -84,84 +79,30 @@ void StorageSystemClusters::writeCluster(MutableColumns & res_columns, const std
 
         for (size_t replica_index = 0; replica_index < shard_addresses.size(); ++replica_index)
         {
-            size_t src_index = 0, res_index = 0;
+            size_t i = 0;
             const auto & address = shard_addresses[replica_index];
 
-            if (columns_mask[src_index++])
-                res_columns[res_index++]->insert(cluster_name);
-            if (columns_mask[src_index++])
-                res_columns[res_index++]->insert(shard_info.shard_num);
-            if (columns_mask[src_index++])
-                res_columns[res_index++]->insert(shard_info.weight);
-            if (columns_mask[src_index++])
-                res_columns[res_index++]->insert(shard_info.has_internal_replication);
-            if (columns_mask[src_index++])
-                res_columns[res_index++]->insert(replica_index + 1);
-            if (columns_mask[src_index++])
-                res_columns[res_index++]->insert(address.host_name);
-            if (columns_mask[src_index++])
-            {
-                auto resolved = address.getResolvedAddress();
-                res_columns[res_index++]->insert(resolved ? resolved->host().toString() : String());
-            }
-            if (columns_mask[src_index++])
-                res_columns[res_index++]->insert(address.port);
-            if (columns_mask[src_index++])
-                res_columns[res_index++]->insert(address.is_local);
-            if (columns_mask[src_index++])
-                res_columns[res_index++]->insert(address.user);
-            if (columns_mask[src_index++])
-                res_columns[res_index++]->insert(address.default_database);
-            if (columns_mask[src_index++])
-                res_columns[res_index++]->insert(pool_status[replica_index].error_count);
-            if (columns_mask[src_index++])
-                res_columns[res_index++]->insert(pool_status[replica_index].slowdown_count);
-            if (columns_mask[src_index++])
-                res_columns[res_index++]->insert(pool_status[replica_index].estimated_recovery_time.count());
-            if (columns_mask[src_index++])
-                res_columns[res_index++]->insert(address.database_shard_name);
-            if (columns_mask[src_index++])
-                res_columns[res_index++]->insert(address.database_replica_name);
-
-            /// make sure these three columns remain the last ones
-            if (columns_mask[src_index++])
-            {
-                if (replicas_info.empty())
-                    res_columns[res_index++]->insertDefault();
-                else
-                {
-                    const auto & replica_info = replicas_info[replica_idx];
-                    res_columns[res_index++]->insert(replica_info.is_active);
-                }
-            }
-            if (columns_mask[src_index++])
-            {
-                if (replicas_info.empty())
-                    res_columns[res_index++]->insertDefault();
-                else
-                {
-                    const auto & replica_info = replicas_info[replica_idx];
-                    if (replica_info.replication_lag != std::nullopt)
-                        res_columns[res_index++]->insert(*replica_info.replication_lag);
-                    else
-                        res_columns[res_index++]->insertDefault();
-                }
-            }
-            if (columns_mask[src_index++])
-            {
-                if (replicas_info.empty())
-                    res_columns[res_index++]->insertDefault();
-                else
-                {
-                    const auto & replica_info = replicas_info[replica_idx];
-                    if (replica_info.recovery_time != 0)
-                        res_columns[res_index++]->insert(replica_info.recovery_time);
-                    else
-                        res_columns[res_index++]->insertDefault();
-                }
-            }
-
-            ++replica_idx;
+            res_columns[i++]->insert(cluster_name);
+            res_columns[i++]->insert(shard_info.shard_num);
+            res_columns[i++]->insert(shard_info.weight);
+            res_columns[i++]->insert(shard_info.has_internal_replication);
+            res_columns[i++]->insert(replica_index + 1);
+            res_columns[i++]->insert(address.host_name);
+            auto resolved = address.getResolvedAddress();
+            res_columns[i++]->insert(resolved ? resolved->host().toString() : String());
+            res_columns[i++]->insert(address.port);
+            res_columns[i++]->insert(address.is_local);
+            res_columns[i++]->insert(address.user);
+            res_columns[i++]->insert(address.default_database);
+            res_columns[i++]->insert(pool_status[replica_index].error_count);
+            res_columns[i++]->insert(pool_status[replica_index].slowdown_count);
+            res_columns[i++]->insert(pool_status[replica_index].estimated_recovery_time.count());
+            res_columns[i++]->insert(address.database_shard_name);
+            res_columns[i++]->insert(address.database_replica_name);
+            if (is_active.empty())
+                res_columns[i++]->insertDefault();
+            else
+                res_columns[i++]->insert(is_active[replica_idx++]);
         }
     }
 }
diff --git a/src/Storages/System/StorageSystemClusters.h b/src/Storages/System/StorageSystemClusters.h
index a5f6d551ca1..0f7c792261d 100644
--- a/src/Storages/System/StorageSystemClusters.h
+++ b/src/Storages/System/StorageSystemClusters.h
@@ -1,16 +1,15 @@
 #pragma once
 
-#include <Databases/DatabaseReplicated.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
+
 namespace DB
 {
 
 class Context;
 class Cluster;
-class DatabaseReplicated;
 
 /** Implements system table 'clusters'
   *  that allows to obtain information about available clusters
@@ -27,9 +26,8 @@ protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
     using NameAndCluster = std::pair<String, std::shared_ptr<Cluster>>;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8> columns_mask) const override;
-    static void writeCluster(MutableColumns & res_columns, const std::vector<UInt8> & columns_mask, const NameAndCluster & name_and_cluster, const DatabaseReplicated * replicated);
-    bool supportsColumnsMask() const override { return true; }
+    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/StorageSystemColumns.cpp b/src/Storages/System/StorageSystemColumns.cpp
index bc13cb77d5e..f48aeba026b 100644
--- a/src/Storages/System/StorageSystemColumns.cpp
+++ b/src/Storages/System/StorageSystemColumns.cpp
@@ -105,8 +105,8 @@ protected:
 
         while (rows_count < max_block_size && db_table_num < total_tables)
         {
-            const std::string database_name = (*databases)[db_table_num].safeGet<std::string>();
-            const std::string table_name = (*tables)[db_table_num].safeGet<std::string>();
+            const std::string database_name = (*databases)[db_table_num].get<std::string>();
+            const std::string table_name = (*tables)[db_table_num].get<std::string>();
             ++db_table_num;
 
             ColumnsDescription columns;
@@ -338,7 +338,7 @@ private:
     std::shared_ptr<StorageSystemColumns> storage;
     std::vector<UInt8> columns_mask;
     const size_t max_block_size;
-    std::optional<ActionsDAG> virtual_columns_filter;
+    ActionsDAGPtr virtual_columns_filter;
 };
 
 void ReadFromSystemColumns::applyFilters(ActionDAGNodes added_filter_nodes)
@@ -437,7 +437,7 @@ void ReadFromSystemColumns::initializePipeline(QueryPipelineBuilder & pipeline,
 
         for (size_t i = 0; i < num_databases; ++i)
         {
-            const std::string database_name = (*database_column)[i].safeGet<std::string>();
+            const std::string database_name = (*database_column)[i].get<std::string>();
             if (database_name.empty())
             {
                 for (auto & [table_name, table] : external_tables)
@@ -468,7 +468,7 @@ void ReadFromSystemColumns::initializePipeline(QueryPipelineBuilder & pipeline,
 
     /// Filter block with `database` and `table` columns.
     if (virtual_columns_filter)
-        VirtualColumnUtils::filterBlockWithPredicate(virtual_columns_filter->getOutputs().at(0), block_to_filter, context);
+        VirtualColumnUtils::filterBlockWithDAG(virtual_columns_filter, block_to_filter, context);
 
     if (!block_to_filter.rows())
     {
diff --git a/src/Storages/System/StorageSystemContributors.generated.cpp b/src/Storages/System/StorageSystemContributors.generated.cpp
index 67dfe3bfe86..35b9c0008c6 100644
--- a/src/Storages/System/StorageSystemContributors.generated.cpp
+++ b/src/Storages/System/StorageSystemContributors.generated.cpp
@@ -457,7 +457,6 @@ const char * auto_contributors[] {
     "Gleb-Tretyakov",
     "GoGoWen2021",
     "Gosha Letov",
-    "Graham Campbell",
     "Gregory",
     "Grigorii Sokolik",
     "Grigory",
@@ -473,7 +472,6 @@ const char * auto_contributors[] {
     "Habibullah Oladepo",
     "HaiBo Li",
     "Hakob Saghatelyan",
-    "Halersson Paris",
     "Hamoon",
     "Han Fei",
     "Han Shukai",
@@ -543,7 +541,6 @@ const char * auto_contributors[] {
     "JackyWoo",
     "Jacob Hayes",
     "Jacob Herrington",
-    "Jacob Reckhard",
     "Jai Jhala",
     "Jake Bamrah",
     "Jake Liu",
@@ -664,7 +661,6 @@ const char * auto_contributors[] {
     "LaurieLY",
     "Lee sungju",
     "Lemore",
-    "Lennard Eijsackers",
     "Leonardo Cecchi",
     "Leonardo Maciel",
     "Leonid Krylov",
@@ -926,7 +922,6 @@ const char * auto_contributors[] {
     "Pervakov Grigorii",
     "Pervakov Grigory",
     "Peter",
-    "Peter Nguyen",
     "Petr Vasilev",
     "Pham Anh Tuan",
     "Philip Hallstrom",
@@ -986,7 +981,6 @@ const char * auto_contributors[] {
     "Ronald Bradford",
     "Rory Crispin",
     "Roy Bellingan",
-    "Ruihang Xia",
     "Ruslan",
     "Ruslan Mardugalliamov",
     "Ruslan Savchenko",
@@ -1006,11 +1000,9 @@ const char * auto_contributors[] {
     "Sami Kerola",
     "Samuel Chou",
     "Samuel Colvin",
-    "Samuele Guerrini",
     "San",
     "Sanjam Panda",
     "Sariel",
-    "Sasha Sheikin",
     "Saulius Valatka",
     "Sean Haynes",
     "Sean Lafferty",
@@ -1210,7 +1202,6 @@ const char * auto_contributors[] {
     "Vladimir Makarov",
     "Vladimir Mihailenco",
     "Vladimir Smirnov",
-    "Vladimir Varankin",
     "Vladislav Rassokhin",
     "Vladislav Smirnov",
     "Vladislav V",
@@ -1284,7 +1275,6 @@ const char * auto_contributors[] {
     "Zhichun Wu",
     "Zhiguo Zhou",
     "Zhipeng",
-    "Zhukova, Maria",
     "Zhuo Qiu",
     "Zijie Lu",
     "Zimu Li",
@@ -1512,7 +1502,6 @@ const char * auto_contributors[] {
     "hchen9",
     "hcz",
     "hdhoang",
-    "heguangnan",
     "heleihelei",
     "helifu",
     "hendrik-m",
@@ -1583,7 +1572,6 @@ const char * auto_contributors[] {
     "kevinyhzou",
     "kgurjev",
     "khamadiev",
-    "khodyrevyurii",
     "kigerzhang",
     "kirillikoff",
     "kmeaw",
@@ -1799,7 +1787,6 @@ const char * auto_contributors[] {
     "ruslandoga",
     "ryzuo",
     "s-kat",
-    "sakulali",
     "sanjam",
     "santaux",
     "santrancisco",
@@ -1817,7 +1804,6 @@ const char * auto_contributors[] {
     "shabroo",
     "shangshujie",
     "shedx",
-    "shiyer7474",
     "shuai-xu",
     "shuchaome",
     "shuyang",
@@ -1915,7 +1901,6 @@ const char * auto_contributors[] {
     "wzl",
     "xPoSx",
     "xbthink",
-    "xc0derx",
     "xiao",
     "xiaolei565",
     "xiebin",
@@ -1979,7 +1964,6 @@ const char * auto_contributors[] {
     "zkun",
     "zlx19950903",
     "zombee0",
-    "zoomxi",
     "zvonand",
     "zvrr",
     "zvvr",
diff --git a/src/Storages/System/StorageSystemDashboards.cpp b/src/Storages/System/StorageSystemDashboards.cpp
index 96ba7e59cf2..5faa37d951e 100644
--- a/src/Storages/System/StorageSystemDashboards.cpp
+++ b/src/Storages/System/StorageSystemDashboards.cpp
@@ -1,7 +1,6 @@
 #include <string_view>
 #include <Storages/System/StorageSystemDashboards.h>
 #include <Common/StringUtils.h>
-#include <Interpreters/Context.h>
 
 namespace DB
 {
@@ -23,9 +22,9 @@ String trim(const char * text)
     return String(view);
 }
 
-void StorageSystemDashboards::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
+void StorageSystemDashboards::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
-    static const std::vector<std::map<String, String>> default_dashboards
+    static const std::vector<std::map<String, String>> dashboards
     {
         /// Default dashboard for self-managed ClickHouse
         {
@@ -372,22 +371,13 @@ ORDER BY t WITH FILL STEP {rounding:UInt32}
         }
     };
 
-    auto add_dashboards = [&](const auto & dashboards)
+    for (const auto & row : dashboards)
     {
-        for (const auto & row : dashboards)
-        {
-            size_t i = 0;
-            res_columns[i++]->insert(row.at("dashboard"));
-            res_columns[i++]->insert(row.at("title"));
-            res_columns[i++]->insert(row.at("query"));
-        }
-    };
-
-    const auto & context_dashboards = context->getDashboards();
-    if (context_dashboards.has_value())
-        add_dashboards(*context_dashboards);
-    else
-        add_dashboards(default_dashboards);
+        size_t i = 0;
+        res_columns[i++]->insert(row.at("dashboard"));
+        res_columns[i++]->insert(row.at("title"));
+        res_columns[i++]->insert(row.at("query"));
+    }
 }
 
 }
diff --git a/src/Storages/System/StorageSystemDashboards.h b/src/Storages/System/StorageSystemDashboards.h
index 1862d53849b..f3e957e06c5 100644
--- a/src/Storages/System/StorageSystemDashboards.h
+++ b/src/Storages/System/StorageSystemDashboards.h
@@ -22,7 +22,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) 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 a41771df406..e0a6ad1347f 100644
--- a/src/Storages/System/StorageSystemDataSkippingIndices.cpp
+++ b/src/Storages/System/StorageSystemDataSkippingIndices.cpp
@@ -214,7 +214,7 @@ private:
     std::shared_ptr<StorageSystemDataSkippingIndices> storage;
     std::vector<UInt8> columns_mask;
     const size_t max_block_size;
-    ExpressionActionsPtr virtual_columns_filter;
+    ActionsDAGPtr virtual_columns_filter;
 };
 
 void ReadFromSystemDataSkippingIndices::applyFilters(ActionDAGNodes added_filter_nodes)
@@ -228,9 +228,10 @@ void ReadFromSystemDataSkippingIndices::applyFilters(ActionDAGNodes added_filter
             { ColumnString::create(), std::make_shared<DataTypeString>(), "database" },
         };
 
-        auto dag = VirtualColumnUtils::splitFilterDagForAllowedInputs(filter_actions_dag->getOutputs().at(0), &block_to_filter);
-        if (dag)
-            virtual_columns_filter = VirtualColumnUtils::buildFilterExpression(std::move(*dag), context);
+        virtual_columns_filter = VirtualColumnUtils::splitFilterDagForAllowedInputs(filter_actions_dag->getOutputs().at(0), &block_to_filter);
+
+        if (virtual_columns_filter)
+            VirtualColumnUtils::buildSetsForDAG(*virtual_columns_filter, context);
     }
 }
 
@@ -278,7 +279,7 @@ void ReadFromSystemDataSkippingIndices::initializePipeline(QueryPipelineBuilder
     /// Condition on "database" in a query acts like an index.
     Block block { ColumnWithTypeAndName(std::move(column), std::make_shared<DataTypeString>(), "database") };
     if (virtual_columns_filter)
-        VirtualColumnUtils::filterBlockWithExpression(virtual_columns_filter, block);
+        VirtualColumnUtils::filterBlockWithDAG(virtual_columns_filter, block, context);
 
     ColumnPtr & filtered_databases = block.getByPosition(0).column;
     pipeline.init(Pipe(std::make_shared<DataSkippingIndicesSource>(
diff --git a/src/Storages/System/StorageSystemDetachedParts.cpp b/src/Storages/System/StorageSystemDetachedParts.cpp
index 0d0ae666c10..7e4c1de1c65 100644
--- a/src/Storages/System/StorageSystemDetachedParts.cpp
+++ b/src/Storages/System/StorageSystemDetachedParts.cpp
@@ -307,7 +307,7 @@ protected:
     std::shared_ptr<StorageSystemDetachedParts> storage;
     std::vector<UInt8> columns_mask;
 
-    std::optional<ActionsDAG> filter;
+    ActionsDAGPtr filter;
     const size_t max_block_size;
     const size_t num_streams;
 };
@@ -359,7 +359,7 @@ void StorageSystemDetachedParts::read(
 
 void ReadFromSystemDetachedParts::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
-    auto state = std::make_shared<SourceState>(StoragesInfoStream({}, std::move(filter), context));
+    auto state = std::make_shared<SourceState>(StoragesInfoStream(nullptr, filter, context));
 
     Pipe pipe;
 
diff --git a/src/Storages/System/StorageSystemDroppedTablesParts.cpp b/src/Storages/System/StorageSystemDroppedTablesParts.cpp
index c2601b8ebe3..c17d6402d88 100644
--- a/src/Storages/System/StorageSystemDroppedTablesParts.cpp
+++ b/src/Storages/System/StorageSystemDroppedTablesParts.cpp
@@ -11,7 +11,7 @@ namespace DB
 {
 
 
-StoragesDroppedInfoStream::StoragesDroppedInfoStream(std::optional<ActionsDAG> filter, ContextPtr context)
+StoragesDroppedInfoStream::StoragesDroppedInfoStream(const ActionsDAGPtr & filter, ContextPtr context)
         : StoragesInfoStreamBase(context)
 {
     /// Will apply WHERE to subset of columns and then add more columns.
@@ -75,7 +75,7 @@ StoragesDroppedInfoStream::StoragesDroppedInfoStream(std::optional<ActionsDAG> f
     {
         /// Filter block_to_filter with columns 'database', 'table', 'engine', 'active'.
         if (filter)
-            VirtualColumnUtils::filterBlockWithExpression(VirtualColumnUtils::buildFilterExpression(std::move(*filter), context), block_to_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 32468fc31b2..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(std::optional<ActionsDAG> filter, 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(std::optional<ActionsDAG>, std::optional<ActionsDAG> filter, ContextPtr context) override
+    std::unique_ptr<StoragesInfoStreamBase> getStoragesInfoStream(const ActionsDAGPtr &, const ActionsDAGPtr & filter, ContextPtr context) override
     {
-        return std::make_unique<StoragesDroppedInfoStream>(std::move(filter), context);
+        return std::make_unique<StoragesDroppedInfoStream>(filter, context);
     }
 };
 
diff --git a/src/Storages/System/StorageSystemFilesystemCache.cpp b/src/Storages/System/StorageSystemFilesystemCache.cpp
index 0e972d8411b..cfb388bc232 100644
--- a/src/Storages/System/StorageSystemFilesystemCache.cpp
+++ b/src/Storages/System/StorageSystemFilesystemCache.cpp
@@ -47,9 +47,6 @@ void StorageSystemFilesystemCache::fillData(MutableColumns & res_columns, Contex
     for (const auto & [cache_name, cache_data] : caches)
     {
         const auto & cache = cache_data->cache;
-        if (!cache->isInitialized())
-            continue;
-
         cache->iterate([&](const FileSegment::Info & file_segment)
         {
             size_t i = 0;
diff --git a/src/Storages/System/StorageSystemFilesystemCacheSettings.cpp b/src/Storages/System/StorageSystemFilesystemCacheSettings.cpp
index c6bba6b8598..8915032baf7 100644
--- a/src/Storages/System/StorageSystemFilesystemCacheSettings.cpp
+++ b/src/Storages/System/StorageSystemFilesystemCacheSettings.cpp
@@ -21,7 +21,6 @@ ColumnsDescription StorageSystemFilesystemCacheSettings::getColumnsDescription()
         {"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"},
-        {"is_initialized", std::make_shared<DataTypeUInt8>(), "Whether the cache is initialized and ready to be used"},
         {"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"},
@@ -57,7 +56,6 @@ void StorageSystemFilesystemCacheSettings::fillData(
         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->isInitialized());
         res_columns[i++]->insert(cache->getUsedCacheSize());
         res_columns[i++]->insert(cache->getFileSegmentsNum());
         res_columns[i++]->insert(settings.max_file_segment_size);
diff --git a/src/Storages/System/StorageSystemKafkaConsumers.cpp b/src/Storages/System/StorageSystemKafkaConsumers.cpp
index db6804d3ad7..86713632339 100644
--- a/src/Storages/System/StorageSystemKafkaConsumers.cpp
+++ b/src/Storages/System/StorageSystemKafkaConsumers.cpp
@@ -42,7 +42,7 @@ ColumnsDescription StorageSystemKafkaConsumers::getColumnsDescription()
         {"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>(), "The flag which shows whether the consumer is in use."},
-        {"last_used", std::make_shared<DataTypeUInt64>(), "The last time this consumer was in use, unix time in microseconds."},
+        {"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)."},
     };
 }
@@ -79,7 +79,7 @@ void StorageSystemKafkaConsumers::fillData(MutableColumns & res_columns, Context
     auto & num_rebalance_revocations = assert_cast<ColumnUInt64 &>(*res_columns[index++]);
     auto & num_rebalance_assigments = assert_cast<ColumnUInt64 &>(*res_columns[index++]);
     auto & is_currently_used = assert_cast<ColumnUInt8 &>(*res_columns[index++]);
-    auto & last_used = assert_cast<ColumnUInt64 &>(*res_columns[index++]);
+    auto & last_used = assert_cast<ColumnDateTime64 &>(*res_columns[index++]);
     auto & rdkafka_stat = assert_cast<ColumnString &>(*res_columns[index++]);
 
     const auto access = context->getAccess();
diff --git a/src/Storages/System/StorageSystemOne.cpp b/src/Storages/System/StorageSystemOne.cpp
index 70377715dc3..936d55e61a0 100644
--- a/src/Storages/System/StorageSystemOne.cpp
+++ b/src/Storages/System/StorageSystemOne.cpp
@@ -41,10 +41,7 @@ Pipe StorageSystemOne::read(
     auto column = DataTypeUInt8().createColumnConst(1, 0u)->convertToFullColumnIfConst();
     Chunk chunk({ std::move(column) }, 1);
 
-    auto source = std::make_shared<SourceFromSingleChunk>(std::move(header), std::move(chunk));
-    source->addTotalRowsApprox(1);
-
-    return Pipe(source);
+    return Pipe(std::make_shared<SourceFromSingleChunk>(std::move(header), std::move(chunk)));
 }
 
 
diff --git a/src/Storages/System/StorageSystemPartsBase.cpp b/src/Storages/System/StorageSystemPartsBase.cpp
index c87bdb6d26a..f7d1c1b3eb8 100644
--- a/src/Storages/System/StorageSystemPartsBase.cpp
+++ b/src/Storages/System/StorageSystemPartsBase.cpp
@@ -91,7 +91,7 @@ StoragesInfo::getProjectionParts(MergeTreeData::DataPartStateVector & state, boo
     return data->getProjectionPartsVectorForInternalUsage({State::Active}, &state);
 }
 
-StoragesInfoStream::StoragesInfoStream(std::optional<ActionsDAG> filter_by_database, std::optional<ActionsDAG> filter_by_other_columns, 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.
@@ -124,7 +124,7 @@ StoragesInfoStream::StoragesInfoStream(std::optional<ActionsDAG> filter_by_datab
 
         /// Filter block_to_filter with column 'database'.
         if (filter_by_database)
-            VirtualColumnUtils::filterBlockWithExpression(VirtualColumnUtils::buildFilterExpression(std::move(*filter_by_database), context), block_to_filter);
+            VirtualColumnUtils::filterBlockWithDAG(filter_by_database, block_to_filter, context);
         rows = block_to_filter.rows();
 
         /// Block contains new columns, update database_column.
@@ -138,7 +138,7 @@ StoragesInfoStream::StoragesInfoStream(std::optional<ActionsDAG> filter_by_datab
 
             for (size_t i = 0; i < rows; ++i)
             {
-                String database_name = (*database_column_for_filter)[i].safeGet<String>();
+                String database_name = (*database_column_for_filter)[i].get<String>();
                 const DatabasePtr database = databases.at(database_name);
 
                 offsets[i] = i ? offsets[i - 1] : 0;
@@ -204,7 +204,7 @@ StoragesInfoStream::StoragesInfoStream(std::optional<ActionsDAG> filter_by_datab
     {
         /// Filter block_to_filter with columns 'database', 'table', 'engine', 'active'.
         if (filter_by_other_columns)
-            VirtualColumnUtils::filterBlockWithExpression(VirtualColumnUtils::buildFilterExpression(std::move(*filter_by_other_columns), context), block_to_filter);
+            VirtualColumnUtils::filterBlockWithDAG(filter_by_other_columns, block_to_filter, context);
         rows = block_to_filter.rows();
     }
 
@@ -236,8 +236,8 @@ protected:
     std::shared_ptr<StorageSystemPartsBase> storage;
     std::vector<UInt8> columns_mask;
     const bool has_state_column;
-    std::optional<ActionsDAG> filter_by_database;
-    std::optional<ActionsDAG> filter_by_other_columns;
+    ActionsDAGPtr filter_by_database;
+    ActionsDAGPtr filter_by_other_columns;
 };
 
 ReadFromSystemPartsBase::ReadFromSystemPartsBase(
@@ -318,7 +318,7 @@ void StorageSystemPartsBase::read(
 
 void ReadFromSystemPartsBase::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
-    auto stream = storage->getStoragesInfoStream(std::move(filter_by_database), std::move(filter_by_other_columns), context);
+    auto stream = storage->getStoragesInfoStream(filter_by_database, filter_by_other_columns, context);
     auto header = getOutputStream().header;
 
     MutableColumns res_columns = header.cloneEmptyColumns();
diff --git a/src/Storages/System/StorageSystemPartsBase.h b/src/Storages/System/StorageSystemPartsBase.h
index 3be73aeda17..8671fd850f8 100644
--- a/src/Storages/System/StorageSystemPartsBase.h
+++ b/src/Storages/System/StorageSystemPartsBase.h
@@ -52,13 +52,13 @@ public:
         {
             StoragesInfo info;
 
-            info.database = (*database_column)[next_row].safeGet<String>();
-            info.table = (*table_column)[next_row].safeGet<String>();
-            UUID storage_uuid = (*storage_uuid_column)[next_row].safeGet<UUID>();
+            info.database = (*database_column)[next_row].get<String>();
+            info.table = (*table_column)[next_row].get<String>();
+            UUID storage_uuid = (*storage_uuid_column)[next_row].get<UUID>();
 
             auto is_same_table = [&storage_uuid, this] (size_t row) -> bool
             {
-                return (*storage_uuid_column)[row].safeGet<UUID>() == storage_uuid;
+                return (*storage_uuid_column)[row].get<UUID>() == storage_uuid;
             };
 
             /// We may have two rows per table which differ in 'active' value.
@@ -66,7 +66,7 @@ public:
             /// must collect the inactive parts. Remember this fact in StoragesInfo.
             for (; next_row < rows && is_same_table(next_row); ++next_row)
             {
-                const auto active = (*active_column)[next_row].safeGet<UInt64>();
+                const auto active = (*active_column)[next_row].get<UInt64>();
                 if (active == 0)
                     info.need_inactive_parts = true;
             }
@@ -116,7 +116,7 @@ protected:
 class StoragesInfoStream : public StoragesInfoStreamBase
 {
 public:
-    StoragesInfoStream(std::optional<ActionsDAG> filter_by_database, std::optional<ActionsDAG> filter_by_other_columns, 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.
@@ -146,9 +146,9 @@ protected:
 
     StorageSystemPartsBase(const StorageID & table_id_, ColumnsDescription && columns);
 
-    virtual std::unique_ptr<StoragesInfoStreamBase> getStoragesInfoStream(std::optional<ActionsDAG> filter_by_database, std::optional<ActionsDAG> filter_by_other_columns, 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>(std::move(filter_by_database), std::move(filter_by_other_columns), context);
+        return std::make_unique<StoragesInfoStream>(filter_by_database, filter_by_other_columns, context);
     }
 
     virtual void
diff --git a/src/Storages/System/StorageSystemProjections.cpp b/src/Storages/System/StorageSystemProjections.cpp
deleted file mode 100644
index 7082853e4f9..00000000000
--- a/src/Storages/System/StorageSystemProjections.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-#include <Storages/System/StorageSystemProjections.h>
-#include <Access/ContextAccess.h>
-#include <Columns/ColumnString.h>
-#include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeEnum.h>
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <Databases/IDatabase.h>
-#include <Storages/VirtualColumnUtils.h>
-#include <Storages/System/getQueriedColumnsMaskAndHeader.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/DatabaseCatalog.h>
-#include <Parsers/ASTIndexDeclaration.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/formatAST.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
-{
-StorageSystemProjections::StorageSystemProjections(const StorageID & table_id_)
-    : IStorage(table_id_)
-{
-    auto projection_type_datatype = std::make_shared<DataTypeEnum8>(
-        DataTypeEnum8::Values
-        {
-            {"Normal",       static_cast<UInt8>(ProjectionDescription::Type::Normal)},
-            {"Aggregate",    static_cast<UInt8>(ProjectionDescription::Type::Aggregate)}
-        }
-    );
-
-    StorageInMemoryMetadata storage_metadata;
-    storage_metadata.setColumns(ColumnsDescription(
-        {
-            { "database", std::make_shared<DataTypeString>(), "Database name."},
-            { "table", std::make_shared<DataTypeString>(), "Table name."},
-            { "name", std::make_shared<DataTypeString>(), "Projection name."},
-            { "type", std::move(projection_type_datatype), "Projection type."},
-            { "sorting_key", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Projection sorting key."},
-            { "query", std::make_shared<DataTypeString>(), "Projection query."},
-        }));
-    setInMemoryMetadata(storage_metadata);
-}
-
-class ProjectionsSource : public ISource
-{
-public:
-    ProjectionsSource(
-        std::vector<UInt8> columns_mask_,
-        Block header,
-        UInt64 max_block_size_,
-        ColumnPtr databases_,
-        ContextPtr context_)
-        : ISource(header)
-        , column_mask(std::move(columns_mask_))
-        , max_block_size(max_block_size_)
-        , databases(std::move(databases_))
-        , context(Context::createCopy(context_))
-        , database_idx(0)
-    {}
-
-    String getName() const override { return "Projections"; }
-
-protected:
-    Chunk generate() override
-    {
-        if (database_idx >= databases->size())
-            return {};
-
-        MutableColumns res_columns = getPort().getHeader().cloneEmptyColumns();
-
-        const auto access = context->getAccess();
-        const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
-
-        size_t rows_count = 0;
-        while (rows_count < max_block_size)
-        {
-            if (tables_it && !tables_it->isValid())
-                ++database_idx;
-
-            while (database_idx < databases->size() && (!tables_it || !tables_it->isValid()))
-            {
-                database_name = databases->getDataAt(database_idx).toString();
-                database = DatabaseCatalog::instance().tryGetDatabase(database_name);
-
-                if (database)
-                    break;
-                ++database_idx;
-            }
-
-            if (database_idx >= databases->size())
-                break;
-
-            if (!tables_it || !tables_it->isValid())
-                tables_it = database->getTablesIterator(context);
-
-            const bool check_access_for_tables = check_access_for_databases && !access->isGranted(AccessType::SHOW_TABLES, database_name);
-
-            for (; rows_count < max_block_size && tables_it->isValid(); tables_it->next())
-            {
-                auto table_name = tables_it->name();
-                if (check_access_for_tables && !access->isGranted(AccessType::SHOW_TABLES, database_name, table_name))
-                    continue;
-
-                const auto table = tables_it->table();
-                if (!table)
-                    continue;
-                StorageMetadataPtr metadata_snapshot = table->getInMemoryMetadataPtr();
-                if (!metadata_snapshot)
-                    continue;
-                const auto & projections = metadata_snapshot->getProjections();
-
-                for (const auto & projection : projections)
-                {
-                    ++rows_count;
-
-                    size_t src_index = 0;
-                    size_t res_index = 0;
-
-                    // 'database' column
-                    if (column_mask[src_index++])
-                        res_columns[res_index++]->insert(database_name);
-                    // 'table' column
-                    if (column_mask[src_index++])
-                        res_columns[res_index++]->insert(table_name);
-                    // 'name' column
-                    if (column_mask[src_index++])
-                        res_columns[res_index++]->insert(projection.name);
-                    // 'type' column
-                    if (column_mask[src_index++])
-                        res_columns[res_index++]->insert(projection.type);
-                    // 'sorting_key' column
-                    if (column_mask[src_index++])
-                    {
-                        auto columns = projection.metadata->getSortingKeyColumns();
-
-                        Array sorting_key;
-                        sorting_key.reserve(columns.size());
-                        for (const auto & column : columns)
-                        {
-                            sorting_key.push_back(column);
-                        }
-                        res_columns[res_index++]->insert(sorting_key);
-                    }
-                    // 'query' column
-                    if (column_mask[src_index++])
-                    {
-                        res_columns[res_index++]->insert(serializeAST(*projection.definition_ast->children.at(0)));
-                    }
-                }
-            }
-        }
-        return Chunk(std::move(res_columns), rows_count);
-    }
-
-private:
-    std::vector<UInt8> column_mask;
-    UInt64 max_block_size;
-    ColumnPtr databases;
-    ContextPtr context;
-    size_t database_idx;
-    DatabasePtr database;
-    std::string database_name;
-    DatabaseTablesIteratorPtr tables_it;
-};
-
-class ReadFromSystemProjections : public SourceStepWithFilter
-{
-public:
-    std::string getName() const override { return "ReadFromSystemProjections"; }
-    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
-
-    ReadFromSystemProjections(
-        const Names & column_names_,
-        const SelectQueryInfo & query_info_,
-        const StorageSnapshotPtr & storage_snapshot_,
-        const ContextPtr & context_,
-        Block sample_block,
-        std::shared_ptr<StorageSystemProjections> 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<StorageSystemProjections> storage;
-    std::vector<UInt8> columns_mask;
-    const size_t max_block_size;
-    ExpressionActionsPtr virtual_columns_filter;
-};
-
-void ReadFromSystemProjections::applyFilters(ActionDAGNodes added_filter_nodes)
-{
-    SourceStepWithFilter::applyFilters(std::move(added_filter_nodes));
-
-    if (filter_actions_dag)
-    {
-        Block block_to_filter
-        {
-            { ColumnString::create(), std::make_shared<DataTypeString>(), "database" },
-        };
-
-        auto dag = VirtualColumnUtils::splitFilterDagForAllowedInputs(filter_actions_dag->getOutputs().at(0), &block_to_filter);
-        if (dag)
-            virtual_columns_filter = VirtualColumnUtils::buildFilterExpression(std::move(*dag), context);
-    }
-}
-
-void StorageSystemProjections::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->getSampleBlock();
-
-    auto [columns_mask, header] = getQueriedColumnsMaskAndHeader(sample_block, column_names);
-
-    auto this_ptr = std::static_pointer_cast<StorageSystemProjections>(shared_from_this());
-
-    auto reading = std::make_unique<ReadFromSystemProjections>(
-        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 ReadFromSystemProjections::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
-{
-    MutableColumnPtr column = ColumnString::create();
-
-    const auto databases = DatabaseCatalog::instance().getDatabases();
-    for (const auto & [database_name, database] : databases)
-    {
-        if (database_name == DatabaseCatalog::TEMPORARY_DATABASE)
-            continue;
-
-        /// Lazy database can contain only very primitive tables, it cannot contain tables with projections.
-        /// Skip it to avoid unnecessary tables loading in the Lazy database.
-        if (database->getEngineName() != "Lazy")
-            column->insert(database_name);
-    }
-
-    /// Condition on "database" in a query acts like an index.
-    Block block { ColumnWithTypeAndName(std::move(column), std::make_shared<DataTypeString>(), "database") };
-    if (virtual_columns_filter)
-        VirtualColumnUtils::filterBlockWithExpression(virtual_columns_filter, block);
-
-    ColumnPtr & filtered_databases = block.getByPosition(0).column;
-    pipeline.init(Pipe(std::make_shared<ProjectionsSource>(
-        std::move(columns_mask), getOutputStream().header, max_block_size, std::move(filtered_databases), context)));
-}
-
-}
diff --git a/src/Storages/System/StorageSystemProjections.h b/src/Storages/System/StorageSystemProjections.h
deleted file mode 100644
index 46e73cec6cd..00000000000
--- a/src/Storages/System/StorageSystemProjections.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include <Storages/IStorage.h>
-
-
-namespace DB
-{
-
-/// For system.projections table - describes the projections in tables, similar to system.data_skipping_indices.
-class StorageSystemProjections : public IStorage
-{
-public:
-    explicit StorageSystemProjections(const StorageID & table_id_);
-
-    std::string getName() const override { return "StorageSystemProjections"; }
-
-    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;
-
-    bool isSystemStorage() const override { return true; }
-};
-
-}
diff --git a/src/Storages/System/StorageSystemQueryCache.cpp b/src/Storages/System/StorageSystemQueryCache.cpp
index b3532ba40a7..4c54d4ae16f 100644
--- a/src/Storages/System/StorageSystemQueryCache.cpp
+++ b/src/Storages/System/StorageSystemQueryCache.cpp
@@ -1,7 +1,6 @@
 #include "StorageSystemQueryCache.h"
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeDateTime.h>
-#include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/Cache/QueryCache.h>
 #include <Interpreters/Context.h>
@@ -16,7 +15,6 @@ ColumnsDescription StorageSystemQueryCache::getColumnsDescription()
     {
         {"query", std::make_shared<DataTypeString>(), "Query string."},
         {"result_size", std::make_shared<DataTypeUInt64>(), "Size of the query cache entry."},
-        {"tag", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "Tag of the query cache entry."},
         {"stale", std::make_shared<DataTypeUInt8>(), "If the query cache entry is stale."},
         {"shared", std::make_shared<DataTypeUInt8>(), "If the query cache entry is shared between multiple users."},
         {"compressed", std::make_shared<DataTypeUInt8>(), "If the query cache entry is compressed."},
@@ -53,12 +51,11 @@ void StorageSystemQueryCache::fillData(MutableColumns & res_columns, ContextPtr
 
         res_columns[0]->insert(key.query_string); /// approximates the original query string
         res_columns[1]->insert(QueryCache::QueryCacheEntryWeight()(*query_result));
-        res_columns[2]->insert(key.tag);
-        res_columns[3]->insert(key.expires_at < std::chrono::system_clock::now());
-        res_columns[4]->insert(key.is_shared);
-        res_columns[5]->insert(key.is_compressed);
-        res_columns[6]->insert(std::chrono::system_clock::to_time_t(key.expires_at));
-        res_columns[7]->insert(key.ast_hash.low64); /// query cache considers aliases (issue #56258)
+        res_columns[2]->insert(key.expires_at < std::chrono::system_clock::now());
+        res_columns[3]->insert(key.is_shared);
+        res_columns[4]->insert(key.is_compressed);
+        res_columns[5]->insert(std::chrono::system_clock::to_time_t(key.expires_at));
+        res_columns[6]->insert(key.ast_hash.low64); /// query cache considers aliases (issue #56258)
     }
 }
 
diff --git a/src/Storages/System/StorageSystemReplicas.cpp b/src/Storages/System/StorageSystemReplicas.cpp
index 724e4bd3f77..b6969487d07 100644
--- a/src/Storages/System/StorageSystemReplicas.cpp
+++ b/src/Storages/System/StorageSystemReplicas.cpp
@@ -285,7 +285,7 @@ private:
     const bool with_zk_fields;
     const size_t max_block_size;
     std::shared_ptr<StorageSystemReplicasImpl> impl;
-    ExpressionActionsPtr virtual_columns_filter;
+    ActionsDAGPtr virtual_columns_filter;
 };
 
 void ReadFromSystemReplicas::applyFilters(ActionDAGNodes added_filter_nodes)
@@ -301,9 +301,10 @@ void ReadFromSystemReplicas::applyFilters(ActionDAGNodes added_filter_nodes)
             { ColumnString::create(), std::make_shared<DataTypeString>(), "engine" },
         };
 
-        auto dag = VirtualColumnUtils::splitFilterDagForAllowedInputs(filter_actions_dag->getOutputs().at(0), &block_to_filter);
-        if (dag)
-            virtual_columns_filter = VirtualColumnUtils::buildFilterExpression(std::move(*dag), context);
+        virtual_columns_filter = VirtualColumnUtils::splitFilterDagForAllowedInputs(filter_actions_dag->getOutputs().at(0), &block_to_filter);
+
+        if (virtual_columns_filter)
+            VirtualColumnUtils::buildSetsForDAG(*virtual_columns_filter, context);
     }
 }
 
@@ -442,7 +443,7 @@ void ReadFromSystemReplicas::initializePipeline(QueryPipelineBuilder & pipeline,
         };
 
         if (virtual_columns_filter)
-            VirtualColumnUtils::filterBlockWithExpression(virtual_columns_filter, filtered_block);
+            VirtualColumnUtils::filterBlockWithDAG(virtual_columns_filter, filtered_block, context);
 
         if (!filtered_block.rows())
         {
diff --git a/src/Storages/System/StorageSystemScheduler.cpp b/src/Storages/System/StorageSystemScheduler.cpp
index b42c807d6fc..339a59e88a5 100644
--- a/src/Storages/System/StorageSystemScheduler.cpp
+++ b/src/Storages/System/StorageSystemScheduler.cpp
@@ -31,7 +31,6 @@ ColumnsDescription StorageSystemScheduler::getColumnsDescription()
         {"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."},
-        {"throughput", std::make_shared<DataTypeFloat64>(), "Current average throughput (dequeued cost per second)."},
         {"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>()),
@@ -97,7 +96,6 @@ void StorageSystemScheduler::fillData(MutableColumns & res_columns, ContextPtr c
         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->throughput.rate(static_cast<double>(clock_gettime_ns())/1e9));
         res_columns[i++]->insert(node->canceled_cost.load());
         res_columns[i++]->insert(node->busy_periods.load());
 
diff --git a/src/Storages/System/StorageSystemServerSettings.cpp b/src/Storages/System/StorageSystemServerSettings.cpp
index ee99c472620..d242b6de4ec 100644
--- a/src/Storages/System/StorageSystemServerSettings.cpp
+++ b/src/Storages/System/StorageSystemServerSettings.cpp
@@ -63,6 +63,7 @@ void StorageSystemServerSettings::fillData(MutableColumns & res_columns, Context
     /// current setting values, one needs to ask the components directly.
     std::unordered_map<String, std::pair<String, ChangeableWithoutRestart>> changeable_settings = {
         {"max_server_memory_usage", {std::to_string(total_memory_tracker.getHardLimit()), ChangeableWithoutRestart::Yes}},
+        {"allow_use_jemalloc_memory", {std::to_string(total_memory_tracker.getAllowUseJemallocMmemory()), ChangeableWithoutRestart::Yes}},
 
         {"max_table_size_to_drop", {std::to_string(context->getMaxTableSizeToDrop()), ChangeableWithoutRestart::Yes}},
         {"max_partition_size_to_drop", {std::to_string(context->getMaxPartitionSizeToDrop()), ChangeableWithoutRestart::Yes}},
diff --git a/src/Storages/System/StorageSystemStackTrace.cpp b/src/Storages/System/StorageSystemStackTrace.cpp
index 6cc525b9340..cc221bbea69 100644
--- a/src/Storages/System/StorageSystemStackTrace.cpp
+++ b/src/Storages/System/StorageSystemStackTrace.cpp
@@ -277,7 +277,7 @@ public:
     StackTraceSource(
         const Names & column_names,
         Block header_,
-        std::optional<ActionsDAG> filter_dag_,
+        ActionsDAGPtr && filter_dag_,
         ContextPtr context_,
         UInt64 max_block_size_,
         LoggerPtr log_)
@@ -423,7 +423,7 @@ protected:
 private:
     ContextPtr context;
     Block header;
-    const std::optional<ActionsDAG> filter_dag;
+    const ActionsDAGPtr filter_dag;
     const ActionsDAG::Node * predicate;
 
     const size_t max_block_size;
diff --git a/src/Storages/System/StorageSystemTables.cpp b/src/Storages/System/StorageSystemTables.cpp
index 943ce9c317a..049a442d494 100644
--- a/src/Storages/System/StorageSystemTables.cpp
+++ b/src/Storages/System/StorageSystemTables.cpp
@@ -125,7 +125,7 @@ ColumnPtr getFilteredTables(
         block.insert(ColumnWithTypeAndName(std::move(engine_column), std::make_shared<DataTypeString>(), "engine"));
 
     if (dag)
-        VirtualColumnUtils::filterBlockWithExpression(VirtualColumnUtils::buildFilterExpression(std::move(*dag), context), block);
+        VirtualColumnUtils::filterBlockWithDAG(dag, block, context);
 
     return block.getByPosition(0).column;
 }
diff --git a/src/Storages/System/StorageSystemViewRefreshes.cpp b/src/Storages/System/StorageSystemViewRefreshes.cpp
index 6e0dab1468d..30539ed6b6a 100644
--- a/src/Storages/System/StorageSystemViewRefreshes.cpp
+++ b/src/Storages/System/StorageSystemViewRefreshes.cpp
@@ -5,7 +5,6 @@
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypeUUID.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/Context.h>
 #include <Storages/MaterializedView/RefreshSet.h>
@@ -20,7 +19,6 @@ ColumnsDescription StorageSystemViewRefreshes::getColumnsDescription()
     {
         {"database", std::make_shared<DataTypeString>(), "The name of the database the table is in."},
         {"view", std::make_shared<DataTypeString>(), "Table name."},
-        {"uuid", std::make_shared<DataTypeUUID>(), "Table uuid (Atomic database)."},
         {"status", std::make_shared<DataTypeString>(), "Current state of the refresh."},
         {"last_refresh_result", std::make_shared<DataTypeString>(), "Outcome of the latest refresh attempt."},
         {"last_refresh_time", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>()),
@@ -34,9 +32,8 @@ ColumnsDescription StorageSystemViewRefreshes::getColumnsDescription()
             "If status = 'WaitingForDependencies', a refresh is ready to start as soon as these dependencies are fulfilled."
         },
         {"exception", std::make_shared<DataTypeString>(),
-            "if last_refresh_result = 'Error', i.e. the last refresh attempt failed, this column contains the corresponding error message and stack trace."
+            "if last_refresh_result = 'Exception', i.e. the last refresh attempt failed, this column contains the corresponding error message and stack trace."
         },
-        {"retry", std::make_shared<DataTypeUInt64>(), "How many failed attempts there were so far, for the current refresh."},
         {"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>(), "The amount of nanoseconds the current refresh took."},
@@ -66,7 +63,6 @@ void StorageSystemViewRefreshes::fillData(
         std::size_t i = 0;
         res_columns[i++]->insert(refresh.view_id.getDatabaseName());
         res_columns[i++]->insert(refresh.view_id.getTableName());
-        res_columns[i++]->insert(refresh.view_id.uuid);
         res_columns[i++]->insert(toString(refresh.state));
         res_columns[i++]->insert(toString(refresh.last_refresh_result));
 
@@ -89,7 +85,6 @@ void StorageSystemViewRefreshes::fillData(
         res_columns[i++]->insert(Array(deps));
 
         res_columns[i++]->insert(refresh.exception_message);
-        res_columns[i++]->insert(refresh.retry);
         res_columns[i++]->insert(refresh.refresh_count);
         res_columns[i++]->insert(Float64(refresh.progress.read_rows) / refresh.progress.total_rows_to_read);
         res_columns[i++]->insert(refresh.progress.elapsed_ns / 1e9);
diff --git a/src/Storages/System/StorageSystemZooKeeperConnection.cpp b/src/Storages/System/StorageSystemZooKeeperConnection.cpp
index 72a7ba38429..ec29b84dac3 100644
--- a/src/Storages/System/StorageSystemZooKeeperConnection.cpp
+++ b/src/Storages/System/StorageSystemZooKeeperConnection.cpp
@@ -4,7 +4,6 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeDateTime.h>
-#include <DataTypes/DataTypeNullable.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Coordination/KeeperFeatureFlags.h>
 #include <Storages/System/StorageSystemZooKeeperConnection.h>
@@ -28,7 +27,7 @@ ColumnsDescription StorageSystemZooKeeperConnection::getColumnsDescription()
         /* 0 */ {"name", std::make_shared<DataTypeString>(), "ZooKeeper cluster's name."},
         /* 1 */ {"host", std::make_shared<DataTypeString>(), "The hostname/IP of the ZooKeeper node that ClickHouse connected to."},
         /* 2 */ {"port", std::make_shared<DataTypeUInt16>(), "The port of the ZooKeeper node that ClickHouse connected to."},
-        /* 3 */ {"index", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt8>()), "The index of the ZooKeeper node that ClickHouse connected to. The index is from ZooKeeper config. If not connected, this column is NULL."},
+        /* 3 */ {"index", std::make_shared<DataTypeUInt8>(), "The index of the ZooKeeper node that ClickHouse connected to. The index is from ZooKeeper config."},
         /* 4 */ {"connected_time", std::make_shared<DataTypeDateTime>(), "When the connection was established."},
         /* 5 */ {"session_uptime_elapsed_seconds", std::make_shared<DataTypeUInt64>(), "Seconds elapsed since the connection was established."},
         /* 6 */ {"is_expired", std::make_shared<DataTypeUInt8>(), "Is the current connection expired."},
@@ -65,7 +64,7 @@ void StorageSystemZooKeeperConnection::fillData(MutableColumns & res_columns, Co
     /// For read-only snapshot type functionality, it's acceptable even though 'getZooKeeper' may cause data inconsistency.
     auto fill_data = [&](const String & name, const zkutil::ZooKeeperPtr zookeeper, MutableColumns & columns)
     {
-        auto index = zookeeper->getConnectedHostIdx();
+        Int8 index = zookeeper->getConnectedHostIdx();
         String host_port = zookeeper->getConnectedHostPort();
         if (index != -1 && !host_port.empty())
         {
@@ -79,10 +78,7 @@ void StorageSystemZooKeeperConnection::fillData(MutableColumns & res_columns, Co
             columns[0]->insert(name);
             columns[1]->insert(host);
             columns[2]->insert(port);
-            if (index)
-                columns[3]->insert(*index);
-            else
-                columns[3]->insertDefault();
+            columns[3]->insert(index);
             columns[4]->insert(connected_time);
             columns[5]->insert(uptime);
             columns[6]->insert(zookeeper->expired());
diff --git a/src/Storages/System/attachSystemTables.cpp b/src/Storages/System/attachSystemTables.cpp
index 816ba5095b1..97eda1db3fa 100644
--- a/src/Storages/System/attachSystemTables.cpp
+++ b/src/Storages/System/attachSystemTables.cpp
@@ -51,7 +51,6 @@
 #include <Storages/System/StorageSystemTableEngines.h>
 #include <Storages/System/StorageSystemTableFunctions.h>
 #include <Storages/System/StorageSystemTables.h>
-#include <Storages/System/StorageSystemProjections.h>
 #include <Storages/System/StorageSystemZooKeeper.h>
 #include <Storages/System/StorageSystemContributors.h>
 #include <Storages/System/StorageSystemErrors.h>
@@ -167,7 +166,6 @@ void attachSystemTablesServer(ContextPtr context, IDatabase & system_database, b
     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.");
     attachNoDescription<StorageSystemDataSkippingIndices>(context, system_database, "data_skipping_indices", "Contains all the information about all the data skipping indices in tables, similar to system.columns.");
-    attachNoDescription<StorageSystemProjections>(context, system_database, "projections", "Contains all the information about all the projections in tables, similar to system.data_skipping_indices.");
     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.");
diff --git a/src/Storages/TTLDescription.cpp b/src/Storages/TTLDescription.cpp
index d674f054632..ac091e7cf3c 100644
--- a/src/Storages/TTLDescription.cpp
+++ b/src/Storages/TTLDescription.cpp
@@ -172,19 +172,19 @@ static ExpressionAndSets buildExpressionAndSets(ASTPtr & ast, const NamesAndType
     /// with subqueries it's possible that new analyzer will be enabled in ::read method
     /// of underlying storage when all other parts of infra are not ready for it
     /// (built with old analyzer).
-    context_copy->setSetting("allow_experimental_analyzer", false);
+    context_copy->setSetting("allow_experimental_analyzer", Field{0});
     auto syntax_analyzer_result = TreeRewriter(context_copy).analyze(ast, columns);
     ExpressionAnalyzer analyzer(ast, syntax_analyzer_result, context_copy);
     auto dag = analyzer.getActionsDAG(false);
 
-    const auto * col = &dag.findInOutputs(ast->getColumnName());
+    const auto * col = &dag->findInOutputs(ast->getColumnName());
     if (col->result_name != ttl_string)
-        col = &dag.addAlias(*col, ttl_string);
+        col = &dag->addAlias(*col, ttl_string);
 
-    dag.getOutputs() = {col};
-    dag.removeUnusedActions();
+    dag->getOutputs() = {col};
+    dag->removeUnusedActions();
 
-    result.expression = std::make_shared<ExpressionActions>(std::move(dag), ExpressionActionsSettings::fromContext(context_copy));
+    result.expression = std::make_shared<ExpressionActions>(dag, ExpressionActionsSettings::fromContext(context_copy));
     result.sets = analyzer.getPreparedSets();
 
     return result;
diff --git a/src/Storages/TimeSeries/PrometheusRemoteReadProtocol.cpp b/src/Storages/TimeSeries/PrometheusRemoteReadProtocol.cpp
deleted file mode 100644
index d6d258f5ff6..00000000000
--- a/src/Storages/TimeSeries/PrometheusRemoteReadProtocol.cpp
+++ /dev/null
@@ -1,472 +0,0 @@
-#include <Storages/TimeSeries/PrometheusRemoteReadProtocol.h>
-
-#include "config.h"
-#if USE_PROMETHEUS_PROTOBUFS
-
-#include <Columns/ColumnDecimal.h>
-#include <Columns/ColumnMap.h>
-#include <Columns/ColumnVector.h>
-#include <Columns/ColumnTuple.h>
-#include <Columns/ColumnsNumber.h>
-#include <Core/Block.h>
-#include <Core/Field.h>
-#include <DataTypes/DataTypeMap.h>
-#include <Interpreters/InterpreterSelectQuery.h>
-#include <Interpreters/StorageID.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTSelectQuery.h>
-#include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/formatAST.h>
-#include <Parsers/makeASTForLogicalFunction.h>
-#include <Processors/Executors/PullingPipelineExecutor.h>
-#include <Storages/StorageTimeSeries.h>
-#include <Storages/TimeSeries/TimeSeriesColumnNames.h>
-#include <Storages/TimeSeries/TimeSeriesColumnsValidator.h>
-#include <Storages/TimeSeries/TimeSeriesTagNames.h>
-#include <Storages/TimeSeries/TimeSeriesSettings.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int BAD_REQUEST_PARAMETER;
-}
-
-
-namespace
-{
-    /// Makes an ASTIdentifier for a column of the specified table.
-    ASTPtr makeASTColumn(const StorageID & table_id, const String & column_name)
-    {
-        return std::make_shared<ASTIdentifier>(Strings{table_id.database_name, table_id.table_name, column_name});
-    }
-
-    /// Makes an AST for condition `data_table.timestamp >= min_timestamp_ms`
-    ASTPtr makeASTTimestampGreaterOrEquals(Int64 min_timestamp_ms, const StorageID & data_table_id)
-    {
-        return makeASTFunction("greaterOrEquals",
-                               makeASTColumn(data_table_id, TimeSeriesColumnNames::Timestamp),
-                               std::make_shared<ASTLiteral>(Field{DecimalField{DateTime64{min_timestamp_ms}, 3}}));
-    }
-
-    /// Makes an AST for condition `data_table.timestamp <= max_timestamp_ms`
-    ASTPtr makeASTTimestampLessOrEquals(Int64 max_timestamp_ms, const StorageID & data_table_id)
-    {
-        return makeASTFunction("lessOrEquals",
-                               makeASTColumn(data_table_id, TimeSeriesColumnNames::Timestamp),
-                               std::make_shared<ASTLiteral>(Field{DecimalField{DateTime64{max_timestamp_ms}, 3}}));
-    }
-
-    /// Makes an AST for condition `tags_table.max_time >= min_timestamp_ms`
-    ASTPtr makeASTMaxTimeGreaterOrEquals(Int64 min_timestamp_ms, const StorageID & tags_table_id)
-    {
-        return makeASTFunction("greaterOrEquals",
-                               makeASTColumn(tags_table_id, TimeSeriesColumnNames::MaxTime),
-                               std::make_shared<ASTLiteral>(Field{DecimalField{DateTime64{min_timestamp_ms}, 3}}));
-    }
-
-    /// Makes an AST for condition `tags_table.min_time <= max_timestamp_ms`
-    ASTPtr makeASTMinTimeLessOrEquals(Int64 max_timestamp_ms, const StorageID & tags_table_id)
-    {
-        return makeASTFunction("lessOrEquals",
-                               makeASTColumn(tags_table_id, TimeSeriesColumnNames::MinTime),
-                               std::make_shared<ASTLiteral>(Field{DecimalField{DateTime64{max_timestamp_ms}, 3}}));
-    }
-
-    /// Makes an AST for the expression referencing a tag value.
-    ASTPtr makeASTLabelName(const String & label_name, const StorageID & tags_table_id, const std::unordered_map<String, String> & column_name_by_tag_name)
-    {
-        if (label_name == TimeSeriesTagNames::MetricName)
-            return makeASTColumn(tags_table_id, TimeSeriesColumnNames::MetricName);
-
-        auto it = column_name_by_tag_name.find(label_name);
-        if (it != column_name_by_tag_name.end())
-            return makeASTColumn(tags_table_id, it->second);
-
-        /// arrayElement() can be used to extract a value from a Map too.
-        return makeASTFunction("arrayElement", makeASTColumn(tags_table_id, TimeSeriesColumnNames::Tags), std::make_shared<ASTLiteral>(label_name));
-    }
-
-    /// Makes an AST for a label matcher, for example `metric_name == 'value'` or `NOT match(labels['label_name'], 'regexp')`.
-    ASTPtr makeASTLabelMatcher(
-        const prometheus::LabelMatcher & label_matcher,
-        const StorageID & tags_table_id,
-        const std::unordered_map<String, String> & column_name_by_tag_name)
-    {
-        const auto & label_name = label_matcher.name();
-        const auto & label_value = label_matcher.value();
-        auto type = label_matcher.type();
-
-        if (type == prometheus::LabelMatcher::EQ)
-            return makeASTFunction("equals", makeASTLabelName(label_name, tags_table_id, column_name_by_tag_name), std::make_shared<ASTLiteral>(label_value));
-        else if (type == prometheus::LabelMatcher::NEQ)
-            return makeASTFunction("notEquals", makeASTLabelName(label_name, tags_table_id, column_name_by_tag_name), std::make_shared<ASTLiteral>(label_value));
-        else if (type == prometheus::LabelMatcher::RE)
-            return makeASTFunction("match", makeASTLabelName(label_name, tags_table_id, column_name_by_tag_name), std::make_shared<ASTLiteral>(label_value));
-        else if (type == prometheus::LabelMatcher::NRE)
-            return makeASTFunction("not", makeASTFunction("match", makeASTLabelName(label_name, tags_table_id, column_name_by_tag_name), std::make_shared<ASTLiteral>(label_value)));
-        else
-            throw Exception(ErrorCodes::BAD_REQUEST_PARAMETER, "Unexpected type of label matcher: {}", type);
-    }
-
-    /// Makes an AST checking that tags match a specified label matcher and that timestamp is in range [min_timestamp_ms, max_timestamp_ms].
-    ASTPtr makeASTFilterForReadingTimeSeries(
-        const google::protobuf::RepeatedPtrField<prometheus::LabelMatcher> & label_matcher,
-        Int64 min_timestamp_ms,
-        Int64 max_timestamp_ms,
-        const StorageID & data_table_id,
-        const StorageID & tags_table_id,
-        const std::unordered_map<String, String> & column_name_by_tag_name,
-        bool filter_by_min_time_and_max_time)
-    {
-        ASTs filters;
-
-        if (min_timestamp_ms)
-        {
-            filters.push_back(makeASTTimestampGreaterOrEquals(min_timestamp_ms, data_table_id));
-            if (filter_by_min_time_and_max_time)
-                filters.push_back(makeASTMaxTimeGreaterOrEquals(min_timestamp_ms, tags_table_id));
-        }
-
-        if (max_timestamp_ms)
-        {
-            filters.push_back(makeASTTimestampLessOrEquals(max_timestamp_ms, data_table_id));
-            if (filter_by_min_time_and_max_time)
-                filters.push_back(makeASTMinTimeLessOrEquals(max_timestamp_ms, tags_table_id));
-        }
-
-        for (const auto & label_matcher_element : label_matcher)
-            filters.push_back(makeASTLabelMatcher(label_matcher_element, tags_table_id, column_name_by_tag_name));
-
-        if (filters.empty())
-            return nullptr;
-
-        return makeASTForLogicalAnd(std::move(filters));
-    }
-
-    /// Makes a mapping from a tag name to a column name.
-    std::unordered_map<String, String> makeColumnNameByTagNameMap(const TimeSeriesSettings & storage_settings)
-    {
-        std::unordered_map<String, String> res;
-        const Map & tags_to_columns = storage_settings.tags_to_columns;
-        for (const auto & tag_name_and_column_name : tags_to_columns)
-        {
-            const auto & tuple = tag_name_and_column_name.safeGet<const Tuple &>();
-            const auto & tag_name = tuple.at(0).safeGet<String>();
-            const auto & column_name = tuple.at(1).safeGet<String>();
-            res[tag_name] = column_name;
-        }
-        return res;
-    }
-
-    /// The function builds a SELECT query for reading time series:
-    /// SELECT tags_table.metric_name, tags_table.tag_column1, ... tags_table.tag_columnN, tags_table.tags,
-    ///        groupArray(CAST(data_table.timestamp, 'DateTime64(3)'), CAST(data_table.value, 'Float64'))
-    /// FROM data_table
-    /// SEMI LEFT JOIN tag_table ON data_table.id = tags_table.id
-    /// WHERE filter
-    /// GROUP BY tags_table.tag_column1, ..., tags_table.tag_columnN, tags_table.tags
-    ASTPtr buildSelectQueryForReadingTimeSeries(
-        Int64 min_timestamp_ms,
-        Int64 max_timestamp_ms,
-        const google::protobuf::RepeatedPtrField<prometheus::LabelMatcher> & label_matcher,
-        const TimeSeriesSettings & time_series_settings,
-        const StorageID & data_table_id,
-        const StorageID & tags_table_id)
-    {
-        auto select_query = std::make_shared<ASTSelectQuery>();
-
-            /// SELECT tags_table.metric_name, any(tags_table.tag_column1), ... any(tags_table.tag_columnN), any(tags_table.tags),
-            ///        groupArray(data_table.timestamp, data_table.value)
-            {
-            auto exp_list = std::make_shared<ASTExpressionList>();
-
-            exp_list->children.push_back(
-                makeASTColumn(tags_table_id, TimeSeriesColumnNames::MetricName));
-
-            const Map & tags_to_columns = time_series_settings.tags_to_columns;
-            for (const auto & tag_name_and_column_name : tags_to_columns)
-            {
-                const auto & tuple = tag_name_and_column_name.safeGet<const Tuple &>();
-                const auto & column_name = tuple.at(1).safeGet<String>();
-                exp_list->children.push_back(
-                    makeASTColumn(tags_table_id, column_name));
-            }
-
-            exp_list->children.push_back(
-                makeASTColumn(tags_table_id, TimeSeriesColumnNames::Tags));
-
-            exp_list->children.push_back(
-                makeASTFunction("groupArray",
-                                makeASTFunction("tuple",
-                                                makeASTFunction("CAST", makeASTColumn(data_table_id, TimeSeriesColumnNames::Timestamp), std::make_shared<ASTLiteral>("DateTime64(3)")),
-                                                makeASTFunction("CAST", makeASTColumn(data_table_id, TimeSeriesColumnNames::Value), std::make_shared<ASTLiteral>("Float64")))));
-
-            select_query->setExpression(ASTSelectQuery::Expression::SELECT, exp_list);
-        }
-
-        /// FROM data_table
-        auto tables = std::make_shared<ASTTablesInSelectQuery>();
-
-        {
-            auto table = std::make_shared<ASTTablesInSelectQueryElement>();
-            auto table_exp = std::make_shared<ASTTableExpression>();
-            table_exp->database_and_table_name = std::make_shared<ASTTableIdentifier>(data_table_id);
-            table_exp->children.emplace_back(table_exp->database_and_table_name);
-
-            table->table_expression = table_exp;
-            tables->children.push_back(table);
-        }
-
-        /// SEMI LEFT JOIN tags_table ON data_table.id = tags_table.id
-        {
-            auto table = std::make_shared<ASTTablesInSelectQueryElement>();
-
-            auto table_join = std::make_shared<ASTTableJoin>();
-            table_join->kind = JoinKind::Left;
-            table_join->strictness = JoinStrictness::Semi;
-
-            table_join->on_expression = makeASTFunction("equals", makeASTColumn(data_table_id, TimeSeriesColumnNames::ID), makeASTColumn(tags_table_id, TimeSeriesColumnNames::ID));
-            table->table_join = table_join;
-
-            auto table_exp = std::make_shared<ASTTableExpression>();
-            table_exp->database_and_table_name = std::make_shared<ASTTableIdentifier>(tags_table_id);
-            table_exp->children.emplace_back(table_exp->database_and_table_name);
-
-            table->table_expression = table_exp;
-            tables->children.push_back(table);
-
-            select_query->setExpression(ASTSelectQuery::Expression::TABLES, tables);
-        }
-
-        auto column_name_by_tag_name = makeColumnNameByTagNameMap(time_series_settings);
-
-        /// WHERE <filter>
-        if (auto where = makeASTFilterForReadingTimeSeries(label_matcher, min_timestamp_ms, max_timestamp_ms, data_table_id, tags_table_id,
-                                                           column_name_by_tag_name, time_series_settings.filter_by_min_time_and_max_time))
-        {
-            select_query->setExpression(ASTSelectQuery::Expression::WHERE, std::move(where));
-        }
-
-        /// GROUP BY tags_table.metric_name, tags_table.tag_column1, ..., tags_table.tag_columnN, tags_table.tags
-        {
-            auto exp_list = std::make_shared<ASTExpressionList>();
-
-            exp_list->children.push_back(
-                makeASTColumn(tags_table_id, TimeSeriesColumnNames::MetricName));
-
-            const Map & tags_to_columns = time_series_settings.tags_to_columns;
-            for (const auto & tag_name_and_column_name : tags_to_columns)
-            {
-                const auto & tuple = tag_name_and_column_name.safeGet<const Tuple &>();
-                const auto & column_name = tuple.at(1).safeGet<String>();
-                exp_list->children.push_back(
-                    makeASTColumn(tags_table_id, column_name));
-            }
-
-            exp_list->children.push_back(makeASTColumn(tags_table_id, TimeSeriesColumnNames::Tags));
-
-            select_query->setExpression(ASTSelectQuery::Expression::GROUP_BY, exp_list);
-        }
-
-        return select_query;
-    }
-
-    /// Sorts a list of pairs {tag_name, tag_value} by tag name.
-    void sortLabelsByName(std::vector<std::pair<std::string_view /* label_name */, std::string_view /* label_value */>> & labels)
-    {
-        auto less_by_label_name = [](const std::pair<std::string_view, std::string_view> & left, const std::pair<std::string_view, std::string_view> & right)
-        {
-            return left.first < right.first;
-        };
-        std::sort(labels.begin(), labels.end(), less_by_label_name);
-    }
-
-    /// Sorts a list of pairs {timestamp, value} by timestamp.
-    void sortTimeSeriesByTimestamp(std::vector<std::pair<Int64 /* timestamp_ms */, Float64 /* value */>> & time_series)
-    {
-        auto less_by_timestamp = [](const std::pair<Int64, Float64> & left, const std::pair<Int64, Float64> & right)
-        {
-            return left.first < right.first;
-        };
-        std::sort(time_series.begin(), time_series.end(), less_by_timestamp);
-    }
-
-    /// Converts a block generated by the SELECT query for converting time series to the protobuf format.
-    void convertBlockToProtobuf(
-        Block && block,
-        google::protobuf::RepeatedPtrField<prometheus::TimeSeries> & out_time_series,
-        const StorageID & time_series_storage_id,
-        const TimeSeriesSettings & time_series_settings)
-    {
-        size_t num_rows = block.rows();
-        if (!num_rows)
-            return;
-
-        size_t column_index = 0;
-
-        /// We analyze columns sequentially.
-        auto get_next_column_with_type = [&] -> const ColumnWithTypeAndName & { return block.getByPosition(column_index++); };
-        auto get_next_column = [&] -> const IColumn & { return *(get_next_column_with_type().column); };
-
-        /// Column "metric_name".
-        const auto & metric_name_column_with_type = get_next_column_with_type();
-        TimeSeriesColumnsValidator validator{time_series_storage_id, time_series_settings};
-        validator.validateColumnForMetricName(metric_name_column_with_type);
-        const auto & metric_name_column = *metric_name_column_with_type.column;
-
-        /// Columns corresponding to specific tags specified in the "tags_to_columns" setting.
-        std::unordered_map<String, const IColumn *> column_by_tag_name;
-        const Map & tags_to_columns = time_series_settings.tags_to_columns;
-        for (const auto & tag_name_and_column_name : tags_to_columns)
-        {
-            const auto & tuple = tag_name_and_column_name.safeGet<const Tuple &>();
-            const auto & tag_name = tuple.at(0).safeGet<String>();
-            const auto & column_with_type = get_next_column_with_type();
-            validator.validateColumnForTagValue(column_with_type);
-            const auto & column = *column_with_type.column;
-            column_by_tag_name[tag_name] = &column;
-        }
-
-        /// Column "tags".
-        const auto & tags_column_with_type = get_next_column_with_type();
-        validator.validateColumnForTagsMap(tags_column_with_type);
-        const auto & tags_column = checkAndGetColumn<ColumnMap>(*tags_column_with_type.column);
-        const auto & tags_names = tags_column.getNestedData().getColumn(0);
-        const auto & tags_values = tags_column.getNestedData().getColumn(1);
-        const auto & tags_offsets = tags_column.getNestedColumn().getOffsets();
-
-        /// Column containing time series: groupArray(CAST(data_table.timestamp, 'DateTime64(3)'), CAST(data_table.value, 'Float64'))
-        const auto & time_series_column = checkAndGetColumn<ColumnArray>(get_next_column());
-        const auto & time_series_timestamps = checkAndGetColumn<ColumnDecimal<DateTime64>>(checkAndGetColumn<ColumnTuple>(time_series_column.getData()).getColumn(0));
-        const auto & time_series_values = checkAndGetColumn<ColumnFloat64>(checkAndGetColumn<ColumnTuple>(time_series_column.getData()).getColumn(1));
-        const auto & time_series_offsets = time_series_column.getOffsets();
-
-        /// We will sort labels lexicographically and time series by timestamp before sending them to a client.
-        std::vector<std::pair<std::string_view, std::string_view>> labels;
-        std::vector<std::pair<Int64, Float64>> time_series;
-
-        for (size_t i = 0; i != num_rows; ++i)
-        {
-            /// Collect labels.
-            size_t num_labels = 1; /* 1 for a metric name */
-
-            for (const auto & [_, column] : column_by_tag_name)
-            {
-                if (!column->isNullAt(i) && !column->getDataAt(i).empty())
-                    ++num_labels;
-            }
-
-            size_t tags_start_offset = tags_offsets[i - 1];
-            size_t tags_end_offset = tags_offsets[i];
-            num_labels += tags_end_offset - tags_start_offset;
-
-            labels.clear();
-            labels.reserve(num_labels);
-
-            labels.emplace_back(TimeSeriesTagNames::MetricName, metric_name_column.getDataAt(i));
-
-            for (const auto & [tag_name, column] : column_by_tag_name)
-            {
-                if (!column->isNullAt(i) && !column->getDataAt(i).empty())
-                    labels.emplace_back(tag_name, column->getDataAt(i));
-            }
-
-            for (size_t j = tags_start_offset; j != tags_end_offset; ++j)
-            {
-                std::string_view tag_name{tags_names.getDataAt(j)};
-                std::string_view tag_value{tags_values.getDataAt(j)};
-                labels.emplace_back(tag_name, tag_value);
-            }
-
-            /// Sort labels.
-            sortLabelsByName(labels);
-
-            /// Collect time series.
-            size_t time_series_start_offset = time_series_offsets[i - 1];
-            size_t time_series_end_offset = time_series_offsets[i];
-            size_t num_time_series = time_series_end_offset - time_series_start_offset;
-
-            time_series.clear();
-            time_series.reserve(num_time_series);
-
-            for (size_t j = time_series_start_offset; j != time_series_end_offset; ++j)
-                time_series.emplace_back(time_series_timestamps.getElement(j), time_series_values.getElement(j));
-
-            /// Sort time series.
-            sortTimeSeriesByTimestamp(time_series);
-
-            /// Prepare a result.
-            auto & new_time_series = *out_time_series.Add();
-
-            for (const auto & [label_name, label_value] : labels)
-            {
-                auto & new_label = *new_time_series.add_labels();
-                new_label.set_name(label_name);
-                new_label.set_value(label_value);
-            }
-
-            for (const auto & [timestamp, value] : time_series)
-            {
-                auto & new_sample = *new_time_series.add_samples();
-                new_sample.set_timestamp(timestamp);
-                new_sample.set_value(value);
-            }
-        }
-    }
-}
-
-
-PrometheusRemoteReadProtocol::PrometheusRemoteReadProtocol(ConstStoragePtr time_series_storage_, const ContextPtr & context_)
-    : WithContext{context_}
-    , time_series_storage(storagePtrToTimeSeries(time_series_storage_))
-    , log(getLogger("PrometheusRemoteReadProtocol"))
-{
-}
-
-PrometheusRemoteReadProtocol::~PrometheusRemoteReadProtocol() = default;
-
-void PrometheusRemoteReadProtocol::readTimeSeries(google::protobuf::RepeatedPtrField<prometheus::TimeSeries> & out_time_series,
-                                                  Int64 start_timestamp_ms,
-                                                  Int64 end_timestamp_ms,
-                                                  const google::protobuf::RepeatedPtrField<prometheus::LabelMatcher> & label_matcher,
-                                                  const prometheus::ReadHints &)
-{
-    out_time_series.Clear();
-
-    auto time_series_storage_id = time_series_storage->getStorageID();
-    auto time_series_settings = time_series_storage->getStorageSettingsPtr();
-    auto data_table_id = time_series_storage->getTargetTableId(ViewTarget::Data);
-    auto tags_table_id = time_series_storage->getTargetTableId(ViewTarget::Tags);
-
-    ASTPtr select_query = buildSelectQueryForReadingTimeSeries(
-        start_timestamp_ms, end_timestamp_ms, label_matcher, *time_series_settings, data_table_id, tags_table_id);
-
-    LOG_TRACE(log, "{}: Executing query {}",
-              time_series_storage_id.getNameForLogs(), select_query);
-
-    InterpreterSelectQuery interpreter(select_query, getContext(), SelectQueryOptions{});
-    BlockIO io = interpreter.execute();
-    PullingPipelineExecutor executor(io.pipeline);
-
-    Block block;
-    while (executor.pull(block))
-    {
-        LOG_TRACE(log, "{}: Pulled block with {} columns and {} rows",
-                  time_series_storage_id.getNameForLogs(), block.columns(), block.rows());
-
-        if (block)
-            convertBlockToProtobuf(std::move(block), out_time_series, time_series_storage_id, *time_series_settings);
-    }
-
-    LOG_TRACE(log, "{}: {} time series read",
-              time_series_storage_id.getNameForLogs(), out_time_series.size());
-}
-
-}
-
-#endif
diff --git a/src/Storages/TimeSeries/PrometheusRemoteReadProtocol.h b/src/Storages/TimeSeries/PrometheusRemoteReadProtocol.h
deleted file mode 100644
index e10e1f8c8cf..00000000000
--- a/src/Storages/TimeSeries/PrometheusRemoteReadProtocol.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include "config.h"
-#if USE_PROMETHEUS_PROTOBUFS
-
-#include <Interpreters/Context_fwd.h>
-#include <Storages/IStorage_fwd.h>
-#include <prompb/remote.pb.h>
-
-
-namespace DB
-{
-class StorageTimeSeries;
-
-/// Helper class to support the prometheus remote read protocol.
-class PrometheusRemoteReadProtocol : public WithContext
-{
-public:
-    PrometheusRemoteReadProtocol(ConstStoragePtr time_series_storage_, const ContextPtr & context_);
-    ~PrometheusRemoteReadProtocol();
-
-    /// Reads time series to send to client by remote read protocol.
-    void readTimeSeries(google::protobuf::RepeatedPtrField<prometheus::TimeSeries> & out_time_series,
-                        Int64 start_timestamp_ms,
-                        Int64 end_timestamp_ms,
-                        const google::protobuf::RepeatedPtrField<prometheus::LabelMatcher> & label_matcher,
-                        const prometheus::ReadHints & read_hints);
-
-private:
-    std::shared_ptr<const StorageTimeSeries> time_series_storage;
-    Poco::LoggerPtr log;
-};
-
-}
-
-#endif
diff --git a/src/Storages/TimeSeries/PrometheusRemoteWriteProtocol.cpp b/src/Storages/TimeSeries/PrometheusRemoteWriteProtocol.cpp
deleted file mode 100644
index 702d058ee79..00000000000
--- a/src/Storages/TimeSeries/PrometheusRemoteWriteProtocol.cpp
+++ /dev/null
@@ -1,601 +0,0 @@
-#include <Storages/TimeSeries/PrometheusRemoteWriteProtocol.h>
-
-#include "config.h"
-#if USE_PROMETHEUS_PROTOBUFS
-
-#include <Core/Field.h>
-#include <Core/DecimalFunctions.h>
-#include <DataTypes/DataTypeDateTime64.h>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <DataTypes/DataTypeMap.h>
-#include <DataTypes/DataTypeString.h>
-#include <Storages/StorageTimeSeries.h>
-#include <Storages/TimeSeries/TimeSeriesColumnNames.h>
-#include <Storages/TimeSeries/TimeSeriesColumnsValidator.h>
-#include <Storages/TimeSeries/TimeSeriesTagNames.h>
-#include <Storages/TimeSeries/TimeSeriesSettings.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/ExpressionActions.h>
-#include <Interpreters/InterpreterInsertQuery.h>
-#include <Interpreters/addMissingDefaults.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTInsertQuery.h>
-#include <Parsers/queryToString.h>
-#include <Processors/Executors/PullingPipelineExecutor.h>
-#include <Processors/Executors/PushingPipelineExecutor.h>
-#include <Processors/Sources/BlocksSource.h>
-#include <Processors/Transforms/ExpressionTransform.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int ILLEGAL_TIME_SERIES_TAGS;
-    extern const int ILLEGAL_COLUMN;
-}
-
-
-namespace
-{
-    /// Checks that a specified set of labels is sorted and has no duplications, and there is one label named "__name__".
-    void checkLabels(const ::google::protobuf::RepeatedPtrField<::prometheus::Label> & labels)
-    {
-        bool metric_name_found = false;
-        for (size_t i = 0; i != static_cast<size_t>(labels.size()); ++i)
-        {
-            const auto & label = labels[static_cast<int>(i)];
-            const auto & label_name = label.name();
-            const auto & label_value = label.value();
-
-            if (label_name.empty())
-                throw Exception(ErrorCodes::ILLEGAL_TIME_SERIES_TAGS, "Label name should not be empty");
-            if (label_value.empty())
-                continue; /// Empty label value is treated like the label doesn't exist.
-
-            if (label_name == TimeSeriesTagNames::MetricName)
-                metric_name_found = true;
-
-            if (i)
-            {
-                /// Check that labels are sorted.
-                const auto & previous_label_name = labels[static_cast<int>(i - 1)].name();
-                if (label_name <= previous_label_name)
-                {
-                    if (label_name == previous_label_name)
-                        throw Exception(ErrorCodes::ILLEGAL_TIME_SERIES_TAGS, "Found duplicate label {}", label_name);
-                    else
-                        throw Exception(ErrorCodes::ILLEGAL_TIME_SERIES_TAGS, "Label names are not sorted in lexicographical order ({} > {})",
-                                        previous_label_name, label_name);
-                }
-            }
-        }
-
-        if (!metric_name_found)
-            throw Exception(ErrorCodes::ILLEGAL_TIME_SERIES_TAGS, "Metric name (label {}) not found", TimeSeriesTagNames::MetricName);
-    }
-
-    /// Finds the description of an insertable column in the list.
-    const ColumnDescription & getInsertableColumnDescription(const ColumnsDescription & columns, const String & column_name, const StorageID & time_series_storage_id)
-    {
-        const ColumnDescription * column = columns.tryGet(column_name);
-        if (!column || ((column->default_desc.kind != ColumnDefaultKind::Default) && (column->default_desc.kind != ColumnDefaultKind::Ephemeral)))
-        {
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "{}: Column {} {}",
-                            time_series_storage_id.getNameForLogs(), column_name, column ? "non-insertable" : "doesn't exist");
-        }
-        return *column;
-    }
-
-    /// Calculates the identifier of each time series in "tags_block" using the default expression for the "id" column,
-    /// and adds column "id" with the results to "tags_block".
-    IColumn & calculateId(const ContextPtr & context, const ColumnDescription & id_column_description, Block & tags_block)
-    {
-        auto blocks = std::make_shared<Blocks>();
-        blocks->push_back(tags_block);
-
-        auto header = tags_block.cloneEmpty();
-        auto pipe = Pipe(std::make_shared<BlocksSource>(blocks, header));
-
-        Block header_with_id;
-        const auto & id_name = id_column_description.name;
-        auto id_type = id_column_description.type;
-        header_with_id.insert(ColumnWithTypeAndName{id_type, id_name});
-
-        auto adding_missing_defaults_dag = addMissingDefaults(
-                    pipe.getHeader(),
-                    header_with_id.getNamesAndTypesList(),
-                    ColumnsDescription{id_column_description},
-                    context);
-
-        auto adding_missing_defaults_actions = std::make_shared<ExpressionActions>(std::move(adding_missing_defaults_dag));
-        pipe.addSimpleTransform([&](const Block & stream_header)
-        {
-            return std::make_shared<ExpressionTransform>(stream_header, adding_missing_defaults_actions);
-        });
-
-        auto convert_actions_dag = ActionsDAG::makeConvertingActions(
-            pipe.getHeader().getColumnsWithTypeAndName(),
-            header_with_id.getColumnsWithTypeAndName(),
-            ActionsDAG::MatchColumnsMode::Position);
-        auto actions = std::make_shared<ExpressionActions>(
-            std::move(convert_actions_dag),
-            ExpressionActionsSettings::fromContext(context, CompileExpressions::yes));
-        pipe.addSimpleTransform([&](const Block & stream_header)
-        {
-            return std::make_shared<ExpressionTransform>(stream_header, actions);
-        });
-
-        QueryPipeline pipeline{std::move(pipe)};
-        PullingPipelineExecutor executor{pipeline};
-
-        MutableColumnPtr id_column;
-
-        Block block_from_executor;
-        while (executor.pull(block_from_executor))
-        {
-            if (block_from_executor)
-            {
-                MutableColumnPtr id_column_part = block_from_executor.getByName(id_name).column->assumeMutable();
-                if (id_column)
-                    id_column->insertRangeFrom(*id_column_part, 0, id_column_part->size());
-                else
-                    id_column = std::move(id_column_part);
-            }
-        }
-
-        if (!id_column)
-            id_column = id_type->createColumn();
-
-        IColumn & id_column_ref = *id_column;
-        tags_block.insert(0, ColumnWithTypeAndName{std::move(id_column), id_type, id_name});
-        return id_column_ref;
-    }
-
-    /// Converts a timestamp in milliseconds to a DateTime64 with a specified scale.
-    DateTime64 scaleTimestamp(Int64 timestamp_ms, UInt32 scale)
-    {
-        if (scale == 3)
-            return timestamp_ms;
-        else if (scale > 3)
-            return timestamp_ms * DecimalUtils::scaleMultiplier<DateTime64>(scale - 3);
-        else
-            return timestamp_ms / DecimalUtils::scaleMultiplier<DateTime64>(3 - scale);
-    }
-
-    /// Finds min time and max time in a time series.
-    std::pair<Int64, Int64> findMinTimeAndMaxTime(const google::protobuf::RepeatedPtrField<prometheus::Sample> & samples)
-    {
-        chassert(!samples.empty());
-        Int64 min_time = std::numeric_limits<Int64>::max();
-        Int64 max_time = std::numeric_limits<Int64>::min();
-        for (const auto & sample : samples)
-        {
-            Int64 timestamp = sample.timestamp();
-            if (timestamp < min_time)
-                min_time = timestamp;
-            if (timestamp > max_time)
-                max_time = timestamp;
-        }
-        return {min_time, max_time};
-    }
-
-    struct BlocksToInsert
-    {
-        std::vector<std::pair<ViewTarget::Kind, Block>> blocks;
-    };
-
-    /// Converts time series from the protobuf format to prepared blocks for inserting into target tables.
-    BlocksToInsert toBlocks(const google::protobuf::RepeatedPtrField<prometheus::TimeSeries> & time_series,
-                            const ContextPtr & context,
-                            const StorageID & time_series_storage_id,
-                            const StorageInMemoryMetadata & time_series_storage_metadata,
-                            const TimeSeriesSettings & time_series_settings)
-    {
-        size_t num_tags_rows = time_series.size();
-
-        size_t num_data_rows = 0;
-        for (const auto & element : time_series)
-            num_data_rows += element.samples_size();
-
-        if (!num_data_rows)
-            return {}; /// Nothing to insert into target tables.
-
-        /// Column types must be extracted from the target tables' metadata.
-        const auto & columns_description = time_series_storage_metadata.columns;
-
-        auto get_column_description = [&](const String & column_name) -> const ColumnDescription &
-        {
-            return getInsertableColumnDescription(columns_description, column_name, time_series_storage_id);
-        };
-
-        /// We're going to prepare two blocks - one for the "data" table, and one for the "tags" table.
-        Block data_block, tags_block;
-
-        auto make_column_for_data_block = [&](const ColumnDescription & column_description) -> IColumn &
-        {
-            auto column = column_description.type->createColumn();
-            column->reserve(num_data_rows);
-            auto * column_ptr = column.get();
-            data_block.insert(ColumnWithTypeAndName{std::move(column), column_description.type, column_description.name});
-            return *column_ptr;
-        };
-
-        auto make_column_for_tags_block = [&](const ColumnDescription & column_description) -> IColumn &
-        {
-            auto column = column_description.type->createColumn();
-            column->reserve(num_tags_rows);
-            auto * column_ptr = column.get();
-            tags_block.insert(ColumnWithTypeAndName{std::move(column), column_description.type, column_description.name});
-            return *column_ptr;
-        };
-
-        /// Create columns.
-
-        /// Column "id".
-        const auto & id_description = get_column_description(TimeSeriesColumnNames::ID);
-        TimeSeriesColumnsValidator validator{time_series_storage_id, time_series_settings};
-        validator.validateColumnForID(id_description);
-        auto & id_column_in_data_table = make_column_for_data_block(id_description);
-
-        /// Column "timestamp".
-        const auto & timestamp_description = get_column_description(TimeSeriesColumnNames::Timestamp);
-        UInt32 timestamp_scale;
-        validator.validateColumnForTimestamp(timestamp_description, timestamp_scale);
-        auto & timestamp_column = make_column_for_data_block(timestamp_description);
-
-        /// Column "value".
-        const auto & value_description = get_column_description(TimeSeriesColumnNames::Value);
-        validator.validateColumnForValue(value_description);
-        auto & value_column = make_column_for_data_block(value_description);
-
-        /// Column "metric_name".
-        const auto & metric_name_description = get_column_description(TimeSeriesColumnNames::MetricName);
-        validator.validateColumnForMetricName(metric_name_description);
-        auto & metric_name_column = make_column_for_tags_block(metric_name_description);
-
-        /// Columns we should check explicitly that they're filled after filling each row.
-        std::vector<IColumn *> columns_to_fill_in_tags_table;
-
-        /// Columns corresponding to specific tags specified in the "tags_to_columns" setting.
-        std::unordered_map<String, IColumn *> columns_by_tag_name;
-        const Map & tags_to_columns = time_series_settings.tags_to_columns;
-        for (const auto & tag_name_and_column_name : tags_to_columns)
-        {
-            const auto & tuple = tag_name_and_column_name.safeGet<const Tuple &>();
-            const auto & tag_name = tuple.at(0).safeGet<String>();
-            const auto & column_name = tuple.at(1).safeGet<String>();
-            const auto & column_description = get_column_description(column_name);
-            validator.validateColumnForTagValue(column_description);
-            auto & column = make_column_for_tags_block(column_description);
-            columns_by_tag_name[tag_name] = &column;
-            columns_to_fill_in_tags_table.emplace_back(&column);
-        }
-
-        /// Column "tags".
-        const auto & tags_description = get_column_description(TimeSeriesColumnNames::Tags);
-        validator.validateColumnForTagsMap(tags_description);
-        auto & tags_column = typeid_cast<ColumnMap &>(make_column_for_tags_block(tags_description));
-        IColumn & tags_names = tags_column.getNestedData().getColumn(0);
-        IColumn & tags_values = tags_column.getNestedData().getColumn(1);
-        auto & tags_offsets = tags_column.getNestedColumn().getOffsets();
-
-        /// Column "all_tags".
-        IColumn * all_tags_names = nullptr;
-        IColumn * all_tags_values = nullptr;
-        IColumn::Offsets * all_tags_offsets = nullptr;
-        if (time_series_settings.use_all_tags_column_to_generate_id)
-        {
-            const auto & all_tags_description = get_column_description(TimeSeriesColumnNames::AllTags);
-            validator.validateColumnForTagsMap(all_tags_description);
-            auto & all_tags_column = typeid_cast<ColumnMap &>(make_column_for_tags_block(all_tags_description));
-            all_tags_names = &all_tags_column.getNestedData().getColumn(0);
-            all_tags_values = &all_tags_column.getNestedData().getColumn(1);
-            all_tags_offsets = &all_tags_column.getNestedColumn().getOffsets();
-        }
-
-        /// Columns "min_time" and "max_time".
-        IColumn * min_time_column = nullptr;
-        IColumn * max_time_column = nullptr;
-        UInt32 min_time_scale = 0;
-        UInt32 max_time_scale = 0;
-        if (time_series_settings.store_min_time_and_max_time)
-        {
-            const auto & min_time_description = get_column_description(TimeSeriesColumnNames::MinTime);
-            const auto & max_time_description = get_column_description(TimeSeriesColumnNames::MaxTime);
-            validator.validateColumnForTimestamp(min_time_description, min_time_scale);
-            validator.validateColumnForTimestamp(max_time_description, max_time_scale);
-            min_time_column = &make_column_for_tags_block(min_time_description);
-            max_time_column = &make_column_for_tags_block(max_time_description);
-            columns_to_fill_in_tags_table.emplace_back(min_time_column);
-            columns_to_fill_in_tags_table.emplace_back(max_time_column);
-        }
-
-        /// Prepare a block for inserting into the "tags" table.
-        size_t current_row_in_tags = 0;
-        for (size_t i = 0; i != static_cast<size_t>(time_series.size()); ++i)
-        {
-            const auto & element = time_series[static_cast<int>(i)];
-            if (!element.samples_size())
-                continue;
-
-            const auto & labels = element.labels();
-            checkLabels(labels);
-
-            for (size_t j = 0; j != static_cast<size_t>(labels.size()); ++j)
-            {
-                const auto & label = labels[static_cast<int>(j)];
-                const auto & tag_name = label.name();
-                const auto & tag_value = label.value();
-
-                if (tag_name == TimeSeriesTagNames::MetricName)
-                {
-                    metric_name_column.insertData(tag_value.data(), tag_value.length());
-                }
-                else
-                {
-                    if (time_series_settings.use_all_tags_column_to_generate_id)
-                    {
-                        all_tags_names->insertData(tag_name.data(), tag_name.length());
-                        all_tags_values->insertData(tag_value.data(), tag_value.length());
-                    }
-
-                    auto it = columns_by_tag_name.find(tag_name);
-                    bool has_column_for_tag_value = (it != columns_by_tag_name.end());
-                    if (has_column_for_tag_value)
-                    {
-                        auto * column = it->second;
-                        column->insertData(tag_value.data(), tag_value.length());
-                    }
-                    else
-                    {
-                        tags_names.insertData(tag_name.data(), tag_name.length());
-                        tags_values.insertData(tag_value.data(), tag_value.length());
-                    }
-                }
-            }
-
-            tags_offsets.push_back(tags_names.size());
-
-            if (time_series_settings.use_all_tags_column_to_generate_id)
-                all_tags_offsets->push_back(all_tags_names->size());
-
-            if (time_series_settings.store_min_time_and_max_time)
-            {
-                auto [min_time, max_time] = findMinTimeAndMaxTime(element.samples());
-                min_time_column->insert(scaleTimestamp(min_time, min_time_scale));
-                max_time_column->insert(scaleTimestamp(max_time, max_time_scale));
-            }
-
-            for (auto * column : columns_to_fill_in_tags_table)
-            {
-                if (column->size() == current_row_in_tags)
-                    column->insertDefault();
-            }
-
-            ++current_row_in_tags;
-        }
-
-        /// Calculate an identifier for each time series, make a new column from those identifiers, and add it to "tags_block".
-        auto & id_column_in_tags_table = calculateId(context, columns_description.get(TimeSeriesColumnNames::ID), tags_block);
-
-        /// Prepare a block for inserting to the "data" table.
-        current_row_in_tags = 0;
-        for (size_t i = 0; i != static_cast<size_t>(time_series.size()); ++i)
-        {
-            const auto & element = time_series[static_cast<int>(i)];
-            if (!element.samples_size())
-                continue;
-
-            id_column_in_data_table.insertManyFrom(id_column_in_tags_table, current_row_in_tags, element.samples_size());
-            for (const auto & sample : element.samples())
-            {
-                timestamp_column.insert(scaleTimestamp(sample.timestamp(), timestamp_scale));
-                value_column.insert(sample.value());
-            }
-
-            ++current_row_in_tags;
-        }
-
-        /// The "all_tags" column in the "tags" table is either ephemeral or doesn't exists.
-        /// We've used the "all_tags" column to calculate the "id" column already,
-        /// and now we don't need it to insert to the "tags" table.
-        tags_block.erase(TimeSeriesColumnNames::AllTags);
-
-        BlocksToInsert res;
-
-        /// A block to the "tags" table should be inserted first.
-        /// (Because any INSERT can fail and we don't want to have rows in the data table with no corresponding "id" written to the "tags" table.)
-        res.blocks.emplace_back(ViewTarget::Tags, std::move(tags_block));
-        res.blocks.emplace_back(ViewTarget::Data, std::move(data_block));
-
-        return res;
-    }
-
-    std::string_view metricTypeToString(prometheus::MetricMetadata::MetricType metric_type)
-    {
-        using namespace std::literals;
-        switch (metric_type)
-        {
-            case prometheus::MetricMetadata::UNKNOWN: return "unknown"sv;
-            case prometheus::MetricMetadata::COUNTER: return "counter"sv;
-            case prometheus::MetricMetadata::GAUGE: return "gauge"sv;
-            case prometheus::MetricMetadata::HISTOGRAM: return "histogram"sv;
-            case prometheus::MetricMetadata::GAUGEHISTOGRAM: return "gaugehistogram"sv;
-            case prometheus::MetricMetadata::SUMMARY: return "summary"sv;
-            case prometheus::MetricMetadata::INFO: return "info"sv;
-            case prometheus::MetricMetadata::STATESET: return "stateset"sv;
-            default: break;
-        }
-        return "";
-    }
-
-    /// Converts metrics metadata from the protobuf format to prepared blocks for inserting into target tables.
-    BlocksToInsert toBlocks(const google::protobuf::RepeatedPtrField<prometheus::MetricMetadata> & metrics_metadata,
-                            const StorageID & time_series_storage_id,
-                            const StorageInMemoryMetadata & time_series_storage_metadata,
-                            const TimeSeriesSettings & time_series_settings)
-    {
-        size_t num_rows = metrics_metadata.size();
-
-        if (!num_rows)
-            return {}; /// Nothing to insert into target tables.
-
-        /// Column types must be extracted from the target tables' metadata.
-        const auto & columns_description = time_series_storage_metadata.columns;
-
-        auto get_column_description = [&](const String & column_name) -> const ColumnDescription &
-        {
-            return getInsertableColumnDescription(columns_description, column_name, time_series_storage_id);
-        };
-
-        /// We're going to prepare one blocks for the "metrics" table.
-        Block block;
-
-        auto make_column = [&](const ColumnDescription & column_description) -> IColumn &
-        {
-            auto column = column_description.type->createColumn();
-            column->reserve(num_rows);
-            auto * column_ptr = column.get();
-            block.insert(ColumnWithTypeAndName{std::move(column), column_description.type, column_description.name});
-            return *column_ptr;
-        };
-
-        /// Create columns.
-
-        /// Column "metric_family_name".
-        const auto & metric_family_name_description = get_column_description(TimeSeriesColumnNames::MetricFamilyName);
-        TimeSeriesColumnsValidator validator{time_series_storage_id, time_series_settings};
-        validator.validateColumnForMetricFamilyName(metric_family_name_description);
-        auto & metric_family_name_column = make_column(metric_family_name_description);
-
-        /// Column "type".
-        const auto & type_description = get_column_description(TimeSeriesColumnNames::Type);
-        validator.validateColumnForType(type_description);
-        auto & type_column = make_column(type_description);
-
-        /// Column "unit".
-        const auto & unit_description = get_column_description(TimeSeriesColumnNames::Unit);
-        validator.validateColumnForUnit(unit_description);
-        auto & unit_column = make_column(unit_description);
-
-        /// Column "help".
-        const auto & help_description = get_column_description(TimeSeriesColumnNames::Help);
-        validator.validateColumnForHelp(help_description);
-        auto & help_column = make_column(help_description);
-
-        /// Fill those columns.
-        for (const auto & element : metrics_metadata)
-        {
-            const auto & metric_family_name = element.metric_family_name();
-            const auto & type_str = metricTypeToString(element.type());
-            const auto & help = element.help();
-            const auto & unit = element.unit();
-
-            metric_family_name_column.insertData(metric_family_name.data(), metric_family_name.length());
-            type_column.insertData(type_str.data(), type_str.length());
-            unit_column.insertData(unit.data(), unit.length());
-            help_column.insertData(help.data(), help.length());
-        }
-
-        /// Prepare a result.
-        BlocksToInsert res;
-        res.blocks.emplace_back(ViewTarget::Metrics, std::move(block));
-        return res;
-    }
-
-    /// Inserts blocks to target tables.
-    void insertToTargetTables(BlocksToInsert && blocks, StorageTimeSeries & time_series_storage, ContextPtr context, Poco::Logger * log)
-    {
-        auto time_series_storage_id = time_series_storage.getStorageID();
-
-        for (auto & [table_kind, block] : blocks.blocks)
-        {
-            if (block)
-            {
-                const auto & target_table_id = time_series_storage.getTargetTableId(table_kind);
-
-                LOG_INFO(log, "{}: Inserting {} rows to the {} table",
-                         time_series_storage_id.getNameForLogs(), block.rows(), toString(table_kind));
-
-                auto insert_query = std::make_shared<ASTInsertQuery>();
-                insert_query->table_id = target_table_id;
-
-                auto columns_ast = std::make_shared<ASTExpressionList>();
-                for (const auto & name : block.getNames())
-                    columns_ast->children.emplace_back(std::make_shared<ASTIdentifier>(name));
-                insert_query->columns = columns_ast;
-
-                ContextMutablePtr insert_context = Context::createCopy(context);
-                insert_context->setCurrentQueryId(context->getCurrentQueryId() + ":" + String{toString(table_kind)});
-
-                LOG_TEST(log, "{}: Executing query: {}", time_series_storage_id.getNameForLogs(), queryToString(insert_query));
-
-                InterpreterInsertQuery interpreter(
-                    insert_query,
-                    insert_context,
-                    /* allow_materialized= */ false,
-                    /* no_squash= */ false,
-                    /* no_destination= */ false,
-                    /* async_insert= */ false);
-
-                BlockIO io = interpreter.execute();
-                PushingPipelineExecutor executor(io.pipeline);
-
-                executor.start();
-                executor.push(std::move(block));
-                executor.finish();
-            }
-        }
-    }
-}
-
-
-PrometheusRemoteWriteProtocol::PrometheusRemoteWriteProtocol(StoragePtr time_series_storage_, const ContextPtr & context_)
-    : WithContext(context_)
-    , time_series_storage(storagePtrToTimeSeries(time_series_storage_))
-    , log(getLogger("PrometheusRemoteWriteProtocol"))
-{
-}
-
-PrometheusRemoteWriteProtocol::~PrometheusRemoteWriteProtocol() = default;
-
-
-void PrometheusRemoteWriteProtocol::writeTimeSeries(const google::protobuf::RepeatedPtrField<prometheus::TimeSeries> & time_series)
-{
-    auto time_series_storage_id = time_series_storage->getStorageID();
-
-    LOG_TRACE(log, "{}: Writing {} time series",
-              time_series_storage_id.getNameForLogs(), time_series.size());
-
-    auto time_series_storage_metadata = time_series_storage->getInMemoryMetadataPtr();
-    auto time_series_settings = time_series_storage->getStorageSettingsPtr();
-
-    auto blocks = toBlocks(time_series, getContext(), time_series_storage_id, *time_series_storage_metadata, *time_series_settings);
-    insertToTargetTables(std::move(blocks), *time_series_storage, getContext(), log.get());
-
-    LOG_TRACE(log, "{}: {} time series written",
-              time_series_storage_id.getNameForLogs(), time_series.size());
-}
-
-void PrometheusRemoteWriteProtocol::writeMetricsMetadata(const google::protobuf::RepeatedPtrField<prometheus::MetricMetadata> & metrics_metadata)
-{
-    auto time_series_storage_id = time_series_storage->getStorageID();
-
-    LOG_TRACE(log, "{}: Writing {} metrics metadata",
-              time_series_storage_id.getNameForLogs(), metrics_metadata.size());
-
-    auto time_series_storage_metadata = time_series_storage->getInMemoryMetadataPtr();
-    auto time_series_settings = time_series_storage->getStorageSettingsPtr();
-
-    auto blocks = toBlocks(metrics_metadata, time_series_storage_id, *time_series_storage_metadata, *time_series_settings);
-    insertToTargetTables(std::move(blocks), *time_series_storage, getContext(), log.get());
-
-    LOG_TRACE(log, "{}: {} metrics metadata written",
-              time_series_storage_id.getNameForLogs(), metrics_metadata.size());
-}
-
-}
-
-#endif
diff --git a/src/Storages/TimeSeries/PrometheusRemoteWriteProtocol.h b/src/Storages/TimeSeries/PrometheusRemoteWriteProtocol.h
deleted file mode 100644
index 24c65e96cbe..00000000000
--- a/src/Storages/TimeSeries/PrometheusRemoteWriteProtocol.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include "config.h"
-#if USE_PROMETHEUS_PROTOBUFS
-
-#include <Interpreters/Context_fwd.h>
-#include <Storages/IStorage_fwd.h>
-#include <prompb/remote.pb.h>
-
-
-namespace DB
-{
-class StorageTimeSeries;
-
-/// Helper class to support the prometheus remote write protocol.
-class PrometheusRemoteWriteProtocol : WithContext
-{
-public:
-    PrometheusRemoteWriteProtocol(StoragePtr time_series_storage_, const ContextPtr & context_);
-    ~PrometheusRemoteWriteProtocol();
-
-    /// Insert time series received by remote write protocol to our table.
-    void writeTimeSeries(const google::protobuf::RepeatedPtrField<prometheus::TimeSeries> & time_series);
-
-    /// Insert metrics metadata received by remote write protocol to our table.
-    void writeMetricsMetadata(const google::protobuf::RepeatedPtrField<prometheus::MetricMetadata> & metrics_metadata);
-
-private:
-    std::shared_ptr<StorageTimeSeries> time_series_storage;
-    Poco::LoggerPtr log;
-};
-
-}
-
-#endif
diff --git a/src/Storages/TimeSeries/TimeSeriesColumnNames.h b/src/Storages/TimeSeries/TimeSeriesColumnNames.h
deleted file mode 100644
index d7b12fdeea8..00000000000
--- a/src/Storages/TimeSeries/TimeSeriesColumnNames.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-
-namespace DB
-{
-
-struct TimeSeriesColumnNames
-{
-    /// The "data" table contains time series:
-    static constexpr const char * ID = "id";
-    static constexpr const char * Timestamp = "timestamp";
-    static constexpr const char * Value = "value";
-
-    /// The "tags" table contains identifiers for each combination of a metric name with corresponding tags (labels):
-
-    /// The default expression specified for the "id" column contains an expression for calculating an identifier of a time series by a metric name and tags.
-    //static constexpr const char * kID = "id";
-    static constexpr const char * MetricName = "metric_name";
-
-    /// Contains tags which have no corresponding columns specified in the "tags_to_columns" setting.
-    static constexpr const char * Tags = "tags";
-
-    /// Contains all tags, including those ones which have corresponding columns specified in the "tags_to_columns" setting.
-    /// This is a generated column, it's not stored anywhere, it's generated on the fly.
-    static constexpr const char * AllTags = "all_tags";
-
-    /// Contains the time range of a time series.
-    static constexpr const char * MinTime = "min_time";
-    static constexpr const char * MaxTime = "max_time";
-
-    /// The "metrics" table contains general information (metadata) about metrics:
-    static constexpr const char * MetricFamilyName = "metric_family_name";
-    static constexpr const char * Type = "type";
-    static constexpr const char * Unit = "unit";
-    static constexpr const char * Help = "help";
-};
-
-}
diff --git a/src/Storages/TimeSeries/TimeSeriesColumnsValidator.cpp b/src/Storages/TimeSeries/TimeSeriesColumnsValidator.cpp
deleted file mode 100644
index a2308857e2e..00000000000
--- a/src/Storages/TimeSeries/TimeSeriesColumnsValidator.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-#include <Storages/TimeSeries/TimeSeriesColumnsValidator.h>
-
-#include <DataTypes/DataTypeDateTime64.h>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <DataTypes/DataTypeMap.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <Storages/ColumnsDescription.h>
-#include <Storages/TimeSeries/TimeSeriesColumnNames.h>
-#include <Storages/TimeSeries/TimeSeriesSettings.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int ILLEGAL_COLUMN;
-    extern const int INCOMPATIBLE_COLUMNS;
-    extern const int THERE_IS_NO_COLUMN;
-}
-
-
-TimeSeriesColumnsValidator::TimeSeriesColumnsValidator(StorageID time_series_storage_id_,
-                                                       std::reference_wrapper<const TimeSeriesSettings> time_series_settings_)
-    : time_series_storage_id(std::move(time_series_storage_id_))
-    , time_series_settings(time_series_settings_)
-{
-}
-
-
-void TimeSeriesColumnsValidator::validateColumns(const ColumnsDescription & columns) const
-{
-    try
-    {
-        validateColumnsImpl(columns);
-    }
-    catch (Exception & e)
-    {
-        e.addMessage("While checking columns of TimeSeries table {}", time_series_storage_id.getNameForLogs());
-        throw;
-    }
-}
-
-
-void TimeSeriesColumnsValidator::validateColumnsImpl(const ColumnsDescription & columns) const
-{
-
-    auto get_column_description = [&](const String & column_name) -> const ColumnDescription &
-    {
-        const auto * column = columns.tryGet(column_name);
-        if (!column)
-        {
-            throw Exception(ErrorCodes::THERE_IS_NO_COLUMN, "Column {} is required for the TimeSeries table engine", column_name);
-        }
-        return *column;
-    };
-
-    /// Validate columns for the "data" table.
-    validateColumnForID(get_column_description(TimeSeriesColumnNames::ID));
-    validateColumnForTimestamp(get_column_description(TimeSeriesColumnNames::Timestamp));
-    validateColumnForValue(get_column_description(TimeSeriesColumnNames::Value));
-
-    /// Validate columns for the "tags" table.
-    validateColumnForMetricName(get_column_description(TimeSeriesColumnNames::MetricName));
-
-    const Map & tags_to_columns = time_series_settings.tags_to_columns;
-    for (const auto & tag_name_and_column_name : tags_to_columns)
-    {
-        const auto & tuple = tag_name_and_column_name.safeGet<const Tuple &>();
-        const auto & column_name = tuple.at(1).safeGet<String>();
-        validateColumnForTagValue(get_column_description(column_name));
-    }
-
-    validateColumnForTagsMap(get_column_description(TimeSeriesColumnNames::Tags));
-    validateColumnForTagsMap(get_column_description(TimeSeriesColumnNames::AllTags));
-
-    /// Validate columns for the "metrics" table.
-    validateColumnForMetricFamilyName(get_column_description(TimeSeriesColumnNames::MetricFamilyName));
-    validateColumnForType(get_column_description(TimeSeriesColumnNames::Type));
-    validateColumnForUnit(get_column_description(TimeSeriesColumnNames::Unit));
-    validateColumnForHelp(get_column_description(TimeSeriesColumnNames::Help));
-}
-
-
-void TimeSeriesColumnsValidator::validateTargetColumns(ViewTarget::Kind target_kind, const StorageID & target_table_id, const ColumnsDescription & target_columns) const
-{
-    try
-    {
-        validateTargetColumnsImpl(target_kind, target_columns);
-    }
-    catch (Exception & e)
-    {
-        e.addMessage("While checking columns of table {} which is the {} target of TimeSeries table {}", target_table_id.getNameForLogs(),
-                     toString(target_kind), time_series_storage_id.getNameForLogs());
-        throw;
-    }
-}
-
-
-void TimeSeriesColumnsValidator::validateTargetColumnsImpl(ViewTarget::Kind target_kind, const ColumnsDescription & target_columns) const
-{
-    auto get_column_description = [&](const String & column_name) -> const ColumnDescription &
-    {
-        const auto * column = target_columns.tryGet(column_name);
-        if (!column)
-        {
-            throw Exception(ErrorCodes::THERE_IS_NO_COLUMN, "Column {} is required for the TimeSeries table engine", column_name);
-        }
-        return *column;
-    };
-
-    switch (target_kind)
-    {
-        case ViewTarget::Data:
-        {
-            /// Here "check_default = false" because it's ok for the "id" column in the target table not to contain
-            /// an expression for calculating the identifier of a time series.
-            validateColumnForID(get_column_description(TimeSeriesColumnNames::ID), /* check_default= */ false);
-
-            validateColumnForTimestamp(get_column_description(TimeSeriesColumnNames::Timestamp));
-            validateColumnForValue(get_column_description(TimeSeriesColumnNames::Value));
-
-            break;
-        }
-
-        case ViewTarget::Tags:
-        {
-            validateColumnForMetricName(get_column_description(TimeSeriesColumnNames::MetricName));
-
-            const Map & tags_to_columns = time_series_settings.tags_to_columns;
-            for (const auto & tag_name_and_column_name : tags_to_columns)
-            {
-                const auto & tuple = tag_name_and_column_name.safeGet<const Tuple &>();
-                const auto & column_name = tuple.at(1).safeGet<String>();
-                validateColumnForTagValue(get_column_description(column_name));
-            }
-
-            validateColumnForTagsMap(get_column_description(TimeSeriesColumnNames::Tags));
-
-            break;
-        }
-
-        case ViewTarget::Metrics:
-        {
-            validateColumnForMetricFamilyName(get_column_description(TimeSeriesColumnNames::MetricFamilyName));
-            validateColumnForType(get_column_description(TimeSeriesColumnNames::Type));
-            validateColumnForUnit(get_column_description(TimeSeriesColumnNames::Unit));
-            validateColumnForHelp(get_column_description(TimeSeriesColumnNames::Help));
-            break;
-        }
-
-        default:
-            UNREACHABLE();
-    }
-}
-
-
-void TimeSeriesColumnsValidator::validateColumnForID(const ColumnDescription & column, bool check_default) const
-{
-    if (check_default && !column.default_desc.expression)
-    {
-        throw Exception(ErrorCodes::INCOMPATIBLE_COLUMNS, "The DEFAULT expression for column {} must contain an expression "
-                        "which will be used to calculate the identifier of each time series: {} {} DEFAULT ...",
-                        column.name, column.name, column.type->getName());
-    }
-}
-
-void TimeSeriesColumnsValidator::validateColumnForTimestamp(const ColumnDescription & column) const
-{
-    if (!isDateTime64(removeNullable(column.type)))
-    {
-        throw Exception(ErrorCodes::INCOMPATIBLE_COLUMNS, "Column {} has illegal data type {}, expected DateTime64",
-                        column.name, column.type->getName());
-    }
-}
-
-void TimeSeriesColumnsValidator::validateColumnForTimestamp(const ColumnDescription & column, UInt32 & out_scale) const
-{
-    auto maybe_datetime64_type = removeNullable(column.type);
-    if (!isDateTime64(maybe_datetime64_type))
-    {
-        throw Exception(ErrorCodes::INCOMPATIBLE_COLUMNS, "Column {} has illegal data type {}, expected DateTime64",
-                        column.name, column.type->getName());
-    }
-    const auto & datetime64_type = typeid_cast<const DataTypeDateTime64 &>(*maybe_datetime64_type);
-    out_scale = datetime64_type.getScale();
-}
-
-void TimeSeriesColumnsValidator::validateColumnForValue(const ColumnDescription & column) const
-{
-    if (!isFloat(removeNullable(column.type)))
-    {
-        throw Exception(ErrorCodes::INCOMPATIBLE_COLUMNS, "Column {} has illegal data type {}, expected Float32 or Float64",
-                        column.name, column.type->getName());
-    }
-}
-
-void TimeSeriesColumnsValidator::validateColumnForMetricName(const ColumnDescription & column) const
-{
-    validateColumnForTagValue(column);
-}
-
-void TimeSeriesColumnsValidator::validateColumnForMetricName(const ColumnWithTypeAndName & column) const
-{
-    validateColumnForTagValue(column);
-}
-
-void TimeSeriesColumnsValidator::validateColumnForTagValue(const ColumnDescription & column) const
-{
-    if (!isString(removeLowCardinalityAndNullable(column.type)))
-    {
-        throw Exception(ErrorCodes::INCOMPATIBLE_COLUMNS, "Column {} has illegal data type {}, expected String or LowCardinality(String)",
-                        column.name, column.type->getName());
-    }
-}
-
-void TimeSeriesColumnsValidator::validateColumnForTagValue(const ColumnWithTypeAndName & column) const
-{
-    if (!isString(removeLowCardinalityAndNullable(column.type)))
-    {
-        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Column {} has illegal data type {}, expected String or LowCardinality(String)",
-                        column.name, column.type->getName());
-    }
-}
-
-void TimeSeriesColumnsValidator::validateColumnForTagsMap(const ColumnDescription & column) const
-{
-    if (!isMap(column.type)
-        || !isString(removeLowCardinality(typeid_cast<const DataTypeMap &>(*column.type).getKeyType()))
-        || !isString(removeLowCardinality(typeid_cast<const DataTypeMap &>(*column.type).getValueType())))
-    {
-        throw Exception(ErrorCodes::INCOMPATIBLE_COLUMNS, "Column {} has illegal data type {}, expected Map(String, String) or Map(LowCardinality(String), String)",
-                        column.name, column.type->getName());
-    }
-}
-
-void TimeSeriesColumnsValidator::validateColumnForTagsMap(const ColumnWithTypeAndName & column) const
-{
-    if (!isMap(column.type)
-        || !isString(removeLowCardinality(typeid_cast<const DataTypeMap &>(*column.type).getKeyType()))
-        || !isString(removeLowCardinality(typeid_cast<const DataTypeMap &>(*column.type).getValueType())))
-    {
-        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Column {} has illegal data type {}, expected Map(String, String) or Map(LowCardinality(String), String)",
-                        column.name, column.type->getName());
-    }
-}
-
-void TimeSeriesColumnsValidator::validateColumnForMetricFamilyName(const ColumnDescription & column) const
-{
-    if (!isString(removeLowCardinalityAndNullable(column.type)))
-    {
-        throw Exception(ErrorCodes::INCOMPATIBLE_COLUMNS, "Column {} has illegal data type {}, expected String or LowCardinality(String)",
-                        column.name, column.type->getName());
-    }
-}
-
-void TimeSeriesColumnsValidator::validateColumnForType(const ColumnDescription & column) const
-{
-    validateColumnForMetricFamilyName(column);
-}
-
-void TimeSeriesColumnsValidator::validateColumnForUnit(const ColumnDescription & column) const
-{
-    validateColumnForMetricFamilyName(column);
-}
-
-void TimeSeriesColumnsValidator::validateColumnForHelp(const ColumnDescription & column) const
-{
-    validateColumnForMetricFamilyName(column);
-}
-
-}
diff --git a/src/Storages/TimeSeries/TimeSeriesColumnsValidator.h b/src/Storages/TimeSeries/TimeSeriesColumnsValidator.h
deleted file mode 100644
index 43a54bf2ad6..00000000000
--- a/src/Storages/TimeSeries/TimeSeriesColumnsValidator.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#pragma once
-
-#include <Interpreters/StorageID.h>
-#include <Parsers/ASTViewTargets.h>
-
-
-namespace DB
-{
-class ColumnsDescription;
-struct ColumnDescription;
-struct ColumnWithTypeAndName;
-struct TimeSeriesSettings;
-
-/// Checks the types of columns of a TimeSeries table.
-class TimeSeriesColumnsValidator
-{
-public:
-    /// Constructor stores a reference to argument `time_series_settings_` (it's unnecessary to copy it).
-    TimeSeriesColumnsValidator(StorageID time_series_storage_id_,
-                               std::reference_wrapper<const TimeSeriesSettings> time_series_settings_);
-
-    /// Checks the columns of a TimeSeries table and throws an exception if some of the required columns don't exist or have illegal types.
-    void validateColumns(const ColumnsDescription & columns) const;
-
-    /// Checks columns of a target table that a TimeSeries table is going to use.
-    /// Throws an exception if some of the required columns don't exist or have illegal types.
-    void validateTargetColumns(ViewTarget::Kind target_kind, const StorageID & target_table_id, const ColumnsDescription & target_columns) const;
-
-    /// Each of the following functions validates a specific column type.
-    void validateColumnForID(const ColumnDescription & column, bool check_default = true) const;
-    void validateColumnForTimestamp(const ColumnDescription & column) const;
-    void validateColumnForTimestamp(const ColumnDescription & column, UInt32 & out_scale) const;
-    void validateColumnForValue(const ColumnDescription & column) const;
-
-    void validateColumnForMetricName(const ColumnDescription & column) const;
-    void validateColumnForMetricName(const ColumnWithTypeAndName & column) const;
-    void validateColumnForTagValue(const ColumnDescription & column) const;
-    void validateColumnForTagValue(const ColumnWithTypeAndName & column) const;
-    void validateColumnForTagsMap(const ColumnDescription & column) const;
-    void validateColumnForTagsMap(const ColumnWithTypeAndName & column) const;
-
-    void validateColumnForMetricFamilyName(const ColumnDescription & column) const;
-    void validateColumnForType(const ColumnDescription & column) const;
-    void validateColumnForUnit(const ColumnDescription & column) const;
-    void validateColumnForHelp(const ColumnDescription & column) const;
-
-private:
-    void validateColumnsImpl(const ColumnsDescription & columns) const;
-    void validateTargetColumnsImpl(ViewTarget::Kind target_kind, const ColumnsDescription & target_columns) const;
-
-    const StorageID time_series_storage_id;
-    const TimeSeriesSettings & time_series_settings;
-};
-
-}
diff --git a/src/Storages/TimeSeries/TimeSeriesDefinitionNormalizer.cpp b/src/Storages/TimeSeries/TimeSeriesDefinitionNormalizer.cpp
deleted file mode 100644
index 746a6a28274..00000000000
--- a/src/Storages/TimeSeries/TimeSeriesDefinitionNormalizer.cpp
+++ /dev/null
@@ -1,473 +0,0 @@
-#include <Storages/TimeSeries/TimeSeriesDefinitionNormalizer.h>
-
-#include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypeFixedString.h>
-#include <Parsers/ASTColumnDeclaration.h>
-#include <Parsers/ASTCreateQuery.h>
-#include <Parsers/ASTDataType.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTLiteral.h>
-#include <Storages/TimeSeries/TimeSeriesColumnNames.h>
-#include <Storages/TimeSeries/TimeSeriesSettings.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int INCOMPATIBLE_COLUMNS;
-    extern const int INCORRECT_QUERY;
-}
-
-
-TimeSeriesDefinitionNormalizer::TimeSeriesDefinitionNormalizer(StorageID time_series_storage_id_,
-                                                               std::reference_wrapper<const TimeSeriesSettings> time_series_settings_,
-                                                               const ASTCreateQuery * as_create_query_)
-    : time_series_storage_id(std::move(time_series_storage_id_))
-    , time_series_settings(time_series_settings_)
-    , as_create_query(as_create_query_)
-{
-}
-
-
-void TimeSeriesDefinitionNormalizer::normalize(ASTCreateQuery & create_query) const
-{
-    reorderColumns(create_query);
-    addMissingColumns(create_query);
-    addMissingDefaultForIDColumn(create_query);
-
-    if (as_create_query)
-        addMissingInnerEnginesFromAsTable(create_query);
-
-    addMissingInnerEngines(create_query);
-}
-
-
-void TimeSeriesDefinitionNormalizer::reorderColumns(ASTCreateQuery & create) const
-{
-    if (!create.columns_list || !create.columns_list->columns)
-        return;
-
-    auto & columns = create.columns_list->columns->children;
-
-    /// Build a map "column_name -> column_declaration".
-    std::unordered_map<std::string_view, std::shared_ptr<ASTColumnDeclaration>> columns_by_name;
-    for (const auto & column : columns)
-    {
-        auto column_declaration = typeid_cast<std::shared_ptr<ASTColumnDeclaration>>(column);
-        columns_by_name[column_declaration->name] = column_declaration;
-    }
-
-    /// Remove all columns and then add them again in the canonical order.
-    columns.clear();
-
-    auto add_column_in_correct_order = [&](std::string_view column_name)
-    {
-        auto it = columns_by_name.find(column_name);
-        if (it != columns_by_name.end())
-        {
-            /// Add the column back to the list.
-            columns.push_back(it->second);
-
-            /// Remove the column from the map to allow the check at the end of this function
-            /// that all columns from the original list are added back to the list.
-            columns_by_name.erase(it);
-        }
-    };
-
-    /// Reorder columns for the "data" table.
-    add_column_in_correct_order(TimeSeriesColumnNames::ID);
-    add_column_in_correct_order(TimeSeriesColumnNames::Timestamp);
-    add_column_in_correct_order(TimeSeriesColumnNames::Value);
-
-    /// Reorder columns for the "tags" table.
-    add_column_in_correct_order(TimeSeriesColumnNames::MetricName);
-
-    const Map & tags_to_columns = time_series_settings.tags_to_columns;
-    for (const auto & tag_name_and_column_name : tags_to_columns)
-    {
-        const auto & tuple = tag_name_and_column_name.safeGet<const Tuple &>();
-        const auto & column_name = tuple.at(1).safeGet<String>();
-        add_column_in_correct_order(column_name);
-    }
-
-    add_column_in_correct_order(TimeSeriesColumnNames::Tags);
-    add_column_in_correct_order(TimeSeriesColumnNames::AllTags);
-
-    if (time_series_settings.store_min_time_and_max_time)
-    {
-        add_column_in_correct_order(TimeSeriesColumnNames::MinTime);
-        add_column_in_correct_order(TimeSeriesColumnNames::MaxTime);
-    }
-
-    /// Reorder columns for the "metrics" table.
-    add_column_in_correct_order(TimeSeriesColumnNames::MetricFamilyName);
-    add_column_in_correct_order(TimeSeriesColumnNames::Type);
-    add_column_in_correct_order(TimeSeriesColumnNames::Unit);
-    add_column_in_correct_order(TimeSeriesColumnNames::Help);
-
-    /// All columns from the original list must be added back to the list.
-    if (!columns_by_name.empty())
-    {
-        throw Exception(
-            ErrorCodes::INCOMPATIBLE_COLUMNS,
-            "{}: Column {} can't be used in this table. "
-            "The TimeSeries table engine supports only a limited set of columns (id, timestamp, value, metric_name, tags, metric_family_name, type, unit, help). "
-            "Extra columns representing tags must be specified in the 'tags_to_columns' setting.",
-            time_series_storage_id.getNameForLogs(), columns_by_name.begin()->first);
-    }
-}
-
-
-void TimeSeriesDefinitionNormalizer::addMissingColumns(ASTCreateQuery & create) const
-{
-    if (!create.as_table.empty())
-    {
-        /// If the create query has the "AS other_table" clause ("CREATE TABLE table AS other_table")
-        /// then all columns must be extracted from that "other_table".
-        /// Function InterpreterCreateQuery::getTablePropertiesAndNormalizeCreateQuery() will do that for us,
-        /// we don't need to fill missing columns by default in that case.
-        return;
-    }
-
-    if (!create.columns_list)
-        create.set(create.columns_list, std::make_shared<ASTColumns>());
-
-    if (!create.columns_list->columns)
-        create.columns_list->set(create.columns_list->columns, std::make_shared<ASTExpressionList>());
-    auto & columns = create.columns_list->columns->children;
-
-    /// Here in this function we rely on that the columns are already sorted in the canonical order (see the reorderColumns() function).
-    /// NOTE: The order in which this function processes columns MUST be exactly the same as the order in reorderColumns().
-    size_t position = 0;
-
-    auto is_next_column_named = [&](std::string_view column_name)
-    {
-        if (position < columns.size() && (typeid_cast<const ASTColumnDeclaration &>(*columns[position]).name == column_name))
-        {
-            ++position;
-            return true;
-        }
-        return false;
-    };
-
-    auto make_new_column = [&](const String & column_name, ASTPtr type)
-    {
-        auto new_column = std::make_shared<ASTColumnDeclaration>();
-        new_column->name = column_name;
-        new_column->type = type;
-        columns.insert(columns.begin() + position, new_column);
-        ++position;
-    };
-
-    auto get_uuid_type = [] { return makeASTDataType("UUID"); };
-    auto get_datetime_type = [] { return makeASTDataType("DateTime64", std::make_shared<ASTLiteral>(3ul)); };
-    auto get_float_type = [] { return makeASTDataType("Float64"); };
-    auto get_string_type = [] { return makeASTDataType("String"); };
-    auto get_lc_string_type = [&] { return makeASTDataType("LowCardinality", get_string_type()); };
-    auto get_string_to_string_map_type = [&] { return makeASTDataType("Map", get_string_type(), get_string_type()); };
-    auto get_lc_string_to_string_map_type = [&] { return makeASTDataType("Map", get_lc_string_type(), get_string_type()); };
-
-    auto make_nullable = [&](std::shared_ptr<ASTDataType> type)
-    {
-        if (type->name == "Nullable")
-            return type;
-        else
-           return makeASTDataType("Nullable", type);
-    };
-
-    /// Add missing columns for the "data" table.
-    if (!is_next_column_named(TimeSeriesColumnNames::ID))
-        make_new_column(TimeSeriesColumnNames::ID, get_uuid_type());
-
-    if (!is_next_column_named(TimeSeriesColumnNames::Timestamp))
-        make_new_column(TimeSeriesColumnNames::Timestamp, get_datetime_type());
-
-    auto timestamp_column = typeid_cast<std::shared_ptr<ASTColumnDeclaration>>(columns[position - 1]);
-    auto timestamp_type = typeid_cast<std::shared_ptr<ASTDataType>>(timestamp_column->type->ptr());
-
-    if (!is_next_column_named(TimeSeriesColumnNames::Value))
-        make_new_column(TimeSeriesColumnNames::Value, get_float_type());
-
-    /// Add missing columns for the "tags" table.
-    if (!is_next_column_named(TimeSeriesColumnNames::MetricName))
-    {
-        /// We use 'LowCardinality(String)' as the default type of the `metric_name` column:
-        /// it looks like a correct optimization because there are shouldn't be too many different metrics.
-        make_new_column(TimeSeriesColumnNames::MetricName, get_lc_string_type());
-    }
-
-    const Map & tags_to_columns = time_series_settings.tags_to_columns;
-    for (const auto & tag_name_and_column_name : tags_to_columns)
-    {
-        const auto & tuple = tag_name_and_column_name.safeGet<const Tuple &>();
-        const auto & column_name = tuple.at(1).safeGet<String>();
-        if (!is_next_column_named(column_name))
-            make_new_column(column_name, get_string_type());
-    }
-
-    if (!is_next_column_named(TimeSeriesColumnNames::Tags))
-    {
-        /// We use 'Map(LowCardinality(String), String)' as the default type of the `tags` column:
-        /// it looks like a correct optimization because there are shouldn't be too many different tag names.
-        make_new_column(TimeSeriesColumnNames::Tags, get_lc_string_to_string_map_type());
-    }
-
-    if (!is_next_column_named(TimeSeriesColumnNames::AllTags))
-    {
-        /// The `all_tags` column is virtual (it's calculated on the fly and never stored anywhere)
-        /// so here we don't need to use the LowCardinality optimization as for the `tags` column.
-        make_new_column(TimeSeriesColumnNames::AllTags, get_string_to_string_map_type());
-    }
-
-    if (time_series_settings.store_min_time_and_max_time)
-    {
-        /// We use Nullable(DateTime64(3)) as the default type of the `min_time` and `max_time` columns.
-        /// It's nullable because it allows the aggregation (see aggregate_min_time_and_max_time) work correctly even
-        /// for rows in the "tags" table which doesn't have `min_time` and `max_time` (because they have no matching rows in the "data" table).
-
-        if (!is_next_column_named(TimeSeriesColumnNames::MinTime))
-            make_new_column(TimeSeriesColumnNames::MinTime, make_nullable(timestamp_type));
-        if (!is_next_column_named(TimeSeriesColumnNames::MaxTime))
-            make_new_column(TimeSeriesColumnNames::MaxTime, make_nullable(timestamp_type));
-    }
-
-    /// Add missing columns for the "metrics" table.
-    if (!is_next_column_named(TimeSeriesColumnNames::MetricFamilyName))
-        make_new_column(TimeSeriesColumnNames::MetricFamilyName, get_string_type());
-
-    if (!is_next_column_named(TimeSeriesColumnNames::Type))
-        make_new_column(TimeSeriesColumnNames::Type, get_string_type());
-
-    if (!is_next_column_named(TimeSeriesColumnNames::Unit))
-        make_new_column(TimeSeriesColumnNames::Unit, get_string_type());
-
-    if (!is_next_column_named(TimeSeriesColumnNames::Help))
-        make_new_column(TimeSeriesColumnNames::Help, get_string_type());
-
-    /// If the following fails that means the order in which columns are processed in this function doesn't match the order of columns in reorderColumns().
-    chassert(position == columns.size());
-}
-
-
-void TimeSeriesDefinitionNormalizer::addMissingDefaultForIDColumn(ASTCreateQuery & create) const
-{
-    /// Find the 'id' column and make a default expression for it.
-    if (!create.columns_list || !create.columns_list->columns)
-        return;
-
-    auto & columns = create.columns_list->columns->children;
-    auto * it = std::find_if(columns.begin(), columns.end(), [](const ASTPtr & column)
-    {
-        return typeid_cast<const ASTColumnDeclaration &>(*column).name == TimeSeriesColumnNames::ID;
-    });
-
-    if (it == columns.end())
-        return;
-
-    auto & column_declaration = typeid_cast<ASTColumnDeclaration &>(**it);
-
-    /// We add a DEFAULT for the 'id' column only if it's not specified yet.
-    if (column_declaration.default_specifier.empty() && !column_declaration.default_expression)
-    {
-        column_declaration.default_specifier = "DEFAULT";
-        column_declaration.default_expression = chooseIDAlgorithm(column_declaration);
-    }
-}
-
-
-ASTPtr TimeSeriesDefinitionNormalizer::chooseIDAlgorithm(const ASTColumnDeclaration & id_column) const
-{
-    /// Build a list of arguments for a hash function.
-    /// All hash functions below allow multiple arguments, so we use two arguments: metric_name, all_tags.
-    ASTs arguments_for_hash_function;
-    arguments_for_hash_function.push_back(std::make_shared<ASTIdentifier>(TimeSeriesColumnNames::MetricName));
-
-    if (time_series_settings.use_all_tags_column_to_generate_id)
-    {
-        arguments_for_hash_function.push_back(std::make_shared<ASTIdentifier>(TimeSeriesColumnNames::AllTags));
-    }
-    else
-    {
-        const Map & tags_to_columns = time_series_settings.tags_to_columns;
-        for (const auto & tag_name_and_column_name : tags_to_columns)
-        {
-            const auto & tuple = tag_name_and_column_name.safeGet<const Tuple &>();
-            const auto & column_name = tuple.at(1).safeGet<String>();
-            arguments_for_hash_function.push_back(std::make_shared<ASTIdentifier>(column_name));
-        }
-        arguments_for_hash_function.push_back(std::make_shared<ASTIdentifier>(TimeSeriesColumnNames::Tags));
-    }
-
-    auto make_hash_function = [&](const String & function_name)
-    {
-        auto function = std::make_shared<ASTFunction>();
-        function->name = function_name;
-        auto arguments_list = std::make_shared<ASTExpressionList>();
-        arguments_list->children = std::move(arguments_for_hash_function);
-        function->arguments = arguments_list;
-        return function;
-    };
-
-    /// The type of a hash function depends on the type of the 'id' column.
-    auto id_type = DataTypeFactory::instance().get(id_column.type);
-    WhichDataType id_type_which(*id_type);
-
-    if (id_type_which.isUInt64())
-    {
-        return make_hash_function("sipHash64");
-    }
-    else if (id_type_which.isFixedString() && typeid_cast<const DataTypeFixedString &>(*id_type).getN() == 16)
-    {
-        return make_hash_function("sipHash128");
-    }
-    else if (id_type_which.isUUID())
-    {
-        return makeASTFunction("reinterpretAsUUID", make_hash_function("sipHash128"));
-    }
-    else if (id_type_which.isUInt128())
-    {
-        return makeASTFunction("reinterpretAsUInt128", make_hash_function("sipHash128"));
-    }
-    else
-    {
-        throw Exception(ErrorCodes::INCOMPATIBLE_COLUMNS, "{}: The DEFAULT expression for column {} must contain an expression "
-                        "which will be used to calculate the identifier of each time series: {} {} DEFAULT ... "
-                        "If the DEFAULT expression is not specified then it can be chosen implicitly but only if the column type is one of these: UInt64, UInt128, UUID. "
-                        "For type {} the DEFAULT expression can't be chosen automatically, so please specify it explicitly",
-                        time_series_storage_id.getNameForLogs(), id_column.name, id_column.name, id_type->getName(), id_type->getName());
-    }
-}
-
-
-void TimeSeriesDefinitionNormalizer::addMissingInnerEnginesFromAsTable(ASTCreateQuery & create) const
-{
-    if (!as_create_query)
-        return;
-
-    for (auto target_kind : {ViewTarget::Data, ViewTarget::Tags, ViewTarget::Metrics})
-    {
-        if (as_create_query->hasTargetTableID(target_kind))
-        {
-            /// It's unlikely correct to use "CREATE table AS other_table" when "other_table" has external tables like this:
-            /// CREATE TABLE other_table ENGINE=TimeSeries data mydata
-            /// (because `table` would use the same table "mydata").
-            /// Thus we just prohibit that.
-            QualifiedTableName as_table{as_create_query->getDatabase(), as_create_query->getTable()};
-            throw Exception(
-                ErrorCodes::INCORRECT_QUERY,
-                "Cannot CREATE a table AS {}.{} because it has external tables",
-                backQuoteIfNeed(as_table.database), backQuoteIfNeed(as_table.table));
-        }
-
-        auto inner_table_engine = create.getTargetInnerEngine(target_kind);
-        if (!inner_table_engine)
-        {
-            /// Copy an inner engine's definition from the other table.
-            inner_table_engine = as_create_query->getTargetInnerEngine(target_kind);
-            if (inner_table_engine)
-                create.setTargetInnerEngine(target_kind, typeid_cast<std::shared_ptr<ASTStorage>>(inner_table_engine->clone()));
-        }
-    }
-}
-
-
-void TimeSeriesDefinitionNormalizer::addMissingInnerEngines(ASTCreateQuery & create) const
-{
-    for (auto target_kind : {ViewTarget::Data, ViewTarget::Tags, ViewTarget::Metrics})
-    {
-        if (create.hasTargetTableID(target_kind))
-            continue; /// External target is set, inner engine is not needed.
-
-        auto inner_table_engine = create.getTargetInnerEngine(target_kind);
-        if (inner_table_engine && inner_table_engine->engine)
-            continue; /// Engine is set already, skip it.
-
-        if (!inner_table_engine)
-        {
-            /// Some part of storage definition (such as PARTITION BY) is specified, but the inner ENGINE is not: just set default one.
-            inner_table_engine = std::make_shared<ASTStorage>();
-            create.setTargetInnerEngine(target_kind, inner_table_engine);
-        }
-
-        /// Set engine by default.
-        setInnerEngineByDefault(target_kind, *inner_table_engine);
-    }
-}
-
-
-void TimeSeriesDefinitionNormalizer::setInnerEngineByDefault(ViewTarget::Kind inner_table_kind, ASTStorage & inner_storage_def) const
-{
-    switch (inner_table_kind)
-    {
-        case ViewTarget::Data:
-        {
-            inner_storage_def.set(inner_storage_def.engine, makeASTFunction("MergeTree"));
-            inner_storage_def.engine->no_empty_args = false;
-
-            if (!inner_storage_def.order_by && !inner_storage_def.primary_key && inner_storage_def.engine->name.ends_with("MergeTree"))
-            {
-                inner_storage_def.set(inner_storage_def.order_by,
-                                      makeASTFunction("tuple",
-                                                      std::make_shared<ASTIdentifier>(TimeSeriesColumnNames::ID),
-                                                      std::make_shared<ASTIdentifier>(TimeSeriesColumnNames::Timestamp)));
-            }
-            break;
-        }
-
-        case ViewTarget::Tags:
-        {
-            String engine_name;
-            if (time_series_settings.aggregate_min_time_and_max_time)
-                engine_name = "AggregatingMergeTree";
-            else
-                engine_name = "ReplacingMergeTree";
-
-            inner_storage_def.set(inner_storage_def.engine, makeASTFunction(engine_name));
-            inner_storage_def.engine->no_empty_args = false;
-
-            if (!inner_storage_def.order_by && !inner_storage_def.primary_key && inner_storage_def.engine->name.ends_with("MergeTree"))
-            {
-                inner_storage_def.set(inner_storage_def.primary_key,
-                                      std::make_shared<ASTIdentifier>(TimeSeriesColumnNames::MetricName));
-
-                ASTs order_by_list;
-                order_by_list.push_back(std::make_shared<ASTIdentifier>(TimeSeriesColumnNames::MetricName));
-                order_by_list.push_back(std::make_shared<ASTIdentifier>(TimeSeriesColumnNames::ID));
-
-                if (time_series_settings.store_min_time_and_max_time && !time_series_settings.aggregate_min_time_and_max_time)
-                {
-                    order_by_list.push_back(std::make_shared<ASTIdentifier>(TimeSeriesColumnNames::MinTime));
-                    order_by_list.push_back(std::make_shared<ASTIdentifier>(TimeSeriesColumnNames::MaxTime));
-                }
-
-                auto order_by_tuple = std::make_shared<ASTFunction>();
-                order_by_tuple->name = "tuple";
-                auto arguments_list = std::make_shared<ASTExpressionList>();
-                arguments_list->children = std::move(order_by_list);
-                order_by_tuple->arguments = arguments_list;
-                inner_storage_def.set(inner_storage_def.order_by, order_by_tuple);
-            }
-            break;
-        }
-
-        case ViewTarget::Metrics:
-        {
-            inner_storage_def.set(inner_storage_def.engine, makeASTFunction("ReplacingMergeTree"));
-            inner_storage_def.engine->no_empty_args = false;
-
-            if (!inner_storage_def.order_by && !inner_storage_def.primary_key && inner_storage_def.engine->name.ends_with("MergeTree"))
-            {
-                inner_storage_def.set(inner_storage_def.order_by, std::make_shared<ASTIdentifier>(TimeSeriesColumnNames::MetricFamilyName));
-            }
-            break;
-        }
-
-        default:
-            UNREACHABLE(); /// This function must not be called with any other `kind`.
-    }
-}
-
-}
diff --git a/src/Storages/TimeSeries/TimeSeriesDefinitionNormalizer.h b/src/Storages/TimeSeries/TimeSeriesDefinitionNormalizer.h
deleted file mode 100644
index 1f959eb3ce0..00000000000
--- a/src/Storages/TimeSeries/TimeSeriesDefinitionNormalizer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#pragma once
-
-#include <Interpreters/StorageID.h>
-#include <Parsers/ASTViewTargets.h>
-
-
-namespace DB
-{
-class ASTColumnDeclaration;
-class ASTCreateQuery;
-struct ColumnDescription;
-struct TimeSeriesSettings;
-
-/// Normalizes a TimeSeries table definition.
-class TimeSeriesDefinitionNormalizer
-{
-public:
-    /// Constructor stores a reference to argument `time_series_settings_` (it's unnecessary to copy it).
-    TimeSeriesDefinitionNormalizer(StorageID time_series_storage_id_,
-                                   std::reference_wrapper<const TimeSeriesSettings> time_series_settings_,
-                                   const ASTCreateQuery * as_create_query_);
-
-    /// Adds missing columns to the definition and reorders all the columns in the canonical way.
-    /// Also adds engines of inner tables to the definition if they aren't specified yet.
-    /// The `as_table_create_query` parameter must be nullptr if it isn't a "CREATE AS <table> query".
-    void normalize(ASTCreateQuery & create_query) const;
-
-private:
-    /// Reorders existing columns in the canonical way.
-    void reorderColumns(ASTCreateQuery & create) const;
-
-    /// Adds missing columns with data types set by default..
-    void addMissingColumns(ASTCreateQuery & create) const;
-
-    /// Adds the DEFAULT expression for the 'id' column if it isn't specified yet.
-    void addMissingDefaultForIDColumn(ASTCreateQuery & create) const;
-
-    /// Generates a formulae for calculating the identifier of a time series from the metric name and all the tags.
-    ASTPtr chooseIDAlgorithm(const ASTColumnDeclaration & id_column) const;
-
-    /// Copies the definitions of inner engines from "CREATE AS <table>" if this is that kind of query.
-    void addMissingInnerEnginesFromAsTable(ASTCreateQuery & create) const;
-
-    /// Adds engines of inner tables to the definition if they aren't specified yet.
-    void addMissingInnerEngines(ASTCreateQuery & create) const;
-
-    /// Sets the engine of an inner table by default.
-    void setInnerEngineByDefault(ViewTarget::Kind inner_table_kind, ASTStorage & inner_storage_def) const;
-
-    const StorageID time_series_storage_id;
-    const TimeSeriesSettings & time_series_settings;
-    const ASTCreateQuery * as_create_query = nullptr;
-};
-
-}
diff --git a/src/Storages/TimeSeries/TimeSeriesInnerTablesCreator.cpp b/src/Storages/TimeSeries/TimeSeriesInnerTablesCreator.cpp
deleted file mode 100644
index 5f616982a6f..00000000000
--- a/src/Storages/TimeSeries/TimeSeriesInnerTablesCreator.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-#include <Storages/TimeSeries/TimeSeriesInnerTablesCreator.h>
-
-#include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <DataTypes/DataTypeCustomSimpleAggregateFunction.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypeMap.h>
-#include <DataTypes/DataTypeString.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/DatabaseCatalog.h>
-#include <Interpreters/InterpreterCreateQuery.h>
-#include <Parsers/ASTCreateQuery.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTViewTargets.h>
-#include <Storages/ColumnsDescription.h>
-#include <Storages/IStorage.h>
-#include <Storages/TimeSeries/TimeSeriesColumnNames.h>
-#include <Storages/TimeSeries/TimeSeriesSettings.h>
-
-
-namespace DB
-{
-
-TimeSeriesInnerTablesCreator::TimeSeriesInnerTablesCreator(ContextPtr context_,
-                                                           StorageID time_series_storage_id_,
-                                                           std::reference_wrapper<const ColumnsDescription> time_series_columns_,
-                                                           std::reference_wrapper<const TimeSeriesSettings> time_series_settings_)
-    : WithContext(context_)
-    , time_series_storage_id(std::move(time_series_storage_id_))
-    , time_series_columns(time_series_columns_)
-    , time_series_settings(time_series_settings_)
-{
-}
-
-TimeSeriesInnerTablesCreator::~TimeSeriesInnerTablesCreator() = default;
-
-
-ColumnsDescription TimeSeriesInnerTablesCreator::getInnerTableColumnsDescription(ViewTarget::Kind inner_table_kind) const
-{
-    ColumnsDescription columns;
-
-    switch (inner_table_kind)
-    {
-        case ViewTarget::Data:
-        {
-            /// Column "id".
-            {
-                auto id_column = time_series_columns.get(TimeSeriesColumnNames::ID);
-                /// The expression for calculating the identifier of a time series can be transferred only to the "tags" inner table
-                /// (because it usually depends on columns like "metric_name" or "all_tags").
-                id_column.default_desc = {};
-                columns.add(std::move(id_column));
-            }
-
-            /// Column "timestamp".
-            columns.add(time_series_columns.get(TimeSeriesColumnNames::Timestamp));
-
-            /// Column "value".
-            columns.add(time_series_columns.get(TimeSeriesColumnNames::Value));
-            break;
-        }
-
-        case ViewTarget::Tags:
-        {
-            /// Column "id".
-            columns.add(time_series_columns.get(TimeSeriesColumnNames::ID));
-
-            /// Column "metric_name".
-            columns.add(time_series_columns.get(TimeSeriesColumnNames::MetricName));
-
-            /// Columns corresponding to specific tags specified in the "tags_to_columns" setting.
-            const Map & tags_to_columns = time_series_settings.tags_to_columns;
-            for (const auto & tag_name_and_column_name : tags_to_columns)
-            {
-                const auto & tuple = tag_name_and_column_name.safeGet<const Tuple &>();
-                const auto & column_name = tuple.at(1).safeGet<String>();
-                columns.add(time_series_columns.get(column_name));
-            }
-
-            /// Column "tags".
-            columns.add(time_series_columns.get(TimeSeriesColumnNames::Tags));
-
-            /// Column "all_tags".
-            if (time_series_settings.use_all_tags_column_to_generate_id)
-            {
-                ColumnDescription all_tags_column = time_series_columns.get(TimeSeriesColumnNames::AllTags);
-                /// Column "all_tags" is here only to calculate the identifier of a time series for the "id" column, so it can be ephemeral.
-                all_tags_column.default_desc.kind = ColumnDefaultKind::Ephemeral;
-                if (!all_tags_column.default_desc.expression)
-                {
-                    all_tags_column.default_desc.ephemeral_default = true;
-                    all_tags_column.default_desc.expression = makeASTFunction("defaultValueOfTypeName", std::make_shared<ASTLiteral>(all_tags_column.type->getName()));
-                }
-                columns.add(std::move(all_tags_column));
-            }
-
-            /// Columns "min_time" and "max_time".
-            if (time_series_settings.store_min_time_and_max_time)
-            {
-                auto min_time_column = time_series_columns.get(TimeSeriesColumnNames::MinTime);
-                auto max_time_column = time_series_columns.get(TimeSeriesColumnNames::MaxTime);
-                if (time_series_settings.aggregate_min_time_and_max_time)
-                {
-                    AggregateFunctionProperties properties;
-                    auto min_function = AggregateFunctionFactory::instance().get("min", NullsAction::EMPTY, {min_time_column.type}, {}, properties);
-                    auto custom_name = std::make_unique<DataTypeCustomSimpleAggregateFunction>(min_function, DataTypes{min_time_column.type}, Array{});
-                    min_time_column.type = DataTypeFactory::instance().getCustom(std::make_unique<DataTypeCustomDesc>(std::move(custom_name)));
-
-                    auto max_function = AggregateFunctionFactory::instance().get("max", NullsAction::EMPTY, {max_time_column.type}, {}, properties);
-                    custom_name = std::make_unique<DataTypeCustomSimpleAggregateFunction>(max_function, DataTypes{max_time_column.type}, Array{});
-                    max_time_column.type = DataTypeFactory::instance().getCustom(std::make_unique<DataTypeCustomDesc>(std::move(custom_name)));
-                }
-                columns.add(std::move(min_time_column));
-                columns.add(std::move(max_time_column));
-            }
-
-            break;
-        }
-
-        case ViewTarget::Metrics:
-        {
-            columns.add(time_series_columns.get(TimeSeriesColumnNames::MetricFamilyName));
-            columns.add(time_series_columns.get(TimeSeriesColumnNames::Type));
-            columns.add(time_series_columns.get(TimeSeriesColumnNames::Unit));
-            columns.add(time_series_columns.get(TimeSeriesColumnNames::Help));
-            break;
-        }
-
-        default:
-            UNREACHABLE();
-    }
-
-    return columns;
-}
-
-
-StorageID TimeSeriesInnerTablesCreator::getInnerTableID(ViewTarget::Kind inner_table_kind, const UUID & inner_table_uuid) const
-{
-    StorageID res = time_series_storage_id;
-    if (time_series_storage_id.hasUUID())
-        res.table_name = fmt::format(".inner_id.{}.{}", toString(inner_table_kind), time_series_storage_id.uuid);
-    else
-        res.table_name = fmt::format(".inner.{}.{}", toString(inner_table_kind), time_series_storage_id.table_name);
-    res.uuid = inner_table_uuid;
-    return res;
-}
-
-
-std::shared_ptr<ASTCreateQuery> TimeSeriesInnerTablesCreator::getInnerTableCreateQuery(
-    ViewTarget::Kind inner_table_kind,
-    const UUID & inner_table_uuid,
-    const std::shared_ptr<ASTStorage> & inner_storage_def) const
-{
-    auto manual_create_query = std::make_shared<ASTCreateQuery>();
-
-    auto inner_table_id = getInnerTableID(inner_table_kind, inner_table_uuid);
-    manual_create_query->setDatabase(inner_table_id.database_name);
-    manual_create_query->setTable(inner_table_id.table_name);
-    manual_create_query->uuid = inner_table_id.uuid;
-    manual_create_query->has_uuid = inner_table_id.uuid != UUIDHelpers::Nil;
-
-    auto new_columns_list = std::make_shared<ASTColumns>();
-    new_columns_list->set(new_columns_list->columns, InterpreterCreateQuery::formatColumns(getInnerTableColumnsDescription(inner_table_kind)));
-    manual_create_query->set(manual_create_query->columns_list, new_columns_list);
-
-    if (inner_storage_def)
-        manual_create_query->set(manual_create_query->storage, inner_storage_def->clone());
-
-    return manual_create_query;
-}
-
-StorageID TimeSeriesInnerTablesCreator::createInnerTable(
-    ViewTarget::Kind inner_table_kind,
-    const UUID & inner_table_uuid,
-    const std::shared_ptr<ASTStorage> & inner_storage_def) const
-{
-    /// We will make a query to create the inner target table.
-    auto create_context = Context::createCopy(getContext());
-
-    auto manual_create_query = getInnerTableCreateQuery(inner_table_kind, inner_table_uuid, inner_storage_def);
-
-    /// Create the inner target table.
-    InterpreterCreateQuery create_interpreter(manual_create_query, create_context);
-    create_interpreter.setInternal(true);
-    create_interpreter.execute();
-
-    return DatabaseCatalog::instance().getTable({manual_create_query->getDatabase(), manual_create_query->getTable()}, getContext())->getStorageID();
-}
-
-}
diff --git a/src/Storages/TimeSeries/TimeSeriesInnerTablesCreator.h b/src/Storages/TimeSeries/TimeSeriesInnerTablesCreator.h
deleted file mode 100644
index 5778dd77398..00000000000
--- a/src/Storages/TimeSeries/TimeSeriesInnerTablesCreator.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#pragma once
-
-#include <Interpreters/Context_fwd.h>
-#include <Parsers/ASTViewTargets.h>
-
-
-namespace DB
-{
-class ASTCreateQuery;
-class ColumnsDescription;
-struct TimeSeriesSettings;
-
-/// Generates inner tables for the TimeSeries table engine.
-class TimeSeriesInnerTablesCreator : public WithContext
-{
-public:
-    /// Constructor stores references to arguments `time_series_columns_` and `time_series_settings_` (it's unnecessary to copy them).
-    TimeSeriesInnerTablesCreator(ContextPtr context_,
-                                 StorageID time_series_storage_id_,
-                                 std::reference_wrapper<const ColumnsDescription> time_series_columns_,
-                                 std::reference_wrapper<const TimeSeriesSettings> time_series_settings_);
-
-    ~TimeSeriesInnerTablesCreator();
-
-    /// Returns a column description of an inner table.
-    ColumnsDescription getInnerTableColumnsDescription(ViewTarget::Kind inner_table_kind) const;
-
-    /// Returns a StorageID of an inner table.
-    StorageID getInnerTableID(ViewTarget::Kind inner_table_kind, const UUID & inner_table_uuid) const;
-
-    /// Generates a CREATE TABLE query for an inner table.
-    std::shared_ptr<ASTCreateQuery> getInnerTableCreateQuery(ViewTarget::Kind inner_table_kind,
-                                                             const UUID & inner_table_uuid,
-                                                             const std::shared_ptr<ASTStorage> & inner_storage_def) const;
-
-    /// Creates an inner table.
-    StorageID createInnerTable(ViewTarget::Kind inner_table_kind,
-                               const UUID & inner_table_uuid,
-                               const std::shared_ptr<ASTStorage> & inner_storage_def) const;
-
-private:
-    const StorageID time_series_storage_id;
-    const ColumnsDescription & time_series_columns;
-    const TimeSeriesSettings & time_series_settings;
-};
-
-}
diff --git a/src/Storages/TimeSeries/TimeSeriesSettings.cpp b/src/Storages/TimeSeries/TimeSeriesSettings.cpp
deleted file mode 100644
index 3a15be59191..00000000000
--- a/src/Storages/TimeSeries/TimeSeriesSettings.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <Storages/TimeSeries/TimeSeriesSettings.h>
-
-#include <Parsers/ASTCreateQuery.h>
-#include <Parsers/ASTFunction.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int UNKNOWN_SETTING;
-}
-
-IMPLEMENT_SETTINGS_TRAITS(TimeSeriesSettingsTraits, LIST_OF_TIME_SERIES_SETTINGS)
-
-void TimeSeriesSettings::loadFromQuery(ASTStorage & storage_def)
-{
-    if (storage_def.settings)
-    {
-        try
-        {
-            applyChanges(storage_def.settings->changes);
-        }
-        catch (Exception & e)
-        {
-            if (e.code() == ErrorCodes::UNKNOWN_SETTING)
-                e.addMessage("for storage " + storage_def.engine->name);
-            throw;
-        }
-    }
-}
-
-}
diff --git a/src/Storages/TimeSeries/TimeSeriesSettings.h b/src/Storages/TimeSeries/TimeSeriesSettings.h
deleted file mode 100644
index 4dc6a436cd0..00000000000
--- a/src/Storages/TimeSeries/TimeSeriesSettings.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include <Core/BaseSettings.h>
-
-
-namespace DB
-{
-class ASTStorage;
-
-#define LIST_OF_TIME_SERIES_SETTINGS(M, ALIAS) \
-    M(Map, tags_to_columns, Map{}, "Map specifying which tags should be put to separate columns of the 'tags' table. Syntax: {'tag1': 'column1', 'tag2' : column2, ...}", 0) \
-    M(Bool, use_all_tags_column_to_generate_id, true, "When generating an expression to calculate an identifier of a time series, this flag enables using the 'all_tags' column in that calculation. The 'all_tags' is a virtual column containing all tags except the metric name", 0) \
-    M(Bool, store_min_time_and_max_time, true, "If set to true then the table will store 'min_time' and 'max_time' for each time series", 0) \
-    M(Bool, aggregate_min_time_and_max_time, true, "When creating an inner target 'tags' table, this flag enables using 'SimpleAggregateFunction(min, Nullable(DateTime64(3)))' instead of just 'Nullable(DateTime64(3))' as the type of the 'min_time' column, and the same for the 'max_time' column", 0) \
-    M(Bool, filter_by_min_time_and_max_time, true, "If set to true then the table will use the 'min_time' and 'max_time' columns for filtering time series", 0) \
-
-DECLARE_SETTINGS_TRAITS(TimeSeriesSettingsTraits, LIST_OF_TIME_SERIES_SETTINGS)
-
-/// Settings for the TimeSeries table engine.
-/// Could be loaded from a CREATE TABLE query (SETTINGS clause). For example:
-/// CREATE TABLE mytable ENGINE = TimeSeries() SETTINGS tags_to_columns = {'job':'job', 'instance':'instance'} DATA ENGINE = ReplicatedMergeTree('zkpath', 'replica'), ...
-struct TimeSeriesSettings : public BaseSettings<TimeSeriesSettingsTraits>
-{
-    void loadFromQuery(ASTStorage & storage_def);
-};
-
-using TimeSeriesSettingsPtr = std::shared_ptr<const TimeSeriesSettings>;
-
-}
diff --git a/src/Storages/TimeSeries/TimeSeriesTagNames.h b/src/Storages/TimeSeries/TimeSeriesTagNames.h
deleted file mode 100644
index 23b005ed414..00000000000
--- a/src/Storages/TimeSeries/TimeSeriesTagNames.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-
-namespace DB
-{
-
-/// Label names with special meaning.
-struct TimeSeriesTagNames
-{
-    static constexpr const char * MetricName = "__name__";
-};
-
-}
diff --git a/src/Storages/VirtualColumnUtils.cpp b/src/Storages/VirtualColumnUtils.cpp
index f0d276e4e56..3c2a34bb475 100644
--- a/src/Storages/VirtualColumnUtils.cpp
+++ b/src/Storages/VirtualColumnUtils.cpp
@@ -1,66 +1,51 @@
+#include <Storages/VirtualColumnUtils.h>
+
 #include <memory>
 #include <stack>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnSet.h>
+#include <Columns/ColumnsCommon.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/FilterDescription.h>
 #include <Core/NamesAndTypes.h>
 #include <Core/TypeId.h>
-
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/FunctionsLogical.h>
+#include <Functions/IFunction.h>
+#include <Functions/IFunctionAdaptors.h>
+#include <Functions/indexHint.h>
+#include <IO/WriteHelpers.h>
+#include <Interpreters/ActionsDAG.h>
+#include <Interpreters/ActionsVisitor.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/TreeRewriter.h>
-#include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/ExpressionActions.h>
+#include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/IdentifierSemantic.h>
+#include <Interpreters/TreeRewriter.h>
 #include <Interpreters/misc.h>
-
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSubquery.h>
-
-#include <Columns/ColumnConst.h>
-#include <Columns/ColumnsNumber.h>
-#include <Columns/ColumnsCommon.h>
-#include <Columns/FilterDescription.h>
-
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <DataTypes/DataTypeDateTime.h>
-
-#include <Processors/QueryPlan/QueryPlan.h>
+#include <Parsers/makeASTForLogicalFunction.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/Sinks/EmptySink.h>
-#include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
-
-#include <Storages/VirtualColumnUtils.h>
-#include <IO/WriteHelpers.h>
-#include <Common/re2.h>
 #include <Common/typeid_cast.h>
-#include <Formats/SchemaInferenceUtils.h>
-#include <Formats/EscapingRuleUtils.h>
-#include <Formats/FormatFactory.h>
-#include <Core/Settings.h>
-#include "Functions/FunctionsLogical.h"
-#include "Functions/IFunction.h"
-#include "Functions/IFunctionAdaptors.h"
-#include "Functions/indexHint.h"
-#include <Interpreters/convertFieldToType.h>
-#include <Parsers/makeASTForLogicalFunction.h>
-#include <Columns/ColumnSet.h>
-#include <Functions/FunctionHelpers.h>
-#include <Interpreters/ActionsVisitor.h>
 
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int INCORRECT_DATA;
-}
-
 namespace VirtualColumnUtils
 {
 
@@ -87,19 +72,15 @@ void buildSetsForDAG(const ActionsDAG & dag, const ContextPtr & context)
     }
 }
 
-ExpressionActionsPtr buildFilterExpression(ActionsDAG dag, ContextPtr context)
-{
-    buildSetsForDAG(dag, context);
-    return std::make_shared<ExpressionActions>(std::move(dag));
-}
-
-void filterBlockWithExpression(const ExpressionActionsPtr & actions, Block & block)
+void filterBlockWithDAG(ActionsDAGPtr dag, Block & block, ContextPtr context)
 {
+    buildSetsForDAG(*dag, context);
+    auto actions = std::make_shared<ExpressionActions>(dag);
     Block block_with_filter = block;
     actions->execute(block_with_filter, /*dry_run=*/ false, /*allow_duplicates_in_input=*/ true);
 
     /// Filter the block.
-    String filter_column_name = actions->getActionsDAG().getOutputs().at(0)->result_name;
+    String filter_column_name = dag->getOutputs().at(0)->result_name;
     ColumnPtr filter_column = block_with_filter.getByName(filter_column_name).column->convertToFullColumnIfConst();
 
     ConstantFilterDescription constant_filter(*filter_column);
@@ -126,48 +107,17 @@ void filterBlockWithExpression(const ExpressionActionsPtr & actions, Block & blo
 
 NameSet getVirtualNamesForFileLikeStorage()
 {
-    return {"_path", "_file", "_size", "_time", "_etag"};
+    return {"_path", "_file", "_size", "_time"};
 }
 
-std::unordered_map<std::string, std::string> parseHivePartitioningKeysAndValues(const String & path)
-{
-    std::string pattern = "([^/]+)=([^/]+)/";
-    re2::StringPiece input_piece(path);
-
-    std::unordered_map<std::string, std::string> key_values;
-    std::string key, value;
-    std::unordered_map<std::string, std::string> used_keys;
-    while (RE2::FindAndConsume(&input_piece, pattern, &key, &value))
-    {
-        auto it = used_keys.find(key);
-        if (it != used_keys.end() && it->second != value)
-            throw Exception(ErrorCodes::INCORRECT_DATA, "Path '{}' to file with enabled hive-style partitioning contains duplicated partition key {} with different values, only unique keys are allowed", path, key);
-        used_keys.insert({key, value});
-
-        auto col_name = key;
-        key_values[col_name] = value;
-    }
-    return key_values;
-}
-
-VirtualColumnsDescription getVirtualsForFileLikeStorage(ColumnsDescription & storage_columns, const ContextPtr & context, const std::string & path, std::optional<FormatSettings> format_settings_)
+VirtualColumnsDescription getVirtualsForFileLikeStorage(const ColumnsDescription & storage_columns)
 {
     VirtualColumnsDescription desc;
 
     auto add_virtual = [&](const auto & name, const auto & type)
     {
         if (storage_columns.has(name))
-        {
-            if (!context->getSettingsRef().use_hive_partitioning)
-                return;
-
-            if (storage_columns.size() == 1)
-                throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot use hive partitioning for file {}: it contains only partition columns. Disable use_hive_partitioning setting to read this file", path);
-            auto local_type = storage_columns.get(name).type;
-            storage_columns.remove(name);
-            desc.addEphemeral(name, local_type, "");
             return;
-        }
 
         desc.addEphemeral(name, type, "");
     };
@@ -176,23 +126,6 @@ VirtualColumnsDescription getVirtualsForFileLikeStorage(ColumnsDescription & sto
     add_virtual("_file", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()));
     add_virtual("_size", makeNullable(std::make_shared<DataTypeUInt64>()));
     add_virtual("_time", makeNullable(std::make_shared<DataTypeDateTime>()));
-    add_virtual("_etag", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()));
-
-    if (context->getSettingsRef().use_hive_partitioning)
-    {
-        auto map = parseHivePartitioningKeysAndValues(path);
-        auto format_settings = format_settings_ ? *format_settings_ : getFormatSettings(context);
-        for (auto & item : map)
-        {
-            auto type = tryInferDataTypeByEscapingRule(item.second, format_settings, FormatSettings::EscapingRule::Raw);
-            if (type == nullptr)
-                type = std::make_shared<DataTypeString>();
-            if (type->canBeInsideLowCardinality())
-                add_virtual(item.first, std::make_shared<DataTypeLowCardinality>(type));
-            else
-                add_virtual(item.first, type);
-        }
-    }
 
     return desc;
 }
@@ -217,7 +150,7 @@ static void addPathAndFileToVirtualColumns(Block & block, const String & path, s
     block.getByName("_idx").column->assumeMutableRef().insert(idx);
 }
 
-std::optional<ActionsDAG> createPathAndFileFilterDAG(const ActionsDAG::Node * predicate, const NamesAndTypesList & virtual_columns)
+ActionsDAGPtr createPathAndFileFilterDAG(const ActionsDAG::Node * predicate, const NamesAndTypesList & virtual_columns)
 {
     if (!predicate || virtual_columns.empty())
         return {};
@@ -233,7 +166,7 @@ std::optional<ActionsDAG> createPathAndFileFilterDAG(const ActionsDAG::Node * pr
     return splitFilterDagForAllowedInputs(predicate, &block);
 }
 
-ColumnPtr getFilterByPathAndFileIndexes(const std::vector<String> & paths, const ExpressionActionsPtr & actions, const NamesAndTypesList & virtual_columns)
+ColumnPtr getFilterByPathAndFileIndexes(const std::vector<String> & paths, const ActionsDAGPtr & dag, const NamesAndTypesList & virtual_columns, const ContextPtr & context)
 {
     Block block;
     for (const auto & column : virtual_columns)
@@ -246,19 +179,15 @@ ColumnPtr getFilterByPathAndFileIndexes(const std::vector<String> & paths, const
     for (size_t i = 0; i != paths.size(); ++i)
         addPathAndFileToVirtualColumns(block, paths[i], i);
 
-    filterBlockWithExpression(actions, block);
+    filterBlockWithDAG(dag, block, context);
 
     return block.getByName("_idx").column;
 }
 
 void addRequestedFileLikeStorageVirtualsToChunk(
     Chunk & chunk, const NamesAndTypesList & requested_virtual_columns,
-    VirtualsForFileLikeStorage virtual_values, ContextPtr context)
+    VirtualsForFileLikeStorage virtual_values)
 {
-    std::unordered_map<std::string, std::string> hive_map;
-    if (context->getSettingsRef().use_hive_partitioning)
-        hive_map = parseHivePartitioningKeysAndValues(virtual_values.path);
-
     for (const auto & virtual_column : requested_virtual_columns)
     {
         if (virtual_column.name == "_path")
@@ -292,17 +221,6 @@ void addRequestedFileLikeStorageVirtualsToChunk(
             else
                 chunk.addColumn(virtual_column.type->createColumnConstWithDefaultValue(chunk.getNumRows())->convertToFullColumnIfConst());
         }
-        else if (auto it = hive_map.find(virtual_column.getNameInStorage()); it != hive_map.end())
-        {
-            chunk.addColumn(virtual_column.type->createColumnConst(chunk.getNumRows(), convertFieldToType(Field(it->second), *virtual_column.type))->convertToFullColumnIfConst());
-        }
-        else if (virtual_column.name == "_etag")
-        {
-            if (virtual_values.etag)
-                chunk.addColumn(virtual_column.type->createColumnConst(chunk.getNumRows(), (*virtual_values.etag))->convertToFullColumnIfConst());
-            else
-                chunk.addColumn(virtual_column.type->createColumnConstWithDefaultValue(chunk.getNumRows())->convertToFullColumnIfConst());
-        }
     }
 }
 
@@ -400,9 +318,9 @@ static const ActionsDAG::Node * splitFilterNodeForAllowedInputs(
             {
                 if (const auto * index_hint = typeid_cast<const FunctionIndexHint *>(adaptor->getFunction().get()))
                 {
-                    auto index_hint_dag = index_hint->getActions().clone();
+                    auto index_hint_dag = index_hint->getActions()->clone();
                     ActionsDAG::NodeRawConstPtrs atoms;
-                    for (const auto & output : index_hint_dag.getOutputs())
+                    for (const auto & output : index_hint_dag->getOutputs())
                         if (const auto * child_copy
                             = splitFilterNodeForAllowedInputs(output, allowed_inputs, additional_nodes, allow_partial_result))
                             atoms.push_back(child_copy);
@@ -414,13 +332,13 @@ static const ActionsDAG::Node * splitFilterNodeForAllowedInputs(
                         if (atoms.size() > 1)
                         {
                             FunctionOverloadResolverPtr func_builder_and = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionAnd>());
-                            res = &index_hint_dag.addFunction(func_builder_and, atoms, {});
+                            res = &index_hint_dag->addFunction(func_builder_and, atoms, {});
                         }
 
                         if (!res->result_type->equals(*node->result_type))
-                            res = &index_hint_dag.addCast(*res, node->result_type, {});
+                            res = &index_hint_dag->addCast(*res, node->result_type, {});
 
-                        additional_nodes.splice(additional_nodes.end(), ActionsDAG::detachNodes(std::move(index_hint_dag)));
+                        additional_nodes.splice(additional_nodes.end(), ActionsDAG::detachNodes(std::move(*index_hint_dag)));
                         return res;
                     }
                 }
@@ -438,16 +356,16 @@ static const ActionsDAG::Node * splitFilterNodeForAllowedInputs(
     return node;
 }
 
-std::optional<ActionsDAG>
+ActionsDAGPtr
 splitFilterDagForAllowedInputs(const ActionsDAG::Node * predicate, const Block * allowed_inputs, bool allow_partial_result)
 {
     if (!predicate)
-        return {};
+        return nullptr;
 
     ActionsDAG::Nodes additional_nodes;
     const auto * res = splitFilterNodeForAllowedInputs(predicate, allowed_inputs, additional_nodes, allow_partial_result);
     if (!res)
-        return {};
+        return nullptr;
 
     return ActionsDAG::cloneSubDAG({res}, true);
 }
@@ -457,7 +375,7 @@ void filterBlockWithPredicate(
 {
     auto dag = splitFilterDagForAllowedInputs(predicate, &block, /*allow_partial_result=*/allow_filtering_with_partial_predicate);
     if (dag)
-        filterBlockWithExpression(buildFilterExpression(std::move(*dag), context), block);
+        filterBlockWithDAG(dag, block, context);
 }
 
 }
diff --git a/src/Storages/VirtualColumnUtils.h b/src/Storages/VirtualColumnUtils.h
index 6aa08b2aef2..c6a167c845c 100644
--- a/src/Storages/VirtualColumnUtils.h
+++ b/src/Storages/VirtualColumnUtils.h
@@ -5,7 +5,6 @@
 #include <Parsers/IAST_fwd.h>
 #include <Storages/SelectQueryInfo.h>
 #include <Storages/VirtualColumnsDescription.h>
-#include <Formats/FormatSettings.h>
 
 #include <unordered_set>
 
@@ -34,10 +33,8 @@ namespace VirtualColumnUtils
 /// cannot be evaluated using the columns from the block.
 void filterBlockWithPredicate(const ActionsDAG::Node * predicate, Block & block, ContextPtr context, bool allow_filtering_with_partial_predicate = true);
 
-
 /// Just filters block. Block should contain all the required columns.
-ExpressionActionsPtr buildFilterExpression(ActionsDAG dag, ContextPtr context);
-void filterBlockWithExpression(const ExpressionActionsPtr & actions, Block & block);
+void filterBlockWithDAG(ActionsDAGPtr dag, Block & block, ContextPtr context);
 
 /// Builds sets used by ActionsDAG inplace.
 void buildSetsForDAG(const ActionsDAG & dag, const ContextPtr & context);
@@ -54,7 +51,7 @@ bool isDeterministicInScopeOfQuery(const ActionsDAG::Node * node);
 /// The predicate will be `_partition_id = '0' AND rowNumberInBlock() = 1`, and `rowNumberInBlock()` is
 /// non-deterministic. If we still extract the part `_partition_id = '0'` for filtering parts, then trivial
 /// count optimization will be mistakenly applied to the query.
-std::optional<ActionsDAG> splitFilterDagForAllowedInputs(const ActionsDAG::Node * predicate, const Block * allowed_inputs, bool allow_partial_result = true);
+ActionsDAGPtr splitFilterDagForAllowedInputs(const ActionsDAG::Node * predicate, const Block * allowed_inputs, bool allow_partial_result = true);
 
 /// Extract from the input stream a set of `name` column values
 template <typename T>
@@ -64,25 +61,21 @@ auto extractSingleValueFromBlock(const Block & block, const String & name)
     const ColumnWithTypeAndName & data = block.getByName(name);
     size_t rows = block.rows();
     for (size_t i = 0; i < rows; ++i)
-        res.insert((*data.column)[i].safeGet<T>());
+        res.insert((*data.column)[i].get<T>());
     return res;
 }
 
 NameSet getVirtualNamesForFileLikeStorage();
-VirtualColumnsDescription getVirtualsForFileLikeStorage(
-    ColumnsDescription & storage_columns,
-    const ContextPtr & context,
-    const std::string & sample_path = "",
-    std::optional<FormatSettings> format_settings_ = std::nullopt);
+VirtualColumnsDescription getVirtualsForFileLikeStorage(const ColumnsDescription & storage_columns);
 
-std::optional<ActionsDAG> createPathAndFileFilterDAG(const ActionsDAG::Node * predicate, const NamesAndTypesList & virtual_columns);
+ActionsDAGPtr createPathAndFileFilterDAG(const ActionsDAG::Node * predicate, const NamesAndTypesList & virtual_columns);
 
-ColumnPtr getFilterByPathAndFileIndexes(const std::vector<String> & paths, const ExpressionActionsPtr & actions, const NamesAndTypesList & virtual_columns);
+ColumnPtr getFilterByPathAndFileIndexes(const std::vector<String> & paths, const ActionsDAGPtr & dag, const NamesAndTypesList & virtual_columns, const ContextPtr & context);
 
 template <typename T>
-void filterByPathOrFile(std::vector<T> & sources, const std::vector<String> & paths, const ExpressionActionsPtr & actions, const NamesAndTypesList & virtual_columns)
+void filterByPathOrFile(std::vector<T> & sources, const std::vector<String> & paths, const ActionsDAGPtr & dag, const NamesAndTypesList & virtual_columns, const ContextPtr & context)
 {
-    auto indexes_column = getFilterByPathAndFileIndexes(paths, actions, virtual_columns);
+    auto indexes_column = getFilterByPathAndFileIndexes(paths, dag, virtual_columns, context);
     const auto & indexes = typeid_cast<const ColumnUInt64 &>(*indexes_column).getData();
     if (indexes.size() == sources.size())
         return;
@@ -100,12 +93,12 @@ struct VirtualsForFileLikeStorage
     std::optional<size_t> size { std::nullopt };
     const String * filename { nullptr };
     std::optional<Poco::Timestamp> last_modified { std::nullopt };
-    const String * etag { nullptr };
+
 };
 
 void addRequestedFileLikeStorageVirtualsToChunk(
     Chunk & chunk, const NamesAndTypesList & requested_virtual_columns,
-    VirtualsForFileLikeStorage virtual_values, ContextPtr context);
+    VirtualsForFileLikeStorage virtual_values);
 }
 
 }
diff --git a/src/Storages/WindowView/StorageWindowView.cpp b/src/Storages/WindowView/StorageWindowView.cpp
index 4a20a07ae89..a39dd4e8f5f 100644
--- a/src/Storages/WindowView/StorageWindowView.cpp
+++ b/src/Storages/WindowView/StorageWindowView.cpp
@@ -20,7 +20,6 @@
 #include <Parsers/ASTAsterisk.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTDropQuery.h>
-#include <Parsers/ASTDataType.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTOrderByElement.h>
@@ -566,11 +565,11 @@ std::pair<BlocksPtr, Block> StorageWindowView::getNewBlocks(UInt32 watermark)
 
     auto syntax_result = TreeRewriter(getContext()).analyze(filter_function, builder.getHeader().getNamesAndTypesList());
     auto filter_expression = ExpressionAnalyzer(filter_function, syntax_result, getContext()).getActionsDAG(false);
-    auto filter_actions = std::make_shared<ExpressionActions>(std::move(filter_expression));
 
     builder.addSimpleTransform([&](const Block & header)
     {
-        return std::make_shared<FilterTransform>(header, filter_actions, filter_function->getColumnName(), true);
+        return std::make_shared<FilterTransform>(
+            header, std::make_shared<ExpressionActions>(filter_expression), filter_function->getColumnName(), true);
     });
 
     /// Adding window column
@@ -595,7 +594,7 @@ std::pair<BlocksPtr, Block> StorageWindowView::getNewBlocks(UInt32 watermark)
         new_header.getColumnsWithTypeAndName(),
         ActionsDAG::MatchColumnsMode::Name);
     auto actions = std::make_shared<ExpressionActions>(
-        std::move(convert_actions_dag), ExpressionActionsSettings::fromContext(getContext(), CompileExpressions::yes));
+        convert_actions_dag, ExpressionActionsSettings::fromContext(getContext(), CompileExpressions::yes));
     builder.addSimpleTransform([&](const Block & stream_header)
     {
         return std::make_shared<ExpressionTransform>(stream_header, actions);
@@ -709,7 +708,7 @@ inline void StorageWindowView::fire(UInt32 watermark)
             getTargetTable()->getInMemoryMetadataPtr()->getColumns(),
             getContext(),
             getContext()->getSettingsRef().insert_null_as_default);
-        auto adding_missing_defaults_actions = std::make_shared<ExpressionActions>(std::move(adding_missing_defaults_dag));
+        auto adding_missing_defaults_actions = std::make_shared<ExpressionActions>(adding_missing_defaults_dag);
         pipe.addSimpleTransform([&](const Block & stream_header)
         {
             return std::make_shared<ExpressionTransform>(stream_header, adding_missing_defaults_actions);
@@ -720,7 +719,7 @@ inline void StorageWindowView::fire(UInt32 watermark)
             block_io.pipeline.getHeader().getColumnsWithTypeAndName(),
             ActionsDAG::MatchColumnsMode::Position);
         auto actions = std::make_shared<ExpressionActions>(
-            std::move(convert_actions_dag),
+            convert_actions_dag,
             ExpressionActionsSettings::fromContext(getContext(), CompileExpressions::yes));
         pipe.addSimpleTransform([&](const Block & stream_header)
         {
@@ -806,7 +805,7 @@ ASTPtr StorageWindowView::getInnerTableCreateQuery(const ASTPtr & inner_query, c
     {
         auto column_window = std::make_shared<ASTColumnDeclaration>();
         column_window->name = window_id_name;
-        column_window->type = makeASTDataType("UInt32");
+        column_window->type = std::make_shared<ASTIdentifier>("UInt32");
         columns_list->children.push_back(column_window);
     }
 
@@ -1051,27 +1050,15 @@ void StorageWindowView::threadFuncFireProc()
     if (shutdown_called)
         return;
 
-    /// Acquiring the lock can take seconds (depends on how long it takes to push) so we keep a reference to remember
-    /// what's the starting point where we want to push from
-    UInt32 timestamp_start = now();
-
     std::lock_guard lock(fire_signal_mutex);
     /// TODO: consider using time_t instead (for every timestamp in this class)
     UInt32 timestamp_now = now();
 
-    LOG_TRACE(
-        log,
-        "Start: {}, now: {}, next fire signal: {}, max watermark: {}",
-        timestamp_start,
-        timestamp_now,
-        next_fire_signal,
-        max_watermark);
-
     while (next_fire_signal <= timestamp_now)
     {
         try
         {
-            if (max_watermark >= timestamp_start)
+            if (max_watermark >= timestamp_now)
                 fire(next_fire_signal);
         }
         catch (...)
@@ -1084,19 +1071,9 @@ void StorageWindowView::threadFuncFireProc()
         if (slide_kind > IntervalKind::Kind::Day)
             slide_interval *= 86400;
         next_fire_signal += slide_interval;
-
-        LOG_TRACE(
-            log,
-            "Start: {}, now: {}, next fire signal: {}, max watermark: {}, max fired watermark: {}, slide interval: {}",
-            timestamp_start,
-            timestamp_now,
-            next_fire_signal,
-            max_watermark,
-            max_fired_watermark,
-            slide_interval);
     }
 
-    if (max_watermark >= timestamp_start)
+    if (max_watermark >= timestamp_now)
         clean_cache_task->schedule();
 
     UInt64 next_fire_ms = static_cast<UInt64>(next_fire_signal) * 1000;
@@ -1162,7 +1139,7 @@ void StorageWindowView::read(
         {
             auto converting_actions = ActionsDAG::makeConvertingActions(
                 target_header.getColumnsWithTypeAndName(), wv_header.getColumnsWithTypeAndName(), ActionsDAG::MatchColumnsMode::Name);
-            auto converting_step = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), std::move(converting_actions));
+            auto converting_step = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), converting_actions);
             converting_step->setStepDescription("Convert Target table structure to WindowView structure");
             query_plan.addStep(std::move(converting_step));
         }
@@ -1211,7 +1188,6 @@ StorageWindowView::StorageWindowView(
     ContextPtr context_,
     const ASTCreateQuery & query,
     const ColumnsDescription & columns_,
-    const String & comment,
     LoadingStrictnessLevel mode)
     : IStorage(table_id_)
     , WithContext(context_->getGlobalContext())
@@ -1230,7 +1206,6 @@ StorageWindowView::StorageWindowView(
 
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
-    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 
     /// If the target table is not set, use inner target table
@@ -1455,16 +1430,13 @@ void StorageWindowView::writeIntoWindowView(
     while (window_view.modifying_query)
         std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
-    const size_t block_rows = block.rows();
-    if (!window_view.is_proctime && window_view.max_watermark == 0 && block_rows > 0)
+    if (!window_view.is_proctime && window_view.max_watermark == 0 && block.rows() > 0)
     {
         std::lock_guard lock(window_view.fire_signal_mutex);
         const auto & window_column = block.getByName(window_view.timestamp_column_name);
         const ColumnUInt32::Container & window_end_data = static_cast<const ColumnUInt32 &>(*window_column.column).getData();
         UInt32 first_record_timestamp = window_end_data[0];
         window_view.max_watermark = window_view.getWindowUpperBound(first_record_timestamp);
-
-        LOG_TRACE(window_view.log, "New max watermark: {}", window_view.max_watermark);
     }
 
     Pipe pipe(std::make_shared<SourceFromSingleChunk>(block));
@@ -1515,7 +1487,7 @@ void StorageWindowView::writeIntoWindowView(
         pipe.addSimpleTransform([&](const Block & header_)
         {
             return std::make_shared<FilterTransform>(
-                header_, std::make_shared<ExpressionActions>(std::move(filter_expression)),
+                header_, std::make_shared<ExpressionActions>(filter_expression),
                 filter_function->getColumnName(), true);
         });
     }
@@ -1654,7 +1626,7 @@ void StorageWindowView::writeIntoWindowView(
             output->getHeader().getColumnsWithTypeAndName(),
             ActionsDAG::MatchColumnsMode::Name);
         auto convert_actions = std::make_shared<ExpressionActions>(
-            std::move(convert_actions_dag), ExpressionActionsSettings::fromContext(local_context, CompileExpressions::yes));
+            convert_actions_dag, ExpressionActionsSettings::fromContext(local_context, CompileExpressions::yes));
 
         builder.addSimpleTransform([&](const Block & header_) { return std::make_shared<ExpressionTransform>(header_, convert_actions); });
     }
@@ -1674,8 +1646,6 @@ void StorageWindowView::writeIntoWindowView(
 
     auto executor = builder.execute();
     executor->execute(builder.getNumThreads(), local_context->getSettingsRef().use_concurrency_control);
-
-    LOG_TRACE(window_view.log, "Wrote {} rows into inner table ({})", block_rows, inner_table->getStorageID().getFullTableName());
 }
 
 void StorageWindowView::startup()
@@ -1794,7 +1764,7 @@ void registerStorageWindowView(StorageFactory & factory)
                             "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.comment, args.mode);
+        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 38fca512ed9..14ac65091d3 100644
--- a/src/Storages/WindowView/StorageWindowView.h
+++ b/src/Storages/WindowView/StorageWindowView.h
@@ -111,7 +111,6 @@ public:
         ContextPtr context_,
         const ASTCreateQuery & query,
         const ColumnsDescription & columns_,
-        const String & comment,
         LoadingStrictnessLevel mode);
 
     String getName() const override { return "WindowView"; }
diff --git a/src/Storages/fuzzers/CMakeLists.txt b/src/Storages/fuzzers/CMakeLists.txt
index f67552716a2..719b9b77cd9 100644
--- a/src/Storages/fuzzers/CMakeLists.txt
+++ b/src/Storages/fuzzers/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 clickhouse_add_executable (mergetree_checksum_fuzzer mergetree_checksum_fuzzer.cpp)
 # Look at comment around fuzz_compression target declaration
-target_link_libraries (mergetree_checksum_fuzzer PRIVATE dbms clickhouse_functions)
+target_link_libraries (mergetree_checksum_fuzzer PRIVATE dbms)
 
 clickhouse_add_executable (columns_description_fuzzer columns_description_fuzzer.cpp)
-target_link_libraries (columns_description_fuzzer PRIVATE clickhouse_functions)
+target_link_libraries (columns_description_fuzzer PRIVATE dbms)
diff --git a/src/Storages/fuzzers/columns_description_fuzzer.cpp b/src/Storages/fuzzers/columns_description_fuzzer.cpp
index e39afccd1f9..b703a1e7051 100644
--- a/src/Storages/fuzzers/columns_description_fuzzer.cpp
+++ b/src/Storages/fuzzers/columns_description_fuzzer.cpp
@@ -1,7 +1,4 @@
 #include <Storages/ColumnsDescription.h>
-#include <iostream>
-
-#include <iostream>
 
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
diff --git a/src/Storages/getStructureOfRemoteTable.cpp b/src/Storages/getStructureOfRemoteTable.cpp
index 1408e120bc5..56071abaa95 100644
--- a/src/Storages/getStructureOfRemoteTable.cpp
+++ b/src/Storages/getStructureOfRemoteTable.cpp
@@ -65,7 +65,7 @@ ColumnsDescription getStructureOfRemoteTableInShard(
     /// Ignore limit for result number of rows (that could be set during handling CSE/CTE),
     /// since this is a service query and should not lead to query failure.
     {
-        Settings new_settings = new_context->getSettingsCopy();
+        Settings new_settings = new_context->getSettings();
         new_settings.max_result_rows = 0;
         new_settings.max_result_bytes = 0;
         new_context->setSettings(new_settings);
@@ -102,16 +102,16 @@ ColumnsDescription getStructureOfRemoteTableInShard(
         {
             ColumnDescription column;
 
-            column.name = (*name)[i].safeGet<const String &>();
+            column.name = (*name)[i].get<const String &>();
 
-            String data_type_name = (*type)[i].safeGet<const String &>();
+            String data_type_name = (*type)[i].get<const String &>();
             column.type = data_type_factory.get(data_type_name);
 
-            String kind_name = (*default_kind)[i].safeGet<const String &>();
+            String kind_name = (*default_kind)[i].get<const String &>();
             if (!kind_name.empty())
             {
                 column.default_desc.kind = columnDefaultKindFromString(kind_name);
-                String expr_str = (*default_expr)[i].safeGet<const String &>();
+                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, settings.max_parser_depth, settings.max_parser_backtracks);
@@ -207,8 +207,8 @@ ColumnsDescriptionByShardNum getExtendedObjectsOfRemoteTables(
             size_t size = name_col.size();
             for (size_t i = 0; i < size; ++i)
             {
-                auto name = name_col[i].safeGet<const String &>();
-                auto type_name = type_col[i].safeGet<const String &>();
+                auto name = name_col[i].get<const String &>();
+                auto type_name = type_col[i].get<const String &>();
 
                 auto storage_column = storage_columns.tryGetPhysical(name);
                 if (storage_column && storage_column->type->hasDynamicSubcolumnsDeprecated())
diff --git a/src/Storages/registerStorages.cpp b/src/Storages/registerStorages.cpp
index 4ed74763810..8f33314397c 100644
--- a/src/Storages/registerStorages.cpp
+++ b/src/Storages/registerStorages.cpp
@@ -26,9 +26,6 @@ void registerStorageGenerateRandom(StorageFactory & factory);
 void registerStorageExecutable(StorageFactory & factory);
 void registerStorageWindowView(StorageFactory & factory);
 void registerStorageLoop(StorageFactory & factory);
-void registerStorageFuzzQuery(StorageFactory & factory);
-void registerStorageTimeSeries(StorageFactory & factory);
-
 #if USE_RAPIDJSON || USE_SIMDJSON
 void registerStorageFuzzJSON(StorageFactory & factory);
 #endif
@@ -129,9 +126,6 @@ void registerStorages()
     registerStorageExecutable(factory);
     registerStorageWindowView(factory);
     registerStorageLoop(factory);
-    registerStorageFuzzQuery(factory);
-    registerStorageTimeSeries(factory);
-
 #if USE_RAPIDJSON || USE_SIMDJSON
     registerStorageFuzzJSON(factory);
 #endif
diff --git a/src/TableFunctions/Hive/TableFunctionHive.cpp b/src/TableFunctions/Hive/TableFunctionHive.cpp
index 759807d7a4f..80494dbe5a8 100644
--- a/src/TableFunctions/Hive/TableFunctionHive.cpp
+++ b/src/TableFunctions/Hive/TableFunctionHive.cpp
@@ -93,7 +93,7 @@ StoragePtr TableFunctionHive::executeImpl(
     ColumnsDescription /*cached_columns_*/,
     bool /*is_insert_query*/) const
 {
-    const Settings & settings = context_->getSettingsRef();
+    const Settings & settings = context_->getSettings();
     ParserExpression partition_by_parser;
     ASTPtr partition_by_ast = parseQuery(
         partition_by_parser,
diff --git a/src/TableFunctions/ITableFunction.cpp b/src/TableFunctions/ITableFunction.cpp
index 916ff7ec022..e5676c5c25d 100644
--- a/src/TableFunctions/ITableFunction.cpp
+++ b/src/TableFunctions/ITableFunction.cpp
@@ -1,4 +1,5 @@
 #include <TableFunctions/ITableFunction.h>
+#include <Interpreters/Context.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageTableFunction.h>
 #include <Access/Common/AccessFlags.h>
diff --git a/src/TableFunctions/ITableFunctionDataLake.h b/src/TableFunctions/ITableFunctionDataLake.h
index db8287f97bf..fe6e5b3e593 100644
--- a/src/TableFunctions/ITableFunctionDataLake.h
+++ b/src/TableFunctions/ITableFunctionDataLake.h
@@ -76,21 +76,6 @@ struct TableFunctionIcebergName
     static constexpr auto name = "iceberg";
 };
 
-struct TableFunctionIcebergS3Name
-{
-    static constexpr auto name = "icebergS3";
-};
-
-struct TableFunctionIcebergAzureName
-{
-    static constexpr auto name = "icebergAzure";
-};
-
-struct TableFunctionIcebergLocalName
-{
-    static constexpr auto name = "icebergLocal";
-};
-
 struct TableFunctionDeltaLakeName
 {
     static constexpr auto name = "deltaLake";
@@ -101,20 +86,14 @@ struct TableFunctionHudiName
     static constexpr auto name = "hudi";
 };
 
-#if USE_AVRO
-#    if USE_AWS_S3
-using TableFunctionIceberg = ITableFunctionDataLake<TableFunctionIcebergName, StorageIceberg, TableFunctionS3>;
-using TableFunctionIcebergS3 = ITableFunctionDataLake<TableFunctionIcebergS3Name, StorageIceberg, TableFunctionS3>;
-#    endif
-#    if USE_AZURE_BLOB_STORAGE
-using TableFunctionIcebergAzure = ITableFunctionDataLake<TableFunctionIcebergAzureName, StorageIceberg, TableFunctionAzureBlob>;
-#    endif
-using TableFunctionIcebergLocal = ITableFunctionDataLake<TableFunctionIcebergLocalName, StorageIceberg, TableFunctionLocal>;
-#endif
 #if USE_AWS_S3
-#    if USE_PARQUET
+#if USE_AVRO
+using TableFunctionIceberg = ITableFunctionDataLake<TableFunctionIcebergName, StorageIceberg, TableFunctionS3>;
+#endif
+#if USE_PARQUET
 using TableFunctionDeltaLake = ITableFunctionDataLake<TableFunctionDeltaLakeName, StorageDeltaLake, TableFunctionS3>;
 #endif
 using TableFunctionHudi = ITableFunctionDataLake<TableFunctionHudiName, StorageHudi, TableFunctionS3>;
 #endif
+
 }
diff --git a/src/TableFunctions/TableFunctionExecutable.cpp b/src/TableFunctions/TableFunctionExecutable.cpp
index cccd3587bc7..2c3802e8667 100644
--- a/src/TableFunctions/TableFunctionExecutable.cpp
+++ b/src/TableFunctions/TableFunctionExecutable.cpp
@@ -170,14 +170,7 @@ StoragePtr TableFunctionExecutable::executeImpl(const ASTPtr & /*ast_function*/,
     if (settings_query != nullptr)
         settings.applyChanges(settings_query->as<ASTSetQuery>()->changes);
 
-    auto storage = std::make_shared<StorageExecutable>(
-        storage_id,
-        format,
-        settings,
-        input_queries,
-        getActualTableStructure(context, is_insert_query),
-        ConstraintsDescription{},
-        /* comment = */ "");
+    auto storage = std::make_shared<StorageExecutable>(storage_id, format, settings, input_queries, getActualTableStructure(context, is_insert_query), ConstraintsDescription{});
     storage->startup();
     return storage;
 }
diff --git a/src/TableFunctions/TableFunctionExplain.cpp b/src/TableFunctions/TableFunctionExplain.cpp
index 69d24c879bd..552b9fde986 100644
--- a/src/TableFunctions/TableFunctionExplain.cpp
+++ b/src/TableFunctions/TableFunctionExplain.cpp
@@ -83,7 +83,7 @@ void TableFunctionExplain::parseArguments(const ASTPtr & ast_function, ContextPt
             "Table function '{}' requires a String argument for EXPLAIN kind, got '{}'",
             getName(), queryToString(kind_arg));
 
-    ASTExplainQuery::ExplainKind kind = ASTExplainQuery::fromString(kind_literal->value.safeGet<String>());
+    ASTExplainQuery::ExplainKind kind = ASTExplainQuery::fromString(kind_literal->value.get<String>());
     auto explain_query = std::make_shared<ASTExplainQuery>(kind);
 
     const auto * settings_arg = function->arguments->children[1]->as<ASTLiteral>();
@@ -92,7 +92,7 @@ void TableFunctionExplain::parseArguments(const ASTPtr & ast_function, ContextPt
             "Table function '{}' requires a serialized string settings argument, got '{}'",
             getName(), queryToString(function->arguments->children[1]));
 
-    const auto & settings_str = settings_arg->value.safeGet<String>();
+    const auto & settings_str = settings_arg->value.get<String>();
     if (!settings_str.empty())
     {
         const Settings & settings = context->getSettingsRef();
diff --git a/src/TableFunctions/TableFunctionFile.cpp b/src/TableFunctions/TableFunctionFile.cpp
index 5cd249f000d..af327cfe54e 100644
--- a/src/TableFunctions/TableFunctionFile.cpp
+++ b/src/TableFunctions/TableFunctionFile.cpp
@@ -48,7 +48,7 @@ void TableFunctionFile::parseFirstArguments(const ASTPtr & arg, const ContextPtr
     else if (type == Field::Types::Int64 || type == Field::Types::UInt64)
     {
         fd = static_cast<int>(
-            (type == Field::Types::Int64) ? literal->value.safeGet<Int64>() : literal->value.safeGet<UInt64>());
+            (type == Field::Types::Int64) ? literal->value.get<Int64>() : literal->value.get<UInt64>());
         if (fd < 0)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "File descriptor must be non-negative");
     }
diff --git a/src/TableFunctions/TableFunctionFuzzQuery.cpp b/src/TableFunctions/TableFunctionFuzzQuery.cpp
deleted file mode 100644
index 224f6666556..00000000000
--- a/src/TableFunctions/TableFunctionFuzzQuery.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <TableFunctions/TableFunctionFuzzQuery.h>
-
-#include <DataTypes/DataTypeString.h>
-#include <Storages/checkAndGetLiteralArgument.h>
-#include <TableFunctions/TableFunctionFactory.h>
-#include <TableFunctions/registerTableFunctions.h>
-
-namespace DB
-{
-
-
-namespace ErrorCodes
-{
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-}
-
-void TableFunctionFuzzQuery::parseArguments(const ASTPtr & ast_function, ContextPtr context)
-{
-    ASTs & args_func = ast_function->children;
-
-    if (args_func.size() != 1)
-        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Table function '{}' must have arguments", getName());
-
-    auto args = args_func.at(0)->children;
-    configuration = StorageFuzzQuery::getConfiguration(args, context);
-}
-
-StoragePtr TableFunctionFuzzQuery::executeImpl(
-    const ASTPtr & /*ast_function*/,
-    ContextPtr context,
-    const std::string & table_name,
-    ColumnsDescription /*cached_columns*/,
-    bool is_insert_query) const
-{
-    ColumnsDescription columns = getActualTableStructure(context, is_insert_query);
-    auto res = std::make_shared<StorageFuzzQuery>(
-        StorageID(getDatabaseName(), table_name),
-        columns,
-        /* comment */ String{},
-        configuration);
-    res->startup();
-    return res;
-}
-
-void registerTableFunctionFuzzQuery(TableFunctionFactory & factory)
-{
-    factory.registerFunction<TableFunctionFuzzQuery>(
-        {.documentation
-         = {.description = "Perturbs a query string with random variations.",
-            .returned_value = "A table object with a single column containing perturbed query strings."},
-         .allow_readonly = true});
-}
-
-}
diff --git a/src/TableFunctions/TableFunctionFuzzQuery.h b/src/TableFunctions/TableFunctionFuzzQuery.h
deleted file mode 100644
index 22d10341c4d..00000000000
--- a/src/TableFunctions/TableFunctionFuzzQuery.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include <optional>
-
-#include <TableFunctions/ITableFunction.h>
-#include <DataTypes/DataTypeString.h>
-#include <Storages/StorageFuzzQuery.h>
-
-#include "config.h"
-
-namespace DB
-{
-
-class TableFunctionFuzzQuery : public ITableFunction
-{
-public:
-    static constexpr auto name = "fuzzQuery";
-    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
-    {
-        return ColumnsDescription{{"query", std::make_shared<DataTypeString>()}};
-    }
-
-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 "fuzzQuery"; }
-
-    String source;
-    std::optional<UInt64> random_seed;
-    StorageFuzzQuery::Configuration configuration;
-};
-
-}
diff --git a/src/TableFunctions/TableFunctionMergeTreeIndex.cpp b/src/TableFunctions/TableFunctionMergeTreeIndex.cpp
index 27ed50fb711..06a48f0e25f 100644
--- a/src/TableFunctions/TableFunctionMergeTreeIndex.cpp
+++ b/src/TableFunctions/TableFunctionMergeTreeIndex.cpp
@@ -76,9 +76,9 @@ void TableFunctionMergeTreeIndex::parseArguments(const ASTPtr & ast_function, Co
                     "Table function '{}' expected bool flag for 'with_marks' argument", getName());
 
             if (value.getType() == Field::Types::Bool)
-                with_marks = value.safeGet<bool>();
+                with_marks = value.get<bool>();
             else
-                with_marks = value.safeGet<UInt64>();
+                with_marks = value.get<UInt64>();
         }
 
         if (!params.empty())
diff --git a/src/TableFunctions/TableFunctionMongoDB.cpp b/src/TableFunctions/TableFunctionMongoDB.cpp
index 94279d1bf6d..b2cf1b4675e 100644
--- a/src/TableFunctions/TableFunctionMongoDB.cpp
+++ b/src/TableFunctions/TableFunctionMongoDB.cpp
@@ -1,4 +1,5 @@
 #include <Storages/StorageMongoDB.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 #include <Common/Exception.h>
 
diff --git a/src/TableFunctions/TableFunctionObjectStorage.cpp b/src/TableFunctions/TableFunctionObjectStorage.cpp
index 9cebb91044a..550d9cc799b 100644
--- a/src/TableFunctions/TableFunctionObjectStorage.cpp
+++ b/src/TableFunctions/TableFunctionObjectStorage.cpp
@@ -14,11 +14,10 @@
 
 #include <Storages/ObjectStorage/Utils.h>
 #include <Storages/NamedCollectionsHelpers.h>
-#include <Storages/ObjectStorage/Azure/Configuration.h>
-#include <Storages/ObjectStorage/HDFS/Configuration.h>
-#include <Storages/ObjectStorage/Local/Configuration.h>
 #include <Storages/ObjectStorage/S3/Configuration.h>
+#include <Storages/ObjectStorage/HDFS/Configuration.h>
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
+#include <Storages/ObjectStorage/Azure/Configuration.h>
 
 
 namespace DB
@@ -85,8 +84,7 @@ ColumnsDescription TableFunctionObjectStorage<
         context->checkAccess(getSourceAccessType());
         ColumnsDescription columns;
         auto storage = getObjectStorage(context, !is_insert_query);
-        std::string sample_path;
-        resolveSchemaAndFormat(columns, configuration->format, storage, configuration, std::nullopt, sample_path, context);
+        resolveSchemaAndFormat(columns, configuration->format, storage, configuration, std::nullopt, context);
         return columns;
     }
     else
@@ -224,5 +222,5 @@ template class TableFunctionObjectStorage<OSSDefinition, StorageS3Configuration>
 template class TableFunctionObjectStorage<HDFSDefinition, StorageHDFSConfiguration>;
 template class TableFunctionObjectStorage<HDFSClusterDefinition, StorageHDFSConfiguration>;
 #endif
-template class TableFunctionObjectStorage<LocalDefinition, StorageLocalConfiguration>;
+
 }
diff --git a/src/TableFunctions/TableFunctionObjectStorage.h b/src/TableFunctions/TableFunctionObjectStorage.h
index 6b923f93e75..e9b811daf7a 100644
--- a/src/TableFunctions/TableFunctionObjectStorage.h
+++ b/src/TableFunctions/TableFunctionObjectStorage.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <Disks/ObjectStorages/IObjectStorage_fwd.h>
-#include <Formats/FormatFactory.h>
-#include <Storages/ObjectStorage/StorageObjectStorage.h>
-#include <Storages/VirtualColumnUtils.h>
-#include <TableFunctions/ITableFunction.h>
 #include "config.h"
+#include <TableFunctions/ITableFunction.h>
+#include <Formats/FormatFactory.h>
+#include <Disks/ObjectStorages/IObjectStorage_fwd.h>
+#include <Storages/VirtualColumnUtils.h>
+#include <Storages/ObjectStorage/StorageObjectStorage.h>
 
 namespace DB
 {
@@ -14,7 +14,6 @@ class Context;
 class StorageS3Configuration;
 class StorageAzureConfiguration;
 class StorageHDFSConfiguration;
-class StorageLocalConfiguration;
 struct S3StorageSettings;
 struct AzureStorageSettings;
 struct HDFSStorageSettings;
@@ -55,12 +54,6 @@ struct HDFSDefinition
     static constexpr auto storage_type_name = "HDFS";
 };
 
-struct LocalDefinition
-{
-    static constexpr auto name = "local";
-    static constexpr auto storage_type_name = "Local";
-};
-
 template <typename Definition, typename Configuration>
 class TableFunctionObjectStorage : public ITableFunction
 {
@@ -135,6 +128,4 @@ using TableFunctionAzureBlob = TableFunctionObjectStorage<AzureDefinition, Stora
 #if USE_HDFS
 using TableFunctionHDFS = TableFunctionObjectStorage<HDFSDefinition, StorageHDFSConfiguration>;
 #endif
-
-using TableFunctionLocal = TableFunctionObjectStorage<LocalDefinition, StorageLocalConfiguration>;
 }
diff --git a/src/TableFunctions/TableFunctionRedis.cpp b/src/TableFunctions/TableFunctionRedis.cpp
index aca751c2840..f87ba6d1c6d 100644
--- a/src/TableFunctions/TableFunctionRedis.cpp
+++ b/src/TableFunctions/TableFunctionRedis.cpp
@@ -15,6 +15,7 @@
 
 #include <Storages/StorageRedis.h>
 #include <TableFunctions/ITableFunction.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 
 namespace DB
diff --git a/src/TableFunctions/TableFunctionRemote.cpp b/src/TableFunctions/TableFunctionRemote.cpp
index 8a877ff0802..e60c31b2d77 100644
--- a/src/TableFunctions/TableFunctionRemote.cpp
+++ b/src/TableFunctions/TableFunctionRemote.cpp
@@ -306,7 +306,21 @@ StoragePtr TableFunctionRemote::executeImpl(const ASTPtr & /*ast_function*/, Con
         cached_columns = getActualTableStructure(context, is_insert_query);
 
     assert(cluster);
-    StoragePtr res = std::make_shared<StorageDistributed>(
+    StoragePtr res = remote_table_function_ptr
+        ? std::make_shared<StorageDistributed>(
+            StorageID(getDatabaseName(), table_name),
+            cached_columns,
+            ConstraintsDescription{},
+            remote_table_function_ptr,
+            String{},
+            context,
+            sharding_key,
+            String{},
+            String{},
+            DistributedSettings{},
+            LoadingStrictnessLevel::CREATE,
+            cluster)
+        : std::make_shared<StorageDistributed>(
             StorageID(getDatabaseName(), table_name),
             cached_columns,
             ConstraintsDescription{},
@@ -320,9 +334,7 @@ StoragePtr TableFunctionRemote::executeImpl(const ASTPtr & /*ast_function*/, Con
             String{},
             DistributedSettings{},
             LoadingStrictnessLevel::CREATE,
-            cluster,
-            remote_table_function_ptr,
-            !is_cluster_function);
+            cluster);
 
     res->startup();
     return res;
diff --git a/src/TableFunctions/TableFunctionSQLite.cpp b/src/TableFunctions/TableFunctionSQLite.cpp
index 87353025d1d..e367e05bf73 100644
--- a/src/TableFunctions/TableFunctionSQLite.cpp
+++ b/src/TableFunctions/TableFunctionSQLite.cpp
@@ -57,7 +57,7 @@ StoragePtr TableFunctionSQLite::executeImpl(const ASTPtr & /*ast_function*/,
                                          sqlite_db,
                                          database_path,
                                          remote_table_name,
-                                         cached_columns, ConstraintsDescription{}, /* comment = */ "", context);
+                                         cached_columns, ConstraintsDescription{}, context);
 
     storage->startup();
     return storage;
diff --git a/src/TableFunctions/TableFunctionTimeSeries.cpp b/src/TableFunctions/TableFunctionTimeSeries.cpp
deleted file mode 100644
index 62ea088eba0..00000000000
--- a/src/TableFunctions/TableFunctionTimeSeries.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-#include <TableFunctions/TableFunctionTimeSeries.h>
-
-#include <Interpreters/Context.h>
-#include <Interpreters/DatabaseCatalog.h>
-#include <Interpreters/evaluateConstantExpression.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Storages/StorageTimeSeries.h>
-#include <Storages/checkAndGetLiteralArgument.h>
-#include <TableFunctions/TableFunctionFactory.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-    extern const int LOGICAL_ERROR;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-}
-
-
-template <ViewTarget::Kind target_kind>
-void TableFunctionTimeSeriesTarget<target_kind>::parseArguments(const ASTPtr & ast_function, ContextPtr context)
-{
-    const auto & args_func = ast_function->as<ASTFunction &>();
-
-    if (!args_func.arguments)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Table function '{}' must have arguments.", name);
-
-    auto & args = args_func.arguments->children;
-
-    if ((args.size() != 1) && (args.size() != 2))
-        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                        "Table function '{}' requires one or two arguments: {}([database, ] time_series_table)", name, name);
-
-    if (args.size() == 1)
-    {
-        /// timeSeriesMetrics( [my_db.]my_time_series_table )
-        if (const auto * id = args[0]->as<ASTIdentifier>())
-        {
-            if (auto table_id = id->createTable())
-                time_series_storage_id = table_id->getTableId();
-        }
-    }
-
-    if (time_series_storage_id.empty())
-    {
-        for (auto & arg : args)
-            arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
-
-        if (args.size() == 1)
-        {
-            /// timeSeriesMetrics( 'my_time_series_table' )
-            time_series_storage_id.table_name = checkAndGetLiteralArgument<String>(args[0], "table_name");
-        }
-        else
-        {
-            /// timeSeriesMetrics( 'mydb', 'my_time_series_table' )
-            time_series_storage_id.database_name = checkAndGetLiteralArgument<String>(args[0], "database_name");
-            time_series_storage_id.table_name = checkAndGetLiteralArgument<String>(args[1], "table_name");
-        }
-    }
-
-    if (time_series_storage_id.empty())
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Couldn't get a table name from the arguments of the {} table function", name);
-
-    time_series_storage_id = context->resolveStorageID(time_series_storage_id);
-    target_table_type_name = getTargetTable(context)->getName();
-}
-
-
-template <ViewTarget::Kind target_kind>
-StoragePtr TableFunctionTimeSeriesTarget<target_kind>::getTargetTable(const ContextPtr & context) const
-{
-    auto time_series_storage = storagePtrToTimeSeries(DatabaseCatalog::instance().getTable(time_series_storage_id, context));
-    return time_series_storage->getTargetTable(target_kind, context);
-}
-
-
-template <ViewTarget::Kind target_kind>
-StoragePtr TableFunctionTimeSeriesTarget<target_kind>::executeImpl(
-        const ASTPtr & /* ast_function */,
-        ContextPtr context,
-        const String & /* table_name */,
-        ColumnsDescription /* cached_columns */,
-        bool /* is_insert_query */) const
-{
-    return getTargetTable(context);
-}
-
-template <ViewTarget::Kind target_kind>
-ColumnsDescription TableFunctionTimeSeriesTarget<target_kind>::getActualTableStructure(ContextPtr context, bool /* is_insert_query */) const
-{
-    return getTargetTable(context)->getInMemoryMetadataPtr()->columns;
-}
-
-template <ViewTarget::Kind target_kind>
-const char * TableFunctionTimeSeriesTarget<target_kind>::getStorageTypeName() const
-{
-    return target_table_type_name.c_str();
-}
-
-
-void registerTableFunctionTimeSeries(TableFunctionFactory & factory)
-{
-    factory.registerFunction<TableFunctionTimeSeriesTarget<ViewTarget::Data>>(
-        {.documentation = {
-            .description=R"(Provides direct access to the 'data' target table for a specified TimeSeries table.)",
-            .examples{{"timeSeriesData", "SELECT * from timeSeriesData('mydb', 'time_series_table');", ""}},
-            .categories{"Time Series"}}
-        });
-    factory.registerFunction<TableFunctionTimeSeriesTarget<ViewTarget::Tags>>(
-        {.documentation = {
-            .description=R"(Provides direct access to the 'tags' target table for a specified TimeSeries table.)",
-            .examples{{"timeSeriesTags", "SELECT * from timeSeriesTags('mydb', 'time_series_table');", ""}},
-            .categories{"Time Series"}}
-        });
-    factory.registerFunction<TableFunctionTimeSeriesTarget<ViewTarget::Metrics>>(
-        {.documentation = {
-            .description=R"(Provides direct access to the 'metrics' target table for a specified TimeSeries table.)",
-            .examples{{"timeSeriesMetrics", "SELECT * from timeSeriesMetrics('mydb', 'time_series_table');", ""}},
-            .categories{"Time Series"}}
-        });
-}
-
-}
diff --git a/src/TableFunctions/TableFunctionTimeSeries.h b/src/TableFunctions/TableFunctionTimeSeries.h
deleted file mode 100644
index 57654413fe4..00000000000
--- a/src/TableFunctions/TableFunctionTimeSeries.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include <Parsers/ASTViewTargets.h>
-#include <TableFunctions/ITableFunction.h>
-#include <Storages/StorageTimeSeries.h>
-
-
-namespace DB
-{
-
-/// Table functions timeSeriesData('mydb', 'my_ts_table'), timeSeriesTags('mydb', 'my_ts_table'), timeSeriesMetrics('mydb', 'my_ts_table')
-/// return the data table, the tags table, and the metrics table respectively associated with any TimeSeries table mydb.my_ts_table
-template <ViewTarget::Kind target_kind>
-class TableFunctionTimeSeriesTarget : public ITableFunction
-{
-public:
-    static constexpr auto name = (target_kind == ViewTarget::Data)
-        ? "timeSeriesData"
-        : ((target_kind == ViewTarget::Tags) ? "timeSeriesTags" : "timeSeriesMetrics");
-
-    String getName() const override { return name; }
-
-private:
-    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
-
-    StoragePtr executeImpl(
-        const ASTPtr & ast_function,
-        ContextPtr context,
-        const std::string & table_name,
-        ColumnsDescription cached_columns,
-        bool is_insert_query) const override;
-
-    ColumnsDescription getActualTableStructure(ContextPtr context, bool is_insert_query) const override;
-    const char * getStorageTypeName() const override;
-
-    StoragePtr getTargetTable(const ContextPtr & context) const;
-
-    StorageID time_series_storage_id = StorageID::createEmpty();
-    String target_table_type_name;
-};
-
-}
diff --git a/src/TableFunctions/registerDataLakeTableFunctions.cpp b/src/TableFunctions/registerDataLakeTableFunctions.cpp
index 8361d8a7977..15a6668f434 100644
--- a/src/TableFunctions/registerDataLakeTableFunctions.cpp
+++ b/src/TableFunctions/registerDataLakeTableFunctions.cpp
@@ -4,43 +4,24 @@
 namespace DB
 {
 
+#if USE_AWS_S3
 #if USE_AVRO
 void registerTableFunctionIceberg(TableFunctionFactory & factory)
 {
-#    if USE_AWS_S3
     factory.registerFunction<TableFunctionIceberg>(
-        {.documentation
-         = {.description = R"(The table function can be used to read the Iceberg table stored on S3 object store. Alias to icebergS3)",
+    {
+        .documentation =
+        {
+            .description=R"(The table function can be used to read the Iceberg table stored on object store.)",
             .examples{{"iceberg", "SELECT * FROM iceberg(url, access_key_id, secret_access_key)", ""}},
-            .categories{"DataLake"}},
-         .allow_readonly = false});
-    factory.registerFunction<TableFunctionIcebergS3>(
-        {.documentation
-         = {.description = R"(The table function can be used to read the Iceberg table stored on S3 object store.)",
-            .examples{{"icebergS3", "SELECT * FROM icebergS3(url, access_key_id, secret_access_key)", ""}},
-            .categories{"DataLake"}},
-         .allow_readonly = false});
-
-#    endif
-#    if USE_AZURE_BLOB_STORAGE
-    factory.registerFunction<TableFunctionIcebergAzure>(
-        {.documentation
-         = {.description = R"(The table function can be used to read the Iceberg table stored on Azure object store.)",
-            .examples{{"icebergAzure", "SELECT * FROM icebergAzure(url, access_key_id, secret_access_key)", ""}},
-            .categories{"DataLake"}},
-         .allow_readonly = false});
-#    endif
-    factory.registerFunction<TableFunctionIcebergLocal>(
-        {.documentation
-         = {.description = R"(The table function can be used to read the Iceberg table stored locally.)",
-            .examples{{"icebergLocal", "SELECT * FROM icebergLocal(filename)", ""}},
-            .categories{"DataLake"}},
-         .allow_readonly = false});
+            .categories{"DataLake"}
+        },
+        .allow_readonly = false
+    });
 }
 #endif
 
-#if USE_AWS_S3
-#    if USE_PARQUET
+#if USE_PARQUET
 void registerTableFunctionDeltaLake(TableFunctionFactory & factory)
 {
     factory.registerFunction<TableFunctionDeltaLake>(
@@ -74,11 +55,11 @@ void registerTableFunctionHudi(TableFunctionFactory & factory)
 void registerDataLakeTableFunctions(TableFunctionFactory & factory)
 {
     UNUSED(factory);
+#if USE_AWS_S3
 #if USE_AVRO
     registerTableFunctionIceberg(factory);
 #endif
-#if USE_AWS_S3
-#    if USE_PARQUET
+#if USE_PARQUET
     registerTableFunctionDeltaLake(factory);
 #endif
     registerTableFunctionHudi(factory);
diff --git a/src/TableFunctions/registerTableFunctions.cpp b/src/TableFunctions/registerTableFunctions.cpp
index 0b21de00f86..ca4913898f9 100644
--- a/src/TableFunctions/registerTableFunctions.cpp
+++ b/src/TableFunctions/registerTableFunctions.cpp
@@ -26,7 +26,6 @@ void registerTableFunctions()
     registerTableFunctionMongoDB(factory);
     registerTableFunctionRedis(factory);
     registerTableFunctionMergeTreeIndex(factory);
-    registerTableFunctionFuzzQuery(factory);
 #if USE_RAPIDJSON || USE_SIMDJSON
     registerTableFunctionFuzzJSON(factory);
 #endif
@@ -57,7 +56,6 @@ void registerTableFunctions()
 
     registerTableFunctionFormat(factory);
     registerTableFunctionExplain(factory);
-    registerTableFunctionTimeSeries(factory);
 
     registerTableFunctionObjectStorage(factory);
     registerTableFunctionObjectStorageCluster(factory);
diff --git a/src/TableFunctions/registerTableFunctions.h b/src/TableFunctions/registerTableFunctions.h
index 1dd6341b67e..efde4d6dcdc 100644
--- a/src/TableFunctions/registerTableFunctions.h
+++ b/src/TableFunctions/registerTableFunctions.h
@@ -23,7 +23,6 @@ void registerTableFunctionGenerate(TableFunctionFactory & factory);
 void registerTableFunctionMongoDB(TableFunctionFactory & factory);
 void registerTableFunctionRedis(TableFunctionFactory & factory);
 void registerTableFunctionMergeTreeIndex(TableFunctionFactory & factory);
-void registerTableFunctionFuzzQuery(TableFunctionFactory & factory);
 #if USE_RAPIDJSON || USE_SIMDJSON
 void registerTableFunctionFuzzJSON(TableFunctionFactory & factory);
 #endif
@@ -68,8 +67,6 @@ void registerTableFunctionObjectStorage(TableFunctionFactory & factory);
 void registerTableFunctionObjectStorageCluster(TableFunctionFactory & factory);
 void registerDataLakeTableFunctions(TableFunctionFactory & factory);
 
-void registerTableFunctionTimeSeries(TableFunctionFactory & factory);
-
 void registerTableFunctions();
 
 }
diff --git a/src/configure_config.cmake b/src/configure_config.cmake
index 5a1aa179e01..75f61baa854 100644
--- a/src/configure_config.cmake
+++ b/src/configure_config.cmake
@@ -135,12 +135,6 @@ endif()
 if (TARGET ch_contrib::vectorscan)
     set(USE_VECTORSCAN 1)
 endif()
-if (TARGET ch_contrib::qpl)
-    set(USE_QPL 1)
-endif()
-if (TARGET ch_contrib::qatlib)
-    set(USE_QATLIB 1)
-endif()
 if (TARGET ch_contrib::avrocpp)
     set(USE_AVRO 1)
 endif()
@@ -164,14 +158,11 @@ endif()
 if (TARGET ch_contrib::bcrypt)
     set(USE_BCRYPT 1)
 endif()
-if (TARGET ch_contrib::usearch)
-    set(USE_USEARCH 1)
-endif()
 if (TARGET ch_contrib::ssh)
     set(USE_SSH 1)
 endif()
-if (TARGET ch_contrib::libfiu)
-    set(USE_LIBFIU 1)
+if (TARGET ch_contrib::fiu)
+    set(FIU_ENABLE 1)
 endif()
 if (TARGET ch_contrib::libarchive)
     set(USE_LIBARCHIVE 1)
@@ -182,8 +173,5 @@ endif()
 if (TARGET ch_contrib::prometheus_protobufs)
     set(USE_PROMETHEUS_PROTOBUFS 1)
 endif()
-if (TARGET ch_contrib::numactl)
-    set(USE_NUMACTL 1)
-endif()
 
 set(SOURCE_DIR ${PROJECT_SOURCE_DIR})
diff --git a/tests/analyzer_tech_debt.txt b/tests/analyzer_tech_debt.txt
index c8edbdc5932..bd92465e1aa 100644
--- a/tests/analyzer_tech_debt.txt
+++ b/tests/analyzer_tech_debt.txt
@@ -1,3 +1,4 @@
 01624_soft_constraints
+02354_vector_search_queries
 # Check after ConstantNode refactoring
 02944_variant_as_common_type
diff --git a/tests/ci/.mypy.ini b/tests/ci/.mypy.ini
index ecb4aef87dd..f12d27979ce 100644
--- a/tests/ci/.mypy.ini
+++ b/tests/ci/.mypy.ini
@@ -15,5 +15,4 @@ warn_return_any = True
 no_implicit_reexport = True
 strict_equality = True
 extra_checks = True
-ignore_missing_imports = True
-logging-fstring-interpolation = False
\ No newline at end of file
+ignore_missing_imports = True
\ No newline at end of file
diff --git a/tests/ci/artifactory.py b/tests/ci/artifactory.py
index 9457fa32ad3..86dcaf79854 100644
--- a/tests/ci/artifactory.py
+++ b/tests/ci/artifactory.py
@@ -13,8 +13,8 @@ from ci_utils import WithIter, Shell
 
 
 class MountPointApp(metaclass=WithIter):
+    RCLONE = "rclone"
     S3FS = "s3fs"
-    GEESEFS = "geesefs"
 
 
 class R2MountPoint:
@@ -30,6 +30,9 @@ class R2MountPoint:
     DEBUG = True
     # enable cache for mountpoint
     CACHE_ENABLED = False
+    # TODO: which mode is better: minimal/writes/full/off
+    _RCLONE_CACHE_MODE = "minimal"
+    UMASK = "0000"
 
     def __init__(self, app: str, dry_run: bool) -> None:
         assert app in MountPointApp
@@ -49,26 +52,20 @@ class R2MountPoint:
                 if self.CACHE_ENABLED
                 else ""
             )
-            if not dry_run:
-                self.aux_mount_options += (
-                    "-o passwd_file /home/ubuntu/.passwd-s3fs_packages "
-                )
             # without -o nomultipart there are errors like "Error 5 writing to /home/ubuntu/***.deb: Input/output error"
             self.mount_cmd = f"s3fs {self.bucket_name} {self.MOUNT_POINT} -o url={self.API_ENDPOINT} -o use_path_request_style -o umask=0000 -o nomultipart -o logfile={self.LOG_FILE} {self.aux_mount_options}"
-        elif self.app == MountPointApp.GEESEFS:
-            self.cache_dir = "/home/ubuntu/geesefs_cache"
+        elif self.app == MountPointApp.RCLONE:
+            # run rclone mount process asynchronously, otherwise subprocess.run(daemonized command) will not return
+            self.cache_dir = "/home/ubuntu/rclone_cache"
+            self.aux_mount_options += "--no-modtime " if self.NOMODTIME else ""
+            self.aux_mount_options += "-v " if self.DEBUG else ""  # -vv too verbose
             self.aux_mount_options += (
-                f" --cache={self.cache_dir} " if self.CACHE_ENABLED else ""
+                f"--vfs-cache-mode {self._RCLONE_CACHE_MODE} --vfs-cache-max-size {self._CACHE_MAX_SIZE_GB}G"
+                if self.CACHE_ENABLED
+                else "--vfs-cache-mode off"
             )
-            if not dry_run:
-                self.aux_mount_options += f" --shared-config=/home/ubuntu/.r2_auth "
-            else:
-                self.aux_mount_options += (
-                    f" --shared-config=/home/ubuntu/.r2_auth_test "
-                )
-            if self.DEBUG:
-                self.aux_mount_options += " --debug_s3 "
-            self.mount_cmd = f"geesefs --endpoint={self.API_ENDPOINT} --cheap --memory-limit=1000 --gc-interval=100 --max-flushers=10 --max-parallel-parts=1 --max-parallel-copy=10 --log-file={self.LOG_FILE} {self.aux_mount_options} {self.bucket_name} {self.MOUNT_POINT}"
+            # Use --no-modtime to try to avoid: ERROR : rpm/lts/clickhouse-client-24.3.6.5.x86_64.rpm: Failed to apply pending mod time
+            self.mount_cmd = f"rclone mount remote:{self.bucket_name} {self.MOUNT_POINT} --daemon --cache-dir {self.cache_dir} --umask 0000 --log-file {self.LOG_FILE} {self.aux_mount_options}"
         else:
             assert False
 
@@ -82,17 +79,22 @@ class R2MountPoint:
         )
 
         _TEST_MOUNT_CMD = f"mount | grep -q {self.MOUNT_POINT}"
-        Shell.check(_CLEAN_LOG_FILE_CMD, verbose=True)
-        Shell.check(_UNMOUNT_CMD, verbose=True)
-        Shell.check(_MKDIR_CMD, verbose=True)
-        Shell.check(_MKDIR_FOR_CACHE, verbose=True)
-        Shell.check(self.mount_cmd, strict=True, verbose=True)
+        Shell.run(_CLEAN_LOG_FILE_CMD)
+        Shell.run(_UNMOUNT_CMD)
+        Shell.run(_MKDIR_CMD)
+        Shell.run(_MKDIR_FOR_CACHE)
+        if self.app == MountPointApp.S3FS:
+            Shell.run(self.mount_cmd, check=True)
+        else:
+            # didn't manage to use simple run() and without blocking or failure
+            Shell.run_as_daemon(self.mount_cmd)
         time.sleep(3)
-        Shell.check(_TEST_MOUNT_CMD, strict=True, verbose=True)
+        Shell.run(_TEST_MOUNT_CMD, check=True)
 
     @classmethod
     def teardown(cls):
-        Shell.check(f"umount {cls.MOUNT_POINT}", verbose=True)
+        print(f"Unmount [{cls.MOUNT_POINT}]")
+        Shell.run(f"umount {cls.MOUNT_POINT}")
 
 
 class RepoCodenames(metaclass=WithIter):
@@ -127,9 +129,10 @@ class DebianArtifactory:
         ]
         REPREPRO_CMD_PREFIX = f"reprepro --basedir {R2MountPoint.MOUNT_POINT}/configs/deb --outdir {R2MountPoint.MOUNT_POINT}/deb --verbose"
         cmd = f"{REPREPRO_CMD_PREFIX} includedeb {self.codename} {' '.join(paths)}"
-        print("Running export commands:")
-        Shell.check(cmd, strict=True, verbose=True)
-        Shell.check("sync")
+        print("Running export command:")
+        print(f"  {cmd}")
+        Shell.run(cmd, check=True)
+        Shell.run("sync")
 
         if self.codename == RepoCodenames.LTS:
             packages_with_version = [
@@ -141,26 +144,18 @@ class DebianArtifactory:
             cmd = f"{REPREPRO_CMD_PREFIX} copy {RepoCodenames.STABLE} {RepoCodenames.LTS} {' '.join(packages_with_version)}"
             print("Running copy command:")
             print(f"  {cmd}")
-            Shell.check(cmd, strict=True)
-            Shell.check("sync")
-        time.sleep(10)
-        Shell.check(f"lsof +D R2MountPoint.MOUNT_POINT", verbose=True)
+            Shell.run(cmd, check=True)
+            Shell.run("sync")
 
     def test_packages(self):
-        Shell.check("docker pull ubuntu:latest", strict=True)
+        Shell.run("docker pull ubuntu:latest")
         print(f"Test packages installation, version [{self.version}]")
         debian_command = f"echo 'deb {self.repo_url} stable main' | tee /etc/apt/sources.list.d/clickhouse.list; apt update -y; apt-get install -y clickhouse-common-static={self.version} clickhouse-client={self.version}"
         cmd = f'docker run --rm ubuntu:latest bash -c "apt update -y; apt install -y sudo gnupg ca-certificates; apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 8919F6BD2B48D754; {debian_command}"'
         print("Running test command:")
         print(f"  {cmd}")
-        assert Shell.check(cmd)
-        print(f"Test packages installation, version [latest]")
-        debian_command_2 = f"echo 'deb {self.repo_url} stable main' | tee /etc/apt/sources.list.d/clickhouse.list; apt update -y; apt-get install -y clickhouse-common-static clickhouse-client"
-        cmd = f'docker run --rm ubuntu:latest bash -c "apt update -y; apt install -y sudo gnupg ca-certificates; apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 8919F6BD2B48D754; {debian_command_2}"'
-        print("Running test command:")
-        print(f"  {cmd}")
-        assert Shell.check(cmd)
-        self.release_info.debian = debian_command
+        Shell.run(cmd, check=True)
+        self.release_info.debian_command = debian_command
         self.release_info.dump()
 
 
@@ -209,40 +204,34 @@ class RpmArtifactory:
         for package in paths:
             _copy_if_not_exists(Path(package), dest_dir)
 
-        # switching between different fuse providers invalidates --update option (apparently some fuse(s) can mess around with mtime)
-        #   add --skip-stat to skip mtime check
         commands = (
-            f"createrepo_c --local-sqlite --workers=2 --update --skip-stat --verbose {dest_dir}",
+            f"createrepo_c --local-sqlite --workers=2 --update --verbose {dest_dir}",
             f"gpg --sign-with {self._SIGN_KEY} --detach-sign --batch --yes --armor {dest_dir / 'repodata' / 'repomd.xml'}",
         )
         print(f"Exporting RPM packages into [{codename}]")
 
         for command in commands:
-            Shell.check(command, strict=True, verbose=True)
+            print("Running command:")
+            print(f"    {command}")
+            Shell.run(command, check=True)
 
         update_public_key = f"gpg --armor --export {self._SIGN_KEY}"
         pub_key_path = dest_dir / "repodata" / "repomd.xml.key"
         print("Updating repomd.xml.key")
-        pub_key_path.write_text(Shell.get_output_or_raise(update_public_key))
+        pub_key_path.write_text(Shell.run(update_public_key, check=True))
         if codename == RepoCodenames.LTS:
             self.export_packages(RepoCodenames.STABLE)
-        Shell.check("sync")
+        Shell.run("sync")
 
     def test_packages(self):
-        Shell.check("docker pull fedora:latest", strict=True)
+        Shell.run("docker pull fedora:latest")
         print(f"Test package installation, version [{self.version}]")
         rpm_command = f"dnf config-manager --add-repo={self.repo_url} && dnf makecache && dnf -y install clickhouse-client-{self.version}-1"
         cmd = f'docker run --rm fedora:latest /bin/bash -c "dnf -y install dnf-plugins-core && dnf config-manager --add-repo={self.repo_url} && {rpm_command}"'
         print("Running test command:")
         print(f"  {cmd}")
-        assert Shell.check(cmd)
-        print(f"Test package installation, version [latest]")
-        rpm_command_2 = f"dnf config-manager --add-repo={self.repo_url} && dnf makecache && dnf -y install clickhouse-client"
-        cmd = f'docker run --rm fedora:latest /bin/bash -c "dnf -y install dnf-plugins-core && dnf config-manager --add-repo={self.repo_url} && {rpm_command_2}"'
-        print("Running test command:")
-        print(f"  {cmd}")
-        assert Shell.check(cmd)
-        self.release_info.rpm = rpm_command
+        Shell.run(cmd, check=True)
+        self.release_info.rpm_command = rpm_command
         self.release_info.dump()
 
 
@@ -282,31 +271,27 @@ class TgzArtifactory:
 
         if codename == RepoCodenames.LTS:
             self.export_packages(RepoCodenames.STABLE)
-        Shell.check("sync")
+        Shell.run("sync")
 
     def test_packages(self):
         tgz_file = "/tmp/tmp.tgz"
         tgz_sha_file = "/tmp/tmp.tgz.sha512"
         cmd = f"curl -o {tgz_file} -f0 {self.repo_url}/stable/clickhouse-client-{self.version}-arm64.tgz"
-        Shell.check(
+        Shell.run(
             cmd,
-            strict=True,
-            verbose=True,
+            check=True,
         )
-        Shell.check(
+        Shell.run(
             f"curl -o {tgz_sha_file} -f0 {self.repo_url}/stable/clickhouse-client-{self.version}-arm64.tgz.sha512",
-            strict=True,
-            verbose=True,
-        )
-        expected_checksum = Shell.get_output_or_raise(f"cut -d ' ' -f 1 {tgz_sha_file}")
-        actual_checksum = Shell.get_output_or_raise(
-            f"sha512sum {tgz_file} | cut -d ' ' -f 1"
+            check=True,
         )
+        expected_checksum = Shell.run(f"cut -d ' ' -f 1 {tgz_sha_file}", check=True)
+        actual_checksum = Shell.run(f"sha512sum {tgz_file} | cut -d ' ' -f 1")
         assert (
             expected_checksum == actual_checksum
         ), f"[{actual_checksum} != {expected_checksum}]"
-        Shell.check("rm /tmp/tmp.tgz*", verbose=True)
-        self.release_info.tgz = cmd
+        Shell.run("rm /tmp/tmp.tgz*")
+        self.release_info.tgz_command = cmd
         self.release_info.dump()
 
 
@@ -357,11 +342,11 @@ if __name__ == "__main__":
     args = parse_args()
 
     """
-    S3FS - very slow with a big repo
-    RCLONE - fuse had many different errors with r2 remote and completely removed
-    GEESEFS ? 
+    Use S3FS. RCLONE has some errors with r2 remote which I didn't figure out how to resolve:
+           ERROR : IO error: NotImplemented: versionId not implemented
+           Failed to copy: NotImplemented: versionId not implemented
     """
-    mp = R2MountPoint(MountPointApp.GEESEFS, dry_run=args.dry_run)
+    mp = R2MountPoint(MountPointApp.S3FS, dry_run=args.dry_run)
     if args.export_debian:
         with ReleaseContextManager(
             release_progress=ReleaseProgress.EXPORT_DEB
diff --git a/tests/ci/auto_release.py b/tests/ci/auto_release.py
index 89714b2fb4b..f2386fe207f 100644
--- a/tests/ci/auto_release.py
+++ b/tests/ci/auto_release.py
@@ -46,7 +46,6 @@ def parse_args():
 
 MAX_NUMBER_OF_COMMITS_TO_CONSIDER_FOR_RELEASE = 5
 AUTORELEASE_INFO_FILE = "/tmp/autorelease_info.json"
-AUTORELEASE_MATRIX_PARAMS = "/tmp/autorelease_params.json"
 
 
 @dataclasses.dataclass
@@ -75,14 +74,6 @@ class AutoReleaseInfo:
         with open(AUTORELEASE_INFO_FILE, "w", encoding="utf-8") as f:
             print(json.dumps(dataclasses.asdict(self), indent=2), file=f)
 
-        # dump file for GH action matrix that is similar to the file above but with dropped not ready release branches
-        params = dataclasses.asdict(self)
-        params["releases"] = [
-            release for release in params["releases"] if release["ready"]
-        ]
-        with open(AUTORELEASE_MATRIX_PARAMS, "w", encoding="utf-8") as f:
-            print(json.dumps(params, indent=2), file=f)
-
     @staticmethod
     def from_file() -> "AutoReleaseInfo":
         with open(AUTORELEASE_INFO_FILE, "r", encoding="utf-8") as json_file:
@@ -94,7 +85,7 @@ class AutoReleaseInfo:
 def _prepare(token):
     assert len(token) > 10
     os.environ["GH_TOKEN"] = token
-    Shell.check("gh auth status")
+    Shell.run("gh auth status", check=True)
 
     gh = GitHub(token)
     prs = gh.get_release_pulls(GITHUB_REPOSITORY)
@@ -111,17 +102,15 @@ def _prepare(token):
         refs = list(repo.get_git_matching_refs(f"tags/v{pr.head.ref}"))
         assert refs
 
+        refs.sort(key=lambda ref: ref.ref)
         latest_release_tag_ref = refs[-1]
         latest_release_tag = repo.get_git_tag(latest_release_tag_ref.object.sha)
 
-        commits = Shell.get_output_or_raise(
+        commits = Shell.run(
             f"git rev-list --first-parent {latest_release_tag.tag}..origin/{pr.head.ref}",
+            check=True,
         ).split("\n")
         commit_num = len(commits)
-        if latest_release_tag.tag.endswith("new"):
-            print("It's a new release branch - skip auto release for it")
-            continue
-
         print(
             f"Previous release [{latest_release_tag.tag}] was [{commit_num}] commits ago, date [{latest_release_tag.tagger.date}]"
         )
@@ -139,39 +128,24 @@ def _prepare(token):
             )
             commit_num -= 1
 
-            is_completed = CI.GH.check_wf_completed(token=token, commit_sha=commit)
+            is_completed = CI.GHActions.check_wf_completed(
+                token=token, commit_sha=commit
+            )
             if not is_completed:
                 print(f"CI is in progress for [{commit}] - check previous commit")
                 commits_to_branch_head += 1
                 continue
 
-            # TODO: switch to check if CI is entirely green
-            statuses = [
-                CI.GH.get_commit_status_by_name(
-                    token=token,
-                    commit_sha=commit,
-                    # handle old name for old releases
-                    status_name=(CI.JobNames.BUILD_CHECK, "ClickHouse build check"),
-                ),
-                CI.GH.get_commit_status_by_name(
-                    token=token,
-                    commit_sha=commit,
-                    # handle old name for old releases
-                    status_name=CI.JobNames.STATELESS_TEST_RELEASE,
-                ),
-                CI.GH.get_commit_status_by_name(
-                    token=token,
-                    commit_sha=commit,
-                    # handle old name for old releases
-                    status_name=CI.JobNames.STATEFUL_TEST_RELEASE,
-                ),
-            ]
+            commit_ci_status = CI.GHActions.get_commit_status_by_name(
+                token=token,
+                commit_sha=commit,
+                status_name=(CI.JobNames.BUILD_CHECK, "ClickHouse build check"),
+            )
             commit_sha = commit
-            if any(status == SUCCESS for status in statuses):
-                commit_ci_status = SUCCESS
+            if commit_ci_status == SUCCESS:
                 break
 
-            print(f"CI status [{statuses}] - skip")
+            print(f"CI status [{commit_ci_status}] - skip")
             commits_to_branch_head += 1
 
         ready = False
diff --git a/tests/ci/bugfix_validate_check.py b/tests/ci/bugfix_validate_check.py
index 932d709a7b8..71b18572938 100644
--- a/tests/ci/bugfix_validate_check.py
+++ b/tests/ci/bugfix_validate_check.py
@@ -8,6 +8,7 @@ from pathlib import Path
 from typing import List, Sequence, Tuple
 
 from ci_config import CI
+from ci_utils import normalize_string
 from env_helper import TEMP_PATH
 from functional_test_check import NO_CHANGES_MSG
 from report import (
@@ -141,9 +142,7 @@ def main():
         for file in set(jr.additional_files):
             file_ = Path(file)
             file_name = file_.name
-            file_name = file_name.replace(
-                ".", "__" + CI.Utils.normalize_string(job_id) + ".", 1
-            )
+            file_name = file_name.replace(".", "__" + normalize_string(job_id) + ".", 1)
             file_ = file_.rename(file_.parent / file_name)
             additional_files.append(file_)
 
diff --git a/tests/ci/changelog.py b/tests/ci/changelog.py
index 8e7900de353..3ba618f3ae5 100755
--- a/tests/ci/changelog.py
+++ b/tests/ci/changelog.py
@@ -7,7 +7,7 @@ import re
 from datetime import date, timedelta
 from pathlib import Path
 from subprocess import DEVNULL
-from typing import Any, Dict, List, Optional, TextIO, Tuple
+from typing import Any, Dict, List, Optional, TextIO
 
 import tqdm  # type: ignore
 from github.GithubException import RateLimitExceededException, UnknownObjectException
@@ -19,7 +19,6 @@ from env_helper import TEMP_PATH
 from git_helper import git_runner, is_shallow
 from github_helper import GitHub, PullRequest, PullRequests, Repository
 from s3_helper import S3Helper
-from ci_utils import Shell
 from version_helper import (
     FILE_WITH_VERSION_PATH,
     get_abs_path,
@@ -37,7 +36,7 @@ categories_preferred_order = (
     "Experimental Feature",
     "Performance Improvement",
     "Improvement",
-    # "Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)",
+    "Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)",
     "Bug Fix (user-visible misbehavior in an official stable release)",
     "Build/Testing/Packaging Improvement",
     "Other",
@@ -114,6 +113,7 @@ def get_descriptions(prs: PullRequests) -> Dict[str, List[Description]]:
         # pylint: enable=protected-access
         if repo_name not in repos:
             repos[repo_name] = pr.base.repo
+        in_changelog = False
         merge_commit = pr.merge_commit_sha
         if merge_commit is None:
             logging.warning("PR %s does not have merge-commit, skipping", pr.number)
@@ -288,11 +288,10 @@ def generate_description(item: PullRequest, repo: Repository) -> Optional[Descri
     # Normalize bug fixes
     if (
         re.match(
-            r"(?i).*bug\Wfix",
+            r"(?i)bug\Wfix",
             category,
         )
-        # Map "Critical Bug Fix" to "Bug fix" category for changelog
-        # and "Critical Bug Fix" not in category
+        and "Critical Bug Fix" not in category
     ):
         category = "Bug Fix (user-visible misbehavior in an official stable release)"
 
@@ -398,21 +397,6 @@ def get_year(prs: PullRequests) -> int:
     return max(pr.created_at.year for pr in prs)
 
 
-def get_branch_and_patch_by_tag(tag: str) -> Tuple[Optional[str], Optional[int]]:
-    tag = tag.removeprefix("v")
-    versions = tag.split(".")
-    if len(versions) < 4:
-        print("ERROR: Can't get branch by tag")
-        return None, None
-    try:
-        patch_version = int(versions[2])
-        branch = f"{int(versions[0])}.{int(versions[1])}"
-        print(f"Branch [{branch}], patch version [{patch_version}]")
-    except ValueError:
-        return None, None
-    return branch, patch_version
-
-
 def main():
     log_levels = [logging.WARN, logging.INFO, logging.DEBUG]
     args = parse_args()
@@ -462,22 +446,6 @@ def main():
     gh_cache = GitHubCache(gh.cache_path, temp_path, S3Helper())
     gh_cache.download()
     query = f"type:pr repo:{args.repo} is:merged"
-
-    branch, patch = get_branch_and_patch_by_tag(TO_REF)
-    if branch and patch and Shell.check(f"git show-ref --quiet {branch}"):
-        if patch > 1:
-            query += f" base:{branch}"
-            print(
-                f"NOTE: It's a patch [{patch}]. will use base branch to filter PRs [{branch}]"
-            )
-        else:
-            print(
-                f"NOTE: It's a first patch version. should count PRs merged on master - won't filter PRs by branch"
-            )
-    else:
-        print(f"ERROR: invalid branch {branch} - pass")
-
-    print(f"Fetch PRs with query {query}")
     prs = gh.get_pulls_from_search(
         query=query, merged=merged, sort="created", progress_func=tqdm.tqdm
     )
diff --git a/tests/ci/cherry_pick.py b/tests/ci/cherry_pick.py
index 03669218d29..a7fc6d02853 100644
--- a/tests/ci/cherry_pick.py
+++ b/tests/ci/cherry_pick.py
@@ -417,13 +417,10 @@ class Backport:
                 f"v{branch}-must-backport" for branch in self.release_branches
             ]
         else:
+            fetch_release_prs = self.gh.get_release_pulls(self._fetch_from)
+            fetch_release_branches = [pr.head.ref for pr in fetch_release_prs]
             self.labels_to_backport = [
-                (
-                    f"v{branch}-must-backport"
-                    if self._repo_name == "ClickHouse/ClickHouse"
-                    else f"v{branch.replace('release/','')}-must-backport"
-                )
-                for branch in self.release_branches
+                f"v{branch}-must-backport" for branch in fetch_release_branches
             ]
 
             logging.info("Fetching from %s", self._fetch_from)
@@ -493,23 +490,17 @@ class Backport:
     def process_pr(self, pr: PullRequest) -> None:
         pr_labels = [label.name for label in pr.labels]
 
-        if any(label in pr_labels for label in self.must_create_backport_labels):
+        if (
+            any(label in pr_labels for label in self.must_create_backport_labels)
+            or self._repo_name != self._fetch_from
+        ):
             branches = [
                 ReleaseBranch(br, pr, self.repo, self.backport_created_label)
                 for br in self.release_branches
             ]  # type: List[ReleaseBranch]
         else:
             branches = [
-                ReleaseBranch(
-                    (
-                        br
-                        if self._repo_name == "ClickHouse/ClickHouse"
-                        else f"release/{br}"
-                    ),
-                    pr,
-                    self.repo,
-                    self.backport_created_label,
-                )
+                ReleaseBranch(br, pr, self.repo, self.backport_created_label)
                 for br in [
                     label.split("-", 1)[0][1:]  # v21.8-must-backport
                     for label in pr_labels
diff --git a/tests/ci/ci.py b/tests/ci/ci.py
index 3321d641c27..375ff237b23 100644
--- a/tests/ci/ci.py
+++ b/tests/ci/ci.py
@@ -16,7 +16,7 @@ import upload_result_helper
 from build_check import get_release_or_pr
 from ci_config import CI
 from ci_metadata import CiMetadata
-from ci_utils import GH, Utils, Envs
+from ci_utils import GHActions, normalize_string, Utils
 from clickhouse_helper import (
     CiLogsCredentials,
     ClickHouseHelper,
@@ -50,6 +50,7 @@ from github_helper import GitHub
 from pr_info import PRInfo
 from report import (
     ERROR,
+    FAILURE,
     PENDING,
     SUCCESS,
     BuildResult,
@@ -61,11 +62,11 @@ from report import (
     FAIL,
 )
 from s3_helper import S3Helper
+from stopwatch import Stopwatch
 from tee_popen import TeePopen
 from ci_cache import CiCache
 from ci_settings import CiSettings
 from ci_buddy import CIBuddy
-from stopwatch import Stopwatch
 from version_helper import get_version_from_repo
 
 # pylint: disable=too-many-lines
@@ -94,12 +95,6 @@ def parse_args(parser: argparse.ArgumentParser) -> argparse.Namespace:
         action="store_true",
         help="Action that configures ci run. Calculates digests, checks job to be executed, generates json output",
     )
-    parser.add_argument(
-        "--workflow",
-        default="",
-        type=str,
-        help="Workflow Name, to be provided with --configure for workflow-specific CI runs",
-    )
     parser.add_argument(
         "--update-gh-statuses",
         action="store_true",
@@ -292,10 +287,7 @@ def _pre_action(s3, job_name, batch, indata, pr_info):
     # for release/master branches reports must be from the same branch
     report_prefix = ""
     if pr_info.is_master or pr_info.is_release:
-        # do not set report prefix for scheduled or dispatched wf (in case it started from feature branch while
-        #   testing), otherwise reports won't be found
-        if not (pr_info.is_scheduled or pr_info.is_dispatched):
-            report_prefix = Utils.normalize_string(pr_info.head_ref)
+        report_prefix = normalize_string(pr_info.head_ref)
     print(
         f"Use report prefix [{report_prefix}], pr_num [{pr_info.number}], head_ref [{pr_info.head_ref}]"
     )
@@ -334,9 +326,7 @@ def _pre_action(s3, job_name, batch, indata, pr_info):
         ):  # we might want to rerun build report job
             rerun_helper = RerunHelper(commit, _get_ext_check_name(job_name))
             if rerun_helper.is_already_finished_by_status():
-                print(
-                    f"WARNING: Rerunning job with GH status, rerun triggered by {Envs.GITHUB_ACTOR}"
-                )
+                print("WARNING: Rerunning job with GH status ")
                 status = rerun_helper.get_finished_status()
                 assert status
                 print("::group::Commit Status")
@@ -346,7 +336,7 @@ def _pre_action(s3, job_name, batch, indata, pr_info):
                 skip_status = status.state
 
         # ci cache check
-        if not to_be_skipped and not no_cache and not Utils.is_job_triggered_manually():
+        if not to_be_skipped and not no_cache:
             ci_cache = CiCache(s3, indata["jobs_data"]["digests"]).update()
             job_config = CI.get_job_config(job_name)
             if ci_cache.is_successful(
@@ -369,10 +359,10 @@ def _pre_action(s3, job_name, batch, indata, pr_info):
                 )
                 to_be_skipped = True
                 # skip_status = SUCCESS already there
-                GH.print_in_group("Commit Status Data", job_status)
+                GHActions.print_in_group("Commit Status Data", job_status)
 
-    # create dummy report
-    jr = JobReport.create_dummy(status=skip_status, job_skipped=to_be_skipped)
+    # create pre report
+    jr = JobReport.create_pre_report(status=skip_status, job_skipped=to_be_skipped)
     jr.dump()
 
     if not to_be_skipped:
@@ -530,7 +520,6 @@ def _configure_jobs(
     pr_info: PRInfo,
     ci_settings: CiSettings,
     skip_jobs: bool,
-    workflow_name: str = "",
     dry_run: bool = False,
 ) -> CiCache:
     """
@@ -548,27 +537,18 @@ def _configure_jobs(
             is_docs_only=pr_info.has_changes_in_documentation_only(),
             is_master=pr_info.is_master,
             is_pr=pr_info.is_pr,
-            workflow_name=workflow_name,
         )
     else:
         job_configs = {}
 
-    if not workflow_name:
-        # filter jobs in accordance with ci settings
-        job_configs = ci_settings.apply(
-            job_configs,
-            pr_info.is_release,
-            is_pr=pr_info.is_pr,
-            is_mq=pr_info.is_merge_queue,
-            labels=pr_info.labels,
-        )
-
-    # add all job batches to job's to_do batches
-    for _job, job_config in job_configs.items():
-        batches = []
-        for batch in range(job_config.num_batches):
-            batches.append(batch)
-        job_config.batches = batches
+    # filter jobs in accordance with ci settings
+    job_configs = ci_settings.apply(
+        job_configs,
+        pr_info.is_release,
+        is_pr=pr_info.is_pr,
+        is_mq=pr_info.is_merge_queue,
+        labels=pr_info.labels,
+    )
 
     # check jobs in ci cache
     ci_cache = CiCache.calc_digests_and_create(
@@ -719,7 +699,7 @@ def _upload_build_artifacts(
         (
             get_release_or_pr(pr_info, get_version_from_repo())[1],
             pr_info.sha,
-            Utils.normalize_string(build_name),
+            normalize_string(build_name),
             "performance.tar.zst",
         )
     )
@@ -986,26 +966,23 @@ def _run_test(job_name: str, run_command: str) -> int:
     else:
         print("Use run command from the workflow")
     env["CHECK_NAME"] = job_name
-    env["MAX_RUN_TIME"] = str(timeout or 0)
     print(f"Going to start run command [{run_command}]")
     stopwatch = Stopwatch()
     job_log = Path(TEMP_PATH) / "job_log.txt"
     with TeePopen(run_command, job_log, env, timeout) as process:
-        print(f"Job process started, pid [{process.process.pid}]")
         retcode = process.wait()
         if retcode != 0:
             print(f"Run action failed for: [{job_name}] with exit code [{retcode}]")
-        if process.timeout_exceeded:
-            print(f"Job timed out: [{job_name}] exit code [{retcode}]")
-            assert JobReport.exist(), "JobReport real or dummy must be present"
-            jr = JobReport.load()
-            if jr.dummy:
-                print(
-                    f"ERROR: Run action failed with timeout and did not generate JobReport - update dummy report with execution time"
-                )
-                jr.test_results = [TestResult.create_check_timeout_expired()]
-                jr.duration = stopwatch.duration_seconds
-                jr.additional_files += [job_log]
+            if timeout and process.timeout_exceeded:
+                print(f"Timeout {timeout} exceeded, dumping the job report")
+                JobReport(
+                    status=FAILURE,
+                    description=f"Timeout {timeout} exceeded",
+                    test_results=[TestResult.create_check_timeout_expired(timeout)],
+                    start_time=stopwatch.start_time_str,
+                    duration=stopwatch.duration_seconds,
+                    additional_files=[job_log],
+                ).dump()
 
     print(f"Run action done for: [{job_name}]")
     return retcode
@@ -1023,9 +1000,7 @@ def _get_ext_check_name(check_name: str) -> str:
     return check_name_with_group
 
 
-def _cancel_pr_workflow(
-    s3: S3Helper, pr_number: int, cancel_sync: bool = False
-) -> None:
+def _cancel_pr_wf(s3: S3Helper, pr_number: int, cancel_sync: bool = False) -> None:
     wf_data = CiMetadata(s3, pr_number).fetch_meta()
     if not cancel_sync:
         if not wf_data.run_id:
@@ -1129,7 +1104,6 @@ def main() -> int:
             pr_info,
             ci_settings,
             args.skip_jobs,
-            args.workflow,
         )
 
         ci_cache.print_status()
@@ -1139,7 +1113,7 @@ def main() -> int:
 
         if IS_CI and not pr_info.is_merge_queue:
 
-            if pr_info.is_release and pr_info.is_push_event:
+            if pr_info.is_release:
                 print("Release/master: CI Cache add pending records for all todo jobs")
                 ci_cache.push_pending_all(pr_info.is_release)
 
@@ -1208,7 +1182,7 @@ def main() -> int:
             job_report
         ), "BUG. There must be job report either real report, or pre-report if job was killed"
         error_description = ""
-        if not job_report.dummy:
+        if not job_report.pre_report:
             # it's a real job report
             ch_helper = ClickHouseHelper()
             check_url = ""
@@ -1254,7 +1228,7 @@ def main() -> int:
                     (
                         get_release_or_pr(pr_info, get_version_from_repo())[0],
                         pr_info.sha,
-                        Utils.normalize_string(
+                        normalize_string(
                             job_report.check_name or _get_ext_check_name(args.job_name)
                         ),
                     )
@@ -1332,20 +1306,10 @@ def main() -> int:
             if CI.is_test_job(args.job_name):
                 gh = GitHub(get_best_robot_token(), per_page=100)
                 commit = get_commit(gh, pr_info.sha)
-                check_url = ""
-                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),
-                    )
                 post_commit_status(
                     commit,
                     ERROR,
-                    check_url,
+                    "",
                     "Error: " + error_description,
                     _get_ext_check_name(args.job_name),
                     pr_info,
@@ -1384,12 +1348,12 @@ def main() -> int:
         assert indata, "Run config must be provided via --infile"
         _update_gh_statuses_action(indata=indata, s3=s3)
 
-    ### CANCEL THE PREVIOUS WORKFLOW RUN
+    ### CANCEL PREVIOUS WORKFLOW RUN
     elif args.cancel_previous_run:
         if pr_info.is_merge_queue:
-            _cancel_pr_workflow(s3, pr_info.merged_pr)
+            _cancel_pr_wf(s3, pr_info.merged_pr)
         elif pr_info.is_pr:
-            _cancel_pr_workflow(s3, pr_info.number, cancel_sync=True)
+            _cancel_pr_wf(s3, pr_info.number, cancel_sync=True)
         else:
             assert False, "BUG! Not supported scenario"
 
diff --git a/tests/ci/ci_buddy.py b/tests/ci/ci_buddy.py
index 07f318207a4..dfb5885270a 100644
--- a/tests/ci/ci_buddy.py
+++ b/tests/ci/ci_buddy.py
@@ -1,52 +1,28 @@
 import argparse
 import json
 import os
-from typing import Union, Dict, List
+from typing import Union, Dict
 
 import boto3
 import requests
 from botocore.exceptions import ClientError
 
 from pr_info import PRInfo
-from ci_config import CI
-from ci_utils import WithIter
-
-
-class Channels(metaclass=WithIter):
-    # Channel names must match json keys in ParameterStore
-    ALERTS = "alerts-channel"
-    INFO = "info-channel"
-    DRY_RUN = "dry-ryn-channel"
-    DEFAULT = "default"
+from ci_utils import Shell, GHActions
 
 
 class CIBuddy:
-    Channels = Channels
     _HEADERS = {"Content-Type": "application/json"}
 
     def __init__(self, dry_run=False):
         self.repo = os.getenv("GITHUB_REPOSITORY", "")
         self.dry_run = dry_run
         res = self._get_webhooks()
-        self.channels = {}
+        self.test_channel = ""
+        self.dev_ci_channel = ""
         if res:
-            channels = json.loads(res)
-            for channel in Channels:
-                if channel in channels:
-                    self.channels[channel] = channels[channel]
-
-            for channel in Channels:
-                if channel not in self.channels:
-                    if Channels.DEFAULT in self.channels:
-                        print(
-                            f"ERROR: missing config for channel [{channel}] - will use default channel instead"
-                        )
-                        self.channels[channel] = self.channels[Channels.DEFAULT]
-                    else:
-                        print(
-                            f"ERROR: missing config for channel [{channel}] - will disable notification"
-                        )
-                        self.channels[channel] = ""
+            self.test_channel = json.loads(res)["test_channel"]
+            self.dev_ci_channel = json.loads(res)["ci_channel"]
         self.job_name = os.getenv("CHECK_NAME", "unknown")
         pr_info = PRInfo()
         self.pr_number = pr_info.number
@@ -55,19 +31,10 @@ class CIBuddy:
         self.sha = pr_info.sha[:10]
 
     def check_workflow(self):
-        CI.GH.print_workflow_results()
-        if CI.Envs.GITHUB_WORKFLOW == CI.WorkFlowNames.CreateRelease:
-            if not CI.GH.is_workflow_ok():
-                self.post_job_error(
-                    f"{CI.Envs.GITHUB_WORKFLOW} Workflow Failed", critical=True
-                )
-        else:
-            res = CI.GH.get_workflow_job_result(CI.GH.ActionsNames.RunConfig)
-            if res != CI.GH.ActionStatuses.SUCCESS:
-                print(f"ERROR: RunConfig status is [{res}] - post report to slack")
-                self.post_job_error(
-                    f"{CI.Envs.GITHUB_WORKFLOW} Workflow Failed", critical=True
-                )
+        GHActions.print_workflow_results()
+        res = GHActions.get_workflow_job_result(GHActions.ActionsNames.RunConfig)
+        if res != GHActions.ActionStatuses.SUCCESS:
+            self.post_job_error("Workflow Configuration Failed", critical=True)
 
     @staticmethod
     def _get_webhooks():
@@ -87,93 +54,61 @@ class CIBuddy:
 
         return json_string
 
-    def post(self, message: str, channels: List[str]) -> None:
-        print(f"Posting slack message, dry_run [{self.dry_run}]")
-        if self.dry_run:
-            urls = [self.channels[Channels.DRY_RUN]]
+    def post(self, message, dry_run=None):
+        if dry_run is None:
+            dry_run = self.dry_run
+        print(f"Posting slack message, dry_run [{dry_run}]")
+        if dry_run:
+            url = self.test_channel
         else:
-            urls = []
-            for channel in channels:
-                url = self.channels[channel]
-                if url:
-                    urls.append(url)
-                else:
-                    print(f"WARNING: no channel config for [{channel}] - skip")
+            url = self.dev_ci_channel
         data = {"text": message}
         try:
-            for url in urls:
-                requests.post(
-                    url, headers=self._HEADERS, data=json.dumps(data), timeout=10
-                )
+            requests.post(url, headers=self._HEADERS, data=json.dumps(data), timeout=10)
         except Exception as e:
             print(f"ERROR: Failed to post message, ex {e}")
 
     def _post_formatted(
-        self,
-        title: str,
-        body: Union[Dict, str],
-        with_wf_link: bool,
-        channels: Union[List[str], str],
+        self, title: str, body: Union[Dict, str], with_wf_link: bool
     ) -> None:
         message = title
         if isinstance(body, dict):
             for name, value in body.items():
-                if "sha" in name and value and len(value) == 40:
+                if "commit_sha" in name:
                     value = (
                         f"<https://github.com/{self.repo}/commit/{value}|{value[:8]}>"
                     )
-                elif isinstance(value, str) and value.startswith("https://github.com/"):
-                    value_shorten = value.split("/")[-1]
-                    value = f"<{value}|{value_shorten}>"
                 message += f"      *{name}*:    {value}\n"
         else:
             message += body + "\n"
         run_id = os.getenv("GITHUB_RUN_ID", "")
         if with_wf_link and run_id:
             message += f"      *workflow*: <https://github.com/{self.repo}/actions/runs/{run_id}|{run_id}>\n"
-        self.post(
-            message, channels=[channels] if isinstance(channels, str) else channels
-        )
+        self.post(message)
 
     def post_info(
-        self,
-        title: str,
-        body: Union[Dict, str],
-        with_wf_link: bool = True,
-        channels: Union[List[str], str] = Channels.INFO,
+        self, title: str, body: Union[Dict, str], with_wf_link: bool = True
     ) -> None:
         title_extended = f":white_circle:    *{title}*\n\n"
-        self._post_formatted(title_extended, body, with_wf_link, channels=channels)
+        self._post_formatted(title_extended, body, with_wf_link)
 
     def post_done(
-        self,
-        title: str,
-        body: Union[Dict, str],
-        with_wf_link: bool = True,
-        channels: Union[List[str], str] = Channels.INFO,
+        self, title: str, body: Union[Dict, str], with_wf_link: bool = True
     ) -> None:
         title_extended = f":white_check_mark:    *{title}*\n\n"
-        self._post_formatted(title_extended, body, with_wf_link, channels=channels)
+        self._post_formatted(title_extended, body, with_wf_link)
 
     def post_warning(
-        self,
-        title: str,
-        body: Union[Dict, str],
-        with_wf_link: bool = True,
-        channels: Union[List[str], str] = Channels.ALERTS,
+        self, title: str, body: Union[Dict, str], with_wf_link: bool = True
     ) -> None:
         title_extended = f":warning:    *{title}*\n\n"
-        self._post_formatted(title_extended, body, with_wf_link, channels=channels)
+        self._post_formatted(title_extended, body, with_wf_link)
 
     def post_critical(
-        self,
-        title: str,
-        body: Union[Dict, str],
-        with_wf_link: bool = True,
-        channels: Union[List[str], str] = Channels.ALERTS,
+        self, title: str, body: Union[Dict, str], with_wf_link: bool = True
     ) -> None:
         title_extended = f":black_circle:    *{title}*\n\n"
-        self._post_formatted(title_extended, body, with_wf_link, channels=channels)
+        self._post_formatted(title_extended, body, with_wf_link)
 
     def post_job_error(
         self,
@@ -182,16 +117,11 @@ class CIBuddy:
         with_instance_info: bool = True,
         with_wf_link: bool = True,
         critical: bool = False,
-        channel: Union[List[str], str] = Channels.ALERTS,
     ) -> None:
         instance_id, instance_type = "unknown", "unknown"
         if with_instance_info:
-            instance_id = (
-                CI.Shell.get_output("ec2metadata --instance-id") or instance_id
-            )
-            instance_type = (
-                CI.Shell.get_output("ec2metadata --instance-type") or instance_type
-            )
+            instance_id = Shell.run("ec2metadata --instance-id") or instance_id
+            instance_type = Shell.run("ec2metadata --instance-type") or instance_type
         if not job_name:
             job_name = os.getenv("CHECK_NAME", "unknown")
         sign = ":red_circle:" if not critical else ":black_circle:"
@@ -213,7 +143,7 @@ class CIBuddy:
         run_id = os.getenv("GITHUB_RUN_ID", "")
         if with_wf_link and run_id:
             message += f"      *workflow*: <https://github.com/{self.repo}/actions/runs/{run_id}|{run_id}>\n"
-        self.post(message, channels=[channel] if isinstance(channel, str) else channel)
+        self.post(message)
 
 
 def parse_args():
diff --git a/tests/ci/ci_cache.py b/tests/ci/ci_cache.py
index 9eeda7161ee..85eabb84f9f 100644
--- a/tests/ci/ci_cache.py
+++ b/tests/ci/ci_cache.py
@@ -7,7 +7,7 @@ from typing import Dict, Optional, Any, Union, Sequence, List, Set
 
 from ci_config import CI
 
-from ci_utils import Utils, GH
+from ci_utils import is_hex, GHActions
 from commit_status_helper import CommitStatusData
 from env_helper import (
     TEMP_PATH,
@@ -240,7 +240,7 @@ class CiCache:
             int(job_properties[-1]),
         )
 
-        if not Utils.is_hex(job_digest):
+        if not is_hex(job_digest):
             print("ERROR: wrong record job digest")
             return None
 
@@ -258,15 +258,15 @@ class CiCache:
     def print_status(self):
         print(f"Cache enabled: [{self.enabled}]")
         for record_type in self.RecordType:
-            GH.print_in_group(
+            GHActions.print_in_group(
                 f"Cache records: [{record_type}]", list(self.records[record_type])
             )
-        GH.print_in_group(
+        GHActions.print_in_group(
             "Jobs to do:",
             list(self.jobs_to_do.items()),
         )
-        GH.print_in_group("Jobs to skip:", self.jobs_to_skip)
-        GH.print_in_group(
+        GHActions.print_in_group("Jobs to skip:", self.jobs_to_skip)
+        GHActions.print_in_group(
             "Jobs to wait:",
             list(self.jobs_to_wait.items()),
         )
@@ -731,8 +731,7 @@ class CiCache:
                     job_config=reference_config,
                 ):
                     remove_from_workflow.append(job_name)
-                    if job_name != CI.JobNames.DOCS_CHECK:
-                        has_test_jobs_to_skip = True
+                    has_test_jobs_to_skip = True
                 else:
                     required_builds += (
                         job_config.required_builds if job_config.required_builds else []
@@ -789,7 +788,7 @@ class CiCache:
 
         while round_cnt < MAX_ROUNDS_TO_WAIT:
             round_cnt += 1
-            GH.print_in_group(
+            GHActions.print_in_group(
                 f"Wait pending jobs, round [{round_cnt}/{MAX_ROUNDS_TO_WAIT}]:",
                 list(self.jobs_to_wait),
             )
@@ -854,7 +853,7 @@ class CiCache:
                     # make up for 2 iterations in dry_run
                     expired_sec += int(TIMEOUT / 2) + 1
 
-        GH.print_in_group(
+        GHActions.print_in_group(
             "Remaining jobs:",
             [list(self.jobs_to_wait)],
         )
diff --git a/tests/ci/ci_config.py b/tests/ci/ci_config.py
index 3587405d95f..dfd7730f113 100644
--- a/tests/ci/ci_config.py
+++ b/tests/ci/ci_config.py
@@ -3,7 +3,7 @@ import re
 from argparse import ArgumentDefaultsHelpFormatter, ArgumentParser
 from typing import Dict, Optional, List
 
-from ci_utils import Utils
+from ci_utils import normalize_string
 from ci_definitions import *
 
 
@@ -13,6 +13,7 @@ class CI:
     each config item in the below dicts should be an instance of JobConfig class or inherited from it
     """
 
+    MAX_TOTAL_FAILURES_BEFORE_BLOCKING_CI = 5
     MAX_TOTAL_FAILURES_PER_JOB_BEFORE_BLOCKING_CI = 2
 
     # reimport types to CI class so that they visible as CI.* and mypy is happy
@@ -20,10 +21,12 @@ class CI:
     from ci_definitions import BuildConfig as BuildConfig
     from ci_definitions import DigestConfig as DigestConfig
     from ci_definitions import JobConfig as JobConfig
+    from ci_definitions import CheckDescription as CheckDescription
     from ci_definitions import Tags as Tags
     from ci_definitions import JobNames as JobNames
     from ci_definitions import BuildNames as BuildNames
     from ci_definitions import StatusNames as StatusNames
+    from ci_definitions import CHECK_DESCRIPTIONS as CHECK_DESCRIPTIONS
     from ci_definitions import REQUIRED_CHECKS as REQUIRED_CHECKS
     from ci_definitions import SyncState as SyncState
     from ci_definitions import MQ_JOBS as MQ_JOBS
@@ -31,24 +34,14 @@ class CI:
     from ci_definitions import Runners as Runners
     from ci_utils import Envs as Envs
     from ci_utils import Utils as Utils
-    from ci_utils import GH as GH
-    from ci_utils import Shell as Shell
+    from ci_utils import GHActions as GHActions
     from ci_definitions import Labels as Labels
-    from ci_definitions import WorkFlowNames as WorkFlowNames
+    from ci_definitions import TRUSTED_CONTRIBUTORS as TRUSTED_CONTRIBUTORS
+    from ci_utils import CATEGORY_TO_LABEL as CATEGORY_TO_LABEL
 
     # Jobs that run for doc related updates
     _DOCS_CHECK_JOBS = [JobNames.DOCS_CHECK, JobNames.STYLE_CHECK]
 
-    WORKFLOW_CONFIGS = {
-        WorkFlowNames.JEPSEN: LabelConfig(
-            run_jobs=[
-                BuildNames.BINARY_RELEASE,
-                JobNames.JEPSEN_KEEPER,
-                JobNames.JEPSEN_SERVER,
-            ]
-        )
-    }  # type: Dict[str, LabelConfig]
-
     TAG_CONFIGS = {
         Tags.DO_NOT_TEST_LABEL: LabelConfig(run_jobs=[JobNames.STYLE_CHECK]),
         Tags.CI_SET_ARM: LabelConfig(
@@ -75,7 +68,7 @@ class CI:
                 JobNames.STATEFUL_TEST_ASAN,
             ]
         ),
-    }  # type: Dict[str, LabelConfig]
+    }
 
     JOB_CONFIGS: Dict[str, JobConfig] = {
         BuildNames.PACKAGE_RELEASE: CommonJobConfigs.BUILD.with_properties(
@@ -163,7 +156,6 @@ class CI:
                 tidy=True,
                 comment="clang-tidy is used for static analysis",
             ),
-            timeout=14400,
         ),
         BuildNames.BINARY_DARWIN: CommonJobConfigs.BUILD.with_properties(
             build_config=BuildConfig(
@@ -317,7 +309,6 @@ class CI:
         JobNames.STATEFUL_TEST_PARALLEL_REPL_TSAN: CommonJobConfigs.STATEFUL_TEST.with_properties(
             required_builds=[BuildNames.PACKAGE_TSAN],
             random_bucket="parrepl_with_sanitizer",
-            timeout=3600,
         ),
         JobNames.STATELESS_TEST_ASAN: CommonJobConfigs.STATELESS_TEST.with_properties(
             required_builds=[BuildNames.PACKAGE_ASAN], num_batches=2
@@ -345,17 +336,17 @@ class CI:
             runner_type=Runners.FUNC_TESTER_ARM,
         ),
         JobNames.STATELESS_TEST_OLD_ANALYZER_S3_REPLICATED_RELEASE: CommonJobConfigs.STATELESS_TEST.with_properties(
-            required_builds=[BuildNames.PACKAGE_RELEASE], num_batches=2
+            required_builds=[BuildNames.PACKAGE_RELEASE], num_batches=4
         ),
         JobNames.STATELESS_TEST_S3_DEBUG: CommonJobConfigs.STATELESS_TEST.with_properties(
-            required_builds=[BuildNames.PACKAGE_DEBUG], num_batches=1
+            required_builds=[BuildNames.PACKAGE_DEBUG], num_batches=2
         ),
         JobNames.STATELESS_TEST_AZURE_ASAN: CommonJobConfigs.STATELESS_TEST.with_properties(
             required_builds=[BuildNames.PACKAGE_ASAN], num_batches=3, release_only=True
         ),
         JobNames.STATELESS_TEST_S3_TSAN: CommonJobConfigs.STATELESS_TEST.with_properties(
             required_builds=[BuildNames.PACKAGE_TSAN],
-            num_batches=3,
+            num_batches=4,
         ),
         JobNames.STRESS_TEST_DEBUG: CommonJobConfigs.STRESS_TEST.with_properties(
             required_builds=[BuildNames.PACKAGE_DEBUG],
@@ -400,14 +391,10 @@ class CI:
             required_builds=[BuildNames.PACKAGE_DEBUG], pr_only=True
         ),
         JobNames.INTEGRATION_TEST_ASAN: CommonJobConfigs.INTEGRATION_TEST.with_properties(
-            required_builds=[BuildNames.PACKAGE_ASAN],
-            release_only=True,
-            num_batches=4,
-            timeout=10800,
+            required_builds=[BuildNames.PACKAGE_ASAN], release_only=True, num_batches=4
         ),
         JobNames.INTEGRATION_TEST_ASAN_OLD_ANALYZER: CommonJobConfigs.INTEGRATION_TEST.with_properties(
-            required_builds=[BuildNames.PACKAGE_ASAN],
-            num_batches=6,
+            required_builds=[BuildNames.PACKAGE_ASAN], num_batches=6
         ),
         JobNames.INTEGRATION_TEST_TSAN: CommonJobConfigs.INTEGRATION_TEST.with_properties(
             required_builds=[BuildNames.PACKAGE_TSAN],
@@ -429,7 +416,6 @@ class CI:
             pr_only=True,
             # TODO: approach with reference job names does not work because digest may not be calculated if job skipped in wf
             # reference_job_name=JobNames.INTEGRATION_TEST_TSAN,
-            timeout=4 * 3600,  # to be able to process many updated tests
         ),
         JobNames.COMPATIBILITY_TEST: CommonJobConfigs.COMPATIBILITY_TEST.with_properties(
             required_builds=[BuildNames.PACKAGE_RELEASE],
@@ -473,7 +459,7 @@ class CI:
         JobNames.STATELESS_TEST_FLAKY_ASAN: CommonJobConfigs.STATELESS_TEST.with_properties(
             required_builds=[BuildNames.PACKAGE_ASAN],
             pr_only=True,
-            timeout=3 * 3600,
+            timeout=3600,
             # TODO: approach with reference job names does not work because digest may not be calculated if job skipped in wf
             # reference_job_name=JobNames.STATELESS_TEST_RELEASE,
         ),
@@ -504,10 +490,9 @@ class CI:
         JobNames.SQLANCER_DEBUG: CommonJobConfigs.SQLLANCER_TEST.with_properties(
             required_builds=[BuildNames.PACKAGE_DEBUG],
         ),
-        # TODO: job does not work at all, uncomment and fix
-        # JobNames.SQL_LOGIC_TEST: CommonJobConfigs.SQLLOGIC_TEST.with_properties(
-        #     required_builds=[BuildNames.PACKAGE_RELEASE],
-        # ),
+        JobNames.SQL_LOGIC_TEST: CommonJobConfigs.SQLLOGIC_TEST.with_properties(
+            required_builds=[BuildNames.PACKAGE_RELEASE],
+        ),
         JobNames.SQLTEST: CommonJobConfigs.SQL_TEST.with_properties(
             required_builds=[BuildNames.PACKAGE_RELEASE],
         ),
@@ -526,10 +511,10 @@ class CI:
             runner_type=Runners.STYLE_CHECKER,
         ),
         JobNames.DOCKER_SERVER: CommonJobConfigs.DOCKER_SERVER.with_properties(
-            required_builds=[BuildNames.PACKAGE_RELEASE, BuildNames.PACKAGE_AARCH64]
+            required_builds=[BuildNames.PACKAGE_RELEASE]
         ),
         JobNames.DOCKER_KEEPER: CommonJobConfigs.DOCKER_SERVER.with_properties(
-            required_builds=[BuildNames.PACKAGE_RELEASE, BuildNames.PACKAGE_AARCH64]
+            required_builds=[BuildNames.PACKAGE_RELEASE]
         ),
         JobNames.DOCS_CHECK: JobConfig(
             digest=DigestConfig(
@@ -542,10 +527,7 @@ class CI:
         JobNames.FAST_TEST: JobConfig(
             pr_only=True,
             digest=DigestConfig(
-                include_paths=[
-                    "./tests/queries/0_stateless/",
-                    "./tests/docker_scripts/",
-                ],
+                include_paths=["./tests/queries/0_stateless/"],
                 exclude_files=[".md"],
                 docker=["clickhouse/fasttest"],
             ),
@@ -567,7 +549,7 @@ class CI:
     @classmethod
     def get_tag_config(cls, label_name: str) -> Optional[LabelConfig]:
         for label, config in cls.TAG_CONFIGS.items():
-            if Utils.normalize_string(label_name) == Utils.normalize_string(label):
+            if normalize_string(label_name) == normalize_string(label):
                 return config
         return None
 
@@ -597,10 +579,10 @@ class CI:
                 if job_name in REQUIRED_CHECKS:
                     stage_type = WorkflowStages.TESTS_1
                 else:
-                    stage_type = WorkflowStages.TESTS_2
+                    stage_type = WorkflowStages.TESTS_3
         assert stage_type, f"BUG [{job_name}]"
-        if non_blocking_ci and stage_type == WorkflowStages.TESTS_2:
-            stage_type = WorkflowStages.TESTS_2_WW
+        if non_blocking_ci and stage_type == WorkflowStages.TESTS_3:
+            stage_type = WorkflowStages.TESTS_2
         return stage_type
 
     @classmethod
@@ -620,25 +602,16 @@ class CI:
 
     @classmethod
     def get_workflow_jobs_with_configs(
-        cls,
-        is_mq: bool,
-        is_docs_only: bool,
-        is_master: bool,
-        is_pr: bool,
-        workflow_name: str,
+        cls, is_mq: bool, is_docs_only: bool, is_master: bool, is_pr: bool
     ) -> Dict[str, JobConfig]:
         """
         get a list of all jobs for a workflow with configs
         """
+        jobs = []
         if is_mq:
             jobs = MQ_JOBS
         elif is_docs_only:
             jobs = cls._DOCS_CHECK_JOBS
-        elif workflow_name:
-            assert (
-                workflow_name in cls.WORKFLOW_CONFIGS
-            ), "Workflow name if provided must be configured in WORKFLOW_CONFIGS"
-            jobs = list(cls.WORKFLOW_CONFIGS[workflow_name].run_jobs)
         else:
             # add all jobs
             jobs = list(cls.JOB_CONFIGS)
@@ -696,34 +669,6 @@ class CI:
         assert res, f"not a build [{build_name}] or invalid JobConfig"
         return res
 
-    @classmethod
-    def is_workflow_ok(cls) -> bool:
-        # TODO: temporary method to make Mergeable check working
-        res = cls.GH.get_workflow_results()
-        if not res:
-            print("ERROR: no workflow results found")
-            return False
-        for workflow_job, workflow_data in res.items():
-            status = workflow_data["result"]
-            if status in (
-                cls.GH.ActionStatuses.SUCCESS,
-                cls.GH.ActionStatuses.SKIPPED,
-            ):
-                print(f"Workflow status for [{workflow_job}] is [{status}] - continue")
-            elif status in (cls.GH.ActionStatuses.FAILURE,):
-                if workflow_job in (
-                    WorkflowStages.TESTS_2,
-                    WorkflowStages.TESTS_2_WW,
-                ):
-                    print(
-                        f"Failed Workflow status for [{workflow_job}], it's not required - continue"
-                    )
-                    continue
-
-                print(f"Failed Workflow status for [{workflow_job}]")
-                return False
-        return True
-
 
 if __name__ == "__main__":
     parser = ArgumentParser(
diff --git a/tests/ci/ci_definitions.py b/tests/ci/ci_definitions.py
index 34201748741..78de91bb578 100644
--- a/tests/ci/ci_definitions.py
+++ b/tests/ci/ci_definitions.py
@@ -1,7 +1,7 @@
 import copy
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import List, Union, Iterable, Optional, Literal, Any
+from typing import Callable, List, Union, Iterable, Optional, Literal, Any
 
 from ci_utils import WithIter
 from integration_test_images import IMAGES
@@ -32,6 +32,28 @@ class Labels:
     AUTO_BACKPORT = {"pr-critical-bugfix"}
 
 
+TRUSTED_CONTRIBUTORS = {
+    e.lower()
+    for e in [
+        "amosbird",
+        "azat",  # SEMRush
+        "bharatnc",  # Many contributions.
+        "cwurm",  # ClickHouse, Inc
+        "den-crane",  # Documentation contributor
+        "ildus",  # adjust, ex-pgpro
+        "nvartolomei",  # Seasoned contributor, CloudFlare
+        "taiyang-li",
+        "ucasFL",  # Amos Bird's friend
+        "thomoco",  # ClickHouse, Inc
+        "tonickkozlov",  # Cloudflare
+        "tylerhannan",  # ClickHouse, Inc
+        "tsolodov",  # ClickHouse, Inc
+        "justindeguzman",  # ClickHouse, Inc
+        "XuJia0210",  # ClickHouse, Inc
+    ]
+}
+
+
 class WorkflowStages(metaclass=WithIter):
     """
     Stages of GitHUb actions workflow
@@ -45,10 +67,10 @@ class WorkflowStages(metaclass=WithIter):
     BUILDS_2 = "Builds_2"
     # all tests required for merge
     TESTS_1 = "Tests_1"
-    # used in woolenwolfdog mode
-    TESTS_2_WW = "Tests_2_ww"
-    # all tests not required for merge
+    # not used atm
     TESTS_2 = "Tests_2"
+    # all tests not required for merge
+    TESTS_3 = "Tests_3"
 
 
 class Runners(metaclass=WithIter):
@@ -62,6 +84,7 @@ class Runners(metaclass=WithIter):
     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"
 
 
@@ -84,15 +107,6 @@ class Tags(metaclass=WithIter):
     libFuzzer = "libFuzzer"
 
 
-class WorkFlowNames(metaclass=WithIter):
-    """
-    CI WorkFlow Names for custom CI runs
-    """
-
-    JEPSEN = "JepsenWorkflow"
-    CreateRelease = "CreateRelease"
-
-
 class BuildNames(metaclass=WithIter):
     """
     Build' job names
@@ -203,7 +217,7 @@ class JobNames(metaclass=WithIter):
     PERFORMANCE_TEST_AMD64 = "Performance Comparison (release)"
     PERFORMANCE_TEST_ARM64 = "Performance Comparison (aarch64)"
 
-    # SQL_LOGIC_TEST = "Sqllogic test (release)"
+    SQL_LOGIC_TEST = "Sqllogic test (release)"
 
     SQLANCER = "SQLancer (release)"
     SQLANCER_DEBUG = "SQLancer (debug)"
@@ -331,7 +345,7 @@ class JobConfig:
     # will be triggered for the job if omitted in CI workflow yml
     run_command: str = ""
     # job timeout, seconds
-    timeout: int = 7200
+    timeout: Optional[int] = None
     # sets number of batches for a multi-batch job
     num_batches: int = 1
     # label that enables job in CI, if set digest isn't used
@@ -414,13 +428,13 @@ class CommonJobConfigs:
                 "./tests/clickhouse-test",
                 "./tests/config",
                 "./tests/*.txt",
-                "./tests/docker_scripts/",
             ],
             exclude_files=[".md"],
             docker=["clickhouse/stateless-test"],
         ),
         run_command='functional_test_check.py "$CHECK_NAME"',
         runner_type=Runners.FUNC_TESTER,
+        timeout=9000,
     )
     STATEFUL_TEST = JobConfig(
         job_name_keyword="stateful",
@@ -431,7 +445,6 @@ class CommonJobConfigs:
                 "./tests/clickhouse-test",
                 "./tests/config",
                 "./tests/*.txt",
-                "./tests/docker_scripts/",
             ],
             exclude_files=[".md"],
             docker=["clickhouse/stateful-test"],
@@ -449,25 +462,23 @@ class CommonJobConfigs:
                 "./tests/clickhouse-test",
                 "./tests/config",
                 "./tests/*.txt",
-                "./tests/docker_scripts/",
             ],
             exclude_files=[".md"],
             docker=["clickhouse/stress-test"],
         ),
         run_command="stress_check.py",
-        runner_type=Runners.FUNC_TESTER,
+        runner_type=Runners.STRESS_TESTER,
         timeout=9000,
     )
     UPGRADE_TEST = JobConfig(
         job_name_keyword="upgrade",
         digest=DigestConfig(
-            include_paths=["./tests/ci/upgrade_check.py", "./tests/docker_scripts/"],
+            include_paths=["./tests/ci/upgrade_check.py"],
             exclude_files=[".md"],
-            docker=["clickhouse/stress-test"],
+            docker=["clickhouse/upgrade-check"],
         ),
         run_command="upgrade_check.py",
-        runner_type=Runners.FUNC_TESTER,
-        timeout=3600,
+        runner_type=Runners.STRESS_TESTER,
     )
     INTEGRATION_TEST = JobConfig(
         job_name_keyword="integration",
@@ -481,7 +492,7 @@ class CommonJobConfigs:
             docker=IMAGES.copy(),
         ),
         run_command='integration_test_check.py "$CHECK_NAME"',
-        runner_type=Runners.FUNC_TESTER,
+        runner_type=Runners.STRESS_TESTER,
     )
     ASTFUZZER_TEST = JobConfig(
         job_name_keyword="ast",
@@ -516,7 +527,7 @@ class CommonJobConfigs:
             docker=["clickhouse/performance-comparison"],
         ),
         run_command="performance_comparison_check.py",
-        runner_type=Runners.FUNC_TESTER,
+        runner_type=Runners.STRESS_TESTER,
     )
     SQLLANCER_TEST = JobConfig(
         job_name_keyword="lancer",
@@ -536,7 +547,7 @@ class CommonJobConfigs:
         run_command="sqllogic_test.py",
         timeout=10800,
         release_only=True,
-        runner_type=Runners.FUNC_TESTER,
+        runner_type=Runners.STYLE_CHECKER,
     )
     SQL_TEST = JobConfig(
         job_name_keyword="sqltest",
@@ -560,11 +571,10 @@ class CommonJobConfigs:
     DOCKER_SERVER = JobConfig(
         job_name_keyword="docker",
         required_on_release_branch=True,
-        run_command='docker_server.py --check-name "$CHECK_NAME" --tag-type head --allow-build-reuse',
+        run_command='docker_server.py --check-name "$CHECK_NAME" --release-type head --allow-build-reuse',
         digest=DigestConfig(
             include_paths=[
                 "tests/ci/docker_server.py",
-                "tests/ci/docker_images_helper.py",
                 "./docker/server",
             ]
         ),
@@ -649,3 +659,188 @@ MQ_JOBS = [
     BuildNames.BINARY_RELEASE,
     JobNames.UNIT_TEST,
 ]
+
+
+@dataclass
+class CheckDescription:
+    name: str
+    description: str  # the check descriptions, will be put into the status table
+    match_func: Callable[[str], bool]  # the function to check vs the commit status
+
+    def __hash__(self) -> int:
+        return hash(self.name + self.description)
+
+
+CHECK_DESCRIPTIONS = [
+    CheckDescription(
+        StatusNames.PR_CHECK,
+        "Checks correctness of the PR's body",
+        lambda x: x == "PR Check",
+    ),
+    CheckDescription(
+        StatusNames.SYNC,
+        "If it fails, ask a maintainer for help",
+        lambda x: x == StatusNames.SYNC,
+    ),
+    CheckDescription(
+        "AST fuzzer",
+        "Runs randomly generated queries to catch program errors. "
+        "The build type is optionally given in parenthesis. "
+        "If it fails, ask a maintainer for help",
+        lambda x: x.startswith("AST fuzzer"),
+    ),
+    CheckDescription(
+        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 == JobNames.BUGFIX_VALIDATE,
+    ),
+    CheckDescription(
+        StatusNames.CI,
+        "A meta-check that indicates the running CI. Normally, it's in <b>success</b> or "
+        "<b>pending</b> state. The failed status indicates some problems with the PR",
+        lambda x: x == "CI running",
+    ),
+    CheckDescription(
+        "Builds",
+        "Builds ClickHouse in various configurations for use in further steps. "
+        "You have to fix the builds that fail. Build logs often has enough "
+        "information to fix the error, but you might have to reproduce the failure "
+        "locally. The <b>cmake</b> options can be found in the build log, grepping for "
+        '<b>cmake</b>. Use these options and follow the <a href="'
+        'https://clickhouse.com/docs/en/development/build">general build process</a>',
+        lambda x: x.startswith("ClickHouse") and x.endswith("build check"),
+    ),
+    CheckDescription(
+        "Compatibility check",
+        "Checks that <b>clickhouse</b> binary runs on distributions with old libc "
+        "versions. If it fails, ask a maintainer for help",
+        lambda x: x.startswith("Compatibility check"),
+    ),
+    CheckDescription(
+        JobNames.DOCKER_SERVER,
+        "The check to build and optionally push the mentioned image to docker hub",
+        lambda x: x.startswith("Docker server"),
+    ),
+    CheckDescription(
+        JobNames.DOCKER_KEEPER,
+        "The check to build and optionally push the mentioned image to docker hub",
+        lambda x: x.startswith("Docker keeper"),
+    ),
+    CheckDescription(
+        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>, '
+        "omitting some. If it fails, further checks are not started until it is fixed. "
+        "Look at the report to see which tests fail, then reproduce the failure "
+        'locally as described <a href="https://clickhouse.com/docs/en/development/'
+        'tests#functional-test-locally">here</a>',
+        lambda x: x == JobNames.FAST_TEST,
+    ),
+    CheckDescription(
+        "Flaky tests",
+        "Checks if new added or modified tests are flaky by running them repeatedly, "
+        "in parallel, with more randomization. Functional tests are run 100 times "
+        "with address sanitizer, and additional randomization of thread scheduling. "
+        "Integration tests are run up to 10 times. If at least once a new test has "
+        "failed, or was too long, this check will be red. We don't allow flaky tests, "
+        'read <a href="https://clickhouse.com/blog/decorating-a-christmas-tree-with-'
+        'the-help-of-flaky-tests/">the doc</a>',
+        lambda x: "tests flaky check" in x,
+    ),
+    CheckDescription(
+        "Install packages",
+        "Checks that the built packages are installable in a clear environment",
+        lambda x: x.startswith("Install packages ("),
+    ),
+    CheckDescription(
+        "Integration tests",
+        "The integration tests report. In parenthesis the package type is given, "
+        "and in square brackets are the optional part/total tests",
+        lambda x: x.startswith("Integration tests ("),
+    ),
+    CheckDescription(
+        StatusNames.MERGEABLE,
+        "Checks if all other necessary checks are successful",
+        lambda x: x == StatusNames.MERGEABLE,
+    ),
+    CheckDescription(
+        "Performance Comparison",
+        "Measure changes in query performance. The performance test report is "
+        'described in detail <a href="https://github.com/ClickHouse/ClickHouse/tree'
+        '/master/docker/test/performance-comparison#how-to-read-the-report">here</a>. '
+        "In square brackets are the optional part/total tests",
+        lambda x: x.startswith("Performance Comparison"),
+    ),
+    CheckDescription(
+        "Push to Dockerhub",
+        "The check for building and pushing the CI related docker images to docker hub",
+        lambda x: x.startswith("Push") and "to Dockerhub" in x,
+    ),
+    CheckDescription(
+        "Sqllogic",
+        "Run clickhouse on the "
+        '<a href="https://www.sqlite.org/sqllogictest">sqllogic</a> '
+        "test set against sqlite and checks that all statements are passed",
+        lambda x: x.startswith("Sqllogic test"),
+    ),
+    CheckDescription(
+        "SQLancer",
+        "Fuzzing tests that detect logical bugs with "
+        '<a href="https://github.com/sqlancer/sqlancer">SQLancer</a> tool',
+        lambda x: x.startswith("SQLancer"),
+    ),
+    CheckDescription(
+        "Stateful tests",
+        "Runs stateful functional tests for ClickHouse binaries built in various "
+        "configurations -- release, debug, with sanitizers, etc",
+        lambda x: x.startswith("Stateful tests ("),
+    ),
+    CheckDescription(
+        "Stateless tests",
+        "Runs stateless functional tests for ClickHouse binaries built in various "
+        "configurations -- release, debug, with sanitizers, etc",
+        lambda x: x.startswith("Stateless tests ("),
+    ),
+    CheckDescription(
+        "Stress test",
+        "Runs stateless functional tests concurrently from several clients to detect "
+        "concurrency-related errors",
+        lambda x: x.startswith("Stress test ("),
+    ),
+    CheckDescription(
+        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 == JobNames.STYLE_CHECK,
+    ),
+    CheckDescription(
+        "Unit tests",
+        "Runs the unit tests for different release types",
+        lambda x: x.startswith("Unit tests ("),
+    ),
+    CheckDescription(
+        "Upgrade check",
+        "Runs stress tests on server version from last release and then tries to "
+        "upgrade it to the version from the PR. It checks if the new server can "
+        "successfully startup without any errors, crashes or sanitizer asserts",
+        lambda x: x.startswith("Upgrade check ("),
+    ),
+    CheckDescription(
+        "ClickBench",
+        "Runs [ClickBench](https://github.com/ClickHouse/ClickBench/) with instant-attach table",
+        lambda x: x.startswith("ClickBench"),
+    ),
+    CheckDescription(
+        "Fallback for unknown",
+        "There's no description for the check yet, please add it to "
+        "tests/ci/ci_config.py:CHECK_DESCRIPTIONS",
+        lambda x: True,
+    ),
+]
diff --git a/tests/ci/ci_metadata.py b/tests/ci/ci_metadata.py
index 67106262634..a767d102811 100644
--- a/tests/ci/ci_metadata.py
+++ b/tests/ci/ci_metadata.py
@@ -9,7 +9,7 @@ from env_helper import (
     S3_BUILDS_BUCKET_PUBLIC,
 )
 from s3_helper import S3Helper
-from ci_utils import GH
+from ci_utils import GHActions
 from synchronizer_utils import SYNC_BRANCH_PREFIX
 
 
@@ -111,7 +111,7 @@ class CiMetadata:
         else:
             log_title = f"Storing workflow metadata: PR [{self.pr_number}], upstream PR [{self.upstream_pr_number}]"
 
-        GH.print_in_group(
+        GHActions.print_in_group(
             log_title,
             [f"run_id: {self.run_id}"],
         )
diff --git a/tests/ci/ci_settings.py b/tests/ci/ci_settings.py
index 05929179e06..c29c5777dba 100644
--- a/tests/ci/ci_settings.py
+++ b/tests/ci/ci_settings.py
@@ -2,6 +2,7 @@ import re
 from dataclasses import dataclass, asdict
 from typing import Optional, List, Dict, Any, Iterable
 
+from ci_utils import normalize_string
 from ci_config import CI
 from git_helper import Runner as GitRunner, GIT_PREFIX
 from pr_info import PRInfo
@@ -88,14 +89,14 @@ class CiSettings:
                 if not res.include_keywords:
                     res.include_keywords = []
                 res.include_keywords.append(
-                    CI.Utils.normalize_string(match.removeprefix("ci_include_"))
+                    normalize_string(match.removeprefix("ci_include_"))
                 )
             elif match.startswith("ci_exclude_"):
                 if not res.exclude_keywords:
                     res.exclude_keywords = []
                 keywords = match.removeprefix("ci_exclude_").split("|")
                 res.exclude_keywords += [
-                    CI.Utils.normalize_string(keyword) for keyword in keywords
+                    normalize_string(keyword) for keyword in keywords
                 ]
             elif match == CI.Tags.NO_CI_CACHE:
                 res.no_ci_cache = True
@@ -162,7 +163,7 @@ class CiSettings:
         # do not exclude builds
         if self.exclude_keywords and not CI.is_build_job(job):
             for keyword in self.exclude_keywords:
-                if keyword in CI.Utils.normalize_string(job):
+                if keyword in normalize_string(job):
                     print(f"Job [{job}] matches Exclude keyword [{keyword}] - deny")
                     return False
 
@@ -173,7 +174,7 @@ class CiSettings:
                 # never exclude Style Check by include keywords
                 return True
             for keyword in self.include_keywords:
-                if keyword in CI.Utils.normalize_string(job):
+                if keyword in normalize_string(job):
                     print(f"Job [{job}] matches Include keyword [{keyword}] - pass")
                     return True
             to_deny = True
@@ -233,4 +234,11 @@ class CiSettings:
         for job in add_parents:
             res[job] = job_configs[job]
 
+        for job, job_config in res.items():
+            batches = []
+            for batch in range(job_config.num_batches):
+                if not self.job_batches or batch in self.job_batches:
+                    batches.append(batch)
+            job_config.batches = batches
+
         return res
diff --git a/tests/ci/ci_utils.py b/tests/ci/ci_utils.py
index 8b60f61b006..3b12fe6974f 100644
--- a/tests/ci/ci_utils.py
+++ b/tests/ci/ci_utils.py
@@ -2,11 +2,10 @@ import json
 import os
 import re
 import subprocess
-import sys
 import time
 from contextlib import contextmanager
 from pathlib import Path
-from typing import Any, Iterator, List, Union, Optional, Sequence
+from typing import Any, Iterator, List, Union, Optional, Sequence, Tuple
 
 import requests
 
@@ -16,9 +15,41 @@ class Envs:
     WORKFLOW_RESULT_FILE = os.getenv(
         "WORKFLOW_RESULT_FILE", "/tmp/workflow_results.json"
     )
-    S3_BUILDS_BUCKET = os.getenv("S3_BUILDS_BUCKET", "clickhouse-builds")
-    GITHUB_WORKFLOW = os.getenv("GITHUB_WORKFLOW", "")
-    GITHUB_ACTOR = os.getenv("GITHUB_ACTOR", "")
+
+
+LABEL_CATEGORIES = {
+    "pr-backward-incompatible": ["Backward Incompatible Change"],
+    "pr-bugfix": [
+        "Bug Fix",
+        "Bug Fix (user-visible misbehavior in an official stable release)",
+        "Bug Fix (user-visible misbehaviour in official stable or prestable release)",
+        "Bug Fix (user-visible misbehavior in official stable or prestable release)",
+    ],
+    "pr-critical-bugfix": ["Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)"],
+    "pr-build": [
+        "Build/Testing/Packaging Improvement",
+        "Build Improvement",
+        "Build/Testing Improvement",
+        "Build",
+        "Packaging Improvement",
+    ],
+    "pr-documentation": [
+        "Documentation (changelog entry is not required)",
+        "Documentation",
+    ],
+    "pr-feature": ["New Feature"],
+    "pr-improvement": ["Improvement"],
+    "pr-not-for-changelog": [
+        "Not for changelog (changelog entry is not required)",
+        "Not for changelog",
+    ],
+    "pr-performance": ["Performance Improvement"],
+    "pr-ci": ["CI Fix or Improvement (changelog entry is not required)"],
+}
+
+CATEGORY_TO_LABEL = {
+    c: lb for lb, categories in LABEL_CATEGORIES.items() for c in categories
+}
 
 
 class WithIter(type):
@@ -36,7 +67,22 @@ def cd(path: Union[Path, str]) -> Iterator[None]:
         os.chdir(oldpwd)
 
 
-class GH:
+def is_hex(s):
+    try:
+        int(s, 16)
+        return True
+    except ValueError:
+        return False
+
+
+def normalize_string(string: str) -> str:
+    res = string.lower()
+    for r in ((" ", "_"), ("(", "_"), (")", "_"), (",", "_"), ("/", "_"), ("-", "_")):
+        res = res.replace(*r)
+    return res
+
+
+class GHActions:
     class ActionsNames:
         RunConfig = "RunConfig"
 
@@ -45,10 +91,9 @@ class GH:
         FAILURE = "failure"
         PENDING = "pending"
         SUCCESS = "success"
-        SKIPPED = "skipped"
 
     @classmethod
-    def get_workflow_results(cls):
+    def _get_workflow_results(cls):
         if not Path(Envs.WORKFLOW_RESULT_FILE).exists():
             print(
                 f"ERROR: Failed to get workflow results from file [{Envs.WORKFLOW_RESULT_FILE}]"
@@ -59,29 +104,18 @@ class GH:
                 res = json.load(json_file)
             except json.JSONDecodeError as e:
                 print(f"ERROR: json decoder exception {e}")
-                json_file.seek(0)
-                print("    File content:")
-                print(json_file.read())
                 return {}
         return res
 
     @classmethod
     def print_workflow_results(cls):
-        res = cls.get_workflow_results()
+        res = cls._get_workflow_results()
         results = [f"{job}: {data['result']}" for job, data in res.items()]
         cls.print_in_group("Workflow results", results)
 
-    @classmethod
-    def is_workflow_ok(cls) -> bool:
-        res = cls.get_workflow_results()
-        for _job, data in res.items():
-            if data["result"] == "failure":
-                return False
-        return bool(res)
-
     @classmethod
     def get_workflow_job_result(cls, wf_job_name: str) -> Optional[str]:
-        res = cls.get_workflow_results()
+        res = cls._get_workflow_results()
         if wf_job_name in res:
             return res[wf_job_name]["result"]  # type: ignore
         else:
@@ -101,31 +135,23 @@ class GH:
     ) -> str:
         assert len(token) == 40
         assert len(commit_sha) == 40
-        assert Utils.is_hex(commit_sha)
-        assert not Utils.is_hex(token)
-
-        url = f"https://api.github.com/repos/{Envs.GITHUB_REPOSITORY}/commits/{commit_sha}/statuses"
+        assert is_hex(commit_sha)
+        assert not is_hex(token)
+        url = f"https://api.github.com/repos/{Envs.GITHUB_REPOSITORY}/commits/{commit_sha}/statuses?per_page={200}"
         headers = {
             "Authorization": f"token {token}",
             "Accept": "application/vnd.github.v3+json",
         }
+        response = requests.get(url, headers=headers, timeout=5)
 
         if isinstance(status_name, str):
             status_name = (status_name,)
-
-        while url:
-            response = requests.get(url, headers=headers, timeout=5)
-            if response.status_code == 200:
-                statuses = response.json()
-                for status in statuses:
-                    if status["context"] in status_name:
-                        return status["state"]  # type: ignore
-
-                # Check if there is a next page
-                url = response.links.get("next", {}).get("url")
-            else:
-                break
-
+        if response.status_code == 200:
+            assert "next" not in response.links, "Response truncated"
+            statuses = response.json()
+            for status in statuses:
+                if status["context"] in status_name:
+                    return status["state"]  # type: ignore
         return ""
 
     @staticmethod
@@ -159,84 +185,72 @@ class GH:
         return False
 
     @staticmethod
-    def get_pr_url_by_branch(branch, repo=None):
-        repo = repo or Envs.GITHUB_REPOSITORY
-        get_url_cmd = f"gh pr list --repo {repo} --head {branch} --json url --jq '.[0].url' --state open"
-        url = Shell.get_output(get_url_cmd)
-        if not url:
-            print(f"WARNING: No open PR found, branch [{branch}] - search for merged")
-            get_url_cmd = f"gh pr list --repo {repo} --head {branch} --json url --jq '.[0].url' --state merged"
-            url = Shell.get_output(get_url_cmd)
+    def get_pr_url_by_branch(repo, branch):
+        get_url_cmd = (
+            f"gh pr list --repo {repo} --head {branch} --json url --jq '.[0].url'"
+        )
+        url = Shell.run(get_url_cmd)
         if not url:
             print(f"ERROR: PR nor found, branch [{branch}]")
         return url
 
-    @staticmethod
-    def is_latest_release_branch(branch):
-        latest_branch = Shell.get_output(
-            'gh pr list --label release --repo ClickHouse/ClickHouse --search "sort:created" -L1 --json headRefName'
-        )
-        if latest_branch:
-            latest_branch = json.loads(latest_branch)[0]["headRefName"]
-        print(
-            f"Latest branch [{latest_branch}], release branch [{branch}], release latest [{latest_branch == branch}]"
-        )
-        return latest_branch == branch
-
 
 class Shell:
     @classmethod
-    def get_output_or_raise(cls, command):
-        return cls.get_output(command, strict=True)
-
-    @classmethod
-    def get_output(cls, command, strict=False):
+    def run_strict(cls, command):
         res = subprocess.run(
             command,
             shell=True,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             text=True,
-            check=strict,
+            check=True,
         )
         return res.stdout.strip()
 
     @classmethod
-    def check(
-        cls,
-        command,
-        strict=False,
-        verbose=False,
-        dry_run=False,
-        stdin_str=None,
-        **kwargs,
-    ):
+    def run(cls, command, check=False, dry_run=False):
         if dry_run:
             print(f"Dry-ryn. Would run command [{command}]")
-            return True
-        if verbose:
-            print(f"Run command [{command}]")
-        proc = subprocess.Popen(
+            return ""
+        print(f"Run command [{command}]")
+        res = ""
+        result = subprocess.run(
             command,
             shell=True,
-            stderr=subprocess.STDOUT,
             stdout=subprocess.PIPE,
-            stdin=subprocess.PIPE if stdin_str else None,
-            universal_newlines=True,
-            start_new_session=True,
-            bufsize=1,
-            errors="backslashreplace",
-            **kwargs,
+            stderr=subprocess.PIPE,
+            text=True,
+            check=False,
         )
-        if stdin_str:
-            proc.communicate(input=stdin_str)
-        elif proc.stdout:
-            for line in proc.stdout:
-                sys.stdout.write(line)
-        proc.wait()
-        if strict:
-            assert proc.returncode == 0
-        return proc.returncode == 0
+        if result.returncode == 0:
+            print(f"stdout: {result.stdout.strip()}")
+            res = result.stdout
+        else:
+            print(
+                f"ERROR: stdout: {result.stdout.strip()}, stderr: {result.stderr.strip()}"
+            )
+            if check:
+                assert result.returncode == 0
+        return res.strip()
+
+    @classmethod
+    def run_as_daemon(cls, command):
+        print(f"Run daemon command [{command}]")
+        subprocess.Popen(command.split(" "))  # pylint:disable=consider-using-with
+        return 0, ""
+
+    @classmethod
+    def check(cls, command):
+        result = subprocess.run(
+            command,
+            shell=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            check=False,
+        )
+        return result.returncode == 0
 
 
 class Utils:
@@ -260,33 +274,82 @@ class Utils:
 
     @staticmethod
     def clear_dmesg():
-        Shell.check("sudo dmesg --clear", verbose=True)
+        Shell.run("sudo dmesg --clear ||:")
 
     @staticmethod
-    def is_hex(s):
-        try:
-            int(s, 16)
-            return True
-        except ValueError:
-            return False
+    def check_pr_description(pr_body: str, repo_name: str) -> Tuple[str, str]:
+        """The function checks the body to being properly formatted according to
+        .github/PULL_REQUEST_TEMPLATE.md, if the first returned string is not empty,
+        then there is an error."""
+        lines = list(map(lambda x: x.strip(), pr_body.split("\n") if pr_body else []))
+        lines = [re.sub(r"\s+", " ", line) for line in lines]
 
-    @staticmethod
-    def normalize_string(string: str) -> str:
-        res = string.lower()
-        for r in (
-            (" ", "_"),
-            ("(", "_"),
-            (")", "_"),
-            (",", "_"),
-            ("/", "_"),
-            ("-", "_"),
-        ):
-            res = res.replace(*r)
-        return res
+        # Check if body contains "Reverts ClickHouse/ClickHouse#36337"
+        if [
+            True for line in lines if re.match(rf"\AReverts {repo_name}#[\d]+\Z", line)
+        ]:
+            return "", LABEL_CATEGORIES["pr-not-for-changelog"][0]
 
-    @staticmethod
-    def is_job_triggered_manually():
-        return (
-            "robot" not in Envs.GITHUB_ACTOR
-            and "clickhouse-ci" not in Envs.GITHUB_ACTOR
-        )
+        category = ""
+        entry = ""
+        description_error = ""
+
+        i = 0
+        while i < len(lines):
+            if re.match(r"(?i)^[#>*_ ]*change\s*log\s*category", lines[i]):
+                i += 1
+                if i >= len(lines):
+                    break
+                # Can have one empty line between header and the category
+                # itself. Filter it out.
+                if not lines[i]:
+                    i += 1
+                    if i >= len(lines):
+                        break
+                category = re.sub(r"^[-*\s]*", "", lines[i])
+                i += 1
+
+                # Should not have more than one category. Require empty line
+                # after the first found category.
+                if i >= len(lines):
+                    break
+                if lines[i]:
+                    second_category = re.sub(r"^[-*\s]*", "", lines[i])
+                    description_error = (
+                        "More than one changelog category specified: "
+                        f"'{category}', '{second_category}'"
+                    )
+                    return description_error, category
+
+            elif re.match(
+                r"(?i)^[#>*_ ]*(short\s*description|change\s*log\s*entry)", lines[i]
+            ):
+                i += 1
+                # Can have one empty line between header and the entry itself.
+                # Filter it out.
+                if i < len(lines) and not lines[i]:
+                    i += 1
+                # All following lines until empty one are the changelog entry.
+                entry_lines = []
+                while i < len(lines) and lines[i]:
+                    entry_lines.append(lines[i])
+                    i += 1
+                entry = " ".join(entry_lines)
+                # Don't accept changelog entries like '...'.
+                entry = re.sub(r"[#>*_.\- ]", "", entry)
+                # Don't accept changelog entries like 'Close #12345'.
+                entry = re.sub(r"^[\w\-\s]{0,10}#?\d{5,6}\.?$", "", entry)
+            else:
+                i += 1
+
+        if not category:
+            description_error = "Changelog category is empty"
+        # Filter out the PR categories that are not for changelog.
+        elif "(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", ""
+        elif not entry:
+            description_error = f"Changelog entry required for category '{category}'"
+
+        return description_error, category
diff --git a/tests/ci/clickhouse_helper.py b/tests/ci/clickhouse_helper.py
index 0725f7100d1..287970cce9a 100644
--- a/tests/ci/clickhouse_helper.py
+++ b/tests/ci/clickhouse_helper.py
@@ -3,7 +3,6 @@ import fileinput
 import json
 import logging
 import time
-import os
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
@@ -299,11 +298,6 @@ class CiLogsCredentials:
     def get_docker_arguments(
         self, pr_info: PRInfo, check_start_time: str, check_name: str
     ) -> str:
-        run_by_hash_total = int(os.getenv("RUN_BY_HASH_TOTAL", "0"))
-        if run_by_hash_total > 1:
-            run_by_hash_num = int(os.getenv("RUN_BY_HASH_NUM", "0"))
-            check_name = f"{check_name} [{run_by_hash_num + 1}/{run_by_hash_total}]"
-
         self.create_ci_logs_credentials()
         if not self.config_path.exists():
             logging.info("Do not use external logs pushing")
diff --git a/tests/ci/commit_status_helper.py b/tests/ci/commit_status_helper.py
index a6287d5629b..fdc9c002b66 100644
--- a/tests/ci/commit_status_helper.py
+++ b/tests/ci/commit_status_helper.py
@@ -7,7 +7,7 @@ import time
 from collections import defaultdict
 from dataclasses import asdict, dataclass
 from pathlib import Path
-from typing import Dict, List, Optional, Union, Callable
+from typing import Dict, List, Optional, Union
 
 from github import Github
 from github.Commit import Commit
@@ -176,7 +176,7 @@ def set_status_comment(commit: Commit, pr_info: PRInfo) -> None:
 
     if not [status for status in statuses if status.context == CI.StatusNames.CI]:
         # This is the case, when some statuses already exist for the check,
-        # but not the CI.StatusNames.CI. We should create it as pending.
+        # but not the StatusNames.CI. We should create it as pending.
         # W/o pr_info to avoid recursion, and yes, one extra create_ci_report
         post_commit_status(
             commit,
@@ -226,20 +226,20 @@ def generate_status_comment(pr_info: PRInfo, statuses: CommitStatuses) -> str:
         f"\n"
     )
     # group checks by the name to get the worst one per each
-    grouped_statuses = {}  # type: Dict[CheckDescription, CommitStatuses]
+    grouped_statuses = {}  # type: Dict[CI.CheckDescription, CommitStatuses]
     for status in statuses:
         cd = None
-        for c in CHECK_DESCRIPTIONS:
+        for c in CI.CHECK_DESCRIPTIONS:
             if c.match_func(status.context):
                 cd = c
                 break
 
-        if cd is None or cd == CHECK_DESCRIPTIONS[-1]:
+        if cd is None or cd == CI.CHECK_DESCRIPTIONS[-1]:
             # This is the case for either non-found description or a fallback
-            cd = CheckDescription(
+            cd = CI.CheckDescription(
                 status.context,
-                CHECK_DESCRIPTIONS[-1].description,
-                CHECK_DESCRIPTIONS[-1].match_func,
+                CI.CHECK_DESCRIPTIONS[-1].description,
+                CI.CHECK_DESCRIPTIONS[-1].match_func,
             )
 
         if cd in grouped_statuses:
@@ -301,7 +301,7 @@ def get_worst_state(statuses: CommitStatuses) -> StatusType:
 
 
 def create_ci_report(pr_info: PRInfo, statuses: CommitStatuses) -> str:
-    """The function converts the statuses to TestResults and uploads the report
+    """The function converst the statuses to TestResults and uploads the report
     to S3 tests bucket. Then it returns the URL"""
     test_results = []  # type: TestResults
     for status in statuses:
@@ -459,7 +459,7 @@ def trigger_mergeable_check(
     set_from_sync: bool = False,
     workflow_failed: bool = False,
 ) -> StatusType:
-    """calculate and update CI.StatusNames.MERGEABLE"""
+    """calculate and update StatusNames.MERGEABLE"""
     required_checks = [status for status in statuses if CI.is_required(status.context)]
 
     mergeable_status = None
@@ -497,9 +497,9 @@ def trigger_mergeable_check(
     description = format_description(description)
 
     if set_from_sync:
-        # update Mergeable Check from sync WF only if its status already present or its new status is FAILURE
+        # update Mergeable Check from sync WF only if its status already present or its new status is not SUCCESS
         #   to avoid false-positives
-        if mergeable_status or state == FAILURE:
+        if mergeable_status or state != SUCCESS:
             set_mergeable_check(commit, description, state)
     elif mergeable_status is None or mergeable_status.description != description:
         set_mergeable_check(commit, description, state)
@@ -536,188 +536,3 @@ def update_upstream_sync_status(
         get_commit_filtered_statuses(last_synced_upstream_commit),
         set_from_sync=True,
     )
-
-
-@dataclass
-class CheckDescription:
-    name: str
-    description: str  # the check descriptions, will be put into the status table
-    match_func: Callable[[str], bool]  # the function to check vs the commit status
-
-    def __hash__(self) -> int:
-        return hash(self.name + self.description)
-
-
-CHECK_DESCRIPTIONS = [
-    CheckDescription(
-        CI.StatusNames.PR_CHECK,
-        "Checks correctness of the PR's body",
-        lambda x: x == "PR Check",
-    ),
-    CheckDescription(
-        CI.StatusNames.SYNC,
-        "If it fails, ask a maintainer for help",
-        lambda x: x == CI.StatusNames.SYNC,
-    ),
-    CheckDescription(
-        "AST fuzzer",
-        "Runs randomly generated queries to catch program errors. "
-        "The build type is optionally given in parenthesis. "
-        "If it fails, ask a maintainer for help",
-        lambda x: x.startswith("AST fuzzer"),
-    ),
-    CheckDescription(
-        CI.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 == CI.JobNames.BUGFIX_VALIDATE,
-    ),
-    CheckDescription(
-        CI.StatusNames.CI,
-        "A meta-check that indicates the running CI. Normally, it's in <b>success</b> or "
-        "<b>pending</b> state. The failed status indicates some problems with the PR",
-        lambda x: x == "CI running",
-    ),
-    CheckDescription(
-        "Builds",
-        "Builds ClickHouse in various configurations for use in further steps. "
-        "You have to fix the builds that fail. Build logs often has enough "
-        "information to fix the error, but you might have to reproduce the failure "
-        "locally. The <b>cmake</b> options can be found in the build log, grepping for "
-        '<b>cmake</b>. Use these options and follow the <a href="'
-        'https://clickhouse.com/docs/en/development/build">general build process</a>',
-        lambda x: x.startswith("ClickHouse") and x.endswith("build check"),
-    ),
-    CheckDescription(
-        "Compatibility check",
-        "Checks that <b>clickhouse</b> binary runs on distributions with old libc "
-        "versions. If it fails, ask a maintainer for help",
-        lambda x: x.startswith("Compatibility check"),
-    ),
-    CheckDescription(
-        CI.JobNames.DOCKER_SERVER,
-        "The check to build and optionally push the mentioned image to docker hub",
-        lambda x: x.startswith("Docker server"),
-    ),
-    CheckDescription(
-        CI.JobNames.DOCKER_KEEPER,
-        "The check to build and optionally push the mentioned image to docker hub",
-        lambda x: x.startswith("Docker keeper"),
-    ),
-    CheckDescription(
-        CI.JobNames.DOCS_CHECK,
-        "Builds and tests the documentation",
-        lambda x: x == CI.JobNames.DOCS_CHECK,
-    ),
-    CheckDescription(
-        CI.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>, '
-        "omitting some. If it fails, further checks are not started until it is fixed. "
-        "Look at the report to see which tests fail, then reproduce the failure "
-        'locally as described <a href="https://clickhouse.com/docs/en/development/'
-        'tests#functional-test-locally">here</a>',
-        lambda x: x == CI.JobNames.FAST_TEST,
-    ),
-    CheckDescription(
-        "Flaky tests",
-        "Checks if new added or modified tests are flaky by running them repeatedly, "
-        "in parallel, with more randomization. Functional tests are run 100 times "
-        "with address sanitizer, and additional randomization of thread scheduling. "
-        "Integration tests are run up to 10 times. If at least once a new test has "
-        "failed, or was too long, this check will be red. We don't allow flaky tests, "
-        'read <a href="https://clickhouse.com/blog/decorating-a-christmas-tree-with-'
-        'the-help-of-flaky-tests/">the doc</a>',
-        lambda x: "tests flaky check" in x,
-    ),
-    CheckDescription(
-        "Install packages",
-        "Checks that the built packages are installable in a clear environment",
-        lambda x: x.startswith("Install packages ("),
-    ),
-    CheckDescription(
-        "Integration tests",
-        "The integration tests report. In parenthesis the package type is given, "
-        "and in square brackets are the optional part/total tests",
-        lambda x: x.startswith("Integration tests ("),
-    ),
-    CheckDescription(
-        CI.StatusNames.MERGEABLE,
-        "Checks if all other necessary checks are successful",
-        lambda x: x == CI.StatusNames.MERGEABLE,
-    ),
-    CheckDescription(
-        "Performance Comparison",
-        "Measure changes in query performance. The performance test report is "
-        'described in detail <a href="https://github.com/ClickHouse/ClickHouse/tree'
-        '/master/docker/test/performance-comparison#how-to-read-the-report">here</a>. '
-        "In square brackets are the optional part/total tests",
-        lambda x: x.startswith("Performance Comparison"),
-    ),
-    CheckDescription(
-        "Push to Dockerhub",
-        "The check for building and pushing the CI related docker images to docker hub",
-        lambda x: x.startswith("Push") and "to Dockerhub" in x,
-    ),
-    CheckDescription(
-        "Sqllogic",
-        "Run clickhouse on the "
-        '<a href="https://www.sqlite.org/sqllogictest">sqllogic</a> '
-        "test set against sqlite and checks that all statements are passed",
-        lambda x: x.startswith("Sqllogic test"),
-    ),
-    CheckDescription(
-        "SQLancer",
-        "Fuzzing tests that detect logical bugs with "
-        '<a href="https://github.com/sqlancer/sqlancer">SQLancer</a> tool',
-        lambda x: x.startswith("SQLancer"),
-    ),
-    CheckDescription(
-        "Stateful tests",
-        "Runs stateful functional tests for ClickHouse binaries built in various "
-        "configurations -- release, debug, with sanitizers, etc",
-        lambda x: x.startswith("Stateful tests ("),
-    ),
-    CheckDescription(
-        "Stateless tests",
-        "Runs stateless functional tests for ClickHouse binaries built in various "
-        "configurations -- release, debug, with sanitizers, etc",
-        lambda x: x.startswith("Stateless tests ("),
-    ),
-    CheckDescription(
-        "Stress test",
-        "Runs stateless functional tests concurrently from several clients to detect "
-        "concurrency-related errors",
-        lambda x: x.startswith("Stress test ("),
-    ),
-    CheckDescription(
-        CI.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 == CI.JobNames.STYLE_CHECK,
-    ),
-    CheckDescription(
-        "Unit tests",
-        "Runs the unit tests for different release types",
-        lambda x: x.startswith("Unit tests ("),
-    ),
-    CheckDescription(
-        "Upgrade check",
-        "Runs stress tests on server version from last release and then tries to "
-        "upgrade it to the version from the PR. It checks if the new server can "
-        "successfully startup without any errors, crashes or sanitizer asserts",
-        lambda x: x.startswith("Upgrade check ("),
-    ),
-    CheckDescription(
-        "ClickBench",
-        "Runs [ClickBench](https://github.com/ClickHouse/ClickBench/) with instant-attach table",
-        lambda x: x.startswith("ClickBench"),
-    ),
-    CheckDescription(
-        "Fallback for unknown",
-        "There's no description for the check yet, please add it to "
-        "tests/ci/ci_config.py:CHECK_DESCRIPTIONS",
-        lambda x: True,
-    ),
-]
diff --git a/tests/ci/create_release.py b/tests/ci/create_release.py
index 68268b033fe..a0b4083b673 100755
--- a/tests/ci/create_release.py
+++ b/tests/ci/create_release.py
@@ -10,8 +10,9 @@ from typing import Iterator, List
 
 from git_helper import Git, GIT_PREFIX
 from ssh import SSHAgent
+from env_helper import GITHUB_REPOSITORY, S3_BUILDS_BUCKET
 from s3_helper import S3Helper
-from ci_utils import Shell, GH
+from ci_utils import Shell, GHActions
 from ci_buddy import CIBuddy
 from version_helper import (
     FILE_WITH_VERSION_PATH,
@@ -42,7 +43,6 @@ class ReleaseProgress:
     TEST_TGZ = "test TGZ packages"
     TEST_RPM = "test RPM packages"
     TEST_DEB = "test DEB packages"
-    MERGE_CREATED_PRS = "merge created PRs"
     COMPLETED = "completed"
 
 
@@ -61,7 +61,6 @@ class ReleaseContextManager:
             # create initial release info
             self.release_info = ReleaseInfo(
                 release_branch="NA",
-                release_type="NA",
                 commit_sha=args.ref,
                 release_tag="NA",
                 version="NA",
@@ -69,14 +68,13 @@ class ReleaseContextManager:
                 previous_release_tag="NA",
                 previous_release_sha="NA",
                 release_progress=ReleaseProgress.STARTED,
-                latest=False,
             ).dump()
         else:
             # fetch release info from fs and update
             self.release_info = ReleaseInfo.from_file()
             assert self.release_info
             assert (
-                self.release_info.progress_status == ReleaseProgressDescription.OK
+                self.release_info.progress_description == ReleaseProgressDescription.OK
             ), "Must be OK on the start of new context"
             self.release_info.release_progress = self.release_progress
             self.release_info.dump()
@@ -85,34 +83,31 @@ class ReleaseContextManager:
     def __exit__(self, exc_type, exc_value, traceback):
         assert self.release_info
         if exc_type is not None:
-            self.release_info.progress_status = ReleaseProgressDescription.FAILED
+            self.release_info.progress_description = ReleaseProgressDescription.FAILED
         else:
-            self.release_info.progress_status = ReleaseProgressDescription.OK
+            self.release_info.progress_description = ReleaseProgressDescription.OK
         self.release_info.dump()
 
 
 @dataclasses.dataclass
 class ReleaseInfo:
     version: str
-    release_type: str
     release_tag: str
     release_branch: str
     commit_sha: str
-    latest: bool
     # lts or stable
     codename: str
     previous_release_tag: str
     previous_release_sha: str
     changelog_pr: str = ""
     version_bump_pr: str = ""
-    prs_merged: bool = False
     release_url: str = ""
-    debian: str = ""
-    rpm: str = ""
-    tgz: str = ""
-    docker: str = ""
+    debian_command: str = ""
+    rpm_command: str = ""
+    tgz_command: str = ""
+    docker_command: str = ""
     release_progress: str = ""
-    progress_status: str = ""
+    progress_description: str = ""
 
     def is_patch(self):
         return self.release_branch != "master"
@@ -132,31 +127,26 @@ class ReleaseInfo:
             print(json.dumps(dataclasses.asdict(self), indent=2), file=f)
         return self
 
-    def prepare(
-        self, commit_ref: str, release_type: str, _skip_tag_check: bool
-    ) -> "ReleaseInfo":
+    def prepare(self, commit_ref: str, release_type: str) -> "ReleaseInfo":
         version = None
         release_branch = None
         release_tag = None
         previous_release_tag = None
         previous_release_sha = None
-        latest_release = False
         codename = ""
         assert release_type in ("patch", "new")
         if release_type == "new":
             # check commit_ref is right and on a right branch
-            if commit_ref != "master":
-                Shell.check(
-                    f"git merge-base --is-ancestor {commit_ref} origin/master",
-                    strict=True,
-                    verbose=True,
-                )
+            Shell.run(
+                f"git merge-base --is-ancestor {commit_ref} origin/master",
+                check=True,
+            )
             with checkout(commit_ref):
-                commit_sha = Shell.get_output_or_raise(f"git rev-list -n1 {commit_ref}")
+                commit_sha = Shell.run(f"git rev-parse {commit_ref}", check=True)
                 # Git() must be inside "with checkout" contextmanager
                 git = Git()
                 version = get_version_from_repo(git=git)
-                release_branch = f"{version.major}.{version.minor}"
+                release_branch = "master"
                 expected_prev_tag = f"v{version.major}.{version.minor}.1.1-new"
                 version.bump().with_description(VersionType.NEW)
                 assert (
@@ -164,13 +154,13 @@ class ReleaseInfo:
                 ), f"BUG: latest tag [{git.latest_tag}], expected [{expected_prev_tag}]"
                 release_tag = version.describe
                 previous_release_tag = expected_prev_tag
-                previous_release_sha = Shell.get_output_or_raise(
-                    f"git rev-list -n1 {previous_release_tag}"
+                previous_release_sha = Shell.run_strict(
+                    f"git rev-parse {previous_release_tag}"
                 )
                 assert previous_release_sha
         if release_type == "patch":
             with checkout(commit_ref):
-                commit_sha = Shell.get_output_or_raise(f"git rev-list -n1 {commit_ref}")
+                commit_sha = Shell.run(f"git rev-parse {commit_ref}", check=True)
                 # Git() must be inside "with checkout" contextmanager
                 git = Git()
                 version = get_version_from_repo(git=git)
@@ -178,16 +168,11 @@ class ReleaseInfo:
                 version.with_description(codename)
                 release_branch = f"{version.major}.{version.minor}"
                 release_tag = version.describe
-            Shell.check(
-                f"{GIT_PREFIX} fetch origin {release_branch} --tags",
-                strict=True,
-                verbose=True,
-            )
+            Shell.run(f"{GIT_PREFIX} fetch origin {release_branch} --tags", check=True)
             # check commit is right and on a right branch
-            Shell.check(
+            Shell.run(
                 f"git merge-base --is-ancestor {commit_ref} origin/{release_branch}",
-                strict=True,
-                verbose=True,
+                check=True,
             )
             if version.patch == 1:
                 expected_version = copy(version)
@@ -207,21 +192,16 @@ class ReleaseInfo:
                 expected_tag_prefix
             ) and git.latest_tag.endswith(expected_tag_suffix):
                 pass
-            # TODO: uncomment and check with dry-run
-            # elif not skip_tag_check:
-            #     assert (
-            #         False
-            #     ), f"BUG: Unexpected latest tag [{git.latest_tag}] expected [{expected_tag_prefix}*{expected_tag_suffix}]. Already Released?"
+            else:
+                assert (
+                    False
+                ), f"BUG: Unexpected latest tag [{git.latest_tag}] expected [{expected_tag_prefix}*{expected_tag_suffix}]"
 
-            previous_release_sha = Shell.get_output_or_raise(
-                f"git rev-list -n1 {previous_release_tag}"
+            previous_release_sha = Shell.run_strict(
+                f"git rev-parse {previous_release_tag}"
             )
             assert previous_release_sha
 
-            if CI.GH.is_latest_release_branch(release_branch):
-                print("This is going to be the latest release!")
-                latest_release = True
-
         assert (
             release_branch
             and previous_release_tag
@@ -230,7 +210,7 @@ class ReleaseInfo:
             and release_tag
             and version
             and (codename in ("lts", "stable") or release_type == "new")
-        ), f"Check: {release_branch}, {previous_release_tag}, {previous_release_sha}, {commit_sha}, {release_tag}, {version}"
+        )
 
         self.release_branch = release_branch
         self.commit_sha = commit_sha
@@ -240,42 +220,40 @@ class ReleaseInfo:
         self.previous_release_tag = previous_release_tag
         self.previous_release_sha = previous_release_sha
         self.release_progress = ReleaseProgress.STARTED
-        self.progress_status = ReleaseProgressDescription.OK
-        self.latest = latest_release
-        self.release_type = release_type
+        self.progress_description = ReleaseProgressDescription.OK
         return self
 
     def push_release_tag(self, dry_run: bool) -> None:
         if dry_run:
             # remove locally created tag from prev run
-            Shell.check(
-                f"{GIT_PREFIX} tag -l | grep -q {self.release_tag} && git tag -d {self.release_tag}"
+            Shell.run(
+                f"{GIT_PREFIX} tag -l | grep -q {self.release_tag} && git tag -d {self.release_tag} ||:"
             )
         # Create release tag
         print(
             f"Create and push release tag [{self.release_tag}], commit [{self.commit_sha}]"
         )
         tag_message = f"Release {self.release_tag}"
-        Shell.check(
+        Shell.run(
             f"{GIT_PREFIX} tag -a -m '{tag_message}' {self.release_tag} {self.commit_sha}",
-            strict=True,
-            verbose=True,
+            check=True,
         )
         cmd_push_tag = f"{GIT_PREFIX} push origin {self.release_tag}:{self.release_tag}"
-        Shell.check(cmd_push_tag, dry_run=dry_run, strict=True, verbose=True)
+        Shell.run(cmd_push_tag, dry_run=dry_run, check=True)
 
     @staticmethod
     def _create_gh_label(label: str, color_hex: str, dry_run: bool) -> None:
-        cmd = f"gh api repos/{CI.Envs.GITHUB_REPOSITORY}/labels -f name={label} -f color={color_hex}"
-        res = Shell.check(cmd, dry_run=dry_run, verbose=True)
-        if not res:
-            # not a critical error - do not fail. branch might be created already (recovery case)
-            print("WARNING: failed to create backport labels for the new branch")
+        cmd = f"gh api repos/{GITHUB_REPOSITORY}/labels -f name={label} -f color={color_hex}"
+        Shell.run(cmd, dry_run=dry_run, check=True)
 
     def push_new_release_branch(self, dry_run: bool) -> None:
+        assert (
+            self.release_branch == "master"
+        ), "New release branch can be created only for release type [new]"
         git = Git()
         version = get_version_from_repo(git=git)
-        new_release_branch = self.release_branch
+        new_release_branch = f"{version.major}.{version.minor}"
+        stable_release_type = version.get_stable_release_type()
         version_after_release = copy(version)
         version_after_release.bump()
         assert (
@@ -283,18 +261,21 @@ class ReleaseInfo:
         ), f"Unexpected current version in git, must precede [{self.version}] by one step, actual [{version.string}]"
         if dry_run:
             # remove locally created branch from prev run
-            Shell.check(
+            Shell.run(
                 f"{GIT_PREFIX} branch -l | grep -q {new_release_branch} && git branch -d {new_release_branch}"
             )
         print(
             f"Create and push new release branch [{new_release_branch}], commit [{self.commit_sha}]"
         )
-        with checkout("master"):
+        with checkout(self.release_branch):
             with checkout_new(new_release_branch):
+                pr_labels = f"--label {CI.Labels.RELEASE}"
+                if stable_release_type == VersionType.LTS:
+                    pr_labels += f" --label {CI.Labels.RELEASE_LTS}"
                 cmd_push_branch = (
                     f"{GIT_PREFIX} push --set-upstream origin {new_release_branch}"
                 )
-                Shell.check(cmd_push_branch, dry_run=dry_run, strict=True, verbose=True)
+                Shell.run(cmd_push_branch, dry_run=dry_run, check=True)
 
         print("Create and push backport tags for new release branch")
         ReleaseInfo._create_gh_label(
@@ -303,136 +284,72 @@ class ReleaseInfo:
         ReleaseInfo._create_gh_label(
             f"v{new_release_branch}-affected", "c2bfff", dry_run=dry_run
         )
-
-    def get_version_bump_branch(self):
-        return f"bump_version_{self.version}"
+        Shell.run(
+            f"""gh pr create --repo {GITHUB_REPOSITORY} --title 'Release pull request for branch {new_release_branch}'
+            --head {new_release_branch} {pr_labels}
+            --body 'This PullRequest is a part of ClickHouse release cycle. It is used by CI system only. Do not perform any changes with it.'
+            """,
+            dry_run=dry_run,
+            check=True,
+        )
 
     def update_version_and_contributors_list(self, dry_run: bool) -> None:
-        # Bump version, update contributors list, create on release branch
+        # Bump version, update contributors list, create PR
+        branch_upd_version_contributors = f"bump_version_{self.version}"
         with checkout(self.commit_sha):
             git = Git()
             version = get_version_from_repo(git=git)
-            if self.release_type == "patch":
-                assert (
-                    version.string == self.version
-                ), f"BUG: version in release info does not match version in git commit, expected [{self.version}], got [{version.string}]"
-                version.bump_patch()
-            else:
-                version.reset_tweak()
-            version.with_description(version.get_stable_release_type())
-
-        with checkout(self.release_branch):
-            update_cmake_version(version)
-            update_contributors(raise_error=True)
-            cmd_commit_version_upd = f"{GIT_PREFIX} commit '{CMAKE_PATH}' '{CONTRIBUTORS_PATH}' -m 'Update autogenerated version to {self.version} and contributors'"
-            cmd_push_branch = f"{GIT_PREFIX} push"
-            Shell.check(
-                cmd_commit_version_upd, strict=True, dry_run=dry_run, verbose=True
-            )
-            Shell.check(cmd_push_branch, strict=True, dry_run=dry_run, verbose=True)
-            if dry_run:
-                Shell.check(
-                    f"{GIT_PREFIX} diff '{CMAKE_PATH}' '{CONTRIBUTORS_PATH}'",
-                    verbose=True,
-                )
-                Shell.check(
-                    f"{GIT_PREFIX} checkout '{CMAKE_PATH}' '{CONTRIBUTORS_PATH}'",
-                    verbose=True,
-                )
-
-        # TODO: move to new GH step?
-        if self.release_type == "new":
-            print("Update version on master branch")
-            branch_upd_version_contributors = self.get_version_bump_branch()
-            with checkout(self.commit_sha):
-                git = Git()
-                version = get_version_from_repo(git=git)
+            if self.release_branch == "master":
                 version.bump()
                 version.with_description(VersionType.TESTING)
-            with checkout("master"):
-                with checkout_new(branch_upd_version_contributors):
-                    update_cmake_version(version)
-                    update_contributors(raise_error=True)
-                    cmd_commit_version_upd = f"{GIT_PREFIX} commit '{CMAKE_PATH}' '{CONTRIBUTORS_PATH}' -m 'Update autogenerated version to {self.version} and contributors'"
-                    cmd_push_branch = f"{GIT_PREFIX} push --set-upstream origin {branch_upd_version_contributors}"
-                    actor = os.getenv("GITHUB_ACTOR", "") or "me"
-                    body = f"Automatic version bump after release {self.release_tag}\n### Changelog category (leave one):\n- Not for changelog (changelog entry is not required)\n"
-                    cmd_create_pr = f"gh pr create --repo {CI.Envs.GITHUB_REPOSITORY} --title 'Update version after release' --head {branch_upd_version_contributors} --base master --body \"{body}\" --assignee {actor}"
-                    Shell.check(
-                        cmd_commit_version_upd,
-                        strict=True,
-                        dry_run=dry_run,
-                        verbose=True,
+            else:
+                version.with_description(version.get_stable_release_type())
+            assert (
+                version.string == self.version
+            ), f"BUG: version in release info does not match version in git commit, expected [{self.version}], got [{version.string}]"
+        with checkout(self.release_branch):
+            with checkout_new(branch_upd_version_contributors):
+                update_cmake_version(version)
+                update_contributors(raise_error=True)
+                cmd_commit_version_upd = f"{GIT_PREFIX} commit '{CMAKE_PATH}' '{CONTRIBUTORS_PATH}' -m 'Update autogenerated version to {self.version} and contributors'"
+                cmd_push_branch = f"{GIT_PREFIX} push --set-upstream origin {branch_upd_version_contributors}"
+                body_file = get_abs_path(".github/PULL_REQUEST_TEMPLATE.md")
+                actor = os.getenv("GITHUB_ACTOR", "") or "me"
+                cmd_create_pr = f"gh pr create --repo {GITHUB_REPOSITORY} --title 'Update version after release' --head {branch_upd_version_contributors} --base {self.release_branch} --body-file '{body_file} --label 'do not test' --assignee @{actor}"
+                Shell.run(cmd_commit_version_upd, check=True, dry_run=dry_run)
+                Shell.run(cmd_push_branch, check=True, dry_run=dry_run)
+                Shell.run(cmd_create_pr, check=True, dry_run=dry_run)
+                if dry_run:
+                    Shell.run(f"{GIT_PREFIX} diff '{CMAKE_PATH}' '{CONTRIBUTORS_PATH}'")
+                    Shell.run(
+                        f"{GIT_PREFIX} checkout '{CMAKE_PATH}' '{CONTRIBUTORS_PATH}'"
                     )
-                    Shell.check(
-                        cmd_push_branch, strict=True, dry_run=dry_run, verbose=True
+                    self.version_bump_pr = "dry-run"
+                else:
+                    self.version_bump_pr = GHActions.get_pr_url_by_branch(
+                        repo=GITHUB_REPOSITORY, branch=branch_upd_version_contributors
                     )
-                    Shell.check(
-                        cmd_create_pr, strict=True, dry_run=dry_run, verbose=True
-                    )
-                    if dry_run:
-                        Shell.check(
-                            f"{GIT_PREFIX} diff '{CMAKE_PATH}' '{CONTRIBUTORS_PATH}'",
-                            verbose=True,
-                        )
-                        Shell.check(
-                            f"{GIT_PREFIX} checkout '{CMAKE_PATH}' '{CONTRIBUTORS_PATH}'",
-                            verbose=True,
-                        )
-                        self.version_bump_pr = "dry-run"
-                    else:
-                        self.version_bump_pr = GH.get_pr_url_by_branch(
-                            branch=branch_upd_version_contributors
-                        )
-
-            # TODO: move to new GH step?
-            print("Create Release PR")
-            with checkout(self.release_branch):
-                pr_labels = f"--label {CI.Labels.RELEASE}"
-                if version.get_stable_release_type() == VersionType.LTS:
-                    pr_labels += f" --label {CI.Labels.RELEASE_LTS}"
-                Shell.check(
-                    f"""gh pr create --repo {CI.Envs.GITHUB_REPOSITORY} --title 'Release pull request for branch {self.release_branch}' \
-                                --head {self.release_branch} {pr_labels} \
-                                --body 'This PullRequest is a part of ClickHouse release cycle. It is used by CI system only. Do not perform any changes with it.'""",
-                    dry_run=dry_run,
-                    strict=True,
-                    verbose=True,
-                )
-
-    def get_change_log_branch(self):
-        return f"auto/{self.release_tag}"
 
     def update_release_info(self, dry_run: bool) -> "ReleaseInfo":
-        if self.release_type == "patch":
-            if not self.changelog_pr:
-                branch = self.get_change_log_branch()
-                if not dry_run:
-                    url = GH.get_pr_url_by_branch(branch=branch)
-                else:
-                    url = "dry-run"
-                print(f"ChangeLog PR url [{url}]")
-                self.changelog_pr = url
-            self.docker = f"docker run --rm clickhouse/clickhouse:{self.version} clickhouse --version"
-        else:
-            # new release branch - find version bump pr on a master branch
-            branch = self.get_version_bump_branch()
+        if self.release_branch != "master":
+            branch = f"auto/{release_info.release_tag}"
             if not dry_run:
-                url = GH.get_pr_url_by_branch(branch=branch)
+                url = GHActions.get_pr_url_by_branch(
+                    repo=GITHUB_REPOSITORY, branch=branch
+                )
             else:
                 url = "dry-run"
-            print(f"Version bump PR url [{url}]")
-            self.version_bump_pr = url
-
-        self.release_url = f"https://github.com/{CI.Envs.GITHUB_REPOSITORY}/releases/tag/{self.release_tag}"
-        print(f"Release url [{self.release_url}]")
-
+            print(f"ChangeLog PR url [{url}]")
+            self.changelog_pr = url
+            print(f"Release url [{url}]")
+            self.release_url = f"https://github.com/{GITHUB_REPOSITORY}/releases/tag/{self.release_tag}"
+            if self.release_progress == ReleaseProgress.COMPLETED:
+                self.docker_command = f"docker run --rm clickhouse/clickhouse:{self.version} clickhouse --version"
         self.dump()
-
         return self
 
     def create_gh_release(self, packages_files: List[str], dry_run: bool) -> None:
-        repo = CI.Envs.GITHUB_REPOSITORY
+        repo = os.getenv("GITHUB_REPOSITORY")
         assert repo
         cmds = [
             f"gh release create --repo {repo} --title 'Release {self.release_tag}' {self.release_tag}"
@@ -441,53 +358,14 @@ class ReleaseInfo:
             cmds.append(f"gh release upload {self.release_tag} {file}")
         if not dry_run:
             for cmd in cmds:
-                Shell.check(cmd, strict=True, verbose=True)
-            self.release_url = (
-                f"https://github.com/{repo}/releases/tag/{self.release_tag}"
-            )
+                Shell.run(cmd, check=True)
+            self.release_url = f"https://github.com/{GITHUB_REPOSITORY}/releases/tag/{self.release_tag}"
         else:
             print("Dry-run, would run commands:")
             print("\n  * ".join(cmds))
             self.release_url = f"dry-run"
         self.dump()
 
-    def merge_prs(self, dry_run: bool) -> None:
-        repo = CI.Envs.GITHUB_REPOSITORY
-        if self.release_type == "patch":
-            assert self.changelog_pr
-            print("Merging ChangeLog PR")
-            if dry_run:
-                changelog_pr_num = 23456
-            else:
-                changelog_pr_num = int(self.changelog_pr.split("/")[-1])
-            res = Shell.check(
-                f"gh pr merge {changelog_pr_num} --repo {repo} --merge --auto",
-                verbose=True,
-                dry_run=dry_run,
-            )
-        else:
-            if not dry_run:
-                assert not self.changelog_pr
-            res = True
-
-        if self.release_type == "new":
-            assert self.version_bump_pr
-            print("Merging Version Bump PR")
-            if dry_run:
-                version_bump_pr = 23456
-            else:
-                version_bump_pr = int(self.version_bump_pr.split("/")[-1])
-            res = res and Shell.check(
-                f"gh pr merge {version_bump_pr} --repo {repo} --merge --auto",
-                verbose=True,
-                dry_run=dry_run,
-            )
-        else:
-            if not dry_run:
-                assert not self.version_bump_pr
-
-        self.prs_merged = res
-
 
 class RepoTypes:
     RPM = "rpm"
@@ -546,7 +424,7 @@ class PackageDownloader:
         self.macos_package_files = ["clickhouse-macos", "clickhouse-macos-aarch64"]
         self.file_to_type = {}
 
-        Shell.check(f"mkdir -p {self.LOCAL_DIR}")
+        Shell.run(f"mkdir -p {self.LOCAL_DIR}")
 
         for package_type in self.PACKAGE_TYPES:
             for package in self.package_names:
@@ -596,7 +474,7 @@ class PackageDownloader:
         return res
 
     def run(self):
-        Shell.check(f"rm -rf {self.LOCAL_DIR}/*")
+        Shell.run(f"rm -rf {self.LOCAL_DIR}/*")
         for package_file in (
             self.deb_package_files + self.rpm_package_files + self.tgz_package_files
         ):
@@ -610,7 +488,7 @@ class PackageDownloader:
                 ]
             )
             self.s3.download_file(
-                bucket=CI.Envs.S3_BUILDS_BUCKET,
+                bucket=S3_BUILDS_BUCKET,
                 s3_path=s3_path,
                 local_file_path="/".join([self.LOCAL_DIR, package_file]),
             )
@@ -631,7 +509,7 @@ class PackageDownloader:
                 ]
             )
             self.s3.download_file(
-                bucket=CI.Envs.S3_BUILDS_BUCKET,
+                bucket=S3_BUILDS_BUCKET,
                 s3_path=s3_path,
                 local_file_path="/".join([self.LOCAL_DIR, destination_binary_name]),
             )
@@ -671,33 +549,33 @@ class PackageDownloader:
 
 @contextmanager
 def checkout(ref: str) -> Iterator[None]:
-    orig_ref = Shell.get_output_or_raise(f"{GIT_PREFIX} symbolic-ref --short HEAD")
+    orig_ref = Shell.run(f"{GIT_PREFIX} symbolic-ref --short HEAD", check=True)
     rollback_cmd = f"{GIT_PREFIX} checkout {orig_ref}"
     assert orig_ref
     if ref not in (orig_ref,):
-        Shell.check(f"{GIT_PREFIX} checkout {ref}", strict=True, verbose=True)
+        Shell.run(f"{GIT_PREFIX} checkout {ref}")
     try:
         yield
     except (Exception, KeyboardInterrupt) as e:
         print(f"ERROR: Exception [{e}]")
-        Shell.check(rollback_cmd, verbose=True)
+        Shell.run(rollback_cmd)
         raise
-    Shell.check(rollback_cmd, verbose=True)
+    Shell.run(rollback_cmd)
 
 
 @contextmanager
 def checkout_new(ref: str) -> Iterator[None]:
-    orig_ref = Shell.get_output_or_raise(f"{GIT_PREFIX} symbolic-ref --short HEAD")
+    orig_ref = Shell.run(f"{GIT_PREFIX} symbolic-ref --short HEAD", check=True)
     rollback_cmd = f"{GIT_PREFIX} checkout {orig_ref}"
     assert orig_ref
-    Shell.check(f"{GIT_PREFIX} checkout -b {ref}", strict=True, verbose=True)
+    Shell.run(f"{GIT_PREFIX} checkout -b {ref}", check=True)
     try:
         yield
     except (Exception, KeyboardInterrupt) as e:
         print(f"ERROR: Exception [{e}]")
-        Shell.check(rollback_cmd, verbose=True)
+        Shell.run(rollback_cmd)
         raise
-    Shell.check(rollback_cmd, verbose=True)
+    Shell.run(rollback_cmd)
 
 
 def parse_args() -> argparse.Namespace:
@@ -710,11 +588,6 @@ def parse_args() -> argparse.Namespace:
         action="store_true",
         help="Initial step to prepare info like release branch, release tag, etc.",
     )
-    parser.add_argument(
-        "--skip-tag-check",
-        action="store_true",
-        help="To skip check against latest git tag on a release branch",
-    )
     parser.add_argument(
         "--push-release-tag",
         action="store_true",
@@ -740,11 +613,6 @@ def parse_args() -> argparse.Namespace:
         action="store_true",
         help="Create GH Release object and attach all packages",
     )
-    parser.add_argument(
-        "--merge-prs",
-        action="store_true",
-        help="Merge PRs with version, changelog updates",
-    )
     parser.add_argument(
         "--post-status",
         action="store_true",
@@ -804,11 +672,7 @@ if __name__ == "__main__":
             assert (
                 args.ref and args.release_type
             ), "--ref and --release-type must be provided with --prepare-release-info"
-            release_info.prepare(
-                commit_ref=args.ref,
-                release_type=args.release_type,
-                _skip_tag_check=args.skip_tag_check,
-            )
+            release_info.prepare(commit_ref=args.ref, release_type=args.release_type)
 
     if args.download_packages:
         with ReleaseContextManager(
@@ -854,12 +718,13 @@ if __name__ == "__main__":
 
     if args.post_status:
         release_info = ReleaseInfo.from_file()
+        release_info.update_release_info(dry_run=args.dry_run)
         if release_info.is_new_release_branch():
             title = "New release branch"
         else:
             title = "New release"
         if (
-            release_info.progress_status == ReleaseProgressDescription.OK
+            release_info.progress_description == ReleaseProgressDescription.OK
             and release_info.release_progress == ReleaseProgress.COMPLETED
         ):
             title = "Completed: " + title
@@ -869,33 +734,24 @@ if __name__ == "__main__":
         else:
             title = "Failed: " + title
             CIBuddy(dry_run=args.dry_run).post_critical(
-                title,
-                dataclasses.asdict(release_info),
-                channels=[CIBuddy.Channels.ALERTS, CIBuddy.Channels.INFO],
+                title, dataclasses.asdict(release_info)
             )
 
     if args.set_progress_started:
         ri = ReleaseInfo.from_file()
         ri.release_progress = args.progress
-        ri.progress_status = ReleaseProgressDescription.FAILED
+        ri.progress_description = ReleaseProgressDescription.FAILED
         ri.dump()
         assert args.progress, "Progress step name must be provided"
 
     if args.set_progress_completed:
         ri = ReleaseInfo.from_file()
         assert (
-            ri.progress_status == ReleaseProgressDescription.FAILED
+            ri.progress_description == ReleaseProgressDescription.FAILED
         ), "Must be FAILED before set to OK"
-        ri.progress_status = ReleaseProgressDescription.OK
+        ri.progress_description = ReleaseProgressDescription.OK
         ri.dump()
 
-    if args.merge_prs:
-        with ReleaseContextManager(
-            release_progress=ReleaseProgress.MERGE_CREATED_PRS
-        ) as release_info:
-            release_info.update_release_info(dry_run=args.dry_run)
-            release_info.merge_prs(dry_run=args.dry_run)
-
     # tear down ssh
     if _ssh_agent and _key_pub:
         _ssh_agent.remove(_key_pub)
diff --git a/tests/ci/docker_images_check.py b/tests/ci/docker_images_check.py
index c8dbcd10245..786a529e0a9 100644
--- a/tests/ci/docker_images_check.py
+++ b/tests/ci/docker_images_check.py
@@ -93,7 +93,7 @@ def process_single_image(
     results = []  # type: TestResults
     for ver in versions:
         stopwatch = Stopwatch()
-        for i in range(2):
+        for i in range(5):
             success, build_log = build_and_push_one_image(
                 image, ver, additional_cache, push, from_tag
             )
diff --git a/tests/ci/docker_images_helper.py b/tests/ci/docker_images_helper.py
index f0323145cfa..6ea679e0597 100644
--- a/tests/ci/docker_images_helper.py
+++ b/tests/ci/docker_images_helper.py
@@ -3,12 +3,12 @@
 import json
 import logging
 import os
+import subprocess
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
 from env_helper import ROOT_DIR, DOCKER_TAG
 from get_robot_token import get_parameter_from_ssm
-from ci_utils import Shell
 
 IMAGES_FILE_PATH = Path("docker/images.json")
 
@@ -16,14 +16,20 @@ ImagesDict = Dict[str, dict]
 
 
 def docker_login(relogin: bool = True) -> None:
-    if relogin or not Shell.check(
-        "docker system info | grep --quiet -E 'Username|Registry'"
+    if (
+        relogin
+        or subprocess.run(  # pylint: disable=unexpected-keyword-arg
+            "docker system info | grep --quiet -E 'Username|Registry'",
+            shell=True,
+            check=False,
+        ).returncode
+        == 1
     ):
-        Shell.check(  # pylint: disable=unexpected-keyword-arg
+        subprocess.check_output(  # pylint: disable=unexpected-keyword-arg
             "docker login --username 'robotclickhouse' --password-stdin",
-            strict=True,
-            stdin_str=get_parameter_from_ssm("dockerhub_robot_password"),
+            input=get_parameter_from_ssm("dockerhub_robot_password"),
             encoding="utf-8",
+            shell=True,
         )
 
 
@@ -42,10 +48,14 @@ class DockerImage:
 def pull_image(image: DockerImage) -> DockerImage:
     try:
         logging.info("Pulling image %s - start", image)
-        Shell.check(f"docker pull {image}", strict=True)
+        subprocess.check_output(
+            f"docker pull {image}",
+            stderr=subprocess.STDOUT,
+            shell=True,
+        )
         logging.info("Pulling image %s - done", image)
     except Exception as ex:
-        logging.info("Got exception pulling docker %s", ex)
+        logging.info("Got execption pulling docker %s", ex)
         raise ex
     return image
 
diff --git a/tests/ci/docker_server.py b/tests/ci/docker_server.py
index 34439c19f0a..413c35cbebe 100644
--- a/tests/ci/docker_server.py
+++ b/tests/ci/docker_server.py
@@ -27,6 +27,7 @@ from stopwatch import Stopwatch
 from tee_popen import TeePopen
 from version_helper import (
     ClickHouseVersion,
+    get_tagged_versions,
     get_version_from_repo,
     version_arg,
 )
@@ -68,14 +69,13 @@ def parse_args() -> argparse.Namespace:
         help="sha of the commit to use packages from",
     )
     parser.add_argument(
-        "--tag-type",
+        "--release-type",
         type=str,
-        choices=("head", "release", "release-latest"),
+        choices=("auto", "latest", "major", "minor", "patch", "head"),
         default="head",
-        help="defines required tags for resulting docker image. "
-        "head - for master image (tag: head) "
-        "release - for release image (tags: XX, XX.XX, XX.XX.XX, XX.XX.XX.XX) "
-        "release-latest - for latest release image (tags: XX, XX.XX, XX.XX.XX, XX.XX.XX.XX, latest) ",
+        help="version part that will be updated when '--version' is set; "
+        "'auto' is a special case, it will get versions from github and detect the "
+        "release type (latest, major, minor or patch) automatically",
     )
     parser.add_argument(
         "--image-path",
@@ -128,9 +128,17 @@ def parse_args() -> argparse.Namespace:
 
 def retry_popen(cmd: str, log_file: Path) -> int:
     max_retries = 2
-    sleep_seconds = 10
-    retcode = -1
-    for _retry in range(max_retries):
+    for retry in range(max_retries):
+        # From time to time docker build may failed. Curl issues, or even push
+        # It will sleep progressively 5, 15, 30 and 50 seconds between retries
+        progressive_sleep = 5 * sum(i + 1 for i in range(retry))
+        if progressive_sleep:
+            logging.warning(
+                "The following command failed, sleep %s before retry: %s",
+                progressive_sleep,
+                cmd,
+            )
+            time.sleep(progressive_sleep)
         with TeePopen(
             cmd,
             log_file=log_file,
@@ -138,46 +146,78 @@ def retry_popen(cmd: str, log_file: Path) -> int:
             retcode = process.wait()
             if retcode == 0:
                 return 0
-            else:
-                # From time to time docker build may failed. Curl issues, or even push
-                logging.error(
-                    "The following command failed, sleep %s before retry: %s",
-                    sleep_seconds,
-                    cmd,
-                )
-                time.sleep(sleep_seconds)
+
     return retcode
 
 
-def gen_tags(version: ClickHouseVersion, tag_type: str) -> List[str]:
+def auto_release_type(version: ClickHouseVersion, release_type: str) -> str:
+    if release_type != "auto":
+        return release_type
+
+    git_versions = get_tagged_versions()
+    reference_version = git_versions[0]
+    for i in reversed(range(len(git_versions))):
+        if git_versions[i] <= version:
+            if i == len(git_versions) - 1:
+                return "latest"
+            reference_version = git_versions[i + 1]
+            break
+
+    if version.major < reference_version.major:
+        return "major"
+    if version.minor < reference_version.minor:
+        return "minor"
+    if version.patch < reference_version.patch:
+        return "patch"
+
+    raise ValueError(
+        "Release type 'tweak' is not supported for "
+        f"{version.string} < {reference_version.string}"
+    )
+
+
+def gen_tags(version: ClickHouseVersion, release_type: str) -> List[str]:
     """
-    @tag_type release-latest, @version 22.2.2.2:
+    22.2.2.2 + latest:
     - latest
     - 22
     - 22.2
     - 22.2.2
     - 22.2.2.2
-    @tag_type release, @version 22.2.2.2:
+    22.2.2.2 + major:
     - 22
     - 22.2
     - 22.2.2
     - 22.2.2.2
-    @tag_type head:
+    22.2.2.2 + minor:
+    - 22.2
+    - 22.2.2
+    - 22.2.2.2
+    22.2.2.2 + patch:
+    - 22.2.2
+    - 22.2.2.2
+    22.2.2.2 + head:
     - head
     """
     parts = version.string.split(".")
     tags = []
-    if tag_type == "release-latest":
-        tags.append("latest")
+    if release_type == "latest":
+        tags.append(release_type)
         for i in range(len(parts)):
             tags.append(".".join(parts[: i + 1]))
-    elif tag_type == "head":
-        tags.append(tag_type)
-    elif tag_type == "release":
+    elif release_type == "major":
         for i in range(len(parts)):
             tags.append(".".join(parts[: i + 1]))
+    elif release_type == "minor":
+        for i in range(1, len(parts)):
+            tags.append(".".join(parts[: i + 1]))
+    elif release_type == "patch":
+        for i in range(2, len(parts)):
+            tags.append(".".join(parts[: i + 1]))
+    elif release_type == "head":
+        tags.append(release_type)
     else:
-        assert False, f"Invalid release type [{tag_type}]"
+        raise ValueError(f"{release_type} is not valid release part")
     return tags
 
 
@@ -331,11 +371,27 @@ def main():
         push = True
 
     image = DockerImageData(image_path, image_repo, False)
-    tags = gen_tags(args.version, args.tag_type)
+    args.release_type = auto_release_type(args.version, args.release_type)
+    tags = gen_tags(args.version, args.release_type)
     repo_urls = {}
     direct_urls: Dict[str, List[str]] = {}
 
     for arch, build_name in zip(ARCH, ("package_release", "package_aarch64")):
+        if args.bucket_prefix:
+            assert not args.allow_build_reuse
+            repo_urls[arch] = f"{args.bucket_prefix}/{build_name}"
+        elif args.sha:
+            # CreateRelease workflow only. TODO
+            version = args.version
+            repo_urls[arch] = (
+                f"{S3_DOWNLOAD}/{S3_BUILDS_BUCKET}/"
+                f"{version.major}.{version.minor}/{args.sha}/{build_name}"
+            )
+        else:
+            # In all other cases urls must be fetched from build reports. TODO: script needs refactoring
+            repo_urls[arch] = ""
+            assert args.allow_build_reuse
+
         if args.allow_build_reuse:
             # read s3 urls from pre-downloaded build reports
             if "clickhouse-server" in image_repo:
@@ -357,21 +413,6 @@ def main():
                 for url in urls
                 if any(package in url for package in PACKAGES) and "-dbg" not in url
             ]
-        elif args.bucket_prefix:
-            assert not args.allow_build_reuse
-            repo_urls[arch] = f"{args.bucket_prefix}/{build_name}"
-            print(f"Bucket prefix is set: Fetching packages from [{repo_urls}]")
-        elif args.sha:
-            version = args.version
-            repo_urls[arch] = (
-                f"{S3_DOWNLOAD}/{S3_BUILDS_BUCKET}/"
-                f"{version.major}.{version.minor}/{args.sha}/{build_name}"
-            )
-            print(f"Fetching packages from [{repo_urls}]")
-        else:
-            assert (
-                False
-            ), "--sha, --bucket_prefix or --allow-build-reuse (to fetch packages from build report) must be provided"
 
     if push:
         docker_login()
diff --git a/tests/ci/fast_test_check.py b/tests/ci/fast_test_check.py
index 55eefcf9714..ed727dd3659 100644
--- a/tests/ci/fast_test_check.py
+++ b/tests/ci/fast_test_check.py
@@ -31,14 +31,15 @@ def get_fasttest_cmd(
         "--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=/repo "
+        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}:/repo "
-        f"--volume={output_path}:/test_output {image} /repo/tests/docker_scripts/fasttest_runner.sh"
+        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}"
     )
 
 
diff --git a/tests/ci/functional_test_check.py b/tests/ci/functional_test_check.py
index ce2ead59d1a..66db082677f 100644
--- a/tests/ci/functional_test_check.py
+++ b/tests/ci/functional_test_check.py
@@ -5,11 +5,10 @@ import csv
 import logging
 import os
 import re
-import signal
 import subprocess
 import sys
 from pathlib import Path
-from typing import List, Tuple, Optional
+from typing import List, Tuple
 
 from build_download_helper import download_all_deb_packages
 from clickhouse_helper import CiLogsCredentials
@@ -26,12 +25,11 @@ from report import (
     TestResults,
     read_test_results,
     FAILURE,
-    TestResult,
 )
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
 from ci_config import CI
-from ci_utils import Utils, Shell
+from ci_utils import Utils
 
 NO_CHANGES_MSG = "Nothing to run"
 
@@ -115,28 +113,29 @@ def get_run_command(
 
     if flaky_check:
         envs.append("-e NUM_TRIES=50")
+        envs.append("-e MAX_RUN_TIME=2800")
 
     envs += [f"-e {e}" for e in additional_envs]
 
     env_str = " ".join(envs)
-
-    if "stateful" in check_name.lower():
-        run_script = "/repo/tests/docker_scripts/stateful_runner.sh"
-    elif "stateless" in check_name.lower():
-        run_script = "/repo/tests/docker_scripts/stateless_runner.sh"
-    else:
-        assert False
+    volume_with_broken_test = (
+        f"--volume={repo_path}/tests/analyzer_tech_debt.txt:/analyzer_tech_debt.txt "
+        if "analyzer" not in check_name
+        else ""
+    )
 
     return (
-        f"docker run --rm --name func-tester --volume={builds_path}:/package_folder "
+        f"docker run --volume={builds_path}:/package_folder "
         # For dmesg and sysctl
         "--privileged "
-        f"{ci_logs_args} "
-        f"--volume={repo_path}:/repo "
+        f"{ci_logs_args}"
+        f"--volume={repo_path}/tests:/usr/share/clickhouse-test "
+        f"--volume={repo_path}/utils/grpc-client:/usr/share/clickhouse-utils/grpc-client "
+        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} {run_script}"
+        f"--cap-add=SYS_PTRACE {env_str} {additional_options_str} {image}"
     )
 
 
@@ -167,7 +166,6 @@ def _get_statless_tests_to_run(pr_info: PRInfo) -> List[str]:
 
 
 def process_results(
-    ret_code: int,
     result_directory: Path,
     server_log_path: Path,
 ) -> Tuple[StatusType, str, TestResults, List[Path]]:
@@ -194,9 +192,6 @@ def process_results(
         logging.info("Files in result folder %s", os.listdir(result_directory))
         return ERROR, "Invalid check_status.tsv", test_results, additional_files
     state, description = status[0][0], status[0][1]
-    if ret_code != 0:
-        state = ERROR
-        description = f"Job failed, exit code: {ret_code}. " + description
 
     try:
         results_path = result_directory / "test_results.tsv"
@@ -238,19 +233,7 @@ def parse_args():
     return parser.parse_args()
 
 
-test_process = None  # type: Optional[TeePopen]
-timeout_expired = False
-
-
-def handle_sigterm(signum, _frame):
-    print(f"WARNING: Received signal {signum}")
-    global timeout_expired
-    timeout_expired = True
-    Shell.check(f"docker exec func-tester pkill -f clickhouse-test", verbose=True)
-
-
 def main():
-    signal.signal(signal.SIGTERM, handle_sigterm)
     logging.basicConfig(level=logging.INFO)
     for handler in logging.root.handlers:
         # pylint: disable=protected-access
@@ -338,13 +321,11 @@ def main():
         logging.info("Going to run func tests: %s", run_command)
 
         with TeePopen(run_command, run_log_path) as process:
-            global test_process
-            test_process = process
             retcode = process.wait()
             if retcode == 0:
                 logging.info("Run successfully")
             else:
-                logging.info("Run failed, exit code %s", retcode)
+                logging.info("Run failed")
 
         try:
             subprocess.check_call(
@@ -358,15 +339,8 @@ def main():
         ci_logs_credentials.clean_ci_logs_from_credentials(run_log_path)
 
         state, description, test_results, additional_logs = process_results(
-            retcode, result_path, server_log_path
+            result_path, server_log_path
         )
-        if timeout_expired:
-            description = "Timeout expired"
-            state = FAILURE
-            test_results.insert(
-                0, TestResult.create_check_timeout_expired(stopwatch.duration_seconds)
-            )
-
     else:
         print(
             "This is validate bugfix or flaky check run, but no changes test to run - skip with success"
diff --git a/tests/ci/integration_tests_runner.py b/tests/ci/integration_tests_runner.py
index 6405492cd9c..501ac882f6f 100755
--- a/tests/ci/integration_tests_runner.py
+++ b/tests/ci/integration_tests_runner.py
@@ -9,7 +9,6 @@ import random
 import re
 import shlex
 import shutil
-import signal
 import string
 import subprocess
 import sys
@@ -17,13 +16,10 @@ import time
 import zlib  # for crc32
 from collections import defaultdict
 from itertools import chain
-from typing import Any, Dict, Optional
+from typing import Any, Dict
 
 from env_helper import IS_CI
 from integration_test_images import IMAGES
-from tee_popen import TeePopen
-from report import JOB_TIMEOUT_TEST_NAME
-from stopwatch import Stopwatch
 
 MAX_RETRY = 1
 NUM_WORKERS = 5
@@ -33,8 +29,7 @@ CLICKHOUSE_BINARY_PATH = "usr/bin/clickhouse"
 CLICKHOUSE_ODBC_BRIDGE_BINARY_PATH = "usr/bin/clickhouse-odbc-bridge"
 CLICKHOUSE_LIBRARY_BRIDGE_BINARY_PATH = "usr/bin/clickhouse-library-bridge"
 
-FLAKY_TRIES_COUNT = 3  # run whole pytest several times
-FLAKY_REPEAT_COUNT = 5  # runs test case in single module several times
+FLAKY_TRIES_COUNT = 10
 MAX_TIME_SECONDS = 3600
 
 MAX_TIME_IN_SANDBOX = 20 * 60  # 20 minutes
@@ -360,13 +355,20 @@ 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)
-                    cmd = f"dpkg -x {full_path} ."
-                    logging.info("Executing installation cmd %s", cmd)
-                    with TeePopen(cmd, log_file=log_path) as proc:
-                        if proc.wait() == 0:
-                            logging.info("Installation of %s successfull", full_path)
-                        else:
-                            raise RuntimeError(f"Installation of {full_path} failed")
+                    with open(log_path, "w", encoding="utf-8") as log:
+                        cmd = f"dpkg -x {full_path} ."
+                        logging.info("Executing installation cmd %s", cmd)
+                        with subprocess.Popen(
+                            cmd, shell=True, stderr=log, stdout=log
+                        ) 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 FileNotFoundError(f"Package with {package} not found")
@@ -566,7 +568,6 @@ class ClickhouseIntegrationTestsRunner:
         tests_in_group,
         num_tries,
         num_workers,
-        repeat_count,
     ):
         try:
             return self.run_test_group(
@@ -575,7 +576,6 @@ class ClickhouseIntegrationTestsRunner:
                 tests_in_group,
                 num_tries,
                 num_workers,
-                repeat_count,
             )
         except Exception as e:
             logging.info("Failed to run %s:\n%s", test_group, e)
@@ -598,7 +598,6 @@ class ClickhouseIntegrationTestsRunner:
         tests_in_group,
         num_tries,
         num_workers,
-        repeat_count,
     ):
         counters = {
             "ERROR": [],
@@ -624,9 +623,6 @@ class ClickhouseIntegrationTestsRunner:
         test_data_dirs = {}
 
         for i in range(num_tries):
-            if timeout_expired:
-                print("Timeout expired - break test group execution")
-                break
             logging.info("Running test group %s for the %s retry", test_group, i)
             clear_ip_tables_and_restart_daemons()
 
@@ -643,7 +639,6 @@ class ClickhouseIntegrationTestsRunner:
 
             test_cmd = " ".join([shlex.quote(test) for test in sorted(test_names)])
             parallel_cmd = f" --parallel {num_workers} " if num_workers > 0 else ""
-            repeat_cmd = f" --count {repeat_count} " if repeat_count > 0 else ""
             # -r -- show extra test summary:
             # -f -- (f)ailed
             # -E -- (E)rror
@@ -652,7 +647,7 @@ class ClickhouseIntegrationTestsRunner:
             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} {repeat_cmd} -- -rfEps --run-id={i} "
+                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}"
             )
@@ -663,8 +658,6 @@ class ClickhouseIntegrationTestsRunner:
                 logging.info("Executing cmd: %s", cmd)
                 # ignore retcode, since it meaningful due to pipe to tee
                 with subprocess.Popen(cmd, shell=True, stderr=log, stdout=log) as proc:
-                    global runner_subprocess
-                    runner_subprocess = proc
                     proc.wait()
 
             extra_logs_names = [log_basename]
@@ -782,71 +775,39 @@ class ClickhouseIntegrationTestsRunner:
         logging.info("Found '%s' tests to run", " ".join(tests_to_run))
         result_state = "success"
         description_prefix = "No flaky tests: "
+        start = time.time()
         logging.info("Starting check with retries")
         final_retry = 0
-        counters = {
-            "ERROR": [],
-            "PASSED": [],
-            "FAILED": [],
-            "SKIPPED": [],
-            "BROKEN": [],
-            "NOT_FAILED": [],
-        }  # type: Dict
-        tests_times = defaultdict(float)  # type: Dict
-        tests_log_paths = defaultdict(list)
-        id_counter = 0
-        for test_to_run in tests_to_run:
-            tries_num = 1 if should_fail else FLAKY_TRIES_COUNT
-            for i in range(tries_num):
-                if timeout_expired:
-                    print("Timeout expired - break flaky check execution")
+        logs = []
+        tires_num = 1 if should_fail else FLAKY_TRIES_COUNT
+        for i in range(tires_num):
+            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
+            )
+            logs += log_paths
+            if counters["FAILED"]:
+                logging.info("Found failed tests: %s", " ".join(counters["FAILED"]))
+                description_prefix = "Failed tests found: "
+                result_state = "failure"
+                if not should_fail:
                     break
-                final_retry += 1
-                logging.info("Running tests for the %s time", i)
-                group_counters, group_test_times, log_paths = self.try_run_test_group(
-                    repo_path,
-                    f"bugfix_{id_counter}" if should_fail else f"flaky{id_counter}",
-                    [test_to_run],
-                    1,
-                    1,
-                    FLAKY_REPEAT_COUNT,
-                )
-                id_counter = id_counter + 1
-                for counter, value in group_counters.items():
-                    logging.info(
-                        "Tests from group %s stats, %s count %s",
-                        test_to_run,
-                        counter,
-                        len(value),
-                    )
-                    counters[counter] += value
-
-                for test_name, test_time in group_test_times.items():
-                    tests_times[test_name] = test_time
-                    tests_log_paths[test_name] = log_paths
-                if not should_fail and (
-                    group_counters["FAILED"] or group_counters["ERROR"]
-                ):
-                    logging.info(
-                        "Unexpected failure in group %s. Fail fast for current group",
-                        test_to_run,
-                    )
+            if counters["ERROR"]:
+                description_prefix = "Failed tests found: "
+                logging.info("Found error tests: %s", " ".join(counters["ERROR"]))
+                # NOTE "error" result state will restart the whole test task,
+                # so we use "failure" here
+                result_state = "failure"
+                if not should_fail:
                     break
-
-        if counters["FAILED"]:
-            logging.info("Found failed tests: %s", " ".join(counters["FAILED"]))
-            description_prefix = "Failed tests found: "
-            result_state = "failure"
-        if counters["ERROR"]:
-            description_prefix = "Failed tests found: "
-            logging.info("Found error tests: %s", " ".join(counters["ERROR"]))
-            # NOTE "error" result state will restart the whole test task,
-            # so we use "failure" here
-            result_state = "failure"
-        logging.info("Try is OK, all tests passed, going to clear env")
-        clear_ip_tables_and_restart_daemons()
-        logging.info("And going to sleep for some time")
-        time.sleep(5)
+            logging.info("Try is OK, all tests passed, going to clear env")
+            clear_ip_tables_and_restart_daemons()
+            logging.info("And going to sleep for some time")
+            if time.time() - start > MAX_TIME_SECONDS:
+                logging.info("Timeout reached, going to finish flaky check")
+                break
+            time.sleep(5)
 
         test_result = []
         for state in ("ERROR", "FAILED", "PASSED", "SKIPPED"):
@@ -857,10 +818,13 @@ class ClickhouseIntegrationTestsRunner:
             else:
                 text_state = state
             test_result += [
-                (c, text_state, f"{tests_times[c]:.2f}", tests_log_paths[c])
+                (
+                    c + " (✕" + str(final_retry) + ")",
+                    text_state,
+                    f"{tests_times[c]:.2f}",
+                )
                 for c in counters[state]
             ]
-
         status_text = description_prefix + ", ".join(
             [
                 str(n).lower().replace("failed", "fail") + ": " + str(len(c))
@@ -868,50 +832,25 @@ class ClickhouseIntegrationTestsRunner:
             ]
         )
 
-        return result_state, status_text, test_result, tests_log_paths
+        return result_state, status_text, test_result, logs
 
     def run_impl(self, repo_path, build_path):
-        stopwatch = Stopwatch()
         if self.flaky_check or self.bugfix_validate_check:
-            result_state, status_text, test_result, tests_log_paths = (
-                self.run_flaky_check(
-                    repo_path, build_path, should_fail=self.bugfix_validate_check
-                )
-            )
-        else:
-            result_state, status_text, test_result, tests_log_paths = (
-                self.run_normal_check(build_path, repo_path)
+            return self.run_flaky_check(
+                repo_path, build_path, should_fail=self.bugfix_validate_check
             )
 
-        if self.soft_deadline_time < time.time():
-            status_text = "Timeout, " + status_text
-            result_state = "failure"
-
-        if timeout_expired:
-            logging.error(
-                "Job killed by external timeout signal - setting status to failure!"
-            )
-            status_text = "Job timeout expired, " + status_text
-            result_state = "failure"
-            # add mock test case to make timeout visible in job report and in ci db
-            test_result.insert(
-                0, (JOB_TIMEOUT_TEST_NAME, "FAIL", f"{stopwatch.duration_seconds}", "")
-            )
-
-        if "(memory)" in self.params["context_name"]:
-            result_state = "success"
-
-        return result_state, status_text, test_result, tests_log_paths
-
-    def run_normal_check(self, build_path, repo_path):
         self._install_clickhouse(build_path)
+
         logging.info("Pulling images")
         self._pre_pull_images(repo_path)
+
         logging.info(
             "Dump iptables before run %s",
             subprocess.check_output("sudo iptables -nvL", shell=True),
         )
         all_tests = self._get_all_tests(repo_path)
+
         if self.run_by_hash_total != 0:
             grouped_tests = self.group_test_by_file(all_tests)
             all_filtered_by_hash_tests = []
@@ -919,6 +858,7 @@ class ClickhouseIntegrationTestsRunner:
                 if stringhash(group) % self.run_by_hash_total == self.run_by_hash_num:
                     all_filtered_by_hash_tests += tests_in_group
             all_tests = all_filtered_by_hash_tests
+
         parallel_skip_tests = self._get_parallel_tests_skip_list(repo_path)
         logging.info(
             "Found %s tests first 3 %s", len(all_tests), " ".join(all_tests[:3])
@@ -950,12 +890,14 @@ class ClickhouseIntegrationTestsRunner:
             len(not_found_tests),
             " ".join(not_found_tests[:3]),
         )
+
         grouped_tests = self.group_test_by_file(filtered_sequential_tests)
         i = 0
         for par_group in chunks(filtered_parallel_tests, PARALLEL_GROUP_SIZE):
             grouped_tests[f"parallel{i}"] = par_group
             i += 1
         logging.info("Found %s tests groups", len(grouped_tests))
+
         counters = {
             "ERROR": [],
             "PASSED": [],
@@ -966,18 +908,18 @@ class ClickhouseIntegrationTestsRunner:
         }  # type: Dict
         tests_times = defaultdict(float)
         tests_log_paths = defaultdict(list)
+
         items_to_run = list(grouped_tests.items())
+
         logging.info("Total test groups %s", len(items_to_run))
         if self.shuffle_test_groups():
             logging.info("Shuffling test groups")
             random.shuffle(items_to_run)
+
         for group, tests in items_to_run:
-            if timeout_expired:
-                print("Timeout expired - break tests execution")
-                break
             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, 0
+                repo_path, group, tests, MAX_RETRY, NUM_WORKERS
             )
             total_tests = 0
             for counter, value in group_counters.items():
@@ -998,6 +940,7 @@ class ClickhouseIntegrationTestsRunner:
             if len(counters["FAILED"]) + len(counters["ERROR"]) >= 20:
                 logging.info("Collected more than 20 failed/error tests, stopping")
                 break
+
         if counters["FAILED"] or counters["ERROR"]:
             logging.info(
                 "Overall status failure, because we have tests in FAILED or ERROR state"
@@ -1006,6 +949,7 @@ class ClickhouseIntegrationTestsRunner:
         else:
             logging.info("Overall success!")
             result_state = "success"
+
         test_result = []
         for state in (
             "ERROR",
@@ -1025,14 +969,22 @@ class ClickhouseIntegrationTestsRunner:
                 (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 = f"fail: {failed_sum}, passed: {len(counters['PASSED'])}"
 
+        if self.soft_deadline_time < time.time():
+            status_text = "Timeout, " + status_text
+            result_state = "failure"
+
         if not counters or sum(len(counter) for counter in counters.values()) == 0:
             status_text = "No tests found for some reason! It's a bug"
             result_state = "failure"
 
-        return result_state, status_text, test_result, tests_log_paths
+        if "(memory)" in self.params["context_name"]:
+            result_state = "success"
+
+        return result_state, status_text, test_result, []
 
 
 def write_results(results_file, status_file, results, status):
@@ -1045,7 +997,6 @@ def write_results(results_file, status_file, results, status):
 
 
 def run():
-    signal.signal(signal.SIGTERM, handle_sigterm)
     logging.basicConfig(level=logging.INFO, format="%(asctime)s %(message)s")
 
     repo_path = os.environ.get("CLICKHOUSE_TESTS_REPO_PATH")
@@ -1065,9 +1016,7 @@ def run():
         logging.info("Clearing dmesg before run")
         subprocess.check_call("sudo -E dmesg --clear", shell=True)
 
-    state, description, test_results, _test_log_paths = runner.run_impl(
-        repo_path, build_path
-    )
+    state, description, test_results, _ = runner.run_impl(repo_path, build_path)
     logging.info("Tests finished")
 
     if IS_CI:
@@ -1082,17 +1031,5 @@ def run():
     logging.info("Result written")
 
 
-timeout_expired = False
-runner_subprocess = None  # type:Optional[subprocess.Popen]
-
-
-def handle_sigterm(signum, _frame):
-    print(f"WARNING: Received signal {signum}")
-    global timeout_expired
-    timeout_expired = True
-    if runner_subprocess:
-        runner_subprocess.send_signal(signal.SIGTERM)
-
-
 if __name__ == "__main__":
     run()
diff --git a/tests/ci/jepsen_check.py b/tests/ci/jepsen_check.py
index 998a97273ae..f91a3f080c0 100644
--- a/tests/ci/jepsen_check.py
+++ b/tests/ci/jepsen_check.py
@@ -9,13 +9,16 @@ from pathlib import Path
 from typing import Any, List
 
 import boto3  # type: ignore
+import requests
 
 from build_download_helper import (
+    download_build_with_progress,
     read_build_urls,
 )
 from compress_files import compress_fast
-from env_helper import REPO_COPY, REPORT_PATH, TEMP_PATH
+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 FAILURE, SUCCESS, JobReport, TestResult, TestResults
 from ssh import SSHKey
@@ -29,10 +32,11 @@ KEEPER_DESIRED_INSTANCE_COUNT = 3
 SERVER_DESIRED_INSTANCE_COUNT = 4
 
 KEEPER_IMAGE_NAME = "clickhouse/keeper-jepsen-test"
-KEEPER_CHECK_NAME = CI.JobNames.JEPSEN_KEEPER
+KEEPER_CHECK_NAME = "ClickHouse Keeper Jepsen"
 
 SERVER_IMAGE_NAME = "clickhouse/server-jepsen-test"
-SERVER_CHECK_NAME = CI.JobNames.JEPSEN_SERVER
+SERVER_CHECK_NAME = "ClickHouse Server Jepsen"
+
 
 SUCCESSFUL_TESTS_ANCHOR = "# Successful tests"
 INTERMINATE_TESTS_ANCHOR = "# Indeterminate tests"
@@ -197,14 +201,36 @@ def main():
     # always use latest
     docker_image = KEEPER_IMAGE_NAME if args.program == "keeper" else SERVER_IMAGE_NAME
 
-    # binary_release assumed to be always ready on the master as it's part of the merge queue workflow
-    build_name = CI.get_required_build_name(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"
+    if pr_info.is_scheduled or pr_info.is_dispatched:
+        # get latest clickhouse 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 = CI.get_required_build_name(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":
@@ -241,10 +267,7 @@ def main():
     additional_data = []
     try:
         test_result = _parse_jepsen_output(jepsen_log_path)
-        if len(test_result) == 0:
-            status = FAILURE
-            description = "No test results found"
-        elif any(r.status == "FAIL" for r in test_result):
+        if any(r.status == "FAIL" for r in test_result):
             status = FAILURE
             description = "Found invalid analysis (ﾉಥ益ಥ）ﾉ ┻━┻"
 
diff --git a/tests/ci/libfuzzer_test_check.py b/tests/ci/libfuzzer_test_check.py
index 8f19dd7d023..d9e33229932 100644
--- a/tests/ci/libfuzzer_test_check.py
+++ b/tests/ci/libfuzzer_test_check.py
@@ -75,7 +75,7 @@ def get_run_command(
         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} "
-        "python3 /usr/share/clickhouse-test/fuzz/runner.py"
+        "python3 ./utils/runner.py"
     )
 
 
diff --git a/tests/ci/merge_pr.py b/tests/ci/merge_pr.py
index ddeb76adf7e..13c7537a84b 100644
--- a/tests/ci/merge_pr.py
+++ b/tests/ci/merge_pr.py
@@ -23,7 +23,7 @@ from commit_status_helper import (
 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
+from report import SUCCESS, FAILURE
 from env_helper import GITHUB_UPSTREAM_REPOSITORY, GITHUB_REPOSITORY
 from synchronizer_utils import SYNC_BRANCH_PREFIX
 from ci_config import CI
@@ -248,27 +248,23 @@ def main():
     repo = gh.get_repo(args.repo)
 
     if args.set_ci_status:
-        CI.GH.print_workflow_results()
         # set Mergeable check status and exit
+        assert args.wf_status in (FAILURE, SUCCESS)
         commit = get_commit(gh, args.pr_info.sha)
         statuses = get_commit_filtered_statuses(commit)
 
         has_failed_statuses = False
+        has_native_failed_status = False
         for status in statuses:
             print(f"Check status [{status.context}], [{status.state}]")
-            if (
-                CI.is_required(status.context)
-                and status.state != SUCCESS
-                and status.context != CI.StatusNames.SYNC
-            ):
-                print(
-                    f"WARNING: Not success status [{status.context}], [{status.state}]"
-                )
+            if CI.is_required(status.context) and status.state != SUCCESS:
+                print(f"WARNING: Failed status [{status.context}], [{status.state}]")
                 has_failed_statuses = True
+                if status.context != CI.StatusNames.SYNC:
+                    has_native_failed_status = True
 
-        workflow_ok = CI.is_workflow_ok()
-        if workflow_ok or has_failed_statuses:
-            # set Mergeable Check if workflow is successful (green)
+        if args.wf_status == SUCCESS or has_failed_statuses:
+            # set Mergeable check if workflow is successful (green)
             # or if we have GH statuses with failures (red)
             #    to avoid false-green on a died runner
             state = trigger_mergeable_check(
@@ -287,7 +283,7 @@ def main():
             print(
                 "Workflow failed but no failed statuses found (died runner?) - cannot set Mergeable Check status"
             )
-        if workflow_ok and not has_failed_statuses:
+        if args.wf_status == SUCCESS and not has_native_failed_status:
             sys.exit(0)
         else:
             sys.exit(1)
diff --git a/tests/ci/pr_info.py b/tests/ci/pr_info.py
index d3c4ffb1e68..59806a2a8fa 100644
--- a/tests/ci/pr_info.py
+++ b/tests/ci/pr_info.py
@@ -2,14 +2,12 @@
 import json
 import logging
 import os
-import re
 from typing import Dict, List, Set, Union
 from urllib.parse import quote
 
 from unidiff import PatchSet  # type: ignore
 
 from build_download_helper import get_gh_api
-from ci_config import Labels
 from env_helper import (
     GITHUB_EVENT_PATH,
     GITHUB_REPOSITORY,
@@ -17,6 +15,7 @@ from env_helper import (
     GITHUB_SERVER_URL,
     GITHUB_UPSTREAM_REPOSITORY,
 )
+from ci_config import Labels
 from get_robot_token import get_best_robot_token
 from github_helper import GitHub
 
@@ -329,13 +328,7 @@ class PRInfo:
 
     @property
     def is_release(self) -> bool:
-        return self.is_master or (
-            self.is_push_event
-            and (
-                bool(re.match(r"^2[1-9]\.[1-9][0-9]*$", self.head_ref))
-                or bool(re.match(r"^release/2[1-9]\.[1-9][0-9]*$", self.head_ref))
-            )
-        )
+        return self.number == 0 and not self.is_merge_queue
 
     @property
     def is_pr(self):
@@ -344,10 +337,6 @@ class PRInfo:
             return True
         return False
 
-    @property
-    def is_push_event(self) -> bool:
-        return self.event_type == EventType.PUSH
-
     @property
     def is_scheduled(self) -> bool:
         return self.event_type == EventType.SCHEDULE
@@ -459,18 +448,16 @@ class PRInfo:
         sync_repo = gh.get_repo(GITHUB_REPOSITORY)
         sync_pr = sync_repo.get_pull(self.number)
         # Find the commit that is in both repos, upstream and cloud
-        # Do not ever use `reversed` here, otherwise the list of commits is not full
-        sync_commits = list(sync_pr.get_commits())
-        upstream_commits = list(upstream_pr.get_commits())
+        sync_commits = sync_pr.get_commits().reversed
+        upstream_commits = upstream_pr.get_commits().reversed
         # Github objects are compared by _url attribute. We can't compare them directly and
         # should compare commits by SHA1
         upstream_shas = [c.sha for c in upstream_commits]
         logging.info("Commits in upstream PR:\n %s", ", ".join(upstream_shas))
         sync_shas = [c.sha for c in sync_commits]
-        logging.info("Commits in sync PR:\n %s", ", ".join(sync_shas))
+        logging.info("Commits in sync PR:\n %s", ", ".join(reversed(sync_shas)))
 
-        # find latest synced commit, search from the latest
-        upstream_commits.reverse()
+        # find latest synced commit
         last_synced_upstream_commit = None
         for commit in upstream_commits:
             if commit.sha in sync_shas:
diff --git a/tests/ci/release.py b/tests/ci/release.py
index b26d6205f3b..2de20d00a00 100755
--- a/tests/ci/release.py
+++ b/tests/ci/release.py
@@ -689,5 +689,4 @@ def main():
 
 
 if __name__ == "__main__":
-    assert False, "Script Deprecated, ask ci team for help"
     main()
diff --git a/tests/ci/report.py b/tests/ci/report.py
index a1b25b994c7..77043dfc8be 100644
--- a/tests/ci/report.py
+++ b/tests/ci/report.py
@@ -22,6 +22,7 @@ from typing import (
 
 from build_download_helper import get_gh_api
 from ci_config import CI
+from ci_utils import normalize_string
 from env_helper import REPORT_PATH, GITHUB_WORKSPACE
 
 logger = logging.getLogger(__name__)
@@ -124,7 +125,7 @@ html {{ min-height: 100%; font-family: "DejaVu Sans", "Noto Sans", Arial, sans-s
 h1 {{ margin-left: 10px; }}
 th, td {{ padding: 5px 10px 5px 10px; text-align: left; vertical-align: top; line-height: 1.5; border: 1px solid var(--table-border-color); }}
 td {{ background: var(--td-background); }}
-th {{ background: var(--th-background); white-space: nowrap; }}
+th {{ background: var(--th-background); }}
 a {{ color: var(--link-color); text-decoration: none; }}
 a:hover, a:active {{ color: var(--link-hover-color); text-decoration: none; }}
 table {{ box-shadow: 0 8px 25px -5px rgba(0, 0, 0, var(--shadow-intensity)); border-collapse: collapse; border-spacing: 0; }}
@@ -134,7 +135,6 @@ th {{ cursor: pointer; }}
 tr:hover {{ filter: var(--tr-hover-filter); }}
 .expandable {{ cursor: pointer; }}
 .expandable-content {{ display: none; }}
-pre {{ white-space: pre-wrap; }}
 #fish {{ display: none; float: right; position: relative; top: -20em; right: 2vw; margin-bottom: -20em; width: 30vw; filter: brightness(7%); z-index: -1; }}
 
 .themes {{
@@ -249,7 +249,6 @@ JOB_REPORT_FILE = Path(GITHUB_WORKSPACE) / "job_report.json"
 
 JOB_STARTED_TEST_NAME = "STARTED"
 JOB_FINISHED_TEST_NAME = "COMPLETED"
-JOB_TIMEOUT_TEST_NAME = "Job Timeout Expired"
 
 
 @dataclass
@@ -278,8 +277,8 @@ class TestResult:
             self.log_files.append(log_path)
 
     @staticmethod
-    def create_check_timeout_expired(duration: Optional[float] = None) -> "TestResult":
-        return TestResult(JOB_TIMEOUT_TEST_NAME, "FAIL", time=duration)
+    def create_check_timeout_expired(timeout: float) -> "TestResult":
+        return TestResult("Check timeout expired", "FAIL", timeout)
 
 
 TestResults = List[TestResult]
@@ -293,9 +292,9 @@ class JobReport:
     start_time: str
     duration: float
     additional_files: Union[Sequence[str], Sequence[Path]]
-    # ClickHouse version, build job only
+    # clickhouse version, build job only
     version: str = ""
-    # check_name to be set in commit status, set it if it differs from the job name
+    # 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] = ""
@@ -304,7 +303,7 @@ class JobReport:
     # indicates that this is not real job report but report for the job that was skipped by rerun check
     job_skipped: bool = False
     # indicates that report generated by CI script in order to check later if job was killed before real report is generated
-    dummy: bool = False
+    pre_report: bool = False
     exit_code: int = -1
 
     @staticmethod
@@ -312,7 +311,7 @@ class JobReport:
         return datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
 
     @classmethod
-    def create_dummy(cls, status: str, job_skipped: bool) -> "JobReport":
+    def create_pre_report(cls, status: str, job_skipped: bool) -> "JobReport":
         return JobReport(
             status=status,
             description="",
@@ -321,7 +320,7 @@ class JobReport:
             duration=0.0,
             additional_files=[],
             job_skipped=job_skipped,
-            dummy=True,
+            pre_report=True,
         )
 
     def update_duration(self):
@@ -622,7 +621,7 @@ class BuildResult:
 
     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 CI.Utils.normalize_string(self.head_ref)
+            self.build_name, self.pr_number or normalize_string(self.head_ref)
         )
         path.write_text(
             json.dumps(
@@ -667,7 +666,11 @@ ColorTheme = Tuple[str, str, str]
 def _format_header(
     header: str, branch_name: str, branch_url: Optional[str] = None
 ) -> str:
-    result = header
+    # Following line does not lower CI->Ci and SQLancer->Sqlancer. It only
+    # capitalizes the first letter and doesn't touch the rest of the word
+    result = " ".join([w[0].upper() + w[1:] for w in header.split(" ") if w])
+    result = result.replace("Clickhouse", "ClickHouse")
+    result = result.replace("clickhouse", "ClickHouse")
     if "ClickHouse" not in result:
         result = f"ClickHouse {result}"
     if branch_url:
@@ -739,24 +742,13 @@ def create_test_html_report(
     if test_results:
         rows_part = []
         num_fails = 0
-        has_test_time = any(tr.time is not None for tr in test_results)
+        has_test_time = False
         has_log_urls = False
 
-        def sort_key(status):
-            if "fail" in status.lower():
-                return 0
-            elif "error" in status.lower():
-                return 1
-            elif "not" in status.lower():
-                return 2
-            elif "ok" in status.lower():
-                return 10
-            elif "success" in status.lower():
-                return 9
-            else:
-                return 5
-
-        test_results.sort(key=lambda result: sort_key(result.status))
+        # Display entires with logs at the top (they correspond to failed tests)
+        test_results.sort(
+            key=lambda result: result.raw_logs is None and result.log_files is None
+        )
 
         for test_result in test_results:
             colspan = 0
@@ -782,11 +774,9 @@ def create_test_html_report(
             row.append(f'<td {fail_id}style="{style}">{test_result.status}</td>')
             colspan += 1
 
-            if has_test_time:
-                if test_result.time is not None:
-                    row.append(f"<td>{test_result.time}</td>")
-                else:
-                    row.append("<td></td>")
+            if test_result.time is not None:
+                has_test_time = True
+                row.append(f"<td>{test_result.time}</td>")
                 colspan += 1
 
             if test_result.log_urls is not None:
diff --git a/tests/ci/run_check.py b/tests/ci/run_check.py
index 55a0c383812..0ad01e3accd 100644
--- a/tests/ci/run_check.py
+++ b/tests/ci/run_check.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 import logging
-import re
 import sys
 from typing import Tuple
 
@@ -17,6 +16,7 @@ from commit_status_helper import (
 from env_helper import GITHUB_REPOSITORY, GITHUB_SERVER_URL
 from get_robot_token import get_best_robot_token
 from ci_config import CI
+from ci_utils import Utils
 from pr_info import PRInfo
 from report import FAILURE, PENDING, SUCCESS, StatusType
 
@@ -25,144 +25,12 @@ TRUSTED_ORG_IDS = {
     54801242,  # clickhouse
 }
 
-TRUSTED_CONTRIBUTORS = {
-    e.lower()
-    for e in [
-        "amosbird",
-        "azat",  # SEMRush
-        "bharatnc",  # Many contributions.
-        "cwurm",  # ClickHouse, Inc
-        "den-crane",  # Documentation contributor
-        "ildus",  # adjust, ex-pgpro
-        "nvartolomei",  # Seasoned contributor, CloudFlare
-        "taiyang-li",
-        "ucasFL",  # Amos Bird's friend
-        "thomoco",  # ClickHouse, Inc
-        "tonickkozlov",  # Cloudflare
-        "tylerhannan",  # ClickHouse, Inc
-        "tsolodov",  # ClickHouse, Inc
-        "justindeguzman",  # ClickHouse, Inc
-        "XuJia0210",  # ClickHouse, Inc
-    ]
-}
-
 OK_SKIP_LABELS = {CI.Labels.RELEASE, CI.Labels.PR_BACKPORT, CI.Labels.PR_CHERRYPICK}
 PR_CHECK = "PR Check"
 
 
-LABEL_CATEGORIES = {
-    "pr-backward-incompatible": ["Backward Incompatible Change"],
-    "pr-bugfix": [
-        "Bug Fix",
-        "Bug Fix (user-visible misbehavior in an official stable release)",
-        "Bug Fix (user-visible misbehaviour in official stable or prestable release)",
-        "Bug Fix (user-visible misbehavior in official stable or prestable release)",
-    ],
-    "pr-critical-bugfix": ["Critical Bug Fix (crash, LOGICAL_ERROR, data loss, RBAC)"],
-    "pr-build": [
-        "Build/Testing/Packaging Improvement",
-        "Build Improvement",
-        "Build/Testing Improvement",
-        "Build",
-        "Packaging Improvement",
-    ],
-    "pr-documentation": [
-        "Documentation (changelog entry is not required)",
-        "Documentation",
-    ],
-    "pr-feature": ["New Feature"],
-    "pr-improvement": ["Improvement"],
-    "pr-not-for-changelog": [
-        "Not for changelog (changelog entry is not required)",
-        "Not for changelog",
-    ],
-    "pr-performance": ["Performance Improvement"],
-    "pr-ci": ["CI Fix or Improvement (changelog entry is not required)"],
-}
-
-CATEGORY_TO_LABEL = {
-    c: lb for lb, categories in LABEL_CATEGORIES.items() for c in categories
-}
-
-
-def check_pr_description(pr_body: str, repo_name: str) -> Tuple[str, str]:
-    """The function checks the body to being properly formatted according to
-    .github/PULL_REQUEST_TEMPLATE.md, if the first returned string is not empty,
-    then there is an error."""
-    lines = list(map(lambda x: x.strip(), pr_body.split("\n") if pr_body else []))
-    lines = [re.sub(r"\s+", " ", line) for line in lines]
-
-    # Check if body contains "Reverts ClickHouse/ClickHouse#36337"
-    if [True for line in lines if re.match(rf"\AReverts {repo_name}#[\d]+\Z", line)]:
-        return "", LABEL_CATEGORIES["pr-not-for-changelog"][0]
-
-    category = ""
-    entry = ""
-    description_error = ""
-
-    i = 0
-    while i < len(lines):
-        if re.match(r"(?i)^[#>*_ ]*change\s*log\s*category", lines[i]):
-            i += 1
-            if i >= len(lines):
-                break
-            # Can have one empty line between header and the category
-            # itself. Filter it out.
-            if not lines[i]:
-                i += 1
-                if i >= len(lines):
-                    break
-            category = re.sub(r"^[-*\s]*", "", lines[i])
-            i += 1
-
-            # Should not have more than one category. Require empty line
-            # after the first found category.
-            if i >= len(lines):
-                break
-            if lines[i]:
-                second_category = re.sub(r"^[-*\s]*", "", lines[i])
-                description_error = (
-                    "More than one changelog category specified: "
-                    f"'{category}', '{second_category}'"
-                )
-                return description_error, category
-
-        elif re.match(
-            r"(?i)^[#>*_ ]*(short\s*description|change\s*log\s*entry)", lines[i]
-        ):
-            i += 1
-            # Can have one empty line between header and the entry itself.
-            # Filter it out.
-            if i < len(lines) and not lines[i]:
-                i += 1
-            # All following lines until empty one are the changelog entry.
-            entry_lines = []
-            while i < len(lines) and lines[i]:
-                entry_lines.append(lines[i])
-                i += 1
-            entry = " ".join(entry_lines)
-            # Don't accept changelog entries like '...'.
-            entry = re.sub(r"[#>*_.\- ]", "", entry)
-            # Don't accept changelog entries like 'Close #12345'.
-            entry = re.sub(r"^[\w\-\s]{0,10}#?\d{5,6}\.?$", "", entry)
-        else:
-            i += 1
-
-    if not category:
-        description_error = "Changelog category is empty"
-    # Filter out the PR categories that are not for changelog.
-    elif "(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", ""
-    elif not entry:
-        description_error = f"Changelog entry required for category '{category}'"
-
-    return description_error, category
-
-
 def pr_is_by_trusted_user(pr_user_login, pr_user_orgs):
-    if pr_user_login.lower() in TRUSTED_CONTRIBUTORS:
+    if pr_user_login.lower() in CI.TRUSTED_CONTRIBUTORS:
         logging.info("User '%s' is trusted", pr_user_login)
         return True
 
@@ -224,20 +92,22 @@ def main():
     commit = get_commit(gh, pr_info.sha)
     status = SUCCESS  # type: StatusType
 
-    description_error, category = check_pr_description(pr_info.body, GITHUB_REPOSITORY)
+    description_error, category = Utils.check_pr_description(
+        pr_info.body, GITHUB_REPOSITORY
+    )
     pr_labels_to_add = []
     pr_labels_to_remove = []
     if (
-        category in CATEGORY_TO_LABEL
-        and CATEGORY_TO_LABEL[category] not in pr_info.labels
+        category in CI.CATEGORY_TO_LABEL
+        and CI.CATEGORY_TO_LABEL[category] not in pr_info.labels
     ):
-        pr_labels_to_add.append(CATEGORY_TO_LABEL[category])
+        pr_labels_to_add.append(CI.CATEGORY_TO_LABEL[category])
 
     for label in pr_info.labels:
         if (
-            label in CATEGORY_TO_LABEL.values()
-            and category in CATEGORY_TO_LABEL
-            and label != CATEGORY_TO_LABEL[category]
+            label in CI.CATEGORY_TO_LABEL.values()
+            and category in CI.CATEGORY_TO_LABEL
+            and label != CI.CATEGORY_TO_LABEL[category]
         ):
             pr_labels_to_remove.append(label)
 
diff --git a/tests/ci/sqllogic_test.py b/tests/ci/sqllogic_test.py
index 7fe44c235c7..63880f07e92 100755
--- a/tests/ci/sqllogic_test.py
+++ b/tests/ci/sqllogic_test.py
@@ -31,7 +31,7 @@ IMAGE_NAME = "clickhouse/sqllogic-test"
 
 def get_run_command(
     builds_path: Path,
-    repo_path: Path,
+    repo_tests_path: Path,
     result_path: Path,
     server_log_path: Path,
     image: DockerImage,
@@ -39,11 +39,11 @@ def get_run_command(
     return (
         f"docker run "
         f"--volume={builds_path}:/package_folder "
-        f"--volume={repo_path}:/repo "
+        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} /repo/tests/docker_scripts/sqllogic_runner.sh"
+        f"--cap-add=SYS_PTRACE {image}"
     )
 
 
@@ -94,6 +94,8 @@ def main():
 
     docker_image = pull_image(get_docker_image(IMAGE_NAME))
 
+    repo_tests_path = repo_path / "tests"
+
     packages_path = temp_path / "packages"
     packages_path.mkdir(parents=True, exist_ok=True)
 
@@ -109,7 +111,7 @@ def main():
 
     run_command = get_run_command(  # run script inside docker
         packages_path,
-        repo_path,
+        repo_tests_path,
         result_path,
         server_log_path,
         docker_image,
diff --git a/tests/ci/stress.py b/tests/ci/stress.py
index a3cdd8b3d6f..8b8b17dd2a9 100755
--- a/tests/ci/stress.py
+++ b/tests/ci/stress.py
@@ -47,8 +47,6 @@ def get_options(i: int, upgrade_check: bool) -> str:
 
     if i > 0 and random.random() < 1 / 3:
         client_options.append("use_query_cache=1")
-        client_options.append("query_cache_nondeterministic_function_handling='ignore'")
-        client_options.append("query_cache_system_table_handling='ignore'")
 
     if i % 5 == 1:
         client_options.append("memory_tracker_fault_probability=0.001")
diff --git a/tests/ci/stress_check.py b/tests/ci/stress_check.py
index f9656e60448..85da601e379 100644
--- a/tests/ci/stress_check.py
+++ b/tests/ci/stress_check.py
@@ -57,16 +57,10 @@ def get_run_command(
     additional_envs: List[str],
     ci_logs_args: str,
     image: DockerImage,
-    upgrade_check: bool,
 ) -> str:
     envs = [f"-e {e}" for e in additional_envs]
     env_str = " ".join(envs)
 
-    if upgrade_check:
-        run_script = "/repo/tests/docker_scripts/upgrade_runner.sh"
-    else:
-        run_script = "/repo/tests/docker_scripts/stress_runner.sh"
-
     cmd = (
         "docker run --cap-add=SYS_PTRACE "
         # For dmesg and sysctl
@@ -76,8 +70,8 @@ def get_run_command(
         f"{ci_logs_args}"
         f"--volume={build_path}:/package_folder "
         f"--volume={result_path}:/test_output "
-        f"--volume={repo_tests_path}/..:/repo "
-        f"--volume={server_log_path}:/var/log/clickhouse-server {env_str} {image} {run_script}"
+        f"--volume={repo_tests_path}:/usr/share/clickhouse-test "
+        f"--volume={server_log_path}:/var/log/clickhouse-server {env_str} {image} "
     )
 
     return cmd
@@ -134,7 +128,7 @@ def process_results(
     return state, description, test_results, additional_files
 
 
-def run_stress_test(upgrade_check: bool = False) -> None:
+def run_stress_test(docker_image_name: str) -> None:
     logging.basicConfig(level=logging.INFO)
     for handler in logging.root.handlers:
         # pylint: disable=protected-access
@@ -154,7 +148,7 @@ def run_stress_test(upgrade_check: bool = False) -> None:
 
     pr_info = PRInfo()
 
-    docker_image = pull_image(get_docker_image("clickhouse/stress-test"))
+    docker_image = pull_image(get_docker_image(docker_image_name))
 
     packages_path = temp_path / "packages"
     packages_path.mkdir(parents=True, exist_ok=True)
@@ -183,7 +177,6 @@ def run_stress_test(upgrade_check: bool = False) -> None:
         additional_envs,
         ci_logs_args,
         docker_image,
-        upgrade_check,
     )
     logging.info("Going to run stress test: %s", run_command)
 
@@ -215,4 +208,4 @@ def run_stress_test(upgrade_check: bool = False) -> None:
 
 
 if __name__ == "__main__":
-    run_stress_test()
+    run_stress_test("clickhouse/stress-test")
diff --git a/tests/ci/tee_popen.py b/tests/ci/tee_popen.py
index 53b0a0f6c2c..13db50df53f 100644
--- a/tests/ci/tee_popen.py
+++ b/tests/ci/tee_popen.py
@@ -2,7 +2,6 @@
 
 import logging
 import os
-import signal
 import sys
 from io import TextIOWrapper
 from pathlib import Path
@@ -31,34 +30,20 @@ class TeePopen:
         self._process = None  # type: Optional[Popen]
         self.timeout = timeout
         self.timeout_exceeded = False
-        self.terminated_by_sigterm = False
-        self.terminated_by_sigkill = False
 
     def _check_timeout(self) -> None:
         if self.timeout is None:
             return
         sleep(self.timeout)
-        logging.warning(
-            "Timeout exceeded. Send SIGTERM to process %s, timeout %s",
-            self.process.pid,
-            self.timeout,
-        )
-        self.send_signal(signal.SIGTERM)
-        time_wait = 0
-        self.terminated_by_sigterm = True
         self.timeout_exceeded = True
-        while self.process.poll() is None and time_wait < 100:
-            print("wait...")
-            wait = 5
-            sleep(wait)
-            time_wait += wait
         while self.process.poll() is None:
-            logging.error(
-                "Process is still running. Send SIGKILL",
+            logging.warning(
+                "Killing process %s, timeout %s exceeded",
+                self.process.pid,
+                self.timeout,
             )
-            self.send_signal(signal.SIGKILL)
-            self.terminated_by_sigkill = True
-            sleep(5)
+            os.killpg(self.process.pid, 9)
+            sleep(10)
 
     def __enter__(self) -> "TeePopen":
         self.process = Popen(
@@ -72,8 +57,6 @@ class TeePopen:
             bufsize=1,
             errors="backslashreplace",
         )
-        sleep(1)
-        print(f"Subprocess started, pid [{self.process.pid}]")
         if self.timeout is not None and self.timeout > 0:
             t = Thread(target=self._check_timeout)
             t.daemon = True  # does not block the program from exit
@@ -102,12 +85,6 @@ class TeePopen:
 
         return self.process.wait()
 
-    def poll(self):
-        return self.process.poll()
-
-    def send_signal(self, signal_num):
-        os.killpg(self.process.pid, signal_num)
-
     @property
     def process(self) -> Popen:
         if self._process is not None:
diff --git a/tests/ci/test_ci_config.py b/tests/ci/test_ci_config.py
index c3e55aeac06..aff49ae0d62 100644
--- a/tests/ci/test_ci_config.py
+++ b/tests/ci/test_ci_config.py
@@ -9,7 +9,7 @@ from ci_settings import CiSettings
 from pr_info import PRInfo, EventType
 from s3_helper import S3Helper
 from ci_cache import CiCache
-from ci_utils import Utils
+from ci_utils import normalize_string
 
 
 _TEST_EVENT_JSON = {"dummy": "dummy"}
@@ -61,7 +61,7 @@ class TestCIConfig(unittest.TestCase):
             if CI.JOB_CONFIGS[job].job_name_keyword:
                 self.assertTrue(
                     CI.JOB_CONFIGS[job].job_name_keyword.lower()
-                    in Utils.normalize_string(job),
+                    in normalize_string(job),
                     f"Job [{job}] apparently uses wrong common config with job keyword [{CI.JOB_CONFIGS[job].job_name_keyword}]",
                 )
 
@@ -217,7 +217,7 @@ class TestCIConfig(unittest.TestCase):
                 else:
                     self.assertTrue(
                         CI.get_job_ci_stage(job)
-                        in (CI.WorkflowStages.TESTS_1, CI.WorkflowStages.TESTS_2),
+                        in (CI.WorkflowStages.TESTS_1, CI.WorkflowStages.TESTS_3),
                         msg=f"Stage for [{job}] is not correct",
                     )
 
@@ -248,7 +248,7 @@ class TestCIConfig(unittest.TestCase):
                 else:
                     self.assertTrue(
                         CI.get_job_ci_stage(job, non_blocking_ci=True)
-                        in (CI.WorkflowStages.TESTS_1, CI.WorkflowStages.TESTS_2_WW),
+                        in (CI.WorkflowStages.TESTS_1, CI.WorkflowStages.TESTS_2),
                         msg=f"Stage for [{job}] is not correct",
                     )
 
@@ -297,9 +297,7 @@ class TestCIConfig(unittest.TestCase):
             assert tag_config
             set_jobs = tag_config.run_jobs
             for job in set_jobs:
-                if any(
-                    k in Utils.normalize_string(job) for k in settings.exclude_keywords
-                ):
+                if any(k in normalize_string(job) for k in settings.exclude_keywords):
                     continue
                 expected_jobs_to_do.append(job)
         for job, config in CI.JOB_CONFIGS.items():
@@ -311,12 +309,12 @@ class TestCIConfig(unittest.TestCase):
                 # expected to run all builds jobs
                 expected_jobs_to_do.append(job)
             if not any(
-                keyword in Utils.normalize_string(job)
+                keyword in normalize_string(job)
                 for keyword in settings.include_keywords
             ):
                 continue
             if any(
-                keyword in Utils.normalize_string(job)
+                keyword in normalize_string(job)
                 for keyword in settings.exclude_keywords
             ):
                 continue
@@ -427,32 +425,6 @@ class TestCIConfig(unittest.TestCase):
         ]
         self.assertCountEqual(expected_jobs_to_do, actual_jobs_to_do)
 
-    def test_ci_py_for_specific_workflow(self):
-        """
-        checks ci.py job configuration
-        """
-        settings = CiSettings()
-        settings.no_ci_cache = True
-        pr_info = PRInfo(github_event=_TEST_EVENT_JSON)
-        # make it merge_queue
-        pr_info.event_type = EventType.SCHEDULE
-        assert pr_info.number == 0 and not pr_info.is_merge_queue and not pr_info.is_pr
-        ci_cache = CIPY._configure_jobs(
-            S3Helper(),
-            pr_info,
-            settings,
-            skip_jobs=False,
-            dry_run=True,
-            workflow_name=CI.WorkFlowNames.JEPSEN,
-        )
-        actual_jobs_to_do = list(ci_cache.jobs_to_do)
-        expected_jobs_to_do = [
-            CI.BuildNames.BINARY_RELEASE,
-            CI.JobNames.JEPSEN_KEEPER,
-            CI.JobNames.JEPSEN_SERVER,
-        ]
-        self.assertCountEqual(expected_jobs_to_do, actual_jobs_to_do)
-
     def test_ci_py_await(self):
         """
         checks ci.py job configuration
@@ -486,7 +458,6 @@ class TestCIConfig(unittest.TestCase):
         pr_info = PRInfo(github_event=_TEST_EVENT_JSON)
         pr_info.event_type = EventType.PUSH
         pr_info.number = 0
-        pr_info.head_ref = "24.12345"
         assert pr_info.is_release and not pr_info.is_merge_queue
         ci_cache = CIPY._configure_jobs(
             S3Helper(), pr_info, settings, skip_jobs=False, dry_run=True
@@ -648,7 +619,7 @@ class TestCIConfig(unittest.TestCase):
                     release_branch=True,
                 )
                 for record_t_, records_ in ci_cache.records.items():
-                    if record_t_.value == record.record_type.value:
+                    if record_t_.value == CiCache.RecordType.FAILED.value:
                         records_[record.to_str_key()] = record
 
         ci_cache.filter_out_not_affected_jobs()
@@ -722,7 +693,7 @@ class TestCIConfig(unittest.TestCase):
                     release_branch=True,
                 )
                 for record_t_, records_ in ci_cache.records.items():
-                    if record_t_.value == record.record_type.value:
+                    if record_t_.value == CiCache.RecordType.FAILED.value:
                         records_[record.to_str_key()] = record
 
         ci_cache.filter_out_not_affected_jobs()
@@ -732,42 +703,3 @@ class TestCIConfig(unittest.TestCase):
             MOCK_REQUIRED_BUILDS,
         )
         self.assertCountEqual(list(ci_cache.jobs_to_do), expected_to_do)
-
-    def test_ci_py_filters_not_affected_jobs_in_prs_docs_check(self):
-        """
-        checks ci.py filters not affected jobs in PRs,
-        Docs Check is special from ci_cache perspective -
-            check it ci pr pipline is filtered properly when only docs check is to be skipped
-        """
-        settings = CiSettings()
-        settings.no_ci_cache = True
-        pr_info = PRInfo(github_event=_TEST_EVENT_JSON)
-        pr_info.event_type = EventType.PULL_REQUEST
-        pr_info.number = 123
-        assert pr_info.is_pr
-        ci_cache = CIPY._configure_jobs(
-            S3Helper(), pr_info, settings, skip_jobs=False, dry_run=True
-        )
-        self.assertTrue(not ci_cache.jobs_to_skip, "Must be no jobs in skip list")
-        assert not ci_cache.jobs_to_wait
-        assert not ci_cache.jobs_to_skip
-
-        job_config = ci_cache.jobs_to_do[CI.JobNames.DOCS_CHECK]
-        for batch in range(job_config.num_batches):
-            # add any record into cache
-            record = CiCache.Record(
-                record_type=CiCache.RecordType.PENDING,
-                job_name=CI.JobNames.DOCS_CHECK,
-                job_digest=ci_cache.job_digests[CI.JobNames.DOCS_CHECK],
-                batch=batch,
-                num_batches=job_config.num_batches,
-                release_branch=True,
-            )
-            for record_t_, records_ in ci_cache.records.items():
-                if record_t_.value == record.record_type.value:
-                    records_[record.to_str_key()] = record
-
-        expected_jobs = list(ci_cache.jobs_to_do)
-        expected_jobs.remove(CI.JobNames.DOCS_CHECK)
-        ci_cache.filter_out_not_affected_jobs()
-        self.assertCountEqual(list(ci_cache.jobs_to_do), expected_jobs)
diff --git a/tests/ci/test_docker.py b/tests/ci/test_docker.py
index 58ebe4ecbb1..662143bfd9b 100644
--- a/tests/ci/test_docker.py
+++ b/tests/ci/test_docker.py
@@ -1,19 +1,61 @@
 #!/usr/bin/env python
 
 import unittest
+from unittest.mock import patch, MagicMock
 
 from version_helper import get_version_from_string
 import docker_server as ds
 
+# di.logging.basicConfig(level=di.logging.INFO)
+
 
 class TestDockerServer(unittest.TestCase):
     def test_gen_tags(self):
         version = get_version_from_string("22.2.2.2")
         cases = (
-            ("release-latest", ["latest", "22", "22.2", "22.2.2", "22.2.2.2"]),
-            ("release", ["22", "22.2", "22.2.2", "22.2.2.2"]),
+            ("latest", ["latest", "22", "22.2", "22.2.2", "22.2.2.2"]),
+            ("major", ["22", "22.2", "22.2.2", "22.2.2.2"]),
+            ("minor", ["22.2", "22.2.2", "22.2.2.2"]),
+            ("patch", ["22.2.2", "22.2.2.2"]),
             ("head", ["head"]),
         )
         for case in cases:
             release_type = case[0]
             self.assertEqual(case[1], ds.gen_tags(version, release_type))
+
+        with self.assertRaises(ValueError):
+            ds.gen_tags(version, "auto")
+
+    @patch("docker_server.get_tagged_versions")
+    def test_auto_release_type(self, mock_tagged_versions: MagicMock) -> None:
+        mock_tagged_versions.return_value = [
+            get_version_from_string("1.1.1.1"),
+            get_version_from_string("1.2.1.1"),
+            get_version_from_string("2.1.1.1"),
+            get_version_from_string("2.2.1.1"),
+            get_version_from_string("2.2.2.1"),
+        ]
+
+        cases_less = (
+            (get_version_from_string("1.0.1.1"), "minor"),
+            (get_version_from_string("1.1.2.1"), "minor"),
+            (get_version_from_string("1.3.1.1"), "major"),
+            (get_version_from_string("2.1.2.1"), "minor"),
+            (get_version_from_string("2.2.1.3"), "patch"),
+            (get_version_from_string("2.2.3.1"), "latest"),
+            (get_version_from_string("2.3.1.1"), "latest"),
+        )
+        for case in cases_less:
+            release = ds.auto_release_type(case[0], "auto")
+            self.assertEqual(case[1], release)
+
+        cases_equal = (
+            (get_version_from_string("1.1.1.1"), "minor"),
+            (get_version_from_string("1.2.1.1"), "major"),
+            (get_version_from_string("2.1.1.1"), "minor"),
+            (get_version_from_string("2.2.1.1"), "patch"),
+            (get_version_from_string("2.2.2.1"), "latest"),
+        )
+        for case in cases_equal:
+            release = ds.auto_release_type(case[0], "auto")
+            self.assertEqual(case[1], release)
diff --git a/tests/ci/unit_tests_check.py b/tests/ci/unit_tests_check.py
index 9cc8ec379bf..b66a4312657 100644
--- a/tests/ci/unit_tests_check.py
+++ b/tests/ci/unit_tests_check.py
@@ -174,13 +174,10 @@ def main():
     test_output = temp_path / "test_output"
     test_output.mkdir(parents=True, exist_ok=True)
 
-    # Don't run ASAN under gdb since that breaks leak detection
-    gdb_enabled = "NO_GDB" if "asan" in check_name else "GDB"
-
     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} {gdb_enabled}"
+        f"--volume={test_output}:/test_output {docker_image}"
     )
 
     run_log_path = test_output / "run.log"
@@ -197,11 +194,6 @@ def main():
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {TEMP_PATH}", shell=True)
 
     state, description, test_results = process_results(test_output)
-    if retcode != 0 and state == SUCCESS:
-        # The process might have failed without reporting it in the test_output (e.g. LeakSanitizer)
-        state = FAILURE
-        description = "Invalid return code. Check run.log"
-
     additional_files = [run_log_path] + [
         p for p in test_output.iterdir() if not p.is_dir()
     ]
diff --git a/tests/ci/upgrade_check.py b/tests/ci/upgrade_check.py
index 8662611dffe..83b6f9e299f 100644
--- a/tests/ci/upgrade_check.py
+++ b/tests/ci/upgrade_check.py
@@ -1,4 +1,4 @@
 import stress_check
 
 if __name__ == "__main__":
-    stress_check.run_stress_test(upgrade_check=True)
+    stress_check.run_stress_test("clickhouse/upgrade-check")
diff --git a/tests/ci/version_helper.py b/tests/ci/version_helper.py
index b20b2bb25cf..07a7a9601c0 100755
--- a/tests/ci/version_helper.py
+++ b/tests/ci/version_helper.py
@@ -85,16 +85,6 @@ class ClickHouseVersion:
             self._tweak = 1
         return self
 
-    def bump_patch(self) -> "ClickHouseVersion":
-        self._revision += 1
-        self._patch += 1
-        self._tweak = 1
-        return self
-
-    def reset_tweak(self) -> "ClickHouseVersion":
-        self._tweak = 1
-        return self
-
     def major_update(self) -> "ClickHouseVersion":
         if self._git is not None:
             self._git.update()
@@ -114,6 +104,13 @@ class ClickHouseVersion:
             self.major, self.minor, self.patch + 1, self.revision, self._git
         )
 
+    def reset_tweak(self) -> "ClickHouseVersion":
+        if self._git is not None:
+            self._git.update()
+        return ClickHouseVersion(
+            self.major, self.minor, self.patch, self.revision, self._git, 1
+        )
+
     @property
     def major(self) -> int:
         return self._major
diff --git a/tests/ci/worker/dockerhub_proxy_template.sh b/tests/ci/worker/dockerhub_proxy_template.sh
new file mode 100644
index 00000000000..0e375dd5f04
--- /dev/null
+++ b/tests/ci/worker/dockerhub_proxy_template.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+set -xeuo pipefail
+
+bash /usr/local/share/scripts/init-network.sh
+
+# tune sysctl for network performance
+cat > /etc/sysctl.d/10-network-memory.conf << EOF
+net.core.netdev_max_backlog=2000
+net.core.rmem_max=1048576
+net.core.wmem_max=1048576
+net.ipv4.tcp_max_syn_backlog=1024
+net.ipv4.tcp_rmem=4096 131072  16777216
+net.ipv4.tcp_wmem=4096 87380   16777216
+net.ipv4.tcp_mem=4096  131072  16777216
+EOF
+
+sysctl -p /etc/sysctl.d/10-network-memory.conf
+
+mkdir /home/ubuntu/registrystorage
+
+sed -i 's/preserve_hostname: false/preserve_hostname: true/g' /etc/cloud/cloud.cfg
+
+REGISTRY_PROXY_USERNAME=robotclickhouse
+REGISTRY_PROXY_PASSWORD=$(aws ssm get-parameter --name dockerhub_robot_password --with-decryption | jq '.Parameter.Value' -r)
+
+docker run -d --network=host -p 5000:5000 -v /home/ubuntu/registrystorage:/var/lib/registry \
+  -e REGISTRY_STORAGE_CACHE='' \
+  -e REGISTRY_HTTP_ADDR=0.0.0.0:5000 \
+  -e REGISTRY_STORAGE_DELETE_ENABLED=true \
+  -e REGISTRY_PROXY_REMOTEURL=https://registry-1.docker.io \
+  -e REGISTRY_PROXY_PASSWORD="$REGISTRY_PROXY_PASSWORD" \
+  -e REGISTRY_PROXY_USERNAME="$REGISTRY_PROXY_USERNAME" \
+  --restart=always --name registry registry:2
diff --git a/tests/ci/worker/prepare-ci-ami.sh b/tests/ci/worker/prepare-ci-ami.sh
new file mode 100644
index 00000000000..eb410ddcb00
--- /dev/null
+++ b/tests/ci/worker/prepare-ci-ami.sh
@@ -0,0 +1,254 @@
+#!/usr/bin/env bash
+# The script is downloaded the AWS image builder Task Orchestrator and Executor (AWSTOE)
+# We can't use `user data script` because cloud-init does not check the exit code
+# The script is downloaded in the component named ci-infrastructure-prepare in us-east-1
+# The link there must be adjusted to a particular RAW link, e.g.
+# https://github.com/ClickHouse/ClickHouse/raw/653da5f00219c088af66d97a8f1ea3e35e798268/tests/ci/worker/prepare-ci-ami.sh
+
+set -xeuo pipefail
+
+echo "Running prepare script"
+export DEBIAN_FRONTEND=noninteractive
+export RUNNER_VERSION=2.317.0
+export RUNNER_HOME=/home/ubuntu/actions-runner
+
+deb_arch() {
+  case $(uname -m) in
+    x86_64 )
+      echo amd64;;
+    aarch64 )
+      echo arm64;;
+  esac
+}
+
+runner_arch() {
+  case $(uname -m) in
+    x86_64 )
+      echo x64;;
+    aarch64 )
+      echo arm64;;
+  esac
+}
+
+# We have test for cgroups, and it's broken with cgroups v2
+# Ubuntu 22.04 has it enabled by default
+sed -r '/GRUB_CMDLINE_LINUX=/ s/"(.*)"/"\1 systemd.unified_cgroup_hierarchy=0"/' -i /etc/default/grub
+update-grub
+
+apt-get update
+
+apt-get install --yes --no-install-recommends \
+    apt-transport-https \
+    at \
+    atop \
+    binfmt-support \
+    build-essential \
+    ca-certificates \
+    curl \
+    gnupg \
+    jq \
+    lsb-release \
+    pigz \
+    ripgrep \
+    zstd \
+    python3-dev \
+    python3-pip \
+    qemu-user-static \
+    unzip \
+    gh
+
+# Install docker
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+
+echo "deb [arch=$(deb_arch) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+
+apt-get update
+apt-get install --yes --no-install-recommends docker-ce docker-buildx-plugin docker-ce-cli containerd.io
+
+usermod -aG docker ubuntu
+
+# enable ipv6 in containers (fixed-cidr-v6 is some random network mask)
+cat <<EOT > /etc/docker/daemon.json
+{
+  "ipv6": true,
+  "fixed-cidr-v6": "2001:db8:1::/64",
+  "log-driver": "json-file",
+  "log-opts": {
+    "max-file": "5",
+    "max-size": "1000m"
+  },
+  "insecure-registries" : ["dockerhub-proxy.dockerhub-proxy-zone:5000"],
+  "registry-mirrors" : ["http://dockerhub-proxy.dockerhub-proxy-zone:5000"]
+}
+EOT
+
+# Install azure-cli
+curl -sLS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /etc/apt/keyrings/microsoft.gpg
+AZ_DIST=$(lsb_release -cs)
+echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/microsoft.gpg] https://packages.microsoft.com/repos/azure-cli/ $AZ_DIST main" | tee /etc/apt/sources.list.d/azure-cli.list
+
+apt-get update
+apt-get install --yes --no-install-recommends azure-cli
+
+# Increase the limit on number of virtual memory mappings to aviod 'Cannot mmap' error
+echo "vm.max_map_count = 2097152" > /etc/sysctl.d/01-increase-map-counts.conf
+# Workarond for sanitizers uncompatibility with some kernels, see https://github.com/google/sanitizers/issues/856
+echo "vm.mmap_rnd_bits=28" > /etc/sysctl.d/02-vm-mmap_rnd_bits.conf
+
+systemctl restart docker
+
+# buildx builder is user-specific
+sudo -u ubuntu docker buildx version
+sudo -u ubuntu docker buildx rm default-builder || : # if it's the second attempt
+sudo -u ubuntu docker buildx create --use --name default-builder
+
+pip install boto3 pygithub requests urllib3 unidiff dohq-artifactory jwt
+
+rm -rf $RUNNER_HOME  # if it's the second attempt
+mkdir -p $RUNNER_HOME && cd $RUNNER_HOME
+
+RUNNER_ARCHIVE="actions-runner-linux-$(runner_arch)-$RUNNER_VERSION.tar.gz"
+
+curl -O -L "https://github.com/actions/runner/releases/download/v$RUNNER_VERSION/$RUNNER_ARCHIVE"
+
+tar xzf "./$RUNNER_ARCHIVE"
+rm -f "./$RUNNER_ARCHIVE"
+./bin/installdependencies.sh
+
+chown -R ubuntu:ubuntu $RUNNER_HOME
+
+cd /home/ubuntu
+curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "awscliv2.zip"
+unzip -q awscliv2.zip
+./aws/install
+
+rm -rf /home/ubuntu/awscliv2.zip /home/ubuntu/aws
+
+# SSH keys of core team
+mkdir -p /home/ubuntu/.ssh
+
+# ~/.ssh/authorized_keys is cleaned out, so we use deprecated but working  ~/.ssh/authorized_keys2
+TEAM_KEYS_URL=$(aws ssm get-parameter --region us-east-1 --name team-keys-url --query 'Parameter.Value' --output=text)
+curl "${TEAM_KEYS_URL}" > /home/ubuntu/.ssh/authorized_keys2
+chown ubuntu: /home/ubuntu/.ssh -R
+chmod 0700 /home/ubuntu/.ssh
+
+# Download cloudwatch agent and install config for it
+wget --directory-prefix=/tmp https://s3.amazonaws.com/amazoncloudwatch-agent/ubuntu/"$(deb_arch)"/latest/amazon-cloudwatch-agent.deb{,.sig}
+gpg --recv-key --keyserver keyserver.ubuntu.com D58167303B789C72
+gpg --verify /tmp/amazon-cloudwatch-agent.deb.sig
+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
+setup_cloudflare_dns() {
+    # Add cloudflare DNS as a fallback
+    # Get default gateway interface
+    local IFACE ETH_DNS CLOUDFLARE_NS new_dns
+    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() {
+    # Setup tailscale, the very first action
+    local TS_API_CLIENT_ID TS_API_CLIENT_SECRET TS_AUTHKEY RUNNER_TYPE
+    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)
+
+    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)
+    RUNNER_TYPE=${RUNNER_TYPE:-unknown}
+    # Clean possible garbage from the runner type
+    RUNNER_TYPE=${RUNNER_TYPE//[^0-9a-z]/-}
+    TS_AUTHKEY=$(TS_API_CLIENT_ID="$TS_API_CLIENT_ID" TS_API_CLIENT_SECRET="$TS_API_CLIENT_SECRET" \
+                 get-authkey -tags tag:svc-core-ci-github -ephemeral)
+    tailscale up --ssh --auth-key="$TS_AUTHKEY" --hostname="ci-runner-$RUNNER_TYPE-$INSTANCE_ID"
+}
+
+cat > /usr/local/share/scripts/init-network.sh << EOF
+!/usr/bin/env bash
+$(declare -f setup_cloudflare_dns)
+
+$(declare -f setup_tailscale)
+
+# If the script is sourced, it will return now and won't execute functions
+return 0 &>/dev/null || :
+
+echo Setup Cloudflare DNS
+setup_cloudflare_dns
+
+echo Setup Tailscale VPN
+setup_tailscale
+EOF
+
+chmod +x /usr/local/share/scripts/init-network.sh
+
+
+# The following line is used in aws TOE check.
+touch /var/tmp/clickhouse-ci-ami.success
+# END OF THE SCRIPT
+
+# TOE (Task Orchestrator and Executor) description
+# name: CIInfrastructurePrepare
+# description: installs the infrastructure for ClickHouse CI runners
+# schemaVersion: 1.0
+#
+# phases:
+#   - name: build
+#     steps:
+#       - name: DownloadRemoteScript
+#         maxAttempts: 3
+#         action: WebDownload
+#         onFailure: Abort
+#         inputs:
+#           - source: https://github.com/ClickHouse/ClickHouse/raw/653da5f00219c088af66d97a8f1ea3e35e798268/tests/ci/worker/prepare-ci-ami.sh
+#             destination: /tmp/prepare-ci-ami.sh
+#       - name: RunScript
+#         maxAttempts: 3
+#         action: ExecuteBash
+#         onFailure: Abort
+#         inputs:
+#           commands:
+#             - bash -x '{{build.DownloadRemoteScript.inputs[0].destination}}'
+#
+#
+#   - name: validate
+#     steps:
+#       - name: RunScript
+#         maxAttempts: 3
+#         action: ExecuteBash
+#         onFailure: Abort
+#         inputs:
+#           commands:
+#             - ls /var/tmp/clickhouse-ci-ami.success
+#       - name: Cleanup
+#         action: DeleteFile
+#         onFailure: Abort
+#         maxAttempts: 3
+#         inputs:
+#           - path: /var/tmp/clickhouse-ci-ami.success
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index 75a180f356b..a29c786e998 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -30,7 +30,6 @@ import subprocess
 import sys
 import traceback
 import urllib.parse
-import io
 
 # for crc32
 import zlib
@@ -40,9 +39,6 @@ from errno import ESRCH
 from subprocess import PIPE, Popen
 from time import sleep, time
 from typing import Dict, List, Optional, Set, Tuple, Union
-from contextlib import redirect_stdout
-from ast import literal_eval as make_tuple
-
 
 try:
     import termcolor  # type: ignore
@@ -271,7 +267,7 @@ def clickhouse_execute_http(
     max_http_retries=5,
     retry_error_codes=False,
 ):
-    if base_args.secure:
+    if args.secure:
         client = http.client.HTTPSConnection(
             host=base_args.tcp_host, port=base_args.http_port, timeout=timeout
         )
@@ -362,89 +358,14 @@ def clickhouse_execute_json(
     return rows
 
 
-# Should we capture client's stacktraces via SIGTSTP
-CAPTURE_CLIENT_STACKTRACE = False
-
-
-def kill_process_group(pgid):
-    print(f"Killing process group {pgid}")
-    print(f"Processes in process group {pgid}:")
-    print(
-        subprocess.check_output(
-            f"pgrep --pgroup {pgid} -a", shell=True, stderr=subprocess.STDOUT
-        ).decode("utf-8"),
-        end="",
-    )
-    try:
-        if CAPTURE_CLIENT_STACKTRACE:
-            # Let's try to dump stacktrace in client (useful to catch issues there)
-            os.killpg(pgid, signal.SIGTSTP)
-            # Wait some time for clickhouse utilities to gather stacktrace
-            if RELEASE_NON_SANITIZED:
-                sleep(0.5)
-            else:
-                sleep(10)
-        # NOTE: this still may leave some processes, that had been
-        # created by timeout(1), since it also creates new process
-        # group. But this should not be a problem with default
-        # options, since the default time for each test is 10min,
-        # and this is way more bigger then the timeout for each
-        # timeout(1) invocation.
-        #
-        # But as a workaround we are sending SIGTERM first, and
-        # only after SIGKILL, that way timeout(1) will have an
-        # ability to terminate childrens (though not always since
-        # signals are asynchronous).
-        os.killpg(pgid, signal.SIGTERM)
-        # We need minimal delay to let processes handle SIGTERM - 0.1 (this may
-        # not be enough, but at least something)
-        sleep(0.1)
-        os.killpg(pgid, signal.SIGKILL)
-    except OSError as e:
-        if e.errno == ESRCH:
-            print(f"Got ESRCH while killing {pgid}. Ignoring.")
-        else:
-            raise
-    print(f"Process group {pgid} should be killed")
-
-
-def cleanup_child_processes(pid):
-    pgid = os.getpgid(os.getpid())
-    print(f"Child processes of {pid}:")
-    print(
-        subprocess.check_output(
-            f"pgrep --parent {pid} -a", shell=True, stderr=subprocess.STDOUT
-        ).decode("utf-8"),
-        end="",
-    )
-    # Due to start_new_session=True, it is not enough to kill by PGID, we need
-    # to look at children processes as well.
-    # But we are hoping that nobody creates session in the tests (though it is
-    # possible via timeout(), but we are assuming that they will be killed by
-    # timeout).
-    processes = subprocess.check_output(
-        f"pgrep --parent {pid}", shell=True, stderr=subprocess.STDOUT
-    )
-    processes = processes.decode("utf-8")
-    processes = processes.strip()
-    processes = processes.split("\n")
-    processes = map(lambda x: int(x.strip()), processes)
-    processes = list(processes)
-    for child in processes:
-        child_pgid = os.getpgid(child)
-        if child_pgid != pgid:
-            kill_process_group(child_pgid)
-
-    # SIGKILL should not be sent, since this will kill the script itself
-    os.killpg(pgid, signal.SIGTERM)
-
-
-# send signal to all processes in group to avoid hung check triggering
-# (to avoid terminating clickhouse-test itself, the signal should be ignored)
 def stop_tests():
+    # send signal to all processes in group to avoid hung check triggering
+    # (to avoid terminating clickhouse-test itself, the signal should be ignored)
+    print("Sending signals")
     signal.signal(signal.SIGTERM, signal.SIG_IGN)
-    cleanup_child_processes(os.getpid())
-    signal.signal(signal.SIGTERM, signal_handler)
+    os.killpg(os.getpgid(os.getpid()), signal.SIGTERM)
+    signal.signal(signal.SIGTERM, signal.SIG_DFL)
+    print("Sending signals DONE")
 
 
 def get_db_engine(args, database_name):
@@ -760,7 +681,6 @@ class FailureReason(enum.Enum):
     BUILD = "not running for current build"
     NO_PARALLEL_REPLICAS = "smth in not supported with parallel replicas"
     SHARED_MERGE_TREE = "no-shared-merge-tree"
-    DISTRIBUTED_CACHE = "distributed-cache"
 
     # UNKNOWN reasons
     NO_REFERENCE = "no reference file"
@@ -916,7 +836,6 @@ class SettingsRandomizer:
         "min_external_table_block_size_bytes": lambda: random.choice([0, 1, 100000000]),
         "max_parsing_threads": lambda: random.choice([0, 1, 10]),
         "optimize_functions_to_subcolumns": lambda: random.randint(0, 1),
-        "parallel_replicas_local_plan": lambda: random.randint(0, 1),
     }
 
     @staticmethod
@@ -1149,24 +1068,9 @@ class TestCase:
 
         return description + "\n"
 
-    def apply_random_settings_limits(self, random_settings):
-        for setting in random_settings:
-            if setting in self.random_settings_limits:
-                min_value = self.random_settings_limits[setting][0]
-                if min_value and random_settings[setting] < min_value:
-                    random_settings[setting] = min_value
-                max_value = self.random_settings_limits[setting][1]
-                if max_value and random_settings[setting] > max_value:
-                    random_settings[setting] = max_value
-
     def __init__(self, suite, case: str, args, is_concurrent: bool):
         self.case: str = case  # case file name
         self.tags: Set[str] = suite.all_tags[case] if case in suite.all_tags else set()
-        self.random_settings_limits = (
-            suite.all_random_settings_limits[case]
-            if case in suite.all_random_settings_limits
-            else {}
-        )
 
         for tag in os.getenv("GLOBAL_TAGS", "").split(","):
             self.tags.add(tag.strip())
@@ -1208,13 +1112,11 @@ class TestCase:
 
         if self.randomize_settings:
             self.random_settings = SettingsRandomizer.get_random_settings(args)
-            self.apply_random_settings_limits(self.random_settings)
 
         if self.randomize_merge_tree_settings:
             self.merge_tree_random_settings = (
                 MergeTreeSettingsRandomizer.get_random_settings(args)
             )
-            self.apply_random_settings_limits(self.merge_tree_random_settings)
 
         self.base_url_params = (
             os.environ["CLICKHOUSE_URL_PARAMS"]
@@ -1289,9 +1191,6 @@ class TestCase:
         elif tags and ("no-replicated-database" in tags) and args.replicated_database:
             return FailureReason.REPLICATED_DB
 
-        elif tags and ("no-distributed-cache" in tags) and args.distributed_cache:
-            return FailureReason.DISTRIBUTED_CACHE
-
         elif (
             tags
             and ("atomic-database" in tags)
@@ -1329,11 +1228,6 @@ class TestCase:
         ):
             return FailureReason.SKIP
 
-        elif "no-flaky-check" in tags and (
-            1 == int(os.environ.get("IS_FLAKY_CHECK", 0))
-        ):
-            return FailureReason.SKIP
-
         elif tags:
             for build_flag in args.build_flags:
                 if "no-" + build_flag in tags:
@@ -1345,39 +1239,39 @@ class TestCase:
 
         return None
 
-    def process_result_impl(self, proc, total_time: float):
-        kill_output = ""
-        if proc:
-            if proc.returncode is None:
-                f = io.StringIO()
-                with redirect_stdout(f):
-                    kill_process_group(os.getpgid(proc.pid))
-                kill_output = f.getvalue()
-
+    def process_result_impl(
+        self, proc, stdout: str, stderr: str, debug_log: str, total_time: float
+    ):
         description = ""
 
-        debug_log = ""
-        if os.path.exists(self.testcase_args.debug_log_file):
-            with open(self.testcase_args.debug_log_file, "rb") as stream:
-                debug_log += self.testcase_args.debug_log_file + ":\n"
-                debug_log += str(stream.read(), errors="replace", encoding="utf-8")
-                debug_log += "\n"
-
-        stdout = ""
-        if os.path.exists(self.stdout_file):
-            with open(self.stdout_file, "rb") as stdfd:
-                stdout = str(stdfd.read(), errors="replace", encoding="utf-8")
-
-        stderr = kill_output
-        if os.path.exists(self.stderr_file):
-            with open(self.stderr_file, "rb") as stdfd:
-                stderr += str(stdfd.read(), errors="replace", encoding="utf-8")
-
         if debug_log:
             debug_log = "\n".join(debug_log.splitlines()[:100])
 
         if proc:
             if proc.returncode is None:
+                try:
+                    pgid = os.getpgid(proc.pid)
+                    # NOTE: this still may leave some processes, that had been
+                    # created by timeout(1), since it also creates new process
+                    # group. But this should not be a problem with default
+                    # options, since the default time for each test is 10min,
+                    # and this is way more bigger then the timeout for each
+                    # timeout(1) invocation.
+                    #
+                    # But as a workaround we are sending SIGTERM first, and
+                    # only after SIGKILL, that way timeout(1) will have an
+                    # ability to terminate childrens (though not always since
+                    # signals are asynchronous).
+                    os.killpg(pgid, signal.SIGTERM)
+                    # This may not be enough, but this is at least something
+                    # (and anyway it is OK to spend 0.1 second more in case of
+                    # test timeout).
+                    sleep(0.1)
+                    os.killpg(pgid, signal.SIGKILL)
+                except OSError as e:
+                    if e.errno != ESRCH:
+                        raise
+
                 if stderr:
                     description += stderr
                 if debug_log:
@@ -1629,7 +1523,7 @@ class TestCase:
 
     def run_single_test(
         self, server_logs_level, client_options
-    ) -> Tuple[Optional[Popen], float]:
+    ) -> Tuple[Optional[Popen], str, str, str, float]:
         args = self.testcase_args
         client = args.testcase_client
         start_time = args.testcase_start_time
@@ -1638,19 +1532,6 @@ class TestCase:
         if args.client_log:
             log_opt = " --client_logs_file=" + args.client_log + " "
             client_options += log_opt
-
-            for env_name in [
-                "TSAN_OPTIONS",
-                "ASAN_OPTIONS",
-                "MSAN_OPTIONS",
-                "UBSAN_OPTIONS",
-            ]:
-                current_options = os.environ.get(env_name, None)
-                if current_options is None:
-                    os.environ[env_name] = f"log_path={args.client_log}"
-                elif "log_path=" not in current_options:
-                    os.environ[env_name] += f":log_path={args.client_log}"
-
             os.environ["CLICKHOUSE_CLIENT_OPT"] = (
                 os.environ["CLICKHOUSE_CLIENT_OPT"]
                 if "CLICKHOUSE_CLIENT_OPT" in os.environ
@@ -1719,6 +1600,13 @@ class TestCase:
             # Whether the test timed out will be decided later
             pass
 
+        debug_log = ""
+        if os.path.exists(self.testcase_args.debug_log_file):
+            with open(self.testcase_args.debug_log_file, "rb") as stream:
+                debug_log += self.testcase_args.debug_log_file + ":\n"
+                debug_log += str(stream.read(), errors="replace", encoding="utf-8")
+                debug_log += "\n"
+
         total_time = (datetime.now() - start_time).total_seconds()
 
         # Normalize randomized database names in stdout, stderr files.
@@ -1770,7 +1658,17 @@ class TestCase:
                 "https://localhost:8443/",
             )
 
-        return proc, total_time
+        stdout = ""
+        if os.path.exists(self.stdout_file):
+            with open(self.stdout_file, "rb") as stdfd:
+                stdout = str(stdfd.read(), errors="replace", encoding="utf-8")
+
+        stderr = ""
+        if os.path.exists(self.stderr_file):
+            with open(self.stderr_file, "rb") as stdfd:
+                stderr += str(stdfd.read(), errors="replace", encoding="utf-8")
+
+        return proc, stdout, stderr, debug_log, total_time
 
     def run(self, args, suite, client_options, server_logs_level):
         start_time = datetime.now()
@@ -1802,14 +1700,14 @@ class TestCase:
             if not is_valid_utf_8(self.case_file) or (
                 self.reference_file and not is_valid_utf_8(self.reference_file)
             ):
-                proc, total_time = self.run_single_test(
+                proc, stdout, stderr, debug_log, total_time = self.run_single_test(
                     server_logs_level, client_options
                 )
 
-                result = self.process_result_impl(proc, total_time)
-                result.check_if_need_retry(
-                    args, result.description, result.description, self.runs_count
+                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:
@@ -1827,16 +1725,17 @@ class TestCase:
                     ):
                         (
                             proc,
+                            stdout,
+                            stderr,
+                            debug_log,
                             total_time,
                         ) = self.run_single_test(server_logs_level, client_options)
 
-                        result = self.process_result_impl(proc, total_time)
-
+                        result = self.process_result_impl(
+                            proc, stdout, stderr, debug_log, total_time
+                        )
                         result.check_if_need_retry(
-                            args,
-                            result.description,
-                            result.description,
-                            self.runs_count,
+                            args, stdout, stderr, self.runs_count
                         )
                         # to avoid breaking CSV parser
                         result.description = result.description.replace("\0", "")
@@ -2001,9 +1900,7 @@ class TestSuite:
         return test_name
 
     @staticmethod
-    def read_test_tags_and_random_settings_limits(
-        suite_dir: str, all_tests: List[str]
-    ) -> (Dict[str, Set[str]], Dict[str, Dict[str, Tuple[int, int]]]):
+    def read_test_tags(suite_dir: str, all_tests: List[str]) -> Dict[str, Set[str]]:
         def get_comment_sign(filename):
             if filename.endswith(".sql") or filename.endswith(".sql.j2"):
                 return "--"
@@ -2028,58 +1925,27 @@ class TestSuite:
             tags = {tag.strip() for tag in tags}
             return tags
 
-        def parse_random_settings_limits_from_line(
-            line, comment_sign
-        ) -> Dict[str, Tuple[int, int]]:
-            if not line.startswith(comment_sign):
-                return {}
-            random_settings_limits_str = line[len(comment_sign) :].lstrip()
-            random_settings_limits_prefix = "Random settings limits:"
-            if not random_settings_limits_str.startswith(random_settings_limits_prefix):
-                return {}
-            random_settings_limits_str = random_settings_limits_str[
-                len(random_settings_limits_prefix) :
-            ]
-            # limits are specified in a form 'setting1=(min, max); setting2=(min,max); ...'
-            random_settings_limits = {}
-            for setting_and_limit in random_settings_limits_str.split(";"):
-                setting_and_limit = setting_and_limit.split("=")
-                random_settings_limits[setting_and_limit[0].strip()] = make_tuple(
-                    setting_and_limit[1]
-                )
-            return random_settings_limits
+        def is_shebang(line: str) -> bool:
+            return line.startswith("#!")
 
-        def find_tag_line(lines, comment_sign):
-            for line in lines:
-                if line.startswith(comment_sign) and line[
-                    len(comment_sign) :
-                ].lstrip().startswith("Tags:"):
+        def find_tag_line(file):
+            for line in file:
+                line = line.strip()
+                if line and not is_shebang(line):
                     return line
             return ""
 
-        def find_random_settings_limits_line(lines, comment_sign):
-            for line in lines:
-                if line.startswith(comment_sign) and line[
-                    len(comment_sign) :
-                ].lstrip().startswith("Random settings limits:"):
-                    return line
-            return ""
-
-        def load_tags_and_random_settings_limits_from_file(filepath):
+        def load_tags_from_file(filepath):
             comment_sign = get_comment_sign(filepath)
             need_query_params = False
             with open(filepath, "r", encoding="utf-8") as file:
                 try:
-                    lines = file.readlines()
-                    tag_line = find_tag_line(lines, comment_sign)
-                    random_settings_limits_line = find_random_settings_limits_line(
-                        lines, comment_sign
-                    )
+                    tag_line = find_tag_line(file)
                 except UnicodeDecodeError:
-                    return [], {}
+                    return []
                 try:
                     if filepath.endswith(".sql"):
-                        for line in lines:
+                        for line in file:
                             if "{CLICKHOUSE_DATABASE" in line:
                                 need_query_params = True
                 except UnicodeDecodeError:
@@ -2087,31 +1953,18 @@ class TestSuite:
             parsed_tags = parse_tags_from_line(tag_line, comment_sign)
             if need_query_params:
                 parsed_tags.add("need-query-parameters")
-            random_settings_limits = parse_random_settings_limits_from_line(
-                random_settings_limits_line, comment_sign
-            )
-            return parsed_tags, random_settings_limits
+            return parsed_tags
 
         all_tags = {}
-        all_random_settings_limits = {}
         start_time = datetime.now()
         for test_name in all_tests:
-            (
-                tags,
-                random_settings_limits,
-            ) = load_tags_and_random_settings_limits_from_file(
-                os.path.join(suite_dir, test_name)
-            )  # noqa: ignore E203
+            tags = load_tags_from_file(os.path.join(suite_dir, test_name))
             if tags:
                 all_tags[test_name] = tags
-            if random_settings_limits:
-                all_random_settings_limits[test_name] = random_settings_limits
         elapsed = (datetime.now() - start_time).total_seconds()
         if elapsed > 1:
-            print(
-                f"Tags and random settings limits for suite {suite_dir} read in {elapsed:.2f} seconds"
-            )
-        return all_tags, all_random_settings_limits
+            print(f"Tags for suite {suite_dir} read in {elapsed:.2f} seconds")
+        return all_tags
 
     def __init__(self, args, suite_path: str, suite_tmp_path: str, suite: str):
         self.args = args
@@ -2141,16 +1994,10 @@ class TestSuite:
         self.all_tests: List[str] = self.get_tests_list(
             self.tests_in_suite_key_func, filter_func
         )
+        self.all_tags: Dict[str, Set[str]] = self.read_test_tags(
+            self.suite_path, self.all_tests
+        )
 
-        all_tags_and_random_settings_limits = (
-            self.read_test_tags_and_random_settings_limits(
-                self.suite_path, self.all_tests
-            )
-        )
-        self.all_tags: Dict[str, Set[str]] = all_tags_and_random_settings_limits[0]
-        self.all_random_settings_limits: Dict[str, Dict[str, (int, int)]] = (
-            all_tags_and_random_settings_limits[1]
-        )
         self.sequential_tests = []
         self.parallel_tests = []
         for test_name in self.all_tests:
@@ -2371,6 +2218,7 @@ def run_tests_array(all_tests_with_params: Tuple[List[str], int, TestSuite, bool
                         args, test_suite, client_options, server_logs_level
                     )
                     test_result = test_case.process_result(test_result, MESSAGES)
+                    break
                 except TimeoutError:
                     break
                 finally:
@@ -2497,13 +2345,7 @@ class BuildFlags:
     POLYMORPHIC_PARTS = "polymorphic-parts"
 
 
-# Release and non-sanitizer build
-RELEASE_NON_SANITIZED = False
-
-
 def collect_build_flags(args):
-    global RELEASE_NON_SANITIZED
-
     result = []
 
     value = clickhouse_execute(
@@ -2528,8 +2370,6 @@ def collect_build_flags(args):
     elif b"RelWithDebInfo" in value or b"Release" in value:
         result.append(BuildFlags.RELEASE)
 
-    RELEASE_NON_SANITIZED = result == [BuildFlags.RELEASE]
-
     value = clickhouse_execute(
         args,
         "SELECT value FROM system.settings WHERE name = 'allow_deprecated_database_ordinary'",
@@ -2662,12 +2502,12 @@ def do_run_tests(jobs, test_suite: TestSuite):
             try:
                 clickhouse_execute(
                     args,
-                    query="SELECT 1 /*hung check*/",
-                    max_http_retries=20,
-                    timeout=10,
+                    query="SELECT 1 /*hang up check*/",
+                    max_http_retries=5,
+                    timeout=20,
                 )
             except Exception:
-                print("Hung check failed")
+                print("Hang up check failed")
                 server_died.set()
 
             if server_died.is_set():
@@ -3122,15 +2962,13 @@ def main(args):
             print(colored("\nNo queries hung.", args, "green", attrs=["bold"]))
 
     if args.client_log:
-        for log_file in [args.client_log, *glob.glob(f"{args.client_log}.*")]:
-            if not os.path.exists(log_file):
-                continue
-            with open(log_file, "rb") as stream:
+        if os.path.exists(args.client_log):
+            with open(args.client_log, "rb") as stream:
                 content = stream.read().decode()
                 if len(content):
-                    print(f"Has fatal logs from client in '{log_file}':\n")
+                    print("Has fatal logs from client:\n")
                     print(content)
-            os.remove(log_file)
+            os.remove(args.client_log)
 
     if len(restarted_tests) > 0:
         print("\nSome tests were restarted:\n")
@@ -3366,12 +3204,6 @@ def parse_args():
         default=False,
         help="Run tests over s3 storage",
     )
-    parser.add_argument(
-        "--distributed-cache",
-        action="store_true",
-        default=False,
-        help="Run tests with enabled distributed cache",
-    )
     parser.add_argument(
         "--azure-blob-storage",
         action="store_true",
@@ -3544,36 +3376,29 @@ def parse_args():
         default="./client.fatal.log",
         help="Path to file for fatal logs from client",
     )
-    parser.add_argument(
-        "--capture-client-stacktrace",
-        action="store_true",
-        help="Capture stacktraces from clickhouse-client/local on errors",
-    )
 
     return parser.parse_args()
 
 
 class Terminated(KeyboardInterrupt):
-    def __init__(self, signal):
-        self.signal = signal
+    pass
 
 
-def signal_handler(signal, frame):
-    raise Terminated(signal)
+def signal_handler(sig, frame):
+    raise Terminated(f"Terminated with {sig} signal")
 
 
 if __name__ == "__main__":
-    # Move to a new process group and kill it at exit so that we don't have any
-    # infinite tests processes left
-    # (new process group is required to avoid killing some parent processes)
-    os.setpgid(0, 0)
-
     stop_time = None
     exit_code = multiprocessing.Value("i", 0)
     server_died = multiprocessing.Event()
     multiprocessing_manager = multiprocessing.Manager()
     restarted_tests = multiprocessing_manager.list()
 
+    # Move to a new process group and kill it at exit so that we don't have any
+    # infinite tests processes left
+    # (new process group is required to avoid killing some parent processes)
+    os.setpgid(0, 0)
     signal.signal(signal.SIGTERM, signal_handler)
     signal.signal(signal.SIGINT, signal_handler)
     signal.signal(signal.SIGHUP, signal_handler)
@@ -3589,9 +3414,7 @@ if __name__ == "__main__":
             f"Cannot access the specified directory with queries ({args.queries})",
             file=sys.stderr,
         )
-        assert False, "No --queries provided"
-
-    CAPTURE_CLIENT_STACKTRACE = args.capture_client_stacktrace
+        sys.exit(1)
 
     # Autodetect the directory with queries if not specified
     if args.queries is None:
@@ -3714,14 +3537,4 @@ if __name__ == "__main__":
     if args.replace_replicated_with_shared:
         args.s3_storage = True
 
-    try:
-        main(args)
-    except ServerDied as e:
-        print(f"{e}", file=sys.stderr)
-        sys.exit(1)
-    except Terminated as e:
-        print(f"Terminated with {e.signal} signal", file=sys.stderr)
-        sys.exit(128 + e.signal)
-    except KeyboardInterrupt:
-        print("Interrupted")
-        sys.exit(128 + signal.SIGINT)
+    main(args)
diff --git a/tests/config/config.d/clusters.xml b/tests/config/config.d/clusters.xml
index ff42b5828e3..af26565d7e6 100644
--- a/tests/config/config.d/clusters.xml
+++ b/tests/config/config.d/clusters.xml
@@ -115,6 +115,10 @@
         <parallel_replicas>
             <shard>
                 <internal_replication>false</internal_replication>
+                <replica>
+                    <host>127.0.0.1</host>
+                    <port>9000</port>
+                </replica>
                 <replica>
                     <host>127.0.0.2</host>
                     <port>9000</port>
@@ -143,10 +147,6 @@
                     <host>127.0.0.8</host>
                     <port>9000</port>
                 </replica>
-                <replica>
-                    <host>127.0.0.1</host>
-                    <port>9000</port>
-                </replica>
                 <replica>
                     <host>127.0.0.9</host>
                     <port>9000</port>
diff --git a/tests/config/config.d/database_catalog_drop_table_concurrency.xml b/tests/config/config.d/database_catalog_drop_table_concurrency.xml
deleted file mode 100644
index ac118625f4e..00000000000
--- a/tests/config/config.d/database_catalog_drop_table_concurrency.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<clickhouse>
-    <database_catalog_drop_table_concurrency>256</database_catalog_drop_table_concurrency>
-</clickhouse>
diff --git a/tests/config/config.d/rocksdb.xml b/tests/config/config.d/rocksdb.xml
index 3002e008a2d..a3790a3dc1d 100644
--- a/tests/config/config.d/rocksdb.xml
+++ b/tests/config/config.d/rocksdb.xml
@@ -1,8 +1,7 @@
 <clickhouse>
     <rocksdb>
         <options>
-            <!-- https://github.com/ClickHouse/ClickHouse/pull/67274#issuecomment-2255301116 -->
-            <info_log_level>ERROR_LEVEL</info_log_level>
+            <info_log_level>DEBUG_LEVEL</info_log_level>
         </options>
     </rocksdb>
 </clickhouse>
diff --git a/tests/config/config.d/storage_conf.xml b/tests/config/config.d/storage_conf.xml
index 091071f0637..7a9b579c00a 100644
--- a/tests/config/config.d/storage_conf.xml
+++ b/tests/config/config.d/storage_conf.xml
@@ -20,14 +20,12 @@
                 <disk>s3_disk</disk>
                 <path>s3_cache/</path>
                 <max_size>104857600</max_size>
-                <max_file_segment_size>5Mi</max_file_segment_size>
                 <cache_on_write_operations>1</cache_on_write_operations>
                 <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
                 <cache_policy>LRU</cache_policy>
                 <slru_size_ratio>0.3</slru_size_ratio>
                 <keep_free_space_size_ratio>0.15</keep_free_space_size_ratio>
                 <keep_free_space_elements_ratio>0.15</keep_free_space_elements_ratio>
-                <load_metadata_asynchronously>0</load_metadata_asynchronously>
             </s3_cache>
             <s3_cache_02933>
                 <type>cache</type>
@@ -38,7 +36,6 @@
                 <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
                 <background_download_threads>0</background_download_threads>
                 <background_download_queue_size_limit>0</background_download_queue_size_limit>
-                <load_metadata_asynchronously>0</load_metadata_asynchronously>
             </s3_cache_02933>
             <!-- local disks -->
             <local_disk>
diff --git a/tests/config/config.d/storage_conf_02944.xml b/tests/config/config.d/storage_conf_02944.xml
index 08d78900229..5f45640a923 100644
--- a/tests/config/config.d/storage_conf_02944.xml
+++ b/tests/config/config.d/storage_conf_02944.xml
@@ -19,7 +19,6 @@
                 <boundary_alignment>10</boundary_alignment>
                 <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
                 <cache_on_write_operations>0</cache_on_write_operations>
-                <load_metadata_asynchronously>0</load_metadata_asynchronously>
             </s3_cache_02944>
         </disks>
     </storage_configuration>
diff --git a/tests/config/config.d/transactions.xml b/tests/config/config.d/transactions.xml
index 64e166b81b5..9948b1f1865 100644
--- a/tests/config/config.d/transactions.xml
+++ b/tests/config/config.d/transactions.xml
@@ -1,4 +1,4 @@
-<clickhouse>
+<yandex>
     <allow_experimental_transactions>42</allow_experimental_transactions>
 
     <merge_tree>
@@ -18,4 +18,4 @@
         <!-- Fault injection after commit should not affect tests, because default waiting mode is WAIT_UNKNOWN -->
         <fault_probability_after_commit>0.01</fault_probability_after_commit>
     </transaction_log>
-</clickhouse>
+</yandex>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index fda74bd7a8d..1b0edc5fc16 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -21,7 +21,6 @@ ln -sf $SRC_PATH/config.d/listen.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/text_log.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/blob_storage_log.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/custom_settings_prefixes.xml $DEST_SERVER_PATH/config.d/
-ln -sf $SRC_PATH/config.d/database_catalog_drop_table_concurrency.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/enable_access_control_improvements.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/macros.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/secure_ports.xml $DEST_SERVER_PATH/config.d/
@@ -94,7 +93,6 @@ ln -sf $SRC_PATH/users.d/prefetch_settings.xml $DEST_SERVER_PATH/users.d/
 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/
-ln -sf $SRC_PATH/users.d/limits.yaml $DEST_SERVER_PATH/users.d/
 
 if [[ -n "$USE_OLD_ANALYZER" ]] && [[ "$USE_OLD_ANALYZER" -eq 1 ]]; then
     ln -sf $SRC_PATH/users.d/analyzer.xml $DEST_SERVER_PATH/users.d/
diff --git a/tests/config/users.d/database_replicated.xml b/tests/config/users.d/database_replicated.xml
index 1c2cf2ac22b..c049c3559fc 100644
--- a/tests/config/users.d/database_replicated.xml
+++ b/tests/config/users.d/database_replicated.xml
@@ -6,7 +6,6 @@
             <distributed_ddl_task_timeout>120</distributed_ddl_task_timeout>
             <database_replicated_always_detach_permanently>1</database_replicated_always_detach_permanently>
             <database_replicated_enforce_synchronous_settings>1</database_replicated_enforce_synchronous_settings>
-            <database_replicated_allow_replicated_engine_arguments>3</database_replicated_allow_replicated_engine_arguments>
         </default>
     </profiles>
 </clickhouse>
diff --git a/tests/config/users.d/limits.yaml b/tests/config/users.d/limits.yaml
deleted file mode 100644
index 53cbbfa744a..00000000000
--- a/tests/config/users.d/limits.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-profiles:
-  default:
-    max_memory_usage: 5G
-    max_rows_to_read: 20000000
-
-    # Also set every other limit to a high value, so it will not limit anything, but we will test that code around it.
-    s3_max_get_rps: 1000000
-    s3_max_get_burst: 2000000
-    s3_max_put_rps: 1000000
-    s3_max_put_burst: 2000000
-    max_remote_read_network_bandwidth: 1T
-    max_remote_write_network_bandwidth: 1T
-    max_local_read_bandwidth: 1T
-    max_local_write_bandwidth: 1T
-    use_index_for_in_with_subqueries_max_values: 1G
-    max_bytes_to_read: 1T
-    max_bytes_to_read_leaf: 1T
-    max_rows_to_group_by: 10G
-    max_bytes_before_external_group_by: 10G
-    max_rows_to_sort: 10G
-    max_bytes_to_sort: 10G
-    max_bytes_before_external_sort: 10G
-    max_result_rows: 1G
-    max_result_bytes: 1G
-    max_execution_time: 600
-    max_execution_time_leaf: 600
-    max_execution_speed: 100G
-    max_execution_speed_bytes: 10T
-    timeout_before_checking_execution_speed: 300
-    max_estimated_execution_time: 600
-    max_columns_to_read: 20K
-    max_temporary_columns: 20K
-    max_temporary_non_const_columns: 20K
-    max_rows_in_set: 10G
-    max_bytes_in_set: 10G
-    max_rows_in_join: 10G
-    max_bytes_in_join: 10G
-    max_rows_to_transfer: 1G
-    max_bytes_to_transfer: 1G
-    max_rows_in_distinct: 10G
-    max_bytes_in_distinct: 10G
-    max_memory_usage_for_user: 32G
-    max_network_bandwidth: 100G
-    max_network_bytes: 1T
-    max_network_bandwidth_for_user: 100G
-    max_network_bandwidth_for_all_users: 100G
-    max_temporary_data_on_disk_size_for_user: 100G
-    max_temporary_data_on_disk_size_for_query: 100G
-    max_backup_bandwidth: 100G
-    max_hyperscan_regexp_length: 1M
-    max_hyperscan_regexp_total_length: 10M
-    query_cache_max_size_in_bytes: 10M
-    query_cache_max_entries: 100K
-    external_storage_max_read_rows: 10G
-    external_storage_max_read_bytes: 10G
-    max_streams_for_merge_tree_reading: 1000
diff --git a/tests/docker_scripts/attach_gdb.lib b/tests/docker_scripts/attach_gdb.lib
deleted file mode 100644
index 4170a19176c..00000000000
--- a/tests/docker_scripts/attach_gdb.lib
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-# shellcheck source=./utils.lib
-source /repo/tests/docker_scripts/utils.lib
-
-function attach_gdb_to_clickhouse()
-{
-    IS_ASAN=$(clickhouse-client --query "SELECT count() FROM system.build_options WHERE name = 'CXX_FLAGS' AND position('sanitize=address' IN value)")
-    if [[ "$IS_ASAN" = "1" ]];
-    then
-        echo "ASAN build detected. Not using gdb since it disables LeakSanitizer detections"
-    else
-            # Set follow-fork-mode to parent, because we attach to clickhouse-server, not to watchdog
-            # and clickhouse-server can do fork-exec, for example, to run some bridge.
-            # Do not set nostop noprint for all signals, because some it may cause gdb to hang,
-            # explicitly ignore non-fatal signals that are used by server.
-            # Number of SIGRTMIN can be determined only in runtime.
-            RTMIN=$(kill -l SIGRTMIN)
-            # shellcheck disable=SC2016
-            echo "
-        set follow-fork-mode parent
-        handle SIGHUP nostop noprint pass
-        handle SIGINT nostop noprint pass
-        handle SIGQUIT nostop noprint pass
-        handle SIGPIPE nostop noprint pass
-        handle SIGTERM nostop noprint pass
-        handle SIGUSR1 nostop noprint pass
-        handle SIGUSR2 nostop noprint pass
-        handle SIG$RTMIN nostop noprint pass
-        info signals
-        continue
-        backtrace full
-        info registers
-        p "top 1 KiB of the stack:"
-        p/x *(uint64_t[128]*)"'$sp'"
-        maintenance info sections
-        thread apply all backtrace full
-        disassemble /s
-        up
-        disassemble /s
-        up
-        disassemble /s
-        p \"done\"
-        detach
-        quit
-        " > script.gdb
-
-            # FIXME Hung check may work incorrectly because of attached gdb
-            # We cannot attach another gdb to get stacktraces if some queries hung
-            gdb -batch -command script.gdb -p "$(cat /var/run/clickhouse-server/clickhouse-server.pid)" | ts '%Y-%m-%d %H:%M:%S' >> /test_output/gdb.log &
-            sleep 5
-            # gdb will send SIGSTOP, spend some time loading debug info and then send SIGCONT, wait for it (up to send_timeout, 300s)
-            run_with_retry 60 clickhouse-client --query "SELECT 'Connected to clickhouse-server after attaching gdb'"
-    fi
-}
-
-# vi: ft=bash
diff --git a/tests/fuzz/README.md b/tests/fuzz/README.md
new file mode 100644
index 00000000000..6b5b161b2d5
--- /dev/null
+++ b/tests/fuzz/README.md
@@ -0,0 +1,23 @@
+The list of functions generated via the following query
+
+```
+    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 the following query:
+
+```
+    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 30af3746fca..f08e319f0d4 100644
--- a/tests/fuzz/all.dict
+++ b/tests/fuzz/all.dict
@@ -1,991 +1,38 @@
-"ADD COLUMN"
-"ADD CONSTRAINT"
-"ADD INDEX"
-"ADD PROJECTION"
-"ADD STATISTICS"
-"ADD"
-"ADMIN OPTION FOR"
-"AFTER"
-"ALGORITHM"
-"ALIAS"
-"ALL"
-"ALLOWED_LATENESS"
-"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"
-"ALTER"
-"AND STDOUT"
-"AND"
-"ANTI"
-"ANY"
-"APPEND"
-"APPLY DELETED MASK"
-"APPLY"
-"ARRAY JOIN"
-"AS"
-"ASC"
-"ASCENDING"
-"ASOF"
-"ASSUME"
-"AST"
-"ASYNC"
-"ATTACH PART"
-"ATTACH PARTITION"
-"ATTACH POLICY"
-"ATTACH PROFILE"
-"ATTACH QUOTA"
-"ATTACH ROLE"
-"ATTACH ROW POLICY"
-"ATTACH SETTINGS PROFILE"
-"ATTACH USER"
-"ATTACH"
-"AUTO_INCREMENT"
-"AZURE"
-"AggregateFunction"
-"Array"
-"BACKUP"
-"BCRYPT_HASH"
-"BCRYPT_PASSWORD"
-"BEGIN TRANSACTION"
-"BETWEEN"
-"BIDIRECTIONAL"
-"BIGINT SIGNED"
-"BIGINT UNSIGNED"
-"BIGINT"
-"BINARY LARGE OBJECT"
-"BINARY VARYING"
-"BINARY"
-"BIT"
-"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"
-"BLOB"
-"BOTH"
-"BY"
-"BYTE"
-"BYTEA"
-"Bool"
-"CASCADE"
-"CASE"
-"CAST"
-"CHANGE"
-"CHANGEABLE_IN_READONLY"
-"CHANGED"
-"CHAR LARGE OBJECT"
-"CHAR VARYING"
-"CHAR"
-"CHARACTER LARGE OBJECT"
-"CHARACTER VARYING"
-"CHARACTER"
-"CHARACTER_LENGTH"
-"CHAR_LENGTH"
-"CHECK ALL TABLES"
-"CHECK TABLE"
-"CHECK"
-"CLEANUP"
-"CLEAR COLUMN"
-"CLEAR INDEX"
-"CLEAR PROJECTION"
-"CLEAR STATISTICS"
-"CLOB"
-"CLUSTER"
-"CLUSTERS"
-"CN"
-"CODEC"
-"COLLATE"
-"COLUMN"
-"COLUMNS"
-"COMMENT COLUMN"
-"COMMENT"
-"COMMIT"
-"COMPRESSION"
-"CONST"
-"CONSTRAINT"
-"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"
-"CREATE POLICY"
-"CREATE PROFILE"
-"CREATE QUOTA"
-"CREATE ROLE"
-"CREATE ROW POLICY"
-"CREATE SETTINGS PROFILE"
-"CREATE TABLE"
-"CREATE TEMPORARY TABLE"
-"CREATE USER"
-"CREATE"
-"CROSS"
-"CUBE"
-"CURRENT GRANTS"
-"CURRENT QUOTA"
-"CURRENT ROLES"
-"CURRENT ROW"
-"CURRENT TRANSACTION"
-"CURRENTUSER"
-"CURRENT_USER"
-"D"
-"DATA INNER UUID"
-"DATA"
-"DATABASE"
-"DATABASES"
-"DATE"
-"DATEADD"
-"DATEDIFF"
-"DATESUB"
-"DATE_ADD"
-"DATE_DIFF"
-"DATE_FORMAT"
-"DATE_SUB"
-"DATE_TRUNC"
-"DAY"
-"DAYOFMONTH"
-"DAYOFWEEK"
-"DAYOFYEAR"
-"DAYS"
-"DD"
-"DEC"
-"DEDUPLICATE"
-"DEFAULT DATABASE"
-"DEFAULT ROLE"
-"DEFAULT"
-"DEFINER"
-"DELETE WHERE"
-"DELETE"
-"DEPENDS ON"
-"DESC"
-"DESCENDING"
-"DESCRIBE"
-"DETACH PART"
-"DETACH PARTITION"
-"DETACH"
-"DICTIONARIES"
-"DICTIONARY"
-"DISK"
-"DISTINCT ON"
-"DISTINCT"
-"DIV"
-"DOUBLE PRECISION"
-"DOUBLE"
-"DOUBLE_SHA1_HASH"
-"DOUBLE_SHA1_PASSWORD"
-"DROP COLUMN"
-"DROP CONSTRAINT"
-"DROP DEFAULT"
-"DROP DETACHED PART"
-"DROP DETACHED PARTITION"
-"DROP INDEX"
-"DROP PART"
-"DROP PARTITION"
-"DROP PROJECTION"
-"DROP STATISTICS"
-"DROP TABLE"
-"DROP TEMPORARY TABLE"
-"DROP"
-"Date"
-"Date32"
-"DateTime"
-"DateTime32"
-"DateTime64"
-"Decimal"
-"Decimal128"
-"Decimal256"
-"Decimal32"
-"Decimal64"
-"Dynamic"
-"ELSE"
-"EMPTY AS"
-"EMPTY"
-"ENABLED ROLES"
-"END"
-"ENFORCED"
-"ENGINE"
-"ENUM"
-"EPHEMERAL SEQUENTIAL"
-"EPHEMERAL"
-"ESTIMATE"
-"EVENT"
-"EVENTS"
-"EVERY"
-"EXCEPT DATABASE"
-"EXCEPT DATABASES"
-"EXCEPT TABLE"
-"EXCEPT TABLES"
-"EXCEPT"
-"EXCHANGE DICTIONARIES"
-"EXCHANGE TABLES"
-"EXISTS"
-"EXPLAIN"
-"EXPRESSION"
-"EXTENDED"
-"EXTERNAL DDL FROM"
-"EXTRACT"
-"Enum"
-"Enum16"
-"Enum8"
-"FALSE"
-"FETCH PART"
-"FETCH PARTITION"
-"FETCH"
-"FIELDS"
-"FILE"
-"FILESYSTEM CACHE"
-"FILESYSTEM CACHES"
-"FILTER"
-"FINAL"
-"FIRST"
-"FIXED"
-"FLOAT"
-"FOLLOWING"
-"FOR"
-"FOREIGN KEY"
-"FOREIGN"
-"FORGET PARTITION"
-"FORMAT"
-"FORMAT_BYTES"
-"FQDN"
-"FREEZE"
-"FROM INFILE"
-"FROM SHARD"
-"FROM"
-"FROM_BASE64"
-"FROM_DAYS"
-"FROM_UNIXTIME"
-"FULL"
-"FULLTEXT"
-"FUNCTION"
-"FixedString"
-"Float32"
-"Float64"
-"ForEach"
-"GEOMETRY"
-"GLOBAL IN"
-"GLOBAL NOT IN"
-"GLOBAL"
-"GRANT OPTION FOR"
-"GRANT"
-"GRANTEES"
-"GRANULARITY"
-"GROUP BY"
-"GROUPING SETS"
-"GROUPS"
-"H"
-"HASH"
-"HAVING"
-"HDFS"
-"HH"
-"HIERARCHICAL"
-"HOST"
-"HOUR"
-"HOURS"
-"HTTP"
-"ID"
-"IDENTIFIED"
-"IF EMPTY"
-"IF EXISTS"
-"IF NOT EXISTS"
-"IGNORE NULLS"
-"ILIKE"
-"IN PARTITION"
-"IN"
-"INDEX"
-"INDEXES"
-"INDICES"
-"INET4"
-"INET6"
-"INET6_ATON"
-"INET6_NTOA"
-"INET_ATON"
-"INET_NTOA"
-"INHERIT"
-"INJECTIVE"
-"INNER"
-"INSERT INTO"
-"INT SIGNED"
-"INT UNSIGNED"
-"INT"
-"INT1 SIGNED"
-"INT1 UNSIGNED"
-"INT1"
-"INTEGER SIGNED"
-"INTEGER UNSIGNED"
-"INTEGER"
-"INTERPOLATE"
-"INTERSECT"
-"INTERVAL"
-"INTO OUTFILE"
-"INVISIBLE"
-"INVOKER"
-"IP"
-"IPv4"
-"IPv4CIDRToRange"
-"IPv4NumToString"
-"IPv4NumToStringClassC"
-"IPv4StringToNum"
-"IPv4StringToNumOrDefault"
-"IPv4StringToNumOrNull"
-"IPv4ToIPv6"
-"IPv6"
-"IPv6CIDRToRange"
-"IPv6NumToString"
-"IPv6StringToNum"
-"IPv6StringToNumOrDefault"
-"IPv6StringToNumOrNull"
-"IS NOT DISTINCT FROM"
-"IS NOT NULL"
-"IS NULL"
-"IS_OBJECT_ID"
-"Int128"
-"Int16"
-"Int256"
-"Int32"
-"Int64"
-"Int8"
-"IntervalDay"
-"IntervalHour"
-"IntervalMicrosecond"
-"IntervalMillisecond"
-"IntervalMinute"
-"IntervalMonth"
-"IntervalNanosecond"
-"IntervalQuarter"
-"IntervalSecond"
-"IntervalWeek"
-"IntervalYear"
-"JOIN"
-"JSON"
-"JSONArrayLength"
-"JSONExtract"
-"JSONExtractArrayRaw"
-"JSONExtractBool"
-"JSONExtractFloat"
-"JSONExtractInt"
-"JSONExtractKeys"
-"JSONExtractKeysAndValues"
-"JSONExtractKeysAndValuesRaw"
-"JSONExtractRaw"
-"JSONExtractString"
-"JSONExtractUInt"
-"JSONHas"
-"JSONKey"
-"JSONLength"
-"JSONMergePatch"
-"JSONType"
-"JSON_ARRAY_LENGTH"
-"JSON_EXISTS"
-"JSON_QUERY"
-"JSON_VALUE"
-"JWT"
-"KERBEROS"
-"KEY BY"
-"KEY"
-"KEYED BY"
-"KEYS"
-"KILL"
-"KIND"
-"L1Distance"
-"L1Norm"
-"L1Normalize"
-"L2Distance"
-"L2Norm"
-"L2Normalize"
-"L2SquaredDistance"
-"L2SquaredNorm"
-"LARGE OBJECT"
-"LAST"
-"LAST_DAY"
-"LAYOUT"
-"LDAP"
-"LEADING"
-"LEFT ARRAY JOIN"
-"LEFT"
-"LESS THAN"
-"LEVEL"
-"LIFETIME"
-"LIGHTWEIGHT"
-"LIKE"
-"LIMIT"
-"LINEAR"
-"LIST"
-"LIVE"
-"LOCAL"
-"LONGBLOB"
-"LONGTEXT"
-"LTRIM"
-"LineString"
-"LinfDistance"
-"LinfNorm"
-"LinfNormalize"
-"LowCardinality"
-"LpDistance"
-"LpNorm"
-"LpNormalize"
-"M"
-"MACNumToString"
-"MACStringToNum"
-"MACStringToOUI"
-"MAP_FROM_ARRAYS"
-"MATCH"
-"MATERIALIZE COLUMN"
-"MATERIALIZE INDEX"
-"MATERIALIZE PROJECTION"
-"MATERIALIZE STATISTICS"
-"MATERIALIZE TTL"
-"MATERIALIZE"
-"MATERIALIZED"
-"MAX"
-"MCS"
-"MD4"
-"MD5"
-"MEDIUMBLOB"
-"MEDIUMINT SIGNED"
-"MEDIUMINT UNSIGNED"
-"MEDIUMINT"
-"MEDIUMTEXT"
-"MEMORY"
-"MERGES"
-"METRICS INNER UUID"
-"METRICS"
-"MI"
-"MICROSECOND"
-"MICROSECONDS"
-"MILLISECOND"
-"MILLISECONDS"
-"MIN"
-"MINUTE"
-"MINUTES"
-"MM"
-"MOD"
-"MODIFY COLUMN"
-"MODIFY COMMENT"
-"MODIFY DEFINER"
-"MODIFY ORDER BY"
-"MODIFY QUERY"
-"MODIFY REFRESH"
-"MODIFY SAMPLE BY"
-"MODIFY SETTING"
-"MODIFY SQL SECURITY"
-"MODIFY STATISTICS"
-"MODIFY TTL"
-"MODIFY"
-"MONTH"
-"MONTHS"
-"MOVE PART"
-"MOVE PARTITION"
-"MOVE"
-"MS"
-"MUTATION"
-"Map"
-"Merge"
-"MultiLineString"
-"MultiPolygon"
-"N"
-"NAME"
-"NAMED COLLECTION"
-"NANOSECOND"
-"NANOSECONDS"
-"NATIONAL CHAR VARYING"
-"NATIONAL CHAR"
-"NATIONAL CHARACTER LARGE OBJECT"
-"NATIONAL CHARACTER VARYING"
-"NATIONAL CHARACTER"
-"NCHAR LARGE OBJECT"
-"NCHAR VARYING"
-"NCHAR"
-"NEXT"
-"NO ACTION"
-"NO DELAY"
-"NO LIMITS"
-"NONE"
-"NOT BETWEEN"
-"NOT IDENTIFIED"
-"NOT ILIKE"
-"NOT IN"
-"NOT KEYED"
-"NOT LIKE"
-"NOT OVERRIDABLE"
-"NOT"
-"NO_PASSWORD"
-"NS"
-"NULL"
-"NULLS"
-"NUMERIC"
-"NVARCHAR"
-"Nested"
-"Nothing"
-"Null"
-"Nullable"
-"OCTET_LENGTH"
-"OFFSET"
-"ON DELETE"
-"ON UPDATE"
-"ON VOLUME"
-"ON"
-"ONLY"
-"OPTIMIZE TABLE"
-"OR REPLACE"
-"OR"
-"ORDER BY"
-"OUTER"
-"OVER"
-"OVERRIDABLE"
-"Object"
-"PART"
-"PARTIAL"
-"PARTITION BY"
-"PARTITION"
-"PARTITIONS"
-"PART_MOVE_TO_SHARD"
-"PASTE"
-"PERIODIC REFRESH"
-"PERMANENTLY"
-"PERMISSIVE"
-"PERSISTENT SEQUENTIAL"
-"PERSISTENT"
-"PIPELINE"
-"PLAINTEXT_PASSWORD"
-"PLAN"
-"POPULATE"
-"PRECEDING"
-"PRECISION"
-"PREWHERE"
-"PRIMARY KEY"
-"PRIMARY"
-"PROFILE"
-"PROJECTION"
-"PULL"
-"Point"
-"Polygon"
-"Protobuf"
-"Q"
-"QQ"
-"QUALIFY"
-"QUARTER"
-"QUARTERS"
-"QUERY TREE"
-"QUERY"
-"QUOTA"
-"RANDOMIZE FOR"
-"RANDOMIZED"
-"RANGE"
-"READONLY"
-"REAL"
-"REALM"
-"RECOMPRESS"
-"RECURSIVE"
-"REFERENCES"
-"REFRESH"
-"REGEXP"
-"REGEXP_EXTRACT"
-"REGEXP_MATCHES"
-"REGEXP_REPLACE"
-"REMOVE SAMPLE BY"
-"REMOVE TTL"
-"REMOVE"
-"RENAME COLUMN"
-"RENAME DATABASE"
-"RENAME DICTIONARY"
-"RENAME TABLE"
-"RENAME TO"
-"RENAME"
-"REPLACE PARTITION"
-"REPLACE"
-"RESET SETTING"
-"RESPECT NULLS"
-"RESTORE"
-"RESTRICT"
-"RESTRICTIVE"
-"RESUME"
-"REVOKE"
-"RIGHT"
-"ROLLBACK"
-"ROLLUP"
-"ROW"
-"ROWS"
-"RTRIM"
-"Resample"
-"Ring"
-"S"
-"S3"
-"SALT"
-"SAMPLE BY"
-"SAMPLE"
-"SAN"
-"SCHEMA"
-"SCHEME"
-"SECOND"
-"SECONDS"
-"SELECT"
-"SEMI"
-"SERVER"
-"SET DEFAULT ROLE"
-"SET DEFAULT"
-"SET FAKE TIME"
-"SET NULL"
-"SET ROLE DEFAULT"
-"SET ROLE"
-"SET TRANSACTION SNAPSHOT"
-"SET"
-"SETTINGS"
-"SHA1"
-"SHA224"
-"SHA256"
-"SHA256_HASH"
-"SHA256_PASSWORD"
-"SHA384"
-"SHA512"
-"SHA512_256"
-"SHOW ACCESS"
-"SHOW CREATE"
-"SHOW ENGINES"
-"SHOW FUNCTIONS"
-"SHOW GRANTS"
-"SHOW PRIVILEGES"
-"SHOW PROCESSLIST"
-"SHOW SETTING"
-"SHOW"
-"SIGNED"
-"SIMPLE"
-"SINGLE"
-"SMALLINT SIGNED"
-"SMALLINT UNSIGNED"
-"SMALLINT"
-"SOURCE"
-"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"
-"START TRANSACTION"
-"STATISTICS"
-"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"
-"STEP"
-"STORAGE"
-"STRICT"
-"STRICTLY_ASCENDING"
-"SUBPARTITION BY"
-"SUBPARTITION"
-"SUBPARTITIONS"
-"SUBSTRING"
-"SUBSTRING_INDEX"
-"SUSPEND"
-"SVG"
-"SYNC"
-"SYNTAX"
-"SYSTEM"
-"SimpleAggregateFunction"
-"State"
-"String"
-"TABLE OVERRIDE"
-"TABLE"
-"TABLES"
-"TAGS INNER UUID"
-"TAGS"
-"TEMPORARY TABLE"
-"TEMPORARY"
-"TEST"
-"TEXT"
-"THEN"
-"TIME"
-"TIMESTAMP"
-"TIMESTAMPADD"
-"TIMESTAMPDIFF"
-"TIMESTAMPSUB"
-"TIMESTAMP_ADD"
-"TIMESTAMP_DIFF"
-"TIMESTAMP_SUB"
-"TINYBLOB"
-"TINYINT SIGNED"
-"TINYINT UNSIGNED"
-"TINYINT"
-"TINYTEXT"
-"TO DISK"
-"TO INNER UUID"
-"TO SHARD"
-"TO TABLE"
-"TO VOLUME"
-"TO"
-"TOP"
-"TOTALS"
-"TO_BASE64"
-"TO_DAYS"
-"TO_UNIXTIME"
-"TRACKING ONLY"
-"TRAILING"
-"TRANSACTION"
-"TRIGGER"
-"TRIM"
-"TRUE"
-"TRUNCATE"
-"TTL"
-"TYPE"
-"TYPEOF"
-"Tuple"
-"UInt128"
-"UInt16"
-"UInt256"
-"UInt32"
-"UInt64"
-"UInt8"
-"ULIDStringToDateTime"
-"UNBOUNDED"
-"UNDROP"
-"UNFREEZE"
-"UNION"
-"UNIQUE"
-"UNSET FAKE TIME"
-"UNSIGNED"
-"UPDATE"
-"URL"
-"URLHash"
-"URLHierarchy"
-"URLPathHierarchy"
-"USE"
-"USING"
-"UTCTimestamp"
-"UTC_timestamp"
-"UUID"
-"UUIDNumToString"
-"UUIDStringToNum"
-"UUIDToNum"
-"UUIDv7ToDateTime"
-"VALID UNTIL"
-"VALUES"
-"VARBINARY"
-"VARCHAR"
-"VARCHAR2"
-"VARYING"
-"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"
-"VIEW"
-"VISIBLE"
-"Variant"
-"WATCH"
-"WATERMARK"
-"WEEK"
-"WEEKS"
-"WHEN"
-"WHERE"
-"WINDOW"
-"WITH ADMIN OPTION"
-"WITH CHECK"
-"WITH FILL"
-"WITH GRANT OPTION"
-"WITH NAME"
-"WITH REPLACE OPTION"
-"WITH TIES"
-"WITH"
-"WITH_ITEMINDEX"
-"WK"
-"WRITABLE"
-"WW"
-"YEAR"
-"YEARS"
-"YY"
-"YYYY"
-"YYYYMMDDToDate"
-"YYYYMMDDToDate32"
-"YYYYMMDDhhmmssToDateTime"
-"YYYYMMDDhhmmssToDateTime64"
-"ZKPATH"
-"_CAST"
-"__actionName"
-"__bitBoolMaskAnd"
-"__bitBoolMaskOr"
-"__bitSwapLastTwo"
-"__bitWrapperFunc"
-"__getScalar"
-"__scalarSubqueryResult"
 "abs"
 "accurateCast"
 "accurateCastOrDefault"
 "accurateCastOrNull"
 "acos"
 "acosh"
+"ADD"
+"ADD COLUMN"
+"ADD CONSTRAINT"
 "addDate"
 "addDays"
 "addHours"
+"ADD INDEX"
 "addInterval"
 "addMicroseconds"
 "addMilliseconds"
 "addMinutes"
 "addMonths"
 "addNanoseconds"
+"ADD PROJECTION"
 "addQuarters"
-"addSeconds"
-"addTupleOfIntervals"
-"addWeeks"
-"addYears"
 "addressToLine"
 "addressToLineWithInlines"
 "addressToSymbol"
+"addSeconds"
+"ADD STATISTIC"
+"addTupleOfIntervals"
+"addWeeks"
+"addYears"
+"ADMIN OPTION FOR"
 "aes_decrypt_mysql"
 "aes_encrypt_mysql"
+"AFTER"
 "age"
+"AggregateFunction"
 "aggThrow"
 "aggThrowArgMax"
 "aggThrowArgMin"
@@ -1001,7 +48,24 @@
 "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"
@@ -1018,6 +82,8 @@
 "analysisOfVarianceSimpleState"
 "analysisOfVarianceState"
 "and"
+"AND"
+"AND STDOUT"
 "anova"
 "anovaArgMax"
 "anovaArgMin"
@@ -1033,7 +99,9 @@
 "anovaResample"
 "anovaSimpleState"
 "anovaState"
+"ANTI"
 "any"
+"ANY"
 "anyArgMax"
 "anyArgMin"
 "anyArray"
@@ -1068,8 +136,6 @@
 "anyLastOrDefault"
 "anyLastOrNull"
 "anyLastResample"
-"anyLastSimpleState"
-"anyLastState"
 "anyLast_respect_nulls"
 "anyLast_respect_nullsArgMax"
 "anyLast_respect_nullsArgMin"
@@ -1085,14 +151,14 @@
 "anyLast_respect_nullsResample"
 "anyLast_respect_nullsSimpleState"
 "anyLast_respect_nullsState"
+"anyLastSimpleState"
+"anyLastState"
 "anyMap"
 "anyMerge"
 "anyNull"
 "anyOrDefault"
 "anyOrNull"
 "anyResample"
-"anySimpleState"
-"anyState"
 "any_respect_nulls"
 "any_respect_nullsArgMax"
 "any_respect_nullsArgMin"
@@ -1108,6 +174,8 @@
 "any_respect_nullsResample"
 "any_respect_nullsSimpleState"
 "any_respect_nullsState"
+"anySimpleState"
+"anyState"
 "any_value"
 "any_valueArgMax"
 "any_valueArgMin"
@@ -1121,8 +189,6 @@
 "any_valueOrDefault"
 "any_valueOrNull"
 "any_valueResample"
-"any_valueSimpleState"
-"any_valueState"
 "any_value_respect_nulls"
 "any_value_respect_nullsArgMax"
 "any_value_respect_nullsArgMin"
@@ -1138,7 +204,12 @@
 "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"
@@ -1215,11 +286,42 @@
 "argMinSimpleState"
 "argMinState"
 "array"
-"arrayAUC"
+"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"
@@ -1243,6 +345,7 @@
 "arrayIntersect"
 "arrayJaccardIndex"
 "arrayJoin"
+"ARRAY JOIN"
 "arrayLast"
 "arrayLastIndex"
 "arrayLastOrNull"
@@ -1279,43 +382,31 @@
 "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"
+"AS"
+"ASC"
+"ASCENDING"
 "ascii"
 "asin"
 "asinh"
+"ASOF"
+"ASSUME"
 "assumeNotNull"
+"AST"
+"ASYNC"
 "atan"
 "atan2"
 "atanh"
+"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"
@@ -1346,32 +437,49 @@
 "avgWeightedResample"
 "avgWeightedSimpleState"
 "avgWeightedState"
+"AZURE"
+"BACKUP"
 "bagexpansion"
 "bar"
 "base58Decode"
 "base58Encode"
 "base64Decode"
 "base64Encode"
-"base64URLDecode"
-"base64URLEncode"
 "base_backup"
 "basename"
+"BCRYPT_HASH"
+"BCRYPT_PASSWORD"
+"BEGIN TRANSACTION"
+"BETWEEN"
+"BIDIRECTIONAL"
+"BIGINT"
+"BIGINT SIGNED"
+"BIGINT UNSIGNED"
 "bin"
+"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"
 "bitHammingDistance"
-"bitNot"
-"bitOr"
-"bitPositionsToArray"
-"bitRotateLeft"
-"bitRotateRight"
-"bitShiftLeft"
-"bitShiftRight"
-"bitSlice"
-"bitTest"
-"bitTestAll"
-"bitTestAny"
-"bitXor"
 "bitmapAnd"
 "bitmapAndCardinality"
 "bitmapAndnot"
@@ -1393,11 +501,59 @@
 "bitmapXorCardinality"
 "bitmaskToArray"
 "bitmaskToList"
+"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"
+"bitTestAny"
+"__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"
+"Bool"
 "boolean"
+"BOTH"
 "boundingRatio"
 "boundingRatioArgMax"
 "boundingRatioArgMin"
@@ -1414,14 +570,21 @@
 "boundingRatioSimpleState"
 "boundingRatioState"
 "buildId"
+"BY"
+"BYTE"
+"BYTEA"
 "byteHammingDistance"
 "byteSize"
 "byteSlice"
 "byteSwap"
+"CASCADE"
+"CASE"
 "caseWithExpr"
 "caseWithExpression"
 "caseWithoutExpr"
 "caseWithoutExpression"
+"_CAST"
+"CAST"
 "catboostEvaluate"
 "categoricalInformationValue"
 "categoricalInformationValueArgMax"
@@ -1441,24 +604,50 @@
 "cbrt"
 "ceil"
 "ceiling"
-"changeDay"
-"changeHour"
-"changeMinute"
-"changeMonth"
-"changeSecond"
-"changeYear"
+"CHANGE"
+"CHANGEABLE_IN_READONLY"
+"CHANGED"
 "char"
+"CHAR"
+"CHARACTER"
+"CHARACTER LARGE OBJECT"
+"CHARACTER_LENGTH"
+"CHARACTER VARYING"
+"CHAR LARGE OBJECT"
+"CHAR_LENGTH"
+"CHAR VARYING"
+"CHECK"
+"CHECK ALL TABLES"
+"CHECK TABLE"
 "cityHash64"
-"clamp"
+"CLEANUP"
+"CLEAR COLUMN"
+"CLEAR INDEX"
+"CLEAR PROJECTION"
+"CLEAR STATISTIC"
+"CLOB"
+"CLUSTER"
 "cluster_host_ids"
+"CLUSTERS"
+"CN"
 "coalesce"
+"CODEC"
+"COLLATE"
+"COLUMN"
+"COLUMNS"
+"COMMENT"
+"COMMENT COLUMN"
+"COMMIT"
+"COMPRESSION"
 "concat"
 "concatAssumeInjective"
 "concatWithSeparator"
 "concatWithSeparatorAssumeInjective"
 "concat_ws"
-"connectionId"
 "connection_id"
+"connectionId"
+"CONST"
+"CONSTRAINT"
 "contingency"
 "contingencyArgMax"
 "contingencyArgMin"
@@ -1546,13 +735,21 @@
 "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"
@@ -1569,11 +766,17 @@
 "covarPopMatrixSimpleState"
 "covarPopMatrixState"
 "covarPopMerge"
+"COVAR_POPMerge"
 "covarPopNull"
+"COVAR_POPNull"
 "covarPopOrDefault"
+"COVAR_POPOrDefault"
 "covarPopOrNull"
+"COVAR_POPOrNull"
 "covarPopResample"
+"COVAR_POPResample"
 "covarPopSimpleState"
+"COVAR_POPSimpleState"
 "covarPopStable"
 "covarPopStableArgMax"
 "covarPopStableArgMin"
@@ -1590,14 +793,23 @@
 "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"
@@ -1614,11 +826,17 @@
 "covarSampMatrixSimpleState"
 "covarSampMatrixState"
 "covarSampMerge"
+"COVAR_SAMPMerge"
 "covarSampNull"
+"COVAR_SAMPNull"
 "covarSampOrDefault"
+"COVAR_SAMPOrDefault"
 "covarSampOrNull"
+"COVAR_SAMPOrNull"
 "covarSampResample"
+"COVAR_SAMPResample"
 "covarSampSimpleState"
+"COVAR_SAMPSimpleState"
 "covarSampStable"
 "covarSampStableArgMax"
 "covarSampStableArgMin"
@@ -1635,6 +853,7 @@
 "covarSampStableSimpleState"
 "covarSampStableState"
 "covarSampState"
+"COVAR_SAMPState"
 "cramersV"
 "cramersVArgMax"
 "cramersVArgMin"
@@ -1665,17 +884,38 @@
 "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"
-"currentDatabase"
-"currentProfiles"
-"currentRoles"
-"currentSchemas"
-"currentUser"
 "current_database"
+"currentDatabase"
 "current_date"
+"CURRENT GRANTS"
+"currentProfiles"
+"CURRENT QUOTA"
+"currentRoles"
+"CURRENT ROLES"
+"CURRENT ROW"
 "current_schemas"
+"currentSchemas"
 "current_timestamp"
-"current_user"
+"CURRENT TRANSACTION"
+"currentUser"
+"CURRENT_USER"
+"CURRENTUSER"
 "cutFragment"
 "cutIPv6"
 "cutQueryString"
@@ -1690,25 +930,59 @@
 "cutToFirstSignificantSubdomainWithWWWRFC"
 "cutURLParameter"
 "cutWWW"
+"D"
 "damerauLevenshteinDistance"
-"dateDiff"
-"dateName"
-"dateTime64ToSnowflake"
-"dateTime64ToSnowflakeID"
-"dateTimeToSnowflake"
-"dateTimeToSnowflakeID"
-"dateTrunc"
+"DATABASE"
+"DATABASES"
+"Date"
+"DATE"
+"Date32"
+"DATE_ADD"
+"DATEADD"
 "date_diff"
+"dateDiff"
+"DATE_DIFF"
+"DATEDIFF"
+"DATE_FORMAT"
+"dateName"
+"DATE_SUB"
+"DATESUB"
+"DateTime"
+"DateTime32"
+"DateTime64"
+"dateTime64ToSnowflake"
+"dateTimeToSnowflake"
+"dateTrunc"
+"DATE_TRUNC"
+"DAY"
+"DAYOFMONTH"
+"DAYOFWEEK"
+"DAYOFYEAR"
+"DAYS"
+"DD"
+"DEC"
+"Decimal"
+"Decimal128"
+"Decimal256"
+"Decimal32"
+"Decimal64"
 "decodeHTMLComponent"
 "decodeURLComponent"
 "decodeURLFormComponent"
 "decodeXMLComponent"
 "decrypt"
+"DEDUPLICATE"
+"DEFAULT"
+"DEFAULT DATABASE"
 "defaultProfiles"
+"DEFAULT ROLE"
 "defaultRoles"
 "defaultValueOfArgumentType"
 "defaultValueOfTypeName"
+"DEFINER"
 "degrees"
+"DELETE"
+"DELETE WHERE"
 "deltaSum"
 "deltaSumArgMax"
 "deltaSumArgMin"
@@ -1740,21 +1014,6 @@
 "deltaSumTimestampSimpleState"
 "deltaSumTimestampState"
 "demangle"
-"denseRank"
-"denseRankArgMax"
-"denseRankArgMin"
-"denseRankArray"
-"denseRankDistinct"
-"denseRankForEach"
-"denseRankIf"
-"denseRankMap"
-"denseRankMerge"
-"denseRankNull"
-"denseRankOrDefault"
-"denseRankOrNull"
-"denseRankResample"
-"denseRankSimpleState"
-"denseRankState"
 "dense_rank"
 "dense_rankArgMax"
 "dense_rankArgMin"
@@ -1770,6 +1029,13 @@
 "dense_rankResample"
 "dense_rankSimpleState"
 "dense_rankState"
+"DEPENDS ON"
+"DESC"
+"DESCENDING"
+"DESCRIBE"
+"DETACH"
+"DETACH PART"
+"DETACH PARTITION"
 "detectCharset"
 "detectLanguage"
 "detectLanguageMixed"
@@ -1789,10 +1055,6 @@
 "dictGetFloat64"
 "dictGetFloat64OrDefault"
 "dictGetHierarchy"
-"dictGetIPv4"
-"dictGetIPv4OrDefault"
-"dictGetIPv6"
-"dictGetIPv6OrDefault"
 "dictGetInt16"
 "dictGetInt16OrDefault"
 "dictGetInt32"
@@ -1801,6 +1063,10 @@
 "dictGetInt64OrDefault"
 "dictGetInt8"
 "dictGetInt8OrDefault"
+"dictGetIPv4"
+"dictGetIPv4OrDefault"
+"dictGetIPv6"
+"dictGetIPv6OrDefault"
 "dictGetOrDefault"
 "dictGetOrNull"
 "dictGetString"
@@ -1816,13 +1082,19 @@
 "dictGetUUID"
 "dictGetUUIDOrDefault"
 "dictHas"
+"DICTIONARIES"
+"DICTIONARY"
 "dictIsIn"
+"DISK"
 "displayName"
 "distanceL1"
 "distanceL2"
 "distanceL2Squared"
 "distanceLinf"
 "distanceLp"
+"DISTINCT"
+"DISTINCT ON"
+"DIV"
 "divide"
 "divideDecimal"
 "domain"
@@ -1830,13 +1102,29 @@
 "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"
-"dynamicElement"
-"dynamicType"
 "e"
 "editDistance"
-"editDistanceUTF8"
+"ELSE"
 "empty"
+"EMPTY"
 "emptyArrayDate"
 "emptyArrayDateTime"
 "emptyArrayFloat32"
@@ -1851,14 +1139,19 @@
 "emptyArrayUInt32"
 "emptyArrayUInt64"
 "emptyArrayUInt8"
+"EMPTY AS"
 "enabledProfiles"
 "enabledRoles"
+"ENABLED ROLES"
 "encodeURLComponent"
 "encodeURLFormComponent"
 "encodeXMLComponent"
 "encrypt"
+"END"
 "endsWith"
 "endsWithUTF8"
+"ENFORCED"
+"ENGINE"
 "entropy"
 "entropyArgMax"
 "entropyArgMin"
@@ -1874,14 +1167,33 @@
 "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"
 "exp10"
 "exp2"
+"EXPLAIN"
 "exponentialMovingAverage"
 "exponentialMovingAverageArgMax"
 "exponentialMovingAverageArgMin"
@@ -1957,7 +1269,11 @@
 "exponentialTimeDecayedSumResample"
 "exponentialTimeDecayedSumSimpleState"
 "exponentialTimeDecayedSumState"
+"EXPRESSION"
+"EXTENDED"
+"EXTERNAL DDL FROM"
 "extract"
+"EXTRACT"
 "extractAll"
 "extractAllGroups"
 "extractAllGroupsHorizontal"
@@ -1970,13 +1286,24 @@
 "extractURLParameterNames"
 "extractURLParameters"
 "factorial"
+"FALSE"
 "farmFingerprint64"
 "farmHash64"
+"FETCH"
+"FETCH PART"
+"FETCH PARTITION"
+"FIELDS"
 "file"
+"FILE"
 "filesystemAvailable"
+"FILESYSTEM CACHE"
+"FILESYSTEM CACHES"
 "filesystemCapacity"
 "filesystemUnreserved"
+"FILTER"
+"FINAL"
 "finalizeAggregation"
+"FIRST"
 "firstLine"
 "firstSignificantSubdomain"
 "firstSignificantSubdomainCustom"
@@ -1995,8 +1322,6 @@
 "first_valueOrDefault"
 "first_valueOrNull"
 "first_valueResample"
-"first_valueSimpleState"
-"first_valueState"
 "first_value_respect_nulls"
 "first_value_respect_nullsArgMax"
 "first_value_respect_nullsArgMin"
@@ -2012,6 +1337,10 @@
 "first_value_respect_nullsResample"
 "first_value_respect_nullsSimpleState"
 "first_value_respect_nullsState"
+"first_valueSimpleState"
+"first_valueState"
+"FIXED"
+"FixedString"
 "flameGraph"
 "flameGraphArgMax"
 "flameGraphArgMin"
@@ -2029,8 +1358,19 @@
 "flameGraphState"
 "flatten"
 "flattenTuple"
+"FLOAT"
+"Float32"
+"Float64"
 "floor"
+"FOLLOWING"
+"FOR"
+"ForEach"
+"FOREIGN"
+"FOREIGN KEY"
+"FORGET PARTITION"
 "format"
+"FORMAT"
+"FORMAT_BYTES"
 "formatDateTime"
 "formatDateTimeInJodaSyntax"
 "formatQuery"
@@ -2043,50 +1383,67 @@
 "formatReadableTimeDelta"
 "formatRow"
 "formatRowNoNewline"
+"FQDN"
 "fragment"
+"FREEZE"
+"FROM"
+"FROM_BASE64"
+"FROM_DAYS"
 "fromDaysSinceYearZero"
 "fromDaysSinceYearZero32"
+"FROM INFILE"
 "fromModifiedJulianDay"
 "fromModifiedJulianDayOrNull"
-"fromUTCTimestamp"
+"FROM SHARD"
+"FROM_UNIXTIME"
 "fromUnixTimestamp"
 "fromUnixTimestamp64Micro"
 "fromUnixTimestamp64Milli"
 "fromUnixTimestamp64Nano"
 "fromUnixTimestampInJodaSyntax"
 "from_utc_timestamp"
+"fromUTCTimestamp"
+"FULL"
 "fullHostName"
+"FULLTEXT"
+"FUNCTION"
 "fuzzBits"
 "gccMurmurHash"
 "gcd"
 "generateRandomStructure"
-"generateSnowflakeID"
 "generateULID"
 "generateUUIDv4"
-"generateUUIDv7"
 "geoDistance"
-"geoToH3"
-"geoToS2"
 "geohashDecode"
 "geohashEncode"
 "geohashesInBox"
-"getClientHTTPHeader"
+"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"
@@ -2227,36 +1584,6 @@
 "groupBitAndResample"
 "groupBitAndSimpleState"
 "groupBitAndState"
-"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"
 "groupBitmap"
 "groupBitmapAnd"
 "groupBitmapAndArgMax"
@@ -2316,21 +1643,39 @@
 "groupBitmapXorResample"
 "groupBitmapXorSimpleState"
 "groupBitmapXorState"
-"groupConcat"
-"groupConcatArgMax"
-"groupConcatArgMin"
-"groupConcatArray"
-"groupConcatDistinct"
-"groupConcatForEach"
-"groupConcatIf"
-"groupConcatMap"
-"groupConcatMerge"
-"groupConcatNull"
-"groupConcatOrDefault"
-"groupConcatOrNull"
-"groupConcatResample"
-"groupConcatSimpleState"
-"groupConcatState"
+"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"
@@ -2346,21 +1691,7 @@
 "groupUniqArrayResample"
 "groupUniqArraySimpleState"
 "groupUniqArrayState"
-"group_concat"
-"group_concatArgMax"
-"group_concatArgMin"
-"group_concatArray"
-"group_concatDistinct"
-"group_concatForEach"
-"group_concatIf"
-"group_concatMap"
-"group_concatMerge"
-"group_concatNull"
-"group_concatOrDefault"
-"group_concatOrNull"
-"group_concatResample"
-"group_concatSimpleState"
-"group_concatState"
+"H"
 "h3CellAreaM2"
 "h3CellAreaRads2"
 "h3Distance"
@@ -2388,6 +1719,7 @@
 "h3IsPentagon"
 "h3IsResClassIII"
 "h3IsValid"
+"h3kRing"
 "h3Line"
 "h3NumHexagons"
 "h3PointDistKm"
@@ -2400,12 +1732,12 @@
 "h3ToParent"
 "h3ToString"
 "h3UnidirectionalEdgeIsValid"
-"h3kRing"
 "halfMD5"
 "has"
 "hasAll"
 "hasAny"
 "hasColumnInTable"
+"HASH"
 "hasSubsequence"
 "hasSubsequenceCaseInsensitive"
 "hasSubsequenceCaseInsensitiveUTF8"
@@ -2416,9 +1748,11 @@
 "hasTokenCaseInsensitive"
 "hasTokenCaseInsensitiveOrNull"
 "hasTokenOrNull"
+"HAVING"
+"HDFS"
 "hex"
-"hilbertDecode"
-"hilbertEncode"
+"HH"
+"HIERARCHICAL"
 "histogram"
 "histogramArgMax"
 "histogramArgMin"
@@ -2438,33 +1772,73 @@
 "hop"
 "hopEnd"
 "hopStart"
-"hostName"
+"HOST"
 "hostname"
+"hostName"
+"HOUR"
+"HOURS"
+"HTTP"
 "hypot"
+"ID"
+"IDENTIFIED"
 "identity"
 "idnaDecode"
 "idnaEncode"
 "if"
+"IF EMPTY"
+"IF EXISTS"
+"IF NOT EXISTS"
 "ifNotFinite"
 "ifNull"
 "ignore"
+"IGNORE NULLS"
 "ilike"
+"ILIKE"
 "in"
-"inIgnoreSet"
+"IN"
+"INDEX"
+"INDEXES"
 "indexHint"
 "indexOf"
+"INDICES"
+"INET4"
+"INET6"
+"INET6_ATON"
+"INET6_NTOA"
+"INET_ATON"
+"INET_NTOA"
+"INHERIT"
+"inIgnoreSet"
 "initcap"
 "initcapUTF8"
-"initialQueryID"
-"initial_query_id"
 "initializeAggregation"
+"initial_query_id"
+"initialQueryID"
+"INJECTIVE"
+"INNER"
+"IN PARTITION"
+"INSERT INTO"
 "instr"
+"INT"
+"INT1"
+"Int128"
+"Int16"
+"INT1 SIGNED"
+"INT1 UNSIGNED"
+"Int256"
+"Int32"
+"Int64"
+"Int8"
 "intDiv"
 "intDivOrZero"
-"intExp10"
-"intExp2"
-"intHash32"
-"intHash64"
+"INTEGER"
+"INTEGER SIGNED"
+"INTEGER UNSIGNED"
+"INTERPOLATE"
+"INTERSECT"
+"INTERVAL"
+"IntervalDay"
+"IntervalHour"
 "intervalLengthSum"
 "intervalLengthSumArgMax"
 "intervalLengthSumArgMin"
@@ -2480,18 +1854,55 @@
 "intervalLengthSumResample"
 "intervalLengthSumSimpleState"
 "intervalLengthSumState"
+"IntervalMicrosecond"
+"IntervalMillisecond"
+"IntervalMinute"
+"IntervalMonth"
+"IntervalNanosecond"
+"IntervalQuarter"
+"IntervalSecond"
+"IntervalWeek"
+"IntervalYear"
+"intExp10"
+"intExp2"
+"intHash32"
+"intHash64"
+"INTO OUTFILE"
+"INT SIGNED"
+"INT UNSIGNED"
+"INVISIBLE"
+"INVOKER"
+"IP"
+"IPv4"
+"IPv4CIDRToRange"
+"IPv4NumToString"
+"IPv4NumToStringClassC"
+"IPv4StringToNum"
+"IPv4StringToNumOrDefault"
+"IPv4StringToNumOrNull"
+"IPv4ToIPv6"
+"IPv6"
+"IPv6CIDRToRange"
+"IPv6NumToString"
+"IPv6StringToNum"
+"IPv6StringToNumOrDefault"
+"IPv6StringToNumOrNull"
 "isConstant"
 "isDecimalOverflow"
 "isFinite"
+"isInfinite"
 "isIPAddressInRange"
 "isIPv4String"
 "isIPv6String"
-"isInfinite"
 "isNaN"
 "isNotDistinctFrom"
+"IS NOT DISTINCT FROM"
 "isNotNull"
+"IS NOT NULL"
 "isNull"
+"IS NULL"
 "isNullable"
+"IS_OBJECT_ID"
 "isValidJSON"
 "isValidUTF8"
 "isZeroOrNull"
@@ -2499,11 +1910,40 @@
 "jaroWinklerSimilarity"
 "javaHash"
 "javaHashUTF16LE"
+"JOIN"
 "joinGet"
 "joinGetOrNull"
+"JSON"
+"JSONArrayLength"
+"JSON_ARRAY_LENGTH"
+"JSON_EXISTS"
+"JSONExtract"
+"JSONExtractArrayRaw"
+"JSONExtractBool"
+"JSONExtractFloat"
+"JSONExtractInt"
+"JSONExtractKeys"
+"JSONExtractKeysAndValues"
+"JSONExtractKeysAndValuesRaw"
+"JSONExtractRaw"
+"JSONExtractString"
+"JSONExtractUInt"
+"JSONHas"
+"JSONKey"
+"JSONLength"
 "jsonMergePatch"
+"JSON_QUERY"
+"JSONType"
+"JSON_VALUE"
 "jumpConsistentHash"
 "kafkaMurmurHash"
+"KERBEROS"
+"KEY"
+"KEY BY"
+"KEYED BY"
+"KEYS"
+"KILL"
+"KIND"
 "kolmogorovSmirnovTest"
 "kolmogorovSmirnovTestArgMax"
 "kolmogorovSmirnovTestArgMin"
@@ -2552,6 +1992,14 @@
 "kurtSampResample"
 "kurtSampSimpleState"
 "kurtSampState"
+"L1Distance"
+"L1Norm"
+"L1Normalize"
+"L2Distance"
+"L2Norm"
+"L2Normalize"
+"L2SquaredDistance"
+"L2SquaredNorm"
 "lagInFrame"
 "lagInFrameArgMax"
 "lagInFrameArgMin"
@@ -2567,6 +2015,7 @@
 "lagInFrameResample"
 "lagInFrameSimpleState"
 "lagInFrameState"
+"LARGE OBJECT"
 "largestTriangleThreeBuckets"
 "largestTriangleThreeBucketsArgMax"
 "largestTriangleThreeBucketsArgMin"
@@ -2582,6 +2031,8 @@
 "largestTriangleThreeBucketsResample"
 "largestTriangleThreeBucketsSimpleState"
 "largestTriangleThreeBucketsState"
+"LAST"
+"LAST_DAY"
 "last_value"
 "last_valueArgMax"
 "last_valueArgMin"
@@ -2595,8 +2046,6 @@
 "last_valueOrDefault"
 "last_valueOrNull"
 "last_valueResample"
-"last_valueSimpleState"
-"last_valueState"
 "last_value_respect_nulls"
 "last_value_respect_nullsArgMax"
 "last_value_respect_nullsArgMin"
@@ -2612,8 +2061,12 @@
 "last_value_respect_nullsResample"
 "last_value_respect_nullsSimpleState"
 "last_value_respect_nullsState"
+"last_valueSimpleState"
+"last_valueState"
+"LAYOUT"
 "lcase"
 "lcm"
+"LDAP"
 "leadInFrame"
 "leadInFrameArgMax"
 "leadInFrameArgMin"
@@ -2629,8 +2082,11 @@
 "leadInFrameResample"
 "leadInFrameSimpleState"
 "leadInFrameState"
+"LEADING"
 "least"
 "left"
+"LEFT"
+"LEFT ARRAY JOIN"
 "leftPad"
 "leftPadUTF8"
 "leftUTF8"
@@ -2639,23 +2095,42 @@
 "lengthUTF8"
 "less"
 "lessOrEquals"
+"LESS THAN"
+"LEVEL"
 "levenshteinDistance"
-"levenshteinDistanceUTF8"
 "lgamma"
+"LIFETIME"
+"LIGHTWEIGHT"
 "like"
+"LIKE"
+"LIMIT"
+"LINEAR"
+"LinfDistance"
+"LinfNorm"
+"LinfNormalize"
+"LIST"
+"LIVE"
 "ln"
+"LOCAL"
 "locate"
 "log"
 "log10"
 "log1p"
 "log2"
 "logTrace"
+"LONGBLOB"
+"LONGTEXT"
+"LowCardinality"
 "lowCardinalityIndices"
 "lowCardinalityKeys"
 "lower"
 "lowerUTF8"
 "lpad"
+"LpDistance"
+"LpNorm"
+"LpNormalize"
 "ltrim"
+"LTRIM"
 "lttb"
 "lttbArgMax"
 "lttbArgMin"
@@ -2671,6 +2146,10 @@
 "lttbResample"
 "lttbSimpleState"
 "lttbState"
+"M"
+"MACNumToString"
+"MACStringToNum"
+"MACStringToOUI"
 "makeDate"
 "makeDate32"
 "makeDateTime"
@@ -2691,6 +2170,7 @@
 "mannWhitneyUTestSimpleState"
 "mannWhitneyUTestState"
 "map"
+"Map"
 "mapAdd"
 "mapAll"
 "mapApply"
@@ -2701,6 +2181,7 @@
 "mapExtractKeyLike"
 "mapFilter"
 "mapFromArrays"
+"MAP_FROM_ARRAYS"
 "mapFromString"
 "mapKeys"
 "mapPartialReverseSort"
@@ -2712,8 +2193,17 @@
 "mapUpdate"
 "mapValues"
 "match"
+"MATCH"
 "materialize"
+"MATERIALIZE"
+"MATERIALIZE COLUMN"
+"MATERIALIZED"
+"MATERIALIZE INDEX"
+"MATERIALIZE PROJECTION"
+"MATERIALIZE STATISTIC"
+"MATERIALIZE TTL"
 "max"
+"MAX"
 "max2"
 "maxArgMax"
 "maxArgMin"
@@ -2774,6 +2264,9 @@
 "maxResample"
 "maxSimpleState"
 "maxState"
+"MCS"
+"MD4"
+"MD5"
 "meanZTest"
 "meanZTestArgMax"
 "meanZTestArgMin"
@@ -3014,9 +2507,23 @@
 "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"
@@ -3051,15 +2558,35 @@
 "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"
@@ -3067,6 +2594,9 @@
 "multiMatchAllIndices"
 "multiMatchAny"
 "multiMatchAnyIndex"
+"multiply"
+"multiplyDecimal"
+"MultiPolygon"
 "multiSearchAllPositions"
 "multiSearchAllPositionsCaseInsensitive"
 "multiSearchAllPositionsCaseInsensitiveUTF8"
@@ -3083,17 +2613,31 @@
 "multiSearchFirstPositionCaseInsensitive"
 "multiSearchFirstPositionCaseInsensitiveUTF8"
 "multiSearchFirstPositionUTF8"
-"multiply"
-"multiplyDecimal"
 "murmurHash2_32"
 "murmurHash2_64"
 "murmurHash3_128"
 "murmurHash3_32"
 "murmurHash3_64"
+"MUTATION"
+"N"
+"NAME"
+"NAMED COLLECTION"
+"NANOSECOND"
+"NANOSECONDS"
+"NATIONAL CHAR"
+"NATIONAL CHARACTER"
+"NATIONAL CHARACTER LARGE OBJECT"
+"NATIONAL CHARACTER VARYING"
+"NATIONAL CHAR VARYING"
+"NCHAR"
+"NCHAR LARGE OBJECT"
+"NCHAR VARYING"
 "negate"
 "neighbor"
 "nested"
+"Nested"
 "netloc"
+"NEXT"
 "ngramDistance"
 "ngramDistanceCaseInsensitive"
 "ngramDistanceCaseInsensitiveUTF8"
@@ -3106,6 +2650,7 @@
 "ngramMinHashCaseInsensitive"
 "ngramMinHashCaseInsensitiveUTF8"
 "ngramMinHashUTF8"
+"ngrams"
 "ngramSearch"
 "ngramSearchCaseInsensitive"
 "ngramSearchCaseInsensitiveUTF8"
@@ -3114,7 +2659,10 @@
 "ngramSimHashCaseInsensitive"
 "ngramSimHashCaseInsensitiveUTF8"
 "ngramSimHashUTF8"
-"ngrams"
+"NO ACTION"
+"NO DELAY"
+"NO LIMITS"
+"NONE"
 "nonNegativeDerivative"
 "nonNegativeDerivativeArgMax"
 "nonNegativeDerivativeArgMin"
@@ -3130,11 +2678,9 @@
 "nonNegativeDerivativeResample"
 "nonNegativeDerivativeSimpleState"
 "nonNegativeDerivativeState"
-"normL1"
-"normL2"
-"normL2Squared"
-"normLinf"
-"normLp"
+"NO_PASSWORD"
+"normalizedQueryHash"
+"normalizedQueryHashKeepNames"
 "normalizeL1"
 "normalizeL2"
 "normalizeLinf"
@@ -3145,18 +2691,18 @@
 "normalizeUTF8NFD"
 "normalizeUTF8NFKC"
 "normalizeUTF8NFKD"
-"normalizedQueryHash"
-"normalizedQueryHashKeepNames"
+"normL1"
+"normL2"
+"normL2Squared"
+"normLinf"
+"normLp"
 "not"
+"NOT"
+"NOT BETWEEN"
 "notEmpty"
 "notEquals"
-"notILike"
-"notIn"
-"notInIgnoreSet"
-"notLike"
-"notNullIn"
-"notNullInIgnoreSet"
 "nothing"
+"Nothing"
 "nothingArgMax"
 "nothingArgMin"
 "nothingArray"
@@ -3200,9 +2746,22 @@
 "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"
@@ -3233,10 +2792,31 @@
 "ntileResample"
 "ntileSimpleState"
 "ntileState"
+"Null"
+"NULL"
+"Nullable"
 "nullIf"
 "nullIn"
 "nullInIgnoreSet"
+"NULLS"
+"NUMERIC"
+"NVARCHAR"
+"Object"
+"OCTET_LENGTH"
+"OFFSET"
+"ON"
+"ON DELETE"
+"ONLY"
+"ON UPDATE"
+"ON VOLUME"
+"OPTIMIZE TABLE"
 "or"
+"OR"
+"ORDER BY"
+"OR REPLACE"
+"OUTER"
+"OVER"
+"OVERRIDABLE"
 "parseDateTime"
 "parseDateTime32BestEffort"
 "parseDateTime32BestEffortOrNull"
@@ -3258,49 +2838,32 @@
 "parseDateTimeInJodaSyntaxOrZero"
 "parseDateTimeOrNull"
 "parseDateTimeOrZero"
-"parseReadableSize"
-"parseReadableSizeOrNull"
-"parseReadableSizeOrZero"
 "parseTimeDelta"
-"partitionID"
+"PART"
+"PARTIAL"
+"PARTITION"
+"PARTITION BY"
 "partitionId"
+"PARTITIONS"
+"PART_MOVE_TO_SHARD"
+"PASTE"
 "path"
 "pathFull"
-"percentRank"
-"percentRankArgMax"
-"percentRankArgMin"
-"percentRankArray"
-"percentRankDistinct"
-"percentRankForEach"
-"percentRankIf"
-"percentRankMap"
-"percentRankMerge"
-"percentRankNull"
-"percentRankOrDefault"
-"percentRankOrNull"
-"percentRankResample"
-"percentRankSimpleState"
-"percentRankState"
-"percent_rank"
-"percent_rankArgMax"
-"percent_rankArgMin"
-"percent_rankArray"
-"percent_rankDistinct"
-"percent_rankForEach"
-"percent_rankIf"
-"percent_rankMap"
-"percent_rankMerge"
-"percent_rankNull"
-"percent_rankOrDefault"
-"percent_rankOrNull"
-"percent_rankResample"
-"percent_rankSimpleState"
-"percent_rankState"
+"PERIODIC REFRESH"
+"PERMANENTLY"
+"PERMISSIVE"
+"PERSISTENT"
+"PERSISTENT SEQUENTIAL"
 "pi"
+"PIPELINE"
+"PLAINTEXT_PASSWORD"
+"PLAN"
 "plus"
 "pmod"
+"Point"
 "pointInEllipses"
 "pointInPolygon"
+"Polygon"
 "polygonAreaCartesian"
 "polygonAreaSpherical"
 "polygonConvexHullCartesian"
@@ -3317,21 +2880,32 @@
 "polygonsUnionSpherical"
 "polygonsWithinCartesian"
 "polygonsWithinSpherical"
+"POPULATE"
 "port"
 "portRFC"
 "position"
 "positionCaseInsensitive"
 "positionCaseInsensitiveUTF8"
 "positionUTF8"
-"positiveModulo"
 "positive_modulo"
+"positiveModulo"
 "pow"
 "power"
-"printf"
+"PRECEDING"
+"PRECISION"
+"PREWHERE"
+"PRIMARY"
+"PRIMARY KEY"
+"PROFILE"
+"PROJECTION"
 "proportionsZTest"
+"Protobuf"
 "protocol"
+"PULL"
 "punycodeDecode"
 "punycodeEncode"
+"Q"
+"QQ"
 "quantile"
 "quantileArgMax"
 "quantileArgMin"
@@ -3525,68 +3099,6 @@
 "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"
@@ -3759,6 +3271,7 @@
 "quantilesGKSimpleState"
 "quantilesGKState"
 "quantilesIf"
+"quantileSimpleState"
 "quantilesInterpolatedWeighted"
 "quantilesInterpolatedWeightedArgMax"
 "quantilesInterpolatedWeightedArgMin"
@@ -3782,6 +3295,7 @@
 "quantilesResample"
 "quantilesSimpleState"
 "quantilesState"
+"quantileState"
 "quantilesTDigest"
 "quantilesTDigestArgMax"
 "quantilesTDigestArgMin"
@@ -3842,10 +3356,75 @@
 "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_id"
+"QUERY TREE"
+"QUOTA"
 "radians"
 "rand"
 "rand32"
@@ -3860,14 +3439,17 @@
 "randLogNormal"
 "randNegativeBinomial"
 "randNormal"
-"randPoisson"
-"randStudentT"
-"randUniform"
 "randomFixedString"
+"RANDOMIZED"
+"RANDOMIZE FOR"
 "randomPrintableASCII"
 "randomString"
 "randomStringUTF8"
+"randPoisson"
+"randStudentT"
+"randUniform"
 "range"
+"RANGE"
 "rank"
 "rankArgMax"
 "rankArgMin"
@@ -3898,14 +3480,22 @@
 "rankResample"
 "rankSimpleState"
 "rankState"
-"readWKTLineString"
-"readWKTMultiLineString"
+"READONLY"
 "readWKTMultiPolygon"
 "readWKTPoint"
 "readWKTPolygon"
 "readWKTRing"
+"REAL"
+"REALM"
+"RECOMPRESS"
+"REFERENCES"
+"REFRESH"
+"REGEXP"
 "regexpExtract"
+"REGEXP_EXTRACT"
+"REGEXP_MATCHES"
 "regexpQuoteMeta"
+"REGEXP_REPLACE"
 "regionHierarchy"
 "regionIn"
 "regionToArea"
@@ -3936,13 +3526,31 @@
 "reinterpretAsUInt64"
 "reinterpretAsUInt8"
 "reinterpretAsUUID"
+"REMOVE"
+"REMOVE SAMPLE BY"
+"REMOVE TTL"
+"RENAME"
+"RENAME COLUMN"
+"RENAME DATABASE"
+"RENAME DICTIONARY"
+"RENAME TABLE"
+"RENAME TO"
 "repeat"
 "replace"
+"REPLACE"
 "replaceAll"
 "replaceOne"
+"REPLACE PARTITION"
 "replaceRegexpAll"
 "replaceRegexpOne"
 "replicate"
+"Resample"
+"RESET SETTING"
+"RESPECT NULLS"
+"RESTORE"
+"RESTRICT"
+"RESTRICTIVE"
+"RESUME"
 "retention"
 "retentionArgMax"
 "retentionArgMin"
@@ -3961,18 +3569,22 @@
 "reverse"
 "reverseUTF8"
 "revision"
+"REVOKE"
 "right"
+"RIGHT"
 "rightPad"
 "rightPadUTF8"
 "rightUTF8"
+"Ring"
+"ROLLBACK"
+"ROLLUP"
 "round"
 "roundAge"
 "roundBankers"
 "roundDown"
 "roundDuration"
 "roundToExp2"
-"rowNumberInAllBlocks"
-"rowNumberInBlock"
+"ROW"
 "row_number"
 "row_numberArgMax"
 "row_numberArgMin"
@@ -3980,6 +3592,8 @@
 "row_numberDistinct"
 "row_numberForEach"
 "row_numberIf"
+"rowNumberInAllBlocks"
+"rowNumberInBlock"
 "row_numberMap"
 "row_numberMerge"
 "row_numberNull"
@@ -3988,12 +3602,15 @@
 "row_numberResample"
 "row_numberSimpleState"
 "row_numberState"
+"ROWS"
 "rpad"
 "rtrim"
+"RTRIM"
 "runningAccumulate"
 "runningConcurrency"
 "runningDifference"
 "runningDifferenceStartingWithFirstValue"
+"S"
 "s2CapContains"
 "s2CapUnion"
 "s2CellsIntersect"
@@ -4003,7 +3620,18 @@
 "s2RectIntersection"
 "s2RectUnion"
 "s2ToGeo"
+"S3"
+"SALT"
+"SAMPLE"
+"SAMPLE BY"
 "scalarProduct"
+"__scalarSubqueryResult"
+"SCHEMA"
+"SCHEME"
+"SECOND"
+"SECONDS"
+"SELECT"
+"SEMI"
 "sequenceCount"
 "sequenceCountArgMax"
 "sequenceCountArgMin"
@@ -4052,14 +3680,44 @@
 "seriesDecomposeSTL"
 "seriesOutliersDetectTukey"
 "seriesPeriodDetectFFT"
-"serverTimeZone"
+"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"
 "simpleJSONExtractInt"
@@ -4083,6 +3741,7 @@
 "simpleLinearRegressionSimpleState"
 "simpleLinearRegressionState"
 "sin"
+"SINGLE"
 "singleValueOrNull"
 "singleValueOrNullArgMax"
 "singleValueOrNullArgMin"
@@ -4137,42 +3796,45 @@
 "skewSampState"
 "sleep"
 "sleepEachRow"
-"snowflakeIDToDateTime"
-"snowflakeIDToDateTime64"
+"SMALLINT"
+"SMALLINT SIGNED"
+"SMALLINT UNSIGNED"
 "snowflakeToDateTime"
 "snowflakeToDateTime64"
 "soundex"
+"SOURCE"
 "space"
-"sparkBar"
-"sparkBarArgMax"
-"sparkBarArgMin"
-"sparkBarArray"
-"sparkBarDistinct"
-"sparkBarForEach"
-"sparkBarIf"
-"sparkBarMap"
-"sparkBarMerge"
-"sparkBarNull"
-"sparkBarOrDefault"
-"sparkBarOrNull"
-"sparkBarResample"
-"sparkBarSimpleState"
-"sparkBarState"
 "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"
@@ -4182,23 +3844,58 @@
 "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"
+"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"
@@ -4215,20 +3912,35 @@
 "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"
@@ -4245,7 +3957,20 @@
 "stddevSampStableSimpleState"
 "stddevSampStableState"
 "stddevSampState"
+"STDDEV_SAMPState"
+"STDDistinct"
+"STDForEach"
+"STDIf"
+"STDMap"
+"STDMerge"
+"STDNull"
+"STDOrDefault"
+"STDOrNull"
+"STDResample"
+"STDSimpleState"
+"STDState"
 "stem"
+"STEP"
 "stochasticLinearRegression"
 "stochasticLinearRegressionArgMax"
 "stochasticLinearRegressionArgMin"
@@ -4276,11 +4001,15 @@
 "stochasticLogisticRegressionResample"
 "stochasticLogisticRegressionSimpleState"
 "stochasticLogisticRegressionState"
-"str_to_date"
-"str_to_map"
+"STORAGE"
+"STRICT"
+"STRICTLY_ASCENDING"
+"String"
 "stringJaccardIndex"
 "stringJaccardIndexUTF8"
 "stringToH3"
+"str_to_date"
+"str_to_map"
 "structureToCapnProtoSchema"
 "structureToProtobufSchema"
 "studentTTest"
@@ -4300,9 +4029,14 @@
 "studentTTestState"
 "subBitmap"
 "subDate"
+"SUBPARTITION"
+"SUBPARTITION BY"
+"SUBPARTITIONS"
 "substr"
 "substring"
+"SUBSTRING"
 "substringIndex"
+"SUBSTRING_INDEX"
 "substringIndexUTF8"
 "substringUTF8"
 "subtractDays"
@@ -4386,21 +4120,6 @@
 "sumMapFilteredWithOverflowResample"
 "sumMapFilteredWithOverflowSimpleState"
 "sumMapFilteredWithOverflowState"
-"sumMapWithOverflow"
-"sumMapWithOverflowArgMax"
-"sumMapWithOverflowArgMin"
-"sumMapWithOverflowArray"
-"sumMapWithOverflowDistinct"
-"sumMapWithOverflowForEach"
-"sumMapWithOverflowIf"
-"sumMapWithOverflowMap"
-"sumMapWithOverflowMerge"
-"sumMapWithOverflowNull"
-"sumMapWithOverflowOrDefault"
-"sumMapWithOverflowOrNull"
-"sumMapWithOverflowResample"
-"sumMapWithOverflowSimpleState"
-"sumMapWithOverflowState"
 "sumMappedArrays"
 "sumMappedArraysArgMax"
 "sumMappedArraysArgMin"
@@ -4416,6 +4135,21 @@
 "sumMappedArraysResample"
 "sumMappedArraysSimpleState"
 "sumMappedArraysState"
+"sumMapWithOverflow"
+"sumMapWithOverflowArgMax"
+"sumMapWithOverflowArgMin"
+"sumMapWithOverflowArray"
+"sumMapWithOverflowDistinct"
+"sumMapWithOverflowForEach"
+"sumMapWithOverflowIf"
+"sumMapWithOverflowMap"
+"sumMapWithOverflowMerge"
+"sumMapWithOverflowNull"
+"sumMapWithOverflowOrDefault"
+"sumMapWithOverflowOrNull"
+"sumMapWithOverflowResample"
+"sumMapWithOverflowSimpleState"
+"sumMapWithOverflowState"
 "sumMerge"
 "sumNull"
 "sumOrDefault"
@@ -4438,11 +4172,23 @@
 "sumWithOverflowResample"
 "sumWithOverflowSimpleState"
 "sumWithOverflowState"
+"SUSPEND"
 "svg"
+"SVG"
+"SYNC"
 "synonyms"
+"SYNTAX"
+"SYSTEM"
+"TABLE"
+"TABLE OVERRIDE"
+"TABLES"
 "tan"
 "tanh"
 "tcpPort"
+"TEMPORARY"
+"TEMPORARY TABLE"
+"TEST"
+"TEXT"
 "tgamma"
 "theilsU"
 "theilsUArgMax"
@@ -4459,20 +4205,36 @@
 "theilsUResample"
 "theilsUSimpleState"
 "theilsUState"
+"THEN"
 "throwIf"
 "tid"
+"TIME"
 "timeDiff"
 "timeSlot"
 "timeSlots"
-"timeZone"
-"timeZoneOf"
-"timeZoneOffset"
 "timestamp"
-"timestampDiff"
+"TIMESTAMP"
+"TIMESTAMP_ADD"
+"TIMESTAMPADD"
 "timestamp_diff"
+"timestampDiff"
+"TIMESTAMP_DIFF"
+"TIMESTAMPDIFF"
+"TIMESTAMP_SUB"
+"TIMESTAMPSUB"
 "timezone"
+"timeZone"
 "timezoneOf"
+"timeZoneOf"
 "timezoneOffset"
+"timeZoneOffset"
+"TINYBLOB"
+"TINYINT"
+"TINYINT SIGNED"
+"TINYINT UNSIGNED"
+"TINYTEXT"
+"TO"
+"TO_BASE64"
 "toBool"
 "toColumnTypeName"
 "toDate"
@@ -4492,9 +4254,11 @@
 "toDateTimeOrDefault"
 "toDateTimeOrNull"
 "toDateTimeOrZero"
+"today"
 "toDayOfMonth"
 "toDayOfWeek"
 "toDayOfYear"
+"TO_DAYS"
 "toDaysSinceYearZero"
 "toDecimal128"
 "toDecimal128OrDefault"
@@ -4513,6 +4277,7 @@
 "toDecimal64OrNull"
 "toDecimal64OrZero"
 "toDecimalString"
+"TO DISK"
 "toFixedString"
 "toFloat32"
 "toFloat32OrDefault"
@@ -4523,16 +4288,7 @@
 "toFloat64OrNull"
 "toFloat64OrZero"
 "toHour"
-"toIPv4"
-"toIPv4OrDefault"
-"toIPv4OrNull"
-"toIPv4OrZero"
-"toIPv6"
-"toIPv6OrDefault"
-"toIPv6OrNull"
-"toIPv6OrZero"
-"toISOWeek"
-"toISOYear"
+"TO INNER UUID"
 "toInt128"
 "toInt128OrDefault"
 "toInt128OrNull"
@@ -4568,7 +4324,18 @@
 "toIntervalSecond"
 "toIntervalWeek"
 "toIntervalYear"
+"toIPv4"
+"toIPv4OrDefault"
+"toIPv4OrNull"
+"toIPv4OrZero"
+"toIPv6"
+"toIPv6OrDefault"
+"toIPv6OrNull"
+"toIPv6OrZero"
+"toISOWeek"
+"toISOYear"
 "toJSONString"
+"tokens"
 "toLastDayOfMonth"
 "toLastDayOfWeek"
 "toLowCardinality"
@@ -4579,82 +4346,7 @@
 "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"
+"TOP"
 "topK"
 "topKArgMax"
 "topKArgMin"
@@ -4687,28 +4379,115 @@
 "topKWeightedState"
 "topLevelDomain"
 "topLevelDomainRFC"
+"toQuarter"
+"toRelativeDayNum"
+"toRelativeHourNum"
+"toRelativeMinuteNum"
+"toRelativeMonthNum"
+"toRelativeQuarterNum"
+"toRelativeSecondNum"
+"toRelativeWeekNum"
+"toRelativeYearNum"
+"toSecond"
+"TO SHARD"
+"toStartOfDay"
+"toStartOfFifteenMinutes"
+"toStartOfFiveMinute"
+"toStartOfFiveMinutes"
+"toStartOfHour"
+"toStartOfInterval"
+"toStartOfISOYear"
+"toStartOfMicrosecond"
+"toStartOfMillisecond"
+"toStartOfMinute"
+"toStartOfMonth"
+"toStartOfNanosecond"
+"toStartOfQuarter"
+"toStartOfSecond"
+"toStartOfTenMinutes"
+"toStartOfWeek"
+"toStartOfYear"
+"toString"
+"toStringCutToZero"
+"TO TABLE"
+"TOTALS"
+"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"
+"TO_UNIXTIME"
+"toUnixTimestamp"
+"toUnixTimestamp64Micro"
+"toUnixTimestamp64Milli"
+"toUnixTimestamp64Nano"
+"to_utc_timestamp"
+"toUTCTimestamp"
+"toUUID"
+"toUUIDOrDefault"
+"toUUIDOrNull"
+"toUUIDOrZero"
+"toValidUTF8"
+"TO VOLUME"
+"toWeek"
+"toYear"
+"toYearWeek"
+"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"
-"tryBase64URLDecode"
 "tryDecrypt"
 "tryIdnaEncode"
 "tryPunycodeDecode"
+"TTL"
 "tumble"
 "tumbleEnd"
 "tumbleStart"
 "tuple"
+"Tuple"
 "tupleConcat"
 "tupleDivide"
 "tupleDivideByNumber"
@@ -4723,13 +4502,25 @@
 "tupleModuloByNumber"
 "tupleMultiply"
 "tupleMultiplyByNumber"
-"tupleNames"
 "tupleNegate"
 "tuplePlus"
 "tupleToNameValuePairs"
+"TYPE"
+"TYPEOF"
 "ucase"
+"UInt128"
+"UInt16"
+"UInt256"
+"UInt32"
+"UInt64"
+"UInt8"
+"ULIDStringToDateTime"
 "unbin"
+"UNBOUNDED"
+"UNDROP"
+"UNFREEZE"
 "unhex"
+"UNION"
 "uniq"
 "uniqArgMax"
 "uniqArgMin"
@@ -4823,6 +4614,7 @@
 "uniqThetaSimpleState"
 "uniqThetaState"
 "uniqThetaUnion"
+"UNIQUE"
 "uniqUpTo"
 "uniqUpToArgMax"
 "uniqUpToArgMin"
@@ -4838,25 +4630,61 @@
 "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"
@@ -4873,20 +4701,35 @@
 "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"
@@ -4903,11 +4746,13 @@
 "varSampStableSimpleState"
 "varSampStableState"
 "varSampState"
-"variantElement"
-"variantType"
+"VAR_SAMPState"
+"VARYING"
 "vectorDifference"
 "vectorSum"
 "version"
+"VIEW"
+"VISIBLE"
 "visibleWidth"
 "visitParamExtractBool"
 "visitParamExtractFloat"
@@ -4916,7 +4761,11 @@
 "visitParamExtractString"
 "visitParamExtractUInt"
 "visitParamHas"
+"WATCH"
+"WATERMARK"
 "week"
+"WEEK"
+"WEEKS"
 "welchTTest"
 "welchTTestArgMax"
 "welchTTestArgMin"
@@ -4932,8 +4781,11 @@
 "welchTTestResample"
 "welchTTestSimpleState"
 "welchTTestState"
-"widthBucket"
+"WHEN"
+"WHERE"
 "width_bucket"
+"widthBucket"
+"WINDOW"
 "windowFunnel"
 "windowFunnelArgMax"
 "windowFunnelArgMin"
@@ -4950,6 +4802,16 @@
 "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"
 "wordShingleMinHash"
 "wordShingleMinHashArg"
@@ -4963,12 +4825,23 @@
 "wordShingleSimHashCaseInsensitive"
 "wordShingleSimHashCaseInsensitiveUTF8"
 "wordShingleSimHashUTF8"
+"WRITABLE"
+"WW"
 "wyHash64"
 "xor"
+"xxh3"
 "xxHash32"
 "xxHash64"
-"xxh3"
 "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 797905203b2..a01a94fd3e3 100644
--- a/tests/fuzz/dictionaries/datatypes.dict
+++ b/tests/fuzz/dictionaries/datatypes.dict
@@ -31,7 +31,6 @@
 "Decimal256"
 "Decimal32"
 "Decimal64"
-"Dynamic"
 "ENUM"
 "Enum"
 "Enum16"
@@ -75,7 +74,6 @@
 "JSON"
 "LONGBLOB"
 "LONGTEXT"
-"LineString"
 "LowCardinality"
 "MEDIUMBLOB"
 "MEDIUMINT"
@@ -83,7 +81,6 @@
 "MEDIUMINT UNSIGNED"
 "MEDIUMTEXT"
 "Map"
-"MultiLineString"
 "MultiPolygon"
 "NATIONAL CHAR"
 "NATIONAL CHAR VARYING"
@@ -135,3 +132,4 @@
 "YEAR"
 "bool"
 "boolean"
+"Dynamic"
diff --git a/tests/fuzz/dictionaries/functions.dict b/tests/fuzz/dictionaries/functions.dict
index e562595fb67..ec7f8017fb2 100644
--- a/tests/fuzz/dictionaries/functions.dict
+++ b/tests/fuzz/dictionaries/functions.dict
@@ -126,7 +126,6 @@
 "JSONHas"
 "JSONKey"
 "JSONLength"
-"JSONMergePatch"
 "JSONType"
 "JSON_ARRAY_LENGTH"
 "JSON_EXISTS"
@@ -228,8 +227,6 @@
 "UTC_timestamp"
 "UUIDNumToString"
 "UUIDStringToNum"
-"UUIDToNum"
-"UUIDv7ToDateTime"
 "VAR_POP"
 "VAR_POPArgMax"
 "VAR_POPArgMin"
@@ -266,7 +263,6 @@
 "YYYYMMDDhhmmssToDateTime"
 "YYYYMMDDhhmmssToDateTime64"
 "_CAST"
-"__actionName"
 "__bitBoolMaskAnd"
 "__bitBoolMaskOr"
 "__bitSwapLastTwo"
@@ -664,8 +660,6 @@
 "base58Encode"
 "base64Decode"
 "base64Encode"
-"base64URLDecode"
-"base64URLEncode"
 "basename"
 "bin"
 "bitAnd"
@@ -750,15 +744,8 @@
 "cbrt"
 "ceil"
 "ceiling"
-"changeDay"
-"changeHour"
-"changeMinute"
-"changeMonth"
-"changeSecond"
-"changeYear"
 "char"
 "cityHash64"
-"clamp"
 "coalesce"
 "concat"
 "concatAssumeInjective"
@@ -983,7 +970,6 @@
 "current_date"
 "current_schemas"
 "current_timestamp"
-"current_user"
 "cutFragment"
 "cutIPv6"
 "cutQueryString"
@@ -1002,9 +988,7 @@
 "dateDiff"
 "dateName"
 "dateTime64ToSnowflake"
-"dateTime64ToSnowflakeID"
 "dateTimeToSnowflake"
-"dateTimeToSnowflakeID"
 "dateTrunc"
 "date_diff"
 "decodeHTMLComponent"
@@ -1048,21 +1032,6 @@
 "deltaSumTimestampSimpleState"
 "deltaSumTimestampState"
 "demangle"
-"denseRank"
-"denseRankArgMax"
-"denseRankArgMin"
-"denseRankArray"
-"denseRankDistinct"
-"denseRankForEach"
-"denseRankIf"
-"denseRankMap"
-"denseRankMerge"
-"denseRankNull"
-"denseRankOrDefault"
-"denseRankOrNull"
-"denseRankResample"
-"denseRankSimpleState"
-"denseRankState"
 "dense_rank"
 "dense_rankArgMax"
 "dense_rankArgMin"
@@ -1139,11 +1108,8 @@
 "domainWithoutWWWRFC"
 "dotProduct"
 "dumpColumnStructure"
-"dynamicElement"
-"dynamicType"
 "e"
 "editDistance"
-"editDistanceUTF8"
 "empty"
 "emptyArrayDate"
 "emptyArrayDateTime"
@@ -1368,17 +1334,14 @@
 "gccMurmurHash"
 "gcd"
 "generateRandomStructure"
-"generateSnowflakeID"
 "generateULID"
 "generateUUIDv4"
-"generateUUIDv7"
 "geoDistance"
 "geoToH3"
 "geoToS2"
 "geohashDecode"
 "geohashEncode"
 "geohashesInBox"
-"getClientHTTPHeader"
 "getMacro"
 "getOSKernelVersion"
 "getServerPort"
@@ -1625,21 +1588,6 @@
 "groupBitmapXorResample"
 "groupBitmapXorSimpleState"
 "groupBitmapXorState"
-"groupConcat"
-"groupConcatArgMax"
-"groupConcatArgMin"
-"groupConcatArray"
-"groupConcatDistinct"
-"groupConcatForEach"
-"groupConcatIf"
-"groupConcatMap"
-"groupConcatMerge"
-"groupConcatNull"
-"groupConcatOrDefault"
-"groupConcatOrNull"
-"groupConcatResample"
-"groupConcatSimpleState"
-"groupConcatState"
 "groupUniqArray"
 "groupUniqArrayArgMax"
 "groupUniqArrayArgMin"
@@ -1655,21 +1603,6 @@
 "groupUniqArrayResample"
 "groupUniqArraySimpleState"
 "groupUniqArrayState"
-"group_concat"
-"group_concatArgMax"
-"group_concatArgMin"
-"group_concatArray"
-"group_concatDistinct"
-"group_concatForEach"
-"group_concatIf"
-"group_concatMap"
-"group_concatMerge"
-"group_concatNull"
-"group_concatOrDefault"
-"group_concatOrNull"
-"group_concatResample"
-"group_concatSimpleState"
-"group_concatState"
 "h3CellAreaM2"
 "h3CellAreaRads2"
 "h3Distance"
@@ -1726,8 +1659,6 @@
 "hasTokenCaseInsensitiveOrNull"
 "hasTokenOrNull"
 "hex"
-"hilbertDecode"
-"hilbertEncode"
 "histogram"
 "histogramArgMax"
 "histogramArgMin"
@@ -1949,7 +1880,6 @@
 "less"
 "lessOrEquals"
 "levenshteinDistance"
-"levenshteinDistanceUTF8"
 "lgamma"
 "like"
 "ln"
@@ -2567,44 +2497,10 @@
 "parseDateTimeInJodaSyntaxOrZero"
 "parseDateTimeOrNull"
 "parseDateTimeOrZero"
-"parseReadableSize"
-"parseReadableSizeOrNull"
-"parseReadableSizeOrZero"
 "parseTimeDelta"
-"partitionID"
 "partitionId"
 "path"
 "pathFull"
-"percentRank"
-"percentRankArgMax"
-"percentRankArgMin"
-"percentRankArray"
-"percentRankDistinct"
-"percentRankForEach"
-"percentRankIf"
-"percentRankMap"
-"percentRankMerge"
-"percentRankNull"
-"percentRankOrDefault"
-"percentRankOrNull"
-"percentRankResample"
-"percentRankSimpleState"
-"percentRankState"
-"percent_rank"
-"percent_rankArgMax"
-"percent_rankArgMin"
-"percent_rankArray"
-"percent_rankDistinct"
-"percent_rankForEach"
-"percent_rankIf"
-"percent_rankMap"
-"percent_rankMerge"
-"percent_rankNull"
-"percent_rankOrDefault"
-"percent_rankOrNull"
-"percent_rankResample"
-"percent_rankSimpleState"
-"percent_rankState"
 "pi"
 "plus"
 "pmod"
@@ -2636,7 +2532,6 @@
 "positive_modulo"
 "pow"
 "power"
-"printf"
 "proportionsZTest"
 "protocol"
 "punycodeDecode"
@@ -3207,8 +3102,6 @@
 "rankResample"
 "rankSimpleState"
 "rankState"
-"readWKTLineString"
-"readWKTMultiLineString"
 "readWKTMultiPolygon"
 "readWKTPoint"
 "readWKTPolygon"
@@ -3446,8 +3339,6 @@
 "skewSampState"
 "sleep"
 "sleepEachRow"
-"snowflakeIDToDateTime"
-"snowflakeIDToDateTime64"
 "snowflakeToDateTime"
 "snowflakeToDateTime64"
 "soundex"
@@ -4010,7 +3901,6 @@
 "truncate"
 "tryBase58Decode"
 "tryBase64Decode"
-"tryBase64URLDecode"
 "tryDecrypt"
 "tryIdnaEncode"
 "tryPunycodeDecode"
@@ -4032,7 +3922,6 @@
 "tupleModuloByNumber"
 "tupleMultiply"
 "tupleMultiplyByNumber"
-"tupleNames"
 "tupleNegate"
 "tuplePlus"
 "tupleToNameValuePairs"
diff --git a/tests/fuzz/dictionaries/keywords.dict b/tests/fuzz/dictionaries/key_words.dict
similarity index 95%
rename from tests/fuzz/dictionaries/keywords.dict
rename to tests/fuzz/dictionaries/key_words.dict
index abaaf9e53b5..db517a2382c 100644
--- a/tests/fuzz/dictionaries/keywords.dict
+++ b/tests/fuzz/dictionaries/key_words.dict
@@ -3,7 +3,7 @@
 "ADD CONSTRAINT"
 "ADD INDEX"
 "ADD PROJECTION"
-"ADD STATISTICS"
+"ADD STATISTIC"
 "ADMIN OPTION FOR"
 "AFTER"
 "ALGORITHM"
@@ -76,7 +76,7 @@
 "CLEAR COLUMN"
 "CLEAR INDEX"
 "CLEAR PROJECTION"
-"CLEAR STATISTICS"
+"CLEAR STATISTIC"
 "CLUSTER"
 "CLUSTERS"
 "CN"
@@ -110,8 +110,6 @@
 "CURRENTUSER"
 "CURRENT_USER"
 "D"
-"DATA"
-"DATA INNER UUID"
 "DATABASE"
 "DATABASES"
 "DATE"
@@ -149,7 +147,7 @@
 "DROP PART"
 "DROP PARTITION"
 "DROP PROJECTION"
-"DROP STATISTICS"
+"DROP STATISTIC"
 "DROP TABLE"
 "DROP TEMPORARY TABLE"
 "ELSE"
@@ -249,7 +247,6 @@
 "IS NULL"
 "IS_OBJECT_ID"
 "JOIN"
-"JWT"
 "KERBEROS"
 "KEY"
 "KEY BY"
@@ -280,15 +277,13 @@
 "MATERIALIZE COLUMN"
 "MATERIALIZE INDEX"
 "MATERIALIZE PROJECTION"
-"MATERIALIZE STATISTICS"
+"MATERIALIZE STATISTIC"
 "MATERIALIZE TTL"
 "MATERIALIZED"
 "MAX"
 "MCS"
 "MEMORY"
 "MERGES"
-"METRICS"
-"METRICS INNER UUID"
 "MI"
 "MICROSECOND"
 "MICROSECONDS"
@@ -302,14 +297,12 @@
 "MODIFY"
 "MODIFY COLUMN"
 "MODIFY COMMENT"
-"MODIFY DEFINER"
 "MODIFY ORDER BY"
 "MODIFY QUERY"
 "MODIFY REFRESH"
 "MODIFY SAMPLE BY"
 "MODIFY SETTING"
 "MODIFY SQL SECURITY"
-"MODIFY STATISTICS"
 "MODIFY TTL"
 "MONTH"
 "MONTHS"
@@ -380,7 +373,6 @@
 "Protobuf"
 "Q"
 "QQ"
-"QUALIFY"
 "QUARTER"
 "QUARTERS"
 "QUERY"
@@ -392,7 +384,6 @@
 "READONLY"
 "REALM"
 "RECOMPRESS"
-"RECURSIVE"
 "REFERENCES"
 "REFRESH"
 "REGEXP"
@@ -424,7 +415,6 @@
 "SALT"
 "SAMPLE"
 "SAMPLE BY"
-"SAN"
 "SCHEME"
 "SECOND"
 "SECONDS"
@@ -470,8 +460,7 @@
 "SS"
 "SSH_KEY"
 "SSL_CERTIFICATE"
-"START TRANSACTION"
-"STATISTICS"
+"STATISTIC"
 "STEP"
 "STORAGE"
 "STRICT"
@@ -486,8 +475,6 @@
 "TABLE"
 "TABLE OVERRIDE"
 "TABLES"
-"TAGS"
-"TAGS INNER UUID"
 "TEMPORARY"
 "TEMPORARY TABLE"
 "TEST"
@@ -542,7 +529,6 @@
 "WITH NAME"
 "WITH REPLACE OPTION"
 "WITH TIES"
-"WITH_ITEMINDEX"
 "WK"
 "WRITABLE"
 "WW"
@@ -554,3 +540,4 @@
 "bagexpansion"
 "base_backup"
 "cluster_host_ids"
+"with_itemindex"
diff --git a/tests/fuzz/tcp_protocol_fuzzer.options b/tests/fuzz/tcp_protocol_fuzzer.options
deleted file mode 100644
index 4885669d91d..00000000000
--- a/tests/fuzz/tcp_protocol_fuzzer.options
+++ /dev/null
@@ -1,4 +0,0 @@
-[fuzzer_arguments]
---log-file=tcp_protocol_fuzzer.log
---=
---logging.terminal=0
diff --git a/tests/fuzz/update_dict.sh b/tests/fuzz/update_dict.sh
deleted file mode 100755
index a83c9167129..00000000000
--- a/tests/fuzz/update_dict.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-SCRIPT_DIR=$(dirname "$(realpath "$0")")
-ROOT_PATH="$(git rev-parse --show-toplevel)"
-CLICKHOUSE_BIN="${CLICKHOUSE_BIN:-$ROOT_PATH/build/programs/clickhouse}"
-DICTIONARIES_DIR="$SCRIPT_DIR/dictionaries"
-
-echo "Generating functions dict"
-$CLICKHOUSE_BIN local -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" > "$DICTIONARIES_DIR/functions.dict"
-
-echo "Generating data types dict"
-$CLICKHOUSE_BIN local -q "SELECT DISTINCT concat('\"', name, '\"') as res FROM system.data_type_families ORDER BY name" > "$DICTIONARIES_DIR/datatypes.dict"
-
-echo "Generating keywords dict"
-$CLICKHOUSE_BIN local -q "SELECT DISTINCT concat('\"', keyword, '\"') as res FROM system.keywords ORDER BY keyword" > "$DICTIONARIES_DIR/keywords.dict"
-
-echo "Merging dictionaries into all.dict"
-cat "$DICTIONARIES_DIR"/* | LC_ALL=C sort | uniq > "$SCRIPT_DIR/all.dict"
\ No newline at end of file
diff --git a/tests/instructions/easy_tasks_sorted_ru.md b/tests/instructions/easy_tasks_sorted_ru.md
index e0607126ecc..fbd86ebf08f 100644
--- a/tests/instructions/easy_tasks_sorted_ru.md
+++ b/tests/instructions/easy_tasks_sorted_ru.md
@@ -97,6 +97,10 @@ Upd: сделали по-другому: теперь всё безопасно.
 
 Возвращает инкрементальное число для повторно встречающихся значений key.
 
+## Агрегатная функция groupConcat.
+
+`groupConcat(x, ',')` - собрать из переданных значений x строку, разделённую запятыми.
+
 ## Функции DATE_ADD, DATE_SUB как синонимы для совместимости с SQL.
 
 https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html#function_date-add
diff --git a/tests/integration/README.md b/tests/integration/README.md
index a149a4d60ef..a8deb97b526 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -142,7 +142,7 @@ of parallel workers for `pytest-xdist`.
 $ export CLICKHOUSE_TESTS_BASE_CONFIG_DIR=$HOME/ClickHouse/programs/server/
 $ export CLICKHOUSE_TESTS_SERVER_BIN_PATH=$HOME/ClickHouse/programs/clickhouse
 $ export CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH=$HOME/ClickHouse/programs/clickhouse-odbc-bridge
-$ ./runner test_storage_s3_queue/test.py::test_max_set_age --count 10 -n 5
+$ ./runner 'test_storage_s3_queue/test.py::test_max_set_age -- --count 10 -n 5'
 Start tests
 =============================================================================== test session starts ================================================================================
 platform linux -- Python 3.10.12, pytest-7.4.4, pluggy-1.5.0 -- /usr/bin/python3
@@ -188,14 +188,6 @@ docker build -t clickhouse/integration-test .
 ```
 
 The helper container used by the `runner` script is in `docker/test/integration/runner/Dockerfile`.
-It can be rebuild with 
-
-```
-cd docker/test/integration/runner
-docker build -t clickhouse/integration-test-runner .
-```
-
-If your docker configuration doesn't allow access to public internet with docker build command you may also need to add option --network=host if you rebuild image for a local integration testsing.
 
 ### Adding new tests
 
diff --git a/tests/integration/compose/docker_compose_hdfs.yml b/tests/integration/compose/docker_compose_hdfs.yml
index 40a10df01f7..1cae54ad9e1 100644
--- a/tests/integration/compose/docker_compose_hdfs.yml
+++ b/tests/integration/compose/docker_compose_hdfs.yml
@@ -1,7 +1,7 @@
 version: '2.3'
 services:
     hdfs1:
-        image: prasanthj/docker-hadoop:2.6.0
+        image: sequenceiq/hadoop-docker:2.7.0
         hostname: hdfs1
         restart: always
         expose:
diff --git a/tests/integration/compose/docker_compose_ldap.yml b/tests/integration/compose/docker_compose_ldap.yml
index f49e00400a2..1f50b34735d 100644
--- a/tests/integration/compose/docker_compose_ldap.yml
+++ b/tests/integration/compose/docker_compose_ldap.yml
@@ -19,7 +19,6 @@ services:
                 ldapsearch -x -H ldap://localhost:$$LDAP_PORT_NUMBER -D $$LDAP_ADMIN_DN -w $$LDAP_ADMIN_PASSWORD -b $$LDAP_ROOT
                 | grep -c -E "member: cn=j(ohn|ane)doe"
                 | grep 2 >> /dev/null
-                && cat /run/slapd/slapd.pid
             interval: 10s
             retries: 10
             timeout: 2s
diff --git a/tests/integration/compose/docker_compose_minio.yml b/tests/integration/compose/docker_compose_minio.yml
index 40098d05b04..4255a529f6d 100644
--- a/tests/integration/compose/docker_compose_minio.yml
+++ b/tests/integration/compose/docker_compose_minio.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   minio1:
-    image: minio/minio:RELEASE.2024-07-31T05-46-26Z
+    image: minio/minio:RELEASE.2023-09-30T07-02-29Z
     volumes:
       - data1-1:/data1
       - ${MINIO_CERTS_DIR:-}:/certs
diff --git a/tests/integration/compose/docker_compose_net.yml b/tests/integration/compose/docker_compose_net.yml
index 311f3008639..eff43681f2e 100644
--- a/tests/integration/compose/docker_compose_net.yml
+++ b/tests/integration/compose/docker_compose_net.yml
@@ -5,7 +5,7 @@ networks:
     enable_ipv6: true
     ipam:
       config:
-      - subnet: 10.0.0.0/12
-        gateway: 10.0.0.1
+      - subnet: 10.5.0.0/12
+        gateway: 10.5.1.1
       - subnet: 2001:3984:3989::/64
         gateway: 2001:3984:3989::1
diff --git a/tests/integration/compose/docker_compose_prometheus.yml b/tests/integration/compose/docker_compose_prometheus.yml
deleted file mode 100644
index 0a1db2138ba..00000000000
--- a/tests/integration/compose/docker_compose_prometheus.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-version: '2.3'
-services:
-  prometheus_writer:
-    image: prom/prometheus:v2.50.1
-    hostname: ${PROMETHEUS_WRITER_HOSTNAME:-prometheus_writer}
-    restart: always
-    entrypoint: |
-      /bin/sh -c 'truncate -s 0 /etc/prometheus/prometheus.yml
-      cat << EOF >> /etc/prometheus/prometheus.yml
-      global:
-        scrape_interval: 1s
-      scrape_configs:
-        - job_name: "prometheus"
-          static_configs:
-            - targets: ["localhost:${PROMETHEUS_WRITER_PORT}"]
-      EOF
-      if [ -n "${PROMETHEUS_REMOTE_WRITE_HANDLER}" ]; then
-        echo "remote_write:" >> /etc/prometheus/prometheus.yml
-        echo "  - url: \"${PROMETHEUS_REMOTE_WRITE_HANDLER}\"" >> /etc/prometheus/prometheus.yml
-      fi
-      #cat "/etc/prometheus/prometheus.yml"
-      /bin/prometheus --config.file="/etc/prometheus/prometheus.yml" --storage.tsdb.path="/prometheus" --web.console.libraries="/usr/share/prometheus/console_libraries" --web.console.templates="/usr/share/prometheus/consoles" --web.listen-address="0.0.0.0:${PROMETHEUS_WRITER_PORT}" &> /var/log/prometheus/prometheus.log'
-    expose:
-      - ${PROMETHEUS_WRITER_PORT}
-    healthcheck:
-      test: curl -f "ttps://localhost:${PROMETHEUS_WRITER_PORT}/api/v1/status/runtimeinfo" || exit 1
-      interval: 5s
-      timeout: 3s
-      retries: 30
-    volumes:
-      - type: ${PROMETHEUS_WRITER_LOGS_FS:-tmpfs}
-        source: ${PROMETHEUS_WRITER_LOGS:-}
-        target: /var/log/prometheus
-
-  prometheus_reader:
-    image: prom/prometheus:v2.50.1
-    hostname: ${PROMETHEUS_READER_HOSTNAME:-prometheus_reader}
-    restart: always
-    entrypoint: |
-      /bin/sh -c 'truncate -s 0 /etc/prometheus/prometheus.yml
-      if [ -n "${PROMETHEUS_REMOTE_READ_HANDLER}" ]; then
-        echo "remote_read:" >> /etc/prometheus/prometheus.yml
-        echo "  - url: \"${PROMETHEUS_REMOTE_READ_HANDLER}\"" >> /etc/prometheus/prometheus.yml
-      fi
-      #cat "/etc/prometheus/prometheus.yml"
-      /bin/prometheus --config.file="/etc/prometheus/prometheus.yml" --storage.tsdb.path="/prometheus" --web.console.libraries="/usr/share/prometheus/console_libraries" --web.console.templates="/usr/share/prometheus/consoles" --web.listen-address="0.0.0.0:${PROMETHEUS_READER_PORT}" &> /var/log/prometheus/prometheus.log'
-    expose:
-      - ${PROMETHEUS_READER_PORT}
-    healthcheck:
-      test: curl -f "ttps://localhost:${PROMETHEUS_READER_PORT}/api/v1/status/runtimeinfo" || exit 1
-      interval: 5s
-      timeout: 3s
-      retries: 30
-    volumes:
-      - type: ${PROMETHEUS_READER_LOGS_FS:-tmpfs}
-        source: ${PROMETHEUS_READER_LOGS:-}
-        target: /var/log/prometheus
diff --git a/tests/integration/compose/docker_compose_rabbitmq.yml b/tests/integration/compose/docker_compose_rabbitmq.yml
index 94c7f0111c4..61b21e0e3d9 100644
--- a/tests/integration/compose/docker_compose_rabbitmq.yml
+++ b/tests/integration/compose/docker_compose_rabbitmq.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
     rabbitmq1:
-        image: rabbitmq:3.12.6-alpine
+        image: rabbitmq:3.12.6-management-alpine
         hostname: rabbitmq1
         expose:
             - ${RABBITMQ_PORT:-5672}
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index aa235118aed..f4be31cc532 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -1,19 +1,16 @@
 #!/usr/bin/env python3
-# pylint: disable=unused-argument
-# pylint: disable=broad-exception-raised
 
 import logging
 import os
 
 import pytest  # pylint:disable=import-error; for style check
-from helpers.cluster import run_and_check, is_port_free
+from helpers.cluster import run_and_check
 from helpers.network import _NetworkManager
 
 # This is a workaround for a problem with logging in pytest [1].
 #
 #   [1]: https://github.com/pytest-dev/pytest/issues/5502
 logging.raiseExceptions = False
-PORTS_PER_WORKER = 50
 
 
 @pytest.fixture(scope="session", autouse=True)
@@ -114,40 +111,5 @@ def pytest_addoption(parser):
     )
 
 
-def get_unique_free_ports(total):
-    ports = []
-    for port in range(30000, 55000):
-        if is_port_free(port) and port not in ports:
-            ports.append(port)
-
-        if len(ports) == total:
-            return ports
-
-    raise Exception(f"Can't collect {total} ports. Collected: {len(ports)}")
-
-
 def pytest_configure(config):
     os.environ["INTEGRATION_TESTS_RUN_ID"] = config.option.run_id
-
-    # When running tests without pytest-xdist,
-    # the `pytest_xdist_setupnodes` hook is not executed
-    worker_ports = os.getenv("WORKER_FREE_PORTS", None)
-    if worker_ports is None:
-        master_ports = get_unique_free_ports(PORTS_PER_WORKER)
-        os.environ["WORKER_FREE_PORTS"] = " ".join([str(p) for p in master_ports])
-
-
-def pytest_xdist_setupnodes(config, specs):
-    # Find {PORTS_PER_WORKER} * {number of xdist workers} ports and
-    # allocate pool of {PORTS_PER_WORKER} ports to each worker
-
-    # Get number of xdist workers
-    num_workers = len(specs)
-    # Get free ports which will be distributed across workers
-    ports = get_unique_free_ports(num_workers * PORTS_PER_WORKER)
-
-    # Iterate over specs of workers and add allocated ports to env variable
-    for i, spec in enumerate(specs):
-        start_range = i * PORTS_PER_WORKER
-        per_workrer_ports = ports[start_range : start_range + PORTS_PER_WORKER]
-        spec.env["WORKER_FREE_PORTS"] = " ".join([str(p) for p in per_workrer_ports])
diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
index 821bb887435..9ac7f3646a8 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -52,7 +52,6 @@ from helpers.client import QueryRuntimeException
 import docker
 
 from .client import Client
-from .retry_decorator import retry
 
 from .config_cluster import *
 
@@ -135,52 +134,6 @@ def get_free_port():
         return s.getsockname()[1]
 
 
-def is_port_free(port: int) -> bool:
-    try:
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-            s.bind(("", port))
-            return True
-    except socket.error:
-        return False
-
-
-class PortPoolManager:
-    """
-    This class is used for distribution of ports allocated to single pytest-xdist worker
-    It can be used by multiple ClickHouseCluster instances
-    """
-
-    # Shared between instances
-    all_ports = None
-    free_ports = None
-
-    def __init__(self):
-        self.used_ports = []
-
-        if self.all_ports is None:
-            worker_ports = os.getenv("WORKER_FREE_PORTS")
-            ports = [int(p) for p in worker_ports.split(" ")]
-
-            # Static vars
-            PortPoolManager.all_ports = ports
-            PortPoolManager.free_ports = ports
-
-    def get_port(self):
-        for port in self.free_ports:
-            if is_port_free(port):
-                self.free_ports.remove(port)
-                self.used_ports.append(port)
-                return port
-
-        raise Exception(
-            f"No free ports: {self.all_ports}",
-        )
-
-    def return_used_ports(self):
-        self.free_ports.extend(self.used_ports)
-        self.used_ports.clear()
-
-
 def retry_exception(num, delay, func, exception=Exception, *args, **kwargs):
     """
     Retry if `func()` throws, `num` times.
@@ -294,7 +247,7 @@ def check_rabbitmq_is_available(rabbitmq_id, cookie):
         ),
         stdout=subprocess.PIPE,
     )
-    p.wait(timeout=60)
+    p.communicate()
     return p.returncode == 0
 
 
@@ -570,8 +523,6 @@ class ClickHouseCluster:
         self.spark_session = None
 
         self.with_azurite = False
-        self.azurite_container = "azurite-container"
-        self.blob_service_client = None
         self._azurite_port = 0
 
         # available when with_hdfs == True
@@ -739,25 +690,6 @@ class ClickHouseCluster:
         self.jdbc_driver_dir = p.abspath(p.join(self.instances_dir, "jdbc_driver"))
         self.jdbc_driver_logs_dir = os.path.join(self.jdbc_driver_dir, "logs")
 
-        # available when with_prometheus == True
-        self.with_prometheus = False
-        self.prometheus_writer_host = "prometheus_writer"
-        self.prometheus_writer_port = 9090
-        self.prometheus_writer_logs_dir = p.abspath(
-            p.join(self.instances_dir, "prometheus_writer/logs")
-        )
-        self.prometheus_reader_host = "prometheus_reader"
-        self.prometheus_reader_port = 9091
-        self.prometheus_reader_logs_dir = p.abspath(
-            p.join(self.instances_dir, "prometheus_reader/logs")
-        )
-        self.prometheus_remote_write_handler_host = None
-        self.prometheus_remote_write_handler_port = 9092
-        self.prometheus_remote_write_handler_path = "/write"
-        self.prometheus_remote_read_handler_host = None
-        self.prometheus_remote_read_handler_port = 9092
-        self.prometheus_remote_read_handler_path = "/read"
-
         self.docker_client = None
         self.is_up = False
         self.env = os.environ.copy()
@@ -783,67 +715,62 @@ class ClickHouseCluster:
                 .stop()
             )
 
-        self.port_pool = PortPoolManager()
-
     @property
     def kafka_port(self):
         if self._kafka_port:
             return self._kafka_port
-        self._kafka_port = self.port_pool.get_port()
+        self._kafka_port = get_free_port()
         return self._kafka_port
 
     @property
     def schema_registry_port(self):
         if self._schema_registry_port:
             return self._schema_registry_port
-        self._schema_registry_port = self.port_pool.get_port()
+        self._schema_registry_port = get_free_port()
         return self._schema_registry_port
 
     @property
     def schema_registry_auth_port(self):
         if self._schema_registry_auth_port:
             return self._schema_registry_auth_port
-        self._schema_registry_auth_port = self.port_pool.get_port()
+        self._schema_registry_auth_port = get_free_port()
         return self._schema_registry_auth_port
 
     @property
     def kerberized_kafka_port(self):
         if self._kerberized_kafka_port:
             return self._kerberized_kafka_port
-        self._kerberized_kafka_port = self.port_pool.get_port()
+        self._kerberized_kafka_port = get_free_port()
         return self._kerberized_kafka_port
 
     @property
     def azurite_port(self):
         if self._azurite_port:
             return self._azurite_port
-        self._azurite_port = self.port_pool.get_port()
+        self._azurite_port = get_free_port()
         return self._azurite_port
 
     @property
     def mongo_port(self):
         if self._mongo_port:
             return self._mongo_port
-        self._mongo_port = self.port_pool.get_port()
+        self._mongo_port = get_free_port()
         return self._mongo_port
 
     @property
     def mongo_no_cred_port(self):
         if self._mongo_no_cred_port:
             return self._mongo_no_cred_port
-        self._mongo_no_cred_port = self.port_pool.get_port()
+        self._mongo_no_cred_port = get_free_port()
         return self._mongo_no_cred_port
 
     @property
     def redis_port(self):
         if self._redis_port:
             return self._redis_port
-        self._redis_port = self.port_pool.get_port()
+        self._redis_port = get_free_port()
         return self._redis_port
 
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.port_pool.return_used_ports()
-
     def print_all_docker_pieces(self):
         res_networks = subprocess.check_output(
             f"docker network ls --filter name='{self.project_name}*'",
@@ -1640,42 +1567,6 @@ class ClickHouseCluster:
         ]
         return self.base_hive_cmd
 
-    def setup_prometheus_cmd(self, instance, env_variables, docker_compose_yml_dir):
-        env_variables["PROMETHEUS_WRITER_HOST"] = self.prometheus_writer_host
-        env_variables["PROMETHEUS_WRITER_PORT"] = str(self.prometheus_writer_port)
-        env_variables["PROMETHEUS_WRITER_LOGS"] = self.prometheus_writer_logs_dir
-        env_variables["PROMETHEUS_WRITER_LOGS_FS"] = "bind"
-        env_variables["PROMETHEUS_READER_HOST"] = self.prometheus_reader_host
-        env_variables["PROMETHEUS_READER_PORT"] = str(self.prometheus_reader_port)
-        env_variables["PROMETHEUS_READER_LOGS"] = self.prometheus_reader_logs_dir
-        env_variables["PROMETHEUS_READER_LOGS_FS"] = "bind"
-        if self.prometheus_remote_write_handler_host:
-            env_variables["PROMETHEUS_REMOTE_WRITE_HANDLER"] = (
-                f"http://{self.prometheus_remote_write_handler_host}:{self.prometheus_remote_write_handler_port}/{self.prometheus_remote_write_handler_path.strip('/')}"
-            )
-        if self.prometheus_remote_read_handler_host:
-            env_variables["PROMETHEUS_REMOTE_READ_HANDLER"] = (
-                f"http://{self.prometheus_remote_read_handler_host}:{self.prometheus_remote_read_handler_port}/{self.prometheus_remote_read_handler_path.strip('/')}"
-            )
-        if not self.with_prometheus:
-            self.with_prometheus = True
-            self.base_cmd.extend(
-                [
-                    "--file",
-                    p.join(docker_compose_yml_dir, "docker_compose_prometheus.yml"),
-                ]
-            )
-            self.base_prometheus_cmd = [
-                "docker-compose",
-                "--env-file",
-                instance.env_file,
-                "--project-name",
-                self.project_name,
-                "--file",
-                p.join(docker_compose_yml_dir, "docker_compose_prometheus.yml"),
-            ]
-        return self.base_prometheus_cmd
-
     def add_instance(
         self,
         name,
@@ -1716,9 +1607,6 @@ class ClickHouseCluster:
         with_jdbc_bridge=False,
         with_hive=False,
         with_coredns=False,
-        with_prometheus=False,
-        handle_prometheus_remote_write=False,
-        handle_prometheus_remote_read=False,
         use_old_analyzer=None,
         hostname=None,
         env_variables=None,
@@ -2061,17 +1949,6 @@ class ClickHouseCluster:
                 self.setup_hive(instance, env_variables, docker_compose_yml_dir)
             )
 
-        if with_prometheus:
-            if handle_prometheus_remote_write:
-                self.prometheus_remote_write_handler_host = instance.hostname
-            if handle_prometheus_remote_read:
-                self.prometheus_remote_read_handler_host = instance.hostname
-            cmds.append(
-                self.setup_prometheus_cmd(
-                    instance, env_variables, docker_compose_yml_dir
-                )
-            )
-
         logging.debug(
             "Cluster name:{} project_name:{}. Added instance name:{} tag:{} base_cmd:{} docker_compose_yml_dir:{}".format(
                 self.name,
@@ -2112,7 +1989,6 @@ class ClickHouseCluster:
             self.base_cmd + ["up", "--force-recreate", "--no-deps", "-d", node.name]
         )
         node.ip_address = self.get_instance_ip(node.name)
-        node.ipv6_address = self.get_instance_global_ipv6(node.name)
         node.client = Client(node.ip_address, command=self.client_bin_path)
 
         logging.info("Restart node with ip change")
@@ -2443,7 +2319,7 @@ class ClickHouseCluster:
                 time.sleep(0.5)
         raise Exception("Cannot wait PostgreSQL Java Client container")
 
-    def wait_rabbitmq_to_start(self, timeout=60):
+    def wait_rabbitmq_to_start(self, timeout=30):
         self.print_all_docker_pieces()
         self.rabbitmq_ip = self.get_instance_ip(self.rabbitmq_host)
 
@@ -2471,7 +2347,7 @@ class ClickHouseCluster:
                 )
             rabbitmq_debuginfo(self.rabbitmq_docker_id, self.rabbitmq_cookie)
         except Exception as e:
-            logging.debug(f"Unable to get logs from docker: {e}.")
+            logging.debug("Unable to get logs from docker.")
         raise Exception("Cannot wait RabbitMQ container")
 
     def wait_nats_is_available(self, max_retries=5):
@@ -2695,32 +2571,6 @@ class ClickHouseCluster:
                     connection_string
                 )
                 logging.debug(blob_service_client.get_account_information())
-                containers = [
-                    c
-                    for c in blob_service_client.list_containers(
-                        name_starts_with=self.azurite_container
-                    )
-                    if c.name == self.azurite_container
-                ]
-                if len(containers) > 0:
-                    for c in containers:
-                        blob_service_client.delete_container(c)
-
-                container_client = blob_service_client.get_container_client(
-                    self.azurite_container
-                )
-                if container_client.exists():
-                    logging.debug(
-                        f"azurite container '{self.azurite_container}' exist, deleting all blobs"
-                    )
-                    for b in container_client.list_blobs():
-                        container_client.delete_blob(b.name)
-                else:
-                    logging.debug(
-                        f"azurite container '{self.azurite_container}' doesn't exist, creating it"
-                    )
-                    container_client.create_container()
-
                 self.blob_service_client = blob_service_client
                 return
             except Exception as ex:
@@ -2845,14 +2695,15 @@ class ClickHouseCluster:
 
             images_pull_cmd = self.base_cmd + ["pull"]
             # sometimes dockerhub/proxy can be flaky
-
-            def logging_pulling_images(**kwargs):
-                if "exception" in kwargs:
-                    logging.info(
-                        "Got exception pulling images: %s", kwargs["exception"]
-                    )
-
-            retry(log_function=logging_pulling_images)(run_and_check)(images_pull_cmd)
+            for i in range(5):
+                try:
+                    run_and_check(images_pull_cmd)
+                    break
+                except Exception as ex:
+                    if i == 4:
+                        raise ex
+                    logging.info("Got exception pulling images: %s", ex)
+                    time.sleep(i * 3)
 
             if self.with_zookeeper_secure and self.base_zookeeper_cmd:
                 logging.debug("Setup ZooKeeper Secure")
@@ -3125,17 +2976,7 @@ class ClickHouseCluster:
                     "Trying to create Azurite instance by command %s",
                     " ".join(map(str, azurite_start_cmd)),
                 )
-
-                def logging_azurite_initialization(exception, retry_number, sleep_time):
-                    logging.info(
-                        f"Azurite initialization failed with error: {exception}"
-                    )
-
-                retry(
-                    log_function=logging_azurite_initialization,
-                )(
-                    run_and_check
-                )(azurite_start_cmd)
+                run_and_check(azurite_start_cmd)
                 self.up_called = True
                 logging.info("Trying to connect to Azurite")
                 self.wait_azurite_to_start()
@@ -3162,12 +3003,6 @@ class ClickHouseCluster:
                     f"http://{self.jdbc_bridge_ip}:{self.jdbc_bridge_port}/ping"
                 )
 
-            if self.with_prometheus:
-                os.makedirs(self.prometheus_writer_logs_dir)
-                os.chmod(self.prometheus_writer_logs_dir, stat.S_IRWXU | stat.S_IRWXO)
-                os.makedirs(self.prometheus_reader_logs_dir)
-                os.chmod(self.prometheus_reader_logs_dir, stat.S_IRWXU | stat.S_IRWXO)
-
             clickhouse_start_cmd = self.base_cmd + ["up", "-d", "--no-recreate"]
             logging.debug(
                 (
@@ -3183,7 +3018,6 @@ class ClickHouseCluster:
             for instance in self.instances.values():
                 instance.docker_client = self.docker_client
                 instance.ip_address = self.get_instance_ip(instance.name)
-                instance.ipv6_address = self.get_instance_global_ipv6(instance.name)
 
                 logging.debug(
                     f"Waiting for ClickHouse start in {instance.name}, ip: {instance.ip_address}..."
@@ -4589,7 +4423,7 @@ class ClickHouseInstance:
 
         use_old_analyzer = os.environ.get("CLICKHOUSE_USE_OLD_ANALYZER") is not None
         # If specific version was used there can be no
-        # enable_analyzer setting, so do this only if it was
+        # allow_experimental_analyzer setting, so do this only if it was
         # explicitly requested.
         if self.tag:
             use_old_analyzer = False
diff --git a/tests/integration/helpers/network.py b/tests/integration/helpers/network.py
index f24b5924e73..e6e79dc7947 100644
--- a/tests/integration/helpers/network.py
+++ b/tests/integration/helpers/network.py
@@ -3,7 +3,6 @@ import subprocess
 import time
 import logging
 import docker
-import ipaddress
 
 
 class PartitionManager:
@@ -27,76 +26,25 @@ class PartitionManager:
         self._check_instance(instance)
 
         self._add_rule(
-            {
-                "source": instance.ip_address,
-                "destination_port": 2181,
-                "action": action,
-            }
+            {"source": instance.ip_address, "destination_port": 2181, "action": action}
         )
         self._add_rule(
-            {
-                "destination": instance.ip_address,
-                "source_port": 2181,
-                "action": action,
-            }
+            {"destination": instance.ip_address, "source_port": 2181, "action": action}
         )
 
-        if instance.ipv6_address:
-            self._add_rule(
-                {
-                    "source": instance.ipv6_address,
-                    "destination_port": 2181,
-                    "action": action,
-                }
-            )
-            self._add_rule(
-                {
-                    "destination": instance.ipv6_address,
-                    "source_port": 2181,
-                    "action": action,
-                }
-            )
-
     def dump_rules(self):
-        v4 = _NetworkManager.get().dump_rules()
-        v6 = _NetworkManager.get().dump_v6_rules()
-
-        return v4 + v6
+        return _NetworkManager.get().dump_rules()
 
     def restore_instance_zk_connections(self, instance, action="DROP"):
         self._check_instance(instance)
 
         self._delete_rule(
-            {
-                "source": instance.ip_address,
-                "destination_port": 2181,
-                "action": action,
-            }
+            {"source": instance.ip_address, "destination_port": 2181, "action": action}
         )
         self._delete_rule(
-            {
-                "destination": instance.ip_address,
-                "source_port": 2181,
-                "action": action,
-            }
+            {"destination": instance.ip_address, "source_port": 2181, "action": action}
         )
 
-        if instance.ipv6_address:
-            self._delete_rule(
-                {
-                    "source": instance.ipv6_address,
-                    "destination_port": 2181,
-                    "action": action,
-                }
-            )
-            self._delete_rule(
-                {
-                    "destination": instance.ipv6_address,
-                    "source_port": 2181,
-                    "action": action,
-                }
-            )
-
     def partition_instances(self, left, right, port=None, action="DROP"):
         self._check_instance(left)
         self._check_instance(right)
@@ -111,34 +59,16 @@ class PartitionManager:
                 rule["destination_port"] = port
             return rule
 
-        def create_rule_v6(src, dst):
-            rule = {
-                "source": src.ipv6_address,
-                "destination": dst.ipv6_address,
-                "action": action,
-            }
-            if port is not None:
-                rule["destination_port"] = port
-            return rule
-
         self._add_rule(create_rule(left, right))
         self._add_rule(create_rule(right, left))
 
-        if left.ipv6_address and right.ipv6_address:
-            self._add_rule(create_rule_v6(left, right))
-            self._add_rule(create_rule_v6(right, left))
-
     def add_network_delay(self, instance, delay_ms):
         self._add_tc_netem_delay(instance, delay_ms)
 
     def heal_all(self):
         while self._iptables_rules:
             rule = self._iptables_rules.pop()
-
-            if self._is_ipv6_rule(rule):
-                _NetworkManager.get().delete_ip6tables_rule(**rule)
-            else:
-                _NetworkManager.get().delete_iptables_rule(**rule)
+            _NetworkManager.get().delete_iptables_rule(**rule)
 
         while self._netem_delayed_instances:
             instance = self._netem_delayed_instances.pop()
@@ -160,27 +90,12 @@ class PartitionManager:
         if instance.ip_address is None:
             raise Exception("Instance + " + instance.name + " is not launched!")
 
-    @staticmethod
-    def _is_ipv6_rule(rule):
-        if rule.get("source"):
-            return ipaddress.ip_address(rule["source"]).version == 6
-        if rule.get("destination"):
-            return ipaddress.ip_address(rule["destination"]).version == 6
-
-        return False
-
     def _add_rule(self, rule):
-        if self._is_ipv6_rule(rule):
-            _NetworkManager.get().add_ip6tables_rule(**rule)
-        else:
-            _NetworkManager.get().add_iptables_rule(**rule)
+        _NetworkManager.get().add_iptables_rule(**rule)
         self._iptables_rules.append(rule)
 
     def _delete_rule(self, rule):
-        if self._is_ipv6_rule(rule):
-            _NetworkManager.get().delete_ip6tables_rule(**rule)
-        else:
-            _NetworkManager.get().delete_iptables_rule(**rule)
+        _NetworkManager.get().delete_iptables_rule(**rule)
         self._iptables_rules.remove(rule)
 
     def _add_tc_netem_delay(self, instance, delay_ms):
@@ -235,65 +150,35 @@ class _NetworkManager:
             cls._instance = cls(**kwargs)
         return cls._instance
 
-    def setup_ip6tables_docker_user_chain(self):
-        _rules = subprocess.check_output(f"ip6tables-save", shell=True)
-        if "DOCKER-USER" in _rules.decode("utf-8"):
-            return
-
-        setup_cmds = [
-            ["ip6tables", "--wait", "-N", "DOCKER-USER"],
-            ["ip6tables", "--wait", "-I", "FORWARD", "-j", "DOCKER-USER"],
-            ["ip6tables", "--wait", "-A", "DOCKER-USER", "-j", "RETURN"],
-        ]
-        for cmd in setup_cmds:
-            self._exec_run(cmd, privileged=True)
-
     def add_iptables_rule(self, **kwargs):
         cmd = ["iptables", "--wait", "-I", "DOCKER-USER", "1"]
         cmd.extend(self._iptables_cmd_suffix(**kwargs))
         self._exec_run(cmd, privileged=True)
 
-    def add_ip6tables_rule(self, **kwargs):
-        self.setup_ip6tables_docker_user_chain()
-
-        cmd = ["ip6tables", "--wait", "-I", "DOCKER-USER", "1"]
-        cmd.extend(self._iptables_cmd_suffix(**kwargs))
-        self._exec_run(cmd, privileged=True)
-
     def delete_iptables_rule(self, **kwargs):
         cmd = ["iptables", "--wait", "-D", "DOCKER-USER"]
         cmd.extend(self._iptables_cmd_suffix(**kwargs))
         self._exec_run(cmd, privileged=True)
 
-    def delete_ip6tables_rule(self, **kwargs):
-        cmd = ["ip6tables", "--wait", "-D", "DOCKER-USER"]
-        cmd.extend(self._iptables_cmd_suffix(**kwargs))
-        self._exec_run(cmd, privileged=True)
-
     def dump_rules(self):
         cmd = ["iptables", "-L", "DOCKER-USER"]
         return self._exec_run(cmd, privileged=True)
 
-    def dump_v6_rules(self):
-        cmd = ["ip6tables", "-L", "DOCKER-USER"]
-        return self._exec_run(cmd, privileged=True)
-
     @staticmethod
     def clean_all_user_iptables_rules():
-        for iptables in ("iptables", "ip6tables"):
-            for i in range(1000):
-                iptables_iter = i
-                # when rules will be empty, it will return error
-                res = subprocess.run(f"{iptables} --wait -D DOCKER-USER 1", shell=True)
+        for i in range(1000):
+            iptables_iter = i
+            # when rules will be empty, it will return error
+            res = subprocess.run("iptables --wait -D DOCKER-USER 1", shell=True)
 
-                if res.returncode != 0:
-                    logging.info(
-                        f"All {iptables} rules cleared, "
-                        + str(iptables_iter)
-                        + " iterations, last error: "
-                        + str(res.stderr)
-                    )
-                    break
+            if res.returncode != 0:
+                logging.info(
+                    "All iptables rules cleared, "
+                    + str(iptables_iter)
+                    + " iterations, last error: "
+                    + str(res.stderr)
+                )
+                return
 
     @staticmethod
     def _iptables_cmd_suffix(
@@ -303,7 +188,6 @@ class _NetworkManager:
         destination_port=None,
         action=None,
         probability=None,
-        protocol=None,
         custom_args=None,
     ):
         ret = []
@@ -318,7 +202,7 @@ class _NetworkManager:
                     str(probability),
                 ]
             )
-        ret.extend(["-p", "tcp" if protocol is None else protocol])
+        ret.extend(["-p", "tcp"])
         if source is not None:
             ret.extend(["-s", source])
         if destination is not None:
diff --git a/tests/integration/helpers/postgres_utility.py b/tests/integration/helpers/postgres_utility.py
index c61c535bd62..468c3b3bb63 100644
--- a/tests/integration/helpers/postgres_utility.py
+++ b/tests/integration/helpers/postgres_utility.py
@@ -245,9 +245,9 @@ class PostgresManager:
     ):
         postgres_database = self.database_or_default(postgres_database)
         self.created_materialized_postgres_db_list.add(materialized_database)
-        self.instance.query(f"DROP DATABASE IF EXISTS `{materialized_database}`")
+        self.instance.query(f"DROP DATABASE IF EXISTS {materialized_database}")
 
-        create_query = f"CREATE DATABASE `{materialized_database}` ENGINE = MaterializedPostgreSQL('{ip}:{port}', '{postgres_database}', '{user}', '{password}')"
+        create_query = f"CREATE DATABASE {materialized_database} ENGINE = MaterializedPostgreSQL('{ip}:{port}', '{postgres_database}', '{user}', '{password}')"
         if len(settings) > 0:
             create_query += " SETTINGS "
             for i in range(len(settings)):
@@ -259,7 +259,7 @@ class PostgresManager:
         assert materialized_database in self.instance.query("SHOW DATABASES")
 
     def drop_materialized_db(self, materialized_database="test_database"):
-        self.instance.query(f"DROP DATABASE IF EXISTS `{materialized_database}` SYNC")
+        self.instance.query(f"DROP DATABASE IF EXISTS {materialized_database} SYNC")
         if materialized_database in self.created_materialized_postgres_db_list:
             self.created_materialized_postgres_db_list.remove(materialized_database)
 
@@ -329,15 +329,11 @@ def assert_nested_table_is_created(
         table = schema_name + "." + table_name
 
     print(f"Checking table {table} exists in {materialized_database}")
-    database_tables = instance.query(
-        f"SHOW TABLES FROM `{materialized_database}` WHERE name = '{table}'"
-    )
+    database_tables = instance.query(f"SHOW TABLES FROM {materialized_database}")
 
     while table not in database_tables:
         time.sleep(0.2)
-        database_tables = instance.query(
-            f"SHOW TABLES FROM `{materialized_database}` WHERE name = '{table}'"
-        )
+        database_tables = instance.query(f"SHOW TABLES FROM {materialized_database}")
 
     assert table in database_tables
 
@@ -370,9 +366,9 @@ def check_tables_are_synchronized(
 
     table_path = ""
     if len(schema_name) == 0:
-        table_path = f"`{materialized_database}`.`{table_name}`"
+        table_path = f"{materialized_database}.{table_name}"
     else:
-        table_path = f"`{materialized_database}`.`{schema_name}.{table_name}`"
+        table_path = f"{materialized_database}.`{schema_name}.{table_name}`"
 
     print(f"Checking table is synchronized: {table_path}")
     result_query = f"select * from {table_path} order by {order_by};"
diff --git a/tests/integration/helpers/retry_decorator.py b/tests/integration/helpers/retry_decorator.py
deleted file mode 100644
index e7bafbe29c1..00000000000
--- a/tests/integration/helpers/retry_decorator.py
+++ /dev/null
@@ -1,39 +0,0 @@
-import time
-import random
-from typing import Type, List
-
-
-def retry(
-    retries: int = 5,
-    delay: float = 1,
-    backoff: float = 1.5,
-    jitter: float = 2,
-    log_function=None,  # should take **kwargs or arguments: `retry_number`, `exception` and `sleep_time`
-    retriable_expections_list: List[Type[BaseException]] = [Exception],
-):
-    def inner(func):
-        def wrapper(*args, **kwargs):
-            current_delay = delay
-            for retry in range(retries):
-                try:
-                    func(*args, **kwargs)
-                    break
-                except Exception as e:
-                    should_retry = False
-                    for retriable_exception in retriable_expections_list:
-                        if isinstance(e, retriable_exception):
-                            should_retry = True
-                            break
-                    if not should_retry or (retry == retries - 1):
-                        raise e
-                    sleep_time = current_delay + random.uniform(0, jitter)
-                    if log_function is not None:
-                        log_function(
-                            retry_number=retry, exception=e, sleep_time=sleep_time
-                        )
-                    time.sleep(sleep_time)
-                    current_delay *= backoff
-
-        return wrapper
-
-    return inner
diff --git a/tests/integration/helpers/s3_tools.py b/tests/integration/helpers/s3_tools.py
index 5b727060e69..0c3538c3c39 100644
--- a/tests/integration/helpers/s3_tools.py
+++ b/tests/integration/helpers/s3_tools.py
@@ -2,92 +2,30 @@ from minio import Minio
 import glob
 import os
 import json
-import shutil
 
 
-from enum import Enum
-
-
-class CloudUploader:
-
-    def upload_directory(self, local_path, remote_blob_path, **kwargs):
-        print(kwargs)
-        result_files = []
-        # print(f"Arguments: {local_path}, {s3_path}")
-        # for local_file in glob.glob(local_path + "/**"):
-        #     print("Local file: {}", local_file)
-        for local_file in glob.glob(local_path + "/**"):
+def upload_directory(minio_client, bucket_name, local_path, s3_path):
+    result_files = []
+    for local_file in glob.glob(local_path + "/**"):
+        if os.path.isfile(local_file):
             result_local_path = os.path.join(local_path, local_file)
-            result_remote_blob_path = os.path.join(remote_blob_path, local_file)
-            if os.path.isfile(local_file):
-                self.upload_file(result_local_path, result_remote_blob_path, **kwargs)
-                result_files.append(result_remote_blob_path)
-            else:
-                files = self.upload_directory(
-                    result_local_path, result_remote_blob_path, **kwargs
-                )
-                result_files.extend(files)
-        return result_files
-
-
-class S3Uploader(CloudUploader):
-    def __init__(self, minio_client, bucket_name):
-        self.minio_client = minio_client
-        self.bucket_name = bucket_name
-
-    def upload_file(self, local_path, remote_blob_path, bucket=None):
-        print(f"Upload to bucket: {bucket}")
-        if bucket is None:
-            bucket = self.bucket_name
-        self.minio_client.fput_object(
-            bucket_name=bucket,
-            object_name=remote_blob_path,
-            file_path=local_path,
-        )
-
-
-class LocalUploader(CloudUploader):
-
-    def __init__(self, clickhouse_node):
-        self.clickhouse_node = clickhouse_node
-
-    def upload_file(self, local_path, remote_blob_path):
-        dir_path = os.path.dirname(remote_blob_path)
-        if dir_path != "":
-            self.clickhouse_node.exec_in_container(
-                [
-                    "bash",
-                    "-c",
-                    "mkdir -p {}".format(dir_path),
-                ]
+            result_s3_path = os.path.join(s3_path, local_file)
+            print(f"Putting file {result_local_path} to {result_s3_path}")
+            minio_client.fput_object(
+                bucket_name=bucket_name,
+                object_name=result_s3_path,
+                file_path=result_local_path,
             )
-        self.clickhouse_node.copy_file_to_container(local_path, remote_blob_path)
-
-
-class AzureUploader(CloudUploader):
-
-    def __init__(self, blob_service_client, container_name):
-        self.blob_service_client = blob_service_client
-        self.container_client = self.blob_service_client.get_container_client(
-            container_name
-        )
-
-    def upload_file(self, local_path, remote_blob_path, container_name=None):
-        if container_name is None:
-            container_client = self.container_client
+            result_files.append(result_s3_path)
         else:
-            container_client = self.blob_service_client.get_container_client(
-                container_name
+            files = upload_directory(
+                minio_client,
+                bucket_name,
+                os.path.join(local_path, local_file),
+                os.path.join(s3_path, local_file),
             )
-        blob_client = container_client.get_blob_client(remote_blob_path)
-        with open(local_path, "rb") as data:
-            blob_client.upload_blob(data, overwrite=True)
-
-
-def upload_directory(minio_client, bucket, local_path, remote_path):
-    return S3Uploader(minio_client=minio_client, bucket_name=bucket).upload_directory(
-        local_path, remote_path
-    )
+            result_files.extend(files)
+    return result_files
 
 
 def get_file_contents(minio_client, bucket, s3_path):
diff --git a/tests/integration/parallel_skip.json b/tests/integration/parallel_skip.json
index 507894534d4..e6fdf27f54c 100644
--- a/tests/integration/parallel_skip.json
+++ b/tests/integration/parallel_skip.json
@@ -1,7 +1,6 @@
 [
   "test_dns_cache/test.py::test_dns_cache_update",
   "test_dns_cache/test.py::test_ip_change_drop_dns_cache",
-  "test_dns_cache/test.py::test_dns_resolver_filter",
   "test_dns_cache/test.py::test_ip_change_update_dns_cache",
   "test_dns_cache/test.py::test_user_access_ip_change[node0]",
   "test_dns_cache/test.py::test_user_access_ip_change[node1]",
@@ -44,6 +43,7 @@
   "test_replicated_database/test.py::test_startup_without_zk",
   "test_replicated_database/test.py::test_sync_replica",
   "test_replicated_fetches_timeouts/test.py::test_no_stall",
+  "test_storage_kafka/test.py::test_kafka_no_holes_when_write_suffix_failed",
   "test_storage_s3/test.py::test_url_reconnect_in_the_middle",
   "test_system_metrics/test.py::test_readonly_metrics",
   "test_system_replicated_fetches/test.py::test_system_replicated_fetches",
@@ -73,7 +73,7 @@
   "test_keeper_map/test.py::test_keeper_map_without_zk",
 
   "test_replicated_merge_tree_wait_on_shutdown/test.py::test_shutdown_and_wait",
-
+  
   "test_http_failover/test.py::test_url_destination_host_with_multiple_addrs",
   "test_http_failover/test.py::test_url_invalid_hostname",
   "test_http_failover/test.py::test_url_ip_change",
@@ -171,5 +171,4 @@
   "test_storage_kerberized_kafka/test.py::test_kafka_json_as_string_request_new_ticket_after_expiration",
   "test_storage_kerberized_kafka/test.py::test_kafka_json_as_string_no_kdc",
   "test_storage_kerberized_kafka/test.py::test_kafka_config_from_sql_named_collection"
-
 ]
diff --git a/tests/integration/runner b/tests/integration/runner
index 83c28cff7c7..a583d7fe897 100755
--- a/tests/integration/runner
+++ b/tests/integration/runner
@@ -6,7 +6,6 @@ import logging
 import os
 import random
 import shlex
-import shutil
 import signal
 import string
 import subprocess
@@ -136,53 +135,6 @@ def check_args_and_update_paths(args):
         )
 
 
-def check_iptables_legacy():
-    iptables_path = shutil.which("iptables")
-    ip6tables_path = shutil.which("ip6tables")
-
-    if iptables_path is None:
-        print("Error: 'iptables' not found in PATH")
-        sys.exit(1)
-    if ip6tables_path is None:
-        print("Error: 'ip6tables' not found in PATH, ignoring")
-
-    try:
-        file_info = os.stat(iptables_path)
-        file_info_str = str(file_info)
-
-        if "legacy" in file_info_str:
-            print(
-                """
-                iptables on your host machine is in 'legacy' mode. This is not supported.
-
-                Please switch to 'nftables' mode, usualy by installing `iptables-nft` or `nftables`, consult your distribution manual.
-                Or, use --ignore-iptables-legacy-check.
-                """
-            )
-            sys.exit(1)
-
-        if not ip6tables_path:
-            return
-
-        file_info = os.stat(ip6tables_path)
-        file_info_str = str(file_info)
-
-        if "legacy" in file_info_str:
-            print(
-                """
-                ip6tables on your host machine is in 'legacy' mode. This is not supported.
-
-                Please switch to 'nftables' mode, usualy by installing `iptables-nft` or `nftables`, consult your distribution manual.
-                Or, use --ignore-iptables-legacy-check.
-                """
-            )
-            sys.exit(1)
-
-    except FileNotFoundError:
-        print(f"Error: '{iptables_path}' not found")
-        sys.exit(1)
-
-
 def docker_kill_handler_handler(signum, frame):
     _, _ = signum, frame
     subprocess.check_call(
@@ -211,7 +163,6 @@ if __name__ == "__main__":
         level=logging.INFO,
         format="%(asctime)s [ %(process)d ] %(levelname)s : %(message)s (%(filename)s:%(lineno)s, %(funcName)s)",
     )
-
     parser = argparse.ArgumentParser(description="ClickHouse integration tests runner")
 
     parser.add_argument(
@@ -292,10 +243,6 @@ if __name__ == "__main__":
         "-n", "--parallel", action="store", dest="parallel", help="Parallelism"
     )
 
-    parser.add_argument(
-        "--count", action="store", type=int, dest="count", help="Repeat count"
-    )
-
     parser.add_argument(
         "--no-random",
         action="store",
@@ -360,33 +307,17 @@ if __name__ == "__main__":
         help="Bind volume to this dir to use for dockerd files",
     )
 
-    parser.add_argument(
-        "--ignore-iptables-legacy-check",
-        action="store_true",
-        default=False,
-        help="Ignore iptables-legacy usage check",
-    )
-
     parser.add_argument("pytest_args", nargs="*", help="args for pytest command")
 
     args = parser.parse_args()
 
     check_args_and_update_paths(args)
 
-    if not args.ignore_iptables_legacy_check:
-        check_iptables_legacy()
-    else:
-        logging.warning("Skipping iptables-legacy check")
-
     parallel_args = ""
     if args.parallel:
         parallel_args += "--dist=loadfile"
         parallel_args += f" -n {args.parallel}".format()
 
-    repeat_args = (
-        f" --count {args.count}" if args.count is not None and args.count > 0 else ""
-    )
-
     rand_args = ""
     # if not args.no_random:
     #     rand_args += f"--random-seed={os.getpid()}"
@@ -478,7 +409,7 @@ if __name__ == "__main__":
         f"--volume={args.utils_dir}/grpc-client/pb2:/ClickHouse/utils/grpc-client/pb2 "
         f"--volume=/run:/run/host:ro {dockerd_internal_volume} {env_tags} {env_cleanup} "
         f"-e DOCKER_CLIENT_TIMEOUT=300 -e COMPOSE_HTTP_TIMEOUT=600 {use_old_analyzer} -e PYTHONUNBUFFERED=1 "
-        f'-e PYTEST_ADDOPTS="{parallel_args} {repeat_args} {pytest_opts} {tests_list} {rand_args} -vvv"'
+        f'-e PYTEST_ADDOPTS="{parallel_args} {pytest_opts} {tests_list} {rand_args} -vvv"'
         f" {DIND_INTEGRATION_TESTS_IMAGE_NAME}:{args.docker_image_version}"
     )
 
diff --git a/tests/integration/test_accept_invalid_certificate/configs/ssl_config_strict.xml b/tests/integration/test_accept_invalid_certificate/configs/ssl_config_strict.xml
deleted file mode 100644
index a4383a77ac4..00000000000
--- a/tests/integration/test_accept_invalid_certificate/configs/ssl_config_strict.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<clickhouse>
-    <!-- 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>
-
-    <!-- Used with https_port and tcp_port_secure. Full ssl options list: https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h#L71 -->
-    <openSSL replace="replace">
-        <server> <!-- Used for https server AND secure tcp port -->
-            <certificateFile>/etc/clickhouse-server/config.d/self-cert.pem</certificateFile>
-            <privateKeyFile>/etc/clickhouse-server/config.d/self-key.pem</privateKeyFile>
-            <caConfig>/etc/clickhouse-server/config.d/ca-cert.pem</caConfig>
-            <verificationMode>strict</verificationMode>
-        </server>
-    </openSSL>
-</clickhouse>
diff --git a/tests/integration/test_accept_invalid_certificate/test.py b/tests/integration/test_accept_invalid_certificate/test.py
index f43e9e6140a..87229d75f90 100644
--- a/tests/integration/test_accept_invalid_certificate/test.py
+++ b/tests/integration/test_accept_invalid_certificate/test.py
@@ -17,19 +17,6 @@ instance = cluster.add_instance(
         "certs/self-cert.pem",
         "certs/ca-cert.pem",
     ],
-    with_zookeeper=False,
-)
-
-
-node1 = cluster.add_instance(
-    "node1",
-    main_configs=[
-        "configs/ssl_config_strict.xml",
-        "certs/self-key.pem",
-        "certs/self-cert.pem",
-        "certs/ca-cert.pem",
-    ],
-    with_zookeeper=False,
 )
 
 
@@ -103,25 +90,3 @@ def test_connection_accept():
         )
         == "1\n"
     )
-
-
-def test_strict_reject():
-    with pytest.raises(Exception) as err:
-        execute_query_native(node1, "SELECT 1", "<clickhouse></clickhouse>")
-    assert "certificate verify failed" in str(err.value)
-
-
-def test_strict_reject_with_config():
-    with pytest.raises(Exception) as err:
-        execute_query_native(node1, "SELECT 1", config_accept)
-    assert "alert certificate required" in str(err.value)
-
-
-def test_strict_connection_reject():
-    with pytest.raises(Exception) as err:
-        execute_query_native(
-            node1,
-            "SELECT 1",
-            config_connection_accept.format(ip_address=f"{instance.ip_address}"),
-        )
-    assert "certificate verify failed" in str(err.value)
diff --git a/tests/integration/test_access_control_on_cluster/test.py b/tests/integration/test_access_control_on_cluster/test.py
index c292d0cc3a4..b12add7ad3f 100644
--- a/tests/integration/test_access_control_on_cluster/test.py
+++ b/tests/integration/test_access_control_on_cluster/test.py
@@ -89,5 +89,3 @@ def test_grant_current_database_on_cluster():
     assert ch1.query("SHOW DATABASES", user="test_user") == "user_db\n"
     ch1.query("GRANT SELECT ON * TO test_user ON CLUSTER 'cluster'", user="test_user")
     assert ch1.query("SHOW DATABASES", user="test_user") == "user_db\n"
-    ch1.query("DROP DATABASE user_db ON CLUSTER 'cluster'")
-    ch1.query("DROP USER test_user ON CLUSTER 'cluster'")
diff --git a/tests/integration/test_access_for_functions/test.py b/tests/integration/test_access_for_functions/test.py
index 82125b35b49..004d39e1dea 100644
--- a/tests/integration/test_access_for_functions/test.py
+++ b/tests/integration/test_access_for_functions/test.py
@@ -65,8 +65,8 @@ def test_ignore_obsolete_grant_on_database():
             "-c",
             f"""
         cat > /var/lib/clickhouse/access/{user_id}.sql << EOF
-ATTACH USER \`{user_id}\`;
-ATTACH GRANT CREATE FUNCTION, SELECT ON mydb.* TO \`{user_id}\`;
+ATTACH USER X;
+ATTACH GRANT CREATE FUNCTION, SELECT ON mydb.* TO X;
 EOF""",
         ]
     )
@@ -76,7 +76,4 @@ EOF""",
     )
     instance.start_clickhouse()
 
-    assert (
-        instance.query(f"SHOW GRANTS FOR `{user_id}`")
-        == f"GRANT SELECT ON mydb.* TO `{user_id}`\n"
-    )
+    assert instance.query("SHOW GRANTS FOR X") == "GRANT SELECT ON mydb.* TO X\n"
diff --git a/tests/integration/test_aliases_in_default_expr_not_break_table_structure/config/enable_keeper.xml b/tests/integration/test_aliases_in_default_expr_not_break_table_structure/config/enable_keeper.xml
deleted file mode 100644
index 4ca4f604ec3..00000000000
--- a/tests/integration/test_aliases_in_default_expr_not_break_table_structure/config/enable_keeper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<clickhouse>
-    <keeper_server>
-        <tcp_port>2181</tcp_port>
-        <server_id>1</server_id>
-        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
-        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
-        <coordination_settings>
-            <session_timeout_ms>20000</session_timeout_ms>
-        </coordination_settings>
-        <raft_configuration>
-            <server>
-                <id>1</id>
-                <hostname>localhost</hostname>
-                <port>9444</port>
-            </server>
-        </raft_configuration>
-    </keeper_server>
-
-    <zookeeper>
-        <node index="1">
-            <host>localhost</host>
-            <port>2181</port>
-        </node>
-        <session_timeout_ms>20000</session_timeout_ms>
-    </zookeeper>
-</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_aliases_in_default_expr_not_break_table_structure/config/users.xml b/tests/integration/test_aliases_in_default_expr_not_break_table_structure/config/users.xml
deleted file mode 100644
index c5de0b6819c..00000000000
--- a/tests/integration/test_aliases_in_default_expr_not_break_table_structure/config/users.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<clickhouse>
-    <users>
-        <default>
-            <profile>default</profile>
-            <no_password></no_password>
-        </default>
-    </users>
-</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_aliases_in_default_expr_not_break_table_structure/test.py b/tests/integration/test_aliases_in_default_expr_not_break_table_structure/test.py
deleted file mode 100644
index e0c15e18c23..00000000000
--- a/tests/integration/test_aliases_in_default_expr_not_break_table_structure/test.py
+++ /dev/null
@@ -1,71 +0,0 @@
-import pytest
-import random
-import string
-
-from helpers.cluster import ClickHouseCluster
-
-
-cluster = ClickHouseCluster(__file__)
-node = cluster.add_instance(
-    "node",
-    main_configs=[
-        "config/enable_keeper.xml",
-        "config/users.xml",
-    ],
-    stay_alive=True,
-    with_minio=True,
-    macros={"shard": 1, "replica": 1},
-)
-
-
-@pytest.fixture(scope="module")
-def start_cluster():
-    try:
-        cluster.start()
-        yield cluster
-    finally:
-        cluster.shutdown()
-
-
-def randomize_table_name(table_name, random_suffix_length=10):
-    letters = string.ascii_letters + string.digits
-    return f"{table_name}_{''.join(random.choice(letters) for _ in range(random_suffix_length))}"
-
-
-@pytest.mark.parametrize("engine", ["ReplicatedMergeTree"])
-def test_aliases_in_default_expr_not_break_table_structure(start_cluster, engine):
-    """
-    Making sure that using aliases in columns' default expressions does not lead to having different columns metadata in ZooKeeper and on disk.
-    Issue: https://github.com/ClickHouse/clickhouse-private/issues/5150
-    """
-
-    data = '{"event": {"col1-key": "col1-val", "col2-key": "col2-val"}}'
-
-    table_name = randomize_table_name("t")
-
-    node.query(
-        f"""
-        DROP TABLE IF EXISTS {table_name};
-        CREATE TABLE {table_name}
-        (
-            `data` String,
-            `col1` String DEFAULT JSONExtractString(JSONExtractString(data, 'event') AS event, 'col1-key'),
-            `col2` String MATERIALIZED JSONExtractString(JSONExtractString(data, 'event') AS event, 'col2-key')
-        )
-        ENGINE = {engine}('/test/{table_name}', '{{replica}}')
-        ORDER BY col1
-        """
-    )
-
-    node.restart_clickhouse()
-
-    node.query(
-        f"""
-        INSERT INTO {table_name} (data) VALUES ('{data}');
-        """
-    )
-    assert node.query(f"SELECT data FROM {table_name}").strip() == data
-    assert node.query(f"SELECT col1 FROM {table_name}").strip() == "col1-val"
-    assert node.query(f"SELECT col2 FROM {table_name}").strip() == "col2-val"
-
-    node.query(f"DROP TABLE {table_name}")
diff --git a/tests/integration/test_alter_comment_on_cluster/test.py b/tests/integration/test_alter_comment_on_cluster/test.py
index 4cb10bbc751..e6767e35c1b 100644
--- a/tests/integration/test_alter_comment_on_cluster/test.py
+++ b/tests/integration/test_alter_comment_on_cluster/test.py
@@ -59,4 +59,3 @@ def test_comment(started_cluster):
 
     expected = "CREATE TABLE default.test_table (`id` Int64 COMMENT \\'column_comment_2\\') ENGINE = ReplicatedMergeTree(\\'/clickhouse/tables/{uuid}/{shard}\\', \\'{replica}\\') ORDER BY id SETTINGS index_granularity = 8192 COMMENT \\'table_comment_2\\'"
     assert_create_query([node_1, node_2], "default", "test_table", expected)
-    node_1.query("DROP TABLE test_table ON CLUSTER 'cluster'")
diff --git a/tests/integration/test_alter_moving_garbage/test.py b/tests/integration/test_alter_moving_garbage/test.py
index 76b40b0df8d..21be46a7e1b 100644
--- a/tests/integration/test_alter_moving_garbage/test.py
+++ b/tests/integration/test_alter_moving_garbage/test.py
@@ -36,16 +36,6 @@ def cluster():
         cluster.shutdown()
 
 
-def drop_table(node, table_name, replicated):
-
-    create_table_statement = f"DROP TABLE {table_name} SYNC"
-
-    if replicated:
-        node.query_with_retry(create_table_statement)
-    else:
-        node.query(create_table_statement)
-
-
 def create_table(node, table_name, replicated, additional_settings):
     settings = {
         "storage_policy": "two_disks",
@@ -168,9 +158,6 @@ def test_alter_moving(
 
     assert data_digest == "1000\n"
 
-    for node in nodes:
-        drop_table(node, table_name, replicated_engine)
-
 
 def test_delete_race_leftovers(cluster):
     """
@@ -261,4 +248,3 @@ def test_delete_race_leftovers(cluster):
 
     # Check that we have all data
     assert table_digest == node.query(table_digest_query)
-    drop_table(node, table_name, replicated=True)
diff --git a/tests/integration/test_alter_on_mixed_type_cluster/test.py b/tests/integration/test_alter_on_mixed_type_cluster/test.py
index da126e307a0..f21a97d40e1 100644
--- a/tests/integration/test_alter_on_mixed_type_cluster/test.py
+++ b/tests/integration/test_alter_on_mixed_type_cluster/test.py
@@ -88,9 +88,6 @@ def test_alter_on_cluter_non_replicated(started_cluster):
     assert node3.query("SELECT COUNT() FROM test_table") == "2\n"
     assert node4.query("SELECT COUNT() FROM test_table") == "2\n"
 
-    for node in [node1, node2, node3, node4]:
-        node.query("TRUNCATE TABLE test_table")
-
 
 def test_alter_replicated_on_cluster(started_cluster):
     for node in [node1, node3]:
@@ -136,6 +133,3 @@ def test_alter_replicated_on_cluster(started_cluster):
     assert node2.query("SELECT COUNT() FROM test_table_replicated") == "2\n"
     assert node3.query("SELECT COUNT() FROM test_table_replicated") == "2\n"
     assert node4.query("SELECT COUNT() FROM test_table_replicated") == "2\n"
-
-    for node in [node1, node2, node3, node4]:
-        node.query("TRUNCATE TABLE test_table_replicated")
diff --git a/tests/integration/test_alter_settings_on_cluster/test.py b/tests/integration/test_alter_settings_on_cluster/test.py
index 7a552c383c9..32f7f2efa30 100644
--- a/tests/integration/test_alter_settings_on_cluster/test.py
+++ b/tests/integration/test_alter_settings_on_cluster/test.py
@@ -73,8 +73,3 @@ def test_default_database_on_cluster(started_cluster):
             database="test_default_database",
             sql="SHOW CREATE test_local_table FORMAT TSV",
         ).endswith("old_parts_lifetime = 100\n")
-
-    ch1.query(
-        database="test_default_database",
-        sql="DROP TABLE test_local_table ON CLUSTER 'cluster' SYNC",
-    )
diff --git a/tests/integration/test_always_fetch_merged/test.py b/tests/integration/test_always_fetch_merged/test.py
index 3bbfc8867f8..ca8e775fb97 100644
--- a/tests/integration/test_always_fetch_merged/test.py
+++ b/tests/integration/test_always_fetch_merged/test.py
@@ -80,6 +80,3 @@ def test_replica_always_download(started_cluster):
 
     assert int(node1_parts) < 10
     assert int(node2_parts) < 10
-
-    node1.query_with_retry("DROP TABLE test_table SYNC")
-    node2.query_with_retry("DROP TABLE test_table SYNC")
diff --git a/tests/integration/test_analyzer_compatibility/test.py b/tests/integration/test_analyzer_compatibility/test.py
index 505d1629cd2..d4ded420c61 100644
--- a/tests/integration/test_analyzer_compatibility/test.py
+++ b/tests/integration/test_analyzer_compatibility/test.py
@@ -1,5 +1,4 @@
 import uuid
-import time
 
 import pytest
 from helpers.cluster import ClickHouseCluster
@@ -59,12 +58,12 @@ ORDER BY h;"""
         == TSV([["backward", "true"], ["current", "true"]])
     )
 
-    # Should be enabled explicitly on the old instance.
-    analyzer_enabled = backward.query(
+    # Should be enabled everywhere
+    analyzer_enabled = current.query(
         f"""
 SELECT
 DISTINCT Settings['allow_experimental_analyzer']
-FROM system.query_log
+FROM clusterAllReplicas('test_cluster_mixed', system.query_log)
 WHERE initial_query_id = '{query_id}';"""
     )
 
@@ -79,8 +78,6 @@ WHERE initial_query_id = '{query_id}';"""
     current.query("SYSTEM FLUSH LOGS")
     backward.query("SYSTEM FLUSH LOGS")
 
-    # The old version doesn't know about the alias.
-    # For this we will ask about the old experimental name.
     assert (
         backward.query(
             """
@@ -101,26 +98,3 @@ WHERE initial_query_id = '{query_id}';"""
     )
 
     assert TSV(analyzer_enabled) == TSV("0")
-
-    # Only new version knows about the alias
-    # and it will send the old setting `allow_experimental_analyzer`
-    # to the remote server.
-    query_id = str(uuid.uuid4())
-    current.query(
-        "SELECT * FROM clusterAllReplicas('test_cluster_mixed', system.tables) SETTINGS enable_analyzer = 1;",
-        query_id=query_id,
-    )
-
-    current.query("SYSTEM FLUSH LOGS")
-    backward.query("SYSTEM FLUSH LOGS")
-
-    # Should be disabled explicitly everywhere.
-    analyzer_enabled = current.query(
-        f"""
-SELECT
-DISTINCT Settings['allow_experimental_analyzer']
-FROM system.query_log
-WHERE initial_query_id = '{query_id}';"""
-    )
-
-    assert TSV(analyzer_enabled) == TSV("1")
diff --git a/tests/integration/test_async_insert_adaptive_busy_timeout/test.py b/tests/integration/test_async_insert_adaptive_busy_timeout/test.py
index 280985b55b3..93319a56d0f 100644
--- a/tests/integration/test_async_insert_adaptive_busy_timeout/test.py
+++ b/tests/integration/test_async_insert_adaptive_busy_timeout/test.py
@@ -104,7 +104,7 @@ def test_with_merge_tree():
     _insert_queries_sequentially(
         table_name,
         _query_settings,
-        iterations=10,
+        iterations=100,
         max_values_size=1000,
         array_size_range=[10, 50],
     )
@@ -125,7 +125,7 @@ def test_with_merge_tree_multithread():
         table_name,
         _query_settings,
         thread_num=15,
-        tasks=100,
+        tasks=1000,
         max_values_size=1000,
         array_size_range=[10, 15],
     )
@@ -152,12 +152,12 @@ def test_with_replicated_merge_tree():
     _insert_queries_sequentially(
         table_name,
         settings,
-        iterations=10,
+        iterations=100,
         max_values_size=1000,
         array_size_range=[10, 50],
     )
 
-    node.query("DROP TABLE {} SYNC".format(table_name))
+    node.query("DROP TABLE IF EXISTS {}".format(table_name))
 
 
 def test_with_replicated_merge_tree_multithread():
@@ -180,12 +180,12 @@ def test_with_replicated_merge_tree_multithread():
         table_name,
         _query_settings,
         thread_num=15,
-        tasks=100,
+        tasks=1000,
         max_values_size=1000,
         array_size_range=[10, 15],
     )
 
-    node.query("DROP TABLE {} SYNC".format(table_name))
+    node.query("DROP TABLE IF EXISTS {}".format(table_name))
 
 
 # Ensure that the combined duration of inserts with adaptive timeouts is less than
@@ -200,13 +200,13 @@ def test_compare_sequential_inserts_durations_for_adaptive_and_fixed_async_timeo
 
     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"] = 100
+    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=50,
+            iterations=100,
             max_values_size=1000,
             array_size_range=[10, 50],
         ),
@@ -231,13 +231,13 @@ def test_compare_sequential_inserts_durations_for_adaptive_and_fixed_async_timeo
 
     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"] = 500
+    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=50,
+            iterations=100,
             max_values_size=1000,
             array_size_range=[10, 50],
         ),
@@ -268,14 +268,14 @@ def test_compare_parallel_inserts_durations_for_adaptive_and_fixed_async_timeout
 
     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"] = 500
+    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=150,
+            tasks=1000,
             max_values_size=1000,
             array_size_range=[10, 50],
         ),
@@ -300,14 +300,14 @@ def test_compare_parallel_inserts_durations_for_adaptive_and_fixed_async_timeout
 
     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"] = 500
+    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=150,
+            tasks=100,
             max_values_size=1000,
             array_size_range=[10, 50],
         ),
@@ -344,34 +344,29 @@ def test_change_queries_frequency():
 
     settings = copy.copy(_query_settings)
     min_ms = 50
-    max_ms = 200
-
     settings["async_insert_busy_timeout_min_ms"] = min_ms
-    settings["async_insert_busy_timeout_max_ms"] = max_ms
-
-    _insert_queries_sequentially(
-        table_name,
-        settings,
-        iterations=50,
-        max_values_size=1000,
-        array_size_range=[10, 50],
-    )
-    node.query("SYSTEM FLUSH LOGS")
-    select_log_query = f"SELECT countIf(timeout_milliseconds - {min_ms} < 25) FROM (SELECT timeout_milliseconds FROM system.asynchronous_insert_log ORDER BY event_time DESC LIMIT 10)"
-    res = node.query(select_log_query)
-    assert int(res) >= 5
+    settings["async_insert_busy_timeout_max_ms"] = 2000
 
     _insert_queries_in_parallel(
         table_name,
         settings,
-        thread_num=10,
-        tasks=1000,
+        thread_num=15,
+        tasks=2000,
         max_values_size=1000,
         array_size_range=[10, 15],
     )
-    node.query("SYSTEM FLUSH LOGS")
-    select_log_query = f"SELECT countIf({max_ms} - timeout_milliseconds < 100) FROM (SELECT timeout_milliseconds FROM system.asynchronous_insert_log ORDER BY event_time DESC LIMIT 10)"
-    res = node.query(select_log_query)
-    assert int(res) >= 5
 
-    node.query("DROP TABLE IF EXISTS {} SYNC".format(table_name))
+    _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 94aba46c713..d06897b1045 100644
--- a/tests/integration/test_async_load_databases/test.py
+++ b/tests/integration/test_async_load_databases/test.py
@@ -28,6 +28,9 @@ def started_cluster():
             """
             CREATE DATABASE IF NOT EXISTS dict ENGINE=Dictionary;
             CREATE DATABASE IF NOT EXISTS test;
+            DROP TABLE IF EXISTS test.elements;
+            CREATE TABLE test.elements (id UInt64, a String, b Int32, c Float64) ENGINE=Log;
+            INSERT INTO test.elements VALUES (0, 'water', 10, 1), (1, 'air', 40, 0.01), (2, 'earth', 100, 1.7);
             """
         )
 
@@ -46,13 +49,6 @@ def get_status(dictionary_name):
 def test_dict_get_data(started_cluster):
     query = instance.query
 
-    query(
-        "CREATE TABLE test.elements (id UInt64, a String, b Int32, c Float64) ENGINE=Log;"
-    )
-    query(
-        "INSERT INTO test.elements VALUES (0, 'water', 10, 1), (1, 'air', 40, 0.01), (2, 'earth', 100, 1.7);"
-    )
-
     # dictionaries_lazy_load == false, so these dictionary are not loaded.
     assert get_status("dep_x") == "NOT_LOADED"
     assert get_status("dep_y") == "NOT_LOADED"
@@ -101,8 +97,6 @@ def test_dict_get_data(started_cluster):
     assert query("SELECT dictGetString('dep_x', 'a', toUInt64(4))") == "XX\n"
     assert query("SELECT dictGetString('dep_y', 'a', toUInt64(4))") == "ether\n"
     assert query("SELECT dictGetString('dep_z', 'a', toUInt64(4))") == "ZZ\n"
-    query("DROP TABLE IF EXISTS test.elements;")
-    instance.restart_clickhouse()
 
 
 def dependent_tables_assert():
@@ -181,5 +175,3 @@ def test_multiple_tables(started_cluster):
     random.shuffle(order)
     for i in order:
         assert query(f"select count() from test.table_{i}") == "100\n"
-    for i in range(tables_count):
-        query(f"drop table test.table_{i} sync")
diff --git a/tests/integration/test_async_metrics_in_cgroup/test.py b/tests/integration/test_async_metrics_in_cgroup/test.py
deleted file mode 100644
index d9f2e3aaaed..00000000000
--- a/tests/integration/test_async_metrics_in_cgroup/test.py
+++ /dev/null
@@ -1,69 +0,0 @@
-import pytest
-
-from helpers.cluster import ClickHouseCluster
-
-cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance("node1", stay_alive=True)
-node2 = cluster.add_instance("node2", stay_alive=True)
-
-
-@pytest.fixture(scope="module")
-def start_cluster():
-    try:
-        cluster.start()
-        yield cluster
-    finally:
-        cluster.shutdown()
-
-
-def run_cpu_intensive_task(node):
-    node.query(
-        "SELECT sum(*) FROM system.numbers_mt FORMAT Null SETTINGS max_execution_time=10",
-        ignore_error=True,
-    )
-
-
-def get_async_metric(node, metric):
-    node.query("SYSTEM FLUSH LOGS")
-    return node.query(
-        f"""
-        SELECT max(value)
-            FROM (
-            SELECT toStartOfInterval(event_time, toIntervalSecond(1)) AS t, avg(value) AS value
-                FROM system.asynchronous_metric_log
-            WHERE event_time >= now() - 60 AND metric = '{metric}'
-            GROUP BY t
-            )
-        SETTINGS max_threads = 1
-        """
-    ).strip("\n")
-
-
-def test_user_cpu_accounting(start_cluster):
-    if node1.is_built_with_sanitizer():
-        pytest.skip("Disabled for sanitizers")
-
-    # run query on the other node, its usage shouldn't be accounted by node1
-    run_cpu_intensive_task(node2)
-
-    node1_cpu_time = get_async_metric(node1, "OSUserTime")
-    assert float(node1_cpu_time) < 2
-
-    # then let's test that we will account cpu time spent by the server itself
-    node2_cpu_time = get_async_metric(node2, "OSUserTime")
-    # this check is really weak, but CI is tough place and we cannot guarantee that test process will get many cpu time
-    assert float(node2_cpu_time) > 2
-
-
-def test_normalized_user_cpu(start_cluster):
-    if node1.is_built_with_sanitizer():
-        pytest.skip("Disabled for sanitizers")
-
-    # run query on the other node, its usage shouldn't be accounted by node1
-    run_cpu_intensive_task(node2)
-
-    node1_cpu_time = get_async_metric(node1, "OSUserTimeNormalized")
-    assert float(node1_cpu_time) < 1.01
-
-    node2_cpu_time = get_async_metric(node2, "OSUserTimeNormalized")
-    assert float(node2_cpu_time) < 1.01
diff --git a/tests/integration/test_asynchronous_metric_log_table/test.py b/tests/integration/test_asynchronous_metric_log_table/test.py
index efdd96004d2..622620e232a 100644
--- a/tests/integration/test_asynchronous_metric_log_table/test.py
+++ b/tests/integration/test_asynchronous_metric_log_table/test.py
@@ -26,24 +26,26 @@ def started_cluster():
 # asynchronous_metric_update_period_s is being set to 2s so that the metrics are populated faster and
 # are available for querying during the test.
 def test_event_time_microseconds_field(started_cluster):
-    node1.query("SET log_queries = 1;")
-    node1.query("CREATE DATABASE replica;")
-    query_create = """CREATE TABLE replica.test
-    (
-        id Int64,
-        event_time DateTime
-    )
-    Engine=MergeTree()
-    PARTITION BY toYYYYMMDD(event_time)
-    ORDER BY id;"""
-    time.sleep(2)
-    node1.query(query_create)
-    node1.query("""INSERT INTO replica.test VALUES (1, now())""")
-    node1.query("SYSTEM FLUSH LOGS;")
+    try:
+        cluster.start()
+        node1.query("SET log_queries = 1;")
+        node1.query("CREATE DATABASE replica;")
+        query_create = """CREATE TABLE replica.test
+        (
+           id Int64,
+           event_time DateTime
+        )
+        Engine=MergeTree()
+        PARTITION BY toYYYYMMDD(event_time)
+        ORDER BY id;"""
+        time.sleep(2)
+        node1.query(query_create)
+        node1.query("""INSERT INTO replica.test VALUES (1, now())""")
+        node1.query("SYSTEM FLUSH LOGS;")
 
-    test_query = (
-        "SELECT count() > 0 ? 'ok' : 'fail' FROM system.asynchronous_metric_log"
-    )
-    assert "ok\n" in node1.query(test_query)
-    node1.query("DROP TABLE replica.test")
-    node1.query("DROP DATABASE replica")
+        test_query = (
+            "SELECT count() > 0 ? 'ok' : 'fail' FROM system.asynchronous_metric_log"
+        )
+        assert "ok\n" in node1.query(test_query)
+    finally:
+        cluster.shutdown()
diff --git a/tests/integration/test_backup_restore_new/test.py b/tests/integration/test_backup_restore_new/test.py
index 56e007dcf5d..d8662fad011 100644
--- a/tests/integration/test_backup_restore_new/test.py
+++ b/tests/integration/test_backup_restore_new/test.py
@@ -1,10 +1,9 @@
-import glob
-import os.path
 import pytest
-import random
+import glob
 import re
+import random
+import os.path
 import sys
-import uuid
 from collections import namedtuple
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import assert_eq_with_retry, TSV
@@ -343,13 +342,6 @@ def test_increment_backup_without_changes():
 
 
 def test_incremental_backup_overflow():
-    if (
-        instance.is_built_with_thread_sanitizer()
-        or instance.is_built_with_memory_sanitizer()
-        or instance.is_built_with_address_sanitizer()
-    ):
-        pytest.skip("The test is slow in builds with sanitizer")
-
     backup_name = new_backup_name()
     incremental_backup_name = new_backup_name()
 
@@ -546,8 +538,7 @@ def test_backup_not_found_or_already_exists():
 
 
 def test_file_engine():
-    id = uuid.uuid4()
-    backup_name = f"File('/backups/file/{id}/')"
+    backup_name = f"File('/backups/file/')"
     create_and_fill_table()
 
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
@@ -558,7 +549,6 @@ def test_file_engine():
 
     instance.query(f"RESTORE TABLE test.table FROM {backup_name}")
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
-    instance.query("DROP TABLE test.table")
 
 
 def test_database():
@@ -575,8 +565,7 @@ def test_database():
 
 
 def test_zip_archive():
-    id = uuid.uuid4()
-    backup_name = f"Disk('backups', 'archive_{id}.zip')"
+    backup_name = f"Disk('backups', 'archive.zip')"
     create_and_fill_table()
 
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
@@ -589,12 +578,10 @@ def test_zip_archive():
 
     instance.query(f"RESTORE TABLE test.table FROM {backup_name}")
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
-    instance.query("DROP TABLE test.table")
 
 
 def test_zip_archive_with_settings():
-    id = uuid.uuid4()
-    backup_name = f"Disk('backups', 'archive_with_settings_{id}.zip')"
+    backup_name = f"Disk('backups', 'archive_with_settings.zip')"
     create_and_fill_table()
 
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
@@ -609,12 +596,10 @@ def test_zip_archive_with_settings():
         f"RESTORE TABLE test.table FROM {backup_name} SETTINGS password='qwerty'"
     )
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
-    instance.query("DROP TABLE test.table")
 
 
 def test_zip_archive_with_bad_compression_method():
-    id = uuid.uuid4()
-    backup_name = f"Disk('backups', 'archive_with_bad_compression_method_{id}.zip')"
+    backup_name = f"Disk('backups', 'archive_with_bad_compression_method.zip')"
     create_and_fill_table()
 
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
@@ -632,8 +617,7 @@ def test_zip_archive_with_bad_compression_method():
 
 
 def test_tar_archive():
-    id = uuid.uuid4()
-    backup_name = f"Disk('backups', 'archive_{id}.tar')"
+    backup_name = f"Disk('backups', 'archive.tar')"
     create_and_fill_table()
 
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
@@ -646,12 +630,10 @@ def test_tar_archive():
 
     instance.query(f"RESTORE TABLE test.table FROM {backup_name}")
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
-    instance.query("DROP TABLE test.table")
 
 
 def test_tar_bz2_archive():
-    id = uuid.uuid4()
-    backup_name = f"Disk('backups', 'archive_{id}.tar.bz2')"
+    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"
@@ -667,8 +649,7 @@ def test_tar_bz2_archive():
 
 
 def test_tar_gz_archive():
-    id = uuid.uuid4()
-    backup_name = f"Disk('backups', 'archive_{id}.tar.gz')"
+    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"
@@ -684,8 +665,7 @@ def test_tar_gz_archive():
 
 
 def test_tar_lzma_archive():
-    id = uuid.uuid4()
-    backup_name = f"Disk('backups', 'archive_{id}.tar.lzma')"
+    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"
@@ -701,8 +681,7 @@ def test_tar_lzma_archive():
 
 
 def test_tar_zst_archive():
-    id = uuid.uuid4()
-    backup_name = f"Disk('backups', 'archive_{id}.tar.zst')"
+    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"
@@ -718,8 +697,7 @@ def test_tar_zst_archive():
 
 
 def test_tar_xz_archive():
-    id = uuid.uuid4()
-    backup_name = f"Disk('backups', 'archive_{id}.tar.xz')"
+    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"
@@ -735,8 +713,7 @@ def test_tar_xz_archive():
 
 
 def test_tar_archive_with_password():
-    id = uuid.uuid4()
-    backup_name = f"Disk('backups', 'archive_with_password_{id}.tar')"
+    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"
@@ -754,8 +731,7 @@ def test_tar_archive_with_password():
 
 
 def test_tar_archive_with_bad_compression_method():
-    id = uuid.uuid4()
-    backup_name = f"Disk('backups', 'archive_with_bad_compression_method_{id}.tar')"
+    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"
@@ -1244,10 +1220,6 @@ def test_system_users_required_privileges():
     assert instance.query("SHOW CREATE ROLE r1") == "CREATE ROLE r1\n"
     assert instance.query("SHOW GRANTS FOR r1") == ""
 
-    instance.query("DROP USER u1")
-    instance.query("DROP ROLE r1")
-    instance.query("DROP USER u2")
-
 
 def test_system_users_async():
     instance.query("CREATE USER u1 IDENTIFIED BY 'qwe123' SETTINGS custom_c = 3")
@@ -1440,8 +1412,6 @@ def test_system_functions():
     assert instance.query("SELECT number, parity_str(number) FROM numbers(3)") == TSV(
         [[0, "even"], [1, "odd"], [2, "even"]]
     )
-    instance.query("DROP FUNCTION linear_equation")
-    instance.query("DROP FUNCTION parity_str")
 
 
 def test_backup_partition():
diff --git a/tests/integration/test_backup_restore_on_cluster/test.py b/tests/integration/test_backup_restore_on_cluster/test.py
index d20e10e8a04..700ed6f15f5 100644
--- a/tests/integration/test_backup_restore_on_cluster/test.py
+++ b/tests/integration/test_backup_restore_on_cluster/test.py
@@ -776,6 +776,7 @@ def test_system_users():
 
 def test_system_functions():
     node1.query("CREATE FUNCTION linear_equation AS (x, k, b) -> k*x + b;")
+
     node1.query("CREATE FUNCTION parity_str AS (n) -> if(n % 2, 'odd', 'even');")
 
     backup_name = new_backup_name()
@@ -816,9 +817,6 @@ def test_system_functions():
         [[0, "even"], [1, "odd"], [2, "even"]]
     )
 
-    node1.query("DROP FUNCTION linear_equation")
-    node1.query("DROP FUNCTION parity_str")
-
 
 def test_projection():
     node1.query(
@@ -1054,12 +1052,9 @@ def test_mutation():
     backup_name = new_backup_name()
     node1.query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}")
 
-    # mutation #0000000000: "UPDATE x=x+1 WHERE 1" could already finish before starting the backup
-    # mutation #0000000001: "UPDATE x=x+1+sleep(3) WHERE 1"
+    assert not has_mutation_in_backup("0000000000", backup_name, "default", "tbl")
     assert has_mutation_in_backup("0000000001", backup_name, "default", "tbl")
-    # mutation #0000000002: "UPDATE x=x+1+sleep(3) WHERE 1"
     assert has_mutation_in_backup("0000000002", backup_name, "default", "tbl")
-    # mutation #0000000003: not expected
     assert not has_mutation_in_backup("0000000003", backup_name, "default", "tbl")
 
     node1.query("DROP TABLE tbl ON CLUSTER 'cluster' SYNC")
diff --git a/tests/integration/test_backup_restore_on_cluster/test_concurrency.py b/tests/integration/test_backup_restore_on_cluster/test_concurrency.py
index 0e381d48fb1..c08f3c9c242 100644
--- a/tests/integration/test_backup_restore_on_cluster/test_concurrency.py
+++ b/tests/integration/test_backup_restore_on_cluster/test_concurrency.py
@@ -276,10 +276,15 @@ def test_create_or_drop_tables_during_backup(db_engine, table_engine):
     for node in nodes:
         assert_eq_with_retry(
             node,
-            f"SELECT status, error from system.backups "
-            f"WHERE id IN {ids_list} AND ((status == 'CREATING_BACKUP') OR (status == 'BACKUP_FAILED'))",
+            f"SELECT status from system.backups WHERE id IN {ids_list} AND (status == 'CREATING_BACKUP')",
+            "",
+        )
+
+    for node in nodes:
+        assert_eq_with_retry(
+            node,
+            f"SELECT status, error from system.backups WHERE id IN {ids_list} AND (status == 'BACKUP_FAILED')",
             "",
-            retry_count=100,
         )
 
     backup_names = {}
diff --git a/tests/integration/test_backup_restore_on_cluster/test_disallow_concurrency.py b/tests/integration/test_backup_restore_on_cluster/test_disallow_concurrency.py
index f3b6993c4fd..cd0f2032559 100644
--- a/tests/integration/test_backup_restore_on_cluster/test_disallow_concurrency.py
+++ b/tests/integration/test_backup_restore_on_cluster/test_disallow_concurrency.py
@@ -9,13 +9,13 @@ import re
 
 cluster = ClickHouseCluster(__file__)
 
-num_nodes = 2
+num_nodes = 10
 
 
 def generate_cluster_def():
     path = os.path.join(
         os.path.dirname(os.path.realpath(__file__)),
-        "./_gen/cluster_for_test_disallow_concurrency.xml",
+        "./_gen/cluster_for_concurrency_test.xml",
     )
     os.makedirs(os.path.dirname(path), exist_ok=True)
     with open(path, "w") as f:
@@ -111,56 +111,22 @@ def create_and_fill_table():
         nodes[i].query(f"INSERT INTO tbl SELECT number FROM numbers(40000000)")
 
 
-def get_status_and_error(node, backup_or_restore_id):
-    return (
-        node.query(
-            f"SELECT status, error FROM system.backups WHERE id == '{backup_or_restore_id}'"
-        )
-        .rstrip("\n")
-        .split("\t")
-    )
-
-
-def wait_for_backup(node, backup_id):
-    assert_eq_with_retry(
-        node,
-        f"SELECT status FROM system.backups WHERE id = '{backup_id}'",
-        "BACKUP_CREATED",
-        sleep_time=2,
-        retry_count=50,
-    )
-
-
-def wait_for_restore(node, restore_id):
-    assert_eq_with_retry(
-        node,
-        f"SELECT status FROM system.backups WHERE id == '{restore_id}'",
-        "RESTORED",
-        sleep_time=2,
-        retry_count=50,
-    )
-
-
-def check_backup_error(error):
+def wait_for_fail_backup(node, backup_id, backup_name):
     expected_errors = [
         "Concurrent backups not supported",
-        "BACKUP_ALREADY_EXISTS",
+        f"Backup {backup_name} already exists",
     ]
-    assert any([expected_error in error for expected_error in expected_errors])
-
-
-def check_restore_error(error):
-    expected_errors = [
-        "Concurrent restores not supported",
-        "Cannot restore the table default.tbl because it already contains some data",
-    ]
-    assert any([expected_error in error for expected_error in expected_errors])
-
-
-def wait_for_backup_failure(node, backup_id):
-    status, error = get_status_and_error(node, backup_id)
+    status = node.query(
+        f"SELECT status FROM system.backups WHERE id == '{backup_id}'"
+    ).rstrip("\n")
     # It is possible that the second backup was picked up first, and then the async backup
-    if status == "CREATING_BACKUP":
+    if status == "BACKUP_FAILED":
+        error = node.query(
+            f"SELECT error FROM system.backups WHERE id == '{backup_id}'"
+        ).rstrip("\n")
+        assert any([expected_error in error for expected_error in expected_errors])
+        return
+    elif status == "CREATING_BACKUP":
         assert_eq_with_retry(
             node,
             f"SELECT status FROM system.backups WHERE id = '{backup_id}'",
@@ -168,17 +134,31 @@ def wait_for_backup_failure(node, backup_id):
             sleep_time=2,
             retry_count=50,
         )
-        status, error = get_status_and_error(node, backup_id)
-    if status == "BACKUP_FAILED":
-        check_backup_error(error)
+        error = node.query(
+            f"SELECT error FROM system.backups WHERE id == '{backup_id}'"
+        ).rstrip("\n")
+        assert re.search(f"Backup {backup_name} already exists", error)
+        return
     else:
         assert False, "Concurrent backups both passed, when one is expected to fail"
 
 
-def wait_for_restore_failure(node, restore_id):
-    status, error = get_status_and_error(node, restore_id)
+def wait_for_fail_restore(node, restore_id):
+    expected_errors = [
+        "Concurrent restores not supported",
+        "Cannot restore the table default.tbl because it already contains some data",
+    ]
+    status = node.query(
+        f"SELECT status FROM system.backups WHERE id == '{restore_id}'"
+    ).rstrip("\n")
     # It is possible that the second backup was picked up first, and then the async backup
-    if status == "RESTORING":
+    if status == "RESTORE_FAILED":
+        error = node.query(
+            f"SELECT error FROM system.backups WHERE id == '{restore_id}'"
+        ).rstrip("\n")
+        assert any([expected_error in error for expected_error in expected_errors])
+        return
+    elif status == "RESTORING":
         assert_eq_with_retry(
             node,
             f"SELECT status FROM system.backups WHERE id = '{restore_id}'",
@@ -186,9 +166,14 @@ def wait_for_restore_failure(node, restore_id):
             sleep_time=2,
             retry_count=50,
         )
-        status, error = get_status_and_error(node, restore_id)
-    if status == "RESTORE_FAILED":
-        check_restore_error(error)
+        error = node.query(
+            f"SELECT error FROM system.backups WHERE id == '{restore_id}'"
+        ).rstrip("\n")
+        assert re.search(
+            "Cannot restore the table default.tbl because it already contains some data",
+            error,
+        )
+        return
     else:
         assert False, "Concurrent restores both passed, when one is expected to fail"
 
@@ -203,28 +188,39 @@ def test_concurrent_backups_on_same_node():
 
     backup_name = new_backup_name()
 
-    # Backup #1.
-    id, status = (
+    id = (
         nodes[0]
         .query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name} ASYNC")
-        .rstrip("\n")
-        .split("\t")
+        .split("\t")[0]
     )
 
+    status = (
+        nodes[0]
+        .query(f"SELECT status FROM system.backups WHERE id == '{id}'")
+        .rstrip("\n")
+    )
     assert status in ["CREATING_BACKUP", "BACKUP_CREATED"]
 
-    # Backup #2.
-    _, error = nodes[0].query_and_get_answer_with_error(
+    result, error = nodes[0].query_and_get_answer_with_error(
         f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}"
     )
 
-    if error:
-        # Backup #2 failed, backup #1 should be successful.
-        check_backup_error(error)
-        wait_for_backup(nodes[0], id)
-    else:
-        # Backup #2 was successful, backup #1 should fail.
-        wait_for_backup_failure(nodes[0], id)
+    expected_errors = [
+        "Concurrent backups not supported",
+        f"Backup {backup_name} already exists",
+    ]
+    if not error:
+        wait_for_fail_backup(nodes[0], id, backup_name)
+
+    assert any([expected_error in error for expected_error in expected_errors])
+
+    assert_eq_with_retry(
+        nodes[0],
+        f"SELECT status FROM system.backups WHERE id = '{id}'",
+        "BACKUP_CREATED",
+        sleep_time=2,
+        retry_count=50,
+    )
 
     # This restore part is added to confirm creating an internal backup & restore work
     # even when a concurrent backup is stopped
@@ -242,38 +238,40 @@ def test_concurrent_backups_on_different_nodes():
 
     backup_name = new_backup_name()
 
-    # Backup #1.
-    id, status = (
-        nodes[0]
+    id = (
+        nodes[1]
         .query(f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name} ASYNC")
-        .rstrip("\n")
-        .split("\t")
+        .split("\t")[0]
     )
 
+    status = (
+        nodes[1]
+        .query(f"SELECT status FROM system.backups WHERE id == '{id}'")
+        .rstrip("\n")
+    )
     assert status in ["CREATING_BACKUP", "BACKUP_CREATED"]
 
-    # Backup #2.
-    _, error = nodes[1].query_and_get_answer_with_error(
+    result, error = nodes[0].query_and_get_answer_with_error(
         f"BACKUP TABLE tbl ON CLUSTER 'cluster' TO {backup_name}"
     )
 
-    if error:
-        # Backup #2 failed, backup #1 should be successful.
-        check_backup_error(error)
-        wait_for_backup(nodes[0], id)
-    else:
-        # Backup #2 was successful, backup #1 should fail.
-        wait_for_backup_failure(nodes[0], id)
+    expected_errors = [
+        "Concurrent backups not supported",
+        f"Backup {backup_name} already exists",
+    ]
 
-    # This restore part is added to confirm creating an internal backup & restore work
-    # even when a concurrent backup is stopped
-    nodes[0].query(
-        f"DROP TABLE tbl ON CLUSTER 'cluster' SYNC",
-        settings={
-            "distributed_ddl_task_timeout": 360,
-        },
+    if not error:
+        wait_for_fail_backup(nodes[1], id, backup_name)
+
+    assert any([expected_error in error for expected_error in expected_errors])
+
+    assert_eq_with_retry(
+        nodes[1],
+        f"SELECT status FROM system.backups WHERE id = '{id}'",
+        "BACKUP_CREATED",
+        sleep_time=2,
+        retry_count=50,
     )
-    nodes[0].query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}")
 
 
 def test_concurrent_restores_on_same_node():
@@ -290,28 +288,40 @@ def test_concurrent_restores_on_same_node():
         },
     )
 
-    # Restore #1.
-    restore_id, status = (
+    restore_id = (
         nodes[0]
         .query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name} ASYNC")
-        .rstrip("\n")
-        .split("\t")
+        .split("\t")[0]
     )
 
+    status = (
+        nodes[0]
+        .query(f"SELECT status FROM system.backups WHERE id == '{restore_id}'")
+        .rstrip("\n")
+    )
     assert status in ["RESTORING", "RESTORED"]
 
-    # Restore #2.
-    _, error = nodes[0].query_and_get_answer_with_error(
+    result, error = nodes[0].query_and_get_answer_with_error(
         f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}"
     )
 
-    if error:
-        # Restore #2 failed, restore #1 should be successful.
-        check_restore_error(error)
-        wait_for_restore(nodes[0], restore_id)
-    else:
-        # Restore #2 was successful, restore #1 should fail.
-        wait_for_restore_failure(nodes[0], restore_id)
+    expected_errors = [
+        "Concurrent restores not supported",
+        "Cannot restore the table default.tbl because it already contains some data",
+    ]
+
+    if not error:
+        wait_for_fail_restore(nodes[0], restore_id)
+
+    assert any([expected_error in error for expected_error in expected_errors])
+
+    assert_eq_with_retry(
+        nodes[0],
+        f"SELECT status FROM system.backups WHERE id == '{restore_id}'",
+        "RESTORED",
+        sleep_time=2,
+        retry_count=50,
+    )
 
 
 def test_concurrent_restores_on_different_node():
@@ -328,25 +338,37 @@ def test_concurrent_restores_on_different_node():
         },
     )
 
-    # Restore #1.
-    restore_id, status = (
+    restore_id = (
         nodes[0]
         .query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name} ASYNC")
-        .rstrip("\n")
-        .split("\t")
+        .split("\t")[0]
     )
 
+    status = (
+        nodes[0]
+        .query(f"SELECT status FROM system.backups WHERE id == '{restore_id}'")
+        .rstrip("\n")
+    )
     assert status in ["RESTORING", "RESTORED"]
 
-    # Restore #2.
-    _, error = nodes[1].query_and_get_answer_with_error(
+    result, error = nodes[1].query_and_get_answer_with_error(
         f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}"
     )
 
-    if error:
-        # Restore #2 failed, restore #1 should be successful.
-        check_restore_error(error)
-        wait_for_restore(nodes[0], restore_id)
-    else:
-        # Restore #2 was successful, restore #1 should fail.
-        wait_for_restore_failure(nodes[0], restore_id)
+    expected_errors = [
+        "Concurrent restores not supported",
+        "Cannot restore the table default.tbl because it already contains some data",
+    ]
+
+    if not error:
+        wait_for_fail_restore(nodes[0], restore_id)
+
+    assert any([expected_error in error for expected_error in expected_errors])
+
+    assert_eq_with_retry(
+        nodes[0],
+        f"SELECT status FROM system.backups WHERE id == '{restore_id}'",
+        "RESTORED",
+        sleep_time=2,
+        retry_count=50,
+    )
diff --git a/tests/integration/test_backup_restore_s3/configs/disk_s3.xml b/tests/integration/test_backup_restore_s3/configs/disk_s3.xml
index 7ac1a052c30..45a1e17b039 100644
--- a/tests/integration/test_backup_restore_s3/configs/disk_s3.xml
+++ b/tests/integration/test_backup_restore_s3/configs/disk_s3.xml
@@ -21,13 +21,6 @@
                 <secret_access_key>minio123</secret_access_key>
                 <s3_max_single_part_upload_size>33554432</s3_max_single_part_upload_size>
             </disk_s3_plain>
-            <disk_s3_plain_rewritable>
-                <type>s3_plain_rewritable</type>
-                <endpoint>http://minio1:9001/root/data/disks/disk_s3_plain_rewritable/</endpoint>
-                <access_key_id>minio</access_key_id>
-                <secret_access_key>minio123</secret_access_key>
-                <s3_max_single_part_upload_size>33554432</s3_max_single_part_upload_size>
-            </disk_s3_plain_rewritable>
             <disk_s3_cache>
                 <type>cache</type>
                 <disk>disk_s3</disk>
@@ -44,20 +37,6 @@
                     </main>
                 </volumes>
             </policy_s3>
-            <policy_s3_plain>
-                <volumes>
-                    <main>
-                        <disk>disk_s3_plain</disk>
-                    </main>
-                </volumes>
-            </policy_s3_plain>
-            <policy_s3_plain_rewritable>
-                <volumes>
-                    <main>
-                        <disk>disk_s3_plain_rewritable</disk>
-                    </main>
-                </volumes>
-            </policy_s3_plain_rewritable>
             <policy_s3_other_bucket>
                 <volumes>
                     <main>
@@ -78,7 +57,6 @@
         <allowed_disk>default</allowed_disk>
         <allowed_disk>disk_s3</allowed_disk>
         <allowed_disk>disk_s3_plain</allowed_disk>
-        <allowed_disk>disk_s3_plain_rewritable</allowed_disk>
         <allowed_disk>disk_s3_cache</allowed_disk>
         <allowed_disk>disk_s3_other_bucket</allowed_disk>
     </backups>
diff --git a/tests/integration/test_backup_restore_s3/test.py b/tests/integration/test_backup_restore_s3/test.py
index 381268ce7fe..d53335000a6 100644
--- a/tests/integration/test_backup_restore_s3/test.py
+++ b/tests/integration/test_backup_restore_s3/test.py
@@ -254,7 +254,6 @@ def check_system_tables(backup_query_id=None):
         ("disk_s3_cache", "ObjectStorage", "S3", "Local"),
         ("disk_s3_other_bucket", "ObjectStorage", "S3", "Local"),
         ("disk_s3_plain", "ObjectStorage", "S3", "Plain"),
-        ("disk_s3_plain_rewritable", "ObjectStorage", "S3", "PlainRewritable"),
         ("disk_s3_restricted_user", "ObjectStorage", "S3", "Local"),
     )
     assert len(expected_disks) == len(disks)
@@ -420,15 +419,25 @@ def test_backup_to_s3_multipart():
     assert "ReadBufferFromS3RequestsErrors" not in restore_events
 
 
-@pytest.mark.parametrize(
-    "storage_policy",
-    [
-        "policy_s3",
-        "policy_s3_other_bucket",
-        "policy_s3_plain_rewritable",
-    ],
-)
-def test_backup_to_s3_native_copy(storage_policy):
+def test_backup_to_s3_native_copy():
+    storage_policy = "policy_s3"
+    backup_name = new_backup_name()
+    backup_destination = (
+        f"S3('http://minio1:9001/root/data/backups/{backup_name}', 'minio', 'minio123')"
+    )
+    (backup_events, restore_events) = check_backup_and_restore(
+        storage_policy, backup_destination
+    )
+    # single part upload
+    assert backup_events["S3CopyObject"] > 0
+    assert restore_events["S3CopyObject"] > 0
+    assert node.contains_in_log(
+        f"copyS3File: Single operation copy has completed. Bucket: root, Key: data/backups/{backup_name}"
+    )
+
+
+def test_backup_to_s3_native_copy_other_bucket():
+    storage_policy = "policy_s3_other_bucket"
     backup_name = new_backup_name()
     backup_destination = (
         f"S3('http://minio1:9001/root/data/backups/{backup_name}', 'minio', 'minio123')"
diff --git a/tests/integration/test_backward_compatibility/test_functions.py b/tests/integration/test_backward_compatibility/test_functions.py
index acf4bd28c9b..d41d6a46ec3 100644
--- a/tests/integration/test_backward_compatibility/test_functions.py
+++ b/tests/integration/test_backward_compatibility/test_functions.py
@@ -80,15 +80,11 @@ def test_aggregate_states(start_cluster):
         except QueryRuntimeException as e:
             error_message = str(e)
             allowed_errors = [
+                "NUMBER_OF_ARGUMENTS_DOESNT_MATCH",
                 "ILLEGAL_TYPE_OF_ARGUMENT",
                 # sequenceNextNode() and friends
                 "UNKNOWN_AGGREGATE_FUNCTION",
                 # Function X takes exactly one parameter:
-                "NUMBER_OF_ARGUMENTS_DOESNT_MATCH",
-                # Function X takes at least one argument
-                "TOO_FEW_ARGUMENTS_FOR_FUNCTION",
-                # Function X accepts at most 3 arguments, Y given
-                "TOO_MANY_ARGUMENTS_FOR_FUNCTION",
                 # The function 'X' can only be used as a window function
                 "BAD_ARGUMENTS",
                 # aggThrow
@@ -154,13 +150,6 @@ def test_aggregate_states(start_cluster):
 
 
 def test_string_functions(start_cluster):
-    if (
-        upstream.is_built_with_thread_sanitizer()
-        or upstream.is_built_with_memory_sanitizer()
-        or upstream.is_built_with_address_sanitizer()
-    ):
-        pytest.skip("The test is slow in builds with sanitizer")
-
     functions = backward.query(
         """
         SELECT if(NOT empty(alias_to), alias_to, name)
@@ -238,7 +227,9 @@ def test_string_functions(start_cluster):
                 "Should start with ",  # POINT/POLYGON/...
                 "Cannot read input: expected a digit but got something else:",
                 # ErrorCodes
+                "NUMBER_OF_ARGUMENTS_DOESNT_MATCH",
                 "ILLEGAL_TYPE_OF_ARGUMENT",
+                "TOO_FEW_ARGUMENTS_FOR_FUNCTION",
                 "DICTIONARIES_WAS_NOT_LOADED",
                 "CANNOT_PARSE_UUID",
                 "CANNOT_PARSE_DOMAIN_VALUE_FROM_STRING",
@@ -258,11 +249,6 @@ def test_string_functions(start_cluster):
                 "CANNOT_PARSE_TEXT",
                 "CANNOT_PARSE_DATETIME",
                 # Function X takes exactly one parameter:
-                "NUMBER_OF_ARGUMENTS_DOESNT_MATCH",
-                # Function X takes at least one argument
-                "TOO_FEW_ARGUMENTS_FOR_FUNCTION",
-                # Function X accepts at most 3 arguments, Y given
-                "TOO_MANY_ARGUMENTS_FOR_FUNCTION",
                 # The function 'X' can only be used as a window function
                 "BAD_ARGUMENTS",
                 # String foo is obviously not a valid IP address.
diff --git a/tests/integration/test_broken_projections/config.d/backups.xml b/tests/integration/test_broken_projections/config.d/backups.xml
index 76068cb01c2..4da8edffd67 100644
--- a/tests/integration/test_broken_projections/config.d/backups.xml
+++ b/tests/integration/test_broken_projections/config.d/backups.xml
@@ -9,6 +9,5 @@
     </storage_configuration>
     <backups>
         <allowed_disk>backups</allowed_disk>
-        <test_randomize_order>true</test_randomize_order>
     </backups>
 </clickhouse>
diff --git a/tests/integration/test_broken_projections/config.d/dont_start_broken.xml b/tests/integration/test_broken_projections/config.d/dont_start_broken.xml
deleted file mode 100644
index 9603cdc7e3e..00000000000
--- a/tests/integration/test_broken_projections/config.d/dont_start_broken.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<clickhouse>
-  <merge_tree>
-    <max_suspicious_broken_parts_bytes>0</max_suspicious_broken_parts_bytes>
-  </merge_tree>
-</clickhouse>
diff --git a/tests/integration/test_broken_projections/test.py b/tests/integration/test_broken_projections/test.py
index d161f3fba78..e198f98e4c5 100644
--- a/tests/integration/test_broken_projections/test.py
+++ b/tests/integration/test_broken_projections/test.py
@@ -4,7 +4,6 @@ import logging
 import string
 import random
 from helpers.cluster import ClickHouseCluster
-from multiprocessing.dummy import Pool
 
 cluster = ClickHouseCluster(__file__)
 
@@ -19,12 +18,6 @@ def cluster():
             stay_alive=True,
             with_zookeeper=True,
         )
-        cluster.add_instance(
-            "node_restart",
-            main_configs=["config.d/dont_start_broken.xml"],
-            stay_alive=True,
-            with_zookeeper=True,
-        )
 
         logging.info("Starting cluster...")
         cluster.start()
@@ -155,22 +148,23 @@ def break_part(node, table, part):
     bash(node, f"rm '{part_path}/columns.txt'")
 
 
-def get_broken_projections_info(node, table, part=None, projection=None, active=True):
-    parent_name_filter = f" AND parent_name = '{part}'" if part else ""
-    name_filter = f" AND name = '{projection}'" if projection else ""
+def get_broken_projections_info(node, table, active=True):
     return node.query(
         f"""
-    SELECT parent_name, name, exception
+    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}
-        {parent_name_filter}
-        {name_filter}
+    ) 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):
@@ -318,8 +312,8 @@ def test_broken_ignored(cluster):
 
     # 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 "FILE_DOESNT_EXIST" in get_broken_projections_info(
-        node, table_name, part="all_2_2_0", projection="proj1"
+    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.
@@ -329,14 +323,14 @@ def test_broken_ignored(cluster):
     break_projection(node, table_name, "proj2", "all_2_2_0", "data")
 
     # It will not yet appear in broken projections info.
-    assert not get_broken_projections_info(node, table_name, projection="proj2")
+    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 "NO_FILE_IN_DATA_PART" in get_broken_projections_info(
-        node, table_name, part="all_2_2_0", projection="proj2"
+    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.
@@ -346,7 +340,7 @@ def test_broken_ignored(cluster):
     break_projection(node, table_name, "proj2", "all_3_3_0", "data")
 
     # It will not yet appear in broken projections info.
-    assert not get_broken_projections_info(node, table_name, part="all_3_3_0")
+    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)
@@ -377,8 +371,8 @@ def test_broken_ignored(cluster):
         node, table_name
     )
 
-    assert get_broken_projections_info(node, table_name, part="all_3_3_0", active=False)
-    assert get_broken_projections_info(node, table_name, part="all_2_2_0", active=True)
+    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)
@@ -402,8 +396,8 @@ def test_materialize_broken_projection(cluster):
     break_projection(node, table_name, "proj1", "all_1_1_0", "metadata")
     reattach(node, table_name)
 
-    assert "NO_FILE_IN_DATA_PART" in get_broken_projections_info(
-        node, table_name, part="all_1_1_0", projection="proj1"
+    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
@@ -412,8 +406,8 @@ def test_materialize_broken_projection(cluster):
     break_projection(node, table_name, "proj2", "all_1_1_0", "data")
     reattach(node, table_name)
 
-    assert "FILE_DOESNT_EXIST" in get_broken_projections_info(
-        node, table_name, part="all_1_1_0", projection="proj2"
+    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
@@ -439,7 +433,6 @@ def test_broken_ignored_replicated(cluster):
     check(node, table_name, 1)
 
     create_table(node, table_name2, 2, table_name)
-    node.query(f"system sync replica {table_name}")
     check(node, table_name2, 1)
 
     break_projection(node, table_name, "proj1", "all_0_0_0", "data")
@@ -457,6 +450,54 @@ def get_random_string(string_length=8):
     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"]
 
@@ -476,8 +517,8 @@ def test_broken_projections_in_backups_2(cluster):
     break_projection(node, table_name, "proj2", "all_2_2_0", "part")
     check(node, table_name, 0, "proj2", "ErrnoException")
 
-    assert "FILE_DOESNT_EXIST" in get_broken_projections_info(
-        node, table_name, part="all_2_2_0", projection="proj2"
+    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(
@@ -531,8 +572,8 @@ def test_broken_projections_in_backups_3(cluster):
     assert "Part all_1_1_0 has a broken projection proj1" in check_table_full(
         node, table_name
     )
-    assert "FILE_DOESNT_EXIST" in get_broken_projections_info(
-        node, table_name, part="all_1_1_0", projection="proj1"
+    assert "all_1_1_0\tproj1\tFILE_DOESNT_EXIST" == get_broken_projections_info(
+        node, table_name
     )
 
     backup_name = f"b4-{get_random_string()}"
@@ -552,11 +593,8 @@ def test_broken_projections_in_backups_3(cluster):
     )
 
     check(node, table_name, 0)
-    assert (
-        "Projection directory proj1.proj does not exist while loading projections"
-        in get_broken_projections_info(
-            node, table_name, part="all_1_1_0", projection="proj1"
-        )
+    assert "all_1_1_0\tproj1\tNO_FILE_IN_DATA_PART" == get_broken_projections_info(
+        node, table_name
     )
 
 
@@ -579,7 +617,7 @@ def test_check_part_thread(cluster):
     break_projection(node, table_name, "proj2", "all_2_2_0", "data")
 
     # It will not yet appear in broken projections info.
-    assert not get_broken_projections_info(node, table_name, projection="proj2")
+    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)
@@ -616,15 +654,15 @@ def test_broken_on_start(cluster):
     break_projection(node, table_name, "proj2", "all_2_2_0", "data")
 
     # It will not yet appear in broken projections info.
-    assert not get_broken_projections_info(node, table_name, projection="proj2")
+    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 "NO_FILE_IN_DATA_PART" in get_broken_projections_info(
-        node, table_name, part="all_2_2_0", projection="proj2"
+    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.
@@ -633,55 +671,12 @@ def test_broken_on_start(cluster):
     node.restart_clickhouse()
 
     # It will not yet appear in broken projections info.
-    assert get_broken_projections_info(node, table_name, projection="proj2")
+    assert "proj2" in get_broken_projections_info(node, table_name)
 
     # Select works
     check(node, table_name, 0)
 
 
-def test_disappeared_projection_on_start(cluster):
-    node = cluster.instances["node_restart"]
-
-    table_name = "test_disapperead_projection"
-    create_table(node, table_name, 1)
-
-    node.query(f"SYSTEM STOP MERGES {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
-    )
-
-    def drop_projection():
-        node.query(
-            f"ALTER TABLE {table_name} DROP PROJECTION proj2",
-            settings={"mutations_sync": "0"},
-        )
-
-    p = Pool(2)
-    p.apply_async(drop_projection)
-
-    for i in range(30):
-        create_query = node.query(f"SHOW CREATE TABLE {table_name}")
-        if "proj2" not in create_query:
-            break
-        time.sleep(0.5)
-
-    assert "proj2" not in create_query
-
-    # Remove 'proj2' for part all_2_2_0
-    break_projection(node, table_name, "proj2", "all_2_2_0", "part")
-
-    node.restart_clickhouse()
-
-    # proj2 is not broken, it doesn't exist, but ok
-    check(node, table_name, 0, expect_broken_part="proj2", do_check_command=0)
-
-
 def test_mutation_with_broken_projection(cluster):
     node = cluster.instances["node"]
 
@@ -707,7 +702,7 @@ def test_mutation_with_broken_projection(cluster):
         node, table_name
     )
 
-    assert not get_broken_projections_info(node, table_name)
+    assert "" == get_broken_projections_info(node, table_name)
 
     check(node, table_name, 1)
 
@@ -715,55 +710,54 @@ def test_mutation_with_broken_projection(cluster):
     break_projection(node, table_name, "proj2", "all_2_2_0_4", "data")
 
     # It will not yet appear in broken projections info.
-    assert not get_broken_projections_info(node, table_name, projection="proj2")
+    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 "NO_FILE_IN_DATA_PART" in get_broken_projections_info(
-        node, table_name, part="all_2_2_0_4", projection="proj2"
+    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 get_broken_projections_info(node, table_name, part="all_2_2_0_4")
+    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"
     )
 
-    parts = get_parts(node, table_name)
     # 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"] == parts or [
-        "all_1_1_0_5",
-        "all_2_2_0_5",
-        "all_3_3_0_5",
-    ] == parts
+    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)
-    if broken:  # can be not broken because of a merge.
-        assert get_broken_projections_info(node, table_name, part="all_2_2_0_5")
+    assert (
+        "all_2_2_0_5" in broken or "" == broken
+    )  # second could be because of a merge.
 
-    check(node, table_name, not broken)
+    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"
     )
 
-    parts = get_parts(node, table_name)
-    assert ["all_1_1_0_6", "all_2_2_0_6", "all_3_3_0_6"] == parts or [
-        "all_0_0_0_6",
-        "all_1_1_0_6",
-        "all_2_2_0_6",
-        "all_3_3_0_6",
-    ] == parts
+    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 not get_broken_projections_info(node, table_name)
+    assert "" == get_broken_projections_info(node, table_name)
 
     check(node, table_name, 1)
diff --git a/tests/integration/test_checking_s3_blobs_paranoid/test.py b/tests/integration/test_checking_s3_blobs_paranoid/test.py
index 76a0f30f82e..1ed70e20b79 100644
--- a/tests/integration/test_checking_s3_blobs_paranoid/test.py
+++ b/tests/integration/test_checking_s3_blobs_paranoid/test.py
@@ -4,8 +4,6 @@ import logging
 import pytest
 import os
 import minio
-import random
-import string
 
 from helpers.cluster import ClickHouseCluster
 from helpers.mock_servers import start_s3_mock
@@ -47,11 +45,6 @@ def cluster():
         cluster.shutdown()
 
 
-def randomize_query_id(query_id, random_suffix_length=10):
-    letters = string.ascii_letters + string.digits
-    return f"{query_id}_{''.join(random.choice(letters) for _ in range(random_suffix_length))}"
-
-
 @pytest.fixture(scope="module")
 def init_broken_s3(cluster):
     yield start_s3_mock(cluster, "broken_s3", "8083")
@@ -68,7 +61,6 @@ def test_upload_after_check_works(cluster, broken_s3):
 
     node.query(
         """
-        DROP TABLE IF EXISTS s3_upload_after_check_works;
         CREATE TABLE s3_upload_after_check_works (
             id Int64,
             data String
@@ -135,9 +127,7 @@ def test_upload_s3_fail_create_multi_part_upload(cluster, broken_s3, compression
 
     broken_s3.setup_at_create_multi_part_upload()
 
-    insert_query_id = randomize_query_id(
-        f"INSERT_INTO_TABLE_FUNCTION_FAIL_CREATE_MPU_{compression}"
-    )
+    insert_query_id = f"INSERT_INTO_TABLE_FUNCTION_FAIL_CREATE_MPU_{compression}"
     error = node.query_and_get_error(
         f"""
         INSERT INTO
@@ -179,9 +169,7 @@ def test_upload_s3_fail_upload_part_when_multi_part_upload(
     broken_s3.setup_fake_multpartuploads()
     broken_s3.setup_at_part_upload(count=1, after=2)
 
-    insert_query_id = randomize_query_id(
-        f"INSERT_INTO_TABLE_FUNCTION_FAIL_UPLOAD_PART_{compression}"
-    )
+    insert_query_id = f"INSERT_INTO_TABLE_FUNCTION_FAIL_UPLOAD_PART_{compression}"
     error = node.query_and_get_error(
         f"""
         INSERT INTO
@@ -209,7 +197,7 @@ def test_upload_s3_fail_upload_part_when_multi_part_upload(
     )
     assert create_multipart == 1
     assert upload_parts >= 2
-    assert s3_errors == 1
+    assert s3_errors >= 2
 
 
 @pytest.mark.parametrize(
@@ -233,7 +221,7 @@ def test_when_error_is_retried(cluster, broken_s3, action_and_message):
     broken_s3.setup_fake_multpartuploads()
     broken_s3.setup_at_part_upload(count=3, after=2, action=action)
 
-    insert_query_id = randomize_query_id(f"INSERT_INTO_TABLE_{action}_RETRIED")
+    insert_query_id = f"INSERT_INTO_TABLE_{action}_RETRIED"
     node.query(
         f"""
         INSERT INTO
@@ -262,7 +250,7 @@ def test_when_error_is_retried(cluster, broken_s3, action_and_message):
     assert s3_errors == 3
 
     broken_s3.setup_at_part_upload(count=1000, after=2, action=action)
-    insert_query_id = randomize_query_id(f"INSERT_INTO_TABLE_{action}_RETRIED_1")
+    insert_query_id = f"INSERT_INTO_TABLE_{action}_RETRIED_1"
     error = node.query_and_get_error(
         f"""
             INSERT INTO
@@ -297,7 +285,7 @@ def test_when_s3_broken_pipe_at_upload_is_retried(cluster, broken_s3):
         action="broken_pipe",
     )
 
-    insert_query_id = randomize_query_id(f"TEST_WHEN_S3_BROKEN_PIPE_AT_UPLOAD")
+    insert_query_id = f"TEST_WHEN_S3_BROKEN_PIPE_AT_UPLOAD"
     node.query(
         f"""
         INSERT INTO
@@ -331,7 +319,7 @@ def test_when_s3_broken_pipe_at_upload_is_retried(cluster, broken_s3):
         after=2,
         action="broken_pipe",
     )
-    insert_query_id = randomize_query_id(f"TEST_WHEN_S3_BROKEN_PIPE_AT_UPLOAD_1")
+    insert_query_id = f"TEST_WHEN_S3_BROKEN_PIPE_AT_UPLOAD_1"
     error = node.query_and_get_error(
         f"""
                INSERT INTO
@@ -373,7 +361,7 @@ def test_when_s3_connection_reset_by_peer_at_upload_is_retried(
         action_args=["1"] if send_something else ["0"],
     )
 
-    insert_query_id = randomize_query_id(
+    insert_query_id = (
         f"TEST_WHEN_S3_CONNECTION_RESET_BY_PEER_AT_UPLOAD_{send_something}"
     )
     node.query(
@@ -410,7 +398,7 @@ def test_when_s3_connection_reset_by_peer_at_upload_is_retried(
         action="connection_reset_by_peer",
         action_args=["1"] if send_something else ["0"],
     )
-    insert_query_id = randomize_query_id(
+    insert_query_id = (
         f"TEST_WHEN_S3_CONNECTION_RESET_BY_PEER_AT_UPLOAD_{send_something}_1"
     )
     error = node.query_and_get_error(
@@ -455,7 +443,7 @@ def test_when_s3_connection_reset_by_peer_at_create_mpu_retried(
         action_args=["1"] if send_something else ["0"],
     )
 
-    insert_query_id = randomize_query_id(
+    insert_query_id = (
         f"TEST_WHEN_S3_CONNECTION_RESET_BY_PEER_AT_MULTIPARTUPLOAD_{send_something}"
     )
     node.query(
@@ -493,7 +481,7 @@ def test_when_s3_connection_reset_by_peer_at_create_mpu_retried(
         action_args=["1"] if send_something else ["0"],
     )
 
-    insert_query_id = randomize_query_id(
+    insert_query_id = (
         f"TEST_WHEN_S3_CONNECTION_RESET_BY_PEER_AT_MULTIPARTUPLOAD_{send_something}_1"
     )
     error = node.query_and_get_error(
@@ -533,7 +521,7 @@ def test_query_is_canceled_with_inf_retries(cluster, broken_s3):
         action="connection_refused",
     )
 
-    insert_query_id = randomize_query_id(f"TEST_QUERY_IS_CANCELED_WITH_INF_RETRIES")
+    insert_query_id = f"TEST_QUERY_IS_CANCELED_WITH_INF_RETRIES"
     request = node.get_query_request(
         f"""
         INSERT INTO
@@ -591,7 +579,7 @@ def test_adaptive_timeouts(cluster, broken_s3, node_name):
         count=1000000,
     )
 
-    insert_query_id = randomize_query_id(f"TEST_ADAPTIVE_TIMEOUTS_{node_name}")
+    insert_query_id = f"TEST_ADAPTIVE_TIMEOUTS_{node_name}"
     node.query(
         f"""
             INSERT INTO
@@ -643,7 +631,6 @@ def test_no_key_found_disk(cluster, broken_s3):
 
     node.query(
         """
-        DROP TABLE IF EXISTS no_key_found_disk;
         CREATE TABLE no_key_found_disk (
             id Int64
         ) ENGINE=MergeTree()
@@ -702,15 +689,3 @@ def test_no_key_found_disk(cluster, broken_s3):
         "DB::Exception: The specified key does not exist. This error happened for S3 disk."
         in error
     )
-
-    s3_disk_no_key_errors_metric_value = int(
-        node.query(
-            """
-            SELECT value
-            FROM system.metrics
-            WHERE metric = 'DiskS3NoSuchKeyErrors'
-            """
-        ).strip()
-    )
-
-    assert s3_disk_no_key_errors_metric_value > 0
diff --git a/tests/integration/test_cluster_all_replicas/test.py b/tests/integration/test_cluster_all_replicas/test.py
index 9797db7c498..d8bad180e1b 100644
--- a/tests/integration/test_cluster_all_replicas/test.py
+++ b/tests/integration/test_cluster_all_replicas/test.py
@@ -21,14 +21,14 @@ def start_cluster():
 def test_cluster(start_cluster):
     assert (
         node1.query(
-            "SELECT hostName() FROM clusterAllReplicas('one_shard_two_nodes', system.one) ORDER BY ALL"
+            "SELECT hostName() FROM clusterAllReplicas('one_shard_two_nodes', system.one)"
         )
         == "node1\nnode2\n"
     )
 
     assert set(
         node1.query(
-            """SELECT hostName(), * FROM clusterAllReplicas("one_shard_two_nodes", system.one) ORDER BY ALL"""
+            """SELECT hostName(), * FROM clusterAllReplicas("one_shard_two_nodes", system.one) ORDER BY dummy"""
         ).splitlines()
     ) == {"node1\t0", "node2\t0"}
 
@@ -48,7 +48,7 @@ def test_global_in(start_cluster):
 
     assert set(
         node1.query(
-            """SELECT hostName(), * FROM clusterAllReplicas("one_shard_two_nodes", system.one) where dummy GLOBAL IN u ORDER BY ALL"""
+            """SELECT hostName(), * FROM clusterAllReplicas("one_shard_two_nodes", system.one) where dummy GLOBAL IN u"""
         ).splitlines()
     ) == {"node1\t0", "node2\t0"}
 
@@ -63,7 +63,7 @@ def test_global_in(start_cluster):
 def test_skip_unavailable_replica(start_cluster, cluster):
     assert (
         node1.query(
-            f"SELECT hostName() FROM clusterAllReplicas('{cluster}', system.one) ORDER BY ALL settings skip_unavailable_shards=1"
+            f"SELECT hostName() FROM clusterAllReplicas('{cluster}', system.one) settings skip_unavailable_shards=1"
         )
         == "node1\nnode2\n"
     )
@@ -81,5 +81,5 @@ def test_error_on_unavailable_replica(start_cluster, cluster):
     # so when skip_unavailable_shards=0 -  any unavailable replica should lead to an error
     with pytest.raises(QueryRuntimeException):
         node1.query(
-            f"SELECT hostName() FROM clusterAllReplicas('{cluster}', system.one) ORDER BY ALL settings skip_unavailable_shards=0"
+            f"SELECT hostName() FROM clusterAllReplicas('{cluster}', system.one) settings skip_unavailable_shards=0"
         )
diff --git a/tests/integration/test_crash_log/test.py b/tests/integration/test_crash_log/test.py
index 5a63e6ca6a7..a5b82039a84 100644
--- a/tests/integration/test_crash_log/test.py
+++ b/tests/integration/test_crash_log/test.py
@@ -60,13 +60,6 @@ def test_pkill(started_node):
 
 
 def test_pkill_query_log(started_node):
-    if (
-        started_node.is_built_with_thread_sanitizer()
-        or started_node.is_built_with_address_sanitizer()
-        or started_node.is_built_with_memory_sanitizer()
-    ):
-        pytest.skip("doesn't fit in timeouts for stacktrace generation")
-
     for signal in ["SEGV", "4"]:
         # force create query_log if it was not created
         started_node.query("SYSTEM FLUSH LOGS")
diff --git a/tests/integration/test_custom_dashboards/configs/config.d/overrides.xml b/tests/integration/test_custom_dashboards/configs/config.d/overrides.xml
deleted file mode 100644
index c3825784785..00000000000
--- a/tests/integration/test_custom_dashboards/configs/config.d/overrides.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<clickhouse>
-    <dashboards>
-        <dashboard>
-            <dashboard>Overview</dashboard>
-            <title>Queries/second</title>
-            <query>
-                SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_Query)
-                FROM 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}
-            </query>
-        </dashboard>
-    </dashboards>
-</clickhouse>
diff --git a/tests/integration/test_custom_dashboards/test.py b/tests/integration/test_custom_dashboards/test.py
deleted file mode 100644
index 7b360f58dc7..00000000000
--- a/tests/integration/test_custom_dashboards/test.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import pytest
-from helpers.cluster import ClickHouseCluster
-
-
-cluster = ClickHouseCluster(__file__)
-
-default = cluster.add_instance("default")
-custom = cluster.add_instance("custom", main_configs=["configs/config.d/overrides.xml"])
-
-
-@pytest.fixture(scope="module", autouse=True)
-def start_cluster():
-    try:
-        cluster.start()
-        yield cluster
-    finally:
-        cluster.shutdown()
-
-
-def test_custom_dashboards():
-    assert int(default.query("select count()>10 from system.dashboards")) == 1
-    assert int(custom.query("select count() from system.dashboards")) == 1
-    assert (
-        default.query(
-            "select normalizeQuery(query) from system.dashboards where dashboard = 'Overview' and title = 'Queries/second'"
-        ).strip()
-        == """
-SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_Query) FROM merge(?..) WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32} GROUP BY t ORDER BY t WITH FILL STEP {rounding:UInt32}
-    """.strip()
-    )
-    custom.query(
-        "select normalizeQuery(query) from system.dashboards where dashboard = 'Overview' and title = 'Queries/second'"
-    ).strip == """
-SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_Query) FROM 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}
-    """.strip()
diff --git a/tests/integration/test_delayed_replica_failover/test.py b/tests/integration/test_delayed_replica_failover/test.py
index f1034e26b25..a480ee3f278 100644
--- a/tests/integration/test_delayed_replica_failover/test.py
+++ b/tests/integration/test_delayed_replica_failover/test.py
@@ -20,30 +20,21 @@ node_1_2 = cluster.add_instance("node_1_2", with_zookeeper=True)
 node_2_1 = cluster.add_instance("node_2_1", with_zookeeper=True)
 node_2_2 = cluster.add_instance("node_2_2", with_zookeeper=True)
 
-# For test to be runnable multiple times
-seqno = 0
-
 
 @pytest.fixture(scope="module")
 def started_cluster():
     try:
         cluster.start()
-        yield cluster
-    finally:
-        cluster.shutdown()
 
-
-@pytest.fixture(scope="function", autouse=True)
-def create_tables():
-    global seqno
-    try:
-        seqno += 1
         for shard in (1, 2):
             for replica in (1, 2):
                 node = cluster.instances["node_{}_{}".format(shard, replica)]
                 node.query(
-                    f"CREATE TABLE replicated (d Date, x UInt32) ENGINE = "
-                    f"ReplicatedMergeTree('/clickhouse/tables/{shard}/replicated_{seqno}', '{node.name}') PARTITION BY toYYYYMM(d) ORDER BY d"
+                    """
+CREATE TABLE replicated (d Date, x UInt32) ENGINE =
+    ReplicatedMergeTree('/clickhouse/tables/{shard}/replicated', '{instance}') PARTITION BY toYYYYMM(d) ORDER BY d""".format(
+                        shard=shard, instance=node.name
+                    )
                 )
 
         node_1_1.query(
@@ -51,15 +42,10 @@ def create_tables():
             "Distributed('test_cluster', 'default', 'replicated')"
         )
 
-        yield
+        yield cluster
 
     finally:
-        node_1_1.query("DROP TABLE distributed")
-
-        node_1_1.query("DROP TABLE replicated")
-        node_1_2.query("DROP TABLE replicated")
-        node_2_1.query("DROP TABLE replicated")
-        node_2_2.query("DROP TABLE replicated")
+        cluster.shutdown()
 
 
 def test(started_cluster):
@@ -115,9 +101,7 @@ SELECT sum(x) FROM distributed WITH TOTALS SETTINGS
         # allow pings to zookeeper to timeout (must be greater than ZK session timeout).
         for _ in range(30):
             try:
-                node_2_2.query(
-                    "SELECT * FROM system.zookeeper where path = '/' SETTINGS insert_keeper_max_retries = 0"
-                )
+                node_2_2.query("SELECT * FROM system.zookeeper where path = '/'")
                 time.sleep(0.5)
             except:
                 break
@@ -136,7 +120,7 @@ SELECT sum(x) FROM distributed SETTINGS
             == "3"
         )
 
-        # Prefer fallback_to_stale_replicas over skip_unavailable_shards
+        # Regression for skip_unavailable_shards in conjunction with skip_unavailable_shards
         assert (
             instance_with_dist_table.query(
                 """
diff --git a/tests/integration/test_dictionaries_postgresql/test.py b/tests/integration/test_dictionaries_postgresql/test.py
index 010ecdb5084..516ac27ea26 100644
--- a/tests/integration/test_dictionaries_postgresql/test.py
+++ b/tests/integration/test_dictionaries_postgresql/test.py
@@ -530,61 +530,10 @@ def test_bad_configuration(started_cluster):
     """
     )
 
-    assert "Unexpected key `dbbb`" in node1.query_and_get_error(
+    node1.query_and_get_error(
         "SELECT dictGetUInt32(postgres_dict, 'value', toUInt64(1))"
     )
-
-
-def test_named_collection_from_ddl(started_cluster):
-    cursor = started_cluster.postgres_conn.cursor()
-    cursor.execute("DROP TABLE IF EXISTS test_table")
-    cursor.execute("CREATE TABLE test_table (id integer, value integer)")
-
-    node1.query(
-        """
-        DROP NAMED COLLECTION IF EXISTS pg_conn;
-        CREATE NAMED COLLECTION pg_conn
-        AS user = 'postgres', password = 'mysecretpassword', host = 'postgres1', port = 5432, database = 'postgres', table = 'test_table';
-    """
-    )
-
-    cursor.execute(
-        "INSERT INTO test_table SELECT i, i FROM generate_series(0, 99) as t(i)"
-    )
-
-    node1.query(
-        """
-    DROP DICTIONARY IF EXISTS postgres_dict;
-    CREATE DICTIONARY postgres_dict (id UInt32, value UInt32)
-    PRIMARY KEY id
-    SOURCE(POSTGRESQL(NAME pg_conn))
-        LIFETIME(MIN 1 MAX 2)
-        LAYOUT(HASHED());
-    """
-    )
-    result = node1.query("SELECT dictGetUInt32(postgres_dict, 'value', toUInt64(99))")
-    assert int(result.strip()) == 99
-
-    node1.query(
-        """
-        DROP NAMED COLLECTION IF EXISTS pg_conn_2;
-        CREATE NAMED COLLECTION pg_conn_2
-        AS user = 'postgres', password = 'mysecretpassword', host = 'postgres1', port = 5432, dbbb = 'postgres', table = 'test_table';
-    """
-    )
-    node1.query(
-        """
-    DROP DICTIONARY IF EXISTS postgres_dict;
-    CREATE DICTIONARY postgres_dict (id UInt32, value UInt32)
-    PRIMARY KEY id
-    SOURCE(POSTGRESQL(NAME pg_conn_2))
-        LIFETIME(MIN 1 MAX 2)
-        LAYOUT(HASHED());
-    """
-    )
-    assert "Unexpected key `dbbb`" in node1.query_and_get_error(
-        "SELECT dictGetUInt32(postgres_dict, 'value', toUInt64(99))"
-    )
+    assert node1.contains_in_log("Unexpected key `dbbb`")
 
 
 if __name__ == "__main__":
diff --git a/tests/integration/test_dictionaries_update_and_reload/test.py b/tests/integration/test_dictionaries_update_and_reload/test.py
index 3ed854d2c9f..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(
@@ -253,7 +263,13 @@ def test_reload_after_fail_by_timer(started_cluster):
 
     # on sanitizers builds it can return 'FAILED_AND_RELOADING' which is not quite right
     # add retry for these builds
-    assert get_status("no_file_2") in ["FAILED", "FAILED_AND_RELOADING"]
+    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.
     instance.copy_file_to_container(
@@ -268,7 +284,7 @@ def test_reload_after_fail_by_timer(started_cluster):
     )
     instance.query("SYSTEM RELOAD DICTIONARY no_file_2")
     instance.query("SELECT dictGetInt32('no_file_2', 'a', toUInt64(9))") == "10\n"
-    assert get_status("no_file_2") in ["LOADED", "LOADED_AND_RELOADING"]
+    assert get_status("no_file_2") == "LOADED"
 
     # Removing the file source should not spoil the loaded dictionary.
     instance.exec_in_container(
@@ -276,7 +292,7 @@ def test_reload_after_fail_by_timer(started_cluster):
     )
     time.sleep(6)
     instance.query("SELECT dictGetInt32('no_file_2', 'a', toUInt64(9))") == "10\n"
-    assert get_status("no_file_2") in ["LOADED", "LOADED_AND_RELOADING"]
+    assert get_status("no_file_2") == "LOADED"
 
 
 def test_reload_after_fail_in_cache_dictionary(started_cluster):
diff --git a/tests/integration/test_disable_insertion_and_mutation/__init__.py b/tests/integration/test_disable_insertion_and_mutation/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/integration/test_disable_insertion_and_mutation/config/cluster.xml b/tests/integration/test_disable_insertion_and_mutation/config/cluster.xml
deleted file mode 100644
index 17782a77679..00000000000
--- a/tests/integration/test_disable_insertion_and_mutation/config/cluster.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<clickhouse>
-	<remote_servers>
-		<default>
-			<shard>
-				<replica>
-					<host>writing_node</host>
-					<port>9000</port>
-				</replica>
-				<replica>
-					<host>reading_node</host>
-					<port>9000</port>
-				</replica>
-			</shard>
-        </default>
-	</remote_servers>
-</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_disable_insertion_and_mutation/config/reading_node.xml b/tests/integration/test_disable_insertion_and_mutation/config/reading_node.xml
deleted file mode 100644
index becabce8a44..00000000000
--- a/tests/integration/test_disable_insertion_and_mutation/config/reading_node.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<clickhouse>
-	<disable_insertion_and_mutation>true</disable_insertion_and_mutation>
-</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_disable_insertion_and_mutation/config/writing_node.xml b/tests/integration/test_disable_insertion_and_mutation/config/writing_node.xml
deleted file mode 100644
index 0737af7afc7..00000000000
--- a/tests/integration/test_disable_insertion_and_mutation/config/writing_node.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<clickhouse>
-	<disable_insertion_and_mutation>false</disable_insertion_and_mutation>
-</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_disable_insertion_and_mutation/test.py b/tests/integration/test_disable_insertion_and_mutation/test.py
deleted file mode 100644
index b6da7ed548f..00000000000
--- a/tests/integration/test_disable_insertion_and_mutation/test.py
+++ /dev/null
@@ -1,75 +0,0 @@
-import pytest
-from helpers.client import QueryRuntimeException
-from helpers.cluster import ClickHouseCluster
-import time
-
-cluster = ClickHouseCluster(__file__)
-
-writing_node = cluster.add_instance(
-    "writing_node",
-    main_configs=["config/writing_node.xml", "config/cluster.xml"],
-    with_zookeeper=True,
-    with_minio=True,
-    stay_alive=True,
-    macros={"shard": 1, "replica": 1},
-)
-reading_node = cluster.add_instance(
-    "reading_node",
-    main_configs=["config/reading_node.xml", "config/cluster.xml"],
-    with_zookeeper=True,
-    with_minio=True,
-    stay_alive=True,
-    macros={"shard": 1, "replica": 2},
-)
-
-
-@pytest.fixture(scope="module")
-def started_cluster():
-    try:
-        cluster.start()
-
-        yield cluster
-
-    finally:
-        cluster.shutdown()
-
-
-def test_disable_insertion_and_mutation(started_cluster):
-    writing_node.query(
-        """CREATE TABLE my_table on cluster default (key UInt64, value String) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{shard}/default.my_table', '{replica}') ORDER BY key partition by (key % 5) """
-    )
-
-    assert "QUERY_IS_PROHIBITED" in reading_node.query_and_get_error(
-        "INSERT INTO my_table VALUES (1, 'hello')"
-    )
-
-    assert "QUERY_IS_PROHIBITED" in reading_node.query_and_get_error(
-        "INSERT INTO my_table SETTINGS async_insert = 1 VALUES (1, 'hello')"
-    )
-
-    assert "QUERY_IS_PROHIBITED" in reading_node.query_and_get_error(
-        "ALTER TABLE my_table delete where 1"
-    )
-
-    assert "QUERY_IS_PROHIBITED" in reading_node.query_and_get_error(
-        "ALTER table my_table update key = 1 where 1"
-    )
-
-    assert "QUERY_IS_PROHIBITED" in reading_node.query_and_get_error(
-        "ALTER TABLE my_table drop partition 0"
-    )
-
-    reading_node.query("SELECT * from my_table")
-    writing_node.query("INSERT INTO my_table VALUES (1, 'hello')")
-    writing_node.query("ALTER TABLE my_table delete where 1")
-    writing_node.query("ALTER table my_table update value = 'no hello' where 1")
-
-    reading_node.query("ALTER TABLE my_table ADD COLUMN new_column UInt64")
-    writing_node.query("SELECT new_column from my_table")
-    reading_node.query("SELECT new_column from my_table")
-
-    reading_node.query("ALter Table my_table MODIFY COLUMN new_column String")
-
-    assert "new_column\tString" in reading_node.query("DESC my_table")
-
-    assert "new_column\tString" in writing_node.query("DESC my_table")
diff --git a/tests/integration/test_disk_configuration/test.py b/tests/integration/test_disk_configuration/test.py
index f297c665dc5..afc5303298c 100644
--- a/tests/integration/test_disk_configuration/test.py
+++ b/tests/integration/test_disk_configuration/test.py
@@ -373,7 +373,7 @@ def test_merge_tree_setting_override(start_cluster):
         CREATE TABLE {TABLE_NAME} (a Int32)
         ENGINE = MergeTree()
         ORDER BY tuple()
-        SETTINGS disk = 's3', storage_policy = 's3';
+        SETTINGS disk = 'kek', storage_policy = 's3';
     """
         )
     )
diff --git a/tests/integration/test_disk_over_web_server/test.py b/tests/integration/test_disk_over_web_server/test.py
index ec0bef23731..891ee8f00f5 100644
--- a/tests/integration/test_disk_over_web_server/test.py
+++ b/tests/integration/test_disk_over_web_server/test.py
@@ -311,8 +311,7 @@ def test_replicated_database(cluster):
         SETTINGS storage_policy = 'web';
     """.format(
             uuids[0]
-        ),
-        settings={"database_replicated_allow_explicit_uuid": 3},
+        )
     )
 
     node2 = cluster.instances["node2"]
diff --git a/tests/integration/test_disks_app_func/test.py b/tests/integration/test_disks_app_func/test.py
index a4b2399e117..56ea5c8846a 100644
--- a/tests/integration/test_disks_app_func/test.py
+++ b/tests/integration/test_disks_app_func/test.py
@@ -13,20 +13,8 @@ def started_cluster():
             main_configs=["config.xml"],
             with_minio=True,
         )
+
         cluster.start()
-
-        # local disk requires its `path` directory to exist.
-        # the two paths below belong to `test1` and `test2` disks
-        node = cluster.instances["disks_app_test"]
-        for path in ["path1", "path2"]:
-            node.exec_in_container(
-                [
-                    "bash",
-                    "-c",
-                    f"mkdir -p /var/lib/clickhouse/{path}",
-                ]
-            )
-
         yield cluster
 
     finally:
diff --git a/tests/integration/test_distributed_format/test.py b/tests/integration/test_distributed_format/test.py
index 5611f465e8b..91afb8f7b34 100644
--- a/tests/integration/test_distributed_format/test.py
+++ b/tests/integration/test_distributed_format/test.py
@@ -55,7 +55,7 @@ def test_single_file(started_cluster, cluster):
     path = get_dist_path(cluster, "distr_1", 1)
     query = f"select * from file('{path}/1.bin', 'Distributed')"
     out = node.exec_in_container(
-        ["/usr/bin/clickhouse", "local", "--stacktrace", "-q", query]
+        ["/usr/bin/clickhouse", "local", "--multiquery", "--stacktrace", "-q", query]
     )
 
     assert out == "1\ta\n2\tbb\n3\tccc\n"
@@ -65,7 +65,7 @@ def test_single_file(started_cluster, cluster):
     select * from t;
     """
     out = node.exec_in_container(
-        ["/usr/bin/clickhouse", "local", "--stacktrace", "-q", query]
+        ["/usr/bin/clickhouse", "local", "--multiquery", "--stacktrace", "-q", query]
     )
 
     assert out == "1\ta\n2\tbb\n3\tccc\n"
@@ -106,7 +106,7 @@ def test_two_files(started_cluster, cluster):
     select * from t order by x;
     """
     out = node.exec_in_container(
-        ["/usr/bin/clickhouse", "local", "--stacktrace", "-q", query]
+        ["/usr/bin/clickhouse", "local", "--multiquery", "--stacktrace", "-q", query]
     )
 
     assert out == "0\t_\n1\ta\n2\tbb\n3\tccc\n"
@@ -141,7 +141,7 @@ def test_single_file_old(started_cluster, cluster):
     select * from t;
     """
     out = node.exec_in_container(
-        ["/usr/bin/clickhouse", "local", "--stacktrace", "-q", query]
+        ["/usr/bin/clickhouse", "local", "--multiquery", "--stacktrace", "-q", query]
     )
 
     assert out == "1\ta\n2\tbb\n3\tccc\n"
diff --git a/tests/integration/test_distributed_inter_server_secret/test.py b/tests/integration/test_distributed_inter_server_secret/test.py
index d74cf97e5c6..7ecb2cda257 100644
--- a/tests/integration/test_distributed_inter_server_secret/test.py
+++ b/tests/integration/test_distributed_inter_server_secret/test.py
@@ -46,10 +46,6 @@ users = pytest.mark.parametrize(
 )
 
 
-def generate_query_id():
-    return str(uuid.uuid4())
-
-
 def bootstrap():
     for n in list(cluster.instances.values()):
         n.query("DROP TABLE IF EXISTS data")
@@ -120,10 +116,10 @@ def start_cluster():
         cluster.shutdown()
 
 
-# @return -- [[user, initial_user]]
+# @return -- [user, initial_user]
 def get_query_user_info(node, query_pattern):
     node.query("SYSTEM FLUSH LOGS")
-    lines = (
+    return (
         node.query(
             """
     SELECT user, initial_user
@@ -137,10 +133,8 @@ def get_query_user_info(node, query_pattern):
             )
         )
         .strip()
-        .split("\n")
+        .split("\t")
     )
-    lines = map(lambda x: x.split("\t"), lines)
-    return list(lines)
 
 
 # @return -- [user, initial_user]
@@ -272,13 +266,13 @@ def test_secure_insert_buffer_async():
     n1.query("SYSTEM RELOAD CONFIG")
     # ensure that SELECT creates new connection (we need separate table for
     # this, so that separate distributed pool will be used)
-    query_id = generate_query_id()
+    query_id = uuid.uuid4().hex
     n1.query("SELECT * FROM dist_secure_from_buffer", user="ro", query_id=query_id)
     assert n1.contains_in_log(
         "{" + query_id + "} <Trace> Connection (n2:9000): Connecting."
     )
 
-    query_id = generate_query_id()
+    query_id = uuid.uuid4().hex
     n1.query(
         "INSERT INTO dist_secure_buffer SELECT * FROM numbers(2)", query_id=query_id
     )
@@ -335,26 +329,26 @@ def test_secure_disagree_insert():
 
 @users
 def test_user_insecure_cluster(user, password):
-    id_ = "query-dist_insecure-" + user + "-" + generate_query_id()
+    id_ = "query-dist_insecure-" + user
     n1.query(f"SELECT *, '{id_}' FROM dist_insecure", user=user, password=password)
-    assert get_query_user_info(n1, id_)[0] == [
+    assert get_query_user_info(n1, id_) == [
         user,
         user,
     ]  # due to prefer_localhost_replica
-    assert get_query_user_info(n2, id_)[0] == ["default", user]
+    assert get_query_user_info(n2, id_) == ["default", user]
 
 
 @users
 def test_user_secure_cluster(user, password):
-    id_ = "query-dist_secure-" + user + "-" + generate_query_id()
+    id_ = "query-dist_secure-" + user
     n1.query(f"SELECT *, '{id_}' FROM dist_secure", user=user, password=password)
-    assert get_query_user_info(n1, id_)[0] == [user, user]
-    assert get_query_user_info(n2, id_)[0] == [user, user]
+    assert get_query_user_info(n1, id_) == [user, user]
+    assert get_query_user_info(n2, id_) == [user, user]
 
 
 @users
 def test_per_user_inline_settings_insecure_cluster(user, password):
-    id_ = "query-ddl-settings-dist_insecure-" + user + "-" + generate_query_id()
+    id_ = "query-ddl-settings-dist_insecure-" + user
     n1.query(
         f"""
         SELECT *, '{id_}' FROM dist_insecure
@@ -371,7 +365,7 @@ def test_per_user_inline_settings_insecure_cluster(user, password):
 
 @users
 def test_per_user_inline_settings_secure_cluster(user, password):
-    id_ = "query-ddl-settings-dist_secure-" + user + "-" + generate_query_id()
+    id_ = "query-ddl-settings-dist_secure-" + user
     n1.query(
         f"""
         SELECT *, '{id_}' FROM dist_secure
@@ -390,7 +384,7 @@ def test_per_user_inline_settings_secure_cluster(user, password):
 
 @users
 def test_per_user_protocol_settings_insecure_cluster(user, password):
-    id_ = "query-protocol-settings-dist_insecure-" + user + "-" + generate_query_id()
+    id_ = "query-protocol-settings-dist_insecure-" + user
     n1.query(
         f"SELECT *, '{id_}' FROM dist_insecure",
         user=user,
@@ -406,7 +400,7 @@ def test_per_user_protocol_settings_insecure_cluster(user, password):
 
 @users
 def test_per_user_protocol_settings_secure_cluster(user, password):
-    id_ = "query-protocol-settings-dist_secure-" + user + "-" + generate_query_id()
+    id_ = "query-protocol-settings-dist_secure-" + user
     n1.query(
         f"SELECT *, '{id_}' FROM dist_secure",
         user=user,
@@ -422,7 +416,7 @@ def test_per_user_protocol_settings_secure_cluster(user, password):
     )
 
 
-def test_secure_cluster_distributed_over_distributed_different_users_remote():
+def test_secure_cluster_distributed_over_distributed_different_users():
     # This works because we will have initial_user='default'
     n1.query(
         "SELECT * FROM remote('n1', currentDatabase(), dist_secure)", user="new_user"
@@ -437,16 +431,3 @@ def test_secure_cluster_distributed_over_distributed_different_users_remote():
     # and stuff).
     with pytest.raises(QueryRuntimeException):
         n1.query("SELECT * FROM dist_over_dist_secure", user="new_user")
-
-
-def test_secure_cluster_distributed_over_distributed_different_users_cluster():
-    id_ = "cluster-user" + "-" + generate_query_id()
-    n1.query(
-        f"SELECT *, '{id_}' FROM cluster(secure, currentDatabase(), dist_secure)",
-        user="nopass",
-        settings={
-            "prefer_localhost_replica": 0,
-        },
-    )
-    assert get_query_user_info(n1, id_) == [["nopass", "nopass"]] * 4
-    assert get_query_user_info(n2, id_) == [["nopass", "nopass"]] * 3
diff --git a/tests/integration/test_distributed_load_balancing/test.py b/tests/integration/test_distributed_load_balancing/test.py
index a913c2ebb49..d61cca6ce12 100644
--- a/tests/integration/test_distributed_load_balancing/test.py
+++ b/tests/integration/test_distributed_load_balancing/test.py
@@ -200,6 +200,7 @@ def test_distributed_replica_max_ignored_errors():
         "connect_timeout": 2,
         "receive_timeout": 2,
         "send_timeout": 2,
+        "idle_connection_timeout": 2,
         "tcp_keep_alive_timeout": 2,
         "distributed_replica_max_ignored_errors": 0,
         "distributed_replica_error_half_life": 60,
diff --git a/tests/integration/test_distributed_type_object/configs/remote_servers.xml b/tests/integration/test_distributed_type_object/configs/remote_servers.xml
index 68b420f36b4..ebce4697529 100644
--- a/tests/integration/test_distributed_type_object/configs/remote_servers.xml
+++ b/tests/integration/test_distributed_type_object/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<clickhouse>
+<yandex>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -15,4 +15,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</clickhouse>
+</yandex>
diff --git a/tests/integration/test_distributed_type_object/test.py b/tests/integration/test_distributed_type_object/test.py
index 64acdda887b..360087c9dda 100644
--- a/tests/integration/test_distributed_type_object/test.py
+++ b/tests/integration/test_distributed_type_object/test.py
@@ -16,7 +16,7 @@ def started_cluster():
 
         for node in (node1, node2):
             node.query(
-                "CREATE TABLE local_table(id UInt32, data Object('json')) ENGINE = MergeTree ORDER BY id",
+                "CREATE TABLE local_table(id UInt32, data JSON) ENGINE = MergeTree ORDER BY id",
                 settings={"allow_experimental_object_type": 1},
             )
             node.query(
@@ -31,9 +31,6 @@ def started_cluster():
 
 
 def test_distributed_type_object(started_cluster):
-    node1.query("TRUNCATE TABLE local_table")
-    node2.query("TRUNCATE TABLE local_table")
-
     node1.query(
         'INSERT INTO local_table FORMAT JSONEachRow {"id": 1, "data": {"k1": 10}}'
     )
@@ -92,7 +89,7 @@ def test_distributed_type_object(started_cluster):
     assert (
         TSV(
             node1.query(
-                "SELECT id, data.k1, data.k2.k3, data.k2.k4, data.k5 FROM dist_table ORDER BY id SETTINGS enable_analyzer = 0"
+                "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 36401517429..a6db26c8575 100644
--- a/tests/integration/test_dns_cache/test.py
+++ b/tests/integration/test_dns_cache/test.py
@@ -317,74 +317,3 @@ def test_host_is_drop_from_cache_after_consecutive_failures(
     assert node4.wait_for_log_line(
         "Cached hosts dropped:.*InvalidHostThatDoesNotExist.*"
     )
-
-
-node7 = cluster.add_instance(
-    "node7",
-    main_configs=["configs/listen_host.xml", "configs/dns_update_long.xml"],
-    with_zookeeper=True,
-    ipv6_address="2001:3984:3989::1:1117",
-    ipv4_address="10.5.95.17",
-)
-
-
-def _render_filter_config(allow_ipv4, allow_ipv6):
-    config = f"""
-    <clickhouse>
-        <dns_allow_resolve_names_to_ipv4>{int(allow_ipv4)}</dns_allow_resolve_names_to_ipv4>
-        <dns_allow_resolve_names_to_ipv6>{int(allow_ipv6)}</dns_allow_resolve_names_to_ipv6>
-    </clickhouse>
-    """
-    return config
-
-
-@pytest.mark.parametrize(
-    "allow_ipv4, allow_ipv6",
-    [
-        (True, False),
-        (False, True),
-        (False, False),
-    ],
-)
-def test_dns_resolver_filter(cluster_without_dns_cache_update, allow_ipv4, allow_ipv6):
-    node = node7
-    host_ipv6 = node.ipv6_address
-    host_ipv4 = node.ipv4_address
-
-    node.set_hosts(
-        [
-            (host_ipv6, "test_host"),
-            (host_ipv4, "test_host"),
-        ]
-    )
-    node.replace_config(
-        "/etc/clickhouse-server/config.d/dns_filter.xml",
-        _render_filter_config(allow_ipv4, allow_ipv6),
-    )
-
-    node.query("SYSTEM RELOAD CONFIG")
-    node.query("SYSTEM DROP DNS CACHE")
-    node.query("SYSTEM DROP CONNECTIONS CACHE")
-
-    if not allow_ipv4 and not allow_ipv6:
-        with pytest.raises(QueryRuntimeException):
-            node.query("SELECT * FROM remote('lost_host', 'system', 'one')")
-    else:
-        node.query("SELECT * FROM remote('test_host', system, one)")
-        assert (
-            node.query(
-                "SELECT ip_address FROM system.dns_cache WHERE hostname='test_host'"
-            )
-            == f"{host_ipv4 if allow_ipv4 else host_ipv6}\n"
-        )
-
-    node.exec_in_container(
-        [
-            "bash",
-            "-c",
-            "rm /etc/clickhouse-server/config.d/dns_filter.xml",
-        ],
-        privileged=True,
-        user="root",
-    )
-    node.query("SYSTEM RELOAD CONFIG")
diff --git a/tests/integration/test_drop_is_lock_free/test.py b/tests/integration/test_drop_is_lock_free/test.py
index 3855bc21f90..1bb8767a9a0 100644
--- a/tests/integration/test_drop_is_lock_free/test.py
+++ b/tests/integration/test_drop_is_lock_free/test.py
@@ -176,7 +176,7 @@ def test_query_is_permanent(transaction, permanent, exclusive_table):
 
     select_handler = node.get_query_request(
         f"""
-            SELECT sleepEachRow(3) FROM {exclusive_table} SETTINGS function_sleep_max_microseconds_per_block = 0, max_threads=1;
+            SELECT sleepEachRow(3) FROM {exclusive_table} SETTINGS function_sleep_max_microseconds_per_block = 0;
         """,
         query_id=query_id,
     )
diff --git a/tests/integration/test_filesystem_cache/test.py b/tests/integration/test_filesystem_cache/test.py
index aee8bd25c2e..17a8dd8b6e1 100644
--- a/tests/integration/test_filesystem_cache/test.py
+++ b/tests/integration/test_filesystem_cache/test.py
@@ -1,7 +1,6 @@
 import logging
 import time
 import os
-import random
 
 import pytest
 from helpers.cluster import ClickHouseCluster
@@ -31,6 +30,14 @@ 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=[
@@ -52,51 +59,6 @@ def cluster():
         cluster.shutdown()
 
 
-@pytest.fixture(scope="function")
-def non_shared_cluster():
-    """
-    For tests that cannot run in parallel against the same node/cluster (see test_custom_cached_disk, which relies on
-    changing server settings at runtime)
-    """
-    try:
-        # Randomize the cluster name
-        cluster = ClickHouseCluster(f"{__file__}_non_shared_{random.randint(0, 10**7)}")
-        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,
-        )
-
-        logging.info("Starting test-exclusive cluster...")
-        cluster.start()
-        logging.info("Cluster started")
-
-        yield cluster
-    finally:
-        cluster.shutdown()
-
-
-def wait_for_cache_initialized(node, cache_path, max_attempts=50):
-    initialized = False
-    attempts = 0
-    while not initialized:
-        query_result = node.query(
-            "SELECT path FROM system.filesystem_cache_settings WHERE is_initialized"
-        )
-        initialized = cache_path in query_result
-
-        if initialized:
-            break
-
-        time.sleep(0.1)
-        attempts += 1
-        if attempts >= max_attempts:
-            raise "Stopped waiting for cache to be initialized"
-
-
 @pytest.mark.parametrize("node_name", ["node"])
 def test_parallel_cache_loading_on_startup(cluster, node_name):
     node = cluster.instances[node_name]
@@ -109,21 +71,14 @@ def test_parallel_cache_loading_on_startup(cluster, node_name):
         ORDER BY value
         SETTINGS disk = disk(
             type = cache,
-            name = 'parallel_loading_test',
-            path = 'parallel_loading_test',
+            path = 'paralel_loading_test',
             disk = 'hdd_blob',
             max_file_segment_size = '1Ki',
             boundary_alignment = '1Ki',
             max_size = '1Gi',
             max_elements = 10000000,
             load_metadata_threads = 30);
-        """
-    )
 
-    wait_for_cache_initialized(node, "parallel_loading_test")
-
-    node.query(
-        """
         SYSTEM DROP FILESYSTEM CACHE;
         INSERT INTO test SELECT * FROM generateRandom('a Int32, b String') LIMIT 1000000;
         SELECT * FROM test FORMAT Null;
@@ -148,7 +103,6 @@ def test_parallel_cache_loading_on_startup(cluster, node_name):
     )
 
     node.restart_clickhouse()
-    wait_for_cache_initialized(node, "parallel_loading_test")
 
     # < because of additional files loaded into cache on server startup.
     assert cache_count <= int(node.query("SELECT count() FROM system.filesystem_cache"))
@@ -177,7 +131,7 @@ def test_caches_with_the_same_configuration(cluster, node_name):
     node = cluster.instances[node_name]
     cache_path = "cache1"
 
-    node.query("SYSTEM DROP FILESYSTEM CACHE;")
+    node.query(f"SYSTEM DROP FILESYSTEM CACHE;")
     for table in ["test", "test2"]:
         node.query(
             f"""
@@ -188,20 +142,14 @@ def test_caches_with_the_same_configuration(cluster, node_name):
             ORDER BY value
             SETTINGS disk = disk(
                 type = cache,
-                name = '{table}',
+                name = {table},
                 path = '{cache_path}',
                 disk = 'hdd_blob',
                 max_file_segment_size = '1Ki',
                 boundary_alignment = '1Ki',
                 cache_on_write_operations=1,
                 max_size = '1Mi');
-            """
-        )
 
-        wait_for_cache_initialized(node, cache_path)
-
-        node.query(
-            f"""
             SET enable_filesystem_cache_on_write_operations=1;
             INSERT INTO {table} SELECT * FROM generateRandom('a Int32, b String')
             LIMIT 1000;
@@ -247,8 +195,9 @@ def test_caches_with_the_same_configuration(cluster, node_name):
 @pytest.mark.parametrize("node_name", ["node_caches_with_same_path"])
 def test_caches_with_the_same_configuration_2(cluster, node_name):
     node = cluster.instances[node_name]
+    cache_path = "cache1"
 
-    node.query("SYSTEM DROP FILESYSTEM CACHE;")
+    node.query(f"SYSTEM DROP FILESYSTEM CACHE;")
     for table in ["cache1", "cache2"]:
         node.query(
             f"""
@@ -258,13 +207,7 @@ def test_caches_with_the_same_configuration_2(cluster, node_name):
             Engine=MergeTree()
             ORDER BY value
             SETTINGS disk = '{table}';
-            """
-        )
 
-        wait_for_cache_initialized(node, "cache1")
-
-        node.query(
-            f"""
             SET enable_filesystem_cache_on_write_operations=1;
             INSERT INTO {table} SELECT * FROM generateRandom('a Int32, b String')
             LIMIT 1000;
@@ -284,8 +227,8 @@ def test_caches_with_the_same_configuration_2(cluster, node_name):
     )
 
 
-def test_custom_cached_disk(non_shared_cluster):
-    node = non_shared_cluster.instances["node_no_filesystem_caches_path"]
+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"""
@@ -434,7 +377,6 @@ def test_force_filesystem_cache_on_merges(cluster):
             ORDER BY value
             SETTINGS disk = disk(
                 type = cache,
-                name = 'force_cache_on_merges',
                 path = 'force_cache_on_merges',
                 disk = 'hdd_blob',
                 max_file_segment_size = '1Ki',
@@ -443,13 +385,7 @@ def test_force_filesystem_cache_on_merges(cluster):
                 max_size = '10Gi',
                 max_elements = 10000000,
                 load_metadata_threads = 30);
-            """
-        )
 
-        wait_for_cache_initialized(node, "force_cache_on_merges")
-
-        node.query(
-            """
             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;
@@ -505,13 +441,7 @@ SETTINGS disk = disk(type = cache,
             path = "test_system_sync_filesystem_cache",
             delayed_cleanup_interval_ms = 10000000, disk = hdd_blob),
         min_bytes_for_wide_part = 10485760;
-    """
-    )
 
-    wait_for_cache_initialized(node, "test_system_sync_filesystem_cache")
-
-    node.query(
-        """
 INSERT INTO test SELECT 1, 'test';
     """
     )
@@ -595,13 +525,7 @@ SETTINGS disk = disk(type = cache,
             keep_free_space_elements_ratio = {elements_ratio},
             disk = hdd_blob),
         min_bytes_for_wide_part = 10485760;
-    """
-    )
 
-    wait_for_cache_initialized(node, "test_keep_up_size_ratio")
-
-    node.query(
-        """
 INSERT INTO test SELECT randomString(200);
     """
     )
diff --git a/tests/integration/test_filesystem_layout/test.py b/tests/integration/test_filesystem_layout/test.py
index 31d6c830a2f..4e719aa0fe9 100644
--- a/tests/integration/test_filesystem_layout/test.py
+++ b/tests/integration/test_filesystem_layout/test.py
@@ -79,7 +79,3 @@ def test_file_path_escaping(started_cluster):
             "test -f /var/lib/clickhouse/shadow/2/store/123/12345678-1000-4000-8000-000000000001/1_1_1_0/%7EId.bin",
         ]
     )
-    node.query("DROP TABLE test.`T.a_b,l-e!` SYNC")
-    node.query("DROP TABLE `test 2`.`T.a_b,l-e!` SYNC")
-    node.query("DROP DATABASE test")
-    node.query("DROP DATABASE `test 2`")
diff --git a/tests/integration/test_grant_and_revoke/configs/config_with_table_engine_grant.xml b/tests/integration/test_grant_and_revoke/configs/config.xml
similarity index 100%
rename from tests/integration/test_grant_and_revoke/configs/config_with_table_engine_grant.xml
rename to tests/integration/test_grant_and_revoke/configs/config.xml
diff --git a/tests/integration/test_grant_and_revoke/configs/config_without_table_engine_grant.xml b/tests/integration/test_grant_and_revoke/configs/config_without_table_engine_grant.xml
deleted file mode 100644
index d3571f281f5..00000000000
--- a/tests/integration/test_grant_and_revoke/configs/config_without_table_engine_grant.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<clickhouse>
-    <access_control_improvements>
-        <table_engines_require_grant>false</table_engines_require_grant>
-    </access_control_improvements>
-</clickhouse>
diff --git a/tests/integration/test_grant_and_revoke/test_with_table_engine_grant.py b/tests/integration/test_grant_and_revoke/test.py
similarity index 99%
rename from tests/integration/test_grant_and_revoke/test_with_table_engine_grant.py
rename to tests/integration/test_grant_and_revoke/test.py
index ad3d35d8bbd..e533cced1e4 100644
--- a/tests/integration/test_grant_and_revoke/test_with_table_engine_grant.py
+++ b/tests/integration/test_grant_and_revoke/test.py
@@ -5,7 +5,7 @@ from helpers.test_tools import TSV
 cluster = ClickHouseCluster(__file__)
 instance = cluster.add_instance(
     "instance",
-    main_configs=["configs/config_with_table_engine_grant.xml"],
+    main_configs=["configs/config.xml"],
     user_configs=["configs/users.d/users.xml"],
 )
 
@@ -359,8 +359,6 @@ def test_implicit_create_view_grant():
     instance.query("GRANT CREATE VIEW ON test.* TO B", user="A")
     instance.query("CREATE VIEW test.view_2 AS SELECT 1", user="B")
     assert instance.query("SELECT * FROM test.view_2") == "1\n"
-    instance.query("DROP USER A")
-    instance.query("DROP VIEW test.view_2")
 
 
 def test_implicit_create_temporary_table_grant():
@@ -532,7 +530,6 @@ def test_current_database():
     assert "Not enough privileges" in instance.query_and_get_error(
         "SELECT * FROM table", user="A"
     )
-    instance.query("DROP TABLE default.table SYNC")
 
 
 def test_grant_with_replace_option():
diff --git a/tests/integration/test_grant_and_revoke/test_without_table_engine_grant.py b/tests/integration/test_grant_and_revoke/test_without_table_engine_grant.py
deleted file mode 100644
index 4a5dfb83f79..00000000000
--- a/tests/integration/test_grant_and_revoke/test_without_table_engine_grant.py
+++ /dev/null
@@ -1,82 +0,0 @@
-import pytest
-from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import TSV
-
-cluster = ClickHouseCluster(__file__)
-instance = cluster.add_instance(
-    "instance",
-    main_configs=["configs/config_without_table_engine_grant.xml"],
-    user_configs=["configs/users.d/users.xml"],
-)
-
-
-@pytest.fixture(scope="module", autouse=True)
-def start_cluster():
-    try:
-        cluster.start()
-
-        instance.query("CREATE DATABASE test")
-
-        yield cluster
-
-    finally:
-        cluster.shutdown()
-
-
-@pytest.fixture(autouse=True)
-def cleanup_after_test():
-    try:
-        yield
-    finally:
-        instance.query("DROP USER IF EXISTS A")
-        instance.query("DROP TABLE IF EXISTS test.table1")
-
-
-def test_table_engine_and_source_grant():
-    instance.query("DROP USER IF EXISTS A")
-    instance.query("CREATE USER A")
-    instance.query("GRANT CREATE TABLE ON test.table1 TO A")
-
-    instance.query("GRANT POSTGRES ON *.* TO A")
-
-    instance.query(
-        """
-        CREATE TABLE test.table1(a Integer)
-        engine=PostgreSQL('localhost:5432', 'dummy', 'dummy', 'dummy', 'dummy');
-        """,
-        user="A",
-    )
-
-    instance.query("DROP TABLE test.table1")
-
-    instance.query("REVOKE POSTGRES ON *.* FROM A")
-
-    assert "Not enough privileges" in instance.query_and_get_error(
-        """
-        CREATE TABLE test.table1(a Integer)
-        engine=PostgreSQL('localhost:5432', 'dummy', 'dummy', 'dummy', 'dummy');
-        """,
-        user="A",
-    )
-
-    # expecting grant POSTGRES instead of grant PostgreSQL due to discrepancy between source access type and table engine
-    # similarily, other sources should also use their own defined name instead of the name of table engine
-    assert "grant POSTGRES ON *.*" in instance.query_and_get_error(
-        """
-        CREATE TABLE test.table1(a Integer)
-        engine=PostgreSQL('localhost:5432', 'dummy', 'dummy', 'dummy', 'dummy');
-        """,
-        user="A",
-    )
-
-    instance.query("GRANT SOURCES ON *.* TO A")
-
-    instance.query(
-        """
-        CREATE TABLE test.table1(a Integer)
-        engine=PostgreSQL('localhost:5432', 'dummy', 'dummy', 'dummy', 'dummy');
-        """,
-        user="A",
-    )
-
-    instance.query("DROP TABLE test.table1")
diff --git a/tests/integration/test_hedged_requests/test.py b/tests/integration/test_hedged_requests/test.py
index 0d72f7c45b1..02ecf3c1367 100644
--- a/tests/integration/test_hedged_requests/test.py
+++ b/tests/integration/test_hedged_requests/test.py
@@ -333,7 +333,7 @@ def test_receive_timeout2(started_cluster):
     # in packet receiving but there are replicas in process of
     # connection establishing.
     update_configs(
-        node_1_sleep_in_send_data=5000,
+        node_1_sleep_in_send_data=4000,
         node_2_sleep_in_send_tables_status=2000,
         node_3_sleep_in_send_tables_status=2000,
     )
diff --git a/tests/integration/test_host_regexp_hosts_file_resolution/configs/host_regexp.xml b/tests/integration/test_host_regexp_hosts_file_resolution/configs/host_regexp.xml
index 9329c8dbde2..7a2141e6c7e 100644
--- a/tests/integration/test_host_regexp_hosts_file_resolution/configs/host_regexp.xml
+++ b/tests/integration/test_host_regexp_hosts_file_resolution/configs/host_regexp.xml
@@ -1,4 +1,4 @@
-<clickhouse>
+<yandex>
     <users>
         <test_dns>
             <password/>
@@ -8,4 +8,4 @@
             <profile>default</profile>
         </test_dns>
     </users>
-</clickhouse>
+</yandex>
\ No newline at end of file
diff --git a/tests/integration/test_host_regexp_hosts_file_resolution/configs/listen_host.xml b/tests/integration/test_host_regexp_hosts_file_resolution/configs/listen_host.xml
index 9c27c612f63..58ef55cd3f3 100644
--- a/tests/integration/test_host_regexp_hosts_file_resolution/configs/listen_host.xml
+++ b/tests/integration/test_host_regexp_hosts_file_resolution/configs/listen_host.xml
@@ -1,5 +1,5 @@
-<clickhouse>
+<yandex>
     <listen_host>::</listen_host>
     <listen_host>0.0.0.0</listen_host>
     <listen_try>1</listen_try>
-</clickhouse>
+</yandex>
diff --git a/tests/integration/test_inserts_with_keeper_retries/configs/storage_conf.xml b/tests/integration/test_inserts_with_keeper_retries/configs/storage_conf.xml
deleted file mode 100644
index 19ba29de163..00000000000
--- a/tests/integration/test_inserts_with_keeper_retries/configs/storage_conf.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<clickhouse>
-    <logger>
-        <level>test</level>
-    </logger>
-
-</clickhouse>
diff --git a/tests/integration/test_inserts_with_keeper_retries/test.py b/tests/integration/test_inserts_with_keeper_retries/test.py
index 3294d4ffa02..3937823a37b 100644
--- a/tests/integration/test_inserts_with_keeper_retries/test.py
+++ b/tests/integration/test_inserts_with_keeper_retries/test.py
@@ -3,7 +3,6 @@
 import pytest
 import time
 import threading
-import uuid
 from helpers.cluster import ClickHouseCluster
 from multiprocessing.dummy import Pool
 from helpers.network import PartitionManager
@@ -11,12 +10,8 @@ from helpers.client import QueryRuntimeException
 from helpers.test_tools import assert_eq_with_retry
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance(
-    "node1",
-    main_configs=["configs/storage_conf.xml"],
-    with_zookeeper=True,
-    with_minio=True,
-)
+
+node1 = cluster.add_instance("node1", with_zookeeper=True)
 
 
 @pytest.fixture(scope="module")
@@ -30,16 +25,10 @@ def started_cluster():
         cluster.shutdown()
 
 
-@pytest.mark.parametrize(
-    "engine,storage_policy",
-    [
-        ("ReplicatedMergeTree", "default"),
-    ],
-)
-def test_replica_inserts_with_keeper_restart(started_cluster, engine, storage_policy):
+def test_replica_inserts_with_keeper_restart(started_cluster):
     try:
         node1.query(
-            f"CREATE TABLE r (a UInt64, b String) ENGINE={engine}('/test/r', '0') ORDER BY tuple() SETTINGS storage_policy='{storage_policy}'"
+            "CREATE TABLE r (a UInt64, b String) ENGINE=ReplicatedMergeTree('/test/r', '0') ORDER BY tuple()"
         )
 
         p = Pool(1)
@@ -71,18 +60,10 @@ def test_replica_inserts_with_keeper_restart(started_cluster, engine, storage_po
         node1.query("DROP TABLE IF EXISTS r SYNC")
 
 
-@pytest.mark.parametrize(
-    "engine,storage_policy",
-    [
-        ("ReplicatedMergeTree", "default"),
-    ],
-)
-def test_replica_inserts_with_keeper_disconnect(
-    started_cluster, engine, storage_policy
-):
+def test_replica_inserts_with_keeper_disconnect(started_cluster):
     try:
         node1.query(
-            f"CREATE TABLE r2 (a UInt64, b String) ENGINE={engine}('/test/r2', '0') ORDER BY tuple() SETTINGS storage_policy='{storage_policy}'"
+            "CREATE TABLE r (a UInt64, b String) ENGINE=ReplicatedMergeTree('/test/r', '0') ORDER BY tuple()"
         )
 
         p = Pool(1)
@@ -103,32 +84,26 @@ def test_replica_inserts_with_keeper_disconnect(
         disconnect_event.wait(90)
 
         node1.query(
-            "INSERT INTO r2 SELECT number, toString(number) FROM numbers(10) SETTINGS insert_keeper_max_retries=20"
+            "INSERT INTO r SELECT number, toString(number) FROM numbers(10) SETTINGS insert_keeper_max_retries=20"
         )
         node1.query(
-            "INSERT INTO r2 SELECT number, toString(number) FROM numbers(10, 10) SETTINGS insert_keeper_max_retries=20"
+            "INSERT INTO r SELECT number, toString(number) FROM numbers(10, 10) SETTINGS insert_keeper_max_retries=20"
         )
 
         job.wait()
         p.close()
         p.join()
 
-        assert node1.query("SELECT COUNT() FROM r2") == "20\n"
+        assert node1.query("SELECT COUNT() FROM r") == "20\n"
 
     finally:
-        node1.query("DROP TABLE IF EXISTS r2 SYNC")
+        node1.query("DROP TABLE IF EXISTS r SYNC")
 
 
-@pytest.mark.parametrize(
-    "engine,storage_policy",
-    [
-        ("ReplicatedMergeTree", "default"),
-    ],
-)
-def test_query_timeout_with_zk_down(started_cluster, engine, storage_policy):
+def test_query_timeout_with_zk_down(started_cluster):
     try:
         node1.query(
-            f"CREATE TABLE zk_down (a UInt64, b String) ENGINE={engine}('/test/zk_down', '0') ORDER BY tuple() SETTINGS storage_policy='{storage_policy}'"
+            "CREATE TABLE zk_down (a UInt64, b String) ENGINE=ReplicatedMergeTree('/test/zk_down', '0') ORDER BY tuple()"
         )
 
         cluster.stop_zookeeper_nodes(["zoo1", "zoo2", "zoo3"])
@@ -143,45 +118,3 @@ def test_query_timeout_with_zk_down(started_cluster, engine, storage_policy):
     finally:
         cluster.start_zookeeper_nodes(["zoo1", "zoo2", "zoo3"])
         node1.query("DROP TABLE IF EXISTS zk_down SYNC")
-
-
-@pytest.mark.parametrize(
-    "engine,storage_policy",
-    [
-        ("ReplicatedMergeTree", "default"),
-    ],
-)
-def test_retries_should_not_wait_for_global_connection(
-    started_cluster, engine, storage_policy
-):
-    pm = PartitionManager()
-    try:
-        node1.query(
-            f"CREATE TABLE zk_down_retries (a UInt64, b String) ENGINE={engine}('/test/zk_down', '0') ORDER BY tuple() SETTINGS storage_policy='{storage_policy}'"
-        )
-
-        cluster.stop_zookeeper_nodes(["zoo1", "zoo2", "zoo3"])
-        # Apart from stopping keepers, we introduce a network delay to make connection retries slower
-        # We want to check that retries are not blocked during that time
-        pm.add_network_delay(node1, 1000)
-
-        query_id = uuid.uuid4()
-
-        with pytest.raises(QueryRuntimeException):
-            node1.query(
-                "INSERT INTO zk_down_retries SELECT number, toString(number) FROM numbers(10) SETTINGS insert_keeper_max_retries=10, insert_keeper_retry_max_backoff_ms=100",
-                query_id=str(query_id),
-            )
-        pm.heal_all()
-        # Use query_log for execution time since we want to ignore the network delay introduced (also in client)
-        node1.query("SYSTEM FLUSH LOGS")
-        res = node1.query(
-            f"SELECT query_duration_ms FROM system.query_log WHERE type != 'QueryStart' AND query_id = '{query_id}'"
-        )
-        query_duration = int(res)
-        # It should be around 1 second. 5 seconds is being generous (debug and so on). Used to take 35 seconds without the fix
-        assert query_duration < 5000
-    finally:
-        pm.heal_all()
-        cluster.start_zookeeper_nodes(["zoo1", "zoo2", "zoo3"])
-        node1.query("DROP TABLE IF EXISTS zk_down_retries SYNC")
diff --git a/tests/integration/test_jbod_ha/configs/config.d/storage_configuration.xml b/tests/integration/test_jbod_ha/configs/config.d/storage_configuration.xml
index fb9acc58ad6..b5c351d105b 100644
--- a/tests/integration/test_jbod_ha/configs/config.d/storage_configuration.xml
+++ b/tests/integration/test_jbod_ha/configs/config.d/storage_configuration.xml
@@ -1,4 +1,4 @@
-<clickhouse>
+<yandex>
     <local_disk_check_period_ms>1000</local_disk_check_period_ms>
     <storage_configuration>
         <disks>
@@ -27,4 +27,4 @@
             </jbod>
         </policies>
     </storage_configuration>
-</clickhouse>
+</yandex>
diff --git a/tests/integration/test_keeper_map/configs/keeper_retries.xml b/tests/integration/test_keeper_map/configs/keeper_retries.xml
deleted file mode 100644
index 43e5b9a09e8..00000000000
--- a/tests/integration/test_keeper_map/configs/keeper_retries.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<clickhouse>
-    <profiles>
-        <default>
-            <insert_keeper_max_retries>0</insert_keeper_max_retries>
-            <keeper_max_retries>0</keeper_max_retries>
-        </default>
-    </profiles>
-    <users>
-        <default>
-            <password></password>
-            <profile>default</profile>
-        </default>
-    </users>
-</clickhouse>
diff --git a/tests/integration/test_keeper_map/test.py b/tests/integration/test_keeper_map/test.py
index 861a7c47687..d7b4230d872 100644
--- a/tests/integration/test_keeper_map/test.py
+++ b/tests/integration/test_keeper_map/test.py
@@ -10,7 +10,6 @@ cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
     "node",
     main_configs=["configs/enable_keeper_map.xml"],
-    user_configs=["configs/keeper_retries.xml"],
     with_zookeeper=True,
     stay_alive=True,
 )
@@ -47,10 +46,7 @@ def assert_keeper_exception_after_partition(query):
     with PartitionManager() as pm:
         pm.drop_instance_zk_connections(node)
         try:
-            error = node.query_and_get_error_with_retry(
-                query,
-                sleep_time=1,
-            )
+            error = node.query_and_get_error_with_retry(query, sleep_time=1)
             assert "Coordination::Exception" in error
         except:
             print_iptables_rules()
@@ -67,7 +63,6 @@ def run_query(query):
 
 
 def test_keeper_map_without_zk(started_cluster):
-    run_query("DROP TABLE IF EXISTS test_keeper_map_without_zk SYNC")
     assert_keeper_exception_after_partition(
         "CREATE TABLE test_keeper_map_without_zk (key UInt64, value UInt64) ENGINE = KeeperMap('/test_keeper_map_without_zk') PRIMARY KEY(key);"
     )
@@ -89,8 +84,7 @@ def test_keeper_map_without_zk(started_cluster):
         node.restart_clickhouse(60)
         try:
             error = node.query_and_get_error_with_retry(
-                "SELECT * FROM test_keeper_map_without_zk",
-                sleep_time=1,
+                "SELECT * FROM test_keeper_map_without_zk", sleep_time=1
             )
             assert "Failed to activate table because of connection issues" in error
         except:
@@ -107,27 +101,6 @@ def test_keeper_map_without_zk(started_cluster):
     )
     assert "Failed to activate table because of invalid metadata in ZooKeeper" in error
 
+    node.query("DETACH TABLE test_keeper_map_without_zk")
+
     client.stop()
-
-
-def test_keeper_map_with_failed_drop(started_cluster):
-    run_query("DROP TABLE IF EXISTS test_keeper_map_with_failed_drop SYNC")
-    run_query("DROP TABLE IF EXISTS test_keeper_map_with_failed_drop_another SYNC")
-    run_query(
-        "CREATE TABLE test_keeper_map_with_failed_drop (key UInt64, value UInt64) ENGINE = KeeperMap('/test_keeper_map_with_failed_drop') PRIMARY KEY(key);"
-    )
-
-    run_query("INSERT INTO test_keeper_map_with_failed_drop VALUES (1, 11)")
-    run_query("SYSTEM ENABLE FAILPOINT keepermap_fail_drop_data")
-    node.query("DROP TABLE test_keeper_map_with_failed_drop SYNC")
-
-    zk_client = get_genuine_zk()
-    assert (
-        zk_client.get("/test_keeper_map/test_keeper_map_with_failed_drop/data")
-        is not None
-    )
-
-    run_query("SYSTEM DISABLE FAILPOINT keepermap_fail_drop_data")
-    run_query(
-        "CREATE TABLE test_keeper_map_with_failed_drop_another (key UInt64, value UInt64) ENGINE = KeeperMap('/test_keeper_map_with_failed_drop') PRIMARY KEY(key);"
-    )
diff --git a/tests/integration/test_keeper_map_retries/__init__.py b/tests/integration/test_keeper_map_retries/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/integration/test_keeper_map_retries/configs/enable_keeper_map.xml b/tests/integration/test_keeper_map_retries/configs/enable_keeper_map.xml
deleted file mode 100644
index b4cbb6a954b..00000000000
--- a/tests/integration/test_keeper_map_retries/configs/enable_keeper_map.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<clickhouse>
-    <keeper_map_path_prefix>/test_keeper_map</keeper_map_path_prefix>
-</clickhouse>
diff --git a/tests/integration/test_keeper_map_retries/configs/fault_injection.xml b/tests/integration/test_keeper_map_retries/configs/fault_injection.xml
deleted file mode 100644
index 8406b7db785..00000000000
--- a/tests/integration/test_keeper_map_retries/configs/fault_injection.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<clickhouse>
-    <zookeeper>
-        <enable_fault_injections_during_startup>1</enable_fault_injections_during_startup>
-        <send_fault_probability>0.005</send_fault_probability>
-        <recv_fault_probability>0.005</recv_fault_probability>
-    </zookeeper>
-</clickhouse>
diff --git a/tests/integration/test_keeper_map_retries/configs/keeper_retries.xml b/tests/integration/test_keeper_map_retries/configs/keeper_retries.xml
deleted file mode 100644
index 208dd6e47fa..00000000000
--- a/tests/integration/test_keeper_map_retries/configs/keeper_retries.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<clickhouse>
-    <profiles>
-        <default>
-            <keeper_max_retries>20</keeper_max_retries>
-            <keeper_retry_max_backoff_ms>10000</keeper_retry_max_backoff_ms>
-        </default>
-    </profiles>
-    <users>
-        <default>
-            <password></password>
-            <profile>default</profile>
-        </default>
-    </users>
-</clickhouse>
diff --git a/tests/integration/test_keeper_map_retries/test.py b/tests/integration/test_keeper_map_retries/test.py
deleted file mode 100644
index c6760e5d1a2..00000000000
--- a/tests/integration/test_keeper_map_retries/test.py
+++ /dev/null
@@ -1,75 +0,0 @@
-import pytest
-
-from helpers.cluster import ClickHouseCluster
-
-import os
-
-CONFIG_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "configs")
-
-cluster = ClickHouseCluster(__file__)
-
-node = cluster.add_instance(
-    "node",
-    main_configs=["configs/enable_keeper_map.xml"],
-    user_configs=["configs/keeper_retries.xml"],
-    with_zookeeper=True,
-    stay_alive=True,
-)
-
-
-def start_clean_clickhouse():
-    # remove fault injection if present
-    if "fault_injection.xml" in node.exec_in_container(
-        ["bash", "-c", "ls /etc/clickhouse-server/config.d"]
-    ):
-        print("Removing fault injection")
-        node.exec_in_container(
-            ["bash", "-c", "rm /etc/clickhouse-server/config.d/fault_injection.xml"]
-        )
-        node.restart_clickhouse()
-
-
-@pytest.fixture(scope="module")
-def started_cluster():
-    try:
-        cluster.start()
-        yield cluster
-
-    finally:
-        cluster.shutdown()
-
-
-def repeat_query(query, repeat):
-    for _ in range(repeat):
-        node.query(
-            query,
-        )
-
-
-def test_queries(started_cluster):
-    start_clean_clickhouse()
-
-    node.query("DROP TABLE IF EXISTS keeper_map_retries SYNC")
-    node.stop_clickhouse()
-    node.copy_file_to_container(
-        os.path.join(CONFIG_DIR, "fault_injection.xml"),
-        "/etc/clickhouse-server/config.d/fault_injection.xml",
-    )
-    node.start_clickhouse()
-
-    repeat_count = 10
-
-    node.query(
-        "CREATE TABLE keeper_map_retries (a UInt64, b UInt64) Engine=KeeperMap('/keeper_map_retries') PRIMARY KEY a",
-    )
-
-    repeat_query(
-        "INSERT INTO keeper_map_retries SELECT number, number FROM numbers(500)",
-        repeat_count,
-    )
-    repeat_query("SELECT * FROM keeper_map_retries", repeat_count)
-    repeat_query(
-        "ALTER TABLE keeper_map_retries UPDATE b = 3 WHERE a > 2", repeat_count
-    )
-    repeat_query("ALTER TABLE keeper_map_retries DELETE WHERE a > 2", repeat_count)
-    repeat_query("TRUNCATE keeper_map_retries", repeat_count)
diff --git a/tests/integration/test_keeper_memory_soft_limit/configs/keeper_config2.xml b/tests/integration/test_keeper_memory_soft_limit/configs/keeper_config2.xml
index e71b93379d0..25ececea3e8 100644
--- a/tests/integration/test_keeper_memory_soft_limit/configs/keeper_config2.xml
+++ b/tests/integration/test_keeper_memory_soft_limit/configs/keeper_config2.xml
@@ -16,7 +16,7 @@
             <value>az-zoo2</value>
             <enable_auto_detection_on_cloud>1</enable_auto_detection_on_cloud>
         </availability_zone>
-        <max_memory_usage_soft_limit>200000000</max_memory_usage_soft_limit>
+        <max_memory_usage_soft_limit>20000000</max_memory_usage_soft_limit>
 
         <coordination_settings>
             <operation_timeout_ms>10000</operation_timeout_ms>
diff --git a/tests/integration/test_keeper_memory_soft_limit/configs/keeper_config3.xml b/tests/integration/test_keeper_memory_soft_limit/configs/keeper_config3.xml
index cf4a4686f2c..81e343b77c9 100644
--- a/tests/integration/test_keeper_memory_soft_limit/configs/keeper_config3.xml
+++ b/tests/integration/test_keeper_memory_soft_limit/configs/keeper_config3.xml
@@ -13,7 +13,7 @@
         <tcp_port>2181</tcp_port>
         <server_id>3</server_id>
 
-        <max_memory_usage_soft_limit>200000000</max_memory_usage_soft_limit>
+        <max_memory_usage_soft_limit>20000000</max_memory_usage_soft_limit>
 
         <coordination_settings>
             <operation_timeout_ms>10000</operation_timeout_ms>
diff --git a/tests/integration/test_manipulate_statistics/test.py b/tests/integration/test_manipulate_statistics/test.py
index 3a1c5ad5b96..a602cce63df 100644
--- a/tests/integration/test_manipulate_statistics/test.py
+++ b/tests/integration/test_manipulate_statistics/test.py
@@ -6,17 +6,11 @@ from helpers.cluster import ClickHouseCluster
 cluster = ClickHouseCluster(__file__)
 
 node1 = cluster.add_instance(
-    "node1",
-    user_configs=["config/config.xml"],
-    with_zookeeper=True,
-    macros={"replica": "a", "shard": "shard1"},
+    "node1", user_configs=["config/config.xml"], with_zookeeper=True
 )
 
 node2 = cluster.add_instance(
-    "node2",
-    user_configs=["config/config.xml"],
-    with_zookeeper=True,
-    macros={"replica": "b", "shard": "shard1"},
+    "node2", user_configs=["config/config.xml"], with_zookeeper=True
 )
 
 
@@ -135,8 +129,8 @@ def test_single_node_normal(started_cluster):
 
 
 def test_replicated_table_ddl(started_cluster):
-    node1.query("DROP TABLE IF EXISTS test_stat SYNC")
-    node2.query("DROP TABLE IF EXISTS test_stat SYNC")
+    node1.query("DROP TABLE IF EXISTS test_stat")
+    node2.query("DROP TABLE IF EXISTS test_stat")
 
     node1.query(
         """
@@ -173,8 +167,7 @@ def test_replicated_table_ddl(started_cluster):
     check_stat_file_on_disk(node2, "test_stat", "all_0_0_0_1", "c", False)
     check_stat_file_on_disk(node2, "test_stat", "all_0_0_0_1", "d", True)
     node1.query(
-        "ALTER TABLE test_stat CLEAR STATISTICS d",
-        settings={"alter_sync": "2", "mutations_sync": 2},
+        "ALTER TABLE test_stat CLEAR STATISTICS d", settings={"alter_sync": "2"}
     )
     node1.query(
         "ALTER TABLE test_stat ADD STATISTICS b type tdigest",
@@ -184,24 +177,7 @@ def test_replicated_table_ddl(started_cluster):
     check_stat_file_on_disk(node2, "test_stat", "all_0_0_0_2", "b", False)
     check_stat_file_on_disk(node2, "test_stat", "all_0_0_0_2", "d", False)
     node1.query(
-        "ALTER TABLE test_stat MATERIALIZE STATISTICS b",
-        settings={"alter_sync": "2", "mutations_sync": 2},
+        "ALTER TABLE test_stat MATERIALIZE STATISTICS b", settings={"alter_sync": "2"}
     )
     check_stat_file_on_disk(node2, "test_stat", "all_0_0_0_3", "a", True)
     check_stat_file_on_disk(node2, "test_stat", "all_0_0_0_3", "b", True)
-
-
-def test_replicated_db(started_cluster):
-    node1.query("DROP DATABASE IF EXISTS test SYNC")
-    node2.query("DROP DATABASE IF EXISTS test SYNC")
-    node1.query(
-        "CREATE DATABASE test ENGINE = Replicated('/test/shared_stats', '{shard}', '{replica}')"
-    )
-    node2.query(
-        "CREATE DATABASE test ENGINE = Replicated('/test/shared_stats', '{shard}', '{replica}')"
-    )
-    node1.query(
-        "CREATE TABLE test.test_stats (a Int64, b Int64) ENGINE = ReplicatedMergeTree() ORDER BY()"
-    )
-    node2.query("ALTER TABLE test.test_stats MODIFY COLUMN b Float64")
-    node2.query("ALTER TABLE test.test_stats MODIFY STATISTICS b TYPE tdigest")
diff --git a/tests/integration/test_mask_sensitive_info/test.py b/tests/integration/test_mask_sensitive_info/test.py
index 8d5345082ff..6f6dc4d287f 100644
--- a/tests/integration/test_mask_sensitive_info/test.py
+++ b/tests/integration/test_mask_sensitive_info/test.py
@@ -202,10 +202,6 @@ def test_create_table():
         f"S3Queue('http://minio1:9001/root/data/', 'CSV', 'gzip') settings mode = 'ordered'",
         f"S3Queue('http://minio1:9001/root/data/', 'minio', '{password}', 'CSV') settings mode = 'ordered'",
         f"S3Queue('http://minio1:9001/root/data/', 'minio', '{password}', 'CSV', 'gzip') settings mode = 'ordered'",
-        (
-            f"Iceberg('http://minio1:9001/root/data/test11.csv.gz', 'minio', '{password}')",
-            "DNS_ERROR",
-        ),
     ]
 
     def make_test_case(i):
@@ -270,7 +266,6 @@ def test_create_table():
             # due to sensitive data substituion the query will be normalized, so not "settings" but "SETTINGS"
             "CREATE TABLE table19 (`x` int) ENGINE = S3Queue('http://minio1:9001/root/data/', 'minio', '[HIDDEN]', 'CSV') SETTINGS mode = 'ordered'",
             "CREATE TABLE table20 (`x` int) ENGINE = S3Queue('http://minio1:9001/root/data/', 'minio', '[HIDDEN]', 'CSV', 'gzip') SETTINGS mode = 'ordered'",
-            "CREATE TABLE table21 (`x` int) ENGINE = Iceberg('http://minio1:9001/root/data/test11.csv.gz', 'minio', '[HIDDEN]')",
         ],
         must_not_contain=[password],
     )
@@ -392,7 +387,6 @@ def test_table_functions():
         f"azureBlobStorageCluster('test_shard_localhost', '{azure_storage_account_url}', 'cont', 'test_simple_15.csv', '{azure_account_name}', '{azure_account_key}', 'CSV', 'none', 'auto')",
         f"azureBlobStorageCluster('test_shard_localhost', named_collection_2, connection_string = '{azure_conn_string}', container = 'cont', blob_path = 'test_simple_16.csv', format = 'CSV')",
         f"azureBlobStorageCluster('test_shard_localhost', named_collection_2, storage_account_url = '{azure_storage_account_url}', container = 'cont', blob_path = 'test_simple_17.csv', account_name = '{azure_account_name}', account_key = '{azure_account_key}')",
-        f"iceberg('http://minio1:9001/root/data/test11.csv.gz', 'minio', '{password}')",
     ]
 
     def make_test_case(i):
@@ -484,7 +478,6 @@ def test_table_functions():
             f"CREATE TABLE tablefunc48 (`x` int) AS azureBlobStorageCluster('test_shard_localhost', '{azure_storage_account_url}', 'cont', 'test_simple_15.csv', '{azure_account_name}', '[HIDDEN]', 'CSV', 'none', 'auto')",
             f"CREATE TABLE tablefunc49 (x int) AS azureBlobStorageCluster('test_shard_localhost', named_collection_2, connection_string = '{azure_conn_string}', container = 'cont', blob_path = 'test_simple_16.csv', format = 'CSV')",
             f"CREATE TABLE tablefunc50 (`x` int) AS azureBlobStorageCluster('test_shard_localhost', named_collection_2, storage_account_url = '{azure_storage_account_url}', container = 'cont', blob_path = 'test_simple_17.csv', account_name = '{azure_account_name}', account_key = '[HIDDEN]')",
-            "CREATE TABLE tablefunc51 (`x` int) AS iceberg('http://minio1:9001/root/data/test11.csv.gz', 'minio', '[HIDDEN]')",
         ],
         must_not_contain=[password],
     )
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 9a99f0c9aa8..86000799ae4 100644
--- a/tests/integration/test_materialized_mysql_database/materialized_with_ddl.py
+++ b/tests/integration/test_materialized_mysql_database/materialized_with_ddl.py
@@ -2353,7 +2353,7 @@ def table_overrides(clickhouse_node, mysql_node, service_name):
     )
     check_query(clickhouse_node, "SELECT count() FROM table_overrides.t1", "1001\n")
     show_db = clickhouse_node.query("SHOW CREATE DATABASE table_overrides")
-    assert "TABLE OVERRIDE t1\\n(\\n\\n)" in show_db, show_db
+    assert "TABLE OVERRIDE `t1`\\n(\\n\\n)" in show_db, show_db
 
     clickhouse_node.query("DROP DATABASE IF EXISTS table_overrides")
     mysql_node.query("DROP DATABASE IF EXISTS table_overrides")
diff --git a/tests/integration/test_memory_limit/test.py b/tests/integration/test_memory_limit/test.py
index db68a38c1b1..6d6745711da 100644
--- a/tests/integration/test_memory_limit/test.py
+++ b/tests/integration/test_memory_limit/test.py
@@ -13,6 +13,7 @@ node = cluster.add_instance(
         "configs/async_metrics_no.xml",
     ],
     mem_limit="4g",
+    env_variables={"MALLOC_CONF": "dirty_decay_ms:0"},
 )
 
 
diff --git a/tests/integration/test_named_collections_encrypted/__init__.py b/tests/integration/test_named_collections_encrypted/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/integration/test_named_collections_encrypted/configs/config.d/named_collections_encrypted.xml b/tests/integration/test_named_collections_encrypted/configs/config.d/named_collections_encrypted.xml
deleted file mode 100644
index 233e23846cb..00000000000
--- a/tests/integration/test_named_collections_encrypted/configs/config.d/named_collections_encrypted.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<clickhouse>
-  <named_collections_storage>
-    <type>local_encrypted</type>
-    <key_hex>bebec0cabebec0cabebec0cabebec0ca</key_hex>
-  </named_collections_storage>
-
-  <named_collections>
-    <collection1>
-      <key1>value1</key1>
-    </collection1>
-  </named_collections>
-</clickhouse>
diff --git a/tests/integration/test_named_collections_encrypted/configs/config.d/named_collections_with_zookeeper_encrypted.xml b/tests/integration/test_named_collections_encrypted/configs/config.d/named_collections_with_zookeeper_encrypted.xml
deleted file mode 100644
index d1dd5c29787..00000000000
--- a/tests/integration/test_named_collections_encrypted/configs/config.d/named_collections_with_zookeeper_encrypted.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<clickhouse>
-  <named_collections_storage>
-    <type>zookeeper_encrypted</type>
-    <key_hex>bebec0cabebec0cabebec0cabebec0ca</key_hex>
-    <path>/named_collections_path/</path>
-    <update_timeout_ms>5000</update_timeout_ms>
-  </named_collections_storage>
-
-  <named_collections>
-    <collection1>
-      <key1>value1</key1>
-    </collection1>
-  </named_collections>
-
-  <remote_servers>
-      <replicated_nc_nodes_cluster>
-          <shard>
-              <internal_replication>true</internal_replication>
-              <replica>
-                  <host>node_with_keeper</host>
-                  <port>9000</port>
-              </replica>
-              <replica>
-                  <host>node_with_keeper_2</host>
-                  <port>9000</port>
-              </replica>
-          </shard>
-          <allow_distributed_ddl_queries>true</allow_distributed_ddl_queries>
-      </replicated_nc_nodes_cluster>
-  </remote_servers>
-</clickhouse>
diff --git a/tests/integration/test_named_collections_encrypted/configs/users.d/users.xml b/tests/integration/test_named_collections_encrypted/configs/users.d/users.xml
deleted file mode 100644
index 7d4f0543ff1..00000000000
--- a/tests/integration/test_named_collections_encrypted/configs/users.d/users.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<clickhouse>
-    <profiles>
-        <default>
-            <ignore_on_cluster_for_replicated_named_collections_queries>0</ignore_on_cluster_for_replicated_named_collections_queries>
-        </default>
-    </profiles>
-    <users>
-        <default>
-            <password></password>
-            <profile>default</profile>
-            <quota>default</quota>
-            <named_collection_control>1</named_collection_control>
-            <show_named_collections>1</show_named_collections>
-            <show_named_collections_secrets>1</show_named_collections_secrets>
-        </default>
-    </users>
-</clickhouse>
diff --git a/tests/integration/test_named_collections_encrypted/test.py b/tests/integration/test_named_collections_encrypted/test.py
deleted file mode 100644
index 7dff32fa6c9..00000000000
--- a/tests/integration/test_named_collections_encrypted/test.py
+++ /dev/null
@@ -1,123 +0,0 @@
-import logging
-import pytest
-import os
-from helpers.cluster import ClickHouseCluster
-
-SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-NAMED_COLLECTIONS_CONFIG = os.path.join(
-    SCRIPT_DIR, "./configs/config.d/named_collections.xml"
-)
-
-ZK_PATH = "/named_collections_path"
-
-
-@pytest.fixture(scope="module")
-def cluster():
-    try:
-        cluster = ClickHouseCluster(__file__)
-        cluster.add_instance(
-            "node_encrypted",
-            main_configs=[
-                "configs/config.d/named_collections_encrypted.xml",
-            ],
-            user_configs=[
-                "configs/users.d/users.xml",
-            ],
-            stay_alive=True,
-        )
-        cluster.add_instance(
-            "node_with_keeper_encrypted",
-            main_configs=[
-                "configs/config.d/named_collections_with_zookeeper_encrypted.xml",
-            ],
-            user_configs=[
-                "configs/users.d/users.xml",
-            ],
-            stay_alive=True,
-            with_zookeeper=True,
-        )
-        cluster.add_instance(
-            "node_with_keeper_2_encrypted",
-            main_configs=[
-                "configs/config.d/named_collections_with_zookeeper_encrypted.xml",
-            ],
-            user_configs=[
-                "configs/users.d/users.xml",
-            ],
-            stay_alive=True,
-            with_zookeeper=True,
-        )
-
-        logging.info("Starting cluster...")
-        cluster.start()
-        logging.info("Cluster started")
-
-        yield cluster
-    finally:
-        cluster.shutdown()
-
-
-def check_encrypted_content(node, zk=None):
-    assert (
-        "collection1\ncollection2"
-        == node.query("select name from system.named_collections").strip()
-    )
-
-    assert (
-        "['key1','key2']"
-        == node.query(
-            "select mapKeys(collection) from system.named_collections where name = 'collection2'"
-        ).strip()
-    )
-
-    assert (
-        "1234\tvalue2"
-        == node.query(
-            "select collection['key1'], collection['key2'] from system.named_collections where name = 'collection2'"
-        ).strip()
-    )
-
-    # Check that the underlying storage is encrypted
-    content = (
-        zk.get(ZK_PATH + "/collection2.sql")[0]
-        if zk is not None
-        else open(
-            f"{node.path}/database/named_collections/collection2.sql", "rb"
-        ).read()
-    )
-
-    assert (
-        content[0:3] == b"ENC"
-    )  # file signature (aka magic number) of the encrypted file
-    assert b"key1" not in content
-    assert b"1234" not in content
-    assert b"key2" not in content
-    assert b"value2" not in content
-
-
-def test_local_storage_encrypted(cluster):
-    node = cluster.instances["node_encrypted"]
-    node.query("CREATE NAMED COLLECTION collection2 AS key1=1234, key2='value2'")
-
-    check_encrypted_content(node)
-    node.restart_clickhouse()
-    check_encrypted_content(node)
-
-    node.query("DROP NAMED COLLECTION collection2")
-
-
-def test_zookeper_storage_encrypted(cluster):
-    node1 = cluster.instances["node_with_keeper_encrypted"]
-    node2 = cluster.instances["node_with_keeper_2_encrypted"]
-    zk = cluster.get_kazoo_client("zoo1")
-
-    node1.query("CREATE NAMED COLLECTION collection2 AS key1=1234, key2='value2'")
-
-    check_encrypted_content(node1, zk)
-    check_encrypted_content(node2, zk)
-    node1.restart_clickhouse()
-    node2.restart_clickhouse()
-    check_encrypted_content(node1, zk)
-    check_encrypted_content(node2, zk)
-
-    node1.query("DROP NAMED COLLECTION collection2")
diff --git a/tests/integration/test_odbc_interaction/test.py b/tests/integration/test_odbc_interaction/test.py
index 9d4ca5ad49f..0d0d7a0afb1 100644
--- a/tests/integration/test_odbc_interaction/test.py
+++ b/tests/integration/test_odbc_interaction/test.py
@@ -51,9 +51,9 @@ create_table_sql_nullable_template = """
     """
 
 
-def skip_test_sanitizers(instance):
-    if instance.is_built_with_sanitizer():
-        pytest.skip("Sanitizers cannot work with third-party shared libraries")
+def skip_test_msan(instance):
+    if instance.is_built_with_memory_sanitizer():
+        pytest.skip("Memory Sanitizer cannot work with third-party shared libraries")
 
 
 def get_mysql_conn():
@@ -208,7 +208,7 @@ def started_cluster():
 
 
 def test_mysql_odbc_select_nullable(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
     mysql_setup = node1.odbc_drivers["MySQL"]
 
     table_name = "test_insert_nullable_select"
@@ -248,7 +248,7 @@ def test_mysql_odbc_select_nullable(started_cluster):
 
 
 def test_mysql_simple_select_works(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     mysql_setup = node1.odbc_drivers["MySQL"]
 
@@ -331,7 +331,7 @@ CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32, column_x Nulla
 
 
 def test_mysql_insert(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     mysql_setup = node1.odbc_drivers["MySQL"]
     table_name = "test_insert"
@@ -374,7 +374,7 @@ def test_mysql_insert(started_cluster):
 
 
 def test_sqlite_simple_select_function_works(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     sqlite_setup = node1.odbc_drivers["SQLite3"]
     sqlite_db = sqlite_setup["Database"]
@@ -438,7 +438,7 @@ def test_sqlite_simple_select_function_works(started_cluster):
 
 
 def test_sqlite_table_function(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     sqlite_setup = node1.odbc_drivers["SQLite3"]
     sqlite_db = sqlite_setup["Database"]
@@ -470,7 +470,7 @@ def test_sqlite_table_function(started_cluster):
 
 
 def test_sqlite_simple_select_storage_works(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     sqlite_setup = node1.odbc_drivers["SQLite3"]
     sqlite_db = sqlite_setup["Database"]
@@ -503,7 +503,7 @@ def test_sqlite_simple_select_storage_works(started_cluster):
 
 
 def test_sqlite_odbc_hashed_dictionary(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     sqlite_db = node1.odbc_drivers["SQLite3"]["Database"]
     node1.exec_in_container(
@@ -586,7 +586,7 @@ def test_sqlite_odbc_hashed_dictionary(started_cluster):
 
 
 def test_sqlite_odbc_cached_dictionary(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     sqlite_db = node1.odbc_drivers["SQLite3"]["Database"]
     node1.exec_in_container(
@@ -635,7 +635,7 @@ def test_sqlite_odbc_cached_dictionary(started_cluster):
 
 
 def test_postgres_odbc_hashed_dictionary_with_schema(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     try:
         conn = get_postgres_conn(started_cluster)
@@ -663,7 +663,7 @@ def test_postgres_odbc_hashed_dictionary_with_schema(started_cluster):
 
 
 def test_postgres_odbc_hashed_dictionary_no_tty_pipe_overflow(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     try:
         conn = get_postgres_conn(started_cluster)
@@ -685,7 +685,7 @@ def test_postgres_odbc_hashed_dictionary_no_tty_pipe_overflow(started_cluster):
 
 
 def test_no_connection_pooling(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     try:
         conn = get_postgres_conn(started_cluster)
@@ -717,7 +717,7 @@ def test_no_connection_pooling(started_cluster):
 
 
 def test_postgres_insert(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     conn = get_postgres_conn(started_cluster)
 
@@ -754,7 +754,7 @@ def test_postgres_insert(started_cluster):
 
 
 def test_odbc_postgres_date_data_type(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     try:
         conn = get_postgres_conn(started_cluster)
@@ -783,7 +783,7 @@ def test_odbc_postgres_date_data_type(started_cluster):
 
 
 def test_odbc_postgres_conversions(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     try:
         conn = get_postgres_conn(started_cluster)
@@ -841,7 +841,7 @@ def test_odbc_postgres_conversions(started_cluster):
 
 
 def test_odbc_cyrillic_with_varchar(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     conn = get_postgres_conn(started_cluster)
     cursor = conn.cursor()
@@ -868,7 +868,7 @@ def test_odbc_cyrillic_with_varchar(started_cluster):
 
 
 def test_many_connections(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     conn = get_postgres_conn(started_cluster)
     cursor = conn.cursor()
@@ -894,7 +894,7 @@ def test_many_connections(started_cluster):
 
 
 def test_concurrent_queries(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     conn = get_postgres_conn(started_cluster)
     cursor = conn.cursor()
@@ -948,7 +948,7 @@ def test_concurrent_queries(started_cluster):
 
 
 def test_odbc_long_column_names(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     conn = get_postgres_conn(started_cluster)
     cursor = conn.cursor()
@@ -986,7 +986,7 @@ def test_odbc_long_column_names(started_cluster):
 
 
 def test_odbc_long_text(started_cluster):
-    skip_test_sanitizers(node1)
+    skip_test_msan(node1)
 
     conn = get_postgres_conn(started_cluster)
     cursor = conn.cursor()
diff --git a/tests/integration/test_parallel_replicas_failover/test.py b/tests/integration/test_parallel_replicas_failover/test.py
index 2da26ee03c9..bf25136bff7 100644
--- a/tests/integration/test_parallel_replicas_failover/test.py
+++ b/tests/integration/test_parallel_replicas_failover/test.py
@@ -1,5 +1,5 @@
 import pytest
-import uuid
+
 from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
@@ -25,15 +25,19 @@ def start_cluster():
 
 
 def create_tables(cluster, table_name, skip_last_replica):
+    node1.query(f"DROP TABLE IF EXISTS {table_name} SYNC")
+    node2.query(f"DROP TABLE IF EXISTS {table_name} SYNC")
+    node3.query(f"DROP TABLE IF EXISTS {table_name} SYNC")
+
     node1.query(
-        f"CREATE TABLE {table_name} (key Int64, value String) Engine=ReplicatedMergeTree('/test_parallel_replicas/shard1/{table_name}', 'r1') ORDER BY (key)"
+        f"CREATE TABLE IF NOT EXISTS {table_name} (key Int64, value String) Engine=ReplicatedMergeTree('/test_parallel_replicas/shard1/{table_name}', 'r1') ORDER BY (key)"
     )
     node2.query(
-        f"CREATE TABLE {table_name} (key Int64, value String) Engine=ReplicatedMergeTree('/test_parallel_replicas/shard1/{table_name}', 'r2') ORDER BY (key)"
+        f"CREATE TABLE IF NOT EXISTS {table_name} (key Int64, value String) Engine=ReplicatedMergeTree('/test_parallel_replicas/shard1/{table_name}', 'r2') ORDER BY (key)"
     )
     if not skip_last_replica:
         node3.query(
-            f"CREATE TABLE {table_name} (key Int64, value String) Engine=ReplicatedMergeTree('/test_parallel_replicas/shard1/{table_name}', 'r3') ORDER BY (key)"
+            f"CREATE TABLE IF NOT EXISTS {table_name} (key Int64, value String) Engine=ReplicatedMergeTree('/test_parallel_replicas/shard1/{table_name}', 'r3') ORDER BY (key)"
         )
 
     # populate data
@@ -63,7 +67,7 @@ def test_skip_replicas_without_table(start_cluster):
     for i in range(4):
         expected_result += f"{i}\t1000\n"
 
-    log_comment = uuid.uuid4()
+    log_comment = "5230b069-9574-407d-9b80-891b5a175f41"
     assert (
         node1.query(
             f"SELECT key, count() FROM {table_name} GROUP BY key ORDER BY key",
@@ -84,8 +88,6 @@ def test_skip_replicas_without_table(start_cluster):
         )
         == "1\t1\n"
     )
-    node1.query(f"DROP TABLE {table_name} SYNC")
-    node2.query(f"DROP TABLE {table_name} SYNC")
 
 
 def test_skip_unresponsive_replicas(start_cluster):
@@ -110,6 +112,3 @@ def test_skip_unresponsive_replicas(start_cluster):
         )
         == expected_result
     )
-    node1.query(f"DROP TABLE {table_name} SYNC")
-    node2.query(f"DROP TABLE {table_name} SYNC")
-    node3.query(f"DROP TABLE {table_name} SYNC")
diff --git a/tests/integration/test_parallel_replicas_invisible_parts/test.py b/tests/integration/test_parallel_replicas_invisible_parts/test.py
index 7093e3b3292..cab3fb46fe9 100644
--- a/tests/integration/test_parallel_replicas_invisible_parts/test.py
+++ b/tests/integration/test_parallel_replicas_invisible_parts/test.py
@@ -35,10 +35,11 @@ def start_cluster():
 
 
 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 {table_name} ON CLUSTER '{cluster_name}' (key Int64, value String)
+        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
@@ -127,4 +128,3 @@ def test_reading_with_invisible_parts(
         )
         == f"{expected}\n"
     )
-    nodes[0].query(f"DROP TABLE {table_name} ON CLUSTER {cluster_name} SYNC")
diff --git a/tests/integration/test_parallel_replicas_no_replicas/test.py b/tests/integration/test_parallel_replicas_no_replicas/test.py
index 5ae4cc7d882..9f716459643 100644
--- a/tests/integration/test_parallel_replicas_no_replicas/test.py
+++ b/tests/integration/test_parallel_replicas_no_replicas/test.py
@@ -33,10 +33,7 @@ def create_tables(cluster, table_name):
 
 
 @pytest.mark.parametrize("skip_unavailable_shards", [1, 0])
-@pytest.mark.parametrize("max_parallel_replicas", [2, 3, 100])
-def test_skip_all_replicas(
-    start_cluster, skip_unavailable_shards, max_parallel_replicas
-):
+def test_skip_all_replicas(start_cluster, skip_unavailable_shards):
     cluster_name = "test_1_shard_3_unavaliable_replicas"
     table_name = "tt"
     create_tables(cluster_name, table_name)
@@ -46,9 +43,8 @@ def test_skip_all_replicas(
             f"SELECT key, count() FROM {table_name}  GROUP BY key ORDER BY key",
             settings={
                 "allow_experimental_parallel_reading_from_replicas": 2,
-                "max_parallel_replicas": max_parallel_replicas,
+                "max_parallel_replicas": 3,
                 "cluster_for_parallel_replicas": cluster_name,
                 "skip_unavailable_shards": skip_unavailable_shards,
-                "parallel_replicas_local_plan": 0,
             },
         )
diff --git a/tests/integration/test_parquet_page_index/__init__.py b/tests/integration/test_parquet_page_index/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/integration/test_parquet_page_index/test.py b/tests/integration/test_parquet_page_index/test.py
deleted file mode 100644
index 778b6618a61..00000000000
--- a/tests/integration/test_parquet_page_index/test.py
+++ /dev/null
@@ -1,108 +0,0 @@
-import pytest
-from helpers.cluster import ClickHouseCluster
-import pyarrow.parquet as pq
-import os
-import time
-
-cluster = ClickHouseCluster(__file__)
-path_to_userfiles = "/var/lib/clickhouse/user_files/"
-node = cluster.add_instance("node", external_dirs=[path_to_userfiles])
-
-
-@pytest.fixture(scope="module")
-def start_cluster():
-    try:
-        cluster.start()
-        yield cluster
-    finally:
-        cluster.shutdown()
-
-
-def check_page_index(file_path):
-    metadata = pq.read_metadata(file_path)
-    assert (
-        metadata
-    ), "pyarrow.parquet library can't read parquet file written by Clickhouse"
-    return metadata.row_group(0).column(0).has_offset_index
-
-
-def delete_if_exists(file_path):
-    if os.path.exists(file_path):
-        os.remove(file_path)
-
-
-@pytest.mark.parametrize(
-    "query, expected_result",
-    {
-        (
-            "SELECT number, number+1 FROM system.numbers LIMIT 100 "
-            "INTO OUTFILE '{file_name}' FORMAT Parquet "
-            "SETTINGS output_format_parquet_use_custom_encoder = false, "
-            "output_format_parquet_write_page_index = true;",
-            True,
-        ),
-        (
-            "SELECT number, number+1 FROM system.numbers LIMIT 100 "
-            "INTO OUTFILE '{file_name}' FORMAT Parquet "
-            "SETTINGS output_format_parquet_use_custom_encoder = false, "
-            "output_format_parquet_write_page_index = false;",
-            False,
-        ),
-        # # default settings:
-        # # output_format_parquet_use_custom_encoder = true
-        (
-            "SELECT number, number+1 FROM system.numbers LIMIT 100 "
-            "INTO OUTFILE '{file_name}' FORMAT Parquet;",
-            False,
-        ),
-    },
-)
-def test_parquet_page_index_select_into_outfile(query, expected_result, start_cluster):
-    file_name = f"export{time.time()}.parquet"
-    query = query.format(file_name=file_name)
-    delete_if_exists(file_name)
-    assert node.query(query) == ""
-    assert (
-        check_page_index(file_name) == expected_result
-    ), "Page offset index have wrong value"
-    delete_if_exists(file_name)
-
-
-@pytest.mark.parametrize(
-    "query, expected_result",
-    {
-        (
-            "INSERT INTO TABLE FUNCTION file('{file_name}') "
-            "SELECT number, number+1 FROM system.numbers LIMIT 100 "
-            "SETTINGS output_format_parquet_use_custom_encoder=false, "
-            "output_format_parquet_write_page_index=true FORMAT Parquet",
-            True,
-        ),
-        (
-            "INSERT INTO TABLE FUNCTION file('{file_name}') "
-            "SELECT number, number+1 FROM system.numbers LIMIT 100 "
-            "SETTINGS output_format_parquet_use_custom_encoder=false, "
-            "output_format_parquet_write_page_index=false FORMAT Parquet",
-            False,
-        ),
-        # # default settings:
-        # # output_format_parquet_use_custom_encoder = true
-        (
-            "INSERT INTO TABLE FUNCTION file('{file_name}') "
-            "SELECT number, number+1 FROM system.numbers LIMIT 100 FORMAT Parquet",
-            False,
-        ),
-    },
-)
-def test_parquet_page_index_insert_into_table_function_file(
-    query, expected_result, start_cluster
-):
-    file_name = f"export{time.time()}.parquet"
-    query = query.format(file_name=file_name)
-    file_path = f"{cluster.instances_dir}{path_to_userfiles}{file_name}"
-    delete_if_exists(file_path)
-    assert node.query(query) == ""
-    assert (
-        check_page_index(file_path) == expected_result
-    ), "Page offset index have wrong value"
-    delete_if_exists(file_path)
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 0a364d7802b..5e04c9e4d12 100644
--- a/tests/integration/test_postgresql_replica_database_engine_2/test.py
+++ b/tests/integration/test_postgresql_replica_database_engine_2/test.py
@@ -1,6 +1,5 @@
 import pytest
 
-import uuid
 import time
 import psycopg2
 import os.path as p
@@ -60,6 +59,7 @@ instance2 = cluster.add_instance(
 pg_manager = PostgresManager()
 pg_manager2 = PostgresManager()
 pg_manager_instance2 = PostgresManager()
+pg_manager3 = PostgresManager()
 
 
 @pytest.fixture(scope="module")
@@ -82,6 +82,12 @@ def started_cluster():
         pg_manager2.init(
             instance2, cluster.postgres_ip, cluster.postgres_port, "postgres_database2"
         )
+        pg_manager3.init(
+            instance,
+            cluster.postgres_ip,
+            cluster.postgres_port,
+            default_database="postgres-postgres",
+        )
 
         yield cluster
 
@@ -648,7 +654,7 @@ def test_table_override(started_cluster):
         instance.query(f"SELECT count() FROM {materialized_database}.{table_name}")
     )
 
-    expected = "CREATE TABLE test_database.table_override\\n(\\n    `key` Int32,\\n    `value` String,\\n    `_sign` Int8 MATERIALIZED 1,\\n    `_version` UInt64 MATERIALIZED 1\\n)\\nENGINE = ReplacingMergeTree(_version)\\nPARTITION BY key\\nORDER BY tuple(key)"
+    expected = "CREATE TABLE test_database.table_override\\n(\\n    `key` Int32,\\n    `value` String,\\n    `_sign` Int8() MATERIALIZED 1,\\n    `_version` UInt64() MATERIALIZED 1\\n)\\nENGINE = ReplacingMergeTree(_version)\\nPARTITION BY key\\nORDER BY tuple(key)"
     assert (
         expected
         == instance.query(
@@ -918,27 +924,16 @@ def test_failed_load_from_snapshot(started_cluster):
 
 
 def test_symbols_in_publication_name(started_cluster):
-    id = uuid.uuid4()
-    db = f"test_{id}"
-    table = f"test_symbols_in_publication_name"
-
-    pg_manager3 = PostgresManager()
-    pg_manager3.init(
-        instance,
-        cluster.postgres_ip,
-        cluster.postgres_port,
-        default_database=db,
-    )
+    table = "test_symbols_in_publication_name"
 
     pg_manager3.create_postgres_table(table)
     instance.query(
-        f"INSERT INTO `{db}`.`{table}` SELECT number, number from numbers(0, 50)"
+        f"INSERT INTO `{pg_manager3.get_default_database()}`.`{table}` SELECT number, number from numbers(0, 50)"
     )
 
     pg_manager3.create_materialized_db(
         ip=started_cluster.postgres_ip,
         port=started_cluster.postgres_port,
-        materialized_database=db,
         settings=[
             f"materialized_postgresql_tables_list = '{table}'",
             "materialized_postgresql_backoff_min_ms = 100",
@@ -946,10 +941,8 @@ def test_symbols_in_publication_name(started_cluster):
         ],
     )
     check_tables_are_synchronized(
-        instance, table, materialized_database=db, postgres_database=db
+        instance, table, postgres_database=pg_manager3.get_default_database()
     )
-    pg_manager3.drop_materialized_db(db)
-    pg_manager3.execute(f'drop table "{table}"')
 
 
 def test_generated_columns(started_cluster):
@@ -960,14 +953,12 @@ def test_generated_columns(started_cluster):
         "",
         f"""CREATE TABLE {table} (
              key integer PRIMARY KEY,
-             x integer DEFAULT 0,
-             temp integer DEFAULT 0,
+             x integer,
              y integer GENERATED ALWAYS AS (x*2) STORED,
-             z text DEFAULT 'z');
+             z text);
          """,
     )
 
-    pg_manager.execute(f"alter table {table} drop column temp;")
     pg_manager.execute(f"insert into {table} (key, x, z) values (1,1,'1');")
     pg_manager.execute(f"insert into {table} (key, x, z) values (2,2,'2');")
 
@@ -1000,44 +991,6 @@ def test_generated_columns(started_cluster):
     )
 
 
-def test_generated_columns_with_sequence(started_cluster):
-    table = "test_generated_columns_with_sequence"
-
-    pg_manager.create_postgres_table(
-        table,
-        "",
-        f"""CREATE TABLE {table} (
-             key integer PRIMARY KEY,
-             x integer,
-             y integer GENERATED ALWAYS AS (x*2) STORED,
-             z text);
-         """,
-    )
-
-    pg_manager.execute(
-        f"create sequence {table}_id_seq increment by 1 minvalue 1 start 1;"
-    )
-    pg_manager.execute(
-        f"alter table {table} alter key set default nextval('{table}_id_seq');"
-    )
-    pg_manager.execute(f"insert into {table} (key, x, z) values (1,1,'1');")
-    pg_manager.execute(f"insert into {table} (key, x, z) values (2,2,'2');")
-
-    pg_manager.create_materialized_db(
-        ip=started_cluster.postgres_ip,
-        port=started_cluster.postgres_port,
-        settings=[
-            f"materialized_postgresql_tables_list = '{table}'",
-            "materialized_postgresql_backoff_min_ms = 100",
-            "materialized_postgresql_backoff_max_ms = 100",
-        ],
-    )
-
-    check_tables_are_synchronized(
-        instance, table, postgres_database=pg_manager.get_default_database()
-    )
-
-
 def test_default_columns(started_cluster):
     table = "test_default_columns"
 
@@ -1134,13 +1087,9 @@ def test_dependent_loading(started_cluster):
     nested_time = instance.query(
         f"SELECT event_time_microseconds FROM system.text_log WHERE message like 'Loading table default.{uuid}_nested' and message not like '%like%'"
     ).strip()
-    time = (
-        instance.query(
-            f"SELECT event_time_microseconds FROM system.text_log WHERE message like 'Loading table default.{table}' and message not like '%like%'"
-        )
-        .strip()
-        .split("\n")[-1]
-    )
+    time = instance.query(
+        f"SELECT event_time_microseconds FROM system.text_log WHERE message like 'Loading table default.{table}' and message not like '%like%'"
+    ).strip()
     instance.query(
         f"SELECT toDateTime64('{nested_time}', 6) < toDateTime64('{time}', 6)"
     )
diff --git a/tests/integration/test_prometheus_protocols/__init__.py b/tests/integration/test_prometheus_protocols/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/integration/test_prometheus_protocols/configs/allow_experimental_time_series_table.xml b/tests/integration/test_prometheus_protocols/configs/allow_experimental_time_series_table.xml
deleted file mode 100644
index d71cfcaf2c8..00000000000
--- a/tests/integration/test_prometheus_protocols/configs/allow_experimental_time_series_table.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<clickhouse>
-    <profiles>
-        <default>
-            <allow_experimental_time_series_table>1</allow_experimental_time_series_table>
-        </default>
-    </profiles>
-</clickhouse>
diff --git a/tests/integration/test_prometheus_protocols/configs/prometheus.xml b/tests/integration/test_prometheus_protocols/configs/prometheus.xml
deleted file mode 100644
index 071a29620cf..00000000000
--- a/tests/integration/test_prometheus_protocols/configs/prometheus.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<clickhouse>
-    <prometheus>
-        <port>9092</port>
-        <handlers>
-            <my_rule_1>
-                <url>/write</url>
-                <handler>
-                    <type>remote_write</type>
-                    <table>default.prometheus</table>
-                </handler>
-            </my_rule_1>
-            <my_rule_2>
-                <url>/read</url>
-                <handler>
-                    <type>remote_read</type>
-                    <table>default.prometheus</table>
-                </handler>
-            </my_rule_2>
-        </handlers>
-    </prometheus>
-</clickhouse>
diff --git a/tests/integration/test_prometheus_protocols/test.py b/tests/integration/test_prometheus_protocols/test.py
deleted file mode 100644
index 0c75a8194c7..00000000000
--- a/tests/integration/test_prometheus_protocols/test.py
+++ /dev/null
@@ -1,177 +0,0 @@
-import pytest
-import time
-import requests
-from http import HTTPStatus
-from helpers.cluster import ClickHouseCluster
-
-cluster = ClickHouseCluster(__file__)
-
-node = cluster.add_instance(
-    "node",
-    main_configs=["configs/prometheus.xml"],
-    user_configs=["configs/allow_experimental_time_series_table.xml"],
-    with_prometheus=True,
-    handle_prometheus_remote_write=True,
-    handle_prometheus_remote_read=True,
-)
-
-
-def execute_query_on_prometheus_writer(query, timestamp):
-    return execute_query_impl(
-        cluster.get_instance_ip(cluster.prometheus_writer_host),
-        cluster.prometheus_writer_port,
-        "/api/v1/query",
-        query,
-        timestamp,
-    )
-
-
-def execute_query_on_prometheus_reader(query, timestamp):
-    return execute_query_impl(
-        cluster.get_instance_ip(cluster.prometheus_reader_host),
-        cluster.prometheus_reader_port,
-        "/api/v1/query",
-        query,
-        timestamp,
-    )
-
-
-def execute_query_impl(host, port, path, query, timestamp):
-    if not path.startswith("/"):
-        path += "/"
-    url = f"http://{host}:{port}/{path.strip('/')}?query={query}&time={timestamp}"
-    print(f"Requesting {url}")
-    r = requests.get(url)
-    print(f"Status code: {r.status_code} {HTTPStatus(r.status_code).phrase}")
-    if r.status_code != requests.codes.ok:
-        print(f"Response: {r.text}")
-        raise Exception(f"Got unexpected status code {r.status_code}")
-    return r.json()
-
-
-def show_query_result(query):
-    evaluation_time = time.time()
-    print(f"Evaluating query: {query}")
-    print(f"Evaluation time: {evaluation_time}")
-    result_from_writer = execute_query_on_prometheus_writer(query, evaluation_time)
-    print(f"Result from prometheus_writer: {result_from_writer}")
-    result_from_reader = execute_query_on_prometheus_reader(query, evaluation_time)
-    print(f"Result from prometheus_reader: {result_from_reader}")
-
-
-def compare_query(query):
-    timeout = 60
-    start_time = time.time()
-    evaluation_time = start_time
-    print(f"Evaluating query: {query}")
-    print(f"Evaluation time: {evaluation_time}")
-    while time.time() < start_time + timeout:
-        result_from_writer = execute_query_on_prometheus_writer(query, evaluation_time)
-        time.sleep(1)
-        result_from_reader = execute_query_on_prometheus_reader(query, evaluation_time)
-        print(f"Result from prometheus_writer: {result_from_writer}")
-        print(f"Result from prometheus_reader: {result_from_reader}")
-        if result_from_writer == result_from_reader:
-            return
-    raise Exception(
-        f"Got different results from prometheus_writer and prometheus_reader"
-    )
-
-
-def compare_queries():
-    compare_query("up")
-
-
-@pytest.fixture(scope="module", autouse=True)
-def start_cluster():
-    try:
-        cluster.start()
-        yield cluster
-    finally:
-        cluster.shutdown()
-
-
-@pytest.fixture(autouse=True)
-def cleanup_after_test():
-    try:
-        yield
-    finally:
-        node.query("DROP TABLE IF EXISTS prometheus SYNC")
-        node.query("DROP TABLE IF EXISTS original SYNC")
-        node.query("DROP TABLE IF EXISTS mydata SYNC")
-        node.query("DROP TABLE IF EXISTS mytable SYNC")
-        node.query("DROP TABLE IF EXISTS mymetrics SYNC")
-
-
-def test_default():
-    node.query("CREATE TABLE prometheus ENGINE=TimeSeries")
-    compare_queries()
-
-
-def test_tags_to_columns():
-    node.query(
-        "CREATE TABLE prometheus ENGINE=TimeSeries SETTINGS tags_to_columns = {'job': 'job', 'instance': 'instance'}"
-    )
-    compare_queries()
-
-
-def test_64bit_id():
-    node.query("CREATE TABLE prometheus (id UInt64) ENGINE=TimeSeries")
-    compare_queries()
-
-
-def test_custom_id_algorithm():
-    node.query(
-        "CREATE TABLE prometheus (id FixedString(16) DEFAULT murmurHash3_128(metric_name, all_tags)) ENGINE=TimeSeries"
-    )
-    compare_queries()
-
-
-def test_create_as_table():
-    node.query("CREATE TABLE original ENGINE=TimeSeries")
-    node.query("CREATE TABLE prometheus AS original")
-    compare_queries()
-
-
-def test_inner_engines():
-    node.query(
-        "CREATE TABLE prometheus ENGINE=TimeSeries "
-        "DATA ENGINE=MergeTree ORDER BY (id, timestamp) "
-        "TAGS ENGINE=AggregatingMergeTree ORDER BY (metric_name, id) "
-        "METRICS ENGINE=ReplacingMergeTree ORDER BY metric_family_name"
-    )
-    compare_queries()
-
-
-def test_external_tables():
-    node.query("DROP TABLE IF EXISTS mydata")
-    node.query("DROP TABLE IF EXISTS mytags")
-    node.query("DROP TABLE IF EXISTS mymetrics")
-    node.query("DROP TABLE IF EXISTS prometheus")
-
-    node.query(
-        "CREATE TABLE mydata (id UUID, timestamp DateTime64(3), value Float64) "
-        "ENGINE=MergeTree ORDER BY (id, timestamp)"
-    )
-    node.query(
-        "CREATE TABLE mytags ("
-        "id UUID, "
-        "metric_name LowCardinality(String), "
-        "tags Map(LowCardinality(String), String), "
-        "min_time SimpleAggregateFunction(min, Nullable(DateTime64(3))), "
-        "max_time SimpleAggregateFunction(max, Nullable(DateTime64(3)))) "
-        "ENGINE=AggregatingMergeTree ORDER BY (metric_name, id)"
-    )
-
-    # FIXME: The table structure should be:
-    # "CREATE TABLE mymetrics (metric_family_name String, type LowCardinality(String), unit LowCardinality(String), help String)"
-    # Renamed it because of the bug and potential type mismatch.
-    node.query(
-        "CREATE TABLE mymetrics (metric_family_name String, type String, unit String, help String) "
-        "ENGINE=ReplacingMergeTree ORDER BY metric_family_name"
-    )
-    node.query(
-        "CREATE TABLE prometheus ENGINE=TimeSeries "
-        "DATA mydata TAGS mytags METRICS mymetrics"
-    )
-    compare_queries()
diff --git a/tests/integration/test_recovery_time_metric/__init__.py b/tests/integration/test_recovery_time_metric/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/integration/test_recovery_time_metric/configs/config.xml b/tests/integration/test_recovery_time_metric/configs/config.xml
deleted file mode 100644
index bad9b1fa9ea..00000000000
--- a/tests/integration/test_recovery_time_metric/configs/config.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<clickhouse>
-    <tcp_port>9000</tcp_port>
-
-    <profiles>
-        <default>
-        </default>
-    </profiles>
-
-    <users>
-        <default>
-            <profile>default</profile>
-            <no_password></no_password>
-        </default>
-    </users>
-
-    <keeper_server>
-        <tcp_port>2181</tcp_port>
-        <server_id>1</server_id>
-        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
-        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
-        <coordination_settings>
-            <session_timeout_ms>20000</session_timeout_ms>
-        </coordination_settings>
-        <raft_configuration>
-            <server>
-                <id>1</id>
-                <hostname>localhost</hostname>
-                <port>9444</port>
-            </server>
-        </raft_configuration>
-    </keeper_server>
-
-    <zookeeper>
-        <node index="1">
-            <host>localhost</host>
-            <port>2181</port>
-        </node>
-        <session_timeout_ms>20000</session_timeout_ms>
-    </zookeeper>
-
-</clickhouse>
diff --git a/tests/integration/test_recovery_time_metric/test.py b/tests/integration/test_recovery_time_metric/test.py
deleted file mode 100644
index 6fcf2fad423..00000000000
--- a/tests/integration/test_recovery_time_metric/test.py
+++ /dev/null
@@ -1,61 +0,0 @@
-import pytest
-from helpers.cluster import ClickHouseCluster
-
-cluster = ClickHouseCluster(__file__)
-node = cluster.add_instance(
-    "node",
-    main_configs=["configs/config.xml"],
-    stay_alive=True,
-)
-
-
-@pytest.fixture(scope="module")
-def start_cluster():
-    try:
-        cluster.start()
-        yield cluster
-    finally:
-        cluster.shutdown()
-
-
-def test_recovery_time_metric(start_cluster):
-    node.query(
-        """
-        DROP DATABASE IF EXISTS rdb;
-        CREATE DATABASE rdb
-        ENGINE = Replicated('/test/test_recovery_time_metric', 'shard1', 'replica1')
-        """
-    )
-
-    node.query(
-        """
-        DROP TABLE IF EXISTS rdb.t;
-        CREATE TABLE rdb.t
-        (
-            `x` UInt32
-        )
-        ENGINE = MergeTree
-        ORDER BY x
-        """
-    )
-
-    node.exec_in_container(["bash", "-c", "rm /var/lib/clickhouse/metadata/rdb/t.sql"])
-
-    node.restart_clickhouse()
-
-    ret = int(
-        node.query(
-            """
-            SELECT recovery_time
-            FROM system.clusters
-            WHERE cluster = 'rdb'
-            """
-        ).strip()
-    )
-    assert ret > 0
-
-    node.query(
-        """
-        DROP DATABASE rdb
-        """
-    )
diff --git a/tests/integration/test_replicated_database/configs/settings.xml b/tests/integration/test_replicated_database/configs/settings.xml
index 41799c5bed2..c637fe8eead 100644
--- a/tests/integration/test_replicated_database/configs/settings.xml
+++ b/tests/integration/test_replicated_database/configs/settings.xml
@@ -5,8 +5,6 @@
             <allow_experimental_alter_materialized_view_structure>1</allow_experimental_alter_materialized_view_structure>
             <allow_experimental_object_type>0</allow_experimental_object_type>
             <allow_suspicious_codecs>0</allow_suspicious_codecs>
-            <database_replicated_allow_replicated_engine_arguments>3</database_replicated_allow_replicated_engine_arguments>
-            <database_replicated_allow_explicit_uuid>3</database_replicated_allow_explicit_uuid>
         </default>
     </profiles>
     <users>
diff --git a/tests/integration/test_replicated_database/configs/settings2.xml b/tests/integration/test_replicated_database/configs/settings2.xml
index fb7f0c8d4d3..dad5740a8ae 100644
--- a/tests/integration/test_replicated_database/configs/settings2.xml
+++ b/tests/integration/test_replicated_database/configs/settings2.xml
@@ -5,8 +5,6 @@
             <allow_experimental_alter_materialized_view_structure>1</allow_experimental_alter_materialized_view_structure>
             <allow_experimental_object_type>0</allow_experimental_object_type>
             <allow_suspicious_codecs>0</allow_suspicious_codecs>
-            <database_replicated_allow_replicated_engine_arguments>3</database_replicated_allow_replicated_engine_arguments>
-            <database_replicated_allow_explicit_uuid>3</database_replicated_allow_explicit_uuid>
 
             <throw_on_unsupported_query_inside_transaction>0</throw_on_unsupported_query_inside_transaction>
         </default>
diff --git a/tests/integration/test_replicated_database_alter_modify_order_by/__init__.py b/tests/integration/test_replicated_database_alter_modify_order_by/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/integration/test_replicated_database_alter_modify_order_by/configs/config.xml b/tests/integration/test_replicated_database_alter_modify_order_by/configs/config.xml
deleted file mode 100644
index 706628cf93b..00000000000
--- a/tests/integration/test_replicated_database_alter_modify_order_by/configs/config.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<clickhouse>
-    <database_atomic_delay_before_drop_table_sec>10</database_atomic_delay_before_drop_table_sec>
-    <allow_moving_table_directory_to_trash>1</allow_moving_table_directory_to_trash>
-    <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>
-    <allow_experimental_transactions>42</allow_experimental_transactions>
-    <async_load_databases>false</async_load_databases>
-</clickhouse>
diff --git a/tests/integration/test_replicated_database_alter_modify_order_by/configs/settings.xml b/tests/integration/test_replicated_database_alter_modify_order_by/configs/settings.xml
deleted file mode 100644
index a5e45ead44e..00000000000
--- a/tests/integration/test_replicated_database_alter_modify_order_by/configs/settings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<clickhouse>
-    <profiles>
-        <default>
-            <database_replicated_allow_replicated_engine_arguments>3</database_replicated_allow_replicated_engine_arguments>
-            <database_replicated_allow_explicit_uuid>3</database_replicated_allow_explicit_uuid>
-        </default>
-    </profiles>
-    <users>
-        <default>
-            <profile>default</profile>
-        </default>
-    </users>
-</clickhouse>
diff --git a/tests/integration/test_replicated_database_alter_modify_order_by/test.py b/tests/integration/test_replicated_database_alter_modify_order_by/test.py
deleted file mode 100644
index 22355817ee6..00000000000
--- a/tests/integration/test_replicated_database_alter_modify_order_by/test.py
+++ /dev/null
@@ -1,70 +0,0 @@
-import pytest
-
-
-from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import assert_eq_with_retry
-
-
-cluster = ClickHouseCluster(__file__)
-
-shard1_node = cluster.add_instance(
-    "shard1_node",
-    main_configs=["configs/config.xml"],
-    user_configs=["configs/settings.xml"],
-    with_zookeeper=True,
-    stay_alive=True,
-    macros={"shard": 1, "replica": 1},
-)
-
-shard2_node = cluster.add_instance(
-    "shard2_node",
-    main_configs=["configs/config.xml"],
-    user_configs=["configs/settings.xml"],
-    with_zookeeper=True,
-    stay_alive=True,
-    macros={"shard": 2, "replica": 1},
-)
-
-
-all_nodes = [
-    shard1_node,
-    shard2_node,
-]
-
-
-@pytest.fixture(scope="module")
-def started_cluster():
-    try:
-        cluster.start()
-        yield cluster
-
-    finally:
-        cluster.shutdown()
-
-
-def test_alter_modify_order_by(started_cluster):
-    shard1_node.query("DROP DATABASE IF EXISTS alter_modify_order_by SYNC;")
-    shard2_node.query("DROP DATABASE IF EXISTS alter_modify_order_by SYNC;")
-
-    shard1_node.query(
-        "CREATE DATABASE alter_modify_order_by ENGINE = Replicated('/test/database/alter_modify_order_by', '{shard}', '{replica}');"
-    )
-    shard1_node.query(
-        "CREATE TABLE alter_modify_order_by.t1 (id Int64, score Int64) ENGINE = ReplicatedMergeTree('/test/tables/{uuid}/{shard}', '{replica}') ORDER BY (id);"
-    )
-    shard1_node.query("ALTER TABLE alter_modify_order_by.t1 modify order by (id);")
-    shard2_node.query(
-        "CREATE DATABASE alter_modify_order_by ENGINE = Replicated('/test/database/alter_modify_order_by', '{shard}', '{replica}');"
-    )
-
-    query = (
-        "select count() from system.tables where database = 'alter_modify_order_by';"
-    )
-    expected = shard1_node.query(query)
-    assert_eq_with_retry(shard2_node, query, expected)
-
-    query = "show create table alter_modify_order_by.t1;"
-    assert shard1_node.query(query) == shard2_node.query(query)
-
-    shard1_node.query("DROP DATABASE IF EXISTS alter_modify_order_by SYNC;")
-    shard2_node.query("DROP DATABASE IF EXISTS alter_modify_order_by SYNC;")
diff --git a/tests/integration/test_replicated_merge_tree_replicated_db_ttl/configs/enable_parallel_replicas.xml b/tests/integration/test_replicated_merge_tree_replicated_db_ttl/configs/enable_parallel_replicas.xml
index 30a0b6276b7..c654074740a 100644
--- a/tests/integration/test_replicated_merge_tree_replicated_db_ttl/configs/enable_parallel_replicas.xml
+++ b/tests/integration/test_replicated_merge_tree_replicated_db_ttl/configs/enable_parallel_replicas.xml
@@ -1,7 +1,7 @@
 <clickhouse>
     <profiles>
         <default>
-            <enable_analyzer>1</enable_analyzer>
+            <allow_experimental_analyzer>1</allow_experimental_analyzer>
             <allow_experimental_parallel_reading_from_replicas>1</allow_experimental_parallel_reading_from_replicas>
             <cluster_for_parallel_replicas>default</cluster_for_parallel_replicas>
             <max_parallel_replicas>100</max_parallel_replicas>
diff --git a/tests/integration/test_replicated_table_attach/configs/config.xml b/tests/integration/test_replicated_table_attach/configs/config.xml
index 3f72f638776..fea3eab4126 100644
--- a/tests/integration/test_replicated_table_attach/configs/config.xml
+++ b/tests/integration/test_replicated_table_attach/configs/config.xml
@@ -1,6 +1,6 @@
 <clickhouse>
     <background_schedule_pool_size>1</background_schedule_pool_size>
     <merge_tree>
-        <initialization_retry_period>3</initialization_retry_period>
+        <initialization_retry_period>5</initialization_retry_period>
     </merge_tree>
 </clickhouse>
diff --git a/tests/integration/test_replicated_table_attach/configs/fault_injection.xml b/tests/integration/test_replicated_table_attach/configs/fault_injection.xml
deleted file mode 100644
index 7ee4ab92f37..00000000000
--- a/tests/integration/test_replicated_table_attach/configs/fault_injection.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<clickhouse>
-    <zookeeper>
-        <enable_fault_injections_during_startup>1</enable_fault_injections_during_startup>
-        <send_fault_probability>0.001</send_fault_probability>
-        <recv_fault_probability>0.001</recv_fault_probability>
-    </zookeeper>
-</clickhouse>
diff --git a/tests/integration/test_replicated_table_attach/test.py b/tests/integration/test_replicated_table_attach/test.py
index 4fe8064b26a..dee2be3fcf7 100644
--- a/tests/integration/test_replicated_table_attach/test.py
+++ b/tests/integration/test_replicated_table_attach/test.py
@@ -3,11 +3,8 @@ import pytest
 from helpers.cluster import ClickHouseCluster
 from helpers.network import PartitionManager
 
-import os
-
 
 cluster = ClickHouseCluster(__file__)
-CONFIG_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "configs")
 
 node = cluster.add_instance(
     "node",
@@ -27,21 +24,7 @@ def started_cluster():
         cluster.shutdown()
 
 
-def start_clean_clickhouse():
-    # remove fault injection if present
-    if "fault_injection.xml" in node.exec_in_container(
-        ["bash", "-c", "ls /etc/clickhouse-server/config.d"]
-    ):
-        print("Removing fault injection")
-        node.exec_in_container(
-            ["bash", "-c", "rm /etc/clickhouse-server/config.d/fault_injection.xml"]
-        )
-        node.restart_clickhouse()
-
-
 def test_startup_with_small_bg_pool(started_cluster):
-    start_clean_clickhouse()
-    node.query("DROP TABLE IF EXISTS replicated_table SYNC")
     node.query(
         "CREATE TABLE replicated_table (k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/replicated_table', 'r1') ORDER BY k"
     )
@@ -55,10 +38,10 @@ def test_startup_with_small_bg_pool(started_cluster):
     node.restart_clickhouse(stop_start_wait_sec=10)
     assert_values()
 
+    node.query("DROP TABLE replicated_table SYNC")
+
 
 def test_startup_with_small_bg_pool_partitioned(started_cluster):
-    start_clean_clickhouse()
-    node.query("DROP TABLE IF EXISTS replicated_table_partitioned SYNC")
     node.query(
         "CREATE TABLE replicated_table_partitioned (k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/replicated_table_partitioned', 'r1') ORDER BY k"
     )
@@ -71,17 +54,10 @@ def test_startup_with_small_bg_pool_partitioned(started_cluster):
     assert_values()
     with PartitionManager() as pm:
         pm.drop_instance_zk_connections(node)
-        node.stop_clickhouse(stop_wait_sec=150)
-        node.copy_file_to_container(
-            os.path.join(CONFIG_DIR, "fault_injection.xml"),
-            "/etc/clickhouse-server/config.d/fault_injection.xml",
-        )
-        node.start_clickhouse(start_wait_sec=150)
+        node.restart_clickhouse(stop_start_wait_sec=300)
         assert_values()
 
     # check that we activate it in the end
-    node.query_with_retry(
-        "INSERT INTO replicated_table_partitioned VALUES(20, 30)",
-        retry_count=20,
-        sleep_time=3,
-    )
+    node.query_with_retry("INSERT INTO replicated_table_partitioned VALUES(20, 30)")
+
+    node.query("DROP TABLE replicated_table_partitioned SYNC")
diff --git a/tests/integration/test_restore_external_engines/__init__.py b/tests/integration/test_restore_external_engines/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/integration/test_restore_external_engines/configs/backups_disk.xml b/tests/integration/test_restore_external_engines/configs/backups_disk.xml
deleted file mode 100644
index f7d666c6542..00000000000
--- a/tests/integration/test_restore_external_engines/configs/backups_disk.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<clickhouse>
-    <storage_configuration>
-        <disks>
-            <backups>
-                <type>local</type>
-                <path>/backups/</path>
-            </backups>
-        </disks>
-    </storage_configuration>
-    <backups>
-        <allowed_disk>backups</allowed_disk>
-        <allowed_path>/backups/</allowed_path>
-    </backups>
-</clickhouse>
diff --git a/tests/integration/test_restore_external_engines/configs/remote_servers.xml b/tests/integration/test_restore_external_engines/configs/remote_servers.xml
deleted file mode 100644
index 76ad3618339..00000000000
--- a/tests/integration/test_restore_external_engines/configs/remote_servers.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<clickhouse>
-    <remote_servers>
-        <test_cluster>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>replica1</host>
-                    <port>9000</port>
-                </replica>
-                <replica>
-                    <host>replica2</host>
-                    <port>9000</port>
-                </replica>
-                 <replica>
-                    <host>replica3</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </test_cluster>
-    </remote_servers>
-</clickhouse>
diff --git a/tests/integration/test_restore_external_engines/test.py b/tests/integration/test_restore_external_engines/test.py
deleted file mode 100644
index a975db05020..00000000000
--- a/tests/integration/test_restore_external_engines/test.py
+++ /dev/null
@@ -1,240 +0,0 @@
-import pytest
-
-import pymysql.cursors
-import pytest
-from helpers.cluster import ClickHouseCluster
-
-cluster = ClickHouseCluster(__file__)
-configs = ["configs/remote_servers.xml", "configs/backups_disk.xml"]
-
-node1 = cluster.add_instance(
-    "replica1",
-    with_zookeeper=True,
-    with_mysql8=True,
-    main_configs=configs,
-    external_dirs=["/backups/"],
-)
-node2 = cluster.add_instance(
-    "replica2",
-    with_zookeeper=True,
-    with_mysql8=True,
-    main_configs=configs,
-    external_dirs=["/backups/"],
-)
-node3 = cluster.add_instance(
-    "replica3",
-    with_zookeeper=True,
-    with_mysql8=True,
-    main_configs=configs,
-    external_dirs=["/backups/"],
-)
-nodes = [node1, node2, node3]
-
-backup_id_counter = 0
-
-
-def new_backup_name():
-    global backup_id_counter
-    backup_id_counter += 1
-    return f"Disk('backups', '{backup_id_counter}/')"
-
-
-def cleanup_nodes(nodes, dbname):
-    for node in nodes:
-        node.query(f"DROP DATABASE IF EXISTS {dbname} SYNC")
-
-
-def fill_nodes(nodes, dbname):
-    cleanup_nodes(nodes, dbname)
-    for node in nodes:
-        node.query(
-            f"CREATE DATABASE {dbname} ENGINE = Replicated('/clickhouse/databases/{dbname}', 'default', '{node.name}')"
-        )
-
-
-def drop_mysql_table(conn, tableName):
-    with conn.cursor() as cursor:
-        cursor.execute(f"DROP TABLE IF EXISTS `clickhouse`.`{tableName}`")
-
-
-def get_mysql_conn(cluster):
-    conn = pymysql.connect(
-        user="root",
-        password="clickhouse",
-        host=cluster.mysql8_ip,
-        port=cluster.mysql8_port,
-    )
-    return conn
-
-
-def fill_tables(cluster, dbname):
-    fill_nodes(nodes, dbname)
-
-    node1.query(
-        f"""CREATE TABLE {dbname}.example_s3_engine_table (name String, value UInt32)
-ENGINE = S3('https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/test-data.csv.gz', 'CSV', 'gzip')
-SETTINGS input_format_with_names_use_header = 0"""
-    )
-
-    conn = get_mysql_conn(cluster)
-
-    with conn.cursor() as cursor:
-        cursor.execute("DROP DATABASE IF EXISTS clickhouse")
-        cursor.execute("CREATE DATABASE clickhouse")
-        cursor.execute("DROP TABLE IF EXISTS clickhouse.inference_table")
-        cursor.execute(
-            "CREATE TABLE clickhouse.inference_table (id INT PRIMARY KEY, data BINARY(16) NOT NULL)"
-        )
-        cursor.execute(
-            "INSERT INTO clickhouse.inference_table VALUES (100, X'9fad5e9eefdfb449')"
-        )
-        conn.commit()
-
-    parameters = "'mysql80:3306', 'clickhouse', 'inference_table', 'root', 'clickhouse'"
-
-    node1.query(
-        f"CREATE TABLE {dbname}.mysql_schema_inference_engine ENGINE=MySQL({parameters})"
-    )
-    node1.query(
-        f"CREATE TABLE {dbname}.mysql_schema_inference_function AS mysql({parameters})"
-    )
-
-    node1.query(f"CREATE TABLE {dbname}.merge_tree (id UInt64, b String) ORDER BY id")
-    node1.query(f"INSERT INTO {dbname}.merge_tree VALUES (100, 'abc')")
-
-    expected = "id\tInt32\t\t\t\t\t\ndata\tFixedString(16)\t\t\t\t\t\n"
-    assert (
-        node1.query(f"DESCRIBE TABLE {dbname}.mysql_schema_inference_engine")
-        == expected
-    )
-    assert (
-        node1.query(f"DESCRIBE TABLE {dbname}.mysql_schema_inference_function")
-        == expected
-    )
-    assert node1.query(f"SELECT id FROM mysql({parameters})") == "100\n"
-    assert (
-        node1.query(f"SELECT id FROM {dbname}.mysql_schema_inference_engine") == "100\n"
-    )
-    assert (
-        node1.query(f"SELECT id FROM {dbname}.mysql_schema_inference_function")
-        == "100\n"
-    )
-    assert node1.query(f"SELECT id FROM {dbname}.merge_tree") == "100\n"
-
-
-@pytest.fixture(scope="module")
-def start_cluster():
-    try:
-        cluster.start()
-        yield cluster
-
-    except Exception as ex:
-        print(ex)
-
-    finally:
-        cluster.shutdown()
-
-
-def test_restore_table(start_cluster):
-    fill_tables(cluster, "replicated")
-    backup_name = new_backup_name()
-    node2.query(f"SYSTEM SYNC DATABASE REPLICA replicated")
-
-    node2.query(f"BACKUP DATABASE replicated TO {backup_name}")
-
-    node2.query("DROP TABLE replicated.example_s3_engine_table")
-    node2.query("DROP TABLE replicated.mysql_schema_inference_engine")
-    node2.query("DROP TABLE replicated.mysql_schema_inference_function")
-
-    node3.query(f"SYSTEM SYNC DATABASE REPLICA replicated")
-
-    assert node3.query("EXISTS replicated.mysql_schema_inference_engine") == "0\n"
-    assert node3.query("EXISTS replicated.mysql_schema_inference_function") == "0\n"
-
-    node3.query(
-        f"RESTORE DATABASE replicated FROM {backup_name} SETTINGS allow_different_database_def=true"
-    )
-    node1.query(f"SYSTEM SYNC DATABASE REPLICA replicated")
-
-    assert (
-        node1.query(
-            "SELECT engine FROM system.tables where database = 'replicated' and name = 'example_s3_engine_table'"
-        )
-        == "S3\n"
-    )
-
-    assert (
-        node1.query(
-            "SELECT count(), sum(id) FROM replicated.mysql_schema_inference_engine"
-        )
-        == "1\t100\n"
-    )
-    assert (
-        node1.query(
-            "SELECT count(), sum(id) FROM replicated.mysql_schema_inference_function"
-        )
-        == "1\t100\n"
-    )
-    assert (
-        node1.query("SELECT count(), sum(id) FROM replicated.merge_tree") == "1\t100\n"
-    )
-    cleanup_nodes(nodes, "replicated")
-
-
-def test_restore_table_null(start_cluster):
-    fill_tables(cluster, "replicated2")
-
-    backup_name = new_backup_name()
-    node2.query(f"SYSTEM SYNC DATABASE REPLICA replicated2")
-
-    node2.query(f"BACKUP DATABASE replicated2 TO {backup_name}")
-
-    node2.query("DROP TABLE replicated2.example_s3_engine_table")
-    node2.query("DROP TABLE replicated2.mysql_schema_inference_engine")
-    node2.query("DROP TABLE replicated2.mysql_schema_inference_function")
-
-    node3.query(f"SYSTEM SYNC DATABASE REPLICA replicated2")
-
-    assert node3.query("EXISTS replicated2.mysql_schema_inference_engine") == "0\n"
-    assert node3.query("EXISTS replicated2.mysql_schema_inference_function") == "0\n"
-
-    node3.query(
-        f"RESTORE DATABASE replicated2 FROM {backup_name} SETTINGS allow_different_database_def=1, allow_different_table_def=1 SETTINGS restore_replace_external_engines_to_null=1, restore_replace_external_table_functions_to_null=1"
-    )
-    node1.query(f"SYSTEM SYNC DATABASE REPLICA replicated2")
-
-    assert (
-        node1.query(
-            "SELECT engine FROM system.tables where database = 'replicated2' and name = 'example_s3_engine_table'"
-        )
-        == "Null\n"
-    )
-
-    assert (
-        node1.query(
-            "SELECT count(), sum(id) FROM replicated2.mysql_schema_inference_engine"
-        )
-        == "0\t0\n"
-    )
-    assert (
-        node1.query(
-            "SELECT count(), sum(id) FROM replicated2.mysql_schema_inference_function"
-        )
-        == "0\t0\n"
-    )
-    assert (
-        node1.query("SELECT count(), sum(id) FROM replicated2.merge_tree") == "1\t100\n"
-    )
-    assert (
-        node1.query(
-            "SELECT engine FROM system.tables where database = 'replicated2' and name like '%mysql%'"
-        )
-        == "Null\nNull\n"
-    )
-    assert (
-        node1.query(
-            "SELECT engine FROM system.tables where database = 'replicated2' and name like '%merge_tree%'"
-        )
-        == "MergeTree\n"
-    )
-    cleanup_nodes(nodes, "replicated2")
diff --git a/tests/integration/test_s3_imds/test_simple.py b/tests/integration/test_s3_imds/test_simple.py
index 4884c824f99..0dacac2b0b9 100644
--- a/tests/integration/test_s3_imds/test_simple.py
+++ b/tests/integration/test_s3_imds/test_simple.py
@@ -56,7 +56,7 @@ def test_credentials_from_metadata():
     )
 
     expected_logs = [
-        "Calling EC2MetadataService to get token failed, falling back to a less secure way",
+        "Calling EC2MetadataService to get token failed, falling back to less secure way",
         "Getting default credentials for ec2 instance from resolver:8080",
         "Calling EC2MetadataService resource, /latest/meta-data/iam/security-credentials returned credential string myrole",
         "Calling EC2MetadataService resource /latest/meta-data/iam/security-credentials/myrole",
diff --git a/tests/integration/test_s3_plain_rewritable/test.py b/tests/integration/test_s3_plain_rewritable/test.py
index 020e170eb48..4b1aaafc814 100644
--- a/tests/integration/test_s3_plain_rewritable/test.py
+++ b/tests/integration/test_s3_plain_rewritable/test.py
@@ -139,19 +139,6 @@ def test(storage_policy):
             == insert_values_arr[i]
         )
 
-    metadata_it = cluster.minio_client.list_objects(
-        cluster.minio_bucket, "data/", recursive=True
-    )
-    metadata_count = 0
-    for obj in list(metadata_it):
-        if "/__meta/" in obj.object_name:
-            assert obj.object_name.endswith("/prefix.path")
-            metadata_count += 1
-        else:
-            assert not obj.object_name.endswith("/prefix.path")
-
-    assert metadata_count > 0
-
     for i in range(NUM_WORKERS):
         node = cluster.instances[f"node{i + 1}"]
         node.query("DROP TABLE IF EXISTS test SYNC")
diff --git a/tests/integration/test_scheduler/test.py b/tests/integration/test_scheduler/test.py
index 31cc106a95d..cde75c244e8 100644
--- a/tests/integration/test_scheduler/test.py
+++ b/tests/integration/test_scheduler/test.py
@@ -69,124 +69,6 @@ def update_workloads_config(**settings):
     node.query("system reload config")
 
 
-def check_profile_event_for_query(workload, profile_event, amount=1):
-    node.query("system flush logs")
-    query_pattern = f"workload='{workload}'".replace("'", "\\'")
-    assert (
-        int(
-            node.query(
-                f"select ProfileEvents['{profile_event}'] from system.query_log where query ilike '%{query_pattern}%' and type = 'QueryFinish' order by query_start_time_microseconds desc limit 1"
-            )
-        )
-        == amount
-    )
-
-
-def test_s3_resource_request_granularity():
-    node.query(
-        f"""
-        drop table if exists data;
-        create table data (key UInt64 CODEC(NONE), value String CODEC(NONE)) engine=MergeTree() order by key settings min_bytes_for_wide_part=1e9, storage_policy='s3';
-    """
-    )
-
-    total_bytes = 50000000  # Approximate data size
-    max_bytes_per_request = 2000000  # Should be ~1MB or less in general
-    min_bytes_per_request = 6000  # Small requests are ok, but we don't want hurt performance with too often resource requests
-
-    writes_before = int(
-        node.query(
-            f"select dequeued_requests from system.scheduler where resource='network_write' and path='/prio/admin'"
-        ).strip()
-    )
-    write_bytes_before = int(
-        node.query(
-            f"select dequeued_cost from system.scheduler where resource='network_write' and path='/prio/admin'"
-        ).strip()
-    )
-    write_budget_before = int(
-        node.query(
-            f"select budget from system.scheduler where resource='network_write' and path='/prio/admin'"
-        ).strip()
-    )
-    node.query(
-        f"insert into data select number, randomString(10000000) from numbers(5) SETTINGS workload='admin'"
-    )
-    writes_after = int(
-        node.query(
-            f"select dequeued_requests from system.scheduler where resource='network_write' and path='/prio/admin'"
-        ).strip()
-    )
-    write_bytes_after = int(
-        node.query(
-            f"select dequeued_cost from system.scheduler where resource='network_write' and path='/prio/admin'"
-        ).strip()
-    )
-    write_budget_after = int(
-        node.query(
-            f"select budget from system.scheduler where resource='network_write' and path='/prio/admin'"
-        ).strip()
-    )
-
-    write_requests = writes_after - writes_before
-    write_bytes = (write_bytes_after - write_bytes_before) - (
-        write_budget_after - write_budget_before
-    )
-    assert write_bytes > 1.0 * total_bytes
-    assert write_bytes < 1.05 * total_bytes
-    assert write_bytes / write_requests < max_bytes_per_request
-    assert write_bytes / write_requests > min_bytes_per_request
-    check_profile_event_for_query("admin", "SchedulerIOWriteRequests", write_requests)
-    check_profile_event_for_query("admin", "SchedulerIOWriteBytes", write_bytes)
-
-    node.query(f"optimize table data final")
-
-    reads_before = int(
-        node.query(
-            f"select dequeued_requests from system.scheduler where resource='network_read' and path='/prio/admin'"
-        ).strip()
-    )
-    read_bytes_before = int(
-        node.query(
-            f"select dequeued_cost from system.scheduler where resource='network_read' and path='/prio/admin'"
-        ).strip()
-    )
-    read_budget_before = int(
-        node.query(
-            f"select budget from system.scheduler where resource='network_read' and path='/prio/admin'"
-        ).strip()
-    )
-    node.query(
-        f"select count() from data where not ignore(*) SETTINGS workload='admin'"
-    )
-    reads_after = int(
-        node.query(
-            f"select dequeued_requests from system.scheduler where resource='network_read' and path='/prio/admin'"
-        ).strip()
-    )
-    read_bytes_after = int(
-        node.query(
-            f"select dequeued_cost from system.scheduler where resource='network_read' and path='/prio/admin'"
-        ).strip()
-    )
-    read_budget_after = int(
-        node.query(
-            f"select budget from system.scheduler where resource='network_read' and path='/prio/admin'"
-        ).strip()
-    )
-
-    read_bytes = (read_bytes_after - read_bytes_before) - (
-        read_budget_after - read_budget_before
-    )
-    read_requests = reads_after - reads_before
-    assert read_bytes > 1.0 * total_bytes
-    assert read_bytes < 1.05 * total_bytes
-    assert read_bytes / read_requests < max_bytes_per_request
-    assert read_bytes / read_requests > min_bytes_per_request
-    check_profile_event_for_query("admin", "SchedulerIOReadRequests", read_requests)
-    check_profile_event_for_query("admin", "SchedulerIOReadBytes", read_bytes)
-
-
 def test_s3_disk():
     node.query(
         f"""
diff --git a/tests/integration/test_server_keep_alive/__init__.py b/tests/integration/test_server_keep_alive/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/integration/test_server_keep_alive/configs/keep_alive_settings.xml b/tests/integration/test_server_keep_alive/configs/keep_alive_settings.xml
deleted file mode 100644
index 06e68044817..00000000000
--- a/tests/integration/test_server_keep_alive/configs/keep_alive_settings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<clickhouse>
-  <keep_alive_timeout>3600</keep_alive_timeout>
-  <max_keep_alive_requests>5</max_keep_alive_requests>
-</clickhouse>
diff --git a/tests/integration/test_server_keep_alive/test.py b/tests/integration/test_server_keep_alive/test.py
deleted file mode 100644
index e550319b6df..00000000000
--- a/tests/integration/test_server_keep_alive/test.py
+++ /dev/null
@@ -1,55 +0,0 @@
-import logging
-import pytest
-import random
-import requests
-
-from helpers.cluster import ClickHouseCluster
-
-cluster = ClickHouseCluster(__file__)
-node = cluster.add_instance("node", main_configs=["configs/keep_alive_settings.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_max_keep_alive_requests_on_user_side(start_cluster):
-    # In this test we have `keep_alive_timeout` set to one hour to never trigger connection reset by timeout, `max_keep_alive_requests` is set to 5.
-    # We expect server to close connection after each 5 requests. We detect connection reset by change in src port.
-    # So the first 5 requests should come from the same port, the following 5 requests should come from another port.
-
-    log_comments = []
-    for _ in range(10):
-        rand_id = random.randint(0, 1000000)
-        log_comment = f"test_requests_with_keep_alive_{rand_id}"
-        log_comments.append(log_comment)
-    log_comments = sorted(log_comments)
-
-    session = requests.Session()
-    for i in range(10):
-        session.get(
-            f"http://{node.ip_address}:8123/?query=select%201&log_comment={log_comments[i]}"
-        )
-
-    ports = node.query(
-        f"""
-        SYSTEM FLUSH LOGS;
-
-        SELECT port
-          FROM system.query_log
-         WHERE log_comment IN ({", ".join(f"'{comment}'" for comment in log_comments)}) AND type = 'QueryFinish'
-      ORDER BY log_comment
-        """
-    ).split("\n")[:-1]
-
-    expected = 5 * [ports[0]] + [ports[5]] * 5
-
-    assert ports == expected
diff --git a/tests/integration/test_server_reload/configs/default_passwd.xml b/tests/integration/test_server_reload/configs/default_passwd.xml
index 9d664cbf9c4..f79149e7e23 100644
--- a/tests/integration/test_server_reload/configs/default_passwd.xml
+++ b/tests/integration/test_server_reload/configs/default_passwd.xml
@@ -1,4 +1,4 @@
- <clickhouse>
+ <yandex>
     <profiles>
         <default>
         </default>
@@ -9,4 +9,4 @@
              <password>123</password>
          </postgresql>
      </users>
- </clickhouse>
+ </yandex>
diff --git a/tests/integration/test_server_reload/configs/overrides_from_zk.xml b/tests/integration/test_server_reload/configs/overrides_from_zk.xml
index aa6105f6ebe..d420faa88a2 100644
--- a/tests/integration/test_server_reload/configs/overrides_from_zk.xml
+++ b/tests/integration/test_server_reload/configs/overrides_from_zk.xml
@@ -1,4 +1,4 @@
-<clickhouse>
+<yandex>
     <listen_host remove="remove"/>
     <include from_zk="/clickhouse/listen_hosts" />
     <tcp_port from_zk="/clickhouse/ports/tcp" replace="replace" />
@@ -7,4 +7,4 @@
     <postgresql_port from_zk="/clickhouse/ports/postgresql" replace="replace" />
     <grpc_port from_zk="/clickhouse/ports/grpc" replace="replace" />
     <http_handlers from_zk="/clickhouse/http_handlers" replace="replace" />
-</clickhouse>
+</yandex>
diff --git a/tests/integration/test_session_log/configs/users.xml b/tests/integration/test_session_log/configs/users.xml
index 766fdbcf00f..0416dfadc8a 100644
--- a/tests/integration/test_session_log/configs/users.xml
+++ b/tests/integration/test_session_log/configs/users.xml
@@ -7,5 +7,17 @@
     <users>
         <default>
         </default>
+        <mysql_user>
+            <password>pass</password>
+        </mysql_user>
+        <postgres_user>
+            <password>pass</password>
+        </postgres_user>
+        <grpc_user>
+            <password>pass</password>
+        </grpc_user>
+        <parallel_user>
+            <password>pass</password>
+        </parallel_user>
     </users>
 </clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_session_log/test.py b/tests/integration/test_session_log/test.py
index 0eb614f7aa9..922e2557c50 100644
--- a/tests/integration/test_session_log/test.py
+++ b/tests/integration/test_session_log/test.py
@@ -5,7 +5,6 @@ import pytest
 import random
 import sys
 import threading
-import time
 
 from helpers.cluster import ClickHouseCluster, run_and_check
 
@@ -60,19 +59,6 @@ def next_session_id():
     return str(session_id)
 
 
-user_counter = 0
-
-
-def create_unique_user(prefix):
-    global user_counter
-    user_counter += 1
-    user_name = f"{prefix}_{os.getppid()}_{user_counter}"
-    instance.query(
-        f"CREATE USER {user_name} IDENTIFIED WITH plaintext_password BY 'pass'"
-    )
-    return user_name
-
-
 def grpc_query(query, user_, pass_, raise_exception):
     try:
         query_info = clickhouse_grpc_pb2.QueryInfo(
@@ -131,50 +117,6 @@ def mysql_query(query, user_, pass_, raise_exception):
         assert raise_exception
 
 
-def wait_for_corresponding_login_success_and_logout(user, expected_login_count):
-    # The client can exit sooner than the server records its disconnection and closes the session.
-    # When the client disconnects, two processes happen at the same time and are in the race condition:
-    # - the client application exits and returns control to the shell;
-    # - the server closes the session and records the logout event to the session log.
-    # We cannot expect that after the control is returned to the shell, the server records the logout event.
-    sql = f"SELECT COUNT(*) FROM (SELECT {SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = '{user}' AND type = 'LoginSuccess' INTERSECT SELECT {SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = '{user}' AND type = 'Logout')"
-    logins_and_logouts = instance.query(sql)
-    while int(logins_and_logouts) != expected_login_count:
-        time.sleep(0.1)
-        logins_and_logouts = instance.query(sql)
-
-
-def check_session_log(user):
-    instance.query("SYSTEM FLUSH LOGS")
-    login_success_records = instance.query(
-        f"SELECT user, client_port <> 0,  client_address <> toIPv6('::') FROM system.session_log WHERE user='{user}' AND type = 'LoginSuccess'"
-    )
-    assert login_success_records == f"{user}\t1\t1\n"
-    logout_records = instance.query(
-        f"SELECT user, client_port <> 0,  client_address <> toIPv6('::') FROM system.session_log WHERE user='{user}' AND type = 'Logout'"
-    )
-    assert logout_records == f"{user}\t1\t1\n"
-    login_failure_records = instance.query(
-        f"SELECT user, client_port <> 0,  client_address <> toIPv6('::') FROM system.session_log WHERE user='{user}' AND type = 'LoginFailure'"
-    )
-    assert login_failure_records == f"{user}\t1\t1\n"
-
-    wait_for_corresponding_login_success_and_logout(user, 1)
-
-
-def session_log_test(prefix, query_function):
-    user = create_unique_user(prefix)
-    wrong_user = "wrong_" + user
-
-    query_function("SELECT 1", user, "pass", False)
-    query_function("SELECT 2", user, "wrong_pass", True)
-    query_function("SELECT 3", wrong_user, "pass", True)
-
-    check_session_log(user)
-
-    instance.query(f"DROP USER {user}")
-
-
 @pytest.fixture(scope="module")
 def started_cluster():
     try:
@@ -189,21 +131,78 @@ def started_cluster():
 
 
 def test_grpc_session(started_cluster):
-    session_log_test("grpc", grpc_query)
+    grpc_query("SELECT 1", "grpc_user", "pass", False)
+    grpc_query("SELECT 2", "grpc_user", "wrong_pass", True)
+    grpc_query("SELECT 3", "wrong_grpc_user", "pass", True)
+
+    instance.query("SYSTEM FLUSH LOGS")
+    login_success_records = instance.query(
+        "SELECT user, client_port <> 0,  client_address <> toIPv6('::') FROM system.session_log WHERE user='grpc_user' AND type = 'LoginSuccess'"
+    )
+    assert login_success_records == "grpc_user\t1\t1\n"
+    logout_records = instance.query(
+        "SELECT user, client_port <> 0,  client_address <> toIPv6('::') FROM system.session_log WHERE user='grpc_user' AND type = 'Logout'"
+    )
+    assert logout_records == "grpc_user\t1\t1\n"
+    login_failure_records = instance.query(
+        "SELECT user, client_port <> 0,  client_address <> toIPv6('::') FROM system.session_log WHERE user='grpc_user' AND type = 'LoginFailure'"
+    )
+    assert login_failure_records == "grpc_user\t1\t1\n"
+    logins_and_logouts = instance.query(
+        f"SELECT COUNT(*) FROM (SELECT {SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = 'grpc_user' AND type = 'LoginSuccess' INTERSECT SELECT {SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = 'grpc_user' AND type = 'Logout')"
+    )
+    assert logins_and_logouts == "1\n"
 
 
 def test_mysql_session(started_cluster):
-    session_log_test("mysql", mysql_query)
+    mysql_query("SELECT 1", "mysql_user", "pass", False)
+    mysql_query("SELECT 2", "mysql_user", "wrong_pass", True)
+    mysql_query("SELECT 3", "wrong_mysql_user", "pass", True)
+
+    instance.query("SYSTEM FLUSH LOGS")
+    login_success_records = instance.query(
+        "SELECT user, client_port <> 0,  client_address <> toIPv6('::') FROM system.session_log WHERE user='mysql_user' AND type = 'LoginSuccess'"
+    )
+    assert login_success_records == "mysql_user\t1\t1\n"
+    logout_records = instance.query(
+        "SELECT user, client_port <> 0,  client_address <> toIPv6('::') FROM system.session_log WHERE user='mysql_user' AND type = 'Logout'"
+    )
+    assert logout_records == "mysql_user\t1\t1\n"
+    login_failure_records = instance.query(
+        "SELECT user, client_port <> 0,  client_address <> toIPv6('::') FROM system.session_log WHERE user='mysql_user' AND type = 'LoginFailure'"
+    )
+    assert login_failure_records == "mysql_user\t1\t1\n"
+    logins_and_logouts = instance.query(
+        f"SELECT COUNT(*) FROM (SELECT {SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = 'mysql_user' AND type = 'LoginSuccess' INTERSECT SELECT {SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = 'mysql_user' AND type = 'Logout')"
+    )
+    assert logins_and_logouts == "1\n"
 
 
 def test_postgres_session(started_cluster):
-    session_log_test("postgres", postgres_query)
+    postgres_query("SELECT 1", "postgres_user", "pass", False)
+    postgres_query("SELECT 2", "postgres_user", "wrong_pass", True)
+    postgres_query("SELECT 3", "wrong_postgres_user", "pass", True)
+
+    instance.query("SYSTEM FLUSH LOGS")
+    login_success_records = instance.query(
+        "SELECT user, client_port <> 0,  client_address <> toIPv6('::') FROM system.session_log WHERE user='postgres_user' AND type = 'LoginSuccess'"
+    )
+    assert login_success_records == "postgres_user\t1\t1\n"
+    logout_records = instance.query(
+        "SELECT user, client_port <> 0,  client_address <> toIPv6('::') FROM system.session_log WHERE user='postgres_user' AND type = 'Logout'"
+    )
+    assert logout_records == "postgres_user\t1\t1\n"
+    login_failure_records = instance.query(
+        "SELECT user, client_port <> 0,  client_address <> toIPv6('::') FROM system.session_log WHERE user='postgres_user' AND type = 'LoginFailure'"
+    )
+    assert login_failure_records == "postgres_user\t1\t1\n"
+    logins_and_logouts = instance.query(
+        f"SELECT COUNT(*) FROM (SELECT {SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = 'postgres_user' AND type = 'LoginSuccess' INTERSECT SELECT {SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = 'postgres_user' AND type = 'Logout')"
+    )
+    assert logins_and_logouts == "1\n"
 
 
 def test_parallel_sessions(started_cluster):
-    user = create_unique_user("parallel")
-    wrong_user = "wrong_" + user
-
     thread_list = []
     for _ in range(10):
         # Sleep time does not significantly matter here,
@@ -213,7 +212,7 @@ def test_parallel_sessions(started_cluster):
                 target=function,
                 args=(
                     f"SELECT sleep({random.uniform(0.03, 0.04)})",
-                    user,
+                    "parallel_user",
                     "pass",
                     False,
                 ),
@@ -224,7 +223,7 @@ def test_parallel_sessions(started_cluster):
                 target=function,
                 args=(
                     f"SELECT sleep({random.uniform(0.03, 0.04)})",
-                    user,
+                    "parallel_user",
                     "wrong_pass",
                     True,
                 ),
@@ -235,7 +234,7 @@ def test_parallel_sessions(started_cluster):
                 target=function,
                 args=(
                     f"SELECT sleep({random.uniform(0.03, 0.04)})",
-                    wrong_user,
+                    "wrong_parallel_user",
                     "pass",
                     True,
                 ),
@@ -248,38 +247,41 @@ def test_parallel_sessions(started_cluster):
 
     instance.query("SYSTEM FLUSH LOGS")
     port_0_sessions = instance.query(
-        f"SELECT COUNT(*) FROM system.session_log WHERE user = '{user}'"
+        f"SELECT COUNT(*) FROM system.session_log WHERE user = 'parallel_user'"
     )
     assert port_0_sessions == "90\n"
 
     port_0_sessions = instance.query(
-        f"SELECT COUNT(*) FROM system.session_log WHERE user = '{user}' AND client_port = 0"
+        f"SELECT COUNT(*) FROM system.session_log WHERE user = 'parallel_user' AND client_port = 0"
     )
     assert port_0_sessions == "0\n"
 
     address_0_sessions = instance.query(
-        f"SELECT COUNT(*) FROM system.session_log WHERE user = '{user}' AND client_address = toIPv6('::')"
+        f"SELECT COUNT(*) FROM system.session_log WHERE user = 'parallel_user' AND client_address = toIPv6('::')"
     )
     assert address_0_sessions == "0\n"
 
     grpc_sessions = instance.query(
-        f"SELECT COUNT(*) FROM system.session_log WHERE user = '{user}' AND interface = 'gRPC'"
+        f"SELECT COUNT(*) FROM system.session_log WHERE user = 'parallel_user' AND interface = 'gRPC'"
     )
     assert grpc_sessions == "30\n"
 
     mysql_sessions = instance.query(
-        f"SELECT COUNT(*) FROM system.session_log WHERE user = '{user}' AND interface = 'MySQL'"
+        f"SELECT COUNT(*) FROM system.session_log WHERE user = 'parallel_user' AND interface = 'MySQL'"
     )
     assert mysql_sessions == "30\n"
 
     postgres_sessions = instance.query(
-        f"SELECT COUNT(*) FROM system.session_log WHERE user = '{user}' AND interface = 'PostgreSQL'"
+        f"SELECT COUNT(*) FROM system.session_log WHERE user = 'parallel_user' AND interface = 'PostgreSQL'"
     )
     assert postgres_sessions == "30\n"
 
-    wait_for_corresponding_login_success_and_logout(user, 30)
+    logins_and_logouts = instance.query(
+        f"SELECT COUNT(*) FROM (SELECT {SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = 'parallel_user' AND type = 'LoginSuccess' INTERSECT SELECT {SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = 'parallel_user' AND type = 'Logout')"
+    )
+    assert logins_and_logouts == "30\n"
 
     logout_failure_sessions = instance.query(
-        f"SELECT COUNT(*) FROM system.session_log  WHERE user = '{user}' AND type = 'LoginFailure'"
+        f"SELECT COUNT(*) FROM system.session_log  WHERE user = 'parallel_user' AND type = 'LoginFailure'"
     )
     assert logout_failure_sessions == "30\n"
diff --git a/tests/integration/test_settings_profile/test.py b/tests/integration/test_settings_profile/test.py
index 4800ab798bf..e5c0a072ff9 100644
--- a/tests/integration/test_settings_profile/test.py
+++ b/tests/integration/test_settings_profile/test.py
@@ -459,7 +459,7 @@ def test_show_profiles():
 
     query_possible_response = [
         "CREATE SETTINGS PROFILE `default`\n",
-        "CREATE SETTINGS PROFILE `default` SETTINGS enable_analyzer = true\n",
+        "CREATE SETTINGS PROFILE `default` SETTINGS allow_experimental_analyzer = true\n",
     ]
     assert (
         instance.query("SHOW CREATE SETTINGS PROFILE default")
@@ -470,7 +470,7 @@ def test_show_profiles():
         "CREATE SETTINGS PROFILE `default`\n"
         "CREATE SETTINGS PROFILE `readonly` SETTINGS readonly = 1\n"
         "CREATE SETTINGS PROFILE `xyz`\n",
-        "CREATE SETTINGS PROFILE `default` SETTINGS enable_analyzer = true\n"
+        "CREATE SETTINGS PROFILE `default` SETTINGS allow_experimental_analyzer = true\n"
         "CREATE SETTINGS PROFILE `readonly` SETTINGS readonly = 1\n"
         "CREATE SETTINGS PROFILE `xyz`\n",
     ]
@@ -482,7 +482,7 @@ def test_show_profiles():
         "CREATE SETTINGS PROFILE `xyz`\n"
     )
     expected_access_analyzer = (
-        "CREATE SETTINGS PROFILE `default` SETTINGS enable_analyzer = true\n"
+        "CREATE SETTINGS PROFILE `default` SETTINGS allow_experimental_analyzer = true\n"
         "CREATE SETTINGS PROFILE `readonly` SETTINGS readonly = 1\n"
         "CREATE SETTINGS PROFILE `xyz`\n"
     )
diff --git a/tests/integration/test_shutdown_static_destructor_failure/__init__.py b/tests/integration/test_shutdown_static_destructor_failure/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/integration/test_shutdown_static_destructor_failure/test.py b/tests/integration/test_shutdown_static_destructor_failure/test.py
deleted file mode 100644
index b1d925cc432..00000000000
--- a/tests/integration/test_shutdown_static_destructor_failure/test.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env python3
-import pytest
-from helpers.cluster import ClickHouseCluster
-
-cluster = ClickHouseCluster(__file__)
-
-node = cluster.add_instance("node", main_configs=[], stay_alive=True)
-
-
-@pytest.fixture(scope="module", autouse=True)
-def start_cluster():
-    try:
-        cluster.start()
-        yield cluster
-    finally:
-        cluster.shutdown()
-
-
-def test_shutdown():
-    node.query("SYSTEM ENABLE FAILPOINT lazy_pipe_fds_fail_close")
-    node.stop_clickhouse()
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client5-cert.pem b/tests/integration/test_ssl_cert_authentication/certs/client5-cert.pem
deleted file mode 100644
index b17baa62262..00000000000
--- a/tests/integration/test_ssl_cert_authentication/certs/client5-cert.pem
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFojCCA4qgAwIBAgIUBfEMZ1Z/4weV13ryVA9qyNTPJHEwDQYJKoZIhvcNAQEL
-BQAwUjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjQwOTAy
-MTYwODI0WhcNMzQwODMxMTYwODI0WjBXMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
-U29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRAw
-DgYDVQQDDAdjbGllbnQ1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
-zivZ5IrYyoJeDX0Zbl/cl8rKE0LbmtD+QKZvQXHD+gstXWxPOEFZVxO3BuqmvBZ1
-MaYNyPYA9JyyP+pO9cE8RrTk3w9xMhv8dYWJQK7na9W9RTSXs8xhPwiEm4XuVgqv
-GfK/EvdxbFMhgzExOR333TkmXPxrMm5xPWwV3RsTCjNVW7nmdPHXmchuTO7lQtww
-6fETqc1Zqv8TO2x/uGZiwAzNYbueWHyzL4Y1UJ7D0mnNNgJvvxtcrzBTlGLLhJ5o
-0+zVQLaOnac0WVk0wDhVaxd/gR4bYN3ixvuFbbOaTroFVTMVme196G2FkJI/05Pn
-D68r1yUpvuNDjkBbuBO43PlsFKLhPU5twfu4TesEb2WZ0VsNxn8Hc0Ne02WwHsHa
-Fi1N0oXvVIeGvvzevuTkjPbh2aCaQX9qbhLXjhgXNFAXQq+qI8ECCWC4LruPL1Es
-+ZM2thQAg4k8GY4U9Q8zX55Ut7t9T771QbHFOAupuTgZJSz0jC8JId0m7NOOqtvu
-4w/GqefCt9bp+wlQDXVOgi+S3GqKM1OuIbs5XQJtNfi6l684ptAFHSHMHXvfGLHI
-MlKdobjNqEFVK9qO/3YvnTUyRyaUA61aHxraXWBwvcUByXwXdgbuz/M5XAi6fr0V
-Trw9iUSviDvu4HwDo8PCw9i8xYFtkr2k1kurWEsFZMcCAwEAAaNrMGkwJwYDVR0R
-BCAwHoYcc3BpZmZlOi8vYmFyLmNvbS9mb28vYm9vL2ZhcjAdBgNVHQ4EFgQUENIS
-25yehLQrlL8vC+DpkNE7urowHwYDVR0jBBgwFoAUiSo9XUmDdI1vjLtMRUK6G2RZ
-kKUwDQYJKoZIhvcNAQELBQADggIBAADH/LINEwB1WUQ2Q/aHiNv1ZyJ+ifgs9ewp
-/t0uwS+53ctcmJ6Sqeni3/UIdLYjpcdBbl1XpqTYuGF28C2YZrWKFB0HaOiH6D8B
-zcGGAkIKFqnhcJxyl37je+scZ8Wk9b04L+X+miN6cgIWm6rQezDF3rs1xvAVBqTM
-YPIk6sBIgHNJy4D3S5KdhqNV0/8KY6T65nGFdEq064qOk8HvS6DyYOs22AitCD+L
-gcWGJHJ3BfNASbRrT25zb1HLUIFFbFIGaPFd9GbiU5hGb9MgUzX44q+WdXoEa59a
-6y9ZcidjEqAGP/FMz16D831YpqRBherZ09ztWXeTfv4NxauisLuoqpOr7CmpQ+Ct
-O5t0cUHILeNBFR7rdMOmDawpEcOSGqcJHdPH4SjP/LtgQODWiNys19Yp5afbM5Lz
-IjLjq1wAHVtSvPHjRhnZSq0SiU1XlDmu1Em3HbFe5RmqL/lcLe7/U10ddngADG7E
-XgPE0jcvl7rYASqYuTbKd6Q53QYx0K7xc1n8mIRJuAofPwl6Yns/ytvw0+E9TBS1
-oGb7j6V/k+Xd77dfJ6fckJXPg7Fm3GPO1ax7FNU51sCrvAHsMZhiWQa6pZzBEORM
-4yI+DSFyskyWXCPth9r3UqHQXzX86LRkyDWg9l6v3NWRSI1j/e7dZds/U/sg2maq
-css4A+kM
------END CERTIFICATE-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client5-ext.cnf b/tests/integration/test_ssl_cert_authentication/certs/client5-ext.cnf
deleted file mode 100644
index 8cb20e70290..00000000000
--- a/tests/integration/test_ssl_cert_authentication/certs/client5-ext.cnf
+++ /dev/null
@@ -1 +0,0 @@
-subjectAltName=URI:spiffe://bar.com/foo/boo/far
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client5-key.pem b/tests/integration/test_ssl_cert_authentication/certs/client5-key.pem
deleted file mode 100644
index aa65de6e26c..00000000000
--- a/tests/integration/test_ssl_cert_authentication/certs/client5-key.pem
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDOK9nkitjKgl4N
-fRluX9yXysoTQtua0P5Apm9BccP6Cy1dbE84QVlXE7cG6qa8FnUxpg3I9gD0nLI/
-6k71wTxGtOTfD3EyG/x1hYlArudr1b1FNJezzGE/CISbhe5WCq8Z8r8S93FsUyGD
-MTE5HffdOSZc/GsybnE9bBXdGxMKM1VbueZ08deZyG5M7uVC3DDp8ROpzVmq/xM7
-bH+4ZmLADM1hu55YfLMvhjVQnsPSac02Am+/G1yvMFOUYsuEnmjT7NVAto6dpzRZ
-WTTAOFVrF3+BHhtg3eLG+4Vts5pOugVVMxWZ7X3obYWQkj/Tk+cPryvXJSm+40OO
-QFu4E7jc+WwUouE9Tm3B+7hN6wRvZZnRWw3GfwdzQ17TZbAewdoWLU3She9Uh4a+
-/N6+5OSM9uHZoJpBf2puEteOGBc0UBdCr6ojwQIJYLguu48vUSz5kza2FACDiTwZ
-jhT1DzNfnlS3u31PvvVBscU4C6m5OBklLPSMLwkh3Sbs046q2+7jD8ap58K31un7
-CVANdU6CL5LcaoozU64huzldAm01+LqXrzim0AUdIcwde98YscgyUp2huM2oQVUr
-2o7/di+dNTJHJpQDrVofGtpdYHC9xQHJfBd2Bu7P8zlcCLp+vRVOvD2JRK+IO+7g
-fAOjw8LD2LzFgW2SvaTWS6tYSwVkxwIDAQABAoICAAxYkuU9LUs/MEulfKLf6bFL
-SvuJSuZD8p3DebEVE3PDPJW2GS5Yt3Vf8FthLNfhjmYJOBUbKiZ7xa7PJKhRyH7B
-cV0sKw6hn2YYN4ZgkuohtAJTamwxZndkVrCLfiC35hFrOGb121xtw/l7tiNh+IhO
-Vk5GLVMpSu2vLcX+S48WUNu7z6GcI9mJJ5XCzobI8cLolVFbQy3atXefASz1MJ+o
-hJoAJrTMztwfMM0hnL9aZ5f+4Fs008GH5tFhcyd/Zu6d5Y1JAVROgXOCRIboOLE/
-iHqeZ2xPDTf2MuDFWw2w1QXrl7UOhDYpbNCh+WF9n14QktMA3jWYnWCE2Rk2USEK
-2QhsScNgA7dY3S3DbSK1ZiyZEgbvdq6EYy5I46jNXqRrfKfuD7J04dtO1pmBWZy3
-a765FMiejbHrC1xrKtSnvGj1oJ23P3TRiEL6tx3QF4bAulWE62ULBfDgqr56pPbt
-KOfPinEFa/14+B4a21iFzsoA6SWPt+i/k00RyRHw4X7acTd8lsavHcT8PGY4wMLX
-cNEombZn4h/0oCqAmBtoXYwctcyQwzhJNzAp1GFMG2gdBPhXUsWcwwjNNzeaewCq
-BO0YO/DFgj1qTHZwswTfppJMF+BTE/sol4eaqOV1TYV48OfYTdo+6dqfH2JkaJyy
-PVJAoZtKKPfDRlrHMrE9AoIBAQD1oZMIi4Nm4TpdOGsU5O2keDW6DXdoxpOI6u9H
-YqWZlSZ57q2u+8JkoVJhH/jq4l1QuXtUObpQ9DYOpPwPkt+ZblUut/ZrmMo+gs81
-RtIv4EGmgFmtrXgmkYGsoNrIu4/ayBPDwGz7Z+gEta+gxhYbxSZgb2ZOZzH/c2my
-3CvfgFiYyv/cfVvynjprRZoxowQvJoMCEEA9REZdO5T51lshQFcrpFU2ucQNKV60
-DELV6uJzhL0EDvg9IqP1CxZhdCsTifE/SNVepNWXFegFGVsD/vxmXVxJYevSDQZY
-SvGWVcgyuQA8Gdze6y3jOUlzCQ3v7D63PgAPS+yrGXLd0Vz9AoIBAQDW39oRb1n2
-ves41cEz7qPNiGmc+zhzyZE30HFnl/RxREPfhzvifTUk3YTUPdJGpcgf+sMoPQ/R
-plx/ZrFPTyV7U+svf/eoPlpNnVnZ1m+C/nN7AjVwq04GRHKYD3lTD7KpoYQ0ICGO
-z9xFiGbK4VRNIiNpyGc3IZBmrwB2wsGn1L4yfFZly3Th4qiDmNpR29rgteQYWSNJ
-hSqsCFcqogJfppP+QKRGf00uHDa1AGQhB2eFykyAniQw52FcdpUdkGqYiR1vdir7
-5XckNixq7yyRflo8CftHybyHipTBZVXBzdvDpY5mxANPcJlSPhJxqruxK9FzNYv6
-OiDlFnFPwNYTAoIBAQDLByRbWcXhEaWGTA3mlVsAKQRvppXemtRzxYzGOnmaure0
-7V3OVvZU6ysGcMD0lOqAwO95rMWeCF1uOVzHGqWLUrFCDni2cvIoPUM8TC+LtxdM
-oqZ9cfbwGjFPGR398Vp0ghAkKzdpjncu/WYPw+ueRJT1/N5ZS979wM3LM0VoVdPl
-Z1WZUFzh63tqE3viL1ZUCscau4f9nCN1CLyYzV9B2sayogB1XZL5Ngq7U68i1iUb
-SspZQm5ZSfqvntx+7OB2I/yuTGtg8WpCma7QGCcs5GSHz/9qAHBFjNKDxF5v3rO9
-iUDybIYuE8I4IK/fT8qfV2x3Vd4CxsT2n/Bb/KOZAoIBAQCyIwrqgWIYCQNFLxDp
-OOJbtse3+R2oAGd/2jLqKzPf4zRR0A95iUvRsEQ6oLX/E9mBiabZaSYALOdqR3yf
-v4HXaI8F5hUvSeIbjmO7EOeJteGPDRm4uowI7h4CqnFuxwjbUKgFfs3TU8fNbXOq
-pnv5JmAthpLrRcwtFNBRpMxfkyPLPwFxiubvjbUexE3ap2Yh/SmIdf2nKdtim9eH
-5KALJFJ06qpGN6uImqNQE27vYvAUHs6lonVmhaxVt4mP5PY6VxIsIc8o3eeUAcV5
-MafFRvcP50aHEVxXEjCY1KXv8fZLkKkp0T7dUQALCqLH0T+hdi5CURYm8KHsylpO
-QBQ5AoIBADXNlx5bXEU2lW21wyWG4v3gqvmnDgQG66RXaHC0Rgpn6BW7pose40fv
-I82yWviabk7wlvaQgXllzZ5vGL43/8pp+wFpRUl5nX8P1ZA8pRkRArm1vLxQRjkM
-90j0M/XhTnC8eC4qKsQx8dPUH0SPkHJAd2tWcP9Q3635zETcINkpsNbsB/QNGBZ1
-JefHA/GNZZBrjFMOnvzEbEbqBdhwlZNRlZxVq/svvNzzv12jFQpM7HVy95bATiZ8
-x7SQlDxCWOWApd9VpM83JnPWCfu0Yi/HHPJd6YdueMhRSvUpLs1sD8fs9bFQ7+OL
-erqwgB4b3yDlXijY75pPDxdPf/0qA3Q=
------END PRIVATE KEY-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client5-req.pem b/tests/integration/test_ssl_cert_authentication/certs/client5-req.pem
deleted file mode 100644
index 6ad15243bac..00000000000
--- a/tests/integration/test_ssl_cert_authentication/certs/client5-req.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEnDCCAoQCAQAwVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUx
-ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEQMA4GA1UEAwwHY2xp
-ZW50NTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAM4r2eSK2MqCXg19
-GW5f3JfKyhNC25rQ/kCmb0Fxw/oLLV1sTzhBWVcTtwbqprwWdTGmDcj2APScsj/q
-TvXBPEa05N8PcTIb/HWFiUCu52vVvUU0l7PMYT8IhJuF7lYKrxnyvxL3cWxTIYMx
-MTkd9905Jlz8azJucT1sFd0bEwozVVu55nTx15nIbkzu5ULcMOnxE6nNWar/Ezts
-f7hmYsAMzWG7nlh8sy+GNVCew9JpzTYCb78bXK8wU5Riy4SeaNPs1UC2jp2nNFlZ
-NMA4VWsXf4EeG2Dd4sb7hW2zmk66BVUzFZntfehthZCSP9OT5w+vK9clKb7jQ45A
-W7gTuNz5bBSi4T1ObcH7uE3rBG9lmdFbDcZ/B3NDXtNlsB7B2hYtTdKF71SHhr78
-3r7k5Iz24dmgmkF/am4S144YFzRQF0KvqiPBAglguC67jy9RLPmTNrYUAIOJPBmO
-FPUPM1+eVLe7fU++9UGxxTgLqbk4GSUs9IwvCSHdJuzTjqrb7uMPxqnnwrfW6fsJ
-UA11ToIvktxqijNTriG7OV0CbTX4upevOKbQBR0hzB173xixyDJSnaG4zahBVSva
-jv92L501MkcmlAOtWh8a2l1gcL3FAcl8F3YG7s/zOVwIun69FU68PYlEr4g77uB8
-A6PDwsPYvMWBbZK9pNZLq1hLBWTHAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEA
-SGJaGaSkfsUBSqPbkbtyE2ndHIY8QMPvJAMB7pPbA/MlX39oO2U1AraFatN/Xzpd
-0uQA2m0UsXF2+ScrG4rd14YkU4wpcT2lIplvFFzUkwfYLATRYrFV0FCru1n28+Ve
-TyUG9/tlf/jnNZwWtB5AEbCWmzXSjXUuwXdn2oQ0z+3dxdSnpOrDkzyYeocIMnMJ
-pG0qdBd+hJrK6snJNli6EfsmmykyCSLorFpnkm2uKUwdTAD2/MlxYdutjk7tqKw5
-wpYi6Wqt/euyQ94Ri4aICZMBFk5+zDdaEOKVQZ0aUT8RWt/aD2ksbTrclDICOe84
-iG+Nf/CyNqSNqsUugCSCxN3UUZgLKEyJb8Pz4N/nFFRBb1aiZ/5YVRTYtZ+k4tLb
-s2exxqVpDg3M5G5bk0iJ8DBEjO/yKwobc7HAtnTAEIs0HGord3yzg3F0Y+5ecQAg
-9ESOptz33EBkTHxpBmt0D0ACa4CTghrf/Id8imNtdGU9i7MeEba+iUVAUP8VfhtL
-FJPRR8aVaKaLc9uCAiiHuRc+J0EHAwTOKKTK3Z1mkYO00kMCiRcru8/H6ibkrkV7
-kRL6NvAc7CsEzSDPkFKAZhQ4p6AcfNC5yRiNLG9JB/wQgBg8v23Uwtk74gOXIaQN
-WUjwzdYOljdcFOzmoDMzyfIFwSXcO3dmmjqOwh2HNw0=
------END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client6-cert.pem b/tests/integration/test_ssl_cert_authentication/certs/client6-cert.pem
deleted file mode 100644
index b83c380a3bc..00000000000
--- a/tests/integration/test_ssl_cert_authentication/certs/client6-cert.pem
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFojCCA4qgAwIBAgIUBfEMZ1Z/4weV13ryVA9qyNTPJHIwDQYJKoZIhvcNAQEL
-BQAwUjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjQwOTAy
-MTYwODM0WhcNMzQwODMxMTYwODM0WjBXMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
-U29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRAw
-DgYDVQQDDAdjbGllbnQ2MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
-uz+3VyFhBD6K68mkDM0LJfRfGbuD8tSmHhtO6+XQzhIUiANW+A1WdyD+zWky0QsS
-vl/2Ds1PmjU7659pkSD8Sidjdz3/TP0eO49nHinLjRQa2Oawk6PCjLIcpJ+A5eGb
-Hno/oiQBMCAPpVh3sex+5yPiUQN62cKRWryv2JJqJmEgvpjC92SaIjf9M3mCsxMf
-an0CZj6hNcorxXQNnF4JZRPQ4mMgBqgFS5Oz1YujHiBUN9ZoIGmS3HZ9LYl5lL7o
-GxNXluyIrIw1kiyQrx+wJFdYwTBeyCqw8wmf993tHRmvpJ2ZFVXTbYqpj2Qkom+J
-EpCRBqCmK+/uSgLOAicS/wR2eiYXkw2rYDIQ6yCyeW7nnaFVWNAFNSdAW1Jdr+Z2
-fKMolhYAcpeMQAYN5wTqJBF9dDwMxbOcdSh1wPZcenuO2q5cMJcn3qt3+SigNKcQ
-BvqtZ54GNGq9h24f11+cqco80v4WYxrmXu8bXQfgtX07UVvqkjbG7O4HtbGDvOlw
-KO7d1kOj4XUJdZbz9g5kaGufN4hlBs9JzYNOZdywNwBiPxHHE71Ht2ihfbBKSl9x
-4Zse5YhPqToacWd5FRW+If5EpHkxxW+f4e61S2/8fnn5yHpMX22HXNBmOUR3vBrl
-xfkje22ZuEf5NfB95aEaRZABmXQaHKdAVQeaAT9TvPMCAwEAAaNrMGkwJwYDVR0R
-BCAwHoYcc3BpZmZlOi8vYmFyLmNvbS9mb28vYmF6L2ZhcjAdBgNVHQ4EFgQU0ieN
-0CTYiMz7HJs9OH2U4imSzN0wHwYDVR0jBBgwFoAUiSo9XUmDdI1vjLtMRUK6G2RZ
-kKUwDQYJKoZIhvcNAQELBQADggIBAELD77yWem26DIWG2Mi6q9KvLb/d8bOFN4mg
-SYYekdEryyYCFhbb0P9T7GKj4KxNxkZaGgwXl+PM8SH7FhqemRCwCtHMVQiWvC1x
-XLCrGiep7Dx+vvKHoCdapQp3uRfsZMHSZbsHJgQRFRt/jgP3jFcrLAa9tD8Yza4y
-lBhh8pUROC0edlqom+BkLYA6A7FWA89x/NZL6wiyPKqRh2SuACszrlQdj4oqdgIF
-pAILjDy4fLaCGGUgu9kHonV0xTjqSdFXiSeImSkePOvGWrh2B5GqRbanPHDSR5VD
-pIhKZPpnvUBNhzoAMv1RFbgNs9m3sYqYChxb8IOGiY/3EG4rgygVez2yu16v5WMU
-PIWwSv3N+oceG085dHxhn4TcDamdFrQHssp7GJBbyGEINHQRiZ4cu3Vz2cVNYcKD
-iFJZ8vVwU7IZOEQeww6DT+gL+wqSgTyDvEXQNbYupFYPZXSBIaygH4eHa+PqPnNL
-DJTpPAlwNRB2+eL3bZxvNAfwqIY6xgwnLBr1QrosmfMKgkswkg8gVoIpIRGACzk2
-iY818Jn+IG/M/aPF3p5dTsOqH3bQmz4ZpoLB2dytqkNDGKSAPPGOpe4MDyx0prCH
-GWDjEjn4xT9AjAJVpTWJCENPzFzwA7byApuZwLTy/5ZBbNJf1K/JwsqXUhHKENb2
-NzMKvQCT
------END CERTIFICATE-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client6-ext.cnf b/tests/integration/test_ssl_cert_authentication/certs/client6-ext.cnf
deleted file mode 100644
index d421f4198b4..00000000000
--- a/tests/integration/test_ssl_cert_authentication/certs/client6-ext.cnf
+++ /dev/null
@@ -1 +0,0 @@
-subjectAltName=URI:spiffe://bar.com/foo/baz/far
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client6-key.pem b/tests/integration/test_ssl_cert_authentication/certs/client6-key.pem
deleted file mode 100644
index e56fed5dddf..00000000000
--- a/tests/integration/test_ssl_cert_authentication/certs/client6-key.pem
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQC7P7dXIWEEPorr
-yaQMzQsl9F8Zu4Py1KYeG07r5dDOEhSIA1b4DVZ3IP7NaTLRCxK+X/YOzU+aNTvr
-n2mRIPxKJ2N3Pf9M/R47j2ceKcuNFBrY5rCTo8KMshykn4Dl4Zseej+iJAEwIA+l
-WHex7H7nI+JRA3rZwpFavK/YkmomYSC+mML3ZJoiN/0zeYKzEx9qfQJmPqE1yivF
-dA2cXgllE9DiYyAGqAVLk7PVi6MeIFQ31mggaZLcdn0tiXmUvugbE1eW7IisjDWS
-LJCvH7AkV1jBMF7IKrDzCZ/33e0dGa+knZkVVdNtiqmPZCSib4kSkJEGoKYr7+5K
-As4CJxL/BHZ6JheTDatgMhDrILJ5buedoVVY0AU1J0BbUl2v5nZ8oyiWFgByl4xA
-Bg3nBOokEX10PAzFs5x1KHXA9lx6e47arlwwlyfeq3f5KKA0pxAG+q1nngY0ar2H
-bh/XX5ypyjzS/hZjGuZe7xtdB+C1fTtRW+qSNsbs7ge1sYO86XAo7t3WQ6PhdQl1
-lvP2DmRoa583iGUGz0nNg05l3LA3AGI/EccTvUe3aKF9sEpKX3Hhmx7liE+pOhpx
-Z3kVFb4h/kSkeTHFb5/h7rVLb/x+efnIekxfbYdc0GY5RHe8GuXF+SN7bZm4R/k1
-8H3loRpFkAGZdBocp0BVB5oBP1O88wIDAQABAoICACymDcaV6/dCHogIpbhzsAPV
-2FNfdiAR+qZVJqVzQC3S+9hOy48MRyDS2k8KlZZpCIgig56V8DQ6G1acxWRYtC/O
-YpZNTzIBbRMQp6r2llXGhHxRzar2sm4wDkpmyiqGeCF1TvUPlsTt8C0iAjCHzt64
-nL9qkAGatmQnd9qxVuRd5pvr+xlYgLRGG3cJs1OV7LjMpCTTLEeSNIu5l4FAnwbe
-CcHhlwJfUBvsVUZHLJcDaHGEC4InCmDNVB3mmPoR53CFVS5kqlZSfHelbr6DVNHl
-jgFK0l7yZw0cr2tAHMkClfIvrg/7ThXhqXrKiz28ULf/hsVIyzbQ2EYHky3KOWny
-04O7/NnOkVHs+XUyNC4sv9nkcd9ntKkvvUPPK0U6vbW7IasC3jCh5LMyZjHYwgmK
-hzxEBZSyutKWn3RWncarwQ/1Vbq3HjbkeVTipXAa7Bny17wiAeZMZ2GqQZ9VcNQ3
-YJWDgxS5shwcEo+71sC4o2HjmWKcPujmt84XcWc6yphPbCpbwwswaQD5MaZxeDgZ
-OUhF9LfslzNrwwoZTFz/Qhy3TOshF7BIbUdQnWLMNdAb9ccby/0WgOmfD6V4t99N
-ksb2nWgvvK3isycs6HHVP/fgv+yM9cKGs66JoH2Jm+SInUtpR5Gv1aGeV97/9WFd
-JuiHtHQIty+8n6GDTscJAoIBAQDuHCBeZ+pVTyW6wxjd4OD2keuDjM3Z7X/UgCoJ
-kR87Dwjd8SHEw8QaH8vvGYBNktFu3KbQ1TV2OR8gAdnwlHeI5V2/nIVX0UBjQM9X
-GC3cmzsMOBAem0nuYXZG9yvawwPUdZ18fQc2wAs4GqL4uKaOeuCefNyK5wKfvX7M
-sA49D45gvLUhpfkTeM8HK9UQwMfMg2fFBzZifqTIG4OGkkAeEY+rkJTUxnvTuuFU
-dkXXF8Qe+pSPkbQVQYYRRO9Wk0i16R6VaYrl3vvi72w2gEw7iQya0A1bHZe3s7vv
-jQuz8h954kcgLYCqsOm/mj3t654jrjW1Z5yRjznTUJKrKMh3AoIBAQDJUVCp2Frm
-NgzrZXD1QrkJ1qCRBHyVu7FikXqNszc9lLD5y8YWRnhDtGruOQ3DYjpuD/DMrO2P
-+iBTambM3mJt6FE8TkXHyMzLoJ/I8SMLMbLNdDpsj8D8RlftwIESiNu9DQfMle5l
-8jxZ7R7usio8HysVm5u6fsSmYVUZF+sWLLAUqote4HQxdvDup9A1q7onVZUYfKnK
-mCVKqfdqFDqMKTSHOngxA5wzQWdMqdgLxiYKPYbkNsJ3dhXQwJjfbyDQq4X/foec
-0wG91/WqsLiMOZLsQBiGMgOq85IqGBByl51QnkT8drPEJsXX6UCHjQ7AYHe0U+pe
-JTa6nMfk2AplAoIBAQDemJa+CuFrvSEldowBqOBGQeXtRi2PBNNTAjnKVcvfd0+v
-xGPwQZ9LWNxaevmSC6YUwNyGMDvZeM8bKf/nQ7R32w0IOzgA/9L0trrezfDZ4piR
-9LtFEaFM4/ohn6J00Yj8DrQak/uxeFlEqsoeQOkcG81u/IVkqU+vrAQlMJUvCiLt
-VpzyhunSBUdtidGW5tIh49qXvAVgkMpVdDtCC+k68unf1rr8K03Jg1RxlFv4F/S1
-jUZi7TBwCqBd9pbU1b3MqdF4loFOImZSIceFL+2UXqvU8pj5zDFwf+s6qB3/rGM2
-m44oi8FUUS1EfNpWWMWuz4bQPruE7GN/pDxpHChDAoIBAGZF5yLCBTvazalwuXf/
-051J6fyCOQCgf7dBjO8b0r54IYhlm1aJqmNK7t/jIDjYWDK96mkwmOeB/JYkAeGm
-QH7xfQOUCCM8wb3Y9hPRXSo8r0ds+plYVoRTACyKlYfi+y8JxaKLsLcd3scYjZRZ
-8tbkRrENgom2CRU1cVP0MLvtK+7zzSYABUdz02aK3l3FxiZhdgMgoemIbbmGq2i6
-qhu2ezcP3yuXV+06Fs59ooIowf6Fz1d08kpaNS7+CSvJevRHjyWDFEX5dHMLmYSD
-jt2+CgP3c/4IvpBEeUblPsXYfFUOcqGHdD/8KppLpzq10H6vA2EbGH+HjEw1hd+e
-WXkCggEBAIq+MHXpbipKp7lsxsp/moeNXUojLfiBcQLU+zauWBdP3kTJmDd7D3Vy
-MoN4zpvhboue70RP1ZZG3yp8s9yR62XrO+44DrKKIhVitpa1IPSavFovFVl/vx1H
-F6PuZvACBF7mRZa23h9XSizvdfycEDf3rZidLG/Y9IarrLF3HYjClBktJTtm0YaU
-QnmTSUdNvRBCs6/BGQNXY76VB5AHNjeLjjuLLbxYF5XsHlsdacgdMv2ShmIcibrT
-nSMK3RdRdRt1Nu1k6v7MkGcaSky7zJIeu6+VftA/7bVKBcnvb+iGZSUSk2QRTCGW
-nT+c65hmPp61jcBOgCF3CntcIw4eEDc=
------END PRIVATE KEY-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client6-req.pem b/tests/integration/test_ssl_cert_authentication/certs/client6-req.pem
deleted file mode 100644
index 1723c8c7273..00000000000
--- a/tests/integration/test_ssl_cert_authentication/certs/client6-req.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEnDCCAoQCAQAwVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUx
-ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEQMA4GA1UEAwwHY2xp
-ZW50NjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALs/t1chYQQ+iuvJ
-pAzNCyX0Xxm7g/LUph4bTuvl0M4SFIgDVvgNVncg/s1pMtELEr5f9g7NT5o1O+uf
-aZEg/EonY3c9/0z9HjuPZx4py40UGtjmsJOjwoyyHKSfgOXhmx56P6IkATAgD6VY
-d7Hsfucj4lEDetnCkVq8r9iSaiZhIL6YwvdkmiI3/TN5grMTH2p9AmY+oTXKK8V0
-DZxeCWUT0OJjIAaoBUuTs9WLox4gVDfWaCBpktx2fS2JeZS+6BsTV5bsiKyMNZIs
-kK8fsCRXWMEwXsgqsPMJn/fd7R0Zr6SdmRVV022KqY9kJKJviRKQkQagpivv7koC
-zgInEv8EdnomF5MNq2AyEOsgsnlu552hVVjQBTUnQFtSXa/mdnyjKJYWAHKXjEAG
-DecE6iQRfXQ8DMWznHUodcD2XHp7jtquXDCXJ96rd/kooDSnEAb6rWeeBjRqvYdu
-H9dfnKnKPNL+FmMa5l7vG10H4LV9O1Fb6pI2xuzuB7Wxg7zpcCju3dZDo+F1CXWW
-8/YOZGhrnzeIZQbPSc2DTmXcsDcAYj8RxxO9R7dooX2wSkpfceGbHuWIT6k6GnFn
-eRUVviH+RKR5McVvn+HutUtv/H55+ch6TF9th1zQZjlEd7wa5cX5I3ttmbhH+TXw
-feWhGkWQAZl0GhynQFUHmgE/U7zzAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEA
-Gewd4gSxvJJ1LIKLVTLeMdEdJfzsS52Kh3BCerku/C4ZKcIyT49dTbi6l6d40bHJ
-Cs32Hwps8/qufhwwWn0r/wyww1Mgfr6ccMgKmrz1VbgWmD9owDzlL014ygiDk8yi
-LwfSLe43NFrFC/FcAJUd/P8UEe0/8GcHjzhU/zqh3VAL7RzSL3k73CsTFiDaxtQL
-8qISpA0lYTldMx5RaN9COWi0rPFv7mJAYRXtE/Cb+T2hb53khOiiRrJYIEJjjAhj
-g8p9FOzlbXdpfoChVk7NA90CbCbxrQ2BiUqQAVYnGhntzHMwR9YxOYjvjnuiHuHX
-7+4Vheda88TciMJlj0TC2e1mXBo182n/qfETeI26MsEOs3DidLT+ygM3woFQyIrX
-3x2kDlvmILKg1mPGhqaRwwzCmk5a1TVdDTRo9VkOvR5/tbfG3vHlgpvBtUFCkEjX
-HOyRh0A3TquofUbtx638lMWscBLqM5g6VO+Hytk6zBmq+8caJFNTOeTHZur04ZLM
-SWfkIwl0B863owNuq4KxXI3NvpCc5LtGc9UrwVoHSH/pv6tbKEX15Y0ERL5/e33M
-GT0D00cPnWAzmYQpYzHQ3Dj29XKlIxWBkn1QvrIFyb/T+dld1efZ3HlQxZEQvOsR
-McY90r+HmVt8uCioYnC4DmchWlSX1MJe/h72udVbAXk=
------END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/generate_certs.sh b/tests/integration/test_ssl_cert_authentication/certs/generate_certs.sh
index e8d649fcff1..a09b7b2874e 100755
--- a/tests/integration/test_ssl_cert_authentication/certs/generate_certs.sh
+++ b/tests/integration/test_ssl_cert_authentication/certs/generate_certs.sh
@@ -14,16 +14,12 @@ openssl req -newkey rsa:4096 -nodes -batch -keyout client1-key.pem -out client1-
 openssl req -newkey rsa:4096 -nodes -batch -keyout client2-key.pem -out client2-req.pem -subj "/C=RU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=client2"
 openssl req -newkey rsa:4096 -nodes -batch -keyout client3-key.pem -out client3-req.pem -subj "/C=RU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=client3"
 openssl req -newkey rsa:4096 -nodes -batch -keyout client4-key.pem -out client4-req.pem -subj "/C=RU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=client4"
-openssl req -newkey rsa:4096 -nodes -batch -keyout client5-key.pem -out client5-req.pem -subj "/C=RU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=client5"
-openssl req -newkey rsa:4096 -nodes -batch -keyout client6-key.pem -out client6-req.pem -subj "/C=RU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=client6"
 
 # 5. Use CA's private key to sign client's CSR and get back the signed certificate
 openssl x509 -req -days 3650 -in client1-req.pem -CA ca-cert.pem -CAkey ca-key.pem -CAcreateserial -out client1-cert.pem
 openssl x509 -req -days 3650 -in client2-req.pem -CA ca-cert.pem -CAkey ca-key.pem -CAcreateserial -out client2-cert.pem
 openssl x509 -req -days 3650 -in client3-req.pem -CA ca-cert.pem -CAkey ca-key.pem -CAcreateserial -out client3-cert.pem
 openssl x509 -req -days 3650 -in client4-req.pem -CA ca-cert.pem -CAkey ca-key.pem -CAcreateserial -extfile client4-ext.cnf -out client4-cert.pem
-openssl x509 -req -days 3650 -in client5-req.pem -CA ca-cert.pem -CAkey ca-key.pem -CAcreateserial -extfile client5-ext.cnf -out client5-cert.pem
-openssl x509 -req -days 3650 -in client6-req.pem -CA ca-cert.pem -CAkey ca-key.pem -CAcreateserial -extfile client6-ext.cnf -out client6-cert.pem
 
 # 6. Generate one more self-signed certificate and private key for using as wrong certificate (because it's not signed by CA)
 openssl req -newkey rsa:4096 -x509 -days 3650 -nodes -batch -keyout wrong-key.pem -out wrong-cert.pem -subj "/C=RU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=client"
diff --git a/tests/integration/test_ssl_cert_authentication/configs/users_with_ssl_auth.xml b/tests/integration/test_ssl_cert_authentication/configs/users_with_ssl_auth.xml
index b697c010195..4bd30163ea6 100644
--- a/tests/integration/test_ssl_cert_authentication/configs/users_with_ssl_auth.xml
+++ b/tests/integration/test_ssl_cert_authentication/configs/users_with_ssl_auth.xml
@@ -17,11 +17,6 @@
                 <subject_alt_name>URI:spiffe://foo.com/baz</subject_alt_name>
             </ssl_certificates>
         </jerome>
-        <stewie>
-            <ssl_certificates>
-                <subject_alt_name>URI:spiffe://bar.com/foo/*/far</subject_alt_name>
-            </ssl_certificates>
-        </stewie>
         <peter>
             <no_password/>
         </peter>
diff --git a/tests/integration/test_ssl_cert_authentication/test.py b/tests/integration/test_ssl_cert_authentication/test.py
index 4b5f3332a48..3af88759e82 100644
--- a/tests/integration/test_ssl_cert_authentication/test.py
+++ b/tests/integration/test_ssl_cert_authentication/test.py
@@ -334,8 +334,6 @@ def test_create_user():
         'lucy\tssl_certificate\t{"common_names":["client2","client3"]}\n'
     )
 
-    instance.query("DROP USER emma")
-
 
 def test_x509_san_support():
     assert (
@@ -371,42 +369,3 @@ def test_x509_san_support():
         instance.query("SHOW CREATE USER jemma")
         == "CREATE USER jemma IDENTIFIED WITH ssl_certificate SAN \\'URI:spiffe://foo.com/bar\\', \\'URI:spiffe://foo.com/baz\\'\n"
     )
-
-    instance.query("DROP USER jemma")
-
-
-def test_x509_san_wildcard_support():
-    assert (
-        execute_query_native(
-            instance, "SELECT currentUser()", user="stewie", cert_name="client5"
-        )
-        == "stewie\n"
-    )
-
-    assert (
-        instance.query(
-            "SELECT name, auth_type, auth_params FROM system.users WHERE name='stewie'"
-        )
-        == 'stewie\tssl_certificate\t{"subject_alt_names":["URI:spiffe:\\\\/\\\\/bar.com\\\\/foo\\\\/*\\\\/far"]}\n'
-    )
-
-    assert (
-        instance.query("SHOW CREATE USER stewie")
-        == "CREATE USER stewie IDENTIFIED WITH ssl_certificate SAN \\'URI:spiffe://bar.com/foo/*/far\\'\n"
-    )
-
-    instance.query(
-        "CREATE USER brian IDENTIFIED WITH ssl_certificate SAN 'URI:spiffe://bar.com/foo/*/far'"
-    )
-
-    assert (
-        execute_query_https("SELECT currentUser()", user="brian", cert_name="client6")
-        == "brian\n"
-    )
-
-    assert (
-        instance.query("SHOW CREATE USER brian")
-        == "CREATE USER brian IDENTIFIED WITH ssl_certificate SAN \\'URI:spiffe://bar.com/foo/*/far\\'\n"
-    )
-
-    instance.query("DROP USER brian")
diff --git a/tests/integration/test_storage_azure_blob_storage/test.py b/tests/integration/test_storage_azure_blob_storage/test.py
index c1f518e45ce..6fbe7634642 100644
--- a/tests/integration/test_storage_azure_blob_storage/test.py
+++ b/tests/integration/test_storage_azure_blob_storage/test.py
@@ -5,7 +5,6 @@ import json
 import logging
 import os
 import io
-import re
 import random
 import threading
 import time
@@ -135,7 +134,6 @@ def test_create_table_connection_string(cluster):
         Engine = AzureBlobStorage('{cluster.env_variables['AZURITE_CONNECTION_STRING']}', 'cont', 'test_create_connection_string', 'CSV')
         """,
     )
-    azure_query(node, "DROP TABLE IF EXISTS test_create_table_conn_string")
 
 
 def test_create_table_account_string(cluster):
@@ -145,7 +143,6 @@ def test_create_table_account_string(cluster):
         f"CREATE TABLE test_create_table_account_url (key UInt64, data String) Engine = AzureBlobStorage('{cluster.env_variables['AZURITE_STORAGE_ACCOUNT_URL']}',"
         f"'cont', 'test_create_connection_string', 'devstoreaccount1', 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'CSV')",
     )
-    azure_query(node, "DROP TABLE IF EXISTS test_create_table_account_url")
 
 
 def test_simple_write_account_string(cluster):
@@ -159,7 +156,6 @@ def test_simple_write_account_string(cluster):
     azure_query(node, "INSERT INTO test_simple_write 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'
-    azure_query(node, "DROP TABLE test_simple_write")
 
 
 def test_simple_write_connection_string(cluster):
@@ -173,7 +169,6 @@ def test_simple_write_connection_string(cluster):
     azure_query(node, "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'
-    azure_query(node, "DROP TABLE test_simple_write_connection_string")
 
 
 def test_simple_write_named_collection_1(cluster):
@@ -189,7 +184,7 @@ def test_simple_write_named_collection_1(cluster):
     )
     print(get_azure_file_content("test_simple_write_named.csv", port))
     assert get_azure_file_content("test_simple_write_named.csv", port) == '1,"a"\n'
-    azure_query(node, "DROP TABLE test_simple_write_named_collection_1")
+    azure_query(node, "TRUNCATE TABLE test_simple_write_named_collection_1")
 
 
 def test_simple_write_named_collection_2(cluster):
@@ -206,7 +201,6 @@ def test_simple_write_named_collection_2(cluster):
     )
     print(get_azure_file_content("test_simple_write_named_2.csv", port))
     assert get_azure_file_content("test_simple_write_named_2.csv", port) == '1,"a"\n'
-    azure_query(node, "DROP TABLE test_simple_write_named_collection_2")
 
 
 def test_partition_by(cluster):
@@ -228,7 +222,6 @@ def test_partition_by(cluster):
     assert "1,2,3\n" == get_azure_file_content("test_3.csv", port)
     assert "3,2,1\n" == get_azure_file_content("test_1.csv", port)
     assert "78,43,45\n" == get_azure_file_content("test_45.csv", port)
-    azure_query(node, "DROP TABLE test_partitioned_write")
 
 
 def test_partition_by_string_column(cluster):
@@ -249,7 +242,6 @@ def test_partition_by_string_column(cluster):
     assert '1,"foo/bar"\n' == get_azure_file_content("test_foo/bar.csv", port)
     assert '3,"йцук"\n' == get_azure_file_content("test_йцук.csv", port)
     assert '78,"你好"\n' == get_azure_file_content("test_你好.csv", port)
-    azure_query(node, "DROP TABLE test_partitioned_string_write")
 
 
 def test_partition_by_const_column(cluster):
@@ -268,7 +260,6 @@ def test_partition_by_const_column(cluster):
     )
     azure_query(node, f"INSERT INTO test_partitioned_const_write VALUES {values}")
     assert values_csv == get_azure_file_content("test_88.csv", port)
-    azure_query(node, "DROP TABLE test_partitioned_const_write")
 
 
 def test_truncate(cluster):
@@ -284,7 +275,6 @@ def test_truncate(cluster):
     azure_query(node, "TRUNCATE TABLE test_truncate")
     with pytest.raises(Exception):
         print(get_azure_file_content("test_truncate.csv", port))
-    azure_query(node, "DROP TABLE test_truncate")
 
 
 def test_simple_read_write(cluster):
@@ -301,7 +291,6 @@ def test_simple_read_write(cluster):
     assert get_azure_file_content("test_simple_read_write.csv", port) == '1,"a"\n'
     print(azure_query(node, "SELECT * FROM test_simple_read_write"))
     assert azure_query(node, "SELECT * FROM test_simple_read_write") == "1\ta\n"
-    azure_query(node, "DROP TABLE test_simple_read_write")
 
 
 def test_create_new_files_on_insert(cluster):
@@ -354,7 +343,6 @@ def test_overwrite(cluster):
 
     result = azure_query(node, f"select count() from test_overwrite")
     assert int(result) == 200
-    azure_query(node, f"DROP TABLE test_overwrite")
 
 
 def test_insert_with_path_with_globs(cluster):
@@ -367,7 +355,6 @@ def test_insert_with_path_with_globs(cluster):
     node.query_and_get_error(
         f"insert into table function test_insert_globs SELECT number, randomString(100) FROM numbers(500)"
     )
-    azure_query(node, f"DROP TABLE test_insert_globs")
 
 
 def test_put_get_with_globs(cluster):
@@ -376,7 +363,6 @@ def test_put_get_with_globs(cluster):
     node = cluster.instances["node"]  # type: ClickHouseInstance
     table_format = "column1 UInt32, column2 UInt32, column3 UInt32"
     max_path = ""
-    used_names = []
     for i in range(10):
         for j in range(10):
             path = "{}/{}_{}/{}.csv".format(
@@ -385,8 +371,6 @@ def test_put_get_with_globs(cluster):
             max_path = max(path, max_path)
             values = f"({i},{j},{i + j})"
 
-            used_names.append(f"test_put_{i}_{j}")
-
             azure_query(
                 node,
                 f"CREATE TABLE test_put_{i}_{j} ({table_format}) Engine = AzureBlobStorage(azure_conf2, "
@@ -407,9 +391,6 @@ def test_put_get_with_globs(cluster):
             bucket="cont", max_path=max_path
         )
     ]
-    azure_query(node, "DROP TABLE test_glob_select")
-    for name in used_names:
-        azure_query(node, f"DROP TABLE {name}")
 
 
 def test_azure_glob_scheherazade(cluster):
@@ -418,14 +399,12 @@ def test_azure_glob_scheherazade(cluster):
     values = "(1, 1, 1)"
     nights_per_job = 1001 // 30
     jobs = []
-    used_names = []
     for night in range(0, 1001, nights_per_job):
 
         def add_tales(start, end):
             for i in range(start, end):
                 path = "night_{}/tale.csv".format(i)
                 unique_num = random.randint(1, 10000)
-                used_names.append(f"test_scheherazade_{i}_{unique_num}")
                 azure_query(
                     node,
                     f"CREATE TABLE test_scheherazade_{i}_{unique_num} ({table_format}) Engine = AzureBlobStorage(azure_conf2, "
@@ -453,9 +432,6 @@ def test_azure_glob_scheherazade(cluster):
     )
     query = "select count(), sum(column1), sum(column2), sum(column3) from test_glob_select_scheherazade"
     assert azure_query(node, query).splitlines() == ["1001\t1001\t1001\t1001"]
-    azure_query(node, "DROP TABLE test_glob_select_scheherazade")
-    for name in used_names:
-        azure_query(node, f"DROP TABLE {name}")
 
 
 @pytest.mark.parametrize(
@@ -529,8 +505,6 @@ def test_schema_inference_no_globs(cluster):
     assert azure_query(node, query).splitlines() == [
         "499500\t2890\t332833500\ttest_schema_inference_no_globs.csv\tcont/test_schema_inference_no_globs.csv"
     ]
-    azure_query(node, f"DROP TABLE test_schema_inference_src")
-    azure_query(node, f"DROP TABLE test_select_inference")
 
 
 def test_schema_inference_from_globs(cluster):
@@ -539,7 +513,6 @@ def test_schema_inference_from_globs(cluster):
     node = cluster.instances["node"]  # type: ClickHouseInstance
     table_format = "column1 UInt32, column2 UInt32, column3 UInt32"
     max_path = ""
-    used_names = []
     for i in range(10):
         for j in range(10):
             path = "{}/{}_{}/{}.csv".format(
@@ -547,7 +520,6 @@ def test_schema_inference_from_globs(cluster):
             )
             max_path = max(path, max_path)
             values = f"({i},{j},{i + j})"
-            used_names.append(f"test_schema_{i}_{j}")
 
             azure_query(
                 node,
@@ -573,9 +545,6 @@ def test_schema_inference_from_globs(cluster):
             bucket="cont", max_path=max_path
         )
     ]
-    azure_query(node, "DROP TABLE test_glob_select_inference")
-    for name in used_names:
-        azure_query(node, f"DROP TABLE {name}")
 
 
 def test_simple_write_account_string_table_function(cluster):
@@ -625,7 +594,7 @@ def test_simple_write_named_collection_1_table_function(cluster):
 
     azure_query(
         node,
-        "DROP TABLE drop_table",
+        "TRUNCATE TABLE drop_table",
     )
 
 
@@ -636,7 +605,6 @@ def test_simple_write_named_collection_2_table_function(cluster):
         node,
         f"INSERT INTO TABLE FUNCTION azureBlobStorage(azure_conf2, storage_account_url = '{cluster.env_variables['AZURITE_STORAGE_ACCOUNT_URL']}',"
         f" container='cont', blob_path='test_simple_write_named_2_tf.csv', format='CSV', structure='key UInt64, data String') VALUES (1, 'a')",
-        settings={"azure_truncate_on_insert": 1},
     )
     print(get_azure_file_content("test_simple_write_named_2_tf.csv", port))
     assert get_azure_file_content("test_simple_write_named_2_tf.csv", port) == '1,"a"\n'
@@ -660,7 +628,6 @@ def test_put_get_with_globs_tf(cluster):
                 node,
                 f"INSERT INTO TABLE FUNCTION azureBlobStorage(azure_conf2, storage_account_url = '{cluster.env_variables['AZURITE_STORAGE_ACCOUNT_URL']}',"
                 f" container='cont', blob_path='{path}', format='CSV', compression='auto', structure='{table_format}') VALUES {values}",
-                settings={"azure_truncate_on_insert": 1},
             )
     query = (
         f"select sum(column1), sum(column2), sum(column3), min(_file), max(_path) from azureBlobStorage(azure_conf2, "
@@ -681,7 +648,7 @@ def test_schema_inference_no_globs_tf(cluster):
     query = (
         f"insert into table function azureBlobStorage(azure_conf2, storage_account_url = '{cluster.env_variables['AZURITE_STORAGE_ACCOUNT_URL']}', "
         f"container='cont', blob_path='test_schema_inference_no_globs_tf.csv', format='CSVWithNames', structure='{table_format}') "
-        f"SELECT number, toString(number), number * number FROM numbers(1000) SETTINGS azure_truncate_on_insert=1"
+        f"SELECT number, toString(number), number * number FROM numbers(1000)"
     )
     azure_query(node, query)
 
@@ -714,7 +681,7 @@ def test_schema_inference_from_globs_tf(cluster):
                 f"insert into table function azureBlobStorage(azure_conf2, storage_account_url = '{cluster.env_variables['AZURITE_STORAGE_ACCOUNT_URL']}', "
                 f"container='cont', blob_path='{path}', format='CSVWithNames', structure='{table_format}') VALUES {values}"
             )
-            azure_query(node, query, settings={"azure_truncate_on_insert": 1})
+            azure_query(node, query)
 
     query = (
         f"select sum(column1), sum(column2), sum(column3), min(_file), max(_path) from azureBlobStorage(azure_conf2, "
@@ -741,7 +708,6 @@ def test_partition_by_tf(cluster):
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{cluster.env_variables['AZURITE_STORAGE_ACCOUNT_URL']}', "
         f"'cont', '{filename}', 'devstoreaccount1', 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', "
         f"'CSV', 'auto', '{table_format}') PARTITION BY {partition_by} VALUES {values}",
-        settings={"azure_truncate_on_insert": 1},
     )
 
     assert "1,2,3\n" == get_azure_file_content("test_partition_tf_3.csv", port)
@@ -761,7 +727,6 @@ def test_filter_using_file(cluster):
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{cluster.env_variables['AZURITE_STORAGE_ACCOUNT_URL']}', 'cont', '{filename}', "
         f"'devstoreaccount1', 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'CSV', 'auto', "
         f"'{table_format}') PARTITION BY {partition_by} VALUES {values}",
-        settings={"azure_truncate_on_insert": 1},
     )
 
     query = (
@@ -779,7 +744,7 @@ def test_read_subcolumns(cluster):
         node,
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_subcolumns.tsv', "
         f"'devstoreaccount1', 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', 'auto',"
-        f" 'a Tuple(b Tuple(c UInt32, d UInt32), e UInt32)') select ((1, 2), 3) SETTINGS azure_truncate_on_insert=1",
+        f" 'a Tuple(b Tuple(c UInt32, d UInt32), e UInt32)') select ((1, 2), 3)",
     )
 
     azure_query(
@@ -829,7 +794,7 @@ def test_read_subcolumn_time(cluster):
         node,
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_subcolumn_time.tsv', "
         f"'devstoreaccount1', 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', 'auto',"
-        f" 'a UInt32') select (42) SETTINGS azure_truncate_on_insert=1",
+        f" 'a UInt32') select (42)",
     )
 
     res = node.query(
@@ -860,7 +825,6 @@ def test_function_signatures(cluster):
     azure_query(
         node,
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_signature.csv', '{account_name}', '{account_key}', 'CSV', 'auto', 'column1 UInt32') VALUES (1),(2),(3)",
-        settings={"azure_truncate_on_insert": 1},
     )
 
     # " - connection_string, container_name, blobpath\n"
@@ -975,13 +939,11 @@ def test_union_schema_inference_mode(cluster):
     azure_query(
         node,
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_union_schema_inference1.jsonl', '{account_name}', '{account_key}', 'JSONEachRow', 'auto', 'a UInt32') VALUES (1)",
-        settings={"azure_truncate_on_insert": 1},
     )
 
     azure_query(
         node,
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_union_schema_inference2.jsonl', '{account_name}', '{account_key}', 'JSONEachRow', 'auto', 'b UInt32') VALUES (2)",
-        settings={"azure_truncate_on_insert": 1},
     )
 
     node.query("system drop schema cache for azure")
@@ -1019,7 +981,6 @@ def test_union_schema_inference_mode(cluster):
     azure_query(
         node,
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_union_schema_inference3.jsonl', '{account_name}', '{account_key}', 'CSV', 'auto', 's String') VALUES ('Error')",
-        settings={"azure_truncate_on_insert": 1},
     )
 
     error = azure_query(
@@ -1041,7 +1002,7 @@ def test_schema_inference_cache(cluster):
     azure_query(
         node,
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_cache0.jsonl', '{account_name}', '{account_key}') "
-        f"select * from numbers(100) SETTINGS azure_truncate_on_insert=1",
+        f"select * from numbers(100)",
     )
 
     time.sleep(1)
@@ -1248,19 +1209,19 @@ def test_filtering_by_file_or_path(cluster):
     azure_query(
         node,
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}','cont', 'test_filter1.tsv', 'devstoreaccount1',  "
-        f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', 'auto', 'x UInt64') select 1 SETTINGS azure_truncate_on_insert=1",
+        f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', 'auto', 'x UInt64') select 1",
     )
 
     azure_query(
         node,
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}','cont', 'test_filter2.tsv', 'devstoreaccount1',  "
-        f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', 'auto', 'x UInt64') select 2 SETTINGS azure_truncate_on_insert=1",
+        f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', 'auto', 'x UInt64') select 2",
     )
 
     azure_query(
         node,
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_filter3.tsv', 'devstoreaccount1', "
-        f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', 'auto', 'x UInt64') select 3 SETTINGS azure_truncate_on_insert=1",
+        f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', 'auto', 'x UInt64') select 3",
     )
 
     node.query(
@@ -1272,7 +1233,7 @@ def test_filtering_by_file_or_path(cluster):
     node.query("SYSTEM FLUSH LOGS")
 
     result = node.query(
-        f"SELECT ProfileEvents['EngineFileLikeReadFiles'] FROM system.query_log WHERE query ilike '%select%azure%test_filter%' AND type='QueryFinish' ORDER BY event_time_microseconds DESC LIMIT 1"
+        f"SELECT ProfileEvents['EngineFileLikeReadFiles'] FROM system.query_log WHERE query ilike '%select%azure%test_filter%' AND type='QueryFinish'"
     )
 
     assert int(result) == 1
@@ -1284,19 +1245,19 @@ def test_size_virtual_column(cluster):
     azure_query(
         node,
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}','cont', 'test_size_virtual_column1.tsv', 'devstoreaccount1',  "
-        f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', 'auto', 'x UInt64') select 1 SETTINGS azure_truncate_on_insert=1",
+        f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', 'auto', 'x UInt64') select 1",
     )
 
     azure_query(
         node,
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}','cont', 'test_size_virtual_column2.tsv', 'devstoreaccount1',  "
-        f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', 'auto', 'x UInt64') select 11 SETTINGS azure_truncate_on_insert=1",
+        f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', 'auto', 'x UInt64') select 11",
     )
 
     azure_query(
         node,
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_size_virtual_column3.tsv', 'devstoreaccount1', "
-        f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', 'auto', 'x UInt64') select 111 SETTINGS azure_truncate_on_insert=1",
+        f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', 'auto', 'x UInt64') select 111",
     )
 
     result = azure_query(
@@ -1319,7 +1280,7 @@ def test_format_detection(cluster):
     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) SETTINGS azure_truncate_on_insert=1",
+        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(
@@ -1389,7 +1350,7 @@ def test_write_to_globbed_partitioned_path(cluster):
     account_key = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=="
     error = azure_query(
         node,
-        f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_data_*_{{_partition_id}}', '{account_name}', '{account_key}', 'CSV', 'auto', 'x UInt64') partition by 42 select 42 SETTINGS azure_truncate_on_insert=1",
+        f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_data_*_{{_partition_id}}', '{account_name}', '{account_key}', 'CSV', 'auto', 'x UInt64') partition by 42 select 42",
         expect_error="true",
     )
 
@@ -1501,94 +1462,3 @@ def test_insert_create_new_file(cluster):
     assert TSV(res) == TSV(
         "test_create_new_file.csv\t1\ntest_create_new_file.1.csv\t2\n"
     )
-
-
-def test_hive_partitioning_with_one_parameter(cluster):
-    # type: (ClickHouseCluster) -> None
-    node = cluster.instances["node"]  # type: ClickHouseInstance
-    table_format = "column1 String, column2 String"
-    values = f"('Elizabeth', 'Gordon')"
-    path = "a/column1=Elizabeth/sample.csv"
-
-    azure_query(
-        node,
-        f"INSERT INTO TABLE FUNCTION azureBlobStorage(azure_conf2, storage_account_url = '{cluster.env_variables['AZURITE_STORAGE_ACCOUNT_URL']}',"
-        f" container='cont', blob_path='{path}', format='CSVWithNames', compression='auto', structure='{table_format}') VALUES {values}",
-        settings={"azure_truncate_on_insert": 1},
-    )
-
-    query = (
-        f"SELECT column2, _file, _path, column1 FROM azureBlobStorage(azure_conf2, "
-        f"storage_account_url = '{cluster.env_variables['AZURITE_STORAGE_ACCOUNT_URL']}', container='cont', "
-        f"blob_path='{path}', format='CSVWithNames', structure='{table_format}')"
-    )
-    assert azure_query(
-        node, query, settings={"use_hive_partitioning": 1}
-    ).splitlines() == [
-        "Gordon\tsample.csv\t{bucket}/{max_path}\tElizabeth".format(
-            bucket="cont", max_path=path
-        )
-    ]
-
-    query = (
-        f"SELECT column2 FROM azureBlobStorage(azure_conf2, "
-        f"storage_account_url = '{cluster.env_variables['AZURITE_STORAGE_ACCOUNT_URL']}', container='cont', "
-        f"blob_path='{path}', format='CSVWithNames', structure='{table_format}');"
-    )
-    assert azure_query(
-        node, query, settings={"use_hive_partitioning": 1}
-    ).splitlines() == ["Gordon"]
-
-
-def test_hive_partitioning_with_all_parameters(cluster):
-    # type: (ClickHouseCluster) -> None
-    node = cluster.instances["node"]  # type: ClickHouseInstance
-    table_format = "column1 String, column2 String"
-    values_1 = f"('Elizabeth', 'Gordon')"
-    values_2 = f"('Emilia', 'Gregor')"
-    path = "a/column1=Elizabeth/column2=Gordon/sample.csv"
-
-    azure_query(
-        node,
-        f"INSERT INTO TABLE FUNCTION azureBlobStorage(azure_conf2, storage_account_url = '{cluster.env_variables['AZURITE_STORAGE_ACCOUNT_URL']}',"
-        f" container='cont', blob_path='{path}', format='CSVWithNames', compression='auto', structure='{table_format}') VALUES {values_1}, {values_2}",
-        settings={"azure_truncate_on_insert": 1},
-    )
-
-    query = (
-        f"SELECT column1, column2, _file, _path FROM azureBlobStorage(azure_conf2, "
-        f"storage_account_url = '{cluster.env_variables['AZURITE_STORAGE_ACCOUNT_URL']}', container='cont', "
-        f"blob_path='{path}', format='CSVWithNames', structure='{table_format}');"
-    )
-    pattern = r"DB::Exception: Cannot use hive partitioning for file"
-
-    with pytest.raises(Exception, match=pattern):
-        azure_query(node, query, settings={"use_hive_partitioning": 1})
-
-
-def test_hive_partitioning_without_setting(cluster):
-    # type: (ClickHouseCluster) -> None
-    node = cluster.instances["node"]  # type: ClickHouseInstance
-    table_format = "column1 String, column2 String"
-    values_1 = f"('Elizabeth', 'Gordon')"
-    values_2 = f"('Emilia', 'Gregor')"
-    path = "a/column1=Elizabeth/column2=Gordon/column3=Gordon/sample.csv"
-
-    azure_query(
-        node,
-        f"INSERT INTO TABLE FUNCTION azureBlobStorage(azure_conf2, storage_account_url = '{cluster.env_variables['AZURITE_STORAGE_ACCOUNT_URL']}',"
-        f" container='cont', blob_path='{path}', format='CSVWithNames', compression='auto', structure='{table_format}') VALUES {values_1}, {values_2}",
-        settings={"azure_truncate_on_insert": 1},
-    )
-
-    query = (
-        f"SELECT column1, column2, _file, _path, column3 FROM azureBlobStorage(azure_conf2, "
-        f"storage_account_url = '{cluster.env_variables['AZURITE_STORAGE_ACCOUNT_URL']}', container='cont', "
-        f"blob_path='{path}', format='CSVWithNames', structure='{table_format}');"
-    )
-    pattern = re.compile(
-        r"DB::Exception: Unknown expression identifier '.*' in scope.*", re.DOTALL
-    )
-
-    with pytest.raises(Exception, match=pattern):
-        azure_query(node, query, settings={"use_hive_partitioning": 0})
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 04baf007c69..6c5e2d20ca5 100644
--- a/tests/integration/test_storage_azure_blob_storage/test_cluster.py
+++ b/tests/integration/test_storage_azure_blob_storage/test_cluster.py
@@ -72,7 +72,6 @@ def test_select_all(cluster):
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_cluster_select_all.csv', 'devstoreaccount1',"
         f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'CSV', 'auto', 'key UInt64, data String') "
         f"VALUES (1, 'a'), (2, 'b')",
-        settings={"azure_truncate_on_insert": 1},
     )
     print(get_azure_file_content("test_cluster_select_all.csv", port))
 
@@ -102,7 +101,6 @@ def test_count(cluster):
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_cluster_count.csv', 'devstoreaccount1', "
         f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'CSV', "
         f"'auto', 'key UInt64') VALUES (1), (2)",
-        settings={"azure_truncate_on_insert": 1},
     )
     print(get_azure_file_content("test_cluster_count.csv", port))
 
@@ -131,7 +129,6 @@ def test_union_all(cluster):
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_parquet_union_all', 'devstoreaccount1', "
         f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'Parquet', "
         f"'auto', 'a Int32, b String') VALUES (1, 'a'), (2, 'b'), (3, 'c'), (4, 'd')",
-        settings={"azure_truncate_on_insert": 1},
     )
 
     pure_azure = azure_query(
@@ -183,7 +180,6 @@ def test_skip_unavailable_shards(cluster):
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_skip_unavailable.csv', 'devstoreaccount1', "
         f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', "
         f"'auto', 'a UInt64') VALUES (1), (2)",
-        settings={"azure_truncate_on_insert": 1},
     )
     result = azure_query(
         node,
@@ -204,7 +200,6 @@ def test_unset_skip_unavailable_shards(cluster):
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_unset_skip_unavailable.csv', 'devstoreaccount1', "
         f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', "
         f"'auto', 'a UInt64') VALUES (1), (2)",
-        settings={"azure_truncate_on_insert": 1},
     )
     result = azure_query(
         node,
@@ -223,7 +218,6 @@ def test_cluster_with_named_collection(cluster):
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_cluster_with_named_collection.csv', 'devstoreaccount1', "
         f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'auto', "
         f"'auto', 'a UInt64') VALUES (1), (2)",
-        settings={"azure_truncate_on_insert": 1},
     )
 
     pure_azure = azure_query(
@@ -255,7 +249,6 @@ def test_partition_parallel_reading_with_cluster(cluster):
         f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', '{filename}', 'devstoreaccount1', "
         f"'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==', 'CSV', 'auto', '{table_format}') "
         f"PARTITION BY {partition_by} VALUES {values}",
-        settings={"azure_truncate_on_insert": 1},
     )
 
     assert "1,2,3\n" == get_azure_file_content("test_tf_3.csv", port)
@@ -279,12 +272,12 @@ def test_format_detection(cluster):
 
     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) SETTINGS azure_truncate_on_insert=1",
+        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) SETTINGS azure_truncate_on_insert=1",
+        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(
diff --git a/tests/integration/test_storage_delta/test.py b/tests/integration/test_storage_delta/test.py
index 0aa846478ea..ff2a4614e49 100644
--- a/tests/integration/test_storage_delta/test.py
+++ b/tests/integration/test_storage_delta/test.py
@@ -8,8 +8,6 @@ import os
 import json
 import time
 import glob
-import random
-import string
 
 import pyspark
 import delta
@@ -57,11 +55,6 @@ def get_spark():
     return builder.master("local").getOrCreate()
 
 
-def randomize_table_name(table_name, random_suffix_length=10):
-    letters = string.ascii_letters + string.digits
-    return f"{table_name}{''.join(random.choice(letters) for _ in range(random_suffix_length))}"
-
-
 @pytest.fixture(scope="module")
 def started_cluster():
     try:
@@ -161,7 +154,7 @@ def test_single_log_file(started_cluster):
     spark = started_cluster.spark_session
     minio_client = started_cluster.minio_client
     bucket = started_cluster.minio_bucket
-    TABLE_NAME = randomize_table_name("test_single_log_file")
+    TABLE_NAME = "test_single_log_file"
 
     inserted_data = "SELECT number as a, toString(number + 1) as b FROM numbers(100)"
     parquet_data_path = create_initial_data_file(
@@ -185,7 +178,7 @@ def test_partition_by(started_cluster):
     spark = started_cluster.spark_session
     minio_client = started_cluster.minio_client
     bucket = started_cluster.minio_bucket
-    TABLE_NAME = randomize_table_name("test_partition_by")
+    TABLE_NAME = "test_partition_by"
 
     write_delta_from_df(
         spark,
@@ -207,7 +200,7 @@ def test_checkpoint(started_cluster):
     spark = started_cluster.spark_session
     minio_client = started_cluster.minio_client
     bucket = started_cluster.minio_bucket
-    TABLE_NAME = randomize_table_name("test_checkpoint")
+    TABLE_NAME = "test_checkpoint"
 
     write_delta_from_df(
         spark,
@@ -282,7 +275,7 @@ def test_multiple_log_files(started_cluster):
     spark = started_cluster.spark_session
     minio_client = started_cluster.minio_client
     bucket = started_cluster.minio_bucket
-    TABLE_NAME = randomize_table_name("test_multiple_log_files")
+    TABLE_NAME = "test_multiple_log_files"
 
     write_delta_from_df(
         spark, generate_data(spark, 0, 100), f"/{TABLE_NAME}", mode="overwrite"
@@ -320,7 +313,7 @@ def test_metadata(started_cluster):
     spark = started_cluster.spark_session
     minio_client = started_cluster.minio_client
     bucket = started_cluster.minio_bucket
-    TABLE_NAME = randomize_table_name("test_metadata")
+    TABLE_NAME = "test_metadata"
 
     parquet_data_path = create_initial_data_file(
         started_cluster,
@@ -349,9 +342,9 @@ def test_metadata(started_cluster):
 
 
 def test_types(started_cluster):
-    TABLE_NAME = randomize_table_name("test_types")
+    TABLE_NAME = "test_types"
     spark = started_cluster.spark_session
-    result_file = randomize_table_name(f"{TABLE_NAME}_result_2")
+    result_file = f"{TABLE_NAME}_result_2"
 
     delta_table = (
         DeltaTable.create(spark)
@@ -425,7 +418,7 @@ def test_restart_broken(started_cluster):
     spark = started_cluster.spark_session
     minio_client = started_cluster.minio_client
     bucket = "broken"
-    TABLE_NAME = randomize_table_name("test_restart_broken")
+    TABLE_NAME = "test_restart_broken"
 
     if not minio_client.bucket_exists(bucket):
         minio_client.make_bucket(bucket)
@@ -462,18 +455,6 @@ def test_restart_broken(started_cluster):
         f"SELECT count() FROM {TABLE_NAME}"
     )
 
-    s3_disk_no_key_errors_metric_value = int(
-        instance.query(
-            """
-            SELECT value
-            FROM system.metrics
-            WHERE metric = 'DiskS3NoSuchKeyErrors'
-            """
-        ).strip()
-    )
-
-    assert s3_disk_no_key_errors_metric_value == 0
-
     minio_client.make_bucket(bucket)
 
     upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
@@ -486,7 +467,7 @@ def test_restart_broken_table_function(started_cluster):
     spark = started_cluster.spark_session
     minio_client = started_cluster.minio_client
     bucket = "broken2"
-    TABLE_NAME = randomize_table_name("test_restart_broken_table_function")
+    TABLE_NAME = "test_restart_broken_table_function"
 
     if not minio_client.bucket_exists(bucket):
         minio_client.make_bucket(bucket)
@@ -540,7 +521,7 @@ def test_partition_columns(started_cluster):
     spark = started_cluster.spark_session
     minio_client = started_cluster.minio_client
     bucket = started_cluster.minio_bucket
-    TABLE_NAME = randomize_table_name("test_partition_columns")
+    TABLE_NAME = "test_partition_columns"
     result_file = f"{TABLE_NAME}"
     partition_columns = ["b", "c", "d", "e"]
 
@@ -575,7 +556,7 @@ def test_partition_columns(started_cluster):
                 "test" + str(i),
                 datetime.strptime(f"2000-01-0{i}", "%Y-%m-%d"),
                 i,
-                False if i % 2 == 0 else True,
+                False,
             )
         ]
         df = spark.createDataFrame(data=data, schema=schema)
@@ -625,15 +606,15 @@ def test_partition_columns(started_cluster):
        ENGINE=DeltaLake('http://{started_cluster.minio_ip}:{started_cluster.minio_port}/{bucket}/{result_file}/', 'minio', 'minio123')"""
     )
     assert (
-        """1	test1	2000-01-01	1	true
+        """1	test1	2000-01-01	1	false
 2	test2	2000-01-02	2	false
-3	test3	2000-01-03	3	true
+3	test3	2000-01-03	3	false
 4	test4	2000-01-04	4	false
-5	test5	2000-01-05	5	true
+5	test5	2000-01-05	5	false
 6	test6	2000-01-06	6	false
-7	test7	2000-01-07	7	true
+7	test7	2000-01-07	7	false
 8	test8	2000-01-08	8	false
-9	test9	2000-01-09	9	true"""
+9	test9	2000-01-09	9	false"""
         == instance.query(f"SELECT * FROM {TABLE_NAME} ORDER BY b").strip()
     )
 
@@ -673,7 +654,7 @@ test9	2000-01-09	9"""
                 "test" + str(i),
                 datetime.strptime(f"2000-01-{i}", "%Y-%m-%d"),
                 i,
-                False if i % 2 == 0 else True,
+                False,
             )
         ]
         df = spark.createDataFrame(data=data, schema=schema)
@@ -699,23 +680,23 @@ test9	2000-01-09	9"""
     assert result == num_rows * 2
 
     assert (
-        """1	test1	2000-01-01	1	true
+        """1	test1	2000-01-01	1	false
 2	test2	2000-01-02	2	false
-3	test3	2000-01-03	3	true
+3	test3	2000-01-03	3	false
 4	test4	2000-01-04	4	false
-5	test5	2000-01-05	5	true
+5	test5	2000-01-05	5	false
 6	test6	2000-01-06	6	false
-7	test7	2000-01-07	7	true
+7	test7	2000-01-07	7	false
 8	test8	2000-01-08	8	false
-9	test9	2000-01-09	9	true
+9	test9	2000-01-09	9	false
 10	test10	2000-01-10	10	false
-11	test11	2000-01-11	11	true
+11	test11	2000-01-11	11	false
 12	test12	2000-01-12	12	false
-13	test13	2000-01-13	13	true
+13	test13	2000-01-13	13	false
 14	test14	2000-01-14	14	false
-15	test15	2000-01-15	15	true
+15	test15	2000-01-15	15	false
 16	test16	2000-01-16	16	false
-17	test17	2000-01-17	17	true
+17	test17	2000-01-17	17	false
 18	test18	2000-01-18	18	false"""
         == instance.query(
             f"""
diff --git a/tests/integration/test_storage_hdfs/test.py b/tests/integration/test_storage_hdfs/test.py
index 7a92e8adb0d..47d8f44c0b7 100644
--- a/tests/integration/test_storage_hdfs/test.py
+++ b/tests/integration/test_storage_hdfs/test.py
@@ -1,11 +1,8 @@
 import os
 
 import pytest
-import uuid
 import time
-import re
 from helpers.cluster import ClickHouseCluster, is_arm
-from helpers.client import QueryRuntimeException
 from helpers.test_tools import TSV
 from pyhdfs import HdfsClient
 
@@ -34,15 +31,13 @@ def started_cluster():
 
 
 def test_read_write_storage(started_cluster):
-    id = uuid.uuid4()
     hdfs_api = started_cluster.hdfs_api
-    filename = f"simple_storage_{id}"
     node1.query("drop table if exists SimpleHDFSStorage SYNC")
     node1.query(
-        f"create table SimpleHDFSStorage (id UInt32, name String, weight Float64) ENGINE = HDFS('hdfs://hdfs1:9000/{filename}', 'TSV')"
+        "create table SimpleHDFSStorage (id UInt32, name String, weight Float64) ENGINE = HDFS('hdfs://hdfs1:9000/simple_storage', 'TSV')"
     )
     node1.query("insert into SimpleHDFSStorage values (1, 'Mark', 72.53)")
-    assert hdfs_api.read_data(f"/{filename}") == "1\tMark\t72.53\n"
+    assert hdfs_api.read_data("/simple_storage") == "1\tMark\t72.53\n"
     assert node1.query("select * from SimpleHDFSStorage") == "1\tMark\t72.53\n"
 
 
@@ -66,17 +61,6 @@ def test_read_write_storage_with_globs(started_cluster):
         hdfs_api.write_data("/storage" + i, i + "\tMark\t72.53\n")
         assert hdfs_api.read_data("/storage" + i) == i + "\tMark\t72.53\n"
 
-    node1.query(
-        "create table HDFSStorageWithDoubleAsterisk (id UInt32, name String, weight Float64) ENGINE = HDFS('hdfs://hdfs1:9000/**.doublestar.tsv', 'TSV')"
-    )
-
-    for i in ["1", "2", "3"]:
-        hdfs_api.write_data(f"/subdir{i}/file{i}.doublestar.tsv", f"{i}\tMark\t72.53\n")
-    assert (
-        hdfs_api.read_data(f"/subdir{i}/file{i}.doublestar.tsv")
-        == f"{i}\tMark\t72.53\n"
-    )
-
     assert (
         node1.query(
             "select count(*) from HDFSStorageWithRange settings s3_throw_on_zero_files_match=1"
@@ -86,7 +70,6 @@ def test_read_write_storage_with_globs(started_cluster):
     assert node1.query("select count(*) from HDFSStorageWithEnum") == "3\n"
     assert node1.query("select count(*) from HDFSStorageWithQuestionMark") == "3\n"
     assert node1.query("select count(*) from HDFSStorageWithAsterisk") == "3\n"
-    assert node1.query("select count(*) from HDFSStorageWithDoubleAsterisk") == "3\n"
 
     try:
         node1.query("insert into HDFSStorageWithEnum values (1, 'NEW', 4.2)")
@@ -109,19 +92,6 @@ def test_read_write_storage_with_globs(started_cluster):
         print(ex)
         assert "in readonly mode" in str(ex)
 
-    try:
-        node1.query("insert into HDFSStorageWithDoubleAsterisk values (1, 'NEW', 4.2)")
-        assert False, "Exception have to be thrown"
-    except Exception as ex:
-        print(ex)
-        assert "in readonly mode" in str(ex)
-
-    node1.query("drop table HDFSStorageWithRange")
-    node1.query("drop table HDFSStorageWithEnum")
-    node1.query("drop table HDFSStorageWithQuestionMark")
-    node1.query("drop table HDFSStorageWithAsterisk")
-    node1.query("drop table HDFSStorageWithDoubleAsterisk")
-
 
 def test_storage_with_multidirectory_glob(started_cluster):
     hdfs_api = started_cluster.hdfs_api
@@ -167,6 +137,7 @@ def test_read_write_table(started_cluster):
 
 def test_write_table(started_cluster):
     hdfs_api = started_cluster.hdfs_api
+
     node1.query(
         "create table OtherHDFSStorage (id UInt32, name String, weight Float64) ENGINE = HDFS('hdfs://hdfs1:9000/other_storage', 'TSV')"
     )
@@ -177,8 +148,6 @@ def test_write_table(started_cluster):
     result = "10\ttomas\t55.55\n11\tjack\t32.54\n"
     assert hdfs_api.read_data("/other_storage") == result
     assert node1.query("select * from OtherHDFSStorage order by id") == result
-    node1.query("truncate table OtherHDFSStorage")
-    node1.query("drop table OtherHDFSStorage")
 
 
 def test_bad_hdfs_uri(started_cluster):
@@ -188,7 +157,7 @@ def test_bad_hdfs_uri(started_cluster):
         )
     except Exception as ex:
         print(ex)
-        assert "Bad HDFS URL" in str(ex)
+        assert "Bad hdfs url" in str(ex)
     try:
         node1.query(
             "create table BadStorage2 (id UInt32, name String, weight Float64) ENGINE = HDFS('hdfs://hdfs100500:9000/other_storage', 'TSV')"
@@ -197,7 +166,6 @@ def test_bad_hdfs_uri(started_cluster):
         print(ex)
         assert "Unable to connect to HDFS" in str(ex)
 
-    node1.query("drop table BadStorage2")
     try:
         node1.query(
             "create table BadStorage3 (id UInt32, name String, weight Float64) ENGINE = HDFS('hdfs://hdfs1:9000/<>', 'TSV')"
@@ -205,7 +173,6 @@ def test_bad_hdfs_uri(started_cluster):
     except Exception as ex:
         print(ex)
         assert "Unable to open HDFS file" in str(ex)
-    node1.query("drop table BadStorage3")
 
 
 @pytest.mark.timeout(800)
@@ -337,8 +304,6 @@ def test_write_gz_storage(started_cluster):
     node1.query("insert into GZHDFSStorage values (1, 'Mark', 72.53)")
     assert hdfs_api.read_gzip_data("/storage.gz") == "1\tMark\t72.53\n"
     assert node1.query("select * from GZHDFSStorage") == "1\tMark\t72.53\n"
-    node1.query("truncate table GZHDFSStorage")
-    node1.query("drop table GZHDFSStorage")
 
 
 def test_write_gzip_storage(started_cluster):
@@ -350,8 +315,6 @@ def test_write_gzip_storage(started_cluster):
     node1.query("insert into GZIPHDFSStorage values (1, 'Mark', 72.53)")
     assert hdfs_api.read_gzip_data("/gzip_storage") == "1\tMark\t72.53\n"
     assert node1.query("select * from GZIPHDFSStorage") == "1\tMark\t72.53\n"
-    node1.query("truncate table GZIPHDFSStorage")
-    node1.query("drop table GZIPHDFSStorage")
 
 
 def test_virtual_columns(started_cluster):
@@ -370,7 +333,6 @@ def test_virtual_columns(started_cluster):
         )
         == expected
     )
-    node1.query("drop table virtual_cols")
 
 
 def test_read_files_with_spaces(started_cluster):
@@ -392,7 +354,6 @@ def test_read_files_with_spaces(started_cluster):
     )
     assert node1.query("select * from test order by id") == "1\n2\n3\n"
     fs.delete(dir, recursive=True)
-    node1.query(f"drop table test")
 
 
 def test_truncate_table(started_cluster):
@@ -414,54 +375,47 @@ def test_truncate_table(started_cluster):
 
 
 def test_partition_by(started_cluster):
-    fs = HdfsClient(hosts=started_cluster.hdfs_ip)
-    id = uuid.uuid4()
-    table_format = "column1 UInt32, column2 UInt32, column3 UInt32"
-    dir = f"partition_{id}"
-    fs.mkdirs(f"/{dir}/", permission=777)
+    hdfs_api = started_cluster.hdfs_api
 
+    table_format = "column1 UInt32, column2 UInt32, column3 UInt32"
     file_name = "test_{_partition_id}"
     partition_by = "column3"
     values = "(1, 2, 3), (3, 2, 1), (1, 3, 2)"
-    table_function = (
-        f"hdfs('hdfs://hdfs1:9000/{dir}/{file_name}', 'TSV', '{table_format}')"
-    )
+    table_function = f"hdfs('hdfs://hdfs1:9000/{file_name}', 'TSV', '{table_format}')"
 
     node1.query(
         f"insert into table function {table_function} PARTITION BY {partition_by} values {values}"
     )
     result = node1.query(
-        f"select * from hdfs('hdfs://hdfs1:9000/{dir}/test_1', 'TSV', '{table_format}')"
+        f"select * from hdfs('hdfs://hdfs1:9000/test_1', 'TSV', '{table_format}')"
     )
     assert result.strip() == "3\t2\t1"
     result = node1.query(
-        f"select * from hdfs('hdfs://hdfs1:9000/{dir}/test_2', 'TSV', '{table_format}')"
+        f"select * from hdfs('hdfs://hdfs1:9000/test_2', 'TSV', '{table_format}')"
     )
     assert result.strip() == "1\t3\t2"
     result = node1.query(
-        f"select * from hdfs('hdfs://hdfs1:9000/{dir}/test_3', 'TSV', '{table_format}')"
+        f"select * from hdfs('hdfs://hdfs1:9000/test_3', 'TSV', '{table_format}')"
     )
     assert result.strip() == "1\t2\t3"
 
     file_name = "test2_{_partition_id}"
     node1.query(
-        f"create table p(column1 UInt32, column2 UInt32, column3 UInt32) engine = HDFS('hdfs://hdfs1:9000/{dir}/{file_name}', 'TSV') partition by column3"
+        f"create table p(column1 UInt32, column2 UInt32, column3 UInt32) engine = HDFS('hdfs://hdfs1:9000/{file_name}', 'TSV') partition by column3"
     )
     node1.query(f"insert into p values {values}")
     result = node1.query(
-        f"select * from hdfs('hdfs://hdfs1:9000/{dir}/test2_1', 'TSV', '{table_format}')"
+        f"select * from hdfs('hdfs://hdfs1:9000/test2_1', 'TSV', '{table_format}')"
     )
     assert result.strip() == "3\t2\t1"
     result = node1.query(
-        f"select * from hdfs('hdfs://hdfs1:9000/{dir}/test2_2', 'TSV', '{table_format}')"
+        f"select * from hdfs('hdfs://hdfs1:9000/test2_2', 'TSV', '{table_format}')"
     )
     assert result.strip() == "1\t3\t2"
     result = node1.query(
-        f"select * from hdfs('hdfs://hdfs1:9000/{dir}/test2_3', 'TSV', '{table_format}')"
+        f"select * from hdfs('hdfs://hdfs1:9000/test2_3', 'TSV', '{table_format}')"
     )
     assert result.strip() == "1\t2\t3"
-    node1.query(f"drop table p")
-    fs.delete("/{dir}", recursive=True)
 
 
 def test_seekable_formats(started_cluster):
@@ -471,7 +425,7 @@ def test_seekable_formats(started_cluster):
         f"hdfs('hdfs://hdfs1:9000/parquet', 'Parquet', 'a Int32, b String')"
     )
     node1.query(
-        f"insert into table function {table_function} SELECT number, randomString(100) FROM numbers(5000000) SETTINGS hdfs_truncate_on_insert=1"
+        f"insert into table function {table_function} SELECT number, randomString(100) FROM numbers(5000000)"
     )
 
     result = node1.query(f"SELECT count() FROM {table_function}")
@@ -479,7 +433,7 @@ def test_seekable_formats(started_cluster):
 
     table_function = f"hdfs('hdfs://hdfs1:9000/orc', 'ORC', 'a Int32, b String')"
     node1.query(
-        f"insert into table function {table_function} SELECT number, randomString(100) FROM numbers(5000000) SETTINGS hdfs_truncate_on_insert=1"
+        f"insert into table function {table_function} SELECT number, randomString(100) FROM numbers(5000000)"
     )
     result = node1.query(f"SELECT count() FROM {table_function}")
     assert int(result) == 5000000
@@ -503,7 +457,7 @@ def test_read_table_with_default(started_cluster):
 
 def test_schema_inference(started_cluster):
     node1.query(
-        f"insert into table function hdfs('hdfs://hdfs1:9000/native', 'Native', 'a Int32, b String') SELECT number, randomString(100) FROM numbers(5000000) SETTINGS hdfs_truncate_on_insert=1"
+        f"insert into table function hdfs('hdfs://hdfs1:9000/native', 'Native', 'a Int32, b String') SELECT number, randomString(100) FROM numbers(5000000)"
     )
 
     result = node1.query(f"desc hdfs('hdfs://hdfs1:9000/native', 'Native')")
@@ -522,7 +476,6 @@ def test_schema_inference(started_cluster):
 
     result = node1.query(f"select count(*) from schema_inference")
     assert int(result) == 5000000
-    node1.query(f"drop table schema_inference")
 
 
 def test_hdfsCluster(started_cluster):
@@ -557,7 +510,6 @@ def test_hdfs_directory_not_exist(started_cluster):
     assert "" == node1.query(
         "select * from HDFSStorageWithNotExistDir settings hdfs_ignore_file_doesnt_exist=1"
     )
-    node1.query("drop table HDFSStorageWithNotExistDir")
 
 
 def test_overwrite(started_cluster):
@@ -577,16 +529,12 @@ def test_overwrite(started_cluster):
 
     result = node1.query(f"select count() from test_overwrite")
     assert int(result) == 10
-    node1.query(f"truncate table test_overwrite")
-    node1.query(f"drop table test_overwrite")
 
 
 def test_multiple_inserts(started_cluster):
-    fs = HdfsClient(hosts=started_cluster.hdfs_ip)
-    id = uuid.uuid4()
-    fs.mkdirs(f"/{id}/", permission=777)
+    hdfs_api = started_cluster.hdfs_api
 
-    table_function = f"hdfs('hdfs://hdfs1:9000/{id}/data_multiple_inserts', 'Parquet', 'a Int32, b String')"
+    table_function = f"hdfs('hdfs://hdfs1:9000/data_multiple_inserts', 'Parquet', 'a Int32, b String')"
     node1.query(f"create table test_multiple_inserts as {table_function}")
     node1.query(
         f"insert into test_multiple_inserts select number, randomString(100) from numbers(10)"
@@ -603,7 +551,7 @@ def test_multiple_inserts(started_cluster):
 
     result = node1.query(f"drop table test_multiple_inserts")
 
-    table_function = f"hdfs('hdfs://hdfs1:9000/{id}/data_multiple_inserts.gz', 'Parquet', 'a Int32, b String')"
+    table_function = f"hdfs('hdfs://hdfs1:9000/data_multiple_inserts.gz', 'Parquet', 'a Int32, b String')"
     node1.query(f"create table test_multiple_inserts as {table_function}")
     node1.query(
         f"insert into test_multiple_inserts select number, randomString(100) FROM numbers(10)"
@@ -617,7 +565,6 @@ def test_multiple_inserts(started_cluster):
 
     result = node1.query(f"select count() from test_multiple_inserts")
     assert int(result) == 60
-    node1.query(f"drop table test_multiple_inserts")
 
 
 def test_format_detection(started_cluster):
@@ -627,58 +574,50 @@ def test_format_detection(started_cluster):
     node1.query(f"insert into arrow_table select 1")
     result = node1.query(f"select * from hdfs('hdfs://hdfs1:9000/data.arrow')")
     assert int(result) == 1
-    node1.query(f"truncate table arrow_table")
-    node1.query(f"drop table arrow_table")
 
 
 def test_schema_inference_with_globs(started_cluster):
-    fs = HdfsClient(hosts=started_cluster.hdfs_ip)
-    dir = "/test_schema_inference_with_globs"
-    fs.mkdirs(dir)
     node1.query(
-        f"insert into table function hdfs('hdfs://hdfs1:9000{dir}/data1.jsoncompacteachrow', 'JSONCompactEachRow', 'x Nullable(UInt32)') select NULL"
+        f"insert into table function hdfs('hdfs://hdfs1:9000/data1.jsoncompacteachrow', 'JSONCompactEachRow', 'x Nullable(UInt32)') select NULL"
     )
     node1.query(
-        f"insert into table function hdfs('hdfs://hdfs1:9000{dir}/data2.jsoncompacteachrow', 'JSONCompactEachRow', 'x Nullable(UInt32)') select 0"
+        f"insert into table function hdfs('hdfs://hdfs1:9000/data2.jsoncompacteachrow', 'JSONCompactEachRow', 'x Nullable(UInt32)') select 0"
     )
 
     result = node1.query(
-        f"desc hdfs('hdfs://hdfs1:9000{dir}/data*.jsoncompacteachrow') settings input_format_json_infer_incomplete_types_as_strings=0"
+        f"desc hdfs('hdfs://hdfs1:9000/data*.jsoncompacteachrow') settings input_format_json_infer_incomplete_types_as_strings=0"
     )
     assert result.strip() == "c1\tNullable(Int64)"
 
     result = node1.query(
-        f"select * from hdfs('hdfs://hdfs1:9000{dir}/data*.jsoncompacteachrow') settings input_format_json_infer_incomplete_types_as_strings=0"
+        f"select * from hdfs('hdfs://hdfs1:9000/data*.jsoncompacteachrow') settings input_format_json_infer_incomplete_types_as_strings=0"
     )
     assert sorted(result.split()) == ["0", "\\N"]
 
     node1.query(
-        f"insert into table function hdfs('hdfs://hdfs1:9000{dir}/data3.jsoncompacteachrow', 'JSONCompactEachRow', 'x Nullable(UInt32)') select NULL"
+        f"insert into table function hdfs('hdfs://hdfs1:9000/data3.jsoncompacteachrow', 'JSONCompactEachRow', 'x Nullable(UInt32)') select NULL"
     )
 
     filename = "data{1,3}.jsoncompacteachrow"
 
     result = node1.query_and_get_error(
-        f"desc hdfs('hdfs://hdfs1:9000{dir}/{filename}') settings schema_inference_use_cache_for_hdfs=0, input_format_json_infer_incomplete_types_as_strings=0"
+        f"desc hdfs('hdfs://hdfs1:9000/{filename}') settings schema_inference_use_cache_for_hdfs=0, input_format_json_infer_incomplete_types_as_strings=0"
     )
 
     assert "All attempts to extract table structure from files failed" in result
 
     node1.query(
-        f"insert into table function hdfs('hdfs://hdfs1:9000{dir}/data0.jsoncompacteachrow', 'TSV', 'x String') select '[123;]'"
+        f"insert into table function hdfs('hdfs://hdfs1:9000/data0.jsoncompacteachrow', 'TSV', 'x String') select '[123;]'"
     )
 
     result = node1.query_and_get_error(
-        f"desc hdfs('hdfs://hdfs1:9000{dir}/data*.jsoncompacteachrow') settings schema_inference_use_cache_for_hdfs=0, input_format_json_infer_incomplete_types_as_strings=0"
+        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" in result
-    fs.delete(dir, recursive=True)
 
 
 def test_insert_select_schema_inference(started_cluster):
-    fs = HdfsClient(hosts=started_cluster.hdfs_ip)
-
     node1.query(
         f"insert into table function hdfs('hdfs://hdfs1:9000/test.native.zst') select toUInt64(1) as x"
     )
@@ -688,7 +627,6 @@ def test_insert_select_schema_inference(started_cluster):
 
     result = node1.query(f"select * from hdfs('hdfs://hdfs1:9000/test.native.zst')")
     assert int(result) == 1
-    fs.delete("/test.native.zst")
 
 
 def test_cluster_join(started_cluster):
@@ -720,7 +658,6 @@ def test_cluster_macro(started_cluster):
 
 def test_virtual_columns_2(started_cluster):
     hdfs_api = started_cluster.hdfs_api
-    fs = HdfsClient(hosts=started_cluster.hdfs_ip)
 
     table_function = (
         f"hdfs('hdfs://hdfs1:9000/parquet_2', 'Parquet', 'a Int32, b String')"
@@ -737,8 +674,6 @@ def test_virtual_columns_2(started_cluster):
 
     result = node1.query(f"SELECT _path FROM {table_function}")
     assert result.strip() == "kek"
-    fs.delete("/parquet_2")
-    fs.delete("/parquet_3")
 
 
 def check_profile_event_for_query(node, file, profile_event, amount=1):
@@ -1032,11 +967,11 @@ def test_read_subcolumns(started_cluster):
     node = started_cluster.instances["node1"]
 
     node.query(
-        f"insert into function hdfs('hdfs://hdfs1:9000/test_subcolumns.tsv', auto, 'a Tuple(b Tuple(c UInt32, d UInt32), e UInt32)') select ((1, 2), 3) settings hdfs_truncate_on_insert=1"
+        f"insert into function hdfs('hdfs://hdfs1:9000/test_subcolumns.tsv', auto, 'a Tuple(b Tuple(c UInt32, d UInt32), e UInt32)') select ((1, 2), 3)"
     )
 
     node.query(
-        f"insert into function hdfs('hdfs://hdfs1:9000/test_subcolumns.jsonl', auto, 'a Tuple(b Tuple(c UInt32, d UInt32), e UInt32)') select ((1, 2), 3) settings hdfs_truncate_on_insert=1"
+        f"insert into function hdfs('hdfs://hdfs1:9000/test_subcolumns.jsonl', auto, 'a Tuple(b Tuple(c UInt32, d UInt32), e UInt32)') select ((1, 2), 3)"
     )
 
     res = node.query(
@@ -1068,7 +1003,7 @@ def test_read_subcolumn_time(started_cluster):
     node = started_cluster.instances["node1"]
 
     node.query(
-        f"insert into function hdfs('hdfs://hdfs1:9000/test_subcolumn_time.tsv', auto, 'a UInt32') select (42) settings hdfs_truncate_on_insert=1"
+        f"insert into function hdfs('hdfs://hdfs1:9000/test_subcolumn_time.tsv', auto, 'a UInt32') select (42)"
     )
 
     res = node.query(
@@ -1079,103 +1014,91 @@ def test_read_subcolumn_time(started_cluster):
 
 
 def test_union_schema_inference_mode(started_cluster):
-    id = uuid.uuid4()
-    fs = HdfsClient(hosts=started_cluster.hdfs_ip)
-
-    dir = f"union_{id}"
-    fs.mkdirs(f"/{dir}/", permission=777)
-
     node = started_cluster.instances["node1"]
 
     node.query(
-        f"insert into function hdfs('hdfs://hdfs1:9000/{dir}/test_union_schema_inference1.jsonl') select 1 as a"
+        "insert into function hdfs('hdfs://hdfs1:9000/test_union_schema_inference1.jsonl') select 1 as a"
     )
 
     node.query(
-        f"insert into function hdfs('hdfs://hdfs1:9000/{dir}/test_union_schema_inference2.jsonl') select 2 as b"
+        "insert into function hdfs('hdfs://hdfs1:9000/test_union_schema_inference2.jsonl') select 2 as b"
     )
 
     node.query("system drop schema cache for hdfs")
 
     result = node.query(
-        f"desc hdfs('hdfs://hdfs1:9000/{dir}/test_union_schema_inference*.jsonl') settings schema_inference_mode='union', describe_compact_output=1 format TSV"
+        "desc hdfs('hdfs://hdfs1:9000/test_union_schema_inference*.jsonl') settings schema_inference_mode='union', describe_compact_output=1 format TSV"
     )
     assert result == "a\tNullable(Int64)\nb\tNullable(Int64)\n"
 
     result = node.query(
-        f"select schema_inference_mode, splitByChar('/', source)[-1] as file, schema from system.schema_inference_cache where source like '%test_union_schema_inference%' order by file format TSV"
+        "select schema_inference_mode, splitByChar('/', source)[-1] as file, schema from system.schema_inference_cache where source like '%test_union_schema_inference%' order by file format TSV"
     )
     assert (
         result == "UNION\ttest_union_schema_inference1.jsonl\ta Nullable(Int64)\n"
         "UNION\ttest_union_schema_inference2.jsonl\tb Nullable(Int64)\n"
     )
     result = node.query(
-        f"select * from hdfs('hdfs://hdfs1:9000/{dir}/test_union_schema_inference*.jsonl') order by tuple(*) settings schema_inference_mode='union', describe_compact_output=1 format TSV"
+        "select * from hdfs('hdfs://hdfs1:9000/test_union_schema_inference*.jsonl') order by tuple(*) settings schema_inference_mode='union', describe_compact_output=1 format TSV"
     )
     assert result == "1\t\\N\n" "\\N\t2\n"
     node.query(f"system drop schema cache for hdfs")
     result = node.query(
-        f"desc hdfs('hdfs://hdfs1:9000/{dir}/test_union_schema_inference2.jsonl') settings schema_inference_mode='union', describe_compact_output=1 format TSV"
+        "desc hdfs('hdfs://hdfs1:9000/test_union_schema_inference2.jsonl') settings schema_inference_mode='union', describe_compact_output=1 format TSV"
     )
     assert result == "b\tNullable(Int64)\n"
 
     result = node.query(
-        f"desc hdfs('hdfs://hdfs1:9000/{dir}/test_union_schema_inference*.jsonl') settings schema_inference_mode='union', describe_compact_output=1 format TSV"
+        "desc hdfs('hdfs://hdfs1:9000/test_union_schema_inference*.jsonl') settings schema_inference_mode='union', describe_compact_output=1 format TSV"
     )
     assert result == "a\tNullable(Int64)\n" "b\tNullable(Int64)\n"
     node.query(
-        f"insert into function hdfs('hdfs://hdfs1:9000/{dir}/test_union_schema_inference3.jsonl', TSV) select 'Error'"
+        f"insert into function hdfs('hdfs://hdfs1:9000/test_union_schema_inference3.jsonl', TSV) select 'Error'"
     )
 
     error = node.query_and_get_error(
-        f"desc hdfs('hdfs://hdfs1:9000/{dir}/test_union_schema_inference*.jsonl') settings schema_inference_mode='union', describe_compact_output=1 format TSV"
+        "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
 
 
 def test_format_detection(started_cluster):
     node = started_cluster.instances["node1"]
-    fs = HdfsClient(hosts=started_cluster.hdfs_ip)
-    id = uuid.uuid4()
-    dir = f"{id}"
-    fs.mkdirs(f"/{dir}/", permission=777)
 
     node.query(
-        f"insert into function hdfs('hdfs://hdfs1:9000/{dir}/test_format_detection0', JSONEachRow) select number as x, 'str_' || toString(number) as y from numbers(0)"
+        "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(
-        f"insert into function hdfs('hdfs://hdfs1:9000/{dir}/test_format_detection1', JSONEachRow) select number as x, 'str_' || toString(number) as y from numbers(10)"
+        "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(
-        f"desc hdfs('hdfs://hdfs1:9000/{dir}/test_format_detection1', JSONEachRow)"
+        "desc hdfs('hdfs://hdfs1:9000/test_format_detection1', JSONEachRow)"
     )
 
-    desc_result = node.query(
-        f"desc hdfs('hdfs://hdfs1:9000/{dir}/test_format_detection1')"
-    )
+    desc_result = node.query("desc hdfs('hdfs://hdfs1:9000/test_format_detection1')")
 
     assert expected_desc_result == desc_result
 
     expected_result = node.query(
-        f"select * from hdfs('hdfs://hdfs1:9000/{dir}/test_format_detection1', JSONEachRow, 'x UInt64, y String') order by x, y"
+        "select * from hdfs('hdfs://hdfs1:9000/test_format_detection1', JSONEachRow, 'x UInt64, y String') order by x, y"
     )
 
     result = node.query(
-        f"select * from hdfs('hdfs://hdfs1:9000/{dir}/test_format_detection1') order by x, y"
+        "select * from hdfs('hdfs://hdfs1:9000/test_format_detection1') order by x, y"
     )
 
     assert expected_result == result
 
     result = node.query(
-        f"select * from hdfs('hdfs://hdfs1:9000/{dir}/test_format_detection1', auto, 'x UInt64, y String') order by x, y"
+        "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(
-        f"select * from hdfs('hdfs://hdfs1:9000/{dir}/test_format_detection{{0,1}}') order by x, y"
+        "select * from hdfs('hdfs://hdfs1:9000/test_format_detection{0,1}') order by x, y"
     )
 
     assert expected_result == result
@@ -1183,25 +1106,25 @@ def test_format_detection(started_cluster):
     node.query("system drop schema cache for hdfs")
 
     result = node.query(
-        f"select * from hdfs('hdfs://hdfs1:9000/{dir}/test_format_detection{{0,1}}') order by x, y"
+        "select * from hdfs('hdfs://hdfs1:9000/test_format_detection{0,1}') order by x, y"
     )
 
     assert expected_result == result
 
     result = node.query(
-        f"select * from hdfsCluster(test_cluster_two_shards, 'hdfs://hdfs1:9000/{dir}/test_format_detection{{0,1}}') order by x, y"
+        "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(
-        f"select * from hdfsCluster(test_cluster_two_shards, 'hdfs://hdfs1:9000/{dir}/test_format_detection{{0,1}}', auto, auto) order by x, y"
+        "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(
-        f"select * from hdfsCluster(test_cluster_two_shards, 'hdfs://hdfs1:9000/{dir}/test_format_detection{{0,1}}', auto, 'x UInt64, y String') order by x, y"
+        "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
@@ -1257,43 +1180,6 @@ def test_respect_object_existence_on_partitioned_write(started_cluster):
     assert int(result) == 44
 
 
-def test_hive_partitioning_with_one_parameter(started_cluster):
-    hdfs_api = started_cluster.hdfs_api
-    hdfs_api.write_data(
-        f"/column0=Elizabeth/file_1", f"column0,column1\nElizabeth,Gordon\n"
-    )
-    assert (
-        hdfs_api.read_data(f"/column0=Elizabeth/file_1")
-        == f"column0,column1\nElizabeth,Gordon\n"
-    )
-
-    r = node1.query(
-        "SELECT column0 FROM hdfs('hdfs://hdfs1:9000/column0=Elizabeth/file_1', 'CSVWithNames')",
-        settings={"use_hive_partitioning": 1},
-    )
-    assert r == f"Elizabeth\n"
-
-
-def test_hive_partitioning_without_setting(started_cluster):
-    hdfs_api = started_cluster.hdfs_api
-    hdfs_api.write_data(
-        f"/column0=Elizabeth/column1=Gordon/parquet_2", f"Elizabeth\tGordon\n"
-    )
-    assert (
-        hdfs_api.read_data(f"/column0=Elizabeth/column1=Gordon/parquet_2")
-        == f"Elizabeth\tGordon\n"
-    )
-    pattern = re.compile(
-        r"DB::Exception: Unknown expression identifier '.*' in scope.*", re.DOTALL
-    )
-
-    with pytest.raises(QueryRuntimeException, match=pattern):
-        node1.query(
-            f"SELECT column1 FROM hdfs('hdfs://hdfs1:9000/column0=Elizabeth/column1=Gordon/parquet_2', 'TSV');",
-            settings={"use_hive_partitioning": 0},
-        )
-
-
 if __name__ == "__main__":
     cluster.start()
     input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_storage_iceberg/configs/config.d/named_collections.xml b/tests/integration/test_storage_iceberg/configs/config.d/named_collections.xml
index b488638dd19..d4c54e2d13d 100644
--- a/tests/integration/test_storage_iceberg/configs/config.d/named_collections.xml
+++ b/tests/integration/test_storage_iceberg/configs/config.d/named_collections.xml
@@ -5,11 +5,5 @@
         <access_key_id>minio</access_key_id>
         <secret_access_key>minio123</secret_access_key>
     </s3>
-    <azure>
-        <account_name>devstoreaccount1</account_name>
-        <account_key>Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==</account_key>
-    </azure>
-    <local>
-    </local>
   </named_collections>
 </clickhouse>
diff --git a/tests/integration/test_storage_iceberg/test.py b/tests/integration/test_storage_iceberg/test.py
index 176c7e209bd..7762d17b96f 100644
--- a/tests/integration/test_storage_iceberg/test.py
+++ b/tests/integration/test_storage_iceberg/test.py
@@ -28,15 +28,12 @@ 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 azure.storage.blob import BlobServiceClient
 
 from helpers.s3_tools import (
     prepare_s3_bucket,
+    upload_directory,
     get_file_contents,
     list_s3_objects,
-    S3Uploader,
-    AzureUploader,
-    LocalUploader,
 )
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
@@ -70,7 +67,6 @@ def started_cluster():
             main_configs=["configs/config.d/named_collections.xml"],
             user_configs=["configs/users.d/users.xml"],
             with_minio=True,
-            with_azurite=True,
             stay_alive=True,
         )
 
@@ -81,25 +77,6 @@ def started_cluster():
         logging.info("S3 bucket created")
 
         cluster.spark_session = get_spark()
-        cluster.default_s3_uploader = S3Uploader(
-            cluster.minio_client, cluster.minio_bucket
-        )
-
-        cluster.azure_container_name = "mycontainer"
-
-        cluster.blob_service_client = cluster.blob_service_client
-
-        container_client = cluster.blob_service_client.create_container(
-            cluster.azure_container_name
-        )
-
-        cluster.container_client = container_client
-
-        cluster.default_azure_uploader = AzureUploader(
-            cluster.blob_service_client, cluster.azure_container_name
-        )
-
-        cluster.default_local_uploader = LocalUploader(cluster.instances["node1"])
 
         yield cluster
 
@@ -165,65 +142,12 @@ def generate_data(spark, start, end):
     return df
 
 
-def get_creation_expression(
-    storage_type,
-    table_name,
-    cluster,
-    format="Parquet",
-    table_function=False,
-    **kwargs,
-):
-    if storage_type == "s3":
-        if "bucket" in kwargs:
-            bucket = kwargs["bucket"]
-        else:
-            bucket = cluster.minio_bucket
-        print(bucket)
-        if table_function:
-            return f"icebergS3(s3, filename = 'iceberg_data/default/{table_name}/', format={format}, url = 'http://minio1:9001/{bucket}/')"
-        else:
-            return f"""
-                DROP TABLE IF EXISTS {table_name};
-                CREATE TABLE {table_name}
-                ENGINE=IcebergS3(s3, filename = 'iceberg_data/default/{table_name}/', format={format}, url = 'http://minio1:9001/{bucket}/')"""
-    elif storage_type == "azure":
-        if table_function:
-            return f"""
-                icebergAzure(azure, container = '{cluster.azure_container_name}', storage_account_url = '{cluster.env_variables["AZURITE_STORAGE_ACCOUNT_URL"]}', blob_path = '/iceberg_data/default/{table_name}/', format={format})
-            """
-        else:
-            return f"""
-                DROP TABLE IF EXISTS {table_name};
-                CREATE TABLE {table_name}
-                ENGINE=IcebergAzure(azure, container = {cluster.azure_container_name}, storage_account_url = '{cluster.env_variables["AZURITE_STORAGE_ACCOUNT_URL"]}', blob_path = '/iceberg_data/default/{table_name}/', format={format})"""
-    elif storage_type == "local":
-        if table_function:
-            return f"""
-                icebergLocal(local, path = '/iceberg_data/default/{table_name}/', format={format})
-            """
-        else:
-            return f"""
-                DROP TABLE IF EXISTS {table_name};
-                CREATE TABLE {table_name}
-                ENGINE=IcebergLocal(local, path = '/iceberg_data/default/{table_name}/', format={format});"""
-    else:
-        raise Exception(f"Unknown iceberg storage type: {storage_type}")
-
-
-def get_uuid_str():
-    return str(uuid.uuid4()).replace("-", "_")
-
-
-def create_iceberg_table(
-    storage_type,
-    node,
-    table_name,
-    cluster,
-    format="Parquet",
-    **kwargs,
-):
+def create_iceberg_table(node, table_name, format="Parquet", bucket="root"):
     node.query(
-        get_creation_expression(storage_type, table_name, cluster, format, **kwargs)
+        f"""
+        DROP TABLE IF EXISTS {table_name};
+        CREATE TABLE {table_name}
+        ENGINE=Iceberg(s3, filename = 'iceberg_data/default/{table_name}/', format={format}, url = 'http://minio1:9001/{bucket}/')"""
     )
 
 
@@ -246,69 +170,40 @@ def create_initial_data_file(
     return result_path
 
 
-def default_upload_directory(
-    started_cluster, storage_type, local_path, remote_path, **kwargs
-):
-    if storage_type == "local":
-        return started_cluster.default_local_uploader.upload_directory(
-            local_path, remote_path, **kwargs
-        )
-    elif storage_type == "s3":
-        print(kwargs)
-        return started_cluster.default_s3_uploader.upload_directory(
-            local_path, remote_path, **kwargs
-        )
-    elif storage_type == "azure":
-        return started_cluster.default_azure_uploader.upload_directory(
-            local_path, remote_path, **kwargs
-        )
-    else:
-        raise Exception(f"Unknown iceberg storage type: {storage_type}")
-
-
 @pytest.mark.parametrize("format_version", ["1", "2"])
-@pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
-def test_single_iceberg_file(started_cluster, format_version, storage_type):
+def test_single_iceberg_file(started_cluster, format_version):
     instance = started_cluster.instances["node1"]
     spark = started_cluster.spark_session
-    TABLE_NAME = (
-        "test_single_iceberg_file_"
-        + format_version
-        + "_"
-        + storage_type
-        + "_"
-        + get_uuid_str()
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    TABLE_NAME = "test_single_iceberg_file_" + format_version
+
+    inserted_data = "SELECT number, toString(number) as string FROM numbers(100)"
+    parquet_data_path = create_initial_data_file(
+        started_cluster, instance, inserted_data, TABLE_NAME
     )
 
-    write_iceberg_from_df(spark, generate_data(spark, 0, 100), TABLE_NAME)
-
-    files = default_upload_directory(
-        started_cluster,
-        storage_type,
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        f"/iceberg_data/default/{TABLE_NAME}/",
+    write_iceberg_from_file(
+        spark, parquet_data_path, TABLE_NAME, format_version=format_version
     )
 
-    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster)
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
+    )
 
+    create_iceberg_table(instance, TABLE_NAME)
     assert instance.query(f"SELECT * FROM {TABLE_NAME}") == instance.query(
-        "SELECT number, toString(number + 1) FROM numbers(100)"
+        inserted_data
     )
 
 
 @pytest.mark.parametrize("format_version", ["1", "2"])
-@pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
-def test_partition_by(started_cluster, format_version, storage_type):
+def test_partition_by(started_cluster, format_version):
     instance = started_cluster.instances["node1"]
     spark = started_cluster.spark_session
-    TABLE_NAME = (
-        "test_partition_by_"
-        + format_version
-        + "_"
-        + storage_type
-        + "_"
-        + get_uuid_str()
-    )
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    TABLE_NAME = "test_partition_by_" + format_version
 
     write_iceberg_from_df(
         spark,
@@ -319,33 +214,22 @@ def test_partition_by(started_cluster, format_version, storage_type):
         partition_by="a",
     )
 
-    files = default_upload_directory(
-        started_cluster,
-        storage_type,
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        f"/iceberg_data/default/{TABLE_NAME}/",
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
     )
     assert len(files) == 14  # 10 partitiions + 4 metadata files
 
-    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster)
+    create_iceberg_table(instance, TABLE_NAME)
     assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 10
 
 
 @pytest.mark.parametrize("format_version", ["1", "2"])
-@pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
-def test_multiple_iceberg_files(started_cluster, format_version, storage_type):
+def test_multiple_iceberg_files(started_cluster, format_version):
     instance = started_cluster.instances["node1"]
     spark = started_cluster.spark_session
     minio_client = started_cluster.minio_client
     bucket = started_cluster.minio_bucket
-    TABLE_NAME = (
-        "test_multiple_iceberg_files_"
-        + format_version
-        + "_"
-        + storage_type
-        + "_"
-        + get_uuid_str()
-    )
+    TABLE_NAME = "test_multiple_iceberg_files_" + format_version
 
     write_iceberg_from_df(
         spark,
@@ -355,13 +239,9 @@ def test_multiple_iceberg_files(started_cluster, format_version, storage_type):
         format_version=format_version,
     )
 
-    files = default_upload_directory(
-        started_cluster,
-        storage_type,
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        f"/iceberg_data/default/{TABLE_NAME}/",
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}", ""
     )
-
     # ['/iceberg_data/default/test_multiple_iceberg_files/data/00000-1-35302d56-f1ed-494e-a85b-fbf85c05ab39-00001.parquet',
     # '/iceberg_data/default/test_multiple_iceberg_files/metadata/version-hint.text',
     # '/iceberg_data/default/test_multiple_iceberg_files/metadata/3127466b-299d-48ca-a367-6b9b1df1e78c-m0.avro',
@@ -369,7 +249,7 @@ def test_multiple_iceberg_files(started_cluster, format_version, storage_type):
     # '/iceberg_data/default/test_multiple_iceberg_files/metadata/v1.metadata.json']
     assert len(files) == 5
 
-    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster)
+    create_iceberg_table(instance, TABLE_NAME)
     assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 100
 
     write_iceberg_from_df(
@@ -379,11 +259,8 @@ def test_multiple_iceberg_files(started_cluster, format_version, storage_type):
         mode="append",
         format_version=format_version,
     )
-    files = default_upload_directory(
-        started_cluster,
-        storage_type,
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        "",
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}", ""
     )
     assert len(files) == 9
 
@@ -394,13 +271,12 @@ def test_multiple_iceberg_files(started_cluster, format_version, storage_type):
 
 
 @pytest.mark.parametrize("format_version", ["1", "2"])
-@pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
-def test_types(started_cluster, format_version, storage_type):
+def test_types(started_cluster, format_version):
     instance = started_cluster.instances["node1"]
     spark = started_cluster.spark_session
-    TABLE_NAME = (
-        "test_types_" + format_version + "_" + storage_type + "_" + get_uuid_str()
-    )
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    TABLE_NAME = "test_types_" + format_version
 
     data = [
         (
@@ -426,29 +302,22 @@ def test_types(started_cluster, format_version, storage_type):
         spark, df, TABLE_NAME, mode="overwrite", format_version=format_version
     )
 
-    default_upload_directory(
-        started_cluster,
-        storage_type,
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        f"/iceberg_data/default/{TABLE_NAME}/",
-    )
+    upload_directory(minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}", "")
 
-    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster)
+    create_iceberg_table(instance, TABLE_NAME)
     assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 1
     assert (
         instance.query(f"SELECT a, b, c, d, e FROM {TABLE_NAME}").strip()
         == "123\tstring\t2000-01-01\t['str1','str2']\ttrue"
     )
 
-    table_function_expr = get_creation_expression(
-        storage_type, TABLE_NAME, started_cluster, table_function=True
-    )
+    table_function = f"iceberg(s3, filename='iceberg_data/default/{TABLE_NAME}/')"
     assert (
-        instance.query(f"SELECT a, b, c, d, e FROM {table_function_expr}").strip()
+        instance.query(f"SELECT a, b, c, d, e FROM {table_function}").strip()
         == "123\tstring\t2000-01-01\t['str1','str2']\ttrue"
     )
 
-    assert instance.query(f"DESCRIBE {table_function_expr} FORMAT TSV") == TSV(
+    assert instance.query(f"DESCRIBE {table_function} FORMAT TSV") == TSV(
         [
             ["a", "Nullable(Int32)"],
             ["b", "Nullable(String)"],
@@ -460,20 +329,12 @@ def test_types(started_cluster, format_version, storage_type):
 
 
 @pytest.mark.parametrize("format_version", ["1", "2"])
-@pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
-def test_delete_files(started_cluster, format_version, storage_type):
+def test_delete_files(started_cluster, format_version):
     instance = started_cluster.instances["node1"]
     spark = started_cluster.spark_session
     minio_client = started_cluster.minio_client
     bucket = started_cluster.minio_bucket
-    TABLE_NAME = (
-        "test_delete_files_"
-        + format_version
-        + "_"
-        + storage_type
-        + "_"
-        + get_uuid_str()
-    )
+    TABLE_NAME = "test_delete_files_" + format_version
 
     write_iceberg_from_df(
         spark,
@@ -483,22 +344,17 @@ def test_delete_files(started_cluster, format_version, storage_type):
         format_version=format_version,
     )
 
-    files = default_upload_directory(
-        started_cluster,
-        storage_type,
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        f"/iceberg_data/default/{TABLE_NAME}/",
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
     )
-    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster)
+
+    create_iceberg_table(instance, TABLE_NAME)
 
     assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 100
 
     spark.sql(f"DELETE FROM {TABLE_NAME} WHERE a >= 0")
-    files = default_upload_directory(
-        started_cluster,
-        storage_type,
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        "",
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
     )
 
     assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 0
@@ -512,41 +368,27 @@ def test_delete_files(started_cluster, format_version, storage_type):
         format_version=format_version,
     )
 
-    files = default_upload_directory(
-        started_cluster,
-        storage_type,
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        "",
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
     )
 
     assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 100
 
     spark.sql(f"DELETE FROM {TABLE_NAME} WHERE a >= 150")
-    files = default_upload_directory(
-        started_cluster,
-        storage_type,
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        "",
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
     )
 
     assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 50
 
 
 @pytest.mark.parametrize("format_version", ["1", "2"])
-@pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
-def test_evolved_schema(started_cluster, format_version, storage_type):
+def test_evolved_schema(started_cluster, format_version):
     instance = started_cluster.instances["node1"]
     spark = started_cluster.spark_session
     minio_client = started_cluster.minio_client
     bucket = started_cluster.minio_bucket
-    TABLE_NAME = (
-        "test_evolved_schema_"
-        + format_version
-        + "_"
-        + storage_type
-        + "_"
-        + get_uuid_str()
-    )
+    TABLE_NAME = "test_evolved_schema_" + format_version
 
     write_iceberg_from_df(
         spark,
@@ -556,25 +398,19 @@ def test_evolved_schema(started_cluster, format_version, storage_type):
         format_version=format_version,
     )
 
-    files = default_upload_directory(
-        started_cluster,
-        storage_type,
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        f"/iceberg_data/default/{TABLE_NAME}/",
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
     )
 
-    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster)
+    create_iceberg_table(instance, TABLE_NAME)
 
     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 = default_upload_directory(
-        started_cluster,
-        storage_type,
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        "",
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
     )
 
     error = instance.query_and_get_error(f"SELECT * FROM {TABLE_NAME}")
@@ -586,13 +422,12 @@ def test_evolved_schema(started_cluster, format_version, storage_type):
     assert data == expected_data
 
 
-@pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
-def test_row_based_deletes(started_cluster, storage_type):
+def test_row_based_deletes(started_cluster):
     instance = started_cluster.instances["node1"]
     spark = started_cluster.spark_session
     minio_client = started_cluster.minio_client
     bucket = started_cluster.minio_bucket
-    TABLE_NAME = "test_row_based_deletes_" + storage_type + "_" + get_uuid_str()
+    TABLE_NAME = "test_row_based_deletes"
 
     spark.sql(
         f"CREATE TABLE {TABLE_NAME} (id bigint, data string) USING iceberg TBLPROPERTIES ('format-version' = '2', 'write.update.mode'='merge-on-read', 'write.delete.mode'='merge-on-read', 'write.merge.mode'='merge-on-read')"
@@ -601,23 +436,17 @@ def test_row_based_deletes(started_cluster, storage_type):
         f"INSERT INTO {TABLE_NAME} select id, char(id + ascii('a')) from range(100)"
     )
 
-    files = default_upload_directory(
-        started_cluster,
-        storage_type,
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        f"/iceberg_data/default/{TABLE_NAME}/",
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
     )
 
-    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster)
+    create_iceberg_table(instance, TABLE_NAME)
 
     assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 100
 
     spark.sql(f"DELETE FROM {TABLE_NAME} WHERE id < 10")
-    files = default_upload_directory(
-        started_cluster,
-        storage_type,
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        "",
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
     )
 
     error = instance.query_and_get_error(f"SELECT * FROM {TABLE_NAME}")
@@ -625,21 +454,13 @@ def test_row_based_deletes(started_cluster, storage_type):
 
 
 @pytest.mark.parametrize("format_version", ["1", "2"])
-@pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
-def test_schema_inference(started_cluster, format_version, storage_type):
+def test_schema_inference(started_cluster, format_version):
     instance = started_cluster.instances["node1"]
     spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
     for format in ["Parquet", "ORC", "Avro"]:
-        TABLE_NAME = (
-            "test_schema_inference_"
-            + format
-            + "_"
-            + format_version
-            + "_"
-            + storage_type
-            + "_"
-            + get_uuid_str()
-        )
+        TABLE_NAME = "test_schema_inference_" + format + "_" + format_version
 
         # Types time, timestamptz, fixed are not supported in Spark.
         spark.sql(
@@ -649,16 +470,12 @@ def test_schema_inference(started_cluster, format_version, storage_type):
         spark.sql(
             f"insert into {TABLE_NAME} select 42, 4242, 42.42, 4242.4242, decimal(42.42), decimal(42.42), decimal(42.42), date('2020-01-01'), timestamp('2020-01-01 20:00:00'), 'hello', binary('hello'), array(1,2,3), map('key', 'value'), struct(42, 'hello'), array(struct(map('key', array(map('key', 42))), struct(42, 'hello')))"
         )
-        files = default_upload_directory(
-            started_cluster,
-            storage_type,
-            f"/iceberg_data/default/{TABLE_NAME}/",
-            f"/iceberg_data/default/{TABLE_NAME}/",
+
+        files = upload_directory(
+            minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
         )
 
-        create_iceberg_table(
-            storage_type, instance, TABLE_NAME, started_cluster, format=format
-        )
+        create_iceberg_table(instance, TABLE_NAME, format)
 
         res = instance.query(
             f"DESC {TABLE_NAME} FORMAT TSVRaw", settings={"print_pretty_type_names": 0}
@@ -693,18 +510,12 @@ def test_schema_inference(started_cluster, format_version, storage_type):
 
 
 @pytest.mark.parametrize("format_version", ["1", "2"])
-@pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
-def test_metadata_file_selection(started_cluster, format_version, storage_type):
+def test_metadata_file_selection(started_cluster, format_version):
     instance = started_cluster.instances["node1"]
     spark = started_cluster.spark_session
-    TABLE_NAME = (
-        "test_metadata_selection_"
-        + format_version
-        + "_"
-        + storage_type
-        + "_"
-        + get_uuid_str()
-    )
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    TABLE_NAME = "test_metadata_selection_" + format_version
 
     spark.sql(
         f"CREATE TABLE {TABLE_NAME} (id bigint, data string) USING iceberg TBLPROPERTIES ('format-version' = '2', 'write.update.mode'='merge-on-read', 'write.delete.mode'='merge-on-read', 'write.merge.mode'='merge-on-read')"
@@ -715,31 +526,22 @@ def test_metadata_file_selection(started_cluster, format_version, storage_type):
             f"INSERT INTO {TABLE_NAME} select id, char(id + ascii('a')) from range(10)"
         )
 
-    files = default_upload_directory(
-        started_cluster,
-        storage_type,
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        f"/iceberg_data/default/{TABLE_NAME}/",
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
     )
 
-    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster)
+    create_iceberg_table(instance, TABLE_NAME)
 
     assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 500
 
 
 @pytest.mark.parametrize("format_version", ["1", "2"])
-@pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
-def test_metadata_file_format_with_uuid(started_cluster, format_version, storage_type):
+def test_metadata_file_format_with_uuid(started_cluster, format_version):
     instance = started_cluster.instances["node1"]
     spark = started_cluster.spark_session
-    TABLE_NAME = (
-        "test_metadata_selection_with_uuid_"
-        + format_version
-        + "_"
-        + storage_type
-        + "_"
-        + get_uuid_str()
-    )
+    minio_client = started_cluster.minio_client
+    bucket = started_cluster.minio_bucket
+    TABLE_NAME = "test_metadata_selection_with_uuid_" + format_version
 
     spark.sql(
         f"CREATE TABLE {TABLE_NAME} (id bigint, data string) USING iceberg TBLPROPERTIES ('format-version' = '2', 'write.update.mode'='merge-on-read', 'write.delete.mode'='merge-on-read', 'write.merge.mode'='merge-on-read')"
@@ -753,48 +555,40 @@ def test_metadata_file_format_with_uuid(started_cluster, format_version, storage
     for i in range(50):
         os.rename(
             f"/iceberg_data/default/{TABLE_NAME}/metadata/v{i + 1}.metadata.json",
-            f"/iceberg_data/default/{TABLE_NAME}/metadata/{str(i).zfill(5)}-{get_uuid_str()}.metadata.json",
+            f"/iceberg_data/default/{TABLE_NAME}/metadata/{str(i).zfill(5)}-{uuid.uuid4()}.metadata.json",
         )
 
-    files = default_upload_directory(
-        started_cluster,
-        storage_type,
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        f"/iceberg_data/default/{TABLE_NAME}/",
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
     )
 
-    create_iceberg_table(storage_type, instance, TABLE_NAME, started_cluster)
+    create_iceberg_table(instance, TABLE_NAME)
 
     assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 500
 
 
-def test_restart_broken_s3(started_cluster):
+def test_restart_broken(started_cluster):
     instance = started_cluster.instances["node1"]
     spark = started_cluster.spark_session
-    TABLE_NAME = "test_restart_broken_table_function_s3" + "_" + get_uuid_str()
-
     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)
 
-    write_iceberg_from_df(
-        spark,
-        generate_data(spark, 0, 100),
+    parquet_data_path = create_initial_data_file(
+        started_cluster,
+        instance,
+        "SELECT number, toString(number) FROM numbers(100)",
         TABLE_NAME,
-        mode="overwrite",
-        format_version="1",
     )
 
-    files = default_upload_directory(
-        started_cluster,
-        "s3",
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        bucket=bucket,
+    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("s3", instance, TABLE_NAME, started_cluster, bucket=bucket)
+    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="")
@@ -819,12 +613,8 @@ def test_restart_broken_s3(started_cluster):
 
     minio_client.make_bucket(bucket)
 
-    files = default_upload_directory(
-        started_cluster,
-        "s3",
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        f"/iceberg_data/default/{TABLE_NAME}/",
-        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 a846fdbb295..b10db879b72 100644
--- a/tests/integration/test_storage_kafka/configs/kafka.xml
+++ b/tests/integration/test_storage_kafka/configs/kafka.xml
@@ -48,7 +48,7 @@
                 <!-- This is only producer setting, if it was applied to consumer,
                  it would create warning message in logs. -->
                 <!-- default 30000 -->
-                <request_timeout_ms>30001</request_timeout_ms>
+                <request_timeout_ms>30001</request_timeout_ms> 
             </kafka_topic>
             <!-- default 60000 -->
             <transaction_timeout_ms>60001</transaction_timeout_ms>
diff --git a/tests/integration/test_storage_kafka/test.py b/tests/integration/test_storage_kafka/test.py
index bef90e1b9d3..8393e88db88 100644
--- a/tests/integration/test_storage_kafka/test.py
+++ b/tests/integration/test_storage_kafka/test.py
@@ -29,7 +29,6 @@ from kafka import KafkaAdminClient, KafkaProducer, KafkaConsumer, BrokerConnecti
 from kafka.protocol.admin import DescribeGroupsRequest_v1
 from kafka.protocol.group import MemberAssignment
 from kafka.admin import NewTopic
-from contextlib import contextmanager
 
 
 # protoc --version
@@ -47,13 +46,6 @@ if is_arm():
 # 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.
 
-
-KAFKA_TOPIC_OLD = "old_t"
-KAFKA_CONSUMER_GROUP_OLD = "old_cg"
-KAFKA_TOPIC_NEW = "new_t"
-KAFKA_CONSUMER_GROUP_NEW = "new_cg"
-
-
 cluster = ClickHouseCluster(__file__)
 instance = cluster.add_instance(
     "instance",
@@ -63,10 +55,10 @@ instance = cluster.add_instance(
     with_zookeeper=True,  # For Replicated Table
     macros={
         "kafka_broker": "kafka1",
-        "kafka_topic_old": KAFKA_TOPIC_OLD,
-        "kafka_group_name_old": KAFKA_CONSUMER_GROUP_OLD,
-        "kafka_topic_new": KAFKA_TOPIC_NEW,
-        "kafka_group_name_new": KAFKA_CONSUMER_GROUP_NEW,
+        "kafka_topic_old": "old",
+        "kafka_group_name_old": "old",
+        "kafka_topic_new": "new",
+        "kafka_group_name_new": "new",
         "kafka_client_id": "instance",
         "kafka_format_json_each_row": "JSONEachRow",
     },
@@ -150,44 +142,6 @@ def kafka_delete_topic(admin_client, topic, max_retries=50):
                 raise Exception(f"Failed to delete topics {topic}, {result}")
 
 
-@contextmanager
-def kafka_topic(
-    admin_client,
-    topic_name,
-    num_partitions=1,
-    replication_factor=1,
-    max_retries=50,
-    config=None,
-):
-    kafka_create_topic(
-        admin_client,
-        topic_name,
-        num_partitions,
-        replication_factor,
-        max_retries,
-        config,
-    )
-    try:
-        yield None
-    finally:
-        # Code to release resource, e.g.:
-        kafka_delete_topic(admin_client, topic_name, max_retries)
-
-
-@contextmanager
-def existing_kafka_topic(admin_client, topic_name, max_retries=50):
-    try:
-        yield None
-    finally:
-        kafka_delete_topic(admin_client, topic_name, max_retries)
-
-
-def get_admin_client(kafka_cluster):
-    return KafkaAdminClient(
-        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
-    )
-
-
 def kafka_produce(kafka_cluster, topic, messages, timestamp=None, retries=15):
     logging.debug(
         "kafka_produce server:{}:{} topic:{}".format(
@@ -207,7 +161,7 @@ def kafka_producer_send_heartbeat_msg(max_retries=50):
     kafka_produce(kafka_cluster, "test_heartbeat_topic", ["test"], retries=max_retries)
 
 
-def kafka_consume(kafka_cluster, topic, need_decode=True, timestamp=0):
+def kafka_consume(kafka_cluster, topic, needDecode=True, timestamp=0):
     consumer = KafkaConsumer(
         bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port),
         auto_offset_reset="earliest",
@@ -217,7 +171,7 @@ def kafka_consume(kafka_cluster, topic, need_decode=True, timestamp=0):
         if toppar.topic == topic:
             for message in messages:
                 assert timestamp == 0 or message.timestamp / 1000 == timestamp
-                if need_decode:
+                if needDecode:
                     yield message.value.decode()
                 else:
                     yield message.value
@@ -242,33 +196,7 @@ def kafka_produce_protobuf_messages(kafka_cluster, topic, start_index, num_messa
     logging.debug(("Produced {} messages for topic {}".format(num_messages, topic)))
 
 
-def kafka_consume_with_retry(
-    kafka_cluster,
-    topic,
-    expected_messages,
-    need_decode=True,
-    timestamp=0,
-    retry_count=20,
-    sleep_time=0.1,
-):
-    messages = []
-    try_count = 0
-    while try_count < retry_count:
-        try_count += 1
-        messages.extend(
-            kafka_consume(
-                kafka_cluster, topic, need_decode=need_decode, timestamp=timestamp
-            )
-        )
-        if len(messages) == expected_messages:
-            break
-        time.sleep(sleep_time)
-    if len(messages) != expected_messages:
-        raise Exception(f"Got only {len(messages)} messages")
-    return messages
-
-
-def kafka_produce_protobuf_messages_no_delimiters(
+def kafka_produce_protobuf_messages_no_delimeters(
     kafka_cluster, topic, start_index, num_messages
 ):
     data = ""
@@ -356,99 +284,10 @@ def avro_confluent_message(schema_registry_client, value):
     return serializer.encode_record_with_schema("test_subject", schema, value)
 
 
-def create_settings_string(settings):
-    if settings is None:
-        return ""
-
-    def format_value(value):
-        if isinstance(value, str):
-            return f"'{value}'"
-        elif isinstance(value, bool):
-            return str(int(value))
-        return str(value)
-
-    settings_string = "SETTINGS "
-    keys = settings.keys()
-    first_key = next(iter(settings))
-    settings_string += str(first_key) + " = " + format_value(settings[first_key])
-    for key in keys:
-        if key == first_key:
-            continue
-        settings_string += ", " + str(key) + " = " + format_value(settings[key])
-    return settings_string
-
-
-def generate_old_create_table_query(
-    table_name,
-    columns_def,
-    database="test",
-    brokers="{kafka_broker}:19092",
-    topic_list="{kafka_topic_new}",
-    consumer_group="{kafka_group_name_new}",
-    format="{kafka_format_json_each_row}",
-    row_delimiter="\\n",
-    keeper_path=None,  # it is not used, but it is easier to handle keeper_path and replica_name like this
-    replica_name=None,
-    settings=None,
-):
-    settings_string = create_settings_string(settings)
-    query = f"""CREATE TABLE {database}.{table_name} ({columns_def}) ENGINE = Kafka('{brokers}', '{topic_list}', '{consumer_group}', '{format}', '{row_delimiter}')
-{settings_string}"""
-    logging.debug(f"Generated old create query: {query}")
-    return query
-
-
-def generate_new_create_table_query(
-    table_name,
-    columns_def,
-    database="test",
-    brokers="{kafka_broker}:19092",
-    topic_list="{kafka_topic_new}",
-    consumer_group="{kafka_group_name_new}",
-    format="{kafka_format_json_each_row}",
-    row_delimiter="\\n",
-    keeper_path=None,
-    replica_name=None,
-    settings=None,
-):
-    if settings is None:
-        settings = {}
-    if keeper_path is None:
-        keeper_path = f"/clickhouse/{{database}}/{table_name}"
-    if replica_name is None:
-        replica_name = "r1"
-    settings["kafka_keeper_path"] = keeper_path
-    settings["kafka_replica_name"] = replica_name
-    settings_string = create_settings_string(settings)
-    query = f"""CREATE TABLE {database}.{table_name} ({columns_def}) ENGINE = Kafka('{brokers}', '{topic_list}', '{consumer_group}', '{format}', '{row_delimiter}')
-{settings_string}
-SETTINGS allow_experimental_kafka_offsets_storage_in_keeper=1"""
-    logging.debug(f"Generated new create query: {query}")
-    return query
-
-
-def must_use_thread_per_consumer(generator):
-    if generator == generate_old_create_table_query:
-        return False
-    if generator == generate_new_create_table_query:
-        return True
-    raise Exception("Unexpected generator")
-
-
-def get_topic_postfix(generator):
-    if generator == generate_old_create_table_query:
-        return "old"
-    if generator == generate_new_create_table_query:
-        return "new"
-    raise Exception("Unexpected generator")
-
-
 # Tests
-@pytest.mark.parametrize(
-    "create_query_generator, do_direct_read",
-    [(generate_old_create_table_query, True), (generate_new_create_table_query, False)],
-)
-def test_kafka_column_types(kafka_cluster, create_query_generator, do_direct_read):
+
+
+def test_kafka_column_types(kafka_cluster):
     def assert_returned_exception(e):
         assert e.value.returncode == 36
         assert (
@@ -458,14 +297,57 @@ def test_kafka_column_types(kafka_cluster, create_query_generator, do_direct_rea
 
     # check column with DEFAULT expression
     with pytest.raises(QueryRuntimeException) as exception:
-        instance.query(create_query_generator("kafka", "a Int, b Int DEFAULT 0"))
+        instance.query(
+            """
+                CREATE TABLE test.kafka (a Int, b Int DEFAULT 0)
+                ENGINE = Kafka('{kafka_broker}:19092', '{kafka_topic_new}', '{kafka_group_name_new}', '{kafka_format_json_each_row}', '\\n')
+                """
+        )
     assert_returned_exception(exception)
 
     # check EPHEMERAL
     with pytest.raises(QueryRuntimeException) as exception:
-        instance.query(create_query_generator("kafka", "a Int, b Int EPHEMERAL"))
+        instance.query(
+            """
+                CREATE TABLE test.kafka (a Int, b Int EPHEMERAL)
+                ENGINE = Kafka('{kafka_broker}:19092', '{kafka_topic_new}', '{kafka_group_name_new}', '{kafka_format_json_each_row}', '\\n')
+                """
+        )
     assert_returned_exception(exception)
 
+    # check ALIAS
+    instance.query(
+        """
+                CREATE TABLE test.kafka (a Int, b String Alias toString(a))
+                ENGINE = Kafka('{kafka_broker}:19092', '{kafka_topic_new}', '{kafka_group_name_new}', '{kafka_format_json_each_row}', '\\n')
+                SETTINGS kafka_commit_on_select = 1;
+                """
+    )
+    messages = []
+    for i in range(5):
+        messages.append(json.dumps({"a": i}))
+    kafka_produce(kafka_cluster, "new", messages)
+    result = ""
+    expected = TSV(
+        """
+0\t0
+1\t1
+2\t2
+3\t3
+4\t4
+                              """
+    )
+    retries = 50
+    while retries > 0:
+        result += instance.query("SELECT a, b FROM test.kafka", ignore_error=True)
+        if TSV(result) == expected:
+            break
+        retries -= 1
+
+    assert TSV(result) == expected
+
+    instance.query("DROP TABLE test.kafka SYNC")
+
     # check MATERIALIZED
     with pytest.raises(QueryRuntimeException) as exception:
         instance.query(
@@ -476,41 +358,6 @@ def test_kafka_column_types(kafka_cluster, create_query_generator, do_direct_rea
         )
     assert_returned_exception(exception)
 
-    if do_direct_read:
-        # check ALIAS
-        instance.query(
-            create_query_generator(
-                "kafka",
-                "a Int, b String Alias toString(a)",
-                settings={"kafka_commit_on_select": True},
-            )
-        )
-        messages = []
-        for i in range(5):
-            messages.append(json.dumps({"a": i}))
-        kafka_produce(kafka_cluster, KAFKA_TOPIC_NEW, messages)
-        result = ""
-        expected = TSV(
-            """
-    0\t0
-    1\t1
-    2\t2
-    3\t3
-    4\t4
-                                """
-        )
-        retries = 50
-        while retries > 0:
-            result += instance.query("SELECT a, b FROM test.kafka", ignore_error=True)
-            if TSV(result) == expected:
-                break
-            retries -= 1
-            time.sleep(0.5)
-
-        assert TSV(result) == expected
-
-        instance.query("DROP TABLE test.kafka SYNC")
-
 
 def test_kafka_settings_old_syntax(kafka_cluster):
     assert TSV(
@@ -519,13 +366,13 @@ def test_kafka_settings_old_syntax(kafka_cluster):
             ignore_error=True,
         )
     ) == TSV(
-        f"""kafka_broker	kafka1
+        """kafka_broker	kafka1
 kafka_client_id	instance
 kafka_format_json_each_row	JSONEachRow
-kafka_group_name_new	{KAFKA_CONSUMER_GROUP_NEW}
-kafka_group_name_old	{KAFKA_CONSUMER_GROUP_OLD}
-kafka_topic_new	new_t
-kafka_topic_old	old_t
+kafka_group_name_new	new
+kafka_group_name_old	old
+kafka_topic_new	new
+kafka_topic_old	old
 """
     )
 
@@ -542,7 +389,7 @@ kafka_topic_old	old_t
     messages = []
     for i in range(50):
         messages.append(json.dumps({"key": i, "value": i}))
-    kafka_produce(kafka_cluster, KAFKA_TOPIC_OLD, messages)
+    kafka_produce(kafka_cluster, "old", messages)
 
     result = ""
     while True:
@@ -552,7 +399,7 @@ kafka_topic_old	old_t
 
     kafka_check_result(result, True)
 
-    members = describe_consumer_group(kafka_cluster, KAFKA_CONSUMER_GROUP_OLD)
+    members = describe_consumer_group(kafka_cluster, "old")
     assert members[0]["client_id"] == "ClickHouse-instance-test-kafka"
     # text_desc = kafka_cluster.exec_in_container(kafka_cluster.get_container_id('kafka1'),"kafka-consumer-groups --bootstrap-server localhost:9092 --describe --members --group old --verbose"))
 
@@ -576,16 +423,16 @@ def test_kafka_settings_new_syntax(kafka_cluster):
     messages = []
     for i in range(25):
         messages.append(json.dumps({"key": i, "value": i}))
-    kafka_produce(kafka_cluster, KAFKA_TOPIC_NEW, messages)
+    kafka_produce(kafka_cluster, "new", messages)
 
     # Insert couple of malformed messages.
-    kafka_produce(kafka_cluster, KAFKA_TOPIC_NEW, ["}{very_broken_message,"])
-    kafka_produce(kafka_cluster, KAFKA_TOPIC_NEW, ["}another{very_broken_message,"])
+    kafka_produce(kafka_cluster, "new", ["}{very_broken_message,"])
+    kafka_produce(kafka_cluster, "new", ["}another{very_broken_message,"])
 
     messages = []
     for i in range(25, 50):
         messages.append(json.dumps({"key": i, "value": i}))
-    kafka_produce(kafka_cluster, KAFKA_TOPIC_NEW, messages)
+    kafka_produce(kafka_cluster, "new", messages)
 
     result = ""
     while True:
@@ -595,7 +442,7 @@ def test_kafka_settings_new_syntax(kafka_cluster):
 
     kafka_check_result(result, True)
 
-    members = describe_consumer_group(kafka_cluster, KAFKA_CONSUMER_GROUP_NEW)
+    members = describe_consumer_group(kafka_cluster, "new")
     assert members[0]["client_id"] == "instance test 1234"
 
 
@@ -673,13 +520,12 @@ def test_kafka_json_as_string(kafka_cluster):
     )
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_formats(kafka_cluster, create_query_generator):
+def test_kafka_formats(kafka_cluster):
     schema_registry_client = CachedSchemaRegistryClient(
-        {"url": f"http://localhost:{kafka_cluster.schema_registry_port}"}
+        "http://localhost:{}".format(kafka_cluster.schema_registry_port)
+    )
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
     )
 
     # data was dumped from clickhouse itself in a following manner
@@ -803,7 +649,7 @@ def test_kafka_formats(kafka_cluster, create_query_generator):
                 '(id = 1, blockNo = 0, val1 = "AM", val2 = 0.5, val3 = 1)\n(id = 2, blockNo = 0, val1 = "AM", val2 = 0.5, val3 = 1)\n(id = 3, blockNo = 0, val1 = "AM", val2 = 0.5, val3 = 1)\n(id = 4, blockNo = 0, val1 = "AM", val2 = 0.5, val3 = 1)\n(id = 5, blockNo = 0, val1 = "AM", val2 = 0.5, val3 = 1)\n(id = 6, blockNo = 0, val1 = "AM", val2 = 0.5, val3 = 1)\n(id = 7, blockNo = 0, val1 = "AM", val2 = 0.5, val3 = 1)\n(id = 8, blockNo = 0, val1 = "AM", val2 = 0.5, val3 = 1)\n(id = 9, blockNo = 0, val1 = "AM", val2 = 0.5, val3 = 1)\n(id = 10, blockNo = 0, val1 = "AM", val2 = 0.5, val3 = 1)\n(id = 11, blockNo = 0, val1 = "AM", val2 = 0.5, val3 = 1)\n(id = 12, blockNo = 0, val1 = "AM", val2 = 0.5, val3 = 1)\n(id = 13, blockNo = 0, val1 = "AM", val2 = 0.5, val3 = 1)\n(id = 14, blockNo = 0, val1 = "AM", val2 = 0.5, val3 = 1)\n(id = 15, blockNo = 0, val1 = "AM", val2 = 0.5, val3 = 1)',
                 '(id = 0, blockNo = 0, val1 = "AM", val2 = 0.5, val3 = 1)',
             ],
-            "extra_settings": {"format_template_row": "template_row.format"},
+            "extra_settings": ", format_template_row='template_row.format'",
         },
         "Regexp": {
             "data_sample": [
@@ -814,10 +660,7 @@ def test_kafka_formats(kafka_cluster, create_query_generator):
                 # On empty message exception happens: Line "" doesn't match the regexp.: (at row 1)
                 # /src/Processors/Formats/Impl/RegexpRowInputFormat.cpp:140: DB::RegexpRowInputFormat::readRow(std::__1::vector<COW<DB::IColumn>::mutable_ptr<DB::IColumn>, std::__1::allocator<COW<DB::IColumn>::mutable_ptr<DB::IColumn> > >&, DB::RowReadExtension&) @ 0x1df82fcb in /usr/bin/clickhouse
             ],
-            "extra_settings": {
-                "format_regexp": r"\(id = (.+?), blockNo = (.+?), val1 = \"(.+?)\", val2 = (.+?), val3 = (.+?)\)",
-                "format_regexp_escaping_rule": "Escaped",
-            },
+            "extra_settings": r", format_regexp='\(id = (.+?), blockNo = (.+?), val1 = \"(.+?)\", val2 = (.+?), val3 = (.+?)\)', format_regexp_escaping_rule='Escaped'",
         },
         ## BINARY FORMATS
         # dumped with
@@ -889,7 +732,7 @@ def test_kafka_formats(kafka_cluster, create_query_generator):
                 # /src/Processors/Formats/Impl/ProtobufRowInputFormat.cpp:25: DB::ProtobufRowInputFormat::readRow(std::__1::vector<COW<DB::IColumn>::mutable_ptr<DB::IColumn>, std::__1::allocator<COW<DB::IColumn>::mutable_ptr<DB::IColumn> > >&, DB::RowReadExtension&) @ 0x1df4cc71 in /usr/bin/clickhouse
                 # /src/Processors/Formats/IRowInputFormat.cpp:64: DB::IRowInputFormat::generate() @ 0x1de727cf in /usr/bin/clickhouse
             ],
-            "extra_settings": {"kafka_schema": "test:TestMessage"},
+            "extra_settings": ", kafka_schema='test:TestMessage'",
         },
         "ORC": {
             "data_sample": [
@@ -913,7 +756,7 @@ def test_kafka_formats(kafka_cluster, create_query_generator):
                 # /src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp:212: DB::CapnProtoRowInputFormat::readMessage() @ 0x1ded1cab in /usr/bin/clickhouse
                 # /src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp:241: DB::CapnProtoRowInputFormat::readRow(std::__1::vector<COW<DB::IColumn>::mutable_ptr<DB::IColumn>, std::__1::allocator<COW<DB::IColumn>::mutable_ptr<DB::IColumn> > >&, DB::RowReadExtension&) @ 0x1ded205d in /usr/bin/clickhouse
             ],
-            "extra_settings": {"kafka_schema": "test:TestRecordStruct"},
+            "extra_settings": ", kafka_schema='test:TestRecordStruct'",
         },
         "Parquet": {
             "data_sample": [
@@ -948,12 +791,9 @@ def test_kafka_formats(kafka_cluster, create_query_generator):
                     {"id": 0, "blockNo": 0, "val1": str("AM"), "val2": 0.5, "val3": 1},
                 ),
             ],
-            "extra_settings": {
-                "format_avro_schema_registry_url": "http://{}:{}".format(
-                    kafka_cluster.schema_registry_host,
-                    kafka_cluster.schema_registry_port,
-                )
-            },
+            "extra_settings": ", format_avro_schema_registry_url='http://{}:{}'".format(
+                kafka_cluster.schema_registry_host, kafka_cluster.schema_registry_port
+            ),
             "supports_empty_value": True,
         },
         "Avro": {
@@ -997,41 +837,40 @@ def test_kafka_formats(kafka_cluster, create_query_generator):
         },
     }
 
-    topic_postfix = str(hash(create_query_generator))
     for format_name, format_opts in list(all_formats.items()):
-        logging.debug(f"Set up {format_name}")
-        topic_name = f"format_tests_{format_name}-{topic_postfix}"
+        logging.debug(("Set up {}".format(format_name)))
+        topic_name = "format_tests_{}".format(format_name)
         data_sample = format_opts["data_sample"]
         data_prefix = []
         # prepend empty value when supported
         if format_opts.get("supports_empty_value", False):
             data_prefix = data_prefix + [""]
         kafka_produce(kafka_cluster, topic_name, data_prefix + data_sample)
-
-        extra_settings = format_opts.get("extra_settings") or {}
-        extra_settings["kafka_flush_interval_ms"] = 1000
-
         instance.query(
             """
             DROP TABLE IF EXISTS test.kafka_{format_name};
 
-            {create_query};
+            CREATE TABLE test.kafka_{format_name} (
+                id Int64,
+                blockNo UInt16,
+                val1 String,
+                val2 Float32,
+                val3 UInt8
+            ) ENGINE = Kafka()
+                SETTINGS kafka_broker_list = 'kafka1:19092',
+                        kafka_topic_list = '{topic_name}',
+                        kafka_group_name = '{topic_name}_group',
+                        kafka_format = '{format_name}',
+                        kafka_flush_interval_ms = 1000 {extra_settings};
 
             DROP TABLE IF EXISTS test.kafka_{format_name}_mv;
 
-            CREATE MATERIALIZED VIEW test.kafka_{format_name}_mv ENGINE=MergeTree ORDER BY tuple() AS
+            CREATE MATERIALIZED VIEW test.kafka_{format_name}_mv Engine=Log AS
                 SELECT *, _topic, _partition, _offset FROM test.kafka_{format_name};
             """.format(
                 topic_name=topic_name,
                 format_name=format_name,
-                create_query=create_query_generator(
-                    f"kafka_{format_name}",
-                    "id Int64, blockNo UInt16, val1 String, val2 Float32, val3 UInt8",
-                    topic_list=f"{topic_name}",
-                    consumer_group=f"{topic_name}_group",
-                    format=format_name,
-                    settings=extra_settings,
-                ),
+                extra_settings=format_opts.get("extra_settings") or "",
             )
         )
     raw_expected = """\
@@ -1066,16 +905,13 @@ def test_kafka_formats(kafka_cluster, create_query_generator):
 
     for format_name, format_opts in list(all_formats.items()):
         logging.debug(("Checking {}".format(format_name)))
-        topic_name = f"format_tests_{format_name}-{topic_postfix}"
+        topic_name = f"format_tests_{format_name}"
         # shift offsets by 1 if format supports empty value
         offsets = (
             [1, 2, 3] if format_opts.get("supports_empty_value", False) else [0, 1, 2]
         )
-        result = instance.query_with_retry(
-            "SELECT * FROM test.kafka_{format_name}_mv;".format(
-                format_name=format_name
-            ),
-            check_callback=lambda x: x.count("\n") == raw_expected.count("\n"),
+        result = instance.query(
+            "SELECT * FROM test.kafka_{format_name}_mv;".format(format_name=format_name)
         )
         expected = raw_expected.format(
             topic_name=topic_name,
@@ -1086,7 +922,7 @@ def test_kafka_formats(kafka_cluster, create_query_generator):
         assert TSV(result) == TSV(expected), "Proper result for format: {}".format(
             format_name
         )
-        kafka_delete_topic(get_admin_client(kafka_cluster), topic_name)
+        kafka_delete_topic(admin_client, topic_name)
 
 
 # Since everything is async and shaky when receiving messages from Kafka,
@@ -1161,29 +997,8 @@ def kafka_cluster():
 
 @pytest.fixture(autouse=True)
 def kafka_setup_teardown():
-    instance.query("DROP DATABASE IF EXISTS test SYNC; CREATE DATABASE test;")
-    admin_client = get_admin_client(cluster)
-
-    def get_topics_to_delete():
-        return [t for t in admin_client.list_topics() if not t.startswith("_")]
-
-    topics = get_topics_to_delete()
-    logging.debug(f"Deleting topics: {topics}")
-    result = admin_client.delete_topics(topics)
-    for topic, error in result.topic_error_codes:
-        if error != 0:
-            logging.warning(f"Received error {error} while deleting topic {topic}")
-        else:
-            logging.info(f"Deleted topic {topic}")
-
-    retries = 0
-    topics = get_topics_to_delete()
-    while len(topics) != 0:
-        logging.info(f"Existing topics: {topics}")
-        if retries >= 5:
-            raise Exception(f"Failed to delete topics {topics}")
-        retries += 1
-        time.sleep(0.5)
+    instance.query("DROP DATABASE IF EXISTS test; CREATE DATABASE test;")
+    # logging.debug("kafka is available - running test")
     yield  # run test
 
 
@@ -1283,7 +1098,9 @@ def test_kafka_issue4116(kafka_cluster):
 
 
 def test_kafka_consumer_hang(kafka_cluster):
-    admin_client = get_admin_client(kafka_cluster)
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
 
     topic_name = "consumer_hang"
     kafka_create_topic(admin_client, topic_name, num_partitions=8)
@@ -1363,7 +1180,9 @@ def test_kafka_consumer_hang(kafka_cluster):
 
 
 def test_kafka_consumer_hang2(kafka_cluster):
-    admin_client = get_admin_client(kafka_cluster)
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
 
     topic_name = "consumer_hang2"
     kafka_create_topic(admin_client, topic_name)
@@ -1424,7 +1243,9 @@ def test_kafka_consumer_hang2(kafka_cluster):
 # sequential read from different consumers leads to breaking lot of kafka invariants
 # (first consumer will get all partitions initially, and may have problems in doing polls every 60 sec)
 def test_kafka_read_consumers_in_parallel(kafka_cluster):
-    admin_client = get_admin_client(kafka_cluster)
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
 
     topic_name = "read_consumers_in_parallel"
     kafka_create_topic(admin_client, topic_name, num_partitions=8)
@@ -1544,7 +1365,9 @@ def test_kafka_tsv_with_delimiter(kafka_cluster):
 
 
 def test_kafka_select_empty(kafka_cluster):
-    admin_client = get_admin_client(kafka_cluster)
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
     topic_name = "empty"
     kafka_create_topic(admin_client, topic_name)
 
@@ -1722,13 +1545,13 @@ def test_kafka_protobuf_no_delimiter(kafka_cluster):
         """
     )
 
-    kafka_produce_protobuf_messages_no_delimiters(
+    kafka_produce_protobuf_messages_no_delimeters(
         kafka_cluster, "pb_no_delimiter", 0, 20
     )
-    kafka_produce_protobuf_messages_no_delimiters(
+    kafka_produce_protobuf_messages_no_delimeters(
         kafka_cluster, "pb_no_delimiter", 20, 1
     )
-    kafka_produce_protobuf_messages_no_delimiters(
+    kafka_produce_protobuf_messages_no_delimeters(
         kafka_cluster, "pb_no_delimiter", 21, 29
     )
 
@@ -1769,20 +1592,18 @@ def test_kafka_protobuf_no_delimiter(kafka_cluster):
     assert TSV(result) == TSV(expected)
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_materialized_view(kafka_cluster, create_query_generator):
-    topic_name = "mv"
-
+def test_kafka_materialized_view(kafka_cluster):
     instance.query(
-        f"""
+        """
         DROP TABLE IF EXISTS test.view;
         DROP TABLE IF EXISTS test.consumer;
-        DROP TABLE IF EXISTS test.kafka;
-
-        {create_query_generator("kafka", "key UInt64, value UInt64", topic_list=topic_name, consumer_group="mv")};
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'mv',
+                     kafka_group_name = 'mv',
+                     kafka_format = 'JSONEachRow',
+                     kafka_row_delimiter = '\\n';
         CREATE TABLE test.view (key UInt64, value UInt64)
             ENGINE = MergeTree()
             ORDER BY key;
@@ -1794,124 +1615,110 @@ def test_kafka_materialized_view(kafka_cluster, create_query_generator):
     messages = []
     for i in range(50):
         messages.append(json.dumps({"key": i, "value": i}))
-    kafka_produce(kafka_cluster, topic_name, messages)
+    kafka_produce(kafka_cluster, "mv", messages)
 
-    with existing_kafka_topic(get_admin_client(kafka_cluster), topic_name):
-        result = instance.query_with_retry(
-            "SELECT * FROM test.view", check_callback=kafka_check_result
-        )
+    while True:
+        result = instance.query("SELECT * FROM test.view")
+        if kafka_check_result(result):
+            break
 
-        kafka_check_result(result, True)
-
-        instance.query(
-            """
-            DROP TABLE test.consumer;
-            DROP TABLE test.view;
-            DROP TABLE test.kafka;
+    instance.query(
         """
-        )
+        DROP TABLE test.consumer;
+        DROP TABLE test.view;
+    """
+    )
+
+    kafka_check_result(result, True)
 
 
-@pytest.mark.parametrize(
-    "create_query_generator, log_line",
-    [
-        (
-            generate_new_create_table_query,
-            r"kafka.*Saved offset [0-9]+ for topic-partition \[recreate_kafka_table:[0-9]+",
-        ),
-        (
-            generate_old_create_table_query,
-            "kafka.*Committed offset [0-9]+.*recreate_kafka_table",
-        ),
-    ],
-)
-def test_kafka_recreate_kafka_table(kafka_cluster, create_query_generator, log_line):
+def test_kafka_recreate_kafka_table(kafka_cluster):
     """
     Checks that materialized view work properly after dropping and recreating the Kafka table.
     """
+    # line for backporting:
+    # admin_client = KafkaAdminClient(bootstrap_servers="localhost:9092")
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
+
     topic_name = "recreate_kafka_table"
-    thread_per_consumer = must_use_thread_per_consumer(create_query_generator)
+    kafka_create_topic(admin_client, topic_name, num_partitions=6)
 
-    with kafka_topic(get_admin_client(kafka_cluster), topic_name, num_partitions=6):
-        create_query = create_query_generator(
-            "kafka",
-            "key UInt64, value UInt64",
-            topic_list=topic_name,
-            consumer_group="recreate_kafka_table_group",
-            settings={
-                "kafka_num_consumers": 4,
-                "kafka_flush_interval_ms": 1000,
-                "kafka_skip_broken_messages": 1048577,
-                "kafka_thread_per_consumer": thread_per_consumer,
-            },
-        )
-
-        instance.query(
-            f"""
-            DROP TABLE IF EXISTS test.view;
-            DROP TABLE IF EXISTS test.consumer;
-            {create_query};
-
-            CREATE TABLE test.view (key UInt64, value UInt64)
-                ENGINE = MergeTree()
-                ORDER BY key;
-            CREATE MATERIALIZED VIEW test.consumer TO test.view AS
-                SELECT * FROM test.kafka;
+    instance.query(
         """
-        )
+        DROP TABLE IF EXISTS test.view;
+        DROP TABLE IF EXISTS test.consumer;
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'recreate_kafka_table',
+                     kafka_group_name = 'recreate_kafka_table_group',
+                     kafka_format = 'JSONEachRow',
+                     kafka_num_consumers = 6,
+                     kafka_flush_interval_ms = 1000,
+                     kafka_skip_broken_messages = 1048577;
 
-        messages = []
-        for i in range(120):
-            messages.append(json.dumps({"key": i, "value": i}))
-        kafka_produce(kafka_cluster, "recreate_kafka_table", messages)
+        CREATE TABLE test.view (key UInt64, value UInt64)
+            ENGINE = MergeTree()
+            ORDER BY key;
+        CREATE MATERIALIZED VIEW test.consumer TO test.view AS
+            SELECT * FROM test.kafka;
+    """
+    )
 
-        instance.wait_for_log_line(
-            log_line,
-            repetitions=6,
-            look_behind_lines=100,
-        )
+    messages = []
+    for i in range(120):
+        messages.append(json.dumps({"key": i, "value": i}))
+    kafka_produce(kafka_cluster, "recreate_kafka_table", messages)
 
-        instance.query(
-            """
-            DROP TABLE test.kafka;
+    instance.wait_for_log_line(
+        "kafka.*Committed offset [0-9]+.*recreate_kafka_table",
+        repetitions=6,
+        look_behind_lines=100,
+    )
+
+    instance.query(
         """
-        )
+        DROP TABLE test.kafka;
+    """
+    )
 
-        instance.rotate_logs()
+    kafka_produce(kafka_cluster, "recreate_kafka_table", messages)
 
-        kafka_produce(kafka_cluster, "recreate_kafka_table", messages)
-
-        instance.query(create_query)
-
-        instance.wait_for_log_line(
-            log_line,
-            repetitions=6,
-            look_behind_lines=100,
-        )
-
-        # data was not flushed yet (it will be flushed 7.5 sec after creating MV)
-        assert int(instance.query("SELECT count() FROM test.view")) == 240
-
-        instance.query(
-            """
-            DROP TABLE test.consumer;
-            DROP TABLE test.kafka;
-            DROP TABLE test.view;
+    instance.query(
         """
-        )
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'recreate_kafka_table',
+                     kafka_group_name = 'recreate_kafka_table_group',
+                     kafka_format = 'JSONEachRow',
+                     kafka_num_consumers = 6,
+                     kafka_flush_interval_ms = 1000,
+                     kafka_skip_broken_messages = 1048577;
+    """
+    )
+
+    instance.wait_for_log_line(
+        "kafka.*Committed offset [0-9]+.*recreate_kafka_table",
+        repetitions=6,
+        look_behind_lines=100,
+    )
+
+    # data was not flushed yet (it will be flushed 7.5 sec after creating MV)
+    assert int(instance.query("SELECT count() FROM test.view")) == 240
+
+    instance.query(
+        """
+        DROP TABLE test.consumer;
+        DROP TABLE test.view;
+    """
+    )
+    kafka_delete_topic(admin_client, topic_name)
 
 
-@pytest.mark.parametrize(
-    "create_query_generator, log_line",
-    [
-        (generate_old_create_table_query, "Committed offset {offset}"),
-        (
-            generate_new_create_table_query,
-            r"kafka.*Saved offset [0-9]+ for topic-partition \[{topic}:[0-9]+\]",
-        ),
-    ],
-)
-def test_librdkafka_compression(kafka_cluster, create_query_generator, log_line):
+def test_librdkafka_compression(kafka_cluster):
     """
     Regression for UB in snappy-c (that is used in librdkafka),
     backport pr is [1].
@@ -1947,68 +1754,58 @@ def test_librdkafka_compression(kafka_cluster, create_query_generator, log_line)
 
     expected = "\n".join(expected)
 
-    admin_client = get_admin_client(kafka_cluster)
-
     for compression_type in supported_compression_types:
         logging.debug(("Check compression {}".format(compression_type)))
 
         topic_name = "test_librdkafka_compression_{}".format(compression_type)
-        topic_config = {"compression.type": compression_type}
-        with kafka_topic(admin_client, topic_name, config=topic_config):
-            instance.query(
-                """{create_query};
+        admin_client = KafkaAdminClient(
+            bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+        )
 
-                CREATE TABLE test.view (key UInt64, value String)
-                    ENGINE = MergeTree()
-                    ORDER BY key;
+        kafka_create_topic(
+            admin_client, topic_name, config={"compression.type": compression_type}
+        )
 
-                CREATE MATERIALIZED VIEW test.consumer TO test.view AS
-                    SELECT * FROM test.kafka;
-            """.format(
-                    create_query=create_query_generator(
-                        "kafka",
-                        "key UInt64, value String",
-                        topic_list=topic_name,
-                        format="JSONEachRow",
-                        settings={"kafka_flush_interval_ms": 1000},
-                    ),
-                )
+        instance.query(
+            """
+            CREATE TABLE test.kafka (key UInt64, value String)
+                ENGINE = Kafka
+                SETTINGS kafka_broker_list = 'kafka1:19092',
+                        kafka_topic_list = '{topic_name}',
+                        kafka_group_name = '{topic_name}_group',
+                        kafka_format = 'JSONEachRow',
+                        kafka_flush_interval_ms = 1000;
+            CREATE MATERIALIZED VIEW test.consumer Engine=Log AS
+                SELECT * FROM test.kafka;
+        """.format(
+                topic_name=topic_name
             )
+        )
 
-            kafka_produce(kafka_cluster, topic_name, messages)
+        kafka_produce(kafka_cluster, topic_name, messages)
 
-            instance.wait_for_log_line(
-                log_line.format(offset=number_of_messages, topic=topic_name)
-            )
-            result = instance.query("SELECT * FROM test.view")
-            assert TSV(result) == TSV(expected)
+        instance.wait_for_log_line("Committed offset {}".format(number_of_messages))
 
-            instance.query("DROP TABLE test.kafka SYNC")
-            instance.query("DROP TABLE test.consumer SYNC")
-            instance.query("DROP TABLE test.view SYNC")
+        result = instance.query("SELECT * FROM test.consumer")
+        assert TSV(result) == TSV(expected)
+
+        instance.query("DROP TABLE test.kafka SYNC")
+        instance.query("DROP TABLE test.consumer SYNC")
+        kafka_delete_topic(admin_client, topic_name)
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_new_create_table_query, generate_old_create_table_query],
-)
-def test_kafka_materialized_view_with_subquery(kafka_cluster, create_query_generator):
-    topic_name = "mysq"
-    logging.debug(f"Using topic {topic_name}")
-
-    create_query = create_query_generator(
-        "kafka",
-        "key UInt64, value UInt64",
-        topic_list=topic_name,
-        consumer_group=topic_name,
-    )
+def test_kafka_materialized_view_with_subquery(kafka_cluster):
     instance.query(
-        f"""
-        DROP TABLE IF EXISTS test.kafka;
+        """
         DROP TABLE IF EXISTS test.view;
         DROP TABLE IF EXISTS test.consumer;
-
-        {create_query};
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'mvsq',
+                     kafka_group_name = 'mvsq',
+                     kafka_format = 'JSONEachRow',
+                     kafka_row_delimiter = '\\n';
         CREATE TABLE test.view (key UInt64, value UInt64)
             ENGINE = MergeTree()
             ORDER BY key;
@@ -2020,46 +1817,37 @@ def test_kafka_materialized_view_with_subquery(kafka_cluster, create_query_gener
     messages = []
     for i in range(50):
         messages.append(json.dumps({"key": i, "value": i}))
-    kafka_produce(kafka_cluster, topic_name, messages)
+    kafka_produce(kafka_cluster, "mvsq", messages)
 
-    with existing_kafka_topic(get_admin_client(kafka_cluster), topic_name):
-        result = instance.query_with_retry(
-            "SELECT * FROM test.view",
-            check_callback=kafka_check_result,
-            retry_count=40,
-            sleep_time=0.75,
-        )
-
-        instance.query(
-            """
-            DROP TABLE test.consumer;
-            DROP TABLE test.view;
-        """
-        )
-
-        kafka_check_result(result, True)
-
-
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_many_materialized_views(kafka_cluster, create_query_generator):
-    topic_name = f"mmv-{get_topic_postfix(create_query_generator)}"
-    create_query = create_query_generator(
-        "kafka",
-        "key UInt64, value UInt64",
-        topic_list=topic_name,
-        consumer_group=f"{topic_name}-group",
-    )
+    while True:
+        result = instance.query("SELECT * FROM test.view")
+        if kafka_check_result(result):
+            break
 
     instance.query(
-        f"""
+        """
+        DROP TABLE test.consumer;
+        DROP TABLE test.view;
+    """
+    )
+
+    kafka_check_result(result, True)
+
+
+def test_kafka_many_materialized_views(kafka_cluster):
+    instance.query(
+        """
         DROP TABLE IF EXISTS test.view1;
         DROP TABLE IF EXISTS test.view2;
         DROP TABLE IF EXISTS test.consumer1;
         DROP TABLE IF EXISTS test.consumer2;
-        {create_query};
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'mmv',
+                     kafka_group_name = 'mmv',
+                     kafka_format = 'JSONEachRow',
+                     kafka_row_delimiter = '\\n';
         CREATE TABLE test.view1 (key UInt64, value UInt64)
             ENGINE = MergeTree()
             ORDER BY key;
@@ -2076,258 +1864,237 @@ def test_kafka_many_materialized_views(kafka_cluster, create_query_generator):
     messages = []
     for i in range(50):
         messages.append(json.dumps({"key": i, "value": i}))
-    kafka_produce(kafka_cluster, topic_name, messages)
+    kafka_produce(kafka_cluster, "mmv", messages)
 
-    with existing_kafka_topic(get_admin_client(kafka_cluster), topic_name):
-        result1 = instance.query_with_retry(
-            "SELECT * FROM test.view1", check_callback=kafka_check_result
-        )
-        result2 = instance.query_with_retry(
-            "SELECT * FROM test.view2", check_callback=kafka_check_result
-        )
+    while True:
+        result1 = instance.query("SELECT * FROM test.view1")
+        result2 = instance.query("SELECT * FROM test.view2")
+        if kafka_check_result(result1) and kafka_check_result(result2):
+            break
 
-        instance.query(
-            """
-            DROP TABLE test.consumer1;
-            DROP TABLE test.consumer2;
-            DROP TABLE test.view1;
-            DROP TABLE test.view2;
+    instance.query(
         """
-        )
+        DROP TABLE test.consumer1;
+        DROP TABLE test.consumer2;
+        DROP TABLE test.view1;
+        DROP TABLE test.view2;
+    """
+    )
 
-        kafka_check_result(result1, True)
-        kafka_check_result(result2, True)
+    kafka_check_result(result1, True)
+    kafka_check_result(result2, True)
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_flush_on_big_message(kafka_cluster, create_query_generator):
-    # Create batches of messages of size ~100Kb
+def test_kafka_flush_on_big_message(kafka_cluster):
+    # Create batchs of messages of size ~100Kb
     kafka_messages = 1000
     batch_messages = 1000
-    topic_name = "flush" + get_topic_postfix(create_query_generator)
     messages = [
         json.dumps({"key": i, "value": "x" * 100}) * batch_messages
         for i in range(kafka_messages)
     ]
-    kafka_produce(kafka_cluster, topic_name, messages)
+    kafka_produce(kafka_cluster, "flush", messages)
 
-    admin_client = get_admin_client(kafka_cluster)
-
-    with existing_kafka_topic(admin_client, topic_name):
-        create_query = create_query_generator(
-            "kafka",
-            "key UInt64, value String",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-            settings={"kafka_max_block_size": 10},
-        )
-
-        instance.query(
-            f"""
-            DROP TABLE IF EXISTS test.view;
-            DROP TABLE IF EXISTS test.consumer;
-            {create_query};
-            CREATE TABLE test.view (key UInt64, value String)
-                ENGINE = MergeTree
-                ORDER BY key;
-            CREATE MATERIALIZED VIEW test.consumer TO test.view AS
-                SELECT * FROM test.kafka;
+    instance.query(
         """
-        )
+        DROP TABLE IF EXISTS test.view;
+        DROP TABLE IF EXISTS test.consumer;
+        CREATE TABLE test.kafka (key UInt64, value String)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'flush',
+                     kafka_group_name = 'flush',
+                     kafka_format = 'JSONEachRow',
+                     kafka_max_block_size = 10;
+        CREATE TABLE test.view (key UInt64, value String)
+            ENGINE = MergeTree
+            ORDER BY key;
+        CREATE MATERIALIZED VIEW test.consumer TO test.view AS
+            SELECT * FROM test.kafka;
+    """
+    )
 
-        received = False
-        while not received:
-            try:
-                offsets = admin_client.list_consumer_group_offsets(topic_name)
-                for topic, offset in list(offsets.items()):
-                    if topic.topic == topic_name and offset.offset == kafka_messages:
-                        received = True
-                        break
-            except kafka.errors.GroupCoordinatorNotAvailableError:
-                continue
+    client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
+    received = False
+    while not received:
+        try:
+            offsets = client.list_consumer_group_offsets("flush")
+            for topic, offset in list(offsets.items()):
+                if topic.topic == "flush" and offset.offset == kafka_messages:
+                    received = True
+                    break
+        except kafka.errors.GroupCoordinatorNotAvailableError:
+            continue
 
-        while True:
-            result = instance.query("SELECT count() FROM test.view")
-            if int(result) == kafka_messages * batch_messages:
-                break
+    while True:
+        result = instance.query("SELECT count() FROM test.view")
+        if int(result) == kafka_messages * batch_messages:
+            break
 
-        instance.query(
-            """
-            DROP TABLE test.consumer;
-            DROP TABLE test.view;
+    instance.query(
         """
-        )
+        DROP TABLE test.consumer;
+        DROP TABLE test.view;
+    """
+    )
 
-        assert (
-            int(result) == kafka_messages * batch_messages
-        ), "ClickHouse lost some messages: {}".format(result)
+    assert (
+        int(result) == kafka_messages * batch_messages
+    ), "ClickHouse lost some messages: {}".format(result)
 
 
 def test_kafka_virtual_columns(kafka_cluster):
-    topic_config = {
-        # default retention, since predefined timestamp_ms is used.
-        "retention.ms": "-1",
-    }
-    with kafka_topic(get_admin_client(kafka_cluster), "virt1", config=topic_config):
-        instance.query(
-            """
-            CREATE TABLE test.kafka (key UInt64, value UInt64)
-                ENGINE = Kafka
-                SETTINGS kafka_broker_list = 'kafka1:19092',
-                        kafka_topic_list = 'virt1',
-                        kafka_group_name = 'virt1',
-                        kafka_commit_on_select = 1,
-                        kafka_format = 'JSONEachRow';
-            """
-        )
-
-        messages = ""
-        for i in range(25):
-            messages += json.dumps({"key": i, "value": i}) + "\n"
-        kafka_produce(kafka_cluster, "virt1", [messages], 0)
-
-        messages = ""
-        for i in range(25, 50):
-            messages += json.dumps({"key": i, "value": i}) + "\n"
-        kafka_produce(kafka_cluster, "virt1", [messages], 0)
-
-        result = ""
-        while True:
-            result += instance.query(
-                """SELECT _key, key, _topic, value, _offset, _partition, _timestamp = 0 ? '0000-00-00 00:00:00' : toString(_timestamp) AS _timestamp FROM test.kafka""",
-                ignore_error=True,
-            )
-            if kafka_check_result(result, False, "test_kafka_virtual1.reference"):
-                break
-
-        kafka_check_result(result, True, "test_kafka_virtual1.reference")
-
-
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_virtual_columns_with_materialized_view(
-    kafka_cluster, create_query_generator
-):
-    topic_config = {
-        # default retention, since predefined timestamp_ms is used.
-        "retention.ms": "-1",
-    }
-    # the topic name is hardcoded in reference, it doesn't worth to create two reference files to have separate topics,
-    # as the context manager will always clean up the topic
-    topic_name = "virt2"
-    create_query = create_query_generator(
-        "kafka",
-        "key UInt64, value UInt64",
-        topic_list=topic_name,
-        consumer_group=f"{topic_name}-group",
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
     )
-    with kafka_topic(get_admin_client(kafka_cluster), topic_name, config=topic_config):
-        instance.query(
-            f"""
-            DROP TABLE IF EXISTS test.view;
-            DROP TABLE IF EXISTS test.consumer;
-            {create_query};
-            CREATE TABLE test.view (key UInt64, value UInt64, kafka_key String, topic String, offset UInt64, partition UInt64, timestamp Nullable(DateTime('UTC')))
-                ENGINE = MergeTree()
-                ORDER BY key;
-            CREATE MATERIALIZED VIEW test.consumer TO test.view AS
-                SELECT *, _key as kafka_key, _topic as topic, _offset as offset, _partition as partition, _timestamp = 0 ? '0000-00-00 00:00:00' : toString(_timestamp) as timestamp FROM test.kafka;
+    topic_config = {
+        # default retention, since predefined timestamp_ms is used.
+        "retention.ms": "-1",
+    }
+    kafka_create_topic(admin_client, "virt1", config=topic_config)
+
+    instance.query(
         """
-        )
-
-        messages = []
-        for i in range(50):
-            messages.append(json.dumps({"key": i, "value": i}))
-        kafka_produce(kafka_cluster, topic_name, messages, 0)
-
-        def check_callback(result):
-            return kafka_check_result(result, False, "test_kafka_virtual2.reference")
-
-        result = instance.query_with_retry(
-            "SELECT kafka_key, key, topic, value, offset, partition, timestamp FROM test.view ORDER BY kafka_key, key",
-            check_callback=check_callback,
-        )
-
-        kafka_check_result(result, True, "test_kafka_virtual2.reference")
-
-        instance.query(
-            """
-            DROP TABLE test.consumer;
-            DROP TABLE test.view;
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'virt1',
+                     kafka_group_name = 'virt1',
+                     kafka_commit_on_select = 1,
+                     kafka_format = 'JSONEachRow';
         """
-        )
+    )
 
+    messages = ""
+    for i in range(25):
+        messages += json.dumps({"key": i, "value": i}) + "\n"
+    kafka_produce(kafka_cluster, "virt1", [messages], 0)
+
+    messages = ""
+    for i in range(25, 50):
+        messages += json.dumps({"key": i, "value": i}) + "\n"
+    kafka_produce(kafka_cluster, "virt1", [messages], 0)
+
+    result = ""
+    while True:
+        result += instance.query(
+            """SELECT _key, key, _topic, value, _offset, _partition, _timestamp = 0 ? '0000-00-00 00:00:00' : toString(_timestamp) AS _timestamp FROM test.kafka""",
+            ignore_error=True,
+        )
+        if kafka_check_result(result, False, "test_kafka_virtual1.reference"):
+            break
+
+    kafka_check_result(result, True, "test_kafka_virtual1.reference")
+
+
+def test_kafka_virtual_columns_with_materialized_view(kafka_cluster):
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
+    topic_config = {
+        # default retention, since predefined timestamp_ms is used.
+        "retention.ms": "-1",
+    }
+    kafka_create_topic(admin_client, "virt2", config=topic_config)
+
+    instance.query(
+        """
+        DROP TABLE IF EXISTS test.view;
+        DROP TABLE IF EXISTS test.consumer;
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'virt2',
+                     kafka_group_name = 'virt2',
+                     kafka_format = 'JSONEachRow',
+                     kafka_row_delimiter = '\\n';
+        CREATE TABLE test.view (key UInt64, value UInt64, kafka_key String, topic String, offset UInt64, partition UInt64, timestamp Nullable(DateTime('UTC')))
+            ENGINE = MergeTree()
+            ORDER BY key;
+        CREATE MATERIALIZED VIEW test.consumer TO test.view AS
+            SELECT *, _key as kafka_key, _topic as topic, _offset as offset, _partition as partition, _timestamp = 0 ? '0000-00-00 00:00:00' : toString(_timestamp) as timestamp FROM test.kafka;
+    """
+    )
+
+    messages = []
+    for i in range(50):
+        messages.append(json.dumps({"key": i, "value": i}))
+    kafka_produce(kafka_cluster, "virt2", messages, 0)
+
+    sql = "SELECT kafka_key, key, topic, value, offset, partition, timestamp FROM test.view ORDER BY kafka_key, key"
+    result = instance.query(sql)
+    iterations = 0
+    while (
+        not kafka_check_result(result, False, "test_kafka_virtual2.reference")
+        and iterations < 10
+    ):
+        time.sleep(3)
+        iterations += 1
+        result = instance.query(sql)
+
+    kafka_check_result(result, True, "test_kafka_virtual2.reference")
+
+    instance.query(
+        """
+        DROP TABLE test.consumer;
+        DROP TABLE test.view;
+    """
+    )
+
+
+def test_kafka_insert(kafka_cluster):
+    instance.query(
+        """
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'insert1',
+                     kafka_group_name = 'insert1',
+                     kafka_format = 'TSV',
+                     kafka_commit_on_select = 1,
+                     kafka_row_delimiter = '\\n';
+    """
+    )
+
+    values = []
+    for i in range(50):
+        values.append("({i}, {i})".format(i=i))
+    values = ",".join(values)
 
-def insert_with_retry(instance, values, table_name="kafka", max_try_count=5):
-    try_count = 0
     while True:
-        logging.debug(f"Inserting, try_count is {try_count}")
         try:
-            try_count += 1
-            instance.query(f"INSERT INTO test.{table_name} VALUES {values}")
+            instance.query("INSERT INTO test.kafka VALUES {}".format(values))
             break
         except QueryRuntimeException as e:
-            if "Local: Timed out." in str(e) and try_count < max_try_count:
+            if "Local: Timed out." in str(e):
                 continue
             else:
                 raise
 
+    messages = []
+    while True:
+        messages.extend(kafka_consume(kafka_cluster, "insert1"))
+        if len(messages) == 50:
+            break
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_insert(kafka_cluster, create_query_generator):
-    topic_name = "insert1" + get_topic_postfix(create_query_generator)
+    result = "\n".join(messages)
+    kafka_check_result(result, True)
 
+
+def test_kafka_produce_consume(kafka_cluster):
     instance.query(
-        create_query_generator(
-            "kafka",
-            "key UInt64, value UInt64",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-            format="TSV",
-        )
-    )
-
-    message_count = 50
-    values = []
-    for i in range(message_count):
-        values.append("({i}, {i})".format(i=i))
-    values = ",".join(values)
-
-    with existing_kafka_topic(get_admin_client(kafka_cluster), topic_name):
-        insert_with_retry(instance, values)
-
-        messages = kafka_consume_with_retry(kafka_cluster, topic_name, message_count)
-        result = "\n".join(messages)
-        kafka_check_result(result, True)
-
-
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_produce_consume(kafka_cluster, create_query_generator):
-    topic_name = "insert2" + get_topic_postfix(create_query_generator)
-
-    create_query = create_query_generator(
-        "kafka",
-        "key UInt64, value UInt64",
-        topic_list=topic_name,
-        consumer_group=topic_name,
-        format="TSV",
-    )
-    instance.query(
-        f"""
+        """
         DROP TABLE IF EXISTS test.view;
         DROP TABLE IF EXISTS test.consumer;
-        {create_query};
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'insert2',
+                     kafka_group_name = 'insert2',
+                     kafka_format = 'TSV',
+                     kafka_row_delimiter = '\\n';
         CREATE TABLE test.view (key UInt64, value UInt64)
             ENGINE = MergeTree
             ORDER BY key;
@@ -2344,7 +2111,15 @@ def test_kafka_produce_consume(kafka_cluster, create_query_generator):
             values.append("({i}, {i})".format(i=i))
         values = ",".join(values)
 
-        insert_with_retry(instance, values)
+        while True:
+            try:
+                instance.query("INSERT INTO test.kafka VALUES {}".format(values))
+                break
+            except QueryRuntimeException as e:
+                if "Local: Timed out." in str(e):
+                    continue
+                else:
+                    raise
 
     threads = []
     threads_num = 16
@@ -2354,48 +2129,40 @@ def test_kafka_produce_consume(kafka_cluster, create_query_generator):
         time.sleep(random.uniform(0, 1))
         thread.start()
 
-    with existing_kafka_topic(get_admin_client(kafka_cluster), topic_name):
-        expected_row_count = messages_num * threads_num
-        result = instance.query_with_retry(
-            "SELECT count() FROM test.view",
-            sleep_time=1,
-            retry_count=20,
-            check_callback=lambda result: int(result) == expected_row_count,
-        )
+    while True:
+        result = instance.query("SELECT count() FROM test.view")
+        time.sleep(1)
+        if int(result) == messages_num * threads_num:
+            break
 
-        instance.query(
-            """
-            DROP TABLE test.consumer;
-            DROP TABLE test.view;
-        """
-        )
-
-        for thread in threads:
-            thread.join()
-
-        assert (
-            int(result) == expected_row_count
-        ), "ClickHouse lost some messages: {}".format(result)
-
-
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_commit_on_block_write(kafka_cluster, create_query_generator):
-    topic_name = "block" + get_topic_postfix(create_query_generator)
-    create_query = create_query_generator(
-        "kafka",
-        "key UInt64, value UInt64",
-        topic_list=topic_name,
-        consumer_group=topic_name,
-        settings={"kafka_max_block_size": 100},
-    )
     instance.query(
-        f"""
+        """
+        DROP TABLE test.consumer;
+        DROP TABLE test.view;
+    """
+    )
+
+    for thread in threads:
+        thread.join()
+
+    assert (
+        int(result) == messages_num * threads_num
+    ), "ClickHouse lost some messages: {}".format(result)
+
+
+def test_kafka_commit_on_block_write(kafka_cluster):
+    instance.query(
+        """
         DROP TABLE IF EXISTS test.view;
         DROP TABLE IF EXISTS test.consumer;
-        {create_query};
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'block',
+                     kafka_group_name = 'block',
+                     kafka_format = 'JSONEachRow',
+                     kafka_max_block_size = 100,
+                     kafka_row_delimiter = '\\n';
         CREATE TABLE test.view (key UInt64, value UInt64)
             ENGINE = MergeTree()
             ORDER BY key;
@@ -2406,40 +2173,46 @@ def test_kafka_commit_on_block_write(kafka_cluster, create_query_generator):
 
     cancel = threading.Event()
 
-    # We need to pass i as a reference. Simple integers are passed by value.
-    # Making an array is probably the easiest way to "force pass by reference".
     i = [0]
 
-    def produce(i):
+    def produce():
         while not cancel.is_set():
             messages = []
             for _ in range(101):
                 messages.append(json.dumps({"key": i[0], "value": i[0]}))
                 i[0] += 1
-            kafka_produce(kafka_cluster, topic_name, messages)
+            kafka_produce(kafka_cluster, "block", messages)
 
-    kafka_thread = threading.Thread(target=produce, args=[i])
+    kafka_thread = threading.Thread(target=produce)
     kafka_thread.start()
 
-    instance.query_with_retry(
-        "SELECT count() FROM test.view",
-        sleep_time=1,
-        check_callback=lambda res: int(res) >= 100,
-    )
+    while int(instance.query("SELECT count() FROM test.view")) == 0:
+        time.sleep(1)
 
     cancel.set()
 
-    instance.query("DROP TABLE test.kafka SYNC")
-
-    instance.query(create_query)
-    kafka_thread.join()
-
-    instance.query_with_retry(
-        "SELECT uniqExact(key) FROM test.view",
-        sleep_time=1,
-        check_callback=lambda res: int(res) >= i[0],
+    instance.query(
+        """
+        DROP TABLE test.kafka;
+    """
     )
 
+    instance.query(
+        """
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'block',
+                     kafka_group_name = 'block',
+                     kafka_format = 'JSONEachRow',
+                     kafka_max_block_size = 100,
+                     kafka_row_delimiter = '\\n';
+    """
+    )
+
+    while int(instance.query("SELECT uniqExact(key) FROM test.view")) < i[0]:
+        time.sleep(1)
+
     result = int(instance.query("SELECT count() == uniqExact(key) FROM test.view"))
 
     instance.query(
@@ -2454,183 +2227,163 @@ def test_kafka_commit_on_block_write(kafka_cluster, create_query_generator):
     assert result == 1, "Messages from kafka get duplicated!"
 
 
-@pytest.mark.parametrize(
-    "create_query_generator, log_line",
-    [
-        (generate_old_create_table_query, "kafka.*Committed offset 2.*virt2_[01]"),
-        (
-            generate_new_create_table_query,
-            r"kafka.*Saved offset 2 for topic-partition \[virt2_[01]:[0-9]+",
-        ),
-    ],
-)
-def test_kafka_virtual_columns2(kafka_cluster, create_query_generator, log_line):
-    admin_client = get_admin_client(kafka_cluster)
+def test_kafka_virtual_columns2(kafka_cluster):
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
 
     topic_config = {
         # default retention, since predefined timestamp_ms is used.
         "retention.ms": "-1",
     }
-    thread_per_consumer = must_use_thread_per_consumer(create_query_generator)
-    topic_name_0 = "virt2_0"
-    topic_name_1 = "virt2_1"
-    consumer_group = "virt2" + get_topic_postfix(create_query_generator)
-    with kafka_topic(admin_client, topic_name_0, num_partitions=2, config=topic_config):
-        with kafka_topic(
-            admin_client, topic_name_1, num_partitions=2, config=topic_config
-        ):
-            create_query = create_query_generator(
-                "kafka",
-                "value UInt64",
-                topic_list=f"{topic_name_0},{topic_name_1}",
-                consumer_group=consumer_group,
-                settings={
-                    "kafka_num_consumers": 2,
-                    "kafka_thread_per_consumer": thread_per_consumer,
-                },
-            )
+    kafka_create_topic(admin_client, "virt2_0", num_partitions=2, config=topic_config)
+    kafka_create_topic(admin_client, "virt2_1", num_partitions=2, config=topic_config)
 
-            instance.query(
-                f"""
-                {create_query};
-
-                CREATE MATERIALIZED VIEW test.view ENGINE=MergeTree ORDER BY tuple() AS
-                SELECT value, _key, _topic, _partition, _offset, toUnixTimestamp(_timestamp), toUnixTimestamp64Milli(_timestamp_ms), _headers.name, _headers.value FROM test.kafka;
-                """
-            )
-
-            producer = KafkaProducer(
-                bootstrap_servers="localhost:{}".format(cluster.kafka_port),
-                value_serializer=producer_serializer,
-                key_serializer=producer_serializer,
-            )
-
-            producer.send(
-                topic=topic_name_0,
-                value=json.dumps({"value": 1}),
-                partition=0,
-                key="k1",
-                timestamp_ms=1577836801001,
-                headers=[("content-encoding", b"base64")],
-            )
-            producer.send(
-                topic=topic_name_0,
-                value=json.dumps({"value": 2}),
-                partition=0,
-                key="k2",
-                timestamp_ms=1577836802002,
-                headers=[
-                    ("empty_value", b""),
-                    ("", b"empty name"),
-                    ("", b""),
-                    ("repetition", b"1"),
-                    ("repetition", b"2"),
-                ],
-            )
-            producer.flush()
-
-            producer.send(
-                topic=topic_name_0,
-                value=json.dumps({"value": 3}),
-                partition=1,
-                key="k3",
-                timestamp_ms=1577836803003,
-                headers=[("b", b"b"), ("a", b"a")],
-            )
-            producer.send(
-                topic=topic_name_0,
-                value=json.dumps({"value": 4}),
-                partition=1,
-                key="k4",
-                timestamp_ms=1577836804004,
-                headers=[("a", b"a"), ("b", b"b")],
-            )
-            producer.flush()
-
-            producer.send(
-                topic=topic_name_1,
-                value=json.dumps({"value": 5}),
-                partition=0,
-                key="k5",
-                timestamp_ms=1577836805005,
-            )
-            producer.send(
-                topic=topic_name_1,
-                value=json.dumps({"value": 6}),
-                partition=0,
-                key="k6",
-                timestamp_ms=1577836806006,
-            )
-            producer.flush()
-
-            producer.send(
-                topic=topic_name_1,
-                value=json.dumps({"value": 7}),
-                partition=1,
-                key="k7",
-                timestamp_ms=1577836807007,
-            )
-            producer.send(
-                topic=topic_name_1,
-                value=json.dumps({"value": 8}),
-                partition=1,
-                key="k8",
-                timestamp_ms=1577836808008,
-            )
-            producer.flush()
-
-            instance.wait_for_log_line(log_line, repetitions=4, look_behind_lines=6000)
-
-            members = describe_consumer_group(kafka_cluster, consumer_group)
-            # pprint.pprint(members)
-            # members[0]['client_id'] = 'ClickHouse-instance-test-kafka-0'
-            # members[1]['client_id'] = 'ClickHouse-instance-test-kafka-1'
-
-            result = instance.query(
-                "SELECT * FROM test.view ORDER BY value", ignore_error=True
-            )
-
-            expected = f"""\
-        1	k1	{topic_name_0}	0	0	1577836801	1577836801001	['content-encoding']	['base64']
-        2	k2	{topic_name_0}	0	1	1577836802	1577836802002	['empty_value','','','repetition','repetition']	['','empty name','','1','2']
-        3	k3	{topic_name_0}	1	0	1577836803	1577836803003	['b','a']	['b','a']
-        4	k4	{topic_name_0}	1	1	1577836804	1577836804004	['a','b']	['a','b']
-        5	k5	{topic_name_1}	0	0	1577836805	1577836805005	[]	[]
-        6	k6	{topic_name_1}	0	1	1577836806	1577836806006	[]	[]
-        7	k7	{topic_name_1}	1	0	1577836807	1577836807007	[]	[]
-        8	k8	{topic_name_1}	1	1	1577836808	1577836808008	[]	[]
-        """
-
-            assert TSV(result) == TSV(expected)
-
-            instance.query(
-                """
-                DROP TABLE test.kafka;
-                DROP TABLE test.view;
-            """
-            )
-            instance.rotate_logs()
-
-
-@pytest.mark.parametrize(
-    "create_query_generator, do_direct_read",
-    [(generate_old_create_table_query, True), (generate_new_create_table_query, False)],
-)
-def test_kafka_producer_consumer_separate_settings(
-    kafka_cluster, create_query_generator, do_direct_read
-):
-    instance.rotate_logs()
     instance.query(
-        create_query_generator(
-            "test_kafka",
-            "key UInt64",
-            topic_list="separate_settings",
-            consumer_group="test",
-        )
+        """
+        CREATE TABLE test.kafka (value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'virt2_0,virt2_1',
+                     kafka_group_name = 'virt2',
+                     kafka_num_consumers = 2,
+                     kafka_format = 'JSONEachRow';
+
+        CREATE MATERIALIZED VIEW test.view Engine=Log AS
+        SELECT value, _key, _topic, _partition, _offset, toUnixTimestamp(_timestamp), toUnixTimestamp64Milli(_timestamp_ms), _headers.name, _headers.value FROM test.kafka;
+        """
     )
 
-    if do_direct_read:
-        instance.query("SELECT * FROM test.test_kafka")
+    producer = KafkaProducer(
+        bootstrap_servers="localhost:{}".format(cluster.kafka_port),
+        value_serializer=producer_serializer,
+        key_serializer=producer_serializer,
+    )
+
+    producer.send(
+        topic="virt2_0",
+        value=json.dumps({"value": 1}),
+        partition=0,
+        key="k1",
+        timestamp_ms=1577836801001,
+        headers=[("content-encoding", b"base64")],
+    )
+    producer.send(
+        topic="virt2_0",
+        value=json.dumps({"value": 2}),
+        partition=0,
+        key="k2",
+        timestamp_ms=1577836802002,
+        headers=[
+            ("empty_value", b""),
+            ("", b"empty name"),
+            ("", b""),
+            ("repetition", b"1"),
+            ("repetition", b"2"),
+        ],
+    )
+    producer.flush()
+
+    producer.send(
+        topic="virt2_0",
+        value=json.dumps({"value": 3}),
+        partition=1,
+        key="k3",
+        timestamp_ms=1577836803003,
+        headers=[("b", b"b"), ("a", b"a")],
+    )
+    producer.send(
+        topic="virt2_0",
+        value=json.dumps({"value": 4}),
+        partition=1,
+        key="k4",
+        timestamp_ms=1577836804004,
+        headers=[("a", b"a"), ("b", b"b")],
+    )
+    producer.flush()
+
+    producer.send(
+        topic="virt2_1",
+        value=json.dumps({"value": 5}),
+        partition=0,
+        key="k5",
+        timestamp_ms=1577836805005,
+    )
+    producer.send(
+        topic="virt2_1",
+        value=json.dumps({"value": 6}),
+        partition=0,
+        key="k6",
+        timestamp_ms=1577836806006,
+    )
+    producer.flush()
+
+    producer.send(
+        topic="virt2_1",
+        value=json.dumps({"value": 7}),
+        partition=1,
+        key="k7",
+        timestamp_ms=1577836807007,
+    )
+    producer.send(
+        topic="virt2_1",
+        value=json.dumps({"value": 8}),
+        partition=1,
+        key="k8",
+        timestamp_ms=1577836808008,
+    )
+    producer.flush()
+
+    instance.wait_for_log_line(
+        "kafka.*Committed offset 2.*virt2_[01]", repetitions=4, look_behind_lines=6000
+    )
+
+    members = describe_consumer_group(kafka_cluster, "virt2")
+    # pprint.pprint(members)
+    # members[0]['client_id'] = 'ClickHouse-instance-test-kafka-0'
+    # members[1]['client_id'] = 'ClickHouse-instance-test-kafka-1'
+
+    result = instance.query("SELECT * FROM test.view ORDER BY value", ignore_error=True)
+
+    expected = """\
+1	k1	virt2_0	0	0	1577836801	1577836801001	['content-encoding']	['base64']
+2	k2	virt2_0	0	1	1577836802	1577836802002	['empty_value','','','repetition','repetition']	['','empty name','','1','2']
+3	k3	virt2_0	1	0	1577836803	1577836803003	['b','a']	['b','a']
+4	k4	virt2_0	1	1	1577836804	1577836804004	['a','b']	['a','b']
+5	k5	virt2_1	0	0	1577836805	1577836805005	[]	[]
+6	k6	virt2_1	0	1	1577836806	1577836806006	[]	[]
+7	k7	virt2_1	1	0	1577836807	1577836807007	[]	[]
+8	k8	virt2_1	1	1	1577836808	1577836808008	[]	[]
+"""
+
+    assert TSV(result) == TSV(expected)
+
+    instance.query(
+        """
+        DROP TABLE test.kafka;
+        DROP TABLE test.view;
+    """
+    )
+    kafka_delete_topic(admin_client, "virt2_0")
+    kafka_delete_topic(admin_client, "virt2_1")
+    instance.rotate_logs()
+
+
+def test_kafka_producer_consumer_separate_settings(kafka_cluster):
+    instance.query(
+        """
+        DROP TABLE IF EXISTS test.test_kafka;
+        CREATE TABLE test.test_kafka (key UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'separate_settings',
+                     kafka_group_name = 'test',
+                     kafka_format = 'JSONEachRow',
+                     kafka_row_delimiter = '\\n';
+        """
+    )
+
+    instance.query("SELECT * FROM test.test_kafka")
     instance.query("INSERT INTO test.test_kafka VALUES (1)")
 
     assert instance.contains_in_log("Kafka producer created")
@@ -2645,11 +2398,11 @@ def test_kafka_producer_consumer_separate_settings(
         # and producer configurations
         assert "heartbeat.interval.ms" in warn
 
-    kafka_consumer_applied_properties = instance.grep_in_log("Consumer set property")
-    kafka_producer_applied_properties = instance.grep_in_log("Producer set property")
+    kafka_consumer_applyed_properties = instance.grep_in_log("Consumer set property")
+    kafka_producer_applyed_properties = instance.grep_in_log("Producer set property")
 
-    assert kafka_consumer_applied_properties is not None
-    assert kafka_producer_applied_properties is not None
+    assert kafka_consumer_applyed_properties is not None
+    assert kafka_producer_applyed_properties is not None
 
     # global settings should be applied for consumer and producer
     global_settings = {
@@ -2659,128 +2412,118 @@ def test_kafka_producer_consumer_separate_settings(
 
     for name, value in global_settings.items():
         property_in_log = f"{name}:{value}"
-        assert property_in_log in kafka_consumer_applied_properties
-        assert property_in_log in kafka_producer_applied_properties
+        assert property_in_log in kafka_consumer_applyed_properties
+        assert property_in_log in kafka_producer_applyed_properties
 
     settings_topic__separate_settings__consumer = {"session.timeout.ms": "6001"}
 
     for name, value in settings_topic__separate_settings__consumer.items():
         property_in_log = f"{name}:{value}"
-        assert property_in_log in kafka_consumer_applied_properties
-        assert property_in_log not in kafka_producer_applied_properties
+        assert property_in_log in kafka_consumer_applyed_properties
+        assert property_in_log not in kafka_producer_applyed_properties
 
     producer_settings = {"transaction.timeout.ms": "60001"}
 
     for name, value in producer_settings.items():
         property_in_log = f"{name}:{value}"
-        assert property_in_log not in kafka_consumer_applied_properties
-        assert property_in_log in kafka_producer_applied_properties
+        assert property_in_log not in kafka_consumer_applyed_properties
+        assert property_in_log in kafka_producer_applyed_properties
 
     # Should be ignored, because it is inside producer tag
     producer_legacy_syntax__topic_separate_settings = {"message.timeout.ms": "300001"}
 
     for name, value in producer_legacy_syntax__topic_separate_settings.items():
         property_in_log = f"{name}:{value}"
-        assert property_in_log not in kafka_consumer_applied_properties
-        assert property_in_log not in kafka_producer_applied_properties
+        assert property_in_log not in kafka_consumer_applyed_properties
+        assert property_in_log not in kafka_producer_applyed_properties
 
     # Old syntax, applied on consumer and producer
     legacy_syntax__topic_separated_settings = {"heartbeat.interval.ms": "302"}
 
     for name, value in legacy_syntax__topic_separated_settings.items():
         property_in_log = f"{name}:{value}"
-        assert property_in_log in kafka_consumer_applied_properties
-        assert property_in_log in kafka_producer_applied_properties
+        assert property_in_log in kafka_consumer_applyed_properties
+        assert property_in_log in kafka_producer_applyed_properties
 
 
-@pytest.mark.parametrize(
-    "create_query_generator, log_line",
-    [
-        (generate_new_create_table_query, "Saved offset 5"),
-        (generate_old_create_table_query, "Committed offset 5"),
-    ],
-)
-def test_kafka_produce_key_timestamp(kafka_cluster, create_query_generator, log_line):
+def test_kafka_produce_key_timestamp(kafka_cluster):
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
+
     topic_name = "insert3"
     topic_config = {
         # default retention, since predefined timestamp_ms is used.
         "retention.ms": "-1",
     }
+    kafka_create_topic(admin_client, topic_name, config=topic_config)
 
-    with kafka_topic(get_admin_client(kafka_cluster), topic_name, config=topic_config):
-        writer_create_query = create_query_generator(
-            "kafka_writer",
-            "key UInt64, value UInt64, _key String, _timestamp DateTime('UTC')",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-            format="TSV",
-        )
-        reader_create_query = create_query_generator(
-            "kafka",
-            "key UInt64, value UInt64, inserted_key String, inserted_timestamp DateTime('UTC')",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-            format="TSV",
-        )
-
-        instance.query(
-            f"""
-            DROP TABLE IF EXISTS test.view;
-            DROP TABLE IF EXISTS test.consumer;
-            {writer_create_query};
-            {reader_create_query};
-            CREATE MATERIALIZED VIEW test.view ENGINE=MergeTree ORDER BY tuple() AS
-                SELECT key, value, inserted_key, toUnixTimestamp(inserted_timestamp), _key, _topic, _partition, _offset, toUnixTimestamp(_timestamp) FROM test.kafka;
+    instance.query(
         """
-        )
+        DROP TABLE IF EXISTS test.view;
+        DROP TABLE IF EXISTS test.consumer;
+        CREATE TABLE test.kafka_writer (key UInt64, value UInt64, _key String, _timestamp DateTime('UTC'))
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'insert3',
+                     kafka_group_name = 'insert3',
+                     kafka_format = 'TSV',
+                     kafka_row_delimiter = '\\n';
 
-        instance.query(
-            "INSERT INTO test.kafka_writer VALUES ({},{},'{}',toDateTime({}))".format(
-                1, 1, "k1", 1577836801
-            )
-        )
-        instance.query(
-            "INSERT INTO test.kafka_writer VALUES ({},{},'{}',toDateTime({}))".format(
-                2, 2, "k2", 1577836802
-            )
-        )
-        instance.query(
-            "INSERT INTO test.kafka_writer VALUES ({},{},'{}',toDateTime({})),({},{},'{}',toDateTime({}))".format(
-                3, 3, "k3", 1577836803, 4, 4, "k4", 1577836804
-            )
-        )
-        instance.query(
-            "INSERT INTO test.kafka_writer VALUES ({},{},'{}',toDateTime({}))".format(
-                5, 5, "k5", 1577836805
-            )
-        )
+        CREATE TABLE test.kafka (key UInt64, value UInt64, inserted_key String, inserted_timestamp DateTime('UTC'))
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'insert3',
+                     kafka_group_name = 'insert3',
+                     kafka_format = 'TSV',
+                     kafka_row_delimiter = '\\n';
 
-        # instance.wait_for_log_line(log_line)
-
-        expected = """\
-    1	1	k1	1577836801	k1	insert3	0	0	1577836801
-    2	2	k2	1577836802	k2	insert3	0	1	1577836802
-    3	3	k3	1577836803	k3	insert3	0	2	1577836803
-    4	4	k4	1577836804	k4	insert3	0	3	1577836804
-    5	5	k5	1577836805	k5	insert3	0	4	1577836805
+        CREATE MATERIALIZED VIEW test.view Engine=Log AS
+            SELECT key, value, inserted_key, toUnixTimestamp(inserted_timestamp), _key, _topic, _partition, _offset, toUnixTimestamp(_timestamp) FROM test.kafka;
     """
+    )
 
-        result = instance.query_with_retry(
-            "SELECT * FROM test.view ORDER BY value",
-            ignore_error=True,
-            retry_count=5,
-            sleep_time=1,
-            check_callback=lambda res: TSV(res) == TSV(expected),
+    instance.query(
+        "INSERT INTO test.kafka_writer VALUES ({},{},'{}',toDateTime({}))".format(
+            1, 1, "k1", 1577836801
         )
+    )
+    instance.query(
+        "INSERT INTO test.kafka_writer VALUES ({},{},'{}',toDateTime({}))".format(
+            2, 2, "k2", 1577836802
+        )
+    )
+    instance.query(
+        "INSERT INTO test.kafka_writer VALUES ({},{},'{}',toDateTime({})),({},{},'{}',toDateTime({}))".format(
+            3, 3, "k3", 1577836803, 4, 4, "k4", 1577836804
+        )
+    )
+    instance.query(
+        "INSERT INTO test.kafka_writer VALUES ({},{},'{}',toDateTime({}))".format(
+            5, 5, "k5", 1577836805
+        )
+    )
 
-        assert TSV(result) == TSV(expected)
+    instance.wait_for_log_line("Committed offset 5")
+
+    result = instance.query("SELECT * FROM test.view ORDER BY value", ignore_error=True)
+
+    # logging.debug(result)
+
+    expected = """\
+1	1	k1	1577836801	k1	insert3	0	0	1577836801
+2	2	k2	1577836802	k2	insert3	0	1	1577836802
+3	3	k3	1577836803	k3	insert3	0	2	1577836803
+4	4	k4	1577836804	k4	insert3	0	3	1577836804
+5	5	k5	1577836805	k5	insert3	0	4	1577836805
+"""
+
+    assert TSV(result) == TSV(expected)
+
+    kafka_delete_topic(admin_client, topic_name)
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_insert_avro(kafka_cluster, create_query_generator):
+def test_kafka_insert_avro(kafka_cluster):
     admin_client = KafkaAdminClient(
         bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
     )
@@ -2788,184 +2531,136 @@ def test_kafka_insert_avro(kafka_cluster, create_query_generator):
         # default retention, since predefined timestamp_ms is used.
         "retention.ms": "-1",
     }
-    topic_name = "avro1" + get_topic_postfix(create_query_generator)
-    with kafka_topic(admin_client, topic_name, config=topic_config):
-        create_query = create_query_generator(
-            "kafka",
-            "key UInt64, value UInt64, _timestamp DateTime('UTC')",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-            format="Avro",
-        )
-        instance.query(
-            f"""
-            DROP TABLE IF EXISTS test.kafka;
-            {create_query}
+    kafka_create_topic(admin_client, "avro1", config=topic_config)
+
+    instance.query(
         """
+        DROP TABLE IF EXISTS test.kafka;
+        CREATE TABLE test.kafka (key UInt64, value UInt64, _timestamp DateTime('UTC'))
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'avro1',
+                     kafka_group_name = 'avro1',
+                     kafka_commit_on_select = 1,
+                     kafka_format = 'Avro';
+    """
+    )
+
+    instance.query(
+        "INSERT INTO test.kafka select number*10 as key, number*100 as value, 1636505534 as _timestamp from numbers(4) SETTINGS output_format_avro_rows_in_file = 2, output_format_avro_codec = 'deflate'"
+    )
+
+    messages = []
+    while True:
+        messages.extend(
+            kafka_consume(
+                kafka_cluster, "avro1", needDecode=False, timestamp=1636505534
+            )
         )
+        if len(messages) == 2:
+            break
 
-        instance.query(
-            "INSERT INTO test.kafka select number*10 as key, number*100 as value, 1636505534 as _timestamp from numbers(4) SETTINGS output_format_avro_rows_in_file = 2, output_format_avro_codec = 'deflate'"
-        )
+    result = ""
+    for a_message in messages:
+        result += decode_avro(a_message) + "\n"
 
-        message_count = 2
-        messages = kafka_consume_with_retry(
-            kafka_cluster,
-            topic_name,
-            message_count,
-            need_decode=False,
-            timestamp=1636505534,
-        )
-
-        result = ""
-        for a_message in messages:
-            result += decode_avro(a_message) + "\n"
-
-        expected_result = """{'key': 0, 'value': 0, '_timestamp': 1636505534}
+    expected_result = """{'key': 0, 'value': 0, '_timestamp': 1636505534}
 {'key': 10, 'value': 100, '_timestamp': 1636505534}
 
 {'key': 20, 'value': 200, '_timestamp': 1636505534}
 {'key': 30, 'value': 300, '_timestamp': 1636505534}
 
 """
-        assert result == expected_result
+    assert result == expected_result
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_produce_consume_avro(kafka_cluster, create_query_generator):
-    topic_name = "insert_avro" + get_topic_postfix(create_query_generator)
-    with kafka_topic(get_admin_client(kafka_cluster), topic_name):
-        num_rows = 75
-
-        writer_create_query = create_query_generator(
-            "kafka_writer",
-            "key UInt64, value UInt64",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-            format="Avro",
-        )
-
-        reader_create_query = create_query_generator(
-            "kafka",
-            "key UInt64, value UInt64",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-            format="Avro",
-        )
-
-        instance.query(
-            f"""
-            DROP TABLE IF EXISTS test.view;
-            DROP TABLE IF EXISTS test.kafka;
-            DROP TABLE IF EXISTS test.kafka_writer;
-
-            {writer_create_query};
-            {reader_create_query};
-
-            CREATE MATERIALIZED VIEW test.view ENGINE=MergeTree ORDER BY tuple() AS
-                SELECT key, value FROM test.kafka;
-            """
-        )
-
-        instance.query(
-            "INSERT INTO test.kafka_writer select number*10 as key, number*100 as value from numbers({num_rows}) SETTINGS output_format_avro_rows_in_file = 7".format(
-                num_rows=num_rows
-            )
-        )
-
-        instance.wait_for_log_line(
-            "Committed offset {offset}".format(offset=math.ceil(num_rows / 7))
-        )
-
-        expected_num_rows = instance.query(
-            "SELECT COUNT(1) FROM test.view", ignore_error=True
-        )
-        assert int(expected_num_rows) == num_rows
-
-        expected_max_key = instance.query(
-            "SELECT max(key) FROM test.view", ignore_error=True
-        )
-        assert int(expected_max_key) == (num_rows - 1) * 10
-
-
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_flush_by_time(kafka_cluster, create_query_generator):
+def test_kafka_produce_consume_avro(kafka_cluster):
     admin_client = KafkaAdminClient(
         bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
     )
-    topic_name = "flush_by_time" + get_topic_postfix(create_query_generator)
 
-    with kafka_topic(admin_client, topic_name):
-        create_query = create_query_generator(
-            "kafka",
-            "key UInt64, value UInt64",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-            settings={
-                "kafka_max_block_size": 100,
-            },
-        )
-        instance.query(
-            f"""
-            DROP TABLE IF EXISTS test.view;
-            DROP TABLE IF EXISTS test.consumer;
+    topic_name = "insert_avro"
+    kafka_create_topic(admin_client, topic_name)
 
-            {create_query};
+    num_rows = 75
 
-            CREATE TABLE test.view (key UInt64, value UInt64, ts DateTime64(3) MATERIALIZED now64(3))
-                ENGINE = MergeTree()
-                ORDER BY key;
+    instance.query(
         """
+        DROP TABLE IF EXISTS test.view;
+        DROP TABLE IF EXISTS test.kafka;
+        DROP TABLE IF EXISTS test.kafka_writer;
+
+        CREATE TABLE test.kafka_writer (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'avro',
+                     kafka_group_name = 'avro',
+                     kafka_format = 'Avro';
+
+
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'avro',
+                     kafka_group_name = 'avro',
+                     kafka_format = 'Avro';
+
+        CREATE MATERIALIZED VIEW test.view Engine=Log AS
+            SELECT key, value FROM test.kafka;
+    """
+    )
+
+    instance.query(
+        "INSERT INTO test.kafka_writer select number*10 as key, number*100 as value from numbers({num_rows}) SETTINGS output_format_avro_rows_in_file = 7".format(
+            num_rows=num_rows
         )
+    )
 
-        cancel = threading.Event()
+    instance.wait_for_log_line(
+        "Committed offset {offset}".format(offset=math.ceil(num_rows / 7))
+    )
 
-        def produce():
-            while not cancel.is_set():
-                messages = [json.dumps({"key": 0, "value": 0})]
-                kafka_produce(kafka_cluster, topic_name, messages)
-                time.sleep(0.8)
+    expected_num_rows = instance.query(
+        "SELECT COUNT(1) FROM test.view", ignore_error=True
+    )
+    assert int(expected_num_rows) == num_rows
 
-        kafka_thread = threading.Thread(target=produce)
-        kafka_thread.start()
+    expected_max_key = instance.query(
+        "SELECT max(key) FROM test.view", ignore_error=True
+    )
+    assert int(expected_max_key) == (num_rows - 1) * 10
 
-        instance.query(
-            """
-            CREATE MATERIALIZED VIEW test.consumer TO test.view AS
-                SELECT * FROM test.kafka;
+    kafka_delete_topic(admin_client, topic_name)
+
+
+def test_kafka_flush_by_time(kafka_cluster):
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
+    topic_name = "flush_by_time"
+    kafka_create_topic(admin_client, topic_name)
+
+    instance.query(
         """
-        )
+        DROP TABLE IF EXISTS test.view;
+        DROP TABLE IF EXISTS test.consumer;
 
-        # By default the flush timeout should be 7.5 seconds => 18 seconds should be enough for 2 flushes, but not for 3
-        time.sleep(18)
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'flush_by_time',
+                     kafka_group_name = 'flush_by_time',
+                     kafka_format = 'JSONEachRow',
+                     kafka_max_block_size = 100,
+                     kafka_row_delimiter = '\\n';
 
-        result = instance.query("SELECT uniqExact(ts), count() >= 15 FROM test.view")
+        SELECT * FROM test.kafka;
 
-        cancel.set()
-        kafka_thread.join()
-
-        instance.query(
-            """
-            DROP TABLE test.consumer;
-            DROP TABLE test.view;
-        """
-        )
-
-        assert TSV(result) == TSV("2	1")
-
-
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_flush_by_block_size(kafka_cluster, create_query_generator):
-    topic_name = "flush_by_block_size" + get_topic_postfix(create_query_generator)
+        CREATE TABLE test.view (key UInt64, value UInt64, ts DateTime64(3) MATERIALIZED now64(3))
+            ENGINE = MergeTree()
+            ORDER BY key;
+    """
+    )
 
     cancel = threading.Event()
 
@@ -2973,142 +2668,159 @@ def test_kafka_flush_by_block_size(kafka_cluster, create_query_generator):
         while not cancel.is_set():
             messages = []
             messages.append(json.dumps({"key": 0, "value": 0}))
-            kafka_produce(kafka_cluster, topic_name, messages)
+            kafka_produce(kafka_cluster, "flush_by_time", messages)
+            time.sleep(0.8)
 
     kafka_thread = threading.Thread(target=produce)
+    kafka_thread.start()
 
-    with kafka_topic(get_admin_client(kafka_cluster), topic_name):
-        kafka_thread.start()
-
-        create_query = create_query_generator(
-            "kafka",
-            "key UInt64, value UInt64",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-            settings={
-                "kafka_max_block_size": 100,
-                "kafka_poll_max_batch_size": 1,
-                "kafka_flush_interval_ms": 120000,
-            },
-        )
-
-        instance.query(
-            f"""
-            DROP TABLE IF EXISTS test.view;
-            DROP TABLE IF EXISTS test.consumer;
-
-            {create_query};
-
-            CREATE TABLE test.view (key UInt64, value UInt64)
-                ENGINE = MergeTree()
-                ORDER BY key;
-
-            CREATE MATERIALIZED VIEW test.consumer TO test.view AS
-                SELECT * FROM test.kafka;
+    instance.query(
         """
-        )
+        CREATE MATERIALIZED VIEW test.consumer TO test.view AS
+            SELECT * FROM test.kafka;
+    """
+    )
 
-        # Wait for Kafka engine to consume this data
-        while 1 != int(
-            instance.query(
-                "SELECT count() FROM system.parts WHERE database = 'test' AND table = 'view' AND name = 'all_1_1_0'"
-            )
-        ):
-            time.sleep(0.5)
+    time.sleep(18)
 
-        cancel.set()
-        kafka_thread.join()
+    result = instance.query("SELECT uniqExact(ts) = 2, count() >= 15 FROM test.view")
 
-        # more flushes can happens during test, we need to check only result of first flush (part named all_1_1_0).
-        result = instance.query("SELECT count() FROM test.view WHERE _part='all_1_1_0'")
-        # logging.debug(result)
+    cancel.set()
+    kafka_thread.join()
 
-        instance.query(
-            """
-            DROP TABLE test.consumer;
-            DROP TABLE test.view;
+    # kafka_cluster.open_bash_shell('instance')
+
+    instance.query(
         """
+        DROP TABLE test.consumer;
+        DROP TABLE test.view;
+    """
+    )
+
+    assert TSV(result) == TSV("1	1")
+    kafka_delete_topic(admin_client, topic_name)
+
+
+def test_kafka_flush_by_block_size(kafka_cluster):
+    cancel = threading.Event()
+
+    def produce():
+        while not cancel.is_set():
+            messages = []
+            messages.append(json.dumps({"key": 0, "value": 0}))
+            kafka_produce(kafka_cluster, "flush_by_block_size", messages)
+
+    kafka_thread = threading.Thread(target=produce)
+    kafka_thread.start()
+
+    instance.query(
+        """
+        DROP TABLE IF EXISTS test.view;
+        DROP TABLE IF EXISTS test.consumer;
+
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'flush_by_block_size',
+                     kafka_group_name = 'flush_by_block_size',
+                     kafka_format = 'JSONEachRow',
+                     kafka_max_block_size = 100,
+                     kafka_poll_max_batch_size = 1,
+                     kafka_flush_interval_ms = 120000, /* should not flush by time during test */
+                     kafka_row_delimiter = '\\n';
+
+        CREATE TABLE test.view (key UInt64, value UInt64)
+            ENGINE = MergeTree()
+            ORDER BY key;
+
+        CREATE MATERIALIZED VIEW test.consumer TO test.view AS
+            SELECT * FROM test.kafka;
+    """
+    )
+
+    # Wait for Kafka engine to consume this data
+    while 1 != int(
+        instance.query(
+            "SELECT count() FROM system.parts WHERE database = 'test' AND table = 'view' AND name = 'all_1_1_0'"
         )
+    ):
+        time.sleep(0.5)
 
-        # 100 = first poll should return 100 messages (and rows)
-        # not waiting for stream_flush_interval_ms
-        assert (
-            int(result) == 100
-        ), "Messages from kafka should be flushed when block of size kafka_max_block_size is formed!"
+    cancel.set()
+    kafka_thread.join()
+
+    # more flushes can happens during test, we need to check only result of first flush (part named all_1_1_0).
+    result = instance.query("SELECT count() FROM test.view WHERE _part='all_1_1_0'")
+    # logging.debug(result)
+
+    instance.query(
+        """
+        DROP TABLE test.consumer;
+        DROP TABLE test.view;
+    """
+    )
+
+    # 100 = first poll should return 100 messages (and rows)
+    # not waiting for stream_flush_interval_ms
+    assert (
+        int(result) == 100
+    ), "Messages from kafka should be flushed when block of size kafka_max_block_size is formed!"
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_lot_of_partitions_partial_commit_of_bulk(
-    kafka_cluster, create_query_generator
-):
+def test_kafka_lot_of_partitions_partial_commit_of_bulk(kafka_cluster):
     admin_client = KafkaAdminClient(
         bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
     )
 
-    topic_name = "topic_with_multiple_partitions2" + get_topic_postfix(
-        create_query_generator
+    topic_name = "topic_with_multiple_partitions2"
+    kafka_create_topic(admin_client, topic_name, num_partitions=10)
+
+    instance.query(
+        """
+        DROP TABLE IF EXISTS test.view;
+        DROP TABLE IF EXISTS test.consumer;
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'topic_with_multiple_partitions2',
+                     kafka_group_name = 'topic_with_multiple_partitions2',
+                     kafka_format = 'JSONEachRow',
+                     kafka_max_block_size = 211,
+                     kafka_flush_interval_ms = 500;
+        CREATE TABLE test.view (key UInt64, value UInt64)
+            ENGINE = MergeTree()
+            ORDER BY key;
+        CREATE MATERIALIZED VIEW test.consumer TO test.view AS
+            SELECT * FROM test.kafka;
+    """
     )
-    with kafka_topic(admin_client, topic_name):
-        create_query = create_query_generator(
-            "kafka",
-            "key UInt64, value UInt64",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-            settings={
-                "kafka_max_block_size": 211,
-                "kafka_flush_interval_ms": 500,
-            },
-        )
-        instance.query(
-            f"""
-            DROP TABLE IF EXISTS test.view;
-            DROP TABLE IF EXISTS test.consumer;
-            {create_query};
-            CREATE TABLE test.view (key UInt64, value UInt64)
-                ENGINE = MergeTree()
-                ORDER BY key;
-            CREATE MATERIALIZED VIEW test.consumer TO test.view AS
-                SELECT * FROM test.kafka;
+
+    messages = []
+    count = 0
+    for dummy_msg in range(1000):
+        rows = []
+        for dummy_row in range(random.randrange(3, 10)):
+            count = count + 1
+            rows.append(json.dumps({"key": count, "value": count}))
+        messages.append("\n".join(rows))
+    kafka_produce(kafka_cluster, "topic_with_multiple_partitions2", messages)
+
+    instance.wait_for_log_line("kafka.*Stalled", repetitions=5)
+
+    result = instance.query("SELECT count(), uniqExact(key), max(key) FROM test.view")
+    logging.debug(result)
+    assert TSV(result) == TSV("{0}\t{0}\t{0}".format(count))
+
+    instance.query(
         """
-        )
-
-        messages = []
-        count = 0
-        for dummy_msg in range(1000):
-            rows = []
-            for dummy_row in range(random.randrange(3, 10)):
-                count = count + 1
-                rows.append(json.dumps({"key": count, "value": count}))
-            messages.append("\n".join(rows))
-        kafka_produce(kafka_cluster, topic_name, messages)
-
-        instance.wait_for_log_line("kafka.*Stalled", repetitions=5)
-
-        result = instance.query(
-            "SELECT count(), uniqExact(key), max(key) FROM test.view"
-        )
-        logging.debug(result)
-        assert TSV(result) == TSV("{0}\t{0}\t{0}".format(count))
-
-        instance.query(
-            """
-            DROP TABLE test.consumer;
-            DROP TABLE test.view;
-        """
-        )
+        DROP TABLE test.consumer;
+        DROP TABLE test.view;
+    """
+    )
+    kafka_delete_topic(admin_client, topic_name)
 
 
-@pytest.mark.parametrize(
-    "create_query_generator, log_line",
-    [
-        (generate_old_create_table_query, "{}.*Polled offset [0-9]+"),
-        (generate_new_create_table_query, "{}.*Saved offset"),
-    ],
-)
-def test_kafka_rebalance(kafka_cluster, create_query_generator, log_line):
+def test_kafka_rebalance(kafka_cluster):
     NUMBER_OF_CONSURRENT_CONSUMERS = 11
 
     instance.query(
@@ -3129,232 +2841,212 @@ def test_kafka_rebalance(kafka_cluster, create_query_generator, log_line):
     """
     )
 
+    # kafka_cluster.open_bash_shell('instance')
+
+    # time.sleep(2)
+
     admin_client = KafkaAdminClient(
         bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
     )
-    topic_name = "topic_with_multiple_partitions" + get_topic_postfix(
-        create_query_generator
-    )
-    table_name_prefix = "kafka_consumer"
-    keeper_path = f"/clickhouse/{{database}}/{table_name_prefix}"
-    with kafka_topic(admin_client, topic_name, num_partitions=11):
-        cancel = threading.Event()
+    topic_name = "topic_with_multiple_partitions"
+    kafka_create_topic(admin_client, topic_name, num_partitions=11)
 
-        msg_index = [0]
+    cancel = threading.Event()
 
-        def produce():
-            while not cancel.is_set():
-                messages = []
-                for _ in range(59):
-                    messages.append(
-                        json.dumps({"key": msg_index[0], "value": msg_index[0]})
-                    )
-                    msg_index[0] += 1
-                kafka_produce(kafka_cluster, topic_name, messages)
+    msg_index = [0]
 
-        kafka_thread = threading.Thread(target=produce)
-        kafka_thread.start()
-
-        for consumer_index in range(NUMBER_OF_CONSURRENT_CONSUMERS):
-            table_name = f"{table_name_prefix}{consumer_index}"
-            replica_name = f"r{consumer_index}"
-            logging.debug(f"Setting up {consumer_index}")
-
-            create_query = create_query_generator(
-                table_name,
-                "key UInt64, value UInt64",
-                topic_list=topic_name,
-                keeper_path=keeper_path,
-                replica_name=replica_name,
-                settings={
-                    "kafka_max_block_size": 33,
-                    "kafka_flush_interval_ms": 500,
-                },
-            )
-            instance.query(
-                f"""
-                DROP TABLE IF EXISTS test.{table_name};
-                DROP TABLE IF EXISTS test.{table_name}_mv;
-                {create_query};
-                CREATE MATERIALIZED VIEW test.{table_name}_mv TO test.destination AS
-                    SELECT
-                    key,
-                    value,
-                    _topic,
-                    _key,
-                    _offset,
-                    _partition,
-                    _timestamp,
-                    '{table_name}' as _consumed_by
-                FROM test.{table_name};
-            """
-            )
-            # kafka_cluster.open_bash_shell('instance')
-            # Waiting for test.kafka_consumerX to start consume ...
-            instance.wait_for_log_line(log_line.format(table_name))
-
-        cancel.set()
-
-        # I leave last one working by intent (to finish consuming after all rebalances)
-        for consumer_index in range(NUMBER_OF_CONSURRENT_CONSUMERS - 1):
-            logging.debug(("Dropping test.kafka_consumer{}".format(consumer_index)))
-            instance.query(
-                "DROP TABLE IF EXISTS test.kafka_consumer{} SYNC".format(consumer_index)
-            )
-
-        # logging.debug(instance.query('SELECT count(), uniqExact(key), max(key) + 1 FROM test.destination'))
-        # kafka_cluster.open_bash_shell('instance')
-
-        while 1:
-            messages_consumed = int(
-                instance.query("SELECT uniqExact(key) FROM test.destination")
-            )
-            if messages_consumed >= msg_index[0]:
-                break
-            time.sleep(1)
-            logging.debug(
-                (
-                    "Waiting for finishing consuming (have {}, should be {})".format(
-                        messages_consumed, msg_index[0]
-                    )
+    def produce():
+        while not cancel.is_set():
+            messages = []
+            for _ in range(59):
+                messages.append(
+                    json.dumps({"key": msg_index[0], "value": msg_index[0]})
                 )
-            )
+                msg_index[0] += 1
+            kafka_produce(kafka_cluster, "topic_with_multiple_partitions", messages)
 
+    kafka_thread = threading.Thread(target=produce)
+    kafka_thread.start()
+
+    for consumer_index in range(NUMBER_OF_CONSURRENT_CONSUMERS):
+        table_name = "kafka_consumer{}".format(consumer_index)
+        logging.debug(("Setting up {}".format(table_name)))
+
+        instance.query(
+            """
+            DROP TABLE IF EXISTS test.{0};
+            DROP TABLE IF EXISTS test.{0}_mv;
+            CREATE TABLE test.{0} (key UInt64, value UInt64)
+                ENGINE = Kafka
+                SETTINGS kafka_broker_list = 'kafka1:19092',
+                        kafka_topic_list = 'topic_with_multiple_partitions',
+                        kafka_group_name = 'rebalance_test_group',
+                        kafka_format = 'JSONEachRow',
+                        kafka_max_block_size = 33,
+                        kafka_flush_interval_ms = 500;
+            CREATE MATERIALIZED VIEW test.{0}_mv TO test.destination AS
+                SELECT
+                key,
+                value,
+                _topic,
+                _key,
+                _offset,
+                _partition,
+                _timestamp,
+                '{0}' as _consumed_by
+            FROM test.{0};
+        """.format(
+                table_name
+            )
+        )
+        # kafka_cluster.open_bash_shell('instance')
+        # Waiting for test.kafka_consumerX to start consume ...
+        instance.wait_for_log_line(
+            "kafka_consumer{}.*Polled offset [0-9]+".format(consumer_index)
+        )
+
+    cancel.set()
+
+    # I leave last one working by intent (to finish consuming after all rebalances)
+    for consumer_index in range(NUMBER_OF_CONSURRENT_CONSUMERS - 1):
+        logging.debug(("Dropping test.kafka_consumer{}".format(consumer_index)))
+        instance.query(
+            "DROP TABLE IF EXISTS test.kafka_consumer{} SYNC".format(consumer_index)
+        )
+
+    # logging.debug(instance.query('SELECT count(), uniqExact(key), max(key) + 1 FROM test.destination'))
+    # kafka_cluster.open_bash_shell('instance')
+
+    while 1:
+        messages_consumed = int(
+            instance.query("SELECT uniqExact(key) FROM test.destination")
+        )
+        if messages_consumed >= msg_index[0]:
+            break
+        time.sleep(1)
         logging.debug(
             (
-                instance.query(
-                    "SELECT count(), uniqExact(key), max(key) + 1 FROM test.destination"
+                "Waiting for finishing consuming (have {}, should be {})".format(
+                    messages_consumed, msg_index[0]
                 )
             )
         )
 
-        # Some queries to debug...
-        # SELECT * FROM test.destination where key in (SELECT key FROM test.destination group by key having count() <> 1)
-        # select number + 1 as key from numbers(4141) x left join test.destination using (key) where  test.destination.key = 0;
-        # SELECT * FROM test.destination WHERE key between 2360 and 2370 order by key;
-        # select _partition from test.destination group by _partition having count() <> max(_offset) + 1;
-        # select toUInt64(0) as _partition, number + 1 as _offset from numbers(400) x left join test.destination using (_partition,_offset) where test.destination.key = 0 order by _offset;
-        # SELECT * FROM test.destination WHERE _partition = 0 and _offset between 220 and 240 order by _offset;
-
-        # CREATE TABLE test.reference (key UInt64, value UInt64) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka1:19092',
-        #             kafka_topic_list = 'topic_with_multiple_partitions',
-        #             kafka_group_name = 'rebalance_test_group_reference',
-        #             kafka_format = 'JSONEachRow',
-        #             kafka_max_block_size = 100000;
-        #
-        # CREATE MATERIALIZED VIEW test.reference_mv Engine=Log AS
-        #     SELECT  key, value, _topic,_key,_offset, _partition, _timestamp, 'reference' as _consumed_by
-        # FROM test.reference;
-        #
-        # select * from test.reference_mv left join test.destination using (key,_topic,_offset,_partition) where test.destination._consumed_by = '';
-
-        result = int(
-            instance.query("SELECT count() == uniqExact(key) FROM test.destination")
-        )
-
-        for consumer_index in range(NUMBER_OF_CONSURRENT_CONSUMERS):
-            logging.debug(("kafka_consumer{}".format(consumer_index)))
-            table_name = "kafka_consumer{}".format(consumer_index)
+    logging.debug(
+        (
             instance.query(
-                """
-                DROP TABLE IF EXISTS test.{0};
-                DROP TABLE IF EXISTS test.{0}_mv;
-            """.format(
-                    table_name
-                )
+                "SELECT count(), uniqExact(key), max(key) + 1 FROM test.destination"
             )
-
-        instance.query(
-            """
-            DROP TABLE IF EXISTS test.destination;
-        """
         )
-
-        kafka_thread.join()
-
-        assert result == 1, "Messages from kafka get duplicated!"
-
-
-# TODO(antaljanosbenjamin): find another way to make insertion fail
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [
-        generate_old_create_table_query,
-        # generate_new_create_table_query,
-    ],
-)
-def test_kafka_no_holes_when_write_suffix_failed(kafka_cluster, create_query_generator):
-    admin_client = KafkaAdminClient(
-        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
-    )
-    topic_name = "no_holes_when_write_suffix_failed" + get_topic_postfix(
-        create_query_generator
     )
 
-    with kafka_topic(admin_client, topic_name):
-        messages = [json.dumps({"key": j + 1, "value": "x" * 300}) for j in range(22)]
-        kafka_produce(kafka_cluster, topic_name, messages)
+    # Some queries to debug...
+    # SELECT * FROM test.destination where key in (SELECT key FROM test.destination group by key having count() <> 1)
+    # select number + 1 as key from numbers(4141) x left join test.destination using (key) where  test.destination.key = 0;
+    # SELECT * FROM test.destination WHERE key between 2360 and 2370 order by key;
+    # select _partition from test.destination group by _partition having count() <> max(_offset) + 1;
+    # select toUInt64(0) as _partition, number + 1 as _offset from numbers(400) x left join test.destination using (_partition,_offset) where test.destination.key = 0 order by _offset;
+    # SELECT * FROM test.destination WHERE _partition = 0 and _offset between 220 and 240 order by _offset;
 
-        create_query = create_query_generator(
-            "kafka",
-            "key UInt64, value String",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-            settings={
-                "kafka_max_block_size": 20,
-                "kafka_flush_interval_ms": 2000,
-            },
-        )
-        instance.query(
-            f"""
-            DROP TABLE IF EXISTS test.view SYNC;
-            DROP TABLE IF EXISTS test.consumer;
+    # CREATE TABLE test.reference (key UInt64, value UInt64) ENGINE = Kafka SETTINGS kafka_broker_list = 'kafka1:19092',
+    #             kafka_topic_list = 'topic_with_multiple_partitions',
+    #             kafka_group_name = 'rebalance_test_group_reference',
+    #             kafka_format = 'JSONEachRow',
+    #             kafka_max_block_size = 100000;
+    #
+    # CREATE MATERIALIZED VIEW test.reference_mv Engine=Log AS
+    #     SELECT  key, value, _topic,_key,_offset, _partition, _timestamp, 'reference' as _consumed_by
+    # FROM test.reference;
+    #
+    # select * from test.reference_mv left join test.destination using (key,_topic,_offset,_partition) where test.destination._consumed_by = '';
 
-            {create_query};
-
-            CREATE TABLE test.view (key UInt64, value String)
-                ENGINE = ReplicatedMergeTree('/clickhouse/kafkatest/tables/{topic_name}', 'node1')
-                ORDER BY key;
-        """
-        )
-
-        # init PartitionManager (it starts container) earlier
-        pm = PartitionManager()
+    result = int(
+        instance.query("SELECT count() == uniqExact(key) FROM test.destination")
+    )
 
+    for consumer_index in range(NUMBER_OF_CONSURRENT_CONSUMERS):
+        logging.debug(("kafka_consumer{}".format(consumer_index)))
+        table_name = "kafka_consumer{}".format(consumer_index)
         instance.query(
             """
-            CREATE MATERIALIZED VIEW test.consumer TO test.view AS
-                SELECT * FROM test.kafka
-                WHERE NOT sleepEachRow(0.25);
+            DROP TABLE IF EXISTS test.{0};
+            DROP TABLE IF EXISTS test.{0}_mv;
+        """.format(
+                table_name
+            )
+        )
+
+    instance.query(
         """
-        )
+        DROP TABLE IF EXISTS test.destination;
+    """
+    )
 
-        instance.wait_for_log_line("Polled batch of 20 messages")
-        # the tricky part here is that disconnect should happen after write prefix, but before write suffix
-        # we have 0.25 (sleepEachRow) * 20 ( Rows ) = 5 sec window after "Polled batch of 20 messages"
-        # while materialized view is working to inject zookeeper failure
-        pm.drop_instance_zk_connections(instance)
-        instance.wait_for_log_line(
-            "Error.*(Connection loss|Coordination::Exception).*while pushing to view"
-        )
-        pm.heal_all()
-        instance.wait_for_log_line("Committed offset 22")
+    kafka_thread.join()
 
-        result = instance.query(
-            "SELECT count(), uniqExact(key), max(key) FROM test.view"
-        )
-        logging.debug(result)
+    assert result == 1, "Messages from kafka get duplicated!"
+    kafka_delete_topic(admin_client, topic_name)
 
-        # kafka_cluster.open_bash_shell('instance')
 
-        instance.query(
-            """
-            DROP TABLE test.consumer;
-            DROP TABLE test.view SYNC;
+def test_kafka_no_holes_when_write_suffix_failed(kafka_cluster):
+    messages = [json.dumps({"key": j + 1, "value": "x" * 300}) for j in range(22)]
+    kafka_produce(kafka_cluster, "no_holes_when_write_suffix_failed", messages)
+
+    instance.query(
         """
-        )
+        DROP TABLE IF EXISTS test.view;
+        DROP TABLE IF EXISTS test.consumer;
 
-        assert TSV(result) == TSV("22\t22\t22")
+        CREATE TABLE test.kafka (key UInt64, value String)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'no_holes_when_write_suffix_failed',
+                     kafka_group_name = 'no_holes_when_write_suffix_failed',
+                     kafka_format = 'JSONEachRow',
+                     kafka_max_block_size = 20,
+                     kafka_flush_interval_ms = 2000;
+
+        CREATE TABLE test.view (key UInt64, value String)
+            ENGINE = ReplicatedMergeTree('/clickhouse/kafkatest/tables/no_holes_when_write_suffix_failed', 'node1')
+            ORDER BY key;
+    """
+    )
+
+    # init PartitionManager (it starts container) earlier
+    pm = PartitionManager()
+
+    instance.query(
+        """
+        CREATE MATERIALIZED VIEW test.consumer TO test.view AS
+            SELECT * FROM test.kafka
+            WHERE NOT sleepEachRow(0.25);
+    """
+    )
+
+    instance.wait_for_log_line("Polled batch of 20 messages")
+    # the tricky part here is that disconnect should happen after write prefix, but before write suffix
+    # we have 0.25 (sleepEachRow) * 20 ( Rows ) = 5 sec window after "Polled batch of 20 messages"
+    # while materialized view is working to inject zookeeper failure
+    pm.drop_instance_zk_connections(instance)
+    instance.wait_for_log_line(
+        "Error.*(Connection loss|Coordination::Exception).*while pushing to view"
+    )
+    pm.heal_all()
+    instance.wait_for_log_line("Committed offset 22")
+
+    result = instance.query("SELECT count(), uniqExact(key), max(key) FROM test.view")
+    logging.debug(result)
+
+    # kafka_cluster.open_bash_shell('instance')
+
+    instance.query(
+        """
+        DROP TABLE test.consumer;
+        DROP TABLE test.view;
+    """
+    )
+
+    assert TSV(result) == TSV("22\t22\t22")
 
 
 def test_exception_from_destructor(kafka_cluster):
@@ -3400,30 +3092,12 @@ def test_exception_from_destructor(kafka_cluster):
     assert TSV(instance.query("SELECT 1")) == TSV("1")
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_commits_of_unprocessed_messages_on_drop(kafka_cluster, create_query_generator):
-    topic_name = "commits_of_unprocessed_messages_on_drop" + get_topic_postfix(
-        create_query_generator
-    )
+def test_commits_of_unprocessed_messages_on_drop(kafka_cluster):
     messages = [json.dumps({"key": j + 1, "value": j + 1}) for j in range(1)]
+    kafka_produce(kafka_cluster, "commits_of_unprocessed_messages_on_drop", messages)
 
-    kafka_produce(kafka_cluster, topic_name, messages)
-
-    create_query = create_query_generator(
-        "kafka",
-        "key UInt64, value UInt64",
-        topic_list=topic_name,
-        consumer_group=f"{topic_name}_test_group",
-        settings={
-            "kafka_max_block_size": 1000,
-            "kafka_flush_interval_ms": 1000,
-        },
-    )
     instance.query(
-        f"""
+        """
         DROP TABLE IF EXISTS test.destination SYNC;
         CREATE TABLE test.destination (
             key UInt64,
@@ -3438,7 +3112,14 @@ def test_commits_of_unprocessed_messages_on_drop(kafka_cluster, create_query_gen
         ENGINE = MergeTree()
         ORDER BY key;
 
-        {create_query};
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                    kafka_topic_list = 'commits_of_unprocessed_messages_on_drop',
+                    kafka_group_name = 'commits_of_unprocessed_messages_on_drop_test_group',
+                    kafka_format = 'JSONEachRow',
+                    kafka_max_block_size = 1000,
+                    kafka_flush_interval_ms = 1000;
 
         CREATE MATERIALIZED VIEW test.kafka_consumer TO test.destination AS
             SELECT
@@ -3466,7 +3147,9 @@ def test_commits_of_unprocessed_messages_on_drop(kafka_cluster, create_query_gen
             for _ in range(113):
                 messages.append(json.dumps({"key": i[0], "value": i[0]}))
                 i[0] += 1
-            kafka_produce(kafka_cluster, topic_name, messages)
+            kafka_produce(
+                kafka_cluster, "commits_of_unprocessed_messages_on_drop", messages
+            )
             time.sleep(0.5)
 
     kafka_thread = threading.Thread(target=produce)
@@ -3479,17 +3162,18 @@ def test_commits_of_unprocessed_messages_on_drop(kafka_cluster, create_query_gen
     """
     )
 
-    new_create_query = create_query_generator(
-        "kafka",
-        "key UInt64, value UInt64",
-        topic_list=topic_name,
-        consumer_group=f"{topic_name}_test_group",
-        settings={
-            "kafka_max_block_size": 10000,
-            "kafka_flush_interval_ms": 1000,
-        },
+    instance.query(
+        """
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                    kafka_topic_list = 'commits_of_unprocessed_messages_on_drop',
+                    kafka_group_name = 'commits_of_unprocessed_messages_on_drop_test_group',
+                    kafka_format = 'JSONEachRow',
+                    kafka_max_block_size = 10000,
+                    kafka_flush_interval_ms = 1000;
+    """
     )
-    instance.query(new_create_query)
 
     cancel.set()
     instance.wait_for_log_line("kafka.*Stalled", repetitions=5)
@@ -3513,31 +3197,22 @@ def test_commits_of_unprocessed_messages_on_drop(kafka_cluster, create_query_gen
     assert TSV(result) == TSV("{0}\t{0}\t{0}".format(i[0] - 1)), "Missing data!"
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_bad_reschedule(kafka_cluster, create_query_generator):
-    topic_name = "test_bad_reschedule" + get_topic_postfix(create_query_generator)
-
+def test_bad_reschedule(kafka_cluster):
     messages = [json.dumps({"key": j + 1, "value": j + 1}) for j in range(20000)]
-    kafka_produce(kafka_cluster, topic_name, messages)
+    kafka_produce(kafka_cluster, "test_bad_reschedule", messages)
 
-    create_query = create_query_generator(
-        "kafka",
-        "key UInt64, value UInt64",
-        topic_list=topic_name,
-        consumer_group=topic_name,
-        settings={
-            "kafka_max_block_size": 1000,
-            "kafka_flush_interval_ms": 1000,
-        },
-    )
     instance.query(
-        f"""
-        {create_query};
+        """
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                    kafka_topic_list = 'test_bad_reschedule',
+                    kafka_group_name = 'test_bad_reschedule',
+                    kafka_format = 'JSONEachRow',
+                    kafka_max_block_size = 1000,
+                    kafka_flush_interval_ms = 1000;
 
-        CREATE MATERIALIZED VIEW test.destination ENGINE=MergeTree ORDER BY tuple() AS
+        CREATE MATERIALIZED VIEW test.destination Engine=Log AS
         SELECT
             key,
             now() as consume_ts,
@@ -3633,26 +3308,21 @@ def test_kafka_duplicates_when_commit_failed(kafka_cluster):
 
 
 # if we came to partition end we will repeat polling until reaching kafka_max_block_size or flush_interval
-# that behavior is a bit questionable - we can just take a bigger pauses between polls instead -
+# that behavior is a bit quesionable - we can just take a bigger pauses between polls instead -
 # to do more job in a single pass, and give more rest for a thread.
 # But in cases of some peaky loads in kafka topic the current contract sounds more predictable and
 # easier to understand, so let's keep it as is for now.
 # also we can came to eof because we drained librdkafka internal queue too fast
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_premature_flush_on_eof(kafka_cluster, create_query_generator):
-    topic_name = "premature_flush_on_eof" + get_topic_postfix(create_query_generator)
-    create_query = create_query_generator(
-        "kafka",
-        "key UInt64, value UInt64",
-        topic_list=topic_name,
-        consumer_group=topic_name,
-    )
+def test_premature_flush_on_eof(kafka_cluster):
     instance.query(
-        f"""
-        {create_query};
+        """
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                    kafka_topic_list = 'premature_flush_on_eof',
+                    kafka_group_name = 'premature_flush_on_eof',
+                    kafka_format = 'JSONEachRow';
+        SELECT * FROM test.kafka LIMIT 1;
         CREATE TABLE test.destination (
             key UInt64,
             value UInt64,
@@ -3668,13 +3338,13 @@ def test_premature_flush_on_eof(kafka_cluster, create_query_generator):
     """
     )
 
-    # messages created here will be consumed immediately after MV creation
+    # messages created here will be consumed immedeately after MV creation
     # reaching topic EOF.
-    # But we should not do flush immediately after reaching EOF, because
+    # But we should not do flush immedeately after reaching EOF, because
     # next poll can return more data, and we should respect kafka_flush_interval_ms
     # and try to form bigger block
-    messages = [json.dumps({"key": 1, "value": 1})]
-    kafka_produce(kafka_cluster, topic_name, messages)
+    messages = [json.dumps({"key": j + 1, "value": j + 1}) for j in range(1)]
+    kafka_produce(kafka_cluster, "premature_flush_on_eof", messages)
 
     instance.query(
         """
@@ -3698,7 +3368,7 @@ def test_premature_flush_on_eof(kafka_cluster, create_query_generator):
     instance.wait_for_log_line("Stalled")
 
     # produce more messages after delay
-    kafka_produce(kafka_cluster, topic_name, messages)
+    kafka_produce(kafka_cluster, "premature_flush_on_eof", messages)
 
     # data was not flushed yet (it will be flushed 7.5 sec after creating MV)
     assert int(instance.query("SELECT count() FROM test.destination")) == 0
@@ -3719,81 +3389,58 @@ def test_premature_flush_on_eof(kafka_cluster, create_query_generator):
     )
 
 
-@pytest.mark.parametrize(
-    "create_query_generator, do_direct_read",
-    [(generate_old_create_table_query, True), (generate_new_create_table_query, False)],
-)
-def test_kafka_unavailable(kafka_cluster, create_query_generator, do_direct_read):
-    number_of_messages = 20000
-    topic_name = "test_bad_reschedule" + get_topic_postfix(create_query_generator)
-    messages = [
-        json.dumps({"key": j + 1, "value": j + 1}) for j in range(number_of_messages)
-    ]
-    kafka_produce(kafka_cluster, topic_name, messages)
+def test_kafka_unavailable(kafka_cluster):
+    messages = [json.dumps({"key": j + 1, "value": j + 1}) for j in range(20000)]
+    kafka_produce(kafka_cluster, "test_bad_reschedule", messages)
 
-    with existing_kafka_topic(get_admin_client(kafka_cluster), topic_name):
-        kafka_cluster.pause_container("kafka1")
+    kafka_cluster.pause_container("kafka1")
 
-        create_query = create_query_generator(
-            "test_bad_reschedule",
-            "key UInt64, value UInt64",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-            settings={"kafka_max_block_size": 1000},
-        )
-        instance.query(
-            f"""
-            {create_query};
-
-            CREATE MATERIALIZED VIEW test.destination_unavailable ENGINE=MergeTree ORDER BY tuple() AS
-            SELECT
-                key,
-                now() as consume_ts,
-                value,
-                _topic,
-                _key,
-                _offset,
-                _partition,
-                _timestamp
-            FROM test.test_bad_reschedule;
+    instance.query(
         """
-        )
+        CREATE TABLE test.test_bad_reschedule (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                    kafka_topic_list = 'test_bad_reschedule',
+                    kafka_group_name = 'test_bad_reschedule',
+                    kafka_format = 'JSONEachRow',
+                    kafka_commit_on_select = 1,
+                    kafka_max_block_size = 1000;
 
-        if do_direct_read:
-            instance.query("SELECT * FROM test.test_bad_reschedule")
-        instance.query("SELECT count() FROM test.destination_unavailable")
+        CREATE MATERIALIZED VIEW test.destination_unavailable Engine=Log AS
+        SELECT
+            key,
+            now() as consume_ts,
+            value,
+            _topic,
+            _key,
+            _offset,
+            _partition,
+            _timestamp
+        FROM test.test_bad_reschedule;
+    """
+    )
 
-        # enough to trigger issue
-        time.sleep(30)
-        kafka_cluster.unpause_container("kafka1")
+    instance.query("SELECT * FROM test.test_bad_reschedule")
+    instance.query("SELECT count() FROM test.destination_unavailable")
 
-        result = instance.query_with_retry(
-            "SELECT count() FROM test.destination_unavailable",
-            sleep_time=1,
-            check_callback=lambda res: int(res) == number_of_messages,
-        )
+    # enough to trigger issue
+    time.sleep(30)
+    kafka_cluster.unpause_container("kafka1")
 
-        assert int(result) == number_of_messages
+    while (
+        int(instance.query("SELECT count() FROM test.destination_unavailable")) < 20000
+    ):
+        print("Waiting for consume")
+        time.sleep(1)
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_issue14202(kafka_cluster, create_query_generator):
+def test_kafka_issue14202(kafka_cluster):
     """
     INSERT INTO Kafka Engine from an empty SELECT sub query was leading to failure
     """
 
-    topic_name = "issue14202" + get_topic_postfix(create_query_generator)
-    create_query = create_query_generator(
-        "kafka_q",
-        "t UInt64, some_string String",
-        topic_list=topic_name,
-        consumer_group=topic_name,
-    )
     instance.query(
-        f"""
+        """
         CREATE TABLE test.empty_table (
             dt Date,
             some_string String
@@ -3802,7 +3449,12 @@ def test_kafka_issue14202(kafka_cluster, create_query_generator):
         PARTITION BY toYYYYMM(dt)
         ORDER BY some_string;
 
-        {create_query};
+        CREATE TABLE test.kafka_q (t UInt64, `some_string` String)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'issue14202',
+                     kafka_group_name = 'issue14202',
+                     kafka_format = 'JSONEachRow';
         """
     )
 
@@ -3853,30 +3505,20 @@ def random_string(size=8):
     return "".join(random.choices(string.ascii_uppercase + string.digits, k=size))
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_engine_put_errors_to_stream(kafka_cluster, create_query_generator):
-    topic_name = "kafka_engine_put_errors_to_stream" + get_topic_postfix(
-        create_query_generator
-    )
-    create_query = create_query_generator(
-        "kafka",
-        "i Int64, s String",
-        topic_list=topic_name,
-        consumer_group=topic_name,
-        settings={
-            "kafka_max_block_size": 128,
-            "kafka_handle_error_mode": "stream",
-        },
-    )
+def test_kafka_engine_put_errors_to_stream(kafka_cluster):
     instance.query(
-        f"""
+        """
         DROP TABLE IF EXISTS test.kafka;
         DROP TABLE IF EXISTS test.kafka_data;
         DROP TABLE IF EXISTS test.kafka_errors;
-        {create_query};
+        CREATE TABLE test.kafka (i Int64, s String)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'kafka_engine_put_errors_to_stream',
+                     kafka_group_name = 'kafka_engine_put_errors_to_stream',
+                     kafka_format = 'JSONEachRow',
+                     kafka_max_block_size = 128,
+                     kafka_handle_error_mode = 'stream';
         CREATE MATERIALIZED VIEW test.kafka_data (i Int64, s String)
             ENGINE = MergeTree
             ORDER BY i
@@ -3904,20 +3546,19 @@ def test_kafka_engine_put_errors_to_stream(kafka_cluster, create_query_generator
                 json.dumps({"i": "n_" + random_string(4), "s": random_string(8)})
             )
 
-    kafka_produce(kafka_cluster, topic_name, messages)
-    with existing_kafka_topic(get_admin_client(kafka_cluster), topic_name):
-        instance.wait_for_log_line("Committed offset 128")
+    kafka_produce(kafka_cluster, "kafka_engine_put_errors_to_stream", messages)
+    instance.wait_for_log_line("Committed offset 128")
 
-        assert TSV(instance.query("SELECT count() FROM test.kafka_data")) == TSV("64")
-        assert TSV(instance.query("SELECT count() FROM test.kafka_errors")) == TSV("64")
+    assert TSV(instance.query("SELECT count() FROM test.kafka_data")) == TSV("64")
+    assert TSV(instance.query("SELECT count() FROM test.kafka_errors")) == TSV("64")
 
-        instance.query(
-            """
-            DROP TABLE test.kafka;
-            DROP TABLE test.kafka_data;
-            DROP TABLE test.kafka_errors;
+    instance.query(
         """
-        )
+        DROP TABLE test.kafka;
+        DROP TABLE test.kafka_data;
+        DROP TABLE test.kafka_errors;
+    """
+    )
 
 
 def gen_normal_json():
@@ -3946,35 +3587,21 @@ def gen_message_with_jsons(jsons=10, malformed=0):
     return s.getvalue()
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_engine_put_errors_to_stream_with_random_malformed_json(
-    kafka_cluster, create_query_generator
-):
-    topic_name = (
-        "kafka_engine_put_errors_to_stream_with_random_malformed_json"
-        + get_topic_postfix(create_query_generator)
-    )
-    create_query = create_query_generator(
-        "kafka",
-        "i Int64, s String",
-        topic_list=topic_name,
-        consumer_group=topic_name,
-        settings={
-            "kafka_max_block_size": 100,
-            "kafka_poll_max_batch_size": 1,
-            "kafka_handle_error_mode": "stream",
-        },
-    )
-
+def test_kafka_engine_put_errors_to_stream_with_random_malformed_json(kafka_cluster):
     instance.query(
-        f"""
+        """
         DROP TABLE IF EXISTS test.kafka;
         DROP TABLE IF EXISTS test.kafka_data;
         DROP TABLE IF EXISTS test.kafka_errors;
-        {create_query};
+        CREATE TABLE test.kafka (i Int64, s String)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'kafka_engine_put_errors_to_stream_with_random_malformed_json',
+                     kafka_group_name = 'kafka_engine_put_errors_to_stream_with_random_malformed_json',
+                     kafka_format = 'JSONEachRow',
+                     kafka_max_block_size = 100,
+                     kafka_poll_max_batch_size = 1,
+                     kafka_handle_error_mode = 'stream';
         CREATE MATERIALIZED VIEW test.kafka_data (i Int64, s String)
             ENGINE = MergeTree
             ORDER BY i
@@ -3999,28 +3626,28 @@ def test_kafka_engine_put_errors_to_stream_with_random_malformed_json(
         else:
             messages.append(gen_message_with_jsons(10, 0))
 
-    kafka_produce(kafka_cluster, topic_name, messages)
-    with existing_kafka_topic(get_admin_client(kafka_cluster), topic_name):
-        instance.wait_for_log_line("Committed offset 128")
-        # 64 good messages, each containing 10 rows
-        assert TSV(instance.query("SELECT count() FROM test.kafka_data")) == TSV("640")
-        # 64 bad messages, each containing some broken row
-        assert TSV(instance.query("SELECT count() FROM test.kafka_errors")) == TSV("64")
+    kafka_produce(
+        kafka_cluster,
+        "kafka_engine_put_errors_to_stream_with_random_malformed_json",
+        messages,
+    )
 
-        instance.query(
-            """
-            DROP TABLE test.kafka;
-            DROP TABLE test.kafka_data;
-            DROP TABLE test.kafka_errors;
+    instance.wait_for_log_line("Committed offset 128")
+    # 64 good messages, each containing 10 rows
+    assert TSV(instance.query("SELECT count() FROM test.kafka_data")) == TSV("640")
+    # 64 bad messages, each containing some broken row
+    assert TSV(instance.query("SELECT count() FROM test.kafka_errors")) == TSV("64")
+
+    instance.query(
         """
-        )
+        DROP TABLE test.kafka;
+        DROP TABLE test.kafka_data;
+        DROP TABLE test.kafka_errors;
+    """
+    )
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator):
+def test_kafka_formats_with_broken_message(kafka_cluster):
     # data was dumped from clickhouse itself in a following manner
     # clickhouse-client --format=Native --query='SELECT toInt64(number) as id, toUInt16( intDiv( id, 65536 ) ) as blockNo, reinterpretAsString(19777) as val1, toFloat32(0.5) as val2, toUInt8(1) as val3 from numbers(100) ORDER BY id' | xxd -ps | tr -d '\n' | sed 's/\(..\)/\\x\1/g'
     admin_client = KafkaAdminClient(
@@ -4038,10 +3665,7 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
                 # broken message
                 '{"id":"0","blockNo":"BAD","val1":"AM","val2":0.5,"val3":1}',
             ],
-            "expected": {
-                "raw_message": '{"id":"0","blockNo":"BAD","val1":"AM","val2":0.5,"val3":1}',
-                "error": 'Cannot parse input: expected \'"\' before: \'BAD","val1":"AM","val2":0.5,"val3":1}\': (while reading the value of key blockNo)',
-            },
+            "expected": """{"raw_message":"{\\"id\\":\\"0\\",\\"blockNo\\":\\"BAD\\",\\"val1\\":\\"AM\\",\\"val2\\":0.5,\\"val3\\":1}","error":"Cannot parse input: expected '\\"' before: 'BAD\\",\\"val1\\":\\"AM\\",\\"val2\\":0.5,\\"val3\\":1}': (while reading the value of key blockNo)"}""",
             "supports_empty_value": True,
             "printable": True,
         },
@@ -4054,10 +3678,7 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
                 # broken message
                 '["0", "BAD", "AM", 0.5, 1]',
             ],
-            "expected": {
-                "raw_message": '["0", "BAD", "AM", 0.5, 1]',
-                "error": "Cannot parse input: expected '\"' before: 'BAD\", \"AM\", 0.5, 1]': (while reading the value of key blockNo)",
-            },
+            "expected": """{"raw_message":"[\\"0\\", \\"BAD\\", \\"AM\\", 0.5, 1]","error":"Cannot parse input: expected '\\"' before: 'BAD\\", \\"AM\\", 0.5, 1]': (while reading the value of key blockNo)"}""",
             "supports_empty_value": True,
             "printable": True,
         },
@@ -4069,10 +3690,7 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
                 # broken message
                 '["0", "BAD", "AM", 0.5, 1]',
             ],
-            "expected": {
-                "raw_message": '["0", "BAD", "AM", 0.5, 1]',
-                "error": "Cannot parse JSON string: expected opening quote",
-            },
+            "expected": """{"raw_message":"[\\"0\\", \\"BAD\\", \\"AM\\", 0.5, 1]","error":"Cannot parse JSON string: expected opening quote"}""",
             "printable": True,
         },
         "TSKV": {
@@ -4083,10 +3701,7 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
                 # broken message
                 "id=0\tblockNo=BAD\tval1=AM\tval2=0.5\tval3=1\n",
             ],
-            "expected": {
-                "raw_message": "id=0\tblockNo=BAD\tval1=AM\tval2=0.5\tval3=1\n",
-                "error": "Found garbage after field in TSKV format: blockNo: (at row 1)\n",
-            },
+            "expected": '{"raw_message":"id=0\\tblockNo=BAD\\tval1=AM\\tval2=0.5\\tval3=1\\n","error":"Found garbage after field in TSKV format: blockNo: (at row 1)\\n"}',
             "printable": True,
         },
         "CSV": {
@@ -4097,10 +3712,7 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
                 # broken message
                 '0,"BAD","AM",0.5,1\n',
             ],
-            "expected": {
-                "raw_message": '0,"BAD","AM",0.5,1\n',
-                "error": "Cannot parse input: expected '\"' before: 'BAD\",\"AM\",0.5,1\\n'",
-            },
+            "expected": """{"raw_message":"0,\\"BAD\\",\\"AM\\",0.5,1\\n","error":"Cannot parse input: expected '\\"' before: 'BAD\\",\\"AM\\",0.5,1\\\\n'"}""",
             "printable": True,
             "supports_empty_value": True,
         },
@@ -4112,10 +3724,7 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
                 # broken message
                 "0\tBAD\tAM\t0.5\t1\n",
             ],
-            "expected": {
-                "raw_message": "0\tBAD\tAM\t0.5\t1\n",
-                "error": "Cannot parse input: expected '\\t' before: 'BAD\\tAM\\t0.5\\t1\\n'",
-            },
+            "expected": """{"raw_message":"0\\tBAD\\tAM\\t0.5\\t1\\n","error":"Cannot parse input: expected '\\\\t' before: 'BAD\\\\tAM\\\\t0.5\\\\t1\\\\n'"}""",
             "supports_empty_value": True,
             "printable": True,
         },
@@ -4127,10 +3736,7 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
                 # broken message
                 '"id","blockNo","val1","val2","val3"\n0,"BAD","AM",0.5,1\n',
             ],
-            "expected": {
-                "raw_message": '"id","blockNo","val1","val2","val3"\n0,"BAD","AM",0.5,1\n',
-                "error": "Cannot parse input: expected '\"' before: 'BAD\",\"AM\",0.5,1\\n'",
-            },
+            "expected": """{"raw_message":"\\"id\\",\\"blockNo\\",\\"val1\\",\\"val2\\",\\"val3\\"\\n0,\\"BAD\\",\\"AM\\",0.5,1\\n","error":"Cannot parse input: expected '\\"' before: 'BAD\\",\\"AM\\",0.5,1\\\\n'"}""",
             "printable": True,
         },
         "Values": {
@@ -4141,10 +3747,7 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
                 # broken message
                 "(0,'BAD','AM',0.5,1)",
             ],
-            "expected": {
-                "raw_message": "(0,'BAD','AM',0.5,1)",
-                "error": "Cannot parse string 'BAD' as UInt16: syntax error at begin of string. Note: there are toUInt16OrZero and toUInt16OrNull functions, which returns zero/NULL instead of throwing exception",
-            },
+            "expected": r"""{"raw_message":"(0,'BAD','AM',0.5,1)","error":"Cannot parse string 'BAD' as UInt16: syntax error at begin of string. Note: there are toUInt16OrZero and toUInt16OrNull functions, which returns zero\/NULL instead of throwing exception"}""",
             "supports_empty_value": True,
             "printable": True,
         },
@@ -4156,10 +3759,7 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
                 # broken message
                 "id\tblockNo\tval1\tval2\tval3\n0\tBAD\tAM\t0.5\t1\n",
             ],
-            "expected": {
-                "raw_message": "id\tblockNo\tval1\tval2\tval3\n0\tBAD\tAM\t0.5\t1\n",
-                "error": "Cannot parse input: expected '\\t' before: 'BAD\\tAM\\t0.5\\t1\\n",
-            },
+            "expected": """{"raw_message":"id\\tblockNo\\tval1\\tval2\\tval3\\n0\\tBAD\\tAM\\t0.5\\t1\\n","error":"Cannot parse input: expected '\\\\t' before: 'BAD\\\\tAM\\\\t0.5\\\\t1\\\\n"}""",
             "supports_empty_value": True,
             "printable": True,
         },
@@ -4171,10 +3771,7 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
                 # broken message
                 "id\tblockNo\tval1\tval2\tval3\nInt64\tUInt16\tString\tFloat32\tUInt8\n0\tBAD\tAM\t0.5\t1\n",
             ],
-            "expected": {
-                "raw_message": "id\tblockNo\tval1\tval2\tval3\nInt64\tUInt16\tString\tFloat32\tUInt8\n0\tBAD\tAM\t0.5\t1\n",
-                "error": "Cannot parse input: expected '\\t' before: 'BAD\\tAM\\t0.5\\t1\\n'",
-            },
+            "expected": """{"raw_message":"id\\tblockNo\\tval1\\tval2\\tval3\\nInt64\\tUInt16\\tString\\tFloat32\\tUInt8\\n0\\tBAD\\tAM\\t0.5\\t1\\n","error":"Cannot parse input: expected '\\\\t' before: 'BAD\\\\tAM\\\\t0.5\\\\t1\\\\n'"}""",
             "printable": True,
         },
         "Native": {
@@ -4185,10 +3782,7 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
                 # broken message
                 b"\x05\x01\x02\x69\x64\x05\x49\x6e\x74\x36\x34\x00\x00\x00\x00\x00\x00\x00\x00\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x06\x53\x74\x72\x69\x6e\x67\x03\x42\x41\x44\x04\x76\x61\x6c\x31\x06\x53\x74\x72\x69\x6e\x67\x02\x41\x4d\x04\x76\x61\x6c\x32\x07\x46\x6c\x6f\x61\x74\x33\x32\x00\x00\x00\x3f\x04\x76\x61\x6c\x33\x05\x55\x49\x6e\x74\x38\x01",
             ],
-            "expected": {
-                "raw_message": "050102696405496E743634000000000000000007626C6F636B4E6F06537472696E67034241440476616C3106537472696E6702414D0476616C3207466C6F617433320000003F0476616C330555496E743801",
-                "error": "Cannot convert: String to UInt16",
-            },
+            "expected": """{"raw_message":"050102696405496E743634000000000000000007626C6F636B4E6F06537472696E67034241440476616C3106537472696E6702414D0476616C3207466C6F617433320000003F0476616C330555496E743801","error":"Cannot convert: String to UInt16"}""",
             "printable": False,
         },
         "RowBinary": {
@@ -4199,10 +3793,7 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
                 # broken message
                 b"\x00\x00\x00\x00\x00\x00\x00\x00\x03\x42\x41\x44\x02\x41\x4d\x00\x00\x00\x3f\x01",
             ],
-            "expected": {
-                "raw_message": "00000000000000000342414402414D0000003F01",
-                "error": "Cannot read all data. Bytes read: 9. Bytes expected: 65.: (at row 1)\n",
-            },
+            "expected": '{"raw_message":"00000000000000000342414402414D0000003F01","error":"Cannot read all data. Bytes read: 9. Bytes expected: 65.: (at row 1)\\n"}',
             "printable": False,
         },
         "RowBinaryWithNamesAndTypes": {
@@ -4213,10 +3804,7 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
                 # broken message
                 b"\x05\x02\x69\x64\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x04\x76\x61\x6c\x31\x04\x76\x61\x6c\x32\x04\x76\x61\x6c\x33\x05\x49\x6e\x74\x36\x34\x06\x53\x74\x72\x69\x6e\x67\x06\x53\x74\x72\x69\x6e\x67\x07\x46\x6c\x6f\x61\x74\x33\x32\x05\x55\x49\x6e\x74\x38\x00\x00\x00\x00\x00\x00\x00\x00\x03\x42\x41\x44\x02\x41\x4d\x00\x00\x00\x3f\x01",
             ],
-            "expected": {
-                "raw_message": "0502696407626C6F636B4E6F0476616C310476616C320476616C3305496E74363406537472696E6706537472696E6707466C6F617433320555496E743800000000000000000342414402414D0000003F01",
-                "error": "Type of 'blockNo' must be UInt16, not String",
-            },
+            "expected": '{"raw_message":"0502696407626C6F636B4E6F0476616C310476616C320476616C3305496E74363406537472696E6706537472696E6707466C6F617433320555496E743800000000000000000342414402414D0000003F01","error":"Type of \'blockNo\' must be UInt16, not String"}',
             "printable": False,
         },
         "ORC": {
@@ -4227,19 +3815,15 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
                 # broken message
                 b"\x4f\x52\x43\x0a\x0b\x0a\x03\x00\x00\x00\x12\x04\x08\x01\x50\x00\x0a\x15\x0a\x05\x00\x00\x00\x00\x00\x12\x0c\x08\x01\x12\x06\x08\x00\x10\x00\x18\x00\x50\x00\x0a\x12\x0a\x06\x00\x00\x00\x00\x00\x00\x12\x08\x08\x01\x42\x02\x08\x06\x50\x00\x0a\x12\x0a\x06\x00\x00\x00\x00\x00\x00\x12\x08\x08\x01\x42\x02\x08\x04\x50\x00\x0a\x29\x0a\x04\x00\x00\x00\x00\x12\x21\x08\x01\x1a\x1b\x09\x00\x00\x00\x00\x00\x00\xe0\x3f\x11\x00\x00\x00\x00\x00\x00\xe0\x3f\x19\x00\x00\x00\x00\x00\x00\xe0\x3f\x50\x00\x0a\x15\x0a\x05\x00\x00\x00\x00\x00\x12\x0c\x08\x01\x12\x06\x08\x02\x10\x02\x18\x02\x50\x00\xff\x80\xff\x80\xff\x00\xff\x80\xff\x03\x42\x41\x44\xff\x80\xff\x02\x41\x4d\xff\x80\x00\x00\x00\x3f\xff\x80\xff\x01\x0a\x06\x08\x06\x10\x00\x18\x0d\x0a\x06\x08\x06\x10\x01\x18\x17\x0a\x06\x08\x06\x10\x02\x18\x14\x0a\x06\x08\x06\x10\x03\x18\x14\x0a\x06\x08\x06\x10\x04\x18\x2b\x0a\x06\x08\x06\x10\x05\x18\x17\x0a\x06\x08\x00\x10\x00\x18\x02\x0a\x06\x08\x00\x10\x01\x18\x02\x0a\x06\x08\x01\x10\x01\x18\x02\x0a\x06\x08\x00\x10\x02\x18\x02\x0a\x06\x08\x02\x10\x02\x18\x02\x0a\x06\x08\x01\x10\x02\x18\x03\x0a\x06\x08\x00\x10\x03\x18\x02\x0a\x06\x08\x02\x10\x03\x18\x02\x0a\x06\x08\x01\x10\x03\x18\x02\x0a\x06\x08\x00\x10\x04\x18\x02\x0a\x06\x08\x01\x10\x04\x18\x04\x0a\x06\x08\x00\x10\x05\x18\x02\x0a\x06\x08\x01\x10\x05\x18\x02\x12\x04\x08\x00\x10\x00\x12\x04\x08\x00\x10\x00\x12\x04\x08\x00\x10\x00\x12\x04\x08\x00\x10\x00\x12\x04\x08\x00\x10\x00\x12\x04\x08\x00\x10\x00\x1a\x03\x47\x4d\x54\x0a\x59\x0a\x04\x08\x01\x50\x00\x0a\x0c\x08\x01\x12\x06\x08\x00\x10\x00\x18\x00\x50\x00\x0a\x08\x08\x01\x42\x02\x08\x06\x50\x00\x0a\x08\x08\x01\x42\x02\x08\x04\x50\x00\x0a\x21\x08\x01\x1a\x1b\x09\x00\x00\x00\x00\x00\x00\xe0\x3f\x11\x00\x00\x00\x00\x00\x00\xe0\x3f\x19\x00\x00\x00\x00\x00\x00\xe0\x3f\x50\x00\x0a\x0c\x08\x01\x12\x06\x08\x02\x10\x02\x18\x02\x50\x00\x08\x03\x10\xec\x02\x1a\x0c\x08\x03\x10\x8e\x01\x18\x1d\x20\xc1\x01\x28\x01\x22\x2e\x08\x0c\x12\x05\x01\x02\x03\x04\x05\x1a\x02\x69\x64\x1a\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x1a\x04\x76\x61\x6c\x31\x1a\x04\x76\x61\x6c\x32\x1a\x04\x76\x61\x6c\x33\x20\x00\x28\x00\x30\x00\x22\x08\x08\x04\x20\x00\x28\x00\x30\x00\x22\x08\x08\x08\x20\x00\x28\x00\x30\x00\x22\x08\x08\x08\x20\x00\x28\x00\x30\x00\x22\x08\x08\x05\x20\x00\x28\x00\x30\x00\x22\x08\x08\x01\x20\x00\x28\x00\x30\x00\x30\x01\x3a\x04\x08\x01\x50\x00\x3a\x0c\x08\x01\x12\x06\x08\x00\x10\x00\x18\x00\x50\x00\x3a\x08\x08\x01\x42\x02\x08\x06\x50\x00\x3a\x08\x08\x01\x42\x02\x08\x04\x50\x00\x3a\x21\x08\x01\x1a\x1b\x09\x00\x00\x00\x00\x00\x00\xe0\x3f\x11\x00\x00\x00\x00\x00\x00\xe0\x3f\x19\x00\x00\x00\x00\x00\x00\xe0\x3f\x50\x00\x3a\x0c\x08\x01\x12\x06\x08\x02\x10\x02\x18\x02\x50\x00\x40\x90\x4e\x48\x01\x08\xd5\x01\x10\x00\x18\x80\x80\x04\x22\x02\x00\x0b\x28\x5b\x30\x06\x82\xf4\x03\x03\x4f\x52\x43\x18",
             ],
-            "expected": {
-                "raw_message": "4F52430A0B0A030000001204080150000A150A050000000000120C0801120608001000180050000A120A06000000000000120808014202080650000A120A06000000000000120808014202080450000A290A0400000000122108011A1B09000000000000E03F11000000000000E03F19000000000000E03F50000A150A050000000000120C080112060802100218025000FF80FF80FF00FF80FF03424144FF80FF02414DFF800000003FFF80FF010A0608061000180D0A060806100118170A060806100218140A060806100318140A0608061004182B0A060806100518170A060800100018020A060800100118020A060801100118020A060800100218020A060802100218020A060801100218030A060800100318020A060802100318020A060801100318020A060800100418020A060801100418040A060800100518020A060801100518021204080010001204080010001204080010001204080010001204080010001204080010001A03474D540A590A04080150000A0C0801120608001000180050000A0808014202080650000A0808014202080450000A2108011A1B09000000000000E03F11000000000000E03F19000000000000E03F50000A0C080112060802100218025000080310EC021A0C0803108E01181D20C1012801222E080C120501020304051A0269641A07626C6F636B4E6F1A0476616C311A0476616C321A0476616C33200028003000220808042000280030002208080820002800300022080808200028003000220808052000280030002208080120002800300030013A04080150003A0C0801120608001000180050003A0808014202080650003A0808014202080450003A2108011A1B09000000000000E03F11000000000000E03F19000000000000E03F50003A0C08011206080210021802500040904E480108D5011000188080042202000B285B300682F403034F524318",
-                "error": "Cannot parse string 'BAD' as UInt16: syntax error at begin of string. Note: there are toUInt16OrZero and toUInt16OrNull functions, which returns zero/NULL instead of throwing exception.",
-            },
+            "expected": r"""{"raw_message":"4F52430A0B0A030000001204080150000A150A050000000000120C0801120608001000180050000A120A06000000000000120808014202080650000A120A06000000000000120808014202080450000A290A0400000000122108011A1B09000000000000E03F11000000000000E03F19000000000000E03F50000A150A050000000000120C080112060802100218025000FF80FF80FF00FF80FF03424144FF80FF02414DFF800000003FFF80FF010A0608061000180D0A060806100118170A060806100218140A060806100318140A0608061004182B0A060806100518170A060800100018020A060800100118020A060801100118020A060800100218020A060802100218020A060801100218030A060800100318020A060802100318020A060801100318020A060800100418020A060801100418040A060800100518020A060801100518021204080010001204080010001204080010001204080010001204080010001204080010001A03474D540A590A04080150000A0C0801120608001000180050000A0808014202080650000A0808014202080450000A2108011A1B09000000000000E03F11000000000000E03F19000000000000E03F50000A0C080112060802100218025000080310EC021A0C0803108E01181D20C1012801222E080C120501020304051A0269641A07626C6F636B4E6F1A0476616C311A0476616C321A0476616C33200028003000220808042000280030002208080820002800300022080808200028003000220808052000280030002208080120002800300030013A04080150003A0C0801120608001000180050003A0808014202080650003A0808014202080450003A2108011A1B09000000000000E03F11000000000000E03F19000000000000E03F50003A0C08011206080210021802500040904E480108D5011000188080042202000B285B300682F403034F524318","error":"Cannot parse string 'BAD' as UInt16: syntax error at begin of string. Note: there are toUInt16OrZero and toUInt16OrNull functions, which returns zero\/NULL instead of throwing exception."}""",
             "printable": False,
         },
     }
 
     topic_name_prefix = "format_tests_4_stream_"
-    topic_name_postfix = get_topic_postfix(create_query_generator)
     for format_name, format_opts in list(all_formats.items()):
         logging.debug(f"Set up {format_name}")
-        topic_name = f"{topic_name_prefix}{format_name}{topic_name_postfix}"
+        topic_name = f"{topic_name_prefix}{format_name}"
         data_sample = format_opts["data_sample"]
         data_prefix = []
         raw_message = "_raw_message"
@@ -4249,33 +3833,39 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
         if format_opts.get("printable", False) == False:
             raw_message = "hex(_raw_message)"
         kafka_produce(kafka_cluster, topic_name, data_prefix + data_sample)
-        create_query = create_query_generator(
-            f"kafka_{format_name}",
-            "id Int64, blockNo UInt16, val1 String, val2 Float32, val3 UInt8",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-            format=format_name,
-            settings={
-                "kafka_handle_error_mode": "stream",
-                "kafka_flush_interval_ms": 1000,
-            },
-        )
         instance.query(
-            f"""
+            """
             DROP TABLE IF EXISTS test.kafka_{format_name};
 
-            {create_query};
+            CREATE TABLE test.kafka_{format_name} (
+                id Int64,
+                blockNo UInt16,
+                val1 String,
+                val2 Float32,
+                val3 UInt8
+            ) ENGINE = Kafka()
+                SETTINGS kafka_broker_list = 'kafka1:19092',
+                        kafka_topic_list = '{topic_name}',
+                        kafka_group_name = '{topic_name}',
+                        kafka_format = '{format_name}',
+                        kafka_handle_error_mode = 'stream',
+                        kafka_flush_interval_ms = 1000 {extra_settings};
 
             DROP TABLE IF EXISTS test.kafka_data_{format_name}_mv;
-            CREATE MATERIALIZED VIEW test.kafka_data_{format_name}_mv ENGINE=MergeTree ORDER BY tuple() AS
+            CREATE MATERIALIZED VIEW test.kafka_data_{format_name}_mv Engine=Log AS
                 SELECT *, _topic, _partition, _offset FROM test.kafka_{format_name}
                 WHERE length(_error) = 0;
 
             DROP TABLE IF EXISTS test.kafka_errors_{format_name}_mv;
-            CREATE MATERIALIZED VIEW test.kafka_errors_{format_name}_mv ENGINE=MergeTree ORDER BY tuple() AS
+            CREATE MATERIALIZED VIEW test.kafka_errors_{format_name}_mv Engine=Log AS
                 SELECT {raw_message} as raw_message, _error as error, _topic as topic, _partition as partition, _offset as offset FROM test.kafka_{format_name}
                 WHERE length(_error) > 0;
-            """
+            """.format(
+                topic_name=topic_name,
+                format_name=format_name,
+                raw_message=raw_message,
+                extra_settings=format_opts.get("extra_settings") or "",
+            )
         )
 
     raw_expected = """\
@@ -4310,7 +3900,7 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
 
     for format_name, format_opts in list(all_formats.items()):
         logging.debug(f"Checking {format_name}")
-        topic_name = f"{topic_name_prefix}{format_name}{topic_name_postfix}"
+        topic_name = f"{topic_name_prefix}{format_name}"
         # shift offsets by 1 if format supports empty value
         offsets = (
             [1, 2, 3] if format_opts.get("supports_empty_value", False) else [0, 1, 2]
@@ -4330,222 +3920,229 @@ def test_kafka_formats_with_broken_message(kafka_cluster, create_query_generator
         assert TSV(result) == TSV(expected), "Proper result for format: {}".format(
             format_name
         )
-        errors_result = json.loads(
+        errors_result = ast.literal_eval(
             instance.query(
                 "SELECT raw_message, error FROM test.kafka_errors_{format_name}_mv format JSONEachRow".format(
                     format_name=format_name
                 )
             )
         )
+        errors_expected = ast.literal_eval(format_opts["expected"])
         # print(errors_result.strip())
         # print(errors_expected.strip())
         assert (
-            errors_result["raw_message"] == format_opts["expected"]["raw_message"]
+            errors_result["raw_message"] == errors_expected["raw_message"]
         ), "Proper raw_message for format: {}".format(format_name)
         # Errors text can change, just checking prefixes
         assert (
-            format_opts["expected"]["error"] in errors_result["error"]
+            errors_expected["error"] in errors_result["error"]
         ), "Proper error for format: {}".format(format_name)
         kafka_delete_topic(admin_client, topic_name)
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [
-        generate_old_create_table_query,
-        generate_new_create_table_query,
-    ],
-)
-def test_kafka_consumer_failover(kafka_cluster, create_query_generator):
-    topic_name = "kafka_consumer_failover" + get_topic_postfix(create_query_generator)
+def wait_for_new_data(table_name, prev_count=0, max_retries=120):
+    retries = 0
+    while True:
+        new_count = int(instance.query("SELECT count() FROM {}".format(table_name)))
+        print(new_count)
+        if new_count > prev_count:
+            return new_count
+        else:
+            retries += 1
+            time.sleep(0.5)
+            if retries > max_retries:
+                raise Exception("No new data :(")
 
-    with kafka_topic(get_admin_client(kafka_cluster), topic_name, num_partitions=2):
-        consumer_group = f"{topic_name}_group"
-        create_queries = []
-        for counter in range(3):
-            create_queries.append(
-                create_query_generator(
-                    f"kafka{counter+1}",
-                    "key UInt64, value UInt64",
-                    topic_list=topic_name,
-                    consumer_group=consumer_group,
-                    settings={
-                        "kafka_max_block_size": 1,
-                        "kafka_poll_timeout_ms": 200,
-                    },
-                )
-            )
 
-        instance.query(
-            f"""
-            {create_queries[0]};
-            {create_queries[1]};
-            {create_queries[2]};
+def test_kafka_consumer_failover(kafka_cluster):
+    # for backporting:
+    # admin_client = KafkaAdminClient(bootstrap_servers="localhost:9092")
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
 
-            CREATE TABLE test.destination (
-                key UInt64,
-                value UInt64,
-                _consumed_by LowCardinality(String)
-            )
-            ENGINE = MergeTree()
-            ORDER BY key;
+    topic_name = "kafka_consumer_failover"
+    kafka_create_topic(admin_client, topic_name, num_partitions=2)
 
-            CREATE MATERIALIZED VIEW test.kafka1_mv TO test.destination AS
-            SELECT key, value, 'kafka1' as _consumed_by
-            FROM test.kafka1;
+    instance.query(
+        """
+        DROP TABLE IF EXISTS test.kafka;
+        DROP TABLE IF EXISTS test.kafka2;
 
-            CREATE MATERIALIZED VIEW test.kafka2_mv TO test.destination AS
-            SELECT key, value, 'kafka2' as _consumed_by
-            FROM test.kafka2;
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'kafka_consumer_failover',
+                     kafka_group_name = 'kafka_consumer_failover_group',
+                     kafka_format = 'JSONEachRow',
+                     kafka_max_block_size = 1,
+                     kafka_poll_timeout_ms = 200;
 
-            CREATE MATERIALIZED VIEW test.kafka3_mv TO test.destination AS
-            SELECT key, value, 'kafka3' as _consumed_by
-            FROM test.kafka3;
-            """
-        )
+        CREATE TABLE test.kafka2 (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'kafka_consumer_failover',
+                     kafka_group_name = 'kafka_consumer_failover_group',
+                     kafka_format = 'JSONEachRow',
+                     kafka_max_block_size = 1,
+                     kafka_poll_timeout_ms = 200;
 
-        producer = KafkaProducer(
-            bootstrap_servers="localhost:{}".format(cluster.kafka_port),
-            value_serializer=producer_serializer,
-            key_serializer=producer_serializer,
-        )
+        CREATE TABLE test.kafka3 (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'kafka_consumer_failover',
+                     kafka_group_name = 'kafka_consumer_failover_group',
+                     kafka_format = 'JSONEachRow',
+                     kafka_max_block_size = 1,
+                     kafka_poll_timeout_ms = 200;
 
-        ## all 3 attached, 2 working
-        producer.send(
-            topic=topic_name,
-            value=json.dumps({"key": 1, "value": 1}),
-            partition=0,
+        CREATE TABLE test.destination (
+            key UInt64,
+            value UInt64,
+            _consumed_by LowCardinality(String)
         )
-        producer.send(
-            topic=topic_name,
-            value=json.dumps({"key": 1, "value": 1}),
-            partition=1,
-        )
-        producer.flush()
+        ENGINE = MergeTree()
+        ORDER BY key;
 
-        count_query = "SELECT count() FROM test.destination"
-        prev_count = instance.query_with_retry(
-            count_query, check_callback=lambda res: int(res) > 0
-        )
+        CREATE MATERIALIZED VIEW test.kafka_mv TO test.destination AS
+        SELECT key, value, 'kafka' as _consumed_by
+        FROM test.kafka;
 
-        ## 2 attached, 2 working
-        instance.query("DETACH TABLE test.kafka1")
-        producer.send(
-            topic=topic_name,
-            value=json.dumps({"key": 2, "value": 2}),
-            partition=0,
-        )
-        producer.send(
-            topic=topic_name,
-            value=json.dumps({"key": 2, "value": 2}),
-            partition=1,
-        )
-        producer.flush()
-        prev_count = instance.query_with_retry(
-            count_query, check_callback=lambda res: int(res) > prev_count
-        )
+        CREATE MATERIALIZED VIEW test.kafka2_mv TO test.destination AS
+        SELECT key, value, 'kafka2' as _consumed_by
+        FROM test.kafka2;
 
-        ## 1 attached, 1 working
-        instance.query("DETACH TABLE test.kafka2")
-        producer.send(
-            topic=topic_name,
-            value=json.dumps({"key": 3, "value": 3}),
-            partition=0,
-        )
-        producer.send(
-            topic=topic_name,
-            value=json.dumps({"key": 3, "value": 3}),
-            partition=1,
-        )
-        producer.flush()
-        prev_count = instance.query_with_retry(
-            count_query, check_callback=lambda res: int(res) > prev_count
-        )
+        CREATE MATERIALIZED VIEW test.kafka3_mv TO test.destination AS
+        SELECT key, value, 'kafka3' as _consumed_by
+        FROM test.kafka3;
+        """
+    )
 
-        ## 2 attached, 2 working
-        instance.query("ATTACH TABLE test.kafka1")
-        producer.send(
-            topic=topic_name,
-            value=json.dumps({"key": 4, "value": 4}),
-            partition=0,
-        )
-        producer.send(
-            topic=topic_name,
-            value=json.dumps({"key": 4, "value": 4}),
-            partition=1,
-        )
-        producer.flush()
-        prev_count = instance.query_with_retry(
-            count_query, check_callback=lambda res: int(res) > prev_count
-        )
+    producer = KafkaProducer(
+        bootstrap_servers="localhost:{}".format(cluster.kafka_port),
+        value_serializer=producer_serializer,
+        key_serializer=producer_serializer,
+    )
 
-        ## 1 attached, 1 working
-        instance.query("DETACH TABLE test.kafka3")
-        producer.send(
-            topic=topic_name,
-            value=json.dumps({"key": 5, "value": 5}),
-            partition=0,
-        )
-        producer.send(
-            topic=topic_name,
-            value=json.dumps({"key": 5, "value": 5}),
-            partition=1,
-        )
-        producer.flush()
-        prev_count = instance.query_with_retry(
-            count_query, check_callback=lambda res: int(res) > prev_count
-        )
+    ## all 3 attached, 2 working
+    producer.send(
+        topic="kafka_consumer_failover",
+        value=json.dumps({"key": 1, "value": 1}),
+        partition=0,
+    )
+    producer.send(
+        topic="kafka_consumer_failover",
+        value=json.dumps({"key": 1, "value": 1}),
+        partition=1,
+    )
+    producer.flush()
+    prev_count = wait_for_new_data("test.destination")
 
-        ## 2 attached, 2 working
-        instance.query("ATTACH TABLE test.kafka2")
-        producer.send(
-            topic=topic_name,
-            value=json.dumps({"key": 6, "value": 6}),
-            partition=0,
-        )
-        producer.send(
-            topic=topic_name,
-            value=json.dumps({"key": 6, "value": 6}),
-            partition=1,
-        )
-        producer.flush()
-        prev_count = instance.query_with_retry(
-            count_query, check_callback=lambda res: int(res) > prev_count
-        )
+    ## 2 attached, 2 working
+    instance.query("DETACH TABLE test.kafka")
+    producer.send(
+        topic="kafka_consumer_failover",
+        value=json.dumps({"key": 2, "value": 2}),
+        partition=0,
+    )
+    producer.send(
+        topic="kafka_consumer_failover",
+        value=json.dumps({"key": 2, "value": 2}),
+        partition=1,
+    )
+    producer.flush()
+    prev_count = wait_for_new_data("test.destination", prev_count)
 
-        ## 3 attached, 2 working
-        instance.query("ATTACH TABLE test.kafka3")
-        producer.send(
-            topic=topic_name,
-            value=json.dumps({"key": 7, "value": 7}),
-            partition=0,
-        )
-        producer.send(
-            topic=topic_name,
-            value=json.dumps({"key": 7, "value": 7}),
-            partition=1,
-        )
-        producer.flush()
-        prev_count = instance.query_with_retry(
-            count_query, check_callback=lambda res: int(res) > prev_count
-        )
+    ## 1 attached, 1 working
+    instance.query("DETACH TABLE test.kafka2")
+    producer.send(
+        topic="kafka_consumer_failover",
+        value=json.dumps({"key": 3, "value": 3}),
+        partition=0,
+    )
+    producer.send(
+        topic="kafka_consumer_failover",
+        value=json.dumps({"key": 3, "value": 3}),
+        partition=1,
+    )
+    producer.flush()
+    prev_count = wait_for_new_data("test.destination", prev_count)
 
-        ## 2 attached, same 2 working
-        instance.query("DETACH TABLE test.kafka3")
-        producer.send(
-            topic=topic_name,
-            value=json.dumps({"key": 8, "value": 8}),
-            partition=0,
-        )
-        producer.send(
-            topic=topic_name,
-            value=json.dumps({"key": 8, "value": 8}),
-            partition=1,
-        )
-        producer.flush()
-        prev_count = instance.query_with_retry(
-            count_query, check_callback=lambda res: int(res) > prev_count
-        )
+    ## 2 attached, 2 working
+    instance.query("ATTACH TABLE test.kafka")
+    producer.send(
+        topic="kafka_consumer_failover",
+        value=json.dumps({"key": 4, "value": 4}),
+        partition=0,
+    )
+    producer.send(
+        topic="kafka_consumer_failover",
+        value=json.dumps({"key": 4, "value": 4}),
+        partition=1,
+    )
+    producer.flush()
+    prev_count = wait_for_new_data("test.destination", prev_count)
+
+    ## 1 attached, 1 working
+    instance.query("DETACH TABLE test.kafka3")
+    producer.send(
+        topic="kafka_consumer_failover",
+        value=json.dumps({"key": 5, "value": 5}),
+        partition=0,
+    )
+    producer.send(
+        topic="kafka_consumer_failover",
+        value=json.dumps({"key": 5, "value": 5}),
+        partition=1,
+    )
+    producer.flush()
+    prev_count = wait_for_new_data("test.destination", prev_count)
+
+    ## 2 attached, 2 working
+    instance.query("ATTACH TABLE test.kafka2")
+    producer.send(
+        topic="kafka_consumer_failover",
+        value=json.dumps({"key": 6, "value": 6}),
+        partition=0,
+    )
+    producer.send(
+        topic="kafka_consumer_failover",
+        value=json.dumps({"key": 6, "value": 6}),
+        partition=1,
+    )
+    producer.flush()
+    prev_count = wait_for_new_data("test.destination", prev_count)
+
+    ## 3 attached, 2 working
+    instance.query("ATTACH TABLE test.kafka3")
+    producer.send(
+        topic="kafka_consumer_failover",
+        value=json.dumps({"key": 7, "value": 7}),
+        partition=0,
+    )
+    producer.send(
+        topic="kafka_consumer_failover",
+        value=json.dumps({"key": 7, "value": 7}),
+        partition=1,
+    )
+    producer.flush()
+    prev_count = wait_for_new_data("test.destination", prev_count)
+
+    ## 2 attached, same 2 working
+    instance.query("DETACH TABLE test.kafka3")
+    producer.send(
+        topic="kafka_consumer_failover",
+        value=json.dumps({"key": 8, "value": 8}),
+        partition=0,
+    )
+    producer.send(
+        topic="kafka_consumer_failover",
+        value=json.dumps({"key": 8, "value": 8}),
+        partition=1,
+    )
+    producer.flush()
+    prev_count = wait_for_new_data("test.destination", prev_count)
+    kafka_delete_topic(admin_client, topic_name)
 
 
 def test_kafka_predefined_configuration(kafka_cluster):
@@ -4575,261 +4172,269 @@ def test_kafka_predefined_configuration(kafka_cluster):
 
 
 # https://github.com/ClickHouse/ClickHouse/issues/26643
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_issue26643(kafka_cluster, create_query_generator):
+def test_issue26643(kafka_cluster):
+    # for backporting:
+    # admin_client = KafkaAdminClient(bootstrap_servers="localhost:9092")
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
     producer = KafkaProducer(
         bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port),
         value_serializer=producer_serializer,
     )
-    topic_name = "test_issue26643" + get_topic_postfix(create_query_generator)
-    thread_per_consumer = must_use_thread_per_consumer(create_query_generator)
 
-    with kafka_topic(get_admin_client(kafka_cluster), topic_name):
-        msg = message_with_repeated_pb2.Message(
-            tnow=1629000000,
-            server="server1",
-            clien="host1",
-            sPort=443,
-            cPort=50000,
-            r=[
-                message_with_repeated_pb2.dd(
-                    name="1", type=444, ttl=123123, data=b"adsfasd"
-                ),
-                message_with_repeated_pb2.dd(name="2"),
-            ],
-            method="GET",
-        )
-
-        data = b""
-        serialized_msg = msg.SerializeToString()
-        data = data + _VarintBytes(len(serialized_msg)) + serialized_msg
-
-        msg = message_with_repeated_pb2.Message(tnow=1629000002)
-
-        serialized_msg = msg.SerializeToString()
-        data = data + _VarintBytes(len(serialized_msg)) + serialized_msg
-
-        producer.send(topic_name, value=data)
-
-        data = _VarintBytes(len(serialized_msg)) + serialized_msg
-        producer.send(topic_name, value=data)
-        producer.flush()
-
-        create_query = create_query_generator(
-            "test_queue",
-            """`tnow` UInt32,
-               `server` String,
-               `client` String,
-               `sPort` UInt16,
-               `cPort` UInt16,
-               `r.name` Array(String),
-               `r.class` Array(UInt16),
-               `r.type` Array(UInt16),
-               `r.ttl` Array(UInt32),
-               `r.data` Array(String),
-               `method` String""",
-            topic_list=topic_name,
-            consumer_group=f"{topic_name}_group",
-            format="Protobuf",
-            settings={
-                "kafka_schema": "message_with_repeated.proto:Message",
-                "kafka_skip_broken_messages": 10000,
-                "kafka_thread_per_consumer": thread_per_consumer,
-            },
-        )
-
-        instance.query(
-            f"""
-            {create_query};
-
-            SET allow_suspicious_low_cardinality_types=1;
-
-            CREATE TABLE test.log
-            (
-                `tnow` DateTime('Asia/Istanbul') CODEC(DoubleDelta, LZ4),
-                `server` LowCardinality(String),
-                `client` LowCardinality(String),
-                `sPort` LowCardinality(UInt16),
-                `cPort` UInt16 CODEC(T64, LZ4),
-                `r.name` Array(String),
-                `r.class` Array(LowCardinality(UInt16)),
-                `r.type` Array(LowCardinality(UInt16)),
-                `r.ttl` Array(LowCardinality(UInt32)),
-                `r.data` Array(String),
-                `method` LowCardinality(String)
-            )
-            ENGINE = MergeTree
-            PARTITION BY toYYYYMMDD(tnow)
-            ORDER BY (tnow, server)
-            TTL toDate(tnow) + toIntervalMonth(1000)
-            SETTINGS index_granularity = 16384, merge_with_ttl_timeout = 7200;
-
-            CREATE MATERIALIZED VIEW test.test_consumer TO test.log AS
-            SELECT
-                toDateTime(a.tnow) AS tnow,
-                a.server AS server,
-                a.client AS client,
-                a.sPort AS sPort,
-                a.cPort AS cPort,
-                a.`r.name` AS `r.name`,
-                a.`r.class` AS `r.class`,
-                a.`r.type` AS `r.type`,
-                a.`r.ttl` AS `r.ttl`,
-                a.`r.data` AS `r.data`,
-                a.method AS method
-            FROM test.test_queue AS a;
-            """
-        )
-
-        instance.wait_for_log_line("Committed offset")
-        result = instance.query("SELECT * FROM test.log")
-
-        expected = """\
-    2021-08-15 07:00:00	server1		443	50000	['1','2']	[0,0]	[444,0]	[123123,0]	['adsfasd','']	GET
-    2021-08-15 07:00:02			0	0	[]	[]	[]	[]	[]
-    2021-08-15 07:00:02			0	0	[]	[]	[]	[]	[]
-    """
-        assert TSV(result) == TSV(expected)
-
-
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_num_consumers_limit(kafka_cluster, create_query_generator):
-    instance.query("DROP TABLE IF EXISTS test.kafka")
-
-    thread_per_consumer = must_use_thread_per_consumer(create_query_generator)
-
-    create_query = create_query_generator(
-        "kafka",
-        "key UInt64, value UInt64",
-        settings={
-            "kafka_num_consumers": 100,
-            "kafka_thread_per_consumer": thread_per_consumer,
-        },
+    topic_list = []
+    topic_list.append(
+        NewTopic(name="test_issue26643", num_partitions=4, replication_factor=1)
     )
-    error = instance.query_and_get_error(create_query)
+    admin_client.create_topics(new_topics=topic_list, validate_only=False)
 
-    assert (
-        "BAD_ARGUMENTS" in error
-        and "The number of consumers can not be bigger than" in error
+    msg = message_with_repeated_pb2.Message(
+        tnow=1629000000,
+        server="server1",
+        clien="host1",
+        sPort=443,
+        cPort=50000,
+        r=[
+            message_with_repeated_pb2.dd(
+                name="1", type=444, ttl=123123, data=b"adsfasd"
+            ),
+            message_with_repeated_pb2.dd(name="2"),
+        ],
+        method="GET",
     )
 
+    data = b""
+    serialized_msg = msg.SerializeToString()
+    data = data + _VarintBytes(len(serialized_msg)) + serialized_msg
+
+    msg = message_with_repeated_pb2.Message(tnow=1629000002)
+
+    serialized_msg = msg.SerializeToString()
+    data = data + _VarintBytes(len(serialized_msg)) + serialized_msg
+
+    producer.send(topic="test_issue26643", value=data)
+
+    data = _VarintBytes(len(serialized_msg)) + serialized_msg
+    producer.send(topic="test_issue26643", value=data)
+    producer.flush()
+
     instance.query(
-        f"""
+        """
+        CREATE TABLE IF NOT EXISTS test.test_queue
+        (
+            `tnow` UInt32,
+            `server` String,
+            `client` String,
+            `sPort` UInt16,
+            `cPort` UInt16,
+            `r.name` Array(String),
+            `r.class` Array(UInt16),
+            `r.type` Array(UInt16),
+            `r.ttl` Array(UInt32),
+            `r.data` Array(String),
+            `method` String
+        )
+        ENGINE = Kafka
+        SETTINGS
+            kafka_broker_list = 'kafka1:19092',
+            kafka_topic_list = 'test_issue26643',
+            kafka_group_name = 'test_issue26643_group',
+            kafka_format = 'Protobuf',
+            kafka_schema = 'message_with_repeated.proto:Message',
+            kafka_num_consumers = 4,
+            kafka_skip_broken_messages = 10000;
+
+        SET allow_suspicious_low_cardinality_types=1;
+
+        CREATE TABLE test.log
+        (
+            `tnow` DateTime('Asia/Istanbul') CODEC(DoubleDelta, LZ4),
+            `server` LowCardinality(String),
+            `client` LowCardinality(String),
+            `sPort` LowCardinality(UInt16),
+            `cPort` UInt16 CODEC(T64, LZ4),
+            `r.name` Array(String),
+            `r.class` Array(LowCardinality(UInt16)),
+            `r.type` Array(LowCardinality(UInt16)),
+            `r.ttl` Array(LowCardinality(UInt32)),
+            `r.data` Array(String),
+            `method` LowCardinality(String)
+        )
+        ENGINE = MergeTree
+        PARTITION BY toYYYYMMDD(tnow)
+        ORDER BY (tnow, server)
+        TTL toDate(tnow) + toIntervalMonth(1000)
+        SETTINGS index_granularity = 16384, merge_with_ttl_timeout = 7200;
+
+        CREATE MATERIALIZED VIEW test.test_consumer TO test.log AS
+        SELECT
+            toDateTime(a.tnow) AS tnow,
+            a.server AS server,
+            a.client AS client,
+            a.sPort AS sPort,
+            a.cPort AS cPort,
+            a.`r.name` AS `r.name`,
+            a.`r.class` AS `r.class`,
+            a.`r.type` AS `r.type`,
+            a.`r.ttl` AS `r.ttl`,
+            a.`r.data` AS `r.data`,
+            a.method AS method
+        FROM test.test_queue AS a;
+        """
+    )
+
+    instance.wait_for_log_line("Committed offset")
+    result = instance.query("SELECT * FROM test.log")
+
+    expected = """\
+2021-08-15 07:00:00	server1		443	50000	['1','2']	[0,0]	[444,0]	[123123,0]	['adsfasd','']	GET
+2021-08-15 07:00:02			0	0	[]	[]	[]	[]	[]
+2021-08-15 07:00:02			0	0	[]	[]	[]	[]	[]
+"""
+    assert TSV(result) == TSV(expected)
+
+    # kafka_cluster.open_bash_shell('instance')
+
+
+def test_num_consumers_limit(kafka_cluster):
+    instance.query("DROP TABLE IF EXISTS test.kafka")
+
+    error = instance.query_and_get_error(
+        """
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka('{kafka_broker}:19092', '{kafka_topic_old}', '{kafka_group_name_old}', '{kafka_format_json_each_row}', '\\n', '', 100)
+            SETTINGS kafka_commit_on_select = 1;
+        """
+    )
+
+    assert "BAD_ARGUMENTS" in error
+
+    instance.query(
+        """
         SET kafka_disable_num_consumers_limit = 1;
-        {create_query};
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka('{kafka_broker}:19092', '{kafka_topic_old}', '{kafka_group_name_old}', '{kafka_format_json_each_row}', '\\n', '', 100)
+            SETTINGS kafka_commit_on_select = 1;
         """
     )
 
     instance.query("DROP TABLE test.kafka")
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_format_with_prefix_and_suffix(kafka_cluster, create_query_generator):
-    topic_name = "custom" + get_topic_postfix(create_query_generator)
-
-    with kafka_topic(get_admin_client(kafka_cluster), topic_name):
-        create_query = create_query_generator(
-            "kafka",
-            "key UInt64, value UInt64",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-            format="CustomSeparated",
-        )
-        instance.query(
-            f"""
-            DROP TABLE IF EXISTS test.kafka;
-            {create_query};
-            """
-        )
-
-        instance.query(
-            "INSERT INTO test.kafka select number*10 as key, number*100 as value from numbers(2) settings format_custom_result_before_delimiter='<prefix>\n', format_custom_result_after_delimiter='<suffix>\n'"
-        )
-
-        message_count = 2
-        messages = kafka_consume_with_retry(kafka_cluster, topic_name, message_count)
-
-        assert len(messages) == 2
-
-        assert (
-            "".join(messages)
-            == "<prefix>\n0\t0\n<suffix>\n<prefix>\n10\t100\n<suffix>\n"
-        )
-
-
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_max_rows_per_message(kafka_cluster, create_query_generator):
-    topic_name = "custom_max_rows_per_message" + get_topic_postfix(
-        create_query_generator
+def test_format_with_prefix_and_suffix(kafka_cluster):
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
     )
 
-    with kafka_topic(get_admin_client(kafka_cluster), topic_name):
-        num_rows = 5
+    kafka_create_topic(admin_client, "custom")
 
-        create_query = create_query_generator(
-            "kafka",
-            "key UInt64, value UInt64",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-            format="CustomSeparated",
-            settings={
-                "format_custom_result_before_delimiter": "<prefix>\n",
-                "format_custom_result_after_delimiter": "<suffix>\n",
-                "kafka_max_rows_per_message": 3,
-            },
-        )
-        instance.query(
-            f"""
-            DROP TABLE IF EXISTS test.view;
-            DROP TABLE IF EXISTS test.kafka;
-            {create_query};
-
-            CREATE MATERIALIZED VIEW test.view ENGINE=MergeTree ORDER BY (key, value) AS
-                SELECT key, value FROM test.kafka;
+    instance.query(
         """
-        )
+        DROP TABLE IF EXISTS test.kafka;
 
-        instance.query(
-            f"INSERT INTO test.kafka select number*10 as key, number*100 as value from numbers({num_rows}) settings format_custom_result_before_delimiter='<prefix>\n', format_custom_result_after_delimiter='<suffix>\n'"
-        )
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'custom',
+                     kafka_group_name = 'custom',
+                     kafka_format = 'CustomSeparated';
+    """
+    )
 
-        message_count = 2
-        messages = kafka_consume_with_retry(kafka_cluster, topic_name, message_count)
+    instance.query(
+        "INSERT INTO test.kafka select number*10 as key, number*100 as value from numbers(2) settings format_custom_result_before_delimiter='<prefix>\n', format_custom_result_after_delimiter='<suffix>\n'"
+    )
 
-        assert len(messages) == message_count
+    messages = []
 
-        assert (
-            "".join(messages)
-            == "<prefix>\n0\t0\n10\t100\n20\t200\n<suffix>\n<prefix>\n30\t300\n40\t400\n<suffix>\n"
-        )
+    attempt = 0
+    while attempt < 100:
+        messages.extend(kafka_consume(kafka_cluster, "custom"))
+        if len(messages) == 2:
+            break
+        attempt += 1
 
-        instance.query_with_retry(
-            "SELECT count() FROM test.view",
-            check_callback=lambda res: int(res) == num_rows,
-        )
+    assert len(messages) == 2
 
-        result = instance.query("SELECT * FROM test.view")
-        assert result == "0\t0\n10\t100\n20\t200\n30\t300\n40\t400\n"
+    assert (
+        "".join(messages) == "<prefix>\n0\t0\n<suffix>\n<prefix>\n10\t100\n<suffix>\n"
+    )
+
+    kafka_delete_topic(admin_client, "custom")
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_row_based_formats(kafka_cluster, create_query_generator):
-    admin_client = get_admin_client(kafka_cluster)
+def test_max_rows_per_message(kafka_cluster):
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
+
+    topic = "custom_max_rows_per_message"
+
+    kafka_create_topic(admin_client, topic)
+
+    num_rows = 5
+
+    instance.query(
+        f"""
+        DROP TABLE IF EXISTS test.view;
+        DROP TABLE IF EXISTS test.kafka;
+
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = '{topic}',
+                     kafka_group_name = '{topic}',
+                     kafka_format = 'CustomSeparated',
+                     format_custom_result_before_delimiter = '<prefix>\n',
+                     format_custom_result_after_delimiter = '<suffix>\n',
+                     kafka_max_rows_per_message = 3;
+
+        CREATE MATERIALIZED VIEW test.view Engine=Log AS
+            SELECT key, value FROM test.kafka;
+    """
+    )
+
+    instance.query(
+        f"INSERT INTO test.kafka select number*10 as key, number*100 as value from numbers({num_rows}) settings format_custom_result_before_delimiter='<prefix>\n', format_custom_result_after_delimiter='<suffix>\n'"
+    )
+
+    messages = []
+
+    attempt = 0
+    while attempt < 500:
+        messages.extend(kafka_consume(kafka_cluster, topic))
+        if len(messages) == 2:
+            break
+        attempt += 1
+
+    assert len(messages) == 2
+
+    assert (
+        "".join(messages)
+        == "<prefix>\n0\t0\n10\t100\n20\t200\n<suffix>\n<prefix>\n30\t300\n40\t400\n<suffix>\n"
+    )
+
+    attempt = 0
+    rows = 0
+    while attempt < 500:
+        rows = int(instance.query("SELECT count() FROM test.view"))
+        if rows == num_rows:
+            break
+        attempt += 1
+
+    assert rows == num_rows
+
+    result = instance.query("SELECT * FROM test.view")
+    assert result == "0\t0\n10\t100\n20\t200\n30\t300\n40\t400\n"
+
+    kafka_delete_topic(admin_client, topic)
+
+
+def test_row_based_formats(kafka_cluster):
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
 
     for format_name in [
         "TSV",
@@ -4849,111 +4454,121 @@ def test_row_based_formats(kafka_cluster, create_query_generator):
         "RowBinaryWithNamesAndTypes",
         "MsgPack",
     ]:
-        logging.debug("Checking {format_name}")
+        print(format_name)
 
-        topic_name = format_name + get_topic_postfix(create_query_generator)
-        table_name = f"kafka_{format_name}"
+        kafka_create_topic(admin_client, format_name)
 
-        with kafka_topic(admin_client, topic_name):
-            num_rows = 10
-            max_rows_per_message = 5
-            message_count = num_rows / max_rows_per_message
+        num_rows = 10
 
-            create_query = create_query_generator(
-                table_name,
-                "key UInt64, value UInt64",
-                topic_list=topic_name,
-                consumer_group=topic_name,
-                format=format_name,
-                settings={"kafka_max_rows_per_message": max_rows_per_message},
-            )
-
-            instance.query(
-                f"""
-                DROP TABLE IF EXISTS test.view;
-                DROP TABLE IF EXISTS test.{table_name};
-
-                {create_query};
-
-                CREATE MATERIALIZED VIEW test.view ENGINE=MergeTree ORDER BY (key, value) AS
-                    SELECT key, value FROM test.{table_name};
-
-                INSERT INTO test.{table_name} SELECT number * 10 as key, number * 100 as value FROM numbers({num_rows});
-            """
-            )
-
-            messages = kafka_consume_with_retry(
-                kafka_cluster, topic_name, message_count, need_decode=False
-            )
-
-            assert len(messages) == message_count
-
-            instance.query_with_retry(
-                "SELECT count() FROM test.view",
-                check_callback=lambda res: int(res) == num_rows,
-            )
-
-            result = instance.query("SELECT * FROM test.view")
-            expected = ""
-            for i in range(num_rows):
-                expected += str(i * 10) + "\t" + str(i * 100) + "\n"
-            assert result == expected
-
-
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_block_based_formats_1(kafka_cluster, create_query_generator):
-    topic_name = "pretty_space" + get_topic_postfix(create_query_generator)
-
-    with kafka_topic(get_admin_client(kafka_cluster), topic_name):
-        create_query = create_query_generator(
-            "kafka",
-            "key UInt64, value UInt64",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-            format="PrettySpace",
-        )
         instance.query(
             f"""
+            DROP TABLE IF EXISTS test.view;
             DROP TABLE IF EXISTS test.kafka;
 
-            {create_query};
+            CREATE TABLE test.kafka (key UInt64, value UInt64)
+                ENGINE = Kafka
+                SETTINGS kafka_broker_list = 'kafka1:19092',
+                         kafka_topic_list = '{format_name}',
+                         kafka_group_name = '{format_name}',
+                         kafka_format = '{format_name}',
+                         kafka_max_rows_per_message = 5;
 
-            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;
+            CREATE MATERIALIZED VIEW test.view Engine=Log AS
+                SELECT key, value FROM test.kafka;
+
+            INSERT INTO test.kafka SELECT number * 10 as key, number * 100 as value FROM numbers({num_rows});
         """
         )
 
-        message_count = 3
-        messages = kafka_consume_with_retry(kafka_cluster, topic_name, message_count)
-        assert len(messages) == 3
+        messages = []
 
-        data = []
-        for message in messages:
-            splitted = message.split("\n")
-            assert splitted[0] == " \x1b[1mkey\x1b[0m   \x1b[1mvalue\x1b[0m"
-            assert splitted[1] == ""
-            assert splitted[-1] == ""
-            data += [line.split() for line in splitted[2:-1]]
+        attempt = 0
+        while attempt < 500:
+            messages.extend(kafka_consume(kafka_cluster, format_name, needDecode=False))
+            if len(messages) == 2:
+                break
+            attempt += 1
 
-        assert data == [
-            ["0", "0"],
-            ["10", "100"],
-            ["20", "200"],
-            ["30", "300"],
-            ["40", "400"],
-        ]
+        assert len(messages) == 2
+
+        attempt = 0
+        rows = 0
+        while attempt < 500:
+            rows = int(instance.query("SELECT count() FROM test.view"))
+            if rows == num_rows:
+                break
+            attempt += 1
+
+        assert rows == num_rows
+
+        result = instance.query("SELECT * FROM test.view")
+        expected = ""
+        for i in range(num_rows):
+            expected += str(i * 10) + "\t" + str(i * 100) + "\n"
+        assert result == expected
+
+        kafka_delete_topic(admin_client, format_name)
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_block_based_formats_2(kafka_cluster, create_query_generator):
-    admin_client = get_admin_client(kafka_cluster)
+def test_block_based_formats_1(kafka_cluster):
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
+
+    topic = "pretty_space"
+    kafka_create_topic(admin_client, topic)
+
+    instance.query(
+        f"""
+        DROP TABLE IF EXISTS test.kafka;
+
+        CREATE TABLE test.kafka (key UInt64, value UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = '{topic}',
+                     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, output_format_pretty_color=1, output_format_pretty_row_numbers=0;
+    """
+    )
+
+    messages = []
+
+    attempt = 0
+    while attempt < 500:
+        messages.extend(kafka_consume(kafka_cluster, topic))
+        if len(messages) == 3:
+            break
+        attempt += 1
+
+    assert len(messages) == 3
+
+    data = []
+    for message in messages:
+        splitted = message.split("\n")
+        assert splitted[0] == " \x1b[1mkey\x1b[0m   \x1b[1mvalue\x1b[0m"
+        assert splitted[1] == ""
+        assert splitted[-1] == ""
+        data += [line.split() for line in splitted[2:-1]]
+
+    assert data == [
+        ["0", "0"],
+        ["10", "100"],
+        ["20", "200"],
+        ["30", "300"],
+        ["40", "400"],
+    ]
+
+    kafka_delete_topic(admin_client, topic)
+
+
+def test_block_based_formats_2(kafka_cluster):
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
+
     num_rows = 100
-    message_count = 9
 
     for format_name in [
         "JSONColumns",
@@ -4963,50 +4578,55 @@ def test_block_based_formats_2(kafka_cluster, create_query_generator):
         "ORC",
         "JSONCompactColumns",
     ]:
-        topic_name = format_name + get_topic_postfix(create_query_generator)
-        table_name = f"kafka_{format_name}"
-        logging.debug(f"Checking format {format_name}")
-        with kafka_topic(admin_client, topic_name):
-            create_query = create_query_generator(
-                table_name,
-                "key UInt64, value UInt64",
-                topic_list=topic_name,
-                consumer_group=topic_name,
-                format=format_name,
-            )
+        kafka_create_topic(admin_client, format_name)
 
-            instance.query(
-                f"""
-                DROP TABLE IF EXISTS test.view;
-                DROP TABLE IF EXISTS test.{table_name};
+        instance.query(
+            f"""
+            DROP TABLE IF EXISTS test.view;
+            DROP TABLE IF EXISTS test.kafka;
 
-                {create_query};
+            CREATE TABLE test.kafka (key UInt64, value UInt64)
+                ENGINE = Kafka
+                SETTINGS kafka_broker_list = 'kafka1:19092',
+                         kafka_topic_list = '{format_name}',
+                         kafka_group_name = '{format_name}',
+                         kafka_format = '{format_name}';
 
-                CREATE MATERIALIZED VIEW test.view ENGINE=MergeTree ORDER BY (key, value) AS
-                    SELECT key, value FROM test.{table_name};
+            CREATE MATERIALIZED VIEW test.view Engine=Log AS
+                SELECT key, value FROM test.kafka;
 
-                INSERT INTO test.{table_name} SELECT number * 10 as key, number * 100 as value FROM numbers({num_rows}) settings max_block_size=12, optimize_trivial_insert_select=0;
-            """
-            )
-            messages = kafka_consume_with_retry(
-                kafka_cluster, topic_name, message_count, need_decode=False
-            )
-            assert len(messages) == message_count
+            INSERT INTO test.kafka SELECT number * 10 as key, number * 100 as value FROM numbers({num_rows}) settings max_block_size=12, optimize_trivial_insert_select=0;
+        """
+        )
 
-            rows = int(
-                instance.query_with_retry(
-                    "SELECT count() FROM test.view",
-                    check_callback=lambda res: int(res) == num_rows,
-                )
-            )
+        messages = []
 
-            assert rows == num_rows
+        attempt = 0
+        while attempt < 500:
+            messages.extend(kafka_consume(kafka_cluster, format_name, needDecode=False))
+            if len(messages) == 9:
+                break
+            attempt += 1
 
-            result = instance.query("SELECT * FROM test.view ORDER by key")
-            expected = ""
-            for i in range(num_rows):
-                expected += str(i * 10) + "\t" + str(i * 100) + "\n"
-            assert result == expected
+        assert len(messages) == 9
+
+        attempt = 0
+        rows = 0
+        while attempt < 500:
+            rows = int(instance.query("SELECT count() FROM test.view"))
+            if rows == num_rows:
+                break
+            attempt += 1
+
+        assert rows == num_rows
+
+        result = instance.query("SELECT * FROM test.view ORDER by key")
+        expected = ""
+        for i in range(num_rows):
+            expected += str(i * 10) + "\t" + str(i * 100) + "\n"
+        assert result == expected
+
+        kafka_delete_topic(admin_client, format_name)
 
 
 def test_system_kafka_consumers(kafka_cluster):
@@ -5151,7 +4771,7 @@ def test_system_kafka_consumers_rebalance(kafka_cluster, max_retries=15):
           assignments.current_offset,
           if(length(exceptions.time)>0, exceptions.time[1]::String, 'never') as last_exception_time_,
           if(length(exceptions.text)>0, exceptions.text[1], 'no exception') as last_exception_,
-          stable_timestamp(last_poll_time) as last_poll_time_, stable_timestamp(last_commit_time) as last_commit_time_,
+          stable_timestamp(last_poll_time) as last_poll_time_, num_messages_read, stable_timestamp(last_commit_time) as last_commit_time_,
           num_commits, stable_timestamp(last_rebalance_time) as last_rebalance_time_,
           num_rebalance_revocations, num_rebalance_assignments, is_currently_used
           FROM system.kafka_consumers WHERE database='test' and table IN ('kafka', 'kafka2') format Vertical;
@@ -5171,6 +4791,7 @@ assignments.current_offset: [2]
 last_exception_time_:       never
 last_exception_:            no exception
 last_poll_time_:            now
+num_messages_read:          4
 last_commit_time_:          now
 num_commits:                2
 last_rebalance_time_:       now
@@ -5189,6 +4810,7 @@ assignments.current_offset: [2]
 last_exception_time_:       never
 last_exception_:            no exception
 last_poll_time_:            now
+num_messages_read:          1
 last_commit_time_:          now
 num_commits:                1
 last_rebalance_time_:       never
@@ -5342,186 +4964,137 @@ def test_formats_errors(kafka_cluster):
         "HiveText",
         "MySQLDump",
     ]:
-        with kafka_topic(admin_client, format_name):
-            table_name = f"kafka_{format_name}"
+        kafka_create_topic(admin_client, format_name)
+        table_name = f"kafka_{format_name}"
 
-            instance.query(
-                f"""
-                DROP TABLE IF EXISTS test.view;
-                DROP TABLE IF EXISTS test.{table_name};
-
-                CREATE TABLE test.{table_name} (key UInt64, value UInt64)
-                    ENGINE = Kafka
-                    SETTINGS kafka_broker_list = 'kafka1:19092',
-                            kafka_topic_list = '{format_name}',
-                            kafka_group_name = '{format_name}',
-                            kafka_format = '{format_name}',
-                            kafka_max_rows_per_message = 5,
-                            format_template_row='template_row.format',
-                            format_regexp='id: (.+?)',
-                            input_format_with_names_use_header=0,
-                            format_schema='key_value_message:Message';
-
-                CREATE MATERIALIZED VIEW test.view ENGINE=MergeTree ORDER BY (key, value) AS
-                    SELECT key, value FROM test.{table_name};
-            """
-            )
-
-            kafka_produce(
-                kafka_cluster,
-                format_name,
-                ["Broken message\nBroken message\nBroken message\n"],
-            )
-
-            num_errors = int(
-                instance.query_with_retry(
-                    f"SELECT length(exceptions.text) from system.kafka_consumers where database = 'test' and table = '{table_name}'",
-                    check_callback=lambda res: int(res) > 0,
-                )
-            )
-
-            assert num_errors > 0
-
-            instance.query(f"DROP TABLE test.{table_name}")
-            instance.query("DROP TABLE test.view")
-
-
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_multiple_read_in_materialized_views(kafka_cluster, create_query_generator):
-    topic_name = "multiple_read_from_mv" + get_topic_postfix(create_query_generator)
-
-    with kafka_topic(get_admin_client(kafka_cluster), topic_name):
-        create_query = create_query_generator(
-            "kafka_multiple_read_input",
-            "id Int64",
-            topic_list=topic_name,
-            consumer_group=topic_name,
-        )
         instance.query(
             f"""
-            DROP TABLE IF EXISTS test.kafka_multiple_read_input SYNC;
-            DROP TABLE IF EXISTS test.kafka_multiple_read_table;
-            DROP TABLE IF EXISTS test.kafka_multiple_read_mv;
+            DROP TABLE IF EXISTS test.view;
+            DROP TABLE IF EXISTS test.{table_name};
 
-            {create_query};
+            CREATE TABLE test.{table_name} (key UInt64, value UInt64)
+                ENGINE = Kafka
+                SETTINGS kafka_broker_list = 'kafka1:19092',
+                         kafka_topic_list = '{format_name}',
+                         kafka_group_name = '{format_name}',
+                         kafka_format = '{format_name}',
+                         kafka_max_rows_per_message = 5,
+                         format_template_row='template_row.format',
+                         format_regexp='id: (.+?)',
+                         input_format_with_names_use_header=0,
+                         format_schema='key_value_message:Message';
 
-            CREATE TABLE test.kafka_multiple_read_table (id Int64)
-            ENGINE = MergeTree
-            ORDER BY id;
-
-
-            CREATE MATERIALIZED VIEW 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
-                )
-            );
-            """
+            CREATE MATERIALIZED VIEW test.view Engine=Log AS
+                SELECT key, value FROM test.{table_name};
+        """
         )
 
         kafka_produce(
-            kafka_cluster, topic_name, [json.dumps({"id": 42}), json.dumps({"id": 43})]
+            kafka_cluster,
+            format_name,
+            ["Broken message\nBroken message\nBroken message\n"],
         )
 
-        expected_result = "42\n43\n"
-        res = instance.query_with_retry(
-            f"SELECT id FROM test.kafka_multiple_read_table ORDER BY id",
-            check_callback=lambda res: res == expected_result,
-        )
-        assert res == expected_result
+        attempt = 0
+        num_errors = 0
+        while attempt < 200:
+            num_errors = int(
+                instance.query(
+                    f"SELECT length(exceptions.text) from system.kafka_consumers where database = 'test' and table = '{table_name}'"
+                )
+            )
+            if num_errors > 0:
+                break
+            attempt += 1
 
-        # Verify that the query deduplicates the records as it meant to be
-        messages = []
-        for _ in range(0, 10):
-            messages.append(json.dumps({"id": 42}))
-            messages.append(json.dumps({"id": 43}))
+        assert num_errors > 0
 
-        messages.append(json.dumps({"id": 44}))
-
-        kafka_produce(kafka_cluster, topic_name, messages)
-
-        expected_result = "42\n43\n44\n"
-        res = instance.query_with_retry(
-            f"SELECT id FROM test.kafka_multiple_read_table ORDER BY id",
-            check_callback=lambda res: res == expected_result,
-        )
-        assert res == expected_result
-
-        instance.query(
-            f"""
-            DROP TABLE test.kafka_multiple_read_input;
-            DROP TABLE test.kafka_multiple_read_table;
-            DROP TABLE test.kafka_multiple_read_mv;
-            """
-        )
+        kafka_delete_topic(admin_client, format_name)
+        instance.query(f"DROP TABLE test.{table_name}")
+        instance.query("DROP TABLE test.view")
 
 
-@pytest.mark.parametrize(
-    "create_query_generator",
-    [generate_old_create_table_query, generate_new_create_table_query],
-)
-def test_kafka_null_message(kafka_cluster, create_query_generator):
-    topic_name = "null_message"
+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.null_message_view;
-        DROP TABLE IF EXISTS test.null_message_consumer;
-        DROP TABLE IF EXISTS test.null_message_kafka;
+        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_query_generator("null_message_kafka", "value UInt64", topic_list=topic_name, consumer_group="mv")};
-        CREATE TABLE test.null_message_view (value UInt64)
-            ENGINE = MergeTree()
-            ORDER BY value;
-        CREATE MATERIALIZED VIEW test.null_message_consumer TO test.null_message_view AS
-            SELECT * FROM test.null_message_kafka;
-    """
+        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
+            )
+        );
+        """
     )
 
-    message_key_values = []
-    for i in range(5):
-        # Here the key is key for Kafka message
-        message = json.dumps({"value": i}) if i != 3 else None
-        message_key_values.append({"key": f"{i}".encode(), "message": message})
-
-    producer = get_kafka_producer(kafka_cluster.kafka_port, producer_serializer, 15)
-    for message_kv in message_key_values:
-        producer.send(
-            topic=topic_name, key=message_kv["key"], value=message_kv["message"]
-        )
-        producer.flush()
-
-    expected = TSV(
-        """
-0
-1
-2
-4
-"""
+    kafka_produce(
+        kafka_cluster, topic, [json.dumps({"id": 42}), json.dumps({"id": 43})]
     )
-    with existing_kafka_topic(get_admin_client(kafka_cluster), topic_name):
-        result = instance.query_with_retry(
-            "SELECT * FROM test.null_message_view",
-            check_callback=lambda res: TSV(res) == expected,
-        )
 
-        assert expected == TSV(result)
+    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
 
-        instance.query(
-            """
-            DROP TABLE test.null_message_consumer SYNC;
-            DROP TABLE test.null_message_view;
-            DROP TABLE test.null_message_kafka SYNC;
+    # 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__":
diff --git a/tests/integration/test_aliases_in_default_expr_not_break_table_structure/__init__.py b/tests/integration/test_storage_kerberized_hdfs/__init__.py
similarity index 100%
rename from tests/integration/test_aliases_in_default_expr_not_break_table_structure/__init__.py
rename to tests/integration/test_storage_kerberized_hdfs/__init__.py
diff --git a/tests/integration/test_storage_kerberized_hdfs/configs/hdfs.xml b/tests/integration/test_storage_kerberized_hdfs/configs/hdfs.xml
new file mode 100644
index 00000000000..2e9dc6cc06c
--- /dev/null
+++ b/tests/integration/test_storage_kerberized_hdfs/configs/hdfs.xml
@@ -0,0 +1,13 @@
+<clickhouse>
+  <hdfs>
+		<hadoop_kerberos_keytab>/tmp/keytab/clickhouse.keytab</hadoop_kerberos_keytab>
+		<hadoop_kerberos_principal>root@TEST.CLICKHOUSE.TECH</hadoop_kerberos_principal>
+		<hadoop_security_authentication>kerberos</hadoop_security_authentication>
+  </hdfs>
+  <hdfs_suser>
+		<hadoop_kerberos_principal>specuser@TEST.CLICKHOUSE.TECH</hadoop_kerberos_principal>
+  </hdfs_suser>
+  <hdfs_dedicatedcachepath>
+		<hadoop_security_kerberos_ticket_cache_path>/tmp/kerb_cache</hadoop_security_kerberos_ticket_cache_path>
+  </hdfs_dedicatedcachepath>
+</clickhouse>
diff --git a/tests/integration/test_storage_kerberized_hdfs/hdfs_configs/bootstrap.sh b/tests/integration/test_storage_kerberized_hdfs/hdfs_configs/bootstrap.sh
new file mode 100755
index 00000000000..db6921bc1c8
--- /dev/null
+++ b/tests/integration/test_storage_kerberized_hdfs/hdfs_configs/bootstrap.sh
@@ -0,0 +1,280 @@
+#!/bin/bash
+
+: "${HADOOP_PREFIX:=/usr/local/hadoop}"
+
+cat >> $HADOOP_PREFIX/etc/hadoop/hadoop-env.sh <<EOF
+export HADOOP_SECURE_DN_USER=hdfs
+export HADOOP_SECURE_DN_PID_DIR=$HADOOP_PREFIX/pid
+export HADOOP_SECURE_DN_LOG_DIR=$HADOOP_PREFIX/logs/hdfs
+export JSVC_HOME=$HADOOP_PREFIX/sbin
+EOF
+$HADOOP_PREFIX/etc/hadoop/hadoop-env.sh
+
+mkdir -p "${HADOOP_SECURE_DN_PID_DIR}"
+mkdir -p "${HADOOP_SECURE_DN_LOG_DIR}"
+
+rm /tmp/*.pid
+
+# installing libraries if any - (resource urls added comma separated to the ACP system variable)
+cd "${HADOOP_PREFIX}/share/hadoop/common" || exit
+for cp in ${ACP//,/ }; do  echo "== ${cp}"; curl -LO "${cp}" ; done;
+cd - || exit
+
+# altering the core-site configuration
+sed "s/HOSTNAME/${HOSTNAME}/" /usr/local/hadoop/etc/hadoop/core-site.xml.template | grep -v '/configuration' > /usr/local/hadoop/etc/hadoop/core-site.xml
+
+cat >> /usr/local/hadoop/etc/hadoop/core-site.xml << EOF
+  <property>
+    <name>hadoop.security.authentication</name>
+    <value>kerberos</value> <!-- A value of "simple" would disable security. -->
+  </property>
+   <property>
+     <name>hadoop.security.authorization</name>
+     <value>true</value>
+   </property>
+  <property>
+    <name>fs.defaultFS</name>
+    <value>hdfs://kerberizedhdfs1:9010</value>
+  </property>
+  <property>
+    <name>fs.default.name</name>
+    <value>hdfs://kerberizedhdfs1:9010</value>
+  </property>
+  <!--
+  <property>
+      <name>hadoop.rpc.protection</name>
+      <value>privacy</value>
+  </property>
+  -->
+</configuration>
+EOF
+
+
+cat > /usr/local/hadoop/etc/hadoop/hdfs-site.xml << EOF
+<configuration>
+<!--
+<property>
+	<name>dfs.permissions.enabled</name>
+	<value>false</value>
+</property>
+-->
+<property>
+  <name>dfs.replication</name>
+  <value>1</value>
+</property>
+<!-- General HDFS security config -->
+<property>
+  <name>dfs.block.access.token.enable</name>
+  <value>true</value>
+</property>
+<!-- NameNode security config -->
+<property>
+  <name>dfs.namenode.keytab.file</name>
+  <value>/usr/local/hadoop/etc/hadoop/conf/hdfs.keytab</value> <!-- path to the HDFS keytab -->
+</property>
+<property>
+  <name>dfs.namenode.kerberos.principal</name>
+  <value>hdfs/_HOST@TEST.CLICKHOUSE.TECH</value>
+</property>
+<property>
+  <name>dfs.namenode.kerberos.internal.spnego.principal</name>
+  <value>HTTP/_HOST@TEST.CLICKHOUSE.TECH</value>
+</property>
+<!-- Secondary NameNode security config -->
+<property>
+  <name>dfs.secondary.namenode.keytab.file</name>
+  <value>/usr/local/hadoop/etc/hadoop/conf/hdfs.keytab</value> <!-- path to the HDFS keytab -->
+</property>
+<property>
+  <name>dfs.secondary.namenode.kerberos.principal</name>
+  <value>hdfs/_HOST@TEST.CLICKHOUSE.TECH</value>
+</property>
+<property>
+  <name>dfs.secondary.namenode.kerberos.internal.spnego.principal</name>
+  <value>HTTP/_HOST@TEST.CLICKHOUSE.TECH</value>
+</property>
+<!-- DataNode security config
+<property>
+   <name>dfs.data.transfer.protectionл</name>
+   <value>integrity</value>
+</property>
+-->
+<property>
+  <name>dfs.datanode.data.dir.perm</name>
+  <value>700</value>
+</property>
+<property>
+  <name>dfs.datanode.address</name>
+  <value>0.0.0.0:1004</value>
+</property>
+<property>
+  <name>dfs.datanode.http.address</name>
+  <value>0.0.0.0:1006</value>
+</property>
+<!-- If the port is 0 then the server will start on a free port. -->
+<property>
+  <name>dfs.datanode.ipc.address</name>
+  <value>0.0.0.0:0</value>
+</property>
+<property>
+  <name>dfs.namenode.secondary.http-address</name>
+  <value>0.0.0.0:0</value>
+</property>
+<property>
+  <name>dfs.namenode.backup.address</name>
+  <value>0.0.0.0:0</value>
+</property>
+<property>
+  <name>dfs.namenode.backup.http-address</name>
+  <value>0.0.0.0:0</value>
+</property>
+<!--
+<property>
+  <name>dfs.http.policy</name>
+  <value>HTTPS_ONLY</value>
+</property>
+-->
+
+
+<property>
+  <name>dfs.datanode.keytab.file</name>
+  <value>/usr/local/hadoop/etc/hadoop/conf/hdfs.keytab</value> <!-- path to the HDFS keytab -->
+</property>
+<property>
+  <name>dfs.datanode.kerberos.principal</name>
+  <value>hdfs/_HOST@TEST.CLICKHOUSE.TECH</value>
+</property>
+
+<!-- Web Authentication config -->
+<property>
+    <name>dfs.webhdfs.enabled</name>
+    <value>true</value>
+</property>
+<property>
+<name>dfs.encrypt.data.transfer</name>
+<value>false</value>
+</property>
+<property>
+  <name>dfs.web.authentication.kerberos.principal</name>
+  <value>HTTP/_HOST@TEST.CLICKHOUSE.TECH</value>
+</property>
+<property>
+    <name>dfs.web.authentication.kerberos.keytab</name>
+  <value>/usr/local/hadoop/etc/hadoop/conf/hdfs.keytab</value> <!-- path to the HDFS keytab -->
+</property>
+</configuration>
+EOF
+
+
+
+# cat > /usr/local/hadoop/etc/hadoop/ssl-server.xml << EOF
+# <configuration>
+# <property>
+#   <name>ssl.server.truststore.location</name>
+#   <value>/usr/local/hadoop/etc/hadoop/conf/hdfs.jks</value>
+# </property>
+# <property>
+#   <name>ssl.server.truststore.password</name>
+#   <value>masterkey</value>
+# </property>
+# <property>
+#   <name>ssl.server.keystore.location</name>
+#   <value>/usr/local/hadoop/etc/hadoop/conf/hdfs.jks</value>
+# </property>
+# <property>
+#   <name>ssl.server.keystore.password</name>
+#   <value>masterkey</value>
+# </property>
+# <property>
+#   <name>ssl.server.keystore.keypassword</name>
+#   <value>masterkey</value>
+# </property>
+# </configuration>
+# EOF
+
+cat > /usr/local/hadoop/etc/hadoop/log4j.properties << EOF
+# Set everything to be logged to the console
+log4j.rootCategory=DEBUG, console
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.target=System.err
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n
+
+# Set the default spark-shell log level to WARN. When running the spark-shell, the
+# log level for this class is used to overwrite the root logger's log level, so that
+# the user can have different defaults for the shell and regular Spark apps.
+log4j.logger.org.apache.spark.repl.Main=INFO
+
+# Settings to quiet third party logs that are too verbose
+log4j.logger.org.spark_project.jetty=DEBUG
+log4j.logger.org.spark_project.jetty.util.component.AbstractLifeCycle=ERROR
+log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO
+log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO
+log4j.logger.org.apache.parquet=ERROR
+log4j.logger.parquet=ERROR
+
+# SPARK-9183: Settings to avoid annoying messages when looking up nonexistent UDFs in SparkSQL with Hive support
+log4j.logger.org.apache.hadoop.hive.metastore.RetryingHMSHandler=FATAL
+log4j.logger.org.apache.hadoop.hive.ql.exec.FunctionRegistry=ERROR
+
+log4j.logger.org.apache.spark.deploy=DEBUG
+log4j.logger.org.apache.spark.executor=DEBUG
+log4j.logger.org.apache.spark.scheduler=DEBUG
+EOF
+
+useradd -u 1098 hdfs
+
+# keytool -genkey -alias kerberized_hdfs1.test.clickhouse.com -keyalg rsa -keysize 1024 -dname "CN=kerberized_hdfs1.test.clickhouse.com" -keypass masterkey -keystore /usr/local/hadoop/etc/hadoop/conf/hdfs.jks -storepass masterkey
+keytool -genkey -alias kerberizedhdfs1 -keyalg rsa -keysize 1024 -dname "CN=kerberizedhdfs1" -keypass masterkey -keystore /usr/local/hadoop/etc/hadoop/conf/hdfs.jks -storepass masterkey
+
+chmod g+r /usr/local/hadoop/etc/hadoop/conf/hdfs.jks
+
+
+service sshd start
+
+# yum --quiet --assumeyes install krb5-workstation.x86_64
+# yum --quiet --assumeyes install tcpdump
+
+# cd /tmp
+# curl http://archive.apache.org/dist/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz   -o  commons-daemon-1.0.15-src.tar.gz
+# tar xzf commons-daemon-1.0.15-src.tar.gz
+# cd commons-daemon-1.0.15-src/src/native/unix
+# ./configure && make
+# cp ./jsvc /usr/local/hadoop/sbin
+
+
+until kinit -kt /usr/local/hadoop/etc/hadoop/conf/hdfs.keytab hdfs/kerberizedhdfs1@TEST.CLICKHOUSE.TECH; do sleep 2; done
+echo "KDC is up and ready to go... starting up"
+
+$HADOOP_PREFIX/sbin/start-dfs.sh
+$HADOOP_PREFIX/sbin/start-yarn.sh
+$HADOOP_PREFIX/sbin/mr-jobhistory-daemon.sh start historyserver
+
+chmod a+r /usr/local/hadoop/etc/hadoop/conf/hdfs.keytab   # create dedicated keytab for hdfsuser
+
+$HADOOP_PREFIX/sbin/start-secure-dns.sh
+sleep 3
+
+/usr/local/hadoop/bin/hdfs dfsadmin -safemode leave
+
+/usr/local/hadoop/bin/hdfs dfs -mkdir /user/specuser
+/usr/local/hadoop/bin/hdfs dfs -chown specuser /user/specuser
+echo "chown_completed" | /usr/local/hadoop/bin/hdfs dfs -appendToFile - /preparations_done_marker
+
+kdestroy
+
+
+
+# adduser --groups hdfs hdfsuser
+
+# /usr/local/hadoop/sbin/hadoop-daemon.sh --config /usr/local/hadoop/etc/hadoop/ --script /usr/local/hadoop/sbin/hdfs start namenode
+# /usr/local/hadoop/sbin/hadoop-daemon.sh --config /usr/local/hadoop/etc/hadoop/ --script /usr/local/hadoop/sbin/hdfs start datanode
+
+
+if [[ $1 == "-d" ]]; then
+  while true; do sleep 1000; done
+fi
+
+if [[ $1 == "-bash" ]]; then
+  /bin/bash
+fi
diff --git a/tests/integration/test_storage_kerberized_hdfs/kerberos_image_config.sh b/tests/integration/test_storage_kerberized_hdfs/kerberos_image_config.sh
new file mode 100644
index 00000000000..45fb93792e0
--- /dev/null
+++ b/tests/integration/test_storage_kerberized_hdfs/kerberos_image_config.sh
@@ -0,0 +1,140 @@
+#!/bin/bash
+
+
+set -x  #  trace
+
+: "${REALM:=TEST.CLICKHOUSE.TECH}"
+: "${DOMAIN_REALM:=test.clickhouse.com}"
+: "${KERB_MASTER_KEY:=masterkey}"
+: "${KERB_ADMIN_USER:=admin}"
+: "${KERB_ADMIN_PASS:=admin}"
+
+create_config() {
+  : "${KDC_ADDRESS:=$(hostname -f)}"
+
+  cat>/etc/krb5.conf<<EOF
+[logging]
+ default = FILE:/var/log/kerberos/krb5libs.log
+ kdc = FILE:/var/log/kerberos/krb5kdc.log
+ admin_server = FILE:/var/log/kerberos/kadmind.log
+
+[libdefaults]
+ default_realm = $REALM
+ dns_lookup_realm = false
+ dns_lookup_kdc = false
+ ticket_lifetime = 15d
+ renew_lifetime = 15d
+ forwardable = true
+ # WARNING: We use weaker key types to simplify testing as stronger key types
+ # require the enhanced security JCE policy file to be installed. You should
+ # NOT run with this configuration in production or any real environment. You
+ # have been warned.
+ default_tkt_enctypes = des-cbc-md5 des-cbc-crc des3-cbc-sha1
+ default_tgs_enctypes = des-cbc-md5 des-cbc-crc des3-cbc-sha1
+ permitted_enctypes = des-cbc-md5 des-cbc-crc des3-cbc-sha1
+
+[realms]
+ $REALM = {
+  kdc = $KDC_ADDRESS
+  admin_server = $KDC_ADDRESS
+ }
+
+[domain_realm]
+ .$DOMAIN_REALM = $REALM
+ $DOMAIN_REALM = $REALM
+EOF
+
+cat>/var/kerberos/krb5kdc/kdc.conf<<EOF
+[kdcdefaults]
+ kdc_ports = 88
+ kdc_tcp_ports = 88
+
+[realms]
+ $REALM = {
+  acl_file = /var/kerberos/krb5kdc/kadm5.acl
+  dict_file = /usr/share/dict/words
+  admin_keytab = /var/kerberos/krb5kdc/kadm5.keytab
+  # WARNING: We use weaker key types to simplify testing as stronger key types
+  # require the enhanced security JCE policy file to be installed. You should
+  # NOT run with this configuration in production or any real environment. You
+  # have been warned.
+  master_key_type = des3-hmac-sha1
+  supported_enctypes = arcfour-hmac:normal des3-hmac-sha1:normal des-cbc-crc:normal des:normal des:v4 des:norealm des:onlyrealm des:afs3
+  default_principal_flags = +preauth
+ }
+EOF
+}
+
+create_db() {
+  /usr/sbin/kdb5_util -P $KERB_MASTER_KEY -r $REALM create -s
+}
+
+start_kdc() {
+  mkdir -p /var/log/kerberos
+
+  /etc/rc.d/init.d/krb5kdc start
+  /etc/rc.d/init.d/kadmin start
+
+  chkconfig krb5kdc on
+  chkconfig kadmin on
+}
+
+restart_kdc() {
+  /etc/rc.d/init.d/krb5kdc restart
+  /etc/rc.d/init.d/kadmin restart
+}
+
+create_admin_user() {
+  kadmin.local -q "addprinc -pw $KERB_ADMIN_PASS $KERB_ADMIN_USER/admin"
+  echo "*/admin@$REALM *" > /var/kerberos/krb5kdc/kadm5.acl
+}
+
+create_keytabs() {
+  rm /tmp/keytab/*.keytab
+
+
+  # kadmin.local -q "addprinc -randkey hdfs/kerberizedhdfs1.${DOMAIN_REALM}@${REALM}"
+  # kadmin.local -q "ktadd -norandkey -k /tmp/keytab/hdfs.keytab hdfs/kerberizedhdfs1.${DOMAIN_REALM}@${REALM}"
+
+  # kadmin.local -q "addprinc -randkey HTTP/kerberizedhdfs1.${DOMAIN_REALM}@${REALM}"
+  # kadmin.local -q "ktadd -norandkey -k /tmp/keytab/hdfs.keytab HTTP/kerberizedhdfs1.${DOMAIN_REALM}@${REALM}"
+  kadmin.local -q "addprinc -randkey hdfs/kerberizedhdfs1@${REALM}"
+  kadmin.local -q "ktadd -norandkey -k /tmp/keytab/hdfs.keytab hdfs/kerberizedhdfs1@${REALM}"
+
+  kadmin.local -q "addprinc -randkey HTTP/kerberizedhdfs1@${REALM}"
+  kadmin.local -q "ktadd -norandkey -k /tmp/keytab/hdfs.keytab HTTP/kerberizedhdfs1@${REALM}"
+
+  kadmin.local -q "addprinc -randkey hdfsuser/node1@${REALM}"
+  kadmin.local -q "ktadd -norandkey -k /tmp/keytab/clickhouse.keytab hdfsuser/node1@${REALM}"
+  kadmin.local -q "addprinc -randkey hdfsuser@${REALM}"
+  kadmin.local -q "ktadd -norandkey -k /tmp/keytab/clickhouse.keytab hdfsuser@${REALM}"
+  kadmin.local -q "addprinc -randkey root@${REALM}"
+  kadmin.local -q "ktadd -norandkey -k /tmp/keytab/clickhouse.keytab root@${REALM}"
+  kadmin.local -q "addprinc -randkey specuser@${REALM}"
+  kadmin.local -q "ktadd -norandkey -k /tmp/keytab/clickhouse.keytab specuser@${REALM}"
+
+  chmod g+r /tmp/keytab/clickhouse.keytab
+}
+
+main() {
+
+  if [ ! -f /kerberos_initialized ]; then
+    create_config
+    create_db
+    create_admin_user
+    start_kdc
+
+    touch /kerberos_initialized
+  fi
+
+  if [ ! -f /var/kerberos/krb5kdc/principal ]; then
+    while true; do sleep 1000; done
+  else
+    start_kdc
+		create_keytabs
+    tail -F /var/log/kerberos/krb5kdc.log
+  fi
+
+}
+
+[[ "$0" == "${BASH_SOURCE[0]}" ]] && main "$@"
diff --git a/tests/integration/test_storage_kerberized_hdfs/secrets/krb.conf b/tests/integration/test_storage_kerberized_hdfs/secrets/krb.conf
new file mode 100644
index 00000000000..dffdcaebe81
--- /dev/null
+++ b/tests/integration/test_storage_kerberized_hdfs/secrets/krb.conf
@@ -0,0 +1,25 @@
+[logging]
+ default = FILE:/var/log/krb5libs.log
+ kdc = FILE:/var/log/krb5kdc.log
+ admin_server = FILE:/var/log/kadmind.log
+
+[libdefaults]
+ default_realm = TEST.CLICKHOUSE.TECH
+ dns_lookup_realm = false
+ dns_lookup_kdc = false
+ ticket_lifetime = 5s
+ forwardable = true
+ rdns = false
+ default_tgs_enctypes = des3-hmac-sha1
+ default_tkt_enctypes = des3-hmac-sha1
+ permitted_enctypes = des3-hmac-sha1
+
+[realms]
+ TEST.CLICKHOUSE.TECH = {
+  kdc = hdfskerberos
+  admin_server = hdfskerberos
+ }
+
+[domain_realm]
+ .test.clickhouse.com = TEST.CLICKHOUSE.TECH
+ test.clickhouse.com = TEST.CLICKHOUSE.TECH
diff --git a/tests/integration/test_storage_kerberized_hdfs/secrets/krb_long.conf b/tests/integration/test_storage_kerberized_hdfs/secrets/krb_long.conf
new file mode 100644
index 00000000000..43c009d2e98
--- /dev/null
+++ b/tests/integration/test_storage_kerberized_hdfs/secrets/krb_long.conf
@@ -0,0 +1,24 @@
+[logging]
+ default = FILE:/var/log/krb5libs.log
+ kdc = FILE:/var/log/krb5kdc.log
+ admin_server = FILE:/var/log/kadmind.log
+
+[libdefaults]
+ default_realm = TEST.CLICKHOUSE.TECH
+ dns_lookup_realm = false
+ dns_lookup_kdc = false
+ ticket_lifetime = 15d
+ forwardable = true
+ default_tgs_enctypes = des3-hmac-sha1
+ default_tkt_enctypes = des3-hmac-sha1
+ permitted_enctypes = des3-hmac-sha1
+
+[realms]
+ TEST.CLICKHOUSE.TECH = {
+  kdc = hdfskerberos
+  admin_server = hdfskerberos
+ }
+
+[domain_realm]
+ .test.clickhouse.com = TEST.CLICKHOUSE.TECH
+ test.clickhouse.com = TEST.CLICKHOUSE.TECH
diff --git a/tests/integration/test_storage_kerberized_hdfs/test.py b/tests/integration/test_storage_kerberized_hdfs/test.py
new file mode 100644
index 00000000000..ddfc1f6483d
--- /dev/null
+++ b/tests/integration/test_storage_kerberized_hdfs/test.py
@@ -0,0 +1,155 @@
+import time
+import pytest
+
+import os
+
+from helpers.cluster import ClickHouseCluster, is_arm
+import subprocess
+
+if is_arm():
+    pytestmark = pytest.mark.skip
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance(
+    "node1",
+    with_kerberized_hdfs=True,
+    user_configs=[],
+    main_configs=["configs/hdfs.xml"],
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    except Exception as ex:
+        print(ex)
+        raise ex
+    finally:
+        cluster.shutdown()
+
+
+def test_read_table(started_cluster):
+    hdfs_api = started_cluster.hdfs_api
+
+    data = "1\tSerialize\t555.222\n2\tData\t777.333\n"
+    hdfs_api.write_data("/simple_table_function", data)
+
+    api_read = hdfs_api.read_data("/simple_table_function")
+    assert api_read == data
+
+    select_read = node1.query(
+        "select * from hdfs('hdfs://kerberizedhdfs1:9010/simple_table_function', 'TSV', 'id UInt64, text String, number Float64')"
+    )
+    assert select_read == data
+
+
+def test_read_write_storage(started_cluster):
+    hdfs_api = started_cluster.hdfs_api
+
+    node1.query(
+        "create table SimpleHDFSStorage2 (id UInt32, name String, weight Float64) ENGINE = HDFS('hdfs://kerberizedhdfs1:9010/simple_storage1', 'TSV')"
+    )
+    node1.query("insert into SimpleHDFSStorage2 values (1, 'Mark', 72.53)")
+
+    api_read = hdfs_api.read_data("/simple_storage1")
+    assert api_read == "1\tMark\t72.53\n"
+
+    select_read = node1.query("select * from SimpleHDFSStorage2")
+    assert select_read == "1\tMark\t72.53\n"
+
+
+def test_write_storage_not_expired(started_cluster):
+    hdfs_api = started_cluster.hdfs_api
+
+    node1.query(
+        "create table SimpleHDFSStorageNotExpired (id UInt32, name String, weight Float64) ENGINE = HDFS('hdfs://kerberizedhdfs1:9010/simple_storage_not_expired', 'TSV')"
+    )
+
+    time.sleep(15)  # wait for ticket expiration
+    node1.query("insert into SimpleHDFSStorageNotExpired values (1, 'Mark', 72.53)")
+
+    api_read = hdfs_api.read_data("/simple_storage_not_expired")
+    assert api_read == "1\tMark\t72.53\n"
+
+    select_read = node1.query("select * from SimpleHDFSStorageNotExpired")
+    assert select_read == "1\tMark\t72.53\n"
+
+
+def test_two_users(started_cluster):
+    hdfs_api = started_cluster.hdfs_api
+
+    node1.query(
+        "create table HDFSStorOne (id UInt32, name String, weight Float64) ENGINE = HDFS('hdfs://kerberizedhdfs1:9010/storage_user_one', 'TSV')"
+    )
+    node1.query("insert into HDFSStorOne values (1, 'Real', 86.00)")
+
+    node1.query(
+        "create table HDFSStorTwo (id UInt32, name String, weight Float64) ENGINE = HDFS('hdfs://suser@kerberizedhdfs1:9010/user/specuser/storage_user_two', 'TSV')"
+    )
+    node1.query("insert into HDFSStorTwo values (1, 'Ideal', 74.00)")
+
+    select_read_1 = node1.query(
+        "select * from hdfs('hdfs://kerberizedhdfs1:9010/user/specuser/storage_user_two', 'TSV', 'id UInt64, text String, number Float64')"
+    )
+
+    select_read_2 = node1.query(
+        "select * from hdfs('hdfs://suser@kerberizedhdfs1:9010/storage_user_one', 'TSV', 'id UInt64, text String, number Float64')"
+    )
+
+
+def test_read_table_expired(started_cluster):
+    hdfs_api = started_cluster.hdfs_api
+
+    data = "1\tSerialize\t555.222\n2\tData\t777.333\n"
+    hdfs_api.write_data("/simple_table_function_relogin", data)
+
+    started_cluster.pause_container("hdfskerberos")
+    time.sleep(15)
+
+    try:
+        select_read = node1.query(
+            "select * from hdfs('hdfs://reloginuser&kerberizedhdfs1:9010/simple_table_function', 'TSV', 'id UInt64, text String, number Float64')"
+        )
+        assert False, "Exception have to be thrown"
+    except Exception as ex:
+        assert "DB::Exception: KerberosInit failure:" in str(ex)
+
+    started_cluster.unpause_container("hdfskerberos")
+
+
+def test_prohibited(started_cluster):
+    node1.query(
+        "create table HDFSStorTwoProhibited (id UInt32, name String, weight Float64) ENGINE = HDFS('hdfs://suser@kerberizedhdfs1:9010/storage_user_two_prohibited', 'TSV')"
+    )
+    try:
+        node1.query("insert into HDFSStorTwoProhibited values (1, 'SomeOne', 74.00)")
+        assert False, "Exception have to be thrown"
+    except Exception as ex:
+        assert (
+            "Unable to open HDFS file: /storage_user_two_prohibited (hdfs://suser@kerberizedhdfs1:9010/storage_user_two_prohibited) error: Permission denied: user=specuser, access=WRITE"
+            in str(ex)
+        )
+
+
+def test_cache_path(started_cluster):
+    node1.query(
+        "create table HDFSStorCachePath (id UInt32, name String, weight Float64) ENGINE = HDFS('hdfs://dedicatedcachepath@kerberizedhdfs1:9010/storage_dedicated_cache_path', 'TSV')"
+    )
+    try:
+        node1.query("insert into HDFSStorCachePath values (1, 'FatMark', 92.53)")
+        assert False, "Exception have to be thrown"
+    except Exception as ex:
+        assert (
+            "DB::Exception: hadoop.security.kerberos.ticket.cache.path cannot be set per user"
+            in str(ex)
+        )
+
+
+if __name__ == "__main__":
+    cluster.start()
+    input("Cluster created, press any key to destroy...")
+    cluster.shutdown()
diff --git a/tests/integration/test_storage_kerberized_kafka/test.py b/tests/integration/test_storage_kerberized_kafka/test.py
index a00914543c6..24d10d7ff83 100644
--- a/tests/integration/test_storage_kerberized_kafka/test.py
+++ b/tests/integration/test_storage_kerberized_kafka/test.py
@@ -8,7 +8,6 @@ import logging
 from helpers.cluster import ClickHouseCluster, is_arm
 from helpers.test_tools import TSV
 from helpers.client import QueryRuntimeException
-from helpers.network import PartitionManager
 
 import json
 import subprocess
@@ -139,7 +138,7 @@ def test_kafka_json_as_string_request_new_ticket_after_expiration(kafka_cluster)
 
     kafka_produce(
         kafka_cluster,
-        "kafka_json_as_string_after_expiration",
+        "kafka_json_as_string",
         [
             '{"t": 123, "e": {"x": "woof"} }',
             "",
@@ -153,9 +152,9 @@ def test_kafka_json_as_string_request_new_ticket_after_expiration(kafka_cluster)
         CREATE TABLE test.kafka (field String)
             ENGINE = Kafka
             SETTINGS kafka_broker_list = 'kerberized_kafka1:19092',
-                     kafka_topic_list = 'kafka_json_as_string_after_expiration',
+                     kafka_topic_list = 'kafka_json_as_string',
                      kafka_commit_on_select = 1,
-                     kafka_group_name = 'kafka_json_as_string_after_expiration',
+                     kafka_group_name = 'kafka_json_as_string',
                      kafka_format = 'JSONAsString',
                      kafka_flush_interval_ms=1000;
         """
@@ -171,7 +170,7 @@ def test_kafka_json_as_string_request_new_ticket_after_expiration(kafka_cluster)
 """
     assert TSV(result) == TSV(expected)
     assert instance.contains_in_log(
-        "Parsing of message (topic: kafka_json_as_string_after_expiration, partition: 0, offset: 1) return no rows"
+        "Parsing of message (topic: kafka_json_as_string, partition: 0, offset: 1) return no rows"
     )
 
 
@@ -205,40 +204,27 @@ def test_kafka_json_as_string_no_kdc(kafka_cluster):
         ],
     )
 
-    # temporary prevent CH - KDC communications
-    with PartitionManager() as pm:
-        other_node = "kafka_kerberos"
-        for node in kafka_cluster.instances.values():
-            source = node.ip_address
-            destination = kafka_cluster.get_instance_ip(other_node)
-            logging.debug(f"partitioning source {source}, destination {destination}")
-            pm._add_rule(
-                {
-                    "source": source,
-                    "destination": destination,
-                    "action": "REJECT",
-                    "protocol": "all",
-                }
-            )
+    kafka_cluster.pause_container("kafka_kerberos")
+    time.sleep(45)  # wait for ticket expiration
 
-        time.sleep(45)  # wait for ticket expiration
+    instance.query(
+        """
+        CREATE TABLE test.kafka_no_kdc (field String)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kerberized_kafka1:19092',
+                     kafka_topic_list = 'kafka_json_as_string_no_kdc',
+                     kafka_group_name = 'kafka_json_as_string_no_kdc',
+                     kafka_commit_on_select = 1,
+                     kafka_format = 'JSONAsString',
+                     kafka_flush_interval_ms=1000;
+        """
+    )
 
-        instance.query(
-            """
-            CREATE TABLE test.kafka_no_kdc (field String)
-                ENGINE = Kafka
-                SETTINGS kafka_broker_list = 'kerberized_kafka1:19092',
-                         kafka_topic_list = 'kafka_json_as_string_no_kdc',
-                         kafka_group_name = 'kafka_json_as_string_no_kdc',
-                         kafka_commit_on_select = 1,
-                         kafka_format = 'JSONAsString',
-                         kafka_flush_interval_ms=1000;
-            """
-        )
-
-        result = instance.query("SELECT * FROM test.kafka_no_kdc;")
+    result = instance.query("SELECT * FROM test.kafka_no_kdc;")
     expected = ""
 
+    kafka_cluster.unpause_container("kafka_kerberos")
+
     assert TSV(result) == TSV(expected)
     assert instance.contains_in_log("StorageKafka (kafka_no_kdc): Nothing to commit")
     assert instance.contains_in_log("Ticket expired")
@@ -248,7 +234,7 @@ def test_kafka_json_as_string_no_kdc(kafka_cluster):
 def test_kafka_config_from_sql_named_collection(kafka_cluster):
     kafka_produce(
         kafka_cluster,
-        "kafka_json_as_string_named_collection",
+        "kafka_json_as_string",
         [
             '{"t": 123, "e": {"x": "woof"} }',
             "",
@@ -259,7 +245,6 @@ def test_kafka_config_from_sql_named_collection(kafka_cluster):
 
     instance.query(
         """
-        DROP NAMED COLLECTION IF EXISTS kafka_config;
         CREATE NAMED COLLECTION kafka_config AS
             kafka.security_protocol = 'SASL_PLAINTEXT',
             kafka.sasl_mechanism = 'GSSAPI',
@@ -270,9 +255,9 @@ def test_kafka_config_from_sql_named_collection(kafka_cluster):
             kafka.api_version_request = 'false',
 
             kafka_broker_list = 'kerberized_kafka1:19092',
-            kafka_topic_list = 'kafka_json_as_string_named_collection',
+            kafka_topic_list = 'kafka_json_as_string',
             kafka_commit_on_select = 1,
-            kafka_group_name = 'kafka_json_as_string_named_collection',
+            kafka_group_name = 'kafka_json_as_string',
             kafka_format = 'JSONAsString',
             kafka_flush_interval_ms=1000;
         """
@@ -294,7 +279,7 @@ def test_kafka_config_from_sql_named_collection(kafka_cluster):
 """
     assert TSV(result) == TSV(expected)
     assert instance.contains_in_log(
-        "Parsing of message (topic: kafka_json_as_string_named_collection, partition: 0, offset: 1) return no rows"
+        "Parsing of message (topic: kafka_json_as_string, partition: 0, offset: 1) return no rows"
     )
 
 
diff --git a/tests/integration/test_storage_mongodb/test.py b/tests/integration/test_storage_mongodb/test.py
index 6e2d15b03be..3957afe8b29 100644
--- a/tests/integration/test_storage_mongodb/test.py
+++ b/tests/integration/test_storage_mongodb/test.py
@@ -1,5 +1,4 @@
 import pymongo
-from uuid import UUID
 
 import pytest
 from helpers.client import QueryRuntimeException
@@ -73,28 +72,6 @@ def test_simple_select(started_cluster):
     simple_mongo_table.drop()
 
 
-@pytest.mark.parametrize("started_cluster", [False], indirect=["started_cluster"])
-def test_uuid(started_cluster):
-    mongo_connection = get_mongo_connection(started_cluster)
-    db = mongo_connection["test"]
-    db.add_user("root", "clickhouse")
-    mongo_table = db["uuid_table"]
-    mongo_table.insert({"key": 0, "data": UUID("f0e77736-91d1-48ce-8f01-15123ca1c7ed")})
-
-    node = started_cluster.instances["node"]
-    node.query(
-        "CREATE TABLE uuid_mongo_table(key UInt64, data UUID) ENGINE = MongoDB('mongo1:27017', 'test', 'uuid_table', 'root', 'clickhouse')"
-    )
-
-    assert node.query("SELECT COUNT() FROM uuid_mongo_table") == "1\n"
-    assert (
-        node.query("SELECT data from uuid_mongo_table where key = 0")
-        == "f0e77736-91d1-48ce-8f01-15123ca1c7ed\n"
-    )
-    node.query("DROP TABLE uuid_mongo_table")
-    mongo_table.drop()
-
-
 @pytest.mark.parametrize("started_cluster", [False], indirect=["started_cluster"])
 def test_simple_select_from_view(started_cluster):
     mongo_connection = get_mongo_connection(started_cluster)
@@ -163,10 +140,6 @@ def test_arrays(started_cluster):
                     "f0e77736-91d1-48ce-8f01-15123ca1c7ed",
                     "93376a07-c044-4281-a76e-ad27cf6973c5",
                 ],
-                "arr_mongo_uuid": [
-                    UUID("f0e77736-91d1-48ce-8f01-15123ca1c7ed"),
-                    UUID("93376a07-c044-4281-a76e-ad27cf6973c5"),
-                ],
                 "arr_arr_bool": [
                     [True, False, True],
                     [True],
@@ -201,7 +174,6 @@ def test_arrays(started_cluster):
         "arr_datetime Array(DateTime),"
         "arr_string Array(String),"
         "arr_uuid Array(UUID),"
-        "arr_mongo_uuid Array(UUID),"
         "arr_arr_bool Array(Array(Bool)),"
         "arr_empty Array(UInt64),"
         "arr_null Array(UInt64),"
@@ -250,11 +222,6 @@ def test_arrays(started_cluster):
         == "['f0e77736-91d1-48ce-8f01-15123ca1c7ed','93376a07-c044-4281-a76e-ad27cf6973c5']\n"
     )
 
-    assert (
-        node.query(f"SELECT arr_mongo_uuid FROM arrays_mongo_table WHERE key = 42")
-        == "['f0e77736-91d1-48ce-8f01-15123ca1c7ed','93376a07-c044-4281-a76e-ad27cf6973c5']\n"
-    )
-
     assert (
         node.query(f"SELECT arr_arr_bool FROM arrays_mongo_table WHERE key = 42")
         == "[[true,false,true],[true],[],[],[false],[false]]\n"
@@ -410,7 +377,6 @@ def test_no_credentials(started_cluster):
     simple_mongo_table.insert_many(data)
 
     node = started_cluster.instances["node"]
-    node.query("drop table if exists simple_mongo_table_2")
     node.query(
         "create table simple_mongo_table_2(key UInt64, data String) engine = MongoDB('mongo2:27017', 'test', 'simple_table', '', '')"
     )
@@ -440,13 +406,10 @@ def test_auth_source(started_cluster):
     simple_mongo_table.insert_many(data)
 
     node = started_cluster.instances["node"]
-    node.query("drop table if exists simple_mongo_table_fail")
     node.query(
         "create table simple_mongo_table_fail(key UInt64, data String) engine = MongoDB('mongo2:27017', 'test', 'simple_table', 'root', 'clickhouse')"
     )
     node.query_and_get_error("SELECT count() FROM simple_mongo_table_fail")
-
-    node.query("drop table if exists simple_mongo_table_ok")
     node.query(
         "create table simple_mongo_table_ok(key UInt64, data String) engine = MongoDB('mongo2:27017', 'test', 'simple_table', 'root', 'clickhouse', 'authSource=admin')"
     )
diff --git a/tests/integration/test_storage_mysql/test.py b/tests/integration/test_storage_mysql/test.py
index c724c5bb498..5948954ff5f 100644
--- a/tests/integration/test_storage_mysql/test.py
+++ b/tests/integration/test_storage_mysql/test.py
@@ -445,7 +445,7 @@ def test_mysql_distributed(started_cluster):
     query = "SELECT * FROM ("
     for i in range(3):
         query += "SELECT name FROM test_replicas UNION DISTINCT "
-    query += "SELECT name FROM test_replicas) ORDER BY name"
+    query += "SELECT name FROM test_replicas)"
 
     result = node2.query(query)
     assert result == "host2\nhost3\nhost4\n"
@@ -827,9 +827,6 @@ def test_settings(started_cluster):
         f"with settings: connect_timeout={connect_timeout}, read_write_timeout={rw_timeout}"
     )
 
-    node1.query("DROP DATABASE IF EXISTS m")
-    node1.query("DROP DATABASE IF EXISTS mm")
-
     rw_timeout = 40123001
     connect_timeout = 40123002
     node1.query(
@@ -858,9 +855,6 @@ def test_settings(started_cluster):
         f"with settings: connect_timeout={connect_timeout}, read_write_timeout={rw_timeout}"
     )
 
-    node1.query("DROP DATABASE m")
-    node1.query("DROP DATABASE mm")
-
     drop_mysql_table(conn, table_name)
     conn.close()
 
@@ -936,9 +930,6 @@ def test_joins(started_cluster):
 
     conn.commit()
 
-    node1.query("DROP TABLE IF EXISTS test_joins_table_users")
-    node1.query("DROP TABLE IF EXISTS test_joins_table_tickets")
-
     node1.query(
         """
         CREATE TABLE test_joins_table_users
@@ -973,9 +964,6 @@ def test_joins(started_cluster):
         """
     ) == "281607\tFeedback\t2024-06-25 12:09:41\tuser@example.com\n"
 
-    node1.query("DROP TABLE test_joins_table_users")
-    node1.query("DROP TABLE test_joins_table_tickets")
-
 
 if __name__ == "__main__":
     with contextmanager(started_cluster)() as cluster:
diff --git a/tests/integration/test_storage_s3/test.py b/tests/integration/test_storage_s3/test.py
index ab327afe90b..d634479e332 100644
--- a/tests/integration/test_storage_s3/test.py
+++ b/tests/integration/test_storage_s3/test.py
@@ -154,7 +154,6 @@ def test_put(started_cluster, maybe_auth, positive, compression):
 
 
 def test_partition_by(started_cluster):
-    id = uuid.uuid4()
     bucket = started_cluster.minio_bucket
     instance = started_cluster.instances["dummy"]  # type: ClickHouseInstance
     table_format = "column1 UInt32, column2 UInt32, column3 UInt32"
@@ -162,37 +161,26 @@ def test_partition_by(started_cluster):
     values = "(1, 2, 3), (3, 2, 1), (78, 43, 45)"
     filename = "test_{_partition_id}.csv"
     put_query = f"""INSERT INTO TABLE FUNCTION
-        s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/{filename}', 'CSV', '{table_format}')
+        s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{filename}', 'CSV', '{table_format}')
         PARTITION BY {partition_by} VALUES {values}"""
 
     run_query(instance, put_query)
 
-    assert "1,2,3\n" == get_s3_file_content(started_cluster, bucket, f"{id}/test_3.csv")
-    assert "3,2,1\n" == get_s3_file_content(started_cluster, bucket, f"{id}/test_1.csv")
-    assert "78,43,45\n" == get_s3_file_content(
-        started_cluster, bucket, f"{id}/test_45.csv"
-    )
+    assert "1,2,3\n" == get_s3_file_content(started_cluster, bucket, "test_3.csv")
+    assert "3,2,1\n" == get_s3_file_content(started_cluster, bucket, "test_1.csv")
+    assert "78,43,45\n" == get_s3_file_content(started_cluster, bucket, "test_45.csv")
 
     filename = "test2_{_partition_id}.csv"
     instance.query(
-        f"create table p ({table_format}) engine=S3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/{filename}', 'CSV') partition by column3"
+        f"create table p ({table_format}) engine=S3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{filename}', 'CSV') partition by column3"
     )
     instance.query(f"insert into p values {values}")
-    assert "1,2,3\n" == get_s3_file_content(
-        started_cluster, bucket, f"{id}/test2_3.csv"
-    )
-    assert "3,2,1\n" == get_s3_file_content(
-        started_cluster, bucket, f"{id}/test2_1.csv"
-    )
-    assert "78,43,45\n" == get_s3_file_content(
-        started_cluster, bucket, f"{id}/test2_45.csv"
-    )
-
-    instance.query("drop table p")
+    assert "1,2,3\n" == get_s3_file_content(started_cluster, bucket, "test2_3.csv")
+    assert "3,2,1\n" == get_s3_file_content(started_cluster, bucket, "test2_1.csv")
+    assert "78,43,45\n" == get_s3_file_content(started_cluster, bucket, "test2_45.csv")
 
 
 def test_partition_by_string_column(started_cluster):
-    id = uuid.uuid4()
     bucket = started_cluster.minio_bucket
     instance = started_cluster.instances["dummy"]  # type: ClickHouseInstance
     table_format = "col_num UInt32, col_str String"
@@ -200,24 +188,21 @@ def test_partition_by_string_column(started_cluster):
     values = "(1, 'foo/bar'), (3, 'йцук'), (78, '你好')"
     filename = "test_{_partition_id}.csv"
     put_query = f"""INSERT INTO TABLE FUNCTION
-        s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/{filename}', 'CSV', '{table_format}')
+        s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{filename}', 'CSV', '{table_format}')
         PARTITION BY {partition_by} VALUES {values}"""
 
     run_query(instance, put_query)
 
     assert '1,"foo/bar"\n' == get_s3_file_content(
-        started_cluster, bucket, f"{id}/test_foo/bar.csv"
-    )
-    assert '3,"йцук"\n' == get_s3_file_content(
-        started_cluster, bucket, f"{id}/test_йцук.csv"
+        started_cluster, bucket, "test_foo/bar.csv"
     )
+    assert '3,"йцук"\n' == get_s3_file_content(started_cluster, bucket, "test_йцук.csv")
     assert '78,"你好"\n' == get_s3_file_content(
-        started_cluster, bucket, f"{id}/test_你好.csv"
+        started_cluster, bucket, "test_你好.csv"
     )
 
 
 def test_partition_by_const_column(started_cluster):
-    id = uuid.uuid4()
     bucket = started_cluster.minio_bucket
     instance = started_cluster.instances["dummy"]  # type: ClickHouseInstance
     table_format = "column1 UInt32, column2 UInt32, column3 UInt32"
@@ -226,14 +211,12 @@ def test_partition_by_const_column(started_cluster):
     values_csv = "1,2,3\n3,2,1\n78,43,45\n"
     filename = "test_{_partition_id}.csv"
     put_query = f"""INSERT INTO TABLE FUNCTION
-        s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/{filename}', 'CSV', '{table_format}')
+        s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{filename}', 'CSV', '{table_format}')
         PARTITION BY {partition_by} VALUES {values}"""
 
     run_query(instance, put_query)
 
-    assert values_csv == get_s3_file_content(
-        started_cluster, bucket, f"{id}/test_88.csv"
-    )
+    assert values_csv == get_s3_file_content(started_cluster, bucket, "test_88.csv")
 
 
 @pytest.mark.parametrize("special", ["space", "plus"])
@@ -293,31 +276,46 @@ def test_get_path_with_special(started_cluster, special):
 @pytest.mark.parametrize("auth", [pytest.param("'minio','minio123',", id="minio")])
 def test_empty_put(started_cluster, auth):
     # type: (ClickHouseCluster, str) -> None
-    id = uuid.uuid4()
+
     bucket = started_cluster.minio_bucket
     instance = started_cluster.instances["dummy"]  # type: ClickHouseInstance
     table_format = "column1 UInt32, column2 UInt32, column3 UInt32"
 
     drop_empty_table_query = "DROP TABLE IF EXISTS empty_table"
-    create_empty_table_query = (
-        f"CREATE TABLE empty_table ({table_format}) ENGINE = Null()"
+    create_empty_table_query = """
+        CREATE TABLE empty_table (
+        {}
+        ) ENGINE = Null()
+    """.format(
+        table_format
     )
 
     run_query(instance, drop_empty_table_query)
     run_query(instance, create_empty_table_query)
 
     filename = "empty_put_test.csv"
-    put_query = f"""insert into table function
-        s3('http://{started_cluster.minio_ip}:{MINIO_INTERNAL_PORT}/{bucket}/{id}/{filename}', {auth} 'CSV', '{table_format}')
-        select * from empty_table"""
+    put_query = "insert into table function s3('http://{}:{}/{}/{}', {}'CSV', '{}') select * from empty_table".format(
+        started_cluster.minio_ip,
+        MINIO_INTERNAL_PORT,
+        bucket,
+        filename,
+        auth,
+        table_format,
+    )
 
     run_query(instance, put_query)
 
     assert (
         run_query(
             instance,
-            f"""select count(*) from
-            s3('http://{started_cluster.minio_ip}:{MINIO_INTERNAL_PORT}/{bucket}/{id}/{filename}', {auth} 'CSV', '{table_format}')""",
+            "select count(*) from s3('http://{}:{}/{}/{}', {}'CSV', '{}')".format(
+                started_cluster.minio_ip,
+                MINIO_INTERNAL_PORT,
+                bucket,
+                filename,
+                auth,
+                table_format,
+            ),
         )
         == "0\n"
     )
@@ -501,7 +499,6 @@ def test_put_get_with_globs(started_cluster):
 def test_multipart(started_cluster, maybe_auth, positive):
     # type: (ClickHouseCluster, str, bool) -> None
 
-    id = uuid.uuid4()
     bucket = (
         started_cluster.minio_bucket
         if not maybe_auth
@@ -524,7 +521,7 @@ def test_multipart(started_cluster, maybe_auth, positive):
 
     assert len(csv_data) > min_part_size_bytes
 
-    filename = f"{id}/test_multipart.csv"
+    filename = "test_multipart.csv"
     put_query = "insert into table function s3('http://{}:{}/{}/{}', {}'CSV', '{}') format CSV".format(
         started_cluster.minio_redirect_host,
         started_cluster.minio_redirect_port,
@@ -696,7 +693,7 @@ def test_s3_glob_many_objects_under_selection(started_cluster):
         def create_files(thread_num):
             for f_num in range(thread_num * 63, thread_num * 63 + 63):
                 path = f"folder1/file{f_num}.csv"
-                query = "insert into table function s3('http://{}:{}/{}/{}', 'CSV', '{}') settings s3_truncate_on_insert=1 values {}".format(
+                query = "insert into table function s3('http://{}:{}/{}/{}', 'CSV', '{}') values {}".format(
                     started_cluster.minio_ip,
                     MINIO_INTERNAL_PORT,
                     bucket,
@@ -709,7 +706,7 @@ def test_s3_glob_many_objects_under_selection(started_cluster):
         jobs.append(threading.Thread(target=create_files, args=(thread_num,)))
         jobs[-1].start()
 
-    query = "insert into table function s3('http://{}:{}/{}/{}', 'CSV', '{}') settings s3_truncate_on_insert=1 values {}".format(
+    query = "insert into table function s3('http://{}:{}/{}/{}', 'CSV', '{}') values {}".format(
         started_cluster.minio_ip,
         MINIO_INTERNAL_PORT,
         bucket,
@@ -884,7 +881,7 @@ def test_storage_s3_get_unstable(started_cluster):
     bucket = started_cluster.minio_bucket
     instance = started_cluster.instances["dummy"]
     table_format = "column1 Int64, column2 Int64, column3 Int64, column4 Int64"
-    get_query = f"SELECT count(), sum(column3), sum(column4) FROM s3('http://resolver:8081/{started_cluster.minio_bucket}/test.csv', 'CSV', '{table_format}') SETTINGS s3_max_single_read_retries=30 FORMAT CSV"
+    get_query = f"SELECT count(), sum(column3), sum(column4) FROM s3('http://resolver:8081/{started_cluster.minio_bucket}/test.csv', 'CSV', '{table_format}') FORMAT CSV"
     result = run_query(instance, get_query)
     assert result.splitlines() == ["500001,500000,0"]
 
@@ -899,10 +896,9 @@ def test_storage_s3_get_slow(started_cluster):
 
 
 def test_storage_s3_put_uncompressed(started_cluster):
-    id = uuid.uuid4()
     bucket = started_cluster.minio_bucket
     instance = started_cluster.instances["dummy"]
-    filename = f"{id}/test_put_uncompressed.bin"
+    filename = "test_put_uncompressed.bin"
     name = "test_put_uncompressed"
     data = [
         "'Gloria Thompson',99",
@@ -954,7 +950,6 @@ def test_storage_s3_put_uncompressed(started_cluster):
     r = result.strip().split("\t")
     assert int(r[0]) >= 1, blob_storage_log
     assert all(col == r[0] for col in r), blob_storage_log
-    run_query(instance, f"DROP TABLE {name}")
 
 
 @pytest.mark.parametrize(
@@ -962,10 +957,9 @@ def test_storage_s3_put_uncompressed(started_cluster):
     [pytest.param("bin", "gzip", id="bin"), pytest.param("gz", "auto", id="gz")],
 )
 def test_storage_s3_put_gzip(started_cluster, extension, method):
-    id = uuid.uuid4()
     bucket = started_cluster.minio_bucket
     instance = started_cluster.instances["dummy"]
-    filename = f"{id}/test_put_gzip.{extension}"
+    filename = f"test_put_gzip.{extension}"
     name = f"test_put_gzip_{extension}"
     data = [
         "'Joseph Tomlinson',5",
@@ -1002,7 +996,6 @@ def test_storage_s3_put_gzip(started_cluster, extension, method):
     f = gzip.GzipFile(fileobj=buf, mode="rb")
     uncompressed_content = f.read().decode()
     assert sum([int(i.split(",")[1]) for i in uncompressed_content.splitlines()]) == 708
-    run_query(instance, f"DROP TABLE {name}")
 
 
 def test_truncate_table(started_cluster):
@@ -1028,24 +1021,14 @@ def test_truncate_table(started_cluster):
             len(list(minio.list_objects(started_cluster.minio_bucket, "truncate/")))
             == 0
         ):
-            break
+            return
         timeout -= 1
         time.sleep(1)
     assert len(list(minio.list_objects(started_cluster.minio_bucket, "truncate/"))) == 0
-    # FIXME: there was a bug in test and it was never checked.
-    # Currently read from truncated table fails with
-    # DB::Exception: Failed to get object info: No response body..
-    # HTTP response code: 404: while reading truncate: While executing S3Source
-    # assert instance.query("SELECT * FROM {}".format(name)) == ""
-    instance.query(f"DROP TABLE {name} SYNC")
-    assert (
-        instance.query(f"SELECT count() FROM system.tables where name='{name}'")
-        == "0\n"
-    )
+    assert instance.query("SELECT * FROM {}".format(name)) == ""
 
 
 def test_predefined_connection_configuration(started_cluster):
-    id = uuid.uuid4()
     bucket = started_cluster.minio_bucket
     instance = started_cluster.instances[
         "dummy_without_named_collections"
@@ -1073,9 +1056,7 @@ def test_predefined_connection_configuration(started_cluster):
         user="user",
     )
 
-    instance.query(
-        f"INSERT INTO {name} SELECT number FROM numbers(10) SETTINGS s3_truncate_on_insert=1"
-    )
+    instance.query(f"INSERT INTO {name} SELECT number FROM numbers(10)")
     result = instance.query(f"SELECT * FROM {name}")
     assert result == instance.query("SELECT number FROM numbers(10)")
 
@@ -1089,11 +1070,9 @@ def test_predefined_connection_configuration(started_cluster):
         "To execute this query, it's necessary to have the grant NAMED COLLECTION ON no_collection"
         in error
     )
-    instance2 = started_cluster.instances["dummy"]  # has named collection access
-    error = instance2.query_and_get_error("SELECT * FROM s3(no_collection)")
+    instance = started_cluster.instances["dummy"]  # has named collection access
+    error = instance.query_and_get_error("SELECT * FROM s3(no_collection)")
     assert "There is no named collection `no_collection`" in error
-    instance.query("DROP USER user")
-    instance.query(f"DROP TABLE {name}")
 
 
 result = ""
@@ -1236,7 +1215,7 @@ def test_s3_schema_inference(started_cluster):
     instance = started_cluster.instances["dummy"]
 
     instance.query(
-        f"insert into table function s3(s3_native, structure='a Int32, b String', format='Native') select number, randomString(100) from numbers(5000000) SETTINGS s3_truncate_on_insert=1"
+        f"insert into table function s3(s3_native, structure='a Int32, b String', format='Native') select number, randomString(100) from numbers(5000000)"
     )
     result = instance.query(f"desc s3(s3_native, format='Native')")
     assert result == "a\tInt32\t\t\t\t\t\nb\tString\t\t\t\t\t\n"
@@ -1276,9 +1255,6 @@ def test_s3_schema_inference(started_cluster):
     result = instance.query(f"select count(*) from {table_function}")
     assert int(result) == 5000000
 
-    instance.query("drop table schema_inference")
-    instance.query("drop table schema_inference_2")
-
 
 def test_empty_file(started_cluster):
     bucket = started_cluster.minio_bucket
@@ -1314,7 +1290,6 @@ def test_overwrite(started_cluster):
 
     result = instance.query(f"select count() from test_overwrite")
     assert int(result) == 200
-    instance.query(f"drop table test_overwrite")
 
 
 def test_create_new_files_on_insert(started_cluster):
@@ -1356,7 +1331,6 @@ def test_create_new_files_on_insert(started_cluster):
 
     result = instance.query(f"select count() from test_multiple_inserts")
     assert int(result) == 60
-    instance.query("drop table test_multiple_inserts")
 
 
 def test_format_detection(started_cluster):
@@ -1364,9 +1338,7 @@ def test_format_detection(started_cluster):
     instance = started_cluster.instances["dummy"]
 
     instance.query(f"create table arrow_table_s3 (x UInt64) engine=S3(s3_arrow)")
-    instance.query(
-        f"insert into arrow_table_s3 select 1 settings s3_truncate_on_insert=1"
-    )
+    instance.query(f"insert into arrow_table_s3 select 1")
     result = instance.query(f"select * from s3(s3_arrow)")
     assert int(result) == 1
 
@@ -1381,9 +1353,7 @@ def test_format_detection(started_cluster):
     assert int(result) == 1
 
     instance.query(f"create table parquet_table_s3 (x UInt64) engine=S3(s3_parquet2)")
-    instance.query(
-        f"insert into parquet_table_s3 select 1 settings s3_truncate_on_insert=1"
-    )
+    instance.query(f"insert into parquet_table_s3 select 1")
     result = instance.query(f"select * from s3(s3_parquet2)")
     assert int(result) == 1
 
@@ -1396,67 +1366,64 @@ def test_format_detection(started_cluster):
         f"select * from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test.parquet')"
     )
     assert int(result) == 1
-    instance.query(f"drop table arrow_table_s3")
-    instance.query(f"drop table parquet_table_s3")
 
 
 def test_schema_inference_from_globs(started_cluster):
-    id = uuid.uuid4()
     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}/{id}/test1.jsoncompacteachrow', 'JSONCompactEachRow', 'x Nullable(UInt32)') select NULL"
+        f"insert into table function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test1.jsoncompacteachrow', 'JSONCompactEachRow', 'x Nullable(UInt32)') select NULL"
     )
     instance.query(
-        f"insert into table function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/test2.jsoncompacteachrow', 'JSONCompactEachRow', 'x Nullable(UInt32)') select 0"
+        f"insert into table function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test2.jsoncompacteachrow', 'JSONCompactEachRow', 'x Nullable(UInt32)') select 0"
     )
 
     url_filename = "test{1,2}.jsoncompacteachrow"
     result = instance.query(
-        f"desc url('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/{url_filename}') settings input_format_json_infer_incomplete_types_as_strings=0"
+        f"desc url('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{url_filename}') settings input_format_json_infer_incomplete_types_as_strings=0"
     )
     assert result.strip() == "c1\tNullable(Int64)"
 
     result = instance.query(
-        f"select * from url('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/{url_filename}') settings input_format_json_infer_incomplete_types_as_strings=0"
+        f"select * from url('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{url_filename}') settings input_format_json_infer_incomplete_types_as_strings=0"
     )
     assert sorted(result.split()) == ["0", "\\N"]
 
     result = instance.query(
-        f"desc s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/test*.jsoncompacteachrow') settings input_format_json_infer_incomplete_types_as_strings=0"
+        f"desc s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test*.jsoncompacteachrow') settings input_format_json_infer_incomplete_types_as_strings=0"
     )
     assert result.strip() == "c1\tNullable(Int64)"
 
     result = instance.query(
-        f"select * from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/test*.jsoncompacteachrow') settings input_format_json_infer_incomplete_types_as_strings=0"
+        f"select * from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test*.jsoncompacteachrow') settings input_format_json_infer_incomplete_types_as_strings=0"
     )
     assert sorted(result.split()) == ["0", "\\N"]
 
     instance.query(
-        f"insert into table function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/test3.jsoncompacteachrow', 'JSONCompactEachRow', 'x Nullable(UInt32)') select NULL"
+        f"insert into table function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test3.jsoncompacteachrow', 'JSONCompactEachRow', 'x Nullable(UInt32)') select NULL"
     )
 
     url_filename = "test{1,3}.jsoncompacteachrow"
 
     result = instance.query_and_get_error(
-        f"desc s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/{url_filename}') settings schema_inference_use_cache_for_s3=0, input_format_json_infer_incomplete_types_as_strings=0"
+        f"desc s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{url_filename}') settings schema_inference_use_cache_for_s3=0, input_format_json_infer_incomplete_types_as_strings=0"
     )
 
     assert "All attempts to extract table structure from files failed" in result
 
     result = instance.query_and_get_error(
-        f"desc url('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/{url_filename}') settings schema_inference_use_cache_for_url=0, input_format_json_infer_incomplete_types_as_strings=0"
+        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 "All attempts to extract table structure from files failed" in result
 
     instance.query(
-        f"insert into table function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/test0.jsoncompacteachrow', 'TSV', 'x String') select '[123;]'"
+        f"insert into table function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test0.jsoncompacteachrow', 'TSV', 'x String') select '[123;]'"
     )
 
     result = instance.query_and_get_error(
-        f"desc s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/test*.jsoncompacteachrow') settings schema_inference_use_cache_for_s3=0, input_format_json_infer_incomplete_types_as_strings=0"
+        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" in result
@@ -1464,7 +1431,7 @@ def test_schema_inference_from_globs(started_cluster):
     url_filename = "test{0,1,2,3}.jsoncompacteachrow"
 
     result = instance.query_and_get_error(
-        f"desc url('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/{url_filename}') settings schema_inference_use_cache_for_url=0, input_format_json_infer_incomplete_types_as_strings=0"
+        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" in result
@@ -1524,12 +1491,9 @@ def test_signatures(started_cluster):
     )
     assert "S3_ERROR" in error
 
-    instance.query(f"drop table test_signatures")
-
 
 def test_select_columns(started_cluster):
     bucket = started_cluster.minio_bucket
-    id = uuid.uuid4()
     instance = started_cluster.instances["dummy"]
     name = "test_table2"
     structure = "id UInt32, value1 Int32, value2 Int32"
@@ -1543,37 +1507,36 @@ def test_select_columns(started_cluster):
     instance.query(
         f"INSERT INTO {name} SELECT * FROM generateRandom('{structure}') LIMIT {limit} SETTINGS s3_truncate_on_insert=1"
     )
-    instance.query(f"SELECT value2, '{id}' FROM {name}")
+    instance.query(f"SELECT value2 FROM {name}")
 
     instance.query("SYSTEM FLUSH LOGS")
     result1 = instance.query(
-        f"SELECT ProfileEvents['ReadBufferFromS3Bytes'] FROM system.query_log WHERE type='QueryFinish' and query LIKE 'SELECT value2, ''{id}'' FROM {name}'"
+        f"SELECT ProfileEvents['ReadBufferFromS3Bytes'] FROM system.query_log WHERE type='QueryFinish' and query LIKE 'SELECT value2 FROM {name}'"
     )
 
-    instance.query(f"SELECT *, '{id}' FROM {name}")
+    instance.query(f"SELECT * FROM {name}")
     instance.query("SYSTEM FLUSH LOGS")
     result2 = instance.query(
-        f"SELECT ProfileEvents['ReadBufferFromS3Bytes'] FROM system.query_log WHERE type='QueryFinish' and query LIKE 'SELECT *, ''{id}'' FROM {name}'"
+        f"SELECT ProfileEvents['ReadBufferFromS3Bytes'] FROM system.query_log WHERE type='QueryFinish' and query LIKE 'SELECT * FROM {name}'"
     )
 
     assert round(int(result2) / int(result1)) == 3
 
 
 def test_insert_select_schema_inference(started_cluster):
-    id = uuid.uuid4()
     bucket = started_cluster.minio_bucket
     instance = started_cluster.instances["dummy"]
 
     instance.query(
-        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/test_insert_select.native') select toUInt64(1) as x"
+        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_insert_select.native') select toUInt64(1) as x"
     )
     result = instance.query(
-        f"desc s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/test_insert_select.native')"
+        f"desc s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_insert_select.native')"
     )
     assert result.strip() == "x\tUInt64"
 
     result = instance.query(
-        f"select * from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{id}/test_insert_select.native')"
+        f"select * from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_insert_select.native')"
     )
     assert int(result) == 1
 
@@ -1583,7 +1546,7 @@ def test_parallel_reading_with_memory_limit(started_cluster):
     instance = started_cluster.instances["dummy"]
 
     instance.query(
-        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_memory_limit.native') select * from numbers(1000000) SETTINGS s3_truncate_on_insert=1"
+        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_memory_limit.native') select * from numbers(1000000)"
     )
 
     result = instance.query_and_get_error(
@@ -1604,7 +1567,7 @@ def test_wrong_format_usage(started_cluster):
     instance = started_cluster.instances["dummy"]
 
     instance.query(
-        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_wrong_format.native') select * from numbers(10e6) SETTINGS s3_truncate_on_insert=1"
+        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_wrong_format.native') select * from numbers(10e6)"
     )
     # size(test_wrong_format.native) = 10e6*8+16(header) ~= 76MiB
 
@@ -2127,11 +2090,11 @@ def test_read_subcolumns(started_cluster):
     instance = started_cluster.instances["dummy"]
 
     instance.query(
-        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_subcolumns.tsv', auto, 'a Tuple(b Tuple(c UInt32, d UInt32), e UInt32)') select  ((1, 2), 3) SETTINGS s3_truncate_on_insert=1"
+        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_subcolumns.tsv', auto, 'a Tuple(b Tuple(c UInt32, d UInt32), e UInt32)') select  ((1, 2), 3)"
     )
 
     instance.query(
-        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_subcolumns.jsonl', auto, 'a Tuple(b Tuple(c UInt32, d UInt32), e UInt32)') select  ((1, 2), 3)  SETTINGS s3_truncate_on_insert=1"
+        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_subcolumns.jsonl', auto, 'a Tuple(b Tuple(c UInt32, d UInt32), e UInt32)') select  ((1, 2), 3)"
     )
 
     res = instance.query(
@@ -2190,7 +2153,7 @@ def test_read_subcolumn_time(started_cluster):
     instance = started_cluster.instances["dummy"]
 
     instance.query(
-        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_subcolumn_time.tsv', auto, 'a UInt32') select  (42)  SETTINGS s3_truncate_on_insert=1"
+        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_subcolumn_time.tsv', auto, 'a UInt32') select  (42)"
     )
 
     res = instance.query(
@@ -2201,30 +2164,29 @@ def test_read_subcolumn_time(started_cluster):
 
 
 def test_filtering_by_file_or_path(started_cluster):
-    id = uuid.uuid4()
     bucket = started_cluster.minio_bucket
     instance = started_cluster.instances["dummy"]
 
     instance.query(
-        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_filter1.tsv', auto, 'x UInt64') select 1 SETTINGS s3_truncate_on_insert=1"
+        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_filter1.tsv', auto, 'x UInt64') select 1"
     )
 
     instance.query(
-        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_filter2.tsv', auto, 'x UInt64') select 2 SETTINGS s3_truncate_on_insert=1"
+        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_filter2.tsv', auto, 'x UInt64') select 2"
     )
 
     instance.query(
-        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_filter3.tsv', auto, 'x UInt64') select 3 SETTINGS s3_truncate_on_insert=1"
+        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_filter3.tsv', auto, 'x UInt64') select 3"
     )
 
     instance.query(
-        f"select count(), '{id}' from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_filter*.tsv') where _file = 'test_filter1.tsv'"
+        f"select count() from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_filter*.tsv') where _file = 'test_filter1.tsv'"
     )
 
     instance.query("SYSTEM FLUSH LOGS")
 
     result = instance.query(
-        f"SELECT ProfileEvents['EngineFileLikeReadFiles'] FROM system.query_log WHERE query like '%{id}%' AND type='QueryFinish'"
+        f"SELECT ProfileEvents['EngineFileLikeReadFiles'] FROM system.query_log WHERE query like '%select%s3%test_filter%' AND type='QueryFinish'"
     )
 
     assert int(result) == 1
@@ -2237,56 +2199,54 @@ def test_filtering_by_file_or_path(started_cluster):
 
 
 def test_union_schema_inference_mode(started_cluster):
-    id = uuid.uuid4()
     bucket = started_cluster.minio_bucket
     instance = started_cluster.instances["s3_non_default"]
-    file_name_prefix = f"test_union_schema_inference_{id}_"
 
     instance.query(
-        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{file_name_prefix}1.jsonl') select 1 as a SETTINGS s3_truncate_on_insert=1"
+        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_union_schema_inference1.jsonl') select 1 as a"
     )
 
     instance.query(
-        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{file_name_prefix}2.jsonl') select 2 as b SETTINGS s3_truncate_on_insert=1"
+        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_union_schema_inference2.jsonl') select 2 as b"
     )
 
     instance.query(
-        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{file_name_prefix}3.jsonl') select 2 as c SETTINGS s3_truncate_on_insert=1"
+        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_union_schema_inference3.jsonl') select 2 as c"
     )
 
     instance.query(
-        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{file_name_prefix}4.jsonl', TSV) select 'Error' SETTINGS s3_truncate_on_insert=1"
+        f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_union_schema_inference4.jsonl', TSV) select 'Error'"
     )
 
     for engine in ["s3", "url"]:
         instance.query("system drop schema cache for s3")
 
         result = instance.query(
-            f"desc {engine}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{file_name_prefix}{{1,2,3}}.jsonl') settings schema_inference_mode='union', describe_compact_output=1 format TSV"
+            f"desc {engine}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_union_schema_inference{{1,2,3}}.jsonl') settings schema_inference_mode='union', describe_compact_output=1 format TSV"
         )
         assert result == "a\tNullable(Int64)\nb\tNullable(Int64)\nc\tNullable(Int64)\n"
 
         result = instance.query(
-            f"select schema_inference_mode, splitByChar('/', source)[-1] as file, schema from system.schema_inference_cache where source like '%{file_name_prefix}%' order by file format TSV"
+            "select schema_inference_mode, splitByChar('/', source)[-1] as file, schema from system.schema_inference_cache where source like '%test_union_schema_inference%' order by file format TSV"
         )
         assert (
-            result == f"UNION\t{file_name_prefix}1.jsonl\ta Nullable(Int64)\n"
-            f"UNION\t{file_name_prefix}2.jsonl\tb Nullable(Int64)\n"
-            f"UNION\t{file_name_prefix}3.jsonl\tc Nullable(Int64)\n"
+            result == "UNION\ttest_union_schema_inference1.jsonl\ta Nullable(Int64)\n"
+            "UNION\ttest_union_schema_inference2.jsonl\tb Nullable(Int64)\n"
+            "UNION\ttest_union_schema_inference3.jsonl\tc Nullable(Int64)\n"
         )
         result = instance.query(
-            f"select * from {engine}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{file_name_prefix}{{1,2,3}}.jsonl') order by tuple(*) settings schema_inference_mode='union', describe_compact_output=1 format TSV"
+            f"select * from {engine}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_union_schema_inference{{1,2,3}}.jsonl') order by tuple(*) settings schema_inference_mode='union', describe_compact_output=1 format TSV"
         )
         assert result == "1\t\\N\t\\N\n" "\\N\t2\t\\N\n" "\\N\t\\N\t2\n"
 
         instance.query(f"system drop schema cache for {engine}")
         result = instance.query(
-            f"desc {engine}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{file_name_prefix}2.jsonl') settings schema_inference_mode='union', describe_compact_output=1 format TSV"
+            f"desc {engine}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_union_schema_inference2.jsonl') settings schema_inference_mode='union', describe_compact_output=1 format TSV"
         )
         assert result == "b\tNullable(Int64)\n"
 
         result = instance.query(
-            f"desc {engine}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{file_name_prefix}{{1,2,3}}.jsonl') settings schema_inference_mode='union', describe_compact_output=1 format TSV"
+            f"desc {engine}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_union_schema_inference{{1,2,3}}.jsonl') settings schema_inference_mode='union', describe_compact_output=1 format TSV"
         )
         assert (
             result == "a\tNullable(Int64)\n"
@@ -2295,7 +2255,7 @@ 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}/{file_name_prefix}{{1,2,3,4}}.jsonl') settings schema_inference_mode='union', describe_compact_output=1 format TSV"
+            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
 
diff --git a/tests/integration/test_storage_s3_queue/test.py b/tests/integration/test_storage_s3_queue/test.py
index b75ad21f002..9a97e8c23d1 100644
--- a/tests/integration/test_storage_s3_queue/test.py
+++ b/tests/integration/test_storage_s3_queue/test.py
@@ -1,7 +1,6 @@
 import io
 import logging
 import random
-import string
 import time
 
 import pytest
@@ -14,6 +13,7 @@ from uuid import uuid4
 AVAILABLE_MODES = ["unordered", "ordered"]
 DEFAULT_AUTH = ["'minio'", "'minio123'"]
 NO_AUTH = ["NOSIGN"]
+AZURE_CONTAINER_NAME = "cont"
 
 
 def prepare_public_s3_bucket(started_cluster):
@@ -68,24 +68,13 @@ def s3_queue_setup_teardown(started_cluster):
     instance = started_cluster.instances["instance"]
     instance_2 = started_cluster.instances["instance2"]
 
-    instance.query("DROP DATABASE IF EXISTS default; CREATE DATABASE default;")
-    instance_2.query("DROP DATABASE IF EXISTS default; CREATE DATABASE default;")
+    instance.query("DROP DATABASE IF EXISTS test; CREATE DATABASE test;")
+    instance_2.query("DROP DATABASE IF EXISTS test; CREATE DATABASE test;")
 
     minio = started_cluster.minio_client
     objects = list(minio.list_objects(started_cluster.minio_bucket, recursive=True))
     for obj in objects:
         minio.remove_object(started_cluster.minio_bucket, obj.object_name)
-
-    container_client = started_cluster.blob_service_client.get_container_client(
-        started_cluster.azurite_container
-    )
-
-    if container_client.exists():
-        blob_names = [b.name for b in container_client.list_blobs()]
-        logging.debug(f"Deleting blobs: {blob_names}")
-        for b in blob_names:
-            container_client.delete_blob(b)
-
     yield  # run test
 
 
@@ -140,6 +129,11 @@ def started_cluster():
         cluster.start()
         logging.info("Cluster started")
 
+        container_client = cluster.blob_service_client.get_container_client(
+            AZURE_CONTAINER_NAME
+        )
+        container_client.create_container()
+
         yield cluster
     finally:
         cluster.shutdown()
@@ -196,7 +190,7 @@ def put_s3_file_content(started_cluster, filename, data, bucket=None):
 
 def put_azure_file_content(started_cluster, filename, data, bucket=None):
     client = started_cluster.blob_service_client.get_blob_client(
-        started_cluster.azurite_container, filename
+        AZURE_CONTAINER_NAME, filename
     )
     buf = io.BytesIO(data)
     client.upload_blob(buf, "BlockBlob", len(data))
@@ -232,7 +226,7 @@ def create_table(
         url = f"http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{files_path}/"
         engine_def = f"{engine_name}('{url}', {auth_params}, {file_format})"
     else:
-        engine_def = f"{engine_name}('{started_cluster.env_variables['AZURITE_CONNECTION_STRING']}', '{started_cluster.azurite_container}', '{files_path}/', 'CSV')"
+        engine_def = f"{engine_name}('{started_cluster.env_variables['AZURITE_CONNECTION_STRING']}', 'cont', '{files_path}/', 'CSV')"
 
     node.query(f"DROP TABLE IF EXISTS {table_name}")
     create_query = f"""
@@ -268,21 +262,15 @@ def create_mv(
     )
 
 
-def generate_random_string(length=6):
-    return "".join(random.choice(string.ascii_lowercase) for i in range(length))
-
-
 @pytest.mark.parametrize("mode", ["unordered", "ordered"])
 @pytest.mark.parametrize("engine_name", ["S3Queue", "AzureQueue"])
 def test_delete_after_processing(started_cluster, mode, engine_name):
     node = started_cluster.instances["instance"]
-    table_name = f"delete_after_processing_{mode}_{engine_name}"
+    table_name = f"test.delete_after_processing_{mode}_{engine_name}"
     dst_table_name = f"{table_name}_dst"
     files_path = f"{table_name}_data"
     files_num = 5
     row_num = 10
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
     if engine_name == "S3Queue":
         storage = "s3"
     else:
@@ -297,7 +285,7 @@ def test_delete_after_processing(started_cluster, mode, engine_name):
         table_name,
         mode,
         files_path,
-        additional_settings={"after_processing": "delete", "keeper_path": keeper_path},
+        additional_settings={"after_processing": "delete"},
         engine_name=engine_name,
     )
     create_mv(node, table_name, dst_table_name)
@@ -325,7 +313,7 @@ def test_delete_after_processing(started_cluster, mode, engine_name):
         assert len(objects) == 0
     else:
         client = started_cluster.blob_service_client.get_container_client(
-            started_cluster.azurite_container
+            AZURE_CONTAINER_NAME
         )
         objects_iterator = client.list_blobs(files_path)
         for objects in objects_iterator:
@@ -336,12 +324,11 @@ def test_delete_after_processing(started_cluster, mode, engine_name):
 @pytest.mark.parametrize("engine_name", ["S3Queue", "AzureQueue"])
 def test_failed_retry(started_cluster, mode, engine_name):
     node = started_cluster.instances["instance"]
-    table_name = f"failed_retry_{mode}_{engine_name}"
+    table_name = f"test.failed_retry_{mode}_{engine_name}"
     dst_table_name = f"{table_name}_dst"
     files_path = f"{table_name}_data"
     file_path = f"{files_path}/trash_test.csv"
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
+    keeper_path = f"/clickhouse/test_{table_name}"
     retries_num = 3
 
     values = [
@@ -398,9 +385,8 @@ def test_failed_retry(started_cluster, mode, engine_name):
 @pytest.mark.parametrize("mode", AVAILABLE_MODES)
 def test_direct_select_file(started_cluster, mode):
     node = started_cluster.instances["instance"]
-    table_name = f"direct_select_file_{mode}"
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{mode}_{generate_random_string()}"
+    table_name = f"test.direct_select_file_{mode}"
+    keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
     file_path = f"{files_path}/test.csv"
 
@@ -461,7 +447,7 @@ def test_direct_select_file(started_cluster, mode):
     ] == []
 
     # New table with different zookeeper path
-    keeper_path = f"{keeper_path}_2"
+    keeper_path = f"/clickhouse/test_{table_name}_{mode}_2"
     create_table(
         started_cluster,
         node,
@@ -505,17 +491,8 @@ def test_direct_select_multiple_files(started_cluster, mode):
     node = started_cluster.instances["instance"]
     table_name = f"direct_select_multiple_files_{mode}"
     files_path = f"{table_name}_data"
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
 
-    create_table(
-        started_cluster,
-        node,
-        table_name,
-        mode,
-        files_path,
-        additional_settings={"keeper_path": keeper_path},
-    )
+    create_table(started_cluster, node, table_name, mode, files_path)
     for i in range(5):
         rand_values = [[random.randint(0, 50) for _ in range(3)] for _ in range(10)]
         values_csv = (
@@ -538,23 +515,14 @@ def test_direct_select_multiple_files(started_cluster, mode):
 
 
 @pytest.mark.parametrize("mode", AVAILABLE_MODES)
-def test_streaming_to_view(started_cluster, mode):
+def test_streaming_to_view_(started_cluster, mode):
     node = started_cluster.instances["instance"]
     table_name = f"streaming_to_view_{mode}"
     dst_table_name = f"{table_name}_dst"
     files_path = f"{table_name}_data"
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
 
     total_values = generate_random_files(started_cluster, files_path, 10)
-    create_table(
-        started_cluster,
-        node,
-        table_name,
-        mode,
-        files_path,
-        additional_settings={"keeper_path": keeper_path},
-    )
+    create_table(started_cluster, node, table_name, mode, files_path)
     create_mv(node, table_name, dst_table_name)
 
     expected_values = set([tuple(i) for i in total_values])
@@ -576,8 +544,7 @@ def test_streaming_to_many_views(started_cluster, mode):
     node = started_cluster.instances["instance"]
     table_name = f"streaming_to_many_views_{mode}"
     dst_table_name = f"{table_name}_dst"
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
+    keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
 
     for i in range(3):
@@ -615,8 +582,7 @@ def test_streaming_to_many_views(started_cluster, mode):
 def test_multiple_tables_meta_mismatch(started_cluster):
     node = started_cluster.instances["instance"]
     table_name = f"multiple_tables_meta_mismatch"
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
+    keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
 
     create_table(
@@ -662,7 +628,10 @@ def test_multiple_tables_meta_mismatch(started_cluster):
             },
         )
     except QueryRuntimeException as e:
-        assert "Existing table metadata in ZooKeeper differs in columns" in str(e)
+        assert (
+            "Table columns structure in ZooKeeper is different from local table structure"
+            in str(e)
+        )
         failed = True
 
     assert failed is True
@@ -706,8 +675,7 @@ def test_multiple_tables_streaming_sync(started_cluster, mode):
     node = started_cluster.instances["instance"]
     table_name = f"multiple_tables_streaming_sync_{mode}"
     dst_table_name = f"{table_name}_dst"
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
+    keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
     files_to_generate = 300
 
@@ -788,10 +756,7 @@ def test_multiple_tables_streaming_sync(started_cluster, mode):
 def test_multiple_tables_streaming_sync_distributed(started_cluster, mode):
     node = started_cluster.instances["instance"]
     node_2 = started_cluster.instances["instance2"]
-    # A unique table name is necessary for repeatable tests
-    table_name = (
-        f"multiple_tables_streaming_sync_distributed_{mode}_{generate_random_string()}"
-    )
+    table_name = f"multiple_tables_streaming_sync_distributed_{mode}"
     dst_table_name = f"{table_name}_dst"
     keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
@@ -806,11 +771,7 @@ def test_multiple_tables_streaming_sync_distributed(started_cluster, mode):
             table_name,
             mode,
             files_path,
-            additional_settings={
-                "keeper_path": keeper_path,
-                "s3queue_buckets": 2,
-                **({"s3queue_processing_threads_num": 1} if mode == "ordered" else {}),
-            },
+            additional_settings={"keeper_path": keeper_path, "s3queue_buckets": 2},
         )
 
     for instance in [node, node_2]:
@@ -845,10 +806,6 @@ def test_multiple_tables_streaming_sync_distributed(started_cluster, mode):
         list(map(int, l.split())) for l in run_query(node_2, get_query).splitlines()
     ]
 
-    logging.debug(
-        f"res1 size: {len(res1)}, res2 size: {len(res2)}, total_rows: {total_rows}"
-    )
-
     assert len(res1) + len(res2) == total_rows
 
     # Checking that all engines have made progress
@@ -868,8 +825,7 @@ def test_max_set_age(started_cluster):
     node = started_cluster.instances["instance"]
     table_name = "max_set_age"
     dst_table_name = f"{table_name}_dst"
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
+    keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
     max_age = 20
     files_to_generate = 10
@@ -980,9 +936,10 @@ def test_max_set_age(started_cluster):
 def test_max_set_size(started_cluster):
     node = started_cluster.instances["instance"]
     table_name = f"max_set_size"
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
+    dst_table_name = f"{table_name}_dst"
+    keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
+    max_age = 10
     files_to_generate = 10
 
     create_table(
@@ -1026,8 +983,7 @@ def test_drop_table(started_cluster):
     node = started_cluster.instances["instance"]
     table_name = f"test_drop"
     dst_table_name = f"{table_name}_dst"
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
+    keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
     files_to_generate = 300
 
@@ -1057,11 +1013,9 @@ def test_drop_table(started_cluster):
 
 def test_s3_client_reused(started_cluster):
     node = started_cluster.instances["instance"]
-    table_name = f"test_s3_client_reused"
+    table_name = f"test.test_s3_client_reused"
     dst_table_name = f"{table_name}_dst"
     files_path = f"{table_name}_data"
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
     row_num = 10
 
     def get_created_s3_clients_count():
@@ -1095,7 +1049,6 @@ def test_s3_client_reused(started_cluster):
         additional_settings={
             "after_processing": "delete",
             "s3queue_processing_threads_num": 1,
-            "keeper_path": keeper_path,
         },
         auth=NO_AUTH,
         bucket=started_cluster.minio_public_bucket,
@@ -1153,8 +1106,7 @@ 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"
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
+    keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
     files_to_generate = 300
     processing_threads = 32
@@ -1221,8 +1173,7 @@ 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"
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
+    keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
     files_to_generate = 300
     shards_num = 3
@@ -1341,7 +1292,7 @@ where zookeeper_path ilike '%{table_name}%' and status = 'Processed' and rows_pr
         pytest.param("unordered", 1),
         pytest.param("unordered", 8),
         pytest.param("ordered", 1),
-        pytest.param("ordered", 2),
+        pytest.param("ordered", 8),
     ],
 )
 def test_shards_distributed(started_cluster, mode, processing_threads):
@@ -1349,11 +1300,10 @@ def test_shards_distributed(started_cluster, mode, processing_threads):
     node_2 = started_cluster.instances["instance2"]
     table_name = f"test_shards_distributed_{mode}_{processing_threads}"
     dst_table_name = f"{table_name}_dst"
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
+    keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
     files_to_generate = 300
-    row_num = 300
+    row_num = 50
     total_rows = row_num * files_to_generate
     shards_num = 2
 
@@ -1383,7 +1333,16 @@ def test_shards_distributed(started_cluster, mode, processing_threads):
     def get_count(node, table_name):
         return int(run_query(node, f"SELECT count() FROM {table_name}"))
 
-    def print_debug_info():
+    for _ in range(30):
+        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:
         processed_files = (
             node.query(
                 f"""
@@ -1410,7 +1369,7 @@ select splitByChar('/', file_name)[-1] as file from system.s3queue where zookeep
         )
 
         count = get_count(node, dst_table_name) + get_count(node_2, dst_table_name)
-        logging.debug(f"Processed rows: {count}/{total_rows}")
+        logging.debug(f"Processed rows: {count}/{files_to_generate}")
 
         info = node.query(
             f"""
@@ -1447,18 +1406,6 @@ select splitByChar('/', file_name)[-1] as file from system.s3queue where zookeep
 
         logging.debug(f"Intersecting files: {intersection(files1, files2)}")
 
-    for _ in range(30):
-        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:
-        print_debug_info()
-
         assert False
 
     get_query = f"SELECT column1, column2, column3 FROM {dst_table_name}"
@@ -1467,12 +1414,6 @@ select splitByChar('/', file_name)[-1] as file from system.s3queue where zookeep
         list(map(int, l.split())) for l in run_query(node_2, get_query).splitlines()
     ]
 
-    if len(res1) + len(res2) != total_rows or len(res1) <= 0 or len(res2) <= 0 or True:
-        logging.debug(
-            f"res1 size: {len(res1)}, res2 size: {len(res2)}, total_rows: {total_rows}"
-        )
-        print_debug_info()
-
     assert len(res1) + len(res2) == total_rows
 
     # Checking that all engines have made progress
@@ -1503,8 +1444,8 @@ def test_settings_check(started_cluster):
     node = started_cluster.instances["instance"]
     node_2 = started_cluster.instances["instance2"]
     table_name = f"test_settings_check"
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
+    dst_table_name = f"{table_name}_dst"
+    keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
     mode = "ordered"
 
@@ -1546,10 +1487,7 @@ 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"
-    # A unique path is necessary for repeatable tests
-    keeper_path = (
-        f"/clickhouse/test_{table_name}_{processing_threads}_{generate_random_string()}"
-    )
+    keeper_path = f"/clickhouse/test_{table_name}_{processing_threads}"
     files_path = f"{table_name}_data"
     files_to_generate = 10
 
@@ -1600,10 +1538,7 @@ def test_processed_file_setting_distributed(started_cluster, processing_threads)
     node_2 = started_cluster.instances["instance2"]
     table_name = f"test_processed_file_setting_distributed_{processing_threads}"
     dst_table_name = f"{table_name}_dst"
-    # A unique path is necessary for repeatable tests
-    keeper_path = (
-        f"/clickhouse/test_{table_name}_{processing_threads}_{generate_random_string()}"
-    )
+    keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
     files_to_generate = 10
 
@@ -1657,8 +1592,7 @@ def test_upgrade(started_cluster):
 
     table_name = f"test_upgrade"
     dst_table_name = f"{table_name}_dst"
-    # A unique path is necessary for repeatable tests
-    keeper_path = f"/clickhouse/test_{table_name}_{generate_random_string()}"
+    keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
     files_to_generate = 10
 
@@ -1697,8 +1631,7 @@ def test_upgrade(started_cluster):
 def test_exception_during_insert(started_cluster):
     node = started_cluster.instances["instance_too_many_parts"]
 
-    # A unique table name is necessary for repeatable tests
-    table_name = f"test_exception_during_insert_{generate_random_string()}"
+    table_name = f"test_exception_during_insert"
     dst_table_name = f"{table_name}_dst"
     keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
@@ -1714,7 +1647,6 @@ def test_exception_during_insert(started_cluster):
             "keeper_path": keeper_path,
         },
     )
-    node.rotate_logs()
     total_values = generate_random_files(
         started_cluster, files_path, files_to_generate, start_ind=0, row_num=1
     )
@@ -1731,49 +1663,33 @@ def test_exception_during_insert(started_cluster):
     )
     assert "Too many parts" in exception
 
-    original_parts_to_throw_insert = 0
-    modified_parts_to_throw_insert = 10
     node.replace_in_config(
         "/etc/clickhouse-server/config.d/merge_tree.xml",
-        f"parts_to_throw_insert>{original_parts_to_throw_insert}",
-        f"parts_to_throw_insert>{modified_parts_to_throw_insert}",
+        "parts_to_throw_insert>0",
+        "parts_to_throw_insert>10",
     )
-    try:
-        node.restart_clickhouse()
+    node.restart_clickhouse()
 
-        def get_count():
-            return int(node.query(f"SELECT count() FROM {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()
-    finally:
-        node.replace_in_config(
-            "/etc/clickhouse-server/config.d/merge_tree.xml",
-            f"parts_to_throw_insert>{modified_parts_to_throw_insert}",
-            f"parts_to_throw_insert>{original_parts_to_throw_insert}",
-        )
-        node.restart_clickhouse()
+    expected_rows = 10
+    for _ in range(20):
+        if expected_rows == get_count():
+            break
+        time.sleep(1)
+    assert expected_rows == get_count()
 
 
 def test_commit_on_limit(started_cluster):
     node = started_cluster.instances["instance"]
 
-    # A unique table name is necessary for repeatable tests
-    table_name = f"test_commit_on_limit_{generate_random_string()}"
+    table_name = f"test_commit_on_limit"
     dst_table_name = f"{table_name}_dst"
     keeper_path = f"/clickhouse/test_{table_name}"
     files_path = f"{table_name}_data"
     files_to_generate = 10
 
-    failed_files_event_before = int(
-        node.query(
-            "SELECT value FROM system.events WHERE name = 'ObjectStorageQueueFailedFiles' SETTINGS system_events_show_zero_values=1"
-        )
-    )
     create_table(
         started_cluster,
         node,
@@ -1849,9 +1765,6 @@ def test_commit_on_limit(started_cluster):
     assert "test_999999.csv" in get_processed_files()
 
     assert 1 == int(
-        node.count_in_log(f"Setting file {files_path}/test_9999.csv as failed")
-    )
-    assert failed_files_event_before + 1 == int(
         node.query(
             "SELECT value FROM system.events WHERE name = 'ObjectStorageQueueFailedFiles' SETTINGS system_events_show_zero_values=1"
         )
diff --git a/tests/integration/test_system_flush_logs/test.py b/tests/integration/test_system_flush_logs/test.py
index cfecea5b3d6..2022f9d4a89 100644
--- a/tests/integration/test_system_flush_logs/test.py
+++ b/tests/integration/test_system_flush_logs/test.py
@@ -4,7 +4,7 @@
 
 import pytest
 from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import assert_eq_with_retry, assert_logs_contain_with_retry, TSV
+from helpers.test_tools import assert_eq_with_retry
 
 cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
@@ -12,6 +12,18 @@ node = cluster.add_instance(
     stay_alive=True,
 )
 
+system_logs = [
+    # disabled by default
+    ("system.text_log", 0),
+    # enabled by default
+    ("system.query_log", 1),
+    ("system.query_thread_log", 1),
+    ("system.part_log", 1),
+    ("system.trace_log", 1),
+    ("system.metric_log", 1),
+    ("system.error_log", 1),
+]
+
 
 @pytest.fixture(scope="module", autouse=True)
 def start_cluster():
@@ -22,28 +34,22 @@ def start_cluster():
         cluster.shutdown()
 
 
-def test_system_logs_exists():
-    system_logs = [
-        ("system.text_log", 1),
-        ("system.query_log", 1),
-        ("system.query_thread_log", 1),
-        ("system.part_log", 1),
-        ("system.trace_log", 1),
-        ("system.metric_log", 1),
-        ("system.error_log", 1),
-    ]
-
+@pytest.fixture(scope="function")
+def flush_logs():
     node.query("SYSTEM FLUSH LOGS")
-    for table, exists in system_logs:
-        q = "SELECT * FROM {}".format(table)
-        if exists:
-            node.query(q)
-        else:
-            response = node.query_and_get_error(q)
-            assert (
-                "Table {} does not exist".format(table) in response
-                or "Unknown table expression identifier '{}'".format(table) in response
-            )
+
+
+@pytest.mark.parametrize("table,exists", system_logs)
+def test_system_logs(flush_logs, table, exists):
+    q = "SELECT * FROM {}".format(table)
+    if exists:
+        node.query(q)
+    else:
+        response = node.query_and_get_error(q)
+        assert (
+            "Table {} does not exist".format(table) in response
+            or "Unknown table expression identifier '{}'".format(table) in response
+        )
 
 
 # Logic is tricky, let's check that there is no hang in case of message queue
@@ -62,19 +68,14 @@ def test_system_logs_non_empty_queue():
 
 
 def test_system_suspend():
-    try:
-        node.query("CREATE TABLE t (x DateTime) ENGINE=Memory;")
-        node.query("INSERT INTO t VALUES (now());")
-        node.query("SYSTEM SUSPEND FOR 1 SECOND;")
-        node.query("INSERT INTO t VALUES (now());")
-        assert "1\n" == node.query("SELECT max(x) - min(x) >= 1 FROM t;")
-    finally:
-        node.query("DROP TABLE IF EXISTS t;")
+    node.query("CREATE TABLE t (x DateTime) ENGINE=Memory;")
+    node.query("INSERT INTO t VALUES (now());")
+    node.query("SYSTEM SUSPEND FOR 1 SECOND;")
+    node.query("INSERT INTO t VALUES (now());")
+    assert "1\n" == node.query("SELECT max(x) - min(x) >= 1 FROM t;")
 
 
 def test_log_max_size(start_cluster):
-    # we do misconfiguration here: buffer_size_rows_flush_threshold > max_size_rows, flush_interval_milliseconds is huge
-    # no auto flush by size not by time has a chance
     node.exec_in_container(
         [
             "bash",
@@ -83,7 +84,6 @@ def test_log_max_size(start_cluster):
         <clickhouse>
             <query_log>
                 <flush_interval_milliseconds replace=\\"replace\\">1000000</flush_interval_milliseconds>
-                <buffer_size_rows_flush_threshold replace=\\"replace\\">1000000</buffer_size_rows_flush_threshold>
                 <max_size_rows replace=\\"replace\\">10</max_size_rows>
                 <reserved_size_rows replace=\\"replace\\">10</reserved_size_rows>
             </query_log>
@@ -92,24 +92,11 @@ def test_log_max_size(start_cluster):
         """,
         ]
     )
-
-    node.query("SYSTEM FLUSH LOGS")
-    node.query(f"TRUNCATE TABLE IF EXISTS system.query_log")
     node.restart_clickhouse()
-
-    # all logs records above max_size_rows are lost
-    # The accepted logs records are never flushed until system flush logs is called by us
-    for i in range(21):
+    for i in range(10):
         node.query(f"select {i}")
-    node.query("system flush logs")
-
-    assert_logs_contain_with_retry(
-        node, "Queue had been full at 0, accepted 10 logs, ignored 34 logs."
-    )
-    assert node.query(
-        "select count() >= 10, count() < 20 from system.query_log"
-    ) == TSV([[1, 1]])
 
+    assert node.query("select count() >= 10 from system.query_log") == "1\n"
     node.exec_in_container(
         ["rm", f"/etc/clickhouse-server/config.d/yyy-override-query_log.xml"]
     )
diff --git a/tests/integration/test_system_logs_recreate/test.py b/tests/integration/test_system_logs_recreate/test.py
index 8b84734ed02..1bdb1fe3261 100644
--- a/tests/integration/test_system_logs_recreate/test.py
+++ b/tests/integration/test_system_logs_recreate/test.py
@@ -33,139 +33,124 @@ def test_system_logs_recreate():
         "error_log",
     ]
 
-    try:
-        node.query("SYSTEM FLUSH LOGS")
-        for table in system_logs:
-            assert "ENGINE = MergeTree" in node.query(
-                f"SHOW CREATE TABLE system.{table}"
-            )
-            assert "ENGINE = Null" not in node.query(
-                f"SHOW CREATE TABLE system.{table}"
-            )
-            assert (
-                len(
-                    node.query(f"SHOW TABLES FROM system LIKE '{table}%'")
-                    .strip()
-                    .split("\n")
-                )
-                == 1
+    node.query("SYSTEM FLUSH LOGS")
+    for table in system_logs:
+        assert "ENGINE = MergeTree" in node.query(f"SHOW CREATE TABLE system.{table}")
+        assert "ENGINE = Null" not in node.query(f"SHOW CREATE TABLE system.{table}")
+        assert (
+            len(
+                node.query(f"SHOW TABLES FROM system LIKE '{table}%'")
+                .strip()
+                .split("\n")
             )
+            == 1
+        )
 
-        # NOTE: we use zzz- prefix to make it the last file,
-        # so that it will be applied last.
-        for table in system_logs:
-            node.exec_in_container(
-                [
-                    "bash",
-                    "-c",
-                    f"""echo "
-            <clickhouse>
-                <{table}>
-                    <engine>ENGINE = Null</engine>
-                    <partition_by remove='remove'/>
-                </{table}>
-            </clickhouse>
-            " > /etc/clickhouse-server/config.d/zzz-override-{table}.xml
-            """,
-                ]
-            )
+    # NOTE: we use zzz- prefix to make it the last file,
+    # so that it will be applied last.
+    for table in system_logs:
+        node.exec_in_container(
+            [
+                "bash",
+                "-c",
+                f"""echo "
+        <clickhouse>
+            <{table}>
+                 <engine>ENGINE = Null</engine>
+                 <partition_by remove='remove'/>
+            </{table}>
+        </clickhouse>
+        " > /etc/clickhouse-server/config.d/zzz-override-{table}.xml
+        """,
+            ]
+        )
 
-        node.restart_clickhouse()
-        node.query("SYSTEM FLUSH LOGS")
-        for table in system_logs:
-            assert "ENGINE = MergeTree" not in node.query(
-                f"SHOW CREATE TABLE system.{table}"
-            )
-            assert "ENGINE = Null" in node.query(f"SHOW CREATE TABLE system.{table}")
-            assert (
-                len(
-                    node.query(f"SHOW TABLES FROM system LIKE '{table}%'")
-                    .strip()
-                    .split("\n")
-                )
-                == 2
+    node.restart_clickhouse()
+    node.query("SYSTEM FLUSH LOGS")
+    for table in system_logs:
+        assert "ENGINE = MergeTree" not in node.query(
+            f"SHOW CREATE TABLE system.{table}"
+        )
+        assert "ENGINE = Null" in node.query(f"SHOW CREATE TABLE system.{table}")
+        assert (
+            len(
+                node.query(f"SHOW TABLES FROM system LIKE '{table}%'")
+                .strip()
+                .split("\n")
             )
+            == 2
+        )
 
-        # apply only storage_policy for all system tables
-        for table in system_logs:
-            node.exec_in_container(
-                [
-                    "bash",
-                    "-c",
-                    f"""echo "
-            <clickhouse>
-                <{table}>
-                    <storage_policy>system_tables</storage_policy>
-                </{table}>
-            </clickhouse>
-            " > /etc/clickhouse-server/config.d/zzz-override-{table}.xml
-            """,
-                ]
-            )
-        node.restart_clickhouse()
-        node.query("SYSTEM FLUSH LOGS")
-        import logging
+    # apply only storage_policy for all system tables
+    for table in system_logs:
+        node.exec_in_container(
+            [
+                "bash",
+                "-c",
+                f"""echo "
+        <clickhouse>
+            <{table}>
+                 <storage_policy>system_tables</storage_policy>
+            </{table}>
+        </clickhouse>
+        " > /etc/clickhouse-server/config.d/zzz-override-{table}.xml
+        """,
+            ]
+        )
+    node.restart_clickhouse()
+    node.query("SYSTEM FLUSH LOGS")
+    import logging
 
-        for table in system_logs:
-            create_table_sql = node.query(
-                f"SHOW CREATE TABLE system.{table} FORMAT TSVRaw"
-            )
-            logging.debug(
-                "With storage policy, SHOW CREATE TABLE system.%s is: %s",
-                table,
-                create_table_sql,
-            )
-            assert "ENGINE = MergeTree" in create_table_sql
-            assert "ENGINE = Null" not in create_table_sql
-            assert "SETTINGS storage_policy = 'system_tables'" in create_table_sql
-            assert (
-                len(
-                    node.query(f"SHOW TABLES FROM system LIKE '{table}%'")
-                    .strip()
-                    .split("\n")
-                )
-                == 3
+    for table in system_logs:
+        create_table_sql = node.query(f"SHOW CREATE TABLE system.{table} FORMAT TSVRaw")
+        logging.debug(
+            "With storage policy, SHOW CREATE TABLE system.%s is: %s",
+            table,
+            create_table_sql,
+        )
+        assert "ENGINE = MergeTree" in create_table_sql
+        assert "ENGINE = Null" not in create_table_sql
+        assert "SETTINGS storage_policy = 'system_tables'" in create_table_sql
+        assert (
+            len(
+                node.query(f"SHOW TABLES FROM system LIKE '{table}%'")
+                .strip()
+                .split("\n")
             )
+            == 3
+        )
 
-        for table in system_logs:
-            node.exec_in_container(
-                ["rm", f"/etc/clickhouse-server/config.d/zzz-override-{table}.xml"]
-            )
+    for table in system_logs:
+        node.exec_in_container(
+            ["rm", f"/etc/clickhouse-server/config.d/zzz-override-{table}.xml"]
+        )
 
-        node.restart_clickhouse()
-        node.query("SYSTEM FLUSH LOGS")
-        for table in system_logs:
-            assert "ENGINE = MergeTree" in node.query(
-                f"SHOW CREATE TABLE system.{table}"
-            )
-            assert "ENGINE = Null" not in node.query(
-                f"SHOW CREATE TABLE system.{table}"
-            )
-            assert (
-                len(
-                    node.query(f"SHOW TABLES FROM system LIKE '{table}%'")
-                    .strip()
-                    .split("\n")
-                )
-                == 4
+    node.restart_clickhouse()
+    node.query("SYSTEM FLUSH LOGS")
+    for table in system_logs:
+        assert "ENGINE = MergeTree" in node.query(f"SHOW CREATE TABLE system.{table}")
+        assert "ENGINE = Null" not in node.query(f"SHOW CREATE TABLE system.{table}")
+        assert (
+            len(
+                node.query(f"SHOW TABLES FROM system LIKE '{table}%'")
+                .strip()
+                .split("\n")
             )
+            == 4
+        )
 
-        node.query("SYSTEM FLUSH LOGS")
-        # Ensure that there was no superfluous RENAME's
-        # IOW that the table created only when the structure is indeed different.
-        for table in system_logs:
-            assert (
-                len(
-                    node.query(f"SHOW TABLES FROM system LIKE '{table}%'")
-                    .strip()
-                    .split("\n")
-                )
-                == 4
+    node.query("SYSTEM FLUSH LOGS")
+    # Ensure that there was no superfluous RENAME's
+    # IOW that the table created only when the structure is indeed different.
+    for table in system_logs:
+        assert (
+            len(
+                node.query(f"SHOW TABLES FROM system LIKE '{table}%'")
+                .strip()
+                .split("\n")
             )
-    finally:
-        for table in system_logs:
-            for syffix in range(3):
-                node.query(f"DROP TABLE IF EXISTS system.{table}_{syffix} sync")
+            == 4
+        )
 
 
 def test_drop_system_log():
@@ -188,20 +173,11 @@ def test_drop_system_log():
     node.query("system flush logs")
     node.query("select 2")
     node.query("system flush logs")
-    assert node.query("select count() >= 2 from system.query_log") == "1\n"
-
+    assert node.query("select count() > 0 from system.query_log") == "1\n"
     node.query("drop table system.query_log sync")
     node.query("select 3")
     node.query("system flush logs")
-    assert node.query("select count() >= 1 from system.query_log") == "1\n"
-
-    node.query("drop table system.query_log sync")
-    node.restart_clickhouse()
-    node.query("system flush logs")
-    assert (
-        node.query("select count() >= 0 from system.query_log") == "1\n"
-    )  # we check that query_log just exists
-
+    assert node.query("select count() > 0 from system.query_log") == "1\n"
     node.exec_in_container(
         ["rm", f"/etc/clickhouse-server/config.d/yyy-override-query_log.xml"]
     )
diff --git a/tests/integration/test_temporary_data_in_cache/configs/config.d/storage_configuration.xml b/tests/integration/test_temporary_data_in_cache/configs/config.d/storage_configuration.xml
index 107864fde0c..5a087d03266 100644
--- a/tests/integration/test_temporary_data_in_cache/configs/config.d/storage_configuration.xml
+++ b/tests/integration/test_temporary_data_in_cache/configs/config.d/storage_configuration.xml
@@ -10,9 +10,9 @@
                 <type>cache</type>
                 <disk>local_disk</disk>
                 <path>/tiny_local_cache/</path>
-                <max_size>12M</max_size>
-                <max_file_segment_size>100K</max_file_segment_size>
-                <boundary_alignment>100K</boundary_alignment>
+                <max_size>10M</max_size>
+                <max_file_segment_size>1M</max_file_segment_size>
+                <boundary_alignment>1M</boundary_alignment>
                 <cache_on_write_operations>1</cache_on_write_operations>
             </tiny_local_cache>
 
diff --git a/tests/integration/test_temporary_data_in_cache/test.py b/tests/integration/test_temporary_data_in_cache/test.py
index 87192a20975..cab134dcce2 100644
--- a/tests/integration/test_temporary_data_in_cache/test.py
+++ b/tests/integration/test_temporary_data_in_cache/test.py
@@ -7,9 +7,6 @@ import fnmatch
 from helpers.cluster import ClickHouseCluster
 from helpers.client import QueryRuntimeException
 
-
-MB = 1024 * 1024
-
 cluster = ClickHouseCluster(__file__)
 
 node = cluster.add_instance(
@@ -39,30 +36,15 @@ def test_cache_evicted_by_temporary_data(start_cluster):
         q("SELECT sum(size) FROM system.filesystem_cache").strip()
     )
 
-    dump_debug_info = lambda: "\n".join(
-        [
-            ">>> filesystem_cache <<<",
-            q("SELECT * FROM system.filesystem_cache FORMAT Vertical"),
-            ">>> remote_data_paths <<<",
-            q("SELECT * FROM system.remote_data_paths FORMAT Vertical"),
-            ">>> tiny_local_cache_local_disk <<<",
-            q(
-                "SELECT * FROM system.disks WHERE name = 'tiny_local_cache_local_disk' FORMAT Vertical"
-            ),
-        ]
-    )
+    assert get_cache_size() == 0
 
-    q("SYSTEM DROP FILESYSTEM CACHE")
-    q("DROP TABLE IF EXISTS t1 SYNC")
-
-    assert get_cache_size() == 0, dump_debug_info()
-    assert get_free_space() > 8 * MB, dump_debug_info()
+    assert get_free_space() > 8 * 1024 * 1024
 
     # Codec is NONE to make cache size predictable
     q(
-        "CREATE TABLE t1 (x UInt64 CODEC(NONE)) ENGINE = MergeTree ORDER BY x SETTINGS storage_policy = 'tiny_local_cache'"
+        "CREATE TABLE t1 (x UInt64 CODEC(NONE), y UInt64 CODEC(NONE)) ENGINE = MergeTree ORDER BY x SETTINGS storage_policy = 'tiny_local_cache'"
     )
-    q("INSERT INTO t1 SELECT number FROM numbers(1024 * 1024)")
+    q("INSERT INTO t1 SELECT number, number FROM numbers(1024 * 1024)")
 
     # To be sure that nothing is reading the cache and entries for t1 can be evited
     q("OPTIMIZE TABLE t1 FINAL")
@@ -72,11 +54,11 @@ def test_cache_evicted_by_temporary_data(start_cluster):
     q("SELECT sum(x) FROM t1")
 
     cache_size_with_t1 = get_cache_size()
-    assert cache_size_with_t1 > 8 * MB, dump_debug_info()
+    assert cache_size_with_t1 > 8 * 1024 * 1024
 
     # Almost all disk space is occupied by t1 cache
     free_space_with_t1 = get_free_space()
-    assert free_space_with_t1 < 4 * MB, dump_debug_info()
+    assert free_space_with_t1 < 4 * 1024 * 1024
 
     # Try to sort the table, but fail because of lack of disk space
     with pytest.raises(QueryRuntimeException) as exc:
@@ -94,27 +76,31 @@ def test_cache_evicted_by_temporary_data(start_cluster):
 
     # Some data evicted from cache by temporary data
     cache_size_after_eviction = get_cache_size()
-    assert cache_size_after_eviction < cache_size_with_t1, dump_debug_info()
+    assert cache_size_after_eviction < cache_size_with_t1
 
     # Disk space freed, at least 3 MB, because temporary data tried to write 4 MB
-    assert get_free_space() > free_space_with_t1 + 3 * MB, dump_debug_info()
+    assert get_free_space() > free_space_with_t1 + 3 * 1024 * 1024
 
     # Read some data to fill the cache again
-    q("SELECT avg(x) FROM t1")
+    q("SELECT avg(y) FROM t1")
 
     cache_size_with_t1 = get_cache_size()
-    assert cache_size_with_t1 > 8 * MB, dump_debug_info()
+    assert cache_size_with_t1 > 8 * 1024 * 1024, q(
+        "SELECT * FROM system.filesystem_cache FORMAT Vertical"
+    )
 
     # Almost all disk space is occupied by t1 cache
     free_space_with_t1 = get_free_space()
-    assert free_space_with_t1 < 4 * MB, dump_debug_info()
+    assert free_space_with_t1 < 4 * 1024 * 1024, q(
+        "SELECT * FROM system.disks WHERE name = 'tiny_local_cache_local_disk' FORMAT Vertical"
+    )
 
     node.http_query(
         "SELECT randomPrintableASCII(1024) FROM numbers(8 * 1024) FORMAT TSV",
         params={"buffer_size": 0, "wait_end_of_query": 1},
     )
 
-    assert get_free_space() > free_space_with_t1 + 3 * MB, dump_debug_info()
+    assert get_free_space() > free_space_with_t1 + 3 * 1024 * 1024
 
     # not enough space for buffering 32 MB
     with pytest.raises(Exception) as exc:
@@ -126,4 +112,4 @@ def test_cache_evicted_by_temporary_data(start_cluster):
         str(exc.value), "*Failed to reserve * for temporary file*"
     ), exc.value
 
-    q("DROP TABLE IF EXISTS t1 SYNC")
+    q("DROP TABLE IF EXISTS t1")
diff --git a/tests/integration/test_throttling/test.py b/tests/integration/test_throttling/test.py
index 4bd96e2756d..c53c2bb1ddf 100644
--- a/tests/integration/test_throttling/test.py
+++ b/tests/integration/test_throttling/test.py
@@ -121,15 +121,21 @@ def node_update_config(mode, setting, value=None):
     node.restart_clickhouse()
 
 
-def assert_took(took, should_take):
+def assert_took(took, should_took):
     # we need to decrease the lower limit because the server limits could
     # be enforced by throttling some server background IO instead of query IO
     # and we have no control over it
-    assert took >= should_take * 0.85
+    #
+    # and the same for upper limit, it can be slightly larger, due to for
+    # instance network latencies or CPU starvation
+    if should_took > 0:
+        assert took >= should_took * 0.85 and took <= should_took * 1.8
+    else:
+        assert took >= should_took * 0.85
 
 
 @pytest.mark.parametrize(
-    "policy,backup_name,mode,setting,value,should_take",
+    "policy,backup_name,mode,setting,value,should_took",
     [
         #
         # Local -> Local
@@ -143,7 +149,7 @@ def assert_took(took, should_take):
             0,
             id="no_local_throttling",
         ),
-        # reading 1e6*8 bytes with 1M default bandwidth should take (8-1)/1=7 seconds
+        # reading 1e6*8 bytes with 1M default bandwith should take (8-1)/1=7 seconds
         pytest.param(
             "default",
             next_backup_name("local"),
@@ -153,7 +159,7 @@ def assert_took(took, should_take):
             7,
             id="user_local_throttling",
         ),
-        # reading 1e6*8 bytes with 2M default bandwidth should take (8-2)/2=3 seconds
+        # reading 1e6*8 bytes with 2M default bandwith should take (8-2)/2=3 seconds
         pytest.param(
             "default",
             next_backup_name("local"),
@@ -175,7 +181,7 @@ def assert_took(took, should_take):
             0,
             id="no_remote_to_local_throttling",
         ),
-        # reading 1e6*8 bytes with 1M default bandwidth should take (8-1)/1=7 seconds
+        # reading 1e6*8 bytes with 1M default bandwith should take (8-1)/1=7 seconds
         pytest.param(
             "s3",
             next_backup_name("local"),
@@ -185,7 +191,7 @@ def assert_took(took, should_take):
             7,
             id="user_remote_to_local_throttling",
         ),
-        # reading 1e6*8 bytes with 2M default bandwidth should take (8-2)/2=3 seconds
+        # reading 1e6*8 bytes with 2M default bandwith should take (8-2)/2=3 seconds
         pytest.param(
             "s3",
             next_backup_name("local"),
@@ -246,7 +252,7 @@ def assert_took(took, should_take):
             0,
             id="no_local_to_remote_throttling",
         ),
-        # reading 1e6*8 bytes with 1M default bandwidth should take (8-1)/1=7 seconds
+        # reading 1e6*8 bytes with 1M default bandwith should take (8-1)/1=7 seconds
         pytest.param(
             "default",
             next_backup_name("remote"),
@@ -256,7 +262,7 @@ def assert_took(took, should_take):
             7,
             id="user_local_to_remote_throttling",
         ),
-        # reading 1e6*8 bytes with 2M default bandwidth should take (8-2)/2=3 seconds
+        # reading 1e6*8 bytes with 2M default bandwith should take (8-2)/2=3 seconds
         pytest.param(
             "default",
             next_backup_name("remote"),
@@ -268,7 +274,7 @@ def assert_took(took, should_take):
         ),
     ],
 )
-def test_backup_throttling(policy, backup_name, mode, setting, value, should_take):
+def test_backup_throttling(policy, backup_name, mode, setting, value, should_took):
     node_update_config(mode, setting, value)
     node.query(
         f"""
@@ -278,7 +284,7 @@ def test_backup_throttling(policy, backup_name, mode, setting, value, should_tak
     """
     )
     _, took = elapsed(node.query, f"backup table data to {backup_name}")
-    assert_took(took, should_take)
+    assert_took(took, should_took)
 
 
 def test_backup_throttling_override():
@@ -299,18 +305,18 @@ def test_backup_throttling_override():
             "max_backup_bandwidth": "500K",
         },
     )
-    # reading 1e6*8 bytes with 500Ki default bandwidth should take (8-0.5)/0.5=15 seconds
+    # reading 1e6*8 bytes with 500Ki default bandwith should take (8-0.5)/0.5=15 seconds
     assert_took(took, 15)
 
 
 @pytest.mark.parametrize(
-    "policy,mode,setting,value,should_take",
+    "policy,mode,setting,value,should_took",
     [
         #
         # Local
         #
         pytest.param("default", None, None, None, 0, id="no_local_throttling"),
-        # reading 1e6*8 bytes with 1M default bandwidth should take (8-1)/1=7 seconds
+        # reading 1e6*8 bytes with 1M default bandwith should take (8-1)/1=7 seconds
         pytest.param(
             "default",
             "user",
@@ -319,7 +325,7 @@ def test_backup_throttling_override():
             7,
             id="user_local_throttling",
         ),
-        # reading 1e6*8 bytes with 2M default bandwidth should take (8-2)/2=3 seconds
+        # reading 1e6*8 bytes with 2M default bandwith should take (8-2)/2=3 seconds
         pytest.param(
             "default",
             "server",
@@ -332,7 +338,7 @@ def test_backup_throttling_override():
         # Remote
         #
         pytest.param("s3", None, None, None, 0, id="no_remote_throttling"),
-        # reading 1e6*8 bytes with 1M default bandwidth should take (8-1)/1=7 seconds
+        # reading 1e6*8 bytes with 1M default bandwith should take (8-1)/1=7 seconds
         pytest.param(
             "s3",
             "user",
@@ -341,7 +347,7 @@ def test_backup_throttling_override():
             7,
             id="user_remote_throttling",
         ),
-        # reading 1e6*8 bytes with 2M default bandwidth should take (8-2)/2=3 seconds
+        # reading 1e6*8 bytes with 2M default bandwith should take (8-2)/2=3 seconds
         pytest.param(
             "s3",
             "server",
@@ -352,7 +358,7 @@ def test_backup_throttling_override():
         ),
     ],
 )
-def test_read_throttling(policy, mode, setting, value, should_take):
+def test_read_throttling(policy, mode, setting, value, should_took):
     node_update_config(mode, setting, value)
     node.query(
         f"""
@@ -362,17 +368,17 @@ def test_read_throttling(policy, mode, setting, value, should_take):
     """
     )
     _, took = elapsed(node.query, f"select * from data")
-    assert_took(took, should_take)
+    assert_took(took, should_took)
 
 
 @pytest.mark.parametrize(
-    "policy,mode,setting,value,should_take",
+    "policy,mode,setting,value,should_took",
     [
         #
         # Local
         #
         pytest.param("default", None, None, None, 0, id="no_local_throttling"),
-        # reading 1e6*8 bytes with 1M default bandwidth should take (8-1)/1=7 seconds
+        # reading 1e6*8 bytes with 1M default bandwith should take (8-1)/1=7 seconds
         pytest.param(
             "default",
             "user",
@@ -381,7 +387,7 @@ def test_read_throttling(policy, mode, setting, value, should_take):
             7,
             id="local_user_throttling",
         ),
-        # reading 1e6*8 bytes with 2M default bandwidth should take (8-2)/2=3 seconds
+        # reading 1e6*8 bytes with 2M default bandwith should take (8-2)/2=3 seconds
         pytest.param(
             "default",
             "server",
@@ -394,7 +400,7 @@ def test_read_throttling(policy, mode, setting, value, should_take):
         # Remote
         #
         pytest.param("s3", None, None, None, 0, id="no_remote_throttling"),
-        # writing 1e6*8 bytes with 1M default bandwidth should take (8-1)/1=7 seconds
+        # writing 1e6*8 bytes with 1M default bandwith should take (8-1)/1=7 seconds
         pytest.param(
             "s3",
             "user",
@@ -403,7 +409,7 @@ def test_read_throttling(policy, mode, setting, value, should_take):
             7,
             id="user_remote_throttling",
         ),
-        # writing 1e6*8 bytes with 2M default bandwidth should take (8-2)/2=3 seconds
+        # writing 1e6*8 bytes with 2M default bandwith should take (8-2)/2=3 seconds
         pytest.param(
             "s3",
             "server",
@@ -414,7 +420,7 @@ def test_read_throttling(policy, mode, setting, value, should_take):
         ),
     ],
 )
-def test_write_throttling(policy, mode, setting, value, should_take):
+def test_write_throttling(policy, mode, setting, value, should_took):
     node_update_config(mode, setting, value)
     node.query(
         f"""
@@ -423,7 +429,7 @@ def test_write_throttling(policy, mode, setting, value, should_take):
     """
     )
     _, took = elapsed(node.query, f"insert into data select * from numbers(1e6)")
-    assert_took(took, should_take)
+    assert_took(took, should_took)
 
 
 def test_max_mutations_bandwidth_for_server():
@@ -438,7 +444,7 @@ def test_max_mutations_bandwidth_for_server():
         node.query,
         "alter table data update key = -key where 1 settings mutations_sync = 1",
     )
-    # reading 1e6*8 bytes with 1M/s bandwidth should take (8-1)/1=7 seconds
+    # reading 1e6*8 bytes with 1M/s bandwith should take (8-1)/1=7 seconds
     assert_took(took, 7)
 
 
@@ -451,5 +457,5 @@ def test_max_merges_bandwidth_for_server():
     )
     node.query("insert into data select * from numbers(1e6)")
     _, took = elapsed(node.query, "optimize table data final")
-    # reading 1e6*8 bytes with 1M/s bandwidth should take (8-1)/1=7 seconds
+    # reading 1e6*8 bytes with 1M/s bandwith should take (8-1)/1=7 seconds
     assert_took(took, 7)
diff --git a/tests/integration/test_truncate_database/test_distributed.py b/tests/integration/test_truncate_database/test_distributed.py
index 6b822077a3c..fed3d16d190 100644
--- a/tests/integration/test_truncate_database/test_distributed.py
+++ b/tests/integration/test_truncate_database/test_distributed.py
@@ -1,36 +1,40 @@
 import pytest
+
 from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
 
 node1 = cluster.add_instance(
-    "node1", with_zookeeper=True, main_configs=["configs/distributed_servers.xml"]
+    "node1", main_configs=["configs/distributed_servers.xml"], with_zookeeper=True
 )
 node2 = cluster.add_instance(
     "node2", with_zookeeper=True, main_configs=["configs/distributed_servers.xml"]
 )
 
 
-def fill_nodes(nodes):
-    for node in nodes:
-        node.query(
-            """
-            DROP DATABASE IF EXISTS test;
-            CREATE DATABASE test;
-            CREATE TABLE test.local_table(id UInt32, val String) ENGINE = MergeTree ORDER BY id;
-            CREATE TABLE test.distributed(id UInt32, val String) ENGINE = Distributed(test_cluster, test, local_table);
-            INSERT INTO test.local_table VALUES ({pos}, '{replica}');
-            """.format(
-                pos=node.name[4:], replica=node.name
-            )
-        )
-
-
 @pytest.fixture(scope="module")
 def started_cluster():
     try:
         cluster.start()
 
+        for node in (node1, node2):
+            node.query(
+                """
+                CREATE DATABASE test;
+                CREATE TABLE test.local_table(id UInt32, val String) ENGINE = MergeTree ORDER BY id
+                """
+            )
+
+        node1.query("INSERT INTO test.local_table VALUES (1, 'node1')")
+        node2.query("INSERT INTO test.local_table VALUES (2, 'node2')")
+
+        node1.query(
+            "CREATE TABLE test.distributed(id UInt32, val String) ENGINE = Distributed(test_cluster, test, local_table)"
+        )
+        node2.query(
+            "CREATE TABLE test.distributed(id UInt32, val String) ENGINE = Distributed(test_cluster, test, local_table)"
+        )
+
         yield cluster
 
     finally:
@@ -38,8 +42,6 @@ def started_cluster():
 
 
 def test_truncate_database_distributed(started_cluster):
-    fill_nodes([node1, node2])
-
     query1 = "SELECT count() FROM test.distributed WHERE (id, val) IN ((1, 'node1'), (2, 'a'), (3, 'b'))"
     query2 = "SELECT sum((id, val) IN ((1, 'node1'), (2, 'a'), (3, 'b'))) FROM test.distributed"
     assert node1.query(query1) == "1\n"
diff --git a/tests/integration/test_truncate_database/test_replicated.py b/tests/integration/test_truncate_database/test_replicated.py
index edcc0446da3..59830d44378 100644
--- a/tests/integration/test_truncate_database/test_replicated.py
+++ b/tests/integration/test_truncate_database/test_replicated.py
@@ -1,3 +1,5 @@
+import time
+
 import pytest
 from helpers.cluster import ClickHouseCluster
 
@@ -6,9 +8,8 @@ def fill_nodes(nodes, shard):
     for node in nodes:
         node.query(
             """
-                DROP DATABASE IF EXISTS test;
                 CREATE DATABASE test;
-
+    
                 CREATE TABLE test.test_table(date Date, id UInt32)
                 ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/{shard}/replicated/test_table', '{replica}') ORDER BY id PARTITION BY toYYYYMM(date);
             """.format(
@@ -34,6 +35,8 @@ def start_cluster():
     try:
         cluster.start()
 
+        fill_nodes([node1, node2, node3], 1)
+
         yield cluster
 
     except Exception as ex:
@@ -44,13 +47,10 @@ def start_cluster():
 
 
 def test_truncate_database_replicated(start_cluster):
-    fill_nodes([node1, node2, node3], 1)
-
     node1.query(
         "INSERT INTO test.test_table SELECT number, toString(number) FROM numbers(100)"
     )
-    assert node2.query("SELECT min(id) FROM test.test_table") == "0\n"
-    assert node2.query("SELECT id FROM test.test_table ORDER BY id LIMIT 1") == "0\n"
+    assert node2.query("SELECT id FROM test.test_table LIMIT 1") == "0\n"
     assert node3.query("SHOW DATABASES LIKE 'test'") == "test\n"
     node3.query("TRUNCATE DATABASE test ON CLUSTER test_cluster SYNC")
     assert node2.query("SHOW TABLES FROM test") == ""
diff --git a/tests/integration/test_ttl_move/test.py b/tests/integration/test_ttl_move/test.py
index 925bdf9baaa..3b79ea7916d 100644
--- a/tests/integration/test_ttl_move/test.py
+++ b/tests/integration/test_ttl_move/test.py
@@ -76,7 +76,7 @@ def get_used_disks_for_table(node, table_name, partition=None):
     )
 
 
-def check_used_disks_with_retry(node, table_name, expected_disks, retries=1):
+def check_used_disks_with_retry(node, table_name, expected_disks, retries):
     for _ in range(retries):
         used_disks = get_used_disks_for_table(node, table_name)
         if set(used_disks).issubset(expected_disks):
@@ -1613,7 +1613,7 @@ def test_alter_with_merge_work(started_cluster, name, engine, positive):
             ALTER TABLE {name} MODIFY
             TTL d1 + INTERVAL 0 SECOND TO DISK 'jbod2',
                 d1 + INTERVAL 5 SECOND TO VOLUME 'external',
-                d1 + INTERVAL 30 SECOND DELETE
+                d1 + INTERVAL 10 SECOND DELETE
         """.format(
                 name=name
             )
@@ -1635,19 +1635,11 @@ 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"])
-            ), "Parts: " + node1.query(
-                f"SELECT disk_name, name FROM system.parts WHERE table = '{name}' AND active = 1"
-            )
+            assert check_used_disks_with_retry(node1, name, set(["external"]), 100)
         else:
-            assert check_used_disks_with_retry(
-                node1, name, set(["jbod1", "jbod2"])
-            ), "Parts: " + node1.query(
-                f"SELECT disk_name, name FROM system.parts WHERE table = '{name}' AND active = 1"
-            )
+            assert check_used_disks_with_retry(node1, name, set(["jbod1", "jbod2"]), 50)
 
-        time.sleep(25)
+        time.sleep(5)
 
         optimize_table(20)
 
diff --git a/tests/integration/test_version_update/configs/log_conf.xml b/tests/integration/test_version_update/configs/log_conf.xml
index 27c7107ce5e..f9d15e572aa 100644
--- a/tests/integration/test_version_update/configs/log_conf.xml
+++ b/tests/integration/test_version_update/configs/log_conf.xml
@@ -1,4 +1,4 @@
-<clickhouse>
+<yandex>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/log.log</log>
@@ -8,4 +8,4 @@
         <stderr>/var/log/clickhouse-server/stderr.log</stderr>
         <stdout>/var/log/clickhouse-server/stdout.log</stdout>
     </logger>
-</clickhouse>
+</yandex>
diff --git a/tests/jepsen.clickhouse/project.clj b/tests/jepsen.clickhouse/project.clj
index 79ebc2a9064..bb41be1ba10 100644
--- a/tests/jepsen.clickhouse/project.clj
+++ b/tests/jepsen.clickhouse/project.clj
@@ -7,13 +7,10 @@
   :main jepsen.clickhouse.main
   :plugins [[lein-cljfmt "0.7.0"]]
   :dependencies [[org.clojure/clojure "1.10.1"]
-                 [jepsen "0.2.7":exclusions [net.java.dev.jna/jna
-                                             net.java.dev.jna/jna-platform]]
+                 [jepsen "0.2.7"]
                  [zookeeper-clj "0.9.4"]
                  [org.clojure/java.jdbc "0.7.12"]
                  [com.hierynomus/sshj "0.34.0"]
-                 [net.java.dev.jna/jna "5.14.0"]
-                 [net.java.dev.jna/jna-platform "5.14.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}
diff --git a/tests/performance/all_join_opt.xml b/tests/performance/all_join_opt.xml
deleted file mode 100644
index 0ab9c39f67c..00000000000
--- a/tests/performance/all_join_opt.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<test>
-    <create_query>CREATE TABLE test (a Int64, b String, c LowCardinality(String)) ENGINE = MergeTree() ORDER BY a</create_query>
-    <create_query>CREATE TABLE test1 (a Int64, b String, c LowCardinality(String)) ENGINE = MergeTree() ORDER BY a</create_query>
-
-    <fill_query>INSERT INTO test SELECT number % 10000, number % 10000, number % 10000 FROM numbers(10000000)</fill_query>
-    <fill_query>INSERT INTO test1 SELECT number % 1000 , number % 1000, number % 1000 FROM numbers(100000)</fill_query>
-
-    <query tag='INNER'>SELECT MAX(test1.a) FROM test INNER JOIN test1 on test.b = test1.b</query>
-    <query tag='LEFT'>SELECT MAX(test1.a) FROM test LEFT JOIN test1 on test.b = test1.b</query>
-    <query tag='RIGHT'>SELECT MAX(test1.a) FROM test RIGHT JOIN test1 on test.b = test1.b</query>
-    <query tag='FULL'>SELECT MAX(test1.a) FROM test FULL JOIN test1 on test.b = test1.b</query>
-
-    <drop_query>DROP TABLE IF EXISTS test</drop_query>
-    <drop_query>DROP TABLE IF EXISTS test1</drop_query>
-</test>
\ No newline at end of file
diff --git a/tests/performance/array_reduce.xml b/tests/performance/array_reduce.xml
index 0f50eba43bf..8e271c155f3 100644
--- a/tests/performance/array_reduce.xml
+++ b/tests/performance/array_reduce.xml
@@ -1,8 +1,11 @@
 <test>
-    <query>SELECT arrayReduce('count', range(1000000)) FROM numbers_mt(500000000) format Null</query>
-    <query>SELECT arrayReduce('sum', range(1000000)) FROM numbers_mt(500000000) format Null</query>
-    <query>SELECT arrayReduceInRanges('count', [(1, 1000000)], range(1000000)) FROM numbers_mt(500000000) format Null</query>
-    <query>SELECT arrayReduceInRanges('sum', [(1, 1000000)], range(1000000)) FROM numbers_mt(500000000) format Null</query>
-    <query>SELECT arrayReduceInRanges('count', arrayZip(range(1000000), range(1000000)), range(1000000))[123456]</query>
-    <query>SELECT arrayReduceInRanges('sum', arrayZip(range(1000000), range(1000000)), range(1000000))[123456]</query>
+
+
+
+    <query>SELECT arrayReduce('count', range(100000000))</query>
+    <query>SELECT arrayReduce('sum', range(100000000))</query>
+    <query>SELECT arrayReduceInRanges('count', [(1, 100000000)], range(100000000))</query>
+    <query>SELECT arrayReduceInRanges('sum', [(1, 100000000)], range(100000000))</query>
+    <query>SELECT arrayReduceInRanges('count', arrayZip(range(1000000), range(1000000)), range(100000000))[123456]</query>
+    <query>SELECT arrayReduceInRanges('sum', arrayZip(range(1000000), range(1000000)), range(100000000))[123456]</query>
 </test>
diff --git a/tests/performance/decimal_aggregates.xml b/tests/performance/decimal_aggregates.xml
index 724d0c5d0e6..ec88be0124f 100644
--- a/tests/performance/decimal_aggregates.xml
+++ b/tests/performance/decimal_aggregates.xml
@@ -4,13 +4,8 @@
     </settings>
 
     <create_query>CREATE TABLE t (x UInt64, d32 Decimal32(3), d64 Decimal64(4), d128 Decimal128(5)) ENGINE = Memory</create_query>
-    <!-- use less threads and several queries to save memory -->
-    <fill_query>INSERT INTO t SELECT number AS x, x % 1000000 AS d32, x AS d64, x d128 FROM numbers_mt(100000000) SETTINGS max_threads = 2</fill_query>
-    <fill_query>INSERT INTO t SELECT number AS x, x % 1000000 AS d32, x AS d64, x d128 FROM numbers_mt(100000000, 100000000) SETTINGS max_threads = 2</fill_query>
-    <fill_query>INSERT INTO t SELECT number AS x, x % 1000000 AS d32, x AS d64, x d128 FROM numbers_mt(200000000, 100000000) SETTINGS max_threads = 2</fill_query>
-    <fill_query>INSERT INTO t SELECT number AS x, x % 1000000 AS d32, x AS d64, x d128 FROM numbers_mt(300000000, 100000000) SETTINGS max_threads = 2</fill_query>
-    <fill_query>INSERT INTO t SELECT number AS x, x % 1000000 AS d32, x AS d64, x d128 FROM numbers_mt(400000000, 100000000) SETTINGS max_threads = 2</fill_query>
-
+    <!-- use less threads to save memory -->
+    <fill_query>INSERT INTO t SELECT number AS x, x % 1000000 AS d32, x AS d64, x d128 FROM numbers_mt(500000000) SETTINGS max_threads = 8</fill_query>
     <drop_query>DROP TABLE IF EXISTS t</drop_query>
 
     <query>SELECT min(d32), max(d32), argMin(x, d32), argMax(x, d32) FROM t</query>
diff --git a/tests/performance/final_big_column.xml b/tests/performance/final_big_column.xml
index bc7c3570db6..5225b3d7ad4 100644
--- a/tests/performance/final_big_column.xml
+++ b/tests/performance/final_big_column.xml
@@ -10,8 +10,8 @@
         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(1000000)</fill_query>
-    <fill_query>INSERT INTO optimized_select_final SELECT toDate('2020-01-01'), 2*number+1, randomPrintableASCII(1000) FROM numbers(1000000)</fill_query>
+    <fill_query>INSERT INTO optimized_select_final SELECT toDate('2000-01-01'), 2*number, randomPrintableASCII(1000) FROM numbers(2500000)</fill_query>
+    <fill_query>INSERT INTO optimized_select_final SELECT toDate('2020-01-01'), 2*number+1, randomPrintableASCII(1000) FROM numbers(2500000)</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>
diff --git a/tests/performance/generate_table_function.xml b/tests/performance/generate_table_function.xml
index d56c585188d..c219d73b6cf 100644
--- a/tests/performance/generate_table_function.xml
+++ b/tests/performance/generate_table_function.xml
@@ -7,7 +7,7 @@
     <query>SELECT sum(NOT ignore(*)) FROM (SELECT * FROM generateRandom('d Date, dt DateTime, dtm DateTime(\'Asia/Istanbul\')', 0, 10, 10) LIMIT 1000000000);</query>
     <query>SELECT sum(NOT ignore(*)) FROM (SELECT * FROM generateRandom('dt64 DateTime64, dts64 DateTime64(6), dtms64 DateTime64(6 ,\'Asia/Istanbul\')', 0, 10, 10) LIMIT 100000000);</query>
     <query>SELECT sum(NOT ignore(*)) FROM (SELECT * FROM generateRandom('f32 Float32, f64 Float64', 0, 10, 10) LIMIT 1000000000);</query>
-    <query>SELECT sum(NOT ignore(*)) FROM (SELECT * FROM generateRandom('d32 Decimal32(4), d64 Decimal64(8), d128 Decimal128(16)', 0, 10, 10) LIMIT 100000000);</query>
+    <query>SELECT sum(NOT ignore(*)) FROM (SELECT * FROM generateRandom('d32 Decimal32(4), d64 Decimal64(8), d128 Decimal128(16)', 0, 10, 10) LIMIT 1000000000);</query>
     <query>SELECT sum(NOT ignore(*)) FROM (SELECT * FROM generateRandom('i Tuple(Int32, Int64)', 0, 10, 10) LIMIT 1000000000);</query>
     <query>SELECT sum(NOT ignore(*)) FROM (SELECT * FROM generateRandom('i Array(Int8)', 0, 10, 10) LIMIT 100000000);</query>
     <query>SELECT sum(NOT ignore(*)) FROM (SELECT * FROM generateRandom('i Array(Nullable(Int32))', 0, 10, 10) LIMIT 100000000);</query>
diff --git a/tests/performance/insert_select_squashing.xml b/tests/performance/insert_select_squashing.xml
deleted file mode 100644
index 4c2c88f3d22..00000000000
--- a/tests/performance/insert_select_squashing.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<test>
-    <settings>
-        <max_block_size>1000</max_block_size>
-    </settings>
-
-    <create_query>
-CREATE TABLE squash_performance
-(
-    s1 String,
-    s2 Nullable(String),
-    a1 Array(Array(String)),
-    a2 Array(Array(UInt32)),
-    m1 Map(String, Array(String)),
-    m2 Map(String, Array(UInt64)),
-    t Tuple(String, Array(String), Map(String, String))
-)
-ENGINE = Null;
-    </create_query>
-
-    <query>INSERT INTO squash_performance SELECT * FROM generateRandom(42) LIMIT 500000</query>
-
-    <drop_query>DROP TABLE IF EXISTS squash_performance</drop_query>
-</test>
diff --git a/tests/performance/insert_select_squashing_dynamic.xml b/tests/performance/insert_select_squashing_dynamic.xml
deleted file mode 100644
index f7f600fd8bd..00000000000
--- a/tests/performance/insert_select_squashing_dynamic.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<test>
-    <settings>
-        <max_block_size>1000</max_block_size>
-        <enable_named_columns_in_function_tuple>0</enable_named_columns_in_function_tuple>
-        <allow_experimental_dynamic_type>1</allow_experimental_dynamic_type>
-    </settings>
-
-    <create_query>
-CREATE TABLE dynamic_squash_performance_1
-(
-    d Dynamic
-)
-ENGINE = Null;
-    </create_query>
-
-    <create_query>
-CREATE TABLE dynamic_squash_performance_2
-(
-    d Dynamic(max_types=6)
-)
-ENGINE = Null;
-    </create_query>
-
-    <create_query>
-CREATE TABLE src_dynamic_squash_performance_1
-(
-    d Dynamic
-)
-ENGINE = Memory;
-    </create_query>
-
-    <create_query>
-CREATE TABLE src_dynamic_squash_performance_2
-(
-    d Dynamic(max_types=6)
-)
-ENGINE = Memory;
-    </create_query>
-
-    <fill_query>
-<![CDATA[insert into src_dynamic_squash_performance_1 select multiIf(number % 15000 < 1000, multiIf(number % 15 < 1,tuple(range(number % 100))::Tuple(b1v1 Array(UInt64))::Dynamic, number % 15 < 3,tuple(range(number % 100))::Tuple(b1v2 Array(UInt64))::Dynamic, number % 15 < 6,tuple(range(number % 100))::Tuple(b1v3 Array(UInt64))::Dynamic, number % 15 < 10,tuple(range(number % 100))::Tuple(b1v4 Array(UInt64))::Dynamic,tuple(range(number % 100))::Tuple(b1v5 Array(UInt64))::Dynamic), number % 15000 < 3000, multiIf(number % 15 < 1,tuple(range(number % 100))::Tuple(b2v1 Array(UInt64))::Dynamic, number % 15 < 3,tuple(range(number % 100))::Tuple(b2v2 Array(UInt64))::Dynamic, number % 15 < 6,tuple(range(number % 100))::Tuple(b2v3 Array(UInt64))::Dynamic, number % 15 < 10,tuple(range(number % 100))::Tuple(b2v4 Array(UInt64))::Dynamic,tuple(range(number % 100))::Tuple(b2v5 Array(UInt64))::Dynamic), number % 15000 < 6000, multiIf(number % 15 < 1,tuple(range(number % 100))::Tuple(b3v1 Array(UInt64))::Dynamic, number % 15 < 3,tuple(range(number % 100))::Tuple(b3v2 Array(UInt64))::Dynamic, number % 15 < 6,tuple(range(number % 100))::Tuple(b3v3 Array(UInt64))::Dynamic, number % 15 < 10,tuple(range(number % 100))::Tuple(b3v4 Array(UInt64))::Dynamic,tuple(range(number % 100))::Tuple(b3v5 Array(UInt64))::Dynamic), number % 15000 < 10000, multiIf(number % 15 < 1,tuple(range(number % 100))::Tuple(b4v1 Array(UInt64))::Dynamic, number % 15 < 3,tuple(range(number % 100))::Tuple(b4v2 Array(UInt64))::Dynamic, number % 15 < 6,tuple(range(number % 100))::Tuple(b4v3 Array(UInt64))::Dynamic, number % 15 < 10,tuple(range(number % 100))::Tuple(b4v4 Array(UInt64))::Dynamic,tuple(range(number % 100))::Tuple(b4v5 Array(UInt64))::Dynamic), multiIf(number % 15 < 1,tuple(range(number % 100))::Tuple(b5v1 Array(UInt64))::Dynamic, number % 15 < 3,tuple(range(number % 100))::Tuple(b5v2 Array(UInt64))::Dynamic, number % 15 < 6,tuple(range(number % 100))::Tuple(b5v3 Array(UInt64))::Dynamic, number % 15 < 10,tuple(range(number % 100))::Tuple(b5v4 Array(UInt64))::Dynamic,tuple(range(number % 100))::Tuple(b5v5 Array(UInt64))::Dynamic)) as res from numbers(1000000)]]>
-    </fill_query>
-
-    <fill_query>
-<![CDATA[insert into src_dynamic_squash_performance_2 select multiIf(number % 15000 < 1000, multiIf(number % 15 < 1,tuple(range(number % 100))::Tuple(b1v1 Array(UInt64))::Dynamic(max_types=6), number % 15 < 3,tuple(range(number % 100))::Tuple(b1v2 Array(UInt64))::Dynamic(max_types=6), number % 15 < 6,tuple(range(number % 100))::Tuple(b1v3 Array(UInt64))::Dynamic(max_types=6), number % 15 < 10,tuple(range(number % 100))::Tuple(b1v4 Array(UInt64))::Dynamic(max_types=6),tuple(range(number % 100))::Tuple(b1v5 Array(UInt64))::Dynamic(max_types=6)), number % 15000 < 3000, multiIf(number % 15 < 1,tuple(range(number % 100))::Tuple(b2v1 Array(UInt64))::Dynamic(max_types=6), number % 15 < 3,tuple(range(number % 100))::Tuple(b2v2 Array(UInt64))::Dynamic(max_types=6), number % 15 < 6,tuple(range(number % 100))::Tuple(b2v3 Array(UInt64))::Dynamic(max_types=6), number % 15 < 10,tuple(range(number % 100))::Tuple(b2v4 Array(UInt64))::Dynamic(max_types=6),tuple(range(number % 100))::Tuple(b2v5 Array(UInt64))::Dynamic(max_types=6)), number % 15000 < 6000, multiIf(number % 15 < 1,tuple(range(number % 100))::Tuple(b3v1 Array(UInt64))::Dynamic(max_types=6), number % 15 < 3,tuple(range(number % 100))::Tuple(b3v2 Array(UInt64))::Dynamic(max_types=6), number % 15 < 6,tuple(range(number % 100))::Tuple(b3v3 Array(UInt64))::Dynamic(max_types=6), number % 15 < 10,tuple(range(number % 100))::Tuple(b3v4 Array(UInt64))::Dynamic(max_types=6),tuple(range(number % 100))::Tuple(b3v5 Array(UInt64))::Dynamic(max_types=6)), number % 15000 < 10000, multiIf(number % 15 < 1,tuple(range(number % 100))::Tuple(b4v1 Array(UInt64))::Dynamic(max_types=6), number % 15 < 3,tuple(range(number % 100))::Tuple(b4v2 Array(UInt64))::Dynamic(max_types=6), number % 15 < 6,tuple(range(number % 100))::Tuple(b4v3 Array(UInt64))::Dynamic(max_types=6), number % 15 < 10,tuple(range(number % 100))::Tuple(b4v4 Array(UInt64))::Dynamic(max_types=6),tuple(range(number % 100))::Tuple(b4v5 Array(UInt64))::Dynamic(max_types=6)), multiIf(number % 15 < 1,tuple(range(number % 100))::Tuple(b5v1 Array(UInt64))::Dynamic(max_types=6), number % 15 < 3,tuple(range(number % 100))::Tuple(b5v2 Array(UInt64))::Dynamic(max_types=6), number % 15 < 6,tuple(range(number % 100))::Tuple(b5v3 Array(UInt64))::Dynamic(max_types=6), number % 15 < 10,tuple(range(number % 100))::Tuple(b5v4 Array(UInt64))::Dynamic(max_types=6),tuple(range(number % 100))::Tuple(b5v5 Array(UInt64))::Dynamic(max_types=6))) as res from numbers(1000000)]]>
-    </fill_query>
-
-    
-    <query>INSERT INTO dynamic_squash_performance_1 SELECT number::Dynamic FROM numbers(10000000)</query>
-    <query>INSERT INTO dynamic_squash_performance_1 SELECT range(number % 100)::Dynamic FROM numbers(2000000)</query>
-    <query>INSERT INTO dynamic_squash_performance_1 SELECT * FROM src_dynamic_squash_performance_1</query>
-    <query>INSERT INTO dynamic_squash_performance_2 SELECT * FROM src_dynamic_squash_performance_2</query>
-
-    <drop_query>DROP TABLE IF EXISTS dynamic_squash_performance_1</drop_query>
-    <drop_query>DROP TABLE IF EXISTS dynamic_squash_performance_2</drop_query>
-    <drop_query>DROP TABLE IF EXISTS src_dynamic_squash_performance_1</drop_query>
-    <drop_query>DROP TABLE IF EXISTS src_dynamic_squash_performance_2</drop_query>
-</test>
-
diff --git a/tests/performance/insert_select_squashing_variant.xml b/tests/performance/insert_select_squashing_variant.xml
deleted file mode 100644
index 5c59fc7b50f..00000000000
--- a/tests/performance/insert_select_squashing_variant.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<test>
-    <settings>
-        <max_block_size>1000</max_block_size>
-        <enable_named_columns_in_function_tuple>0</enable_named_columns_in_function_tuple>
-        <allow_experimental_variant_type>1</allow_experimental_variant_type>
-        <allow_suspicious_variant_types>1</allow_suspicious_variant_types>
-    </settings>
-
-    <create_query>
-CREATE TABLE variant_squash_performance
-(
-    v Variant(Tuple(v1 Array(UInt64)), Tuple(v2 Array(UInt64)), Tuple(v3 Array(UInt64)), Tuple(v4 Array(UInt64)), Tuple(v5 Array(UInt64)))
-)
-ENGINE = Null;
-    </create_query>
-
-    <create_query>
-CREATE TABLE src_variant_squash_performance
-(
-    v Variant(Tuple(v1 Array(UInt64)), Tuple(v2 Array(UInt64)), Tuple(v3 Array(UInt64)), Tuple(v4 Array(UInt64)), Tuple(v5 Array(UInt64)))
-)
-ENGINE = Memory;
-    </create_query>
-
-    <fill_query>
-<![CDATA[insert into src_variant_squash_performance with 'Variant(Tuple(v1 Array(UInt64)), Tuple(v2 Array(UInt64)), Tuple(v3 Array(UInt64)), Tuple(v4 Array(UInt64)), Tuple(v5 Array(UInt64)))' as variant_type select multiIf(number % 15 < 1, CAST(tuple(range(number % 100))::Tuple(v1 Array(UInt64)), variant_type), number % 15 < 3, CAST(tuple(range(number % 100))::Tuple(v2 Array(UInt64)), variant_type), number % 15 < 6, CAST(tuple(range(number % 100))::Tuple(v3 Array(UInt64)), variant_type), number % 15 < 10, CAST(tuple(range(number % 100))::Tuple(v4 Array(UInt64)), variant_type), CAST(tuple(range(number % 100))::Tuple(v5 Array(UInt64)), variant_type)) from numbers(1000000)]]>
-    </fill_query>
-
-    <query>INSERT INTO variant_squash_performance SELECT * FROM src_variant_squash_performance</query>
-
-    <drop_query>DROP TABLE IF EXISTS variant_squash_performance</drop_query>
-    <drop_query>DROP TABLE IF EXISTS src_variant_squash_performance</drop_query>
-</test>
-
diff --git a/tests/performance/json_type.xml b/tests/performance/json_type.xml
index db3fd844f89..b6406f52579 100644
--- a/tests/performance/json_type.xml
+++ b/tests/performance/json_type.xml
@@ -27,9 +27,9 @@
         </substitution>
     </substitutions>
 
-    <create_query>CREATE TABLE t_json_1(data Object('json')) ENGINE = MergeTree ORDER BY tuple()</create_query>
-    <create_query>CREATE TABLE t_json_2(data Object('json')) ENGINE = MergeTree ORDER BY tuple()</create_query>
-    <create_query>CREATE TABLE t_json_3(data Object('json')) ENGINE = MergeTree ORDER BY tuple()</create_query>
+    <create_query>CREATE TABLE t_json_1(data JSON) ENGINE = MergeTree ORDER BY tuple()</create_query>
+    <create_query>CREATE TABLE t_json_2(data JSON) ENGINE = MergeTree ORDER BY tuple()</create_query>
+    <create_query>CREATE TABLE t_json_3(data JSON) ENGINE = MergeTree ORDER BY tuple()</create_query>
 
     <query>INSERT INTO t_json_1 SELECT materialize({json1}) FROM numbers(200000)</query>
     <query>INSERT INTO t_json_2 SELECT {json2} FROM numbers(100000)</query>
diff --git a/tests/performance/materialized_view_deduplication.xml b/tests/performance/materialized_view_deduplication.xml
deleted file mode 100644
index e5e0e5fc6e4..00000000000
--- a/tests/performance/materialized_view_deduplication.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<test>
-    <settings>
-        <deduplicate_blocks_in_dependent_materialized_views>1</deduplicate_blocks_in_dependent_materialized_views>
-    </settings>
-    <create_query>
-        CREATE TABLE dst (`key` Int64, `value` String)
-        ENGINE = MergeTree ORDER BY tuple()
-        SETTINGS non_replicated_deduplication_window=1000;
-    </create_query>
-    <create_query>
-        CREATE TABLE mv_dst (`key` Int64, `value` String)
-        ENGINE = MergeTree ORDER BY tuple()
-        SETTINGS non_replicated_deduplication_window=1000;
-    </create_query>
-    <create_query>
-        CREATE MATERIALIZED VIEW mv_first TO mv_dst
-        AS SELECT 0 AS key, value AS value FROM dst;
-    </create_query>
-    <create_query>
-        CREATE MATERIALIZED VIEW mv_second TO mv_dst
-        AS SELECT 0 AS key, value AS value FROM dst;
-    </create_query>
-    <fill_query>INSERT INTO dst SELECT number as key, toString(number) from numbers(1000);</fill_query>
-
-    <query>
-        INSERT INTO dst SELECT number as key, toString(number) from numbers(1000);
-    </query>
-
-    <drop_query>DROP TABLE IF EXISTS dst</drop_query>
-    <drop_query>DROP TABLE IF EXISTS mv_dst</drop_query>
-    <drop_query>DROP TABLE IF EXISTS mv_first</drop_query>
-    <drop_query>DROP TABLE IF EXISTS mv_second</drop_query>
-</test>
diff --git a/tests/performance/materialized_view_parallel_insert.xml b/tests/performance/materialized_view_parallel_insert.xml
index c3e7cdc50c0..df0a23182c3 100644
--- a/tests/performance/materialized_view_parallel_insert.xml
+++ b/tests/performance/materialized_view_parallel_insert.xml
@@ -1,8 +1,4 @@
 <test>
-    <settings>
-        <parallel_view_processing>1</parallel_view_processing>
-    </settings>
-
     <create_query>
         CREATE MATERIALIZED VIEW hits_mv ENGINE MergeTree
         PARTITION BY toYYYYMM(EventDate)
diff --git a/tests/performance/new_json_type.xml b/tests/performance/new_json_type.xml
deleted file mode 100644
index 1ad21850c6c..00000000000
--- a/tests/performance/new_json_type.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<test>
-    <settings>
-        <allow_experimental_json_type>1</allow_experimental_json_type>
-    </settings>
-
-    <!-- Looks like the only way to use json in test's queries is to put them to substitution.
-         Otherwise jsons are interpreted as substitutions themselves -->
-
-    <substitutions>
-        <substitution>
-            <name>json1</name>
-            <values>
-                <value>'{"k1":1, "k2": "some"}'</value>
-            </values>
-        </substitution>
-        <substitution>
-            <name>json2</name>
-            <values>
-                <value>'{"col' || toString(number % 100) || '":' || toString(number) || '}'</value>
-            </values>
-        </substitution>
-        <substitution>
-            <name>json3</name>
-            <values>
-                <value>'{"k1":[{"k2":"aaa","k3":[{"k4":"bbb"},{"k4":"ccc"}]},{"k2":"ddd","k3":[{"k4":"eee"},{"k4":"fff"}]}]}'</value>
-            </values>
-        </substitution>
-    </substitutions>
-
-    <create_query>CREATE TABLE t_json_1(data JSON) ENGINE = MergeTree ORDER BY tuple()</create_query>
-    <create_query>CREATE TABLE t_json_2(data JSON) ENGINE = MergeTree ORDER BY tuple()</create_query>
-    <create_query>CREATE TABLE t_json_3(data JSON) ENGINE = MergeTree ORDER BY tuple()</create_query>
-
-    <query>INSERT INTO t_json_1 SELECT materialize({json1}) FROM numbers(200000)</query>
-    <query>INSERT INTO t_json_2 SELECT {json2} FROM numbers(100000)</query>
-    <query>INSERT INTO t_json_3 SELECT materialize({json3}) FROM numbers_mt(100000)</query>
-
-    <drop_query>DROP TABLE IF EXISTS t_json_1</drop_query>
-    <drop_query>DROP TABLE IF EXISTS t_json_2</drop_query>
-    <drop_query>DROP TABLE IF EXISTS t_json_3</drop_query>
-</test>
diff --git a/tests/performance/optimize_functions_to_subcolumns.xml b/tests/performance/optimize_functions_to_subcolumns.xml
deleted file mode 100644
index 146af1605c4..00000000000
--- a/tests/performance/optimize_functions_to_subcolumns.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<test>
-    <settings>
-        <max_insert_threads>4</max_insert_threads>
-    </settings>
-
-    <create_query>
-        CREATE TABLE t_subcolumns (a Array(UInt64), s Nullable(String), m Map(String, UInt64)) ENGINE = MergeTree ORDER BY tuple()
-    </create_query>
-
-    <fill_query>
-        INSERT INTO t_subcolumns SELECT range(number % 20), toString(number), mapFromArrays(range(number % 20), range(number % 20)) FROM numbers_mt(50000000)
-    </fill_query>
-
-    <fill_query>
-        OPTIMIZE TABLE t_subcolumns FINAL
-    </fill_query>
-
-    <query>SELECT count() FROM t_subcolumns WHERE NOT ignore(length(a))</query>
-    <query>SELECT count() FROM t_subcolumns WHERE notEmpty(a)</query>
-    <query>SELECT count() FROM t_subcolumns WHERE NOT ignore(length(m))</query>
-    <query>SELECT count() FROM t_subcolumns WHERE notEmpty(m)</query>
-    <query>SELECT count() FROM t_subcolumns WHERE isNotNull(s)</query>
-    <query>SELECT count(s) FROM t_subcolumns</query>
-
-    <drop_query>DROP TABLE t_subcolumns</drop_query>
-</test>
diff --git a/tests/performance/parallel_mv.xml b/tests/performance/parallel_mv.xml
index 0bf5ed1be09..5b856740a19 100644
--- a/tests/performance/parallel_mv.xml
+++ b/tests/performance/parallel_mv.xml
@@ -11,13 +11,13 @@
     <create_query>create table mt_4 (n UInt64, s String) engine = MergeTree order by tuple()</create_query>
 
     <create_query>create materialized view mv_1 to mt_1 as
-        select number as n, toString(number) as s from main_table where number % 13 != 0</create_query>
+        select number, toString(number) from main_table where number % 13 != 0</create_query>
     <create_query>create materialized view mv_2 to mt_2 as
-        select number as n, toString(number) as s from main_table where number % 13 != 1</create_query>
+        select number, toString(number) from main_table where number % 13 != 1</create_query>
     <create_query>create materialized view mv_3 to mt_3 as
-        select number as n, toString(number) as s from main_table where number % 13 != 3</create_query>
+        select number, toString(number) from main_table where number % 13 != 3</create_query>
     <create_query>create materialized view mv_4 to mt_4 as
-        select number as n, toString(number) as s from main_table where number % 13 != 4</create_query>
+        select number, toString(number) from main_table where number % 13 != 4</create_query>
 
     <fill_query>SYSTEM STOP MERGES main_table</fill_query>
     <fill_query>SYSTEM STOP MERGES mt_1</fill_query>
diff --git a/tests/performance/parquet_read_with_index.xml b/tests/performance/parquet_read_with_index.xml
deleted file mode 100644
index 1bb2d8eb4a2..00000000000
--- a/tests/performance/parquet_read_with_index.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test>
-    <fill_query>
-        INSERT INTO FUNCTION file('test_pq_index', Parquet) SELECT * FROM generateRandom('int64_column Nullable(Int64), tuple_column Tuple(a Nullable(String), b Nullable(Float64), c Tuple(i UInt32, j UInt32)),array_tuple_column Array(Tuple(a Nullable(String), b Nullable(Float64), c Nullable(Int64))), map_tuple_column Map(String, Tuple(a Nullable(String), b Nullable(Float64), c Nullable(Int64)))') limit 1000000 SETTINGS output_format_parquet_use_custom_encoder=false, output_format_parquet_write_page_index=true
-    </fill_query>
-
-    <query>
-        SELECT * FROM file('test_pq_index', Parquet, 'tuple_column Tuple(a Nullable(String))') Format Null
-    </query>
-
-    <query>
-        SELECT tuple_column.a FROM file('test_pq_index', Parquet) Format Null
-    </query>
-
-    <query>
-        SELECT tuple_column.a FROM file('test_pq_index', Parquet, 'tuple_column Tuple(a Nullable(String))') Format Null
-    </query>
-
-    <query>
-        SELECT tuple_column.c.i FROM file('test_pq_index', Parquet) Format Null
-    </query>
-
-    <query>
-        SELECT * FROM file('test_pq_index', Parquet, 'array_tuple_column Array (Tuple(a Nullable(String)))') Format Null
-    </query>
-
-    <query>
-        SELECT * FROM file('test_pq_index', Parquet, 'map_tuple_column Map(String, Tuple(a Nullable(String)))') Format Null
-    </query>
-
-</test>
diff --git a/tests/performance/read_from_comp_parts.xml b/tests/performance/read_from_comp_parts.xml
index 055df51d12d..a625075588a 100644
--- a/tests/performance/read_from_comp_parts.xml
+++ b/tests/performance/read_from_comp_parts.xml
@@ -5,16 +5,15 @@
         ORDER BY (c1, c2)
         SETTINGS min_rows_for_wide_part = 1000000000 AS
         SELECT *
-        FROM generateRandom('c1 UInt32, c2 UInt64, s1 String, arr1 Array(UInt32), c3 UInt64, s2 String', 0, 5, 6)
+        FROM generateRandom('c1 UInt32, c2 UInt64, s1 String, arr1 Array(UInt32), c3 UInt64, s2 String', 0, 30, 30)
         LIMIT 50000000
-        SETTINGS max_insert_threads = 8
     </create_query>
 
     <settings>
         <max_threads>8</max_threads>
     </settings>
 
-    <query short="1">SELECT count() FROM mt_comp_parts WHERE NOT ignore(s1)</query>
+    <query short="1">SELECT count() FROM mt_comp_parts WHERE NOT ignore(c1)</query>
     <query>SELECT count() FROM mt_comp_parts WHERE NOT ignore(c2, s1, arr1, s2)</query>
     <query>SELECT count() FROM mt_comp_parts WHERE NOT ignore(c1, s1, c3)</query>
     <query>SELECT count() FROM mt_comp_parts WHERE NOT ignore(c1, c2, c3)</query>
diff --git a/tests/performance/scripts/compare.sh b/tests/performance/scripts/compare.sh
index da7bbf77a28..cb56ab6c5bf 100755
--- a/tests/performance/scripts/compare.sh
+++ b/tests/performance/scripts/compare.sh
@@ -71,8 +71,6 @@ function configure
 {
     # Use the new config for both servers, so that we can change it in a PR.
     rm right/config/config.d/text_log.xml ||:
-    # backups disk uses absolute path, and this overlaps between servers, that could lead to errors
-    rm right/config/config.d/backups.xml ||:
     cp -rv right/config left ||:
 
     # Start a temporary server to rename the tables
diff --git a/tests/performance/scripts/config/config.d/cgroups_memory_usage_observer_wait_time.xml b/tests/performance/scripts/config/config.d/cgroups_memory_usage_observer_wait_time.xml
deleted file mode 100644
index a7868b11212..00000000000
--- a/tests/performance/scripts/config/config.d/cgroups_memory_usage_observer_wait_time.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<clickhouse>
-    <cgroups_memory_usage_observer_wait_time>0</cgroups_memory_usage_observer_wait_time>
-</clickhouse>
diff --git a/tests/performance/scripts/entrypoint.sh b/tests/performance/scripts/entrypoint.sh
index d392ba7c410..0c3bfa550f4 100755
--- a/tests/performance/scripts/entrypoint.sh
+++ b/tests/performance/scripts/entrypoint.sh
@@ -118,7 +118,7 @@ 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 --diff-filter=d "$base" pr -- tests/performance/*.xml | tee changed-test-definitions.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
 
@@ -152,7 +152,7 @@ cat /proc/sys/kernel/core_pattern
 {
     time $SCRIPT_DIR/download.sh "$REF_PR" "$REF_SHA" "$PR_TO_TEST" "$SHA_TO_TEST" && \
     time stage=configure "$script_path"/compare.sh ; \
-} 2>&1 | ts "$(printf '%%Y-%%m-%%d %%H:%%M:%%S\t')" | tee -a compare.log
+} 2>&1 | ts "$(printf '%%Y-%%m-%%d %%H:%%M:%%S\t')" | tee compare.log
 
 # Stop the servers to free memory. Normally they are restarted before getting
 # the profile info, so they shouldn't use much, but if the comparison script
diff --git a/tests/performance/scripts/perf.py b/tests/performance/scripts/perf.py
index 83d66997677..e98c158249a 100755
--- a/tests/performance/scripts/perf.py
+++ b/tests/performance/scripts/perf.py
@@ -345,16 +345,6 @@ for query_index in queries_to_run:
 
     print(f"display-name\t{query_index}\t{tsv_escape(query_display_name)}")
 
-    for conn_index, c in enumerate(all_connections):
-        try:
-            c.execute("SYSTEM JEMALLOC PURGE")
-
-            print(f"purging jemalloc arenas\t{conn_index}\t{c.last_query.elapsed}")
-        except KeyboardInterrupt:
-            raise
-        except:
-            continue
-
     # Prewarm: run once on both servers. Helps to bring the data into memory,
     # precompile the queries, etc.
     # A query might not run on the old server if it uses a function added in the
diff --git a/tests/performance/storage_join_direct_join.xml b/tests/performance/storage_join_direct_join.xml
index 0e67abb275e..2fc63c2c926 100644
--- a/tests/performance/storage_join_direct_join.xml
+++ b/tests/performance/storage_join_direct_join.xml
@@ -16,7 +16,4 @@
     <query>SELECT keys.key, value1 FROM keys ANY LEFT JOIN dict AS d ON (keys.key = d.key) FORMAT Null;</query>
     <query>SELECT keys.key, value1 FROM keys ANY LEFT JOIN dict AS d ON (keys.key = d.key) FORMAT Null SETTINGS
         allow_experimental_analyzer=1</query>
-
-    <drop_query>DROP TABLE IF EXISTS keys</drop_query>
-    <drop_query>DROP TABLE IF EXISTS dict</drop_query>
-</test>
+</test>
\ No newline at end of file
diff --git a/tests/performance/views_max_insert_threads.xml b/tests/performance/views_max_insert_threads.xml
index c16fb330b35..2988984f5d8 100644
--- a/tests/performance/views_max_insert_threads.xml
+++ b/tests/performance/views_max_insert_threads.xml
@@ -1,9 +1,5 @@
 <!-- https://github.com/ClickHouse/ClickHouse/issues/37900 -->
 <test>
-    <settings>
-        <parallel_view_processing>1</parallel_view_processing>
-    </settings>
-
     <create_query>create table views_max_insert_threads_null (a UInt64) Engine = Null</create_query>
     <create_query>create materialized view views_max_insert_threads_mv Engine = Null AS select now() as ts, max(a) from views_max_insert_threads_null group by ts</create_query>
 
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 0f13217c236..07c42d6d039 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
@@ -1,7 +1,5 @@
--- Tags: no-parallel, no-fasttest, no-ubsan, no-batch, no-flaky-check
+-- Tags: no-parallel, no-fasttest, no-ubsan, no-batch
 -- no-parallel because we want to run this test when most of the other tests already passed
--- This is not a regular test. It is intended to run once after other tests to validate certain statistics about the whole test runs.
--- TODO: I advise to put in inside clickhouse-test instead.
 
 -- If this test fails, see the "Top patterns of log messages" diagnostics in the end of run.log
 
@@ -9,8 +7,6 @@ system flush logs;
 drop table if exists logs;
 create view logs as select * from system.text_log where now() - toIntervalMinute(120) < event_time;
 
-SET max_rows_to_read = 0;
-
 -- Check that we don't have too many messages formatted with fmt::runtime or strings concatenation.
 -- 0.001 threshold should be always enough, the value was about 0.00025
 WITH 0.001 AS threshold
@@ -167,10 +163,7 @@ create temporary table known_short_messages (s String) as select * from (select
     '{} -> {}',
     '{} {}',
     '{}%',
-    '{}: {}',
-    'Unknown data type family: {}',
-    'Cannot load time zone {}',
-    'Unknown table engine {}'
+    '{}: {}'
     ] as arr) array join arr;
 
 -- Check that we don't have too many short meaningless message patterns.
diff --git a/tests/queries/0_stateless/00080_show_tables_and_system_tables.sql b/tests/queries/0_stateless/00080_show_tables_and_system_tables.sql
index 02e3645ece0..a58f9ddb0ac 100644
--- a/tests/queries/0_stateless/00080_show_tables_and_system_tables.sql
+++ b/tests/queries/0_stateless/00080_show_tables_and_system_tables.sql
@@ -6,8 +6,8 @@ CREATE DATABASE {CLICKHOUSE_DATABASE:Identifier};
 CREATE TABLE {CLICKHOUSE_DATABASE:Identifier}.A (A UInt8) ENGINE = TinyLog;
 CREATE TABLE {CLICKHOUSE_DATABASE:Identifier}.B (A UInt8) ENGINE = TinyLog;
 
-SHOW TABLES FROM {CLICKHOUSE_DATABASE:Identifier};
-SHOW TABLES IN system WHERE engine LIKE '%System%' AND name IN ('numbers', 'one') AND database = 'system';
+SHOW TABLES from {CLICKHOUSE_DATABASE:Identifier};
+SHOW TABLES in system where engine like '%System%' and name in ('numbers', 'one');
 
 SELECT name, toUInt32(metadata_modification_time) > 0, engine_full, create_table_query FROM system.tables WHERE database = currentDatabase() ORDER BY name FORMAT TSVRaw;
 
@@ -16,7 +16,7 @@ SELECT name FROM system.tables WHERE is_temporary = 1 AND name = 'test_temporary
 
 CREATE TABLE {CLICKHOUSE_DATABASE:Identifier}.test_log(id UInt64) ENGINE = Log;
 CREATE MATERIALIZED VIEW {CLICKHOUSE_DATABASE:Identifier}.test_materialized ENGINE = Log AS SELECT * FROM {CLICKHOUSE_DATABASE:Identifier}.test_log;
-SELECT dependencies_database, dependencies_table FROM system.tables WHERE name = 'test_log' AND database=currentDatabase();
+SELECT dependencies_database, dependencies_table FROM system.tables WHERE name = 'test_log' and database=currentDatabase();
 
 DROP DATABASE {CLICKHOUSE_DATABASE:Identifier};
 
diff --git a/tests/queries/0_stateless/00086_concat_nary_const_with_nonconst_segfault.sql b/tests/queries/0_stateless/00086_concat_nary_const_with_nonconst_segfault.sql
index 4b87b2af28d..2f0ef648983 100644
--- a/tests/queries/0_stateless/00086_concat_nary_const_with_nonconst_segfault.sql
+++ b/tests/queries/0_stateless/00086_concat_nary_const_with_nonconst_segfault.sql
@@ -1 +1 @@
-SELECT extract(toString(number), '10000000') FROM system.numbers_mt WHERE concat(materialize('1'), '...', toString(number)) LIKE '%10000000%' LIMIT 1 SETTINGS max_rows_to_read = 0;
+SELECT extract(toString(number), '10000000') FROM system.numbers_mt WHERE concat(materialize('1'), '...', toString(number)) LIKE '%10000000%' LIMIT 1
diff --git a/tests/queries/0_stateless/00111_shard_external_sort_distributed.reference b/tests/queries/0_stateless/00111_shard_external_sort_distributed.reference
index 7534c12a0d8..df5aa77af60 100644
--- a/tests/queries/0_stateless/00111_shard_external_sort_distributed.reference
+++ b/tests/queries/0_stateless/00111_shard_external_sort_distributed.reference
@@ -1,20 +1,20 @@
-4437158
-4437158
-1723641
-1723641
-3630402
-3630402
-916885
-916885
-2823646
-2823646
-110129
-110129
-4730407
-4730407
-2016890
-2016890
-3923651
-3923651
-1210134
-1210134
+7040546
+7040546
+4327029
+4327029
+1613512
+1613512
+8947307
+8947307
+6233790
+6233790
+3520273
+3520273
+806756
+806756
+8140551
+8140551
+5427034
+5427034
+2713517
+2713517
diff --git a/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql b/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql
index 9e06654195d..112f5edae36 100644
--- a/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql
+++ b/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql
@@ -1,12 +1,11 @@
--- Tags: distributed, long, no-flaky-check
--- ^ no-flaky-check - sometimes longer than 600s with ThreadFuzzer.
+-- Tags: distributed
 
-SET max_memory_usage = 150000000;
-SET max_bytes_before_external_sort = 10000000;
+SET max_memory_usage = 300000000;
+SET max_bytes_before_external_sort = 20000000;
 
 DROP TABLE IF EXISTS numbers10m;
-CREATE VIEW numbers10m AS SELECT number FROM system.numbers LIMIT 5000000;
+CREATE VIEW numbers10m AS SELECT number FROM system.numbers LIMIT 10000000;
 
-SELECT number FROM remote('127.0.0.{2,3}', currentDatabase(), numbers10m) ORDER BY number * 1234567890123456789 LIMIT 4999980, 20;
+SELECT number FROM remote('127.0.0.{2,3}', currentDatabase(), numbers10m) ORDER BY number * 1234567890123456789 LIMIT 19999980, 20;
 
 DROP TABLE numbers10m;
diff --git a/tests/queries/0_stateless/00115_shard_in_incomplete_result.sh b/tests/queries/0_stateless/00115_shard_in_incomplete_result.sh
index 1efe529ac24..5c3918dea9f 100755
--- a/tests/queries/0_stateless/00115_shard_in_incomplete_result.sh
+++ b/tests/queries/0_stateless/00115_shard_in_incomplete_result.sh
@@ -8,13 +8,13 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 set -o errexit
 set -o pipefail
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     DROP TABLE IF EXISTS users;
     CREATE TABLE users (UserID UInt64) ENGINE = Log;
     INSERT INTO users VALUES (1468013291393583084);
     INSERT INTO users VALUES (1321770221388956068);
 ";
 
-for _ in {1..10}; do seq 1 10 | sed "s/.*/SELECT count() FROM (SELECT * FROM remote('127.0.0.{2,3}', ${CLICKHOUSE_DATABASE}, users) WHERE UserID IN (SELECT arrayJoin([1468013291393583084, 1321770221388956068])));/" | $CLICKHOUSE_CLIENT | grep -vE '^4$' && echo 'Fail!' && break; echo -n '.'; done; echo
+for _ in {1..10}; do seq 1 10 | sed "s/.*/SELECT count() FROM (SELECT * FROM remote('127.0.0.{2,3}', ${CLICKHOUSE_DATABASE}, users) WHERE UserID IN (SELECT arrayJoin([1468013291393583084, 1321770221388956068])));/" | $CLICKHOUSE_CLIENT -n | grep -vE '^4$' && echo 'Fail!' && break; echo -n '.'; done; echo
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE users;";
diff --git a/tests/queries/0_stateless/00116_storage_set.sql b/tests/queries/0_stateless/00116_storage_set.sql
index 36ad015c69e..c156b387c8f 100644
--- a/tests/queries/0_stateless/00116_storage_set.sql
+++ b/tests/queries/0_stateless/00116_storage_set.sql
@@ -28,8 +28,8 @@ RENAME TABLE set2 TO set;
 SELECT arrayJoin(['Hello', 'test', 'World', 'world', 'abc', 'xyz']) AS s WHERE s IN set;
 
 create table tab (x String) engine = MergeTree order by x as select 'Hello';
-SELECT * FROM tab PREWHERE x IN (set) WHERE x IN (set) LIMIT 1 settings enable_analyzer=0;
-SELECT * FROM tab PREWHERE x IN (set) WHERE x IN (set) LIMIT 1 settings enable_analyzer=1;
+SELECT * FROM tab PREWHERE x IN (set) WHERE x IN (set) LIMIT 1 settings allow_experimental_analyzer=0;
+SELECT * FROM tab PREWHERE x IN (set) WHERE x IN (set) LIMIT 1 settings allow_experimental_analyzer=1;
 DROP TABLE tab;
 
 DROP TABLE set;
diff --git a/tests/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh b/tests/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh
index f0c0354ab33..d57efaa1f0e 100755
--- a/tests/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh
+++ b/tests/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     DROP TABLE IF EXISTS numbers_100k;
     CREATE VIEW numbers_100k AS SELECT * FROM system.numbers LIMIT 100000;
 ";
diff --git a/tests/queries/0_stateless/00170_lower_upper_utf8.reference b/tests/queries/0_stateless/00170_lower_upper_utf8.reference
index b1cb9ad5b57..f202cb75513 100644
--- a/tests/queries/0_stateless/00170_lower_upper_utf8.reference
+++ b/tests/queries/0_stateless/00170_lower_upper_utf8.reference
@@ -22,8 +22,3 @@
 1
 1
 1
-1
-1
-1
-1
-2
diff --git a/tests/queries/0_stateless/00170_lower_upper_utf8.sql b/tests/queries/0_stateless/00170_lower_upper_utf8.sql
index 7c7bbac0df3..4caba2033ff 100644
--- a/tests/queries/0_stateless/00170_lower_upper_utf8.sql
+++ b/tests/queries/0_stateless/00170_lower_upper_utf8.sql
@@ -1,6 +1,3 @@
--- Tags: no-fasttest
--- no-fasttest: upper/lowerUTF8 use ICU
-
 select lower('aaaaaaaaaaaaaaa012345789,.!aaaa' as str) = str;
 select lowerUTF8('aaaaaaaaaaaaaaa012345789,.!aaaa' as str) = str;
 select lower('AaAaAaAaAaAaAaA012345789,.!aAaA') = 'aaaaaaaaaaaaaaa012345789,.!aaaa';
@@ -30,14 +27,3 @@ select sum(lower(materialize('aaaaАБВГAAAAaaAA')) = materialize('aaaaАБВ
 select sum(upper(materialize('aaaaАБВГAAAAaaAA')) = materialize('AAAAАБВГAAAAAAAA')) = count() from system.one array join range(16384) as n;
 select sum(lowerUTF8(materialize('aaaaАБВГAAAAaaAA')) = materialize('aaaaабвгaaaaaaaa')) = count() from system.one array join range(16384) as n;
 select sum(upperUTF8(materialize('aaaaАБВГAAAAaaAA')) = materialize('AAAAАБВГAAAAAAAA')) = count() from system.one array join range(16384) as n;
-
--- Turkish language
-select upperUTF8('ır') = 'IR';
-select lowerUTF8('ır') = 'ır';
-
--- German language
-select upper('öäüß') = 'öäüß';
-select lower('ÖÄÜẞ') = 'ÖÄÜẞ';
-
--- Bug 68680
-SELECT lengthUTF8(lowerUTF8('Ä\0'));
diff --git a/tests/queries/0_stateless/00170_lower_upper_utf8_memleak.reference b/tests/queries/0_stateless/00170_lower_upper_utf8_memleak.reference
deleted file mode 100644
index 7f6160bace3..00000000000
--- a/tests/queries/0_stateless/00170_lower_upper_utf8_memleak.reference
+++ /dev/null
@@ -1 +0,0 @@
-españa
diff --git a/tests/queries/0_stateless/00170_lower_upper_utf8_memleak.sh b/tests/queries/0_stateless/00170_lower_upper_utf8_memleak.sh
deleted file mode 100755
index 8436659c6a8..00000000000
--- a/tests/queries/0_stateless/00170_lower_upper_utf8_memleak.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest
-# no-fasttest: upper/lowerUTF8 use ICU
-
-# Test for issue #69336
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-$CLICKHOUSE_LOCAL --query "SELECT lowerUTF8('ESPAÑA')"
diff --git a/tests/queries/0_stateless/00186_very_long_arrays.sh b/tests/queries/0_stateless/00186_very_long_arrays.sh
index 086303279fa..739b17ccc99 100755
--- a/tests/queries/0_stateless/00186_very_long_arrays.sh
+++ b/tests/queries/0_stateless/00186_very_long_arrays.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long, no-tsan
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00202_cross_join.sql b/tests/queries/0_stateless/00202_cross_join.sql
index 301161b6583..8d62c56b3f1 100644
--- a/tests/queries/0_stateless/00202_cross_join.sql
+++ b/tests/queries/0_stateless/00202_cross_join.sql
@@ -3,6 +3,5 @@ SELECT x, y FROM (SELECT number AS x FROM system.numbers LIMIT 3) js1 CROSS JOIN
 SET join_algorithm = 'auto';
 SELECT x, y FROM (SELECT number AS x FROM system.numbers LIMIT 3) js1 CROSS JOIN (SELECT number AS y FROM system.numbers LIMIT 5) js2;
 
--- Just to test that we preserved old setting name this we use `enable_analyzer` instead of `enable_analyzer` here.
 SET allow_experimental_analyzer = 1;
 SELECT x, y FROM (SELECT number AS x FROM system.numbers LIMIT 3) js1 CROSS JOIN (SELECT number AS y FROM system.numbers LIMIT 5) js2;
diff --git a/tests/queries/0_stateless/00233_position_function_family.sql b/tests/queries/0_stateless/00233_position_function_family.sql
index d6668cb7ba4..dd7394bc39a 100644
--- a/tests/queries/0_stateless/00233_position_function_family.sql
+++ b/tests/queries/0_stateless/00233_position_function_family.sql
@@ -1,6 +1,3 @@
--- Tags: no-fasttest
--- no-fasttest: upper/lowerUTF8 use ICU
-
 SET send_logs_level = 'fatal';
 
 select 1 = position('', '');
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 b72162be49a..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
@@ -1,6 +1,6 @@
 -- Tags: shard
 
-set enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 set enable_positional_arguments = 0;
 
 select 40 as z from (select * from system.numbers limit 3) group by z;
diff --git a/tests/queries/0_stateless/00284_external_aggregation.reference b/tests/queries/0_stateless/00284_external_aggregation.reference
index 48e30e781e0..be0db217a97 100644
--- a/tests/queries/0_stateless/00284_external_aggregation.reference
+++ b/tests/queries/0_stateless/00284_external_aggregation.reference
@@ -1,2 +1,22 @@
 49999995000000	10000000
 499999500000	1000000	15
+100033	2
+100034	2
+100035	2
+100036	2
+100037	2
+100038	2
+100039	2
+10004	2
+100040	2
+100041	2
+100033	2
+100034	2
+100035	2
+100036	2
+100037	2
+100038	2
+100039	2
+10004	2
+100040	2
+100041	2
diff --git a/tests/queries/0_stateless/00284_external_aggregation.sql b/tests/queries/0_stateless/00284_external_aggregation.sql
index cdc31ff68c8..c1140faaa28 100644
--- a/tests/queries/0_stateless/00284_external_aggregation.sql
+++ b/tests/queries/0_stateless/00284_external_aggregation.sql
@@ -1,8 +1,5 @@
 -- Tags: long
 
--- This test was split in two due to long runtimes in sanitizers.
--- The other part is 00284_external_aggregation_2.
-
 SET max_bytes_before_external_group_by = 100000000;
 SET max_memory_usage = 410000000;
 SET group_by_two_level_threshold = 100000;
@@ -10,3 +7,19 @@ SET group_by_two_level_threshold_bytes = 50000000;
 
 SELECT sum(k), sum(c) FROM (SELECT number AS k, count() AS c FROM (SELECT * FROM system.numbers LIMIT 10000000) GROUP BY k);
 SELECT sum(k), sum(c), max(u) FROM (SELECT number AS k, count() AS c, uniqArray(range(number % 16)) AS u FROM (SELECT * FROM system.numbers LIMIT 1000000) GROUP BY k);
+
+SET max_memory_usage = 0;
+SET group_by_two_level_threshold = 100000;
+SET max_bytes_before_external_group_by = '1Mi';
+
+-- method: key_string & key_string_two_level
+CREATE TABLE t_00284_str(s String) ENGINE = MergeTree() ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
+INSERT INTO t_00284_str SELECT toString(number) FROM numbers_mt(1e6);
+INSERT INTO t_00284_str SELECT toString(number) FROM numbers_mt(1e6);
+SELECT s, count() FROM t_00284_str GROUP BY s ORDER BY s LIMIT 10 OFFSET 42;
+
+-- method: low_cardinality_key_string & low_cardinality_key_string_two_level
+CREATE TABLE t_00284_lc_str(s LowCardinality(String)) ENGINE = MergeTree() ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
+INSERT INTO t_00284_lc_str SELECT toString(number) FROM numbers_mt(1e6);
+INSERT INTO t_00284_lc_str SELECT toString(number) FROM numbers_mt(1e6);
+SELECT s, count() FROM t_00284_lc_str GROUP BY s ORDER BY s LIMIT 10 OFFSET 42;
diff --git a/tests/queries/0_stateless/00284_external_aggregation_2.reference b/tests/queries/0_stateless/00284_external_aggregation_2.reference
deleted file mode 100644
index 71d2e96d4b0..00000000000
--- a/tests/queries/0_stateless/00284_external_aggregation_2.reference
+++ /dev/null
@@ -1,20 +0,0 @@
-100033	2
-100034	2
-100035	2
-100036	2
-100037	2
-100038	2
-100039	2
-10004	2
-100040	2
-100041	2
-100033	2
-100034	2
-100035	2
-100036	2
-100037	2
-100038	2
-100039	2
-10004	2
-100040	2
-100041	2
diff --git a/tests/queries/0_stateless/00284_external_aggregation_2.sql b/tests/queries/0_stateless/00284_external_aggregation_2.sql
deleted file mode 100644
index 7960e3894d0..00000000000
--- a/tests/queries/0_stateless/00284_external_aggregation_2.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- Tags: long
-
--- This test was split in two due to long runtimes in sanitizers.
--- The other part is 00284_external_aggregation.
-
-SET group_by_two_level_threshold_bytes = 50000000;
-SET max_memory_usage = 0;
-SET group_by_two_level_threshold = 100000;
-SET max_bytes_before_external_group_by = '1Mi';
-
--- method: key_string & key_string_two_level
-CREATE TABLE t_00284_str(s String) ENGINE = MergeTree() ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
-INSERT INTO t_00284_str SELECT toString(number) FROM numbers_mt(1e6);
-INSERT INTO t_00284_str SELECT toString(number) FROM numbers_mt(1e6);
-SELECT s, count() FROM t_00284_str GROUP BY s ORDER BY s LIMIT 10 OFFSET 42;
-
--- method: low_cardinality_key_string & low_cardinality_key_string_two_level
-CREATE TABLE t_00284_lc_str(s LowCardinality(String)) ENGINE = MergeTree() ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
-INSERT INTO t_00284_lc_str SELECT toString(number) FROM numbers_mt(1e6);
-INSERT INTO t_00284_lc_str SELECT toString(number) FROM numbers_mt(1e6);
-SELECT s, count() FROM t_00284_lc_str GROUP BY s ORDER BY s LIMIT 10 OFFSET 42;
-
diff --git a/tests/queries/0_stateless/00307_format_xml.reference b/tests/queries/0_stateless/00307_format_xml.reference
index 14e74653d4f..2d9badc5a3e 100644
--- a/tests/queries/0_stateless/00307_format_xml.reference
+++ b/tests/queries/0_stateless/00307_format_xml.reference
@@ -1,4 +1,3 @@
-unnamed columns in tuple
 <?xml version='1.0' encoding='UTF-8' ?>
 <result>
 	<meta>
@@ -55,43 +54,3 @@ unnamed columns in tuple
 	</extremes>
 	<rows>1</rows>
 </result>
-named columns in tuple
-<?xml version='1.0' encoding='UTF-8' ?>
-<result>
-	<meta>
-		<columns>
-			<column>
-				<name>s</name>
-				<type>String</type>
-			</column>
-			<column>
-				<name>time</name>
-				<type>DateTime</type>
-			</column>
-			<column>
-				<name>tpl</name>
-				<type>Tuple(String, DateTime)</type>
-			</column>
-		</columns>
-	</meta>
-	<data>
-		<row>
-			<s>Hello &amp; world</s>
-			<time>2001-02-03 04:05:06</time>
-			<tpl><tuple><elem>Hello &amp; world</elem><elem>2001-02-03 04:05:06</elem></tuple></tpl>
-		</row>
-	</data>
-	<extremes>
-		<min>
-			<s>Hello &amp; world</s>
-			<time>2001-02-03 04:05:06</time>
-			<tpl><tuple><elem>Hello &amp; world</elem><elem>2001-02-03 04:05:06</elem></tuple></tpl>
-		</min>
-		<max>
-			<s>Hello &amp; world</s>
-			<time>2001-02-03 04:05:06</time>
-			<tpl><tuple><elem>Hello &amp; world</elem><elem>2001-02-03 04:05:06</elem></tuple></tpl>
-		</max>
-	</extremes>
-	<rows>1</rows>
-</result>
diff --git a/tests/queries/0_stateless/00307_format_xml.sql b/tests/queries/0_stateless/00307_format_xml.sql
index a7e0e628945..29c733bb186 100644
--- a/tests/queries/0_stateless/00307_format_xml.sql
+++ b/tests/queries/0_stateless/00307_format_xml.sql
@@ -1,5 +1,2 @@
 SET output_format_write_statistics = 0;
-SELECT 'unnamed columns in tuple';
 SELECT 'Hello & world' AS s, 'Hello\n<World>', toDateTime('2001-02-03 04:05:06') AS time, arrayMap(x -> toString(x), range(10)) AS arr, (s, time) AS tpl SETTINGS extremes = 1, enable_named_columns_in_function_tuple = 0 FORMAT XML;
-SELECT 'named columns in tuple';
-SELECT 'Hello & world' AS s, toDateTime('2001-02-03 04:05:06') AS time, (s, time) AS tpl SETTINGS extremes = 1, enable_named_columns_in_function_tuple = 0 FORMAT XML;
diff --git a/tests/queries/0_stateless/00309_formats.reference b/tests/queries/0_stateless/00309_formats.reference
index f3ea45520bb..e637ee0363a 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.sql b/tests/queries/0_stateless/00309_formats.sql
index b784907be08..b0939c00a10 100644
--- a/tests/queries/0_stateless/00309_formats.sql
+++ b/tests/queries/0_stateless/00309_formats.sql
@@ -9,8 +9,3 @@ SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, a
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT JSON;
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT JSONCompact;
 SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, range(n) AS arr, arrayStringConcat(arrayMap(x -> reinterpretAsString(x), arr)) AS s, (n, d) AS tuple FROM system.numbers LIMIT 2 FORMAT XML;
-
-SET enable_named_columns_in_function_tuple = 1;
-
-SELECT 36 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 1 FORMAT RowBinaryWithNamesAndTypes SETTINGS allow_experimental_analyzer=1;
-SELECT number * 246 + 10 AS n, toDate('2000-01-01') + n AS d, (n, d) AS tuple FROM system.numbers LIMIT 1 FORMAT TabSeparatedWithNamesAndTypes SETTINGS allow_experimental_analyzer=1;
diff --git a/tests/queries/0_stateless/00313_const_totals_extremes.sh b/tests/queries/0_stateless/00313_const_totals_extremes.sh
index 6267d5066dd..539a19817e2 100755
--- a/tests/queries/0_stateless/00313_const_totals_extremes.sh
+++ b/tests/queries/0_stateless/00313_const_totals_extremes.sh
@@ -4,10 +4,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT 1 AS k, count() GROUP BY k WITH TOTALS SETTINGS enable_analyzer = 1";
-${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT 1234567890123 AS k, count() GROUP BY k WITH TOTALS SETTINGS enable_analyzer = 1 FORMAT JSON";
-${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT toFloat32(1.23) AS k, count() GROUP BY k WITH TOTALS SETTINGS enable_analyzer = 1 FORMAT JSONCompact";
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT 1 AS k, count() GROUP BY k WITH TOTALS SETTINGS allow_experimental_analyzer = 1";
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT 1234567890123 AS k, count() GROUP BY k WITH TOTALS SETTINGS allow_experimental_analyzer = 1 FORMAT JSON";
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT toFloat32(1.23) AS k, count() GROUP BY k WITH TOTALS SETTINGS allow_experimental_analyzer = 1 FORMAT JSONCompact";
 
-${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT toDate('2010-01-01') AS k, count() GROUP BY k WITH TOTALS SETTINGS enable_analyzer = 1";
-${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT toDateTime('2010-01-01 01:02:03', 'UTC') AS k, count() GROUP BY k WITH TOTALS SETTINGS enable_analyzer = 1 FORMAT JSON";
-${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT 1.1 AS k, count() GROUP BY k WITH TOTALS SETTINGS enable_analyzer = 1 FORMAT JSONCompact";
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT toDate('2010-01-01') AS k, count() GROUP BY k WITH TOTALS SETTINGS allow_experimental_analyzer = 1";
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT toDateTime('2010-01-01 01:02:03', 'UTC') AS k, count() GROUP BY k WITH TOTALS SETTINGS allow_experimental_analyzer = 1 FORMAT JSON";
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&extremes=1&output_format_write_statistics=0" -d "SELECT 1.1 AS k, count() GROUP BY k WITH TOTALS SETTINGS allow_experimental_analyzer = 1 FORMAT JSONCompact";
diff --git a/tests/queries/0_stateless/00314_sample_factor_virtual_column.sql b/tests/queries/0_stateless/00314_sample_factor_virtual_column.sql
index b8ac5e733ed..6e3dc019069 100644
--- a/tests/queries/0_stateless/00314_sample_factor_virtual_column.sql
+++ b/tests/queries/0_stateless/00314_sample_factor_virtual_column.sql
@@ -1,7 +1,3 @@
--- Tags: no-msan
---          ^
---          makes SELECTs extremely slow sometimes for some reason: "Aggregated. 1000000 to 1 rows (from 7.63 MiB) in 242.829221645 sec."
-
 DROP TABLE IF EXISTS sample_00314_1;
 DROP TABLE IF EXISTS sample_00314_2;
 DROP TABLE IF EXISTS sample_merge_00314;
diff --git a/tests/queries/0_stateless/00331_final_and_prewhere_condition_ver_column.sql b/tests/queries/0_stateless/00331_final_and_prewhere_condition_ver_column.sql
index a3c499f1688..78a58a979d1 100644
--- a/tests/queries/0_stateless/00331_final_and_prewhere_condition_ver_column.sql
+++ b/tests/queries/0_stateless/00331_final_and_prewhere_condition_ver_column.sql
@@ -1,8 +1,8 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 -- https://github.com/ClickHouse/ClickHouse/issues/45804
 
-CREATE TABLE myRMT(
+CREATE TABLE myRMT(   
   key Int64,
   someCol String,
   ver DateTime
diff --git a/tests/queries/0_stateless/00366_multi_statements.reference b/tests/queries/0_stateless/00366_multi_statements.reference
index 71ca552522c..68f9261b937 100644
--- a/tests/queries/0_stateless/00366_multi_statements.reference
+++ b/tests/queries/0_stateless/00366_multi_statements.reference
@@ -3,10 +3,8 @@
 1
 1
 Syntax error
-1
-2
-1
-2
+Syntax error
+Syntax error
 Syntax error
 Syntax error
 1
diff --git a/tests/queries/0_stateless/00366_multi_statements.sh b/tests/queries/0_stateless/00366_multi_statements.sh
index 8546e547581..9b885bb1b32 100755
--- a/tests/queries/0_stateless/00366_multi_statements.sh
+++ b/tests/queries/0_stateless/00366_multi_statements.sh
@@ -10,26 +10,26 @@ $CLICKHOUSE_CLIENT --query="SELECT 1; "
 $CLICKHOUSE_CLIENT --query="SELECT 1 ; "
 
 $CLICKHOUSE_CLIENT --query="SELECT 1; S" 2>&1 | grep -o 'Syntax error'
-$CLICKHOUSE_CLIENT --query="SELECT 1; SELECT 2"
-$CLICKHOUSE_CLIENT --query="SELECT 1; SELECT 2;"
+$CLICKHOUSE_CLIENT --query="SELECT 1; SELECT 2" 2>&1 | grep -o 'Syntax error'
+$CLICKHOUSE_CLIENT --query="SELECT 1; SELECT 2;" 2>&1 | grep -o 'Syntax error'
 $CLICKHOUSE_CLIENT --query="SELECT 1; SELECT 2; SELECT" 2>&1 | grep -o 'Syntax error'
 
-$CLICKHOUSE_CLIENT --query="SELECT 1; S" 2>&1 | grep -o 'Syntax error'
-$CLICKHOUSE_CLIENT --query="SELECT 1; SELECT 2"
-$CLICKHOUSE_CLIENT --query="SELECT 1; SELECT 2;"
-$CLICKHOUSE_CLIENT --query="SELECT 1; SELECT 2; SELECT" 2>&1 | grep -o 'Syntax error'
+$CLICKHOUSE_CLIENT -n --query="SELECT 1; S" 2>&1 | grep -o 'Syntax error'
+$CLICKHOUSE_CLIENT -n --query="SELECT 1; SELECT 2"
+$CLICKHOUSE_CLIENT -n --query="SELECT 1; SELECT 2;"
+$CLICKHOUSE_CLIENT -n --query="SELECT 1; SELECT 2; SELECT" 2>&1 | grep -o 'Syntax error'
 
-$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS t_00366; CREATE TABLE t_00366 (x UInt64) ENGINE = TinyLog;"
+$CLICKHOUSE_CLIENT -n --query="DROP TABLE IF EXISTS t_00366; CREATE TABLE t_00366 (x UInt64) ENGINE = TinyLog;"
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO t_00366 VALUES (1),(2),(3);"
 $CLICKHOUSE_CLIENT --query="SELECT * FROM t_00366"
 $CLICKHOUSE_CLIENT --query="INSERT INTO t_00366 VALUES" <<< "(4),(5),(6)"
 $CLICKHOUSE_CLIENT --query="SELECT * FROM t_00366"
 
-$CLICKHOUSE_CLIENT --query="INSERT INTO t_00366 VALUES (1),(2),(3);"
-$CLICKHOUSE_CLIENT --query="SELECT * FROM t_00366"
-$CLICKHOUSE_CLIENT --query="INSERT INTO t_00366 VALUES" <<< "(4),(5),(6)"
-$CLICKHOUSE_CLIENT --query="SELECT * FROM t_00366"
+$CLICKHOUSE_CLIENT -n --query="INSERT INTO t_00366 VALUES (1),(2),(3);"
+$CLICKHOUSE_CLIENT -n --query="SELECT * FROM t_00366"
+$CLICKHOUSE_CLIENT -n --query="INSERT INTO t_00366 VALUES" <<< "(4),(5),(6)"
+$CLICKHOUSE_CLIENT -n --query="SELECT * FROM t_00366"
 
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -d "SELECT 1"
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -d "SELECT 1;"
@@ -48,4 +48,4 @@ $CLICKHOUSE_CLIENT --query="SELECT * FROM t_00366"
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=INSERT+INTO+t_00366+VALUES" -d "(7),(8),(9)"
 $CLICKHOUSE_CLIENT --query="SELECT * FROM t_00366"
 
-$CLICKHOUSE_CLIENT --query="DROP TABLE t_00366;"
+$CLICKHOUSE_CLIENT -n --query="DROP TABLE t_00366;"
diff --git a/tests/queries/0_stateless/00370_duplicate_columns_in_subqueries.sql b/tests/queries/0_stateless/00370_duplicate_columns_in_subqueries.sql
index 8a93c0a9d26..118e50c35e0 100644
--- a/tests/queries/0_stateless/00370_duplicate_columns_in_subqueries.sql
+++ b/tests/queries/0_stateless/00370_duplicate_columns_in_subqueries.sql
@@ -1,6 +1,6 @@
 SET any_join_distinct_right_table_keys = 1;
 SET joined_subquery_requires_alias = 0;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 select x, y from (select 1 as x, 2 as y, x, y);
 select x, y from (select 1 as x, 1 as y, x, y);
diff --git a/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql b/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
index c8a243d9b27..8a310cb8fc9 100644
--- a/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
+++ b/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
@@ -1,4 +1,4 @@
--- Tags: shard, long
+-- Tags: shard
 
 DROP TABLE IF EXISTS group_uniq_str;
 CREATE TABLE group_uniq_str ENGINE = Memory AS SELECT number % 10 as id, toString(intDiv((number%10000), 10)) as v FROM system.numbers LIMIT 10000000;
@@ -7,7 +7,7 @@ INSERT INTO group_uniq_str SELECT 2 as id, toString(number % 100) as v FROM syst
 INSERT INTO group_uniq_str SELECT 5 as id, toString(number % 100) as v FROM system.numbers LIMIT 10000000;
 
 SELECT length(groupUniqArray(v)) FROM group_uniq_str GROUP BY id ORDER BY id;
-SELECT length(groupUniqArray(v)) FROM remote('127.0.0.{2,3,4,5}', currentDatabase(), 'group_uniq_str') GROUP BY id ORDER BY id SETTINGS max_rows_to_read = '100M';
+SELECT length(groupUniqArray(v)) FROM remote('127.0.0.{2,3,4,5}', currentDatabase(), 'group_uniq_str') GROUP BY id ORDER BY id;
 SELECT length(groupUniqArray(10)(v)) FROM group_uniq_str GROUP BY id ORDER BY id;
 SELECT length(groupUniqArray(10000)(v)) FROM group_uniq_str GROUP BY id ORDER BY id;
 
diff --git a/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql b/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
index 4453c26283c..abd0e6e6a45 100644
--- a/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
+++ b/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
@@ -1,6 +1,4 @@
--- Tags: long
-
-SET max_rows_to_read = '55M';
+-- Tags: shard
 
 DROP TABLE IF EXISTS group_uniq_arr_int;
 CREATE TABLE group_uniq_arr_int ENGINE = Memory AS
diff --git a/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql b/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
index 1ec91ac2396..e9cfff211f8 100644
--- a/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
+++ b/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
@@ -1,5 +1,4 @@
--- Tags: shard, long
-SET max_rows_to_read = '55M';
+-- Tags: shard
 
 DROP TABLE IF EXISTS group_uniq_arr_str;
 CREATE TABLE group_uniq_arr_str ENGINE = Memory AS
diff --git a/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql b/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql
index 941d5ecd135..e7b59bc3f7f 100644
--- a/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql
+++ b/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql
@@ -2,7 +2,7 @@
 
 SET output_format_write_statistics = 0;
 SET extremes = 1;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SET output_format_json_quote_64bit_integers = 1;
 SELECT toInt64(0) as i0, toUInt64(0) as u0, toInt64(9223372036854775807) as ip, toInt64(-9223372036854775808) as in, toUInt64(18446744073709551615) as up, [toInt64(0)] as arr, (toUInt64(0), toUInt64(0)) as tuple GROUP BY i0, u0, ip, in, up, arr, tuple WITH TOTALS FORMAT JSON;
diff --git a/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh b/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
index 0aab52d15c2..62f891db33c 100755
--- a/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
+++ b/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
@@ -5,4 +5,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query="SELECT 1; SELECT xyz; SELECT 2;" 2> /dev/null || true;
+$CLICKHOUSE_CLIENT --multiquery --query="SELECT 1; SELECT xyz; SELECT 2;" 2> /dev/null || true;
diff --git a/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh b/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
index b6cc270994f..b59aae83e81 100755
--- a/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
+++ b/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
@@ -48,13 +48,13 @@ pack_unpack_compare "SELECT name, is_aggregate FROM system.functions" "name Stri
 echo
 # Check settings are passed correctly
 ${CLICKHOUSE_LOCAL} --max_rows_in_distinct=33 -q "SELECT name, value FROM system.settings WHERE name = 'max_rows_in_distinct'"
-${CLICKHOUSE_LOCAL} -q "SET max_rows_in_distinct=33; SELECT name, value FROM system.settings WHERE name = 'max_rows_in_distinct'"
+${CLICKHOUSE_LOCAL} -n -q "SET max_rows_in_distinct=33; SELECT name, value FROM system.settings WHERE name = 'max_rows_in_distinct'"
 ${CLICKHOUSE_LOCAL} --max_bytes_before_external_group_by=1 --max_block_size=10 -q "SELECT sum(ignore(*)) FROM (SELECT number, count() FROM numbers(1000) GROUP BY number)"
 echo
 # Check exta options, we expect zero exit code and no stderr output
-(${CLICKHOUSE_LOCAL} --ignore-error --echo -q "SELECT nothing_to_do();SELECT 42;" 2>/dev/null || echo "Wrong RC")
+(${CLICKHOUSE_LOCAL} --ignore-error -n --echo -q "SELECT nothing_to_do();SELECT 42;" 2>/dev/null || echo "Wrong RC")
 echo
-${CLICKHOUSE_LOCAL} -q "CREATE TABLE sophisticated_default
+${CLICKHOUSE_LOCAL} -n -q "CREATE TABLE sophisticated_default
 (
     a UInt8 DEFAULT 3,
     b UInt8 ALIAS a + 5,
diff --git a/tests/queries/0_stateless/00408_http_keep_alive.reference b/tests/queries/0_stateless/00408_http_keep_alive.reference
index 5402036bfd7..17a7fd690a8 100644
--- a/tests/queries/0_stateless/00408_http_keep_alive.reference
+++ b/tests/queries/0_stateless/00408_http_keep_alive.reference
@@ -1,6 +1,6 @@
 < Connection: Keep-Alive
-< Keep-Alive: timeout=10, max=?
+< Keep-Alive: timeout=10
 < Connection: Keep-Alive
-< Keep-Alive: timeout=10, max=?
+< Keep-Alive: timeout=10
 < Connection: Keep-Alive
-< Keep-Alive: timeout=10, max=?
+< Keep-Alive: timeout=10
diff --git a/tests/queries/0_stateless/00408_http_keep_alive.sh b/tests/queries/0_stateless/00408_http_keep_alive.sh
index 4a1cb4ed712..4bd0e494eb8 100755
--- a/tests/queries/0_stateless/00408_http_keep_alive.sh
+++ b/tests/queries/0_stateless/00408_http_keep_alive.sh
@@ -6,10 +6,9 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 URL="${CLICKHOUSE_PORT_HTTP_PROTO}://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_HTTP}/"
 
-# the sed command here replaces the real number of left requests with a question mark, because it can vary and we don't really have control over it
-${CLICKHOUSE_CURL} -vsS "${URL}" --data-binary @- <<< "SELECT 1" 2>&1 | sed -r 's/(keep-alive: timeout=10, max=)[0-9]+/\1?/I' | grep -i 'keep-alive';
-${CLICKHOUSE_CURL} -vsS "${URL}" --data-binary @- <<< " error here " 2>&1 | sed -r 's/(keep-alive: timeout=10, max=)[0-9]+/\1?/I' | grep -i 'keep-alive';
-${CLICKHOUSE_CURL} -vsS "${URL}"ping  2>&1 | perl -lnE 'print if /Keep-Alive/' | sed -r 's/(keep-alive: timeout=10, max=)[0-9]+/\1?/I' | grep -i 'keep-alive';
+${CLICKHOUSE_CURL} -vsS "${URL}" --data-binary @- <<< "SELECT 1" 2>&1 | perl -lnE 'print if /Keep-Alive/';
+${CLICKHOUSE_CURL} -vsS "${URL}" --data-binary @- <<< " error here " 2>&1 | perl -lnE 'print if /Keep-Alive/';
+${CLICKHOUSE_CURL} -vsS "${URL}"ping  2>&1 | perl -lnE 'print if /Keep-Alive/';
 
 # no keep-alive:
 ${CLICKHOUSE_CURL} -vsS "${URL}"404/not/found/ 2>&1 | perl -lnE 'print if /Keep-Alive/';
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison.python b/tests/queries/0_stateless/00411_long_accurate_number_comparison.python
index 38b108a696f..045de9ee7ee 100644
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison.python
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison.python
@@ -2,16 +2,23 @@
 
 import os, itertools, urllib.request, urllib.parse, urllib.error, urllib.request, urllib.error, urllib.parse, sys
 
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, "helpers"))
 
-from pure_http_client import ClickHouseClient
-
-client = ClickHouseClient()
+def get_ch_answer(query):
+    return (
+        urllib.request.urlopen(
+            os.environ.get(
+                "CLICKHOUSE_URL",
+                "http://localhost:" + os.environ.get("CLICKHOUSE_PORT_HTTP", "8123"),
+            ),
+            data=query.encode(),
+        )
+        .read()
+        .decode()
+    )
 
 
 def check_answers(query, answer):
-    ch_answer = client.query(query)
+    ch_answer = get_ch_answer(query)
     if ch_answer.strip() != answer.strip():
         print("FAIL on query:", query)
         print("Expected answer:", answer)
diff --git a/tests/queries/0_stateless/00443_preferred_block_size_bytes.sh b/tests/queries/0_stateless/00443_preferred_block_size_bytes.sh
index 0635fbc2a57..27b9f5c00c7 100755
--- a/tests/queries/0_stateless/00443_preferred_block_size_bytes.sh
+++ b/tests/queries/0_stateless/00443_preferred_block_size_bytes.sh
@@ -43,10 +43,10 @@ popd > /dev/null
 #SCRIPTDIR=`dirname "$SCRIPTPATH"`
 SCRIPTDIR=$SCRIPTPATH
 
-cat "$SCRIPTDIR"/00282_merging.sql | $CLICKHOUSE_CLIENT --preferred_block_size_bytes=10 > "${CLICKHOUSE_TMP}"/preferred_block_size_bytes.stdout
+cat "$SCRIPTDIR"/00282_merging.sql | $CLICKHOUSE_CLIENT --preferred_block_size_bytes=10 -n > "${CLICKHOUSE_TMP}"/preferred_block_size_bytes.stdout
 cmp "$SCRIPTDIR"/00282_merging.reference "${CLICKHOUSE_TMP}"/preferred_block_size_bytes.stdout && echo PASSED || echo FAILED
 
-cat "$SCRIPTDIR"/00282_merging.sql | $CLICKHOUSE_CLIENT --preferred_block_size_bytes=20 > "${CLICKHOUSE_TMP}"/preferred_block_size_bytes.stdout
+cat "$SCRIPTDIR"/00282_merging.sql | $CLICKHOUSE_CLIENT --preferred_block_size_bytes=20 -n > "${CLICKHOUSE_TMP}"/preferred_block_size_bytes.stdout
 cmp "$SCRIPTDIR"/00282_merging.reference "${CLICKHOUSE_TMP}"/preferred_block_size_bytes.stdout && echo PASSED || echo FAILED
 
 rm "${CLICKHOUSE_TMP}"/preferred_block_size_bytes.stdout
diff --git a/tests/queries/0_stateless/00445_join_nullable_keys.sql b/tests/queries/0_stateless/00445_join_nullable_keys.sql
index bec0c76eb5f..774594f90f3 100644
--- a/tests/queries/0_stateless/00445_join_nullable_keys.sql
+++ b/tests/queries/0_stateless/00445_join_nullable_keys.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET join_use_nulls = 0;
 SET any_join_distinct_right_table_keys = 1;
 
diff --git a/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh b/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
index 86902fca4aa..d41d6409315 100755
--- a/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
+++ b/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
@@ -25,7 +25,7 @@ ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_4&se
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_5&session_timeout=60" --data-binary "SELECT 1"
 
 echo "Sessions are local per user:"
-${CLICKHOUSE_CLIENT} --query "DROP USER IF EXISTS test_00463; CREATE USER test_00463; GRANT ALL ON *.* TO test_00463;"
+${CLICKHOUSE_CLIENT} --multiquery --query "DROP USER IF EXISTS test_00463; CREATE USER test_00463; GRANT ALL ON *.* TO test_00463;"
 
 ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_6&session_timeout=600" --data-binary "CREATE TEMPORARY TABLE t (s String)"
 ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_6" --data-binary "INSERT INTO t VALUES ('Hello')"
@@ -37,7 +37,7 @@ ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&user=test_00463&session_id=${C
 ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_6" --data-binary "SELECT * FROM t"
 ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&user=test_00463&session_id=${CLICKHOUSE_DATABASE}_6" --data-binary "SELECT * FROM t"
 
-${CLICKHOUSE_CLIENT} --query "DROP USER test_00463";
+${CLICKHOUSE_CLIENT} --multiquery --query "DROP USER test_00463";
 
 echo "And cannot be accessed for a non-existent user:"
 ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&user=test_00463&session_id=${CLICKHOUSE_DATABASE}_6" --data-binary "SELECT * FROM t" | grep -c -F 'Exception'
@@ -59,7 +59,7 @@ done
 
 echo "A session successfully expire after a timeout and the session's temporary table shadows the permanent table:"
 # An infinite loop is required to make the test reliable. We will check that the timeout corresponds to the observed time at least once
-${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS t; CREATE TABLE t (s String) ENGINE = Memory; INSERT INTO t VALUES ('World');"
+${CLICKHOUSE_CLIENT} --multiquery --query "DROP TABLE IF EXISTS t; CREATE TABLE t (s String) ENGINE = Memory; INSERT INTO t VALUES ('World');"
 while true
 do
     (
@@ -70,11 +70,11 @@ do
         ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_8" --data-binary "SELECT * FROM t"
     ) | tr -d '\n' | grep -F 'HelloWorld' && break || sleep 1
 done
-${CLICKHOUSE_CLIENT} --query "DROP TABLE t"
+${CLICKHOUSE_CLIENT} --multiquery --query "DROP TABLE t"
 
 echo "A session cannot be used by concurrent connections:"
 
-${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_9&query_id=${CLICKHOUSE_DATABASE}_9&max_rows_to_read=0" --data-binary "SELECT count() FROM system.numbers" >/dev/null &
+${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_9&query_id=${CLICKHOUSE_DATABASE}_9" --data-binary "SELECT count() FROM system.numbers" >/dev/null &
 
 # An infinite loop is required to make the test reliable. We will ensure that at least once the query on the line above has started before this check
 while true
@@ -83,5 +83,5 @@ do
 done
 
 ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_9" --data-binary "SELECT 1" | grep -c -F 'SESSION_IS_LOCKED'
-${CLICKHOUSE_CLIENT} --query "KILL QUERY WHERE query_id = '${CLICKHOUSE_DATABASE}_9' SYNC FORMAT Null";
+${CLICKHOUSE_CLIENT} --multiquery --query "KILL QUERY WHERE query_id = '${CLICKHOUSE_DATABASE}_9' SYNC FORMAT Null";
 wait
diff --git a/tests/queries/0_stateless/00474_readonly_settings.sh b/tests/queries/0_stateless/00474_readonly_settings.sh
index ed3558c6d7a..3a857d81a74 100755
--- a/tests/queries/0_stateless/00474_readonly_settings.sh
+++ b/tests/queries/0_stateless/00474_readonly_settings.sh
@@ -8,8 +8,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 $CLICKHOUSE_CLIENT --query="select toUInt64(pow(2, 62)) as value format JSON" --output_format_json_quote_64bit_integers=0 | grep value
 $CLICKHOUSE_CLIENT --query="select toUInt64(pow(2, 62)) as value format JSON" --output_format_json_quote_64bit_integers=1 | grep value
 
-$CLICKHOUSE_CLIENT --readonly=1 --query="set output_format_json_quote_64bit_integers=1 ; select toUInt64(pow(2, 63)) as value format JSON" --server_logs_file=/dev/null 2>&1 | grep -o -q 'value\|Cannot modify .* setting in readonly mode' && echo "OK" || echo "FAIL"
-$CLICKHOUSE_CLIENT --readonly=1 --query="set output_format_json_quote_64bit_integers=0 ; select toUInt64(pow(2, 63)) as value format JSON" --server_logs_file=/dev/null 2>&1 | grep -o -q 'value\|Cannot modify .* setting in readonly mode' && echo "OK" || echo "FAIL"
+$CLICKHOUSE_CLIENT --readonly=1 --multiquery --query="set output_format_json_quote_64bit_integers=1 ; select toUInt64(pow(2, 63)) as value format JSON" --server_logs_file=/dev/null 2>&1 | grep -o -q 'value\|Cannot modify .* setting in readonly mode' && echo "OK" || echo "FAIL"
+$CLICKHOUSE_CLIENT --readonly=1 --multiquery --query="set output_format_json_quote_64bit_integers=0 ; select toUInt64(pow(2, 63)) as value format JSON" --server_logs_file=/dev/null 2>&1 | grep -o -q 'value\|Cannot modify .* setting in readonly mode' && echo "OK" || echo "FAIL"
 
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=SELECT+toUInt64(pow(2,+63))+as+value+format+JSON&output_format_json_quote_64bit_integers=1" | grep value
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=SELECT+toUInt64(pow(2,+63))+as+value+format+JSON&output_format_json_quote_64bit_integers=0" | grep value
diff --git a/tests/queries/0_stateless/00490_with_select.sql b/tests/queries/0_stateless/00490_with_select.sql
index d63f0ca4f31..c803cf1d3ad 100644
--- a/tests/queries/0_stateless/00490_with_select.sql
+++ b/tests/queries/0_stateless/00490_with_select.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 with pow(2,2) as four select pow(four, 2), 2 as two, pow(two, 2);
 select `pow(four, 2)`, `pow(two, 2)` from (with pow(2,2) as four select pow(four, 2), 2 as two, pow(two, 2));
diff --git a/tests/queries/0_stateless/00499_json_enum_insert.sql b/tests/queries/0_stateless/00499_json_enum_insert.sql
index 24eab38c65f..c4988d08243 100644
--- a/tests/queries/0_stateless/00499_json_enum_insert.sql
+++ b/tests/queries/0_stateless/00499_json_enum_insert.sql
@@ -4,15 +4,12 @@ DROP TABLE IF EXISTS json;
 CREATE TABLE json (x Enum8('browser' = 1, 'mobile' = 2), y String) ENGINE = Memory;
 
 INSERT INTO json (y) VALUES ('Hello');
-
 SELECT * FROM json ORDER BY y;
 
 INSERT INTO json (y) FORMAT JSONEachRow {"y": "World 1"};
-
 SELECT * FROM json ORDER BY y;
 
 INSERT INTO json (x, y) FORMAT JSONEachRow {"y": "World 2"};
-
 SELECT * FROM json ORDER BY y;
 
 DROP TABLE json;
diff --git a/tests/queries/0_stateless/00501_http_head.reference b/tests/queries/0_stateless/00501_http_head.reference
index 807bcd4922e..8351327b356 100644
--- a/tests/queries/0_stateless/00501_http_head.reference
+++ b/tests/queries/0_stateless/00501_http_head.reference
@@ -2,11 +2,11 @@ HTTP/1.1 200 OK
 Connection: Keep-Alive
 Content-Type: text/tab-separated-values; charset=UTF-8
 Transfer-Encoding: chunked
-Keep-Alive: timeout=10, max=?
+Keep-Alive: timeout=10
 
 HTTP/1.1 200 OK
 Connection: Keep-Alive
 Content-Type: text/tab-separated-values; charset=UTF-8
 Transfer-Encoding: chunked
-Keep-Alive: timeout=10, max=?
+Keep-Alive: timeout=10
 
diff --git a/tests/queries/0_stateless/00501_http_head.sh b/tests/queries/0_stateless/00501_http_head.sh
index 30da64c31f0..60283f26833 100755
--- a/tests/queries/0_stateless/00501_http_head.sh
+++ b/tests/queries/0_stateless/00501_http_head.sh
@@ -4,9 +4,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-# the sed command here replaces the real number of left requests with a question mark, because it can vary and we don't really have control over it
-( ${CLICKHOUSE_CURL} -s --head "${CLICKHOUSE_URL}&query=SELECT%201" | sed -r 's/(keep-alive: timeout=10, max=)[0-9]+/\1?/I';
-  ${CLICKHOUSE_CURL} -s --head "${CLICKHOUSE_URL}&query=select+*+from+system.numbers+limit+1000000" ) | sed -r 's/(keep-alive: timeout=10, max=)[0-9]+/\1?/I' | grep -v "Date:" | grep -v "X-ClickHouse-Server-Display-Name:" | grep -v "X-ClickHouse-Query-Id:" | grep -v "X-ClickHouse-Format:" | grep -v "X-ClickHouse-Timezone:"
+( ${CLICKHOUSE_CURL} -s --head "${CLICKHOUSE_URL}&query=SELECT%201";
+  ${CLICKHOUSE_CURL} -s --head "${CLICKHOUSE_URL}&query=select+*+from+system.numbers+limit+1000000" ) | grep -v "Date:" | grep -v "X-ClickHouse-Server-Display-Name:" | grep -v "X-ClickHouse-Query-Id:" | grep -v "X-ClickHouse-Format:" | grep -v "X-ClickHouse-Timezone:"
 
 if [[ $(${CLICKHOUSE_CURL} -sS -X POST -I "${CLICKHOUSE_URL}&query=SELECT+1" | grep -c '411 Length Required') -ne 1 ]]; then
     echo FAIL
diff --git a/tests/queries/0_stateless/00505_secure.sh b/tests/queries/0_stateless/00505_secure.sh
index eed0d3bf5c6..eaa50bce6b1 100755
--- a/tests/queries/0_stateless/00505_secure.sh
+++ b/tests/queries/0_stateless/00505_secure.sh
@@ -23,7 +23,7 @@ $CLICKHOUSE_CLIENT_SECURE -q "SELECT 4;"
 
 # TODO: can test only on unchanged port. Possible solutions: generate config or pass shard port via command line
 if [[ "$CLICKHOUSE_PORT_TCP_SECURE" = "$CLICKHOUSE_PORT_TCP_SECURE" ]]; then
-    cat "$CURDIR"/00505_distributed_secure.data | $CLICKHOUSE_CLIENT_SECURE -m
+    cat "$CURDIR"/00505_distributed_secure.data | $CLICKHOUSE_CLIENT_SECURE -n -m
 else
     tail -n 13 "$CURDIR"/00505_secure.reference
 fi
diff --git a/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql b/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
index 329f6ad2248..51e6a513608 100644
--- a/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
+++ b/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
@@ -6,8 +6,6 @@ DROP TABLE IF EXISTS without_deduplication;
 DROP TABLE IF EXISTS with_deduplication_mv;
 DROP TABLE IF EXISTS without_deduplication_mv;
 
-SET database_replicated_allow_explicit_uuid=3;
-SET database_replicated_allow_replicated_engine_arguments=3;
 CREATE TABLE with_deduplication(x UInt32)
     ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00510/with_deduplication', 'r1') ORDER BY x;
 CREATE TABLE without_deduplication(x UInt32)
diff --git a/tests/queries/0_stateless/00517_date_parsing.sql b/tests/queries/0_stateless/00517_date_parsing.sql
index 4cfede7cb2b..9067d39ba3e 100644
--- a/tests/queries/0_stateless/00517_date_parsing.sql
+++ b/tests/queries/0_stateless/00517_date_parsing.sql
@@ -7,7 +7,6 @@ INSERT INTO date VALUES ('2017-01-02'), ('2017-1-02'), ('2017-01-2'), ('2017-1-2
 SELECT * FROM date;
 
 INSERT INTO date FORMAT JSONEachRow {"d": "2017-01-02"}, {"d": "2017-1-02"}, {"d": "2017-01-2"}, {"d": "2017-1-2"}, {"d": "2017/01/02"}, {"d": "2017/1/02"}, {"d": "2017/01/2"}, {"d": "2017/1/2"}, {"d": "2017-11-12"};
-
 SELECT * FROM date ORDER BY d;
 
 DROP TABLE date;
diff --git a/tests/queries/0_stateless/00531_client_ignore_error.sh b/tests/queries/0_stateless/00531_client_ignore_error.sh
index 553cb9fa897..d3215e1beac 100755
--- a/tests/queries/0_stateless/00531_client_ignore_error.sh
+++ b/tests/queries/0_stateless/00531_client_ignore_error.sh
@@ -5,8 +5,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-echo "SELECT 1; SELECT 2; SELECT CAST(); SELECT ';'; SELECT 3;SELECT CAST();SELECT 4;" | $CLICKHOUSE_CLIENT --ignore-error 2>/dev/null
-echo "SELECT CAST();" | $CLICKHOUSE_CLIENT --ignore-error 2>/dev/null
-echo "SELECT 5;" | $CLICKHOUSE_CLIENT --ignore-error
+echo "SELECT 1; SELECT 2; SELECT CAST(); SELECT ';'; SELECT 3;SELECT CAST();SELECT 4;" | $CLICKHOUSE_CLIENT -n --ignore-error 2>/dev/null
+echo "SELECT CAST();" | $CLICKHOUSE_CLIENT -n --ignore-error 2>/dev/null
+echo "SELECT 5;" | $CLICKHOUSE_CLIENT -n --ignore-error
 
 #$CLICKHOUSE_CLIENT -q "SELECT 'Still alive'"
diff --git a/tests/queries/0_stateless/00534_client_ignore_error.sh b/tests/queries/0_stateless/00534_client_ignore_error.sh
index 553cb9fa897..d3215e1beac 100755
--- a/tests/queries/0_stateless/00534_client_ignore_error.sh
+++ b/tests/queries/0_stateless/00534_client_ignore_error.sh
@@ -5,8 +5,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-echo "SELECT 1; SELECT 2; SELECT CAST(); SELECT ';'; SELECT 3;SELECT CAST();SELECT 4;" | $CLICKHOUSE_CLIENT --ignore-error 2>/dev/null
-echo "SELECT CAST();" | $CLICKHOUSE_CLIENT --ignore-error 2>/dev/null
-echo "SELECT 5;" | $CLICKHOUSE_CLIENT --ignore-error
+echo "SELECT 1; SELECT 2; SELECT CAST(); SELECT ';'; SELECT 3;SELECT CAST();SELECT 4;" | $CLICKHOUSE_CLIENT -n --ignore-error 2>/dev/null
+echo "SELECT CAST();" | $CLICKHOUSE_CLIENT -n --ignore-error 2>/dev/null
+echo "SELECT 5;" | $CLICKHOUSE_CLIENT -n --ignore-error
 
 #$CLICKHOUSE_CLIENT -q "SELECT 'Still alive'"
diff --git a/tests/queries/0_stateless/00543_access_to_temporary_table_in_readonly_mode.sh b/tests/queries/0_stateless/00543_access_to_temporary_table_in_readonly_mode.sh
index 5550fa69d3d..560b97a1d1b 100755
--- a/tests/queries/0_stateless/00543_access_to_temporary_table_in_readonly_mode.sh
+++ b/tests/queries/0_stateless/00543_access_to_temporary_table_in_readonly_mode.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     DROP TABLE IF EXISTS test_readonly;
     CREATE TABLE test_readonly (
         ID Int
@@ -16,7 +16,7 @@ $CLICKHOUSE_CLIENT --query="
 ################
 
 # Try to create temporary table
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     SET readonly = 1;
     CREATE TEMPORARY TABLE readonly (
         ID Int
@@ -26,7 +26,7 @@ CODE=$?;
 [ "$CODE" -ne "164" ] && [ "$CODE" -ne "0" ] && echo "Fail" && exit $CODE;
 
 # Try to insert into exists (non temporary) table
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     SET readonly = 1;
     INSERT INTO test_readonly (ID) VALUES (1);
 " 2> /dev/null;
@@ -34,7 +34,7 @@ CODE=$?;
 [ "$CODE" -ne "164" ] && [ "$CODE" -ne "0" ] && echo "Fail" && exit $CODE;
 
 # Try to drop exists (non temporary) table
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     SET readonly = 1;
     DROP TABLE test_readonly;
 " 2> /dev/null;
@@ -46,7 +46,7 @@ CODE=$?;
 ################
 
 # Try to create temporary table
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     SET readonly = 2;
     CREATE TEMPORARY TABLE readonly (
         ID Int
@@ -58,7 +58,7 @@ CODE=$?;
 [ "$CODE" -ne "0" ] && echo "Fail" && exit $CODE;
 
 # Try to insert into exists (non temporary) table
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     SET readonly = 2;
     INSERT INTO test_readonly (ID) VALUES (1);
 " 2> /dev/null;
@@ -66,7 +66,7 @@ CODE=$?;
 [ "$CODE" -ne "164" ] && [ "$CODE" -ne "0" ] && echo "Fail" && exit $CODE;
 
 # Try to drop exists (non temporary) table
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     SET readonly = 2;
     DROP TABLE test_readonly;
 " 2> /dev/null;
@@ -78,7 +78,7 @@ CODE=$?;
 ################
 
 # Try to create temporary table
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     SET readonly = 0;
     CREATE TEMPORARY TABLE readonly (
         ID Int
@@ -90,7 +90,7 @@ CODE=$?;
 [ "$CODE" -ne "0" ] && echo "Fail" && exit $CODE;
 
 # Try to insert into exists (non temporary) table
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     SET readonly = 0;
     INSERT INTO test_readonly (ID) VALUES (1);
 " 2> /dev/null;
@@ -98,7 +98,7 @@ CODE=$?;
 [ "$CODE" -ne "0" ] && echo "Fail" && exit $CODE;
 
 # Try to drop exists (non temporary) table
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     SET readonly = 0;
     DROP TABLE test_readonly;
 " 2> /dev/null;
diff --git a/tests/queries/0_stateless/00550_join_insert_select.sh b/tests/queries/0_stateless/00550_join_insert_select.sh
index ee2f3ab286b..bfaccb613ca 100755
--- a/tests/queries/0_stateless/00550_join_insert_select.sh
+++ b/tests/queries/0_stateless/00550_join_insert_select.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --ignore-error --query="
+$CLICKHOUSE_CLIENT -n --ignore-error --query="
 DROP TABLE IF EXISTS test1_00550;
 DROP TABLE IF EXISTS test2_00550;
 DROP TABLE IF EXISTS test3_00550;
diff --git a/tests/queries/0_stateless/00560_float_leading_plus_in_exponent.sql b/tests/queries/0_stateless/00560_float_leading_plus_in_exponent.sql
index d2d62510e7b..33e010cdc9c 100644
--- a/tests/queries/0_stateless/00560_float_leading_plus_in_exponent.sql
+++ b/tests/queries/0_stateless/00560_float_leading_plus_in_exponent.sql
@@ -1,5 +1,3 @@
 CREATE TEMPORARY TABLE test_float (x Float64);
-
 INSERT INTO test_float FORMAT TabSeparated 1.075e+06
-
 SELECT * FROM test_float;
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 55b7cdd3c64..2c46edc98bf 100644
--- a/tests/queries/0_stateless/00597_push_down_predicate_long.reference
+++ b/tests/queries/0_stateless/00597_push_down_predicate_long.reference
@@ -390,7 +390,7 @@ ANY LEFT JOIN
 ) USING (id)
 WHERE id = 1
 2000-01-01	1	test string 1	1	2000-01-01	test string 1	1
-------- enable_analyzer=1 -------
+------- allow_experimental_analyzer=1 -------
 1	2000-01-01	test string 1	1	2000-01-01	test string 1	1
 SELECT
     id,
@@ -454,7 +454,7 @@ FROM
 )
 WHERE id = 1
 2000-01-01	1	test string 1	1
-------- enable_analyzer=1 -------
+------- allow_experimental_analyzer=1 -------
 1	2000-01-01	test string 1	1	2000-01-01	test string 1	1
 SELECT
     date,
@@ -484,7 +484,7 @@ ANY LEFT JOIN
 ) AS b USING (id)
 WHERE b.id = 1
 2000-01-01	1	test string 1	1	2000-01-01	test string 1	1
-------- enable_analyzer=1 -------
+------- allow_experimental_analyzer=1 -------
 1	2000-01-01	test string 1	1	2000-01-01	test string 1	1
 SELECT
     id,
@@ -510,7 +510,7 @@ ANY LEFT JOIN
 ) AS b USING (date, id)
 WHERE b.date = toDate(\'2000-01-01\')
 1	2000-01-01	test string 1	1
-------- enable_analyzer=1 -------
+------- allow_experimental_analyzer=1 -------
 2000-01-01	1	test string 1	1
 SELECT
     date,
@@ -593,7 +593,7 @@ SEMI LEFT JOIN
 ) AS r USING (id)
 WHERE r.id = 1
 2000-01-01	1	test string 1	1	2000-01-01	test string 1	1
-------- enable_analyzer=1 -------
+------- allow_experimental_analyzer=1 -------
 1	2000-01-01	test string 1	1	2000-01-01	test string 1	1
 SELECT value + t1.value AS expr
 FROM
diff --git a/tests/queries/0_stateless/00597_push_down_predicate_long.sql b/tests/queries/0_stateless/00597_push_down_predicate_long.sql
index f79b24abe56..caf6edd7372 100644
--- a/tests/queries/0_stateless/00597_push_down_predicate_long.sql
+++ b/tests/queries/0_stateless/00597_push_down_predicate_long.sql
@@ -110,9 +110,9 @@ SELECT * FROM (SELECT * FROM test_00597 UNION ALL SELECT * FROM test_00597) WHER
 
 -- Optimize predicate expression with join query
 EXPLAIN SYNTAX SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id WHERE id = 1;
-SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id WHERE id = 1 SETTINGS enable_analyzer=0;
-SELECT '------- enable_analyzer=1 -------';
-SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id WHERE id = 1 SETTINGS enable_analyzer=1;
+SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id WHERE id = 1 SETTINGS allow_experimental_analyzer=0;
+SELECT '------- allow_experimental_analyzer=1 -------';
+SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id WHERE id = 1 SETTINGS allow_experimental_analyzer=1;
 
 EXPLAIN SYNTAX SELECT * FROM (SELECT toInt8(1) AS id) ANY LEFT JOIN test_00597 USING id WHERE value = 1;
 SELECT * FROM (SELECT toInt8(1) AS id) ANY LEFT JOIN test_00597 USING id WHERE value = 1;
@@ -123,30 +123,30 @@ SELECT b.value FROM (SELECT toInt8(1) AS id) ANY LEFT JOIN test_00597 AS b USING
 
 -- Optimize predicate expression with join and nested subquery
 EXPLAIN SYNTAX SELECT * FROM (SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id) WHERE id = 1;
-SELECT * FROM (SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id) WHERE id = 1 SETTINGS enable_analyzer=0;
-SELECT '------- enable_analyzer=1 -------';
-SELECT * FROM (SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id) WHERE id = 1 SETTINGS enable_analyzer=1;
+SELECT * FROM (SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id) WHERE id = 1 SETTINGS allow_experimental_analyzer=0;
+SELECT '------- allow_experimental_analyzer=1 -------';
+SELECT * FROM (SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) USING id) WHERE id = 1 SETTINGS allow_experimental_analyzer=1;
 
 -- Optimize predicate expression with join query and qualified
 EXPLAIN SYNTAX SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING id WHERE b.id = 1;
-SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING id WHERE b.id = 1 SETTINGS enable_analyzer=0;
-SELECT '------- enable_analyzer=1 -------';
-SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING id WHERE b.id = 1 SETTINGS enable_analyzer=1;
+SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING id WHERE b.id = 1 SETTINGS allow_experimental_analyzer=0;
+SELECT '------- allow_experimental_analyzer=1 -------';
+SELECT * FROM (SELECT * FROM test_00597) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING id WHERE b.id = 1 SETTINGS allow_experimental_analyzer=1;
 
 -- Compatibility test
 EXPLAIN SYNTAX SELECT * FROM (SELECT toInt8(1) AS id, toDate('2000-01-01') AS date FROM system.numbers LIMIT 1) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING date, id WHERE b.date = toDate('2000-01-01');
-SELECT * FROM (SELECT toInt8(1) AS id, toDate('2000-01-01') AS date FROM system.numbers LIMIT 1) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING date, id WHERE b.date = toDate('2000-01-01') SETTINGS enable_analyzer=0;
-SELECT '------- enable_analyzer=1 -------';
-SELECT * FROM (SELECT toInt8(1) AS id, toDate('2000-01-01') AS date FROM system.numbers LIMIT 1) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING date, id WHERE b.date = toDate('2000-01-01') SETTINGS enable_analyzer=1;
+SELECT * FROM (SELECT toInt8(1) AS id, toDate('2000-01-01') AS date FROM system.numbers LIMIT 1) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING date, id WHERE b.date = toDate('2000-01-01') SETTINGS allow_experimental_analyzer=0;
+SELECT '------- allow_experimental_analyzer=1 -------';
+SELECT * FROM (SELECT toInt8(1) AS id, toDate('2000-01-01') AS date FROM system.numbers LIMIT 1) ANY LEFT JOIN (SELECT * FROM test_00597) AS b USING date, id WHERE b.date = toDate('2000-01-01') SETTINGS allow_experimental_analyzer=1;
 
 EXPLAIN SYNTAX SELECT * FROM (SELECT * FROM (SELECT * FROM test_00597) AS a ANY LEFT JOIN (SELECT * FROM test_00597) AS b  ON  a.id = b.id) WHERE id = 1;
 SELECT * FROM (SELECT * FROM (SELECT * FROM test_00597) AS a ANY LEFT JOIN (SELECT * FROM test_00597) AS b  ON  a.id = b.id) WHERE id = 1;
 
 -- Explain with join subquery
 EXPLAIN SYNTAX SELECT * FROM (SELECT * FROM test_00597) ANY INNER JOIN (SELECT * FROM (SELECT * FROM test_00597)) as r USING id WHERE r.id = 1;
-SELECT * FROM (SELECT * FROM test_00597) ANY INNER JOIN (SELECT * FROM (SELECT * FROM test_00597)) as r USING id WHERE r.id = 1 SETTINGS enable_analyzer=0;
-SELECT '------- enable_analyzer=1 -------';
-SELECT * FROM (SELECT * FROM test_00597) ANY INNER JOIN (SELECT * FROM (SELECT * FROM test_00597)) as r USING id WHERE r.id = 1 SETTINGS enable_analyzer=1;
+SELECT * FROM (SELECT * FROM test_00597) ANY INNER JOIN (SELECT * FROM (SELECT * FROM test_00597)) as r USING id WHERE r.id = 1 SETTINGS allow_experimental_analyzer=0;
+SELECT '------- allow_experimental_analyzer=1 -------';
+SELECT * FROM (SELECT * FROM test_00597) ANY INNER JOIN (SELECT * FROM (SELECT * FROM test_00597)) as r USING id WHERE r.id = 1 SETTINGS allow_experimental_analyzer=1;
 
 -- issue 20497
 EXPLAIN SYNTAX SELECT value + t1.value AS expr FROM (SELECT t0.value, t1.value FROM test_00597 AS t0 FULL JOIN test_00597 AS t1 USING date) WHERE expr < 3;
diff --git a/tests/queries/0_stateless/00600_replace_running_query.sh b/tests/queries/0_stateless/00600_replace_running_query.sh
index 7d4125eea69..7a71d17f19b 100755
--- a/tests/queries/0_stateless/00600_replace_running_query.sh
+++ b/tests/queries/0_stateless/00600_replace_running_query.sh
@@ -6,56 +6,41 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-TEST_PREFIX="${CLICKHOUSE_DATABASE}"
+TEST_PREFIX=$RANDOM
 ${CLICKHOUSE_CLIENT} -q "drop user if exists u_00600${TEST_PREFIX}"
-${CLICKHOUSE_CLIENT} -q "create user u_00600${TEST_PREFIX} settings max_execution_time=60, readonly=1, max_rows_to_read=0"
+${CLICKHOUSE_CLIENT} -q "create user u_00600${TEST_PREFIX} settings max_execution_time=60, readonly=1"
 ${CLICKHOUSE_CLIENT} -q "grant select on system.numbers to u_00600${TEST_PREFIX}"
 
 function wait_for_query_to_start()
 {
-    while [[ 0 -eq $($CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" -d "SELECT count() FROM system.processes WHERE query_id = '$1'") ]]
-    do
-        sleep 0.1
-    done
-}
-
-function wait_for_queries_to_finish()
-{
-    while [[ 0 -ne $($CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" -d "SELECT count() FROM system.processes WHERE current_database = '${CLICKHOUSE_DATABASE}' AND query NOT LIKE '%this query%'") ]]
-    do
-        sleep 0.1
-    done
+    while [[ $($CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" -d "SELECT count() FROM system.processes WHERE query_id = '$1'") == 0 ]]; do sleep 0.1; done
 }
 
 
-$CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL&query_id=${CLICKHOUSE_DATABASE}hello&replace_running_query=1&max_rows_to_read=0" -d 'SELECT 1, count() FROM system.numbers' > /dev/null 2>&1 &
-wait_for_query_to_start "${CLICKHOUSE_DATABASE}hello"
+$CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL&query_id=hello&replace_running_query=1" -d 'SELECT 1, count() FROM system.numbers' > /dev/null 2>&1 &
+wait_for_query_to_start 'hello'
 
 # Replace it
-$CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL&query_id=${CLICKHOUSE_DATABASE}hello&replace_running_query=1" -d 'SELECT 0'
+$CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL&query_id=hello&replace_running_query=1" -d 'SELECT 0'
 
 # Wait for it to be replaced
 wait
-wait_for_queries_to_finish
 
-${CLICKHOUSE_CLIENT_BINARY} --user=u_00600${TEST_PREFIX} --query_id="${CLICKHOUSE_DATABASE}42" --query='SELECT 2, count() FROM system.numbers' 2>&1 | grep -cF 'QUERY_WAS_CANCELLED' &
-wait_for_query_to_start "${CLICKHOUSE_DATABASE}42"
+${CLICKHOUSE_CLIENT_BINARY} --user=u_00600${TEST_PREFIX} --query_id=42 --query='SELECT 2, count() FROM system.numbers' 2>&1 | grep -cF 'was cancelled' &
+wait_for_query_to_start '42'
 
 # Trying to run another query with the same query_id
-${CLICKHOUSE_CLIENT} --query_id="${CLICKHOUSE_DATABASE}42" --query='SELECT 43' 2>&1 | grep -cF 'is already running by user'
+${CLICKHOUSE_CLIENT} --query_id=42 --query='SELECT 43' 2>&1 | grep -cF 'is already running by user'
 
 # Trying to replace query of a different user
-$CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL&query_id=${CLICKHOUSE_DATABASE}42&replace_running_query=1" -d 'SELECT 1' | grep -cF 'is already running by user'
+$CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL&query_id=42&replace_running_query=1" -d 'SELECT 1' | grep -cF 'is already running by user'
 
-$CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" -d "KILL QUERY WHERE query_id = '${CLICKHOUSE_DATABASE}42' SYNC" > /dev/null
+$CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" -d "KILL QUERY WHERE query_id = '42' SYNC" > /dev/null
 wait
-wait_for_queries_to_finish
 
-${CLICKHOUSE_CLIENT} --query_id="${CLICKHOUSE_DATABASE}42" --max_rows_to_read=0 --query='SELECT 3, count() FROM system.numbers' 2>&1 | grep -cF 'QUERY_WAS_CANCELLED' &
-wait_for_query_to_start "${CLICKHOUSE_DATABASE}42"
-${CLICKHOUSE_CLIENT} --query_id="${CLICKHOUSE_DATABASE}42" --replace_running_query=1 --replace_running_query_max_wait_ms=500 --query='SELECT 43' 2>&1 | grep -F "can't be stopped" > /dev/null
+${CLICKHOUSE_CLIENT} --query_id=42 --query='SELECT 3, count() FROM system.numbers' 2>&1 | grep -cF 'was cancelled' &
+wait_for_query_to_start '42'
+${CLICKHOUSE_CLIENT} --query_id=42 --replace_running_query=1 --replace_running_query_max_wait_ms=500 --query='SELECT 43' 2>&1 | grep -F "can't be stopped" > /dev/null
 wait
-wait_for_queries_to_finish
-
-${CLICKHOUSE_CLIENT} --query_id="${CLICKHOUSE_DATABASE}42" --replace_running_query=1 --query='SELECT 44'
+${CLICKHOUSE_CLIENT} --query_id=42 --replace_running_query=1 --query='SELECT 44'
 ${CLICKHOUSE_CLIENT} -q "drop user u_00600${TEST_PREFIX}"
diff --git a/tests/queries/0_stateless/00601_kill_running_query.reference b/tests/queries/0_stateless/00601_kill_running_query.reference
index 7824d5804bc..3917ff89482 100644
--- a/tests/queries/0_stateless/00601_kill_running_query.reference
+++ b/tests/queries/0_stateless/00601_kill_running_query.reference
@@ -1 +1 @@
-waiting	test_00601_default	default	SELECT sum(ignore(*)) FROM (SELECT number % 1000 AS k, groupArray(number) FROM numbers(50000000) GROUP BY k) SETTINGS max_rows_to_read = 0
+waiting	test_00601_default	default	SELECT sum(ignore(*)) FROM (SELECT number % 1000 AS k, groupArray(number) FROM numbers(50000000) GROUP BY k)
diff --git a/tests/queries/0_stateless/00601_kill_running_query.sh b/tests/queries/0_stateless/00601_kill_running_query.sh
index be0fff49129..3163f8146d0 100755
--- a/tests/queries/0_stateless/00601_kill_running_query.sh
+++ b/tests/queries/0_stateless/00601_kill_running_query.sh
@@ -11,7 +11,7 @@ function wait_for_query_to_start()
     while [[ $($CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" -d "SELECT count() FROM system.processes WHERE query_id = '$1'") == 0 ]]; do sleep 0.1; done
 }
 
-${CLICKHOUSE_CURL_COMMAND} -q --max-time 30 -sS "$CLICKHOUSE_URL&query_id=test_00601_$CLICKHOUSE_DATABASE" -d 'SELECT sum(ignore(*)) FROM (SELECT number % 1000 AS k, groupArray(number) FROM numbers(50000000) GROUP BY k) SETTINGS max_rows_to_read = 0' > /dev/null &
+${CLICKHOUSE_CURL_COMMAND} -q --max-time 30 -sS "$CLICKHOUSE_URL&query_id=test_00601_$CLICKHOUSE_DATABASE" -d 'SELECT sum(ignore(*)) FROM (SELECT number % 1000 AS k, groupArray(number) FROM numbers(50000000) GROUP BY k)' > /dev/null &
 wait_for_query_to_start "test_00601_$CLICKHOUSE_DATABASE"
 $CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" -d "KILL QUERY WHERE query_id = 'test_00601_$CLICKHOUSE_DATABASE'"
 wait
diff --git a/tests/queries/0_stateless/00609_mv_index_in_in.sql b/tests/queries/0_stateless/00609_mv_index_in_in.sql
index 848938780c2..bd9f35350c1 100644
--- a/tests/queries/0_stateless/00609_mv_index_in_in.sql
+++ b/tests/queries/0_stateless/00609_mv_index_in_in.sql
@@ -1,4 +1,4 @@
--- Tags: no-ordinary-database, no-parallel
+-- Tags: no-ordinary-database
 
 DROP TABLE IF EXISTS test_00609;
 DROP TABLE IF EXISTS test_mv_00609;
@@ -6,7 +6,6 @@ DROP TABLE IF EXISTS test_mv_00609;
 create table test_00609 (a Int8) engine=Memory;
 
 insert into test_00609 values (1);
-set database_replicated_allow_explicit_uuid=3;
 set allow_deprecated_syntax_for_merge_tree=1;
 create materialized view test_mv_00609 uuid '00000609-1000-4000-8000-000000000001' Engine=MergeTree(date, (a), 8192) populate as select a, toDate('2000-01-01') date from test_00609;
 
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 7b2973669de..c8297635c43 100755
--- a/tests/queries/0_stateless/00612_pk_in_tuple_perf.sh
+++ b/tests/queries/0_stateless/00612_pk_in_tuple_perf.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 
 
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS pk_in_tuple_perf;
 CREATE TABLE pk_in_tuple_perf
 (
@@ -27,7 +27,7 @@ $CLICKHOUSE_CLIENT --query "$query FORMAT JSON" | grep "rows_read"
 
 ## Test with non-const args in tuple
 
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS pk_in_tuple_perf_non_const;
 CREATE TABLE pk_in_tuple_perf_non_const
 (
diff --git a/tests/queries/0_stateless/00621_regression_for_in_operator.reference b/tests/queries/0_stateless/00621_regression_for_in_operator.reference
index ab8a1499f6d..b68f550a742 100644
--- a/tests/queries/0_stateless/00621_regression_for_in_operator.reference
+++ b/tests/queries/0_stateless/00621_regression_for_in_operator.reference
@@ -17,7 +17,7 @@ QUERY id: 0
         LIST id: 5, nodes: 2
           COLUMN id: 6, column_name: g, result_type: String, source_id: 3
           CONSTANT id: 7, constant_value: Tuple_(\'5\', \'6\'), constant_value_type: Tuple(String, String)
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 2
 2
 QUERY id: 0
@@ -42,4 +42,4 @@ QUERY id: 0
               LIST id: 11, nodes: 2
                 COLUMN id: 8, column_name: g, result_type: String, source_id: 3
                 CONSTANT id: 12, constant_value: \'6\', constant_value_type: String
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
diff --git a/tests/queries/0_stateless/00621_regression_for_in_operator.sql b/tests/queries/0_stateless/00621_regression_for_in_operator.sql
index 0d8c4933c65..db1bcb4a39a 100644
--- a/tests/queries/0_stateless/00621_regression_for_in_operator.sql
+++ b/tests/queries/0_stateless/00621_regression_for_in_operator.sql
@@ -12,13 +12,13 @@ SELECT count() FROM regression_for_in_operator_view WHERE g IN ('5','6');
 
 SET optimize_min_equality_disjunction_chain_length = 1;
 SELECT count() FROM regression_for_in_operator_view WHERE g = '5' OR g = '6';
-SELECT count() FROM regression_for_in_operator_view WHERE g = '5' OR g = '6' SETTINGS enable_analyzer = 1;
-EXPLAIN QUERY TREE SELECT count() FROM regression_for_in_operator_view WHERE g = '5' OR g = '6' SETTINGS enable_analyzer = 1;
+SELECT count() FROM regression_for_in_operator_view WHERE g = '5' OR g = '6' SETTINGS allow_experimental_analyzer = 1;
+EXPLAIN QUERY TREE SELECT count() FROM regression_for_in_operator_view WHERE g = '5' OR g = '6' SETTINGS allow_experimental_analyzer = 1;
 
 SET optimize_min_equality_disjunction_chain_length = 3;
 SELECT count() FROM regression_for_in_operator_view WHERE g = '5' OR g = '6';
-SELECT count() FROM regression_for_in_operator_view WHERE g = '5' OR g = '6' SETTINGS enable_analyzer = 1;
-EXPLAIN QUERY TREE SELECT count() FROM regression_for_in_operator_view WHERE g = '5' OR g = '6' SETTINGS enable_analyzer = 1;
+SELECT count() FROM regression_for_in_operator_view WHERE g = '5' OR g = '6' SETTINGS allow_experimental_analyzer = 1;
+EXPLAIN QUERY TREE SELECT count() FROM regression_for_in_operator_view WHERE g = '5' OR g = '6' SETTINGS allow_experimental_analyzer = 1;
 
 DROP TABLE regression_for_in_operator_view;
 DROP TABLE regression_for_in_operator;
diff --git a/tests/queries/0_stateless/00626_replace_partition_from_table.reference b/tests/queries/0_stateless/00626_replace_partition_from_table.reference
index 0f8ded245d0..611f3a93ced 100644
--- a/tests/queries/0_stateless/00626_replace_partition_from_table.reference
+++ b/tests/queries/0_stateless/00626_replace_partition_from_table.reference
@@ -10,12 +10,11 @@ REPLACE recursive
 4	8
 1
 ATTACH FROM
-6	8
-10	12
+5	8
 OPTIMIZE
-10	12	9
-10	12	5
+5	8	5
+5	8	3
 After restart
-10	12
+5	8
 DETACH+ATTACH PARTITION
-7	7
+3	4
diff --git a/tests/queries/0_stateless/00626_replace_partition_from_table.sql b/tests/queries/0_stateless/00626_replace_partition_from_table.sql
index 3f712f48c06..7224224334e 100644
--- a/tests/queries/0_stateless/00626_replace_partition_from_table.sql
+++ b/tests/queries/0_stateless/00626_replace_partition_from_table.sql
@@ -53,16 +53,12 @@ DROP TABLE src;
 CREATE TABLE src (p UInt64, k String, d UInt64) ENGINE = MergeTree PARTITION BY p ORDER BY k;
 INSERT INTO src VALUES (1, '0', 1);
 INSERT INTO src VALUES (1, '1', 1);
-INSERT INTO src VALUES (2, '2', 1);
-INSERT INTO src VALUES (3, '3', 1);
 
 SYSTEM STOP MERGES dst;
-INSERT INTO dst VALUES (1, '1', 2), (1, '2', 0);
+INSERT INTO dst VALUES (1, '1', 2);
 ALTER TABLE dst ATTACH PARTITION 1 FROM src;
 SELECT count(), sum(d) FROM dst;
 
-ALTER TABLE dst ATTACH PARTITION ALL FROM src;
-SELECT count(), sum(d) FROM dst;
 
 SELECT 'OPTIMIZE';
 SELECT count(), sum(d), uniqExact(_part) FROM dst;
diff --git a/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.reference b/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.reference
index 6a7c3478f86..c6208941ac6 100644
--- a/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.reference
+++ b/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.reference
@@ -16,7 +16,6 @@ REPLACE recursive
 ATTACH FROM
 5	8
 5	8
-7	12
 REPLACE with fetch
 4	6
 4	6
diff --git a/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
index 0cadfb6194c..13146f2eab0 100755
--- a/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: zookeeper, no-object-storage, long
+# Tags: zookeeper, no-object-storage
 
 # Because REPLACE PARTITION does not forces immediate removal of replaced data parts from local filesystem
 # (it tries to do it as quick as possible, but it still performed in separate thread asynchronously)
@@ -82,8 +82,6 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE src;"
 $CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String, d UInt64) ENGINE = MergeTree PARTITION BY p ORDER BY k;"
 $CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (1, '0', 1);"
 $CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (1, '1', 1);"
-$CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (3, '1', 2);"
-$CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (4, '1', 2);"
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO dst_r2 VALUES (1, '1', 2);"
 query_with_retry "ALTER TABLE dst_r2 ATTACH PARTITION 1 FROM src;"
@@ -92,13 +90,6 @@ $CLICKHOUSE_CLIENT --query="SYSTEM SYNC REPLICA dst_r1;"
 $CLICKHOUSE_CLIENT --query="SELECT count(), sum(d) FROM dst_r1;"
 $CLICKHOUSE_CLIENT --query="SELECT count(), sum(d) FROM dst_r2;"
 
-query_with_retry "ALTER TABLE dst_r2 ATTACH PARTITION ALL FROM src;"
-$CLICKHOUSE_CLIENT --query="SYSTEM SYNC REPLICA dst_r2;"
-$CLICKHOUSE_CLIENT --query="SELECT count(), sum(d) FROM dst_r2;"
-query_with_retry "ALTER TABLE dst_r2 DROP PARTITION 3;"
-$CLICKHOUSE_CLIENT --query="SYSTEM SYNC REPLICA dst_r2;"
-query_with_retry "ALTER TABLE dst_r2 DROP PARTITION 4;"
-$CLICKHOUSE_CLIENT --query="SYSTEM SYNC REPLICA dst_r2;"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'REPLACE with fetch';"
 $CLICKHOUSE_CLIENT --query="DROP TABLE src;"
diff --git a/tests/queries/0_stateless/00630_arbitrary_csv_delimiter.sh b/tests/queries/0_stateless/00630_arbitrary_csv_delimiter.sh
index 921cab8d865..978b7bdb671 100755
--- a/tests/queries/0_stateless/00630_arbitrary_csv_delimiter.sh
+++ b/tests/queries/0_stateless/00630_arbitrary_csv_delimiter.sh
@@ -22,7 +22,7 @@ echo '"Hello, world"; 123; "2016-01-01"
 "Hello, ""world"""; "456"; 2016-01-02;
 Hello "world"; 789 ;2016-01-03
 "Hello
- world"; 100; 2016-01-04;' | $CLICKHOUSE_CLIENT --query="SET format_csv_delimiter=';'; INSERT INTO csv FORMAT CSV";
+ world"; 100; 2016-01-04;' | $CLICKHOUSE_CLIENT --multiquery --query="SET format_csv_delimiter=';'; INSERT INTO csv FORMAT CSV";
 
 $CLICKHOUSE_CLIENT --query="SELECT * FROM csv ORDER BY d";
 $CLICKHOUSE_CLIENT --format_csv_delimiter=";" --query="SELECT * FROM csv ORDER BY d FORMAT CSV";
@@ -33,7 +33,7 @@ $CLICKHOUSE_CLIENT --query="CREATE TABLE csv (s1 String, s2 String) ENGINE = Mem
 
 echo 'abc,def;hello;
 hello; world;
-"hello ""world""";abc,def;' | $CLICKHOUSE_CLIENT --query="SET format_csv_delimiter=';'; INSERT INTO csv FORMAT CSV";
+"hello ""world""";abc,def;' | $CLICKHOUSE_CLIENT --multiquery --query="SET format_csv_delimiter=';'; INSERT INTO csv FORMAT CSV";
 
 
 $CLICKHOUSE_CLIENT --query="SELECT * FROM csv";
@@ -44,7 +44,7 @@ $CLICKHOUSE_CLIENT --query="CREATE TABLE csv (s1 String, s2 String) ENGINE = Mem
 echo '"s1";"s2"
 abc,def;hello;
 hello; world;
-"hello ""world""";abc,def;' | $CLICKHOUSE_CLIENT --query="SET format_csv_delimiter=';'; INSERT INTO csv FORMAT CSVWithNames";
+"hello ""world""";abc,def;' | $CLICKHOUSE_CLIENT --multiquery --query="SET format_csv_delimiter=';'; INSERT INTO csv FORMAT CSVWithNames";
 
 $CLICKHOUSE_CLIENT --format_csv_delimiter=";" --query="SELECT * FROM csv FORMAT CSV";
 $CLICKHOUSE_CLIENT --format_csv_delimiter="," --query="SELECT * FROM csv FORMAT CSV";
diff --git a/tests/queries/0_stateless/00632_get_sample_block_cache.sql b/tests/queries/0_stateless/00632_get_sample_block_cache.sql
index a631cbb8b86..ae9b6bb7b2c 100644
--- a/tests/queries/0_stateless/00632_get_sample_block_cache.sql
+++ b/tests/queries/0_stateless/00632_get_sample_block_cache.sql
@@ -2,9 +2,6 @@
 
 SET joined_subquery_requires_alias = 0;
 
--- We are no longer interested in the old analyzer.
-SET allow_experimental_analyzer = 1;
-
 -- This test (SELECT) without cache can take tens minutes
 DROP TABLE IF EXISTS dict_string;
 DROP TABLE IF EXISTS dict_ui64;
@@ -44,6 +41,8 @@ SETTINGS index_granularity = 8192;
 CREATE TABLE dict_string (entityIri String) ENGINE = Memory;
 CREATE TABLE dict_ui64 (learnerId UInt64) ENGINE = Memory;
 
+--SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average`, `views-count-before-full-watched-average`, `duration`, `full-watched-learners-count`, `overall-watchers-count`, `overall-full-watched-learners-count`, `views-count`, `time-before-full-watched-average`, if (isNaN((`overall-full-watched-learners-count`/`overall-watchers-count`) * 100), 0, (`overall-full-watched-learners-count`/`overall-watchers-count`) * 100) as `overall-watched-part`, if (isNaN((`full-watched-learners-count`/`watchers-count` * 100)), 0, (`full-watched-learners-count`/`watchers-count` * 100)) as `full-watched-part`, if (isNaN((`rejects-count`/`views-count` * 100)), 0, (`rejects-count`/`views-count` * 100)) as `rejects-part` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average`, `views-count-before-full-watched-average`, `duration`, `full-watched-learners-count`, `overall-watchers-count`, `overall-full-watched-learners-count`, `views-count`, `time-before-full-watched-average` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average`, `views-count-before-full-watched-average`, `duration`, `full-watched-learners-count`, `overall-watchers-count`, `overall-full-watched-learners-count`, `views-count` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average`, `views-count-before-full-watched-average`, `duration`, `full-watched-learners-count`, `overall-watchers-count`, `overall-full-watched-learners-count` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average`, `views-count-before-full-watched-average`, `duration`, `full-watched-learners-count`, `overall-watchers-count` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average`, `views-count-before-full-watched-average`, `duration`, `full-watched-learners-count` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average`, `views-count-before-full-watched-average`, `duration` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average`, `views-count-before-full-watched-average` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average` FROM (SELECT `entityIri`, `watchers-count` FROM (SELECT `entityIri` FROM `CloM8CwMR2`) ANY LEFT JOIN (SELECT uniq(learnerId) as `watchers-count`, `entityIri` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN `CloM8CwMR2` AND `courseId` = 1 WHERE `learnerId` IN `tkRpHxGqM1` GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT avg(viewDurationSum) as `time-repeating-average`, `entityIri` FROM (SELECT sum(views.viewDuration) as viewDurationSum, `entityIri`, `learnerId` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN `CloM8CwMR2` AND `courseId` = 1 WHERE `views`.`repeatingView` = 1 AND `learnerId` IN `tkRpHxGqM1` GROUP BY `learnerId`, `entityIri`) GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT avg(views.viewDuration) as `reject-views-duration-average`, `entityIri` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN `CloM8CwMR2` AND `courseId` = 1 WHERE `views`.`reject` = 1 AND `learnerId` IN `tkRpHxGqM1` GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT avg(viewsCount) as `repeating-views-count-average`, `entityIri` FROM (SELECT count() as viewsCount, `learnerId`, `entityIri` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `courseId` = 1 AND `entityIri` IN `CloM8CwMR2` WHERE `views`.`repeatingView` = 1 AND `learnerId` IN `tkRpHxGqM1` GROUP BY `learnerId`, `entityIri`) GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT avg(views.viewDuration) as `views-duration-average`, `entityIri` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN `CloM8CwMR2` AND `courseId` = 1 WHERE `learnerId` IN `tkRpHxGqM1` GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT avg(views.watchedPart) as `watched-part-average`, `entityIri` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN `CloM8CwMR2` AND `courseId` = 1 WHERE `learnerId` IN `tkRpHxGqM1` GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT count() as `rejects-count`, `entityIri` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN `CloM8CwMR2` AND `courseId` = 1 WHERE `views`.`reject` = 1 AND `learnerId` IN `tkRpHxGqM1` GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT avg(progressMax) as `progress-average`, `entityIri` FROM (SELECT max(views.progress) as progressMax, `entityIri`, `learnerId` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN `CloM8CwMR2` AND `courseId` = 1 WHERE `learnerId` IN `tkRpHxGqM1` GROUP BY `learnerId`, `entityIri`) GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT avg(fullWatchedViews) as `views-count-before-full-watched-average`, `entityIri` FROM `video_views` FINAL PREWHERE `entityIri` IN `CloM8CwMR2` AND `courseId` = 1 WHERE `learnerId` IN `tkRpHxGqM1` GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT any(duration) as `duration`, `entityIri` FROM `video_views` FINAL PREWHERE `entityIri` IN `CloM8CwMR2` AND `courseId` = 1 WHERE `learnerId` IN `tkRpHxGqM1` GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT uniq(learnerId) as `full-watched-learners-count`, `entityIri` FROM `video_views` FINAL PREWHERE `entityIri` IN `CloM8CwMR2` AND `courseId` = 1 WHERE `fullWatched` = 1 AND `learnerId` IN `tkRpHxGqM1` GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT uniq(learnerId) as `overall-watchers-count`, `entityIri` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN `CloM8CwMR2` AND `courseId` = 1 WHERE `learnerId` IN `tkRpHxGqM1` GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT uniq(learnerId) as `overall-full-watched-learners-count`,  `entityIri` FROM `video_views` FINAL PREWHERE `entityIri` IN `CloM8CwMR2` AND `courseId` = 1 WHERE `fullWatched` = 1 AND `learnerId` IN `tkRpHxGqM1` GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT count() as `views-count`, `entityIri` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN `CloM8CwMR2` AND `courseId` = 1 WHERE `learnerId` IN `tkRpHxGqM1` GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT avg(fullWatchedTime) as `time-before-full-watched-average`, `entityIri` FROM `video_views` FINAL PREWHERE `entityIri` IN `CloM8CwMR2` AND `courseId` = 1 WHERE `learnerId` IN `tkRpHxGqM1` GROUP BY `entityIri`) USING `entityIri`) FORMAT JSON;
+
 SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average`, `views-count-before-full-watched-average`, `duration`, `full-watched-learners-count`, `overall-watchers-count`, `overall-full-watched-learners-count`, `views-count`, `time-before-full-watched-average`, if (isNaN((`overall-full-watched-learners-count`/`overall-watchers-count`) * 100), 0, (`overall-full-watched-learners-count`/`overall-watchers-count`) * 100) as `overall-watched-part`, if (isNaN((`full-watched-learners-count`/`watchers-count` * 100)), 0, (`full-watched-learners-count`/`watchers-count` * 100)) as `full-watched-part`, if (isNaN((`rejects-count`/`views-count` * 100)), 0, (`rejects-count`/`views-count` * 100)) as `rejects-part` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average`, `views-count-before-full-watched-average`, `duration`, `full-watched-learners-count`, `overall-watchers-count`, `overall-full-watched-learners-count`, `views-count`, `time-before-full-watched-average` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average`, `views-count-before-full-watched-average`, `duration`, `full-watched-learners-count`, `overall-watchers-count`, `overall-full-watched-learners-count`, `views-count` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average`, `views-count-before-full-watched-average`, `duration`, `full-watched-learners-count`, `overall-watchers-count`, `overall-full-watched-learners-count` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average`, `views-count-before-full-watched-average`, `duration`, `full-watched-learners-count`, `overall-watchers-count` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average`, `views-count-before-full-watched-average`, `duration`, `full-watched-learners-count` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average`, `views-count-before-full-watched-average`, `duration` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average`, `views-count-before-full-watched-average` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count`, `progress-average` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average`, `rejects-count` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average`, `watched-part-average` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average`, `repeating-views-count-average`, `views-duration-average` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`,
  `reject-views-duration-average`, `repeating-views-count-average` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average`, `reject-views-duration-average` FROM (SELECT `entityIri`, `watchers-count`, `time-repeating-average` FROM (SELECT `entityIri`, `watchers-count` FROM (SELECT `entityIri` FROM dict_string) ANY LEFT JOIN (SELECT uniq(learnerId) as `watchers-count`, `entityIri` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN dict_string AND `courseId` = 1 WHERE `learnerId` IN dict_ui64 GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT avg(viewDurationSum) as `time-repeating-average`, `entityIri` FROM (SELECT sum(views.viewDuration) as viewDurationSum, `entityIri`, `learnerId` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN dict_string AND `courseId` = 1 WHERE `views`.`repeatingView` = 1 AND `learnerId` IN dict_ui64 GROUP BY `learnerId`, `entityIri`) GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT avg(views.viewDuration) as `reject-views-duration-average`, `entityIri` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN dict_string AND `courseId` = 1 WHERE `views`.`reject` = 1 AND `learnerId` IN dict_ui64 GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT avg(viewsCount) as `repeating-views-count-average`, `entityIri` FROM (SELECT count() as viewsCount, `learnerId`, `entityIri` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `courseId` = 1 AND `entityIri` IN dict_string WHERE `views`.`repeatingView` = 1 AND `learnerId` IN dict_ui64 GROUP BY `learnerId`, `entityIri`) GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT avg(views.viewDuration) as `views-duration-average`, `entityIri` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN dict_string AND `courseId` = 1 WHERE `learnerId` IN dict_ui64 GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT avg(views.watchedPart) as `watched-part-average`, `entityIri` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN dict_string AND `courseId` = 1 WHERE `learnerId` IN dict_ui64 GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT count() as `rejects-count`, `entityIri` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN dict_string AND `courseId` = 1 WHERE `views`.`reject` = 1 AND `learnerId` IN dict_ui64 GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT avg(progressMax) as `progress-average`, `entityIri` FROM (SELECT max(views.progress) as progressMax, `entityIri`, `learnerId` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN dict_string AND `courseId` = 1 WHERE `learnerId` IN dict_ui64 GROUP BY `learnerId`, `entityIri`) GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT avg(fullWatchedViews) as `views-count-before-full-watched-average`, `entityIri` FROM `video_views` FINAL PREWHERE `entityIri` IN dict_string AND `courseId` = 1 WHERE `learnerId` IN dict_ui64 GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT any(duration) as `duration`, `entityIri` FROM `video_views` FINAL PREWHERE `entityIri` IN dict_string AND `courseId` = 1 WHERE `learnerId` IN dict_ui64 GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT uniq(learnerId) as `full-watched-learners-count`, `entityIri` FROM `video_views` FINAL PREWHERE `entityIri` IN dict_string AND `courseId` = 1 WHERE `fullWatched` = 1 AND `learnerId` IN dict_ui64 GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT uniq(learnerId) as `overall-watchers-count`, `entityIri` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN dict_string AND `courseId` = 1 WHERE `learnerId` IN dict_ui64 GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT uniq(learnerId) as `overall-full-watched-learners-count`,
   `entityIri` FROM `video_views` FINAL PREWHERE `entityIri` IN dict_string AND `courseId` = 1 WHERE `fullWatched` = 1 AND `learnerId` IN dict_ui64 GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT count() as `views-count`, `entityIri` FROM `video_views` FINAL ARRAY JOIN `views` PREWHERE `entityIri` IN dict_string AND `courseId` = 1 WHERE `learnerId` IN dict_ui64 GROUP BY `entityIri`) USING `entityIri`) ANY LEFT JOIN (SELECT avg(fullWatchedTime) as `time-before-full-watched-average`, `entityIri` FROM `video_views` FINAL PREWHERE `entityIri` IN dict_string AND `courseId` = 1 WHERE `learnerId` IN dict_ui64 GROUP BY `entityIri`) USING `entityIri`);
@@ -56,8 +55,8 @@ DROP TABLE video_views;
 
 
 
--- Test for tsan: Ensure cache is used from one thread
-SET max_threads = 32, max_memory_usage = '10G';
+-- Test for tsan: Ensure cache used from one thread
+SET max_threads = 32;
 
 DROP TABLE IF EXISTS sample_00632;
 
@@ -174,6 +173,7 @@ FROM
     UNION ALL SELECT * FROM ( SELECT * FROM sample_00632 WHERE x > 0 )
     )
     GROUP BY x
+    --HAVING c = 1
     ORDER BY x ASC
 );
 DROP TABLE sample_00632;
diff --git a/tests/queries/0_stateless/00634_performance_introspection_and_logging.sh b/tests/queries/0_stateless/00634_performance_introspection_and_logging.sh
index e9a4369a5bf..93fd0c4a977 100755
--- a/tests/queries/0_stateless/00634_performance_introspection_and_logging.sh
+++ b/tests/queries/0_stateless/00634_performance_introspection_and_logging.sh
@@ -19,13 +19,13 @@ settings="$server_logs --log_queries=1 --log_query_threads=1 --log_profile_event
 
 # Test insert logging on each block and checkPacket() method
 
-$CLICKHOUSE_CLIENT $settings -q "
+$CLICKHOUSE_CLIENT $settings -n -q "
 DROP TABLE IF EXISTS null_00634;
 CREATE TABLE null_00634 (i UInt8) ENGINE = MergeTree PARTITION BY tuple() ORDER BY tuple();"
 
 head -c 1000 /dev/zero | $CLICKHOUSE_CLIENT $settings --max_insert_block_size=10 --min_insert_block_size_rows=1 --min_insert_block_size_bytes=1 -q "INSERT INTO null_00634 FORMAT RowBinary"
 
-$CLICKHOUSE_CLIENT $settings -q "
+$CLICKHOUSE_CLIENT $settings -n -q "
 SELECT count() FROM null_00634;
 DROP TABLE null_00634;"
 
diff --git a/tests/queries/0_stateless/00650_csv_with_specified_quote_rule.sh b/tests/queries/0_stateless/00650_csv_with_specified_quote_rule.sh
index 2f76b3e63ac..3971510f7f6 100755
--- a/tests/queries/0_stateless/00650_csv_with_specified_quote_rule.sh
+++ b/tests/queries/0_stateless/00650_csv_with_specified_quote_rule.sh
@@ -18,7 +18,7 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE csv";
 $CLICKHOUSE_CLIENT --query="CREATE TABLE csv (s String, n UInt64, d Date) ENGINE = Memory";
 
 echo "'single quote' not end, 123, 2016-01-01
-'em good, 456, 2016-01-02" | $CLICKHOUSE_CLIENT --query="SET format_csv_allow_single_quotes=0; INSERT INTO csv FORMAT CSV";
+'em good, 456, 2016-01-02" | $CLICKHOUSE_CLIENT --multiquery --query="SET format_csv_allow_single_quotes=0; INSERT INTO csv FORMAT CSV";
 
 $CLICKHOUSE_CLIENT --query="SELECT * FROM csv ORDER BY d";
 
@@ -38,7 +38,7 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE csv";
 $CLICKHOUSE_CLIENT --query="CREATE TABLE csv (s String, n UInt64, d Date) ENGINE = Memory";
 
 echo '"double quote" not end, 123, 2016-01-01
-"em good, 456, 2016-01-02' | $CLICKHOUSE_CLIENT --query="SET format_csv_allow_double_quotes=0; INSERT INTO csv FORMAT CSV";
+"em good, 456, 2016-01-02' | $CLICKHOUSE_CLIENT --multiquery --query="SET format_csv_allow_double_quotes=0; INSERT INTO csv FORMAT CSV";
 
 $CLICKHOUSE_CLIENT --query="SELECT * FROM csv ORDER BY d";
 
diff --git a/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh b/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
index df0afeb707c..994114c9c50 100755
--- a/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
+++ b/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
@@ -5,4 +5,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --ignore-error --query "DROP TABLE IF EXISTS tab_00651; CREATE TABLE tab_00651 (val UInt64) engine = Memory; SHOW CREATE TABLE tab_00651 format abcd; DESC tab_00651; DROP TABLE tab_00651;" 2>/dev/null ||:
+${CLICKHOUSE_CLIENT} --ignore-error --multiquery --query "DROP TABLE IF EXISTS tab_00651; CREATE TABLE tab_00651 (val UInt64) engine = Memory; SHOW CREATE TABLE tab_00651 format abcd; DESC tab_00651; DROP TABLE tab_00651;" 2>/dev/null ||:
diff --git a/tests/queries/0_stateless/00652_mergetree_mutations.sh b/tests/queries/0_stateless/00652_mergetree_mutations.sh
index edb306d3883..a9d7908a1af 100755
--- a/tests/queries/0_stateless/00652_mergetree_mutations.sh
+++ b/tests/queries/0_stateless/00652_mergetree_mutations.sh
@@ -70,21 +70,6 @@ sleep 1
 ${CLICKHOUSE_CLIENT} --query="INSERT INTO mutations_cleaner(x) VALUES (4)"
 sleep 0.1
 
-for i in {1..10}
-do
-
-    if [ "$(${CLICKHOUSE_CLIENT} --query="SELECT count() FROM system.mutations WHERE database = '$CLICKHOUSE_DATABASE' and table = 'mutations_cleaner'")" -eq 2 ]; then
-        break
-    fi
-
-    if [[ $i -eq 100 ]]; then
-        echo "Timed out while waiting for outdated mutation record to be deleted!"
-    fi
-
-    sleep 1
-    ${CLICKHOUSE_CLIENT} --query="INSERT INTO mutations_cleaner(x) VALUES (4)"  
-done
-
 # Check that the first mutation is cleaned
 ${CLICKHOUSE_CLIENT} --query="SELECT mutation_id, command, is_done FROM system.mutations WHERE database = '$CLICKHOUSE_DATABASE' and table = 'mutations_cleaner' ORDER BY mutation_id"
 
diff --git a/tests/queries/0_stateless/00652_mutations_default_database.sh b/tests/queries/0_stateless/00652_mutations_default_database.sh
index 577943bc3fd..eed45540f9b 100755
--- a/tests/queries/0_stateless/00652_mutations_default_database.sh
+++ b/tests/queries/0_stateless/00652_mutations_default_database.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --mutations_sync=1 << EOF
+${CLICKHOUSE_CLIENT} --multiquery --mutations_sync=1 << EOF
 DROP TABLE IF EXISTS mutations;
 DROP TABLE IF EXISTS for_subquery;
 
diff --git a/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh b/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
index d4f6d3b290c..0ac5a2f748a 100755
--- a/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
+++ b/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
@@ -9,7 +9,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=./mergetree_mutations.lib
 . "$CURDIR"/mergetree_mutations.lib
 
-${CLICKHOUSE_CLIENT} --allow_nondeterministic_mutations=1 << EOF
+${CLICKHOUSE_CLIENT} --allow_nondeterministic_mutations=1 --multiquery << EOF
 DROP TABLE IF EXISTS mutations_r1;
 DROP TABLE IF EXISTS for_subquery;
 
diff --git a/tests/queries/0_stateless/00653_verification_monotonic_data_load.reference b/tests/queries/0_stateless/00653_verification_monotonic_data_load.reference
index 81260c0921c..8900af059b8 100644
--- a/tests/queries/0_stateless/00653_verification_monotonic_data_load.reference
+++ b/tests/queries/0_stateless/00653_verification_monotonic_data_load.reference
@@ -1,26 +1,26 @@
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
+no monotonic int case: String -> UInt64
+no monotonic int case: FixedString -> UInt64
+monotonic int case: Int32 -> Int64
+monotonic int case: Int32 -> UInt64
+monotonic int case: Int32 -> Int32
+monotonic int case: Int32 -> UInt32
+monotonic int case: Int32 -> Int16
+monotonic int case: Int32 -> UInt16
+monotonic int case: UInt32 -> Int64
+monotonic int case: UInt32 -> UInt64
+monotonic int case: UInt32 -> Int32
+monotonic int case: UInt32 -> UInt32
+monotonic int case: UInt32 -> Int16
+monotonic int case: UInt32 -> UInt16
+monotonic int case: Enum16 -> Int32
+monotonic int case: Enum16 -> UInt32
+monotonic int case: Enum16 -> Int16
+monotonic int case: Enum16 -> UInt16
+monotonic int case: Enum16 -> Int8
+monotonic int case: Enum16 -> UInt8
+monotonic int case: Date -> Int32
+monotonic int case: Date -> UInt32
+monotonic int case: Date -> Int16
+monotonic int case: Date -> UInt16
+monotonic int case: Date -> Int8
+monotonic int case: Date -> UInt8
diff --git a/tests/queries/0_stateless/00653_verification_monotonic_data_load.sh b/tests/queries/0_stateless/00653_verification_monotonic_data_load.sh
index 2a26ec84582..7766d7720e1 100755
--- a/tests/queries/0_stateless/00653_verification_monotonic_data_load.sh
+++ b/tests/queries/0_stateless/00653_verification_monotonic_data_load.sh
@@ -47,42 +47,38 @@ ${CLICKHOUSE_CLIENT} --query="INSERT INTO date_test_table VALUES (1), (2), (2),
 CLICKHOUSE_CLIENT=$(echo ${CLICKHOUSE_CLIENT} | sed 's/'"--send_logs_level=${CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL}"'/--send_logs_level=debug/g')
 CLICKHOUSE_CLIENT="${CLICKHOUSE_CLIENT} --optimize_use_implicit_projections 0"
 
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM string_test_table WHERE toUInt64(val) == 0;" 2>&1 |grep -q "3 marks to read from 1 ranges" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM fixed_string_test_table WHERE toUInt64(val) == 0;" 2>&1 |grep -q "3 marks to read from 1 ranges" && echo "OK" &
-wait
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM string_test_table WHERE toUInt64(val) == 0;" 2>&1 |grep -q "3 marks to read from 1 ranges" && echo "no monotonic int case: String -> UInt64"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM fixed_string_test_table WHERE toUInt64(val) == 0;" 2>&1 |grep -q "3 marks to read from 1 ranges" && echo "no monotonic int case: FixedString -> UInt64"
 
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM signed_integer_test_table WHERE toInt64(val) == 0;" 2>&1 |grep -q "2 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM signed_integer_test_table WHERE toUInt64(val) == 0;" 2>&1 |grep -q "2 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM signed_integer_test_table WHERE toInt32(val) == 0;" 2>&1 |grep -q "2 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM signed_integer_test_table WHERE toUInt32(val) == 0;" 2>&1 |grep -q "2 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM signed_integer_test_table WHERE toInt16(val) == 0;" 2>&1 |grep -q "5 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM signed_integer_test_table WHERE toUInt16(val) == 0;" 2>&1 |grep -q "5 marks to read from" && echo "OK" &
-wait
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM signed_integer_test_table WHERE toInt64(val) == 0;" 2>&1 |grep -q "2 marks to read from" && echo "monotonic int case: Int32 -> Int64"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM signed_integer_test_table WHERE toUInt64(val) == 0;" 2>&1 |grep -q "2 marks to read from" && echo "monotonic int case: Int32 -> UInt64"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM signed_integer_test_table WHERE toInt32(val) == 0;" 2>&1 |grep -q "2 marks to read from" && echo "monotonic int case: Int32 -> Int32"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM signed_integer_test_table WHERE toUInt32(val) == 0;" 2>&1 |grep -q "2 marks to read from" && echo "monotonic int case: Int32 -> UInt32"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM signed_integer_test_table WHERE toInt16(val) == 0;" 2>&1 |grep -q "5 marks to read from" && echo "monotonic int case: Int32 -> Int16"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM signed_integer_test_table WHERE toUInt16(val) == 0;" 2>&1 |grep -q "5 marks to read from" && echo "monotonic int case: Int32 -> UInt16"
 
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM unsigned_integer_test_table WHERE toInt64(val) == 0;" 2>&1 |grep -q "1 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM unsigned_integer_test_table WHERE toUInt64(val) == 0;" 2>&1 |grep -q "1 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM unsigned_integer_test_table WHERE toInt32(val) == 0;" 2>&1 |grep -q "2 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM unsigned_integer_test_table WHERE toUInt32(val) == 0;" 2>&1 |grep -q "1 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM unsigned_integer_test_table WHERE toInt16(val) == 0;" 2>&1 |grep -q "4 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM unsigned_integer_test_table WHERE toUInt16(val) == 0;" 2>&1 |grep -q "4 marks to read from" && echo "OK" &
-wait
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM unsigned_integer_test_table WHERE toInt64(val) == 0;" 2>&1 |grep -q "1 marks to read from" && echo "monotonic int case: UInt32 -> Int64"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM unsigned_integer_test_table WHERE toUInt64(val) == 0;" 2>&1 |grep -q "1 marks to read from" && echo "monotonic int case: UInt32 -> UInt64"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM unsigned_integer_test_table WHERE toInt32(val) == 0;" 2>&1 |grep -q "2 marks to read from" && echo "monotonic int case: UInt32 -> Int32"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM unsigned_integer_test_table WHERE toUInt32(val) == 0;" 2>&1 |grep -q "1 marks to read from" && echo "monotonic int case: UInt32 -> UInt32"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM unsigned_integer_test_table WHERE toInt16(val) == 0;" 2>&1 |grep -q "4 marks to read from" && echo "monotonic int case: UInt32 -> Int16"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM unsigned_integer_test_table WHERE toUInt16(val) == 0;" 2>&1 |grep -q "4 marks to read from" && echo "monotonic int case: UInt32 -> UInt16"
 
 
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM enum_test_table WHERE toInt32(val) == 1;" 2>&1 |grep -q "1 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM enum_test_table WHERE toUInt32(val) == 1;" 2>&1 |grep -q "1 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM enum_test_table WHERE toInt16(val) == 1;" 2>&1 |grep -q "1 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM enum_test_table WHERE toUInt16(val) == 1;" 2>&1 |grep -q "1 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM enum_test_table WHERE toInt8(val) == 1;" 2>&1 |grep -q "5 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM enum_test_table WHERE toUInt8(val) == 1;" 2>&1 |grep -q "5 marks to read from" && echo "OK" &
-wait
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM enum_test_table WHERE toInt32(val) == 1;" 2>&1 |grep -q "1 marks to read from" && echo "monotonic int case: Enum16 -> Int32"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM enum_test_table WHERE toUInt32(val) == 1;" 2>&1 |grep -q "1 marks to read from" && echo "monotonic int case: Enum16 -> UInt32"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM enum_test_table WHERE toInt16(val) == 1;" 2>&1 |grep -q "1 marks to read from" && echo "monotonic int case: Enum16 -> Int16"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM enum_test_table WHERE toUInt16(val) == 1;" 2>&1 |grep -q "1 marks to read from" && echo "monotonic int case: Enum16 -> UInt16"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM enum_test_table WHERE toInt8(val) == 1;" 2>&1 |grep -q "5 marks to read from" && echo "monotonic int case: Enum16 -> Int8"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM enum_test_table WHERE toUInt8(val) == 1;" 2>&1 |grep -q "5 marks to read from" && echo "monotonic int case: Enum16 -> UInt8"
 
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM date_test_table WHERE toInt32(val) == 1;" 2>&1 |grep -q "1 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM date_test_table WHERE toUInt32(val) == 1;" 2>&1 |grep -q "1 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM date_test_table WHERE toInt16(val) == 1;" 2>&1 |grep -q "2 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM date_test_table WHERE toUInt16(val) == 1;" 2>&1 |grep -q "1 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM date_test_table WHERE toInt8(val) == 1;" 2>&1 |grep -q "5 marks to read from" && echo "OK" &
-${CLICKHOUSE_CLIENT} --query="SELECT count() FROM date_test_table WHERE toUInt8(val) == 1;" 2>&1 |grep -q "5 marks to read from" && echo "OK" &
-wait
+
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM date_test_table WHERE toInt32(val) == 1;" 2>&1 |grep -q "1 marks to read from" && echo "monotonic int case: Date -> Int32"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM date_test_table WHERE toUInt32(val) == 1;" 2>&1 |grep -q "1 marks to read from" && echo "monotonic int case: Date -> UInt32"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM date_test_table WHERE toInt16(val) == 1;" 2>&1 |grep -q "2 marks to read from" && echo "monotonic int case: Date -> Int16"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM date_test_table WHERE toUInt16(val) == 1;" 2>&1 |grep -q "1 marks to read from" && echo "monotonic int case: Date -> UInt16"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM date_test_table WHERE toInt8(val) == 1;" 2>&1 |grep -q "5 marks to read from" && echo "monotonic int case: Date -> Int8"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM date_test_table WHERE toUInt8(val) == 1;" 2>&1 |grep -q "5 marks to read from" && echo "monotonic int case: Date -> UInt8"
 
 CLICKHOUSE_CLIENT=$(echo ${CLICKHOUSE_CLIENT} | sed 's/--send_logs_level=debug/'"--send_logs_level=${CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL}"'/g')
 
diff --git a/tests/queries/0_stateless/00673_subquery_prepared_set_performance.sql b/tests/queries/0_stateless/00673_subquery_prepared_set_performance.sql
index 98c0802ffbc..0591592344c 100644
--- a/tests/queries/0_stateless/00673_subquery_prepared_set_performance.sql
+++ b/tests/queries/0_stateless/00673_subquery_prepared_set_performance.sql
@@ -3,10 +3,10 @@ DROP TABLE IF EXISTS mergetree_00673;
 CREATE TABLE mergetree_00673 (x UInt64) ENGINE = MergeTree ORDER BY x;
 INSERT INTO mergetree_00673 VALUES (1);
 
-SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM mergetree_00673 WHERE x IN (SELECT * FROM numbers(1000000))))))))))))))))))))));
+SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM mergetree_00673 WHERE x IN (SELECT * FROM numbers(10000000))))))))))));
 
 SET force_primary_key = 1;
 
-SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM mergetree_00673 WHERE x IN (SELECT * FROM numbers(1000000))))))))))))))))))))));
+SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM mergetree_00673 WHERE x IN (SELECT * FROM numbers(10000000))))))))))));
 
 DROP TABLE mergetree_00673;
diff --git a/tests/queries/0_stateless/00674_join_on_syntax.sql b/tests/queries/0_stateless/00674_join_on_syntax.sql
index 584e43b88bf..9ff26db1536 100644
--- a/tests/queries/0_stateless/00674_join_on_syntax.sql
+++ b/tests/queries/0_stateless/00674_join_on_syntax.sql
@@ -1,5 +1,5 @@
 SET joined_subquery_requires_alias = 0;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 drop table if exists tab1;
 drop table if exists tab2;
diff --git a/tests/queries/0_stateless/00686_client_exit_code.sh b/tests/queries/0_stateless/00686_client_exit_code.sh
index e348f93f30d..9586ddbd0a3 100755
--- a/tests/queries/0_stateless/00686_client_exit_code.sh
+++ b/tests/queries/0_stateless/00686_client_exit_code.sh
@@ -8,5 +8,5 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=./mergetree_mutations.lib
 . "$CURDIR"/mergetree_mutations.lib
 
-echo "INSERT INTO test FORMAT CSV" | ${CLICKHOUSE_CLIENT} 2>/dev/null
+echo "INSERT INTO test FORMAT CSV" | ${CLICKHOUSE_CLIENT} -n 2>/dev/null
 echo $?
diff --git a/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql b/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
index d359efd8d42..c4613acf5f3 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
+++ b/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
@@ -1,5 +1,5 @@
 drop table if exists lc_dict_reading;
-create table lc_dict_reading (val UInt64, str LowCardinality(String), pat String) engine = MergeTree order by val SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
+create table lc_dict_reading (val UInt64, str StringWithDictionary, pat String) engine = MergeTree order by val SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
 insert into lc_dict_reading select number, if(number < 8192 * 4, number % 100, number) as s, s from system.numbers limit 1000000;
 select sum(toUInt64(str)), sum(toUInt64(pat)) from lc_dict_reading where val < 8129 or val > 8192 * 4;
 drop table if exists lc_dict_reading;
diff --git a/tests/queries/0_stateless/00688_low_cardinality_in.sql b/tests/queries/0_stateless/00688_low_cardinality_in.sql
index c39fdb37160..cb57fad51a4 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_in.sql
+++ b/tests/queries/0_stateless/00688_low_cardinality_in.sql
@@ -1,6 +1,6 @@
 set allow_suspicious_low_cardinality_types = 1;
 drop table if exists lc_00688;
-create table lc_00688 (str LowCardinality(String), val LowCardinality(UInt8)) engine = MergeTree order by tuple();
+create table lc_00688 (str StringWithDictionary, val UInt8WithDictionary) engine = MergeTree order by tuple();
 insert into lc_00688 values ('a', 1), ('b', 2);
 select str, str in ('a', 'd') from lc_00688;
 select val, val in (1, 3) from lc_00688;
diff --git a/tests/queries/0_stateless/00688_low_cardinality_prewhere.sql b/tests/queries/0_stateless/00688_low_cardinality_prewhere.sql
index 17c74b7ca05..a15b2540fe6 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_prewhere.sql
+++ b/tests/queries/0_stateless/00688_low_cardinality_prewhere.sql
@@ -1,5 +1,5 @@
 drop table if exists lc_prewhere;
-create table lc_prewhere (key UInt64, val UInt64, str LowCardinality(String), s String) engine = MergeTree order by key settings index_granularity = 8192;
+create table lc_prewhere (key UInt64, val UInt64, str StringWithDictionary, s String) engine = MergeTree order by key settings index_granularity = 8192;
 insert into lc_prewhere select number, if(number < 10 or number > 8192 * 9, 1, 0), toString(number) as s, s from system.numbers limit 100000;
 select sum(toUInt64(str)), sum(toUInt64(s)) from lc_prewhere prewhere val == 1;
 drop table if exists lc_prewhere;
diff --git a/tests/queries/0_stateless/00688_low_cardinality_serialization.sql b/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
index 1e4de3f3d3e..b4fe4b29200 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
+++ b/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
@@ -8,8 +8,8 @@ select 'MergeTree';
 drop table if exists lc_small_dict;
 drop table if exists lc_big_dict;
 
-create table lc_small_dict (str LowCardinality(String)) engine = MergeTree order by str SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
-create table lc_big_dict (str LowCardinality(String)) engine = MergeTree order by str SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
+create table lc_small_dict (str StringWithDictionary) engine = MergeTree order by str SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
+create table lc_big_dict (str StringWithDictionary) engine = MergeTree order by str SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
 
 insert into lc_small_dict select toString(number % 1000) from system.numbers limit 1000000;
 insert into lc_big_dict select toString(number) from system.numbers limit 1000000;
diff --git a/tests/queries/0_stateless/00688_low_cardinality_syntax.reference b/tests/queries/0_stateless/00688_low_cardinality_syntax.reference
index b06beb0d6f0..ca27069a7df 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_syntax.reference
+++ b/tests/queries/0_stateless/00688_low_cardinality_syntax.reference
@@ -1,7 +1,13 @@
 a
 a
+a
+a
 1
 1
+1
+1
+ab
+ab
 ab
 ab
 -
diff --git a/tests/queries/0_stateless/00688_low_cardinality_syntax.sql b/tests/queries/0_stateless/00688_low_cardinality_syntax.sql
index dccdac1d95d..a11d9e2d9fe 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_syntax.sql
+++ b/tests/queries/0_stateless/00688_low_cardinality_syntax.sql
@@ -13,32 +13,56 @@ drop table if exists lc_null_fix_str_0;
 drop table if exists lc_null_fix_str_1;
 
 create table lc_str_0 (str LowCardinality(String)) engine = Memory;
+create table lc_str_1 (str StringWithDictionary) engine = Memory;
 create table lc_null_str_0 (str LowCardinality(Nullable(String))) engine = Memory;
+create table lc_null_str_1 (str NullableWithDictionary(String)) engine = Memory;
 create table lc_int8_0 (val LowCardinality(Int8)) engine = Memory;
+create table lc_int8_1 (val Int8WithDictionary) engine = Memory;
 create table lc_null_int8_0 (val LowCardinality(Nullable(Int8))) engine = Memory;
+create table lc_null_int8_1 (val NullableWithDictionary(Int8)) engine = Memory;
 create table lc_fix_str_0 (str LowCardinality(FixedString(2))) engine = Memory;
+create table lc_fix_str_1 (str FixedStringWithDictionary(2)) engine = Memory;
 create table lc_null_fix_str_0 (str LowCardinality(Nullable(FixedString(2)))) engine = Memory;
+create table lc_null_fix_str_1 (str NullableWithDictionary(FixedString(2))) engine = Memory;
 
 insert into lc_str_0 select 'a';
+insert into lc_str_1 select 'a';
 insert into lc_null_str_0 select 'a';
+insert into lc_null_str_1 select 'a';
 insert into lc_int8_0 select 1;
+insert into lc_int8_1 select 1;
 insert into lc_null_int8_0 select 1;
+insert into lc_null_int8_1 select 1;
 insert into lc_fix_str_0 select 'ab';
+insert into lc_fix_str_1 select 'ab';
 insert into lc_null_fix_str_0 select 'ab';
+insert into lc_null_fix_str_1 select 'ab';
 
 select str from lc_str_0;
+select str from lc_str_1;
 select str from lc_null_str_0;
+select str from lc_null_str_1;
 select val from lc_int8_0;
+select val from lc_int8_1;
 select val from lc_null_int8_0;
+select val from lc_null_int8_1;
 select str from lc_fix_str_0;
+select str from lc_fix_str_1;
 select str from lc_null_fix_str_0;
+select str from lc_null_fix_str_1;
 
 drop table if exists lc_str_0;
+drop table if exists lc_str_1;
 drop table if exists lc_null_str_0;
+drop table if exists lc_null_str_1;
 drop table if exists lc_int8_0;
+drop table if exists lc_int8_1;
 drop table if exists lc_null_int8_0;
+drop table if exists lc_null_int8_1;
 drop table if exists lc_fix_str_0;
+drop table if exists lc_fix_str_1;
 drop table if exists lc_null_fix_str_0;
+drop table if exists lc_null_fix_str_1;
 
 select '-';
 SELECT toLowCardinality('a') AS s, toTypeName(s), toTypeName(length(s)) from system.one;
@@ -49,7 +73,7 @@ select (toLowCardinality(z) as val) || 'b'  from (select arrayJoin(['c', 'd']) a
 
 select '-';
 drop table if exists lc_str_uuid;
-create table lc_str_uuid(str1 String, str2 LowCardinality(String), str3 LowCardinality(String)) ENGINE=Memory;
+create table lc_str_uuid(str1 String, str2 LowCardinality(String), str3 StringWithDictionary) ENGINE=Memory;
 select toUUID(str1), toUUID(str2), toUUID(str3) from lc_str_uuid;
 select toUUID(str1, '', NULL), toUUID(str2, '', NULL), toUUID(str3, '', NULL) from lc_str_uuid;
 insert into lc_str_uuid values ('61f0c404-5cb3-11e7-907b-a6006ad3dba0', '61f0c404-5cb3-11e7-907b-a6006ad3dba0', '61f0c404-5cb3-11e7-907b-a6006ad3dba0');
diff --git a/tests/queries/0_stateless/00699_materialized_view_mutations.sh b/tests/queries/0_stateless/00699_materialized_view_mutations.sh
index 07ca9bc0f67..a0f7db536dc 100755
--- a/tests/queries/0_stateless/00699_materialized_view_mutations.sh
+++ b/tests/queries/0_stateless/00699_materialized_view_mutations.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} --multiquery --query="
 DROP TABLE IF EXISTS view_00699;
 DROP TABLE IF EXISTS null_00699;
 
@@ -20,14 +20,14 @@ SELECT count(), min(x), max(x) FROM view_00699;
 
 ALTER TABLE null_00699 DELETE WHERE x % 2 = 0;"  --mutations_sync=1
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} --multiquery --query="
 SELECT count(), min(x), max(x) FROM null_00699;
 SELECT count(), min(x), max(x) FROM view_00699;
 
 ALTER TABLE view_00699 DELETE WHERE x % 2 = 0;
 " --mutations_sync=1
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} --multiquery --query="
 SELECT count(), min(x), max(x) FROM null_00699;
 SELECT count(), min(x), max(x) FROM view_00699;
 
@@ -35,7 +35,7 @@ ALTER TABLE null_00699 DELETE WHERE x % 2 = 1;
 ALTER TABLE view_00699 DELETE WHERE x % 2 = 1;
 " --mutations_sync=1
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} --multiquery --query="
 SELECT count(), min(x), max(x) FROM null_00699;
 SELECT count(), min(x), max(x) FROM view_00699;
 
diff --git a/tests/queries/0_stateless/00700_decimal_compare.sql b/tests/queries/0_stateless/00700_decimal_compare.sql
index 1b901e04c28..beadbdade16 100644
--- a/tests/queries/0_stateless/00700_decimal_compare.sql
+++ b/tests/queries/0_stateless/00700_decimal_compare.sql
@@ -27,7 +27,7 @@ SELECT a > 0, b > 0, g > 0 FROM decimal ORDER BY a DESC;
 SELECT a, g > toInt8(0), g > toInt16(0), g > toInt32(0), g > toInt64(0) FROM decimal ORDER BY a;
 SELECT a, g > toUInt8(0), g > toUInt16(0), g > toUInt32(0), g > toUInt64(0) FROM decimal ORDER BY a;
 SELECT a, b, g FROM decimal WHERE a IN(42) AND b IN(42) AND g IN(42);
-SELECT a, b, g FROM decimal WHERE a IN(42) AND b IN(42) AND g IN(42) SETTINGS enable_analyzer = 1;
+SELECT a, b, g FROM decimal WHERE a IN(42) AND b IN(42) AND g IN(42) SETTINGS allow_experimental_analyzer = 1;
 SELECT a, b, g FROM decimal WHERE a > 0 AND a <= 42 AND b <= 42 AND g <= 42;
 
 SELECT d, e, f from decimal WHERE d > 0 AND d < 1 AND e > 0 AND e < 1 AND f > 0 AND f < 1;
diff --git a/tests/queries/0_stateless/00700_decimal_formats.sql b/tests/queries/0_stateless/00700_decimal_formats.sql
index f008897bf5d..45b2a5f1078 100644
--- a/tests/queries/0_stateless/00700_decimal_formats.sql
+++ b/tests/queries/0_stateless/00700_decimal_formats.sql
@@ -9,22 +9,22 @@ CREATE TABLE IF NOT EXISTS decimal
 
 INSERT INTO decimal (a, b, c) VALUES (42.0, -42.0, 42) (0.42, -0.42, .42) (42.42, -42.42, 42.42);
 INSERT INTO decimal (a, b, c) FORMAT JSONEachRow {"a":1.1, "b":-1.1, "c":1.1} {"a":1.0, "b":-1.0, "c":1} {"a":0.1, "b":-0.1, "c":.1};
-
 INSERT INTO decimal (a, b, c) FORMAT CSV 2.0,-2.0,2
-
+;
 INSERT INTO decimal (a, b, c) FORMAT CSV 0.2 ,-0.2 ,.2
-
+;
 INSERT INTO decimal (a, b, c) FORMAT CSV 2.2 , -2.2 , 2.2
-
+;
 INSERT INTO decimal (a, b, c) FORMAT TabSeparated 3.3	-3.3	3.3
-
+;
 INSERT INTO decimal (a, b, c) FORMAT TabSeparated 3.0	-3.0	3
-
+;
 INSERT INTO decimal (a, b, c) FORMAT TabSeparated 0.3	-0.3	.3
-
+;
 INSERT INTO decimal (a, b, c) FORMAT CSV 4.4E+5,-4E+8,.4E+20
-
+;
 INSERT INTO decimal (a, b, c) FORMAT CSV 5.5e-2, -5e-9 ,.5e-17
+;
 
 SELECT * FROM decimal ORDER BY a FORMAT JSONEachRow;
 SELECT * FROM decimal ORDER BY b DESC FORMAT CSV;
diff --git a/tests/queries/0_stateless/00704_drop_truncate_memory_table.sh b/tests/queries/0_stateless/00704_drop_truncate_memory_table.sh
index e40da11b893..e1540d1a25e 100755
--- a/tests/queries/0_stateless/00704_drop_truncate_memory_table.sh
+++ b/tests/queries/0_stateless/00704_drop_truncate_memory_table.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} --multiquery --query="
 DROP TABLE IF EXISTS memory;
 CREATE TABLE memory (x UInt64) ENGINE = Memory;
 
@@ -21,13 +21,13 @@ INSERT INTO memory SELECT * FROM numbers(1000);"
 # But if the table will be dropped before query - just pass.
 # It's Ok, because otherwise the test will depend on the race condition in the test itself.
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} --multiquery --query="
 SET max_threads = 1;
 SELECT count() FROM memory WHERE NOT ignore(sleep(0.0001));" 2>&1 | grep -c -P '^1000$|^0$|Exception' &
 
 sleep 0.05;
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} --multiquery --query="
 TRUNCATE TABLE memory;
 DROP TABLE memory;
 "
diff --git a/tests/queries/0_stateless/00705_drop_create_merge_tree.sh b/tests/queries/0_stateless/00705_drop_create_merge_tree.sh
index fd002668696..d7754091290 100755
--- a/tests/queries/0_stateless/00705_drop_create_merge_tree.sh
+++ b/tests/queries/0_stateless/00705_drop_create_merge_tree.sh
@@ -5,8 +5,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-yes 'CREATE TABLE IF NOT EXISTS table (x UInt8) ENGINE = MergeTree ORDER BY tuple();' | head -n 1000 | $CLICKHOUSE_CLIENT &
-yes 'DROP TABLE IF EXISTS table;' | head -n 1000 | $CLICKHOUSE_CLIENT &
+yes 'CREATE TABLE IF NOT EXISTS table (x UInt8) ENGINE = MergeTree ORDER BY tuple();' | head -n 1000 | $CLICKHOUSE_CLIENT --ignore-error -nm 2>/dev/null &
+yes 'DROP TABLE table;' | head -n 1000 | $CLICKHOUSE_CLIENT --ignore-error -nm 2>/dev/null &
 wait
 
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS table"
diff --git a/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh b/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
index d69e14bdbb9..96d5764780f 100755
--- a/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
+++ b/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/mergetree_mutations.lib
 
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     DROP TABLE IF EXISTS fetches_r1 SYNC;
     DROP TABLE IF EXISTS fetches_r2 SYNC"
 
@@ -17,7 +17,7 @@ ${CLICKHOUSE_CLIENT} --query="CREATE TABLE fetches_r2(x UInt32) ENGINE Replicate
     SETTINGS prefer_fetch_merged_part_time_threshold=0, \
              prefer_fetch_merged_part_size_threshold=0"
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET insert_keeper_fault_injection_probability=0;
     INSERT INTO fetches_r1 VALUES (1);
     INSERT INTO fetches_r1 VALUES (2);
@@ -51,6 +51,6 @@ ${CLICKHOUSE_CLIENT} --query="SYSTEM SYNC REPLICA fetches_r2"
 ${CLICKHOUSE_CLIENT} --query="SELECT '*** Check data after fetch/clone of mutated part ***'"
 ${CLICKHOUSE_CLIENT} --query="SELECT _part, * FROM fetches_r2 ORDER BY x"
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     DROP TABLE fetches_r1 SYNC;
     DROP TABLE fetches_r2 SYNC"
diff --git a/tests/queries/0_stateless/00717_low_cardinaliry_group_by.sql b/tests/queries/0_stateless/00717_low_cardinaliry_group_by.sql
index 3115ab508fe..02915d4e611 100644
--- a/tests/queries/0_stateless/00717_low_cardinaliry_group_by.sql
+++ b/tests/queries/0_stateless/00717_low_cardinaliry_group_by.sql
@@ -1,5 +1,5 @@
 drop table if exists tab_00717;
-create table tab_00717 (a String, b LowCardinality(String)) engine = MergeTree order by a;
+create table tab_00717 (a String, b StringWithDictionary) engine = MergeTree order by a;
 insert into tab_00717 values ('a_1', 'b_1'), ('a_2', 'b_2');
 select count() from tab_00717;
 select a from tab_00717 group by a order by a;
diff --git a/tests/queries/0_stateless/00718_low_cardinaliry_alter.sql b/tests/queries/0_stateless/00718_low_cardinaliry_alter.sql
index 524e396bcb1..591ff952132 100644
--- a/tests/queries/0_stateless/00718_low_cardinaliry_alter.sql
+++ b/tests/queries/0_stateless/00718_low_cardinaliry_alter.sql
@@ -7,7 +7,7 @@ alter table tab_00718 modify column b UInt32;
 select *, toTypeName(b) from tab_00718;
 alter table tab_00718 modify column b LowCardinality(UInt32);
 select *, toTypeName(b) from tab_00718;
-alter table tab_00718 modify column b LowCardinality(String);
+alter table tab_00718 modify column b StringWithDictionary;
 select *, toTypeName(b) from tab_00718;
 alter table tab_00718 modify column b LowCardinality(UInt32);
 select *, toTypeName(b) from tab_00718;
diff --git a/tests/queries/0_stateless/00722_inner_join.sql b/tests/queries/0_stateless/00722_inner_join.sql
index aa590f470ae..0d5a543b99d 100644
--- a/tests/queries/0_stateless/00722_inner_join.sql
+++ b/tests/queries/0_stateless/00722_inner_join.sql
@@ -1,6 +1,6 @@
 -- Tags: no-parallel
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS one;
 CREATE TABLE one(dummy UInt8) ENGINE = Memory;
diff --git a/tests/queries/0_stateless/00727_concat.reference b/tests/queries/0_stateless/00727_concat.reference
index a93bf12b77a..329ad36ad3c 100644
--- a/tests/queries/0_stateless/00727_concat.reference
+++ b/tests/queries/0_stateless/00727_concat.reference
@@ -34,7 +34,6 @@ With 2023-11-14 05:50:12.123
 With hallo
 With [\'foo\',\'bar\']
 With {"foo":"bar"}
-With {"foo":"bar"}
 With (42,\'foo\')
 With {42:\'foo\'}
 With 122.233.64.201
diff --git a/tests/queries/0_stateless/00727_concat.sql b/tests/queries/0_stateless/00727_concat.sql
index 65cd019cc13..76dae541261 100644
--- a/tests/queries/0_stateless/00727_concat.sql
+++ b/tests/queries/0_stateless/00727_concat.sql
@@ -2,7 +2,6 @@
 -- no-fasttest: json type needs rapidjson library, geo types need s2 geometry
 
 SET allow_experimental_object_type = 1;
-SET allow_experimental_json_type = 1;
 SET allow_suspicious_low_cardinality_types=1;
 
 SELECT '-- Const string + non-const arbitrary type';
@@ -41,7 +40,6 @@ SELECT concat('With ', materialize('2023-11-14 05:50:12.123' :: DateTime64(3, 'E
 SELECT concat('With ', materialize('hallo' :: Enum('hallo' = 1)));
 SELECT concat('With ', materialize(['foo', 'bar'] :: Array(String)));
 SELECT concat('With ', materialize('{"foo": "bar"}' :: JSON));
-SELECT concat('With ', materialize('{"foo": "bar"}' :: Object('json')));
 SELECT concat('With ', materialize((42, 'foo') :: Tuple(Int32, String)));
 SELECT concat('With ', materialize(map(42, 'foo') :: Map(Int32, String)));
 SELECT concat('With ', materialize('122.233.64.201' :: IPv4));
diff --git a/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh b/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
index 285fd3945f9..5a4fd901f8d 100755
--- a/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
+++ b/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
@@ -12,7 +12,7 @@ settings="--log_queries=1 --log_query_threads=1 --log_profile_events=1 --log_que
 
 # Test insert logging on each block and checkPacket() method
 
-$CLICKHOUSE_CLIENT $settings -q "
+$CLICKHOUSE_CLIENT $settings -n -q "
 DROP TABLE IF EXISTS merge_tree_table;
 CREATE TABLE merge_tree_table (id UInt64, date Date, uid UInt32) ENGINE = MergeTree(date, id, 8192);"
 
diff --git a/tests/queries/0_stateless/00736_disjunction_optimisation.reference b/tests/queries/0_stateless/00736_disjunction_optimisation.reference
index 4e7f2e09dea..f28dcacef0e 100644
--- a/tests/queries/0_stateless/00736_disjunction_optimisation.reference
+++ b/tests/queries/0_stateless/00736_disjunction_optimisation.reference
@@ -49,7 +49,7 @@ QUERY id: 0
               LIST id: 12, nodes: 2
                 COLUMN id: 13, column_name: s, result_type: UInt64, source_id: 3
                 CONSTANT id: 14, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 1	21
 1	22
 1	23
@@ -99,7 +99,7 @@ QUERY id: 0
         LIST id: 14, nodes: 2
           COLUMN id: 15, column_name: s, result_type: UInt64, source_id: 3
           CONSTANT id: 16, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 1	1	21	1	1	1
 1	1	22	0	1	1
 1	1	23	0	0	1
@@ -152,7 +152,7 @@ QUERY id: 0
             CONSTANT id: 16, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
   JOIN TREE
     TABLE id: 3, alias: __table1, table_name: default.bug
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 21	1
 22	1
 23	1
@@ -185,7 +185,7 @@ QUERY id: 0
             CONSTANT id: 6, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
   JOIN TREE
     TABLE id: 3, alias: __table1, table_name: default.bug
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 1	21
 1	22
 1	23
@@ -237,7 +237,7 @@ QUERY id: 0
               LIST id: 12, nodes: 2
                 COLUMN id: 13, column_name: s, result_type: UInt64, source_id: 3
                 CONSTANT id: 14, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 1	21
 1	22
 1	23
@@ -287,7 +287,7 @@ QUERY id: 0
         LIST id: 14, nodes: 2
           COLUMN id: 15, column_name: s, result_type: UInt64, source_id: 3
           CONSTANT id: 16, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 1	1	21	1	1	1
 1	1	22	0	1	1
 1	1	23	0	0	1
@@ -348,7 +348,7 @@ QUERY id: 0
             CONSTANT id: 21, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
   JOIN TREE
     TABLE id: 3, alias: __table1, table_name: default.bug
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 21	1
 22	1
 23	1
@@ -381,7 +381,7 @@ QUERY id: 0
             CONSTANT id: 6, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
   JOIN TREE
     TABLE id: 3, alias: __table1, table_name: default.bug
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 21	1
 22	1
 23	1
@@ -414,4 +414,4 @@ QUERY id: 0
             CONSTANT id: 6, constant_value: Tuple_(UInt64_21, UInt64_22, UInt64_23), constant_value_type: Tuple(UInt8, UInt8, UInt8)
   JOIN TREE
     TABLE id: 3, alias: __table1, table_name: default.bug
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
diff --git a/tests/queries/0_stateless/00736_disjunction_optimisation.sql b/tests/queries/0_stateless/00736_disjunction_optimisation.sql
index 38f77622bd4..e5bfc81f7ae 100644
--- a/tests/queries/0_stateless/00736_disjunction_optimisation.sql
+++ b/tests/queries/0_stateless/00736_disjunction_optimisation.sql
@@ -7,43 +7,43 @@ set optimize_min_equality_disjunction_chain_length = 2;
 select * from bug;
 
 select * from bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23);
-select * from bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23) SETTINGS enable_analyzer = 1;
-explain query tree select * from bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23) SETTINGS enable_analyzer = 1;;
+select * from bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23) SETTINGS allow_experimental_analyzer = 1;
+explain query tree select * from bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23) SETTINGS allow_experimental_analyzer = 1;;
 
 select * from (select * from bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23);
-select * from (select * from bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23) SETTINGS enable_analyzer = 1;;
-explain query tree select * from (select * from bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23) SETTINGS enable_analyzer = 1;;
+select * from (select * from bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23) SETTINGS allow_experimental_analyzer = 1;;
+explain query tree select * from (select * from bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23) SETTINGS allow_experimental_analyzer = 1;;
 
 select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from bug;
-select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from bug SETTINGS enable_analyzer = 1;;
-explain query tree select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from bug SETTINGS enable_analyzer = 1;;
+select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from bug SETTINGS allow_experimental_analyzer = 1;;
+explain query tree select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from bug SETTINGS allow_experimental_analyzer = 1;;
 
 select s, (s=21 or s=22 or s=23) from bug;
-select s, (s=21 or s=22 or s=23) from bug SETTINGS enable_analyzer = 1;;
-explain query tree select s, (s=21 or s=22 or s=23) from bug SETTINGS enable_analyzer = 1;;
+select s, (s=21 or s=22 or s=23) from bug SETTINGS allow_experimental_analyzer = 1;;
+explain query tree select s, (s=21 or s=22 or s=23) from bug SETTINGS allow_experimental_analyzer = 1;;
 
 set optimize_min_equality_disjunction_chain_length = 3;
 
 select * from bug;
 
 select * from bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23);
-select * from bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23) SETTINGS enable_analyzer = 1;
-explain query tree select * from bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23) SETTINGS enable_analyzer = 1;;
+select * from bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23) SETTINGS allow_experimental_analyzer = 1;
+explain query tree select * from bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23) SETTINGS allow_experimental_analyzer = 1;;
 
 select * from (select * from bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23);
-select * from (select * from bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23) SETTINGS enable_analyzer = 1;;
-explain query tree select * from (select * from bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23) SETTINGS enable_analyzer = 1;;
+select * from (select * from bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23) SETTINGS allow_experimental_analyzer = 1;;
+explain query tree select * from (select * from bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23) SETTINGS allow_experimental_analyzer = 1;;
 
 select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from bug;
-select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from bug SETTINGS enable_analyzer = 1;;
-explain query tree select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from bug SETTINGS enable_analyzer = 1;;
+select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from bug SETTINGS allow_experimental_analyzer = 1;;
+explain query tree select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from bug SETTINGS allow_experimental_analyzer = 1;;
 
 select s, (s=21 or s=22 or s=23) from bug;
-select s, (s=21 or s=22 or s=23) from bug SETTINGS enable_analyzer = 1;;
-explain query tree select s, (s=21 or s=22 or s=23) from bug SETTINGS enable_analyzer = 1;;
+select s, (s=21 or s=22 or s=23) from bug SETTINGS allow_experimental_analyzer = 1;;
+explain query tree select s, (s=21 or s=22 or s=23) from bug SETTINGS allow_experimental_analyzer = 1;;
 
 select s, (s=21 or 22=s or 23=s) from bug;
-select s, (s=21 or 22=s or 23=s) from bug SETTINGS enable_analyzer = 1;;
-explain query tree select s, (s=21 or 22=s or 23=s) from bug SETTINGS enable_analyzer = 1;;
+select s, (s=21 or 22=s or 23=s) from bug SETTINGS allow_experimental_analyzer = 1;;
+explain query tree select s, (s=21 or 22=s or 23=s) from bug SETTINGS allow_experimental_analyzer = 1;;
 
 DROP TABLE bug;
diff --git a/tests/queries/0_stateless/00738_lock_for_inner_table.sh b/tests/queries/0_stateless/00738_lock_for_inner_table.sh
index 9bc84dd1063..b62a639d8f4 100755
--- a/tests/queries/0_stateless/00738_lock_for_inner_table.sh
+++ b/tests/queries/0_stateless/00738_lock_for_inner_table.sh
@@ -7,8 +7,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-CLICKHOUSE_CLIENT="${CLICKHOUSE_CLIENT} --database_replicated_allow_explicit_uuid 3"
-
 # there are some issues with Atomic database, let's generate it uniq
 # otherwise flaky check will not pass.
 uuid=$(${CLICKHOUSE_CLIENT} --query "SELECT reinterpretAsUUID(currentDatabase())")
diff --git a/tests/queries/0_stateless/00752_low_cardinality_mv_1.sql b/tests/queries/0_stateless/00752_low_cardinality_mv_1.sql
index 4fdd0a2496e..60cc30ec2c3 100644
--- a/tests/queries/0_stateless/00752_low_cardinality_mv_1.sql
+++ b/tests/queries/0_stateless/00752_low_cardinality_mv_1.sql
@@ -1,7 +1,7 @@
 drop table if exists lc_00752;
 drop table if exists lc_mv_00752;
 
-create table lc_00752 (str LowCardinality(String)) engine = MergeTree order by tuple();
+create table lc_00752 (str StringWithDictionary) engine = MergeTree order by tuple();
 
 insert into lc_00752 values ('a'), ('bbb'), ('ab'), ('accccc'), ('baasddas'), ('bcde');
 
@@ -12,3 +12,4 @@ select * from lc_mv_00752 order by letter;
 
 drop table if exists lc_00752;
 drop table if exists lc_mv_00752;
+
diff --git a/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh b/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh
index 989096a26d6..09f20284402 100755
--- a/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh
+++ b/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh
@@ -25,83 +25,83 @@ ${CLICKHOUSE_CLIENT} --query "SELECT count(*) FROM distributed WHERE a = 0 AND b
 | grep -F -q "All connection tries failed" && echo 'OK' || echo 'FAIL'
 
 # Should pass now
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed WHERE a = 0 AND b = 0;
 "
 
 # Should still fail because of matching unavailable shard
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed WHERE a = 2 AND b = 2;
 " 2>&1 \ | grep -F -q "All connection tries failed" && echo 'OK' || echo 'FAIL'
 
 # Try more complext expressions for constant folding - all should pass.
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed WHERE a = 1 AND a = 0 AND b = 0;
 "
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed WHERE a IN (0, 1) AND b IN (0, 1);
 "
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed WHERE a = 0 AND b = 0 OR a = 1 AND b = 1;
 "
 
 # TODO: should pass one day.
-#${CLICKHOUSE_CLIENT} --query="
+#${CLICKHOUSE_CLIENT} -n --query="
 #    SET optimize_skip_unused_shards = 1;
 #    SELECT count(*) FROM distributed WHERE a = 0 AND b >= 0 AND b <= 1;
 #"
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed WHERE a = 0 AND b = 0 AND c = 0;
 "
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed WHERE a = 0 AND b = 0 AND c != 10;
 "
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed WHERE a = 0 AND b = 0 AND (a+b)*b != 12;
 "
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed WHERE (a = 0 OR a = 1) AND (b = 0 OR b = 1);
 "
 
 # These ones should fail.
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed WHERE a = 0 AND b <= 1;
 " 2>&1 \ | grep -F -q "All connection tries failed" && echo 'OK' || echo 'FAIL'
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed WHERE a = 0 AND c = 0;
 " 2>&1 \ | grep -F -q "All connection tries failed" && echo 'OK' || echo 'FAIL'
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed WHERE a = 0 OR a = 1 AND b = 0;
 " 2>&1 \ | grep -F -q "All connection tries failed" && echo 'OK' || echo 'FAIL'
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed WHERE a = 0 AND b = 0 OR a = 2 AND b = 2;
 " 2>&1 \ | grep -F -q "All connection tries failed" && echo 'OK' || echo 'FAIL'
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed WHERE a = 0 AND b = 0 OR c = 0;
 " 2>&1 \ | grep -F -q "All connection tries failed" && echo 'OK' || echo 'FAIL'
diff --git a/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh b/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh
index b3dff2ea69a..035907bddd7 100755
--- a/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh
+++ b/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh
@@ -30,73 +30,73 @@ ${CLICKHOUSE_CLIENT} --query "SELECT count(*) FROM distributed_00754 PREWHERE a
 | grep -F -q "All connection tries failed" && echo 'OK' || echo 'FAIL'
 
 # Should pass now
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed_00754 PREWHERE a = 0 AND b = 0;
 "
 
 
 # Should still fail because of matching unavailable shard
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed_00754 PREWHERE a = 2 AND b = 2;
 " 2>&1 \ | grep -F -q "All connection tries failed" && echo 'OK' || echo 'FAIL'
 
 # Try more complex expressions for constant folding - all should pass.
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed_00754 PREWHERE a = 1 AND a = 0 WHERE b = 0;
 "
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed_00754 PREWHERE a = 1 WHERE b = 1 AND length(c) = 5;
 "
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed_00754 PREWHERE a IN (0, 1) AND b IN (0, 1) WHERE c LIKE '%l%';
 "
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed_00754 PREWHERE a IN (0, 1) WHERE b IN (0, 1) AND c LIKE '%l%';
 "
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed_00754 PREWHERE a = 0 AND b = 0 OR a = 1 AND b = 1 WHERE c LIKE '%l%';
 "
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed_00754 PREWHERE (a = 0 OR a = 1) WHERE (b = 0 OR b = 1);
 "
 
 # These should fail.
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed_00754 PREWHERE a = 0 AND b <= 1;
 " 2>&1 \ | grep -F -q "All connection tries failed" && echo 'OK' || echo 'FAIL'
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed_00754 PREWHERE a = 0 WHERE c LIKE '%l%';
 " 2>&1 \ | grep -F -q "All connection tries failed" && echo 'OK' || echo 'FAIL'
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed_00754 PREWHERE a = 0 OR a = 1 AND b = 0;
 " 2>&1 \ | grep -F -q "All connection tries failed" && echo 'OK' || echo 'FAIL'
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed_00754 PREWHERE a = 0 AND b = 0 OR a = 2 AND b = 2;
 " 2>&1 \ | grep -F -q "All connection tries failed" && echo 'OK' || echo 'FAIL'
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET optimize_skip_unused_shards = 1;
     SELECT count(*) FROM distributed_00754 PREWHERE a = 0 AND b = 0 OR c LIKE '%l%';
 " 2>&1 \ | grep -F -q "All connection tries failed" && echo 'OK' || echo 'FAIL'
diff --git a/tests/queries/0_stateless/00757_enum_defaults_const.sql b/tests/queries/0_stateless/00757_enum_defaults_const.sql
index 048c9dee88f..64271a37473 100644
--- a/tests/queries/0_stateless/00757_enum_defaults_const.sql
+++ b/tests/queries/0_stateless/00757_enum_defaults_const.sql
@@ -1,3 +1,3 @@
-SET enable_analyzer=0;
+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.sql b/tests/queries/0_stateless/00757_enum_defaults_const_analyzer.sql
index c202ed630db..bf079539019 100644
--- a/tests/queries/0_stateless/00757_enum_defaults_const_analyzer.sql
+++ b/tests/queries/0_stateless/00757_enum_defaults_const_analyzer.sql
@@ -1,3 +1,3 @@
-SET enable_analyzer=1;
+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/00760_insert_json_with_defaults.sql b/tests/queries/0_stateless/00760_insert_json_with_defaults.sql
index 54987258375..1430d10cdb0 100644
--- a/tests/queries/0_stateless/00760_insert_json_with_defaults.sql
+++ b/tests/queries/0_stateless/00760_insert_json_with_defaults.sql
@@ -15,29 +15,20 @@ CREATE TABLE defaults
 ) ENGINE = MergeTree ORDER BY x;
 
 INSERT INTO defaults FORMAT JSONEachRow {"x":1, "y":1};
-
 INSERT INTO defaults (x, y) SELECT x, y FROM defaults LIMIT 1;
-
 INSERT INTO defaults FORMAT JSONEachRow {"x":2, "y":2, "c":2};
-
 INSERT INTO defaults FORMAT JSONEachRow {"x":3, "y":3, "a":3, "b":3, "c":3};
-
 INSERT INTO defaults FORMAT JSONEachRow {"x":4} {"y":5, "c":5} {"a":6, "b":6, "c":6};
 
 SELECT * FROM defaults ORDER BY (x, y);
 
 ALTER TABLE defaults ADD COLUMN n Nested(a UInt64, b String);
-
 INSERT INTO defaults FORMAT JSONEachRow {"x":7, "y":7, "n.a":[1,2], "n.b":["a","b"]};
-
 SELECT * FROM defaults WHERE x = 7 FORMAT JSONEachRow;
 
 ALTER TABLE defaults ADD COLUMN n.c Array(UInt8) DEFAULT arrayMap(x -> 0, n.a) AFTER n.a;
-
 INSERT INTO defaults FORMAT JSONEachRow {"x":8, "y":8, "n.a":[3,4], "n.b":["c","d"]};
-
 INSERT INTO defaults FORMAT JSONEachRow {"x":9, "y":9};
-
 SELECT * FROM defaults WHERE x > 7 ORDER BY x FORMAT JSONEachRow;
 
 DROP TABLE defaults;
diff --git a/tests/queries/0_stateless/00761_lower_utf8_bug.sql b/tests/queries/0_stateless/00761_lower_utf8_bug.sql
index a0ab55edc15..de20b894331 100644
--- a/tests/queries/0_stateless/00761_lower_utf8_bug.sql
+++ b/tests/queries/0_stateless/00761_lower_utf8_bug.sql
@@ -1,4 +1 @@
--- Tags: no-fasttest
--- no-fasttest: upper/lowerUTF8 use ICU
-
 SELECT lowerUTF8('\xF0') = lowerUTF8('\xF0');
diff --git a/tests/queries/0_stateless/00763_lock_buffer_long.sh b/tests/queries/0_stateless/00763_lock_buffer_long.sh
index 92f917aa287..444a66767aa 100755
--- a/tests/queries/0_stateless/00763_lock_buffer_long.sh
+++ b/tests/queries/0_stateless/00763_lock_buffer_long.sh
@@ -16,12 +16,12 @@ ${CLICKHOUSE_CLIENT} --query="CREATE TABLE buffer_00763_2 (s String) ENGINE = Bu
 
 function thread1()
 {
-    seq 1 500 | sed -r -e 's/.+/DROP TABLE IF EXISTS mt_00763_2; CREATE TABLE mt_00763_2 (s String) ENGINE = MergeTree ORDER BY s; INSERT INTO mt_00763_2 SELECT toString(number) FROM numbers(10);/' | ${CLICKHOUSE_CLIENT} --fsync-metadata 0 --ignore-error ||:
+    seq 1 500 | sed -r -e 's/.+/DROP TABLE IF EXISTS mt_00763_2; CREATE TABLE mt_00763_2 (s String) ENGINE = MergeTree ORDER BY s; INSERT INTO mt_00763_2 SELECT toString(number) FROM numbers(10);/' | ${CLICKHOUSE_CLIENT} --fsync-metadata 0 --multiquery --ignore-error ||:
 }
 
 function thread2()
 {
-    seq 1 500 | sed -r -e 's/.+/SELECT count() FROM buffer_00763_2;/' | ${CLICKHOUSE_CLIENT} --server_logs_file='/dev/null' --ignore-error 2>&1 | grep -vP '^0$|^10$|^Received exception|^Code: 60|^Code: 218|^Code: 473' | grep -v '(query: '
+    seq 1 500 | sed -r -e 's/.+/SELECT count() FROM buffer_00763_2;/' | ${CLICKHOUSE_CLIENT} --multiquery --server_logs_file='/dev/null' --ignore-error 2>&1 | grep -vP '^0$|^10$|^Received exception|^Code: 60|^Code: 218|^Code: 473' | grep -v '(query: '
 }
 
 thread1 &
diff --git a/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh b/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
index 10535bd754f..c12b4426740 100755
--- a/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
+++ b/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
@@ -23,7 +23,7 @@ function thread_alter()
     while [ $SECONDS -lt "$TIMELIMIT" ] && [ $it -lt 300 ];
     do
         it=$((it+1))
-        $CLICKHOUSE_CLIENT --ignore-error -q "
+        $CLICKHOUSE_CLIENT --multiquery --ignore-error -q "
             ALTER TABLE mt_00763_1 MODIFY column s UInt32;
             ALTER TABLE mt_00763_1 MODIFY column s String;
         " ||:
@@ -37,7 +37,7 @@ function thread_query()
     while [ $SECONDS -lt "$TIMELIMIT" ] && [ $it -lt 2000 ];
     do
         it=$((it+1))
-        $CLICKHOUSE_CLIENT --ignore-error -q "
+        $CLICKHOUSE_CLIENT --multiquery --ignore-error -q "
             SELECT sum(length(s)) FROM buffer_00763_1;
         " 2>&1 | grep -vP '(^3$|^Received exception from server|^Code: 473)'
     done
diff --git a/tests/queries/0_stateless/00800_low_cardinality_join.sql b/tests/queries/0_stateless/00800_low_cardinality_join.sql
index fc5f5d1860c..ecb5194253c 100644
--- a/tests/queries/0_stateless/00800_low_cardinality_join.sql
+++ b/tests/queries/0_stateless/00800_low_cardinality_join.sql
@@ -1,4 +1,4 @@
-set enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 set joined_subquery_requires_alias = 0;
 
 select * from (select dummy as val from system.one) any left join (select dummy as val from system.one) using val;
diff --git a/tests/queries/0_stateless/00800_low_cardinality_merge_join.sql.j2 b/tests/queries/0_stateless/00800_low_cardinality_merge_join.sql.j2
index a5f5e9b33b8..8e2037480c7 100644
--- a/tests/queries/0_stateless/00800_low_cardinality_merge_join.sql.j2
+++ b/tests/queries/0_stateless/00800_low_cardinality_merge_join.sql.j2
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 {% for join_algorithm in ['partial_merge', 'full_sorting_merge', 'grace_hash'] -%}
 
diff --git a/tests/queries/0_stateless/00804_test_deflate_qpl_codec_compression.reference b/tests/queries/0_stateless/00804_test_deflate_qpl_codec_compression.reference
index a6e03404f2b..a2178f5eda7 100644
--- a/tests/queries/0_stateless/00804_test_deflate_qpl_codec_compression.reference
+++ b/tests/queries/0_stateless/00804_test_deflate_qpl_codec_compression.reference
@@ -1,4 +1,4 @@
-CREATE TABLE default.compression_codec\n(\n    `id` UInt64 CODEC(DEFLATE_QPL),\n    `data` String CODEC(DEFLATE_QPL),\n    `ddd` Date CODEC(DEFLATE_QPL),\n    `ddd32` Date32 CODEC(DEFLATE_QPL),\n    `somenum` Float64 CODEC(DEFLATE_QPL),\n    `somestr` FixedString(3) CODEC(DEFLATE_QPL),\n    `othernum` Int64 CODEC(DEFLATE_QPL),\n    `somearray` Array(UInt8) CODEC(DEFLATE_QPL),\n    `somemap` Map(String, UInt32) CODEC(DEFLATE_QPL),\n    `sometuple` Tuple(\n        UInt16,\n        UInt64) CODEC(DEFLATE_QPL)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.compression_codec\n(\n    `id` UInt64 CODEC(DEFLATE_QPL),\n    `data` String CODEC(DEFLATE_QPL),\n    `ddd` Date CODEC(DEFLATE_QPL),\n    `ddd32` Date32 CODEC(DEFLATE_QPL),\n    `somenum` Float64 CODEC(DEFLATE_QPL),\n    `somestr` FixedString(3) CODEC(DEFLATE_QPL),\n    `othernum` Int64 CODEC(DEFLATE_QPL),\n    `somearray` Array(UInt8) CODEC(DEFLATE_QPL),\n    `somemap` Map(String, UInt32) CODEC(DEFLATE_QPL),\n    `sometuple` Tuple(UInt16, UInt64) CODEC(DEFLATE_QPL)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
 1	hello	2018-12-14	2018-12-14	1.1	aaa	5	[1,2,3]	{'k1':1,'k2':2}	(1,2)
 2	world	2018-12-15	2018-12-15	2.2	bbb	6	[4,5,6]	{'k3':3,'k4':4}	(3,4)
 3	!	2018-12-16	2018-12-16	3.3	ccc	7	[7,8,9]	{'k5':5,'k6':6}	(5,6)
diff --git a/tests/queries/0_stateless/00804_test_zstd_qat_codec_compression.reference b/tests/queries/0_stateless/00804_test_zstd_qat_codec_compression.reference
index ff70403ce7a..31a4360469f 100644
--- a/tests/queries/0_stateless/00804_test_zstd_qat_codec_compression.reference
+++ b/tests/queries/0_stateless/00804_test_zstd_qat_codec_compression.reference
@@ -1,4 +1,4 @@
-CREATE TABLE default.compression_codec\n(\n    `id` UInt64 CODEC(ZSTD_QAT(1)),\n    `data` String CODEC(ZSTD_QAT(1)),\n    `ddd` Date CODEC(ZSTD_QAT(1)),\n    `ddd32` Date32 CODEC(ZSTD_QAT(1)),\n    `somenum` Float64 CODEC(ZSTD_QAT(1)),\n    `somestr` FixedString(3) CODEC(ZSTD_QAT(1)),\n    `othernum` Int64 CODEC(ZSTD_QAT(1)),\n    `somearray` Array(UInt8) CODEC(ZSTD_QAT(1)),\n    `somemap` Map(String, UInt32) CODEC(ZSTD_QAT(1)),\n    `sometuple` Tuple(\n        UInt16,\n        UInt64) CODEC(ZSTD_QAT(1))\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.compression_codec\n(\n    `id` UInt64 CODEC(ZSTD_QAT(1)),\n    `data` String CODEC(ZSTD_QAT(1)),\n    `ddd` Date CODEC(ZSTD_QAT(1)),\n    `ddd32` Date32 CODEC(ZSTD_QAT(1)),\n    `somenum` Float64 CODEC(ZSTD_QAT(1)),\n    `somestr` FixedString(3) CODEC(ZSTD_QAT(1)),\n    `othernum` Int64 CODEC(ZSTD_QAT(1)),\n    `somearray` Array(UInt8) CODEC(ZSTD_QAT(1)),\n    `somemap` Map(String, UInt32) CODEC(ZSTD_QAT(1)),\n    `sometuple` Tuple(UInt16, UInt64) CODEC(ZSTD_QAT(1))\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
 1	hello	2018-12-14	2018-12-14	1.1	aaa	5	[1,2,3]	{'k1':1,'k2':2}	(1,2)
 2	world	2018-12-15	2018-12-15	2.2	bbb	6	[4,5,6]	{'k3':3,'k4':4}	(3,4)
 3	!	2018-12-16	2018-12-16	3.3	ccc	7	[7,8,9]	{'k5':5,'k6':6}	(5,6)
diff --git a/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sh b/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sh
index 8f7a1a9ae98..12d889a7137 100755
--- a/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sh
+++ b/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sh
@@ -10,7 +10,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SHARD=$($CLICKHOUSE_CLIENT --query "Select getMacro('shard')")
 REPLICA=$($CLICKHOUSE_CLIENT --query "Select getMacro('replica')")
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 
 DROP TABLE IF EXISTS part_header_r1;
 DROP TABLE IF EXISTS part_header_r2;
@@ -62,7 +62,7 @@ do
     [[ $count1 == 1 && $count2 == 1 ]] && break
 done
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 
 SELECT '*** Test part removal ***';
 SELECT '*** replica 1 ***';
diff --git a/tests/queries/0_stateless/00818_alias_bug_4110.sql b/tests/queries/0_stateless/00818_alias_bug_4110.sql
index 1242a3b605d..d057bacc908 100644
--- a/tests/queries/0_stateless/00818_alias_bug_4110.sql
+++ b/tests/queries/0_stateless/00818_alias_bug_4110.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 select s.a as a, s.a + 1 as b from (select 10 as a) s;
 select s.a + 1 as a, s.a as b from (select 10 as a) s;
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 3b4b3cd77d3..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,5 +1,5 @@
 SET output_format_pretty_color = 1;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS table1;
 DROP TABLE IF EXISTS table2;
diff --git a/tests/queries/0_stateless/00819_full_join_wrong_columns_in_block.sql b/tests/queries/0_stateless/00819_full_join_wrong_columns_in_block.sql
index 8b3d3ec1bc1..3c0246619da 100644
--- a/tests/queries/0_stateless/00819_full_join_wrong_columns_in_block.sql
+++ b/tests/queries/0_stateless/00819_full_join_wrong_columns_in_block.sql
@@ -1,6 +1,6 @@
 SET any_join_distinct_right_table_keys = 1;
 SET joined_subquery_requires_alias = 0;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT * FROM (SELECT 1 AS a, 'x' AS b) join (SELECT 1 as a, 'y' as b) using a;
 SELECT * FROM (SELECT 1 AS a, 'x' AS b) left join (SELECT 1 as a, 'y' as b) using a;
diff --git a/tests/queries/0_stateless/00820_multiple_joins.sql b/tests/queries/0_stateless/00820_multiple_joins.sql
index b4197570cfa..5c7a7bebb0b 100644
--- a/tests/queries/0_stateless/00820_multiple_joins.sql
+++ b/tests/queries/0_stateless/00820_multiple_joins.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS table1;
 DROP TABLE IF EXISTS table2;
diff --git a/tests/queries/0_stateless/00820_multiple_joins_subquery_requires_alias.sql b/tests/queries/0_stateless/00820_multiple_joins_subquery_requires_alias.sql
index 538e6967ff3..3da2cad4eff 100644
--- a/tests/queries/0_stateless/00820_multiple_joins_subquery_requires_alias.sql
+++ b/tests/queries/0_stateless/00820_multiple_joins_subquery_requires_alias.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS table1;
 DROP TABLE IF EXISTS table2;
diff --git a/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh b/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
index 468ced802cd..3cd842a10ba 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
@@ -9,7 +9,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS array_3dim_protobuf_00825;
 
 CREATE TABLE array_3dim_protobuf_00825
diff --git a/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh b/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
index 47f0e2a31e7..76c5a63c4f2 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
@@ -11,7 +11,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS array_of_arrays_protobuf_00825;
 
 CREATE TABLE array_of_arrays_protobuf_00825
diff --git a/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh b/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
index da359f2ab5c..1258230610d 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
@@ -11,7 +11,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS enum_mapping_protobuf_00825;
 
 CREATE TABLE enum_mapping_protobuf_00825
diff --git a/tests/queries/0_stateless/00825_protobuf_format_map.sh b/tests/queries/0_stateless/00825_protobuf_format_map.sh
index 155754a2f00..82ebcc6959a 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_map.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_map.sh
@@ -9,7 +9,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS map_protobuf_00825;
 
 CREATE TABLE map_protobuf_00825
diff --git a/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh b/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
index 9b4a12a3ae4..b0a16c2fbba 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
@@ -11,7 +11,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS nested_in_nested_protobuf_00825;
 
 CREATE TABLE nested_in_nested_protobuf_00825 (x Nested (y Nested (z Int64))) ENGINE = MergeTree ORDER BY tuple();
diff --git a/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh b/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
index acec56b1790..cf9c47f5ea9 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
@@ -11,7 +11,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS nested_optional_protobuf_00825;
 
 CREATE TABLE nested_optional_protobuf_00825
diff --git a/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh b/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
index ce6f6275028..0f168c38395 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
@@ -9,7 +9,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS no_length_delimiter_protobuf_00825;
 DROP TABLE IF EXISTS roundtrip_no_length_delimiter_protobuf_00825;
 
@@ -43,11 +43,11 @@ $CLICKHOUSE_CLIENT --query "SELECT * FROM roundtrip_no_length_delimiter_protobuf
 rm "$BINARY_FILE_PATH"
 
 # The ProtobufSingle format can't be used to write multiple rows because this format doesn't have any row delimiter.
-$CLICKHOUSE_CLIENT > /dev/null <<EOF
+$CLICKHOUSE_CLIENT --multiquery > /dev/null <<EOF
 SELECT * FROM no_length_delimiter_protobuf_00825 FORMAT ProtobufSingle SETTINGS format_schema = '$SCHEMADIR/00825_protobuf_format_no_length_delimiter:Message'; -- { clientError 546 }
 EOF
 
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE no_length_delimiter_protobuf_00825;
 DROP TABLE roundtrip_no_length_delimiter_protobuf_00825;
 EOF
diff --git a/tests/queries/0_stateless/00825_protobuf_format_persons.sh b/tests/queries/0_stateless/00825_protobuf_format_persons.sh
index 1f199dc4691..a9ac49a1e30 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_persons.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_persons.sh
@@ -17,7 +17,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS persons_00825;
 DROP TABLE IF EXISTS roundtrip_persons_00825;
 DROP TABLE IF EXISTS alt_persons_00825;
@@ -129,7 +129,7 @@ $CLICKHOUSE_CLIENT --query "INSERT INTO edition2023_persons_00825 SETTINGS forma
 $CLICKHOUSE_CLIENT --query "SELECT * FROM edition2023_persons_00825 ORDER BY name"
 rm "$BINARY_FILE_PATH"
 
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE persons_00825;
 DROP TABLE roundtrip_persons_00825;
 DROP TABLE alt_persons_00825;
diff --git a/tests/queries/0_stateless/00825_protobuf_format_skipped_column_in_nested.sh b/tests/queries/0_stateless/00825_protobuf_format_skipped_column_in_nested.sh
index c98205b5126..1c1dde82b4a 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_skipped_column_in_nested.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_skipped_column_in_nested.sh
@@ -11,7 +11,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS table_skipped_column_in_nested_00825;
 
 CREATE TABLE table_skipped_column_in_nested_00825 (
diff --git a/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh b/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
index eafe1919606..f4525ba609c 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
@@ -9,7 +9,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS splitted_nested_protobuf_00825;
 
 CREATE TABLE splitted_nested_protobuf_00825 (
diff --git a/tests/queries/0_stateless/00825_protobuf_format_squares.sh b/tests/queries/0_stateless/00825_protobuf_format_squares.sh
index 9c6778d519d..f04cf60d78b 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_squares.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_squares.sh
@@ -9,7 +9,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS squares_protobuf_00825;
 
 CREATE TABLE squares_protobuf_00825 (number UInt32, square UInt64) ENGINE = MergeTree ORDER BY tuple();
diff --git a/tests/queries/0_stateless/00825_protobuf_format_table_default.sh b/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
index 8ccb022b669..5701ee2cb4d 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
@@ -9,7 +9,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS table_default_protobuf_00825;
 
 CREATE TABLE table_default_protobuf_00825
diff --git a/tests/queries/0_stateless/00830_join_overwrite.sql b/tests/queries/0_stateless/00830_join_overwrite.sql
index f51a152ea46..bc3662528db 100644
--- a/tests/queries/0_stateless/00830_join_overwrite.sql
+++ b/tests/queries/0_stateless/00830_join_overwrite.sql
@@ -13,7 +13,7 @@ SELECT joinGet('kv_overwrite', 'v', toUInt32(1));
 CREATE TABLE t2 (k UInt32, v UInt32) ENGINE = Memory;
 INSERT INTO t2 VALUES (1, 2), (1, 3);
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT v FROM (SELECT 1 as k) t1 ANY INNER JOIN t2 USING (k) SETTINGS join_any_take_last_row = 0;
 SELECT v FROM (SELECT 1 as k) t1 ANY INNER JOIN t2 USING (k) SETTINGS join_any_take_last_row = 1;
diff --git a/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh b/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh
index dd3735f27b1..5c21c70e06a 100755
--- a/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh
+++ b/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CURL} --max-time 1 -sS "${CLICKHOUSE_URL}&query_id=cancel_http_readonly_queries_on_client_close&cancel_http_readonly_queries_on_client_close=1&max_rows_to_read=0&query=SELECT+count()+FROM+system.numbers" 2>&1 | grep -cF 'curl: (28)'
+${CLICKHOUSE_CURL} --max-time 1 -sS "${CLICKHOUSE_URL}&query_id=cancel_http_readonly_queries_on_client_close&cancel_http_readonly_queries_on_client_close=1&query=SELECT+count()+FROM+system.numbers" 2>&1 | grep -cF 'curl: (28)'
 
 i=0 retries=300
 while [[ $i -lt $retries ]]; do
diff --git a/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh b/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
index 3e6b339cb57..16ad08deeb2 100755
--- a/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
+++ b/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-# Tags: replica, no-debug, no-fasttest
-# no-fasttest: Waiting for failed mutations is slow: https://github.com/ClickHouse/ClickHouse/issues/67936
+# Tags: replica, no-debug
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00835_if_generic_case.sql b/tests/queries/0_stateless/00835_if_generic_case.sql
index e06e610dbb5..051fad14603 100644
--- a/tests/queries/0_stateless/00835_if_generic_case.sql
+++ b/tests/queries/0_stateless/00835_if_generic_case.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul') AS x, toDate('2000-01-02') AS y, x > y ? x : y AS z;
 SELECT materialize(toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul')) AS x, toDate('2000-01-02') AS y, x > y ? x : y AS z;
diff --git a/tests/queries/0_stateless/00837_minmax_index.sh b/tests/queries/0_stateless/00837_minmax_index.sh
index ff487f50ee0..e4de0b9ebfc 100755
--- a/tests/queries/0_stateless/00837_minmax_index.sh
+++ b/tests/queries/0_stateless/00837_minmax_index.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS minmax_idx;"
 
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 CREATE TABLE minmax_idx
 (
     u64 UInt64,
diff --git a/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh b/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh
index a29d2e5bc71..da4d3b05987 100755
--- a/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh
+++ b/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh
@@ -9,7 +9,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS table"
 
-seq 1 100 | sed -r -e "s/.+/CREATE TABLE table (x UInt8) ENGINE = MergeTree ORDER BY x; DROP TABLE table;/" | $CLICKHOUSE_CLIENT &
-seq 1 100 | sed -r -e "s/.+/SELECT * FROM system.tables WHERE database = '${CLICKHOUSE_DATABASE}' LIMIT 1000000, 1;/" | $CLICKHOUSE_CLIENT 2>/dev/null &
+seq 1 100 | sed -r -e "s/.+/CREATE TABLE table (x UInt8) ENGINE = MergeTree ORDER BY x; DROP TABLE table;/" | $CLICKHOUSE_CLIENT -n &
+seq 1 100 | sed -r -e "s/.+/SELECT * FROM system.tables WHERE database = '${CLICKHOUSE_DATABASE}' LIMIT 1000000, 1;/" | $CLICKHOUSE_CLIENT -n 2>/dev/null &
 
 wait
diff --git a/tests/queries/0_stateless/00838_unique_index.sh b/tests/queries/0_stateless/00838_unique_index.sh
index a3aba4f26b6..b267b6a8eb3 100755
--- a/tests/queries/0_stateless/00838_unique_index.sh
+++ b/tests/queries/0_stateless/00838_unique_index.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS set_idx;"
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 CREATE TABLE set_idx
 (
     u64 UInt64,
diff --git a/tests/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh b/tests/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh
index cb774116356..f0bc52ee356 100755
--- a/tests/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh
+++ b/tests/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh
@@ -27,7 +27,7 @@ function thread_drop_create()
     while [ $SECONDS -lt "$TIMELIMIT" ] && [ $it -lt 100 ];
     do
         it=$((it+1))
-        $CLICKHOUSE_CLIENT -m -q "
+        $CLICKHOUSE_CLIENT -nm -q "
             drop table if exists view_00840;
             create view view_00840 as select count(*),database,table from system.columns group by database,table;
         "
diff --git a/tests/queries/0_stateless/00848_join_use_nulls_segfault.sql b/tests/queries/0_stateless/00848_join_use_nulls_segfault.sql
index 275968236ae..2f6cca0284c 100644
--- a/tests/queries/0_stateless/00848_join_use_nulls_segfault.sql
+++ b/tests/queries/0_stateless/00848_join_use_nulls_segfault.sql
@@ -1,5 +1,5 @@
 SET any_join_distinct_right_table_keys = 1;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS t1_00848;
 DROP TABLE IF EXISTS t2_00848;
diff --git a/tests/queries/0_stateless/00849_multiple_comma_join_2.sql b/tests/queries/0_stateless/00849_multiple_comma_join_2.sql
index 250dd4a47ab..6530f691087 100644
--- a/tests/queries/0_stateless/00849_multiple_comma_join_2.sql
+++ b/tests/queries/0_stateless/00849_multiple_comma_join_2.sql
@@ -12,7 +12,7 @@ CREATE TABLE t2 (a UInt32, b Nullable(Int32)) ENGINE = Memory;
 CREATE TABLE t3 (a UInt32, b Nullable(Int32)) ENGINE = Memory;
 CREATE TABLE t4 (a UInt32, b Nullable(Int32)) ENGINE = Memory;
 
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 
 --- EXPLAIN SYNTAX (old AST based optimization)
 SELECT countIf(explain like '%COMMA%' OR explain like '%CROSS%'), countIf(explain like '%INNER%') FROM (
@@ -62,56 +62,56 @@ 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 enable_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 enable_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 enable_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 enable_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 enable_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 enable_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 enable_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 enable_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 enable_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 enable_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 enable_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 enable_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 enable_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 enable_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 enable_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);
 INSERT INTO t3 values (1,1), (1, Null);
 INSERT INTO t4 values (1,1), (1, Null);
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT 'SELECT * FROM t1, t2';
 SELECT * FROM t1, t2
diff --git a/tests/queries/0_stateless/00855_join_with_array_join.sql b/tests/queries/0_stateless/00855_join_with_array_join.sql
index 2d5bc6cb1f6..c278ff0738a 100644
--- a/tests/queries/0_stateless/00855_join_with_array_join.sql
+++ b/tests/queries/0_stateless/00855_join_with_array_join.sql
@@ -1,5 +1,5 @@
 SET joined_subquery_requires_alias = 0;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT ax, c FROM (SELECT [1,2] ax, 0 c) ARRAY JOIN ax JOIN (SELECT 0 c) USING (c);
 SELECT ax, c FROM (SELECT [3,4] ax, 0 c) JOIN (SELECT 0 c) USING (c) ARRAY JOIN ax;
diff --git a/tests/queries/0_stateless/00858_issue_4756.sql b/tests/queries/0_stateless/00858_issue_4756.sql
index 3f6ab037c02..9eacd5ef364 100644
--- a/tests/queries/0_stateless/00858_issue_4756.sql
+++ b/tests/queries/0_stateless/00858_issue_4756.sql
@@ -1,4 +1,4 @@
-set enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 set distributed_product_mode = 'local';
 
 drop table if exists shard1;
diff --git a/tests/queries/0_stateless/00861_decimal_quoted_csv.sql b/tests/queries/0_stateless/00861_decimal_quoted_csv.sql
index d7211c55df7..e716c607ef8 100644
--- a/tests/queries/0_stateless/00861_decimal_quoted_csv.sql
+++ b/tests/queries/0_stateless/00861_decimal_quoted_csv.sql
@@ -2,14 +2,15 @@ DROP TABLE IF EXISTS test_00861;
 CREATE TABLE test_00861 (key UInt64, d32 Decimal32(2), d64 Decimal64(2), d128 Decimal128(2)) ENGINE = Memory;
 
 INSERT INTO test_00861 FORMAT CSV "1","1","1","1"
-
+;
 INSERT INTO test_00861 FORMAT CSV "2","-1","-1","-1"
-
+;
 INSERT INTO test_00861 FORMAT CSV "3","1.0","1.0","1.0"
-
+;
 INSERT INTO test_00861 FORMAT CSV "4","-0.1","-0.1","-0.1"
-
+;
 INSERT INTO test_00861 FORMAT CSV "5","0.010","0.010","0.010"
+;
 
 SELECT * FROM test_00861 ORDER BY key;
 
diff --git a/tests/queries/0_stateless/00897_flatten.sql b/tests/queries/0_stateless/00897_flatten.sql
index 45d1a225a49..0d67a1708fd 100644
--- a/tests/queries/0_stateless/00897_flatten.sql
+++ b/tests/queries/0_stateless/00897_flatten.sql
@@ -2,7 +2,7 @@ SELECT flatten(arrayJoin([[[1, 2, 3], [4, 5]], [[6], [7, 8]]]));
 SELECT arrayFlatten(arrayJoin([[[[]], [[1], [], [2, 3]]], [[[4]]]]));
 SELECT flatten(arrayMap(x -> arrayMap(y -> arrayMap(z -> range(x), range(x)), range(x)), range(number))) FROM numbers(6);
 SELECT flatten(arrayMap(x -> arrayMap(y -> arrayMap(z -> range(z), range(y)), range(x)), range(number))) FROM numbers(6);
-SELECT flatten(arrayMap(x -> arrayMap(x -> arrayMap(x -> range(x), range(x)), range(x)), range(number))) FROM numbers(6) SETTINGS enable_analyzer=1;
+SELECT flatten(arrayMap(x -> arrayMap(x -> arrayMap(x -> range(x), range(x)), range(x)), range(number))) FROM numbers(6) SETTINGS allow_experimental_analyzer=1;
 SELECT arrayFlatten([[[1, 2, 3], [4, 5]], [[6], [7, 8]]]);
 SELECT flatten([[[]]]);
 SELECT arrayFlatten([]);
diff --git a/tests/queries/0_stateless/00900_long_parquet.sh b/tests/queries/0_stateless/00900_long_parquet.sh
index 86a0d013078..5d6317b2787 100755
--- a/tests/queries/0_stateless/00900_long_parquet.sh
+++ b/tests/queries/0_stateless/00900_long_parquet.sh
@@ -8,64 +8,58 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 
-${CLICKHOUSE_CLIENT} --query="
-    DROP TABLE IF EXISTS contributors;
-    CREATE TABLE contributors (name String) ENGINE = Memory;"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS contributors"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE contributors (name String) ENGINE = Memory"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM system.contributors ORDER BY name DESC FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO contributors FORMAT Parquet"
-${CLICKHOUSE_CLIENT} --query="
-    -- random results
-    SELECT * FROM contributors LIMIT 10 FORMAT Null;
-    DROP TABLE contributors;
+# random results
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM contributors LIMIT 10" > /dev/null
+${CLICKHOUSE_CLIENT} --query="DROP TABLE contributors"
 
-    DROP TABLE IF EXISTS parquet_numbers;
-    CREATE TABLE parquet_numbers (number UInt64) ENGINE = Memory;"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_numbers"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_numbers (number UInt64) ENGINE = Memory"
 # less than default block size (65k)
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM system.numbers LIMIT 10000 FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_numbers FORMAT Parquet"
-${CLICKHOUSE_CLIENT} --query="
-    SELECT * FROM parquet_numbers ORDER BY number DESC LIMIT 10;
-    TRUNCATE TABLE parquet_numbers;"
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_numbers ORDER BY number DESC LIMIT 10"
+${CLICKHOUSE_CLIENT} --query="TRUNCATE TABLE parquet_numbers"
 
 # More than default block size
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM system.numbers LIMIT 100000 FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_numbers FORMAT Parquet"
-${CLICKHOUSE_CLIENT} --query="
-    SELECT * FROM parquet_numbers ORDER BY number DESC LIMIT 10;
-    TRUNCATE TABLE parquet_numbers;"
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_numbers ORDER BY number DESC LIMIT 10"
+${CLICKHOUSE_CLIENT} --query="TRUNCATE TABLE parquet_numbers"
 
 ${CLICKHOUSE_CLIENT} --max_block_size=2 --query="SELECT * FROM system.numbers LIMIT 3 FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_numbers FORMAT Parquet"
-${CLICKHOUSE_CLIENT} --query="
-    SELECT * FROM parquet_numbers ORDER BY number DESC LIMIT 10;
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_numbers ORDER BY number DESC LIMIT 10"
 
-    TRUNCATE TABLE parquet_numbers;"
+${CLICKHOUSE_CLIENT} --query="TRUNCATE TABLE parquet_numbers"
 ${CLICKHOUSE_CLIENT} --max_block_size=1 --query="SELECT * FROM system.numbers LIMIT 1000 FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_numbers FORMAT Parquet"
-${CLICKHOUSE_CLIENT} --query="
-    SELECT * FROM parquet_numbers ORDER BY number DESC LIMIT 10;
-    DROP TABLE parquet_numbers;
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_numbers ORDER BY number DESC LIMIT 10"
 
-    DROP TABLE IF EXISTS parquet_events;
-    CREATE TABLE parquet_events (event String, value UInt64, description String) ENGINE = Memory;"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_numbers"
+
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_events"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_events (event String, value UInt64, description String) ENGINE = Memory"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM system.events FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_events FORMAT Parquet"
-${CLICKHOUSE_CLIENT} --query="
-    SELECT event, description FROM parquet_events WHERE event IN ('ContextLock', 'Query') ORDER BY event;
-    DROP TABLE parquet_events;
+${CLICKHOUSE_CLIENT} --query="SELECT event, description FROM parquet_events WHERE event IN ('ContextLock', 'Query') ORDER BY event"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_events"
 
-    DROP TABLE IF EXISTS parquet_types1;
-    DROP TABLE IF EXISTS parquet_types2;
-    DROP TABLE IF EXISTS parquet_types3;
-    DROP TABLE IF EXISTS parquet_types4;
-    CREATE TABLE parquet_types1       (int8 Int8, uint8 UInt8, int16 Int16, uint16 UInt16, int32 Int32, uint32 UInt32, int64 Int64, uint64 UInt64, float32 Float32, float64 Float64, string String, fixedstring FixedString(15), date Date, datetime DateTime, datetime64 DateTime64(9)) ENGINE = Memory;
-    CREATE TABLE parquet_types2       (int8 Int8, uint8 UInt8, int16 Int16, uint16 UInt16, int32 Int32, uint32 UInt32, int64 Int64, uint64 UInt64, float32 Float32, float64 Float64, string String, fixedstring FixedString(15), date Date, datetime DateTime, datetime64 DateTime64(9)) ENGINE = Memory;
-    -- convert min type
-    CREATE TABLE parquet_types3       (int8 Int8,  uint8 Int8,  int16 Int8,   uint16 Int8,  int32 Int8,   uint32 Int8,  int64 Int8,   uint64 Int8,    float32 Int8,    float64 Int8, string FixedString(15), fixedstring FixedString(15), date Date, datetime Date, datetime64 DateTime64(9)) ENGINE = Memory;
-    -- convert max type
-    CREATE TABLE parquet_types4       (int8 Int64, uint8 Int64, int16 Int64, uint16 Int64, int32 Int64,  uint32 Int64, int64 Int64,  uint64 Int64,   float32 Int64,   float64 Int64, string String,          fixedstring String, date DateTime, datetime DateTime, datetime64 DateTime64(9)) ENGINE = Memory;
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_types1"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_types2"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_types3"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_types4"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_types1       (int8 Int8, uint8 UInt8, int16 Int16, uint16 UInt16, int32 Int32, uint32 UInt32, int64 Int64, uint64 UInt64, float32 Float32, float64 Float64, string String, fixedstring FixedString(15), date Date, datetime DateTime, datetime64 DateTime64(9)) ENGINE = Memory"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_types2       (int8 Int8, uint8 UInt8, int16 Int16, uint16 UInt16, int32 Int32, uint32 UInt32, int64 Int64, uint64 UInt64, float32 Float32, float64 Float64, string String, fixedstring FixedString(15), date Date, datetime DateTime, datetime64 DateTime64(9)) ENGINE = Memory"
+# convert min type
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_types3       (int8 Int8,  uint8 Int8,  int16 Int8,   uint16 Int8,  int32 Int8,   uint32 Int8,  int64 Int8,   uint64 Int8,    float32 Int8,    float64 Int8, string FixedString(15), fixedstring FixedString(15), date Date, datetime Date, datetime64 DateTime64(9)) ENGINE = Memory"
+# convert max type
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_types4       (int8 Int64, uint8 Int64, int16 Int64, uint16 Int64, int32 Int64,  uint32 Int64, int64 Int64,  uint64 Int64,   float32 Int64,   float64 Int64, string String,          fixedstring String, date DateTime, datetime DateTime, datetime64 DateTime64(9)) ENGINE = Memory"
 
-    INSERT INTO parquet_types1 values (     -108,         108,       -1016,          1116,       -1032,          1132,       -1064,          1164,          -1.032,          -1.064,    'string-0',               'fixedstring', '2001-02-03', '2002-02-03 04:05:06', toDateTime64('2002-02-03 04:05:06.789', 9));
+${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_types1 values (     -108,         108,       -1016,          1116,       -1032,          1132,       -1064,          1164,          -1.032,          -1.064,    'string-0',               'fixedstring', '2001-02-03', '2002-02-03 04:05:06', toDateTime64('2002-02-03 04:05:06.789', 9))"
 
-    -- min
-    INSERT INTO parquet_types1 values (     -128,           0,      -32768,             0, -2147483648,             0, -9223372036854775808, 0,             -1.032,          -1.064,    'string-1',             'fixedstring-1', '2003-04-05', '2003-02-03 04:05:06', toDateTime64('2003-02-03 04:05:06.789', 9));
+# min
+${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_types1 values (     -128,           0,      -32768,             0, -2147483648,             0, -9223372036854775808, 0,             -1.032,          -1.064,    'string-1',             'fixedstring-1', '2003-04-05', '2003-02-03 04:05:06', toDateTime64('2003-02-03 04:05:06.789', 9))"
 
-    -- max
-    INSERT INTO parquet_types1 values (      127,         255,       32767,         65535,  2147483647,    4294967295, 9223372036854775807, 9223372036854775807, -1.032,     -1.064,    'string-2',             'fixedstring-2', '2004-06-07', '2004-02-03 04:05:06', toDateTime64('2004-02-03 04:05:06.789', 9));"
+# max
+${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_types1 values (      127,         255,       32767,         65535,  2147483647,    4294967295, 9223372036854775807, 9223372036854775807, -1.032,     -1.064,    'string-2',             'fixedstring-2', '2004-06-07', '2004-02-03 04:05:06', toDateTime64('2004-02-03 04:05:06.789', 9))"
 
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_types1 FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_types2 FORMAT Parquet"
 
@@ -78,9 +72,8 @@ ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_types2 ORDER BY int8 FORMAT
 echo diff:
 diff "${CLICKHOUSE_TMP}"/parquet_all_types_1.dump "${CLICKHOUSE_TMP}"/parquet_all_types_2.dump
 
-${CLICKHOUSE_CLIENT} --query="
-    TRUNCATE TABLE parquet_types2;
-    INSERT INTO parquet_types3 values (       79,          81,          82,            83,          84,            85,          86,            87,              88,              89,         'str01',                  'fstr1', '2003-03-04', '2004-05-06', toDateTime64('2004-05-06 07:08:09.012', 9));"
+${CLICKHOUSE_CLIENT} --query="TRUNCATE TABLE parquet_types2"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_types3 values (       79,          81,          82,            83,          84,            85,          86,            87,              88,              89,         'str01',                  'fstr1', '2003-03-04', '2004-05-06', toDateTime64('2004-05-06 07:08:09.012', 9))"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_types3 ORDER BY int8 FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_types2 FORMAT Parquet"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_types1 ORDER BY int8 FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_types3 FORMAT Parquet"
 
@@ -88,69 +81,70 @@ ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_types4 values (       80,
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_types4 ORDER BY int8 FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_types2 FORMAT Parquet"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_types1 ORDER BY int8 FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_types4 FORMAT Parquet"
 
-${CLICKHOUSE_CLIENT} --query="
-    SELECT 'dest:';
-    SELECT * FROM parquet_types2 ORDER BY int8;
-    SELECT 'min:';
-    SELECT * FROM parquet_types3 ORDER BY int8;
-    SELECT 'max:';
-    SELECT * FROM parquet_types4 ORDER BY int8;
+echo dest:
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_types2 ORDER BY int8"
+echo min:
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_types3 ORDER BY int8"
+echo max:
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_types4 ORDER BY int8"
 
-    DROP TABLE IF EXISTS parquet_types5;
-    DROP TABLE IF EXISTS parquet_types6;
-    TRUNCATE TABLE parquet_types2;
-    CREATE TABLE parquet_types5       (int8 Nullable(Int8), uint8 Nullable(UInt8), int16 Nullable(Int16), uint16 Nullable(UInt16), int32 Nullable(Int32), uint32 Nullable(UInt32), int64 Nullable(Int64), uint64 Nullable(UInt64), float32 Nullable(Float32), float64 Nullable(Float64), string Nullable(String), fixedstring Nullable(FixedString(15)), date Nullable(Date), datetime Nullable(DateTime), datetime64 Nullable(DateTime64(9))) ENGINE = Memory;
-    CREATE TABLE parquet_types6       (int8 Nullable(Int8), uint8 Nullable(UInt8), int16 Nullable(Int16), uint16 Nullable(UInt16), int32 Nullable(Int32), uint32 Nullable(UInt32), int64 Nullable(Int64), uint64 Nullable(UInt64), float32 Nullable(Float32), float64 Nullable(Float64), string Nullable(String), fixedstring Nullable(FixedString(15)), date Nullable(Date), datetime Nullable(DateTime), datetime64 Nullable(DateTime64(9))) ENGINE = Memory;
-    INSERT INTO parquet_types5 values (               NULL,                  NULL,                  NULL,                    NULL,                  NULL,                    NULL,                  NULL,                    NULL,                      NULL,                      NULL,                    NULL,                                  NULL,                NULL,                        NULL, NULL);"
+
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_types5"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_types6"
+${CLICKHOUSE_CLIENT} --query="TRUNCATE TABLE parquet_types2"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_types5       (int8 Nullable(Int8), uint8 Nullable(UInt8), int16 Nullable(Int16), uint16 Nullable(UInt16), int32 Nullable(Int32), uint32 Nullable(UInt32), int64 Nullable(Int64), uint64 Nullable(UInt64), float32 Nullable(Float32), float64 Nullable(Float64), string Nullable(String), fixedstring Nullable(FixedString(15)), date Nullable(Date), datetime Nullable(DateTime), datetime64 Nullable(DateTime64(9))) ENGINE = Memory"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_types6       (int8 Nullable(Int8), uint8 Nullable(UInt8), int16 Nullable(Int16), uint16 Nullable(UInt16), int32 Nullable(Int32), uint32 Nullable(UInt32), int64 Nullable(Int64), uint64 Nullable(UInt64), float32 Nullable(Float32), float64 Nullable(Float64), string Nullable(String), fixedstring Nullable(FixedString(15)), date Nullable(Date), datetime Nullable(DateTime), datetime64 Nullable(DateTime64(9))) ENGINE = Memory"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_types5 values (               NULL,                  NULL,                  NULL,                    NULL,                  NULL,                    NULL,                  NULL,                    NULL,                      NULL,                      NULL,                    NULL,                                  NULL,                NULL,                        NULL, NULL)"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_types5 ORDER BY int8 FORMAT Parquet" > "${CLICKHOUSE_TMP}"/parquet_all_types_5.parquet
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_types5 ORDER BY int8 FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_types6 FORMAT Parquet"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_types1 ORDER BY int8 FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_types6 FORMAT Parquet"
 echo dest from null:
-${CLICKHOUSE_CLIENT} --query="
-    SELECT * FROM parquet_types6 ORDER BY int8;
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_types6 ORDER BY int8"
 
-    DROP TABLE parquet_types5;
-    DROP TABLE parquet_types6;
 
-    DROP TABLE parquet_types1;
-    DROP TABLE parquet_types2;
-    DROP TABLE parquet_types3;
-    DROP TABLE parquet_types4;
+${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_types5"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_types6"
 
-    DROP TABLE IF EXISTS parquet_arrays;
 
-    CREATE TABLE parquet_arrays (id UInt32, a1 Array(Int8), a2 Array(UInt8), a3 Array(Int16), a4 Array(UInt16), a5 Array(Int32), a6 Array(UInt32), a7 Array(Int64), a8 Array(UInt64), a9 Array(String), a10 Array(FixedString(4)), a11 Array(Float32), a12 Array(Float64), a13 Array(Date), a14 Array(DateTime), a15 Array(Decimal(4, 2)), a16 Array(Decimal(10, 2)), a17 Array(Decimal(25, 2))) engine=Memory();
+${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_types1"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_types2"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_types3"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_types4"
 
-    INSERT INTO parquet_arrays VALUES (1, [1,-2,3], [1,2,3], [100, -200, 300], [100, 200, 300], [10000000, -20000000, 30000000], [10000000, 2000000, 3000000], [100000000000000, -200000000000, 3000000000000], [100000000000000, 20000000000000, 3000000000000], ['Some string', 'Some string', 'Some string'], ['0000', '1111', '2222'], [42.42, 424.2, 0.4242], [424242.424242, 4242042420.242424, 42], ['2000-01-01', '2001-01-01', '2002-01-01'], ['2000-01-01', '2001-01-01', '2002-01-01'], [0.2, 10.003, 4.002], [4.000000001, 10000.10000, 10000.100001], [1000000000.000000001123, 90.0000000010010101, 0101001.0112341001]);
 
-    INSERT INTO parquet_arrays VALUES (2, [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []);"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_arrays"
+
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_arrays (id UInt32, a1 Array(Int8), a2 Array(UInt8), a3 Array(Int16), a4 Array(UInt16), a5 Array(Int32), a6 Array(UInt32), a7 Array(Int64), a8 Array(UInt64), a9 Array(String), a10 Array(FixedString(4)), a11 Array(Float32), a12 Array(Float64), a13 Array(Date), a14 Array(DateTime), a15 Array(Decimal(4, 2)), a16 Array(Decimal(10, 2)), a17 Array(Decimal(25, 2))) engine=Memory()"
+
+${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_arrays VALUES (1, [1,-2,3], [1,2,3], [100, -200, 300], [100, 200, 300], [10000000, -20000000, 30000000], [10000000, 2000000, 3000000], [100000000000000, -200000000000, 3000000000000], [100000000000000, 20000000000000, 3000000000000], ['Some string', 'Some string', 'Some string'], ['0000', '1111', '2222'], [42.42, 424.2, 0.4242], [424242.424242, 4242042420.242424, 42], ['2000-01-01', '2001-01-01', '2002-01-01'], ['2000-01-01', '2001-01-01', '2002-01-01'], [0.2, 10.003, 4.002], [4.000000001, 10000.10000, 10000.100001], [1000000000.000000001123, 90.0000000010010101, 0101001.0112341001])"
+
+${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_arrays VALUES (2, [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [])"
 
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_arrays FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_arrays FORMAT Parquet"
-${CLICKHOUSE_CLIENT} --query="
-    SELECT * FROM parquet_arrays ORDER BY id;
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_arrays ORDER BY id"
 
-    DROP TABLE parquet_arrays;
+${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_arrays"
 
-    DROP TABLE IF EXISTS parquet_nullable_arrays;
-    CREATE TABLE parquet_nullable_arrays (id UInt32, a1 Array(Nullable(UInt32)), a2 Array(Nullable(String)), a3 Array(Nullable(Decimal(4, 2)))) engine=Memory();
-    INSERT INTO parquet_nullable_arrays VALUES (1, [1, Null, 2], [Null, 'Some string', Null], [0.001, Null, 42.42]), (2, [Null], [Null], [Null]), (3, [], [], []);"
+
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_nullable_arrays"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_nullable_arrays (id UInt32, a1 Array(Nullable(UInt32)), a2 Array(Nullable(String)), a3 Array(Nullable(Decimal(4, 2)))) engine=Memory()"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_nullable_arrays VALUES (1, [1, Null, 2], [Null, 'Some string', Null], [0.001, Null, 42.42]), (2, [Null], [Null], [Null]), (3, [], [], [])"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_nullable_arrays FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_nullable_arrays FORMAT Parquet"
-${CLICKHOUSE_CLIENT} --query="
-    SELECT * FROM parquet_nullable_arrays ORDER BY id;
-    DROP TABLE parquet_nullable_arrays;
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_nullable_arrays ORDER BY id"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_nullable_arrays"
 
-    DROP TABLE IF EXISTS parquet_nested_arrays;
-    CREATE TABLE parquet_nested_arrays (a1 Array(Array(Array(UInt32))), a2 Array(Array(Array(String))), a3 Array(Array(Nullable(UInt32))), a4 Array(Array(Nullable(String)))) engine=Memory();
-    INSERT INTO parquet_nested_arrays VALUES ([[[1,2,3], [1,2,3]], [[1,2,3]], [[], [1,2,3]]], [[['Some string', 'Some string'], []], [['Some string']], [[]]], [[Null, 1, 2], [Null], [1, 2], []], [['Some string', Null, 'Some string'], [Null], []]);"
+
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_nested_arrays"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_nested_arrays (a1 Array(Array(Array(UInt32))), a2 Array(Array(Array(String))), a3 Array(Array(Nullable(UInt32))), a4 Array(Array(Nullable(String)))) engine=Memory() "
+${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_nested_arrays VALUES ([[[1,2,3], [1,2,3]], [[1,2,3]], [[], [1,2,3]]], [[['Some string', 'Some string'], []], [['Some string']], [[]]], [[Null, 1, 2], [Null], [1, 2], []], [['Some string', Null, 'Some string'], [Null], []])"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_nested_arrays FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_nested_arrays FORMAT Parquet"
-${CLICKHOUSE_CLIENT} --query="
-    SELECT * FROM parquet_nested_arrays;
-    DROP TABLE parquet_nested_arrays;
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_nested_arrays"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_nested_arrays"
 
-    DROP TABLE IF EXISTS parquet_decimal;
-    CREATE TABLE parquet_decimal (d1 Decimal32(4), d2 Decimal64(8), d3 Decimal128(16), d4 Decimal256(32)) ENGINE = Memory;
-    INSERT INTO TABLE parquet_decimal VALUES (0.123, 0.123123123, 0.123123123123, 0.123123123123123123);"
+
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_decimal"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_decimal (d1 Decimal32(4), d2 Decimal64(8), d3 Decimal128(16), d4 Decimal256(32)) ENGINE = Memory"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO TABLE parquet_decimal VALUES (0.123, 0.123123123, 0.123123123123, 0.123123123123123123)"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_decimal FORMAT Arrow" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_decimal FORMAT Arrow"
-${CLICKHOUSE_CLIENT} --query="
-    SELECT * FROM parquet_decimal;
-    DROP TABLE parquet_decimal;"
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_decimal"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_decimal"
diff --git a/tests/queries/0_stateless/00900_long_parquet_decimal.sh b/tests/queries/0_stateless/00900_long_parquet_decimal.sh
index 14e8fdcc038..1b82ae9bbc7 100755
--- a/tests/queries/0_stateless/00900_long_parquet_decimal.sh
+++ b/tests/queries/0_stateless/00900_long_parquet_decimal.sh
@@ -6,115 +6,108 @@
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS decimal;"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS decimal2;"
 
-${CLICKHOUSE_CLIENT} --query="
-    DROP TABLE IF EXISTS decimal;
-    DROP TABLE IF EXISTS decimal2;
-
-    -- Simple small values
-    CREATE TABLE IF NOT EXISTS decimal  (a DECIMAL(9,0), b DECIMAL(18,0), c DECIMAL(38,0), d DECIMAL(9, 9), e DECIMAL(18, 18), f DECIMAL(38, 38), g Decimal(9, 5), h decimal(18, 9), i deciMAL(38, 18), j DECIMAL(1,0)) ENGINE = Memory;
-    CREATE TABLE IF NOT EXISTS decimal2 AS decimal ENGINE = Memory;
-    INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-    -- INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (1, 1, 1, 0.1, 0.1, 1, 1, 1, 1, 1);
-    -- INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (10, 10, 10, 0.1, 0.1, 0.1, 10, 10, 10, 10);
-    -- INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (-100, -100, -100, -0.1, -0.1, -0.1, -100, -100, -100, -100);
-    INSERT INTO decimal (a, b, c) VALUES (1, 1, 1);
-    INSERT INTO decimal (a, b, c) VALUES (10, 10, 10);"
+# Simple small values
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE IF NOT EXISTS decimal  (a DECIMAL(9,0), b DECIMAL(18,0), c DECIMAL(38,0), d DECIMAL(9, 9), e DECIMAL(18, 18), f DECIMAL(38, 38), g Decimal(9, 5), h decimal(18, 9), i deciMAL(38, 18), j DECIMAL(1,0)) ENGINE = Memory;"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE IF NOT EXISTS decimal2 AS decimal ENGINE = Memory;"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (0, 0, 0, 0, 0, 0, 0, 0, 0, 0);"
+#${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (1, 1, 1, 0.1, 0.1, 1, 1, 1, 1, 1);"
+#${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (10, 10, 10, 0.1, 0.1, 0.1, 10, 10, 10, 10);"
+#${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (-100, -100, -100, -0.1, -0.1, -0.1, -100, -100, -100, -100);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, c) VALUES (1, 1, 1);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, c) VALUES (10, 10, 10);"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal ORDER BY a, b, c, d, e, f, g, h, i, j;" > "${CLICKHOUSE_TMP}"/parquet_decimal0_1.dump
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal ORDER BY a, b, c, d, e, f, g, h, i, j FORMAT Parquet;" > "${CLICKHOUSE_TMP}"/parquet_decimal0.parquet
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal ORDER BY a, b, c, d, e, f, g, h, i, j FORMAT Parquet;" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal2 FORMAT Parquet"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal2 ORDER BY a, b, c, d, e, f, g, h, i, j;" > "${CLICKHOUSE_TMP}"/parquet_decimal0_2.dump
 echo diff0:
 diff "${CLICKHOUSE_TMP}"/parquet_decimal0_1.dump "${CLICKHOUSE_TMP}"/parquet_decimal0_2.dump
-${CLICKHOUSE_CLIENT} --query="
-    DROP TABLE IF EXISTS decimal;
-    DROP TABLE IF EXISTS decimal2;
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS decimal;"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS decimal2;"
 
-    CREATE TABLE IF NOT EXISTS decimal  ( a DECIMAL(9,0), b DECIMAL(18,0), c DECIMAL(38,0), d DECIMAL(9, 9), e DECIMAL(18, 18), f DECIMAL(38, 38), g Decimal(9, 5), h decimal(18, 9), i deciMAL(38, 18), j DECIMAL(1,0)) ENGINE = Memory;
-    CREATE TABLE IF NOT EXISTS decimal2 AS decimal ENGINE = Memory;
-    INSERT INTO decimal (a, b, d, g) VALUES (999999999, 999999999999999999, 0.999999999, 9999.99999);
-    INSERT INTO decimal (a, b, d, g) VALUES (-999999999, -999999999999999999, -0.999999999, -9999.99999);
-    INSERT INTO decimal (c) VALUES (99999999999999999999999999999999999999);
-    INSERT INTO decimal (c) VALUES (-99999999999999999999999999999999999999);
-    INSERT INTO decimal (f) VALUES (0.99999999999999999999999999999999999999);
-    INSERT INTO decimal (f) VALUES (-0.99999999999999999999999999999999999999);
-    INSERT INTO decimal (e, h) VALUES (0.999999999999999999, 999999999.999999999);
-    INSERT INTO decimal (e, h) VALUES (-0.999999999999999999, -999999999.999999999);
-    INSERT INTO decimal (i) VALUES (99999999999999999999.999999999999999999);
-    INSERT INTO decimal (i) VALUES (-99999999999999999999.999999999999999999);
-    INSERT INTO decimal (a, b, c, d, g, j, h) VALUES (1, 1, 1, 0.000000001, 0.00001, 1, 0.000000001);
-    INSERT INTO decimal (a, b, c, d, g, j, h) VALUES (-1, -1, -1, -0.000000001, -0.00001, -1, -0.000000001);
-    INSERT INTO decimal (e, f) VALUES (0.000000000000000001, 0.00000000000000000000000000000000000001);
-    INSERT INTO decimal (e, f) VALUES (-0.000000000000000001, -0.00000000000000000000000000000000000001);
-    INSERT INTO decimal (i) VALUES (0.000000000000000001);
-    INSERT INTO decimal (i) VALUES (-0.000000000000000001);
-    INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-    INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (-0, -0, -0, -0, -0, -0, -0, -0, -0, -0);
-    INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
-    INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (-0.0, -0.0, -0.0, -0.0, -0.0, -0.0, -0.0, -0.0, -0.0, -0.0);
-    INSERT INTO decimal (a, b, g) VALUES ('42.00000', 42.0000000000000000000000000000000, '0.999990');
-    INSERT INTO decimal (a, b, c, d, e, f) VALUES ('0.9e9', '0.9e18', '0.9e38', '9e-9', '9e-18', '9e-38');
-    INSERT INTO decimal (a, b, c, d, e, f) VALUES ('-0.9e9', '-0.9e18', '-0.9e38', '-9e-9', '-9e-18', '-9e-38');"
+
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE IF NOT EXISTS decimal  ( a DECIMAL(9,0), b DECIMAL(18,0), c DECIMAL(38,0), d DECIMAL(9, 9), e DECIMAL(18, 18), f DECIMAL(38, 38), g Decimal(9, 5), h decimal(18, 9), i deciMAL(38, 18), j DECIMAL(1,0)) ENGINE = Memory;"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE IF NOT EXISTS decimal2 AS decimal ENGINE = Memory;"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, d, g) VALUES (999999999, 999999999999999999, 0.999999999, 9999.99999);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, d, g) VALUES (-999999999, -999999999999999999, -0.999999999, -9999.99999);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (c) VALUES (99999999999999999999999999999999999999);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (c) VALUES (-99999999999999999999999999999999999999);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (f) VALUES (0.99999999999999999999999999999999999999);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (f) VALUES (-0.99999999999999999999999999999999999999);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (e, h) VALUES (0.999999999999999999, 999999999.999999999);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (e, h) VALUES (-0.999999999999999999, -999999999.999999999);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (i) VALUES (99999999999999999999.999999999999999999);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (i) VALUES (-99999999999999999999.999999999999999999);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, c, d, g, j, h) VALUES (1, 1, 1, 0.000000001, 0.00001, 1, 0.000000001);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, c, d, g, j, h) VALUES (-1, -1, -1, -0.000000001, -0.00001, -1, -0.000000001);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (e, f) VALUES (0.000000000000000001, 0.00000000000000000000000000000000000001);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (e, f) VALUES (-0.000000000000000001, -0.00000000000000000000000000000000000001);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (i) VALUES (0.000000000000000001);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (i) VALUES (-0.000000000000000001);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (0, 0, 0, 0, 0, 0, 0, 0, 0, 0);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (-0, -0, -0, -0, -0, -0, -0, -0, -0, -0);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (-0.0, -0.0, -0.0, -0.0, -0.0, -0.0, -0.0, -0.0, -0.0, -0.0);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, g) VALUES ('42.00000', 42.0000000000000000000000000000000, '0.999990');"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, c, d, e, f) VALUES ('0.9e9', '0.9e18', '0.9e38', '9e-9', '9e-18', '9e-38');"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, c, d, e, f) VALUES ('-0.9e9', '-0.9e18', '-0.9e38', '-9e-9', '-9e-18', '-9e-38');"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal ORDER BY a, b, c, d, e, f, g, h, i, j;" > "${CLICKHOUSE_TMP}"/parquet_decimal1_1.dump
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal ORDER BY a, b, c, d, e, f, g, h, i, j FORMAT Parquet;" > "${CLICKHOUSE_TMP}"/parquet_decimal1.parquet
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal ORDER BY a, b, c, d, e, f, g, h, i, j FORMAT Parquet;" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal2 FORMAT Parquet"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal2 ORDER BY a, b, c, d, e, f, g, h, i, j;" > "${CLICKHOUSE_TMP}"/parquet_decimal1_2.dump
 echo diff1:
 diff "${CLICKHOUSE_TMP}"/parquet_decimal1_1.dump "${CLICKHOUSE_TMP}"/parquet_decimal1_2.dump
-${CLICKHOUSE_CLIENT} --query="
-    DROP TABLE IF EXISTS decimal;
-    DROP TABLE IF EXISTS decimal2;
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS decimal;"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS decimal2;"
 
-    CREATE TABLE IF NOT EXISTS decimal  (a DECIMAL(9,0), b DECIMAL(18,0), c DECIMAL(38,0), d DECIMAL(9, 9), e Decimal64(18), f Decimal128(38), g Decimal32(5), h Decimal64(9), i Decimal128(18), j dec(4,2)) ENGINE = Memory;
-    CREATE TABLE IF NOT EXISTS decimal2 AS decimal ENGINE = Memory;
-    INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (42, 42, 42, 0.42, 0.42, 0.42, 42.42, 42.42, 42.42, 42.42);
-    INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (-42, -42, -42, -0.42, -0.42, -0.42, -42.42, -42.42, -42.42, -42.42);"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE IF NOT EXISTS decimal  (a DECIMAL(9,0), b DECIMAL(18,0), c DECIMAL(38,0), d DECIMAL(9, 9), e Decimal64(18), f Decimal128(38), g Decimal32(5), h Decimal64(9), i Decimal128(18), j dec(4,2)) ENGINE = Memory;"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE IF NOT EXISTS decimal2 AS decimal ENGINE = Memory;"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (42, 42, 42, 0.42, 0.42, 0.42, 42.42, 42.42, 42.42, 42.42);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal (a, b, c, d, e, f, g, h, i, j) VALUES (-42, -42, -42, -0.42, -0.42, -0.42, -42.42, -42.42, -42.42, -42.42);"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal ORDER BY a, b, c, d, e, f, g, h, i, j;" > "${CLICKHOUSE_TMP}"/parquet_decimal2_1.dump
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal ORDER BY a, b, c, d, e, f, g, h, i, j FORMAT Parquet;" > "${CLICKHOUSE_TMP}"/parquet_decimal2.parquet
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal ORDER BY a, b, c, d, e, f, g, h, i, j FORMAT Parquet;" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal2 FORMAT Parquet"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal2 ORDER BY a, b, c, d, e, f, g, h, i, j;" > "${CLICKHOUSE_TMP}"/parquet_decimal2_2.dump
 echo diff2:
 diff "${CLICKHOUSE_TMP}"/parquet_decimal2_1.dump "${CLICKHOUSE_TMP}"/parquet_decimal2_2.dump
-${CLICKHOUSE_CLIENT} --query="
-    DROP TABLE IF EXISTS decimal;
-    DROP TABLE IF EXISTS decimal2;
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS decimal;"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS decimal2;"
 
-    CREATE TABLE IF NOT EXISTS decimal  (a Nullable(DECIMAL(9,0)), b Nullable(DECIMAL(18,0)), c Nullable(DECIMAL(38,0)), d Nullable(DECIMAL(9,0))) ENGINE = Memory;
-    CREATE TABLE IF NOT EXISTS decimal2 AS decimal ENGINE = Memory;"
+
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE IF NOT EXISTS decimal  (a Nullable(DECIMAL(9,0)), b Nullable(DECIMAL(18,0)), c Nullable(DECIMAL(38,0)), d Nullable(DECIMAL(9,0))) ENGINE = Memory;"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE IF NOT EXISTS decimal2 AS decimal ENGINE = Memory;"
 # Empty table test
 # throws No data to insert
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal ORDER BY a, b, c, d  FORMAT Parquet;" > "${CLICKHOUSE_TMP}"/parquet_decimal3_1.parquet
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal ORDER BY a, b, c, d FORMAT Parquet;" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal2 FORMAT Parquet" 2> /dev/null
 echo nothing:
-${CLICKHOUSE_CLIENT} --query="
-    SELECT * FROM decimal2 ORDER BY a, b, c, d;
-    TRUNCATE TABLE decimal2;
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal2 ORDER BY a, b, c, d;"
+${CLICKHOUSE_CLIENT} --query="TRUNCATE TABLE decimal2;"
 
-    INSERT INTO decimal VALUES (Null, Null, Null, Null);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal VALUES (Null, Null, Null, Null)"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal ORDER BY a, b, c, d FORMAT Parquet;" > "${CLICKHOUSE_TMP}"/parquet_decimal3_2.parquet
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal ORDER BY a, b, c, d FORMAT Parquet;" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal2 FORMAT Parquet"
 echo nulls:
-${CLICKHOUSE_CLIENT} --query="
-    SELECT * FROM decimal2 ORDER BY a, b, c, d;
-    TRUNCATE TABLE decimal2;
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal2 ORDER BY a, b, c, d;"
+${CLICKHOUSE_CLIENT} --query="TRUNCATE TABLE decimal2;"
 
-    INSERT INTO decimal VALUES (1, Null, Null, Null);
-    INSERT INTO decimal VALUES (Null, 1, Null, Null);
-    INSERT INTO decimal VALUES (Null, Null, 1, Null);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal VALUES (1, Null, Null, Null)"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal VALUES (Null, 1, Null, Null)"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal VALUES (Null, Null, 1, Null)"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal ORDER BY a, b, c, d FORMAT Parquet;" > "${CLICKHOUSE_TMP}"/parquet_decimal3_3.parquet
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal ORDER BY a, b, c, d FORMAT Parquet;" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO decimal2 FORMAT Parquet"
 
-${CLICKHOUSE_CLIENT} --query="
-    SELECT 'full orig:';
-    SELECT * FROM decimal ORDER BY a, b, c, d;
-    SELECT 'full inserted:';
-    SELECT * FROM decimal2 ORDER BY a, b, c, d;"
+echo full orig:
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal ORDER BY a, b, c, d;"
+echo full inserted:
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal2 ORDER BY a, b, c, d;"
 
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal2 ORDER BY a, b, c, d;" > "${CLICKHOUSE_TMP}"/parquet_decimal3_1.dump
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM decimal2 ORDER BY a, b, c, d;" > "${CLICKHOUSE_TMP}"/parquet_decimal3_2.dump
 
 echo diff3:
 diff "${CLICKHOUSE_TMP}"/parquet_decimal3_1.dump "${CLICKHOUSE_TMP}"/parquet_decimal3_2.dump
-${CLICKHOUSE_CLIENT} --query="
-    DROP TABLE IF EXISTS decimal;
-    DROP TABLE IF EXISTS decimal2;"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS decimal;"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS decimal2;"
diff --git a/tests/queries/0_stateless/00900_long_parquet_load.sh b/tests/queries/0_stateless/00900_long_parquet_load.sh
index 0a7f10fe16d..97fee5e97ec 100755
--- a/tests/queries/0_stateless/00900_long_parquet_load.sh
+++ b/tests/queries/0_stateless/00900_long_parquet_load.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long, no-fasttest, no-debug, no-asan, no-msan, no-tsan
+# Tags: long, no-fasttest, no-debug
 
 #
 # Load all possible .parquet files found in submodules.
@@ -57,14 +57,14 @@ for NAME in $(find "$DATA_DIR"/*.parquet -print0 | xargs -0 -n 1 basename | LC_A
     # COLUMNS=`$CUR_DIR/00900_parquet_create_table_columns.py $JSON` 2>&1 || continue
     COLUMNS=$(cat "$COLUMNS_FILE") || continue
 
-    ${CLICKHOUSE_CLIENT} -n --query="
-        DROP TABLE IF EXISTS parquet_load;
-        CREATE TABLE parquet_load ($COLUMNS) ENGINE = Memory;"
+    ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_load"
+    $CLICKHOUSE_CLIENT --multiquery <<EOF
+CREATE TABLE parquet_load ($COLUMNS) ENGINE = Memory;
+EOF
 
     # Some files contain unsupported data structures, exception is ok.
     ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_load FORMAT Parquet" < "$DATA_DIR"/"$NAME" 2>&1 | sed 's/Exception/Ex---tion/'
 
-    ${CLICKHOUSE_CLIENT} -n --query="
-        SELECT * FROM parquet_load ORDER BY tuple(*) LIMIT 100;
-        DROP TABLE parquet_load;"
+    ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_load ORDER BY tuple(*) LIMIT 100"
+    ${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_load"
 done
diff --git a/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh b/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
index db14a3b1032..4e258911078 100755
--- a/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
+++ b/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
@@ -6,7 +6,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS maps"
-${CLICKHOUSE_CLIENT} <<EOF
+${CLICKHOUSE_CLIENT} --multiquery <<EOF
 CREATE TABLE maps (m1 Map(UInt32, UInt32), m2 Map(String, String), m3 Map(UInt32, Tuple(UInt32, UInt32)), m4 Map(UInt32, Array(UInt32)), m5 Array(Map(UInt32, UInt32)), m6 Tuple(Map(UInt32, UInt32), Map(String, String)), m7 Array(Map(UInt32, Array(Tuple(Map(UInt32, UInt32), Tuple(UInt32)))))) ENGINE=Memory();
 EOF
 
diff --git a/tests/queries/0_stateless/00906_low_cardinality_cache.sql b/tests/queries/0_stateless/00906_low_cardinality_cache.sql
index 337fba865fd..55eacd0db44 100644
--- a/tests/queries/0_stateless/00906_low_cardinality_cache.sql
+++ b/tests/queries/0_stateless/00906_low_cardinality_cache.sql
@@ -1,6 +1,3 @@
--- Tags: long
-
-SET max_rows_to_read = '100M';
 drop table if exists lc_00906;
 create table lc_00906 (b LowCardinality(String)) engine=MergeTree order by b SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
 insert into lc_00906 select '0123456789' from numbers(100000000);
diff --git a/tests/queries/0_stateless/00907_set_index_max_rows.sh b/tests/queries/0_stateless/00907_set_index_max_rows.sh
index bdd0f36346f..3707aaf2ca6 100755
--- a/tests/queries/0_stateless/00907_set_index_max_rows.sh
+++ b/tests/queries/0_stateless/00907_set_index_max_rows.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS set_idx;"
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 CREATE TABLE set_idx
 (
     u64 UInt64,
diff --git a/tests/queries/0_stateless/00908_bloom_filter_index.reference b/tests/queries/0_stateless/00908_bloom_filter_index.reference
index e2e13a9ed12..c0cbd6c0335 100644
--- a/tests/queries/0_stateless/00908_bloom_filter_index.reference
+++ b/tests/queries/0_stateless/00908_bloom_filter_index.reference
@@ -28,8 +28,6 @@
 		"rows_read": 3,
 8	aбвгдеёж
 		"rows_read": 2,
-13
-1
 1	column-oriented
 2	column-oriented
 		"rows_read": 4,
diff --git a/tests/queries/0_stateless/00908_bloom_filter_index.sh b/tests/queries/0_stateless/00908_bloom_filter_index.sh
index 3bd169dd6df..88fc7944236 100755
--- a/tests/queries/0_stateless/00908_bloom_filter_index.sh
+++ b/tests/queries/0_stateless/00908_bloom_filter_index.sh
@@ -12,7 +12,7 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS bloom_filter_idx3;"
 
 
 # NGRAM BF
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 CREATE TABLE bloom_filter_idx
 (
     k UInt64,
@@ -22,7 +22,7 @@ CREATE TABLE bloom_filter_idx
 ORDER BY k
 SETTINGS index_granularity = 2, index_granularity_bytes = '10Mi';"
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 CREATE TABLE bloom_filter_idx2
 (
     k UInt64,
@@ -103,13 +103,9 @@ $CLICKHOUSE_CLIENT --optimize_or_like_chain 0 --query="SELECT * FROM bloom_filte
 $CLICKHOUSE_CLIENT --optimize_or_like_chain 0 --query="SELECT * FROM bloom_filter_idx WHERE (s, lower(s)) IN (('aбвгдеёж', 'aбвгдеёж'), ('abc', 'cba')) ORDER BY k"
 $CLICKHOUSE_CLIENT --optimize_or_like_chain 0 --query="SELECT * FROM bloom_filter_idx WHERE (s, lower(s)) IN (('aбвгдеёж', 'aбвгдеёж'), ('abc', 'cba')) ORDER BY k FORMAT JSON" | grep "rows_read"
 
-# Weird conditions not supported by the index.
-$CLICKHOUSE_CLIENT --optimize_or_like_chain 0 --query="SELECT count() FROM bloom_filter_idx WHERE (s = 'asd') = (s = 'asd')"
-$CLICKHOUSE_CLIENT --optimize_or_like_chain 0 --query="SELECT count() FROM bloom_filter_idx WHERE has(['asd', 'some string'], s)"
-
 
 # TOKEN BF
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 CREATE TABLE bloom_filter_idx3
 (
     k UInt64,
@@ -147,7 +143,7 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE bloom_filter_idx2"
 $CLICKHOUSE_CLIENT --query="DROP TABLE bloom_filter_idx3"
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS bloom_filter_idx_na;"
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 CREATE TABLE bloom_filter_idx_na
 (
     na Array(Array(String)),
@@ -156,7 +152,7 @@ CREATE TABLE bloom_filter_idx_na
 ORDER BY na" 2>&1 | grep -c 'DB::Exception: Unexpected type Array(Array(String)) of bloom filter index'
 
 # NGRAM BF with IPv6
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 CREATE TABLE bloom_filter_ipv6_idx
 (
     foo IPv6,
diff --git a/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh b/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
index 152d5a847b7..d310a2c3612 100755
--- a/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
+++ b/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
@@ -13,5 +13,5 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # ${CURDIR}/00921_datetime64_compatibility.python
 
 python3 "${CURDIR}"/00921_datetime64_compatibility_long.python \
-    | ${CLICKHOUSE_CLIENT} --ignore-error -m --calculate_text_stack_trace 0 --log-level 'error' 2>&1 \
+    | ${CLICKHOUSE_CLIENT} --ignore-error -nm --calculate_text_stack_trace 0 --log-level 'error' 2>&1 \
     | grep -v -e 'Received exception .*$' -e '^(query: ' | sed 's/^\(Code: [0-9]\+\).*$/\1/g'
diff --git a/tests/queries/0_stateless/00927_disable_hyperscan.sql b/tests/queries/0_stateless/00927_disable_hyperscan.sql
index 24ec7a35adb..c07848a4fcc 100644
--- a/tests/queries/0_stateless/00927_disable_hyperscan.sql
+++ b/tests/queries/0_stateless/00927_disable_hyperscan.sql
@@ -1,4 +1,4 @@
--- Tags: no-fasttest
+-- Tags: no-debug
 
 SET allow_hyperscan = 1;
 
diff --git a/tests/queries/0_stateless/00937_format_schema_rows_template.sh b/tests/queries/0_stateless/00937_format_schema_rows_template.sh
index f020e15b2d7..0221527f9c9 100755
--- a/tests/queries/0_stateless/00937_format_schema_rows_template.sh
+++ b/tests/queries/0_stateless/00937_format_schema_rows_template.sh
@@ -23,7 +23,7 @@ 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 --query "SELECT * FROM template GROUP BY question, answer, likes, date WITH TOTALS ORDER BY date LIMIT 3 FORMAT Template SETTINGS \
+$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}"
@@ -38,7 +38,7 @@ 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 --query "SELECT * FROM template GROUP BY question, answer, likes, date WITH TOTALS ORDER BY date LIMIT 3 FORMAT Template SETTINGS \
+$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}', \
diff --git a/tests/queries/0_stateless/00940_max_parts_in_total.sql b/tests/queries/0_stateless/00940_max_parts_in_total.sql
index 955f593c907..e2633c2f0f8 100644
--- a/tests/queries/0_stateless/00940_max_parts_in_total.sql
+++ b/tests/queries/0_stateless/00940_max_parts_in_total.sql
@@ -1,7 +1,6 @@
 drop table if exists max_parts_in_total;
 create table max_parts_in_total (x UInt64) ENGINE = MergeTree PARTITION BY x ORDER BY x SETTINGS max_parts_in_total = 10;
 
-SET max_insert_threads = 1;
 INSERT INTO max_parts_in_total SELECT number FROM numbers(10);
 SELECT 1;
 INSERT INTO max_parts_in_total SELECT 123; -- { serverError TOO_MANY_PARTS }
diff --git a/tests/queries/0_stateless/00940_order_by_read_in_order_query_plan.sql b/tests/queries/0_stateless/00940_order_by_read_in_order_query_plan.sql
index 0421cadf868..532539206f7 100644
--- a/tests/queries/0_stateless/00940_order_by_read_in_order_query_plan.sql
+++ b/tests/queries/0_stateless/00940_order_by_read_in_order_query_plan.sql
@@ -1,4 +1,4 @@
-SET optimize_read_in_order = 1, query_plan_read_in_order = 1, enable_analyzer = 0;
+SET optimize_read_in_order = 1, query_plan_read_in_order = 1, allow_experimental_analyzer = 0;
 
 drop table if exists tab;
 drop table if exists tab2;
diff --git a/tests/queries/0_stateless/00942_mutate_index.sh b/tests/queries/0_stateless/00942_mutate_index.sh
index e1e23639e85..6ebb30c25b9 100755
--- a/tests/queries/0_stateless/00942_mutate_index.sh
+++ b/tests/queries/0_stateless/00942_mutate_index.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS minmax_idx;"
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 CREATE TABLE minmax_idx
 (
     u64 UInt64,
diff --git a/tests/queries/0_stateless/00943_materialize_index.sh b/tests/queries/0_stateless/00943_materialize_index.sh
index e4a585fce97..6ff7d34a9d7 100755
--- a/tests/queries/0_stateless/00943_materialize_index.sh
+++ b/tests/queries/0_stateless/00943_materialize_index.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS minmax_idx;"
 
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 CREATE TABLE minmax_idx
 (
     u64 UInt64,
@@ -34,7 +34,7 @@ $CLICKHOUSE_CLIENT --query="INSERT INTO minmax_idx VALUES
 $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="
+$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;"
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 a12536da239..4655077960f 100755
--- a/tests/queries/0_stateless/00944_clear_index_in_partition.sh
+++ b/tests/queries/0_stateless/00944_clear_index_in_partition.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS minmax_idx;"
 
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 CREATE TABLE minmax_idx
 (
     u64 UInt64,
diff --git a/tests/queries/0_stateless/00945_bloom_filter_index.reference b/tests/queries/0_stateless/00945_bloom_filter_index.reference
index 9d9b49b29c9..c0c2254648e 100644
--- a/tests/queries/0_stateless/00945_bloom_filter_index.reference
+++ b/tests/queries/0_stateless/00945_bloom_filter_index.reference
@@ -14,11 +14,6 @@
 0
 2
 2
-18
-100
-100
-3
-100
 1
 1
 1
@@ -227,5 +222,3 @@
 1	value1
 1	value2
 2	value3
-1
-1
diff --git a/tests/queries/0_stateless/00945_bloom_filter_index.sql b/tests/queries/0_stateless/00945_bloom_filter_index.sql
index 6e3819e74d3..4c26988574a 100644
--- a/tests/queries/0_stateless/00945_bloom_filter_index.sql
+++ b/tests/queries/0_stateless/00945_bloom_filter_index.sql
@@ -25,15 +25,6 @@ WITH ((1, 2), (2, 3)) AS liter_prepared_set SELECT COUNT() FROM single_column_bl
 WITH ((1, 1), (2, 2)) AS liter_prepared_set SELECT COUNT() FROM single_column_bloom_filter WHERE (i32, i64) IN liter_prepared_set SETTINGS max_rows_to_read = 6;
 WITH ((1, (1, 1)), (2, (2, 2))) AS liter_prepared_set SELECT COUNT() FROM single_column_bloom_filter WHERE (i64, (i64, i32)) IN liter_prepared_set SETTINGS max_rows_to_read = 6;
 
--- Check that indexHint() works (but it doesn't work with COUNT()).
-SELECT SUM(ignore(*) + 1) FROM single_column_bloom_filter WHERE indexHint(i32 in (3, 15, 50));
-
--- The index doesn't understand expressions like these, but it shouldn't break the query.
-SELECT COUNT() FROM single_column_bloom_filter WHERE (i32 = 200) = (i32 = 200);
-SELECT SUM(ignore(*) + 1) FROM single_column_bloom_filter WHERE indexHint((i32 = 200) != (i32 = 200));
-SELECT COUNT() FROM single_column_bloom_filter WHERE indexOf([10, 20, 30], i32) != 0;
-SELECT COUNT() FROM single_column_bloom_filter WHERE has([100, 200, 300], 200);
-
 DROP TABLE IF EXISTS single_column_bloom_filter;
 
 
@@ -374,10 +365,3 @@ SELECT id, ary[indexOf(ary, 'value2')] FROM test_bf_indexOf WHERE ary[indexOf(ar
 SELECT id, ary[indexOf(ary, 'value3')] FROM test_bf_indexOf WHERE ary[indexOf(ary, 'value3')] = 'value3' ORDER BY id FORMAT TSV;
 
 DROP TABLE IF EXISTS test_bf_indexOf;
-
--- Test for bug #65597
-DROP TABLE IF EXISTS test_bf_cast;
-CREATE TABLE test_bf_cast (c Int32, INDEX x1 (c) type bloom_filter) ENGINE = MergeTree ORDER BY c AS SELECT 1;
-SELECT count() FROM test_bf_cast WHERE cast(c = 1 OR c = 9999 AS Bool) SETTINGS use_skip_indexes=0;
-SELECT count() FROM test_bf_cast WHERE cast(c = 1 OR c = 9999 AS Bool) SETTINGS use_skip_indexes=1;
-DROP TABLE test_bf_cast;
diff --git a/tests/queries/0_stateless/00945_ml_test.sql b/tests/queries/0_stateless/00945_ml_test.sql
index c3a3a51b98c..299b550bceb 100644
--- a/tests/queries/0_stateless/00945_ml_test.sql
+++ b/tests/queries/0_stateless/00945_ml_test.sql
@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS defaults
     predict1 Float64,
     predict2 Float64
 ) ENGINE = Memory;
-insert into defaults values (1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2);
+insert into defaults values (1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2),(1,2,1,-1,-2),(-1,-2,-1,1,2)
 DROP TABLE IF EXISTS model;
 create table model engine = Memory as select stochasticLogisticRegressionState(0.1, 0.0, 1.0, 'SGD')(target, param1, param2) as state from defaults;
 
diff --git a/tests/queries/0_stateless/00946_ml_test.sql b/tests/queries/0_stateless/00946_ml_test.sql
index a3da3b7e5c7..b3f4941c2a7 100644
--- a/tests/queries/0_stateless/00946_ml_test.sql
+++ b/tests/queries/0_stateless/00946_ml_test.sql
@@ -18,7 +18,7 @@ CREATE TABLE IF NOT EXISTS defaults
     predict7 Float64
 
 ) ENGINE = Memory;
-insert into defaults values (1.76210664421617,1.7469706406568504,0.7988286239230257,1.0938642223599824,1.167321139201246,1.7648182796261376,0.909111664354187,0.92,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.6276564089897139,-0.06763531281107672,0.7988286239230257,0.5966532121963541,1.167321139201246,0.4551512643242912,0.909111664354187,0.76,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(-0.07046681268810527,-0.5625278455750569,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-1.0056311758200724,0.909111664354187,0.72,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.4531256035702591,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-1.0614543055744028,0.11933920911869125,0.909111664354187,0.8,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(-0.24499761810756004,-0.7274920231630502,-0.952028633990455,-1.3921908284581592,-0.5042604443804907,-0.6530285178541898,-1.0999748867047898,0.65,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(1.1512488252480781,1.2520781078928702,1.674257252879766,1.0938642223599824,-0.5042604443804907,1.244309594057455,0.909111664354187,0.9,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,0.6101272780073337,-0.6698191206144725,0.909111664354187,0.75,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(-0.7685900343659244,-1.057420378339037,-0.952028633990455,-0.3977688081309026,0.6101272780073337,-1.1735372034228724,-1.0999748867047898,0.68,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(-1.2921824506242887,-0.8924562007510436,-1.8274572629471952,-1.3921908284581592,-2.175842027962227,-1.0056311758200724,-1.0999748867047898,0.5,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.5403910062799865,0.09732886477691666,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.0018049897967303734,-1.0999748867047898,0.45,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.7149218116994412,-0.2325994903990701,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.3340070654088696,0.909111664354187,0.52,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.889452617118896,0.5922213975408968,0.7988286239230257,0.5966532121963541,1.167321139201246,0.6734291002079332,0.909111664354187,0.84,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.9767180198286235,0.7571855751288902,0.7988286239230257,0.5966532121963541,1.167321139201246,0.8413351278107333,0.909111664354187,0.78,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(-0.8558554370756518,0.26229304236491,-0.0766000050337147,0.5966532121963541,-0.5042604443804907,-1.0056311758200724,0.909111664354187,0.62,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(-0.5067938262367422,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,-1.618648166768315,-0.6698191206144725,0.909111664354187,0.61,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(-0.24499761810756004,-0.39756366798706344,-0.0766000050337147,0.09944220203272576,-1.0614543055744028,-0.5019130930116695,-1.0999748867047898,0.54,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(0.016798590021622126,-0.06763531281107672,-0.0766000050337147,0.5966532121963541,-0.5042604443804907,0.16971101739953035,-1.0999748867047898,0.66,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(0.1913293954410769,-0.2325994903990701,-0.0766000050337147,0.5966532121963541,-0.5042604443804907,-1.0056311758200724,0.909111664354187,0.65,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(0.10406399273134952,0.4272572199529034,-0.0766000050337147,0.5966532121963541,-0.5042604443804907,0.3376170450023333,-1.0999748867047898,0.63,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(-1.2049170479145614,-0.8924562007510436,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,-0.1661010378060696,-1.0999748867047898,0.62,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(-0.41952842352701486,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,-1.618648166768315,-1.1735372034228724,0.909111664354187,0.64,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(0.7149218116994412,1.087113930304877,0.7988286239230257,-0.3977688081309026,-1.618648166768315,-0.3340070654088696,-1.0999748867047898,0.7,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(0.9767180198286235,1.4170422854808635,1.674257252879766,1.5910752325236108,1.724515000395158,1.5129592382219361,0.909111664354187,0.94,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(1.5003104360869879,1.9119348182448437,1.674257252879766,1.5910752325236108,1.167321139201246,1.848771293427536,0.909111664354187,0.95,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(1.6748412415064426,1.9119348182448437,1.674257252879766,0.5966532121963541,0.052933416813421515,2.016677321030339,0.909111664354187,0.97,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(2.023902852345352,2.076898995832837,1.674257252879766,1.0938642223599824,1.167321139201246,1.680865265824736,0.909111664354187,0.94,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(0.4531256035702591,0.26229304236491,1.674257252879766,1.0938642223599824,0.052933416813421515,0.3376170450023333,-1.0999748867047898,0.76,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(-1.6412440614631982,-1.5523129111030172,-0.952028633990455,-1.8894018386217877,-1.0614543055744028,-1.8451613138340752,0.909111664354187,0.44,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(-1.9030402695923805,-2.377133799042984,-1.8274572629471952,-1.3921908284581592,-1.618648166768315,-2.348879396642477,-1.0999748867047898,0.46,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(-0.5940592289464697,-1.3873487335150236,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-2.180973369039677,-1.0999748867047898,0.54,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(-1.4667132560437435,-1.7172770886910105,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,-0.8377251482172725,0.909111664354187,0.65,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(0.889452617118896,-0.7274920231630502,-0.0766000050337147,0.5966532121963541,0.6101272780073337,-0.5019130930116695,0.909111664354187,0.74,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(1.8493720469258974,1.7469706406568504,0.7988286239230257,-0.3977688081309026,1.167321139201246,1.3450532106191362,0.909111664354187,0.91,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(2.023902852345352,1.087113930304877,1.674257252879766,0.5966532121963541,0.6101272780073337,1.680865265824736,0.909111664354187,0.9,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(1.2385142279578056,0.7571855751288902,1.674257252879766,0.5966532121963541,1.724515000395158,2.016677321030339,0.909111664354187,0.94,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(0.2785947981508043,0.4272572199529034,1.674257252879766,1.5910752325236108,1.724515000395158,1.0092411554135332,0.909111664354187,0.88,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(-1.553978658753471,-0.2325994903990701,-0.952028633990455,0.5966532121963541,0.6101272780073337,-0.3340070654088696,-1.0999748867047898,0.64,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(-1.4667132560437435,-0.39756366798706344,-1.8274572629471952,-2.386612848785416,-1.618648166768315,-1.3414432310256739,-1.0999748867047898,0.58,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(-1.117651645204834,-0.39756366798706344,-1.8274572629471952,-0.3977688081309026,-2.175842027962227,-1.8451613138340752,-1.0999748867047898,0.52,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(-0.8558554370756518,0.09732886477691666,-0.952028633990455,0.5966532121963541,0.052933416813421515,-1.5093492586284738,-1.0999748867047898,0.48,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(-0.7685900343659244,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,-1.0056311758200724,0.909111664354187,0.46,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(-0.07046681268810527,-0.39756366798706344,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6698191206144725,0.909111664354187,0.49,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(-0.3322630208172874,-0.06763531281107672,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-0.1661010378060696,0.909111664354187,0.53,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(1.3257796306675331,1.582006463068857,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.8413351278107333,-1.0999748867047898,0.87,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(0.8021872144091686,0.9221497527168835,1.674257252879766,1.0938642223599824,0.6101272780073337,1.3450532106191362,0.909111664354187,0.91,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(0.4531256035702591,0.4272572199529034,1.674257252879766,1.5910752325236108,0.6101272780073337,0.8413351278107333,0.909111664354187,0.88,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(1.0639834225383509,1.087113930304877,1.674257252879766,0.5966532121963541,1.724515000395158,1.1771471830163363,0.909111664354187,0.86,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(1.9366374496356247,1.9119348182448437,1.674257252879766,1.0938642223599824,0.6101272780073337,1.848771293427536,-1.0999748867047898,0.89,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(0.36586020086053167,0.4272572199529034,-0.0766000050337147,0.09944220203272576,1.724515000395158,0.42157005880373183,0.909111664354187,0.82,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(0.889452617118896,0.5922213975408968,0.7988286239230257,-0.3977688081309026,0.6101272780073337,-0.3340070654088696,0.909111664354187,0.78,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(-0.3322630208172874,-1.5523129111030172,-0.0766000050337147,-0.8949798182945309,1.167321139201246,-0.5019130930116695,0.909111664354187,0.76,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-0.41952842352701486,-1.2223845559270303,-0.952028633990455,-1.8894018386217877,0.052933416813421515,-1.1735372034228724,0.909111664354187,0.56,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(1.5003104360869879,1.4170422854808635,0.7988286239230257,0.5966532121963541,-0.5042604443804907,-1.0056311758200724,0.909111664354187,0.78,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(0.6276564089897139,0.7571855751288902,0.7988286239230257,0.5966532121963541,-1.0614543055744028,-0.8377251482172725,0.909111664354187,0.72,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(0.4531256035702591,0.4272572199529034,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-1.0056311758200724,-1.0999748867047898,0.7,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(0.2785947981508043,-0.7274920231630502,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-1.5093492586284738,-1.0999748867047898,0.64,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-0.07046681268810527,-0.8924562007510436,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,-2.013067341436875,-1.0999748867047898,0.64,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-1.6412440614631982,-1.3873487335150236,-0.952028633990455,0.5966532121963541,-1.618648166768315,-1.6772552862312753,-1.0999748867047898,0.46,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-1.4667132560437435,-1.3873487335150236,-1.8274572629471952,-0.3977688081309026,-1.618648166768315,-3.0205035070536796,0.909111664354187,0.36,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-0.5067938262367422,-0.5625278455750569,-0.952028633990455,-1.3921908284581592,-1.618648166768315,-0.5019130930116695,-1.0999748867047898,0.42,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-0.681324631656197,-1.2223845559270303,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,-0.8377251482172725,-1.0999748867047898,0.48,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-0.8558554370756518,-1.057420378339037,-0.0766000050337147,0.5966532121963541,-0.5042604443804907,-0.6698191206144725,-1.0999748867047898,0.47,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-1.117651645204834,-0.39756366798706344,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,-0.6698191206144725,0.909111664354187,0.54,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(-0.15773221539783266,-0.06763531281107672,-0.952028633990455,0.5966532121963541,-0.5042604443804907,-0.1661010378060696,0.909111664354187,0.56,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(0.7149218116994412,0.5922213975408968,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.16971101739953035,-1.0999748867047898,0.52,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(0.7149218116994412,0.7571855751288902,0.7988286239230257,0.09944220203272576,0.052933416813421515,0.5391042781256927,-1.0999748867047898,0.55,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(0.889452617118896,1.087113930304877,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,0.7070103057284927,-1.0999748867047898,0.61,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(-0.07046681268810527,-0.06763531281107672,-0.952028633990455,0.09944220203272576,0.052933416813421515,0.06896740083785215,0.909111664354187,0.57,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(0.10406399273134952,0.26229304236491,-0.0766000050337147,0.09944220203272576,0.6101272780073337,1.0428223609340956,0.909111664354187,0.68,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(0.9767180198286235,1.2520781078928702,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9420787443724145,0.909111664354187,0.78,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(1.3257796306675331,1.7469706406568504,1.674257252879766,1.5910752325236108,1.724515000395158,1.7480276768658578,0.909111664354187,0.94,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(1.6748412415064426,0.7571855751288902,1.674257252879766,1.5910752325236108,1.724515000395158,1.9495149099892173,0.909111664354187,0.96,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(0.36586020086053167,0.5922213975408968,1.674257252879766,1.5910752325236108,1.724515000395158,1.4290062244205346,0.909111664354187,0.93,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(-0.24499761810756004,0.09732886477691666,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.7405915112490521,0.909111664354187,0.84,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(-0.24499761810756004,-0.2325994903990701,-0.0766000050337147,-0.3977688081309026,1.724515000395158,0.5055230726051333,-1.0999748867047898,0.74,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(1.0639834225383509,1.087113930304877,-0.952028633990455,-1.3921908284581592,0.6101272780073337,-0.06535742124438843,0.909111664354187,0.72,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(0.889452617118896,0.7571855751288902,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,0.20329222292009272,0.909111664354187,0.74,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(-1.3794478533340162,-1.3873487335150236,-0.952028633990455,-0.3977688081309026,-1.618648166768315,-0.6362379150939101,-1.0999748867047898,0.64,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(-1.8157748668826532,-2.0472054438669973,-0.952028633990455,-0.3977688081309026,-1.618648166768315,-1.777998902792955,0.909111664354187,0.44,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(-1.990305672302108,-2.377133799042984,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-2.0802297524779956,-1.0999748867047898,0.46,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(-0.41952842352701486,-0.39756366798706344,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,-0.972049970299513,0.909111664354187,0.5,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(2.023902852345352,2.076898995832837,0.7988286239230257,1.5910752325236108,1.724515000395158,1.5129592382219361,0.909111664354187,0.96,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(0.2785947981508043,0.4272572199529034,1.674257252879766,1.5910752325236108,1.167321139201246,1.0428223609340956,0.909111664354187,0.92,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(0.4531256035702591,1.2520781078928702,1.674257252879766,0.5966532121963541,1.167321139201246,1.2778907995780144,0.909111664354187,0.92,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(2.023902852345352,1.2520781078928702,1.674257252879766,1.0938642223599824,1.167321139201246,1.4290062244205346,0.909111664354187,0.94,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(0.1913293954410769,-0.7274920231630502,0.7988286239230257,1.0938642223599824,0.052933416813421515,0.10254860635841155,-1.0999748867047898,0.76,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(-0.15773221539783266,-0.2325994903990701,-0.0766000050337147,1.0938642223599824,0.052933416813421515,-0.30042585988831016,-1.0999748867047898,0.72,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(0.016798590021622126,-0.06763531281107672,-0.952028633990455,0.09944220203272576,-0.5042604443804907,-0.535494298532232,-1.0999748867047898,0.66,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(-0.24499761810756004,0.09732886477691666,-0.0766000050337147,1.0938642223599824,0.052933416813421515,-0.7705627371761508,-1.0999748867047898,0.64,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(-0.07046681268810527,0.26229304236491,0.7988286239230257,1.0938642223599824,0.052933416813421515,0.27045463396121155,0.909111664354187,0.74,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(0.10406399273134952,-0.2325994903990701,-0.952028633990455,0.5966532121963541,0.6101272780073337,-1.139955997902313,0.909111664354187,0.64,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(-1.553978658753471,-1.7172770886910105,-0.0766000050337147,1.5910752325236108,0.052933416813421515,-1.5765116696695942,-1.0999748867047898,0.38,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(-1.6412440614631982,-1.5523129111030172,-0.952028633990455,0.5966532121963541,-0.5042604443804907,-0.9552593675392334,-1.0999748867047898,0.34,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(-1.3794478533340162,-1.7172770886910105,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,-1.2071184089434333,0.909111664354187,0.44,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(-1.2049170479145614,-1.3873487335150236,-0.0766000050337147,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898,0.36,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(-1.117651645204834,-1.2223845559270303,0.7988286239230257,-1.8894018386217877,-1.0614543055744028,-1.2742808199845537,-1.0999748867047898,0.42,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(-0.9431208397853792,-1.2223845559270303,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,-1.0056311758200724,-1.0999748867047898,0.48,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(1.2385142279578056,2.076898995832837,-0.0766000050337147,0.5966532121963541,0.6101272780073337,0.6062666891668145,0.909111664354187,0.86,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(1.3257796306675331,1.9119348182448437,0.7988286239230257,1.5910752325236108,1.167321139201246,1.076403566454655,0.909111664354187,0.9,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(0.5403910062799865,0.9221497527168835,-0.0766000050337147,0.5966532121963541,0.6101272780073337,0.47194186708457386,0.909111664354187,0.79,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(0.4531256035702591,-0.06763531281107672,-0.0766000050337147,0.09944220203272576,0.052933416813421515,-0.2332634488471884,0.909111664354187,0.71,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-0.41952842352701486,-0.39756366798706344,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,-0.8041439426967131,-1.0999748867047898,0.64,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-0.24499761810756004,-0.2325994903990701,-0.952028633990455,0.5966532121963541,0.052933416813421515,-0.585866106813071,-1.0999748867047898,0.62,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(0.016798590021622126,-0.5625278455750569,-0.952028633990455,1.0938642223599824,0.6101272780073337,-0.2164728460869087,-1.0999748867047898,0.57,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(0.8021872144091686,0.7571855751288902,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.7573821140093348,0.909111664354187,0.74,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-0.07046681268810527,0.4272572199529034,-0.0766000050337147,0.5966532121963541,1.167321139201246,0.30403583948177093,0.909111664354187,0.69,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,1.167321139201246,0.9756599498929738,0.909111664354187,0.87,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(1.8493720469258974,1.582006463068857,0.7988286239230257,0.09944220203272576,1.167321139201246,1.4457968271808173,0.909111664354187,0.91,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(1.2385142279578056,1.4170422854808635,1.674257252879766,1.5910752325236108,1.724515000395158,1.3114720050985766,0.909111664354187,0.93,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-1.117651645204834,-0.7274920231630502,1.674257252879766,1.5910752325236108,0.6101272780073337,0.06896740083785215,-1.0999748867047898,0.68,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-1.0303862424951067,0.09732886477691666,1.674257252879766,-0.3977688081309026,-0.5042604443804907,-0.199682243326629,-1.0999748867047898,0.61,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(0.36586020086053167,0.26229304236491,0.7988286239230257,0.5966532121963541,0.6101272780073337,0.13612981187897094,0.909111664354187,0.69,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-1.3794478533340162,-0.06763531281107672,-0.0766000050337147,0.09944220203272576,0.052933416813421515,-0.4347506819705508,0.909111664354187,0.62,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(0.2785947981508043,0.4272572199529034,-0.952028633990455,0.5966532121963541,0.052933416813421515,-0.06535742124438843,-1.0999748867047898,0.72,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-0.5067938262367422,-0.39756366798706344,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,-0.2500540516074711,0.909111664354187,0.59,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-0.5940592289464697,-0.2325994903990701,0.7988286239230257,1.0938642223599824,1.167321139201246,0.7405915112490521,0.909111664354187,0.66,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-1.553978658753471,-0.8924562007510436,-0.0766000050337147,0.5966532121963541,0.052933416813421515,0.03538619531728977,-1.0999748867047898,0.56,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-2.3393672831410175,-0.5625278455750569,0.7988286239230257,-1.3921908284581592,-1.0614543055744028,-1.9123237248751956,-1.0999748867047898,0.45,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-1.8157748668826532,-1.3873487335150236,-0.952028633990455,-0.3977688081309026,0.052933416813421515,-2.214554574560236,-1.0999748867047898,0.47,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(0.889452617118896,-0.5625278455750569,1.674257252879766,-0.3977688081309026,0.052933416813421515,0.4047794560434521,0.909111664354187,0.71,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,1.6137028547836172,0.909111664354187,0.94,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(1.5003104360869879,1.9119348182448437,1.674257252879766,1.0938642223599824,1.167321139201246,1.4793780327013768,0.909111664354187,0.94,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-0.5940592289464697,-0.2325994903990701,0.7988286239230257,-1.8894018386217877,-1.0614543055744028,-0.40116947644999135,-1.0999748867047898,0.57,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-0.7685900343659244,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.052933416813421515,-0.6362379150939101,-1.0999748867047898,0.61,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-1.3794478533340162,-0.2325994903990701,0.7988286239230257,-0.8949798182945309,-0.5042604443804907,-0.2164728460869087,-1.0999748867047898,0.57,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.10254860635841155,0.909111664354187,0.64,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(0.5403910062799865,0.9221497527168835,-0.0766000050337147,0.5966532121963541,-0.5042604443804907,1.2107283885368956,0.909111664354187,0.85,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(0.1913293954410769,0.7571855751288902,-0.0766000050337147,-0.8949798182945309,-1.618648166768315,0.18650162015981303,0.909111664354187,0.78,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(0.8021872144091686,0.7571855751288902,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.8413351278107333,0.909111664354187,0.84,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(1.4130450333772604,1.7469706406568504,1.674257252879766,1.5910752325236108,1.724515000395158,1.2611001968177347,0.909111664354187,0.92,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(1.9366374496356247,1.087113930304877,1.674257252879766,0.5966532121963541,1.167321139201246,1.9495149099892173,0.909111664354187,0.96,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(-1.2049170479145614,-0.39756366798706344,1.674257252879766,1.5910752325236108,1.167321139201246,0.08575800359813185,-1.0999748867047898,0.77,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(-0.681324631656197,-0.39756366798706344,1.674257252879766,0.09944220203272576,0.052933416813421515,-0.06535742124438843,-1.0999748867047898,0.71,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(0.5403910062799865,0.7571855751288902,1.674257252879766,0.5966532121963541,1.167321139201246,0.30403583948177093,-1.0999748867047898,0.79,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(1.4130450333772604,0.9221497527168835,1.674257252879766,0.5966532121963541,0.6101272780073337,1.1435659774957738,0.909111664354187,0.89,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(-0.24499761810756004,0.26229304236491,0.7988286239230257,0.09944220203272576,0.6101272780073337,0.2872452367214912,0.909111664354187,0.82,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,1.5910752325236108,0.6101272780073337,-0.2500540516074711,-1.0999748867047898,0.76,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(-0.07046681268810527,-1.2223845559270303,-0.952028633990455,-1.8894018386217877,-0.5042604443804907,-0.7369815316555913,0.909111664354187,0.71,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(0.8021872144091686,1.4170422854808635,-0.952028633990455,1.0938642223599824,-0.5042604443804907,0.8077539222901738,0.909111664354187,0.8,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(0.10406399273134952,0.26229304236491,-1.8274572629471952,0.09944220203272576,0.052933416813421515,0.8749163333312926,-1.0999748867047898,0.78,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(1.0639834225383509,0.4272572199529034,-0.952028633990455,0.5966532121963541,-0.5042604443804907,0.9252881416121347,0.909111664354187,0.84,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(1.3257796306675331,1.7469706406568504,-0.952028633990455,1.0938642223599824,0.052933416813421515,1.2778907995780144,0.909111664354187,0.9,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(1.2385142279578056,1.2520781078928702,1.674257252879766,0.5966532121963541,0.052933416813421515,1.412215621660255,0.909111664354187,0.92,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(2.023902852345352,2.076898995832837,0.7988286239230257,1.0938642223599824,0.6101272780073337,2.2181645541536983,0.909111664354187,0.97,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(0.7149218116994412,0.7571855751288902,-0.952028633990455,-0.3977688081309026,0.052933416813421515,0.6062666891668145,0.909111664354187,0.8,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(0.2785947981508043,0.9221497527168835,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,0.06896740083785215,0.909111664354187,0.81,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(-0.15773221539783266,-0.39756366798706344,-0.0766000050337147,-1.3921908284581592,-1.0614543055744028,-0.199682243326629,-1.0999748867047898,0.75,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(0.8021872144091686,1.087113930304877,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,0.8581257305710129,0.909111664354187,0.83,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(1.9366374496356247,1.4170422854808635,0.7988286239230257,0.5966532121963541,0.052933416813421515,2.016677321030339,0.909111664354187,0.96,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(-0.5067938262367422,-0.2325994903990701,-0.952028633990455,0.09944220203272576,-0.5042604443804907,-0.5690755040527913,0.909111664354187,0.79,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(1.5003104360869879,1.087113930304877,0.7988286239230257,0.5966532121963541,0.6101272780073337,1.3954250188999753,0.909111664354187,0.93,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(1.3257796306675331,1.4170422854808635,1.674257252879766,1.5910752325236108,1.724515000395158,1.1435659774957738,0.909111664354187,0.94,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(0.36586020086053167,0.7571855751288902,1.674257252879766,1.5910752325236108,1.724515000395158,0.7741727167696144,0.909111664354187,0.86,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(0.6276564089897139,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.6101272780073337,0.25366403120093184,-1.0999748867047898,0.79,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(0.8021872144091686,0.09732886477691666,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.4887324698448536,-1.0999748867047898,0.8,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(-0.41952842352701486,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,0.15292041463925066,-1.0999748867047898,0.77,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(-0.15773221539783266,-0.39756366798706344,-0.0766000050337147,-1.3921908284581592,-1.0614543055744028,-0.4347506819705508,-1.0999748867047898,0.7,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(-0.681324631656197,-0.5625278455750569,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.5690755040527913,-1.0999748867047898,0.65,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(-0.9431208397853792,-0.2325994903990701,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.7705627371761508,-1.0999748867047898,0.61,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(-1.7285094641729257,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.1735372034228724,-1.0999748867047898,0.52,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(-0.15773221539783266,-0.7274920231630502,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.2406996144639928,-1.0999748867047898,0.57,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(-1.6412440614631982,-1.3873487335150236,-1.8274572629471952,-1.8894018386217877,-0.5042604443804907,-1.9123237248751956,-1.0999748867047898,0.53,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(0.10406399273134952,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.1661010378060696,-1.0999748867047898,0.67,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(0.016798590021622126,-0.39756366798706344,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,-0.06535742124438843,-1.0999748867047898,0.68,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.690219702968213,0.909111664354187,0.81,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(0.4531256035702591,0.4272572199529034,1.674257252879766,1.0938642223599824,0.6101272780073337,0.6230572919270941,-1.0999748867047898,0.78,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(-1.2921824506242887,-0.8924562007510436,-0.0766000050337147,0.09944220203272576,1.724515000395158,-0.45154128473083044,-1.0999748867047898,0.65,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(-0.3322630208172874,-0.8924562007510436,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,-0.5522849012925116,-1.0999748867047898,0.64,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(-2.0775710750118352,-1.7172770886910105,-0.952028633990455,-1.3921908284581592,0.6101272780073337,-1.3414432310256739,0.909111664354187,0.64,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(-0.5067938262367422,-1.3873487335150236,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,-1.0392123813406318,-1.0999748867047898,0.65,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(-0.41952842352701486,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-0.9384687647789537,0.909111664354187,0.68,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(1.5003104360869879,1.582006463068857,1.674257252879766,0.5966532121963541,1.167321139201246,0.7909633195298942,0.909111664354187,0.89,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(0.4531256035702591,0.4272572199529034,0.7988286239230257,0.5966532121963541,1.724515000395158,0.8917069360915754,0.909111664354187,0.86,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(0.5403910062799865,0.9221497527168835,0.7988286239230257,0.5966532121963541,1.167321139201246,1.0596129636943752,0.909111664354187,0.89,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(0.36586020086053167,0.5922213975408968,0.7988286239230257,0.5966532121963541,0.6101272780073337,0.6230572919270941,0.909111664354187,0.87,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(0.2785947981508043,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.052933416813421515,0.4551512643242912,0.909111664354187,0.85,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(1.0639834225383509,1.9119348182448437,0.7988286239230257,1.0938642223599824,1.167321139201246,0.9420787443724145,0.909111664354187,0.9,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(0.1913293954410769,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,-1.0999748867047898,0.82,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(-0.681324631656197,0.09732886477691666,-0.0766000050337147,-0.8949798182945309,-0.5042604443804907,-0.8041439426967131,-1.0999748867047898,0.72,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(-0.8558554370756518,-0.8924562007510436,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.5522849012925116,-1.0999748867047898,0.73,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(-1.4667132560437435,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,-0.7369815316555913,-1.0999748867047898,0.71,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(-1.0303862424951067,-0.06763531281107672,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.30042585988831016,-1.0999748867047898,0.71,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(-1.553978658753471,-1.2223845559270303,-0.952028633990455,-0.3977688081309026,0.052933416813421515,-1.2071184089434333,-1.0999748867047898,0.68,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(-0.24499761810756004,0.4272572199529034,-0.0766000050337147,0.5966532121963541,0.6101272780073337,0.3376170450023333,-1.0999748867047898,0.75,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(-0.07046681268810527,-0.2325994903990701,-0.952028633990455,-0.8949798182945309,0.6101272780073337,-0.46833188749111015,-1.0999748867047898,0.72,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(0.889452617118896,0.9221497527168835,0.7988286239230257,1.0938642223599824,1.167321139201246,0.8581257305710129,0.909111664354187,0.89,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(0.016798590021622126,-0.06763531281107672,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.13612981187897094,0.909111664354187,0.84,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(1.5875758387967152,1.7469706406568504,1.674257252879766,1.0938642223599824,0.052933416813421515,1.412215621660255,0.909111664354187,0.93,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(1.2385142279578056,1.2520781078928702,1.674257252879766,1.0938642223599824,0.052933416813421515,1.2778907995780144,0.909111664354187,0.93,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(0.6276564089897139,0.7571855751288902,1.674257252879766,1.5910752325236108,1.724515000395158,0.8077539222901738,0.909111664354187,0.88,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(0.6276564089897139,0.5922213975408968,1.674257252879766,1.0938642223599824,0.6101272780073337,0.9420787443724145,0.909111664354187,0.9,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(0.5403910062799865,0.4272572199529034,1.674257252879766,0.5966532121963541,1.724515000395158,0.6398478946873739,0.909111664354187,0.87,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(0.4531256035702591,1.087113930304877,1.674257252879766,1.0938642223599824,0.6101272780073337,0.572685483646252,0.909111664354187,0.86,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(1.6748412415064426,1.7469706406568504,1.674257252879766,1.0938642223599824,1.724515000395158,1.5633310465027752,0.909111664354187,0.94,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(-0.07046681268810527,0.26229304236491,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.27045463396121155,-1.0999748867047898,0.77,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(-0.8558554370756518,-0.06763531281107672,-0.952028633990455,-0.3977688081309026,0.052933416813421515,-0.1325198322855102,0.909111664354187,0.78,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(-0.9431208397853792,-0.39756366798706344,-0.952028633990455,-0.3977688081309026,-1.0614543055744028,-0.5690755040527913,-1.0999748867047898,0.73,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(-0.5940592289464697,-0.2325994903990701,-0.952028633990455,0.09944220203272576,-1.0614543055744028,-0.45154128473083044,-1.0999748867047898,0.73,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(-0.5067938262367422,-0.5625278455750569,-0.0766000050337147,1.0938642223599824,1.167321139201246,-0.2836352571280305,-1.0999748867047898,0.7,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(-0.3322630208172874,-0.06763531281107672,-0.0766000050337147,0.5966532121963541,1.167321139201246,0.15292041463925066,-1.0999748867047898,0.72,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(0.016798590021622126,-0.7274920231630502,-0.0766000050337147,-0.8949798182945309,-0.5042604443804907,-0.0989386267649508,0.909111664354187,0.73,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(-0.15773221539783266,0.4272572199529034,-0.952028633990455,0.09944220203272576,-0.5042604443804907,-0.2332634488471884,0.909111664354187,0.72,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(2.023902852345352,2.076898995832837,1.674257252879766,1.0938642223599824,1.167321139201246,2.2013739513934185,0.909111664354187,0.97,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(1.5003104360869879,2.076898995832837,1.674257252879766,0.5966532121963541,1.724515000395158,2.1342115403522968,0.909111664354187,0.97,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(-1.6412440614631982,-0.39756366798706344,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.0989386267649508,-1.0999748867047898,0.69,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(-1.9030402695923805,-1.3873487335150236,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,-1.5933022724298738,-1.0999748867047898,0.57,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(-0.15773221539783266,-1.3873487335150236,-0.952028633990455,0.09944220203272576,-0.5042604443804907,-1.1903278061831537,-1.0999748867047898,0.63,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(-0.5940592289464697,-0.8924562007510436,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.972049970299513,0.909111664354187,0.66,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(-1.0303862424951067,-0.2325994903990701,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,-0.7369815316555913,-1.0999748867047898,0.64,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(-1.3794478533340162,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.8041439426967131,0.909111664354187,0.68,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(0.7149218116994412,0.09732886477691666,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.7741727167696144,0.909111664354187,0.79,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(0.9767180198286235,0.4272572199529034,0.7988286239230257,1.5910752325236108,0.6101272780073337,0.908497538851855,0.909111664354187,0.82,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(1.8493720469258974,2.076898995832837,0.7988286239230257,1.5910752325236108,1.724515000395158,1.7816088823864173,0.909111664354187,0.95,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(1.4130450333772604,1.9119348182448437,1.674257252879766,1.5910752325236108,1.167321139201246,1.9830961155097766,0.909111664354187,0.96,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(1.2385142279578056,1.582006463068857,0.7988286239230257,1.0938642223599824,1.724515000395158,1.3786344161396955,0.909111664354187,0.94,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(1.1512488252480781,1.4170422854808635,1.674257252879766,1.5910752325236108,1.167321139201246,1.2778907995780144,0.909111664354187,0.93,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(0.4531256035702591,0.7571855751288902,0.7988286239230257,1.0938642223599824,1.167321139201246,1.1099847719752143,0.909111664354187,0.91,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(0.36586020086053167,0.26229304236491,0.7988286239230257,0.5966532121963541,0.6101272780073337,0.8917069360915754,0.909111664354187,0.85,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(0.6276564089897139,0.4272572199529034,0.7988286239230257,-0.3977688081309026,0.052933416813421515,0.6230572919270941,0.909111664354187,0.84,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(-0.41952842352701486,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.052933416813421515,-0.30042585988831016,-1.0999748867047898,0.74,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(-0.3322630208172874,-0.7274920231630502,-0.0766000050337147,0.5966532121963541,0.6101272780073337,0.25366403120093184,-1.0999748867047898,0.76,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(-0.07046681268810527,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.06535742124438843,-1.0999748867047898,0.75,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(0.6276564089897139,0.9221497527168835,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.32082644224205065,-1.0999748867047898,0.76,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(-0.7685900343659244,0.26229304236491,-0.952028633990455,-0.3977688081309026,0.6101272780073337,-0.2500540516074711,-1.0999748867047898,0.71,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(-1.0303862424951067,-0.39756366798706344,-0.952028633990455,-0.3977688081309026,-1.618648166768315,-0.6194473123336305,-1.0999748867047898,0.67,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(-1.8157748668826532,-1.3873487335150236,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.9552593675392334,-1.0999748867047898,0.61,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(-0.9431208397853792,0.4272572199529034,-0.952028633990455,0.09944220203272576,0.6101272780073337,-0.2500540516074711,-1.0999748867047898,0.63,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(-0.41952842352701486,0.4272572199529034,-0.952028633990455,0.09944220203272576,-0.5042604443804907,-0.1157292295252305,-1.0999748867047898,0.64,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(0.10406399273134952,0.7571855751288902,-0.0766000050337147,0.5966532121963541,0.052933416813421515,0.11933920911869125,-1.0999748867047898,0.71,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(0.6276564089897139,0.5922213975408968,0.7988286239230257,-0.3977688081309026,-0.5042604443804907,0.690219702968213,0.909111664354187,0.82,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(-0.3322630208172874,-0.5625278455750569,-0.0766000050337147,0.5966532121963541,1.167321139201246,0.08575800359813185,-1.0999748867047898,0.73,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(0.1913293954410769,-0.2325994903990701,-0.0766000050337147,0.09944220203272576,-1.0614543055744028,-0.45154128473083044,0.909111664354187,0.74,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(-0.41952842352701486,-0.06763531281107672,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-0.5522849012925116,-1.0999748867047898,0.69,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(-1.117651645204834,-1.2223845559270303,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-0.8880969564981116,-1.0999748867047898,0.64,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(1.1512488252480781,0.9221497527168835,1.674257252879766,1.5910752325236108,0.6101272780073337,1.1939377857766158,0.909111664354187,0.91,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(0.8021872144091686,0.5922213975408968,1.674257252879766,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187,0.88,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(0.7149218116994412,0.7571855751288902,0.7988286239230257,0.5966532121963541,1.167321139201246,0.9588693471326941,0.909111664354187,0.85,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(1.0639834225383509,1.087113930304877,1.674257252879766,1.0938642223599824,1.724515000395158,0.9924505526532535,0.909111664354187,0.86,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(-0.5940592289464697,-0.5625278455750569,-0.0766000050337147,-1.3921908284581592,0.052933416813421515,-0.3843788736897117,-1.0999748867047898,0.7,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(-1.553978658753471,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.1903278061831537,-1.0999748867047898,0.59,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(-1.8157748668826532,-1.057420378339037,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-1.5429304641490347,-1.0999748867047898,0.6,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(0.016798590021622126,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-0.753772134415871,-1.0999748867047898,0.65,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(0.6276564089897139,1.2520781078928702,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.27045463396121155,0.909111664354187,0.7,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(0.7149218116994412,1.087113930304877,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.7405915112490521,0.909111664354187,0.76,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(-0.24499761810756004,-0.06763531281107672,-0.952028633990455,-0.8949798182945309,0.6101272780073337,-0.06535742124438843,-1.0999748867047898,0.63,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(0.9767180198286235,0.4272572199529034,0.7988286239230257,0.5966532121963541,-1.0614543055744028,0.7070103057284927,0.909111664354187,0.81,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(-0.07046681268810527,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.22008282568037243,-1.0999748867047898,0.72,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(-0.5067938262367422,-0.5625278455750569,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-0.199682243326629,-1.0999748867047898,0.71,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4551512643242912,0.909111664354187,0.8,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.36586020086053167,0.5922213975408968,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.3879888532831724,0.909111664354187,0.77,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.2785947981508043,-0.5625278455750569,-0.0766000050337147,-0.3977688081309026,-1.0614543055744028,-0.04856681848410872,0.909111664354187,0.74,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(-0.07046681268810527,-1.3873487335150236,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,0.6734291002079332,-1.0999748867047898,0.7,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.10406399273134952,-1.2223845559270303,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-0.0989386267649508,0.909111664354187,0.71,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(1.5875758387967152,1.2520781078928702,0.7988286239230257,1.0938642223599824,1.167321139201246,1.8151900879069767,0.909111664354187,0.93,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.36586020086053167,1.087113930304877,0.7988286239230257,0.5966532121963541,1.724515000395158,0.8749163333312926,-1.0999748867047898,0.85,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(-0.8558554370756518,0.4272572199529034,0.7988286239230257,0.5966532121963541,1.167321139201246,-0.3843788736897117,-1.0999748867047898,0.79,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(-0.681324631656197,-1.3873487335150236,-0.0766000050337147,0.5966532121963541,0.6101272780073337,-0.06535742124438843,-1.0999748867047898,0.76,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.6276564089897139,-1.2223845559270303,-0.0766000050337147,0.5966532121963541,1.724515000395158,0.06896740083785215,0.909111664354187,0.78,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.8021872144091686,-0.8924562007510436,0.7988286239230257,1.5910752325236108,1.724515000395158,0.27045463396121155,0.909111664354187,0.77,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(1.2385142279578056,1.9119348182448437,0.7988286239230257,1.5910752325236108,1.167321139201246,1.244309594057455,0.909111664354187,0.9,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(0.889452617118896,0.09732886477691666,1.674257252879766,1.5910752325236108,0.052933416813421515,0.8917069360915754,0.909111664354187,0.87,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-0.41952842352701486,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.8545157509775522,-1.0999748867047898,0.71,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-0.7685900343659244,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,0.6101272780073337,-0.40116947644999135,0.909111664354187,0.7,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(0.6276564089897139,0.5922213975408968,-0.0766000050337147,-0.8949798182945309,-2.175842027962227,0.32082644224205065,0.909111664354187,0.7,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(0.7149218116994412,0.4272572199529034,-0.952028633990455,-0.3977688081309026,-1.0614543055744028,0.27045463396121155,0.909111664354187,0.75,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-0.3322630208172874,-0.8924562007510436,-0.0766000050337147,-0.8949798182945309,-1.0614543055744028,0.13612981187897094,-1.0999748867047898,0.71,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-0.41952842352701486,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.2500540516074711,-1.0999748867047898,0.72,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-0.24499761810756004,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.7201909288953117,0.909111664354187,0.73,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(0.889452617118896,0.9221497527168835,0.7988286239230257,1.0938642223599824,1.724515000395158,0.908497538851855,-1.0999748867047898,0.83,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-0.7685900343659244,0.09732886477691666,0.7988286239230257,1.0938642223599824,1.724515000395158,-0.4347506819705508,-1.0999748867047898,0.77,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-0.9431208397853792,-0.39756366798706344,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,-0.6362379150939101,0.909111664354187,0.72,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-1.553978658753471,-1.8822412662790038,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.2406996144639928,-1.0999748867047898,0.54,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-1.990305672302108,-2.0472054438669973,-1.8274572629471952,-1.8894018386217877,-2.175842027962227,-1.610092875190155,-1.0999748867047898,0.49,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(-0.41952842352701486,-1.3873487335150236,-1.8274572629471952,-2.386612848785416,-2.175842027962227,-0.9888405730597928,0.909111664354187,0.52,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(-0.15773221539783266,-1.2223845559270303,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.0895841896214724,-1.0999748867047898,0.58,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(0.4531256035702591,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.6062666891668145,0.909111664354187,0.78,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(1.0639834225383509,0.9221497527168835,1.674257252879766,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187,0.89,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(0.2785947981508043,-1.057420378339037,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,0.03538619531728977,-1.0999748867047898,0.7,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(-0.7685900343659244,-0.7274920231630502,-0.952028633990455,-0.3977688081309026,0.052933416813421515,-0.1828916405663493,-1.0999748867047898,0.66,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(-1.117651645204834,-0.8924562007510436,-0.952028633990455,-0.3977688081309026,0.6101272780073337,0.22008282568037243,-1.0999748867047898,0.67,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(-0.5067938262367422,-0.8924562007510436,-0.0766000050337147,1.0938642223599824,0.6101272780073337,0.06896740083785215,0.909111664354187,0.68,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(0.016798590021622126,0.4272572199529034,-0.0766000050337147,0.5966532121963541,1.167321139201246,0.8581257305710129,0.909111664354187,0.8,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(-0.41952842352701486,-0.2325994903990701,-0.0766000050337147,0.5966532121963541,0.052933416813421515,0.32082644224205065,0.909111664354187,0.81,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(0.36586020086053167,0.5922213975408968,-0.0766000050337147,-0.8949798182945309,-0.5042604443804907,0.5055230726051333,0.909111664354187,0.8,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(2.023902852345352,0.7571855751288902,0.7988286239230257,1.5910752325236108,1.167321139201246,1.7816088823864173,0.909111664354187,0.94,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(1.2385142279578056,1.4170422854808635,1.674257252879766,0.5966532121963541,0.6101272780073337,1.1099847719752143,0.909111664354187,0.93,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(1.6748412415064426,1.7469706406568504,1.674257252879766,1.0938642223599824,0.6101272780073337,0.9924505526532535,0.909111664354187,0.92,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(0.6276564089897139,1.087113930304877,1.674257252879766,1.5910752325236108,1.167321139201246,0.8077539222901738,0.909111664354187,0.89,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(-0.24499761810756004,-0.5625278455750569,0.7988286239230257,1.5910752325236108,1.724515000395158,0.7070103057284927,-1.0999748867047898,0.82,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(-0.3322630208172874,0.26229304236491,-0.0766000050337147,0.5966532121963541,0.052933416813421515,0.6734291002079332,-1.0999748867047898,0.79,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,-1.5933022724298738,-1.0999748867047898,0.58,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(-1.4667132560437435,-0.8924562007510436,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.223909011703713,-1.0999748867047898,0.56,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(-1.2921824506242887,-1.3873487335150236,-0.952028633990455,-2.386612848785416,-1.618648166768315,-1.056002984100913,-1.0999748867047898,0.56,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(-0.41952842352701486,-1.5523129111030172,-1.8274572629471952,0.09944220203272576,-0.5042604443804907,-0.7034003261350319,0.909111664354187,0.64,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(-0.07046681268810527,-1.057420378339037,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-0.46833188749111015,0.909111664354187,0.61,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(0.016798590021622126,-1.2223845559270303,-0.952028633990455,-0.3977688081309026,-1.0614543055744028,-0.04856681848410872,-1.0999748867047898,0.68,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(-0.5940592289464697,-0.06763531281107672,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.11933920911869125,-1.0999748867047898,0.76,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(0.2785947981508043,2.076898995832837,-0.0766000050337147,0.5966532121963541,1.167321139201246,0.8581257305710129,-1.0999748867047898,0.86,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(1.1512488252480781,1.087113930304877,-0.0766000050337147,1.0938642223599824,1.167321139201246,1.076403566454655,0.909111664354187,0.9,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(-1.0303862424951067,0.7571855751288902,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.08575800359813185,-1.0999748867047898,0.71,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(-0.681324631656197,-0.2325994903990701,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-1.0056311758200724,-1.0999748867047898,0.62,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(0.1913293954410769,0.09732886477691666,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,0.27045463396121155,-1.0999748867047898,0.66,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(0.4531256035702591,-0.39756366798706344,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,-0.2500540516074711,0.909111664354187,0.65,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(0.5403910062799865,-0.06763531281107672,-0.0766000050337147,0.09944220203272576,0.052933416813421515,-0.08214802400466813,0.909111664354187,0.73,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(-0.3322630208172874,-0.2325994903990701,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-0.2836352571280305,-1.0999748867047898,0.62,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(0.36586020086053167,0.26229304236491,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.3376170450023333,0.909111664354187,0.74,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(0.5403910062799865,0.4272572199529034,-0.0766000050337147,0.5966532121963541,0.052933416813421515,0.8413351278107333,0.909111664354187,0.79,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(0.7149218116994412,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.6101272780073337,0.6734291002079332,0.909111664354187,0.8,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(-0.41952842352701486,0.09732886477691666,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,-0.1157292295252305,-1.0999748867047898,0.69,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(-0.7685900343659244,0.4272572199529034,0.7988286239230257,0.09944220203272576,-0.5042604443804907,0.0018049897967303734,-1.0999748867047898,0.7,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(0.2785947981508043,-0.5625278455750569,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.23687342844065212,0.909111664354187,0.76,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(0.9767180198286235,0.09732886477691666,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9756599498929738,0.909111664354187,0.84,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(-0.5067938262367422,-0.06763531281107672,0.7988286239230257,1.0938642223599824,1.167321139201246,0.6734291002079332,0.909111664354187,0.78,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(-1.3794478533340162,-1.2223845559270303,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,-0.9384687647789537,-1.0999748867047898,0.67,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(-1.0303862424951067,-0.39756366798706344,-0.952028633990455,-0.3977688081309026,0.6101272780073337,-0.7873533399364304,-1.0999748867047898,0.66,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(-0.7685900343659244,-0.5625278455750569,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,-0.8880969564981116,-1.0999748867047898,0.65,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(-1.6412440614631982,-1.057420378339037,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.2406996144639928,-1.0999748867047898,0.54,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(-1.4667132560437435,-1.3873487335150236,-1.8274572629471952,-2.386612848785416,-1.0614543055744028,-0.9888405730597928,-1.0999748867047898,0.58,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(0.6276564089897139,0.5922213975408968,-0.0766000050337147,-0.8949798182945309,-1.618648166768315,0.3376170450023333,0.909111664354187,0.79,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(0.889452617118896,0.9221497527168835,0.7988286239230257,0.09944220203272576,-0.5042604443804907,0.15292041463925066,0.909111664354187,0.8,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(0.016798590021622126,-0.2325994903990701,-0.0766000050337147,0.5966532121963541,0.052933416813421515,-0.1661010378060696,0.909111664354187,0.75,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(0.5403910062799865,-0.5625278455750569,-0.0766000050337147,0.5966532121963541,0.6101272780073337,-0.2668446543677508,0.909111664354187,0.73,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(-0.24499761810756004,-0.06763531281107672,-0.952028633990455,-0.8949798182945309,0.6101272780073337,-0.5522849012925116,-1.0999748867047898,0.72,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(-1.0303862424951067,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.7034003261350319,-1.0999748867047898,0.62,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(-0.15773221539783266,-0.5625278455750569,-0.0766000050337147,-0.3977688081309026,-1.0614543055744028,-0.45154128473083044,-1.0999748867047898,0.67,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(0.8021872144091686,1.4170422854808635,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.908497538851855,0.909111664354187,0.81,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(-1.553978658753471,-1.2223845559270303,-0.0766000050337147,-1.3921908284581592,-1.618648166768315,-0.972049970299513,-1.0999748867047898,0.63,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(-1.9030402695923805,-1.057420378339037,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.2406996144639928,-1.0999748867047898,0.69,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(0.6276564089897139,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.2872452367214912,0.909111664354187,0.8,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-2.175842027962227,-1.1903278061831537,-1.0999748867047898,0.43,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(0.889452617118896,0.9221497527168835,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.10254860635841155,0.909111664354187,0.8,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(-0.5067938262367422,-0.39756366798706344,-0.952028633990455,-0.3977688081309026,-1.618648166768315,-0.8041439426967131,0.909111664354187,0.73,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(-0.7685900343659244,-0.2325994903990701,-0.0766000050337147,0.09944220203272576,-1.0614543055744028,-0.6530285178541898,0.909111664354187,0.75,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(0.1913293954410769,0.09732886477691666,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.0989386267649508,0.909111664354187,0.71,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(-0.41952842352701486,-0.06763531281107672,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.08575800359813185,0.909111664354187,0.73,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(0.7149218116994412,0.5922213975408968,0.7988286239230257,0.5966532121963541,1.167321139201246,0.8581257305710129,0.909111664354187,0.83,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(0.1913293954410769,0.4272572199529034,-0.0766000050337147,-0.3977688081309026,-1.0614543055744028,0.32082644224205065,-1.0999748867047898,0.72,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(1.3257796306675331,1.7469706406568504,1.674257252879766,1.5910752325236108,1.724515000395158,1.462587429941097,0.909111664354187,0.94,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(0.5403910062799865,0.09732886477691666,1.674257252879766,0.5966532121963541,0.6101272780073337,0.23687342844065212,0.909111664354187,0.81,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(0.6276564089897139,-0.06763531281107672,1.674257252879766,0.09944220203272576,0.6101272780073337,0.10254860635841155,0.909111664354187,0.81,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(-0.41952842352701486,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.2332634488471884,0.909111664354187,0.75,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(0.8021872144091686,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.27045463396121155,0.909111664354187,0.79,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(-0.7685900343659244,-0.2325994903990701,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.6026567095733507,-1.0999748867047898,0.58,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(-1.0303862424951067,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-0.7873533399364304,-1.0999748867047898,0.59,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(-1.9030402695923805,-1.8822412662790038,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-2.1138109579985565,-1.0999748867047898,0.47,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(-0.07046681268810527,-1.5523129111030172,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.9626955331560363,-1.0999748867047898,0.49,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(-1.117651645204834,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.610092875190155,-1.0999748867047898,0.47,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(-1.553978658753471,-2.2121696214549904,-1.8274572629471952,-2.386612848785416,-2.7330358891561395,-2.1138109579985565,-1.0999748867047898,0.42,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(-1.2921824506242887,-1.3873487335150236,-1.8274572629471952,-1.3921908284581592,-1.618648166768315,-2.2649263828410766,-1.0999748867047898,0.57,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(-0.3322630208172874,-1.057420378339037,-0.0766000050337147,-0.8949798182945309,-0.5042604443804907,-0.9384687647789537,-1.0999748867047898,0.62,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(0.10406399273134952,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5522849012925116,0.909111664354187,0.74,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(0.7149218116994412,0.4272572199529034,0.7988286239230257,0.09944220203272576,0.6101272780073337,0.11933920911869125,0.909111664354187,0.73,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(-1.2049170479145614,-1.2223845559270303,-0.952028633990455,-0.3977688081309026,0.052933416813421515,-0.9048875592583913,0.909111664354187,0.64,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(-1.4667132560437435,-0.8924562007510436,-0.0766000050337147,0.09944220203272576,-1.0614543055744028,-0.7201909288953117,-1.0999748867047898,0.63,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(-1.7285094641729257,-1.5523129111030172,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,-1.5597210669093144,-1.0999748867047898,0.59,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(0.016798590021622126,-0.2325994903990701,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8041439426967131,-1.0999748867047898,0.73,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(0.889452617118896,0.26229304236491,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.2872452367214912,0.909111664354187,0.79,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(-1.3794478533340162,-0.5625278455750569,-0.952028633990455,0.09944220203272576,0.052933416813421515,-1.1903278061831537,0.909111664354187,0.68,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(-0.24499761810756004,-0.39756366798706344,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.610092875190155,-1.0999748867047898,0.7,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(0.36586020086053167,-0.06763531281107672,-0.952028633990455,-1.3921908284581592,-2.175842027962227,-0.2668446543677508,-1.0999748867047898,0.81,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(0.4531256035702591,0.4272572199529034,-0.0766000050337147,0.5966532121963541,1.724515000395158,0.06896740083785215,0.909111664354187,0.85,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(1.5003104360869879,1.4170422854808635,0.7988286239230257,0.5966532121963541,0.052933416813421515,1.580121649263055,0.909111664354187,0.93,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(1.8493720469258974,1.2520781078928702,1.674257252879766,1.0938642223599824,1.724515000395158,1.0596129636943752,0.909111664354187,0.91,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(-0.9431208397853792,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,-0.40116947644999135,-1.0999748867047898,0.69,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(-0.3322630208172874,-0.8924562007510436,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.5055230726051333,0.909111664354187,0.77,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(1.1512488252480781,1.087113930304877,0.7988286239230257,1.0938642223599824,-0.5042604443804907,0.9588693471326941,0.909111664354187,0.86,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(0.2785947981508043,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,1.167321139201246,-0.4347506819705508,0.909111664354187,0.74,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(-0.5067938262367422,-1.5523129111030172,-1.8274572629471952,-2.386612848785416,-1.0614543055744028,-1.9123237248751956,-1.0999748867047898,0.57,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(-1.6412440614631982,-2.5420979766309775,-1.8274572629471952,-1.3921908284581592,-1.618648166768315,-1.2071184089434333,-1.0999748867047898,0.51,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(-1.3794478533340162,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-0.5042604443804907,-0.9552593675392334,0.909111664354187,0.67,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187);
+insert into defaults values (1.76210664421617,1.7469706406568504,0.7988286239230257,1.0938642223599824,1.167321139201246,1.7648182796261376,0.909111664354187,0.92,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.6276564089897139,-0.06763531281107672,0.7988286239230257,0.5966532121963541,1.167321139201246,0.4551512643242912,0.909111664354187,0.76,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(-0.07046681268810527,-0.5625278455750569,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-1.0056311758200724,0.909111664354187,0.72,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.4531256035702591,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-1.0614543055744028,0.11933920911869125,0.909111664354187,0.8,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(-0.24499761810756004,-0.7274920231630502,-0.952028633990455,-1.3921908284581592,-0.5042604443804907,-0.6530285178541898,-1.0999748867047898,0.65,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(1.1512488252480781,1.2520781078928702,1.674257252879766,1.0938642223599824,-0.5042604443804907,1.244309594057455,0.909111664354187,0.9,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,0.6101272780073337,-0.6698191206144725,0.909111664354187,0.75,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(-0.7685900343659244,-1.057420378339037,-0.952028633990455,-0.3977688081309026,0.6101272780073337,-1.1735372034228724,-1.0999748867047898,0.68,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(-1.2921824506242887,-0.8924562007510436,-1.8274572629471952,-1.3921908284581592,-2.175842027962227,-1.0056311758200724,-1.0999748867047898,0.5,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.5403910062799865,0.09732886477691666,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.0018049897967303734,-1.0999748867047898,0.45,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.7149218116994412,-0.2325994903990701,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.3340070654088696,0.909111664354187,0.52,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.889452617118896,0.5922213975408968,0.7988286239230257,0.5966532121963541,1.167321139201246,0.6734291002079332,0.909111664354187,0.84,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.9767180198286235,0.7571855751288902,0.7988286239230257,0.5966532121963541,1.167321139201246,0.8413351278107333,0.909111664354187,0.78,-0.5940592289464697,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(-0.8558554370756518,0.26229304236491,-0.0766000050337147,0.5966532121963541,-0.5042604443804907,-1.0056311758200724,0.909111664354187,0.62,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(-0.5067938262367422,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,-1.618648166768315,-0.6698191206144725,0.909111664354187,0.61,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(-0.24499761810756004,-0.39756366798706344,-0.0766000050337147,0.09944220203272576,-1.0614543055744028,-0.5019130930116695,-1.0999748867047898,0.54,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(0.016798590021622126,-0.06763531281107672,-0.0766000050337147,0.5966532121963541,-0.5042604443804907,0.16971101739953035,-1.0999748867047898,0.66,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(0.1913293954410769,-0.2325994903990701,-0.0766000050337147,0.5966532121963541,-0.5042604443804907,-1.0056311758200724,0.909111664354187,0.65,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(0.10406399273134952,0.4272572199529034,-0.0766000050337147,0.5966532121963541,-0.5042604443804907,0.3376170450023333,-1.0999748867047898,0.63,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(-1.2049170479145614,-0.8924562007510436,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,-0.1661010378060696,-1.0999748867047898,0.62,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(-0.41952842352701486,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,-1.618648166768315,-1.1735372034228724,0.909111664354187,0.64,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(0.7149218116994412,1.087113930304877,0.7988286239230257,-0.3977688081309026,-1.618648166768315,-0.3340070654088696,-1.0999748867047898,0.7,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(0.9767180198286235,1.4170422854808635,1.674257252879766,1.5910752325236108,1.724515000395158,1.5129592382219361,0.909111664354187,0.94,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(1.5003104360869879,1.9119348182448437,1.674257252879766,1.5910752325236108,1.167321139201246,1.848771293427536,0.909111664354187,0.95,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(1.6748412415064426,1.9119348182448437,1.674257252879766,0.5966532121963541,0.052933416813421515,2.016677321030339,0.909111664354187,0.97,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,1.0428223609340956,0.909111664354187),(2.023902852345352,2.076898995832837,1.674257252879766,1.0938642223599824,1.167321139201246,1.680865265824736,0.909111664354187,0.94,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(0.4531256035702591,0.26229304236491,1.674257252879766,1.0938642223599824,0.052933416813421515,0.3376170450023333,-1.0999748867047898,0.76,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(-1.6412440614631982,-1.5523129111030172,-0.952028633990455,-1.8894018386217877,-1.0614543055744028,-1.8451613138340752,0.909111664354187,0.44,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(-1.9030402695923805,-2.377133799042984,-1.8274572629471952,-1.3921908284581592,-1.618648166768315,-2.348879396642477,-1.0999748867047898,0.46,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(-0.5940592289464697,-1.3873487335150236,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-2.180973369039677,-1.0999748867047898,0.54,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(-1.4667132560437435,-1.7172770886910105,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,-0.8377251482172725,0.909111664354187,0.65,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(0.889452617118896,-0.7274920231630502,-0.0766000050337147,0.5966532121963541,0.6101272780073337,-0.5019130930116695,0.909111664354187,0.74,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(1.8493720469258974,1.7469706406568504,0.7988286239230257,-0.3977688081309026,1.167321139201246,1.3450532106191362,0.909111664354187,0.91,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(2.023902852345352,1.087113930304877,1.674257252879766,0.5966532121963541,0.6101272780073337,1.680865265824736,0.909111664354187,0.9,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(1.2385142279578056,0.7571855751288902,1.674257252879766,0.5966532121963541,1.724515000395158,2.016677321030339,0.909111664354187,0.94,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(0.2785947981508043,0.4272572199529034,1.674257252879766,1.5910752325236108,1.724515000395158,1.0092411554135332,0.909111664354187,0.88,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(-1.553978658753471,-0.2325994903990701,-0.952028633990455,0.5966532121963541,0.6101272780073337,-0.3340070654088696,-1.0999748867047898,0.64,1.6748412415064426,1.9119348182448437,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.7144464713452956,0.909111664354187),(-1.4667132560437435,-0.39756366798706344,-1.8274572629471952,-2.386612848785416,-1.618648166768315,-1.3414432310256739,-1.0999748867047898,0.58,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(-1.117651645204834,-0.39756366798706344,-1.8274572629471952,-0.3977688081309026,-2.175842027962227,-1.8451613138340752,-1.0999748867047898,0.52,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(-0.8558554370756518,0.09732886477691666,-0.952028633990455,0.5966532121963541,0.052933416813421515,-1.5093492586284738,-1.0999748867047898,0.48,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(-0.7685900343659244,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,-1.0056311758200724,0.909111664354187,0.46,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(-0.07046681268810527,-0.39756366798706344,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.6698191206144725,0.909111664354187,0.49,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(-0.3322630208172874,-0.06763531281107672,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-0.1661010378060696,0.909111664354187,0.53,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(1.3257796306675331,1.582006463068857,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.8413351278107333,-1.0999748867047898,0.87,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(0.8021872144091686,0.9221497527168835,1.674257252879766,1.0938642223599824,0.6101272780073337,1.3450532106191362,0.909111664354187,0.91,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(0.4531256035702591,0.4272572199529034,1.674257252879766,1.5910752325236108,0.6101272780073337,0.8413351278107333,0.909111664354187,0.88,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(1.0639834225383509,1.087113930304877,1.674257252879766,0.5966532121963541,1.724515000395158,1.1771471830163363,0.909111664354187,0.86,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(1.9366374496356247,1.9119348182448437,1.674257252879766,1.0938642223599824,0.6101272780073337,1.848771293427536,-1.0999748867047898,0.89,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(0.36586020086053167,0.4272572199529034,-0.0766000050337147,0.09944220203272576,1.724515000395158,0.42157005880373183,0.909111664354187,0.82,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(0.889452617118896,0.5922213975408968,0.7988286239230257,-0.3977688081309026,0.6101272780073337,-0.3340070654088696,0.909111664354187,0.78,0.36586020086053167,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.0989386267649508,0.909111664354187),(-0.3322630208172874,-1.5523129111030172,-0.0766000050337147,-0.8949798182945309,1.167321139201246,-0.5019130930116695,0.909111664354187,0.76,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-0.41952842352701486,-1.2223845559270303,-0.952028633990455,-1.8894018386217877,0.052933416813421515,-1.1735372034228724,0.909111664354187,0.56,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(1.5003104360869879,1.4170422854808635,0.7988286239230257,0.5966532121963541,-0.5042604443804907,-1.0056311758200724,0.909111664354187,0.78,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(0.6276564089897139,0.7571855751288902,0.7988286239230257,0.5966532121963541,-1.0614543055744028,-0.8377251482172725,0.909111664354187,0.72,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(0.4531256035702591,0.4272572199529034,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-1.0056311758200724,-1.0999748867047898,0.7,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(0.2785947981508043,-0.7274920231630502,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-1.5093492586284738,-1.0999748867047898,0.64,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-0.07046681268810527,-0.8924562007510436,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,-2.013067341436875,-1.0999748867047898,0.64,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-1.6412440614631982,-1.3873487335150236,-0.952028633990455,0.5966532121963541,-1.618648166768315,-1.6772552862312753,-1.0999748867047898,0.46,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-1.4667132560437435,-1.3873487335150236,-1.8274572629471952,-0.3977688081309026,-1.618648166768315,-3.0205035070536796,0.909111664354187,0.36,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-0.5067938262367422,-0.5625278455750569,-0.952028633990455,-1.3921908284581592,-1.618648166768315,-0.5019130930116695,-1.0999748867047898,0.42,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-0.681324631656197,-1.2223845559270303,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,-0.8377251482172725,-1.0999748867047898,0.48,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-0.8558554370756518,-1.057420378339037,-0.0766000050337147,0.5966532121963541,-0.5042604443804907,-0.6698191206144725,-1.0999748867047898,0.47,-0.15773221539783266,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-1.117651645204834,-0.39756366798706344,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,-0.6698191206144725,0.909111664354187,0.54,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(-0.15773221539783266,-0.06763531281107672,-0.952028633990455,0.5966532121963541,-0.5042604443804907,-0.1661010378060696,0.909111664354187,0.56,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(0.7149218116994412,0.5922213975408968,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.16971101739953035,-1.0999748867047898,0.52,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(0.7149218116994412,0.7571855751288902,0.7988286239230257,0.09944220203272576,0.052933416813421515,0.5391042781256927,-1.0999748867047898,0.55,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(0.889452617118896,1.087113930304877,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,0.7070103057284927,-1.0999748867047898,0.61,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(-0.07046681268810527,-0.06763531281107672,-0.952028633990455,0.09944220203272576,0.052933416813421515,0.06896740083785215,0.909111664354187,0.57,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(0.10406399273134952,0.26229304236491,-0.0766000050337147,0.09944220203272576,0.6101272780073337,1.0428223609340956,0.909111664354187,0.68,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(0.9767180198286235,1.2520781078928702,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9420787443724145,0.909111664354187,0.78,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(1.3257796306675331,1.7469706406568504,1.674257252879766,1.5910752325236108,1.724515000395158,1.7480276768658578,0.909111664354187,0.94,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(1.6748412415064426,0.7571855751288902,1.674257252879766,1.5910752325236108,1.724515000395158,1.9495149099892173,0.909111664354187,0.96,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(0.36586020086053167,0.5922213975408968,1.674257252879766,1.5910752325236108,1.724515000395158,1.4290062244205346,0.909111664354187,0.93,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(-0.24499761810756004,0.09732886477691666,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.7405915112490521,0.909111664354187,0.84,-1.117651645204834,-1.057420378339037,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898),(-0.24499761810756004,-0.2325994903990701,-0.0766000050337147,-0.3977688081309026,1.724515000395158,0.5055230726051333,-1.0999748867047898,0.74,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(1.0639834225383509,1.087113930304877,-0.952028633990455,-1.3921908284581592,0.6101272780073337,-0.06535742124438843,0.909111664354187,0.72,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(0.889452617118896,0.7571855751288902,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,0.20329222292009272,0.909111664354187,0.74,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(-1.3794478533340162,-1.3873487335150236,-0.952028633990455,-0.3977688081309026,-1.618648166768315,-0.6362379150939101,-1.0999748867047898,0.64,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(-1.8157748668826532,-2.0472054438669973,-0.952028633990455,-0.3977688081309026,-1.618648166768315,-1.777998902792955,0.909111664354187,0.44,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(-1.990305672302108,-2.377133799042984,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-2.0802297524779956,-1.0999748867047898,0.46,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(-0.41952842352701486,-0.39756366798706344,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,-0.972049970299513,0.909111664354187,0.5,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(2.023902852345352,2.076898995832837,0.7988286239230257,1.5910752325236108,1.724515000395158,1.5129592382219361,0.909111664354187,0.96,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(0.2785947981508043,0.4272572199529034,1.674257252879766,1.5910752325236108,1.167321139201246,1.0428223609340956,0.909111664354187,0.92,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(0.4531256035702591,1.2520781078928702,1.674257252879766,0.5966532121963541,1.167321139201246,1.2778907995780144,0.909111664354187,0.92,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(2.023902852345352,1.2520781078928702,1.674257252879766,1.0938642223599824,1.167321139201246,1.4290062244205346,0.909111664354187,0.94,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(0.1913293954410769,-0.7274920231630502,0.7988286239230257,1.0938642223599824,0.052933416813421515,0.10254860635841155,-1.0999748867047898,0.76,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(-0.15773221539783266,-0.2325994903990701,-0.0766000050337147,1.0938642223599824,0.052933416813421515,-0.30042585988831016,-1.0999748867047898,0.72,-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.9626955331560363,-1.0999748867047898),(0.016798590021622126,-0.06763531281107672,-0.952028633990455,0.09944220203272576,-0.5042604443804907,-0.535494298532232,-1.0999748867047898,0.66,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(-0.24499761810756004,0.09732886477691666,-0.0766000050337147,1.0938642223599824,0.052933416813421515,-0.7705627371761508,-1.0999748867047898,0.64,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(-0.07046681268810527,0.26229304236491,0.7988286239230257,1.0938642223599824,0.052933416813421515,0.27045463396121155,0.909111664354187,0.74,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(0.10406399273134952,-0.2325994903990701,-0.952028633990455,0.5966532121963541,0.6101272780073337,-1.139955997902313,0.909111664354187,0.64,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(-1.553978658753471,-1.7172770886910105,-0.0766000050337147,1.5910752325236108,0.052933416813421515,-1.5765116696695942,-1.0999748867047898,0.38,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(-1.6412440614631982,-1.5523129111030172,-0.952028633990455,0.5966532121963541,-0.5042604443804907,-0.9552593675392334,-1.0999748867047898,0.34,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(-1.3794478533340162,-1.7172770886910105,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,-1.2071184089434333,0.909111664354187,0.44,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(-1.2049170479145614,-1.3873487335150236,-0.0766000050337147,-1.3921908284581592,-1.0614543055744028,-1.5765116696695942,-1.0999748867047898,0.36,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(-1.117651645204834,-1.2223845559270303,0.7988286239230257,-1.8894018386217877,-1.0614543055744028,-1.2742808199845537,-1.0999748867047898,0.42,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(-0.9431208397853792,-1.2223845559270303,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,-1.0056311758200724,-1.0999748867047898,0.48,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(1.2385142279578056,2.076898995832837,-0.0766000050337147,0.5966532121963541,0.6101272780073337,0.6062666891668145,0.909111664354187,0.86,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(1.3257796306675331,1.9119348182448437,0.7988286239230257,1.5910752325236108,1.167321139201246,1.076403566454655,0.909111664354187,0.9,-2.3393672831410175,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.7444176972723957,-1.0999748867047898),(0.5403910062799865,0.9221497527168835,-0.0766000050337147,0.5966532121963541,0.6101272780073337,0.47194186708457386,0.909111664354187,0.79,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(0.4531256035702591,-0.06763531281107672,-0.0766000050337147,0.09944220203272576,0.052933416813421515,-0.2332634488471884,0.909111664354187,0.71,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-0.41952842352701486,-0.39756366798706344,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,-0.8041439426967131,-1.0999748867047898,0.64,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-0.24499761810756004,-0.2325994903990701,-0.952028633990455,0.5966532121963541,0.052933416813421515,-0.585866106813071,-1.0999748867047898,0.62,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(0.016798590021622126,-0.5625278455750569,-0.952028633990455,1.0938642223599824,0.6101272780073337,-0.2164728460869087,-1.0999748867047898,0.57,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(0.8021872144091686,0.7571855751288902,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.7573821140093348,0.909111664354187,0.74,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-0.07046681268810527,0.4272572199529034,-0.0766000050337147,0.5966532121963541,1.167321139201246,0.30403583948177093,0.909111664354187,0.69,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,1.167321139201246,0.9756599498929738,0.909111664354187,0.87,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(1.8493720469258974,1.582006463068857,0.7988286239230257,0.09944220203272576,1.167321139201246,1.4457968271808173,0.909111664354187,0.91,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(1.2385142279578056,1.4170422854808635,1.674257252879766,1.5910752325236108,1.724515000395158,1.3114720050985766,0.909111664354187,0.93,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-1.117651645204834,-0.7274920231630502,1.674257252879766,1.5910752325236108,0.6101272780073337,0.06896740083785215,-1.0999748867047898,0.68,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(-1.0303862424951067,0.09732886477691666,1.674257252879766,-0.3977688081309026,-0.5042604443804907,-0.199682243326629,-1.0999748867047898,0.61,-1.2049170479145614,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.5933022724298738,-1.0999748867047898),(0.36586020086053167,0.26229304236491,0.7988286239230257,0.5966532121963541,0.6101272780073337,0.13612981187897094,0.909111664354187,0.69,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-1.3794478533340162,-0.06763531281107672,-0.0766000050337147,0.09944220203272576,0.052933416813421515,-0.4347506819705508,0.909111664354187,0.62,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(0.2785947981508043,0.4272572199529034,-0.952028633990455,0.5966532121963541,0.052933416813421515,-0.06535742124438843,-1.0999748867047898,0.72,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-0.5067938262367422,-0.39756366798706344,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,-0.2500540516074711,0.909111664354187,0.59,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-0.5940592289464697,-0.2325994903990701,0.7988286239230257,1.0938642223599824,1.167321139201246,0.7405915112490521,0.909111664354187,0.66,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-1.553978658753471,-0.8924562007510436,-0.0766000050337147,0.5966532121963541,0.052933416813421515,0.03538619531728977,-1.0999748867047898,0.56,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-2.3393672831410175,-0.5625278455750569,0.7988286239230257,-1.3921908284581592,-1.0614543055744028,-1.9123237248751956,-1.0999748867047898,0.45,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-1.8157748668826532,-1.3873487335150236,-0.952028633990455,-0.3977688081309026,0.052933416813421515,-2.214554574560236,-1.0999748867047898,0.47,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(0.889452617118896,-0.5625278455750569,1.674257252879766,-0.3977688081309026,0.052933416813421515,0.4047794560434521,0.909111664354187,0.71,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,1.6137028547836172,0.909111664354187,0.94,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(1.5003104360869879,1.9119348182448437,1.674257252879766,1.0938642223599824,1.167321139201246,1.4793780327013768,0.909111664354187,0.94,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-0.5940592289464697,-0.2325994903990701,0.7988286239230257,-1.8894018386217877,-1.0614543055744028,-0.40116947644999135,-1.0999748867047898,0.57,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-0.7685900343659244,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.052933416813421515,-0.6362379150939101,-1.0999748867047898,0.61,-0.5067938262367422,-1.3873487335150236,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-0.2836352571280305,0.909111664354187),(-1.3794478533340162,-0.2325994903990701,0.7988286239230257,-0.8949798182945309,-0.5042604443804907,-0.2164728460869087,-1.0999748867047898,0.57,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.10254860635841155,0.909111664354187,0.64,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(0.5403910062799865,0.9221497527168835,-0.0766000050337147,0.5966532121963541,-0.5042604443804907,1.2107283885368956,0.909111664354187,0.85,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(0.1913293954410769,0.7571855751288902,-0.0766000050337147,-0.8949798182945309,-1.618648166768315,0.18650162015981303,0.909111664354187,0.78,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(0.8021872144091686,0.7571855751288902,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.8413351278107333,0.909111664354187,0.84,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(1.4130450333772604,1.7469706406568504,1.674257252879766,1.5910752325236108,1.724515000395158,1.2611001968177347,0.909111664354187,0.92,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(1.9366374496356247,1.087113930304877,1.674257252879766,0.5966532121963541,1.167321139201246,1.9495149099892173,0.909111664354187,0.96,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(-1.2049170479145614,-0.39756366798706344,1.674257252879766,1.5910752325236108,1.167321139201246,0.08575800359813185,-1.0999748867047898,0.77,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(-0.681324631656197,-0.39756366798706344,1.674257252879766,0.09944220203272576,0.052933416813421515,-0.06535742124438843,-1.0999748867047898,0.71,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(0.5403910062799865,0.7571855751288902,1.674257252879766,0.5966532121963541,1.167321139201246,0.30403583948177093,-1.0999748867047898,0.79,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(1.4130450333772604,0.9221497527168835,1.674257252879766,0.5966532121963541,0.6101272780073337,1.1435659774957738,0.909111664354187,0.89,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(-0.24499761810756004,0.26229304236491,0.7988286239230257,0.09944220203272576,0.6101272780073337,0.2872452367214912,0.909111664354187,0.82,0.4531256035702591,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4047794560434521,0.909111664354187),(-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,1.5910752325236108,0.6101272780073337,-0.2500540516074711,-1.0999748867047898,0.76,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(-0.07046681268810527,-1.2223845559270303,-0.952028633990455,-1.8894018386217877,-0.5042604443804907,-0.7369815316555913,0.909111664354187,0.71,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(0.8021872144091686,1.4170422854808635,-0.952028633990455,1.0938642223599824,-0.5042604443804907,0.8077539222901738,0.909111664354187,0.8,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(0.10406399273134952,0.26229304236491,-1.8274572629471952,0.09944220203272576,0.052933416813421515,0.8749163333312926,-1.0999748867047898,0.78,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(1.0639834225383509,0.4272572199529034,-0.952028633990455,0.5966532121963541,-0.5042604443804907,0.9252881416121347,0.909111664354187,0.84,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(1.3257796306675331,1.7469706406568504,-0.952028633990455,1.0938642223599824,0.052933416813421515,1.2778907995780144,0.909111664354187,0.9,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(1.2385142279578056,1.2520781078928702,1.674257252879766,0.5966532121963541,0.052933416813421515,1.412215621660255,0.909111664354187,0.92,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(2.023902852345352,2.076898995832837,0.7988286239230257,1.0938642223599824,0.6101272780073337,2.2181645541536983,0.909111664354187,0.97,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(0.7149218116994412,0.7571855751288902,-0.952028633990455,-0.3977688081309026,0.052933416813421515,0.6062666891668145,0.909111664354187,0.8,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(0.2785947981508043,0.9221497527168835,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,0.06896740083785215,0.909111664354187,0.81,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(-0.15773221539783266,-0.39756366798706344,-0.0766000050337147,-1.3921908284581592,-1.0614543055744028,-0.199682243326629,-1.0999748867047898,0.75,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(0.8021872144091686,1.087113930304877,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,0.8581257305710129,0.909111664354187,0.83,0.1913293954410769,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.11933920911869125,0.909111664354187),(1.9366374496356247,1.4170422854808635,0.7988286239230257,0.5966532121963541,0.052933416813421515,2.016677321030339,0.909111664354187,0.96,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(-0.5067938262367422,-0.2325994903990701,-0.952028633990455,0.09944220203272576,-0.5042604443804907,-0.5690755040527913,0.909111664354187,0.79,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(1.5003104360869879,1.087113930304877,0.7988286239230257,0.5966532121963541,0.6101272780073337,1.3954250188999753,0.909111664354187,0.93,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(1.3257796306675331,1.4170422854808635,1.674257252879766,1.5910752325236108,1.724515000395158,1.1435659774957738,0.909111664354187,0.94,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(0.36586020086053167,0.7571855751288902,1.674257252879766,1.5910752325236108,1.724515000395158,0.7741727167696144,0.909111664354187,0.86,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(0.6276564089897139,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.6101272780073337,0.25366403120093184,-1.0999748867047898,0.79,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(0.8021872144091686,0.09732886477691666,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.4887324698448536,-1.0999748867047898,0.8,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(-0.41952842352701486,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,0.15292041463925066,-1.0999748867047898,0.77,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(-0.15773221539783266,-0.39756366798706344,-0.0766000050337147,-1.3921908284581592,-1.0614543055744028,-0.4347506819705508,-1.0999748867047898,0.7,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(-0.681324631656197,-0.5625278455750569,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.5690755040527913,-1.0999748867047898,0.65,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(-0.9431208397853792,-0.2325994903990701,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.7705627371761508,-1.0999748867047898,0.61,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(-1.7285094641729257,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.1735372034228724,-1.0999748867047898,0.52,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(-0.15773221539783266,-0.7274920231630502,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.2406996144639928,-1.0999748867047898,0.57,0.6276564089897139,0.4272572199529034,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9252881416121347,0.909111664354187),(-1.6412440614631982,-1.3873487335150236,-1.8274572629471952,-1.8894018386217877,-0.5042604443804907,-1.9123237248751956,-1.0999748867047898,0.53,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(0.10406399273134952,0.26229304236491,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.1661010378060696,-1.0999748867047898,0.67,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(0.016798590021622126,-0.39756366798706344,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,-0.06535742124438843,-1.0999748867047898,0.68,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.690219702968213,0.909111664354187,0.81,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(0.4531256035702591,0.4272572199529034,1.674257252879766,1.0938642223599824,0.6101272780073337,0.6230572919270941,-1.0999748867047898,0.78,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(-1.2921824506242887,-0.8924562007510436,-0.0766000050337147,0.09944220203272576,1.724515000395158,-0.45154128473083044,-1.0999748867047898,0.65,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(-0.3322630208172874,-0.8924562007510436,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,-0.5522849012925116,-1.0999748867047898,0.64,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(-2.0775710750118352,-1.7172770886910105,-0.952028633990455,-1.3921908284581592,0.6101272780073337,-1.3414432310256739,0.909111664354187,0.64,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(-0.5067938262367422,-1.3873487335150236,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,-1.0392123813406318,-1.0999748867047898,0.65,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(-0.41952842352701486,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-0.9384687647789537,0.909111664354187,0.68,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(1.5003104360869879,1.582006463068857,1.674257252879766,0.5966532121963541,1.167321139201246,0.7909633195298942,0.909111664354187,0.89,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(0.4531256035702591,0.4272572199529034,0.7988286239230257,0.5966532121963541,1.724515000395158,0.8917069360915754,0.909111664354187,0.86,-1.4667132560437435,-1.2223845559270303,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5690755040527913,-1.0999748867047898),(0.5403910062799865,0.9221497527168835,0.7988286239230257,0.5966532121963541,1.167321139201246,1.0596129636943752,0.909111664354187,0.89,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(0.36586020086053167,0.5922213975408968,0.7988286239230257,0.5966532121963541,0.6101272780073337,0.6230572919270941,0.909111664354187,0.87,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(0.2785947981508043,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.052933416813421515,0.4551512643242912,0.909111664354187,0.85,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(1.0639834225383509,1.9119348182448437,0.7988286239230257,1.0938642223599824,1.167321139201246,0.9420787443724145,0.909111664354187,0.9,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(0.1913293954410769,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,-1.0999748867047898,0.82,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(-0.681324631656197,0.09732886477691666,-0.0766000050337147,-0.8949798182945309,-0.5042604443804907,-0.8041439426967131,-1.0999748867047898,0.72,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(-0.8558554370756518,-0.8924562007510436,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.5522849012925116,-1.0999748867047898,0.73,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(-1.4667132560437435,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,-0.7369815316555913,-1.0999748867047898,0.71,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(-1.0303862424951067,-0.06763531281107672,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.30042585988831016,-1.0999748867047898,0.71,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(-1.553978658753471,-1.2223845559270303,-0.952028633990455,-0.3977688081309026,0.052933416813421515,-1.2071184089434333,-1.0999748867047898,0.68,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(-0.24499761810756004,0.4272572199529034,-0.0766000050337147,0.5966532121963541,0.6101272780073337,0.3376170450023333,-1.0999748867047898,0.75,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(-0.07046681268810527,-0.2325994903990701,-0.952028633990455,-0.8949798182945309,0.6101272780073337,-0.46833188749111015,-1.0999748867047898,0.72,2.023902852345352,0.9221497527168835,0.7988286239230257,1.5910752325236108,1.724515000395158,1.915933704468658,0.909111664354187),(0.889452617118896,0.9221497527168835,0.7988286239230257,1.0938642223599824,1.167321139201246,0.8581257305710129,0.909111664354187,0.89,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(0.016798590021622126,-0.06763531281107672,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.13612981187897094,0.909111664354187,0.84,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(1.5875758387967152,1.7469706406568504,1.674257252879766,1.0938642223599824,0.052933416813421515,1.412215621660255,0.909111664354187,0.93,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(1.2385142279578056,1.2520781078928702,1.674257252879766,1.0938642223599824,0.052933416813421515,1.2778907995780144,0.909111664354187,0.93,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(0.6276564089897139,0.7571855751288902,1.674257252879766,1.5910752325236108,1.724515000395158,0.8077539222901738,0.909111664354187,0.88,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(0.6276564089897139,0.5922213975408968,1.674257252879766,1.0938642223599824,0.6101272780073337,0.9420787443724145,0.909111664354187,0.9,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(0.5403910062799865,0.4272572199529034,1.674257252879766,0.5966532121963541,1.724515000395158,0.6398478946873739,0.909111664354187,0.87,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(0.4531256035702591,1.087113930304877,1.674257252879766,1.0938642223599824,0.6101272780073337,0.572685483646252,0.909111664354187,0.86,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(1.6748412415064426,1.7469706406568504,1.674257252879766,1.0938642223599824,1.724515000395158,1.5633310465027752,0.909111664354187,0.94,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(-0.07046681268810527,0.26229304236491,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.27045463396121155,-1.0999748867047898,0.77,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(-0.8558554370756518,-0.06763531281107672,-0.952028633990455,-0.3977688081309026,0.052933416813421515,-0.1325198322855102,0.909111664354187,0.78,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(-0.9431208397853792,-0.39756366798706344,-0.952028633990455,-0.3977688081309026,-1.0614543055744028,-0.5690755040527913,-1.0999748867047898,0.73,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(-0.5940592289464697,-0.2325994903990701,-0.952028633990455,0.09944220203272576,-1.0614543055744028,-0.45154128473083044,-1.0999748867047898,0.73,1.5875758387967152,1.582006463068857,1.674257252879766,1.5910752325236108,1.724515000395158,2.0502585265508984,0.909111664354187),(-0.5067938262367422,-0.5625278455750569,-0.0766000050337147,1.0938642223599824,1.167321139201246,-0.2836352571280305,-1.0999748867047898,0.7,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(-0.3322630208172874,-0.06763531281107672,-0.0766000050337147,0.5966532121963541,1.167321139201246,0.15292041463925066,-1.0999748867047898,0.72,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(0.016798590021622126,-0.7274920231630502,-0.0766000050337147,-0.8949798182945309,-0.5042604443804907,-0.0989386267649508,0.909111664354187,0.73,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(-0.15773221539783266,0.4272572199529034,-0.952028633990455,0.09944220203272576,-0.5042604443804907,-0.2332634488471884,0.909111664354187,0.72,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(2.023902852345352,2.076898995832837,1.674257252879766,1.0938642223599824,1.167321139201246,2.2013739513934185,0.909111664354187,0.97,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(1.5003104360869879,2.076898995832837,1.674257252879766,0.5966532121963541,1.724515000395158,2.1342115403522968,0.909111664354187,0.97,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(-1.6412440614631982,-0.39756366798706344,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.0989386267649508,-1.0999748867047898,0.69,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(-1.9030402695923805,-1.3873487335150236,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,-1.5933022724298738,-1.0999748867047898,0.57,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(-0.15773221539783266,-1.3873487335150236,-0.952028633990455,0.09944220203272576,-0.5042604443804907,-1.1903278061831537,-1.0999748867047898,0.63,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(-0.5940592289464697,-0.8924562007510436,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.972049970299513,0.909111664354187,0.66,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(-1.0303862424951067,-0.2325994903990701,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,-0.7369815316555913,-1.0999748867047898,0.64,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(-1.3794478533340162,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.8041439426967131,0.909111664354187,0.68,-1.2921824506242887,-1.057420378339037,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-1.0727935868611929,-1.0999748867047898),(0.7149218116994412,0.09732886477691666,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.7741727167696144,0.909111664354187,0.79,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(0.9767180198286235,0.4272572199529034,0.7988286239230257,1.5910752325236108,0.6101272780073337,0.908497538851855,0.909111664354187,0.82,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(1.8493720469258974,2.076898995832837,0.7988286239230257,1.5910752325236108,1.724515000395158,1.7816088823864173,0.909111664354187,0.95,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(1.4130450333772604,1.9119348182448437,1.674257252879766,1.5910752325236108,1.167321139201246,1.9830961155097766,0.909111664354187,0.96,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(1.2385142279578056,1.582006463068857,0.7988286239230257,1.0938642223599824,1.724515000395158,1.3786344161396955,0.909111664354187,0.94,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(1.1512488252480781,1.4170422854808635,1.674257252879766,1.5910752325236108,1.167321139201246,1.2778907995780144,0.909111664354187,0.93,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(0.4531256035702591,0.7571855751288902,0.7988286239230257,1.0938642223599824,1.167321139201246,1.1099847719752143,0.909111664354187,0.91,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(0.36586020086053167,0.26229304236491,0.7988286239230257,0.5966532121963541,0.6101272780073337,0.8917069360915754,0.909111664354187,0.85,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(0.6276564089897139,0.4272572199529034,0.7988286239230257,-0.3977688081309026,0.052933416813421515,0.6230572919270941,0.909111664354187,0.84,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(-0.41952842352701486,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.052933416813421515,-0.30042585988831016,-1.0999748867047898,0.74,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(-0.3322630208172874,-0.7274920231630502,-0.0766000050337147,0.5966532121963541,0.6101272780073337,0.25366403120093184,-1.0999748867047898,0.76,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(-0.07046681268810527,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.06535742124438843,-1.0999748867047898,0.75,-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8377251482172725,-1.0999748867047898),(0.6276564089897139,0.9221497527168835,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.32082644224205065,-1.0999748867047898,0.76,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(-0.7685900343659244,0.26229304236491,-0.952028633990455,-0.3977688081309026,0.6101272780073337,-0.2500540516074711,-1.0999748867047898,0.71,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(-1.0303862424951067,-0.39756366798706344,-0.952028633990455,-0.3977688081309026,-1.618648166768315,-0.6194473123336305,-1.0999748867047898,0.67,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(-1.8157748668826532,-1.3873487335150236,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-0.9552593675392334,-1.0999748867047898,0.61,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(-0.9431208397853792,0.4272572199529034,-0.952028633990455,0.09944220203272576,0.6101272780073337,-0.2500540516074711,-1.0999748867047898,0.63,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(-0.41952842352701486,0.4272572199529034,-0.952028633990455,0.09944220203272576,-0.5042604443804907,-0.1157292295252305,-1.0999748867047898,0.64,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(0.10406399273134952,0.7571855751288902,-0.0766000050337147,0.5966532121963541,0.052933416813421515,0.11933920911869125,-1.0999748867047898,0.71,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(0.6276564089897139,0.5922213975408968,0.7988286239230257,-0.3977688081309026,-0.5042604443804907,0.690219702968213,0.909111664354187,0.82,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(-0.3322630208172874,-0.5625278455750569,-0.0766000050337147,0.5966532121963541,1.167321139201246,0.08575800359813185,-1.0999748867047898,0.73,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(0.1913293954410769,-0.2325994903990701,-0.0766000050337147,0.09944220203272576,-1.0614543055744028,-0.45154128473083044,0.909111664354187,0.74,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(-0.41952842352701486,-0.06763531281107672,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-0.5522849012925116,-1.0999748867047898,0.69,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(-1.117651645204834,-1.2223845559270303,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-0.8880969564981116,-1.0999748867047898,0.64,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(1.1512488252480781,0.9221497527168835,1.674257252879766,1.5910752325236108,0.6101272780073337,1.1939377857766158,0.909111664354187,0.91,-1.8157748668826532,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.3414432310256739,-1.0999748867047898),(0.8021872144091686,0.5922213975408968,1.674257252879766,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187,0.88,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(0.7149218116994412,0.7571855751288902,0.7988286239230257,0.5966532121963541,1.167321139201246,0.9588693471326941,0.909111664354187,0.85,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(1.0639834225383509,1.087113930304877,1.674257252879766,1.0938642223599824,1.724515000395158,0.9924505526532535,0.909111664354187,0.86,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(-0.5940592289464697,-0.5625278455750569,-0.0766000050337147,-1.3921908284581592,0.052933416813421515,-0.3843788736897117,-1.0999748867047898,0.7,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(-1.553978658753471,-1.2223845559270303,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.1903278061831537,-1.0999748867047898,0.59,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(-1.8157748668826532,-1.057420378339037,-1.8274572629471952,-0.8949798182945309,-0.5042604443804907,-1.5429304641490347,-1.0999748867047898,0.6,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(0.016798590021622126,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-0.753772134415871,-1.0999748867047898,0.65,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(0.6276564089897139,1.2520781078928702,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.27045463396121155,0.909111664354187,0.7,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(0.7149218116994412,1.087113930304877,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.7405915112490521,0.909111664354187,0.76,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(-0.24499761810756004,-0.06763531281107672,-0.952028633990455,-0.8949798182945309,0.6101272780073337,-0.06535742124438843,-1.0999748867047898,0.63,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(0.9767180198286235,0.4272572199529034,0.7988286239230257,0.5966532121963541,-1.0614543055744028,0.7070103057284927,0.909111664354187,0.81,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(-0.07046681268810527,-0.39756366798706344,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.22008282568037243,-1.0999748867047898,0.72,0.2785947981508043,0.09732886477691666,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.2668446543677508,0.909111664354187),(-0.5067938262367422,-0.5625278455750569,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-0.199682243326629,-1.0999748867047898,0.71,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.4551512643242912,0.909111664354187,0.8,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.36586020086053167,0.5922213975408968,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.3879888532831724,0.909111664354187,0.77,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.2785947981508043,-0.5625278455750569,-0.0766000050337147,-0.3977688081309026,-1.0614543055744028,-0.04856681848410872,0.909111664354187,0.74,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(-0.07046681268810527,-1.3873487335150236,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,0.6734291002079332,-1.0999748867047898,0.7,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.10406399273134952,-1.2223845559270303,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-0.0989386267649508,0.909111664354187,0.71,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(1.5875758387967152,1.2520781078928702,0.7988286239230257,1.0938642223599824,1.167321139201246,1.8151900879069767,0.909111664354187,0.93,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.36586020086053167,1.087113930304877,0.7988286239230257,0.5966532121963541,1.724515000395158,0.8749163333312926,-1.0999748867047898,0.85,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(-0.8558554370756518,0.4272572199529034,0.7988286239230257,0.5966532121963541,1.167321139201246,-0.3843788736897117,-1.0999748867047898,0.79,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(-0.681324631656197,-1.3873487335150236,-0.0766000050337147,0.5966532121963541,0.6101272780073337,-0.06535742124438843,-1.0999748867047898,0.76,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.6276564089897139,-1.2223845559270303,-0.0766000050337147,0.5966532121963541,1.724515000395158,0.06896740083785215,0.909111664354187,0.78,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(0.8021872144091686,-0.8924562007510436,0.7988286239230257,1.5910752325236108,1.724515000395158,0.27045463396121155,0.909111664354187,0.77,-0.24499761810756004,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.6026567095733507,-1.0999748867047898),(1.2385142279578056,1.9119348182448437,0.7988286239230257,1.5910752325236108,1.167321139201246,1.244309594057455,0.909111664354187,0.9,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(0.889452617118896,0.09732886477691666,1.674257252879766,1.5910752325236108,0.052933416813421515,0.8917069360915754,0.909111664354187,0.87,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-0.41952842352701486,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,0.6101272780073337,-0.8545157509775522,-1.0999748867047898,0.71,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-0.7685900343659244,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,0.6101272780073337,-0.40116947644999135,0.909111664354187,0.7,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(0.6276564089897139,0.5922213975408968,-0.0766000050337147,-0.8949798182945309,-2.175842027962227,0.32082644224205065,0.909111664354187,0.7,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(0.7149218116994412,0.4272572199529034,-0.952028633990455,-0.3977688081309026,-1.0614543055744028,0.27045463396121155,0.909111664354187,0.75,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-0.3322630208172874,-0.8924562007510436,-0.0766000050337147,-0.8949798182945309,-1.0614543055744028,0.13612981187897094,-1.0999748867047898,0.71,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-0.41952842352701486,-0.39756366798706344,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.2500540516074711,-1.0999748867047898,0.72,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-0.24499761810756004,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.7201909288953117,0.909111664354187,0.73,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(0.889452617118896,0.9221497527168835,0.7988286239230257,1.0938642223599824,1.724515000395158,0.908497538851855,-1.0999748867047898,0.83,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-0.7685900343659244,0.09732886477691666,0.7988286239230257,1.0938642223599824,1.724515000395158,-0.4347506819705508,-1.0999748867047898,0.77,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-0.9431208397853792,-0.39756366798706344,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,-0.6362379150939101,0.909111664354187,0.72,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-1.553978658753471,-1.8822412662790038,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.2406996144639928,-1.0999748867047898,0.54,0.10406399273134952,-0.2325994903990701,-0.0766000050337147,-1.3921908284581592,-0.5042604443804907,0.08575800359813185,-1.0999748867047898),(-1.990305672302108,-2.0472054438669973,-1.8274572629471952,-1.8894018386217877,-2.175842027962227,-1.610092875190155,-1.0999748867047898,0.49,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(-0.41952842352701486,-1.3873487335150236,-1.8274572629471952,-2.386612848785416,-2.175842027962227,-0.9888405730597928,0.909111664354187,0.52,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(-0.15773221539783266,-1.2223845559270303,-1.8274572629471952,-1.3921908284581592,-1.0614543055744028,-1.0895841896214724,-1.0999748867047898,0.58,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(0.4531256035702591,0.4272572199529034,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.6062666891668145,0.909111664354187,0.78,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(1.0639834225383509,0.9221497527168835,1.674257252879766,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187,0.89,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(0.2785947981508043,-1.057420378339037,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,0.03538619531728977,-1.0999748867047898,0.7,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(-0.7685900343659244,-0.7274920231630502,-0.952028633990455,-0.3977688081309026,0.052933416813421515,-0.1828916405663493,-1.0999748867047898,0.66,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(-1.117651645204834,-0.8924562007510436,-0.952028633990455,-0.3977688081309026,0.6101272780073337,0.22008282568037243,-1.0999748867047898,0.67,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(-0.5067938262367422,-0.8924562007510436,-0.0766000050337147,1.0938642223599824,0.6101272780073337,0.06896740083785215,0.909111664354187,0.68,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(0.016798590021622126,0.4272572199529034,-0.0766000050337147,0.5966532121963541,1.167321139201246,0.8581257305710129,0.909111664354187,0.8,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(-0.41952842352701486,-0.2325994903990701,-0.0766000050337147,0.5966532121963541,0.052933416813421515,0.32082644224205065,0.909111664354187,0.81,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(0.36586020086053167,0.5922213975408968,-0.0766000050337147,-0.8949798182945309,-0.5042604443804907,0.5055230726051333,0.909111664354187,0.8,0.8021872144091686,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.8749163333312926,0.909111664354187),(2.023902852345352,0.7571855751288902,0.7988286239230257,1.5910752325236108,1.167321139201246,1.7816088823864173,0.909111664354187,0.94,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(1.2385142279578056,1.4170422854808635,1.674257252879766,0.5966532121963541,0.6101272780073337,1.1099847719752143,0.909111664354187,0.93,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(1.6748412415064426,1.7469706406568504,1.674257252879766,1.0938642223599824,0.6101272780073337,0.9924505526532535,0.909111664354187,0.92,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(0.6276564089897139,1.087113930304877,1.674257252879766,1.5910752325236108,1.167321139201246,0.8077539222901738,0.909111664354187,0.89,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(-0.24499761810756004,-0.5625278455750569,0.7988286239230257,1.5910752325236108,1.724515000395158,0.7070103057284927,-1.0999748867047898,0.82,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(-0.3322630208172874,0.26229304236491,-0.0766000050337147,0.5966532121963541,0.052933416813421515,0.6734291002079332,-1.0999748867047898,0.79,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(-0.8558554370756518,-0.39756366798706344,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,-1.5933022724298738,-1.0999748867047898,0.58,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(-1.4667132560437435,-0.8924562007510436,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.223909011703713,-1.0999748867047898,0.56,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(-1.2921824506242887,-1.3873487335150236,-0.952028633990455,-2.386612848785416,-1.618648166768315,-1.056002984100913,-1.0999748867047898,0.56,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(-0.41952842352701486,-1.5523129111030172,-1.8274572629471952,0.09944220203272576,-0.5042604443804907,-0.7034003261350319,0.909111664354187,0.64,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(-0.07046681268810527,-1.057420378339037,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-0.46833188749111015,0.909111664354187,0.61,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(0.016798590021622126,-1.2223845559270303,-0.952028633990455,-0.3977688081309026,-1.0614543055744028,-0.04856681848410872,-1.0999748867047898,0.68,0.016798590021622126,-0.5625278455750569,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,0.27045463396121155,-1.0999748867047898),(-0.5940592289464697,-0.06763531281107672,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.11933920911869125,-1.0999748867047898,0.76,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(0.2785947981508043,2.076898995832837,-0.0766000050337147,0.5966532121963541,1.167321139201246,0.8581257305710129,-1.0999748867047898,0.86,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(1.1512488252480781,1.087113930304877,-0.0766000050337147,1.0938642223599824,1.167321139201246,1.076403566454655,0.909111664354187,0.9,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(-1.0303862424951067,0.7571855751288902,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.08575800359813185,-1.0999748867047898,0.71,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(-0.681324631656197,-0.2325994903990701,-0.952028633990455,-0.8949798182945309,-1.0614543055744028,-1.0056311758200724,-1.0999748867047898,0.62,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(0.1913293954410769,0.09732886477691666,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,0.27045463396121155,-1.0999748867047898,0.66,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(0.4531256035702591,-0.39756366798706344,-0.952028633990455,-0.3977688081309026,-0.5042604443804907,-0.2500540516074711,0.909111664354187,0.65,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(0.5403910062799865,-0.06763531281107672,-0.0766000050337147,0.09944220203272576,0.052933416813421515,-0.08214802400466813,0.909111664354187,0.73,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(-0.3322630208172874,-0.2325994903990701,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-0.2836352571280305,-1.0999748867047898,0.62,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(0.36586020086053167,0.26229304236491,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.3376170450023333,0.909111664354187,0.74,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(0.5403910062799865,0.4272572199529034,-0.0766000050337147,0.5966532121963541,0.052933416813421515,0.8413351278107333,0.909111664354187,0.79,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(0.7149218116994412,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.6101272780073337,0.6734291002079332,0.909111664354187,0.8,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(-0.41952842352701486,0.09732886477691666,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,-0.1157292295252305,-1.0999748867047898,0.69,1.0639834225383509,0.5922213975408968,0.7988286239230257,1.0938642223599824,0.6101272780073337,1.0596129636943752,0.909111664354187),(-0.7685900343659244,0.4272572199529034,0.7988286239230257,0.09944220203272576,-0.5042604443804907,0.0018049897967303734,-1.0999748867047898,0.7,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(0.2785947981508043,-0.5625278455750569,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.23687342844065212,0.909111664354187,0.76,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(0.9767180198286235,0.09732886477691666,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.9756599498929738,0.909111664354187,0.84,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(-0.5067938262367422,-0.06763531281107672,0.7988286239230257,1.0938642223599824,1.167321139201246,0.6734291002079332,0.909111664354187,0.78,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(-1.3794478533340162,-1.2223845559270303,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,-0.9384687647789537,-1.0999748867047898,0.67,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(-1.0303862424951067,-0.39756366798706344,-0.952028633990455,-0.3977688081309026,0.6101272780073337,-0.7873533399364304,-1.0999748867047898,0.66,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(-0.7685900343659244,-0.5625278455750569,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,-0.8880969564981116,-1.0999748867047898,0.65,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(-1.6412440614631982,-1.057420378339037,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.2406996144639928,-1.0999748867047898,0.54,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(-1.4667132560437435,-1.3873487335150236,-1.8274572629471952,-2.386612848785416,-1.0614543055744028,-0.9888405730597928,-1.0999748867047898,0.58,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(0.6276564089897139,0.5922213975408968,-0.0766000050337147,-0.8949798182945309,-1.618648166768315,0.3376170450023333,0.909111664354187,0.79,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(0.889452617118896,0.9221497527168835,0.7988286239230257,0.09944220203272576,-0.5042604443804907,0.15292041463925066,0.909111664354187,0.8,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(0.016798590021622126,-0.2325994903990701,-0.0766000050337147,0.5966532121963541,0.052933416813421515,-0.1661010378060696,0.909111664354187,0.75,0.6276564089897139,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.7405915112490521,0.909111664354187),(0.5403910062799865,-0.5625278455750569,-0.0766000050337147,0.5966532121963541,0.6101272780073337,-0.2668446543677508,0.909111664354187,0.73,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(-0.24499761810756004,-0.06763531281107672,-0.952028633990455,-0.8949798182945309,0.6101272780073337,-0.5522849012925116,-1.0999748867047898,0.72,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(-1.0303862424951067,-0.8924562007510436,-0.952028633990455,-1.3921908284581592,-1.0614543055744028,-0.7034003261350319,-1.0999748867047898,0.62,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(-0.15773221539783266,-0.5625278455750569,-0.0766000050337147,-0.3977688081309026,-1.0614543055744028,-0.45154128473083044,-1.0999748867047898,0.67,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(0.8021872144091686,1.4170422854808635,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.908497538851855,0.909111664354187,0.81,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(-1.553978658753471,-1.2223845559270303,-0.0766000050337147,-1.3921908284581592,-1.618648166768315,-0.972049970299513,-1.0999748867047898,0.63,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(-1.9030402695923805,-1.057420378339037,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.2406996144639928,-1.0999748867047898,0.69,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(0.6276564089897139,0.7571855751288902,0.7988286239230257,0.5966532121963541,0.052933416813421515,0.2872452367214912,0.909111664354187,0.8,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(-1.7285094641729257,-1.8822412662790038,-0.952028633990455,-0.8949798182945309,-2.175842027962227,-1.1903278061831537,-1.0999748867047898,0.43,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(0.889452617118896,0.9221497527168835,-0.0766000050337147,0.09944220203272576,-0.5042604443804907,0.10254860635841155,0.909111664354187,0.8,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(-0.5067938262367422,-0.39756366798706344,-0.952028633990455,-0.3977688081309026,-1.618648166768315,-0.8041439426967131,0.909111664354187,0.73,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(-0.7685900343659244,-0.2325994903990701,-0.0766000050337147,0.09944220203272576,-1.0614543055744028,-0.6530285178541898,0.909111664354187,0.75,0.7149218116994412,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,0.8581257305710129,0.909111664354187),(0.1913293954410769,0.09732886477691666,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.0989386267649508,0.909111664354187,0.71,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(-0.41952842352701486,-0.06763531281107672,0.7988286239230257,1.0938642223599824,0.6101272780073337,0.08575800359813185,0.909111664354187,0.73,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(0.7149218116994412,0.5922213975408968,0.7988286239230257,0.5966532121963541,1.167321139201246,0.8581257305710129,0.909111664354187,0.83,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(0.1913293954410769,0.4272572199529034,-0.0766000050337147,-0.3977688081309026,-1.0614543055744028,0.32082644224205065,-1.0999748867047898,0.72,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(1.3257796306675331,1.7469706406568504,1.674257252879766,1.5910752325236108,1.724515000395158,1.462587429941097,0.909111664354187,0.94,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(0.5403910062799865,0.09732886477691666,1.674257252879766,0.5966532121963541,0.6101272780073337,0.23687342844065212,0.909111664354187,0.81,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(0.6276564089897139,-0.06763531281107672,1.674257252879766,0.09944220203272576,0.6101272780073337,0.10254860635841155,0.909111664354187,0.81,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(-0.41952842352701486,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.2332634488471884,0.909111664354187,0.75,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(0.8021872144091686,0.4272572199529034,-0.0766000050337147,0.09944220203272576,0.052933416813421515,0.27045463396121155,0.909111664354187,0.79,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(-0.7685900343659244,-0.2325994903990701,-0.0766000050337147,-0.3977688081309026,-0.5042604443804907,-0.6026567095733507,-1.0999748867047898,0.58,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(-1.0303862424951067,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,0.052933416813421515,-0.7873533399364304,-1.0999748867047898,0.59,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(-1.9030402695923805,-1.8822412662790038,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-2.1138109579985565,-1.0999748867047898,0.47,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(-0.07046681268810527,-1.5523129111030172,-1.8274572629471952,-1.8894018386217877,-1.618648166768315,-1.9626955331560363,-1.0999748867047898,0.49,1.1512488252480781,1.4170422854808635,0.7988286239230257,1.5910752325236108,1.167321139201246,1.4290062244205346,0.909111664354187),(-1.117651645204834,-1.7172770886910105,-0.952028633990455,-1.8894018386217877,-1.618648166768315,-1.610092875190155,-1.0999748867047898,0.47,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(-1.553978658753471,-2.2121696214549904,-1.8274572629471952,-2.386612848785416,-2.7330358891561395,-2.1138109579985565,-1.0999748867047898,0.42,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(-1.2921824506242887,-1.3873487335150236,-1.8274572629471952,-1.3921908284581592,-1.618648166768315,-2.2649263828410766,-1.0999748867047898,0.57,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(-0.3322630208172874,-1.057420378339037,-0.0766000050337147,-0.8949798182945309,-0.5042604443804907,-0.9384687647789537,-1.0999748867047898,0.62,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(0.10406399273134952,-0.06763531281107672,-0.0766000050337147,-0.3977688081309026,0.052933416813421515,-0.5522849012925116,0.909111664354187,0.74,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(0.7149218116994412,0.4272572199529034,0.7988286239230257,0.09944220203272576,0.6101272780073337,0.11933920911869125,0.909111664354187,0.73,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(-1.2049170479145614,-1.2223845559270303,-0.952028633990455,-0.3977688081309026,0.052933416813421515,-0.9048875592583913,0.909111664354187,0.64,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(-1.4667132560437435,-0.8924562007510436,-0.0766000050337147,0.09944220203272576,-1.0614543055744028,-0.7201909288953117,-1.0999748867047898,0.63,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(-1.7285094641729257,-1.5523129111030172,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,-1.5597210669093144,-1.0999748867047898,0.59,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(0.016798590021622126,-0.2325994903990701,-0.952028633990455,-1.3921908284581592,0.052933416813421515,-0.8041439426967131,-1.0999748867047898,0.73,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(0.889452617118896,0.26229304236491,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.2872452367214912,0.909111664354187,0.79,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(-1.3794478533340162,-0.5625278455750569,-0.952028633990455,0.09944220203272576,0.052933416813421515,-1.1903278061831537,0.909111664354187,0.68,-0.41952842352701486,-0.7274920231630502,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.30403583948177093,-1.0999748867047898),(-0.24499761810756004,-0.39756366798706344,-0.952028633990455,-0.8949798182945309,-1.618648166768315,-1.610092875190155,-1.0999748867047898,0.7,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(0.36586020086053167,-0.06763531281107672,-0.952028633990455,-1.3921908284581592,-2.175842027962227,-0.2668446543677508,-1.0999748867047898,0.81,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(0.4531256035702591,0.4272572199529034,-0.0766000050337147,0.5966532121963541,1.724515000395158,0.06896740083785215,0.909111664354187,0.85,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(1.5003104360869879,1.4170422854808635,0.7988286239230257,0.5966532121963541,0.052933416813421515,1.580121649263055,0.909111664354187,0.93,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(1.8493720469258974,1.2520781078928702,1.674257252879766,1.0938642223599824,1.724515000395158,1.0596129636943752,0.909111664354187,0.91,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(-0.9431208397853792,-0.7274920231630502,-0.952028633990455,-0.8949798182945309,-0.5042604443804907,-0.40116947644999135,-1.0999748867047898,0.69,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(-0.3322630208172874,-0.8924562007510436,-0.0766000050337147,0.09944220203272576,0.6101272780073337,0.5055230726051333,0.909111664354187,0.77,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(1.1512488252480781,1.087113930304877,0.7988286239230257,1.0938642223599824,-0.5042604443804907,0.9588693471326941,0.909111664354187,0.86,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(0.2785947981508043,-0.5625278455750569,-0.0766000050337147,0.09944220203272576,1.167321139201246,-0.4347506819705508,0.909111664354187,0.74,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(-0.5067938262367422,-1.5523129111030172,-1.8274572629471952,-2.386612848785416,-1.0614543055744028,-1.9123237248751956,-1.0999748867047898,0.57,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(-1.6412440614631982,-2.5420979766309775,-1.8274572629471952,-1.3921908284581592,-1.618648166768315,-1.2071184089434333,-1.0999748867047898,0.51,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187),(-1.3794478533340162,-1.5523129111030172,-1.8274572629471952,-1.3921908284581592,-0.5042604443804907,-0.9552593675392334,0.909111664354187,0.67,1.4130450333772604,1.582006463068857,0.7988286239230257,1.5910752325236108,0.6101272780073337,1.7816088823864173,0.909111664354187)
 DROP TABLE IF EXISTS model;
 create table model engine = Memory as select stochasticLinearRegressionState(0.1, 0.0, 5, 'SGD')(target, param1, param2, param3, param4, param5, param6, param7) as state from defaults;
 with (select state from model) as model select round(evalMLMethod(model, predict1, predict2, predict3, predict4, predict5, predict6, predict7), 12) from defaults;
diff --git a/tests/queries/0_stateless/00956_sensitive_data_masking.sh b/tests/queries/0_stateless/00956_sensitive_data_masking.sh
index bd65b937648..926557e4ba6 100755
--- a/tests/queries/0_stateless/00956_sensitive_data_masking.sh
+++ b/tests/queries/0_stateless/00956_sensitive_data_masking.sh
@@ -17,7 +17,7 @@ echo 1
 # normal execution
 $CLICKHOUSE_CLIENT \
   --query="SELECT 'find_me_TOPSECRET=TOPSECRET' FROM numbers(1) FORMAT Null" \
-  --log_queries=1 --ignore-error >"$tmp_file" 2>&1
+  --log_queries=1 --ignore-error --multiquery >"$tmp_file" 2>&1
 
 grep -F 'find_me_[hidden]' "$tmp_file" >/dev/null || echo 'fail 1a'
 grep -F 'TOPSECRET' "$tmp_file" && echo 'fail 1b'
@@ -38,7 +38,7 @@ echo 3
 # failure at before query start
 $CLICKHOUSE_CLIENT \
   --query="SELECT 1 FROM system.numbers WHERE credit_card_number='find_me_TOPSECRET=TOPSECRET' FORMAT Null" \
-  --log_queries=1 --ignore-error |& grep -v '^(query: ' > "$tmp_file"
+  --log_queries=1 --ignore-error --multiquery |& grep -v '^(query: ' > "$tmp_file"
 
 grep -F 'find_me_[hidden]' "$tmp_file" >/dev/null || echo 'fail 3a'
 grep -F 'TOPSECRET' "$tmp_file" && echo 'fail 3b'
@@ -56,7 +56,7 @@ echo 4
 # failure at the end of query
 $CLICKHOUSE_CLIENT \
   --query="SELECT 'find_me_TOPSECRET=TOPSECRET', intDiv( 100, number - 10) FROM numbers(11) FORMAT Null" \
-  --log_queries=1 --ignore-error --max_block_size=2 |& grep -v '^(query: ' > "$tmp_file"
+  --log_queries=1 --ignore-error --max_block_size=2 --multiquery |& grep -v '^(query: ' > "$tmp_file"
 
 grep -F 'find_me_[hidden]' "$tmp_file" >/dev/null || echo 'fail 4a'
 grep -F 'TOPSECRET' "$tmp_file" && echo 'fail 4b'
@@ -67,7 +67,7 @@ rm -f "$tmp_file2" >/dev/null 2>&1
 bash -c "$CLICKHOUSE_CLIENT \
   --function_sleep_max_microseconds_per_block 60000000 \
   --query=\"select sleepEachRow(1) from numbers(10) where ignore('find_me_TOPSECRET=TOPSECRET')=0 and ignore('fwerkh_that_magic_string_make_me_unique') = 0 FORMAT Null\" \
-  --log_queries=1 --ignore-error |& grep -v '^(query: ' > $tmp_file2" &
+  --log_queries=1 --ignore-error --multiquery |& grep -v '^(query: ' > $tmp_file2" &
 
 rm -f "$tmp_file" >/dev/null 2>&1
 # check that executing query doesn't expose secrets in processlist
@@ -133,7 +133,7 @@ insert into sensitive select number as id, toDate('2019-01-01') as date, 'abcd'
 insert into sensitive select number as id, toDate('2019-01-01') as date, 'find_me_TOPSECRET=TOPSECRET' as value1, rand() as valuer from numbers(10);
 insert into sensitive select number as id, toDate('2019-01-01') as date, 'abcd' as value1, rand() as valuer from numbers(10000);
 select * from sensitive WHERE value1 = 'find_me_TOPSECRET=TOPSECRET' FORMAT Null;
-drop table sensitive;" --log_queries=1 --ignore-error >"$tmp_file" 2>&1
+drop table sensitive;" --log_queries=1 --ignore-error --multiquery >"$tmp_file" 2>&1
 
 grep -F 'find_me_[hidden]' "$tmp_file" >/dev/null || echo 'fail 8a'
 grep -F 'TOPSECRET' "$tmp_file" && echo 'fail 8b'
@@ -144,7 +144,7 @@ echo 9
 $CLICKHOUSE_CLIENT \
    --server_logs_file=/dev/null \
    --query="SELECT if( count() > 0, 'text_log non empty', 'text_log empty') FROM system.text_log WHERE event_date >= yesterday() and message like '%find_me%';
-   select * from system.text_log where event_date >= yesterday() and message like '%TOPSECRET=TOPSECRET%';"  --ignore-error 
+   select * from system.text_log where event_date >= yesterday() and message like '%TOPSECRET=TOPSECRET%';"  --ignore-error --multiquery
 
 echo 'finish'
 rm -f "$tmp_file" >/dev/null 2>&1
diff --git a/tests/queries/0_stateless/00961_check_table.reference b/tests/queries/0_stateless/00961_check_table.reference
index 686285bb6aa..a0a054898b9 100644
--- a/tests/queries/0_stateless/00961_check_table.reference
+++ b/tests/queries/0_stateless/00961_check_table.reference
@@ -14,4 +14,4 @@
 ========
 201902_4_5_1	1	
 ========
-201801_1_1_2	1	
+201801_1_1_0	1	
diff --git a/tests/queries/0_stateless/00961_check_table.sql b/tests/queries/0_stateless/00961_check_table.sql
index fc3c5435670..a6abe8103d5 100644
--- a/tests/queries/0_stateless/00961_check_table.sql
+++ b/tests/queries/0_stateless/00961_check_table.sql
@@ -39,6 +39,6 @@ CHECK TABLE mt_table PARTITION 201902 SETTINGS max_threads = 1;
 
 SELECT '========';
 
-CHECK TABLE mt_table PART '201801_1_1_2';
+CHECK TABLE mt_table PART '201801_1_1_0';
 
 DROP TABLE IF EXISTS mt_table;
diff --git a/tests/queries/0_stateless/00964_bloom_index_string_functions.sh b/tests/queries/0_stateless/00964_bloom_index_string_functions.sh
index 9e410f09b13..e2ec7fd42e4 100755
--- a/tests/queries/0_stateless/00964_bloom_index_string_functions.sh
+++ b/tests/queries/0_stateless/00964_bloom_index_string_functions.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS bloom_filter_idx;"
 
 # NGRAM BF
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 CREATE TABLE bloom_filter_idx
 (
     k UInt64,
diff --git a/tests/queries/0_stateless/00965_set_index_string_functions.sh b/tests/queries/0_stateless/00965_set_index_string_functions.sh
index 0f29c3dd2f2..8892fb11752 100755
--- a/tests/queries/0_stateless/00965_set_index_string_functions.sh
+++ b/tests/queries/0_stateless/00965_set_index_string_functions.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS set_idx;"
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 CREATE TABLE set_idx
 (
     k UInt64,
diff --git a/tests/queries/0_stateless/00965_shard_unresolvable_addresses.sql b/tests/queries/0_stateless/00965_shard_unresolvable_addresses.sql
index f2afb974a06..16b62c37d80 100644
--- a/tests/queries/0_stateless/00965_shard_unresolvable_addresses.sql
+++ b/tests/queries/0_stateless/00965_shard_unresolvable_addresses.sql
@@ -1,10 +1,9 @@
--- Tags: shard, no-fasttest
--- no-fasttest: Slow timeouts
+-- Tags: shard, no-parallel
 
 SET prefer_localhost_replica = 1;
-SET connections_with_failover_max_tries=1;
-SET connect_timeout_with_failover_ms=2000;
-SET connect_timeout_with_failover_secure_ms=2000;
 
 SELECT count() FROM remote('127.0.0.1,localhos', system.one); -- { serverError ALL_CONNECTION_TRIES_FAILED }
 SELECT count() FROM remote('127.0.0.1|localhos', system.one);
+
+-- Clear cache to avoid future errors in the logs
+SYSTEM DROP DNS CACHE
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 ba260042f47..389d433c7e2 100755
--- a/tests/queries/0_stateless/00974_primary_key_for_lowCardinality.sh
+++ b/tests/queries/0_stateless/00974_primary_key_for_lowCardinality.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS lowString;"
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS string;"
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 create table lowString
 (
 a LowCardinality(String),
@@ -18,7 +18,7 @@ ENGINE = MergeTree()
 PARTITION BY toYYYYMM(b)
 ORDER BY (a)"
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 create table string
 (
 a String,
diff --git a/tests/queries/0_stateless/00974_query_profiler.sql b/tests/queries/0_stateless/00974_query_profiler.sql
index 1f90641726f..24e4241b813 100644
--- a/tests/queries/0_stateless/00974_query_profiler.sql
+++ b/tests/queries/0_stateless/00974_query_profiler.sql
@@ -2,9 +2,7 @@
 -- Tag no-fasttest: Not sure why fail even in sequential mode. Disabled for now to make some progress.
 
 SET allow_introspection_functions = 1;
-SET trace_profile_events = 0; -- This can inhibit profiler from working, because it prevents sending samples from different profilers concurrently.
 
-SET query_profiler_cpu_time_period_ns = 0;
 SET query_profiler_real_time_period_ns = 100000000;
 SET log_queries = 1;
 SELECT sleep(0.5), ignore('test real time query profiler');
@@ -17,7 +15,6 @@ SELECT count() > 0 FROM system.trace_log t WHERE query_id = (SELECT query_id FRO
 SET query_profiler_real_time_period_ns = 0;
 SET query_profiler_cpu_time_period_ns = 1000000;
 SET log_queries = 1;
-SET max_rows_to_read = 0;
 SELECT count(), ignore('test cpu time query profiler') FROM numbers_mt(10000000000);
 SET log_queries = 0;
 SYSTEM FLUSH LOGS;
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 1d35daf9f2e..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
@@ -11,7 +11,7 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS indices_mutaions1;"
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS indices_mutaions2;"
 
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 CREATE TABLE indices_mutaions1
 (
     u64 UInt64,
diff --git a/tests/queries/0_stateless/00976_max_execution_speed.sql b/tests/queries/0_stateless/00976_max_execution_speed.sql
index 41374712724..52c3f05ff43 100644
--- a/tests/queries/0_stateless/00976_max_execution_speed.sql
+++ b/tests/queries/0_stateless/00976_max_execution_speed.sql
@@ -1,2 +1,2 @@
-SET max_execution_speed = 1, max_execution_time = 3, max_rows_to_read = 0;
+SET max_execution_speed = 1, max_execution_time = 3;
 SELECT count() FROM system.numbers; -- { serverError TIMEOUT_EXCEEDED }
diff --git a/tests/queries/0_stateless/00976_system_stop_ttl_merges.sql b/tests/queries/0_stateless/00976_system_stop_ttl_merges.sql
index 2ab85d90a66..b27e4275d5d 100644
--- a/tests/queries/0_stateless/00976_system_stop_ttl_merges.sql
+++ b/tests/queries/0_stateless/00976_system_stop_ttl_merges.sql
@@ -4,7 +4,7 @@ create table ttl (d Date, a Int) engine = MergeTree order by a partition by toDa
 
 system stop ttl merges ttl;
 
-insert into ttl values (toDateTime('2000-10-10 00:00:00'), 1), (toDateTime('2000-10-10 00:00:00'), 2);
+insert into ttl values (toDateTime('2000-10-10 00:00:00'), 1), (toDateTime('2000-10-10 00:00:00'), 2)
 insert into ttl values (toDateTime('2100-10-10 00:00:00'), 3), (toDateTime('2100-10-10 00:00:00'), 4);
 
 select sleep(1) format Null; -- wait if very fast merge happen
diff --git a/tests/queries/0_stateless/00982_low_cardinality_setting_in_mv.sql b/tests/queries/0_stateless/00982_low_cardinality_setting_in_mv.sql
index e545dec90b7..7192642bcde 100644
--- a/tests/queries/0_stateless/00982_low_cardinality_setting_in_mv.sql
+++ b/tests/queries/0_stateless/00982_low_cardinality_setting_in_mv.sql
@@ -4,7 +4,7 @@ DROP TABLE IF EXISTS mat_view;
 
 CREATE TABLE test1 (a LowCardinality(String)) ENGINE=MergeTree() ORDER BY a;
 CREATE TABLE test2 (a UInt64) engine=MergeTree() ORDER BY a;
-CREATE MATERIALIZED VIEW test_mv TO test2 AS SELECT toUInt64(a = 'test') AS a FROM test1;
+CREATE MATERIALIZED VIEW test_mv TO test2 AS SELECT toUInt64(a = 'test') FROM test1;
 
 DROP TABLE test_mv;
 DROP TABLE test1;
diff --git a/tests/queries/0_stateless/00990_hasToken.sh b/tests/queries/0_stateless/00990_hasToken.sh
index d79472aa5a5..6a1d4ff5ccf 100755
--- a/tests/queries/0_stateless/00990_hasToken.sh
+++ b/tests/queries/0_stateless/00990_hasToken.sh
@@ -6,4 +6,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 # We should have correct env vars from shell_config.sh to run this test
 
-python3 "$CURDIR"/00990_hasToken.python | ${CLICKHOUSE_CLIENT} --max_query_size 1048576 -m
+python3 "$CURDIR"/00990_hasToken.python | ${CLICKHOUSE_CLIENT} --max_query_size 1048576 -nm
diff --git a/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh b/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
index df330b82c80..8243c6bde62 100755
--- a/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
+++ b/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
@@ -22,7 +22,7 @@ function thread1()
 
 function thread2()
 {
-    while true; do $CLICKHOUSE_CLIENT --query "ALTER TABLE alter_table ADD COLUMN h String '0'; ALTER TABLE alter_table MODIFY COLUMN h UInt64; ALTER TABLE alter_table DROP COLUMN h;"; done
+    while true; do $CLICKHOUSE_CLIENT -n --query "ALTER TABLE alter_table ADD COLUMN h String '0'; ALTER TABLE alter_table MODIFY COLUMN h UInt64; ALTER TABLE alter_table DROP COLUMN h;"; done
 }
 
 function thread3()
diff --git a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
index d5c0248e2b3..02a739ece4a 100755
--- a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
+++ b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
@@ -9,7 +9,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 set -e
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
     DROP TABLE IF EXISTS alter_table0;
     DROP TABLE IF EXISTS alter_table1;
 
@@ -31,7 +31,7 @@ function thread1()
 
 function thread2()
 {
-    while true; do $CLICKHOUSE_CLIENT --query "ALTER TABLE alter_table0 ADD COLUMN h String DEFAULT '0'; ALTER TABLE alter_table0 MODIFY COLUMN h UInt64; ALTER TABLE alter_table0 DROP COLUMN h;"; done
+    while true; do $CLICKHOUSE_CLIENT -n --query "ALTER TABLE alter_table0 ADD COLUMN h String DEFAULT '0'; ALTER TABLE alter_table0 MODIFY COLUMN h UInt64; ALTER TABLE alter_table0 DROP COLUMN h;"; done
 }
 
 function thread3()
@@ -87,6 +87,6 @@ check_replication_consistency "alter_table" "count(), sum(a), sum(b), round(sum(
 
 $CLICKHOUSE_CLIENT -q "SELECT table, lost_part_count FROM system.replicas WHERE database=currentDatabase() AND lost_part_count!=0";
 
-$CLICKHOUSE_CLIENT -q "DROP TABLE alter_table0;" 2> >(grep -F -v 'is already started to be removing by another replica right now') &
-$CLICKHOUSE_CLIENT -q "DROP TABLE alter_table1;" 2> >(grep -F -v 'is already started to be removing by another replica right now') &
+$CLICKHOUSE_CLIENT -n -q "DROP TABLE alter_table0;" 2> >(grep -F -v 'is already started to be removing by another replica right now') &
+$CLICKHOUSE_CLIENT -n -q "DROP TABLE alter_table1;" 2> >(grep -F -v 'is already started to be removing by another replica right now') &
 wait
diff --git a/tests/queries/0_stateless/01000_subquery_requires_alias.sql b/tests/queries/0_stateless/01000_subquery_requires_alias.sql
index 38ba1798dc1..3cd522a8389 100644
--- a/tests/queries/0_stateless/01000_subquery_requires_alias.sql
+++ b/tests/queries/0_stateless/01000_subquery_requires_alias.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET joined_subquery_requires_alias = 1;
 
 SELECT * FROM (SELECT 1 as A, 2 as B) X
diff --git a/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql b/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
index b8f2596f3d5..a090be85221 100644
--- a/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
+++ b/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
@@ -1,7 +1,5 @@
 -- Tags: no-parallel, no-fasttest, no-random-settings
 
-SET max_bytes_in_join = 0;
-SET max_rows_in_join = 0;
 SET max_memory_usage = 32000000;
 SET join_on_disk_max_files_to_merge = 4;
 
diff --git a/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh b/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
index 54f1bbe29dc..55bbfb3ff11 100755
--- a/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
+++ b/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 R1=table_1013_1
 R2=table_1013_2
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -n -q "
     DROP TABLE IF EXISTS $R1;
     DROP TABLE IF EXISTS $R2;
 
@@ -19,13 +19,13 @@ ${CLICKHOUSE_CLIENT} -q "
     INSERT INTO $R1 VALUES (1)
 "
 
-timeout 10s ${CLICKHOUSE_CLIENT} -q "
+timeout 10s ${CLICKHOUSE_CLIENT} -n -q "
     SET receive_timeout=1;
     SYSTEM SYNC REPLICA $R2
 " 2>&1 | grep -F -q "Code: 159. DB::Exception" && echo 'OK' || echo 'Failed!'
 
 # By dropping tables all related SYNC REPLICA queries would be terminated as well
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -n -q "
     DROP TABLE IF EXISTS $R2;
     DROP TABLE IF EXISTS $R1;
 "
diff --git a/tests/queries/0_stateless/01013_totals_without_aggregation.sql b/tests/queries/0_stateless/01013_totals_without_aggregation.sql
index 08be45754bb..ab656cd92b5 100644
--- a/tests/queries/0_stateless/01013_totals_without_aggregation.sql
+++ b/tests/queries/0_stateless/01013_totals_without_aggregation.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT 11 AS n GROUP BY n WITH TOTALS;
 SELECT 12 AS n GROUP BY n WITH ROLLUP;
diff --git a/tests/queries/0_stateless/01014_lazy_database_basic.sh b/tests/queries/0_stateless/01014_lazy_database_basic.sh
index 55d18a7c527..ea7603b2519 100755
--- a/tests/queries/0_stateless/01014_lazy_database_basic.sh
+++ b/tests/queries/0_stateless/01014_lazy_database_basic.sh
@@ -5,9 +5,9 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} -q "DROP DATABASE IF EXISTS testlazy"
+${CLICKHOUSE_CLIENT} -n -q "DROP DATABASE IF EXISTS testlazy"
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -n -q "
     CREATE DATABASE testlazy ENGINE = Lazy(1);
     CREATE TABLE testlazy.log (a UInt64, b UInt64) ENGINE = Log;
     CREATE TABLE testlazy.slog (a UInt64, b UInt64) ENGINE = StripeLog;
@@ -30,7 +30,7 @@ ${CLICKHOUSE_CLIENT} -q "
 
 sleep 1.5
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -n -q "
     SELECT * FROM testlazy.log LIMIT 0; -- drop testlazy.log from cache
     RENAME TABLE testlazy.log TO testlazy.log2;
     SELECT database, name FROM system.tables WHERE database = 'testlazy';
@@ -44,7 +44,7 @@ ${CLICKHOUSE_CLIENT} -q "
 
 sleep 1.5
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -n -q "
     INSERT INTO testlazy.log2 VALUES (1, 1);
     INSERT INTO testlazy.slog VALUES (2, 2);
     INSERT INTO testlazy.tlog VALUES (3, 3);
@@ -55,14 +55,14 @@ ${CLICKHOUSE_CLIENT} -q "
 
 sleep 1.5
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -n -q "
     SELECT * FROM testlazy.log2 LIMIT 0; -- drop testlazy.log2 from cache
     DROP TABLE testlazy.log2;
 "
 
 sleep 1.5
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -n -q "
     SELECT * FROM testlazy.slog;
     SELECT * FROM testlazy.tlog;
 "
diff --git a/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh b/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
index ff2c0b8821e..e4b3a31b13f 100755
--- a/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
+++ b/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
@@ -83,7 +83,7 @@ export -f recreate_lazy_func4;
 export -f show_tables_func;
 
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -n -q "
     DROP DATABASE IF EXISTS $CURR_DATABASE;
     CREATE DATABASE $CURR_DATABASE ENGINE = Lazy(1);
 "
diff --git a/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh b/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
index 053fd9d9d49..4f35b69da0b 100755
--- a/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
+++ b/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
@@ -9,7 +9,7 @@ R1=table_1017_1
 R2=table_1017_2
 T1=table_1017_merge
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -n -q "
     DROP DICTIONARY IF EXISTS dict1;
     DROP TABLE IF EXISTS $R1;
     DROP TABLE IF EXISTS $R2;
@@ -68,7 +68,7 @@ ${CLICKHOUSE_CLIENT} --query "ALTER TABLE $R1 DELETE WHERE dictHas('${CLICKHOUSE
 ${CLICKHOUSE_CLIENT} --query "ALTER TABLE $R1 DELETE WHERE dictHas('${CLICKHOUSE_DATABASE}.dict1', toUInt64(x))" --allow_nondeterministic_mutations=1 2>&1 \
 && echo 'OK' || echo 'FAIL'
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -n -q "
     DROP DICTIONARY IF EXISTS dict1;
     DROP TABLE IF EXISTS $R2;
     DROP TABLE IF EXISTS $R1;
diff --git a/tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql b/tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql
index eca370d94af..c13a0859183 100644
--- a/tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql
+++ b/tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql
@@ -7,8 +7,7 @@
 -- sizeof(HLL) is (2^K * 6 / 8)
 -- hence max_memory_usage for 100 rows = (96<<10)*100 = 9830400
 
-SET use_uncompressed_cache = 0;
-SET memory_profiler_step = 1;
+SET use_uncompressed_cache = 0; 
 
 -- HashTable for UInt32 (used until (1<<13) elements), hence 8192 elements
 SELECT 'UInt32';
@@ -32,14 +31,14 @@ SELECT 'K=16';
 SELECT 'UInt32';
 SET max_memory_usage = 2000000;
 SELECT sum(u) FROM (SELECT intDiv(number, 4096) AS k, uniqCombined(16)(number % 4096) u FROM numbers(4096 * 100) GROUP BY k); -- { serverError MEMORY_LIMIT_EXCEEDED }
-SET max_memory_usage = 5230000;
+SET max_memory_usage = 4915200;
 SELECT sum(u) FROM (SELECT intDiv(number, 4096) AS k, uniqCombined(16)(number % 4096) u FROM numbers(4096 * 100) GROUP BY k);
 
 -- HashTable for UInt64 (used until (1<<11) elements), hence 2048 elements
 SELECT 'UInt64';
 SET max_memory_usage = 2000000;
 SELECT sum(u) FROM (SELECT intDiv(number, 2048) AS k, uniqCombined(16)(reinterpretAsString(number % 2048)) u FROM numbers(2048 * 100) GROUP BY k); -- { serverError MEMORY_LIMIT_EXCEEDED }
-SET max_memory_usage = 5900000;
+SET max_memory_usage = 4915200;
 SELECT sum(u) FROM (SELECT intDiv(number, 2048) AS k, uniqCombined(16)(reinterpretAsString(number % 2048)) u FROM numbers(2048 * 100) GROUP BY k);
 
 SELECT 'K=18';
diff --git a/tests/queries/0_stateless/01018_ambiguous_column.sql b/tests/queries/0_stateless/01018_ambiguous_column.sql
index b2e0e8fc522..e9e754ed7a8 100644
--- a/tests/queries/0_stateless/01018_ambiguous_column.sql
+++ b/tests/queries/0_stateless/01018_ambiguous_column.sql
@@ -1,5 +1,5 @@
 SET output_format_pretty_color=1;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 select * from system.one cross join system.one;
 select * from system.one cross join system.one r;
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh b/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
index 82221eb06e9..872b0a7c1a1 100755
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 set -e
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
     DROP DATABASE IF EXISTS database_for_dict;
     DROP TABLE IF EXISTS table_for_dict1;
     DROP TABLE IF EXISTS table_for_dict2;
@@ -44,7 +44,7 @@ function thread3()
 
 function thread4()
 {
-    while true; do $CLICKHOUSE_CLIENT -q "
+    while true; do $CLICKHOUSE_CLIENT -n -q "
         SELECT * FROM database_for_dict.dict1 FORMAT Null;
         SELECT * FROM database_for_dict.dict2 FORMAT Null;
     " ||: ; done
@@ -52,7 +52,7 @@ function thread4()
 
 function thread5()
 {
-    while true; do $CLICKHOUSE_CLIENT -q "
+    while true; do $CLICKHOUSE_CLIENT -n -q "
         SELECT dictGetString('database_for_dict.dict1', 'value_column', toUInt64(number)) from numbers(1000) FROM FORMAT Null;
         SELECT dictGetString('database_for_dict.dict2', 'value_column', toUInt64(number)) from numbers(1000) FROM FORMAT Null;
     " ||: ; done
@@ -117,7 +117,7 @@ $CLICKHOUSE_CLIENT -q "SELECT 'Still alive'"
 $CLICKHOUSE_CLIENT -q "ATTACH DICTIONARY IF NOT EXISTS database_for_dict.dict1"
 $CLICKHOUSE_CLIENT -q "ATTACH DICTIONARY IF NOT EXISTS database_for_dict.dict2"
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
     DROP DATABASE database_for_dict;
     DROP TABLE table_for_dict1;
     DROP TABLE table_for_dict2;
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_select.sql b/tests/queries/0_stateless/01018_ddl_dictionaries_select.sql
index 4c4bcc440ca..4b9b15bee8f 100644
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_select.sql
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_select.sql
@@ -139,6 +139,6 @@ SELECT {CLICKHOUSE_DATABASE:String} || '.dict3' as n, dictGet(n, 'some_column',
 
 DROP TABLE {CLICKHOUSE_DATABASE:Identifier}.table_for_dict;
 
-SYSTEM RELOAD DICTIONARY {CLICKHOUSE_DATABASE:Identifier}.dict3; -- {serverError UNKNOWN_TABLE}
+SYSTEM RELOAD DICTIONARIES; -- {serverError UNKNOWN_TABLE}
 
 SELECT dictGetString({CLICKHOUSE_DATABASE:String} || '.dict3', 'some_column', toUInt64(12));
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 eb12a76eb62..4bd21fcee02 100755
--- a/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh
+++ b/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS src;
 DROP TABLE IF EXISTS mv;
 
diff --git a/tests/queries/0_stateless/01019_alter_materialized_view_consistent.sh b/tests/queries/0_stateless/01019_alter_materialized_view_consistent.sh
index eccf456d330..26c2e54e637 100755
--- a/tests/queries/0_stateless/01019_alter_materialized_view_consistent.sh
+++ b/tests/queries/0_stateless/01019_alter_materialized_view_consistent.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS src_a;
 DROP TABLE IF EXISTS src_b;
 
diff --git a/tests/queries/0_stateless/01030_storage_url_syntax.sql b/tests/queries/0_stateless/01030_storage_url_syntax.sql
index 084486b61ee..0eb89af8462 100644
--- a/tests/queries/0_stateless/01030_storage_url_syntax.sql
+++ b/tests/queries/0_stateless/01030_storage_url_syntax.sql
@@ -1,6 +1,3 @@
--- Tags: no-fasttest
--- no-fasttest: Timeout for the first query (CANNOT_DETECT_FORMAT) is too slow: https://github.com/ClickHouse/ClickHouse/issues/67939
-
 drop table if exists test_table_url_syntax
 ;
 create table test_table_url_syntax (id UInt32) ENGINE = URL('')
diff --git a/tests/queries/0_stateless/01034_JSONCompactEachRow.sql b/tests/queries/0_stateless/01034_JSONCompactEachRow.sql
index e47e5346c01..f71597a60e5 100644
--- a/tests/queries/0_stateless/01034_JSONCompactEachRow.sql
+++ b/tests/queries/0_stateless/01034_JSONCompactEachRow.sql
@@ -22,64 +22,51 @@ SELECT 5;
 /* Check JSONCompactEachRow Input */
 CREATE TABLE test_table (v1 String, v2 UInt8, v3 DEFAULT v2 * 16, v4 UInt8 DEFAULT 8) ENGINE = MergeTree() ORDER BY v2;
 INSERT INTO test_table FORMAT JSONCompactEachRow ["first", 1, "2", null] ["second", 2, null, 6];
-
 SELECT * FROM test_table FORMAT JSONCompactEachRow;
 TRUNCATE TABLE test_table;
 SELECT 6;
 /* Check input_format_null_as_default = 1 */
 SET input_format_null_as_default = 1;
 INSERT INTO test_table FORMAT JSONCompactEachRow ["first", 1, "2", null] ["second", 2, null, 6];
-
 SELECT * FROM test_table FORMAT JSONCompactEachRow;
 TRUNCATE TABLE test_table;
 SELECT 7;
 /* Check Nested */
 CREATE TABLE test_table_2 (v1 UInt8, n Nested(id UInt8, name String)) ENGINE = MergeTree() ORDER BY v1;
 INSERT INTO test_table_2 FORMAT JSONCompactEachRow [16, [15, 16, null], ["first", "second", "third"]];
-
 SELECT * FROM test_table_2 FORMAT JSONCompactEachRow;
 TRUNCATE TABLE test_table_2;
 SELECT 8;
 /* Check JSONCompactEachRowWithNamesAndTypes and JSONCompactEachRowWithNamesAndTypes Input */
 SET input_format_null_as_default = 0;
 INSERT INTO test_table FORMAT JSONCompactEachRowWithNamesAndTypes ["v1", "v2", "v3", "v4"]["String","UInt8","UInt16","UInt8"]["first", 1, "2", null]["second", 2, null, 6];
-
 INSERT INTO test_table FORMAT JSONCompactEachRowWithNames ["v1", "v2", "v3", "v4"]["first", 1, "2", null]["second", 2, null, 6];
-
 SELECT * FROM test_table FORMAT JSONCompactEachRow;
 TRUNCATE TABLE test_table;
 SELECT 9;
 /* Check input_format_null_as_default = 1 */
 SET input_format_null_as_default = 1;
 INSERT INTO test_table FORMAT JSONCompactEachRowWithNamesAndTypes ["v1", "v2", "v3", "v4"]["String","UInt8","UInt16","UInt8"]["first", 1, "2", null] ["second", 2, null, 6];
-
 INSERT INTO test_table FORMAT JSONCompactEachRowWithNames ["v1", "v2", "v3", "v4"]["first", 1, "2", null] ["second", 2, null, 6];
-
 SELECT * FROM test_table FORMAT JSONCompactEachRow;
 SELECT 10;
 /* Check Header */
 TRUNCATE TABLE test_table;
 SET input_format_skip_unknown_fields = 1;
 INSERT INTO test_table FORMAT JSONCompactEachRowWithNamesAndTypes ["v1", "v2", "invalid_column"]["String", "UInt8", "UInt8"]["first", 1, 32]["second", 2, "64"];
-
 INSERT INTO test_table FORMAT JSONCompactEachRowWithNames ["v1", "v2", "invalid_column"]["first", 1, 32]["second", 2, "64"];
-
 SELECT * FROM test_table FORMAT JSONCompactEachRow;
 SELECT 11;
 TRUNCATE TABLE test_table;
 INSERT INTO test_table FORMAT JSONCompactEachRowWithNamesAndTypes ["v4", "v2", "v3"]["UInt8", "UInt8", "UInt16"][1, 2, 3]
-
 INSERT INTO test_table FORMAT JSONCompactEachRowWithNames ["v4", "v2", "v3"][1, 2, 3]
-
 SELECT * FROM test_table FORMAT JSONCompactEachRowWithNamesAndTypes;
 SELECT '----------';
 SELECT * FROM test_table FORMAT JSONCompactEachRowWithNames;
 SELECT 12;
 /* Check Nested */
 INSERT INTO test_table_2 FORMAT JSONCompactEachRowWithNamesAndTypes ["v1", "n.id", "n.name"]["UInt8", "Array(UInt8)", "Array(String)"][16, [15, 16, null], ["first", "second", "third"]];
-
 INSERT INTO test_table_2 FORMAT JSONCompactEachRowWithNames ["v1", "n.id", "n.name"][16, [15, 16, null], ["first", "second", "third"]];
-
 SELECT * FROM test_table_2 FORMAT JSONCompactEachRowWithNamesAndTypes;
 SELECT '----------';
 SELECT * FROM test_table_2 FORMAT JSONCompactEachRowWithNames;
diff --git a/tests/queries/0_stateless/01035_avg_weighted_long.sh b/tests/queries/0_stateless/01035_avg_weighted_long.sh
index 6c3356324ed..92c86981b37 100755
--- a/tests/queries/0_stateless/01035_avg_weighted_long.sh
+++ b/tests/queries/0_stateless/01035_avg_weighted_long.sh
@@ -28,7 +28,7 @@ exttypes=("Int128" "Int256" "UInt256")
             echo "SELECT avgWeighted(to${left}(1), to${right}(2));"
         done
     done
-) | $CLICKHOUSE_CLIENT_BINARY -m
+) | $CLICKHOUSE_CLIENT_BINARY -nm
 
 ${CLICKHOUSE_CLIENT} --server_logs_file=/dev/null --query="SELECT avgWeighted(['string'], toFloat64(0))" 2>&1 \
   | grep -c 'Code: 43. DB::Exception: .* DB::Exception:.* Types .* are non-conforming as arguments for aggregate function avgWeighted'
diff --git a/tests/queries/0_stateless/01035_lc_empty_part_bug.sh b/tests/queries/0_stateless/01035_lc_empty_part_bug.sh
index a509fcf629c..185c4ef4a4e 100755
--- a/tests/queries/0_stateless/01035_lc_empty_part_bug.sh
+++ b/tests/queries/0_stateless/01035_lc_empty_part_bug.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 # that test is failing on versions <= 19.11.12
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} --multiquery --query="
     DROP TABLE IF EXISTS lc_empty_part_bug;
     create table lc_empty_part_bug (id  UInt64, s String) Engine=MergeTree ORDER BY id SETTINGS number_of_free_entries_in_pool_to_execute_mutation=0;
     insert into lc_empty_part_bug select number as id, toString(rand()) from numbers(100);
@@ -15,7 +15,7 @@ ${CLICKHOUSE_CLIENT} --query="
 
 echo 'Waited for mutation to finish'
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} --multiquery --query="
     alter table lc_empty_part_bug modify column s LowCardinality(String);
     SELECT 'still alive';
     insert into lc_empty_part_bug select number+100 as id, toString(rand()) from numbers(100);
diff --git a/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql b/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql
index 1334780a5af..d0841124706 100644
--- a/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql
+++ b/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql
@@ -1,6 +1,3 @@
--- Tags: no-parallel
--- Does not allow if other tests do SYSTEM RELOAD DICTIONARIES at the same time.
-
 CREATE TABLE dict_data (key UInt64, val UInt64) Engine=Memory();
 CREATE DICTIONARY dict
 (
diff --git a/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh b/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh
index 5c67fe08fbf..9a26f78a8ee 100755
--- a/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh
+++ b/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh
@@ -14,7 +14,7 @@ declare -a SearchTypes=("POLYGON" "POLYGON_SIMPLE" "POLYGON_INDEX_EACH" "POLYGON
 
 tar -xf "${CURDIR}"/01037_test_data_search.tar.gz -C "${DATA_DIR}"
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 DROP TABLE IF EXISTS points;
 CREATE TABLE points (x Float64, y Float64) ENGINE = Memory;
 "
@@ -23,7 +23,7 @@ $CLICKHOUSE_CLIENT --query="INSERT INTO points FORMAT TSV" --max_insert_block_si
 
 rm "${DATA_DIR}"/01037_point_data
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 DROP TABLE IF EXISTS polygons_array;
 
 CREATE TABLE polygons_array
@@ -43,7 +43,7 @@ for type in "${SearchTypes[@]}";
 do
    outputFile="${TMP_DIR}/results${type}.out"
 
-   $CLICKHOUSE_CLIENT --query="
+   $CLICKHOUSE_CLIENT -n --query="
    DROP DICTIONARY IF EXISTS dict_array;
 
    CREATE DICTIONARY dict_array
diff --git a/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh b/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh
index 591978d1129..47f7a5c1c4f 100755
--- a/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh
+++ b/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh
@@ -14,7 +14,7 @@ declare -a SearchTypes=("POLYGON_INDEX_EACH" "POLYGON_INDEX_CELL")
 
 tar -xf "${CURDIR}"/01037_test_data_perf.tar.gz -C "${DATA_DIR}"
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 CREATE TABLE points (x Float64, y Float64) ENGINE = Memory;
 "
 
@@ -22,7 +22,7 @@ $CLICKHOUSE_CLIENT --query="INSERT INTO points FORMAT TSV" --min_chunk_bytes_for
 
 rm "${DATA_DIR}"/01037_point_data
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 DROP TABLE IF EXISTS polygons_array;
 
 CREATE TABLE polygons_array
@@ -42,7 +42,7 @@ for type in "${SearchTypes[@]}";
 do
    outputFile="${TMP_DIR}/results${type}.out"
 
-   $CLICKHOUSE_CLIENT --query="
+   $CLICKHOUSE_CLIENT -n --query="
    DROP DICTIONARY IF EXISTS dict_array;
 
    CREATE DICTIONARY dict_array
diff --git a/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh b/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh
index ac033ff4eb8..d1ee3f283bc 100755
--- a/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh
+++ b/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 TMP_DIR=${CLICKHOUSE_TMP}/tmp
 mkdir -p $TMP_DIR
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 DROP TABLE IF EXISTS polygons_array;
 
 CREATE TABLE polygons_array (key Array(Array(Array(Array(Float64)))), name String, value UInt64) ENGINE = Memory;
@@ -53,7 +53,7 @@ for type in "${SearchTypes[@]}";
 do
     outputFile="${TMP_DIR}/results${type}.out"
 
-    $CLICKHOUSE_CLIENT --query="
+    $CLICKHOUSE_CLIENT -n --query="
     DROP DICTIONARY IF EXISTS dict_array;
     CREATE DICTIONARY dict_array
     (
@@ -106,7 +106,7 @@ do
     diff -q "${CURDIR}/01037_polygon_dicts_simple_functions.ans" "$outputFile"
 done
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 DROP DICTIONARY dict_array;
 DROP DICTIONARY dict_tuple;
 DROP TABLE polygons_array;
diff --git a/tests/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh b/tests/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh
index 8e15453cbe5..66732205f95 100755
--- a/tests/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh
+++ b/tests/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -41,7 +42,6 @@ function check()
 
     while [ "$query_result" != "2.2" ]
     do
-        sleep 0.2
         query_result=$($CLICKHOUSE_CLIENT --query "SELECT dictGetFloat64('${CLICKHOUSE_DATABASE}.dict_with_zero_min_lifetime', 'value', toUInt64(2))")
     done
 }
diff --git a/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.reference b/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.reference
index 10bc7981d3e..f12dcd8258a 100644
--- a/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.reference
+++ b/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.reference
@@ -1,6 +1,6 @@
 12 -> 	102
 13 -> 	103
 14 -> 	-1
-12 (after reloading) -> 	102
-13 (after reloading) -> 	103
-14 (after reloading) -> 	104
+12(r) -> 	102
+13(r) -> 	103
+14(r) -> 	104
diff --git a/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh b/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
index 453e1bb8f0a..2b075566ac3 100755
--- a/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
+++ b/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
-# Tags: no-random-settings
-# Dictionaries are updated using the server time.
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -8,19 +6,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 set -e -o pipefail
 
-# Wait when the dictionary will update the value for 13 on its own:
-function wait_for_dict_upate()
-{
-    for ((i = 0; i < 100; ++i)); do
-        if [ "$(${CLICKHOUSE_CLIENT} --query "SELECT dictGetInt64('${CLICKHOUSE_DATABASE}.dict', 'y', toUInt64(13))")" != -1 ]; then
-            return 0
-        fi
-        sleep 0.5
-    done
-    return 1
-}
-
-$CLICKHOUSE_CLIENT <<EOF
+# NOTE: dictionaries TTLs works with server timezone, so session_timeout cannot be used
+$CLICKHOUSE_CLIENT --session_timezone '' --multiquery <<EOF
 CREATE TABLE ${CLICKHOUSE_DATABASE}.table(x Int64, y Int64, insert_time DateTime) ENGINE = MergeTree ORDER BY tuple();
 INSERT INTO ${CLICKHOUSE_DATABASE}.table VALUES (12, 102, now());
 
@@ -31,7 +18,7 @@ CREATE DICTIONARY ${CLICKHOUSE_DATABASE}.dict
   insert_time DateTime
 )
 PRIMARY KEY x
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table' DB '${CLICKHOUSE_DATABASE}' UPDATE_FIELD 'insert_time' UPDATE_LAG 60))
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table' DB '${CLICKHOUSE_DATABASE}' UPDATE_FIELD 'insert_time'))
 LAYOUT(FLAT())
 LIFETIME(1);
 EOF
@@ -41,20 +28,16 @@ $CLICKHOUSE_CLIENT --query "SELECT '12 -> ', dictGetInt64('${CLICKHOUSE_DATABASE
 $CLICKHOUSE_CLIENT --query "INSERT INTO ${CLICKHOUSE_DATABASE}.table VALUES (13, 103, now())"
 $CLICKHOUSE_CLIENT --query "INSERT INTO ${CLICKHOUSE_DATABASE}.table VALUES (14, 104, now() - INTERVAL 1 DAY)"
 
-if ! wait_for_dict_upate; then
-    echo "Dictionary had not been reloaded" >&2
-    exit 1
-fi
+while [ "$(${CLICKHOUSE_CLIENT} --query "SELECT dictGetInt64('${CLICKHOUSE_DATABASE}.dict', 'y', toUInt64(13))")" = -1 ]
+    do
+        sleep 0.5
+    done
 
 $CLICKHOUSE_CLIENT --query "SELECT '13 -> ', dictGetInt64('${CLICKHOUSE_DATABASE}.dict', 'y', toUInt64(13))"
-
-# By the way, the value for 14 is expected to not be updated at this moment,
-# because the values were selected by the update field insert_time, and for 14 it was set as one day ago.
 $CLICKHOUSE_CLIENT --query "SELECT '14 -> ', dictGetInt64('${CLICKHOUSE_DATABASE}.dict', 'y', toUInt64(14))"
 
-# SYSTEM RELOAD DICTIONARY reloads it completely, regardless of the update field, so we will see new values, even for key 14.
 $CLICKHOUSE_CLIENT --query "SYSTEM RELOAD DICTIONARY '${CLICKHOUSE_DATABASE}.dict'"
 
-$CLICKHOUSE_CLIENT --query "SELECT '12 (after reloading) -> ', dictGetInt64('${CLICKHOUSE_DATABASE}.dict', 'y', toUInt64(12))"
-$CLICKHOUSE_CLIENT --query "SELECT '13 (after reloading) -> ', dictGetInt64('${CLICKHOUSE_DATABASE}.dict', 'y', toUInt64(13))"
-$CLICKHOUSE_CLIENT --query "SELECT '14 (after reloading) -> ', dictGetInt64('${CLICKHOUSE_DATABASE}.dict', 'y', toUInt64(14))"
+$CLICKHOUSE_CLIENT --query "SELECT '12(r) -> ', dictGetInt64('${CLICKHOUSE_DATABASE}.dict', 'y', toUInt64(12))"
+$CLICKHOUSE_CLIENT --query "SELECT '13(r) -> ', dictGetInt64('${CLICKHOUSE_DATABASE}.dict', 'y', toUInt64(13))"
+$CLICKHOUSE_CLIENT --query "SELECT '14(r) -> ', dictGetInt64('${CLICKHOUSE_DATABASE}.dict', 'y', toUInt64(14))"
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 de436f1b28e..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,5 +1,5 @@
 SET send_logs_level = 'fatal';
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 SET allow_experimental_window_view = 1;
 DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
 set allow_deprecated_database_ordinary=1;
diff --git a/tests/queries/0_stateless/01048_window_view_parser.sql b/tests/queries/0_stateless/01048_window_view_parser.sql
index bcd80e37c00..adcb4a6364d 100644
--- a/tests/queries/0_stateless/01048_window_view_parser.sql
+++ b/tests/queries/0_stateless/01048_window_view_parser.sql
@@ -1,7 +1,7 @@
 -- Tags: no-parallel
 
 SET send_logs_level = 'fatal';
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 SET allow_experimental_window_view = 1;
 DROP DATABASE IF EXISTS test_01048;
 set allow_deprecated_database_ordinary=1;
diff --git a/tests/queries/0_stateless/01049_join_low_card_bug_long.reference.j2 b/tests/queries/0_stateless/01049_join_low_card_bug_long.reference.j2
index 341e77b1d78..2ebe5c373b2 100644
--- a/tests/queries/0_stateless/01049_join_low_card_bug_long.reference.j2
+++ b/tests/queries/0_stateless/01049_join_low_card_bug_long.reference.j2
@@ -1,5 +1,5 @@
 -- { echoOn }
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 {% for join_algorithm in ['default', 'partial_merge', 'parallel_hash'] -%}
 SET join_algorithm = '{{ join_algorithm }}';
 SET join_use_nulls = 0;
@@ -313,7 +313,7 @@ SELECT r.lc, materialize(r.lc), toTypeName(r.lc), toTypeName(materialize(r.lc))
 str	str	LowCardinality(Nullable(String))	LowCardinality(Nullable(String))
 str_r	str_r	LowCardinality(Nullable(String))	LowCardinality(Nullable(String))
 \N	\N	LowCardinality(Nullable(String))	LowCardinality(Nullable(String))
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 {% for join_algorithm in ['default', 'partial_merge', 'parallel_hash'] -%}
 SET join_algorithm = '{{ join_algorithm }}';
 SET join_use_nulls = 0;
diff --git a/tests/queries/0_stateless/01049_join_low_card_bug_long.sql.j2 b/tests/queries/0_stateless/01049_join_low_card_bug_long.sql.j2
index 7e7b5cb1fed..64ec34ef1bf 100644
--- a/tests/queries/0_stateless/01049_join_low_card_bug_long.sql.j2
+++ b/tests/queries/0_stateless/01049_join_low_card_bug_long.sql.j2
@@ -23,9 +23,9 @@ INSERT INTO nl VALUES (0, 'str'), (2, 'str_l');
 INSERT INTO l_lc VALUES (0, 'str'), (2, 'str_l');
 
 -- { echoOn }
-{% for enable_analyzer in [0, 1] -%}
+{% for allow_experimental_analyzer in [0, 1] -%}
 
-SET enable_analyzer = {{ enable_analyzer }};
+SET allow_experimental_analyzer = {{ allow_experimental_analyzer }};
 
 {% for join_algorithm in ['default', 'partial_merge', 'parallel_hash'] -%}
 SET join_algorithm = '{{ join_algorithm }}';
diff --git a/tests/queries/0_stateless/01050_window_view_parser_tumble.sql b/tests/queries/0_stateless/01050_window_view_parser_tumble.sql
index 9c4d312bab6..c52a6fefacb 100644
--- a/tests/queries/0_stateless/01050_window_view_parser_tumble.sql
+++ b/tests/queries/0_stateless/01050_window_view_parser_tumble.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 SET allow_experimental_window_view = 1;
 
 DROP TABLE IF EXISTS mt;
diff --git a/tests/queries/0_stateless/01051_window_view_parser_hop.sql b/tests/queries/0_stateless/01051_window_view_parser_hop.sql
index 569e3b2a6bf..b37e4ed3095 100644
--- a/tests/queries/0_stateless/01051_window_view_parser_hop.sql
+++ b/tests/queries/0_stateless/01051_window_view_parser_hop.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 SET allow_experimental_window_view = 1;
 
 DROP TABLE IF EXISTS mt;
diff --git a/tests/queries/0_stateless/01052_window_view_proc_tumble_to_now.sh b/tests/queries/0_stateless/01052_window_view_proc_tumble_to_now.sh
index a235b60cee9..5c70806ea7b 100755
--- a/tests/queries/0_stateless/01052_window_view_proc_tumble_to_now.sh
+++ b/tests/queries/0_stateless/01052_window_view_proc_tumble_to_now.sh
@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
+# Tags: no-random-settings, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01053_ssd_dictionary.sh b/tests/queries/0_stateless/01053_ssd_dictionary.sh
index 7dd3fa4657a..fdd40940ab5 100755
--- a/tests/queries/0_stateless/01053_ssd_dictionary.sh
+++ b/tests/queries/0_stateless/01053_ssd_dictionary.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --allow_deprecated_database_ordinary=1 --query="
+$CLICKHOUSE_CLIENT --allow_deprecated_database_ordinary=1 -n --query="
   DROP DATABASE IF EXISTS 01053_db;
 
   CREATE DATABASE 01053_db;
diff --git a/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sh b/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sh
index b4a647c9864..32c9c52ab09 100755
--- a/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sh
+++ b/tests/queries/0_stateless/01053_window_view_proc_hop_to_now.sh
@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
+# Tags: no-random-settings, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sh b/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sh
index af9a47714b5..ba566bb4ae6 100755
--- a/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sh
+++ b/tests/queries/0_stateless/01054_window_view_proc_tumble_to.sh
@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
+# Tags: no-random-settings, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01055_minmax_index_compact_parts.sh b/tests/queries/0_stateless/01055_minmax_index_compact_parts.sh
index 29ce4da02ed..0b14ef8f6fa 100755
--- a/tests/queries/0_stateless/01055_minmax_index_compact_parts.sh
+++ b/tests/queries/0_stateless/01055_minmax_index_compact_parts.sh
@@ -10,7 +10,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS minmax_idx;"
 
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
 CREATE TABLE minmax_idx
 (
     u64 UInt64,
diff --git a/tests/queries/0_stateless/01055_window_view_proc_hop_to.sh b/tests/queries/0_stateless/01055_window_view_proc_hop_to.sh
index 5a7e92e6a1b..0db4173b3dc 100755
--- a/tests/queries/0_stateless/01055_window_view_proc_hop_to.sh
+++ b/tests/queries/0_stateless/01055_window_view_proc_hop_to.sh
@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
+# Tags: no-random-settings, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
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 e0f969050b5..e65650816ab 100755
--- a/tests/queries/0_stateless/01056_window_view_proc_hop_watch.py
+++ b/tests/queries/0_stateless/01056_window_view_proc_hop_watch.py
@@ -20,9 +20,7 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.expect(prompt)
 
-    client1.send(
-        "SET enable_analyzer = 0, function_sleep_max_microseconds_per_block=10000000"
-    )
+    client1.send("SET allow_experimental_analyzer = 0")
     client1.expect(prompt)
     client1.send("SET allow_experimental_window_view = 1")
     client1.expect(prompt)
@@ -30,9 +28,7 @@ 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 enable_analyzer = 0, function_sleep_max_microseconds_per_block=10000000"
-    )
+    client2.send("SET allow_experimental_analyzer = 0")
     client2.expect(prompt)
 
     client1.send("CREATE DATABASE IF NOT EXISTS 01056_window_view_proc_hop_watch")
@@ -46,9 +42,8 @@ with client(name="client1>", log=log) as client1, client(
         "CREATE TABLE 01056_window_view_proc_hop_watch.mt(a Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple()"
     )
     client1.expect(prompt)
-    # Introduce a sleep call to verify that even if the push to view is slow WATCH will work
     client1.send(
-        "CREATE WINDOW VIEW 01056_window_view_proc_hop_watch.wv ENGINE Memory AS SELECT count(sleep(5)) AS count FROM 01056_window_view_proc_hop_watch.mt GROUP BY hop(timestamp, INTERVAL '1' SECOND, INTERVAL '1' SECOND, 'US/Samoa') AS wid;"
+        "CREATE WINDOW VIEW 01056_window_view_proc_hop_watch.wv ENGINE Memory AS SELECT count(a) AS count FROM 01056_window_view_proc_hop_watch.mt GROUP BY hop(timestamp, INTERVAL '1' SECOND, INTERVAL '1' SECOND, 'US/Samoa') AS wid;"
     )
     client1.expect(prompt)
 
diff --git a/tests/queries/0_stateless/01057_window_view_event_tumble_to_strict_asc.sh b/tests/queries/0_stateless/01057_window_view_event_tumble_to_strict_asc.sh
index ab0a6c147a9..087e2577e5f 100755
--- a/tests/queries/0_stateless/01057_window_view_event_tumble_to_strict_asc.sh
+++ b/tests/queries/0_stateless/01057_window_view_event_tumble_to_strict_asc.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01058_window_view_event_hop_to_strict_asc.sh b/tests/queries/0_stateless/01058_window_view_event_hop_to_strict_asc.sh
index 529d7ba195f..b74e8cc6d25 100755
--- a/tests/queries/0_stateless/01058_window_view_event_hop_to_strict_asc.sh
+++ b/tests/queries/0_stateless/01058_window_view_event_hop_to_strict_asc.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01059_window_view_event_hop_watch_strict_asc.py b/tests/queries/0_stateless/01059_window_view_event_hop_watch_strict_asc.py
index 33e63502ef2..3dbb176b0dc 100755
--- a/tests/queries/0_stateless/01059_window_view_event_hop_watch_strict_asc.py
+++ b/tests/queries/0_stateless/01059_window_view_event_hop_watch_strict_asc.py
@@ -20,13 +20,13 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.expect(prompt)
 
-    client1.send("SET enable_analyzer = 0")
+    client1.send("SET allow_experimental_analyzer = 0")
     client1.expect(prompt)
     client1.send("SET allow_experimental_window_view = 1")
     client1.expect(prompt)
     client1.send("SET window_view_heartbeat_interval = 1")
     client1.expect(prompt)
-    client2.send("SET enable_analyzer = 0")
+    client2.send("SET allow_experimental_analyzer = 0")
     client2.expect(prompt)
 
     client1.send("CREATE DATABASE IF NOT EXISTS db_01059_event_hop_watch_strict_asc")
diff --git a/tests/queries/0_stateless/01060_defaults_all_columns.sql b/tests/queries/0_stateless/01060_defaults_all_columns.sql
index 74fad7f75fb..afbb01b8cb2 100644
--- a/tests/queries/0_stateless/01060_defaults_all_columns.sql
+++ b/tests/queries/0_stateless/01060_defaults_all_columns.sql
@@ -3,7 +3,6 @@ DROP TABLE IF EXISTS defaults_all_columns;
 CREATE TABLE defaults_all_columns (n UInt8 DEFAULT 42, s String DEFAULT concat('test', CAST(n, 'String'))) ENGINE = Memory;
 
 INSERT INTO defaults_all_columns FORMAT JSONEachRow {"n": 1, "s": "hello"} {};
-
 INSERT INTO defaults_all_columns FORMAT JSONEachRow {"n": 2}, {"s": "world"};
 
 SELECT * FROM defaults_all_columns ORDER BY n, s;
diff --git a/tests/queries/0_stateless/01060_window_view_event_tumble_to_asc.sh b/tests/queries/0_stateless/01060_window_view_event_tumble_to_asc.sh
index 1da599f4d49..8161e54923d 100755
--- a/tests/queries/0_stateless/01060_window_view_event_tumble_to_asc.sh
+++ b/tests/queries/0_stateless/01060_window_view_event_tumble_to_asc.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01061_window_view_event_hop_to_asc.sh b/tests/queries/0_stateless/01061_window_view_event_hop_to_asc.sh
index 52a187f256e..2230fc28fca 100755
--- a/tests/queries/0_stateless/01061_window_view_event_hop_to_asc.sh
+++ b/tests/queries/0_stateless/01061_window_view_event_hop_to_asc.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01062_window_view_event_hop_watch_asc.py b/tests/queries/0_stateless/01062_window_view_event_hop_watch_asc.py
index 22a171781d9..d6cc3ee1a88 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
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# Tags: no-parallel
 
 import os
 import sys
@@ -16,11 +17,10 @@ log = None
 with client(name="client1>", log=log) as client1, client(
     name="client2>", log=log
 ) as client2:
-    database_name = os.environ["CLICKHOUSE_DATABASE"]
     client1.expect(prompt)
     client2.expect(prompt)
 
-    client1.send("SET enable_analyzer = 0")
+    client1.send("SET allow_experimental_analyzer = 0")
     client1.expect(prompt)
     client1.send("SET allow_experimental_window_view = 1")
     client1.expect(prompt)
@@ -28,41 +28,43 @@ 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 enable_analyzer = 0")
+    client2.send("SET allow_experimental_analyzer = 0")
     client2.expect(prompt)
 
-    client1.send(f"DROP TABLE IF EXISTS {database_name}.mt")
+    client1.send("CREATE DATABASE IF NOT EXISTS 01062_window_view_event_hop_watch_asc")
     client1.expect(prompt)
-    client1.send(f"DROP TABLE IF EXISTS {database_name}.wv SYNC")
+    client1.send("DROP TABLE IF EXISTS 01062_window_view_event_hop_watch_asc.mt")
+    client1.expect(prompt)
+    client1.send("DROP TABLE IF EXISTS 01062_window_view_event_hop_watch_asc.wv SYNC")
     client1.expect(prompt)
 
     client1.send(
-        f"CREATE TABLE {database_name}.mt(a Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple()"
+        "CREATE TABLE 01062_window_view_event_hop_watch_asc.mt(a Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple()"
     )
     client1.expect(prompt)
     client1.send(
-        f"CREATE WINDOW VIEW {database_name}.wv ENGINE Memory WATERMARK=ASCENDING AS SELECT count(a) AS count, hopEnd(wid) AS w_end FROM {database_name}.mt GROUP BY hop(timestamp, INTERVAL '2' SECOND, INTERVAL '3' SECOND, 'US/Samoa') AS wid"
+        "CREATE WINDOW VIEW 01062_window_view_event_hop_watch_asc.wv ENGINE Memory WATERMARK=ASCENDING AS SELECT count(a) AS count, hopEnd(wid) AS w_end FROM 01062_window_view_event_hop_watch_asc.mt GROUP BY hop(timestamp, INTERVAL '2' SECOND, INTERVAL '3' SECOND, 'US/Samoa') AS wid"
     )
     client1.expect(prompt)
 
-    client1.send(f"WATCH {database_name}.wv")
+    client1.send("WATCH 01062_window_view_event_hop_watch_asc.wv")
     client1.expect("Query id" + end_of_block)
     client1.expect("Progress: 0.00 rows.*\\)")
     client2.send(
-        f"INSERT INTO {database_name}.mt VALUES (1, toDateTime('1990/01/01 12:00:00', 'US/Samoa'));"
+        "INSERT INTO 01062_window_view_event_hop_watch_asc.mt VALUES (1, toDateTime('1990/01/01 12:00:00', 'US/Samoa'));"
     )
     client2.expect(prompt)
     client2.send(
-        f"INSERT INTO {database_name}.mt VALUES (1, toDateTime('1990/01/01 12:00:05', 'US/Samoa'));"
+        "INSERT INTO 01062_window_view_event_hop_watch_asc.mt VALUES (1, toDateTime('1990/01/01 12:00:05', 'US/Samoa'));"
     )
     client2.expect(prompt)
     client1.expect("1*" + end_of_block)
     client2.send(
-        f"INSERT INTO {database_name}.mt VALUES (1, toDateTime('1990/01/01 12:00:06', 'US/Samoa'));"
+        "INSERT INTO 01062_window_view_event_hop_watch_asc.mt VALUES (1, toDateTime('1990/01/01 12:00:06', 'US/Samoa'));"
     )
     client2.expect(prompt)
     client2.send(
-        f"INSERT INTO {database_name}.mt VALUES (1, toDateTime('1990/01/01 12:00:10', 'US/Samoa'));"
+        "INSERT INTO 01062_window_view_event_hop_watch_asc.mt VALUES (1, toDateTime('1990/01/01 12:00:10', 'US/Samoa'));"
     )
     client2.expect(prompt)
     client1.expect("1" + end_of_block)
@@ -75,7 +77,9 @@ with client(name="client1>", log=log) as client1, client(
     if match.groups()[1]:
         client1.send(client1.command)
         client1.expect(prompt)
-    client1.send(f"DROP TABLE {database_name}.wv SYNC")
+    client1.send("DROP TABLE 01062_window_view_event_hop_watch_asc.wv SYNC")
     client1.expect(prompt)
-    client1.send(f"DROP TABLE {database_name}.mt")
+    client1.send("DROP TABLE 01062_window_view_event_hop_watch_asc.mt")
+    client1.expect(prompt)
+    client1.send("DROP DATABASE IF EXISTS 01062_window_view_event_hop_watch_asc")
     client1.expect(prompt)
diff --git a/tests/queries/0_stateless/01063_window_view_event_tumble_to_bounded.sh b/tests/queries/0_stateless/01063_window_view_event_tumble_to_bounded.sh
index 1b08841bcf6..913f2b69b9c 100755
--- a/tests/queries/0_stateless/01063_window_view_event_tumble_to_bounded.sh
+++ b/tests/queries/0_stateless/01063_window_view_event_tumble_to_bounded.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01064_window_view_event_hop_to_bounded.sh b/tests/queries/0_stateless/01064_window_view_event_hop_to_bounded.sh
index 48a01592121..20e6a72f7d9 100755
--- a/tests/queries/0_stateless/01064_window_view_event_hop_to_bounded.sh
+++ b/tests/queries/0_stateless/01064_window_view_event_hop_to_bounded.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01065_window_view_event_hop_watch_bounded.py b/tests/queries/0_stateless/01065_window_view_event_hop_watch_bounded.py
index b9dacedd090..e5f9ab59f60 100755
--- a/tests/queries/0_stateless/01065_window_view_event_hop_watch_bounded.py
+++ b/tests/queries/0_stateless/01065_window_view_event_hop_watch_bounded.py
@@ -19,7 +19,7 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.expect(prompt)
 
-    client1.send("SET enable_analyzer = 0")
+    client1.send("SET allow_experimental_analyzer = 0")
     client1.expect(prompt)
     client1.send("SET allow_experimental_window_view = 1")
     client1.expect(prompt)
@@ -27,7 +27,7 @@ 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 enable_analyzer = 0")
+    client2.send("SET allow_experimental_analyzer = 0")
     client2.expect(prompt)
 
     client1.send(
diff --git a/tests/queries/0_stateless/01066_window_view_event_tumble_to_strict_asc_lateness.sh b/tests/queries/0_stateless/01066_window_view_event_tumble_to_strict_asc_lateness.sh
index d61502331bc..756c74d4fa9 100755
--- a/tests/queries/0_stateless/01066_window_view_event_tumble_to_strict_asc_lateness.sh
+++ b/tests/queries/0_stateless/01066_window_view_event_tumble_to_strict_asc_lateness.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01067_window_view_event_tumble_to_asc_lateness.sh b/tests/queries/0_stateless/01067_window_view_event_tumble_to_asc_lateness.sh
index b272a7c5762..8d2c58a7332 100755
--- a/tests/queries/0_stateless/01067_window_view_event_tumble_to_asc_lateness.sh
+++ b/tests/queries/0_stateless/01067_window_view_event_tumble_to_asc_lateness.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01068_window_view_event_tumble_to_bounded_lateness.sh b/tests/queries/0_stateless/01068_window_view_event_tumble_to_bounded_lateness.sh
index 9e184e5ba14..3367bba1e03 100755
--- a/tests/queries/0_stateless/01068_window_view_event_tumble_to_bounded_lateness.sh
+++ b/tests/queries/0_stateless/01068_window_view_event_tumble_to_bounded_lateness.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01069_window_view_proc_tumble_watch.py b/tests/queries/0_stateless/01069_window_view_proc_tumble_watch.py
index 904723f650f..8c3a46992dc 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
@@ -20,7 +20,7 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.expect(prompt)
 
-    client1.send("SET enable_analyzer = 0")
+    client1.send("SET allow_experimental_analyzer = 0")
     client1.expect(prompt)
     client1.send("SET allow_experimental_window_view = 1")
     client1.expect(prompt)
@@ -28,7 +28,7 @@ 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 enable_analyzer = 0")
+    client2.send("SET allow_experimental_analyzer = 0")
     client2.expect(prompt)
 
     client1.send("CREATE DATABASE 01069_window_view_proc_tumble_watch")
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 35f0155c624..172a82a29da 100755
--- a/tests/queries/0_stateless/01070_window_view_watch_events.py
+++ b/tests/queries/0_stateless/01070_window_view_watch_events.py
@@ -20,7 +20,7 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.expect(prompt)
 
-    client1.send("SET enable_analyzer = 0")
+    client1.send("SET allow_experimental_analyzer = 0")
     client1.expect(prompt)
     client1.send("SET allow_experimental_window_view = 1")
     client1.expect(prompt)
@@ -28,7 +28,7 @@ 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 enable_analyzer = 0")
+    client2.send("SET allow_experimental_analyzer = 0")
     client2.expect(prompt)
 
     client1.send("CREATE DATABASE IF NOT EXISTS 01070_window_view_watch_events")
diff --git a/tests/queries/0_stateless/01071_window_view_event_tumble_asc_join.sh b/tests/queries/0_stateless/01071_window_view_event_tumble_asc_join.sh
index 6614c8a578a..f1d426228cf 100755
--- a/tests/queries/0_stateless/01071_window_view_event_tumble_asc_join.sh
+++ b/tests/queries/0_stateless/01071_window_view_event_tumble_asc_join.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS info;
diff --git a/tests/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql b/tests/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql
index ae5e86ec387..f7ccc309c5a 100644
--- a/tests/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql
+++ b/tests/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql
@@ -2,13 +2,9 @@
 
 DROP TABLE IF EXISTS json_square_brackets;
 CREATE TABLE json_square_brackets (id UInt32, name String) ENGINE = Memory;
-
 INSERT INTO json_square_brackets FORMAT JSONEachRow [{"id": 1, "name": "name1"}, {"id": 2, "name": "name2"}];
-
 INSERT INTO json_square_brackets FORMAT JSONEachRow[];
-
 INSERT INTO json_square_brackets FORMAT JSONEachRow [  ]  ;
-
 INSERT INTO json_square_brackets FORMAT JSONEachRow ;
 
 SELECT * FROM json_square_brackets ORDER BY id;
diff --git a/tests/queries/0_stateless/01072_window_view_multiple_columns_groupby.sh b/tests/queries/0_stateless/01072_window_view_multiple_columns_groupby.sh
index 998ee9855ae..062ecf648a7 100755
--- a/tests/queries/0_stateless/01072_window_view_multiple_columns_groupby.sh
+++ b/tests/queries/0_stateless/01072_window_view_multiple_columns_groupby.sh
@@ -7,10 +7,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01073_window_view_event_tumble_to_asc_populate.sh b/tests/queries/0_stateless/01073_window_view_event_tumble_to_asc_populate.sh
index a26221d0328..b2a98897aff 100755
--- a/tests/queries/0_stateless/01073_window_view_event_tumble_to_asc_populate.sh
+++ b/tests/queries/0_stateless/01073_window_view_event_tumble_to_asc_populate.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -33,7 +33,7 @@ while true; do
 	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM dst" | grep -q "7" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SELECT * FROM dst ORDER BY market, w_end;
 INSERT INTO mt VALUES (1, 8, '1990/01/01 12:00:35');
 INSERT INTO mt VALUES (1, 8, '1990/01/01 12:00:37');
diff --git a/tests/queries/0_stateless/01074_window_view_event_tumble_asc_join_populate.sh b/tests/queries/0_stateless/01074_window_view_event_tumble_asc_join_populate.sh
index 97dfef61b1a..5f169920dee 100755
--- a/tests/queries/0_stateless/01074_window_view_event_tumble_asc_join_populate.sh
+++ b/tests/queries/0_stateless/01074_window_view_event_tumble_asc_join_populate.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS info;
diff --git a/tests/queries/0_stateless/01075_window_view_proc_tumble_to_now_populate.sh b/tests/queries/0_stateless/01075_window_view_proc_tumble_to_now_populate.sh
index 220bb39602b..67c249a9d0e 100755
--- a/tests/queries/0_stateless/01075_window_view_proc_tumble_to_now_populate.sh
+++ b/tests/queries/0_stateless/01075_window_view_proc_tumble_to_now_populate.sh
@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
+# Tags: no-random-settings, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh b/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
index e003d2a26da..dcd15718416 100755
--- a/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
+++ b/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: race, no-parallel
+# Tags: race
 
 # This is a monkey test used to trigger sanitizers.
 
diff --git a/tests/queries/0_stateless/01076_window_view_alter_query_to.sh b/tests/queries/0_stateless/01076_window_view_alter_query_to.sh
index de782261a59..11c126ea6de 100755
--- a/tests/queries/0_stateless/01076_window_view_alter_query_to.sh
+++ b/tests/queries/0_stateless/01076_window_view_alter_query_to.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
@@ -33,7 +33,7 @@ done
 $CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY market, w_end;"
 $CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT '----ALTER TABLE...MODIFY QUERY----';"
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 ALTER TABLE wv MODIFY QUERY SELECT count(a) AS count, mt.market * 2 as market, tumbleEnd(wid) AS w_end FROM mt GROUP BY tumble(timestamp, INTERVAL '5' SECOND, 'US/Samoa') AS wid, mt.market;
 
 INSERT INTO mt VALUES (1, 6, '1990/01/01 12:00:10');
diff --git a/tests/queries/0_stateless/01077_mutations_index_consistency.sh b/tests/queries/0_stateless/01077_mutations_index_consistency.sh
index f103692de56..ffbe3692b64 100755
--- a/tests/queries/0_stateless/01077_mutations_index_consistency.sh
+++ b/tests/queries/0_stateless/01077_mutations_index_consistency.sh
@@ -7,13 +7,13 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS movement"
 
-$CLICKHOUSE_CLIENT --query "CREATE TABLE movement (date DateTime('Asia/Istanbul')) Engine = MergeTree ORDER BY (toStartOfHour(date)) SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';"
+$CLICKHOUSE_CLIENT -n --query "CREATE TABLE movement (date DateTime('Asia/Istanbul')) Engine = MergeTree ORDER BY (toStartOfHour(date)) SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';"
 
 $CLICKHOUSE_CLIENT --query "insert into movement select toDateTime('2020-01-22 00:00:00', 'Asia/Istanbul') + number%(23*3600) from numbers(1000000);"
 
 $CLICKHOUSE_CLIENT --query "OPTIMIZE TABLE movement FINAL"
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT -n --query "
 SELECT
     count(),
     toStartOfHour(date) AS Hour
@@ -26,7 +26,7 @@ ORDER BY Hour DESC
 
 $CLICKHOUSE_CLIENT --query "alter table movement delete where date >= toDateTime('2020-01-22T16:00:00', 'Asia/Istanbul')  and date < toDateTime('2020-01-22T17:00:00', 'Asia/Istanbul') SETTINGS mutations_sync = 2"
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT -n --query "
 SELECT
     count(),
     toStartOfHour(date) AS Hour
@@ -37,7 +37,7 @@ ORDER BY Hour DESC
 " | grep "16:00:00" | wc -l
 
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT -n --query "
 SELECT
     count(),
     toStartOfHour(date) AS Hour
@@ -48,7 +48,7 @@ ORDER BY Hour DESC
 " | grep "22:00:00" | cut -f1
 
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT -n --query "
 SELECT
     count(),
     toStartOfHour(date) AS Hour
diff --git a/tests/queries/0_stateless/01077_window_view_alter_query_to_modify_source.sh b/tests/queries/0_stateless/01077_window_view_alter_query_to_modify_source.sh
index f3c03b06b86..17c28e2daf5 100755
--- a/tests/queries/0_stateless/01077_window_view_alter_query_to_modify_source.sh
+++ b/tests/queries/0_stateless/01077_window_view_alter_query_to_modify_source.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS mt2;
@@ -35,7 +35,7 @@ done
 $CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM dst ORDER BY market, w_end;"
 $CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT '----ALTER TABLE...MODIFY QUERY----';"
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 ALTER TABLE wv MODIFY QUERY SELECT count(a) AS count, mt2.market * 2 as market, tumbleEnd(wid) AS w_end FROM mt2 GROUP BY tumble(timestamp, INTERVAL '5' SECOND, 'US/Samoa') AS wid, mt2.market;
 
 INSERT INTO mt2 VALUES (1, 6, '1990/01/01 12:00:10');
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 275edb094c7..05aeb1b4ccb 100755
--- a/tests/queries/0_stateless/01078_window_view_alter_query_watch.py
+++ b/tests/queries/0_stateless/01078_window_view_alter_query_watch.py
@@ -20,7 +20,7 @@ with client(name="client1>", log=log) as client1, client(
     client2.expect(prompt)
     client3.expect(prompt)
 
-    client1.send("SET enable_analyzer = 0")
+    client1.send("SET allow_experimental_analyzer = 0")
     client1.expect(prompt)
     client1.send("SET allow_experimental_window_view = 1")
     client1.expect(prompt)
@@ -28,13 +28,13 @@ 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 enable_analyzer = 0")
+    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 enable_analyzer = 0")
+    client3.send("SET allow_experimental_analyzer = 0")
     client3.expect(prompt)
 
     client1.send("CREATE DATABASE IF NOT EXISTS 01078_window_view_alter_query_watch")
diff --git a/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh b/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
index 22f8e5269bd..82b8be65af5 100755
--- a/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS table_for_bad_alters";
 
-$CLICKHOUSE_CLIENT --query "CREATE TABLE table_for_bad_alters (
+$CLICKHOUSE_CLIENT -n --query "CREATE TABLE table_for_bad_alters (
     key UInt64,
     value1 UInt8,
     value2 String
@@ -26,10 +26,6 @@ while [[ $($CLICKHOUSE_CLIENT --query "KILL MUTATION WHERE mutation_id='00000000
     sleep 1
 done
 
-while [[ $($CLICKHOUSE_CLIENT --query "SELECT * FROM system.replication_queue WHERE type='ALTER_METADATA' AND database = '$CLICKHOUSE_DATABASE'" 2>&1) ]]; do
-    sleep 1
-done
-
 $CLICKHOUSE_CLIENT --query "SHOW CREATE TABLE table_for_bad_alters;" # Type changed, but we can revert back
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO table_for_bad_alters VALUES(2, 2, 7)"
diff --git a/tests/queries/0_stateless/01079_window_view_inner_table_memory_tumble.sh b/tests/queries/0_stateless/01079_window_view_inner_table_memory_tumble.sh
index 476688cee30..7747e343bfb 100755
--- a/tests/queries/0_stateless/01079_window_view_inner_table_memory_tumble.sh
+++ b/tests/queries/0_stateless/01079_window_view_inner_table_memory_tumble.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01080_window_view_inner_table_memory_hop.sh b/tests/queries/0_stateless/01080_window_view_inner_table_memory_hop.sh
index 10dea880b26..25576ff3c06 100755
--- a/tests/queries/0_stateless/01080_window_view_inner_table_memory_hop.sh
+++ b/tests/queries/0_stateless/01080_window_view_inner_table_memory_hop.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01081_window_view_target_table_engine.sh b/tests/queries/0_stateless/01081_window_view_target_table_engine.sh
index 806db683251..dea0e5a7ba0 100755
--- a/tests/queries/0_stateless/01081_window_view_target_table_engine.sh
+++ b/tests/queries/0_stateless/01081_window_view_target_table_engine.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS wv;
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 778ac786e88..5dcdfdb5020 100755
--- a/tests/queries/0_stateless/01082_window_view_watch_limit.py
+++ b/tests/queries/0_stateless/01082_window_view_watch_limit.py
@@ -19,7 +19,7 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.expect(prompt)
 
-    client1.send("SET enable_analyzer = 0")
+    client1.send("SET allow_experimental_analyzer = 0")
     client1.expect(prompt)
     client1.send("SET allow_experimental_window_view = 1")
     client1.expect(prompt)
@@ -27,7 +27,7 @@ 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 enable_analyzer = 0")
+    client2.send("SET allow_experimental_analyzer = 0")
     client2.expect(prompt)
 
     client1.send("CREATE DATABASE IF NOT EXISTS 01082_window_view_watch_limit")
diff --git a/tests/queries/0_stateless/01083_window_view_select.sh b/tests/queries/0_stateless/01083_window_view_select.sh
index 729b119a561..ca9195aa00d 100755
--- a/tests/queries/0_stateless/01083_window_view_select.sh
+++ b/tests/queries/0_stateless/01083_window_view_select.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS dst;
diff --git a/tests/queries/0_stateless/01084_window_view_with_table_identifier.sh b/tests/queries/0_stateless/01084_window_view_with_table_identifier.sh
index b2d66f5db4f..d8a29be781d 100755
--- a/tests/queries/0_stateless/01084_window_view_with_table_identifier.sh
+++ b/tests/queries/0_stateless/01084_window_view_with_table_identifier.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS wv;
diff --git a/tests/queries/0_stateless/01085_window_view_attach.sql b/tests/queries/0_stateless/01085_window_view_attach.sql
index 8f81e443aca..a40c6f20a1a 100644
--- a/tests/queries/0_stateless/01085_window_view_attach.sql
+++ b/tests/queries/0_stateless/01085_window_view_attach.sql
@@ -1,6 +1,6 @@
 
 SET send_logs_level = 'fatal';
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 SET allow_experimental_window_view = 1;
 
 DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
diff --git a/tests/queries/0_stateless/01086_window_view_cleanup.sh b/tests/queries/0_stateless/01086_window_view_cleanup.sh
index 2e6cc7e2520..01bf50bc14d 100755
--- a/tests/queries/0_stateless/01086_window_view_cleanup.sh
+++ b/tests/queries/0_stateless/01086_window_view_cleanup.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 # Creation of a database with Ordinary engine emits a warning.
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
@@ -8,43 +9,41 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-DATABASE_ORDINARY="${CLICKHOUSE_DATABASE}_ordinary"
+$CLICKHOUSE_CLIENT "${opts[@]}" --allow_deprecated_database_ordinary=1 --multiquery <<EOF
+SET allow_experimental_window_view = 1;
+SET window_view_clean_interval = 1;
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --query "
-    SET allow_deprecated_database_ordinary = 1;
-    SET allow_experimental_window_view = 1;
-    SET window_view_clean_interval = 1;
+DROP DATABASE IF EXISTS test_01086;
+CREATE DATABASE test_01086 ENGINE=Ordinary;
 
-    DROP DATABASE IF EXISTS ${DATABASE_ORDINARY};
-    CREATE DATABASE ${DATABASE_ORDINARY} ENGINE=Ordinary;
+CREATE TABLE test_01086.dst(count UInt64, market Int32, w_end DateTime) Engine=MergeTree ORDER BY tuple();
+CREATE TABLE test_01086.mt(a Int32, market Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple();
+CREATE WINDOW VIEW test_01086.wv TO test_01086.dst WATERMARK=ASCENDING AS SELECT count(a) AS count, market, tumbleEnd(wid) AS w_end FROM test_01086.mt GROUP BY tumble(timestamp, INTERVAL '5' SECOND, 'US/Samoa') AS wid, market;
 
-    CREATE TABLE ${DATABASE_ORDINARY}.dst(count UInt64, market Int32, w_end DateTime) Engine=MergeTree ORDER BY tuple();
-    CREATE TABLE ${DATABASE_ORDINARY}.mt(a Int32, market Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple();
-    CREATE WINDOW VIEW ${DATABASE_ORDINARY}.wv TO ${DATABASE_ORDINARY}.dst WATERMARK=ASCENDING AS SELECT count(a) AS count, market, tumbleEnd(wid) AS w_end FROM ${DATABASE_ORDINARY}.mt GROUP BY tumble(timestamp, INTERVAL '5' SECOND, 'US/Samoa') AS wid, market;
-
-    INSERT INTO ${DATABASE_ORDINARY}.mt VALUES (1, 1, toDateTime('1990/01/01 12:00:00', 'US/Samoa'));
-    INSERT INTO ${DATABASE_ORDINARY}.mt VALUES (1, 2, toDateTime('1990/01/01 12:00:01', 'US/Samoa'));
-    INSERT INTO ${DATABASE_ORDINARY}.mt VALUES (1, 3, toDateTime('1990/01/01 12:00:02', 'US/Samoa'));
-    INSERT INTO ${DATABASE_ORDINARY}.mt VALUES (1, 4, toDateTime('1990/01/01 12:00:05', 'US/Samoa'));
-    INSERT INTO ${DATABASE_ORDINARY}.mt VALUES (1, 5, toDateTime('1990/01/01 12:00:06', 'US/Samoa'));"
+INSERT INTO test_01086.mt VALUES (1, 1, toDateTime('1990/01/01 12:00:00', 'US/Samoa'));
+INSERT INTO test_01086.mt VALUES (1, 2, toDateTime('1990/01/01 12:00:01', 'US/Samoa'));
+INSERT INTO test_01086.mt VALUES (1, 3, toDateTime('1990/01/01 12:00:02', 'US/Samoa'));
+INSERT INTO test_01086.mt VALUES (1, 4, toDateTime('1990/01/01 12:00:05', 'US/Samoa'));
+INSERT INTO test_01086.mt VALUES (1, 5, toDateTime('1990/01/01 12:00:06', 'US/Samoa'));
+EOF
 
 while true; do
-	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM ${DATABASE_ORDINARY}.\`.inner.wv\`" | grep -q "5" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM test_01086.\`.inner.wv\`" | grep -q "5" && break || sleep .5 ||:
 done
 
 $CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT sleep(2);"
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --query="INSERT INTO ${DATABASE_ORDINARY}.mt VALUES (1, 6, toDateTime('1990/01/01 12:00:11', 'US/Samoa'));"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="INSERT INTO test_01086.mt VALUES (1, 6, toDateTime('1990/01/01 12:00:11', 'US/Samoa'));"
 
 while true; do
-	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM ${DATABASE_ORDINARY}.\`.inner.wv\`" | grep -q "3" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM test_01086.\`.inner.wv\`" | grep -q "3" && break || sleep .5 ||:
 done
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT market, wid FROM ${DATABASE_ORDINARY}.\`.inner.wv\` ORDER BY market, \`windowID(timestamp, toIntervalSecond('5'), 'US/Samoa')\` as wid";
-$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE ${DATABASE_ORDINARY}.wv SYNC;"
-$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE ${DATABASE_ORDINARY}.mt SYNC;"
-$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE ${DATABASE_ORDINARY}.dst SYNC;"
-$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP DATABASE ${DATABASE_ORDINARY} SYNC;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT market, wid FROM test_01086.\`.inner.wv\` ORDER BY market, \`windowID(timestamp, toIntervalSecond('5'), 'US/Samoa')\` as wid";
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE test_01086.wv SYNC;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE test_01086.mt SYNC;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP TABLE test_01086.dst SYNC;"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="DROP DATABASE test_01086 SYNC;"
diff --git a/tests/queries/0_stateless/01087_window_view_alter_query.sh b/tests/queries/0_stateless/01087_window_view_alter_query.sh
index 03a6e39adb1..a28ee4bc425 100755
--- a/tests/queries/0_stateless/01087_window_view_alter_query.sh
+++ b/tests/queries/0_stateless/01087_window_view_alter_query.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS wv;
@@ -31,7 +31,7 @@ done
 $CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT * FROM wv ORDER BY market, w_end;"
 $CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT '----ALTER TABLE...MODIFY QUERY----';"
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 ALTER TABLE wv MODIFY QUERY SELECT count(a) AS count, mt.market * 2 as market, tumbleEnd(wid) AS w_end FROM mt GROUP BY tumble(timestamp, INTERVAL '5' SECOND, 'US/Samoa') AS wid, mt.market;
 
 INSERT INTO mt VALUES (1, 6, toDateTime('1990/01/01 12:00:10', 'US/Samoa'));
diff --git a/tests/queries/0_stateless/01088_window_view_default_column.sh b/tests/queries/0_stateless/01088_window_view_default_column.sh
index 0e989444bd7..1cdd9e3c9b9 100755
--- a/tests/queries/0_stateless/01088_window_view_default_column.sh
+++ b/tests/queries/0_stateless/01088_window_view_default_column.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" <<EOF
+$CLICKHOUSE_CLIENT "${opts[@]}" --multiquery <<EOF
 SET allow_experimental_window_view = 1;
 DROP TABLE IF EXISTS mt;
 DROP TABLE IF EXISTS wv;
diff --git a/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql b/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql
index 45f1a00ae23..21a84bdd691 100644
--- a/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql
+++ b/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql
@@ -1,4 +1,4 @@
 -- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug
 
-SET query_profiler_cpu_time_period_ns = 1, max_rows_to_read = 0;
+SET query_profiler_cpu_time_period_ns = 1;
 SELECT count() FROM numbers_mt(1000000000);
diff --git a/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh b/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
index a6a99aadac2..bcaa70abbb5 100755
--- a/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
+++ b/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
@@ -1,31 +1,29 @@
 #!/usr/bin/env bash
-# Tags: no-fasttest, no-parallel
-# no-parallel: FIXME: Timing issues with INSERT + DETACH (https://github.com/ClickHouse/ClickHouse/pull/67610/files#r1700345054)
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-NEW_DATABASE=test_01107_${CLICKHOUSE_DATABASE}
-$CLICKHOUSE_CLIENT -q "DROP DATABASE IF EXISTS ${NEW_DATABASE}"
-$CLICKHOUSE_CLIENT -q "CREATE DATABASE ${NEW_DATABASE} ENGINE=Atomic"
-$CLICKHOUSE_CLIENT -q "CREATE TABLE ${NEW_DATABASE}.mt (n UInt64) ENGINE=MergeTree() ORDER BY tuple()"
+$CLICKHOUSE_CLIENT -q "DROP DATABASE IF EXISTS test_01107"
+$CLICKHOUSE_CLIENT -q "CREATE DATABASE test_01107 ENGINE=Atomic"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE test_01107.mt (n UInt64) ENGINE=MergeTree() ORDER BY tuple()"
 
-$CLICKHOUSE_CLIENT --function_sleep_max_microseconds_per_block 60000000 -q "INSERT INTO ${NEW_DATABASE}.mt SELECT number + sleepEachRow(3) FROM numbers(5)" &
+$CLICKHOUSE_CLIENT --function_sleep_max_microseconds_per_block 60000000 -q "INSERT INTO test_01107.mt SELECT number + sleepEachRow(3) FROM numbers(5)" &
 sleep 1
 
-$CLICKHOUSE_CLIENT -q "DETACH TABLE ${NEW_DATABASE}.mt" --database_atomic_wait_for_drop_and_detach_synchronously=0
-$CLICKHOUSE_CLIENT -q "ATTACH TABLE ${NEW_DATABASE}.mt" --database_atomic_wait_for_drop_and_detach_synchronously=0 2>&1 | grep -F "Code: 57" > /dev/null && echo "OK"
-$CLICKHOUSE_CLIENT -q "DETACH DATABASE ${NEW_DATABASE}" --database_atomic_wait_for_drop_and_detach_synchronously=0 2>&1 | grep -F "Code: 219" > /dev/null && echo "OK"
+$CLICKHOUSE_CLIENT -q "DETACH TABLE test_01107.mt" --database_atomic_wait_for_drop_and_detach_synchronously=0
+$CLICKHOUSE_CLIENT -q "ATTACH TABLE test_01107.mt" --database_atomic_wait_for_drop_and_detach_synchronously=0 2>&1 | grep -F "Code: 57" > /dev/null && echo "OK"
+$CLICKHOUSE_CLIENT -q "DETACH DATABASE test_01107" --database_atomic_wait_for_drop_and_detach_synchronously=0 2>&1 | grep -F "Code: 219" > /dev/null && echo "OK"
 
 wait
-$CLICKHOUSE_CLIENT -q "ATTACH TABLE ${NEW_DATABASE}.mt"
-$CLICKHOUSE_CLIENT -q "SELECT count(n), sum(n) FROM ${NEW_DATABASE}.mt"
-$CLICKHOUSE_CLIENT -q "DETACH DATABASE ${NEW_DATABASE}" --database_atomic_wait_for_drop_and_detach_synchronously=0
-$CLICKHOUSE_CLIENT -q "ATTACH DATABASE ${NEW_DATABASE}"
-$CLICKHOUSE_CLIENT -q "SELECT count(n), sum(n) FROM ${NEW_DATABASE}.mt"
+$CLICKHOUSE_CLIENT -q "ATTACH TABLE test_01107.mt"
+$CLICKHOUSE_CLIENT -q "SELECT count(n), sum(n) FROM test_01107.mt"
+$CLICKHOUSE_CLIENT -q "DETACH DATABASE test_01107" --database_atomic_wait_for_drop_and_detach_synchronously=0
+$CLICKHOUSE_CLIENT -q "ATTACH DATABASE test_01107"
+$CLICKHOUSE_CLIENT -q "SELECT count(n), sum(n) FROM test_01107.mt"
 
-$CLICKHOUSE_CLIENT --function_sleep_max_microseconds_per_block 60000000 -q "INSERT INTO ${NEW_DATABASE}.mt SELECT number + sleepEachRow(1) FROM numbers(5)" && echo "end" &
+$CLICKHOUSE_CLIENT --function_sleep_max_microseconds_per_block 60000000 -q "INSERT INTO test_01107.mt SELECT number + sleepEachRow(1) FROM numbers(5)" && echo "end" &
 sleep 1
-$CLICKHOUSE_CLIENT -q "DROP DATABASE ${NEW_DATABASE}" --database_atomic_wait_for_drop_and_detach_synchronously=0 && sleep 1 && echo "dropped"
+$CLICKHOUSE_CLIENT -q "DROP DATABASE test_01107" --database_atomic_wait_for_drop_and_detach_synchronously=0 && sleep 1 && echo "dropped"
 wait
diff --git a/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.sh b/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.sh
index 9101b9faa3d..619b6e91d11 100755
--- a/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.sh
+++ b/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.sh
@@ -30,7 +30,7 @@ function drop_db()
         database=$($CLICKHOUSE_CLIENT -q "select name from system.databases where name like '${CLICKHOUSE_DATABASE}%' order by rand() limit 1")
         if [[ "$database" == "$CLICKHOUSE_DATABASE" ]]; then continue; fi
         if [ -z "$database" ]; then continue; fi
-        $CLICKHOUSE_CLIENT --query \
+        $CLICKHOUSE_CLIENT -n --query \
         "drop database if exists $database" 2>&1| grep -Fa "Exception: "
         sleep 0.$RANDOM
     done
diff --git a/tests/queries/0_stateless/01114_database_atomic.sh b/tests/queries/0_stateless/01114_database_atomic.sh
index 5fe85136d05..fb4672ef906 100755
--- a/tests/queries/0_stateless/01114_database_atomic.sh
+++ b/tests/queries/0_stateless/01114_database_atomic.sh
@@ -31,7 +31,7 @@ $CLICKHOUSE_CLIENT -q "SELECT name,
                               splitByChar('/', metadata_path)[-2] as uuid_path, ((splitByChar('/', metadata_path)[-3] as metadata) = substr(uuid_path, 1, 3)) OR metadata='metadata'
                               FROM system.databases WHERE name LIKE '${CLICKHOUSE_DATABASE}_%'" | sed "s/$uuid_db_1/00001114-1000-4000-8000-000000000001/g" | sed "s/$uuid_db_2/00001114-1000-4000-8000-000000000002/g"
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 CREATE TABLE ${DATABASE_1}.mt_tmp (n UInt64) ENGINE=MergeTree() ORDER BY tuple();
 INSERT INTO ${DATABASE_1}.mt_tmp SELECT * FROM numbers(100);
 CREATE TABLE ${DATABASE_3}.mt (n UInt64) ENGINE=MergeTree() ORDER BY tuple() PARTITION BY (n % 5);
@@ -51,8 +51,8 @@ $CLICKHOUSE_CLIENT --show_table_uuid_in_table_create_query_if_not_nil=1 -q "SHOW
 $CLICKHOUSE_CLIENT -q "SELECT name, uuid, create_table_query FROM system.tables WHERE database='${DATABASE_2}'" | sed "s/$explicit_uuid/00001114-0000-4000-8000-000000000002/g"
 
 RANDOM_COMMENT="$RANDOM"
-$CLICKHOUSE_CLIENT --max-threads 5 --function_sleep_max_microseconds_per_block 120000000 -q "SELECT count(col), sum(col) FROM (SELECT n + sleepEachRow(3) AS col FROM ${DATABASE_1}.mt) -- ${RANDOM_COMMENT}" &     # 66s (3s * 22 rows per partition [Using 5 threads in parallel]), result: 110, 5995
-$CLICKHOUSE_CLIENT --max-threads 5 --function_sleep_max_microseconds_per_block 120000000 -q "INSERT INTO ${DATABASE_2}.mt SELECT number + sleepEachRow(2.2) FROM numbers(30) -- ${RANDOM_COMMENT}" &                # 66s (2.2s * 30 rows)
+$CLICKHOUSE_CLIENT --max-threads 5 --function_sleep_max_microseconds_per_block 60000000 -q "SELECT count(col), sum(col) FROM (SELECT n + sleepEachRow(1.5) AS col FROM ${DATABASE_1}.mt) -- ${RANDOM_COMMENT}" &     # 33s (1.5s * 22 rows per partition [Using 5 threads in parallel]), result: 110, 5995
+$CLICKHOUSE_CLIENT --max-threads 5 --function_sleep_max_microseconds_per_block 60000000 -q "INSERT INTO ${DATABASE_2}.mt SELECT number + sleepEachRow(1.5) FROM numbers(30) -- ${RANDOM_COMMENT}" &                  # 45s (1.5s * 30 rows)
 
 it=0
 while [[ $($CLICKHOUSE_CLIENT -q "SELECT count() FROM system.processes WHERE query_id != queryID() AND current_database = currentDatabase() AND query LIKE '%-- ${RANDOM_COMMENT}%'") -ne 2 ]]; do
@@ -65,7 +65,7 @@ while [[ $($CLICKHOUSE_CLIENT -q "SELECT count() FROM system.processes WHERE que
     sleep 0.1
 done
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 RENAME TABLE ${DATABASE_1}.mt TO ${DATABASE_1}.mt_tmp;
 RENAME TABLE ${DATABASE_1}.mt_tmp TO ${DATABASE_2}.mt_tmp;
 EXCHANGE TABLES ${DATABASE_2}.mt AND ${DATABASE_2}.mt_tmp;
@@ -79,7 +79,7 @@ uuid_mt1=$($CLICKHOUSE_CLIENT -q "SELECT uuid FROM system.tables WHERE database=
 $CLICKHOUSE_CLIENT --show_table_uuid_in_table_create_query_if_not_nil=1 -q "SHOW CREATE TABLE ${DATABASE_1}.mt" | sed "s/$uuid_mt1/00001114-0000-4000-8000-000000000001/g"
 $CLICKHOUSE_CLIENT --show_table_uuid_in_table_create_query_if_not_nil=1 -q "SHOW CREATE TABLE ${DATABASE_2}.mt" | sed "s/$explicit_uuid/00001114-0000-4000-8000-000000000002/g"
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 DROP TABLE ${DATABASE_1}.mt SETTINGS database_atomic_wait_for_drop_and_detach_synchronously=0;
 CREATE TABLE ${DATABASE_1}.mt (s String) ENGINE=Log();
 INSERT INTO ${DATABASE_1}.mt SELECT 's' || toString(number) FROM numbers(5);
@@ -87,7 +87,7 @@ SELECT count() FROM ${DATABASE_1}.mt
 " # result: 5
 
 RANDOM_TUPLE="${RANDOM}_tuple"
-$CLICKHOUSE_CLIENT --max-threads 5 --function_sleep_max_microseconds_per_block 60000000 -q "SELECT tuple(s, sleepEachRow(4)) FROM ${DATABASE_1}.mt -- ${RANDOM_TUPLE}" > /dev/null &    # 20s (4s * 5 rows)
+$CLICKHOUSE_CLIENT --max-threads 5 --function_sleep_max_microseconds_per_block 60000000 -q "SELECT tuple(s, sleepEachRow(3)) FROM ${DATABASE_1}.mt -- ${RANDOM_TUPLE}" > /dev/null &    # 15s (3s * 5 rows)
 it=0
 while [[ $($CLICKHOUSE_CLIENT -q "SELECT count() FROM system.processes WHERE query_id != queryID() AND current_database = currentDatabase() AND query LIKE '%-- ${RANDOM_TUPLE}%'") -ne 1 ]]; do
     it=$((it+1))
diff --git a/tests/queries/0_stateless/01119_optimize_trivial_insert_select.sql b/tests/queries/0_stateless/01119_optimize_trivial_insert_select.sql
index 2b301d7aced..a53b60a5ad3 100644
--- a/tests/queries/0_stateless/01119_optimize_trivial_insert_select.sql
+++ b/tests/queries/0_stateless/01119_optimize_trivial_insert_select.sql
@@ -1,9 +1,8 @@
 drop table if exists t;
 create table t(n int, a Int64, s String) engine = MergeTree() order by a;
 
-set enable_positional_arguments = 0;
-set optimize_trivial_insert_select = 1;
-set max_rows_to_read = 0;
+set enable_positional_arguments=0;
+set optimize_trivial_insert_select=1;
 
 -- due to aggregate functions, optimize_trivial_insert_select will not be applied
 insert into t select 1, sum(number) as c, getSetting('max_threads') from numbers_mt(100000000) settings max_insert_threads=4, max_threads=2;
diff --git a/tests/queries/0_stateless/01119_session_log.sh b/tests/queries/0_stateless/01119_session_log.sql
old mode 100755
new mode 100644
similarity index 74%
rename from tests/queries/0_stateless/01119_session_log.sh
rename to tests/queries/0_stateless/01119_session_log.sql
index 61bb7cf3ea8..55f6228797a
--- a/tests/queries/0_stateless/01119_session_log.sh
+++ b/tests/queries/0_stateless/01119_session_log.sql
@@ -1,20 +1,5 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest
+-- Tags: no-fasttest
 
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-
-session_log_query_prefix="
-system flush logs;
-select distinct type, user, auth_type, toString(client_address)!='::ffff:0.0.0.0' as a, client_port!=0 as b, interface from system.session_log
-where user in ('default', 'nonexistsnt_user_1119', '   ', ' INTERSERVER SECRET ')
-and interface in ('HTTP', 'TCP', 'TCP_Interserver')
-and (user != 'default' or (a=1 and b=1)) -- FIXME: we should not write uninitialized address and port (but we do sometimes)
-and event_time >= now() - interval 5 minute"
-
-$CLICKHOUSE_CLIENT -m -q "
 select * from remote('127.0.0.2', system, one, 'default', '');
 select * from remote('127.0.0.2', system, one, 'default', 'wrong password'); -- { serverError AUTHENTICATION_FAILED }
 select * from remote('127.0.0.2', system, one, 'nonexistsnt_user_1119', ''); -- { serverError AUTHENTICATION_FAILED }
@@ -31,17 +16,9 @@ select * from url('http://127.0.0.1:8123/?query=select+1&user=+++', LineAsString
 
 select * from cluster('test_cluster_interserver_secret', system, one);
 
-$session_log_query_prefix and type != 'Logout' order by type, user, interface;
-"
-
-# Wait for logout events.
-for _ in {1..10}
-do
-    if [ "`$CLICKHOUSE_CLIENT -q "$session_log_query_prefix and type = 'Logout'" | wc -l`" -eq 3 ]
-    then
-        break
-    fi
-    sleep 2
-done
-
-$CLICKHOUSE_CLIENT -q "$session_log_query_prefix and type = 'Logout' order by user, interface"
+system flush logs;
+select distinct type, user, auth_type, toString(client_address)!='::ffff:0.0.0.0' as a, client_port!=0 as b, interface from system.session_log
+where user in ('default', 'nonexistsnt_user_1119', '   ', ' INTERSERVER SECRET ')
+and interface in ('HTTP', 'TCP', 'TCP_Interserver')
+and (user != 'default' or (a=1 and b=1)) -- FIXME: we should not write uninitialized address and port (but we do sometimes)
+and event_time >= now() - interval 5 minute order by type, user, interface;
diff --git a/tests/queries/0_stateless/01133_begin_commit_race.sh b/tests/queries/0_stateless/01133_begin_commit_race.sh
index 81e88e387ee..2b266527541 100755
--- a/tests/queries/0_stateless/01133_begin_commit_race.sh
+++ b/tests/queries/0_stateless/01133_begin_commit_race.sh
@@ -14,7 +14,7 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE mt (n Int64) ENGINE=MergeTree ORDER BY
 function begin_commit_readonly()
 {
   while true; do
-    $CLICKHOUSE_CLIENT --query "
+    $CLICKHOUSE_CLIENT --multiquery --query "
             SET wait_changes_become_visible_after_commit_mode='wait';
             BEGIN TRANSACTION;
             COMMIT;" 2>&1| grep -Fa "Exception: " | grep -Fv UNKNOWN_STATUS_OF_TRANSACTION
@@ -24,7 +24,7 @@ function begin_commit_readonly()
 function begin_rollback_readonly()
 {
   while true; do
-    $CLICKHOUSE_CLIENT --wait_changes_become_visible_after_commit_mode=wait_unknown --query "
+    $CLICKHOUSE_CLIENT --wait_changes_become_visible_after_commit_mode=wait_unknown --multiquery --query "
             BEGIN TRANSACTION;
             SET TRANSACTION SNAPSHOT 42;
             ROLLBACK;"
@@ -34,7 +34,7 @@ function begin_rollback_readonly()
 function begin_insert_commit()
 {
   while true; do
-    $CLICKHOUSE_CLIENT --wait_changes_become_visible_after_commit_mode=async --query "
+    $CLICKHOUSE_CLIENT --wait_changes_become_visible_after_commit_mode=async --multiquery --query "
             BEGIN TRANSACTION;
             INSERT INTO mt VALUES ($RANDOM);
             COMMIT;" 2>&1| grep -Fa "Exception: " | grep -Fv UNKNOWN_STATUS_OF_TRANSACTION
diff --git a/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.sql b/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.sql
index dda396f4b5d..2464b7a57cf 100644
--- a/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.sql
+++ b/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.sql
@@ -16,36 +16,36 @@ SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (x) ORD
 SELECT '-';
 
 -- lc should be supertype for l.lc and r.lc, so expect Nullable(String)
-SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 1;
-SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 1;
-SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 1;
+SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
 
 SELECT '-';
 
 -- old behavior is different
-SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 0;
-SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 0;
-SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 0;
+SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+SELECT x, lc, toTypeName(lc), r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
 
 SELECT '-';
 
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 1;
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 1;
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 1;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
 
 SELECT '-';
 
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 0;
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 0;
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 0;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
 
 SELECT '-';
 
-SELECT x, lc FROM t AS l RIGHT JOIN nr AS r USING (lc) SETTINGS enable_analyzer = 1;
+SELECT x, lc FROM t AS l RIGHT JOIN nr AS r USING (lc) SETTINGS allow_experimental_analyzer = 1;
 
 SELECT '-';
 
-SELECT x, lc FROM t AS l RIGHT JOIN nr AS r USING (lc) SETTINGS enable_analyzer = 0;
+SELECT x, lc FROM t AS l RIGHT JOIN nr AS r USING (lc) SETTINGS allow_experimental_analyzer = 0;
 
 SELECT '-';
 
diff --git a/tests/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.sql b/tests/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.sql
index 862c26c41ce..718e8358c64 100644
--- a/tests/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.sql
+++ b/tests/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.sql
@@ -17,27 +17,27 @@ SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (x) ORD
 
 SELECT '-';
 
-SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 1;
-SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 1;
-SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 1;
+SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
 
 SELECT '-';
 
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 1;
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 1;
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 1;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 1;
 
 SELECT '-';
 
-SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 0;
-SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 0;
-SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 0;
+SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
 
 SELECT '-';
 
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 0;
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 0;
-SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS enable_analyzer = 0;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l LEFT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
+SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x SETTINGS allow_experimental_analyzer = 0;
 
 SELECT '-';
 
diff --git a/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql b/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
index c689542e4c3..a585ef1c324 100644
--- a/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
+++ b/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
@@ -7,8 +7,6 @@ DROP TABLE IF EXISTS rmt1;
 DROP TABLE IF EXISTS rmt2;
 DROP TABLE IF EXISTS rmt3;
 
-SET database_replicated_allow_replicated_engine_arguments=1;
-
 CREATE TABLE rmt (n UInt64, s String) ENGINE = ReplicatedMergeTree('/clickhouse/test_01148/{shard}/{database}/{table}', '{replica}') ORDER BY n;
 SHOW CREATE TABLE rmt;
 RENAME TABLE rmt TO rmt1;
diff --git a/tests/queries/0_stateless/01153_attach_mv_uuid.sql b/tests/queries/0_stateless/01153_attach_mv_uuid.sql
index 0ef16449096..00cce8a1de4 100644
--- a/tests/queries/0_stateless/01153_attach_mv_uuid.sql
+++ b/tests/queries/0_stateless/01153_attach_mv_uuid.sql
@@ -14,8 +14,6 @@ INSERT INTO src VALUES (3), (4);
 SELECT * FROM mv ORDER BY n;
 DROP TABLE mv SYNC;
 
-SET database_replicated_allow_explicit_uuid=3;
-
 SET show_table_uuid_in_table_create_query_if_not_nil=1;
 CREATE TABLE ".inner_id.e15f3ab5-6cae-4df3-b879-f40deafd82c2" (n Int32, n2 Int64) ENGINE = MergeTree PARTITION BY n % 10 ORDER BY n;
 ATTACH MATERIALIZED VIEW mv UUID 'e15f3ab5-6cae-4df3-b879-f40deafd82c2' (n Int32, n2 Int64) ENGINE = MergeTree PARTITION BY n % 10 ORDER BY n AS SELECT n, n * n AS n2 FROM src;
diff --git a/tests/queries/0_stateless/01160_table_dependencies.sh b/tests/queries/0_stateless/01160_table_dependencies.sh
index b72acf62610..acb6522e9e2 100755
--- a/tests/queries/0_stateless/01160_table_dependencies.sh
+++ b/tests/queries/0_stateless/01160_table_dependencies.sh
@@ -35,7 +35,7 @@ arraySort(loading_dependencies_table), arraySort(loading_dependent_table) from s
 $CLICKHOUSE_CLIENT -q "select '====='"
 $CLICKHOUSE_CLIENT -q "alter table t add column x int default in(1, $CLICKHOUSE_DATABASE.s), drop column y"
 
-$CLICKHOUSE_CLIENT -q "create materialized view mv to s as select n as x from t where n in (select n from join)"
+$CLICKHOUSE_CLIENT -q "create materialized view mv to s as select n from t where n in (select n from join)"
 
 $CLICKHOUSE_CLIENT -q "select table, arraySort(dependencies_table),
 arraySort(loading_dependencies_table), arraySort(loading_dependent_table) from system.tables where database=currentDatabase() order by table"
diff --git a/tests/queries/0_stateless/01161_all_system_tables.sh b/tests/queries/0_stateless/01161_all_system_tables.sh
index d4a80d074dc..739df782a39 100755
--- a/tests/queries/0_stateless/01161_all_system_tables.sh
+++ b/tests/queries/0_stateless/01161_all_system_tables.sh
@@ -19,7 +19,7 @@ function run_selects()
     thread_num=$1
     readarray -t tables_arr < <(${CLICKHOUSE_CLIENT} -q "SELECT database || '.' || name FROM system.tables
     WHERE database in ('system', 'information_schema', 'INFORMATION_SCHEMA') and name != 'zookeeper' and name != 'models'
-    AND sipHash64(name || toString($RAND)) % $THREADS = $thread_num AND name NOT LIKE '%\\_sender' AND name NOT LIKE '%\\_watcher' AND name != 'coverage_log'")
+    AND sipHash64(name || toString($RAND)) % $THREADS = $thread_num AND name NOT LIKE '%\\_sender' AND name NOT LIKE '%\\_watcher'")
 
     for t in "${tables_arr[@]}"
     do
diff --git a/tests/queries/0_stateless/01169_alter_partition_isolation_stress.sh b/tests/queries/0_stateless/01169_alter_partition_isolation_stress.sh
index 8873fd88f0e..d4884cbf457 100755
--- a/tests/queries/0_stateless/01169_alter_partition_isolation_stress.sh
+++ b/tests/queries/0_stateless/01169_alter_partition_isolation_stress.sh
@@ -22,7 +22,7 @@ function thread_insert()
     set -eu
     val=1
     while true; do
-        $CLICKHOUSE_CLIENT --query "
+        $CLICKHOUSE_CLIENT --multiquery --query "
         BEGIN TRANSACTION;
         INSERT INTO src VALUES /* ($val, 1) */ ($val, 1);
         INSERT INTO src VALUES /* ($val, 2) */ ($val, 2);
@@ -210,7 +210,7 @@ function thread_select()
     set -eu
     while true; do
         output=$(
-        $CLICKHOUSE_CLIENT --query "
+        $CLICKHOUSE_CLIENT --multiquery --query "
         BEGIN TRANSACTION;
         -- no duplicates
         SELECT type, throwIf(count(n) != countDistinct(n)) FROM src GROUP BY type FORMAT Null;
diff --git a/tests/queries/0_stateless/01169_old_alter_partition_isolation_stress.sh b/tests/queries/0_stateless/01169_old_alter_partition_isolation_stress.sh
index 404042ab64e..0d2016952d4 100755
--- a/tests/queries/0_stateless/01169_old_alter_partition_isolation_stress.sh
+++ b/tests/queries/0_stateless/01169_old_alter_partition_isolation_stress.sh
@@ -19,7 +19,7 @@ function thread_insert()
     set -e
     val=1
     while true; do
-        $CLICKHOUSE_CLIENT --query "
+        $CLICKHOUSE_CLIENT --multiquery --query "
         BEGIN TRANSACTION;
         INSERT INTO src VALUES /* ($val, 1) */ ($val, 1);
         INSERT INTO src VALUES /* ($val, 2) */ ($val, 2);
@@ -40,7 +40,7 @@ function thread_partition_src_to_dst()
     sum=0
     for i in {1..20}; do
         out=$(
-        $CLICKHOUSE_CLIENT --query "
+        $CLICKHOUSE_CLIENT --multiquery --query "
         BEGIN TRANSACTION;
         INSERT INTO src VALUES /* ($i, 3) */ ($i, 3);
         INSERT INTO dst SELECT * FROM src;
@@ -49,7 +49,7 @@ function thread_partition_src_to_dst()
         SELECT throwIf((SELECT (count(), sum(n)) FROM merge(currentDatabase(), '') WHERE type=3) != ($count + 1, $sum + $i)) FORMAT Null;
         COMMIT;" 2>&1) ||:
 
-        echo "$out" | grep -Fv "SERIALIZATION_ERROR" | grep -F "Received from " && $CLICKHOUSE_CLIENT --query "
+        echo "$out" | grep -Fv "SERIALIZATION_ERROR" | grep -F "Received from " && $CLICKHOUSE_CLIENT --multiquery --query "
                                                                                    begin transaction;
                                                                                    set transaction snapshot 3;
                                                                                    select $i, 'src', type, n, _part from src order by type, n;
@@ -68,7 +68,7 @@ function thread_partition_dst_to_src()
         if (( i % 2 )); then
             action="COMMIT"
         fi
-        $CLICKHOUSE_CLIENT --query "
+        $CLICKHOUSE_CLIENT --multiquery --query "
         SYSTEM STOP MERGES dst;
         ALTER TABLE dst DROP PARTITION ID 'nonexistent';  -- STOP MERGES doesn't wait for started merges to finish, so we use this trick
         SYSTEM SYNC TRANSACTION LOG;
@@ -87,7 +87,7 @@ function thread_select()
 {
     set -e
     while true; do
-        $CLICKHOUSE_CLIENT --query "
+        $CLICKHOUSE_CLIENT --multiquery --query "
         BEGIN TRANSACTION;
         -- no duplicates
         SELECT type, throwIf(count(n) != countDistinct(n)) FROM src GROUP BY type FORMAT Null;
diff --git a/tests/queries/0_stateless/01171_mv_select_insert_isolation_long.reference b/tests/queries/0_stateless/01171_mv_select_insert_isolation_long.reference
index e69de29bb2d..d8bb9e310e6 100644
--- a/tests/queries/0_stateless/01171_mv_select_insert_isolation_long.reference
+++ b/tests/queries/0_stateless/01171_mv_select_insert_isolation_long.reference
@@ -0,0 +1,4 @@
+275	0	138	136	0
+275	0
+275	0	138	136	0
+275	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 f6a88c205c1..2ab7f883367 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,134 +1,88 @@
 #!/usr/bin/env bash
-# Tags: long, no-ordinary-database
+# Tags: long, no-ordinary-database, no-debug
+# Test is too heavy, avoid parallel run in Flaky Check
 # shellcheck disable=SC2119
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-set -ue
+set -e
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS src";
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS dst";
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS mv";
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS tmp";
+$CLICKHOUSE_CLIENT --query "CREATE TABLE src (n Int8, m Int8, CONSTRAINT c CHECK xxHash32(n+m) % 8 != 0) ENGINE=MergeTree ORDER BY n PARTITION BY 0 < n SETTINGS old_parts_lifetime=0";
+$CLICKHOUSE_CLIENT --query "CREATE TABLE dst (nm Int16, CONSTRAINT c CHECK xxHash32(nm) % 8 != 0) ENGINE=MergeTree ORDER BY nm SETTINGS old_parts_lifetime=0";
+$CLICKHOUSE_CLIENT --query "CREATE MATERIALIZED VIEW mv TO dst (nm Int16) AS SELECT n*m AS nm FROM src";
 
-$CLICKHOUSE_CLIENT --query "CREATE TABLE src (n Int32, m Int32, CONSTRAINT c CHECK xxHash32(n+m) % 8 != 0) ENGINE=MergeTree ORDER BY n PARTITION BY 0 < n SETTINGS old_parts_lifetime=0";
-$CLICKHOUSE_CLIENT --query "CREATE TABLE dst (nm Int32, CONSTRAINT c CHECK xxHash32(nm) % 8 != 0) ENGINE=MergeTree ORDER BY nm SETTINGS old_parts_lifetime=0";
-$CLICKHOUSE_CLIENT --query "CREATE MATERIALIZED VIEW mv TO dst (nm Int32) AS SELECT n*m AS nm FROM src";
-
-$CLICKHOUSE_CLIENT --query "CREATE TABLE tmp (x UInt32, nm Int32) ENGINE=MergeTree ORDER BY (x, nm) SETTINGS old_parts_lifetime=0"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE tmp (x UInt8, nm Int16) ENGINE=MergeTree ORDER BY (x, nm) SETTINGS old_parts_lifetime=0"
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO src VALUES (0, 0)"
 
-is_pid_exist()
-{
-    local pid=$1
-    ps -p $pid > /dev/null
-}
-
-function run_with_time_and_iterations_limits()
+# some transactions will fail due to constraint
+function thread_insert_commit()
 {
     set -e
-
-    local min_time=$1; shift
-    local max_time=$1; shift
-    local min_iterations=$1; shift
-    local max_iterations=$1; shift
-    local function_to_run=$1; shift
-
-    # if [ "${1:-X}" = "1" ]; then
-    #     set -x
-    # fi
-
-    local started_time
-    started_time=$SECONDS
-    local iteration=0
-
-    while true
-    do
-        $function_to_run $iteration "$@"
-
-        [[ $SECONDS -lt $max_time ]] || break
-        [[ $SECONDS -lt $min_time ]] || [[ $iteration -lt $max_iterations ]] || break
-
-        iteration=$(($iteration + 1))
+    for i in {1..100}; do
+        $CLICKHOUSE_CLIENT --multiquery --query "
+        BEGIN TRANSACTION;
+        INSERT INTO src VALUES /* ($i, $1) */ ($i, $1);
+        SELECT throwIf((SELECT sum(nm) FROM mv) != $(($i * $1))) FORMAT Null;
+        INSERT INTO src VALUES /* (-$i, $1) */ (-$i, $1);
+        COMMIT;" 2>&1| grep -Fv "is violated at row" | grep -Fv "Transaction is not in RUNNING state" | grep -F "Received from " ||:
     done
-
-    [[ $iteration -gt $min_iterations ]] || echo "$iteration/$min_iterations : not enough iterations of $function_to_run has been made from $started_time until $max_time" >&2
-    set +x
 }
 
-function insert_commit_action()
+function thread_insert_rollback()
 {
     set -e
-
-    local i=$1; shift
-    local tag=$1; shift
-
-    # some transactions will fail due to constraint
-    $CLICKHOUSE_CLIENT --query "
+    for _ in {1..100}; do
+        $CLICKHOUSE_CLIENT --multiquery --query "
         BEGIN TRANSACTION;
-        INSERT INTO src VALUES /* ($i, $tag) */ ($i, $tag);
-        SELECT throwIf((SELECT sum(nm) FROM mv) != $(($i * $tag))) /* ($i, $tag) */ FORMAT Null;
-        INSERT INTO src VALUES /* (-$i, $tag) */ (-$i, $tag);
-        COMMIT;
-    " 2>&1 \
-    | grep -Fv "is violated at row" | grep -Fv "Transaction is not in RUNNING state" | grep -F "Received from " ||:
-}
-
-
-function insert_rollback_action()
-{
-    set -e
-
-    local i=$1; shift
-    local tag=$1; shift
-
-    $CLICKHOUSE_CLIENT --query "
-        BEGIN TRANSACTION;
-        INSERT INTO src VALUES /* (42, $tag) */ (42, $tag);
-        SELECT throwIf((SELECT count() FROM src WHERE n=42 AND m=$tag) != 1) FORMAT Null;
+        INSERT INTO src VALUES /* (42, $1) */ (42, $1);
+        SELECT throwIf((SELECT count() FROM src WHERE n=42 AND m=$1) != 1) FORMAT Null;
         ROLLBACK;"
+    done
 }
 
 # make merges more aggressive
-function optimize_action()
+function thread_optimize()
 {
     set -e
+    while true; do
+        optimize_query="OPTIMIZE TABLE src"
+        partition_id=$(( RANDOM % 2 ))
+        if (( RANDOM % 2 )); then
+            optimize_query="OPTIMIZE TABLE dst"
+            partition_id="all"
+        fi
+        if (( RANDOM % 2 )); then
+            optimize_query="$optimize_query PARTITION ID '$partition_id'"
+        fi
+        if (( RANDOM % 2 )); then
+            optimize_query="$optimize_query FINAL"
+        fi
+        action="COMMIT"
+        if (( RANDOM % 4 )); then
+            action="ROLLBACK"
+        fi
 
-    optimize_query="OPTIMIZE TABLE src"
-    partition_id=$(( RANDOM % 2 ))
-    if (( RANDOM % 2 )); then
-        optimize_query="OPTIMIZE TABLE dst"
-        partition_id="all"
-    fi
-    if (( RANDOM % 2 )); then
-        optimize_query="$optimize_query PARTITION ID '$partition_id'"
-    fi
-    if (( RANDOM % 2 )); then
-        optimize_query="$optimize_query FINAL"
-    fi
-    action="COMMIT"
-    if (( RANDOM % 4 )); then
-        action="ROLLBACK"
-    fi
-
-    $CLICKHOUSE_CLIENT --query "
+        $CLICKHOUSE_CLIENT --multiquery --query "
         BEGIN TRANSACTION;
-            $optimize_query;
+        $optimize_query;
         $action;
-    " 2>&1 \
-    | grep -Fv "already exists, but it will be deleted soon" | grep -F "Received from " ||:
-
-    sleep 0.$RANDOM;
+        " 2>&1| grep -Fv "already exists, but it will be deleted soon" | grep -F "Received from " ||:
+        sleep 0.$RANDOM;
+    done
 }
 
-function select_action()
+function thread_select()
 {
     set -e
-
-    $CLICKHOUSE_CLIENT --query "
+    while true; do
+        $CLICKHOUSE_CLIENT --multiquery --query "
         BEGIN TRANSACTION;
         SELECT throwIf((SELECT (sum(n), count() % 2) FROM src) != (0, 1)) FORMAT Null;
         SELECT throwIf((SELECT (sum(nm), count() % 2) FROM mv) != (0, 1)) FORMAT Null;
@@ -136,13 +90,14 @@ function select_action()
         SELECT throwIf((SELECT arraySort(groupArray(nm)) FROM mv) != (SELECT arraySort(groupArray(nm)) FROM dst)) FORMAT Null;
         SELECT throwIf((SELECT arraySort(groupArray(nm)) FROM mv) != (SELECT arraySort(groupArray(n*m)) FROM src)) FORMAT Null;
         COMMIT;"
+    done
 }
 
-function select_insert_action()
+function thread_select_insert()
 {
     set -e
-
-    $CLICKHOUSE_CLIENT --query "
+    while true; do
+        $CLICKHOUSE_CLIENT --multiquery --query "
         BEGIN TRANSACTION;
         SELECT throwIf((SELECT count() FROM tmp) != 0) FORMAT Null;
         INSERT INTO tmp SELECT 1, n*m FROM src;
@@ -155,71 +110,36 @@ function select_insert_action()
         SELECT throwIf(1 != (SELECT countDistinct(arr) FROM (SELECT x, arraySort(groupArray(nm)) AS arr FROM tmp WHERE x!=4 GROUP BY x))) FORMAT Null;
         SELECT throwIf((SELECT count(), sum(nm) FROM tmp WHERE x=4) != (SELECT count(), sum(nm) FROM tmp WHERE x!=4)) FORMAT Null;
         ROLLBACK;"
+    done
 }
 
-MIN_SECONDS=5
-MAX_SECONDS=400
-WAIT_FINISH=60
+thread_insert_commit 1 & PID_1=$!
+thread_insert_commit 2 & PID_2=$!
+thread_insert_rollback 3 & PID_3=$!
 
-if [[ $((MAX_SECONDS + WAIT_FINISH)) -ge  550 ]]; then
-    echo "time sttings are wrong" 2>&1
-    exit 1
-fi
+thread_optimize & PID_4=$!
+thread_select & PID_5=$!
+thread_select_insert & PID_6=$!
+sleep 0.$RANDOM;
+thread_select & PID_7=$!
+thread_select_insert & PID_8=$!
 
-START_TIME=$SECONDS
-MIN_TIME=$((START_TIME + MIN_SECONDS))
-MAX_TIME=$((START_TIME + MAX_SECONDS))
-MIN_ITERATIONS=15
-MAX_ITERATIONS=200
+wait $PID_1 && wait $PID_2 && wait $PID_3
+kill -TERM $PID_4
+kill -TERM $PID_5
+kill -TERM $PID_6
+kill -TERM $PID_7
+kill -TERM $PID_8
+wait
+wait_for_queries_to_finish 40
 
-run_with_time_and_iterations_limits $MIN_TIME $MAX_TIME $MIN_ITERATIONS $MAX_ITERATIONS insert_commit_action 1   & PID_1=$!
-run_with_time_and_iterations_limits $MIN_TIME $MAX_TIME $MIN_ITERATIONS $MAX_ITERATIONS insert_commit_action 2   & PID_2=$!
-run_with_time_and_iterations_limits $MIN_TIME $MAX_TIME $MIN_ITERATIONS $MAX_ITERATIONS insert_rollback_action 3 & PID_3=$!
+$CLICKHOUSE_CLIENT --multiquery --query "
+BEGIN TRANSACTION;
+SELECT count(), sum(n), sum(m=1), sum(m=2), sum(m=3) FROM src;
+SELECT count(), sum(nm) FROM mv";
 
-run_with_time_and_iterations_limits $MIN_TIME $MAX_TIME $MIN_ITERATIONS $MAX_ITERATIONS optimize_action      & PID_4=$!
-run_with_time_and_iterations_limits $MIN_TIME $MAX_TIME $MIN_ITERATIONS $MAX_ITERATIONS select_action        & PID_5=$!
-run_with_time_and_iterations_limits $MIN_TIME $MAX_TIME $MIN_ITERATIONS $MAX_ITERATIONS select_insert_action & PID_6=$!
-sleep 0.$RANDOM
-run_with_time_and_iterations_limits $MIN_TIME $MAX_TIME $MIN_ITERATIONS $MAX_ITERATIONS select_action        & PID_7=$!
-run_with_time_and_iterations_limits $MIN_TIME $MAX_TIME $MIN_ITERATIONS $MAX_ITERATIONS select_insert_action & PID_8=$!
-
-is_pid_exist $PID_1 || echo "insert_commit_action is not running" 2>&1
-is_pid_exist $PID_2 || echo "second insert_commit_action is not running" 2>&1
-is_pid_exist $PID_3 || echo "insert_rollback_action is not running" 2>&1
-is_pid_exist $PID_4 || echo "optimize_action is not running" 2>&1
-is_pid_exist $PID_5 || echo "select_action is not running" 2>&1
-is_pid_exist $PID_6 || echo "select_insert_action is not running" 2>&1
-is_pid_exist $PID_7 || echo "second select_action is not running" 2>&1
-is_pid_exist $PID_8 || echo "second select_insert_action is not running" 2>&1
-
-wait $PID_1 || echo "insert_commit_action has failed with status $?" 2>&1
-wait $PID_2 || echo "second insert_commit_action has failed with status $?" 2>&1
-wait $PID_3 || echo "insert_rollback_action has failed with status $?" 2>&1
-wait $PID_4 || echo "optimize_action has failed with status $?" 2>&1
-wait $PID_5 || echo "select_action has failed with status $?" 2>&1
-wait $PID_6 || echo "select_insert_action has failed with status $?" 2>&1
-wait $PID_7 || echo "second select_action has failed with status $?" 2>&1
-wait $PID_8 || echo "second select_insert_action has failed with status $?" 2>&1
-
-wait_for_queries_to_finish $WAIT_FINISH
-
-$CLICKHOUSE_CLIENT --query "
-    BEGIN TRANSACTION;
-        SELECT throwIf((SELECT (sum(n), count() % 2) FROM src) != (0, 1)) FORMAT Null;
-        SELECT throwIf((SELECT (sum(nm), count() % 2) FROM mv) != (0, 1)) FORMAT Null;
-        SELECT throwIf((SELECT (sum(nm), count() % 2) FROM dst) != (0, 1)) FORMAT Null;
-        SELECT throwIf((SELECT arraySort(groupArray(nm)) FROM mv) != (SELECT arraySort(groupArray(nm)) FROM dst)) FORMAT Null;
-        SELECT throwIf((SELECT arraySort(groupArray(nm)) FROM mv) != (SELECT arraySort(groupArray(n*m)) FROM src)) FORMAT Null;
-    COMMIT;
-"
-
-$CLICKHOUSE_CLIENT --query  "
-    SELECT throwIf((SELECT (sum(n), count() % 2) FROM src) != (0, 1)) FORMAT Null;
-    SELECT throwIf((SELECT (sum(nm), count() % 2) FROM mv) != (0, 1)) FORMAT Null;
-    SELECT throwIf((SELECT (sum(nm), count() % 2) FROM dst) != (0, 1)) FORMAT Null;
-    SELECT throwIf((SELECT arraySort(groupArray(nm)) FROM mv) != (SELECT arraySort(groupArray(nm)) FROM dst)) FORMAT Null;
-    SELECT throwIf((SELECT arraySort(groupArray(nm)) FROM mv) != (SELECT arraySort(groupArray(n*m)) FROM src)) FORMAT Null;
-"
+$CLICKHOUSE_CLIENT --query "SELECT count(), sum(n), sum(m=1), sum(m=2), sum(m=3) FROM src"
+$CLICKHOUSE_CLIENT --query "SELECT count(), sum(nm) FROM mv"
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE src";
 $CLICKHOUSE_CLIENT --query "DROP TABLE dst";
diff --git a/tests/queries/0_stateless/01172_transaction_counters.reference b/tests/queries/0_stateless/01172_transaction_counters.reference
index 0fd73c7bcec..24083d7d40b 100644
--- a/tests/queries/0_stateless/01172_transaction_counters.reference
+++ b/tests/queries/0_stateless/01172_transaction_counters.reference
@@ -16,25 +16,25 @@
 7	all_3_3_0	(0,0,'00000000-0000-0000-0000-000000000000')	0
 7	all_4_4_0	(0,0,'00000000-0000-0000-0000-000000000000')	0
 8	1
-1	AddPart	1	1	1	1	all_1_1_0
-2	Begin	1	1	1	1	
-2	AddPart	1	1	1	1	all_2_2_0
-2	Rollback	1	1	1	1	
-3	Begin	1	1	1	1	
-3	AddPart	1	1	1	1	all_3_3_0
-3	Commit	1	1	1	0	
-1	LockPart	1	1	1	1	all_2_2_0
-4	Begin	1	1	1	1	
-4	AddPart	1	1	1	1	all_4_4_0
-4	Commit	1	1	1	0	
-5	Begin	1	1	1	1	
-5	AddPart	1	1	1	1	all_5_5_0
-5	LockPart	1	1	1	1	all_1_1_0
-5	LockPart	1	1	1	1	all_3_3_0
-5	LockPart	1	1	1	1	all_4_4_0
-5	LockPart	1	1	1	1	all_5_5_0
-5	UnlockPart	1	1	1	1	all_1_1_0
-5	UnlockPart	1	1	1	1	all_3_3_0
-5	UnlockPart	1	1	1	1	all_4_4_0
-5	UnlockPart	1	1	1	1	all_5_5_0
-5	Rollback	1	1	1	1	
+1	1	AddPart	1	1	1	1	all_1_1_0
+2	1	Begin	1	1	1	1	
+2	1	AddPart	1	1	1	1	all_2_2_0
+2	1	Rollback	1	1	1	1	
+3	1	Begin	1	1	1	1	
+3	1	AddPart	1	1	1	1	all_3_3_0
+3	1	Commit	1	1	1	0	
+1	1	LockPart	1	1	1	1	all_2_2_0
+4	1	Begin	1	1	1	1	
+4	1	AddPart	1	1	1	1	all_4_4_0
+4	1	Commit	1	1	1	0	
+5	1	Begin	1	1	1	1	
+5	1	AddPart	1	1	1	1	all_5_5_0
+5	1	LockPart	1	1	1	1	all_1_1_0
+5	1	LockPart	1	1	1	1	all_3_3_0
+5	1	LockPart	1	1	1	1	all_4_4_0
+5	1	LockPart	1	1	1	1	all_5_5_0
+5	1	UnlockPart	1	1	1	1	all_1_1_0
+5	1	UnlockPart	1	1	1	1	all_3_3_0
+5	1	UnlockPart	1	1	1	1	all_4_4_0
+5	1	UnlockPart	1	1	1	1	all_5_5_0
+5	1	Rollback	1	1	1	1	
diff --git a/tests/queries/0_stateless/01172_transaction_counters.sql b/tests/queries/0_stateless/01172_transaction_counters.sql
index 581b45cd15c..a809e4196e9 100644
--- a/tests/queries/0_stateless/01172_transaction_counters.sql
+++ b/tests/queries/0_stateless/01172_transaction_counters.sql
@@ -42,6 +42,7 @@ rollback;
 
 system flush logs;
 select indexOf((select arraySort(groupUniqArray(tid)) from system.transactions_info_log where database=currentDatabase() and table='txn_counters'), tid),
+       (toDecimal64(now64(6), 6) - toDecimal64(event_time, 6)) < 100,
        type,
        thread_id!=0,
        length(query_id)=length(queryID()) or type='Commit' and query_id='',  -- ignore fault injection after commit
diff --git a/tests/queries/0_stateless/01174_select_insert_isolation.sh b/tests/queries/0_stateless/01174_select_insert_isolation.sh
index 235d98fb5de..6321f6ff01b 100755
--- a/tests/queries/0_stateless/01174_select_insert_isolation.sh
+++ b/tests/queries/0_stateless/01174_select_insert_isolation.sh
@@ -16,7 +16,7 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE mt (n Int8, m Int8) ENGINE=MergeTree OR
 function thread_insert_commit()
 {
     for i in {1..50}; do
-        $CLICKHOUSE_CLIENT --query "
+        $CLICKHOUSE_CLIENT --multiquery --query "
         BEGIN TRANSACTION;
         INSERT INTO mt VALUES /* ($i, $1) */ ($i, $1);
         INSERT INTO mt VALUES /* (-$i, $1) */ (-$i, $1);
@@ -27,7 +27,7 @@ function thread_insert_commit()
 function thread_insert_rollback()
 {
     for _ in {1..50}; do
-        $CLICKHOUSE_CLIENT --query "
+        $CLICKHOUSE_CLIENT --multiquery --query "
         BEGIN TRANSACTION;
         INSERT INTO mt VALUES /* (42, $1) */ (42, $1);
         ROLLBACK;";
@@ -38,7 +38,7 @@ function thread_select()
 {
     while true; do
         # The first and the last queries must get the same result
-        $CLICKHOUSE_CLIENT --query "
+        $CLICKHOUSE_CLIENT --multiquery --query "
         BEGIN TRANSACTION;
         SET throw_on_unsupported_query_inside_transaction=0;
         CREATE TEMPORARY TABLE tmp AS SELECT arraySort(groupArray(n)), arraySort(groupArray(m)), arraySort(groupArray(_part)) FROM mt FORMAT Null;
@@ -58,7 +58,7 @@ kill -TERM $PID_4
 wait
 wait_for_queries_to_finish 40
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT --multiquery --query "
 BEGIN TRANSACTION;
 SELECT count(), sum(n), sum(m=1), sum(m=2), sum(m=3) FROM mt;";
 
diff --git a/tests/queries/0_stateless/01179_insert_values_semicolon.expect b/tests/queries/0_stateless/01179_insert_values_semicolon.expect
index 4b8693126a1..534b18a9500 100755
--- a/tests/queries/0_stateless/01179_insert_values_semicolon.expect
+++ b/tests/queries/0_stateless/01179_insert_values_semicolon.expect
@@ -37,10 +37,10 @@ send -- "INSERT INTO test_01179 values ('foo'); \r"
 expect "Ok."
 
 send -- "INSERT INTO test_01179 values ('foo'); ('bar') \r"
-expect "Syntax error"
+expect "Cannot read data after semicolon"
 
 send -- "SELECT val, count() FROM test_01179 GROUP BY val FORMAT TSV\r"
-expect "foo\t3"
+expect "foo\t2"
 
 send -- "DROP TABLE test_01179\r"
 expect "Ok."
diff --git a/tests/queries/0_stateless/01187_set_profile_as_setting.sh b/tests/queries/0_stateless/01187_set_profile_as_setting.sh
index f6c6fd0be34..dacb609d790 100755
--- a/tests/queries/0_stateless/01187_set_profile_as_setting.sh
+++ b/tests/queries/0_stateless/01187_set_profile_as_setting.sh
@@ -1,17 +1,17 @@
 #!/usr/bin/env bash
 # Tags: no-random-settings
 
+unset CLICKHOUSE_LOG_COMMENT
+
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# reset --log_comment, because the test has to use the readonly mode
-CLICKHOUSE_LOG_COMMENT=
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "select value, changed from system.settings where name='readonly';"
-$CLICKHOUSE_CLIENT -m -q "set profile='default'; select value, changed from system.settings where name='readonly';"
-$CLICKHOUSE_CLIENT -m -q "set profile='readonly'; select value, changed from system.settings where name='readonly';" 2>&1| grep -Fa "Cannot modify 'send_logs_level' setting in readonly mode" > /dev/null && echo "OK"
+$CLICKHOUSE_CLIENT -n -m -q "select value, changed from system.settings where name='readonly';"
+$CLICKHOUSE_CLIENT -n -m -q "set profile='default'; select value, changed from system.settings where name='readonly';"
+$CLICKHOUSE_CLIENT -n -m -q "set profile='readonly'; select value, changed from system.settings where name='readonly';" 2>&1| grep -Fa "Cannot modify 'send_logs_level' setting in readonly mode" > /dev/null && echo "OK"
 CLICKHOUSE_CLIENT=$(echo ${CLICKHOUSE_CLIENT} | sed 's/'"--send_logs_level=${CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL}"'/--send_logs_level=fatal/g')
-$CLICKHOUSE_CLIENT -m -q "set profile='readonly'; select value, changed from system.settings where name='readonly';"
+$CLICKHOUSE_CLIENT -n -m -q "set profile='readonly'; select value, changed from system.settings where name='readonly';"
 
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=select+value,changed+from+system.settings+where+name='readonly'"
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&profile=default&query=select+value,changed+from+system.settings+where+name='readonly'"
diff --git a/tests/queries/0_stateless/01191_rename_dictionary.sql b/tests/queries/0_stateless/01191_rename_dictionary.sql
index be95e5a7d4b..c5012dabc81 100644
--- a/tests/queries/0_stateless/01191_rename_dictionary.sql
+++ b/tests/queries/0_stateless/01191_rename_dictionary.sql
@@ -27,7 +27,6 @@ RENAME DICTIONARY test_01191.t TO test_01191.dict1; -- {serverError INCORRECT_QU
 DROP DICTIONARY test_01191.t; -- {serverError INCORRECT_QUERY}
 DROP TABLE test_01191.t;
 
-DROP DATABASE IF EXISTS dummy_db;
 CREATE DATABASE dummy_db ENGINE=Atomic;
 RENAME DICTIONARY test_01191.dict TO dummy_db.dict1;
 RENAME DICTIONARY dummy_db.dict1 TO test_01191.dict;
diff --git a/tests/queries/0_stateless/01198_client_quota_key.sh b/tests/queries/0_stateless/01198_client_quota_key.sh
index d08aa2e364f..3f5f5df5071 100755
--- a/tests/queries/0_stateless/01198_client_quota_key.sh
+++ b/tests/queries/0_stateless/01198_client_quota_key.sh
@@ -5,4 +5,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --quota_key Hello --query_id test_quota_key --log_queries 1 --query "SELECT 1; SYSTEM FLUSH LOGS; SELECT DISTINCT quota_key FROM system.query_log WHERE current_database = currentDatabase() AND event_date >= yesterday() AND event_time >= now() - 300 AND query_id = 'test_quota_key'"
+$CLICKHOUSE_CLIENT --quota_key Hello --query_id test_quota_key --log_queries 1 --multiquery --query "SELECT 1; SYSTEM FLUSH LOGS; SELECT DISTINCT quota_key FROM system.query_log WHERE current_database = currentDatabase() AND event_date >= yesterday() AND event_time >= now() - 300 AND query_id = 'test_quota_key'"
diff --git a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
index 8afb0c18462..a255c1db30e 100755
--- a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS table_for_rename_replicated"
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT -n --query "
 CREATE TABLE table_for_rename_replicated
 (
   date Date,
diff --git a/tests/queries/0_stateless/01231_operator_null_in.sql b/tests/queries/0_stateless/01231_operator_null_in.sql
index 26f342540e3..0424a995b3f 100644
--- a/tests/queries/0_stateless/01231_operator_null_in.sql
+++ b/tests/queries/0_stateless/01231_operator_null_in.sql
@@ -112,7 +112,7 @@ DROP TABLE IF EXISTS null_in_subquery;
 
 DROP TABLE IF EXISTS null_in_tuple;
 CREATE TABLE null_in_tuple (dt DateTime, idx int, t Tuple(Nullable(UInt64), Nullable(String))) ENGINE = MergeTree() PARTITION BY dt ORDER BY idx SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
-INSERT INTO null_in_tuple VALUES (1, 1, (1, '1')) (2, 2, (2, NULL)) (3, 3, (NULL, '3')) (4, 4, (NULL, NULL));
+INSERT INTO null_in_tuple VALUES (1, 1, (1, '1')) (2, 2, (2, NULL)) (3, 3, (NULL, '3')) (4, 4, (NULL, NULL))
 
 SET transform_null_in = 0;
 
diff --git a/tests/queries/0_stateless/01232_untuple.sql b/tests/queries/0_stateless/01232_untuple.sql
index e2049e0a453..391d08ab859 100644
--- a/tests/queries/0_stateless/01232_untuple.sql
+++ b/tests/queries/0_stateless/01232_untuple.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET enable_named_columns_in_function_tuple = 1;
 
 select untuple((* except (b),)) from (select 1 a, 2 b, 3 c);
diff --git a/tests/queries/0_stateless/01238_http_memory_tracking.sh b/tests/queries/0_stateless/01238_http_memory_tracking.sh
index f88c8fb47c6..26d3dd8acd4 100755
--- a/tests/queries/0_stateless/01238_http_memory_tracking.sh
+++ b/tests/queries/0_stateless/01238_http_memory_tracking.sh
@@ -8,22 +8,18 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 set -o pipefail
 
-MISTER_USER="test_01238_http_$RANDOM"
-# Create another user to check limit on the amount of memory reliabily
-${CLICKHOUSE_CLIENT} --format Null -q "CREATE USER $MISTER_USER"
-
 # This is needed to keep at least one running query for user for the time of test.
 # (1k http queries takes ~1 second, let's run for 5x more to avoid flaps)
-${CLICKHOUSE_CLIENT} --user ${MISTER_USER} --function_sleep_max_microseconds_per_block 5000000 --format Null <<<'SELECT sleepEachRow(1) FROM numbers(5)' &
+${CLICKHOUSE_CLIENT} --function_sleep_max_microseconds_per_block 5000000 --format Null -n <<<'SELECT sleepEachRow(1) FROM numbers(5)' &
 
 # ignore "yes: standard output: Broken pipe"
 yes 'SELECT 1' 2>/dev/null | {
     head -n1000
 } | {
-    xargs -I{} ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&user=${MISTER_USER}&wait_end_of_query=1&max_memory_usage_for_user=$((1<<30))" -d '{}'
+    xargs -I{} ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&wait_end_of_query=1&max_memory_usage_for_user=$((1<<30))" -d '{}'
 } | grep -x -c 1
 
 wait
 
 # Reset max_memory_usage_for_user, so it will not affect other tests
-${CLICKHOUSE_CLIENT} --user ${MISTER_USER} --max_memory_usage_for_user=0 -q "SELECT 1 FORMAT Null"
+${CLICKHOUSE_CLIENT} --max_memory_usage_for_user=0 -q "SELECT 1 FORMAT Null"
diff --git a/tests/queries/0_stateless/01245_limit_infinite_sources.sql b/tests/queries/0_stateless/01245_limit_infinite_sources.sql
index 69c93baf8a8..05680d86a33 100644
--- a/tests/queries/0_stateless/01245_limit_infinite_sources.sql
+++ b/tests/queries/0_stateless/01245_limit_infinite_sources.sql
@@ -9,4 +9,3 @@ FROM
 )
 WHERE number = 1
 LIMIT 1
-SETTINGS max_rows_to_read = 0;
diff --git a/tests/queries/0_stateless/01246_buffer_flush.sh b/tests/queries/0_stateless/01246_buffer_flush.sh
index 3c7b9038e1f..1ca953c80d9 100755
--- a/tests/queries/0_stateless/01246_buffer_flush.sh
+++ b/tests/queries/0_stateless/01246_buffer_flush.sh
@@ -5,90 +5,72 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-set -e
-
-function query()
-{
-    local query_id
-    if [[ $1 == --query_id ]]; then
-        query_id="&query_id=$2"
-        shift 2
-    fi
-    ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}$query_id" -d "$*"
-}
-
-function wait_until()
+function elapsed_sec()
 {
     local expr=$1 && shift
+    local start end
+    start=$(date +%s.%N)
     while ! eval "$expr"; do
         sleep 0.5
     done
-}
-function get_buffer_delay()
-{
-    local buffer_insert_id=$1 && shift
-    $CLICKHOUSE_CLIENT -q "SYSTEM FLUSH LOGS"
-    query "
-        WITH
-            (SELECT event_time_microseconds FROM system.query_log WHERE current_database = '$CLICKHOUSE_DATABASE' AND type = 'QueryStart' AND query_id = '$buffer_insert_id') AS begin_,
-            (SELECT max(event_time) FROM data_01256) AS end_
-        SELECT dateDiff('seconds', begin_, end_)::UInt64
-    "
+    end=$(date +%s.%N)
+    $CLICKHOUSE_LOCAL -q "select floor($end-$start)"
 }
 
-query "drop table if exists data_01256"
-query "drop table if exists buffer_01256"
-query "create table data_01256 (key UInt64, event_time DateTime(6) MATERIALIZED now64(6)) Engine=Memory()"
+$CLICKHOUSE_CLIENT -nm -q "
+    drop table if exists data_01256;
+    drop table if exists buffer_01256;
+
+    create table data_01256 as system.numbers Engine=Memory();
+"
 
 echo "min"
-query "
-    create table buffer_01256 (key UInt64) Engine=Buffer($CLICKHOUSE_DATABASE, data_01256, 1,
+$CLICKHOUSE_CLIENT -nm -q "
+    create table buffer_01256 as system.numbers Engine=Buffer(currentDatabase(), data_01256, 1,
         2, 100, /* time */
         4, 100, /* rows */
         1, 1e6  /* bytes */
-    )
+    );
+    insert into buffer_01256 select * from system.numbers limit 5;
+    select count() from data_01256;
 "
-min_query_id=$(random_str 10)
-query --query_id "$min_query_id" "insert into buffer_01256 select * from system.numbers limit 5"
-query "select count() from data_01256"
-wait_until '[[ $(query "select count() from data_01256") -eq 5 ]]'
-sec=$(get_buffer_delay "$min_query_id")
+sec=$(elapsed_sec '[[ $($CLICKHOUSE_CLIENT -q "select count() from data_01256") -eq 5 ]]')
 [[ $sec -ge 2 ]] || echo "Buffer flushed too early, min_time=2, flushed after $sec sec"
 [[ $sec -lt 100 ]] || echo "Buffer flushed too late, max_time=100, flushed after $sec sec"
-query "select count() from data_01256"
-query "drop table buffer_01256"
+$CLICKHOUSE_CLIENT -q "select count() from data_01256"
+$CLICKHOUSE_CLIENT -q "drop table buffer_01256"
 
 echo "max"
-query "
-    create table buffer_01256 (key UInt64) Engine=Buffer($CLICKHOUSE_DATABASE, data_01256, 1,
+$CLICKHOUSE_CLIENT -nm -q "
+    create table buffer_01256 as system.numbers Engine=Buffer(currentDatabase(), data_01256, 1,
         100, 2,   /* time */
         0,   100, /* rows */
         0,   1e6  /* bytes */
-    )
+    );
+    insert into buffer_01256 select * from system.numbers limit 5;
+    select count() from data_01256;
 "
-max_query_id=$(random_str 10)
-query --query_id "$max_query_id" "insert into buffer_01256 select * from system.numbers limit 5"
-query "select count() from data_01256"
-wait_until '[[ $(query "select count() from data_01256") -eq 10 ]]'
-sec=$(get_buffer_delay "$max_query_id")
+sec=$(elapsed_sec '[[ $($CLICKHOUSE_CLIENT -q "select count() from data_01256") -eq 10 ]]')
 [[ $sec -ge 2 ]] || echo "Buffer flushed too early, max_time=2, flushed after $sec sec"
-query "select count() from data_01256"
-query "drop table buffer_01256"
+$CLICKHOUSE_CLIENT -q "select count() from data_01256"
+$CLICKHOUSE_CLIENT -q "drop table buffer_01256"
 
 echo "direct"
-query "
-    create table buffer_01256 (key UInt64) Engine=Buffer($CLICKHOUSE_DATABASE, data_01256, 1,
+$CLICKHOUSE_CLIENT -nm -q "
+    create table buffer_01256 as system.numbers Engine=Buffer(currentDatabase(), data_01256, 1,
         100, 100, /* time */
         0,   9,   /* rows */
         0,   1e6  /* bytes */
-    )
+    );
+    insert into buffer_01256 select * from system.numbers limit 10;
+    select count() from data_01256;
 "
-query "insert into buffer_01256 select * from system.numbers limit 10"
-query "select count() from data_01256"
 
 echo "drop"
-query "insert into buffer_01256 select * from system.numbers limit 10"
-query "drop table if exists buffer_01256"
-query "select count() from data_01256"
+$CLICKHOUSE_CLIENT -nm -q "
+    insert into buffer_01256 select * from system.numbers limit 10;
+    drop table if exists buffer_01256;
+    select count() from data_01256;
+"
 
-query "drop table data_01256"
+$CLICKHOUSE_CLIENT -q "drop table data_01256"
diff --git a/tests/queries/0_stateless/01249_flush_interactive.sh b/tests/queries/0_stateless/01249_flush_interactive.sh
index 775b7825a16..551e11c8c8d 100755
--- a/tests/queries/0_stateless/01249_flush_interactive.sh
+++ b/tests/queries/0_stateless/01249_flush_interactive.sh
@@ -14,10 +14,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 function test()
 {
-    timeout 5 ${CLICKHOUSE_LOCAL} --max_execution_time 10 --max_rows_to_read 0 --query "
+    timeout 5 ${CLICKHOUSE_LOCAL} --max_execution_time 10 --query "
         SELECT DISTINCT number % 5 FROM system.numbers" ||:
     echo -e '---'
-    timeout 5 ${CLICKHOUSE_CURL} -sS --no-buffer "${CLICKHOUSE_URL}&max_execution_time=10&max_rows_to_read=0" --data-binary "
+    timeout 5 ${CLICKHOUSE_CURL} -sS --no-buffer "${CLICKHOUSE_URL}&max_execution_time=10" --data-binary "
         SELECT DISTINCT number % 5 FROM system.numbers" ||:
     echo -e '---'
 }
diff --git a/tests/queries/0_stateless/01254_dict_load_after_detach_attach.reference b/tests/queries/0_stateless/01254_dict_load_after_detach_attach.reference
index 2f2d638a294..9c2c59f6379 100644
--- a/tests/queries/0_stateless/01254_dict_load_after_detach_attach.reference
+++ b/tests/queries/0_stateless/01254_dict_load_after_detach_attach.reference
@@ -1,4 +1,4 @@
-0	NOT_LOADED
+NOT_LOADED
 0	LOADED
 10
 1	LOADED
diff --git a/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql b/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql
index ef9e940df8b..11473c6ce32 100644
--- a/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql
+++ b/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql
@@ -12,7 +12,7 @@ LAYOUT(FLAT());
 DETACH DATABASE {CLICKHOUSE_DATABASE:Identifier};
 ATTACH DATABASE {CLICKHOUSE_DATABASE:Identifier};
 
-SELECT query_count, status FROM system.dictionaries WHERE database = currentDatabase() AND name = 'dict';
+SELECT COALESCE((SELECT status FROM system.dictionaries WHERE database = currentDatabase() AND name = 'dict')::Nullable(String), 'NOT_LOADED');
 SYSTEM RELOAD DICTIONARY dict;
 SELECT query_count, status FROM system.dictionaries WHERE database = currentDatabase() AND name = 'dict';
 SELECT dictGetUInt64('dict', 'val', toUInt64(0));
diff --git a/tests/queries/0_stateless/01257_dictionary_mismatch_types.sql b/tests/queries/0_stateless/01257_dictionary_mismatch_types.sql
index 38349d8291b..a4bb7bf2525 100644
--- a/tests/queries/0_stateless/01257_dictionary_mismatch_types.sql
+++ b/tests/queries/0_stateless/01257_dictionary_mismatch_types.sql
@@ -98,7 +98,7 @@ ORDER BY (col1, col2, col3, col4, col5);
 SET input_format_null_as_default = 1;
 INSERT INTO test_dict_db.table1 VALUES ('id1',1,'20200127-1',701,'20200127-1-01',0,300,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 10:37:59',NULL,'2020-02-04 11:35:14','2020-02-08 05:32:04',NULL,NULL,'12345'),('id1',1,'20200127-1',701,'20200127-1-01',0,300,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 10:37:59',NULL,'2020-02-04 11:35:14','2020-02-08 05:32:04',NULL,NULL,'12345'),('id1',1,'20200127-1',702,'20200127-1-02',0,300,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 10:37:59',NULL,'2020-02-04 11:35:14','2020-02-08 05:32:04',NULL,NULL,'12345'),('id1',1,'20200127-1',703,'20200127-1-03',0,300,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 10:37:59',NULL,'2020-02-04 11:35:14','2020-02-08 05:32:04',NULL,NULL,'12345'),('id1',1,'20200127-1',704,'20200127-1-04',0,300,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 10:37:59',NULL,'2020-02-04 11:35:14','2020-02-08 05:32:04',NULL,NULL,'12345'),('id1',1,'20200127-1',705,'20200127-1-05',0,300,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 10:37:59',NULL,'2020-02-04 11:35:14','2020-02-08 05:32:04',NULL,NULL,'12345'),('id1',1,'20200202-1',711,'20200202-1-01',0,200,NULL,'C2','Hello','C40',NULL,1,'2020-02-03 11:07:57',NULL,NULL,NULL,'2020-02-03 11:09:23',NULL,NULL),('id1',1,'20200202-2',712,'20200202-2-01',0,0,NULL,'C3','bye','R40',NULL,1,'2020-02-03 14:13:10',NULL,'2020-02-03 16:11:31','2020-02-07 05:32:05','2020-02-07 11:18:15','2020-02-07 11:18:16','123455'),('id1',1,'20200202-2',713,'20200202-2-02',0,0,NULL,'C3','bye','R40',NULL,1,'2020-02-03 14:13:10',NULL,'2020-02-03 16:11:31','2020-02-07 05:32:05','2020-02-07 11:18:15','2020-02-07 11:18:16','123455'),('id1',2,'20200128-1',701,'20200128-1-01',0,0,NULL,'N1','Hi','N40',NULL,2,'2020-02-03 17:07:27',NULL,'2020-02-05 13:33:55','2020-02-13 05:32:04',NULL,NULL,'A123755'),('id1',2,'20200131-1',701,'20200131-1-01',0,0,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 13:07:17',NULL,'2020-02-04 13:47:55','2020-02-12 05:32:04',NULL,NULL,'A123485'),('id1',2,'20200201-1',701,'20200201-1-01',0,0,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 21:07:37',NULL,'2020-02-05 13:40:51','2020-02-13 05:32:04',NULL,NULL,'A123455'),('id1',2,'20200202-1',711,'20200202-1-01',0,0,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 02:06:54',NULL,'2020-02-04 13:36:45','2020-02-12 05:32:04',NULL,NULL,'A123459'),('id1',2,'20200202-1',712,'20200202-1-02',0,0,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 02:06:54',NULL,'2020-02-04 13:36:45','2020-02-12 05:32:04',NULL,NULL,'A123429'),('id2',1,'20200131-1',401,'20200131-1-01',0,210,'2020-02-16 05:22:04','N1','Hi','N40',NULL,1,'2020-02-03 10:11:00',NULL,'2020-02-05 17:30:05','2020-02-09 05:32:05',NULL,NULL,'454545'),('id2',1,'20200131-1',402,'20200131-1-02',0,210,'2020-02-16 05:22:04','N1','Hi','N40',NULL,1,'2020-02-03 10:11:00',NULL,'2020-02-05 17:30:05','2020-02-09 05:32:05',NULL,NULL,'454545'),('id2',1,'20200131-1',403,'20200131-1-03',0,270,'2020-02-16 05:22:04','N1','Hi','N40',NULL,1,'2020-02-03 10:11:00',NULL,'2020-02-05 17:30:05','2020-02-09 05:32:05',NULL,NULL,'454545'),('id2',1,'20200131-1',404,'20200131-1-04',0,270,'2020-02-16 05:22:04','N1','Hi','N40',NULL,1,'2020-02-03 10:11:00',NULL,'2020-02-05 17:30:05','2020-02-09 05:32:05',NULL,NULL,'454545'),('id2',1,'20200131-1',405,'20200131-1-05',0,380,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 10:11:00',NULL,'2020-02-11 16:52:58','2020-02-15 05:32:04',NULL,NULL,'6892144935823'),('id2',1,'20200131-1',406,'20200131-1-06',0,380,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 10:11:00',NULL,'2020-02-11 16:52:58','2020-02-15 05:32:04',NULL,NULL,'6892144935823'),('id2',1,'20200131-1',407,'20200131-1-07',0,280,NULL,'C2','Hello','C40',NULL,1,'2020-02-03 10:11:00',NULL,NULL,NULL,'2020-02-04 11:01:21',NULL,NULL),('id2',1,'20200131-1',408,'20200131-1-08',0,0,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 10:11:00',NULL,'2020-02-05 17:30:05','2020-02-09 05:32:04',NULL,NULL,'454545'),('id2',1,'20200201-1',401,'20200201-1-01',0,190,'2020-02-16 05:22:05','N1','Hi','N40',NULL,1,'2020-02-03 12:06:17',NULL,'2020-02-05 17:30:30','2020-02-09 05:32:03',NULL,NULL,'90071'),('id2',1,'20200201-1',402,'20200201-1-01',0,160,'2020-02-14 05:22:13','N1','Hi','N40',NULL,1,'2020-02-03 06:21:05',NULL,'2020-02-03 17:42:35','2020-02-07 05:32:04',NULL,NULL,'96575'),('id2',1,'20200201-1',403,'20200201-1-02',0,230,'2020-02-14 05:22:13','N1','Hi','N40',NULL,1,'2020-02-03 06:21:05',NULL,'2020-02-03 17:42:35','2020-02-07 05:32:04',NULL,NULL,'96575'),('id2',1,'20200202-1',404,'20200202-1-01',0,130,'2020-02-14 05:22:14','N1','Hi','N40',NULL,1,'2020-02-03 14:00:39',NULL,'2020-02-03 17:42:45','2020-02-07 05:32:04',NULL,NULL,'96850'),('id3',1,'20200130-1',391,'20200130-1-01',0,300,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 10:26:46',NULL,'2020-02-05 15:33:01','2020-02-08 05:32:05',NULL,NULL,'27243'),('id3',1,'20200130-1',392,'20200130-1-02',0,300,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 10:26:46',NULL,'2020-02-10 16:16:11','2020-02-13 05:32:06',NULL,NULL,'92512'),('id3',1,'20200131-1',393,'20200131-1-01',0,0,NULL,'C2','Hello','C40',NULL,1,'2020-02-03 10:24:38',NULL,NULL,NULL,'2020-02-05 14:04:40',NULL,NULL),('id3',1,'20200131-2',391,'20200131-1-01',0,0,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 10:22:08',NULL,'2020-02-06 14:27:06','2020-02-09 05:32:04',NULL,NULL,'46433'),('id3',1,'20200131-2',392,'20200131-1-02',0,0,NULL,'N1','Hi','N40',NULL,1,'2020-02-03 10:22:08',NULL,'2020-02-06 14:27:06','2020-02-09 05:32:02',NULL,NULL,'46433');
 
-SYSTEM RELOAD DICTIONARY test_dict_db.table1_dict;
+SYSTEM RELOAD DICTIONARIES;
 
 SELECT
     dictGet('test_dict_db.table1_dict', 'col6', (col1, col2, col3, col4, col5)),
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 1ec53399958..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
@@ -10,7 +10,7 @@ set -o pipefail
 # shellcheck disable=SC2120
 function execute()
 {
-    ${CLICKHOUSE_CLIENT} "$@"
+    ${CLICKHOUSE_CLIENT} -n "$@"
 }
 
 #
@@ -76,7 +76,7 @@ insert into data_01278 select
     reinterpretAsString(number), // s6
     reinterpretAsString(number), // s7
     reinterpretAsString(number)  // s8
-from numbers(200000);" > /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/01278_random_string_utf8.sql b/tests/queries/0_stateless/01278_random_string_utf8.sql
index 290d6a0c759..da2dc48c3e1 100644
--- a/tests/queries/0_stateless/01278_random_string_utf8.sql
+++ b/tests/queries/0_stateless/01278_random_string_utf8.sql
@@ -1,6 +1,3 @@
--- Tags: no-fasttest
--- no-fasttest: upper/lowerUTF8 use ICU
-
 SELECT randomStringUTF8('string'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 SELECT lengthUTF8(randomStringUTF8(100));
 SELECT toTypeName(randomStringUTF8(10));
diff --git a/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh b/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh
index c1ec812875c..60a65b9a253 100755
--- a/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh
+++ b/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     DROP DATABASE IF EXISTS 01280_db;
     CREATE DATABASE 01280_db;
     DROP TABLE IF EXISTS 01280_db.table_for_dict;
@@ -39,9 +39,9 @@ $CLICKHOUSE_CLIENT --query="
     LIFETIME(MIN 1000 MAX 2000)
     LAYOUT(COMPLEX_KEY_SSD_CACHE(FILE_SIZE 8192 PATH '$USER_FILES_PATH/0d'));"
 
-$CLICKHOUSE_CLIENT -q "SELECT dictHas('01280_db.ssd_dict', 'a', tuple('1')); -- { serverError 43 }"
+$CLICKHOUSE_CLIENT -nq "SELECT dictHas('01280_db.ssd_dict', 'a', tuple('1')); -- { serverError 43 }"
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     SELECT 'TEST_SMALL';
     SELECT 'VALUE FROM RAM BUFFER';
     SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple('1', toInt32(3)));
@@ -63,9 +63,9 @@ $CLICKHOUSE_CLIENT --query="
     SELECT dictGetInt32('01280_db.ssd_dict', 'b', tuple('10', toInt32(-20)));
     SELECT dictGetString('01280_db.ssd_dict', 'c', tuple('10', toInt32(-20)));"
 
-$CLICKHOUSE_CLIENT -q "SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple(toInt32(3))); -- { serverError 53 }"
+$CLICKHOUSE_CLIENT -nq "SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple(toInt32(3))); -- { serverError 53 }"
 
-$CLICKHOUSE_CLIENT --query="DROP DICTIONARY 01280_db.ssd_dict;
+$CLICKHOUSE_CLIENT -n --query="DROP DICTIONARY 01280_db.ssd_dict;
     DROP TABLE IF EXISTS 01280_db.keys_table;
     CREATE TABLE 01280_db.keys_table
     (
@@ -122,4 +122,4 @@ $CLICKHOUSE_CLIENT --query="DROP DICTIONARY 01280_db.ssd_dict;
     DROP DICTIONARY IF EXISTS database_for_dict.ssd_dict;
     DROP TABLE IF EXISTS database_for_dict.keys_table;"
 
-$CLICKHOUSE_CLIENT --query="DROP DATABASE IF EXISTS 01280_db;"
+$CLICKHOUSE_CLIENT -n --query="DROP DATABASE IF EXISTS 01280_db;"
diff --git a/tests/queries/0_stateless/01285_engine_join_donmikel.sh b/tests/queries/0_stateless/01285_engine_join_donmikel.sh
index ce273ab8e0c..7522ed9924b 100755
--- a/tests/queries/0_stateless/01285_engine_join_donmikel.sh
+++ b/tests/queries/0_stateless/01285_engine_join_donmikel.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT --multiquery --query "
 DROP TABLE IF EXISTS NmSubj;
 DROP TABLE IF EXISTS events;
 
@@ -60,7 +60,7 @@ FROM events as e INNER JOIN NmSubj as ns
 ON ns.NmId = toUInt32(e.Param1)
 WHERE e.EventDate = today() - 7 AND e.EventId = 'GCO' AND ns.SubjectId = 2073"
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT --multiquery --query "
 DROP TABLE NmSubj;
 DROP TABLE events;
 "
diff --git a/tests/queries/0_stateless/01287_max_execution_speed.sql b/tests/queries/0_stateless/01287_max_execution_speed.sql
index 0d132999481..35bc4e02d38 100644
--- a/tests/queries/0_stateless/01287_max_execution_speed.sql
+++ b/tests/queries/0_stateless/01287_max_execution_speed.sql
@@ -1,4 +1,4 @@
--- Tags: no-fasttest, no-debug, no-tsan, no-msan, no-asan
+-- Tags: no-fasttest
 
 SET min_execution_speed = 100000000000, timeout_before_checking_execution_speed = 0;
 SELECT count() FROM system.numbers; -- { serverError TOO_SLOW }
diff --git a/tests/queries/0_stateless/01293_optimize_final_force.sh b/tests/queries/0_stateless/01293_optimize_final_force.sh
index 9c135d272e4..e838af8af9b 100755
--- a/tests/queries/0_stateless/01293_optimize_final_force.sh
+++ b/tests/queries/0_stateless/01293_optimize_final_force.sh
@@ -11,7 +11,7 @@ TIMELIMIT=31
 while [ $SECONDS -lt "$TIMELIMIT" ] && [ $it -lt 100 ];
 do
     it=$((it+1))
-    $CLICKHOUSE_CLIENT --query "
+    $CLICKHOUSE_CLIENT --multiquery --query "
         DROP TABLE IF EXISTS mt;
         CREATE TABLE mt (x UInt8, k UInt8 DEFAULT 0) ENGINE = SummingMergeTree ORDER BY k;
 
diff --git a/tests/queries/0_stateless/01293_show_settings.reference b/tests/queries/0_stateless/01293_show_settings.reference
index c4c3473ee18..187f55697e4 100644
--- a/tests/queries/0_stateless/01293_show_settings.reference
+++ b/tests/queries/0_stateless/01293_show_settings.reference
@@ -5,7 +5,5 @@ 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_memory_usage	UInt64	5000000000
-max_memory_usage_for_user	UInt64	32000000000
 max_untracked_memory	UInt64	1048576
 memory_profiler_step	UInt64	1048576
diff --git a/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh b/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
index 00619f13173..21f46a34514 100755
--- a/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
+++ b/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
@@ -85,7 +85,7 @@ export -f recreate_lazy_func4;
 export -f test_func;
 
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -n -q "
     DROP DATABASE IF EXISTS $CURR_DATABASE;
     CREATE DATABASE $CURR_DATABASE ENGINE = Lazy(1);
 "
diff --git a/tests/queries/0_stateless/01299_alter_merge_tree.sql b/tests/queries/0_stateless/01299_alter_merge_tree.sql
index 1fa354040f5..3c4467926f8 100644
--- a/tests/queries/0_stateless/01299_alter_merge_tree.sql
+++ b/tests/queries/0_stateless/01299_alter_merge_tree.sql
@@ -3,11 +3,11 @@ drop table if exists merge_tree;
 set allow_deprecated_syntax_for_merge_tree=1;
 create table merge_tree ( CounterID UInt32,  StartDate Date,  Sign Int8,  VisitID UInt64,  UserID UInt64,  StartTime DateTime,   ClickLogID UInt64) ENGINE = CollapsingMergeTree(StartDate, intHash32(UserID), tuple(CounterID, StartDate, intHash32(UserID), VisitID, ClickLogID), 8192, Sign);
 
-insert into merge_tree values (1, '2013-09-19', 1, 0, 2, '2013-09-19 12:43:06', 3);
+insert into merge_tree values (1, '2013-09-19', 1, 0, 2, '2013-09-19 12:43:06', 3)
 alter table merge_tree add column dummy String after CounterID;
 describe table merge_tree;
 
-insert into merge_tree values (1, 'Hello, Alter Table!','2013-09-19', 1, 0, 2, '2013-09-19 12:43:06', 3);
+insert into merge_tree values (1, 'Hello, Alter Table!','2013-09-19', 1, 0, 2, '2013-09-19 12:43:06', 3)
 
 select CounterID, dummy from merge_tree where dummy <> '' limit 10;
 
diff --git a/tests/queries/0_stateless/01300_group_by_other_keys_having.reference b/tests/queries/0_stateless/01300_group_by_other_keys_having.reference
index 23028e3fb6e..f861da3da2b 100644
--- a/tests/queries/0_stateless/01300_group_by_other_keys_having.reference
+++ b/tests/queries/0_stateless/01300_group_by_other_keys_having.reference
@@ -3,7 +3,7 @@ SELECT round(avg(log(2) * number), 6) AS k FROM numbers(10000000) GROUP BY (numb
 3465735.9028
 3465735.9028
 3465736.595947
-SELECT round(avg(log(2) * number), 6) AS k FROM numbers(10000000) GROUP BY (number % 2) * (number % 3), number % 3, number % 2 HAVING avg(log(2) * number) > 3465735.3 ORDER BY k SETTINGS enable_analyzer=1;
+SELECT round(avg(log(2) * number), 6) AS k FROM numbers(10000000) GROUP BY (number % 2) * (number % 3), number % 3, number % 2 HAVING avg(log(2) * number) > 3465735.3 ORDER BY k SETTINGS allow_experimental_analyzer=1;
 3465735.9028
 3465735.9028
 3465736.595947
@@ -11,7 +11,7 @@ SELECT round(avg(log(2) * number), 6) AS k FROM numbers(10000000) GROUP BY numbe
 3465734.169932
 3465734.863079
 3465735.556226
-SELECT round(avg(log(2) * number), 6) AS k FROM numbers(10000000) GROUP BY number % 5, ((number % 5) * (number % 5)) HAVING ((number % 5) * (number % 5)) < 5 ORDER BY k SETTINGS enable_analyzer=1;
+SELECT round(avg(log(2) * number), 6) AS k FROM numbers(10000000) GROUP BY number % 5, ((number % 5) * (number % 5)) HAVING ((number % 5) * (number % 5)) < 5 ORDER BY k SETTINGS allow_experimental_analyzer=1;
 3465734.169932
 3465734.863079
 3465735.556226
@@ -19,7 +19,7 @@ SELECT (number % 5) * (number % 5) AS k FROM numbers(10000000) GROUP BY number %
 0
 1
 4
-SELECT (number % 5) * (number % 5) AS k FROM numbers(10000000) GROUP BY number % 5, ((number % 5) * (number % 5)) HAVING ((number % 5) * (number % 5)) < 5 ORDER BY k SETTINGS enable_analyzer=1;
+SELECT (number % 5) * (number % 5) AS k FROM numbers(10000000) GROUP BY number % 5, ((number % 5) * (number % 5)) HAVING ((number % 5) * (number % 5)) < 5 ORDER BY k SETTINGS allow_experimental_analyzer=1;
 0
 1
 4
diff --git a/tests/queries/0_stateless/01300_group_by_other_keys_having.sql b/tests/queries/0_stateless/01300_group_by_other_keys_having.sql
index a73b122a9f9..203e8322ad9 100644
--- a/tests/queries/0_stateless/01300_group_by_other_keys_having.sql
+++ b/tests/queries/0_stateless/01300_group_by_other_keys_having.sql
@@ -1,16 +1,16 @@
 set optimize_group_by_function_keys = 1;
 set optimize_syntax_fuse_functions = 0;
-set enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 
 -- { echoOn }
 SELECT round(avg(log(2) * number), 6) AS k FROM numbers(10000000) GROUP BY (number % 2) * (number % 3), number % 3, number % 2 HAVING avg(log(2) * number) > 3465735.3 ORDER BY k;
-SELECT round(avg(log(2) * number), 6) AS k FROM numbers(10000000) GROUP BY (number % 2) * (number % 3), number % 3, number % 2 HAVING avg(log(2) * number) > 3465735.3 ORDER BY k SETTINGS enable_analyzer=1;
+SELECT round(avg(log(2) * number), 6) AS k FROM numbers(10000000) GROUP BY (number % 2) * (number % 3), number % 3, number % 2 HAVING avg(log(2) * number) > 3465735.3 ORDER BY k SETTINGS allow_experimental_analyzer=1;
 
 SELECT round(avg(log(2) * number), 6) AS k FROM numbers(10000000) GROUP BY number % 5, ((number % 5) * (number % 5)) HAVING ((number % 5) * (number % 5)) < 5 ORDER BY k;
-SELECT round(avg(log(2) * number), 6) AS k FROM numbers(10000000) GROUP BY number % 5, ((number % 5) * (number % 5)) HAVING ((number % 5) * (number % 5)) < 5 ORDER BY k SETTINGS enable_analyzer=1;
+SELECT round(avg(log(2) * number), 6) AS k FROM numbers(10000000) GROUP BY number % 5, ((number % 5) * (number % 5)) HAVING ((number % 5) * (number % 5)) < 5 ORDER BY k SETTINGS allow_experimental_analyzer=1;
 
 SELECT (number % 5) * (number % 5) AS k FROM numbers(10000000) GROUP BY number % 5, ((number % 5) * (number % 5)) HAVING ((number % 5) * (number % 5)) < 5 ORDER BY k;
-SELECT (number % 5) * (number % 5) AS k FROM numbers(10000000) GROUP BY number % 5, ((number % 5) * (number % 5)) HAVING ((number % 5) * (number % 5)) < 5 ORDER BY k SETTINGS enable_analyzer=1;
+SELECT (number % 5) * (number % 5) AS k FROM numbers(10000000) GROUP BY number % 5, ((number % 5) * (number % 5)) HAVING ((number % 5) * (number % 5)) < 5 ORDER BY k SETTINGS allow_experimental_analyzer=1;
 
 -- { echoOff }
 
diff --git a/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.reference b/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.reference
index 6282bf366d0..b20e7415f52 100644
--- a/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.reference
+++ b/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.reference
@@ -1,2 +1,2 @@
-Memory limit exceeded
+Memory limit (for query) exceeded
 Ok
diff --git a/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh b/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
index 5b7cba77432..47fe7a9c7d9 100755
--- a/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
+++ b/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-fasttest, no-parallel
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 start=$SECONDS
 # If the memory leak exists, it will lead to OOM fairly quickly.
 for _ in {1..1000}; do
-    $CLICKHOUSE_CLIENT --max_memory_usage 1G --max_rows_to_read 0 <<< "SELECT uniqExactState(number) FROM system.numbers_mt GROUP BY number % 10";
+    $CLICKHOUSE_CLIENT --max_memory_usage 1G <<< "SELECT uniqExactState(number) FROM system.numbers_mt GROUP BY number % 10";
 
     # NOTE: we cannot use timeout here since this will not guarantee that the query will be executed at least once.
     # (since graceful wait of clickhouse-client had been reverted)
@@ -16,5 +16,5 @@ for _ in {1..1000}; do
     if [[ $elapsed -gt 30 ]]; then
         break
     fi
-done 2>&1 | grep -o -P 'Memory limit .+ exceeded' | sed -r -e 's/(Memory limit)(.+)( exceeded)/\1\3/' | uniq
+done 2>&1 | grep -o -F 'Memory limit (for query) exceeded' | uniq
 echo 'Ok'
diff --git a/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh b/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
index bbf2fd9177a..a521accb082 100755
--- a/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
+++ b/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-fasttest, no-parallel
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01304_direct_io_long.sh b/tests/queries/0_stateless/01304_direct_io_long.sh
index 867c37667fe..2e27c2f7728 100755
--- a/tests/queries/0_stateless/01304_direct_io_long.sh
+++ b/tests/queries/0_stateless/01304_direct_io_long.sh
@@ -1,23 +1,22 @@
 #!/usr/bin/env bash
-# Tags: long, no-object-storage-with-slow-build, no-flaky-check
-# It can be too long with ThreadFuzzer
+# Tags: long, no-object-storage-with-slow-build
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --max_rows_to_read 50M --query "
+$CLICKHOUSE_CLIENT --multiquery --query "
     DROP TABLE IF EXISTS bug;
     CREATE TABLE bug (UserID UInt64, Date Date) ENGINE = MergeTree ORDER BY Date
         SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi', merge_max_block_size = 8192;
     INSERT INTO bug SELECT rand64(), '2020-06-07' FROM numbers(50000000);
     OPTIMIZE TABLE bug FINAL;"
 LOG="$CLICKHOUSE_TMP/err-$CLICKHOUSE_DATABASE"
-$CLICKHOUSE_BENCHMARK --max_rows_to_read 51M --iterations 10 --max_threads 100 --min_bytes_to_use_direct_io 1 <<< "SELECT sum(UserID) FROM bug PREWHERE NOT ignore(Date)" 1>/dev/null 2>"$LOG"
+$CLICKHOUSE_BENCHMARK --iterations 10 --max_threads 100 --min_bytes_to_use_direct_io 1 <<< "SELECT sum(UserID) FROM bug PREWHERE NOT ignore(Date)" 1>/dev/null 2>"$LOG"
 cat "$LOG" | grep Exception
 cat "$LOG" | grep Loaded
 
 rm "$LOG"
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT --multiquery --query "
     DROP TABLE bug;"
diff --git a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
index 6ff6644f11e..1d2d4516b9c 100755
--- a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
@@ -10,7 +10,7 @@ set -e
 function thread()
 {
     while true; do
-        $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS test_table_$1 SYNC;
+        $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS test_table_$1 SYNC;
             CREATE TABLE test_table_$1 (a UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r_$1') ORDER BY tuple();" 2>&1 |
                 grep -vP '(^$)|(^Received exception from server)|(^\d+\. )|because the last replica of the table was dropped right now|is already started to be removing by another replica right now| were removed by another replica|Removing leftovers from table|Another replica was suddenly created|was created by another server at the same moment|was suddenly removed|some other replicas were created at the same time|^\(query: '
     done
diff --git a/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh b/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
index 02aa0f76be5..db986e74b6b 100755
--- a/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
+++ b/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
@@ -12,8 +12,8 @@ DATA_SIZE=200
 
 SEQ=$(seq 0 $(($NUM_REPLICAS - 1)))
 
-for REPLICA in $SEQ; do $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS r$REPLICA"; done
-for REPLICA in $SEQ; do $CLICKHOUSE_CLIENT --query "CREATE TABLE r$REPLICA (x UInt64) ENGINE = ReplicatedMergeTree('/test/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/table', 'r$REPLICA') ORDER BY x SETTINGS min_bytes_for_wide_part = '10M';"; done
+for REPLICA in $SEQ; do $CLICKHOUSE_CLIENT -n --query "DROP TABLE IF EXISTS r$REPLICA"; done
+for REPLICA in $SEQ; do $CLICKHOUSE_CLIENT -n --query "CREATE TABLE r$REPLICA (x UInt64) ENGINE = ReplicatedMergeTree('/test/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/table', 'r$REPLICA') ORDER BY x SETTINGS min_bytes_for_wide_part = '10M';"; done
 
 function thread()
 {
@@ -30,6 +30,6 @@ done
 
 wait
 
-for REPLICA in $SEQ; do $CLICKHOUSE_CLIENT --query "SYSTEM SYNC REPLICA r$REPLICA"; done
-for REPLICA in $SEQ; do $CLICKHOUSE_CLIENT --query "SELECT count(), sum(x) FROM r$REPLICA"; done
-for REPLICA in $SEQ; do $CLICKHOUSE_CLIENT --query "DROP TABLE r$REPLICA"; done
+for REPLICA in $SEQ; do $CLICKHOUSE_CLIENT -n --query "SYSTEM SYNC REPLICA r$REPLICA"; done
+for REPLICA in $SEQ; do $CLICKHOUSE_CLIENT -n --query "SELECT count(), sum(x) FROM r$REPLICA"; done
+for REPLICA in $SEQ; do $CLICKHOUSE_CLIENT -n --query "DROP TABLE r$REPLICA"; done
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 cc96a37a0ce..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
@@ -17,7 +17,7 @@ function thread1()
 {
     local TIMELIMIT=$((SECONDS+$1))
     while [ $SECONDS -lt "$TIMELIMIT" ]; do
-        $CLICKHOUSE_CLIENT --query "CREATE TABLE test_01320.r (x UInt64) ENGINE = ReplicatedMergeTree('/test/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/table', 'r') ORDER BY x; DROP TABLE test_01320.r;"
+        $CLICKHOUSE_CLIENT -n --query "CREATE TABLE test_01320.r (x UInt64) ENGINE = ReplicatedMergeTree('/test/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/table', 'r') ORDER BY x; DROP TABLE test_01320.r;"
     done
 }
 
diff --git a/tests/queries/0_stateless/01323_redundant_functions_in_order_by.reference b/tests/queries/0_stateless/01323_redundant_functions_in_order_by.reference
index c2c37cc4de6..d47f12ff4d1 100644
--- a/tests/queries/0_stateless/01323_redundant_functions_in_order_by.reference
+++ b/tests/queries/0_stateless/01323_redundant_functions_in_order_by.reference
@@ -65,7 +65,7 @@ QUERY id: 0
           SORT id: 12, sort_direction: ASCENDING, with_fill: 0
             EXPRESSION
               COLUMN id: 7, column_name: number, result_type: UInt64, source_id: 8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT groupArray(x)
 FROM
 (
@@ -99,7 +99,7 @@ QUERY id: 0
           SORT id: 12, sort_direction: ASCENDING, with_fill: 0
             EXPRESSION
               COLUMN id: 7, column_name: number, result_type: UInt64, source_id: 8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT groupArray(x)
 FROM
 (
@@ -141,7 +141,7 @@ QUERY id: 0
           SORT id: 15, sort_direction: ASCENDING, with_fill: 0
             EXPRESSION
               COLUMN id: 7, column_name: number, result_type: UInt64, source_id: 8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     key,
     a,
@@ -203,7 +203,7 @@ QUERY id: 0
       SORT id: 25, sort_direction: ASCENDING, with_fill: 0
         EXPRESSION
           COLUMN id: 26, column_name: key, result_type: UInt64, source_id: 5
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     key,
     a
@@ -229,7 +229,7 @@ QUERY id: 0
       SORT id: 7, sort_direction: ASCENDING, with_fill: 0
         EXPRESSION
           COLUMN id: 4, column_name: a, result_type: UInt8, source_id: 3
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     key,
     a
@@ -262,7 +262,7 @@ QUERY id: 0
                     LIST id: 11, nodes: 2
                       COLUMN id: 2, column_name: key, result_type: UInt64, source_id: 3
                       COLUMN id: 4, column_name: a, result_type: UInt8, source_id: 3
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 QUERY id: 0
   PROJECTION COLUMNS
     key UInt64
@@ -285,7 +285,7 @@ QUERY id: 0
       SORT id: 10, sort_direction: ASCENDING, with_fill: 0
         EXPRESSION
           COLUMN id: 2, column_name: key, result_type: UInt64, source_id: 3
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 QUERY id: 0
   PROJECTION COLUMNS
     t1.id UInt64
@@ -314,7 +314,7 @@ QUERY id: 0
       SORT id: 14, sort_direction: ASCENDING, with_fill: 0
         EXPRESSION
           COLUMN id: 15, column_name: id, result_type: UInt64, source_id: 5
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 [0,1,2]
 [0,1,2]
 [0,1,2]
diff --git a/tests/queries/0_stateless/01323_redundant_functions_in_order_by.sql b/tests/queries/0_stateless/01323_redundant_functions_in_order_by.sql
index fb1eed1666e..738ad581e3d 100644
--- a/tests/queries/0_stateless/01323_redundant_functions_in_order_by.sql
+++ b/tests/queries/0_stateless/01323_redundant_functions_in_order_by.sql
@@ -8,37 +8,37 @@ INSERT INTO test SELECT number, number, toString(number), number from numbers(4)
 set optimize_redundant_functions_in_order_by = 1;
 
 SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(x));
-SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(x)) SETTINGS enable_analyzer=1;
+SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(x)) SETTINGS allow_experimental_analyzer=1;
 SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(exp(x)));
-SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(exp(x))) SETTINGS enable_analyzer=1;
+SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(exp(x))) SETTINGS allow_experimental_analyzer=1;
 SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY exp(x), x);
-SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY exp(x), x) SETTINGS enable_analyzer=1;
+SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY exp(x), x) SETTINGS allow_experimental_analyzer=1;
 SELECT * FROM (SELECT number + 2 AS key FROM numbers(4)) s FULL JOIN test t USING(key) ORDER BY s.key, t.key;
-SELECT * FROM (SELECT number + 2 AS key FROM numbers(4)) s FULL JOIN test t USING(key) ORDER BY s.key, t.key SETTINGS enable_analyzer=1;
+SELECT * FROM (SELECT number + 2 AS key FROM numbers(4)) s FULL JOIN test t USING(key) ORDER BY s.key, t.key SETTINGS allow_experimental_analyzer=1;
 SELECT key, a FROM test ORDER BY key, a, exp(key + a);
-SELECT key, a FROM test ORDER BY key, a, exp(key + a) SETTINGS enable_analyzer=1;
+SELECT key, a FROM test ORDER BY key, a, exp(key + a) SETTINGS allow_experimental_analyzer=1;
 SELECT key, a FROM test ORDER BY key, exp(key + a);
-SELECT key, a FROM test ORDER BY key, exp(key + a) SETTINGS enable_analyzer=1;
+SELECT key, a FROM test ORDER BY key, exp(key + a) SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(x));
-EXPLAIN QUERY TREE run_passes=1 SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(x)) settings enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(x)) settings allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(exp(x)));
-EXPLAIN QUERY TREE run_passes=1 SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(exp(x))) settings enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY x, exp(exp(x))) settings allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY exp(x), x);
-EXPLAIN QUERY TREE run_passes=1 SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY exp(x), x) settings enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT groupArray(x) from (SELECT number as x FROM numbers(3) ORDER BY exp(x), x) settings allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT * FROM (SELECT number + 2 AS key FROM numbers(4)) s FULL JOIN test t USING(key) ORDER BY s.key, t.key;
-EXPLAIN QUERY TREE run_passes=1 SELECT * FROM (SELECT number + 2 AS key FROM numbers(4)) s FULL JOIN test t USING(key) ORDER BY s.key, t.key settings enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT * FROM (SELECT number + 2 AS key FROM numbers(4)) s FULL JOIN test t USING(key) ORDER BY s.key, t.key settings allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT key, a FROM test ORDER BY key, a, exp(key + a);
-EXPLAIN QUERY TREE run_passes=1 SELECT key, a FROM test ORDER BY key, a, exp(key + a) settings enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT key, a FROM test ORDER BY key, a, exp(key + a) settings allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT key, a FROM test ORDER BY key, exp(key + a);
-EXPLAIN QUERY TREE run_passes=1 SELECT key, a FROM test ORDER BY key, exp(key + a) settings enable_analyzer=1;
-EXPLAIN QUERY TREE run_passes=1 SELECT key FROM test GROUP BY key ORDER BY avg(a), key settings enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT key, a FROM test ORDER BY key, exp(key + a) settings allow_experimental_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT key FROM test GROUP BY key ORDER BY avg(a), key settings allow_experimental_analyzer=1;
 
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 CREATE TABLE t1 (id UInt64) ENGINE = MergeTree() ORDER BY id;
 CREATE TABLE t2 (id UInt64) ENGINE = MergeTree() ORDER BY id;
 
-EXPLAIN QUERY TREE run_passes=1 SELECT * FROM t1 INNER JOIN t2 ON t1.id = t2.id ORDER BY t1.id, t2.id settings enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT * FROM t1 INNER JOIN t2 ON t1.id = t2.id ORDER BY t1.id, t2.id settings allow_experimental_analyzer=1;
 
 set optimize_redundant_functions_in_order_by = 0;
 
diff --git a/tests/queries/0_stateless/01324_insert_tsv_raw.sql b/tests/queries/0_stateless/01324_insert_tsv_raw.sql
index 4827f34597a..c3812730e5b 100644
--- a/tests/queries/0_stateless/01324_insert_tsv_raw.sql
+++ b/tests/queries/0_stateless/01324_insert_tsv_raw.sql
@@ -1,6 +1,7 @@
 drop table if exists tsv_raw;
 create table tsv_raw (strval String, intval Int64, b1 String, b2 String, b3 String, b4 String) engine = Memory;
 insert into tsv_raw format TSVRaw "a 	1	\	\\	"\""	"\\""
+;
 
 select * from tsv_raw format TSVRaw;
 select * from tsv_raw format JSONCompactEachRow;
diff --git a/tests/queries/0_stateless/01353_low_cardinality_join_types.sql b/tests/queries/0_stateless/01353_low_cardinality_join_types.sql
index 2aa42f33fd3..93953f1d74a 100644
--- a/tests/queries/0_stateless/01353_low_cardinality_join_types.sql
+++ b/tests/queries/0_stateless/01353_low_cardinality_join_types.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 set join_algorithm = 'hash';
 
 select '-';
@@ -75,7 +75,7 @@ from (select toLowCardinality(number) k, toLowCardinality(toString(number)) s fr
 full join (select toLowCardinality(number+1) k, toLowCardinality(toString(number+1)) s from numbers(2)) as js2
 using k order by js1.k, js2.k;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 set join_algorithm = 'hash';
 
 select '-';
diff --git a/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql b/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
index b9ad132bcd2..1b22082bd83 100644
--- a/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
+++ b/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
@@ -1,5 +1,4 @@
 -- Tags: no-parallel
--- no-parallel: Slows down query_log
 
 DROP TABLE IF EXISTS slow_log;
 DROP TABLE IF EXISTS expected_times;
diff --git a/tests/queries/0_stateless/01375_storage_file_tsv_csv_with_names_write_prefix.sh b/tests/queries/0_stateless/01375_storage_file_tsv_csv_with_names_write_prefix.sh
index a634f689dca..af8d3f4e69b 100755
--- a/tests/queries/0_stateless/01375_storage_file_tsv_csv_with_names_write_prefix.sh
+++ b/tests/queries/0_stateless/01375_storage_file_tsv_csv_with_names_write_prefix.sh
@@ -9,7 +9,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 echo 'zero rows'
 for format in TSVWithNames TSVWithNamesAndTypes CSVWithNames CSVWithNamesAndTypes JSONCompactEachRowWithNames JSONCompactEachRowWithNamesAndTypes JSONCompactStringsEachRow JSONCompactStringsEachRowWithNamesAndTypes; do
     echo $format
-    ${CLICKHOUSE_LOCAL} --query="
+    ${CLICKHOUSE_LOCAL} --multiquery --query="
         CREATE TABLE ${format}_01375 ENGINE File($format, '01375_$format') AS SELECT * FROM numbers(1) WHERE number < 0;
         SELECT * FROM ${format}_01375;
         DROP TABLE ${format}_01375;
@@ -22,7 +22,7 @@ echo 'multi clickhouse-local one file'
 for format in TSVWithNames TSVWithNamesAndTypes CSVWithNames CSVWithNamesAndTypes JSONCompactEachRowWithNames JSONCompactEachRowWithNamesAndTypes JSONCompactStringsEachRow JSONCompactStringsEachRowWithNamesAndTypes; do
     echo $format
     for _ in {1..2}; do
-        ${CLICKHOUSE_LOCAL} --query="
+        ${CLICKHOUSE_LOCAL} --multiquery --query="
             CREATE TABLE ${format}_01375 ENGINE File($format, '01375_$format') AS SELECT * FROM numbers(1);
             SELECT * FROM ${format}_01375;
             DROP TABLE ${format}_01375;
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 2d16e71f099..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
@@ -21,4 +21,4 @@ QUERY id: 0
   GROUP BY
     LIST id: 10, nodes: 1
       COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
-  SETTINGS enable_analyzer=1
+  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 08ca9ed3c2d..a868b38b4d7 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
@@ -38,7 +38,7 @@ EXPLAIN QUERY TREE
 SELECT dictGet('dictdb_01376.dict_exists', 'value', number) as val
 FROM numbers(2)
 GROUP BY val
-SETTINGS enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
 
 DROP DICTIONARY dictdb_01376.dict_exists;
 DROP TABLE dictdb_01376.table_for_dict;
diff --git a/tests/queries/0_stateless/01395_limit_more_cases.reference b/tests/queries/0_stateless/01395_limit_more_cases.reference
index d68b987ea19..c9d0dd73ab8 100644
--- a/tests/queries/0_stateless/01395_limit_more_cases.reference
+++ b/tests/queries/0_stateless/01395_limit_more_cases.reference
@@ -254,3 +254,4 @@
 15	13	0	0	0	0	0	0
 15	14	0	0	0	0	0	0
 15	15	0	0	0	0	0	0
+0	0	0
diff --git a/tests/queries/0_stateless/01395_limit_more_cases.sh b/tests/queries/0_stateless/01395_limit_more_cases.sh
index 6be8a91f0c7..177147d2142 100755
--- a/tests/queries/0_stateless/01395_limit_more_cases.sh
+++ b/tests/queries/0_stateless/01395_limit_more_cases.sh
@@ -9,15 +9,29 @@ SIZE=13
 for OFFSET in {0..15}; do
     for LIMIT in {0..15}; do
         echo "SELECT
-            $OFFSET,
-            $LIMIT,
-            count() AS c,
-            min(number) AS first,
-            max(number) AS last,
+            $OFFSET, $LIMIT,
+            count() AS c, min(number) AS first, max(number) AS last,
             throwIf(first != ($OFFSET < $SIZE AND $LIMIT > 0 ? $OFFSET : 0)),
             throwIf(last != ($OFFSET < $SIZE AND $LIMIT > 0 ? least($SIZE - 1, $OFFSET + $LIMIT - 1) : 0)),
             throwIf((c != 0 OR first != 0 OR last != 0) AND (c != last - first + 1))
             FROM (SELECT * FROM numbers($SIZE) LIMIT $OFFSET, $LIMIT);
         "
     done
-done | $CLICKHOUSE_CLIENT --max_block_size 5
+done | $CLICKHOUSE_CLIENT -n --max_block_size 5
+
+# Randomized test
+
+ITERATIONS=1000
+for _ in $(seq $ITERATIONS); do
+    SIZE=$(($RANDOM % 100))
+    OFFSET=$(($RANDOM % 111))
+    LIMIT=$(($RANDOM % 111))
+
+    echo "WITH count() AS c, min(number) AS first, max(number) AS last
+            SELECT
+                throwIf(first != ($OFFSET < $SIZE AND $LIMIT > 0 ? $OFFSET : 0)),
+                throwIf(last != ($OFFSET < $SIZE AND $LIMIT > 0 ? least($SIZE - 1, $OFFSET + $LIMIT - 1) : 0)),
+                throwIf((c != 0 OR first != 0 OR last != 0) AND (c != last - first + 1))
+            FROM (SELECT * FROM numbers($SIZE) LIMIT $OFFSET, $LIMIT);
+        "
+done | $CLICKHOUSE_CLIENT -n --max_block_size $(($RANDOM % 20 + 1)) | uniq
diff --git a/tests/queries/0_stateless/01395_limit_more_cases_random.reference b/tests/queries/0_stateless/01395_limit_more_cases_random.reference
deleted file mode 100644
index 06b63ea6c2f..00000000000
--- a/tests/queries/0_stateless/01395_limit_more_cases_random.reference
+++ /dev/null
@@ -1 +0,0 @@
-0	0	0
diff --git a/tests/queries/0_stateless/01395_limit_more_cases_random.sh b/tests/queries/0_stateless/01395_limit_more_cases_random.sh
deleted file mode 100755
index bb942906e63..00000000000
--- a/tests/queries/0_stateless/01395_limit_more_cases_random.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-SIZE=13
-ITERATIONS=300
-for _ in $(seq $ITERATIONS); do
-    SIZE=$(($RANDOM % 100))
-    OFFSET=$(($RANDOM % 111))
-    LIMIT=$(($RANDOM % 111))
-
-    echo "WITH count() AS c, min(number) AS first, max(number) AS last
-            SELECT
-                throwIf(first != ($OFFSET < $SIZE AND $LIMIT > 0 ? $OFFSET : 0)),
-                throwIf(last != ($OFFSET < $SIZE AND $LIMIT > 0 ? least($SIZE - 1, $OFFSET + $LIMIT - 1) : 0)),
-                throwIf((c != 0 OR first != 0 OR last != 0) AND (c != last - first + 1))
-            FROM (SELECT * FROM numbers($SIZE) LIMIT $OFFSET, $LIMIT);
-        "
-done | $CLICKHOUSE_CLIENT --max_block_size $(($RANDOM % 20 + 1)) | uniq
diff --git a/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh b/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
index eca2db359bb..80e9253af2c 100755
--- a/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
+++ b/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
@@ -13,7 +13,7 @@ REPLICA=$($CLICKHOUSE_CLIENT --query "Select getMacro('replica')")
 
 SCALE=1000
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT -n --query "
     DROP TABLE IF EXISTS r1;
     DROP TABLE IF EXISTS r2;
     CREATE TABLE r1 (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/{shard}', '1{replica}') ORDER BY x
@@ -46,7 +46,7 @@ $CLICKHOUSE_CLIENT --receive_timeout 600 --query "SYSTEM SYNC REPLICA r2" # Need
 
 $CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/$SHARD/replicas/2$REPLICA' AND name = 'is_lost'";
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT -n --query "
     DROP TABLE IF EXISTS r1;
     DROP TABLE IF EXISTS r2;
 "
diff --git a/tests/queries/0_stateless/01396_low_cardinality_fixed_string_default.sql b/tests/queries/0_stateless/01396_low_cardinality_fixed_string_default.sql
index f0c89cdf826..e31c402559e 100644
--- a/tests/queries/0_stateless/01396_low_cardinality_fixed_string_default.sql
+++ b/tests/queries/0_stateless/01396_low_cardinality_fixed_string_default.sql
@@ -6,7 +6,6 @@ CREATE TABLE test
 ) ENGINE = MergeTree() PARTITION BY id ORDER BY id;
 
 INSERT INTO test FORMAT CSV 1,RU
-
 INSERT INTO test FORMAT CSV 1,
 
 SELECT * FROM test ORDER BY code;
diff --git a/tests/queries/0_stateless/01412_cache_dictionary_race.sh b/tests/queries/0_stateless/01412_cache_dictionary_race.sh
index b0c73cf742f..36295ca01ea 100755
--- a/tests/queries/0_stateless/01412_cache_dictionary_race.sh
+++ b/tests/queries/0_stateless/01412_cache_dictionary_race.sh
@@ -10,7 +10,7 @@ $CLICKHOUSE_CLIENT --query "DROP DATABASE IF EXISTS ordinary_db"
 
 $CLICKHOUSE_CLIENT --query "CREATE DATABASE ordinary_db"
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
 
 CREATE DICTIONARY ordinary_db.dict1
 (
@@ -35,7 +35,7 @@ function dict_get_thread()
 function drop_create_table_thread()
 {
     while true; do
-        $CLICKHOUSE_CLIENT --query "CREATE TABLE ordinary_db.table_for_dict_real (
+        $CLICKHOUSE_CLIENT -n --query "CREATE TABLE ordinary_db.table_for_dict_real (
             key_column UInt64,
             second_column UInt8,
             third_column String
diff --git a/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh b/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
index 5cdd6057050..31e2cc395aa 100755
--- a/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
+++ b/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-# Tags: zookeeper, no-parallel, no-fasttest
-# no-fasttest: Waiting for failed mutations is slow: https://github.com/ClickHouse/ClickHouse/issues/67936
+# Tags: zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01415_sticking_mutations.sh b/tests/queries/0_stateless/01415_sticking_mutations.sh
index 97467c3ce9d..b7c8768a65d 100755
--- a/tests/queries/0_stateless/01415_sticking_mutations.sh
+++ b/tests/queries/0_stateless/01415_sticking_mutations.sh
@@ -11,7 +11,7 @@ $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS sticking_mutations"
 
 function check_sticky_mutations()
 {
-    $CLICKHOUSE_CLIENT --query "CREATE TABLE sticking_mutations (
+    $CLICKHOUSE_CLIENT -n --query "CREATE TABLE sticking_mutations (
       date Date,
       key UInt64,
       value1 String,
diff --git a/tests/queries/0_stateless/01428_nullable_asof_join.sql b/tests/queries/0_stateless/01428_nullable_asof_join.sql
index 41f6ba8a03d..f07a26edd97 100644
--- a/tests/queries/0_stateless/01428_nullable_asof_join.sql
+++ b/tests/queries/0_stateless/01428_nullable_asof_join.sql
@@ -18,13 +18,13 @@ SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(ma
 FROM (SELECT toUInt8(number) > 0 as pk, toUInt8(number) as dt FROM numbers(3)) a
 ASOF LEFT JOIN (SELECT 1 as pk, toNullable(0) as dt) b
 USING(pk, dt)
-ORDER BY a.dt SETTINGS enable_analyzer = 0;
+ORDER BY a.dt SETTINGS allow_experimental_analyzer = 0;
 
 SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(materialize(a.dt)), toTypeName(materialize(b.dt))
 FROM (SELECT toUInt8(number) > 0 as pk, toUInt8(number) as dt FROM numbers(3)) a
 ASOF LEFT JOIN (SELECT 1 as pk, toNullable(0) as dt) b
 USING(pk, dt)
-ORDER BY a.dt SETTINGS enable_analyzer = 1;
+ORDER BY a.dt SETTINGS allow_experimental_analyzer = 1;
 
 SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(materialize(a.dt)), toTypeName(materialize(b.dt))
 FROM (SELECT toUInt8(number) > 0 as pk, toNullable(toUInt8(number)) as dt FROM numbers(3)) a
@@ -70,25 +70,25 @@ SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(ma
 FROM (SELECT toUInt8(number) > 0 as pk, toNullable(toUInt8(number)) as dt FROM numbers(3)) a
 ASOF JOIN (SELECT 1 as pk, 2 as dt) b
 USING(pk, dt)
-ORDER BY a.dt SETTINGS enable_analyzer = 0;
+ORDER BY a.dt SETTINGS allow_experimental_analyzer = 0;
 
 SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(materialize(a.dt)), toTypeName(materialize(b.dt))
 FROM (SELECT toUInt8(number) > 0 as pk, toNullable(toUInt8(number)) as dt FROM numbers(3)) a
 ASOF JOIN (SELECT 1 as pk, 2 as dt) b
 USING(pk, dt)
-ORDER BY a.dt SETTINGS enable_analyzer = 1;
+ORDER BY a.dt SETTINGS allow_experimental_analyzer = 1;
 
 SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(materialize(a.dt)), toTypeName(materialize(b.dt))
 FROM (SELECT toUInt8(number) > 0 as pk, toUInt8(number) as dt FROM numbers(3)) a
 ASOF JOIN (SELECT 1 as pk, toNullable(0) as dt) b
 USING(pk, dt)
-ORDER BY a.dt SETTINGS enable_analyzer = 0;
+ORDER BY a.dt SETTINGS allow_experimental_analyzer = 0;
 
 SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(materialize(a.dt)), toTypeName(materialize(b.dt))
 FROM (SELECT toUInt8(number) > 0 as pk, toUInt8(number) as dt FROM numbers(3)) a
 ASOF JOIN (SELECT 1 as pk, toNullable(0) as dt) b
 USING(pk, dt)
-ORDER BY a.dt SETTINGS enable_analyzer = 1;
+ORDER BY a.dt SETTINGS allow_experimental_analyzer = 1;
 
 SELECT a.pk, b.pk, a.dt, b.dt, toTypeName(a.pk), toTypeName(b.pk), toTypeName(materialize(a.dt)), toTypeName(materialize(b.dt))
 FROM (SELECT toUInt8(number) > 0 as pk, toNullable(toUInt8(number)) as dt FROM numbers(3)) a
diff --git a/tests/queries/0_stateless/01431_utf8_ubsan.sql b/tests/queries/0_stateless/01431_utf8_ubsan.sql
index 3a28e023805..d6a299225b1 100644
--- a/tests/queries/0_stateless/01431_utf8_ubsan.sql
+++ b/tests/queries/0_stateless/01431_utf8_ubsan.sql
@@ -1,5 +1,2 @@
--- Tags: no-fasttest
--- no-fasttest: upper/lowerUTF8 use ICU
-
 SELECT hex(lowerUTF8('\xFF'));
 SELECT hex(upperUTF8('\xFF'));
diff --git a/tests/queries/0_stateless/01443_merge_truncate_long.sh b/tests/queries/0_stateless/01443_merge_truncate_long.sh
index 51654b2e4e1..65b9bcd366e 100755
--- a/tests/queries/0_stateless/01443_merge_truncate_long.sh
+++ b/tests/queries/0_stateless/01443_merge_truncate_long.sh
@@ -34,7 +34,7 @@ do
         SELECT count() FROM t HAVING count() > 0;
         SELECT ${i};
         "
-done | ${CLICKHOUSE_CLIENT}
+done | ${CLICKHOUSE_CLIENT} --multiquery
 
 wait
 
diff --git a/tests/queries/0_stateless/01448_json_compact_strings_each_row.sql b/tests/queries/0_stateless/01448_json_compact_strings_each_row.sql
index 52f0eba8ba4..06374c633e5 100644
--- a/tests/queries/0_stateless/01448_json_compact_strings_each_row.sql
+++ b/tests/queries/0_stateless/01448_json_compact_strings_each_row.sql
@@ -24,64 +24,51 @@ SELECT 5;
 /* Check JSONCompactStringsEachRow Input */
 CREATE TABLE test_table (v1 String, v2 UInt8, v3 DEFAULT v2 * 16, v4 UInt8 DEFAULT 8) ENGINE = MergeTree() ORDER BY v2;
 INSERT INTO test_table FORMAT JSONCompactStringsEachRow ["first", "1", "2", "3"] ["second", "2", "3", "6"];
-
 SELECT * FROM test_table FORMAT JSONCompactStringsEachRow;
 TRUNCATE TABLE test_table;
 SELECT 6;
 /* Check input_format_null_as_default = 1 */
 SET input_format_null_as_default = 1;
 INSERT INTO test_table FORMAT JSONCompactStringsEachRow ["first", "1", "2", "ᴺᵁᴸᴸ"] ["second", "2", "null", "6"];
-
 SELECT * FROM test_table FORMAT JSONCompactStringsEachRow;
 TRUNCATE TABLE test_table;
 SELECT 7;
 /* Check Nested */
 CREATE TABLE test_table_2 (v1 UInt8, n Nested(id UInt8, name String)) ENGINE = MergeTree() ORDER BY v1;
 INSERT INTO test_table_2 FORMAT JSONCompactStringsEachRow ["16", "[15, 16, 17]", "['first', 'second', 'third']"];
-
 SELECT * FROM test_table_2 FORMAT JSONCompactStringsEachRow;
 TRUNCATE TABLE test_table_2;
 SELECT 8;
 /* Check JSONCompactStringsEachRowWithNames and JSONCompactStringsEachRowWithNamesAndTypes Input */
 SET input_format_null_as_default = 0;
 INSERT INTO test_table FORMAT JSONCompactStringsEachRowWithNamesAndTypes ["v1", "v2", "v3", "v4"]["String","UInt8","UInt16","UInt8"]["first", "1", "2", "3"]["second", "2", "3", "6"];
-
 INSERT INTO test_table FORMAT JSONCompactStringsEachRowWithNames ["v1", "v2", "v3", "v4"]["first", "1", "2", "3"]["second", "2", "3", "6"];
-
 SELECT * FROM test_table FORMAT JSONCompactStringsEachRow;
 TRUNCATE TABLE test_table;
 SELECT 9;
 /* Check input_format_null_as_default = 1 */
 SET input_format_null_as_default = 1;
 INSERT INTO test_table FORMAT JSONCompactStringsEachRowWithNamesAndTypes ["v1", "v2", "v3", "v4"]["String","UInt8","UInt16","UInt8"]["first", "1", "2", "null"] ["second", "2", "null", "6"];
-
 INSERT INTO test_table FORMAT JSONCompactStringsEachRowWithNames ["v1", "v2", "v3", "v4"]["first", "1", "2", "null"] ["second", "2", "null", "6"];
-
 SELECT * FROM test_table FORMAT JSONCompactStringsEachRow;
 SELECT 10;
 /* Check Header */
 TRUNCATE TABLE test_table;
 SET input_format_skip_unknown_fields = 1;
 INSERT INTO test_table FORMAT JSONCompactStringsEachRowWithNamesAndTypes ["v1", "v2", "invalid_column"]["String", "UInt8", "UInt8"]["first", "1", "32"]["second", "2", "64"];
-
 INSERT INTO test_table FORMAT JSONCompactStringsEachRowWithNames ["v1", "v2", "invalid_column"]["first", "1", "32"]["second", "2", "64"];
-
 SELECT * FROM test_table FORMAT JSONCompactStringsEachRow;
 SELECT 11;
 TRUNCATE TABLE test_table;
 INSERT INTO test_table FORMAT JSONCompactStringsEachRowWithNamesAndTypes ["v4", "v2", "v3"]["UInt8", "UInt8", "UInt16"]["1", "2", "3"]
-
 INSERT INTO test_table FORMAT JSONCompactStringsEachRowWithNames ["v4", "v2", "v3"]["1", "2", "3"]
-
 SELECT * FROM test_table FORMAT JSONCompactStringsEachRowWithNamesAndTypes;
 SELECT '---------';
 SELECT * FROM test_table FORMAT JSONCompactStringsEachRowWithNames;
 SELECT 12;
 /* Check Nested */
 INSERT INTO test_table_2 FORMAT JSONCompactStringsEachRowWithNamesAndTypes ["v1", "n.id", "n.name"]["UInt8", "Array(UInt8)", "Array(String)"]["16", "[15, 16, 17]", "['first', 'second', 'third']"];
-
 INSERT INTO test_table_2 FORMAT JSONCompactStringsEachRowWithNames ["v1", "n.id", "n.name"]["16", "[15, 16, 17]", "['first', 'second', 'third']"];
-
 SELECT * FROM test_table_2 FORMAT JSONCompactStringsEachRowWithNamesAndTypes;
 SELECT '---------';
 SELECT * FROM test_table_2 FORMAT JSONCompactStringsEachRowWithNames;
diff --git a/tests/queries/0_stateless/01451_dist_logs.sh b/tests/queries/0_stateless/01451_dist_logs.sh
index e281e232bb5..23dee7a827d 100755
--- a/tests/queries/0_stateless/01451_dist_logs.sh
+++ b/tests/queries/0_stateless/01451_dist_logs.sh
@@ -10,4 +10,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # triggered not for the first query
 for _ in {1..20}; do
     echo "select * from remote('127.{2,3}', system.numbers) where number = 10 limit 1;"
-done | ${CLICKHOUSE_CLIENT} 2>/dev/null
+done | ${CLICKHOUSE_CLIENT} -n 2>/dev/null
diff --git a/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh b/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh
index 950afea9086..fa9238041b1 100755
--- a/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh
+++ b/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh
@@ -11,19 +11,14 @@ $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS mem"
 $CLICKHOUSE_CLIENT -q "CREATE TABLE mem (x UInt64) engine = Memory"
 
 function f {
-  local TIMELIMIT=$((SECONDS+$1))
   for _ in $(seq 1 300); do
     $CLICKHOUSE_CLIENT -q "SELECT count() FROM (SELECT * FROM mem SETTINGS max_threads=2) FORMAT Null;"
-    if [ $SECONDS -ge "$TIMELIMIT" ]; then
-        break
-    fi
   done
 }
 
 function g {
-  local TIMELIMIT=$((SECONDS+$1))
   for _ in $(seq 1 100); do
-    $CLICKHOUSE_CLIENT -q "
+    $CLICKHOUSE_CLIENT -n -q "
         INSERT INTO mem SELECT number FROM numbers(1000000);
         INSERT INTO mem SELECT number FROM numbers(1000000);
         INSERT INTO mem SELECT number FROM numbers(1000000);
@@ -35,18 +30,14 @@ function g {
         INSERT INTO mem VALUES (1);
         TRUNCATE TABLE mem;
     "
-    if [ $SECONDS -ge "$TIMELIMIT" ]; then
-        break
-    fi
   done
 }
 
 export -f f;
 export -f g;
 
-TIMEOUT=20
-f $TIMEOUT &
-g $TIMEOUT &
+timeout 20 bash -c f > /dev/null &
+timeout 20 bash -c g > /dev/null &
 wait
 
 $CLICKHOUSE_CLIENT -q "DROP TABLE mem"
diff --git a/tests/queries/0_stateless/01455_opentelemetry_distributed.reference b/tests/queries/0_stateless/01455_opentelemetry_distributed.reference
index 2b08db1f27f..2920b387aa2 100644
--- a/tests/queries/0_stateless/01455_opentelemetry_distributed.reference
+++ b/tests/queries/0_stateless/01455_opentelemetry_distributed.reference
@@ -1,10 +1,10 @@
 ===http===
-{"query":"select 1 from remote('127.0.0.2', system, one) settings enable_analyzer = 1 format Null\n","status":"QueryFinish","tracestate":"some custom state","sorted_by_start_time":1}
+{"query":"select 1 from remote('127.0.0.2', system, one) settings allow_experimental_analyzer = 1 format Null\n","status":"QueryFinish","tracestate":"some custom state","sorted_by_start_time":1}
 {"query":"DESC TABLE system.one","status":"QueryFinish","tracestate":"some custom state","sorted_by_start_time":1}
 {"query":"SELECT 1 AS `1` FROM `system`.`one` AS `__table1`","status":"QueryFinish","tracestate":"some custom state","sorted_by_start_time":1}
 {"query":"DESC TABLE system.one","query_status":"QueryFinish","tracestate":"some custom state","sorted_by_finish_time":1}
 {"query":"SELECT 1 AS `1` FROM `system`.`one` AS `__table1`","query_status":"QueryFinish","tracestate":"some custom state","sorted_by_finish_time":1}
-{"query":"select 1 from remote('127.0.0.2', system, one) settings enable_analyzer = 1 format Null\n","query_status":"QueryFinish","tracestate":"some custom state","sorted_by_finish_time":1}
+{"query":"select 1 from remote('127.0.0.2', system, one) settings allow_experimental_analyzer = 1 format Null\n","query_status":"QueryFinish","tracestate":"some custom state","sorted_by_finish_time":1}
 {"total spans":"3","unique spans":"3","unique non-zero parent spans":"3"}
 {"initial query spans with proper parent":"2"}
 {"unique non-empty tracestate values":"1"}
diff --git a/tests/queries/0_stateless/01455_opentelemetry_distributed.sh b/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
index 30940f93a56..e19810dd7f1 100755
--- a/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
+++ b/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
@@ -9,8 +9,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 function check_log
 {
-${CLICKHOUSE_CLIENT} --format=JSONEachRow -q "
-set enable_analyzer = 1;
+${CLICKHOUSE_CLIENT} --format=JSONEachRow -nq "
+set allow_experimental_analyzer = 1;
 system flush logs;
 
 -- Show queries sorted by start time.
@@ -75,7 +75,7 @@ select uniqExact(value) "'"'"unique non-empty tracestate values"'"'"
 
 # Generate some random trace id so that the prevous runs of the test do not interfere.
 echo "===http==="
-trace_id=$(${CLICKHOUSE_CLIENT} -q "select lower(hex(reverse(reinterpretAsString(generateUUIDv4())))) settings enable_analyzer = 1")
+trace_id=$(${CLICKHOUSE_CLIENT} -q "select lower(hex(reverse(reinterpretAsString(generateUUIDv4())))) settings allow_experimental_analyzer = 1")
 
 # Check that the HTTP traceparent is read, and then passed through `remote`
 # table function. We expect 4 queries -- one initial, one SELECT and two
@@ -85,7 +85,7 @@ ${CLICKHOUSE_CURL} \
     --header "traceparent: 00-$trace_id-0000000000000073-01" \
     --header "tracestate: some custom state" "$CLICKHOUSE_URL" \
     --get \
-    --data-urlencode "query=select 1 from remote('127.0.0.2', system, one) settings enable_analyzer = 1 format Null"
+    --data-urlencode "query=select 1 from remote('127.0.0.2', system, one) settings allow_experimental_analyzer = 1 format Null"
 
 check_log
 
diff --git a/tests/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql b/tests/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql
index a2e4804f12e..b7cbfc92c26 100644
--- a/tests/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql
+++ b/tests/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS tbl;
 CREATE TABLE tbl(a String, b UInt32, c Float64, d Int64, e UInt8) ENGINE=MergeTree ORDER BY tuple();
 INSERT INTO tbl SELECT number, number * 2, number * 3, number * 4, number * 5 FROM system.numbers LIMIT 10;
diff --git a/tests/queries/0_stateless/01458_named_tuple_millin.reference b/tests/queries/0_stateless/01458_named_tuple_millin.reference
index 86561570985..954dfe36563 100644
--- a/tests/queries/0_stateless/01458_named_tuple_millin.reference
+++ b/tests/queries/0_stateless/01458_named_tuple_millin.reference
@@ -1,16 +1,12 @@
 CREATE TABLE default.tuple
 (
-    `j` Tuple(
-        a Int8,
-        b String)
+    `j` Tuple(a Int8, b String)
 )
 ENGINE = Memory
 j	Tuple(\n    a Int8,\n    b String)					
 CREATE TABLE default.tuple
 (
-    `j` Tuple(
-        a Int8,
-        b String)
+    `j` Tuple(a Int8, b String)
 )
 ENGINE = Memory
 j	Tuple(\n    a Int8,\n    b String)					
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 cc574557438..56620d848a3 100755
--- a/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
+++ b/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
@@ -10,7 +10,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 NUM_REPLICAS=10
 
 for i in $(seq 1 $NUM_REPLICAS); do
-    $CLICKHOUSE_CLIENT -q "
+    $CLICKHOUSE_CLIENT -n -q "
         DROP TABLE IF EXISTS r$i SYNC;
         CREATE TABLE r$i (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/r', 'r$i') ORDER BY x;
     "
@@ -31,7 +31,7 @@ done
 wait
 
 for i in $(seq 1 $NUM_REPLICAS); do
-    $CLICKHOUSE_CLIENT -q "
+    $CLICKHOUSE_CLIENT -n -q "
         SYSTEM SYNC REPLICA r$i;
         SELECT count(), min(x), max(x), sum(x) FROM r$i;"
 done
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 24ea3ba3835..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
@@ -16,7 +16,7 @@ unset CLICKHOUSE_WRITE_COVERAGE
 NUM_REPLICAS=10
 
 for i in $(seq 1 $NUM_REPLICAS); do
-    $CLICKHOUSE_CLIENT -q "
+    $CLICKHOUSE_CLIENT -n -q "
         DROP TABLE IF EXISTS r$i SYNC;
         CREATE TABLE r$i (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/r', 'r$i') ORDER BY x;
     "
@@ -39,7 +39,7 @@ done
 wait
 
 for i in $(seq 1 $NUM_REPLICAS); do
-    $CLICKHOUSE_CLIENT -q "
+    $CLICKHOUSE_CLIENT -n -q "
         SYSTEM SYNC REPLICA r$i;
         SELECT count(), min(x), max(x), sum(x) FROM r$i;"
 done
diff --git a/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum_detach_attach.sh b/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum_detach_attach.sh
index a2ef0d52328..1f76a2efc6b 100755
--- a/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum_detach_attach.sh
+++ b/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum_detach_attach.sh
@@ -11,7 +11,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 NUM_REPLICAS=6
 
 for i in $(seq 1 $NUM_REPLICAS); do
-    $CLICKHOUSE_CLIENT -q "
+    $CLICKHOUSE_CLIENT -n -q "
         DROP TABLE IF EXISTS r$i SYNC;
         CREATE TABLE r$i (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/r', 'r$i') ORDER BY x;
     "
@@ -36,7 +36,7 @@ done
 wait
 
 for i in $(seq 1 $NUM_REPLICAS); do
-    $CLICKHOUSE_CLIENT -q "
+    $CLICKHOUSE_CLIENT -n -q "
         SYSTEM SYNC REPLICA r$i;
         SELECT count(), min(x), max(x), sum(x) FROM r$i;"
 done
diff --git a/tests/queries/0_stateless/01476_right_full_join_switch.sql b/tests/queries/0_stateless/01476_right_full_join_switch.sql
index 7c8c3157844..dfbdec47e1f 100644
--- a/tests/queries/0_stateless/01476_right_full_join_switch.sql
+++ b/tests/queries/0_stateless/01476_right_full_join_switch.sql
@@ -13,7 +13,7 @@ INSERT INTO nr VALUES (2, NULL);
 
 SET join_use_nulls = 0;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 -- t.x is supertupe for `x` from left and right since `x` is inside `USING`.
 SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM t AS l LEFT JOIN nr AS r USING (x) ORDER BY t.x;
@@ -28,7 +28,7 @@ SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM nr AS l FULL JOIN t
 
 SELECT '-';
 
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 
 -- t.x is supertupe for `x` from left and right since `x` is inside `USING`.
 SELECT t.x, l.s, r.s, toTypeName(l.s), toTypeName(r.s) FROM t AS l LEFT JOIN nr AS r USING (x) ORDER BY t.x;
diff --git a/tests/queries/0_stateless/01477_lc_in_merge_join_left_key.sql.j2 b/tests/queries/0_stateless/01477_lc_in_merge_join_left_key.sql.j2
index b43db222e43..6eafd41b411 100644
--- a/tests/queries/0_stateless/01477_lc_in_merge_join_left_key.sql.j2
+++ b/tests/queries/0_stateless/01477_lc_in_merge_join_left_key.sql.j2
@@ -10,11 +10,11 @@ CREATE TABLE nr (`x` Nullable(UInt32), `s` Nullable(String)) ENGINE = Memory;
 INSERT INTO t VALUES (1, 'l');
 INSERT INTO nr VALUES (2, NULL);
 
-{% for enable_analyzer in [0, 1] -%}
+{% for allow_experimental_analyzer in [0, 1] -%}
 
-SET enable_analyzer = {{ enable_analyzer }};
+SET allow_experimental_analyzer = {{ allow_experimental_analyzer }};
 
-{% if enable_analyzer -%}
+{% if allow_experimental_analyzer -%}
 SELECT '- analyzer -';
 {% endif -%}
 
diff --git a/tests/queries/0_stateless/01479_cross_join_9855.sql b/tests/queries/0_stateless/01479_cross_join_9855.sql
index 19cd0ab18fd..9dcf209a1cd 100644
--- a/tests/queries/0_stateless/01479_cross_join_9855.sql
+++ b/tests/queries/0_stateless/01479_cross_join_9855.sql
@@ -2,8 +2,8 @@ SET cross_to_inner_join_rewrite = 1;
 
 SELECT count()
 FROM numbers(4) AS n1, numbers(3) AS n2
-WHERE n1.number > (select avg(n.number) from numbers(3) n) SETTINGS enable_analyzer=0;
+WHERE n1.number > (select avg(n.number) from numbers(3) n) SETTINGS allow_experimental_analyzer=0;
 
 SELECT count()
 FROM numbers(4) AS n1, numbers(3) AS n2, numbers(6) AS n3
-WHERE n1.number > (select avg(n.number) from numbers(3) n) SETTINGS enable_analyzer=0;
+WHERE n1.number > (select avg(n.number) from numbers(3) n) SETTINGS allow_experimental_analyzer=0;
diff --git a/tests/queries/0_stateless/01485_256_bit_multiply.sql b/tests/queries/0_stateless/01485_256_bit_multiply.sql
index a4e99d51970..5c8c47c9127 100644
--- a/tests/queries/0_stateless/01485_256_bit_multiply.sql
+++ b/tests/queries/0_stateless/01485_256_bit_multiply.sql
@@ -1,7 +1,5 @@
 -- Tags: no-random-settings, no-asan, no-msan, no-tsan, no-ubsan, no-debug
 
-SET max_rows_to_read = '100M';
-
 select count() from
 (
     select toInt128(number) * number x, toInt256(number) * number y from numbers_mt(100000000) where x != y
diff --git a/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql b/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql
index 362da3ac364..92e6fce2c93 100644
--- a/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql
+++ b/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql
@@ -1,4 +1,4 @@
--- Tags: zookeeper
+-- Tags: zookeeper, no-parallel
 
 DROP TABLE IF EXISTS r_prop_table1;
 DROP TABLE IF EXISTS r_prop_table2;
diff --git a/tests/queries/0_stateless/01504_compression_multiple_streams.reference b/tests/queries/0_stateless/01504_compression_multiple_streams.reference
index 14cdce72044..4d3aba66526 100644
--- a/tests/queries/0_stateless/01504_compression_multiple_streams.reference
+++ b/tests/queries/0_stateless/01504_compression_multiple_streams.reference
@@ -1,20 +1,20 @@
 1	1	[[1]]	(1,[1])
 1	1	[[1]]	(1,[1])
-CREATE TABLE default.columns_with_multiple_streams\n(\n    `field0` Nullable(Int64) CODEC(Delta(2), LZ4),\n    `field1` Nullable(UInt8) CODEC(Delta(8), LZ4),\n    `field2` Array(Array(Int64)) CODEC(Delta(8), LZ4),\n    `field3` Tuple(\n        UInt32,\n        Array(UInt64)) CODEC(T64, Default)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS min_rows_for_wide_part = 0, min_bytes_for_wide_part = 0, index_granularity = 8192
+CREATE TABLE default.columns_with_multiple_streams\n(\n    `field0` Nullable(Int64) CODEC(Delta(2), LZ4),\n    `field1` Nullable(UInt8) CODEC(Delta(8), LZ4),\n    `field2` Array(Array(Int64)) CODEC(Delta(8), LZ4),\n    `field3` Tuple(UInt32, Array(UInt64)) CODEC(T64, Default)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS min_rows_for_wide_part = 0, min_bytes_for_wide_part = 0, index_granularity = 8192
 1	1	[[1]]	(1,[1])
 2	2	[[2]]	(2,[2])
-CREATE TABLE default.columns_with_multiple_streams\n(\n    `field0` Nullable(Int64) CODEC(Delta(2), LZ4),\n    `field1` Nullable(UInt8) CODEC(Delta(8), LZ4),\n    `field2` Array(Array(Int64)) CODEC(Delta(8), LZ4),\n    `field3` Tuple(\n        UInt32,\n        Array(UInt64)) CODEC(Delta, Default)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS min_rows_for_wide_part = 0, min_bytes_for_wide_part = 0, index_granularity = 8192
+CREATE TABLE default.columns_with_multiple_streams\n(\n    `field0` Nullable(Int64) CODEC(Delta(2), LZ4),\n    `field1` Nullable(UInt8) CODEC(Delta(8), LZ4),\n    `field2` Array(Array(Int64)) CODEC(Delta(8), LZ4),\n    `field3` Tuple(UInt32, Array(UInt64)) CODEC(Delta, Default)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS min_rows_for_wide_part = 0, min_bytes_for_wide_part = 0, index_granularity = 8192
 1	1	[[1]]	(1,[1])
 2	2	[[2]]	(2,[2])
 3	3	[[3]]	(3,[3])
 1	1	[[1]]	(1,[1])
 1	1	[[1]]	(1,[1])
-CREATE TABLE default.columns_with_multiple_streams_compact\n(\n    `field0` Nullable(Int64) CODEC(Delta(2), LZ4),\n    `field1` Nullable(UInt8) CODEC(Delta(8), LZ4),\n    `field2` Array(Array(Int64)) CODEC(Delta(8), LZ4),\n    `field3` Tuple(\n        UInt32,\n        Array(UInt64)) CODEC(Delta, Default)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS min_rows_for_wide_part = 100000, min_bytes_for_wide_part = 100000, index_granularity = 8192
+CREATE TABLE default.columns_with_multiple_streams_compact\n(\n    `field0` Nullable(Int64) CODEC(Delta(2), LZ4),\n    `field1` Nullable(UInt8) CODEC(Delta(8), LZ4),\n    `field2` Array(Array(Int64)) CODEC(Delta(8), LZ4),\n    `field3` Tuple(UInt32, Array(UInt64)) CODEC(Delta, Default)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS min_rows_for_wide_part = 100000, min_bytes_for_wide_part = 100000, index_granularity = 8192
 1	1	[[1]]	(1,[1])
 2	2	[[2]]	(2,[2])
 1	1	[[1]]	(1,[1])
 2	2	[[2]]	(2,[2])
-CREATE TABLE default.columns_with_multiple_streams_compact\n(\n    `field0` Nullable(Int64) CODEC(Delta(2), LZ4),\n    `field1` Nullable(UInt8) CODEC(Delta(8), LZ4),\n    `field2` Array(Array(Int64)) CODEC(Delta(8), LZ4),\n    `field3` Tuple(\n        UInt32,\n        Array(UInt64)) CODEC(Delta, Default)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS min_rows_for_wide_part = 100000, min_bytes_for_wide_part = 100000, index_granularity = 8192
+CREATE TABLE default.columns_with_multiple_streams_compact\n(\n    `field0` Nullable(Int64) CODEC(Delta(2), LZ4),\n    `field1` Nullable(UInt8) CODEC(Delta(8), LZ4),\n    `field2` Array(Array(Int64)) CODEC(Delta(8), LZ4),\n    `field3` Tuple(UInt32, Array(UInt64)) CODEC(Delta, Default)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS min_rows_for_wide_part = 100000, min_bytes_for_wide_part = 100000, index_granularity = 8192
 1	1	[[1]]	(1,[1])
 2	2	[[2]]	(2,[2])
 3	3	[[3]]	(3,[3])
diff --git a/tests/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh b/tests/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh
index 6954fef7314..29593ea4fb5 100755
--- a/tests/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh
+++ b/tests/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh
@@ -34,7 +34,7 @@ done
 
 # Check access rights
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT -n --query "
     DROP DATABASE IF EXISTS test;
     CREATE DATABASE test;
     USE test;
diff --git a/tests/queries/0_stateless/01508_explain_header.sql b/tests/queries/0_stateless/01508_explain_header.sql
index 03452e4bdac..a9f876068aa 100644
--- a/tests/queries/0_stateless/01508_explain_header.sql
+++ b/tests/queries/0_stateless/01508_explain_header.sql
@@ -1,3 +1,3 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 explain header = 1 select 1 as x;
diff --git a/tests/queries/0_stateless/01508_format_regexp_raw.sh b/tests/queries/0_stateless/01508_format_regexp_raw.sh
index 52613c28b2f..8cf1bd73566 100755
--- a/tests/queries/0_stateless/01508_format_regexp_raw.sh
+++ b/tests/queries/0_stateless/01508_format_regexp_raw.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} -n --query "
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (a String, b String) ENGINE = Memory;
 "
@@ -12,7 +12,7 @@ CREATE TABLE t (a String, b String) ENGINE = Memory;
 ${CLICKHOUSE_CLIENT} --format_regexp_escaping_rule 'Raw' --format_regexp '^(.+?) separator (.+?)$' --query '
 INSERT INTO t FORMAT Regexp abc\ separator Hello, world!'
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} -n --query "
 SELECT * FROM t;
 DROP TABLE t;
 "
diff --git a/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh b/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
index 0e6ab287146..22cd6fb8127 100755
--- a/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
+++ b/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
@@ -11,7 +11,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 NUM_REPLICAS=6
 
 for i in $(seq 1 $NUM_REPLICAS); do
-    $CLICKHOUSE_CLIENT -q "
+    $CLICKHOUSE_CLIENT -n -q "
         DROP TABLE IF EXISTS r$i SYNC;
         CREATE TABLE r$i (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/parallel_quorum_many', 'r$i') ORDER BY x;
     "
@@ -39,12 +39,12 @@ done
 wait
 
 for i in $(seq 1 $NUM_REPLICAS); do
-    $CLICKHOUSE_CLIENT -q "
+    $CLICKHOUSE_CLIENT -n -q "
         SYSTEM SYNC REPLICA r$i;
         SELECT count(), min(x), max(x), sum(x) FROM r$i;
     "
 done
 
 for i in $(seq 1 $NUM_REPLICAS); do
-    $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS r$i SYNC;"
+    $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS r$i SYNC;"
 done
diff --git a/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh b/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
index 3f4210f9bb0..1589f17c752 100755
--- a/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
+++ b/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
@@ -12,13 +12,13 @@ NUM_REPLICAS=2
 NUM_INSERTS=5
 
 for i in $(seq 1 $NUM_REPLICAS); do
-    $CLICKHOUSE_CLIENT -q "
+    $CLICKHOUSE_CLIENT -n -q "
         DROP TABLE IF EXISTS r$i;
         CREATE TABLE r$i (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/parallel_quorum', 'r$i') ORDER BY x;
     "
 done
 
-$CLICKHOUSE_CLIENT -q "SYSTEM STOP REPLICATION QUEUES r2;"
+$CLICKHOUSE_CLIENT -n -q "SYSTEM STOP REPLICATION QUEUES r2;"
 
 function thread {
     $CLICKHOUSE_CLIENT --insert_quorum 2 --insert_quorum_parallel 1 --query "INSERT INTO r1 SELECT $1"
@@ -28,12 +28,12 @@ for i in $(seq 1 $NUM_INSERTS); do
     thread $i &
 done
 
-$CLICKHOUSE_CLIENT -q "SYSTEM START REPLICATION QUEUES r2;"
+$CLICKHOUSE_CLIENT -n -q "SYSTEM START REPLICATION QUEUES r2;"
 
 wait
 
 for i in $(seq 1 $NUM_REPLICAS); do
-    $CLICKHOUSE_CLIENT -q "
+    $CLICKHOUSE_CLIENT -n -q "
         SELECT count(), min(x), max(x), sum(x) FROM r$i;
         DROP TABLE IF EXISTS r$i;
 "
diff --git a/tests/queries/0_stateless/01509_dictionary_preallocate.sh b/tests/queries/0_stateless/01509_dictionary_preallocate.sh
index 0459f69b0ad..2a22a307a08 100755
--- a/tests/queries/0_stateless/01509_dictionary_preallocate.sh
+++ b/tests/queries/0_stateless/01509_dictionary_preallocate.sh
@@ -15,7 +15,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # PREALLOCATE attribute (and also for the history/greppability, that it was
 # such).
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     DROP TABLE IF EXISTS data_01509;
     DROP DICTIONARY IF EXISTS dict_01509;
     CREATE TABLE data_01509
diff --git a/tests/queries/0_stateless/01509_format_raw_blob.reference b/tests/queries/0_stateless/01509_format_raw_blob.reference
index eb074457e07..05014001bd9 100644
--- a/tests/queries/0_stateless/01509_format_raw_blob.reference
+++ b/tests/queries/0_stateless/01509_format_raw_blob.reference
@@ -1,2 +1,2 @@
-48fad37bc89fc3bcc29c4750897b6709  -
-48fad37bc89fc3bcc29c4750897b6709  -
+9fd46251e5574c633cbfbb9293671888  -
+9fd46251e5574c633cbfbb9293671888  -
diff --git a/tests/queries/0_stateless/01509_format_raw_blob.sh b/tests/queries/0_stateless/01509_format_raw_blob.sh
index 355928014e8..3d1d3fbb17b 100755
--- a/tests/queries/0_stateless/01509_format_raw_blob.sh
+++ b/tests/queries/0_stateless/01509_format_raw_blob.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} -n --query "
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (a LowCardinality(Nullable(String))) ENGINE = Memory;
 "
@@ -12,7 +12,7 @@ CREATE TABLE t (a LowCardinality(Nullable(String))) ENGINE = Memory;
 ${CLICKHOUSE_CLIENT} --query "INSERT INTO t FORMAT RawBLOB" < ${BASH_SOURCE[0]}
 
 cat ${BASH_SOURCE[0]} | md5sum
-${CLICKHOUSE_CLIENT} --query "SELECT * FROM t FORMAT RawBLOB" | md5sum
+${CLICKHOUSE_CLIENT} -n --query "SELECT * FROM t FORMAT RawBLOB" | md5sum
 
 ${CLICKHOUSE_CLIENT} --query "
 DROP TABLE t;
diff --git a/tests/queries/0_stateless/01510_format_regexp_raw_low_cardinality.sh b/tests/queries/0_stateless/01510_format_regexp_raw_low_cardinality.sh
index dc178d081bf..594caca7d04 100755
--- a/tests/queries/0_stateless/01510_format_regexp_raw_low_cardinality.sh
+++ b/tests/queries/0_stateless/01510_format_regexp_raw_low_cardinality.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} -n --query "
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (a String, b LowCardinality(Nullable(String))) ENGINE = Memory;
 "
@@ -12,7 +12,7 @@ CREATE TABLE t (a String, b LowCardinality(Nullable(String))) ENGINE = Memory;
 ${CLICKHOUSE_CLIENT} --format_regexp_escaping_rule 'Raw' --format_regexp '^(.+?) separator (.+?)$' --query '
 INSERT INTO t FORMAT Regexp abc\ separator Hello, world!'
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} -n --query "
 SELECT * FROM t;
 DROP TABLE t;
 "
diff --git a/tests/queries/0_stateless/01514_input_format_csv_enum_as_number_setting.sql b/tests/queries/0_stateless/01514_input_format_csv_enum_as_number_setting.sql
index 9e1783b7ba0..526af60434f 100644
--- a/tests/queries/0_stateless/01514_input_format_csv_enum_as_number_setting.sql
+++ b/tests/queries/0_stateless/01514_input_format_csv_enum_as_number_setting.sql
@@ -8,7 +8,6 @@ CREATE TABLE table_with_enum_column_for_csv_insert (
 SET input_format_csv_enum_as_number = 1;
 
 INSERT INTO table_with_enum_column_for_csv_insert FORMAT CSV 102,2
-
 SELECT * FROM table_with_enum_column_for_csv_insert;
 
 SET input_format_csv_enum_as_number = 0;
diff --git a/tests/queries/0_stateless/01514_input_format_json_enum_as_number.sql b/tests/queries/0_stateless/01514_input_format_json_enum_as_number.sql
index a5044cd6875..0b2cb8c64e2 100644
--- a/tests/queries/0_stateless/01514_input_format_json_enum_as_number.sql
+++ b/tests/queries/0_stateless/01514_input_format_json_enum_as_number.sql
@@ -8,7 +8,6 @@ CREATE TABLE table_with_enum_column_for_json_insert (
 ) ENGINE=Memory();
 
 INSERT INTO table_with_enum_column_for_json_insert FORMAT JSONEachRow {"Id":102,"Value":2}
-
 SELECT * FROM table_with_enum_column_for_json_insert;
 
 DROP TABLE IF EXISTS table_with_enum_column_for_json_insert;
diff --git a/tests/queries/0_stateless/01514_input_format_tsv_enum_as_number_setting.sql b/tests/queries/0_stateless/01514_input_format_tsv_enum_as_number_setting.sql
index 5ad94eeb20e..033d7d282f0 100644
--- a/tests/queries/0_stateless/01514_input_format_tsv_enum_as_number_setting.sql
+++ b/tests/queries/0_stateless/01514_input_format_tsv_enum_as_number_setting.sql
@@ -8,9 +8,7 @@ CREATE TABLE table_with_enum_column_for_tsv_insert (
 SET input_format_tsv_enum_as_number = 1;
 
 INSERT INTO table_with_enum_column_for_tsv_insert FORMAT TSV 102	2
-
 INSERT INTO table_with_enum_column_for_tsv_insert FORMAT TabSeparatedRaw 103	1
-
 SELECT * FROM table_with_enum_column_for_tsv_insert ORDER BY Id;
 
 SET input_format_tsv_enum_as_number = 0;
diff --git a/tests/queries/0_stateless/01526_initial_query_id.sh b/tests/queries/0_stateless/01526_initial_query_id.sh
index 8ba27a04d60..e77764ee34e 100755
--- a/tests/queries/0_stateless/01526_initial_query_id.sh
+++ b/tests/queries/0_stateless/01526_initial_query_id.sh
@@ -15,7 +15,7 @@ ${CLICKHOUSE_CURL} \
     --get \
     --data-urlencode "query=select 1 format Null"
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -n -q "
 system flush logs;
 select interface, initial_query_id = query_id
     from system.query_log
diff --git a/tests/queries/0_stateless/01526_max_untracked_memory.sh b/tests/queries/0_stateless/01526_max_untracked_memory.sh
index 173f6fbe2e6..b2bad637422 100755
--- a/tests/queries/0_stateless/01526_max_untracked_memory.sh
+++ b/tests/queries/0_stateless/01526_max_untracked_memory.sh
@@ -14,7 +14,7 @@ min_trace_entries=2
 
 # do not use _, they should be escaped for LIKE
 query_id_tcp_prefix="01526-tcp-memory-tracking-$RANDOM-$$"
-${CLICKHOUSE_CLIENT} --log_queries=1 --max_threads=1 --max_untracked_memory=0 --memory_profiler_sample_probability=1 --trace_profile_events 0 -q "with '$query_id_tcp_prefix' as __id $query FORMAT Null"
+${CLICKHOUSE_CLIENT} --log_queries=1 --max_threads=1 --max_untracked_memory=0 --memory_profiler_sample_probability=1 -q "with '$query_id_tcp_prefix' as __id $query FORMAT Null"
 ${CLICKHOUSE_CLIENT} -q "SYSTEM FLUSH LOGS"
 query_id_tcp="$(${CLICKHOUSE_CLIENT} -q "SELECT DISTINCT query_id FROM system.query_log WHERE current_database = currentDatabase() AND query LIKE '%$query_id_tcp_prefix%'")"
 ${CLICKHOUSE_CLIENT} -q "SELECT count()>=$min_trace_entries FROM system.trace_log WHERE query_id = '$query_id_tcp' AND abs(size) < 4e6 AND event_time >= now() - interval 1 hour"
@@ -23,7 +23,7 @@ ${CLICKHOUSE_CLIENT} -q "SELECT count()>=$min_trace_entries FROM system.trace_lo
 
 # query_id cannot be longer then 28 bytes
 query_id_http="01526_http_${RANDOM}_$$"
-echo "$query" | ${CLICKHOUSE_CURL} -sSg -o /dev/null "${CLICKHOUSE_URL}&query_id=$query_id_http&max_untracked_memory=0&memory_profiler_sample_probability=1&max_threads=1&trace_profile_events=0" -d @-
+echo "$query" | ${CLICKHOUSE_CURL} -sSg -o /dev/null "${CLICKHOUSE_URL}&query_id=$query_id_http&max_untracked_memory=0&memory_profiler_sample_probability=1&max_threads=1" -d @-
 ${CLICKHOUSE_CLIENT} -q "SYSTEM FLUSH LOGS"
 # at least 2, one allocation, one deallocation
 # (but actually even more)
diff --git a/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh b/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh
index c1d5c357308..d61d34244d9 100755
--- a/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh
+++ b/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh
@@ -10,6 +10,6 @@ rm -rf "${WORKING_FOLDER_01527}"
 mkdir -p "${WORKING_FOLDER_01527}"
 
 # OPTIMIZE was crashing due to lack of temporary volume in local
-${CLICKHOUSE_LOCAL} --query "drop database if exists d; create database d; create table d.t engine MergeTree order by a as select 1 a; optimize table d.t final" --path="${WORKING_FOLDER_01527}"
+${CLICKHOUSE_LOCAL} --multiquery --query "drop database if exists d; create database d; create table d.t engine MergeTree order by a as select 1 a; optimize table d.t final" --path="${WORKING_FOLDER_01527}"
 
 rm -rf "${WORKING_FOLDER_01527}"
diff --git a/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh b/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh
index bc9efaedd5d..a5697a62dc2 100755
--- a/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh
+++ b/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT --multiquery --query "
 SET allow_suspicious_low_cardinality_types=1;
 CREATE TABLE IF NOT EXISTS test_01543 (value LowCardinality(String), value2 LowCardinality(UInt64)) ENGINE=Memory();
 "
diff --git a/tests/queries/0_stateless/01544_file_engine_settings.sh b/tests/queries/0_stateless/01544_file_engine_settings.sh
index eb0a8a964d0..b31754f9531 100755
--- a/tests/queries/0_stateless/01544_file_engine_settings.sh
+++ b/tests/queries/0_stateless/01544_file_engine_settings.sh
@@ -10,7 +10,7 @@ rm -f -- "$the_file"
 
 # We are going to check that format settings work for File engine,
 # by creating a table with a non-default delimiter, and reading from it.
-${CLICKHOUSE_LOCAL} --query "
+${CLICKHOUSE_LOCAL} --multiquery --query "
     create table t(a int, b int) engine File(CSV, '$the_file') settings format_csv_delimiter = '|';
     insert into t select 1 a, 1 b;
 "
@@ -18,7 +18,7 @@ ${CLICKHOUSE_LOCAL} --query "
 # See what's in the file
 cat "$the_file"
 
-${CLICKHOUSE_LOCAL} --query "
+${CLICKHOUSE_LOCAL} --multiquery --query "
     create table t(a int, b int) engine File(CSV, '$the_file') settings format_csv_delimiter = '|';
     select * from t;
 " 
diff --git a/tests/queries/0_stateless/01548_create_table_compound_column_format.reference b/tests/queries/0_stateless/01548_create_table_compound_column_format.reference
index c23cc57548b..c6c4dcdfa4a 100644
--- a/tests/queries/0_stateless/01548_create_table_compound_column_format.reference
+++ b/tests/queries/0_stateless/01548_create_table_compound_column_format.reference
@@ -1,13 +1,12 @@
 CREATE TABLE test
 (
     `a` Int64,
-    `b` Nested(a Int64)
+    `b` NESTED(a Int64)
 )
 ENGINE = TinyLog
 CREATE TABLE test
 (
     `a` Int64,
-    `b` Tuple(
-        a Int64)
+    `b` TUPLE(a Int64)
 )
 ENGINE = TinyLog
diff --git a/tests/queries/0_stateless/01548_create_table_compound_column_format.sh b/tests/queries/0_stateless/01548_create_table_compound_column_format.sh
index 9065af17dc1..99e3aed2825 100755
--- a/tests/queries/0_stateless/01548_create_table_compound_column_format.sh
+++ b/tests/queries/0_stateless/01548_create_table_compound_column_format.sh
@@ -4,6 +4,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-echo "CREATE TABLE test(a Int64, b Nested(a Int64)) ENGINE=TinyLog" | $CLICKHOUSE_FORMAT
+echo "CREATE TABLE test(a Int64, b NESTED(a Int64)) ENGINE=TinyLog" | $CLICKHOUSE_FORMAT
 
-echo "CREATE TABLE test(a Int64, b Tuple(a Int64)) ENGINE=TinyLog" | $CLICKHOUSE_FORMAT
\ No newline at end of file
+echo "CREATE TABLE test(a Int64, b TUPLE(a Int64)) ENGINE=TinyLog" | $CLICKHOUSE_FORMAT
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01556_explain_select_with_union_query.sql b/tests/queries/0_stateless/01556_explain_select_with_union_query.sql
index d8278e1887a..bbd96ef5c69 100644
--- a/tests/queries/0_stateless/01556_explain_select_with_union_query.sql
+++ b/tests/queries/0_stateless/01556_explain_select_with_union_query.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET union_default_mode = 'DISTINCT';
 
 set enable_global_with_statement = 1;
diff --git a/tests/queries/0_stateless/01558_enum_as_num_in_tsv_csv_input.sql b/tests/queries/0_stateless/01558_enum_as_num_in_tsv_csv_input.sql
index 4dccfda4bc5..6a0f2a97b4f 100644
--- a/tests/queries/0_stateless/01558_enum_as_num_in_tsv_csv_input.sql
+++ b/tests/queries/0_stateless/01558_enum_as_num_in_tsv_csv_input.sql
@@ -6,23 +6,15 @@ CREATE TABLE enum_as_num (
 ) ENGINE=Memory();
 
 INSERT INTO enum_as_num FORMAT TSV 1	1
-
 INSERT INTO enum_as_num FORMAT TSV 2	2
-
 INSERT INTO enum_as_num FORMAT TSV 3	3
-
 INSERT INTO enum_as_num FORMAT TSV 4	a
-
 INSERT INTO enum_as_num FORMAT TSV 5	b
 
 INSERT INTO enum_as_num FORMAT CSV 6,1
-
 INSERT INTO enum_as_num FORMAT CSV 7,2
-
 INSERT INTO enum_as_num FORMAT CSV 8,3
-
 INSERT INTO enum_as_num FORMAT CSV 9,a
-
 INSERT INTO enum_as_num FORMAT CSV 10,b
 
 SELECT * FROM enum_as_num ORDER BY Id;
diff --git a/tests/queries/0_stateless/01561_clickhouse_client_stage.reference b/tests/queries/0_stateless/01561_clickhouse_client_stage.reference
index b6200464293..2631199cbab 100644
--- a/tests/queries/0_stateless/01561_clickhouse_client_stage.reference
+++ b/tests/queries/0_stateless/01561_clickhouse_client_stage.reference
@@ -1,15 +1,15 @@
-execute: --enable_analyzer=1
+execute: --allow_experimental_analyzer=1
 "foo"
 1
-execute: --enable_analyzer=1 --stage fetch_columns
+execute: --allow_experimental_analyzer=1 --stage fetch_columns
 "__table1.dummy"
 0
-execute: --enable_analyzer=1 --stage with_mergeable_state
+execute: --allow_experimental_analyzer=1 --stage with_mergeable_state
 "1_UInt8"
 1
-execute: --enable_analyzer=1 --stage with_mergeable_state_after_aggregation
+execute: --allow_experimental_analyzer=1 --stage with_mergeable_state_after_aggregation
 "1_UInt8"
 1
-execute: --enable_analyzer=1 --stage complete
+execute: --allow_experimental_analyzer=1 --stage complete
 "foo"
 1
diff --git a/tests/queries/0_stateless/01561_clickhouse_client_stage.sh b/tests/queries/0_stateless/01561_clickhouse_client_stage.sh
index 79c9bb6ae10..99267458421 100755
--- a/tests/queries/0_stateless/01561_clickhouse_client_stage.sh
+++ b/tests/queries/0_stateless/01561_clickhouse_client_stage.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=1"
+    "--allow_experimental_analyzer=1"
 )
 
 function execute_query()
diff --git a/tests/queries/0_stateless/01561_mann_whitney_scipy.python b/tests/queries/0_stateless/01561_mann_whitney_scipy.python
index 0f84d510933..4713120287d 100644
--- a/tests/queries/0_stateless/01561_mann_whitney_scipy.python
+++ b/tests/queries/0_stateless/01561_mann_whitney_scipy.python
@@ -19,13 +19,7 @@ def test_and_check(name, a, b, t_stat, p_value):
     )
     client.query(
         "INSERT INTO mann_whitney VALUES {};".format(
-            ", ".join(["({},{})".format(i, 0) for i in a])
-        )
-    )
-
-    client.query(
-        "INSERT INTO mann_whitney VALUES {};".format(
-            ", ".join(["({},{})".format(i, 1) for i in b])
+            ", ".join(["({},{}), ({},{})".format(i, 0, j, 1) for i, j in zip(a, b)])
         )
     )
 
@@ -65,15 +59,6 @@ def test_mann_whitney():
     test_and_check("mannWhitneyUTest('greater')", rvs1, rvs2, s, p)
 
 
-def test_mann_whitney_skew():
-    rvs1 = [1]
-    rvs2 = [0, 2, 4]
-    s, p = stats.mannwhitneyu(rvs1, rvs2, alternative="two-sided")
-    test_and_check("mannWhitneyUTest", rvs1, rvs2, s, p)
-    test_and_check("mannWhitneyUTest('two-sided')", rvs1, rvs2, s, p)
-
-
 if __name__ == "__main__":
     test_mann_whitney()
-    test_mann_whitney_skew()
     print("Ok.")
diff --git a/tests/queries/0_stateless/01563_distributed_query_finish.sh b/tests/queries/0_stateless/01563_distributed_query_finish.sh
index 50d194b1f15..e3c5928f108 100755
--- a/tests/queries/0_stateless/01563_distributed_query_finish.sh
+++ b/tests/queries/0_stateless/01563_distributed_query_finish.sh
@@ -9,7 +9,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m <<EOL
+$CLICKHOUSE_CLIENT -nm <<EOL
 drop table if exists dist_01247;
 drop table if exists data_01247;
 
@@ -29,7 +29,7 @@ for ((i = 0; i < 100; ++i)); do
         "--optimize_distributed_group_by_sharding_key=1"
         "--prefer_localhost_replica=0"
     )
-    $CLICKHOUSE_CLIENT "${opts[@]}" --format CSV -m -q "select count(), * from dist_01247 group by number order by number limit 1 format Null"
+    $CLICKHOUSE_CLIENT "${opts[@]}" --format CSV -nm -q "select count(), * from dist_01247 group by number order by number limit 1 format Null"
 
     # expect zero new network errors
     network_errors_after=$($CLICKHOUSE_CLIENT -q "SELECT value FROM system.errors WHERE name = 'NETWORK_ERROR'")
diff --git a/tests/queries/0_stateless/01564_test_hint_woes.reference b/tests/queries/0_stateless/01564_test_hint_woes.reference
index 56c07922ccb..adb4cc61816 100644
--- a/tests/queries/0_stateless/01564_test_hint_woes.reference
+++ b/tests/queries/0_stateless/01564_test_hint_woes.reference
@@ -20,7 +20,7 @@ select 1;
 insert into values_01564 values (11); -- { serverError VIOLATED_CONSTRAINT }
 select nonexistent column; -- { serverError UNKNOWN_IDENTIFIER }
 -- query after values on the same line
-insert into values_01564 values (1);
+insert into values_01564 values (1); select 1;
 select 1;
 1
 -- a failing insert and then a normal insert (#https://github.com/ClickHouse/ClickHouse/issues/19353)
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 f08ef911da4..6253840c63c 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
@@ -24,7 +24,7 @@ expect_after {
     -i $any_spawn_id timeout { exit 1 }
 }
 
-spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT --disable_suggestion -m --history_file=$history_file --highlight 0"
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT --disable_suggestion -mn --history_file=$history_file --highlight 0"
 expect "\n:) "
 
 send -- "DROP TABLE IF EXISTS t01565;\r"
diff --git a/tests/queries/0_stateless/01590_countSubstrings.sql b/tests/queries/0_stateless/01590_countSubstrings.sql
index 5ec4f412d7f..b38cbb7d188 100644
--- a/tests/queries/0_stateless/01590_countSubstrings.sql
+++ b/tests/queries/0_stateless/01590_countSubstrings.sql
@@ -1,6 +1,3 @@
--- Tags: no-fasttest
--- no-fasttest: upper/lowerUTF8 use ICU
-
 --
 -- countSubstrings
 --
diff --git a/tests/queries/0_stateless/01591_window_functions.sql b/tests/queries/0_stateless/01591_window_functions.sql
index db727599d2c..b821ba13721 100644
--- a/tests/queries/0_stateless/01591_window_functions.sql
+++ b/tests/queries/0_stateless/01591_window_functions.sql
@@ -1,6 +1,6 @@
 -- Tags: long
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 -- Too slow
 SET max_bytes_before_external_sort = 0;
diff --git a/tests/queries/0_stateless/01599_mutation_query_params.sh b/tests/queries/0_stateless/01599_mutation_query_params.sh
index 5b604c96028..52b0131a9c2 100755
--- a/tests/queries/0_stateless/01599_mutation_query_params.sh
+++ b/tests/queries/0_stateless/01599_mutation_query_params.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT -n --query "
 DROP TABLE IF EXISTS test;
 
 CREATE TABLE test
diff --git a/tests/queries/0_stateless/01600_detach_permanently.sh b/tests/queries/0_stateless/01600_detach_permanently.sh
index 4810d2e9732..6721dbf3015 100755
--- a/tests/queries/0_stateless/01600_detach_permanently.sh
+++ b/tests/queries/0_stateless/01600_detach_permanently.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-fasttest
-# no-fasttest: It's a bit demanding
+# Tags: no-parallel
 
 # Creation of a database with Ordinary engine emits a warning.
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
@@ -10,16 +9,16 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 ## tests with real clickhouse restart would be a bit to heavy,
-## to ensure the table will not reappear back clickhouse-local is enough.
+## to ensure the table will not reappear back clickhose-local is enough.
 
-WORKING_FOLDER_01600="${CLICKHOUSE_TMP}/${CLICKHOUSE_TEST_UNIQUE_NAME}"
+WORKING_FOLDER_01600="${CLICKHOUSE_TMP}/01600_detach_permanently"
 rm -rf "${WORKING_FOLDER_01600}"
 mkdir -p "${WORKING_FOLDER_01600}"
 
 clickhouse_local() {
     local query="$1"
     shift
-    ${CLICKHOUSE_LOCAL} --allow_deprecated_database_ordinary=1 --query "$query" "$@" --path="${WORKING_FOLDER_01600}"
+    ${CLICKHOUSE_LOCAL} --allow_deprecated_database_ordinary=1 --multiquery --query "$query" "$@" --path="${WORKING_FOLDER_01600}"
 }
 
 test_detach_attach_sequence() {
@@ -112,8 +111,8 @@ 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 SETTINGS enable_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 enable_analyzer = 1" 2>&1 | grep -c "Unknown table expression identifier 'db_ordinary.src_mv_with_inner'"
+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"
diff --git a/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql b/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql
index 2945622fbed..ae296e18560 100644
--- a/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql
+++ b/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql
@@ -1,4 +1,9 @@
-CREATE TABLE base
+-- Tags: no-parallel
+
+drop database if exists test_01600;
+create database test_01600;
+
+CREATE TABLE test_01600.base
 (
 `id` UInt64,
 `id2` UInt64,
@@ -9,7 +14,7 @@ ENGINE=MergeTree()
 PARTITION BY d
 ORDER BY (id,id2,d);
 
-CREATE TABLE derived1
+CREATE TABLE test_01600.derived1
 (
     `id1` UInt64,
     `d1` UInt64,
@@ -20,7 +25,7 @@ PARTITION BY d1
 ORDER BY (id1, d1)
 ;
 
-CREATE TABLE derived2
+CREATE TABLE test_01600.derived2
 (
     `id2` UInt64,
     `d2` UInt64,
@@ -31,17 +36,19 @@ PARTITION BY d2
 ORDER BY (id2, d2)
 ;
 
-select
+select 
 base.id as `base.id`,
 derived2.value2 as `derived2.value2`,
 derived1.value1 as `derived1.value1`
-from base as base
-left join derived2 as derived2 on base.id2 = derived2.id2
-left join derived1 as derived1 on base.id = derived1.id1;
+from test_01600.base as base 
+left join test_01600.derived2 as derived2 on base.id2 = derived2.id2
+left join test_01600.derived1 as derived1 on base.id = derived1.id1;
 
 
 SELECT
     base.id AS `base.id`,
     derived1.value1 AS `derived1.value1`
-FROM base AS base
-LEFT JOIN derived1 AS derived1 ON base.id = derived1.id1;
+FROM test_01600.base AS base
+LEFT JOIN test_01600.derived1 AS derived1 ON base.id = derived1.id1;
+
+drop database test_01600;
diff --git a/tests/queries/0_stateless/01600_parts_states_metrics_long.sh b/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
index 0a9f94cc451..a0ed2b6bfeb 100755
--- a/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
+++ b/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
 # Tags: long, no-parallel
-
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
-
 function query()
 {
     # NOTE: database_atomic_wait_for_drop_and_detach_synchronously needed only for local env, CI has it ON
@@ -49,15 +47,11 @@ verify()
 
 query "DROP TABLE IF EXISTS test_table"
 query "CREATE TABLE test_table (data Date) ENGINE = MergeTree PARTITION BY toYear(data) ORDER BY data;"
-
 query "INSERT INTO test_table VALUES ('1992-01-01')"
 verify
-
 query "INSERT INTO test_table VALUES ('1992-01-02')"
 verify
-
 query "OPTIMIZE TABLE test_table FINAL"
 verify
-
 query "DROP TABLE test_table"
-verify
+verify
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01600_quota_by_forwarded_ip.sh b/tests/queries/0_stateless/01600_quota_by_forwarded_ip.sh
index 834eba8f25c..1d768c8b027 100755
--- a/tests/queries/0_stateless/01600_quota_by_forwarded_ip.sh
+++ b/tests/queries/0_stateless/01600_quota_by_forwarded_ip.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT -n --query "
 CREATE USER quoted_by_ip_${CLICKHOUSE_DATABASE};
 CREATE USER quoted_by_forwarded_ip_${CLICKHOUSE_DATABASE};
 
@@ -57,7 +57,7 @@ ${CLICKHOUSE_CURL} -H 'X-Forwarded-For: 5.6.7.8, 1.2.3.4' -sS "${CLICKHOUSE_URL}
 
 ${CLICKHOUSE_CURL} -H 'X-Forwarded-For: 1.2.3.4, 5.6.7.8' -sS "${CLICKHOUSE_URL}&user=quoted_by_forwarded_ip_${CLICKHOUSE_DATABASE}" -d "SELECT count() FROM numbers(10)"
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT -n --query "
 DROP QUOTA IF EXISTS quota_by_ip_${CLICKHOUSE_DATABASE};
 DROP QUOTA IF EXISTS quota_by_forwarded_ip;
 
diff --git a/tests/queries/0_stateless/01603_read_with_backoff_bug.sql b/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
index 212a18b5799..1cf52c0288b 100644
--- a/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
+++ b/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
@@ -1,17 +1,15 @@
--- Tags: long, no-tsan, no-msan, no-distributed-cache
--- Too long for TSan and MSan
+-- Tags: no-tsan
+-- Tag no-tsan: Too long for TSan
 
 set enable_filesystem_cache=0;
 set enable_filesystem_cache_on_write_operations=0;
-set max_rows_to_read = '30M';
-
 drop table if exists t;
 
 create table t (x UInt64, s String) engine = MergeTree order by x SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
 INSERT INTO t SELECT
     number,
     if(number < (8129 * 1024), arrayStringConcat(arrayMap(x -> toString(x), range(number % 128)), ' '), '')
-FROM numbers_mt((8129 * 1024) * 3) settings max_insert_threads=8, max_rows_to_read=0, max_memory_usage='10Gi';
+FROM numbers_mt((8129 * 1024) * 3) settings max_insert_threads=8;
 
 -- optimize table t final;
 
diff --git a/tests/queries/0_stateless/01605_adaptive_granularity_block_borders.sql b/tests/queries/0_stateless/01605_adaptive_granularity_block_borders.sql
index b65d0a3e73a..aaeee466794 100644
--- a/tests/queries/0_stateless/01605_adaptive_granularity_block_borders.sql
+++ b/tests/queries/0_stateless/01605_adaptive_granularity_block_borders.sql
@@ -1,4 +1,4 @@
--- Tags: long, no-random-merge-tree-settings, no-random-settings, no-tsan, no-debug, no-object-storage, no-distributed-cache
+-- Tags: no-random-merge-tree-settings, no-random-settings, no-tsan, no-debug, no-object-storage, long
 -- no-tsan: too slow
 -- no-object-storage: for remote tables we use thread pool even when reading with one stream, so memory consumption is higher
 
diff --git a/tests/queries/0_stateless/01606_git_import.sh b/tests/queries/0_stateless/01606_git_import.sh
index 6986d6b14cf..48558d79f93 100755
--- a/tests/queries/0_stateless/01606_git_import.sh
+++ b/tests/queries/0_stateless/01606_git_import.sh
@@ -19,7 +19,7 @@ done
 
 ${CLICKHOUSE_GIT_IMPORT} 2>&1 | wc -l
 
-${CLICKHOUSE_CLIENT} --multiline --query "
+${CLICKHOUSE_CLIENT} --multiline --multiquery --query "
 
 DROP TABLE IF EXISTS commits;
 DROP TABLE IF EXISTS file_changes;
@@ -122,7 +122,7 @@ ${CLICKHOUSE_CLIENT} --query "SELECT count() FROM commits"
 ${CLICKHOUSE_CLIENT} --query "SELECT count() FROM file_changes"
 ${CLICKHOUSE_CLIENT} --query "SELECT count(), round(avg(indent), 1) FROM line_changes"
 
-${CLICKHOUSE_CLIENT} --multiline --query "
+${CLICKHOUSE_CLIENT} --multiline --multiquery --query "
 DROP TABLE commits;
 DROP TABLE file_changes;
 DROP TABLE line_changes;
diff --git a/tests/queries/0_stateless/01607_arrays_as_nested_csv.sh b/tests/queries/0_stateless/01607_arrays_as_nested_csv.sh
index 2a1182c14c1..946be7fb4af 100755
--- a/tests/queries/0_stateless/01607_arrays_as_nested_csv.sh
+++ b/tests/queries/0_stateless/01607_arrays_as_nested_csv.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} --multiquery --query "
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (a Array(String)) ENGINE = Memory;
 "
@@ -22,7 +22,7 @@ ${CLICKHOUSE_CLIENT} --input_format_csv_arrays_as_nested_csv 1 --query "INSERT I
 """Hello"", ""world"", ""42"""" TV"""
 END
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} --multiquery --query "
 SELECT * FROM test;
 DROP TABLE IF EXISTS test;
 "
diff --git a/tests/queries/0_stateless/01622_constraints_simple_optimization.reference b/tests/queries/0_stateless/01622_constraints_simple_optimization.reference
index 64a9db37a68..d267df2237f 100644
--- a/tests/queries/0_stateless/01622_constraints_simple_optimization.reference
+++ b/tests/queries/0_stateless/01622_constraints_simple_optimization.reference
@@ -32,10 +32,10 @@
 1
 1
 0
-SELECT count()
+SELECT count() AS `count()`
 FROM constraint_test_constants
 WHERE (b > 100) OR (c > 100)
-SELECT count()
+SELECT count() AS `count()`
 FROM constraint_test_constants
 WHERE c > 100
 QUERY id: 0
@@ -52,8 +52,8 @@ QUERY id: 0
         LIST id: 5, nodes: 2
           COLUMN id: 6, column_name: c, result_type: Int64, source_id: 3
           CONSTANT id: 7, constant_value: UInt64_100, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
-SELECT count()
+  SETTINGS allow_experimental_analyzer=1
+SELECT count() AS `count()`
 FROM constraint_test_constants
 WHERE c > 100
 QUERY id: 0
@@ -70,8 +70,8 @@ QUERY id: 0
         LIST id: 5, nodes: 2
           COLUMN id: 6, column_name: c, result_type: Int64, source_id: 3
           CONSTANT id: 7, constant_value: UInt64_100, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
-SELECT count()
+  SETTINGS allow_experimental_analyzer=1
+SELECT count() AS `count()`
 FROM constraint_test_constants
 QUERY id: 0
   PROJECTION COLUMNS
@@ -81,4 +81,4 @@ QUERY id: 0
       FUNCTION id: 2, function_name: count, function_type: aggregate, result_type: UInt64
   JOIN TREE
     TABLE id: 3, alias: __table1, table_name: default.constraint_test_constants
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
diff --git a/tests/queries/0_stateless/01622_constraints_simple_optimization.sql b/tests/queries/0_stateless/01622_constraints_simple_optimization.sql
index e549467de02..acde02e2c67 100644
--- a/tests/queries/0_stateless/01622_constraints_simple_optimization.sql
+++ b/tests/queries/0_stateless/01622_constraints_simple_optimization.sql
@@ -101,10 +101,10 @@ SELECT count() FROM constraint_test_constants WHERE 11 <= a; ---> assumption ->
 EXPLAIN SYNTAX SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100);
 -- EXPLAIN QUERY TREE SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100); ---> the order of the generated checks is not consistent
 EXPLAIN SYNTAX SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100) AND (NOT b > 100 OR c > 100);
-EXPLAIN QUERY TREE SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100) AND (NOT b > 100 OR c > 100) SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100) AND (NOT b > 100 OR c > 100) SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100) AND (NOT b > 100 OR c > 100) AND (c > 100);
-EXPLAIN QUERY TREE SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100) AND (NOT b > 100 OR c > 100) AND (c > 100) SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100) AND (NOT b > 100 OR c > 100) AND (c > 100) SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100) AND (NOT b > 100 OR c > 100) AND (c <= 100);
-EXPLAIN QUERY TREE SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100) AND (NOT b > 100 OR c > 100) AND (c <= 100) SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT count() FROM constraint_test_constants WHERE (a > 100 OR b > 100 OR c > 100) AND (a <= 100 OR b > 100 OR c > 100) AND (NOT b > 100 OR c > 100) AND (c <= 100) SETTINGS allow_experimental_analyzer = 1;
 
 DROP TABLE constraint_test_constants;
diff --git a/tests/queries/0_stateless/01622_constraints_where_optimization.reference b/tests/queries/0_stateless/01622_constraints_where_optimization.reference
index 09a6dd3d0e7..3f6e8211f1a 100644
--- a/tests/queries/0_stateless/01622_constraints_where_optimization.reference
+++ b/tests/queries/0_stateless/01622_constraints_where_optimization.reference
@@ -11,7 +11,7 @@ QUERY id: 0
     TABLE id: 3, alias: __table1, table_name: default.t_constraints_where
   WHERE
     CONSTANT id: 4, constant_value: UInt64_0, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT count()
 FROM t_constraints_where
 WHERE 0
@@ -25,7 +25,7 @@ QUERY id: 0
     TABLE id: 3, alias: __table1, table_name: default.t_constraints_where
   WHERE
     CONSTANT id: 4, constant_value: UInt64_0, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT count()
 FROM t_constraints_where
 WHERE 0
@@ -39,7 +39,7 @@ QUERY id: 0
     TABLE id: 3, alias: __table1, table_name: default.t_constraints_where
   WHERE
     CONSTANT id: 4, constant_value: UInt64_0, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT count()
 FROM t_constraints_where
 WHERE b < 8
@@ -57,7 +57,7 @@ QUERY id: 0
         LIST id: 5, nodes: 2
           COLUMN id: 6, column_name: b, result_type: UInt32, source_id: 3
           CONSTANT id: 7, constant_value: UInt64_8, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT count()
 FROM t_constraints_where
 PREWHERE (b > 20) OR (b < 8)
@@ -75,7 +75,7 @@ QUERY id: 0
         LIST id: 5, nodes: 2
           COLUMN id: 6, column_name: b, result_type: UInt32, source_id: 3
           CONSTANT id: 7, constant_value: UInt64_8, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT count()
 FROM t_constraints_where
 QUERY id: 0
@@ -86,4 +86,4 @@ QUERY id: 0
       FUNCTION id: 2, function_name: count, function_type: aggregate, result_type: UInt64
   JOIN TREE
     TABLE id: 3, alias: __table1, table_name: default.t_constraints_where
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
diff --git a/tests/queries/0_stateless/01622_constraints_where_optimization.sql b/tests/queries/0_stateless/01622_constraints_where_optimization.sql
index 63803ec8ce6..d41b1988bdd 100644
--- a/tests/queries/0_stateless/01622_constraints_where_optimization.sql
+++ b/tests/queries/0_stateless/01622_constraints_where_optimization.sql
@@ -9,15 +9,15 @@ CREATE TABLE t_constraints_where(a UInt32, b UInt32, CONSTRAINT c1 ASSUME b >= 5
 INSERT INTO t_constraints_where VALUES (1, 7);
 
 EXPLAIN SYNTAX SELECT count() FROM t_constraints_where WHERE b > 15; -- assumption -> 0
-EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where WHERE b > 15 SETTINGS enable_analyzer = 1; -- assumption -> 0
+EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where WHERE b > 15 SETTINGS allow_experimental_analyzer = 1; -- assumption -> 0
 EXPLAIN SYNTAX SELECT count() FROM t_constraints_where WHERE b = 20; -- assumption -> 0
-EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where WHERE b = 20 SETTINGS enable_analyzer = 1; -- assumption -> 0
+EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where WHERE b = 20 SETTINGS allow_experimental_analyzer = 1; -- assumption -> 0
 EXPLAIN SYNTAX SELECT count() FROM t_constraints_where WHERE b < 2; -- assumption -> 0
-EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where WHERE b < 2 SETTINGS enable_analyzer = 1; -- assumption -> 0
+EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where WHERE b < 2 SETTINGS allow_experimental_analyzer = 1; -- assumption -> 0
 EXPLAIN SYNTAX SELECT count() FROM t_constraints_where WHERE b > 20 OR b < 8; -- assumption -> remove (b < 20)
-EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where WHERE b > 20 OR b < 8 SETTINGS enable_analyzer = 1; -- assumption -> remove (b < 20)
+EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where WHERE b > 20 OR b < 8 SETTINGS allow_experimental_analyzer = 1; -- assumption -> remove (b < 20)
 EXPLAIN SYNTAX SELECT count() FROM t_constraints_where PREWHERE b > 20 OR b < 8; -- assumption -> remove (b < 20)
-EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where PREWHERE b > 20 OR b < 8 SETTINGS enable_analyzer = 1; -- assumption -> remove (b < 20)
+EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where PREWHERE b > 20 OR b < 8 SETTINGS allow_experimental_analyzer = 1; -- assumption -> remove (b < 20)
 
 DROP TABLE t_constraints_where;
 
@@ -26,6 +26,6 @@ CREATE TABLE t_constraints_where(a UInt32, b UInt32, CONSTRAINT c1 ASSUME b < 10
 INSERT INTO t_constraints_where VALUES (1, 7);
 
 EXPLAIN SYNTAX SELECT count() FROM t_constraints_where WHERE b = 1 OR b < 18 OR b > 5; -- assumption -> (b < 20) -> 0;
-EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where WHERE b = 1 OR b < 18 OR b > 5 SETTINGS enable_analyzer = 1; -- assumption -> (b < 20) -> 0;
+EXPLAIN QUERY TREE SELECT count() FROM t_constraints_where WHERE b = 1 OR b < 18 OR b > 5 SETTINGS allow_experimental_analyzer = 1; -- assumption -> (b < 20) -> 0;
 
 DROP TABLE t_constraints_where;
diff --git a/tests/queries/0_stateless/01623_constraints_column_swap.reference b/tests/queries/0_stateless/01623_constraints_column_swap.reference
index b49884b4798..555a4c93f70 100644
--- a/tests/queries/0_stateless/01623_constraints_column_swap.reference
+++ b/tests/queries/0_stateless/01623_constraints_column_swap.reference
@@ -1,6 +1,6 @@
 SELECT
-    (b AS `cityHash64(a)`) + 10,
-    (b AS b) + 3
+    (b AS `cityHash64(a)`) + 10 AS `plus(cityHash64(a), 10)`,
+    (b AS b) + 3 AS `plus(b, 3)`
 FROM column_swap_test_test
 WHERE b = 1
 QUERY id: 0
@@ -27,7 +27,7 @@ QUERY id: 0
         LIST id: 12, nodes: 2
           COLUMN id: 13, column_name: b, result_type: UInt64, source_id: 5
           CONSTANT id: 14, constant_value: UInt64_1, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     cityHash64(a) + 10,
     b + 3
@@ -57,10 +57,10 @@ QUERY id: 0
         LIST id: 12, nodes: 2
           COLUMN id: 13, column_name: b, result_type: UInt64, source_id: 5
           CONSTANT id: 14, constant_value: UInt64_1, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT
-    (b AS `cityHash64(a)`) + 10,
-    (b AS b) + 3
+    (b AS `cityHash64(a)`) + 10 AS `plus(cityHash64(a), 10)`,
+    (b AS b) + 3 AS `plus(b, 3)`
 FROM column_swap_test_test
 WHERE b = 0
 QUERY id: 0
@@ -87,10 +87,10 @@ QUERY id: 0
         LIST id: 12, nodes: 2
           COLUMN id: 13, column_name: b, result_type: UInt64, source_id: 5
           CONSTANT id: 14, constant_value: UInt64_0, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT
-    (b AS `cityHash64(a)`) + 10,
-    (b AS b) + 3
+    (b AS `cityHash64(a)`) + 10 AS `plus(cityHash64(a), 10)`,
+    (b AS b) + 3 AS `plus(b, 3)`
 FROM column_swap_test_test
 WHERE b = 0
 QUERY id: 0
@@ -117,10 +117,10 @@ QUERY id: 0
         LIST id: 12, nodes: 2
           COLUMN id: 13, column_name: b, result_type: UInt64, source_id: 5
           CONSTANT id: 14, constant_value: UInt64_0, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT
-    (b AS `cityHash64(a)`) + 10,
-    (b AS b) + 3
+    (b AS `cityHash64(a)`) + 10 AS `plus(cityHash64(a), 10)`,
+    (b AS b) + 3 AS `plus(b, 3)`
 FROM column_swap_test_test
 WHERE b = 1
 QUERY id: 0
@@ -147,8 +147,8 @@ QUERY id: 0
         LIST id: 12, nodes: 2
           COLUMN id: 13, column_name: b, result_type: UInt64, source_id: 5
           CONSTANT id: 14, constant_value: UInt64_1, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
-SELECT (b AS `cityHash64(a)`) + 10
+  SETTINGS allow_experimental_analyzer=1
+SELECT (b AS `cityHash64(a)`) + 10 AS `plus(cityHash64(a), 10)`
 FROM column_swap_test_test
 WHERE b = 0
 QUERY id: 0
@@ -169,10 +169,10 @@ QUERY id: 0
         LIST id: 8, nodes: 2
           COLUMN id: 9, column_name: b, result_type: UInt64, source_id: 5
           CONSTANT id: 10, constant_value: UInt64_0, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT
-    (cityHash64(a) AS `cityHash64(a)`) + 10,
-    a
+    (cityHash64(a) AS `cityHash64(a)`) + 10 AS `plus(cityHash64(a), 10)`,
+    a AS a
 FROM column_swap_test_test
 WHERE cityHash64(a) = 0
 QUERY id: 0
@@ -201,10 +201,10 @@ QUERY id: 0
               LIST id: 13, nodes: 1
                 COLUMN id: 14, column_name: a, result_type: String, source_id: 7
           CONSTANT id: 15, constant_value: UInt64_0, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT
-    (cityHash64(a) AS b) + 10,
-    a
+    (cityHash64(a) AS b) + 10 AS `plus(b, 10)`,
+    a AS a
 FROM column_swap_test_test
 WHERE cityHash64(a) = 0
 QUERY id: 0
@@ -233,7 +233,7 @@ QUERY id: 0
               LIST id: 13, nodes: 1
                 COLUMN id: 14, column_name: a, result_type: String, source_id: 7
           CONSTANT id: 15, constant_value: UInt64_0, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     a AS `substring(reverse(b), 1, 1)`,
     a AS a
@@ -255,7 +255,7 @@ QUERY id: 0
         LIST id: 6, nodes: 2
           COLUMN id: 7, column_name: a, result_type: String, source_id: 3
           CONSTANT id: 8, constant_value: \'c\', constant_value_type: String
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     a AS `substring(reverse(b), 1, 1)`,
     a AS a
@@ -277,7 +277,7 @@ QUERY id: 0
         LIST id: 6, nodes: 2
           COLUMN id: 7, column_name: a, result_type: String, source_id: 3
           CONSTANT id: 8, constant_value: \'c\', constant_value_type: String
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     a AS t1,
     a AS t2
@@ -299,7 +299,7 @@ QUERY id: 0
         LIST id: 6, nodes: 2
           COLUMN id: 7, column_name: a, result_type: String, source_id: 3
           CONSTANT id: 8, constant_value: \'c\', constant_value_type: String
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT a AS `substring(reverse(b), 1, 1)`
 FROM column_swap_test_test
 WHERE a = \'c\'
@@ -317,7 +317,7 @@ QUERY id: 0
         LIST id: 5, nodes: 2
           COLUMN id: 6, column_name: a, result_type: String, source_id: 3
           CONSTANT id: 7, constant_value: \'c\', constant_value_type: String
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT a
 FROM t_bad_constraint
 QUERY id: 0
@@ -328,4 +328,4 @@ QUERY id: 0
       COLUMN id: 2, column_name: a, result_type: UInt32, source_id: 3
   JOIN TREE
     TABLE id: 3, alias: __table1, table_name: default.t_bad_constraint
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
diff --git a/tests/queries/0_stateless/01623_constraints_column_swap.sql b/tests/queries/0_stateless/01623_constraints_column_swap.sql
index ccd387c9f8d..242be87938d 100644
--- a/tests/queries/0_stateless/01623_constraints_column_swap.sql
+++ b/tests/queries/0_stateless/01623_constraints_column_swap.sql
@@ -14,22 +14,22 @@ INSERT INTO column_swap_test_test VALUES (1, 'cat', 1), (2, 'dog', 2);
 INSERT INTO column_swap_test_test SELECT number AS i, format('test {} kek {}', toString(number), toString(number + 10))  AS a, 1 AS b FROM system.numbers LIMIT 1000000;
 
 EXPLAIN SYNTAX SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE cityHash64(a) = 1;
-EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE cityHash64(a) = 1 SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE cityHash64(a) = 1 SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test PREWHERE cityHash64(a) = 1;
-EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test PREWHERE cityHash64(a) = 1 SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test PREWHERE cityHash64(a) = 1 SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE cityHash64(a) = 0;
-EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE cityHash64(a) = 0 SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE cityHash64(a) = 0 SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE b = 0;
-EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE b = 0 SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE b = 0 SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE b = 1;
-EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE b = 1 SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, b + 3 FROM column_swap_test_test WHERE b = 1 SETTINGS allow_experimental_analyzer = 1;
 
 EXPLAIN SYNTAX SELECT cityHash64(a) + 10 FROM column_swap_test_test WHERE cityHash64(a) = 0;
-EXPLAIN QUERY TREE SELECT cityHash64(a) + 10 FROM column_swap_test_test WHERE cityHash64(a) = 0 SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT cityHash64(a) + 10 FROM column_swap_test_test WHERE cityHash64(a) = 0 SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT cityHash64(a) + 10, a FROM column_swap_test_test WHERE cityHash64(a) = 0;
-EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, a FROM column_swap_test_test WHERE cityHash64(a) = 0 SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT cityHash64(a) + 10, a FROM column_swap_test_test WHERE cityHash64(a) = 0 SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT b + 10, a FROM column_swap_test_test WHERE b = 0;
-EXPLAIN QUERY TREE SELECT b + 10, a FROM column_swap_test_test WHERE b = 0 SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT b + 10, a FROM column_swap_test_test WHERE b = 0 SETTINGS allow_experimental_analyzer = 1;
 
 DROP TABLE column_swap_test_test;
 
@@ -37,13 +37,13 @@ CREATE TABLE column_swap_test_test (i Int64, a String, b String, CONSTRAINT c1 A
 INSERT INTO column_swap_test_test SELECT number AS i, toString(number) AS a, format('test {} kek {}', toString(number), toString(number + 10)) b FROM system.numbers LIMIT 1000000;
 
 EXPLAIN SYNTAX SELECT substring(reverse(b), 1, 1), a FROM column_swap_test_test WHERE a = 'c';
-EXPLAIN QUERY TREE SELECT substring(reverse(b), 1, 1), a FROM column_swap_test_test WHERE a = 'c' SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT substring(reverse(b), 1, 1), a FROM column_swap_test_test WHERE a = 'c' SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT substring(reverse(b), 1, 1), a FROM column_swap_test_test WHERE substring(reverse(b), 1, 1) = 'c';
-EXPLAIN QUERY TREE SELECT substring(reverse(b), 1, 1), a FROM column_swap_test_test WHERE substring(reverse(b), 1, 1) = 'c' SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT substring(reverse(b), 1, 1), a FROM column_swap_test_test WHERE substring(reverse(b), 1, 1) = 'c' SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT substring(reverse(b), 1, 1) AS t1, a AS t2 FROM column_swap_test_test WHERE substring(reverse(b), 1, 1) = 'c';
-EXPLAIN QUERY TREE SELECT substring(reverse(b), 1, 1) AS t1, a AS t2 FROM column_swap_test_test WHERE substring(reverse(b), 1, 1) = 'c' SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT substring(reverse(b), 1, 1) AS t1, a AS t2 FROM column_swap_test_test WHERE substring(reverse(b), 1, 1) = 'c' SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT substring(reverse(b), 1, 1) FROM column_swap_test_test WHERE substring(reverse(b), 1, 1) = 'c';
-EXPLAIN QUERY TREE SELECT substring(reverse(b), 1, 1) FROM column_swap_test_test WHERE substring(reverse(b), 1, 1) = 'c' SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT substring(reverse(b), 1, 1) FROM column_swap_test_test WHERE substring(reverse(b), 1, 1) = 'c' SETTINGS allow_experimental_analyzer = 1;
 
 DROP TABLE column_swap_test_test;
 
@@ -54,6 +54,6 @@ CREATE TABLE t_bad_constraint(a UInt32, s String, CONSTRAINT c1 ASSUME a = toUIn
 INSERT INTO t_bad_constraint SELECT number, randomPrintableASCII(100) FROM numbers(10000);
 
 EXPLAIN SYNTAX SELECT a FROM t_bad_constraint;
-EXPLAIN QUERY TREE SELECT a FROM t_bad_constraint SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT a FROM t_bad_constraint SETTINGS allow_experimental_analyzer = 1;
 
 DROP TABLE t_bad_constraint;
diff --git a/tests/queries/0_stateless/01632_tinylog_read_write.sh b/tests/queries/0_stateless/01632_tinylog_read_write.sh
index 68d28b080e9..10625ec5d27 100755
--- a/tests/queries/0_stateless/01632_tinylog_read_write.sh
+++ b/tests/queries/0_stateless/01632_tinylog_read_write.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test; CREATE TABLE IF NOT EXISTS test (x UInt64, s Array(Nullable(String))) ENGINE = TinyLog;"
+$CLICKHOUSE_CLIENT --multiquery --query "DROP TABLE IF EXISTS test; CREATE TABLE IF NOT EXISTS test (x UInt64, s Array(Nullable(String))) ENGINE = TinyLog;"
 
 function thread_select {
     local TIMELIMIT=$((SECONDS+$1))
@@ -47,4 +47,4 @@ thread_insert $TIMEOUT &
 wait
 echo "Done"
 
-$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test;"
+$CLICKHOUSE_CLIENT --multiquery --query "DROP TABLE IF EXISTS test;"
diff --git a/tests/queries/0_stateless/01646_rewrite_sum_if.sql b/tests/queries/0_stateless/01646_rewrite_sum_if.sql
index fd98a157ac6..da341a3f7db 100644
--- a/tests/queries/0_stateless/01646_rewrite_sum_if.sql
+++ b/tests/queries/0_stateless/01646_rewrite_sum_if.sql
@@ -34,7 +34,7 @@ SELECT sum(if(number % 2 == 0, 0, 1)) FROM numbers(100);
 SELECT sum(if(number % 2 == 0 as cond_expr, 0 as zero_expr, 1 as one_expr) as if_expr), sum(cond_expr), sum(if_expr), one_expr, zero_expr FROM numbers(100);
 SELECT countIf(number % 2 != 0) FROM numbers(100);
 
-set enable_analyzer = true;
+set allow_experimental_analyzer = true;
 
 EXPLAIN QUERY TREE run_passes=1 SELECT sumIf(123, number % 2 == 0) FROM numbers(100);
 EXPLAIN QUERY TREE run_passes=1 SELECT sum(if(number % 2 == 0, 123, 0)) FROM numbers(100);
diff --git a/tests/queries/0_stateless/01651_bugs_from_15889.sql b/tests/queries/0_stateless/01651_bugs_from_15889.sql
index b98feaa1f65..dd31f2941ef 100644
--- a/tests/queries/0_stateless/01651_bugs_from_15889.sql
+++ b/tests/queries/0_stateless/01651_bugs_from_15889.sql
@@ -111,5 +111,5 @@ WITH (
     ) AS t)
 SELECT if(dateDiff('second', toDateTime(time_with_microseconds), toDateTime(t)) = -9223372036854775808, 'ok', '');
 
-set joined_subquery_requires_alias=0, enable_analyzer=0; -- the query is invalid with a new analyzer
+set joined_subquery_requires_alias=0, allow_experimental_analyzer=0; -- the query is invalid with a new analyzer
 SELECT number, number / 2 AS n, j1, j2 FROM remote('127.0.0.{2,3}', system.numbers) GLOBAL ANY LEFT JOIN (SELECT number / 3 AS n, number AS j1, 'Hello' AS j2 FROM system.numbers LIMIT 1048577) USING (n) LIMIT 10 format Null;
diff --git a/tests/queries/0_stateless/01651_lc_insert_tiny_log.reference b/tests/queries/0_stateless/01651_lc_insert_tiny_log.reference
new file mode 100644
index 00000000000..3da44c57b27
--- /dev/null
+++ b/tests/queries/0_stateless/01651_lc_insert_tiny_log.reference
@@ -0,0 +1,12 @@
+10000000
+10000000	1274991808
+20000000
+20000000	2549983616
+10000000
+10000000	1274991808
+20000000
+20000000	2549983616
+10000000
+10000000	1274991808
+20000000
+20000000	2549983616
diff --git a/tests/queries/0_stateless/01651_lc_insert_tiny_log.sql b/tests/queries/0_stateless/01651_lc_insert_tiny_log.sql
new file mode 100644
index 00000000000..d405bb01fd9
--- /dev/null
+++ b/tests/queries/0_stateless/01651_lc_insert_tiny_log.sql
@@ -0,0 +1,48 @@
+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;
+
+INSERT INTO perf_lc_num (num) SELECT toUInt8(number) FROM numbers(10000000);
+
+select sum(length(arr)) from perf_lc_num;
+select sum(length(arr)), sum(num) from perf_lc_num;
+
+INSERT INTO perf_lc_num (num) SELECT toUInt8(number) FROM numbers(10000000);
+
+select sum(length(arr)) from perf_lc_num;
+select sum(length(arr)), sum(num) from perf_lc_num;
+
+drop table if exists perf_lc_num;
+
+
+CREATE TABLE perf_lc_num(　        num UInt8,　        arr Array(LowCardinality(Int64)) default [num]　        ) ENGINE = Log;
+
+INSERT INTO perf_lc_num (num) SELECT toUInt8(number) FROM numbers(10000000);
+
+select sum(length(arr)) from perf_lc_num;
+select sum(length(arr)), sum(num) from perf_lc_num;
+
+INSERT INTO perf_lc_num (num) SELECT toUInt8(number) FROM numbers(10000000);
+
+select sum(length(arr)) from perf_lc_num;
+select sum(length(arr)), sum(num) from perf_lc_num;
+
+drop table if exists perf_lc_num;
+
+
+CREATE TABLE perf_lc_num(　        num UInt8,　        arr Array(LowCardinality(Int64)) default [num]　        ) ENGINE = StripeLog;
+
+INSERT INTO perf_lc_num (num) SELECT toUInt8(number) FROM numbers(10000000);
+
+select sum(length(arr)) from perf_lc_num;
+select sum(length(arr)), sum(num) from perf_lc_num;
+
+INSERT INTO perf_lc_num (num) SELECT toUInt8(number) FROM numbers(10000000);
+
+select sum(length(arr)) from perf_lc_num;
+select sum(length(arr)), sum(num) from perf_lc_num;
+
+drop table if exists perf_lc_num;
+
+
diff --git a/tests/queries/0_stateless/01651_lc_insert_tiny_log_1.reference b/tests/queries/0_stateless/01651_lc_insert_tiny_log_1.reference
deleted file mode 100644
index 0715a4212ed..00000000000
--- a/tests/queries/0_stateless/01651_lc_insert_tiny_log_1.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-10000000
-10000000	1274991808
-30000000
-30000000	3824991808
diff --git a/tests/queries/0_stateless/01651_lc_insert_tiny_log_1.sql b/tests/queries/0_stateless/01651_lc_insert_tiny_log_1.sql
deleted file mode 100644
index 142d3b21b47..00000000000
--- a/tests/queries/0_stateless/01651_lc_insert_tiny_log_1.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-set allow_suspicious_low_cardinality_types = 1, max_rows_to_read = '31M';
-drop table if exists perf_lc_num;
-
-CREATE TABLE perf_lc_num(        num UInt8,        arr Array(LowCardinality(Int64)) default [num]        ) ENGINE = TinyLog;
-
-INSERT INTO perf_lc_num (num) SELECT toUInt8(number) FROM numbers(10000000);
-
-select sum(length(arr)) from perf_lc_num;
-select sum(length(arr)), sum(num) from perf_lc_num;
-
-INSERT INTO perf_lc_num (num) SELECT toUInt8(number) FROM numbers(10000000, 20000000);
-
-select sum(length(arr)) from perf_lc_num;
-select sum(length(arr)), sum(num) from perf_lc_num;
-
-drop table if exists perf_lc_num;
diff --git a/tests/queries/0_stateless/01651_lc_insert_tiny_log_2.reference b/tests/queries/0_stateless/01651_lc_insert_tiny_log_2.reference
deleted file mode 100644
index 0715a4212ed..00000000000
--- a/tests/queries/0_stateless/01651_lc_insert_tiny_log_2.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-10000000
-10000000	1274991808
-30000000
-30000000	3824991808
diff --git a/tests/queries/0_stateless/01651_lc_insert_tiny_log_2.sql b/tests/queries/0_stateless/01651_lc_insert_tiny_log_2.sql
deleted file mode 100644
index e6b68e1d682..00000000000
--- a/tests/queries/0_stateless/01651_lc_insert_tiny_log_2.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-set allow_suspicious_low_cardinality_types = 1, max_rows_to_read = '31M';
-drop table if exists perf_lc_num;
-
-CREATE TABLE perf_lc_num(        num UInt8,        arr Array(LowCardinality(Int64)) default [num]        ) ENGINE = Log;
-
-INSERT INTO perf_lc_num (num) SELECT toUInt8(number) FROM numbers(10000000);
-
-select sum(length(arr)) from perf_lc_num;
-select sum(length(arr)), sum(num) from perf_lc_num;
-
-INSERT INTO perf_lc_num (num) SELECT toUInt8(number) FROM numbers(10000000, 20000000);
-
-select sum(length(arr)) from perf_lc_num;
-select sum(length(arr)), sum(num) from perf_lc_num;
-
-drop table if exists perf_lc_num;
diff --git a/tests/queries/0_stateless/01651_lc_insert_tiny_log_3.reference b/tests/queries/0_stateless/01651_lc_insert_tiny_log_3.reference
deleted file mode 100644
index 0715a4212ed..00000000000
--- a/tests/queries/0_stateless/01651_lc_insert_tiny_log_3.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-10000000
-10000000	1274991808
-30000000
-30000000	3824991808
diff --git a/tests/queries/0_stateless/01651_lc_insert_tiny_log_3.sql b/tests/queries/0_stateless/01651_lc_insert_tiny_log_3.sql
deleted file mode 100644
index 85a42163897..00000000000
--- a/tests/queries/0_stateless/01651_lc_insert_tiny_log_3.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-set allow_suspicious_low_cardinality_types = 1, max_rows_to_read = '31M';
-drop table if exists perf_lc_num;
-
-CREATE TABLE perf_lc_num(        num UInt8,        arr Array(LowCardinality(Int64)) default [num]        ) ENGINE = StripeLog;
-
-INSERT INTO perf_lc_num (num) SELECT toUInt8(number) FROM numbers(10000000);
-
-select sum(length(arr)) from perf_lc_num;
-select sum(length(arr)), sum(num) from perf_lc_num;
-
-INSERT INTO perf_lc_num (num) SELECT toUInt8(number) FROM numbers(10000000, 20000000);
-
-select sum(length(arr)) from perf_lc_num;
-select sum(length(arr)), sum(num) from perf_lc_num;
-
-drop table if exists perf_lc_num;
diff --git a/tests/queries/0_stateless/01651_map_functions.reference b/tests/queries/0_stateless/01651_map_functions.reference
index e336a02318d..471da5586b7 100644
--- a/tests/queries/0_stateless/01651_map_functions.reference
+++ b/tests/queries/0_stateless/01651_map_functions.reference
@@ -52,10 +52,3 @@
 {1:4,2:5}
 {1:4,2:5}
 {1:4,2:5}
-{1:3,2:4}
-{1:3,2:4}
-{1:3,2:4}	{(1,3):'a',(2,4):'b'}
-{(1,'a'):'c',(2,'b'):'d'}
-{(1,'a'):'c',(2,'b'):'d'}
-{(1,'a'):'c',(2,'b'):'d'}
-{(1,'a'):'c',(2,'b'):'d'}
diff --git a/tests/queries/0_stateless/01651_map_functions.sql b/tests/queries/0_stateless/01651_map_functions.sql
index dc93a38b265..cf2460fce2c 100644
--- a/tests/queries/0_stateless/01651_map_functions.sql
+++ b/tests/queries/0_stateless/01651_map_functions.sql
@@ -67,20 +67,12 @@ select mapFromArrays(['aa', 'bb'], [4, 5, 6]); -- { serverError SIZES_OF_ARRAYS_
 select mapFromArrays([[1,2], [3,4]], [4, 5, 6]); -- { serverError SIZES_OF_ARRAYS_DONT_MATCH }
 select mapFromArrays(['a', 2], [4, 5]); -- { serverError NO_COMMON_TYPE}
 select mapFromArrays([1, 2], [4, 'a']); -- { serverError NO_COMMON_TYPE}
-select mapFromArrays(['aa', 'bb'], map('a', 4)); -- { serverError SIZES_OF_ARRAYS_DONT_MATCH }
-select mapFromArrays([1,null]::Array(Nullable(UInt8)), [3,4]); -- { serverError BAD_ARGUMENTS }
 
 select mapFromArrays(['aa', 'bb'], map('a', 4, 'b', 5));
 select mapFromArrays(['aa', 'bb'], materialize(map('a', 4, 'b', 5))) from numbers(2);
 
+select mapFromArrays(map('a', 4, 'b', 4), ['aa', 'bb']) from numbers(2); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+select mapFromArrays(['aa', 'bb'], map('a', 4)); -- { serverError SIZES_OF_ARRAYS_DONT_MATCH }
+
 select mapFromArrays([toLowCardinality(1), toLowCardinality(2)], [4, 5]);
 select mapFromArrays([toLowCardinality(1), toLowCardinality(2)], materialize([4, 5])) from numbers(2);
-
-select mapFromArrays([1,2], [3,4]);
-select mapFromArrays([1,2]::Array(Nullable(UInt8)), [3,4]);
-select mapFromArrays([1,2], [3,4]) as x, mapFromArrays(x, ['a', 'b']);
-
-select mapFromArrays(map(1, 'a', 2, 'b'), array('c', 'd'));
-select mapFromArrays(materialize(map(1, 'a', 2, 'b')), array('c', 'd'));
-select mapFromArrays(map(1, 'a', 2, 'b'), materialize(array('c', 'd')));
-select mapFromArrays(materialize(map(1, 'a', 2, 'b')), materialize(array('c', 'd')));
diff --git a/tests/queries/0_stateless/01655_plan_optimizations.sh b/tests/queries/0_stateless/01655_plan_optimizations.sh
index 42cdac8c01f..4bd0eb7d908 100755
--- a/tests/queries/0_stateless/01655_plan_optimizations.sh
+++ b/tests/queries/0_stateless/01655_plan_optimizations.sh
@@ -26,13 +26,13 @@ $CLICKHOUSE_CLIENT -q "
     settings enable_optimize_predicate_expression=0"
 
 echo "> filter should be pushed down after aggregating, column after aggregation is const"
-$CLICKHOUSE_CLIENT --enable_analyzer=0 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=0 -q "
     explain actions = 1 select s, y, y != 0 from (select sum(x) as s, y from (
         select number as x, number + 1 as y from numbers(10)) group by y
     ) where y != 0
     settings enable_optimize_predicate_expression=0" | grep -o "Aggregating\|Filter\|COLUMN Const(UInt8) -> notEquals(y, 0)"
 echo "> (analyzer) filter should be pushed down after aggregating, column after aggregation is const"
-$CLICKHOUSE_CLIENT --enable_analyzer=1 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=1 -q "
     explain actions = 1 select s, y, y != 0 from (select sum(x) as s, y from (
         select number as x, number + 1 as y from numbers(10)) group by y
     ) where y != 0
@@ -44,14 +44,14 @@ $CLICKHOUSE_CLIENT -q "
     settings enable_optimize_predicate_expression=0"
 
 echo "> one condition of filter should be pushed down after aggregating, other condition is aliased"
-$CLICKHOUSE_CLIENT --enable_analyzer=0 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=0 -q "
     explain actions = 1 select s, y from (
         select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
     ) where y != 0 and s != 4
     settings enable_optimize_predicate_expression=0" |
     grep -o "Aggregating\|Filter column\|Filter column: notEquals(y, 0)\|ALIAS notEquals(s, 4) :: 4 -> and(notEquals(y, 0), notEquals(s, 4)) UInt8 : 2"
 echo "> (analyzer) one condition of filter should be pushed down after aggregating, other condition is aliased"
-$CLICKHOUSE_CLIENT --enable_analyzer=1 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=1 -q "
     explain actions = 1 select s, y from (
         select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
     ) where y != 0 and s != 4
@@ -64,14 +64,14 @@ $CLICKHOUSE_CLIENT -q "
     settings enable_optimize_predicate_expression=0"
 
 echo "> one condition of filter should be pushed down after aggregating, other condition is casted"
-$CLICKHOUSE_CLIENT --enable_analyzer=0 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=0 -q "
     explain actions = 1 select s, y from (
         select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
     ) where y != 0 and s - 4
     settings enable_optimize_predicate_expression=0" |
     grep -o "Aggregating\|Filter column\|Filter column: notEquals(y, 0)\|FUNCTION and(minus(s, 4) :: 5, 1 :: 3) -> and(notEquals(y, 0), minus(s, 4))"
 echo "> (analyzer) one condition of filter should be pushed down after aggregating, other condition is casted"
-$CLICKHOUSE_CLIENT --enable_analyzer=1 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=1 -q "
     explain actions = 1 select s, y from (
         select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
     ) where y != 0 and s - 4
@@ -84,14 +84,14 @@ $CLICKHOUSE_CLIENT -q "
     settings enable_optimize_predicate_expression=0"
 
 echo "> one condition of filter should be pushed down after aggregating, other two conditions are ANDed"
-$CLICKHOUSE_CLIENT --enable_analyzer=0 --convert_query_to_cnf=0 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=0 --convert_query_to_cnf=0 -q "
     explain actions = 1 select s, y from (
         select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
     ) where y != 0 and s - 8 and s - 4
     settings enable_optimize_predicate_expression=0" |
     grep -o "Aggregating\|Filter column\|Filter column: notEquals(y, 0)\|FUNCTION and(minus(s, 8) :: 5, minus(s, 4) :: 2) -> and(notEquals(y, 0), minus(s, 8), minus(s, 4))"
 echo "> (analyzer) one condition of filter should be pushed down after aggregating, other two conditions are ANDed"
-$CLICKHOUSE_CLIENT --enable_analyzer=1 --convert_query_to_cnf=0 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=1 --convert_query_to_cnf=0 -q "
     explain actions = 1 select s, y from (
         select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
     ) where y != 0 and s - 8 and s - 4
@@ -104,14 +104,14 @@ $CLICKHOUSE_CLIENT -q "
     settings enable_optimize_predicate_expression=0"
 
 echo "> two conditions of filter should be pushed down after aggregating and ANDed, one condition is aliased"
-$CLICKHOUSE_CLIENT --enable_analyzer=0 --convert_query_to_cnf=0 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=0 --convert_query_to_cnf=0 -q "
     explain actions = 1 select s, y from (
         select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
     ) where y != 0 and s != 8 and y - 4
     settings enable_optimize_predicate_expression=0" |
     grep -o "Aggregating\|Filter column\|Filter column: and(notEquals(y, 0), minus(y, 4))\|ALIAS notEquals(s, 8) :: 4 -> and(notEquals(y, 0), notEquals(s, 8), minus(y, 4))"
 echo "> (analyzer) two conditions of filter should be pushed down after aggregating and ANDed, one condition is aliased"
-$CLICKHOUSE_CLIENT --enable_analyzer=1 --convert_query_to_cnf=0 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=1 --convert_query_to_cnf=0 -q "
     explain actions = 1 select s, y from (
         select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
     ) where y != 0 and s != 8 and y - 4
@@ -124,13 +124,13 @@ $CLICKHOUSE_CLIENT -q "
     settings enable_optimize_predicate_expression=0"
 
 echo "> filter is split, one part is filtered before ARRAY JOIN"
-$CLICKHOUSE_CLIENT --enable_analyzer=0  -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=0  -q "
     explain actions = 1 select x, y from (
         select range(number) as x, number + 1 as y from numbers(3)
     ) array join x where y != 2 and x != 0" |
     grep -o "Filter column: and(notEquals(y, 2), notEquals(x, 0))\|ARRAY JOIN x\|Filter column: notEquals(y, 2)"
 echo "> (analyzer) filter is split, one part is filtered before ARRAY JOIN"
-$CLICKHOUSE_CLIENT --enable_analyzer=1 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=1 -q "
     explain actions = 1 select x, y from (
         select range(number) as x, number + 1 as y from numbers(3)
     ) array join x where y != 2 and x != 0" |
@@ -154,14 +154,14 @@ $CLICKHOUSE_CLIENT -q "
 #     settings enable_optimize_predicate_expression=0"
 
 echo "> filter is pushed down before Distinct"
-$CLICKHOUSE_CLIENT --enable_analyzer=0 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=0 -q "
     explain actions = 1 select x, y from (
         select distinct x, y from (select number % 2 as x, number % 3 as y from numbers(10))
     ) where y != 2
     settings enable_optimize_predicate_expression=0" |
     grep -o "Distinct\|Filter column: notEquals(y, 2)"
 echo "> (analyzer) filter is pushed down before Distinct"
-$CLICKHOUSE_CLIENT --enable_analyzer=1 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=1 -q "
     explain actions = 1 select x, y from (
         select distinct x, y from (select number % 2 as x, number % 3 as y from numbers(10))
     ) where y != 2
@@ -174,14 +174,14 @@ $CLICKHOUSE_CLIENT -q "
     settings enable_optimize_predicate_expression=0"
 
 echo "> filter is pushed down before sorting steps"
-$CLICKHOUSE_CLIENT --enable_analyzer=0 --convert_query_to_cnf=0 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=0 --convert_query_to_cnf=0 -q "
     explain actions = 1 select x, y from (
         select number % 2 as x, number % 3 as y from numbers(6) order by y desc
     ) where x != 0 and y != 0
     settings enable_optimize_predicate_expression = 0" |
     grep -o "Sorting\|Filter column: and(notEquals(x, 0), notEquals(y, 0))"
 echo "> (analyzer) filter is pushed down before sorting steps"
-$CLICKHOUSE_CLIENT --enable_analyzer=1 --convert_query_to_cnf=0 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=1 --convert_query_to_cnf=0 -q "
     explain actions = 1 select x, y from (
         select number % 2 as x, number % 3 as y from numbers(6) order by y desc
     ) where x != 0 and y != 0
@@ -194,14 +194,14 @@ $CLICKHOUSE_CLIENT -q "
     settings enable_optimize_predicate_expression = 0"
 
 echo "> filter is pushed down before TOTALS HAVING and aggregating"
-$CLICKHOUSE_CLIENT --enable_analyzer=0 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=0 -q "
     explain actions = 1 select * from (
         select y, sum(x) from (select number as x, number % 4 as y from numbers(10)) group by y with totals
     ) where y != 2
     settings enable_optimize_predicate_expression=0" |
     grep -o "TotalsHaving\|Aggregating\|Filter column: notEquals(y, 2)"
 echo "> (analyzer) filter is pushed down before TOTALS HAVING and aggregating"
-$CLICKHOUSE_CLIENT --enable_analyzer=1 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=1 -q "
     explain actions = 1 select * from (
         select y, sum(x) from (select number as x, number % 4 as y from numbers(10)) group by y with totals
     ) where y != 2
@@ -224,14 +224,14 @@ $CLICKHOUSE_CLIENT -q "
     ) where number != 2 settings enable_optimize_predicate_expression=0"
 
 echo "> one condition of filter is pushed down before LEFT JOIN"
-$CLICKHOUSE_CLIENT --enable_analyzer=0 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=0 -q "
     explain actions = 1
     select number as a, r.b from numbers(4) as l any left join (
         select number + 2 as b from numbers(3)
     ) as r on a = r.b where a != 1 and b != 2 settings enable_optimize_predicate_expression = 0" |
     grep -o "Join\|Filter column: notEquals(number, 1)"
 echo "> (analyzer) one condition of filter is pushed down before LEFT JOIN"
-$CLICKHOUSE_CLIENT --enable_analyzer=1 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=1 -q "
     explain actions = 1
     select number as a, r.b from numbers(4) as l any left join (
         select number + 2 as b from numbers(3)
@@ -243,14 +243,14 @@ $CLICKHOUSE_CLIENT -q "
     ) as r on a = r.b where a != 1 and b != 2 settings enable_optimize_predicate_expression = 0" | sort
 
 echo "> one condition of filter is pushed down before INNER JOIN"
-$CLICKHOUSE_CLIENT --enable_analyzer=0 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=0 -q "
     explain actions = 1
     select number as a, r.b from numbers(4) as l any inner join (
         select number + 2 as b from numbers(3)
     ) as r on a = r.b where a != 1 and b != 2 settings enable_optimize_predicate_expression = 0" |
     grep -o "Join\|Filter column: and(notEquals(number, 1), notEquals(number, 2))\|Filter column: and(notEquals(b, 2), notEquals(b, 1))"
 echo "> (analyzer) one condition of filter is pushed down before INNER JOIN"
-$CLICKHOUSE_CLIENT --enable_analyzer=1 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=1 -q "
     explain actions = 1
     select number as a, r.b from numbers(4) as l any inner join (
         select number + 2 as b from numbers(3)
@@ -274,12 +274,12 @@ $CLICKHOUSE_CLIENT -q "
 
 echo "> function calculation should be done after sorting and limit (if possible)"
 echo "> Expression should be divided into two subexpressions and only one of them should be moved after Sorting"
-$CLICKHOUSE_CLIENT --enable_analyzer=0 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=0 -q "
     explain actions = 1 select number as n, sipHash64(n) from numbers(100) order by number + 1 limit 5" |
     sed 's/^ *//g' | grep -o "^ *\(Expression (.*Before ORDER BY.*)\|Sorting\|FUNCTION \w\+\)"
 echo "> (analyzer) function calculation should be done after sorting and limit (if possible)"
 echo "> Expression should be divided into two subexpressions and only one of them should be moved after Sorting"
-$CLICKHOUSE_CLIENT --enable_analyzer=1 -q "
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=1 -q "
     explain actions = 1 select number as n, sipHash64(n) from numbers(100) order by number + 1 limit 5" |
     sed 's/^ *//g' | grep -o "^ *\(Expression (.*Before ORDER BY.*)\|Sorting\|FUNCTION \w\+\)"
 echo "> this query should be executed without throwing an exception"
diff --git a/tests/queries/0_stateless/01655_plan_optimizations_merge_filters.sql b/tests/queries/0_stateless/01655_plan_optimizations_merge_filters.sql
index c6620184a43..2193fc7a8f4 100644
--- a/tests/queries/0_stateless/01655_plan_optimizations_merge_filters.sql
+++ b/tests/queries/0_stateless/01655_plan_optimizations_merge_filters.sql
@@ -1,7 +1,7 @@
 set query_plan_merge_filters=1;
 
-set enable_analyzer=1;
+set allow_experimental_analyzer=1;
 select explain from (explain actions = 1 select * from (select sum(number) as v, bitAnd(number, 15) as key from numbers(1e8) group by key having v != 0) where key = 7) where explain like '%Filter%' or explain like '%Aggregating%';
 
-set enable_analyzer=0;
+set allow_experimental_analyzer=0;
 select explain from (explain actions = 1 select * from (select sum(number) as v, bitAnd(number, 15) as key from numbers(1e8) group by key having v != 0) where key = 7) where explain like '%Filter%' or explain like '%Aggregating%';
diff --git a/tests/queries/0_stateless/01655_plan_optimizations_optimize_read_in_window_order.reference b/tests/queries/0_stateless/01655_plan_optimizations_optimize_read_in_window_order.reference
index c8b3c5ca954..7c2753124b3 100644
--- a/tests/queries/0_stateless/01655_plan_optimizations_optimize_read_in_window_order.reference
+++ b/tests/queries/0_stateless/01655_plan_optimizations_optimize_read_in_window_order.reference
@@ -1,23 +1,23 @@
 Partial sorting plan
   optimize_read_in_window_order=0
     Sort description: n ASC, x ASC
-  optimize_read_in_window_order=0, enable_analyzer=1
+  optimize_read_in_window_order=0, allow_experimental_analyzer=1
     Sort description: n ASC, x ASC
   optimize_read_in_window_order=1
     Prefix sort description: n ASC
     Result sort description: n ASC, x ASC
-  optimize_read_in_window_order=1, enable_analyzer=1
+  optimize_read_in_window_order=1, allow_experimental_analyzer=1
     Prefix sort description: __table1.n ASC
     Result sort description: __table1.n ASC, __table1.x ASC
 No sorting plan
   optimize_read_in_window_order=0
     Sort description: n ASC, x ASC
-  optimize_read_in_window_order=0, enable_analyzer=1
+  optimize_read_in_window_order=0, allow_experimental_analyzer=1
     Sort description: __table1.n ASC, __table1.x ASC
   optimize_read_in_window_order=1
     Prefix sort description: n ASC, x ASC
     Result sort description: n ASC, x ASC
-  optimize_read_in_window_order=1, enable_analyzer=1
+  optimize_read_in_window_order=1, allow_experimental_analyzer=1
     Prefix sort description: __table1.n ASC, __table1.x ASC
     Result sort description: __table1.n ASC, __table1.x ASC
 Complex ORDER BY
diff --git a/tests/queries/0_stateless/01655_plan_optimizations_optimize_read_in_window_order.sh b/tests/queries/0_stateless/01655_plan_optimizations_optimize_read_in_window_order.sh
index d74ea328d04..24c8cf5052e 100755
--- a/tests/queries/0_stateless/01655_plan_optimizations_optimize_read_in_window_order.sh
+++ b/tests/queries/0_stateless/01655_plan_optimizations_optimize_read_in_window_order.sh
@@ -19,25 +19,25 @@ $CLICKHOUSE_CLIENT -q "optimize table ${name}_n_x final"
 
 echo 'Partial sorting plan'
 echo '  optimize_read_in_window_order=0'
-$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n SETTINGS optimize_read_in_order=0,optimize_read_in_window_order=0,enable_analyzer=0" | grep -i "sort description"
-echo '  optimize_read_in_window_order=0, enable_analyzer=1'
-$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n SETTINGS optimize_read_in_order=0,optimize_read_in_window_order=0,enable_analyzer=0" | grep -i "sort description"
+$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n SETTINGS optimize_read_in_order=0,optimize_read_in_window_order=0,allow_experimental_analyzer=0" | grep -i "sort description"
+echo '  optimize_read_in_window_order=0, allow_experimental_analyzer=1'
+$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n SETTINGS optimize_read_in_order=0,optimize_read_in_window_order=0,allow_experimental_analyzer=0" | grep -i "sort description"
 
 echo '  optimize_read_in_window_order=1'
-$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n SETTINGS optimize_read_in_order=1,enable_analyzer=0" | grep -i "sort description"
-echo '  optimize_read_in_window_order=1, enable_analyzer=1'
-$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n SETTINGS optimize_read_in_order=1,enable_analyzer=1" | grep -i "sort description"
+$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n SETTINGS optimize_read_in_order=1,allow_experimental_analyzer=0" | grep -i "sort description"
+echo '  optimize_read_in_window_order=1, allow_experimental_analyzer=1'
+$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n SETTINGS optimize_read_in_order=1,allow_experimental_analyzer=1" | grep -i "sort description"
 
 echo 'No sorting plan'
 echo '  optimize_read_in_window_order=0'
-$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n_x SETTINGS optimize_read_in_order=0,optimize_read_in_window_order=0,enable_analyzer=0" | grep -i "sort description"
-echo '  optimize_read_in_window_order=0, enable_analyzer=1'
-$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n_x SETTINGS optimize_read_in_order=0,optimize_read_in_window_order=0,enable_analyzer=1" | grep -i "sort description"
+$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n_x SETTINGS optimize_read_in_order=0,optimize_read_in_window_order=0,allow_experimental_analyzer=0" | grep -i "sort description"
+echo '  optimize_read_in_window_order=0, allow_experimental_analyzer=1'
+$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n_x SETTINGS optimize_read_in_order=0,optimize_read_in_window_order=0,allow_experimental_analyzer=1" | grep -i "sort description"
 
 echo '  optimize_read_in_window_order=1'
-$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n_x SETTINGS optimize_read_in_order=1,enable_analyzer=0" | grep -i "sort description"
-echo '  optimize_read_in_window_order=1, enable_analyzer=1'
-$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n_x SETTINGS optimize_read_in_order=1,enable_analyzer=1" | grep -i "sort description"
+$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n_x SETTINGS optimize_read_in_order=1,allow_experimental_analyzer=0" | grep -i "sort description"
+echo '  optimize_read_in_window_order=1, allow_experimental_analyzer=1'
+$CLICKHOUSE_CLIENT -q "explain plan actions=1, description=1 select n, sum(x) OVER (ORDER BY n, x ROWS BETWEEN 100 PRECEDING AND CURRENT ROW) from ${name}_n_x SETTINGS optimize_read_in_order=1,allow_experimental_analyzer=1" | grep -i "sort description"
 
 echo 'Complex ORDER BY'
 $CLICKHOUSE_CLIENT -q "CREATE TABLE ${name}_complex (unique1 Int32, unique2 Int32, ten Int32) ENGINE=MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192"
diff --git a/tests/queries/0_stateless/01656_test_query_log_factories_info.reference b/tests/queries/0_stateless/01656_test_query_log_factories_info.reference
index 44531c19ab7..47b3133ceca 100644
--- a/tests/queries/0_stateless/01656_test_query_log_factories_info.reference
+++ b/tests/queries/0_stateless/01656_test_query_log_factories_info.reference
@@ -17,7 +17,7 @@ used_functions
 ['repeat']
 
 arraySort(used_data_type_families)
-['Int32','Nullable','String']
+['Array','Int32','Nullable','String']
 
 used_database_engines
 ['Atomic']
diff --git a/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh b/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
index ceb6aa060ea..685fe69642a 100755
--- a/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
+++ b/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
@@ -24,7 +24,7 @@ ${CLICKHOUSE_CLIENT} --query "select file('a.txt'), file('b.txt');";echo ":"$?
 ${CLICKHOUSE_CLIENT} --query "insert into data select file('a.txt'), file('b.txt');";echo ":"$?
 ${CLICKHOUSE_CLIENT} --query "insert into data select file('a.txt'), file('b.txt');";echo ":"$?
 ${CLICKHOUSE_CLIENT} --query "select file('c.txt'), * from data";echo ":"$?
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} --multiquery --query "
     create table filenames(name String) engine=MergeTree() order by tuple();
     insert into filenames values ('a.txt'), ('b.txt'), ('c.txt');
     select file(name) from filenames format TSV;
@@ -56,7 +56,7 @@ echo $c_count
 
 # Valid cases:
 # The default dir is the CWD path in LOCAL mode
-${CLICKHOUSE_LOCAL} --query "
+${CLICKHOUSE_LOCAL} --multiquery --query "
     drop table if exists data;
     create table data (A String, B String) engine=MergeTree() order by A;
     select file('a.txt'), file('b.txt');
diff --git a/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh b/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh
index ec318db98bf..e04c9515009 100755
--- a/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh
+++ b/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh
@@ -8,7 +8,7 @@ function wait_for_query_to_start() {
     while [[ $($CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" -d "SELECT sum(read_rows) FROM system.processes WHERE query_id = '$1'") == 0 ]]; do sleep 0.1; done
 }
 
-${CLICKHOUSE_CLIENT} --multiline --query "
+${CLICKHOUSE_CLIENT} --multiline --multiquery --query "
 drop table if exists simple;
 
 create table simple (i int, j int) engine = MergeTree order by i
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 a2153bf0093..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,5 +1,5 @@
 SET output_format_pretty_color=1;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS table1;
 DROP TABLE IF EXISTS table2;
diff --git a/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.python b/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.python
index f363cb64018..9072dfeb09f 100644
--- a/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.python
+++ b/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.python
@@ -10,38 +10,18 @@ DEBUG_LOG = os.path.join(
     os.path.basename(os.path.abspath(__file__)).strip(".python") + ".debuglog",
 )
 
-STATE_MAP = {
-    -1: "process did not start",
-    0: "completion was found",
-    1: "process started and said ':)'",
-    2: "completion search was started",
-    3: "completion is missing",
-}
-
 
 def run_with_timeout(func, args, timeout):
-    for _ in range(5):
-        state = multiprocessing.Value("i", -1)
-        process = multiprocessing.Process(
-            target=func, args=args, kwargs={"state": state}
-        )
-        process.start()
-        process.join(timeout)
+    process = multiprocessing.Process(target=func, args=args)
+    process.start()
+    process.join(timeout)
 
-        if state.value in (0, 3):
-            return
-
-        if process.is_alive():
-            process.terminate()
-
-            if state.value == -1:
-                continue
-
-            print(f"Timeout, state: {STATE_MAP[state.value]}")
-            return
+    if process.is_alive():
+        process.terminate()
+        print("Timeout")
 
 
-def test_completion(program, argv, comp_word, state=None):
+def test_completion(program, argv, comp_word):
     comp_begin = comp_word[:-3]
 
     shell_pid, master = pty.fork()
@@ -61,8 +41,6 @@ def test_completion(program, argv, comp_word, state=None):
                 debug_log_fd.write(repr(output_b) + "\n")
                 debug_log_fd.flush()
 
-            state.value = 1
-
             os.write(master, b"SET " + bytes(comp_begin.encode()))
             output_b = os.read(master, 4096)
             output = output_b.decode()
@@ -77,28 +55,23 @@ def test_completion(program, argv, comp_word, state=None):
             time.sleep(0.01)
             os.write(master, b"\t")
 
-            state.value = 2
-
             output_b = os.read(master, 4096)
             output = output_b.decode()
             debug_log_fd.write(repr(output_b) + "\n")
             debug_log_fd.flush()
+            # fail fast if there is a bell character in the output,
+            # meaning no concise completion is found
+            if "\x07" in output:
+                print(f"{comp_word}: FAIL")
+                return
 
             while not comp_word in output:
-                # fail fast if there is a bell character in the output,
-                # meaning no concise completion is found
-                if "\x07" in output:
-                    print(f"{comp_word}: FAIL")
-                    state.value = 3
-                    return
-
                 output_b = os.read(master, 4096)
                 output += output_b.decode()
                 debug_log_fd.write(repr(output_b) + "\n")
                 debug_log_fd.flush()
 
             print(f"{comp_word}: OK")
-            state.value = 0
         finally:
             os.close(master)
             debug_log_fd.close()
diff --git a/tests/queries/0_stateless/01676_range_hashed_dictionary.sql b/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
index ba2a9eba87f..430f3a86dc1 100644
--- a/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
+++ b/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
@@ -1,4 +1,10 @@
-CREATE TABLE date_table
+-- Tags: no-parallel
+
+DROP DATABASE IF EXISTS database_for_range_dict;
+
+CREATE DATABASE database_for_range_dict;
+
+CREATE TABLE database_for_range_dict.date_table
 (
   CountryID UInt64,
   StartDate Date,
@@ -8,11 +14,11 @@ CREATE TABLE date_table
 ENGINE = MergeTree()
 ORDER BY CountryID;
 
-INSERT INTO date_table VALUES(1, toDate('2019-05-05'), toDate('2019-05-20'), 0.33);
-INSERT INTO date_table VALUES(1, toDate('2019-05-21'), toDate('2019-05-30'), 0.42);
-INSERT INTO date_table VALUES(2, toDate('2019-05-21'), toDate('2019-05-30'), 0.46);
+INSERT INTO database_for_range_dict.date_table VALUES(1, toDate('2019-05-05'), toDate('2019-05-20'), 0.33);
+INSERT INTO database_for_range_dict.date_table VALUES(1, toDate('2019-05-21'), toDate('2019-05-30'), 0.42);
+INSERT INTO database_for_range_dict.date_table VALUES(2, toDate('2019-05-21'), toDate('2019-05-30'), 0.46);
 
-CREATE DICTIONARY range_dictionary
+CREATE DICTIONARY database_for_range_dict.range_dictionary
 (
   CountryID UInt64,
   StartDate Date,
@@ -20,7 +26,7 @@ CREATE DICTIONARY range_dictionary
   Tax Float64 DEFAULT 0.2
 )
 PRIMARY KEY CountryID
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'date_table' DB currentDatabase()))
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'date_table' DB 'database_for_range_dict'))
 LIFETIME(MIN 1 MAX 1000)
 LAYOUT(RANGE_HASHED())
 RANGE(MIN StartDate MAX EndDate)
@@ -29,30 +35,30 @@ SETTINGS(dictionary_use_async_executor=1, max_threads=8)
 
 SELECT 'Dictionary not nullable';
 SELECT 'dictGet';
-SELECT dictGet('range_dictionary', 'Tax', toUInt64(1), toDate('2019-05-15'));
-SELECT dictGet('range_dictionary', 'Tax', toUInt64(1), toDate('2019-05-29'));
-SELECT dictGet('range_dictionary', 'Tax', toUInt64(2), toDate('2019-05-29'));
-SELECT dictGet('range_dictionary', 'Tax', toUInt64(2), toDate('2019-05-31'));
-SELECT dictGetOrDefault('range_dictionary', 'Tax', toUInt64(2), toDate('2019-05-31'), 0.4);
+SELECT dictGet('database_for_range_dict.range_dictionary', 'Tax', toUInt64(1), toDate('2019-05-15'));
+SELECT dictGet('database_for_range_dict.range_dictionary', 'Tax', toUInt64(1), toDate('2019-05-29'));
+SELECT dictGet('database_for_range_dict.range_dictionary', 'Tax', toUInt64(2), toDate('2019-05-29'));
+SELECT dictGet('database_for_range_dict.range_dictionary', 'Tax', toUInt64(2), toDate('2019-05-31'));
+SELECT dictGetOrDefault('database_for_range_dict.range_dictionary', 'Tax', toUInt64(2), toDate('2019-05-31'), 0.4);
 SELECT 'dictHas';
-SELECT dictHas('range_dictionary', toUInt64(1), toDate('2019-05-15'));
-SELECT dictHas('range_dictionary', toUInt64(1), toDate('2019-05-29'));
-SELECT dictHas('range_dictionary', toUInt64(2), toDate('2019-05-29'));
-SELECT dictHas('range_dictionary', toUInt64(2), toDate('2019-05-31'));
+SELECT dictHas('database_for_range_dict.range_dictionary', toUInt64(1), toDate('2019-05-15'));
+SELECT dictHas('database_for_range_dict.range_dictionary', toUInt64(1), toDate('2019-05-29'));
+SELECT dictHas('database_for_range_dict.range_dictionary', toUInt64(2), toDate('2019-05-29'));
+SELECT dictHas('database_for_range_dict.range_dictionary', toUInt64(2), toDate('2019-05-31'));
 SELECT 'select columns from dictionary';
 SELECT 'allColumns';
-SELECT * FROM range_dictionary ORDER BY CountryID, StartDate, EndDate;
+SELECT * FROM database_for_range_dict.range_dictionary ORDER BY CountryID, StartDate, EndDate;
 SELECT 'noColumns';
-SELECT 1 FROM range_dictionary ORDER BY CountryID, StartDate, EndDate;
+SELECT 1 FROM database_for_range_dict.range_dictionary ORDER BY CountryID, StartDate, EndDate;
 SELECT 'onlySpecificColumns';
-SELECT CountryID, StartDate, Tax FROM range_dictionary ORDER BY CountryID, StartDate, EndDate;
+SELECT CountryID, StartDate, Tax FROM database_for_range_dict.range_dictionary ORDER BY CountryID, StartDate, EndDate;
 SELECT 'onlySpecificColumn';
-SELECT Tax FROM range_dictionary ORDER BY CountryID, StartDate, EndDate;
+SELECT Tax FROM database_for_range_dict.range_dictionary ORDER BY CountryID, StartDate, EndDate;
 
-DROP DICTIONARY range_dictionary;
-DROP TABLE date_table;
+DROP DICTIONARY database_for_range_dict.range_dictionary;
+DROP TABLE database_for_range_dict.date_table;
 
-CREATE TABLE date_table
+CREATE TABLE database_for_range_dict.date_table
 (
   CountryID UInt64,
   StartDate Date,
@@ -62,11 +68,11 @@ CREATE TABLE date_table
 ENGINE = MergeTree()
 ORDER BY CountryID;
 
-INSERT INTO date_table VALUES(1, toDate('2019-05-05'), toDate('2019-05-20'), 0.33);
-INSERT INTO date_table VALUES(1, toDate('2019-05-21'), toDate('2019-05-30'), 0.42);
-INSERT INTO date_table VALUES(2, toDate('2019-05-21'), toDate('2019-05-30'), NULL);
+INSERT INTO database_for_range_dict.date_table VALUES(1, toDate('2019-05-05'), toDate('2019-05-20'), 0.33);
+INSERT INTO database_for_range_dict.date_table VALUES(1, toDate('2019-05-21'), toDate('2019-05-30'), 0.42);
+INSERT INTO database_for_range_dict.date_table VALUES(2, toDate('2019-05-21'), toDate('2019-05-30'), NULL);
 
-CREATE DICTIONARY range_dictionary_nullable
+CREATE DICTIONARY database_for_range_dict.range_dictionary_nullable
 (
   CountryID UInt64,
   StartDate Date,
@@ -74,33 +80,35 @@ CREATE DICTIONARY range_dictionary_nullable
   Tax Nullable(Float64) DEFAULT 0.2
 )
 PRIMARY KEY CountryID
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'date_table' DB currentDatabase()))
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'date_table' DB 'database_for_range_dict'))
 LIFETIME(MIN 1 MAX 1000)
 LAYOUT(RANGE_HASHED())
 RANGE(MIN StartDate MAX EndDate);
 
 SELECT 'Dictionary nullable';
 SELECT 'dictGet';
-SELECT dictGet('range_dictionary_nullable', 'Tax', toUInt64(1), toDate('2019-05-15'));
-SELECT dictGet('range_dictionary_nullable', 'Tax', toUInt64(1), toDate('2019-05-29'));
-SELECT dictGet('range_dictionary_nullable', 'Tax', toUInt64(2), toDate('2019-05-29'));
-SELECT dictGet('range_dictionary_nullable', 'Tax', toUInt64(2), toDate('2019-05-31'));
-SELECT dictGetOrDefault('range_dictionary_nullable', 'Tax', toUInt64(2), toDate('2019-05-31'), 0.4);
+SELECT dictGet('database_for_range_dict.range_dictionary_nullable', 'Tax', toUInt64(1), toDate('2019-05-15'));
+SELECT dictGet('database_for_range_dict.range_dictionary_nullable', 'Tax', toUInt64(1), toDate('2019-05-29'));
+SELECT dictGet('database_for_range_dict.range_dictionary_nullable', 'Tax', toUInt64(2), toDate('2019-05-29'));
+SELECT dictGet('database_for_range_dict.range_dictionary_nullable', 'Tax', toUInt64(2), toDate('2019-05-31'));
+SELECT dictGetOrDefault('database_for_range_dict.range_dictionary_nullable', 'Tax', toUInt64(2), toDate('2019-05-31'), 0.4);
 SELECT 'dictHas';
-SELECT dictHas('range_dictionary_nullable', toUInt64(1), toDate('2019-05-15'));
-SELECT dictHas('range_dictionary_nullable', toUInt64(1), toDate('2019-05-29'));
-SELECT dictHas('range_dictionary_nullable', toUInt64(2), toDate('2019-05-29'));
-SELECT dictHas('range_dictionary_nullable', toUInt64(2), toDate('2019-05-31'));
+SELECT dictHas('database_for_range_dict.range_dictionary_nullable', toUInt64(1), toDate('2019-05-15'));
+SELECT dictHas('database_for_range_dict.range_dictionary_nullable', toUInt64(1), toDate('2019-05-29'));
+SELECT dictHas('database_for_range_dict.range_dictionary_nullable', toUInt64(2), toDate('2019-05-29'));
+SELECT dictHas('database_for_range_dict.range_dictionary_nullable', toUInt64(2), toDate('2019-05-31'));
 SELECT 'select columns from dictionary';
 SELECT 'allColumns';
-SELECT * FROM range_dictionary_nullable ORDER BY CountryID, StartDate, EndDate;
+SELECT * FROM database_for_range_dict.range_dictionary_nullable ORDER BY CountryID, StartDate, EndDate;
 SELECT 'noColumns';
-SELECT 1 FROM range_dictionary_nullable ORDER BY CountryID, StartDate, EndDate;
+SELECT 1 FROM database_for_range_dict.range_dictionary_nullable ORDER BY CountryID, StartDate, EndDate;
 SELECT 'onlySpecificColumns';
-SELECT CountryID, StartDate, Tax FROM range_dictionary_nullable ORDER BY CountryID, StartDate, EndDate;
+SELECT CountryID, StartDate, Tax FROM database_for_range_dict.range_dictionary_nullable ORDER BY CountryID, StartDate, EndDate;
 SELECT 'onlySpecificColumn';
-SELECT Tax FROM range_dictionary_nullable ORDER BY CountryID, StartDate, EndDate;
+SELECT Tax FROM database_for_range_dict.range_dictionary_nullable ORDER BY CountryID, StartDate, EndDate;
 
-DROP DICTIONARY range_dictionary_nullable;
-DROP TABLE date_table;
+DROP DICTIONARY database_for_range_dict.range_dictionary_nullable;
+DROP TABLE database_for_range_dict.date_table;
+
+DROP DATABASE database_for_range_dict;
 
diff --git a/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh b/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh
index 6a7eb975c87..0e5c2862066 100755
--- a/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh
+++ b/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     DROP DATABASE IF EXISTS 01684_database_for_cache_dictionary;
     CREATE DATABASE 01684_database_for_cache_dictionary;
 
diff --git a/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh b/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh
index c2d222a86ea..5583a9dd5e7 100755
--- a/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh
+++ b/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh
@@ -1,11 +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="
-    CREATE TABLE complex_key_simple_attributes_source_table
+$CLICKHOUSE_CLIENT -n --query="
+    DROP DATABASE IF EXISTS 01685_database_for_cache_dictionary;
+    CREATE DATABASE 01685_database_for_cache_dictionary;
+
+    CREATE TABLE 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table
     (
     id UInt64,
     id_key String,
@@ -14,11 +18,11 @@ $CLICKHOUSE_CLIENT --query="
     )
     ENGINE = TinyLog;
 
-    INSERT INTO complex_key_simple_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
-    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');
+    INSERT INTO 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
+    INSERT INTO 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table VALUES(1, 'id_key_1', 'value_1', 'value_second_1');
+    INSERT INTO 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
 
-    CREATE DICTIONARY cache_dictionary_complex_key_simple_attributes
+    CREATE DICTIONARY 01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes
     (
     id UInt64,
     id_key String,
@@ -26,32 +30,32 @@ $CLICKHOUSE_CLIENT --query="
     value_second String DEFAULT 'value_second_default'
     )
     PRIMARY KEY id, id_key
-    SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'complex_key_simple_attributes_source_table' DB '${CLICKHOUSE_DATABASE}'))
+    SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'complex_key_simple_attributes_source_table' DB '01685_database_for_cache_dictionary'))
     LIFETIME(MIN 1 MAX 1000)
-    LAYOUT(COMPLEX_KEY_SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '$USER_FILES_PATH/${CLICKHOUSE_DATABASE}_dic'));
+    LAYOUT(COMPLEX_KEY_SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '$USER_FILES_PATH/0d'));
 
     SELECT 'Dictionary cache_dictionary_complex_key_simple_attributes';
     SELECT 'dictGet existing value';
-    SELECT dictGet('cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
-        dictGet('cache_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 3;
+    SELECT dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+        dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 3;
     SELECT 'dictGet with non existing value';
-    SELECT dictGet('cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
-        dictGet('cache_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 4;
+    SELECT dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+        dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 4;
     SELECT 'dictGetOrDefault existing value';
-    SELECT dictGetOrDefault('cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
-        dictGetOrDefault('cache_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 3;
+    SELECT dictGetOrDefault('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+        dictGetOrDefault('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 3;
     SELECT 'dictGetOrDefault non existing value';
-    SELECT dictGetOrDefault('cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
-        dictGetOrDefault('cache_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 4;
+    SELECT dictGetOrDefault('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+        dictGetOrDefault('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 4;
     SELECT 'dictHas';
-    SELECT dictHas('cache_dictionary_complex_key_simple_attributes', (number, concat('id_key_', toString(number)))) FROM system.numbers LIMIT 4;
+    SELECT dictHas('01685_database_for_cache_dictionary.cache_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 cache_dictionary_complex_key_simple_attributes ORDER BY id;
+    SELECT * FROM 01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes ORDER BY id;
 
-    DROP DICTIONARY cache_dictionary_complex_key_simple_attributes;
-    DROP TABLE complex_key_simple_attributes_source_table;
+    DROP DICTIONARY 01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes;
+    DROP TABLE 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table;
 
-    CREATE TABLE complex_key_complex_attributes_source_table
+    CREATE TABLE 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table
     (
     id UInt64,
     id_key String,
@@ -60,11 +64,11 @@ $CLICKHOUSE_CLIENT --query="
     )
     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 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
+    INSERT INTO 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table VALUES(1, 'id_key_1', 'value_1', NULL);
+    INSERT INTO 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
 
-    CREATE DICTIONARY cache_dictionary_complex_key_complex_attributes
+    CREATE DICTIONARY 01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes
     (
         id UInt64,
         id_key String,
@@ -73,28 +77,29 @@ $CLICKHOUSE_CLIENT --query="
         value_second Nullable(String) DEFAULT 'value_second_default'
     )
     PRIMARY KEY id, id_key
-    SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'complex_key_complex_attributes_source_table' DB '${CLICKHOUSE_DATABASE}'))
+    SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'complex_key_complex_attributes_source_table' DB '01685_database_for_cache_dictionary'))
     LIFETIME(MIN 1 MAX 1000)
     LAYOUT(COMPLEX_KEY_SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '$USER_FILES_PATH/1d'));
 
     SELECT 'Dictionary cache_dictionary_complex_key_complex_attributes';
     SELECT 'dictGet existing value';
-    SELECT dictGet('cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
-        dictGet('cache_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 3;
+    SELECT dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+        dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 3;
     SELECT 'dictGet with non existing value';
-    SELECT dictGet('cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
-        dictGet('cache_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 4;
+    SELECT dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+        dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 4;
     SELECT 'dictGetOrDefault existing value';
-    SELECT dictGetOrDefault('cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
-        dictGetOrDefault('cache_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 3;
+    SELECT dictGetOrDefault('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+        dictGetOrDefault('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 3;
     SELECT 'dictGetOrDefault non existing value';
-    SELECT dictGetOrDefault('cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
-        dictGetOrDefault('cache_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 4;
+    SELECT dictGetOrDefault('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+        dictGetOrDefault('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 4;
     SELECT 'dictHas';
-    SELECT dictHas('cache_dictionary_complex_key_complex_attributes', (number, concat('id_key_', toString(number)))) FROM system.numbers LIMIT 4;
+    SELECT dictHas('01685_database_for_cache_dictionary.cache_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 cache_dictionary_complex_key_complex_attributes ORDER BY id;
+    SELECT * FROM 01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes ORDER BY id;
 
-    DROP DICTIONARY cache_dictionary_complex_key_complex_attributes;
-    DROP TABLE complex_key_complex_attributes_source_table;
-"
+    DROP DICTIONARY 01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes;
+    DROP TABLE 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table;
+
+    DROP DATABASE 01685_database_for_cache_dictionary;"
diff --git a/tests/queries/0_stateless/01691_parser_data_type_exponential.sh b/tests/queries/0_stateless/01691_parser_data_type_exponential.sh
index 5d115e09a79..f8004f9350d 100755
--- a/tests/queries/0_stateless/01691_parser_data_type_exponential.sh
+++ b/tests/queries/0_stateless/01691_parser_data_type_exponential.sh
@@ -5,4 +5,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 # Check that DataType parser does not have exponential complexity in the case found by fuzzer.
-for _ in {1..10}; do ${CLICKHOUSE_CLIENT} --query "SELECT CAST(1 AS A2222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateFuncpion(groupBitmapp, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222223ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateFuncpion(groupBitmap, 00000000000000000000000000000000000000000000000000000000000000000000000000000001841416382, 222222222222222ggregateFuncpion(groupBitmap22222222222222222222222222222222222222222222222222220000000000000000000000000000000000000000000000000000000000000000000000000000002260637443813394204222222222222222222ggregateFuncpion(groupBitmapp, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222223ggregateFuncpio22222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222222ggregateFuncpion(groupBitmap2222222222222ggregateFuncpion(groupBitmapp, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222223ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggre222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 22222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 2222222222222eFuncpion(groupBitmap, 00000000000000000000000000000000000000000000000000000000000000000000000000000001841416382, 222222222222222ggregateFuncpion(groupBitmap22222222222222222222222222222222222222222222222222222222222222222222222200000000000000000000178859639454016722222222222222222222222222222222222222222222222222222222222ggregateFuncpion(groupBitmapp, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222223ggregateFuncpio22222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateFuncpion(groupBitmapp, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222223ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateFuncpion(groupBitmap, 00000000000000000000000000000000000000000000000000000000000000000000000000000001841416382, 222222222222222ggregateFuncpion(groupBitmap22222222222222222222222222222222222222222222222222222222222222222222222200000000000000000000178859639454016722222222222222222222222222222222222222222222222222222222222ggregateFuncpion(groupBitmapp, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222223ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateFuncpion(groupBitmap, 22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222, 222222222222222ggregateFuncpion(groupBitmap222222222222222222222222222222222222222222222222222222222222222222222222000000000000000000001788596394540167623222222222222222222ggregateFu22222222222222222222222222222222222, UInt33)); -- { clientError 62 }"; done
+for _ in {1..10}; do ${CLICKHOUSE_CLIENT} -n --query "SELECT CAST(1 AS A2222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateFuncpion(groupBitmapp, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222223ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateFuncpion(groupBitmap, 00000000000000000000000000000000000000000000000000000000000000000000000000000001841416382, 222222222222222ggregateFuncpion(groupBitmap22222222222222222222222222222222222222222222222222220000000000000000000000000000000000000000000000000000000000000000000000000000002260637443813394204222222222222222222ggregateFuncpion(groupBitmapp, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222223ggregateFuncpio22222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222222ggregateFuncpion(groupBitmap2222222222222ggregateFuncpion(groupBitmapp, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222223ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggre222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 22222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 2222222222222eFuncpion(groupBitmap, 00000000000000000000000000000000000000000000000000000000000000000000000000000001841416382, 222222222222222ggregateFuncpion(groupBitmap22222222222222222222222222222222222222222222222222222222222222222222222200000000000000000000178859639454016722222222222222222222222222222222222222222222222222222222222ggregateFuncpion(groupBitmapp, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222223ggregateFuncpio22222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateFuncpion(groupBitmapp, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222223ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateFuncpion(groupBitmap, 00000000000000000000000000000000000000000000000000000000000000000000000000000001841416382, 222222222222222ggregateFuncpion(groupBitmap22222222222222222222222222222222222222222222222222222222222222222222222200000000000000000000178859639454016722222222222222222222222222222222222222222222222222222222222ggregateFuncpion(groupBitmapp, 222222222222222ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateF222222222222222222222222222222222222222222222222222222222teFuncpion(groupBitmap, 222222222222223ggregateFuncpion(groupBitmap2222222222222222222222222222222222222222222222222222222222222222222222ggregateFuncpion(groupBitmap, 22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222, 222222222222222ggregateFuncpion(groupBitmap222222222222222222222222222222222222222222222222222222222222222222222222000000000000000000001788596394540167623222222222222222222ggregateFu22222222222222222222222222222222222, UInt33)); -- { clientError 62 }"; done
diff --git a/tests/queries/0_stateless/01710_aggregate_projection_with_normalized_states.reference b/tests/queries/0_stateless/01710_aggregate_projection_with_normalized_states.reference
index 37993873983..25aa9dc5dec 100644
--- a/tests/queries/0_stateless/01710_aggregate_projection_with_normalized_states.reference
+++ b/tests/queries/0_stateless/01710_aggregate_projection_with_normalized_states.reference
@@ -1,3 +1,2 @@
 3
 950	990	500	2000
-[950]	[999]
diff --git a/tests/queries/0_stateless/01710_aggregate_projection_with_normalized_states.sql b/tests/queries/0_stateless/01710_aggregate_projection_with_normalized_states.sql
index 956bf3711a2..e023c0991b3 100644
--- a/tests/queries/0_stateless/01710_aggregate_projection_with_normalized_states.sql
+++ b/tests/queries/0_stateless/01710_aggregate_projection_with_normalized_states.sql
@@ -9,8 +9,7 @@ CREATE TABLE r (
      s Int64,
      PROJECTION p
          (SELECT a, quantilesTimingMerge(0.5, 0.95, 0.99)(q), sum(s) GROUP BY a)
-) Engine=SummingMergeTree order by (x, a)
-SETTINGS deduplicate_merge_projection_mode = 'drop';  -- should set it to rebuild once projection is supported with SummingMergeTree
+) Engine=SummingMergeTree order by (x, a);
 
 insert into r
 select number%100 x,
@@ -29,6 +28,4 @@ FROM cluster('test_cluster_two_shards', currentDatabase(), r)
 WHERE a = 'x'
 settings prefer_localhost_replica=0;
 
-SELECT quantilesTimingMerge(0.95)(q), quantilesTimingMerge(toInt64(1))(q) FROM remote('127.0.0.{1,2}', currentDatabase(), r);
-
 DROP TABLE r;
diff --git a/tests/queries/0_stateless/01710_projection_vertical_merges.sql b/tests/queries/0_stateless/01710_projection_vertical_merges.sql
index 8835787e7be..0f80d659e92 100644
--- a/tests/queries/0_stateless/01710_projection_vertical_merges.sql
+++ b/tests/queries/0_stateless/01710_projection_vertical_merges.sql
@@ -1,5 +1,4 @@
--- Tags: long, no-parallel, no-msan, no-tsan, no-asan
--- set no-parallel and no sanitizers tag is to prevent timeout of this test
+-- Tags: long
 
 drop table if exists t;
 
diff --git a/tests/queries/0_stateless/01710_projections_optimize_aggregation_in_order.sh b/tests/queries/0_stateless/01710_projections_optimize_aggregation_in_order.sh
index f38e53f898a..a166837e01a 100755
--- a/tests/queries/0_stateless/01710_projections_optimize_aggregation_in_order.sh
+++ b/tests/queries/0_stateless/01710_projections_optimize_aggregation_in_order.sh
@@ -4,7 +4,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     DROP TABLE IF EXISTS in_order_agg_01710;
 
     CREATE TABLE in_order_agg_01710
diff --git a/tests/queries/0_stateless/01710_projections_partial_optimize_aggregation_in_order.sh b/tests/queries/0_stateless/01710_projections_partial_optimize_aggregation_in_order.sh
index 01537524730..ee73974e8a4 100755
--- a/tests/queries/0_stateless/01710_projections_partial_optimize_aggregation_in_order.sh
+++ b/tests/queries/0_stateless/01710_projections_partial_optimize_aggregation_in_order.sh
@@ -9,7 +9,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     DROP TABLE IF EXISTS in_order_agg_partial_01710;
 
     CREATE TABLE in_order_agg_partial_01710
diff --git a/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2 b/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2
index 3c2fa9877db..db004c13d96 100644
--- a/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2
+++ b/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2
@@ -37,8 +37,8 @@ SELECT a, t1.a, t2.a FROM t1 FULL JOIN t2 USING (a) ORDER BY (t1.a, t2.a); {{ is
 SELECT '= left =';
 SELECT a, t1.a, t2.a FROM t1 LEFT JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
 SELECT '= right =';
-SELECT a, t1.a, t2.a FROM t1 RIGHT JOIN t2 USING (a) ORDER BY (t1.a, t2.a) SETTINGS enable_analyzer = 0; {{ is_implemented(join_algorithm) }}
-SELECT a, t1.a, t2.a FROM t1 RIGHT JOIN t2 USING (a) ORDER BY (t1.a, t2.a) SETTINGS enable_analyzer = 1; {{ is_implemented(join_algorithm) }}
+SELECT a, t1.a, t2.a FROM t1 RIGHT JOIN t2 USING (a) ORDER BY (t1.a, t2.a) SETTINGS allow_experimental_analyzer = 0; {{ is_implemented(join_algorithm) }}
+SELECT a, t1.a, t2.a FROM t1 RIGHT JOIN t2 USING (a) ORDER BY (t1.a, t2.a) SETTINGS allow_experimental_analyzer = 1; {{ is_implemented(join_algorithm) }}
 SELECT '= inner =';
 SELECT a, t1.a, t2.a FROM t1 INNER JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
 
@@ -119,8 +119,8 @@ SELECT a, t1.a, t2.a FROM t1 FULL JOIN t2 USING (a) ORDER BY (t1.a, t2.a); {{ is
 SELECT '= left =';
 SELECT a, t1.a, t2.a FROM t1 LEFT JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
 SELECT '= right =';
-SELECT a, t1.a, t2.a FROM t1 RIGHT JOIN t2 USING (a) ORDER BY (t1.a, t2.a) SETTINGS enable_analyzer = 0; {{ is_implemented(join_algorithm) }}
-SELECT a, t1.a, t2.a FROM t1 RIGHT JOIN t2 USING (a) ORDER BY (t1.a, t2.a) SETTINGS enable_analyzer = 1; {{ is_implemented(join_algorithm) }}
+SELECT a, t1.a, t2.a FROM t1 RIGHT JOIN t2 USING (a) ORDER BY (t1.a, t2.a) SETTINGS allow_experimental_analyzer = 0; {{ is_implemented(join_algorithm) }}
+SELECT a, t1.a, t2.a FROM t1 RIGHT JOIN t2 USING (a) ORDER BY (t1.a, t2.a) SETTINGS allow_experimental_analyzer = 1; {{ is_implemented(join_algorithm) }}
 SELECT '= inner =';
 SELECT a, t1.a, t2.a FROM t1 INNER JOIN t2 USING (a) ORDER BY (t1.a, t2.a);
 
@@ -166,8 +166,8 @@ SELECT '= types =';
 SELECT any(toTypeName(a)) == 'Nullable(Int32)' AND any(toTypeName(t2.a)) == 'Nullable(Int32)' FROM t1 FULL JOIN t2 USING (a); {{ is_implemented(join_algorithm) }}
 SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Nullable(Int32)' FROM t1 LEFT JOIN t2 USING (a);
 
-SELECT any(toTypeName(a)) == 'Nullable(Int32)' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 RIGHT JOIN t2 USING (a) SETTINGS enable_analyzer = 0; {{ is_implemented(join_algorithm) }}
-SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 RIGHT JOIN t2 USING (a) SETTINGS enable_analyzer = 1; {{ is_implemented(join_algorithm) }}
+SELECT any(toTypeName(a)) == 'Nullable(Int32)' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 RIGHT JOIN t2 USING (a) SETTINGS allow_experimental_analyzer = 0; {{ is_implemented(join_algorithm) }}
+SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 RIGHT JOIN t2 USING (a) SETTINGS allow_experimental_analyzer = 1; {{ is_implemented(join_algorithm) }}
 
 SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(t2.a)) == 'Int32' FROM t1 INNER JOIN t2 USING (a);
 
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 83a26c83005..6625ad916e8 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
@@ -1,7 +1,6 @@
 -- Tags: long, distributed, no-random-settings
 
 drop table if exists data_01730;
-SET max_rows_to_read = 0, max_result_rows = 0, max_bytes_before_external_group_by = 0;
 
 -- does not use 127.1 due to prefer_localhost_replica
 
diff --git a/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh b/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
index dbfb3518a61..5fc41890a18 100755
--- a/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
+++ b/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
@@ -11,14 +11,14 @@ set -o pipefail
 echo "
 	DROP TABLE IF EXISTS storage_join_race;
 	CREATE TABLE storage_join_race (x UInt64, y UInt64) Engine = Join(ALL, FULL, x);
-" | $CLICKHOUSE_CLIENT
+" | $CLICKHOUSE_CLIENT -n
 
 function read_thread_big()
 {
     while true; do
         echo "
             SELECT * FROM ( SELECT number AS x FROM numbers(100000) ) AS t1 ALL FULL JOIN storage_join_race USING (x) FORMAT Null;
-        " | $CLICKHOUSE_CLIENT
+        " | $CLICKHOUSE_CLIENT -n
     done
 }
 
@@ -27,7 +27,7 @@ function read_thread_small()
     while true; do
         echo "
             SELECT * FROM ( SELECT number AS x FROM numbers(10) ) AS t1 ALL FULL JOIN storage_join_race USING (x) FORMAT Null;
-        " | $CLICKHOUSE_CLIENT
+        " | $CLICKHOUSE_CLIENT -n
     done
 }
 
@@ -36,7 +36,7 @@ function read_thread_select()
     while true; do
         echo "
             SELECT * FROM storage_join_race FORMAT Null;
-        " | $CLICKHOUSE_CLIENT
+        " | $CLICKHOUSE_CLIENT -n
     done
 }
 
@@ -56,7 +56,7 @@ echo "
     INSERT INTO storage_join_race
         SELECT number AS x, sleepEachRow(0.1) + number AS y FROM numbers ($TIMEOUT * 10)
         SETTINGS function_sleep_max_microseconds_per_block = 100000000, max_block_size = 10;
-" | $CLICKHOUSE_CLIENT
+" | $CLICKHOUSE_CLIENT -n
 
 wait
 
diff --git a/tests/queries/0_stateless/01739_index_hint.reference b/tests/queries/0_stateless/01739_index_hint.reference
index b921dc6c1f9..21f4edc0049 100644
--- a/tests/queries/0_stateless/01739_index_hint.reference
+++ b/tests/queries/0_stateless/01739_index_hint.reference
@@ -35,9 +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, enable_analyzer=0;
+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, enable_analyzer=1;
+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 b208063e7c4..1eca65f0892 100644
--- a/tests/queries/0_stateless/01739_index_hint.sql
+++ b/tests/queries/0_stateless/01739_index_hint.sql
@@ -38,8 +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, enable_analyzer=0;
+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, enable_analyzer=1;
+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 07055f96782..022bf488886 100755
--- a/tests/queries/0_stateless/01747_system_session_log_long.sh
+++ b/tests/queries/0_stateless/01747_system_session_log_long.sh
@@ -82,7 +82,7 @@ trap "cleanup" EXIT
 function executeQueryExpectError()
 {
     cat - > "${TMP_QUERY_FILE}"
-    ! ${CLICKHOUSE_CLIENT} --queries-file "${TMP_QUERY_FILE}" "${@}"  2>&1 | tee -a "${TMP_QUERY_FILE}"
+    ! ${CLICKHOUSE_CLIENT} --multiquery --queries-file "${TMP_QUERY_FILE}" "${@}"  2>&1 | tee -a "${TMP_QUERY_FILE}"
 }
 
 function createUser()
@@ -303,7 +303,7 @@ function runEndpointTests()
     if [[ -n "${setup_queries}" ]]
     then
         # echo "Executing setup queries: ${setup_queries}"
-        echo "${setup_queries}" | executeQuery
+        echo "${setup_queries}" | executeQuery --multiquery
     fi
 
     testTCP "${auth_type}" "${username}" "${password}"
@@ -357,7 +357,7 @@ testAsUserIdentifiedBy "plaintext_password"
 testAsUserIdentifiedBy "sha256_password"
 testAsUserIdentifiedBy "double_sha1_password"
 
-executeQuery <<EOF
+executeQuery --multiquery <<EOF
 SYSTEM FLUSH LOGS;
 
 WITH
diff --git a/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql b/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql
index 93ed3f93c4e..86af09f391d 100644
--- a/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql
+++ b/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql
@@ -41,7 +41,7 @@ SELECT dictGetOrDefault('01753_dictionary_db.direct_dictionary_simple_key_simple
 SELECT 'dictHas';
 SELECT dictHas('01753_dictionary_db.direct_dictionary_simple_key_simple_attributes', number) FROM system.numbers LIMIT 4;
 SELECT 'select all values as input stream';
-SELECT * FROM 01753_dictionary_db.direct_dictionary_simple_key_simple_attributes ORDER BY ALL;
+SELECT * FROM 01753_dictionary_db.direct_dictionary_simple_key_simple_attributes;
 
 DROP DICTIONARY 01753_dictionary_db.direct_dictionary_simple_key_simple_attributes;
 DROP TABLE 01753_dictionary_db.simple_key_simple_attributes_source_table;
diff --git a/tests/queries/0_stateless/01753_optimize_aggregation_in_order.sh b/tests/queries/0_stateless/01753_optimize_aggregation_in_order.sh
index f9681ebe4f5..2a7345f4865 100755
--- a/tests/queries/0_stateless/01753_optimize_aggregation_in_order.sh
+++ b/tests/queries/0_stateless/01753_optimize_aggregation_in_order.sh
@@ -6,7 +6,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --optimize_aggregation_in_order=1 -m -q "
+$CLICKHOUSE_CLIENT --optimize_aggregation_in_order=1 -nm -q "
 drop table if exists data_01753;
 create table data_01753 (key Int) engine=MergeTree() order by key as select * from numbers(8);
 select * from data_01753 group by key settings max_block_size=1;
diff --git a/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.reference b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.reference
index fc1ddcae595..28dbb9215a8 100644
--- a/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.reference
+++ b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.reference
@@ -49,7 +49,7 @@ order by query;
  tuple(2)
 select 'optimize_skip_unused_shards_rewrite_in(2,)';
 optimize_skip_unused_shards_rewrite_in(2,)
-with (select currentDatabase()) as id_2 select *, ignore(id_2) from dist_01756 where dummy in (2);
+with (select currentDatabase()) as id_2 select *, ignore(id_2) from dist_01756 where dummy in (2,);
 system flush logs;
 select splitByString('IN', query)[-1] from system.query_log where
     event_date >= yesterday() and
@@ -59,10 +59,10 @@ select splitByString('IN', query)[-1] from system.query_log where
     query like concat('%', currentDatabase(), '%AS%id_2%') and
     type = 'QueryFinish'
 order by query;
- (2)
+ tuple(2)
 select 'optimize_skip_unused_shards_rewrite_in(0,)';
 optimize_skip_unused_shards_rewrite_in(0,)
-with (select currentDatabase()) as id_00 select *, ignore(id_00) from dist_01756 where dummy in (0);
+with (select currentDatabase()) as id_00 select *, ignore(id_00) from dist_01756 where dummy in (0,);
 0	0
 system flush logs;
 select splitByString('IN', query)[-1] from system.query_log where
@@ -73,7 +73,7 @@ select splitByString('IN', query)[-1] from system.query_log where
     query like concat('%', currentDatabase(), '%AS%id_00%') and
     type = 'QueryFinish'
 order by query;
- (0)
+ tuple(0)
 -- signed column
 select 'signed column';
 signed column
@@ -103,7 +103,7 @@ errors
 -- optimize_skip_unused_shards does not support non-constants
 select * from dist_01756 where dummy in (select * from system.one); -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
 -- this is a constant for analyzer
-select * from dist_01756 where dummy in (toUInt8(0)) settings enable_analyzer=0; -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
+select * from dist_01756 where dummy in (toUInt8(0)) settings allow_experimental_analyzer=0; -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
 -- NOT IN does not supported
 select * from dist_01756 where dummy not in (0, 2); -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
 --
@@ -140,7 +140,7 @@ select * from dist_01756_str where key in ('0', '2');
 select * from dist_01756_str where key in (0, 2);
 0
 -- analyzer does support this
-select * from dist_01756_str where key in ('0', Null) settings enable_analyzer=0; -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
+select * from dist_01756_str where key in ('0', Null) settings allow_experimental_analyzer=0; -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
 -- select * from dist_01756_str where key in (0, 2); -- { serverError TYPE_MISMATCH }
 -- select * from dist_01756_str where key in (0, Null); -- { serverError TYPE_MISMATCH }
 
diff --git a/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
index 0759fb93a44..9a1a00cc0a1 100644
--- a/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
+++ b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
@@ -63,7 +63,7 @@ select splitByString('IN', query)[-1] from system.query_log where
 order by query;
 
 select 'optimize_skip_unused_shards_rewrite_in(2,)';
-with (select currentDatabase()) as id_2 select *, ignore(id_2) from dist_01756 where dummy in (2);
+with (select currentDatabase()) as id_2 select *, ignore(id_2) from dist_01756 where dummy in (2,);
 system flush logs;
 select splitByString('IN', query)[-1] from system.query_log where
     event_date >= yesterday() and
@@ -75,7 +75,7 @@ select splitByString('IN', query)[-1] from system.query_log where
 order by query;
 
 select 'optimize_skip_unused_shards_rewrite_in(0,)';
-with (select currentDatabase()) as id_00 select *, ignore(id_00) from dist_01756 where dummy in (0);
+with (select currentDatabase()) as id_00 select *, ignore(id_00) from dist_01756 where dummy in (0,);
 system flush logs;
 select splitByString('IN', query)[-1] from system.query_log where
     event_date >= yesterday() and
@@ -113,7 +113,7 @@ select 'errors';
 -- optimize_skip_unused_shards does not support non-constants
 select * from dist_01756 where dummy in (select * from system.one); -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
 -- this is a constant for analyzer
-select * from dist_01756 where dummy in (toUInt8(0)) settings enable_analyzer=0; -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
+select * from dist_01756 where dummy in (toUInt8(0)) settings allow_experimental_analyzer=0; -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
 -- NOT IN does not supported
 select * from dist_01756 where dummy not in (0, 2); -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
 
@@ -146,7 +146,7 @@ create table dist_01756_str as data_01756_str engine=Distributed(test_cluster_tw
 select * from dist_01756_str where key in ('0', '2');
 select * from dist_01756_str where key in (0, 2);
 -- analyzer does support this
-select * from dist_01756_str where key in ('0', Null) settings enable_analyzer=0; -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
+select * from dist_01756_str where key in ('0', Null) settings allow_experimental_analyzer=0; -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
 -- select * from dist_01756_str where key in (0, 2); -- { serverError TYPE_MISMATCH }
 -- select * from dist_01756_str where key in (0, Null); -- { serverError TYPE_MISMATCH }
 
diff --git a/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql b/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql
index 6fcf98d47cb..3853ccb4080 100644
--- a/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql
+++ b/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql
@@ -21,9 +21,9 @@ select * from dist_01757 where dummy = 0 or dummy = 1 format Null settings optim
 
 -- and negative
 -- disabled for analyzer cause new implementation consider `dummy = 0 and dummy = 1` as constant False.
-select * from dist_01757 where dummy = 0 and dummy = 1 settings optimize_skip_unused_shards_limit=1, enable_analyzer=0; -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
-select * from dist_01757 where dummy = 0 and dummy = 2 and dummy = 3 settings optimize_skip_unused_shards_limit=1, enable_analyzer=0; -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
-select * from dist_01757 where dummy = 0 and dummy = 2 and dummy = 3 settings optimize_skip_unused_shards_limit=2, enable_analyzer=0; -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
+select * from dist_01757 where dummy = 0 and dummy = 1 settings optimize_skip_unused_shards_limit=1, allow_experimental_analyzer=0; -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
+select * from dist_01757 where dummy = 0 and dummy = 2 and dummy = 3 settings optimize_skip_unused_shards_limit=1, allow_experimental_analyzer=0; -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
+select * from dist_01757 where dummy = 0 and dummy = 2 and dummy = 3 settings optimize_skip_unused_shards_limit=2, allow_experimental_analyzer=0; -- { serverError UNABLE_TO_SKIP_UNUSED_SHARDS }
 
 -- and
 select * from dist_01757 where dummy = 0 and dummy = 1 settings optimize_skip_unused_shards_limit=2;
diff --git a/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh b/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh
index 3c9e12f780b..b963f3a618f 100755
--- a/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh
+++ b/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh
@@ -7,7 +7,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --optimize_skip_unused_shards=1 -m -q "
+$CLICKHOUSE_CLIENT --optimize_skip_unused_shards=1 -nm -q "
 create table dist_01758 as system.one engine=Distributed(test_cluster_two_shards, system, one, dummy);
 select * from dist_01758 where dummy = 0 format Null;
 " |& grep -o "StorageDistributed (dist_01758).*"
diff --git a/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql b/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql
index c6bccde8590..a7f04921f1f 100644
--- a/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql
+++ b/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS ddl_dictonary_test_source;
 CREATE TABLE ddl_dictonary_test_source
 (
diff --git a/tests/queries/0_stateless/01763_filter_push_down_bugs.sql b/tests/queries/0_stateless/01763_filter_push_down_bugs.sql
index aa610e19c12..367baef142b 100644
--- a/tests/queries/0_stateless/01763_filter_push_down_bugs.sql
+++ b/tests/queries/0_stateless/01763_filter_push_down_bugs.sql
@@ -57,13 +57,13 @@ EXPLAIN indexes=1 SELECT id, delete_time FROM t1
  CROSS JOIN (
     SELECT delete_time
     FROM t2
-) AS d WHERE create_time < delete_time AND id = 101 SETTINGS enable_analyzer=0;
+) AS d WHERE create_time < delete_time AND id = 101 SETTINGS allow_experimental_analyzer=0;
 
 EXPLAIN indexes=1 SELECT id, delete_time FROM t1
  CROSS JOIN (
     SELECT delete_time
     FROM t2
-) AS d WHERE create_time < delete_time AND id = 101 SETTINGS enable_analyzer=1;
+) AS d WHERE create_time < delete_time AND id = 101 SETTINGS allow_experimental_analyzer=1;
 
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
diff --git a/tests/queries/0_stateless/01764_table_function_dictionary.sql b/tests/queries/0_stateless/01764_table_function_dictionary.sql
index e37f8d2a290..76e7213b367 100644
--- a/tests/queries/0_stateless/01764_table_function_dictionary.sql
+++ b/tests/queries/0_stateless/01764_table_function_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS table_function_dictionary_source_table;
 CREATE TABLE table_function_dictionary_source_table
 (
@@ -16,7 +18,7 @@ CREATE DICTIONARY table_function_dictionary_test_dictionary
    value UInt64 DEFAULT 0
 )
 PRIMARY KEY id
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' DATABASE currentDatabase() TABLE 'table_function_dictionary_source_table'))
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_function_dictionary_source_table'))
 LAYOUT(DIRECT());
 
 SELECT * FROM dictionary('table_function_dictionary_test_dictionary');
diff --git a/tests/queries/0_stateless/01780_column_sparse_materialize.reference b/tests/queries/0_stateless/01780_column_sparse_materialize.reference
deleted file mode 100644
index 660cfabff33..00000000000
--- a/tests/queries/0_stateless/01780_column_sparse_materialize.reference
+++ /dev/null
@@ -1,50 +0,0 @@
--- { echoOn }
-
-SELECT dumpColumnStructure(id) FROM sparse_t;
-UInt64, Sparse(size = 2, UInt64(size = 2), UInt64(size = 1))
-UInt64, Sparse(size = 2, UInt64(size = 2), UInt64(size = 1))
-SELECT dumpColumnStructure(materialize(id)) FROM sparse_t;
-UInt64, UInt64(size = 2)
-UInt64, UInt64(size = 2)
-SELECT dumpColumnStructure(u) FROM sparse_t;
-UInt64, Sparse(size = 2, UInt64(size = 1), UInt64(size = 0))
-UInt64, Sparse(size = 2, UInt64(size = 1), UInt64(size = 0))
-SELECT dumpColumnStructure(materialize(u)) FROM sparse_t;
-UInt64, UInt64(size = 2)
-UInt64, UInt64(size = 2)
-SELECT dumpColumnStructure(s) FROM sparse_t;
-String, Sparse(size = 2, String(size = 2), UInt64(size = 1))
-String, Sparse(size = 2, String(size = 2), UInt64(size = 1))
-SELECT dumpColumnStructure(materialize(s)) FROM sparse_t;
-String, String(size = 2)
-String, String(size = 2)
-SELECT dumpColumnStructure(arr1) FROM sparse_t;
-Array(String), Array(size = 2, UInt64(size = 2), String(size = 1))
-Array(String), Array(size = 2, UInt64(size = 2), String(size = 1))
-SELECT dumpColumnStructure(materialize(arr1)) FROM sparse_t;
-Array(String), Array(size = 2, UInt64(size = 2), String(size = 1))
-Array(String), Array(size = 2, UInt64(size = 2), String(size = 1))
-SELECT dumpColumnStructure(arr2) FROM sparse_t;
-Array(UInt64), Array(size = 2, UInt64(size = 2), UInt64(size = 1))
-Array(UInt64), Array(size = 2, UInt64(size = 2), UInt64(size = 1))
-SELECT dumpColumnStructure(materialize(arr2)) FROM sparse_t;
-Array(UInt64), Array(size = 2, UInt64(size = 2), UInt64(size = 1))
-Array(UInt64), Array(size = 2, UInt64(size = 2), UInt64(size = 1))
-SELECT dumpColumnStructure(t) FROM sparse_t;
-Tuple(a UInt64, s String), Tuple(size = 2, Sparse(size = 2, UInt64(size = 1), UInt64(size = 0)), Sparse(size = 2, String(size = 1), UInt64(size = 0)))
-Tuple(a UInt64, s String), Tuple(size = 2, Sparse(size = 2, UInt64(size = 1), UInt64(size = 0)), Sparse(size = 2, String(size = 1), UInt64(size = 0)))
-SELECT dumpColumnStructure(materialize(t)) FROM sparse_t;
-Tuple(a UInt64, s String), Tuple(size = 2, UInt64(size = 2), String(size = 2))
-Tuple(a UInt64, s String), Tuple(size = 2, UInt64(size = 2), String(size = 2))
-SELECT dumpColumnStructure(t.a) FROM sparse_t;
-UInt64, Sparse(size = 2, UInt64(size = 1), UInt64(size = 0))
-UInt64, Sparse(size = 2, UInt64(size = 1), UInt64(size = 0))
-SELECT dumpColumnStructure(materialize(t.a)) FROM sparse_t;
-UInt64, UInt64(size = 2)
-UInt64, UInt64(size = 2)
-SELECT dumpColumnStructure(t.s) FROM sparse_t;
-String, Sparse(size = 2, String(size = 1), UInt64(size = 0))
-String, Sparse(size = 2, String(size = 1), UInt64(size = 0))
-SELECT dumpColumnStructure(materialize(t.s)) FROM sparse_t;
-String, String(size = 2)
-String, String(size = 2)
diff --git a/tests/queries/0_stateless/01780_column_sparse_materialize.sql b/tests/queries/0_stateless/01780_column_sparse_materialize.sql
deleted file mode 100644
index a53ea140f0f..00000000000
--- a/tests/queries/0_stateless/01780_column_sparse_materialize.sql
+++ /dev/null
@@ -1,52 +0,0 @@
-DROP TABLE IF EXISTS sparse_t;
-
-CREATE TABLE sparse_t (
-    id UInt64,
-    u UInt64,
-    s String,
-    arr1 Array(String),
-    arr2 Array(UInt64),
-    t Tuple(a UInt64, s String))
-ENGINE = MergeTree ORDER BY tuple()
-SETTINGS ratio_of_defaults_for_sparse_serialization = 0.1;
-
-INSERT INTO sparse_t SELECT
-    number,
-    if (number % 2 = 0, number, 0),
-    if (number % 2 = 0, toString(number), ''),
-    if (number % 2 = 0, [''], []),
-    if (number % 2 = 0, [0], []),
-    (if (number % 2 = 0, number, 0), '')
-FROM numbers(2);
-
--- { echoOn }
-
-SELECT dumpColumnStructure(id) FROM sparse_t;
-SELECT dumpColumnStructure(materialize(id)) FROM sparse_t;
-
-SELECT dumpColumnStructure(u) FROM sparse_t;
-SELECT dumpColumnStructure(materialize(u)) FROM sparse_t;
-
-SELECT dumpColumnStructure(s) FROM sparse_t;
-SELECT dumpColumnStructure(materialize(s)) FROM sparse_t;
-
-SELECT dumpColumnStructure(arr1) FROM sparse_t;
-SELECT dumpColumnStructure(materialize(arr1)) FROM sparse_t;
-
-SELECT dumpColumnStructure(arr2) FROM sparse_t;
-SELECT dumpColumnStructure(materialize(arr2)) FROM sparse_t;
-
-SELECT dumpColumnStructure(t) FROM sparse_t;
-SELECT dumpColumnStructure(materialize(t)) FROM sparse_t;
-
-SELECT dumpColumnStructure(t.a) FROM sparse_t;
-SELECT dumpColumnStructure(materialize(t.a)) FROM sparse_t;
-
-SELECT dumpColumnStructure(t.s) FROM sparse_t;
-SELECT dumpColumnStructure(materialize(t.s)) FROM sparse_t;
-
--- { echoOff }
-
-
-DROP TABLE IF EXISTS sparse_t
-;
diff --git a/tests/queries/0_stateless/01786_explain_merge_tree.sh b/tests/queries/0_stateless/01786_explain_merge_tree.sh
index 828012f56bc..e3b28acdc41 100755
--- a/tests/queries/0_stateless/01786_explain_merge_tree.sh
+++ b/tests/queries/0_stateless/01786_explain_merge_tree.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 for i in $(seq 0 1)
 do
-    CH_CLIENT="$CLICKHOUSE_CLIENT --optimize_move_to_prewhere=1 --convert_query_to_cnf=0 --optimize_read_in_order=1 --enable_analyzer=$i"
+    CH_CLIENT="$CLICKHOUSE_CLIENT --optimize_move_to_prewhere=1 --convert_query_to_cnf=0 --optimize_read_in_order=1 --allow_experimental_analyzer=$i"
 
     $CH_CLIENT -q "drop table if exists test_index"
     $CH_CLIENT -q "drop table if exists idx"
diff --git a/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.sh b/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.sh
index ee46f8194b9..9c51b82282c 100755
--- a/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.sh
+++ b/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.sh
@@ -7,7 +7,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --prefer_localhost_replica=0 -m -q "
+$CLICKHOUSE_CLIENT --prefer_localhost_replica=0 -nm -q "
     DROP TABLE IF EXISTS tmp_01683;
     DROP TABLE IF EXISTS dist_01683;
 
diff --git a/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.sh b/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.sh
index 43cd0014864..935bfe18cfc 100755
--- a/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.sh
+++ b/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.sh
@@ -5,7 +5,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS nullable_low_cardinality_tsv_test;";
-$CLICKHOUSE_CLIENT --query="CREATE TABLE nullable_low_cardinality_tsv_test
+$CLICKHOUSE_CLIENT --multiquery --query="CREATE TABLE nullable_low_cardinality_tsv_test
 (
     A Date,
     S LowCardinality(Nullable(String)),
diff --git a/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh b/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
index 4cf487274d4..4713b15bb5b 100755
--- a/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
+++ b/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
@@ -17,7 +17,7 @@ INSERT INTO db01802.postgresql SELECT number FROM numbers(10);
 
 SELECT 'before row policy';
 SELECT * FROM db01802.postgresql;
-" | $CLICKHOUSE_CLIENT
+" | $CLICKHOUSE_CLIENT -n
 
 
 echo "
@@ -28,7 +28,7 @@ CREATE ROW POLICY IF NOT EXISTS test_policy ON db01802.postgresql FOR SELECT USI
 
 SELECT '';
 SELECT 'after row policy with no password';
-" | $CLICKHOUSE_CLIENT
+" | $CLICKHOUSE_CLIENT -n
 
 psql --host localhost --port ${CLICKHOUSE_PORT_POSTGRESQL} db01802 --user postgresql_user -c "SELECT * FROM postgresql;"
 
@@ -40,7 +40,7 @@ GRANT SELECT(val) ON db01802.postgresql TO postgresql_user;
 CREATE ROW POLICY IF NOT EXISTS test_policy ON db01802.postgresql FOR SELECT USING val = 2 TO postgresql_user;
 
 SELECT 'after row policy with plaintext_password';
-" | $CLICKHOUSE_CLIENT
+" | $CLICKHOUSE_CLIENT -n
 
 psql "postgresql://postgresql_user:qwerty@localhost:${CLICKHOUSE_PORT_POSTGRESQL}/db01802" -c "SELECT * FROM postgresql;"
 
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 4196598e461..c38fc505fa8 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
@@ -17,10 +17,10 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # The number of threads removing data parts should be between 1 and 129.
 # Because max_parts_cleaning_thread_pool_size is 128 by default
 
-$CLICKHOUSE_CLIENT --allow_deprecated_database_ordinary=1 -m -q "create database ordinary_$CLICKHOUSE_DATABASE engine=Ordinary"
+$CLICKHOUSE_CLIENT --allow_deprecated_database_ordinary=1 -nm -q "create database ordinary_$CLICKHOUSE_DATABASE engine=Ordinary"
 
 # MergeTree
-$CLICKHOUSE_CLIENT -m -q """
+$CLICKHOUSE_CLIENT -nm -q """
     use ordinary_$CLICKHOUSE_DATABASE;
     drop table if exists data_01810;
 
@@ -47,7 +47,7 @@ $CLICKHOUSE_CLIENT -m -q """
 """
 
 # ReplicatedMergeTree
-$CLICKHOUSE_CLIENT -m -q """
+$CLICKHOUSE_CLIENT -nm -q """
     use ordinary_$CLICKHOUSE_DATABASE;
     drop table if exists rep_data_01810;
 
@@ -76,4 +76,4 @@ $CLICKHOUSE_CLIENT -m -q """
     format Null;
 """
 
-$CLICKHOUSE_CLIENT -m -q "drop database ordinary_$CLICKHOUSE_DATABASE"
+$CLICKHOUSE_CLIENT -nm -q "drop database ordinary_$CLICKHOUSE_DATABASE"
diff --git a/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.sh b/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.sh
deleted file mode 100755
index 7878867e159..00000000000
--- a/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-function wait_with_limit()
-{
-    local limit=$1 && shift
-    local expr=$1 && shift
-
-    for ((i = 0; i < limit; ++i)); do
-        if eval "$expr"; then
-            break
-        fi
-        sleep 1
-    done
-}
-
-$CLICKHOUSE_CLIENT -m -q "
-    drop table if exists data_01811;
-    drop table if exists buffer_01811;
-
-
-    create table data_01811 (key Int) Engine=Memory();
-    /* Buffer with flush_rows=1000 */
-    create table buffer_01811 (key Int) Engine=Buffer(currentDatabase(), data_01811,
-        /* num_layers= */ 1,
-        /* min_time= */   1,     /* max_time= */  86400,
-        /* min_rows= */   1e9,   /* max_rows= */  1e6,
-        /* min_bytes= */  0,     /* max_bytes= */ 4e6,
-        /* flush_time= */ 86400, /* flush_rows= */ 10, /* flush_bytes= */0
-    );
-
-    insert into buffer_01811 select * from numbers(10);
-    insert into buffer_01811 select * from numbers(10);
-"
-
-# wait for background buffer flush
-wait_with_limit 30 '[[ $($CLICKHOUSE_CLIENT -q "select count() from data_01811") -gt 0 ]]'
-
-$CLICKHOUSE_CLIENT -m -q "select count() from data_01811"
-
-$CLICKHOUSE_CLIENT -m -q "
-    drop table buffer_01811;
-    drop table data_01811;
-"
diff --git a/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.sql b/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.sql
new file mode 100644
index 00000000000..dac68ad4ae8
--- /dev/null
+++ b/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.sql
@@ -0,0 +1,22 @@
+drop table if exists data_01811;
+drop table if exists buffer_01811;
+
+create table data_01811 (key Int) Engine=Memory();
+/* Buffer with flush_rows=1000 */
+create table buffer_01811 (key Int) Engine=Buffer(currentDatabase(), data_01811,
+    /* num_layers= */ 1,
+    /* min_time= */   1,     /* max_time= */  86400,
+    /* min_rows= */   1e9,   /* max_rows= */  1e6,
+    /* min_bytes= */  0,     /* max_bytes= */ 4e6,
+    /* flush_time= */ 86400, /* flush_rows= */ 10, /* flush_bytes= */0
+);
+
+insert into buffer_01811 select * from numbers(10);
+insert into buffer_01811 select * from numbers(10);
+
+-- wait for background buffer flush
+select sleep(3) format Null;
+select count() from data_01811;
+
+drop table buffer_01811;
+drop table data_01811;
diff --git a/tests/queries/0_stateless/01814_distributed_push_down_limit.sh b/tests/queries/0_stateless/01814_distributed_push_down_limit.sh
index f3e8ceffff6..4b75102e9cf 100755
--- a/tests/queries/0_stateless/01814_distributed_push_down_limit.sh
+++ b/tests/queries/0_stateless/01814_distributed_push_down_limit.sh
@@ -13,7 +13,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 function setup()
 {
-    $CLICKHOUSE_CLIENT -m -q "
+    $CLICKHOUSE_CLIENT -nm -q "
         drop table if exists data_01814;
         drop table if exists dist_01814;
 
@@ -24,7 +24,7 @@ function setup()
 
 function cleanup()
 {
-    $CLICKHOUSE_CLIENT -m -q "
+    $CLICKHOUSE_CLIENT -nm -q "
         drop table data_01814;
         drop table dist_01814;
     "
@@ -67,7 +67,7 @@ function test_distributed_push_down_limit_with_query_log()
 
     $CLICKHOUSE_CLIENT "${settings_and_opts[@]}" -q "select * from $table group by key limit $offset, 10"
 
-    $CLICKHOUSE_CLIENT -m -q "
+    $CLICKHOUSE_CLIENT -nm -q "
         system flush logs;
         select read_rows from system.query_log
             where
diff --git a/tests/queries/0_stateless/01821_table_comment.reference b/tests/queries/0_stateless/01821_table_comment.reference
index cdd87df43d2..05acabae3d4 100644
--- a/tests/queries/0_stateless/01821_table_comment.reference
+++ b/tests/queries/0_stateless/01821_table_comment.reference
@@ -1,8 +1,4 @@
-t1	this is a temporary table
+t1	this is a temtorary table
 t2	this is a MergeTree table
 t3	this is a Log table
-t4	this is a Kafka table
-t5	this is a EmbeddedRocksDB table
-t6	this is a Executable table
-t7	this is a WindowView table
-CREATE TABLE default.t1\n(\n    `n` Int8\n)\nENGINE = Memory\nCOMMENT \'this is a temporary table\'
+CREATE TABLE default.t1\n(\n    `n` Int8\n)\nENGINE = Memory\nCOMMENT \'this is a temtorary table\'
diff --git a/tests/queries/0_stateless/01821_table_comment.sql b/tests/queries/0_stateless/01821_table_comment.sql
index 4946e46d37a..4bd71d3e278 100644
--- a/tests/queries/0_stateless/01821_table_comment.sql
+++ b/tests/queries/0_stateless/01821_table_comment.sql
@@ -1,4 +1,4 @@
--- Tags: no-parallel, no-fasttest
+-- Tags: no-parallel
 
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
@@ -9,7 +9,7 @@ CREATE TABLE t1
     `n` Int8
 )
 ENGINE = Memory
-COMMENT 'this is a temporary table';
+COMMENT 'this is a temtorary table';
 
 CREATE TABLE t2
 (
@@ -26,57 +26,14 @@ CREATE TABLE t3
 ENGINE = Log
 COMMENT 'this is a Log table';
 
-CREATE TABLE t4
-(
-    `n` Int8
-)
-ENGINE = Kafka
-SETTINGS
-    kafka_broker_list = 'localhost:10000',
-    kafka_topic_list = 'test',
-    kafka_group_name = 'test',
-    kafka_format = 'JSONEachRow'
-COMMENT 'this is a Kafka table';
-
-CREATE TABLE t5
-(
-    `n` Int8
-)
-ENGINE = EmbeddedRocksDB
-PRIMARY KEY n
-COMMENT 'this is a EmbeddedRocksDB table';
-
-CREATE TABLE t6
-(
-    `n` Int8
-)
-ENGINE = Executable('script.py', TabSeparated)
-COMMENT 'this is a Executable table';
-
-SET allow_experimental_window_view = 1;
--- New analyzer doesn't support WindowView tables
-SET allow_experimental_analyzer = 0;
-
-CREATE WINDOW VIEW t7
-(
-    `n` Int8
-)
-ENGINE MergeTree
-ORDER BY n
-AS SELECT 1
-GROUP BY tumble(now(), toIntervalDay('1'))
-COMMENT 'this is a WindowView table';
-
-SET allow_experimental_analyzer = 1;
-
 SELECT
     name,
     comment
 FROM system.tables
-WHERE name IN ('t1', 't2', 't3', 't4', 't5', 't6', 't7')
-    AND database = currentDatabase() order by name;
+WHERE name IN ('t1', 't2', 't3') AND database = currentDatabase() order by name;
 
 SHOW CREATE TABLE t1;
 
-DROP TABLE t1, t2, t3, t4, t5, t6;
-DROP VIEW t7;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
diff --git a/tests/queries/0_stateless/01823_explain_json.sh b/tests/queries/0_stateless/01823_explain_json.sh
index 356a317ae57..39128773069 100755
--- a/tests/queries/0_stateless/01823_explain_json.sh
+++ b/tests/queries/0_stateless/01823_explain_json.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=1"
+    "--allow_experimental_analyzer=1"
 )
 $CLICKHOUSE_CLIENT "${opts[@]}" -q "EXPLAIN json = 1, description = 0 SELECT 1 UNION ALL SELECT 2 FORMAT TSVRaw"
 echo "--------"
diff --git a/tests/queries/0_stateless/01825_new_type_json_10.reference b/tests/queries/0_stateless/01825_new_type_json_10.reference
deleted file mode 100644
index d70c8210914..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_10.reference
+++ /dev/null
@@ -1,13 +0,0 @@
-('a.b','Int64')
-('a.c','Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))')
-('d','Int64')
-('e','Array(Nullable(Int64))')
-('f','Int64')
-{"o":{"a":{"b":"1","c":[{"d":"10","e":["31"]},{"d":"20","e":["63","127"]}]}}}
-{"o":{"a":{"b":"2","c":[]}}}
-{"o":{"a":{"b":"3","c":[{"e":["32"],"f":"20"},{"e":["64","128"],"f":"30"}]}}}
-{"o":{"a":{"b":"4","c":[]}}}
-1	[10,20]	[[31],[63,127]]	[NULL,NULL]
-2	[]	[]	[]
-3	[NULL,NULL]	[[32],[64,128]]	[20,30]
-4	[]	[]	[]
diff --git a/tests/queries/0_stateless/01825_new_type_json_10.sql b/tests/queries/0_stateless/01825_new_type_json_10.sql
deleted file mode 100644
index f586cc4477b..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_10.sql
+++ /dev/null
@@ -1,17 +0,0 @@
--- Tags: no-fasttest
-
-SET allow_experimental_json_type = 1;
-
-DROP TABLE IF EXISTS t_json_10;
-CREATE TABLE t_json_10 (o JSON) ENGINE = Memory;
-
-INSERT INTO t_json_10 FORMAT JSONAsObject {"a": {"b": 1, "c": [{"d": 10, "e": [31]}, {"d": 20, "e": [63, 127]}]}} {"a": {"b": 2, "c": []}}
-
-INSERT INTO t_json_10 FORMAT JSONAsObject {"a": {"b": 3, "c": [{"f": 20, "e": [32]}, {"f": 30, "e": [64, 128]}]}} {"a": {"b": 4, "c": []}}
-
-SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(o)) as path FROM t_json_10 order by path;
-SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(arrayJoin(o.a.c.:`Array(JSON)`))) as path FROM t_json_10 order by path;
-SELECT o FROM t_json_10 ORDER BY o.a.b FORMAT JSONEachRow;
-SELECT o.a.b, o.a.c.:`Array(JSON)`.d, o.a.c.:`Array(JSON)`.e, o.a.c.:`Array(JSON)`.f FROM t_json_10 ORDER BY o.a.b;
-
-DROP TABLE t_json_10;
diff --git a/tests/queries/0_stateless/01825_new_type_json_11.reference b/tests/queries/0_stateless/01825_new_type_json_11.reference
deleted file mode 100644
index aa3375a23cb..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_11.reference
+++ /dev/null
@@ -1,13 +0,0 @@
-('id','Int64')
-('key_1','Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))')
-('key_2','Int64')
-('key_3','Array(JSON(max_dynamic_types=8, max_dynamic_paths=64))')
-('key_4','Array(JSON(max_dynamic_types=4, max_dynamic_paths=16))')
-('key_7','Int64')
-('key_5','Int64')
-{"obj":{"id":"1","key_1":[{"key_2":"100","key_3":[{"key_4":[{"key_5":"-2"}],"key_7":"257"}]},{"key_2":"65536"}]}}
-{"obj":{"id":"2","key_1":[{"key_2":"101","key_3":[{"key_4":[{"key_5":"-2"}]}]},{"key_2":"102","key_3":[{"key_7":"257"}]},{"key_2":"65536"}]}}
-{"obj.key_1.:`Array(JSON)`.key_3":[[{"key_4":[{"key_5":"-2"}],"key_7":"257"}],null]}
-{"obj.key_1.:`Array(JSON)`.key_3":[[{"key_4":[{"key_5":"-2"}]}],[{"key_7":"257"}],null]}
-[[[-2]],[]]	[[257],[]]
-[[[-2]],[[]],[]]	[[NULL],[257],[]]
diff --git a/tests/queries/0_stateless/01825_new_type_json_11.sh b/tests/queries/0_stateless/01825_new_type_json_11.sh
deleted file mode 100755
index f448b7433ab..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_11.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/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 -q "DROP TABLE IF EXISTS t_json_11"
-
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_11 (obj JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_json_type 1
-
-cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_11 FORMAT JSONAsObject"
-{
-    "id": 1,
-    "key_1":[
-        {
-            "key_2":100,
-            "key_3": [
-                {
-                    "key_7":257,
-                    "key_4":[{"key_5":-2}]
-                }
-            ]
-        },
-        {
-            "key_2":65536
-        }
-    ]
-}
-{
-    "id": 2,
-    "key_1":[
-        {
-          "key_2":101,
-          "key_3": [
-              {
-                  "key_4":[{"key_5":-2}]
-              }
-          ]
-        },
-        {
-            "key_2":102,
-            "key_3": [
-                {
-                    "key_7":257
-                }
-            ]
-        },
-        {
-            "key_2":65536
-        }
-    ]
-}
-EOF
-
-$CLICKHOUSE_CLIENT -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(obj)) as path FROM t_json_11 order by path;"
-$CLICKHOUSE_CLIENT -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(arrayJoin(obj.key_1[]))) as path FROM t_json_11 order by path;"
-$CLICKHOUSE_CLIENT -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(arrayJoin(arrayJoin(obj.key_1[].key_3[])))) as path FROM t_json_11 order by path;"
-$CLICKHOUSE_CLIENT -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(arrayJoin(arrayJoin(arrayJoin(obj.key_1[].key_3[].key_4[]))))) as path FROM t_json_11 order by path;"
-$CLICKHOUSE_CLIENT -q "SELECT obj FROM t_json_11 ORDER BY obj.id FORMAT JSONEachRow"
-$CLICKHOUSE_CLIENT -q "SELECT obj.key_1[].key_3 FROM t_json_11 ORDER BY obj.id FORMAT JSONEachRow"
-$CLICKHOUSE_CLIENT -q "SELECT obj.key_1[].key_3[].key_4[].key_5, obj.key_1[].key_3[].key_7 FROM t_json_11 ORDER BY obj.id"
-
-$CLICKHOUSE_CLIENT -q "DROP TABLE t_json_11;"
diff --git a/tests/queries/0_stateless/01825_new_type_json_12.reference b/tests/queries/0_stateless/01825_new_type_json_12.reference
deleted file mode 100644
index 10770498c4a..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_12.reference
+++ /dev/null
@@ -1,13 +0,0 @@
-('id','Int64')
-('key_0','Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))')
-('key_1','Array(JSON(max_dynamic_types=8, max_dynamic_paths=64))')
-('key_3','Array(JSON(max_dynamic_types=4, max_dynamic_paths=16))')
-('key_4','Int64')
-('key_4','String')
-('key_5','Float64')
-('key_6','Float64')
-('key_6','String')
-('key_7','Float64')
-('key_7','Int64')
-{"obj":{"id":"1","key_0":[{"key_1":[{"key_3":[{"key_4":"1048576","key_5":0.0001048576,"key_6":25.5,"key_7":"1025"},{"key_6":"","key_7":"2"}]}]},{},{"key_1":[{"key_3":[{"key_5":-1,"key_6":"aqbjfiruu","key_7":-922337203685477600},{"key_4":"","key_6":"","key_7":65537}]},{"key_3":[{"key_4":"ghdqyeiom","key_5":1048575,"key_7":21474836.48}]}]}]}}
-[[[1048576,NULL]],[],[[NULL,''],['ghdqyeiom']]]	[[[0.0001048576,NULL]],[],[[-1,NULL],[1048575]]]	[[[25.5,'']],[],[['aqbjfiruu',''],[NULL]]]	[[[1025,2]],[],[[-922337203685477600,65537],[21474836.48]]]
diff --git a/tests/queries/0_stateless/01825_new_type_json_12.sh b/tests/queries/0_stateless/01825_new_type_json_12.sh
deleted file mode 100755
index d7c938d7cd1..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_12.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/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 -q "DROP TABLE IF EXISTS t_json_12"
-
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_12 (obj JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_json_type 1
-
-cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_12 FORMAT JSONAsObject"
-{
-    "id": 1,
-    "key_0":[
-        {
-            "key_1":[
-                {
-                    "key_3":[
-                        {"key_7":1025,"key_6":25.5,"key_4":1048576,"key_5":0.0001048576},
-                        {"key_7":2,"key_6":"","key_4":null}
-                    ]
-                }
-            ]
-        },
-        {},
-        {
-            "key_1":[
-                {
-                    "key_3":[
-                        {"key_7":-922337203685477580.8,"key_6":"aqbjfiruu","key_5":-1},
-                        {"key_7":65537,"key_6":"","key_4":""}
-                    ]
-                },
-                {
-                    "key_3":[
-                        {"key_7":21474836.48,"key_4":"ghdqyeiom","key_5":1048575}
-                    ]
-                }
-            ]
-        }
-    ]
-}
-EOF
-
-$CLICKHOUSE_CLIENT -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(obj)) as path FROM t_json_12 order by path;"
-$CLICKHOUSE_CLIENT -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(arrayJoin(obj.key_0[]))) as path FROM t_json_12 order by path;"
-$CLICKHOUSE_CLIENT -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(arrayJoin(arrayJoin(obj.key_0[].key_1[])))) as path FROM t_json_12 order by path;"
-$CLICKHOUSE_CLIENT -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(arrayJoin(arrayJoin(arrayJoin(obj.key_0[].key_1[].key_3[]))))) as path FROM t_json_12 order by path;"
-$CLICKHOUSE_CLIENT -q "SELECT obj FROM t_json_12 ORDER BY obj.id FORMAT JSONEachRow" --output_format_json_named_tuples_as_objects 1
-$CLICKHOUSE_CLIENT -q "SELECT obj.key_0[].key_1[].key_3[].key_4, obj.key_0[].key_1[].key_3[].key_5, \
-    obj.key_0[].key_1[].key_3[].key_6, obj.key_0[].key_1[].key_3[].key_7 FROM t_json_12 ORDER BY obj.id"
-
-$CLICKHOUSE_CLIENT -q "DROP TABLE t_json_12;"
diff --git a/tests/queries/0_stateless/01825_new_type_json_13.reference b/tests/queries/0_stateless/01825_new_type_json_13.reference
deleted file mode 100644
index 6840341bae4..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_13.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-('id','Int64')
-('key_1','Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))')
-{"obj":{"id":"1","key_1":[{"key_2":[{"key_3":[{"key_8":"65537"},{"key_4":[{"key_5":-0.02},{"key_7":"1023"},{"key_6":"9223372036854775807","key_7":"1"}]},{"key_4":[{"key_7":"65537"}]}]}]}]}}
-\N	\N	\N	\N
diff --git a/tests/queries/0_stateless/01825_new_type_json_13.sh b/tests/queries/0_stateless/01825_new_type_json_13.sh
deleted file mode 100755
index 316e6890d5e..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_13.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/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 -q "DROP TABLE IF EXISTS t_json_13"
-
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_13 (obj JSON) ENGINE = MergeTree ORDER BY tuple() settings replace_long_file_name_to_hash=1" --allow_experimental_json_type 1
-
-cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_13 FORMAT JSONAsObject"
-{
-    "id": 1,
-    "key_1":[
-        {
-            "key_2":[
-                {
-                    "key_3":[
-                        {"key_8":65537},
-                        {
-                            "key_4":[
-                                {"key_5":-0.02},
-                                {"key_7":1023},
-                                {"key_7":1,"key_6":9223372036854775807}
-                            ]
-                        },
-                        {
-                            "key_4":[{"key_7":65537,"key_6":null}]
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
-EOF
-
-$CLICKHOUSE_CLIENT -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(obj)) as path FROM t_json_13 order by path;"
-$CLICKHOUSE_CLIENT -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(arrayJoin(obj.key1[]))) as path FROM t_json_13 order by path;"
-
-$CLICKHOUSE_CLIENT -q "SELECT obj FROM t_json_13 ORDER BY obj.id FORMAT JSONEachRow" --output_format_json_named_tuples_as_objects 1
-$CLICKHOUSE_CLIENT -q "SELECT \
-    obj.key_1.key_2.key_3.key_8, \
-    obj.key_1.key_2.key_3.key_4.key_5, \
-    obj.key_1.key_2.key_3.key_4.key_6, \
-    obj.key_1.key_2.key_3.key_4.key_7 \
-FROM t_json_13 ORDER BY obj.id"
-
-$CLICKHOUSE_CLIENT -q "DROP TABLE t_json_13;"
diff --git a/tests/queries/0_stateless/01825_new_type_json_18.reference b/tests/queries/0_stateless/01825_new_type_json_18.reference
deleted file mode 100644
index 183100cb25c..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_18.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-1	{"k1":"1"}	{'k1':'Int64'}
-1	{"k1":["1","2"]}	{'k1':'Array(Nullable(Int64))'}
diff --git a/tests/queries/0_stateless/01825_new_type_json_18.sql b/tests/queries/0_stateless/01825_new_type_json_18.sql
deleted file mode 100644
index 469d37776ea..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_18.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- Tags: no-fasttest
-
-SET allow_experimental_json_type = 1;
-
-DROP TABLE IF EXISTS t_json_2;
-
-CREATE TABLE t_json_2(id UInt64, data JSON)
-ENGINE = MergeTree ORDER BY tuple();
-
-INSERT INTO t_json_2 FORMAT JSONEachRow {"id": 1, "data" : {"k1": 1}};
-
-SELECT id, data, JSONAllPathsWithTypes(data) FROM t_json_2 ORDER BY id;
-
-TRUNCATE TABLE t_json_2;
-
-INSERT INTO t_json_2 FORMAT JSONEachRow {"id": 1, "data" : {"k1": [1, 2]}};
-
-SELECT id, data, JSONAllPathsWithTypes(data) FROM t_json_2 ORDER BY id;
diff --git a/tests/queries/0_stateless/01825_new_type_json_2.reference b/tests/queries/0_stateless/01825_new_type_json_2.reference
deleted file mode 100644
index b93299e1d00..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_2.reference
+++ /dev/null
@@ -1,24 +0,0 @@
-1	{"k1":"1","k2":"2"}	{'k1':'Int64','k2':'Int64'}
-2	{"k2":"3","k3":"4"}	{'k2':'Int64','k3':'Int64'}
-1	1	2	\N
-2	\N	3	4
-1	{"k1":"1","k2":"2"}	{'k1':'Int64','k2':'Int64'}
-2	{"k2":"3","k3":"4"}	{'k2':'Int64','k3':'Int64'}
-3	{"k3":"10"}	{'k3':'Int64'}
-4	{"k2":"5","k3":"str"}	{'k2':'Int64','k3':'String'}
-1	1	2	\N
-2	\N	3	4
-3	\N	\N	10
-4	\N	5	str
-============
-1	{"k1":[1,2,3.3]}	{'k1':'Array(Nullable(Float64))'}
-1	[1,2,3.3]
-1	{"k1":[1,2,3.3]}	{'k1':'Array(Nullable(Float64))'}
-2	{"k1":["a","4","b"]}	{'k1':'Array(Nullable(String))'}
-1	[1,2,3.3]
-2	['a','4','b']
-============
-1	{"k1":[{"k2":"11"},{"k3":"22"}]}	{'k1':'Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))'}
-2	{"k1":[{"k3":"33"},{"k4":"44"},{"k3":"55","k4":"66"}]}	{'k1':'Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))'}
-1	\N	\N	\N
-2	\N	\N	\N
diff --git a/tests/queries/0_stateless/01825_new_type_json_2.sql b/tests/queries/0_stateless/01825_new_type_json_2.sql
deleted file mode 100644
index 1f532b0e605..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_2.sql
+++ /dev/null
@@ -1,41 +0,0 @@
--- Tags: no-fasttest
-
-SET allow_experimental_json_type = 1;
-
-DROP TABLE IF EXISTS t_json_2;
-
-CREATE TABLE t_json_2(id UInt64, data JSON)
-ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01825_2/t_json_2', 'r1') ORDER BY tuple();
-
-INSERT INTO t_json_2 FORMAT JSONEachRow {"id": 1, "data": {"k1": 1, "k2" : 2}} {"id": 2, "data": {"k2": 3, "k3" : 4}};
-
-SELECT id, data, JSONAllPathsWithTypes(data) FROM t_json_2 ORDER BY id;
-SELECT id, data.k1, data.k2, data.k3 FROM t_json_2 ORDER BY id;
-
-INSERT INTO t_json_2 FORMAT JSONEachRow {"id": 3, "data": {"k3" : 10}} {"id": 4, "data": {"k2": 5, "k3" : "str"}};
-
-SELECT id, data, JSONAllPathsWithTypes(data) FROM t_json_2 ORDER BY id;
-SELECT id, data.k1, data.k2, data.k3 FROM t_json_2 ORDER BY id;
-
-SELECT '============';
-TRUNCATE TABLE t_json_2;
-
-INSERT INTO TABLE t_json_2 FORMAT JSONEachRow {"id": 1, "data": {"k1" : [1, 2, 3.3]}};
-
-SELECT id, data, JSONAllPathsWithTypes(data) FROM t_json_2 ORDER BY id;
-SELECT id, data.k1 FROM t_json_2 ORDEr BY id;
-
-INSERT INTO TABLE t_json_2 FORMAT JSONEachRow {"id": 2, "data": {"k1" : ["a", 4, "b"]}};
-
-SELECT id, data, JSONAllPathsWithTypes(data) FROM t_json_2 ORDER BY id;
-SELECT id, data.k1 FROM t_json_2 ORDER BY id;
-
-SELECT '============';
-TRUNCATE TABLE t_json_2;
-
-INSERT INTO TABLE t_json_2 FORMAT JSONEachRow {"id": 1, "data": {"k1" : [{"k2" : 11}, {"k3" : 22}]}} {"id": 2, "data": {"k1" : [{"k3" : 33}, {"k4" : 44}, {"k3" : 55, "k4" : 66}]}};
-
-SELECT id, data, JSONAllPathsWithTypes(data) FROM t_json_2 ORDER BY id;
-SELECT id, data.k1.k2, data.k1.k3, data.k1.k4 FROM t_json_2 ORDER BY id;
-
-DROP TABLE t_json_2;
diff --git a/tests/queries/0_stateless/01825_new_type_json_3.reference.j2 b/tests/queries/0_stateless/01825_new_type_json_3.reference.j2
deleted file mode 100644
index 8ff87d1132b..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_3.reference.j2
+++ /dev/null
@@ -1,59 +0,0 @@
-1	{}	{}
-2	{"k1":"v1","k2":"2"}	{'k1':'String','k2':'Int64'}
-1	\N	\N
-2	v1	2
-========
-1	{"k1":[]}	{'k1':'Array(Nullable(String))'}
-2	{"k1":[{"k2":"v1","k3":"v3"},{"k2":"v4"}]}	{'k1':'Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))'}
-1	\N	\N
-2	\N	\N
-1	{"k1":[]}	{'k1':'Array(Nullable(String))'}
-2	{"k1":[{"k2":"v1","k3":"v3"},{"k2":"v4"}]}	{'k1':'Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))'}
-3	{"k1":[]}	{'k1':'Array(Nullable(String))'}
-4	{"k1":[]}	{'k1':'Array(Nullable(String))'}
-1	\N	\N
-2	\N	\N
-3	\N	\N
-4	\N	\N
-all_2_2_0	data	JSON
-all_3_3_0	data	JSON
-data	JSON
-1	\N	\N
-2	\N	\N
-3	\N	\N
-4	\N	\N
-========
-1	{"k1":{"k2":"1","k3":"foo"}}	{'k1.k2':'Int64','k1.k3':'String'}
-2	{"k4":["1","2","3"]}	{'k4':'Array(Nullable(Int64))'}
-3	{"k1":{"k2":"10"},"k4":[]}	{'k1.k2':'Int64','k4':'Array(Nullable(Int64))'}
-1	1	foo	\N
-2	\N	\N	[1,2,3]
-3	10	\N	[]
-1	{}	{}
-2	{"k1":"v1","k2":"2"}	{'k1':'String','k2':'Int64'}
-1	\N	\N
-2	v1	2
-========
-1	{"k1":[]}	{'k1':'Array(Nullable(String))'}
-2	{"k1":[{"k2":"v1","k3":"v3"},{"k2":"v4"}]}	{'k1':'Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))'}
-1	\N	\N
-2	\N	\N
-1	{"k1":[]}	{'k1':'Array(Nullable(String))'}
-2	{"k1":[{"k2":"v1","k3":"v3"},{"k2":"v4"}]}	{'k1':'Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))'}
-3	{"k1":[]}	{'k1':'Array(Nullable(String))'}
-4	{"k1":[]}	{'k1':'Array(Nullable(String))'}
-1	\N	\N
-2	\N	\N
-3	\N	\N
-4	\N	\N
-1	\N	\N
-2	\N	\N
-3	\N	\N
-4	\N	\N
-========
-1	{"k1":{"k2":"1","k3":"foo"}}	{'k1.k2':'Int64','k1.k3':'String'}
-2	{"k4":["1","2","3"]}	{'k4':'Array(Nullable(Int64))'}
-3	{"k1":{"k2":"10"},"k4":[]}	{'k1.k2':'Int64','k4':'Array(Nullable(Int64))'}
-1	1	foo	\N
-2	\N	\N	[1,2,3]
-3	10	\N	[]
diff --git a/tests/queries/0_stateless/01825_new_type_json_3.sql.j2 b/tests/queries/0_stateless/01825_new_type_json_3.sql.j2
deleted file mode 100644
index 7866942f7a2..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_3.sql.j2
+++ /dev/null
@@ -1,64 +0,0 @@
-
--- Tags: no-fasttest
-
-{% for engine in ["ReplicatedMergeTree('/clickhouse/tables/{database}/test_01825_3/t_json_3', 'r1') ORDER BY tuple()", "Memory"] -%}
-
-SET insert_keeper_fault_injection_probability=0; -- disable fault injection; part ids are non-deterministic in case of insert retries
-
-SET allow_experimental_json_type = 1;
-
-DROP TABLE IF EXISTS t_json_3;
-
-CREATE TABLE t_json_3(id UInt64, data JSON)
-ENGINE = {{ engine }};
-
-{% if 'MergeTree' in engine %}
-    SYSTEM STOP MERGES t_json_3;
-{% endif %}
-
-INSERT INTO t_json_3 FORMAT JSONEachRow {"id": 1, "data": {"k1": null}}, {"id": 2, "data": {"k1": "v1", "k2" : 2}};
-
-SELECT id, data, JSONAllPathsWithTypes(data) FROM t_json_3 ORDER BY id;
-SELECT id, data.k1, data.k2 FROM t_json_3 ORDER BY id;
-
-SELECT '========';
-TRUNCATE TABLE t_json_3;
-
-INSERT INTO t_json_3 FORMAT JSONEachRow {"id": 1, "data": {"k1" : []}} {"id": 2, "data": {"k1" : [{"k2" : "v1", "k3" : "v3"}, {"k2" : "v4"}]}};
-
-SELECT id, data, JSONAllPathsWithTypes(data) FROM t_json_3 ORDER BY id;
-SELECT id, data.k1.k2, data.k1.k3 FROM t_json_3 ORDER BY id;
-
-INSERT INTO t_json_3 FORMAT JSONEachRow {"id": 3, "data": {"k1" : []}} {"id": 4, "data": {"k1" : []}};
-
-SELECT id, data, JSONAllPathsWithTypes(data) FROM t_json_3 ORDER BY id;
-SELECT id, data.k1.k2, data.k1.k3 FROM t_json_3 ORDER BY id;
-
-{% if 'MergeTree' in engine %}
-    SELECT name, column, type
-    FROM system.parts_columns
-    WHERE table = 't_json_3' AND database = currentDatabase() AND active AND column = 'data'
-    ORDER BY name;
-
-    SYSTEM START MERGES t_json_3;
-    OPTIMIZE TABLE t_json_3 FINAL;
-
-    SELECT column, type
-    FROM system.parts_columns
-    WHERE table = 't_json_3' AND database = currentDatabase() AND active AND column = 'data'
-    ORDER BY name;
-{% endif %}
-
-SELECT id, data.k1.k2, data.k1.k3 FROM t_json_3 ORDER BY id;
-
-SELECT '========';
-TRUNCATE TABLE t_json_3;
-
-INSERT INTO t_json_3 FORMAT JSONEachRow {"id": 1, "data": {"k1" : {"k2" : 1, "k3" : "foo"}}} {"id": 2, "data": {"k1" : null, "k4" : [1, 2, 3]}}, {"id" : 3, "data": {"k1" : {"k2" : 10}, "k4" : []}};
-
-SELECT id, data, JSONAllPathsWithTypes(data) FROM t_json_3 ORDER BY id;
-SELECT id, data.k1.k2, data.k1.k3, data.k4 FROM t_json_3 ORDER BY id;
-
-DROP TABLE t_json_3;
-
-{% endfor -%}
diff --git a/tests/queries/0_stateless/01825_new_type_json_6.reference b/tests/queries/0_stateless/01825_new_type_json_6.reference
deleted file mode 100644
index dacf9ec4a23..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_6.reference
+++ /dev/null
@@ -1,10 +0,0 @@
-('key','String')
-('out','Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))')
-('outputs','Array(JSON(max_dynamic_types=8, max_dynamic_paths=64))')
-('outputs','Array(Nullable(String))')
-('type','Int64')
-('value','Int64')
-('index','Int64')
-('n','Int64')
-v1	[0,0]	[1,2]	[[],[1960131]]	[[],[0]]
-v2	[1,1]	[4,3]	[[1881212],[]]	[[1],[]]
diff --git a/tests/queries/0_stateless/01825_new_type_json_6.sh b/tests/queries/0_stateless/01825_new_type_json_6.sh
deleted file mode 100755
index 6b9a7e71f50..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_6.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/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 -q "DROP TABLE IF EXISTS t_json_6;"
-
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_6 (data JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_json_type 1
-
-cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_6 FORMAT JSONAsObject"
-{
-    "key": "v1",
-    "out": [
-        {
-            "type": 0,
-            "value": 1,
-            "outputs": []
-        },
-        {
-            "type": 0,
-            "value": 2,
-            "outputs": [
-                {
-                    "index": 1960131,
-                    "n": 0
-                }
-            ]
-        }
-    ]
-}
-{
-    "key": "v2",
-    "out": [
-        {
-            "type": 1,
-            "value": 4,
-            "outputs": [
-                {
-                    "index": 1881212,
-                    "n": 1
-                }
-            ]
-        },
-        {
-            "type": 1,
-            "value": 3
-        }
-    ]
-}
-EOF
-
-$CLICKHOUSE_CLIENT -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(data)) as path FROM t_json_6 order by path;"
-$CLICKHOUSE_CLIENT -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(arrayJoin(data.out[]))) as path FROM t_json_6 order by path;"
-$CLICKHOUSE_CLIENT -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(arrayJoin(arrayJoin(data.out[].outputs[])))) as path FROM t_json_6 order by path;"
-$CLICKHOUSE_CLIENT -q "SELECT data.key, data.out[].type, data.out[].value, data.out[].outputs[].index, data.out[].outputs[].n FROM t_json_6 ORDER BY data.key"
-
-$CLICKHOUSE_CLIENT -q "DROP TABLE t_json_6;"
diff --git a/tests/queries/0_stateless/01825_new_type_json_7.reference b/tests/queries/0_stateless/01825_new_type_json_7.reference
deleted file mode 100644
index 8e26e9b2c44..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_7.reference
+++ /dev/null
@@ -1,5 +0,0 @@
-('categories','Array(Nullable(String))')
-('key','String')
-v1	\N
-v2	['foo','bar']
-v3	\N
diff --git a/tests/queries/0_stateless/01825_new_type_json_7.sh b/tests/queries/0_stateless/01825_new_type_json_7.sh
deleted file mode 100755
index 36483175df6..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_7.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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 -q "DROP TABLE IF EXISTS t_json_7;"
-
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_7 (data JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_json_type 1
-
-cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_7 FORMAT JSONAsObject"
-{
-    "key": "v1",
-    "categories": null
-}
-{
-    "key": "v2",
-    "categories": ["foo", "bar"]
-}
-{
-    "key": "v3",
-    "categories": null
-}
-EOF
-
-$CLICKHOUSE_CLIENT -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(data)) as path FROM t_json_7 order by path;"
-$CLICKHOUSE_CLIENT -q "SELECT data.key, data.categories FROM t_json_7 ORDER BY data.key"
-
-$CLICKHOUSE_CLIENT -q "DROP TABLE t_json_7;"
diff --git a/tests/queries/0_stateless/01825_new_type_json_8.reference b/tests/queries/0_stateless/01825_new_type_json_8.reference
deleted file mode 100644
index 651c79631b9..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_8.reference
+++ /dev/null
@@ -1,12 +0,0 @@
-{"k1":[[{"k2":"1","k3":"2"},{"k2":"3","k3":"4"}],[{"k2":"5","k3":"6"}]]}	('k1','Array(Array(JSON(max_dynamic_types=16, max_dynamic_paths=256)))')
-{"k1":[[{"k2":"1","k3":"2"},{"k2":"3","k3":"4"}],[{"k2":"5","k3":"6"}]]}	('k2','Int64')
-{"k1":[[{"k2":"1","k3":"2"},{"k2":"3","k3":"4"}],[{"k2":"5","k3":"6"}]]}	('k3','Int64')
-{"k1":[[{"k2":"1","k3":"2"},{"k2":"3","k3":"4"}],[{"k2":"5","k3":"6"}]]}	('k2','Int64')
-{"k1":[[{"k2":"1","k3":"2"},{"k2":"3","k3":"4"}],[{"k2":"5","k3":"6"}]]}	('k3','Int64')
-{"k1":[[{"k2":"1","k3":"2"},{"k2":"3","k3":"4"}],[{"k2":"5","k3":"6"}]]}	('k2','Int64')
-{"k1":[[{"k2":"1","k3":"2"},{"k2":"3","k3":"4"}],[{"k2":"5","k3":"6"}]]}	('k3','Int64')
-{"k1":[{"k2":["1","3","4","5"],"k3":["6","7"]},{"k2":["8"],"k3":["9","10","11"]}]}	('k1','Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))')
-{"k1":[{"k2":["1","3","4","5"],"k3":["6","7"]},{"k2":["8"],"k3":["9","10","11"]}]}	('k2','Array(Nullable(Int64))')
-{"k1":[{"k2":["1","3","4","5"],"k3":["6","7"]},{"k2":["8"],"k3":["9","10","11"]}]}	('k3','Array(Nullable(Int64))')
-{"k1":[{"k2":["1","3","4","5"],"k3":["6","7"]},{"k2":["8"],"k3":["9","10","11"]}]}	('k2','Array(Nullable(Int64))')
-{"k1":[{"k2":["1","3","4","5"],"k3":["6","7"]},{"k2":["8"],"k3":["9","10","11"]}]}	('k3','Array(Nullable(Int64))')
diff --git a/tests/queries/0_stateless/01825_new_type_json_8.sh b/tests/queries/0_stateless/01825_new_type_json_8.sh
deleted file mode 100755
index ceb8a659dcd..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_8.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/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 -q "DROP TABLE IF EXISTS t_json_8"
-
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_8 (data JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_json_type 1
-
-cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_8 FORMAT JSONAsObject"
-{
-    "k1": [
-        [{"k2": 1, "k3": 2}, {"k2": 3, "k3": 4}],
-        [{"k2": 5, "k3": 6}]
-    ]
-}
-EOF
-
-$CLICKHOUSE_CLIENT -q "SELECT data, arrayJoin(JSONAllPathsWithTypes(data)) FROM t_json_8"
-$CLICKHOUSE_CLIENT -q "SELECT data, arrayJoin(JSONAllPathsWithTypes(arrayJoin(arrayJoin(data.k1[][])))) FROM t_json_8"
-$CLICKHOUSE_CLIENT -q "TRUNCATE TABLE t_json_8"
-
-cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_8 FORMAT JSONAsObject"
-{
-    "k1": [
-        {"k2": [1, 3, 4, 5], "k3": [6, 7]},
-        {"k2": [8], "k3": [9, 10, 11]}
-    ]
-}
-EOF
-
-$CLICKHOUSE_CLIENT -q "SELECT data, arrayJoin(JSONAllPathsWithTypes(data)) FROM t_json_8"
-$CLICKHOUSE_CLIENT -q "SELECT data, arrayJoin(JSONAllPathsWithTypes(arrayJoin(data.k1[]))) FROM t_json_8"
-$CLICKHOUSE_CLIENT -q "TRUNCATE TABLE t_json_8"
-
-$CLICKHOUSE_CLIENT -q "DROP TABLE t_json_8"
diff --git a/tests/queries/0_stateless/01825_new_type_json_9.reference b/tests/queries/0_stateless/01825_new_type_json_9.reference
deleted file mode 100644
index 9ad0b55b9c5..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_9.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-('foo','Int64')
-('k1','Int64')
-('k2','Int64')
diff --git a/tests/queries/0_stateless/01825_new_type_json_9.sql b/tests/queries/0_stateless/01825_new_type_json_9.sql
deleted file mode 100644
index 161a1d37f2e..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_9.sql
+++ /dev/null
@@ -1,17 +0,0 @@
--- Tags: no-fasttest
-
-DROP TABLE IF EXISTS t_json;
-
-SET allow_experimental_json_type = 1;
-
-CREATE TABLE t_json(id UInt64, obj JSON) ENGINE = MergeTree ORDER BY id;
-
-INSERT INTO t_json format JSONEachRow {"id": 1, "obj": {"foo": 1, "k1": 2}};
-
-INSERT INTO t_json format JSONEachRow {"id": 2, "obj": {"foo": 1, "k2": 2}};
-
-OPTIMIZE TABLE t_json FINAL;
-
-SELECT distinct arrayJoin(JSONAllPathsWithTypes(obj)) as path from t_json order by path;
-
-DROP TABLE IF EXISTS t_json;
diff --git a/tests/queries/0_stateless/01825_new_type_json_add_column.reference.j2 b/tests/queries/0_stateless/01825_new_type_json_add_column.reference.j2
deleted file mode 100644
index 7bb8b8e335b..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_add_column.reference.j2
+++ /dev/null
@@ -1,8 +0,0 @@
-{"id":"1","s":{}}
-{"id":"2","s":{"k1":"100"}}
-{"id":"1"}
-{"id":"2"}
-{"id":"1","s":{}}
-{"id":"2","s":{"k1":"100"}}
-{"id":"1"}
-{"id":"2"}
diff --git a/tests/queries/0_stateless/01825_new_type_json_add_column.sql.j2 b/tests/queries/0_stateless/01825_new_type_json_add_column.sql.j2
deleted file mode 100644
index 6547efdedee..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_add_column.sql.j2
+++ /dev/null
@@ -1,23 +0,0 @@
--- Tags: no-fasttest
-
-{% for storage in ["MergeTree", "ReplicatedMergeTree('/clickhouse/tables/{database}/test_01825_add_column/', 'r1')"] -%}
-
-DROP TABLE IF EXISTS t_json_add_column;
-SET allow_experimental_json_type = 1;
-
-CREATE TABLE t_json_add_column (id UInt64) ENGINE = {{ storage }} ORDER BY tuple();
-
-INSERT INTO t_json_add_column VALUES (1);
-ALTER TABLE t_json_add_column ADD COLUMN s JSON;
-
-INSERT INTO t_json_add_column VALUES(2, '{"k1": 100}');
-
-SELECT * FROM t_json_add_column ORDER BY id FORMAT JSONEachRow;
-
-ALTER TABLE t_json_add_column DROP COLUMN s;
-
-SELECT * FROM t_json_add_column ORDER BY id FORMAT JSONEachRow;
-
-DROP TABLE t_json_add_column;
-
-{% endfor -%}
diff --git a/tests/queries/0_stateless/01825_new_type_json_bools.reference b/tests/queries/0_stateless/01825_new_type_json_bools.reference
deleted file mode 100644
index ebbfd28c321..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_bools.reference
+++ /dev/null
@@ -1 +0,0 @@
-{"k1":true,"k2":false}	{'k1':'Bool','k2':'Bool'}
diff --git a/tests/queries/0_stateless/01825_new_type_json_bools.sql b/tests/queries/0_stateless/01825_new_type_json_bools.sql
deleted file mode 100644
index f8775d0f00a..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_bools.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- Tags: no-fasttest
-
-DROP TABLE IF EXISTS t_json_bools;
-SET allow_experimental_json_type = 1;
-
-CREATE TABLE t_json_bools (data JSON) ENGINE = Memory;
-INSERT INTO t_json_bools VALUES ('{"k1": true, "k2": false}');
-SELECT data, JSONAllPathsWithTypes(data) FROM t_json_bools;
-
-DROP TABLE t_json_bools;
diff --git a/tests/queries/0_stateless/01825_new_type_json_btc.reference b/tests/queries/0_stateless/01825_new_type_json_btc.reference
deleted file mode 100644
index b7ea598d47b..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_btc.reference
+++ /dev/null
@@ -1,33 +0,0 @@
-100
-('double_spend','Bool')
-('fee','Int64')
-('hash','String')
-('inputs','Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))')
-('lock_time','Int64')
-('out','Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))')
-('rbf','Bool')
-('relayed_by','String')
-('size','Int64')
-('time','Int64')
-('tx_index','Int64')
-('ver','Int64')
-('vin_sz','Int64')
-('vout_sz','Int64')
-('weight','Int64')
-('index','Int64')
-('prev_out.addr','String')
-('prev_out.n','Int64')
-('prev_out.script','String')
-('prev_out.spending_outpoints','Array(JSON(max_dynamic_types=8, max_dynamic_paths=64))')
-('prev_out.spent','Bool')
-('prev_out.tx_index','Int64')
-('prev_out.type','Int64')
-('prev_out.value','Int64')
-('script','String')
-('sequence','Int64')
-('witness','String')
-('n','Int64')
-('tx_index','Int64')
-8174.56	2680
-2.32	1
-[[],['{"n":"0","tx_index":"359661801933760"}']]
diff --git a/tests/queries/0_stateless/01825_new_type_json_btc.sh b/tests/queries/0_stateless/01825_new_type_json_btc.sh
deleted file mode 100755
index 1b04f588eb3..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_btc.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-mkdir -p ${CLICKHOUSE_USER_FILES_UNIQUE}/
-rm -rf "${CLICKHOUSE_USER_FILES_UNIQUE:?}"/*
-cp $CUR_DIR/data_json/btc_transactions.json ${CLICKHOUSE_USER_FILES_UNIQUE}/
-
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS btc"
-
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE btc (data JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_json_type 1
-
-${CLICKHOUSE_CLIENT} -q "INSERT INTO btc SELECT * FROM file('${CLICKHOUSE_TEST_UNIQUE_NAME}/btc_transactions.json', 'JSONAsObject')"
-
-${CLICKHOUSE_CLIENT} -q "SELECT count() FROM btc WHERE NOT ignore(*)"
-${CLICKHOUSE_CLIENT} -q "SELECT distinct arrayJoin(JSONAllPathsWithTypes(data)) as path from btc order by path"
-${CLICKHOUSE_CLIENT} -q "SELECT distinct arrayJoin(JSONAllPathsWithTypes(arrayJoin(data.inputs.:\`Array(JSON)\`))) as path from btc order by path"
-${CLICKHOUSE_CLIENT} -q "SELECT distinct arrayJoin(JSONAllPathsWithTypes(arrayJoin(arrayJoin(data.inputs.:\`Array(JSON)\`.prev_out.spending_outpoints.:\`Array(JSON)\`)))) as path from btc order by path"
-
-${CLICKHOUSE_CLIENT} -q "SELECT avg(data.fee.:Int64), median(data.fee.:Int64) FROM btc"
-
-${CLICKHOUSE_CLIENT} -q "SELECT avg(length(data.inputs.:\`Array(JSON)\`.prev_out.spending_outpoints.:\`Array(JSON)\`) AS outpoints_length), median(outpoints_length) FROM btc"
-
-${CLICKHOUSE_CLIENT} -q "SELECT data.out.:\`Array(JSON)\`.spending_outpoints.:\`Array(JSON)\` AS outpoints FROM btc WHERE arrayExists(x -> notEmpty(x), outpoints)"
-
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS btc"
-
-rm ${CLICKHOUSE_USER_FILES_UNIQUE}/btc_transactions.json
diff --git a/tests/queries/0_stateless/01825_new_type_json_distributed.reference b/tests/queries/0_stateless/01825_new_type_json_distributed.reference
deleted file mode 100644
index b2cbe847542..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_distributed.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-{"k1":"2","k2":{"k3":"qqq","k4":["44","55"]}}	{'k1':'Int64','k2.k3':'String','k2.k4':'Array(Nullable(Int64))'}
-{"k1":"2","k2":{"k3":"qqq","k4":["44","55"]}}	{'k1':'Int64','k2.k3':'String','k2.k4':'Array(Nullable(Int64))'}
-2	qqq	[44,55]
-2	qqq	[44,55]
diff --git a/tests/queries/0_stateless/01825_new_type_json_distributed.sql b/tests/queries/0_stateless/01825_new_type_json_distributed.sql
deleted file mode 100644
index 0fede046927..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_distributed.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- Tags: no-fasttest
-
-SET allow_experimental_json_type = 1;
-
-DROP TABLE IF EXISTS t_json_local;
-DROP TABLE IF EXISTS t_json_dist;
-
-CREATE TABLE t_json_local(data JSON) ENGINE = MergeTree ORDER BY tuple();
-CREATE TABLE t_json_dist AS t_json_local ENGINE = Distributed(test_cluster_two_shards, currentDatabase(), t_json_local);
-
-INSERT INTO t_json_local FORMAT JSONAsObject {"k1": 2, "k2": {"k3": "qqq", "k4": [44, 55]}}
-;
-
-SELECT data, JSONAllPathsWithTypes(data) FROM t_json_dist;
-SELECT data.k1, data.k2.k3, data.k2.k4 FROM t_json_dist;
-
-DROP TABLE IF EXISTS t_json_local;
-DROP TABLE IF EXISTS t_json_dist;
diff --git a/tests/queries/0_stateless/01825_new_type_json_ephemeral.reference b/tests/queries/0_stateless/01825_new_type_json_ephemeral.reference
deleted file mode 100644
index 7efe8cea252..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_ephemeral.reference
+++ /dev/null
@@ -1 +0,0 @@
-PushEvent	some-repo	{"actor":{"avatar_url":"https:\\/\\/avatars.githubusercontent.com\\/u\\/123213213?","display_login":"github-actions","gravatar_id":"","id":"123123123","login":"github-actions[bot]","url":"https:\\/\\/api.github.com\\/users\\/github-actions[bot]"},"created_at":"2022-01-04 07:00:00","repo":{"id":"1001001010101","name":"some-repo","url":"https:\\/\\/api.github.com\\/repos\\/some-repo"},"type":"PushEvent"}
diff --git a/tests/queries/0_stateless/01825_new_type_json_ephemeral.sql b/tests/queries/0_stateless/01825_new_type_json_ephemeral.sql
deleted file mode 100644
index 4aaebfd326f..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_ephemeral.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-
-SET allow_experimental_json_type = 1;
-
-DROP TABLE IF EXISTS t_github_json;
-
-CREATE table t_github_json
-(
-    event_type LowCardinality(String) DEFAULT JSONExtractString(message_raw, 'type'),
-    repo_name LowCardinality(String) DEFAULT JSONExtractString(message_raw, 'repo', 'name'),
-    message JSON DEFAULT empty(message_raw) ? '{}' : message_raw,
-    message_raw String EPHEMERAL
-) ENGINE = MergeTree ORDER BY (event_type, repo_name);
-
-INSERT INTO t_github_json (message_raw) FORMAT JSONEachRow {"message_raw": "{\"type\":\"PushEvent\", \"created_at\": \"2022-01-04 07:00:00\", \"actor\":{\"avatar_url\":\"https://avatars.githubusercontent.com/u/123213213?\",\"display_login\":\"github-actions\",\"gravatar_id\":\"\",\"id\":123123123,\"login\":\"github-actions[bot]\",\"url\":\"https://api.github.com/users/github-actions[bot]\"},\"repo\":{\"id\":1001001010101,\"name\":\"some-repo\",\"url\":\"https://api.github.com/repos/some-repo\"}}"}
-
-SELECT * FROM t_github_json ORDER BY event_type, repo_name;
-
-DROP TABLE t_github_json;
diff --git a/tests/queries/0_stateless/01825_new_type_json_ghdata.reference b/tests/queries/0_stateless/01825_new_type_json_ghdata.reference
deleted file mode 100644
index ca2fb7e8ff9..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_ghdata.reference
+++ /dev/null
@@ -1,12 +0,0 @@
-5000
-leonardomso/33-js-concepts	3
-ytdl-org/youtube-dl	3
-Bogdanp/neko	2
-bminossi/AllVideoPocsFromHackerOne	2
-disclose/diodata	2
-Commit	182
-chipeo345	119
-phanwi346	114
-Nicholas Piggin	95
-direwolf-github	49
-2
diff --git a/tests/queries/0_stateless/01825_new_type_json_ghdata.sh b/tests/queries/0_stateless/01825_new_type_json_ghdata.sh
deleted file mode 100755
index f165223fb98..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_ghdata.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest, no-s3-storage, long
-# ^ no-s3-storage: too memory hungry
-
-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 ghdata"
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE ghdata (data JSON(max_dynamic_paths=100)) ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi'" --allow_experimental_json_type 1
-
-cat $CUR_DIR/data_json/ghdata_sample.json | ${CLICKHOUSE_CLIENT} \
-  --max_memory_usage 10G --query "INSERT INTO ghdata FORMAT JSONAsObject"
-
-${CLICKHOUSE_CLIENT} -q "SELECT count() FROM ghdata WHERE NOT ignore(*)"
-
-${CLICKHOUSE_CLIENT} -q \
-"SELECT data.repo.name, count() AS stars FROM ghdata \
-    WHERE data.type = 'WatchEvent' GROUP BY data.repo.name ORDER BY stars DESC, data.repo.name LIMIT 5"
-
-${CLICKHOUSE_CLIENT} --enable_analyzer=1 -q \
-"SELECT data.payload.commits[].author.name AS name, count() AS c FROM ghdata \
-    ARRAY JOIN data.payload.commits[].author.name \
-    GROUP BY name ORDER BY c DESC, name LIMIT 5"
-
-${CLICKHOUSE_CLIENT} -q "SELECT max(data.payload.pull_request.assignees[].size0) FROM ghdata"
-
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS ghdata"
diff --git a/tests/queries/0_stateless/01825_new_type_json_ghdata_insert_select.sh b/tests/queries/0_stateless/01825_new_type_json_ghdata_insert_select.sh
deleted file mode 100755
index b450e9827c2..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_ghdata_insert_select.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest, no-s3-storage, long, no-asan
-# ^ no-s3-storage: it is memory-hungry, no-asan: too long
-
-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 ghdata_2"
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS ghdata_2_string"
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS ghdata_2_from_string"
-
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE ghdata_2 (data JSON(max_dynamic_paths=100)) ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi'" --allow_experimental_json_type 1
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE ghdata_2_string (data String) ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi'"
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE ghdata_2_from_string (data JSON(max_dynamic_paths=100)) ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi'" --allow_experimental_json_type 1
-
-cat $CUR_DIR/data_json/ghdata_sample.json | ${CLICKHOUSE_CLIENT} --max_memory_usage 10G -q "INSERT INTO ghdata_2 FORMAT JSONAsObject"
-cat $CUR_DIR/data_json/ghdata_sample.json | ${CLICKHOUSE_CLIENT} -q "INSERT INTO ghdata_2_string FORMAT JSONAsString"
-
-${CLICKHOUSE_CLIENT} --max_memory_usage 10G -q "INSERT INTO ghdata_2_from_string SELECT data FROM ghdata_2_string"
-
-${CLICKHOUSE_CLIENT} -q "SELECT \
-    (SELECT mapSort(groupUniqArrayMap(JSONAllPathsWithTypes(data))), sum(cityHash64(toString(data))) FROM ghdata_2_from_string) = \
-    (SELECT mapSort(groupUniqArrayMap(JSONAllPathsWithTypes(data))), sum(cityHash64(toString(data))) FROM ghdata_2)"
-
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS ghdata_2"
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS ghdata_2_string"
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS ghdata_2_from_string"
diff --git a/tests/queries/0_stateless/01825_new_type_json_in_array.reference b/tests/queries/0_stateless/01825_new_type_json_in_array.reference
deleted file mode 100644
index aa33d9a7413..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_in_array.reference
+++ /dev/null
@@ -1,30 +0,0 @@
-{"id":1,"arr":[{"k1":"1","k2":{"k3":"2","k4":"3"}},{"k1":"2","k2":{"k5":"foo"}}]}
-{"id":2,"arr":[{"k1":"3","k2":{"k3":"4","k4":"5"}}]}
-1	[1,2]	[2,NULL]	[3,NULL]	[NULL,'foo']
-2	[3]	[4]	[5]	[NULL]
-{"arr":{"k1":"1","k2":{"k3":"2","k4":"3"}}}
-{"arr":{"k1":"2","k2":{"k5":"foo"}}}
-{"arr":{"k1":"3","k2":{"k3":"4","k4":"5"}}}
-('k1','Int64')
-('k2.k3','Int64')
-('k2.k4','Int64')
-('k2.k5','String')
-{"id":1,"arr":[{"k1":[{"k2":"aaa","k3":"bbb"},{"k2":"ccc"}]}]}
-{"id":2,"arr":[{"k1":[{"k3":"ddd","k4":"10"},{"k4":"20"}],"k5":{"k6":"foo"}}]}
-1	[['aaa','ccc']]	[['bbb',NULL]]	[[NULL,NULL]]	[NULL]
-2	[[NULL,NULL]]	[['ddd',NULL]]	[[10,20]]	['foo']
-{"k1":{"k2":"aaa","k3":"bbb"}}
-{"k1":{"k2":"ccc"}}
-{"k1":{"k3":"ddd","k4":"10"}}
-{"k1":{"k4":"20"}}
-('k2','String')
-('k3','String')
-('k4','Int64')
-[['{"k2":"aaa","k3":"bbb"}','{"k2":"ccc"}']]
-[['{"k3":"ddd","k4":"10"}','{"k4":"20"}']]
-{"arr":[{"x":1}]}
-{"arr":{"x":{"y":1},"t":{"y":2}}}
-{"arr":[1,{"y":1}]}
-{"arr":[2,{"y":2}]}
-{"arr":[{"x":"aaa","y":["1","2","3"]}]}
-{"arr":[{"x":1}]}
diff --git a/tests/queries/0_stateless/01825_new_type_json_in_array.sql b/tests/queries/0_stateless/01825_new_type_json_in_array.sql
deleted file mode 100644
index 42ab1f64681..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_in_array.sql
+++ /dev/null
@@ -1,39 +0,0 @@
--- Tags: no-fasttest
-
-SET allow_experimental_json_type = 1;
-SET allow_experimental_analyzer = 1;
-DROP TABLE IF EXISTS t_json_array;
-
-CREATE TABLE t_json_array (id UInt32, arr Array(JSON)) ENGINE = MergeTree ORDER BY id;
-
-INSERT INTO t_json_array FORMAT JSONEachRow {"id": 1, "arr": [{"k1": 1, "k2": {"k3": 2, "k4": 3}}, {"k1": 2, "k2": {"k5": "foo"}}]}
-
-INSERT INTO t_json_array FORMAT JSONEachRow {"id": 2, "arr": [{"k1": 3, "k2": {"k3": 4, "k4": 5}}]}
-
-
-SELECT * FROM t_json_array ORDER BY id FORMAT JSONEachRow;
-SELECT id, arr.k1, arr.k2.k3, arr.k2.k4, arr.k2.k5 FROM t_json_array ORDER BY id;
-SELECT arr FROM t_json_array ARRAY JOIN arr ORDER BY arr.k1 FORMAT JSONEachRow;
-SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(arrayJoin(arr))) as path FROM t_json_array order by path;
-
-TRUNCATE TABLE t_json_array;
-
-INSERT INTO t_json_array FORMAT JSONEachRow {"id": 1, "arr": [{"k1": [{"k2": "aaa", "k3": "bbb"}, {"k2": "ccc"}]}]}
-
-INSERT INTO t_json_array FORMAT JSONEachRow {"id": 2, "arr": [{"k1": [{"k3": "ddd", "k4": 10}, {"k4": 20}], "k5": {"k6": "foo"}}]}
-
-SELECT * FROM t_json_array ORDER BY id FORMAT JSONEachRow;
-SELECT id, arr.k1[].k2, arr.k1[].k3, arr.k1[].k4, arr.k5.k6 FROM t_json_array ORDER BY id;
-
-SELECT arrayJoin(arrayJoin(arr.k1[])) AS k1 FROM t_json_array ORDER BY toString(k1) FORMAT JSONEachRow;
-SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(arrayJoin(arrayJoin(arr.k1[])))) AS path FROM t_json_array order by path;
-
-SELECT arr.k1 FROM t_json_array GROUP BY arr.k1 ORDER BY toString(arr.k1);
-
-DROP TABLE t_json_array;
-
-SELECT * FROM values('arr Array(JSON)', '[\'{"x" : 1}\']') FORMAT JSONEachRow;
-SELECT * FROM values('arr Map(String, JSON)', '{\'x\' : \'{"y" : 1}\', \'t\' : \'{"y" : 2}\'}') FORMAT JSONEachRow;
-SELECT * FROM values('arr Tuple(Int32, JSON)', '(1, \'{"y" : 1}\')', '(2, \'{"y" : 2}\')') FORMAT JSONEachRow;
-SELECT * FROM format(JSONEachRow, '{"arr" : [{"x" : "aaa", "y" : [1,2,3]}]}') FORMAT JSONEachRow;
-SELECT * FROM values('arr Array(JSON)', '[\'{"x" : 1}\']') FORMAT JSONEachRow;
diff --git a/tests/queries/0_stateless/01825_new_type_json_in_other_types.reference b/tests/queries/0_stateless/01825_new_type_json_in_other_types.reference
deleted file mode 100644
index 03913e5098e..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_in_other_types.reference
+++ /dev/null
@@ -1,17 +0,0 @@
-Tuple(String, Map(String, Array(JSON)), JSON)
-=============
-{"id":1,"data":["foo",{"aa":[{"k1":[{"k2":"1","k3":"2"},{"k3":"3"}]},{"k1":[{"k2":"4"},{"k3":"5"},{"k2":"6"}],"k4":"qqq"}],"bb":[{"k4":"www"},{"k1":[{"k2":"7","k3":"8"},{"k2":"9","k3":"10"},{"k2":"11","k3":"12"}]}]},{"k1":"aa","k2":{"k3":"bb","k4":"c"}}]}
-{"id":2,"data":["bar",{"aa":[{"k1":[{"k2":"13","k3":"14"},{"k2":"15","k3":"16"}],"k4":"www"}]},{}]}
-{"id":3,"data":["some",{"aa":[{"k1":[{"k3":"20","k5":"some"}]}]},{"k1":"eee"}]}
-=============
-{"aa":[{"k1":[{"k2":"1","k3":"2"},{"k3":"3"}]},{"k1":[{"k2":"4"},{"k3":"5"},{"k2":"6"}],"k4":"qqq"}],"bb":[{"k4":"www"},{"k1":[{"k2":"7","k3":"8"},{"k2":"9","k3":"10"},{"k2":"11","k3":"12"}]}]}
-{"aa":[{"k1":[{"k2":"13","k3":"14"},{"k2":"15","k3":"16"}],"k4":"www"}],"bb":[]}
-{"aa":[{"k1":[{"k3":"20","k5":"some"}]}],"bb":[]}
-=============
-{"k1":[[{"k2":"1","k3":"2"},{"k3":"3"}],[{"k2":"4"},{"k3":"5"},{"k2":"6"}]],"k4":[null,"qqq"]}
-{"k1":[[{"k2":"13","k3":"14"},{"k2":"15","k3":"16"}]],"k4":["www"]}
-{"k1":[[{"k3":"20","k5":"some"}]],"k4":[null]}
-=============
-{"obj":{"k1":"aa","k2":{"k3":"bb","k4":"c"}}}
-{"obj":{}}
-{"obj":{"k1":"eee"}}
diff --git a/tests/queries/0_stateless/01825_new_type_json_in_other_types.sh b/tests/queries/0_stateless/01825_new_type_json_in_other_types.sh
deleted file mode 100755
index 1c7b64c73a1..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_in_other_types.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest
-
-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 t_json_nested"
-
-${CLICKHOUSE_CLIENT} -q "
-    CREATE TABLE t_json_nested
-    (
-        id UInt32,
-        data Tuple(String, Map(String, Array(JSON)), JSON)
-    )
-    ENGINE = MergeTree ORDER BY id" --allow_experimental_json_type 1
-
-cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_nested FORMAT JSONEachRow"
-{
-    "id": 1,
-    "data":[
-        "foo",
-        {
-            "aa": [
-                {"k1": [{"k2": 1, "k3": 2}, {"k3": 3}]},
-                {"k1": [{"k2": 4}, {"k3": 5}, {"k2": 6}], "k4": "qqq"}
-            ],
-            "bb": [
-                 {"k4": "www"},
-                 {"k1": [{"k2": 7, "k3": 8}, {"k2": 9, "k3": 10}, {"k2": 11, "k3": 12}]}
-            ]
-        },
-        {"k1": "aa", "k2": {"k3": "bb", "k4": "c"}}
-    ]
-}
-{
-    "id": 2,
-    "data":[
-        "bar",
-        {
-            "aa": [
-                {"k1": [{"k2": 13, "k3": 14}, {"k2": 15, "k3": 16}], "k4": "www"}
-            ],
-        },
-        {}
-    ]
-}
-EOF
-
-cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_nested FORMAT JSONEachRow"
-{
-    "id": 3,
-    "data":[
-        "some",
-        {
-            "aa": [
-                {"k1": [{"k3": 20, "k5": "some"}]},
-            ],
-        },
-        {"k1": "eee"}
-    ]
-}
-EOF
-
-$CLICKHOUSE_CLIENT -q "SELECT toTypeName(data) FROM t_json_nested LIMIT 1"
-
-echo "============="
-
-$CLICKHOUSE_CLIENT -q "SELECT * FROM t_json_nested ORDER BY id FORMAT JSONEachRow"
-
-echo "============="
-
-$CLICKHOUSE_CLIENT -q "
-    SELECT (data.2)['aa'] AS aa, (data.2)['bb'] AS bb
-    FROM t_json_nested ORDER BY id FORMAT JSONEachRow"
-
-echo "============="
-
-$CLICKHOUSE_CLIENT --allow_experimental_analyzer=1 -q "
-    WITH (data.2)['aa'] AS aa, (data.2)['bb'] AS bb
-    SELECT aa.k1 AS k1,
-           aa.k4 AS k4
-    FROM t_json_nested ORDER BY id FORMAT JSONEachRow"
-
-echo "============="
-
-$CLICKHOUSE_CLIENT -q "SELECT data.3 AS obj FROM t_json_nested ORDER BY id FORMAT JSONEachRow"
-
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS t_json_nested"
-
diff --git a/tests/queries/0_stateless/01825_new_type_json_insert_select.reference b/tests/queries/0_stateless/01825_new_type_json_insert_select.reference
deleted file mode 100644
index d38be29943e..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_insert_select.reference
+++ /dev/null
@@ -1,27 +0,0 @@
-('k1','Int64')
-('k2','String')
-1	{"k1":"1","k2":"foo"}
-('k1','Int64')
-('k2','String')
-('k3','String')
-1	{"k1":"1","k2":"foo"}
-2	{"k1":"2","k2":"bar"}
-3	{"k1":"3","k3":"aaa"}
-('arr','Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))')
-('arr','String')
-('k1','Int64')
-('k2','String')
-('k3','String')
-1	{"k1":"1","k2":"foo"}
-2	{"k1":"2","k2":"bar"}
-3	{"k1":"3","k3":"aaa"}
-4	{"arr":[{"k11":"5","k22":"6"},{"k11":"7","k33":"8"}]}
-5	{"arr":"not array"}
-{"data":{"k1":"1","k10":[{"a":"1","b":"2"},{"a":"2","b":"3"}]}}
-{"data":{"k1":"2","k10":[{"a":"1","b":"2","c":{"k11":"haha"}}]}}
-('k1','Int64')
-('k10','Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))')
-{"data":{"k1":"1","k10":[{"a":"1","b":"2"},{"a":"2","b":"3"}]}}
-{"data":{"k1":"2","k10":[{"a":"1","b":"2","c":{"k11":"haha"}}]}}
-('k1','Int64')
-('k10','Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))')
diff --git a/tests/queries/0_stateless/01825_new_type_json_insert_select.sql b/tests/queries/0_stateless/01825_new_type_json_insert_select.sql
deleted file mode 100644
index aff920c06ee..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_insert_select.sql
+++ /dev/null
@@ -1,73 +0,0 @@
--- Tags: no-fasttest
-
-SET allow_experimental_json_type = 1;
-
-DROP TABLE IF EXISTS type_json_src;
-DROP TABLE IF EXISTS type_json_dst;
-
-CREATE TABLE type_json_src (id UInt32, data JSON) ENGINE = MergeTree ORDER BY id;
-CREATE TABLE type_json_dst AS type_json_src;
-
-INSERT INTO type_json_src VALUES (1, '{"k1": 1, "k2": "foo"}');
-
-INSERT INTO type_json_dst SELECT * FROM type_json_src;
-
-SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(data)) AS path FROM type_json_dst ORDER BY path;
-SELECT id, data FROM type_json_dst ORDER BY id;
-
-INSERT INTO type_json_src VALUES (2, '{"k1": 2, "k2": "bar"}') (3, '{"k1": 3, "k3": "aaa"}');
-
-INSERT INTO type_json_dst SELECT * FROM type_json_src WHERE id > 1;
-
-SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(data)) AS path FROM type_json_dst ORDER BY path;
-SELECT id, data FROM type_json_dst ORDER BY id;
-
-INSERT INTO type_json_dst VALUES (4, '{"arr": [{"k11": 5, "k22": 6}, {"k11": 7, "k33": 8}]}');
-
-INSERT INTO type_json_src VALUES (5, '{"arr": "not array"}');
-
-INSERT INTO type_json_dst SELECT * FROM type_json_src WHERE id = 5;
-
-TRUNCATE TABLE type_json_src;
-INSERT INTO type_json_src VALUES (6, '{"arr": [{"k22": "str1"}]}');
-
-INSERT INTO type_json_dst SELECT * FROM type_json_src WHERE id = 5;
-
-SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(data)) AS path FROM type_json_dst ORDER BY path;
-SELECT id, data FROM type_json_dst ORDER BY id;
-
-DROP TABLE type_json_src;
-DROP TABLE type_json_dst;
-
-CREATE TABLE type_json_dst (data JSON) ENGINE = MergeTree ORDER BY tuple();
-CREATE TABLE type_json_src (data String) ENGINE = MergeTree ORDER BY tuple();
-
-SYSTEM STOP MERGES type_json_src;
-
-SET max_threads = 1;
-SET max_insert_threads = 1;
-SET output_format_json_named_tuples_as_objects = 1;
-
-INSERT INTO type_json_src FORMAT JSONAsString {"k1": 1, "k10": [{"a": "1", "b": "2"}, {"a": "2", "b": "3"}]};
-
-INSERT INTO type_json_src FORMAT JSONAsString  {"k1": 2, "k10": [{"a": "1", "b": "2", "c": {"k11": "haha"}}]};
-
-INSERT INTO type_json_dst SELECT data FROM type_json_src;
-
-SELECT * FROM type_json_dst ORDER BY data.k1 FORMAT JSONEachRow;
-SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(data)) AS path FROM type_json_dst ORDER BY path;
-
-TRUNCATE TABLE type_json_src;
-TRUNCATE TABLE type_json_dst;
-
-INSERT INTO type_json_src FORMAT JSONAsString  {"k1": 2, "k10": [{"a": "1", "b": "2", "c": {"k11": "haha"}}]};
-
-INSERT INTO type_json_src FORMAT JSONAsString {"k1": 1, "k10": [{"a": "1", "b": "2"}, {"a": "2", "b": "3"}]};
-
-INSERT INTO type_json_dst SELECT data FROM type_json_src;
-
-SELECT * FROM type_json_dst ORDER BY data.k1 FORMAT JSONEachRow;
-SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(data)) AS path FROM type_json_dst ORDER BY path;
-
-DROP TABLE type_json_src;
-DROP TABLE type_json_dst;
diff --git a/tests/queries/0_stateless/01825_new_type_json_missed_values.reference b/tests/queries/0_stateless/01825_new_type_json_missed_values.reference
deleted file mode 100644
index 952b5652bc1..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_missed_values.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-('foo','Int64')
-('k1','Int64')
-('k2','Int64')
-1
diff --git a/tests/queries/0_stateless/01825_new_type_json_missed_values.sql b/tests/queries/0_stateless/01825_new_type_json_missed_values.sql
deleted file mode 100644
index 84bd8a19c18..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_missed_values.sql
+++ /dev/null
@@ -1,19 +0,0 @@
--- Tags: no-fasttest
-
-DROP TABLE IF EXISTS t_json;
-
-SET allow_experimental_json_type = 1;
-
-CREATE TABLE t_json(id UInt64, obj JSON)
-ENGINE = MergeTree ORDER BY id
-SETTINGS min_bytes_for_wide_part = 0;
-
-SYSTEM STOP MERGES t_json;
-
-INSERT INTO t_json SELECT number, '{"k1": 1, "k2": 2}' FROM numbers(1000000);
-INSERT INTO t_json VALUES (1000001, '{"foo": 1}');
-
-SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(obj)) AS path FROM t_json ORDER BY path;
-SELECT count() FROM t_json WHERE obj.foo IS NOT NULL;
-
-DROP TABLE IF EXISTS t_json;
diff --git a/tests/queries/0_stateless/01825_new_type_json_multiple_files.reference b/tests/queries/0_stateless/01825_new_type_json_multiple_files.reference
deleted file mode 100644
index 63c12792c17..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_multiple_files.reference
+++ /dev/null
@@ -1,22 +0,0 @@
-{"data":{"k0":"100"}}
-{"data":{"k1":"100"}}
-{"data":{"k2":"100"}}
-{"data":{"k3":"100"}}
-{"data":{"k4":"100"}}
-{"data":{"k5":"100"}}
-('k0','Int64')
-('k1','Int64')
-('k2','Int64')
-('k3','Int64')
-('k4','Int64')
-('k5','Int64')
-{"data":{"k0":"100"}}
-{"data":{"k1":"100"}}
-{"data":{"k2":"100"}}
-('k0','Int64')
-('k1','Int64')
-('k2','Int64')
-{"data":{"k1":"100"}}
-{"data":{"k3":"100"}}
-('k1','Int64')
-('k3','Int64')
diff --git a/tests/queries/0_stateless/01825_new_type_json_multiple_files.sh b/tests/queries/0_stateless/01825_new_type_json_multiple_files.sh
deleted file mode 100755
index 9cb37987628..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_multiple_files.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-for f in "${USER_FILES_PATH:?}/${CLICKHOUSE_DATABASE}"_*.json; do
-    [ -e $f ] && rm $f
-done
-
-for i in {0..5}; do
-    echo "{\"k$i\": 100}" > "$USER_FILES_PATH/${CLICKHOUSE_DATABASE}_$i.json"
-done
-
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS t_json_files"
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE t_json_files (file String, data JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_json_type 1
-
-${CLICKHOUSE_CLIENT} -q "INSERT INTO t_json_files SELECT _file, data FROM file('${CLICKHOUSE_DATABASE}_*.json', 'JSONAsObject', 'data JSON')" --allow_experimental_json_type 1
-
-${CLICKHOUSE_CLIENT} -q "SELECT data FROM t_json_files ORDER BY file FORMAT JSONEachRow" --output_format_json_named_tuples_as_objects 1
-${CLICKHOUSE_CLIENT} -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(data)) AS path FROM t_json_files ORDER BY path"
-
-${CLICKHOUSE_CLIENT} -q "TRUNCATE TABLE IF EXISTS t_json_files"
-
-${CLICKHOUSE_CLIENT} -q "INSERT INTO t_json_files \
-    SELECT _file, data FROM file('${CLICKHOUSE_DATABASE}_*.json', 'JSONAsObject', 'data JSON') \
-    ORDER BY _file LIMIT 3" --max_threads 1 --min_insert_block_size_rows 1 --max_insert_block_size 1 --max_block_size 1 --allow_experimental_json_type 1
-
-${CLICKHOUSE_CLIENT} -q "SELECT data FROM t_json_files ORDER BY file, data FORMAT JSONEachRow" --output_format_json_named_tuples_as_objects 1
-${CLICKHOUSE_CLIENT} -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(data)) AS path FROM t_json_files ORDER BY path"
-
-${CLICKHOUSE_CLIENT} -q "TRUNCATE TABLE IF EXISTS t_json_files"
-
-${CLICKHOUSE_CLIENT} -q "INSERT INTO t_json_files \
-    SELECT _file, data FROM file('${CLICKHOUSE_DATABASE}_*.json', 'JSONAsObject', 'data JSON') \
-    WHERE _file IN ('${CLICKHOUSE_DATABASE}_1.json', '${CLICKHOUSE_DATABASE}_3.json')" --allow_experimental_json_type 1
-
-${CLICKHOUSE_CLIENT} -q "SELECT data FROM t_json_files ORDER BY file FORMAT JSONEachRow" --output_format_json_named_tuples_as_objects 1
-${CLICKHOUSE_CLIENT} -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(data)) AS path FROM t_json_files ORDER BY path"
-
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS t_json_files"
-rm "$USER_FILES_PATH"/${CLICKHOUSE_DATABASE}_*.json
diff --git a/tests/queries/0_stateless/01825_new_type_json_mutations.reference b/tests/queries/0_stateless/01825_new_type_json_mutations.reference
deleted file mode 100644
index c7523661a3b..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_mutations.reference
+++ /dev/null
@@ -1,7 +0,0 @@
-1	q	{"k1":"1","k2":"2","k3":[{"k4":"aaa"},{"k4":"bbb"}]}
-2	w	{"k1":"3","k2":"4","k3":[{"k4":"ccc"}]}
-3	e	{"k1":"5","k2":"6"}
-1	q	{"k1":"1","k2":"2","k3":[{"k4":"aaa"},{"k4":"bbb"}]}
-3	e	{"k1":"5","k2":"6"}
-1	foo
-3	foo
diff --git a/tests/queries/0_stateless/01825_new_type_json_mutations.sql b/tests/queries/0_stateless/01825_new_type_json_mutations.sql
deleted file mode 100644
index 77feee692d9..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_mutations.sql
+++ /dev/null
@@ -1,21 +0,0 @@
--- Tags: no-fasttest
-
-DROP TABLE IF EXISTS t_json_mutations;
-
-SET allow_experimental_json_type = 1;
-SET output_format_json_named_tuples_as_objects = 1;
-SET mutations_sync = 2;
-
-CREATE TABLE t_json_mutations(id UInt32, s String, obj JSON) ENGINE = MergeTree ORDER BY id;
-
-INSERT INTO t_json_mutations VALUES (1, 'q', '{"k1": 1, "k2": 2, "k3": [{"k4": "aaa"}, {"k4": "bbb"}]}');
-INSERT INTO t_json_mutations VALUES (2, 'w', '{"k1": 3, "k2": 4, "k3": [{"k4": "ccc"}]}');
-INSERT INTO t_json_mutations VALUES (3, 'e', '{"k1": 5, "k2": 6}');
-
-SELECT * FROM t_json_mutations ORDER BY id;
-ALTER TABLE t_json_mutations DELETE WHERE id = 2;
-SELECT * FROM t_json_mutations ORDER BY id;
-ALTER TABLE t_json_mutations DROP COLUMN s, DROP COLUMN obj, ADD COLUMN t String DEFAULT 'foo';
-SELECT * FROM t_json_mutations ORDER BY id;
-
-DROP TABLE t_json_mutations;
diff --git a/tests/queries/0_stateless/01825_new_type_json_nbagames.reference b/tests/queries/0_stateless/01825_new_type_json_nbagames.reference
deleted file mode 100644
index 9be03136b68..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_nbagames.reference
+++ /dev/null
@@ -1,61 +0,0 @@
-1000
-('_id.$oid','String')
-('date.$date','String')
-('teams','Array(JSON(max_dynamic_types=16, max_dynamic_paths=256))')
-('abbreviation','String')
-('city','String')
-('home','Bool')
-('name','String')
-('players','Array(JSON(max_dynamic_types=8, max_dynamic_paths=64))')
-('results.ast','Int64')
-('results.blk','Int64')
-('results.drb','Int64')
-('results.fg','Int64')
-('results.fg3','Int64')
-('results.fg3_pct','String')
-('results.fg3a','Int64')
-('results.fg_pct','String')
-('results.fga','Int64')
-('results.ft','Int64')
-('results.ft_pct','String')
-('results.fta','Int64')
-('results.mp','Int64')
-('results.orb','Int64')
-('results.pf','Int64')
-('results.pts','Int64')
-('results.stl','Int64')
-('results.tov','Int64')
-('results.trb','Int64')
-('score','Int64')
-('won','Int64')
-Boston Celtics	70
-Los Angeles Lakers	64
-Milwaukee Bucks	61
-Philadelphia 76ers	57
-Atlanta Hawks	55
-('ast','Int64')
-('blk','Int64')
-('drb','Int64')
-('fg','Int64')
-('fg3','Int64')
-('fg3_pct','String')
-('fg3a','Int64')
-('fg_pct','String')
-('fga','Int64')
-('ft','Int64')
-('ft_pct','String')
-('fta','Int64')
-('mp','String')
-('orb','Int64')
-('pf','Int64')
-('player','String')
-('pts','Int64')
-('stl','Int64')
-('tov','Int64')
-('trb','Int64')
-Larry Bird	10
-Clyde Drexler	4
-Alvin Robertson	3
-Magic Johnson	3
-Charles Barkley	2
-1
diff --git a/tests/queries/0_stateless/01825_new_type_json_nbagames.sh b/tests/queries/0_stateless/01825_new_type_json_nbagames.sh
deleted file mode 100755
index 20eba88eda4..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_nbagames.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest
-
-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 nbagames"
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS nbagames_string"
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS nbagames_from_string"
-
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE nbagames (data JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_json_type 1
-
-cat $CUR_DIR/data_json/nbagames_sample.json | ${CLICKHOUSE_CLIENT} -q "INSERT INTO nbagames FORMAT JSONAsObject"
-
-${CLICKHOUSE_CLIENT} -q "SELECT count() FROM nbagames WHERE NOT ignore(*)"
-${CLICKHOUSE_CLIENT} -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(data)) as path from nbagames order by path"
-${CLICKHOUSE_CLIENT} -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(arrayJoin(data.teams[]))) as path from nbagames order by path"
-
-${CLICKHOUSE_CLIENT} --allow_experimental_analyzer=1 -q  \
-    "SELECT teams.name.:String AS name, sum(teams.won.:Int64) AS wins FROM nbagames \
-    ARRAY JOIN data.teams[] AS teams GROUP BY name \
-    ORDER BY wins DESC LIMIT 5;"
-
-${CLICKHOUSE_CLIENT} -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(arrayJoin(arrayJoin(data.teams[].players[])))) as path from nbagames order by path"
-
-${CLICKHOUSE_CLIENT} --allow_experimental_analyzer=1 -q \
-"SELECT player, sum(triple_double) AS triple_doubles FROM \
-( \
-    SELECT \
-        arrayJoin(arrayJoin(data.teams[].players[])) as players, \
-        players.player.:String as player, \
-        ((players.pts.:Int64 >= 10) + \
-        (players.ast.:Int64 >= 10) + \
-        (players.blk.:Int64 >= 10) + \
-        (players.stl.:Int64 >= 10) + \
-        (players.trb.:Int64 >= 10)) >= 3 AS triple_double \
-        from nbagames \
-) \
-GROUP BY player ORDER BY triple_doubles DESC, player LIMIT 5"
-
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE nbagames_string (data String) ENGINE = MergeTree ORDER BY tuple()"
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE nbagames_from_string (data JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_json_type 1
-
-cat $CUR_DIR/data_json/nbagames_sample.json | ${CLICKHOUSE_CLIENT} -q "INSERT INTO nbagames_string FORMAT JSONAsString"
-${CLICKHOUSE_CLIENT} -q "INSERT INTO nbagames_from_string SELECT data FROM nbagames_string"
-
-${CLICKHOUSE_CLIENT} -q "SELECT \
-    (SELECT groupUniqArrayMap(JSONAllPathsWithTypes(data)), sum(cityHash64(toString(data))) FROM nbagames_from_string) = \
-    (SELECT groupUniqArrayMap(JSONAllPathsWithTypes(data)), sum(cityHash64(toString(data))) FROM nbagames)"
-
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS nbagames"
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS nbagames_string"
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS nbagames_from_string"
diff --git a/tests/queries/0_stateless/01825_new_type_json_order_by.reference b/tests/queries/0_stateless/01825_new_type_json_order_by.reference
deleted file mode 100644
index 611d2835127..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_order_by.reference
+++ /dev/null
@@ -1,6 +0,0 @@
-0
-0
-{"k":"v"}
-
-{"k":"v"}
-{"k":"v"}
diff --git a/tests/queries/0_stateless/01825_new_type_json_order_by.sql b/tests/queries/0_stateless/01825_new_type_json_order_by.sql
deleted file mode 100644
index 6b5fb40aed4..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_order_by.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- Tags: no-fasttest
-
-SET allow_experimental_json_type = 1;
-SELECT dummy FROM system.one ORDER BY materialize('{"k":"v"}'::JSON);
-SELECT dummy FROM system.one ORDER BY materialize('{"k":"v"}'::JSON), dummy;
-SELECT materialize('{"k":"v"}'::JSON) SETTINGS extremes = 1;
diff --git a/tests/queries/0_stateless/01825_new_type_json_parallel_insert.reference b/tests/queries/0_stateless/01825_new_type_json_parallel_insert.reference
deleted file mode 100644
index 7cf3855d684..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_parallel_insert.reference
+++ /dev/null
@@ -1 +0,0 @@
-{'k1':['Int64'],'k2':['String']}	500000
diff --git a/tests/queries/0_stateless/01825_new_type_json_parallel_insert.sql b/tests/queries/0_stateless/01825_new_type_json_parallel_insert.sql
deleted file mode 100644
index a8457ff4f15..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_parallel_insert.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- Tags: long
-DROP TABLE IF EXISTS t_json_parallel;
-
-SET allow_experimental_json_type = 1, max_insert_threads = 20, max_threads = 20, min_insert_block_size_rows = 65536;
-CREATE TABLE t_json_parallel (data JSON) ENGINE = MergeTree ORDER BY tuple();
-
-INSERT INTO t_json_parallel SELECT materialize('{"k1":1, "k2": "some"}') FROM numbers_mt(500000);
-SELECT groupUniqArrayMap(JSONAllPathsWithTypes(data)), count() FROM t_json_parallel;
-
-DROP TABLE t_json_parallel;
diff --git a/tests/queries/0_stateless/01825_new_type_json_partitions.reference b/tests/queries/0_stateless/01825_new_type_json_partitions.reference
deleted file mode 100644
index c5839472132..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_partitions.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-{"id":1,"obj":{"k1":"v1"}}
-{"id":2,"obj":{"k2":"v2"}}
diff --git a/tests/queries/0_stateless/01825_new_type_json_partitions.sql b/tests/queries/0_stateless/01825_new_type_json_partitions.sql
deleted file mode 100644
index d1f37dedded..00000000000
--- a/tests/queries/0_stateless/01825_new_type_json_partitions.sql
+++ /dev/null
@@ -1,14 +0,0 @@
--- Tags: no-fasttest
-
-DROP TABLE IF EXISTS t_json_partitions;
-
-SET allow_experimental_json_type = 1;
-
-CREATE TABLE t_json_partitions (id UInt32, obj JSON)
-ENGINE MergeTree ORDER BY id PARTITION BY id;
-
-INSERT INTO t_json_partitions FORMAT JSONEachRow {"id": 1, "obj": {"k1": "v1"}} {"id": 2, "obj": {"k2": "v2"}};
-
-SELECT * FROM t_json_partitions ORDER BY id FORMAT JSONEachRow;
-
-DROP TABLE t_json_partitions;
diff --git a/tests/queries/0_stateless/01825_type_json_1.sql b/tests/queries/0_stateless/01825_type_json_1.sql
index dd7c1d2b41f..6876349677e 100644
--- a/tests/queries/0_stateless/01825_type_json_1.sql
+++ b/tests/queries/0_stateless/01825_type_json_1.sql
@@ -10,7 +10,6 @@ ENGINE = MergeTree ORDER BY tuple();
 SYSTEM STOP MERGES t_json;
 
 INSERT INTO t_json FORMAT JSONEachRow {"id": 1, "data": {"k1": "aa", "k2": {"k3": "bb", "k4": "c"}}} {"id": 2, "data": {"k1": "ee", "k5": "ff"}};
-
 INSERT INTO t_json FORMAT JSONEachRow {"id": 3, "data": {"k5":"foo"}};
 
 SELECT id, data.k1, data.k2.k3, data.k2.k4, data.k5 FROM t_json ORDER BY id;
@@ -33,7 +32,6 @@ SELECT '============';
 TRUNCATE TABLE t_json;
 
 INSERT INTO t_json FORMAT JSONEachRow {"id": 1, "data": {"k1":[{"k2":"aaa","k3":[{"k4":"bbb"},{"k4":"ccc"}]},{"k2":"ddd","k3":[{"k4":"eee"},{"k4":"fff"}]}]}};
-
 SELECT id, data.k1.k2, data.k1.k3.k4 FROM t_json ORDER BY id;
 
 SELECT name, column, type
@@ -84,5 +82,4 @@ ORDER BY name;
 
 DROP TABLE IF EXISTS t_json;
 
--- Restore it after it is fixed.
--- CREATE TABLE t_json(id UInt64, data Object('JSON')) ENGINE = Log; -- { serverError ILLEGAL_COLUMN }
+CREATE TABLE t_json(id UInt64, data Object('JSON')) ENGINE = Log; -- { serverError ILLEGAL_COLUMN }
diff --git a/tests/queries/0_stateless/01825_type_json_10.sql b/tests/queries/0_stateless/01825_type_json_10.sql
index 3ddbf85ba63..98f1a766ed8 100644
--- a/tests/queries/0_stateless/01825_type_json_10.sql
+++ b/tests/queries/0_stateless/01825_type_json_10.sql
@@ -4,10 +4,9 @@ SET allow_experimental_object_type = 1;
 SET output_format_json_named_tuples_as_objects = 1;
 
 DROP TABLE IF EXISTS t_json_10;
-CREATE TABLE t_json_10 (o Object('json')) ENGINE = Memory;
+CREATE TABLE t_json_10 (o JSON) ENGINE = Memory;
 
 INSERT INTO t_json_10 FORMAT JSONAsObject {"a": {"b": 1, "c": [{"d": 10, "e": [31]}, {"d": 20, "e": [63, 127]}]}} {"a": {"b": 2, "c": []}}
-
 INSERT INTO t_json_10 FORMAT JSONAsObject {"a": {"b": 3, "c": [{"f": 20, "e": [32]}, {"f": 30, "e": [64, 128]}]}} {"a": {"b": 4, "c": []}}
 
 SELECT DISTINCT toTypeName(o) FROM t_json_10;
diff --git a/tests/queries/0_stateless/01825_type_json_11.sh b/tests/queries/0_stateless/01825_type_json_11.sh
index 6109dff53a6..dbed15c8bb9 100755
--- a/tests/queries/0_stateless/01825_type_json_11.sh
+++ b/tests/queries/0_stateless/01825_type_json_11.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS t_json_11"
 
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_11 (obj Object('json')) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
+$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_11 (obj JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
 
 cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_11 FORMAT JSONAsObject"
 {
diff --git a/tests/queries/0_stateless/01825_type_json_12.sh b/tests/queries/0_stateless/01825_type_json_12.sh
index 8805372e8e3..2db3f1c55dc 100755
--- a/tests/queries/0_stateless/01825_type_json_12.sh
+++ b/tests/queries/0_stateless/01825_type_json_12.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS t_json_12"
 
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_12 (obj Object('json')) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
+$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_12 (obj JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
 
 cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_12 FORMAT JSONAsObject"
 {
diff --git a/tests/queries/0_stateless/01825_type_json_13.sh b/tests/queries/0_stateless/01825_type_json_13.sh
index b887586fc63..17c36c547ee 100755
--- a/tests/queries/0_stateless/01825_type_json_13.sh
+++ b/tests/queries/0_stateless/01825_type_json_13.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS t_json_13"
 
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_13 (obj Object('json')) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
+$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_13 (obj JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
 
 cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_13 FORMAT JSONAsObject"
 {
diff --git a/tests/queries/0_stateless/01825_type_json_14.sql b/tests/queries/0_stateless/01825_type_json_14.sql
index b68aec9d6a4..3c8951a2a43 100644
--- a/tests/queries/0_stateless/01825_type_json_14.sql
+++ b/tests/queries/0_stateless/01825_type_json_14.sql
@@ -4,7 +4,7 @@ SET allow_experimental_object_type = 1;
 SET output_format_json_named_tuples_as_objects = 1;
 
 DROP TABLE IF EXISTS t_json_14;
-CREATE TABLE t_json_14 (id UInt32, o Object('json')) ENGINE = Memory;
+CREATE TABLE t_json_14 (id UInt32, o JSON) ENGINE = Memory;
 
 INSERT INTO t_json_14 VALUES (1, '{"key_10":65536,"key_11":"anve","key_0":{"key_1":{"key_2":1025,"key_3":1},"key_4":1,"key_5":256}}');
 INSERT INTO t_json_14 VALUES (2, '{"key_0":[{"key_12":"buwvq","key_11":0.0000000255}]}'); -- { serverError INCOMPATIBLE_COLUMNS }
diff --git a/tests/queries/0_stateless/01825_type_json_15.sh b/tests/queries/0_stateless/01825_type_json_15.sh
index 413ee66d25e..9e18988f30b 100755
--- a/tests/queries/0_stateless/01825_type_json_15.sh
+++ b/tests/queries/0_stateless/01825_type_json_15.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS t_json_15"
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_15 (obj Object('json')) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
+$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_15 (obj JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
 
 cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_15 FORMAT JSONAsObject"
 {
diff --git a/tests/queries/0_stateless/01825_type_json_16.sh b/tests/queries/0_stateless/01825_type_json_16.sh
index 96f59bc397c..e175344ee84 100755
--- a/tests/queries/0_stateless/01825_type_json_16.sh
+++ b/tests/queries/0_stateless/01825_type_json_16.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS t_json_16"
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_16 (obj Object('json')) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
+$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_16 (obj JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
 
 cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_16 FORMAT JSONAsObject"
 {
diff --git a/tests/queries/0_stateless/01825_type_json_17.sql b/tests/queries/0_stateless/01825_type_json_17.sql
index d531b904f8c..ee5cf590407 100644
--- a/tests/queries/0_stateless/01825_type_json_17.sql
+++ b/tests/queries/0_stateless/01825_type_json_17.sql
@@ -4,7 +4,7 @@ DROP TABLE IF EXISTS t_json_17;
 SET allow_experimental_object_type = 1;
 SET output_format_json_named_tuples_as_objects = 1;
 
-CREATE TABLE t_json_17(obj Object('json'))
+CREATE TABLE t_json_17(obj JSON)
 ENGINE = MergeTree ORDER BY tuple();
 
 DROP FUNCTION IF EXISTS hasValidSizes17;
@@ -13,7 +13,6 @@ CREATE FUNCTION hasValidSizes17 AS (arr1, arr2) -> length(arr1) = length(arr2) A
 SYSTEM STOP MERGES t_json_17;
 
 INSERT INTO t_json_17 FORMAT JSONAsObject {"id": 1, "arr": [{"k1": [{"k2": "aaa", "k3": "bbb"}, {"k2": "ccc"}]}]}
-
 INSERT INTO t_json_17 FORMAT JSONAsObject {"id": 2, "arr": [{"k1": [{"k3": "ddd", "k4": 10}, {"k4": 20}], "k5": {"k6": "foo"}}]}
 
 SELECT toTypeName(obj) FROM t_json_17 LIMIT 1;
@@ -25,7 +24,6 @@ SELECT obj.arr.k1.k4 FROM t_json_17 ORDER BY obj.id;
 TRUNCATE TABLE t_json_17;
 
 INSERT INTO t_json_17 FORMAT JSONAsObject {"id": 1, "arr": [{"k1": [{"k2": "aaa"}]}]}
-
 INSERT INTO t_json_17 FORMAT JSONAsObject {"id": 2, "arr": [{"k1": [{"k2": "bbb", "k3": [{"k4": 10}]}, {"k2": "ccc", "k3": [{"k4": 20}]}]}]}
 
 SELECT toTypeName(obj) FROM t_json_17 LIMIT 1;
@@ -37,9 +35,7 @@ SELECT obj.arr.k1.k3.k4 FROM t_json_17 ORDER BY obj.id;
 TRUNCATE TABLE t_json_17;
 
 INSERT INTO t_json_17 FORMAT JSONAsObject {"id": 1, "arr": [{"k3": "qqq"}, {"k3": "www"}]}
-
 INSERT INTO t_json_17 FORMAT JSONAsObject {"id": 2, "arr": [{"k1": [{"k2": "aaa"}], "k3": "eee"}]}
-
 INSERT INTO t_json_17 FORMAT JSONAsObject {"id": 3, "arr": [{"k1": [{"k2": "bbb", "k4": [{"k5": 10}]}, {"k2": "ccc", "k4": [{"k5": 20}]}], "k3": "rrr"}]}
 
 SELECT toTypeName(obj) FROM t_json_17 LIMIT 1;
diff --git a/tests/queries/0_stateless/01825_type_json_18.sql b/tests/queries/0_stateless/01825_type_json_18.sql
index 26bab5ff9e5..b493982a12c 100644
--- a/tests/queries/0_stateless/01825_type_json_18.sql
+++ b/tests/queries/0_stateless/01825_type_json_18.sql
@@ -8,11 +8,9 @@ CREATE TABLE t_json_2(id UInt64, data Object('JSON'))
 ENGINE = MergeTree ORDER BY tuple();
 
 INSERT INTO t_json_2 FORMAT JSONEachRow {"id": 1, "data" : {"k1": 1}};
-
 SELECT id, data, toTypeName(data) FROM t_json_2 ORDER BY id;
 
 TRUNCATE TABLE t_json_2;
 
 INSERT INTO t_json_2 FORMAT JSONEachRow {"id": 1, "data" : {"k1": [1, 2]}};
-
 SELECT id, data, toTypeName(data) FROM t_json_2 ORDER BY id;
diff --git a/tests/queries/0_stateless/01825_type_json_3.sql.j2 b/tests/queries/0_stateless/01825_type_json_3.sql.j2
index 81095667046..0fbf7a936d8 100644
--- a/tests/queries/0_stateless/01825_type_json_3.sql.j2
+++ b/tests/queries/0_stateless/01825_type_json_3.sql.j2
@@ -8,7 +8,7 @@ SET allow_experimental_object_type = 1;
 
 DROP TABLE IF EXISTS t_json_3;
 
-CREATE TABLE t_json_3(id UInt64, data Object('json'))
+CREATE TABLE t_json_3(id UInt64, data JSON)
 ENGINE = {{ engine }};
 
 {% if 'MergeTree' in engine %}
diff --git a/tests/queries/0_stateless/01825_type_json_4.sh b/tests/queries/0_stateless/01825_type_json_4.sh
index 15a3821706f..4d81e9516c9 100755
--- a/tests/queries/0_stateless/01825_type_json_4.sh
+++ b/tests/queries/0_stateless/01825_type_json_4.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS t_json_4"
 
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_4(id UInt64, data Object('json')) \
+$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_4(id UInt64, data JSON) \
 ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
 
 echo '{"id": 1, "data": {"k1": "v1"}}, {"id": 2, "data": {"k1": [1, 2]}}' \
diff --git a/tests/queries/0_stateless/01825_type_json_5.sql b/tests/queries/0_stateless/01825_type_json_5.sql
index f50eee6b8ef..b939a960e32 100644
--- a/tests/queries/0_stateless/01825_type_json_5.sql
+++ b/tests/queries/0_stateless/01825_type_json_5.sql
@@ -2,14 +2,14 @@
 
 SET allow_experimental_object_type = 1;
 
-SELECT '{"a": {"b": 1, "c": 2}}'::Object('JSON') AS s;
-SELECT '{"a": {"b": 1, "c": 2}}'::Object('JSON') AS s format JSONEachRow;
+SELECT '{"a": {"b": 1, "c": 2}}'::JSON AS s;
+SELECT '{"a": {"b": 1, "c": 2}}'::JSON AS s format JSONEachRow;
 
 DROP TABLE IF EXISTS t_json_5;
 DROP TABLE IF EXISTS t_json_str_5;
 
 CREATE TABLE t_json_str_5 (data String) ENGINE = MergeTree ORDER BY tuple();
-CREATE TABLE t_json_5 (data Object('json')) ENGINE = MergeTree ORDER BY tuple();
+CREATE TABLE t_json_5 (data JSON) ENGINE = MergeTree ORDER BY tuple();
 
 INSERT INTO t_json_str_5 FORMAT JSONAsString {"k1": 1, "k2": {"k4": [22, 33]}}, {"k1": 2, "k2": {"k3": "qqq", "k4": [44]}}
 ;
diff --git a/tests/queries/0_stateless/01825_type_json_6.sh b/tests/queries/0_stateless/01825_type_json_6.sh
index f3475541dc6..8bbb1abee4a 100755
--- a/tests/queries/0_stateless/01825_type_json_6.sh
+++ b/tests/queries/0_stateless/01825_type_json_6.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS t_json_6;"
 
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_6 (data Object('json')) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
+$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_6 (data JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
 
 cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_6 FORMAT JSONAsObject"
 {
diff --git a/tests/queries/0_stateless/01825_type_json_7.sh b/tests/queries/0_stateless/01825_type_json_7.sh
index 10fb59a08f8..a6c8c53f995 100755
--- a/tests/queries/0_stateless/01825_type_json_7.sh
+++ b/tests/queries/0_stateless/01825_type_json_7.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS t_json_7;"
 
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_7 (data Object('json')) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
+$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_7 (data JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
 
 cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_7 FORMAT JSONAsObject"
 {
diff --git a/tests/queries/0_stateless/01825_type_json_8.sh b/tests/queries/0_stateless/01825_type_json_8.sh
index 3dc418f8f84..e73569e6777 100755
--- a/tests/queries/0_stateless/01825_type_json_8.sh
+++ b/tests/queries/0_stateless/01825_type_json_8.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS t_json_8"
 
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_8 (data Object('json')) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
+$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_8 (data JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
 
 cat <<EOF | $CLICKHOUSE_CLIENT -q "INSERT INTO t_json_8 FORMAT JSONAsObject"
 {
diff --git a/tests/queries/0_stateless/01825_type_json_9.sql b/tests/queries/0_stateless/01825_type_json_9.sql
index b530660cae8..8fa4b335578 100644
--- a/tests/queries/0_stateless/01825_type_json_9.sql
+++ b/tests/queries/0_stateless/01825_type_json_9.sql
@@ -4,10 +4,9 @@ DROP TABLE IF EXISTS t_json;
 
 SET allow_experimental_object_type = 1;
 
-CREATE TABLE t_json(id UInt64, obj Object('json')) ENGINE = MergeTree ORDER BY id;
+CREATE TABLE t_json(id UInt64, obj JSON) ENGINE = MergeTree ORDER BY id;
 
 INSERT INTO t_json format JSONEachRow {"id": 1, "obj": {"foo": 1, "k1": 2}};
-
 INSERT INTO t_json format JSONEachRow {"id": 2, "obj": {"foo": 1, "k2": 2}};
 
 OPTIMIZE TABLE t_json FINAL;
diff --git a/tests/queries/0_stateless/01825_type_json_add_column.sql.j2 b/tests/queries/0_stateless/01825_type_json_add_column.sql.j2
index 6ac331cfbc1..d787ba9b163 100644
--- a/tests/queries/0_stateless/01825_type_json_add_column.sql.j2
+++ b/tests/queries/0_stateless/01825_type_json_add_column.sql.j2
@@ -9,7 +9,7 @@ SET allow_experimental_object_type = 1;
 CREATE TABLE t_json_add_column (id UInt64) ENGINE = {{ storage }} ORDER BY tuple();
 
 INSERT INTO t_json_add_column VALUES (1);
-ALTER TABLE t_json_add_column ADD COLUMN s Object('json');
+ALTER TABLE t_json_add_column ADD COLUMN s JSON;
 
 INSERT INTO t_json_add_column VALUES(2, '{"k1": 100}');
 
diff --git a/tests/queries/0_stateless/01825_type_json_bools.sql b/tests/queries/0_stateless/01825_type_json_bools.sql
index c6cbbc9539f..03c521a67bb 100644
--- a/tests/queries/0_stateless/01825_type_json_bools.sql
+++ b/tests/queries/0_stateless/01825_type_json_bools.sql
@@ -3,7 +3,7 @@
 DROP TABLE IF EXISTS t_json_bools;
 SET allow_experimental_object_type = 1;
 
-CREATE TABLE t_json_bools (data Object('json')) ENGINE = Memory;
+CREATE TABLE t_json_bools (data JSON) ENGINE = Memory;
 INSERT INTO t_json_bools VALUES ('{"k1": true, "k2": false}');
 SELECT data, toTypeName(data) FROM t_json_bools;
 
diff --git a/tests/queries/0_stateless/01825_type_json_btc.sh b/tests/queries/0_stateless/01825_type_json_btc.sh
index c2cb7937392..ebc5482de7a 100755
--- a/tests/queries/0_stateless/01825_type_json_btc.sh
+++ b/tests/queries/0_stateless/01825_type_json_btc.sh
@@ -11,7 +11,7 @@ cp $CUR_DIR/data_json/btc_transactions.json ${CLICKHOUSE_USER_FILES_UNIQUE}/
 
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS btc"
 
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE btc (data Object('json')) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE btc (data JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
 
 ${CLICKHOUSE_CLIENT} -q "INSERT INTO btc SELECT * FROM file('${CLICKHOUSE_TEST_UNIQUE_NAME}/btc_transactions.json', 'JSONAsObject')"
 
diff --git a/tests/queries/0_stateless/01825_type_json_describe.sql b/tests/queries/0_stateless/01825_type_json_describe.sql
index ab30e5c642b..cd7c4ff8c8c 100644
--- a/tests/queries/0_stateless/01825_type_json_describe.sql
+++ b/tests/queries/0_stateless/01825_type_json_describe.sql
@@ -5,7 +5,7 @@ SET allow_experimental_object_type = 1;
 
 DROP TABLE IF EXISTS t_json_desc;
 
-CREATE TABLE t_json_desc (data Object('json')) ENGINE = MergeTree ORDER BY tuple();
+CREATE TABLE t_json_desc (data JSON) ENGINE = MergeTree ORDER BY tuple();
 
 INSERT INTO t_json_desc FORMAT JSONAsObject {"k1": 10}
 ;
diff --git a/tests/queries/0_stateless/01825_type_json_distributed.sql b/tests/queries/0_stateless/01825_type_json_distributed.sql
index 89dab8f0ff3..70cc0743556 100644
--- a/tests/queries/0_stateless/01825_type_json_distributed.sql
+++ b/tests/queries/0_stateless/01825_type_json_distributed.sql
@@ -5,7 +5,7 @@ SET allow_experimental_object_type = 1;
 DROP TABLE IF EXISTS t_json_local;
 DROP TABLE IF EXISTS t_json_dist;
 
-CREATE TABLE t_json_local(data Object('json')) ENGINE = MergeTree ORDER BY tuple();
+CREATE TABLE t_json_local(data JSON) ENGINE = MergeTree ORDER BY tuple();
 CREATE TABLE t_json_dist AS t_json_local ENGINE = Distributed(test_cluster_two_shards, currentDatabase(), t_json_local);
 
 INSERT INTO t_json_local FORMAT JSONAsObject {"k1": 2, "k2": {"k3": "qqq", "k4": [44, 55]}}
diff --git a/tests/queries/0_stateless/01825_type_json_empty_string.sql b/tests/queries/0_stateless/01825_type_json_empty_string.sql
index 04b1b965641..b3f2a7cb120 100644
--- a/tests/queries/0_stateless/01825_type_json_empty_string.sql
+++ b/tests/queries/0_stateless/01825_type_json_empty_string.sql
@@ -3,7 +3,7 @@
 DROP TABLE IF EXISTS t_json_empty_str;
 SET allow_experimental_object_type = 1;
 
-CREATE TABLE t_json_empty_str(id UInt32, o Object('json')) ENGINE = Memory;
+CREATE TABLE t_json_empty_str(id UInt32, o JSON) ENGINE = Memory;
 
 INSERT INTO t_json_empty_str VALUES (1, ''), (2, '{"k1": 1, "k2": "v1"}'), (3, '{}'), (4, '{"k1": 2}');
 
diff --git a/tests/queries/0_stateless/01825_type_json_ephemeral.sql b/tests/queries/0_stateless/01825_type_json_ephemeral.sql
index 18aa9937dc4..ac047ad7040 100644
--- a/tests/queries/0_stateless/01825_type_json_ephemeral.sql
+++ b/tests/queries/0_stateless/01825_type_json_ephemeral.sql
@@ -7,7 +7,7 @@ CREATE table t_github_json
 (
     event_type LowCardinality(String) DEFAULT JSONExtractString(message_raw, 'type'),
     repo_name LowCardinality(String) DEFAULT JSONExtractString(message_raw, 'repo', 'name'),
-    message Object('json') DEFAULT message_raw,
+    message JSON DEFAULT message_raw,
     message_raw String EPHEMERAL
 ) ENGINE = MergeTree ORDER BY (event_type, repo_name);
 
diff --git a/tests/queries/0_stateless/01825_type_json_field.sql b/tests/queries/0_stateless/01825_type_json_field.sql
index 2428190768c..15fd7b3c250 100644
--- a/tests/queries/0_stateless/01825_type_json_field.sql
+++ b/tests/queries/0_stateless/01825_type_json_field.sql
@@ -4,7 +4,7 @@ SET allow_experimental_object_type = 1;
 
 DROP TABLE IF EXISTS t_json_field;
 
-CREATE TABLE t_json_field (id UInt32, data Object('json'))
+CREATE TABLE t_json_field (id UInt32, data JSON)
 ENGINE = MergeTree ORDER BY tuple();
 
 INSERT INTO t_json_field VALUES (1, (10, 'a')::Tuple(a UInt32, s String));
diff --git a/tests/queries/0_stateless/01825_type_json_from_map.sql b/tests/queries/0_stateless/01825_type_json_from_map.sql
index b99125815e6..817d099c2d5 100644
--- a/tests/queries/0_stateless/01825_type_json_from_map.sql
+++ b/tests/queries/0_stateless/01825_type_json_from_map.sql
@@ -7,7 +7,7 @@ DROP TABLE IF EXISTS t_map;
 SET allow_experimental_object_type = 1;
 SET optimize_trivial_insert_select = 1;
 
-CREATE TABLE t_json(id UInt64, obj Object('json')) ENGINE = MergeTree ORDER BY id;
+CREATE TABLE t_json(id UInt64, obj JSON) ENGINE = MergeTree ORDER BY id;
 CREATE TABLE t_map(id UInt64, m Map(String, UInt64)) ENGINE = MergeTree ORDER BY id;
 
 INSERT INTO t_map
diff --git a/tests/queries/0_stateless/01825_type_json_ghdata.sh b/tests/queries/0_stateless/01825_type_json_ghdata.sh
index 7e952de6c08..cea02131d86 100755
--- a/tests/queries/0_stateless/01825_type_json_ghdata.sh
+++ b/tests/queries/0_stateless/01825_type_json_ghdata.sh
@@ -1,13 +1,12 @@
 #!/usr/bin/env bash
-# Tags: no-fasttest, no-s3-storage, long
-# ^ no-s3-storage: it is memory-hungry
+# Tags: no-fasttest
 
 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 ghdata"
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE ghdata (data Object('json')) ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi'" --allow_experimental_object_type 1
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE ghdata (data JSON) ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi'" --allow_experimental_object_type 1
 
 cat $CUR_DIR/data_json/ghdata_sample.json | ${CLICKHOUSE_CLIENT} -q "INSERT INTO ghdata FORMAT JSONAsObject"
 
diff --git a/tests/queries/0_stateless/01825_type_json_ghdata_insert_select.sh b/tests/queries/0_stateless/01825_type_json_ghdata_insert_select.sh
index fc503b345d9..498e1db1f69 100755
--- a/tests/queries/0_stateless/01825_type_json_ghdata_insert_select.sh
+++ b/tests/queries/0_stateless/01825_type_json_ghdata_insert_select.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-fasttest, no-s3-storage, long
-# ^ no-s3-storage: too memory hungry
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -10,9 +9,9 @@ ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS ghdata_2"
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS ghdata_2_string"
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS ghdata_2_from_string"
 
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE ghdata_2 (data Object('json')) ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi'" --allow_experimental_object_type 1
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE ghdata_2 (data JSON) ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi'" --allow_experimental_object_type 1
 ${CLICKHOUSE_CLIENT} -q "CREATE TABLE ghdata_2_string (data String) ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi'"
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE ghdata_2_from_string (data Object('json')) ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi'" --allow_experimental_object_type 1
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE ghdata_2_from_string (data JSON) ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi'" --allow_experimental_object_type 1
 
 cat $CUR_DIR/data_json/ghdata_sample.json | ${CLICKHOUSE_CLIENT} -q "INSERT INTO ghdata_2 FORMAT JSONAsObject"
 cat $CUR_DIR/data_json/ghdata_sample.json | ${CLICKHOUSE_CLIENT} -q "INSERT INTO ghdata_2_string FORMAT JSONAsString"
diff --git a/tests/queries/0_stateless/01825_type_json_in_array.sql b/tests/queries/0_stateless/01825_type_json_in_array.sql
index 15999480f74..e5c20d7ba6b 100644
--- a/tests/queries/0_stateless/01825_type_json_in_array.sql
+++ b/tests/queries/0_stateless/01825_type_json_in_array.sql
@@ -3,10 +3,9 @@
 SET allow_experimental_object_type = 1;
 DROP TABLE IF EXISTS t_json_array;
 
-CREATE TABLE t_json_array (id UInt32, arr Array(Object('json'))) ENGINE = MergeTree ORDER BY id;
+CREATE TABLE t_json_array (id UInt32, arr Array(JSON)) ENGINE = MergeTree ORDER BY id;
 
 INSERT INTO t_json_array FORMAT JSONEachRow {"id": 1, "arr": [{"k1": 1, "k2": {"k3": 2, "k4": 3}}, {"k1": 2, "k2": {"k5": "foo"}}]}
-
 INSERT INTO t_json_array FORMAT JSONEachRow {"id": 2, "arr": [{"k1": 3, "k2": {"k3": 4, "k4": 5}}]}
 
 SET output_format_json_named_tuples_as_objects = 1;
@@ -19,7 +18,6 @@ SELECT toTypeName(arr) FROM t_json_array LIMIT 1;
 TRUNCATE TABLE t_json_array;
 
 INSERT INTO t_json_array FORMAT JSONEachRow {"id": 1, "arr": [{"k1": [{"k2": "aaa", "k3": "bbb"}, {"k2": "ccc"}]}]}
-
 INSERT INTO t_json_array FORMAT JSONEachRow {"id": 2, "arr": [{"k1": [{"k3": "ddd", "k4": 10}, {"k4": 20}], "k5": {"k6": "foo"}}]}
 
 SELECT * FROM t_json_array ORDER BY id FORMAT JSONEachRow;
@@ -30,8 +28,8 @@ SELECT toTypeName(arrayJoin(arrayJoin(arr.k1))) AS arr FROM t_json_array LIMIT 1
 
 DROP TABLE t_json_array;
 
-SELECT * FROM values('arr Array(Object(''json''))', '[\'{"x" : 1}\']') FORMAT JSONEachRow;
-SELECT * FROM values('arr Map(String, Object(''json''))', '{\'x\' : \'{"y" : 1}\', \'t\' : \'{"y" : 2}\'}') FORMAT JSONEachRow;
-SELECT * FROM values('arr Tuple(Int32, Object(''json''))', '(1, \'{"y" : 1}\')', '(2, \'{"y" : 2}\')') FORMAT JSONEachRow;
+SELECT * FROM values('arr Array(JSON)', '[\'{"x" : 1}\']') FORMAT JSONEachRow;
+SELECT * FROM values('arr Map(String, JSON)', '{\'x\' : \'{"y" : 1}\', \'t\' : \'{"y" : 2}\'}') FORMAT JSONEachRow;
+SELECT * FROM values('arr Tuple(Int32, JSON)', '(1, \'{"y" : 1}\')', '(2, \'{"y" : 2}\')') FORMAT JSONEachRow;
 SELECT * FROM format(JSONEachRow, '{"arr" : [{"x" : "aaa", "y" : [1,2,3]}]}') FORMAT JSONEachRow;
-SELECT * FROM values('arr Array(Object(''json''))', '[\'{"x" : 1}\']') FORMAT JSONEachRow;
+SELECT * FROM values('arr Array(JSON)', '[\'{"x" : 1}\']') FORMAT JSONEachRow;
diff --git a/tests/queries/0_stateless/01825_type_json_in_other_types.sh b/tests/queries/0_stateless/01825_type_json_in_other_types.sh
index c3c4b0ffdbc..e9cf0bcaca1 100755
--- a/tests/queries/0_stateless/01825_type_json_in_other_types.sh
+++ b/tests/queries/0_stateless/01825_type_json_in_other_types.sh
@@ -12,7 +12,7 @@ ${CLICKHOUSE_CLIENT} -q "
     CREATE TABLE t_json_nested
     (
         id UInt32,
-        data Tuple(String, Map(String, Array(Object('json'))), Object('json'))
+        data Tuple(String, Map(String, Array(JSON)), JSON)
     )
     ENGINE = MergeTree ORDER BY id" --allow_experimental_object_type 1
 
diff --git a/tests/queries/0_stateless/01825_type_json_insert_select.sql b/tests/queries/0_stateless/01825_type_json_insert_select.sql
index 67b5e644f66..cd0b280c360 100644
--- a/tests/queries/0_stateless/01825_type_json_insert_select.sql
+++ b/tests/queries/0_stateless/01825_type_json_insert_select.sql
@@ -5,18 +5,16 @@ SET allow_experimental_object_type = 1;
 DROP TABLE IF EXISTS type_json_src;
 DROP TABLE IF EXISTS type_json_dst;
 
-CREATE TABLE type_json_src (id UInt32, data Object('json')) ENGINE = MergeTree ORDER BY id;
+CREATE TABLE type_json_src (id UInt32, data JSON) ENGINE = MergeTree ORDER BY id;
 CREATE TABLE type_json_dst AS type_json_src;
 
 INSERT INTO type_json_src VALUES (1, '{"k1": 1, "k2": "foo"}');
-
 INSERT INTO type_json_dst SELECT * FROM type_json_src;
 
 SELECT DISTINCT toTypeName(data) FROM type_json_dst;
 SELECT id, data FROM type_json_dst ORDER BY id;
 
 INSERT INTO type_json_src VALUES (2, '{"k1": 2, "k2": "bar"}') (3, '{"k1": 3, "k3": "aaa"}');
-
 INSERT INTO type_json_dst SELECT * FROM type_json_src WHERE id > 1;
 
 SELECT DISTINCT toTypeName(data) FROM type_json_dst;
@@ -25,12 +23,10 @@ SELECT id, data FROM type_json_dst ORDER BY id;
 INSERT INTO type_json_dst VALUES (4, '{"arr": [{"k11": 5, "k22": 6}, {"k11": 7, "k33": 8}]}');
 
 INSERT INTO type_json_src VALUES (5, '{"arr": "not array"}');
-
 INSERT INTO type_json_dst SELECT * FROM type_json_src WHERE id = 5; -- { serverError INCOMPATIBLE_COLUMNS }
 
 TRUNCATE TABLE type_json_src;
-INSERT INTO type_json_src VALUES (5, '{"arr": [{"k22": "str1"}]}');
-
+INSERT INTO type_json_src VALUES (5, '{"arr": [{"k22": "str1"}]}')
 INSERT INTO type_json_dst SELECT * FROM type_json_src WHERE id = 5;
 
 SELECT DISTINCT toTypeName(data) FROM type_json_dst;
@@ -39,7 +35,7 @@ SELECT id, data FROM type_json_dst ORDER BY id;
 DROP TABLE type_json_src;
 DROP TABLE type_json_dst;
 
-CREATE TABLE type_json_dst (data Object('json')) ENGINE = MergeTree ORDER BY tuple();
+CREATE TABLE type_json_dst (data JSON) ENGINE = MergeTree ORDER BY tuple();
 CREATE TABLE type_json_src (data String) ENGINE = MergeTree ORDER BY tuple();
 
 SYSTEM STOP MERGES type_json_src;
@@ -49,7 +45,6 @@ SET max_insert_threads = 1;
 SET output_format_json_named_tuples_as_objects = 1;
 
 INSERT INTO type_json_src FORMAT JSONAsString {"k1": 1, "k10": [{"a": "1", "b": "2"}, {"a": "2", "b": "3"}]};
-
 INSERT INTO type_json_src FORMAT JSONAsString  {"k1": 2, "k10": [{"a": "1", "b": "2", "c": {"k11": "haha"}}]};
 
 INSERT INTO type_json_dst SELECT data FROM type_json_src;
@@ -62,7 +57,6 @@ TRUNCATE TABLE type_json_dst;
 
 -- Insert in another order. Order is important, because a way how defaults are filled differs.
 INSERT INTO type_json_src FORMAT JSONAsString  {"k1": 2, "k10": [{"a": "1", "b": "2", "c": {"k11": "haha"}}]};
-
 INSERT INTO type_json_src FORMAT JSONAsString {"k1": 1, "k10": [{"a": "1", "b": "2"}, {"a": "2", "b": "3"}]};
 
 INSERT INTO type_json_dst SELECT data FROM type_json_src;
diff --git a/tests/queries/0_stateless/01825_type_json_missed_values.sql b/tests/queries/0_stateless/01825_type_json_missed_values.sql
index 69012ce9aab..2420ab7cf34 100644
--- a/tests/queries/0_stateless/01825_type_json_missed_values.sql
+++ b/tests/queries/0_stateless/01825_type_json_missed_values.sql
@@ -4,7 +4,7 @@ DROP TABLE IF EXISTS t_json;
 
 SET allow_experimental_object_type = 1;
 
-CREATE TABLE t_json(id UInt64, obj Object('json'))
+CREATE TABLE t_json(id UInt64, obj JSON)
 ENGINE = MergeTree ORDER BY id
 SETTINGS min_bytes_for_wide_part = 0;
 
diff --git a/tests/queries/0_stateless/01825_type_json_multiple_files.sh b/tests/queries/0_stateless/01825_type_json_multiple_files.sh
index 72e2a332865..453e7a3c78e 100755
--- a/tests/queries/0_stateless/01825_type_json_multiple_files.sh
+++ b/tests/queries/0_stateless/01825_type_json_multiple_files.sh
@@ -14,9 +14,9 @@ for i in {0..5}; do
 done
 
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS t_json_files"
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE t_json_files (file String, data Object('json')) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE t_json_files (file String, data JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
 
-${CLICKHOUSE_CLIENT} -q "INSERT INTO t_json_files SELECT _file, data FROM file('${CLICKHOUSE_DATABASE}_*.json', 'JSONAsObject', 'data Object(''json'')')" --allow_experimental_object_type 1
+${CLICKHOUSE_CLIENT} -q "INSERT INTO t_json_files SELECT _file, data FROM file('${CLICKHOUSE_DATABASE}_*.json', 'JSONAsObject', 'data JSON')" --allow_experimental_object_type 1
 
 ${CLICKHOUSE_CLIENT} -q "SELECT data FROM t_json_files ORDER BY file FORMAT JSONEachRow" --output_format_json_named_tuples_as_objects 1
 ${CLICKHOUSE_CLIENT} -q "SELECT toTypeName(data) FROM t_json_files LIMIT 1"
@@ -24,7 +24,7 @@ ${CLICKHOUSE_CLIENT} -q "SELECT toTypeName(data) FROM t_json_files LIMIT 1"
 ${CLICKHOUSE_CLIENT} -q "TRUNCATE TABLE IF EXISTS t_json_files"
 
 ${CLICKHOUSE_CLIENT} -q "INSERT INTO t_json_files \
-    SELECT _file, data FROM file('${CLICKHOUSE_DATABASE}_*.json', 'JSONAsObject', 'data Object(''json'')') \
+    SELECT _file, data FROM file('${CLICKHOUSE_DATABASE}_*.json', 'JSONAsObject', 'data JSON') \
     ORDER BY _file LIMIT 3" --max_threads 1 --min_insert_block_size_rows 1 --max_insert_block_size 1 --max_block_size 1 --allow_experimental_object_type 1
 
 ${CLICKHOUSE_CLIENT} -q "SELECT data FROM t_json_files ORDER BY file, data FORMAT JSONEachRow" --output_format_json_named_tuples_as_objects 1
@@ -33,7 +33,7 @@ ${CLICKHOUSE_CLIENT} -q "SELECT toTypeName(data) FROM t_json_files LIMIT 1"
 ${CLICKHOUSE_CLIENT} -q "TRUNCATE TABLE IF EXISTS t_json_files"
 
 ${CLICKHOUSE_CLIENT} -q "INSERT INTO t_json_files \
-    SELECT _file, data FROM file('${CLICKHOUSE_DATABASE}_*.json', 'JSONAsObject', 'data Object(''json'')') \
+    SELECT _file, data FROM file('${CLICKHOUSE_DATABASE}_*.json', 'JSONAsObject', 'data JSON') \
     WHERE _file IN ('${CLICKHOUSE_DATABASE}_1.json', '${CLICKHOUSE_DATABASE}_3.json')" --allow_experimental_object_type 1
 
 ${CLICKHOUSE_CLIENT} -q "SELECT data FROM t_json_files ORDER BY file FORMAT JSONEachRow" --output_format_json_named_tuples_as_objects 1
diff --git a/tests/queries/0_stateless/01825_type_json_mutations.sql b/tests/queries/0_stateless/01825_type_json_mutations.sql
index b8ee7f1fd81..a16710bdbf7 100644
--- a/tests/queries/0_stateless/01825_type_json_mutations.sql
+++ b/tests/queries/0_stateless/01825_type_json_mutations.sql
@@ -6,7 +6,7 @@ SET allow_experimental_object_type = 1;
 SET output_format_json_named_tuples_as_objects = 1;
 SET mutations_sync = 2;
 
-CREATE TABLE t_json_mutations(id UInt32, s String, obj Object('json')) ENGINE = MergeTree ORDER BY id;
+CREATE TABLE t_json_mutations(id UInt32, s String, obj JSON) ENGINE = MergeTree ORDER BY id;
 
 INSERT INTO t_json_mutations VALUES (1, 'q', '{"k1": 1, "k2": 2, "k3": [{"k4": "aaa"}, {"k4": "bbb"}]}');
 INSERT INTO t_json_mutations VALUES (2, 'w', '{"k1": 3, "k2": 4, "k3": [{"k4": "ccc"}]}');
diff --git a/tests/queries/0_stateless/01825_type_json_nbagames.sh b/tests/queries/0_stateless/01825_type_json_nbagames.sh
index 7e414b4802e..e13d004ac58 100755
--- a/tests/queries/0_stateless/01825_type_json_nbagames.sh
+++ b/tests/queries/0_stateless/01825_type_json_nbagames.sh
@@ -9,7 +9,7 @@ ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS nbagames"
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS nbagames_string"
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS nbagames_from_string"
 
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE nbagames (data Object('json')) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE nbagames (data JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
 
 cat $CUR_DIR/data_json/nbagames_sample.json | ${CLICKHOUSE_CLIENT} -q "INSERT INTO nbagames FORMAT JSONAsObject"
 
@@ -39,7 +39,7 @@ ${CLICKHOUSE_CLIENT} -q \
 GROUP BY player ORDER BY triple_doubles DESC, player LIMIT 5"
 
 ${CLICKHOUSE_CLIENT} -q "CREATE TABLE nbagames_string (data String) ENGINE = MergeTree ORDER BY tuple()"
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE nbagames_from_string (data Object('json')) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE nbagames_from_string (data JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
 
 cat $CUR_DIR/data_json/nbagames_sample.json | ${CLICKHOUSE_CLIENT} -q "INSERT INTO nbagames_string FORMAT JSONAsString"
 ${CLICKHOUSE_CLIENT} -q "INSERT INTO nbagames_from_string SELECT data FROM nbagames_string"
diff --git a/tests/queries/0_stateless/01825_type_json_order_by.sql b/tests/queries/0_stateless/01825_type_json_order_by.sql
index 328cd907536..98b2a6105d9 100644
--- a/tests/queries/0_stateless/01825_type_json_order_by.sql
+++ b/tests/queries/0_stateless/01825_type_json_order_by.sql
@@ -1,6 +1,6 @@
 -- Tags: no-fasttest
 
 SET allow_experimental_object_type = 1;
-SELECT dummy FROM system.one ORDER BY materialize('{"k":"v"}'::Object('json'));
-SELECT dummy FROM system.one ORDER BY materialize('{"k":"v"}'::Object('json')), dummy;
-SELECT materialize('{"k":"v"}'::Object('json')) SETTINGS extremes = 1;
+SELECT dummy FROM system.one ORDER BY materialize('{"k":"v"}'::JSON);
+SELECT dummy FROM system.one ORDER BY materialize('{"k":"v"}'::JSON), dummy;
+SELECT materialize('{"k":"v"}'::JSON) SETTINGS extremes = 1;
diff --git a/tests/queries/0_stateless/01825_type_json_parallel_insert.sql b/tests/queries/0_stateless/01825_type_json_parallel_insert.sql
index 5d16fbfcbdf..654c0ecb3c3 100644
--- a/tests/queries/0_stateless/01825_type_json_parallel_insert.sql
+++ b/tests/queries/0_stateless/01825_type_json_parallel_insert.sql
@@ -2,7 +2,7 @@
 DROP TABLE IF EXISTS t_json_parallel;
 
 SET allow_experimental_object_type = 1, max_insert_threads = 20, max_threads = 20, min_insert_block_size_rows = 65536;
-CREATE TABLE t_json_parallel (data Object('json')) ENGINE = MergeTree ORDER BY tuple();
+CREATE TABLE t_json_parallel (data JSON) ENGINE = MergeTree ORDER BY tuple();
 
 INSERT INTO t_json_parallel SELECT materialize('{"k1":1, "k2": "some"}') FROM numbers_mt(500000);
 SELECT any(toTypeName(data)), count() FROM t_json_parallel;
diff --git a/tests/queries/0_stateless/01825_type_json_partitions.sql b/tests/queries/0_stateless/01825_type_json_partitions.sql
index fb646f441b6..27804e7edae 100644
--- a/tests/queries/0_stateless/01825_type_json_partitions.sql
+++ b/tests/queries/0_stateless/01825_type_json_partitions.sql
@@ -5,7 +5,7 @@ DROP TABLE IF EXISTS t_json_partitions;
 SET allow_experimental_object_type = 1;
 SET output_format_json_named_tuples_as_objects = 1;
 
-CREATE TABLE t_json_partitions (id UInt32, obj Object('json'))
+CREATE TABLE t_json_partitions (id UInt32, obj JSON)
 ENGINE MergeTree ORDER BY id PARTITION BY id;
 
 INSERT INTO t_json_partitions FORMAT JSONEachRow {"id": 1, "obj": {"k1": "v1"}} {"id": 2, "obj": {"k2": "v2"}};
diff --git a/tests/queries/0_stateless/01825_type_json_schema_race_long.sh b/tests/queries/0_stateless/01825_type_json_schema_race_long.sh
index 8001ff3c314..38d1432cef6 100755
--- a/tests/queries/0_stateless/01825_type_json_schema_race_long.sh
+++ b/tests/queries/0_stateless/01825_type_json_schema_race_long.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS t_json_race"
-$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_race (data Object('json')) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
+$CLICKHOUSE_CLIENT -q "CREATE TABLE t_json_race (data JSON) ENGINE = MergeTree ORDER BY tuple()" --allow_experimental_object_type 1
 
 function test_case()
 {
diff --git a/tests/queries/0_stateless/01825_type_json_sparse.sql b/tests/queries/0_stateless/01825_type_json_sparse.sql
index 11c4030df28..69ca1ff8406 100644
--- a/tests/queries/0_stateless/01825_type_json_sparse.sql
+++ b/tests/queries/0_stateless/01825_type_json_sparse.sql
@@ -5,7 +5,7 @@ DROP TABLE IF EXISTS t_json_sparse;
 SET allow_experimental_object_type = 1;
 SET optimize_trivial_insert_select = 1;
 
-CREATE TABLE t_json_sparse (data Object('json'))
+CREATE TABLE t_json_sparse (data JSON)
 ENGINE = MergeTree ORDER BY tuple()
 SETTINGS ratio_of_defaults_for_sparse_serialization = 0.1,
 min_bytes_for_wide_part = 0, index_granularity = 8192, index_granularity_bytes = '10Mi';
diff --git a/tests/queries/0_stateless/01825_type_json_wide_parts_merge.sql b/tests/queries/0_stateless/01825_type_json_wide_parts_merge.sql
index 1d8e2286982..fd023e473a4 100644
--- a/tests/queries/0_stateless/01825_type_json_wide_parts_merge.sql
+++ b/tests/queries/0_stateless/01825_type_json_wide_parts_merge.sql
@@ -5,7 +5,7 @@ SET output_format_json_named_tuples_as_objects = 1;
 
 DROP TABLE IF EXISTS t_json_wide_parts;
 
-CREATE TABLE t_json_wide_parts (data Object('json'))
+CREATE TABLE t_json_wide_parts (data JSON)
 ENGINE MergeTree ORDER BY tuple()
 SETTINGS min_bytes_for_wide_part = 0;
 
diff --git a/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh b/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh
index 7b8d3ce1504..bf8bb716a9f 100755
--- a/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh
+++ b/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh
@@ -4,7 +4,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} --multiquery --query "
 drop table if exists aliases_lazyness;
 create table aliases_lazyness (x UInt32, y ALIAS sleepEachRow(0.1)) Engine=MergeTree ORDER BY x;
 insert into aliases_lazyness(x) select * from numbers(100);
diff --git a/tests/queries/0_stateless/01852_multiple_joins_with_union_join.sql b/tests/queries/0_stateless/01852_multiple_joins_with_union_join.sql
index 4387a697a83..8c6937eb581 100644
--- a/tests/queries/0_stateless/01852_multiple_joins_with_union_join.sql
+++ b/tests/queries/0_stateless/01852_multiple_joins_with_union_join.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS v1;
 DROP TABLE IF EXISTS v2;
diff --git a/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh b/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh
index 2b122debff5..218320772c9 100755
--- a/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh
+++ b/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh
@@ -7,7 +7,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 function run_test_once()
 {
-    $CLICKHOUSE_CLIENT -m -q "
+    $CLICKHOUSE_CLIENT -nm -q "
         DROP TABLE IF EXISTS simple_key_source_table_01863;
         CREATE TABLE simple_key_source_table_01863
         (
@@ -29,13 +29,13 @@ function run_test_once()
         LIFETIME(MIN 0 MAX 1000);
     "
 
-    prev=$($CLICKHOUSE_CLIENT -m -q "SELECT value FROM system.events WHERE event = 'DictCacheKeysRequestedMiss' SETTINGS system_events_show_zero_values=1")
-    curr=$($CLICKHOUSE_CLIENT -m -q "
+    prev=$($CLICKHOUSE_CLIENT -nm -q "SELECT value FROM system.events WHERE event = 'DictCacheKeysRequestedMiss' SETTINGS system_events_show_zero_values=1")
+    curr=$($CLICKHOUSE_CLIENT -nm -q "
         SELECT toUInt64(1) as key, dictGet('simple_key_cache_dictionary_01863', 'value', key) FORMAT Null;
         SELECT value FROM system.events WHERE event = 'DictCacheKeysRequestedMiss' SETTINGS system_events_show_zero_values=1
     ")
 
-    $CLICKHOUSE_CLIENT -m -q "
+    $CLICKHOUSE_CLIENT -nm -q "
         DROP DICTIONARY simple_key_cache_dictionary_01863;
         DROP TABLE simple_key_source_table_01863;
     "
diff --git a/tests/queries/0_stateless/01872_functions_to_subcolumns_analyzer.sql b/tests/queries/0_stateless/01872_functions_to_subcolumns_analyzer.sql
index 032d83890ec..b544f6829cf 100644
--- a/tests/queries/0_stateless/01872_functions_to_subcolumns_analyzer.sql
+++ b/tests/queries/0_stateless/01872_functions_to_subcolumns_analyzer.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS t_func_to_subcolumns;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET optimize_functions_to_subcolumns = 1;
 
 CREATE TABLE t_func_to_subcolumns (id UInt64, arr Array(UInt64), n Nullable(String), m Map(String, UInt64))
diff --git a/tests/queries/0_stateless/01872_initial_query_start_time.sh b/tests/queries/0_stateless/01872_initial_query_start_time.sh
index ff3e1954c75..6a935602ea4 100755
--- a/tests/queries/0_stateless/01872_initial_query_start_time.sh
+++ b/tests/queries/0_stateless/01872_initial_query_start_time.sh
@@ -13,7 +13,7 @@ ${CLICKHOUSE_CLIENT} -q "create table m (dummy UInt8) ENGINE = Distributed('test
 query_id=$(${CLICKHOUSE_CLIENT} -q "select lower(hex(reverse(reinterpretAsString(generateUUIDv4()))))")
 ${CLICKHOUSE_CLIENT} -q "select * from m format Null" "--query_id=$query_id"
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -n -q "
 system flush logs;
 select
     anyIf(initial_query_start_time, is_initial_query) = anyIf(initial_query_start_time, not is_initial_query),
diff --git a/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh b/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh
index 1294ba53e82..8336229a643 100755
--- a/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh
+++ b/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     SET allow_experimental_bigint_types = 1;
 
     DROP TABLE IF EXISTS dictionary_decimal_source_table;
diff --git a/tests/queries/0_stateless/01881_aggregate_functions_versioning.reference b/tests/queries/0_stateless/01881_aggregate_functions_versioning.reference
index e15f312c2c8..c30c4ca7e74 100644
--- a/tests/queries/0_stateless/01881_aggregate_functions_versioning.reference
+++ b/tests/queries/0_stateless/01881_aggregate_functions_versioning.reference
@@ -1 +1 @@
-CREATE TABLE default.test_table\n(\n    `col1` DateTime,\n    `col2` Int64,\n    `col3` AggregateFunction(1, sumMap, Tuple(\n        Array(UInt8),\n        Array(UInt8)))\n)\nENGINE = AggregatingMergeTree\nORDER BY (col1, col2)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.test_table\n(\n    `col1` DateTime,\n    `col2` Int64,\n    `col3` AggregateFunction(1, sumMap, Tuple(Array(UInt8), Array(UInt8)))\n)\nENGINE = AggregatingMergeTree\nORDER BY (col1, col2)\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/01889_clickhouse_client_config_format.reference b/tests/queries/0_stateless/01889_clickhouse_client_config_format.reference
index 149315ad9d5..202e32a583e 100644
--- a/tests/queries/0_stateless/01889_clickhouse_client_config_format.reference
+++ b/tests/queries/0_stateless/01889_clickhouse_client_config_format.reference
@@ -12,13 +12,5 @@ yml
 2
 yaml
 2
-autodetect xml (with leading whitespaces)
-2
-autodetect xml (non leading whitespaces)
-2
-autodetect yaml
-2
-autodetect invalid xml
-Correct: invalid xml parsed with exception
-autodetect invalid yaml
-Code: 585. Unable to parse YAML configuration file /config_default.badyaml, yaml-cpp: error at line 2, column 12: illegal map value. (CANNOT_PARSE_YAML)
+ini
+Code: 347. Unknown format of '/config_default.ini' config. (CANNOT_LOAD_CONFIG)
diff --git a/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh b/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh
index 58fd6852116..4e970f17d3a 100755
--- a/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh
+++ b/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh
@@ -12,11 +12,7 @@ XML_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.XML
 conf_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.conf
 yml_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.yml
 yaml_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.yaml
-autodetect_xml_with_leading_whitespace_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.config
-autodetect_xml_non_leading_whitespace_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.cfg
-autodetect_yaml_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.properties
-autodetect_invalid_xml_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.badxml
-autodetect_invalid_yaml_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.badyaml
+ini_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.ini
 
 function cleanup()
 {
@@ -26,11 +22,7 @@ function cleanup()
     rm "${conf_config:?}"
     rm "${yml_config:?}"
     rm "${yaml_config:?}"
-    rm "${autodetect_xml_with_leading_whitespace_config:?}"
-    rm "${autodetect_xml_non_leading_whitespace_config:?}"
-    rm "${autodetect_yaml_config:?}"
-    rm "${autodetect_invalid_xml_config:?}"
-    rm "${autodetect_invalid_yaml_config:?}"
+    rm "${ini_config:?}"
 }
 trap cleanup EXIT
 
@@ -60,29 +52,10 @@ EOL
 cat > "$yaml_config" <<EOL
 max_threads: 2
 EOL
-cat > "$autodetect_xml_with_leading_whitespace_config" <<EOL
-
-    <config>
-        <max_threads>2</max_threads>
-    </config>
+cat > "$ini_config" <<EOL
+[config]
+max_threads=2
 EOL
-cat > "$autodetect_xml_non_leading_whitespace_config" <<EOL
-<config>
-    <max_threads>2</max_threads>
-</config>
-EOL
-cat > "$autodetect_yaml_config" <<EOL
-max_threads: 2
-EOL
-cat > "$autodetect_invalid_xml_config" <<EOL
-<!-- This is a XML file comment -->
-<invalid tag><invalid tag>
-EOL
-cat > "$autodetect_invalid_yaml_config" <<EOL
-; This is a INI file comment
-max_threads: 2
-EOL
-
 
 echo 'default'
 $CLICKHOUSE_CLIENT --config "$config" -q "select getSetting('max_threads')"
@@ -101,16 +74,5 @@ echo 'yml'
 $CLICKHOUSE_CLIENT --config "$yml_config" -q "select getSetting('max_threads')"
 echo 'yaml'
 $CLICKHOUSE_CLIENT --config "$yaml_config" -q "select getSetting('max_threads')"
-
-echo 'autodetect xml (with leading whitespaces)'
-$CLICKHOUSE_CLIENT --config "$autodetect_xml_with_leading_whitespace_config" -q "select getSetting('max_threads')"
-echo 'autodetect xml (non leading whitespaces)'
-$CLICKHOUSE_CLIENT --config "$autodetect_xml_non_leading_whitespace_config" -q "select getSetting('max_threads')"
-echo 'autodetect yaml'
-$CLICKHOUSE_CLIENT --config "$autodetect_yaml_config" -q "select getSetting('max_threads')"
-
-# Error code is 1000 (Poco::Exception). It is not ignored.
-echo 'autodetect invalid xml'
-$CLICKHOUSE_CLIENT --config "$autodetect_invalid_xml_config" -q "select getSetting('max_threads')" 2>&1 |& grep -q "Code: 1000" && echo "Correct: invalid xml parsed with exception" || echo 'Fail: expected error code 1000 but got other'
-echo 'autodetect invalid yaml'
-$CLICKHOUSE_CLIENT --config "$autodetect_invalid_yaml_config" -q "select getSetting('max_threads')" 2>&1 |& sed -e "s#$CLICKHOUSE_TMP##" -e "s#DB::Exception: ##"
\ No newline at end of file
+echo 'ini'
+$CLICKHOUSE_CLIENT --config "$ini_config" -q "select getSetting('max_threads')" 2>&1 |& sed -e "s#$CLICKHOUSE_TMP##" -e "s#DB::Exception: ##"
diff --git a/tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh b/tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh
index c0f200ed20d..e9467d77451 100755
--- a/tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh
+++ b/tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh
@@ -9,6 +9,6 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 echo "
 DROP USER IF EXISTS postgresql_user;
 CREATE USER postgresql_user HOST IP '127.0.0.1' IDENTIFIED WITH no_password;
-" | $CLICKHOUSE_CLIENT
+" | $CLICKHOUSE_CLIENT -n
 
 psql --host localhost --port ${CLICKHOUSE_PORT_POSTGRESQL} ${CLICKHOUSE_DATABASE} --user postgresql_user -c "SELECT NULL;"
diff --git a/tests/queries/0_stateless/01890_cross_join_explain_crash.sql b/tests/queries/0_stateless/01890_cross_join_explain_crash.sql
index 79aea3884b7..bb2bc606870 100644
--- a/tests/queries/0_stateless/01890_cross_join_explain_crash.sql
+++ b/tests/queries/0_stateless/01890_cross_join_explain_crash.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET joined_subquery_requires_alias = 0;
 
 select * FROM (SELECT 1), (SELECT 1), (SELECT 1);
diff --git a/tests/queries/0_stateless/01890_materialized_distributed_join.sh b/tests/queries/0_stateless/01890_materialized_distributed_join.sh
index 5c04ee8b214..88f7dcf9a69 100755
--- a/tests/queries/0_stateless/01890_materialized_distributed_join.sh
+++ b/tests/queries/0_stateless/01890_materialized_distributed_join.sh
@@ -7,7 +7,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     drop table if exists test_distributed;
     drop table if exists test_source;
     drop table if exists test_shard;
diff --git a/tests/queries/0_stateless/01900_kill_mutation_parallel_long.sh b/tests/queries/0_stateless/01900_kill_mutation_parallel_long.sh
index 81a674be3c4..30dff6db0c4 100755
--- a/tests/queries/0_stateless/01900_kill_mutation_parallel_long.sh
+++ b/tests/queries/0_stateless/01900_kill_mutation_parallel_long.sh
@@ -12,7 +12,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     drop table if exists data_01900_1;
     drop table if exists data_01900_2;
 
@@ -27,18 +27,18 @@ $CLICKHOUSE_CLIENT -m -q "
 # so 100 mutations will be scheduled and killed later.
 for i in {1..100}; do
     echo "alter table data_01900_1 update s = 'foo_$i' where 1;"
-done | $CLICKHOUSE_CLIENT -m
+done | $CLICKHOUSE_CLIENT -nm
 
 # but these mutations should not be killed.
 (
     for i in {1..100}; do
         echo "alter table data_01900_2 update s = 'bar_$i' where 1;"
-    done | $CLICKHOUSE_CLIENT -m --mutations_sync=1
+    done | $CLICKHOUSE_CLIENT -nm --mutations_sync=1
 ) &
-$CLICKHOUSE_CLIENT --format Null -m -q "kill mutation where table = 'data_01900_1' and database = '$CLICKHOUSE_DATABASE';"
+$CLICKHOUSE_CLIENT --format Null -nm -q "kill mutation where table = 'data_01900_1' and database = '$CLICKHOUSE_DATABASE';"
 wait
 
-$CLICKHOUSE_CLIENT -m -q "select * from data_01900_2"
+$CLICKHOUSE_CLIENT -nm -q "select * from data_01900_2"
 
 $CLICKHOUSE_CLIENT -q "drop table data_01900_1"
 $CLICKHOUSE_CLIENT -q "drop table data_01900_2"
diff --git a/tests/queries/0_stateless/01903_correct_block_size_prediction_with_default.sh b/tests/queries/0_stateless/01903_correct_block_size_prediction_with_default.sh
index 57f9b5595de..1482730af2c 100755
--- a/tests/queries/0_stateless/01903_correct_block_size_prediction_with_default.sh
+++ b/tests/queries/0_stateless/01903_correct_block_size_prediction_with_default.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 sql="toUInt16OrNull(arrayFirst((v, k) -> (k = '4Id'), arr[2], arr[1]))"
 
 # Create the table and fill it
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     CREATE TABLE test_extract(str String,  arr Array(Array(String)) ALIAS extractAllGroupsHorizontal(str, '\\W(\\w+)=(\"[^\"]*?\"|[^\",}]*)')) ENGINE=MergeTree() PARTITION BY tuple() ORDER BY tuple();
     INSERT INTO test_extract (str) WITH range(8) as range_arr, arrayMap(x-> concat(toString(x),'Id'), range_arr) as key, arrayMap(x -> rand() % 8, range_arr) as val, arrayStringConcat(arrayMap((x,y) -> concat(x,'=',toString(y)), key, val),',') as str SELECT str FROM numbers(500000);
     ALTER TABLE test_extract ADD COLUMN 15Id Nullable(UInt16) DEFAULT $sql;"
@@ -24,7 +24,7 @@ function test()
     $CLICKHOUSE_CLIENT --query="SELECT uniq(15Id) FROM test_extract $where SETTINGS max_threads=1" --query_id=$uuid_1
     uuid_2=$(cat /proc/sys/kernel/random/uuid)
     $CLICKHOUSE_CLIENT --query="SELECT uniq($sql) FROM test_extract $where SETTINGS max_threads=1" --query_id=$uuid_2
-    $CLICKHOUSE_CLIENT --query="
+    $CLICKHOUSE_CLIENT -n --query="
         SYSTEM FLUSH LOGS;
         WITH memory_1 AS (SELECT memory_usage FROM system.query_log WHERE current_database = currentDatabase() AND query_id='$uuid_1' AND type = 'QueryFinish' as memory_1),
              memory_2 AS (SELECT memory_usage FROM system.query_log WHERE current_database = currentDatabase() AND query_id='$uuid_2' AND type = 'QueryFinish' as memory_2)
diff --git a/tests/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh b/tests/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh
index a44106414ea..853445daf3f 100755
--- a/tests/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh
+++ b/tests/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     DROP TABLE IF EXISTS dictionary_array_source_table;
     CREATE TABLE dictionary_array_source_table
     (
diff --git a/tests/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh b/tests/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh
index a5c65ca87a7..0b555cf82c2 100755
--- a/tests/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh
+++ b/tests/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     DROP TABLE IF EXISTS dictionary_nullable_source_table;
     CREATE TABLE dictionary_nullable_source_table
     (
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 6fabd33c804..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)\nAS SELECT * 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/01913_names_of_tuple_literal.sql b/tests/queries/0_stateless/01913_names_of_tuple_literal.sql
index d6dda4fda9b..879f4c91587 100644
--- a/tests/queries/0_stateless/01913_names_of_tuple_literal.sql
+++ b/tests/queries/0_stateless/01913_names_of_tuple_literal.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 
 SELECT ((1, 2), (2, 3), (3, 4)) FORMAT TSVWithNames;
 SELECT ((1, 2), (2, 3), (3, 4)) FORMAT TSVWithNames SETTINGS legacy_column_name_of_tuple_literal = 1;
diff --git a/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh b/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
index bc8b01fa9f5..0dfde4997a7 100755
--- a/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
@@ -18,7 +18,7 @@ done
 wait
 
 for i in $(seq 1 $NUM_REPLICAS); do
-    $CLICKHOUSE_CLIENT --query "CREATE TABLE ttl_table$i(
+    $CLICKHOUSE_CLIENT -n --query "CREATE TABLE ttl_table$i(
         key DateTime
     )
     ENGINE ReplicatedMergeTree('/test/01921_concurrent_ttl_and_normal_merges/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/ttl_table', '$i')
diff --git a/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh b/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
index adf4fd96a00..a6b83eba27d 100755
--- a/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
+++ b/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
@@ -1,35 +1,20 @@
 #!/usr/bin/env bash
-# Tags: no-fasttest, no-parallel
+# Tags: no-fasttest
 # Tag no-fasttest: needs pv
-# Tag no-parallel: reads from a system table
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS t; CREATE TABLE t (x UInt64) ENGINE = Memory;"
+${CLICKHOUSE_CLIENT} --multiquery --query "DROP TABLE IF EXISTS t; CREATE TABLE t (x UInt64) ENGINE = Memory;"
 
 # Rate limit is chosen for operation to spent more than one second.
 seq 1 1000 | pv --quiet --rate-limit 400 | ${CLICKHOUSE_CLIENT} --query "INSERT INTO t FORMAT TSV"
 
 # We check that the value of NetworkReceiveElapsedMicroseconds correctly includes the time spent waiting data from the client.
-result=$(${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS;
-    WITH ProfileEvents['NetworkReceiveElapsedMicroseconds'] AS elapsed_us
-    SELECT elapsed_us FROM system.query_log
-    WHERE current_database = currentDatabase() AND query_kind = 'Insert' AND event_date >= yesterday() AND type = 'QueryFinish'
-    ORDER BY event_time DESC LIMIT 1;")
-
-elapsed_us=$(echo $result | sed 's/ .*//')
-
-min_elapsed_us=1000000
-if [[ "$elapsed_us" -ge "$min_elapsed_us" ]]; then
-    echo 1
-else
-    # Print debug info
-    ${CLICKHOUSE_CLIENT} --query "
-    WITH ProfileEvents['NetworkReceiveElapsedMicroseconds'] AS elapsed_us
-    SELECT query_start_time_microseconds, event_time_microseconds, query_duration_ms, elapsed_us, query FROM system.query_log
-    WHERE current_database = currentDatabase() and event_date >= yesterday() AND type = 'QueryFinish' ORDER BY query_start_time;"
-fi
+${CLICKHOUSE_CLIENT} --multiquery --query "SYSTEM FLUSH LOGS;
+    WITH ProfileEvents['NetworkReceiveElapsedMicroseconds'] AS time
+    SELECT time >= 1000000 ? 1 : time FROM system.query_log
+        WHERE current_database = currentDatabase() AND query_kind = 'Insert' AND event_date >= yesterday() AND type = 2 ORDER BY event_time DESC LIMIT 1;"
 
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE t"
diff --git a/tests/queries/0_stateless/01925_join_materialized_columns.sql b/tests/queries/0_stateless/01925_join_materialized_columns.sql
index ce71cfed8a3..abb6fda3bfb 100644
--- a/tests/queries/0_stateless/01925_join_materialized_columns.sql
+++ b/tests/queries/0_stateless/01925_join_materialized_columns.sql
@@ -32,8 +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 settings enable_analyzer=0;
-SELECT * FROM t1 ALL JOIN t2 USING (dt) ORDER BY t1.time, t2.time settings enable_analyzer=1;
+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 '-';
@@ -53,5 +53,5 @@ 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, INVALID_JOIN_ON_EXPRESSION }
-SELECT time as talias FROM t1 JOIN t2 ON talias = t2.time settings enable_analyzer=0; -- { serverError AMBIGUOUS_COLUMN_NAME }
-SELECT time as talias FROM t1 JOIN t2 ON talias = t2.time settings enable_analyzer=1;
+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_json_as_string_data_in_square_brackets.sql b/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.sql
index 6e6f306c109..3b1e5176ff9 100644
--- a/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.sql
+++ b/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.sql
@@ -3,11 +3,8 @@
 DROP TABLE IF EXISTS json_square_brackets;
 CREATE TABLE json_square_brackets (field String) ENGINE = Memory;
 INSERT INTO json_square_brackets FORMAT JSONAsString [{"id": 1, "name": "name1"}, {"id": 2, "name": "name2"}];
-
 INSERT INTO json_square_brackets FORMAT JSONAsString[];
-
 INSERT INTO json_square_brackets FORMAT JSONAsString [  ]  ;
-
 INSERT INTO json_square_brackets FORMAT JSONEachRow ;
 
 SELECT * FROM json_square_brackets;
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
index 28b9c8650af..31035aa80cd 100644
--- a/tests/queries/0_stateless/01925_test_storage_merge_aliases_analyzer.sql
+++ b/tests/queries/0_stateless/01925_test_storage_merge_aliases_analyzer.sql
@@ -1,7 +1,7 @@
 -- Tags: no-parallel
 
 drop table if exists merge;
-set enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 create table merge
 (
     dt Date,
diff --git a/tests/queries/0_stateless/01927_query_views_log_matview_exceptions.sh b/tests/queries/0_stateless/01927_query_views_log_matview_exceptions.sh
index 608107c76d6..47d5e733480 100755
--- a/tests/queries/0_stateless/01927_query_views_log_matview_exceptions.sh
+++ b/tests/queries/0_stateless/01927_query_views_log_matview_exceptions.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 function cleanup()
 {
-    ${CLICKHOUSE_CLIENT} -q "
+    ${CLICKHOUSE_CLIENT} -n -q "
         DROP TABLE IF EXISTS matview_exception_a_to_c;
         DROP TABLE IF EXISTS matview_exception_a_to_b;
         DROP TABLE IF EXISTS table_exception_c;
@@ -17,7 +17,7 @@ function cleanup()
 
 function setup()
 {
-    ${CLICKHOUSE_CLIENT} -q "
+    ${CLICKHOUSE_CLIENT} -n -q "
         CREATE TABLE table_exception_a (a String, b Int64) ENGINE = MergeTree ORDER BY b;
         CREATE TABLE table_exception_b (a Float64,  b Int64) ENGINE = MergeTree ORDER BY tuple();
         CREATE TABLE table_exception_c (a Float64) ENGINE = MergeTree ORDER BY a;
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 4efbb461501..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,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT dictGet(t.nest.a, concat(currentDatabase(), '.dict.dict'), 's', number) FROM numbers(5); -- { serverError INVALID_IDENTIFIER }
 
diff --git a/tests/queries/0_stateless/01939_network_receive_bytes_metrics.sh b/tests/queries/0_stateless/01939_network_receive_bytes_metrics.sh
index b2335a0365b..03babad40f3 100755
--- a/tests/queries/0_stateless/01939_network_receive_bytes_metrics.sh
+++ b/tests/queries/0_stateless/01939_network_receive_bytes_metrics.sh
@@ -4,11 +4,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS t; CREATE TABLE t (x UInt64) ENGINE = Memory;"
+${CLICKHOUSE_CLIENT} --multiquery --query "DROP TABLE IF EXISTS t; CREATE TABLE t (x UInt64) ENGINE = Memory;"
 
 seq 1 1000 | ${CLICKHOUSE_CLIENT} --query "INSERT INTO t FORMAT TSV"
 
-${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS;
+${CLICKHOUSE_CLIENT} --multiquery --query "SYSTEM FLUSH LOGS;
     WITH ProfileEvents['NetworkReceiveBytes'] AS bytes
     SELECT bytes >= 8000 AND bytes < 9000 ? 1 : bytes FROM system.query_log
         WHERE current_database = currentDatabase() AND query_kind = 'Insert' AND event_date >= yesterday() AND type = 2 ORDER BY event_time DESC LIMIT 1;"
diff --git a/tests/queries/0_stateless/01942_dateTimeToSnowflakeID.sql b/tests/queries/0_stateless/01942_dateTimeToSnowflakeID.sql
index 0154265ef72..945b399157f 100644
--- a/tests/queries/0_stateless/01942_dateTimeToSnowflakeID.sql
+++ b/tests/queries/0_stateless/01942_dateTimeToSnowflakeID.sql
@@ -1,5 +1,5 @@
 SET session_timezone = 'UTC'; -- disable timezone randomization
-SET enable_analyzer = 1; -- The old path formats the result with different whitespaces
+SET allow_experimental_analyzer = 1; -- The old path formats the result with different whitespaces
 
 SELECT '-- Negative tests';
 SELECT dateTimeToSnowflakeID();  -- {serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
diff --git a/tests/queries/0_stateless/01942_snowflakeIDToDateTime.sql b/tests/queries/0_stateless/01942_snowflakeIDToDateTime.sql
index 41e5beb9c16..48316691c71 100644
--- a/tests/queries/0_stateless/01942_snowflakeIDToDateTime.sql
+++ b/tests/queries/0_stateless/01942_snowflakeIDToDateTime.sql
@@ -1,5 +1,5 @@
 SET session_timezone = 'UTC'; -- disable timezone randomization
-SET enable_analyzer = 1; -- The old path formats the result with different whitespaces
+SET allow_experimental_analyzer = 1; -- The old path formats the result with different whitespaces
 
 SELECT '-- Negative tests';
 SELECT snowflakeIDToDateTime();  -- {serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
diff --git a/tests/queries/0_stateless/01943_non_deterministic_order_key.sql b/tests/queries/0_stateless/01943_non_deterministic_order_key.sql
index 94aa423c552..781ea1b1cc7 100644
--- a/tests/queries/0_stateless/01943_non_deterministic_order_key.sql
+++ b/tests/queries/0_stateless/01943_non_deterministic_order_key.sql
@@ -1,4 +1,3 @@
 CREATE TABLE a (number UInt64) ENGINE = MergeTree ORDER BY if(now() > toDateTime('2020-06-01 13:31:40'), toInt64(number), -number); -- { serverError BAD_ARGUMENTS }
 CREATE TABLE b (number UInt64) ENGINE = MergeTree ORDER BY now() > toDateTime(number); -- { serverError BAD_ARGUMENTS }
 CREATE TABLE c (number UInt64) ENGINE = MergeTree ORDER BY now(); -- { serverError BAD_ARGUMENTS }
-CREATE TABLE d (number UInt64) ENGINE = MergeTree ORDER BY now() + 1 + 1 + number; -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/01943_query_id_check.sql b/tests/queries/0_stateless/01943_query_id_check.sql
index 74c2dad8897..ad9e88e0478 100644
--- a/tests/queries/0_stateless/01943_query_id_check.sql
+++ b/tests/queries/0_stateless/01943_query_id_check.sql
@@ -16,7 +16,7 @@ SELECT query FROM system.query_log WHERE initial_query_id = (SELECT * FROM tmp)
 DROP TABLE tmp;
 
 CREATE TABLE tmp (str String) ENGINE = Log;
-INSERT INTO tmp (*) VALUES ('a');
+INSERT INTO tmp (*) VALUES ('a')
 SELECT count() FROM (SELECT initialQueryID() FROM remote('127.0.0.{1..3}', currentDatabase(), 'tmp') GROUP BY queryID());
 SELECT count() FROM (SELECT queryID() FROM remote('127.0.0.{1..3}', currentDatabase(), 'tmp') GROUP BY queryID());
 SELECT count() FROM (SELECT queryID() AS t FROM remote('127.0.0.{1..3}', currentDatabase(), 'tmp') GROUP BY queryID() HAVING t == initialQueryID());
diff --git a/tests/queries/0_stateless/01945_system_warnings.sh b/tests/queries/0_stateless/01945_system_warnings.sh
index 63403ce2893..249c3218bcc 100755
--- a/tests/queries/0_stateless/01945_system_warnings.sh
+++ b/tests/queries/0_stateless/01945_system_warnings.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh b/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh
index ed2828c3f54..a00f307673e 100755
--- a/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh
+++ b/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh
@@ -7,7 +7,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} --multiquery --query "
     DROP USER IF EXISTS dns_fail_1, dns_fail_2;
     CREATE USER dns_fail_1 HOST NAME 'non.existing.host.name', '${MYHOSTNAME}';
     CREATE USER dns_fail_2 HOST NAME '${MYHOSTNAME}', 'non.existing.host.name';"
diff --git a/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh b/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
index b3748581f4f..0aedef028a2 100755
--- a/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
+++ b/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
@@ -9,7 +9,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 mkdir -p ${USER_FILES_PATH}/
 cp $CUR_DIR/data_zstd/test_01946.zstd ${USER_FILES_PATH}/
 
-${CLICKHOUSE_CLIENT} --multiline --query "
+${CLICKHOUSE_CLIENT} --multiline --multiquery --query "
 set min_chunk_bytes_for_parallel_parsing=10485760;
 set max_read_buffer_size = 65536;
 set input_format_parallel_parsing = 0;
diff --git a/tests/queries/0_stateless/01947_multiple_pipe_read.sh b/tests/queries/0_stateless/01947_multiple_pipe_read.sh
index 51709eb574e..06a18a55e6e 100755
--- a/tests/queries/0_stateless/01947_multiple_pipe_read.sh
+++ b/tests/queries/0_stateless/01947_multiple_pipe_read.sh
@@ -11,7 +11,7 @@ cat "$SAMPLE_FILE"
 
 echo '******************'
 echo 'Read twice from a regular file'
-${CLICKHOUSE_LOCAL} --structure 'x UInt64, s String' -q 'select * from table; select * from table;' --file "$SAMPLE_FILE"
+${CLICKHOUSE_LOCAL} --structure 'x UInt64, s String' -n -q 'select * from table; select * from table;' --file "$SAMPLE_FILE"
 echo '---'
 ${CLICKHOUSE_LOCAL} --structure 'x UInt64, s String' -q 'select * from table WHERE x IN (select x from table);' --file "$SAMPLE_FILE"
 echo '---'
@@ -19,7 +19,7 @@ ${CLICKHOUSE_LOCAL} --structure 'x UInt64, s String' -q 'select * from table UNI
 
 echo '******************'
 echo 'Read twice from file descriptor that corresponds to a regular file'
-${CLICKHOUSE_LOCAL} --structure 'x UInt64, s String' -q 'select * from table; select * from table;' < "$SAMPLE_FILE"
+${CLICKHOUSE_LOCAL} --structure 'x UInt64, s String' -n -q 'select * from table; select * from table;' < "$SAMPLE_FILE"
 echo '---'
 ${CLICKHOUSE_LOCAL} --structure 'x UInt64, s String' -q 'select * from table WHERE x IN (select x from table);' < "$SAMPLE_FILE"
 echo '---'
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 a807bf7096e..5acefdb365e 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
@@ -21,7 +21,7 @@ Expression (Projection)
     Union
       Expression ((Before LIMIT BY + (Before ORDER BY + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Projection + Before ORDER BY))))))
         ReadFromSystemNumbers
-      Expression (Before LIMIT BY)
+      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
@@ -71,7 +71,7 @@ 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 enable_analyzer = 1;
+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)
@@ -96,7 +96,7 @@ 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 + (Project names + (Projection + Change column names to column identifiers)))))))))))
             ReadFromSystemNumbers
-      Expression (Before LIMIT BY)
+      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
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 960fd227a39..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,7 +4,7 @@ set optimize_skip_unused_shards=1;
 set optimize_distributed_group_by_sharding_key=1;
 set prefer_localhost_replica=1;
 
-set enable_analyzer = 0;
+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
@@ -17,7 +17,7 @@ explain select distinct k1, k2 from remote('127.{1,2}', view(select 1 k1, 2 k2,
 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 enable_analyzer = 1;
+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
diff --git a/tests/queries/0_stateless/01961_roaring_memory_tracking.sql b/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
index 22eb8e887f2..485c8192f69 100644
--- a/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
+++ b/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
@@ -2,5 +2,5 @@
 
 SET max_bytes_before_external_group_by = 0;
 
-SET max_memory_usage = '100M', max_rows_to_read = '1G';
+SET max_memory_usage = '100M';
 SELECT cityHash64(rand() % 1000) as n, groupBitmapState(number) FROM numbers_mt(200000000) GROUP BY n FORMAT Null; -- { serverError MEMORY_LIMIT_EXCEEDED }
diff --git a/tests/queries/0_stateless/02000_join_on_const.reference b/tests/queries/0_stateless/02000_join_on_const.reference
index 3bd1633ce32..848ecedf9e3 100644
--- a/tests/queries/0_stateless/02000_join_on_const.reference
+++ b/tests/queries/0_stateless/02000_join_on_const.reference
@@ -33,23 +33,23 @@
 2	2
 2	2
 -- { echoOn }
-SELECT * FROM t1 LEFT JOIN t2 ON t1.id = t2.id AND 1 = 1 SETTINGS enable_analyzer = 1;
+SELECT * FROM t1 LEFT JOIN t2 ON t1.id = t2.id AND 1 = 1 SETTINGS allow_experimental_analyzer = 1;
 1	0
 2	2
-SELECT * FROM t1 RIGHT JOIN t2 ON t1.id = t2.id AND 1 = 1 SETTINGS enable_analyzer = 1;
+SELECT * FROM t1 RIGHT JOIN t2 ON t1.id = t2.id AND 1 = 1 SETTINGS allow_experimental_analyzer = 1;
 2	2
 0	3
-SELECT * FROM t1 FULL JOIN t2 ON t1.id = t2.id AND 1 = 1 SETTINGS enable_analyzer = 1;
+SELECT * FROM t1 FULL JOIN t2 ON t1.id = t2.id AND 1 = 1 SETTINGS allow_experimental_analyzer = 1;
 1	0
 2	2
 0	3
-SELECT * FROM t1 LEFT JOIN t2 ON t1.id = t2.id AND 1 = 2 SETTINGS enable_analyzer = 1;
+SELECT * FROM t1 LEFT JOIN t2 ON t1.id = t2.id AND 1 = 2 SETTINGS allow_experimental_analyzer = 1;
 1	0
 2	0
-SELECT * FROM t1 RIGHT JOIN t2 ON t1.id = t2.id AND 1 = 2 SETTINGS enable_analyzer = 1;
+SELECT * FROM t1 RIGHT JOIN t2 ON t1.id = t2.id AND 1 = 2 SETTINGS allow_experimental_analyzer = 1;
 0	2
 0	3
-SELECT * FROM t1 FULL JOIN t2 ON t1.id = t2.id AND 1 = 2 SETTINGS enable_analyzer = 1;
+SELECT * FROM t1 FULL JOIN t2 ON t1.id = t2.id AND 1 = 2 SETTINGS allow_experimental_analyzer = 1;
 1	0
 2	0
 0	2
diff --git a/tests/queries/0_stateless/02000_join_on_const.sql b/tests/queries/0_stateless/02000_join_on_const.sql
index da70973ed87..2c1152e0ae6 100644
--- a/tests/queries/0_stateless/02000_join_on_const.sql
+++ b/tests/queries/0_stateless/02000_join_on_const.sql
@@ -56,30 +56,30 @@ SELECT * FROM t1 RIGHT JOIN t2 ON NULL SETTINGS join_algorithm = 'auto'; -- { se
 SELECT * FROM t1 FULL JOIN t2 ON NULL SETTINGS join_algorithm = 'partial_merge'; -- { serverError INVALID_JOIN_ON_EXPRESSION,NOT_IMPLEMENTED }
 
 -- mixing of constant and non-constant expressions in ON is not allowed
-SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 1 == 1 SETTINGS enable_analyzer = 0; -- { serverError AMBIGUOUS_COLUMN_NAME }
-SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 1 == 1 SETTINGS enable_analyzer = 1;
-SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 1 == 2 SETTINGS enable_analyzer = 0; -- { serverError AMBIGUOUS_COLUMN_NAME }
-SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 1 == 2 SETTINGS enable_analyzer = 1;
+SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 1 == 1 SETTINGS allow_experimental_analyzer = 0; -- { serverError AMBIGUOUS_COLUMN_NAME }
+SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 1 == 1 SETTINGS allow_experimental_analyzer = 1;
+SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 1 == 2 SETTINGS allow_experimental_analyzer = 0; -- { serverError AMBIGUOUS_COLUMN_NAME }
+SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 1 == 2 SETTINGS allow_experimental_analyzer = 1;
 
-SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 1 != 1 SETTINGS enable_analyzer = 0; -- { serverError INVALID_JOIN_ON_EXPRESSION }
-SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 1 != 1 SETTINGS enable_analyzer = 1;
+SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 1 != 1 SETTINGS allow_experimental_analyzer = 0; -- { serverError INVALID_JOIN_ON_EXPRESSION }
+SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 1 != 1 SETTINGS allow_experimental_analyzer = 1;
 SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND NULL; -- { serverError INVALID_JOIN_ON_EXPRESSION }
 SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 'aaa'; -- { serverError INVALID_JOIN_ON_EXPRESSION,ILLEGAL_TYPE_OF_ARGUMENT }
 SELECT * FROM t1 JOIN t2 ON 'aaa'; -- { serverError INVALID_JOIN_ON_EXPRESSION }
 
-SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 0 SETTINGS enable_analyzer = 0; -- { serverError INVALID_JOIN_ON_EXPRESSION }
-SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 0 SETTINGS enable_analyzer = 1;
-SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 1 SETTINGS enable_analyzer = 0; -- { serverError INVALID_JOIN_ON_EXPRESSION }
-SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 1 SETTINGS enable_analyzer = 1;
+SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 0 SETTINGS allow_experimental_analyzer = 0; -- { serverError INVALID_JOIN_ON_EXPRESSION }
+SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 0 SETTINGS allow_experimental_analyzer = 1;
+SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 1 SETTINGS allow_experimental_analyzer = 0; -- { serverError INVALID_JOIN_ON_EXPRESSION }
+SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND 1 SETTINGS allow_experimental_analyzer = 1;
 
 -- { echoOn }
-SELECT * FROM t1 LEFT JOIN t2 ON t1.id = t2.id AND 1 = 1 SETTINGS enable_analyzer = 1;
-SELECT * FROM t1 RIGHT JOIN t2 ON t1.id = t2.id AND 1 = 1 SETTINGS enable_analyzer = 1;
-SELECT * FROM t1 FULL JOIN t2 ON t1.id = t2.id AND 1 = 1 SETTINGS enable_analyzer = 1;
+SELECT * FROM t1 LEFT JOIN t2 ON t1.id = t2.id AND 1 = 1 SETTINGS allow_experimental_analyzer = 1;
+SELECT * FROM t1 RIGHT JOIN t2 ON t1.id = t2.id AND 1 = 1 SETTINGS allow_experimental_analyzer = 1;
+SELECT * FROM t1 FULL JOIN t2 ON t1.id = t2.id AND 1 = 1 SETTINGS allow_experimental_analyzer = 1;
 
-SELECT * FROM t1 LEFT JOIN t2 ON t1.id = t2.id AND 1 = 2 SETTINGS enable_analyzer = 1;
-SELECT * FROM t1 RIGHT JOIN t2 ON t1.id = t2.id AND 1 = 2 SETTINGS enable_analyzer = 1;
-SELECT * FROM t1 FULL JOIN t2 ON t1.id = t2.id AND 1 = 2 SETTINGS enable_analyzer = 1;
+SELECT * FROM t1 LEFT JOIN t2 ON t1.id = t2.id AND 1 = 2 SETTINGS allow_experimental_analyzer = 1;
+SELECT * FROM t1 RIGHT JOIN t2 ON t1.id = t2.id AND 1 = 2 SETTINGS allow_experimental_analyzer = 1;
+SELECT * FROM t1 FULL JOIN t2 ON t1.id = t2.id AND 1 = 2 SETTINGS allow_experimental_analyzer = 1;
 
 SELECT * FROM (SELECT 1 as a) as t1 INNER JOIN  ( SELECT ('b', 256) as b ) AS t2 ON NULL;
 SELECT * FROM (SELECT 1 as a) as t1 LEFT JOIN  ( SELECT ('b', 256) as b ) AS t2 ON NULL;
@@ -94,26 +94,27 @@ SELECT a + 1
 FROM (SELECT 1 as x) as t1
 LEFT JOIN ( SELECT 1 AS a ) AS t2
 ON TRUE
-SETTINGS enable_analyzer=1, join_use_nulls=1;
+SETTINGS allow_experimental_analyzer=1, join_use_nulls=1;
 
 SELECT a + 1, x + 1, toTypeName(a), toTypeName(x)
 FROM (SELECT 1 as x) as t1
 LEFT JOIN ( SELECT sum(number) as a from numbers(3) GROUP BY NULL) AS t2
 ON TRUE
-SETTINGS enable_analyzer=1, join_use_nulls=1;
+SETTINGS allow_experimental_analyzer=1, join_use_nulls=1;
 
 SELECT a + 1, x + 1, toTypeName(a), toTypeName(x)
 FROM (SELECT 1 as x) as t1
 RIGHT JOIN ( SELECT sum(number) as a from numbers(3) GROUP BY NULL) AS t2
 ON TRUE
-SETTINGS enable_analyzer=1, join_use_nulls=1;
+SETTINGS allow_experimental_analyzer=1, join_use_nulls=1;
 
 SELECT a + 1, x + 1, toTypeName(a), toTypeName(x)
 FROM (SELECT 1 as x) as t1
 FULL JOIN ( SELECT sum(number) as a from numbers(3) GROUP BY NULL) AS t2
 ON TRUE
-SETTINGS enable_analyzer=1, join_use_nulls=1;
+SETTINGS allow_experimental_analyzer=1, join_use_nulls=1;
 
 
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
+
diff --git a/tests/queries/0_stateless/02002_parse_map_int_key.sql b/tests/queries/0_stateless/02002_parse_map_int_key.sql
index c4b48e3d2b6..8d009037dd7 100644
--- a/tests/queries/0_stateless/02002_parse_map_int_key.sql
+++ b/tests/queries/0_stateless/02002_parse_map_int_key.sql
@@ -2,6 +2,7 @@ DROP TABLE IF EXISTS t_map_int_key;
 CREATE TABLE t_map_int_key (m1 Map(UInt32, UInt32), m2 Map(Date, UInt32)) ENGINE = Memory;
 
 INSERT INTO t_map_int_key FORMAT CSV "{1:2, 3: 4, 5 :6, 7 : 8}","{'2021-05-20':1, '2021-05-21': 2, '2021-05-22' :3, '2021-05-23' : 4}"
+;
 
 SELECT m1, m2 FROM t_map_int_key;
 
diff --git a/tests/queries/0_stateless/02002_row_level_filter_bug.sh b/tests/queries/0_stateless/02002_row_level_filter_bug.sh
index 557aa738217..d15a26f48f5 100755
--- a/tests/queries/0_stateless/02002_row_level_filter_bug.sh
+++ b/tests/queries/0_stateless/02002_row_level_filter_bug.sh
@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+# Tag no-parallel: create user
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-TEST_ROLE="${CLICKHOUSE_DATABASE}_role"
-TEST_USER="${CLICKHOUSE_DATABASE}_user"
-TEST_POLICY="${CLICKHOUSE_DATABASE}_policy"
 
 $CLICKHOUSE_CLIENT --query "drop table if exists test_table"
 $CLICKHOUSE_CLIENT --query "CREATE TABLE test_table
@@ -38,26 +37,26 @@ arrayJoin(['AWD','ZZZ']) as team,
 arrayJoin([3183,3106,0,3130,3108,3126,3109,3107,3182,3180,3129,3128,3125,3266]) as a
 FROM numbers(600);"
 
-$CLICKHOUSE_CLIENT --query "DROP ROLE IF EXISTS ${TEST_ROLE};"
-$CLICKHOUSE_CLIENT --query "create role ${TEST_ROLE};"
-$CLICKHOUSE_CLIENT --query "REVOKE ALL ON *.* FROM ${TEST_ROLE};"
+$CLICKHOUSE_CLIENT --query "DROP ROLE IF exists AWD;"
+$CLICKHOUSE_CLIENT --query "create role AWD;"
+$CLICKHOUSE_CLIENT --query "REVOKE ALL ON *.* FROM AWD;"
 
-$CLICKHOUSE_CLIENT --query "DROP USER IF EXISTS ${TEST_USER};"
-$CLICKHOUSE_CLIENT --query "CREATE USER ${TEST_USER} IDENTIFIED WITH plaintext_password BY 'AWD_pwd' DEFAULT ROLE ${TEST_ROLE};"
+$CLICKHOUSE_CLIENT --query "DROP USER IF EXISTS AWD_user;"
+$CLICKHOUSE_CLIENT --query "CREATE USER AWD_user IDENTIFIED WITH plaintext_password BY 'AWD_pwd' DEFAULT ROLE AWD;"
 
-$CLICKHOUSE_CLIENT --query "GRANT SELECT ON test_table TO ${TEST_ROLE};"
+$CLICKHOUSE_CLIENT --query "GRANT SELECT ON test_table TO AWD;"
 
-$CLICKHOUSE_CLIENT --query "DROP ROW POLICY IF EXISTS ${TEST_POLICY} ON test_table;"
-$CLICKHOUSE_CLIENT --query "CREATE ROW POLICY ${TEST_POLICY} ON test_table FOR SELECT USING team = 'AWD' TO ${TEST_ROLE};"
+$CLICKHOUSE_CLIENT --query "DROP ROW POLICY IF EXISTS ttt_bu_test_table_AWD ON test_table;"
+$CLICKHOUSE_CLIENT --query "CREATE ROW POLICY ttt_bu_test_table_AWD ON test_table FOR SELECT USING team = 'AWD' TO AWD;"
 
-$CLICKHOUSE_CLIENT  --user=${TEST_USER} --password=AWD_pwd  --query "
+$CLICKHOUSE_CLIENT  --user=AWD_user --password=AWD_pwd  --query "
 SELECT count() AS count
  FROM test_table
 WHERE
  t_date = '2021-07-15' AND c = 'aur' AND a=3130;
 "
 
-$CLICKHOUSE_CLIENT  --user=${TEST_USER} --password=AWD_pwd  --query "
+$CLICKHOUSE_CLIENT  --user=AWD_user --password=AWD_pwd  --query "
 SELECT
     team,
     a,
@@ -71,12 +70,8 @@ GROUP BY
     t_date;
 "
 
-$CLICKHOUSE_CLIENT  --user=${TEST_USER} --password=AWD_pwd  --query "
+$CLICKHOUSE_CLIENT  --user=AWD_user --password=AWD_pwd  --query "
 SELECT count() AS count
 FROM test_table
 WHERE (t_date = '2021-07-15') AND (c = 'aur') AND (a = 313)
 "
-
-$CLICKHOUSE_CLIENT --query "DROP ROLE IF EXISTS ${TEST_ROLE};"
-$CLICKHOUSE_CLIENT --query "DROP USER IF EXISTS ${TEST_USER};"
-$CLICKHOUSE_CLIENT --query "DROP ROW POLICY IF EXISTS ${TEST_POLICY} ON test_table;"
diff --git a/tests/queries/0_stateless/02003_memory_limit_in_client.sh b/tests/queries/0_stateless/02003_memory_limit_in_client.sh
index 32e8c32f009..96028f4847a 100755
--- a/tests/queries/0_stateless/02003_memory_limit_in_client.sh
+++ b/tests/queries/0_stateless/02003_memory_limit_in_client.sh
@@ -4,21 +4,21 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --max_result_bytes 0 --max_memory_usage_in_client=1 -q "SELECT arrayMap(x -> range(x), range(number)) FROM numbers(1000) -- { clientError MEMORY_LIMIT_EXCEEDED }"
-$CLICKHOUSE_CLIENT --max_memory_usage_in_client=0 -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
+$CLICKHOUSE_CLIENT --max_memory_usage_in_client=1 -n -q "SELECT arrayMap(x -> range(x), range(number)) FROM numbers(1000) -- { clientError MEMORY_LIMIT_EXCEEDED }"
+$CLICKHOUSE_CLIENT --max_memory_usage_in_client=0 -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
 
-$CLICKHOUSE_CLIENT --max_result_bytes 0 --max_memory_usage_in_client='5K' -q "SELECT arrayMap(x -> range(x), range(number)) FROM numbers(1000) -- { clientError MEMORY_LIMIT_EXCEEDED }"
-$CLICKHOUSE_CLIENT --max_result_bytes 0 --max_memory_usage_in_client='5k' -q "SELECT arrayMap(x -> range(x), range(number)) FROM numbers(1000) -- { clientError MEMORY_LIMIT_EXCEEDED }"
-$CLICKHOUSE_CLIENT --max_memory_usage_in_client='1M' -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
-$CLICKHOUSE_CLIENT --max_memory_usage_in_client='23G' -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
-$CLICKHOUSE_CLIENT --max_memory_usage_in_client='11T' -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
+$CLICKHOUSE_CLIENT --max_memory_usage_in_client='5K' -n -q "SELECT arrayMap(x -> range(x), range(number)) FROM numbers(1000) -- { clientError MEMORY_LIMIT_EXCEEDED }"
+$CLICKHOUSE_CLIENT --max_memory_usage_in_client='5k' -n -q "SELECT arrayMap(x -> range(x), range(number)) FROM numbers(1000) -- { clientError MEMORY_LIMIT_EXCEEDED }"
+$CLICKHOUSE_CLIENT --max_memory_usage_in_client='1M' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
+$CLICKHOUSE_CLIENT --max_memory_usage_in_client='23G' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
+$CLICKHOUSE_CLIENT --max_memory_usage_in_client='11T' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
 
-$CLICKHOUSE_CLIENT --max_memory_usage_in_client='2P' -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_INPUT_ASSERTION_FAILED"
-$CLICKHOUSE_CLIENT --max_memory_usage_in_client='2.1p' -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_INPUT_ASSERTION_FAILED"
-$CLICKHOUSE_CLIENT --max_memory_usage_in_client='10E' -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_INPUT_ASSERTION_FAILED"
-$CLICKHOUSE_CLIENT --max_memory_usage_in_client='10.2e' -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_INPUT_ASSERTION_FAILED"
-$CLICKHOUSE_CLIENT --max_memory_usage_in_client='-1.1T' -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_NUMBER"
-$CLICKHOUSE_CLIENT --max_memory_usage_in_client='-1' -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_NUMBER"
-$CLICKHOUSE_CLIENT --max_memory_usage_in_client='1m' -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_INPUT_ASSERTION_FAILED"
-$CLICKHOUSE_CLIENT --max_memory_usage_in_client='14g' -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_INPUT_ASSERTION_FAILED"
-$CLICKHOUSE_CLIENT --max_memory_usage_in_client='11t' -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_INPUT_ASSERTION_FAILED"
+$CLICKHOUSE_CLIENT --max_memory_usage_in_client='2P' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_INPUT_ASSERTION_FAILED"
+$CLICKHOUSE_CLIENT --max_memory_usage_in_client='2.1p' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_INPUT_ASSERTION_FAILED"
+$CLICKHOUSE_CLIENT --max_memory_usage_in_client='10E' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_INPUT_ASSERTION_FAILED"
+$CLICKHOUSE_CLIENT --max_memory_usage_in_client='10.2e' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_INPUT_ASSERTION_FAILED"
+$CLICKHOUSE_CLIENT --max_memory_usage_in_client='-1.1T' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_NUMBER"
+$CLICKHOUSE_CLIENT --max_memory_usage_in_client='-1' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_NUMBER"
+$CLICKHOUSE_CLIENT --max_memory_usage_in_client='1m' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_INPUT_ASSERTION_FAILED"
+$CLICKHOUSE_CLIENT --max_memory_usage_in_client='14g' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_INPUT_ASSERTION_FAILED"
+$CLICKHOUSE_CLIENT --max_memory_usage_in_client='11t' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000" 2>&1 | grep -c -F "CANNOT_PARSE_INPUT_ASSERTION_FAILED"
diff --git a/tests/queries/0_stateless/02009_from_infile.sh b/tests/queries/0_stateless/02009_from_infile.sh
index 578ac14f558..6a31aa4ac55 100755
--- a/tests/queries/0_stateless/02009_from_infile.sh
+++ b/tests/queries/0_stateless/02009_from_infile.sh
@@ -19,7 +19,7 @@ ${CLICKHOUSE_CLIENT} --query "INSERT INTO test_infile FROM INFILE '${CLICKHOUSE_
 ${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_infile;"
 
 # if it not fails, select will print information
-${CLICKHOUSE_LOCAL} --query "CREATE TABLE test_infile (word String) ENGINE=Memory(); INSERT INTO test_infile FROM INFILE '${CLICKHOUSE_TMP}/test_infile.gz' FORMAT CSV; SELECT * from test_infile;"
+${CLICKHOUSE_LOCAL} --multiquery --query "CREATE TABLE test_infile (word String) ENGINE=Memory(); INSERT INTO test_infile FROM INFILE '${CLICKHOUSE_TMP}/test_infile.gz' FORMAT CSV; SELECT * from test_infile;"
 
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=DROP+TABLE" -d 'IF EXISTS test_infile_url'
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=CREATE" -d 'TABLE test_infile_url (x String) ENGINE = Memory'
diff --git a/tests/queries/0_stateless/02015_column_default_dict_get_identifier.sql b/tests/queries/0_stateless/02015_column_default_dict_get_identifier.sql
index 046d0c42180..24a3b631388 100644
--- a/tests/queries/0_stateless/02015_column_default_dict_get_identifier.sql
+++ b/tests/queries/0_stateless/02015_column_default_dict_get_identifier.sql
@@ -1,6 +1,9 @@
 -- Tags: no-parallel
 
-CREATE TABLE test_table
+DROP DATABASE IF EXISTS 02015_db;
+CREATE DATABASE 02015_db;
+
+CREATE TABLE 02015_db.test_table
 (
     key_column UInt64,
     data_column_1 UInt64,
@@ -9,9 +12,9 @@ CREATE TABLE test_table
 ENGINE = MergeTree
 ORDER BY key_column;
 
-INSERT INTO test_table VALUES (0, 0, 0);
+INSERT INTO 02015_db.test_table VALUES (0, 0, 0);
 
-CREATE DICTIONARY test_dictionary
+CREATE DICTIONARY 02015_db.test_dictionary
 (
     key_column UInt64 DEFAULT 0,
     data_column_1 UInt64 DEFAULT 1,
@@ -19,18 +22,20 @@ CREATE DICTIONARY test_dictionary
 )
 PRIMARY KEY key_column
 LAYOUT(DIRECT())
-SOURCE(CLICKHOUSE(DB currentDatabase() TABLE 'test_table'));
+SOURCE(CLICKHOUSE(DB '02015_db' TABLE 'test_table'));
 
-CREATE TABLE test_table_default
+CREATE TABLE 02015_db.test_table_default
 (
-    data_1 DEFAULT dictGetUInt64('test_dictionary', 'data_column_1', toUInt64(0)),
-    data_2 DEFAULT dictGet(test_dictionary, 'data_column_2', toUInt64(0))
+    data_1 DEFAULT dictGetUInt64('02015_db.test_dictionary', 'data_column_1', toUInt64(0)),
+    data_2 DEFAULT dictGet(02015_db.test_dictionary, 'data_column_2', toUInt64(0))
 )
 ENGINE=TinyLog;
 
-INSERT INTO test_table_default(data_1) VALUES (5);
-SELECT * FROM test_table_default;
+INSERT INTO 02015_db.test_table_default(data_1) VALUES (5);
+SELECT * FROM 02015_db.test_table_default;
 
-DROP TABLE test_table_default;
-DROP DICTIONARY test_dictionary;
-DROP TABLE test_table;
+DROP TABLE 02015_db.test_table_default;
+DROP DICTIONARY 02015_db.test_dictionary;
+DROP TABLE 02015_db.test_table;
+
+DROP DATABASE 02015_db;
diff --git a/tests/queries/0_stateless/02020_alter_table_modify_comment.sh b/tests/queries/0_stateless/02020_alter_table_modify_comment.sh
index fa2d84e131a..3448f052f51 100755
--- a/tests/queries/0_stateless/02020_alter_table_modify_comment.sh
+++ b/tests/queries/0_stateless/02020_alter_table_modify_comment.sh
@@ -16,7 +16,7 @@ function test_table_comments()
     local ENGINE_NAME="$1"
     echo "engine : ${ENGINE_NAME}"
 
-    $CLICKHOUSE_CLIENT -m <<EOF
+    $CLICKHOUSE_CLIENT -nm <<EOF
     DROP TABLE IF EXISTS comment_test_table;
 
     CREATE TABLE comment_test_table
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 d87b0794c91..f77397dc482 100755
--- a/tests/queries/0_stateless/02021_create_database_with_comment.sh
+++ b/tests/queries/0_stateless/02021_create_database_with_comment.sh
@@ -20,7 +20,7 @@ function test_db_comments()
     local ENGINE_NAME="$1"
     echo "engine : ${ENGINE_NAME}"
 
-    $CLICKHOUSE_CLIENT --allow_deprecated_database_ordinary=1 -m <<EOF
+    $CLICKHOUSE_CLIENT --allow_deprecated_database_ordinary=1 -nm <<EOF
 DROP DATABASE IF EXISTS ${DB_NAME};
 CREATE DATABASE ${DB_NAME} ENGINE = ${ENGINE_NAME} COMMENT 'Test DB with comment';
 EOF
diff --git a/tests/queries/0_stateless/02021_exponential_sum.reference b/tests/queries/0_stateless/02021_exponential_sum.reference
index c9dcee51173..5bd77479cf7 100644
--- a/tests/queries/0_stateless/02021_exponential_sum.reference
+++ b/tests/queries/0_stateless/02021_exponential_sum.reference
@@ -5,3 +5,4 @@
 0.0009775171065493646
 0.0009775171065493646
 0.0009775171065493646
+0.0009775171065493646
diff --git a/tests/queries/0_stateless/02021_exponential_sum.sql b/tests/queries/0_stateless/02021_exponential_sum.sql
index 62ec7dcf9f1..8ab7638029c 100644
--- a/tests/queries/0_stateless/02021_exponential_sum.sql
+++ b/tests/queries/0_stateless/02021_exponential_sum.sql
@@ -6,3 +6,4 @@ WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)
 WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(100000);
 WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(1000000);
 WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(10000000);
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(100000000);
diff --git a/tests/queries/0_stateless/02021_exponential_sum_shard.reference b/tests/queries/0_stateless/02021_exponential_sum_shard.reference
index c28e5d7a132..8453706a05a 100644
--- a/tests/queries/0_stateless/02021_exponential_sum_shard.reference
+++ b/tests/queries/0_stateless/02021_exponential_sum_shard.reference
@@ -2,3 +2,4 @@
 0.009775171065493644
 0.009775171065493644
 0.009775171065493644
+0.009775171065493644
diff --git a/tests/queries/0_stateless/02021_exponential_sum_shard.sql b/tests/queries/0_stateless/02021_exponential_sum_shard.sql
index 8e91637e41d..49fde0fe217 100644
--- a/tests/queries/0_stateless/02021_exponential_sum_shard.sql
+++ b/tests/queries/0_stateless/02021_exponential_sum_shard.sql
@@ -3,3 +3,4 @@ WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)
 WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM remote('127.0.0.{1..10}', numbers_mt(10000));
 WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM remote('127.0.0.{1..10}', numbers_mt(100000));
 WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM remote('127.0.0.{1..10}', numbers_mt(1000000));
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM remote('127.0.0.{1..10}', numbers_mt(10000000));
diff --git a/tests/queries/0_stateless/02024_compression_in_query.sh b/tests/queries/0_stateless/02024_compression_in_query.sh
index 2936568c991..caa74523bd7 100755
--- a/tests/queries/0_stateless/02024_compression_in_query.sh
+++ b/tests/queries/0_stateless/02024_compression_in_query.sh
@@ -55,8 +55,8 @@ ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS test_compression_keyword;"
 [ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz.gz ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz.gz
 
 # create files using compression method and without it to check that both queries work correct
-${CLICKHOUSE_LOCAL} --query "SELECT * FROM (SELECT 'Hello, World! From local.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' FORMAT TabSeparated;"
-${CLICKHOUSE_LOCAL} --query "SELECT * FROM (SELECT 'Hello, World! From local.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz' COMPRESSION 'GZ' FORMAT TabSeparated;"
+${CLICKHOUSE_LOCAL} --multiquery --query "SELECT * FROM (SELECT 'Hello, World! From local.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' FORMAT TabSeparated;"
+${CLICKHOUSE_LOCAL} --multiquery --query "SELECT * FROM (SELECT 'Hello, World! From local.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz' COMPRESSION 'GZ' FORMAT TabSeparated;"
 
 # check content of files
 cp ${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp.gz
@@ -68,7 +68,7 @@ gunzip ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp.gz
 cat ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp
 
 # create table to check inserts
-${CLICKHOUSE_LOCAL} --query "
+${CLICKHOUSE_LOCAL} --multiquery --query "
 DROP TABLE IF EXISTS test_compression_keyword;
 CREATE TABLE test_compression_keyword (text String) Engine=Memory;
 INSERT INTO TABLE test_compression_keyword FROM INFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' FORMAT TabSeparated;
diff --git a/tests/queries/0_stateless/02030_tuple_filter.sql b/tests/queries/0_stateless/02030_tuple_filter.sql
index c8f344f5076..42853dec681 100644
--- a/tests/queries/0_stateless/02030_tuple_filter.sql
+++ b/tests/queries/0_stateless/02030_tuple_filter.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_tuple_filter;
 
diff --git a/tests/queries/0_stateless/02044_url_glob_parallel_connection_refused.sh b/tests/queries/0_stateless/02044_url_glob_parallel_connection_refused.sh
index d70845f52eb..b4b0ee8a023 100755
--- a/tests/queries/0_stateless/02044_url_glob_parallel_connection_refused.sh
+++ b/tests/queries/0_stateless/02044_url_glob_parallel_connection_refused.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-# Tags: distributed, no-fasttest
-# no-fasttest: Slow wait and retries
+# Tags: distributed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02048_clickhouse_local_stage.reference b/tests/queries/0_stateless/02048_clickhouse_local_stage.reference
index b6200464293..2631199cbab 100644
--- a/tests/queries/0_stateless/02048_clickhouse_local_stage.reference
+++ b/tests/queries/0_stateless/02048_clickhouse_local_stage.reference
@@ -1,15 +1,15 @@
-execute: --enable_analyzer=1
+execute: --allow_experimental_analyzer=1
 "foo"
 1
-execute: --enable_analyzer=1 --stage fetch_columns
+execute: --allow_experimental_analyzer=1 --stage fetch_columns
 "__table1.dummy"
 0
-execute: --enable_analyzer=1 --stage with_mergeable_state
+execute: --allow_experimental_analyzer=1 --stage with_mergeable_state
 "1_UInt8"
 1
-execute: --enable_analyzer=1 --stage with_mergeable_state_after_aggregation
+execute: --allow_experimental_analyzer=1 --stage with_mergeable_state_after_aggregation
 "1_UInt8"
 1
-execute: --enable_analyzer=1 --stage complete
+execute: --allow_experimental_analyzer=1 --stage complete
 "foo"
 1
diff --git a/tests/queries/0_stateless/02048_clickhouse_local_stage.sh b/tests/queries/0_stateless/02048_clickhouse_local_stage.sh
index 09a7e8efefc..182acc23a13 100755
--- a/tests/queries/0_stateless/02048_clickhouse_local_stage.sh
+++ b/tests/queries/0_stateless/02048_clickhouse_local_stage.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=1"
+    "--allow_experimental_analyzer=1"
 )
 
 function execute_query()
diff --git a/tests/queries/0_stateless/02048_parallel_reading_from_infile.sh b/tests/queries/0_stateless/02048_parallel_reading_from_infile.sh
index efc19cad054..f055ea304b2 100755
--- a/tests/queries/0_stateless/02048_parallel_reading_from_infile.sh
+++ b/tests/queries/0_stateless/02048_parallel_reading_from_infile.sh
@@ -17,7 +17,7 @@ echo -e "103" > "${CLICKHOUSE_TMP}"/test_infile_parallel_3
 
 gzip "${CLICKHOUSE_TMP}"/test_infile_parallel
 
-${CLICKHOUSE_CLIENT} <<EOF
+${CLICKHOUSE_CLIENT} --multiquery  <<EOF
 DROP TABLE IF EXISTS test_infile_parallel;
 CREATE TABLE test_infile_parallel (Id Int32,Value Enum('first' = 1, 'second' = 2)) ENGINE=Memory();
 SET input_format_allow_errors_num=1;
@@ -27,13 +27,13 @@ SELECT count() FROM test_infile_parallel WHERE Value='second';
 EOF
 
 # Error code is 27 (DB::ParsingException). It is not ignored.
-${CLICKHOUSE_CLIENT}  -m --query "DROP TABLE IF EXISTS test_infile_parallel;
+${CLICKHOUSE_CLIENT}  -m --multiquery --query "DROP TABLE IF EXISTS test_infile_parallel;
 CREATE TABLE test_infile_parallel (Id Int32,Value Enum('first' = 1, 'second' = 2)) ENGINE=Memory();
 SET input_format_allow_errors_num=0;
 INSERT INTO test_infile_parallel FROM INFILE '${CLICKHOUSE_TMP}/test_infile_parallel*' FORMAT TSV;
 " 2>&1 | grep -q "27" && echo "Correct" || echo 'Fail'
 
-${CLICKHOUSE_LOCAL} <<EOF
+${CLICKHOUSE_LOCAL} --multiquery <<EOF
 DROP TABLE IF EXISTS test_infile_parallel; 
 SET input_format_allow_errors_num=1;
 CREATE TABLE test_infile_parallel (Id Int32,Value Enum('first' = 1, 'second' = 2)) ENGINE=Memory(); 
diff --git a/tests/queries/0_stateless/02050_client_profile_events.sh b/tests/queries/0_stateless/02050_client_profile_events.sh
index d8cfcde2f68..05e48de771d 100755
--- a/tests/queries/0_stateless/02050_client_profile_events.sh
+++ b/tests/queries/0_stateless/02050_client_profile_events.sh
@@ -11,29 +11,23 @@ echo 'print only last (and also number of rows to provide more info in case of f
 $CLICKHOUSE_CLIENT --max_block_size=65505 --print-profile-events --profile-events-delay-ms=-1 -q 'select * from numbers(1e5)' |& grep -o -e '\[ 0 \] SelectedRows: .*$' -e Exception
 
 echo 'regression test for incorrect filtering out snapshots'
-$CLICKHOUSE_CLIENT --print-profile-events --profile-events-delay-ms=-1 -q 'select 1; select 1' >& /dev/null
+$CLICKHOUSE_CLIENT --print-profile-events --profile-events-delay-ms=-1 -n -q 'select 1; select 1' >& /dev/null
 echo $?
 
 echo 'regression test for overlap profile events snapshots between queries'
-$CLICKHOUSE_CLIENT --print-profile-events --profile-events-delay-ms=-1 -q 'select 1; select 1' |& grep -F -o '[ 0 ] SelectedRows: 1 (increment)'
+$CLICKHOUSE_CLIENT --print-profile-events --profile-events-delay-ms=-1 -n -q 'select 1; select 1' |& grep -F -o '[ 0 ] SelectedRows: 1 (increment)'
 
 echo 'regression test for overlap profile events snapshots between queries (clickhouse-local)'
-$CLICKHOUSE_LOCAL --print-profile-events --profile-events-delay-ms=-1 -q 'select 1; select 1' |& grep -F -o '[ 0 ] SelectedRows: 1 (increment)'
+$CLICKHOUSE_LOCAL --print-profile-events --profile-events-delay-ms=-1 -n -q 'select 1; select 1' |& grep -F -o '[ 0 ] SelectedRows: 1 (increment)'
 
 echo 'print everything'
-profile_events="$(
-  $CLICKHOUSE_CLIENT --max_block_size 1 --print-profile-events -q 'select sleep(1) from numbers(2) format Null' |&
-  $CLICKHOUSE_LOCAL --input-format LineAsString --query "SELECT sum(extract(line, 'SelectedRows: (\\d+)')::UInt64) FROM table WHERE line LIKE '%SelectedRows: %'"
-)"
+profile_events="$($CLICKHOUSE_CLIENT --max_block_size 1 --print-profile-events -q 'select sleep(1) from numbers(2) format Null' |& grep -c 'SelectedRows')"
 test "$profile_events" -gt 1 && echo OK || echo "FAIL ($profile_events)"
 
 echo 'print each 100 ms'
-profile_events="$(
-  $CLICKHOUSE_CLIENT --max_block_size 1 --print-profile-events --profile-events-delay-ms=100 -q 'select sleep(0.2) from numbers(10) format Null' |&
-  $CLICKHOUSE_LOCAL --input-format LineAsString --query "SELECT sum(extract(line, 'SelectedRows: (\\d+)')::UInt64) FROM table WHERE line LIKE '%SelectedRows: %'"
-)"
+profile_events="$($CLICKHOUSE_CLIENT --max_block_size 1 --print-profile-events --profile-events-delay-ms=100 -q 'select sleep(0.2) from numbers(10) format Null' |& grep -c 'SelectedRows')"
 test "$profile_events" -gt 1 && echo OK || echo "FAIL ($profile_events)"
 
 echo 'check that ProfileEvents is new for each query'
-sleep_function_calls=$($CLICKHOUSE_CLIENT --print-profile-events --profile-events-delay-ms=-1 -q 'select sleep(1); select 1' |& grep -c 'SleepFunctionCalls')
+sleep_function_calls=$($CLICKHOUSE_CLIENT --print-profile-events --profile-events-delay-ms=-1 -n -q 'select sleep(1); select 1' |& grep -c 'SleepFunctionCalls')
 test "$sleep_function_calls" -eq 1 && echo OK || echo "FAIL ($sleep_function_calls)"
diff --git a/tests/queries/0_stateless/02071_lower_upper_utf8_row_overlaps.sql b/tests/queries/0_stateless/02071_lower_upper_utf8_row_overlaps.sql
index d175e0659d0..8ca0a3f5f75 100644
--- a/tests/queries/0_stateless/02071_lower_upper_utf8_row_overlaps.sql
+++ b/tests/queries/0_stateless/02071_lower_upper_utf8_row_overlaps.sql
@@ -1,6 +1,3 @@
--- Tags: no-fasttest
--- no-fasttest: upper/lowerUTF8 use ICU
-
 drop table if exists utf8_overlap;
 create table utf8_overlap (str String) engine=Memory();
 
diff --git a/tests/queries/0_stateless/02099_tsv_raw_format_1.reference b/tests/queries/0_stateless/02099_tsv_raw_format.reference
similarity index 94%
rename from tests/queries/0_stateless/02099_tsv_raw_format_1.reference
rename to tests/queries/0_stateless/02099_tsv_raw_format.reference
index 3ac175e51f6..de46cf8dff7 100644
--- a/tests/queries/0_stateless/02099_tsv_raw_format_1.reference
+++ b/tests/queries/0_stateless/02099_tsv_raw_format.reference
@@ -109,3 +109,5 @@ UInt64	String	Date
 2
 \N
 nSome text
+b1cad4eb4be08a40387c9de70d02fcc2  -
+b1cad4eb4be08a40387c9de70d02fcc2  -
diff --git a/tests/queries/0_stateless/02099_tsv_raw_format_1.sh b/tests/queries/0_stateless/02099_tsv_raw_format.sh
similarity index 69%
rename from tests/queries/0_stateless/02099_tsv_raw_format_1.sh
rename to tests/queries/0_stateless/02099_tsv_raw_format.sh
index bd1f8731717..16b695e4037 100755
--- a/tests/queries/0_stateless/02099_tsv_raw_format_1.sh
+++ b/tests/queries/0_stateless/02099_tsv_raw_format.sh
@@ -1,8 +1,4 @@
 #!/usr/bin/env bash
-# Tags: long
-
-# This test was split in two due to long runtimes in sanitizers.
-# The other part is 02099_tsv_raw_format_2.sh.
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -18,7 +14,7 @@ do
     echo $format
     $CLICKHOUSE_CLIENT -q "INSERT INTO test_02099 SELECT number, toString(number), toDate(number) FROM numbers(3)"
     $CLICKHOUSE_CLIENT -q "SELECT * FROM test_02099 FORMAT $format"
-
+        
     $CLICKHOUSE_CLIENT -q "SELECT * FROM test_02099 FORMAT $format" | $CLICKHOUSE_CLIENT -q "INSERT INTO test_02099 FORMAT $format"
     $CLICKHOUSE_CLIENT -q "SELECT * FROM test_02099"
 
@@ -49,3 +45,17 @@ echo 'nSome text' | $CLICKHOUSE_CLIENT -q "INSERT INTO test_nullable_string_0209
 
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_nullable_string_02099"
 $CLICKHOUSE_CLIENT -q "DROP TABLE test_nullable_string_02099"
+
+
+$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS test_parallel_parsing_02099"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE test_parallel_parsing_02099 (x UInt64, a Array(UInt64), s String) ENGINE=Memory()";
+$CLICKHOUSE_CLIENT -q "SELECT number AS x, range(number % 50) AS a, toString(a) AS s FROM numbers(1000000) FORMAT TSVRaw" |  $CLICKHOUSE_CLIENT --input_format_parallel_parsing=0 -q "INSERT INTO test_parallel_parsing_02099 FORMAT TSVRaw"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_parallel_parsing_02099 ORDER BY x" | md5sum
+
+$CLICKHOUSE_CLIENT -q "TRUNCATE TABLE test_parallel_parsing_02099"
+
+$CLICKHOUSE_CLIENT -q "SELECT number AS x, range(number % 50) AS a, toString(a) AS s FROM numbers(1000000) FORMAT TSVRaw" |  $CLICKHOUSE_CLIENT --input_format_parallel_parsing=1 -q "INSERT INTO test_parallel_parsing_02099 FORMAT TSVRaw"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_parallel_parsing_02099 ORDER BY x" | md5sum
+
+$CLICKHOUSE_CLIENT -q "DROP TABLE test_parallel_parsing_02099"
+
diff --git a/tests/queries/0_stateless/02099_tsv_raw_format_2.reference b/tests/queries/0_stateless/02099_tsv_raw_format_2.reference
deleted file mode 100644
index 4682749c21f..00000000000
--- a/tests/queries/0_stateless/02099_tsv_raw_format_2.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-c8ff17885084035ea1aebd95fee2efb6  -
-c8ff17885084035ea1aebd95fee2efb6  -
diff --git a/tests/queries/0_stateless/02099_tsv_raw_format_2.sh b/tests/queries/0_stateless/02099_tsv_raw_format_2.sh
deleted file mode 100755
index 9f57eea42f2..00000000000
--- a/tests/queries/0_stateless/02099_tsv_raw_format_2.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Tags: long
-
-# This test was split in two due to long runtimes in sanitizers.
-# The other part is 02099_tsv_raw_format_1.sh.
-#
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS test_parallel_parsing_02099"
-$CLICKHOUSE_CLIENT -q "CREATE TABLE test_parallel_parsing_02099 (x UInt64, a Array(UInt64), s String) ENGINE=Memory()";
-$CLICKHOUSE_CLIENT -q "SELECT number AS x, range(number % 50) AS a, toString(a) AS s FROM numbers(100000) FORMAT TSVRaw" | $CLICKHOUSE_CLIENT --input_format_parallel_parsing=0 -q "INSERT INTO test_parallel_parsing_02099 FORMAT TSVRaw"
-$CLICKHOUSE_CLIENT -q "SELECT * FROM test_parallel_parsing_02099 ORDER BY x" | md5sum
-
-$CLICKHOUSE_CLIENT -q "TRUNCATE TABLE test_parallel_parsing_02099"
-
-$CLICKHOUSE_CLIENT -q "SELECT number AS x, range(number % 50) AS a, toString(a) AS s FROM numbers(100000) FORMAT TSVRaw" | $CLICKHOUSE_CLIENT --input_format_parallel_parsing=1 -q "INSERT INTO test_parallel_parsing_02099 FORMAT TSVRaw"
-$CLICKHOUSE_CLIENT -q "SELECT * FROM test_parallel_parsing_02099 ORDER BY x" | md5sum
-
-$CLICKHOUSE_CLIENT -q "DROP TABLE test_parallel_parsing_02099"
-
diff --git a/tests/queries/0_stateless/02104_clickhouse_local_columns_description.sh b/tests/queries/0_stateless/02104_clickhouse_local_columns_description.sh
index f88a8de80f5..f0ea5b4415c 100755
--- a/tests/queries/0_stateless/02104_clickhouse_local_columns_description.sh
+++ b/tests/queries/0_stateless/02104_clickhouse_local_columns_description.sh
@@ -4,4 +4,4 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-${CLICKHOUSE_LOCAL} --query "create table t (n int, m int default 42) engine=Memory;insert into t values (1, NULL);select * from t"
+${CLICKHOUSE_LOCAL} --multiquery --query "create table t (n int, m int default 42) engine=Memory;insert into t values (1, NULL);select * from t"
diff --git a/tests/queries/0_stateless/02105_backslash_letter_commands.expect b/tests/queries/0_stateless/02105_backslash_letter_commands.expect
index f09e9613a87..7e78b7e7280 100755
--- a/tests/queries/0_stateless/02105_backslash_letter_commands.expect
+++ b/tests/queries/0_stateless/02105_backslash_letter_commands.expect
@@ -33,6 +33,7 @@ expect "Syntax error: "
 expect ":) "
 
 send -- "  \\l ;  \\d;  \r"
+expect "Syntax error (Multi-statements are not allowed): "
 expect ":) "
 
 send -- "  \\l  ;\r"
diff --git a/tests/queries/0_stateless/02114_bool_type.sql b/tests/queries/0_stateless/02114_bool_type.sql
index 6ff9206bb59..d4ea4e54028 100644
--- a/tests/queries/0_stateless/02114_bool_type.sql
+++ b/tests/queries/0_stateless/02114_bool_type.sql
@@ -15,31 +15,22 @@ SELECT value,f FROM bool_test where value > 0;
 
 set bool_true_representation='True';
 set bool_false_representation='False';
-
 INSERT INTO bool_test (value,f) FORMAT CSV True,test
-
 INSERT INTO bool_test (value,f) FORMAT TSV False	test
-
 SELECT value,f FROM bool_test order by value FORMAT CSV;
 SELECT value,f FROM bool_test order by value FORMAT TSV;
 
 set bool_true_representation='Yes';
 set bool_false_representation='No';
-
 INSERT INTO bool_test (value,f) FORMAT CSV Yes,test
-
 INSERT INTO bool_test (value,f) FORMAT TSV No	test
-
 SELECT value,f FROM bool_test order by value FORMAT CSV;
 SELECT value,f FROM bool_test order by value FORMAT TSV;
 
 set bool_true_representation='On';
 set bool_false_representation='Off';
-
 INSERT INTO bool_test (value,f) FORMAT CSV On,test
-
 INSERT INTO bool_test (value,f) FORMAT TSV Off	test
-
 SELECT value,f FROM bool_test order by value FORMAT CSV;
 SELECT value,f FROM bool_test order by value FORMAT TSV;
 
diff --git a/tests/queries/0_stateless/02115_map_contains_analyzer.sql b/tests/queries/0_stateless/02115_map_contains_analyzer.sql
index 00285404987..46e02eca4f0 100644
--- a/tests/queries/0_stateless/02115_map_contains_analyzer.sql
+++ b/tests/queries/0_stateless/02115_map_contains_analyzer.sql
@@ -5,7 +5,7 @@ CREATE TABLE t_map_contains (m Map(String, UInt32)) ENGINE = Memory;
 INSERT INTO t_map_contains VALUES (map('a', 1, 'b', 2)), (map('c', 3, 'd', 4));
 
 SET optimize_functions_to_subcolumns = 1;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 EXPLAIN QUERY TREE dump_tree = 0, dump_ast = 1 SELECT mapContains(m, 'a') FROM t_map_contains;
 SELECT mapContains(m, 'a') FROM t_map_contains;
diff --git a/tests/queries/0_stateless/02116_tuple_element_analyzer.sql b/tests/queries/0_stateless/02116_tuple_element_analyzer.sql
index ef3729bdc95..5aeb72c9ee4 100644
--- a/tests/queries/0_stateless/02116_tuple_element_analyzer.sql
+++ b/tests/queries/0_stateless/02116_tuple_element_analyzer.sql
@@ -4,7 +4,7 @@ CREATE TABLE t_tuple_element(t1 Tuple(a UInt32, s String), t2 Tuple(UInt32, Stri
 INSERT INTO t_tuple_element VALUES ((1, 'a'), (2, 'b'));
 
 SET optimize_functions_to_subcolumns = 1;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT t1.1 FROM t_tuple_element;
 EXPLAIN QUERY TREE dump_tree = 0, dump_ast = 1 SELECT t1.1 FROM 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 638a46a142f..cfae4fee6c2 100644
--- a/tests/queries/0_stateless/02117_show_create_table_system.reference
+++ b/tests/queries/0_stateless/02117_show_create_table_system.reference
@@ -52,8 +52,6 @@ CREATE TABLE system.clusters
     `database_shard_name` String,
     `database_replica_name` String,
     `is_active` Nullable(UInt8),
-    `replication_lag` Nullable(UInt32),
-    `recovery_time` Nullable(UInt64),
     `name` String ALIAS cluster
 )
 ENGINE = SystemClusters
@@ -510,15 +508,9 @@ CREATE TABLE system.parts
     `rows_where_ttl_info.max` Array(DateTime),
     `projections` Array(String),
     `visible` UInt8,
-    `creation_tid` Tuple(
-        UInt64,
-        UInt64,
-        UUID),
+    `creation_tid` Tuple(UInt64, UInt64, UUID),
     `removal_tid_lock` UInt64,
-    `removal_tid` Tuple(
-        UInt64,
-        UInt64,
-        UUID),
+    `removal_tid` Tuple(UInt64, UInt64, UUID),
     `creation_csn` UInt64,
     `removal_csn` UInt64,
     `has_lightweight_delete` UInt8,
diff --git a/tests/queries/0_stateless/02122_join_group_by_timeout.reference b/tests/queries/0_stateless/02122_join_group_by_timeout.reference
index 6500560e8fc..f314e22e519 100644
--- a/tests/queries/0_stateless/02122_join_group_by_timeout.reference
+++ b/tests/queries/0_stateless/02122_join_group_by_timeout.reference
@@ -1,6 +1,4 @@
 Code: 159
-query_duration	1
-0
-query_duration	1
-Code: 159
+0
+Code: 159
 0
diff --git a/tests/queries/0_stateless/02122_join_group_by_timeout.sh b/tests/queries/0_stateless/02122_join_group_by_timeout.sh
index 0e89fcf56d9..59719f75d7c 100755
--- a/tests/queries/0_stateless/02122_join_group_by_timeout.sh
+++ b/tests/queries/0_stateless/02122_join_group_by_timeout.sh
@@ -1,24 +1,21 @@
 #!/usr/bin/env bash
+# Tags: no-debug
+
+# no-debug: Query is canceled by timeout after max_execution_time,
+#           but sending an exception to the client may hang
+#           for more than MAX_PROCESS_WAIT seconds in a slow debug build,
+#           and test will fail.
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-TIMEOUT=5
-IS_SANITIZER_OR_DEBUG=$($CLICKHOUSE_CLIENT -q "SELECT count() FROM system.warnings WHERE message like '%built with sanitizer%' or message like '%built in debug mode%'")
-if [ "$IS_SANITIZER_OR_DEBUG" -gt 0 ]; then
-    # Increase the timeout due to in debug/sanitizers build:
-    # - client is slow
-    # - stacktrace resolving is slow
-    TIMEOUT=15
-fi
+MAX_PROCESS_WAIT=5
 
 # TCP CLIENT: As of today (02/12/21) uses PullingAsyncPipelineExecutor
 ### Should be cancelled after 1 second and return a 159 exception (timeout)
-### However, in the test, the server can be overloaded, so we assert query duration in the interval of 1 to 60 seconds.
-query_id=$(random_str 12)
-$CLICKHOUSE_CLIENT --max_result_rows 0 --max_result_bytes 0 --query_id "$query_id" --max_execution_time 1 -q "
-    SELECT * FROM
+timeout -s KILL $MAX_PROCESS_WAIT $CLICKHOUSE_CLIENT --max_execution_time 1 -q \
+    "SELECT * FROM
     (
         SELECT a.name as n
         FROM
@@ -31,35 +28,28 @@ $CLICKHOUSE_CLIENT --max_result_rows 0 --max_result_bytes 0 --query_id "$query_i
         GROUP BY n
     )
     LIMIT 20
-    FORMAT Null
-" 2>&1 | grep -m1 -o "Code: 159"
-$CLICKHOUSE_CLIENT -q "system flush logs"
-${CLICKHOUSE_CURL} -q -sS "$CLICKHOUSE_URL" -d "select 'query_duration', round(query_duration_ms/1000) BETWEEN 1 AND 60 from system.query_log where current_database = '$CLICKHOUSE_DATABASE' and query_id = '$query_id' and type != 'QueryStart'"
-
+    FORMAT Null" 2>&1 | grep -o "Code: 159" | sort | uniq
 
 ### Should stop pulling data and return what has been generated already (return code 0)
-query_id=$(random_str 12)
-$CLICKHOUSE_CLIENT --max_result_rows 0 --max_result_bytes 0 --query_id "$query_id" -q "
-    SELECT a.name as n
-    FROM
-    (
-        SELECT 'Name' as name, number FROM system.numbers LIMIT 2000000
-    ) AS a,
-    (
-        SELECT 'Name' as name2, number FROM system.numbers LIMIT 2000000
-    ) as b
-    FORMAT Null
-    SETTINGS max_execution_time = 1, timeout_overflow_mode = 'break'
-"
+timeout -s KILL $MAX_PROCESS_WAIT $CLICKHOUSE_CLIENT -q \
+    "SELECT a.name as n
+     FROM
+     (
+         SELECT 'Name' as name, number FROM system.numbers LIMIT 2000000
+     ) AS a,
+     (
+         SELECT 'Name' as name2, number FROM system.numbers LIMIT 2000000
+     ) as b
+     FORMAT Null
+     SETTINGS max_execution_time = 1, timeout_overflow_mode = 'break'
+    "
 echo $?
-$CLICKHOUSE_CLIENT -q "system flush logs"
-${CLICKHOUSE_CURL} -q -sS "$CLICKHOUSE_URL" -d "select 'query_duration', round(query_duration_ms/1000) BETWEEN 1 AND 60 from system.query_log where current_database = '$CLICKHOUSE_DATABASE' and query_id = '$query_id' and type != 'QueryStart'"
 
 
 # HTTP CLIENT: As of today (02/12/21) uses PullingPipelineExecutor
 ### Should be cancelled after 1 second and return a 159 exception (timeout)
-${CLICKHOUSE_CURL} -q --max-time $TIMEOUT -sS "$CLICKHOUSE_URL&max_execution_time=1&max_result_rows=0&max_result_bytes=0" -d "
-    SELECT * FROM
+${CLICKHOUSE_CURL} -q --max-time $MAX_PROCESS_WAIT -sS "$CLICKHOUSE_URL&max_execution_time=1" -d \
+    "SELECT * FROM
     (
         SELECT a.name as n
         FROM
@@ -72,13 +62,12 @@ ${CLICKHOUSE_CURL} -q --max-time $TIMEOUT -sS "$CLICKHOUSE_URL&max_execution_tim
         GROUP BY n
     )
     LIMIT 20
-    FORMAT Null
-" 2>&1 | grep -o "Code: 159" | sort | uniq
+    FORMAT Null" 2>&1 | grep -o "Code: 159" | sort | uniq
 
 
 ### Should stop pulling data and return what has been generated already (return code 0)
-${CLICKHOUSE_CURL} -q --max-time $TIMEOUT -sS "$CLICKHOUSE_URL&max_result_rows=0&max_result_bytes=0" -d "
-    SELECT a.name as n
+${CLICKHOUSE_CURL} -q --max-time $MAX_PROCESS_WAIT -sS "$CLICKHOUSE_URL" -d \
+    "SELECT a.name as n
           FROM
           (
               SELECT 'Name' as name, number FROM system.numbers LIMIT 2000000
@@ -88,5 +77,5 @@ ${CLICKHOUSE_CURL} -q --max-time $TIMEOUT -sS "$CLICKHOUSE_URL&max_result_rows=0
           ) as b
           FORMAT Null
           SETTINGS max_execution_time = 1, timeout_overflow_mode = 'break'
-"
+    "
 echo $?
diff --git a/tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks.sh b/tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks.sh
index ca7ac0d51fe..9a7ac2007f1 100755
--- a/tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks.sh
+++ b/tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks.sh
@@ -14,24 +14,24 @@ $CLICKHOUSE_CLIENT --query="SYSTEM STOP MERGES block_dedup_token;"
 $CLICKHOUSE_CLIENT --query="SELECT 'insert 2 blocks with dedup token, 1 row per block'"
 DEDUP_TOKEN='dedup1'
 echo 'INSERT INTO block_dedup_token VALUES (1), (2)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'insert deduplicated by token'"
 echo 'INSERT INTO block_dedup_token VALUES (1), (2)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'insert the same data by providing different dedup token'"
 DEDUP_TOKEN='dedup2'
 echo 'INSERT INTO block_dedup_token VALUES (1), (2)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'insert 4 blocks, 2 deduplicated, 2 inserted'"
 echo 'INSERT INTO block_dedup_token VALUES (1), (2), (3), (4)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'disable token based deduplication, insert the same data as with token'"
 DEDUP_TOKEN=''
 echo 'INSERT INTO block_dedup_token VALUES (1), (2), (3), (4)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE block_dedup_token SYNC"
diff --git a/tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks_replica.sh b/tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks_replica.sh
index c4ce97aad40..0c95abb9867 100755
--- a/tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks_replica.sh
+++ b/tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks_replica.sh
@@ -15,24 +15,24 @@ $CLICKHOUSE_CLIENT --query="SYSTEM STOP MERGES block_dedup_token_replica"
 $CLICKHOUSE_CLIENT --query="SELECT 'insert 2 blocks with dedup token, 1 row per block'"
 DEDUP_TOKEN='dedup1'
 echo 'INSERT INTO block_dedup_token_replica VALUES (1), (2)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'insert deduplicated by token'"
 echo 'INSERT INTO block_dedup_token_replica VALUES (1), (2)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'insert the same data by providing different dedup token'"
 DEDUP_TOKEN='dedup2'
 echo 'INSERT INTO block_dedup_token_replica VALUES (1), (2)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'insert 4 blocks, 2 deduplicated, 2 inserted'"
 echo 'INSERT INTO block_dedup_token_replica VALUES (1), (2), (3), (4)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'disable token based deduplication, insert the same data as with token'"
 DEDUP_TOKEN=''
 echo 'INSERT INTO block_dedup_token_replica VALUES (1), (2), (3), (4)' | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&$INSERT_BLOCK_SETTINGS&insert_deduplication_token='$DEDUP_TOKEN'&query=" --data-binary @-
-$CLICKHOUSE_CLIENT --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
+$CLICKHOUSE_CLIENT --multiquery --query "$QUERY_COUNT_ORIGIN_BLOCKS;$QUERY_SELECT_FROM_TABLE_ORDERED"
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE block_dedup_token_replica SYNC"
diff --git a/tests/queries/0_stateless/02125_many_mutations.sh b/tests/queries/0_stateless/02125_many_mutations.sh
index 9b0afaca585..239f30811d4 100755
--- a/tests/queries/0_stateless/02125_many_mutations.sh
+++ b/tests/queries/0_stateless/02125_many_mutations.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 # "max_parts_to_merge_at_once = 1" prevents merges to start in background before our own OPTIMIZE FINAL
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT --multiquery -q "
 drop table if exists many_mutations;
 create table many_mutations (x UInt32, y UInt32) engine = MergeTree order by x settings number_of_mutations_to_delay = 0, number_of_mutations_to_throw = 0, max_parts_to_merge_at_once = 1;
 insert into many_mutations values (0, 0), (1, 1);
@@ -17,7 +17,7 @@ select x, y from many_mutations order by x;
 
 job()
 {
-   yes "alter table many_mutations update y = y + 1 where 1;" | head -n 1000 | $CLICKHOUSE_CLIENT
+   yes "alter table many_mutations update y = y + 1 where 1;" | head -n 1000 | $CLICKHOUSE_CLIENT --multiquery
 }
 
 job &
@@ -44,7 +44,7 @@ job &
 wait
 
 # truncate before drop, avoid removing all the mutations (it's slow) in DatabaseCatalog's thread (may affect other tests)
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT --multiquery -q "
 select count() from system.mutations where database = currentDatabase() and table = 'many_mutations' and not is_done;
 system start merges many_mutations;
 optimize table many_mutations final SETTINGS optimize_throw_if_noop = 1;
diff --git a/tests/queries/0_stateless/02125_many_mutations_2.sh b/tests/queries/0_stateless/02125_many_mutations_2.sh
index d0025e6d8cc..958f50287b2 100755
--- a/tests/queries/0_stateless/02125_many_mutations_2.sh
+++ b/tests/queries/0_stateless/02125_many_mutations_2.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 # "max_parts_to_merge_at_once = 1" prevents merges to start in background before our own OPTIMIZE FINAL
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT --multiquery -q "
 drop table if exists many_mutations;
 create table many_mutations (x UInt32, y UInt32) engine = MergeTree order by x settings number_of_mutations_to_delay = 0, number_of_mutations_to_throw = 0, max_parts_to_merge_at_once = 1;
 insert into many_mutations select number, number + 1 from numbers(2000);
@@ -21,7 +21,7 @@ job()
    for i in {1..1000}
    do
       echo "alter table many_mutations delete where y = ${i} * 2 settings mutations_sync = 0;"
-   done | $CLICKHOUSE_CLIENT
+   done | $CLICKHOUSE_CLIENT --multiquery
 }
 
 job &
@@ -48,7 +48,7 @@ job &
 wait
 
 # truncate before drop, avoid removing all the mutations (it's slow) in DatabaseCatalog's thread (may affect other tests)
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT --multiquery -q "
 select count() from system.mutations where database = currentDatabase() and table = 'many_mutations' and not is_done;
 system start merges many_mutations;
 optimize table many_mutations final SETTINGS optimize_throw_if_noop = 1;
diff --git a/tests/queries/0_stateless/02125_query_views_log_window_function.sql b/tests/queries/0_stateless/02125_query_views_log_window_function.sql
index 3f15cf5b998..fff1e943c58 100644
--- a/tests/queries/0_stateless/02125_query_views_log_window_function.sql
+++ b/tests/queries/0_stateless/02125_query_views_log_window_function.sql
@@ -1,4 +1,4 @@
-set enable_analyzer = 0;
+set allow_experimental_analyzer = 0;
 set allow_experimental_window_view = 1;
 
 CREATE TABLE data ( `id` UInt64, `timestamp` DateTime) ENGINE = Memory;
diff --git a/tests/queries/0_stateless/02129_window_functions_disable_optimizations.sql b/tests/queries/0_stateless/02129_window_functions_disable_optimizations.sql
index 20a4f2bcf5f..0f12bc2eb9c 100644
--- a/tests/queries/0_stateless/02129_window_functions_disable_optimizations.sql
+++ b/tests/queries/0_stateless/02129_window_functions_disable_optimizations.sql
@@ -29,4 +29,4 @@ HAVING sum(log(2) * number) > 346.57353 ORDER BY k;
 SELECT round(sum(log(2) * number), 6) AS k FROM numbers(10000)
 GROUP BY (number % 2) * (number % 3), number % 3, number % 2
 HAVING sum(log(2) * number) > 346.57353 ORDER BY k
-SETTINGS enable_analyzer=1;
+SETTINGS allow_experimental_analyzer=1;
diff --git a/tests/queries/0_stateless/02135_local_create_db.sh b/tests/queries/0_stateless/02135_local_create_db.sh
index 5004cd35f99..55c5c85468f 100755
--- a/tests/queries/0_stateless/02135_local_create_db.sh
+++ b/tests/queries/0_stateless/02135_local_create_db.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 for Engine in Atomic Ordinary; do
-    $CLICKHOUSE_LOCAL --allow_deprecated_database_ordinary=1 --query """
+    $CLICKHOUSE_LOCAL --allow_deprecated_database_ordinary=1 --multiquery --query """
     CREATE DATABASE foo_$Engine Engine=$Engine;
     DROP DATABASE foo_$Engine;
     """
diff --git a/tests/queries/0_stateless/02136_kill_scalar_queries.sh b/tests/queries/0_stateless/02136_kill_scalar_queries.sh
index f8bd5a42756..c8691b62360 100755
--- a/tests/queries/0_stateless/02136_kill_scalar_queries.sh
+++ b/tests/queries/0_stateless/02136_kill_scalar_queries.sh
@@ -10,7 +10,7 @@ function wait_for_query_to_start()
 }
 
 QUERY_1_ID="${CLICKHOUSE_DATABASE}_TEST02132KILL_QUERY1"
-(${CLICKHOUSE_CLIENT} --max_rows_to_read 0 --query_id="${QUERY_1_ID}" --query='select (SELECT max(number) from system.numbers) + 1;'  2>&1 | grep -q "Code: 394." || echo 'FAIL') &
+(${CLICKHOUSE_CLIENT} --query_id="${QUERY_1_ID}" --query='select (SELECT max(number) from system.numbers) + 1;'  2>&1 | grep -q "Code: 394." || echo 'FAIL') &
 wait_for_query_to_start "${QUERY_1_ID}"
 ${CLICKHOUSE_CLIENT} --query="KILL QUERY WHERE query_id='${QUERY_1_ID}' SYNC"
 
diff --git a/tests/queries/0_stateless/02136_scalar_progress.reference b/tests/queries/0_stateless/02136_scalar_progress.reference
index b8957f78e6d..5378c52de89 100644
--- a/tests/queries/0_stateless/02136_scalar_progress.reference
+++ b/tests/queries/0_stateless/02136_scalar_progress.reference
@@ -1,7 +1,6 @@
 < X-ClickHouse-Progress: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000","result_rows":"0","result_bytes":"0"}
 < X-ClickHouse-Progress: {"read_rows":"65505","read_bytes":"524040","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000","result_rows":"0","result_bytes":"0"}
 < X-ClickHouse-Progress: {"read_rows":"100000","read_bytes":"800000","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000","result_rows":"0","result_bytes":"0"}
-< X-ClickHouse-Progress: {"read_rows":"100000","read_bytes":"800000","written_rows":"0","written_bytes":"0","total_rows_to_read":"100001","result_rows":"0","result_bytes":"0"}
-< X-ClickHouse-Progress: {"read_rows":"100001","read_bytes":"800001","written_rows":"0","written_bytes":"0","total_rows_to_read":"100001","result_rows":"0","result_bytes":"0"}
-< X-ClickHouse-Progress: {"read_rows":"100001","read_bytes":"800001","written_rows":"0","written_bytes":"0","total_rows_to_read":"100001","result_rows":"1","result_bytes":"272"}
-< X-ClickHouse-Summary: {"read_rows":"100001","read_bytes":"800001","written_rows":"0","written_bytes":"0","total_rows_to_read":"100001","result_rows":"1","result_bytes":"272"}
+< X-ClickHouse-Progress: {"read_rows":"100001","read_bytes":"800001","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000","result_rows":"0","result_bytes":"0"}
+< X-ClickHouse-Progress: {"read_rows":"100001","read_bytes":"800001","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000","result_rows":"1","result_bytes":"272"}
+< X-ClickHouse-Summary: {"read_rows":"100001","read_bytes":"800001","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000","result_rows":"1","result_bytes":"272"}
diff --git a/tests/queries/0_stateless/02136_scalar_read_rows_json.sh b/tests/queries/0_stateless/02136_scalar_read_rows_json.sh
index 00f2c92161f..1fe345d266d 100755
--- a/tests/queries/0_stateless/02136_scalar_read_rows_json.sh
+++ b/tests/queries/0_stateless/02136_scalar_read_rows_json.sh
@@ -7,4 +7,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 echo "#1"
 ${CLICKHOUSE_CLIENT} --query='SELECT count() FROM numbers(100) FORMAT JSON;' | grep -a -v "elapsed"
 echo "#2"
-${CLICKHOUSE_CLIENT} --query='SELECT (SELECT max(number), count(number) FROM numbers(100000) as n) SETTINGS max_block_size = 65505, enable_analyzer = 1 FORMAT JSON;' | grep -a -v "elapsed" | grep -v "_subquery"
+${CLICKHOUSE_CLIENT} --query='SELECT (SELECT max(number), count(number) FROM numbers(100000) as n) SETTINGS max_block_size = 65505, allow_experimental_analyzer = 1 FORMAT JSON;' | grep -a -v "elapsed" | grep -v "_subquery"
diff --git a/tests/queries/0_stateless/02141_clickhouse_local_interactive_table.reference b/tests/queries/0_stateless/02141_clickhouse_local_interactive_table.reference
index 0e74c0a083e..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 TEMPORARY TABLE `table`\n(\n    `key` String\n)\nENGINE = File(TSVWithNamesAndTypes, \'/dev/null\')
-CREATE TEMPORARY TABLE `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/02141_clickhouse_local_interactive_table.sh b/tests/queries/0_stateless/02141_clickhouse_local_interactive_table.sh
index 3a95e59416a..934d87616ac 100755
--- a/tests/queries/0_stateless/02141_clickhouse_local_interactive_table.sh
+++ b/tests/queries/0_stateless/02141_clickhouse_local_interactive_table.sh
@@ -4,5 +4,5 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_LOCAL --file /dev/null --structure "key String" --input-format TSVWithNamesAndTypes --interactive --send_logs_level=trace <<<'show create temporary table table'
-$CLICKHOUSE_LOCAL --database foo --file /dev/null --structure "key String" --input-format TSVWithNamesAndTypes --interactive --send_logs_level=trace <<<'show create temporary table table'
+$CLICKHOUSE_LOCAL --file /dev/null --structure "key String" --input-format TSVWithNamesAndTypes --interactive --send_logs_level=trace <<<'show create table table'
+$CLICKHOUSE_LOCAL --database foo --file /dev/null --structure "key String" --input-format TSVWithNamesAndTypes --interactive --send_logs_level=trace <<<'show create table table'
diff --git a/tests/queries/0_stateless/02149_read_in_order_fixed_prefix.sql b/tests/queries/0_stateless/02149_read_in_order_fixed_prefix.sql
index 7bbdecf5501..ae8c39b49bc 100644
--- a/tests/queries/0_stateless/02149_read_in_order_fixed_prefix.sql
+++ b/tests/queries/0_stateless/02149_read_in_order_fixed_prefix.sql
@@ -22,20 +22,20 @@ SELECT toStartOfMonth(date) as d, i FROM t_read_in_order ORDER BY d, -i LIMIT 5;
 EXPLAIN PIPELINE SELECT toStartOfMonth(date) as d, i FROM t_read_in_order ORDER BY d, -i LIMIT 5;
 
 SELECT date, i FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i LIMIT 5;
-EXPLAIN PIPELINE SELECT date, i FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i LIMIT 5 settings enable_analyzer=0;
-EXPLAIN PIPELINE SELECT date, i FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i LIMIT 5 settings enable_analyzer=1;
+EXPLAIN PIPELINE SELECT date, i FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i LIMIT 5 settings allow_experimental_analyzer=0;
+EXPLAIN PIPELINE SELECT date, i FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i LIMIT 5 settings allow_experimental_analyzer=1;
 
 SELECT * FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i, v LIMIT 5;
-EXPLAIN PIPELINE SELECT * FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i, v LIMIT 5 settings enable_analyzer=0;
-EXPLAIN PIPELINE SELECT * FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i, v LIMIT 5 settings enable_analyzer=1;
+EXPLAIN PIPELINE SELECT * FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i, v LIMIT 5 settings allow_experimental_analyzer=0;
+EXPLAIN PIPELINE SELECT * FROM t_read_in_order WHERE date = '2020-10-11' ORDER BY i, v LIMIT 5 settings allow_experimental_analyzer=1;
 
 INSERT INTO t_read_in_order SELECT '2020-10-12', number, number FROM numbers(100000);
 
 SELECT date, i FROM t_read_in_order WHERE date = '2020-10-12' ORDER BY i LIMIT 5;
 
 EXPLAIN SYNTAX SELECT date, i FROM t_read_in_order WHERE date = '2020-10-12' ORDER BY i DESC LIMIT 5;
-EXPLAIN PIPELINE SELECT date, i FROM t_read_in_order WHERE date = '2020-10-12' ORDER BY i DESC LIMIT 5 settings enable_analyzer=0;
-EXPLAIN PIPELINE SELECT date, i FROM t_read_in_order WHERE date = '2020-10-12' ORDER BY i DESC LIMIT 5 settings enable_analyzer=1;
+EXPLAIN PIPELINE SELECT date, i FROM t_read_in_order WHERE date = '2020-10-12' ORDER BY i DESC LIMIT 5 settings allow_experimental_analyzer=0;
+EXPLAIN PIPELINE SELECT date, i FROM t_read_in_order WHERE date = '2020-10-12' ORDER BY i DESC LIMIT 5 settings allow_experimental_analyzer=1;
 SELECT date, i FROM t_read_in_order WHERE date = '2020-10-12' ORDER BY i DESC LIMIT 5;
 
 DROP TABLE IF EXISTS t_read_in_order;
diff --git a/tests/queries/0_stateless/02150_index_hypothesis_race_long.sh b/tests/queries/0_stateless/02150_index_hypothesis_race_long.sh
index 92b78a6d27a..114f60cc393 100755
--- a/tests/queries/0_stateless/02150_index_hypothesis_race_long.sh
+++ b/tests/queries/0_stateless/02150_index_hypothesis_race_long.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# Tags: long, no-random-settings, no-distributed-cache
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -11,21 +10,13 @@ $CLICKHOUSE_CLIENT -q "CREATE TABLE t_index_hypothesis (a UInt32, b UInt32, INDE
 
 $CLICKHOUSE_CLIENT -q "INSERT INTO t_index_hypothesis SELECT number, number + 1 FROM numbers(10000000)"
 
-run_query() {
+for _ in {0..30}; do
     output=`$CLICKHOUSE_CLIENT -q "SELECT count() FROM t_index_hypothesis WHERE a = b"`
     if [[ $output != "0" ]]; then
         echo "output: $output, expected: 0"
         exit 1
     fi
-}
-
-export -f run_query
-parallel -j 8 run_query ::: {0..30}
-
-if [ $? -ne 0 ]; then
-    echo FAILED
-    exit 1
-fi
+done
 
 echo OK
 
diff --git a/tests/queries/0_stateless/02151_client_option_echo.sh b/tests/queries/0_stateless/02151_client_option_echo.sh
index 565a3a16fe9..8056b3b5ed1 100755
--- a/tests/queries/0_stateless/02151_client_option_echo.sh
+++ b/tests/queries/0_stateless/02151_client_option_echo.sh
@@ -11,6 +11,6 @@ ${CLICKHOUSE_CLIENT} --echo --query="DROP TABLE IF EXISTS echo_test_0"
 # single query echo off
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS echo_test_1"
 # multi query echo on
-${CLICKHOUSE_CLIENT} --echo --query="DROP TABLE IF EXISTS echo_test_2;DROP TABLE IF EXISTS echo_test_3"
+${CLICKHOUSE_CLIENT} --echo --multiquery --query="DROP TABLE IF EXISTS echo_test_2;DROP TABLE IF EXISTS echo_test_3"
 # multi query echo off
-${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS echo_test_4;DROP TABLE IF EXISTS echo_test_5"
+${CLICKHOUSE_CLIENT} --multiquery --query="DROP TABLE IF EXISTS echo_test_4;DROP TABLE IF EXISTS echo_test_5"
diff --git a/tests/queries/0_stateless/02151_hash_table_sizes_stats.sh b/tests/queries/0_stateless/02151_hash_table_sizes_stats.sh
index b679c962232..f99dbdacec2 100755
--- a/tests/queries/0_stateless/02151_hash_table_sizes_stats.sh
+++ b/tests/queries/0_stateless/02151_hash_table_sizes_stats.sh
@@ -35,7 +35,7 @@ prepare_table_with_sorting_key() {
 
 run_query() {
   query_id="${CLICKHOUSE_DATABASE}_hash_table_sizes_stats_$RANDOM$RANDOM"
-  $CLICKHOUSE_CLIENT --query_id="$query_id" -q "
+  $CLICKHOUSE_CLIENT --query_id="$query_id" --multiquery -q "
     SET max_block_size = $((table_size / 10));
     SET merge_tree_min_rows_for_concurrent_read = 1;
     SET max_untracked_memory = 0;
diff --git a/tests/queries/0_stateless/02151_hash_table_sizes_stats_distributed.sh b/tests/queries/0_stateless/02151_hash_table_sizes_stats_distributed.sh
index 67afa26d02a..056c176c1ff 100755
--- a/tests/queries/0_stateless/02151_hash_table_sizes_stats_distributed.sh
+++ b/tests/queries/0_stateless/02151_hash_table_sizes_stats_distributed.sh
@@ -40,7 +40,7 @@ prepare_table_with_sorting_key() {
 
 run_query() {
   query_id="${CLICKHOUSE_DATABASE}_hash_table_sizes_stats_$RANDOM$RANDOM"
-  $CLICKHOUSE_CLIENT --query_id="$query_id" -q "
+  $CLICKHOUSE_CLIENT --query_id="$query_id" --multiquery -q "
     SET max_block_size = $((table_size / 10));
     SET merge_tree_min_rows_for_concurrent_read = 1;
     SET max_untracked_memory = 0;
diff --git a/tests/queries/0_stateless/02151_hash_table_sizes_stats_joins.sh b/tests/queries/0_stateless/02151_hash_table_sizes_stats_joins.sh
index 007dae6e427..6d715604d93 100755
--- a/tests/queries/0_stateless/02151_hash_table_sizes_stats_joins.sh
+++ b/tests/queries/0_stateless/02151_hash_table_sizes_stats_joins.sh
@@ -58,7 +58,7 @@ $CLICKHOUSE_CLIENT -q "SYSTEM FLUSH LOGS"
 for i in "${!queries_without_preallocation[@]}"; do
   $CLICKHOUSE_CLIENT --param_query_id="${queries_without_preallocation[$i]}" -q "
     -- the old analyzer is not supported
-    SELECT sum(if(getSetting('enable_analyzer'), ProfileEvents['HashJoinPreallocatedElementsInHashTables'] = 0, 1))
+    SELECT sum(if(getSetting('allow_experimental_analyzer'), ProfileEvents['HashJoinPreallocatedElementsInHashTables'] = 0, 1))
       FROM system.query_log
      WHERE event_date >= yesterday() AND query_id = {query_id:String} AND current_database = currentDatabase() AND type = 'QueryFinish'
   "
@@ -67,7 +67,7 @@ done
 for i in "${!queries_with_preallocation[@]}"; do
   $CLICKHOUSE_CLIENT --param_query_id="${queries_with_preallocation[$i]}" -q "
     -- the old analyzer is not supported
-    SELECT sum(if(getSetting('enable_analyzer'), ProfileEvents['HashJoinPreallocatedElementsInHashTables'] > 0, 1))
+    SELECT sum(if(getSetting('allow_experimental_analyzer'), ProfileEvents['HashJoinPreallocatedElementsInHashTables'] > 0, 1))
       FROM system.query_log
      WHERE event_date >= yesterday() AND query_id = {query_id:String} AND current_database = currentDatabase() AND type = 'QueryFinish'
   "
diff --git a/tests/queries/0_stateless/02151_lc_prefetch.sql b/tests/queries/0_stateless/02151_lc_prefetch.sql
index f8c76038120..c2b97231145 100644
--- a/tests/queries/0_stateless/02151_lc_prefetch.sql
+++ b/tests/queries/0_stateless/02151_lc_prefetch.sql
@@ -3,6 +3,5 @@ drop table if exists tab_lc;
 CREATE TABLE tab_lc (x UInt64, y LowCardinality(String)) engine = MergeTree order by x SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
 insert into tab_lc select number, toString(number % 10) from numbers(20000000);
 optimize table tab_lc;
-SET max_rows_to_read = '21M';
 select count() from tab_lc where y == '0' settings local_filesystem_read_prefetch=1;
 drop table if exists tab_lc;
diff --git a/tests/queries/0_stateless/02154_dictionary_get_http_json.sh b/tests/queries/0_stateless/02154_dictionary_get_http_json.sh
index bcd9f4f5c1a..fbaf67fff2f 100755
--- a/tests/queries/0_stateless/02154_dictionary_get_http_json.sh
+++ b/tests/queries/0_stateless/02154_dictionary_get_http_json.sh
@@ -32,7 +32,7 @@ $CLICKHOUSE_CLIENT -q """
 
 echo """
     SELECT dictGet(02154_test_dictionary, 'value', toUInt64(0)), dictGet(02154_test_dictionary, 'value', toUInt64(1))
-    SETTINGS enable_analyzer = 1
+    SETTINGS allow_experimental_analyzer = 1
     FORMAT JSON
 """ | ${CLICKHOUSE_CURL} -sSg "${CLICKHOUSE_URL}&wait_end_of_query=1&output_format_write_statistics=0" -d @-
 
diff --git a/tests/queries/0_stateless/02156_storage_merge_prewhere.sql b/tests/queries/0_stateless/02156_storage_merge_prewhere.sql
index 2e5066fc488..4f010ebadfd 100644
--- a/tests/queries/0_stateless/02156_storage_merge_prewhere.sql
+++ b/tests/queries/0_stateless/02156_storage_merge_prewhere.sql
@@ -24,8 +24,8 @@ 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);
 
-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%' settings enable_analyzer=1;
-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%' settings enable_analyzer=0;
+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%' settings allow_experimental_analyzer=1;
+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%' settings allow_experimental_analyzer=0;
 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_merge2 WHERE k = 3 AND notEmpty(v)) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
diff --git a/tests/queries/0_stateless/02158_explain_ast_alter_commands.sh b/tests/queries/0_stateless/02158_explain_ast_alter_commands.sh
index 7a504ab1d31..8dfb61eedfb 100755
--- a/tests/queries/0_stateless/02158_explain_ast_alter_commands.sh
+++ b/tests/queries/0_stateless/02158_explain_ast_alter_commands.sh
@@ -47,4 +47,4 @@ EXPLAIN AST ALTER TABLE t UPDATE c = 1 WHERE 1;
 EXPLAIN AST ALTER TABLE t UPDATE c = 1 IN PARTITION 'p' WHERE 1;
 EXPLAIN AST ALTER TABLE t DELETE WHERE c = 1;
 EXPLAIN AST ALTER TABLE t DELETE IN PARTITION 'p' WHERE c = 1;" | \
-    $CLICKHOUSE_CLIENT --readonly 1 2>&1 | grep 'AlterCommand'
+    $CLICKHOUSE_CLIENT --readonly 1 --multiquery 2>&1 | grep 'AlterCommand'
diff --git a/tests/queries/0_stateless/02161_addressToLineWithInlines.sql b/tests/queries/0_stateless/02161_addressToLineWithInlines.sql
index d7ce133f38c..cf400ed34c5 100644
--- a/tests/queries/0_stateless/02161_addressToLineWithInlines.sql
+++ b/tests/queries/0_stateless/02161_addressToLineWithInlines.sql
@@ -6,7 +6,7 @@ SELECT addressToLineWithInlines(1); -- { serverError FUNCTION_NOT_ALLOWED }
 SET allow_introspection_functions = 1;
 SET query_profiler_real_time_period_ns = 0;
 SET query_profiler_cpu_time_period_ns = 1000000;
-SET log_queries = 1, max_rows_to_read = 0;
+SET log_queries = 1;
 SELECT count() FROM numbers_mt(10000000000) SETTINGS log_comment='02161_test_case';
 SET log_queries = 0;
 SET query_profiler_cpu_time_period_ns = 0;
diff --git a/tests/queries/0_stateless/02164_clickhouse_local_interactive_exception.expect b/tests/queries/0_stateless/02164_clickhouse_local_interactive_exception.expect
new file mode 100755
index 00000000000..add977c4fce
--- /dev/null
+++ b/tests/queries/0_stateless/02164_clickhouse_local_interactive_exception.expect
@@ -0,0 +1,29 @@
+#!/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
+
+log_user 0
+set timeout 20
+match_max 100000
+
+expect_after {
+    -i $any_spawn_id eof { exp_continue }
+    -i $any_spawn_id timeout { exit 1 }
+}
+
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_LOCAL  --disable_suggestion"
+
+expect ":) "
+send -- "insert into table function null() format TSV some trash here 123 \n 456\r"
+expect "CANNOT_PARSE_INPUT_ASSERTION_FAILED"
+expect ":) "
+
+send -- ""
+expect eof
diff --git a/tests/queries/0_stateless/02164_clickhouse_local_interactive_exception.python b/tests/queries/0_stateless/02164_clickhouse_local_interactive_exception.python
deleted file mode 100644
index 4c2df9556a1..00000000000
--- a/tests/queries/0_stateless/02164_clickhouse_local_interactive_exception.python
+++ /dev/null
@@ -1,95 +0,0 @@
-import pty
-import os
-import shlex
-import time
-import multiprocessing
-
-COMPLETION_TIMEOUT_SECONDS = 30
-DEBUG_LOG = os.path.join(
-    os.environ["CLICKHOUSE_TMP"],
-    os.path.basename(os.path.abspath(__file__)).strip(".python") + ".debuglog",
-)
-
-STATE_MAP = {
-    -1: "process did not start",
-    0: "all good",
-    1: "process started and said ':)'",
-    2: "prompt search was started",
-    3: "prompt is missing",
-}
-
-
-def run_with_timeout(func, args, timeout):
-    for _ in range(5):
-        state = multiprocessing.Value("i", -1)
-        process = multiprocessing.Process(
-            target=func, args=args, kwargs={"state": state}
-        )
-        process.start()
-        process.join(timeout)
-
-        if state.value in (0, 3):
-            return
-
-        if process.is_alive():
-            process.terminate()
-
-            if state.value == -1:
-                continue
-
-            print(f"Timeout, state: {STATE_MAP[state.value]}")
-            return
-
-
-def expect(text, master, debug_log_fd, output=""):
-    while not text in output:
-        output_b = os.read(master, 4096)
-        output += output_b.decode()
-        debug_log_fd.write(repr(output_b) + "\n")
-        debug_log_fd.flush()
-
-    return output
-
-
-def test_completion(program, argv, prompt, state=None):
-    shell_pid, master = pty.fork()
-    if shell_pid == 0:
-        os.execv(program, argv)
-    else:
-        try:
-            debug_log_fd = open(DEBUG_LOG, "a")
-
-            expect(":)", master, debug_log_fd)
-
-            state.value = 1
-            os.write(master, bytes(prompt.encode()))
-            expect(prompt[:-10], master, debug_log_fd)
-
-            time.sleep(0.01)
-            os.write(master, b"\r")
-            state.value = 2
-
-            output = expect("CANNOT_PARSE_INPUT_ASSERTION_FAILED", master, debug_log_fd)
-            expect(":)", master, debug_log_fd, output)
-
-            print("OK")
-            state.value = 0
-        finally:
-            os.close(master)
-            debug_log_fd.close()
-
-
-if __name__ == "__main__":
-    clickhouse_local = os.environ["CLICKHOUSE_LOCAL"]
-    args = shlex.split(clickhouse_local)
-    args.append("--disable_suggestion")
-    args.append("--highlight=0")
-    run_with_timeout(
-        test_completion,
-        [
-            args[0],
-            args,
-            "insert into table function null() format TSV some trash here 123 \n 456",
-        ],
-        COMPLETION_TIMEOUT_SECONDS,
-    )
diff --git a/tests/queries/0_stateless/02164_clickhouse_local_interactive_exception.reference b/tests/queries/0_stateless/02164_clickhouse_local_interactive_exception.reference
index d86bac9de59..e69de29bb2d 100644
--- a/tests/queries/0_stateless/02164_clickhouse_local_interactive_exception.reference
+++ b/tests/queries/0_stateless/02164_clickhouse_local_interactive_exception.reference
@@ -1 +0,0 @@
-OK
diff --git a/tests/queries/0_stateless/02174_cte_scalar_cache.sql b/tests/queries/0_stateless/02174_cte_scalar_cache.sql
index d14475c843a..86cfff21446 100644
--- a/tests/queries/0_stateless/02174_cte_scalar_cache.sql
+++ b/tests/queries/0_stateless/02174_cte_scalar_cache.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 WITH
     ( SELECT sleep(0.0001) FROM system.one ) as a1,
@@ -28,7 +28,7 @@ WITH
     ( SELECT sleep(0.0001) FROM system.one ) as a5
 SELECT '02177_CTE_NEW_ANALYZER', a1, a2, a3, a4, a5 FROM system.numbers LIMIT 100
         FORMAT Null
-SETTINGS enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
 
 SYSTEM FLUSH LOGS;
 SELECT
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 a2be0a11faf..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,7 +14,7 @@ CREATE MATERIALIZED VIEW mv1 TO t2 AS
     FROM t1
     LIMIT 5;
 
-set enable_analyzer = 0;
+set allow_experimental_analyzer = 0;
 
 -- FIRST INSERT
 INSERT INTO t1
@@ -61,7 +61,7 @@ WHERE
   AND event_date >= yesterday() AND event_time > now() - interval 10 minute;
 
 truncate table t2;
-set enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 
 -- FIRST INSERT ANALYZER
 INSERT INTO t1
@@ -100,7 +100,7 @@ WHERE
 
 DROP TABLE mv1;
 
-set enable_analyzer = 0;
+set allow_experimental_analyzer = 0;
 
 CREATE TABLE t3 (z Int64) ENGINE = Memory;
 CREATE MATERIALIZED VIEW mv2 TO t3 AS
@@ -134,7 +134,7 @@ WHERE
   AND event_date >= yesterday() AND event_time > now() - interval 10 minute;
 
 truncate table t3;
-set enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 
 -- SECOND INSERT ANALYZER
 INSERT INTO t1
@@ -162,7 +162,7 @@ WHERE
 
 DROP TABLE mv2;
 
-set enable_analyzer = 0;
+set allow_experimental_analyzer = 0;
 
 CREATE TABLE t4 (z Int64) ENGINE = Memory;
 CREATE MATERIALIZED VIEW mv3 TO t4 AS
@@ -197,7 +197,7 @@ WHERE
   AND event_date >= yesterday() AND event_time > now() - interval 10 minute;
 
 truncate table t4;
-set enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 
 -- THIRD INSERT ANALYZER
 INSERT INTO t1
diff --git a/tests/queries/0_stateless/02177_issue_31009.sql b/tests/queries/0_stateless/02177_issue_31009.sql
index 5c62b5a9c2f..f25df59f4b4 100644
--- a/tests/queries/0_stateless/02177_issue_31009.sql
+++ b/tests/queries/0_stateless/02177_issue_31009.sql
@@ -8,8 +8,6 @@ DROP TABLE IF EXISTS right;
 CREATE TABLE left ( key UInt32, value String ) ENGINE = MergeTree ORDER BY key SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
 CREATE TABLE right (  key UInt32, value String ) ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
 
-SET max_rows_to_read = '50M';
-
 INSERT INTO left SELECT number, toString(number) FROM numbers(25367182);
 INSERT INTO right SELECT number, toString(number) FROM numbers(23124707);
 
diff --git a/tests/queries/0_stateless/02177_issue_31009_pt2.sql.j2 b/tests/queries/0_stateless/02177_issue_31009_pt2.sql.j2
index 7df77595347..47940356302 100644
--- a/tests/queries/0_stateless/02177_issue_31009_pt2.sql.j2
+++ b/tests/queries/0_stateless/02177_issue_31009_pt2.sql.j2
@@ -1,5 +1,4 @@
--- Tags: long, no-flaky-check
--- It can be too long with ThreadFuzzer
+-- Tags: long
 
 DROP TABLE IF EXISTS left;
 DROP TABLE IF EXISTS right;
diff --git a/tests/queries/0_stateless/02184_hash_functions_and_ip_types.sql b/tests/queries/0_stateless/02184_hash_functions_and_ip_types.sql
index e7d1909cae6..c90c8b90c9e 100644
--- a/tests/queries/0_stateless/02184_hash_functions_and_ip_types.sql
+++ b/tests/queries/0_stateless/02184_hash_functions_and_ip_types.sql
@@ -1,6 +1,6 @@
 -- Tags: no-fasttest
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT
     toIPv4('1.2.3.4') AS ipv4,
diff --git a/tests/queries/0_stateless/02184_ipv6_select_parsing.sql b/tests/queries/0_stateless/02184_ipv6_select_parsing.sql
index ba5399555f8..2892de309c4 100644
--- a/tests/queries/0_stateless/02184_ipv6_select_parsing.sql
+++ b/tests/queries/0_stateless/02184_ipv6_select_parsing.sql
@@ -2,11 +2,8 @@ drop table if exists ips_v6;
 create table ips_v6(i IPv6) Engine=Memory;
 
 INSERT INTO ips_v6 SELECT toIPv6('::ffff:127.0.0.1');
-
 INSERT INTO ips_v6 values       ('::ffff:127.0.0.1');
-
 INSERT INTO ips_v6     FORMAT TSV ::ffff:127.0.0.1
-
 INSERT INTO ips_v6 SELECT       ('::ffff:127.0.0.1');
 
 SELECT * FROM ips_v6;
diff --git a/tests/queries/0_stateless/02192_comment_error.reference b/tests/queries/0_stateless/02192_comment_error.reference
index 5f097eb8df6..21da4d2be9e 100644
--- a/tests/queries/0_stateless/02192_comment_error.reference
+++ b/tests/queries/0_stateless/02192_comment_error.reference
@@ -1,5 +1,5 @@
-FAIL
-FAIL
+OK
+OK
 OK
 OK
 OK
diff --git a/tests/queries/0_stateless/02192_comment_error.sh b/tests/queries/0_stateless/02192_comment_error.sh
index d48c95a6419..78ff474ae84 100755
--- a/tests/queries/0_stateless/02192_comment_error.sh
+++ b/tests/queries/0_stateless/02192_comment_error.sh
@@ -4,10 +4,8 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-# just stop, no exception
 ${CLICKHOUSE_CLIENT} --query="#" 2>&1 | grep -F -q 'Syntax error' && echo 'OK' || echo 'FAIL'
 ${CLICKHOUSE_CLIENT} --query="#not a comemnt" 2>&1 | grep -F -q 'Syntax error' && echo 'OK' || echo 'FAIL'
-# syntax error
 ${CLICKHOUSE_CLIENT} --query="select 1 #not a comemnt" 2>&1 | grep -F -q 'Syntax error' && echo 'OK' || echo 'FAIL'
 ${CLICKHOUSE_CLIENT} --query="select 1 #" 2>&1 | grep -F -q 'Syntax error' && echo 'OK' || echo 'FAIL'
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -d "select 42 #" 2>&1 | grep -F -q 'Syntax error' && echo 'OK' || echo 'FAIL'
diff --git a/tests/queries/0_stateless/02193_async_insert_tcp_client_1.sql b/tests/queries/0_stateless/02193_async_insert_tcp_client_1.sql
index a232a4196db..86db9d04aa0 100644
--- a/tests/queries/0_stateless/02193_async_insert_tcp_client_1.sql
+++ b/tests/queries/0_stateless/02193_async_insert_tcp_client_1.sql
@@ -6,7 +6,9 @@ DROP TABLE IF EXISTS t_async_insert_02193_1;
 
 CREATE TABLE t_async_insert_02193_1 (id UInt32, s String) ENGINE = Memory;
 
-INSERT INTO t_async_insert_02193_1 SETTINGS async_insert = 1 FORMAT CSV 1,aaa
+INSERT INTO t_async_insert_02193_1 SETTINGS async_insert = 1 FORMAT CSV
+1,aaa
+;
 
 INSERT INTO t_async_insert_02193_1 SETTINGS async_insert = 1 FORMAT Values (2, 'bbb');
 
diff --git a/tests/queries/0_stateless/02206_clickhouse_local_use_database.sh b/tests/queries/0_stateless/02206_clickhouse_local_use_database.sh
index 3b71c8754c9..59ede739e4a 100755
--- a/tests/queries/0_stateless/02206_clickhouse_local_use_database.sh
+++ b/tests/queries/0_stateless/02206_clickhouse_local_use_database.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-$CLICKHOUSE_LOCAL --echo --multiline -q """
+$CLICKHOUSE_LOCAL --echo --multiline --multiquery -q """
 SHOW TABLES;
 CREATE DATABASE test1;
 CREATE TABLE test1.table1 (a Int32) ENGINE=Memory;
diff --git a/tests/queries/0_stateless/02210_processors_profile_log.reference b/tests/queries/0_stateless/02210_processors_profile_log.reference
index 12ba17103da..035bd9897ad 100644
--- a/tests/queries/0_stateless/02210_processors_profile_log.reference
+++ b/tests/queries/0_stateless/02210_processors_profile_log.reference
@@ -6,6 +6,6 @@ ExpressionTransform
 ExpressionTransform	1	1	1	1	1
 LazyOutputFormat	1	1	1	0	0
 LimitsCheckingTransform	1	1	1	1	1
-NullSource	0	0	0	0	0
-NullSource	0	0	0	0	0
+NullSource	1	0	0	0	0
+NullSource	1	0	0	0	0
 SourceFromSingleChunk	1	0	0	1	1
diff --git a/tests/queries/0_stateless/02210_processors_profile_log.sql b/tests/queries/0_stateless/02210_processors_profile_log.sql
index a850f4312b3..75e5bcbb585 100644
--- a/tests/queries/0_stateless/02210_processors_profile_log.sql
+++ b/tests/queries/0_stateless/02210_processors_profile_log.sql
@@ -20,8 +20,8 @@ SELECT
         -- SourceFromSingleChunk, that feed data to ExpressionTransform,
         -- will feed first block and then wait in PortFull.
         name = 'SourceFromSingleChunk', output_wait_elapsed_us >= 0.9e6 ? 1 : output_wait_elapsed_us,
-        -- LazyOutputFormatLazyOutputFormat is the output
-        -- so it cannot starts to execute before sleep(1) will be executed.
+        -- NullSource/LazyOutputFormatLazyOutputFormat are the outputs
+        -- so they cannot starts to execute before sleep(1) will be executed.
         input_wait_elapsed_us>=1e6 ? 1 : input_wait_elapsed_us)
     elapsed,
     input_rows,
diff --git a/tests/queries/0_stateless/02210_toColumnTypeName_toLowCardinality_const.reference b/tests/queries/0_stateless/02210_toColumnTypeName_toLowCardinality_const.reference
index e3978020431..1e3d3a50562 100644
--- a/tests/queries/0_stateless/02210_toColumnTypeName_toLowCardinality_const.reference
+++ b/tests/queries/0_stateless/02210_toColumnTypeName_toLowCardinality_const.reference
@@ -1 +1 @@
-Const(LowCardinality(UInt8))
+Const(ColumnLowCardinality)
diff --git a/tests/queries/0_stateless/02221_parallel_replicas_bug.sh b/tests/queries/0_stateless/02221_parallel_replicas_bug.sh
index a382b3859f3..3c44a2a7ba7 100755
--- a/tests/queries/0_stateless/02221_parallel_replicas_bug.sh
+++ b/tests/queries/0_stateless/02221_parallel_replicas_bug.sh
@@ -4,4 +4,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-${CLICKHOUSE_CLIENT} --allow_experimental_parallel_reading_from_replicas=1 --parallel_replicas_for_non_replicated_merge_tree=1 -m < "$CURDIR"/01099_parallel_distributed_insert_select.sql > /dev/null
+${CLICKHOUSE_CLIENT} --allow_experimental_parallel_reading_from_replicas=1 --parallel_replicas_for_non_replicated_merge_tree=1 -nm < "$CURDIR"/01099_parallel_distributed_insert_select.sql > /dev/null
diff --git a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.sh b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.sh
index e23a272a4e8..db94c59d2de 100755
--- a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.sh
+++ b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS sample_table"
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS sample_table_2"
 
-${CLICKHOUSE_CLIENT} -q"
+${CLICKHOUSE_CLIENT} -n -q"
 CREATE TABLE sample_table (
     key UInt64
 )
@@ -16,7 +16,7 @@ ENGINE ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/02221_
 ORDER BY tuple();
 "
 
-${CLICKHOUSE_CLIENT} -q"
+${CLICKHOUSE_CLIENT} -n -q"
 CREATE TABLE sample_table_2 (
     key UInt64
 )
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 6381d811d5d..c62ec14b340 100755
--- a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.sh
+++ b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS sample_table;"
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS sample_table_2;"
 
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE sample_table (
+${CLICKHOUSE_CLIENT} -n --query="CREATE TABLE sample_table (
     key UInt64
 )
 ENGINE ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/02221_system_zookeeper_unrestricted_like', '1')
@@ -16,7 +16,7 @@ ORDER BY tuple();
 DROP TABLE IF EXISTS sample_table SYNC;"
 
 
-${CLICKHOUSE_CLIENT} --query "CREATE TABLE sample_table_2 (
+${CLICKHOUSE_CLIENT} -n --query "CREATE TABLE sample_table_2 (
     key UInt64
 )
 ENGINE ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/02221_system_zookeeper_unrestricted_like_2', '1')
diff --git a/tests/queries/0_stateless/02225_parallel_distributed_insert_select_view.sh b/tests/queries/0_stateless/02225_parallel_distributed_insert_select_view.sh
index 63111cc32e4..376a49fd820 100755
--- a/tests/queries/0_stateless/02225_parallel_distributed_insert_select_view.sh
+++ b/tests/queries/0_stateless/02225_parallel_distributed_insert_select_view.sh
@@ -6,7 +6,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 drop table if exists dst_02225;
 drop table if exists src_02225;
 create table dst_02225 (key Int) engine=Memory();
@@ -14,7 +14,7 @@ create table src_02225 (key Int) engine=Memory();
 insert into src_02225 values (1);
 "
 
-$CLICKHOUSE_CLIENT --param_database=$CLICKHOUSE_DATABASE -m -q "
+$CLICKHOUSE_CLIENT --param_database=$CLICKHOUSE_DATABASE -nm -q "
 truncate table dst_02225;
 insert into function remote('127.{1,2}', currentDatabase(), dst_02225, key)
 select * from remote('127.{1,2}', view(select * from {database:Identifier}.src_02225), key)
@@ -29,7 +29,7 @@ settings parallel_distributed_insert_select=2, max_distributed_depth=1;
 select * from dst_02225;
 "
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 drop table src_02225;
 drop table dst_02225;
 "
diff --git a/tests/queries/0_stateless/02226_analyzer_or_like_combine.reference b/tests/queries/0_stateless/02226_analyzer_or_like_combine.reference
index 61dfd1c6779..0ff24b39709 100644
--- a/tests/queries/0_stateless/02226_analyzer_or_like_combine.reference
+++ b/tests/queries/0_stateless/02226_analyzer_or_like_combine.reference
@@ -40,7 +40,7 @@ QUERY id: 0
                     LIST id: 3, nodes: 1
                       CONSTANT id: 4, constant_value: \'Привет, World\', constant_value_type: String
                 CONSTANT id: 16, constant_value: \'world%\', constant_value_type: String
-  SETTINGS optimize_or_like_chain=0 enable_analyzer=1
+  SETTINGS optimize_or_like_chain=0 allow_experimental_analyzer=1
 SELECT materialize(\'Привет, World\') AS s
 WHERE multiMatchAny(s, [\'^hell\', \'(?i)привет\', \'(?i)^world\']) OR false
 SETTINGS optimize_or_like_chain = 1
@@ -68,7 +68,7 @@ QUERY id: 0
                       CONSTANT id: 4, constant_value: \'Привет, World\', constant_value_type: String
                 CONSTANT id: 10, constant_value: Array_[\'^hell\', \'(?i)привет\', \'(?i)^world\'], constant_value_type: Array(String)
           CONSTANT id: 11, constant_value: UInt64_0, constant_value_type: UInt8
-  SETTINGS optimize_or_like_chain=1 enable_analyzer=1
+  SETTINGS optimize_or_like_chain=1 allow_experimental_analyzer=1
 SELECT
     materialize(\'Привет, World\') AS s1,
     materialize(\'Привет, World\') AS s2
diff --git a/tests/queries/0_stateless/02226_analyzer_or_like_combine.sql b/tests/queries/0_stateless/02226_analyzer_or_like_combine.sql
index 0c150249aeb..fbebfc6d281 100644
--- a/tests/queries/0_stateless/02226_analyzer_or_like_combine.sql
+++ b/tests/queries/0_stateless/02226_analyzer_or_like_combine.sql
@@ -1,9 +1,7 @@
-SET allow_hyperscan = 1, max_hyperscan_regexp_length = 0, max_hyperscan_regexp_total_length = 0;
-
 EXPLAIN SYNTAX SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s ILIKE 'world%') SETTINGS optimize_or_like_chain = 0;
-EXPLAIN QUERY TREE run_passes=1 SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s ILIKE 'world%') SETTINGS optimize_or_like_chain = 0, enable_analyzer = 1;
+EXPLAIN QUERY TREE run_passes=1 SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s ILIKE 'world%') SETTINGS optimize_or_like_chain = 0, allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s ILIKE 'world%') SETTINGS optimize_or_like_chain = 1;
-EXPLAIN QUERY TREE run_passes=1 SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s ILIKE 'world%') SETTINGS optimize_or_like_chain = 1, enable_analyzer = 1;
+EXPLAIN QUERY TREE run_passes=1 SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s ILIKE 'world%') SETTINGS optimize_or_like_chain = 1, allow_experimental_analyzer = 1;
 
 EXPLAIN SYNTAX SELECT materialize('Привет, World') AS s1, materialize('Привет, World') AS s2 WHERE (s1 LIKE 'hell%') OR (s2 ILIKE '%привет%') OR (s1 ILIKE 'world%') SETTINGS optimize_or_like_chain = 1;
 EXPLAIN SYNTAX SELECT materialize('Привет, World') AS s1, materialize('Привет, World') AS s2 WHERE (s1 LIKE 'hell%') OR (s2 ILIKE '%привет%') OR (s1 ILIKE 'world%') SETTINGS optimize_or_like_chain = 1, allow_hyperscan = 0;
@@ -13,18 +11,18 @@ EXPLAIN SYNTAX SELECT materialize('Привет, World') AS s1, materialize('П
 
 
 SELECT materialize('Привет, optimized World') AS s WHERE (s LIKE 'hell%') OR (s LIKE '%привет%') OR (s ILIKE '%world') SETTINGS optimize_or_like_chain = 1;
-SELECT materialize('Привет, optimized World') AS s WHERE (s LIKE 'hell%') OR (s LIKE '%привет%') OR (s ILIKE '%world') SETTINGS optimize_or_like_chain = 1, enable_analyzer = 1;
+SELECT materialize('Привет, optimized World') AS s WHERE (s LIKE 'hell%') OR (s LIKE '%привет%') OR (s ILIKE '%world') SETTINGS optimize_or_like_chain = 1, allow_experimental_analyzer = 1;
 
 SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s LIKE '%привет%') OR (s ILIKE '%world') SETTINGS optimize_or_like_chain = 0;
-SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s LIKE '%привет%') OR (s ILIKE '%world') SETTINGS optimize_or_like_chain = 0, enable_analyzer = 1;
+SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s LIKE '%привет%') OR (s ILIKE '%world') SETTINGS optimize_or_like_chain = 0, allow_experimental_analyzer = 1;
 
 SELECT materialize('Привет, optimized World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s LIKE 'world%') SETTINGS optimize_or_like_chain = 1;
-SELECT materialize('Привет, optimized World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s LIKE 'world%') SETTINGS optimize_or_like_chain = 1, enable_analyzer = 1;
+SELECT materialize('Привет, optimized World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s LIKE 'world%') SETTINGS optimize_or_like_chain = 1, allow_experimental_analyzer = 1;
 
 SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s LIKE 'world%') SETTINGS optimize_or_like_chain = 0;
-SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s LIKE 'world%') SETTINGS optimize_or_like_chain = 0, enable_analyzer = 1;
+SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s LIKE 'world%') SETTINGS optimize_or_like_chain = 0, allow_experimental_analyzer = 1;
 
-SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s ILIKE 'world%') SETTINGS optimize_or_like_chain = 1, enable_analyzer = 1;
+SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s ILIKE 'world%') SETTINGS optimize_or_like_chain = 1, allow_experimental_analyzer = 1;
 
 -- Aliases
 
diff --git a/tests/queries/0_stateless/02226_filesystem_cache_profile_events.sh b/tests/queries/0_stateless/02226_filesystem_cache_profile_events.sh
index 18ae2d7b4b3..d0e61541b15 100755
--- a/tests/queries/0_stateless/02226_filesystem_cache_profile_events.sh
+++ b/tests/queries/0_stateless/02226_filesystem_cache_profile_events.sh
@@ -10,7 +10,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 for STORAGE_POLICY in 's3_cache' 'local_cache' 'azure_cache'; do
     echo "Using storage policy: $STORAGE_POLICY"
 
-    $CLICKHOUSE_CLIENT --multiline  --query """
+    $CLICKHOUSE_CLIENT --multiquery --multiline  --query """
     SET max_memory_usage='20G';
     SET enable_filesystem_cache_on_write_operations = 0;
 
@@ -25,7 +25,7 @@ for STORAGE_POLICY in 's3_cache' 'local_cache' 'azure_cache'; do
 
     query_id=$($CLICKHOUSE_CLIENT --query "select queryID() from ($query) limit 1" 2>&1)
 
-    $CLICKHOUSE_CLIENT --multiline  --query """
+    $CLICKHOUSE_CLIENT --multiquery --multiline  --query """
     SYSTEM FLUSH LOGS;
     SELECT ProfileEvents['CachedReadBufferReadFromCacheHits'] > 0 as remote_fs_cache_hit,
            ProfileEvents['CachedReadBufferReadFromCacheMisses'] > 0 as remote_fs_cache_miss,
@@ -40,14 +40,14 @@ for STORAGE_POLICY in 's3_cache' 'local_cache' 'azure_cache'; do
     LIMIT 1;
     """
 
-    $CLICKHOUSE_CLIENT --multiline --query """
+    $CLICKHOUSE_CLIENT --multiquery --multiline --query """
     set remote_filesystem_read_method = 'read';
     set local_filesystem_read_method = 'pread';
     """
 
     query_id=$($CLICKHOUSE_CLIENT --query "select queryID() from ($query) limit 1" 2>&1)
 
-    $CLICKHOUSE_CLIENT --multiline  --query """
+    $CLICKHOUSE_CLIENT --multiquery --multiline  --query """
     SYSTEM FLUSH LOGS;
     SELECT ProfileEvents['CachedReadBufferReadFromCacheHits'] > 0 as remote_fs_cache_hit,
            ProfileEvents['CachedReadBufferReadFromCacheMisses'] > 0 as remote_fs_cache_miss,
@@ -63,13 +63,13 @@ for STORAGE_POLICY in 's3_cache' 'local_cache' 'azure_cache'; do
     """
 
 
-    $CLICKHOUSE_CLIENT --multiline --query """
+    $CLICKHOUSE_CLIENT --multiquery --multiline --query """
     set remote_filesystem_read_method='threadpool';
     """
 
     query_id=$($CLICKHOUSE_CLIENT --query "select queryID() from ($query) limit 1")
 
-    $CLICKHOUSE_CLIENT --multiline  --query """
+    $CLICKHOUSE_CLIENT --multiquery --multiline  --query """
     SYSTEM FLUSH LOGS;
     SELECT ProfileEvents['CachedReadBufferReadFromCacheHits'] > 0 as remote_fs_cache_hit,
            ProfileEvents['CachedReadBufferReadFromCacheMisses'] > 0 as remote_fs_cache_miss,
@@ -84,7 +84,7 @@ for STORAGE_POLICY in 's3_cache' 'local_cache' 'azure_cache'; do
     LIMIT 1;
     """
 
-    $CLICKHOUSE_CLIENT --multiline  --query """
+    $CLICKHOUSE_CLIENT --multiquery --multiline  --query """
     SELECT * FROM test_02226 WHERE value LIKE '%abc%' ORDER BY value LIMIT 10 FORMAT Null;
 
     SET enable_filesystem_cache_on_write_operations = 1;
diff --git a/tests/queries/0_stateless/02226_parallel_reading_from_replicas_benchmark.sh b/tests/queries/0_stateless/02226_parallel_reading_from_replicas_benchmark.sh
index 177b373641f..bc90f4b2c11 100755
--- a/tests/queries/0_stateless/02226_parallel_reading_from_replicas_benchmark.sh
+++ b/tests/queries/0_stateless/02226_parallel_reading_from_replicas_benchmark.sh
@@ -4,7 +4,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 drop table if exists data_02226;
 create table data_02226 (key Int) engine=MergeTree() order by key
 as select * from numbers(1);
@@ -24,7 +24,7 @@ opts=(
 $CLICKHOUSE_BENCHMARK --query "select * from remote('127.1', $CLICKHOUSE_DATABASE, data_02226)" "${opts[@]}" >& /dev/null
 ret=$?
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 drop table data_02226;
 "
 
diff --git a/tests/queries/0_stateless/02227_test_create_empty_sqlite_db.sh b/tests/queries/0_stateless/02227_test_create_empty_sqlite_db.sh
index a3fe5f19de0..344452767cc 100755
--- a/tests/queries/0_stateless/02227_test_create_empty_sqlite_db.sh
+++ b/tests/queries/0_stateless/02227_test_create_empty_sqlite_db.sh
@@ -17,7 +17,7 @@ export CURR_DATABASE="test_01889_sqllite_${CLICKHOUSE_DATABASE}"
 
 DB_PATH=${USER_FILES_PATH}/${CURR_DATABASE}_db1
 
-${CLICKHOUSE_CLIENT} --multiline --query="""
+${CLICKHOUSE_CLIENT} --multiquery --multiline --query="""
 DROP DATABASE IF EXISTS ${CURR_DATABASE};
 CREATE DATABASE ${CURR_DATABASE} ENGINE = SQLite('${DB_PATH}');
 SHOW TABLES FROM ${CURR_DATABASE};
@@ -25,6 +25,6 @@ SHOW TABLES FROM ${CURR_DATABASE};
 
 sqlite3 "${DB_PATH}" 'CREATE TABLE table1 (col1 text, col2 smallint);'
 
-${CLICKHOUSE_CLIENT} --multiline --query="""
+${CLICKHOUSE_CLIENT} --multiquery --multiline --query="""
 SHOW TABLES FROM ${CURR_DATABASE};
 """
diff --git a/tests/queries/0_stateless/02227_union_match_by_name.sql b/tests/queries/0_stateless/02227_union_match_by_name.sql
index 489c3d976ea..6a19add1d37 100644
--- a/tests/queries/0_stateless/02227_union_match_by_name.sql
+++ b/tests/queries/0_stateless/02227_union_match_by_name.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 -- { echoOn }
 
diff --git a/tests/queries/0_stateless/02228_unquoted_dates_in_csv_schema_inference.reference b/tests/queries/0_stateless/02228_unquoted_dates_in_csv_schema_inference.reference
index 56293ca0e5d..be82d744a3b 100644
--- a/tests/queries/0_stateless/02228_unquoted_dates_in_csv_schema_inference.reference
+++ b/tests/queries/0_stateless/02228_unquoted_dates_in_csv_schema_inference.reference
@@ -1 +1 @@
-c1	Nullable(DateTime)					
+c1	Nullable(DateTime64(9))					
diff --git a/tests/queries/0_stateless/02231_bloom_filter_sizing.reference b/tests/queries/0_stateless/02231_bloom_filter_sizing.reference
index aabadfc92fd..bdba311c092 100644
--- a/tests/queries/0_stateless/02231_bloom_filter_sizing.reference
+++ b/tests/queries/0_stateless/02231_bloom_filter_sizing.reference
@@ -1,6 +1,6 @@
 Bloom filter on sort key
-1000
+10000
 0
 Bloom filter on non-sort key
-1000
+10000
 0
diff --git a/tests/queries/0_stateless/02231_bloom_filter_sizing.sql b/tests/queries/0_stateless/02231_bloom_filter_sizing.sql
index ee896675d64..233e3111067 100644
--- a/tests/queries/0_stateless/02231_bloom_filter_sizing.sql
+++ b/tests/queries/0_stateless/02231_bloom_filter_sizing.sql
@@ -12,7 +12,7 @@ INSERT INTO bloom_filter_sizing_pk
 SELECT
 number % 100 as key, -- 100 unique keys
 number as value -- whatever
-FROM numbers(100_000);
+FROM numbers(1000 * 1000);
 
 --
 -- Merge everything into a single part
@@ -40,7 +40,7 @@ SELECT
 number % 100 as key1, -- 100 unique keys
 rand() % 100 as key2, -- 100 unique keys
 number as value -- whatever
-FROM numbers(100_000);
+FROM numbers(1000 * 1000);
 
 --
 -- Merge everything into a single part
diff --git a/tests/queries/0_stateless/02231_buffer_aggregate_states_leak.sql b/tests/queries/0_stateless/02231_buffer_aggregate_states_leak.sql
index 7cc267b7263..3d6b69fe161 100644
--- a/tests/queries/0_stateless/02231_buffer_aggregate_states_leak.sql
+++ b/tests/queries/0_stateless/02231_buffer_aggregate_states_leak.sql
@@ -1,4 +1,4 @@
--- Tags: long, no-tsan
+-- Tags: long
 
 drop table if exists buffer_02231;
 drop table if exists out_02231;
@@ -11,8 +11,8 @@ create table buffer_02231
 (
     key Int,
     v1 AggregateFunction(groupArray, String)
-) engine = Buffer(currentDatabase(), 'out_02231',
-    /* layers= */       1,
+) engine=Buffer(currentDatabase(), 'out_02231',
+    /* layers= */1,
     /* min/max time  */ 86400, 86400,
     /* min/max rows  */ 1e9, 1e9,
     /* min/max bytes */ 1e12, 1e12,
@@ -29,7 +29,7 @@ from in_02231
 group by key;
 
 set optimize_trivial_insert_select = 1;
-insert into in_02231 select * from numbers(5e6) settings max_memory_usage='400Mi', max_threads=1;
+insert into in_02231 select * from numbers(10e6) settings max_memory_usage='400Mi', max_threads=1;
 
 drop table buffer_02231;
 drop table out_02231;
diff --git a/tests/queries/0_stateless/02232_allow_only_replicated_engine.sh b/tests/queries/0_stateless/02232_allow_only_replicated_engine.sh
index e47a3033681..d1a3825d286 100755
--- a/tests/queries/0_stateless/02232_allow_only_replicated_engine.sh
+++ b/tests/queries/0_stateless/02232_allow_only_replicated_engine.sh
@@ -12,9 +12,9 @@ ${CLICKHOUSE_CLIENT} -q "GRANT CREATE TABLE ON ${CLICKHOUSE_DATABASE}_db.* TO us
 ${CLICKHOUSE_CLIENT} -q "GRANT TABLE ENGINE ON Memory, TABLE ENGINE ON MergeTree, TABLE ENGINE ON ReplicatedMergeTree TO user_${CLICKHOUSE_DATABASE}"
 ${CLICKHOUSE_CLIENT} -q "CREATE DATABASE ${CLICKHOUSE_DATABASE}_db engine = Replicated('/clickhouse/databases/${CLICKHOUSE_TEST_ZOOKEEPER_PREFIX}/${CLICKHOUSE_DATABASE}_db', '{shard}', '{replica}')"
 ${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_memory (x UInt32) engine = Memory;"
-${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_mt (x UInt32) engine = MergeTree order by x;" 2>&1 | grep -o "Only tables with a Replicated engine"
-${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_mt (x UInt32) engine = MergeTree order by x;"
-${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_rmt (x UInt32) engine = ReplicatedMergeTree order by x;"
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" -n --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_mt (x UInt32) engine = MergeTree order by x;" 2>&1 | grep -o "Only tables with a Replicated engine"
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none -n --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_mt (x UInt32) engine = MergeTree order by x;"
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" -n --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_rmt (x UInt32) engine = ReplicatedMergeTree order by x;"
 ${CLICKHOUSE_CLIENT} --query "DROP DATABASE ${CLICKHOUSE_DATABASE}_db"
 ${CLICKHOUSE_CLIENT} -q "DROP USER user_${CLICKHOUSE_DATABASE}"
 
diff --git a/tests/queries/0_stateless/02233_with_total_empty_chunk.sql b/tests/queries/0_stateless/02233_with_total_empty_chunk.sql
index c70b35df459..d59319ac75e 100644
--- a/tests/queries/0_stateless/02233_with_total_empty_chunk.sql
+++ b/tests/queries/0_stateless/02233_with_total_empty_chunk.sql
@@ -1,3 +1,3 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT (NULL, NULL, NULL, NULL, NULL, NULL, NULL) FROM numbers(0) GROUP BY number WITH TOTALS HAVING sum(number) <= arrayJoin([]) -- { serverError ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER };
diff --git a/tests/queries/0_stateless/02234_cast_to_ip_address.reference b/tests/queries/0_stateless/02234_cast_to_ip_address.reference
index b9f0a49ec4d..fa9c6bd0f94 100644
--- a/tests/queries/0_stateless/02234_cast_to_ip_address.reference
+++ b/tests/queries/0_stateless/02234_cast_to_ip_address.reference
@@ -37,7 +37,7 @@ IPv6 functions
 ::ffff:127.0.0.1
 ::
 \N
-20000000
+100000000
 --
 ::ffff:127.0.0.1
 --
diff --git a/tests/queries/0_stateless/02234_cast_to_ip_address.sql b/tests/queries/0_stateless/02234_cast_to_ip_address.sql
index c851cfde927..28f1afff57f 100644
--- a/tests/queries/0_stateless/02234_cast_to_ip_address.sql
+++ b/tests/queries/0_stateless/02234_cast_to_ip_address.sql
@@ -67,11 +67,11 @@ SELECT toIPv6('::.1.2.3'); --{serverError CANNOT_PARSE_IPV6}
 SELECT toIPv6OrDefault('::.1.2.3');
 SELECT toIPv6OrNull('::.1.2.3');
 
-SELECT count() FROM numbers_mt(20000000) WHERE NOT ignore(toIPv6OrZero(randomString(8)));
+SELECT count() FROM numbers_mt(100000000) WHERE NOT ignore(toIPv6OrZero(randomString(8)));
 
 SELECT '--';
 
-SELECT cast('test' , 'IPv6'); -- { serverError CANNOT_PARSE_IPV6 }
+SELECT cast('test' , 'IPv6'); --{serverError CANNOT_PARSE_IPV6}
 SELECT cast('::ffff:127.0.0.1', 'IPv6');
 
 SELECT '--';
diff --git a/tests/queries/0_stateless/02234_clickhouse_local_test_mode.reference b/tests/queries/0_stateless/02234_clickhouse_local_test_mode.reference
index 2c94e483710..d3605d15a3d 100644
--- a/tests/queries/0_stateless/02234_clickhouse_local_test_mode.reference
+++ b/tests/queries/0_stateless/02234_clickhouse_local_test_mode.reference
@@ -1,2 +1,2 @@
 OK
-OK
+Missing columns
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 d387fda746c..eb4a91bd850 100755
--- a/tests/queries/0_stateless/02234_clickhouse_local_test_mode.sh
+++ b/tests/queries/0_stateless/02234_clickhouse_local_test_mode.sh
@@ -4,5 +4,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_LOCAL --query="SELECT n SETTINGS enable_analyzer = 1" 2>&1 | grep -q "Code: 47. DB::Exception:" && echo 'OK' || echo 'FAIL'
-$CLICKHOUSE_LOCAL --query="SELECT n SETTINGS enable_analyzer = 0" 2>&1 | grep -q "Code: 47. DB::Exception:" && echo 'OK' || echo 'FAIL'
+
+$CLICKHOUSE_LOCAL --query="SELECT n SETTINGS allow_experimental_analyzer = 1" 2>&1 | grep -q "Code: 47. DB::Exception:" && echo 'OK' || echo 'FAIL' ||:
+$CLICKHOUSE_LOCAL --query="SELECT n SETTINGS allow_experimental_analyzer = 0 -- { serverError 47 }" 2>&1 | grep -o 'Missing columns'
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 aa5db33417c..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} --allow_suspicious_low_cardinality_types=1 --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;
@@ -28,14 +28,14 @@ ORDER BY tuple();
 
 INSERT INTO t_01411_num (num) SELECT number % 1000 FROM numbers(100000);
 
-create table lc_dict_reading (val UInt64, str LowCardinality(String), pat String) engine = MergeTree order by val;
+create table lc_dict_reading (val UInt64, str StringWithDictionary, pat String) engine = MergeTree order by val;
 insert into lc_dict_reading select number, if(number < 8192 * 4, number % 100, number) as s, s from system.numbers limit 100000;
 """
 
 function go()
 {
 
-${CLICKHOUSE_CLIENT} --multiline --query="""
+${CLICKHOUSE_CLIENT} --multiquery --multiline --query="""
 
 select sum(toUInt64(str)), sum(toUInt64(pat)) from lc_dict_reading where val < 8129 or val > 8192 * 4;
 
@@ -67,7 +67,7 @@ for _ in `seq 1 32`; do go | grep -q "Exception" && echo 'FAIL' || echo 'OK' ||:
 
 wait
 
-${CLICKHOUSE_CLIENT} --multiline --query="""
+${CLICKHOUSE_CLIENT} --multiquery --multiline --query="""
 DROP TABLE IF EXISTS t_01411;
 DROP TABLE IF EXISTS t_01411_num;
 """
diff --git a/tests/queries/0_stateless/02240_protobuflist_format_persons.sh b/tests/queries/0_stateless/02240_protobuflist_format_persons.sh
index e5e717d00a8..637e01b9e63 100755
--- a/tests/queries/0_stateless/02240_protobuflist_format_persons.sh
+++ b/tests/queries/0_stateless/02240_protobuflist_format_persons.sh
@@ -15,7 +15,7 @@ SCHEMADIR=$CURDIR/format_schemas
 set -eo pipefail
 
 # Run the client.
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS persons_02240;
 DROP TABLE IF EXISTS roundtrip_persons_02240;
 DROP TABLE IF EXISTS alt_persons_02240;
@@ -118,7 +118,7 @@ $CLICKHOUSE_CLIENT --query "INSERT INTO syntax2_persons_02240 SETTINGS format_sc
 $CLICKHOUSE_CLIENT --query "SELECT * FROM syntax2_persons_02240 ORDER BY name"
 rm "$BINARY_FILE_PATH"
 
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE persons_02240;
 DROP TABLE roundtrip_persons_02240;
 DROP TABLE alt_persons_02240;
diff --git a/tests/queries/0_stateless/02242_subcolumns_sizes.sql b/tests/queries/0_stateless/02242_subcolumns_sizes.sql
index 1232e5fc1c2..8c3d8e69238 100644
--- a/tests/queries/0_stateless/02242_subcolumns_sizes.sql
+++ b/tests/queries/0_stateless/02242_subcolumns_sizes.sql
@@ -4,12 +4,11 @@ DROP TABLE IF EXISTS t_subcolumns_sizes;
 
 SET allow_experimental_object_type = 1;
 
-CREATE TABLE t_subcolumns_sizes (id UInt64, arr Array(UInt64), n Nullable(String), d Object('json'))
+CREATE TABLE t_subcolumns_sizes (id UInt64, arr Array(UInt64), n Nullable(String), d JSON)
 ENGINE = MergeTree ORDER BY id
 SETTINGS min_bytes_for_wide_part = 0;
 
 INSERT INTO t_subcolumns_sizes FORMAT JSONEachRow {"id": 1, "arr": [1, 2, 3], "n": null, "d": {"k1": "v1", "k2": [{"k3": 1, "k4": "v2"}, {"k3": 3}]}}
-
 INSERT INTO t_subcolumns_sizes FORMAT JSONEachRow {"id": 2, "arr": [0], "n": "foo", "d": {"k1": "v3", "k2": [{"k4": "v4"}, {"k3": "v5", "k5": 5}]}}
 
 OPTIMIZE TABLE t_subcolumns_sizes FINAL;
diff --git a/tests/queries/0_stateless/02245_s3_virtual_columns.reference b/tests/queries/0_stateless/02245_s3_virtual_columns.reference
index 3822f6ffa0f..09383c51888 100644
--- a/tests/queries/0_stateless/02245_s3_virtual_columns.reference
+++ b/tests/queries/0_stateless/02245_s3_virtual_columns.reference
@@ -11,5 +11,5 @@ create table test_02245_2 (a UInt64, _path Int32) engine = S3(s3_conn, filename=
 insert into test_02245_2 select 1, 2 settings s3_truncate_on_insert=1;
 select * from test_02245_2;
 1	2
-select _path, isNotNull(_etag) from test_02245_2;
-2	1
+select _path from test_02245_2;
+2
diff --git a/tests/queries/0_stateless/02245_s3_virtual_columns.sql b/tests/queries/0_stateless/02245_s3_virtual_columns.sql
index a66b212e5c7..e86344d2094 100644
--- a/tests/queries/0_stateless/02245_s3_virtual_columns.sql
+++ b/tests/queries/0_stateless/02245_s3_virtual_columns.sql
@@ -12,4 +12,4 @@ drop table if exists test_02245_2;
 create table test_02245_2 (a UInt64, _path Int32) engine = S3(s3_conn, filename='test_02245_2', format=Parquet);
 insert into test_02245_2 select 1, 2 settings s3_truncate_on_insert=1;
 select * from test_02245_2;
-select _path, isNotNull(_etag) from test_02245_2;
+select _path from test_02245_2;
diff --git a/tests/queries/0_stateless/02246_clickhouse_local_drop_database.sh b/tests/queries/0_stateless/02246_clickhouse_local_drop_database.sh
index b653c9f3e94..7e25e099626 100755
--- a/tests/queries/0_stateless/02246_clickhouse_local_drop_database.sh
+++ b/tests/queries/0_stateless/02246_clickhouse_local_drop_database.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 dir=${CLICKHOUSE_TEST_UNIQUE_NAME}
 [[ -d $dir ]] && rm -r $dir
 mkdir $dir
-$CLICKHOUSE_LOCAL --multiline --path $dir -q """
+$CLICKHOUSE_LOCAL --multiline --multiquery --path $dir -q """
 DROP DATABASE IF EXISTS test;
 CREATE DATABASE IF NOT EXISTS test;
 USE test;
@@ -15,7 +15,7 @@ CREATE TABLE test (id Int32) ENGINE=MergeTree() ORDER BY id;
 DROP DATABASE test;
 """
 
-$CLICKHOUSE_LOCAL --multiline -q """
+$CLICKHOUSE_LOCAL --multiline --multiquery -q """
 DROP DATABASE IF EXISTS test;
 CREATE DATABASE IF NOT EXISTS test;
 USE test;
diff --git a/tests/queries/0_stateless/02246_flatten_tuple.sql b/tests/queries/0_stateless/02246_flatten_tuple.sql
index d09e740ee0c..139f7a621ef 100644
--- a/tests/queries/0_stateless/02246_flatten_tuple.sql
+++ b/tests/queries/0_stateless/02246_flatten_tuple.sql
@@ -12,7 +12,7 @@ INSERT INTO t_flatten_tuple VALUES (([(1, 'a'), (2, 'b')], 3, ('c', 4)));
 SELECT flattenTuple(t) AS ft, toTypeName(ft) FROM t_flatten_tuple;
 
 SET allow_experimental_object_type = 1;
-CREATE TABLE t_flatten_object(data Object('json')) ENGINE = Memory;
+CREATE TABLE t_flatten_object(data JSON) ENGINE = Memory;
 
 INSERT INTO t_flatten_object VALUES ('{"id": 1, "obj": {"k1": 1, "k2": {"k3": 2, "k4": [{"k5": 3}, {"k5": 4}]}}, "s": "foo"}');
 INSERT INTO t_flatten_object VALUES ('{"id": 2, "obj": {"k2": {"k3": "str", "k4": [{"k6": 55}]}, "some": 42}, "s": "bar"}');
diff --git a/tests/queries/0_stateless/02247_written_bytes_quota.sh b/tests/queries/0_stateless/02247_written_bytes_quota.sh
index ce32c76ab18..2430184c4df 100755
--- a/tests/queries/0_stateless/02247_written_bytes_quota.sh
+++ b/tests/queries/0_stateless/02247_written_bytes_quota.sh
@@ -1,51 +1,48 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-ROLE="r_${CLICKHOUSE_TEST_UNIQUE_NAME}"
-USER="u_${CLICKHOUSE_TEST_UNIQUE_NAME}"
-QUOTA="q_${CLICKHOUSE_TEST_UNIQUE_NAME}"
-
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS written_bytes_02247"
-${CLICKHOUSE_CLIENT} -q "DROP ROLE IF EXISTS ${ROLE}"
-${CLICKHOUSE_CLIENT} -q "DROP USER IF EXISTS ${USER}"
-${CLICKHOUSE_CLIENT} -q "DROP QUOTA IF EXISTS ${QUOTA}"
+${CLICKHOUSE_CLIENT} -q "DROP ROLE IF EXISTS r02247"
+${CLICKHOUSE_CLIENT} -q "DROP USER IF EXISTS u02247"
+${CLICKHOUSE_CLIENT} -q "DROP QUOTA IF EXISTS q02247"
 
 ${CLICKHOUSE_CLIENT} -q "CREATE TABLE written_bytes_02247(s String) ENGINE = Memory"
 
-${CLICKHOUSE_CLIENT} -q "CREATE ROLE ${ROLE}"
-${CLICKHOUSE_CLIENT} -q "CREATE USER ${USER}"
-${CLICKHOUSE_CLIENT} -q "GRANT ALL ON *.* TO ${ROLE}"
-${CLICKHOUSE_CLIENT} -q "GRANT ${ROLE} to ${USER}"
-${CLICKHOUSE_CLIENT} -q "CREATE QUOTA ${QUOTA} FOR INTERVAL 100 YEAR MAX WRITTEN BYTES = 30 TO ${ROLE}"
+${CLICKHOUSE_CLIENT} -q "CREATE ROLE r02247"
+${CLICKHOUSE_CLIENT} -q "CREATE USER u02247"
+${CLICKHOUSE_CLIENT} -q "GRANT ALL ON *.* TO r02247"
+${CLICKHOUSE_CLIENT} -q "GRANT r02247 to u02247"
+${CLICKHOUSE_CLIENT} -q "CREATE QUOTA q02247 FOR INTERVAL 100 YEAR MAX WRITTEN BYTES = 30 TO r02247"
 
 # The value 'qwqw' means about 13 bytes are to be written, so the current quota (30 bytes) gives the ability to write 'qwqw' 2 times.
-${CLICKHOUSE_CLIENT} --user ${USER} --async_insert 1 -q "INSERT INTO written_bytes_02247 VALUES ('qwqw')"
-#${CLICKHOUSE_CLIENT} --user ${USER} -q "SHOW CURRENT QUOTA"
-${CLICKHOUSE_CLIENT} --user ${USER} --async_insert 0 -q "INSERT INTO written_bytes_02247 VALUES ('qwqw')"
-#${CLICKHOUSE_CLIENT} --user ${USER} -q "SHOW CURRENT QUOTA"
-${CLICKHOUSE_CLIENT} --user ${USER} --async_insert 1 -q "INSERT INTO written_bytes_02247 VALUES ('qwqw')" 2>&1 | grep -m1 -o QUOTA_EXCEEDED
-${CLICKHOUSE_CLIENT} --user ${USER} --async_insert 0 -q "INSERT INTO written_bytes_02247 VALUES ('qwqw')" 2>&1 | grep -m1 -o QUOTA_EXCEEDED
+${CLICKHOUSE_CLIENT} --user u02247 --async_insert 1 -q "INSERT INTO written_bytes_02247 VALUES ('qwqw')"
+#${CLICKHOUSE_CLIENT} --user u02247 -q "SHOW CURRENT QUOTA"
+${CLICKHOUSE_CLIENT} --user u02247 --async_insert 0 -q "INSERT INTO written_bytes_02247 VALUES ('qwqw')"
+#${CLICKHOUSE_CLIENT} --user u02247 -q "SHOW CURRENT QUOTA"
+${CLICKHOUSE_CLIENT} --user u02247 --async_insert 1 -q "INSERT INTO written_bytes_02247 VALUES ('qwqw')" 2>&1 | grep -m1 -o QUOTA_EXCEEDED
+${CLICKHOUSE_CLIENT} --user u02247 --async_insert 0 -q "INSERT INTO written_bytes_02247 VALUES ('qwqw')" 2>&1 | grep -m1 -o QUOTA_EXCEEDED
 
-${CLICKHOUSE_CLIENT} -q "SELECT written_bytes > 10 FROM system.quotas_usage WHERE quota_name = '${QUOTA}'"
+${CLICKHOUSE_CLIENT} -q "SELECT written_bytes > 10 FROM system.quotas_usage WHERE quota_name = 'q02247'"
 ${CLICKHOUSE_CLIENT} -q "SELECT count() FROM written_bytes_02247"
 
-${CLICKHOUSE_CLIENT} -q "DROP QUOTA ${QUOTA}"
-${CLICKHOUSE_CLIENT} -q "CREATE QUOTA ${QUOTA} FOR INTERVAL 100 YEAR MAX WRITTEN BYTES = 1000 TO ${ROLE}"
+${CLICKHOUSE_CLIENT} -q "DROP QUOTA q02247"
+${CLICKHOUSE_CLIENT} -q "CREATE QUOTA q02247 FOR INTERVAL 100 YEAR MAX WRITTEN BYTES = 1000 TO r02247"
 ${CLICKHOUSE_CLIENT} -q "TRUNCATE TABLE written_bytes_02247"
 
 # Numbers from 0 to 50 means about 540 bytes are to be written, so the current quota (1000 bytes) is enough to do so.
-${CLICKHOUSE_CLIENT} --user ${USER} -q "INSERT INTO written_bytes_02247 SELECT toString(number) FROM numbers(50)"
+${CLICKHOUSE_CLIENT} --user u02247 -q "INSERT INTO written_bytes_02247 SELECT toString(number) FROM numbers(50)"
 
 # Numbers from 0 to 100 means about 1090 bytes are to be written, so the current quota (1000 bytes total - 540 bytes already used) is NOT enough to do so.
-${CLICKHOUSE_CLIENT} --user ${USER} -q "INSERT INTO written_bytes_02247 SELECT toString(number) FROM numbers(100)" 2>&1 | grep -m1 -o QUOTA_EXCEEDED
+${CLICKHOUSE_CLIENT} --user u02247 -q "INSERT INTO written_bytes_02247 SELECT toString(number) FROM numbers(100)" 2>&1 | grep -m1 -o QUOTA_EXCEEDED
 
-${CLICKHOUSE_CLIENT} -q "SELECT written_bytes > 100 FROM system.quotas_usage WHERE quota_name = '${QUOTA}'"
+${CLICKHOUSE_CLIENT} -q "SELECT written_bytes > 100 FROM system.quotas_usage WHERE quota_name = 'q02247'"
 ${CLICKHOUSE_CLIENT} -q "SELECT count() FROM written_bytes_02247"
 
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS written_bytes_02247"
-${CLICKHOUSE_CLIENT} -q "DROP ROLE IF EXISTS ${ROLE}"
-${CLICKHOUSE_CLIENT} -q "DROP USER IF EXISTS ${USER}"
-${CLICKHOUSE_CLIENT} -q "DROP QUOTA IF EXISTS ${QUOTA}"
+${CLICKHOUSE_CLIENT} -q "DROP ROLE IF EXISTS r02247"
+${CLICKHOUSE_CLIENT} -q "DROP USER IF EXISTS u02247"
+${CLICKHOUSE_CLIENT} -q "DROP QUOTA IF EXISTS q02247"
diff --git a/tests/queries/0_stateless/02249_insert_select_from_input_schema_inference.sql b/tests/queries/0_stateless/02249_insert_select_from_input_schema_inference.sql
index a0c6701faae..eb83309f117 100644
--- a/tests/queries/0_stateless/02249_insert_select_from_input_schema_inference.sql
+++ b/tests/queries/0_stateless/02249_insert_select_from_input_schema_inference.sql
@@ -3,6 +3,5 @@ set use_structure_from_insertion_table_in_table_functions = 1;
 drop table if exists test_02249;
 create table test_02249 (x UInt32, y String) engine=Memory();
 insert into test_02249 select * from input() format JSONEachRow {"x" : 1, "y" : "string1"}, {"y" : "string2", "x" : 2};
-
 select * from test_02249;
 drop table test_02249;
diff --git a/tests/queries/0_stateless/02250_ON_CLUSTER_grant.sh b/tests/queries/0_stateless/02250_ON_CLUSTER_grant.sh
index 09f9c0c8a98..66417e9694a 100755
--- a/tests/queries/0_stateless/02250_ON_CLUSTER_grant.sh
+++ b/tests/queries/0_stateless/02250_ON_CLUSTER_grant.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 function cleanup()
 {
-    $CLICKHOUSE_CLIENT -mq "
+    $CLICKHOUSE_CLIENT -nmq "
         DROP USER IF EXISTS with_on_cluster_$CLICKHOUSE_TEST_UNIQUE_NAME;
         DROP USER IF EXISTS without_on_cluster_$CLICKHOUSE_TEST_UNIQUE_NAME;
         DROP DATABASE IF EXISTS db_with_on_cluster_$CLICKHOUSE_TEST_UNIQUE_NAME;
@@ -15,7 +15,7 @@ function cleanup()
 cleanup
 trap cleanup EXIT
 
-$CLICKHOUSE_CLIENT -mq "
+$CLICKHOUSE_CLIENT -nmq "
     CREATE USER with_on_cluster_$CLICKHOUSE_TEST_UNIQUE_NAME;
     CREATE USER without_on_cluster_$CLICKHOUSE_TEST_UNIQUE_NAME;
 
diff --git a/tests/queries/0_stateless/02262_column_ttl.sh b/tests/queries/0_stateless/02262_column_ttl.sh
index c620d3b6d9c..b5e29c9b2a1 100755
--- a/tests/queries/0_stateless/02262_column_ttl.sh
+++ b/tests/queries/0_stateless/02262_column_ttl.sh
@@ -14,7 +14,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # note, that this should be written in .sh since we need $CLICKHOUSE_DATABASE
 # not 'default' to catch text_log
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     drop table if exists ttl_02262;
     drop table if exists this_text_log;
 
@@ -31,7 +31,7 @@ $CLICKHOUSE_CLIENT -m -q "
 
 ttl_02262_uuid=$($CLICKHOUSE_CLIENT -q "select uuid from system.tables where database = '$CLICKHOUSE_DATABASE' and name = 'ttl_02262'")
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     -- OPTIMIZE TABLE x FINAL will be done in background
     -- attach to it's log, via table UUID in query_id (see merger/mutator code).
     create materialized view this_text_log engine=Memory() as
diff --git a/tests/queries/0_stateless/02267_join_dup_columns_issue36199.sql b/tests/queries/0_stateless/02267_join_dup_columns_issue36199.sql
index ecb2198237f..fbcc374ba10 100644
--- a/tests/queries/0_stateless/02267_join_dup_columns_issue36199.sql
+++ b/tests/queries/0_stateless/02267_join_dup_columns_issue36199.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 
 SET join_algorithm = 'hash';
 
@@ -22,7 +22,7 @@ SELECT * FROM ( SELECT count('a'), count('b'), count('c'), 2 AS x ) as t1 RIGHT
 SELECT 'y', * FROM (SELECT count('y'), count('y'), 2 AS x) AS t1 RIGHT JOIN (SELECT count('x'), count('y'), 3 AS x) AS t2 ON t1.x = t2.x;
 SELECT * FROM (SELECT arrayJoin([NULL]), 9223372036854775806, arrayJoin([NULL]), NULL AS x) AS t1 RIGHT JOIN (SELECT arrayJoin([arrayJoin([10000000000.])]), NULL AS x) AS t2 ON t1.x = t2.x;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET join_algorithm = 'hash';
 
 SELECT * FROM ( SELECT 2 AS x ) AS t1 RIGHT JOIN ( SELECT count('x'), count('y'), 2 AS x ) AS t2 ON t1.x = t2.x;
diff --git a/tests/queries/0_stateless/02267_jsonlines_ndjson_format.sql b/tests/queries/0_stateless/02267_jsonlines_ndjson_format.sql
index 5dfb17da98c..5e32758b328 100644
--- a/tests/queries/0_stateless/02267_jsonlines_ndjson_format.sql
+++ b/tests/queries/0_stateless/02267_jsonlines_ndjson_format.sql
@@ -6,7 +6,6 @@ DROP TABLE IF EXISTS 02267_t;
 CREATE TABLE 02267_t (n1 UInt32, n2 UInt32) ENGINE = Memory;
 
 INSERT INTO 02267_t FORMAT JSONLines {"n1": 1, "n2": 2} {"n1": 3, "n2": 4} {"n1": 5, "n2": 6};
-
 INSERT INTO 02267_t FORMAT NDJSON {"n1": 1, "n2": 2} {"n1": 3, "n2": 4} {"n1": 5, "n2": 6};
 
 SELECT * FROM 02267_t ORDER BY n1, n2 FORMAT JSONLines;
diff --git a/tests/queries/0_stateless/02271_fix_column_matcher_and_column_transformer.sql b/tests/queries/0_stateless/02271_fix_column_matcher_and_column_transformer.sql
index ab89d98c608..f8faa3e653b 100644
--- a/tests/queries/0_stateless/02271_fix_column_matcher_and_column_transformer.sql
+++ b/tests/queries/0_stateless/02271_fix_column_matcher_and_column_transformer.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS github_events;
 
diff --git a/tests/queries/0_stateless/02286_drop_filesystem_cache.sh b/tests/queries/0_stateless/02286_drop_filesystem_cache.sh
index dab777fcc31..32c9e9cb060 100755
--- a/tests/queries/0_stateless/02286_drop_filesystem_cache.sh
+++ b/tests/queries/0_stateless/02286_drop_filesystem_cache.sh
@@ -31,7 +31,7 @@ for STORAGE_POLICY in 's3_cache' 'local_cache' 'azure_cache'; do
     $CLICKHOUSE_CLIENT --query "SELECT * FROM test_02286 FORMAT Null"
     $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
 
-    $CLICKHOUSE_CLIENT --multiline --query "SYSTEM DROP FILESYSTEM CACHE 'ff'; --{serverError 36}"
+    $CLICKHOUSE_CLIENT --multiline --multiquery --query "SYSTEM DROP FILESYSTEM CACHE 'ff'; --{serverError 36}"
 
     $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache"
 
diff --git a/tests/queries/0_stateless/02286_parallel_final.sh b/tests/queries/0_stateless/02286_parallel_final.sh
index 47dfad42e11..0ac510208f3 100755
--- a/tests/queries/0_stateless/02286_parallel_final.sh
+++ b/tests/queries/0_stateless/02286_parallel_final.sh
@@ -9,7 +9,7 @@ echo "Test intersecting ranges"
 
 test_random_values() {
   layers=$1
-  $CLICKHOUSE_CLIENT -q "
+  $CLICKHOUSE_CLIENT -n -q "
     drop table if exists tbl_8parts_${layers}granules_rnd;
     create table tbl_8parts_${layers}granules_rnd (key1 UInt32, sign Int8) engine = CollapsingMergeTree(sign) order by (key1) partition by (key1 % 8);
     insert into tbl_8parts_${layers}granules_rnd select number, 1 from numbers_mt($((layers * 8 * 8192)));
@@ -29,7 +29,7 @@ echo "Test non intersecting ranges"
 
 test_sequential_values() {
   layers=$1
-  $CLICKHOUSE_CLIENT -q "
+  $CLICKHOUSE_CLIENT -n -q "
     drop table if exists tbl_8parts_${layers}granules_seq;
     create table tbl_8parts_${layers}granules_seq (key1 UInt32, sign Int8) engine = CollapsingMergeTree(sign) order by (key1) partition by (key1 / $((layers * 8192)))::UInt64;
     insert into tbl_8parts_${layers}granules_seq select number, 1 from numbers_mt($((layers * 8 * 8192)));
diff --git a/tests/queries/0_stateless/02286_tuple_numeric_identifier.reference b/tests/queries/0_stateless/02286_tuple_numeric_identifier.reference
index 916cdaf83cd..21348493d1d 100644
--- a/tests/queries/0_stateless/02286_tuple_numeric_identifier.reference
+++ b/tests/queries/0_stateless/02286_tuple_numeric_identifier.reference
@@ -1,4 +1,4 @@
-CREATE TABLE default.t_tuple_numeric\n(\n    `t` Tuple(\n        `1` Tuple(\n            `2` Int32,\n            `3` Int32),\n        `4` Int32)\n)\nENGINE = Memory
+CREATE TABLE default.t_tuple_numeric\n(\n    `t` Tuple(`1` Tuple(`2` Int32, `3` Int32), `4` Int32)\n)\nENGINE = Memory
 {"t":{"1":{"2":2,"3":3},"4":4}}
 2	3	4
 2	3	4
diff --git a/tests/queries/0_stateless/02286_tuple_numeric_identifier.sql b/tests/queries/0_stateless/02286_tuple_numeric_identifier.sql
index 8c26b93aedd..151ff275f7b 100644
--- a/tests/queries/0_stateless/02286_tuple_numeric_identifier.sql
+++ b/tests/queries/0_stateless/02286_tuple_numeric_identifier.sql
@@ -28,7 +28,7 @@ SELECT `t`.`1`.`1`, `t`.`1`.`2`, `t`.`2` FROM t_tuple_numeric;
 DROP TABLE t_tuple_numeric;
 
 SET allow_experimental_object_type = 1;
-CREATE TABLE t_tuple_numeric (t Object('json')) ENGINE = Memory;
+CREATE TABLE t_tuple_numeric (t JSON) ENGINE = Memory;
 INSERT INTO t_tuple_numeric FORMAT JSONEachRow {"t":{"1":{"2":2,"3":3},"4":4}}
 
 SELECT toTypeName(t) FROM t_tuple_numeric LIMIT 1;
diff --git a/tests/queries/0_stateless/02293_http_header_full_summary_without_progress.sh b/tests/queries/0_stateless/02293_http_header_full_summary_without_progress.sh
index 0d8a568fef0..a08928a773c 100755
--- a/tests/queries/0_stateless/02293_http_header_full_summary_without_progress.sh
+++ b/tests/queries/0_stateless/02293_http_header_full_summary_without_progress.sh
@@ -6,17 +6,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-# Sanity check to ensure that the server is up and running
-for _ in {1..10}; do
-    echo 'SELECT 1' | ${CLICKHOUSE_CURL_COMMAND} -s "${CLICKHOUSE_URL}" --data-binary @- > /dev/null
-    if [ $? -eq 0 ]; then
-        break
-    fi
-    sleep 1
-done
-
 CURL_OUTPUT=$(echo 'SELECT 1 + sleepEachRow(0.00002) FROM numbers(100000)' | \
-  ${CLICKHOUSE_CURL_COMMAND} --max-time 3 -vsS "${CLICKHOUSE_URL}&wait_end_of_query=1&send_progress_in_http_headers=0&max_execution_time=1" --data-binary @- 2>&1)
+  ${CLICKHOUSE_CURL_COMMAND} -vsS "${CLICKHOUSE_URL}&wait_end_of_query=1&send_progress_in_http_headers=0&max_execution_time=1" --data-binary @- 2>&1)
 
 READ_ROWS=$(echo "${CURL_OUTPUT}" | \
   grep 'X-ClickHouse-Summary' | \
@@ -29,7 +20,6 @@ then
   echo "Read rows in summary is not zero"
 else
   echo "Read rows in summary is zero!"
-  echo "${CURL_OUTPUT}"
 fi
 
 # Check that the response code is correct too
diff --git a/tests/queries/0_stateless/02293_ttest_large_samples.sql b/tests/queries/0_stateless/02293_ttest_large_samples.sql
index b4687541360..14baa3fddfe 100644
--- a/tests/queries/0_stateless/02293_ttest_large_samples.sql
+++ b/tests/queries/0_stateless/02293_ttest_large_samples.sql
@@ -1,5 +1,3 @@
--- Tags: long
-
 SELECT roundBankers(result.1, 5), roundBankers(result.2, 5) FROM (
 SELECT
      studentTTest(sample, variant) as result
@@ -17,8 +15,6 @@ SELECT
 FROM system.numbers limit 500000));
 
 
-SET max_rows_to_read = 0;
-
 SELECT roundBankers(result.1, 5), roundBankers(result.2, 5 ) FROM (
 SELECT
      studentTTest(sample, variant) as result
diff --git a/tests/queries/0_stateless/02294_floating_point_second_in_settings.sh b/tests/queries/0_stateless/02294_floating_point_second_in_settings.sh
index 27dbd3e3de6..7a18b8fea29 100755
--- a/tests/queries/0_stateless/02294_floating_point_second_in_settings.sh
+++ b/tests/queries/0_stateless/02294_floating_point_second_in_settings.sh
@@ -23,16 +23,16 @@ function check_output() {
 
 # TCP CLIENT
 echo "TCP CLIENT"
-OUTPUT=$($CLICKHOUSE_CLIENT --max_rows_to_read 0 --max_execution_time $MAX_TIMEOUT -q "SELECT count() FROM system.numbers" 2>&1 || true)
+OUTPUT=$($CLICKHOUSE_CLIENT --max_execution_time $MAX_TIMEOUT -q "SELECT count() FROM system.numbers" 2>&1 || true)
 check_output "${OUTPUT}"
 
 echo "TCP CLIENT WITH SETTINGS IN QUERY"
-OUTPUT=$($CLICKHOUSE_CLIENT --max_rows_to_read 0 -q "SELECT count() FROM system.numbers SETTINGS max_execution_time=$MAX_TIMEOUT" 2>&1 || true)
+OUTPUT=$($CLICKHOUSE_CLIENT -q "SELECT count() FROM system.numbers SETTINGS max_execution_time=$MAX_TIMEOUT" 2>&1 || true)
 check_output "${OUTPUT}"
 
 # HTTP CLIENT
 echo "HTTP CLIENT"
-OUTPUT=$(${CLICKHOUSE_CURL_COMMAND} -q -sS "$CLICKHOUSE_URL&max_execution_time=${MAX_TIMEOUT}&max_rows_to_read=0" -d \
+OUTPUT=$(${CLICKHOUSE_CURL_COMMAND} -q -sS "$CLICKHOUSE_URL&max_execution_time=$MAX_TIMEOUT" -d \
     "SELECT count() FROM system.numbers" || true)
 check_output "${OUTPUT}"
 
diff --git a/tests/queries/0_stateless/02303_query_kind.reference b/tests/queries/0_stateless/02303_query_kind.reference
index c26242098e3..9f1c026f889 100644
--- a/tests/queries/0_stateless/02303_query_kind.reference
+++ b/tests/queries/0_stateless/02303_query_kind.reference
@@ -1,4 +1,4 @@
-clickhouse-client --enable_analyzer=1 --query_kind secondary_query -q explain plan header=1 select toString(dummy) as dummy from system.one group by dummy
+clickhouse-client --allow_experimental_analyzer=1 --query_kind secondary_query -q explain plan header=1 select toString(dummy) as dummy from system.one group by dummy
 Expression ((Project names + Projection))
 Header: dummy String
   Aggregating
@@ -7,7 +7,7 @@ Header: dummy String
     Header: toString(__table1.dummy) String
       ReadFromStorage (SystemOne)
       Header: dummy UInt8
-clickhouse-local --enable_analyzer=1 --query_kind secondary_query -q explain plan header=1 select toString(dummy) as dummy from system.one group by dummy
+clickhouse-local --allow_experimental_analyzer=1 --query_kind secondary_query -q explain plan header=1 select toString(dummy) as dummy from system.one group by dummy
 Expression ((Project names + Projection))
 Header: dummy String
   Aggregating
@@ -16,7 +16,7 @@ Header: dummy String
     Header: toString(__table1.dummy) String
       ReadFromStorage (SystemOne)
       Header: dummy UInt8
-clickhouse-client --enable_analyzer=1 --query_kind initial_query -q explain plan header=1 select toString(dummy) as dummy from system.one group by dummy
+clickhouse-client --allow_experimental_analyzer=1 --query_kind initial_query -q explain plan header=1 select toString(dummy) as dummy from system.one group by dummy
 Expression ((Project names + Projection))
 Header: dummy String
   Aggregating
@@ -25,7 +25,7 @@ Header: dummy String
     Header: __table1.dummy UInt8
       ReadFromStorage (SystemOne)
       Header: dummy UInt8
-clickhouse-local --enable_analyzer=1 --query_kind initial_query -q explain plan header=1 select toString(dummy) as dummy from system.one group by dummy
+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
diff --git a/tests/queries/0_stateless/02303_query_kind.sh b/tests/queries/0_stateless/02303_query_kind.sh
index 7fe491b9deb..1d883a2dcc7 100755
--- a/tests/queries/0_stateless/02303_query_kind.sh
+++ b/tests/queries/0_stateless/02303_query_kind.sh
@@ -5,7 +5,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=1"
+    "--allow_experimental_analyzer=1"
 )
 
 function run_query()
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 5c731ea6d89..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
@@ -1,6 +1,4 @@
 #!/usr/bin/expect -f
-# Tags: no-debug, no-tsan, no-msan, no-asan, no-ubsan, no-s3-storage, no-cpu-aarch64
-# ^ it can be slower than 60 seconds
 
 # This is the regression for the concurrent access in ProgressIndication,
 # so it is important to read enough rows here (10e6).
diff --git a/tests/queries/0_stateless/02313_dump_column_structure_low_cardinality.reference b/tests/queries/0_stateless/02313_dump_column_structure_low_cardinality.reference
index 6b1e4743867..fa7f1799c31 100644
--- a/tests/queries/0_stateless/02313_dump_column_structure_low_cardinality.reference
+++ b/tests/queries/0_stateless/02313_dump_column_structure_low_cardinality.reference
@@ -1 +1 @@
-Array(LowCardinality(String)), Const(size = 1, Array(size = 1, UInt64(size = 1), LowCardinality(size = 2, UInt8(size = 2), Unique(size = 3, String(size = 3)))))
+Array(LowCardinality(String)), Const(size = 1, Array(size = 1, UInt64(size = 1), ColumnLowCardinality(size = 2, UInt8(size = 2), ColumnUnique(size = 3, String(size = 3)))))
diff --git a/tests/queries/0_stateless/02313_filesystem_cache_seeks.sh b/tests/queries/0_stateless/02313_filesystem_cache_seeks.sh
index b7adde6fcbb..b54e3d7f805 100755
--- a/tests/queries/0_stateless/02313_filesystem_cache_seeks.sh
+++ b/tests/queries/0_stateless/02313_filesystem_cache_seeks.sh
@@ -8,20 +8,16 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 
-client_opts=(
-  --distributed_ddl_output_mode  'null_status_on_timeout'
-)
-
 for STORAGE_POLICY in 's3_cache' 'local_cache' 's3_cache_multi' 'azure_cache'; do
     echo "Using storage policy: $STORAGE_POLICY"
     $CLICKHOUSE_CLIENT --query "SYSTEM DROP FILESYSTEM CACHE"
 
-    $CLICKHOUSE_CLIENT "${client_opts[@]}" --query "DROP TABLE IF EXISTS test_02313" > /dev/null
+    $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test_02313"
 
-    $CLICKHOUSE_CLIENT "${client_opts[@]}" --query "CREATE TABLE test_02313 (id Int32, val String)
+    $CLICKHOUSE_CLIENT --query "CREATE TABLE test_02313 (id Int32, val String)
     ENGINE = MergeTree()
     ORDER BY tuple()
-    SETTINGS storage_policy = '$STORAGE_POLICY'" > /dev/null
+    SETTINGS storage_policy = '$STORAGE_POLICY'"
 
     $CLICKHOUSE_CLIENT --enable_filesystem_cache_on_write_operations=0 -n --query "INSERT INTO test_02313
     SELECT * FROM
@@ -36,6 +32,6 @@ for STORAGE_POLICY in 's3_cache' 'local_cache' 's3_cache_multi' 'azure_cache'; d
     $CLICKHOUSE_CLIENT --query "SELECT * FROM test_02313 WHERE val LIKE concat('%', randomPrintableASCII(3), '%') FORMAT Null"
     $CLICKHOUSE_CLIENT --query "SELECT * FROM test_02313 WHERE val LIKE concat('%', randomPrintableASCII(3), '%') FORMAT Null"
 
-    $CLICKHOUSE_CLIENT "${client_opts[@]}" --query "DROP TABLE test_02313" > /dev/null
+    $CLICKHOUSE_CLIENT --query "DROP TABLE test_02313"
 
 done
diff --git a/tests/queries/0_stateless/02315_grouping_constant_folding.reference b/tests/queries/0_stateless/02315_grouping_constant_folding.reference
index 7b8c75b2304..31816318a42 100644
--- a/tests/queries/0_stateless/02315_grouping_constant_folding.reference
+++ b/tests/queries/0_stateless/02315_grouping_constant_folding.reference
@@ -27,7 +27,7 @@ SELECT count() AS amount, a, b, GROUPING(a, b) FROM test02315 GROUP BY ROLLUP(a,
 5	0	0	2
 5	1	0	2
 10	0	0	0
-SELECT count() AS amount, a, b, GROUPING(a, b) FROM test02315 GROUP BY GROUPING SETS ((a, b), (a, a), ()) ORDER BY (amount, a, b) SETTINGS force_grouping_standard_compatibility=0, enable_analyzer=1;
+SELECT count() AS amount, a, b, GROUPING(a, b) FROM test02315 GROUP BY GROUPING SETS ((a, b), (a, a), ()) ORDER BY (amount, a, b) SETTINGS force_grouping_standard_compatibility=0, allow_experimental_analyzer=1;
 1	0	0	3
 1	0	2	3
 1	0	4	3
diff --git a/tests/queries/0_stateless/02315_grouping_constant_folding.sql b/tests/queries/0_stateless/02315_grouping_constant_folding.sql
index 5e305d2e6c5..f992aa0da32 100644
--- a/tests/queries/0_stateless/02315_grouping_constant_folding.sql
+++ b/tests/queries/0_stateless/02315_grouping_constant_folding.sql
@@ -9,7 +9,7 @@ SELECT count() AS amount, a, b, GROUPING(a, b) FROM test02315 GROUP BY GROUPING
 
 SELECT count() AS amount, a, b, GROUPING(a, b) FROM test02315 GROUP BY ROLLUP(a, b) ORDER BY (amount, a, b) SETTINGS force_grouping_standard_compatibility=0;
 
-SELECT count() AS amount, a, b, GROUPING(a, b) FROM test02315 GROUP BY GROUPING SETS ((a, b), (a, a), ()) ORDER BY (amount, a, b) SETTINGS force_grouping_standard_compatibility=0, enable_analyzer=1;
+SELECT count() AS amount, a, b, GROUPING(a, b) FROM test02315 GROUP BY GROUPING SETS ((a, b), (a, a), ()) ORDER BY (amount, a, b) SETTINGS force_grouping_standard_compatibility=0, allow_experimental_analyzer=1;
 
 -- { echoOff }
 DROP TABLE test02315;
diff --git a/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.sh b/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.sh
index 953485c3a1f..07c7bc4af56 100755
--- a/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.sh
+++ b/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.sh
@@ -23,99 +23,99 @@ $CLICKHOUSE_CLIENT -q "insert into distinct_in_order_explain select number % num
 
 $CLICKHOUSE_CLIENT -q "select '-- disable optimize_distinct_in_order'"
 $CLICKHOUSE_CLIENT -q "select '-- distinct all primary key columns -> ordinary distinct'"
-$CLICKHOUSE_CLIENT -q "$DISABLE_OPTIMIZATION;explain pipeline select distinct * from distinct_in_order_explain" | eval $FIND_DISTINCT
+$CLICKHOUSE_CLIENT -nq "$DISABLE_OPTIMIZATION;explain pipeline select distinct * from distinct_in_order_explain" | eval $FIND_DISTINCT
 
 $CLICKHOUSE_CLIENT -q "select '-- enable optimize_distinct_in_order'"
 $CLICKHOUSE_CLIENT -q "select '-- distinct with all primary key columns -> pre-distinct optimization only'"
-$CLICKHOUSE_CLIENT -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct * from distinct_in_order_explain" | eval $FIND_DISTINCT
+$CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct * from distinct_in_order_explain" | eval $FIND_DISTINCT
 
 $CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix -> pre-distinct optimization only'"
-$CLICKHOUSE_CLIENT -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, c from distinct_in_order_explain" | eval $FIND_DISTINCT
+$CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, c from distinct_in_order_explain" | eval $FIND_DISTINCT
 
 $CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by column in distinct -> pre-distinct and final distinct optimization'"
-$CLICKHOUSE_CLIENT -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, c from distinct_in_order_explain order by c" | eval $FIND_DISTINCT
+$CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, c from distinct_in_order_explain order by c" | eval $FIND_DISTINCT
 
 $CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by the same columns -> pre-distinct and final distinct optimization'"
-$CLICKHOUSE_CLIENT -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, b from distinct_in_order_explain order by a, b" | eval $FIND_DISTINCT
+$CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, b from distinct_in_order_explain order by a, b" | eval $FIND_DISTINCT
 
 $CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by columns are prefix of distinct columns -> pre-distinct and final distinct optimization'"
-$CLICKHOUSE_CLIENT -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, b from distinct_in_order_explain order by a" | eval $FIND_DISTINCT
+$CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, b from distinct_in_order_explain order by a" | eval $FIND_DISTINCT
 
 $CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by column in distinct but non-primary key prefix -> pre-distinct and final distinct optimization'"
-$CLICKHOUSE_CLIENT -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, b, c from distinct_in_order_explain order by c" | eval $FIND_DISTINCT
+$CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, b, c from distinct_in_order_explain order by c" | eval $FIND_DISTINCT
 
 $CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by column _not_ in distinct -> pre-distinct optimization only'"
-$CLICKHOUSE_CLIENT -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, c from distinct_in_order_explain order by b" | eval $FIND_DISTINCT
+$CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, c from distinct_in_order_explain order by b" | eval $FIND_DISTINCT
 
 $CLICKHOUSE_CLIENT -q "select '-- distinct with non-primary key prefix -> ordinary distinct'"
-$CLICKHOUSE_CLIENT -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct b, c from distinct_in_order_explain" | eval $FIND_DISTINCT
+$CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct b, c from distinct_in_order_explain" | eval $FIND_DISTINCT
 
 $CLICKHOUSE_CLIENT -q "select '-- distinct with non-primary key prefix and order by column in distinct -> final distinct optimization only'"
-$CLICKHOUSE_CLIENT -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct b, c from distinct_in_order_explain order by b" | eval $FIND_DISTINCT
+$CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct b, c from distinct_in_order_explain order by b" | eval $FIND_DISTINCT
 
 $CLICKHOUSE_CLIENT -q "select '-- distinct with non-primary key prefix and order by column _not_ in distinct -> ordinary distinct'"
-$CLICKHOUSE_CLIENT -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct b, c from distinct_in_order_explain order by a" | eval $FIND_DISTINCT
+$CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct b, c from distinct_in_order_explain order by a" | eval $FIND_DISTINCT
 
 $CLICKHOUSE_CLIENT -q "select '-- distinct with non-primary key prefix and order by _const_ column in distinct -> ordinary distinct'"
-$CLICKHOUSE_CLIENT -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct b, 1 as x from distinct_in_order_explain order by x" | eval $FIND_DISTINCT
+$CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct b, 1 as x from distinct_in_order_explain order by x" | eval $FIND_DISTINCT
 
 echo "-- Check reading in order for distinct"
 echo "-- disabled, distinct columns match sorting key"
-$CLICKHOUSE_CLIENT --max_threads=0 -q "$DISABLE_OPTIMIZATION;explain pipeline select distinct a, b from distinct_in_order_explain" | eval $FIND_READING_DEFAULT
+$CLICKHOUSE_CLIENT --max_threads=0 -nq "$DISABLE_OPTIMIZATION;explain pipeline select distinct a, b from distinct_in_order_explain" | eval $FIND_READING_DEFAULT
 echo "-- enabled, distinct columns match sorting key"
 # read_in_order_two_level_merge_threshold is set here to avoid repeating MergeTreeInOrder in output
-$CLICKHOUSE_CLIENT --read_in_order_two_level_merge_threshold=2 -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, b from distinct_in_order_explain" | eval $FIND_READING_IN_ORDER
+$CLICKHOUSE_CLIENT --read_in_order_two_level_merge_threshold=2 -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, b from distinct_in_order_explain" | eval $FIND_READING_IN_ORDER
 echo "-- enabled, distinct columns form prefix of sorting key"
-$CLICKHOUSE_CLIENT --read_in_order_two_level_merge_threshold=2 -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, b from distinct_in_order_explain" | eval $FIND_READING_IN_ORDER
+$CLICKHOUSE_CLIENT --read_in_order_two_level_merge_threshold=2 -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, b from distinct_in_order_explain" | eval $FIND_READING_IN_ORDER
 echo "-- enabled, distinct columns DON't form prefix of sorting key"
-$CLICKHOUSE_CLIENT --max_threads=0 -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct b from distinct_in_order_explain" | eval $FIND_READING_DEFAULT
+$CLICKHOUSE_CLIENT --max_threads=0 -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct b from distinct_in_order_explain" | eval $FIND_READING_DEFAULT
 echo "-- enabled, distinct columns contains constant columns, non-const columns form prefix of sorting key"
-$CLICKHOUSE_CLIENT --read_in_order_two_level_merge_threshold=2 -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct 1, a from distinct_in_order_explain" | eval $FIND_READING_IN_ORDER
+$CLICKHOUSE_CLIENT --read_in_order_two_level_merge_threshold=2 -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct 1, a from distinct_in_order_explain" | eval $FIND_READING_IN_ORDER
 echo "-- enabled, distinct columns contains constant columns, non-const columns match prefix of sorting key"
-$CLICKHOUSE_CLIENT --read_in_order_two_level_merge_threshold=2 -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct 1, b, a from distinct_in_order_explain" | eval $FIND_READING_IN_ORDER
+$CLICKHOUSE_CLIENT --read_in_order_two_level_merge_threshold=2 -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct 1, b, a from distinct_in_order_explain" | eval $FIND_READING_IN_ORDER
 echo "-- enabled, only part of distinct columns form prefix of sorting key"
-$CLICKHOUSE_CLIENT --max_threads=0 -q "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, c from distinct_in_order_explain" | eval $FIND_READING_DEFAULT
+$CLICKHOUSE_CLIENT --max_threads=0 -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, c from distinct_in_order_explain" | eval $FIND_READING_DEFAULT
 
 echo "=== disable new analyzer ==="
-DISABLE_ANALYZER="set enable_analyzer=0"
+DISABLE_ANALYZER="set allow_experimental_analyzer=0"
 
 echo "-- enabled, check that sorting properties are propagated from ReadFromMergeTree till preliminary distinct"
-$CLICKHOUSE_CLIENT -q "$DISABLE_ANALYZER;$ENABLE_OPTIMIZATION;explain plan sorting=1 select distinct b, a from distinct_in_order_explain where a > 0" | eval $FIND_SORTING_PROPERTIES
+$CLICKHOUSE_CLIENT -nq "$DISABLE_ANALYZER;$ENABLE_OPTIMIZATION;explain plan sorting=1 select distinct b, a from distinct_in_order_explain where a > 0" | eval $FIND_SORTING_PROPERTIES
 
 echo "-- check that reading in order optimization for ORDER BY and DISTINCT applied correctly in the same query"
 ENABLE_READ_IN_ORDER="set optimize_read_in_order=1"
 echo "-- disabled, check that sorting description for ReadFromMergeTree match ORDER BY columns"
-$CLICKHOUSE_CLIENT -q "$DISABLE_ANALYZER;$DISABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct b, a from distinct_in_order_explain order by a" | eval $FIND_SORTING_PROPERTIES
+$CLICKHOUSE_CLIENT -nq "$DISABLE_ANALYZER;$DISABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct b, a from distinct_in_order_explain order by a" | eval $FIND_SORTING_PROPERTIES
 echo "-- enabled, check that ReadFromMergeTree sorting description is overwritten by DISTINCT optimization i.e. it contains columns from DISTINCT clause"
-$CLICKHOUSE_CLIENT -q "$DISABLE_ANALYZER;$ENABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct b, a from distinct_in_order_explain order by a" | eval $FIND_SORTING_PROPERTIES
+$CLICKHOUSE_CLIENT -nq "$DISABLE_ANALYZER;$ENABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct b, a from distinct_in_order_explain order by a" | eval $FIND_SORTING_PROPERTIES
 echo "-- enabled, check that ReadFromMergeTree sorting description is overwritten by DISTINCT optimization, but direction used from ORDER BY clause"
-$CLICKHOUSE_CLIENT -q "$DISABLE_ANALYZER;$ENABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct b, a from distinct_in_order_explain order by a DESC" | eval $FIND_SORTING_PROPERTIES
+$CLICKHOUSE_CLIENT -nq "$DISABLE_ANALYZER;$ENABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct b, a from distinct_in_order_explain order by a DESC" | eval $FIND_SORTING_PROPERTIES
 echo "-- enabled, check that ReadFromMergeTree sorting description is NOT overwritten by DISTINCT optimization (1), - it contains columns from ORDER BY clause"
-$CLICKHOUSE_CLIENT -q "$DISABLE_ANALYZER;$ENABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct a from distinct_in_order_explain order by a, b" | eval $FIND_SORTING_PROPERTIES
+$CLICKHOUSE_CLIENT -nq "$DISABLE_ANALYZER;$ENABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct a from distinct_in_order_explain order by a, b" | eval $FIND_SORTING_PROPERTIES
 echo "-- enabled, check that ReadFromMergeTree sorting description is NOT overwritten by DISTINCT optimization (2), - direction used from ORDER BY clause"
-$CLICKHOUSE_CLIENT -q "$DISABLE_ANALYZER;$ENABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct b, a from distinct_in_order_explain order by a DESC, b DESC" | eval $FIND_SORTING_PROPERTIES
+$CLICKHOUSE_CLIENT -nq "$DISABLE_ANALYZER;$ENABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct b, a from distinct_in_order_explain order by a DESC, b DESC" | eval $FIND_SORTING_PROPERTIES
 
 echo "-- enabled, check that disabling other 'read in order' optimizations do not disable distinct in order optimization"
-$CLICKHOUSE_CLIENT -q "$DISABLE_ANALYZER;$ENABLE_OPTIMIZATION;set optimize_read_in_order=0;set optimize_aggregation_in_order=0;set optimize_read_in_window_order=0;explain plan sorting=1 select distinct a,b from distinct_in_order_explain" | eval $FIND_SORTING_PROPERTIES
+$CLICKHOUSE_CLIENT -nq "$DISABLE_ANALYZER;$ENABLE_OPTIMIZATION;set optimize_read_in_order=0;set optimize_aggregation_in_order=0;set optimize_read_in_window_order=0;explain plan sorting=1 select distinct a,b from distinct_in_order_explain" | eval $FIND_SORTING_PROPERTIES
 
 echo "=== enable new analyzer ==="
-ENABLE_ANALYZER="set enable_analyzer=1"
+ENABLE_ANALYZER="set allow_experimental_analyzer=1"
 
 echo "-- enabled, check that sorting properties are propagated from ReadFromMergeTree till preliminary distinct"
-$CLICKHOUSE_CLIENT -q "$ENABLE_ANALYZER;$ENABLE_OPTIMIZATION;explain plan sorting=1 select distinct b, a from distinct_in_order_explain where a > 0 settings optimize_move_to_prewhere=1" | eval $FIND_SORTING_PROPERTIES
+$CLICKHOUSE_CLIENT -nq "$ENABLE_ANALYZER;$ENABLE_OPTIMIZATION;explain plan sorting=1 select distinct b, a from distinct_in_order_explain where a > 0 settings optimize_move_to_prewhere=1" | eval $FIND_SORTING_PROPERTIES
 
 echo "-- disabled, check that sorting description for ReadFromMergeTree match ORDER BY columns"
-$CLICKHOUSE_CLIENT -q "$ENABLE_ANALYZER;$DISABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct b, a from distinct_in_order_explain order by a" | eval $FIND_SORTING_PROPERTIES
+$CLICKHOUSE_CLIENT -nq "$ENABLE_ANALYZER;$DISABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct b, a from distinct_in_order_explain order by a" | eval $FIND_SORTING_PROPERTIES
 echo "-- enabled, check that ReadFromMergeTree sorting description is overwritten by DISTINCT optimization i.e. it contains columns from DISTINCT clause"
-$CLICKHOUSE_CLIENT -q "$ENABLE_ANALYZER;$ENABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct b, a from distinct_in_order_explain order by a" | eval $FIND_SORTING_PROPERTIES
+$CLICKHOUSE_CLIENT -nq "$ENABLE_ANALYZER;$ENABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct b, a from distinct_in_order_explain order by a" | eval $FIND_SORTING_PROPERTIES
 echo "-- enabled, check that ReadFromMergeTree sorting description is overwritten by DISTINCT optimization, but direction used from ORDER BY clause"
-$CLICKHOUSE_CLIENT -q "$ENABLE_ANALYZER;$ENABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct b, a from distinct_in_order_explain order by a DESC" | eval $FIND_SORTING_PROPERTIES
+$CLICKHOUSE_CLIENT -nq "$ENABLE_ANALYZER;$ENABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct b, a from distinct_in_order_explain order by a DESC" | eval $FIND_SORTING_PROPERTIES
 echo "-- enabled, check that ReadFromMergeTree sorting description is NOT overwritten by DISTINCT optimization (1), - it contains columns from ORDER BY clause"
-$CLICKHOUSE_CLIENT -q "$ENABLE_ANALYZER;$ENABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct a from distinct_in_order_explain order by a, b" | eval $FIND_SORTING_PROPERTIES
+$CLICKHOUSE_CLIENT -nq "$ENABLE_ANALYZER;$ENABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct a from distinct_in_order_explain order by a, b" | eval $FIND_SORTING_PROPERTIES
 echo "-- enabled, check that ReadFromMergeTree sorting description is NOT overwritten by DISTINCT optimization (2), - direction used from ORDER BY clause"
-$CLICKHOUSE_CLIENT -q "$ENABLE_ANALYZER;$ENABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct b, a from distinct_in_order_explain order by a DESC, b DESC" | eval $FIND_SORTING_PROPERTIES
+$CLICKHOUSE_CLIENT -nq "$ENABLE_ANALYZER;$ENABLE_OPTIMIZATION;$ENABLE_READ_IN_ORDER;explain plan sorting=1 select distinct b, a from distinct_in_order_explain order by a DESC, b DESC" | eval $FIND_SORTING_PROPERTIES
 
 echo "-- enabled, check that disabling other 'read in order' optimizations do not disable distinct in order optimization"
-$CLICKHOUSE_CLIENT -q "$ENABLE_ANALYZER;$ENABLE_OPTIMIZATION;set optimize_read_in_order=0;set optimize_aggregation_in_order=0;set optimize_read_in_window_order=0;explain plan sorting=1 select distinct a,b from distinct_in_order_explain" | eval $FIND_SORTING_PROPERTIES
+$CLICKHOUSE_CLIENT -nq "$ENABLE_ANALYZER;$ENABLE_OPTIMIZATION;set optimize_read_in_order=0;set optimize_aggregation_in_order=0;set optimize_read_in_window_order=0;explain plan sorting=1 select distinct a,b from distinct_in_order_explain" | eval $FIND_SORTING_PROPERTIES
 
 $CLICKHOUSE_CLIENT -q "drop table if exists distinct_in_order_explain sync"
diff --git a/tests/queries/0_stateless/02319_lightweight_delete_on_merge_tree.sql b/tests/queries/0_stateless/02319_lightweight_delete_on_merge_tree.sql
index 6491253cd5f..f82f79dbe44 100644
--- a/tests/queries/0_stateless/02319_lightweight_delete_on_merge_tree.sql
+++ b/tests/queries/0_stateless/02319_lightweight_delete_on_merge_tree.sql
@@ -102,7 +102,7 @@ ALTER TABLE t_proj ADD PROJECTION p_1 (SELECT avg(a), avg(b), count()) SETTINGS
 
 INSERT INTO t_proj SELECT number + 1, number + 1  FROM numbers(1000);
 
-DELETE FROM t_proj WHERE a < 100; -- { serverError SUPPORT_IS_DISABLED }
+DELETE FROM t_proj WHERE a < 100; -- { serverError NOT_IMPLEMENTED }
 
 SELECT avg(a), avg(b), count() FROM t_proj;
 
diff --git a/tests/queries/0_stateless/02325_dates_schema_inference.reference b/tests/queries/0_stateless/02325_dates_schema_inference.reference
index 124f105220d..c8eebd3262e 100644
--- a/tests/queries/0_stateless/02325_dates_schema_inference.reference
+++ b/tests/queries/0_stateless/02325_dates_schema_inference.reference
@@ -1,29 +1,29 @@
 JSONEachRow
 x	Nullable(Date)					
 x	Nullable(DateTime64(9))					
-x	Nullable(DateTime)					
+x	Nullable(DateTime64(9))					
 x	Array(Nullable(Date))					
-x	Array(Nullable(DateTime))					
-x	Array(Nullable(DateTime))					
-x	Tuple(\n    date1 Nullable(DateTime),\n    date2 Nullable(Date))					
-x	Array(Nullable(DateTime))					
-x	Array(Nullable(DateTime))					
-x	Nullable(DateTime)					
+x	Array(Nullable(DateTime64(9)))					
+x	Array(Nullable(DateTime64(9)))					
+x	Tuple(\n    date1 Nullable(DateTime64(9)),\n    date2 Nullable(Date))					
+x	Array(Nullable(DateTime64(9)))					
+x	Array(Nullable(DateTime64(9)))					
+x	Nullable(DateTime64(9))					
 x	Array(Nullable(String))					
 x	Nullable(String)					
 x	Array(Nullable(String))					
-x	Tuple(\n    key1 Array(Array(Nullable(DateTime))),\n    key2 Array(Array(Nullable(String))))					
+x	Tuple(\n    key1 Array(Array(Nullable(DateTime64(9)))),\n    key2 Array(Array(Nullable(String))))					
 CSV
 c1	Nullable(Date)					
 c1	Nullable(DateTime64(9))					
-c1	Nullable(DateTime)					
+c1	Nullable(DateTime64(9))					
 c1	Array(Nullable(Date))					
-c1	Array(Nullable(DateTime))					
-c1	Array(Nullable(DateTime))					
-c1	Map(String, Nullable(DateTime))					
-c1	Array(Nullable(DateTime))					
-c1	Array(Nullable(DateTime))					
-c1	Nullable(DateTime)					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Map(String, Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Nullable(DateTime64(9))					
 c1	Array(Nullable(String))					
 c1	Nullable(String)					
 c1	Array(Nullable(String))					
@@ -31,14 +31,14 @@ c1	Map(String, Array(Array(Nullable(String))))
 TSV
 c1	Nullable(Date)					
 c1	Nullable(DateTime64(9))					
-c1	Nullable(DateTime)					
+c1	Nullable(DateTime64(9))					
 c1	Array(Nullable(Date))					
-c1	Array(Nullable(DateTime))					
-c1	Array(Nullable(DateTime))					
-c1	Map(String, Nullable(DateTime))					
-c1	Array(Nullable(DateTime))					
-c1	Array(Nullable(DateTime))					
-c1	Nullable(DateTime)					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Map(String, Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Nullable(DateTime64(9))					
 c1	Array(Nullable(String))					
 c1	Nullable(String)					
 c1	Array(Nullable(String))					
@@ -46,14 +46,14 @@ c1	Map(String, Array(Array(Nullable(String))))
 Values
 c1	Nullable(Date)					
 c1	Nullable(DateTime64(9))					
-c1	Nullable(DateTime)					
+c1	Nullable(DateTime64(9))					
 c1	Array(Nullable(Date))					
-c1	Array(Nullable(DateTime))					
-c1	Array(Nullable(DateTime))					
-c1	Map(String, Nullable(DateTime))					
-c1	Array(Nullable(DateTime))					
-c1	Array(Nullable(DateTime))					
-c1	Nullable(DateTime)					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Map(String, Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Nullable(DateTime64(9))					
 c1	Array(Nullable(String))					
 c1	Nullable(String)					
 c1	Array(Nullable(String))					
diff --git a/tests/queries/0_stateless/02335_column_ttl_expired_column_optimization.sh b/tests/queries/0_stateless/02335_column_ttl_expired_column_optimization.sh
index 490f8361682..96f80d65878 100755
--- a/tests/queries/0_stateless/02335_column_ttl_expired_column_optimization.sh
+++ b/tests/queries/0_stateless/02335_column_ttl_expired_column_optimization.sh
@@ -6,7 +6,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 data_path="$CLICKHOUSE_TMP/local"
 
-$CLICKHOUSE_LOCAL --path "$data_path" -m -q "
+$CLICKHOUSE_LOCAL --path "$data_path" -nm -q "
     create table ttl_02335 (
         date Date,
         key Int,
diff --git a/tests/queries/0_stateless/02337_analyzer_columns_basic.sql b/tests/queries/0_stateless/02337_analyzer_columns_basic.sql
index c132a69ac21..167eecc6fb8 100644
--- a/tests/queries/0_stateless/02337_analyzer_columns_basic.sql
+++ b/tests/queries/0_stateless/02337_analyzer_columns_basic.sql
@@ -1,6 +1,6 @@
 -- Tags: no-parallel
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 -- Empty from section
 
diff --git a/tests/queries/0_stateless/02337_drop_filesystem_cache_access.sh b/tests/queries/0_stateless/02337_drop_filesystem_cache_access.sh
index 07d5f641571..7f2103e6ddb 100755
--- a/tests/queries/0_stateless/02337_drop_filesystem_cache_access.sh
+++ b/tests/queries/0_stateless/02337_drop_filesystem_cache_access.sh
@@ -7,17 +7,17 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiline -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 DROP USER IF EXISTS user_test_02337;
 CREATE USER user_test_02337 IDENTIFIED WITH plaintext_password BY 'user_test_02337';
 REVOKE ALL ON *.* FROM user_test_02337;
 """
-${CLICKHOUSE_CLIENT} --multiline --user user_test_02337 --password user_test_02337 -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery --user user_test_02337 --password user_test_02337 -q """
 SYSTEM DROP FILESYSTEM CACHE; -- { serverError 497 }
 """
-${CLICKHOUSE_CLIENT} --multiline -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 GRANT SYSTEM DROP FILESYSTEM CACHE ON *.* TO user_test_02337 WITH GRANT OPTION;
 """
-${CLICKHOUSE_CLIENT} --multiline --user user_test_02337 --password user_test_02337 -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery --user user_test_02337 --password user_test_02337 -q """
 SYSTEM DROP FILESYSTEM CACHE;
 """
diff --git a/tests/queries/0_stateless/02337_multiple_joins_original_names.sql b/tests/queries/0_stateless/02337_multiple_joins_original_names.sql
index 37c7077b56e..63bbfe6873d 100644
--- a/tests/queries/0_stateless/02337_multiple_joins_original_names.sql
+++ b/tests/queries/0_stateless/02337_multiple_joins_original_names.sql
@@ -1,6 +1,6 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/34697
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT table1_id FROM (
     SELECT first.table1_id
diff --git a/tests/queries/0_stateless/02338_analyzer_constants_basic.sql b/tests/queries/0_stateless/02338_analyzer_constants_basic.sql
index 536202dc2cf..6d6249538a4 100644
--- a/tests/queries/0_stateless/02338_analyzer_constants_basic.sql
+++ b/tests/queries/0_stateless/02338_analyzer_constants_basic.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DESCRIBE (SELECT 1);
 SELECT 1;
diff --git a/tests/queries/0_stateless/02339_analyzer_matcher_basic.sql b/tests/queries/0_stateless/02339_analyzer_matcher_basic.sql
index 57c6a9479ec..a09325fa43b 100644
--- a/tests/queries/0_stateless/02339_analyzer_matcher_basic.sql
+++ b/tests/queries/0_stateless/02339_analyzer_matcher_basic.sql
@@ -1,6 +1,6 @@
 -- Tags: no-parallel
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT 'Matchers without FROM section';
 
diff --git a/tests/queries/0_stateless/02340_analyzer_functions.sql b/tests/queries/0_stateless/02340_analyzer_functions.sql
index bd018302913..101a5bfcc86 100644
--- a/tests/queries/0_stateless/02340_analyzer_functions.sql
+++ b/tests/queries/0_stateless/02340_analyzer_functions.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DESCRIBE (SELECT 1 + 1);
 SELECT 1 + 1;
diff --git a/tests/queries/0_stateless/02341_analyzer_aliases_basics.sql b/tests/queries/0_stateless/02341_analyzer_aliases_basics.sql
index 8bed0c8bc1e..9f21db8e659 100644
--- a/tests/queries/0_stateless/02341_analyzer_aliases_basics.sql
+++ b/tests/queries/0_stateless/02341_analyzer_aliases_basics.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT 'Aliases to constants';
 
diff --git a/tests/queries/0_stateless/02341_global_join_cte.reference b/tests/queries/0_stateless/02341_global_join_cte.reference
index 4f854ca3bef..f2cfe994ffa 100644
--- a/tests/queries/0_stateless/02341_global_join_cte.reference
+++ b/tests/queries/0_stateless/02341_global_join_cte.reference
@@ -1,6 +1,6 @@
 -- { echo }
-with rhs as (select * from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one))) select lhs.d2 from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one)) lhs global join rhs using (d1) order by rhs.d2 settings enable_analyzer=0; -- { serverError ALIAS_REQUIRED }
-with rhs as (select * from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one))) select lhs.d2 from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one)) lhs global join rhs using (d1) order by rhs.d2 settings enable_analyzer=1; -- It works with analyzer; rhs is an alias itself.
+with rhs as (select * from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one))) select lhs.d2 from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one)) lhs global join rhs using (d1) order by rhs.d2 settings allow_experimental_analyzer=0; -- { serverError ALIAS_REQUIRED }
+with rhs as (select * from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one))) select lhs.d2 from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one)) lhs global join rhs using (d1) order by rhs.d2 settings allow_experimental_analyzer=1; -- It works with analyzer; rhs is an alias itself.
 0
 0
 0
diff --git a/tests/queries/0_stateless/02341_global_join_cte.sql b/tests/queries/0_stateless/02341_global_join_cte.sql
index f6acd822f14..b9b906afd70 100644
--- a/tests/queries/0_stateless/02341_global_join_cte.sql
+++ b/tests/queries/0_stateless/02341_global_join_cte.sql
@@ -1,5 +1,5 @@
 -- { echo }
-with rhs as (select * from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one))) select lhs.d2 from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one)) lhs global join rhs using (d1) order by rhs.d2 settings enable_analyzer=0; -- { serverError ALIAS_REQUIRED }
-with rhs as (select * from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one))) select lhs.d2 from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one)) lhs global join rhs using (d1) order by rhs.d2 settings enable_analyzer=1; -- It works with analyzer; rhs is an alias itself.
+with rhs as (select * from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one))) select lhs.d2 from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one)) lhs global join rhs using (d1) order by rhs.d2 settings allow_experimental_analyzer=0; -- { serverError ALIAS_REQUIRED }
+with rhs as (select * from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one))) select lhs.d2 from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one)) lhs global join rhs using (d1) order by rhs.d2 settings allow_experimental_analyzer=1; -- It works with analyzer; rhs is an alias itself.
 with rhs as (select * from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one))) select lhs.d2 from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one)) lhs global join rhs using (d1) order by rhs.d2 settings joined_subquery_requires_alias=0;
 with rhs_ as (select * from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one))) select lhs.d2 from remote('127.{1,2}', view(select dummy d1, dummy d2 from system.one)) lhs global join rhs_ rhs using (d1) order by rhs.d2 settings joined_subquery_requires_alias=0;
diff --git a/tests/queries/0_stateless/02342_analyzer_compound_types.sql b/tests/queries/0_stateless/02342_analyzer_compound_types.sql
index 36617aab2f8..0fd96928496 100644
--- a/tests/queries/0_stateless/02342_analyzer_compound_types.sql
+++ b/tests/queries/0_stateless/02342_analyzer_compound_types.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT 'Constant tuple';
 
diff --git a/tests/queries/0_stateless/02342_window_view_different_struct.sql b/tests/queries/0_stateless/02342_window_view_different_struct.sql
index 9c35459ecef..a5b2b8daa5a 100644
--- a/tests/queries/0_stateless/02342_window_view_different_struct.sql
+++ b/tests/queries/0_stateless/02342_window_view_different_struct.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 SET allow_experimental_window_view = 1;
 
 DROP TABLE IF EXISTS data_02342;
diff --git a/tests/queries/0_stateless/02343_aggregation_pipeline.reference b/tests/queries/0_stateless/02343_aggregation_pipeline.reference
index eb013200a17..bf61eb6da0a 100644
--- a/tests/queries/0_stateless/02343_aggregation_pipeline.reference
+++ b/tests/queries/0_stateless/02343_aggregation_pipeline.reference
@@ -1,6 +1,6 @@
 -- { echoOn }
 
-explain pipeline select * from (select * from numbers(1e8) group by number) group by number settings max_rows_to_read = 0;
+explain pipeline select * from (select * from numbers(1e8) group by number) group by number;
 (Expression)
 ExpressionTransform × 16
   (Aggregating)
@@ -16,7 +16,7 @@ ExpressionTransform × 16
               ExpressionTransform
                 (ReadFromSystemNumbers)
                 NumbersRange 0 → 1
-explain pipeline select * from (select * from numbers_mt(1e8) group by number) group by number settings max_rows_to_read = 0;
+explain pipeline select * from (select * from numbers_mt(1e8) group by number) group by number;
 (Expression)
 ExpressionTransform × 16
   (Aggregating)
@@ -32,7 +32,7 @@ ExpressionTransform × 16
               ExpressionTransform × 16
                 (ReadFromSystemNumbers)
                 NumbersRange × 16 0 → 1
-explain pipeline select * from (select * from numbers_mt(1e8) group by number) order by number settings max_rows_to_read = 0;
+explain pipeline select * from (select * from numbers_mt(1e8) group by number) order by number;
 (Expression)
 ExpressionTransform
   (Sorting)
diff --git a/tests/queries/0_stateless/02343_aggregation_pipeline.sql b/tests/queries/0_stateless/02343_aggregation_pipeline.sql
index 24d54293313..0f9dbd0247d 100644
--- a/tests/queries/0_stateless/02343_aggregation_pipeline.sql
+++ b/tests/queries/0_stateless/02343_aggregation_pipeline.sql
@@ -13,9 +13,11 @@ set allow_prefetched_read_pool_for_local_filesystem = 0;
 
 -- { echoOn }
 
-explain pipeline select * from (select * from numbers(1e8) group by number) group by number settings max_rows_to_read = 0;
-explain pipeline select * from (select * from numbers_mt(1e8) group by number) group by number settings max_rows_to_read = 0;
-explain pipeline select * from (select * from numbers_mt(1e8) group by number) order by number settings max_rows_to_read = 0;
+explain pipeline select * from (select * from numbers(1e8) group by number) group by number;
+
+explain pipeline select * from (select * from numbers_mt(1e8) group by number) group by number;
+
+explain pipeline select * from (select * from numbers_mt(1e8) group by number) order by number;
 
 explain pipeline select number from remote('127.0.0.{1,2,3}', system, numbers_mt) group by number settings distributed_aggregation_memory_efficient = 1;
 
diff --git a/tests/queries/0_stateless/02343_analyzer_column_transformers_strict.sql b/tests/queries/0_stateless/02343_analyzer_column_transformers_strict.sql
index b55cb85c0da..7e323c570b8 100644
--- a/tests/queries/0_stateless/02343_analyzer_column_transformers_strict.sql
+++ b/tests/queries/0_stateless/02343_analyzer_column_transformers_strict.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02343_analyzer_lambdas.sql b/tests/queries/0_stateless/02343_analyzer_lambdas.sql
index 07f382700ae..80fa47fc325 100644
--- a/tests/queries/0_stateless/02343_analyzer_lambdas.sql
+++ b/tests/queries/0_stateless/02343_analyzer_lambdas.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02343_analyzer_lambdas_issue_28083.sql b/tests/queries/0_stateless/02343_analyzer_lambdas_issue_28083.sql
index dff0d7f82ca..3b780e1dec3 100644
--- a/tests/queries/0_stateless/02343_analyzer_lambdas_issue_28083.sql
+++ b/tests/queries/0_stateless/02343_analyzer_lambdas_issue_28083.sql
@@ -1,11 +1,11 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 select so,
        r
 from
-    (select  [('y',0),('n',1)] as cg,
+    (select  [('y',0),('n',1)] as cg, 
              if( arrayMap( x -> x.1, cg ) != ['y', 'n'], 'y', 'n')  as so,
-             arrayFilter( x -> x.1 = so , cg) as r
+             arrayFilter( x -> x.1 = so , cg) as r  
     );
 
 select
diff --git a/tests/queries/0_stateless/02343_analyzer_lambdas_issue_36677.sql b/tests/queries/0_stateless/02343_analyzer_lambdas_issue_36677.sql
index da0b4e8ef57..b07f3f33ac3 100644
--- a/tests/queries/0_stateless/02343_analyzer_lambdas_issue_36677.sql
+++ b/tests/queries/0_stateless/02343_analyzer_lambdas_issue_36677.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT
     arraySum(x -> ((x.1) / ((x.2) * (x.2))), arrayZip(mag, magerr)) / arraySum(x -> (1. / (x * x)), magerr) AS weightedmeanmag,
diff --git a/tests/queries/0_stateless/02344_analyzer_multiple_aliases_for_expression.sql b/tests/queries/0_stateless/02344_analyzer_multiple_aliases_for_expression.sql
index 3c7ea467734..ee02b79cc32 100644
--- a/tests/queries/0_stateless/02344_analyzer_multiple_aliases_for_expression.sql
+++ b/tests/queries/0_stateless/02344_analyzer_multiple_aliases_for_expression.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02344_describe_cache.reference b/tests/queries/0_stateless/02344_describe_cache.reference
index 13429b14866..6895606eb2b 100644
--- a/tests/queries/0_stateless/02344_describe_cache.reference
+++ b/tests/queries/0_stateless/02344_describe_cache.reference
@@ -1,2 +1,2 @@
 1
-102400	10000000	33554432	1	4194304	0	0	0	0	/var/lib/clickhouse/filesystem_caches/02344_describe_cache_test	0	5000	0	16
+102400	10000000	33554432	4194304	0	0	0	0	/var/lib/clickhouse/filesystem_caches/02344_describe_cache_test	0	5000	0	16
diff --git a/tests/queries/0_stateless/02344_describe_cache.sh b/tests/queries/0_stateless/02344_describe_cache.sh
index c5373b4d7e3..d91661db9bc 100755
--- a/tests/queries/0_stateless/02344_describe_cache.sh
+++ b/tests/queries/0_stateless/02344_describe_cache.sh
@@ -11,7 +11,7 @@ $CLICKHOUSE_CLIENT -nm --query """
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (a Int32, b String)
 ENGINE = MergeTree() ORDER BY tuple()
-SETTINGS disk = disk(name = '$disk_name', type = cache, max_size = '100Ki', path = '$disk_name', disk = 's3_disk', load_metadata_asynchronously = 0);
+SETTINGS disk = disk(name = '$disk_name', type = cache, max_size = '100Ki', path = '$disk_name', disk = 's3_disk');
 """
 
 $CLICKHOUSE_CLIENT -nm --query """
diff --git a/tests/queries/0_stateless/02344_insert_profile_events_stress.sql b/tests/queries/0_stateless/02344_insert_profile_events_stress.sql
index 902e1da543c..e9a790bea5d 100644
--- a/tests/queries/0_stateless/02344_insert_profile_events_stress.sql
+++ b/tests/queries/0_stateless/02344_insert_profile_events_stress.sql
@@ -1,5 +1,4 @@
 -- Tags: no-parallel, long, no-debug, no-tsan, no-msan, no-asan
-SET max_rows_to_read = 0;
 
 create table data_02344 (key Int) engine=Null;
 -- 3e9 rows is enough to fill the socket buffer and cause INSERT hung.
diff --git a/tests/queries/0_stateless/02345_analyzer_subqueries.sql b/tests/queries/0_stateless/02345_analyzer_subqueries.sql
index d1ec9b58e27..c0cc242b57b 100644
--- a/tests/queries/0_stateless/02345_analyzer_subqueries.sql
+++ b/tests/queries/0_stateless/02345_analyzer_subqueries.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02345_implicit_transaction.sql b/tests/queries/0_stateless/02345_implicit_transaction.sql
index 9496de71e13..ee2e0a07c3e 100644
--- a/tests/queries/0_stateless/02345_implicit_transaction.sql
+++ b/tests/queries/0_stateless/02345_implicit_transaction.sql
@@ -3,7 +3,7 @@
 CREATE TABLE landing (n Int64) engine=MergeTree order by n;
 CREATE TABLE target  (n Int64) engine=MergeTree order by n;
 CREATE MATERIALIZED VIEW landing_to_target TO target AS
-    SELECT n + throwIf(n == 3333) AS n
+    SELECT n + throwIf(n == 3333)
     FROM landing;
 
 INSERT INTO landing SELECT * FROM numbers(10000); -- { serverError FUNCTION_THROW_IF_VALUE_IS_NON_ZERO }
diff --git a/tests/queries/0_stateless/02346_additional_filters.sql b/tests/queries/0_stateless/02346_additional_filters.sql
index 5a799e1c8c1..f6b665713ec 100644
--- a/tests/queries/0_stateless/02346_additional_filters.sql
+++ b/tests/queries/0_stateless/02346_additional_filters.sql
@@ -4,8 +4,6 @@ drop table if exists table_2;
 drop table if exists v_numbers;
 drop table if exists mv_table;
 
-SET max_rows_to_read = 0;
-
 create table table_1 (x UInt32, y String) engine = MergeTree order by x;
 insert into table_1 values (1, 'a'), (2, 'bb'), (3, 'ccc'), (4, 'dddd');
 
diff --git a/tests/queries/0_stateless/02346_fulltext_index_bug52019.sql b/tests/queries/0_stateless/02346_fulltext_index_bug52019.sql
index e29c3c51e5e..a643df65095 100644
--- a/tests/queries/0_stateless/02346_fulltext_index_bug52019.sql
+++ b/tests/queries/0_stateless/02346_fulltext_index_bug52019.sql
@@ -13,8 +13,8 @@ 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 enable_analyzer=1;
-SELECT * FROM tab PREWHERE (s[1]) = 'Click a03' SETTINGS enable_analyzer=1; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT * FROM tab PREWHERE (s['foo']) = 'Click a03' SETTINGS enable_analyzer=1;
+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_fulltext_index_match_predicate.sql b/tests/queries/0_stateless/02346_fulltext_index_match_predicate.sql
index a20c8dc9afd..7f36c423a41 100644
--- a/tests/queries/0_stateless/02346_fulltext_index_match_predicate.sql
+++ b/tests/queries/0_stateless/02346_fulltext_index_match_predicate.sql
@@ -31,7 +31,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-    enable_analyzer = 0;
+    allow_experimental_analyzer = 0;
 
 SELECT *
 FROM
@@ -42,7 +42,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-    enable_analyzer = 1;
+    allow_experimental_analyzer = 1;
 
 SELECT '---';
 
@@ -61,7 +61,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-    enable_analyzer = 0;
+    allow_experimental_analyzer = 0;
 
 SELECT *
 FROM
@@ -72,7 +72,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-    enable_analyzer = 1;
+    allow_experimental_analyzer = 1;
 
 SELECT '---';
 
@@ -91,7 +91,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-    enable_analyzer = 0;
+    allow_experimental_analyzer = 0;
 
 SELECT *
 FROM
@@ -102,6 +102,6 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-    enable_analyzer = 1;
+    allow_experimental_analyzer = 1;
 
 DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02346_non_negative_derivative.sql b/tests/queries/0_stateless/02346_non_negative_derivative.sql
index ab648f2ee73..704241da16c 100644
--- a/tests/queries/0_stateless/02346_non_negative_derivative.sql
+++ b/tests/queries/0_stateless/02346_non_negative_derivative.sql
@@ -58,8 +58,8 @@ SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 13 YEAR) OVER (PAR
 -- test against wrong arguments/types
 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 NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
-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 NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+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_lightweight_delete_in_partition.reference b/tests/queries/0_stateless/02352_lightweight_delete_in_partition.reference
deleted file mode 100644
index 2bd7b51cea0..00000000000
--- a/tests/queries/0_stateless/02352_lightweight_delete_in_partition.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-200
-200
-100
-100
diff --git a/tests/queries/0_stateless/02352_lightweight_delete_in_partition.sql b/tests/queries/0_stateless/02352_lightweight_delete_in_partition.sql
deleted file mode 100644
index 04371d273fd..00000000000
--- a/tests/queries/0_stateless/02352_lightweight_delete_in_partition.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-DROP TABLE IF EXISTS t_merge_tree SYNC;
-DROP TABLE IF EXISTS t_replicated_merge_tree SYNC;
-
-CREATE TABLE t_merge_tree(time Date, id String , name String) ENGINE = MergeTree() PARTITION BY time ORDER BY id;
-CREATE TABLE t_replicated_merge_tree(time Date, id String, name String) ENGINE = ReplicatedMergeTree('/test/02352/{database}/t_rep','1') PARTITION BY time ORDER BY id;
-
-INSERT INTO t_merge_tree select '2024-08-01', '1', toString(number) FROM numbers(100);
-INSERT INTO t_merge_tree select '2024-08-02', '1', toString(number)  FROM numbers(100);
-
-INSERT INTO t_replicated_merge_tree select '2024-08-01', '1', toString(number) FROM numbers(100);
-INSERT INTO t_replicated_merge_tree select '2024-08-02', '1', toString(number)  FROM numbers(100);
-
-SELECT COUNT() FROM t_merge_tree;
-SELECT COUNT() FROM t_replicated_merge_tree;
-
-DELETE FROM t_merge_tree IN PARTITION '2024-08-01' WHERE id = '1';
-DELETE FROM t_replicated_merge_tree IN PARTITION '2024-08-01' WHERE id = '1';
-
-SELECT COUNT() FROM t_merge_tree;
-SELECT COUNT() FROM t_replicated_merge_tree;
-
-DROP TABLE t_merge_tree SYNC;
-DROP TABLE t_replicated_merge_tree SYNC;
diff --git a/tests/queries/0_stateless/02353_simdjson_buffer_overflow.sql b/tests/queries/0_stateless/02353_simdjson_buffer_overflow.sql
index e7c6c272102..b324f834053 100644
--- a/tests/queries/0_stateless/02353_simdjson_buffer_overflow.sql
+++ b/tests/queries/0_stateless/02353_simdjson_buffer_overflow.sql
@@ -2,6 +2,5 @@
 
 SET max_execution_time = 3;
 SET timeout_overflow_mode = 'break';
-SET max_rows_to_read = 0, max_bytes_to_read = 0;
 
 SELECT count() FROM system.numbers_mt WHERE NOT ignore(JSONExtract('{' || repeat('"a":"b",', rand() % 10) || '"c":"d"}', 'a', 'String')) FORMAT Null;
diff --git a/tests/queries/0_stateless/02354_distributed_with_external_aggregation_memory_usage.sql b/tests/queries/0_stateless/02354_distributed_with_external_aggregation_memory_usage.sql
index f9da5b3a73c..105fb500461 100644
--- a/tests/queries/0_stateless/02354_distributed_with_external_aggregation_memory_usage.sql
+++ b/tests/queries/0_stateless/02354_distributed_with_external_aggregation_memory_usage.sql
@@ -1,7 +1,5 @@
 -- Tags: long, no-tsan, no-msan, no-asan, no-ubsan, no-debug, no-object-storage
 
-SET max_rows_to_read = '101M';
-
 DROP TABLE IF EXISTS t_2354_dist_with_external_aggr;
 
 create table t_2354_dist_with_external_aggr(a UInt64, b String, c FixedString(100)) engine = MergeTree order by tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
@@ -25,6 +23,6 @@ select a, b, c, sum(a) as s
 from remote('127.0.0.{2,3}', currentDatabase(), t_2354_dist_with_external_aggr)
 group by a, b, c
 format Null
-settings max_memory_usage = '5Gi', max_result_rows = 0, max_result_bytes = 0;
+settings max_memory_usage = '5Gi';
 
 DROP TABLE t_2354_dist_with_external_aggr;
diff --git a/tests/queries/0_stateless/02354_vector_search_bugs.reference b/tests/queries/0_stateless/02354_vector_search_bugs.reference
index ce006359f5c..d2c2d7e2fb7 100644
--- a/tests/queries/0_stateless/02354_vector_search_bugs.reference
+++ b/tests/queries/0_stateless/02354_vector_search_bugs.reference
@@ -1,42 +1,17 @@
-Rejects INSERTs of Arrays with different sizes
 Issue #52258: Empty Arrays or Arrays with default values are rejected
+- Annoy
+- Usearch
 It is possible to create parts with different Array vector sizes but there will be an error at query time
+- Annoy
+- Usearch
 Correctness of index with > 1 mark
+- Annoy
 1	[1,0]	0
 9000	[9000,0]	0
-Issue #69085: Reference vector computed by a subquery
-Expression (Projection)
-  Limit (preliminary LIMIT (without OFFSET))
-    Sorting (Sorting for ORDER BY)
-      Expression (Before ORDER BY)
-        ReadFromMergeTree (default.tab)
-        Indexes:
-          PrimaryKey
-            Condition: true
-            Parts: 1/1
-            Granules: 4/4
-          Skip
-            Name: idx
-            Description: vector_similarity GRANULARITY 2
-            Parts: 1/1
-            Granules: 2/4
-Expression (Projection)
-  Limit (preliminary LIMIT (without OFFSET))
-    Sorting (Sorting for ORDER BY)
-      Expression (Before ORDER BY)
-        ReadFromMergeTree (default.tab)
-        Indexes:
-          PrimaryKey
-            Condition: true
-            Parts: 1/1
-            Granules: 4/4
-Expression (Projection)
-  Limit (preliminary LIMIT (without OFFSET))
-    Sorting (Sorting for ORDER BY)
-      Expression (Before ORDER BY)
-        ReadFromMergeTree (default.tab)
-        Indexes:
-          PrimaryKey
-            Condition: true
-            Parts: 1/1
-            Granules: 4/4
+1	(1,0)	0
+9000	(9000,0)	0
+- Usearch
+1	[1,0]	0
+9000	[9000,0]	0
+1	(1,0)	0
+9000	(9000,0)	0
diff --git a/tests/queries/0_stateless/02354_vector_search_bugs.sql b/tests/queries/0_stateless/02354_vector_search_bugs.sql
index e0015d04b7e..db0c06c4e16 100644
--- a/tests/queries/0_stateless/02354_vector_search_bugs.sql
+++ b/tests/queries/0_stateless/02354_vector_search_bugs.sql
@@ -1,28 +1,61 @@
--- Tags: no-fasttest, no-ordinary-database
+-- Tags: no-fasttest, no-ubsan, no-cpu-aarch64, no-ordinary-database, no-asan
 
--- Tests various bugs and special cases for vector indexes.
+-- Tests vector search in ClickHouse, i.e. Annoy and Usearch indexes. Both index types share similarities in implementation and usage,
+-- therefore they are tested in a single file.
 
-SET allow_experimental_vector_similarity_index = 1;
-SET enable_analyzer = 1; -- 0 vs. 1 produce slightly different error codes, make it future-proof
+-- This file contains tests for various bugs and special cases
+
+SET allow_experimental_annoy_index = 1;
+SET allow_experimental_usearch_index = 1;
+
+SET allow_experimental_analyzer = 1; -- 0 vs. 1 produce slightly different error codes, make it future-proof
 
 DROP TABLE IF EXISTS tab;
 
-SELECT 'Rejects INSERTs of Arrays with different sizes';
-
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance')) ENGINE = MergeTree ORDER BY id;
-INSERT INTO tab values (0, [2.2, 2.3]) (1, [3.1, 3.2, 3.3]); -- { serverError INCORRECT_DATA }
-DROP TABLE tab;
-
 SELECT 'Issue #52258: Empty Arrays or Arrays with default values are rejected';
 
-CREATE TABLE tab (id UInt64, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance')) ENGINE = MergeTree() ORDER BY id;
+SELECT '- Annoy';
+
+CREATE TABLE tab (id UInt64, vec Array(Float32), INDEX idx vec TYPE annoy()) ENGINE = MergeTree() ORDER BY (id);
 INSERT INTO tab VALUES (1, []); -- { serverError INCORRECT_DATA }
 INSERT INTO tab (id) VALUES (1); -- { serverError INCORRECT_DATA }
 DROP TABLE tab;
 
+CREATE TABLE tab (id UInt64, vec Tuple(Float32, Float32), INDEX idx vec TYPE annoy()) ENGINE = MergeTree() ORDER BY (id);
+INSERT INTO tab (id) VALUES (1); -- works fine, takes on default tuple (0.0, 0.0)
+DROP TABLE tab;
+
+SELECT '- Usearch';
+
+CREATE TABLE tab (id UInt64, vec Array(Float32), INDEX idx vec TYPE usearch()) ENGINE = MergeTree() ORDER BY (id);
+INSERT INTO tab VALUES (1, []); -- { serverError INCORRECT_DATA }
+INSERT INTO tab (id) VALUES (1); -- { serverError INCORRECT_DATA }
+DROP TABLE tab;
+
+CREATE TABLE tab (id UInt64, vec Tuple(Float32, Float32), INDEX idx vec TYPE usearch()) ENGINE = MergeTree() ORDER BY (id);
+INSERT INTO tab (id) VALUES (1); -- works fine, takes on default tuple (0.0, 0.0)
+DROP TABLE tab;
+
 SELECT 'It is possible to create parts with different Array vector sizes but there will be an error at query time';
 
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance')) ENGINE = MergeTree ORDER BY id;
+SELECT '- Annoy';
+
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE annoy()) ENGINE = MergeTree ORDER BY id;
+SYSTEM STOP MERGES tab;
+INSERT INTO tab values (0, [2.2, 2.3]) (1, [3.1, 3.2]);
+INSERT INTO tab values (2, [2.2, 2.3, 2.4]) (3, [3.1, 3.2, 3.3]);
+
+WITH [0.0, 2.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab
+ORDER BY L2Distance(vec, reference_vec)
+LIMIT 3; -- { serverError SIZES_OF_ARRAYS_DONT_MATCH }
+
+DROP TABLE tab;
+
+SELECT '- Usearch';
+
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE usearch()) ENGINE = MergeTree ORDER BY id;
 SYSTEM STOP MERGES tab;
 INSERT INTO tab values (0, [2.2, 2.3]) (1, [3.1, 3.2]);
 INSERT INTO tab values (2, [2.2, 2.3, 2.4]) (3, [3.1, 3.2, 3.3]);
@@ -37,7 +70,9 @@ DROP TABLE tab;
 
 SELECT 'Correctness of index with > 1 mark';
 
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance')) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity_bytes = 0, min_rows_for_wide_part = 0, min_bytes_for_wide_part = 0, index_granularity = 8192; -- disable adaptive granularity due to bug
+SELECT '- Annoy';
+
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE annoy()) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity_bytes=0, min_rows_for_wide_part = 0, min_bytes_for_wide_part = 0, index_granularity=8192; -- disable adaptive granularity due to bug
 INSERT INTO tab SELECT number, [toFloat32(number), 0.0] from numbers(10000);
 
 WITH [1.0, 0.0] AS reference_vec
@@ -54,49 +89,57 @@ LIMIT 1;
 
 DROP TABLE tab;
 
-SELECT 'Issue #69085: Reference vector computed by a subquery';
+-- same, but with Tuples
+CREATE TABLE tab(id Int32, vec Tuple(Float32, Float32), INDEX idx vec TYPE annoy()) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity_bytes=0, min_rows_for_wide_part = 0, min_bytes_for_wide_part = 0, index_granularity=8192; -- disable adaptive granularity due to bug
+INSERT INTO tab SELECT number, (toFloat32(number), 0.0) from numbers(10000);
 
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'cosineDistance', 'f16', 0, 0, 0) GRANULARITY 2) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 3;
-INSERT INTO tab VALUES (0, [4.6, 2.3]), (1, [2.0, 3.2]), (2, [4.2, 3.4]), (3, [5.3, 2.9]), (4, [2.4, 5.2]), (5, [5.3, 2.3]), (6, [1.0, 9.3]), (7, [5.5, 4.7]), (8, [6.4, 3.5]), (9, [5.3, 2.5]), (10, [6.4, 3.4]), (11, [6.4, 3.2]);
-
--- works
-EXPLAIN indexes = 1
-WITH [0., 2.] AS reference_vec
-SELECT
-    id,
-    vec,
-    cosineDistance(vec, reference_vec) AS distance
+WITH (1.0, 0.0) AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
 FROM tab
-ORDER BY distance
-LIMIT 1
-SETTINGS enable_analyzer = 0;
+ORDER BY L2Distance(vec, reference_vec)
+LIMIT 1;
 
--- does not work
-EXPLAIN indexes = 1
-WITH (
-    SELECT vec
-    FROM tab
-    LIMIT 1
-) AS reference_vec
-SELECT
-    id,
-    vec,
-    cosineDistance(vec, reference_vec) AS distance
+WITH (9000.0, 0.0) AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
 FROM tab
-ORDER BY distance
-LIMIT 1
-SETTINGS enable_analyzer = 0;
+ORDER BY L2Distance(vec, reference_vec)
+LIMIT 1;
 
--- does not work as well
-EXPLAIN indexes = 1
-WITH (
-    SELECT [0., 2.]
-) AS reference_vec
-SELECT
-    id,
-    vec,
-    cosineDistance(vec, reference_vec) AS distance
+DROP TABLE tab;
+
+SELECT '- Usearch';
+
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE usearch()) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity_bytes=0, min_rows_for_wide_part = 0, min_bytes_for_wide_part = 0, index_granularity=8192; -- disable adaptive granularity due to bug
+INSERT INTO tab SELECT number, [toFloat32(number), 0.0] from numbers(10000);
+
+WITH [1.0, 0.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
 FROM tab
-ORDER BY distance
-LIMIT 1
-SETTINGS enable_analyzer = 0;
+ORDER BY L2Distance(vec, reference_vec)
+LIMIT 1;
+
+WITH [9000.0, 0.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab
+ORDER BY L2Distance(vec, reference_vec)
+LIMIT 1;
+
+DROP TABLE tab;
+
+-- same, but with Tuples
+CREATE TABLE tab(id Int32, vec Tuple(Float32, Float32), INDEX idx vec TYPE usearch()) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity_bytes=0, min_rows_for_wide_part = 0, min_bytes_for_wide_part = 0, index_granularity=8192; -- disable adaptive granularity due to bug
+INSERT INTO tab SELECT number, (toFloat32(number), 0.0) from numbers(10000);
+
+WITH (1.0, 0.0) AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab
+ORDER BY L2Distance(vec, reference_vec)
+LIMIT 1;
+
+WITH (9000.0, 0.0) AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab
+ORDER BY L2Distance(vec, reference_vec)
+LIMIT 1;
+
+DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02354_vector_search_default_granularity.reference b/tests/queries/0_stateless/02354_vector_search_default_granularity.reference
index ab3cc71ff6b..2f97ed72c52 100644
--- a/tests/queries/0_stateless/02354_vector_search_default_granularity.reference
+++ b/tests/queries/0_stateless/02354_vector_search_default_granularity.reference
@@ -1,2 +1,7 @@
+Test the default index granularity for vector search indexes (CREATE TABLE AND ALTER TABLE), should be 100 million for Annoy and USearch
+- Annoy
+100000000
+100000000
+- Usearch
 100000000
 100000000
diff --git a/tests/queries/0_stateless/02354_vector_search_default_granularity.sql b/tests/queries/0_stateless/02354_vector_search_default_granularity.sql
index acb69cb6ff8..f15554505f8 100644
--- a/tests/queries/0_stateless/02354_vector_search_default_granularity.sql
+++ b/tests/queries/0_stateless/02354_vector_search_default_granularity.sql
@@ -1,18 +1,35 @@
--- Tags: no-fasttest, no-ordinary-database
+-- Tags: no-fasttest, no-ubsan, no-cpu-aarch64, no-ordinary-database, no-asan
 
--- Tests that vector search indexes use a (non-standard) index granularity of 100 mio by default.
+-- Tests vector search in ClickHouse, i.e. Annoy and Usearch indexes. Both index types share similarities in implementation and usage,
+-- therefore they are tested in a single file.
 
-SET allow_experimental_vector_similarity_index = 1;
+-- This file contains tests for the non-standard default granularity of vector search indexes.
+
+SET allow_experimental_annoy_index = 1;
+SET allow_experimental_usearch_index = 1;
+
+SELECT 'Test the default index granularity for vector search indexes (CREATE TABLE AND ALTER TABLE), should be 100 million for Annoy and USearch';
+
+SELECT '- Annoy';
 
--- After CREATE TABLE
 DROP TABLE IF EXISTS tab;
-CREATE TABLE tab (id Int32, vec Array(Float32), INDEX idx(vec) TYPE vector_similarity('hnsw', 'L2Distance')) ENGINE = MergeTree ORDER BY id;
-SELECT granularity FROM system.data_skipping_indices WHERE database = currentDatabase() AND table = 'tab' AND name = 'idx';
-
--- After ALTER TABLE
-DROP TABLE tab;
-CREATE TABLE tab (id Int32, vec Array(Float32)) ENGINE = MergeTree ORDER BY id;
-ALTER TABLE tab ADD INDEX idx(vec) TYPE vector_similarity('hnsw', 'L2Distance');
+CREATE TABLE tab (id Int32, vec Array(Float32), INDEX idx(vec) TYPE annoy) ENGINE=MergeTree ORDER BY id;
+SELECT granularity FROM system.data_skipping_indices WHERE database = currentDatabase() AND table = 'tab' AND name = 'idx';
+
+DROP TABLE tab;
+CREATE TABLE tab (id Int32, vec Array(Float32)) ENGINE=MergeTree ORDER BY id;
+ALTER TABLE tab ADD INDEX idx(vec) TYPE annoy;
+SELECT granularity FROM system.data_skipping_indices WHERE database = currentDatabase() AND table = 'tab' AND name = 'idx';
+
+SELECT '- Usearch';
+
+DROP TABLE tab;
+CREATE TABLE tab (id Int32, vec Array(Float32), INDEX idx(vec) TYPE usearch) ENGINE=MergeTree ORDER BY id;
+SELECT granularity FROM system.data_skipping_indices WHERE database = currentDatabase() AND table = 'tab' AND name = 'idx';
+
+DROP TABLE tab;
+CREATE TABLE tab (id Int32, vec Array(Float32)) ENGINE=MergeTree ORDER BY id;
+ALTER TABLE tab ADD INDEX idx(vec) TYPE usearch;
 SELECT granularity FROM system.data_skipping_indices WHERE database = currentDatabase() AND table = 'tab' AND name = 'idx';
 
 DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02354_vector_search_detach_attach.reference b/tests/queries/0_stateless/02354_vector_search_detach_attach.reference
deleted file mode 100644
index 80eb091922e..00000000000
--- a/tests/queries/0_stateless/02354_vector_search_detach_attach.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-5	[0,2]	0
-6	[0,2.1]	0.09999990463256836
-7	[0,2.2]	0.20000004768371582
diff --git a/tests/queries/0_stateless/02354_vector_search_detach_attach.sql b/tests/queries/0_stateless/02354_vector_search_detach_attach.sql
deleted file mode 100644
index f92eaddbbed..00000000000
--- a/tests/queries/0_stateless/02354_vector_search_detach_attach.sql
+++ /dev/null
@@ -1,20 +0,0 @@
--- Tags: no-fasttest, no-ordinary-database
-
--- Tests that vector similarity indexes can be detached/attached.
-
-SET allow_experimental_vector_similarity_index = 1;
-
-DROP TABLE IF EXISTS tab;
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance')) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 8192;
-INSERT INTO tab VALUES (0, [1.0, 0.0]), (1, [1.1, 0.0]), (2, [1.2, 0.0]), (3, [1.3, 0.0]), (4, [1.4, 0.0]), (5, [0.0, 2.0]), (6, [0.0, 2.1]), (7, [0.0, 2.2]), (8, [0.0, 2.3]), (9, [0.0, 2.4]);
-
-DETACH TABLE tab SYNC;
-ATTACH TABLE tab;
-
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab
-ORDER BY L2Distance(vec, reference_vec)
-LIMIT 3;
-
-DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02354_vector_search_experimental_setting.reference b/tests/queries/0_stateless/02354_vector_search_experimental_setting.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/02354_vector_search_experimental_setting.sql b/tests/queries/0_stateless/02354_vector_search_experimental_setting.sql
deleted file mode 100644
index cce838f8e02..00000000000
--- a/tests/queries/0_stateless/02354_vector_search_experimental_setting.sql
+++ /dev/null
@@ -1,32 +0,0 @@
--- Tags: no-fasttest, no-ordinary-database
-
--- Tests that CREATE TABLE and ADD INDEX respect setting 'allow_experimental_vector_similarity_index'.
-
-DROP TABLE IF EXISTS tab;
-
--- Test CREATE TABLE
-
-SET allow_experimental_vector_similarity_index = 0;
-CREATE TABLE tab (id UInt32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance')) ENGINE = MergeTree ORDER BY tuple(); -- { serverError SUPPORT_IS_DISABLED }
-
-SET allow_experimental_vector_similarity_index = 1;
-CREATE TABLE tab (id UInt32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance')) ENGINE = MergeTree ORDER BY tuple();
-DROP TABLE tab;
-
--- Test ADD INDEX
-
-CREATE TABLE tab (id UInt32, vec Array(Float32)) ENGINE = MergeTree ORDER BY tuple();
-
-SET allow_experimental_vector_similarity_index = 0;
-ALTER TABLE tab ADD INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance');  -- { serverError SUPPORT_IS_DISABLED }
-
-SET allow_experimental_vector_similarity_index = 1;
-ALTER TABLE tab ADD INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance');
-
--- Other index DDL must work regardless of the setting
-SET allow_experimental_vector_similarity_index = 0;
-ALTER TABLE tab MATERIALIZE INDEX idx;
--- ALTER TABLE tab CLEAR INDEX idx; -- <-- Should work but doesn't w/o enabled setting. Unexpected but not terrible.
-ALTER TABLE tab DROP INDEX idx;
-
-DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02354_vector_search_index_creation_negative.reference b/tests/queries/0_stateless/02354_vector_search_index_creation_negative.reference
index 5963f4b5834..43bc49e8adc 100644
--- a/tests/queries/0_stateless/02354_vector_search_index_creation_negative.reference
+++ b/tests/queries/0_stateless/02354_vector_search_index_creation_negative.reference
@@ -1,7 +1,8 @@
-Two or six index arguments
-1st argument (method) must be String and hnsw
-2nd argument (distance function) must be String and L2Distance or cosineDistance
-3nd argument (quantization), if given, must be String and f32, f16, ...
-4nd argument (M), if given, must be UInt64 and > 1
+At most two index arguments
+1st argument (distance function) must be String
+Rejects unsupported distance functions
+2nd argument (Annoy: number of trees, USearch: scalar kind) must be UInt64 (Annoy) / String (Usearch)
+Rejects unsupported scalar kinds (only Usearch)
 Must be created on single column
-Must be created on Array(Float32) columns
+Must be created on Array(Float32) or Tuple(Float32, Float, ...) columns
+Rejects INSERTs of Arrays with different sizes
diff --git a/tests/queries/0_stateless/02354_vector_search_index_creation_negative.sql b/tests/queries/0_stateless/02354_vector_search_index_creation_negative.sql
index e8e6aaee1b2..6a4d6448629 100644
--- a/tests/queries/0_stateless/02354_vector_search_index_creation_negative.sql
+++ b/tests/queries/0_stateless/02354_vector_search_index_creation_negative.sql
@@ -1,40 +1,63 @@
--- Tags: no-fasttest, no-ordinary-database
+-- Tags: no-fasttest, no-ubsan, no-cpu-aarch64, no-ordinary-database, no-asan
 
--- Tests that various conditions are checked during creation of vector search indexes.
+-- Tests vector search in ClickHouse, i.e. Annoy and Usearch indexes. Both index types share similarities in implementation and usage,
+-- therefore they are tested in a single file.
 
-SET allow_experimental_vector_similarity_index = 1;
+-- This file tests that various conditions are checked during creation of vector search indexes.
+
+SET allow_experimental_annoy_index = 1;
+SET allow_experimental_usearch_index = 1;
 
 DROP TABLE IF EXISTS tab;
 
-SELECT 'Two or six index arguments';
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_QUERY }
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity()) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_QUERY }
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('cant_have_one_arg')) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_QUERY }
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('cant', 'have', 'three_args')) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_QUERY }
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('cant', 'have', 'more', 'than', 'six', 'args', '!')) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_QUERY }
+SELECT 'At most two index arguments';
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE annoy('too', 'many', 'arguments')) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_QUERY }
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE usearch('too', 'many', 'args')) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_QUERY }
 
-SELECT '1st argument (method) must be String and hnsw';
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity(3, 'L2Distance')) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_QUERY }
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('not_hnsw', 'L2Distance')) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_DATA }
+SELECT '1st argument (distance function) must be String';
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE annoy(3)) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_QUERY }
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE usearch(3)) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_QUERY }
 
-SELECT '2nd argument (distance function) must be String and L2Distance or cosineDistance';
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 3)) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_QUERY }
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'invalid_distance')) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_DATA }
+SELECT 'Rejects unsupported distance functions';
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE annoy('invalidDistance')) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_DATA }
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE usearch('invalidDistance')) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_DATA }
 
-SELECT '3nd argument (quantization), if given, must be String and f32, f16, ...';
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance', 1, 1, 1, 1)) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_QUERY }
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance', 'invalid', 2, 1, 1)) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_DATA }
-SELECT '4nd argument (M), if given, must be UInt64 and > 1';
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance', 'f32', 'invalid', 1, 1)) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_QUERY }
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance', 'f32', 1, 1, 1)) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_DATA }
+SELECT '2nd argument (Annoy: number of trees, USearch: scalar kind) must be UInt64 (Annoy) / String (Usearch)';
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE annoy('L2Distance', 'not an UInt64')) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_QUERY }
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE usearch(3)) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_QUERY }
+
+SELECT 'Rejects unsupported scalar kinds (only Usearch)';
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE usearch('L2Distance', 'invalidKind')) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_DATA }
 
 SELECT 'Must be created on single column';
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx (vec, id) TYPE vector_similarity('hnsw', 'L2Distance')) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_NUMBER_OF_COLUMNS }
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx (vec, id) TYPE annoy()) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_NUMBER_OF_COLUMNS }
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx (vec, id) TYPE usearch()) ENGINE = MergeTree ORDER BY id; -- { serverError INCORRECT_NUMBER_OF_COLUMNS }
+
+SELECT 'Must be created on Array(Float32) or Tuple(Float32, Float, ...) columns';
 
-SELECT 'Must be created on Array(Float32) columns';
 SET allow_suspicious_low_cardinality_types = 1;
-CREATE TABLE tab(id Int32, vec UInt64, INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance')) ENGINE = MergeTree ORDER BY id; -- { serverError ILLEGAL_COLUMN }
-CREATE TABLE tab(id Int32, vec Float32, INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance')) ENGINE = MergeTree ORDER BY id; -- { serverError ILLEGAL_COLUMN }
-CREATE TABLE tab(id Int32, vec Array(UInt64), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance')) ENGINE = MergeTree ORDER BY id; -- { serverError ILLEGAL_COLUMN }
-CREATE TABLE tab(id Int32, vec LowCardinality(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance')) ENGINE = MergeTree ORDER BY id; -- { serverError ILLEGAL_COLUMN }
-CREATE TABLE tab(id Int32, vec Nullable(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance')) ENGINE = MergeTree ORDER BY id; -- { serverError ILLEGAL_COLUMN }
+
+CREATE TABLE tab(id Int32, vec Float32, INDEX idx vec TYPE annoy()) ENGINE = MergeTree ORDER BY id; -- { serverError ILLEGAL_COLUMN }
+CREATE TABLE tab(id Int32, vec Float32, INDEX idx vec TYPE usearch()) ENGINE = MergeTree ORDER BY id; -- { serverError ILLEGAL_COLUMN }
+
+CREATE TABLE tab(id Int32, vec Array(Float64), INDEX idx vec TYPE annoy()) ENGINE = MergeTree ORDER BY id; -- { serverError ILLEGAL_COLUMN }
+CREATE TABLE tab(id Int32, vec Array(Float64), INDEX idx vec TYPE usearch()) ENGINE = MergeTree ORDER BY id; -- { serverError ILLEGAL_COLUMN }
+
+CREATE TABLE tab(id Int32, vec Tuple(Float64), INDEX idx vec TYPE annoy()) ENGINE = MergeTree ORDER BY id; -- { serverError ILLEGAL_COLUMN }
+CREATE TABLE tab(id Int32, vec Tuple(Float64), INDEX idx vec TYPE usearch()) ENGINE = MergeTree ORDER BY id; -- { serverError ILLEGAL_COLUMN }
+
+CREATE TABLE tab(id Int32, vec LowCardinality(Float32), INDEX idx vec TYPE annoy()) ENGINE = MergeTree ORDER BY id; -- { serverError ILLEGAL_COLUMN }
+CREATE TABLE tab(id Int32, vec LowCardinality(Float32), INDEX idx vec TYPE usearch()) ENGINE = MergeTree ORDER BY id; -- { serverError ILLEGAL_COLUMN }
+
+CREATE TABLE tab(id Int32, vec Nullable(Float32), INDEX idx vec TYPE annoy()) ENGINE = MergeTree ORDER BY id; -- { serverError ILLEGAL_COLUMN }
+CREATE TABLE tab(id Int32, vec Nullable(Float32), INDEX idx vec TYPE usearch()) ENGINE = MergeTree ORDER BY id; -- { serverError ILLEGAL_COLUMN }
+
+SELECT 'Rejects INSERTs of Arrays with different sizes';
+
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE annoy()) ENGINE = MergeTree ORDER BY id;
+INSERT INTO tab values (0, [2.2, 2.3]) (1, [3.1, 3.2, 3.3]); -- { serverError INCORRECT_DATA }
+DROP TABLE tab;
+
+CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE usearch()) ENGINE = MergeTree ORDER BY id;
+INSERT INTO tab values (0, [2.2, 2.3]) (1, [3.1, 3.2, 3.3]); -- { serverError INCORRECT_DATA }
+DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02354_vector_search_legacy_index_compatibility.reference b/tests/queries/0_stateless/02354_vector_search_legacy_index_compatibility.reference
deleted file mode 100644
index 030bfa9b1bd..00000000000
--- a/tests/queries/0_stateless/02354_vector_search_legacy_index_compatibility.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-Annoy
-Usearch
diff --git a/tests/queries/0_stateless/02354_vector_search_legacy_index_compatibility.sql b/tests/queries/0_stateless/02354_vector_search_legacy_index_compatibility.sql
deleted file mode 100644
index 0889aa74f7a..00000000000
--- a/tests/queries/0_stateless/02354_vector_search_legacy_index_compatibility.sql
+++ /dev/null
@@ -1,43 +0,0 @@
--- Indexes of type 'annoy' or 'usearch' are no longer supported.
--- Test what happens when ClickHouse encounters tables with the old index type.
-
-DROP TABLE IF EXISTS tab;
-
-SELECT 'Annoy';
-
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX vec_idx vec TYPE annoy()) ENGINE = MergeTree ORDER BY id;
-
-INSERT INTO tab VALUES (0, [1.0, 0.0]), (1, [1.1, 0.0]), (2, [1.2, 0.0]), (3, [1.3, 0.0]), (4, [1.4, 0.0]), (5, [0.0, 2.0]), (6, [0.0, 2.1]), (7, [0.0, 2.2]), (8, [0.0, 2.3]), (9, [0.0, 2.4]); -- { serverError ILLEGAL_INDEX }
-
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab
-ORDER BY L2Distance(vec, reference_vec)
-LIMIT 3;
--- (*) The search succeeds because the index contains no data (i.e. some shortcut)
--- If it had data (can't really test in SQL tests ...), this statement would also return an error, trust me.
-
--- Detach and attach should work.
-DETACH TABLE tab;
-ATTACH TABLE tab;
-
-DROP TABLE tab;
-
-SELECT 'Usearch';
-
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX vec_idx vec TYPE usearch()) ENGINE = MergeTree ORDER BY id;
-
-INSERT INTO tab VALUES (0, [1.0, 0.0]), (1, [1.1, 0.0]), (2, [1.2, 0.0]), (3, [1.3, 0.0]), (4, [1.4, 0.0]), (5, [0.0, 2.0]), (6, [0.0, 2.1]), (7, [0.0, 2.2]), (8, [0.0, 2.3]), (9, [0.0, 2.4]); -- { serverError ILLEGAL_INDEX }
-
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab
-ORDER BY L2Distance(vec, reference_vec)
-LIMIT 3;
--- see above: (*)
-
--- Detach and attach should work.
-DETACH TABLE tab;
-ATTACH TABLE tab;
-
-DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02354_vector_search_multiple_indexes.reference b/tests/queries/0_stateless/02354_vector_search_multiple_indexes.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/02354_vector_search_multiple_indexes.sql b/tests/queries/0_stateless/02354_vector_search_multiple_indexes.sql
deleted file mode 100644
index f1cfc041233..00000000000
--- a/tests/queries/0_stateless/02354_vector_search_multiple_indexes.sql
+++ /dev/null
@@ -1,14 +0,0 @@
--- Tags: no-fasttest, no-ordinary-database
-
--- Tests that multiple vector similarity indexes can be created on the same column (even if that makes no sense)
-
-SET allow_experimental_vector_similarity_index = 1;
-
-DROP TABLE IF EXISTS tab;
-CREATE TABLE tab (id Int32, vec Array(Float32), PRIMARY KEY id, INDEX vec_idx(vec) TYPE vector_similarity('hnsw', 'L2Distance'));
-
-ALTER TABLE tab ADD INDEX idx(vec) TYPE minmax;
-ALTER TABLE tab ADD INDEX vec_idx1(vec) TYPE vector_similarity('hnsw', 'cosineDistance');
-ALTER TABLE tab ADD INDEX vec_idx2(vec) TYPE vector_similarity('hnsw', 'L2Distance'); -- silly but creating the same index also works for non-vector indexes ...
-
-DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02354_vector_search_queries.reference b/tests/queries/0_stateless/02354_vector_search_queries.reference
index e42f91d05dc..41c1915ecc3 100644
--- a/tests/queries/0_stateless/02354_vector_search_queries.reference
+++ b/tests/queries/0_stateless/02354_vector_search_queries.reference
@@ -1,12 +1,41 @@
-10 rows, index_granularity = 8192, GRANULARITY = 1 million --> 1 granule, 1 indexed block
+ARRAY, 10 rows, index_granularity = 8192, GRANULARITY = 1 million --> 1 granule, 1 indexed block
+- Annoy: WHERE-type
 5	[0,2]	0
 6	[0,2.1]	0.09999990463256836
 7	[0,2.2]	0.20000004768371582
+- Annoy: ORDER-BY-type
+5	[0,2]	0
+6	[0,2.1]	0.09999990463256836
+7	[0,2.2]	0.20000004768371582
+- Usearch: WHERE-type
+5	[0,2]	0
+6	[0,2.1]	0.09999990463256836
+7	[0,2.2]	0.20000004768371582
+- Usearch: ORDER-BY-type
+5	[0,2]	0
+6	[0,2.1]	0.09999990463256836
+7	[0,2.2]	0.20000004768371582
+- Annoy: WHERE-type, EXPLAIN
+Expression ((Projection + Before ORDER BY))
+  Limit (preliminary LIMIT (without OFFSET))
+    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))
     Sorting (Sorting for ORDER BY)
       Expression (Before ORDER BY)
-        ReadFromMergeTree (default.tab)
+        ReadFromMergeTree (default.tab_annoy)
         Indexes:
           PrimaryKey
             Condition: true
@@ -14,151 +43,158 @@ Expression (Projection)
             Granules: 1/1
           Skip
             Name: idx
-            Description: vector_similarity GRANULARITY 100000000
+            Description: annoy GRANULARITY 100000000
             Parts: 1/1
             Granules: 1/1
-12 rows, index_granularity = 3, GRANULARITY = 2 --> 4 granules, 2 indexed block
+- Usearch: WHERE-type, EXPLAIN
+Expression ((Projection + Before ORDER BY))
+  Limit (preliminary LIMIT (without OFFSET))
+    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))
+    Sorting (Sorting for ORDER BY)
+      Expression (Before ORDER BY)
+        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
+ARRAY vectors, 12 rows, index_granularity = 3, GRANULARITY = 2 --> 4 granules, 2 indexed block
+- Annoy: WHERE-type
 6	[0,2]	0
 7	[0,2.1]	0.09999990463256836
 8	[0,2.2]	0.20000004768371582
-Expression (Projection)
-  Limit (preliminary LIMIT (without OFFSET))
-    Sorting (Sorting for ORDER BY)
-      Expression (Before ORDER BY)
-        ReadFromMergeTree (default.tab)
-        Indexes:
-          PrimaryKey
-            Condition: true
-            Parts: 1/1
-            Granules: 4/4
-          Skip
-            Name: idx
-            Description: vector_similarity GRANULARITY 2
-            Parts: 1/1
-            Granules: 2/4
-Special cases
--- Non-default metric, M, ef_construction, ef_search
-6	[1,9.3]	0.005731362878640178
-1	[2,3.2]	0.15200169244542905
-7	[5.5,4.7]	0.3503476876550442
-Expression (Projection)
-  Limit (preliminary LIMIT (without OFFSET))
-    Sorting (Sorting for ORDER BY)
-      Expression (Before ORDER BY)
-        ReadFromMergeTree (default.tab)
-        Indexes:
-          PrimaryKey
-            Condition: true
-            Parts: 1/1
-            Granules: 4/4
-          Skip
-            Name: idx
-            Description: vector_similarity GRANULARITY 2
-            Parts: 1/1
-            Granules: 2/4
--- Setting "max_limit_for_ann_queries"
-Expression (Projection)
-  Limit (preliminary LIMIT (without OFFSET))
-    Sorting (Sorting for ORDER BY)
-      Expression (Before ORDER BY)
-        ReadFromMergeTree (default.tab)
-        Indexes:
-          PrimaryKey
-            Condition: true
-            Parts: 1/1
-            Granules: 4/4
--- Non-default quantization
-1	[2,3.2]	2.3323807824711897
-2	[4.2,3.4]	4.427188573446585
-0	[4.6,2.3]	4.609772130377966
-Expression (Projection)
-  Limit (preliminary LIMIT (without OFFSET))
-    Sorting (Sorting for ORDER BY)
-      Expression (Before ORDER BY)
-        ReadFromMergeTree (default.tab_f64)
-        Indexes:
-          PrimaryKey
-            Condition: true
-            Parts: 1/1
-            Granules: 4/4
-          Skip
-            Name: idx
-            Description: vector_similarity GRANULARITY 2
-            Parts: 1/1
-            Granules: 2/4
-1	[2,3.2]	2.3323807824711897
-2	[4.2,3.4]	4.427188573446585
-0	[4.6,2.3]	4.609772130377966
-Expression (Projection)
-  Limit (preliminary LIMIT (without OFFSET))
-    Sorting (Sorting for ORDER BY)
-      Expression (Before ORDER BY)
-        ReadFromMergeTree (default.tab_f32)
-        Indexes:
-          PrimaryKey
-            Condition: true
-            Parts: 1/1
-            Granules: 4/4
-          Skip
-            Name: idx
-            Description: vector_similarity GRANULARITY 2
-            Parts: 1/1
-            Granules: 2/4
-1	[2,3.2]	2.3323807824711897
-2	[4.2,3.4]	4.427188573446585
-0	[4.6,2.3]	4.609772130377966
-Expression (Projection)
-  Limit (preliminary LIMIT (without OFFSET))
-    Sorting (Sorting for ORDER BY)
-      Expression (Before ORDER BY)
-        ReadFromMergeTree (default.tab_f16)
-        Indexes:
-          PrimaryKey
-            Condition: true
-            Parts: 1/1
-            Granules: 4/4
-          Skip
-            Name: idx
-            Description: vector_similarity GRANULARITY 2
-            Parts: 1/1
-            Granules: 2/4
-1	[2,3.2]	2.3323807824711897
-2	[4.2,3.4]	4.427188573446585
-0	[4.6,2.3]	4.609772130377966
-Expression (Projection)
-  Limit (preliminary LIMIT (without OFFSET))
-    Sorting (Sorting for ORDER BY)
-      Expression (Before ORDER BY)
-        ReadFromMergeTree (default.tab_bf16)
-        Indexes:
-          PrimaryKey
-            Condition: true
-            Parts: 1/1
-            Granules: 4/4
-          Skip
-            Name: idx
-            Description: vector_similarity GRANULARITY 2
-            Parts: 1/1
-            Granules: 2/4
-1	[2,3.2]	2.3323807824711897
-2	[4.2,3.4]	4.427188573446585
-0	[4.6,2.3]	4.609772130377966
-Expression (Projection)
-  Limit (preliminary LIMIT (without OFFSET))
-    Sorting (Sorting for ORDER BY)
-      Expression (Before ORDER BY)
-        ReadFromMergeTree (default.tab_i8)
-        Indexes:
-          PrimaryKey
-            Condition: true
-            Parts: 1/1
-            Granules: 4/4
-          Skip
-            Name: idx
-            Description: vector_similarity GRANULARITY 2
-            Parts: 1/1
-            Granules: 2/4
--- Index on Array(Float64) column
+- Annoy: ORDER-BY-type
 6	[0,2]	0
-7	[0,2.1]	0.10000000000000009
-8	[0,2.2]	0.20000000000000018
+7	[0,2.1]	0.09999990463256836
+8	[0,2.2]	0.20000004768371582
+- Usearch: WHERE-type
+6	[0,2]	0
+7	[0,2.1]	0.09999990463256836
+8	[0,2.2]	0.20000004768371582
+- Usearch: ORDER-BY-type
+6	[0,2]	0
+7	[0,2.1]	0.09999990463256836
+8	[0,2.2]	0.20000004768371582
+- Annoy: WHERE-type, EXPLAIN
+Expression ((Projection + Before ORDER BY))
+  Limit (preliminary LIMIT (without OFFSET))
+    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))
+    Sorting (Sorting for ORDER BY)
+      Expression (Before ORDER BY)
+        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: 2/4
+- Usearch: WHERE-type, EXPLAIN
+Expression ((Projection + Before ORDER BY))
+  Limit (preliminary LIMIT (without OFFSET))
+    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))
+    Sorting (Sorting for ORDER BY)
+      Expression (Before ORDER BY)
+        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: 2/4
+TUPLE vectors and special cases
+- Annoy: WHERE-type
+0	(4.6,2.3)	0.5527864045000421
+1	(2,3.2)	0.15200169244542905
+2	(4.2,3.4)	0.37080174340866845
+- Annoy: ORDER-BY-type
+6	(1,9.3)	0.005731362878640178
+1	(2,3.2)	0.15200169244542905
+7	(5.5,4.7)	0.3503476876550442
+- Usearch: WHERE-type
+0	(4.6,2.3)	0.5527864045000421
+1	(2,3.2)	0.15200169244542905
+2	(4.2,3.4)	0.37080174340866845
+- Usearch: ORDER-BY-type
+6	(1,9.3)	0.005731362878640178
+1	(2,3.2)	0.15200169244542905
+7	(5.5,4.7)	0.3503476876550442
+- Special case: MaximumDistance is negative
+- Special case: MaximumDistance is negative
+- Special case: setting "annoy_index_search_k_nodes"
+- Special case: setting "max_limit_for_ann_queries"
+Expression (Projection)
+  Limit (preliminary LIMIT (without OFFSET))
+    Sorting (Sorting for ORDER BY)
+      Expression (Before ORDER BY)
+        ReadFromMergeTree (default.tab_annoy)
+        Indexes:
+          PrimaryKey
+            Condition: true
+            Parts: 1/1
+            Granules: 4/4
+- Special case: setting "max_limit_for_ann_queries"
+Expression (Projection)
+  Limit (preliminary LIMIT (without OFFSET))
+    Sorting (Sorting for ORDER BY)
+      Expression (Before ORDER BY)
+        ReadFromMergeTree (default.tab_usearch)
+        Indexes:
+          PrimaryKey
+            Condition: true
+            Parts: 1/1
+            Granules: 4/4
diff --git a/tests/queries/0_stateless/02354_vector_search_queries.sql b/tests/queries/0_stateless/02354_vector_search_queries.sql
index 8769e5c56bb..64051aa8544 100644
--- a/tests/queries/0_stateless/02354_vector_search_queries.sql
+++ b/tests/queries/0_stateless/02354_vector_search_queries.sql
@@ -1,177 +1,238 @@
--- Tags: no-fasttest, no-ordinary-database
+-- Tags: no-fasttest, no-ubsan, no-cpu-aarch64, no-ordinary-database, no-asan
 
--- Tests various simple approximate nearest neighborhood (ANN) queries that utilize vector search indexes.
+-- Tests vector search in ClickHouse, i.e. Annoy and Usearch indexes. Both index types share similarities in implementation and usage,
+-- therefore they are tested in a single file.
 
-SET allow_experimental_vector_similarity_index = 1;
+-- This file tests various simple approximate nearest neighborhood (ANN) queries that utilize vector search indexes.
 
-SET enable_analyzer = 0;
+SET allow_experimental_annoy_index = 1;
+SET allow_experimental_usearch_index = 1;
 
-SELECT '10 rows, index_granularity = 8192, GRANULARITY = 1 million --> 1 granule, 1 indexed block';
+SELECT 'ARRAY, 10 rows, index_granularity = 8192, GRANULARITY = 1 million --> 1 granule, 1 indexed block';
 
-DROP TABLE IF EXISTS tab;
+DROP TABLE IF EXISTS tab_annoy;
+DROP TABLE IF EXISTS tab_usearch;
 
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance')) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 8192;
-INSERT INTO tab VALUES (0, [1.0, 0.0]), (1, [1.1, 0.0]), (2, [1.2, 0.0]), (3, [1.3, 0.0]), (4, [1.4, 0.0]), (5, [0.0, 2.0]), (6, [0.0, 2.1]), (7, [0.0, 2.2]), (8, [0.0, 2.3]), (9, [0.0, 2.4]);
+CREATE TABLE tab_annoy(id Int32, vec Array(Float32), INDEX idx vec TYPE annoy()) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 8192;
+INSERT INTO tab_annoy VALUES (0, [1.0, 0.0]), (1, [1.1, 0.0]), (2, [1.2, 0.0]), (3, [1.3, 0.0]), (4, [1.4, 0.0]), (5, [0.0, 2.0]), (6, [0.0, 2.1]), (7, [0.0, 2.2]), (8, [0.0, 2.3]), (9, [0.0, 2.4]);
+
+CREATE TABLE tab_usearch(id Int32, vec Array(Float32), INDEX idx vec TYPE usearch()) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 8192;
+INSERT INTO tab_usearch VALUES (0, [1.0, 0.0]), (1, [1.1, 0.0]), (2, [1.2, 0.0]), (3, [1.3, 0.0]), (4, [1.4, 0.0]), (5, [0.0, 2.0]), (6, [0.0, 2.1]), (7, [0.0, 2.2]), (8, [0.0, 2.3]), (9, [0.0, 2.4]);
 
 
+SELECT '- Annoy: WHERE-type';
 WITH [0.0, 2.0] AS reference_vec
 SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab
+FROM tab_annoy
+WHERE L2Distance(vec, reference_vec) < 1.0
+LIMIT 3;
+
+SELECT '- Annoy: ORDER-BY-type';
+WITH [0.0, 2.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab_annoy
 ORDER BY L2Distance(vec, reference_vec)
 LIMIT 3;
 
-EXPLAIN indexes = 1
+SELECT '- Usearch: WHERE-type';
 WITH [0.0, 2.0] AS reference_vec
 SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab
+FROM tab_usearch
+WHERE L2Distance(vec, reference_vec) < 1.0
+LIMIT 3;
+
+SELECT '- Usearch: ORDER-BY-type';
+WITH [0.0, 2.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab_usearch
 ORDER BY L2Distance(vec, reference_vec)
 LIMIT 3;
 
-DROP TABLE tab;
-
-
-SELECT '12 rows, index_granularity = 3, GRANULARITY = 2 --> 4 granules, 2 indexed block';
-
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance') GRANULARITY 2) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 3;
-INSERT INTO tab VALUES (0, [1.0, 0.0]), (1, [1.1, 0.0]), (2, [1.2, 0.0]), (3, [1.3, 0.0]), (4, [1.4, 0.0]), (5, [1.5, 0.0]), (6, [0.0, 2.0]), (7, [0.0, 2.1]), (8, [0.0, 2.2]), (9, [0.0, 2.3]), (10, [0.0, 2.4]), (11, [0.0, 2.5]);
-
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab
-ORDER BY L2Distance(vec, reference_vec)
-LIMIT 3;
-
-EXPLAIN indexes = 1
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab
-ORDER BY L2Distance(vec, reference_vec)
-LIMIT 3;
-
-DROP TABLE tab;
-
-
-SELECT 'Special cases'; -- Not a systematic test, just to check that no bad things happen.
-
-SELECT '-- Non-default metric, M, ef_construction, ef_search';
-CREATE TABLE tab(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'cosineDistance', 'f32', 42, 99, 66) GRANULARITY 2) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 3;
-INSERT INTO tab VALUES (0, [4.6, 2.3]), (1, [2.0, 3.2]), (2, [4.2, 3.4]), (3, [5.3, 2.9]), (4, [2.4, 5.2]), (5, [5.3, 2.3]), (6, [1.0, 9.3]), (7, [5.5, 4.7]), (8, [6.4, 3.5]), (9, [5.3, 2.5]), (10, [6.4, 3.4]), (11, [6.4, 3.2]);
-
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, cosineDistance(vec, reference_vec)
-FROM tab
-ORDER BY cosineDistance(vec, reference_vec)
-LIMIT 3;
-
-EXPLAIN indexes = 1
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, cosineDistance(vec, reference_vec)
-FROM tab
-ORDER BY cosineDistance(vec, reference_vec)
-LIMIT 3;
-
-SELECT '-- Setting "max_limit_for_ann_queries"';
+SELECT '- Annoy: WHERE-type, EXPLAIN';
 EXPLAIN indexes=1
-WITH [0.0, 2.0] as reference_vec
+WITH [0.0, 2.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab_annoy
+WHERE L2Distance(vec, reference_vec) < 1.0
+LIMIT 3;
+
+SELECT '- Annoy: ORDER-BY-type, EXPLAIN';
+EXPLAIN indexes=1
+WITH [0.0, 2.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab_annoy
+ORDER BY L2Distance(vec, reference_vec)
+LIMIT 3;
+
+SELECT '- Usearch: WHERE-type, EXPLAIN';
+EXPLAIN indexes=1
+WITH [0.0, 2.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab_usearch
+WHERE L2Distance(vec, reference_vec) < 1.0
+LIMIT 3;
+
+SELECT '- Usearch: ORDER-BY-type, EXPLAIN';
+EXPLAIN indexes=1
+WITH [0.0, 2.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab_usearch
+ORDER BY L2Distance(vec, reference_vec)
+LIMIT 3;
+
+DROP TABLE tab_annoy;
+DROP TABLE tab_usearch;
+
+
+SELECT 'ARRAY vectors, 12 rows, index_granularity = 3, GRANULARITY = 2 --> 4 granules, 2 indexed block';
+
+CREATE TABLE tab_annoy(id Int32, vec Array(Float32), INDEX idx vec TYPE annoy() GRANULARITY 2) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 3;
+INSERT INTO tab_annoy VALUES (0, [1.0, 0.0]), (1, [1.1, 0.0]), (2, [1.2, 0.0]), (3, [1.3, 0.0]), (4, [1.4, 0.0]), (5, [1.5, 0.0]), (6, [0.0, 2.0]), (7, [0.0, 2.1]), (8, [0.0, 2.2]), (9, [0.0, 2.3]), (10, [0.0, 2.4]), (11, [0.0, 2.5]);
+
+CREATE TABLE tab_usearch(id Int32, vec Array(Float32), INDEX idx vec TYPE usearch() GRANULARITY 2) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 3;
+INSERT INTO tab_usearch VALUES (0, [1.0, 0.0]), (1, [1.1, 0.0]), (2, [1.2, 0.0]), (3, [1.3, 0.0]), (4, [1.4, 0.0]), (5, [1.5, 0.0]), (6, [0.0, 2.0]), (7, [0.0, 2.1]), (8, [0.0, 2.2]), (9, [0.0, 2.3]), (10, [0.0, 2.4]), (11, [0.0, 2.5]);
+
+SELECT '- Annoy: WHERE-type';
+WITH [0.0, 2.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab_annoy
+WHERE L2Distance(vec, reference_vec) < 1.0
+LIMIT 3;
+
+SELECT '- Annoy: ORDER-BY-type';
+WITH [0.0, 2.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab_annoy
+ORDER BY L2Distance(vec, reference_vec)
+LIMIT 3;
+
+SELECT '- Usearch: WHERE-type';
+WITH [0.0, 2.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab_usearch
+WHERE L2Distance(vec, reference_vec) < 1.0
+LIMIT 3;
+
+SELECT '- Usearch: ORDER-BY-type';
+WITH [0.0, 2.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab_usearch
+ORDER BY L2Distance(vec, reference_vec)
+LIMIT 3;
+
+SELECT '- Annoy: WHERE-type, EXPLAIN';
+EXPLAIN indexes=1
+WITH [0.0, 2.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab_annoy
+WHERE L2Distance(vec, reference_vec) < 1.0
+LIMIT 3;
+
+SELECT '- Annoy: ORDER-BY-type, EXPLAIN';
+EXPLAIN indexes=1
+WITH [0.0, 2.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab_annoy
+ORDER BY L2Distance(vec, reference_vec)
+LIMIT 3;
+
+SELECT '- Usearch: WHERE-type, EXPLAIN';
+EXPLAIN indexes=1
+WITH [0.0, 2.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab_usearch
+WHERE L2Distance(vec, reference_vec) < 1.0
+LIMIT 3;
+
+SELECT '- Usearch: ORDER-BY-type, EXPLAIN';
+EXPLAIN indexes=1
+WITH [0.0, 2.0] AS reference_vec
+SELECT id, vec, L2Distance(vec, reference_vec)
+FROM tab_usearch
+ORDER BY L2Distance(vec, reference_vec)
+LIMIT 3;
+
+DROP TABLE tab_annoy;
+DROP TABLE tab_usearch;
+
+
+SELECT 'TUPLE vectors and special cases';
+-- Not a systematic test, just to check that no bad things happen.
+-- Just for jun, use metric = 'cosineDistance' (Annoy/Usearch), tree_count = 200 (Annoy), scalarKind = 'f64' (Usearch)
+
+CREATE TABLE tab_annoy(id Int32, vec Tuple(Float32, Float32), INDEX idx vec TYPE annoy('cosineDistance', 200) GRANULARITY 2) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 3;
+INSERT INTO tab_annoy VALUES (0, (4.6, 2.3)), (1, (2.0, 3.2)), (2, (4.2, 3.4)), (3, (5.3, 2.9)), (4, (2.4, 5.2)), (5, (5.3, 2.3)), (6, (1.0, 9.3)), (7, (5.5, 4.7)), (8, (6.4, 3.5)), (9, (5.3, 2.5)), (10, (6.4, 3.4)), (11, (6.4, 3.2));
+
+CREATE TABLE tab_usearch(id Int32, vec Tuple(Float32, Float32), INDEX idx vec TYPE usearch('cosineDistance', 'f64') GRANULARITY 2) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 3;
+INSERT INTO tab_usearch VALUES (0, (4.6, 2.3)), (1, (2.0, 3.2)), (2, (4.2, 3.4)), (3, (5.3, 2.9)), (4, (2.4, 5.2)), (5, (5.3, 2.3)), (6, (1.0, 9.3)), (7, (5.5, 4.7)), (8, (6.4, 3.5)), (9, (5.3, 2.5)), (10, (6.4, 3.4)), (11, (6.4, 3.2));
+
+SELECT '- Annoy: WHERE-type';
+WITH (0.0, 2.0) AS reference_vec
 SELECT id, vec, cosineDistance(vec, reference_vec)
-FROM tab
+FROM tab_annoy
+WHERE cosineDistance(vec, reference_vec) < 1.0
+LIMIT 3;
+
+SELECT '- Annoy: ORDER-BY-type';
+WITH (0.0, 2.0) AS reference_vec
+SELECT id, vec, cosineDistance(vec, reference_vec)
+FROM tab_annoy
+ORDER BY cosineDistance(vec, reference_vec)
+LIMIT 3;
+
+SELECT '- Usearch: WHERE-type';
+WITH (0.0, 2.0) AS reference_vec
+SELECT id, vec, cosineDistance(vec, reference_vec)
+FROM tab_usearch
+WHERE cosineDistance(vec, reference_vec) < 1.0
+LIMIT 3;
+
+SELECT '- Usearch: ORDER-BY-type';
+WITH (0.0, 2.0) AS reference_vec
+SELECT id, vec, cosineDistance(vec, reference_vec)
+FROM tab_usearch
+ORDER BY cosineDistance(vec, reference_vec)
+LIMIT 3;
+
+SELECT '- Special case: MaximumDistance is negative';
+WITH (0.0, 2.0) as reference_vec
+SELECT id, vec, cosineDistance(vec, reference_vec)
+FROM tab_annoy
+WHERE cosineDistance(vec, reference_vec) < -1.0
+LIMIT 3; -- { serverError INCORRECT_QUERY }
+
+SELECT '- Special case: MaximumDistance is negative';
+WITH (0.0, 2.0) as reference_vec
+SELECT id, vec, cosineDistance(vec, reference_vec)
+FROM tab_usearch
+WHERE cosineDistance(vec, reference_vec) < -1.0
+LIMIT 3; -- { serverError INCORRECT_QUERY }
+
+SELECT '- Special case: setting "annoy_index_search_k_nodes"';
+WITH (0.0, 2.0) as reference_vec
+SELECT id, vec, cosineDistance(vec, reference_vec)
+FROM tab_annoy
 ORDER BY cosineDistance(vec, reference_vec)
 LIMIT 3
-SETTINGS max_limit_for_ann_queries = 2; -- LIMIT 3 > 2 --> don't use the ann index
+SETTINGS annoy_index_search_k_nodes=0; -- searches zero nodes --> no results
 
-DROP TABLE tab;
+SELECT '- Special case: setting "max_limit_for_ann_queries"';
+EXPLAIN indexes=1
+WITH (0.0, 2.0) as reference_vec
+SELECT id, vec, cosineDistance(vec, reference_vec)
+FROM tab_annoy
+ORDER BY cosineDistance(vec, reference_vec)
+LIMIT 3
+SETTINGS max_limit_for_ann_queries=2; -- LIMIT 3 > 2 --> don't use the ann index
 
-SELECT '-- Non-default quantization';
-CREATE TABLE tab_f64(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance', 'f64', 0, 0, 0) GRANULARITY 2) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 3;
-CREATE TABLE tab_f32(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance', 'f32', 0, 0, 0) GRANULARITY 2) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 3;
-CREATE TABLE tab_f16(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance', 'f16', 0, 0, 0) GRANULARITY 2) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 3;
-CREATE TABLE tab_bf16(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance', 'bf16', 0, 0, 0) GRANULARITY 2) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 3;
-CREATE TABLE tab_i8(id Int32, vec Array(Float32), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance', 'i8', 0, 0, 0) GRANULARITY 2) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 3;
-INSERT INTO tab_f64 VALUES (0, [4.6, 2.3]), (1, [2.0, 3.2]), (2, [4.2, 3.4]), (3, [5.3, 2.9]), (4, [2.4, 5.2]), (5, [5.3, 2.3]), (6, [1.0, 9.3]), (7, [5.5, 4.7]), (8, [6.4, 3.5]), (9, [5.3, 2.5]), (10, [6.4, 3.4]), (11, [6.4, 3.2]);
-INSERT INTO tab_f32 VALUES (0, [4.6, 2.3]), (1, [2.0, 3.2]), (2, [4.2, 3.4]), (3, [5.3, 2.9]), (4, [2.4, 5.2]), (5, [5.3, 2.3]), (6, [1.0, 9.3]), (7, [5.5, 4.7]), (8, [6.4, 3.5]), (9, [5.3, 2.5]), (10, [6.4, 3.4]), (11, [6.4, 3.2]);
-INSERT INTO tab_f16 VALUES (0, [4.6, 2.3]), (1, [2.0, 3.2]), (2, [4.2, 3.4]), (3, [5.3, 2.9]), (4, [2.4, 5.2]), (5, [5.3, 2.3]), (6, [1.0, 9.3]), (7, [5.5, 4.7]), (8, [6.4, 3.5]), (9, [5.3, 2.5]), (10, [6.4, 3.4]), (11, [6.4, 3.2]);
-INSERT INTO tab_bf16 VALUES (0, [4.6, 2.3]), (1, [2.0, 3.2]), (2, [4.2, 3.4]), (3, [5.3, 2.9]), (4, [2.4, 5.2]), (5, [5.3, 2.3]), (6, [1.0, 9.3]), (7, [5.5, 4.7]), (8, [6.4, 3.5]), (9, [5.3, 2.5]), (10, [6.4, 3.4]), (11, [6.4, 3.2]);
-INSERT INTO tab_i8 VALUES (0, [4.6, 2.3]), (1, [2.0, 3.2]), (2, [4.2, 3.4]), (3, [5.3, 2.9]), (4, [2.4, 5.2]), (5, [5.3, 2.3]), (6, [1.0, 9.3]), (7, [5.5, 4.7]), (8, [6.4, 3.5]), (9, [5.3, 2.5]), (10, [6.4, 3.4]), (11, [6.4, 3.2]);
+SELECT '- Special case: setting "max_limit_for_ann_queries"';
+EXPLAIN indexes=1
+WITH (0.0, 2.0) as reference_vec
+SELECT id, vec, cosineDistance(vec, reference_vec)
+FROM tab_usearch
+ORDER BY cosineDistance(vec, reference_vec)
+LIMIT 3
+SETTINGS max_limit_for_ann_queries=2; -- LIMIT 3 > 2 --> don't use the ann index
 
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab_f64
-ORDER BY L2Distance(vec, reference_vec)
-LIMIT 3;
-
-EXPLAIN indexes = 1
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab_f64
-ORDER BY L2Distance(vec, reference_vec)
-LIMIT 3;
-
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab_f32
-ORDER BY L2Distance(vec, reference_vec)
-LIMIT 3;
-
-EXPLAIN indexes = 1
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab_f32
-ORDER BY L2Distance(vec, reference_vec)
-LIMIT 3;
-
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab_f16
-ORDER BY L2Distance(vec, reference_vec)
-LIMIT 3;
-
-EXPLAIN indexes = 1
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab_f16
-ORDER BY L2Distance(vec, reference_vec)
-LIMIT 3;
-
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab_bf16
-ORDER BY L2Distance(vec, reference_vec)
-LIMIT 3;
-
-EXPLAIN indexes = 1
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab_bf16
-ORDER BY L2Distance(vec, reference_vec)
-LIMIT 3;
-
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab_i8
-ORDER BY L2Distance(vec, reference_vec)
-LIMIT 3;
-
-EXPLAIN indexes = 1
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab_i8
-ORDER BY L2Distance(vec, reference_vec)
-LIMIT 3;
-
-DROP TABLE tab_f64;
-DROP TABLE tab_f32;
-DROP TABLE tab_f16;
-DROP TABLE tab_bf16;
-DROP TABLE tab_i8;
-
-SELECT '-- Index on Array(Float64) column';
-CREATE TABLE tab(id Int32, vec Array(Float64), INDEX idx vec TYPE vector_similarity('hnsw', 'L2Distance') GRANULARITY 2) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 3;
-INSERT INTO tab VALUES (0, [1.0, 0.0]), (1, [1.1, 0.0]), (2, [1.2, 0.0]), (3, [1.3, 0.0]), (4, [1.4, 0.0]), (5, [1.5, 0.0]), (6, [0.0, 2.0]), (7, [0.0, 2.1]), (8, [0.0, 2.2]), (9, [0.0, 2.3]), (10, [0.0, 2.4]), (11, [0.0, 2.5]);
-
-WITH [0.0, 2.0] AS reference_vec
-SELECT id, vec, L2Distance(vec, reference_vec)
-FROM tab
-ORDER BY L2Distance(vec, reference_vec)
-LIMIT 3;
-
-DROP TABLE tab;
+DROP TABLE tab_annoy;
+DROP TABLE tab_usearch;
diff --git a/tests/queries/0_stateless/02354_vector_search_unquoted_index_parameters.reference b/tests/queries/0_stateless/02354_vector_search_unquoted_index_parameters.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/02354_vector_search_unquoted_index_parameters.sql b/tests/queries/0_stateless/02354_vector_search_unquoted_index_parameters.sql
deleted file mode 100644
index da6494bf831..00000000000
--- a/tests/queries/0_stateless/02354_vector_search_unquoted_index_parameters.sql
+++ /dev/null
@@ -1,23 +0,0 @@
--- Tags: no-fasttest, no-ordinary-database
-
-SET allow_experimental_vector_similarity_index = 1;
-
--- Tests that quoted and unquoted parameters can be passed to vector search indexes.
-
-DROP TABLE IF EXISTS tab1;
-DROP TABLE IF EXISTS tab2;
-
-CREATE TABLE tab1 (id Int32, vec Array(Float32), PRIMARY KEY id, INDEX vec_idx(vec) TYPE vector_similarity('hnsw', 'L2Distance'));
-CREATE TABLE tab2 (id Int32, vec Array(Float32), PRIMARY KEY id, INDEX vec_idx(vec) TYPE vector_similarity(hnsw, L2Distance));
-
-DROP TABLE tab1;
-DROP TABLE tab2;
-
-CREATE TABLE tab1 (id Int32, vec Array(Float32), PRIMARY KEY id);
-CREATE TABLE tab2 (id Int32, vec Array(Float32), PRIMARY KEY id);
-
-ALTER TABLE tab1 ADD INDEX idx1(vec) TYPE vector_similarity('hnsw', 'L2Distance');
-ALTER TABLE tab2 ADD INDEX idx2(vec) TYPE vector_similarity(hnsw, L2Distance);
-
-DROP TABLE tab1;
-DROP TABLE tab2;
diff --git a/tests/queries/0_stateless/02355_column_type_name_lc.reference b/tests/queries/0_stateless/02355_column_type_name_lc.reference
index 50c25a86b2f..234a072299f 100644
--- a/tests/queries/0_stateless/02355_column_type_name_lc.reference
+++ b/tests/queries/0_stateless/02355_column_type_name_lc.reference
@@ -1 +1 @@
-LowCardinality(String)
+ColumnLowCardinality
diff --git a/tests/queries/0_stateless/02361_fsync_profile_events.sh b/tests/queries/0_stateless/02361_fsync_profile_events.sh
index 73bf3fa120a..98c9cf9b7b4 100755
--- a/tests/queries/0_stateless/02361_fsync_profile_events.sh
+++ b/tests/queries/0_stateless/02361_fsync_profile_events.sh
@@ -6,7 +6,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     drop table if exists data_fsync_pe;
 
     create table data_fsync_pe (key Int) engine=MergeTree()
@@ -27,7 +27,7 @@ for i in {1..100}; do
     $CLICKHOUSE_CLIENT --query_id "$query_id" -q "insert into data_fsync_pe values (1)"
 
     read -r FileSync FileOpen DirectorySync FileSyncElapsedMicroseconds DirectorySyncElapsedMicroseconds <<<"$(
-    $CLICKHOUSE_CLIENT -m --param_query_id "$query_id" -q "
+    $CLICKHOUSE_CLIENT -nm --param_query_id "$query_id" -q "
         system flush logs;
 
         select
diff --git a/tests/queries/0_stateless/02364_window_view_segfault.sh b/tests/queries/0_stateless/02364_window_view_segfault.sh
index 833d8967558..9accf7f30c3 100755
--- a/tests/queries/0_stateless/02364_window_view_segfault.sh
+++ b/tests/queries/0_stateless/02364_window_view_segfault.sh
@@ -6,10 +6,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=0"
+    "--allow_experimental_analyzer=0"
 )
 
-${CLICKHOUSE_CLIENT} "${opts[@]}" --multiline --query """
+${CLICKHOUSE_CLIENT} "${opts[@]}" --multiquery --multiline --query """
 DROP TABLE IF EXISTS mt ON CLUSTER test_shard_localhost;
 DROP TABLE IF EXISTS wv ON CLUSTER test_shard_localhost;
 CREATE TABLE mt ON CLUSTER test_shard_localhost (a Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple();
diff --git a/tests/queries/0_stateless/02366_explain_query_tree.sql b/tests/queries/0_stateless/02366_explain_query_tree.sql
index 82621ec90f7..c38b2d819d1 100644
--- a/tests/queries/0_stateless/02366_explain_query_tree.sql
+++ b/tests/queries/0_stateless/02366_explain_query_tree.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 EXPLAIN QUERY TREE run_passes = 0 SELECT 1;
 
diff --git a/tests/queries/0_stateless/02366_kql_summarize.sql b/tests/queries/0_stateless/02366_kql_summarize.sql
index 1480d10e14a..ca16bc3a755 100644
--- a/tests/queries/0_stateless/02366_kql_summarize.sql
+++ b/tests/queries/0_stateless/02366_kql_summarize.sql
@@ -40,7 +40,7 @@ create table Dates
     EventTime DateTime,
 ) ENGINE = Memory;
 
-Insert into Dates VALUES ('2015-10-12') , ('2016-10-12');
+Insert into Dates VALUES ('2015-10-12') , ('2016-10-12')
 Select '-- test summarize --' ;
 set dialect='kusto';
 Customers | summarize count(), min(Age), max(Age), avg(Age), sum(Age);
diff --git a/tests/queries/0_stateless/02367_analyzer_table_alias_columns.sql b/tests/queries/0_stateless/02367_analyzer_table_alias_columns.sql
index a6408abca9b..f41680cd9f4 100644
--- a/tests/queries/0_stateless/02367_analyzer_table_alias_columns.sql
+++ b/tests/queries/0_stateless/02367_analyzer_table_alias_columns.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02368_analyzer_table_functions.sql b/tests/queries/0_stateless/02368_analyzer_table_functions.sql
index cc65848a5d8..456e095c6c1 100644
--- a/tests/queries/0_stateless/02368_analyzer_table_functions.sql
+++ b/tests/queries/0_stateless/02368_analyzer_table_functions.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT c1, c2, c3, c4 FROM format('CSV', '1,2,"[1,2,3]","[[\'abc\'], [], [\'d\', \'e\']]"');
 SELECT f.c1, f.c2, f.c3, f.c4 FROM format('CSV', '1,2,"[1,2,3]","[[\'abc\'], [], [\'d\', \'e\']]"') AS f;
diff --git a/tests/queries/0_stateless/02369_analyzer_array_join_function.sql b/tests/queries/0_stateless/02369_analyzer_array_join_function.sql
index f84c96ee6a6..e60ec7e71a9 100644
--- a/tests/queries/0_stateless/02369_analyzer_array_join_function.sql
+++ b/tests/queries/0_stateless/02369_analyzer_array_join_function.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT arrayJoin([1, 2, 3]);
 
diff --git a/tests/queries/0_stateless/02370_analyzer_in_function.sql b/tests/queries/0_stateless/02370_analyzer_in_function.sql
index 9fb05ada829..a6e4400e101 100644
--- a/tests/queries/0_stateless/02370_analyzer_in_function.sql
+++ b/tests/queries/0_stateless/02370_analyzer_in_function.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT 1 IN 1;
 SELECT 1 IN (1);
diff --git a/tests/queries/0_stateless/02371_analyzer_join_cross.sql b/tests/queries/0_stateless/02371_analyzer_join_cross.sql
index 660dc19770a..3624a1d2282 100644
--- a/tests/queries/0_stateless/02371_analyzer_join_cross.sql
+++ b/tests/queries/0_stateless/02371_analyzer_join_cross.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET single_join_prefer_left_table = 0;
 
 DROP TABLE IF EXISTS test_table_join_1;
diff --git a/tests/queries/0_stateless/02372_analyzer_join.reference b/tests/queries/0_stateless/02372_analyzer_join.reference
index 9204dded262..eefcb1e50dc 100644
--- a/tests/queries/0_stateless/02372_analyzer_join.reference
+++ b/tests/queries/0_stateless/02372_analyzer_join.reference
@@ -5,63 +5,63 @@ JOIN INNER
 SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value
-FROM test_table_join_1 INNER JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id ORDER BY ALL;
+FROM test_table_join_1 INNER JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id;
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
 SELECT '--';
 --
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value
-FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1
 SELECT '--';
 --
 SELECT t1.value, t2.value
-FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 Join_1_Value_0	Join_2_Value_0
 Join_1_Value_1	Join_2_Value_1
-SELECT id FROM test_table_join_1 INNER JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id ORDER BY ALL; -- { serverError AMBIGUOUS_IDENTIFIER }
-SELECT value FROM test_table_join_1 INNER JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id ORDER BY ALL; -- { serverError AMBIGUOUS_IDENTIFIER }
+SELECT id FROM test_table_join_1 INNER JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id; -- { serverError AMBIGUOUS_IDENTIFIER }
+SELECT value FROM test_table_join_1 INNER JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id; -- { serverError AMBIGUOUS_IDENTIFIER }
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t2.value = 'Join_2_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t2.value = 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON toString(t1.id) = toString(t2.id) AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON toString(t1.id) = toString(t2.id) AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id;
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
-SELECT t1_id, t1.value, t2_id, t2.value FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id) ORDER BY ALL;
+SELECT t1_id, t1.value, t2_id, t2.value FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id);
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
 SELECT '--';
 --
-SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1_id = t2_id ORDER BY ALL;
+SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1_id = t2_id;
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
 SELECT 'JOIN LEFT';
@@ -69,75 +69,75 @@ JOIN LEFT
 SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value
-FROM test_table_join_1 LEFT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id ORDER BY ALL;
+FROM test_table_join_1 LEFT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id;
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
 2	Join_1_Value_2	0	
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
 2	Join_1_Value_2	0	
 SELECT '--';
 --
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value
-FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1
 2	2	Join_1_Value_2	Join_1_Value_2	0	0		
 SELECT '--';
 --
 SELECT t1.value, t2.value
-FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 Join_1_Value_0	Join_2_Value_0
 Join_1_Value_1	Join_2_Value_1
 Join_1_Value_2	
-SELECT id FROM test_table_join_1 LEFT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id ORDER BY ALL; -- { serverError AMBIGUOUS_IDENTIFIER }
-SELECT value FROM test_table_join_1 LEFT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id ORDER BY ALL; -- { serverError AMBIGUOUS_IDENTIFIER }
+SELECT id FROM test_table_join_1 LEFT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id; -- { serverError AMBIGUOUS_IDENTIFIER }
+SELECT value FROM test_table_join_1 LEFT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id; -- { serverError AMBIGUOUS_IDENTIFIER }
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t2.value = 'Join_2_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t2.value = 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	0	
 2	Join_1_Value_2	0	
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	0	
 2	Join_1_Value_2	0	
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON toString(t1.id) = toString(t2.id) AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON toString(t1.id) = toString(t2.id) AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	0	
 2	Join_1_Value_2	0	
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id;
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
 2	Join_1_Value_2	0	
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
-SELECT t1_id, t1.value, t2_id, t2.value FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id) ORDER BY ALL;
+SELECT t1_id, t1.value, t2_id, t2.value FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id);
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
 2	Join_1_Value_2	0	
 SELECT '--';
 --
-SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1_id = t2_id ORDER BY ALL;
+SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1_id = t2_id;
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
 2	Join_1_Value_2	0	
@@ -146,182 +146,182 @@ JOIN RIGHT
 SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value
-FROM test_table_join_1 RIGHT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id ORDER BY ALL;
-0		3	Join_2_Value_3
+FROM test_table_join_1 RIGHT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id;
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
+0		3	Join_2_Value_3
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
-0		3	Join_2_Value_3
+FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
+0		3	Join_2_Value_3
 SELECT '--';
 --
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value
-FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
-0	0			3	3	Join_2_Value_3	Join_2_Value_3
+FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1
+0	0			3	3	Join_2_Value_3	Join_2_Value_3
 SELECT '--';
 --
 SELECT t1.value, t2.value
-FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
-	Join_2_Value_3
+FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 Join_1_Value_0	Join_2_Value_0
 Join_1_Value_1	Join_2_Value_1
-SELECT id FROM test_table_join_1 RIGHT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id ORDER BY ALL; -- { serverError AMBIGUOUS_IDENTIFIER }
-SELECT value FROM test_table_join_1 RIGHT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id ORDER BY ALL; -- { serverError AMBIGUOUS_IDENTIFIER }
+	Join_2_Value_3
+SELECT id FROM test_table_join_1 RIGHT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id; -- { serverError AMBIGUOUS_IDENTIFIER }
+SELECT value FROM test_table_join_1 RIGHT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id; -- { serverError AMBIGUOUS_IDENTIFIER }
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t2.value = 'Join_2_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t2.value = 'Join_2_Value_0';
+0	Join_1_Value_0	0	Join_2_Value_0
 0		1	Join_2_Value_1
 0		3	Join_2_Value_3
-0	Join_1_Value_0	0	Join_2_Value_0
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0';
+0	Join_1_Value_0	0	Join_2_Value_0
 0		1	Join_2_Value_1
 0		3	Join_2_Value_3
-0	Join_1_Value_0	0	Join_2_Value_0
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON toString(t1.id) = toString(t2.id) AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON toString(t1.id) = toString(t2.id) AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0';
+0	Join_1_Value_0	0	Join_2_Value_0
 0		1	Join_2_Value_1
 0		3	Join_2_Value_3
-0	Join_1_Value_0	0	Join_2_Value_0
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id ORDER BY ALL;
-0		3	Join_2_Value_3
+FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id;
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
+0		3	Join_2_Value_3
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
-SELECT t1_id, t1.value, t2_id, t2.value FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id) ORDER BY ALL;
-0		3	Join_2_Value_3
+SELECT t1_id, t1.value, t2_id, t2.value FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id);
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
+0		3	Join_2_Value_3
 SELECT '--';
 --
-SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1_id = t2_id ORDER BY ALL;
-0		3	Join_2_Value_3
+SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1_id = t2_id;
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
+0		3	Join_2_Value_3
 SELECT 'JOIN FULL';
 JOIN FULL
 SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value
-FROM test_table_join_1 FULL JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id ORDER BY ALL;
-0		3	Join_2_Value_3
+FROM test_table_join_1 FULL JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id;
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
 2	Join_1_Value_2	0	
+0		3	Join_2_Value_3
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
-0		3	Join_2_Value_3
+FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
 2	Join_1_Value_2	0	
+0		3	Join_2_Value_3
 SELECT '--';
 --
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value
-FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
-0	0			3	3	Join_2_Value_3	Join_2_Value_3
+FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1
 2	2	Join_1_Value_2	Join_1_Value_2	0	0		
+0	0			3	3	Join_2_Value_3	Join_2_Value_3
 SELECT '--';
 --
 SELECT t1.value, t2.value
-FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
-	Join_2_Value_3
+FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 Join_1_Value_0	Join_2_Value_0
 Join_1_Value_1	Join_2_Value_1
 Join_1_Value_2	
-SELECT id FROM test_table_join_1 FULL JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id ORDER BY ALL; -- { serverError AMBIGUOUS_IDENTIFIER }
-SELECT value FROM test_table_join_1 FULL JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id ORDER BY ALL; -- { serverError AMBIGUOUS_IDENTIFIER }
+	Join_2_Value_3
+SELECT id FROM test_table_join_1 FULL JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id; -- { serverError AMBIGUOUS_IDENTIFIER }
+SELECT value FROM test_table_join_1 FULL JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id; -- { serverError AMBIGUOUS_IDENTIFIER }
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t2.value = 'Join_2_Value_0' ORDER BY ALL;
-0		1	Join_2_Value_1
-0		3	Join_2_Value_3
+FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t2.value = 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	0	
 2	Join_1_Value_2	0	
+0		1	Join_2_Value_1
+0		3	Join_2_Value_3
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0' ORDER BY ALL;
-0		1	Join_2_Value_1
-0		3	Join_2_Value_3
+FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	0	
 2	Join_1_Value_2	0	
+0		1	Join_2_Value_1
+0		3	Join_2_Value_3
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON toString(t1.id) = toString(t2.id) AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0' ORDER BY ALL;
-0		1	Join_2_Value_1
-0		3	Join_2_Value_3
+FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON toString(t1.id) = toString(t2.id) AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	0	
 2	Join_1_Value_2	0	
+0		1	Join_2_Value_1
+0		3	Join_2_Value_3
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id ORDER BY ALL;
-0		3	Join_2_Value_3
+FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id;
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
 2	Join_1_Value_2	0	
+0		3	Join_2_Value_3
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
-SELECT t1_id, t1.value, t2_id, t2.value FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id) ORDER BY ALL;
-0		3	Join_2_Value_3
+SELECT t1_id, t1.value, t2_id, t2.value FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id);
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
 2	Join_1_Value_2	0	
+0		3	Join_2_Value_3
 SELECT '--';
 --
-SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1_id = t2_id ORDER BY ALL;
-0		3	Join_2_Value_3
+SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1_id = t2_id;
 0	Join_1_Value_0	0	Join_2_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1
 2	Join_1_Value_2	0	
+0		3	Join_2_Value_3
 SELECT 'First JOIN INNER second JOIN INNER';
 First JOIN INNER second JOIN INNER
 SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 INNER JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-INNER JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+INNER JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 SELECT '--';
@@ -329,48 +329,48 @@ SELECT '--';
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0	0	0	Join_3_Value_0	Join_3_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1	1	1	Join_3_Value_1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-INNER JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-INNER JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 SELECT 'First JOIN INNER second JOIN LEFT';
@@ -379,14 +379,14 @@ SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 INNER JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-LEFT JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+LEFT JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 SELECT '--';
@@ -394,48 +394,48 @@ SELECT '--';
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0	0	0	Join_3_Value_0	Join_3_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1	1	1	Join_3_Value_1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-LEFT JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-LEFT JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 SELECT 'First JOIN INNER second JOIN RIGHT';
@@ -444,159 +444,159 @@ SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 INNER JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-RIGHT JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0	0			0	0			4	4	Join_3_Value_4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0	0	0	Join_3_Value_0	Join_3_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1	1	1	Join_3_Value_1	Join_3_Value_1
+0	0			0	0			4	4	Join_3_Value_4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-		Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
+		Join_3_Value_4
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
-0		0		1	Join_3_Value_1
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
+0		0		4	Join_3_Value_4
+0		0		1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
+RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
+0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 0		0		1	Join_3_Value_1
 0		0		4	Join_3_Value_4
-0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
-		Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
+		Join_3_Value_4
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-RIGHT JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-RIGHT JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		0		4	Join_3_Value_4
 SELECT 'First JOIN INNER second JOIN FULL';
 First JOIN INNER second JOIN FULL
 SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 INNER JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-FULL JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		0		4	Join_3_Value_4
+FULL JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		0		4	Join_3_Value_4
+FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0	0			0	0			4	4	Join_3_Value_4	Join_3_Value_4
+FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0	0	0	Join_3_Value_0	Join_3_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1	1	1	Join_3_Value_1	Join_3_Value_1
+0	0			0	0			4	4	Join_3_Value_4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-		Join_3_Value_4
+FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
+		Join_3_Value_4
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
-0		0		1	Join_3_Value_1
-0		0		4	Join_3_Value_4
+FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
+0		0		4	Join_3_Value_4
+0		0		1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
+FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
+0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 0		0		1	Join_3_Value_1
 0		0		4	Join_3_Value_4
-0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
-		Join_3_Value_4
+FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
+		Join_3_Value_4
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-FULL JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
-0		0		4	Join_3_Value_4
+FULL JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-FULL JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
-0		0		4	Join_3_Value_4
+FULL JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		0		4	Join_3_Value_4
 SELECT 'First JOIN LEFT second JOIN INNER';
 First JOIN LEFT second JOIN INNER
 SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 LEFT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-INNER JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+INNER JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
@@ -604,7 +604,7 @@ SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
@@ -613,7 +613,7 @@ SELECT '--';
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0	0	0	Join_3_Value_0	Join_3_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1	1	1	Join_3_Value_1	Join_3_Value_1
 2	2	Join_1_Value_2	Join_1_Value_2	0	0			0	0	Join_3_Value_0	Join_3_Value_0
@@ -621,7 +621,7 @@ SELECT '--';
 --
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 Join_1_Value_2		Join_3_Value_0
@@ -629,20 +629,20 @@ SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 Join_1_Value_2		Join_3_Value_0
@@ -650,7 +650,7 @@ SELECT 'JOIN expression aliases';
 JOIN expression aliases
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-INNER JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
@@ -658,7 +658,7 @@ SELECT '--';
 --
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-INNER JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
@@ -668,7 +668,7 @@ SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 LEFT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-LEFT JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+LEFT JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
@@ -676,7 +676,7 @@ SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
@@ -685,7 +685,7 @@ SELECT '--';
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0	0	0	Join_3_Value_0	Join_3_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1	1	1	Join_3_Value_1	Join_3_Value_1
 2	2	Join_1_Value_2	Join_1_Value_2	0	0			0	0	Join_3_Value_0	Join_3_Value_0
@@ -693,7 +693,7 @@ SELECT '--';
 --
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 Join_1_Value_2		Join_3_Value_0
@@ -701,7 +701,7 @@ SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	0		0	
 2	Join_1_Value_2	0		0	
@@ -709,7 +709,7 @@ SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	0		0	
 2	Join_1_Value_2	0		0	
@@ -718,7 +718,7 @@ JOIN multiple clauses
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 Join_1_Value_2		Join_3_Value_0
@@ -726,7 +726,7 @@ SELECT 'JOIN expression aliases';
 JOIN expression aliases
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-LEFT JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
@@ -734,7 +734,7 @@ SELECT '--';
 --
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-LEFT JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
@@ -744,184 +744,184 @@ SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 LEFT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-RIGHT JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0	0			0	0			4	4	Join_3_Value_4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0	0	0	Join_3_Value_0	Join_3_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1	1	1	Join_3_Value_1	Join_3_Value_1
 2	2	Join_1_Value_2	Join_1_Value_2	0	0			0	0	Join_3_Value_0	Join_3_Value_0
+0	0			0	0			4	4	Join_3_Value_4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-		Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 Join_1_Value_2		Join_3_Value_0
+		Join_3_Value_4
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
-0		0		1	Join_3_Value_1
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
+0		0		4	Join_3_Value_4
+0		0		1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
+RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
+0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 0		0		1	Join_3_Value_1
 0		0		4	Join_3_Value_4
-0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
-		Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 Join_1_Value_2		Join_3_Value_0
+		Join_3_Value_4
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-RIGHT JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-RIGHT JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		0		4	Join_3_Value_4
 SELECT 'First JOIN LEFT second JOIN FULL';
 First JOIN LEFT second JOIN FULL
 SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 LEFT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-FULL JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		0		4	Join_3_Value_4
+FULL JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		0		4	Join_3_Value_4
+FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0	0			0	0			4	4	Join_3_Value_4	Join_3_Value_4
+FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0	0	0	Join_3_Value_0	Join_3_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1	1	1	Join_3_Value_1	Join_3_Value_1
 2	2	Join_1_Value_2	Join_1_Value_2	0	0			0	0	Join_3_Value_0	Join_3_Value_0
+0	0			0	0			4	4	Join_3_Value_4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-		Join_3_Value_4
+FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 Join_1_Value_2		Join_3_Value_0
+		Join_3_Value_4
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
-0		0		1	Join_3_Value_1
-0		0		4	Join_3_Value_4
+FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	0		0	
 2	Join_1_Value_2	0		0	
+0		0		4	Join_3_Value_4
+0		0		1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
-0		0		1	Join_3_Value_1
-0		0		4	Join_3_Value_4
+FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	0		0	
 2	Join_1_Value_2	0		0	
+0		0		1	Join_3_Value_1
+0		0		4	Join_3_Value_4
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
-		Join_3_Value_4
+FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 Join_1_Value_2		Join_3_Value_0
+		Join_3_Value_4
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-FULL JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
-0		0		4	Join_3_Value_4
+FULL JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-FULL JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
-0		0		4	Join_3_Value_4
+FULL JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		0		4	Join_3_Value_4
 SELECT 'First JOIN RIGHT second JOIN INNER';
 First JOIN RIGHT second JOIN INNER
 SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 RIGHT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-INNER JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+INNER JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 SELECT '--';
@@ -929,48 +929,48 @@ SELECT '--';
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0	0	0	Join_3_Value_0	Join_3_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1	1	1	Join_3_Value_1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-INNER JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-INNER JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 SELECT 'First JOIN RIGHT second JOIN LEFT';
@@ -979,246 +979,246 @@ SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 RIGHT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-LEFT JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		3	Join_2_Value_3	0	
+LEFT JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		3	Join_2_Value_3	0	
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		3	Join_2_Value_3	0	
+LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		3	Join_2_Value_3	0	
 SELECT '--';
 --
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0	0			3	3	Join_2_Value_3	Join_2_Value_3	0	0		
+LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0	0	0	Join_3_Value_0	Join_3_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1	1	1	Join_3_Value_1	Join_3_Value_1
+0	0			3	3	Join_2_Value_3	Join_2_Value_3	0	0		
 SELECT '--';
 --
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-	Join_2_Value_3	
+LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
+	Join_2_Value_3	
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
-0		1	Join_2_Value_1	0	
-0		3	Join_2_Value_3	0	
+LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
+0		3	Join_2_Value_3	0	
+0		1	Join_2_Value_1	0	
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
+LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
+0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 0		1	Join_2_Value_1	0	
 0		3	Join_2_Value_3	0	
-0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
-	Join_2_Value_3	
+LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
+	Join_2_Value_3	
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-LEFT JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
-0		3	Join_2_Value_3	0	
+LEFT JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		3	Join_2_Value_3	0	
 SELECT '--';
 --
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-LEFT JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
-0		3	Join_2_Value_3	0	
+LEFT JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		3	Join_2_Value_3	0	
 SELECT 'First JOIN RIGHT second JOIN RIGHT';
 First JOIN RIGHT second JOIN RIGHT
 SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 RIGHT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-RIGHT JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0	0			0	0			4	4	Join_3_Value_4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0	0	0	Join_3_Value_0	Join_3_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1	1	1	Join_3_Value_1	Join_3_Value_1
+0	0			0	0			4	4	Join_3_Value_4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-		Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
+		Join_3_Value_4
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
-0		0		1	Join_3_Value_1
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
+0		0		4	Join_3_Value_4
+0		0		1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
+RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
+0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 0		0		1	Join_3_Value_1
 0		0		4	Join_3_Value_4
-0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
-		Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
+		Join_3_Value_4
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-RIGHT JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-RIGHT JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		0		4	Join_3_Value_4
 SELECT 'First JOIN RIGHT second JOIN FULL';
 First JOIN RIGHT second JOIN FULL
 SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 RIGHT JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-FULL JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		0		4	Join_3_Value_4
-0		3	Join_2_Value_3	0	
+FULL JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		3	Join_2_Value_3	0	
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		0		4	Join_3_Value_4
-0		3	Join_2_Value_3	0	
+FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		3	Join_2_Value_3	0	
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0	0			0	0			4	4	Join_3_Value_4	Join_3_Value_4
-0	0			3	3	Join_2_Value_3	Join_2_Value_3	0	0		
+FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0	0	0	Join_3_Value_0	Join_3_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1	1	1	Join_3_Value_1	Join_3_Value_1
+0	0			3	3	Join_2_Value_3	Join_2_Value_3	0	0		
+0	0			0	0			4	4	Join_3_Value_4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-		Join_3_Value_4
-	Join_2_Value_3	
+FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
+	Join_2_Value_3	
+		Join_3_Value_4
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
-0		0		1	Join_3_Value_1
-0		0		4	Join_3_Value_4
-0		1	Join_2_Value_1	0	
-0		3	Join_2_Value_3	0	
+FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
+0		3	Join_2_Value_3	0	
+0		1	Join_2_Value_1	0	
+0		0		4	Join_3_Value_4
+0		0		1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
-0		0		1	Join_3_Value_1
-0		0		4	Join_3_Value_4
+FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
+0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 0		1	Join_2_Value_1	0	
 0		3	Join_2_Value_3	0	
-0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
+0		0		1	Join_3_Value_1
+0		0		4	Join_3_Value_4
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
-		Join_3_Value_4
-	Join_2_Value_3	
+FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
+	Join_2_Value_3	
+		Join_3_Value_4
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-FULL JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
-0		0		4	Join_3_Value_4
-0		3	Join_2_Value_3	0	
+FULL JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		3	Join_2_Value_3	0	
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-FULL JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
-0		0		4	Join_3_Value_4
-0		3	Join_2_Value_3	0	
+FULL JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
+0		3	Join_2_Value_3	0	
+0		0		4	Join_3_Value_4
 SELECT 'First JOIN FULL second JOIN INNER';
 First JOIN FULL second JOIN INNER
 SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 FULL JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-INNER JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+INNER JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
@@ -1226,7 +1226,7 @@ SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
@@ -1235,7 +1235,7 @@ SELECT '--';
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0	0	0	Join_3_Value_0	Join_3_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1	1	1	Join_3_Value_1	Join_3_Value_1
 2	2	Join_1_Value_2	Join_1_Value_2	0	0			0	0	Join_3_Value_0	Join_3_Value_0
@@ -1243,7 +1243,7 @@ SELECT '--';
 --
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 Join_1_Value_2		Join_3_Value_0
@@ -1251,20 +1251,20 @@ SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 Join_1_Value_2		Join_3_Value_0
@@ -1272,7 +1272,7 @@ SELECT 'JOIN expression aliases';
 JOIN expression aliases
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-INNER JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
@@ -1280,7 +1280,7 @@ SELECT '--';
 --
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-INNER JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
+INNER JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
@@ -1290,265 +1290,265 @@ SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 FULL JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-LEFT JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		3	Join_2_Value_3	0	
+LEFT JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		3	Join_2_Value_3	0	
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		3	Join_2_Value_3	0	
+LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		3	Join_2_Value_3	0	
 SELECT '--';
 --
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0	0			3	3	Join_2_Value_3	Join_2_Value_3	0	0		
+LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0	0	0	Join_3_Value_0	Join_3_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1	1	1	Join_3_Value_1	Join_3_Value_1
 2	2	Join_1_Value_2	Join_1_Value_2	0	0			0	0	Join_3_Value_0	Join_3_Value_0
+0	0			3	3	Join_2_Value_3	Join_2_Value_3	0	0		
 SELECT '--';
 --
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-	Join_2_Value_3	
+LEFT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 Join_1_Value_2		Join_3_Value_0
+	Join_2_Value_3	
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
-0		1	Join_2_Value_1	0	
-0		3	Join_2_Value_3	0	
+LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	0		0	
 2	Join_1_Value_2	0		0	
+0		3	Join_2_Value_3	0	
+0		1	Join_2_Value_1	0	
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
-0		1	Join_2_Value_1	0	
-0		3	Join_2_Value_3	0	
+LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	0		0	
 2	Join_1_Value_2	0		0	
+0		1	Join_2_Value_1	0	
+0		3	Join_2_Value_3	0	
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
-	Join_2_Value_3	
+LEFT JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 Join_1_Value_2		Join_3_Value_0
+	Join_2_Value_3	
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-LEFT JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
-0		3	Join_2_Value_3	0	
+LEFT JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		3	Join_2_Value_3	0	
 SELECT '--';
 --
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-LEFT JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
-0		3	Join_2_Value_3	0	
+LEFT JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		3	Join_2_Value_3	0	
 SELECT 'First JOIN FULL second JOIN RIGHT';
 First JOIN FULL second JOIN RIGHT
 SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 FULL JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-RIGHT JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0	0			0	0			4	4	Join_3_Value_4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0	0	0	Join_3_Value_0	Join_3_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1	1	1	Join_3_Value_1	Join_3_Value_1
 2	2	Join_1_Value_2	Join_1_Value_2	0	0			0	0	Join_3_Value_0	Join_3_Value_0
+0	0			0	0			4	4	Join_3_Value_4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-		Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 Join_1_Value_2		Join_3_Value_0
+		Join_3_Value_4
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
-0		0		1	Join_3_Value_1
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
+0		0		4	Join_3_Value_4
+0		0		1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
+RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
+0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 0		0		1	Join_3_Value_1
 0		0		4	Join_3_Value_4
-0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
-		Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 Join_1_Value_2		Join_3_Value_0
+		Join_3_Value_4
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-RIGHT JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-RIGHT JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
-0		0		4	Join_3_Value_4
+RIGHT JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		0		4	Join_3_Value_4
 SELECT 'First JOIN FULL second JOIN FULL';
 First JOIN FULL second JOIN FULL
 SELECT 'JOIN ON without conditions';
 JOIN ON without conditions
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 FULL JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-FULL JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		0		4	Join_3_Value_4
-0		3	Join_2_Value_3	0	
+FULL JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		3	Join_2_Value_3	0	
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0		0		4	Join_3_Value_4
-0		3	Join_2_Value_3	0	
+FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		3	Join_2_Value_3	0	
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-0	0			0	0			4	4	Join_3_Value_4	Join_3_Value_4
-0	0			3	3	Join_2_Value_3	Join_2_Value_3	0	0		
+FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 0	0	Join_1_Value_0	Join_1_Value_0	0	0	Join_2_Value_0	Join_2_Value_0	0	0	Join_3_Value_0	Join_3_Value_0
 1	1	Join_1_Value_1	Join_1_Value_1	1	1	Join_2_Value_1	Join_2_Value_1	1	1	Join_3_Value_1	Join_3_Value_1
 2	2	Join_1_Value_2	Join_1_Value_2	0	0			0	0	Join_3_Value_0	Join_3_Value_0
+0	0			3	3	Join_2_Value_3	Join_2_Value_3	0	0		
+0	0			0	0			4	4	Join_3_Value_4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
-		Join_3_Value_4
-	Join_2_Value_3	
+FULL JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 Join_1_Value_2		Join_3_Value_0
+	Join_2_Value_3	
+		Join_3_Value_4
 SELECT 'JOIN ON with conditions';
 JOIN ON with conditions
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
-0		0		1	Join_3_Value_1
-0		0		4	Join_3_Value_4
-0		1	Join_2_Value_1	0	
-0		3	Join_2_Value_3	0	
+FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	0		0	
 2	Join_1_Value_2	0		0	
+0		3	Join_2_Value_3	0	
+0		1	Join_2_Value_1	0	
+0		0		4	Join_3_Value_4
+0		0		1	Join_3_Value_1
 SELECT '--';
 --
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
-0		0		1	Join_3_Value_1
-0		0		4	Join_3_Value_4
-0		1	Join_2_Value_1	0	
-0		3	Join_2_Value_3	0	
+FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	0		0	
 2	Join_1_Value_2	0		0	
+0		1	Join_2_Value_1	0	
+0		3	Join_2_Value_3	0	
+0		0		1	Join_3_Value_1
+0		0		4	Join_3_Value_4
 SELECT 'JOIN multiple clauses';
 JOIN multiple clauses
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
-		Join_3_Value_4
-	Join_2_Value_3	
+FULL JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 Join_1_Value_0	Join_2_Value_0	Join_3_Value_0
 Join_1_Value_1	Join_2_Value_1	Join_3_Value_1
 Join_1_Value_2		Join_3_Value_0
+	Join_2_Value_3	
+		Join_3_Value_4
 SELECT 'JOIN expression aliases';
 JOIN expression aliases
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-FULL JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
-0		0		4	Join_3_Value_4
-0		3	Join_2_Value_3	0	
+FULL JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		3	Join_2_Value_3	0	
+0		0		4	Join_3_Value_4
 SELECT '--';
 --
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-FULL JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
-0		0		4	Join_3_Value_4
-0		3	Join_2_Value_3	0	
+FULL JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 0	Join_1_Value_0	0	Join_2_Value_0	0	Join_3_Value_0
 1	Join_1_Value_1	1	Join_2_Value_1	1	Join_3_Value_1
 2	Join_1_Value_2	0		0	Join_3_Value_0
+0		3	Join_2_Value_3	0	
+0		0		4	Join_3_Value_4
diff --git a/tests/queries/0_stateless/02372_analyzer_join.sql.j2 b/tests/queries/0_stateless/02372_analyzer_join.sql.j2
index fb75ddeac09..facf4dc018b 100644
--- a/tests/queries/0_stateless/02372_analyzer_join.sql.j2
+++ b/tests/queries/0_stateless/02372_analyzer_join.sql.j2
@@ -1,6 +1,6 @@
 -- Tags: long
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET single_join_prefer_left_table = 0;
 
 DROP TABLE IF EXISTS test_table_join_1;
@@ -45,59 +45,59 @@ SELECT 'JOIN {{ join_type }}';
 SELECT 'JOIN ON without conditions';
 
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value
-FROM test_table_join_1 {{ join_type }} JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id ORDER BY ALL;
+FROM test_table_join_1 {{ join_type }} JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id;
 
 SELECT '--';
 
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 
 SELECT '--';
 
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value
-FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 
 SELECT '--';
 
 SELECT t1.value, t2.value
-FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 
-SELECT id FROM test_table_join_1 {{ join_type }} JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id ORDER BY ALL; -- { serverError AMBIGUOUS_IDENTIFIER }
+SELECT id FROM test_table_join_1 {{ join_type }} JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id; -- { serverError AMBIGUOUS_IDENTIFIER }
 
-SELECT value FROM test_table_join_1 {{ join_type }} JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id ORDER BY ALL; -- { serverError AMBIGUOUS_IDENTIFIER }
+SELECT value FROM test_table_join_1 {{ join_type }} JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id; -- { serverError AMBIGUOUS_IDENTIFIER }
 
 SELECT 'JOIN ON with conditions';
 
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0';
 
 SELECT '--';
 
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t2.value = 'Join_2_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t2.value = 'Join_2_Value_0';
 
 SELECT '--';
 
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0';
 
 SELECT '--';
 
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON toString(t1.id) = toString(t2.id) AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0' ORDER BY ALL;
+FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON toString(t1.id) = toString(t2.id) AND t1.value = 'Join_1_Value_0' AND t2.value = 'Join_2_Value_0';
 
 SELECT 'JOIN multiple clauses';
 
 SELECT t1.id, t1.value, t2.id, t2.value
-FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id;
 
 SELECT 'JOIN expression aliases';
 
-SELECT t1_id, t1.value, t2_id, t2.value FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id) ORDER BY ALL;
+SELECT t1_id, t1.value, t2_id, t2.value FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id);
 
 SELECT '--';
 
-SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON t1_id = t2_id ORDER BY ALL;
+SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value FROM test_table_join_1 AS t1 {{ join_type }} JOIN test_table_join_2 AS t2 ON t1_id = t2_id;
 
 {% endfor %}
 
@@ -110,56 +110,56 @@ SELECT 'JOIN ON without conditions';
 
 SELECT test_table_join_1.id, test_table_join_1.value, test_table_join_2.id, test_table_join_2.value, test_table_join_3.id, test_table_join_3.value
 FROM test_table_join_1 {{ first_join_type }} JOIN test_table_join_2 ON test_table_join_1.id = test_table_join_2.id
-{{ second_join_type }} JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+{{ second_join_type }} JOIN test_table_join_3 ON test_table_join_2.id = test_table_join_3.id;
 
 SELECT '--';
 
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 {{ first_join_type }} JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-{{ second_join_type }} JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+{{ second_join_type }} JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 
 SELECT '--';
 
 SELECT t1.id, test_table_join_1.id, t1.value, test_table_join_1.value, t2.id, test_table_join_2.id, t2.value, test_table_join_2.value,
 t3.id, test_table_join_3.id, t3.value, test_table_join_3.value
 FROM test_table_join_1 AS t1 {{ first_join_type }} JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-{{ second_join_type }} JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+{{ second_join_type }} JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 
 SELECT '--';
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1 {{ first_join_type }} JOIN test_table_join_2 AS t2 ON test_table_join_1.id = test_table_join_2.id
-{{ second_join_type }} JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id  ORDER BY ALL;
+{{ second_join_type }} JOIN test_table_join_3 AS t3 ON test_table_join_2.id = test_table_join_3.id;
 
 SELECT 'JOIN ON with conditions';
 
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 {{ first_join_type }} JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0'
-{{ second_join_type }} JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' ORDER BY ALL;
+{{ second_join_type }} JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0';
 
 SELECT '--';
 
 SELECT t1.id, t1.value, t2.id, t2.value, t3.id, t3.value
 FROM test_table_join_1 AS t1 {{ first_join_type }} JOIN test_table_join_2 AS t2 ON t1.id = t2.id AND t1.value == 'Join_1_Value_0' AND t2.value == 'Join_2_Value_0'
-{{ second_join_type }} JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0' ORDER BY ALL;
+{{ second_join_type }} JOIN test_table_join_3 AS t3 ON t2.id = t3.id AND t2.value == 'Join_2_Value_0' AND t3.value == 'Join_3_Value_0';
 
 SELECT 'JOIN multiple clauses';
 
 SELECT t1.value, t2.value, t3.value
 FROM test_table_join_1 AS t1
 {{ first_join_type }} JOIN test_table_join_2 AS t2 ON t1.id = t2.id OR t1.id = t2.id
-{{ second_join_type }} JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id ORDER BY ALL;
+{{ second_join_type }} JOIN test_table_join_3 AS t3 ON t2.id = t3.id OR t3.id = t2.id;
 
 SELECT 'JOIN expression aliases';
 
 SELECT t1_id, t1.value, t2_id, t2.value, t3_id, t3.value
 FROM test_table_join_1 AS t1 {{ first_join_type }} JOIN test_table_join_2 AS t2 ON (t1.id AS t1_id) = (t2.id AS t2_id)
-{{ second_join_type }} JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id) ORDER BY ALL;
+{{ second_join_type }} JOIN test_table_join_3 AS t3 ON t2_id = (t3.id AS t3_id);
 
 SELECT '--';
 
 SELECT t1.id AS t1_id, t1.value, t2.id AS t2_id, t2.value, t3.id AS t3_id, t3.value
 FROM test_table_join_1 AS t1 {{ first_join_type }} JOIN test_table_join_2 AS t2 ON t1_id = t2_id
-{{ second_join_type }} JOIN test_table_join_3 AS t3 ON t2_id = t3_id ORDER BY ALL;
+{{ second_join_type }} JOIN test_table_join_3 AS t3 ON t2_id = t3_id;
 
 {% endfor %}
 {% endfor %}
diff --git a/tests/queries/0_stateless/02372_data_race_in_avro.sh b/tests/queries/0_stateless/02372_data_race_in_avro.sh
index 50a7ae1e3c5..49c34e31923 100755
--- a/tests/queries/0_stateless/02372_data_race_in_avro.sh
+++ b/tests/queries/0_stateless/02372_data_race_in_avro.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-fasttest, no-parallel
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02372_now_in_block.sql b/tests/queries/0_stateless/02372_now_in_block.sql
index d0aec471801..aee4572ce8d 100644
--- a/tests/queries/0_stateless/02372_now_in_block.sql
+++ b/tests/queries/0_stateless/02372_now_in_block.sql
@@ -1,4 +1,3 @@
-SET max_rows_to_read = 0, max_bytes_to_read = 0;
 SELECT count() FROM (SELECT DISTINCT nowInBlock(), nowInBlock('Pacific/Pitcairn') FROM system.numbers LIMIT 2);
 SELECT nowInBlock(1); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 SELECT nowInBlock(NULL) IS NULL;
diff --git a/tests/queries/0_stateless/02373_analyzer_join_use_nulls.reference b/tests/queries/0_stateless/02373_analyzer_join_use_nulls.reference
index 2b3671e1ea6..3722c23e4a0 100644
--- a/tests/queries/0_stateless/02373_analyzer_join_use_nulls.reference
+++ b/tests/queries/0_stateless/02373_analyzer_join_use_nulls.reference
@@ -1,27 +1,27 @@
 -- { echoOn }
 
 SELECT t1.id AS t1_id, toTypeName(t1_id), t1.value AS t1_value, toTypeName(t1_value), t2.id AS t2_id, toTypeName(t2_id), t2.value AS t2_value, toTypeName(t2_value)
-FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 0	UInt64	Join_1_Value_0	String	0	UInt64	Join_2_Value_0	String
 1	UInt64	Join_1_Value_1	String	1	UInt64	Join_2_Value_1	String
 SELECT '--';
 --
 SELECT t1.id AS t1_id, toTypeName(t1_id), t1.value AS t1_value, toTypeName(t1_value), t2.id AS t2_id, toTypeName(t2_id), t2.value AS t2_value, toTypeName(t2_value)
-FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 0	UInt64	Join_1_Value_0	String	0	Nullable(UInt64)	Join_2_Value_0	Nullable(String)
 1	UInt64	Join_1_Value_1	String	1	Nullable(UInt64)	Join_2_Value_1	Nullable(String)
 2	UInt64	Join_1_Value_2	String	\N	Nullable(UInt64)	\N	Nullable(String)
 SELECT '--';
 --
 SELECT t1.id AS t1_id, toTypeName(t1_id), t1.value AS t1_value, toTypeName(t1_value), t2.id AS t2_id, toTypeName(t2_id), t2.value AS t2_value, toTypeName(t2_value)
-FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 0	Nullable(UInt64)	Join_1_Value_0	Nullable(String)	0	UInt64	Join_2_Value_0	String
 1	Nullable(UInt64)	Join_1_Value_1	Nullable(String)	1	UInt64	Join_2_Value_1	String
 \N	Nullable(UInt64)	\N	Nullable(String)	3	UInt64	Join_2_Value_3	String
 SELECT '--';
 --
 SELECT t1.id AS t1_id, toTypeName(t1_id), t1.value AS t1_value, toTypeName(t1_value), t2.id AS t2_id, toTypeName(t2_id), t2.value AS t2_value, toTypeName(t2_value)
-FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 0	Nullable(UInt64)	Join_1_Value_0	Nullable(String)	0	Nullable(UInt64)	Join_2_Value_0	Nullable(String)
 1	Nullable(UInt64)	Join_1_Value_1	Nullable(String)	1	Nullable(UInt64)	Join_2_Value_1	Nullable(String)
 2	Nullable(UInt64)	Join_1_Value_2	Nullable(String)	\N	Nullable(UInt64)	\N	Nullable(String)
@@ -30,14 +30,14 @@ SELECT '--';
 --
 SELECT id AS using_id, toTypeName(using_id), t1.id AS t1_id, toTypeName(t1_id), t1.value AS t1_value, toTypeName(t1_value),
 t2.id AS t2_id, toTypeName(t2_id), t2.value AS t2_value, toTypeName(t2_value)
-FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 USING (id) ORDER BY ALL;
+FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 USING (id);
 0	UInt64	0	UInt64	Join_1_Value_0	String	0	UInt64	Join_2_Value_0	String
 1	UInt64	1	UInt64	Join_1_Value_1	String	1	UInt64	Join_2_Value_1	String
 SELECT '--';
 --
 SELECT id AS using_id, toTypeName(using_id), t1.id AS t1_id, toTypeName(t1_id), t1.value AS t1_value, toTypeName(t1_value),
 t2.id AS t2_id, toTypeName(t2_id), t2.value AS t2_value, toTypeName(t2_value)
-FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 USING (id) ORDER BY ALL;
+FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 USING (id);
 0	UInt64	0	UInt64	Join_1_Value_0	String	0	Nullable(UInt64)	Join_2_Value_0	Nullable(String)
 1	UInt64	1	UInt64	Join_1_Value_1	String	1	Nullable(UInt64)	Join_2_Value_1	Nullable(String)
 2	UInt64	2	UInt64	Join_1_Value_2	String	\N	Nullable(UInt64)	\N	Nullable(String)
@@ -45,7 +45,7 @@ SELECT '--';
 --
 SELECT id AS using_id, toTypeName(using_id), t1.id AS t1_id, toTypeName(t1_id), t1.value AS t1_value, toTypeName(t1_value),
 t2.id AS t2_id, toTypeName(t2_id), t2.value AS t2_value, toTypeName(t2_value)
-FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 USING (id) ORDER BY ALL;
+FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 USING (id);
 0	UInt64	0	Nullable(UInt64)	Join_1_Value_0	Nullable(String)	0	UInt64	Join_2_Value_0	String
 1	UInt64	1	Nullable(UInt64)	Join_1_Value_1	Nullable(String)	1	UInt64	Join_2_Value_1	String
 3	UInt64	\N	Nullable(UInt64)	\N	Nullable(String)	3	UInt64	Join_2_Value_3	String
@@ -53,7 +53,7 @@ SELECT '--';
 --
 SELECT id AS using_id, toTypeName(using_id), t1.id AS t1_id, toTypeName(t1_id), t1.value AS t1_value, toTypeName(t1_value),
 t2.id AS t2_id, toTypeName(t2_id), t2.value AS t2_value, toTypeName(t2_value)
-FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 USING (id) ORDER BY ALL;
+FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 USING (id);
 0	Nullable(UInt64)	0	Nullable(UInt64)	Join_1_Value_0	Nullable(String)	0	Nullable(UInt64)	Join_2_Value_0	Nullable(String)
 1	Nullable(UInt64)	1	Nullable(UInt64)	Join_1_Value_1	Nullable(String)	1	Nullable(UInt64)	Join_2_Value_1	Nullable(String)
 2	Nullable(UInt64)	2	Nullable(UInt64)	Join_1_Value_2	Nullable(String)	\N	Nullable(UInt64)	\N	Nullable(String)
diff --git a/tests/queries/0_stateless/02373_analyzer_join_use_nulls.sql b/tests/queries/0_stateless/02373_analyzer_join_use_nulls.sql
index 16a37ee7f50..db7895084e8 100644
--- a/tests/queries/0_stateless/02373_analyzer_join_use_nulls.sql
+++ b/tests/queries/0_stateless/02373_analyzer_join_use_nulls.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET join_use_nulls = 1;
 
 DROP TABLE IF EXISTS test_table_join_1;
@@ -26,46 +26,46 @@ INSERT INTO test_table_join_2 VALUES (3, 'Join_2_Value_3');
 -- { echoOn }
 
 SELECT t1.id AS t1_id, toTypeName(t1_id), t1.value AS t1_value, toTypeName(t1_value), t2.id AS t2_id, toTypeName(t2_id), t2.value AS t2_value, toTypeName(t2_value)
-FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 
 SELECT '--';
 
 SELECT t1.id AS t1_id, toTypeName(t1_id), t1.value AS t1_value, toTypeName(t1_value), t2.id AS t2_id, toTypeName(t2_id), t2.value AS t2_value, toTypeName(t2_value)
-FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 
 SELECT '--';
 
 SELECT t1.id AS t1_id, toTypeName(t1_id), t1.value AS t1_value, toTypeName(t1_value), t2.id AS t2_id, toTypeName(t2_id), t2.value AS t2_value, toTypeName(t2_value)
-FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 
 SELECT '--';
 
 SELECT t1.id AS t1_id, toTypeName(t1_id), t1.value AS t1_value, toTypeName(t1_value), t2.id AS t2_id, toTypeName(t2_id), t2.value AS t2_value, toTypeName(t2_value)
-FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id ORDER BY ALL;
+FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 ON t1.id = t2.id;
 
 SELECT '--';
 
 SELECT id AS using_id, toTypeName(using_id), t1.id AS t1_id, toTypeName(t1_id), t1.value AS t1_value, toTypeName(t1_value),
 t2.id AS t2_id, toTypeName(t2_id), t2.value AS t2_value, toTypeName(t2_value)
-FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 USING (id) ORDER BY ALL;
+FROM test_table_join_1 AS t1 INNER JOIN test_table_join_2 AS t2 USING (id);
 
 SELECT '--';
 
 SELECT id AS using_id, toTypeName(using_id), t1.id AS t1_id, toTypeName(t1_id), t1.value AS t1_value, toTypeName(t1_value),
 t2.id AS t2_id, toTypeName(t2_id), t2.value AS t2_value, toTypeName(t2_value)
-FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 USING (id) ORDER BY ALL;
+FROM test_table_join_1 AS t1 LEFT JOIN test_table_join_2 AS t2 USING (id);
 
 SELECT '--';
 
 SELECT id AS using_id, toTypeName(using_id), t1.id AS t1_id, toTypeName(t1_id), t1.value AS t1_value, toTypeName(t1_value),
 t2.id AS t2_id, toTypeName(t2_id), t2.value AS t2_value, toTypeName(t2_value)
-FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 USING (id) ORDER BY ALL;
+FROM test_table_join_1 AS t1 RIGHT JOIN test_table_join_2 AS t2 USING (id);
 
 SELECT '--';
 
 SELECT id AS using_id, toTypeName(using_id), t1.id AS t1_id, toTypeName(t1_id), t1.value AS t1_value, toTypeName(t1_value),
 t2.id AS t2_id, toTypeName(t2_id), t2.value AS t2_value, toTypeName(t2_value)
-FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 USING (id) ORDER BY ALL;
+FROM test_table_join_1 AS t1 FULL JOIN test_table_join_2 AS t2 USING (id);
 
 -- { echoOff }
 
diff --git a/tests/queries/0_stateless/02373_datetime64_monotonicity.sh b/tests/queries/0_stateless/02373_datetime64_monotonicity.sh
index 73a32e28be9..7e852aa24b0 100755
--- a/tests/queries/0_stateless/02373_datetime64_monotonicity.sh
+++ b/tests/queries/0_stateless/02373_datetime64_monotonicity.sh
@@ -7,7 +7,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 for tz in Asia/Tehran UTC Canada/Atlantic Europe/Berlin
 do
     echo "$tz"
-    TZ=$tz $CLICKHOUSE_LOCAL --multiline "
+    TZ=$tz $CLICKHOUSE_LOCAL --multiline --multiquery "
       drop table if exists dt64_monotonicity_test;
       drop table if exists dt64_monotonicity_test_string;
       CREATE TABLE dt64_monotonicity_test (date_time DateTime64(3, 'Europe/Berlin'), id String) ENGINE = MergeTree PARTITION BY toDate(date_time, 'Europe/Berlin') ORDER BY date_time;
diff --git a/tests/queries/0_stateless/02374_analyzer_array_join.sql b/tests/queries/0_stateless/02374_analyzer_array_join.sql
index fe1508f5f78..8c26df1806e 100644
--- a/tests/queries/0_stateless/02374_analyzer_array_join.sql
+++ b/tests/queries/0_stateless/02374_analyzer_array_join.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02374_analyzer_join_using.sql.j2 b/tests/queries/0_stateless/02374_analyzer_join_using.sql.j2
index 2c64efc7fc8..26fb52716ff 100644
--- a/tests/queries/0_stateless/02374_analyzer_join_using.sql.j2
+++ b/tests/queries/0_stateless/02374_analyzer_join_using.sql.j2
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table_join_1;
 CREATE TABLE test_table_join_1
diff --git a/tests/queries/0_stateless/02374_combine_multi_if_and_count_if_opt.sql b/tests/queries/0_stateless/02374_combine_multi_if_and_count_if_opt.sql
index 05472e5e35a..4371c2e5641 100644
--- a/tests/queries/0_stateless/02374_combine_multi_if_and_count_if_opt.sql
+++ b/tests/queries/0_stateless/02374_combine_multi_if_and_count_if_opt.sql
@@ -4,7 +4,7 @@ create table m (a int) engine Log;
 
 insert into m values (1);
 
-set enable_analyzer = true, optimize_rewrite_sum_if_to_count_if=1;
+set allow_experimental_analyzer = true, optimize_rewrite_sum_if_to_count_if=1;
 
 EXPLAIN QUERY TREE select sum(multiIf(a = 1, 1, 0)) from m;
 
diff --git a/tests/queries/0_stateless/02375_analyzer_union.sql b/tests/queries/0_stateless/02375_analyzer_union.sql
index cf9a99ffbba..5e41f07d217 100644
--- a/tests/queries/0_stateless/02375_analyzer_union.sql
+++ b/tests/queries/0_stateless/02375_analyzer_union.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02376_analyzer_in_function_subquery.sql b/tests/queries/0_stateless/02376_analyzer_in_function_subquery.sql
index 295d8a8f97e..72a4edb8567 100644
--- a/tests/queries/0_stateless/02376_analyzer_in_function_subquery.sql
+++ b/tests/queries/0_stateless/02376_analyzer_in_function_subquery.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02377_analyzer_in_function_set.sql b/tests/queries/0_stateless/02377_analyzer_in_function_set.sql
index 00aa40ccf17..e3cbcf75a9c 100644
--- a/tests/queries/0_stateless/02377_analyzer_in_function_set.sql
+++ b/tests/queries/0_stateless/02377_analyzer_in_function_set.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02377_extend_protocol_with_query_parameters.sh b/tests/queries/0_stateless/02377_extend_protocol_with_query_parameters.sh
index 46396d38747..71e3b6961f8 100755
--- a/tests/queries/0_stateless/02377_extend_protocol_with_query_parameters.sh
+++ b/tests/queries/0_stateless/02377_extend_protocol_with_query_parameters.sh
@@ -24,7 +24,7 @@ $CLICKHOUSE_CLIENT \
 
 
 table_name="t_02377_extend_protocol_with_query_parameters_$RANDOM$RANDOM"
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
   create table $table_name(
     id Int64,
     arr Array(UInt8),
@@ -57,17 +57,17 @@ $CLICKHOUSE_CLIENT \
 
 
 # it is possible to set parameter for the current session
-$CLICKHOUSE_CLIENT -q "set param_n = 42; select {n: UInt8}"
+$CLICKHOUSE_CLIENT -n -q "set param_n = 42; select {n: UInt8}"
 # and it will not be visible to other sessions
-$CLICKHOUSE_CLIENT -q "select {n: UInt8} -- { serverError 456 }"
+$CLICKHOUSE_CLIENT -n -q "select {n: UInt8} -- { serverError 456 }"
 
 
 # the same parameter could be set multiple times within one session (new value overrides the previous one)
-$CLICKHOUSE_CLIENT -q "set param_n = 12; set param_n = 13; select {n: UInt8}"
+$CLICKHOUSE_CLIENT -n -q "set param_n = 12; set param_n = 13; select {n: UInt8}"
 
 
 # multiple different parameters could be defined within each session
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
   set param_a = 13, param_b = 'str';
   set param_c = '2022-08-04 18:30:53';
   set param_d = '{\'10\': [11, 12], \'13\': [14, 15]}';
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 52f48dcbb91..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 --merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability=0.0 -q "$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 --enable_analyzer=0 --merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability=0.0 -q "$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 --enable_analyzer=1 --merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability=0.0 -q "$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/02378_analyzer_projection_names.sql b/tests/queries/0_stateless/02378_analyzer_projection_names.sql
index 7b3099c4f36..f41afe6a950 100644
--- a/tests/queries/0_stateless/02378_analyzer_projection_names.sql
+++ b/tests/queries/0_stateless/02378_analyzer_projection_names.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET single_join_prefer_left_table = 0;
 
 DROP TABLE IF EXISTS test_table;
diff --git a/tests/queries/0_stateless/02378_part_log_profile_events.sh b/tests/queries/0_stateless/02378_part_log_profile_events.sh
deleted file mode 100755
index 8dd8b1eca91..00000000000
--- a/tests/queries/0_stateless/02378_part_log_profile_events.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-shared-merge-tree
-# Tag no-shared-merge-tree: depend on events with local disk
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-${CLICKHOUSE_CLIENT} --query "
-    DROP TABLE IF EXISTS test;
-
-    CREATE TABLE test (key UInt64, val UInt64) engine = MergeTree Order by key PARTITION BY key >= 128;
-    SET max_block_size = 64, max_insert_block_size = 64, min_insert_block_size_rows = 64;
-    INSERT INTO test SELECT number AS key, sipHash64(number) AS val FROM numbers(512);
-"
-
-${CLICKHOUSE_CLIENT} --query "
-    SYSTEM FLUSH LOGS;
-    SELECT
-        if(count(DISTINCT query_id) == 1, 'Ok', 'Error: ' || toString(count(DISTINCT query_id))),
-        if(count() == 512 / 64, 'Ok', 'Error: ' || toString(count())), -- 512 rows inserted, 64 rows per block
-        if(SUM(ProfileEvents['MergeTreeDataWriterRows']) == 512, 'Ok', 'Error: ' || toString(SUM(ProfileEvents['MergeTreeDataWriterRows']))),
-        if(SUM(ProfileEvents['MergeTreeDataWriterUncompressedBytes']) >= 1024, 'Ok', 'Error: ' || toString(SUM(ProfileEvents['MergeTreeDataWriterUncompressedBytes']))),
-        if(SUM(ProfileEvents['MergeTreeDataWriterCompressedBytes']) >= 1024, 'Ok', 'Error: ' || toString(SUM(ProfileEvents['MergeTreeDataWriterCompressedBytes']))),
-        if(SUM(ProfileEvents['MergeTreeDataWriterBlocks']) >= 8, 'Ok', 'Error: ' || toString(SUM(ProfileEvents['MergeTreeDataWriterBlocks'])))
-    FROM system.part_log
-    WHERE event_time > now() - INTERVAL 10 MINUTE
-        AND database == currentDatabase() AND table == 'test'
-        AND event_type == 'NewPart';
-"
-
-${CLICKHOUSE_CLIENT} --query "OPTIMIZE TABLE test FINAL;"
-
-${CLICKHOUSE_CLIENT} --query "
-    SYSTEM FLUSH LOGS;
-    SELECT
-        if(count() > 2, 'Ok', 'Error: ' || toString(count())),
-        if(SUM(ProfileEvents['MergedRows']) >= 512, 'Ok', 'Error: ' || toString(SUM(ProfileEvents['MergedRows'])))
-    FROM system.part_log
-    WHERE event_time > now() - INTERVAL 10 MINUTE
-        AND database == currentDatabase() AND table == 'test'
-        AND event_type == 'MergeParts';
-"
-
-${CLICKHOUSE_CLIENT} --query "
-    ALTER TABLE test UPDATE val = 0 WHERE key % 2 == 0 SETTINGS mutations_sync = 2
-"
-
-# The mutation query may return before the entry is added to the system.part_log table.
-# Retry SYSTEM FLUSH LOGS until all entries are fully flushed.
-for _ in {1..10}; do
-    ${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS"
-    res=$(${CLICKHOUSE_CLIENT} --query "
-        SELECT count() FROM system.part_log
-        WHERE event_time > now() - INTERVAL 10 MINUTE
-            AND database == currentDatabase() AND table == 'test'
-            AND event_type == 'MutatePart';"
-    )
-    if [[ $res -eq 2 ]]; then
-        break
-    fi
-
-    sleep 2.0
-done
-
-${CLICKHOUSE_CLIENT} --query "
-    SELECT
-        if(count() == 2, 'Ok', 'Error: ' || toString(count())),
-        if(SUM(ProfileEvents['MutatedRows']) == 512, 'Ok', 'Error: ' || toString(SUM(ProfileEvents['MutatedRows']))),
-        if(SUM(ProfileEvents['FileOpen']) > 1, 'Ok', 'Error: ' || toString(SUM(ProfileEvents['FileOpen'])))
-    FROM system.part_log
-    WHERE event_time > now() - INTERVAL 10 MINUTE
-        AND database == currentDatabase() AND table == 'test'
-        AND event_type == 'MutatePart';
-"
-
-${CLICKHOUSE_CLIENT} --query "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02378_part_log_profile_events.sql b/tests/queries/0_stateless/02378_part_log_profile_events.sql
new file mode 100644
index 00000000000..38d3f8b4c05
--- /dev/null
+++ b/tests/queries/0_stateless/02378_part_log_profile_events.sql
@@ -0,0 +1,50 @@
+DROP TABLE IF EXISTS test;
+
+CREATE TABLE test (key UInt64, val UInt64) engine = MergeTree Order by key PARTITION BY key >= 128;
+
+SET max_block_size = 64, max_insert_block_size = 64, min_insert_block_size_rows = 64;
+
+INSERT INTO test SELECT number AS key, sipHash64(number) AS val FROM numbers(512);
+
+SYSTEM FLUSH LOGS;
+
+SELECT
+    if(count(DISTINCT query_id) == 1, 'Ok', 'Error: ' || toString(count(DISTINCT query_id))),
+    if(count() == 512 / 64, 'Ok', 'Error: ' || toString(count())), -- 512 rows inserted, 64 rows per block
+    if(SUM(ProfileEvents['MergeTreeDataWriterRows']) == 512, 'Ok', 'Error: ' || toString(SUM(ProfileEvents['MergeTreeDataWriterRows']))),
+    if(SUM(ProfileEvents['MergeTreeDataWriterUncompressedBytes']) >= 1024, 'Ok', 'Error: ' || toString(SUM(ProfileEvents['MergeTreeDataWriterUncompressedBytes']))),
+    if(SUM(ProfileEvents['MergeTreeDataWriterCompressedBytes']) >= 1024, 'Ok', 'Error: ' || toString(SUM(ProfileEvents['MergeTreeDataWriterCompressedBytes']))),
+    if(SUM(ProfileEvents['MergeTreeDataWriterBlocks']) >= 8, 'Ok', 'Error: ' || toString(SUM(ProfileEvents['MergeTreeDataWriterBlocks'])))
+FROM system.part_log
+WHERE event_time > now() - INTERVAL 10 MINUTE
+    AND database == currentDatabase() AND table == 'test'
+    AND event_type == 'NewPart'
+;
+
+OPTIMIZE TABLE test FINAL;
+
+SYSTEM FLUSH LOGS;
+SELECT
+    if(count() > 2, 'Ok', 'Error: ' || toString(count())),
+    if(SUM(ProfileEvents['MergedRows']) >= 512, 'Ok', 'Error: ' || toString(SUM(ProfileEvents['MergedRows'])))
+FROM system.part_log
+WHERE event_time > now() - INTERVAL 10 MINUTE
+    AND database == currentDatabase() AND table == 'test'
+    AND event_type == 'MergeParts'
+;
+
+ALTER TABLE test UPDATE val = 0 WHERE key % 2 == 0 SETTINGS mutations_sync = 2;
+
+SYSTEM FLUSH LOGS;
+
+SELECT
+    if(count() == 2, 'Ok', 'Error: ' || toString(count())),
+    if(SUM(ProfileEvents['MergedRows']) == 512, 'Ok', 'Error: ' || toString(SUM(ProfileEvents['MergedRows']))),
+    if(SUM(ProfileEvents['FileOpen']) > 1, 'Ok', 'Error: ' || toString(SUM(ProfileEvents['FileOpen'])))
+FROM system.part_log
+WHERE event_time > now() - INTERVAL 10 MINUTE
+    AND database == currentDatabase() AND table == 'test'
+    AND event_type == 'MutatePart'
+;
+
+DROP TABLE test;
diff --git a/tests/queries/0_stateless/02379_analyzer_subquery_depth.sql b/tests/queries/0_stateless/02379_analyzer_subquery_depth.sql
index 40303e0f92a..5699a15aead 100644
--- a/tests/queries/0_stateless/02379_analyzer_subquery_depth.sql
+++ b/tests/queries/0_stateless/02379_analyzer_subquery_depth.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT (SELECT a FROM (SELECT 1 AS a)) SETTINGS max_subquery_depth = 1; -- { serverError TOO_DEEP_SUBQUERIES }
 SELECT (SELECT a FROM (SELECT 1 AS a)) SETTINGS max_subquery_depth = 2;
diff --git a/tests/queries/0_stateless/02380_analyzer_join_sample.sql b/tests/queries/0_stateless/02380_analyzer_join_sample.sql
index bc77f3623ae..e417f47d173 100644
--- a/tests/queries/0_stateless/02380_analyzer_join_sample.sql
+++ b/tests/queries/0_stateless/02380_analyzer_join_sample.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table_join_1;
 CREATE TABLE test_table_join_1
diff --git a/tests/queries/0_stateless/02381_analyzer_join_final.sql b/tests/queries/0_stateless/02381_analyzer_join_final.sql
index 0db81ac7728..57fc3aedd8f 100644
--- a/tests/queries/0_stateless/02381_analyzer_join_final.sql
+++ b/tests/queries/0_stateless/02381_analyzer_join_final.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table_join_1;
 CREATE TABLE test_table_join_1
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
index 4e88b67e3dd..ca4af4df6b6 100644
--- 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
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 -- { echoOn }
 
diff --git a/tests/queries/0_stateless/02382_analyzer_matcher_join_using.sql b/tests/queries/0_stateless/02382_analyzer_matcher_join_using.sql
index 6a0b58e7b28..7983b05a69e 100644
--- a/tests/queries/0_stateless/02382_analyzer_matcher_join_using.sql
+++ b/tests/queries/0_stateless/02382_analyzer_matcher_join_using.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table_join_1;
 CREATE TABLE test_table_join_1
diff --git a/tests/queries/0_stateless/02383_analyzer_merge_tree_self_join.sql b/tests/queries/0_stateless/02383_analyzer_merge_tree_self_join.sql
index fbd6fe4db4f..c22a0f4244b 100644
--- a/tests/queries/0_stateless/02383_analyzer_merge_tree_self_join.sql
+++ b/tests/queries/0_stateless/02383_analyzer_merge_tree_self_join.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table_join_1;
 CREATE TABLE test_table_join_1
diff --git a/tests/queries/0_stateless/02383_join_and_filtering_set.sh b/tests/queries/0_stateless/02383_join_and_filtering_set.sh
index a3f12381c97..3a6d60811c9 100755
--- a/tests/queries/0_stateless/02383_join_and_filtering_set.sh
+++ b/tests/queries/0_stateless/02383_join_and_filtering_set.sh
@@ -9,7 +9,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q """
+$CLICKHOUSE_CLIENT -mn -q """
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 
diff --git a/tests/queries/0_stateless/02384_analyzer_dict_get_join_get.sql b/tests/queries/0_stateless/02384_analyzer_dict_get_join_get.sql
index a8ad5c4d957..f4619f20765 100644
--- a/tests/queries/0_stateless/02384_analyzer_dict_get_join_get.sql
+++ b/tests/queries/0_stateless/02384_analyzer_dict_get_join_get.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02385_analyzer_aliases_compound_expression.sql b/tests/queries/0_stateless/02385_analyzer_aliases_compound_expression.sql
index 025e064d23c..861ada9623a 100644
--- a/tests/queries/0_stateless/02385_analyzer_aliases_compound_expression.sql
+++ b/tests/queries/0_stateless/02385_analyzer_aliases_compound_expression.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT cast(tuple(1, 'Value'), 'Tuple(first UInt64, second String)') AS value, value.first, value.second;
 
diff --git a/tests/queries/0_stateless/02386_analyzer_in_function_nested_subqueries.sql b/tests/queries/0_stateless/02386_analyzer_in_function_nested_subqueries.sql
index 64d24aae1b1..c8ca3ff21d4 100644
--- a/tests/queries/0_stateless/02386_analyzer_in_function_nested_subqueries.sql
+++ b/tests/queries/0_stateless/02386_analyzer_in_function_nested_subqueries.sql
@@ -1,3 +1,3 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT (NULL IN (SELECT 9223372036854775806 IN (SELECT 65536), inf, NULL IN (NULL))) IN (SELECT NULL IN (NULL));
diff --git a/tests/queries/0_stateless/02387_analyzer_cte.sql b/tests/queries/0_stateless/02387_analyzer_cte.sql
index 149eab7f741..1f10ac10438 100644
--- a/tests/queries/0_stateless/02387_analyzer_cte.sql
+++ b/tests/queries/0_stateless/02387_analyzer_cte.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02387_parse_date_as_datetime.sql b/tests/queries/0_stateless/02387_parse_date_as_datetime.sql
index 24d367e56b6..9727f677be2 100644
--- a/tests/queries/0_stateless/02387_parse_date_as_datetime.sql
+++ b/tests/queries/0_stateless/02387_parse_date_as_datetime.sql
@@ -1,19 +1,13 @@
 CREATE TEMPORARY TABLE test (`i` Int64, `d` DateTime);
-
 INSERT INTO test FORMAT JSONEachRow {"i": 123, "d": "2022-05-03"};
-
 INSERT INTO test FORMAT JSONEachRow {"i": 456, "d": "2022-05-03 01:02:03"};
-
 SELECT * FROM test ORDER BY i;
 
 DROP TABLE test;
 
 CREATE TEMPORARY TABLE test (`i` Int64, `d` DateTime64);
-
 INSERT INTO test FORMAT JSONEachRow {"i": 123, "d": "2022-05-03"};
-
 INSERT INTO test FORMAT JSONEachRow {"i": 456, "d": "2022-05-03 01:02:03"};
-
 SELECT * FROM test ORDER BY i;
 
 DROP TABLE test;
diff --git a/tests/queries/0_stateless/02388_analyzer_recursive_lambda.sql b/tests/queries/0_stateless/02388_analyzer_recursive_lambda.sql
index 31d6f91a39d..9fd2f73703d 100644
--- a/tests/queries/0_stateless/02388_analyzer_recursive_lambda.sql
+++ b/tests/queries/0_stateless/02388_analyzer_recursive_lambda.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 WITH x -> plus(lambda(1), x) AS lambda SELECT lambda(1048576); -- { serverError UNSUPPORTED_METHOD };
 
diff --git a/tests/queries/0_stateless/02389_analyzer_nested_lambda.sql b/tests/queries/0_stateless/02389_analyzer_nested_lambda.sql
index 51a10adae6a..8e3777ebc15 100644
--- a/tests/queries/0_stateless/02389_analyzer_nested_lambda.sql
+++ b/tests/queries/0_stateless/02389_analyzer_nested_lambda.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 -- { echoOn }
 
diff --git a/tests/queries/0_stateless/02403_enable_extended_results_for_datetime_functions.reference b/tests/queries/0_stateless/02403_enable_extended_results_for_datetime_functions.reference
index 147e368b5c9..c830d790000 100644
--- a/tests/queries/0_stateless/02403_enable_extended_results_for_datetime_functions.reference
+++ b/tests/queries/0_stateless/02403_enable_extended_results_for_datetime_functions.reference
@@ -64,7 +64,7 @@ toStartOfMonth;toDateTime64;false	2099-07-07
 type;toStartOfMonth;toDateTime64;false	Date
 toStartOfWeek;toDate32;false	2099-07-07
 type;toStartOfWeek;toDate32;false	Date
-toStartOfWeek;toDateTime64;false	1970-01-01
+toStartOfWeek;toDateTime64;false	2099-07-07
 type;toStartOfWeek;toDateTime64;false	Date
 toMonday;toDate32;false	2099-07-08
 type;toMonday;toDate32;false	Date
diff --git a/tests/queries/0_stateless/02404_data.CSV b/tests/queries/0_stateless/02404_data.CSV
deleted file mode 100644
index 2d8b5c8daa8..00000000000
--- a/tests/queries/0_stateless/02404_data.CSV
+++ /dev/null
@@ -1,10 +0,0 @@
-0,"1970-01-01"
-1,"1970-01-02"
-2,"1970-01-03"
-3,"1970-01-04"
-4,"1970-01-05"
-5,"1970-01-06"
-6,"1970-01-07"
-7,"1970-01-08"
-8,"1970-01-09"
-9,"1970-01-10"
diff --git a/tests/queries/0_stateless/02404_data.CSVWithNames b/tests/queries/0_stateless/02404_data.CSVWithNames
deleted file mode 100644
index 34647008916..00000000000
--- a/tests/queries/0_stateless/02404_data.CSVWithNames
+++ /dev/null
@@ -1,11 +0,0 @@
-"number","toDate(number)"
-0,"1970-01-01"
-1,"1970-01-02"
-2,"1970-01-03"
-3,"1970-01-04"
-4,"1970-01-05"
-5,"1970-01-06"
-6,"1970-01-07"
-7,"1970-01-08"
-8,"1970-01-09"
-9,"1970-01-10"
diff --git a/tests/queries/0_stateless/02404_data.CustomSeparated b/tests/queries/0_stateless/02404_data.CustomSeparated
deleted file mode 100644
index f3ae1663536..00000000000
--- a/tests/queries/0_stateless/02404_data.CustomSeparated
+++ /dev/null
@@ -1,10 +0,0 @@
-0	1970-01-01
-1	1970-01-02
-2	1970-01-03
-3	1970-01-04
-4	1970-01-05
-5	1970-01-06
-6	1970-01-07
-7	1970-01-08
-8	1970-01-09
-9	1970-01-10
diff --git a/tests/queries/0_stateless/02404_data.JSONCompactEachRow b/tests/queries/0_stateless/02404_data.JSONCompactEachRow
deleted file mode 100644
index de2e0986aab..00000000000
--- a/tests/queries/0_stateless/02404_data.JSONCompactEachRow
+++ /dev/null
@@ -1,10 +0,0 @@
-["0", "1970-01-01"]
-["1", "1970-01-02"]
-["2", "1970-01-03"]
-["3", "1970-01-04"]
-["4", "1970-01-05"]
-["5", "1970-01-06"]
-["6", "1970-01-07"]
-["7", "1970-01-08"]
-["8", "1970-01-09"]
-["9", "1970-01-10"]
diff --git a/tests/queries/0_stateless/02404_data.JSONEachRow b/tests/queries/0_stateless/02404_data.JSONEachRow
deleted file mode 100644
index e77256ac7fc..00000000000
--- a/tests/queries/0_stateless/02404_data.JSONEachRow
+++ /dev/null
@@ -1,10 +0,0 @@
-{"number":"0","toDate(number)":"1970-01-01"}
-{"number":"1","toDate(number)":"1970-01-02"}
-{"number":"2","toDate(number)":"1970-01-03"}
-{"number":"3","toDate(number)":"1970-01-04"}
-{"number":"4","toDate(number)":"1970-01-05"}
-{"number":"5","toDate(number)":"1970-01-06"}
-{"number":"6","toDate(number)":"1970-01-07"}
-{"number":"7","toDate(number)":"1970-01-08"}
-{"number":"8","toDate(number)":"1970-01-09"}
-{"number":"9","toDate(number)":"1970-01-10"}
diff --git a/tests/queries/0_stateless/02404_data.TSKV b/tests/queries/0_stateless/02404_data.TSKV
deleted file mode 100644
index 70f7ad33c8b..00000000000
--- a/tests/queries/0_stateless/02404_data.TSKV
+++ /dev/null
@@ -1,10 +0,0 @@
-number=0	toDate(number)=1970-01-01
-number=1	toDate(number)=1970-01-02
-number=2	toDate(number)=1970-01-03
-number=3	toDate(number)=1970-01-04
-number=4	toDate(number)=1970-01-05
-number=5	toDate(number)=1970-01-06
-number=6	toDate(number)=1970-01-07
-number=7	toDate(number)=1970-01-08
-number=8	toDate(number)=1970-01-09
-number=9	toDate(number)=1970-01-10
diff --git a/tests/queries/0_stateless/02404_data.TSV b/tests/queries/0_stateless/02404_data.TSV
deleted file mode 100644
index f3ae1663536..00000000000
--- a/tests/queries/0_stateless/02404_data.TSV
+++ /dev/null
@@ -1,10 +0,0 @@
-0	1970-01-01
-1	1970-01-02
-2	1970-01-03
-3	1970-01-04
-4	1970-01-05
-5	1970-01-06
-6	1970-01-07
-7	1970-01-08
-8	1970-01-09
-9	1970-01-10
diff --git a/tests/queries/0_stateless/02404_data.TSVWithNames b/tests/queries/0_stateless/02404_data.TSVWithNames
deleted file mode 100644
index 23310234a8c..00000000000
--- a/tests/queries/0_stateless/02404_data.TSVWithNames
+++ /dev/null
@@ -1,11 +0,0 @@
-number	toDate(number)
-0	1970-01-01
-1	1970-01-02
-2	1970-01-03
-3	1970-01-04
-4	1970-01-05
-5	1970-01-06
-6	1970-01-07
-7	1970-01-08
-8	1970-01-09
-9	1970-01-10
diff --git a/tests/queries/0_stateless/02404_data.Values b/tests/queries/0_stateless/02404_data.Values
deleted file mode 100644
index d9a621d7ec9..00000000000
--- a/tests/queries/0_stateless/02404_data.Values
+++ /dev/null
@@ -1 +0,0 @@
-(0,'1970-01-01'),(1,'1970-01-02'),(2,'1970-01-03'),(3,'1970-01-04'),(4,'1970-01-05'),(5,'1970-01-06'),(6,'1970-01-07'),(7,'1970-01-08'),(8,'1970-01-09'),(9,'1970-01-10')
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02404_memory_bound_merging.reference b/tests/queries/0_stateless/02404_memory_bound_merging.reference
index e02684c3b95..0409c48f846 100644
--- a/tests/queries/0_stateless/02404_memory_bound_merging.reference
+++ b/tests/queries/0_stateless/02404_memory_bound_merging.reference
@@ -100,7 +100,7 @@ select a, count() from dist_t_different_dbs group by a, b order by a limit 5 off
 504	2000
 1000000
 -- { echoOn } --
-explain pipeline select a from pr_t group by a order by a limit 5 offset 500 settings parallel_replicas_local_plan=0;
+explain pipeline select a from pr_t group by a order by a limit 5 offset 500;
 (Expression)
 ExpressionTransform
   (Limit)
@@ -119,31 +119,6 @@ ExpressionTransform
                     Resize 1 → 4
                       GroupingAggregatedTransform 3 → 1
                         (ReadFromRemoteParallelReplicas)
-explain pipeline select a from pr_t group by a order by a limit 5 offset 500 settings allow_experimental_analyzer=1, parallel_replicas_local_plan=1;
-(Expression)
-ExpressionTransform
-  (Limit)
-  Limit
-    (Sorting)
-    MergingSortedTransform 4 → 1
-      MergeSortingTransform × 4
-        LimitsCheckingTransform × 4
-          PartialSortingTransform × 4
-            (Expression)
-            ExpressionTransform × 4
-              (MergingAggregated)
-              MergingAggregatedBucketTransform × 4
-                Resize 1 → 4
-                  FinishAggregatingInOrderTransform 3 → 1
-                    (Union)
-                      (Aggregating)
-                      FinalizeAggregatedTransform
-                        AggregatingInOrderTransform
-                          (Expression)
-                          ExpressionTransform
-                            (ReadFromMergeTree)
-                            MergeTreeSelect(pool: ReadPoolParallelReplicasInOrder, algorithm: InOrder) 0 → 1
-                      (ReadFromRemoteParallelReplicas)
 select a, count() from pr_t group by a order by a limit 5 offset 500;
 500	1000
 501	1000
diff --git a/tests/queries/0_stateless/02404_memory_bound_merging.sql b/tests/queries/0_stateless/02404_memory_bound_merging.sql
index 112640a2e2c..a2de19dff8a 100644
--- a/tests/queries/0_stateless/02404_memory_bound_merging.sql
+++ b/tests/queries/0_stateless/02404_memory_bound_merging.sql
@@ -66,14 +66,14 @@ insert into pr_t select number % 1000, number % 1000 from numbers_mt(1e6);
 set allow_experimental_parallel_reading_from_replicas = 1;
 set parallel_replicas_for_non_replicated_merge_tree = 1;
 set max_parallel_replicas = 3;
+set use_hedged_requests = 0;
 set cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost';
 set distributed_aggregation_memory_efficient=1;
 
 select count() from pr_t;
 
 -- { echoOn } --
-explain pipeline select a from pr_t group by a order by a limit 5 offset 500 settings parallel_replicas_local_plan=0;
-explain pipeline select a from pr_t group by a order by a limit 5 offset 500 settings allow_experimental_analyzer=1, parallel_replicas_local_plan=1;
+explain pipeline select a from pr_t group by a order by a limit 5 offset 500;
 
 select a, count() from pr_t group by a order by a limit 5 offset 500;
 select a, count() from pr_t group by a, b order by a limit 5 offset 500;
diff --git a/tests/queries/0_stateless/02404_schema_inference_cache_respect_format_settings.reference b/tests/queries/0_stateless/02404_schema_inference_cache_respect_format_settings.reference
index 3d6b1021916..049603328d9 100644
--- a/tests/queries/0_stateless/02404_schema_inference_cache_respect_format_settings.reference
+++ b/tests/queries/0_stateless/02404_schema_inference_cache_respect_format_settings.reference
@@ -4,7 +4,7 @@ c2	Nullable(Date)
 c1	Nullable(Float64)					
 c2	Nullable(Date)					
 c1	Nullable(Int64)					
-c2	Nullable(DateTime)					
+c2	Nullable(DateTime64(9))					
 c1	UInt8					
 c2	Nullable(Date)					
 4
@@ -14,7 +14,7 @@ toDate(number)	Nullable(Date)
 number	Nullable(Float64)					
 toDate(number)	Nullable(Date)					
 number	Nullable(Int64)					
-toDate(number)	Nullable(DateTime)					
+toDate(number)	Nullable(DateTime64(9))					
 number	Nullable(Int64)					
 toDate(number)	Nullable(Date)					
 4
@@ -24,7 +24,7 @@ c2	Nullable(Date)
 c1	Nullable(Float64)					
 c2	Nullable(Date)					
 c1	Nullable(Int64)					
-c2	Nullable(DateTime)					
+c2	Nullable(DateTime64(9))					
 c1	UInt8					
 c2	Nullable(Date)					
 4
@@ -34,7 +34,7 @@ toDate(number)	Nullable(Date)
 number	Nullable(Float64)					
 toDate(number)	Nullable(Date)					
 number	Nullable(Int64)					
-toDate(number)	Nullable(DateTime)					
+toDate(number)	Nullable(DateTime64(9))					
 number	Nullable(Int64)					
 toDate(number)	Nullable(Date)					
 4
@@ -44,7 +44,7 @@ toDate(number)	Nullable(Date)
 number	Nullable(Float64)					
 toDate(number)	Nullable(Date)					
 number	Nullable(Int64)					
-toDate(number)	Nullable(DateTime)					
+toDate(number)	Nullable(DateTime64(9))					
 number	Nullable(Int64)					
 toDate(number)	Nullable(Date)					
 4
@@ -54,7 +54,7 @@ c2	Nullable(Date)
 c1	Nullable(Float64)					
 c2	Nullable(Date)					
 c1	Nullable(Int64)					
-c2	Nullable(DateTime)					
+c2	Nullable(DateTime64(9))					
 c1	UInt8					
 c2	Nullable(Date)					
 4
@@ -64,7 +64,7 @@ toDate(number)	Nullable(Date)
 number	Nullable(Float64)					
 toDate(number)	Nullable(Date)					
 number	Nullable(Int64)					
-toDate(number)	Nullable(DateTime)					
+toDate(number)	Nullable(DateTime64(9))					
 number	Nullable(Int64)					
 toDate(number)	Nullable(Date)					
 4
@@ -74,7 +74,7 @@ c2	Nullable(Date)
 c1	Nullable(Float64)					
 c2	Nullable(Date)					
 c1	Nullable(Int64)					
-c2	Nullable(DateTime)					
+c2	Nullable(DateTime64(9))					
 c1	UInt8					
 c2	Nullable(Date)					
 4
@@ -84,7 +84,7 @@ c2	Nullable(Date)
 c1	Nullable(Float64)					
 c2	Nullable(Date)					
 c1	Nullable(Int64)					
-c2	Nullable(DateTime)					
+c2	Nullable(DateTime64(9))					
 c1	UInt8					
 c2	Nullable(Date)					
 4
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 1368bf530c8..8dd8910c858 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
@@ -143,6 +143,7 @@ arrayStringConcat
 arraySum
 arrayUniq
 arrayWithConstant
+arrayZip
 asinh
 assumeNotNull
 atan
@@ -415,6 +416,7 @@ logTrace
 lowCardinalityIndices
 lowCardinalityKeys
 lower
+lowerUTF8
 makeDate
 makeDate32
 makeDateTime
@@ -560,7 +562,6 @@ positionCaseInsensitive
 positionCaseInsensitiveUTF8
 positionUTF8
 pow
-printf
 proportionsZTest
 protocol
 queryID
@@ -895,6 +896,7 @@ tupleToNameValuePairs
 unbin
 unhex
 upper
+upperUTF8
 uptime
 validateNestedArraySizes
 version
diff --git a/tests/queries/0_stateless/02416_rename_database_rbac.sh b/tests/queries/0_stateless/02416_rename_database_rbac.sh
index 4d4b54e9384..c319136d29c 100755
--- a/tests/queries/0_stateless/02416_rename_database_rbac.sh
+++ b/tests/queries/0_stateless/02416_rename_database_rbac.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --multiline -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 DROP DATABASE IF EXISTS database_02416;
 CREATE DATABASE database_02416;
 
@@ -18,6 +18,6 @@ REVOKE DROP DATABASE ON database_02416.* FROM 'user_test_02416';
 GRANT CREATE TABLE ON *.* TO 'user_test_02416' WITH GRANT OPTION;
 GRANT DROP TABLE ON *.* TO 'user_test_02416' WITH GRANT OPTION;
 """
-${CLICKHOUSE_CLIENT} --multiline --user user_test_02416 --password user_test_02416 -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery --user user_test_02416 --password user_test_02416 -q """
 RENAME DATABASE user_test_02416 to aaaaaaaaa; -- { serverError 497 }
 """
diff --git a/tests/queries/0_stateless/02417_load_marks_async.sh b/tests/queries/0_stateless/02417_load_marks_async.sh
index bcede9e4f5e..950656e7ab6 100755
--- a/tests/queries/0_stateless/02417_load_marks_async.sh
+++ b/tests/queries/0_stateless/02417_load_marks_async.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS test;"
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -n -q "
 CREATE TABLE test
 (
 n0 UInt64,
diff --git a/tests/queries/0_stateless/02420_final_setting_analyzer.reference b/tests/queries/0_stateless/02420_final_setting_analyzer.reference
index 763ecad84ab..780a6e5de68 100644
--- a/tests/queries/0_stateless/02420_final_setting_analyzer.reference
+++ b/tests/queries/0_stateless/02420_final_setting_analyzer.reference
@@ -1,5 +1,5 @@
 -- { echoOn }
-set enable_analyzer=1;
+set allow_experimental_analyzer=1;
 SYSTEM STOP MERGES tbl;
 -- simple test case
 create table if not exists replacing_mt (x String) engine=ReplacingMergeTree() ORDER BY x;
diff --git a/tests/queries/0_stateless/02420_final_setting_analyzer.sql b/tests/queries/0_stateless/02420_final_setting_analyzer.sql
index 89fff094825..cbdec017602 100644
--- a/tests/queries/0_stateless/02420_final_setting_analyzer.sql
+++ b/tests/queries/0_stateless/02420_final_setting_analyzer.sql
@@ -1,5 +1,5 @@
 -- { echoOn }
-set enable_analyzer=1;
+set allow_experimental_analyzer=1;
 SYSTEM STOP MERGES tbl;
 
 -- simple test case
diff --git a/tests/queries/0_stateless/02421_decimal_in_precision_issue_41125.sql b/tests/queries/0_stateless/02421_decimal_in_precision_issue_41125.sql
index 5a4e23c10bd..fde893626c1 100644
--- a/tests/queries/0_stateless/02421_decimal_in_precision_issue_41125.sql
+++ b/tests/queries/0_stateless/02421_decimal_in_precision_issue_41125.sql
@@ -21,7 +21,7 @@ SELECT count() == 1 FROM dtest WHERE b IN toDecimal64('44.4000', 4);
 SELECT count() == 1 FROM dtest WHERE b IN toDecimal128('44.4000', 4);
 SELECT count() == 1 FROM dtest WHERE b IN toDecimal256('44.4000', 4);
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT count() == 0 FROM (SELECT '33.3' :: Decimal(9, 1) AS a WHERE a IN ('33.33' :: Decimal(9, 2)));
 
diff --git a/tests/queries/0_stateless/02421_explain_subquery.sql b/tests/queries/0_stateless/02421_explain_subquery.sql
index 02f45e8cc3b..2970003cb1c 100644
--- a/tests/queries/0_stateless/02421_explain_subquery.sql
+++ b/tests/queries/0_stateless/02421_explain_subquery.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 
 SELECT count() > 3 FROM (EXPLAIN PIPELINE header = 1 SELECT * FROM system.numbers ORDER BY number DESC) WHERE explain LIKE '%Header: number UInt64%';
 SELECT count() > 0 FROM (EXPLAIN PLAN SELECT * FROM system.numbers ORDER BY number DESC) WHERE explain ILIKE '%Sort%';
@@ -32,7 +32,7 @@ SELECT count() == 1 FROM (EXPLAIN ESTIMATE SELECT sum(a) FROM t1);
 
 DROP TABLE t1;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT count() > 3 FROM (EXPLAIN PIPELINE header = 1 SELECT * FROM system.numbers ORDER BY number DESC) WHERE explain LIKE '%Header: \_\_table1.number UInt64%';
 SELECT count() > 0 FROM (EXPLAIN PLAN SELECT * FROM system.numbers ORDER BY number DESC) WHERE explain ILIKE '%Sort%';
diff --git a/tests/queries/0_stateless/02421_new_type_json_async_insert.reference b/tests/queries/0_stateless/02421_new_type_json_async_insert.reference
deleted file mode 100644
index fdd133460c6..00000000000
--- a/tests/queries/0_stateless/02421_new_type_json_async_insert.reference
+++ /dev/null
@@ -1,5 +0,0 @@
-INCORRECT_DATA
-0
-0
-INCORRECT_DATA
-aaa
diff --git a/tests/queries/0_stateless/02421_new_type_json_async_insert.sh b/tests/queries/0_stateless/02421_new_type_json_async_insert.sh
deleted file mode 100755
index b23470a4179..00000000000
--- a/tests/queries/0_stateless/02421_new_type_json_async_insert.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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 -q "DROP TABLE IF EXISTS t_json_async_insert"
-$CLICKHOUSE_CLIENT --allow_experimental_json_type=1 -q "CREATE TABLE t_json_async_insert (data JSON) ENGINE = MergeTree ORDER BY tuple()"
-
-$CLICKHOUSE_CLIENT --async_insert=1 --wait_for_async_insert=1 -q 'INSERT INTO t_json_async_insert FORMAT JSONAsObject {"aaa"}' 2>&1 | grep -o -m1 "INCORRECT_DATA"
-$CLICKHOUSE_CLIENT -q "SELECT count() FROM t_json_async_insert"
-$CLICKHOUSE_CLIENT -q "SELECT count() FROM system.parts WHERE database = '$CLICKHOUSE_DATABASE' AND table = 't_json_async_insert'"
-
-$CLICKHOUSE_CLIENT --async_insert=1 --wait_for_async_insert=1 -q 'INSERT INTO t_json_async_insert FORMAT JSONAsObject {"aaa"}' 2>&1 | grep -o -m1 "INCORRECT_DATA" &
-$CLICKHOUSE_CLIENT --async_insert=1 --wait_for_async_insert=1 -q 'INSERT INTO t_json_async_insert FORMAT JSONAsObject {"k1": "aaa"}' &
-
-wait
-
-$CLICKHOUSE_CLIENT -q "SELECT data.k1 FROM t_json_async_insert ORDER BY data.k1"
-$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS t_json_async_insert"
diff --git a/tests/queries/0_stateless/02421_new_type_json_empty_parts.reference b/tests/queries/0_stateless/02421_new_type_json_empty_parts.reference
deleted file mode 100644
index 172ea2d3eed..00000000000
--- a/tests/queries/0_stateless/02421_new_type_json_empty_parts.reference
+++ /dev/null
@@ -1,16 +0,0 @@
-Collapsing
-0
-0
-DELETE all
-2
-1
-('k1','String')
-('k2','String')
-0
-0
-TTL
-1
-1
-('k2','String')
-0
-0
diff --git a/tests/queries/0_stateless/02421_new_type_json_empty_parts.sh b/tests/queries/0_stateless/02421_new_type_json_empty_parts.sh
deleted file mode 100755
index 2714b9586f8..00000000000
--- a/tests/queries/0_stateless/02421_new_type_json_empty_parts.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest
-
-set -euo pipefail
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-# shellcheck source=./parts.lib
-. "$CURDIR"/parts.lib
-
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS t_json_empty_parts;"
-${CLICKHOUSE_CLIENT} -q "SELECT 'Collapsing';"
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE t_json_empty_parts (id UInt64, s Int8, data JSON) ENGINE = CollapsingMergeTree(s) ORDER BY id SETTINGS old_parts_lifetime=5;" --allow_experimental_json_type 1
-${CLICKHOUSE_CLIENT} -q "INSERT INTO t_json_empty_parts VALUES (1, 1, '{\"k1\": \"aaa\"}') (1, -1, '{\"k2\": \"bbb\"}');"
-${CLICKHOUSE_CLIENT} -q "SELECT count() FROM t_json_empty_parts;"
-${CLICKHOUSE_CLIENT} -q "SELECT count() FROM system.parts WHERE table = 't_json_empty_parts' AND database = currentDatabase() AND active;"
-${CLICKHOUSE_CLIENT} -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(data)) AS path FROM t_json_empty_parts ORDER BY path"
-
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS t_json_empty_parts;"
-${CLICKHOUSE_CLIENT} -q "SELECT 'DELETE all';"
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE t_json_empty_parts (id UInt64, data JSON) ENGINE = MergeTree ORDER BY id SETTINGS old_parts_lifetime=5;" --allow_experimental_json_type 1
-${CLICKHOUSE_CLIENT} -q "INSERT INTO t_json_empty_parts VALUES (1, '{\"k1\": \"aaa\"}') (1, '{\"k2\": \"bbb\"}');"
-${CLICKHOUSE_CLIENT} -q "SELECT count() FROM t_json_empty_parts;"
-${CLICKHOUSE_CLIENT} -q "SELECT count() FROM system.parts WHERE table = 't_json_empty_parts' AND database = currentDatabase() AND active;"
-${CLICKHOUSE_CLIENT} -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(data)) AS path FROM t_json_empty_parts ORDER BY path"
-${CLICKHOUSE_CLIENT} -q "ALTER TABLE t_json_empty_parts DELETE WHERE 1 SETTINGS mutations_sync = 1;"
-timeout 60 bash -c 'wait_for_delete_empty_parts t_json_empty_parts'
-${CLICKHOUSE_CLIENT} -q "SELECT count() FROM t_json_empty_parts;"
-${CLICKHOUSE_CLIENT} -q "SELECT count() FROM system.parts WHERE table = 't_json_empty_parts' AND database = currentDatabase() AND active;"
-${CLICKHOUSE_CLIENT} -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(data)) AS path FROM t_json_empty_parts ORDER BY path"
-
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS t_json_empty_parts;"
-${CLICKHOUSE_CLIENT} -q "SELECT 'TTL';"
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE t_json_empty_parts (id UInt64, d Date, data JSON) ENGINE = MergeTree ORDER BY id TTL d WHERE id % 2 = 1 SETTINGS old_parts_lifetime=5;" --allow_experimental_json_type 1
-${CLICKHOUSE_CLIENT} -q "INSERT INTO t_json_empty_parts VALUES (1, '2000-01-01', '{\"k1\": \"aaa\"}') (2, '2000-01-01', '{\"k2\": \"bbb\"}');"
-${CLICKHOUSE_CLIENT} -q "OPTIMIZE TABLE t_json_empty_parts FINAL;"
-${CLICKHOUSE_CLIENT} -q "SELECT count() FROM t_json_empty_parts;"
-${CLICKHOUSE_CLIENT} -q "SELECT count() FROM system.parts WHERE table = 't_json_empty_parts' AND database = currentDatabase() AND active;"
-${CLICKHOUSE_CLIENT} -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(data)) AS path FROM t_json_empty_parts ORDER BY path"
-${CLICKHOUSE_CLIENT} -q "ALTER TABLE t_json_empty_parts MODIFY TTL d;"
-${CLICKHOUSE_CLIENT} -q "OPTIMIZE TABLE t_json_empty_parts FINAL;"
-timeout 60 bash -c 'wait_for_delete_empty_parts t_json_empty_parts'
-${CLICKHOUSE_CLIENT} -q "SELECT count() FROM t_json_empty_parts;"
-${CLICKHOUSE_CLIENT} -q "SELECT count() FROM system.parts WHERE table = 't_json_empty_parts' AND database = currentDatabase() AND active;"
-${CLICKHOUSE_CLIENT} -q "SELECT DISTINCT arrayJoin(JSONAllPathsWithTypes(data)) AS path FROM t_json_empty_parts ORDER BY path"
-
-${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS t_json_empty_parts;"
diff --git a/tests/queries/0_stateless/02421_simple_queries_for_opentelemetry.sh b/tests/queries/0_stateless/02421_simple_queries_for_opentelemetry.sh
index 91e85eabcb8..98b571c5968 100755
--- a/tests/queries/0_stateless/02421_simple_queries_for_opentelemetry.sh
+++ b/tests/queries/0_stateless/02421_simple_queries_for_opentelemetry.sh
@@ -9,7 +9,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # $2 - query
 function execute_query()
 {
-  ${CLICKHOUSE_CLIENT} --opentelemetry_start_trace_probability=1 --query_id $1 -q "
+  ${CLICKHOUSE_CLIENT} --opentelemetry_start_trace_probability=1 --query_id $1 -nq "
       ${2}
   "
 }
@@ -18,7 +18,7 @@ function execute_query()
 # so we only to check the db.statement only
 function check_query_span_query_only()
 {
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -nq "
     SYSTEM FLUSH LOGS;
     SELECT attribute['db.statement']       as query
     FROM system.opentelemetry_span_log
@@ -31,7 +31,7 @@ ${CLICKHOUSE_CLIENT} -q "
 
 function check_query_span()
 {
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -nq "
     SYSTEM FLUSH LOGS;
     SELECT attribute['db.statement']             as query,
            attribute['clickhouse.read_rows']     as read_rows,
@@ -47,7 +47,7 @@ ${CLICKHOUSE_CLIENT} -q "
 #
 # Set up
 #
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -nq "
 DROP TABLE IF EXISTS ${CLICKHOUSE_DATABASE}.opentelemetry_test;
 CREATE TABLE ${CLICKHOUSE_DATABASE}.opentelemetry_test (id UInt64) Engine=MergeTree Order By id;
 "
@@ -79,4 +79,4 @@ check_query_span $query_id
 #
 ${CLICKHOUSE_CLIENT} -q "
 DROP TABLE IF EXISTS ${CLICKHOUSE_DATABASE}.opentelemetry_test;
-"
+"
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02421_type_json_async_insert.sh b/tests/queries/0_stateless/02421_type_json_async_insert.sh
index 73d66d116ce..8aa0d510dbb 100755
--- a/tests/queries/0_stateless/02421_type_json_async_insert.sh
+++ b/tests/queries/0_stateless/02421_type_json_async_insert.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS t_json_async_insert"
-$CLICKHOUSE_CLIENT --allow_experimental_object_type=1 -q "CREATE TABLE t_json_async_insert (data Object('json')) ENGINE = MergeTree ORDER BY tuple()"
+$CLICKHOUSE_CLIENT --allow_experimental_object_type=1 -q "CREATE TABLE t_json_async_insert (data JSON) ENGINE = MergeTree ORDER BY tuple()"
 
 $CLICKHOUSE_CLIENT --async_insert=1 --wait_for_async_insert=1 -q 'INSERT INTO t_json_async_insert FORMAT JSONAsObject {"aaa"}' 2>&1 | grep -o -m1 "Cannot parse object"
 $CLICKHOUSE_CLIENT -q "SELECT count() FROM t_json_async_insert"
diff --git a/tests/queries/0_stateless/02421_type_json_empty_parts.sh b/tests/queries/0_stateless/02421_type_json_empty_parts.sh
index 2ecec524e25..b6cf5995bfa 100755
--- a/tests/queries/0_stateless/02421_type_json_empty_parts.sh
+++ b/tests/queries/0_stateless/02421_type_json_empty_parts.sh
@@ -11,7 +11,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS t_json_empty_parts;"
 ${CLICKHOUSE_CLIENT} -q "SELECT 'Collapsing';"
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE t_json_empty_parts (id UInt64, s Int8, data Object('json')) ENGINE = CollapsingMergeTree(s) ORDER BY id SETTINGS old_parts_lifetime=5;" --allow_experimental_object_type 1
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE t_json_empty_parts (id UInt64, s Int8, data JSON) ENGINE = CollapsingMergeTree(s) ORDER BY id SETTINGS old_parts_lifetime=5;" --allow_experimental_object_type 1
 ${CLICKHOUSE_CLIENT} -q "INSERT INTO t_json_empty_parts VALUES (1, 1, '{\"k1\": \"aaa\"}') (1, -1, '{\"k2\": \"bbb\"}');"
 ${CLICKHOUSE_CLIENT} -q "SELECT count() FROM t_json_empty_parts;"
 ${CLICKHOUSE_CLIENT} -q "SELECT count() FROM system.parts WHERE table = 't_json_empty_parts' AND database = currentDatabase() AND active;"
@@ -19,7 +19,7 @@ ${CLICKHOUSE_CLIENT} -q "DESC TABLE t_json_empty_parts SETTINGS describe_extend_
 
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS t_json_empty_parts;"
 ${CLICKHOUSE_CLIENT} -q "SELECT 'DELETE all';"
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE t_json_empty_parts (id UInt64, data Object('json')) ENGINE = MergeTree ORDER BY id SETTINGS old_parts_lifetime=5;" --allow_experimental_object_type 1
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE t_json_empty_parts (id UInt64, data JSON) ENGINE = MergeTree ORDER BY id SETTINGS old_parts_lifetime=5;" --allow_experimental_object_type 1
 ${CLICKHOUSE_CLIENT} -q "INSERT INTO t_json_empty_parts VALUES (1, '{\"k1\": \"aaa\"}') (1, '{\"k2\": \"bbb\"}');"
 ${CLICKHOUSE_CLIENT} -q "SELECT count() FROM t_json_empty_parts;"
 ${CLICKHOUSE_CLIENT} -q "SELECT count() FROM system.parts WHERE table = 't_json_empty_parts' AND database = currentDatabase() AND active;"
@@ -32,7 +32,7 @@ ${CLICKHOUSE_CLIENT} -q "DESC TABLE t_json_empty_parts SETTINGS describe_extend_
 
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS t_json_empty_parts;"
 ${CLICKHOUSE_CLIENT} -q "SELECT 'TTL';"
-${CLICKHOUSE_CLIENT} -q "CREATE TABLE t_json_empty_parts (id UInt64, d Date, data Object('json')) ENGINE = MergeTree ORDER BY id TTL d WHERE id % 2 = 1 SETTINGS old_parts_lifetime=5;" --allow_experimental_object_type 1
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE t_json_empty_parts (id UInt64, d Date, data JSON) ENGINE = MergeTree ORDER BY id TTL d WHERE id % 2 = 1 SETTINGS old_parts_lifetime=5;" --allow_experimental_object_type 1
 ${CLICKHOUSE_CLIENT} -q "INSERT INTO t_json_empty_parts VALUES (1, '2000-01-01', '{\"k1\": \"aaa\"}') (2, '2000-01-01', '{\"k2\": \"bbb\"}');"
 ${CLICKHOUSE_CLIENT} -q "OPTIMIZE TABLE t_json_empty_parts FINAL;"
 ${CLICKHOUSE_CLIENT} -q "SELECT count() FROM t_json_empty_parts;"
diff --git a/tests/queries/0_stateless/02423_ddl_for_opentelemetry.sh b/tests/queries/0_stateless/02423_ddl_for_opentelemetry.sh
index b23c4f376fc..7136698d5b7 100755
--- a/tests/queries/0_stateless/02423_ddl_for_opentelemetry.sh
+++ b/tests/queries/0_stateless/02423_ddl_for_opentelemetry.sh
@@ -39,7 +39,7 @@ function check_span()
         extra_condition=""
     fi
 
-    ret=$(${CLICKHOUSE_CLIENT} -q "
+    ret=$(${CLICKHOUSE_CLIENT} -nq "
         SYSTEM FLUSH LOGS;
 
         SELECT count()
diff --git a/tests/queries/0_stateless/02428_decimal_in_floating_point_literal.sql b/tests/queries/0_stateless/02428_decimal_in_floating_point_literal.sql
index a0d92115188..a84cb5572ba 100644
--- a/tests/queries/0_stateless/02428_decimal_in_floating_point_literal.sql
+++ b/tests/queries/0_stateless/02428_decimal_in_floating_point_literal.sql
@@ -30,7 +30,7 @@ SELECT count() == 1 FROM decimal_in_float_test WHERE a NOT IN (33.333);
 SELECT count() == 1 FROM decimal_in_float_test WHERE b IN (44.44);
 SELECT count() == 1 FROM decimal_in_float_test WHERE b NOT IN (44.4,44.444);
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 
 SELECT toDecimal32(1.555,3) IN (1.5551);
diff --git a/tests/queries/0_stateless/02428_parameterized_view.sh b/tests/queries/0_stateless/02428_parameterized_view.sh
index 95f82db5454..c6f0927db36 100755
--- a/tests/queries/0_stateless/02428_parameterized_view.sh
+++ b/tests/queries/0_stateless/02428_parameterized_view.sh
@@ -72,8 +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) SETTINGS enable_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 enable_analyzer = 1"
+$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/02434_cancel_insert_when_client_dies.sh b/tests/queries/0_stateless/02434_cancel_insert_when_client_dies.sh
index 1548bef857f..dca8dae22c3 100755
--- a/tests/queries/0_stateless/02434_cancel_insert_when_client_dies.sh
+++ b/tests/queries/0_stateless/02434_cancel_insert_when_client_dies.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-random-settings, no-asan, no-msan, no-tsan, no-debug, no-fasttest
-# no-fasttest: The test runs for 40 seconds
+# Tags: no-random-settings, no-asan, no-msan, no-tsan, no-debug
 # shellcheck disable=SC2009
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/02435_rollback_cancelled_queries.sh b/tests/queries/0_stateless/02435_rollback_cancelled_queries.sh
index 1bc7d4cd1d3..776d1f850b0 100755
--- a/tests/queries/0_stateless/02435_rollback_cancelled_queries.sh
+++ b/tests/queries/0_stateless/02435_rollback_cancelled_queries.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-random-settings, no-ordinary-database, no-fasttest
-# no-fasttest: The test is slow (too many small blocks)
+# Tags: no-random-settings, no-ordinary-database
 # shellcheck disable=SC2009
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
@@ -26,7 +25,7 @@ function insert_data
         $CLICKHOUSE_CURL -sS -d 'begin transaction' "$CLICKHOUSE_URL&$TXN_SETTINGS"
         SETTINGS="$SETTINGS&session_check=1"
         BEGIN="begin transaction;"
-        COMMIT=$(echo -ne "\n\n\ncommit")
+        COMMIT=$(echo -ne "\n\ncommit")
     fi
 
     # max_block_size=10000, so external table will contain smaller blocks that will be squashed on insert-select (more chances to catch a bug on query cancellation)
@@ -42,7 +41,7 @@ function insert_data
     else
         # client will send 1000-rows blocks, server will squash them into 110000-rows blocks (more chances to catch a bug on query cancellation)
         $CLICKHOUSE_CLIENT --stacktrace --query_id="$ID" --throw_on_unsupported_query_inside_transaction=0 --implicit_transaction="$IMPLICIT" \
-            --max_block_size=1000 --max_insert_block_size=1000 -q \
+            --max_block_size=1000 --max_insert_block_size=1000 --multiquery -q \
             "${BEGIN}insert into dedup_test settings max_insert_block_size=110000, min_insert_block_size_rows=110000 format TSV$COMMIT" < $DATA_FILE \
             | grep -Fv "Transaction is not in RUNNING state"
     fi
diff --git a/tests/queries/0_stateless/02444_async_broken_outdated_part_loading.sh b/tests/queries/0_stateless/02444_async_broken_outdated_part_loading.sh
index a1313ba16e5..d24c6afcef3 100755
--- a/tests/queries/0_stateless/02444_async_broken_outdated_part_loading.sh
+++ b/tests/queries/0_stateless/02444_async_broken_outdated_part_loading.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 $CLICKHOUSE_CLIENT -q "drop table if exists rmt sync;"
-$CLICKHOUSE_CLIENT -q "create table rmt (n int) engine=ReplicatedMergeTree('/test/02444/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/rmt', '1') order by n settings old_parts_lifetime=600"
+$CLICKHOUSE_CLIENT -q "create table rmt (n int) engine=ReplicatedMergeTree('/test/02444/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/rmt', '1') order by n"
 
 $CLICKHOUSE_CLIENT --insert_keeper_fault_injection_probability=0 -q "insert into rmt values (1);"
 $CLICKHOUSE_CLIENT --insert_keeper_fault_injection_probability=0 -q "insert into rmt values (2);"
diff --git a/tests/queries/0_stateless/02445_replicated_db_alter_partition.sh b/tests/queries/0_stateless/02445_replicated_db_alter_partition.sh
index f716a6aa779..4d9048354a1 100755
--- a/tests/queries/0_stateless/02445_replicated_db_alter_partition.sh
+++ b/tests/queries/0_stateless/02445_replicated_db_alter_partition.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-# Tags: no-fasttest
-# no-fasttest: Slow timeouts
-
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
diff --git a/tests/queries/0_stateless/02446_parent_zero_copy_locks.sql b/tests/queries/0_stateless/02446_parent_zero_copy_locks.sql
index a44322e02cf..86eda526c72 100644
--- a/tests/queries/0_stateless/02446_parent_zero_copy_locks.sql
+++ b/tests/queries/0_stateless/02446_parent_zero_copy_locks.sql
@@ -7,7 +7,7 @@ create table rmt2 (n int, m int, k int) engine=ReplicatedMergeTree('/test/02446/
     settings storage_policy='s3_cache', allow_remote_fs_zero_copy_replication=1, old_parts_lifetime=0, cleanup_delay_period=0, max_cleanup_delay_period=1, cleanup_delay_period_random_add=1, min_bytes_for_wide_part=0;
 
 -- FIXME zero-copy locks may remain in ZooKeeper forever if we failed to insert a part.
--- Probably that's why we have to replace persistent lock with ephemeral sometimes.
+-- Probably that's why we have to replace repsistent lock with ephemeral sometimes.
 -- See also "Replacing persistent lock with ephemeral for path {}. It can happen only in case of local part loss"
 -- in StorageReplicatedMergeTree::createZeroCopyLockNode
 set insert_keeper_fault_injection_probability=0;
@@ -23,10 +23,6 @@ select sleepEachRow(0.5) as test_does_not_rely_on_this;
 insert into rmt1 values(5, 5, 5);
 alter table rmt2 update m = m * 10 where 1 settings mutations_sync=2;
 
--- wait for parts to be merged
-select throwIf(name = 'all_0_5_1_6') from system.parts where database=currentDatabase() and table like 'rmt%' and active
-format Null; -- { retry 30 until serverError FUNCTION_THROW_IF_VALUE_IS_NON_ZERO }
-
 system sync replica rmt2;
 set optimize_throw_if_noop=1;
 optimize table rmt2 final;
@@ -36,10 +32,10 @@ select 1, * from rmt1 order by n;
 system sync replica rmt1;
 select 2, * from rmt2 order by n;
 
--- wait for outdated parts to be removed (do not ignore _state column, so it will count Deleting parts as well)
-select throwIf(count() = 0), groupArray(_state) from (
-select *, _state from system.parts where database=currentDatabase() and table like 'rmt%' and active=0
-) format Null; -- { retry 30 until serverError FUNCTION_THROW_IF_VALUE_IS_NON_ZERO }
+-- a funny way to wait for outdated parts to be removed
+select sleep(1), sleepEachRow(0.1) from url('http://localhost:8123/?param_tries={1..10}&query=' || encodeURLComponent(
+            'select *, _state from system.parts where database=''' || currentDatabase() || ''' and table like ''rmt%'' and active=0'
+    ), 'LineAsString', 's String') settings max_threads=1 format Null;
 
 select *, _state from system.parts where database=currentDatabase() and table like 'rmt%' and active=0;
 
diff --git a/tests/queries/0_stateless/02447_drop_database_replica.sh b/tests/queries/0_stateless/02447_drop_database_replica.sh
index abe99398a56..93a5fcee8e2 100755
--- a/tests/queries/0_stateless/02447_drop_database_replica.sh
+++ b/tests/queries/0_stateless/02447_drop_database_replica.sh
@@ -1,10 +1,5 @@
 #!/usr/bin/env bash
 
-# Tags: no-parallel, no-fasttest
-# no-parallel: This test is not parallel because when we execute system-wide SYSTEM DROP REPLICA,
-#  other tests might shut down the storage in parallel and the test will fail.
-# no-fasttest: It has several tests with timeouts for inactive replicas
-
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
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 96692ba325a..0cd520d8d5d 100755
--- a/tests/queries/0_stateless/02450_kill_distributed_query_deadlock.sh
+++ b/tests/queries/0_stateless/02450_kill_distributed_query_deadlock.sh
@@ -5,24 +5,20 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-# Test that runs a distributed query and cancels it ASAP,
-# this has a chance to trigger a hung/deadlock in ProcessorList.
-for i in {1..50}
-do
+# Test that running distributed query and cancel it ASAP,
+# this can trigger a hung/deadlock in ProcessorList.
+for i in {1..50}; do
     query_id="$CLICKHOUSE_TEST_UNIQUE_NAME-$i"
-    $CLICKHOUSE_CLIENT --format Null --query_id "$query_id" --max_rows_to_read 0 --max_bytes_to_read 0 --max_result_rows 0 --max_result_bytes 0 -q "select * from remote('127.{1|2|3|4|5|6}', numbers(1e12))" 2>/dev/null &
-    while true
-    do
+    $CLICKHOUSE_CLIENT --format Null --query_id "$query_id" -q "select * from remote('127.{1|2|3|4|5|6}', numbers(1e12))" 2>/dev/null &
+    while :; do
         killed_queries="$($CLICKHOUSE_CLIENT -q "kill query where query_id = '$query_id' sync" | wc -l)"
-        if [[ "$killed_queries" -ge 1 ]]
-        then
+        if [[ "$killed_queries" -ge 1 ]]; then
             break
         fi
     done
     wait -n
     query_return_status=$?
-    if [[ $query_return_status -eq 0 ]]
-    then
+    if [[ $query_return_status -eq 0 ]]; then
         echo "Query $query_id should be cancelled, however it returns successfully"
     fi
 done
diff --git a/tests/queries/0_stateless/02451_order_by_monotonic.sh b/tests/queries/0_stateless/02451_order_by_monotonic.sh
index fa0a37678f0..7d1356b4445 100755
--- a/tests/queries/0_stateless/02451_order_by_monotonic.sh
+++ b/tests/queries/0_stateless/02451_order_by_monotonic.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 opts=(
-    "--enable_analyzer=1"
+    "--allow_experimental_analyzer=1"
 )
 
 function explain_sort_description()
diff --git a/tests/queries/0_stateless/02455_one_row_from_csv_memory_usage.sh b/tests/queries/0_stateless/02455_one_row_from_csv_memory_usage.sh
index 1a0bc69f2e8..7906f2917c4 100755
--- a/tests/queries/0_stateless/02455_one_row_from_csv_memory_usage.sh
+++ b/tests/queries/0_stateless/02455_one_row_from_csv_memory_usage.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 #  shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-ln -s "$CUR_DIR"/data_csv/10m_rows.csv.xz $USER_FILES_PATH/${CLICKHOUSE_DATABASE}_10m_rows.csv.xz
+cp "$CUR_DIR"/data_csv/10m_rows.csv.xz $USER_FILES_PATH/${CLICKHOUSE_DATABASE}_10m_rows.csv.xz
 
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM file('${CLICKHOUSE_DATABASE}_10m_rows.csv.xz' , 'CSVWithNames') order by identifier, number, name, surname, birthday LIMIT 1 settings input_format_parallel_parsing=1, max_threads=1, max_parsing_threads=16, min_chunk_bytes_for_parallel_parsing=10485760, max_memory_usage=1000000000"
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM file('${CLICKHOUSE_DATABASE}_10m_rows.csv.xz' , 'CSVWithNames') order by identifier, number, name, surname, birthday LIMIT 1 settings input_format_parallel_parsing=1, max_threads=1, max_parsing_threads=16, min_chunk_bytes_for_parallel_parsing=10485760, max_memory_usage=100000000"
diff --git a/tests/queries/0_stateless/02458_insert_select_progress_tcp.sh b/tests/queries/0_stateless/02458_insert_select_progress_tcp.sh
index 178da822d41..ae3ea017fbb 100755
--- a/tests/queries/0_stateless/02458_insert_select_progress_tcp.sh
+++ b/tests/queries/0_stateless/02458_insert_select_progress_tcp.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     drop table if exists insert_select_progress_tcp;
     create table insert_select_progress_tcp(s UInt16) engine = MergeTree order by s;
 "
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 845f895b7b4..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
@@ -7,22 +7,21 @@ create table test (x Nullable(UInt32), y UInt32) engine=Memory();
 
 set use_structure_from_insertion_table_in_table_functions=2;
 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 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 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}
-
-insert into test select x, y from input() format JSONEachRow {"x" : null, "y" : 42};
+insert into test select x, y from input() format JSONEachRow {"x" : null, "y" : 42}
 
 select * from test order by y;
 
@@ -32,9 +31,9 @@ insert into test select * from file(02458_data.jsonl);
 insert into test select x from file(02458_data.jsonl);
 insert into test select y from file(02458_data.jsonl);
 insert into test select y as x from file(02458_data.jsonl);
-insert into test select c1 from input() format CSV 1,2; -- {serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
 
-insert into test select x from input() format JSONEachRow {"x" : null, "y" : 42};
+insert into test select c1 from input() format CSV 1,2; -- {serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
+insert into test select x from input() format JSONEachRow {"x" : null, "y" : 42}
 
 select * from test order by x;
 
diff --git a/tests/queries/0_stateless/02459_group_by_all.sql b/tests/queries/0_stateless/02459_group_by_all.sql
index 8281c201edf..4f08ee331a4 100644
--- a/tests/queries/0_stateless/02459_group_by_all.sql
+++ b/tests/queries/0_stateless/02459_group_by_all.sql
@@ -21,7 +21,7 @@ select substring(a, 1, 3), substring(substring(substring(a, c, count(b)), 1, cou
 select substring(a, 1, 3), substring(a, 1, count(b)) from group_by_all group by all;
 select count(b) AS len, substring(a, 1, 3), substring(a, 1, len) from group_by_all group by all;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 select a, count(b) from group_by_all group by all order by a;
 select substring(a, 1, 3), count(b) from group_by_all group by all;
diff --git a/tests/queries/0_stateless/02460_projections_and_aggregate_null_if_empty.sh b/tests/queries/0_stateless/02460_projections_and_aggregate_null_if_empty.sh
index 748e134ea99..6e96b9b8afc 100755
--- a/tests/queries/0_stateless/02460_projections_and_aggregate_null_if_empty.sh
+++ b/tests/queries/0_stateless/02460_projections_and_aggregate_null_if_empty.sh
@@ -6,4 +6,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_LOCAL} --aggregate_functions_null_for_empty=1 --query "create table test_date (date Int32) ENGINE = MergeTree ORDER BY (date) as select 20220920; SELECT max(date) FROM test_date";
+${CLICKHOUSE_LOCAL} --aggregate_functions_null_for_empty=1 --multiquery --query "create table test_date (date Int32) ENGINE = MergeTree ORDER BY (date) as select 20220920; SELECT max(date) FROM test_date";
diff --git a/tests/queries/0_stateless/02473_multistep_prewhere.python b/tests/queries/0_stateless/02473_multistep_prewhere.python
index 09326b6365d..a942568233c 100644
--- a/tests/queries/0_stateless/02473_multistep_prewhere.python
+++ b/tests/queries/0_stateless/02473_multistep_prewhere.python
@@ -6,7 +6,7 @@ import sys
 CURDIR = os.path.dirname(os.path.realpath(__file__))
 sys.path.insert(0, os.path.join(CURDIR, "helpers"))
 
-from pure_http_client import ClickHouseClient, requests_session_with_retries
+from pure_http_client import ClickHouseClient
 
 
 class Tester:
@@ -193,9 +193,9 @@ def main():
     url = os.environ["CLICKHOUSE_URL"] + "&max_threads=1"
 
     default_index_granularity = 10
-    total_rows = 7 * default_index_granularity
+    total_rows = 8 * default_index_granularity
     step = default_index_granularity
-    session = requests_session_with_retries()
+    session = requests.Session()
     for index_granularity in [
         default_index_granularity - 1,
         default_index_granularity,
diff --git a/tests/queries/0_stateless/02473_multistep_split_prewhere.python b/tests/queries/0_stateless/02473_multistep_split_prewhere.python
index 10e94059171..19444994fd2 100644
--- a/tests/queries/0_stateless/02473_multistep_split_prewhere.python
+++ b/tests/queries/0_stateless/02473_multistep_split_prewhere.python
@@ -6,7 +6,7 @@ import sys
 CURDIR = os.path.dirname(os.path.realpath(__file__))
 sys.path.insert(0, os.path.join(CURDIR, "helpers"))
 
-from pure_http_client import ClickHouseClient, requests_session_with_retries
+from pure_http_client import ClickHouseClient
 
 
 class Tester:
@@ -161,7 +161,7 @@ def main():
     default_index_granularity = 10
     total_rows = 8 * default_index_granularity
     step = default_index_granularity
-    session = requests_session_with_retries()
+    session = requests.Session()
     for index_granularity in [default_index_granularity - 1, default_index_granularity]:
         tester = Tester(session, url, index_granularity, total_rows)
         # Test combinations of ranges of columns c and d
diff --git a/tests/queries/0_stateless/02474_analyzer_subqueries_table_expression_modifiers.sql b/tests/queries/0_stateless/02474_analyzer_subqueries_table_expression_modifiers.sql
index e86c867043d..5ac8c79d4ed 100644
--- a/tests/queries/0_stateless/02474_analyzer_subqueries_table_expression_modifiers.sql
+++ b/tests/queries/0_stateless/02474_analyzer_subqueries_table_expression_modifiers.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT * FROM (SELECT 1) FINAL; -- { serverError UNSUPPORTED_METHOD }
 SELECT * FROM (SELECT 1) SAMPLE 1/2; -- { serverError UNSUPPORTED_METHOD }
diff --git a/tests/queries/0_stateless/02475_analyzer_join_tree_subquery.sql b/tests/queries/0_stateless/02475_analyzer_join_tree_subquery.sql
index c9e7ac19157..eda90529166 100644
--- a/tests/queries/0_stateless/02475_analyzer_join_tree_subquery.sql
+++ b/tests/queries/0_stateless/02475_analyzer_join_tree_subquery.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 WITH subquery AS (SELECT sum(number) FROM numbers(10)) SELECT * FROM subquery;
 
diff --git a/tests/queries/0_stateless/02475_analyzer_subquery_compound_expression.sql b/tests/queries/0_stateless/02475_analyzer_subquery_compound_expression.sql
index fc9e9d44b42..f96c834c057 100644
--- a/tests/queries/0_stateless/02475_analyzer_subquery_compound_expression.sql
+++ b/tests/queries/0_stateless/02475_analyzer_subquery_compound_expression.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 SELECT cast(tuple(1, 2), 'Tuple(value_1 UInt64, value_2 UInt64)') AS value, value.value_1, value.value_2;
 
diff --git a/tests/queries/0_stateless/02475_or_function_alias_and_const_where.sql b/tests/queries/0_stateless/02475_or_function_alias_and_const_where.sql
index 53b97a1dd2a..ddb0f70c6de 100644
--- a/tests/queries/0_stateless/02475_or_function_alias_and_const_where.sql
+++ b/tests/queries/0_stateless/02475_or_function_alias_and_const_where.sql
@@ -1,2 +1,2 @@
 SELECT (number = 1) AND (number = 2) AS value, sum(value) OVER () FROM numbers(1) WHERE 1;
-SELECT (number = 1) AND (number = 2) AS value, sum(value) OVER () FROM numbers(1) WHERE 1 SETTINGS enable_analyzer=1;
+SELECT (number = 1) AND (number = 2) AS value, sum(value) OVER () FROM numbers(1) WHERE 1 SETTINGS allow_experimental_analyzer=1;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02476_analyzer_identifier_hints.sh b/tests/queries/0_stateless/02476_analyzer_identifier_hints.sh
index 92f519a9f8a..0702c146426 100755
--- a/tests/queries/0_stateless/02476_analyzer_identifier_hints.sh
+++ b/tests/queries/0_stateless/02476_analyzer_identifier_hints.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
     DROP TABLE IF EXISTS test_table;
     CREATE TABLE test_table
     (
@@ -17,64 +17,64 @@ $CLICKHOUSE_CLIENT -q "
     INSERT INTO test_table VALUES (0, 'Value');
 ";
 
-$CLICKHOUSE_CLIENT -q "SELECT value_ FROM test_table SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT value_ FROM test_table SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT test_table.value_ FROM test_table SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT test_table.value_ FROM test_table SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['test_table.value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT test_tabl.value_ FROM test_table SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT test_tabl.value_ FROM test_table SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['test_table.value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT test_table.value_ FROM test_table AS test_table_alias SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT test_table.value_ FROM test_table AS test_table_alias SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['test_table.value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT test_tabl.value_ FROM test_table AS test_table_alias SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT test_tabl.value_ FROM test_table AS test_table_alias SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['test_table.value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT test_table_alias.value_ FROM test_table AS test_table_alias SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT test_table_alias.value_ FROM test_table AS test_table_alias SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['test_table_alias.value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT test_table_alia.value_ FROM test_table AS test_table_alias SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT test_table_alia.value_ FROM test_table AS test_table_alias SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['test_table_alias.value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT value_ FROM (SELECT 1 AS value) SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT value_ FROM (SELECT 1 AS value) SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT subquery.value_ FROM (SELECT 1 AS value) AS subquery SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT subquery.value_ FROM (SELECT 1 AS value) AS subquery SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['subquery.value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT subquer.value_ FROM (SELECT 1 AS value) AS subquery SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT subquer.value_ FROM (SELECT 1 AS value) AS subquery SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['subquery.value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT 1 AS value) SELECT value_ FROM cte_subquery SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT 1 AS value) SELECT value_ FROM cte_subquery SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT 1 AS value) SELECT cte_subquery.value_ FROM cte_subquery SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT 1 AS value) SELECT cte_subquery.value_ FROM cte_subquery SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['cte_subquery.value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT 1 AS value) SELECT cte_subquer.value_ FROM cte_subquery SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT 1 AS value) SELECT cte_subquer.value_ FROM cte_subquery SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['cte_subquery.value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT 1 AS value) SELECT cte_subquery_alias.value_ FROM cte_subquery AS cte_subquery_alias SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT 1 AS value) SELECT cte_subquery_alias.value_ FROM cte_subquery AS cte_subquery_alias SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['cte_subquery_alias.value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT 1 AS value) SELECT cte_subquery_alia.value_ FROM cte_subquery AS cte_subquery_alias SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT 1 AS value) SELECT cte_subquery_alia.value_ FROM cte_subquery AS cte_subquery_alias SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['cte_subquery_alias.value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT 1 AS constant_value, constant_valu SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT 1 AS constant_value, constant_valu SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['constant_value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT 1 AS constant_value, constant_valu SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT 1 AS constant_value, constant_valu SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['constant_value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT 1 AS constant_value, arrayMap(lambda_argument -> lambda_argument + constant_valu, [1, 2, 3]) SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT 1 AS constant_value, arrayMap(lambda_argument -> lambda_argument + constant_valu, [1, 2, 3]) SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['constant_value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "WITH 1 AS constant_value SELECT (SELECT constant_valu) SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "WITH 1 AS constant_value SELECT (SELECT constant_valu) SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['constant_value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
     DROP TABLE IF EXISTS test_table_compound;
     CREATE TABLE test_table_compound
     (
@@ -85,64 +85,64 @@ $CLICKHOUSE_CLIENT -q "
     INSERT INTO test_table_compound VALUES (0, tuple('Value_1'));
 ";
 
-$CLICKHOUSE_CLIENT -q "SELECT value.value_ FROM test_table_compound SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT value.value_ FROM test_table_compound SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT test_table_compound.value.value_ FROM test_table_compound SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT test_table_compound.value.value_ FROM test_table_compound SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['test_table_compound.value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT test_tabl_compound.value.value_ FROM test_table_compound SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT test_tabl_compound.value.value_ FROM test_table_compound SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['test_table_compound.value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT test_table_compound.value.value_ FROM test_table_compound AS test_table_compound_alias SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT test_table_compound.value.value_ FROM test_table_compound AS test_table_compound_alias SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['test_table_compound.value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT test_tabl_compound.value.value_ FROM test_table_compound AS test_table_compound_alias SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT test_tabl_compound.value.value_ FROM test_table_compound AS test_table_compound_alias SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['test_table_compound.value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT test_table_compound_alias.value.value_ FROM test_table_compound AS test_table_compound_alias SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT test_table_compound_alias.value.value_ FROM test_table_compound AS test_table_compound_alias SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['test_table_compound_alias.value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT test_table_compound_alia.value.value_ FROM test_table_compound AS test_table_compound_alias SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT test_table_compound_alia.value.value_ FROM test_table_compound AS test_table_compound_alias SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['test_table_compound_alias.value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT value.value_ FROM (SELECT cast(tuple(1), 'Tuple(value_1 String)') AS value) SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT value.value_ FROM (SELECT cast(tuple(1), 'Tuple(value_1 String)') AS value) SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT subquery.value.value_ FROM (SELECT cast(tuple(1), 'Tuple(value_1 String)') AS value) AS subquery SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT subquery.value.value_ FROM (SELECT cast(tuple(1), 'Tuple(value_1 String)') AS value) AS subquery SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['subquery.value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT subquer.value.value_ FROM (SELECT cast(tuple(1), 'Tuple(value_1 String)') AS value) AS subquery SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT subquer.value.value_ FROM (SELECT cast(tuple(1), 'Tuple(value_1 String)') AS value) AS subquery SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['subquery.value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT cast(tuple(1), 'Tuple(value_1 String)') AS value) SELECT value.value_ FROM cte_subquery SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT cast(tuple(1), 'Tuple(value_1 String)') AS value) SELECT value.value_ FROM cte_subquery SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT cast(tuple(1), 'Tuple(value_1 String)') AS value) SELECT cte_subquery.value.value_ FROM cte_subquery SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT cast(tuple(1), 'Tuple(value_1 String)') AS value) SELECT cte_subquery.value.value_ FROM cte_subquery SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['cte_subquery.value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT cast(tuple(1), 'Tuple(value_1 String)') AS value) SELECT cte_subquer.value.value_ FROM cte_subquery SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT cast(tuple(1), 'Tuple(value_1 String)') AS value) SELECT cte_subquer.value.value_ FROM cte_subquery SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['cte_subquery.value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT cast(tuple(1), 'Tuple(value_1 String)') AS value) SELECT cte_subquery_alias.value.value_ FROM cte_subquery AS cte_subquery_alias SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT cast(tuple(1), 'Tuple(value_1 String)') AS value) SELECT cte_subquery_alias.value.value_ FROM cte_subquery AS cte_subquery_alias SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['cte_subquery_alias.value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT cast(tuple(1), 'Tuple(value_1 String)') AS value) SELECT cte_subquery_alia.value.value_ FROM cte_subquery AS cte_subquery_alias SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "WITH cte_subquery AS (SELECT cast(tuple(1), 'Tuple(value_1 String)') AS value) SELECT cte_subquery_alia.value.value_ FROM cte_subquery AS cte_subquery_alias SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['cte_subquery_alias.value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT cast(tuple(1), 'Tuple(value_1 String)') AS constant_value, constant_value.value_ SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT cast(tuple(1), 'Tuple(value_1 String)') AS constant_value, constant_value.value_ SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['constant_value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT cast(tuple(1), 'Tuple(value_1 String)') AS constant_value, constant_valu.value_ SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT cast(tuple(1), 'Tuple(value_1 String)') AS constant_value, constant_valu.value_ SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['constant_value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT cast(tuple(1), 'Tuple(value_1 String)') AS constant_value, arrayMap(lambda_argument -> lambda_argument + constant_value.value_, [1, 2, 3]) SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT cast(tuple(1), 'Tuple(value_1 String)') AS constant_value, arrayMap(lambda_argument -> lambda_argument + constant_value.value_, [1, 2, 3]) SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['constant_value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "WITH cast(tuple(1), 'Tuple(value_1 String)') AS constant_value SELECT (SELECT constant_value.value_) SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "WITH cast(tuple(1), 'Tuple(value_1 String)') AS constant_value SELECT (SELECT constant_value.value_) SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['constant_value.value_1'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
     DROP TABLE IF EXISTS test_table_1;
     CREATE TABLE test_table_1
     (
@@ -162,30 +162,30 @@ $CLICKHOUSE_CLIENT -q "
     INSERT INTO test_table_2 VALUES (0, 'Value');
 ";
 
-$CLICKHOUSE_CLIENT -q "SELECT test_table_1.value_ FROM test_table_1 INNER JOIN test_table_2 ON test_table_1.id = test_table_2.id SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT test_table_1.value_ FROM test_table_1 INNER JOIN test_table_2 ON test_table_1.id = test_table_2.id SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['test_table_1.value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT test_table_2.value_ FROM test_table_1 INNER JOIN test_table_2 ON test_table_1.id = test_table_2.id SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT test_table_2.value_ FROM test_table_1 INNER JOIN test_table_2 ON test_table_1.id = test_table_2.id SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['test_table_2.value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT t1.value_ FROM test_table_1 AS t1 INNER JOIN test_table_2 AS t2 ON t1.id = t2.id SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT t1.value_ FROM test_table_1 AS t1 INNER JOIN test_table_2 AS t2 ON t1.id = t2.id SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['t1.value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT t2.value_ FROM test_table_1 AS t1 INNER JOIN test_table_2 AS t2 ON t1.id = t2.id SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT t2.value_ FROM test_table_1 AS t1 INNER JOIN test_table_2 AS t2 ON t1.id = t2.id SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['t2.value'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT [1] AS a, a.size1 SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT [1] AS a, a.size1 SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['a.size0'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT ((1))::Tuple(a Tuple(b UInt32)) AS t, t.c SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT ((1))::Tuple(a Tuple(b UInt32)) AS t, t.c SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['t.a'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT ((1))::Tuple(a Tuple(b UInt32)) AS t, t.a.c SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT ((1))::Tuple(a Tuple(b UInt32)) AS t, t.a.c SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['t.a.b'\]" &>/dev/null;
 
 $CLICKHOUSE_CLIENT -q "SELECT 1";
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
     DROP TABLE test_table;
     DROP TABLE test_table_compound;
     DROP TABLE test_table_1;
diff --git a/tests/queries/0_stateless/02476_analyzer_join_with_unused_columns.sql b/tests/queries/0_stateless/02476_analyzer_join_with_unused_columns.sql
index feb6786ffb6..ca937e01238 100644
--- a/tests/queries/0_stateless/02476_analyzer_join_with_unused_columns.sql
+++ b/tests/queries/0_stateless/02476_analyzer_join_with_unused_columns.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT subquery_1.id, subquery_2.id FROM (SELECT 1 AS id, 2 AS value) AS subquery_1, (SELECT 3 AS id, 4 AS value) AS subquery_2;
 
diff --git a/tests/queries/0_stateless/02476_fuse_sum_count.sql b/tests/queries/0_stateless/02476_fuse_sum_count.sql
index 2319e81440b..315bbd10a65 100644
--- a/tests/queries/0_stateless/02476_fuse_sum_count.sql
+++ b/tests/queries/0_stateless/02476_fuse_sum_count.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET optimize_syntax_fuse_functions = 1;
 
 DROP TABLE IF EXISTS fuse_tbl;
diff --git a/tests/queries/0_stateless/02477_analyzer_array_join_with_join.sql b/tests/queries/0_stateless/02477_analyzer_array_join_with_join.sql
index 3d2cc1b1620..7e4ecb98ae8 100644
--- a/tests/queries/0_stateless/02477_analyzer_array_join_with_join.sql
+++ b/tests/queries/0_stateless/02477_analyzer_array_join_with_join.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02477_analyzer_ast_key_condition_crash.sql b/tests/queries/0_stateless/02477_analyzer_ast_key_condition_crash.sql
index 2fc1cc45ce0..53f3a9b23ec 100644
--- a/tests/queries/0_stateless/02477_analyzer_ast_key_condition_crash.sql
+++ b/tests/queries/0_stateless/02477_analyzer_ast_key_condition_crash.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02477_analyzer_function_hints.sh b/tests/queries/0_stateless/02477_analyzer_function_hints.sh
index 23cc5651257..d49c20cab75 100755
--- a/tests/queries/0_stateless/02477_analyzer_function_hints.sh
+++ b/tests/queries/0_stateless/02477_analyzer_function_hints.sh
@@ -1,27 +1,29 @@
 #!/usr/bin/env bash
 
+# Tags: no-parallel
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -q "SELECT plu(1, 1) SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT plu(1, 1) SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['plus'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT uniqExac(1, 1) SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT uniqExac(1, 1) SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['uniqExact'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "DROP FUNCTION IF EXISTS test_user_defined_function_$CLICKHOUSE_DATABASE;"
-$CLICKHOUSE_CLIENT -q "CREATE FUNCTION test_user_defined_function_$CLICKHOUSE_DATABASE AS x -> x + 1;"
-$CLICKHOUSE_CLIENT -q "SELECT test_user_defined_function_${CLICKHOUSE_DATABASE}A(1) SETTINGS enable_analyzer = 1;" 2>&1 \
-   | grep -E "Maybe you meant: \[.*'test_user_defined_function_$CLICKHOUSE_DATABASE'.*\]" &>/dev/null;
-$CLICKHOUSE_CLIENT -q "DROP FUNCTION test_user_defined_function_$CLICKHOUSE_DATABASE";
+$CLICKHOUSE_CLIENT -q "DROP FUNCTION IF EXISTS test_user_defined_function;"
+$CLICKHOUSE_CLIENT -q "CREATE FUNCTION test_user_defined_function AS x -> x + 1;"
+$CLICKHOUSE_CLIENT -q "SELECT test_user_defined_functio(1) SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
+    | grep "Maybe you meant: \['test_user_defined_function'\]" &>/dev/null;
+$CLICKHOUSE_CLIENT -q "DROP FUNCTION test_user_defined_function";
 
-$CLICKHOUSE_CLIENT -q "WITH (x -> x + 1) AS lambda_function SELECT lambda_functio(1) SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "WITH (x -> x + 1) AS lambda_function SELECT lambda_functio(1) SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['lambda_function'\]" &>/dev/null;
 
-$CLICKHOUSE_CLIENT -q "SELECT row_numbe() OVER (PARTITION BY 1) SETTINGS enable_analyzer = 1;" 2>&1 \
+$CLICKHOUSE_CLIENT -q "SELECT row_numbe() OVER (PARTITION BY 1) SETTINGS allow_experimental_analyzer = 1;" 2>&1 \
     | grep "Maybe you meant: \['row_number'\]" &>/dev/null;
 
 $CLICKHOUSE_CLIENT -q "SELECT 1";
diff --git a/tests/queries/0_stateless/02477_exists_fuzz_43478.sql b/tests/queries/0_stateless/02477_exists_fuzz_43478.sql
index c225befed0e..8ec876eb252 100644
--- a/tests/queries/0_stateless/02477_exists_fuzz_43478.sql
+++ b/tests/queries/0_stateless/02477_exists_fuzz_43478.sql
@@ -1,3 +1,3 @@
 create table test_rows_compact_part__fuzz_11 (x UInt32) engine = MergeTree order by x;
 insert into test_rows_compact_part__fuzz_11 select 1;
-select 1 from test_rows_compact_part__fuzz_11 where exists(select 1) settings enable_analyzer=1;
+select 1 from test_rows_compact_part__fuzz_11 where exists(select 1) settings allow_experimental_analyzer=1;
diff --git a/tests/queries/0_stateless/02477_fuse_quantiles.sql b/tests/queries/0_stateless/02477_fuse_quantiles.sql
index 8ddc029f75f..c0719d771d7 100644
--- a/tests/queries/0_stateless/02477_fuse_quantiles.sql
+++ b/tests/queries/0_stateless/02477_fuse_quantiles.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET optimize_syntax_fuse_functions = 1;
 
 DROP TABLE IF EXISTS fuse_tbl;
diff --git a/tests/queries/0_stateless/02477_logical_expressions_optimizer_low_cardinality.reference b/tests/queries/0_stateless/02477_logical_expressions_optimizer_low_cardinality.reference
index 0ce90cde108..11c178ac0d0 100644
--- a/tests/queries/0_stateless/02477_logical_expressions_optimizer_low_cardinality.reference
+++ b/tests/queries/0_stateless/02477_logical_expressions_optimizer_low_cardinality.reference
@@ -19,7 +19,7 @@ QUERY id: 0
                 COLUMN id: 2, column_name: a, result_type: LowCardinality(String), source_id: 3
                 CONSTANT id: 8, constant_value: Tuple_(\'x\', \'y\'), constant_value_type: Tuple(String, String)
           CONSTANT id: 9, constant_value: UInt64_0, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT a
 FROM t_logical_expressions_optimizer_low_cardinality
 WHERE (a = \'x\') OR (\'y\' = a)
@@ -41,7 +41,7 @@ QUERY id: 0
                 COLUMN id: 2, column_name: a, result_type: LowCardinality(String), source_id: 3
                 CONSTANT id: 8, constant_value: Tuple_(\'x\', \'y\'), constant_value_type: Tuple(String, String)
           CONSTANT id: 9, constant_value: UInt64_0, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT a
 FROM t_logical_expressions_optimizer_low_cardinality
 WHERE (a != \'x\') AND (a != \'y\')
@@ -63,7 +63,7 @@ QUERY id: 0
                 COLUMN id: 2, column_name: a, result_type: LowCardinality(String), source_id: 3
                 CONSTANT id: 8, constant_value: Tuple_(\'x\', \'y\'), constant_value_type: Tuple(String, String)
           CONSTANT id: 9, constant_value: \'UInt8\', constant_value_type: String
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT a
 FROM t_logical_expressions_optimizer_low_cardinality
 WHERE (a != \'x\') AND (\'y\' != a)
@@ -85,7 +85,7 @@ QUERY id: 0
                 COLUMN id: 2, column_name: a, result_type: LowCardinality(String), source_id: 3
                 CONSTANT id: 8, constant_value: Tuple_(\'x\', \'y\'), constant_value_type: Tuple(String, String)
           CONSTANT id: 9, constant_value: \'UInt8\', constant_value_type: String
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT a
 FROM t_logical_expressions_optimizer_low_cardinality
 WHERE (b = 0) OR (b = 1)
@@ -111,7 +111,7 @@ QUERY id: 0
               LIST id: 11, nodes: 2
                 COLUMN id: 8, column_name: b, result_type: UInt32, source_id: 3
                 CONSTANT id: 12, constant_value: UInt64_1, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT a
 FROM t_logical_expressions_optimizer_low_cardinality
 WHERE (b != 0) AND (b != 1)
@@ -137,4 +137,4 @@ QUERY id: 0
               LIST id: 11, nodes: 2
                 COLUMN id: 8, column_name: b, result_type: UInt32, source_id: 3
                 CONSTANT id: 12, constant_value: UInt64_1, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
diff --git a/tests/queries/0_stateless/02477_logical_expressions_optimizer_low_cardinality.sql b/tests/queries/0_stateless/02477_logical_expressions_optimizer_low_cardinality.sql
index b328e9658d0..976b21a7e29 100644
--- a/tests/queries/0_stateless/02477_logical_expressions_optimizer_low_cardinality.sql
+++ b/tests/queries/0_stateless/02477_logical_expressions_optimizer_low_cardinality.sql
@@ -5,21 +5,21 @@ CREATE TABLE t_logical_expressions_optimizer_low_cardinality (a LowCardinality(S
 -- LowCardinality case, ignore optimize_min_equality_disjunction_chain_length limit, optimizer applied
 -- Chain of OR equals
 EXPLAIN SYNTAX SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE a = 'x' OR a = 'y';
-EXPLAIN QUERY TREE SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE a = 'x' OR a = 'y' SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE a = 'x' OR a = 'y' SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE a = 'x' OR 'y' = a;
-EXPLAIN QUERY TREE SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE a = 'x' OR 'y' = a SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE a = 'x' OR 'y' = a SETTINGS allow_experimental_analyzer = 1;
 -- Chain of AND notEquals
 EXPLAIN SYNTAX SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE a <> 'x' AND a <> 'y';
-EXPLAIN QUERY TREE SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE a <> 'x' AND a <> 'y' SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE a <> 'x' AND a <> 'y' SETTINGS allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE a <> 'x' AND 'y' <> a;
-EXPLAIN QUERY TREE SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE a <> 'x' AND 'y' <> a SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE a <> 'x' AND 'y' <> a SETTINGS allow_experimental_analyzer = 1;
 
 -- Non-LowCardinality case, optimizer not applied for short chains
 -- Chain of OR equals
 EXPLAIN SYNTAX SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE b = 0 OR b = 1;
-EXPLAIN QUERY TREE SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE b = 0 OR b = 1 SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE b = 0 OR b = 1 SETTINGS allow_experimental_analyzer = 1;
 -- Chain of AND notEquals
 EXPLAIN SYNTAX SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE b <> 0 AND b <> 1;
-EXPLAIN QUERY TREE SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE b <> 0 AND b <> 1 SETTINGS enable_analyzer = 1;
+EXPLAIN QUERY TREE SELECT a FROM t_logical_expressions_optimizer_low_cardinality WHERE b <> 0 AND b <> 1 SETTINGS allow_experimental_analyzer = 1;
 
 DROP TABLE t_logical_expressions_optimizer_low_cardinality;
diff --git a/tests/queries/0_stateless/02478_analyzer_table_expression_aliases.sql b/tests/queries/0_stateless/02478_analyzer_table_expression_aliases.sql
index a1eb88c634d..66f50f7b26d 100644
--- a/tests/queries/0_stateless/02478_analyzer_table_expression_aliases.sql
+++ b/tests/queries/0_stateless/02478_analyzer_table_expression_aliases.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02478_window_frame_type_groups.sql b/tests/queries/0_stateless/02478_window_frame_type_groups.sql
index a01e1813cc1..f762bcb61ee 100644
--- a/tests/queries/0_stateless/02478_window_frame_type_groups.sql
+++ b/tests/queries/0_stateless/02478_window_frame_type_groups.sql
@@ -1,7 +1,7 @@
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 
 SELECT toUInt64(dense_rank(1) OVER (ORDER BY 100 ASC GROUPS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)) FROM numbers(10); -- { serverError NOT_IMPLEMENTED }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT toUInt64(dense_rank(1) OVER (ORDER BY 100 ASC GROUPS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)) FROM numbers(10); -- { serverError NOT_IMPLEMENTED }
diff --git a/tests/queries/0_stateless/02479_analyzer_aggregation_crash.sql b/tests/queries/0_stateless/02479_analyzer_aggregation_crash.sql
index 1e890740665..c931a3ab634 100644
--- a/tests/queries/0_stateless/02479_analyzer_aggregation_crash.sql
+++ b/tests/queries/0_stateless/02479_analyzer_aggregation_crash.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/02479_analyzer_aggregation_totals_rollup_crash_fix.sql b/tests/queries/0_stateless/02479_analyzer_aggregation_totals_rollup_crash_fix.sql
index 004e61ee1a2..6cd3e6a9385 100644
--- a/tests/queries/0_stateless/02479_analyzer_aggregation_totals_rollup_crash_fix.sql
+++ b/tests/queries/0_stateless/02479_analyzer_aggregation_totals_rollup_crash_fix.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT anyLast(number) FROM numbers(1) GROUP BY number WITH ROLLUP WITH TOTALS;
 
diff --git a/tests/queries/0_stateless/02479_analyzer_join_with_constants.sql b/tests/queries/0_stateless/02479_analyzer_join_with_constants.sql
index 503bbe63347..9f77cf39f47 100644
--- a/tests/queries/0_stateless/02479_analyzer_join_with_constants.sql
+++ b/tests/queries/0_stateless/02479_analyzer_join_with_constants.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT * FROM (SELECT 1 AS id) AS t1 INNER JOIN (SELECT 1 AS id) AS t2 ON t1.id = t2.id AND 1;
 
diff --git a/tests/queries/0_stateless/02479_mysql_connect_to_self.sql b/tests/queries/0_stateless/02479_mysql_connect_to_self.sql
index b8ed7e0c03e..cf2220073d3 100644
--- a/tests/queries/0_stateless/02479_mysql_connect_to_self.sql
+++ b/tests/queries/0_stateless/02479_mysql_connect_to_self.sql
@@ -7,7 +7,7 @@ DROP TABLE IF EXISTS foo;
 CREATE TABLE foo (key UInt32, a String, b Int64, c String) ENGINE = TinyLog;
 INSERT INTO foo VALUES (1, 'one', -1, 'een'), (2, 'two', -2, 'twee'), (3, 'three', -3, 'drie'), (4, 'four', -4, 'vier'), (5, 'five', -5, 'vijf');
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT '---';
 SELECT * FROM mysql('127.0.0.1:9004', currentDatabase(), foo, 'default', '', SETTINGS connect_timeout = 100, connection_wait_timeout = 100) ORDER BY key;
diff --git a/tests/queries/0_stateless/02480_analyzer_alias_nullptr.sql b/tests/queries/0_stateless/02480_analyzer_alias_nullptr.sql
index 07503de1b10..f6b381e5c70 100644
--- a/tests/queries/0_stateless/02480_analyzer_alias_nullptr.sql
+++ b/tests/queries/0_stateless/02480_analyzer_alias_nullptr.sql
@@ -1,3 +1,3 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT min(b), x AS b FROM (SELECT max(number) FROM numbers(1)); -- { serverError UNKNOWN_IDENTIFIER }
diff --git a/tests/queries/0_stateless/02480_tets_show_full.sh b/tests/queries/0_stateless/02480_tets_show_full.sh
index 50184857a1f..5f5040ba128 100755
--- a/tests/queries/0_stateless/02480_tets_show_full.sh
+++ b/tests/queries/0_stateless/02480_tets_show_full.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 database=$($CLICKHOUSE_CLIENT -q 'SELECT currentDatabase()')
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 DROP TABLE IF EXISTS test_02480_table;
 DROP VIEW IF EXISTS test_02480_view;
 CREATE TABLE test_02480_table (id Int64) ENGINE=MergeTree ORDER BY id;
diff --git a/tests/queries/0_stateless/02480_tlp_nan.reference b/tests/queries/0_stateless/02480_tlp_nan.reference
index 29e5bffa7f0..befd1f66564 100644
--- a/tests/queries/0_stateless/02480_tlp_nan.reference
+++ b/tests/queries/0_stateless/02480_tlp_nan.reference
@@ -1,21 +1,21 @@
 -- {echo}
-SELECT sqrt(-1) as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=1;
+SELECT sqrt(-1) as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=1;
 nan	0	1	0
-SELECT sqrt(-1) as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=0;
+SELECT sqrt(-1) as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=0;
 nan	0	1	0
-SELECT -inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=1;
+SELECT -inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=1;
 -inf	0	1	0
-SELECT -inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=0;
+SELECT -inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=0;
 -inf	0	1	0
-SELECT NULL as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=1;
+SELECT NULL as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=1;
 \N	\N	\N	1
-SELECT NULL as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=0;
+SELECT NULL as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=0;
 \N	\N	\N	1
-SELECT inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=1;
+SELECT inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=1;
 inf	0	1	0
-SELECT inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=0;
+SELECT inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=0;
 inf	0	1	0
-SELECT nan as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=1;
+SELECT nan as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=1;
 nan	0	1	0
-SELECT nan as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=0;
+SELECT nan as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=0;
 nan	0	1	0
diff --git a/tests/queries/0_stateless/02480_tlp_nan.sql b/tests/queries/0_stateless/02480_tlp_nan.sql
index 55318e0cb30..e24bc9a9830 100644
--- a/tests/queries/0_stateless/02480_tlp_nan.sql
+++ b/tests/queries/0_stateless/02480_tlp_nan.sql
@@ -1,15 +1,15 @@
 -- {echo}
-SELECT sqrt(-1) as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=1;
-SELECT sqrt(-1) as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=0;
+SELECT sqrt(-1) as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=1;
+SELECT sqrt(-1) as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=0;
 
-SELECT -inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=1;
-SELECT -inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=0;
+SELECT -inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=1;
+SELECT -inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=0;
 
-SELECT NULL as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=1;
-SELECT NULL as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=0;
+SELECT NULL as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=1;
+SELECT NULL as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=0;
 
-SELECT inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=1;
-SELECT inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=0;
+SELECT inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=1;
+SELECT inf as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=0;
 
-SELECT nan as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=1;
-SELECT nan as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS enable_analyzer=0;
+SELECT nan as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=1;
+SELECT nan as x, not(x), not(not(x)), (not(x)) IS NULL SETTINGS allow_experimental_analyzer=0;
diff --git a/tests/queries/0_stateless/02481_aggregation_in_order_plan.sql b/tests/queries/0_stateless/02481_aggregation_in_order_plan.sql
index 139e0ed4b77..490060dee6f 100644
--- a/tests/queries/0_stateless/02481_aggregation_in_order_plan.sql
+++ b/tests/queries/0_stateless/02481_aggregation_in_order_plan.sql
@@ -5,5 +5,5 @@ insert into tab select 0, number % 3, 2 - intDiv(number, 3), (number % 3 + 1) *
 insert into tab select 0, number % 3, 2 - intDiv(number, 3), (number % 3 + 1) * 100 from numbers(6);
 
 select a, any(b), c, d from tab where b = 1 group by a, c, d order by c, d settings optimize_aggregation_in_order=1, query_plan_aggregation_in_order=1;
-select * from (explain actions = 1, sorting=1 select a, any(b), c, d from tab where b = 1 group by a, c, d settings optimize_aggregation_in_order=1, query_plan_aggregation_in_order=1) where explain like '%ReadFromMergeTree%' or explain like '%Aggregating%' or explain like '%Order:%' settings enable_analyzer=0;
-select * from (explain actions = 1, sorting=1 select a, any(b), c, d from tab where b = 1 group by a, c, d settings optimize_aggregation_in_order=1, query_plan_aggregation_in_order=1) where explain like '%ReadFromMergeTree%' or explain like '%Aggregating%' or explain like '%Order:%' settings enable_analyzer=1;
+select * from (explain actions = 1, sorting=1 select a, any(b), c, d from tab where b = 1 group by a, c, d settings optimize_aggregation_in_order=1, query_plan_aggregation_in_order=1) where explain like '%ReadFromMergeTree%' or explain like '%Aggregating%' or explain like '%Order:%' settings allow_experimental_analyzer=0;
+select * from (explain actions = 1, sorting=1 select a, any(b), c, d from tab where b = 1 group by a, c, d settings optimize_aggregation_in_order=1, query_plan_aggregation_in_order=1) where explain like '%ReadFromMergeTree%' or explain like '%Aggregating%' or explain like '%Order:%' settings allow_experimental_analyzer=1;
diff --git a/tests/queries/0_stateless/02481_analyzer_join_alias_unknown_identifier_crash.sql b/tests/queries/0_stateless/02481_analyzer_join_alias_unknown_identifier_crash.sql
index 8b5b272f547..0c5f0eba750 100644
--- a/tests/queries/0_stateless/02481_analyzer_join_alias_unknown_identifier_crash.sql
+++ b/tests/queries/0_stateless/02481_analyzer_join_alias_unknown_identifier_crash.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table_join_1;
 CREATE TABLE test_table_join_1
diff --git a/tests/queries/0_stateless/02481_analyzer_optimize_aggregation_arithmetics.sql b/tests/queries/0_stateless/02481_analyzer_optimize_aggregation_arithmetics.sql
index e68de0af522..ca91d137bf4 100644
--- a/tests/queries/0_stateless/02481_analyzer_optimize_aggregation_arithmetics.sql
+++ b/tests/queries/0_stateless/02481_analyzer_optimize_aggregation_arithmetics.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET optimize_arithmetic_operations_in_aggregate_functions = 1;
 
 -- { echoOn }
diff --git a/tests/queries/0_stateless/02481_analyzer_optimize_grouping_sets_keys.sql b/tests/queries/0_stateless/02481_analyzer_optimize_grouping_sets_keys.sql
index 8e6b132f5b7..fef71fdf94f 100644
--- a/tests/queries/0_stateless/02481_analyzer_optimize_grouping_sets_keys.sql
+++ b/tests/queries/0_stateless/02481_analyzer_optimize_grouping_sets_keys.sql
@@ -1,4 +1,4 @@
-set enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 set optimize_syntax_fuse_functions = 0;
 
 EXPLAIN QUERY TREE run_passes=1
diff --git a/tests/queries/0_stateless/02481_async_insert_race_long.sh b/tests/queries/0_stateless/02481_async_insert_race_long.sh
index 91e6c4960e0..d8153967e9a 100755
--- a/tests/queries/0_stateless/02481_async_insert_race_long.sh
+++ b/tests/queries/0_stateless/02481_async_insert_race_long.sh
@@ -7,13 +7,13 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-export MY_CLICKHOUSE_CLIENT="$CLICKHOUSE_CLIENT --async_insert_busy_timeout_min_ms 50 --async_insert_busy_timeout_max_ms 50 --async_insert 1"
+export MY_CLICKHOUSE_CLIENT="$CLICKHOUSE_CLIENT --async_insert_busy_timeout_ms 10 --async_insert_max_data_size 1 --async_insert 1"
 
 function insert1()
 {
     local TIMELIMIT=$((SECONDS+$1))
     while [ $SECONDS -lt "$TIMELIMIT" ]; do
-        ${MY_CLICKHOUSE_CLIENT} --insert_keeper_fault_injection_probability=0 --wait_for_async_insert 0 -q 'INSERT INTO async_inserts_race FORMAT CSV 1,"a"'
+        ${MY_CLICKHOUSE_CLIENT} --wait_for_async_insert 0 -q 'INSERT INTO async_inserts_race FORMAT CSV 1,"a"'
     done
 }
 
@@ -21,7 +21,7 @@ function insert2()
 {
     local TIMELIMIT=$((SECONDS+$1))
     while [ $SECONDS -lt "$TIMELIMIT" ]; do
-        ${MY_CLICKHOUSE_CLIENT} --insert_keeper_fault_injection_probability=0 --wait_for_async_insert 0 -q 'INSERT INTO async_inserts_race FORMAT JSONEachRow {"id": 5, "s": "e"} {"id": 6, "s": "f"}'
+        ${MY_CLICKHOUSE_CLIENT} --wait_for_async_insert 0 -q 'INSERT INTO async_inserts_race FORMAT JSONEachRow {"id": 5, "s": "e"} {"id": 6, "s": "f"}'
     done
 }
 
@@ -29,8 +29,11 @@ function insert3()
 {
     local TIMELIMIT=$((SECONDS+$1))
     while [ $SECONDS -lt "$TIMELIMIT" ]; do
-        ${MY_CLICKHOUSE_CLIENT} --insert_keeper_fault_injection_probability=0 --wait_for_async_insert 1 -q "INSERT INTO async_inserts_race VALUES (7, 'g') (8, 'h')"
+        ${MY_CLICKHOUSE_CLIENT} --wait_for_async_insert 1 -q "INSERT INTO async_inserts_race VALUES (7, 'g') (8, 'h')" &
+        sleep 0.05
     done
+
+    wait
 }
 
 function select1()
diff --git a/tests/queries/0_stateless/02481_parquet_list_monotonically_increasing_offsets.sh b/tests/queries/0_stateless/02481_parquet_list_monotonically_increasing_offsets.sh
index 1027f18fc83..55e6ac2f758 100755
--- a/tests/queries/0_stateless/02481_parquet_list_monotonically_increasing_offsets.sh
+++ b/tests/queries/0_stateless/02481_parquet_list_monotonically_increasing_offsets.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
-# Tags: no-ubsan, no-fasttest, no-tsan, no-msan, no-asan
+# Tags: no-ubsan, no-fasttest, no-tsan
 # It is too slow under TSan
-# It eats too much memory under ASan or MSan
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -12,7 +11,7 @@ echo "Parquet"
 DATA_FILE=$CUR_DIR/data_parquet/list_monotonically_increasing_offsets.parquet
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_load"
 ${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_load (list Array(Int64), json Nullable(String)) ENGINE = Memory"
-cat "$DATA_FILE" | ${CLICKHOUSE_CLIENT} --max_memory_usage 10G -q "INSERT INTO parquet_load FORMAT Parquet"
-${CLICKHOUSE_CLIENT} --max_result_rows 0 --max_result_bytes 0 --query="SELECT * FROM parquet_load" | md5sum
+cat "$DATA_FILE" | ${CLICKHOUSE_CLIENT} -q "INSERT INTO parquet_load FORMAT Parquet"
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_load" | md5sum
 ${CLICKHOUSE_CLIENT} --query="SELECT count() FROM parquet_load"
 ${CLICKHOUSE_CLIENT} --query="drop table parquet_load"
diff --git a/tests/queries/0_stateless/02482_json_nested_arrays_with_same_keys.sh b/tests/queries/0_stateless/02482_json_nested_arrays_with_same_keys.sh
index e0648f4df6e..0d0caa78ea3 100755
--- a/tests/queries/0_stateless/02482_json_nested_arrays_with_same_keys.sh
+++ b/tests/queries/0_stateless/02482_json_nested_arrays_with_same_keys.sh
@@ -21,7 +21,7 @@ echo '
     }
 }' > 02482_object_data.jsonl
 
-$CLICKHOUSE_LOCAL --allow_experimental_object_type=1 -q "select * from file(02482_object_data.jsonl, auto, 'obj Object(''json'')')"
+$CLICKHOUSE_LOCAL --allow_experimental_object_type=1 -q "select * from file(02482_object_data.jsonl, auto, 'obj JSON')"
 
 rm 02482_object_data.jsonl
 
diff --git a/tests/queries/0_stateless/02482_load_parts_refcounts.sh b/tests/queries/0_stateless/02482_load_parts_refcounts.sh
index 4dc7a7fd99b..5303824d97c 100755
--- a/tests/queries/0_stateless/02482_load_parts_refcounts.sh
+++ b/tests/queries/0_stateless/02482_load_parts_refcounts.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT -n --query "
     DROP TABLE IF EXISTS load_parts_refcounts SYNC;
 
     CREATE TABLE load_parts_refcounts (id UInt32)
diff --git a/tests/queries/0_stateless/02482_new_json_nested_arrays_with_same_keys.reference b/tests/queries/0_stateless/02482_new_json_nested_arrays_with_same_keys.reference
deleted file mode 100644
index 3eb1f72bfd6..00000000000
--- a/tests/queries/0_stateless/02482_new_json_nested_arrays_with_same_keys.reference
+++ /dev/null
@@ -1 +0,0 @@
-{"list":[{"nested":{"x":[{"r":"1"},{"r":"2"}]},"x":[{"r":"1"}]}]}
diff --git a/tests/queries/0_stateless/02482_new_json_nested_arrays_with_same_keys.sh b/tests/queries/0_stateless/02482_new_json_nested_arrays_with_same_keys.sh
deleted file mode 100755
index ae98946ad73..00000000000
--- a/tests/queries/0_stateless/02482_new_json_nested_arrays_with_same_keys.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest, no-parallel
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-echo '
-{
-    "obj" :
-    {
-        "list" :
-        [
-            {
-                "nested" : {
-                    "x" : [{"r" : 1}, {"r" : 2}]
-                },
-                "x" : [{"r" : 1}]
-            }
-        ]
-    }
-}' > 02482_object_data.jsonl
-
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 -q "select * from file(02482_object_data.jsonl, auto, 'obj JSON')"
-
-rm 02482_object_data.jsonl
-
diff --git a/tests/queries/0_stateless/02483_cuturlparameter_with_arrays.sql b/tests/queries/0_stateless/02483_cuturlparameter_with_arrays.sql
index 0cf95d10a88..6d64d2685b7 100644
--- a/tests/queries/0_stateless/02483_cuturlparameter_with_arrays.sql
+++ b/tests/queries/0_stateless/02483_cuturlparameter_with_arrays.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 -- { echoOn }
 
diff --git a/tests/queries/0_stateless/02483_elapsed_time.sh b/tests/queries/0_stateless/02483_elapsed_time.sh
index 274b30cefb9..fdb23d6da01 100755
--- a/tests/queries/0_stateless/02483_elapsed_time.sh
+++ b/tests/queries/0_stateless/02483_elapsed_time.sh
@@ -17,7 +17,7 @@ EXCEPTION_BEFORE_START_QUERY="WITH
                                   FROM system.numbers
                                   WHERE number IN (sub)
                               )
-                              SETTINGS enable_global_with_statement = 0, enable_analyzer = 1"
+                              SETTINGS enable_global_with_statement = 0, allow_experimental_analyzer = 1"
 
 
 # For this query the system.query_log needs to show ExceptionBeforeStart and elapsed seconds <= 1.0
diff --git a/tests/queries/0_stateless/02489_analyzer_indexes.sql b/tests/queries/0_stateless/02489_analyzer_indexes.sql
index dcf18016da6..b5438ddd31a 100644
--- a/tests/queries/0_stateless/02489_analyzer_indexes.sql
+++ b/tests/queries/0_stateless/02489_analyzer_indexes.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
@@ -59,3 +59,4 @@ WHERE t1.id = 1 AND t1.value_1 = '1' AND t1.value_2 = '1' AND t1.value_3 = '1'
 SETTINGS force_primary_key = 1, force_data_skipping_indices = 'value_1_idx, value_2_idx, value_3_idx';
 
 DROP TABLE test_table;
+
diff --git a/tests/queries/0_stateless/02490_benchmark_max_consecutive_errors.sh b/tests/queries/0_stateless/02490_benchmark_max_consecutive_errors.sh
index df7e9386662..3c046020773 100755
--- a/tests/queries/0_stateless/02490_benchmark_max_consecutive_errors.sh
+++ b/tests/queries/0_stateless/02490_benchmark_max_consecutive_errors.sh
@@ -5,12 +5,4 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 $CLICKHOUSE_BENCHMARK -q 'select throwIf(1)' |& grep '^An error occurred while processing the query.*Exception:' -c
-RES=$($CLICKHOUSE_BENCHMARK --max-consecutive-errors 10 -q 'select throwIf(1)' |& tee "${CLICKHOUSE_TMP}/${CLICKHOUSE_DATABASE}.log" | grep '^An error occurred while processing the query.*Exception:' -c)
-
-if [ "$RES" -eq 10 ]
-then
-    echo "$RES"
-else
-    echo "$RES"
-    cat "${CLICKHOUSE_TMP}/${CLICKHOUSE_DATABASE}.log"
-fi
+$CLICKHOUSE_BENCHMARK --max-consecutive-errors 10 -q 'select throwIf(1)' |& grep '^An error occurred while processing the query.*Exception:' -c
diff --git a/tests/queries/0_stateless/02493_analyzer_sum_if_to_count_if.sql b/tests/queries/0_stateless/02493_analyzer_sum_if_to_count_if.sql
index 171e080961a..f1dbfa1f32a 100644
--- a/tests/queries/0_stateless/02493_analyzer_sum_if_to_count_if.sql
+++ b/tests/queries/0_stateless/02493_analyzer_sum_if_to_count_if.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET optimize_rewrite_sum_if_to_count_if = 1;
 
 EXPLAIN QUERY TREE (SELECT sumIf(1, (number % 2) == 0) FROM numbers(10));
diff --git a/tests/queries/0_stateless/02493_analyzer_table_functions_untuple.sql b/tests/queries/0_stateless/02493_analyzer_table_functions_untuple.sql
index c9687783dc9..bdbe65c643b 100644
--- a/tests/queries/0_stateless/02493_analyzer_table_functions_untuple.sql
+++ b/tests/queries/0_stateless/02493_analyzer_table_functions_untuple.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT number FROM numbers(untuple(tuple(1)));
 
diff --git a/tests/queries/0_stateless/02493_analyzer_uniq_injective_functions_elimination.sql b/tests/queries/0_stateless/02493_analyzer_uniq_injective_functions_elimination.sql
index ca37c6f3833..5a3b2379fde 100644
--- a/tests/queries/0_stateless/02493_analyzer_uniq_injective_functions_elimination.sql
+++ b/tests/queries/0_stateless/02493_analyzer_uniq_injective_functions_elimination.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1, optimize_injective_functions_inside_uniq = 1;
+SET allow_experimental_analyzer = 1, optimize_injective_functions_inside_uniq = 1;
 
 -- Simple test
 EXPLAIN QUERY TREE SELECT uniqCombined(tuple('')) FROM numbers(1);
diff --git a/tests/queries/0_stateless/02494_analyzer_compound_expression_crash_fix.sql b/tests/queries/0_stateless/02494_analyzer_compound_expression_crash_fix.sql
index 20b0bdd46b0..3e6f9f42724 100644
--- a/tests/queries/0_stateless/02494_analyzer_compound_expression_crash_fix.sql
+++ b/tests/queries/0_stateless/02494_analyzer_compound_expression_crash_fix.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table (
diff --git a/tests/queries/0_stateless/02494_query_cache_bugs.reference b/tests/queries/0_stateless/02494_query_cache_bugs.reference
index ea9017d5394..448e1366ea7 100644
--- a/tests/queries/0_stateless/02494_query_cache_bugs.reference
+++ b/tests/queries/0_stateless/02494_query_cache_bugs.reference
@@ -22,24 +22,3 @@ Row 1:
 ──────
 x: 1
 2
--- Bug 67476: Queries with overflow mode != throw must not be cached by the query cache
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
diff --git a/tests/queries/0_stateless/02494_query_cache_bugs.sql b/tests/queries/0_stateless/02494_query_cache_bugs.sql
index 423068aa646..74496e0f77a 100644
--- a/tests/queries/0_stateless/02494_query_cache_bugs.sql
+++ b/tests/queries/0_stateless/02494_query_cache_bugs.sql
@@ -36,32 +36,4 @@ SELECT count(*) FROM system.query_cache;
 
 DROP TABLE tab;
 
-SELECT '-- Bug 67476: Queries with overflow mode != throw must not be cached by the query cache';
-
-DROP TABLE IF EXISTS tab;
-
-CREATE TABLE tab(c UInt64) ENGINE = Memory;
-
-SYSTEM DROP QUERY CACHE;
-SELECT sum(c) FROM tab SETTINGS read_overflow_mode = 'break', use_query_cache = 1;
-SELECT count(*) from system.query_cache;
-SELECT sum(c) FROM tab SETTINGS read_overflow_mode_leaf = 'break', use_query_cache = 1;
-SELECT count(*) from system.query_cache;
-SELECT sum(c) FROM tab SETTINGS group_by_overflow_mode = 'break', use_query_cache = 1;
-SELECT count(*) from system.query_cache;
-SELECT sum(c) FROM tab SETTINGS sort_overflow_mode = 'break', use_query_cache = 1;
-SELECT count(*) from system.query_cache;
-SELECT sum(c) FROM tab SETTINGS result_overflow_mode = 'break', use_query_cache = 1;
-SELECT count(*) from system.query_cache;
-SELECT sum(c) FROM tab SETTINGS timeout_overflow_mode = 'break', use_query_cache = 1;
-SELECT count(*) from system.query_cache;
-SELECT sum(c) FROM tab SETTINGS set_overflow_mode = 'break', use_query_cache = 1;
-SELECT count(*) from system.query_cache;
-SELECT sum(c) FROM tab SETTINGS join_overflow_mode = 'break', use_query_cache = 1;
-SELECT count(*) from system.query_cache;
-SELECT sum(c) FROM tab SETTINGS transfer_overflow_mode = 'break', use_query_cache = 1;
-SELECT count(*) from system.query_cache;
-SELECT sum(c) FROM tab SETTINGS distinct_overflow_mode = 'break', use_query_cache = 1;
-SELECT count(*) from system.query_cache;
-
 SYSTEM DROP QUERY CACHE;
diff --git a/tests/queries/0_stateless/02494_query_cache_drop_cache.reference b/tests/queries/0_stateless/02494_query_cache_drop_cache.reference
index 6481b5e0770..2f1465d1598 100644
--- a/tests/queries/0_stateless/02494_query_cache_drop_cache.reference
+++ b/tests/queries/0_stateless/02494_query_cache_drop_cache.reference
@@ -1,17 +1,3 @@
-Cache query result in query cache
 1
 1
-DROP entries with a certain tag, no entry will match
-1
-After a full DROP, the cache is empty now
-0
-Cache query result with different or no tag in query cache
-1
-1
-1
-2
-4
-DROP entries with certain tags
-2
-1
 0
diff --git a/tests/queries/0_stateless/02494_query_cache_drop_cache.sql b/tests/queries/0_stateless/02494_query_cache_drop_cache.sql
index 3d064169a4e..bc2e7f442fc 100644
--- a/tests/queries/0_stateless/02494_query_cache_drop_cache.sql
+++ b/tests/queries/0_stateless/02494_query_cache_drop_cache.sql
@@ -4,31 +4,10 @@
 -- (it's silly to use what will be tested below but we have to assume other tests cluttered the query cache)
 SYSTEM DROP QUERY CACHE;
 
-SELECT 'Cache query result in query cache';
+-- Cache query result in query cache
 SELECT 1 SETTINGS use_query_cache = true;
 SELECT count(*) FROM system.query_cache;
 
-SELECT 'DROP entries with a certain tag, no entry will match';
-SYSTEM DROP QUERY CACHE TAG 'tag';
-SELECT count(*) FROM system.query_cache;
-
-SELECT 'After a full DROP, the cache is empty now';
+-- No query results are cached after DROP
 SYSTEM DROP QUERY CACHE;
 SELECT count(*) FROM system.query_cache;
-
--- More tests for DROP with tags:
-
-SELECT 'Cache query result with different or no tag in query cache';
-SELECT 1 SETTINGS use_query_cache = true;
-SELECT 1 SETTINGS use_query_cache = true, query_cache_tag = 'abc';
-SELECT 1 SETTINGS use_query_cache = true, query_cache_tag = 'def';
-SELECT 2 SETTINGS use_query_cache = true;
-SELECT count(*) FROM system.query_cache;
-
-SELECT 'DROP entries with certain tags';
-SYSTEM DROP QUERY CACHE TAG '';
-SELECT count(*) FROM system.query_cache;
-SYSTEM DROP QUERY CACHE TAG 'def';
-SELECT count(*) FROM system.query_cache;
-SYSTEM DROP QUERY CACHE TAG 'abc';
-SELECT count(*) FROM system.query_cache;
diff --git a/tests/queries/0_stateless/02494_query_cache_explain.sql b/tests/queries/0_stateless/02494_query_cache_explain.sql
index decdd92c477..bf376b47fdb 100644
--- a/tests/queries/0_stateless/02494_query_cache_explain.sql
+++ b/tests/queries/0_stateless/02494_query_cache_explain.sql
@@ -1,7 +1,7 @@
 -- Tags: no-parallel
 -- Tag no-parallel: Messes with internal cache
 
-SET enable_analyzer = 1;
+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 9a07ddf0386..24803ed7420 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,8 +15,8 @@ ${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_NO_ANALYZER="SETTINGS use_query_cache=1, max_threads=1, enable_analyzer=0, merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability=0.0"
-SETTINGS_ANALYZER="SETTINGS use_query_cache=1, max_threads=1, enable_analyzer=1, merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability=0.0"
+SETTINGS_NO_ANALYZER="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"
+SETTINGS_ANALYZER="SETTINGS use_query_cache=1, max_threads=1, allow_experimental_analyzer=1, 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 to check the logs.
diff --git a/tests/queries/0_stateless/02494_query_cache_tag.reference b/tests/queries/0_stateless/02494_query_cache_tag.reference
deleted file mode 100644
index f7be5c06ecf..00000000000
--- a/tests/queries/0_stateless/02494_query_cache_tag.reference
+++ /dev/null
@@ -1,12 +0,0 @@
-1
-SELECT 1 SETTINGS use_query_cache = true, query_cache_tag = \'abc\'	abc
----
-1
-1
-SELECT 1 SETTINGS use_query_cache = true	
-SELECT 1 SETTINGS use_query_cache = true, query_cache_tag = \'abc\'	abc
----
-1
-1
-SELECT 1 SETTINGS use_query_cache = true	abc
-SELECT 1 SETTINGS use_query_cache = true	def
diff --git a/tests/queries/0_stateless/02494_query_cache_tag.sql b/tests/queries/0_stateless/02494_query_cache_tag.sql
deleted file mode 100644
index 62d36f6ebe6..00000000000
--- a/tests/queries/0_stateless/02494_query_cache_tag.sql
+++ /dev/null
@@ -1,34 +0,0 @@
--- Tags: no-parallel
--- Tag no-parallel: Messes with internal cache
-
-SYSTEM DROP QUERY CACHE;
-
--- Store the result a single query with a tag in the query cache and check that the system table knows about the tag
-SELECT 1 SETTINGS use_query_cache = true, query_cache_tag = 'abc';
-
-SELECT query, tag FROM system.query_cache;
-
-SELECT '---';
-
-SYSTEM DROP QUERY CACHE;
-
--- Store the result of the same query with two different tags. The cache should store two entries.
-SELECT 1 SETTINGS use_query_cache = true; -- default query_cache_tag = ''
-SELECT 1 SETTINGS use_query_cache = true, query_cache_tag = 'abc';
-SELECT query, tag FROM system.query_cache ORDER BY ALL;
-
-SELECT '---';
-
-SYSTEM DROP QUERY CACHE;
-
--- Like before but the tag is set standalone.
-
-SET query_cache_tag = 'abc';
-SELECT 1 SETTINGS use_query_cache = true;
-
-SET query_cache_tag = 'def';
-SELECT 1 SETTINGS use_query_cache = true;
-
-SELECT query, tag FROM system.query_cache ORDER BY ALL;
-
-SYSTEM DROP QUERY CACHE;
diff --git a/tests/queries/0_stateless/02494_query_cache_user_isolation.sh b/tests/queries/0_stateless/02494_query_cache_user_isolation.sh
index dcad921e013..d55e2460619 100755
--- a/tests/queries/0_stateless/02494_query_cache_user_isolation.sh
+++ b/tests/queries/0_stateless/02494_query_cache_user_isolation.sh
@@ -91,16 +91,16 @@ ${CLICKHOUSE_CLIENT} --user "admin" --query "INSERT INTO user_data (ID, userID)
 
 # Test...
 ${CLICKHOUSE_CLIENT} --user "admin" --query "SELECT '-- policy_1 test'"
-${CLICKHOUSE_CLIENT} --user "admin" "SET ROLE user_role_1; SELECT * FROM user_data" # should only return rows with userID = 1
+${CLICKHOUSE_CLIENT} --user "admin" --multiquery "SET ROLE user_role_1; SELECT * FROM user_data" # should only return rows with userID = 1
 
 ${CLICKHOUSE_CLIENT} --user "admin" --query "SELECT '-- policy_2 test'"
-${CLICKHOUSE_CLIENT} --user "admin" "SET ROLE user_role_2; SELECT * FROM user_data" # should only return rows with userID = 2
+${CLICKHOUSE_CLIENT} --user "admin" --multiquery "SET ROLE user_role_2; SELECT * FROM user_data" # should only return rows with userID = 2
 
 ${CLICKHOUSE_CLIENT} --user "admin" --query "SELECT '-- policy_1 with query cache test'"
-${CLICKHOUSE_CLIENT} --user "admin" "SET ROLE user_role_1; SELECT * FROM user_data SETTINGS use_query_cache = 1" # should only return rows with userID = 1
+${CLICKHOUSE_CLIENT} --user "admin" --multiquery "SET ROLE user_role_1; SELECT * FROM user_data SETTINGS use_query_cache = 1" # should only return rows with userID = 1
 
 ${CLICKHOUSE_CLIENT} --user "admin" --query "SELECT '-- policy_2 with query cache test'"
-${CLICKHOUSE_CLIENT} --user "admin" "SET ROLE user_role_2; SELECT * FROM user_data SETTINGS use_query_cache = 1" # should only return rows with userID = 2 (not userID = 1!)
+${CLICKHOUSE_CLIENT} --user "admin" --multiquery "SET ROLE user_role_2; SELECT * FROM user_data SETTINGS use_query_cache = 1" # should only return rows with userID = 2 (not userID = 1!)
 
 # Cleanup
 ${CLICKHOUSE_CLIENT} --user "admin" --query "DROP ROLE user_role_1"
diff --git a/tests/queries/0_stateless/02495_analyzer_storage_join.sql b/tests/queries/0_stateless/02495_analyzer_storage_join.sql
index 1148cd68338..aeab15862c3 100644
--- a/tests/queries/0_stateless/02495_analyzer_storage_join.sql
+++ b/tests/queries/0_stateless/02495_analyzer_storage_join.sql
@@ -2,7 +2,7 @@ DROP TABLE IF EXISTS t;
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS tj;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET single_join_prefer_left_table = 0;
 
 CREATE TABLE tj (key2 UInt64, key1 Int64, a UInt64, b UInt64, x UInt64, y UInt64) ENGINE = Join(ALL, RIGHT, key1, key2);
@@ -23,7 +23,7 @@ SELECT x FROM t1 ALL RIGHT JOIN tj ON t1.id1 == tj.key1 AND t1.id2 == tj.key2 OR
 SELECT '--- name clashes ---';
 
 CREATE TABLE t (key2 UInt64, key1 Int64, b UInt64, x UInt64, val UInt64) ENGINE = Memory;
-INSERT INTO t VALUES (1, -1, 11, 111, 1111), (2, -2, 22, 222, 2222), (3, -3, 33, 333, 2222), (4, -4, 44, 444, 4444), (5, -5, 55, 555, 5555);
+INSERT INTO t VALUES (1, -1, 11, 111, 1111), (2, -2, 22, 222, 2222), (3, -3, 33, 333, 2222), (4, -4, 44, 444, 4444), (5, -5, 55, 555, 5555)
 
 SELECT '-- using --';
 
diff --git a/tests/queries/0_stateless/02495_sum_if_to_count_if_bug.sql b/tests/queries/0_stateless/02495_sum_if_to_count_if_bug.sql
index c00c0ba4e07..0791b374668 100644
--- a/tests/queries/0_stateless/02495_sum_if_to_count_if_bug.sql
+++ b/tests/queries/0_stateless/02495_sum_if_to_count_if_bug.sql
@@ -1,3 +1,4 @@
 select sum(if((number % NULL) = 2, 0, 1)) FROM numbers(1024) settings optimize_rewrite_sum_if_to_count_if=0;
-select sum(if((number % NULL) = 2, 0, 1)) FROM numbers(1024) settings optimize_rewrite_sum_if_to_count_if=1, enable_analyzer=0;
-select sum(if((number % NULL) = 2, 0, 1)) FROM numbers(1024) settings optimize_rewrite_sum_if_to_count_if=1, enable_analyzer=1;
+select sum(if((number % NULL) = 2, 0, 1)) FROM numbers(1024) settings optimize_rewrite_sum_if_to_count_if=1, allow_experimental_analyzer=0;
+select sum(if((number % NULL) = 2, 0, 1)) FROM numbers(1024) settings optimize_rewrite_sum_if_to_count_if=1, allow_experimental_analyzer=1;
+
diff --git a/tests/queries/0_stateless/02496_remove_redundant_sorting.reference b/tests/queries/0_stateless/02496_remove_redundant_sorting.reference
index 7824fd8cba9..4d004f2f78f 100644
--- a/tests/queries/0_stateless/02496_remove_redundant_sorting.reference
+++ b/tests/queries/0_stateless/02496_remove_redundant_sorting.reference
@@ -395,9 +395,9 @@ Expression ((Projection + Before ORDER BY))
         Union
           Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
             ReadFromStorage (SystemOne)
-          Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
+          Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
             ReadFromStorage (SystemOne)
-          Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
+          Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
             ReadFromStorage (SystemOne)
 -- execute
 Float64	9007199254740994
@@ -427,9 +427,9 @@ Expression ((Projection + Before ORDER BY))
         Union
           Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
             ReadFromStorage (SystemOne)
-          Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
+          Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
             ReadFromStorage (SystemOne)
-          Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
+          Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
             ReadFromStorage (SystemOne)
 -- execute
 Nullable(Float64)	9007199254740994
@@ -459,9 +459,9 @@ Expression ((Projection + Before ORDER BY))
         Union
           Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
             ReadFromStorage (SystemOne)
-          Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
+          Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
             ReadFromStorage (SystemOne)
-          Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
+          Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
             ReadFromStorage (SystemOne)
 -- execute
 Float64	9007199254740994
diff --git a/tests/queries/0_stateless/02496_remove_redundant_sorting.sh b/tests/queries/0_stateless/02496_remove_redundant_sorting.sh
index 6e132c55628..953f1257365 100755
--- a/tests/queries/0_stateless/02496_remove_redundant_sorting.sh
+++ b/tests/queries/0_stateless/02496_remove_redundant_sorting.sh
@@ -8,8 +8,8 @@ if [ -z ${ENABLE_ANALYZER+x} ]; then
     ENABLE_ANALYZER=0
 fi
 
-DISABLE_OPTIMIZATION="SET enable_analyzer=$ENABLE_ANALYZER;SET query_plan_remove_redundant_sorting=0;SET optimize_duplicate_order_by_and_distinct=0"
-ENABLE_OPTIMIZATION="SET enable_analyzer=$ENABLE_ANALYZER;SET query_plan_remove_redundant_sorting=1;SET optimize_duplicate_order_by_and_distinct=0"
+DISABLE_OPTIMIZATION="SET allow_experimental_analyzer=$ENABLE_ANALYZER;SET query_plan_remove_redundant_sorting=0;SET optimize_duplicate_order_by_and_distinct=0"
+ENABLE_OPTIMIZATION="SET allow_experimental_analyzer=$ENABLE_ANALYZER;SET query_plan_remove_redundant_sorting=1;SET optimize_duplicate_order_by_and_distinct=0"
 
 echo "-- Disabled query_plan_remove_redundant_sorting"
 echo "-- ORDER BY clauses in subqueries are untouched"
@@ -26,15 +26,15 @@ FROM
     ORDER BY number DESC
 )
 ORDER BY number ASC"
-$CLICKHOUSE_CLIENT -q "$DISABLE_OPTIMIZATION;EXPLAIN $query"
+$CLICKHOUSE_CLIENT -nq "$DISABLE_OPTIMIZATION;EXPLAIN $query"
 
 function run_query {
     echo "-- query"
     echo "$1"
     echo "-- explain"
-    $CLICKHOUSE_CLIENT -q "$ENABLE_OPTIMIZATION;EXPLAIN $1"
+    $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;EXPLAIN $1"
     echo "-- execute"
-    $CLICKHOUSE_CLIENT -q "$ENABLE_OPTIMIZATION;$1"
+    $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;$1"
 }
 
 echo "-- Enabled query_plan_remove_redundant_sorting"
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 3c68d14fdf2..dd5ac7bf706 100644
--- a/tests/queries/0_stateless/02496_remove_redundant_sorting_analyzer.reference
+++ b/tests/queries/0_stateless/02496_remove_redundant_sorting_analyzer.reference
@@ -394,9 +394,9 @@ Expression ((Project names + Projection))
         Union
           Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
             ReadFromStorage (SystemOne)
-          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
             ReadFromStorage (SystemOne)
-          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
             ReadFromStorage (SystemOne)
 -- execute
 Float64	9007199254740994
@@ -426,9 +426,9 @@ Expression ((Project names + Projection))
         Union
           Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
             ReadFromStorage (SystemOne)
-          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
             ReadFromStorage (SystemOne)
-          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
             ReadFromStorage (SystemOne)
 -- execute
 Nullable(Float64)	9007199254740994
@@ -458,9 +458,9 @@ Expression ((Project names + Projection))
         Union
           Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
             ReadFromStorage (SystemOne)
-          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
             ReadFromStorage (SystemOne)
-          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
             ReadFromStorage (SystemOne)
 -- execute
 Float64	9007199254740994
diff --git a/tests/queries/0_stateless/02497_analyzer_sum_if_count_if_pass_crash_fix.sql b/tests/queries/0_stateless/02497_analyzer_sum_if_count_if_pass_crash_fix.sql
index 7533a333225..51522565014 100644
--- a/tests/queries/0_stateless/02497_analyzer_sum_if_count_if_pass_crash_fix.sql
+++ b/tests/queries/0_stateless/02497_analyzer_sum_if_count_if_pass_crash_fix.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET optimize_rewrite_sum_if_to_count_if = 1;
 
 SELECT sum(if((number % 2) = 0 AS cond_expr, 1 AS one_expr, 0 AS zero_expr) AS if_expr), sum(cond_expr), sum(if_expr), one_expr, zero_expr FROM numbers(100);
diff --git a/tests/queries/0_stateless/02497_having_without_actual_aggregation_bug.sql b/tests/queries/0_stateless/02497_having_without_actual_aggregation_bug.sql
index e5fd26e484e..b28cbd4861e 100644
--- a/tests/queries/0_stateless/02497_having_without_actual_aggregation_bug.sql
+++ b/tests/queries/0_stateless/02497_having_without_actual_aggregation_bug.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 select number from numbers_mt(10) having number >= 9;
 
diff --git a/tests/queries/0_stateless/02497_if_transform_strings_to_enum.sql b/tests/queries/0_stateless/02497_if_transform_strings_to_enum.sql
index cc2d839fbc1..131eac390f1 100644
--- a/tests/queries/0_stateless/02497_if_transform_strings_to_enum.sql
+++ b/tests/queries/0_stateless/02497_if_transform_strings_to_enum.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET optimize_if_transform_strings_to_enum = 1;
 
 SELECT transform(number, [2, 4, 6], ['google', 'censor.net', 'yahoo'], 'other') FROM system.numbers LIMIT 10;
diff --git a/tests/queries/0_stateless/02497_remote_disk_fat_column.sql b/tests/queries/0_stateless/02497_remote_disk_fat_column.sql
index 65519296602..d97109b66f3 100644
--- a/tests/queries/0_stateless/02497_remote_disk_fat_column.sql
+++ b/tests/queries/0_stateless/02497_remote_disk_fat_column.sql
@@ -2,7 +2,7 @@
 set allow_suspicious_fixed_string_types=1;
 create table fat_granularity (x UInt32, fat FixedString(160000)) engine = MergeTree order by x settings storage_policy = 's3_cache';
 
-insert into fat_granularity select number, toString(number) || '_' from numbers(100000) settings max_block_size = 3000, max_insert_threads = 8, min_insert_block_size_rows = 0, min_insert_block_size_bytes = 0;
+insert into fat_granularity select number, toString(number) || '_' from numbers(100000) settings max_block_size = 8192, max_insert_threads=8;
 
 -- Too large sizes of FixedString to deserialize
 select x from fat_granularity prewhere fat like '256\_%' settings max_threads=2;
diff --git a/tests/queries/0_stateless/02497_storage_file_reader_selection.sh b/tests/queries/0_stateless/02497_storage_file_reader_selection.sh
index 27243dd47fa..aa43e81f131 100755
--- a/tests/queries/0_stateless/02497_storage_file_reader_selection.sh
+++ b/tests/queries/0_stateless/02497_storage_file_reader_selection.sh
@@ -13,6 +13,6 @@ $CLICKHOUSE_LOCAL --storage_file_read_method=mmap --print-profile-events -q "SEL
 $CLICKHOUSE_LOCAL --storage_file_read_method=pread --print-profile-events -q "SELECT * FROM file($DATA_FILE) FORMAT Null" 2>&1 | grep -F -q "CreatedReadBufferMMap" && echo 'Fail' || echo 0
 $CLICKHOUSE_LOCAL --storage_file_read_method=pread --print-profile-events -q "SELECT * FROM file($DATA_FILE) FORMAT Null" 2>&1 | grep -F -q "CreatedReadBufferOrdinary" && echo 1 || echo 'Fail'
 
-$CLICKHOUSE_CLIENT --storage_file_read_method=mmap -q "SELECT * FROM file('/dev/null', 'LineAsString') FORMAT Null -- { serverError BAD_ARGUMENTS }"
+$CLICKHOUSE_CLIENT --storage_file_read_method=mmap -nq "SELECT * FROM file('/dev/null', 'LineAsString') FORMAT Null -- { serverError BAD_ARGUMENTS }"
 
 rm $DATA_FILE
diff --git a/tests/queries/0_stateless/02497_storage_join_right_assert.sql b/tests/queries/0_stateless/02497_storage_join_right_assert.sql
index eabaa236379..8f9134e9504 100644
--- a/tests/queries/0_stateless/02497_storage_join_right_assert.sql
+++ b/tests/queries/0_stateless/02497_storage_join_right_assert.sql
@@ -7,8 +7,8 @@ CREATE TABLE t2 (key UInt64, a UInt64) ENGINE = Join(ALL, RIGHT, key);
 INSERT INTO t1 VALUES (1, 1), (2, 2);
 INSERT INTO t2 VALUES (2, 2), (3, 3);
 
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 SELECT * FROM t1 ALL RIGHT JOIN t2 USING (key) ORDER BY key;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SELECT * FROM t1 ALL RIGHT JOIN t2 USING (key) ORDER BY key;
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 76c44f9e0cb..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
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET optimize_arithmetic_operations_in_aggregate_functions = 1;
 
 DROP TABLE IF EXISTS test_table;
diff --git a/tests/queries/0_stateless/02498_analyzer_settings_push_down.sql b/tests/queries/0_stateless/02498_analyzer_settings_push_down.sql
index 472ab358d97..67623869f0a 100644
--- a/tests/queries/0_stateless/02498_analyzer_settings_push_down.sql
+++ b/tests/queries/0_stateless/02498_analyzer_settings_push_down.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET optimize_functions_to_subcolumns = 0;
 
 DROP TABLE IF EXISTS test_table;
diff --git a/tests/queries/0_stateless/02498_storage_join_key_positions.sql.j2 b/tests/queries/0_stateless/02498_storage_join_key_positions.sql.j2
index e814b8eaf3f..e2dad61a93e 100644
--- a/tests/queries/0_stateless/02498_storage_join_key_positions.sql.j2
+++ b/tests/queries/0_stateless/02498_storage_join_key_positions.sql.j2
@@ -13,7 +13,7 @@ INSERT INTO tjj VALUES (11, 11, 11, 1000), (21, 21, 21, 2000), (31, 31, 31, 3000
 
 
 {% for use_analyzer in [0, 1] -%}
-SET enable_analyzer = '{{ use_analyzer }}';
+SET allow_experimental_analyzer = '{{ use_analyzer }}';
 
 SELECT '--- using ---';
 SELECT * FROM t1 ALL INNER JOIN tj USING (key1, key2, key3) ORDER BY key1;
diff --git a/tests/queries/0_stateless/02499_analyzer_aggregate_function_lambda_crash_fix.sql b/tests/queries/0_stateless/02499_analyzer_aggregate_function_lambda_crash_fix.sql
index 7ac817aecde..f2698512112 100644
--- a/tests/queries/0_stateless/02499_analyzer_aggregate_function_lambda_crash_fix.sql
+++ b/tests/queries/0_stateless/02499_analyzer_aggregate_function_lambda_crash_fix.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT count((t, x_0, x_1) -> ((key_2, x_0, x_1) IN (NULL, NULL, '0.3'))) FROM numbers(10); -- { serverError UNSUPPORTED_METHOD }
 SELECT count((t, x_0, x_1) -> ((key_2, x_0, x_1) IN (NULL, NULL, '0.3'))) OVER (PARTITION BY id) FROM numbers(10); -- { serverError UNSUPPORTED_METHOD }
diff --git a/tests/queries/0_stateless/02499_analyzer_set_index.sql b/tests/queries/0_stateless/02499_analyzer_set_index.sql
index 52d96cfcabf..f90ae61541f 100644
--- a/tests/queries/0_stateless/02499_analyzer_set_index.sql
+++ b/tests/queries/0_stateless/02499_analyzer_set_index.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02500_analyzer_storage_view_crash_fix.sql b/tests/queries/0_stateless/02500_analyzer_storage_view_crash_fix.sql
index f0484a68566..8f4d14b95cc 100644
--- a/tests/queries/0_stateless/02500_analyzer_storage_view_crash_fix.sql
+++ b/tests/queries/0_stateless/02500_analyzer_storage_view_crash_fix.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02500_remove_redundant_distinct.reference b/tests/queries/0_stateless/02500_remove_redundant_distinct.reference
index 9bb8f4a4017..d7623cd5541 100644
--- a/tests/queries/0_stateless/02500_remove_redundant_distinct.reference
+++ b/tests/queries/0_stateless/02500_remove_redundant_distinct.reference
@@ -53,7 +53,7 @@ Expression (Projection)
               Distinct (Preliminary DISTINCT)
                 Expression (Before ORDER BY)
                   ReadFromSystemNumbers
-          Expression ((Before ORDER BY + Projection))
+          Expression (( + Projection))
             Distinct
               Distinct (Preliminary DISTINCT)
                 Expression (Before ORDER BY)
@@ -536,7 +536,7 @@ Expression (Projection)
               Distinct (Preliminary DISTINCT)
                 Expression (Before ORDER BY)
                   ReadFromSystemNumbers
-          Expression ((Before ORDER BY + Projection))
+          Expression (( + Projection))
             Distinct
               Distinct (Preliminary DISTINCT)
                 Expression (Before ORDER BY)
diff --git a/tests/queries/0_stateless/02500_remove_redundant_distinct.sh b/tests/queries/0_stateless/02500_remove_redundant_distinct.sh
index 6fd42fa940a..c4f0994cd13 100755
--- a/tests/queries/0_stateless/02500_remove_redundant_distinct.sh
+++ b/tests/queries/0_stateless/02500_remove_redundant_distinct.sh
@@ -9,8 +9,8 @@ if [ -z ${ENABLE_ANALYZER+x} ]; then
 fi
 
 OPTIMIZATION_SETTING="query_plan_remove_redundant_distinct"
-DISABLE_OPTIMIZATION="set enable_analyzer=$ENABLE_ANALYZER;SET $OPTIMIZATION_SETTING=0;SET optimize_duplicate_order_by_and_distinct=0"
-ENABLE_OPTIMIZATION="set enable_analyzer=$ENABLE_ANALYZER;SET $OPTIMIZATION_SETTING=1;SET optimize_duplicate_order_by_and_distinct=0"
+DISABLE_OPTIMIZATION="set allow_experimental_analyzer=$ENABLE_ANALYZER;SET $OPTIMIZATION_SETTING=0;SET optimize_duplicate_order_by_and_distinct=0"
+ENABLE_OPTIMIZATION="set allow_experimental_analyzer=$ENABLE_ANALYZER;SET $OPTIMIZATION_SETTING=1;SET optimize_duplicate_order_by_and_distinct=0"
 
 echo "-- Disabled $OPTIMIZATION_SETTING"
 query="SELECT DISTINCT *
@@ -24,15 +24,15 @@ FROM
     )
 )"
 
-$CLICKHOUSE_CLIENT -q "$DISABLE_OPTIMIZATION;EXPLAIN $query"
+$CLICKHOUSE_CLIENT -nq "$DISABLE_OPTIMIZATION;EXPLAIN $query"
 
 function run_query {
     echo "-- query"
     echo "$1"
     echo "-- explain"
-    $CLICKHOUSE_CLIENT -q "$ENABLE_OPTIMIZATION;EXPLAIN $1"
+    $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;EXPLAIN $1"
     echo "-- execute"
-    $CLICKHOUSE_CLIENT -q "$ENABLE_OPTIMIZATION;$1"
+    $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;$1"
 }
 
 echo "-- Enabled $OPTIMIZATION_SETTING"
diff --git a/tests/queries/0_stateless/02500_remove_redundant_distinct_analyzer.reference b/tests/queries/0_stateless/02500_remove_redundant_distinct_analyzer.reference
index 27b01cf1158..b79f6310166 100644
--- a/tests/queries/0_stateless/02500_remove_redundant_distinct_analyzer.reference
+++ b/tests/queries/0_stateless/02500_remove_redundant_distinct_analyzer.reference
@@ -54,7 +54,7 @@ Expression (Project names)
                 Distinct (Preliminary DISTINCT)
                   Expression ((Projection + Change column names to column identifiers))
                     ReadFromSystemNumbers
-            Expression ((Projection + (Change column names to column identifiers + Project names)))
+            Expression (( + ( + Project names)))
               Distinct (DISTINCT)
                 Distinct (Preliminary DISTINCT)
                   Expression ((Projection + Change column names to column identifiers))
@@ -542,7 +542,7 @@ Expression (Project names)
                 Distinct (Preliminary DISTINCT)
                   Expression ((Projection + Change column names to column identifiers))
                     ReadFromSystemNumbers
-            Expression ((Projection + (Change column names to column identifiers + Project names)))
+            Expression (( + ( + Project names)))
               Distinct (DISTINCT)
                 Distinct (Preliminary DISTINCT)
                   Expression ((Projection + Change column names to column identifiers))
diff --git a/tests/queries/0_stateless/02501_analyzer_expired_context_crash_fix.sql b/tests/queries/0_stateless/02501_analyzer_expired_context_crash_fix.sql
index e2c940c829a..b9ec14501bd 100644
--- a/tests/queries/0_stateless/02501_analyzer_expired_context_crash_fix.sql
+++ b/tests/queries/0_stateless/02501_analyzer_expired_context_crash_fix.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02502_analyzer_insert_select_crash_fix.sql b/tests/queries/0_stateless/02502_analyzer_insert_select_crash_fix.sql
index a438276bda5..4643f65988a 100644
--- a/tests/queries/0_stateless/02502_analyzer_insert_select_crash_fix.sql
+++ b/tests/queries/0_stateless/02502_analyzer_insert_select_crash_fix.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02503_cache_on_write_with_small_segment_size.sh b/tests/queries/0_stateless/02503_cache_on_write_with_small_segment_size.sh
index 13412502dd4..5aeab4c746e 100755
--- a/tests/queries/0_stateless/02503_cache_on_write_with_small_segment_size.sh
+++ b/tests/queries/0_stateless/02503_cache_on_write_with_small_segment_size.sh
@@ -11,7 +11,7 @@ function random {
      cat /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z' | fold -w ${1:-8} | head -n 1
 }
 
-${CLICKHOUSE_CLIENT} --multiline -q "
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q "
 drop table if exists ttt;
 
 CREATE TABLE ttt (id Int32, value String)
@@ -46,7 +46,7 @@ ${CLICKHOUSE_CLIENT}  -q "
 select count() from system.filesystem_cache_log where query_id = '$query_id' AND read_type == 'READ_FROM_CACHE';
 "
 
-${CLICKHOUSE_CLIENT} --multiline -q "
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q "
 select count() from ttt;
 drop table ttt sync;
 "
diff --git a/tests/queries/0_stateless/02503_join_switch_alias_fuzz.sql b/tests/queries/0_stateless/02503_join_switch_alias_fuzz.sql
index 113a8493de6..28d64bf3881 100644
--- a/tests/queries/0_stateless/02503_join_switch_alias_fuzz.sql
+++ b/tests/queries/0_stateless/02503_join_switch_alias_fuzz.sql
@@ -1,4 +1,4 @@
 SELECT * FROM (SELECT 1 AS id, '' AS test) AS a
 LEFT JOIN (SELECT test, 1 AS id, NULL AS test) AS b ON b.id = a.id
-SETTINGS join_algorithm = 'auto', max_rows_in_join = 1, enable_analyzer = 1
+SETTINGS join_algorithm = 'auto', max_rows_in_join = 1, allow_experimental_analyzer = 1
 ;
diff --git a/tests/queries/0_stateless/02504_explain_ast_insert.sql b/tests/queries/0_stateless/02504_explain_ast_insert.sql
index 3b8a64e6ea2..fc50feebaa4 100644
--- a/tests/queries/0_stateless/02504_explain_ast_insert.sql
+++ b/tests/queries/0_stateless/02504_explain_ast_insert.sql
@@ -1,2 +1,2 @@
-explain ast insert into test values (balabala);
+explain ast insert into test values balabala;
 explain ast insert into test format TabSeparated balabala;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02504_regexp_dictionary_table_source.sql b/tests/queries/0_stateless/02504_regexp_dictionary_table_source.sql
index 604c5b179cf..487b6e7f58e 100644
--- a/tests/queries/0_stateless/02504_regexp_dictionary_table_source.sql
+++ b/tests/queries/0_stateless/02504_regexp_dictionary_table_source.sql
@@ -14,12 +14,12 @@ CREATE TABLE regexp_dictionary_source_table
 
 -- test back reference.
 
-INSERT INTO regexp_dictionary_source_table VALUES (1, 0, 'Linux/(\d+[\.\d]*).+tlinux', ['name', 'version'], ['TencentOS', '\1']);
-INSERT INTO regexp_dictionary_source_table VALUES (2, 0, '(\d+)/tclwebkit(\d+[\.\d]*)', ['name', 'version', 'comment'], ['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']);
+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'])
 
 create dictionary regexp_dict1
 (
@@ -50,24 +50,23 @@ CREATE TABLE needle_table
 ENGINE=TinyLog;
 
 INSERT INTO needle_table select concat(toString(number + 30), '/tclwebkit', toString(number)) from system.numbers limit 15;
-
 select * from needle_table;
 select dictGet(regexp_dict1, ('name', 'version'), key) from needle_table;
 
 -- test invalid
-INSERT INTO regexp_dictionary_source_table VALUES (6, 2, '3[12]/tclwebkit', ['version'], ['10']);
+INSERT INTO regexp_dictionary_source_table VALUES (6, 2, '3[12]/tclwebkit', ['version'], ['10'])
 SYSTEM RELOAD dictionary regexp_dict1; -- { serverError INCORRECT_DICTIONARY_DEFINITION  }
 
 truncate table regexp_dictionary_source_table;
 
-INSERT INTO regexp_dictionary_source_table VALUES (6, 2, '3[12]/tclwebkit', ['version'], ['10']);
+INSERT INTO regexp_dictionary_source_table VALUES (6, 2, '3[12]/tclwebkit', ['version'], ['10'])
 SYSTEM RELOAD dictionary regexp_dict1; -- { serverError INCORRECT_DICTIONARY_DEFINITION  }
 
 truncate table regexp_dictionary_source_table;
 
-INSERT INTO regexp_dictionary_source_table VALUES (1, 2, 'Linux/(\d+[\.\d]*).+tlinux', ['name', 'version'], ['TencentOS', '\1']);
-INSERT INTO regexp_dictionary_source_table VALUES (2, 3, '(\d+)/tclwebkit(\d+[\.\d]*)', ['name', 'version', 'comment'], ['Android', '$1', 'test $1 and $2']);
-INSERT INTO regexp_dictionary_source_table VALUES (3, 1, '(\d+)/tclwebkit(\d+[\.\d]*)', ['name', 'version', 'comment'], ['Android', '$1', 'test $1 and $2']);
+INSERT INTO regexp_dictionary_source_table VALUES (1, 2, 'Linux/(\d+[\.\d]*).+tlinux', ['name', 'version'], ['TencentOS', '\1'])
+INSERT INTO regexp_dictionary_source_table VALUES (2, 3, '(\d+)/tclwebkit(\d+[\.\d]*)', ['name', 'version', 'comment'], ['Android', '$1', 'test $1 and $2'])
+INSERT INTO regexp_dictionary_source_table VALUES (3, 1, '(\d+)/tclwebkit(\d+[\.\d]*)', ['name', 'version', 'comment'], ['Android', '$1', 'test $1 and $2'])
 SYSTEM RELOAD dictionary regexp_dict1; -- { serverError INCORRECT_DICTIONARY_DEFINITION  }
 
 -- test priority
diff --git a/tests/queries/0_stateless/02513_analyzer_duplicate_alias_crash_fix.sql b/tests/queries/0_stateless/02513_analyzer_duplicate_alias_crash_fix.sql
index e54252b5c5f..fb50ea2c4ca 100644
--- a/tests/queries/0_stateless/02513_analyzer_duplicate_alias_crash_fix.sql
+++ b/tests/queries/0_stateless/02513_analyzer_duplicate_alias_crash_fix.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT toUInt64(NULL) AS x FROM (SELECT 1) HAVING x IN
     (SELECT NULL FROM (SELECT x IN (SELECT x IN (SELECT 1), x IN (SELECT 1) FROM (SELECT 1 WHERE x IN (SELECT NULL FROM (SELECT NULL))))));
diff --git a/tests/queries/0_stateless/02513_analyzer_sort_msan.sql b/tests/queries/0_stateless/02513_analyzer_sort_msan.sql
index b86a15e9ef0..e5beccaff2a 100644
--- a/tests/queries/0_stateless/02513_analyzer_sort_msan.sql
+++ b/tests/queries/0_stateless/02513_analyzer_sort_msan.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS products;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 CREATE TABLE products (`price` UInt32) ENGINE = Memory;
 INSERT INTO products VALUES (1);
diff --git a/tests/queries/0_stateless/02513_validate_data_types.sql b/tests/queries/0_stateless/02513_validate_data_types.sql
index 4996f63c5bd..5eb91ac7879 100644
--- a/tests/queries/0_stateless/02513_validate_data_types.sql
+++ b/tests/queries/0_stateless/02513_validate_data_types.sql
@@ -1,9 +1,9 @@
 -- Tags: no-fasttest
 
 set allow_experimental_object_type=0;
-select CAST('{"x" : 1}', 'Object(''json'')'); -- {serverError ILLEGAL_COLUMN}
+select CAST('{"x" : 1}', 'JSON'); -- {serverError ILLEGAL_COLUMN}
 desc file(nonexist.json, JSONAsObject); -- {serverError ILLEGAL_COLUMN}
-desc file(nonexist.json, JSONEachRow, 'x Object(''json'')'); -- {serverError ILLEGAL_COLUMN}
+desc file(nonexist.json, JSONEachRow, 'x JSON'); -- {serverError ILLEGAL_COLUMN}
 
 set allow_suspicious_low_cardinality_types=0;
 select CAST(1000000, 'LowCardinality(UInt64)'); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
diff --git a/tests/queries/0_stateless/02514_analyzer_drop_join_on.sql b/tests/queries/0_stateless/02514_analyzer_drop_join_on.sql
index df84e2f50b2..2406be13aa8 100644
--- a/tests/queries/0_stateless/02514_analyzer_drop_join_on.sql
+++ b/tests/queries/0_stateless/02514_analyzer_drop_join_on.sql
@@ -15,7 +15,7 @@ INSERT INTO c VALUES (1, 1, 'a'), (2, 2, 'b'), (3, 3, 'c');
 CREATE TABLE d (k UInt64, d1 UInt64, d2 String) ENGINE = Memory;
 INSERT INTO d VALUES (1, 1, 'a'), (2, 2, 'b'), (3, 3, 'c');
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 -- { echoOn }
 
diff --git a/tests/queries/0_stateless/02514_database_replicated_no_arguments_for_rmt.sh b/tests/queries/0_stateless/02514_database_replicated_no_arguments_for_rmt.sh
index 096a0fcc0b0..a0f228e6af4 100755
--- a/tests/queries/0_stateless/02514_database_replicated_no_arguments_for_rmt.sh
+++ b/tests/queries/0_stateless/02514_database_replicated_no_arguments_for_rmt.sh
@@ -14,8 +14,8 @@ ${CLICKHOUSE_CLIENT} -q "CREATE USER user_${CLICKHOUSE_DATABASE} settings databa
 ${CLICKHOUSE_CLIENT} -q "GRANT CREATE TABLE ON ${CLICKHOUSE_DATABASE}_db.* TO user_${CLICKHOUSE_DATABASE}"
 ${CLICKHOUSE_CLIENT} -q "GRANT TABLE ENGINE ON ReplicatedMergeTree TO user_${CLICKHOUSE_DATABASE}"
 ${CLICKHOUSE_CLIENT} -q "CREATE DATABASE ${CLICKHOUSE_DATABASE}_db engine = Replicated('/clickhouse/databases/${CLICKHOUSE_TEST_ZOOKEEPER_PREFIX}/${CLICKHOUSE_DATABASE}_db', '{shard}', '{replica}')"
-${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_rmt_ok (x UInt32) engine = ReplicatedMergeTree order by x;"
-${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_rmt_fail (x UInt32) engine = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/root/{shard}', '{replica}') order by x; -- { serverError 36 }"
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" -n --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_rmt_ok (x UInt32) engine = ReplicatedMergeTree order by x;"
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" -n --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_rmt_fail (x UInt32) engine = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/root/{shard}', '{replica}') order by x; -- { serverError 80 }"
 ${CLICKHOUSE_CLIENT} --query "DROP DATABASE ${CLICKHOUSE_DATABASE}_db"
 ${CLICKHOUSE_CLIENT} -q "DROP USER user_${CLICKHOUSE_DATABASE}"
 
diff --git a/tests/queries/0_stateless/02514_if_with_lazy_low_cardinality.sql b/tests/queries/0_stateless/02514_if_with_lazy_low_cardinality.sql
index b169cfd0ab9..80e3c0a9ece 100644
--- a/tests/queries/0_stateless/02514_if_with_lazy_low_cardinality.sql
+++ b/tests/queries/0_stateless/02514_if_with_lazy_low_cardinality.sql
@@ -1,6 +1,3 @@
--- Tags: no-fasttest
--- no-fasttest: upper/lowerUTF8 use ICU
-
 create table if not exists t (`arr.key` Array(LowCardinality(String)), `arr.value` Array(LowCardinality(String))) engine = Memory;
 insert into t (`arr.key`, `arr.value`) values (['a'], ['b']);
 select if(true, if(lowerUTF8(arr.key) = 'a', 1, 2), 3) as x from t left array join arr;
diff --git a/tests/queries/0_stateless/02514_null_dictionary_source.sql b/tests/queries/0_stateless/02514_null_dictionary_source.sql
index bfd36042f57..74fb57707ff 100644
--- a/tests/queries/0_stateless/02514_null_dictionary_source.sql
+++ b/tests/queries/0_stateless/02514_null_dictionary_source.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DICTIONARY IF EXISTS null_dict;
 CREATE DICTIONARY null_dict (
     id              UInt64,
diff --git a/tests/queries/0_stateless/02515_analyzer_null_for_empty.sql b/tests/queries/0_stateless/02515_analyzer_null_for_empty.sql
index e12f215743b..de21e9b475e 100644
--- a/tests/queries/0_stateless/02515_analyzer_null_for_empty.sql
+++ b/tests/queries/0_stateless/02515_analyzer_null_for_empty.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET aggregate_functions_null_for_empty = 1;
 
 SELECT max(aggr) FROM (SELECT max('92233720368547758.06') AS aggr FROM system.one);
diff --git a/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.sql.j2 b/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.sql.j2
index a199165a38f..09447dfce65 100644
--- a/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.sql.j2
+++ b/tests/queries/0_stateless/02516_join_with_totals_and_subquery_bug.sql.j2
@@ -13,7 +13,7 @@ INNER JOIN
     GROUP BY 1
         WITH TOTALS
 ) AS t2 USING (a)
-SETTINGS enable_analyzer=0;
+SETTINGS allow_experimental_analyzer=0;
 
 SELECT *
 FROM
@@ -30,7 +30,7 @@ INNER JOIN
     GROUP BY 1
         WITH TOTALS
 ) AS t2 USING (a)
-SETTINGS enable_analyzer=1;
+SETTINGS allow_experimental_analyzer=1;
 
 SELECT a
 FROM
diff --git a/tests/queries/0_stateless/02516_projections_and_context.sql b/tests/queries/0_stateless/02516_projections_and_context.sql
index ec14fc0aa9e..334544eb4fa 100644
--- a/tests/queries/0_stateless/02516_projections_and_context.sql
+++ b/tests/queries/0_stateless/02516_projections_and_context.sql
@@ -1,10 +1,10 @@
 DROP TABLE IF EXISTS test1__fuzz_37;
 CREATE TABLE test1__fuzz_37 (`i` Date) ENGINE = MergeTree ORDER BY i;
 insert into test1__fuzz_37 values ('2020-10-10');
-set enable_analyzer = 0;
+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 enable_analyzer = 1;
+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)); -- { 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/02518_rewrite_aggregate_function_with_if.sql b/tests/queries/0_stateless/02518_rewrite_aggregate_function_with_if.sql
index 4ed13307c29..fe882da67cb 100644
--- a/tests/queries/0_stateless/02518_rewrite_aggregate_function_with_if.sql
+++ b/tests/queries/0_stateless/02518_rewrite_aggregate_function_with_if.sql
@@ -1,4 +1,4 @@
-set enable_analyzer = true;
+set allow_experimental_analyzer = true;
 -- { echoOn }
 
 set optimize_rewrite_aggregate_function_with_if = false;
diff --git a/tests/queries/0_stateless/02521_analyzer_aggregation_without_column.sql b/tests/queries/0_stateless/02521_analyzer_aggregation_without_column.sql
index 50bf3cd45e4..105bce6711c 100644
--- a/tests/queries/0_stateless/02521_analyzer_aggregation_without_column.sql
+++ b/tests/queries/0_stateless/02521_analyzer_aggregation_without_column.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02521_analyzer_array_join_crash.sql b/tests/queries/0_stateless/02521_analyzer_array_join_crash.sql
index f5d601303a2..7842d47d757 100644
--- a/tests/queries/0_stateless/02521_analyzer_array_join_crash.sql
+++ b/tests/queries/0_stateless/02521_analyzer_array_join_crash.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02521_merge_over_gap.sh b/tests/queries/0_stateless/02521_merge_over_gap.sh
index 3c549a2a0dc..4f73b5bceee 100755
--- a/tests/queries/0_stateless/02521_merge_over_gap.sh
+++ b/tests/queries/0_stateless/02521_merge_over_gap.sh
@@ -15,7 +15,7 @@ $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS table_with_gap;"
 $CLICKHOUSE_CLIENT --query "CREATE TABLE table_with_gap (v UInt8) ENGINE = MergeTree() ORDER BY tuple() settings old_parts_lifetime = 10000;"
 $CLICKHOUSE_CLIENT --query "SYSTEM STOP MERGES table_with_gap;"
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT --multiquery --query "
     INSERT INTO table_with_gap VALUES (1);
     INSERT INTO table_with_gap VALUES (2);
     INSERT INTO table_with_gap VALUES (3);
diff --git a/tests/queries/0_stateless/02524_fuzz_and_fuss_2.sql b/tests/queries/0_stateless/02524_fuzz_and_fuss_2.sql
index a38fb0bd471..7b49378d4da 100644
--- a/tests/queries/0_stateless/02524_fuzz_and_fuss_2.sql
+++ b/tests/queries/0_stateless/02524_fuzz_and_fuss_2.sql
@@ -9,6 +9,6 @@ ENGINE = Memory;
 INSERT INTO data_a_02187
 SELECT *
 FROM system.one
-SETTINGS max_block_size = '1', min_insert_block_size_rows = '65536', min_insert_block_size_bytes = '0', max_insert_threads = '0', max_threads = '3', receive_timeout = '10', receive_data_timeout_ms = '10000', connections_with_failover_max_tries = '0', extremes = '1', use_uncompressed_cache = '0', optimize_move_to_prewhere = '1', optimize_move_to_prewhere_if_final = '0', replication_alter_partitions_sync = '2', totals_mode = 'before_having', allow_suspicious_low_cardinality_types = '1', compile_expressions = '1', min_count_to_compile_expression = '0', group_by_two_level_threshold = '100', distributed_aggregation_memory_efficient = '0', distributed_group_by_no_merge = '1', optimize_distributed_group_by_sharding_key = '1', optimize_skip_unused_shards = '1', optimize_skip_unused_shards_rewrite_in = '1', force_optimize_skip_unused_shards = '2', optimize_skip_unused_shards_nesting = '1', force_optimize_skip_unused_shards_nesting = '2', merge_tree_min_rows_for_concurrent_read = '10000', force_primary_key = '1', network_compression_method = 'ZSTD', network_zstd_compression_level = '7', log_queries = '0', log_queries_min_type = 'QUERY_FINISH', distributed_product_mode = 'local', insert_quorum = '2', insert_quorum_timeout = '0', insert_quorum_parallel = '0', select_sequential_consistency = '1', join_use_nulls = '1', any_join_distinct_right_table_keys = '1', preferred_max_column_in_block_size_bytes = '32', distributed_foreground_insert = '1', insert_allow_materialized_columns = '1', use_index_for_in_with_subqueries = '1', joined_subquery_requires_alias = '0', empty_result_for_aggregation_by_empty_set = '1', allow_suspicious_codecs = '1', query_profiler_real_time_period_ns = '0', query_profiler_cpu_time_period_ns = '0', opentelemetry_start_trace_probability = '1', max_rows_to_read = '1000000', read_overflow_mode = 'break', max_rows_to_group_by = '10', group_by_overflow_mode = 'any', max_rows_to_sort = '100', sort_overflow_mode = 'break', max_result_rows = '10', max_execution_time = '9', max_execution_speed = '1', max_bytes_in_join = '100', join_algorithm = 'partial_merge', max_memory_usage = '1099511627776', log_query_threads = '1', send_logs_level = 'fatal', enable_optimize_predicate_expression = '1', prefer_localhost_replica = '1', optimize_read_in_order = '1', optimize_aggregation_in_order = '1', read_in_order_two_level_merge_threshold = '1', allow_introspection_functions = '1', check_query_single_value_result = '1', allow_experimental_live_view = '1', default_table_engine = 'Memory', mutations_sync = '2', convert_query_to_cnf = '0', optimize_arithmetic_operations_in_aggregate_functions = '1', optimize_duplicate_order_by_and_distinct = '0', optimize_multiif_to_if = '0', optimize_functions_to_subcolumns = '1', optimize_using_constraints = '1', optimize_substitute_columns = '1', optimize_append_index = '1', transform_null_in = '1', data_type_default_nullable = '1', cast_keep_nullable = '1', cast_ipv4_ipv6_default_on_conversion_error = '0', system_events_show_zero_values = '1', enable_global_with_statement = '1', optimize_on_insert = '0', optimize_rewrite_sum_if_to_count_if = '1', distributed_ddl_output_mode = 'throw', union_default_mode = 'ALL', optimize_aggregators_of_group_by_keys = '1', optimize_group_by_function_keys = '1', short_circuit_function_evaluation = 'enable', async_insert = '1', enable_filesystem_cache = '0', allow_deprecated_database_ordinary = '1', allow_deprecated_syntax_for_merge_tree = '1', allow_experimental_nlp_functions = '1', allow_experimental_object_type = '1', optimize_use_projections = '1', input_format_null_as_default = '1', input_format_ipv4_default_on_conversion_error = '0', input_format_ipv6_default_on_conversion_error = '0', output_format_json_named_tuples_as_objects = '1', output_format_write_statistics = '0', output_format_pretty_row_numbers = '1';
+SETTINGS max_block_size = '1', min_insert_block_size_rows = '65536', min_insert_block_size_bytes = '0', max_insert_threads = '0', max_threads = '3', receive_timeout = '10', receive_data_timeout_ms = '10000', connections_with_failover_max_tries = '0', extremes = '1', use_uncompressed_cache = '0', optimize_move_to_prewhere = '1', optimize_move_to_prewhere_if_final = '0', replication_alter_partitions_sync = '2', totals_mode = 'before_having', allow_suspicious_low_cardinality_types = '1', compile_expressions = '1', min_count_to_compile_expression = '0', group_by_two_level_threshold = '100', distributed_aggregation_memory_efficient = '0', distributed_group_by_no_merge = '1', optimize_distributed_group_by_sharding_key = '1', optimize_skip_unused_shards = '1', optimize_skip_unused_shards_rewrite_in = '1', force_optimize_skip_unused_shards = '2', optimize_skip_unused_shards_nesting = '1', force_optimize_skip_unused_shards_nesting = '2', merge_tree_min_rows_for_concurrent_read = '10000', force_primary_key = '1', network_compression_method = 'ZSTD', network_zstd_compression_level = '7', log_queries = '0', log_queries_min_type = 'QUERY_FINISH', distributed_product_mode = 'local', insert_quorum = '2', insert_quorum_timeout = '0', insert_quorum_parallel = '0', select_sequential_consistency = '1', join_use_nulls = '1', any_join_distinct_right_table_keys = '1', preferred_max_column_in_block_size_bytes = '32', distributed_foreground_insert = '1', insert_allow_materialized_columns = '1', use_index_for_in_with_subqueries = '1', joined_subquery_requires_alias = '0', empty_result_for_aggregation_by_empty_set = '1', allow_suspicious_codecs = '1', query_profiler_real_time_period_ns = '0', query_profiler_cpu_time_period_ns = '0', opentelemetry_start_trace_probability = '1', max_rows_to_read = '1000000', read_overflow_mode = 'break', max_rows_to_group_by = '10', group_by_overflow_mode = 'any', max_rows_to_sort = '100', sort_overflow_mode = 'break', max_result_rows = '10', max_execution_time = '3', max_execution_speed = '1', max_bytes_in_join = '100', join_algorithm = 'partial_merge', max_memory_usage = '1099511627776', log_query_threads = '1', send_logs_level = 'fatal', enable_optimize_predicate_expression = '1', prefer_localhost_replica = '1', optimize_read_in_order = '1', optimize_aggregation_in_order = '1', read_in_order_two_level_merge_threshold = '1', allow_introspection_functions = '1', check_query_single_value_result = '1', allow_experimental_live_view = '1', default_table_engine = 'Memory', mutations_sync = '2', convert_query_to_cnf = '0', optimize_arithmetic_operations_in_aggregate_functions = '1', optimize_duplicate_order_by_and_distinct = '0', optimize_multiif_to_if = '0', optimize_functions_to_subcolumns = '1', optimize_using_constraints = '1', optimize_substitute_columns = '1', optimize_append_index = '1', transform_null_in = '1', data_type_default_nullable = '1', cast_keep_nullable = '1', cast_ipv4_ipv6_default_on_conversion_error = '0', system_events_show_zero_values = '1', enable_global_with_statement = '1', optimize_on_insert = '0', optimize_rewrite_sum_if_to_count_if = '1', distributed_ddl_output_mode = 'throw', union_default_mode = 'ALL', optimize_aggregators_of_group_by_keys = '1', optimize_group_by_function_keys = '1', short_circuit_function_evaluation = 'enable', async_insert = '1', enable_filesystem_cache = '0', allow_deprecated_database_ordinary = '1', allow_deprecated_syntax_for_merge_tree = '1', allow_experimental_nlp_functions = '1', allow_experimental_object_type = '1', optimize_use_projections = '1', input_format_null_as_default = '1', input_format_ipv4_default_on_conversion_error = '0', input_format_ipv6_default_on_conversion_error = '0', output_format_json_named_tuples_as_objects = '1', output_format_write_statistics = '0', output_format_pretty_row_numbers = '1';
 
 DROP TABLE data_a_02187;
diff --git a/tests/queries/0_stateless/02525_analyzer_function_in_crash_fix.sql b/tests/queries/0_stateless/02525_analyzer_function_in_crash_fix.sql
index dd1688ad400..95b896d38ab 100644
--- a/tests/queries/0_stateless/02525_analyzer_function_in_crash_fix.sql
+++ b/tests/queries/0_stateless/02525_analyzer_function_in_crash_fix.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02530_dictionaries_update_field.sh b/tests/queries/0_stateless/02530_dictionaries_update_field.sh
index 968756368d1..a8e5804fba4 100755
--- a/tests/queries/0_stateless/02530_dictionaries_update_field.sh
+++ b/tests/queries/0_stateless/02530_dictionaries_update_field.sh
@@ -35,7 +35,7 @@ for layout in "${layouts[@]}"; do
             echo "$layout"
         fi
 
-        $CLICKHOUSE_CLIENT "
+        $CLICKHOUSE_CLIENT --multiquery "
             TRUNCATE TABLE table_for_update_field_dictionary;
 
             CREATE DICTIONARY $dictionary_name
diff --git a/tests/queries/0_stateless/02532_analyzer_aggregation_with_rollup.sql b/tests/queries/0_stateless/02532_analyzer_aggregation_with_rollup.sql
index 587ef71df8a..09097eb029f 100644
--- a/tests/queries/0_stateless/02532_analyzer_aggregation_with_rollup.sql
+++ b/tests/queries/0_stateless/02532_analyzer_aggregation_with_rollup.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT
     sum(a.number) AS total,
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 e69de29bb2d..7e51b888d9c 100644
--- a/tests/queries/0_stateless/02532_send_logs_level_test.reference
+++ b/tests/queries/0_stateless/02532_send_logs_level_test.reference
@@ -0,0 +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 a91e49ddd22..71f42e2a6db 100755
--- a/tests/queries/0_stateless/02532_send_logs_level_test.sh
+++ b/tests/queries/0_stateless/02532_send_logs_level_test.sh
@@ -1,14 +1,13 @@
 #!/usr/bin/env bash
-# Tags: no-object-storage, no-debug, no-random-merge-tree-settings
+# Tags: no-object-storage, no-debug
 # - no-object-storage - S3 has additional logging
 # - no-debug - debug builds also has additional logging
-# - no-random-merge-tree-settings - changes content of log messages
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     drop table if exists data;
     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);
@@ -18,10 +17,6 @@ $CLICKHOUSE_CLIENT -m -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 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;" |& grep -o -e '<Unknown>.*' -e '<Test>.*'
 
-set -e
-
-trap '$CLICKHOUSE_CLIENT -q "drop table data"' EXIT
-
-$CLICKHOUSE_CLIENT_CLEAN -q "select * from data SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;" |& (! grep -q -o -e '<Unknown>.*')
-$CLICKHOUSE_CLIENT_CLEAN -q "select * from data SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;" |& grep -q -o -e '<Test>.*'
+$CLICKHOUSE_CLIENT -q "drop table data"
diff --git a/tests/queries/0_stateless/02534_analyzer_grouping_function.sql b/tests/queries/0_stateless/02534_analyzer_grouping_function.sql
index ee1cc1d88d1..3163e03d579 100644
--- a/tests/queries/0_stateless/02534_analyzer_grouping_function.sql
+++ b/tests/queries/0_stateless/02534_analyzer_grouping_function.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02535_analyzer_group_by_use_nulls.sql b/tests/queries/0_stateless/02535_analyzer_group_by_use_nulls.sql
index 59bbfc96289..4ae5df9629a 100644
--- a/tests/queries/0_stateless/02535_analyzer_group_by_use_nulls.sql
+++ b/tests/queries/0_stateless/02535_analyzer_group_by_use_nulls.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 -- { echoOn }
 SELECT number, number % 2, sum(number) AS val
diff --git a/tests/queries/0_stateless/02535_analyzer_limit_offset.sql b/tests/queries/0_stateless/02535_analyzer_limit_offset.sql
index 96aef9557c5..8f98d823e5c 100644
--- a/tests/queries/0_stateless/02535_analyzer_limit_offset.sql
+++ b/tests/queries/0_stateless/02535_analyzer_limit_offset.sql
@@ -1,3 +1,3 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT number FROM numbers(100) LIMIT 10 OFFSET 10;
diff --git a/tests/queries/0_stateless/02536_delta_gorilla_corruption.sql b/tests/queries/0_stateless/02536_delta_gorilla_corruption.sql
index 3accc726d08..a4e0965e329 100644
--- a/tests/queries/0_stateless/02536_delta_gorilla_corruption.sql
+++ b/tests/queries/0_stateless/02536_delta_gorilla_corruption.sql
@@ -12,7 +12,7 @@ create table bug_delta_gorilla
 (value_bug UInt64 codec (Delta, Gorilla))
 engine = MergeTree
 order by tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi'
-as (select 0 from numbers(20000000));
+as (select 0 from numbers(30000000));
 
 select count(*)
 from bug_delta_gorilla
diff --git a/tests/queries/0_stateless/02536_replace_with_nonconst_needle_and_replacement.sql b/tests/queries/0_stateless/02536_replace_with_nonconst_needle_and_replacement.sql
index b88224a89c1..926bde3a74b 100644
--- a/tests/queries/0_stateless/02536_replace_with_nonconst_needle_and_replacement.sql
+++ b/tests/queries/0_stateless/02536_replace_with_nonconst_needle_and_replacement.sql
@@ -7,7 +7,7 @@ CREATE TABLE test_tab
   engine = MergeTree()
   ORDER BY id;
 
-INSERT INTO test_tab VALUES (1, 'Hello World', 'l', 'xx') (2, 'Hello World', 'll', 'x') (3, 'Hello World', 'not_found', 'x') (4, 'Hello World', '[eo]', 'x') (5, 'Hello World', '.', 'x');
+INSERT INTO test_tab VALUES (1, 'Hello World', 'l', 'xx') (2, 'Hello World', 'll', 'x') (3, 'Hello World', 'not_found', 'x') (4, 'Hello World', '[eo]', 'x') (5, 'Hello World', '.', 'x')
 
 
 SELECT '** replaceAll() **';
@@ -77,7 +77,7 @@ CREATE TABLE test_tab
   engine = MergeTree()
   ORDER BY id;
 
-INSERT INTO test_tab VALUES (1, 'Hello World', 'l', 'x') (2, 'Hello World', '', 'y');
+INSERT INTO test_tab VALUES (1, 'Hello World', 'l', 'x') (2, 'Hello World', '', 'y')
 
 -- needle: non-const, replacement: const
 SELECT replaceAll(haystack, needle, 'x') FROM test_tab;  -- { serverError ARGUMENT_OUT_OF_BOUND }
diff --git a/tests/queries/0_stateless/02538_analyzer_create_table_as_select.sql b/tests/queries/0_stateless/02538_analyzer_create_table_as_select.sql
index 16634e996fe..168066ce2f9 100644
--- a/tests/queries/0_stateless/02538_analyzer_create_table_as_select.sql
+++ b/tests/queries/0_stateless/02538_analyzer_create_table_as_select.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table_data;
 CREATE TABLE test_table_data
diff --git a/tests/queries/0_stateless/02539_settings_alias.sh b/tests/queries/0_stateless/02539_settings_alias.sh
index c770633c0ac..5cfa09ad0fa 100755
--- a/tests/queries/0_stateless/02539_settings_alias.sh
+++ b/tests/queries/0_stateless/02539_settings_alias.sh
@@ -10,7 +10,7 @@ for check_query in "SELECT value FROM system.settings WHERE name = 'alter_sync';
     echo "Checking setting value with '$check_query'"
 
     echo 'Using SET'
-    $CLICKHOUSE_CLIENT -m -q """
+    $CLICKHOUSE_CLIENT -mn -q """
     SET replication_alter_partitions_sync = 0;
     $check_query
 
@@ -28,7 +28,7 @@ for check_query in "SELECT value FROM system.settings WHERE name = 'alter_sync';
 done
 
 
-$CLICKHOUSE_CLIENT -m -q """
+$CLICKHOUSE_CLIENT -mn -q """
 DROP VIEW IF EXISTS 02539_settings_alias_view;
 CREATE VIEW 02539_settings_alias_view AS SELECT 1 SETTINGS replication_alter_partitions_sync = 2;
 SHOW CREATE TABLE 02539_settings_alias_view;
diff --git a/tests/queries/0_stateless/02540_analyzer_matcher_alias_materialized_columns.sql b/tests/queries/0_stateless/02540_analyzer_matcher_alias_materialized_columns.sql
index 58840796c7e..cc622dde8fe 100644
--- a/tests/queries/0_stateless/02540_analyzer_matcher_alias_materialized_columns.sql
+++ b/tests/queries/0_stateless/02540_analyzer_matcher_alias_materialized_columns.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02540_input_format_json_ignore_unknown_keys_in_named_tuple.sh b/tests/queries/0_stateless/02540_input_format_json_ignore_unknown_keys_in_named_tuple.sh
index 48b3b27680c..eccac543215 100755
--- a/tests/queries/0_stateless/02540_input_format_json_ignore_unknown_keys_in_named_tuple.sh
+++ b/tests/queries/0_stateless/02540_input_format_json_ignore_unknown_keys_in_named_tuple.sh
@@ -115,7 +115,7 @@ EOL
 # NOTE: due to [1] we cannot use dot.dot notation, only tupleElement()
 #
 #   [1]: https://github.com/ClickHouse/ClickHouse/issues/24607
-$CLICKHOUSE_LOCAL --enable_analyzer=1 "${gharchive_settings[@]}" --structure="${gharchive_structure[*]}" -q "
+$CLICKHOUSE_LOCAL --allow_experimental_analyzer=1 "${gharchive_settings[@]}" --structure="${gharchive_structure[*]}" -q "
     SELECT
         payload.issue.labels.name AS labels,
         payload.pull_request.merged_by.login AS merged_by
diff --git a/tests/queries/0_stateless/02541_analyzer_grouping_sets_crash_fix.sql b/tests/queries/0_stateless/02541_analyzer_grouping_sets_crash_fix.sql
index b9aa251bc96..d7af475bbe7 100644
--- a/tests/queries/0_stateless/02541_analyzer_grouping_sets_crash_fix.sql
+++ b/tests/queries/0_stateless/02541_analyzer_grouping_sets_crash_fix.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 WITH pow(NULL, 256) AS four SELECT NULL AS two GROUP BY GROUPING SETS ((pow(two, 65536)));
 
diff --git a/tests/queries/0_stateless/02552_analyzer_optimize_group_by_function_keys_crash.sql b/tests/queries/0_stateless/02552_analyzer_optimize_group_by_function_keys_crash.sql
index 85740cd85a2..ee9032472a7 100644
--- a/tests/queries/0_stateless/02552_analyzer_optimize_group_by_function_keys_crash.sql
+++ b/tests/queries/0_stateless/02552_analyzer_optimize_group_by_function_keys_crash.sql
@@ -1,3 +1,3 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT NULL GROUP BY tuple('0.0000000007'), count(NULL) OVER (ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) -- { serverError ILLEGAL_AGGREGATION };
diff --git a/tests/queries/0_stateless/02553_new_type_json_attach_partition.reference b/tests/queries/0_stateless/02553_new_type_json_attach_partition.reference
deleted file mode 100644
index 1556b015503..00000000000
--- a/tests/queries/0_stateless/02553_new_type_json_attach_partition.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-{"b":"1","c":{"k1":"1"}}
-{"b":"1","c":{"k1":["1","2"]}}
diff --git a/tests/queries/0_stateless/02553_new_type_json_attach_partition.sql b/tests/queries/0_stateless/02553_new_type_json_attach_partition.sql
deleted file mode 100644
index c7d4c0b5d55..00000000000
--- a/tests/queries/0_stateless/02553_new_type_json_attach_partition.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-SET allow_experimental_json_type = 1;
-
-DROP TABLE IF EXISTS t_json_attach_partition;
-
-CREATE TABLE t_json_attach_partition(b UInt64, c JSON) ENGINE = MergeTree ORDER BY tuple();
-
-INSERT INTO t_json_attach_partition FORMAT JSONEachRow {"b": 1, "c" : {"k1": 1}};
-
-ALTER TABLE t_json_attach_partition DETACH PARTITION tuple();
-INSERT INTO t_json_attach_partition FORMAT JSONEachRow {"b": 1, "c" : {"k1": [1, 2]}};
-
-ALTER TABLE t_json_attach_partition ATTACH PARTITION tuple();
-SELECT * FROM t_json_attach_partition ORDER BY toString(c) FORMAT JSONEachRow;
-
-DROP TABLE t_json_attach_partition;
diff --git a/tests/queries/0_stateless/02553_type_json_attach_partition.sql b/tests/queries/0_stateless/02553_type_json_attach_partition.sql
index 428189f3a84..9225106f767 100644
--- a/tests/queries/0_stateless/02553_type_json_attach_partition.sql
+++ b/tests/queries/0_stateless/02553_type_json_attach_partition.sql
@@ -2,10 +2,9 @@ SET allow_experimental_object_type = 1;
 
 DROP TABLE IF EXISTS t_json_attach_partition;
 
-CREATE TABLE t_json_attach_partition(b UInt64, c Object('json')) ENGINE = MergeTree ORDER BY tuple();
+CREATE TABLE t_json_attach_partition(b UInt64, c JSON) ENGINE = MergeTree ORDER BY tuple();
 
 INSERT INTO t_json_attach_partition FORMAT JSONEachRow {"b": 1, "c" : {"k1": 1}};
-
 ALTER TABLE t_json_attach_partition DETACH PARTITION tuple();
 INSERT INTO t_json_attach_partition FORMAT JSONEachRow {"b": 1, "c" : {"k1": [1, 2]}};
 
diff --git a/tests/queries/0_stateless/02553_type_object_analyzer.sql b/tests/queries/0_stateless/02553_type_object_analyzer.sql
index e5dd6eaebc0..55482a02ed1 100644
--- a/tests/queries/0_stateless/02553_type_object_analyzer.sql
+++ b/tests/queries/0_stateless/02553_type_object_analyzer.sql
@@ -1,9 +1,9 @@
 SET output_format_json_named_tuples_as_objects = 1;
 SET allow_experimental_object_type = 1;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS t_json_analyzer;
-CREATE TABLE t_json_analyzer (a Object('json')) ENGINE = Memory;
+CREATE TABLE t_json_analyzer (a JSON) ENGINE = Memory;
 INSERT INTO t_json_analyzer VALUES ('{"id": 2, "obj": {"k2": {"k3": "str", "k4": [{"k6": 55}]}, "some": 42}, "s": "bar"}');
 
 SELECT any(a) AS data FROM t_json_analyzer FORMAT JSONEachRow;
diff --git a/tests/queries/0_stateless/02554_fix_grouping_sets_predicate_push_down.sql b/tests/queries/0_stateless/02554_fix_grouping_sets_predicate_push_down.sql
index 0eed4a8c592..f926b9037d2 100644
--- a/tests/queries/0_stateless/02554_fix_grouping_sets_predicate_push_down.sql
+++ b/tests/queries/0_stateless/02554_fix_grouping_sets_predicate_push_down.sql
@@ -60,7 +60,7 @@ FROM
                 (day_))
     ) AS t
 )
-WHERE type_1 = 'all' settings enable_analyzer=0;
+WHERE type_1 = 'all' settings allow_experimental_analyzer=0;
 
 -- Query plan with analyzer has less Filter steps (which is more optimal)
 EXPLAIN PIPELINE
@@ -83,7 +83,7 @@ FROM
                 (day_))
     ) AS t
 )
-WHERE type_1 = 'all' settings enable_analyzer=1;
+WHERE type_1 = 'all' settings allow_experimental_analyzer=1;
 
 SELECT '';
 SELECT '---Result---';
@@ -129,7 +129,7 @@ FROM
                 (day_))
     ) AS t
 )
-WHERE day_ = '2023-01-05' settings enable_analyzer=0;
+WHERE day_ = '2023-01-05' settings allow_experimental_analyzer=0;
 
 -- Query plan with analyzer has less Filter steps (which is more optimal)
 EXPLAIN PIPELINE
@@ -151,6 +151,6 @@ FROM
                 (day_))
     ) AS t
 )
-WHERE day_ = '2023-01-05' settings enable_analyzer=1;
+WHERE day_ = '2023-01-05' settings allow_experimental_analyzer=1;
 
 DROP TABLE test_grouping_sets_predicate;
diff --git a/tests/queries/0_stateless/02555_davengers_rename_chain.sh b/tests/queries/0_stateless/02555_davengers_rename_chain.sh
index 196507dc72e..660a95846c4 100755
--- a/tests/queries/0_stateless/02555_davengers_rename_chain.sh
+++ b/tests/queries/0_stateless/02555_davengers_rename_chain.sh
@@ -46,7 +46,7 @@ tables["wrong_metadata_compact"]="min_bytes_for_wide_part = 10000000"
 for table in "${!tables[@]}"; do
     settings="${tables[$table]}"
 
-    $CLICKHOUSE_CLIENT --query="
+    $CLICKHOUSE_CLIENT -n --query="
         DROP TABLE IF EXISTS $table;
 
         CREATE TABLE $table(
@@ -69,7 +69,7 @@ for table in "${!tables[@]}"; do
 
     wait_column "$table" "\`a1\` UInt64" || exit 2
 
-    $CLICKHOUSE_CLIENT --query="
+    $CLICKHOUSE_CLIENT -n --query="
         -- { echoOn }
         SELECT 'ECHO_ALIGNMENT_FIX' FORMAT Null;
 
@@ -82,7 +82,7 @@ for table in "${!tables[@]}"; do
 
     wait_mutation_loaded "$table" "b1 TO a" || exit 2
 
-    $CLICKHOUSE_CLIENT --query="
+    $CLICKHOUSE_CLIENT -n --query="
         -- { echoOn }
         SELECT 'ECHO_ALIGNMENT_FIX' FORMAT Null;
 
@@ -94,7 +94,7 @@ for table in "${!tables[@]}"; do
 
     wait_for_all_mutations "$table"
 
-    $CLICKHOUSE_CLIENT --query="
+    $CLICKHOUSE_CLIENT -n --query="
         -- { echoOn }
         SELECT 'ECHO_ALIGNMENT_FIX' FORMAT Null;
 
diff --git a/tests/queries/0_stateless/02558_system_processes_elapsed.sh b/tests/queries/0_stateless/02558_system_processes_elapsed.sh
index 8d2615541fd..891ac3cf7bc 100755
--- a/tests/queries/0_stateless/02558_system_processes_elapsed.sh
+++ b/tests/queries/0_stateless/02558_system_processes_elapsed.sh
@@ -9,12 +9,7 @@ while :; do
     pid=$!
     sleep 1.5
     duration="$($CLICKHOUSE_CLIENT -q "select floor(elapsed) from system.processes where current_database = currentDatabase() and query not like '%system.processes%'")"
-    # The process might not exist at this point in some exception situations
-    # maybe it was killed by OOM?
-    # It safe to skip this iteration.
-    if ! kill -INT $pid > /dev/null 2>&1; then
-        continue
-    fi
+    kill -INT $pid
     wait
     $CLICKHOUSE_CLIENT -q "kill query where current_database = currentDatabase() sync format Null"
     if [[ $duration -eq 1 ]]; then
diff --git a/tests/queries/0_stateless/02560_analyzer_materialized_view.sql b/tests/queries/0_stateless/02560_analyzer_materialized_view.sql
index 3fdef366dc9..1f268fe1e16 100644
--- a/tests/queries/0_stateless/02560_analyzer_materialized_view.sql
+++ b/tests/queries/0_stateless/02560_analyzer_materialized_view.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02560_window_ntile.reference b/tests/queries/0_stateless/02560_window_ntile.reference
index 5f01832d075..d877b2034cb 100644
--- a/tests/queries/0_stateless/02560_window_ntile.reference
+++ b/tests/queries/0_stateless/02560_window_ntile.reference
@@ -213,8 +213,6 @@ select a, b, ntile('2') over (partition by a order by b) from(select intDiv(numb
 select a, b, ntile(0) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError BAD_ARGUMENTS }
 select a, b, ntile(-2) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError BAD_ARGUMENTS }
 select a, b, ntile(b + 1) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError BAD_ARGUMENTS }
-select a, b, ntile() over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
-select a, b, ntile(3, 2) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 -- Bad window type
 select a, b, ntile(2) over (partition by a) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError BAD_ARGUMENTS }
 select a, b, ntile(2) over (partition by a order by b rows between 4 preceding and unbounded following) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/02560_window_ntile.sql b/tests/queries/0_stateless/02560_window_ntile.sql
index d0e4d557e58..44e9b865052 100644
--- a/tests/queries/0_stateless/02560_window_ntile.sql
+++ b/tests/queries/0_stateless/02560_window_ntile.sql
@@ -16,8 +16,6 @@ select a, b, ntile('2') over (partition by a order by b) from(select intDiv(numb
 select a, b, ntile(0) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError BAD_ARGUMENTS }
 select a, b, ntile(-2) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError BAD_ARGUMENTS }
 select a, b, ntile(b + 1) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError BAD_ARGUMENTS }
-select a, b, ntile() over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
-select a, b, ntile(3, 2) over (partition by a order by b) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 
 -- Bad window type
 select a, b, ntile(2) over (partition by a) from(select intDiv(number,10) as a, number%10 as b from numbers(20)); -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/02563_analyzer_merge.sql b/tests/queries/0_stateless/02563_analyzer_merge.sql
index 6c252c22773..217fb7019c4 100644
--- a/tests/queries/0_stateless/02563_analyzer_merge.sql
+++ b/tests/queries/0_stateless/02563_analyzer_merge.sql
@@ -1,6 +1,6 @@
 -- Tags: no-parallel
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP DATABASE IF EXISTS 02563_db;
 CREATE DATABASE 02563_db;
diff --git a/tests/queries/0_stateless/02564_analyzer_cross_to_inner.sql b/tests/queries/0_stateless/02564_analyzer_cross_to_inner.sql
index 7032559e066..a83cd238982 100644
--- a/tests/queries/0_stateless/02564_analyzer_cross_to_inner.sql
+++ b/tests/queries/0_stateless/02564_analyzer_cross_to_inner.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
diff --git a/tests/queries/0_stateless/02565_analyzer_limit_settings.sql b/tests/queries/0_stateless/02565_analyzer_limit_settings.sql
index 1dd6735e64d..7c02c2d0d20 100644
--- a/tests/queries/0_stateless/02565_analyzer_limit_settings.sql
+++ b/tests/queries/0_stateless/02565_analyzer_limit_settings.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 -- { echoOn }
 SET limit = 0;
diff --git a/tests/queries/0_stateless/02566_analyzer_limit_settings_distributed.sql b/tests/queries/0_stateless/02566_analyzer_limit_settings_distributed.sql
index a2620f436f4..1624344b5a9 100644
--- a/tests/queries/0_stateless/02566_analyzer_limit_settings_distributed.sql
+++ b/tests/queries/0_stateless/02566_analyzer_limit_settings_distributed.sql
@@ -1,6 +1,6 @@
 -- Tags: distributed
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT 'limit', * FROM remote('127.1', view(SELECT * FROM numbers(10))) SETTINGS limit=5;
 SELECT 'offset', * FROM remote('127.1', view(SELECT * FROM numbers(10))) SETTINGS offset=5;
diff --git a/tests/queries/0_stateless/02567_and_consistency.reference b/tests/queries/0_stateless/02567_and_consistency.reference
index 7e6d1f24f43..e0014f187a8 100644
--- a/tests/queries/0_stateless/02567_and_consistency.reference
+++ b/tests/queries/0_stateless/02567_and_consistency.reference
@@ -8,7 +8,7 @@ true
 =====
 1
 =====
-enable_analyzer
+allow_experimental_analyzer
 true
 #45440
 2086579505	0	1	0	0
diff --git a/tests/queries/0_stateless/02567_and_consistency.sql b/tests/queries/0_stateless/02567_and_consistency.sql
index 0442a6dad7f..0eeab99e539 100644
--- a/tests/queries/0_stateless/02567_and_consistency.sql
+++ b/tests/queries/0_stateless/02567_and_consistency.sql
@@ -50,9 +50,9 @@ SELECT 1 and sin(1);
 
 SELECT '=====';
 
-SELECT 'enable_analyzer';
+SELECT 'allow_experimental_analyzer';
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT toBool(sin(SUM(number))) AS x
 FROM
diff --git a/tests/queries/0_stateless/02572_query_views_log_background_thread.sh b/tests/queries/0_stateless/02572_query_views_log_background_thread.sh
index 22b94e09b58..a3e428e75c8 100755
--- a/tests/queries/0_stateless/02572_query_views_log_background_thread.sh
+++ b/tests/queries/0_stateless/02572_query_views_log_background_thread.sh
@@ -8,21 +8,18 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --ignore-error --query "drop table if exists buffer_02572;
+${CLICKHOUSE_CLIENT} --ignore-error --multiquery --query "drop table if exists buffer_02572;
     drop table if exists data_02572; drop table if exists copy_02572; drop table if exists mv_02572;"
 
 ${CLICKHOUSE_CLIENT} --query="create table copy_02572 (key Int) engine=Memory();"
 ${CLICKHOUSE_CLIENT} --query="create table data_02572 (key Int) engine=Memory();"
-${CLICKHOUSE_CLIENT} --query="create table buffer_02572 (key Int) engine=Buffer(currentDatabase(), data_02572, 1, 8, 8, 1, 1e9, 1, 1e9);"
+${CLICKHOUSE_CLIENT} --query="create table buffer_02572 (key Int) engine=Buffer(currentDatabase(), data_02572, 1, 3, 3, 1, 1e9, 1, 1e9);"
 ${CLICKHOUSE_CLIENT} --query="create materialized view mv_02572 to copy_02572 as select * from data_02572;"
 
-start=$(date +%s)
 ${CLICKHOUSE_CLIENT} --query="insert into buffer_02572 values (1);"
 
-if [ $(( $(date +%s) - start )) -gt 6 ]; then  # clickhouse test cluster is overloaded, will skip
-    # ensure that the flush was not direct
-    ${CLICKHOUSE_CLIENT} --ignore-error --query "select * from data_02572; select * from copy_02572;"
-fi
+# ensure that the flush was not direct
+${CLICKHOUSE_CLIENT} --ignore-error --multiquery --query "select * from data_02572; select * from copy_02572;"
 
 # we cannot use OPTIMIZE, this will attach query context, so let's wait
 for _ in {1..100}; do
@@ -31,11 +28,11 @@ for _ in {1..100}; do
 done
 
 
-${CLICKHOUSE_CLIENT} --ignore-error --query "select * from data_02572; select * from copy_02572;"
+${CLICKHOUSE_CLIENT} --ignore-error --multiquery --query "select * from data_02572; select * from copy_02572;"
 
 ${CLICKHOUSE_CLIENT} --query="system flush logs;"
 ${CLICKHOUSE_CLIENT} --query="select count() > 0, lower(status::String), errorCodeToName(exception_code)
     from system.query_views_log where
     view_name = concatWithSeparator('.', currentDatabase(), 'mv_02572') and
     view_target = concatWithSeparator('.', currentDatabase(), 'copy_02572')
-    group by 2, 3;"
+    group by 2, 3;"
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02576_predicate_push_down_sorting_fix.sql b/tests/queries/0_stateless/02576_predicate_push_down_sorting_fix.sql
index 486a26613f6..2dade7837b7 100644
--- a/tests/queries/0_stateless/02576_predicate_push_down_sorting_fix.sql
+++ b/tests/queries/0_stateless/02576_predicate_push_down_sorting_fix.sql
@@ -1,3 +1,3 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 EXPLAIN header = 1, actions = 1 SELECT number FROM (SELECT number FROM numbers(2) ORDER BY ignore(2)) WHERE ignore(2);
diff --git a/tests/queries/0_stateless/02576_rewrite_array_exists_to_has.sql b/tests/queries/0_stateless/02576_rewrite_array_exists_to_has.sql
index b5a123e3767..5233f2f7e3c 100644
--- a/tests/queries/0_stateless/02576_rewrite_array_exists_to_has.sql
+++ b/tests/queries/0_stateless/02576_rewrite_array_exists_to_has.sql
@@ -1,4 +1,4 @@
-set enable_analyzer = true;
+set allow_experimental_analyzer = true;
 
 set optimize_rewrite_array_exists_to_has = false;
 EXPLAIN QUERY TREE run_passes = 1  select arrayExists(x -> x = 5 , materialize(range(10))) from numbers(10);
@@ -8,7 +8,7 @@ set optimize_rewrite_array_exists_to_has = true;
 EXPLAIN QUERY TREE run_passes = 1  select arrayExists(x -> x = 5 , materialize(range(10))) from numbers(10);
 EXPLAIN QUERY TREE run_passes = 1  select arrayExists(x -> 5 = x , materialize(range(10))) from numbers(10);
 
-set enable_analyzer = false;
+set allow_experimental_analyzer = false;
 
 set optimize_rewrite_array_exists_to_has = false;
 EXPLAIN SYNTAX select arrayExists(x -> x = 5 , materialize(range(10))) from numbers(10);
diff --git a/tests/queries/0_stateless/02577_analyzer_array_join_calc_twice.sql b/tests/queries/0_stateless/02577_analyzer_array_join_calc_twice.sql
index 0b281dd4f81..b6bb258db28 100644
--- a/tests/queries/0_stateless/02577_analyzer_array_join_calc_twice.sql
+++ b/tests/queries/0_stateless/02577_analyzer_array_join_calc_twice.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT 1 + arrayJoin(a) AS m FROM (SELECT [1, 2, 3] AS a) GROUP BY m;
 
diff --git a/tests/queries/0_stateless/02579_fill_empty_chunk.sql b/tests/queries/0_stateless/02579_fill_empty_chunk.sql
index aeae98df7a3..30942b154c9 100644
--- a/tests/queries/0_stateless/02579_fill_empty_chunk.sql
+++ b/tests/queries/0_stateless/02579_fill_empty_chunk.sql
@@ -1,7 +1,7 @@
 -- this SELECT produces empty chunk in FillingTransform
 
 SET enable_positional_arguments = 0;
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 
 SELECT
     2 AS x,
diff --git a/tests/queries/0_stateless/02579_fill_empty_chunk_analyzer.sql b/tests/queries/0_stateless/02579_fill_empty_chunk_analyzer.sql
index 144640149ea..8350173f443 100644
--- a/tests/queries/0_stateless/02579_fill_empty_chunk_analyzer.sql
+++ b/tests/queries/0_stateless/02579_fill_empty_chunk_analyzer.sql
@@ -1,7 +1,7 @@
 -- this SELECT produces empty chunk in FillingTransform
 
 SET enable_positional_arguments = 0;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 -- With analyzer this special query has correct output
 SELECT
diff --git a/tests/queries/0_stateless/02581_share_big_sets_between_multiple_mutations_tasks_long.reference b/tests/queries/0_stateless/02581_share_big_sets_between_multiple_mutations_tasks_long.reference
index d3e7e113ffe..3a92fcf283d 100644
--- a/tests/queries/0_stateless/02581_share_big_sets_between_multiple_mutations_tasks_long.reference
+++ b/tests/queries/0_stateless/02581_share_big_sets_between_multiple_mutations_tasks_long.reference
@@ -3,11 +3,7 @@ all_1_1_0
 all_2_2_0
 all_3_3_0
 all_4_4_0
-40000
 5000	all_1_1_0_9
 5000	all_2_2_0_9
 5000	all_3_3_0_9
 5000	all_4_4_0_9
-mutation_version	has_parts_for_which_set_was_built	has_parts_that_shared_set
-8	1	1
-9	1	1
diff --git a/tests/queries/0_stateless/02581_share_big_sets_between_multiple_mutations_tasks_long.sql b/tests/queries/0_stateless/02581_share_big_sets_between_multiple_mutations_tasks_long.sql
index 6b0677a80ae..741d0177971 100644
--- a/tests/queries/0_stateless/02581_share_big_sets_between_multiple_mutations_tasks_long.sql
+++ b/tests/queries/0_stateless/02581_share_big_sets_between_multiple_mutations_tasks_long.sql
@@ -18,35 +18,12 @@ SELECT name FROM system.parts WHERE database=currentDatabase() AND table = '0258
 
 -- Start multiple mutations simultaneously
 SYSTEM STOP MERGES 02581_trips;
-ALTER TABLE 02581_trips UPDATE description='5' WHERE id IN (SELECT (number*10 + 5)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=0;
-ALTER TABLE 02581_trips UPDATE description='6' WHERE id IN (SELECT (number*10 + 6)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=0;
-ALTER TABLE 02581_trips DELETE                 WHERE id IN (SELECT (number*10 + 7)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=0;
-ALTER TABLE 02581_trips UPDATE description='8' WHERE id IN (SELECT (number*10 + 8)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=0;
+ALTER TABLE 02581_trips UPDATE description='5' WHERE id IN (SELECT (number*10 + 5)::UInt32 FROM numbers(200000000)) SETTINGS mutations_sync=0;
+ALTER TABLE 02581_trips UPDATE description='6' WHERE id IN (SELECT (number*10 + 6)::UInt32 FROM numbers(200000000)) SETTINGS mutations_sync=0;
+ALTER TABLE 02581_trips DELETE WHERE id IN (SELECT (number*10 + 7)::UInt32 FROM numbers(200000000)) SETTINGS mutations_sync=0;
+ALTER TABLE 02581_trips UPDATE description='8' WHERE id IN (SELECT (number*10 + 8)::UInt32 FROM numbers(200000000)) SETTINGS mutations_sync=0;
 SYSTEM START MERGES 02581_trips;
-
--- Wait for mutations to finish
-SELECT count() FROM 02581_trips SETTINGS select_sequential_consistency = 1;
-
-DELETE FROM 02581_trips                        WHERE id IN (SELECT (number*10 + 9)::UInt32 FROM numbers(10000000)) SETTINGS lightweight_deletes_sync = 2;
-SELECT count(), _part from 02581_trips WHERE description = '' GROUP BY _part ORDER BY _part SETTINGS select_sequential_consistency=1;
-
-SYSTEM FLUSH LOGS;
--- Check that in every mutation there were parts that built sets (log messages like 'Created Set with 10000000 entries from 10000000 rows in 0.388989187 sec.' )
--- and parts that shared sets (log messages like 'Got set from cache in 0.388930505 sec.' )
-WITH (
-        SELECT uuid
-        FROM system.tables
-        WHERE (database = currentDatabase()) AND (name = '02581_trips')
-    ) AS table_uuid
-SELECT
-    CAST(splitByChar('_', query_id)[5], 'UInt64') AS mutation_version, -- '5521485f-8a40-4aba-87a2-00342c369563::all_3_3_0_6'
-    sum(message LIKE 'Created Set with % entries%') >= 1  AS has_parts_for_which_set_was_built,
-    sum(message LIKE 'Got set from cache%') >= 1 AS has_parts_that_shared_set
-FROM system.text_log
-WHERE
-    query_id LIKE concat(CAST(table_uuid, 'String'), '::all\\_%')
-    AND (event_date >= yesterday())
-    AND (message LIKE 'Created Set with % entries%' OR message LIKE 'Got set from cache%')
-GROUP BY mutation_version ORDER BY mutation_version FORMAT TSVWithNames;
+DELETE FROM 02581_trips WHERE id IN (SELECT (number*10 + 9)::UInt32 FROM numbers(200000000));
+SELECT count(), _part from 02581_trips WHERE description = '' GROUP BY _part ORDER BY _part;
 
 DROP TABLE 02581_trips;
diff --git a/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks.sql b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks.sql
index ad8bef7fbb7..ea1452fc372 100644
--- a/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks.sql
+++ b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks.sql
@@ -1,5 +1,4 @@
--- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-fasttest
--- no-fasttest: Slow test
+-- Tags: no-tsan, no-asan, no-ubsan, no-msan
 -- no sanitizers: too slow sometimes
 
 DROP TABLE IF EXISTS 02581_trips;
diff --git a/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_long.reference b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_long.reference
index eecd768eb5e..3a7410d925f 100644
--- a/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_long.reference
+++ b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_long.reference
@@ -10,11 +10,3 @@ all_4_4_0
 20000
 16000
 12000
-mutation_version	has_parts_for_which_set_was_built	has_parts_that_shared_set
-5	1	1
-6	1	1
-7	1	1
-8	1	1
-9	1	1
-10	1	1
-11	1	1
diff --git a/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_long.sql b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_long.sql
index 091a9c8171d..b7314c8fa47 100644
--- a/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_long.sql
+++ b/tests/queries/0_stateless/02581_share_big_sets_between_mutation_tasks_long.sql
@@ -18,63 +18,42 @@ SELECT count() from 02581_trips WHERE description = '';
 SELECT name FROM system.parts WHERE database=currentDatabase() AND table = '02581_trips' AND active ORDER BY name;
 
 -- Run mutation with `id` a 'IN big subquery'
-ALTER TABLE 02581_trips UPDATE description='a' WHERE id IN (SELECT (number*10)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=2;
+ALTER TABLE 02581_trips UPDATE description='a' WHERE id IN (SELECT (number*10)::UInt32 FROM numbers(200000000)) SETTINGS mutations_sync=2;
 SELECT count() from 02581_trips WHERE description = '';
 
-ALTER TABLE 02581_trips UPDATE description='a' WHERE id IN (SELECT (number*10 + 1)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=2, max_rows_in_set=1000;
+ALTER TABLE 02581_trips UPDATE description='a' WHERE id IN (SELECT (number*10 + 1)::UInt32 FROM numbers(200000000)) SETTINGS mutations_sync=2, max_rows_in_set=1000;
 SELECT count() from 02581_trips WHERE description = '';
 
 -- Run mutation with func(`id`) IN big subquery
-ALTER TABLE 02581_trips UPDATE description='b' WHERE id::UInt64 IN (SELECT (number*10 + 2)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=2;
+ALTER TABLE 02581_trips UPDATE description='b' WHERE id::UInt64 IN (SELECT (number*10 + 2)::UInt32 FROM numbers(200000000)) SETTINGS mutations_sync=2;
 SELECT count() from 02581_trips WHERE description = '';
 
 -- Run mutation with non-PK `id2` IN big subquery
---SELECT count(), _part FROM 02581_trips WHERE id2 IN (SELECT (number*10 + 3)::UInt32 FROM numbers(10000000)) GROUP BY _part ORDER BY _part;
---EXPLAIN SELECT (), _part FROM 02581_trips WHERE id2 IN (SELECT (number*10 + 3)::UInt32 FROM numbers(10000000));
-ALTER TABLE 02581_trips UPDATE description='c' WHERE id2 IN (SELECT (number*10 + 3)::UInt32 FROM numbers(10000000)) SETTINGS mutations_sync=2;
+ALTER TABLE 02581_trips UPDATE description='c' WHERE id2 IN (SELECT (number*10 + 3)::UInt32 FROM numbers(200000000)) SETTINGS mutations_sync=2;
 SELECT count() from 02581_trips WHERE description = '';
 
 -- Run mutation with PK and non-PK IN big subquery
 ALTER TABLE 02581_trips UPDATE description='c'
 WHERE
-    (id IN (SELECT (number*10 + 4)::UInt32 FROM numbers(10000000))) OR
-    (id2 IN (SELECT (number*10 + 4)::UInt32 FROM numbers(10000000)))
+    (id IN (SELECT (number*10 + 4)::UInt32 FROM numbers(200000000))) OR
+    (id2 IN (SELECT (number*10 + 4)::UInt32 FROM numbers(200000000)))
 SETTINGS mutations_sync=2;
 SELECT count() from 02581_trips WHERE description = '';
 
 -- Run mutation with PK and non-PK IN big subquery
 ALTER TABLE 02581_trips UPDATE description='c'
 WHERE
-    (id::UInt64 IN (SELECT (number*10 + 5)::UInt32 FROM numbers(10000000))) OR
-    (id2::UInt64 IN (SELECT (number*10 + 5)::UInt32 FROM numbers(10000000)))
+    (id::UInt64 IN (SELECT (number*10 + 5)::UInt32 FROM numbers(200000000))) OR
+    (id2::UInt64 IN (SELECT (number*10 + 5)::UInt32 FROM numbers(200000000)))
 SETTINGS mutations_sync=2;
 SELECT count() from 02581_trips WHERE description = '';
 
 -- Run mutation with PK and non-PK IN big subquery
 ALTER TABLE 02581_trips UPDATE description='c'
 WHERE
-    (id::UInt32 IN (SELECT (number*10 + 6)::UInt32 FROM numbers(10000000))) OR
-    ((id2+1)::String IN (SELECT (number*10 + 6)::UInt32 FROM numbers(10000000)))
+    (id::UInt32 IN (SELECT (number*10 + 6)::UInt32 FROM numbers(200000000))) OR
+    ((id2+1)::String IN (SELECT (number*10 + 6)::UInt32 FROM numbers(200000000)))
 SETTINGS mutations_sync=2;
 SELECT count() from 02581_trips WHERE description = '';
 
-SYSTEM FLUSH LOGS;
--- Check that in every mutation there were parts that built sets (log messages like 'Created Set with 10000000 entries from 10000000 rows in 0.388989187 sec.' )
--- and parts that shared sets (log messages like 'Got set from cache in 0.388930505 sec.' )
-WITH (
-        SELECT uuid
-        FROM system.tables
-        WHERE (database = currentDatabase()) AND (name = '02581_trips')
-    ) AS table_uuid
-SELECT
-    CAST(splitByChar('_', query_id)[5], 'UInt64') AS mutation_version, -- '5521485f-8a40-4aba-87a2-00342c369563::all_3_3_0_6'
-    sum(message LIKE 'Created Set with % entries%') >= 1  AS has_parts_for_which_set_was_built,
-    sum(message LIKE 'Got set from cache%') >= 1 AS has_parts_that_shared_set
-FROM system.text_log
-WHERE
-    query_id LIKE concat(CAST(table_uuid, 'String'), '::all\\_%')
-    AND (event_date >= yesterday())
-    AND (message LIKE 'Created Set with % entries%' OR message LIKE 'Got set from cache%')
-GROUP BY mutation_version ORDER BY mutation_version FORMAT TSVWithNames;
-
 DROP TABLE 02581_trips;
diff --git a/tests/queries/0_stateless/02582_analyzer_join_subquery_empty_column_list.sql b/tests/queries/0_stateless/02582_analyzer_join_subquery_empty_column_list.sql
index 33c9296a0d8..10e5871cc44 100644
--- a/tests/queries/0_stateless/02582_analyzer_join_subquery_empty_column_list.sql
+++ b/tests/queries/0_stateless/02582_analyzer_join_subquery_empty_column_list.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 -- { echoOn }
 
 SELECT a FROM ( select 1 AS a ) AS t1, ( select 2 AS b, 3 AS c) AS t2;
@@ -10,3 +10,5 @@ SELECT b FROM ( select 1 AS a UNION ALL select 1 as a ) AS t1, ( select 2 AS b,
 SELECT c FROM ( select 1 AS a UNION ALL select 1 as a ) AS t1, ( select 2 AS b, 3 AS c UNION ALL select 2 as b, 3 as c) AS t2;
 SELECT 42 FROM ( select 1 AS a UNION ALL select 1 as a ) AS t1, ( select 2 AS b, 3 AS c UNION ALL select 2 as b, 3 as c) AS t2;
 SELECT count() FROM ( select 1 AS a UNION ALL select 1 as a ) AS t1, ( select 2 AS b, 3 AS c UNION ALL select 2 as b, 3 as c) AS t2;
+
+
diff --git a/tests/queries/0_stateless/02585_query_status_deadlock.sh b/tests/queries/0_stateless/02585_query_status_deadlock.sh
index 932cf593393..e3e34109cdb 100755
--- a/tests/queries/0_stateless/02585_query_status_deadlock.sh
+++ b/tests/queries/0_stateless/02585_query_status_deadlock.sh
@@ -7,8 +7,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 QUERY_ID="${CLICKHOUSE_DATABASE}_test_02585_query_to_kill_id_1"
 
-$CLICKHOUSE_CLIENT --query_id="$QUERY_ID" --max_rows_to_read 0 -n -q "
-create temporary table tmp as select * from numbers(100000000);
+$CLICKHOUSE_CLIENT --query_id="$QUERY_ID" -n -q "
+create temporary table tmp as select * from numbers(500000000);
 select * from remote('127.0.0.2', 'system.numbers_mt') where number in (select * from tmp);" &> /dev/null &
 
 $CLICKHOUSE_CLIENT -q "SYSTEM FLUSH LOGS"
@@ -19,7 +19,8 @@ do
     if [ -n "$res" ]; then
         break
     fi
-    sleep 1
+    sleep  1
 done
 
 $CLICKHOUSE_CLIENT -q "kill query where query_id = '$QUERY_ID' sync" &> /dev/null
+
diff --git a/tests/queries/0_stateless/02597_column_update_tricky_expression_and_replication.python b/tests/queries/0_stateless/02597_column_update_tricky_expression_and_replication.python
deleted file mode 100644
index eb0cab9d56f..00000000000
--- a/tests/queries/0_stateless/02597_column_update_tricky_expression_and_replication.python
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-from threading import Thread
-from queue import Queue
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, "helpers"))
-
-from pure_http_client import ClickHouseClient
-
-
-client = ClickHouseClient()
-
-
-client.query("DROP TABLE IF EXISTS test SYNC")
-client.query(
-    """
-CREATE TABLE test
-(
-    c_id String,
-    p_id String,
-    d UInt32,
-)
-Engine = ReplicatedMergeTree('/clickhouse/tables/{database}/test/test_table', '1')
-ORDER BY (c_id, p_id)
-"""
-)
-
-
-def attempt_mutation(q):
-    try:
-        client.query(
-            "ALTER TABLE test DROP COLUMN x SETTINGS mutations_sync=2",
-            with_retries=False,
-        )
-    except ValueError as e:
-        assert "BAD_ARGUMENTS" in str(e)
-        q.put("OK")
-
-
-client.query("INSERT INTO test SELECT '1', '11', '111' FROM numbers(5)")
-client.query("SYSTEM ENABLE FAILPOINT infinite_sleep")
-client.query(
-    "ALTER TABLE test UPDATE d = d + sleepEachRow(0.3) where 1 SETTINGS mutations_sync=0"
-)
-client.query("ALTER TABLE test ADD COLUMN x UInt32 default 0 SETTINGS mutations_sync=0")
-client.query("ALTER TABLE test UPDATE d = x + 1 where 1 SETTINGS mutations_sync=0")
-
-q = Queue()
-t = Thread(target=attempt_mutation, args=(q,))
-t.start()
-t.join()
-assert not q.empty()
-assert q.get() == "OK"
-
-client.query("SYSTEM DISABLE FAILPOINT infinite_sleep")
-
-client.query("ALTER TABLE test UPDATE x = x + 1 where 1 SETTINGS mutations_sync=2")
-client.query("ALTER TABLE test DROP COLUMN x SETTINGS mutations_sync=2")
-client.query("SELECT * from test format Null")
-client.query("DROP TABLE test")
diff --git a/tests/queries/0_stateless/02597_column_update_tricky_expression_and_replication.reference b/tests/queries/0_stateless/02597_column_update_tricky_expression_and_replication.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/02597_column_update_tricky_expression_and_replication.sh b/tests/queries/0_stateless/02597_column_update_tricky_expression_and_replication.sh
deleted file mode 100755
index 5be04d99204..00000000000
--- a/tests/queries/0_stateless/02597_column_update_tricky_expression_and_replication.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# Tags: zookeeper, no-parallel
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-# We should have correct env vars from shell_config.sh to run this test
-python3 "$CURDIR"/02597_column_update_tricky_expression_and_replication.python
diff --git a/tests/integration/test_async_metrics_in_cgroup/__init__.py b/tests/queries/0_stateless/02597_column_update_tricy_expression_and_replication.reference
similarity index 100%
rename from tests/integration/test_async_metrics_in_cgroup/__init__.py
rename to tests/queries/0_stateless/02597_column_update_tricy_expression_and_replication.reference
diff --git a/tests/queries/0_stateless/02597_column_update_tricy_expression_and_replication.sql b/tests/queries/0_stateless/02597_column_update_tricy_expression_and_replication.sql
new file mode 100644
index 00000000000..34f88b19b7e
--- /dev/null
+++ b/tests/queries/0_stateless/02597_column_update_tricy_expression_and_replication.sql
@@ -0,0 +1,28 @@
+CREATE TABLE test (
+    `c_id` String,
+    `p_id` String,
+    `d` UInt32
+)
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test/test_table', '1')
+ORDER BY (c_id, p_id);
+
+INSERT INTO test SELECT '1', '11', '111' FROM numbers(3);
+
+INSERT INTO test SELECT '2', '22', '22' FROM numbers(3);
+
+set mutations_sync=0;
+
+ALTER TABLE test UPDATE d = d + sleepEachRow(0.3) where 1;
+
+ALTER TABLE test ADD COLUMN x UInt32 default 0;
+ALTER TABLE test UPDATE d = x + 1 where 1;
+ALTER TABLE test DROP COLUMN x SETTINGS mutations_sync = 2; --{serverError BAD_ARGUMENTS}
+
+ALTER TABLE test UPDATE x = x + 1 where 1 SETTINGS mutations_sync = 2;
+
+ALTER TABLE test DROP COLUMN x SETTINGS mutations_sync = 2;
+
+select * from test format Null;
+
+DROP TABLE test;
+
diff --git a/tests/queries/0_stateless/02661_quantile_approx.reference b/tests/queries/0_stateless/02661_quantile_approx.reference
index 239516f9ac4..0ee846a268b 100644
--- a/tests/queries/0_stateless/02661_quantile_approx.reference
+++ b/tests/queries/0_stateless/02661_quantile_approx.reference
@@ -33,10 +33,10 @@ FROM
     FROM numbers(49999)
 );
 [24902,44518,49999]
-select medianGK()(number) from numbers(10) SETTINGS enable_analyzer = 0; -- { serverError BAD_ARGUMENTS }
-select medianGK()(number) from numbers(10) SETTINGS enable_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
-select quantileGK()(number) from numbers(10) SETTINGS enable_analyzer = 0; -- { serverError BAD_ARGUMENTS }
-select quantileGK()(number) from numbers(10) SETTINGS enable_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select medianGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 0; -- { serverError BAD_ARGUMENTS }
+select medianGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select quantileGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 0; -- { serverError BAD_ARGUMENTS }
+select quantileGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 select medianGK(100)(number) from numbers(10);
 4
 select quantileGK(100)(number) from numbers(10);
@@ -47,8 +47,8 @@ select quantileGK(100, 0.5, 0.75)(number) from numbers(10); -- { serverError NUM
 select quantileGK('abc', 0.5)(number) from numbers(10); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 select quantileGK(1.23, 0.5)(number) from numbers(10); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 select quantileGK(-100, 0.5)(number) from numbers(10); -- { serverError BAD_ARGUMENTS }
-select quantilesGK()(number) from numbers(10) SETTINGS enable_analyzer = 0; -- { serverError BAD_ARGUMENTS }
-select quantilesGK()(number) from numbers(10) SETTINGS enable_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select quantilesGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 0; -- { serverError BAD_ARGUMENTS }
+select quantilesGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 select quantilesGK(100)(number) from numbers(10); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 select quantilesGK(100, 0.5)(number) from numbers(10);
 [4]
diff --git a/tests/queries/0_stateless/02661_quantile_approx.sql b/tests/queries/0_stateless/02661_quantile_approx.sql
index 732ce645c98..c0004260fa1 100644
--- a/tests/queries/0_stateless/02661_quantile_approx.sql
+++ b/tests/queries/0_stateless/02661_quantile_approx.sql
@@ -1,4 +1,4 @@
-set enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 
 -- { echoOn }
 with arrayJoin([0, 1, 2, 10]) as x select quantilesGK(100, 0.5, 0.4, 0.1)(x);
@@ -29,11 +29,11 @@ FROM
     FROM numbers(49999)
 );
 
-select medianGK()(number) from numbers(10) SETTINGS enable_analyzer = 0; -- { serverError BAD_ARGUMENTS }
-select medianGK()(number) from numbers(10) SETTINGS enable_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+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 enable_analyzer = 0; -- { serverError BAD_ARGUMENTS }
-select quantileGK()(number) from numbers(10) SETTINGS enable_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select quantileGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 0; -- { serverError BAD_ARGUMENTS }
+select quantileGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 
 select medianGK(100)(number) from numbers(10);
 select quantileGK(100)(number) from numbers(10);
@@ -43,8 +43,8 @@ select quantileGK('abc', 0.5)(number) from numbers(10); -- { serverError ILLEGAL
 select quantileGK(1.23, 0.5)(number) from numbers(10); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 select quantileGK(-100, 0.5)(number) from numbers(10); -- { serverError BAD_ARGUMENTS }
 
-select quantilesGK()(number) from numbers(10) SETTINGS enable_analyzer = 0; -- { serverError BAD_ARGUMENTS }
-select quantilesGK()(number) from numbers(10) SETTINGS enable_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select quantilesGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 0; -- { serverError BAD_ARGUMENTS }
+select quantilesGK()(number) from numbers(10) SETTINGS allow_experimental_analyzer = 1; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 
 select quantilesGK(100)(number) from numbers(10); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 select quantilesGK(100, 0.5)(number) from numbers(10);
diff --git a/tests/queries/0_stateless/02662_first_last_value.reference b/tests/queries/0_stateless/02662_first_last_value.reference
index 308cbf850b0..b0783399623 100644
--- a/tests/queries/0_stateless/02662_first_last_value.reference
+++ b/tests/queries/0_stateless/02662_first_last_value.reference
@@ -18,7 +18,7 @@ select last_value(b) ignore nulls from test;
 5
 select last_value(b) respect nulls from test;
 \N
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 -- first value
 select first_value(b) from test;
 3
diff --git a/tests/queries/0_stateless/02662_first_last_value.sql b/tests/queries/0_stateless/02662_first_last_value.sql
index 16768bd6f1e..8e429e2e27d 100644
--- a/tests/queries/0_stateless/02662_first_last_value.sql
+++ b/tests/queries/0_stateless/02662_first_last_value.sql
@@ -15,7 +15,7 @@ select last_value(b) from test;
 select last_value(b) ignore nulls from test;
 select last_value(b) respect nulls from test;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 -- first value
 select first_value(b) from test;
diff --git a/tests/queries/0_stateless/02668_logical_optimizer_removing_redundant_checks.sql b/tests/queries/0_stateless/02668_logical_optimizer_removing_redundant_checks.sql
index dabdcfd5507..7d624195df9 100644
--- a/tests/queries/0_stateless/02668_logical_optimizer_removing_redundant_checks.sql
+++ b/tests/queries/0_stateless/02668_logical_optimizer_removing_redundant_checks.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS 02668_logical_optimizer;
 
diff --git a/tests/queries/0_stateless/02668_parse_datetime.reference b/tests/queries/0_stateless/02668_parse_datetime.reference
index b67ca2d8b76..d21a51ce70c 100644
--- a/tests/queries/0_stateless/02668_parse_datetime.reference
+++ b/tests/queries/0_stateless/02668_parse_datetime.reference
@@ -239,7 +239,7 @@ select sTr_To_DaTe('10:04:11 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') = toDateTi
 select str_to_date('10:04:11 invalid 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') IS NULL;
 1
 -- Error handling
-select parseDateTime(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select parseDateTime('12 AM'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 select parseDateTime('12 AM', '%h %p', 'UTC', 'a fourth argument'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 -- Fuzzer crash bug #53715
 select parseDateTime('', '', toString(number)) from numbers(13); -- { serverError ILLEGAL_COLUMN }
@@ -270,7 +270,3 @@ select parseDateTime('8 13, 2022, 7:58:32', '%c %e, %G, %k:%i:%s', 'UTC');
 2022-08-13 07:58:32
 select parseDateTime('08 13, 2022, 07:58:32', '%c %e, %G, %k:%i:%s', 'UTC');
 2022-08-13 07:58:32
--- The format string argument is optional
-set session_timezone = 'UTC'; -- don't randomize the session timezone
-select parseDateTime('2021-01-04 23:12:34') = toDateTime('2021-01-04 23:12:34');
-1
diff --git a/tests/queries/0_stateless/02668_parse_datetime.sql b/tests/queries/0_stateless/02668_parse_datetime.sql
index 7b3aed60a4a..02ac0c5f35c 100644
--- a/tests/queries/0_stateless/02668_parse_datetime.sql
+++ b/tests/queries/0_stateless/02668_parse_datetime.sql
@@ -162,7 +162,7 @@ select sTr_To_DaTe('10:04:11 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') = toDateTi
 select str_to_date('10:04:11 invalid 03-07-2019', '%s:%i:%H %d-%m-%Y', 'UTC') IS NULL;
 
 -- Error handling
-select parseDateTime(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select parseDateTime('12 AM'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 select parseDateTime('12 AM', '%h %p', 'UTC', 'a fourth argument'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 
 -- Fuzzer crash bug #53715
@@ -187,9 +187,4 @@ select parseDateTime('08 13, 2022, 07:58:32', '%m %e, %G, %k:%i:%s', 'UTC');
 select parseDateTime('8 13, 2022, 7:58:32', '%c %e, %G, %k:%i:%s', 'UTC');
 select parseDateTime('08 13, 2022, 07:58:32', '%c %e, %G, %k:%i:%s', 'UTC');
 
--- The format string argument is optional
-set session_timezone = 'UTC'; -- don't randomize the session timezone
-select parseDateTime('2021-01-04 23:12:34') = toDateTime('2021-01-04 23:12:34');
-
-
 -- { echoOff }
diff --git a/tests/queries/0_stateless/02668_parse_datetime_in_joda_syntax.reference b/tests/queries/0_stateless/02668_parse_datetime_in_joda_syntax.reference
index 6f560577ab5..9fbf105dc41 100644
--- a/tests/queries/0_stateless/02668_parse_datetime_in_joda_syntax.reference
+++ b/tests/queries/0_stateless/02668_parse_datetime_in_joda_syntax.reference
@@ -354,9 +354,5 @@ select parseDateTimeInJodaSyntaxOrNull('2001 366 2000', 'yyyy D yyyy', 'UTC') =
 select parseDateTimeInJodaSyntaxOrNull('2001 invalid 366 2000', 'yyyy D yyyy', 'UTC') IS NULL;
 1
 -- Error handling
-select parseDateTimeInJodaSyntax(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select parseDateTimeInJodaSyntax('12 AM'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 select parseDateTimeInJodaSyntax('12 AM', 'h a', 'UTC', 'a fourth argument'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
--- The format string argument is optional
-set session_timezone = 'UTC'; -- don't randomize the session timezone
-select parseDateTimeInJodaSyntax('2021-01-04 23:12:34') = toDateTime('2021-01-04 23:12:34');
-1
diff --git a/tests/queries/0_stateless/02668_parse_datetime_in_joda_syntax.sql b/tests/queries/0_stateless/02668_parse_datetime_in_joda_syntax.sql
index 28d14607ba6..f5810d3d4c3 100644
--- a/tests/queries/0_stateless/02668_parse_datetime_in_joda_syntax.sql
+++ b/tests/queries/0_stateless/02668_parse_datetime_in_joda_syntax.sql
@@ -239,11 +239,6 @@ select parseDateTimeInJodaSyntaxOrNull('2001 366 2000', 'yyyy D yyyy', 'UTC') =
 select parseDateTimeInJodaSyntaxOrNull('2001 invalid 366 2000', 'yyyy D yyyy', 'UTC') IS NULL;
 
 -- Error handling
-select parseDateTimeInJodaSyntax(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+select parseDateTimeInJodaSyntax('12 AM'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 select parseDateTimeInJodaSyntax('12 AM', 'h a', 'UTC', 'a fourth argument'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
-
--- The format string argument is optional
-set session_timezone = 'UTC'; -- don't randomize the session timezone
-select parseDateTimeInJodaSyntax('2021-01-04 23:12:34') = toDateTime('2021-01-04 23:12:34');
-
 -- { echoOff }
diff --git a/tests/queries/0_stateless/02674_trivial_count_analyzer.reference b/tests/queries/0_stateless/02674_trivial_count_analyzer.reference
index 9d7f393e71c..05feadb58a0 100644
--- a/tests/queries/0_stateless/02674_trivial_count_analyzer.reference
+++ b/tests/queries/0_stateless/02674_trivial_count_analyzer.reference
@@ -1,5 +1,5 @@
 -- { echoOn }
-set enable_analyzer=1;
+set allow_experimental_analyzer=1;
 set optimize_trivial_count_query=1;
 create table m3(a Int64, b UInt64) Engine=MergeTree order by tuple();
 select count() from m3;
diff --git a/tests/queries/0_stateless/02674_trivial_count_analyzer.sql b/tests/queries/0_stateless/02674_trivial_count_analyzer.sql
index c13a9dc68f2..988d1b9ba92 100644
--- a/tests/queries/0_stateless/02674_trivial_count_analyzer.sql
+++ b/tests/queries/0_stateless/02674_trivial_count_analyzer.sql
@@ -2,7 +2,7 @@ drop table if exists m3;
 drop table if exists replacing_m3;
 
 -- { echoOn }
-set enable_analyzer=1;
+set allow_experimental_analyzer=1;
 set optimize_trivial_count_query=1;
 
 create table m3(a Int64, b UInt64) Engine=MergeTree order by tuple();
diff --git a/tests/queries/0_stateless/02675_predicate_push_down_filled_join_fix.sql b/tests/queries/0_stateless/02675_predicate_push_down_filled_join_fix.sql
index 6c8932b5d58..930127497ae 100644
--- a/tests/queries/0_stateless/02675_predicate_push_down_filled_join_fix.sql
+++ b/tests/queries/0_stateless/02675_predicate_push_down_filled_join_fix.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET single_join_prefer_left_table = 0;
 SET optimize_move_to_prewhere = 0;
 
diff --git a/tests/queries/0_stateless/02675_profile_events_from_query_log_and_client.reference b/tests/queries/0_stateless/02675_profile_events_from_query_log_and_client.reference
index 448eca3e5b1..babcecf7004 100644
--- a/tests/queries/0_stateless/02675_profile_events_from_query_log_and_client.reference
+++ b/tests/queries/0_stateless/02675_profile_events_from_query_log_and_client.reference
@@ -1,11 +1,11 @@
 INSERT TO S3
-S3Clients	1
-S3CompleteMultipartUpload	1
-S3CreateMultipartUpload	1
-S3HeadObject	2
-S3ReadRequestsCount	2
-S3UploadPart	1
-Successful write requests	3
+ [ 0 ] S3Clients: 1 
+ [ 0 ] S3CompleteMultipartUpload: 1 
+ [ 0 ] S3CreateMultipartUpload: 1 
+ [ 0 ] S3HeadObject: 2 
+ [ 0 ] S3ReadRequestsCount: 2 
+ [ 0 ] S3UploadPart: 1 
+ [ 0 ] S3WriteRequestsCount: 3 
 CHECK WITH query_log
 QueryFinish	S3CreateMultipartUpload	1	S3UploadPart	1	S3CompleteMultipartUpload	1	S3PutObject	0
 CREATE
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 ff534a6a2e6..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
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-fasttest, no-random-merge-tree-settings
+# Tags: no-fasttest
 # Tag no-fasttest: needs s3
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
@@ -9,25 +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 | $CLICKHOUSE_LOCAL -q "
-WITH '(\\w+): (\\d+)' AS pattern,
-  (SELECT (groupArray(regexpExtract(line, pattern, 1)),
-           groupArray(regexpExtract(line, pattern, 2)::UInt64))::Map(String, UInt64)
-   FROM file(stdin, 'LineAsString', 'line String')
-   WHERE line LIKE '% S3%'
-     AND line NOT LIKE '%Microseconds%'
-     AND line NOT LIKE '%S3DiskConnections%'
-     AND line NOT LIKE '%S3DiskAddresses%'
-     AND line NOT LIKE '%RequestThrottlerCount%'
-     ) AS pe_map
-SELECT * FROM (
-    SELECT untuple(arrayJoin(pe_map) AS pe)
-    WHERE tupleElement(pe, 1) not like '%WriteRequests%'
-    UNION ALL
-    SELECT 'Successful write requests',
-           (pe_map['S3WriteRequestsCount'] - pe_map['S3WriteRequestsErrors'])::UInt64
-) ORDER BY 1
-"
+" 2>&1 | grep -o -e '\ \[\ .*\ \]\ S3.*:\ .*\ ' | grep -v 'Microseconds' | grep -v 'S3DiskConnections' | grep -v 'S3DiskAddresses' | sort
 
 echo "CHECK WITH query_log"
 $CLICKHOUSE_CLIENT -nq "
@@ -58,19 +40,19 @@ CREATE TABLE times (t DateTime) ENGINE MergeTree ORDER BY t
 echo "INSERT"
 $CLICKHOUSE_CLIENT --print-profile-events --profile-events-delay-ms=-1  -nq "
 INSERT INTO times SELECT now() + INTERVAL 1 day SETTINGS optimize_on_insert = 0;
-" 2>&1 | grep -o -e ' \[ .* \] FileOpen: .* '
+" 2>&1 | grep -o -e '\ \[\ .*\ \]\ FileOpen:\ .*\ '
 
 echo "READ"
 $CLICKHOUSE_CLIENT --print-profile-events --profile-events-delay-ms=-1  -nq "
 SELECT '1', min(t) FROM times SETTINGS optimize_use_implicit_projections = 1;
-" 2>&1 | grep -o -e ' \[ .* \] FileOpen: .* '
+" 2>&1 | grep -o -e '\ \[\ .*\ \]\ FileOpen:\ .*\ '
 
 echo "INSERT and READ INSERT"
 $CLICKHOUSE_CLIENT --print-profile-events --profile-events-delay-ms=-1  -nq "
 INSERT INTO times SELECT now() + INTERVAL 2 day SETTINGS optimize_on_insert = 0;
 SELECT '2', min(t) FROM times SETTINGS optimize_use_implicit_projections = 1;
 INSERT INTO times SELECT now() + INTERVAL 3 day SETTINGS optimize_on_insert = 0;
-" 2>&1 | grep -o -e ' \[ .* \] FileOpen: .* '
+" 2>&1 | grep -o -e '\ \[\ .*\ \]\ FileOpen:\ .*\ '
 
 echo "DROP"
 $CLICKHOUSE_CLIENT -nq "
diff --git a/tests/queries/0_stateless/02676_analyzer_limit_offset.sql b/tests/queries/0_stateless/02676_analyzer_limit_offset.sql
index 5dbe55e916c..39c6b85f088 100644
--- a/tests/queries/0_stateless/02676_analyzer_limit_offset.sql
+++ b/tests/queries/0_stateless/02676_analyzer_limit_offset.sql
@@ -1,4 +1,4 @@
-set enable_analyzer=1;
+set allow_experimental_analyzer=1;
 
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (i UInt64) Engine = MergeTree() order by i;
diff --git a/tests/queries/0_stateless/02676_distinct_reading_in_order_analyzer.sql b/tests/queries/0_stateless/02676_distinct_reading_in_order_analyzer.sql
index 6a219cd3781..f9ff1eed111 100644
--- a/tests/queries/0_stateless/02676_distinct_reading_in_order_analyzer.sql
+++ b/tests/queries/0_stateless/02676_distinct_reading_in_order_analyzer.sql
@@ -1,6 +1,6 @@
 drop table if exists t;
 
-set enable_analyzer=1;
+set allow_experimental_analyzer=1;
 
 create table t (a UInt64, b UInt64) engine=MergeTree() order by (a);
 insert into t select number % 2, number from numbers(10);
diff --git a/tests/queries/0_stateless/02677_analyzer_bitmap_has_any.sql b/tests/queries/0_stateless/02677_analyzer_bitmap_has_any.sql
index dc906a92f1e..c06ea009c1d 100644
--- a/tests/queries/0_stateless/02677_analyzer_bitmap_has_any.sql
+++ b/tests/queries/0_stateless/02677_analyzer_bitmap_has_any.sql
@@ -18,7 +18,7 @@ FROM
         bitmapHasAny(bitmapBuild([toUInt64(1)]), (
             SELECT groupBitmapState(toUInt64(2))
         )) has2
-) SETTINGS enable_analyzer = 0; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+) SETTINGS allow_experimental_analyzer = 0; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 
 SELECT '--------------';
 
@@ -32,4 +32,5 @@ FROM
         bitmapHasAny(bitmapBuild([toUInt64(1)]), (
             SELECT groupBitmapState(toUInt64(2))
         )) has2
-) SETTINGS enable_analyzer = 1;
+) SETTINGS allow_experimental_analyzer = 1;
+
diff --git a/tests/queries/0_stateless/02677_analyzer_compound_expressions.sql b/tests/queries/0_stateless/02677_analyzer_compound_expressions.sql
index 90781f70158..6b7fdab8993 100644
--- a/tests/queries/0_stateless/02677_analyzer_compound_expressions.sql
+++ b/tests/queries/0_stateless/02677_analyzer_compound_expressions.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 WITH ('a', 'b')::Tuple(c1 String, c2 String) AS t
 SELECT t.c1, t.c2;
diff --git a/tests/queries/0_stateless/02677_get_subcolumn_array_of_tuples.sql b/tests/queries/0_stateless/02677_get_subcolumn_array_of_tuples.sql
index 95665979857..5779821afaa 100644
--- a/tests/queries/0_stateless/02677_get_subcolumn_array_of_tuples.sql
+++ b/tests/queries/0_stateless/02677_get_subcolumn_array_of_tuples.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS t_get_subcolumn;
 
diff --git a/tests/queries/0_stateless/02679_explain_merge_tree_prewhere_row_policy.sql b/tests/queries/0_stateless/02679_explain_merge_tree_prewhere_row_policy.sql
index 4911979394a..4bc7be13490 100644
--- a/tests/queries/0_stateless/02679_explain_merge_tree_prewhere_row_policy.sql
+++ b/tests/queries/0_stateless/02679_explain_merge_tree_prewhere_row_policy.sql
@@ -10,8 +10,8 @@ INSERT INTO test_table VALUES (0, 'Value');
 DROP ROW POLICY IF EXISTS test_row_policy ON test_table;
 CREATE ROW POLICY test_row_policy ON test_table USING id >= 5 TO ALL;
 
-EXPLAIN header = 1, actions = 1 SELECT id, value FROM test_table PREWHERE id = 5 settings enable_analyzer=0;
-EXPLAIN header = 1, actions = 1 SELECT id, value FROM test_table PREWHERE id = 5 settings enable_analyzer=1;
+EXPLAIN header = 1, actions = 1 SELECT id, value FROM test_table PREWHERE id = 5 settings allow_experimental_analyzer=0;
+EXPLAIN header = 1, actions = 1 SELECT id, value FROM test_table PREWHERE id = 5 settings allow_experimental_analyzer=1;
 
 DROP ROW POLICY test_row_policy ON test_table;
 DROP TABLE test_table;
diff --git a/tests/queries/0_stateless/02697_stop_reading_on_first_cancel.sh b/tests/queries/0_stateless/02697_stop_reading_on_first_cancel.sh
index 2de267a79d7..2be13588453 100755
--- a/tests/queries/0_stateless/02697_stop_reading_on_first_cancel.sh
+++ b/tests/queries/0_stateless/02697_stop_reading_on_first_cancel.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 QUERY_ID="${CLICKHOUSE_DATABASE}_read_with_cancel"
 
-$CLICKHOUSE_CLIENT --max_rows_to_read 0 --query_id="$QUERY_ID" --query="SELECT sum(number * 0) FROM numbers(10000000000) SETTINGS partial_result_on_first_cancel=true;" &
+$CLICKHOUSE_CLIENT -n --query_id="$QUERY_ID" --query="SELECT sum(number * 0) FROM numbers(10000000000) SETTINGS partial_result_on_first_cancel=true;" &
 pid=$!
 
 for _ in {0..60}
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 680b98fb1bd..502cca20ab2 100644
--- a/tests/queries/0_stateless/02699_polygons_sym_difference_rollup.sql
+++ b/tests/queries/0_stateless/02699_polygons_sym_difference_rollup.sql
@@ -1,4 +1,4 @@
 SELECT polygonsSymDifferenceCartesian([[[(1., 1.)]] AS x], [x]) GROUP BY x WITH ROLLUP;
-SELECT [[(2147483647, 0.), (10.0001, 65535), (1, 255), (1023, 2147483646)]], polygonsSymDifferenceCartesian([[[(2147483647, 0.), (10.0001, 65535), (1023, 2147483646)]]], [[[(1000.0001, 10.0001)]]]) GROUP BY [[(2147483647, 0.), (10.0001, 65535), (1023, 2147483646)]] WITH ROLLUP SETTINGS enable_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 enable_analyzer=1;
+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;
diff --git a/tests/queries/0_stateless/02699_polygons_sym_difference_total.sql b/tests/queries/0_stateless/02699_polygons_sym_difference_total.sql
index 53d0a3bb543..0fac4b11320 100644
--- a/tests/queries/0_stateless/02699_polygons_sym_difference_total.sql
+++ b/tests/queries/0_stateless/02699_polygons_sym_difference_total.sql
@@ -1,2 +1,2 @@
-SET enable_analyzer=0;
+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.sql b/tests/queries/0_stateless/02699_polygons_sym_difference_total_analyzer.sql
index 40f610ae5a6..879e0e5297f 100644
--- a/tests/queries/0_stateless/02699_polygons_sym_difference_total_analyzer.sql
+++ b/tests/queries/0_stateless/02699_polygons_sym_difference_total_analyzer.sql
@@ -1,2 +1,2 @@
-SET enable_analyzer=1;
+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/02700_s3_part_INT_MAX.sh b/tests/queries/0_stateless/02700_s3_part_INT_MAX.sh
index cfb38c60615..a34a480a078 100755
--- a/tests/queries/0_stateless/02700_s3_part_INT_MAX.sh
+++ b/tests/queries/0_stateless/02700_s3_part_INT_MAX.sh
@@ -10,9 +10,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # NOTE: .sh test is used over .sql because it needs $CLICKHOUSE_DATABASE to
 # avoid truncation, since seems that the version of MinIO that is used on CI
 # too slow with this.
-#
-# Unfortunately, the test has to buffer it in memory.
-$CLICKHOUSE_CLIENT --max_memory_usage 16G -nm -q "
+$CLICKHOUSE_CLIENT -nm -q "
     INSERT INTO FUNCTION s3('http://localhost:11111/test/$CLICKHOUSE_DATABASE/test_INT_MAX.tsv', '', '', 'TSV')
     SELECT repeat('a', 1024) FROM numbers((pow(2, 30) * 2) / 1024)
     SETTINGS s3_max_single_part_upload_size = '5Gi';
diff --git a/tests/queries/0_stateless/02701_invalid_having_NOT_AN_AGGREGATE.sql b/tests/queries/0_stateless/02701_invalid_having_NOT_AN_AGGREGATE.sql
index 9cfc4d83058..092bda23164 100644
--- a/tests/queries/0_stateless/02701_invalid_having_NOT_AN_AGGREGATE.sql
+++ b/tests/queries/0_stateless/02701_invalid_having_NOT_AN_AGGREGATE.sql
@@ -1 +1 @@
-SELECT a, sum(b) FROM (SELECT 1 AS a, 1 AS b, 0 AS c) GROUP BY a HAVING c SETTINGS enable_analyzer=1 -- { serverError NOT_AN_AGGREGATE }
+SELECT a, sum(b) FROM (SELECT 1 AS a, 1 AS b, 0 AS c) GROUP BY a HAVING c SETTINGS allow_experimental_analyzer=1 -- { serverError NOT_AN_AGGREGATE }
diff --git a/tests/queries/0_stateless/02702_allow_skip_errors_enum.sh b/tests/queries/0_stateless/02702_allow_skip_errors_enum.sh
index 9c73ad3a809..e68f5517d52 100755
--- a/tests/queries/0_stateless/02702_allow_skip_errors_enum.sh
+++ b/tests/queries/0_stateless/02702_allow_skip_errors_enum.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS t; CREATE TABLE t (x Enum('Hello' = 1, 'World' = 2)) ENGINE = Memory;"
+$CLICKHOUSE_CLIENT --multiquery --query "DROP TABLE IF EXISTS t; CREATE TABLE t (x Enum('Hello' = 1, 'World' = 2)) ENGINE = Memory;"
 $CLICKHOUSE_CLIENT --input_format_allow_errors_num 1 --query "INSERT INTO t FORMAT CSV" <<END
 Hello
 Goodbye
diff --git a/tests/queries/0_stateless/02702_logical_optimizer_with_nulls.sql b/tests/queries/0_stateless/02702_logical_optimizer_with_nulls.sql
index 9e2927334e1..72ab507f541 100644
--- a/tests/queries/0_stateless/02702_logical_optimizer_with_nulls.sql
+++ b/tests/queries/0_stateless/02702_logical_optimizer_with_nulls.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS 02702_logical_optimizer;
 
diff --git a/tests/queries/0_stateless/02703_explain_query_tree_is_forbidden_with_old_analyzer.sql b/tests/queries/0_stateless/02703_explain_query_tree_is_forbidden_with_old_analyzer.sql
index c028e74f1b5..d351bfe402c 100644
--- a/tests/queries/0_stateless/02703_explain_query_tree_is_forbidden_with_old_analyzer.sql
+++ b/tests/queries/0_stateless/02703_explain_query_tree_is_forbidden_with_old_analyzer.sql
@@ -1,2 +1,2 @@
-set enable_analyzer=0;
+set allow_experimental_analyzer=0;
 EXPLAIN QUERY TREE run_passes = true, dump_passes = true SELECT 1; -- { serverError NOT_IMPLEMENTED }
diff --git a/tests/queries/0_stateless/02703_max_local_read_bandwidth.sh b/tests/queries/0_stateless/02703_max_local_read_bandwidth.sh
index 79253648475..6f43c1ae869 100755
--- a/tests/queries/0_stateless/02703_max_local_read_bandwidth.sh
+++ b/tests/queries/0_stateless/02703_max_local_read_bandwidth.sh
@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
-# Tags: no-object-storage, no-random-settings, no-random-merge-tree-settings, no-fasttest
-# no-fasttest: The test is slow
+# Tags: no-object-storage, no-random-settings, no-random-merge-tree-settings
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     drop table if exists data;
     create table data (key UInt64 CODEC(NONE)) engine=MergeTree() order by tuple() settings min_bytes_for_wide_part=1e9;
 "
@@ -26,7 +25,7 @@ read_methods=(
 for read_method in "${read_methods[@]}"; do
     query_id=$(random_str 10)
     $CLICKHOUSE_CLIENT --query_id "$query_id" -q "select * from data format Null settings max_local_read_bandwidth='1M', local_filesystem_read_method='$read_method'"
-    $CLICKHOUSE_CLIENT -m -q "
+    $CLICKHOUSE_CLIENT -nm -q "
         SYSTEM FLUSH LOGS;
         SELECT
             '$read_method',
diff --git a/tests/queries/0_stateless/02703_max_local_write_bandwidth.sh b/tests/queries/0_stateless/02703_max_local_write_bandwidth.sh
index c5776134673..4f6a300c5b3 100755
--- a/tests/queries/0_stateless/02703_max_local_write_bandwidth.sh
+++ b/tests/queries/0_stateless/02703_max_local_write_bandwidth.sh
@@ -5,7 +5,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     drop table if exists data;
     create table data (key UInt64 CODEC(NONE)) engine=MergeTree() order by tuple() settings min_bytes_for_wide_part=1e9;
 "
@@ -13,7 +13,7 @@ $CLICKHOUSE_CLIENT -m -q "
 query_id=$(random_str 10)
 # writes 1e6*8 bytes with 1M bandwith it should take (8-1)/1=7 seconds
 $CLICKHOUSE_CLIENT --query_id "$query_id" -q "insert into data select * from numbers(1e6) settings max_local_write_bandwidth='1M'"
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     SYSTEM FLUSH LOGS;
     SELECT
         query_duration_ms >= 7e3,
diff --git a/tests/queries/0_stateless/02703_row_policies_for_asterisk.sh b/tests/queries/0_stateless/02703_row_policies_for_asterisk.sh
deleted file mode 100755
index bb75ab5041b..00000000000
--- a/tests/queries/0_stateless/02703_row_policies_for_asterisk.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-$CLICKHOUSE_CLIENT "
-    SELECT 'Policy for table \`*\` does not affect other tables in the database';
-    CREATE ROW POLICY 02703_asterisk_${CLICKHOUSE_DATABASE}_policy ON ${CLICKHOUSE_DATABASE}.\`*\` USING x=1 AS permissive TO ALL;
-    CREATE TABLE ${CLICKHOUSE_DATABASE}.\`*\` (x UInt8, y UInt8) ENGINE = MergeTree ORDER BY x AS SELECT 100, 20;
-    CREATE TABLE ${CLICKHOUSE_DATABASE}.\`other\` (x UInt8, y UInt8) ENGINE = MergeTree ORDER BY x AS SELECT 100, 20;
-    SELECT 'star', * FROM ${CLICKHOUSE_DATABASE}.\`*\`;
-    SELECT 'other', * FROM ${CLICKHOUSE_DATABASE}.other;
-    DROP ROW POLICY 02703_asterisk_${CLICKHOUSE_DATABASE}_policy ON ${CLICKHOUSE_DATABASE}.\`*\`;
-"
diff --git a/tests/queries/0_stateless/02703_row_policies_for_asterisk.sql b/tests/queries/0_stateless/02703_row_policies_for_asterisk.sql
new file mode 100644
index 00000000000..96b1c01a6d6
--- /dev/null
+++ b/tests/queries/0_stateless/02703_row_policies_for_asterisk.sql
@@ -0,0 +1,11 @@
+-- Tags: no-parallel
+
+SELECT 'Policy for table `*` does not affect other tables in the database';
+CREATE DATABASE 02703_db_asterisk;
+CREATE ROW POLICY 02703_asterisk ON 02703_db_asterisk.`*` USING x=1 AS permissive TO ALL;
+CREATE TABLE 02703_db_asterisk.`*` (x UInt8, y UInt8) ENGINE = MergeTree ORDER BY x AS SELECT 100, 20;
+CREATE TABLE 02703_db_asterisk.`other` (x UInt8, y UInt8) ENGINE = MergeTree ORDER BY x AS SELECT 100, 20;
+SELECT 'star', * FROM 02703_db_asterisk.`*`;
+SELECT 'other', * FROM 02703_db_asterisk.other;
+DROP ROW POLICY 02703_asterisk ON 02703_db_asterisk.`*`;
+DROP DATABASE 02703_db_asterisk;
diff --git a/tests/queries/0_stateless/02703_row_policies_for_database_combination.sh b/tests/queries/0_stateless/02703_row_policies_for_database_combination.sh
deleted file mode 100755
index 756f71fc043..00000000000
--- a/tests/queries/0_stateless/02703_row_policies_for_database_combination.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env bash
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-$CLICKHOUSE_CLIENT "
-
-DROP TABLE IF EXISTS 02703_rptable;
-DROP TABLE IF EXISTS 02703_rptable_another;
-CREATE TABLE 02703_rptable (x UInt8, y UInt8) ENGINE = MergeTree ORDER BY x;
-
-INSERT INTO 02703_rptable VALUES (1, 10), (2, 20), (3, 30), (4, 40);
-
-CREATE TABLE 02703_rptable_another ENGINE = MergeTree ORDER BY x AS SELECT * FROM 02703_rptable;
-
-
-DROP ROW POLICY IF EXISTS 02703_filter_policy_${CLICKHOUSE_DATABASE}_1 ON ${CLICKHOUSE_DATABASE}.02703_rptable;
-DROP ROW POLICY IF EXISTS 02703_filter_policy_${CLICKHOUSE_DATABASE}_2 ON ${CLICKHOUSE_DATABASE}.*;
-DROP ROW POLICY IF EXISTS 02703_filter_policy_${CLICKHOUSE_DATABASE}_3 ON ${CLICKHOUSE_DATABASE}.02703_rptable;
-DROP ROW POLICY IF EXISTS 02703_filter_policy_${CLICKHOUSE_DATABASE}_4 ON ${CLICKHOUSE_DATABASE}.02703_rptable;
-DROP ROW POLICY IF EXISTS 02703_filter_policy_${CLICKHOUSE_DATABASE}_5 ON ${CLICKHOUSE_DATABASE}.*;
-
--- the test assumes users_without_row_policies_can_read_rows is true
-
-SELECT 'None';
-SELECT * FROM 02703_rptable;
-
-CREATE ROW POLICY 02703_filter_policy_${CLICKHOUSE_DATABASE}_1 ON ${CLICKHOUSE_DATABASE}.02703_rptable USING x=1 AS permissive TO ALL;
-SELECT 'R1: x == 1';
-SELECT * FROM 02703_rptable;
-
-CREATE ROW POLICY 02703_filter_policy_${CLICKHOUSE_DATABASE}_2 ON ${CLICKHOUSE_DATABASE}.* USING x=2 AS permissive TO ALL;
-SELECT 'R1, R2: (x == 1) OR (x == 2)';
-SELECT * FROM 02703_rptable;
-
-SELECT 'R1, R2: (x == 2) FROM ANOTHER';
-SELECT * FROM 02703_rptable_another;
-
-CREATE ROW POLICY 02703_filter_policy_${CLICKHOUSE_DATABASE}_3 ON ${CLICKHOUSE_DATABASE}.02703_rptable USING x=3 AS permissive TO ALL;
-SELECT 'R1, R2, R3: (x == 1) OR (x == 2) OR (x == 3)';
-SELECT * FROM 02703_rptable;
-
-CREATE ROW POLICY 02703_filter_policy_${CLICKHOUSE_DATABASE}_4 ON ${CLICKHOUSE_DATABASE}.02703_rptable USING x<=2 AS restrictive TO ALL;
-SELECT 'R1, R2, R3, R4: ((x == 1) OR (x == 2) OR (x == 3)) AND (x <= 2)';
-SELECT * FROM 02703_rptable;
-
-CREATE ROW POLICY 02703_filter_policy_${CLICKHOUSE_DATABASE}_5 ON ${CLICKHOUSE_DATABASE}.* USING y>=20 AS restrictive TO ALL;
-SELECT 'R1, R2, R3, R4, R5: ((x == 1) OR (x == 2) OR (x == 3)) AND (x <= 2) AND (y >= 20)';
-SELECT * FROM 02703_rptable;
-
-CREATE TABLE 02703_after_rp ENGINE = MergeTree ORDER BY x AS SELECT * FROM 02703_rptable;
-SELECT * FROM 02703_after_rp;
-
--- does not matter if policies or table are created first
-SELECT 'R1, R2, R3, R4, R5: (x == 2) AND (y >= 20) FROM AFTER_RP';
-SELECT * FROM 02703_after_rp;
-
-SELECT 'R1, R2, R3, R4, R5: (x == 2) AND (y >= 20) FROM ANOTHER';
-SELECT * FROM 02703_rptable_another;
-
-DROP ROW POLICY 02703_filter_policy_${CLICKHOUSE_DATABASE}_1 ON ${CLICKHOUSE_DATABASE}.02703_rptable;
-SELECT 'R2, R3, R4, R5: ((x == 2) OR (x == 3)) AND (x <= 2) AND (y >= 20)';
-SELECT * FROM 02703_rptable;
-
-DROP ROW POLICY 02703_filter_policy_${CLICKHOUSE_DATABASE}_2 ON ${CLICKHOUSE_DATABASE}.*;
-SELECT 'R3, R4, R5: (x == 3) AND (x <= 2) AND (y >= 20)';
-SELECT * FROM 02703_rptable;
-
-DROP ROW POLICY 02703_filter_policy_${CLICKHOUSE_DATABASE}_3 ON ${CLICKHOUSE_DATABASE}.02703_rptable;
-SELECT 'R4, R5: (x <= 2) AND (y >= 20)';
-SELECT * FROM 02703_rptable;
-
-DROP ROW POLICY 02703_filter_policy_${CLICKHOUSE_DATABASE}_4 ON ${CLICKHOUSE_DATABASE}.02703_rptable;
-SELECT 'R5: (x >= 2)';
-SELECT * FROM 02703_rptable;
-
-CREATE TABLE 02703_unexpected_columns (xx UInt8, yy UInt8) ENGINE = MergeTree ORDER BY xx;
-SELECT 'Policy not applicable';
-SELECT * FROM 02703_unexpected_columns; -- { serverError UNKNOWN_IDENTIFIER } -- Missing columns: 'x' while processing query
-
-DROP ROW POLICY 02703_filter_policy_${CLICKHOUSE_DATABASE}_5 ON ${CLICKHOUSE_DATABASE}.*;
-SELECT 'None';
-SELECT * FROM 02703_rptable;
-
-SELECT 'No problematic policy, select works';
-SELECT 'Ok' FROM ${CLICKHOUSE_DATABASE}.02703_unexpected_columns;
-
-DROP TABLE 02703_rptable;
-DROP TABLE 02703_rptable_another;
-DROP TABLE 02703_unexpected_columns;
-
-"
diff --git a/tests/queries/0_stateless/02703_row_policies_for_database_combination.sql b/tests/queries/0_stateless/02703_row_policies_for_database_combination.sql
new file mode 100644
index 00000000000..8c93fc595ba
--- /dev/null
+++ b/tests/queries/0_stateless/02703_row_policies_for_database_combination.sql
@@ -0,0 +1,88 @@
+-- Tags: no-parallel
+
+DROP DATABASE IF EXISTS 02703_db;
+CREATE DATABASE 02703_db;
+DROP TABLE IF EXISTS 02703_db.02703_rptable;
+DROP TABLE IF EXISTS 02703_db.02703_rptable_another;
+CREATE TABLE 02703_db.02703_rptable (x UInt8, y UInt8) ENGINE = MergeTree ORDER BY x;
+
+INSERT INTO 02703_db.02703_rptable VALUES (1, 10), (2, 20), (3, 30), (4, 40);
+
+CREATE TABLE 02703_db.02703_rptable_another ENGINE = MergeTree ORDER BY x AS SELECT * FROM 02703_db.02703_rptable;
+
+
+DROP ROW POLICY IF EXISTS 02703_filter_1 ON 02703_db.02703_rptable;
+DROP ROW POLICY IF EXISTS 02703_filter_2 ON 02703_db.*;
+DROP ROW POLICY IF EXISTS 02703_filter_3 ON 02703_db.02703_rptable;
+DROP ROW POLICY IF EXISTS 02703_filter_4 ON 02703_db.02703_rptable;
+DROP ROW POLICY IF EXISTS 02703_filter_5 ON 02703_db.*;
+
+-- the test assumes users_without_row_policies_can_read_rows is true
+
+SELECT 'None';
+SELECT * FROM 02703_db.02703_rptable;
+
+CREATE ROW POLICY 02703_filter_1 ON 02703_db.02703_rptable USING x=1 AS permissive TO ALL;
+SELECT 'R1: x == 1';
+SELECT * FROM 02703_db.02703_rptable;
+
+CREATE ROW POLICY 02703_filter_2 ON 02703_db.* USING x=2 AS permissive TO ALL;
+SELECT 'R1, R2: (x == 1) OR (x == 2)';
+SELECT * FROM 02703_db.02703_rptable;
+
+SELECT 'R1, R2: (x == 2) FROM ANOTHER';
+SELECT * FROM 02703_db.02703_rptable_another;
+
+CREATE ROW POLICY 02703_filter_3 ON 02703_db.02703_rptable USING x=3 AS permissive TO ALL;
+SELECT 'R1, R2, R3: (x == 1) OR (x == 2) OR (x == 3)';
+SELECT * FROM 02703_db.02703_rptable;
+
+CREATE ROW POLICY 02703_filter_4 ON 02703_db.02703_rptable USING x<=2 AS restrictive TO ALL;
+SELECT 'R1, R2, R3, R4: ((x == 1) OR (x == 2) OR (x == 3)) AND (x <= 2)';
+SELECT * FROM 02703_db.02703_rptable;
+
+CREATE ROW POLICY 02703_filter_5 ON 02703_db.* USING y>=20 AS restrictive TO ALL;
+SELECT 'R1, R2, R3, R4, R5: ((x == 1) OR (x == 2) OR (x == 3)) AND (x <= 2) AND (y >= 20)';
+SELECT * FROM 02703_db.02703_rptable;
+
+CREATE TABLE 02703_db.02703_after_rp ENGINE = MergeTree ORDER BY x AS SELECT * FROM 02703_db.02703_rptable;
+SELECT * FROM 02703_db.02703_after_rp;
+
+-- does not matter if policies or table are created first
+SELECT 'R1, R2, R3, R4, R5: (x == 2) AND (y >= 20) FROM AFTER_RP';
+SELECT * FROM 02703_db.02703_after_rp;
+
+SELECT 'R1, R2, R3, R4, R5: (x == 2) AND (y >= 20) FROM ANOTHER';
+SELECT * FROM 02703_db.02703_rptable_another;
+
+DROP ROW POLICY 02703_filter_1 ON 02703_db.02703_rptable;
+SELECT 'R2, R3, R4, R5: ((x == 2) OR (x == 3)) AND (x <= 2) AND (y >= 20)';
+SELECT * FROM 02703_db.02703_rptable;
+
+DROP ROW POLICY 02703_filter_2 ON 02703_db.*;
+SELECT 'R3, R4, R5: (x == 3) AND (x <= 2) AND (y >= 20)';
+SELECT * FROM 02703_db.02703_rptable;
+
+DROP ROW POLICY 02703_filter_3 ON 02703_db.02703_rptable;
+SELECT 'R4, R5: (x <= 2) AND (y >= 20)';
+SELECT * FROM 02703_db.02703_rptable;
+
+DROP ROW POLICY 02703_filter_4 ON 02703_db.02703_rptable;
+SELECT 'R5: (x >= 2)';
+SELECT * FROM 02703_db.02703_rptable;
+
+CREATE TABLE 02703_db.02703_unexpected_columns (xx UInt8, yy UInt8) ENGINE = MergeTree ORDER BY xx;
+SELECT 'Policy not applicable';
+SELECT * FROM 02703_db.02703_unexpected_columns; -- { serverError UNKNOWN_IDENTIFIER } -- Missing columns: 'x' while processing query
+
+DROP ROW POLICY 02703_filter_5 ON 02703_db.*;
+SELECT 'None';
+SELECT * FROM 02703_db.02703_rptable;
+
+SELECT 'No problematic policy, select works';
+SELECT 'Ok' FROM 02703_db.02703_unexpected_columns;
+
+DROP TABLE 02703_db.02703_rptable;
+DROP TABLE 02703_db.02703_rptable_another;
+DROP TABLE 02703_db.02703_unexpected_columns;
+DROP DATABASE 02703_db;
diff --git a/tests/queries/0_stateless/02703_row_policy_for_database.reference b/tests/queries/0_stateless/02703_row_policy_for_database.reference
index 56b0d8c6f20..b67ea69ae72 100644
--- a/tests/queries/0_stateless/02703_row_policy_for_database.reference
+++ b/tests/queries/0_stateless/02703_row_policy_for_database.reference
@@ -1,20 +1,20 @@
 -- row policies for database
-  -- SHOW CREATE POLICY default ON default.*
-CREATE ROW POLICY default_db_policy ON default.* FOR SELECT USING 1 TO ALL
-  -- SHOW CREATE POLICY ON default.*
-CREATE ROW POLICY default_db_policy ON default.* FOR SELECT USING 1 TO ALL
-CREATE ROW POLICY default_tb_policy ON default.`table` FOR SELECT USING 1 TO ALL
-  -- SHOW CREATE POLICY ON default.`*`
+  -- SHOW CREATE POLICY db1_02703 ON db1_02703.*
+CREATE ROW POLICY db1_02703 ON db1_02703.* FOR SELECT USING 1 TO ALL
+  -- SHOW CREATE POLICY ON db1_02703.*
+CREATE ROW POLICY db1_02703 ON db1_02703.* FOR SELECT USING 1 TO ALL
+CREATE ROW POLICY tbl1_02703 ON db1_02703.`table` FOR SELECT USING 1 TO ALL
+  -- SHOW CREATE POLICY ON db1_02703.`*`
 R1, R2: (x == 1) OR (x == 2)
 1
 2
 Check system.query_log
 SELECT \'-- row policies for database\';	[]
-SELECT \'  -- SHOW CREATE POLICY default ON default.*\';	[]
-SELECT \'  -- SHOW CREATE POLICY ON default.*\';	[]
-SELECT \'  -- SHOW CREATE POLICY ON default.`*`\';	[]
+SELECT \'  -- SHOW CREATE POLICY db1_02703 ON db1_02703.*\';	[]
+SELECT \'  -- SHOW CREATE POLICY ON db1_02703.*\';	[]
+SELECT \'  -- SHOW CREATE POLICY ON db1_02703.`*`\';	[]
 SELECT \'R1, R2: (x == 1) OR (x == 2)\';	[]
-SELECT * FROM 02703_rqtable_default;	['default_filter_11_db_policy ON default.*','default_filter_11_policy ON default.`02703_rqtable_default`']
+SELECT * FROM 02703_rqtable_default;	['`02703_filter_11_db` ON default.*','`02703_filter_11` ON default.`02703_rqtable_default`']
 SELECT \'Check system.query_log\';	[]
   -- CREATE DATABASE-LEVEL POLICY IN CURRENT DATABASE
-CREATE ROW POLICY db2_02703 ON default.* TO user_default
+CREATE ROW POLICY db2_02703 ON db1_02703.* TO u1_02703
diff --git a/tests/queries/0_stateless/02703_row_policy_for_database.sh b/tests/queries/0_stateless/02703_row_policy_for_database.sh
deleted file mode 100755
index c29fa313825..00000000000
--- a/tests/queries/0_stateless/02703_row_policy_for_database.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-CLICKHOUSE_USER="user_$CLICKHOUSE_DATABASE"
-
-$CLICKHOUSE_CLIENT "
-
-DROP USER IF EXISTS ${CLICKHOUSE_USER};
-CREATE USER ${CLICKHOUSE_USER};
-
-CREATE TABLE ${CLICKHOUSE_DATABASE}.02703_rqtable (x UInt8) ENGINE = MergeTree ORDER BY x;
-INSERT INTO ${CLICKHOUSE_DATABASE}.02703_rqtable VALUES (1), (2), (3), (4);
-
-SELECT '-- row policies for database';
-CREATE ROW POLICY ${CLICKHOUSE_DATABASE}_db_policy ON ${CLICKHOUSE_DATABASE}.* USING 1 AS PERMISSIVE TO ALL;
-CREATE ROW POLICY ${CLICKHOUSE_DATABASE}_tb_policy ON ${CLICKHOUSE_DATABASE}.table USING 1 AS PERMISSIVE TO ALL;
-SELECT '  -- SHOW CREATE POLICY ${CLICKHOUSE_DATABASE} ON ${CLICKHOUSE_DATABASE}.*';
-SHOW CREATE POLICY ${CLICKHOUSE_DATABASE}_db_policy ON ${CLICKHOUSE_DATABASE}.*;
-SELECT '  -- SHOW CREATE POLICY ON ${CLICKHOUSE_DATABASE}.*';
-SHOW CREATE POLICY ON ${CLICKHOUSE_DATABASE}.*;
-SELECT '  -- SHOW CREATE POLICY ON ${CLICKHOUSE_DATABASE}.\`*\`';
-SHOW CREATE POLICY ON ${CLICKHOUSE_DATABASE}.\`*\`;
-DROP POLICY ${CLICKHOUSE_DATABASE}_db_policy ON ${CLICKHOUSE_DATABASE}.*;
-DROP POLICY ${CLICKHOUSE_DATABASE}_tb_policy ON ${CLICKHOUSE_DATABASE}.table;
-"
-
-$CLICKHOUSE_CLIENT --query "CREATE ROW POLICY any_02703 ON *.some_table USING 1 AS PERMISSIVE TO ALL;" 2>&1 | grep -q "SYNTAX_ERROR"
-
-$CLICKHOUSE_CLIENT "
-CREATE TABLE 02703_rqtable_default (x UInt8) ENGINE = MergeTree ORDER BY x;
-
-CREATE ROW POLICY ${CLICKHOUSE_DATABASE}_filter_11_db_policy ON * USING x=1 AS permissive TO ALL;
-CREATE ROW POLICY ${CLICKHOUSE_DATABASE}_filter_11_policy ON 02703_rqtable_default USING x=2 AS permissive TO ALL;
-
-INSERT INTO 02703_rqtable_default VALUES (1), (2), (3), (4);
-
-SELECT 'R1, R2: (x == 1) OR (x == 2)';
-SELECT * FROM 02703_rqtable_default;
-
-DROP TABLE 02703_rqtable_default;
-
-SELECT 'Check system.query_log';
-SYSTEM FLUSH LOGS;
-SELECT query, used_row_policies FROM system.query_log WHERE current_database == currentDatabase() AND type == 'QueryStart' AND query_kind == 'Select' ORDER BY event_time_microseconds;
-
-DROP ROW POLICY ${CLICKHOUSE_DATABASE}_filter_11_db_policy ON *;
-DROP ROW POLICY ${CLICKHOUSE_DATABASE}_filter_11_policy ON 02703_rqtable_default;
-
-USE ${CLICKHOUSE_DATABASE};
-SELECT '  -- CREATE DATABASE-LEVEL POLICY IN CURRENT DATABASE';
-CREATE ROW POLICY db2_02703 ON * TO ${CLICKHOUSE_USER};
-SHOW CREATE POLICY db2_02703 ON *;
-
-DROP ROW POLICY db2_02703 ON *;
-
-DROP USER ${CLICKHOUSE_USER};
-"
diff --git a/tests/queries/0_stateless/02703_row_policy_for_database.sql b/tests/queries/0_stateless/02703_row_policy_for_database.sql
new file mode 100644
index 00000000000..51ce5f4f870
--- /dev/null
+++ b/tests/queries/0_stateless/02703_row_policy_for_database.sql
@@ -0,0 +1,53 @@
+-- Tags: no-parallel
+
+DROP DATABASE IF EXISTS db1_02703;
+DROP USER IF EXISTS u1_02703;
+CREATE USER u1_02703;
+
+CREATE DATABASE db1_02703;
+
+CREATE TABLE db1_02703.02703_rqtable (x UInt8) ENGINE = MergeTree ORDER BY x;
+INSERT INTO db1_02703.02703_rqtable VALUES (1), (2), (3), (4);
+
+
+SELECT '-- row policies for database';
+CREATE ROW POLICY db1_02703 ON db1_02703.* USING 1 AS PERMISSIVE TO ALL;
+CREATE ROW POLICY tbl1_02703 ON db1_02703.table USING 1 AS PERMISSIVE TO ALL;
+SELECT '  -- SHOW CREATE POLICY db1_02703 ON db1_02703.*';
+SHOW CREATE POLICY db1_02703 ON db1_02703.*;
+SELECT '  -- SHOW CREATE POLICY ON db1_02703.*';
+SHOW CREATE POLICY ON db1_02703.*;
+SELECT '  -- SHOW CREATE POLICY ON db1_02703.`*`';
+SHOW CREATE POLICY ON db1_02703.`*`;
+DROP POLICY db1_02703 ON db1_02703.*;
+DROP POLICY tbl1_02703 ON db1_02703.table;
+
+CREATE ROW POLICY any_02703 ON *.some_table USING 1 AS PERMISSIVE TO ALL; -- { clientError SYNTAX_ERROR }
+
+CREATE TABLE 02703_rqtable_default (x UInt8) ENGINE = MergeTree ORDER BY x;
+
+CREATE ROW POLICY 02703_filter_11_db ON * USING x=1 AS permissive TO ALL;
+CREATE ROW POLICY 02703_filter_11 ON 02703_rqtable_default USING x=2 AS permissive TO ALL;
+
+INSERT INTO 02703_rqtable_default VALUES (1), (2), (3), (4);
+
+SELECT 'R1, R2: (x == 1) OR (x == 2)';
+SELECT * FROM 02703_rqtable_default;
+
+DROP TABLE 02703_rqtable_default;
+
+SELECT 'Check system.query_log';
+SYSTEM FLUSH LOGS;
+SELECT query, used_row_policies FROM system.query_log WHERE current_database == currentDatabase() AND type == 'QueryStart' AND query_kind == 'Select' ORDER BY event_time_microseconds;
+
+DROP ROW POLICY 02703_filter_11_db ON *;
+DROP ROW POLICY 02703_filter_11 ON 02703_rqtable_default;
+
+USE db1_02703;
+SELECT '  -- CREATE DATABASE-LEVEL POLICY IN CURRENT DATABASE';
+CREATE ROW POLICY db2_02703 ON * TO u1_02703;
+SHOW CREATE POLICY db2_02703 ON *;
+
+DROP ROW POLICY db2_02703 ON *;
+
+DROP USER u1_02703;
diff --git a/tests/queries/0_stateless/02704_keeper_map_zk_nodes.sh b/tests/queries/0_stateless/02704_keeper_map_zk_nodes.sh
index 758313814be..9689d4f5a50 100755
--- a/tests/queries/0_stateless/02704_keeper_map_zk_nodes.sh
+++ b/tests/queries/0_stateless/02704_keeper_map_zk_nodes.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 table_name="02704_keeper_map_zk_nodes"
 table_name_another="02704_keeper_map_zk_nodes_new_table"
 
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT --multiquery --query="
 DROP TABLE IF EXISTS $table_name;
 DROP TABLE IF EXISTS $table_name_another;
 CREATE TABLE $table_name (key UInt64, value UInt64)
diff --git a/tests/queries/0_stateless/02704_max_backup_bandwidth.sh b/tests/queries/0_stateless/02704_max_backup_bandwidth.sh
index 7e914c4c539..8cb03a93a7a 100755
--- a/tests/queries/0_stateless/02704_max_backup_bandwidth.sh
+++ b/tests/queries/0_stateless/02704_max_backup_bandwidth.sh
@@ -5,7 +5,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     drop table if exists data;
     create table data (key UInt64 CODEC(NONE)) engine=MergeTree() order by tuple() settings min_bytes_for_wide_part=1e9;
 "
@@ -15,7 +15,7 @@ $CLICKHOUSE_CLIENT -q "insert into data select * from numbers(1e6)"
 
 query_id=$(random_str 10)
 $CLICKHOUSE_CLIENT --query_id "$query_id" -q "backup table data to Disk('backups', '$CLICKHOUSE_DATABASE/data/backup1')" --max_backup_bandwidth=1M > /dev/null
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     SYSTEM FLUSH LOGS;
     SELECT
         query_duration_ms >= 7e3,
diff --git a/tests/queries/0_stateless/02704_storage_merge_explain_graph_crash.sql b/tests/queries/0_stateless/02704_storage_merge_explain_graph_crash.sql
index db5eddf2a90..44a8fe4f049 100644
--- a/tests/queries/0_stateless/02704_storage_merge_explain_graph_crash.sql
+++ b/tests/queries/0_stateless/02704_storage_merge_explain_graph_crash.sql
@@ -13,4 +13,4 @@ CREATE TABLE foo2_dist (`Id` UInt32, `Val` String) ENGINE = Distributed(test_sha
 CREATE TABLE merge1 AS foo ENGINE = Merge(currentDatabase(), '^(foo|foo2_dist)$');
 
 EXPLAIN PIPELINE graph = 1, compact = 1 SELECT * FROM merge1 FORMAT Null;
-EXPLAIN PIPELINE graph = 1, compact = 1 SELECT * FROM merge1 FORMAT Null SETTINGS enable_analyzer=1;
+EXPLAIN PIPELINE graph = 1, compact = 1 SELECT * FROM merge1 FORMAT Null SETTINGS allow_experimental_analyzer=1;
diff --git a/tests/queries/0_stateless/02707_analyzer_nested_lambdas_types.sql b/tests/queries/0_stateless/02707_analyzer_nested_lambdas_types.sql
index 320e1111e65..f9258d61900 100644
--- a/tests/queries/0_stateless/02707_analyzer_nested_lambdas_types.sql
+++ b/tests/queries/0_stateless/02707_analyzer_nested_lambdas_types.sql
@@ -1,24 +1,24 @@
 SELECT
     range(1),
     arrayMap(x -> arrayMap(x -> x, range(x)), [1])
-SETTINGS enable_analyzer = 0;
+SETTINGS allow_experimental_analyzer = 0;
 
 SELECT
     range(1),
     arrayMap(x -> arrayMap(x -> x, range(x)), [1])
-SETTINGS enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
 
 SELECT
     range(1),
     arrayMap(x -> arrayMap(x -> 1, range(x)), [1])
-SETTINGS enable_analyzer = 0;
+SETTINGS allow_experimental_analyzer = 0;
 
 SELECT
     range(1),
     arrayMap(x -> arrayMap(x -> 1, range(x)), [1])
-SETTINGS enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
 
 SELECT
     range(1),
     arrayMap(x -> arrayMap(y -> 1, range(x)), [1])
-SETTINGS enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/02707_clickhouse_local_implicit_file_table_function.sh b/tests/queries/0_stateless/02707_clickhouse_local_implicit_file_table_function.sh
index 644767de85f..dabea8a373a 100755
--- a/tests/queries/0_stateless/02707_clickhouse_local_implicit_file_table_function.sh
+++ b/tests/queries/0_stateless/02707_clickhouse_local_implicit_file_table_function.sh
@@ -42,7 +42,7 @@ $CLICKHOUSE_LOCAL -q "SELECT COUNT(*) FROM \"${dir}/tmp.csv\""
 
 #################
 echo "Test 2: check Filesystem database"
-$CLICKHOUSE_LOCAL --multiline -q """
+$CLICKHOUSE_LOCAL --multiline --multiquery -q """
 DROP DATABASE IF EXISTS test;
 CREATE DATABASE test ENGINE = Filesystem('${dir}');
 SELECT COUNT(*) FROM test.\`tmp.csv\`;
@@ -57,7 +57,7 @@ DROP DATABASE test;
 
 #################
 echo "Test 3: check show database with Filesystem"
-$CLICKHOUSE_LOCAL --multiline -q """
+$CLICKHOUSE_LOCAL --multiline --multiquery -q """
 DROP DATABASE IF EXISTS test02707;
 CREATE DATABASE test02707 ENGINE = Filesystem('${dir}');
 SHOW DATABASES;
diff --git a/tests/queries/0_stateless/02712_bool_better_exception_message.sh b/tests/queries/0_stateless/02712_bool_better_exception_message.sh
index 1da70d7025b..ee006958d93 100755
--- a/tests/queries/0_stateless/02712_bool_better_exception_message.sh
+++ b/tests/queries/0_stateless/02712_bool_better_exception_message.sh
@@ -6,19 +6,19 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-$CLICKHOUSE_LOCAL <<END
+$CLICKHOUSE_LOCAL --multiquery <<END
     SELECT * FROM format(JSONEachRow, 'x Bool', '{"x": 1}');
     SELECT * FROM format(JSONEachRow, 'x Bool', '{"x": null}');
 END
 
-$CLICKHOUSE_LOCAL <<END 2>&1 | rg -Fc "'w' character"
+$CLICKHOUSE_LOCAL --multiquery <<END 2>&1 | rg -Fc "'w' character"
     SELECT * FROM format(JSONEachRow, 'x Bool', '{"x": wtf}');
 END
 
-$CLICKHOUSE_LOCAL <<END 2>&1 | rg -Fc "expected 'false'"
+$CLICKHOUSE_LOCAL --multiquery <<END 2>&1 | rg -Fc "expected 'false'"
     SELECT * FROM format(JSONEachRow, 'x Bool', '{"x": ftw}');
 END
 
-$CLICKHOUSE_LOCAL <<END 2>&1 | rg -Fc "'{' character"
+$CLICKHOUSE_LOCAL --multiquery <<END 2>&1 | rg -Fc "'{' character"
     SELECT * FROM format(JSONEachRow, 'x Bool', '{"x": {}}');
 END
diff --git a/tests/queries/0_stateless/02714_local_object_storage.sql b/tests/queries/0_stateless/02714_local_object_storage.sql
index bfe3162df97..914eac1ddba 100644
--- a/tests/queries/0_stateless/02714_local_object_storage.sql
+++ b/tests/queries/0_stateless/02714_local_object_storage.sql
@@ -1,5 +1,3 @@
--- Tags: no-distributed-cache
-
 SET min_bytes_to_use_direct_io='1Gi'; -- It does not work (fixme)
 SET local_filesystem_read_method='pread'; -- ui_uring local_fs_method does not work here (fixme)
 
diff --git a/tests/queries/0_stateless/02717_pretty_json.sql b/tests/queries/0_stateless/02717_pretty_json.sql
index 1a5c090bcb2..8a49eb50adf 100644
--- a/tests/queries/0_stateless/02717_pretty_json.sql
+++ b/tests/queries/0_stateless/02717_pretty_json.sql
@@ -1,3 +1,3 @@
 set allow_experimental_object_type=1;
-select 42 as num, [42, 42] as arr, [[[42, 42], [42, 42]], [[42, 42]]] as nested_arr, tuple(42, 42)::Tuple(a UInt32, b UInt32) as tuple, tuple(tuple(tuple(42, 42), 42), 42)::Tuple(a Tuple(b Tuple(c UInt32, d UInt32), e UInt32), f UInt32) as nested_tuple, map(42, 42, 24, 24) as map, map(42, map(42, map(42, 42))) as nested_map, [tuple(map(42, 42), [42, 42]), tuple(map(42, 42), [42, 42])]::Array(Tuple(Map(UInt32, UInt32), Array(UInt32))) as nested_types, '{"a" : {"b" : 1, "c" : 2}}'::Object('json') as json_object format PrettyNDJSON;
+select 42 as num, [42, 42] as arr, [[[42, 42], [42, 42]], [[42, 42]]] as nested_arr, tuple(42, 42)::Tuple(a UInt32, b UInt32) as tuple, tuple(tuple(tuple(42, 42), 42), 42)::Tuple(a Tuple(b Tuple(c UInt32, d UInt32), e UInt32), f UInt32) as nested_tuple, map(42, 42, 24, 24) as map, map(42, map(42, map(42, 42))) as nested_map, [tuple(map(42, 42), [42, 42]), tuple(map(42, 42), [42, 42])]::Array(Tuple(Map(UInt32, UInt32), Array(UInt32))) as nested_types, '{"a" : {"b" : 1, "c" : 2}}'::JSON as json_object format PrettyNDJSON;
 
diff --git a/tests/queries/0_stateless/02722_database_filesystem.reference b/tests/queries/0_stateless/02722_database_filesystem.reference
index 290bb9d4fbc..2aa7e74befb 100644
--- a/tests/queries/0_stateless/02722_database_filesystem.reference
+++ b/tests/queries/0_stateless/02722_database_filesystem.reference
@@ -1,6 +1,6 @@
 Test 1: create filesystem database and check implicit calls
 0
-default_test1
+test1
 4
 4
 30
diff --git a/tests/queries/0_stateless/02722_database_filesystem.sh b/tests/queries/0_stateless/02722_database_filesystem.sh
index e28c9358f1e..2d0ff256c95 100755
--- a/tests/queries/0_stateless/02722_database_filesystem.sh
+++ b/tests/queries/0_stateless/02722_database_filesystem.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -14,11 +15,14 @@ echo '2,"def",456,"bacabaa"' >> ${user_files_tmp_dir}/tmp.csv
 echo '3,"story",78912,"acabaab"' >> ${user_files_tmp_dir}/tmp.csv
 echo '4,"history",21321321,"cabaaba"' >> ${user_files_tmp_dir}/tmp.csv
 
+tmp_dir=${CLICKHOUSE_TEST_UNIQUE_NAME}
+
 $CLICKHOUSE_LOCAL -q "insert into function file('$user_files_tmp_dir/tmp_numbers_1.csv') select * from numbers(1, 10)"
 $CLICKHOUSE_LOCAL -q "insert into function file('$user_files_tmp_dir/tmp_numbers_2.csv') select * from numbers(11, 10)"
 $CLICKHOUSE_LOCAL -q "insert into function file('$user_files_tmp_dir/tmp_numbers_30.csv') select * from numbers(21, 10)"
 
-tmp_dir=$(mktemp -d ${CLICKHOUSE_TEST_UNIQUE_NAME}_XXXX)
+[[ -d $tmp_dir ]] && rm -rd $tmp_dir
+mkdir $tmp_dir
 cp ${user_files_tmp_dir}/tmp.csv ${tmp_dir}/tmp.csv
 cp ${user_files_tmp_dir}/tmp.csv ${user_files_tmp_dir}/tmp/tmp.csv
 cp ${user_files_tmp_dir}/tmp.csv ${user_files_tmp_dir}/tmp.myext
@@ -26,57 +30,55 @@ cp ${user_files_tmp_dir}/tmp_numbers_1.csv ${user_files_tmp_dir}/tmp/tmp_numbers
 
 #################
 echo "Test 1: create filesystem database and check implicit calls"
-DATABASE_TEST1="${CLICKHOUSE_DATABASE}_test1"
-${CLICKHOUSE_CLIENT} --multiline -q """
-DROP DATABASE IF EXISTS ${DATABASE_TEST1};
-CREATE DATABASE ${DATABASE_TEST1} ENGINE = Filesystem;
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+DROP DATABASE IF EXISTS test1;
+CREATE DATABASE test1 ENGINE = Filesystem;
 """
 echo $?
-${CLICKHOUSE_CLIENT} --query "SHOW DATABASES" | grep "${DATABASE_TEST1}"
-${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM ${DATABASE_TEST1}.\`${unique_name}/tmp.csv\`;"
-${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM ${DATABASE_TEST1}.\`${unique_name}/tmp/tmp.csv\`;"
-${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM ${DATABASE_TEST1}.\`${unique_name}/tmp_numbers_*.csv\`;"
-${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM ${DATABASE_TEST1}.\`${unique_name}/tmp/*tmp_numbers_*.csv\`;"
-${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM ${DATABASE_TEST1}.\`${unique_name}/*/*tmp_numbers_*.csv\`;"
-${CLICKHOUSE_CLIENT} --query "SELECT count(DISTINCT _path) FROM ${DATABASE_TEST1}.\`${unique_name}/*.csv\` WHERE startsWith(_path, '${user_files_tmp_dir}')";
-${CLICKHOUSE_CLIENT} --query "SELECT count(DISTINCT _path) FROM ${DATABASE_TEST1}.\`${unique_name}/*.csv\` WHERE not startsWith(_path, '${user_files_tmp_dir}')";
+${CLICKHOUSE_CLIENT} --query "SHOW DATABASES" | grep "test1"
+${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`${unique_name}/tmp.csv\`;"
+${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`${unique_name}/tmp/tmp.csv\`;"
+${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`${unique_name}/tmp_numbers_*.csv\`;"
+${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`${unique_name}/tmp/*tmp_numbers_*.csv\`;"
+${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`${unique_name}/*/*tmp_numbers_*.csv\`;"
+${CLICKHOUSE_CLIENT} --query "SELECT count(DISTINCT _path) FROM test1.\`${unique_name}/*.csv\` WHERE startsWith(_path, '${user_files_tmp_dir}')";
+${CLICKHOUSE_CLIENT} --query "SELECT count(DISTINCT _path) FROM test1.\`${unique_name}/*.csv\` WHERE not startsWith(_path, '${user_files_tmp_dir}')";
 # **/* does not search in the current directory but searches recursively in nested directories.
-${CLICKHOUSE_CLIENT} --query "SELECT count(DISTINCT _path) FROM ${DATABASE_TEST1}.\`${unique_name}/**/*.csv\` WHERE startsWith(_path, '${user_files_tmp_dir}')";
-${CLICKHOUSE_CLIENT} --query "SELECT count(DISTINCT _path) FROM ${DATABASE_TEST1}.\`${unique_name}/**/*.csv\` WHERE not startsWith(_path, '${user_files_tmp_dir}')";
-${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM ${DATABASE_TEST1}.\`tmp_numbers_*.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "CANNOT_EXTRACT_TABLE_STRUCTURE" > /dev/null && echo "OK" || echo 'FAIL' ||:
+${CLICKHOUSE_CLIENT} --query "SELECT count(DISTINCT _path) FROM test1.\`${unique_name}/**/*.csv\` WHERE startsWith(_path, '${user_files_tmp_dir}')";
+${CLICKHOUSE_CLIENT} --query "SELECT count(DISTINCT _path) FROM test1.\`${unique_name}/**/*.csv\` WHERE not startsWith(_path, '${user_files_tmp_dir}')";
+${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`tmp_numbers_*.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "CANNOT_EXTRACT_TABLE_STRUCTURE" > /dev/null && echo "OK" || echo 'FAIL' ||:
 ${CLICKHOUSE_LOCAL} -q "SELECT COUNT(*) FROM \"${tmp_dir}/tmp.csv\""
 
 #################
 echo "Test 2: check DatabaseFilesystem access rights and errors handling on server"
 # DATABASE_ACCESS_DENIED: Allows list files only inside user_files
-${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM ${DATABASE_TEST1}.\`../tmp.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
-${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM ${DATABASE_TEST1}.\`/tmp/tmp.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
-${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM ${DATABASE_TEST1}.\`../*/tmp_numbers_*.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
-${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM ${DATABASE_TEST1}.\`../tmp_numbers_*.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
-${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM ${DATABASE_TEST1}.\`../*.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
-${CLICKHOUSE_CLIENT} --multiline --query """
-USE ${DATABASE_TEST1};
+${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`../tmp.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
+${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`/tmp/tmp.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
+${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`../*/tmp_numbers_*.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
+${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`../tmp_numbers_*.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
+${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`../*.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
+${CLICKHOUSE_CLIENT} --multiline --multiquery --query """
+USE test1;
 SELECT COUNT(*) FROM \"../${tmp_dir}/tmp.csv\";
 """ 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
-${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM ${DATABASE_TEST1}.\`../../../../../../tmp.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
+${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`../../../../../../tmp.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF "PATH_ACCESS_DENIED" > /dev/null && echo "OK" || echo 'FAIL' ||:
 
 # BAD_ARGUMENTS: path should be inside user_files
-DATABASE_TEST2="${CLICKHOUSE_DATABASE}_test2"
-${CLICKHOUSE_CLIENT} --multiline -q """
-DROP DATABASE IF EXISTS ${DATABASE_TEST2};
-CREATE DATABASE ${DATABASE_TEST2} ENGINE = Filesystem('/tmp');
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+DROP DATABASE IF EXISTS test2;
+CREATE DATABASE test2 ENGINE = Filesystem('/tmp');
 """ 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "BAD_ARGUMENTS" > /dev/null && echo "OK" || echo 'FAIL' ||:
 
 # BAD_ARGUMENTS: .../user_files/relative_unknown_dir does not exist
-${CLICKHOUSE_CLIENT} --multiline -q """
-DROP DATABASE IF EXISTS ${DATABASE_TEST2};
-CREATE DATABASE ${DATABASE_TEST2} ENGINE = Filesystem('relative_unknown_dir');
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+DROP DATABASE IF EXISTS test2;
+CREATE DATABASE test2 ENGINE = Filesystem('relative_unknown_dir');
 """ 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "BAD_ARGUMENTS" > /dev/null && echo "OK" || echo 'FAIL' ||:
 
 # FILE_DOESNT_EXIST: unknown file
-${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM ${DATABASE_TEST1}.\`tmp2.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "FILE_DOESNT_EXIST" > /dev/null && echo "OK" || echo 'FAIL' ||:
+${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' ||:
 
 # Clean
-${CLICKHOUSE_CLIENT} --query "DROP DATABASE IF EXISTS ${DATABASE_TEST1};"
+${CLICKHOUSE_CLIENT} --query "DROP DATABASE test1;"
 rm -rd $tmp_dir
 rm -rd $user_files_tmp_dir
diff --git a/tests/queries/0_stateless/02722_matcher_join_use_nulls.sql.j2 b/tests/queries/0_stateless/02722_matcher_join_use_nulls.sql.j2
index 6a8472fecdf..25451a34867 100644
--- a/tests/queries/0_stateless/02722_matcher_join_use_nulls.sql.j2
+++ b/tests/queries/0_stateless/02722_matcher_join_use_nulls.sql.j2
@@ -8,7 +8,7 @@ INSERT INTO t1 VALUES (1);
 INSERT INTO t2 VALUES (2, 2);
 
 SET join_use_nulls = 1;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 -- { echoOn }
 
diff --git a/tests/queries/0_stateless/02724_database_s3.sh b/tests/queries/0_stateless/02724_database_s3.sh
index cc7f012c8cf..80b47282146 100755
--- a/tests/queries/0_stateless/02724_database_s3.sh
+++ b/tests/queries/0_stateless/02724_database_s3.sh
@@ -8,7 +8,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 #################
 echo "Test 1: select from s3"
-${CLICKHOUSE_CLIENT} --multiline -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1 ENGINE = S3;
 USE test1;
@@ -17,7 +17,7 @@ SELECT * FROM \"http://localhost:11111/test/a.tsv\"
 ${CLICKHOUSE_CLIENT} -q "SHOW DATABASES;" | grep test1
 
 # check credentials with absolute path
-${CLICKHOUSE_CLIENT} --multiline -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 DROP DATABASE IF EXISTS test2;
 CREATE DATABASE test2 ENGINE = S3('', 'test', 'testtest');
 USE test2;
@@ -25,7 +25,7 @@ SELECT * FROM \"http://localhost:11111/test/b.tsv\"
 """
 
 # check credentials with relative path
-${CLICKHOUSE_CLIENT} --multiline -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 DROP DATABASE IF EXISTS test4;
 CREATE DATABASE test4 ENGINE = S3('http://localhost:11111/test', 'test', 'testtest');
 USE test4;
@@ -33,7 +33,7 @@ SELECT * FROM \"b.tsv\"
 """
 
 # Check named collection loading
-${CLICKHOUSE_CLIENT} --multiline -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 DROP DATABASE IF EXISTS test5;
 CREATE DATABASE test5 ENGINE = S3(s3_conn_db);
 SELECT * FROM test5.\`b.tsv\`
@@ -41,20 +41,20 @@ SELECT * FROM test5.\`b.tsv\`
 
 #################
 echo "Test 2: check exceptions"
-${CLICKHOUSE_CLIENT} --multiline -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 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 "S3_ERROR" > /dev/null && echo "OK" || echo 'FAIL' ||:
 
-${CLICKHOUSE_CLIENT} --multiline -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 USE test3;
 SELECT * FROM \"abacaba\"
 """ 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "BAD_ARGUMENTS" > /dev/null && echo "OK" || echo 'FAIL' ||:
 
 # Cleanup
-${CLICKHOUSE_CLIENT} --multiline -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 DROP DATABASE IF EXISTS test1;
 DROP DATABASE IF EXISTS test2;
 DROP DATABASE IF EXISTS test3;
diff --git a/tests/queries/0_stateless/02724_delay_mutations.sh b/tests/queries/0_stateless/02724_delay_mutations.sh
index 7843e692822..f349e29253a 100755
--- a/tests/queries/0_stateless/02724_delay_mutations.sh
+++ b/tests/queries/0_stateless/02724_delay_mutations.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=./mergetree_mutations.lib
 . "$CURDIR"/mergetree_mutations.lib
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} -n --query "
 DROP TABLE IF EXISTS t_delay_mutations SYNC;
 
 CREATE TABLE t_delay_mutations (id UInt64, v UInt64)
@@ -36,14 +36,14 @@ SELECT count() FROM system.mutations WHERE database = currentDatabase() AND tabl
 ${CLICKHOUSE_CLIENT} --query "SYSTEM START MERGES t_delay_mutations"
 wait_for_mutation "t_delay_mutations" "mutation_5.txt"
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} -n --query "
 SELECT * FROM t_delay_mutations ORDER BY id;
 SELECT count() FROM system.mutations WHERE database = currentDatabase() AND table = 't_delay_mutations' AND NOT is_done;
 
 DROP TABLE IF EXISTS t_delay_mutations SYNC;
 "
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} -n --query "
 SYSTEM FLUSH LOGS;
 
 SELECT
diff --git a/tests/queries/0_stateless/02724_limit_num_mutations.sh b/tests/queries/0_stateless/02724_limit_num_mutations.sh
index 604cc9ff08e..60888db0e2e 100755
--- a/tests/queries/0_stateless/02724_limit_num_mutations.sh
+++ b/tests/queries/0_stateless/02724_limit_num_mutations.sh
@@ -23,7 +23,7 @@ function wait_for_alter()
     done
 }
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} -n --query "
 DROP TABLE IF EXISTS t_limit_mutations SYNC;
 
 CREATE TABLE t_limit_mutations (id UInt64, v UInt64)
@@ -48,14 +48,14 @@ SELECT count() FROM system.mutations WHERE database = currentDatabase() AND tabl
 SHOW CREATE TABLE t_limit_mutations;
 "
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} -n --query "
 ALTER TABLE t_limit_mutations UPDATE v = 6 WHERE 1 SETTINGS number_of_mutations_to_throw = 100;
 ALTER TABLE t_limit_mutations MODIFY COLUMN v String SETTINGS number_of_mutations_to_throw = 100, alter_sync = 0;
 "
 
 wait_for_alter "String"
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} -n --query "
 SELECT * FROM t_limit_mutations ORDER BY id;
 SELECT count() FROM system.mutations WHERE database = currentDatabase() AND table = 't_limit_mutations' AND NOT is_done;
 SHOW CREATE TABLE t_limit_mutations;
@@ -65,7 +65,7 @@ ${CLICKHOUSE_CLIENT} --query "SYSTEM START MERGES t_limit_mutations"
 
 wait_for_mutation "t_limit_mutations" "0000000003"
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} -n --query "
 SELECT * FROM t_limit_mutations ORDER BY id;
 SELECT count() FROM system.mutations WHERE database = currentDatabase() AND table = 't_limit_mutations' AND NOT is_done;
 SHOW CREATE TABLE t_limit_mutations;
diff --git a/tests/queries/0_stateless/02725_async_insert_table_setting.sh b/tests/queries/0_stateless/02725_async_insert_table_setting.sh
index 14c2d335275..13911e8d677 100755
--- a/tests/queries/0_stateless/02725_async_insert_table_setting.sh
+++ b/tests/queries/0_stateless/02725_async_insert_table_setting.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} -n --query "
 DROP TABLE IF EXISTS t_mt_async_insert;
 DROP TABLE IF EXISTS t_mt_sync_insert;
 
@@ -19,7 +19,7 @@ url="${CLICKHOUSE_URL}&async_insert=0&wait_for_async_insert=1"
 ${CLICKHOUSE_CURL} -sS "$url" -d "INSERT INTO t_mt_async_insert VALUES (1, 'aa'), (2, 'bb')"
 ${CLICKHOUSE_CURL} -sS "$url" -d "INSERT INTO t_mt_sync_insert VALUES (1, 'aa'), (2, 'bb')"
 
-${CLICKHOUSE_CLIENT} --query "
+${CLICKHOUSE_CLIENT} -n --query "
 SELECT count() FROM t_mt_async_insert;
 SELECT count() FROM t_mt_sync_insert;
 
diff --git a/tests/queries/0_stateless/02725_cnf_large_check.sql b/tests/queries/0_stateless/02725_cnf_large_check.sql
index 2567636c02c..0780e6bcdd3 100644
--- a/tests/queries/0_stateless/02725_cnf_large_check.sql
+++ b/tests/queries/0_stateless/02725_cnf_large_check.sql
@@ -7,21 +7,21 @@ INSERT INTO 02725_cnf VALUES (0, 0, 0, 0, 0, 0, 0, 0, 0, 0), (0, 0, 0, 0, 0, 0,
 SELECT count()
 FROM 02725_cnf
 WHERE (c5 AND (NOT c0)) OR ((NOT c3) AND (NOT c6) AND (NOT c1) AND (NOT c6)) OR (c7 AND (NOT c3) AND (NOT c5) AND (NOT c7)) OR ((NOT c8) AND c5) OR ((NOT c0)) OR ((NOT c8) AND (NOT c5) AND c1 AND c6 AND c3) OR (c7 AND (NOT c0) AND c6 AND c1 AND (NOT c2)) OR (c3 AND (NOT c9) AND c1)
-SETTINGS convert_query_to_cnf = 1, enable_analyzer = 1;
+SETTINGS convert_query_to_cnf = 1, allow_experimental_analyzer = 1;
 
 SELECT count()
 FROM 02725_cnf
 WHERE (c5 AND (NOT c0)) OR ((NOT c3) AND (NOT c6) AND (NOT c1) AND (NOT c6)) OR (c7 AND (NOT c3) AND (NOT c5) AND (NOT c7)) OR ((NOT c8) AND c5) OR ((NOT c0)) OR ((NOT c8) AND (NOT c5) AND c1 AND c6 AND c3) OR (c7 AND (NOT c0) AND c6 AND c1 AND (NOT c2)) OR (c3 AND (NOT c9) AND c1)
-SETTINGS convert_query_to_cnf = 1, enable_analyzer = 0;
+SETTINGS convert_query_to_cnf = 1, allow_experimental_analyzer = 0;
 
 SELECT count()
 FROM 02725_cnf
 WHERE ((NOT c2) AND c2 AND (NOT c1)) OR ((NOT c2) AND c3 AND (NOT c5)) OR ((NOT c7) AND (NOT c8)) OR (c9 AND c6 AND c8 AND (NOT c8) AND (NOT c7))
-SETTINGS convert_query_to_cnf = 1, enable_analyzer = 1;
+SETTINGS convert_query_to_cnf = 1, allow_experimental_analyzer = 1;
 
 SELECT count()
 FROM 02725_cnf
 WHERE ((NOT c2) AND c2 AND (NOT c1)) OR ((NOT c2) AND c3 AND (NOT c5)) OR ((NOT c7) AND (NOT c8)) OR (c9 AND c6 AND c8 AND (NOT c8) AND (NOT c7))
-SETTINGS convert_query_to_cnf = 1, enable_analyzer = 0;
+SETTINGS convert_query_to_cnf = 1, allow_experimental_analyzer = 0;
 
 DROP TABLE 02725_cnf;
diff --git a/tests/queries/0_stateless/02725_database_hdfs.sh b/tests/queries/0_stateless/02725_database_hdfs.sh
index 7fd35c72ef1..1eb22976b84 100755
--- a/tests/queries/0_stateless/02725_database_hdfs.sh
+++ b/tests/queries/0_stateless/02725_database_hdfs.sh
@@ -25,7 +25,7 @@ fi
 echo "Test 1: select from hdfs database"
 
 # Database without specific host
-${CLICKHOUSE_CLIENT} --multiline -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 DROP DATABASE IF EXISTS test_hdfs_1;
 CREATE DATABASE test_hdfs_1 ENGINE = HDFS;
 USE test_hdfs_1;
@@ -34,7 +34,7 @@ SELECT * FROM \"hdfs://localhost:12222/test_02725_1.tsv\"
 ${CLICKHOUSE_CLIENT} -q "SHOW DATABASES;" | grep test_hdfs_1
 
 # Database with host
-${CLICKHOUSE_CLIENT} --multiline -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 DROP DATABASE IF EXISTS test_hdfs_2;
 CREATE DATABASE test_hdfs_2 ENGINE = HDFS('hdfs://localhost:12222');
 USE test_hdfs_2;
@@ -45,12 +45,12 @@ ${CLICKHOUSE_CLIENT} -q "SHOW DATABASES;" | grep test_hdfs_2
 #################
 echo "Test 2: check exceptions"
 
-${CLICKHOUSE_CLIENT} --multiline -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 DROP DATABASE IF EXISTS test_hdfs_3;
 CREATE DATABASE test_hdfs_3 ENGINE = HDFS('abacaba');
 """ 2>&1 | tr '\n' ' ' | grep -oF "BAD_ARGUMENTS"
 
-${CLICKHOUSE_CLIENT} --multiline -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 DROP DATABASE IF EXISTS test_hdfs_4;
 CREATE DATABASE test_hdfs_4 ENGINE = HDFS;
 USE test_hdfs_4;
@@ -64,7 +64,7 @@ ${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_hdfs_4.\`hdfs://localhost:12222
 
 
 # Cleanup
-${CLICKHOUSE_CLIENT} --multiline -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 DROP DATABASE IF EXISTS test_hdfs_1;
 DROP DATABASE IF EXISTS test_hdfs_2;
 DROP DATABASE IF EXISTS test_hdfs_3;
diff --git a/tests/queries/0_stateless/02725_local_query_parameters.sh b/tests/queries/0_stateless/02725_local_query_parameters.sh
index 151a854d5b9..92d7f645454 100755
--- a/tests/queries/0_stateless/02725_local_query_parameters.sh
+++ b/tests/queries/0_stateless/02725_local_query_parameters.sh
@@ -5,6 +5,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_LOCAL -q "
+$CLICKHOUSE_LOCAL --multiquery -q "
     SET param_x=1;
     SELECT {x:UInt64}, {x:String};"
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 5d941adcb81..e393d96fc40 100644
--- a/tests/queries/0_stateless/02726_async_insert_flush_queue.sql
+++ b/tests/queries/0_stateless/02726_async_insert_flush_queue.sql
@@ -11,13 +11,9 @@ SET async_insert_use_adaptive_busy_timeout=0;
 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};
-
-INSERT INTO t_async_inserts_flush FORMAT JSONEachRow {"a": "str"};
-
-INSERT INTO t_async_inserts_flush FORMAT JSONEachRow {"a": 100} {"a": 200};
-
+INSERT INTO t_async_inserts_flush FORMAT JSONEachRow {"a": "str"}
+INSERT INTO t_async_inserts_flush FORMAT JSONEachRow {"a": 100} {"a": 200}
 INSERT INTO t_async_inserts_flush VALUES (3) (4) (5);
 
 SELECT sleep(1) FORMAT Null;
@@ -30,9 +26,7 @@ SELECT count() FROM t_async_inserts_flush;
 
 SYSTEM FLUSH ASYNC INSERT QUEUE;
 
-SELECT count() FROM system.asynchronous_inserts
-WHERE database = currentDatabase() AND table = 't_async_inserts_flush';
-
+SELECT count() FROM system.asynchronous_inserts;
 SELECT count() FROM t_async_inserts_flush;
 
 DROP TABLE t_async_inserts_flush;
diff --git a/tests/queries/0_stateless/02726_async_insert_flush_stress.sh b/tests/queries/0_stateless/02726_async_insert_flush_stress.sh
index 61bbbd620f0..876766d0780 100755
--- a/tests/queries/0_stateless/02726_async_insert_flush_stress.sh
+++ b/tests/queries/0_stateless/02726_async_insert_flush_stress.sh
@@ -91,5 +91,5 @@ flush1 $TIMEOUT &
 wait
 
 ${CLICKHOUSE_CLIENT} -q "SYSTEM FLUSH ASYNC INSERT QUEUE"
-${CLICKHOUSE_CLIENT} -q "SELECT count() FROM system.asynchronous_inserts WHERE database = currentDatabase() AND table = 'async_inserts'"
+${CLICKHOUSE_CLIENT} -q "SELECT count() FROM system.asynchronous_inserts"
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts";
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
index 4ddf41c4d6d..c2f3c51b17a 100644
--- a/tests/queries/0_stateless/02731_analyzer_join_resolve_nested.sql.j2
+++ b/tests/queries/0_stateless/02731_analyzer_join_resolve_nested.sql.j2
@@ -31,7 +31,7 @@ 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 enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 {% for join_use_nulls in [0, 1] -%}
 
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 682a43aab5f..451f0d6d485 100644
--- a/tests/queries/0_stateless/02731_parallel_replicas_join_subquery.reference
+++ b/tests/queries/0_stateless/02731_parallel_replicas_join_subquery.reference
@@ -31,10 +31,10 @@
 29	2j&S)ba?XG	QuQj	17163829389637435056
 3	UlI+1		14144472852965836438
 =============== QUERIES EXECUTED BY PARALLEL INNER QUERY ALONE ===============
-0	2	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 `__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, enable_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, enable_analyzer=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
@@ -58,8 +58,8 @@ U	c	10
 UlI+1		10
 bX?}ix [	Ny]2 G	10
 t<iT	X48q:Z]t0	10
-0	2	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 `__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_` 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, enable_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, enable_analyzer=1;
+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 299f1cbbc32..7693d0da295 100644
--- a/tests/queries/0_stateless/02731_parallel_replicas_join_subquery.sql
+++ b/tests/queries/0_stateless/02731_parallel_replicas_join_subquery.sql
@@ -22,8 +22,8 @@ SELECT
 LIMIT 100;
 
 SET max_parallel_replicas = 3;
+SET prefer_localhost_replica = 1;
 SET cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost';
-SET parallel_replicas_local_plan = 1;
 SET joined_subquery_requires_alias = 0;
 
 SELECT '=============== INNER QUERY (NO PARALLEL) ===============';
@@ -38,7 +38,7 @@ FROM join_inner_table
 GROUP BY key, value1, value2
 ORDER BY key, value1, value2
 LIMIT 10;
--- settings enable_analyzer=0;
+-- settings allow_experimental_analyzer=0;
 
 -- SELECT
 --     key,
@@ -49,7 +49,7 @@ LIMIT 10;
 --     PREWHERE (id = '833c9e22-c245-4eb5-8745-117a9a1f26b1') AND (number > toUInt64('1610517366120'))
 -- GROUP BY key, value1, value2
 -- ORDER BY key, value1, value2
--- LIMIT 10 settings enable_analyzer=1;
+-- LIMIT 10 settings allow_experimental_analyzer=1;
 
 SELECT '=============== INNER QUERY (PARALLEL) ===============';
 
@@ -64,7 +64,7 @@ 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, enable_analyzer=0;
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, allow_experimental_analyzer=0;
 
 -- Parallel inner query alone
 SELECT
@@ -77,7 +77,7 @@ 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, enable_analyzer=1;
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, allow_experimental_analyzer=1;
 
 SELECT '=============== QUERIES EXECUTED BY PARALLEL INNER QUERY ALONE ===============';
 
@@ -184,7 +184,7 @@ FROM
         )
 GROUP BY value1, value2
 ORDER BY value1, value2
-SETTINGS allow_experimental_parallel_reading_from_replicas = 1, enable_analyzer=0;
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, allow_experimental_analyzer=0;
 
 -- Parallel full query
 SELECT
@@ -214,7 +214,7 @@ FROM
         )
 GROUP BY value1, value2
 ORDER BY value1, value2
-SETTINGS allow_experimental_parallel_reading_from_replicas = 1, enable_analyzer=1;
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, allow_experimental_analyzer=1;
 
 SYSTEM FLUSH LOGS;
 
diff --git a/tests/queries/0_stateless/02734_optimize_group_by.sql b/tests/queries/0_stateless/02734_optimize_group_by.sql
index 626805d028d..28e86c04b0f 100644
--- a/tests/queries/0_stateless/02734_optimize_group_by.sql
+++ b/tests/queries/0_stateless/02734_optimize_group_by.sql
@@ -1,5 +1,5 @@
-SELECT 'a' AS key, 'b' as value GROUP BY key WITH CUBE SETTINGS enable_analyzer = 0;
-SELECT 'a' AS key, 'b' as value GROUP BY key WITH CUBE SETTINGS enable_analyzer = 1;
+SELECT 'a' AS key, 'b' as value GROUP BY key WITH CUBE SETTINGS allow_experimental_analyzer = 0;
+SELECT 'a' AS key, 'b' as value GROUP BY key WITH CUBE SETTINGS allow_experimental_analyzer = 1;
 
 SELECT 'a' AS key, 'b' as value GROUP BY ignore(1) WITH CUBE;
 
diff --git a/tests/queries/0_stateless/02735_parquet_encoder.sql b/tests/queries/0_stateless/02735_parquet_encoder.sql
index ab5047cb915..9320d0e57c3 100644
--- a/tests/queries/0_stateless/02735_parquet_encoder.sql
+++ b/tests/queries/0_stateless/02735_parquet_encoder.sql
@@ -1,4 +1,4 @@
--- Tags: long, no-fasttest, no-parallel, no-tsan, no-msan, no-asan
+-- Tags: no-fasttest, no-parallel
 
 set output_format_parquet_use_custom_encoder = 1;
 set output_format_parquet_row_group_size = 1000;
diff --git a/tests/queries/0_stateless/02751_multiquery_with_argument.reference b/tests/queries/0_stateless/02751_multiquery_with_argument.reference
index f02e9bab2cd..4b0c199ed35 100644
--- a/tests/queries/0_stateless/02751_multiquery_with_argument.reference
+++ b/tests/queries/0_stateless/02751_multiquery_with_argument.reference
@@ -5,6 +5,8 @@
 Syntax error
 Empty query
 Empty query
+BAD_ARGUMENTS
+BAD_ARGUMENTS
 301
 302
 304
@@ -15,6 +17,8 @@ Bad arguments
 Bad arguments
 Bad arguments
 Bad arguments
+Bad arguments
+Bad arguments
 320
 317
 Bad arguments
diff --git a/tests/queries/0_stateless/02751_multiquery_with_argument.sh b/tests/queries/0_stateless/02751_multiquery_with_argument.sh
index 4021194656b..fea2978c116 100755
--- a/tests/queries/0_stateless/02751_multiquery_with_argument.sh
+++ b/tests/queries/0_stateless/02751_multiquery_with_argument.sh
@@ -4,31 +4,32 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_LOCAL "SELECT 100"
-$CLICKHOUSE_LOCAL "SELECT 101;"
-$CLICKHOUSE_LOCAL "SELECT 102;SELECT 103;"
+$CLICKHOUSE_LOCAL --multiquery "SELECT 100"
+$CLICKHOUSE_LOCAL --multiquery "SELECT 101;"
+$CLICKHOUSE_LOCAL --multiquery "SELECT 102;SELECT 103;"
 
 # Invalid SQL.
-$CLICKHOUSE_LOCAL "SELECT 200; S" 2>&1 | grep -o 'Syntax error'
-$CLICKHOUSE_LOCAL "; SELECT 201;" 2>&1 | grep -o 'Empty query'
-$CLICKHOUSE_LOCAL "; S; SELECT 202" 2>&1 | grep -o 'Empty query'
+$CLICKHOUSE_LOCAL --multiquery "SELECT 200; S" 2>&1 | grep -o 'Syntax error'
+$CLICKHOUSE_LOCAL --multiquery "; SELECT 201;" 2>&1 | grep -o 'Empty query'
+$CLICKHOUSE_LOCAL --multiquery "; S; SELECT 202" 2>&1 | grep -o 'Empty query'
+
+# Simultaneously passing --queries-file + --query (multiquery) is prohibited.
+$CLICKHOUSE_LOCAL --queries-file "queries.csv" --multiquery "SELECT 250;" 2>&1 | grep -o 'BAD_ARGUMENTS'
+$CLICKHOUSE_CLIENT --queries-file "queries.csv" --multiquery "SELECT 251;" 2>&1 | grep -o 'BAD_ARGUMENTS'
 
 # Error expectation cases.
 # -n <SQL> is also interpreted as a query
 $CLICKHOUSE_LOCAL -n "SELECT 301"
 $CLICKHOUSE_LOCAL -n "SELECT 302;"
 $CLICKHOUSE_LOCAL -n "SELECT 304;SELECT 305;"
-# --multiquery and -n are obsolete by now and no-ops.
-# The only exception is a single --multiquery "<some_query>"
 $CLICKHOUSE_LOCAL --multiquery --multiquery 2>&1 | grep -o 'Bad arguments'
 $CLICKHOUSE_LOCAL -n --multiquery 2>&1 | grep -o 'Bad arguments'
 $CLICKHOUSE_LOCAL --multiquery -n 2>&1 | grep -o 'Bad arguments'
 $CLICKHOUSE_LOCAL --multiquery --multiquery "SELECT 306; SELECT 307;" 2>&1 | grep -o 'Bad arguments'
 $CLICKHOUSE_LOCAL -n --multiquery "SELECT 307; SELECT 308;" 2>&1 | grep -o 'Bad arguments'
-$CLICKHOUSE_LOCAL --multiquery "SELECT 309; SELECT 310;" --multiquery 2>&1 | grep -o 'Bad arguments'
+$CLICKHOUSE_LOCAL --multiquery "SELECT 309; SELECT 310;" --multiquery  2>&1 | grep -o 'Bad arguments'
 $CLICKHOUSE_LOCAL --multiquery "SELECT 311;" --multiquery "SELECT 312;" 2>&1 | grep -o 'Bad arguments'
 $CLICKHOUSE_LOCAL --multiquery "SELECT 313;" -n "SELECT 314;" 2>&1 | grep -o 'Bad arguments'
 $CLICKHOUSE_LOCAL -n "SELECT 320" --query "SELECT 317;"
-# --query should be followed by SQL
 $CLICKHOUSE_LOCAL --query -n "SELECT 400;" 2>&1 | grep -o 'Bad arguments'
 $CLICKHOUSE_LOCAL --query -n --multiquery "SELECT 401;" 2>&1 | grep -o 'Bad arguments'
diff --git a/tests/queries/0_stateless/02765_queries_with_subqueries_profile_events.reference b/tests/queries/0_stateless/02765_queries_with_subqueries_profile_events.reference
index a6c8c0bbc3e..d21f914f0dc 100644
--- a/tests/queries/0_stateless/02765_queries_with_subqueries_profile_events.reference
+++ b/tests/queries/0_stateless/02765_queries_with_subqueries_profile_events.reference
@@ -1,24 +1,24 @@
-view	enable_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+view	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
 1	0	1	0	1	2	3
-subquery	enable_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+subquery	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
 1	0	0	1	0	2	2
-CSE	enable_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+CSE	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
 1	0	0	1	0	2	2
-CSE_Multi	enable_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+CSE_Multi	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
 1	0	0	1	0	2	2
-CTE	enable_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+CTE	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
 1	0	0	1	0	2	2
-CTE_Multi	enable_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+CTE_Multi	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
 1	0	0	1	0	4	4
-view	enable_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+view	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
 1	1	1	0	1	3	4
-subquery	enable_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+subquery	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
 1	1	0	1	0	2	2
-CSE	enable_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+CSE	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
 1	1	0	1	0	2	2
-CSE_Multi	enable_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+CSE_Multi	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
 1	1	0	1	0	2	2
-CTE	enable_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+CTE	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
 1	1	0	1	0	2	2
-CTE_Multi	enable_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
+CTE_Multi	allow_experimental_analyzer	InsertQuery	SelectQuery	InsertQueriesWithSubqueries	SelectQueriesWithSubqueries	QueriesWithSubqueries
 1	1	0	1	0	4	4
diff --git a/tests/queries/0_stateless/02765_queries_with_subqueries_profile_events.sh b/tests/queries/0_stateless/02765_queries_with_subqueries_profile_events.sh
index fd64e8d8cb8..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
@@ -4,7 +4,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
     DROP TABLE IF EXISTS mv;
     DROP TABLE IF EXISTS output;
     DROP TABLE IF EXISTS input;
@@ -14,14 +14,14 @@ $CLICKHOUSE_CLIENT -q "
     CREATE MATERIALIZED VIEW mv TO output SQL SECURITY NONE AS SELECT * FROM input;
 "
 
-for enable_analyzer in 0 1; do
+for allow_experimental_analyzer in 0 1; do
     query_id="$(random_str 10)"
-    $CLICKHOUSE_CLIENT --enable_analyzer "$enable_analyzer" --query_id "$query_id" -q "INSERT INTO input SELECT * FROM numbers(1)"
-    $CLICKHOUSE_CLIENT -m -q "
+    $CLICKHOUSE_CLIENT --allow_experimental_analyzer "$allow_experimental_analyzer" --query_id "$query_id" -q "INSERT INTO input SELECT * FROM numbers(1)"
+    $CLICKHOUSE_CLIENT -mn -q "
         SYSTEM FLUSH LOGS;
         SELECT
             1 view,
-            $enable_analyzer enable_analyzer,
+            $allow_experimental_analyzer allow_experimental_analyzer,
             ProfileEvents['InsertQuery'] InsertQuery,
             ProfileEvents['SelectQuery'] SelectQuery,
             ProfileEvents['InsertQueriesWithSubqueries'] InsertQueriesWithSubqueries,
@@ -34,12 +34,12 @@ for enable_analyzer in 0 1; do
     "
 
     query_id="$(random_str 10)"
-    $CLICKHOUSE_CLIENT --enable_analyzer "$enable_analyzer" --query_id "$query_id" -q "SELECT * FROM system.one WHERE dummy IN (SELECT * FROM system.one) FORMAT Null"
-    $CLICKHOUSE_CLIENT -m -q "
+    $CLICKHOUSE_CLIENT --allow_experimental_analyzer "$allow_experimental_analyzer" --query_id "$query_id" -q "SELECT * FROM system.one WHERE dummy IN (SELECT * FROM system.one) FORMAT Null"
+    $CLICKHOUSE_CLIENT -mn -q "
         SYSTEM FLUSH LOGS;
         SELECT
             1 subquery,
-            $enable_analyzer enable_analyzer,
+            $allow_experimental_analyzer allow_experimental_analyzer,
             ProfileEvents['InsertQuery'] InsertQuery,
             ProfileEvents['SelectQuery'] SelectQuery,
             ProfileEvents['InsertQueriesWithSubqueries'] InsertQueriesWithSubqueries,
@@ -51,12 +51,12 @@ for enable_analyzer in 0 1; do
     "
 
     query_id="$(random_str 10)"
-    $CLICKHOUSE_CLIENT --enable_analyzer "$enable_analyzer" --query_id "$query_id" -q "WITH (SELECT * FROM system.one) AS x SELECT x FORMAT Null"
-    $CLICKHOUSE_CLIENT -m -q "
+    $CLICKHOUSE_CLIENT --allow_experimental_analyzer "$allow_experimental_analyzer" --query_id "$query_id" -q "WITH (SELECT * FROM system.one) AS x SELECT x FORMAT Null"
+    $CLICKHOUSE_CLIENT -mn -q "
         SYSTEM FLUSH LOGS;
         SELECT
             1 CSE,
-            $enable_analyzer enable_analyzer,
+            $allow_experimental_analyzer allow_experimental_analyzer,
             ProfileEvents['InsertQuery'] InsertQuery,
             ProfileEvents['SelectQuery'] SelectQuery,
             ProfileEvents['InsertQueriesWithSubqueries'] InsertQueriesWithSubqueries,
@@ -68,12 +68,12 @@ for enable_analyzer in 0 1; do
     "
 
     query_id="$(random_str 10)"
-    $CLICKHOUSE_CLIENT --enable_analyzer "$enable_analyzer" --query_id "$query_id" -q "WITH (SELECT * FROM system.one) AS x SELECT x, x FORMAT Null"
-    $CLICKHOUSE_CLIENT -m -q "
+    $CLICKHOUSE_CLIENT --allow_experimental_analyzer "$allow_experimental_analyzer" --query_id "$query_id" -q "WITH (SELECT * FROM system.one) AS x SELECT x, x FORMAT Null"
+    $CLICKHOUSE_CLIENT -mn -q "
         SYSTEM FLUSH LOGS;
         SELECT
             1 CSE_Multi,
-            $enable_analyzer enable_analyzer,
+            $allow_experimental_analyzer allow_experimental_analyzer,
             ProfileEvents['InsertQuery'] InsertQuery,
             ProfileEvents['SelectQuery'] SelectQuery,
             ProfileEvents['InsertQueriesWithSubqueries'] InsertQueriesWithSubqueries,
@@ -85,12 +85,12 @@ for enable_analyzer in 0 1; do
     "
 
     query_id="$(random_str 10)"
-    $CLICKHOUSE_CLIENT --enable_analyzer "$enable_analyzer" --query_id "$query_id" -q "WITH x AS (SELECT * FROM system.one) SELECT * FROM x FORMAT Null"
-    $CLICKHOUSE_CLIENT -m -q "
+    $CLICKHOUSE_CLIENT --allow_experimental_analyzer "$allow_experimental_analyzer" --query_id "$query_id" -q "WITH x AS (SELECT * FROM system.one) SELECT * FROM x FORMAT Null"
+    $CLICKHOUSE_CLIENT -mn -q "
         SYSTEM FLUSH LOGS;
         SELECT
             1 CTE,
-            $enable_analyzer enable_analyzer,
+            $allow_experimental_analyzer allow_experimental_analyzer,
             ProfileEvents['InsertQuery'] InsertQuery,
             ProfileEvents['SelectQuery'] SelectQuery,
             ProfileEvents['InsertQueriesWithSubqueries'] InsertQueriesWithSubqueries,
@@ -102,12 +102,12 @@ for enable_analyzer in 0 1; do
     "
 
     query_id="$(random_str 10)"
-    $CLICKHOUSE_CLIENT --enable_analyzer "$enable_analyzer" --query_id "$query_id" -q "WITH x AS (SELECT * FROM system.one) SELECT * FROM x UNION ALL SELECT * FROM x FORMAT Null"
-    $CLICKHOUSE_CLIENT -m -q "
+    $CLICKHOUSE_CLIENT --allow_experimental_analyzer "$allow_experimental_analyzer" --query_id "$query_id" -q "WITH x AS (SELECT * FROM system.one) SELECT * FROM x UNION ALL SELECT * FROM x FORMAT Null"
+    $CLICKHOUSE_CLIENT -mn -q "
         SYSTEM FLUSH LOGS;
         SELECT
             1 CTE_Multi,
-            $enable_analyzer enable_analyzer,
+            $allow_experimental_analyzer allow_experimental_analyzer,
             ProfileEvents['InsertQuery'] InsertQuery,
             ProfileEvents['SelectQuery'] SelectQuery,
             ProfileEvents['InsertQueriesWithSubqueries'] InsertQueriesWithSubqueries,
diff --git a/tests/queries/0_stateless/02767_into_outfile_extensions_msan.sh b/tests/queries/0_stateless/02767_into_outfile_extensions_msan.sh
index 2d2ee328a29..0c5767314d5 100755
--- a/tests/queries/0_stateless/02767_into_outfile_extensions_msan.sh
+++ b/tests/queries/0_stateless/02767_into_outfile_extensions_msan.sh
@@ -6,6 +6,6 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 out="explain1.$CLICKHOUSE_TEST_UNIQUE_NAME.out"
 # only EXPLAIN triggers the problem under MSan
-$CLICKHOUSE_CLIENT --enable_analyzer=0 -q "explain select * from numbers(1) into outfile '$out'"
+$CLICKHOUSE_CLIENT --allow_experimental_analyzer=0 -q "explain select * from numbers(1) into outfile '$out'"
 cat "$out"
 rm -f "$out"
diff --git a/tests/queries/0_stateless/02769_parallel_replicas_unavailable_shards.sql b/tests/queries/0_stateless/02769_parallel_replicas_unavailable_shards.sql
index 7dbc389b55c..1a75e000349 100644
--- a/tests/queries/0_stateless/02769_parallel_replicas_unavailable_shards.sql
+++ b/tests/queries/0_stateless/02769_parallel_replicas_unavailable_shards.sql
@@ -4,9 +4,7 @@ INSERT INTO test_parallel_replicas_unavailable_shards SELECT * FROM numbers(10);
 
 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';
--- with local plan for initiator, the query can be executed fast on initator, we can simply not come to the point where unavailable replica can be detected
--- therefore disable local plan for now
-SELECT count() FROM test_parallel_replicas_unavailable_shards WHERE NOT ignore(*) SETTINGS log_comment = '02769_7b513191-5082-4073-8568-53b86a49da79', parallel_replicas_local_plan=0;
+SELECT count() FROM test_parallel_replicas_unavailable_shards WHERE NOT ignore(*) SETTINGS log_comment = '02769_7b513191-5082-4073-8568-53b86a49da79';
 
 SYSTEM FLUSH LOGS;
 
diff --git a/tests/queries/0_stateless/02770_async_buffer_ignore.sh b/tests/queries/0_stateless/02770_async_buffer_ignore.sh
index 37f002767d6..6eaf655324d 100755
--- a/tests/queries/0_stateless/02770_async_buffer_ignore.sh
+++ b/tests/queries/0_stateless/02770_async_buffer_ignore.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-fasttest, no-random-settings, no-distributed-cache
+# Tags: no-fasttest, no-random-settings
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
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 91ca5ef0340..d86b65c3291 100644
--- a/tests/queries/0_stateless/02771_ignore_data_skipping_indices.sql
+++ b/tests/queries/0_stateless/02771_ignore_data_skipping_indices.sql
@@ -23,12 +23,12 @@ 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 INDEX_NOT_USED }
 SELECT * FROM data_02771 WHERE x = 1 AND y = 2 SETTINGS ignore_data_skipping_indices='xy_idx';
 
-SET enable_analyzer = 0;
+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 enable_analyzer = 1;
+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_multiple_query_arguments.reference b/tests/queries/0_stateless/02771_multiple_query_arguments.reference
index b98ad7086a9..0c008e96965 100644
--- a/tests/queries/0_stateless/02771_multiple_query_arguments.reference
+++ b/tests/queries/0_stateless/02771_multiple_query_arguments.reference
@@ -2,17 +2,15 @@
 101
 202
 202
-303
-303
-303
+Multi-statements are not allowed
+Empty query
 Bad arguments
 Syntax error
 101
 101
 202
 202
-303
-303
-303
+Multi-statements are not allowed
+Empty query
 Bad arguments
 Syntax error
diff --git a/tests/queries/0_stateless/02771_multiple_query_arguments.sh b/tests/queries/0_stateless/02771_multiple_query_arguments.sh
index ae6e23eb61a..2958c9e9a72 100755
--- a/tests/queries/0_stateless/02771_multiple_query_arguments.sh
+++ b/tests/queries/0_stateless/02771_multiple_query_arguments.sh
@@ -7,15 +7,15 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # clickhouse-client
 $CLICKHOUSE_CLIENT --query "SELECT 101" --query "SELECT 101"
 $CLICKHOUSE_CLIENT --query "SELECT 202;" --query "SELECT 202;"
-$CLICKHOUSE_CLIENT --query "SELECT 303" --query "SELECT 303; SELECT 303"
-$CLICKHOUSE_CLIENT --query "" --query "" 2>&1
+$CLICKHOUSE_CLIENT --query "SELECT 303" --query "SELECT 303; SELECT 303" 2>&1 | grep -o 'Multi-statements are not allowed'
+$CLICKHOUSE_CLIENT --query "" --query "" 2>&1 | grep -o 'Empty query'
 $CLICKHOUSE_CLIENT --query "SELECT 303" --query 2>&1 | grep -o 'Bad arguments'
 $CLICKHOUSE_CLIENT --query "SELECT 303" --query "SELE" 2>&1 | grep -o 'Syntax error'
 
 # clickhouse-local
 $CLICKHOUSE_LOCAL --query "SELECT 101" --query "SELECT 101"
 $CLICKHOUSE_LOCAL --query "SELECT 202;" --query "SELECT 202;"
-$CLICKHOUSE_LOCAL --query "SELECT 303" --query "SELECT 303; SELECT 303"
-$CLICKHOUSE_LOCAL --query "" --query ""
+$CLICKHOUSE_LOCAL --query "SELECT 303" --query "SELECT 303; SELECT 303" 2>&1 | grep -o 'Multi-statements are not allowed' # behaves differently than clickhouse-client, TODO make it consistent
+$CLICKHOUSE_LOCAL --query "" --query "" 2>&1 | grep -o 'Empty query' # behaves equally different than clickhouse-client TODO
 $CLICKHOUSE_LOCAL --query "SELECT 303" --query 2>&1 | grep -o 'Bad arguments'
 $CLICKHOUSE_LOCAL --query "SELECT 303" --query "SELE" 2>&1 | grep -o 'Syntax error'
diff --git a/tests/queries/0_stateless/02771_parallel_replicas_analyzer.reference b/tests/queries/0_stateless/02771_parallel_replicas_analyzer.reference
index 3c54d5977f3..5bf3520ccdb 100644
--- a/tests/queries/0_stateless/02771_parallel_replicas_analyzer.reference
+++ b/tests/queries/0_stateless/02771_parallel_replicas_analyzer.reference
@@ -8,5 +8,5 @@
 5935810273536892891
 7885388429666205427
 8124171311239967992
-1	1	-- Simple query with analyzer and pure parallel replicas\nSELECT number\nFROM join_inner_table__fuzz_146_replicated\n    SETTINGS\n    enable_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	1	SELECT `__table1`.`number` AS `number` FROM `default`.`join_inner_table__fuzz_146_replicated` AS `__table1`
+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`
diff --git a/tests/queries/0_stateless/02771_parallel_replicas_analyzer.sql b/tests/queries/0_stateless/02771_parallel_replicas_analyzer.sql
index 54295ffda17..88a0d2163d6 100644
--- a/tests/queries/0_stateless/02771_parallel_replicas_analyzer.sql
+++ b/tests/queries/0_stateless/02771_parallel_replicas_analyzer.sql
@@ -1,5 +1,5 @@
 -- Tags: zookeeper
-DROP TABLE IF EXISTS join_inner_table__fuzz_146_replicated;
+
 CREATE TABLE join_inner_table__fuzz_146_replicated
 (
     `id` UUID,
@@ -17,13 +17,11 @@ INSERT INTO join_inner_table__fuzz_146_replicated
     SELECT CAST('833c9e22-c245-4eb5-8745-117a9a1f26b1', 'UUID') AS id, CAST(rowNumberInAllBlocks(), 'String') AS key, *
     FROM generateRandom('number Int64, value1 String, value2 String, time Int64', 1, 10, 2) LIMIT 10;
 
-SET parallel_replicas_local_plan = 1;
-
 -- Simple query with analyzer and pure parallel replicas
 SELECT number
 FROM join_inner_table__fuzz_146_replicated
     SETTINGS
-    enable_analyzer = 1,
+    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;
@@ -51,5 +49,3 @@ WHERE
       )
 GROUP BY is_initial_query, query
 ORDER BY is_initial_query DESC, c, query;
-
-DROP TABLE join_inner_table__fuzz_146_replicated;
diff --git a/tests/queries/0_stateless/02771_semi_join_use_nulls.sql.j2 b/tests/queries/0_stateless/02771_semi_join_use_nulls.sql.j2
index 74e252c785b..248461a98bb 100644
--- a/tests/queries/0_stateless/02771_semi_join_use_nulls.sql.j2
+++ b/tests/queries/0_stateless/02771_semi_join_use_nulls.sql.j2
@@ -1,11 +1,11 @@
 
-{% for enable_analyzer in [0, 1] -%}
+{% for allow_experimental_analyzer in [0, 1] -%}
 {% for join_use_nulls in [0, 1] -%}
 {% for kind in ['LEFT', 'RIGHT'] -%}
 {% for strictness in ['SEMI', 'ANTI'] -%}
 {% for maybe_materialize in ['', 'materialize'] -%}
 
-SET enable_analyzer = {{ enable_analyzer }};
+SET allow_experimental_analyzer = {{ allow_experimental_analyzer }};
 
 SET join_use_nulls = {{ join_use_nulls }};
 
diff --git a/tests/queries/0_stateless/02775_show_columns_called_from_clickhouse.reference b/tests/queries/0_stateless/02775_show_columns_called_from_clickhouse.reference
index cb905d63ca5..de0f151db7d 100644
--- a/tests/queries/0_stateless/02775_show_columns_called_from_clickhouse.reference
+++ b/tests/queries/0_stateless/02775_show_columns_called_from_clickhouse.reference
@@ -44,7 +44,7 @@ nested.col1	Array(String)	NO		\N
 nested.col2	Array(UInt32)	NO		\N	
 nfs	Nullable(FixedString(3))	YES		\N	
 ns	Nullable(String)	YES		\N	
-o	JSON	NO		\N	
+o	Object(\'json\')	NO		\N	
 p	Point	NO		\N	
 pg	Polygon	NO		\N	
 r	Ring	NO		\N	
diff --git a/tests/queries/0_stateless/02775_show_columns_called_from_clickhouse.sql b/tests/queries/0_stateless/02775_show_columns_called_from_clickhouse.sql
index dadfa59bf87..3bbcbb1a535 100644
--- a/tests/queries/0_stateless/02775_show_columns_called_from_clickhouse.sql
+++ b/tests/queries/0_stateless/02775_show_columns_called_from_clickhouse.sql
@@ -11,7 +11,7 @@
 DROP TABLE IF EXISTS tab;
 
 SET allow_suspicious_low_cardinality_types=1;
-SET allow_experimental_json_type=1;
+SET allow_experimental_object_type=1;
 
 CREATE TABLE tab
 (
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 2079da9d34a..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
@@ -33,7 +33,7 @@ send -- "DROP TABLE IF EXISTS tab;\r"
 expect "Query OK, 0 rows affected"
 
 send -- "SET allow_suspicious_low_cardinality_types=1;\r"
-send -- "SET allow_experimental_json_type=1;\r"
+send -- "SET allow_experimental_object_type=1;\r"
 
 send -- "
 CREATE TABLE tab
diff --git a/tests/queries/0_stateless/02783_date_predicate_optimizations.sql b/tests/queries/0_stateless/02783_date_predicate_optimizations.sql
index b127af677ee..4da8cebff1c 100644
--- a/tests/queries/0_stateless/02783_date_predicate_optimizations.sql
+++ b/tests/queries/0_stateless/02783_date_predicate_optimizations.sql
@@ -11,8 +11,8 @@ INSERT INTO source values ('2021-12-31 23:00:00', 0);
 
 SELECT * FROM source WHERE toYYYYMM(ts) = 202112;
 SELECT * FROM source WHERE toYear(ts) = 2021;
-SELECT * FROM source WHERE toYYYYMM(ts) = 202112 SETTINGS enable_analyzer=1;
-SELECT * FROM source WHERE toYear(ts) = 2021 SETTINGS enable_analyzer=1;
+SELECT * FROM source WHERE toYYYYMM(ts) = 202112 SETTINGS allow_experimental_analyzer=1;
+SELECT * FROM source WHERE toYear(ts) = 2021 SETTINGS allow_experimental_analyzer=1;
 
 DROP TABLE IF EXISTS source;
 CREATE TABLE source
@@ -46,18 +46,18 @@ SELECT count(*) FROM source WHERE toYear(dt) < 2023;
 SELECT count(*) FROM source WHERE toYear(dt) <= 2023;
 SELECT count(*) FROM source WHERE toYear(dt) > 2023;
 SELECT count(*) FROM source WHERE toYear(dt) >= 2023;
-SELECT count(*) FROM source WHERE toYYYYMM(dt) = 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(dt) <> 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(dt) < 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(dt) <= 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(dt) > 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(dt) >= 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(dt) = 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(dt) <> 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(dt) < 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(dt) <= 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(dt) > 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(dt) >= 2023 SETTINGS enable_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(dt) = 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(dt) <> 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(dt) < 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(dt) <= 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(dt) > 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(dt) >= 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(dt) = 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(dt) <> 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(dt) < 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(dt) <= 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(dt) > 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(dt) >= 2023 SETTINGS allow_experimental_analyzer=1;
 
 SELECT 'DateTime';
 SELECT count(*) FROM source WHERE toYYYYMM(ts) = 202312;
@@ -72,18 +72,18 @@ SELECT count(*) FROM source WHERE toYear(ts) < 2023;
 SELECT count(*) FROM source WHERE toYear(ts) <= 2023;
 SELECT count(*) FROM source WHERE toYear(ts) > 2023;
 SELECT count(*) FROM source WHERE toYear(ts) >= 2023;
-SELECT count(*) FROM source WHERE toYYYYMM(ts) = 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(ts) <> 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(ts) < 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(ts) <= 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(ts) > 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(ts) >= 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(ts) = 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(ts) <> 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(ts) < 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(ts) <= 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(ts) > 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(ts) >= 2023 SETTINGS enable_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(ts) = 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(ts) <> 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(ts) < 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(ts) <= 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(ts) > 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(ts) >= 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(ts) = 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(ts) <> 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(ts) < 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(ts) <= 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(ts) > 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(ts) >= 2023 SETTINGS allow_experimental_analyzer=1;
 
 SELECT 'Date32';
 SELECT count(*) FROM source WHERE toYYYYMM(dt_32) = 202312;
@@ -98,18 +98,18 @@ SELECT count(*) FROM source WHERE toYear(dt_32) < 2023;
 SELECT count(*) FROM source WHERE toYear(dt_32) <= 2023;
 SELECT count(*) FROM source WHERE toYear(dt_32) > 2023;
 SELECT count(*) FROM source WHERE toYear(dt_32) >= 2023;
-SELECT count(*) FROM source WHERE toYYYYMM(dt_32) = 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(dt_32) <> 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(dt_32) < 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(dt_32) <= 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(dt_32) > 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(dt_32) >= 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(dt_32) = 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(dt_32) <> 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(dt_32) < 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(dt_32) <= 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(dt_32) > 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(dt_32) >= 2023 SETTINGS enable_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(dt_32) = 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(dt_32) <> 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(dt_32) < 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(dt_32) <= 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(dt_32) > 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(dt_32) >= 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(dt_32) = 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(dt_32) <> 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(dt_32) < 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(dt_32) <= 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(dt_32) > 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(dt_32) >= 2023 SETTINGS allow_experimental_analyzer=1;
 
 SELECT 'DateTime64';
 SELECT count(*) FROM source WHERE toYYYYMM(ts_64) = 202312;
@@ -124,16 +124,16 @@ SELECT count(*) FROM source WHERE toYear(ts_64) < 2023;
 SELECT count(*) FROM source WHERE toYear(ts_64) <= 2023;
 SELECT count(*) FROM source WHERE toYear(ts_64) > 2023;
 SELECT count(*) FROM source WHERE toYear(ts_64) >= 2023;
-SELECT count(*) FROM source WHERE toYYYYMM(ts_64) = 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(ts_64) <> 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(ts_64) < 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(ts_64) <= 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(ts_64) > 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYYYYMM(ts_64) >= 202312 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(ts_64) = 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(ts_64) <> 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(ts_64) < 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(ts_64) <= 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(ts_64) > 2023 SETTINGS enable_analyzer=1;
-SELECT count(*) FROM source WHERE toYear(ts_64) >= 2023 SETTINGS enable_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(ts_64) = 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(ts_64) <> 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(ts_64) < 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(ts_64) <= 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(ts_64) > 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYYYYMM(ts_64) >= 202312 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(ts_64) = 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(ts_64) <> 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(ts_64) < 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(ts_64) <= 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(ts_64) > 2023 SETTINGS allow_experimental_analyzer=1;
+SELECT count(*) FROM source WHERE toYear(ts_64) >= 2023 SETTINGS allow_experimental_analyzer=1;
 DROP TABLE source;
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 bf7170fd7fb..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
@@ -34,7 +34,7 @@ function run_query_with_pure_parallel_replicas () {
         --prefer_localhost_replica 1 \
         --cluster_for_parallel_replicas 'test_cluster_one_shard_three_replicas_localhost' \
         --allow_experimental_parallel_reading_from_replicas 1 \
-        --enable_analyzer 0
+        --allow_experimental_analyzer 0
 
     $CLICKHOUSE_CLIENT \
         --query "$2" \
@@ -43,7 +43,7 @@ function run_query_with_pure_parallel_replicas () {
         --prefer_localhost_replica 1 \
         --cluster_for_parallel_replicas 'test_cluster_one_shard_three_replicas_localhost' \
         --allow_experimental_parallel_reading_from_replicas 1 \
-        --enable_analyzer 1
+        --allow_experimental_analyzer 1
 }
 
 function run_query_with_custom_key_parallel_replicas () {
@@ -58,7 +58,7 @@ function run_query_with_custom_key_parallel_replicas () {
         --max_parallel_replicas 3 \
         --parallel_replicas_custom_key_filter_type 'default' \
         --parallel_replicas_custom_key "$2" \
-        --enable_analyzer 0
+        --allow_experimental_analyzer 0
 
     $CLICKHOUSE_CLIENT \
         --query "$2" \
@@ -66,7 +66,7 @@ function run_query_with_custom_key_parallel_replicas () {
         --max_parallel_replicas 3 \
         --parallel_replicas_custom_key_filter_type 'default' \
         --parallel_replicas_custom_key "$2" \
-        --enable_analyzer 1
+        --allow_experimental_analyzer 1
 }
 
 $CLICKHOUSE_CLIENT --query "
diff --git a/tests/queries/0_stateless/02784_move_all_conditions_to_prewhere_analyzer_asan.sql b/tests/queries/0_stateless/02784_move_all_conditions_to_prewhere_analyzer_asan.sql
index 3766e5b0c8f..44b9ce4fdc1 100644
--- a/tests/queries/0_stateless/02784_move_all_conditions_to_prewhere_analyzer_asan.sql
+++ b/tests/queries/0_stateless/02784_move_all_conditions_to_prewhere_analyzer_asan.sql
@@ -4,7 +4,7 @@ CREATE TABLE t_02784 (c1 UInt64, c2 UInt64) ENGINE=MergeTree() ORDER BY c1 SETTI
 
 INSERT INTO t_02784 SELECT number, number FROM numbers(1);
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SET move_all_conditions_to_prewhere=1;
 
 SELECT c1, c2 FROM t_02784 WHERE c1 = 0 AND c2 = 0;
diff --git a/tests/queries/0_stateless/02784_parallel_replicas_automatic_decision.sh b/tests/queries/0_stateless/02784_parallel_replicas_automatic_decision.sh
index ef41a5d6277..8a3b34e5cfa 100755
--- a/tests/queries/0_stateless/02784_parallel_replicas_automatic_decision.sh
+++ b/tests/queries/0_stateless/02784_parallel_replicas_automatic_decision.sh
@@ -6,17 +6,16 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 CLICKHOUSE_CLIENT_TRACE=${CLICKHOUSE_CLIENT/"--send_logs_level=${CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL}"/"--send_logs_level=trace"}
 
 function were_parallel_replicas_used () {
+    # Not using current_database = '$CLICKHOUSE_DATABASE' as nested parallel queries aren't run with it
     $CLICKHOUSE_CLIENT --query "
         SELECT
             initial_query_id,
-            concat('Used parallel replicas: ', (ProfileEvents['ParallelReplicasUsedCount'] > 0)::bool::String) as used
+            concat('Used parallel replicas: ', (countIf(initial_query_id != query_id) != 0)::bool::String) as used
         FROM system.query_log
     WHERE event_date >= yesterday()
       AND initial_query_id LIKE '$1%'
-      AND query_id = initial_query_id
-      AND type = 'QueryFinish'
-      AND current_database = '$CLICKHOUSE_DATABASE'
-    ORDER BY event_time_microseconds ASC
+    GROUP BY initial_query_id
+    ORDER BY min(event_time_microseconds) ASC
     FORMAT TSV"
 }
 
@@ -49,11 +48,11 @@ function run_query_with_pure_parallel_replicas () {
         --query "$3" \
         --query_id "${1}_pure" \
         --max_parallel_replicas 3 \
+        --prefer_localhost_replica 1 \
         --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" \
-        --max_threads 5 \
     |& grep "It is enough work for" | awk '{ print substr($7, 2, length($7) - 2) "\t" $20 " estimated parallel replicas" }'
 }
 
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 595b35db610..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
@@ -4,8 +4,8 @@
 02784_automatic_parallel_replicas_join-default_simple_join_1M_pure	10 estimated parallel replicas
 02784_automatic_parallel_replicas_join-default_simple_join_300k_pure	3 estimated parallel replicas
 02784_automatic_parallel_replicas_join-default_simple_join_300k_pure	33 estimated parallel replicas
-02784_automatic_parallel_replicas_join-default_simple_join_0_pure	Used parallel replicas: true
-02784_automatic_parallel_replicas_join-default_simple_join_10M_pure	Used parallel replicas: false
-02784_automatic_parallel_replicas_join-default_simple_join_5M_pure	Used parallel replicas: true
-02784_automatic_parallel_replicas_join-default_simple_join_1M_pure	Used parallel replicas: true
-02784_automatic_parallel_replicas_join-default_simple_join_300k_pure	Used parallel replicas: true
+02784_automatic_parallel_replicas_join-default_simple_join_0_pure	Distinct parallel subqueries: 2	Used parallel replicas: true
+02784_automatic_parallel_replicas_join-default_simple_join_10M_pure	Distinct parallel subqueries: 0	Used parallel replicas: false
+02784_automatic_parallel_replicas_join-default_simple_join_5M_pure	Distinct parallel subqueries: 1	Used parallel replicas: true
+02784_automatic_parallel_replicas_join-default_simple_join_1M_pure	Distinct parallel subqueries: 1	Used parallel replicas: true
+02784_automatic_parallel_replicas_join-default_simple_join_300k_pure	Distinct parallel subqueries: 2	Used parallel replicas: true
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 238d63e6980..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
@@ -9,17 +9,17 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 CLICKHOUSE_CLIENT_TRACE=${CLICKHOUSE_CLIENT/"--send_logs_level=${CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL}"/"--send_logs_level=trace"}
 
 function were_parallel_replicas_used () {
+    # Not using current_database = '$CLICKHOUSE_DATABASE' as nested parallel queries aren't run with it
     $CLICKHOUSE_CLIENT --query "
         SELECT
             initial_query_id,
-            concat('Used parallel replicas: ', (ProfileEvents['ParallelReplicasUsedCount'] > 0)::bool::String) as used
+            concat('Distinct parallel subqueries: ' , countDistinctIf(query, initial_query_id != query_id)::String) as subqueries_parallelized,
+            concat('Used parallel replicas: ', (countIf(initial_query_id != query_id) != 0)::bool::String) as used
         FROM system.query_log
     WHERE event_date >= yesterday()
       AND initial_query_id LIKE '$1%'
-      AND query_id = initial_query_id
-      AND type = 'QueryFinish'
-      AND current_database = '$CLICKHOUSE_DATABASE'
-    ORDER BY event_time_microseconds ASC
+    GROUP BY initial_query_id
+    ORDER BY min(event_time_microseconds) ASC
     FORMAT TSV"
 }
 
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 c2c77a4aa31..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
@@ -39,7 +39,7 @@ QUERY id: 0
                     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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE ((date1 < \'1993-01-01\') OR (date1 >= \'1994-01-01\')) AND ((id >= 1) AND (id <= 3))
@@ -81,7 +81,7 @@ QUERY id: 0
                     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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE (date1 < \'1993-01-01\') AND ((id >= 1) AND (id <= 3))
@@ -115,7 +115,7 @@ QUERY id: 0
                     LIST id: 17, nodes: 2
                       COLUMN id: 14, column_name: id, result_type: UInt32, source_id: 3
                       CONSTANT id: 18, constant_value: UInt64_3, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE (date1 >= \'1994-01-01\') AND ((id >= 1) AND (id <= 3))
@@ -149,7 +149,7 @@ QUERY id: 0
                     LIST id: 17, nodes: 2
                       COLUMN id: 14, column_name: id, result_type: UInt32, source_id: 3
                       CONSTANT id: 18, constant_value: UInt64_3, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE (date1 < \'1994-01-01\') AND ((id >= 1) AND (id <= 3))
@@ -183,7 +183,7 @@ QUERY id: 0
                     LIST id: 17, nodes: 2
                       COLUMN id: 14, column_name: id, result_type: UInt32, source_id: 3
                       CONSTANT id: 18, constant_value: UInt64_3, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE (date1 >= \'1993-01-01\') AND ((id >= 1) AND (id <= 3))
@@ -217,7 +217,7 @@ QUERY id: 0
                     LIST id: 17, nodes: 2
                       COLUMN id: 14, column_name: id, result_type: UInt32, source_id: 3
                       CONSTANT id: 18, constant_value: UInt64_3, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE ((date1 >= \'1993-01-01\') AND (date1 < \'1998-01-01\')) AND ((id >= 1) AND (id <= 3))
@@ -259,7 +259,7 @@ QUERY id: 0
                     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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE (((date1 >= \'1993-01-01\') AND (date1 < \'1994-01-01\')) OR ((date1 >= \'1994-01-01\') AND (date1 < \'1995-01-01\'))) AND ((id >= 1) AND (id <= 3))
@@ -317,7 +317,7 @@ QUERY id: 0
                     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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT
     value1,
     toYear(date1) AS year1
@@ -366,7 +366,7 @@ QUERY id: 0
                     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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE (date1 < \'1993-01-01\') AND ((id >= 1) AND (id <= 3))
@@ -400,7 +400,7 @@ QUERY id: 0
                     LIST id: 17, nodes: 2
                       COLUMN id: 14, column_name: id, result_type: UInt32, source_id: 3
                       CONSTANT id: 18, constant_value: UInt64_3, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 PREWHERE (date1 >= \'1993-01-01\') AND (date1 < \'1994-01-01\')
@@ -441,7 +441,7 @@ QUERY id: 0
               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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE ((id >= 1) AND (id <= 3)) AND ((date1 >= \'1993-01-01\') AND (date1 < \'1994-01-01\'))
@@ -481,7 +481,7 @@ QUERY id: 0
               LIST id: 20, nodes: 2
                 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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE (toYYYYMM(date1) = 199300) AND ((id >= 1) AND (id <= 3))
@@ -518,7 +518,7 @@ QUERY id: 0
                     LIST id: 19, nodes: 2
                       COLUMN id: 16, column_name: id, result_type: UInt32, source_id: 3
                       CONSTANT id: 20, constant_value: UInt64_3, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE (toYYYYMM(date1) = 199313) AND ((id >= 1) AND (id <= 3))
@@ -555,7 +555,7 @@ QUERY id: 0
                     LIST id: 19, nodes: 2
                       COLUMN id: 16, column_name: id, result_type: UInt32, source_id: 3
                       CONSTANT id: 20, constant_value: UInt64_3, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE ((date1 >= \'1993-12-01\') AND (date1 < \'1994-01-01\')) AND ((id >= 1) AND (id <= 3))
@@ -597,7 +597,7 @@ QUERY id: 0
                     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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE ((date1 >= \'1992-03-01\') AND (date1 < \'1992-04-01\')) AND ((id >= 1) AND (id <= 3))
@@ -639,7 +639,7 @@ QUERY id: 0
                     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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE ((date1 < \'1992-03-01\') OR (date1 >= \'1992-04-01\')) AND ((id >= 1) AND (id <= 3))
@@ -681,7 +681,7 @@ QUERY id: 0
                     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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE (date1 < \'1992-03-01\') AND ((id >= 1) AND (id <= 3))
@@ -715,7 +715,7 @@ QUERY id: 0
                     LIST id: 17, nodes: 2
                       COLUMN id: 14, column_name: id, result_type: UInt32, source_id: 3
                       CONSTANT id: 18, constant_value: UInt64_3, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE (date1 >= \'1992-04-01\') AND ((id >= 1) AND (id <= 3))
@@ -749,7 +749,7 @@ QUERY id: 0
                     LIST id: 17, nodes: 2
                       COLUMN id: 14, column_name: id, result_type: UInt32, source_id: 3
                       CONSTANT id: 18, constant_value: UInt64_3, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE (date1 < \'1992-04-01\') AND ((id >= 1) AND (id <= 3))
@@ -783,7 +783,7 @@ QUERY id: 0
                     LIST id: 17, nodes: 2
                       COLUMN id: 14, column_name: id, result_type: UInt32, source_id: 3
                       CONSTANT id: 18, constant_value: UInt64_3, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE (date1 >= \'1992-03-01\') AND ((id >= 1) AND (id <= 3))
@@ -817,7 +817,7 @@ QUERY id: 0
                     LIST id: 17, nodes: 2
                       COLUMN id: 14, column_name: id, result_type: UInt32, source_id: 3
                       CONSTANT id: 18, constant_value: UInt64_3, constant_value_type: UInt8
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
 WHERE ((date1 >= \'1992-03-01\') OR ((date1 >= \'1993-01-01\') AND (date1 < \'1994-01-01\'))) AND ((id >= 1) AND (id <= 3))
@@ -867,7 +867,7 @@ QUERY id: 0
                     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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM datetime_t
 WHERE ((date1 >= \'1993-01-01 00:00:00\') AND (date1 < \'1994-01-01 00:00:00\')) AND ((id >= 1) AND (id <= 3))
@@ -909,7 +909,7 @@ QUERY id: 0
                     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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM datetime_t
 WHERE ((date1 >= \'1993-12-01 00:00:00\') AND (date1 < \'1994-01-01 00:00:00\')) AND ((id >= 1) AND (id <= 3))
@@ -951,7 +951,7 @@ QUERY id: 0
                     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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date32_t
 WHERE ((date1 >= \'1993-01-01\') AND (date1 < \'1994-01-01\')) AND ((id >= 1) AND (id <= 3))
@@ -993,7 +993,7 @@ QUERY id: 0
                     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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date32_t
 WHERE ((date1 >= \'1993-12-01\') AND (date1 < \'1994-01-01\')) AND ((id >= 1) AND (id <= 3))
@@ -1035,7 +1035,7 @@ QUERY id: 0
                     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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM datetime64_t
 WHERE ((date1 >= \'1993-01-01 00:00:00\') AND (date1 < \'1994-01-01 00:00:00\')) AND ((id >= 1) AND (id <= 3))
@@ -1077,7 +1077,7 @@ QUERY id: 0
                     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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM datetime64_t
 WHERE ((date1 >= \'1993-12-01 00:00:00\') AND (date1 < \'1994-01-01 00:00:00\')) AND ((id >= 1) AND (id <= 3))
@@ -1119,4 +1119,4 @@ QUERY id: 0
                     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 enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
diff --git a/tests/queries/0_stateless/02785_date_predicate_optimizations_ast_query_tree_rewrite.sql b/tests/queries/0_stateless/02785_date_predicate_optimizations_ast_query_tree_rewrite.sql
index 5ff62cb4bb3..9cc8dd74e5d 100644
--- a/tests/queries/0_stateless/02785_date_predicate_optimizations_ast_query_tree_rewrite.sql
+++ b/tests/queries/0_stateless/02785_date_predicate_optimizations_ast_query_tree_rewrite.sql
@@ -2,74 +2,74 @@ DROP TABLE IF EXISTS date_t;
 CREATE TABLE date_t (id UInt32, value1 String, date1 Date) ENGINE ReplacingMergeTree() ORDER BY id;
 
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE toYear(date1) = 1993 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYear(date1) = 1993 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYear(date1) = 1993 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE toYear(date1) <> 1993 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYear(date1) <> 1993 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYear(date1) <> 1993 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE toYear(date1) < 1993 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYear(date1) < 1993 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYear(date1) < 1993 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE toYear(date1) > 1993 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYear(date1) > 1993 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYear(date1) > 1993 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE toYear(date1) <= 1993 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYear(date1) <= 1993 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYear(date1) <= 1993 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE toYear(date1) >= 1993 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYear(date1) >= 1993 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYear(date1) >= 1993 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE toYear(date1) BETWEEN 1993 AND 1997 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYear(date1) BETWEEN 1993 AND 1997 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYear(date1) BETWEEN 1993 AND 1997 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE (toYear(date1) = 1993 OR toYear(date1) = 1994) AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE (toYear(date1) = 1993 OR toYear(date1) = 1994) AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE (toYear(date1) = 1993 OR toYear(date1) = 1994) AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1, toYear(date1) as year1 FROM date_t WHERE year1 = 1993 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1, toYear(date1) as year1 FROM date_t WHERE year1 = 1993 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1, toYear(date1) as year1 FROM date_t WHERE year1 = 1993 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE 1993 > toYear(date1) AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE 1993 > toYear(date1) AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE 1993 > toYear(date1) AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t PREWHERE toYear(date1) = 1993 WHERE id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t PREWHERE toYear(date1) = 1993 WHERE id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t PREWHERE toYear(date1) = 1993 WHERE id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE id BETWEEN 1 AND 3 HAVING toYear(date1) = 1993;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE id BETWEEN 1 AND 3 HAVING toYear(date1) = 1993 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE id BETWEEN 1 AND 3 HAVING toYear(date1) = 1993 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE toYYYYMM(date1) = 199300 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) = 199300 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) = 199300 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE toYYYYMM(date1) = 199313 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) = 199313 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) = 199313 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE toYYYYMM(date1) = 199312 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) = 199312 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) = 199312 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE toYYYYMM(date1) = 199203 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) = 199203 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) = 199203 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE toYYYYMM(date1) <> 199203 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) <> 199203 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) <> 199203 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE toYYYYMM(date1) < 199203 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) < 199203 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) < 199203 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE toYYYYMM(date1) > 199203 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) > 199203 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) > 199203 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE toYYYYMM(date1) <= 199203 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) <= 199203 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) <= 199203 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE toYYYYMM(date1) >= 199203 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) >= 199203 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE toYYYYMM(date1) >= 199203 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date_t WHERE (toYYYYMM(date1) >= 199203 OR toYear(date1) = 1993) AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE (toYYYYMM(date1) >= 199203 OR toYear(date1) = 1993) AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date_t WHERE (toYYYYMM(date1) >= 199203 OR toYear(date1) = 1993) AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 DROP TABLE date_t;
 
 DROP TABLE IF EXISTS datetime_t;
 CREATE TABLE datetime_t (id UInt32, value1 String, date1 Datetime) ENGINE ReplacingMergeTree() ORDER BY id;
 
 EXPLAIN SYNTAX SELECT value1 FROM datetime_t WHERE toYear(date1) = 1993 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM datetime_t WHERE toYear(date1) = 1993 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM datetime_t WHERE toYear(date1) = 1993 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM datetime_t WHERE toYYYYMM(date1) = 199312 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM datetime_t WHERE toYYYYMM(date1) = 199312 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM datetime_t WHERE toYYYYMM(date1) = 199312 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 DROP TABLE datetime_t;
 
 DROP TABLE IF EXISTS date32_t;
 CREATE TABLE date32_t (id UInt32, value1 String, date1 Date32) ENGINE ReplacingMergeTree() ORDER BY id;
 
 EXPLAIN SYNTAX SELECT value1 FROM date32_t WHERE toYear(date1) = 1993 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date32_t WHERE toYear(date1) = 1993 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date32_t WHERE toYear(date1) = 1993 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM date32_t WHERE toYYYYMM(date1) = 199312 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date32_t WHERE toYYYYMM(date1) = 199312 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM date32_t WHERE toYYYYMM(date1) = 199312 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 DROP TABLE date32_t;
 
 DROP TABLE IF EXISTS datetime64_t;
 CREATE TABLE datetime64_t (id UInt32, value1 String, date1 Datetime64) ENGINE ReplacingMergeTree() ORDER BY id;
 
 EXPLAIN SYNTAX SELECT value1 FROM datetime64_t WHERE toYear(date1) = 1993 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM datetime64_t WHERE toYear(date1) = 1993 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM datetime64_t WHERE toYear(date1) = 1993 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 EXPLAIN SYNTAX SELECT value1 FROM datetime64_t WHERE toYYYYMM(date1) = 199312 AND id BETWEEN 1 AND 3;
-EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM datetime64_t WHERE toYYYYMM(date1) = 199312 AND id BETWEEN 1 AND 3 SETTINGS enable_analyzer=1;
+EXPLAIN QUERY TREE run_passes=1 SELECT value1 FROM datetime64_t WHERE toYYYYMM(date1) = 199312 AND id BETWEEN 1 AND 3 SETTINGS allow_experimental_analyzer=1;
 DROP TABLE datetime64_t;
diff --git a/tests/queries/0_stateless/02786_max_execution_time_leaf.sql b/tests/queries/0_stateless/02786_max_execution_time_leaf.sql
index 2e4623f4ac6..f678c913b46 100644
--- a/tests/queries/0_stateless/02786_max_execution_time_leaf.sql
+++ b/tests/queries/0_stateless/02786_max_execution_time_leaf.sql
@@ -1,5 +1,4 @@
 -- Tags: no-fasttest
-SET max_rows_to_read = 0;
 SELECT count() FROM cluster('test_cluster_two_shards', view( SELECT * FROM numbers(100000000000) )) SETTINGS max_execution_time_leaf = 1; -- { serverError TIMEOUT_EXCEEDED }
 -- Can return partial result
 SELECT count() FROM cluster('test_cluster_two_shards', view( SELECT * FROM numbers(100000000000) )) FORMAT Null SETTINGS max_execution_time_leaf = 1, timeout_overflow_mode_leaf = 'break';
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 5a37d51233d..751b2798243 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
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-fasttest, no-random-settings, no-replicated-database, no-distributed-cache
+# Tags: no-fasttest, no-random-settings, no-replicated-database
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -14,59 +14,43 @@ SETTINGS disk = 's3_disk', min_bytes_for_wide_part = 0;
 
 INSERT INTO test_s3 SELECT number, number FROM numbers_mt(1e7);
 "
-
-# This (reusing connections from the pool) is not guaranteed to always happen,
-# (due to random time difference between the queries and random activity in parallel)
-# but should happen most of the time.
-
-while true
-do
-    query="SELECT a, b FROM test_s3"
-    query_id=$(${CLICKHOUSE_CLIENT} --query "select queryID() from ($query) limit 1" 2>&1)
-    ${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS"
-
-    RES=$(${CLICKHOUSE_CLIENT} -nm --query "
-    SELECT ProfileEvents['DiskConnectionsPreserved'] > 0
-    FROM system.query_log
-    WHERE type = 'QueryFinish'
-        AND current_database = currentDatabase()
-        AND query_id='$query_id';
-    ")
-
-    [[ $RES -eq 1 ]] && echo "$RES" && break;
-done
+query="SELECT a, b FROM test_s3"
+query_id=$(${CLICKHOUSE_CLIENT} --query "select queryID() from ($query) limit 1" 2>&1)
+${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS"
+${CLICKHOUSE_CLIENT} -nm --query "
+SELECT ProfileEvents['DiskConnectionsPreserved'] > 0
+FROM system.query_log
+WHERE type = 'QueryFinish'
+    AND current_database = currentDatabase()
+    AND query_id='$query_id';
+"
 
 
 # Test connection pool in ReadWriteBufferFromHTTP
 
-while true
-do
-    query_id=$(${CLICKHOUSE_CLIENT} -nq "
-    create table mut (n int, m int, k int) engine=ReplicatedMergeTree('/test/02441/{database}/mut', '1') order by n;
-    set insert_keeper_fault_injection_probability=0;
-    insert into mut values (1, 2, 3), (10, 20, 30);
+query_id=$(${CLICKHOUSE_CLIENT} -nq "
+create table mut (n int, m int, k int) engine=ReplicatedMergeTree('/test/02441/{database}/mut', '1') order by n;
+set insert_keeper_fault_injection_probability=0;
+insert into mut values (1, 2, 3), (10, 20, 30);
 
-    system stop merges mut;
-    alter table mut delete where n = 10;
+system stop merges mut;
+alter table mut delete where n = 10;
 
-    select queryID() from(
-        -- a funny way to wait for a MUTATE_PART to be assigned
-        select sleepEachRow(2) from url('http://localhost:8123/?param_tries={1..10}&query=' || encodeURLComponent(
-            'select 1 where ''MUTATE_PART'' not in (select type from system.replication_queue where database=''' || currentDatabase() || ''' and table=''mut'')'
-            ), 'LineAsString', 's String')
-        -- queryID() will be returned for each row, since the query above doesn't return anything we need to return a fake row
-        union all
-        select 1
-    ) limit 1 settings max_threads=1;
-    " 2>&1)
-    ${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS"
-    RES=$(${CLICKHOUSE_CLIENT} -nm --query "
-    SELECT ProfileEvents['StorageConnectionsPreserved'] > 0
-    FROM system.query_log
-    WHERE type = 'QueryFinish'
-        AND current_database = currentDatabase()
-        AND query_id='$query_id';
-    ")
-
-    [[ $RES -eq 1 ]] && echo "$RES" && break;
-done
+select queryID() from(
+    -- a funny way to wait for a MUTATE_PART to be assigned
+    select sleepEachRow(2) from url('http://localhost:8123/?param_tries={1..10}&query=' || encodeURLComponent(
+        'select 1 where ''MUTATE_PART'' not in (select type from system.replication_queue where database=''' || currentDatabase() || ''' and table=''mut'')'
+        ), 'LineAsString', 's String')
+    -- queryID() will be returned for each row, since the query above doesn't return anything we need to return a fake row
+    union all
+    select 1
+) limit 1 settings max_threads=1;
+" 2>&1)
+${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS"
+${CLICKHOUSE_CLIENT} -nm --query "
+SELECT ProfileEvents['StorageConnectionsPreserved'] > 0
+FROM system.query_log
+WHERE type = 'QueryFinish'
+    AND current_database = currentDatabase()
+    AND query_id='$query_id';
+"
diff --git a/tests/queries/0_stateless/02790_async_queries_in_query_log.reference b/tests/queries/0_stateless/02790_async_queries_in_query_log.reference
index 84254cc8735..567e8d4f4b5 100644
--- a/tests/queries/0_stateless/02790_async_queries_in_query_log.reference
+++ b/tests/queries/0_stateless/02790_async_queries_in_query_log.reference
@@ -9,7 +9,7 @@ written_rows:   0
 written_bytes:  0
 result_rows:    0
 result_bytes:   0
-query:          INSERT INTO default.async_insert_landing (id) SETTINGS wait_for_async_insert = 1, async_insert = 1 FORMAT Values
+query:          INSERT INTO default.async_insert_landing SETTINGS wait_for_async_insert = 1, async_insert = 1 FORMAT Values
 query_kind:     AsyncInsertFlush
 databases:      ['default']
 tables:         ['default.async_insert_landing']
@@ -26,7 +26,7 @@ written_rows:   4
 written_bytes:  16
 result_rows:    4
 result_bytes:   16
-query:          INSERT INTO default.async_insert_landing (id) SETTINGS wait_for_async_insert = 1, async_insert = 1 FORMAT Values
+query:          INSERT INTO default.async_insert_landing SETTINGS wait_for_async_insert = 1, async_insert = 1 FORMAT Values
 query_kind:     AsyncInsertFlush
 databases:      ['default']
 tables:         ['default.async_insert_landing']
@@ -54,7 +54,7 @@ written_rows:   0
 written_bytes:  0
 result_rows:    0
 result_bytes:   0
-query:          INSERT INTO default.async_insert_landing (id) SETTINGS wait_for_async_insert = 1, async_insert = 1 FORMAT Values
+query:          INSERT INTO default.async_insert_landing SETTINGS wait_for_async_insert = 1, async_insert = 1 FORMAT Values
 query_kind:     AsyncInsertFlush
 databases:      ['default']
 tables:         ['default.async_insert_landing','default.async_insert_target']
@@ -71,7 +71,7 @@ written_rows:   6
 written_bytes:  24
 result_rows:    6
 result_bytes:   24
-query:          INSERT INTO default.async_insert_landing (id) SETTINGS wait_for_async_insert = 1, async_insert = 1 FORMAT Values
+query:          INSERT INTO default.async_insert_landing SETTINGS wait_for_async_insert = 1, async_insert = 1 FORMAT Values
 query_kind:     AsyncInsertFlush
 databases:      ['default']
 tables:         ['default.async_insert_landing','default.async_insert_target']
@@ -118,7 +118,7 @@ written_rows:   0
 written_bytes:  0
 result_rows:    0
 result_bytes:   0
-query:          INSERT INTO default.async_insert_landing (id) SETTINGS wait_for_async_insert = 1, async_insert = 1 FORMAT Values
+query:          INSERT INTO default.async_insert_landing SETTINGS wait_for_async_insert = 1, async_insert = 1 FORMAT Values
 query_kind:     AsyncInsertFlush
 databases:      ['default']
 tables:         ['default.async_insert_landing','default.async_insert_target']
@@ -135,7 +135,7 @@ written_rows:   3
 written_bytes:  12
 result_rows:    0
 result_bytes:   0
-query:          INSERT INTO default.async_insert_landing (id) SETTINGS wait_for_async_insert = 1, async_insert = 1 FORMAT Values
+query:          INSERT INTO default.async_insert_landing SETTINGS wait_for_async_insert = 1, async_insert = 1 FORMAT Values
 query_kind:     AsyncInsertFlush
 databases:      ['default']
 tables:         ['default.async_insert_landing','default.async_insert_target']
diff --git a/tests/queries/0_stateless/02792_drop_projection_lwd.sql b/tests/queries/0_stateless/02792_drop_projection_lwd.sql
index dad7f7cd028..dcde7dcc600 100644
--- a/tests/queries/0_stateless/02792_drop_projection_lwd.sql
+++ b/tests/queries/0_stateless/02792_drop_projection_lwd.sql
@@ -7,7 +7,7 @@ CREATE TABLE t_projections_lwd (a UInt32, b UInt32, PROJECTION p (SELECT * ORDER
 INSERT INTO t_projections_lwd SELECT number, number FROM numbers(100);
 
 -- LWD does not work, as expected
-DELETE FROM t_projections_lwd WHERE a = 1; -- { serverError SUPPORT_IS_DISABLED }
+DELETE FROM t_projections_lwd WHERE a = 1; -- { serverError NOT_IMPLEMENTED }
 KILL MUTATION WHERE database = currentDatabase() AND table = 't_projections_lwd' SYNC FORMAT Null;
 
 -- drop projection
diff --git a/tests/queries/0_stateless/02803_remote_cannot_clone_block.sql b/tests/queries/0_stateless/02803_remote_cannot_clone_block.sql
index dd72b990445..6d79aa76d18 100644
--- a/tests/queries/0_stateless/02803_remote_cannot_clone_block.sql
+++ b/tests/queries/0_stateless/02803_remote_cannot_clone_block.sql
@@ -6,7 +6,7 @@ SELECT *
 FROM system.numbers
 LIMIT 10000;
 
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 
 SELECT *
 FROM
diff --git a/tests/queries/0_stateless/02805_distributed_queries_timeouts.reference b/tests/queries/0_stateless/02805_distributed_queries_timeouts.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/02805_distributed_queries_timeouts.sql b/tests/queries/0_stateless/02805_distributed_queries_timeouts.sql
deleted file mode 100644
index 98aeac36243..00000000000
--- a/tests/queries/0_stateless/02805_distributed_queries_timeouts.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- Tags: no-fasttest
--- no-fasttest: Timeouts are slow
-create table dist as system.one engine=Distributed(test_shard_localhost, system, one);
-select sleep(8) from dist settings function_sleep_max_microseconds_per_block=8e9, prefer_localhost_replica=0, receive_timeout=7, async_socket_for_remote=0, use_hedged_requests=1 format Null;
-select sleep(8) from dist settings function_sleep_max_microseconds_per_block=8e9, prefer_localhost_replica=0, receive_timeout=7, async_socket_for_remote=1, use_hedged_requests=0 format Null;
-select sleep(8) from dist settings function_sleep_max_microseconds_per_block=8e9, prefer_localhost_replica=0, receive_timeout=7, async_socket_for_remote=0, use_hedged_requests=0 format Null;
diff --git a/tests/queries/0_stateless/02807_lower_utf8_msan.sql b/tests/queries/0_stateless/02807_lower_utf8_msan.sql
index 95f224577f7..e9eb18bf615 100644
--- a/tests/queries/0_stateless/02807_lower_utf8_msan.sql
+++ b/tests/queries/0_stateless/02807_lower_utf8_msan.sql
@@ -1,5 +1,2 @@
--- Tags: no-fasttest
--- no-fasttest: upper/lowerUTF8 use ICU
-
 SELECT lowerUTF8(arrayJoin(['©--------------------------------------', '©--------------------'])) ORDER BY 1;
 SELECT upperUTF8(materialize('aaaaАБВГaaaaaaaaaaaaАБВГAAAAaaAA')) FROM numbers(2);
diff --git a/tests/queries/0_stateless/02808_custom_disk_with_user_defined_name.sh b/tests/queries/0_stateless/02808_custom_disk_with_user_defined_name.sh
index 63fa60bd548..333bc1bc25d 100755
--- a/tests/queries/0_stateless/02808_custom_disk_with_user_defined_name.sh
+++ b/tests/queries/0_stateless/02808_custom_disk_with_user_defined_name.sh
@@ -13,7 +13,7 @@ DROP TABLE IF EXISTS test;
 CREATE TABLE test (a Int32, b String)
 ENGINE = MergeTree() ORDER BY tuple()
 SETTINGS disk = disk(name = 's3_disk', type = cache, max_size = '100Ki', path = ${CLICKHOUSE_TEST_UNIQUE_NAME}, disk = s3_disk);
-""" 2>&1 | grep -q "Disk \`s3_disk\` already exists and is described by the config" && echo 'OK' || echo 'FAIL'
+""" 2>&1 | grep -q "Disk with name \`s3_disk\` already exist" && echo 'OK' || echo 'FAIL'
 
 disk_name="${CLICKHOUSE_TEST_UNIQUE_NAME}"
 
diff --git a/tests/queries/0_stateless/02812_bug_with_unused_join_columns.sql b/tests/queries/0_stateless/02812_bug_with_unused_join_columns.sql
index d791b8f3367..6c801b5b73e 100644
--- a/tests/queries/0_stateless/02812_bug_with_unused_join_columns.sql
+++ b/tests/queries/0_stateless/02812_bug_with_unused_join_columns.sql
@@ -1 +1 @@
-SELECT concat(func.name, comb.name) AS x FROM system.functions AS func JOIN system.aggregate_function_combinators AS comb using name WHERE is_aggregate settings enable_analyzer=1;
+SELECT concat(func.name, comb.name) AS x FROM system.functions AS func JOIN system.aggregate_function_combinators AS comb using name WHERE is_aggregate settings allow_experimental_analyzer=1;
diff --git a/tests/queries/0_stateless/02814_currentDatabase_for_table_functions.reference b/tests/queries/0_stateless/02814_currentDatabase_for_table_functions.reference
index 20b14d9a67b..7ff95106d3d 100644
--- a/tests/queries/0_stateless/02814_currentDatabase_for_table_functions.reference
+++ b/tests/queries/0_stateless/02814_currentDatabase_for_table_functions.reference
@@ -11,12 +11,7 @@ CREATE VIEW number_view as SELECT * FROM numbers(10) as tb;
 CREATE MATERIALIZED VIEW null_mv Engine = Log AS SELECT * FROM null_table LEFT JOIN number_view as tb USING number;
 CREATE TABLE null_table_buffer (number UInt64) ENGINE = Buffer(currentDatabase(), null_table, 1, 1, 1, 100, 200, 10000, 20000);
 INSERT INTO null_table_buffer VALUES (1);
--- OPTIMIZE query should flush Buffer table, but still it is not guaranteed
--- (see the comment StorageBuffer::optimize)
--- But the combination of OPTIMIZE + sleep + OPTIMIZE should be enough.
-OPTIMIZE TABLE null_table_buffer;
-SELECT sleep(1) FORMAT Null;
-OPTIMIZE TABLE null_table_buffer;
+SELECT sleep(3) FORMAT Null;
 -- Insert about should've landed into `null_mv`
 SELECT count() FROM null_mv;
 1
diff --git a/tests/queries/0_stateless/02814_currentDatabase_for_table_functions.sql b/tests/queries/0_stateless/02814_currentDatabase_for_table_functions.sql
index 8b1e3ba1e10..74b5cf5f432 100644
--- a/tests/queries/0_stateless/02814_currentDatabase_for_table_functions.sql
+++ b/tests/queries/0_stateless/02814_currentDatabase_for_table_functions.sql
@@ -13,13 +13,7 @@ CREATE MATERIALIZED VIEW null_mv Engine = Log AS SELECT * FROM null_table LEFT J
 
 CREATE TABLE null_table_buffer (number UInt64) ENGINE = Buffer(currentDatabase(), null_table, 1, 1, 1, 100, 200, 10000, 20000);
 INSERT INTO null_table_buffer VALUES (1);
-
--- OPTIMIZE query should flush Buffer table, but still it is not guaranteed
--- (see the comment StorageBuffer::optimize)
--- But the combination of OPTIMIZE + sleep + OPTIMIZE should be enough.
-OPTIMIZE TABLE null_table_buffer;
-SELECT sleep(1) FORMAT Null;
-OPTIMIZE TABLE null_table_buffer;
+SELECT sleep(3) FORMAT Null;
 
 -- Insert about should've landed into `null_mv`
 SELECT count() FROM null_mv;
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
index dfb885f5a69..ca03cbb6f9f 100644
--- 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
@@ -1,4 +1,4 @@
-set enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 set optimize_move_functions_out_of_any = 0;
 
 SELECT 'set optimize_aggregators_of_group_by_keys = 1';
diff --git a/tests/queries/0_stateless/02815_join_algorithm_setting.sql b/tests/queries/0_stateless/02815_join_algorithm_setting.sql
index 4a5ae784b31..a8733eebc91 100644
--- a/tests/queries/0_stateless/02815_join_algorithm_setting.sql
+++ b/tests/queries/0_stateless/02815_join_algorithm_setting.sql
@@ -104,9 +104,9 @@ JOIN ( SELECT k AS key, k + 100 AS key2 FROM t2 ) AS t2 ON t1.key = t2.key OR t1
 -- But for CROSS choose `hash` algorithm even though it's not enabled
 SELECT * FROM ( SELECT number AS key, number * 10 AS key2 FROM numbers_mt(10) ) AS t1
 CROSS JOIN ( SELECT k AS key, k + 100 AS key2 FROM t2 ) AS t2 FORMAT Null
-SETTINGS enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
 
 -- ... (not for old analyzer)
 SELECT * FROM ( SELECT number AS key, number * 10 AS key2 FROM numbers_mt(10) ) AS t1
 CROSS JOIN ( SELECT k AS key, k + 100 AS key2 FROM t2 ) AS t2 FORMAT Null
-SETTINGS enable_analyzer = 0; -- { serverError NOT_IMPLEMENTED }
+SETTINGS allow_experimental_analyzer = 0; -- { serverError NOT_IMPLEMENTED }
diff --git a/tests/queries/0_stateless/02815_no_throw_in_simple_queries.sh b/tests/queries/0_stateless/02815_no_throw_in_simple_queries.sh
index 18ffc9dfec3..68c55f9b66a 100755
--- a/tests/queries/0_stateless/02815_no_throw_in_simple_queries.sh
+++ b/tests/queries/0_stateless/02815_no_throw_in_simple_queries.sh
@@ -19,7 +19,7 @@ $CLICKHOUSE_CLIENT --query "SHOW TABLES" || echo "Failed"
 $CLICKHOUSE_CLIENT --query "SELECT * FROM system.tables WHERE database = currentDatabase() FORMAT Null" || echo "Failed"
 
 # Multi queries are ok:
-$CLICKHOUSE_LOCAL "SELECT 1; SELECT 2;" || echo "Failed"
+$CLICKHOUSE_LOCAL --multiquery "SELECT 1; SELECT 2;" || echo "Failed"
 
 # It can run in interactive mode:
 function run()
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 e2afc1d208c..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
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 query_id="${CLICKHOUSE_DATABASE}_min_max_allocation_size_$RANDOM$RANDOM"
-${CLICKHOUSE_CLIENT} --query_id="$query_id" --memory_profiler_sample_min_allocation_size=4096 --memory_profiler_sample_max_allocation_size=16384 --log_queries=1 --max_threads=1 --max_untracked_memory=0 --memory_profiler_sample_probability=1 --query "select randomPrintableASCII(number) from numbers(1000) FORMAT Null"
+${CLICKHOUSE_CLIENT} --query_id="$query_id" --memory_profiler_sample_min_allocation_size=4096 --memory_profiler_sample_max_allocation_size=8192 --log_queries=1 --max_threads=1 --max_untracked_memory=0 --memory_profiler_sample_probability=1 --query "select randomPrintableASCII(number) from numbers(1000) FORMAT Null"
 
 ${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS"
 
@@ -14,4 +14,4 @@ ${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS"
 ${CLICKHOUSE_CLIENT} --query "SELECT countDistinct(abs(size)) > 0 FROM system.trace_log where query_id='$query_id' and trace_type = 'MemorySample'"
 
 # show wrong allocations
-${CLICKHOUSE_CLIENT} --query "SELECT abs(size) FROM system.trace_log where query_id='$query_id' and trace_type = 'MemorySample' and (abs(size) > 16384 or abs(size) < 4096)"
+${CLICKHOUSE_CLIENT} --query "SELECT abs(size) FROM system.trace_log where query_id='$query_id' and trace_type = 'MemorySample' and (abs(size) > 8192 or abs(size) < 4096)"
diff --git a/tests/queries/0_stateless/02832_alter_max_sessions_for_user.reference b/tests/queries/0_stateless/02832_alter_max_sessions_for_user.reference
index c2e103d61cb..f80f8738ff8 100644
--- a/tests/queries/0_stateless/02832_alter_max_sessions_for_user.reference
+++ b/tests/queries/0_stateless/02832_alter_max_sessions_for_user.reference
@@ -1,7 +1,8 @@
-test_alter_profile case: max_sessions_for_user 1
-USER_SESSION_LIMIT_EXCEEDED
-test_alter_profile case: max_sessions_for_user 2
+test_alter_profile case: max_session_count 1 alter_sessions_count 1
+test_alter_profile case: max_session_count 2 alter_sessions_count 1
 USER_SESSION_LIMIT_EXCEEDED
+test_alter_profile case: max_session_count 1 alter_sessions_count 2
+test_alter_profile case: max_session_count 2 alter_sessions_count 2
 READONLY
 READONLY
 READONLY
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 55f9e3e97a4..87fbffdb1e6 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
@@ -5,6 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+SESSION_ID_PREFIX="02832_alter_max_sessions_session_$$"
 QUERY_ID_PREFIX="02832_alter_max_sessions_query_$$"
 PROFILE="02832_alter_max_sessions_profile_$$"
 USER="02832_alter_max_sessions_user_$$"
@@ -16,41 +17,48 @@ ${CLICKHOUSE_CLIENT} -q $"DROP PROFILE IF EXISTS ${PROFILE}"
 ${CLICKHOUSE_CLIENT} -q $"CREATE SETTINGS PROFILE ${PROFILE}"
 ${CLICKHOUSE_CLIENT} -q $"CREATE USER '${USER}' SETTINGS PROFILE '${PROFILE}'"
 
-function wait_for_query_to_start()
+function run_sessions_set()
 {
-    while [[ $($CLICKHOUSE_CLIENT -q "SELECT count() FROM system.processes WHERE query_id = '$1'") == 0 ]]; do sleep 0.2; done
-}
-
-function test_alter_max_sessions_for_user()
-{
-    local max_sessions_for_user="$1"
-    echo $"test_alter_profile case: max_sessions_for_user ${max_sessions_for_user}"
-
-    # Step 0: Set max_sessions_for_user.
-    ${CLICKHOUSE_CLIENT} -q $"ALTER SETTINGS PROFILE ${PROFILE} SETTINGS max_sessions_for_user = ${max_sessions_for_user}"
-
-    # Step 1: Simulaneously run `max_sessions_for_user` queries. These queries should run without any problems.
-    for ((i = 1 ; i <= max_sessions_for_user ; i++)); do
-        local query_id="${QUERY_ID_PREFIX}_${i}_${max_sessions_for_user}"
-        ${CLICKHOUSE_CLIENT} --max_block_size 1 --query_id $query_id --user $USER --function_sleep_max_microseconds_per_block=120000000 -q "SELECT sleepEachRow(0.1) FROM numbers(1200)" &>/dev/null &
-        wait_for_query_to_start $query_id
+    local sessions_count="$1"
+    local session_check="$2"
+    for ((i = 1 ; i <= ${sessions_count} ; i++)); do
+        local session_id="${SESSION_ID_PREFIX}_${i}"
+        local query_id="${QUERY_ID_PREFIX}_${i}"
+        # Write only expected error text
+        # More than alter_sessions_count queries will not start.
+        ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&user=${USER}&query_id=${query_id}&session_id=${session_id}&session_check=${session_check}&session_timeout=600&function_sleep_max_microseconds_per_block=120000000" --data-binary "SELECT sleep(120)" | grep -o  -m 1 'USER_SESSION_LIMIT_EXCEEDED' &
     done
 
-    # Step 2: Run another `max_sessions_for_user` + 1 query. That query should fail.
-    local query_id="${QUERY_ID_PREFIX}_should_fail"
-    ${CLICKHOUSE_CLIENT} --query_id $query_id --user $USER -q "SELECT 1" 2>&1 | grep -o -m 1 'USER_SESSION_LIMIT_EXCEEDED'
-    
-    # Step 3: Stop running queries launched at step 1.
-    for ((i = 1 ; i <= max_sessions_for_user ; i++)); do
-        local query_id="${QUERY_ID_PREFIX}_${i}_${max_sessions_for_user}"
-        $CLICKHOUSE_CLIENT --query "KILL QUERY WHERE query_id='$query_id' ASYNC" >/dev/null
+    for ((i = 1 ; i <= ${sessions_count} ; i++)); do
+        local query_id="${QUERY_ID_PREFIX}_${i}"
+        $CLICKHOUSE_CLIENT --query "KILL QUERY WHERE query_id='$query_id' SYNC" >/dev/null
     done
 
     wait
 }
 
-test_alter_max_sessions_for_user 1
-test_alter_max_sessions_for_user 2
+function test_alter_profile()
+{
+    local max_session_count="$1"
+    local alter_sessions_count="$2"
+    echo $"test_alter_profile case: max_session_count ${max_session_count} alter_sessions_count ${alter_sessions_count}"
+
+    ${CLICKHOUSE_CLIENT} -q $"ALTER SETTINGS PROFILE ${PROFILE} SETTINGS max_sessions_for_user = ${max_session_count}"
+
+    # Create sessions with $max_session_count restriction
+    run_sessions_set $max_session_count 0
+
+    # 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)
+    run_sessions_set $max_session_count 1
+}
+
+test_alter_profile 1 1
+test_alter_profile 2 1
+test_alter_profile 1 2
+test_alter_profile 2 2
 
 ${CLICKHOUSE_CLIENT} -q "SELECT 1 SETTINGS max_sessions_for_user = 1" 2>&1 | grep -m 1 -o 'READONLY' | head -1
 ${CLICKHOUSE_CLIENT} -q $"SET max_sessions_for_user = 1 " 2>&1 | grep -o  -m 1 'READONLY' | head -1
diff --git a/tests/queries/0_stateless/02833_concurrent_sessions.reference b/tests/queries/0_stateless/02833_concurrrent_sessions.reference
similarity index 84%
rename from tests/queries/0_stateless/02833_concurrent_sessions.reference
rename to tests/queries/0_stateless/02833_concurrrent_sessions.reference
index 904e8cefc6e..bfe507e8eac 100644
--- a/tests/queries/0_stateless/02833_concurrent_sessions.reference
+++ b/tests/queries/0_stateless/02833_concurrrent_sessions.reference
@@ -1,34 +1,34 @@
 sessions:
-45
+150
 port_0_sessions:
 0
 address_0_sessions:
 0
 tcp_sessions
-18
+60
 http_sessions
-9
+30
 http_with_session_id_sessions
-9
-mysql_sessions
-9
+30
+my_sql_sessions
+30
 Corresponding LoginSuccess/Logout
-3
+10
 LoginFailure
-3
+10
 Corresponding LoginSuccess/Logout
-3
+10
 LoginFailure
-3
+10
 Corresponding LoginSuccess/Logout
-3
+10
 LoginFailure
-3
+10
 Corresponding LoginSuccess/Logout
-3
+10
 LoginFailure
-3
+10
 Corresponding LoginSuccess/Logout
-3
+10
 LoginFailure
-3
+10
diff --git a/tests/queries/0_stateless/02833_concurrent_sessions.sh b/tests/queries/0_stateless/02833_concurrrent_sessions.sh
similarity index 77%
rename from tests/queries/0_stateless/02833_concurrent_sessions.sh
rename to tests/queries/0_stateless/02833_concurrrent_sessions.sh
index feaff3a38a3..c5b6204529b 100755
--- a/tests/queries/0_stateless/02833_concurrent_sessions.sh
+++ b/tests/queries/0_stateless/02833_concurrrent_sessions.sh
@@ -37,11 +37,11 @@ done
 # These functions try to create a session with successful login and logout.
 # Sleep a small, random amount of time to make concurrency more intense.
 # and try to login with an invalid password.
-function tcp_session()
+function tcp_session() 
 {
     local user=$1
     local i=0
-    while (( (i++) < 3 )); do
+    while (( (i++) < 10 )); do
         # login logout
         ${CLICKHOUSE_CLIENT} -q "SELECT 1, sleep(0.01${RANDOM})" --user="${user}" --password="pass"
         # login failure
@@ -49,11 +49,11 @@ function tcp_session()
     done
 }
 
-function http_session()
+function http_session() 
 {
     local user=$1
     local i=0
-    while (( (i++) < 3 )); do
+    while (( (i++) < 10 )); do
         # login logout
         ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&user=${user}&password=pass" -d "SELECT 3, sleep(0.01${RANDOM})"
 
@@ -62,11 +62,11 @@ function http_session()
     done
 }
 
-function http_with_session_id_session()
+function http_with_session_id_session() 
 {
     local user=$1
     local i=0
-    while (( (i++) < 3 )); do
+    while (( (i++) < 10 )); do
         # login logout
         ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${user}&user=${user}&password=pass" -d "SELECT 5, sleep 0.01${RANDOM}"
 
@@ -75,11 +75,11 @@ function http_with_session_id_session()
     done
 }
 
-function mysql_session()
+function mysql_session() 
 {
     local user=$1
     local i=0
-    while (( (i++) < 3 )); do
+    while (( (i++) < 10 )); do
         # login logout
         ${CLICKHOUSE_CLIENT} -q "SELECT 1, sleep(0.01${RANDOM}) FROM mysql('127.0.0.1:9004', 'system', 'one', '${user}', 'pass')"
 
@@ -97,29 +97,29 @@ export -f http_with_session_id_session;
 export -f mysql_session;
 
 for user in "${TCP_USERS[@]}"; do
-    tcp_session ${user} >/dev/null 2>&1 &
+    timeout 60s bash -c "tcp_session ${user}" >/dev/null 2>&1 &
 done
 
 for user in "${HTTP_USERS[@]}"; do
-    http_session ${user} >/dev/null 2>&1 &
+    timeout 60s bash -c "http_session ${user}" >/dev/null 2>&1 &
 done
 
 for user in "${HTTP_WITH_SESSION_ID_SESSION_USERS[@]}"; do
-    http_with_session_id_session ${user} >/dev/null 2>&1 &
+    timeout 60s bash -c "http_with_session_id_session ${user}" >/dev/null 2>&1 &
 done
 
 for user in "${MYSQL_USERS[@]}"; do
-    mysql_session ${user} >/dev/null 2>&1 &
+    timeout 60s bash -c "mysql_session ${user}" >/dev/null 2>&1 &
 done
 
 wait
 
 ${CLICKHOUSE_CLIENT} -q "SYSTEM FLUSH LOGS"
 
-echo "sessions:"
+echo "sessions:" 
 ${CLICKHOUSE_CLIENT} -q "SELECT count(*) FROM system.session_log WHERE user IN (${ALL_USERS_SQL_COLLECTION_STRING})"
 
-echo "port_0_sessions:"
+echo "port_0_sessions:" 
 ${CLICKHOUSE_CLIENT} -q "SELECT count(*) FROM system.session_log WHERE user IN (${ALL_USERS_SQL_COLLECTION_STRING}) AND client_port = 0"
 
 echo "address_0_sessions:"
@@ -131,29 +131,13 @@ echo "http_sessions"
 ${CLICKHOUSE_CLIENT} -q "SELECT count(*) FROM system.session_log WHERE user IN (${HTTP_USERS_SQL_COLLECTION_STRING}) AND interface = 'HTTP'"
 echo "http_with_session_id_sessions"
 ${CLICKHOUSE_CLIENT} -q "SELECT count(*) FROM system.session_log WHERE user IN (${HTTP_WITH_SESSION_ID_USERS_SQL_COLLECTION_STRING}) AND interface = 'HTTP'"
-echo "mysql_sessions"
+echo "my_sql_sessions"
 ${CLICKHOUSE_CLIENT} -q "SELECT count(*) FROM system.session_log WHERE user IN (${MYSQL_USERS_SQL_COLLECTION_STRING}) AND interface = 'MySQL'"
 
 for user in "${ALL_USERS[@]}"; do
     ${CLICKHOUSE_CLIENT} -q "DROP USER ${user}"
-    echo "Corresponding LoginSuccess/Logout"
-
-    # The client can exit sooner than the server records its disconnection and closes the session.
-    # When the client disconnects, two processes happen at the same time and are in the race condition:
-    # - the client application exits and returns control to the shell;
-    # - the server closes the session and records the logout event to the session log.
-    # We cannot expect that after the control is returned to the shell, the server records the logout event.
-    while true
-    do
-        [[ 3 -eq $(${CLICKHOUSE_CLIENT} -q "
-            SELECT COUNT(*) FROM (
-                SELECT ${SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = '${user}' AND type = 'LoginSuccess'
-                INTERSECT
-                SELECT ${SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = '${user}' AND type = 'Logout'
-            )") ]] && echo 3 && break;
-        sleep 0.1
-    done
-
+    echo "Corresponding LoginSuccess/Logout" 
+    ${CLICKHOUSE_CLIENT} -q "SELECT COUNT(*) FROM (SELECT ${SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = '${user}' AND type = 'LoginSuccess' INTERSECT SELECT ${SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = '${user}' AND type = 'Logout')"
     echo "LoginFailure"
-    ${CLICKHOUSE_CLIENT} -q "SELECT COUNT(*) FROM system.session_log WHERE user = '${user}' AND type = 'LoginFailure'"
+    ${CLICKHOUSE_CLIENT} -q "SELECT COUNT(*) FROM system.session_log WHERE user = '${user}' AND type = 'LoginFailure'" 
  done
diff --git a/tests/queries/0_stateless/02834_analyzer_with_statement_references.sql b/tests/queries/0_stateless/02834_analyzer_with_statement_references.sql
index ce1eaa7ae77..29ed6e3f0da 100644
--- a/tests/queries/0_stateless/02834_analyzer_with_statement_references.sql
+++ b/tests/queries/0_stateless/02834_analyzer_with_statement_references.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 WITH test_aliases AS (SELECT number FROM numbers(20)), alias2 AS (SELECT number FROM test_aliases)
 SELECT number FROM alias2 SETTINGS enable_global_with_statement = 1;
diff --git a/tests/queries/0_stateless/02834_remote_session_log.sh b/tests/queries/0_stateless/02834_remote_session_log.sh
index 0581cb36136..3bedfb6c9ee 100755
--- a/tests/queries/0_stateless/02834_remote_session_log.sh
+++ b/tests/queries/0_stateless/02834_remote_session_log.sh
@@ -44,16 +44,6 @@ for interface in 'TCP' 'HTTP' 'MySQL'
 do
     LOGIN_COUNT=`${CLICKHOUSE_CLIENT} -q "SELECT count(*) FROM system.session_log WHERE user = '${TEST_USER}' AND type = 'LoginSuccess' AND interface = '${interface}'"`
     CORRESPONDING_LOGOUT_RECORDS_COUNT=`${CLICKHOUSE_CLIENT} -q "SELECT COUNT(*) FROM (SELECT ${SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = '${TEST_USER}' AND type = 'LoginSuccess' AND interface = '${interface}' INTERSECT SELECT ${SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = '${TEST_USER}' AND type = 'Logout' AND interface = '${interface}')"`
-    # The client can exit sooner than the server records its disconnection and closes the session.
-    # When the client disconnects, two processes happen at the same time and are in the race condition:
-    # - the client application exits and returns control to the shell;
-    # - the server closes the session and records the logout event to the session log.
-    # We cannot expect that after the control is returned to the shell, the server records the logout event.
-    while [ "$LOGIN_COUNT" != "$CORRESPONDING_LOGOUT_RECORDS_COUNT" ]
-    do
-        sleep 0.1
-        CORRESPONDING_LOGOUT_RECORDS_COUNT=`${CLICKHOUSE_CLIENT} -q "SELECT COUNT(*) FROM (SELECT ${SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = '${TEST_USER}' AND type = 'LoginSuccess' AND interface = '${interface}' INTERSECT SELECT ${SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = '${TEST_USER}' AND type = 'Logout' AND interface = '${interface}')"`
-    done
 
     if [ "$LOGIN_COUNT" == "$CORRESPONDING_LOGOUT_RECORDS_COUNT" ]; then
         echo "${interface} Login and logout count is equal"
diff --git a/tests/queries/0_stateless/02835_drop_user_during_session.sh b/tests/queries/0_stateless/02835_drop_user_during_session.sh
index 01e4f9a5c2b..347ebd22f96 100755
--- a/tests/queries/0_stateless/02835_drop_user_during_session.sh
+++ b/tests/queries/0_stateless/02835_drop_user_during_session.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-debug, no-random-settings, no-random-merge-tree-settings
+# Tags: no-debug
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -24,7 +24,7 @@ function http_session()
     ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&user=${user}&password=pass" -d "SELECT COUNT(*) FROM system.numbers"
 }
 
-function http_with_session_id_session()
+function http_with_session_id_session() 
 {
     local user=$1
     ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&user=${user}&password=pass" -d "SELECT COUNT(*) FROM system.numbers"
@@ -104,27 +104,11 @@ wait
 
 ${CLICKHOUSE_CLIENT} -q "SYSTEM FLUSH LOGS"
 
-echo "port_0_sessions:"
+echo "port_0_sessions:" 
 ${CLICKHOUSE_CLIENT} -q "SELECT count(*) FROM system.session_log WHERE user = '${TEST_USER}' AND client_port = 0"
 echo "address_0_sessions:"
 ${CLICKHOUSE_CLIENT} -q "SELECT count(*) FROM system.session_log WHERE user = '${TEST_USER}' AND client_address = toIPv6('::')"
-echo "Corresponding LoginSuccess/Logout"
-
-# The client can exit sooner than the server records its disconnection and closes the session.
-# When the client disconnects, two processes happen at the same time and are in the race condition:
-# - the client application exits and returns control to the shell;
-# - the server closes the session and records the logout event to the session log.
-# We cannot expect that after the control is returned to the shell, the server records the logout event.
-while true
-do
-    [[ 9 -eq $(${CLICKHOUSE_CLIENT} -q "
-        SELECT COUNT(*) FROM (
-            SELECT ${SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = '${TEST_USER}' AND type = 'LoginSuccess'
-            INTERSECT
-            SELECT ${SESSION_LOG_MATCHING_FIELDS}, FROM system.session_log WHERE user = '${TEST_USER}' AND type = 'Logout'
-        )") ]] && echo 9 && break;
-    sleep 0.1
-done
-
+echo "Corresponding LoginSuccess/Logout" 
+${CLICKHOUSE_CLIENT} -q "SELECT COUNT(*) FROM (SELECT ${SESSION_LOG_MATCHING_FIELDS} FROM system.session_log WHERE user = '${TEST_USER}' AND type = 'LoginSuccess' INTERSECT SELECT ${SESSION_LOG_MATCHING_FIELDS}, FROM system.session_log WHERE user = '${TEST_USER}' AND type = 'Logout')"
 echo "LoginFailure"
-${CLICKHOUSE_CLIENT} -q "SELECT COUNT(*) FROM system.session_log WHERE user = '${TEST_USER}' AND type = 'LoginFailure'"
+${CLICKHOUSE_CLIENT} -q "SELECT COUNT(*) FROM system.session_log WHERE user = '${TEST_USER}' AND type = 'LoginFailure'" 
diff --git a/tests/queries/0_stateless/02835_join_step_explain.sql b/tests/queries/0_stateless/02835_join_step_explain.sql
index 1cdd3684a0b..d0475fa14b6 100644
--- a/tests/queries/0_stateless/02835_join_step_explain.sql
+++ b/tests/queries/0_stateless/02835_join_step_explain.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table_1;
 CREATE TABLE test_table_1
diff --git a/tests/queries/0_stateless/02840_merge__table_or_filter.reference b/tests/queries/0_stateless/02840_merge__table_or_filter.reference
index 21b54a0121e..ff5e0865a22 100644
--- a/tests/queries/0_stateless/02840_merge__table_or_filter.reference
+++ b/tests/queries/0_stateless/02840_merge__table_or_filter.reference
@@ -1,38 +1,38 @@
 -- { echoOn }
 
-select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') settings enable_analyzer=0, convert_query_to_cnf=0;
+select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') settings allow_experimental_analyzer=0, convert_query_to_cnf=0;
 v1	1
 v1	2
-select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') settings enable_analyzer=0, convert_query_to_cnf=0;
+select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') settings allow_experimental_analyzer=0, convert_query_to_cnf=0;
 v1	1
 v2	2
-select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v3') settings enable_analyzer=0, convert_query_to_cnf=0;
+select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v3') settings allow_experimental_analyzer=0, convert_query_to_cnf=0;
 v1	1
-select _table, key from m where (value = 10 and _table = 'v3') or (value = 20 and _table = 'v3') settings enable_analyzer=0, convert_query_to_cnf=0;
-select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') settings enable_analyzer=0, convert_query_to_cnf=1;
+select _table, key from m where (value = 10 and _table = 'v3') or (value = 20 and _table = 'v3') settings allow_experimental_analyzer=0, convert_query_to_cnf=0;
+select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') settings allow_experimental_analyzer=0, convert_query_to_cnf=1;
 v1	1
 v1	2
-select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') settings enable_analyzer=0, convert_query_to_cnf=1;
+select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') settings allow_experimental_analyzer=0, convert_query_to_cnf=1;
 v1	1
 v2	2
-select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v3') settings enable_analyzer=0, convert_query_to_cnf=1;
+select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v3') settings allow_experimental_analyzer=0, convert_query_to_cnf=1;
 v1	1
-select _table, key from m where (value = 10 and _table = 'v3') or (value = 20 and _table = 'v3') settings enable_analyzer=0, convert_query_to_cnf=1;
-select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') settings enable_analyzer=1, convert_query_to_cnf=0;
+select _table, key from m where (value = 10 and _table = 'v3') or (value = 20 and _table = 'v3') settings allow_experimental_analyzer=0, convert_query_to_cnf=1;
+select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') settings allow_experimental_analyzer=1, convert_query_to_cnf=0;
 v1	1
 v1	2
-select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') settings enable_analyzer=1, convert_query_to_cnf=0;
+select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') settings allow_experimental_analyzer=1, convert_query_to_cnf=0;
 v1	1
 v2	2
-select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v3') settings enable_analyzer=1, convert_query_to_cnf=0;
+select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v3') settings allow_experimental_analyzer=1, convert_query_to_cnf=0;
 v1	1
-select _table, key from m where (value = 10 and _table = 'v3') or (value = 20 and _table = 'v3') settings enable_analyzer=1, convert_query_to_cnf=0;
-select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') settings enable_analyzer=1, convert_query_to_cnf=1;
+select _table, key from m where (value = 10 and _table = 'v3') or (value = 20 and _table = 'v3') settings allow_experimental_analyzer=1, convert_query_to_cnf=0;
+select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') settings allow_experimental_analyzer=1, convert_query_to_cnf=1;
 v1	1
 v1	2
-select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') settings enable_analyzer=1, convert_query_to_cnf=1;
+select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') settings allow_experimental_analyzer=1, convert_query_to_cnf=1;
 v1	1
 v2	2
-select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v3') settings enable_analyzer=1, convert_query_to_cnf=1;
+select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v3') settings allow_experimental_analyzer=1, convert_query_to_cnf=1;
 v1	1
-select _table, key from m where (value = 10 and _table = 'v3') or (value = 20 and _table = 'v3') settings enable_analyzer=1, convert_query_to_cnf=1;
+select _table, key from m where (value = 10 and _table = 'v3') or (value = 20 and _table = 'v3') settings allow_experimental_analyzer=1, convert_query_to_cnf=1;
diff --git a/tests/queries/0_stateless/02840_merge__table_or_filter.sql.j2 b/tests/queries/0_stateless/02840_merge__table_or_filter.sql.j2
index f7413dc3ee6..286e4545ef7 100644
--- a/tests/queries/0_stateless/02840_merge__table_or_filter.sql.j2
+++ b/tests/queries/0_stateless/02840_merge__table_or_filter.sql.j2
@@ -27,10 +27,10 @@ select _table, key from m where (value = 10 and _table = 'v3') or (value = 20 an
 set max_threads=1;
 -- { echoOn }
 {% for settings in [
-    'enable_analyzer=0, convert_query_to_cnf=0',
-    'enable_analyzer=0, convert_query_to_cnf=1',
-    'enable_analyzer=1, convert_query_to_cnf=0',
-    'enable_analyzer=1, convert_query_to_cnf=1'
+    'allow_experimental_analyzer=0, convert_query_to_cnf=0',
+    'allow_experimental_analyzer=0, convert_query_to_cnf=1',
+    'allow_experimental_analyzer=1, convert_query_to_cnf=0',
+    'allow_experimental_analyzer=1, convert_query_to_cnf=1'
 ] %}
 select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') settings {{ settings }};
 select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') settings {{ settings }};
diff --git a/tests/queries/0_stateless/02841_local_assert.sh b/tests/queries/0_stateless/02841_local_assert.sh
index dc49007b0f6..a167c09da1f 100755
--- a/tests/queries/0_stateless/02841_local_assert.sh
+++ b/tests/queries/0_stateless/02841_local_assert.sh
@@ -7,12 +7,12 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 echo "create table test (x UInt64) engine=Memory;
-insert into test from infile 'data'; -- {clientError BAD_ARGUMENTS}" | $CLICKHOUSE_LOCAL -m 
+insert into test from infile 'data'; -- {clientError BAD_ARGUMENTS}" | $CLICKHOUSE_LOCAL -nm 
 
 echo "create table test (x UInt64) engine=Memory;
-insert into test from infile 'data';" | $CLICKHOUSE_LOCAL -m --ignore-error
+insert into test from infile 'data';" | $CLICKHOUSE_LOCAL -nm --ignore-error
 
 echo "create table test (x UInt64) engine=Memory;
 insert into test from infile 'data'; -- {clientError BAD_ARGUMENTS}
-select 1" | $CLICKHOUSE_LOCAL -m 
+select 1" | $CLICKHOUSE_LOCAL -nm 
 
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 d5a2d034014..556e2f52de2 100755
--- a/tests/queries/0_stateless/02841_not_ready_set_bug.sh
+++ b/tests/queries/0_stateless/02841_not_ready_set_bug.sh
@@ -13,7 +13,7 @@ $CLICKHOUSE_CLIENT -q "SELECT * FROM system.tables WHERE 1 in (SELECT number fro
 $CLICKHOUSE_CLIENT -q "SELECT xor(1, 0) FROM system.parts WHERE 1 IN (SELECT 1) FORMAT Null"
 
 # (Not all of these tests are effective because some of these tables are empty.)
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -nq "
     select * from system.columns where table in (select '123');
     select * from system.replicas where database in (select '123');
     select * from system.data_skipping_indices where database in (select '123');
@@ -23,7 +23,7 @@ $CLICKHOUSE_CLIENT -q "
     select * from system.replication_queue where database in (select '123');
     select * from system.distribution_queue where database in (select '123');
 "
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -nq "
     create table a (x Int8) engine MergeTree order by x;
     insert into a values (1);
     select * from mergeTreeIndex(currentDatabase(), 'a') where part_name in (select '123');
diff --git a/tests/queries/0_stateless/02841_parallel_replicas_summary.sh b/tests/queries/0_stateless/02841_parallel_replicas_summary.sh
index 01e2883c547..c82d2c8b0c0 100755
--- a/tests/queries/0_stateless/02841_parallel_replicas_summary.sh
+++ b/tests/queries/0_stateless/02841_parallel_replicas_summary.sh
@@ -27,7 +27,6 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE replicas_summary (n Int64) ENGINE = Mer
 
 query_id_base="02841_summary_$CLICKHOUSE_DATABASE"
 
-# TODO: rethink the test, for now temporary disable parallel_replicas_local_plan
 echo "
     SELECT *
     FROM replicas_summary
@@ -37,8 +36,7 @@ echo "
         cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost',
         allow_experimental_parallel_reading_from_replicas = 2,
         parallel_replicas_for_non_replicated_merge_tree = 1,
-        interactive_delay=0,
-        parallel_replicas_local_plan=0
+        interactive_delay=0
     "\
     | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&wait_end_of_query=1&query_id=${query_id_base}_interactive_0" --data-binary @- -vvv 2>&1 \
     | grep "Summary" | grep -cv '"read_rows":"0"'
@@ -52,8 +50,7 @@ echo "
         cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost',
         allow_experimental_parallel_reading_from_replicas = 2,
         parallel_replicas_for_non_replicated_merge_tree = 1,
-        interactive_delay=99999999999,
-        parallel_replicas_local_plan=0
+        interactive_delay=99999999999
     "\
     | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&wait_end_of_query=1&query_id=${query_id_base}_interactive_high" --data-binary @- -vvv 2>&1 \
     | grep "Summary" | grep -cv '"read_rows":"0"'
diff --git a/tests/queries/0_stateless/02841_parquet_filter_pushdown_bug.reference b/tests/queries/0_stateless/02841_parquet_filter_pushdown_bug.reference
deleted file mode 100644
index 6ed63af507a..00000000000
--- a/tests/queries/0_stateless/02841_parquet_filter_pushdown_bug.reference
+++ /dev/null
@@ -1 +0,0 @@
-[1,2]
diff --git a/tests/queries/0_stateless/02841_parquet_filter_pushdown_bug.sh b/tests/queries/0_stateless/02841_parquet_filter_pushdown_bug.sh
deleted file mode 100755
index 58eb207b6e6..00000000000
--- a/tests/queries/0_stateless/02841_parquet_filter_pushdown_bug.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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 f from file('$CURDIR/data_parquet/68131.parquet', Parquet, 'f Array(Int32)')"
\ No newline at end of file
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 3dda63e1e49..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,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-CH_URL_BASE="$CLICKHOUSE_URL&http_write_exception_in_output_format=1&enable_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
diff --git a/tests/queries/0_stateless/02841_with_clause_resolve.sql b/tests/queries/0_stateless/02841_with_clause_resolve.sql
index fe94a26110d..b416446461b 100644
--- a/tests/queries/0_stateless/02841_with_clause_resolve.sql
+++ b/tests/queries/0_stateless/02841_with_clause_resolve.sql
@@ -1,16 +1,16 @@
-set enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 
 WITH
     -- Input
     44100 AS sample_frequency
     , number AS tick
     , tick / sample_frequency AS time
-
+    
     -- Delay
     , (time, wave, delay_, decay, count) -> arraySum(n1 -> wave(time - delay_ * n1), range(count)) AS delay
 
     , delay(time, (time -> 0.5), 0.2, 0.5, 5) AS kick
-
+    
 SELECT
 
     kick
@@ -23,29 +23,29 @@ WITH
     44100 AS sample_frequency
     , number AS tick
     , tick / sample_frequency AS time
-
+    
     -- Output control
     , 1 AS master_volume
     , level -> least(1.0, greatest(-1.0, level)) AS clamp
     , level -> (clamp(level) * 0x7FFF * master_volume)::Int16 AS output
     , x -> (x, x) AS mono
-
+    
     -- Basic waves
     , time -> sin(time * 2 * pi()) AS sine_wave
     , time -> time::UInt64 % 2 * 2 - 1 AS square_wave
     , time -> (time - floor(time)) * 2 - 1 AS sawtooth_wave
     , time -> abs(sawtooth_wave(time)) * 2 - 1 AS triangle_wave
-
+    
     -- Helpers
     , (from, to, wave, time) -> from + ((wave(time) + 1) / 2) * (to - from) AS lfo
     , (from, to, steps, time) -> from + floor((time - floor(time)) * steps) / steps * (to - from) AS step_lfo
     , (from, to, steps, time) -> exp(step_lfo(log(from), log(to), steps, time)) AS exp_step_lfo
-
+    
     -- Noise
     , time -> cityHash64(time) / 0xFFFFFFFFFFFFFFFF AS uniform_noise
     , time -> erf(uniform_noise(time)) AS white_noise
     , time -> cityHash64(time) % 2 ? 1 : -1 AS bernoulli_noise
-
+    
     -- Distortion
     , (x, amount) -> clamp(x * amount) AS clipping
     , (x, amount) -> clamp(x > 0 ? pow(x, amount) : -pow(-x, amount)) AS power_distortion
@@ -53,10 +53,10 @@ WITH
     , (time, sample_frequency) -> round(time * sample_frequency) / sample_frequency AS desample
     , (time, wave, amount) -> (time - floor(time) < (1 - amount)) ? wave(time * (1 - amount)) : 0 AS thin
     , (time, wave, amount) -> wave(floor(time) + pow(time - floor(time), amount)) AS skew
-
+    
     -- Combining
     , (a, b, weight) -> a * (1 - weight) + b * weight AS combine
-
+    
     -- Envelopes
     , (time, offset, attack, hold, release) ->
         time < offset ? 0
@@ -64,7 +64,7 @@ WITH
         : (time < offset + attack + hold           ? 1
         : (time < offset + attack + hold + release ? (offset + attack + hold + release - time) / release
         : 0))) AS envelope
-
+    
     , (bpm, time, offset, attack, hold, release) ->
         envelope(
             time * (bpm / 60) - floor(time * (bpm / 60)),
@@ -72,20 +72,20 @@ WITH
             attack,
             hold,
             release) AS running_envelope
-
+    
     -- Sequencers
     , (sequence, time) -> sequence[1 + time::UInt64 % length(sequence)] AS sequencer
-
+    
     -- Delay
     , (time, wave, delay, decay, count) -> arraySum(n -> wave(time - delay * n) * pow(decay, n), range(count)) AS delay
-
-
+    
+    
     , delay(time, (time -> power_distortion(sine_wave(time * 80 + sine_wave(time * 2)), lfo(0.5, 1, sine_wave, time / 16))
             * running_envelope(60, time, 0, 0.0, 0.01, 0.1)),
             0.2, 0.5, 5) AS kick
-
+    
 SELECT
-
+    
     (output(
         kick +
         delay(time, (time ->
@@ -95,7 +95,7 @@ SELECT
                 lfo(1, 0.75, triangle_wave, time / 8))),
             0.2, 0.5, 10)
         * lfo(0.5, 1, triangle_wave, time / 7)
-
+    
         + delay(time, (time ->
             power_distortion(
                 sine_wave(time * sequencer([50, 100, 200, 400], time / 2) + 1 * sine_wave(time * sequencer([50, 100, 200], time / 4) + 1/4))
@@ -103,16 +103,16 @@ SELECT
                 lfo(1, 0.75, triangle_wave, time / 8))),
             0.2, 0.5, 10)
         * lfo(0.5, 1, triangle_wave, 16 + time / 11)
-
+    
         + delay(time, (time ->
             white_noise(time) * running_envelope(60, time, 0.75, 0.01, 0.01, 0.1)),
             0.2, 0.5, 10)
         * lfo(0.5, 1, triangle_wave, 24 + time / 13)
-
+    
         + sine_wave(time * 100 + 1 * sine_wave(time * 10 + 1/4))
             * running_envelope(120, time, 0, 0.01, 0.01, 0.1)
     ),
-
+    
     output(
         kick +
         delay(time + 0.01, (time ->
@@ -122,7 +122,7 @@ SELECT
                 lfo(1, 0.75, triangle_wave, time / 8))),
             0.2, 0.5, 10)
         * lfo(0.5, 1, triangle_wave, time / 7)
-
+    
         + delay(time - 0.01, (time ->
             power_distortion(
                 sine_wave(time * sequencer([50, 100, 200, 400], time / 2) + 1 * sine_wave(time * sequencer([50, 100, 200], time / 4) + 1/4))
@@ -130,12 +130,12 @@ SELECT
                 lfo(1, 0.75, triangle_wave, time / 8))),
             0.2, 0.5, 10)
         * lfo(0.5, 1, triangle_wave, 16 + time / 11)
-
+    
         + delay(time + 0.005, (time ->
             white_noise(time) * running_envelope(60, time, 0.75, 0.01, 0.01, 0.1)),
             0.2, 0.5, 10)
         * lfo(0.5, 1, triangle_wave, 24 + time / 13)
     ))
-
+    
 FROM system.numbers
 LIMIT 10;
diff --git a/tests/queries/0_stateless/02843_backup_use_same_password_for_base_backup.reference b/tests/queries/0_stateless/02843_backup_use_same_password_for_base_backup.reference
deleted file mode 100644
index cdcf0532cd9..00000000000
--- a/tests/queries/0_stateless/02843_backup_use_same_password_for_base_backup.reference
+++ /dev/null
@@ -1,21 +0,0 @@
-use_same_password_for_base_backup
-base
-BACKUP_CREATED
-add_more_data_1
-inc_1
-BACKUP_CREATED
-add_more_data_2
-inc_2
-BACKUP_CREATED
-inc_2_bad
-Couldn't unpack zip archive '02843_backup_use_same_password_for_base_backup_default_inc_1.zip': Password is required. (CANNOT_UNPACK_ARCHIVE)
-restore_inc_1
-RESTORED
-restore_inc_2
-RESTORED
-restore_inc_2_bad
-Couldn't unpack zip archive '02843_backup_use_same_password_for_base_backup_default_inc_1.zip': Password is required. (CANNOT_UNPACK_ARCHIVE)
-count_inc_1
-20
-count_inc_2
-30
diff --git a/tests/queries/0_stateless/02843_backup_use_same_password_for_base_backup.sh b/tests/queries/0_stateless/02843_backup_use_same_password_for_base_backup.sh
deleted file mode 100755
index a2b1a953e24..00000000000
--- a/tests/queries/0_stateless/02843_backup_use_same_password_for_base_backup.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-$CLICKHOUSE_CLIENT -nm -q "
-  DROP TABLE IF EXISTS data;
-  DROP TABLE IF EXISTS data_1;
-  DROP TABLE IF EXISTS data_2;
-  CREATE TABLE data (key Int) ENGINE=MergeTree() ORDER BY tuple();
-  INSERT INTO data SELECT * from numbers(10);
-"
-
-echo 'use_same_password_for_base_backup'
-echo "base"
-$CLICKHOUSE_CLIENT -q "BACKUP TABLE data TO Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}_base.zip') SETTINGS password='password';" | cut -f2
-
-echo 'add_more_data_1'
-$CLICKHOUSE_CLIENT -q "INSERT INTO data SELECT * FROM numbers(10,10);"
-
-echo "inc_1"
-$CLICKHOUSE_CLIENT -q "BACKUP TABLE data TO Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}_inc_1.zip') SETTINGS base_backup=Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}_base.zip'),password='password',use_same_password_for_base_backup=1" | cut -f2
-
-echo 'add_more_data_2'
-$CLICKHOUSE_CLIENT -q "INSERT INTO data SELECT * FROM numbers(20,10);"
-
-echo "inc_2"
-$CLICKHOUSE_CLIENT -q "BACKUP TABLE data TO Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}_inc_2.zip') SETTINGS base_backup=Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}_inc_1.zip'),password='password',use_same_password_for_base_backup=1" | cut -f2
-
-echo "inc_2_bad"
-$CLICKHOUSE_CLIENT -q "BACKUP TABLE data TO Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}_inc_2_bad.zip') SETTINGS base_backup=Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}_inc_1.zip'),password='password'" |& grep -m1 -o "Couldn't unpack zip archive '${CLICKHOUSE_TEST_UNIQUE_NAME}_inc_1.zip': Password is required. (CANNOT_UNPACK_ARCHIVE)"
-
-echo "restore_inc_1"
-$CLICKHOUSE_CLIENT -q "RESTORE TABLE data AS data_1 FROM Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}_inc_1.zip') SETTINGS password='password',use_same_password_for_base_backup=1" | cut -f2
-
-echo "restore_inc_2"
-$CLICKHOUSE_CLIENT -q "RESTORE TABLE data AS data_2 FROM Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}_inc_2.zip') SETTINGS password='password',use_same_password_for_base_backup=1" | cut -f2
-
-echo "restore_inc_2_bad"
-$CLICKHOUSE_CLIENT -q "RESTORE TABLE data AS data_2 FROM Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}_inc_2.zip') SETTINGS password='password'" |& grep -m1 -o "Couldn't unpack zip archive '${CLICKHOUSE_TEST_UNIQUE_NAME}_inc_1.zip': Password is required. (CANNOT_UNPACK_ARCHIVE)"
-
-echo "count_inc_1"
-$CLICKHOUSE_CLIENT -q "SELECT COUNT(*) FROM data_1" | cut -f2
-
-echo "count_inc_2"
-$CLICKHOUSE_CLIENT -q "SELECT COUNT(*) FROM data_2" | cut -f2
-
-exit 0
diff --git a/tests/queries/0_stateless/02843_insertion_table_schema_infer.sh b/tests/queries/0_stateless/02843_insertion_table_schema_infer.sh
index 9207e48092f..d806b678456 100755
--- a/tests/queries/0_stateless/02843_insertion_table_schema_infer.sh
+++ b/tests/queries/0_stateless/02843_insertion_table_schema_infer.sh
@@ -9,7 +9,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 DATA_DIR=$CUR_DIR/data_tsv
 
-$CLICKHOUSE_LOCAL \
+$CLICKHOUSE_LOCAL --multiquery \
 "CREATE VIEW users AS SELECT * FROM file('$DATA_DIR/mock_data.tsv', TSVWithNamesAndTypes); 
  CREATE TABLE users_output (name String, tag UInt64)ENGINE = Memory;
  INSERT INTO users_output WITH (SELECT groupUniqArrayArray(mapKeys(Tags)) FROM users) AS unique_tags SELECT UserName AS name, length(unique_tags) AS tag FROM users;
diff --git a/tests/queries/0_stateless/02844_subquery_timeout_with_break.sql b/tests/queries/0_stateless/02844_subquery_timeout_with_break.sql
index 00b527a9378..511ed0c59de 100644
--- a/tests/queries/0_stateless/02844_subquery_timeout_with_break.sql
+++ b/tests/queries/0_stateless/02844_subquery_timeout_with_break.sql
@@ -4,7 +4,7 @@ CREATE TABLE t (key UInt64, value UInt64, INDEX value_idx value TYPE bloom_filte
 INSERT INTO t SELECT number, rand()%1000 FROM numbers(10000);
 
 SET timeout_overflow_mode='break';
-SET max_execution_time=0.1, max_rows_to_read=0;
+SET max_execution_time=0.1;
 SELECT * FROM t WHERE value IN (SELECT number FROM numbers(1000000000));
 
 DROP TABLE t;
diff --git a/tests/queries/0_stateless/02845_threads_count_in_distributed_queries.sql.j2 b/tests/queries/0_stateless/02845_threads_count_in_distributed_queries.sql.j2
index 26b858d8c00..ffdd4e3400e 100644
--- a/tests/queries/0_stateless/02845_threads_count_in_distributed_queries.sql.j2
+++ b/tests/queries/0_stateless/02845_threads_count_in_distributed_queries.sql.j2
@@ -1,9 +1,5 @@
--- Tags: no-parallel, no-fasttest
--- ^ because query_thread_log is not guaranteed to be written under high load
--- (when the queue is full, events are silently dropped)
-
 -- enforce some defaults to be sure that the env settings will not affect the test
-SET max_threads=5, async_socket_for_remote=1, prefer_localhost_replica=1, optimize_read_in_order=1, load_marks_asynchronously=0, local_filesystem_read_method='pread', remote_filesystem_read_method='read', trace_profile_events=0;
+SET max_threads=5, async_socket_for_remote=1, prefer_localhost_replica=1, optimize_read_in_order=1, load_marks_asynchronously=0, local_filesystem_read_method='pread', remote_filesystem_read_method='read';
 
 -- we use query_thread_log to check peak thread usage
 -- after https://github.com/ClickHouse/ClickHouse/issues/53417 there is a simpler way to check it
diff --git a/tests/queries/0_stateless/02858_explicit_uuid_and_zk_path.reference b/tests/queries/0_stateless/02858_explicit_uuid_and_zk_path.reference
deleted file mode 100644
index 874494fb061..00000000000
--- a/tests/queries/0_stateless/02858_explicit_uuid_and_zk_path.reference
+++ /dev/null
@@ -1,10 +0,0 @@
-2
-3
-m1
-m2
-rmt1
-rmt2
-02858000-1000-4000-8000-000000000
-0
-CREATE TABLE default.rmt1\n(\n    `n` Int32\n)\nENGINE = ReplicatedMergeTree(\'/test/02858_explicit_uuid_and_zk_path_default/rmt/{shard}\', \'_{replica}\')\nORDER BY n\nSETTINGS index_granularity = 8192
-CREATE TABLE default.rmt2\n(\n    `n` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/{uuid}/{shard}\', \'{replica}\')\nORDER BY n\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/02858_explicit_uuid_and_zk_path.sh b/tests/queries/0_stateless/02858_explicit_uuid_and_zk_path.sh
deleted file mode 100755
index 81a9cef02ff..00000000000
--- a/tests/queries/0_stateless/02858_explicit_uuid_and_zk_path.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=error
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-
-db=$CLICKHOUSE_DATABASE
-if [[ $($CLICKHOUSE_CLIENT -q "SELECT engine = 'Replicated' FROM system.databases WHERE name='$CLICKHOUSE_DATABASE'") != 1 ]]; then
-  $CLICKHOUSE_CLIENT -q "CREATE DATABASE rdb_$CLICKHOUSE_DATABASE ENGINE=Replicated('/test/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/rdb', '1', '1')"
-  db="rdb_$CLICKHOUSE_DATABASE"
-fi
-
-$CLICKHOUSE_CLIENT --distributed_ddl_output_mode=none --database_replicated_allow_explicit_uuid=0 -q "CREATE TABLE $db.m0
-UUID '02858000-1000-4000-8000-000000000000' (n int) ENGINE=Memory" 2>&1| grep -Fac "database_replicated_allow_explicit_uuid"
-
-$CLICKHOUSE_CLIENT --distributed_ddl_output_mode=none --database_replicated_allow_explicit_uuid=1 -q "CREATE TABLE $db.m1
-UUID '02858000-1000-4000-8000-000000000$(($RANDOM % 10))$(($RANDOM % 10))$(($RANDOM % 10))' (n int) ENGINE=Memory"
-
-$CLICKHOUSE_CLIENT --distributed_ddl_output_mode=none --database_replicated_allow_explicit_uuid=2 -q "CREATE TABLE $db.m2
-UUID '02858000-1000-4000-8000-000000000002' (n int) ENGINE=Memory"
-
-
-$CLICKHOUSE_CLIENT --distributed_ddl_output_mode=none --database_replicated_allow_replicated_engine_arguments=0 -q "CREATE TABLE $db.rmt0 (n int)
-ENGINE=ReplicatedMergeTree('/test/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/rmt/{shard}', '_{replica}') ORDER BY n" 2>&1| grep -Fac "database_replicated_allow_replicated_engine_arguments"
-
-$CLICKHOUSE_CLIENT --distributed_ddl_output_mode=none --database_replicated_allow_replicated_engine_arguments=1 -q "CREATE TABLE $db.rmt1 (n int)
-ENGINE=ReplicatedMergeTree('/test/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/rmt/{shard}', '_{replica}') ORDER BY n"
-
-$CLICKHOUSE_CLIENT --distributed_ddl_output_mode=none --database_replicated_allow_replicated_engine_arguments=2 -q "CREATE TABLE $db.rmt2 (n int)
-ENGINE=ReplicatedMergeTree('/test/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/rmt/{shard}', '_{replica}') ORDER BY n"
-
-
-$CLICKHOUSE_CLIENT -q "SELECT name FROM system.tables WHERE database='$db' ORDER BY name"
-
-$CLICKHOUSE_CLIENT -q "SELECT substring(toString(uuid) as s, 1, length(s) - 3) FROM system.tables WHERE database='$db' and name='m1'"
-$CLICKHOUSE_CLIENT -q "SELECT toString(uuid) LIKE '02858000%' FROM system.tables WHERE database='$db' and name='m2'"
-
-$CLICKHOUSE_CLIENT -q "SHOW CREATE $db.rmt1" | sed "s/$db/default/g"
-$CLICKHOUSE_CLIENT -q "SHOW CREATE $db.rmt2" | sed "s/$db/default/g"
-
-$CLICKHOUSE_CLIENT -q "DROP DATABASE IF EXISTS rdb_$CLICKHOUSE_DATABASE"
diff --git a/tests/queries/0_stateless/02861_filter_pushdown_const_bug.sql b/tests/queries/0_stateless/02861_filter_pushdown_const_bug.sql
index c9cdab0cea2..ea52df5d4b4 100644
--- a/tests/queries/0_stateless/02861_filter_pushdown_const_bug.sql
+++ b/tests/queries/0_stateless/02861_filter_pushdown_const_bug.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS t1;
 
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 cc822846505..08313e2fd3b 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
@@ -5,8 +5,29 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-# In this test we restore from "/tests/queries/0_stateless/backups/with_broken_part.zip"
-backup_name="$($CURDIR/helpers/install_predefined_backup.sh with_broken_part.zip)"
+# Copies a test predefined backup from "/tests/queries/0_stateless/backups/" folder to the "backups" disk,
+# returns the path to the backup relative to that disk.
+function install_test_backup()
+{
+    local test_backup_filename="$1"
+    local test_backup_path="$CURDIR/backups/${test_backup_filename}"
+
+    local backups_disk_root
+    backups_disk_root=$($CLICKHOUSE_CLIENT --query "SELECT path FROM system.disks WHERE name='backups'")
+
+    if [ -z "${backups_disk_root}" ]; then
+        echo "Disk '${backups_disk_root}' not found"
+        exit 1
+    fi
+
+    local install_path=${backups_disk_root}/${CLICKHOUSE_DATABASE}/${test_backup_filename}
+    mkdir -p "$(dirname "${install_path}")"
+    ln -s "${test_backup_path}" "${install_path}"
+
+    echo "${CLICKHOUSE_DATABASE}/${test_backup_filename}"
+}
+
+backup_name="$(install_test_backup with_broken_part.zip)"
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS tbl"
 
@@ -18,7 +39,7 @@ $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS tbl"
 # Then try to restore with the setting `restore_broken_parts_as_detached` set to true.
 $CLICKHOUSE_CLIENT --query "RESTORE TABLE default.tbl AS tbl FROM Disk('backups', '${backup_name}') SETTINGS restore_broken_parts_as_detached = true" 2>/dev/null | awk -F '\t' '{print $2}'
 
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 SELECT * FROM tbl ORDER BY x;
 SELECT name, reason FROM system.detached_parts WHERE database = currentDatabase() AND table = 'tbl';
 
diff --git a/tests/queries/0_stateless/02864_statistics_bugs.reference b/tests/queries/0_stateless/02864_statistics_bugs.reference
deleted file mode 100644
index a7eeae9def6..00000000000
--- a/tests/queries/0_stateless/02864_statistics_bugs.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-10
-11
-0
diff --git a/tests/queries/0_stateless/02864_statistics_bugs.sql b/tests/queries/0_stateless/02864_statistics_bugs.sql
deleted file mode 100644
index 01bbe221b0f..00000000000
--- a/tests/queries/0_stateless/02864_statistics_bugs.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-SET allow_experimental_statistics = 1;
-SET allow_statistics_optimize = 1;
-SET mutations_sync = 1;
-
-DROP TABLE IF EXISTS bug_67742;
-CREATE TABLE bug_67742 (a Float64 STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple();
-INSERT INTO bug_67742 SELECT number FROM system.numbers LIMIT 10000;
-SELECT count(*) FROM bug_67742 WHERE a < '10';
-DROP TABLE bug_67742;
-
-DROP TABLE IF EXISTS bug_67742;
-CREATE TABLE bug_67742 (a Int32 STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple();
-INSERT INTO bug_67742 SELECT number FROM system.numbers LIMIT 10000;
-SELECT count(*) FROM bug_67742 WHERE a < '10.5'; -- { serverError TYPE_MISMATCH }
-DROP TABLE bug_67742;
-
-DROP TABLE IF EXISTS bug_67742;
-CREATE TABLE bug_67742 (a Int32 STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple();
-INSERT INTO bug_67742 SELECT number FROM system.numbers LIMIT 10000;
-SELECT count(*) FROM bug_67742 WHERE a < 10.5;
-DROP TABLE bug_67742;
-
-DROP TABLE IF EXISTS bug_67742;
-CREATE TABLE bug_67742 (a Int16 STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple();
-INSERT INTO bug_67742 SELECT number FROM system.numbers LIMIT 10000;
-SELECT count(*) FROM bug_67742 WHERE a < '9999999999999999999999999';
-DROP TABLE bug_67742;
diff --git a/tests/queries/0_stateless/02864_statistics_create_materialize_drop.reference b/tests/queries/0_stateless/02864_statistics_create_materialize_drop.reference
deleted file mode 100644
index 1843964377d..00000000000
--- a/tests/queries/0_stateless/02864_statistics_create_materialize_drop.reference
+++ /dev/null
@@ -1,5 +0,0 @@
-Test create statistics:
-CREATE TABLE default.tab\n(\n    `a` LowCardinality(Int64) STATISTICS(tdigest, uniq, countmin, minmax),\n    `b` LowCardinality(Nullable(String)) STATISTICS(uniq, countmin),\n    `c` LowCardinality(Nullable(Int64)) STATISTICS(tdigest, uniq, countmin, minmax),\n    `d` DateTime STATISTICS(tdigest, uniq, countmin, minmax),\n    `pk` String\n)\nENGINE = MergeTree\nORDER BY pk\nSETTINGS index_granularity = 8192
-Test materialize and drop statistics:
-CREATE TABLE default.tab\n(\n    `a` LowCardinality(Int64),\n    `b` LowCardinality(Nullable(String)) STATISTICS(uniq, countmin),\n    `c` LowCardinality(Nullable(Int64)),\n    `d` DateTime,\n    `pk` String\n)\nENGINE = MergeTree\nORDER BY pk\nSETTINGS index_granularity = 8192
-CREATE TABLE default.tab\n(\n    `a` LowCardinality(Int64),\n    `b` LowCardinality(Nullable(String)),\n    `c` LowCardinality(Nullable(Int64)),\n    `d` DateTime,\n    `pk` String\n)\nENGINE = MergeTree\nORDER BY pk\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/02864_statistics_create_materialize_drop.sql b/tests/queries/0_stateless/02864_statistics_create_materialize_drop.sql
deleted file mode 100644
index 249e3c84a51..00000000000
--- a/tests/queries/0_stateless/02864_statistics_create_materialize_drop.sql
+++ /dev/null
@@ -1,35 +0,0 @@
--- Tags: no-fasttest
-
-DROP TABLE IF EXISTS tab SYNC;
-
-SET allow_experimental_statistics = 1;
-SET allow_statistics_optimize = 1;
-SET allow_suspicious_low_cardinality_types=1;
-SET mutations_sync = 2;
-
-
-SELECT 'Test create statistics:';
-
-CREATE TABLE tab
-(
-    a LowCardinality(Int64) STATISTICS(countmin, minmax, tdigest, uniq),
-    b LowCardinality(Nullable(String)) STATISTICS(countmin, uniq),
-    c LowCardinality(Nullable(Int64)) STATISTICS(countmin, minmax, tdigest, uniq),
-    d DateTime STATISTICS(countmin, minmax, tdigest, uniq),
-    pk String,
-) Engine = MergeTree() ORDER BY pk;
-
-INSERT INTO tab select number, number, number, toDateTime(number), generateUUIDv4() FROM system.numbers LIMIT 10000;
-SHOW CREATE TABLE tab;
-
-
-SELECT 'Test materialize and drop statistics:';
-ALTER TABLE tab DROP STATISTICS a, b, c, d;
-ALTER TABLE tab ADD STATISTICS b TYPE countmin, uniq;
-ALTER TABLE tab MATERIALIZE STATISTICS b;
-SHOW CREATE TABLE tab;
-
-ALTER TABLE tab DROP STATISTICS b;
-SHOW CREATE TABLE tab;
-
-DROP TABLE IF EXISTS tab SYNC;
diff --git a/tests/queries/0_stateless/02864_statistics_ddl.reference b/tests/queries/0_stateless/02864_statistics_ddl.reference
index 0e453b0ee8a..a7ff5caa0b0 100644
--- a/tests/queries/0_stateless/02864_statistics_ddl.reference
+++ b/tests/queries/0_stateless/02864_statistics_ddl.reference
@@ -1,6 +1,31 @@
-CREATE TABLE default.tab\n(\n    `f64` Float64,\n    `f64_tdigest` Float64 STATISTICS(tdigest),\n    `f32` Float32,\n    `s` String,\n    `a` Array(Float64)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
-CREATE TABLE default.tab\n(\n    `f64` Float64 STATISTICS(tdigest, uniq),\n    `f64_tdigest` Float64 STATISTICS(tdigest),\n    `f32` Float32 STATISTICS(tdigest, uniq),\n    `s` String,\n    `a` Array(Float64)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
-CREATE TABLE default.tab\n(\n    `f64` Float64 STATISTICS(tdigest, uniq),\n    `f64_tdigest` Float64 STATISTICS(tdigest),\n    `f32` Float32 STATISTICS(tdigest, uniq),\n    `s` String,\n    `a` Array(Float64)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
-CREATE TABLE default.tab\n(\n    `f64` Float64 STATISTICS(tdigest, uniq),\n    `f64_tdigest` Float64 STATISTICS(tdigest),\n    `f32` Float32 STATISTICS(tdigest, uniq),\n    `s` String,\n    `a` Array(Float64)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
-CREATE TABLE default.tab\n(\n    `f64` Float64 STATISTICS(tdigest, uniq),\n    `f64_tdigest` Float64 STATISTICS(tdigest),\n    `f32` Float32 STATISTICS(tdigest, uniq),\n    `s` String,\n    `a` Array(Float64)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
-CREATE TABLE default.tab\n(\n    `f64` Float64,\n    `f64_tdigest` Float64 STATISTICS(tdigest),\n    `f32` Float32,\n    `s` String,\n    `a` Array(Float64)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.tab\n(\n    `a` Float64 STATISTICS(tdigest),\n    `b` Int64 STATISTICS(tdigest),\n    `pk` String\n)\nENGINE = MergeTree\nORDER BY pk\nSETTINGS min_bytes_for_wide_part = 0, index_granularity = 8192
+After insert
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(a, 10), less(b, 10)) (removed)
+10
+0
+After drop statistic
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(b, 10), less(a, 10)) (removed)
+10
+CREATE TABLE default.tab\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.tab\n(\n    `a` Float64 STATISTICS(tdigest),\n    `b` Int64 STATISTICS(tdigest),\n    `pk` String\n)\nENGINE = MergeTree\nORDER BY pk\nSETTINGS min_bytes_for_wide_part = 0, index_granularity = 8192
+After materialize statistic
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(a, 10), less(b, 10)) (removed)
+20
+After merge
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(a, 10), less(b, 10)) (removed)
+20
+CREATE TABLE default.tab\n(\n    `a` Float64 STATISTICS(tdigest),\n    `c` Int64 STATISTICS(tdigest),\n    `pk` String\n)\nENGINE = MergeTree\nORDER BY pk\nSETTINGS min_bytes_for_wide_part = 0, index_granularity = 8192
+After rename
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(a, 10), less(c, 10)) (removed)
+20
diff --git a/tests/queries/0_stateless/02864_statistics_ddl.sql b/tests/queries/0_stateless/02864_statistics_ddl.sql
index 5b2c5cebc1d..fe612efe2ac 100644
--- a/tests/queries/0_stateless/02864_statistics_ddl.sql
+++ b/tests/queries/0_stateless/02864_statistics_ddl.sql
@@ -1,227 +1,59 @@
--- Tags: no-fasttest
--- no-fasttest: 'countmin' sketches need a 3rd party library
-
--- Tests that DDL statements which create / drop / materialize statistics
-
-SET mutations_sync = 1;
+-- Tests that various DDL statements create/drop/materialize statistics
 
 DROP TABLE IF EXISTS tab;
 
-SET allow_experimental_statistics = 0;
--- Error case: Can't create statistics when allow_experimental_statistics = 0
-CREATE TABLE tab (col Float64 STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); -- { serverError INCORRECT_QUERY }
-
 SET allow_experimental_statistics = 1;
-
--- Error case: Unknown statistics types are rejected
-CREATE TABLE tab (col Float64 STATISTICS(no_statistics_type)) Engine = MergeTree() ORDER BY tuple(); -- { serverError INCORRECT_QUERY }
-
--- Error case: The same statistics type can't exist more than once on a column
-CREATE TABLE tab (col Float64 STATISTICS(tdigest, tdigest)) Engine = MergeTree() ORDER BY tuple(); -- { serverError INCORRECT_QUERY }
-
-SET allow_suspicious_low_cardinality_types = 1;
-
--- Statistics can only be created on columns of specific data types (depending on the statistics kind), (*)
-
---   tdigest requires data_type.isValueRepresentedByInteger
---     These types work:
-CREATE TABLE tab (col UInt8 STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col UInt256 STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Float32 STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Decimal32(3) STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Date STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Date32 STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col DateTime STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col DateTime64 STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Enum('hello', 'world') STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col IPv4 STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Nullable(UInt8) STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col LowCardinality(UInt8) STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col LowCardinality(Nullable(UInt8)) STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
---     These types don't work:
-CREATE TABLE tab (col String STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col FixedString(1) STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col Array(Float64) STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col Tuple(Float64, Float64) STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col Map(UInt64, UInt64) STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col UUID STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col IPv6 STATISTICS(tdigest)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-
---   uniq requires data_type.isValueRepresentedByInteger or (Fixed)String
---     These types work:
-CREATE TABLE tab (col UInt8 STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col UInt256 STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Float32 STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Decimal32(3) STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Date STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Date32 STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col DateTime STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col DateTime64 STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Enum('hello', 'world') STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col IPv4 STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Nullable(UInt8) STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col LowCardinality(UInt8) STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col LowCardinality(Nullable(UInt8)) STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col String STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col FixedString(1) STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
---     These types don't work:
-CREATE TABLE tab (col Array(Float64) STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col Tuple(Float64, Float64) STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col Map(UInt64, UInt64) STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col UUID STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col IPv6 STATISTICS(uniq)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-
---   countmin requires data_type.isValueRepresentedByInteger or data_type = (Fixed)String
---     These types work:
-CREATE TABLE tab (col UInt8 STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col UInt256 STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Float32 STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Decimal32(3) STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Date STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Date32 STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col DateTime STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col DateTime64 STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Enum('hello', 'world') STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col IPv4 STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Nullable(UInt8) STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col LowCardinality(UInt8) STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col LowCardinality(Nullable(UInt8)) STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col String STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col FixedString(1) STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
---     These types don't work:
-CREATE TABLE tab (col Array(Float64) STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col Tuple(Float64, Float64) STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col Map(UInt64, UInt64) STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col UUID STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col IPv6 STATISTICS(countmin)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-
---   minmax requires data_type.isValueRepresentedByInteger
---     These types work:
-CREATE TABLE tab (col UInt8 STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col UInt256 STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Float32 STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Decimal32(3) STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Date STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Date32 STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col DateTime STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col DateTime64 STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Enum('hello', 'world') STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col IPv4 STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col Nullable(UInt8) STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col LowCardinality(UInt8) STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
-CREATE TABLE tab (col LowCardinality(Nullable(UInt8)) STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); DROP TABLE tab;
---     These types don't work:
-CREATE TABLE tab (col String STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col FixedString(1) STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col Array(Float64) STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col Tuple(Float64, Float64) STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col Map(UInt64, UInt64) STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col UUID STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-CREATE TABLE tab (col IPv6 STATISTICS(minmax)) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
-
--- CREATE TABLE was easy, ALTER is more fun
+SET allow_statistics_optimize = 1;
 
 CREATE TABLE tab
 (
-    f64           Float64,
-    f64_tdigest   Float64 STATISTICS(tdigest),
-    f32           Float32,
-    s             String,
-    a             Array(Float64)
-)
-Engine = MergeTree()
-ORDER BY tuple();
+    a Float64 STATISTICS(tdigest),
+    b Int64 STATISTICS(tdigest),
+    pk String,
+) Engine = MergeTree() ORDER BY pk
+SETTINGS min_bytes_for_wide_part = 0;
 
--- Error case: Unknown statistics types are rejected
--- (relevant for ADD and MODIFY)
-ALTER TABLE tab ADD STATISTICS f64 TYPE no_statistics_type; -- { serverError INCORRECT_QUERY }
-ALTER TABLE tab ADD STATISTICS IF NOT EXISTS f64 TYPE no_statistics_type; -- { serverError INCORRECT_QUERY }
-ALTER TABLE tab MODIFY STATISTICS f64 TYPE no_statistics_type; -- { serverError INCORRECT_QUERY }
--- for some reason, ALTER TABLE tab MODIFY STATISTICS IF EXISTS is not supported
-
--- Error case: The same statistics type can't exist more than once on a column
--- (relevant for ADD and MODIFY)
---   Create the same statistics object twice
-ALTER TABLE tab ADD STATISTICS f64 TYPE tdigest, tdigest; -- { serverError INCORRECT_QUERY }
-ALTER TABLE tab ADD STATISTICS IF NOT EXISTS f64 TYPE tdigest, tdigest; -- { serverError INCORRECT_QUERY }
-ALTER TABLE tab MODIFY STATISTICS f64 TYPE tdigest, tdigest; -- { serverError INCORRECT_QUERY }
---   Create an statistics which exists already
-ALTER TABLE tab ADD STATISTICS f64_tdigest TYPE tdigest; -- { serverError ILLEGAL_STATISTICS }
-ALTER TABLE tab ADD STATISTICS IF NOT EXISTS f64_tdigest TYPE tdigest; -- no-op
-ALTER TABLE tab MODIFY STATISTICS f64_tdigest TYPE tdigest; -- no-op
-
--- Error case: Column does not exist
--- (relevant for ADD, MODIFY, DROP, CLEAR, and MATERIALIZE)
--- Note that the results are unfortunately quite inconsistent ...
-ALTER TABLE tab ADD STATISTICS no_such_column TYPE tdigest; -- { serverError ILLEGAL_STATISTICS }
-ALTER TABLE tab ADD STATISTICS IF NOT EXISTS no_such_column TYPE tdigest; -- { serverError ILLEGAL_STATISTICS }
-ALTER TABLE tab MODIFY STATISTICS no_such_column TYPE tdigest; -- { serverError ILLEGAL_STATISTICS }
-ALTER TABLE tab DROP STATISTICS no_such_column; -- { serverError ILLEGAL_STATISTICS }
-ALTER TABLE tab DROP STATISTICS IF EXISTS no_such_column; -- no-op
-ALTER TABLE tab CLEAR STATISTICS no_such_column; -- { serverError ILLEGAL_STATISTICS }
-ALTER TABLE tab CLEAR STATISTICS IF EXISTS no_such_column; -- no-op
-ALTER TABLE tab MATERIALIZE STATISTICS no_such_column; -- { serverError ILLEGAL_STATISTICS }
-ALTER TABLE tab MATERIALIZE STATISTICS IF EXISTS no_such_column; -- { serverError ILLEGAL_STATISTICS }
-
--- Error case: Column exists but has no statistics
--- (relevant for MODIFY, DROP, CLEAR, and MATERIALIZE)
--- Note that the results are unfortunately quite inconsistent ...
-ALTER TABLE tab MODIFY STATISTICS s TYPE tdigest; -- { serverError ILLEGAL_STATISTICS }
-ALTER TABLE tab DROP STATISTICS s; -- { serverError ILLEGAL_STATISTICS }
-ALTER TABLE tab DROP STATISTICS IF EXISTS s; -- no-op
-ALTER TABLE tab CLEAR STATISTICS s; -- { serverError ILLEGAL_STATISTICS }
-ALTER TABLE tab CLEAR STATISTICS IF EXISTS s; -- no-op
-ALTER TABLE tab MATERIALIZE STATISTICS s; -- { serverError ILLEGAL_STATISTICS }
-ALTER TABLE tab MATERIALIZE STATISTICS IF EXISTS s; -- { serverError ILLEGAL_STATISTICS }
-
--- We don't check systematically that that statistics can only be created via ALTER ADD STATISTICS on columns of specific data types (the
--- internal type validation code is tested already above, (*)). Only do a rudimentary check for each statistics type with a data type that
--- works and one that doesn't work.
---   tdigest
---     Works:
-ALTER TABLE tab ADD STATISTICS f64 TYPE tdigest; ALTER TABLE tab DROP STATISTICS f64;
-ALTER TABLE tab MODIFY STATISTICS f64 TYPE tdigest; ALTER TABLE tab DROP STATISTICS f64;
---     Doesn't work:
-ALTER TABLE tab ADD STATISTICS a TYPE tdigest; -- { serverError ILLEGAL_STATISTICS }
-ALTER TABLE tab MODIFY STATISTICS a TYPE tdigest; -- { serverError ILLEGAL_STATISTICS }
---   uniq
---     Works:
-ALTER TABLE tab ADD STATISTICS f64 TYPE uniq; ALTER TABLE tab DROP STATISTICS f64;
-ALTER TABLE tab MODIFY STATISTICS f64 TYPE countmin; ALTER TABLE tab DROP STATISTICS f64;
---     Doesn't work:
-ALTER TABLE tab ADD STATISTICS a TYPE uniq; -- { serverError ILLEGAL_STATISTICS }
-ALTER TABLE tab MODIFY STATISTICS a TYPE uniq; -- { serverError ILLEGAL_STATISTICS }
---   countmin
---     Works:
-ALTER TABLE tab ADD STATISTICS f64 TYPE countmin; ALTER TABLE tab DROP STATISTICS f64;
-ALTER TABLE tab MODIFY STATISTICS f64 TYPE countmin; ALTER TABLE tab DROP STATISTICS f64;
---     Doesn't work:
-ALTER TABLE tab ADD STATISTICS a TYPE countmin; -- { serverError ILLEGAL_STATISTICS }
-ALTER TABLE tab MODIFY STATISTICS a TYPE countmin; -- { serverError ILLEGAL_STATISTICS }
---   minmax
---     Works:
-ALTER TABLE tab ADD STATISTICS f64 TYPE minmax; ALTER TABLE tab DROP STATISTICS f64;
-ALTER TABLE tab MODIFY STATISTICS f64 TYPE minmax; ALTER TABLE tab DROP STATISTICS f64;
---     Doesn't work:
-ALTER TABLE tab ADD STATISTICS a TYPE minmax; -- { serverError ILLEGAL_STATISTICS }
-ALTER TABLE tab MODIFY STATISTICS a TYPE minmax; -- { serverError ILLEGAL_STATISTICS }
-
--- Any data type changes on columns with statistics are disallowed, for simplicity even if the new data type is compatible with all existing
--- statistics objects (e.g. tdigest can be created on Float64 and UInt64)
-ALTER TABLE tab MODIFY COLUMN f64_tdigest UInt64; -- { serverError ALTER_OF_COLUMN_IS_FORBIDDEN }
-
--- Finally, do a full-circle test of a good case. Print table definition after each step.
--- Intentionally specifying _two_ columns and _two_ statistics types to have that also tested.
-SHOW CREATE TABLE tab;
-ALTER TABLE tab ADD STATISTICS f64, f32 TYPE tdigest, uniq;
-SHOW CREATE TABLE tab;
-ALTER TABLE tab MODIFY STATISTICS f64, f32 TYPE tdigest, uniq;
-SHOW CREATE TABLE tab;
-ALTER TABLE tab CLEAR STATISTICS f64, f32;
-SHOW CREATE TABLE tab;
-ALTER TABLE tab MATERIALIZE STATISTICS f64, f32;
-SHOW CREATE TABLE tab;
-ALTER TABLE tab DROP STATISTICS f64, f32;
 SHOW CREATE TABLE tab;
 
-DROP TABLE tab;
+INSERT INTO tab select number, -number, generateUUIDv4() FROM system.numbers LIMIT 10000;
+
+SELECT 'After insert';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM tab WHERE b < 10 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+SELECT count(*) FROM tab WHERE b < 10 and a < 10;
+SELECT count(*) FROM tab WHERE b < NULL and a < '10';
+
+ALTER TABLE tab DROP STATISTICS a, b;
+
+SELECT 'After drop statistic';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM tab WHERE b < 10 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+SELECT count(*) FROM tab WHERE b < 10 and a < 10;
+
+SHOW CREATE TABLE tab;
+
+ALTER TABLE tab ADD STATISTICS a, b TYPE tdigest;
+
+SELECT 'After add statistic';
+
+SHOW CREATE TABLE tab;
+
+ALTER TABLE tab MATERIALIZE STATISTICS a, b;
+INSERT INTO tab select number, -number, generateUUIDv4() FROM system.numbers LIMIT 10000;
+
+SELECT 'After materialize statistic';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM tab WHERE b < 10 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+SELECT count(*) FROM tab WHERE b < 10 and a < 10;
+
+OPTIMIZE TABLE tab FINAL;
+
+SELECT 'After merge';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM tab WHERE b < 10 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+SELECT count(*) FROM tab WHERE b < 10 and a < 10;
+
+ALTER TABLE tab RENAME COLUMN b TO c;
+SHOW CREATE TABLE tab;
+
+SELECT 'After rename';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM tab WHERE c < 10 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+SELECT count(*) FROM tab WHERE c < 10 and a < 10;
+
+DROP TABLE IF EXISTS tab;
diff --git a/tests/queries/0_stateless/02864_statistics_delayed_materialization_in_merge.reference b/tests/queries/0_stateless/02864_statistics_delayed_materialization_in_merge.reference
deleted file mode 100644
index eb5e685597c..00000000000
--- a/tests/queries/0_stateless/02864_statistics_delayed_materialization_in_merge.reference
+++ /dev/null
@@ -1,12 +0,0 @@
-After insert
-        Prewhere info
-          Prewhere filter
-          Prewhere filter column: and(less(b, 10_UInt8), less(a, 10_UInt8)) (removed)
-After merge
-        Prewhere info
-          Prewhere filter
-          Prewhere filter column: and(less(a, 10_UInt8), less(b, 10_UInt8)) (removed)
-After truncate, insert, and materialize
-        Prewhere info
-          Prewhere filter
-          Prewhere filter column: and(less(a, 10_UInt8), less(b, 10_UInt8)) (removed)
diff --git a/tests/queries/0_stateless/02864_statistics_delayed_materialization_in_merge.sql b/tests/queries/0_stateless/02864_statistics_delayed_materialization_in_merge.sql
deleted file mode 100644
index d469a4c2036..00000000000
--- a/tests/queries/0_stateless/02864_statistics_delayed_materialization_in_merge.sql
+++ /dev/null
@@ -1,36 +0,0 @@
--- Tests delayed materialization of statistics in merge instead of during insert (setting 'materialize_statistics_on_insert = 0').
--- (The concrete statistics type, column data type and predicate type don't matter)
-
--- Checks by the predicate evaluation order in EXPLAIN. This is quite fragile, a better approach would be helpful (maybe 'send_logs_level'?)
-
-DROP TABLE IF EXISTS tab;
-
-SET allow_experimental_statistics = 1;
-SET allow_statistics_optimize = 1;
-SET enable_analyzer = 1;
-
-SET materialize_statistics_on_insert = 0;
-
-CREATE TABLE tab
-(
-    a Int64 STATISTICS(tdigest),
-    b Int16 STATISTICS(tdigest),
-) ENGINE = MergeTree() ORDER BY tuple()
-SETTINGS min_bytes_for_wide_part = 0, enable_vertical_merge_algorithm = 0; -- TODO: there is a bug in vertical merge with statistics.
-
-INSERT INTO tab SELECT number, -number FROM system.numbers LIMIT 10000;
-SELECT 'After insert';
-SELECT replaceRegexpAll(explain, '__table1\.', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM tab WHERE b < 10 and a < 10) WHERE explain LIKE '%Prewhere%'; -- checks b first, then a (statistics not used)
-
-OPTIMIZE TABLE tab FINAL;
-SELECT 'After merge';
-SELECT replaceRegexpAll(explain, '__table1\.', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM tab WHERE b < 10 and a < 10) WHERE explain LIKE '%Prewhere%'; -- checks a first, then b (statistics used)
-
-TRUNCATE TABLE tab;
-SET mutations_sync = 2;
-INSERT INTO tab SELECT number, -number FROM system.numbers LIMIT 10000;
-ALTER TABLE tab MATERIALIZE STATISTICS a, b;
-SELECT 'After truncate, insert, and materialize';
-SELECT replaceRegexpAll(explain, '__table1\.', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM tab WHERE b < 10 and a < 10) WHERE explain LIKE '%Prewhere%'; -- checks a first, then b (statistics used)
-
-DROP TABLE tab;
diff --git a/tests/integration/test_custom_dashboards/__init__.py b/tests/queries/0_stateless/02864_statistics_exception.reference
similarity index 100%
rename from tests/integration/test_custom_dashboards/__init__.py
rename to tests/queries/0_stateless/02864_statistics_exception.reference
diff --git a/tests/queries/0_stateless/02864_statistics_exception.sql b/tests/queries/0_stateless/02864_statistics_exception.sql
new file mode 100644
index 00000000000..289ffee6600
--- /dev/null
+++ b/tests/queries/0_stateless/02864_statistics_exception.sql
@@ -0,0 +1,55 @@
+-- Tests creating/dropping/materializing statistics produces the right exceptions.
+
+DROP TABLE IF EXISTS tab;
+
+-- Can't create statistics when allow_experimental_statistics = 0
+CREATE TABLE tab
+(
+    a Float64 STATISTICS(tdigest)
+) Engine = MergeTree() ORDER BY tuple(); -- { serverError INCORRECT_QUERY }
+
+SET allow_experimental_statistics = 1;
+
+-- The same type of statistics can't exist more than once on a column
+CREATE TABLE tab
+(
+    a Float64 STATISTICS(tdigest, tdigest)
+) Engine = MergeTree() ORDER BY tuple(); -- { serverError INCORRECT_QUERY }
+
+-- Unknown statistics types are rejected
+CREATE TABLE tab
+(
+    a Float64 STATISTICS(no_statistics_type)
+) Engine = MergeTree() ORDER BY tuple(); -- { serverError INCORRECT_QUERY }
+
+-- tDigest statistics can only be created on numeric columns
+CREATE TABLE tab
+(
+    a String STATISTICS(tdigest),
+) Engine = MergeTree() ORDER BY tuple(); -- { serverError ILLEGAL_STATISTICS }
+
+CREATE TABLE tab
+(
+    a Float64,
+    b String
+) Engine = MergeTree() ORDER BY tuple();
+
+ALTER TABLE tab ADD STATISTICS a TYPE no_statistics_type; -- { serverError INCORRECT_QUERY }
+ALTER TABLE tab ADD STATISTICS a TYPE tdigest;
+ALTER TABLE tab ADD STATISTICS IF NOT EXISTS a TYPE tdigest;
+ALTER TABLE tab ADD STATISTICS a TYPE tdigest; -- { serverError ILLEGAL_STATISTICS }
+ALTER TABLE tab MODIFY STATISTICS a TYPE tdigest;
+-- Statistics can be created only on integer columns
+ALTER TABLE tab ADD STATISTICS b TYPE tdigest; -- { serverError ILLEGAL_STATISTICS }
+ALTER TABLE tab DROP STATISTICS b; -- { serverError ILLEGAL_STATISTICS }
+ALTER TABLE tab DROP STATISTICS a;
+ALTER TABLE tab DROP STATISTICS IF EXISTS a;
+ALTER TABLE tab CLEAR STATISTICS a; -- { serverError ILLEGAL_STATISTICS }
+ALTER TABLE tab CLEAR STATISTICS IF EXISTS a;
+ALTER TABLE tab MATERIALIZE STATISTICS b; -- { serverError ILLEGAL_STATISTICS }
+
+ALTER TABLE tab ADD STATISTICS a TYPE tdigest;
+ALTER TABLE tab MODIFY COLUMN a Float64 TTL toDateTime(b) + INTERVAL 1 MONTH;
+ALTER TABLE tab MODIFY COLUMN a Int64; -- { serverError ALTER_OF_COLUMN_IS_FORBIDDEN }
+
+DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02864_statistics_materialize_in_merge.reference b/tests/queries/0_stateless/02864_statistics_materialize_in_merge.reference
new file mode 100644
index 00000000000..5e969cf41cb
--- /dev/null
+++ b/tests/queries/0_stateless/02864_statistics_materialize_in_merge.reference
@@ -0,0 +1,10 @@
+10
+10
+10
+statistics not used	Condition less(b, 10_UInt8) moved to PREWHERE
+statistics not used	Condition less(a, 10_UInt8) moved to PREWHERE
+statistics used after merge	Condition less(a, 10_UInt8) moved to PREWHERE
+statistics used after merge	Condition less(b, 10_UInt8) moved to PREWHERE
+statistics used after materialize	Condition less(a, 10_UInt8) moved to PREWHERE
+statistics used after materialize	Condition less(b, 10_UInt8) moved to PREWHERE
+2	0
diff --git a/tests/queries/0_stateless/02864_statistics_materialize_in_merge.sql b/tests/queries/0_stateless/02864_statistics_materialize_in_merge.sql
new file mode 100644
index 00000000000..3e15ec1148e
--- /dev/null
+++ b/tests/queries/0_stateless/02864_statistics_materialize_in_merge.sql
@@ -0,0 +1,52 @@
+-- Tests delayed materialization of statistics in merge instead of during insert (setting 'materialize_statistics_on_insert = 0').
+
+DROP TABLE IF EXISTS tab;
+
+SET allow_experimental_analyzer = 1;
+SET allow_experimental_statistics = 1;
+SET allow_statistics_optimize = 1;
+
+SET materialize_statistics_on_insert = 0;
+
+CREATE TABLE tab
+(
+    a Int64 STATISTICS(tdigest),
+    b Int16 STATISTICS(tdigest),
+) ENGINE = MergeTree() ORDER BY tuple()
+SETTINGS min_bytes_for_wide_part = 0, enable_vertical_merge_algorithm = 0; -- TODO: there is a bug in vertical merge with statistics.
+
+INSERT INTO tab SELECT number, -number FROM system.numbers LIMIT 10000;
+
+SELECT count(*) FROM tab WHERE b < 10 and a < 10 SETTINGS log_comment = 'statistics not used';
+
+OPTIMIZE TABLE tab FINAL;
+
+SELECT count(*) FROM tab WHERE b < 10 and a < 10 SETTINGS log_comment = 'statistics used after merge';
+
+TRUNCATE TABLE tab;
+SET mutations_sync = 2;
+
+INSERT INTO tab SELECT number, -number FROM system.numbers LIMIT 10000;
+ALTER TABLE tab MATERIALIZE STATISTICS a, b;
+
+SELECT count(*) FROM tab WHERE b < 10 and a < 10 SETTINGS log_comment = 'statistics used after materialize';
+
+DROP TABLE tab;
+
+SYSTEM FLUSH LOGS;
+
+SELECT log_comment, message FROM system.text_log JOIN
+(
+    SELECT Settings['log_comment'] AS log_comment, query_id FROM system.query_log
+    WHERE current_database = currentDatabase()
+        AND query LIKE 'SELECT count(*) FROM tab%'
+        AND type = 'QueryFinish'
+) AS query_log USING (query_id)
+WHERE message LIKE '%moved to PREWHERE%'
+ORDER BY event_time_microseconds;
+
+SELECT count(), sum(ProfileEvents['MergeTreeDataWriterStatisticsCalculationMicroseconds'])
+FROM system.query_log
+WHERE current_database = currentDatabase()
+    AND query LIKE 'INSERT INTO tab SELECT%'
+    AND type = 'QueryFinish';
diff --git a/tests/queries/0_stateless/02864_statistics_predicates.reference b/tests/queries/0_stateless/02864_statistics_predicates.reference
deleted file mode 100644
index c2d74300fa9..00000000000
--- a/tests/queries/0_stateless/02864_statistics_predicates.reference
+++ /dev/null
@@ -1,121 +0,0 @@
-u64 and =
-10
-10
-10
-10
-10
-0
-0
-0
-0
-0
-10
-10
-10
-10
-10
-u64 and <
-70
-70
-70
-70
-70
-80
-80
-80
-80
-80
-70
-70
-70
-70
-70
-f64 and =
-10
-10
-10
-10
-10
-0
-0
-0
-0
-0
-10
-10
-10
-10
-10
-0
-0
-0
-0
-0
-f64 and <
-70
-70
-70
-70
-70
-80
-80
-80
-80
-80
-70
-70
-70
-70
-70
-80
-80
-80
-80
-80
-dt and =
-0
-0
-0
-0
-0
-10
-10
-10
-10
-10
-dt and <
-10000
-10000
-10000
-10000
-10000
-70
-70
-70
-70
-70
-b and =
-5000
-5000
-5000
-5000
-5000
-5000
-5000
-5000
-5000
-5000
-5000
-5000
-5000
-5000
-5000
-0
-0
-0
-0
-0
-s and =
-10
-10
-10
diff --git a/tests/queries/0_stateless/02864_statistics_predicates.sql b/tests/queries/0_stateless/02864_statistics_predicates.sql
deleted file mode 100644
index d7afba12c1d..00000000000
--- a/tests/queries/0_stateless/02864_statistics_predicates.sql
+++ /dev/null
@@ -1,250 +0,0 @@
--- Tags: no-fasttest
--- no-fasttest: 'countmin' sketches need a 3rd party library
-
--- Tests the cross product of all predicates with all right-hand sides on all data types and all statistics types.
-
-SET allow_experimental_statistics = 1;
-SET allow_statistics_optimize = 1;
-
-DROP TABLE IF EXISTS tab;
-
-CREATE TABLE tab
-(
-    u64                 UInt64,
-    u64_tdigest         UInt64 STATISTICS(tdigest),
-    u64_minmax          UInt64 STATISTICS(minmax),
-    u64_countmin       UInt64 STATISTICS(countmin),
-    u64_uniq            UInt64 STATISTICS(uniq),
-    f64                 Float64,
-    f64_tdigest         Float64 STATISTICS(tdigest),
-    f64_minmax          Float64 STATISTICS(minmax),
-    f64_countmin       Float64 STATISTICS(countmin),
-    f64_uniq            Float64 STATISTICS(uniq),
-    dt                  DateTime,
-    dt_tdigest          DateTime STATISTICS(tdigest),
-    dt_minmax           DateTime STATISTICS(minmax),
-    dt_countmin        DateTime STATISTICS(countmin),
-    dt_uniq             DateTime STATISTICS(uniq),
-    b                   Bool,
-    b_tdigest           Bool STATISTICS(tdigest),
-    b_minmax            Bool STATISTICS(minmax),
-    b_countmin         Bool STATISTICS(countmin),
-    b_uniq              Bool STATISTICS(uniq),
-    s                   String,
- -- s_tdigest           String STATISTICS(tdigest), -- not supported by tdigest
- -- s_minmax            String STATISTICS(minmax), -- not supported by minmax
-    s_countmin         String STATISTICS(countmin),
-    s_uniq              String STATISTICS(uniq)
-) Engine = MergeTree() ORDER BY tuple()
-SETTINGS min_bytes_for_wide_part = 0;
-
-INSERT INTO tab
--- SELECT number % 10000, number % 1000, -(number % 100) FROM system.numbers LIMIT 10000;
-SELECT number % 1000, -- u64
-       number % 1000,
-       number % 1000,
-       number % 1000,
-       number % 1000,
-       number % 1000, -- f64
-       number % 1000,
-       number % 1000,
-       number % 1000,
-       number % 1000,
-       number % 1000, -- dt
-       number % 1000,
-       number % 1000,
-       number % 1000,
-       number % 1000,
-       number % 2,    -- b
-       number % 2,
-       number % 2,
-       number % 2,
-       number % 2,
-       toString(number % 1000),
-       toString(number % 1000),
-       toString(number % 1000)
-FROM system.numbers LIMIT 10000;
-
--- u64 ----------------------------------------------------
-
-SELECT 'u64 and =';
-
-SELECT count(*) FROM tab WHERE u64 = 7;
-SELECT count(*) FROM tab WHERE u64_tdigest = 7;
-SELECT count(*) FROM tab WHERE u64_minmax = 7;
-SELECT count(*) FROM tab WHERE u64_countmin = 7;
-SELECT count(*) FROM tab WHERE u64_uniq = 7;
-
-SELECT count(*) FROM tab WHERE u64 = 7.7;
-SELECT count(*) FROM tab WHERE u64_tdigest = 7.7;
-SELECT count(*) FROM tab WHERE u64_minmax = 7.7;
-SELECT count(*) FROM tab WHERE u64_countmin = 7.7;
-SELECT count(*) FROM tab WHERE u64_uniq = 7.7;
-
-SELECT count(*) FROM tab WHERE u64 = '7';
-SELECT count(*) FROM tab WHERE u64_tdigest = '7';
-SELECT count(*) FROM tab WHERE u64_minmax = '7';
-SELECT count(*) FROM tab WHERE u64_countmin = '7';
-SELECT count(*) FROM tab WHERE u64_uniq = '7';
-
-SELECT count(*) FROM tab WHERE u64 = '7.7'; -- { serverError TYPE_MISMATCH }
-SELECT count(*) FROM tab WHERE u64_tdigest = '7.7'; -- { serverError TYPE_MISMATCH }
-SELECT count(*) FROM tab WHERE u64_minmax = '7.7'; -- { serverError TYPE_MISMATCH }
-SELECT count(*) FROM tab WHERE u64_countmin = '7.7'; -- { serverError TYPE_MISMATCH }
-SELECT count(*) FROM tab WHERE u64_uniq = '7.7'; -- { serverError TYPE_MISMATCH }
-
-SELECT 'u64 and <';
-
-SELECT count(*) FROM tab WHERE u64 < 7;
-SELECT count(*) FROM tab WHERE u64_tdigest < 7;
-SELECT count(*) FROM tab WHERE u64_minmax < 7;
-SELECT count(*) FROM tab WHERE u64_countmin < 7;
-SELECT count(*) FROM tab WHERE u64_uniq < 7;
-
-SELECT count(*) FROM tab WHERE u64 < 7.7;
-SELECT count(*) FROM tab WHERE u64_tdigest < 7.7;
-SELECT count(*) FROM tab WHERE u64_minmax < 7.7;
-SELECT count(*) FROM tab WHERE u64_countmin < 7.7;
-SELECT count(*) FROM tab WHERE u64_uniq < 7.7;
-
-SELECT count(*) FROM tab WHERE u64 < '7';
-SELECT count(*) FROM tab WHERE u64_tdigest < '7';
-SELECT count(*) FROM tab WHERE u64_minmax < '7';
-SELECT count(*) FROM tab WHERE u64_countmin < '7';
-SELECT count(*) FROM tab WHERE u64_uniq < '7';
-
-SELECT count(*) FROM tab WHERE u64 < '7.7'; -- { serverError TYPE_MISMATCH }
-SELECT count(*) FROM tab WHERE u64_tdigest < '7.7'; -- { serverError TYPE_MISMATCH }
-SELECT count(*) FROM tab WHERE u64_minmax < '7.7'; -- { serverError TYPE_MISMATCH }
-SELECT count(*) FROM tab WHERE u64_countmin < '7.7'; -- { serverError TYPE_MISMATCH }
-SELECT count(*) FROM tab WHERE u64_uniq < '7.7'; -- { serverError TYPE_MISMATCH }
-
--- f64 ----------------------------------------------------
-
-SELECT 'f64 and =';
-
-SELECT count(*) FROM tab WHERE f64 = 7;
-SELECT count(*) FROM tab WHERE f64_tdigest = 7;
-SELECT count(*) FROM tab WHERE f64_minmax = 7;
-SELECT count(*) FROM tab WHERE f64_countmin = 7;
-SELECT count(*) FROM tab WHERE f64_uniq = 7;
-
-SELECT count(*) FROM tab WHERE f64 = 7.7;
-SELECT count(*) FROM tab WHERE f64_tdigest = 7.7;
-SELECT count(*) FROM tab WHERE f64_minmax = 7.7;
-SELECT count(*) FROM tab WHERE f64_countmin = 7.7;
-SELECT count(*) FROM tab WHERE f64_uniq = 7.7;
-
-SELECT count(*) FROM tab WHERE f64 = '7';
-SELECT count(*) FROM tab WHERE f64_tdigest = '7';
-SELECT count(*) FROM tab WHERE f64_minmax = '7';
-SELECT count(*) FROM tab WHERE f64_countmin = '7';
-SELECT count(*) FROM tab WHERE f64_uniq = '7';
-
-SELECT count(*) FROM tab WHERE f64 = '7.7';
-SELECT count(*) FROM tab WHERE f64_tdigest = '7.7';
-SELECT count(*) FROM tab WHERE f64_minmax = '7.7';
-SELECT count(*) FROM tab WHERE f64_countmin = '7.7';
-SELECT count(*) FROM tab WHERE f64_uniq = '7.7';
-
-SELECT 'f64 and <';
-
-SELECT count(*) FROM tab WHERE f64 < 7;
-SELECT count(*) FROM tab WHERE f64_tdigest < 7;
-SELECT count(*) FROM tab WHERE f64_minmax < 7;
-SELECT count(*) FROM tab WHERE f64_countmin < 7;
-SELECT count(*) FROM tab WHERE f64_uniq < 7;
-
-SELECT count(*) FROM tab WHERE f64 < 7.7;
-SELECT count(*) FROM tab WHERE f64_tdigest < 7.7;
-SELECT count(*) FROM tab WHERE f64_minmax < 7.7;
-SELECT count(*) FROM tab WHERE f64_countmin < 7.7;
-SELECT count(*) FROM tab WHERE f64_uniq < 7.7;
-
-SELECT count(*) FROM tab WHERE f64 < '7';
-SELECT count(*) FROM tab WHERE f64_tdigest < '7';
-SELECT count(*) FROM tab WHERE f64_minmax < '7';
-SELECT count(*) FROM tab WHERE f64_countmin < '7';
-SELECT count(*) FROM tab WHERE f64_uniq < '7';
-
-SELECT count(*) FROM tab WHERE f64 < '7.7';
-SELECT count(*) FROM tab WHERE f64_tdigest < '7.7';
-SELECT count(*) FROM tab WHERE f64_minmax < '7.7';
-SELECT count(*) FROM tab WHERE f64_countmin < '7.7';
-SELECT count(*) FROM tab WHERE f64_uniq < '7.7';
-
--- dt ----------------------------------------------------
-
-SELECT 'dt and =';
-
-SELECT count(*) FROM tab WHERE dt = '2024-08-08 11:12:13';
-SELECT count(*) FROM tab WHERE dt_tdigest = '2024-08-08 11:12:13';
-SELECT count(*) FROM tab WHERE dt_minmax = '2024-08-08 11:12:13';
-SELECT count(*) FROM tab WHERE dt_countmin = '2024-08-08 11:12:13';
-SELECT count(*) FROM tab WHERE dt_uniq = '2024-08-08 11:12:13';
-
-SELECT count(*) FROM tab WHERE dt = 7;
-SELECT count(*) FROM tab WHERE dt_tdigest = 7;
-SELECT count(*) FROM tab WHERE dt_minmax = 7;
-SELECT count(*) FROM tab WHERE dt_countmin = 7;
-SELECT count(*) FROM tab WHERE dt_uniq = 7;
-
-SELECT 'dt and <';
-
-SELECT count(*) FROM tab WHERE dt < '2024-08-08 11:12:13';
-SELECT count(*) FROM tab WHERE dt_tdigest < '2024-08-08 11:12:13';
-SELECT count(*) FROM tab WHERE dt_minmax < '2024-08-08 11:12:13';
-SELECT count(*) FROM tab WHERE dt_countmin < '2024-08-08 11:12:13';
-SELECT count(*) FROM tab WHERE dt_uniq < '2024-08-08 11:12:13';
-
-SELECT count(*) FROM tab WHERE dt < 7;
-SELECT count(*) FROM tab WHERE dt_tdigest < 7;
-SELECT count(*) FROM tab WHERE dt_minmax < 7;
-SELECT count(*) FROM tab WHERE dt_countmin < 7;
-SELECT count(*) FROM tab WHERE dt_uniq < 7;
-
--- b ----------------------------------------------------
-
-SELECT 'b and =';
-
-SELECT count(*) FROM tab WHERE b = true;
-SELECT count(*) FROM tab WHERE b_tdigest = true;
-SELECT count(*) FROM tab WHERE b_minmax = true;
-SELECT count(*) FROM tab WHERE b_countmin = true;
-SELECT count(*) FROM tab WHERE b_uniq = true;
-
-SELECT count(*) FROM tab WHERE b = 'true';
-SELECT count(*) FROM tab WHERE b_tdigest = 'true';
-SELECT count(*) FROM tab WHERE b_minmax = 'true';
-SELECT count(*) FROM tab WHERE b_countmin = 'true';
-SELECT count(*) FROM tab WHERE b_uniq = 'true';
-
-SELECT count(*) FROM tab WHERE b = 1;
-SELECT count(*) FROM tab WHERE b_tdigest = 1;
-SELECT count(*) FROM tab WHERE b_minmax = 1;
-SELECT count(*) FROM tab WHERE b_countmin = 1;
-SELECT count(*) FROM tab WHERE b_uniq = 1;
-
-SELECT count(*) FROM tab WHERE b = 1.1;
-SELECT count(*) FROM tab WHERE b_tdigest = 1.1;
-SELECT count(*) FROM tab WHERE b_minmax = 1.1;
-SELECT count(*) FROM tab WHERE b_countmin = 1.1;
-SELECT count(*) FROM tab WHERE b_uniq = 1.1;
-
--- s ----------------------------------------------------
-
-SELECT 's and =';
-
-SELECT count(*) FROM tab WHERE s = 7; -- { serverError NO_COMMON_TYPE }
--- SELECT count(*) FROM tab WHERE s_tdigest = 7; -- not supported
--- SELECT count(*) FROM tab WHERE s_minmax = 7; -- not supported
-SELECT count(*) FROM tab WHERE s_countmin = 7; -- { serverError NO_COMMON_TYPE }
-SELECT count(*) FROM tab WHERE s_uniq = 7; -- { serverError NO_COMMON_TYPE }
-
-SELECT count(*) FROM tab WHERE s = '7';
--- SELECT count(*) FROM tab WHERE s_tdigest = '7'; -- not supported
--- SELECT count(*) FROM tab WHERE s_minmax = '7'; -- not supported
-SELECT count(*) FROM tab WHERE s_countmin = '7';
-SELECT count(*) FROM tab WHERE s_uniq = '7';
-
-DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02864_statistics_uniq.reference b/tests/queries/0_stateless/02864_statistics_uniq.reference
new file mode 100644
index 00000000000..77786dbdd8c
--- /dev/null
+++ b/tests/queries/0_stateless/02864_statistics_uniq.reference
@@ -0,0 +1,35 @@
+CREATE TABLE default.t1\n(\n    `a` Float64 STATISTICS(tdigest),\n    `b` Int64 STATISTICS(tdigest),\n    `c` Int64 STATISTICS(tdigest, uniq),\n    `pk` String\n)\nENGINE = MergeTree\nORDER BY pk\nSETTINGS min_bytes_for_wide_part = 0, index_granularity = 8192
+After insert
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(a, 10), equals(c, 0), less(b, 10)) (removed)
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(equals(c, 11), less(a, 10), less(b, 10)) (removed)
+After merge
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(a, 10), equals(c, 0), less(b, 10)) (removed)
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(equals(c, 11), less(a, 10), less(b, 10)) (removed)
+After modify TDigest
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(a, 10), equals(c, 11), less(b, 10)) (removed)
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(a, 10), equals(c, 0), less(b, 10)) (removed)
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(c, -1), less(a, 10), less(b, 10)) (removed)
+After drop
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(a, 10), equals(c, 11), less(b, 10)) (removed)
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(a, 10), equals(c, 0), less(b, 10)) (removed)
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(a, 10), less(c, -1), less(b, 10)) (removed)
diff --git a/tests/queries/0_stateless/02864_statistics_uniq.sql b/tests/queries/0_stateless/02864_statistics_uniq.sql
new file mode 100644
index 00000000000..d496392668b
--- /dev/null
+++ b/tests/queries/0_stateless/02864_statistics_uniq.sql
@@ -0,0 +1,72 @@
+DROP TABLE IF EXISTS t1;
+
+SET allow_experimental_statistics = 1;
+SET allow_statistics_optimize = 1;
+SET mutations_sync = 1;
+
+CREATE TABLE t1
+(
+    a Float64 STATISTICS(tdigest),
+    b Int64 STATISTICS(tdigest),
+    c Int64 STATISTICS(tdigest, uniq),
+    pk String,
+) Engine = MergeTree() ORDER BY pk
+SETTINGS min_bytes_for_wide_part = 0;
+
+SHOW CREATE TABLE t1;
+
+INSERT INTO t1 select number, -number, number/1000, generateUUIDv4() FROM system.numbers LIMIT 10000;
+INSERT INTO t1 select 0, 0, 11, generateUUIDv4();
+
+SELECT 'After insert';
+SELECT replaceRegexpAll(explain, '__table1.|_UInt8|_Int8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM t1 WHERE b < 10 and c = 0 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+SELECT replaceRegexpAll(explain, '__table1.|_UInt8|_Int8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM t1 WHERE b < 10 and c = 11 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+OPTIMIZE TABLE t1 FINAL;
+
+SELECT 'After merge';
+SELECT replaceRegexpAll(explain, '__table1.|_UInt8|_Int8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM t1 WHERE b < 10 and c = 0 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+SELECT replaceRegexpAll(explain, '__table1.|_UInt8|_Int8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM t1 WHERE b < 10 and c = 11 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+
+SELECT 'After modify TDigest';
+ALTER TABLE t1 MODIFY STATISTICS c TYPE TDigest;
+ALTER TABLE t1 MATERIALIZE STATISTICS c;
+
+SELECT replaceRegexpAll(explain, '__table1.|_UInt8|_Int8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM t1 WHERE b < 10 and c = 11 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+SELECT replaceRegexpAll(explain, '__table1.|_UInt8|_Int8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM t1 WHERE b < 10 and c = 0 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+SELECT replaceRegexpAll(explain, '__table1.|_UInt8|_Int8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM t1 WHERE b < 10 and c < -1 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+
+
+ALTER TABLE t1 DROP STATISTICS c;
+
+SELECT 'After drop';
+SELECT replaceRegexpAll(explain, '__table1.|_UInt8|_Int8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM t1 WHERE b < 10 and c = 11 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+SELECT replaceRegexpAll(explain, '__table1.|_UInt8|_Int8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM t1 WHERE b < 10 and c = 0 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+SELECT replaceRegexpAll(explain, '__table1.|_UInt8|_Int8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM t1 WHERE b < 10 and c < -1 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+SET allow_suspicious_low_cardinality_types=1;
+CREATE TABLE t2
+(
+    a Float64 STATISTICS(tdigest),
+    b Int64 STATISTICS(tdigest),
+    c LowCardinality(Int64) STATISTICS(tdigest, uniq),
+    pk String,
+) Engine = MergeTree() ORDER BY pk
+SETTINGS min_bytes_for_wide_part = 0;
+INSERT INTO t2 select number, -number, number/1000, generateUUIDv4() FROM system.numbers LIMIT 10000;
+
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+
+CREATE TABLE t3
+(
+    a Float64 STATISTICS(tdigest),
+    b Int64 STATISTICS(tdigest),
+    c Nullable(Int64) STATISTICS(tdigest, uniq),
+    pk String,
+) Engine = MergeTree() ORDER BY pk
+SETTINGS min_bytes_for_wide_part = 0;
+INSERT INTO t3 select number, -number, number/1000, generateUUIDv4() FROM system.numbers LIMIT 10000;
+
+DROP TABLE IF EXISTS t3;
diff --git a/tests/queries/0_stateless/02864_statistics_usage.reference b/tests/queries/0_stateless/02864_statistics_usage.reference
deleted file mode 100644
index a9f669b88c1..00000000000
--- a/tests/queries/0_stateless/02864_statistics_usage.reference
+++ /dev/null
@@ -1,20 +0,0 @@
-After insert
-        Prewhere info
-          Prewhere filter
-          Prewhere filter column: and(less(a, 10_UInt8), less(b, 10_UInt8)) (removed)
-After drop statistic
-        Prewhere info
-          Prewhere filter
-          Prewhere filter column: and(less(b, 10_UInt8), less(a, 10_UInt8)) (removed)
-After add and materialize statistic
-        Prewhere info
-          Prewhere filter
-          Prewhere filter column: and(less(a, 10_UInt8), less(b, 10_UInt8)) (removed)
-After merge
-        Prewhere info
-          Prewhere filter
-          Prewhere filter column: and(less(a, 10_UInt8), less(b, 10_UInt8)) (removed)
-After rename
-        Prewhere info
-          Prewhere filter
-          Prewhere filter column: and(less(a, 10_UInt8), less(c, 10_UInt8)) (removed)
diff --git a/tests/queries/0_stateless/02864_statistics_usage.sql b/tests/queries/0_stateless/02864_statistics_usage.sql
deleted file mode 100644
index 4956bd27e87..00000000000
--- a/tests/queries/0_stateless/02864_statistics_usage.sql
+++ /dev/null
@@ -1,42 +0,0 @@
--- Test that the optimizer picks up column statistics
--- (The concrete statistics type, column data type and predicate type don't matter)
-
--- Checks by the predicate evaluation order in EXPLAIN. This is quite fragile, a better approach would be helpful (maybe 'send_logs_level'?)
-
-SET allow_experimental_statistics = 1;
-SET allow_statistics_optimize = 1;
-SET mutations_sync = 1;
-SET enable_analyzer = 1;
-
-DROP TABLE IF EXISTS tab;
-
-CREATE TABLE tab
-(
-    a Float64 STATISTICS(tdigest),
-    b Int64 STATISTICS(tdigest)
-) Engine = MergeTree() ORDER BY tuple()
-SETTINGS min_bytes_for_wide_part = 0;
-
-INSERT INTO tab select number, -number FROM system.numbers LIMIT 10000;
-SELECT 'After insert';
-SELECT replaceRegexpAll(explain, '__table1\.', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM tab WHERE b < 10 and a < 10) WHERE explain LIKE '%Prewhere%'; -- checks a first, then b (statistics used)
-
-ALTER TABLE tab DROP STATISTICS a, b;
-SELECT 'After drop statistic';
-SELECT replaceRegexpAll(explain, '__table1\.', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM tab WHERE b < 10 and a < 10) WHERE explain LIKE '%Prewhere%'; -- checks b first, then a (statistics not used)
-
-ALTER TABLE tab ADD STATISTICS a, b TYPE tdigest;
-ALTER TABLE tab MATERIALIZE STATISTICS a, b;
-INSERT INTO tab select number, -number FROM system.numbers LIMIT 10000;
-SELECT 'After add and materialize statistic';
-SELECT replaceRegexpAll(explain, '__table1\.', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM tab WHERE b < 10 and a < 10) WHERE explain LIKE '%Prewhere%'; -- checks a first, then b (statistics used)
-
-OPTIMIZE TABLE tab FINAL;
-SELECT 'After merge';
-SELECT replaceRegexpAll(explain, '__table1\.', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM tab WHERE b < 10 and a < 10) WHERE explain LIKE '%Prewhere%'; -- checks a first, then b (statistics used)
-
-ALTER TABLE tab RENAME COLUMN b TO c;
-SELECT 'After rename';
-SELECT replaceRegexpAll(explain, '__table1\.', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM tab WHERE c < 10 and a < 10) WHERE explain LIKE '%Prewhere%'; -- checks a first, then c (statistics used)
-
-DROP TABLE IF EXISTS tab;
diff --git a/tests/queries/0_stateless/02866_size_of_marks_skip_idx_explain.sql b/tests/queries/0_stateless/02866_size_of_marks_skip_idx_explain.sql
index b3adf38710a..b916c5ca13d 100644
--- a/tests/queries/0_stateless/02866_size_of_marks_skip_idx_explain.sql
+++ b/tests/queries/0_stateless/02866_size_of_marks_skip_idx_explain.sql
@@ -4,7 +4,7 @@ SET optimize_move_to_prewhere = 1;
 SET convert_query_to_cnf = 0;
 SET optimize_read_in_order = 1;
 
-SET enable_analyzer = 1; -- slightly different operator names than w/o
+SET allow_experimental_analyzer = 1; -- slightly different operator names than w/o
 
 DROP TABLE IF EXISTS test_skip_idx;
 
diff --git a/tests/queries/0_stateless/02868_distinct_to_count_optimization.reference b/tests/queries/0_stateless/02868_distinct_to_count_optimization.reference
index 3dedcedbcee..c2075f72f33 100644
--- a/tests/queries/0_stateless/02868_distinct_to_count_optimization.reference
+++ b/tests/queries/0_stateless/02868_distinct_to_count_optimization.reference
@@ -6,7 +6,7 @@ FROM
     SELECT DISTINCT a
     FROM test_rewrite_uniq_to_count
 )
-SETTINGS enable_analyzer = 0
+SETTINGS allow_experimental_analyzer = 0
 3
 QUERY id: 0
   PROJECTION COLUMNS
@@ -23,7 +23,7 @@ QUERY id: 0
           COLUMN id: 5, column_name: a, result_type: UInt8, source_id: 6
       JOIN TREE
         TABLE id: 6, alias: __table2, table_name: default.test_rewrite_uniq_to_count
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 2. test distinct with subquery alias
 3
 SELECT count()
@@ -32,7 +32,7 @@ FROM
     SELECT DISTINCT a
     FROM test_rewrite_uniq_to_count
 ) AS t
-SETTINGS enable_analyzer = 0
+SETTINGS allow_experimental_analyzer = 0
 3
 QUERY id: 0
   PROJECTION COLUMNS
@@ -49,7 +49,7 @@ QUERY id: 0
           COLUMN id: 5, column_name: a, result_type: UInt8, source_id: 6
       JOIN TREE
         TABLE id: 6, alias: __table2, table_name: default.test_rewrite_uniq_to_count
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 3. test distinct with compound column name
 3
 SELECT count()
@@ -58,7 +58,7 @@ FROM
     SELECT DISTINCT a
     FROM test_rewrite_uniq_to_count
 ) AS t
-SETTINGS enable_analyzer = 0
+SETTINGS allow_experimental_analyzer = 0
 3
 QUERY id: 0
   PROJECTION COLUMNS
@@ -75,7 +75,7 @@ QUERY id: 0
           COLUMN id: 5, column_name: a, result_type: UInt8, source_id: 6
       JOIN TREE
         TABLE id: 6, alias: __table2, table_name: default.test_rewrite_uniq_to_count
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 4. test distinct with select expression alias
 3
 SELECT count()
@@ -84,7 +84,7 @@ FROM
     SELECT DISTINCT a AS alias_of_a
     FROM test_rewrite_uniq_to_count
 ) AS t
-SETTINGS enable_analyzer = 0
+SETTINGS allow_experimental_analyzer = 0
 3
 QUERY id: 0
   PROJECTION COLUMNS
@@ -101,7 +101,7 @@ QUERY id: 0
           COLUMN id: 5, column_name: a, result_type: UInt8, source_id: 6
       JOIN TREE
         TABLE id: 6, alias: __table2, table_name: default.test_rewrite_uniq_to_count
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 5. test simple group by
 3
 SELECT count()
@@ -113,7 +113,7 @@ FROM
     FROM test_rewrite_uniq_to_count
     GROUP BY a
 )
-SETTINGS enable_analyzer = 0
+SETTINGS allow_experimental_analyzer = 0
 3
 QUERY id: 0
   PROJECTION COLUMNS
@@ -133,7 +133,7 @@ QUERY id: 0
       GROUP BY
         LIST id: 7, nodes: 1
           COLUMN id: 5, column_name: a, result_type: UInt8, source_id: 6
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 6. test group by with subquery alias
 3
 SELECT count()
@@ -145,7 +145,7 @@ FROM
     FROM test_rewrite_uniq_to_count
     GROUP BY a
 ) AS t
-SETTINGS enable_analyzer = 0
+SETTINGS allow_experimental_analyzer = 0
 3
 QUERY id: 0
   PROJECTION COLUMNS
@@ -165,7 +165,7 @@ QUERY id: 0
       GROUP BY
         LIST id: 7, nodes: 1
           COLUMN id: 5, column_name: a, result_type: UInt8, source_id: 6
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 7. test group by with compound column name
 3
 SELECT count()
@@ -177,7 +177,7 @@ FROM
     FROM test_rewrite_uniq_to_count
     GROUP BY a
 ) AS t
-SETTINGS enable_analyzer = 0
+SETTINGS allow_experimental_analyzer = 0
 3
 QUERY id: 0
   PROJECTION COLUMNS
@@ -197,7 +197,7 @@ QUERY id: 0
       GROUP BY
         LIST id: 7, nodes: 1
           COLUMN id: 5, column_name: a, result_type: UInt8, source_id: 6
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
 8. test group by with select expression alias
 3
 SELECT count()
@@ -209,7 +209,7 @@ FROM
     FROM test_rewrite_uniq_to_count
     GROUP BY alias_of_a
 ) AS t
-SETTINGS enable_analyzer = 0
+SETTINGS allow_experimental_analyzer = 0
 3
 QUERY id: 0
   PROJECTION COLUMNS
@@ -229,4 +229,4 @@ QUERY id: 0
       GROUP BY
         LIST id: 7, nodes: 1
           COLUMN id: 5, column_name: a, result_type: UInt8, source_id: 6
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
diff --git a/tests/queries/0_stateless/02868_distinct_to_count_optimization.sql b/tests/queries/0_stateless/02868_distinct_to_count_optimization.sql
index d30bade4dd5..66431b7c36b 100644
--- a/tests/queries/0_stateless/02868_distinct_to_count_optimization.sql
+++ b/tests/queries/0_stateless/02868_distinct_to_count_optimization.sql
@@ -16,53 +16,53 @@ set optimize_uniq_to_count=true;
 
 
 SELECT '1. test simple distinct';
-SELECT uniq(a) FROM (SELECT DISTINCT a FROM test_rewrite_uniq_to_count) settings enable_analyzer=0;
-EXPLAIN SYNTAX SELECT uniq(a) FROM (SELECT DISTINCT a FROM test_rewrite_uniq_to_count) settings enable_analyzer=0;
-SELECT uniq(a) FROM (SELECT DISTINCT a FROM test_rewrite_uniq_to_count) settings enable_analyzer=1;
-EXPLAIN QUERY TREE SELECT uniq(a) FROM (SELECT DISTINCT a FROM test_rewrite_uniq_to_count) settings enable_analyzer=1;
+SELECT uniq(a) FROM (SELECT DISTINCT a FROM test_rewrite_uniq_to_count) settings allow_experimental_analyzer=0;
+EXPLAIN SYNTAX SELECT uniq(a) FROM (SELECT DISTINCT a FROM test_rewrite_uniq_to_count) settings allow_experimental_analyzer=0;
+SELECT uniq(a) FROM (SELECT DISTINCT a FROM test_rewrite_uniq_to_count) settings allow_experimental_analyzer=1;
+EXPLAIN QUERY TREE SELECT uniq(a) FROM (SELECT DISTINCT a FROM test_rewrite_uniq_to_count) settings allow_experimental_analyzer=1;
 
 
 SELECT '2. test distinct with subquery alias';
-SELECT uniq(t.a) FROM (SELECT DISTINCT a FROM test_rewrite_uniq_to_count) t settings enable_analyzer=0;
-EXPLAIN SYNTAX SELECT uniq(a) FROM (SELECT DISTINCT a FROM test_rewrite_uniq_to_count) t settings enable_analyzer=0;
-SELECT uniq(t.a) FROM (SELECT DISTINCT a FROM test_rewrite_uniq_to_count) t settings enable_analyzer=1;
-EXPLAIN QUERY TREE SELECT uniq(t.a) FROM (SELECT DISTINCT a FROM test_rewrite_uniq_to_count) t settings enable_analyzer=1;
+SELECT uniq(t.a) FROM (SELECT DISTINCT a FROM test_rewrite_uniq_to_count) t settings allow_experimental_analyzer=0;
+EXPLAIN SYNTAX SELECT uniq(a) FROM (SELECT DISTINCT a FROM test_rewrite_uniq_to_count) t settings allow_experimental_analyzer=0;
+SELECT uniq(t.a) FROM (SELECT DISTINCT a FROM test_rewrite_uniq_to_count) t settings allow_experimental_analyzer=1;
+EXPLAIN QUERY TREE SELECT uniq(t.a) FROM (SELECT DISTINCT a FROM test_rewrite_uniq_to_count) t settings allow_experimental_analyzer=1;
 
 SELECT '3. test distinct with compound column name';
-SELECT uniq(a) FROM (SELECT DISTINCT test_rewrite_uniq_to_count.a FROM test_rewrite_uniq_to_count) t settings enable_analyzer=0;
-EXPLAIN SYNTAX SELECT uniq(a) FROM (SELECT DISTINCT test_rewrite_uniq_to_count.a FROM test_rewrite_uniq_to_count) t settings enable_analyzer=0;
-SELECT uniq(a) FROM (SELECT DISTINCT test_rewrite_uniq_to_count.a FROM test_rewrite_uniq_to_count) t settings enable_analyzer=1;
-EXPLAIN QUERY TREE SELECT uniq(a) FROM (SELECT DISTINCT test_rewrite_uniq_to_count.a FROM test_rewrite_uniq_to_count) t settings enable_analyzer=1;
+SELECT uniq(a) FROM (SELECT DISTINCT test_rewrite_uniq_to_count.a FROM test_rewrite_uniq_to_count) t settings allow_experimental_analyzer=0;
+EXPLAIN SYNTAX SELECT uniq(a) FROM (SELECT DISTINCT test_rewrite_uniq_to_count.a FROM test_rewrite_uniq_to_count) t settings allow_experimental_analyzer=0;
+SELECT uniq(a) FROM (SELECT DISTINCT test_rewrite_uniq_to_count.a FROM test_rewrite_uniq_to_count) t settings allow_experimental_analyzer=1;
+EXPLAIN QUERY TREE SELECT uniq(a) FROM (SELECT DISTINCT test_rewrite_uniq_to_count.a FROM test_rewrite_uniq_to_count) t settings allow_experimental_analyzer=1;
 
 SELECT '4. test distinct with select expression alias';
-SELECT uniq(alias_of_a) FROM (SELECT DISTINCT a as alias_of_a FROM test_rewrite_uniq_to_count) t settings enable_analyzer=0;
-EXPLAIN SYNTAX SELECT uniq(alias_of_a) FROM (SELECT DISTINCT a as alias_of_a FROM test_rewrite_uniq_to_count) t settings enable_analyzer=0;
-SELECT uniq(alias_of_a) FROM (SELECT DISTINCT a as alias_of_a FROM test_rewrite_uniq_to_count) t settings enable_analyzer=1;
-EXPLAIN QUERY TREE SELECT uniq(alias_of_a) FROM (SELECT DISTINCT a as alias_of_a FROM test_rewrite_uniq_to_count) t settings enable_analyzer=1;
+SELECT uniq(alias_of_a) FROM (SELECT DISTINCT a as alias_of_a FROM test_rewrite_uniq_to_count) t settings allow_experimental_analyzer=0;
+EXPLAIN SYNTAX SELECT uniq(alias_of_a) FROM (SELECT DISTINCT a as alias_of_a FROM test_rewrite_uniq_to_count) t settings allow_experimental_analyzer=0;
+SELECT uniq(alias_of_a) FROM (SELECT DISTINCT a as alias_of_a FROM test_rewrite_uniq_to_count) t settings allow_experimental_analyzer=1;
+EXPLAIN QUERY TREE SELECT uniq(alias_of_a) FROM (SELECT DISTINCT a as alias_of_a FROM test_rewrite_uniq_to_count) t settings allow_experimental_analyzer=1;
 
 
 SELECT '5. test simple group by';
-SELECT uniq(a) FROM (SELECT a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) settings enable_analyzer=0;
-EXPLAIN SYNTAX SELECT uniq(a) FROM (SELECT a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) settings enable_analyzer=0;
-SELECT uniq(a) FROM (SELECT a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) settings enable_analyzer=1;
-EXPLAIN QUERY TREE SELECT uniq(a) FROM (SELECT a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) settings enable_analyzer=1;
+SELECT uniq(a) FROM (SELECT a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) settings allow_experimental_analyzer=0;
+EXPLAIN SYNTAX SELECT uniq(a) FROM (SELECT a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) settings allow_experimental_analyzer=0;
+SELECT uniq(a) FROM (SELECT a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) settings allow_experimental_analyzer=1;
+EXPLAIN QUERY TREE SELECT uniq(a) FROM (SELECT a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) settings allow_experimental_analyzer=1;
 
 SELECT '6. test group by with subquery alias';
-SELECT uniq(t.a) FROM (SELECT a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) t settings enable_analyzer=0;
-EXPLAIN SYNTAX SELECT uniq(t.a) FROM (SELECT a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) t settings enable_analyzer=0;
-SELECT uniq(t.a) FROM (SELECT a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) t settings enable_analyzer=1;
-EXPLAIN QUERY TREE SELECT uniq(t.a) FROM (SELECT a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) t settings enable_analyzer=1;
+SELECT uniq(t.a) FROM (SELECT a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) t settings allow_experimental_analyzer=0;
+EXPLAIN SYNTAX SELECT uniq(t.a) FROM (SELECT a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) t settings allow_experimental_analyzer=0;
+SELECT uniq(t.a) FROM (SELECT a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) t settings allow_experimental_analyzer=1;
+EXPLAIN QUERY TREE SELECT uniq(t.a) FROM (SELECT a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) t settings allow_experimental_analyzer=1;
 
 SELECT '7. test group by with compound column name';
-SELECT uniq(t.alias_of_a) FROM (SELECT a as alias_of_a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) t settings enable_analyzer=0;
-EXPLAIN SYNTAX SELECT uniq(t.alias_of_a) FROM (SELECT a as alias_of_a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) t settings enable_analyzer=0;
-SELECT uniq(t.alias_of_a) FROM (SELECT a as alias_of_a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) t settings enable_analyzer=1;
-EXPLAIN QUERY TREE SELECT uniq(t.alias_of_a) FROM (SELECT a as alias_of_a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) t settings enable_analyzer=1;
+SELECT uniq(t.alias_of_a) FROM (SELECT a as alias_of_a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) t settings allow_experimental_analyzer=0;
+EXPLAIN SYNTAX SELECT uniq(t.alias_of_a) FROM (SELECT a as alias_of_a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) t settings allow_experimental_analyzer=0;
+SELECT uniq(t.alias_of_a) FROM (SELECT a as alias_of_a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) t settings allow_experimental_analyzer=1;
+EXPLAIN QUERY TREE SELECT uniq(t.alias_of_a) FROM (SELECT a as alias_of_a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY a) t settings allow_experimental_analyzer=1;
 
 SELECT '8. test group by with select expression alias';
-SELECT uniq(t.alias_of_a) FROM (SELECT a as alias_of_a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY alias_of_a) t settings enable_analyzer=0;
-EXPLAIN SYNTAX SELECT uniq(t.alias_of_a) FROM (SELECT a as alias_of_a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY alias_of_a) t  settings enable_analyzer=0;
-SELECT uniq(t.alias_of_a) FROM (SELECT a as alias_of_a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY alias_of_a) t  settings enable_analyzer=1;
-EXPLAIN QUERY TREE SELECT uniq(t.alias_of_a) FROM (SELECT a as alias_of_a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY alias_of_a) t  settings enable_analyzer=1;
+SELECT uniq(t.alias_of_a) FROM (SELECT a as alias_of_a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY alias_of_a) t settings allow_experimental_analyzer=0;
+EXPLAIN SYNTAX SELECT uniq(t.alias_of_a) FROM (SELECT a as alias_of_a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY alias_of_a) t  settings allow_experimental_analyzer=0;
+SELECT uniq(t.alias_of_a) FROM (SELECT a as alias_of_a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY alias_of_a) t  settings allow_experimental_analyzer=1;
+EXPLAIN QUERY TREE SELECT uniq(t.alias_of_a) FROM (SELECT a as alias_of_a, sum(b) FROM test_rewrite_uniq_to_count GROUP BY alias_of_a) t  settings allow_experimental_analyzer=1;
 
 drop table if exists test_rewrite_uniq_to_count;
diff --git a/tests/queries/0_stateless/02868_no_merge_across_partitions_final_with_lonely.sh b/tests/queries/0_stateless/02868_no_merge_across_partitions_final_with_lonely.sh
index be0ef4e2648..4bc29ce4233 100755
--- a/tests/queries/0_stateless/02868_no_merge_across_partitions_final_with_lonely.sh
+++ b/tests/queries/0_stateless/02868_no_merge_across_partitions_final_with_lonely.sh
@@ -7,7 +7,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} -m -q """
+${CLICKHOUSE_CLIENT} -nm -q """
 DROP TABLE IF EXISTS with_lonely;
 
 CREATE TABLE with_lonely
@@ -23,7 +23,7 @@ ORDER BY (id);
 """
 
 create_optimize_partition() {
-    ${CLICKHOUSE_CLIENT} -m -q """
+    ${CLICKHOUSE_CLIENT} -nm -q """
     INSERT INTO with_lonely SELECT number, '$1', number*10, 0 FROM numbers(10);
     INSERT INTO with_lonely SELECT number+500000, '$1', number*10, 1 FROM numbers(10);
     """
@@ -39,7 +39,7 @@ create_optimize_partition "2022-10-29"
 create_optimize_partition "2022-10-30"
 create_optimize_partition "2022-10-31"
 
-${CLICKHOUSE_CLIENT} -m -q """
+${CLICKHOUSE_CLIENT} -nm -q """
 SYSTEM STOP MERGES with_lonely;
 
 INSERT INTO with_lonely SELECT number, '2022-11-01', number*10, 0 FROM numbers(10);
diff --git a/tests/queries/0_stateless/02870_per_column_settings.sql b/tests/queries/0_stateless/02870_per_column_settings.sql
index c3050222bc8..d242ebe6c61 100644
--- a/tests/queries/0_stateless/02870_per_column_settings.sql
+++ b/tests/queries/0_stateless/02870_per_column_settings.sql
@@ -49,7 +49,7 @@ CREATE TABLE tab
 (
     id UInt64,
     tup Tuple(UInt64, UInt64) SETTINGS (min_compress_block_size = 81920, max_compress_block_size = 163840),
-    json Object('json') 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
diff --git a/tests/queries/0_stateless/02871_clickhouse_client_restart_pager.sh b/tests/queries/0_stateless/02871_clickhouse_client_restart_pager.sh
index 418e439e44b..cc4ce9b122e 100755
--- a/tests/queries/0_stateless/02871_clickhouse_client_restart_pager.sh
+++ b/tests/queries/0_stateless/02871_clickhouse_client_restart_pager.sh
@@ -7,7 +7,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # head by default print 10 rows, but it is not enough to query 11 rows, since
 # we need to overflow the default pipe size, hence just 1 million of rows (it
 # should be around 6 MiB in text representation, should be definitelly enough).
-$CLICKHOUSE_CLIENT --ignore-error -m --pager head -q "
+$CLICKHOUSE_CLIENT --ignore-error -nm --pager head -q "
     select * from numbers(1e6); -- { clientError CANNOT_WRITE_TO_FILE_DESCRIPTOR }
     select * from numbers(1e6); -- { clientError CANNOT_WRITE_TO_FILE_DESCRIPTOR }
 "
diff --git a/tests/queries/0_stateless/02871_peak_threads_usage.sh b/tests/queries/0_stateless/02871_peak_threads_usage.sh
index 0f0473bbb47..dfb3e665020 100755
--- a/tests/queries/0_stateless/02871_peak_threads_usage.sh
+++ b/tests/queries/0_stateless/02871_peak_threads_usage.sh
@@ -26,7 +26,7 @@ ${CLICKHOUSE_CLIENT} --query_id="${UNIQUE_QUERY_ID}_6" --query='SELECT * FROM nu
 ${CLICKHOUSE_CLIENT} --query_id="${UNIQUE_QUERY_ID}_7" --query='SELECT * FROM numbers_mt(5000), numbers(5000) SETTINGS max_threads = 1, joined_subquery_requires_alias=0' "${QUERY_OPTIONS[@]}"
 ${CLICKHOUSE_CLIENT} --query_id="${UNIQUE_QUERY_ID}_8" --query='SELECT * FROM numbers_mt(5000), numbers(5000) SETTINGS max_threads = 4, joined_subquery_requires_alias=0' "${QUERY_OPTIONS[@]}"
 
-${CLICKHOUSE_CLIENT} --query_id="${UNIQUE_QUERY_ID}_9" -m --query="""
+${CLICKHOUSE_CLIENT} --query_id="${UNIQUE_QUERY_ID}_9" -mn --query="""
 SELECT count() FROM 
     (SELECT number FROM numbers_mt(1,100000) 
             UNION ALL SELECT number FROM numbers_mt(10000, 200000)
@@ -38,7 +38,7 @@ SELECT count() FROM
             UNION ALL SELECT number FROM numbers_mt(300000, 4000000)
     ) SETTINGS max_threads = 1""" "${QUERY_OPTIONS[@]}"
 
-${CLICKHOUSE_CLIENT} --query_id="${UNIQUE_QUERY_ID}_10" -m --query="""
+${CLICKHOUSE_CLIENT} --query_id="${UNIQUE_QUERY_ID}_10" -mn --query="""
 SELECT count() FROM 
     (SELECT number FROM numbers_mt(1,100000) 
             UNION ALL SELECT number FROM numbers_mt(10000, 2000)
@@ -50,7 +50,7 @@ SELECT count() FROM
             UNION ALL SELECT number FROM numbers_mt(300000, 4000000)
     ) SETTINGS max_threads = 4""" "${QUERY_OPTIONS[@]}"
 
-${CLICKHOUSE_CLIENT} --query_id="${UNIQUE_QUERY_ID}_11" -m --query="""
+${CLICKHOUSE_CLIENT} --query_id="${UNIQUE_QUERY_ID}_11" -mn --query="""
 SELECT count() FROM 
     (SELECT number FROM numbers_mt(1,100000) 
             UNION ALL SELECT number FROM numbers_mt(1, 1)
@@ -62,20 +62,20 @@ SELECT count() FROM
             UNION ALL SELECT number FROM numbers_mt(1, 4000000)
     ) SETTINGS max_threads = 4""" "${QUERY_OPTIONS[@]}"
 
-${CLICKHOUSE_CLIENT} --query_id="${UNIQUE_QUERY_ID}_12" -m --query="""
+${CLICKHOUSE_CLIENT} --query_id="${UNIQUE_QUERY_ID}_12" -mn --query="""
 SELECT sum(number) FROM numbers_mt(100000)
 GROUP BY number % 2
 WITH TOTALS ORDER BY number % 2
 SETTINGS max_threads = 4""" "${QUERY_OPTIONS[@]}"
 
-${CLICKHOUSE_CLIENT} --query_id="${UNIQUE_QUERY_ID}_13" -m --query="SELECT * FROM numbers(100000) SETTINGS max_threads = 1" "${QUERY_OPTIONS[@]}"
+${CLICKHOUSE_CLIENT} --query_id="${UNIQUE_QUERY_ID}_13" -mn --query="SELECT * FROM numbers(100000) SETTINGS max_threads = 1" "${QUERY_OPTIONS[@]}"
 
-${CLICKHOUSE_CLIENT} --query_id="${UNIQUE_QUERY_ID}_14" -m --query="SELECT * FROM numbers(100000) SETTINGS max_threads = 4" "${QUERY_OPTIONS[@]}"
+${CLICKHOUSE_CLIENT} --query_id="${UNIQUE_QUERY_ID}_14" -mn --query="SELECT * FROM numbers(100000) SETTINGS max_threads = 4" "${QUERY_OPTIONS[@]}"
 
 ${CLICKHOUSE_CLIENT} -q "SYSTEM FLUSH LOGS"
 for i in {1..14}
 do
-    ${CLICKHOUSE_CLIENT} -m --query="""
+    ${CLICKHOUSE_CLIENT} -mn --query="""
     SELECT '${i}',
            peak_threads_usage, 
            (select count() from system.query_thread_log WHERE system.query_thread_log.query_id = '${UNIQUE_QUERY_ID}_${i}' AND current_database = currentDatabase()) = length(thread_ids),
diff --git a/tests/queries/0_stateless/02874_parquet_multiple_batches_array_inconsistent_offsets.sh b/tests/queries/0_stateless/02874_parquet_multiple_batches_array_inconsistent_offsets.sh
index 2df3e90c98c..c96531ffea9 100755
--- a/tests/queries/0_stateless/02874_parquet_multiple_batches_array_inconsistent_offsets.sh
+++ b/tests/queries/0_stateless/02874_parquet_multiple_batches_array_inconsistent_offsets.sh
@@ -123,7 +123,7 @@ echo "Parquet"
 
 DATA_FILE=$CUR_DIR/data_parquet/string_int_list_inconsistent_offset_multiple_batches.parquet
 
-${CLICKHOUSE_LOCAL} "
+${CLICKHOUSE_LOCAL} --multiquery "
 DROP TABLE IF EXISTS parquet_load;
 CREATE TABLE parquet_load (ints Array(Int64), strings Nullable(String)) ENGINE = Memory;
 INSERT INTO parquet_load FROM INFILE '$DATA_FILE';
diff --git a/tests/queries/0_stateless/02875_clickhouse_local_multiquery.reference b/tests/queries/0_stateless/02875_clickhouse_local_multiquery.reference
index 1cc8f10a4cf..d99881dfa6b 100644
--- a/tests/queries/0_stateless/02875_clickhouse_local_multiquery.reference
+++ b/tests/queries/0_stateless/02875_clickhouse_local_multiquery.reference
@@ -1,7 +1,5 @@
-1
-2
-1
-2
+Multi-statements are not allowed
+Multi-statements are not allowed
 1
 2
 1
diff --git a/tests/queries/0_stateless/02875_clickhouse_local_multiquery.sh b/tests/queries/0_stateless/02875_clickhouse_local_multiquery.sh
index 3a7d861262e..e2dab337dc2 100755
--- a/tests/queries/0_stateless/02875_clickhouse_local_multiquery.sh
+++ b/tests/queries/0_stateless/02875_clickhouse_local_multiquery.sh
@@ -4,12 +4,11 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-# clickhouse-local and clickhouse-client behave the same
-$CLICKHOUSE_CLIENT -q "select 1; select 2;"
-$CLICKHOUSE_LOCAL -q "select 1; select 2;"
-
-# -n is a no-op
-$CLICKHOUSE_CLIENT -q "select 1; select 2;"
-$CLICKHOUSE_LOCAL -q "select 1; select 2;"
+# throw exception
+$CLICKHOUSE_CLIENT -q "select 1; select 2;" 2>&1 | grep -o 'Multi-statements are not allowed'
+$CLICKHOUSE_LOCAL -q "select 1; select 2;" 2>&1 | grep -o 'Multi-statements are not allowed'
+# execute correctly
+$CLICKHOUSE_CLIENT -n -q "select 1; select 2;"
+$CLICKHOUSE_LOCAL -n -q "select 1; select 2;"
 
 exit 0
diff --git a/tests/queries/0_stateless/02875_merge_engine_set_index.sh b/tests/queries/0_stateless/02875_merge_engine_set_index.sh
index f40696c31a9..57b5db374c1 100755
--- a/tests/queries/0_stateless/02875_merge_engine_set_index.sh
+++ b/tests/queries/0_stateless/02875_merge_engine_set_index.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -nq "
     CREATE TABLE t1
     (
         a UInt32,
@@ -38,7 +38,7 @@ $CLICKHOUSE_CLIENT -q "
     ENGINE = Merge(currentDatabase(), 't*');"
 
 query_id="${CLICKHOUSE_DATABASE}_merge_engine_set_index_$RANDOM$RANDOM"
-$CLICKHOUSE_CLIENT --query_id="$query_id" -q "
+$CLICKHOUSE_CLIENT --query_id="$query_id" --multiquery -q "
 SELECT
     a,
     b
@@ -57,7 +57,7 @@ ORDER BY
     b DESC
 FORMAT Null;"
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -nq "
 SYSTEM FLUSH LOGS;
 
 SELECT ProfileEvents['SelectedMarks']
diff --git a/tests/queries/0_stateless/02877_optimize_read_in_order_from_view.sh b/tests/queries/0_stateless/02877_optimize_read_in_order_from_view.sh
index dc9cc71757e..a3a906a9891 100755
--- a/tests/queries/0_stateless/02877_optimize_read_in_order_from_view.sh
+++ b/tests/queries/0_stateless/02877_optimize_read_in_order_from_view.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 set -eo pipefail
 
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP TABLE IF EXISTS view1;
 DROP TABLE IF EXISTS table1;
 CREATE TABLE table1 (number UInt64) ENGINE=MergeTree ORDER BY number SETTINGS index_granularity=1;
diff --git a/tests/queries/0_stateless/02878_use_structure_from_insertion_table_with_explicit_insert_columns.sh b/tests/queries/0_stateless/02878_use_structure_from_insertion_table_with_explicit_insert_columns.sh
index dd08724456b..8bdaa47c111 100755
--- a/tests/queries/0_stateless/02878_use_structure_from_insertion_table_with_explicit_insert_columns.sh
+++ b/tests/queries/0_stateless/02878_use_structure_from_insertion_table_with_explicit_insert_columns.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 $CLICKHOUSE_LOCAL -q "select 42 as x format Native" > $CLICKHOUSE_TEST_UNIQUE_NAME.native
-$CLICKHOUSE_LOCAL -q "
+$CLICKHOUSE_LOCAL -n -q "
 create table test (x UInt64, y UInt64) engine=Memory;
 insert into test (x) select * from file('$CLICKHOUSE_TEST_UNIQUE_NAME.native');
 insert into test (y) select * from file('$CLICKHOUSE_TEST_UNIQUE_NAME.native');
diff --git a/tests/queries/0_stateless/02879_use_structure_from_insertion_table_with_defaults.sh b/tests/queries/0_stateless/02879_use_structure_from_insertion_table_with_defaults.sh
index c7270b65e19..315bbcd544f 100755
--- a/tests/queries/0_stateless/02879_use_structure_from_insertion_table_with_defaults.sh
+++ b/tests/queries/0_stateless/02879_use_structure_from_insertion_table_with_defaults.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 $CLICKHOUSE_LOCAL -q "select 1 as x format Native" > $CLICKHOUSE_TEST_UNIQUE_NAME.native
-$CLICKHOUSE_LOCAL -q "
+$CLICKHOUSE_LOCAL -n -q "
 create table test (x UInt64, y UInt64 default 42) engine=Memory;
 insert into test select * from file('$CLICKHOUSE_TEST_UNIQUE_NAME.native');
 select * from test;
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 83b38955734..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,14 +7,14 @@ CREATE TABLE test_table
 
 INSERT INTO test_table SELECT number, number FROM numbers(10);
 
-set enable_analyzer = 0;
+set allow_experimental_analyzer = 0;
 
 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 enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 
 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');
diff --git a/tests/queries/0_stateless/02883_named_collections_override.sh b/tests/queries/0_stateless/02883_named_collections_override.sh
index 915ce280226..a08c795127d 100755
--- a/tests/queries/0_stateless/02883_named_collections_override.sh
+++ b/tests/queries/0_stateless/02883_named_collections_override.sh
@@ -8,7 +8,7 @@ u1="${CLICKHOUSE_TEST_UNIQUE_NAME}_collection1"
 u2="${CLICKHOUSE_TEST_UNIQUE_NAME}_collection2"
 u3="${CLICKHOUSE_TEST_UNIQUE_NAME}_collection3"
 
-${CLICKHOUSE_CLIENT}  -m --query "
+${CLICKHOUSE_CLIENT}  -nm --query "
 
 DROP NAMED COLLECTION IF EXISTS $u1;
 DROP NAMED COLLECTION IF EXISTS $u2;
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 791515c82d6..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
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 set -e
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
     DROP TABLE IF EXISTS t_async_insert_native_1;
     CREATE TABLE t_async_insert_native_1 (id UInt64, s String) ENGINE = MergeTree ORDER BY id;
 "
@@ -22,7 +22,7 @@ echo '{"id": 1, "s": "aaa"}' \
     | $CLICKHOUSE_CLIENT $async_insert_options -q 'INSERT INTO t_async_insert_native_1 FORMAT JSONEachRow {"id": 2, "s": "bbb"}' 2>&1 \
     | grep -o "NOT_IMPLEMENTED"
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
     SELECT sum(length(entries.bytes)) FROM system.asynchronous_inserts
     WHERE database = '$CLICKHOUSE_DATABASE' AND table = 't_async_insert_native_1';
 
diff --git a/tests/queries/0_stateless/02884_async_insert_native_protocol_2.sh b/tests/queries/0_stateless/02884_async_insert_native_protocol_2.sh
index a8a9209ee68..b9b1854eaef 100755
--- a/tests/queries/0_stateless/02884_async_insert_native_protocol_2.sh
+++ b/tests/queries/0_stateless/02884_async_insert_native_protocol_2.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 set -e
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
     DROP TABLE IF EXISTS t_async_insert_native_2;
     CREATE TABLE t_async_insert_native_2 (id UInt64, s String) ENGINE = MergeTree ORDER BY id;
 "
@@ -18,7 +18,7 @@ echo "(3, 'ccc') (4, 'ddd') (5, 'eee')" | $CLICKHOUSE_CLIENT $async_insert_optio
 
 wait
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
     SELECT * FROM t_async_insert_native_2 ORDER BY id;
 
     SYSTEM FLUSH LOGS;
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 229f13eb821..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
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 set -e
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
     DROP TABLE IF EXISTS t_async_insert_native_3;
     CREATE TABLE t_async_insert_native_3 (id UInt64, s String) ENGINE = MergeTree ORDER BY id;
 "
@@ -21,7 +21,7 @@ $CLICKHOUSE_CLIENT $async_insert_options -q "INSERT INTO t_async_insert_native_3
 
 wait
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
     SELECT format, length(entries.bytes) FROM system.asynchronous_inserts
     WHERE database = '$CLICKHOUSE_DATABASE' AND table = 't_async_insert_native_3'
     ORDER BY format;
diff --git a/tests/queries/0_stateless/02884_async_insert_native_protocol_4.sh b/tests/queries/0_stateless/02884_async_insert_native_protocol_4.sh
index e84c1ca8899..9118c11315c 100755
--- a/tests/queries/0_stateless/02884_async_insert_native_protocol_4.sh
+++ b/tests/queries/0_stateless/02884_async_insert_native_protocol_4.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
     DROP TABLE IF EXISTS t_async_insert_native_4;
     CREATE TABLE t_async_insert_native_4 (id UInt64) ENGINE = MergeTree ORDER BY id;
 "
@@ -20,7 +20,7 @@ echo "(2) (3) (4) (5)" | $CLICKHOUSE_CLIENT_WITH_LOG $async_insert_options --asy
     -q 'INSERT INTO t_async_insert_native_4 FORMAT Values' 2>&1 \
     | grep -c "too much data"
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
     SELECT * FROM t_async_insert_native_4 ORDER BY id;
 
     SYSTEM FLUSH LOGS;
diff --git a/tests/queries/0_stateless/02884_authentication_quota.sh b/tests/queries/0_stateless/02884_authentication_quota.sh
index ef48ac741f0..f013bb4d639 100755
--- a/tests/queries/0_stateless/02884_authentication_quota.sh
+++ b/tests/queries/0_stateless/02884_authentication_quota.sh
@@ -1,12 +1,13 @@
 #!/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_${CLICKHOUSE_DATABASE}"
-USER="2884_user_${CLICKHOUSE_DATABASE}"
-ROLE="2884_role_${CLICKHOUSE_DATABASE}"
+QUOTA="2884_quota_$$"
+USER="2884_user_$$"
+ROLE="2884_role_$$"
 
 
 function login_test()
@@ -25,10 +26,10 @@ function login_test()
 
     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}'"
 
@@ -38,7 +39,7 @@ function login_test()
     ${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'
 
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
index fadbbff7f34..bc14df13b2c 100755
--- 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
@@ -11,7 +11,7 @@ user2="user02884_2_${CLICKHOUSE_DATABASE}_$RANDOM"
 user3="user02884_3_${CLICKHOUSE_DATABASE}_$RANDOM"
 db=${CLICKHOUSE_DATABASE}
 
-${CLICKHOUSE_CLIENT} <<EOF
+${CLICKHOUSE_CLIENT} --multiquery <<EOF
 CREATE TABLE $db.test_table (s String) ENGINE = MergeTree ORDER BY s;
 
 DROP USER IF EXISTS $user1, $user2, $user3;
@@ -20,7 +20,7 @@ GRANT SELECT ON $db.* TO $user1;
 EOF
 
 echo "===== StorageView ====="
-${CLICKHOUSE_CLIENT} <<EOF
+${CLICKHOUSE_CLIENT} --multiquery <<EOF
 CREATE VIEW $db.test_view_1 (s String)
 AS SELECT * FROM $db.test_table;
 
@@ -63,7 +63,7 @@ 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} <<EOF
+${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;
@@ -159,7 +159,7 @@ ${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"
 
-${CLICKHOUSE_CLIENT} <<EOF
+${CLICKHOUSE_CLIENT} --multiquery <<EOF
 CREATE TABLE $db.source
 (
     a UInt64
@@ -234,7 +234,7 @@ ${CLICKHOUSE_CLIENT} --user $user1 --query "
 ${CLICKHOUSE_CLIENT} --query "GRANT SET DEFINER ON $user2 TO $user1"
 
 echo "===== TestRowPolicy ====="
-${CLICKHOUSE_CLIENT} <<EOF
+${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;
@@ -248,7 +248,7 @@ EOF
 
 ${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT * FROM $db.test_view_row_1"
 
-${CLICKHOUSE_CLIENT} <<EOF
+${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;
@@ -264,7 +264,7 @@ ${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT * FROM $db.test_mv_row_2"
 
 echo "===== TestInsertChain ====="
 
-${CLICKHOUSE_CLIENT} <<EOF
+${CLICKHOUSE_CLIENT} --multiquery <<EOF
 CREATE TABLE $db.session_events(
     clientId UUID,
     sessionId UUID,
@@ -304,7 +304,7 @@ ${CLICKHOUSE_CLIENT} --user $user3 --query "SELECT count(*) FROM session_events"
 ${CLICKHOUSE_CLIENT} --query "SELECT count(*) FROM materialized_events"
 
 echo "===== TestOnCluster ====="
-${CLICKHOUSE_CLIENT} <<EOF
+${CLICKHOUSE_CLIENT} --multiquery <<EOF
 
 CREATE TABLE $db.test_cluster ON CLUSTER test_shard_localhost (a String) Engine = MergeTree() ORDER BY a FORMAT Null;
 CREATE TABLE $db.test_cluster_2 ON CLUSTER test_shard_localhost (a String) Engine = MergeTree() ORDER BY a FORMAT Null;
diff --git a/tests/queries/0_stateless/02884_parallel_window_functions.reference b/tests/queries/0_stateless/02884_parallel_window_functions.reference
index 1f5346a1484..bac15838dc2 100644
--- a/tests/queries/0_stateless/02884_parallel_window_functions.reference
+++ b/tests/queries/0_stateless/02884_parallel_window_functions.reference
@@ -12,7 +12,7 @@ FROM
         AVG(wg) AS WR,
         ac,
         nw
-    FROM window_function_threading
+    FROM window_funtion_threading
     GROUP BY ac, nw
 )
 GROUP BY nw
@@ -32,7 +32,7 @@ FROM
         AVG(wg) AS WR,
         ac,
         nw
-    FROM window_function_threading
+    FROM window_funtion_threading
     GROUP BY ac, nw
 )
 GROUP BY nw
@@ -42,7 +42,6 @@ SETTINGS max_threads = 1;
 0	2	0
 1	2	0
 2	2	0
-SET max_rows_to_read = 40000000;
 SELECT
     nw,
     sum(WR) AS R,
@@ -54,7 +53,7 @@ FROM
         AVG(wg) AS WR,
         ac,
         nw
-    FROM window_function_threading
+    FROM window_funtion_threading
     WHERE (ac % 4) = 0
     GROUP BY
         ac,
@@ -65,7 +64,7 @@ FROM
         AVG(wg) AS WR,
         ac,
         nw
-    FROM window_function_threading
+    FROM window_funtion_threading
     WHERE (ac % 4) = 1
     GROUP BY
         ac,
@@ -76,7 +75,7 @@ FROM
         AVG(wg) AS WR,
         ac,
         nw
-    FROM window_function_threading
+    FROM window_funtion_threading
     WHERE (ac % 4) = 2
     GROUP BY
         ac,
@@ -87,7 +86,7 @@ FROM
         AVG(wg) AS WR,
         ac,
         nw
-    FROM window_function_threading
+    FROM window_funtion_threading
     WHERE (ac % 4) = 3
     GROUP BY
         ac,
diff --git a/tests/queries/0_stateless/02884_parallel_window_functions.sql b/tests/queries/0_stateless/02884_parallel_window_functions.sql
index 2207c90a4ee..c5ab013a198 100644
--- a/tests/queries/0_stateless/02884_parallel_window_functions.sql
+++ b/tests/queries/0_stateless/02884_parallel_window_functions.sql
@@ -1,6 +1,6 @@
 -- Tags: long, no-tsan, no-asan, no-ubsan, no-msan, no-debug
 
-CREATE TABLE window_function_threading
+CREATE TABLE window_funtion_threading
 Engine = MergeTree
 ORDER BY (ac, nw)
 AS SELECT
@@ -20,7 +20,7 @@ FROM
         AVG(wg) AS WR,
         ac,
         nw
-    FROM window_function_threading
+    FROM window_funtion_threading
     GROUP BY ac, nw
 )
 GROUP BY nw
@@ -40,7 +40,7 @@ FROM
         AVG(wg) AS WR,
         ac,
         nw
-    FROM window_function_threading
+    FROM window_funtion_threading
     GROUP BY ac, nw
 )
 GROUP BY nw
@@ -58,7 +58,7 @@ FROM
         AVG(wg) AS WR,
         ac,
         nw
-    FROM window_function_threading
+    FROM window_funtion_threading
     GROUP BY ac, nw
 )
 GROUP BY nw
@@ -66,8 +66,6 @@ ORDER BY nw ASC, R DESC
 LIMIT 10
 SETTINGS max_threads = 1;
 
-SET max_rows_to_read = 40000000;
-
 SELECT
     nw,
     sum(WR) AS R,
@@ -79,7 +77,7 @@ FROM
         AVG(wg) AS WR,
         ac,
         nw
-    FROM window_function_threading
+    FROM window_funtion_threading
     WHERE (ac % 4) = 0
     GROUP BY
         ac,
@@ -90,7 +88,7 @@ FROM
         AVG(wg) AS WR,
         ac,
         nw
-    FROM window_function_threading
+    FROM window_funtion_threading
     WHERE (ac % 4) = 1
     GROUP BY
         ac,
@@ -101,7 +99,7 @@ FROM
         AVG(wg) AS WR,
         ac,
         nw
-    FROM window_function_threading
+    FROM window_funtion_threading
     WHERE (ac % 4) = 2
     GROUP BY
         ac,
@@ -112,7 +110,7 @@ FROM
         AVG(wg) AS WR,
         ac,
         nw
-    FROM window_function_threading
+    FROM window_funtion_threading
     WHERE (ac % 4) = 3
     GROUP BY
         ac,
diff --git a/tests/queries/0_stateless/02885_async_insert_access_check_for_defaults.sh b/tests/queries/0_stateless/02885_async_insert_access_check_for_defaults.sh
index 72346e0cb59..b2525e67d4a 100755
--- a/tests/queries/0_stateless/02885_async_insert_access_check_for_defaults.sh
+++ b/tests/queries/0_stateless/02885_async_insert_access_check_for_defaults.sh
@@ -8,7 +8,7 @@ restricted_user=${CLICKHOUSE_DATABASE}_restricted_user_$RANDOM$RANDOM
 # The 'restricted_user' will not have access to the dictionary 'dict',
 # so they shouldn't be able to insert to a table with DEFAULT dictGet(dict, ...)
 
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP USER IF EXISTS ${restricted_user};
 DROP TABLE IF EXISTS table_with_default;
 DROP DICTIONARY IF EXISTS dict;
@@ -50,7 +50,7 @@ $CLICKHOUSE_CLIENT --user "${restricted_user}" --query "INSERT INTO table_with_d
 $CLICKHOUSE_CLIENT --user "${restricted_user}" --async_insert=1 --query "INSERT INTO table_with_default (key) VALUES (6)"
 $CLICKHOUSE_CLIENT --query "SELECT * FROM table_with_default WHERE key IN [5, 6] ORDER BY key"
 
-$CLICKHOUSE_CLIENT <<EOF
+$CLICKHOUSE_CLIENT --multiquery <<EOF
 DROP USER ${restricted_user};
 DROP TABLE table_with_default;
 DROP DICTIONARY dict;
diff --git a/tests/queries/0_stateless/02885_ephemeral_columns_from_file.sh b/tests/queries/0_stateless/02885_ephemeral_columns_from_file.sh
index 065658d4d56..2917ec86957 100755
--- a/tests/queries/0_stateless/02885_ephemeral_columns_from_file.sh
+++ b/tests/queries/0_stateless/02885_ephemeral_columns_from_file.sh
@@ -9,7 +9,7 @@ $CLICKHOUSE_LOCAL -q "select * from file('$CLICKHOUSE_TEST_UNIQUE_NAME.jsonl', a
 $CLICKHOUSE_LOCAL -q "select * from file('$CLICKHOUSE_TEST_UNIQUE_NAME.jsonl', auto, 'x UInt64 Alias y, y UInt64')" 2>&1 | grep -c "BAD_ARGUMENTS"
 $CLICKHOUSE_LOCAL -q "select * from file('$CLICKHOUSE_TEST_UNIQUE_NAME.jsonl', auto, 'x UInt64 Materialized 42, y UInt64')" 2>&1 | grep -c "BAD_ARGUMENTS"
 
-$CLICKHOUSE_LOCAL -q "
+$CLICKHOUSE_LOCAL -n -q "
     create table test (x UInt64 Ephemeral, y UInt64 default x + 1) engine=Memory;
     insert into test (x, y) select * from file('$CLICKHOUSE_TEST_UNIQUE_NAME.jsonl');
     select * from test;
diff --git a/tests/queries/0_stateless/02888_replicated_merge_tree_creation.sh b/tests/queries/0_stateless/02888_replicated_merge_tree_creation.sh
index 466f0d01a7f..b9603e75d2e 100755
--- a/tests/queries/0_stateless/02888_replicated_merge_tree_creation.sh
+++ b/tests/queries/0_stateless/02888_replicated_merge_tree_creation.sh
@@ -5,7 +5,6 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-CLICKHOUSE_CLIENT="${CLICKHOUSE_CLIENT} --database_replicated_allow_explicit_uuid 3 --database_replicated_allow_replicated_engine_arguments 3"
 
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS test_exception_replicated SYNC"
 
diff --git a/tests/queries/0_stateless/02890_named_tuple_functions.sql b/tests/queries/0_stateless/02890_named_tuple_functions.sql
index 6724462562a..0033102bd53 100644
--- a/tests/queries/0_stateless/02890_named_tuple_functions.sql
+++ b/tests/queries/0_stateless/02890_named_tuple_functions.sql
@@ -1,5 +1,5 @@
 set enable_named_columns_in_function_tuple = 1;
-set enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 
 drop table if exists x;
 create table x (i int, j int) engine MergeTree order by i;
diff --git a/tests/queries/0_stateless/02890_untuple_column_names.reference b/tests/queries/0_stateless/02890_untuple_column_names.reference
index f91a63fa15f..13a85c70138 100644
--- a/tests/queries/0_stateless/02890_untuple_column_names.reference
+++ b/tests/queries/0_stateless/02890_untuple_column_names.reference
@@ -57,7 +57,7 @@ t.1: 1
 Row 1:
 ──────
 t.1: 1
--- tuple() with enable_named_columns_in_function_tuple = 1 and enable_analyzer = 1 keeps the column names
+-- tuple() with enable_named_columns_in_function_tuple = 1 and allow_experimental_analyzer = 1 keeps the column names
 Row 1:
 ──────
 t.a: 1
diff --git a/tests/queries/0_stateless/02890_untuple_column_names.sql b/tests/queries/0_stateless/02890_untuple_column_names.sql
index 9773e2e53a0..cd490ca3522 100644
--- a/tests/queries/0_stateless/02890_untuple_column_names.sql
+++ b/tests/queries/0_stateless/02890_untuple_column_names.sql
@@ -6,43 +6,43 @@
 
 SELECT '-- tuple element alias';
 
-SELECT untuple(tuple(1)::Tuple(a Int)), untuple(tuple('s')::Tuple(a String)) FORMAT Vertical SETTINGS enable_analyzer = 0;
-SELECT untuple(tuple(1)::Tuple(a Int)), untuple(tuple('s')::Tuple(a String)) FORMAT Vertical SETTINGS enable_analyzer = 1;
+SELECT untuple(tuple(1)::Tuple(a Int)), untuple(tuple('s')::Tuple(a String)) FORMAT Vertical SETTINGS allow_experimental_analyzer = 0;
+SELECT untuple(tuple(1)::Tuple(a Int)), untuple(tuple('s')::Tuple(a String)) FORMAT Vertical SETTINGS allow_experimental_analyzer = 1;
 
-SELECT untuple(tuple(1)::Tuple(a Int)), untuple(tuple(1)::Tuple(a Int)) FORMAT Vertical SETTINGS enable_analyzer = 0; -- { serverError DUPLICATE_COLUMN }
-SELECT untuple(tuple(1)::Tuple(a Int)), untuple(tuple(1)::Tuple(a Int)) FORMAT Vertical SETTINGS enable_analyzer = 1; -- Bug: doesn't throw an exception
+SELECT untuple(tuple(1)::Tuple(a Int)), untuple(tuple(1)::Tuple(a Int)) FORMAT Vertical SETTINGS allow_experimental_analyzer = 0; -- { serverError DUPLICATE_COLUMN }
+SELECT untuple(tuple(1)::Tuple(a Int)), untuple(tuple(1)::Tuple(a Int)) FORMAT Vertical SETTINGS allow_experimental_analyzer = 1; -- Bug: doesn't throw an exception
 
 SELECT '-- tuple element alias + untuple() alias';
 
-SELECT untuple(tuple(1)::Tuple(a Int)) x, untuple(tuple('s')::Tuple(a String)) y FORMAT Vertical SETTINGS enable_analyzer = 0;
-SELECT untuple(tuple(1)::Tuple(a Int)) x, untuple(tuple('s')::Tuple(a String)) y FORMAT Vertical SETTINGS enable_analyzer = 1;
+SELECT untuple(tuple(1)::Tuple(a Int)) x, untuple(tuple('s')::Tuple(a String)) y FORMAT Vertical SETTINGS allow_experimental_analyzer = 0;
+SELECT untuple(tuple(1)::Tuple(a Int)) x, untuple(tuple('s')::Tuple(a String)) y FORMAT Vertical SETTINGS allow_experimental_analyzer = 1;
 
-SELECT untuple(tuple(1)::Tuple(a Int)) x, untuple(tuple(1)::Tuple(a Int)) x FORMAT Vertical SETTINGS enable_analyzer = 0; -- { serverError DUPLICATE_COLUMN }
-SELECT untuple(tuple(1)::Tuple(a Int)) x, untuple(tuple(1)::Tuple(a Int)) x FORMAT Vertical SETTINGS enable_analyzer = 1; -- Bug: doesn't throw an exception
+SELECT untuple(tuple(1)::Tuple(a Int)) x, untuple(tuple(1)::Tuple(a Int)) x FORMAT Vertical SETTINGS allow_experimental_analyzer = 0; -- { serverError DUPLICATE_COLUMN }
+SELECT untuple(tuple(1)::Tuple(a Int)) x, untuple(tuple(1)::Tuple(a Int)) x FORMAT Vertical SETTINGS allow_experimental_analyzer = 1; -- Bug: doesn't throw an exception
 
 SELECT '-- untuple() alias';
 
-SELECT untuple(tuple(1)::Tuple(Int)) x, untuple(tuple('s')::Tuple(String)) y FORMAT Vertical SETTINGS enable_analyzer = 0;
-SELECT untuple(tuple(1)::Tuple(Int)) x, untuple(tuple('s')::Tuple(String)) y FORMAT Vertical SETTINGS enable_analyzer = 1;
+SELECT untuple(tuple(1)::Tuple(Int)) x, untuple(tuple('s')::Tuple(String)) y FORMAT Vertical SETTINGS allow_experimental_analyzer = 0;
+SELECT untuple(tuple(1)::Tuple(Int)) x, untuple(tuple('s')::Tuple(String)) y FORMAT Vertical SETTINGS allow_experimental_analyzer = 1;
 
-SELECT untuple(tuple(1)::Tuple(Int)) x, untuple(tuple(1)::Tuple(Int)) x FORMAT Vertical SETTINGS enable_analyzer = 0; -- { serverError DUPLICATE_COLUMN }
-SELECT untuple(tuple(1)::Tuple(Int)) x, untuple(tuple(1)::Tuple(Int)) x FORMAT Vertical SETTINGS enable_analyzer = 1; -- Bug: doesn't throw an exception
+SELECT untuple(tuple(1)::Tuple(Int)) x, untuple(tuple(1)::Tuple(Int)) x FORMAT Vertical SETTINGS allow_experimental_analyzer = 0; -- { serverError DUPLICATE_COLUMN }
+SELECT untuple(tuple(1)::Tuple(Int)) x, untuple(tuple(1)::Tuple(Int)) x FORMAT Vertical SETTINGS allow_experimental_analyzer = 1; -- Bug: doesn't throw an exception
 
 SELECT '-- no aliases';
 
-SELECT untuple(tuple(1)::Tuple(Int)), untuple(tuple('s')::Tuple(String)) FORMAT Vertical SETTINGS enable_analyzer = 0;
-SELECT untuple(tuple(1)::Tuple(Int)), untuple(tuple('s')::Tuple(String)) FORMAT Vertical SETTINGS enable_analyzer = 1;
+SELECT untuple(tuple(1)::Tuple(Int)), untuple(tuple('s')::Tuple(String)) FORMAT Vertical SETTINGS allow_experimental_analyzer = 0;
+SELECT untuple(tuple(1)::Tuple(Int)), untuple(tuple('s')::Tuple(String)) FORMAT Vertical SETTINGS allow_experimental_analyzer = 1;
 
-SELECT untuple(tuple(1)::Tuple(Int)), untuple(tuple(1)::Tuple(Int)) FORMAT Vertical SETTINGS enable_analyzer = 0; -- { serverError DUPLICATE_COLUMN }
-SELECT untuple(tuple(1)::Tuple(Int)), untuple(tuple(1)::Tuple(Int)) FORMAT Vertical SETTINGS enable_analyzer = 1; -- Bug: doesn't throw an exception
+SELECT untuple(tuple(1)::Tuple(Int)), untuple(tuple(1)::Tuple(Int)) FORMAT Vertical SETTINGS allow_experimental_analyzer = 0; -- { serverError DUPLICATE_COLUMN }
+SELECT untuple(tuple(1)::Tuple(Int)), untuple(tuple(1)::Tuple(Int)) FORMAT Vertical SETTINGS allow_experimental_analyzer = 1; -- Bug: doesn't throw an exception
 
 SELECT '-- tuple() loses the column names (would be good to fix, see #36773)';
-SELECT untuple(tuple(1 as a)) as t FORMAT Vertical SETTINGS enable_analyzer = 0, enable_named_columns_in_function_tuple = 0;
-SELECT untuple(tuple(1 as a)) as t FORMAT Vertical SETTINGS enable_analyzer = 1, enable_named_columns_in_function_tuple = 0;
+SELECT untuple(tuple(1 as a)) as t FORMAT Vertical SETTINGS allow_experimental_analyzer = 0, enable_named_columns_in_function_tuple = 0;
+SELECT untuple(tuple(1 as a)) as t FORMAT Vertical SETTINGS allow_experimental_analyzer = 1, enable_named_columns_in_function_tuple = 0;
 
-SELECT '-- tuple() with enable_named_columns_in_function_tuple = 1 and enable_analyzer = 1 keeps the column names';
-SELECT untuple(tuple(1 as a)) as t FORMAT Vertical SETTINGS enable_analyzer = 1, enable_named_columns_in_function_tuple = 1;
+SELECT '-- tuple() with enable_named_columns_in_function_tuple = 1 and allow_experimental_analyzer = 1 keeps the column names';
+SELECT untuple(tuple(1 as a)) as t FORMAT Vertical SETTINGS allow_experimental_analyzer = 1, enable_named_columns_in_function_tuple = 1;
 
 SELECT '-- thankfully JSONExtract() keeps them';
-SELECT untuple(JSONExtract('{"key": "value"}', 'Tuple(key String)')) x FORMAT Vertical SETTINGS enable_analyzer = 0;
-SELECT untuple(JSONExtract('{"key": "value"}', 'Tuple(key String)')) x FORMAT Vertical SETTINGS enable_analyzer = 1;
+SELECT untuple(JSONExtract('{"key": "value"}', 'Tuple(key String)')) x FORMAT Vertical SETTINGS allow_experimental_analyzer = 0;
+SELECT untuple(JSONExtract('{"key": "value"}', 'Tuple(key String)')) x FORMAT Vertical SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/02895_npy_output_format.sh b/tests/queries/0_stateless/02895_npy_output_format.sh
index 74000bc298f..a364e447062 100755
--- a/tests/queries/0_stateless/02895_npy_output_format.sh
+++ b/tests/queries/0_stateless/02895_npy_output_format.sh
@@ -9,7 +9,7 @@ mkdir -p ${USER_FILES_PATH}/${CLICKHOUSE_TEST_UNIQUE_NAME}/
 rm -rf ${USER_FILES_PATH}/${CLICKHOUSE_TEST_UNIQUE_NAME:?}/*
 chmod 777 ${USER_FILES_PATH}/${CLICKHOUSE_TEST_UNIQUE_NAME}/
 
-${CLICKHOUSE_CLIENT} -q --ignore-error "
+${CLICKHOUSE_CLIENT} -n -q --ignore-error "
     DROP DATABASE IF EXISTS npy_output_02895;
     CREATE DATABASE IF NOT EXISTS npy_output_02895;
 
diff --git a/tests/queries/0_stateless/02895_peak_memory_usage_http_headers_regression.sh b/tests/queries/0_stateless/02895_peak_memory_usage_http_headers_regression.sh
index b4656c9e321..d6775927f35 100755
--- a/tests/queries/0_stateless/02895_peak_memory_usage_http_headers_regression.sh
+++ b/tests/queries/0_stateless/02895_peak_memory_usage_http_headers_regression.sh
@@ -4,7 +4,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 DROP TABLE IF EXISTS data;
 DROP TABLE IF EXISTS data2;
 DROP VIEW IF EXISTS mv1;
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 ecaad62b35a..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,7 +1,5 @@
 -- Tags: no-fasttest
 
-SET max_rows_to_read = 0, max_execution_time = 0, max_estimated_execution_time = 0;
-
 -- Query stops after timeout without an error
 SELECT * FROM numbers(100000000) SETTINGS max_block_size=1, max_execution_time=2, timeout_overflow_mode='break' FORMAT Null;
 
diff --git a/tests/queries/0_stateless/02898_input_format_values_allow_data_after_semicolon.reference b/tests/queries/0_stateless/02898_input_format_values_allow_data_after_semicolon.reference
index e69de29bb2d..250a673a26b 100644
--- a/tests/queries/0_stateless/02898_input_format_values_allow_data_after_semicolon.reference
+++ b/tests/queries/0_stateless/02898_input_format_values_allow_data_after_semicolon.reference
@@ -0,0 +1,6 @@
+client no multiquery
+Cannot read data after semicolon (and input_format_values_allow_data_after_semicolon=0)
+client multiquery
+local no multiquery
+Cannot read data after semicolon (and input_format_values_allow_data_after_semicolon=0)
+local multiquery
diff --git a/tests/queries/0_stateless/02898_input_format_values_allow_data_after_semicolon.sh b/tests/queries/0_stateless/02898_input_format_values_allow_data_after_semicolon.sh
index 2b9ac6bfd54..8164c91b2ae 100755
--- a/tests/queries/0_stateless/02898_input_format_values_allow_data_after_semicolon.sh
+++ b/tests/queries/0_stateless/02898_input_format_values_allow_data_after_semicolon.sh
@@ -4,5 +4,12 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -q "insert into function null() values (1); -- { foo }"
-$CLICKHOUSE_LOCAL  -q "insert into function null() values (1); -- { foo }"
+echo "client no multiquery"
+$CLICKHOUSE_CLIENT -q "insert into function null() values (1); -- { foo }" |& grep -F -o "Cannot read data after semicolon (and input_format_values_allow_data_after_semicolon=0)"
+echo "client multiquery"
+$CLICKHOUSE_CLIENT -n -q "insert into function null() values (1); -- { foo }"
+
+echo "local no multiquery"
+$CLICKHOUSE_LOCAL -q "insert into function null() values (1); -- { foo }" |& grep -F -o "Cannot read data after semicolon (and input_format_values_allow_data_after_semicolon=0)"
+echo "local multiquery"
+$CLICKHOUSE_LOCAL -n -q "insert into function null() values (1); -- { foo }"
diff --git a/tests/queries/0_stateless/02898_parallel_replicas_progress_bar.sql b/tests/queries/0_stateless/02898_parallel_replicas_progress_bar.sql
index 9348ea1dc32..d8bfec12b3a 100644
--- a/tests/queries/0_stateless/02898_parallel_replicas_progress_bar.sql
+++ b/tests/queries/0_stateless/02898_parallel_replicas_progress_bar.sql
@@ -26,8 +26,7 @@ WHERE query_id in (select query_id from system.query_log where current_database
     AND message LIKE '%Total rows to read: 3000%' SETTINGS allow_experimental_parallel_reading_from_replicas=0;
 
 -- reading in order coordinator
--- disable parallel_replicas_local_plan since the test relay on traces which only present in case of no local plan
-SELECT k, sipHash64(v) FROM t1 order by k limit 5 offset 998 SETTINGS optimize_read_in_order=1, parallel_replicas_local_plan=0, log_comment='02898_inorder_190aed82-2423-413b-ad4c-24dcca50f65b';
+SELECT k, sipHash64(v) FROM t1 order by k limit 5 offset 998 SETTINGS optimize_read_in_order=1, log_comment='02898_inorder_190aed82-2423-413b-ad4c-24dcca50f65b';
 
 SYSTEM FLUSH LOGS;
 SELECT count() > 0 FROM system.text_log
diff --git a/tests/queries/0_stateless/02900_clickhouse_local_drop_current_database.sh b/tests/queries/0_stateless/02900_clickhouse_local_drop_current_database.sh
index 7a52ccc3fd5..3250c70a268 100755
--- a/tests/queries/0_stateless/02900_clickhouse_local_drop_current_database.sh
+++ b/tests/queries/0_stateless/02900_clickhouse_local_drop_current_database.sh
@@ -4,7 +4,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-${CLICKHOUSE_LOCAL} --echo "
+${CLICKHOUSE_LOCAL} --echo --multiquery "
     CREATE DATABASE foo;
     USE foo;
     SELECT 1;
diff --git a/tests/queries/0_stateless/02900_window_function_with_sparse_column.sql b/tests/queries/0_stateless/02900_window_function_with_sparse_column.sql
index 6919e23ad1f..0b053d3e870 100644
--- a/tests/queries/0_stateless/02900_window_function_with_sparse_column.sql
+++ b/tests/queries/0_stateless/02900_window_function_with_sparse_column.sql
@@ -18,7 +18,7 @@ ENGINE = MergeTree
 PARTITION BY toYYYYMM(time)
 ORDER BY (key, id, time);
 
-INSERT INTO test1 VALUES ('id0', now(), 3, false);
+INSERT INTO test1 VALUES ('id0', now(), 3, false)
 
 SELECT last_value(value) OVER (PARTITION BY id ORDER BY time ASC) as last_value
 FROM test1
diff --git a/tests/queries/0_stateless/02903_empty_order_by_throws_error.sh b/tests/queries/0_stateless/02903_empty_order_by_throws_error.sh
index ef631d9ed1b..64f5dd1a987 100755
--- a/tests/queries/0_stateless/02903_empty_order_by_throws_error.sh
+++ b/tests/queries/0_stateless/02903_empty_order_by_throws_error.sh
@@ -5,13 +5,13 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 # setting disabled and no order by or primary key; expect error
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     DROP TABLE IF EXISTS test_empty_order_by;
     CREATE TABLE test_empty_order_by(a UInt8) ENGINE = MergeTree() SETTINGS index_granularity = 8192;
 " 2>&1 \ | grep -F -q "You must provide an ORDER BY or PRIMARY KEY expression in the table definition." && echo 'OK' || echo 'FAIL'
 
 # setting disabled and primary key in table definition
-$CLICKHOUSE_CLIENT --query="
+$CLICKHOUSE_CLIENT -n --query="
     DROP TABLE IF EXISTS test_empty_order_by;
     CREATE TABLE test_empty_order_by(a UInt8) ENGINE = MergeTree() PRIMARY KEY a SETTINGS index_granularity = 8192;
     SHOW CREATE TABLE test_empty_order_by;
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 b77e5b0b402..5065da371a8 100755
--- a/tests/queries/0_stateless/02903_rmt_retriable_merge_exception.sh
+++ b/tests/queries/0_stateless/02903_rmt_retriable_merge_exception.sh
@@ -15,7 +15,7 @@ if [[ $($CLICKHOUSE_CLIENT -q "select count()>0 from system.clusters where clust
     cluster=test_cluster_database_replicated
 fi
 
-$CLICKHOUSE_CLIENT -m --distributed_ddl_output_mode=none -q "
+$CLICKHOUSE_CLIENT -nm --distributed_ddl_output_mode=none -q "
     drop table if exists rmt1;
     drop table if exists rmt2;
 
@@ -46,7 +46,7 @@ part_name='%'
 
 # wait while there be at least one 'No active replica has part all_0_1_1 or covering part' in logs
 for _ in {0..50}; do
-    no_active_repilica_messages=$($CLICKHOUSE_CLIENT -m -q "
+    no_active_repilica_messages=$($CLICKHOUSE_CLIENT -nm -q "
         system flush logs;
 
         select count()
@@ -65,7 +65,7 @@ for _ in {0..50}; do
     sleep 1
 done
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     system start pulling replication log rmt2;
     system flush logs;
 
diff --git a/tests/queries/0_stateless/02904_empty_order_by_with_setting_enabled.sh b/tests/queries/0_stateless/02904_empty_order_by_with_setting_enabled.sh
index 5f9dc6ea077..7ac9b488be5 100755
--- a/tests/queries/0_stateless/02904_empty_order_by_with_setting_enabled.sh
+++ b/tests/queries/0_stateless/02904_empty_order_by_with_setting_enabled.sh
@@ -5,7 +5,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 # setting enabled and no order by or primary key
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET create_table_empty_primary_key_by_default = true;
     DROP TABLE IF EXISTS test_empty_order_by;
     CREATE TABLE test_empty_order_by(a UInt8) ENGINE = MergeTree() SETTINGS index_granularity = 8192;
@@ -13,7 +13,7 @@ ${CLICKHOUSE_CLIENT} --query="
 " 2>&1 \ | grep -F -q "ORDER BY tuple()" && echo 'OK' || echo 'FAIL'
 
 # setting enabled and per-column primary key
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET create_table_empty_primary_key_by_default = true;
     DROP TABLE IF EXISTS test_empty_order_by;
     CREATE TABLE test_empty_order_by(a UInt8 PRIMARY KEY, b String PRIMARY KEY) ENGINE = MergeTree() SETTINGS index_granularity = 8192;
@@ -21,7 +21,7 @@ ${CLICKHOUSE_CLIENT} --query="
 " 2>&1 \ | grep -F -q "ORDER BY (a, b)" && echo 'OK' || echo 'FAIL'
 
 # setting enabled and primary key in table definition (not per-column or order by)
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET create_table_empty_primary_key_by_default = true;
     DROP TABLE IF EXISTS test_empty_order_by;
     CREATE TABLE test_empty_order_by(a UInt8, b String) ENGINE = MergeTree() PRIMARY KEY (a) SETTINGS index_granularity = 8192;
@@ -29,7 +29,7 @@ ${CLICKHOUSE_CLIENT} --query="
 " 2>&1 \ | grep -F -q "ORDER BY a" && echo 'OK' || echo 'FAIL'
 
 # setting enabled and order by in table definition (no primary key)
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
     SET create_table_empty_primary_key_by_default = true;
     DROP TABLE IF EXISTS test_empty_order_by;
     CREATE TABLE test_empty_order_by(a UInt8, b String) ENGINE = MergeTree() ORDER BY (a, b) SETTINGS index_granularity = 8192;
diff --git a/tests/queries/0_stateless/02907_backup_mv_with_no_inner_table.sh b/tests/queries/0_stateless/02907_backup_mv_with_no_inner_table.sh
index e37f1e51c74..30ec50fa20f 100755
--- a/tests/queries/0_stateless/02907_backup_mv_with_no_inner_table.sh
+++ b/tests/queries/0_stateless/02907_backup_mv_with_no_inner_table.sh
@@ -5,7 +5,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 drop table if exists src;
 create table src (a Int32) engine = MergeTree() order by tuple();
 
@@ -15,14 +15,14 @@ create materialized view mv (a Int32) engine = MergeTree() order by tuple() as s
 
 uuid=$(${CLICKHOUSE_CLIENT} --query "select uuid from system.tables where table='mv' and database == currentDatabase()")
 inner_table=".inner_id.${uuid}"
-${CLICKHOUSE_CLIENT} -m --query "drop table \`$inner_table\` sync"
+${CLICKHOUSE_CLIENT} -nm --query "drop table \`$inner_table\` sync"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 set send_logs_level = 'error';
 backup table ${CLICKHOUSE_DATABASE}.\`mv\` to Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}');
 " | grep -o "BACKUP_CREATED"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 drop table mv;
 restore table ${CLICKHOUSE_DATABASE}.\`mv\` from Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}');
 " | grep -o "RESTORED"
diff --git a/tests/queries/0_stateless/02907_backup_mv_with_no_source_table.sh b/tests/queries/0_stateless/02907_backup_mv_with_no_source_table.sh
index f950954941f..d59ebe400ee 100755
--- a/tests/queries/0_stateless/02907_backup_mv_with_no_source_table.sh
+++ b/tests/queries/0_stateless/02907_backup_mv_with_no_source_table.sh
@@ -4,7 +4,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 drop table if exists src;
 create table src (a Int32) engine = MergeTree() order by tuple();
 
@@ -15,18 +15,18 @@ drop table if exists mv;
 create materialized view mv to dst (a Int32) as select * from src;
 "
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 drop table src;
 backup database ${CLICKHOUSE_DATABASE} on cluster test_shard_localhost to Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}');
 " | grep -o "BACKUP_CREATED"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 drop table mv;
 set allow_deprecated_database_ordinary=1;
 restore table ${CLICKHOUSE_DATABASE}.mv on cluster test_shard_localhost from Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}');
 " | grep -o "RESTORED"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 drop table if exists src;
 create table src (a Int32) engine = MergeTree() order by tuple();
 
@@ -37,13 +37,13 @@ drop table if exists mv;
 create materialized view mv to dst (a Int32) as select * from src;
 "
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 drop table src;
 drop table dst;
 backup database ${CLICKHOUSE_DATABASE} on cluster test_shard_localhost to Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}2');
 " | grep -o "BACKUP_CREATED"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 drop table mv;
 set allow_deprecated_database_ordinary=1;
 restore table ${CLICKHOUSE_DATABASE}.mv on cluster test_shard_localhost from Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}2');
diff --git a/tests/queries/0_stateless/02907_backup_restore_default_nullable.sh b/tests/queries/0_stateless/02907_backup_restore_default_nullable.sh
index dc5793d1638..8ed36a7edd7 100755
--- a/tests/queries/0_stateless/02907_backup_restore_default_nullable.sh
+++ b/tests/queries/0_stateless/02907_backup_restore_default_nullable.sh
@@ -4,7 +4,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 drop table if exists test;
 set data_type_default_nullable = 0;
 create table test (test String) ENGINE = MergeTree() ORDER BY tuple();
@@ -13,7 +13,7 @@ backup table ${CLICKHOUSE_DATABASE}.test on cluster test_shard_localhost to Disk
 
 ${CLICKHOUSE_CLIENT} --query "show create table test"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 drop table test sync;
 set data_type_default_nullable = 1;
 restore table ${CLICKHOUSE_DATABASE}.test on cluster test_shard_localhost from Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}');
diff --git a/tests/queries/0_stateless/02907_backup_restore_flatten_nested.reference b/tests/queries/0_stateless/02907_backup_restore_flatten_nested.reference
index 0db19f0591a..aa8f22f590a 100644
--- a/tests/queries/0_stateless/02907_backup_restore_flatten_nested.reference
+++ b/tests/queries/0_stateless/02907_backup_restore_flatten_nested.reference
@@ -1,8 +1,8 @@
 BACKUP_CREATED
-CREATE TABLE default.test\n(\n    `test` Array(Tuple(\n        foo String,\n        bar Float64))\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.test\n(\n    `test` Array(Tuple(foo String, bar Float64))\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
 BACKUP_CREATED
 CREATE TABLE default.test2\n(\n    `test` Nested(foo String, bar Float64)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
 RESTORED
-CREATE TABLE default.test\n(\n    `test` Array(Tuple(\n        foo String,\n        bar Float64))\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.test\n(\n    `test` Array(Tuple(foo String, bar Float64))\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
 RESTORED
 CREATE TABLE default.test2\n(\n    `test` Nested(foo String, bar Float64)\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/02907_backup_restore_flatten_nested.sh b/tests/queries/0_stateless/02907_backup_restore_flatten_nested.sh
index eae307add10..742d24a97eb 100755
--- a/tests/queries/0_stateless/02907_backup_restore_flatten_nested.sh
+++ b/tests/queries/0_stateless/02907_backup_restore_flatten_nested.sh
@@ -4,7 +4,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 drop table if exists test;
 set flatten_nested = 0;
 create table test (test Array(Tuple(foo String, bar Float64))) ENGINE = MergeTree() ORDER BY tuple();
@@ -13,7 +13,7 @@ backup table ${CLICKHOUSE_DATABASE}.test on cluster test_shard_localhost to Disk
 
 ${CLICKHOUSE_CLIENT} --query "show create table test"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 drop table if exists test2;
 set flatten_nested = 0;
 create table test2 (test Nested(foo String, bar Float64)) ENGINE = MergeTree() ORDER BY tuple();
@@ -22,7 +22,7 @@ backup table ${CLICKHOUSE_DATABASE}.test2 on cluster test_shard_localhost to Dis
 
 ${CLICKHOUSE_CLIENT} --query "show create table test2"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 drop table test sync;
 set flatten_nested = 1;
 restore table ${CLICKHOUSE_DATABASE}.test on cluster test_shard_localhost from Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}');
@@ -30,7 +30,7 @@ restore table ${CLICKHOUSE_DATABASE}.test on cluster test_shard_localhost from D
 
 ${CLICKHOUSE_CLIENT} --query "show create table test"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 drop table test2 sync;
 set flatten_nested = 1;
 restore table ${CLICKHOUSE_DATABASE}.test2 on cluster test_shard_localhost from Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}2');
diff --git a/tests/queries/0_stateless/02907_clickhouse_dictionary_bug.sh b/tests/queries/0_stateless/02907_clickhouse_dictionary_bug.sh
index 2cad15c6fcb..57182050534 100755
--- a/tests/queries/0_stateless/02907_clickhouse_dictionary_bug.sh
+++ b/tests/queries/0_stateless/02907_clickhouse_dictionary_bug.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -n -q "
     DROP DICTIONARY IF EXISTS 02907_dictionary;
     DROP TABLE IF EXISTS 02907_table;
 
diff --git a/tests/queries/0_stateless/02907_system_backups_profile_events.sh b/tests/queries/0_stateless/02907_system_backups_profile_events.sh
index 9a1d5a3db11..801056a2844 100755
--- a/tests/queries/0_stateless/02907_system_backups_profile_events.sh
+++ b/tests/queries/0_stateless/02907_system_backups_profile_events.sh
@@ -4,7 +4,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 drop table if exists test;
 create table test (a Int32) engine = MergeTree() order by tuple();
 "
@@ -12,10 +12,10 @@ create table test (a Int32) engine = MergeTree() order by tuple();
 backup_id=${CLICKHOUSE_TEST_UNIQUE_NAME}
 backup_name="Disk('backups', '$backup_id')";
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 backup table ${CLICKHOUSE_DATABASE}.test to $backup_name;
 " | grep -o "BACKUP_CREATED"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 select ProfileEvents['BackupEntriesCollectorMicroseconds'] > 10 from system.backups where name='Disk(\'backups\', \'$backup_id\')'
 "
diff --git a/tests/queries/0_stateless/02908_Npy_files_caching.sh b/tests/queries/0_stateless/02908_Npy_files_caching.sh
index 218e13efb95..4845f740972 100755
--- a/tests/queries/0_stateless/02908_Npy_files_caching.sh
+++ b/tests/queries/0_stateless/02908_Npy_files_caching.sh
@@ -7,13 +7,13 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 $CLICKHOUSE_LOCAL -q "select count() from file('$CURDIR/data_npy/one_dim.npy') settings optimize_count_from_files=0"
 $CLICKHOUSE_LOCAL -q "select count() from file('$CURDIR/data_npy/one_dim.npy') settings optimize_count_from_files=1"
 $CLICKHOUSE_LOCAL -q "select count() from file('$CURDIR/data_npy/one_dim.npy', auto, 'array Int64') settings optimize_count_from_files=1"
-$CLICKHOUSE_LOCAL -m -q "
+$CLICKHOUSE_LOCAL -nm -q "
 desc file('$CURDIR/data_npy/one_dim.npy');
 select number_of_rows from system.schema_inference_cache where format='Npy';
 "
 $CLICKHOUSE_LOCAL -q "select count() from file('$CURDIR/data_npy/npy_big.npy') settings optimize_count_from_files=0"
 $CLICKHOUSE_LOCAL -q "select count() from file('$CURDIR/data_npy/npy_big.npy') settings optimize_count_from_files=1"
-$CLICKHOUSE_LOCAL -m -q "
+$CLICKHOUSE_LOCAL -nm -q "
 desc file('$CURDIR/data_npy/npy_big.npy');
 select number_of_rows from system.schema_inference_cache where format='Npy';
 "
diff --git a/tests/queries/0_stateless/02908_filesystem_cache_as_collection.reference b/tests/queries/0_stateless/02908_filesystem_cache_as_collection.reference
index 41a60204eab..d4191af1594 100644
--- a/tests/queries/0_stateless/02908_filesystem_cache_as_collection.reference
+++ b/tests/queries/0_stateless/02908_filesystem_cache_as_collection.reference
@@ -1,2 +1,2 @@
-1048576	10000000	33554432	1	4194304	0	0	0	0	/var/lib/clickhouse/filesystem_caches/collection_sql	0	5000	0	16
-1048576	10000000	33554432	1	4194304	0	0	0	0	/var/lib/clickhouse/filesystem_caches/collection	0	5000	0	16
+1048576	10000000	33554432	4194304	0	0	0	0	/var/lib/clickhouse/filesystem_caches/collection_sql	0	5000	0	16
+1048576	10000000	33554432	4194304	0	0	0	0	/var/lib/clickhouse/filesystem_caches/collection	0	5000	0	16
diff --git a/tests/queries/0_stateless/02908_filesystem_cache_as_collection.sql b/tests/queries/0_stateless/02908_filesystem_cache_as_collection.sql
index 127baa8304e..c7216833bc9 100644
--- a/tests/queries/0_stateless/02908_filesystem_cache_as_collection.sql
+++ b/tests/queries/0_stateless/02908_filesystem_cache_as_collection.sql
@@ -3,8 +3,8 @@
 CREATE NAMED COLLECTION IF NOT EXISTS cache_collection_sql AS path = 'collection_sql', max_size = '1Mi';
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (a Int32, b String)
-ENGINE = MergeTree() ORDER BY a SETTINGS disk = disk(type = cache, disk = 'local_disk', name = '$CLICHOUSE_TEST_UNIQUE_NAME', cache_name='cache_collection_sql', load_metadata_asynchronously = 0);
+ENGINE = MergeTree() ORDER BY a SETTINGS disk = disk(type = cache, disk = 'local_disk', name = '$CLICHOUSE_TEST_UNIQUE_NAME', cache_name='cache_collection_sql');
 DESCRIBE FILESYSTEM CACHE '$CLICHOUSE_TEST_UNIQUE_NAME';
 CREATE TABLE test2 (a Int32, b String)
-ENGINE = MergeTree() ORDER BY a SETTINGS disk = disk(type = cache, disk = 'local_disk', name = '$CLICHOUSE_TEST_UNIQUE_NAME_2', cache_name='cache_collection', load_metadata_asynchronously = 0);
+ENGINE = MergeTree() ORDER BY a SETTINGS disk = disk(type = cache, disk = 'local_disk', name = '$CLICHOUSE_TEST_UNIQUE_NAME_2', cache_name='cache_collection');
 DESCRIBE FILESYSTEM CACHE '$CLICHOUSE_TEST_UNIQUE_NAME_2';
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 fdefd2e3466..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,10 +1,10 @@
-Creating 50 tables
-150	1	1
-150	1	1
-150	1	1
-150	1	1
-Making 100 requests to system.replicas
+Creating 300 tables
+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
-150
+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 81ba59fc591..a247c99a818 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
@@ -7,8 +7,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 set -e
 
-NUM_TABLES=50
-CONCURRENCY=100
+NUM_TABLES=300
+CONCURRENCY=200
 
 echo "Creating $NUM_TABLES tables"
 
@@ -46,10 +46,10 @@ wait;
 
 
 # Check results with different max_block_size
-$CLICKHOUSE_CLIENT -q 'SELECT count() as c, sum(total_replicas) >= 3*c, sum(active_replicas) >= 3*c FROM system.replicas WHERE database=currentDatabase()'
-$CLICKHOUSE_CLIENT -q 'SELECT count() as c, sum(total_replicas) >= 3*c, sum(active_replicas) >= 3*c FROM system.replicas WHERE database=currentDatabase() SETTINGS max_block_size=1'
-$CLICKHOUSE_CLIENT -q 'SELECT count() as c, sum(total_replicas) >= 3*c, sum(active_replicas) >= 3*c FROM system.replicas WHERE database=currentDatabase() SETTINGS max_block_size=77'
-$CLICKHOUSE_CLIENT -q 'SELECT count() as c, sum(total_replicas) >= 3*c, sum(active_replicas) >= 3*c FROM system.replicas WHERE database=currentDatabase() SETTINGS max_block_size=11111'
+$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'
 
 
 echo "Making $CONCURRENCY requests to system.replicas"
@@ -70,8 +70,8 @@ wait;
 $CLICKHOUSE_CLIENT -nq "
 SYSTEM FLUSH LOGS;
 
--- Check that number of ZK request is less then a half of (total replicas * concurrency)
-SELECT sum(ProfileEvents['ZooKeeperTransactions']) < (${NUM_TABLES} * 3 * ${CONCURRENCY} / 2)
+-- 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/02908_table_ttl_dependency.sh b/tests/queries/0_stateless/02908_table_ttl_dependency.sh
index 0bc02426f61..70136b4a42b 100755
--- a/tests/queries/0_stateless/02908_table_ttl_dependency.sh
+++ b/tests/queries/0_stateless/02908_table_ttl_dependency.sh
@@ -6,7 +6,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     DROP TABLE IF EXISTS 02908_dependent;
     DROP TABLE IF EXISTS 02908_main;
 
@@ -14,11 +14,11 @@ $CLICKHOUSE_CLIENT -m -q "
     CREATE TABLE 02908_dependent (a UInt32, ts DateTime) ENGINE = MergeTree ORDER BY a TTL ts + 1 WHERE a IN (SELECT a FROM ${CLICKHOUSE_DATABASE}.02908_main);
 "
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     DROP TABLE 02908_main;
 " 2>&1 | grep -F -q "HAVE_DEPENDENT_OBJECTS"
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     DROP TABLE 02908_dependent;
     DROP TABLE 02908_main;
 "
diff --git a/tests/queries/0_stateless/02909_settings_in_json_schema_cache.sh b/tests/queries/0_stateless/02909_settings_in_json_schema_cache.sh
index 75d491642ea..8da144f90ca 100755
--- a/tests/queries/0_stateless/02909_settings_in_json_schema_cache.sh
+++ b/tests/queries/0_stateless/02909_settings_in_json_schema_cache.sh
@@ -5,7 +5,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 echo '{"x" : 42}' > $CLICKHOUSE_TEST_UNIQUE_NAME.json
-$CLICKHOUSE_LOCAL -m -q "
+$CLICKHOUSE_LOCAL -nm -q "
 DESC file('$CLICKHOUSE_TEST_UNIQUE_NAME.json') SETTINGS schema_inference_make_columns_nullable=1;
 DESC file('$CLICKHOUSE_TEST_UNIQUE_NAME.json') SETTINGS schema_inference_make_columns_nullable=0;
 SELECT count() from system.schema_inference_cache where format = 'JSON' and additional_format_info like '%schema_inference_make_columns_nullable%';"
diff --git a/tests/queries/0_stateless/02910_object-json-crash-add-column.sql b/tests/queries/0_stateless/02910_object-json-crash-add-column.sql
index 97672bf89c6..bda5e958453 100644
--- a/tests/queries/0_stateless/02910_object-json-crash-add-column.sql
+++ b/tests/queries/0_stateless/02910_object-json-crash-add-column.sql
@@ -11,10 +11,10 @@ ORDER BY i;
 
 INSERT INTO test02910 (i, jString) SELECT 1, '{"a":"123"}';
 
-ALTER TABLE test02910 ADD COLUMN j2 Tuple(Object('json')) DEFAULT jString;  -- { serverError SUPPORT_IS_DISABLED }
-ALTER TABLE test02910 ADD COLUMN j2 Tuple(Float64, Object('json'));  -- { serverError SUPPORT_IS_DISABLED }
-ALTER TABLE test02910 ADD COLUMN j2 Tuple(Array(Tuple(Object('json')))) DEFAULT jString;  -- { serverError SUPPORT_IS_DISABLED }
-ALTER TABLE test02910 ADD COLUMN j2 Object('json') default jString;  -- { serverError SUPPORT_IS_DISABLED }
+ALTER TABLE test02910 ADD COLUMN j2 Tuple(JSON) DEFAULT jString;  -- { serverError SUPPORT_IS_DISABLED }
+ALTER TABLE test02910 ADD COLUMN j2 Tuple(Float64, JSON);  -- { serverError SUPPORT_IS_DISABLED }
+ALTER TABLE test02910 ADD COLUMN j2 Tuple(Array(Tuple(JSON))) DEFAULT jString;  -- { serverError SUPPORT_IS_DISABLED }
+ALTER TABLE test02910 ADD COLUMN j2 JSON default jString;  -- { serverError SUPPORT_IS_DISABLED }
 
 -- If we would allow adding a column with dynamic subcolumns the subsequent select would crash the server.
 -- SELECT * FROM test02910;
@@ -39,10 +39,10 @@ INSERT INTO test02910_second SELECT number, number, '2023-10-28 11:11:11.11111',
 INSERT INTO test02910_second SELECT number, number, '2023-10-28 11:11:11.11111', ['c', 'd'] FROM numbers(10);
 INSERT INTO test02910_second SELECT number, number, '2023-10-28 11:11:11.11111', [] FROM numbers(10);
 
-ALTER TABLE test02910_second ADD COLUMN `tags_json` Tuple(Object('json')) DEFAULT jString;  -- { serverError SUPPORT_IS_DISABLED }
-ALTER TABLE test02910_second ADD COLUMN `tags_json` Tuple(Float64, Object('json'));  -- { serverError SUPPORT_IS_DISABLED }
-ALTER TABLE test02910_second ADD COLUMN `tags_json` Tuple(Array(Tuple(Object('json')))) DEFAULT jString;  -- { serverError SUPPORT_IS_DISABLED }
-ALTER TABLE test02910_second ADD COLUMN `tags_json` Object('json'); -- { serverError SUPPORT_IS_DISABLED }
+ALTER TABLE test02910_second ADD COLUMN `tags_json` Tuple(JSON) DEFAULT jString;  -- { serverError SUPPORT_IS_DISABLED }
+ALTER TABLE test02910_second ADD COLUMN `tags_json` Tuple(Float64, JSON);  -- { serverError SUPPORT_IS_DISABLED }
+ALTER TABLE test02910_second ADD COLUMN `tags_json` Tuple(Array(Tuple(JSON))) DEFAULT jString;  -- { serverError SUPPORT_IS_DISABLED }
+ALTER TABLE test02910_second ADD COLUMN `tags_json` JSON; -- { serverError SUPPORT_IS_DISABLED }
 
 -- If we would allow adding a column with dynamic subcolumns the subsequent select would crash the server.
 -- SELECT * FROM test02910;
diff --git a/tests/queries/0_stateless/02911_analyzer_explain_estimate.sql b/tests/queries/0_stateless/02911_analyzer_explain_estimate.sql
index 77f30ba82ba..b082f2f33b2 100644
--- a/tests/queries/0_stateless/02911_analyzer_explain_estimate.sql
+++ b/tests/queries/0_stateless/02911_analyzer_explain_estimate.sql
@@ -1,5 +1,5 @@
 -- Tags: distributed
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 EXPLAIN ESTIMATE SELECT 0 = 1048577, NULL, groupBitmapOr(bitmapBuild([toInt32(65537)])) FROM cluster(test_cluster_two_shards) WHERE NULL = 1048575;
diff --git a/tests/queries/0_stateless/02911_analyzer_order_by_read_in_order_query_plan.sql b/tests/queries/0_stateless/02911_analyzer_order_by_read_in_order_query_plan.sql
index 907263168d0..77a72c24f5a 100644
--- a/tests/queries/0_stateless/02911_analyzer_order_by_read_in_order_query_plan.sql
+++ b/tests/queries/0_stateless/02911_analyzer_order_by_read_in_order_query_plan.sql
@@ -1,4 +1,4 @@
-SET optimize_read_in_order = 1, query_plan_read_in_order = 1, enable_analyzer = 1;
+SET optimize_read_in_order = 1, query_plan_read_in_order = 1, allow_experimental_analyzer = 1;
 
 drop table if exists tab;
 drop table if exists tab2;
diff --git a/tests/queries/0_stateless/02911_analyzer_remove_unused_projection_columns.sql b/tests/queries/0_stateless/02911_analyzer_remove_unused_projection_columns.sql
index d567ac6c8f3..70de63c592d 100644
--- a/tests/queries/0_stateless/02911_analyzer_remove_unused_projection_columns.sql
+++ b/tests/queries/0_stateless/02911_analyzer_remove_unused_projection_columns.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/02911_backup_restore_keeper_map.sh b/tests/queries/0_stateless/02911_backup_restore_keeper_map.sh
index 01aba244a02..ccdf52a6e23 100755
--- a/tests/queries/0_stateless/02911_backup_restore_keeper_map.sh
+++ b/tests/queries/0_stateless/02911_backup_restore_keeper_map.sh
@@ -5,18 +5,17 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 database_name="$CLICKHOUSE_DATABASE"_02911_keeper_map
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     DROP DATABASE IF EXISTS $database_name;
     CREATE DATABASE $database_name;
     CREATE TABLE $database_name.02911_backup_restore_keeper_map1 (key UInt64, value String) Engine=KeeperMap('/' || currentDatabase() || '/test02911') PRIMARY KEY key;
     CREATE TABLE $database_name.02911_backup_restore_keeper_map2 (key UInt64, value String) Engine=KeeperMap('/' || currentDatabase() || '/test02911') PRIMARY KEY key; -- table using same Keeper path as 02911_backup_restore_keeper_map1
     CREATE TABLE $database_name.02911_backup_restore_keeper_map3 (key UInt64, value String) Engine=KeeperMap('/' || currentDatabase() || '/test02911_different') PRIMARY KEY key;
+
+    INSERT INTO $database_name.02911_backup_restore_keeper_map2 SELECT number, 'test' || toString(number) FROM system.numbers LIMIT 5000;
+    INSERT INTO $database_name.02911_backup_restore_keeper_map3 SELECT number, 'test' || toString(number) FROM system.numbers LIMIT 3000;
 "
 
-$CLICKHOUSE_CLIENT -m -q "INSERT INTO $database_name.02911_backup_restore_keeper_map2 SELECT number, 'test' || toString(number) FROM system.numbers LIMIT 5000;"
-
-$CLICKHOUSE_CLIENT -m -q "INSERT INTO $database_name.02911_backup_restore_keeper_map3 SELECT number, 'test' || toString(number) FROM system.numbers LIMIT 3000;"
-
 backup_path="$database_name"
 for i in $(seq 1 3); do
     $CLICKHOUSE_CLIENT -q "SELECT count() FROM $database_name.02911_backup_restore_keeper_map$i;"
@@ -46,4 +45,4 @@ for i in $(seq 1 3); do
     $CLICKHOUSE_CLIENT -q "SELECT count() FROM $database_name.02911_backup_restore_keeper_map$i;"
 done
 
-$CLICKHOUSE_CLIENT -q "DROP DATABASE $database_name SYNC;"
+$CLICKHOUSE_CLIENT -q "DROP DATABASE $database_name SYNC;"
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02911_join_on_nullsafe_optimization.reference b/tests/queries/0_stateless/02911_join_on_nullsafe_optimization.reference
index 352e02941c3..8f194b4ffde 100644
--- a/tests/queries/0_stateless/02911_join_on_nullsafe_optimization.reference
+++ b/tests/queries/0_stateless/02911_join_on_nullsafe_optimization.reference
@@ -42,19 +42,10 @@ SELECT * FROM t1 JOIN t2 ON (t1.x == t2.x AND ((t2.x IS NOT NULL) AND (t1.x IS N
 SELECT * FROM t1 JOIN t2 ON (t1.x == t2.x AND ((t2.x IS NOT NULL) AND (t1.x IS NOT NULL)) ) OR ( t2.x <> t1.x AND t2.x <> t1.x ) ORDER BY t1.x NULLS LAST; -- { serverError INVALID_JOIN_ON_EXPRESSION }
 SELECT * FROM t1 JOIN t2 ON (t1.x == t2.x AND ((t2.x IS NOT NULL) AND (t1.x IS NOT NULL)) ) OR ( t2.x <> t1.x AND (t2.x IS NULL) AND (t2.x IS NULL) ) ORDER BY t1.x NULLS LAST; -- { serverError INVALID_JOIN_ON_EXPRESSION }
 -- aliases defined in the join condition are valid
-SELECT *, e, e2 FROM t1 FULL JOIN t2 ON ( ( ((t1.x == t2.x) AS e) AND ((t2.x IS NOT NULL) AND (t1.x IS NOT NULL)) ) OR ( (t2.x IS NULL) AND (t1.x IS NULL) ) AS e2 ) ORDER BY t1.x NULLS LAST, t2.x NULLS LAST;
-1	42	\N	\N	\N	0
-2	2	2	2	1	1
-3	3	3	33	1	1
-\N	\N	4	42	\N	0
-\N	\N	\N	\N	\N	1
-SELECT *, e, e2 FROM t1 FULL JOIN t2 ON ( ( ((t1.x == t2.x) AS e) AND ((t2.x IS NOT NULL) AND (t1.x IS NOT NULL)) ) AS e2 ) ORDER BY t1.x NULLS LAST, t2.x NULLS LAST;
-1	42	\N	\N	\N	0
-2	2	2	2	1	1
-3	3	3	33	1	1
-\N	\N	4	42	\N	0
-\N	\N	\N	\N	\N	0
-\N	\N	\N	\N	\N	0
+-- FIXME(@vdimir) broken query formatting for the following queries:
+-- SELECT *, e, e2 FROM t1 FULL JOIN t2 ON ( ( ((t1.x == t2.x) AS e) AND ((t2.x IS NOT NULL) AND (t1.x IS NOT NULL)) ) OR ( (t2.x IS NULL) AND (t1.x IS NULL) ) AS e2 ) ORDER BY t1.x NULLS LAST, t2.x NULLS LAST;
+-- SELECT *, e, e2 FROM t1 FULL JOIN t2 ON ( ( ((t1.x == t2.x) AS e) AND ((t2.x IS NOT NULL) AND (t1.x IS NOT NULL)) ) AS e2 ) ORDER BY t1.x NULLS LAST, t2.x NULLS LAST;
+
 -- check for non-nullable columns for which `is null` is replaced with constant
 SELECT * FROM t1n as t1 JOIN t2n as t2 ON (t1.x == t2.x AND ((t2.x IS NOT NULL) AND (t1.x IS NOT NULL)) ) OR ( (t2.x IS NULL) AND (t1.x IS NULL) ) ORDER BY t1.x NULLS LAST;
 2	2	2	2
diff --git a/tests/queries/0_stateless/02911_join_on_nullsafe_optimization.sql b/tests/queries/0_stateless/02911_join_on_nullsafe_optimization.sql
index e1e095a6eae..18cb303a54a 100644
--- a/tests/queries/0_stateless/02911_join_on_nullsafe_optimization.sql
+++ b/tests/queries/0_stateless/02911_join_on_nullsafe_optimization.sql
@@ -15,7 +15,7 @@ CREATE TABLE t2n (x Int64, y UInt64) ENGINE = TinyLog;
 INSERT INTO t1n VALUES (1,42), (2,2), (3,3);
 INSERT INTO t2n VALUES (2,2), (3,33), (4,42);
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 -- { echoOn }
 SELECT * FROM t1 JOIN t2 ON (t1.x <=> t2.x OR (t1.x IS NULL AND t2.x IS NULL)) ORDER BY t1.x NULLS LAST;
@@ -39,8 +39,9 @@ SELECT * FROM t1 JOIN t2 ON (t1.x == t2.x AND ((t2.x IS NOT NULL) AND (t1.x IS N
 SELECT * FROM t1 JOIN t2 ON (t1.x == t2.x AND ((t2.x IS NOT NULL) AND (t1.x IS NOT NULL)) ) OR ( t2.x <> t1.x AND (t2.x IS NULL) AND (t2.x IS NULL) ) ORDER BY t1.x NULLS LAST; -- { serverError INVALID_JOIN_ON_EXPRESSION }
 
 -- aliases defined in the join condition are valid
-SELECT *, e, e2 FROM t1 FULL JOIN t2 ON ( ( ((t1.x == t2.x) AS e) AND ((t2.x IS NOT NULL) AND (t1.x IS NOT NULL)) ) OR ( (t2.x IS NULL) AND (t1.x IS NULL) ) AS e2 ) ORDER BY t1.x NULLS LAST, t2.x NULLS LAST;
-SELECT *, e, e2 FROM t1 FULL JOIN t2 ON ( ( ((t1.x == t2.x) AS e) AND ((t2.x IS NOT NULL) AND (t1.x IS NOT NULL)) ) AS e2 ) ORDER BY t1.x NULLS LAST, t2.x NULLS LAST;
+-- FIXME(@vdimir) broken query formatting for the following queries:
+-- SELECT *, e, e2 FROM t1 FULL JOIN t2 ON ( ( ((t1.x == t2.x) AS e) AND ((t2.x IS NOT NULL) AND (t1.x IS NOT NULL)) ) OR ( (t2.x IS NULL) AND (t1.x IS NULL) ) AS e2 ) ORDER BY t1.x NULLS LAST, t2.x NULLS LAST;
+-- SELECT *, e, e2 FROM t1 FULL JOIN t2 ON ( ( ((t1.x == t2.x) AS e) AND ((t2.x IS NOT NULL) AND (t1.x IS NOT NULL)) ) AS e2 ) ORDER BY t1.x NULLS LAST, t2.x NULLS LAST;
 
 -- check for non-nullable columns for which `is null` is replaced with constant
 SELECT * FROM t1n as t1 JOIN t2n as t2 ON (t1.x == t2.x AND ((t2.x IS NOT NULL) AND (t1.x IS NOT NULL)) ) OR ( (t2.x IS NULL) AND (t1.x IS NULL) ) ORDER BY t1.x NULLS LAST;
diff --git a/tests/queries/0_stateless/02911_support_alias_column_in_indices.sql b/tests/queries/0_stateless/02911_support_alias_column_in_indices.sql
index 5ab50044e64..4d68786d7db 100644
--- a/tests/queries/0_stateless/02911_support_alias_column_in_indices.sql
+++ b/tests/queries/0_stateless/02911_support_alias_column_in_indices.sql
@@ -17,8 +17,8 @@ settings index_granularity = 8192, min_index_granularity_bytes = 1024, index_gra
 insert into test1 select * from numbers(10);
 insert into test1 select * from numbers(11, 20);
 
-explain indexes = 1 select * from test1 where a > 10 settings enable_analyzer = 0;
-explain indexes = 1 select * from test1 where a > 10 settings enable_analyzer = 1;
+explain indexes = 1 select * from test1 where a > 10 settings allow_experimental_analyzer = 0;
+explain indexes = 1 select * from test1 where a > 10 settings allow_experimental_analyzer = 1;
 
 create table test2
 (
@@ -34,7 +34,7 @@ settings index_granularity = 8192, min_index_granularity_bytes = 1024, index_gra
 insert into test2 select * from numbers(10);
 insert into test2 select * from numbers(11, 20);
 
-explain indexes = 1 select * from test2 where a2 > 15 settings enable_analyzer = 0;
-explain indexes = 1 select * from test2 where a2 > 15 settings enable_analyzer = 1;
+explain indexes = 1 select * from test2 where a2 > 15 settings allow_experimental_analyzer = 0;
+explain indexes = 1 select * from test2 where a2 > 15 settings allow_experimental_analyzer = 1;
 
 drop database 02911_support_alias_column_in_indices;
diff --git a/tests/queries/0_stateless/02915_analyzer_fuzz_1.sql b/tests/queries/0_stateless/02915_analyzer_fuzz_1.sql
index f1d606ab1cd..94849453063 100644
--- a/tests/queries/0_stateless/02915_analyzer_fuzz_1.sql
+++ b/tests/queries/0_stateless/02915_analyzer_fuzz_1.sql
@@ -1,2 +1,2 @@
-set enable_analyzer=1;
+set allow_experimental_analyzer=1;
 SELECT concat('With ', materialize(_CAST('ba\0', 'LowCardinality(FixedString(3))'))) AS `concat('With ', materialize(CAST('ba\\0', 'LowCardinality(FixedString(3))')))` FROM system.one GROUP BY 'With ';
diff --git a/tests/queries/0_stateless/02915_analyzer_fuzz_2.sql b/tests/queries/0_stateless/02915_analyzer_fuzz_2.sql
index 8921d36c546..ca9fff68446 100644
--- a/tests/queries/0_stateless/02915_analyzer_fuzz_2.sql
+++ b/tests/queries/0_stateless/02915_analyzer_fuzz_2.sql
@@ -1,4 +1,5 @@
 SET aggregate_functions_null_for_empty = 1;
---set enable_analyzer=1;
+--set allow_experimental_analyzer=1;
 create table t_delete_projection (x UInt32, y UInt64, projection p (select sum(y))) engine = MergeTree order by tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
 insert into t_delete_projection select number, toString(number) from numbers(8192 * 10);
+
diff --git a/tests/queries/0_stateless/02915_analyzer_fuzz_5.sql b/tests/queries/0_stateless/02915_analyzer_fuzz_5.sql
index d75d4f4eb72..29d06d2c315 100644
--- a/tests/queries/0_stateless/02915_analyzer_fuzz_5.sql
+++ b/tests/queries/0_stateless/02915_analyzer_fuzz_5.sql
@@ -1,4 +1,4 @@
-set enable_analyzer=1;
+set allow_experimental_analyzer=1;
 SET max_block_size = 1000;
 SET max_threads = 4;
 SET max_rows_to_group_by = 3000, group_by_overflow_mode = 'any';
diff --git a/tests/queries/0_stateless/02915_analyzer_fuzz_6.sql b/tests/queries/0_stateless/02915_analyzer_fuzz_6.sql
index cc276ec4074..b4eb1b4aff4 100644
--- a/tests/queries/0_stateless/02915_analyzer_fuzz_6.sql
+++ b/tests/queries/0_stateless/02915_analyzer_fuzz_6.sql
@@ -1,5 +1,5 @@
 set allow_suspicious_low_cardinality_types=1;
-set enable_analyzer=1;
+set allow_experimental_analyzer=1;
 
 create table tab (x LowCardinality(Nullable(Float64))) engine = MergeTree order by x settings allow_nullable_key=1;
 insert into tab select number from numbers(2);
diff --git a/tests/queries/0_stateless/02915_input_table_function_in_subquery.sh b/tests/queries/0_stateless/02915_input_table_function_in_subquery.sh
index 7ad38e11e96..80e38338751 100755
--- a/tests/queries/0_stateless/02915_input_table_function_in_subquery.sh
+++ b/tests/queries/0_stateless/02915_input_table_function_in_subquery.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 CREATE TABLE IF NOT EXISTS ts_data_double_raw
 (
    device_id UInt32 NOT NULL CODEC(ZSTD),
diff --git a/tests/queries/0_stateless/02915_lazy_loading_of_base_backups.sh b/tests/queries/0_stateless/02915_lazy_loading_of_base_backups.sh
index b6d6ca57768..5f0f41a956b 100755
--- a/tests/queries/0_stateless/02915_lazy_loading_of_base_backups.sh
+++ b/tests/queries/0_stateless/02915_lazy_loading_of_base_backups.sh
@@ -13,40 +13,40 @@ b_backup="Disk('backups', '$b_backup_id')"
 c_backup_id=${CLICKHOUSE_TEST_UNIQUE_NAME}_c
 c_backup="Disk('backups', '$c_backup_id')"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 DROP TABLE IF EXISTS tbl1;
 DROP TABLE IF EXISTS tbl2;
 DROP TABLE IF EXISTS tbl3;
 "
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 CREATE TABLE tbl1 (a Int32) ENGINE = MergeTree() ORDER BY tuple();
 "
 
 # The following BACKUP command must write backup 'a'.
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 BACKUP DATABASE ${CLICKHOUSE_DATABASE} TO $a_backup SETTINGS id='$a_backup_id';
 " | grep -o "BACKUP_CREATED"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 CREATE TABLE tbl2 (a Int32) ENGINE = MergeTree() ORDER BY tuple();
 "
 
 # The following BACKUP command must read backup 'a' and write backup 'b'.
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 BACKUP DATABASE ${CLICKHOUSE_DATABASE} TO $b_backup SETTINGS id='$b_backup_id', base_backup=$a_backup;
 " | grep -o "BACKUP_CREATED"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 CREATE TABLE tbl3 (a Int32) ENGINE = MergeTree() ORDER BY tuple();
 "
 
 # The following BACKUP command must read only backup 'b' (and not 'a') and write backup 'c'.
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 BACKUP DATABASE ${CLICKHOUSE_DATABASE} TO $c_backup SETTINGS id='$c_backup_id', base_backup=$b_backup;
 " | grep -o "BACKUP_CREATED"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 DROP TABLE tbl1;
 DROP TABLE tbl2;
 DROP TABLE tbl3;
@@ -57,28 +57,28 @@ r2_restore_id=${CLICKHOUSE_TEST_UNIQUE_NAME}_r2
 r3_restore_id=${CLICKHOUSE_TEST_UNIQUE_NAME}_r3
 
 # The following RESTORE command must read all 3 backups 'a', 'b', c' because the table 'tbl1' was in the first backup.
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 RESTORE TABLE ${CLICKHOUSE_DATABASE}.tbl1 FROM $c_backup SETTINGS id='$r1_restore_id';
 " | grep -o "RESTORED"
 
 # The following RESTORE command must read only 2 backups 'b', c' (and not 'a') because the table 'tbl2' was in the second backup.
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 RESTORE TABLE ${CLICKHOUSE_DATABASE}.tbl2 FROM $c_backup SETTINGS id='$r2_restore_id';
 " | grep -o "RESTORED"
 
 # The following RESTORE command must read only 1 backup 'c' (and not 'a' or 'b') because the table 'tbl3' was in the third backup.
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 RESTORE TABLE ${CLICKHOUSE_DATABASE}.tbl3 FROM $c_backup SETTINGS id='$r3_restore_id';
 " | grep -o "RESTORED"
 
 all_ids="['$a_backup_id', '$b_backup_id', '$c_backup_id', '$r1_restore_id', '$r2_restore_id', '$r3_restore_id']"
 id_prefix_len=`expr "${CLICKHOUSE_TEST_UNIQUE_NAME}_" : '.*'`
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 SELECT substr(id, 1 + $id_prefix_len) as short_id, ProfileEvents['BackupsOpenedForRead'], ProfileEvents['BackupsOpenedForWrite'] FROM system.backups WHERE id IN ${all_ids} ORDER BY short_id
 "
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 DROP TABLE tbl1;
 DROP TABLE tbl2;
 DROP TABLE tbl3;
diff --git a/tests/queries/0_stateless/02915_move_partition_inactive_replica.sql b/tests/queries/0_stateless/02915_move_partition_inactive_replica.sql
index 81eabce4fc4..3b30a2b6c2c 100644
--- a/tests/queries/0_stateless/02915_move_partition_inactive_replica.sql
+++ b/tests/queries/0_stateless/02915_move_partition_inactive_replica.sql
@@ -40,17 +40,10 @@ OPTIMIZE TABLE shard_0.from_0;
 OPTIMIZE TABLE shard_1.from_0;
 OPTIMIZE TABLE shard_0.from_1;
 OPTIMIZE TABLE shard_1.from_1;
-
 OPTIMIZE TABLE shard_0.to;
 
--- If moved parts are not merged by OPTIMIZE or background merge restart
--- can log Warning about metadata version on disk. It's normal situation
--- and test shouldn't rarely fail because of it.
-set send_logs_level = 'error';
-
 system restart replica shard_0.to;
 
--- Doesn't lead to test flakyness, because we don't check anything after it
 select sleep(2);
 
 attach table shard_1.to;
@@ -61,3 +54,4 @@ 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;
+
diff --git a/tests/queries/0_stateless/02915_sleep_large_uint.sql b/tests/queries/0_stateless/02915_sleep_large_uint.sql
index 08b6c580a28..f7c04ab6d1f 100644
--- a/tests/queries/0_stateless/02915_sleep_large_uint.sql
+++ b/tests/queries/0_stateless/02915_sleep_large_uint.sql
@@ -1,7 +1,6 @@
 SELECT sleep(3.40282e+44); -- { serverError BAD_ARGUMENTS }
 SELECT sleep((pow(2, 64) / 1000000) - 1); -- { serverError BAD_ARGUMENTS }
 SELECT sleepEachRow(184467440737095516) from numbers(10000); -- { serverError BAD_ARGUMENTS }
-SET max_rows_to_read = 0;
 SELECT sleepEachRow(pow(2, 31)) from numbers(9007199254740992) settings function_sleep_max_microseconds_per_block = 8589934592000000000; -- { serverError TOO_SLOW }
 
 -- Another corner case, but it requires lots of memory to run (huge block size)
diff --git a/tests/queries/0_stateless/02916_csv_infer_numbers_from_strings.reference b/tests/queries/0_stateless/02916_csv_infer_numbers_from_strings.reference
index 8726c81b5bb..f64557f1b70 100644
--- a/tests/queries/0_stateless/02916_csv_infer_numbers_from_strings.reference
+++ b/tests/queries/0_stateless/02916_csv_infer_numbers_from_strings.reference
@@ -1,6 +1,6 @@
 c1	Nullable(Int64)					
 c2	Nullable(Float64)					
-c3	Nullable(String)					
+c3	Nullable(Bool)					
 c1	Nullable(String)					
 c2	Nullable(String)					
 c3	Nullable(String)					
diff --git a/tests/queries/0_stateless/02916_dictionary_access.sh b/tests/queries/0_stateless/02916_dictionary_access.sh
index be62cc027ef..08ee517ab3b 100755
--- a/tests/queries/0_stateless/02916_dictionary_access.sh
+++ b/tests/queries/0_stateless/02916_dictionary_access.sh
@@ -7,7 +7,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 username="user_${CLICKHOUSE_TEST_UNIQUE_NAME}"
 dictname="dict_${CLICKHOUSE_TEST_UNIQUE_NAME}"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
     CREATE DICTIONARY IF NOT EXISTS ${dictname}
     (
         id UInt64,
@@ -23,15 +23,15 @@ ${CLICKHOUSE_CLIENT} -m --query "
     SELECT dictGet(${dictname}, 'value', 1);
 "
 
-$CLICKHOUSE_CLIENT -m --user="${username}" --query "
+$CLICKHOUSE_CLIENT -nm --user="${username}" --query "
     SELECT * FROM dictionary(${dictname});
 " 2>&1 | grep -o ACCESS_DENIED | uniq
 
-$CLICKHOUSE_CLIENT -m --user="${username}" --query "
+$CLICKHOUSE_CLIENT -nm --user="${username}" --query "
     SELECT dictGet(${dictname}, 'value', 1);
 " 2>&1 | grep -o ACCESS_DENIED | uniq
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
     DROP DICTIONARY IF EXISTS ${dictname};
     DROP USER IF EXISTS ${username};
 "
diff --git a/tests/queries/0_stateless/02916_glogal_in_cancel.sql b/tests/queries/0_stateless/02916_glogal_in_cancel.sql
index dd61795947a..ad54f1ecdec 100644
--- a/tests/queries/0_stateless/02916_glogal_in_cancel.sql
+++ b/tests/queries/0_stateless/02916_glogal_in_cancel.sql
@@ -1,2 +1,2 @@
-set max_execution_time = 0.5, timeout_overflow_mode = 'break', max_rows_to_read = 0;
+set max_execution_time = 0.5, timeout_overflow_mode = 'break';
 SELECT number FROM remote('127.0.0.{3|2}', numbers(1)) WHERE number GLOBAL IN (SELECT number FROM numbers(10000000000.)) format Null;
diff --git a/tests/queries/0_stateless/02916_joinget_dependency.sh b/tests/queries/0_stateless/02916_joinget_dependency.sh
index ff9332cb57f..6477ae8c967 100755
--- a/tests/queries/0_stateless/02916_joinget_dependency.sh
+++ b/tests/queries/0_stateless/02916_joinget_dependency.sh
@@ -6,7 +6,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 # We test the dependency on the DROP
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     DROP TABLE IF EXISTS Sub_distributed;
     DROP TABLE IF EXISTS Sub;
     DROP TABLE IF EXISTS Mapping;
@@ -20,8 +20,8 @@ $CLICKHOUSE_CLIENT -q "
     DROP TABLE Mapping;
 " 2>&1 | grep -cm1 "HAVE_DEPENDENT_OBJECTS"
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     DROP TABLE Sub_distributed;
     DROP TABLE Sub;
     DROP TABLE Mapping;
-"
+"
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02916_another_move_partition_inactive_replica.reference b/tests/queries/0_stateless/02916_move_partition_inactive_replica.reference
similarity index 100%
rename from tests/queries/0_stateless/02916_another_move_partition_inactive_replica.reference
rename to tests/queries/0_stateless/02916_move_partition_inactive_replica.reference
diff --git a/tests/queries/0_stateless/02916_another_move_partition_inactive_replica.sql b/tests/queries/0_stateless/02916_move_partition_inactive_replica.sql
similarity index 87%
rename from tests/queries/0_stateless/02916_another_move_partition_inactive_replica.sql
rename to tests/queries/0_stateless/02916_move_partition_inactive_replica.sql
index fa5b6357811..b0699539ac1 100644
--- a/tests/queries/0_stateless/02916_another_move_partition_inactive_replica.sql
+++ b/tests/queries/0_stateless/02916_move_partition_inactive_replica.sql
@@ -35,15 +35,8 @@ 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;
 
--- If moved parts are not merged by OPTIMIZE or background merge restart
--- can log Warning about metadata version on disk. It's normal situation
--- and test shouldn't rarely fail because of it.
-set send_logs_level = 'error';
-
 system restart replica shard_0.to;
 
--- Doesn't lead to test flakyness, because we don't check content in table
--- which doesn't depend on any background operation
 select sleep(3);
 
 attach table shard_1.to;
diff --git a/tests/queries/0_stateless/02916_to_start_of_interval_with_origin.reference b/tests/queries/0_stateless/02916_to_start_of_interval_with_origin.reference
deleted file mode 100644
index f0afdf03963..00000000000
--- a/tests/queries/0_stateless/02916_to_start_of_interval_with_origin.reference
+++ /dev/null
@@ -1,59 +0,0 @@
--- Negative tests
-Time and origin as Date
-2023-02-01
-2023-08-01
-2023-10-08
-2023-10-08
-2023-10-09
-Time and origin as Date32
-2023-02-01
-2023-08-01
-2023-10-08
-2023-10-08
-2023-10-09
-Time and origin as DateTime
-2023-02-01 09:08:07
-2023-08-01 09:08:07
-2023-10-08 09:08:07
-2023-10-08 09:08:07
-2023-10-09 09:08:07
-2023-10-09 10:10:07
-2023-10-09 10:11:07
-2023-10-09 10:11:12
-Time and origin as DateTime64(9)
-2023-02-01 09:08:07.123456789
-2023-08-01 09:08:07.123456789
-2023-09-10 09:08:07.123456789
-2023-10-08 09:08:07.123456789
-2023-10-09 09:08:07.123456789
-2023-10-09 10:10:07.123456789
-2023-10-09 10:11:11.123456789
-2023-10-09 10:11:12.123456789
-2023-10-09 10:11:12.987
-2023-10-09 10:11:12.987654
-2023-10-09 10:11:12.987654321
-Time and origin as DateTime64(3)
-2023-02-01 09:08:07.123
-2023-08-01 09:08:07.123
-2023-10-08 09:08:07.123
-2023-10-08 09:08:07.123
-2023-10-09 09:08:07.123
-2023-10-09 10:10:07.123
-2023-10-09 10:11:11.123
-2023-10-09 10:11:12.123
-2023-10-09 10:11:12.987
-2023-10-09 10:11:12.987000
-2023-10-09 10:11:12.987000000
-Non-const arguments
-2023-03-01 16:55:00.00
-2023-02-01 16:55:00.00
-2023-03-01 16:55:00.00
-2023-02-01 16:55:00.00
-2023-03-01 16:55:00.00
-2023-03-01 16:55:00
-2023-02-01 16:55:00
-2023-03-01 16:55:00
-2023-02-01 16:55:00
-2023-03-01 16:55:00
-2023-01-02 15:44:30
-2023-02-01 16:44:30.00
diff --git a/tests/queries/0_stateless/02916_to_start_of_interval_with_origin.sql b/tests/queries/0_stateless/02916_to_start_of_interval_with_origin.sql
deleted file mode 100644
index b03ccae31d9..00000000000
--- a/tests/queries/0_stateless/02916_to_start_of_interval_with_origin.sql
+++ /dev/null
@@ -1,95 +0,0 @@
-set session_timezone = 'UTC';
-
-SELECT '-- Negative tests';
-
--- time and origin arguments must have the same type
-SELECT toStartOfInterval(toDate('2023-01-02 14:45:50'), toIntervalSecond(5), toDate32('2023-01-02 14:44:30')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDate('2023-01-02 14:45:50'), toIntervalMillisecond(12), toDateTime('2023-01-02 14:44:30')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDate32('2023-01-02 14:45:50'), toIntervalHour(5), toDate('2023-01-02 14:44:30')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDateTime('2023-01-02 14:45:50'), toIntervalMinute(1), toDateTime64('2023-01-02 14:44:30', 2)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDateTime64('2023-01-02 14:45:50', 2), toIntervalMinute(1), toDate('2023-01-02 14:44:30')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-
--- the origin must be before the time
-SELECT toStartOfInterval(toDateTime('2023-01-02 14:42:50'), toIntervalMinute(1), toDateTime('2023-01-02 14:44:30')); -- { serverError BAD_ARGUMENTS }
-
--- the origin must be constant
-SELECT toStartOfInterval(toDateTime('2023-01-02 14:45:50'), toIntervalMinute(1), number % 2 == 0 ? toDateTime('2023-02-01 15:55:00') : toDateTime('2023-01-01 15:55:00')) from numbers(1); -- { serverError ILLEGAL_COLUMN }
-SELECT toStartOfInterval(toDateTime('2023-01-02 14:45:50'), toIntervalHour(1), materialize(toDateTime('2023-01-02 14:44:30')), 'Europe/Amsterdam'); -- { serverError ILLEGAL_COLUMN }
-
--- with 4 arguments, the 3rd one must not be a string or an integer
-SELECT toStartOfInterval(toDateTime('2023-01-02 14:45:50'), toIntervalYear(1), 'Europe/Amsterdam', 'Europe/Amsterdam'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDateTime('2023-01-02 14:45:50'), toIntervalYear(1), 5, 'Europe/Amsterdam'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-
--- too many arguments
-SELECT toStartOfInterval(toDateTime('2023-01-02 14:45:50'), toIntervalYear(1), toDateTime('2020-01-02 14:44:30'), 'Europe/Amsterdam', 5); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
-
-SELECT 'Time and origin as Date';
-SELECT toStartOfInterval(toDate('2023-10-09'), toIntervalYear(1), toDate('2022-02-01'));
-SELECT toStartOfInterval(toDate('2023-10-09'), toIntervalQuarter(1), toDate('2022-02-01'));
-SELECT toStartOfInterval(toDate('2023-10-09'), toIntervalMonth(1), toDate('2023-09-08'));
-SELECT toStartOfInterval(toDate('2023-10-09'), toIntervalWeek(1), toDate('2023-10-01'));
-SELECT toStartOfInterval(toDate('2023-10-09'), toIntervalDay(1), toDate('2023-10-08'));
-SELECT toStartOfInterval(toDate('2023-10-09'), toIntervalHour(1), toDate('2023-10-09')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDate('2023-10-09'), toIntervalMinute(1), toDate('2023-10-09')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDate('2023-10-09'), toIntervalSecond(1), toDate('2023-10-09')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDate('2023-10-09'), toIntervalMillisecond(1), toDate('2023-10-09')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDate('2023-10-09'), toIntervalMicrosecond(1), toDate('2023-10-09')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDate('2023-10-09'), toIntervalNanosecond(1), toDate('2023-10-09')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-
-SELECT 'Time and origin as Date32';
-SELECT toStartOfInterval(toDate32('2023-10-09'), toIntervalYear(1), toDate32('2022-02-01'));
-SELECT toStartOfInterval(toDate32('2023-10-09'), toIntervalQuarter(1), toDate32('2022-02-01'));
-SELECT toStartOfInterval(toDate32('2023-10-09'), toIntervalMonth(1), toDate32('2023-09-08'));
-SELECT toStartOfInterval(toDate32('2023-10-09'), toIntervalWeek(1), toDate32('2023-10-01'));
-SELECT toStartOfInterval(toDate32('2023-10-09'), toIntervalDay(1), toDate32('2023-10-08'));
-SELECT toStartOfInterval(toDate32('2023-10-09'), toIntervalHour(1), toDate32('2023-10-09')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDate32('2023-10-09'), toIntervalMinute(1), toDate32('2023-10-09')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDate32('2023-10-09'), toIntervalSecond(1), toDate32('2023-10-09')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDate32('2023-10-09'), toIntervalMillisecond(1), toDate32('2023-10-09')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDate32('2023-10-09'), toIntervalMicrosecond(1), toDate32('2023-10-09')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDate32('2023-10-09'), toIntervalNanosecond(1), toDate32('2023-10-09')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-
-SELECT 'Time and origin as DateTime';
-SELECT toStartOfInterval(toDateTime('2023-10-09 10:11:12'), toIntervalYear(1), toDateTime('2022-02-01 09:08:07'));
-SELECT toStartOfInterval(toDateTime('2023-10-09 10:11:12'), toIntervalQuarter(1), toDateTime('2022-02-01 09:08:07'));
-SELECT toStartOfInterval(toDateTime('2023-10-09 10:11:12'), toIntervalMonth(1), toDateTime('2023-09-08 09:08:07'));
-SELECT toStartOfInterval(toDateTime('2023-10-09 10:11:12'), toIntervalWeek(1), toDateTime('2023-10-01 09:08:07'));
-SELECT toStartOfInterval(toDateTime('2023-10-09 10:11:12'), toIntervalDay(1), toDateTime('2023-10-08 09:08:07'));
-SELECT toStartOfInterval(toDateTime('2023-10-09 10:11:12'), toIntervalHour(1), toDateTime('2023-10-09 09:10:07'));
-SELECT toStartOfInterval(toDateTime('2023-10-09 10:11:12'), toIntervalMinute(1), toDateTime('2023-10-09 09:10:07'));
-SELECT toStartOfInterval(toDateTime('2023-10-09 10:11:12'), toIntervalSecond(1), toDateTime('2023-10-09 09:10:07'));
-SELECT toStartOfInterval(toDateTime('2023-10-09 10:11:12'), toIntervalMillisecond(1), toDateTime('2023-10-09 10:11:12')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDateTime('2023-10-09 10:11:12'), toIntervalMicrosecond(1), toDateTime('2023-10-09 10:11:12')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT toStartOfInterval(toDateTime('2023-10-09 10:11:12'), toIntervalNanosecond(1), toDateTime('2023-10-09 10:11:12')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-
-SELECT 'Time and origin as DateTime64(9)';
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987654321', 9), toIntervalYear(1), toDateTime64('2022-02-01 09:08:07.123456789', 9));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987654321', 9), toIntervalQuarter(1), toDateTime64('2022-02-01 09:08:07.123456789', 9));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987654321', 9), toIntervalMonth(1), toDateTime64('2023-09-10 09:08:07.123456789', 9));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987654321', 9), toIntervalWeek(1), toDateTime64('2023-10-01 09:08:07.123456789', 9));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987654321', 9), toIntervalDay(1), toDateTime64('2023-10-08 09:08:07.123456789', 9));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987654321', 9), toIntervalHour(1), toDateTime64('2023-10-09 09:10:07.123456789', 9));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987654321', 9), toIntervalMinute(1), toDateTime64('2023-10-09 09:10:11.123456789', 9));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987654321', 9), toIntervalSecond(1), toDateTime64('2023-10-09 10:11:10.123456789', 9));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987654321', 9), toIntervalMillisecond(1), toDateTime64('2023-10-09 10:11:12.123456789', 9));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987654321', 9), toIntervalMicrosecond(1), toDateTime64('2023-10-09 10:11:12.123456789', 9));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987654321', 9), toIntervalNanosecond(1), toDateTime64('2023-10-09 10:11:12.123456789', 9));
-
-SELECT 'Time and origin as DateTime64(3)';
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987', 3), toIntervalYear(1), toDateTime64('2022-02-01 09:08:07.123', 3));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987', 3), toIntervalQuarter(1), toDateTime64('2022-02-01 09:08:07.123', 3));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987', 3), toIntervalMonth(1), toDateTime64('2023-09-08 09:08:07.123', 3));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987', 3), toIntervalWeek(1), toDateTime64('2023-10-01 09:08:07.123', 3));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987', 3), toIntervalDay(1), toDateTime64('2023-10-08 09:08:07.123', 3));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987', 3), toIntervalHour(1), toDateTime64('2023-10-09 09:10:07.123', 3));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987', 3), toIntervalMinute(1), toDateTime64('2023-10-09 10:10:11.123', 3));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987', 3), toIntervalSecond(1), toDateTime64('2023-10-09 10:11:10.123', 3));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987', 3), toIntervalMillisecond(1), toDateTime64('2023-10-09 10:11:12.123', 3));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987', 3), toIntervalMicrosecond(1), toDateTime64('2023-10-09 10:11:12.123', 3));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.987', 3), toIntervalNanosecond(1), toDateTime64('2023-10-09 10:11:12.123', 3));
-
-SELECT 'Non-const arguments';
-SELECT toStartOfInterval(number % 2 == 0 ? toDateTime64('2023-03-01 15:55:00', 2) : toDateTime64('2023-02-01 15:55:00', 2), toIntervalMinute(1), toDateTime64('2023-01-01 13:55:00', 2), 'Europe/Amsterdam') from numbers(5);
-SELECT toStartOfInterval(number % 2 == 0 ? toDateTime('2023-03-01 15:55:00') : toDateTime('2023-02-01 15:55:00'), toIntervalHour(1), toDateTime('2023-01-01 13:55:00'), 'Europe/Amsterdam') from numbers(5);
-SELECT toStartOfInterval(materialize(toDateTime('2023-01-02 14:45:50')), toIntervalHour(1), toDateTime('2023-01-02 14:44:30'), 'Europe/Amsterdam');
-SELECT toStartOfInterval(materialize(toDateTime64('2023-02-01 15:45:50', 2)), toIntervalHour(1), toDateTime64('2023-01-02 14:44:30', 2), 'Europe/Amsterdam');
diff --git a/tests/queries/0_stateless/02918_join_pm_lc_crash.sql b/tests/queries/0_stateless/02918_join_pm_lc_crash.sql
index 0326acff4a6..123208ee981 100644
--- a/tests/queries/0_stateless/02918_join_pm_lc_crash.sql
+++ b/tests/queries/0_stateless/02918_join_pm_lc_crash.sql
@@ -1,30 +1,31 @@
 
 SET joined_subquery_requires_alias = 0, join_algorithm = 'partial_merge';
 
-SET enable_analyzer = 0, join_use_nulls = 0;
+SET allow_experimental_analyzer = 0, join_use_nulls = 0;
 
 SELECT * FROM (SELECT dummy AS val FROM system.one)
 JOIN (SELECT toLowCardinality(toNullable(dummy)) AS val
 FROM system.one GROUP BY val WITH TOTALS)
 USING (val);
 
-SET enable_analyzer = 0, join_use_nulls = 1;
+SET allow_experimental_analyzer = 0, join_use_nulls = 1;
 
 SELECT * FROM (SELECT dummy AS val FROM system.one)
 JOIN (SELECT toLowCardinality(toNullable(dummy)) AS val
 FROM system.one GROUP BY val WITH TOTALS)
 USING (val);
 
-SET enable_analyzer = 1, join_use_nulls = 0;
+SET allow_experimental_analyzer = 1, join_use_nulls = 0;
 
 SELECT * FROM (SELECT dummy AS val FROM system.one)
 JOIN (SELECT toLowCardinality(toNullable(dummy)) AS val
 FROM system.one GROUP BY val WITH TOTALS)
 USING (val);
 
-SET enable_analyzer = 1, join_use_nulls = 1;
+SET allow_experimental_analyzer = 1, join_use_nulls = 1;
 
 SELECT * FROM (SELECT dummy AS val FROM system.one)
 JOIN (SELECT toLowCardinality(toNullable(dummy)) AS val
 FROM system.one GROUP BY val WITH TOTALS)
 USING (val);
+
diff --git a/tests/queries/0_stateless/02918_optimize_count_for_merge_tables.sql b/tests/queries/0_stateless/02918_optimize_count_for_merge_tables.sql
index f5647f01ab9..9feb2aa2ad6 100644
--- a/tests/queries/0_stateless/02918_optimize_count_for_merge_tables.sql
+++ b/tests/queries/0_stateless/02918_optimize_count_for_merge_tables.sql
@@ -15,7 +15,7 @@ INSERT INTO mt2 VALUES (1);
 SELECT count() FROM merge;
 
 -- can use the trivial count optimization
-EXPLAIN SELECT count() FROM merge settings enable_analyzer=0;
+EXPLAIN SELECT count() FROM merge settings allow_experimental_analyzer=0;
 
 CREATE TABLE mt3 (id UInt64) ENGINE = TinyLog;
 
@@ -24,7 +24,7 @@ INSERT INTO mt2 VALUES (2);
 SELECT count() FROM merge;
 
 -- can't use the trivial count optimization as TinyLog doesn't support it
-EXPLAIN SELECT count() FROM merge settings enable_analyzer=0;
+EXPLAIN SELECT count() FROM merge settings allow_experimental_analyzer=0;
 
 DROP TABLE IF EXISTS mt1;
 DROP TABLE IF EXISTS mt2;
diff --git a/tests/queries/0_stateless/02922_respect_nulls_parser.sql b/tests/queries/0_stateless/02922_respect_nulls_parser.sql
index ccd67dbe676..c9a17fdfbfe 100644
--- a/tests/queries/0_stateless/02922_respect_nulls_parser.sql
+++ b/tests/queries/0_stateless/02922_respect_nulls_parser.sql
@@ -13,7 +13,7 @@ SELECT toDateTimeNonExistingFunction(now()) RESPECT NULLS b; -- { serverError UN
 SELECT toDateTime(now()) RESPECT NULLS b; -- { serverError SYNTAX_ERROR }
 SELECT count() from numbers(10) where in(number, (0)) RESPECT NULLS; -- { serverError SYNTAX_ERROR }
 SELECT if(number > 0, number, 0) respect nulls from numbers(0); -- { serverError SYNTAX_ERROR }
-WITH (x -> x + 1) AS lambda SELECT lambda(number) RESPECT NULLS FROM numbers(10) SETTINGS enable_analyzer = 1; -- { serverError SYNTAX_ERROR }
+WITH (x -> x + 1) AS lambda SELECT lambda(number) RESPECT NULLS FROM numbers(10) SETTINGS allow_experimental_analyzer = 1; -- { serverError SYNTAX_ERROR }
 SELECT * from system.one WHERE indexHint(dummy = 1) RESPECT NULLS; -- { serverError SYNTAX_ERROR }
 SELECT arrayJoin([[3,4,5], [6,7], [2], [1,1]]) IGNORE NULLS; -- { serverError SYNTAX_ERROR }
 SELECT number, grouping(number % 2, number) RESPECT NULLS AS gr FROM numbers(10) GROUP BY GROUPING SETS ((number), (number % 2)) SETTINGS force_grouping_standard_compatibility = 0; -- { serverError SYNTAX_ERROR }
diff --git a/tests/queries/0_stateless/02930_client_file_log_comment.reference b/tests/queries/0_stateless/02930_client_file_log_comment.reference
new file mode 100644
index 00000000000..c380ac1d6fe
--- /dev/null
+++ b/tests/queries/0_stateless/02930_client_file_log_comment.reference
@@ -0,0 +1,6 @@
+42
+4242
+424242
+select 42	clickhouse.default-1.sql
+select 4242	clickhouse.default-2.sql
+select 424242\n	foo
diff --git a/tests/queries/0_stateless/02930_client_file_log_comment.sh b/tests/queries/0_stateless/02930_client_file_log_comment.sh
new file mode 100755
index 00000000000..3d0df6de9b4
--- /dev/null
+++ b/tests/queries/0_stateless/02930_client_file_log_comment.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# reset --log_comment
+CLICKHOUSE_LOG_COMMENT=
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+file1="$CUR_DIR/clickhouse.${CLICKHOUSE_DATABASE}-1.sql"
+echo -n 'select 42' >> "$file1"
+file2="$CUR_DIR/clickhouse.${CLICKHOUSE_DATABASE}-2.sql"
+echo -n 'select 4242' >> "$file2"
+
+$CLICKHOUSE_CLIENT --queries-file "$file1" "$file2" <<<'select 42'
+$CLICKHOUSE_CLIENT --log_comment foo --queries-file /dev/stdin <<<'select 424242'
+
+$CLICKHOUSE_CLIENT -nm -q "
+    system flush logs;
+    select query, log_comment from system.query_log where current_database = '$CLICKHOUSE_DATABASE' and event_date >= yesterday() and query = 'select 42' and type != 'QueryStart';
+    select query, log_comment from system.query_log where current_database = '$CLICKHOUSE_DATABASE' and event_date >= yesterday() and query = 'select 4242' and type != 'QueryStart';
+    select query, log_comment from system.query_log where current_database = '$CLICKHOUSE_DATABASE' and event_date >= yesterday() and query = 'select 424242\n' and type != 'QueryStart';
+" | sed "s#$CUR_DIR/##"
+
+rm "$file1" "$file2"
diff --git a/tests/queries/0_stateless/02931_size_virtual_column_use_structure_from_insertion_table.sh b/tests/queries/0_stateless/02931_size_virtual_column_use_structure_from_insertion_table.sh
index 76ab56a4570..d9e4a2c8f8b 100755
--- a/tests/queries/0_stateless/02931_size_virtual_column_use_structure_from_insertion_table.sh
+++ b/tests/queries/0_stateless/02931_size_virtual_column_use_structure_from_insertion_table.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 echo "1,2" > $CLICKHOUSE_TEST_UNIQUE_NAME.csv
-$CLICKHOUSE_LOCAL -m -q "
+$CLICKHOUSE_LOCAL -nm -q "
 create table test (x UInt64, y UInt32, size UInt64) engine=Memory;
 insert into test select c1, c2, _size from file('$CLICKHOUSE_TEST_UNIQUE_NAME.csv') settings use_structure_from_insertion_table_in_table_functions=1;
 select * from test;
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
index b41635f014e..802d920aaef 100644
--- 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
@@ -1635,21 +1635,21 @@ QUERY id: 0
   JOIN TREE
     TABLE id: 10, alias: __table1, table_name: default.test_table
 SELECT sum(float64 + 2) From test_table;
-26.875
+26.5
 SELECT sum(2 + float64) From test_table;
-26.875
+26.5
 SELECT sum(float64 - 2) From test_table;
-6.875
+6.5
 SELECT sum(2 - float64) From test_table;
--6.875
+-6.5
 SELECT sum(float64) + 2 * count(float64) From test_table;
-26.875
+26.5
 SELECT 2 * count(float64) + sum(float64) From test_table;
-26.875
+26.5
 SELECT sum(float64) - 2 * count(float64) From test_table;
-6.875
+6.5
 SELECT 2 * count(float64) - sum(float64) From test_table;
--6.875
+-6.5
 EXPLAIN QUERY TREE (SELECT sum(float64 + 2) From test_table);
 QUERY id: 0
   PROJECTION COLUMNS
@@ -2463,25 +2463,25 @@ QUERY id: 0
   JOIN TREE
     TABLE id: 12, alias: __table1, table_name: default.test_table
 SELECT sum(float64 + 2) + sum(float64 + 3) From test_table;
-58.75
+58
 SELECT sum(float64 + 2) - sum(float64 + 3) From test_table;
 -5
 SELECT sum(float64 - 2) + sum(float64 - 3) From test_table;
-8.75
+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.75
+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.75
+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.75
+-8
 EXPLAIN QUERY TREE (SELECT sum(float64 + 2) + sum(float64 + 3) From test_table);
 QUERY id: 0
   PROJECTION COLUMNS
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
index b6fa097abe9..43dad8eb8e0 100644
--- 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
@@ -1,4 +1,4 @@
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 -- { echoOn }
 Select sum(number + 1) from numbers(10);
@@ -25,12 +25,11 @@ CREATE TABLE test_table
     decimal32 Decimal32(5),
 ) ENGINE=MergeTree ORDER BY uint64;
 
--- Use Float64 numbers divisible by 1/16 (or some other small power of two), so that their sum doesn't depend on summation order.
-INSERT INTO test_table VALUES (1, 1.125, 1.11);
-INSERT INTO test_table VALUES (2, 2.250, 2.22);
-INSERT INTO test_table VALUES (3, 3.375, 3.33);
-INSERT INTO test_table VALUES (4, 4.500, 4.44);
-INSERT INTO test_table VALUES (5, 5.625, 5.55);
+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;
diff --git a/tests/queries/0_stateless/02932_parallel_replicas_fuzzer.sql b/tests/queries/0_stateless/02932_parallel_replicas_fuzzer.sql
index e5cbe100a58..3daaf36188a 100644
--- a/tests/queries/0_stateless/02932_parallel_replicas_fuzzer.sql
+++ b/tests/queries/0_stateless/02932_parallel_replicas_fuzzer.sql
@@ -35,4 +35,4 @@ ORDER BY
     nan DESC,
     _CAST([0, NULL, NULL, NULL, NULL], 'Array(Nullable(UInt8))') DESC
 FORMAT Null
-SETTINGS receive_timeout = 10., receive_data_timeout_ms = 10000, use_hedged_requests = 0, allow_suspicious_low_cardinality_types = 1, max_parallel_replicas = 3, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_parallel_reading_from_replicas = 1, parallel_replicas_for_non_replicated_merge_tree = 1, log_queries = 1, table_function_remote_max_addresses = 200, enable_analyzer = 1;
+SETTINGS receive_timeout = 10., receive_data_timeout_ms = 10000, use_hedged_requests = 0, allow_suspicious_low_cardinality_types = 1, max_parallel_replicas = 3, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_parallel_reading_from_replicas = 1, parallel_replicas_for_non_replicated_merge_tree = 1, log_queries = 1, table_function_remote_max_addresses = 200, allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/02932_refreshable_materialized_views_1.reference b/tests/queries/0_stateless/02932_refreshable_materialized_views.reference
similarity index 66%
rename from tests/queries/0_stateless/02932_refreshable_materialized_views_1.reference
rename to tests/queries/0_stateless/02932_refreshable_materialized_views.reference
index bfc6add90a7..2eb41590af1 100644
--- a/tests/queries/0_stateless/02932_refreshable_materialized_views_1.reference
+++ b/tests/queries/0_stateless/02932_refreshable_materialized_views.reference
@@ -3,25 +3,21 @@ CREATE MATERIALIZED VIEW default.a\nREFRESH AFTER 2 SECOND\n(\n    `x` UInt64\n)
 <2: refreshed>	3	1	1
 <3: time difference at least>	1000
 <4: next refresh in>	2
-<4.1: fake clock>	Scheduled	2050-01-01 00:00:01	2050-01-01 00:00:03
 <4.5: altered>	Scheduled	Finished	2052-01-01 00:00:00
 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\nAS SELECT x * 10 AS y\nFROM default.a
-<7.5: created dependent>	2052-11-11 11:11:11
 <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
-<9.2: dropping>	0	2
-<9.4: dropped>	0	2
-<10: creating>	a	Scheduled	[]	2054-01-01 00:00:00
-<10: creating>	b	WaitingForDependencies	['default.a']	2054-01-01 00:00:00
+<10: waiting>	a	Scheduled	[]	2054-01-01 00:00:00
+<10: waiting>	b	WaitingForDependencies	['default.a']	2054-01-01 00:00:00
 <11: chain-refreshed a>	4
 <12: chain-refreshed b>	40
-<13: chain-refreshed>	a	Scheduled	[]	Finished	2054-01-01 00:00:01	2056-01-01 00:00:00	1
-<13: chain-refreshed>	b	Scheduled	['default.a']	Finished	2054-01-24 23:22:21	2056-01-01 00:00:00	1
+<13: chain-refreshed>	a	Scheduled	[]	Finished	2054-01-01 00:00:01	2056-01-01 00:00:00	
+<13: chain-refreshed>	b	Scheduled	['default.a']	Finished	2054-01-24 23:22:21	2056-01-01 00:00:00	
 <14: waiting for next cycle>	a	Scheduled	[]	2058-01-01 00:00:00
 <14: waiting for next cycle>	b	WaitingForDependencies	['default.a']	2060-01-01 00:00:00
 <15: chain-refreshed a>	6
@@ -30,3 +26,19 @@ CREATE MATERIALIZED VIEW default.b\nREFRESH EVERY 2 YEAR DEPENDS ON default.a\n(
 <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\nAS SELECT x * 10 AS y\nFROM default.a
+<19: exception>	1
+<20: unexception>	1
+<21: rename>	1
+<22: rename>	d	Finished
+<23: simple refresh>	1
+<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\nAS SELECT 42
+<29: randomize>	1	1
+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
+<32: empty>	i	Scheduled	Unknown
+<32: empty>	j	Scheduled	Finished
diff --git a/tests/queries/0_stateless/02932_refreshable_materialized_views_1.sh b/tests/queries/0_stateless/02932_refreshable_materialized_views.sh
similarity index 51%
rename from tests/queries/0_stateless/02932_refreshable_materialized_views_1.sh
rename to tests/queries/0_stateless/02932_refreshable_materialized_views.sh
index 2b92a113e91..89942e25b67 100755
--- a/tests/queries/0_stateless/02932_refreshable_materialized_views_1.sh
+++ b/tests/queries/0_stateless/02932_refreshable_materialized_views.sh
@@ -2,6 +2,8 @@
 # Tags: atomic-database
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# reset --log_comment
+CLICKHOUSE_LOG_COMMENT=
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
@@ -19,13 +21,13 @@ $CLICKHOUSE_CLIENT -nq "
         refresh after 2 second
         engine Memory
         empty
-        as select number as x from numbers(2) union all select rand64() as x;
-    select '<1: created view>', view, remaining_dependencies, exception, last_refresh_result in ('Unknown', 'Finished') from refreshes;
-    show create a;"
+        as select number as x from numbers(2) union all select rand64() as x"
+$CLICKHOUSE_CLIENT -nq "select '<1: created view>', view, remaining_dependencies, exception, last_refresh_result in ('Unknown', 'Finished') from refreshes";
+$CLICKHOUSE_CLIENT -nq "show create a"
 # Wait for any refresh. (xargs trims the string and turns \t and \n into spaces)
 while [ "`$CLICKHOUSE_CLIENT -nq "select last_refresh_result from refreshes -- $LINENO" | xargs`" == 'Unknown' ]
 do
-    sleep 0.5
+    sleep 0.1
 done
 start_time="`$CLICKHOUSE_CLIENT -nq "select reinterpret(now64(), 'Int64')"`"
 # Check table contents.
@@ -36,14 +38,14 @@ while :
 do
     res2="`$CLICKHOUSE_CLIENT -nq 'select * from a order by x format Values -- $LINENO'`"
     [ "$res2" == "$res1" ] || break
-    sleep 0.5
+    sleep 0.1
 done
 # Wait for another change.
 while :
 do
     res3="`$CLICKHOUSE_CLIENT -nq 'select * from a order by x format Values -- $LINENO'`"
     [ "$res3" == "$res2" ] || break
-    sleep 0.5
+    sleep 0.1
 done
 # 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
@@ -54,15 +56,16 @@ $CLICKHOUSE_CLIENT -nq "
 
 # Create a source table from which views will read.
 $CLICKHOUSE_CLIENT -nq "
-    create table src (x Int8) engine Memory as select 1;"
+    create table src (x Int8) engine Memory as select 1"
 
 # 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';
-    system wait view a;
-    system refresh view a;
-    system wait view a;
-    select '<4.1: fake clock>', status, last_refresh_time, next_refresh_time from refreshes;
+    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:03' ]
+do
+    sleep 0.1
+done
+$CLICKHOUSE_CLIENT -nq "
     alter table a modify refresh every 2 year;
     alter table a modify query select x*2 as x from src;
     select '<4.5: altered>', status, last_refresh_result, next_refresh_time from refreshes;
@@ -73,7 +76,7 @@ $CLICKHOUSE_CLIENT -nq "
     system test view a set fake time '2052-02-03 04:05:06';"
 while [ "`$CLICKHOUSE_CLIENT -nq "select last_refresh_time from refreshes -- $LINENO" | xargs`" != '2052-02-03 04:05:06' ]
 do
-    sleep 0.5
+    sleep 0.1
 done
 $CLICKHOUSE_CLIENT -nq "
     select '<6: refreshed>', * from a;
@@ -84,9 +87,11 @@ $CLICKHOUSE_CLIENT -nq "
     create materialized view b refresh every 2 year depends on a (y Int32) engine MergeTree order by y empty as select x*10 as y from a;
     show create b;
     system test view b set fake time '2052-11-11 11:11:11';
-    system refresh view b;
-    system wait view b;
-    select '<7.5: created dependent>', last_refresh_time from refreshes where view = 'b';"
+    system refresh view b;"
+while [ "`$CLICKHOUSE_CLIENT -nq "select last_refresh_time from refreshes where view = 'b' -- $LINENO" | xargs`" != '2052-11-11 11:11:11' ]
+do
+    sleep 0.1
+done
 # Next refresh shouldn't start until the dependency refreshes.
 $CLICKHOUSE_CLIENT -nq "
     select '<8: refreshed>', * from b;
@@ -94,33 +99,24 @@ $CLICKHOUSE_CLIENT -nq "
     system test view b set fake time '2054-01-24 23:22:21';"
 while [ "`$CLICKHOUSE_CLIENT -nq "select status, next_refresh_time from refreshes where view = 'b' -- $LINENO" | xargs`" != 'WaitingForDependencies 2054-01-01 00:00:00' ]
 do
-    sleep 0.5
+    sleep 0.1
 done
-
-# Drop the source table, check that refresh fails and doesn't leave a temp table behind.
+# Update source table (by dropping and re-creating it - to test that tables are looked up by name
+# rather than uuid), kick off refresh of the dependency.
 $CLICKHOUSE_CLIENT -nq "
-    select '<9.2: dropping>', countIf(name like '%tmp%'), countIf(name like '%.inner%') from system.tables where database = currentDatabase();
+    select '<10: waiting>', view, status, remaining_dependencies, next_refresh_time from refreshes;
     drop table src;
-    system refresh view a;"
-$CLICKHOUSE_CLIENT -nq "system wait view a;" 2>/dev/null && echo "SYSTEM WAIT VIEW failed to fail at $LINENO"
-$CLICKHOUSE_CLIENT -nq "
-    select '<9.4: dropped>', countIf(name like '%tmp%'), countIf(name like '%.inner%') from system.tables where database = currentDatabase();"
-
-# Create the source table again, check that refresh succeeds (in particular that tables are looked
-# up by name rather than uuid).
-$CLICKHOUSE_CLIENT -nq "
-    select '<10: creating>', view, status, remaining_dependencies, next_refresh_time from refreshes;
     create table src (x Int16) engine Memory as select 2;
     system test view a set fake time '2054-01-01 00:00:01';"
 while [ "`$CLICKHOUSE_CLIENT -nq "select status from refreshes where view = 'b' -- $LINENO" | xargs`" != 'Scheduled' ]
 do
-    sleep 0.5
+    sleep 0.1
 done
 # Both tables should've refreshed.
 $CLICKHOUSE_CLIENT -nq "
     select '<11: chain-refreshed a>', * from a;
     select '<12: chain-refreshed b>', * from b;
-    select '<13: chain-refreshed>', view, status, remaining_dependencies, last_refresh_result, last_refresh_time, next_refresh_time, exception == '' from refreshes;"
+    select '<13: chain-refreshed>', view, status, remaining_dependencies, last_refresh_result, last_refresh_time, next_refresh_time, exception from refreshes;"
 
 # Make the dependent table run ahead by one refresh cycle, make sure it waits for the dependency to
 # catch up to the same cycle.
@@ -129,16 +125,16 @@ $CLICKHOUSE_CLIENT -nq "
     system refresh view b;"
 while [ "`$CLICKHOUSE_CLIENT -nq "select next_refresh_time from refreshes where view = 'b' -- $LINENO" | xargs`" != '2060-01-01 00:00:00' ]
 do
-    sleep 0.5
+    sleep 0.1
 done
 $CLICKHOUSE_CLIENT -nq "
     system test view b set fake time '2061-01-01 00:00:00';
     system test view a set fake time '2057-01-01 00:00:00';"
 while [ "`$CLICKHOUSE_CLIENT -nq "select status, next_refresh_time from refreshes -- $LINENO" | xargs`" != 'Scheduled 2058-01-01 00:00:00 WaitingForDependencies 2060-01-01 00:00:00' ]
 do
-    sleep 0.5
+    sleep 0.1
 done
-
+sleep 1
 $CLICKHOUSE_CLIENT -nq "
     select '<14: waiting for next cycle>', view, status, remaining_dependencies, next_refresh_time from refreshes;
     truncate src;
@@ -146,7 +142,7 @@ $CLICKHOUSE_CLIENT -nq "
     system test view a set fake time '2060-02-02 02:02:02';"
 while [ "`$CLICKHOUSE_CLIENT -nq "select next_refresh_time from refreshes where view = 'b' -- $LINENO" | xargs`" != '2062-01-01 00:00:00' ]
 do
-    sleep 0.5
+    sleep 0.1
 done
 $CLICKHOUSE_CLIENT -nq "
     select '<15: chain-refreshed a>', * from a;
@@ -158,20 +154,150 @@ $CLICKHOUSE_CLIENT -nq "
     system test view b set fake time '2062-03-03 03:03:03'"
 while [ "`$CLICKHOUSE_CLIENT -nq "select status from refreshes where view = 'b' -- $LINENO" | xargs`" != 'WaitingForDependencies' ]
 do
-    sleep 0.5
+    sleep 0.1
 done
 $CLICKHOUSE_CLIENT -nq "
     alter table b modify refresh every 2 year"
 while [ "`$CLICKHOUSE_CLIENT -nq "select status, last_refresh_time from refreshes where view = 'b' -- $LINENO" | xargs`" != 'Scheduled 2062-03-03 03:03:03' ]
 do
-    sleep 0.5
+    sleep 0.1
 done
 $CLICKHOUSE_CLIENT -nq "
     select '<18: removed dependency>', view, status, remaining_dependencies, last_refresh_time,next_refresh_time, refresh_count from refreshes where view = 'b';
     show create b;"
 
+# Select from a table that doesn't exist, get an exception.
 $CLICKHOUSE_CLIENT -nq "
-    drop table src;
     drop table a;
     drop table b;
+    create materialized view c refresh every 1 second (x Int64) engine Memory empty as select * from src;
+    drop table src;"
+while [ "`$CLICKHOUSE_CLIENT -nq "select last_refresh_result from refreshes -- $LINENO" | xargs`" != 'Exception' ]
+do
+    sleep 0.1
+done
+# Check exception, create src, expect successful refresh.
+$CLICKHOUSE_CLIENT -nq "
+    select '<19: exception>', exception ilike '%UNKNOWN_TABLE%' from refreshes;
+    create table src (x Int64) engine Memory as select 1;
+    system refresh view c;"
+while [ "`$CLICKHOUSE_CLIENT -nq "select last_refresh_result from refreshes -- $LINENO" | xargs`" != 'Finished' ]
+do
+    sleep 0.1
+done
+# Rename table.
+$CLICKHOUSE_CLIENT -nq "
+    select '<20: unexception>', * from c;
+    rename table c to d;
+    select '<21: rename>', * from d;
+    select '<22: rename>', view, last_refresh_result from refreshes;"
+
+# Do various things during a refresh.
+# First make a nonempty view.
+$CLICKHOUSE_CLIENT -nq "
+    drop table d;
+    truncate src;
+    insert into src values (1)
+    create materialized view e refresh every 1 second (x Int64) engine MergeTree order by x empty as select x + sleepEachRow(1) as x from src settings max_block_size = 1;"
+while [ "`$CLICKHOUSE_CLIENT -nq "select last_refresh_result from refreshes -- $LINENO" | xargs`" != 'Finished' ]
+do
+    sleep 0.1
+done
+# Stop refreshes.
+$CLICKHOUSE_CLIENT -nq "
+    select '<23: simple refresh>', * from e;
+    system stop view e;"
+while [ "`$CLICKHOUSE_CLIENT -nq "select status from refreshes -- $LINENO" | xargs`" != 'Disabled' ]
+do
+    sleep 0.1
+done
+# Make refreshes slow, wait for a slow refresh to start. (We stopped refreshes first to make sure
+# we wait for a slow refresh, not a previous fast one.)
+$CLICKHOUSE_CLIENT -nq "
+    insert into src select * from numbers(1000) settings max_block_size=1;
+    system start view e;"
+while [ "`$CLICKHOUSE_CLIENT -nq "select status from refreshes -- $LINENO" | xargs`" != 'Running' ]
+do
+    sleep 0.1
+done
+# Rename.
+$CLICKHOUSE_CLIENT -nq "
+    rename table e to f;
+    select '<24: rename during refresh>', * from f;
+    select '<25: rename during refresh>', view, status from refreshes;
+    alter table f modify refresh after 10 year;"
+sleep 2 # make it likely that at least one row was processed
+# Cancel.
+$CLICKHOUSE_CLIENT -nq "
+    system cancel view f;"
+while [ "`$CLICKHOUSE_CLIENT -nq "select last_refresh_result from refreshes -- $LINENO" | xargs`" != 'Cancelled' ]
+do
+    sleep 0.1
+done
+# Check that another refresh doesn't immediately start after the cancelled one.
+sleep 1
+$CLICKHOUSE_CLIENT -nq "
+    select '<27: cancelled>', view, status from refreshes;
+    system refresh view f;"
+while [ "`$CLICKHOUSE_CLIENT -nq "select status from refreshes -- $LINENO" | xargs`" != 'Running' ]
+do
+    sleep 0.1
+done
+# Drop.
+$CLICKHOUSE_CLIENT -nq "
+    drop table f;
+    select '<28: drop during refresh>', view, status from refreshes;"
+
+# Try OFFSET and RANDOMIZE FOR.
+$CLICKHOUSE_CLIENT -nq "
+    create materialized view g refresh every 1 week offset 3 day 4 hour randomize for 4 day 1 hour (x Int64) engine Memory empty as select 42;
+    show create g;
+    system test view g set fake time '2050-02-03 15:30:13';"
+while [ "`$CLICKHOUSE_CLIENT -nq "select next_refresh_time > '2049-01-01' from refreshes -- $LINENO" | xargs`" != '1' ]
+do
+    sleep 0.1
+done
+$CLICKHOUSE_CLIENT -nq "
+    with '2050-02-10 04:00:00'::DateTime as expected
+    select '<29: randomize>', abs(next_refresh_time::Int64 - expected::Int64) <= 3600*(24*4+1), next_refresh_time != expected from refreshes;"
+
+# Send data 'TO' an existing table.
+$CLICKHOUSE_CLIENT -nq "
+    drop table g;
+    create table dest (x Int64) engine MergeTree order by x;
+    truncate src;
+    insert into src values (1);
+    create materialized view h refresh every 1 second to dest empty as select x*10 as x from src;
+    show create h;"
+while [ "`$CLICKHOUSE_CLIENT -nq "select last_refresh_result from refreshes -- $LINENO" | xargs`" != 'Finished' ]
+do
+    sleep 0.1
+done
+$CLICKHOUSE_CLIENT -nq "
+    select '<30: to existing table>', * from dest;
+    insert into src values (2);"
+while [ "`$CLICKHOUSE_CLIENT -nq "select count() from dest -- $LINENO" | xargs`" != '2' ]
+do
+    sleep 0.1
+done
+$CLICKHOUSE_CLIENT -nq "
+    select '<31: to existing table>', * from dest;
+    drop table dest;
+    drop table src;
+    drop table h;"
+
+# EMPTY
+$CLICKHOUSE_CLIENT -nq "
+    create materialized view i refresh after 1 year engine Memory empty as select number as x from numbers(2);
+    create materialized view j refresh after 1 year engine Memory as select number as x from numbers(2)"
+while [ "`$CLICKHOUSE_CLIENT -nq "select sum(last_success_time is null) from refreshes -- $LINENO" | xargs`" == '2' ]
+do
+    sleep 0.1
+done
+$CLICKHOUSE_CLIENT -nq "
+    select '<32: empty>', view, status, last_refresh_result from refreshes order by view;
+    drop table i;
+    drop table j"
+
+$CLICKHOUSE_CLIENT -nq "
     drop table refreshes;"
diff --git a/tests/queries/0_stateless/02932_refreshable_materialized_views_2.reference b/tests/queries/0_stateless/02932_refreshable_materialized_views_2.reference
deleted file mode 100644
index cdaad32de0a..00000000000
--- a/tests/queries/0_stateless/02932_refreshable_materialized_views_2.reference
+++ /dev/null
@@ -1,30 +0,0 @@
-<19: exception>	1
-<20: unexception>	1
-<21: rename>	1
-<22: rename>	d	Finished
-<23: simple refresh>	1
-<24: rename during refresh>	1
-<25: rename during refresh>	f	Running
-<27: cancelled>	f	Scheduled	Cancelled
-<28: drop during refresh>	0	0
-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 AS x
-<29: randomize>	1	1
-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
-<31.5: will retry>	Error	1
-<31.6: did retry>	10
-<32: empty>	i	Scheduled	Unknown	0
-<32: empty>	j	Scheduled	Finished	0
-<34: append>	10
-<35: append>	10
-<35: append>	20
-<35: append>	30
-<36: not append>	20
-<36: not append>	30
-<37: append chain>	100
-<38: append chain>	100
-<38: append chain>	100
-<38: append chain>	200
-creating MergeTree without ORDER BY failed, as expected
diff --git a/tests/queries/0_stateless/02932_refreshable_materialized_views_2.sh b/tests/queries/0_stateless/02932_refreshable_materialized_views_2.sh
deleted file mode 100755
index 50a905576d5..00000000000
--- a/tests/queries/0_stateless/02932_refreshable_materialized_views_2.sh
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/usr/bin/env bash
-# Tags: atomic-database
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# reset --log_comment
-CLICKHOUSE_LOG_COMMENT=
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-# Set session timezone to UTC to make all DateTime formatting and parsing use UTC, because refresh
-# scheduling is done in UTC.
-CLICKHOUSE_CLIENT="`echo "$CLICKHOUSE_CLIENT" | sed 's/--session_timezone[= ][^ ]*//g'`"
-CLICKHOUSE_CLIENT="`echo "$CLICKHOUSE_CLIENT --allow_experimental_refreshable_materialized_view=1 --allow_materialized_view_with_bad_select=0 --session_timezone Etc/UTC"`"
-
-$CLICKHOUSE_CLIENT -nq "create view refreshes as select * from system.view_refreshes where database = '$CLICKHOUSE_DATABASE' order by view"
-
-
-# Select from a table that doesn't exist, get an exception.
-$CLICKHOUSE_CLIENT -nq "
-    create table src (x Int8) engine Memory as select 1;
-    create materialized view c refresh every 1 second (x Int64) engine Memory empty as select * from src;
-    drop table src;"
-while [ "`$CLICKHOUSE_CLIENT -nq "select last_refresh_result from refreshes where view = 'c' -- $LINENO" | xargs`" != 'Error' ]
-do
-    sleep 0.5
-done
-# Check exception, create src, expect successful refresh.
-$CLICKHOUSE_CLIENT -nq "
-    select '<19: exception>', exception ilike '%UNKNOWN_TABLE%' ? '1' : exception from refreshes where view = 'c';
-    create table src (x Int64) engine Memory as select 1;
-    system refresh view c;"
-while [ "`$CLICKHOUSE_CLIENT -nq "select last_refresh_result from refreshes -- $LINENO" | xargs`" != 'Finished' ]
-do
-    sleep 0.5
-done
-# Rename table.
-$CLICKHOUSE_CLIENT -nq "
-    select '<20: unexception>', * from c;
-    rename table c to d;
-    select '<21: rename>', * from d;
-    select '<22: rename>', view, last_refresh_result from refreshes;"
-
-# Do various things during a refresh.
-# First make a nonempty view.
-$CLICKHOUSE_CLIENT -nq "
-    drop table d;
-    truncate src;
-    insert into src values (1);
-    create materialized view e refresh every 1 second (x Int64) engine MergeTree order by x empty as select x + sleepEachRow(1) as x from src settings max_block_size = 1;"
-while [ "`$CLICKHOUSE_CLIENT -nq "select last_refresh_result from refreshes -- $LINENO" | xargs`" != 'Finished' ]
-do
-    sleep 0.5
-done
-# Stop refreshes.
-$CLICKHOUSE_CLIENT -nq "
-    select '<23: simple refresh>', * from e;
-    system stop view e;"
-while [ "`$CLICKHOUSE_CLIENT -nq "select status from refreshes -- $LINENO" | xargs`" != 'Disabled' ]
-do
-    sleep 0.5
-done
-# Make refreshes slow, wait for a slow refresh to start. (We stopped refreshes first to make sure
-# we wait for a slow refresh, not a previous fast one.)
-$CLICKHOUSE_CLIENT -nq "
-    insert into src select * from numbers(1000) settings max_block_size=1;
-    system start view e;"
-while [ "`$CLICKHOUSE_CLIENT -nq "select status from refreshes -- $LINENO" | xargs`" != 'Running' ]
-do
-    sleep 0.5
-done
-# Rename.
-$CLICKHOUSE_CLIENT -nq "
-    rename table e to f;
-    select '<24: rename during refresh>', * from f;
-    select '<25: rename during refresh>', view, status from refreshes where view = 'f';
-    alter table f modify refresh after 10 year;"
-
-# Cancel.
-$CLICKHOUSE_CLIENT -nq "
-    system cancel view f;"
-while [ "`$CLICKHOUSE_CLIENT -nq "select status from refreshes where view = 'f' -- $LINENO" | xargs`" != 'Scheduled' ]
-do
-    sleep 0.5
-done
-# Check that another refresh doesn't immediately start after the cancelled one.
-$CLICKHOUSE_CLIENT -nq "
-    select '<27: cancelled>', view, status, last_refresh_result from refreshes where view = 'f';
-    system refresh view f;"
-while [ "`$CLICKHOUSE_CLIENT -nq "select status from refreshes where view = 'f' -- $LINENO" | xargs`" != 'Running' ]
-do
-    sleep 0.5
-done
-# Drop.
-$CLICKHOUSE_CLIENT -nq "
-    drop table f;
-    select '<28: drop during refresh>', view, status from refreshes;
-    select '<28: drop during refresh>', countIf(name like '%tmp%'), countIf(name like '%.inner%') from system.tables where database = currentDatabase()"
-
-# Try OFFSET and RANDOMIZE FOR.
-$CLICKHOUSE_CLIENT -nq "
-    create materialized view g refresh every 1 week offset 3 day 4 hour randomize for 4 day 1 hour (x Int64) engine Memory empty as select 42 as x;
-    show create g;
-    system test view g set fake time '2050-02-03 15:30:13';"
-while [ "`$CLICKHOUSE_CLIENT -nq "select next_refresh_time > '2049-01-01' from refreshes -- $LINENO" | xargs`" != '1' ]
-do
-    sleep 0.5
-done
-$CLICKHOUSE_CLIENT -nq "
-    with '2050-02-10 04:00:00'::DateTime as expected
-    select '<29: randomize>', abs(next_refresh_time::Int64 - expected::Int64) <= 3600*(24*4+1), next_refresh_time != expected from refreshes;"
-
-# Send data 'TO' an existing table.
-$CLICKHOUSE_CLIENT -nq "
-    drop table g;
-    create table dest (x Int64) engine MergeTree order by x;
-    truncate src;
-    insert into src values (1);
-    create materialized view h refresh every 1 second to dest empty as select x*10 as x from src;
-    show create h;"
-while [ "`$CLICKHOUSE_CLIENT -nq "select last_refresh_result from refreshes -- $LINENO" | xargs`" != 'Finished' ]
-do
-    sleep 0.5
-done
-$CLICKHOUSE_CLIENT -nq "
-    select '<30: to existing table>', * from dest;
-    insert into src values (2);"
-while [ "`$CLICKHOUSE_CLIENT -nq "select count() from dest -- $LINENO" | xargs`" != '2' ]
-do
-    sleep 0.5
-done
-$CLICKHOUSE_CLIENT -nq "
-    select '<31: to existing table>', * from dest;
-    drop table dest;
-    drop table h;"
-
-# Retries.
-$CLICKHOUSE_CLIENT -nq "
-    create materialized view h2 refresh after 1 year settings refresh_retries = 10 (x Int64) engine Memory as select x*10 + throwIf(x % 2 == 0) as x from src;"
-$CLICKHOUSE_CLIENT -nq "system wait view h2;" 2>/dev/null && echo "SYSTEM WAIT VIEW failed to fail at $LINENO"
-$CLICKHOUSE_CLIENT -nq "
-    select '<31.5: will retry>', last_refresh_result, retry > 0 from refreshes;
-    create table src2 (x Int8) engine Memory;
-    insert into src2 values (1);
-    exchange tables src and src2;
-    drop table src2;"
-while [ "`$CLICKHOUSE_CLIENT -nq "select last_refresh_result, retry from refreshes -- $LINENO" | xargs`" != 'Finished 0' ]
-do
-    sleep 0.5
-done
-$CLICKHOUSE_CLIENT -nq "
-    select '<31.6: did retry>', x from h2;
-    drop table h2"
-
-# EMPTY
-$CLICKHOUSE_CLIENT -nq "
-    create materialized view i refresh after 1 year engine Memory empty as select number as x from numbers(2);
-    create materialized view j refresh after 1 year engine Memory as select number as x from numbers(2);"
-while [ "`$CLICKHOUSE_CLIENT -nq "select sum(last_success_time is null) from refreshes -- $LINENO" | xargs`" == '2' ]
-do
-    sleep 0.5
-done
-$CLICKHOUSE_CLIENT -nq "
-    select '<32: empty>', view, status, last_refresh_result, retry from refreshes order by view;
-    drop table i;
-    drop table j;"
-
-# APPEND
-$CLICKHOUSE_CLIENT -nq "
-    create materialized view k refresh every 10 year append (x Int64) engine Memory empty as select x*10 as x from src;
-    select '<33: append>', * from k;
-    system refresh view k;
-    system wait view k;
-    select '<34: append>', * from k;
-    truncate table src;
-    insert into src values (2), (3);
-    system refresh view k;
-    system wait view k;
-    select '<35: append>', * from k order by x;"
-# ALTER to non-APPEND
-$CLICKHOUSE_CLIENT -nq "
-    alter table k modify refresh every 10 year;
-    system wait view k;
-    system refresh view k;
-    system wait view k;
-    select '<36: not append>', * from k order by x;
-    drop table k;
-    truncate table src;"
-
-# APPEND + TO + regular materialized view reading from it.
-$CLICKHOUSE_CLIENT -nq "
-    create table mid (x Int64) engine MergeTree order by x;
-    create materialized view l refresh every 10 year append to mid empty as select x*10 as x from src;
-    create materialized view m (x Int64) engine Memory as select x*10 as x from mid;
-    insert into src values (1);
-    system refresh view l;
-    system wait view l;
-    select '<37: append chain>', * from m;
-    insert into src values (2);
-    system refresh view l;
-    system wait view l;
-    select '<38: append chain>', * from m order by x;
-    drop table l;
-    drop table m;
-    drop table mid;"
-
-# Failing to create inner table.
-$CLICKHOUSE_CLIENT -nq "
-    create materialized view n refresh every 1 second (x Int64) engine MergeTree as select 1 as x from numbers(2);" 2>/dev/null || echo "creating MergeTree without ORDER BY failed, as expected"
-$CLICKHOUSE_CLIENT -nq "
-    create materialized view n refresh every 1 second (x Int64) engine MergeTree order by x as select 1 as x from numbers(2);
-    drop table n;"
-
-# Reading from table that doesn't exist yet.
-$CLICKHOUSE_CLIENT -nq "
-    create materialized view o refresh every 1 second (x Int64) engine Memory as select x from nonexist; -- { serverError UNKNOWN_TABLE }
-    create materialized view o (x Int64) engine Memory as select x from nonexist; -- { serverError UNKNOWN_TABLE }
-    create materialized view o (x Int64) engine Memory as select x from nope.nonexist; -- { serverError UNKNOWN_DATABASE }
-    create materialized view o refresh every 1 second (x Int64) engine Memory as select x from nope.nonexist settings allow_materialized_view_with_bad_select = 1;
-    drop table o;"
-
-$CLICKHOUSE_CLIENT -nq "
-    drop table refreshes;"
diff --git a/tests/queries/0_stateless/02933_change_cache_setting_without_restart.reference b/tests/queries/0_stateless/02933_change_cache_setting_without_restart.reference
index 0f64d0393b2..17a25d82824 100644
--- a/tests/queries/0_stateless/02933_change_cache_setting_without_restart.reference
+++ b/tests/queries/0_stateless/02933_change_cache_setting_without_restart.reference
@@ -1,7 +1,7 @@
-134217728	10000000	33554432	1	4194304	1	0	0	0	/var/lib/clickhouse/filesystem_caches/s3_cache_02933/	0	0	0	16
-134217728	10000000	33554432	1	4194304	1	0	0	0	/var/lib/clickhouse/filesystem_caches/s3_cache_02933/	10	1000	0	16
-134217728	10000000	33554432	1	4194304	1	0	0	0	/var/lib/clickhouse/filesystem_caches/s3_cache_02933/	5	1000	0	16
-134217728	10000000	33554432	1	4194304	1	0	0	0	/var/lib/clickhouse/filesystem_caches/s3_cache_02933/	15	1000	0	16
-134217728	10000000	33554432	1	4194304	1	0	0	0	/var/lib/clickhouse/filesystem_caches/s3_cache_02933/	2	1000	0	16
-134217728	10000000	33554432	1	4194304	1	0	0	0	/var/lib/clickhouse/filesystem_caches/s3_cache_02933/	0	1000	0	16
-134217728	10000000	33554432	1	4194304	1	0	0	0	/var/lib/clickhouse/filesystem_caches/s3_cache_02933/	0	0	0	16
+134217728	10000000	33554432	4194304	1	0	0	0	/var/lib/clickhouse/filesystem_caches/s3_cache_02933/	0	0	0	16
+134217728	10000000	33554432	4194304	1	0	0	0	/var/lib/clickhouse/filesystem_caches/s3_cache_02933/	10	1000	0	16
+134217728	10000000	33554432	4194304	1	0	0	0	/var/lib/clickhouse/filesystem_caches/s3_cache_02933/	5	1000	0	16
+134217728	10000000	33554432	4194304	1	0	0	0	/var/lib/clickhouse/filesystem_caches/s3_cache_02933/	15	1000	0	16
+134217728	10000000	33554432	4194304	1	0	0	0	/var/lib/clickhouse/filesystem_caches/s3_cache_02933/	2	1000	0	16
+134217728	10000000	33554432	4194304	1	0	0	0	/var/lib/clickhouse/filesystem_caches/s3_cache_02933/	0	1000	0	16
+134217728	10000000	33554432	4194304	1	0	0	0	/var/lib/clickhouse/filesystem_caches/s3_cache_02933/	0	0	0	16
diff --git a/tests/queries/0_stateless/02933_paste_join.sql b/tests/queries/0_stateless/02933_paste_join.sql
index 6c5a923d028..604078d1c3a 100644
--- a/tests/queries/0_stateless/02933_paste_join.sql
+++ b/tests/queries/0_stateless/02933_paste_join.sql
@@ -41,10 +41,10 @@ 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 enable_analyzer = 1;
-SELECT * FROM (SELECT 1 AS a) PASTE JOIN (SELECT 2 AS b) PASTE JOIN (SELECT 3 AS a) SETTINGS enable_analyzer = 1; -- { serverError AMBIGUOUS_COLUMN_NAME }
+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 enable_analyzer = 1;
+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;
diff --git a/tests/queries/0_stateless/02933_replicated_database_forbid_create_as_select.sh b/tests/queries/0_stateless/02933_replicated_database_forbid_create_as_select.sh
index 2b78746ae2c..b587549cb60 100755
--- a/tests/queries/0_stateless/02933_replicated_database_forbid_create_as_select.sh
+++ b/tests/queries/0_stateless/02933_replicated_database_forbid_create_as_select.sh
@@ -12,15 +12,15 @@ ${CLICKHOUSE_CLIENT} --query "CREATE DATABASE ${CLICKHOUSE_DATABASE}_db engine =
 
 # Non-replicated engines are allowed
 ${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.test (id UInt64) ENGINE = MergeTree() ORDER BY id AS SELECT 1"
-${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --query "CREATE MATERIALIZED VIEW ${CLICKHOUSE_DATABASE}_db.test_mv (id UInt64) ENGINE = MergeTree() ORDER BY id POPULATE AS SELECT 1 AS id"
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --query "CREATE MATERIALIZED VIEW ${CLICKHOUSE_DATABASE}_db.test_mv (id UInt64) ENGINE = MergeTree() ORDER BY id POPULATE AS SELECT 1"
 
 # Replicated storafes are forbidden
 ${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.test2 (id UInt64) ENGINE = ReplicatedMergeTree ORDER BY id AS SELECT 1" |& grep -cm1 "SUPPORT_IS_DISABLED"
-${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --query "CREATE MATERIALIZED VIEW ${CLICKHOUSE_DATABASE}_db.test_mv2 (id UInt64) ENGINE = ReplicatedMergeTree ORDER BY id POPULATE AS SELECT 1 AS id" |& grep -cm1 "SUPPORT_IS_DISABLED"
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --query "CREATE MATERIALIZED VIEW ${CLICKHOUSE_DATABASE}_db.test_mv2 (id UInt64) ENGINE = ReplicatedMergeTree ORDER BY id POPULATE AS SELECT 1" |& grep -cm1 "SUPPORT_IS_DISABLED"
 
 # POPULATE is allowed with the special setting
-${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --query "CREATE MATERIALIZED VIEW ${CLICKHOUSE_DATABASE}_db.test_mv2 (id UInt64) ENGINE = ReplicatedMergeTree ORDER BY id POPULATE AS SELECT 1 AS id" --database_replicated_allow_heavy_create=1
-${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --query "CREATE MATERIALIZED VIEW ${CLICKHOUSE_DATABASE}_db.test_mv3 (id UInt64) ENGINE = ReplicatedMergeTree ORDER BY id POPULATE AS SELECT 1 AS id" --compatibility='24.6'
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --query "CREATE MATERIALIZED VIEW ${CLICKHOUSE_DATABASE}_db.test_mv2 (id UInt64) ENGINE = ReplicatedMergeTree ORDER BY id POPULATE AS SELECT 1" --database_replicated_allow_heavy_create=1
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --query "CREATE MATERIALIZED VIEW ${CLICKHOUSE_DATABASE}_db.test_mv3 (id UInt64) ENGINE = ReplicatedMergeTree ORDER BY id POPULATE AS SELECT 1" --compatibility='24.6'
 
 # AS SELECT is forbidden even with the setting
 ${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.test2 (id UInt64) ENGINE = ReplicatedMergeTree ORDER BY id AS SELECT 1" --database_replicated_allow_heavy_create=1  |& grep -cm1 "SUPPORT_IS_DISABLED"
diff --git a/tests/queries/0_stateless/02935_format_with_arbitrary_types.reference b/tests/queries/0_stateless/02935_format_with_arbitrary_types.reference
index f100e8c48d4..3455adc8723 100644
--- a/tests/queries/0_stateless/02935_format_with_arbitrary_types.reference
+++ b/tests/queries/0_stateless/02935_format_with_arbitrary_types.reference
@@ -34,7 +34,6 @@ The answer to all questions is 2023-11-14 05:50:12.123.
 The answer to all questions is hallo.
 The answer to all questions is [\'foo\',\'bar\'].
 The answer to all questions is {"foo":"bar"}.
-The answer to all questions is {"foo":"bar"}.
 The answer to all questions is (42,\'foo\').
 The answer to all questions is {42:\'foo\'}.
 The answer to all questions is 122.233.64.201.
diff --git a/tests/queries/0_stateless/02935_format_with_arbitrary_types.sql b/tests/queries/0_stateless/02935_format_with_arbitrary_types.sql
index dcc3964e4b0..ad1de2bec6d 100644
--- a/tests/queries/0_stateless/02935_format_with_arbitrary_types.sql
+++ b/tests/queries/0_stateless/02935_format_with_arbitrary_types.sql
@@ -3,7 +3,6 @@
 -- no-fasttest: json type needs rapidjson library, geo types need s2 geometry
 
 SET allow_experimental_object_type = 1;
-SET allow_experimental_json_type = 1;
 SET allow_suspicious_low_cardinality_types=1;
 
 SELECT '-- Const string + non-const arbitrary type';
@@ -41,7 +40,6 @@ SELECT format('The {0} to all questions is {1}.', 'answer', materialize('2023-11
 SELECT format('The {0} to all questions is {1}.', 'answer', materialize('2023-11-14 05:50:12.123' :: DateTime64(3, 'Europe/Amsterdam')));
 SELECT format('The {0} to all questions is {1}.', 'answer', materialize('hallo' :: Enum('hallo' = 1)));
 SELECT format('The {0} to all questions is {1}.', 'answer', materialize(['foo', 'bar'] :: Array(String)));
-SELECT format('The {0} to all questions is {1}.', 'answer', materialize('{"foo": "bar"}' :: Object('json')));
 SELECT format('The {0} to all questions is {1}.', 'answer', materialize('{"foo": "bar"}' :: JSON));
 SELECT format('The {0} to all questions is {1}.', 'answer', materialize((42, 'foo') :: Tuple(Int32, String)));
 SELECT format('The {0} to all questions is {1}.', 'answer', materialize(map(42, 'foo') :: Map(Int32, String)));
diff --git a/tests/queries/0_stateless/02940_system_stacktrace_optimizations.sh b/tests/queries/0_stateless/02940_system_stacktrace_optimizations.sh
index 9d1faf301d3..0e23bb6c42b 100755
--- a/tests/queries/0_stateless/02940_system_stacktrace_optimizations.sh
+++ b/tests/queries/0_stateless/02940_system_stacktrace_optimizations.sh
@@ -9,12 +9,12 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 # no message at all
 echo "thread = 0"
-$CLICKHOUSE_CLIENT --allow_repeated_settings --send_logs_level=test -m -q "select * from system.stack_trace where thread_id = 0" |& grep -F -o 'Send signal to'
+$CLICKHOUSE_CLIENT --allow_repeated_settings --send_logs_level=test -nm -q "select * from system.stack_trace where thread_id = 0" |& grep -F -o 'Send signal to'
 
 # send messages to some threads
 echo "thread != 0"
-$CLICKHOUSE_CLIENT --allow_repeated_settings --send_logs_level=test -m -q "select * from system.stack_trace where thread_id != 0 format Null" |& grep -F -o 'Send signal to' | grep -v 'Send signal to 0 threads (total)'
+$CLICKHOUSE_CLIENT --allow_repeated_settings --send_logs_level=test -nm -q "select * from system.stack_trace where thread_id != 0 format Null" |& grep -F -o 'Send signal to' | grep -v 'Send signal to 0 threads (total)'
 
 # there is no thread with comm="foo", so no signals will be sent
 echo "thread_name = 'foo'"
-$CLICKHOUSE_CLIENT --allow_repeated_settings --send_logs_level=test -m -q "select * from system.stack_trace where thread_name = 'foo' format Null" |& grep -F -o 'Send signal to 0 threads (total)'
+$CLICKHOUSE_CLIENT --allow_repeated_settings --send_logs_level=test -nm -q "select * from system.stack_trace where thread_name = 'foo' format Null" |& grep -F -o 'Send signal to 0 threads (total)'
diff --git a/tests/queries/0_stateless/02941_variant_type_1.sh b/tests/queries/0_stateless/02941_variant_type_1.sh
index c12bece6d54..723de45eaad 100755
--- a/tests/queries/0_stateless/02941_variant_type_1.sh
+++ b/tests/queries/0_stateless/02941_variant_type_1.sh
@@ -2,6 +2,8 @@
 # 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
 
diff --git a/tests/queries/0_stateless/02941_variant_type_2.sh b/tests/queries/0_stateless/02941_variant_type_2.sh
index e93dfac8510..8453bce98dc 100755
--- a/tests/queries/0_stateless/02941_variant_type_2.sh
+++ b/tests/queries/0_stateless/02941_variant_type_2.sh
@@ -2,6 +2,8 @@
 # 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
 
diff --git a/tests/queries/0_stateless/02941_variant_type_3.sh b/tests/queries/0_stateless/02941_variant_type_3.sh
index cc0fde5b689..990eb25b5be 100755
--- a/tests/queries/0_stateless/02941_variant_type_3.sh
+++ b/tests/queries/0_stateless/02941_variant_type_3.sh
@@ -2,6 +2,8 @@
 # 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
 
diff --git a/tests/queries/0_stateless/02941_variant_type_4.sh b/tests/queries/0_stateless/02941_variant_type_4.sh
index 93a1770d05e..b8f619694b0 100755
--- a/tests/queries/0_stateless/02941_variant_type_4.sh
+++ b/tests/queries/0_stateless/02941_variant_type_4.sh
@@ -2,6 +2,8 @@
 # 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
 
diff --git a/tests/queries/0_stateless/02941_variant_type_alters.sh b/tests/queries/0_stateless/02941_variant_type_alters.sh
index 0b3ab8e925b..7c151d1fe9e 100755
--- a/tests/queries/0_stateless/02941_variant_type_alters.sh
+++ b/tests/queries/0_stateless/02941_variant_type_alters.sh
@@ -2,6 +2,8 @@
 # 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
 
diff --git a/tests/queries/0_stateless/02943_order_by_all.sql b/tests/queries/0_stateless/02943_order_by_all.sql
index 4ce59e84e6c..0d5e0ea52e4 100644
--- a/tests/queries/0_stateless/02943_order_by_all.sql
+++ b/tests/queries/0_stateless/02943_order_by_all.sql
@@ -13,40 +13,40 @@ INSERT INTO order_by_all VALUES ('B', 3), ('C', NULL), ('D', 1), ('A', 2);
 
 SELECT '-- no modifiers';
 
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 SELECT a, b FROM order_by_all ORDER BY ALL;
 SELECT b, a FROM order_by_all ORDER BY ALL;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SELECT a, b FROM order_by_all ORDER BY ALL;
 SELECT b, a FROM order_by_all ORDER BY ALL;
 
 SELECT '-- with ASC/DESC modifiers';
 
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 SELECT a, b FROM order_by_all ORDER BY ALL ASC;
 SELECT a, b FROM order_by_all ORDER BY ALL DESC;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SELECT a, b FROM order_by_all ORDER BY ALL ASC;
 SELECT a, b FROM order_by_all ORDER BY ALL DESC;
 
 SELECT '-- with NULLS FIRST/LAST modifiers';
 
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 SELECT b, a FROM order_by_all ORDER BY ALL NULLS FIRST;
 SELECT b, a FROM order_by_all ORDER BY ALL NULLS LAST;
 
-SET enable_analyzer = 1;
+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 '-- SELECT *';
 
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 SELECT * FROM order_by_all ORDER BY all;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SELECT * FROM order_by_all ORDER BY all;
 
 DROP TABLE order_by_all;
@@ -65,7 +65,7 @@ INSERT INTO order_by_all VALUES ('B', 3, 10), ('C', NULL, 40), ('D', 1, 20), ('A
 
 SELECT '  -- columns';
 
-SET enable_analyzer = 0;
+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 SETTINGS enable_order_by_all = false;
 SELECT a FROM order_by_all ORDER BY all;  -- { serverError UNEXPECTED_EXPRESSION }
@@ -73,7 +73,7 @@ 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 enable_analyzer = 1;
+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 SETTINGS enable_order_by_all = false;
 SELECT a FROM order_by_all ORDER BY all SETTINGS enable_order_by_all = false;
@@ -86,30 +86,30 @@ SELECT * FROM order_by_all ORDER BY all SETTINGS enable_order_by_all = false;
 
 SELECT '  -- column aliases';
 
-SET enable_analyzer = 0;
+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 SETTINGS enable_order_by_all = false;
 
-SET enable_analyzer = 1;
+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 SETTINGS enable_order_by_all = false;
 
 SELECT '  -- expressions';
 
-SET enable_analyzer = 0;
+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 SETTINGS enable_order_by_all = false;
 
-SET enable_analyzer = 1;
+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 SETTINGS enable_order_by_all = false;
 
 SELECT '  -- ORDER BY ALL loses its special meaning when used in conjunction with other columns';
 
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 SELECT a, b, all FROM order_by_all ORDER BY all, a;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SELECT a, b, all FROM order_by_all ORDER BY all, a;
 
 DROP TABLE order_by_all;
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 44af2dbf26f..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
@@ -26,7 +26,7 @@ function wait_part()
 function restore_failpoints()
 {
     # restore entry error with failpoints (to avoid endless errors in logs)
-    $CLICKHOUSE_CLIENT -m -q "
+    $CLICKHOUSE_CLIENT -nm -q "
         system enable failpoint replicated_queue_unfail_entries;
         system sync replica $failed_replica;
         system disable failpoint replicated_queue_unfail_entries;
@@ -34,7 +34,7 @@ function restore_failpoints()
 }
 trap restore_failpoints EXIT
 
-$CLICKHOUSE_CLIENT -m --insert_keeper_fault_injection_probability=0 -q "
+$CLICKHOUSE_CLIENT -nm --insert_keeper_fault_injection_probability=0 -q "
     drop table if exists data_r1;
     drop table if exists data_r2;
 
@@ -45,7 +45,7 @@ $CLICKHOUSE_CLIENT -m --insert_keeper_fault_injection_probability=0 -q "
 "
 
 # will fail ALTER_METADATA on one of replicas
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
     system enable failpoint replicated_queue_fail_next_entry;
     alter table data_r1 drop index value_idx settings alter_sync=0; -- part all_0_0_0_1
 
@@ -80,7 +80,7 @@ fi
 # This will create MERGE_PARTS, on failed replica it will be fetched from source replica (since it does not have all parts to execute merge)
 $CLICKHOUSE_CLIENT -q "optimize table $success_replica final settings optimize_throw_if_noop=1, alter_sync=1" # part all_0_0_1_1
 
-$CLICKHOUSE_CLIENT -m --insert_keeper_fault_injection_probability=0 -q "
+$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;
diff --git a/tests/queries/0_stateless/02943_tokenbf_and_ngrambf_indexes_support_match_function.sql b/tests/queries/0_stateless/02943_tokenbf_and_ngrambf_indexes_support_match_function.sql
index 5ad54c872fa..42175cbb2c6 100644
--- a/tests/queries/0_stateless/02943_tokenbf_and_ngrambf_indexes_support_match_function.sql
+++ b/tests/queries/0_stateless/02943_tokenbf_and_ngrambf_indexes_support_match_function.sql
@@ -41,7 +41,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-  enable_analyzer = 0;
+  allow_experimental_analyzer = 0;
 
 SELECT *
 FROM
@@ -52,7 +52,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-  enable_analyzer = 1;
+  allow_experimental_analyzer = 1;
 
 SELECT *
 FROM
@@ -63,7 +63,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-  enable_analyzer = 0;
+  allow_experimental_analyzer = 0;
 
 SELECT *
 FROM
@@ -74,7 +74,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-  enable_analyzer = 1;
+  allow_experimental_analyzer = 1;
 
 
 SELECT '---';
@@ -96,7 +96,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-  enable_analyzer = 0;
+  allow_experimental_analyzer = 0;
 
 SELECT *
 FROM
@@ -107,7 +107,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-  enable_analyzer = 1;
+  allow_experimental_analyzer = 1;
 
 SELECT *
 FROM
@@ -118,7 +118,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-  enable_analyzer = 0;
+  allow_experimental_analyzer = 0;
 
 SELECT *
 FROM
@@ -129,7 +129,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-  enable_analyzer = 1;
+  allow_experimental_analyzer = 1;
 
 SELECT '---';
 
@@ -150,7 +150,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-  enable_analyzer = 0;
+  allow_experimental_analyzer = 0;
 SELECT *
 FROM
 (
@@ -160,7 +160,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-  enable_analyzer = 1;
+  allow_experimental_analyzer = 1;
 
 SELECT *
 FROM
@@ -171,7 +171,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-  enable_analyzer = 0;
+  allow_experimental_analyzer = 0;
 
 SELECT *
 FROM
@@ -182,7 +182,7 @@ FROM
 WHERE
     explain LIKE '%Granules: %'
 SETTINGS
-  enable_analyzer = 1;
+  allow_experimental_analyzer = 1;
 
 DROP TABLE tokenbf_tab;
 DROP TABLE ngrambf_tab;
diff --git a/tests/queries/0_stateless/02943_variant_read_subcolumns.sh b/tests/queries/0_stateless/02943_variant_read_subcolumns.sh
index 21ab877eaf3..5ca8dd5f36f 100755
--- a/tests/queries/0_stateless/02943_variant_read_subcolumns.sh
+++ b/tests/queries/0_stateless/02943_variant_read_subcolumns.sh
@@ -2,6 +2,8 @@
 # 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
 
@@ -32,3 +34,4 @@ 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.sh b/tests/queries/0_stateless/02943_variant_type_with_different_local_and_global_order.sh
index 4aa4b11cecb..1d88757a5d6 100755
--- 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
@@ -2,6 +2,8 @@
 # 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
 
diff --git a/tests/queries/0_stateless/02944_dynamically_change_filesystem_cache_size.reference b/tests/queries/0_stateless/02944_dynamically_change_filesystem_cache_size.reference
index c6bbcdc20c2..298cc908178 100644
--- a/tests/queries/0_stateless/02944_dynamically_change_filesystem_cache_size.reference
+++ b/tests/queries/0_stateless/02944_dynamically_change_filesystem_cache_size.reference
@@ -1,20 +1,20 @@
-100	10	10	1	10	0	0	0	0	/var/lib/clickhouse/filesystem_caches/s3_cache_02944/	0	5000	0	16
+100	10	10	10	0	0	0	0	/var/lib/clickhouse/filesystem_caches/s3_cache_02944/	0	5000	0	16
 0
 10
 98
 set max_size from 100 to 10
-10	10	10	1	10	0	0	8	1	/var/lib/clickhouse/filesystem_caches/s3_cache_02944/	0	5000	0	16
+10	10	10	10	0	0	8	1	/var/lib/clickhouse/filesystem_caches/s3_cache_02944/	0	5000	0	16
 1
 8
 set max_size from 10 to 100
-100	10	10	1	10	0	0	8	1	/var/lib/clickhouse/filesystem_caches/s3_cache_02944/	0	5000	0	16
+100	10	10	10	0	0	8	1	/var/lib/clickhouse/filesystem_caches/s3_cache_02944/	0	5000	0	16
 10
 98
 set max_elements from 10 to 2
-100	2	10	1	10	0	0	18	2	/var/lib/clickhouse/filesystem_caches/s3_cache_02944/	0	5000	0	16
+100	2	10	10	0	0	18	2	/var/lib/clickhouse/filesystem_caches/s3_cache_02944/	0	5000	0	16
 2
 18
 set max_elements from 2 to 10
-100	10	10	1	10	0	0	18	2	/var/lib/clickhouse/filesystem_caches/s3_cache_02944/	0	5000	0	16
+100	10	10	10	0	0	18	2	/var/lib/clickhouse/filesystem_caches/s3_cache_02944/	0	5000	0	16
 10
 98
diff --git a/tests/queries/0_stateless/02944_variant_as_common_type_analyzer.sql b/tests/queries/0_stateless/02944_variant_as_common_type_analyzer.sql
index 7947c8a0ce1..77bed6cf796 100644
--- a/tests/queries/0_stateless/02944_variant_as_common_type_analyzer.sql
+++ b/tests/queries/0_stateless/02944_variant_as_common_type_analyzer.sql
@@ -1,7 +1,7 @@
 -- this test is just like 02944_variant_as_common_type, but with different expected output, because
 -- analyzer changes some return types. Specifically, if(c, x, y) always casts to the common type of
 -- x and y, even if c is constant.
-set enable_analyzer=1;
+set allow_experimental_analyzer=1;
 
 set allow_experimental_variant_type=1;
 set use_variant_as_common_type=1;
@@ -76,3 +76,4 @@ 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/02947_merge_tree_index_table_3.sh b/tests/queries/0_stateless/02947_merge_tree_index_table_3.sh
index ec699d974d4..6cb184cb1fe 100755
--- a/tests/queries/0_stateless/02947_merge_tree_index_table_3.sh
+++ b/tests/queries/0_stateless/02947_merge_tree_index_table_3.sh
@@ -6,7 +6,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 user_name="${CLICKHOUSE_DATABASE}_test_user_02947"
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -n -q "
 DROP TABLE IF EXISTS t_merge_tree_index;
 DROP USER IF EXISTS $user_name;
 
@@ -44,7 +44,7 @@ $CLICKHOUSE_CLIENT --user "$user_name" --password "password" -q "SELECT arr.size
 $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 -q "
+$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/02950_dictionary_short_circuit.sql b/tests/queries/0_stateless/02950_dictionary_short_circuit.sql
index c613709a975..12c934a8d2d 100644
--- a/tests/queries/0_stateless/02950_dictionary_short_circuit.sql
+++ b/tests/queries/0_stateless/02950_dictionary_short_circuit.sql
@@ -241,12 +241,12 @@ CREATE TABLE regexp_dictionary_source_table
     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']);
+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
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
index d06aba8a4b6..3d2fe5d664d 100755
--- a/tests/queries/0_stateless/02950_dictionary_ssd_cache_short_circuit.sh
+++ b/tests/queries/0_stateless/02950_dictionary_ssd_cache_short_circuit.sh
@@ -1,11 +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="
-    CREATE TABLE source_table
+$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,
@@ -14,9 +18,9 @@ $CLICKHOUSE_CLIENT --query="
     )
     ENGINE = TinyLog;
 
-    INSERT INTO source_table VALUES (0, 'zero', 'zero', 0), (1, 'one', NULL, 1);
+    INSERT INTO 02950_database_for_ssd_cache_dictionary.source_table VALUES (0, 'zero', 'zero', 0), (1, 'one', NULL, 1);
 
-    CREATE DICTIONARY ssd_cache_dictionary
+    CREATE DICTIONARY 02950_database_for_ssd_cache_dictionary.ssd_cache_dictionary
     (
     id UInt64,
     v1 String,
@@ -26,11 +30,12 @@ $CLICKHOUSE_CLIENT --query="
     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 '$CLICKHOUSE_USER_FILES/${CLICKHOUSE_DATABASE}_ssd_dic'));
+    LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '$CLICKHOUSE_USER_FILES/0d'));
 
-    SELECT dictGetOrDefault('ssd_cache_dictionary', ('v1', 'v2'), 0, (intDiv(1, id), intDiv(1, id))) FROM source_table;
-    SELECT dictGetOrDefault('ssd_cache_dictionary', 'v2', id+1, intDiv(NULL, id)) FROM source_table;
-    SELECT dictGetOrDefault('ssd_cache_dictionary', 'v3', id+1, intDiv(NULL, id)) FROM source_table;
+    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 ssd_cache_dictionary;
-    DROP TABLE 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.sh b/tests/queries/0_stateless/02950_distributed_initial_query_event.sh
index 737d5c6b41e..7f690a681c4 100755
--- a/tests/queries/0_stateless/02950_distributed_initial_query_event.sh
+++ b/tests/queries/0_stateless/02950_distributed_initial_query_event.sh
@@ -6,7 +6,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$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 -q "
+$CLICKHOUSE_CLIENT -n -q "
 DROP TABLE IF EXISTS local;
 DROP TABLE IF EXISTS distributed;
 CREATE TABLE local (x UInt8) Engine=Memory;
diff --git a/tests/queries/0_stateless/02950_parallel_replicas_used_count.reference b/tests/queries/0_stateless/02950_parallel_replicas_used_count.reference
index c1265b7ca14..21b7b527b7a 100644
--- a/tests/queries/0_stateless/02950_parallel_replicas_used_count.reference
+++ b/tests/queries/0_stateless/02950_parallel_replicas_used_count.reference
@@ -1,4 +1,4 @@
-10000	49995000
+100	4950
 1
 89
 90
@@ -6,9 +6,3 @@
 92
 93
 1
-93
-92
-91
-90
-89
-1
diff --git a/tests/queries/0_stateless/02950_parallel_replicas_used_count.sql b/tests/queries/0_stateless/02950_parallel_replicas_used_count.sql
index 4396ca60e0e..22f55acd365 100644
--- a/tests/queries/0_stateless/02950_parallel_replicas_used_count.sql
+++ b/tests/queries/0_stateless/02950_parallel_replicas_used_count.sql
@@ -2,12 +2,11 @@ DROP TABLE IF EXISTS test;
 
 CREATE TABLE test (k UInt64, v String)
 ENGINE = MergeTree
-ORDER BY k
-SETTINGS index_granularity=1;
+ORDER BY k;
 
-INSERT INTO test SELECT number, toString(number) FROM numbers(10_000);
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
 
-SET allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 3, parallel_replicas_for_non_replicated_merge_tree=1, cluster_for_parallel_replicas='test_cluster_one_shard_three_replicas_localhost';
+SET allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 3, prefer_localhost_replica = 0, parallel_replicas_for_non_replicated_merge_tree=1, cluster_for_parallel_replicas='test_cluster_one_shard_three_replicas_localhost';
 
 -- default coordinator
 SELECT count(), sum(k)
@@ -15,18 +14,12 @@ FROM test
 SETTINGS log_comment = '02950_parallel_replicas_used_replicas_count';
 
 SYSTEM FLUSH LOGS;
-SELECT ProfileEvents['ParallelReplicasUsedCount'] > 0 FROM system.query_log WHERE type = 'QueryFinish' AND query_id IN (SELECT query_id FROM system.query_log WHERE current_database = currentDatabase() AND log_comment = '02950_parallel_replicas_used_replicas_count' AND type = 'QueryFinish' AND initial_query_id = query_id)  SETTINGS allow_experimental_parallel_reading_from_replicas=0;
+SELECT ProfileEvents['ParallelReplicasUsedCount'] FROM system.query_log WHERE type = 'QueryFinish' AND query_id IN (SELECT query_id FROM system.query_log WHERE current_database = currentDatabase() AND log_comment = '02950_parallel_replicas_used_replicas_count' AND type = 'QueryFinish' AND initial_query_id = query_id)  SETTINGS allow_experimental_parallel_reading_from_replicas=0;
 
 -- In order coordinator
-SELECT k FROM test order by k limit 5 offset 89 SETTINGS optimize_read_in_order=1, log_comment='02950_parallel_replicas_used_replicas_count_2', merge_tree_min_rows_for_concurrent_read=1, max_threads=1;
+SELECT k FROM test order by k limit 5 offset 89 SETTINGS optimize_read_in_order=1, log_comment='02950_parallel_replicas_used_replicas_count_2';
 
 SYSTEM FLUSH LOGS;
-SELECT ProfileEvents['ParallelReplicasUsedCount'] > 0 FROM system.query_log WHERE type = 'QueryFinish' AND query_id IN (SELECT query_id FROM system.query_log WHERE current_database = currentDatabase() AND log_comment = '02950_parallel_replicas_used_replicas_count_2' AND type = 'QueryFinish' AND initial_query_id = query_id)  SETTINGS allow_experimental_parallel_reading_from_replicas=0;
-
--- In reverse order coordinator
-SELECT k FROM test order by k desc limit 5 offset 9906 SETTINGS optimize_read_in_order=1, log_comment='02950_parallel_replicas_used_replicas_count_3', merge_tree_min_rows_for_concurrent_read=1, max_threads=1;
-
-SYSTEM FLUSH LOGS;
-SELECT ProfileEvents['ParallelReplicasUsedCount'] > 0 FROM system.query_log WHERE type = 'QueryFinish' AND query_id IN (SELECT query_id FROM system.query_log WHERE current_database = currentDatabase() AND log_comment = '02950_parallel_replicas_used_replicas_count_3' AND type = 'QueryFinish' AND initial_query_id = query_id)  SETTINGS allow_experimental_parallel_reading_from_replicas=0;
+SELECT ProfileEvents['ParallelReplicasUsedCount'] FROM system.query_log WHERE type = 'QueryFinish' AND query_id IN (SELECT query_id FROM system.query_log WHERE current_database = currentDatabase() AND log_comment = '02950_parallel_replicas_used_replicas_count_2' AND type = 'QueryFinish' AND initial_query_id = query_id)  SETTINGS allow_experimental_parallel_reading_from_replicas=0;
 
 DROP TABLE test;
diff --git a/tests/queries/0_stateless/02952_conjunction_optimization.sql b/tests/queries/0_stateless/02952_conjunction_optimization.sql
index fb6c26a2e1f..94bc352e4c5 100644
--- a/tests/queries/0_stateless/02952_conjunction_optimization.sql
+++ b/tests/queries/0_stateless/02952_conjunction_optimization.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS 02952_disjunction_optimization;
 
diff --git a/tests/queries/0_stateless/02954_analyzer_fuzz_i57086.sql b/tests/queries/0_stateless/02954_analyzer_fuzz_i57086.sql
index 886944e30c0..a8029fdd3d6 100644
--- a/tests/queries/0_stateless/02954_analyzer_fuzz_i57086.sql
+++ b/tests/queries/0_stateless/02954_analyzer_fuzz_i57086.sql
@@ -12,4 +12,4 @@ WITH ROLLUP
 ORDER BY
     count() ASC,
     number DESC NULLS LAST
-    SETTINGS limit = 2, enable_analyzer = 1;
+    SETTINGS limit = 2, allow_experimental_analyzer = 1;
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
index 95a79c56194..e0c6a439112 100644
--- a/tests/queries/0_stateless/02955_analyzer_using_functional_args.reference.j2
+++ b/tests/queries/0_stateless/02955_analyzer_using_functional_args.reference.j2
@@ -10,7 +10,7 @@
 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 enable_analyzer = 1;
+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
@@ -18,11 +18,11 @@ SELECT y * 2, s || 'a' FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2
 738	ba
 7386	aa
 13332	a
-SELECT (1, *) FROM t1 FULL JOIN t2 USING (y) ORDER BY ALL SETTINGS enable_analyzer = 1;
+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 enable_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;
 (1,369,'b')
 (1,3693,'a')
 (1,6666,'')
@@ -42,27 +42,27 @@ SELECT (1, t1.*, t2.*) FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2
 (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 enable_analyzer = 1;
+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 enable_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;
 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 enable_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;
 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 enable_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;
 (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 enable_analyzer = 1;
+SELECT y FROM t1 FULL JOIN t2 USING (y) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
 369
 3693
 6666
@@ -78,11 +78,11 @@ SELECT s FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2) t2 USING (y)
 
 a
 b
-SELECT y FROM t1 FULL JOIN t2 USING (y) PREWHERE y * 2 > 2 ORDER BY ALL SETTINGS enable_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 = 0;
 369
 3693
 6666
-SELECT y FROM t1 FULL JOIN t2 USING (y) PREWHERE y * 2 > 2 ORDER BY ALL SETTINGS enable_analyzer = 1, join_use_nulls = 1;
+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
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
index 1dde83149b6..f5b81231afe 100644
--- a/tests/queries/0_stateless/02955_analyzer_using_functional_args.sql.j2
+++ b/tests/queries/0_stateless/02955_analyzer_using_functional_args.sql.j2
@@ -24,21 +24,21 @@ 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 enable_analyzer = 1;
-SELECT * FROM t2 INNER JOIN t1 USING (y, z) SETTINGS enable_analyzer = 1;
+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 enable_analyzer = 1;
-SELECT * FROM t3 INNER JOIN t1 USING (y, z) SETTINGS enable_analyzer = 1;
+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 enable_analyzer = 1;
+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 enable_analyzer = 1;
-SELECT (1, *) FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2) t2 USING (y) ORDER BY ALL SETTINGS enable_analyzer = 1;
+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;
@@ -46,19 +46,19 @@ SELECT (1, t1.*) FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2) t2 U
 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 enable_analyzer = 1;
-SELECT * FROM t1 FULL JOIN t2 USING (y) FULL JOIN t3 USING (y) ORDER BY 1,2,3 SETTINGS enable_analyzer = 1;
-SELECT t1.*, t2.*, t3.* FROM t1 FULL JOIN t2 USING (y) FULL JOIN t3 USING (y) ORDER BY 1,2,3 SETTINGS enable_analyzer = 1;
-SELECT (1, t1.*, t2.*, t3.*) FROM t1 FULL JOIN t2 USING (y) FULL JOIN t3 USING (y) ORDER BY 1 SETTINGS enable_analyzer = 1;
+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 enable_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 enable_analyzer = 1, join_use_nulls = 0;
-SELECT y FROM t1 FULL JOIN t2 USING (y) PREWHERE y * 2 > 2 ORDER BY ALL SETTINGS enable_analyzer = 1, join_use_nulls = 1;
+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;
diff --git a/tests/queries/0_stateless/02955_sparkBar_alias_sparkbar.sql b/tests/queries/0_stateless/02955_sparkBar_alias_sparkbar.sql
index 0f658379ff9..98259fc8029 100644
--- a/tests/queries/0_stateless/02955_sparkBar_alias_sparkbar.sql
+++ b/tests/queries/0_stateless/02955_sparkBar_alias_sparkbar.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 DROP TABLE IF EXISTS spark_bar_test;
 
 CREATE TABLE spark_bar_test (`value` Int64, `event_date` Date) ENGINE = MergeTree ORDER BY event_date;
@@ -9,3 +9,4 @@ SELECT sparkbar(9)(event_date,cnt) FROM (SELECT sum(value) as cnt, event_date FR
 SELECT sparkBar(9)(event_date,cnt) FROM (SELECT sum(value) as cnt, event_date FROM spark_bar_test GROUP BY event_date);
 
 DROP TABLE IF EXISTS spark_bar_test;
+
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 4f49adb26d5..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,7 +5,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_LOCAL "
+$CLICKHOUSE_LOCAL --multiquery "
     CREATE TABLE test (x UInt8) ENGINE = MergeTree ORDER BY ();
     INSERT INTO test SELECT 1;
 
diff --git a/tests/queries/0_stateless/02962_join_using_bug_57894.sql b/tests/queries/0_stateless/02962_join_using_bug_57894.sql
index 96190241da5..87aef8b1a71 100644
--- a/tests/queries/0_stateless/02962_join_using_bug_57894.sql
+++ b/tests/queries/0_stateless/02962_join_using_bug_57894.sql
@@ -9,7 +9,7 @@ CREATE TABLE r (`x` LowCardinality(Nullable(UInt32)), `s` Nullable(String)) ENGI
 INSERT INTO r SELECT number, toString(number) FROM numbers(2, 8);
 INSERT INTO r VALUES (NULL, NULL);
 
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 
 SELECT x FROM t FULL JOIN r USING (x) ORDER BY ALL
 ;
@@ -21,7 +21,7 @@ SETTINGS join_algorithm = 'partial_merge';
 SELECT x FROM t FULL JOIN r USING (x) ORDER BY ALL
 SETTINGS join_algorithm = 'full_sorting_merge';
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT x FROM t FULL JOIN r USING (x) ORDER BY ALL
 ;
diff --git a/tests/queries/0_stateless/02963_test_flexible_disk_configuration.sql b/tests/queries/0_stateless/02963_test_flexible_disk_configuration.sql
index 6b285d423e7..7ebef866360 100644
--- a/tests/queries/0_stateless/02963_test_flexible_disk_configuration.sql
+++ b/tests/queries/0_stateless/02963_test_flexible_disk_configuration.sql
@@ -2,33 +2,13 @@
 
 drop table if exists test;
 create table test (a Int32) engine = MergeTree() order by tuple()
-settings disk=disk(name='02963_custom_disk', type = object_storage, object_storage_type = local_blob_storage, path='./02963_test1/');
+settings disk=disk(name='test1', type = object_storage, object_storage_type = local_blob_storage, path='./02963_test1/');
 
-drop table if exists test;
-create table test (a Int32) engine = MergeTree() order by tuple()
-settings disk=disk(name='02963_custom_disk', type = object_storage, object_storage_type = local_blob_storage, path='./02963_test2/'); -- { serverError BAD_ARGUMENTS }
-
-drop table if exists test;
-create table test (a Int32) engine = MergeTree() order by tuple()
-settings disk=disk(name='02963_custom_disk'); -- { serverError BAD_ARGUMENTS }
-
-drop table if exists test;
-create table test (a Int32) engine = MergeTree() order by tuple()
-settings disk='02963_custom_disk'; -- { serverError BAD_ARGUMENTS }
-
-drop table if exists test;
-create table test (a Int32) engine = MergeTree() order by tuple()
-settings disk=disk(name='s3_disk_02963'); -- { serverError BAD_ARGUMENTS }
-
-drop table if exists test;
+drop table test;
 create table test (a Int32) engine = MergeTree() order by tuple()
 settings disk='s3_disk_02963';
 
-drop table if exists test;
-create table test (a Int32) engine = MergeTree() order by tuple()
-settings disk=disk(name='s3_disk_02963', type = object_storage, object_storage_type = local_blob_storage, path='./02963_test2/'); -- { serverError BAD_ARGUMENTS }
-
-drop table if exists test;
+drop table test;
 create table test (a Int32) engine = MergeTree() order by tuple()
 settings disk=disk(name='test1',
                    type = object_storage,
@@ -37,7 +17,7 @@ settings disk=disk(name='test1',
                    access_key_id = clickhouse,
                    secret_access_key = clickhouse);
 
-drop table if exists test;
+drop table test;
 create table test (a Int32) engine = MergeTree() order by tuple()
 settings disk=disk(name='test2',
                    type = object_storage,
@@ -47,7 +27,7 @@ settings disk=disk(name='test2',
                    access_key_id = clickhouse,
                    secret_access_key = clickhouse);
 
-drop table if exists test;
+drop table test;
 create table test (a Int32) engine = MergeTree() order by tuple()
 settings disk=disk(name='test3',
                    type = object_storage,
@@ -57,8 +37,8 @@ settings disk=disk(name='test3',
                    endpoint = 'http://localhost:11111/test/common/',
                    access_key_id = clickhouse,
                    secret_access_key = clickhouse);
+drop table test;
 
-drop table if exists test;
 create table test (a Int32) engine = MergeTree() order by tuple()
 settings disk=disk(name='test4',
                    type = object_storage,
@@ -68,8 +48,8 @@ settings disk=disk(name='test4',
                    endpoint = 'http://localhost:11111/test/common/',
                    access_key_id = clickhouse,
                    secret_access_key = clickhouse);
+drop table test;
 
-drop table if exists test;
 create table test (a Int32) engine = MergeTree() order by tuple()
 settings disk=disk(name='test5',
                    type = object_storage,
diff --git a/tests/queries/0_stateless/02967_analyzer_fuzz.sql b/tests/queries/0_stateless/02967_analyzer_fuzz.sql
index dab6ec2af22..7f2d9afcc71 100644
--- a/tests/queries/0_stateless/02967_analyzer_fuzz.sql
+++ b/tests/queries/0_stateless/02967_analyzer_fuzz.sql
@@ -7,7 +7,7 @@ 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 enable_analyzer = 1;
+    SETTINGS allow_experimental_analyzer = 1;
 
 
 CREATE TABLE data_01223 (`key` Int) ENGINE = Memory;
@@ -17,4 +17,4 @@ SELECT count(round('92233720368547758.07', '-0.01', NULL, nan, '25.7', '-9223372
 FROM dist_01223
 WHERE round(NULL, 1025, 1.1754943508222875e-38, NULL)
 WITH TOTALS
-    SETTINGS enable_analyzer = 1;
+    SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/02967_parallel_replicas_join_algo_and_analyzer_3.reference b/tests/queries/0_stateless/02967_parallel_replicas_join_algo_and_analyzer_3.reference
index 87e78d7d116..c0485b817c4 100644
--- a/tests/queries/0_stateless/02967_parallel_replicas_join_algo_and_analyzer_3.reference
+++ b/tests/queries/0_stateless/02967_parallel_replicas_join_algo_and_analyzer_3.reference
@@ -11,8 +11,10 @@ nested join with analyzer and parallel replicas, both global
 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
@@ -27,8 +29,10 @@ nested join with analyzer and parallel replicas, global + local
 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
@@ -43,8 +47,10 @@ nested join with analyzer and parallel replicas, both local, both full sorting m
 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
@@ -59,8 +65,10 @@ nested join with analyzer and parallel replicas, both local, both full sorting a
 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
@@ -75,6 +83,8 @@ nested join with analyzer and parallel replicas, both local, both full sorting a
 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_3.sh b/tests/queries/0_stateless/02967_parallel_replicas_join_algo_and_analyzer_3.sh
index a595e363ef4..e49a340ab67 100755
--- a/tests/queries/0_stateless/02967_parallel_replicas_join_algo_and_analyzer_3.sh
+++ b/tests/queries/0_stateless/02967_parallel_replicas_join_algo_and_analyzer_3.sh
@@ -17,8 +17,6 @@ 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);
 "
 
-PARALLEL_REPLICAS_SETTINGS="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_local_plan=1"
-
 ##############
 echo
 echo "nested join with analyzer and parallel replicas, both global"
@@ -28,14 +26,18 @@ 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 enable_analyzer=1, $PARALLEL_REPLICAS_SETTINGS, parallel_replicas_prefer_local_join=0"
+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 --max_rows_in_set_to_optimize_join 0 -q "
+$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 enable_analyzer=1, $PARALLEL_REPLICAS_SETTINGS, send_logs_level='trace', parallel_replicas_prefer_local_join=0" 2>&1 |
+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'
@@ -49,14 +51,18 @@ 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 enable_analyzer=1, $PARALLEL_REPLICAS_SETTINGS, parallel_replicas_prefer_local_join=0"
+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 --max_rows_in_set_to_optimize_join 0 -q "
+$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 enable_analyzer=1, $PARALLEL_REPLICAS_SETTINGS, send_logs_level='trace', parallel_replicas_prefer_local_join=0" 2>&1 |
+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'
@@ -71,14 +77,18 @@ 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 enable_analyzer=1, $PARALLEL_REPLICAS_SETTINGS, parallel_replicas_prefer_local_join=0, join_algorithm='full_sorting_merge'"
+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 --max_rows_in_set_to_optimize_join 0 -q "
+$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 enable_analyzer=1, $PARALLEL_REPLICAS_SETTINGS, parallel_replicas_prefer_local_join=0, send_logs_level='trace', join_algorithm='full_sorting_merge'" 2>&1 |
+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'
@@ -92,14 +102,18 @@ 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 enable_analyzer=1, $PARALLEL_REPLICAS_SETTINGS, parallel_replicas_prefer_local_join=0, join_algorithm='full_sorting_merge'"
+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 --max_rows_in_set_to_optimize_join 0 -q "
+$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 enable_analyzer=1, $PARALLEL_REPLICAS_SETTINGS, parallel_replicas_prefer_local_join=0, send_logs_level='trace', join_algorithm='full_sorting_merge'" 2>&1 |
+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'
@@ -113,14 +127,18 @@ 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 enable_analyzer=1, $PARALLEL_REPLICAS_SETTINGS, parallel_replicas_prefer_local_join=0, join_algorithm='hash'"
+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 --max_rows_in_set_to_optimize_join 0 -q "
+$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 enable_analyzer=1, $PARALLEL_REPLICAS_SETTINGS, parallel_replicas_prefer_local_join=0, send_logs_level='trace', join_algorithm='hash'" 2>&1 |
+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
index ba67acd7d0b..100e4e500cd 100644
--- a/tests/queries/0_stateless/02967_parallel_replicas_joins_and_analyzer.reference
+++ b/tests/queries/0_stateless/02967_parallel_replicas_joins_and_analyzer.reference
@@ -2,7 +2,7 @@
 
 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', enable_analyzer=1;
+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
@@ -18,21 +18,9 @@ select x, y, r.y, z, rr.z, a from (select l.x, l.y, r.y, r.z as z from (select x
 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', enable_analyzer=1;
-Union
-  Expression
-    Join
-      Expression
-        Join
-          Expression
-            Expression
-              ReadFromMergeTree
-          Expression
-            ReadFromMemoryStorage
-      Expression
-        ReadFromMemoryStorage
-  Expression
-    ReadFromRemoteParallelReplicas
+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),
@@ -41,7 +29,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
@@ -64,25 +52,11 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
-    Union
-      Expression
-        Sorting
-          Expression
-            Join
-              Expression
-                Join
-                  Expression
-                    Expression
-                      ReadFromMergeTree
-                  Expression
-                    ReadFromMemoryStorage
-              Expression
-                ReadFromMemoryStorage
-      Expression
-        ReadFromRemoteParallelReplicas
+    Expression
+      ReadFromRemoteParallelReplicas
 --
 -- GROUP BY should work up to WithMergableStage
 with sub1 as (select x, y from tab1 where x != 2),
@@ -91,7 +65,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
@@ -101,27 +75,13 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
-        Union
-          Expression
-            Aggregating
-              Expression
-                Join
-                  Expression
-                    Join
-                      Expression
-                        Expression
-                          ReadFromMergeTree
-                      Expression
-                        ReadFromMemoryStorage
-                  Expression
-                    ReadFromMemoryStorage
-          Expression
-            ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
 --
 -- ORDER BY in sub3 : sub1 is fully pushed, sub3 -> WithMergableStage
 with sub1 as (select x, y from tab1 where x != 2),
@@ -130,7 +90,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
@@ -153,27 +113,15 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
-        Union
-          Expression
-            Join
-              Expression
-                Expression
-                  ReadFromMergeTree
-              Expression
-                ReadFromMemoryStorage
-          Expression
-            ReadFromRemoteParallelReplicas
-        Union
-          Expression
-            Expression
-              ReadFromMergeTree
-          Expression
-            ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
 --
 -- ORDER BY in sub1 : sub1 -> WithMergableStage
 with sub1 as (select x, y from tab1 where x != 2 order by y),
@@ -182,7 +130,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
@@ -205,31 +153,19 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
-            Union
-              Expression
-                Expression
-                  ReadFromMergeTree
-              Expression
-                ReadFromRemoteParallelReplicas
-            Union
-              Expression
-                Expression
-                  ReadFromMergeTree
-              Expression
-                ReadFromRemoteParallelReplicas
-        Union
-          Expression
             Expression
-              ReadFromMergeTree
-          Expression
-            ReadFromRemoteParallelReplicas
+              ReadFromRemoteParallelReplicas
+            Expression
+              ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
 --
 -- RIGHT JOIN in sub3: sub3 -> WithMergableStage
 with sub1 as (select x, y from tab1 where x != 2),
@@ -238,7 +174,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub2 r any right join sub1 l on l.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', enable_analyzer=1;
+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
@@ -261,29 +197,17 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub2 r any right join sub1 l on l.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', enable_analyzer=1;
+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
-        Union
-          Expression
-            Expression
-              ReadFromMergeTree
-          Expression
-            ReadFromRemoteParallelReplicas
-        Union
-          Expression
-            Expression
-              ReadFromMergeTree
-          Expression
-            ReadFromRemoteParallelReplicas
-    Union
-      Expression
         Expression
-          ReadFromMergeTree
-      Expression
-        ReadFromRemoteParallelReplicas
+          ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
+    Expression
+      ReadFromRemoteParallelReplicas
 --
 -- RIGHT JOIN in sub5: sub5 -> WithMergableStage
 with sub1 as (select x, y from tab1 where x != 2),
@@ -291,7 +215,7 @@ 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', enable_analyzer=1;
+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
@@ -313,31 +237,19 @@ 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', enable_analyzer=1;
+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
-        Union
-          Expression
-            Expression
-              ReadFromMergeTree
-          Expression
-            ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
         Expression
           Join
-            Union
-              Expression
-                Expression
-                  ReadFromMergeTree
-              Expression
-                ReadFromRemoteParallelReplicas
-            Union
-              Expression
-                Expression
-                  ReadFromMergeTree
-              Expression
-                ReadFromRemoteParallelReplicas
+            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)),
@@ -346,7 +258,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
@@ -369,31 +281,11 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
-    Union
-      Expression
-        Sorting
-          Expression
-            Join
-              Expression
-                Join
-                  Expression
-                    CreatingSets
-                      Expression
-                        Expression
-                          ReadFromMergeTree
-                      CreatingSet
-                        Expression
-                          Filter
-                            ReadFromSystemNumbers
-                  Expression
-                    ReadFromMemoryStorage
-              Expression
-                ReadFromMemoryStorage
-      Expression
-        ReadFromRemoteParallelReplicas
+    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)),
@@ -402,7 +294,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1, parallel_replicas_allow_in_with_subquery=0;
+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
@@ -425,7 +317,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1, parallel_replicas_allow_in_with_subquery=0;-- { echoOn }
+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
@@ -441,21 +333,13 @@ Expression
                   Expression
                     Filter
                       ReadFromSystemNumbers
-            Union
-              Expression
-                Expression
-                  ReadFromMergeTree
-              Expression
-                ReadFromRemoteParallelReplicas
-        Union
-          Expression
             Expression
-              ReadFromMergeTree
-          Expression
-            ReadFromRemoteParallelReplicas
+              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', enable_analyzer=1;
+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
@@ -471,23 +355,9 @@ select x, y, r.y, z, rr.z, a from (select l.x, l.y, r.y, r.z as z from (select x
 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', enable_analyzer=1;
-Union
-  Expression
-    Join
-      Expression
-        Join
-          Expression
-            Expression
-              ReadFromMergeTree
-          Expression
-            Expression
-              ReadFromMergeTree
-      Expression
-        Expression
-          ReadFromMergeTree
-  Expression
-    ReadFromRemoteParallelReplicas
+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),
@@ -496,7 +366,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
@@ -519,27 +389,11 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
-    Union
-      Expression
-        Sorting
-          Expression
-            Join
-              Expression
-                Join
-                  Expression
-                    Expression
-                      ReadFromMergeTree
-                  Expression
-                    Expression
-                      ReadFromMergeTree
-              Expression
-                Expression
-                  ReadFromMergeTree
-      Expression
-        ReadFromRemoteParallelReplicas
+    Expression
+      ReadFromRemoteParallelReplicas
 --
 -- GROUP BY should work up to WithMergableStage
 with sub1 as (select x, y from tab1 where x != 2),
@@ -548,7 +402,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
@@ -558,29 +412,13 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
-        Union
-          Expression
-            Aggregating
-              Expression
-                Join
-                  Expression
-                    Join
-                      Expression
-                        Expression
-                          ReadFromMergeTree
-                      Expression
-                        Expression
-                          ReadFromMergeTree
-                  Expression
-                    Expression
-                      ReadFromMergeTree
-          Expression
-            ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
 --
 -- ORDER BY in sub3 : sub1 is fully pushed, sub3 -> WithMergableStage
 with sub1 as (select x, y from tab1 where x != 2),
@@ -589,7 +427,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
@@ -612,28 +450,15 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
-        Union
-          Expression
-            Join
-              Expression
-                Expression
-                  ReadFromMergeTree
-              Expression
-                Expression
-                  ReadFromMergeTree
-          Expression
-            ReadFromRemoteParallelReplicas
-        Union
-          Expression
-            Expression
-              ReadFromMergeTree
-          Expression
-            ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
 --
 -- ORDER BY in sub1 : sub1 -> WithMergableStage
 with sub1 as (select x, y from tab1 where x != 2 order by y),
@@ -642,7 +467,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
@@ -665,31 +490,19 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
-            Union
-              Expression
-                Expression
-                  ReadFromMergeTree
-              Expression
-                ReadFromRemoteParallelReplicas
-            Union
-              Expression
-                Expression
-                  ReadFromMergeTree
-              Expression
-                ReadFromRemoteParallelReplicas
-        Union
-          Expression
             Expression
-              ReadFromMergeTree
-          Expression
-            ReadFromRemoteParallelReplicas
+              ReadFromRemoteParallelReplicas
+            Expression
+              ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
 --
 -- RIGHT JOIN in sub3: sub3 -> WithMergableStage
 with sub1 as (select x, y from tab1 where x != 2),
@@ -698,7 +511,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub2 r any right join sub1 l on l.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', enable_analyzer=1;
+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
@@ -721,29 +534,17 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub2 r any right join sub1 l on l.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', enable_analyzer=1;
+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
-        Union
-          Expression
-            Expression
-              ReadFromMergeTree
-          Expression
-            ReadFromRemoteParallelReplicas
-        Union
-          Expression
-            Expression
-              ReadFromMergeTree
-          Expression
-            ReadFromRemoteParallelReplicas
-    Union
-      Expression
         Expression
-          ReadFromMergeTree
-      Expression
-        ReadFromRemoteParallelReplicas
+          ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
+    Expression
+      ReadFromRemoteParallelReplicas
 --
 -- RIGHT JOIN in sub5: sub5 -> WithMergableStage
 with sub1 as (select x, y from tab1 where x != 2),
@@ -751,7 +552,7 @@ 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', enable_analyzer=1;
+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
@@ -773,31 +574,19 @@ 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', enable_analyzer=1;
+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
-        Union
-          Expression
-            Expression
-              ReadFromMergeTree
-          Expression
-            ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
         Expression
           Join
-            Union
-              Expression
-                Expression
-                  ReadFromMergeTree
-              Expression
-                ReadFromRemoteParallelReplicas
-            Union
-              Expression
-                Expression
-                  ReadFromMergeTree
-              Expression
-                ReadFromRemoteParallelReplicas
+            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)),
@@ -806,7 +595,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
@@ -829,33 +618,11 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
-    Union
-      Expression
-        Sorting
-          Expression
-            Join
-              Expression
-                Join
-                  Expression
-                    CreatingSets
-                      Expression
-                        Expression
-                          ReadFromMergeTree
-                      CreatingSet
-                        Expression
-                          Filter
-                            ReadFromSystemNumbers
-                  Expression
-                    Expression
-                      ReadFromMergeTree
-              Expression
-                Expression
-                  ReadFromMergeTree
-      Expression
-        ReadFromRemoteParallelReplicas
+    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)),
@@ -864,7 +631,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1, parallel_replicas_allow_in_with_subquery=0;
+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
@@ -887,7 +654,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1, parallel_replicas_allow_in_with_subquery=0;
+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
@@ -903,15 +670,7 @@ Expression
                   Expression
                     Filter
                       ReadFromSystemNumbers
-            Union
-              Expression
-                Expression
-                  ReadFromMergeTree
-              Expression
-                ReadFromRemoteParallelReplicas
-        Union
-          Expression
             Expression
-              ReadFromMergeTree
-          Expression
-            ReadFromRemoteParallelReplicas
+              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
index 6f90f07c7a5..54505b147a3 100644
--- 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
@@ -10,8 +10,6 @@ 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);
 
-set parallel_replicas_local_plan=1;
-
 {% for use_global_in in [0, 1] -%}
 
 -- { echoOn }
@@ -19,8 +17,8 @@ set parallel_replicas_local_plan=1;
 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', enable_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', enable_analyzer=1;
+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),
@@ -29,7 +27,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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),
@@ -38,7 +36,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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),
@@ -47,7 +45,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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),
@@ -56,7 +54,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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),
@@ -65,7 +63,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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),
@@ -74,7 +72,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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),
@@ -83,7 +81,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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),
@@ -92,7 +90,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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),
@@ -101,7 +99,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub2 r any right join sub1 l on l.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', enable_analyzer=1;
+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),
@@ -110,7 +108,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub2 r any right join sub1 l on l.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', enable_analyzer=1;
+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),
@@ -118,7 +116,7 @@ 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', enable_analyzer=1;
+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),
@@ -126,7 +124,7 @@ 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', enable_analyzer=1;
+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
@@ -136,7 +134,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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)),
@@ -145,7 +143,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1;
+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
@@ -155,7 +153,7 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1, parallel_replicas_allow_in_with_subquery=0;
+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)),
@@ -164,6 +162,6 @@ sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.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', enable_analyzer=1, parallel_replicas_allow_in_with_subquery=0;
+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_file_log_multiple_read.sh b/tests/queries/0_stateless/02968_file_log_multiple_read.sh
index 0879bf02d60..d9bae05270a 100755
--- a/tests/queries/0_stateless/02968_file_log_multiple_read.sh
+++ b/tests/queries/0_stateless/02968_file_log_multiple_read.sh
@@ -15,7 +15,7 @@ do
 	echo $i >> ${logs_dir}/a.txt
 done
 
-${CLICKHOUSE_CLIENT} --query="
+${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;
@@ -69,7 +69,7 @@ done
 
 ${CLICKHOUSE_CLIENT} --query "SELECT * FROM table_to_store_data ORDER BY id;"
 
-${CLICKHOUSE_CLIENT} --query="
+${CLICKHOUSE_CLIENT} -n --query="
 DROP TABLE file_log;
 DROP TABLE table_to_store_data;
 DROP TABLE file_log_mv;
diff --git a/tests/queries/0_stateless/02968_full_sorting_join_fuzz.reference b/tests/queries/0_stateless/02968_full_sorting_join_fuzz.reference
deleted file mode 100644
index 0e9f5cc1db1..00000000000
--- a/tests/queries/0_stateless/02968_full_sorting_join_fuzz.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-[NULL]	[]	100	0
-
-[NULL]	[]	100	0
diff --git a/tests/queries/0_stateless/02968_full_sorting_join_fuzz.sql b/tests/queries/0_stateless/02968_full_sorting_join_fuzz.sql
deleted file mode 100644
index 85ca740cef2..00000000000
--- a/tests/queries/0_stateless/02968_full_sorting_join_fuzz.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-SET max_bytes_in_join = 0, join_algorithm = 'full_sorting_merge', max_block_size = 10240;
-
-DROP TABLE IF EXISTS t1;
-DROP TABLE IF EXISTS t2;
-
-CREATE TABLE t1 (`key` UInt32, `s` String) ENGINE = MergeTree ORDER BY key;
-CREATE TABLE t2 (`key` UInt32, `s` String) ENGINE = MergeTree ORDER BY key;
-
-INSERT INTO t1 SELECT (sipHash64(number, 'x') % 10000000) + 1 AS key, concat('val', toString(number)) AS s FROM numbers_mt(10000000);
-INSERT INTO t2 SELECT (sipHash64(number, 'y') % 1000000) + 1 AS key, concat('val', toString(number)) AS s FROM numbers_mt(1000000);
-
-SELECT materialize([NULL]), [], 100, count(materialize(NULL)) FROM t1 ALL INNER JOIN t2 ON t1.key = t2.key PREWHERE 10 WHERE t2.key != 0 WITH TOTALS;
-
-DROP TABLE t1;
-DROP TABLE t2;
diff --git a/tests/queries/0_stateless/02968_projection_merge.reference b/tests/queries/0_stateless/02968_projection_merge.reference
deleted file mode 100644
index 40cb572c95a..00000000000
--- a/tests/queries/0_stateless/02968_projection_merge.reference
+++ /dev/null
@@ -1,28 +0,0 @@
-ReplacingMergeTree
-0	2
-1	2
-2	2
-0	2
-1	2
-2	2
-CollapsingMergeTree
-0	2
-1	2
-2	2
-0	2
-1	2
-2	2
-VersionedCollapsingMergeTree
-0	2
-1	2
-2	2
-0	2
-1	2
-2	2
-DEDUPLICATE ON MergeTree
-0	1
-1	1
-2	1
-0	1
-1	1
-2	1
diff --git a/tests/queries/0_stateless/02968_projection_merge.sql b/tests/queries/0_stateless/02968_projection_merge.sql
deleted file mode 100644
index 3e047d2cf69..00000000000
--- a/tests/queries/0_stateless/02968_projection_merge.sql
+++ /dev/null
@@ -1,116 +0,0 @@
-SELECT 'ReplacingMergeTree';
-DROP TABLE IF EXISTS tp;
-CREATE TABLE tp
-(
-    `type` Int32,
-    `eventcnt` UInt64,
-    PROJECTION p
-    (
-        SELECT type,sum(eventcnt)
-        GROUP BY type
-    )
-)
-ENGINE = ReplacingMergeTree
-ORDER BY type
-SETTINGS deduplicate_merge_projection_mode = 'rebuild';
-
-INSERT INTO tp SELECT number%3, 1 FROM numbers(3);
-INSERT INTO tp SELECT number%3, 2 FROM numbers(3);
-
-OPTIMIZE TABLE tp FINAL;
-
-SELECT type,sum(eventcnt) FROM tp GROUP BY type ORDER BY type
-SETTINGS optimize_use_projections = 0, force_optimize_projection = 0;
-
-SELECT type,sum(eventcnt) FROM tp GROUP BY type ORDER BY type
-SETTINGS optimize_use_projections = 1, force_optimize_projection = 1;
-
-
-SELECT 'CollapsingMergeTree';
-DROP TABLE IF EXISTS tp;
-CREATE TABLE tp
-(
-    `type` Int32,
-    `eventcnt` UInt64,
-    `sign` Int8,
-    PROJECTION p
-    (
-        SELECT type,sum(eventcnt)
-        GROUP BY type
-    )
-)
-ENGINE = CollapsingMergeTree(sign)
-ORDER BY type
-SETTINGS deduplicate_merge_projection_mode = 'rebuild';
-
-INSERT INTO tp SELECT number % 3, 1, 1 FROM numbers(3);
-INSERT INTO tp SELECT number % 3, 1, -1 FROM numbers(3);
-INSERT INTO tp SELECT number % 3, 2, 1 FROM numbers(3);
-
-OPTIMIZE TABLE tp FINAL;
-
-SELECT type,sum(eventcnt) FROM tp GROUP BY type ORDER BY type
-SETTINGS optimize_use_projections = 0, force_optimize_projection = 0;
-
-SELECT type,sum(eventcnt) FROM tp GROUP BY type ORDER BY type
-SETTINGS optimize_use_projections = 1, force_optimize_projection = 1;
-
--- Actually we don't need to test all 3 engines Replacing/Collapsing/VersionedCollapsing,
--- Because they share the same logic of 'reduce number of rows during merges'
-SELECT 'VersionedCollapsingMergeTree';
-DROP TABLE IF EXISTS tp;
-CREATE TABLE tp
-(
-    `type` Int32,
-    `eventcnt` UInt64,
-    `sign` Int8,
-    `version` UInt8,
-    PROJECTION p
-    (
-        SELECT type,sum(eventcnt)
-        GROUP BY type
-    )
-)
-ENGINE = VersionedCollapsingMergeTree(sign,version)
-ORDER BY type
-SETTINGS deduplicate_merge_projection_mode = 'rebuild';
-
-INSERT INTO tp SELECT number % 3, 1, -1, 0 FROM numbers(3);
-INSERT INTO tp SELECT number % 3, 2, 1, 1 FROM numbers(3);
-INSERT INTO tp SELECT number % 3, 1, 1, 0 FROM numbers(3);
-
-OPTIMIZE TABLE tp FINAL;
-
-SELECT type,sum(eventcnt) FROM tp GROUP BY type ORDER BY type
-SETTINGS optimize_use_projections = 0, force_optimize_projection = 0;
-
-SELECT type,sum(eventcnt) FROM tp GROUP BY type ORDER BY type
-SETTINGS optimize_use_projections = 1, force_optimize_projection = 1;
-
-SELECT 'DEDUPLICATE ON MergeTree';
-DROP TABLE IF EXISTS tp;
-CREATE TABLE tp
-(
-    `type` Int32,
-    `eventcnt` UInt64,
-    PROJECTION p
-    (
-        SELECT type,sum(eventcnt)
-        GROUP BY type
-    )
-)
-ENGINE = MergeTree
-ORDER BY type
-SETTINGS deduplicate_merge_projection_mode = 'rebuild';
-
-INSERT INTO tp SELECT number % 3, 1 FROM numbers(3);
-INSERT INTO tp SELECT number % 3, 2 FROM numbers(3);
-
-OPTIMIZE TABLE tp FINAL DEDUPLICATE BY type;
-
-SELECT type,sum(eventcnt) FROM tp GROUP BY type ORDER BY type
-SETTINGS optimize_use_projections = 0, force_optimize_projection = 0;
-
-SELECT type,sum(eventcnt) FROM tp GROUP BY type ORDER BY type
-SETTINGS optimize_use_projections = 1, force_optimize_projection = 1;
-
diff --git a/tests/queries/0_stateless/02969_analyzer_eliminate_injective_functions.sql b/tests/queries/0_stateless/02969_analyzer_eliminate_injective_functions.sql
index a7d0c7793db..15f2550a63e 100644
--- a/tests/queries/0_stateless/02969_analyzer_eliminate_injective_functions.sql
+++ b/tests/queries/0_stateless/02969_analyzer_eliminate_injective_functions.sql
@@ -1,4 +1,4 @@
-set enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 
 EXPLAIN QUERY TREE
 SELECT toString(toString(number + 1)) as val, count()
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
index 859d26af1a1..361fd7c7a4e 100644
--- a/tests/queries/0_stateless/02969_functions_to_subcolumns_if_null.sql
+++ b/tests/queries/0_stateless/02969_functions_to_subcolumns_if_null.sql
@@ -7,21 +7,21 @@ INSERT INTO t_subcolumns_if SELECT number::Nullable(Int64) as number FROM number
 SELECT
     sum(multiIf(id IS NOT NULL, 1, 0))
 FROM t_subcolumns_if
-SETTINGS enable_analyzer = 1, optimize_functions_to_subcolumns = 1;
+SETTINGS allow_experimental_analyzer = 1, optimize_functions_to_subcolumns = 1;
 
 SELECT
     sum(multiIf(id IS NULL, 1, 0))
 FROM t_subcolumns_if
-SETTINGS enable_analyzer = 0, optimize_functions_to_subcolumns = 1;
+SETTINGS allow_experimental_analyzer = 0, optimize_functions_to_subcolumns = 1;
 
 SELECT
     sum(multiIf(id IS NULL, 1, 0))
 FROM t_subcolumns_if
-SETTINGS enable_analyzer = 1, optimize_functions_to_subcolumns = 0;
+SETTINGS allow_experimental_analyzer = 1, optimize_functions_to_subcolumns = 0;
 
 SELECT
     sum(multiIf(id IS NULL, 1, 0))
 FROM t_subcolumns_if
-SETTINGS enable_analyzer = 1, optimize_functions_to_subcolumns = 1;
+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
index 3e63763d544..5555c918500 100644
--- a/tests/queries/0_stateless/02969_mysql_cast_type_aliases.reference
+++ b/tests/queries/0_stateless/02969_mysql_cast_type_aliases.reference
@@ -7,7 +7,7 @@ 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"}	JSON
+JSON	{"foo":"bar"}	Object(\'json\')
 Real	49.22	Float32
 Signed	50	Int64
 Unsigned	52	UInt64
@@ -21,7 +21,7 @@ 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"}	JSON
+JSON	{"foo":"bar"}	Object(\'json\')
 Real	49.22	Float32
 Signed	50	Int64
 Unsigned	52	UInt64
diff --git a/tests/queries/0_stateless/02969_mysql_cast_type_aliases.sql b/tests/queries/0_stateless/02969_mysql_cast_type_aliases.sql
index 8cccde4b0ab..7b5735cdebc 100644
--- a/tests/queries/0_stateless/02969_mysql_cast_type_aliases.sql
+++ b/tests/queries/0_stateless/02969_mysql_cast_type_aliases.sql
@@ -1,7 +1,7 @@
 -- 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_json_type = 1;
+SET allow_experimental_object_type = 1;
 
 SELECT '-- Uppercase tests';
 -- Not supported as it is translated to FixedString without arguments
diff --git a/tests/queries/0_stateless/02971_analyzer_remote_id.sh b/tests/queries/0_stateless/02971_analyzer_remote_id.sh
index 6d504ce3568..ab3c5292529 100755
--- a/tests/queries/0_stateless/02971_analyzer_remote_id.sh
+++ b/tests/queries/0_stateless/02971_analyzer_remote_id.sh
@@ -5,5 +5,5 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 ${CLICKHOUSE_CLIENT} --query="CREATE TABLE ${CLICKHOUSE_DATABASE}.x ENGINE = MergeTree() ORDER BY number AS SELECT * FROM numbers(2)"
-${CLICKHOUSE_LOCAL} --query="SELECT count() FROM remote('127.0.0.{2,3}', '${CLICKHOUSE_DATABASE}.x') SETTINGS enable_analyzer = 1" 2>&1 \
+${CLICKHOUSE_LOCAL} --query="SELECT count() FROM remote('127.0.0.{2,3}', '${CLICKHOUSE_DATABASE}.x') SETTINGS allow_experimental_analyzer = 1" 2>&1 \
         | grep -av "ASan doesn't fully support makecontext/swapcontext functions"
diff --git a/tests/queries/0_stateless/02971_functions_to_subcolumns_column_names.sql b/tests/queries/0_stateless/02971_functions_to_subcolumns_column_names.sql
index 6df2f27dbbf..48e5232d18b 100644
--- a/tests/queries/0_stateless/02971_functions_to_subcolumns_column_names.sql
+++ b/tests/queries/0_stateless/02971_functions_to_subcolumns_column_names.sql
@@ -5,7 +5,7 @@ CREATE TABLE t_column_names (arr Array(UInt64), n Nullable(String)) ENGINE = Mem
 INSERT INTO t_column_names VALUES ([1, 2, 3], 'foo');
 
 SET optimize_functions_to_subcolumns = 1;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 EXPLAIN QUERY TREE dump_tree = 0, dump_ast = 1 SELECT length(arr), isNull(n) FROM t_column_names;
 SELECT length(arr), isNull(n) FROM t_column_names FORMAT JSONEachRow;
diff --git a/tests/queries/0_stateless/02971_functions_to_subcolumns_map.sql b/tests/queries/0_stateless/02971_functions_to_subcolumns_map.sql
index c53a03b8ccd..e8a752a82d5 100644
--- a/tests/queries/0_stateless/02971_functions_to_subcolumns_map.sql
+++ b/tests/queries/0_stateless/02971_functions_to_subcolumns_map.sql
@@ -5,7 +5,7 @@ CREATE TABLE t_func_to_subcolumns_map (id UInt64, m Map(String, UInt64)) ENGINE
 INSERT INTO t_func_to_subcolumns_map VALUES (1, map('aaa', 1, 'bbb', 2)) (2, map('ccc', 3));
 
 SET optimize_functions_to_subcolumns = 1;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 EXPLAIN QUERY TREE dump_tree = 0, dump_ast = 1 SELECT length(m) FROM t_func_to_subcolumns_map;
 SELECT length(m) FROM t_func_to_subcolumns_map;
diff --git a/tests/queries/0_stateless/02971_functions_to_subcolumns_variant.sql b/tests/queries/0_stateless/02971_functions_to_subcolumns_variant.sql
index 2612664a7b2..511bcc44514 100644
--- a/tests/queries/0_stateless/02971_functions_to_subcolumns_variant.sql
+++ b/tests/queries/0_stateless/02971_functions_to_subcolumns_variant.sql
@@ -7,7 +7,7 @@ CREATE TABLE t_func_to_subcolumns_variant (id UInt64, v Variant(String, UInt64))
 INSERT INTO t_func_to_subcolumns_variant VALUES (1, 'foo') (2, 111);
 
 SET optimize_functions_to_subcolumns = 1;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 EXPLAIN QUERY TREE dump_tree = 0, dump_ast = 1 SELECT variantElement(v, 'String') FROM t_func_to_subcolumns_variant;
 SELECT variantElement(v, 'String') FROM t_func_to_subcolumns_variant;
diff --git a/tests/queries/0_stateless/02972_parallel_replicas_cte.sql b/tests/queries/0_stateless/02972_parallel_replicas_cte.sql
index 767cd61216b..083b0ecc5c9 100644
--- a/tests/queries/0_stateless/02972_parallel_replicas_cte.sql
+++ b/tests/queries/0_stateless/02972_parallel_replicas_cte.sql
@@ -15,15 +15,15 @@ WITH filtered_groups AS (SELECT a FROM pr_1 WHERE a >= 100)
 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 enable_analyzer=0. With analyzer it will be supported (with correct result)
+-- 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 >= 100)
 SELECT count() FROM pr_2 INNER JOIN filtered_groups ON pr_2.a = filtered_groups.a
-SETTINGS enable_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 }
+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 >= 100)
 SELECT count() FROM pr_2 INNER JOIN filtered_groups ON pr_2.a = filtered_groups.a
-SETTINGS enable_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 }
+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
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
index 2b92c2865ad..b212e42061f 100755
--- a/tests/queries/0_stateless/02973_backup_of_in_memory_compressed.sh
+++ b/tests/queries/0_stateless/02973_backup_of_in_memory_compressed.sh
@@ -6,26 +6,26 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT "
+$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 "
+$CLICKHOUSE_CLIENT --multiquery "
 BACKUP TABLE test TO File('test.zip');
 " --format Null
 
-$CLICKHOUSE_CLIENT "
+$CLICKHOUSE_CLIENT --multiquery "
 TRUNCATE TABLE test;
 SELECT count() FROM test;
 "
 
-$CLICKHOUSE_CLIENT "
+$CLICKHOUSE_CLIENT --multiquery "
 RESTORE TABLE test FROM File('test.zip');
 " --format Null
 
-$CLICKHOUSE_CLIENT "
+$CLICKHOUSE_CLIENT --multiquery "
 SELECT count(), min(x), max(x) FROM test;
 DROP TABLE test;
 "
diff --git a/tests/queries/0_stateless/02973_parse_crlf_with_tsv_files.sh b/tests/queries/0_stateless/02973_parse_crlf_with_tsv_files.sh
index 9608925d087..6edac86be5b 100755
--- a/tests/queries/0_stateless/02973_parse_crlf_with_tsv_files.sh
+++ b/tests/queries/0_stateless/02973_parse_crlf_with_tsv_files.sh
@@ -17,7 +17,7 @@ echo -ne "Akiba_Hebrew_Academy\t2017-08-01\t241\r\nAegithina_tiphia\t2018-02-01\
 
 echo -e "<-- Read UNIX endings -->\n"
 $CLICKHOUSE_CLIENT --query "SELECT * FROM file(${UNIX_ENDINGS}, 'TabSeparated', 'SearchTerm String, Date Date, Hits UInt32');" 
-$CLICKHOUSE_CLIENT --query "SELECT * FROM file(${DOS_ENDINGS}, 'TabSeparated', 'SearchTerm String, Date Date, Hits UInt32'); --{serverError 117}" 
+$CLICKHOUSE_CLIENT --multiquery --query "SELECT * FROM file(${DOS_ENDINGS}, 'TabSeparated', 'SearchTerm String, Date Date, Hits UInt32'); --{serverError 117}" 
 
 echo -e "\n<-- Read DOS endings with setting input_format_tsv_crlf_end_of_line=1 -->\n"
 $CLICKHOUSE_CLIENT --query "SELECT * FROM file(${DOS_ENDINGS}, 'TabSeparated', 'SearchTerm String, Date Date, Hits UInt32') SETTINGS input_format_tsv_crlf_end_of_line = 1;"
diff --git a/tests/queries/0_stateless/02974_analyzer_array_join_subcolumn.sql b/tests/queries/0_stateless/02974_analyzer_array_join_subcolumn.sql
index 1fd103d0bb0..14823644b96 100644
--- a/tests/queries/0_stateless/02974_analyzer_array_join_subcolumn.sql
+++ b/tests/queries/0_stateless/02974_analyzer_array_join_subcolumn.sql
@@ -2,21 +2,21 @@ 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)}),;
+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 enable_analyzer = 1;
-SELECT p, p.values.a FROM (SELECT * FROM t2) ARRAY JOIN pe AS p SETTINGS enable_analyzer = 1;
+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 enable_analyzer = 1;
-SELECT p, p.values.a FROM (SELECT * FROM t3) ARRAY JOIN c.pe as p SETTINGS enable_analyzer = 1;
+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 enable_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;
 
 
diff --git a/tests/queries/0_stateless/02974_backup_query_format_null.sh b/tests/queries/0_stateless/02974_backup_query_format_null.sh
index 345a4f47b20..ddba2f6de16 100755
--- a/tests/queries/0_stateless/02974_backup_query_format_null.sh
+++ b/tests/queries/0_stateless/02974_backup_query_format_null.sh
@@ -4,7 +4,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} -m --query "
+${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);
@@ -14,7 +14,7 @@ backup_name="Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}')"
 
 ${CLICKHOUSE_CLIENT} --query "BACKUP TABLE tbl TO ${backup_name} FORMAT Null"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 DROP TABLE tbl;
 RESTORE ALL FROM ${backup_name} FORMAT Null
 "
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
index 7ad5a2179f9..e65c9654c9c 100755
--- 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
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-${CLICKHOUSE_CLIENT} -q """
+${CLICKHOUSE_CLIENT} -nq """
     CREATE TABLE t1_local
     (
         n UInt64,
diff --git a/tests/queries/0_stateless/01825_new_type_json_ghdata_insert_select.reference b/tests/queries/0_stateless/02982_aggregation_states_destruction.reference
similarity index 100%
rename from tests/queries/0_stateless/01825_new_type_json_ghdata_insert_select.reference
rename to tests/queries/0_stateless/02982_aggregation_states_destruction.reference
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..84183606d48
--- /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() > 0 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/02984_form_format.sh b/tests/queries/0_stateless/02984_form_format.sh
index 814fe1a0f2c..471b48e0f68 100755
--- a/tests/queries/0_stateless/02984_form_format.sh
+++ b/tests/queries/0_stateless/02984_form_format.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Tags: no-parallel
+
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
@@ -6,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 FILE_NAME="data.tmp"
 FORM_DATA="${USER_FILES_PATH}/${CLICKHOUSE_TEST_UNIQUE_NAME}/${FILE_NAME}"
 mkdir -p ${USER_FILES_PATH}/${CLICKHOUSE_TEST_UNIQUE_NAME}/
-touch $FORM_DATA
+touch $FORM_DATA 
 
 # Simple tests
 echo -ne "col1=42&col2=Hello%2C%20World%21" > $FORM_DATA
diff --git a/tests/queries/0_stateless/02987_logical_optimizer_pass_lowcardinality.sql b/tests/queries/0_stateless/02987_logical_optimizer_pass_lowcardinality.sql
index 266270562cc..be7689025b2 100644
--- a/tests/queries/0_stateless/02987_logical_optimizer_pass_lowcardinality.sql
+++ b/tests/queries/0_stateless/02987_logical_optimizer_pass_lowcardinality.sql
@@ -2,4 +2,4 @@ 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 enable_analyzer = true, join_use_nulls = true, convert_query_to_cnf = true;
+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/02989_join_using_parent_scope.reference b/tests/queries/0_stateless/02989_join_using_parent_scope.reference
index 72678a1db4d..965bfaf7c43 100644
--- a/tests/queries/0_stateless/02989_join_using_parent_scope.reference
+++ b/tests/queries/0_stateless/02989_join_using_parent_scope.reference
@@ -23,7 +23,7 @@ SELECT b AS a, a FROM tb JOIN tabc USING (a) ORDER BY ALL;
 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 enable_analyzer = 1;
+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
@@ -31,57 +31,57 @@ SELECT 3 AS a, a, * FROM tb FULL JOIN tabc USING (a) ORDER BY ALL SETTINGS enabl
 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 enable_analyzer = 1;
+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 enable_analyzer = 1;
+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 enable_analyzer = 1;
+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 enable_analyzer = 1;
+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 enable_analyzer = 1;
+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, enable_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;
 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 enable_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;
 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 enable_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;
 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 enable_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;
 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 enable_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;
 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 enable_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;
 3	abc3
 4	\N
 \N	abc0
@@ -94,7 +94,7 @@ 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, enable_analyzer = 1;
+SETTINGS analyzer_compatibility_join_using_top_level_identifier = 0, allow_experimental_analyzer = 1;
 2
 3
 4
@@ -108,7 +108,7 @@ 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 enable_analyzer = 1, analyzer_compatibility_join_using_top_level_identifier = 1;
+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
@@ -116,7 +116,7 @@ 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 enable_analyzer = 1, analyzer_compatibility_join_using_top_level_identifier = 0;
+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
@@ -125,7 +125,7 @@ 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 enable_analyzer = 0;
+SETTINGS allow_experimental_analyzer = 0;
 uid	name	u2.uid	u2.name
 Int16	String	Int16	String
 1231	Ksenia	6666	Ksenia
diff --git a/tests/queries/0_stateless/02989_join_using_parent_scope.sql b/tests/queries/0_stateless/02989_join_using_parent_scope.sql
index 4283d8b6eca..2e4d9f097f7 100644
--- a/tests/queries/0_stateless/02989_join_using_parent_scope.sql
+++ b/tests/queries/0_stateless/02989_join_using_parent_scope.sql
@@ -24,21 +24,21 @@ 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 enable_analyzer = 1;
-SELECT b + 1 AS a, * FROM tb JOIN tabc USING (a) ORDER BY ALL SETTINGS enable_analyzer = 1;
+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 enable_analyzer = 1;
-SELECT b + 1 AS a, * FROM tb LEFT JOIN tabc USING (a) ORDER BY ALL SETTINGS enable_analyzer = 1;
-SELECT b + 1 AS a, * FROM tb RIGHT JOIN tabc USING (a) ORDER BY ALL SETTINGS enable_analyzer = 1;
-SELECT b + 1 AS a, * FROM tb FULL JOIN tabc USING (a) ORDER BY ALL SETTINGS enable_analyzer = 1;
-SELECT b + 1 AS a, * FROM tb FULL JOIN tabc USING (a) ORDER BY ALL SETTINGS asterisk_include_alias_columns = 1, enable_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 enable_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 enable_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 enable_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 enable_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 enable_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
@@ -49,7 +49,7 @@ SETTINGS analyzer_compatibility_join_using_top_level_identifier = 1; -- { server
 
 -- 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, enable_analyzer = 1;
+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`
 
@@ -63,19 +63,19 @@ 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 enable_analyzer = 1, analyzer_compatibility_join_using_top_level_identifier = 1;
+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 enable_analyzer = 1, analyzer_compatibility_join_using_top_level_identifier = 0;
+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 enable_analyzer = 0;
+SETTINGS allow_experimental_analyzer = 0;
 
 DROP TABLE IF EXISTS users;
 
diff --git a/tests/queries/0_stateless/02991_count_rewrite_analyzer.sql b/tests/queries/0_stateless/02991_count_rewrite_analyzer.sql
index bb0d3a1a9d1..b11aeedd225 100644
--- a/tests/queries/0_stateless/02991_count_rewrite_analyzer.sql
+++ b/tests/queries/0_stateless/02991_count_rewrite_analyzer.sql
@@ -1,5 +1,5 @@
 -- Regression test for https://github.com/ClickHouse/ClickHouse/issues/59919
-SET enable_analyzer=1;
+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;
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
index ad056384bfd..127c6fee07d 100644
--- a/tests/queries/0_stateless/02992_all_columns_should_have_comment.sql
+++ b/tests/queries/0_stateless/02992_all_columns_should_have_comment.sql
@@ -1,8 +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', 'coverage_log', 'filesystem_read_prefetches_log')) AND
-      (default_kind != 'ALIAS');
+WHERE (database = 'system') AND (comment = '') AND (table NOT ILIKE '%_log_%') AND (table NOT IN ('numbers', 'numbers_mt', 'one', 'generate_series', 'generateSeries', 'coverage_log')) AND (default_kind != 'ALIAS');
diff --git a/tests/queries/0_stateless/02992_analyzer_group_by_const.sql b/tests/queries/0_stateless/02992_analyzer_group_by_const.sql
index efe18918c93..2a9e673d7bc 100644
--- a/tests/queries/0_stateless/02992_analyzer_group_by_const.sql
+++ b/tests/queries/0_stateless/02992_analyzer_group_by_const.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer=1;
+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';
diff --git a/tests/queries/0_stateless/02993_lazy_index_loading.reference b/tests/queries/0_stateless/02993_lazy_index_loading.reference
index 08f07a92815..5bc329ae4eb 100644
--- a/tests/queries/0_stateless/02993_lazy_index_loading.reference
+++ b/tests/queries/0_stateless/02993_lazy_index_loading.reference
@@ -1,4 +1,4 @@
-100000000	100000000
+100000000	140000000
 0	0
 1
 100000000	100000000
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
index 65601cd39be..1b9be79dbe4 100644
--- a/tests/queries/0_stateless/02994_merge_tree_mutations_cleanup.sql.j2
+++ b/tests/queries/0_stateless/02994_merge_tree_mutations_cleanup.sql.j2
@@ -1,5 +1,3 @@
--- Tags: no-fasttest
--- no-fasttest: Slow wait
 drop table if exists data_rmt;
 drop table if exists data_mt;
 
diff --git a/tests/queries/0_stateless/02995_baseline_24_7_2.tsv b/tests/queries/0_stateless/02995_baseline_23_12_1.tsv
similarity index 82%
rename from tests/queries/0_stateless/02995_baseline_24_7_2.tsv
rename to tests/queries/0_stateless/02995_baseline_23_12_1.tsv
index 10b392f3e04..a391473e7c9 100644
--- a/tests/queries/0_stateless/02995_baseline_24_7_2.tsv
+++ b/tests/queries/0_stateless/02995_baseline_23_12_1.tsv
@@ -11,28 +11,23 @@ allow_create_index_without_type	0
 allow_custom_error_code_in_throwif	0
 allow_ddl	1
 allow_deprecated_database_ordinary	0
-allow_deprecated_error_prone_window_functions	0
-allow_deprecated_snowflake_conversion_functions	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	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	1
-allow_experimental_dynamic_type	0
-allow_experimental_full_text_index	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_join_condition	0
 allow_experimental_lightweight_delete	1
 allow_experimental_live_view	0
 allow_experimental_map_type	1
@@ -45,15 +40,12 @@ 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	1
-allow_experimental_statistic	0
+allow_experimental_shared_merge_tree	0
 allow_experimental_statistics	0
 allow_experimental_undrop_table_query	1
 allow_experimental_usearch_index	0
-allow_experimental_variant_type	0
 allow_experimental_window_functions	1
 allow_experimental_window_view	0
-allow_get_client_http_header	0
 allow_hyperscan	1
 allow_introspection_functions	0
 allow_named_collection_override_by_default	1
@@ -66,21 +58,17 @@ 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_statistics_optimize	0
 allow_suspicious_codecs	0
 allow_suspicious_fixed_string_types	0
 allow_suspicious_indices	0
 allow_suspicious_low_cardinality_types	0
-allow_suspicious_primary_key	0
 allow_suspicious_ttl_expressions	0
-allow_suspicious_variant_types	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
-analyzer_compatibility_join_using_top_level_identifier	0
 annoy_index_search_k_nodes	-1
 any_join_distinct_right_table_keys	0
 apply_deleted_mask	1
@@ -88,42 +76,20 @@ apply_mutations_on_fly	0
 asterisk_include_alias_columns	0
 asterisk_include_materialized_columns	0
 async_insert	0
-async_insert_busy_timeout_decrease_rate	0.2
-async_insert_busy_timeout_increase_rate	0.2
-async_insert_busy_timeout_max_ms	200
-async_insert_busy_timeout_min_ms	50
 async_insert_busy_timeout_ms	200
 async_insert_cleanup_timeout_ms	1000
 async_insert_deduplicate	0
-async_insert_max_data_size	10485760
+async_insert_max_data_size	1000000
 async_insert_max_query_number	450
-async_insert_poll_timeout_ms	10
 async_insert_stale_timeout_ms	0
 async_insert_threads	16
-async_insert_use_adaptive_busy_timeout	1
 async_query_sending_for_remote	1
 async_socket_for_remote	1
-azure_allow_parallel_part_upload	1
 azure_create_new_file_on_insert	0
-azure_ignore_file_doesnt_exist	0
 azure_list_object_keys_size	1000
-azure_max_blocks_in_multipart_upload	50000
-azure_max_inflight_parts_for_one_file	20
-azure_max_single_part_copy_size	268435456
 azure_max_single_part_upload_size	104857600
 azure_max_single_read_retries	4
-azure_max_unexpected_write_error_retries	4
-azure_max_upload_part_size	5368709120
-azure_min_upload_part_size	16777216
-azure_sdk_max_retries	10
-azure_sdk_retry_initial_backoff_ms	10
-azure_sdk_retry_max_backoff_ms	1000
-azure_skip_empty_files	0
-azure_strict_upload_part_size	0
-azure_throw_on_zero_files_match	0
 azure_truncate_on_insert	0
-azure_upload_part_size_multiply_factor	2
-azure_upload_part_size_multiply_parts_count_threshold	500
 background_buffer_flush_schedule_pool_size	16
 background_common_pool_size	8
 background_distributed_schedule_pool_size	16
@@ -141,7 +107,6 @@ 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_restore_s3_retry_attempts	1000
 backup_threads	16
 bool_false_representation	false
 bool_true_representation	true
@@ -150,7 +115,6 @@ 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
-cast_string_to_dynamic_use_inference	0
 check_query_single_value_result	1
 check_referential_table_dependencies	0
 check_table_dependencies	1
@@ -159,7 +123,6 @@ cloud_mode	0
 cloud_mode_engine	1
 cluster_for_parallel_replicas	
 collect_hash_table_stats_during_aggregation	1
-collect_hash_table_stats_during_joins	1
 column_names_for_schema_inference	
 compatibility	
 compatibility_ignore_auto_increment_in_create_table	0
@@ -178,12 +141,9 @@ 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_join_min_bytes_to_compress	1073741824
-cross_join_min_rows_to_compress	10000000
 cross_to_inner_join_rewrite	1
 data_type_default_nullable	0
 database_atomic_wait_for_drop_and_detach_synchronously	0
-database_replicated_allow_heavy_create	0
 database_replicated_allow_only_replicated_engine	0
 database_replicated_allow_replicated_engine_arguments	1
 database_replicated_always_detach_permanently	0
@@ -196,19 +156,15 @@ date_time_overflow_behavior	ignore
 decimal_check_overflow	1
 deduplicate_blocks_in_dependent_materialized_views	0
 default_database_engine	Atomic
-default_materialized_view_sql_security	DEFINER
 default_max_bytes_in_join	1000000000
-default_normal_view_sql_security	INVOKER
-default_table_engine	MergeTree
+default_table_engine	None
 default_temporary_table_engine	Memory
-default_view_definer	CURRENT_USER
 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
-dictionary_validate_primary_key_type	0
 distinct_overflow_mode	throw
 distributed_aggregation_memory_efficient	1
 distributed_background_insert_batch	0
@@ -226,7 +182,6 @@ 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_insert_skip_read_only_replicas	0
 distributed_product_mode	deny
 distributed_push_down_limit	1
 distributed_replica_error_cap	1000
@@ -236,7 +191,6 @@ 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_blob_storage_log	1
 enable_debug_queries	0
 enable_deflate_qpl_codec	0
 enable_early_constant_folding	1
@@ -251,7 +205,6 @@ enable_job_stack_trace	0
 enable_lightweight_delete	1
 enable_memory_bound_merging_of_aggregation_results	1
 enable_multiple_prewhere_read_steps	1
-enable_named_columns_in_function_tuple	1
 enable_optimize_predicate_expression	1
 enable_optimize_predicate_expression_to_final_subquery	1
 enable_order_by_all	1
@@ -263,9 +216,7 @@ enable_sharing_sets_for_mutations	1
 enable_software_prefetch_in_aggregation	1
 enable_unaligned_array_join	0
 enable_url_encoding	1
-enable_vertical_final	1
 enable_writes_to_query_cache	1
-enable_zstd_qat_codec	0
 engine_file_allow_create_multiple_files	0
 engine_file_empty_if_not_exists	0
 engine_file_skip_empty_files	0
@@ -280,12 +231,10 @@ external_storage_max_read_rows	0
 external_storage_rw_timeout_sec	300
 external_table_functions_use_nulls	1
 external_table_strict_query	0
-extract_key_value_pairs_max_pairs_per_row	1000
 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_reserve_space_wait_lock_timeout_milliseconds	1000
 filesystem_cache_segments_batch_size	20
 filesystem_prefetch_max_memory_usage	1073741824
 filesystem_prefetch_min_bytes_for_single_read_task	2097152
@@ -329,9 +278,7 @@ format_regexp_escaping_rule	Raw
 format_regexp_skip_unmatched	0
 format_schema	
 format_template_resultset	
-format_template_resultset_format	
 format_template_row	
-format_template_row_format	
 format_template_rows_between_delimiter	\n
 format_tsv_null_representation	\\N
 formatdatetime_f_prints_single_zero	0
@@ -341,11 +288,8 @@ fsync_metadata	1
 function_implementation	
 function_json_value_return_type_allow_complex	0
 function_json_value_return_type_allow_nullable	0
-function_locate_has_mysql_compatible_argument_order	1
 function_range_max_elements_in_block	500000000
 function_sleep_max_microseconds_per_block	3000000
-function_visible_width_behavior	1
-geo_distance_returns_float64_on_float64_arguments	1
 glob_expansion_max_elements	1000
 grace_hash_join_initial_buckets	1
 grace_hash_join_max_buckets	1024
@@ -356,10 +300,8 @@ group_by_use_nulls	0
 handle_kafka_error_mode	default
 handshake_timeout_ms	10000
 hdfs_create_new_file_on_insert	0
-hdfs_ignore_file_doesnt_exist	0
 hdfs_replication	0
 hdfs_skip_empty_files	0
-hdfs_throw_on_zero_files_match	0
 hdfs_truncate_on_insert	0
 hedged_connection_timeout_ms	50
 hsts_max_age	0
@@ -384,14 +326,10 @@ 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
-iceberg_engine_ignore_schema_evolution	0
 idle_connection_timeout	3600
 ignore_cold_parts_seconds	0
 ignore_data_skipping_indices	
-ignore_drop_queries_probability	0
-ignore_materialized_views_with_dropped_target_table	0
 ignore_on_cluster_for_replicated_access_entities_queries	0
-ignore_on_cluster_for_replicated_named_collections_queries	0
 ignore_on_cluster_for_replicated_udf_queries	0
 implicit_transaction	0
 input_format_allow_errors_num	0
@@ -403,14 +341,12 @@ 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_binary_decode_types_in_binary_format	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_deserialize_separate_columns_into_tuple	1
 input_format_csv_detect_header	1
 input_format_csv_empty_as_default	1
 input_format_csv_enum_as_number	0
@@ -418,37 +354,29 @@ 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_try_infer_strings_from_quoted_tuples	1
 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_force_null_for_omitted_fields	0
-input_format_hive_text_allow_variable_number_of_columns	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_case_insensitive_column_matching	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_ignore_unnecessary_fields	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_bools_as_strings	1
 input_format_json_read_numbers_as_strings	1
 input_format_json_read_objects_as_strings	1
-input_format_json_throw_on_bad_escape_sequence	1
 input_format_json_try_infer_named_tuples_from_objects	1
 input_format_json_try_infer_numbers_from_strings	0
-input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects	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
@@ -456,13 +384,11 @@ 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_native_decode_types_in_binary_format	0
 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_reader_time_zone_name	GMT
 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
@@ -472,21 +398,17 @@ 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	65409
-input_format_parquet_prefer_block_bytes	16744704
+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_parquet_use_native_reader	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_exponent_floats	0
 input_format_try_infer_integers	1
 input_format_tsv_allow_variable_number_of_columns	0
-input_format_tsv_crlf_end_of_line	0
 input_format_tsv_detect_header	1
 input_format_tsv_empty_as_default	0
 input_format_tsv_enum_as_number	0
@@ -528,12 +450,7 @@ joined_subquery_requires_alias	1
 kafka_disable_num_consumers_limit	0
 kafka_max_wait_ms	5000
 keeper_map_strict_mode	0
-keeper_max_retries	10
-keeper_retry_initial_backoff_ms	100
-keeper_retry_max_backoff_ms	5000
 legacy_column_name_of_tuple_literal	0
-lightweight_deletes_sync	2
-lightweight_mutation_projection_mode	throw
 limit	0
 live_view_heartbeat_interval	15
 load_balancing	random
@@ -544,7 +461,7 @@ local_filesystem_read_prefetch	0
 lock_acquire_timeout	120
 log_comment	
 log_formatted_queries	0
-log_processors_profiles	1
+log_processors_profiles	0
 log_profile_events	1
 log_queries	1
 log_queries_cut_to_length	100000
@@ -557,8 +474,6 @@ 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_skip_indexes_on_insert	1
-materialize_statistics_on_insert	1
 materialize_ttl_after_modify	1
 materialized_views_ignore_errors	0
 max_alter_threads	\'auto(16)\'
@@ -586,7 +501,6 @@ max_distributed_depth	5
 max_download_buffer_size	10485760
 max_download_threads	4
 max_entries_for_hash_table_stats	10000
-max_estimated_execution_time	0
 max_execution_speed	0
 max_execution_speed_bytes	0
 max_execution_time	0
@@ -614,9 +528,7 @@ max_network_bandwidth_for_user	0
 max_network_bytes	0
 max_number_of_partitions_for_independent_aggregation	128
 max_parallel_replicas	1
-max_parser_backtracks	1000000
 max_parser_depth	1000
-max_parsing_threads	\'auto(16)\'
 max_partition_size_to_drop	50000000000
 max_partitions_per_insert_block	100
 max_partitions_to_read	-1
@@ -625,7 +537,6 @@ max_query_size	262144
 max_read_buffer_size	1048576
 max_read_buffer_size_local_fs	131072
 max_read_buffer_size_remote_fs	0
-max_recursive_cte_evaluation_depth	1000
 max_remote_read_network_bandwidth	0
 max_remote_read_network_bandwidth_for_server	0
 max_remote_write_network_bandwidth	0
@@ -638,7 +549,7 @@ 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	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
@@ -646,7 +557,6 @@ max_rows_to_sort	0
 max_rows_to_transfer	0
 max_sessions_for_user	0
 max_size_to_preallocate_for_aggregation	100000000
-max_size_to_preallocate_for_joins	100000000
 max_streams_for_merge_tree_reading	0
 max_streams_multiplier_for_merge_tables	5
 max_streams_to_max_threads_ratio	1
@@ -682,7 +592,6 @@ 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_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability	0
 merge_tree_use_const_size_tasks_for_remote_reading	1
 metrics_perf_events_enabled	0
 metrics_perf_events_list	
@@ -695,8 +604,6 @@ min_count_to_compile_expression	3
 min_count_to_compile_sort_description	3
 min_execution_speed	0
 min_execution_speed_bytes	0
-min_external_table_block_size_bytes	268402944
-min_external_table_block_size_rows	1048449
 min_free_disk_space_for_temporary_data	0
 min_hit_rate_to_use_consecutive_keys_optimization	0.5
 min_insert_block_size_bytes	268402944
@@ -712,8 +619,8 @@ 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	1
-mysql_map_string_to_text_in_show_columns	1
+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
@@ -740,7 +647,6 @@ 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_in_group_by	1
 optimize_injective_functions_inside_uniq	1
 optimize_min_equality_disjunction_chain_length	3
 optimize_min_inequality_conjunction_chain_length	3
@@ -758,7 +664,7 @@ 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	1
+optimize_rewrite_sum_if_to_count_if	0
 optimize_skip_merged_partitions	0
 optimize_skip_unused_shards	0
 optimize_skip_unused_shards_limit	1000
@@ -768,10 +674,9 @@ optimize_sorting_by_input_stream_properties	1
 optimize_substitute_columns	0
 optimize_syntax_fuse_functions	0
 optimize_throw_if_noop	0
-optimize_time_filter_with_preimage	1
 optimize_trivial_approximate_count_query	0
 optimize_trivial_count_query	1
-optimize_trivial_insert_select	0
+optimize_trivial_insert_select	1
 optimize_uniq_to_count	1
 optimize_use_implicit_projections	1
 optimize_use_projections	1
@@ -780,19 +685,13 @@ 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	1
-output_format_arrow_use_64_bit_indexes_for_dictionary	0
-output_format_arrow_use_signed_indexes_for_dictionary	1
+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_binary_encode_types_in_binary_format	0
 output_format_bson_string_as_string	0
-output_format_compression_level	3
-output_format_compression_zstd_window_log	0
 output_format_csv_crlf_end_of_line	0
-output_format_csv_serialize_tuple_into_separate_columns	1
 output_format_decimal_trailing_zeros	0
 output_format_enable_streaming	0
 output_format_json_array_of_rows	0
@@ -806,34 +705,27 @@ 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_native_encode_types_in_binary_format	0
-output_format_orc_compression_method	zstd
+output_format_orc_compression_method	lz4
 output_format_orc_row_index_stride	10000
-output_format_orc_string_as_string	1
+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	zstd
+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	1
-output_format_parquet_use_custom_encoder	1
+output_format_parquet_string_as_string	0
+output_format_parquet_use_custom_encoder	0
 output_format_parquet_version	2.latest
-output_format_parquet_write_page_index	1
-output_format_pretty_color	auto
-output_format_pretty_display_footer_column_names	1
-output_format_pretty_display_footer_column_names_min_rows	50
+output_format_pretty_color	1
 output_format_pretty_grid_charset	UTF-8
-output_format_pretty_highlight_digit_groups	1
 output_format_pretty_max_column_pad_width	250
 output_format_pretty_max_rows	10000
 output_format_pretty_max_value_width	10000
-output_format_pretty_max_value_width_apply_for_single_value	0
-output_format_pretty_row_numbers	1
-output_format_pretty_single_large_number_tip_threshold	1000000
+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
@@ -842,22 +734,15 @@ 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_values_escape_quote_with_quote	0
 output_format_write_statistics	1
-page_cache_inject_eviction	0
 parallel_distributed_insert_select	0
 parallel_replica_offset	0
-parallel_replicas_allow_in_with_subquery	1
 parallel_replicas_count	0
 parallel_replicas_custom_key	
 parallel_replicas_custom_key_filter_type	default
-parallel_replicas_custom_key_range_lower	0
-parallel_replicas_custom_key_range_upper	0
 parallel_replicas_for_non_replicated_merge_tree	0
-parallel_replicas_mark_segment_size	128
 parallel_replicas_min_number_of_granules_to_enable	0
 parallel_replicas_min_number_of_rows_per_replica	0
-parallel_replicas_prefer_local_join	1
 parallel_replicas_single_task_marks_count_multiplier	2
 parallel_view_processing	0
 parallelize_output_from_storages	1
@@ -870,14 +755,11 @@ parts_to_delay_insert	0
 parts_to_throw_insert	0
 periodic_live_view_refresh	60
 poll_interval	10
-postgresql_connection_attempt_timeout	2
 postgresql_connection_pool_auto_close_connection	0
-postgresql_connection_pool_retries	2
 postgresql_connection_pool_size	16
 postgresql_connection_pool_wait_timeout	5000
 precise_float_parsing	0
 prefer_column_name_to_alias	0
-prefer_external_sort_block_bytes	16744704
 prefer_global_in_and_join	0
 prefer_localhost_replica	1
 prefer_warmed_unmerged_parts_seconds	0
@@ -885,7 +767,7 @@ 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	1
+print_pretty_type_names	0
 priority	0
 query_cache_compress_entries	1
 query_cache_max_entries	0
@@ -896,10 +778,8 @@ 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_system_table_handling	throw
 query_cache_ttl	60
 query_plan_aggregation_in_order	1
-query_plan_convert_outer_join_to_inner_join	1
 query_plan_enable_multithreading_after_window_functions	1
 query_plan_enable_optimizations	1
 query_plan_execute_functions_after_sorting	1
@@ -908,8 +788,6 @@ 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_merge_filters	0
-query_plan_optimize_prewhere	1
 query_plan_optimize_primary_key	1
 query_plan_optimize_projection	1
 query_plan_push_down_limit	1
@@ -928,9 +806,7 @@ 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_from_page_cache_if_exists_otherwise_bypass_cache	0
 read_in_order_two_level_merge_threshold	100
-read_in_order_use_buffering	1
 read_overflow_mode	throw
 read_overflow_mode_leaf	throw
 read_priority	0
@@ -959,20 +835,17 @@ 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_connect_timeout_ms	1000
 s3_create_new_file_on_insert	0
 s3_disable_checksum	0
-s3_ignore_file_doesnt_exist	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_part_number	10000
 s3_max_put_burst	0
 s3_max_put_rps	0
 s3_max_redirects	10
-s3_max_single_operation_copy_size	33554432
 s3_max_single_part_upload_size	33554432
 s3_max_single_read_retries	4
 s3_max_unexpected_write_error_retries	4
@@ -987,8 +860,6 @@ 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
-s3_validate_request_settings	1
-s3queue_allow_experimental_sharded_mode	0
 s3queue_default_zookeeper_path	/clickhouse/s3queue/
 s3queue_enable_logging_to_s3queue_log	0
 schema_inference_cache_require_modification_time_for_url	1
@@ -1016,8 +887,6 @@ sleep_after_receiving_query_ms	0
 sleep_in_send_data_ms	0
 sleep_in_send_tables_status_ms	0
 sort_overflow_mode	throw
-split_intersecting_parts_ranges_into_layers_final	1
-split_parts_ranges_into_intersecting_and_non_intersecting_final	1
 splitby_max_substrings_includes_remaining_string	0
 stop_refreshable_materialized_views_on_startup	0
 storage_file_read_method	pread
@@ -1029,10 +898,8 @@ stream_poll_timeout_ms	500
 system_events_show_zero_values	0
 table_function_remote_max_addresses	1000
 tcp_keep_alive_timeout	290
-temporary_data_in_cache_reserve_space_wait_lock_timeout_milliseconds	600000
 temporary_files_codec	LZ4
 temporary_live_view_timeout	1
-throw_if_deduplication_in_dependent_materialized_views_enabled_with_async_insert	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
@@ -1045,10 +912,8 @@ totals_mode	after_having_exclusive
 trace_profile_events	0
 transfer_overflow_mode	throw
 transform_null_in	0
-traverse_shadow_remote_data_paths	0
 union_default_mode	
 unknown_packet_in_send_data	0
-update_insert_deduplication_token_in_dependent_materialized_views	0
 use_cache_for_count_from_files	1
 use_client_time_zone	0
 use_compact_format_in_distributed_parts_names	1
@@ -1058,15 +923,12 @@ 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_page_cache_for_disks_without_file_cache	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_variant_as_common_type	0
 use_with_fill_by_sorting_prefix	1
-validate_experimental_and_suspicious_types_inside_nested_types	1
 validate_polygons	1
 wait_changes_become_visible_after_commit_mode	wait_unknown
 wait_for_async_insert	1
diff --git a/tests/queries/0_stateless/02995_forget_partition.sh b/tests/queries/0_stateless/02995_forget_partition.sh
index e9d4590cce6..c22f5829130 100755
--- a/tests/queries/0_stateless/02995_forget_partition.sh
+++ b/tests/queries/0_stateless/02995_forget_partition.sh
@@ -1,13 +1,12 @@
 #!/usr/bin/env bash
-# Tags: zookeeper, no-replicated-database, no-fasttest
-# no-fasttest: Slow wait
+# 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 -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 drop table if exists forget_partition;
 
 create table forget_partition
@@ -32,7 +31,7 @@ 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 IN ('20240101', '20240102')") != 0 ]]; do sleep 1; done
 
-${CLICKHOUSE_CLIENT} --multiline -q """
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 set allow_unrestricted_reads_from_keeper=1;
 
 select '---before---';
diff --git a/tests/queries/0_stateless/02995_index_1.sh b/tests/queries/0_stateless/02995_index_1.sh
index 76be6341d53..a5f1b30c2e8 100755
--- a/tests/queries/0_stateless/02995_index_1.sh
+++ b/tests/queries/0_stateless/02995_index_1.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
-# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage, no-distributed-cache
+# 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} "
+${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;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT}
+done | ${CLICKHOUSE_CLIENT} --multiquery
 
-${CLICKHOUSE_CLIENT} "DROP TABLE test"
+${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_10.sh b/tests/queries/0_stateless/02995_index_10.sh
index e7e7d3c3b42..d72c7c72705 100755
--- a/tests/queries/0_stateless/02995_index_10.sh
+++ b/tests/queries/0_stateless/02995_index_10.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
-# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage, no-distributed-cache
+# 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} -q "
+${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;
@@ -37,9 +37,8 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   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
-SETTINGS trace_profile_events=0 -- test is too slow with profiling
-;"
-done | ${CLICKHOUSE_CLIENT}
+HAVING count() > 0;
+"
+done | ${CLICKHOUSE_CLIENT} --multiquery
 
-${CLICKHOUSE_CLIENT} -q "DROP TABLE test"
+${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_2.sh b/tests/queries/0_stateless/02995_index_2.sh
index a78e0f40649..e7451c7ee4b 100755
--- a/tests/queries/0_stateless/02995_index_2.sh
+++ b/tests/queries/0_stateless/02995_index_2.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
-# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage, no-distributed-cache
+# 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} "
+${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;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT}
+done | ${CLICKHOUSE_CLIENT} --multiquery
 
-${CLICKHOUSE_CLIENT} "DROP TABLE test"
+${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_3.sh b/tests/queries/0_stateless/02995_index_3.sh
index 4392259e8a0..506429e2696 100755
--- a/tests/queries/0_stateless/02995_index_3.sh
+++ b/tests/queries/0_stateless/02995_index_3.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
-# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage, no-distributed-cache
+# 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} "
+${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;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT} 
+done | ${CLICKHOUSE_CLIENT} --multiquery
 
-${CLICKHOUSE_CLIENT} "DROP TABLE test"
+${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_4.sh b/tests/queries/0_stateless/02995_index_4.sh
index 9d7caf9f388..1a0458728f9 100755
--- a/tests/queries/0_stateless/02995_index_4.sh
+++ b/tests/queries/0_stateless/02995_index_4.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
-# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage, no-distributed-cache
+# 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} "
+${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;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT} 
+done | ${CLICKHOUSE_CLIENT} --multiquery
 
-${CLICKHOUSE_CLIENT} "DROP TABLE test"
+${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_5.sh b/tests/queries/0_stateless/02995_index_5.sh
index 58e53a2c481..60c12a8146d 100755
--- a/tests/queries/0_stateless/02995_index_5.sh
+++ b/tests/queries/0_stateless/02995_index_5.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
-# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage, no-distributed-cache
+# 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} "
+${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;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT}
+done | ${CLICKHOUSE_CLIENT} --multiquery
 
-${CLICKHOUSE_CLIENT} "DROP TABLE test"
+${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_6.sh b/tests/queries/0_stateless/02995_index_6.sh
index ef35f0e1126..4936f73f36b 100755
--- a/tests/queries/0_stateless/02995_index_6.sh
+++ b/tests/queries/0_stateless/02995_index_6.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
-# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage, no-distributed-cache
+# 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} "
+${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;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT}
+done | ${CLICKHOUSE_CLIENT} --multiquery
 
-${CLICKHOUSE_CLIENT} "DROP TABLE test"
+${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_7.sh b/tests/queries/0_stateless/02995_index_7.sh
index 7a03b0d4c1a..26be310abce 100755
--- a/tests/queries/0_stateless/02995_index_7.sh
+++ b/tests/queries/0_stateless/02995_index_7.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
-# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage, no-distributed-cache
+# 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} "
+${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;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT} 
+done | ${CLICKHOUSE_CLIENT} --multiquery
 
-${CLICKHOUSE_CLIENT} "DROP TABLE test"
+${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_8.sh b/tests/queries/0_stateless/02995_index_8.sh
index adb835aedca..8c2620b59fd 100755
--- a/tests/queries/0_stateless/02995_index_8.sh
+++ b/tests/queries/0_stateless/02995_index_8.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} "
+${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;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT} 
+done | ${CLICKHOUSE_CLIENT} --multiquery
 
-${CLICKHOUSE_CLIENT} "DROP TABLE test"
+${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_index_9.sh b/tests/queries/0_stateless/02995_index_9.sh
index 8b10acbd72d..76160c62aaa 100755
--- a/tests/queries/0_stateless/02995_index_9.sh
+++ b/tests/queries/0_stateless/02995_index_9.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
-# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage, no-distributed-cache
+# 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} "
+${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;
@@ -39,6 +39,6 @@ WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1
   AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
 HAVING count() > 0;
 "
-done | ${CLICKHOUSE_CLIENT} 
+done | ${CLICKHOUSE_CLIENT} --multiquery
 
-${CLICKHOUSE_CLIENT} "DROP TABLE test"
+${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_new_settings_history.sh b/tests/queries/0_stateless/02995_new_settings_history.sh
index 7fb21f88fae..8de98c55b6a 100755
--- a/tests/queries/0_stateless/02995_new_settings_history.sh
+++ b/tests/queries/0_stateless/02995_new_settings_history.sh
@@ -7,12 +7,12 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$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 24.7.2
-# clickhouse local --query "select name, default from system.settings order by name format TSV" > 02995_baseline_24_7_2.tsv
+# 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_24_7_2.tsv', 'TSV', 'name String, default String')
+        SELECT * FROM file('${CUR_DIR}/02995_baseline_23_12_1.tsv', 'TSV', 'name String, default String')
     ),
     new_settings AS
     (
@@ -21,7 +21,7 @@ $CLICKHOUSE_LOCAL --query "
     )
     SELECT * FROM
     (
-        SELECT 'PLEASE ADD THE NEW SETTING TO SettingsChangesHistory.cpp: ' || name || ' WAS ADDED',
+        SELECT 'PLEASE ADD THE NEW SETTING TO SettingsChangesHistory.h: ' || name || ' WAS ADDED',
         FROM new_settings
         WHERE (name NOT IN (
             SELECT name
@@ -29,17 +29,17 @@ $CLICKHOUSE_LOCAL --query "
         )) AND (name NOT IN (
             SELECT arrayJoin(tupleElement(changes, 'name'))
             FROM system.settings_changes
-            WHERE splitByChar('.', version)[1]::UInt64 >= 24 AND splitByChar('.', version)[2]::UInt64 > 7
+            WHERE splitByChar('.', version())[1] >= '24'
         ))
         UNION ALL
         (
-            SELECT 'PLEASE ADD THE SETTING VALUE CHANGE TO SettingsChangesHistory.cpp: ' || name || ' WAS CHANGED FROM ' || old_settings.default || ' TO ' || new_settings.default,
+            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]::UInt64 >= 24 AND splitByChar('.', version)[2]::UInt64 > 7
+                WHERE splitByChar('.', version())[1] >= '24'
             ))
         )
     )
diff --git a/tests/queries/0_stateless/02996_analyzer_prewhere_projection.sql b/tests/queries/0_stateless/02996_analyzer_prewhere_projection.sql
index 66f7c37a893..9d676001010 100644
--- a/tests/queries/0_stateless/02996_analyzer_prewhere_projection.sql
+++ b/tests/queries/0_stateless/02996_analyzer_prewhere_projection.sql
@@ -4,4 +4,4 @@ CREATE TABLE t__fuzz_0 (`i` LowCardinality(Int32), `j` Int32, `k` Int32, PROJECT
 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 enable_analyzer = true;
+SETTINGS allow_experimental_analyzer = true;
diff --git a/tests/queries/0_stateless/02998_analyzer_prewhere_report.sql b/tests/queries/0_stateless/02998_analyzer_prewhere_report.sql
index 5a7cab854e9..b3027181901 100644
--- a/tests/queries/0_stateless/02998_analyzer_prewhere_report.sql
+++ b/tests/queries/0_stateless/02998_analyzer_prewhere_report.sql
@@ -15,4 +15,4 @@ SELECT
     arrayFilter(x -> (x IN (2, 3)), data) AS filtered
 FROM hits
 WHERE arrayExists(x -> (x IN (2, 3)), data)
-SETTINGS enable_analyzer = 1;
+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
index 67ef38093d4..ffd2f68990b 100644
--- a/tests/queries/0_stateless/02998_analyzer_secret_args_tree_node.reference
+++ b/tests/queries/0_stateless/02998_analyzer_secret_args_tree_node.reference
@@ -1,5 +1,5 @@
 -- { echoOn }
-SET enable_analyzer = 1;
+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
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
index a216f886f8a..f40b40b6c8c 100644
--- a/tests/queries/0_stateless/02998_analyzer_secret_args_tree_node.sql
+++ b/tests/queries/0_stateless/02998_analyzer_secret_args_tree_node.sql
@@ -2,7 +2,7 @@
 -- encrypt function doesn't exist in the fastest build
 
 -- { echoOn }
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 EXPLAIN QUERY TREE SELECT encrypt('aes-256-ofb', (SELECT 'qwerty'), '12345678901234567890123456789012'), encrypt('aes-256-ofb', (SELECT 'asdf'), '12345678901234567890123456789012');
 
diff --git a/tests/queries/0_stateless/02998_native_parquet_reader.sh b/tests/queries/0_stateless/02998_native_parquet_reader.sh
index 95b659815ed..d6369c4921b 100755
--- a/tests/queries/0_stateless/02998_native_parquet_reader.sh
+++ b/tests/queries/0_stateless/02998_native_parquet_reader.sh
@@ -208,4 +208,4 @@ CH_SCHEMA="\
 QUERY="SELECT * from file('$PAR_PATH', 'Parquet', '$CH_SCHEMA')"
 
 # there may be more than on group in parquet files, unstable results may generated by multithreads
-$CLICKHOUSE_LOCAL --max_threads 1 --max_parsing_threads 1 --input_format_parquet_use_native_reader true --query "$QUERY"
+$CLICKHOUSE_LOCAL --multiquery --max_threads 1 --max_parsing_threads 1 --input_format_parquet_use_native_reader true --query "$QUERY"
diff --git a/tests/queries/0_stateless/02998_primary_key_skip_columns.sql b/tests/queries/0_stateless/02998_primary_key_skip_columns.sql
index 1abe692a7a4..ee558996b52 100644
--- a/tests/queries/0_stateless/02998_primary_key_skip_columns.sql
+++ b/tests/queries/0_stateless/02998_primary_key_skip_columns.sql
@@ -1,5 +1,4 @@
--- Tags: no-asan, no-tsan, no-msan, no-ubsan, no-random-settings, no-debug, no-fasttest
--- no-fasttest: Low index granularity and too many parts makes the test slow
+-- Tags: no-asan, no-tsan, no-msan, no-ubsan, no-random-settings, no-debug
 
 DROP TABLE IF EXISTS 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
index 93cae129842..1cb984f0f34 100644
--- a/tests/queries/0_stateless/02998_projection_after_attach_partition.reference
+++ b/tests/queries/0_stateless/02998_projection_after_attach_partition.reference
@@ -19,12 +19,12 @@ 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 enable_analyzer=0;
+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 enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 EXPLAIN SELECT * FROM visits_order_dst WHERE user_name='another_user2';
 Expression ((Project names + Projection))
   Filter
diff --git a/tests/queries/0_stateless/02998_projection_after_attach_partition.sql b/tests/queries/0_stateless/02998_projection_after_attach_partition.sql
index 72ee4ad81e8..4e0121dafe9 100644
--- a/tests/queries/0_stateless/02998_projection_after_attach_partition.sql
+++ b/tests/queries/0_stateless/02998_projection_after_attach_partition.sql
@@ -25,10 +25,10 @@ INSERT INTO visits_order SELECT 2, 'yet_another_user2', number*3 from numbers(1,
 
 ALTER TABLE visits_order_dst ATTACH PARTITION ID '2' FROM visits_order;
 
-SET enable_analyzer=0;
+SET allow_experimental_analyzer=0;
 
 EXPLAIN SELECT * FROM visits_order_dst WHERE user_name='another_user2';
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 EXPLAIN SELECT * FROM visits_order_dst WHERE user_name='another_user2';
diff --git a/tests/queries/0_stateless/02999_analyzer_preimage_null.sql b/tests/queries/0_stateless/02999_analyzer_preimage_null.sql
index 0fc61cf0836..07d3a0f69c1 100644
--- a/tests/queries/0_stateless/02999_analyzer_preimage_null.sql
+++ b/tests/queries/0_stateless/02999_analyzer_preimage_null.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer=1;
+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;
diff --git a/tests/queries/0_stateless/03001_analyzer_nullable_nothing.sql b/tests/queries/0_stateless/03001_analyzer_nullable_nothing.sql
index c1c7ca87b5f..32c378ebf0a 100644
--- a/tests/queries/0_stateless/03001_analyzer_nullable_nothing.sql
+++ b/tests/queries/0_stateless/03001_analyzer_nullable_nothing.sql
@@ -3,4 +3,4 @@ SELECT
     count(_CAST(NULL, 'Nullable(Nothing)')),
     round(avg(_CAST(NULL, 'Nullable(Nothing)'))) AS k
 FROM numbers(256)
-    SETTINGS enable_analyzer = 1;
+    SETTINGS allow_experimental_analyzer = 1;
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
index 8c6aa70f14c..f857358a5ea 100755
--- a/tests/queries/0_stateless/03001_backup_matview_after_modify_query.sh
+++ b/tests/queries/0_stateless/03001_backup_matview_after_modify_query.sh
@@ -9,7 +9,7 @@ db="$CLICKHOUSE_DATABASE"
 db_2="${db}_2"
 backup_name="${db}_backup"
 
-${CLICKHOUSE_CLIENT} "
+${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;
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
index 96cbd391a44..2ec5832fac6 100755
--- a/tests/queries/0_stateless/03001_matview_columns_after_modify_query.sh
+++ b/tests/queries/0_stateless/03001_matview_columns_after_modify_query.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} "
+${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;
diff --git a/tests/queries/0_stateless/03001_restore_from_old_backup_with_matview_inner_table_metadata.sh b/tests/queries/0_stateless/03001_restore_from_old_backup_with_matview_inner_table_metadata.sh
index 2c70cb1e3be..8d987dbf1df 100755
--- a/tests/queries/0_stateless/03001_restore_from_old_backup_with_matview_inner_table_metadata.sh
+++ b/tests/queries/0_stateless/03001_restore_from_old_backup_with_matview_inner_table_metadata.sh
@@ -5,8 +5,29 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-# In this test we restore from "/tests/queries/0_stateless/backups/old_backup_with_matview_inner_table_metadata.zip"
-backup_name="$($CURDIR/helpers/install_predefined_backup.sh old_backup_with_matview_inner_table_metadata.zip)"
+# Copies a test predefined backup from "/tests/queries/0_stateless/backups/" folder to the "backups" disk,
+# returns the path to the backup relative to that disk.
+function install_test_backup()
+{
+    local test_backup_filename="$1"
+    local test_backup_path="$CURDIR/backups/${test_backup_filename}"
+
+    local backups_disk_root
+    backups_disk_root=$($CLICKHOUSE_CLIENT --query "SELECT path FROM system.disks WHERE name='backups'")
+
+    if [ -z "${backups_disk_root}" ]; then
+        echo "Disk '${backups_disk_root}' not found"
+        exit 1
+    fi
+
+    local install_path=${backups_disk_root}/${CLICKHOUSE_DATABASE}/${test_backup_filename}
+    mkdir -p "$(dirname "${install_path}")"
+    ln -s "${test_backup_path}" "${install_path}"
+
+    echo "${CLICKHOUSE_DATABASE}/${test_backup_filename}"
+}
+
+backup_name="$(install_test_backup old_backup_with_matview_inner_table_metadata.zip)"
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS mv"
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS src"
diff --git a/tests/queries/0_stateless/03002_analyzer_prewhere.sql b/tests/queries/0_stateless/03002_analyzer_prewhere.sql
index 976e7cab73d..0edf16f1cbe 100644
--- a/tests/queries/0_stateless/03002_analyzer_prewhere.sql
+++ b/tests/queries/0_stateless/03002_analyzer_prewhere.sql
@@ -1,4 +1,4 @@
-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, enable_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;
+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;
 
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
index 6714a069246..8ccc3cf61da 100644
--- 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
@@ -1,5 +1,3 @@
--- Tags: long
-SET max_rows_to_read = 0;
 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;
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
deleted file mode 100644
index b19d389d8d0..00000000000
--- a/tests/queries/0_stateless/03002_part_log_rmt_fetch_merge_error.reference
+++ /dev/null
@@ -1,10 +0,0 @@
-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.sh b/tests/queries/0_stateless/03002_part_log_rmt_fetch_merge_error.sh
deleted file mode 100755
index b3aba430003..00000000000
--- a/tests/queries/0_stateless/03002_part_log_rmt_fetch_merge_error.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-replicated-database, no-shared-merge-tree, no-fasttest
-# SMT: The merge process is completely different from RMT
-# no-fasttest: Avoid long waits
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-set -e
-
-function wait_until()
-{
-    local q=$1 && shift
-    while [ "$($CLICKHOUSE_CLIENT -m -q "$q")" != "1" ]; do
-        sleep 0.5
-    done
-}
-
-$CLICKHOUSE_CLIENT -m -q "
-    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, old_parts_lifetime=600;
-    -- 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, old_parts_lifetime=600;
-
-    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;
-"
-
-$CLICKHOUSE_CLIENT -m -q "
-    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;
-"
-# wait until rmt_slave will fetch the part and reflect this error in system.part_log
-wait_until "select count()>0 from system.part_log where table = 'rmt_slave' and database = '$CLICKHOUSE_DATABASE' and error > 0"
-$CLICKHOUSE_CLIENT -m -q "
-    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
deleted file mode 100644
index aac9e7527d1..00000000000
--- a/tests/queries/0_stateless/03002_part_log_rmt_fetch_mutate_error.reference
+++ /dev/null
@@ -1,10 +0,0 @@
-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.sh b/tests/queries/0_stateless/03002_part_log_rmt_fetch_mutate_error.sh
deleted file mode 100755
index c67db053401..00000000000
--- a/tests/queries/0_stateless/03002_part_log_rmt_fetch_mutate_error.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-replicated-database, no-shared-merge-tree, no-fasttest
-# SMT: The merge process is completely different from RMT
-# no-fasttest: Avoid long waits
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-# shellcheck source=./mergetree_mutations.lib
-. "$CUR_DIR"/mergetree_mutations.lib
-
-set -e
-
-function wait_until()
-{
-    local q=$1 && shift
-    while [ "$($CLICKHOUSE_CLIENT -m -q "$q")" != "1" ]; do
-        sleep 0.5
-    done
-}
-
-$CLICKHOUSE_CLIENT -m -q "
-    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, old_parts_lifetime=600;
-    -- 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, old_parts_lifetime=600;
-
-    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
-wait_for_mutation rmt_master 0000000000
-$CLICKHOUSE_CLIENT -m -q "system start pulling replication log rmt_slave"
-# and wait until rmt_slave to fetch the part and reflect this error in system.part_log
-wait_until "select count()>0 from system.part_log where table = 'rmt_slave' and database = '$CLICKHOUSE_DATABASE' and error > 0"
-$CLICKHOUSE_CLIENT -m -q "
-    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;
-"
-wait_for_mutation rmt_slave 0000000000
-$CLICKHOUSE_CLIENT -m -q "
-    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/03003_analyzer_setting.sql b/tests/queries/0_stateless/03003_analyzer_setting.sql
index 3dbdaed4ad0..2e5cab71277 100644
--- a/tests/queries/0_stateless/03003_analyzer_setting.sql
+++ b/tests/queries/0_stateless/03003_analyzer_setting.sql
@@ -1,9 +1,9 @@
 CREATE TABLE test (dummy Int8) ENGINE = Distributed(test_cluster_two_shards, 'system', 'one');
 
-SET enable_analyzer = 0;
+SET allow_experimental_analyzer = 0;
 
-SELECT * FROM (SELECT * FROM test SETTINGS enable_analyzer = 1); -- { serverError INCORRECT_QUERY }
+SELECT * FROM (SELECT * FROM test SETTINGS allow_experimental_analyzer = 1); -- { serverError INCORRECT_QUERY }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
-SELECT * FROM (SELECT * FROM test SETTINGS enable_analyzer = 0); -- { serverError INCORRECT_QUERY }
+SELECT * FROM (SELECT * FROM test SETTINGS allow_experimental_analyzer = 0); -- { serverError INCORRECT_QUERY }
diff --git a/tests/queries/0_stateless/03003_functions_to_subcolumns_final.sql b/tests/queries/0_stateless/03003_functions_to_subcolumns_final.sql
index b2ca478daa4..3fe29139c5f 100644
--- a/tests/queries/0_stateless/03003_functions_to_subcolumns_final.sql
+++ b/tests/queries/0_stateless/03003_functions_to_subcolumns_final.sql
@@ -2,7 +2,7 @@ DROP TABLE IF EXISTS t_length_1;
 DROP TABLE IF EXISTS t_length_2;
 
 SET optimize_functions_to_subcolumns = 1;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET optimize_on_insert = 0;
 
 CREATE TABLE t_length_1 (id UInt64, arr Array(UInt64)) ENGINE = ReplacingMergeTree ORDER BY id;
diff --git a/tests/queries/0_stateless/03005_input_function_in_join.sql b/tests/queries/0_stateless/03005_input_function_in_join.sql
index a6fc27cd8d0..8a6b4a48a8d 100644
--- a/tests/queries/0_stateless/03005_input_function_in_join.sql
+++ b/tests/queries/0_stateless/03005_input_function_in_join.sql
@@ -8,7 +8,7 @@ SELECT x.number FROM (
 ) 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_correct_revoke_for_partial_rights.sh b/tests/queries/0_stateless/03006_correct_revoke_for_partial_rights.sh
index 312fb03668c..8c79dfdbafc 100755
--- a/tests/queries/0_stateless/03006_correct_revoke_for_partial_rights.sh
+++ b/tests/queries/0_stateless/03006_correct_revoke_for_partial_rights.sh
@@ -8,7 +8,7 @@ db=${CLICKHOUSE_DATABASE}
 user1="user1_03006_${db}_$RANDOM"
 user2="user2_03006_${db}_$RANDOM"
 
-${CLICKHOUSE_CLIENT} <<EOF
+${CLICKHOUSE_CLIENT} --multiquery <<EOF
 DROP DATABASE IF EXISTS $db;
 CREATE DATABASE $db;
 CREATE USER $user1, $user2;
diff --git a/tests/queries/0_stateless/03006_join_on_inequal_expression_2.sql.j2 b/tests/queries/0_stateless/03006_join_on_inequal_expression_2.sql.j2
index a09dc18739f..f15fced161c 100644
--- a/tests/queries/0_stateless/03006_join_on_inequal_expression_2.sql.j2
+++ b/tests/queries/0_stateless/03006_join_on_inequal_expression_2.sql.j2
@@ -18,7 +18,7 @@ INSERT INTO t1 (key, a, attr) VALUES (1, 10, 'alpha'), (2, 15, 'beta'), (3, 20,
 INSERT INTO t2 (key, a, attr) VALUES (1, 5, 'ALPHA'), (2, 10, 'beta'), (4, 25, 'delta');
 
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SET allow_experimental_join_condition=1;
 SET join_use_nulls=0;
 -- { echoOn }
diff --git a/tests/queries/0_stateless/03006_join_on_inequal_expression_3.sql.j2 b/tests/queries/0_stateless/03006_join_on_inequal_expression_3.sql.j2
index 009ae10e4ff..a97153ce3aa 100644
--- a/tests/queries/0_stateless/03006_join_on_inequal_expression_3.sql.j2
+++ b/tests/queries/0_stateless/03006_join_on_inequal_expression_3.sql.j2
@@ -18,7 +18,7 @@ INSERT INTO t1 (key, a, attr) VALUES (1, 10, 'alpha'), (2, 15, 'beta'), (3, 20,
 INSERT INTO t2 (key, a, attr) VALUES (1, 5, 'ALPHA'), (2, 10, 'beta'), (4, 25, 'delta');
 
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SET allow_experimental_join_condition=1;
 SET join_use_nulls=0;
 -- { echoOn }
diff --git a/tests/queries/0_stateless/03006_join_on_inequal_expression_4.sql.j2 b/tests/queries/0_stateless/03006_join_on_inequal_expression_4.sql.j2
index 37eaaa8ab5c..3235019821b 100644
--- a/tests/queries/0_stateless/03006_join_on_inequal_expression_4.sql.j2
+++ b/tests/queries/0_stateless/03006_join_on_inequal_expression_4.sql.j2
@@ -15,7 +15,7 @@ CREATE TABLE t2 (
 INSERT INTO t1 (key, a) VALUES (1, 10), (2, 15), (3, 20);
 INSERT INTO t2 (key, a) VALUES (1, 5), (2, 10), (4, 25);
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SET allow_experimental_join_condition=1;
 SET join_algorithm='hash';
 -- { echoOn }
diff --git a/tests/queries/0_stateless/03006_join_on_inequal_expression_fast.reference b/tests/queries/0_stateless/03006_join_on_inequal_expression_fast.reference
index a70e70ef7e9..46f24f73356 100644
--- a/tests/queries/0_stateless/03006_join_on_inequal_expression_fast.reference
+++ b/tests/queries/0_stateless/03006_join_on_inequal_expression_fast.reference
@@ -382,253 +382,6 @@ key1	e	5	5	5	key1	C	3	4	5
 key2	a2	1	1	1			0	0	\N
 key4	f	2	3	4	key4	F	1	1	1
 SET join_algorithm='hash';
-SELECT t1.*, t2.* FROM t1 LEFT ANY JOIN t2 ON (t1.a < t2.a OR lower(t1.attr) == lower(t2.attr)) AND t1.key = t2.key ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	A	1	2	1
-key1	b	2	3	2	key1	B	2	1	2
-key1	c	3	2	1	key1	C	3	4	5
-key1	d	4	7	2	key1	D	4	1	6
-key1	e	5	5	5			0	0	\N
-key2	a2	1	1	1			0	0	\N
-key4	f	2	3	4	key4	F	1	1	1
-SELECT t1.*, t2.* from t1 LEFT ANY  JOIN t2 ON t1.key = t2.key and (t1.b + t2.b == t1.c + t2.c) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	A	1	2	1
-key1	b	2	3	2	key1	B	2	1	2
-key1	c	3	2	1	key1	B	2	1	2
-key1	d	4	7	2	key1	D	4	1	6
-key1	e	5	5	5			0	0	\N
-key2	a2	1	1	1			0	0	\N
-key4	f	2	3	4			0	0	\N
-SELECT t1.*, t2.* from t1 LEFT ANY  JOIN t2 ON t1.key = t2.key and (t1.a < t2.a) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	B	2	1	2
-key1	b	2	3	2	key1	C	3	4	5
-key1	c	3	2	1	key1	D	4	1	6
-key1	d	4	7	2			0	0	\N
-key1	e	5	5	5			0	0	\N
-key2	a2	1	1	1			0	0	\N
-key4	f	2	3	4			0	0	\N
-SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 LEFT ANY JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0);
-1	1	1	1	1	1
-SELECT t1.*, t2.* FROM t1 LEFT SEMI JOIN t2 ON (t1.a < t2.a OR lower(t1.attr) == lower(t2.attr)) AND t1.key = t2.key ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	A	1	2	1
-key1	b	2	3	2	key1	B	2	1	2
-key1	c	3	2	1	key1	C	3	4	5
-key1	d	4	7	2	key1	D	4	1	6
-key4	f	2	3	4	key4	F	1	1	1
-SELECT t1.*, t2.* from t1 LEFT SEMI  JOIN t2 ON t1.key = t2.key and (t1.b + t2.b == t1.c + t2.c) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	A	1	2	1
-key1	b	2	3	2	key1	B	2	1	2
-key1	c	3	2	1	key1	B	2	1	2
-key1	d	4	7	2	key1	D	4	1	6
-SELECT t1.*, t2.* from t1 LEFT SEMI  JOIN t2 ON t1.key = t2.key and (t1.a < t2.a) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	B	2	1	2
-key1	b	2	3	2	key1	C	3	4	5
-key1	c	3	2	1	key1	D	4	1	6
-SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 LEFT SEMI JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0);
-1	1	1	1	1	1
-SELECT t1.*, t2.* FROM t1 LEFT ANTI JOIN t2 ON (t1.a < t2.a OR lower(t1.attr) == lower(t2.attr)) AND t1.key = t2.key ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	e	5	5	5	key1		0	0	\N
-key2	a2	1	1	1	key2		0	0	\N
-SELECT t1.*, t2.* from t1 LEFT ANTI  JOIN t2 ON t1.key = t2.key and (t1.b + t2.b == t1.c + t2.c) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	e	5	5	5	key1		0	0	\N
-key2	a2	1	1	1	key2		0	0	\N
-key4	f	2	3	4	key4		0	0	\N
-SELECT t1.*, t2.* from t1 LEFT ANTI  JOIN t2 ON t1.key = t2.key and (t1.a < t2.a) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	d	4	7	2	key1		0	0	\N
-key1	e	5	5	5	key1		0	0	\N
-key2	a2	1	1	1	key2		0	0	\N
-key4	f	2	3	4	key4		0	0	\N
-SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 LEFT ANTI JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0);
-SELECT t1.*, t2.* FROM t1 RIGHT ANY JOIN t2 ON (t1.a < t2.a OR lower(t1.attr) == lower(t2.attr)) AND t1.key = t2.key ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-		0	0	\N	key3	a3	1	1	1
-key1	a	1	1	2	key1	A	1	2	1
-key1	a	1	1	2	key1	B	2	1	2
-key1	a	1	1	2	key1	C	3	4	5
-key1	a	1	1	2	key1	D	4	1	6
-key4	f	2	3	4	key4	F	1	1	1
-SELECT t1.*, t2.* from t1 RIGHT ANY  JOIN t2 ON t1.key = t2.key and (t1.b + t2.b == t1.c + t2.c) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-		0	0	\N	key3	a3	1	1	1
-		0	0	\N	key4	F	1	1	1
-key1	a	1	1	2	key1	A	1	2	1
-key1	b	2	3	2	key1	B	2	1	2
-key1	b	2	3	2	key1	C	3	4	5
-key1	d	4	7	2	key1	D	4	1	6
-SELECT t1.*, t2.* from t1 RIGHT ANY  JOIN t2 ON t1.key = t2.key and (t1.a < t2.a) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-		0	0	\N	key1	A	1	2	1
-		0	0	\N	key3	a3	1	1	1
-		0	0	\N	key4	F	1	1	1
-key1	a	1	1	2	key1	B	2	1	2
-key1	a	1	1	2	key1	C	3	4	5
-key1	a	1	1	2	key1	D	4	1	6
-SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 RIGHT ANY JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0);
-1	1	1	1	1	1
-SELECT t1.*, t2.* FROM t1 RIGHT SEMI JOIN t2 ON (t1.a < t2.a OR lower(t1.attr) == lower(t2.attr)) AND t1.key = t2.key ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	A	1	2	1
-key1	a	1	1	2	key1	B	2	1	2
-key1	a	1	1	2	key1	C	3	4	5
-key1	a	1	1	2	key1	D	4	1	6
-key4	f	2	3	4	key4	F	1	1	1
-SELECT t1.*, t2.* from t1 RIGHT SEMI  JOIN t2 ON t1.key = t2.key and (t1.b + t2.b == t1.c + t2.c) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	A	1	2	1
-key1	b	2	3	2	key1	B	2	1	2
-key1	b	2	3	2	key1	C	3	4	5
-key1	d	4	7	2	key1	D	4	1	6
-SELECT t1.*, t2.* from t1 RIGHT SEMI  JOIN t2 ON t1.key = t2.key and (t1.a < t2.a) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	B	2	1	2
-key1	a	1	1	2	key1	C	3	4	5
-key1	a	1	1	2	key1	D	4	1	6
-SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 RIGHT SEMI JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0);
-1	1	1	1	1	1
-SELECT t1.*, t2.* FROM t1 RIGHT ANTI JOIN t2 ON (t1.a < t2.a OR lower(t1.attr) == lower(t2.attr)) AND t1.key = t2.key ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-		0	0	\N	key3	a3	1	1	1
-SELECT t1.*, t2.* from t1 RIGHT ANTI  JOIN t2 ON t1.key = t2.key and (t1.b + t2.b == t1.c + t2.c) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-		0	0	\N	key3	a3	1	1	1
-		0	0	\N	key4	F	1	1	1
-SELECT t1.*, t2.* from t1 RIGHT ANTI  JOIN t2 ON t1.key = t2.key and (t1.a < t2.a) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-		0	0	\N	key1	A	1	2	1
-		0	0	\N	key3	a3	1	1	1
-		0	0	\N	key4	F	1	1	1
-SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 RIGHT ANTI JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0);
-SET join_algorithm='grace_hash';
-SELECT t1.*, t2.* FROM t1 LEFT ANY JOIN t2 ON (t1.a < t2.a OR lower(t1.attr) == lower(t2.attr)) AND t1.key = t2.key ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	A	1	2	1
-key1	b	2	3	2	key1	B	2	1	2
-key1	c	3	2	1	key1	C	3	4	5
-key1	d	4	7	2	key1	D	4	1	6
-key1	e	5	5	5			0	0	\N
-key2	a2	1	1	1			0	0	\N
-key4	f	2	3	4	key4	F	1	1	1
-SELECT t1.*, t2.* from t1 LEFT ANY  JOIN t2 ON t1.key = t2.key and (t1.b + t2.b == t1.c + t2.c) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	A	1	2	1
-key1	b	2	3	2	key1	B	2	1	2
-key1	c	3	2	1	key1	B	2	1	2
-key1	d	4	7	2	key1	D	4	1	6
-key1	e	5	5	5			0	0	\N
-key2	a2	1	1	1			0	0	\N
-key4	f	2	3	4			0	0	\N
-SELECT t1.*, t2.* from t1 LEFT ANY  JOIN t2 ON t1.key = t2.key and (t1.a < t2.a) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	B	2	1	2
-key1	b	2	3	2	key1	C	3	4	5
-key1	c	3	2	1	key1	D	4	1	6
-key1	d	4	7	2			0	0	\N
-key1	e	5	5	5			0	0	\N
-key2	a2	1	1	1			0	0	\N
-key4	f	2	3	4			0	0	\N
-SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 LEFT ANY JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0);
-1	1	1	1	1	1
-SELECT t1.*, t2.* FROM t1 LEFT SEMI JOIN t2 ON (t1.a < t2.a OR lower(t1.attr) == lower(t2.attr)) AND t1.key = t2.key ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	A	1	2	1
-key1	b	2	3	2	key1	B	2	1	2
-key1	c	3	2	1	key1	C	3	4	5
-key1	d	4	7	2	key1	D	4	1	6
-key4	f	2	3	4	key4	F	1	1	1
-SELECT t1.*, t2.* from t1 LEFT SEMI  JOIN t2 ON t1.key = t2.key and (t1.b + t2.b == t1.c + t2.c) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	A	1	2	1
-key1	b	2	3	2	key1	B	2	1	2
-key1	c	3	2	1	key1	B	2	1	2
-key1	d	4	7	2	key1	D	4	1	6
-SELECT t1.*, t2.* from t1 LEFT SEMI  JOIN t2 ON t1.key = t2.key and (t1.a < t2.a) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	B	2	1	2
-key1	b	2	3	2	key1	C	3	4	5
-key1	c	3	2	1	key1	D	4	1	6
-SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 LEFT SEMI JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0);
-1	1	1	1	1	1
-SELECT t1.*, t2.* FROM t1 LEFT ANTI JOIN t2 ON (t1.a < t2.a OR lower(t1.attr) == lower(t2.attr)) AND t1.key = t2.key ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	e	5	5	5	key1		0	0	\N
-key2	a2	1	1	1	key2		0	0	\N
-SELECT t1.*, t2.* from t1 LEFT ANTI  JOIN t2 ON t1.key = t2.key and (t1.b + t2.b == t1.c + t2.c) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	e	5	5	5	key1		0	0	\N
-key2	a2	1	1	1	key2		0	0	\N
-key4	f	2	3	4	key4		0	0	\N
-SELECT t1.*, t2.* from t1 LEFT ANTI  JOIN t2 ON t1.key = t2.key and (t1.a < t2.a) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	d	4	7	2	key1		0	0	\N
-key1	e	5	5	5	key1		0	0	\N
-key2	a2	1	1	1	key2		0	0	\N
-key4	f	2	3	4	key4		0	0	\N
-SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 LEFT ANTI JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0);
-SELECT t1.*, t2.* FROM t1 RIGHT ANY JOIN t2 ON (t1.a < t2.a OR lower(t1.attr) == lower(t2.attr)) AND t1.key = t2.key ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-		0	0	\N	key3	a3	1	1	1
-key1	a	1	1	2	key1	A	1	2	1
-key1	a	1	1	2	key1	B	2	1	2
-key1	a	1	1	2	key1	C	3	4	5
-key1	a	1	1	2	key1	D	4	1	6
-key4	f	2	3	4	key4	F	1	1	1
-SELECT t1.*, t2.* from t1 RIGHT ANY  JOIN t2 ON t1.key = t2.key and (t1.b + t2.b == t1.c + t2.c) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-		0	0	\N	key3	a3	1	1	1
-		0	0	\N	key4	F	1	1	1
-key1	a	1	1	2	key1	A	1	2	1
-key1	b	2	3	2	key1	B	2	1	2
-key1	b	2	3	2	key1	C	3	4	5
-key1	d	4	7	2	key1	D	4	1	6
-SELECT t1.*, t2.* from t1 RIGHT ANY  JOIN t2 ON t1.key = t2.key and (t1.a < t2.a) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-		0	0	\N	key1	A	1	2	1
-		0	0	\N	key3	a3	1	1	1
-		0	0	\N	key4	F	1	1	1
-key1	a	1	1	2	key1	B	2	1	2
-key1	a	1	1	2	key1	C	3	4	5
-key1	a	1	1	2	key1	D	4	1	6
-SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 RIGHT ANY JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0);
-1	1	1	1	1	1
-SELECT t1.*, t2.* FROM t1 RIGHT SEMI JOIN t2 ON (t1.a < t2.a OR lower(t1.attr) == lower(t2.attr)) AND t1.key = t2.key ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	A	1	2	1
-key1	a	1	1	2	key1	B	2	1	2
-key1	a	1	1	2	key1	C	3	4	5
-key1	a	1	1	2	key1	D	4	1	6
-key4	f	2	3	4	key4	F	1	1	1
-SELECT t1.*, t2.* from t1 RIGHT SEMI  JOIN t2 ON t1.key = t2.key and (t1.b + t2.b == t1.c + t2.c) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	A	1	2	1
-key1	b	2	3	2	key1	B	2	1	2
-key1	b	2	3	2	key1	C	3	4	5
-key1	d	4	7	2	key1	D	4	1	6
-SELECT t1.*, t2.* from t1 RIGHT SEMI  JOIN t2 ON t1.key = t2.key and (t1.a < t2.a) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	B	2	1	2
-key1	a	1	1	2	key1	C	3	4	5
-key1	a	1	1	2	key1	D	4	1	6
-SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 RIGHT SEMI JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0);
-1	1	1	1	1	1
-SELECT t1.*, t2.* FROM t1 RIGHT ANTI JOIN t2 ON (t1.a < t2.a OR lower(t1.attr) == lower(t2.attr)) AND t1.key = t2.key ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-		0	0	\N	key3	a3	1	1	1
-SELECT t1.*, t2.* from t1 RIGHT ANTI  JOIN t2 ON t1.key = t2.key and (t1.b + t2.b == t1.c + t2.c) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-		0	0	\N	key3	a3	1	1	1
-		0	0	\N	key4	F	1	1	1
-SELECT t1.*, t2.* from t1 RIGHT ANTI  JOIN t2 ON t1.key = t2.key and (t1.a < t2.a) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-		0	0	\N	key1	A	1	2	1
-		0	0	\N	key3	a3	1	1	1
-		0	0	\N	key4	F	1	1	1
-SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 RIGHT ANTI JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0);
-SET join_algorithm='hash';
-SELECT t1.* FROM t1 LEFT ANY JOIN t2 ON t1.key = t2.key AND t1.a < t2.a OR t1.a = t2.a ORDER BY ALL;
-key1	a	1	1	2
-key1	b	2	3	2
-key1	c	3	2	1
-key1	d	4	7	2
-key1	e	5	5	5
-key2	a2	1	1	1
-key4	f	2	3	4
-SELECT t1.* FROM t1 LEFT SEMI JOIN t2 ON t1.key = t2.key AND t1.a < t2.a OR t1.a = t2.a ORDER BY ALL;
-key1	a	1	1	2
-key1	b	2	3	2
-key1	c	3	2	1
-key1	d	4	7	2
-key2	a2	1	1	1
-key4	f	2	3	4
-SELECT t1.* FROM t1 LEFT ANTI JOIN t2 ON t1.key = t2.key AND t1.a < t2.a OR t1.a = t2.a ORDER BY ALL;
-key1	e	5	5	5
-SELECT t1.* FROM t1 RIGHT ANY JOIN t2 ON t1.key = t2.key AND t1.a < t2.a OR t1.a = t2.a ORDER BY ALL;
-key1	a	1	1	2
-key1	a	1	1	2
-key1	a	1	1	2
-key1	a	1	1	2
-key1	a	1	1	2
-key1	a	1	1	2
-SELECT t1.* FROM t1 RIGHT SEMI JOIN t2 ON t1.key = t2.key AND t1.a < t2.a OR t1.a = t2.a ORDER BY ALL;
-key1	a	1	1	2
-key1	a	1	1	2
-key1	a	1	1	2
-key1	a	1	1	2
-key1	a	1	1	2
-key1	a	1	1	2
-SELECT t1.* FROM t1 RIGHT ANTI JOIN t2 ON t1.key = t2.key AND t1.a < t2.a OR t1.a = t2.a ORDER BY ALL;
-SET join_algorithm='hash';
 SELECT t1.*, t2.* FROM t1 LEFT JOIN t2 ON t1.key = t2.key AND t1.a < t2.a OR t1.a = t2.a ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
 key1	a	1	1	2	key1	A	1	2	1
 key1	a	1	1	2	key1	B	2	1	2
@@ -699,46 +452,3 @@ key2	a2	1	1	1	key1	A	1	2	1
 key2	a2	1	1	1	key3	a3	1	1	1
 key2	a2	1	1	1	key4	F	1	1	1
 key4	f	2	3	4	key1	B	2	1	2
-SET join_algorithm='hash';
-SELECT t1.*, t2.* FROM t1 INNER ANY JOIN t2 ON (t1.a < t2.a OR lower(t1.attr) == lower(t2.attr)) AND t1.key = t2.key ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	A	1	2	1
-key1	b	2	3	2	key1	B	2	1	2
-key1	c	3	2	1	key1	C	3	4	5
-key1	d	4	7	2	key1	D	4	1	6
-key4	f	2	3	4	key4	F	1	1	1
-SELECT t1.*, t2.* from t1 INNER ANY  JOIN t2 ON t1.key = t2.key and (t1.b + t2.b == t1.c + t2.c) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	A	1	2	1
-key1	b	2	3	2	key1	B	2	1	2
-key1	c	3	2	1	key1	B	2	1	2
-key1	d	4	7	2	key1	D	4	1	6
-SELECT t1.*, t2.* from t1 INNER ANY  JOIN t2 ON t1.key = t2.key and (t1.a < t2.a) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	B	2	1	2
-key1	b	2	3	2	key1	C	3	4	5
-key1	c	3	2	1	key1	D	4	1	6
-SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 INNER ANY JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0);
-1	1	1	1	1	1
-SET join_algorithm='grace_hash';
-SELECT t1.*, t2.* FROM t1 INNER ANY JOIN t2 ON (t1.a < t2.a OR lower(t1.attr) == lower(t2.attr)) AND t1.key = t2.key ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	A	1	2	1
-key1	b	2	3	2	key1	B	2	1	2
-key1	c	3	2	1	key1	C	3	4	5
-key1	d	4	7	2	key1	D	4	1	6
-key4	f	2	3	4	key4	F	1	1	1
-SELECT t1.*, t2.* from t1 INNER ANY  JOIN t2 ON t1.key = t2.key and (t1.b + t2.b == t1.c + t2.c) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	A	1	2	1
-key1	b	2	3	2	key1	B	2	1	2
-key1	c	3	2	1	key1	B	2	1	2
-key1	d	4	7	2	key1	D	4	1	6
-SELECT t1.*, t2.* from t1 INNER ANY  JOIN t2 ON t1.key = t2.key and (t1.a < t2.a) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-key1	a	1	1	2	key1	B	2	1	2
-key1	b	2	3	2	key1	C	3	4	5
-key1	c	3	2	1	key1	D	4	1	6
-SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 INNER ANY JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0);
-1	1	1	1	1	1
-SET join_algorithm='hash';
-SELECT t1.* FROM t1 INNER ANY JOIN t2 ON t1.key = t2.key AND t1.a < t2.a OR t1.a = t2.a ORDER BY ALL;
-key1	a	1	1	2
-key1	b	2	3	2
-key1	c	3	2	1
-key1	d	4	7	2
-key2	a2	1	1	1
diff --git a/tests/queries/0_stateless/03006_join_on_inequal_expression_fast.sql.j2 b/tests/queries/0_stateless/03006_join_on_inequal_expression_fast.sql.j2
index b300881c562..a363101ca69 100644
--- a/tests/queries/0_stateless/03006_join_on_inequal_expression_fast.sql.j2
+++ b/tests/queries/0_stateless/03006_join_on_inequal_expression_fast.sql.j2
@@ -6,7 +6,7 @@ INSERT INTO t1 VALUES ('key1', 'a', 1, 1, 2), ('key1', 'b', 2, 3, 2), ('key1', '
 CREATE TABLE t2 (key String, attr String, a UInt64, b UInt64, c Nullable(UInt64)) ENGINE = MergeTree ORDER BY key;
 INSERT INTO t2 VALUES ('key1', 'A', 1, 2, 1), ('key1', 'B', 2, 1, 2), ('key1', 'C', 3, 4, 5), ('key1', 'D', 4, 1, 6), ('key3', 'a3', 1, 1, 1), ('key4', 'F', 1,1,1);
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SET allow_experimental_join_condition=1;
 SET join_use_nulls=0;
 -- { echoOn }
@@ -22,26 +22,6 @@ SELECT t1.*, t2.* FROM t1 {{ join_type }} JOIN t2 ON t1.key = t2.key AND (t1.a=2
 {% endfor -%}
 {% endfor -%}
 
-{% for algorithm in ['hash', 'grace_hash'] -%}
-SET join_algorithm='{{ algorithm }}';
-{% for join_type in ['LEFT', 'RIGHT'] -%}
-{% for join_strictness in ['ANY', 'SEMI', 'ANTI'] -%}
-SELECT t1.*, t2.* FROM t1 {{ join_type }} {{ join_strictness }} JOIN t2 ON (t1.a < t2.a OR lower(t1.attr) == lower(t2.attr)) AND t1.key = t2.key ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-SELECT t1.*, t2.* from t1 {{ join_type }} {{ join_strictness }}  JOIN t2 ON t1.key = t2.key and (t1.b + t2.b == t1.c + t2.c) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-SELECT t1.*, t2.* from t1 {{ join_type }} {{ join_strictness }}  JOIN t2 ON t1.key = t2.key and (t1.a < t2.a) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 {{ join_type }} {{ join_strictness }} JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0);
-{% endfor -%}
-{% endfor -%}
-{% endfor -%}
-
-{% for algorithm in ['hash'] -%}
-SET join_algorithm='{{ algorithm }}';
-{% for join_type in ['LEFT', 'RIGHT'] -%}
-{% for join_strictness in ['ANY', 'SEMI', 'ANTI'] -%}
-SELECT t1.* FROM t1 {{ join_type }} {{ join_strictness }} JOIN t2 ON t1.key = t2.key AND t1.a < t2.a OR t1.a = t2.a ORDER BY ALL;
-{% endfor -%}
-{% endfor -%}
-{% endfor -%}
 
 {% for algorithm in ['hash'] -%}
 SET join_algorithm='{{ algorithm }}';
@@ -49,28 +29,6 @@ SET join_algorithm='{{ algorithm }}';
 SELECT t1.*, t2.* FROM t1 {{ join_type }} JOIN t2 ON t1.key = t2.key AND t1.a < t2.a OR t1.a = t2.a ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
 {% endfor -%}
 {% endfor -%}
-
-{% for algorithm in ['hash', 'grace_hash'] -%}
-SET join_algorithm='{{ algorithm }}';
-{% for join_type in ['INNER'] -%}
-{% for join_strictness in ['ANY'] -%}
-SELECT t1.*, t2.* FROM t1 {{ join_type }} {{ join_strictness }} JOIN t2 ON (t1.a < t2.a OR lower(t1.attr) == lower(t2.attr)) AND t1.key = t2.key ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-SELECT t1.*, t2.* from t1 {{ join_type }} {{ join_strictness }}  JOIN t2 ON t1.key = t2.key and (t1.b + t2.b == t1.c + t2.c) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-SELECT t1.*, t2.* from t1 {{ join_type }} {{ join_strictness }}  JOIN t2 ON t1.key = t2.key and (t1.a < t2.a) ORDER BY (t1.key, t1.attr, t2.key, t2.attr);
-SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 {{ join_type }} {{ join_strictness }} JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0);
-{% endfor -%}
-{% endfor -%}
-{% endfor -%}
-
-{% for algorithm in ['hash'] -%}
-SET join_algorithm='{{ algorithm }}';
-{% for join_type in ['INNER'] -%}
-{% for join_strictness in ['ANY'] -%}
-SELECT t1.* FROM t1 {{ join_type }} {{ join_strictness }} JOIN t2 ON t1.key = t2.key AND t1.a < t2.a OR t1.a = t2.a ORDER BY ALL;
-{% endfor -%}
-{% endfor -%}
-{% endfor -%}
-
 -- { echoOff }
 
 -- test error messages
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
index 7c8d6dd9aff..df4ec9d26a3 100644
--- 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
@@ -20,7 +20,7 @@ ORDER BY n
 AS SELECT *
 FROM numbers(10);
 
-SET enable_analyzer = 1;
+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
diff --git a/tests/queries/0_stateless/03006_parallel_replicas_prewhere.reference b/tests/queries/0_stateless/03006_parallel_replicas_prewhere.reference
index 8b8d0e5d565..e69de29bb2d 100644
--- a/tests/queries/0_stateless/03006_parallel_replicas_prewhere.reference
+++ b/tests/queries/0_stateless/03006_parallel_replicas_prewhere.reference
@@ -1 +0,0 @@
-default	url_na_log	1	130000	130
diff --git a/tests/queries/0_stateless/03006_parallel_replicas_prewhere.sql b/tests/queries/0_stateless/03006_parallel_replicas_prewhere.sql
index de43302690a..4b84646c034 100644
--- a/tests/queries/0_stateless/03006_parallel_replicas_prewhere.sql
+++ b/tests/queries/0_stateless/03006_parallel_replicas_prewhere.sql
@@ -21,21 +21,11 @@ SELECT
 FROM numbers(130000)
 SETTINGS max_insert_block_size = 200000;
 
-SET 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;
-
 EXPLAIN ESTIMATE
 SELECT count()
 FROM url_na_log
 PREWHERE (DateVisit >= toFixedString('2022-08-10', 10)) AND (DateVisit <= '2022-08-20')
-SETTINGS parallel_replicas_local_plan=0;
-
--- here parallel replicas uses local snapshot as working set
--- so, the estimation can be done
-EXPLAIN ESTIMATE
-SELECT count()
-FROM url_na_log
-PREWHERE (DateVisit >= toFixedString('2022-08-10', 10)) AND (DateVisit <= '2022-08-20')
-SETTINGS allow_experimental_analyzer=1, parallel_replicas_local_plan=1;
+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.sql b/tests/queries/0_stateless/03007_column_nullable_uninitialzed_value.sql
index 44f6642d2a5..9479044e0e0 100644
--- a/tests/queries/0_stateless/03007_column_nullable_uninitialzed_value.sql
+++ b/tests/queries/0_stateless/03007_column_nullable_uninitialzed_value.sql
@@ -1 +1 @@
-SELECT count(NULL) IGNORE NULLS > avg(toDecimal32(NULL)) IGNORE NULLS, count() FROM numbers(1000) WITH TOTALS SETTINGS enable_analyzer = 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_deduplication_random_setttings.sh b/tests/queries/0_stateless/03008_deduplication_random_setttings.sh
index 07b99eb4e99..e9f59138177 100755
--- a/tests/queries/0_stateless/03008_deduplication_random_setttings.sh
+++ b/tests/queries/0_stateless/03008_deduplication_random_setttings.sh
@@ -35,7 +35,7 @@ THIS_RUN+=" deduplicate_src_table=$deduplicate_src_table"
 THIS_RUN+=" deduplicate_dst_table=$deduplicate_dst_table"
 THIS_RUN+=" insert_unique_blocks=$insert_unique_blocks"
 
-$CLICKHOUSE_CLIENT --max_insert_block_size 1  -mq "
+$CLICKHOUSE_CLIENT --max_insert_block_size 1  -nmq "
     $(python3 $CURDIR/03008_deduplication.python insert_several_blocks_into_table \
         --insert-method $insert_method \
         --table-engine $engine \
@@ -48,7 +48,7 @@ $CLICKHOUSE_CLIENT --max_insert_block_size 1  -mq "
     )
 " 1>/dev/null 2>&1 && echo 'insert_several_blocks_into_table OK'  || echo "FAIL: insert_several_blocks_into_table ${THIS_RUN}"
 
-$CLICKHOUSE_CLIENT --max_insert_block_size 1  -mq "
+$CLICKHOUSE_CLIENT --max_insert_block_size 1  -nmq "
     $(python3 $CURDIR/03008_deduplication.python mv_generates_several_blocks \
         --insert-method $insert_method \
         --table-engine $engine \
@@ -61,7 +61,7 @@ $CLICKHOUSE_CLIENT --max_insert_block_size 1  -mq "
     )
 " 1>/dev/null 2>&1 && echo 'mv_generates_several_blocks OK'  || echo "FAIL: mv_generates_several_blocks ${THIS_RUN}"
 
-$CLICKHOUSE_CLIENT  --max_insert_block_size 1 -mq "
+$CLICKHOUSE_CLIENT  --max_insert_block_size 1 -nmq "
     $(python3 $CURDIR/03008_deduplication.python several_mv_into_one_table \
         --insert-method $insert_method \
         --table-engine $engine \
diff --git a/tests/queries/0_stateless/03008_local_plain_rewritable.sh b/tests/queries/0_stateless/03008_local_plain_rewritable.sh
index e61f9061297..d51e180efc9 100755
--- a/tests/queries/0_stateless/03008_local_plain_rewritable.sh
+++ b/tests/queries/0_stateless/03008_local_plain_rewritable.sh
@@ -8,7 +8,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 ${CLICKHOUSE_CLIENT} --query "drop table if exists 03008_test_local_mt sync"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 create table 03008_test_local_mt (a Int32, b Int64, c Int64)
 engine = MergeTree() partition by intDiv(a, 1000) order by tuple(a, b)
 settings disk = disk(
@@ -19,35 +19,35 @@ settings disk = disk(
     path = '/var/lib/clickhouse/disks/local_plain_rewritable/')
 "
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 insert into 03008_test_local_mt (*) values (1, 2, 0), (2, 2, 2), (3, 1, 9), (4, 7, 7), (5, 10, 2), (6, 12, 5);
 insert into 03008_test_local_mt (*) select number, number, number from numbers_mt(10000);
 "
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 select count(*) from 03008_test_local_mt;
 select (*) from 03008_test_local_mt order by tuple(a, b) limit 10;
 "
 
 ${CLICKHOUSE_CLIENT} --query "optimize table 03008_test_local_mt final;"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 alter table 03008_test_local_mt modify setting disk = '03008_local_plain_rewritable', old_parts_lifetime = 3600;
 select engine_full from system.tables WHERE database = currentDatabase() AND name = '03008_test_local_mt';
 " | grep -c "old_parts_lifetime = 3600"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 select count(*) from 03008_test_local_mt;
 select (*) from 03008_test_local_mt order by tuple(a, b) limit 10;
 "
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 alter table 03008_test_local_mt update c = 0 where a % 2 = 1;
 alter table 03008_test_local_mt add column d Int64 after c;
 alter table 03008_test_local_mt drop column c;
 " 2>&1 | grep -Fq "SUPPORT_IS_DISABLED"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 truncate table 03008_test_local_mt;
 select count(*) from 03008_test_local_mt;
 "
diff --git a/tests/queries/0_stateless/03008_s3_plain_rewritable.sh b/tests/queries/0_stateless/03008_s3_plain_rewritable.sh
index 8eea7940774..4d5989f6f12 100755
--- a/tests/queries/0_stateless/03008_s3_plain_rewritable.sh
+++ b/tests/queries/0_stateless/03008_s3_plain_rewritable.sh
@@ -46,12 +46,7 @@ ${CLICKHOUSE_CLIENT} --query "drop table if exists test_s3_mt_dst"
 
 ${CLICKHOUSE_CLIENT} -m --query "
 create table test_s3_mt_dst (a Int32, b Int64, c Int64) engine = MergeTree() partition by intDiv(a, 1000) order by tuple(a, b)
-settings disk = disk(
-    name = 03008_s3_plain_rewritable,
-    type = s3_plain_rewritable,
-    endpoint = 'http://localhost:11111/test/03008_test_s3_mt/',
-    access_key_id = clickhouse,
-    secret_access_key = clickhouse);
+settings disk = '03008_s3_plain_rewritable'
 "
 
 ${CLICKHOUSE_CLIENT} -m --query "
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
index 5ec6ee5a996..71a175faac8 100644
--- 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
@@ -1,11 +1,11 @@
 SET optimize_rewrite_sum_if_to_count_if = 1;
 
-SET enable_analyzer = 0;
+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 enable_analyzer = 1;
+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);
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
index 7b57dbd807d..b15593b2abd 100644
--- 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
@@ -1,4 +1,4 @@
-set enable_analyzer = 1;
+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;
@@ -8,3 +8,4 @@ SELECT materialize(3) from numbers(10) GROUP BY GROUPING SETS (('str'), (materia
 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_json_key_ignore_case.reference b/tests/queries/0_stateless/03013_json_key_ignore_case.reference
new file mode 100644
index 00000000000..54683d8fbc5
--- /dev/null
+++ b/tests/queries/0_stateless/03013_json_key_ignore_case.reference
@@ -0,0 +1,3 @@
+1	77328912	Ben
+2	77328913	Jim
+3	77328914	Bill
diff --git a/tests/queries/0_stateless/03013_json_key_ignore_case.sh b/tests/queries/0_stateless/03013_json_key_ignore_case.sh
new file mode 100755
index 00000000000..7882a29ae4f
--- /dev/null
+++ b/tests/queries/0_stateless/03013_json_key_ignore_case.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# NOTE: this sh wrapper is required because of shell_config
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+USER_FILES_PATH=$($CLICKHOUSE_CLIENT --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep -E '^Code: 107.*FILE_DOESNT_EXIST' | head -1 | awk '{gsub("/nonexist.txt","",$9); print $9}')
+
+cp "$CURDIR"/data_json/key_ignore_case.json $USER_FILES_PATH/
+
+$CLICKHOUSE_CLIENT -q "drop table if exists test_tbl"
+$CLICKHOUSE_CLIENT -q "create table test_tbl (id UInt16, reqid UInt32, name String) engine=MergeTree order by id"
+$CLICKHOUSE_CLIENT -q "INSERT INTO test_tbl SELECT * FROM file('key_ignore_case.json', 'JSONEachRow') SETTINGS input_format_json_case_insensitive_column_matching=true"
+$CLICKHOUSE_CLIENT -q "select * from test_tbl"
+$CLICKHOUSE_CLIENT -q "drop table test_tbl"
diff --git a/tests/queries/0_stateless/03014_analyzer_groupby_fuzz_60317.sql b/tests/queries/0_stateless/03014_analyzer_groupby_fuzz_60317.sql
index 295f89c5a0a..094614cb78d 100644
--- a/tests/queries/0_stateless/03014_analyzer_groupby_fuzz_60317.sql
+++ b/tests/queries/0_stateless/03014_analyzer_groupby_fuzz_60317.sql
@@ -6,7 +6,7 @@ SELECT
 FROM system.one
 GROUP BY
     _CAST(30, 'Nullable(UInt8)')
-SETTINGS enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
 
 -- WITH CUBE (note that result is different with the analyzer (analyzer is correct including all combinations)
 SELECT
@@ -24,4 +24,4 @@ GROUP BY
     _CAST(30, 'Nullable(UInt8)')
 WITH CUBE
 WITH TOTALS
-SETTINGS enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
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
index d700f9ba3b1..e7ea964b876 100644
--- 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
@@ -1,4 +1,5 @@
-set enable_analyzer=1, group_by_use_nulls=1, optimize_injective_functions_in_group_by=1;
+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/03015_analyzer_groupby_fuzz_60772.sql b/tests/queries/0_stateless/03015_analyzer_groupby_fuzz_60772.sql
index 5190b8635d6..d3bd9ef0ce3 100644
--- a/tests/queries/0_stateless/03015_analyzer_groupby_fuzz_60772.sql
+++ b/tests/queries/0_stateless/03015_analyzer_groupby_fuzz_60772.sql
@@ -7,7 +7,7 @@ GROUP BY
     toFixedString(toFixedString('2018-01-02 22:33:44', 19), 19),
     'gr',
     '2018-01-02 22:33:44'
-SETTINGS enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
 
 -- WITH CUBE (note that result is different with the analyzer (analyzer is correct including all combinations)
 SELECT
@@ -20,4 +20,4 @@ GROUP BY
     'gr',
     '2018-01-02 22:33:44'
 WITH CUBE
-SETTINGS enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/03015_peder1001.sql b/tests/queries/0_stateless/03015_peder1001.sql
index df8e4db1536..810503207f2 100644
--- a/tests/queries/0_stateless/03015_peder1001.sql
+++ b/tests/queries/0_stateless/03015_peder1001.sql
@@ -1,6 +1,3 @@
--- Tags: no-fasttest
--- no-fasttest: upper/lowerUTF8 use ICU
-
 DROP TABLE IF EXISTS test_data;
 
 CREATE TABLE test_data
diff --git a/tests/queries/0_stateless/03016_analyzer_groupby_fuzz_59796.sql b/tests/queries/0_stateless/03016_analyzer_groupby_fuzz_59796.sql
index 6c926c32887..c00a75a631c 100644
--- a/tests/queries/0_stateless/03016_analyzer_groupby_fuzz_59796.sql
+++ b/tests/queries/0_stateless/03016_analyzer_groupby_fuzz_59796.sql
@@ -3,4 +3,4 @@ SELECT
 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 enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/03017_analyzer_groupby_fuzz_61600.sql b/tests/queries/0_stateless/03017_analyzer_groupby_fuzz_61600.sql
index b22ea42b686..53a5cfe9b1a 100644
--- a/tests/queries/0_stateless/03017_analyzer_groupby_fuzz_61600.sql
+++ b/tests/queries/0_stateless/03017_analyzer_groupby_fuzz_61600.sql
@@ -11,7 +11,7 @@ FROM set_index_not__fuzz_0
 GROUP BY
     toNullable(3),
     concat(concat(NULLIF(1, 1), toNullable(toNullable(3))))
-SETTINGS enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
 
 -- WITH ROLLUP (note that result is different with the analyzer (analyzer is correct including all combinations)
 SELECT
@@ -22,4 +22,4 @@ GROUP BY
     toNullable(3),
     concat(concat(NULLIF(1, 1), toNullable(toNullable(3))))
 WITH ROLLUP
-SETTINGS enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
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
index 0d0a81c9105..f0b60caca36 100644
--- 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
@@ -1,4 +1,5 @@
-set enable_analyzer=1;
+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.sql b/tests/queries/0_stateless/03023_group_by_use_nulls_analyzer_crashes.sql
index d3d6ecaadaf..b8c173520a9 100644
--- 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
@@ -1,4 +1,4 @@
-set enable_analyzer = 1, group_by_use_nulls = 1;
+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;
 
@@ -56,4 +56,4 @@ SELECT arraySplit(number -> toUInt8(number), []) from numbers(1) GROUP BY toUInt
 
 SELECT count(arraySplit(number -> toUInt8(number), [arraySplit(x -> toUInt8(number), [])])) FROM numbers(10) GROUP BY number, [number] WITH ROLLUP settings group_by_use_nulls=1; -- {serverError ILLEGAL_TYPE_OF_ARGUMENT}
 
-SELECT count(arraySplit(x -> toUInt8(number), [])) FROM numbers(10) GROUP BY number, [number] WITH ROLLUP settings group_by_use_nulls=1;
+SELECT count(arraySplit(x -> toUInt8(number), [])) FROM numbers(10) GROUP BY number, [number] WITH ROLLUP settings group_by_use_nulls=1;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03023_invalid_format_detection.sh b/tests/queries/0_stateless/03023_invalid_format_detection.sh
deleted file mode 100755
index 984a42aa218..00000000000
--- a/tests/queries/0_stateless/03023_invalid_format_detection.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-touch $CLICKHOUSE_TEST_UNIQUE_NAME.xml
-$CLICKHOUSE_LOCAL -q "select * from file('$CLICKHOUSE_TEST_UNIQUE_NAME.*')" 2>&1 | grep -c "CANNOT_DETECT_FORMAT"
-rm $CLICKHOUSE_TEST_UNIQUE_NAME.xml
-
diff --git a/tests/queries/0_stateless/03023_remove_unused_column_distinct.sql b/tests/queries/0_stateless/03023_remove_unused_column_distinct.sql
index af8756f1fbc..c2f32bfe3c1 100644
--- a/tests/queries/0_stateless/03023_remove_unused_column_distinct.sql
+++ b/tests/queries/0_stateless/03023_remove_unused_column_distinct.sql
@@ -12,4 +12,4 @@ FROM
         FROM numbers(10)
     )
 )
-SETTINGS enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/03031_clickhouse_local_input.sh b/tests/queries/0_stateless/03031_clickhouse_local_input.sh
index e2f9cf48108..6f59e9b9703 100755
--- a/tests/queries/0_stateless/03031_clickhouse_local_input.sh
+++ b/tests/queries/0_stateless/03031_clickhouse_local_input.sh
@@ -6,15 +6,15 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 tmp_file="$CUR_DIR/$CLICKHOUSE_DATABASE.txt"
 echo '# foo'
-$CLICKHOUSE_LOCAL --engine_file_truncate_on_insert=1 -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select * from input('x String') format LineAsString" <<<foo
+$CLICKHOUSE_LOCAL --engine_file_truncate_on_insert=1 -n -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select * from input('x String') format LineAsString" <<<foo
 cat "$tmp_file"
 echo '# !foo'
-$CLICKHOUSE_LOCAL --engine_file_truncate_on_insert=1 -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select * from input('x String') where x != 'foo' format LineAsString" <<<foo
+$CLICKHOUSE_LOCAL --engine_file_truncate_on_insert=1 -n -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select * from input('x String') where x != 'foo' format LineAsString" <<<foo
 cat "$tmp_file"
 echo '# bar'
-$CLICKHOUSE_LOCAL --engine_file_truncate_on_insert=1 -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select y from input('x String, y String') format TSV" <<<$'foo\tbar'
+$CLICKHOUSE_LOCAL --engine_file_truncate_on_insert=1 -n -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select y from input('x String, y String') format TSV" <<<$'foo\tbar'
 cat "$tmp_file"
 echo '# defaults'
-$CLICKHOUSE_LOCAL --input_format_tsv_empty_as_default=1 --engine_file_truncate_on_insert=1 -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select y from input('x String, y String DEFAULT \\'bam\\'') format TSV" <<<$'foo\t'
+$CLICKHOUSE_LOCAL --input_format_tsv_empty_as_default=1 --engine_file_truncate_on_insert=1 -n -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select y from input('x String, y String DEFAULT \\'bam\\'') format TSV" <<<$'foo\t'
 cat "$tmp_file"
 rm -f "${tmp_file:?}"
diff --git a/tests/queries/0_stateless/03031_filter_float64_logical_error.sql b/tests/queries/0_stateless/03031_filter_float64_logical_error.sql
index df35cc7b14a..59d4a06c8f7 100644
--- a/tests/queries/0_stateless/03031_filter_float64_logical_error.sql
+++ b/tests/queries/0_stateless/03031_filter_float64_logical_error.sql
@@ -26,7 +26,7 @@ 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', enable_analyzer=0;
+SETTINGS force_primary_key = 1, force_data_skipping_indices = 'value_1_idx, value_2_idx', allow_experimental_analyzer=0;
 
 
 SELECT
@@ -37,4 +37,4 @@ 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', enable_analyzer=1; -- { serverError ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER }
+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_table_function_fuzzquery.reference b/tests/queries/0_stateless/03031_table_function_fuzzquery.reference
deleted file mode 100644
index 202e4557a33..00000000000
--- a/tests/queries/0_stateless/03031_table_function_fuzzquery.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-query
-String
diff --git a/tests/queries/0_stateless/03031_table_function_fuzzquery.sql b/tests/queries/0_stateless/03031_table_function_fuzzquery.sql
deleted file mode 100644
index b26096f7f0e..00000000000
--- a/tests/queries/0_stateless/03031_table_function_fuzzquery.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-
-SELECT * FROM fuzzQuery('SELECT 1', 500, 8956) LIMIT 0 FORMAT TSVWithNamesAndTypes;
-
-SELECT * FROM fuzzQuery('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;
-', 500, 8956) LIMIT 10 FORMAT NULL;
diff --git a/tests/queries/0_stateless/03031_tuple_elimination_analyzer.sql b/tests/queries/0_stateless/03031_tuple_elimination_analyzer.sql
index 42bd5004933..97a19cda7d3 100644
--- a/tests/queries/0_stateless/03031_tuple_elimination_analyzer.sql
+++ b/tests/queries/0_stateless/03031_tuple_elimination_analyzer.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS test;
 
-SET allow_suspicious_low_cardinality_types = true, enable_analyzer = true;
+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;
 
diff --git a/tests/queries/0_stateless/03032_async_backup_restore.sh b/tests/queries/0_stateless/03032_async_backup_restore.sh
index 514d0759f1b..14a8ef7f417 100755
--- a/tests/queries/0_stateless/03032_async_backup_restore.sh
+++ b/tests/queries/0_stateless/03032_async_backup_restore.sh
@@ -4,7 +4,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 DROP TABLE IF EXISTS tbl;
 DROP TABLE IF EXISTS tbl2;
 CREATE TABLE tbl (a Int32) ENGINE = MergeTree() ORDER BY tuple();
@@ -51,7 +51,7 @@ wait_status "${restore_operation_id}" "RESTORED"
 # Check the result of that restoration.
 ${CLICKHOUSE_CLIENT} --query "SELECT * FROM tbl2"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
 DROP TABLE tbl;
 DROP TABLE tbl2;
 "
diff --git a/tests/queries/0_stateless/03032_redundant_equals.sql b/tests/queries/0_stateless/03032_redundant_equals.sql
index cf402f1b159..de85ec5cf00 100644
--- a/tests/queries/0_stateless/03032_redundant_equals.sql
+++ b/tests/queries/0_stateless/03032_redundant_equals.sql
@@ -5,11 +5,11 @@ CREATE TABLE test_table
     k UInt64,
 )
 ENGINE = MergeTree
-ORDER BY k SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
+ORDER BY k;
 
-INSERT INTO test_table SELECT number FROM numbers(100000);
+INSERT INTO test_table SELECT number FROM numbers(10000000);
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT * FROM test_table WHERE k in (100) = 1;
 SELECT * FROM test_table WHERE k = (100) = 1;
@@ -25,7 +25,7 @@ SELECT * FROM test_table WHERE (NOT ((k not in (100) = 0) OR (k in (100) = 1)))
 SELECT * FROM test_table WHERE (NOT ((k in (101) = 0) OR (k in (100) = 1))) = 1;
 SELECT * FROM test_table WHERE ((k not in (101) = 0) OR (k in (100) = 1)) = 1;
 SELECT * FROM test_table WHERE ((k not in (99) = 1) AND (k in (100) = 1)) = 1;
--- we skip optimizing queries with toNullable(0 or 1) but lets make sure they still work
+-- we skip optimizing queries with toNullable(0 or 1) but lets make sure they still work 
 SELECT * FROM test_table WHERE (k = 101) = toLowCardinality(toNullable(1));
 SELECT * FROM test_table WHERE (k = 101) = toNullable(1);
 SELECT * FROM test_table WHERE (k = 101) = toLowCardinality(1);
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
index d01e458a544..9be1152bbbf 100644
--- 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
@@ -3,5 +3,6 @@ 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, enable_analyzer=1;
+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.sh b/tests/queries/0_stateless/03033_analyzer_query_parameters.sh
index 67ddf2449eb..cf46067df99 100755
--- a/tests/queries/0_stateless/03033_analyzer_query_parameters.sh
+++ b/tests/queries/0_stateless/03033_analyzer_query_parameters.sh
@@ -4,5 +4,5 @@ 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 enable_analyzer = 1"
-${CLICKHOUSE_LOCAL} --param_rounding 1 --query "SELECT 1 AS x ORDER BY x WITH FILL STEP {rounding:UInt32} SETTINGS enable_analyzer = 0"
+${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_cte_numbers_memory.sql b/tests/queries/0_stateless/03033_cte_numbers_memory.sql
index b362f42f89a..66b11cbfaa5 100644
--- a/tests/queries/0_stateless/03033_cte_numbers_memory.sql
+++ b/tests/queries/0_stateless/03033_cte_numbers_memory.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/61238
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 WITH
 (SELECT number FROM system.numbers LIMIT 1) as w1,
diff --git a/tests/queries/0_stateless/03033_dynamic_text_serialization.reference b/tests/queries/0_stateless/03033_dynamic_text_serialization.reference
index f949d5e9baf..d965245266c 100644
--- a/tests/queries/0_stateless/03033_dynamic_text_serialization.reference
+++ b/tests/queries/0_stateless/03033_dynamic_text_serialization.reference
@@ -4,25 +4,25 @@ JSON
 {"d":"str","dynamicType(d)":"String"}
 {"d":["1","2","3"],"dynamicType(d)":"Array(Int64)"}
 {"d":"2020-01-01","dynamicType(d)":"Date"}
-{"d":"2020-01-01 10:00:00","dynamicType(d)":"DateTime"}
+{"d":"2020-01-01 10:00:00.000000000","dynamicType(d)":"DateTime64(9)"}
 {"d":{"a":"42","b":"str"},"dynamicType(d)":"Tuple(a Int64, b String)"}
 {"d":{"a":"43"},"dynamicType(d)":"Tuple(a Int64)"}
 {"d":{"a":"44","c":["1","2","3"]},"dynamicType(d)":"Tuple(a Int64, c Array(Int64))"}
 {"d":["1","str",["1","2","3"]],"dynamicType(d)":"Tuple(Int64, String, Array(Int64))"}
 {"d":null,"dynamicType(d)":"None"}
 {"d":true,"dynamicType(d)":"Bool"}
-{"d":"42","dynamicType(d)":"Int64","isDynamicElementInSharedData(d)":false}
-{"d":42.42,"dynamicType(d)":"Float64","isDynamicElementInSharedData(d)":false}
-{"d":"str","dynamicType(d)":"String","isDynamicElementInSharedData(d)":true}
-{"d":null,"dynamicType(d)":"None","isDynamicElementInSharedData(d)":false}
-{"d":true,"dynamicType(d)":"Bool","isDynamicElementInSharedData(d)":true}
+{"d":"42","dynamicType(d)":"Int64"}
+{"d":"42.42","dynamicType(d)":"String"}
+{"d":"str","dynamicType(d)":"String"}
+{"d":null,"dynamicType(d)":"None"}
+{"d":"1","dynamicType(d)":"Int64"}
 CSV
 42,"Int64"
 42.42,"Float64"
 "str","String"
 "[1,2,3]","Array(Int64)"
 "2020-01-01","Date"
-"2020-01-01 10:00:00","DateTime"
+"2020-01-01 10:00:00.000000000","DateTime64(9)"
 "[1, 'str', [1, 2, 3]]","String"
 \N,"None"
 true,"Bool"
@@ -32,24 +32,24 @@ TSV
 str	String
 [1,2,3]	Array(Int64)
 2020-01-01	Date
-2020-01-01 10:00:00	DateTime
+2020-01-01 10:00:00.000000000	DateTime64(9)
 [1, \'str\', [1, 2, 3]]	String
 \N	None
 true	Bool
 Values
-(42,'Int64'),(42.42,'Float64'),('str','String'),([1,2,3],'Array(Int64)'),('2020-01-01','Date'),('2020-01-01 10:00:00','DateTime'),(NULL,'None'),(true,'Bool')
+(42,'Int64'),(42.42,'Float64'),('str','String'),([1,2,3],'Array(Int64)'),('2020-01-01','Date'),('2020-01-01 10:00:00.000000000','DateTime64(9)'),(NULL,'None'),(true,'Bool')
 Cast using parsing
 42	Int64
 42.42	Float64
 [1,2,3]	Array(Int64)
 2020-01-01	Date
-2020-01-01 10:00:00	DateTime
-NULL	String
+2020-01-01 10:00:00.000000000	DateTime64(9)
+\N	None
 true	Bool
-42	Int64	false
-42.42	Float64	false
-[1,2,3]	Array(Int64)	false
-2020-01-01	Date	true
-2020-01-01 10:00:00	DateTime	true
-NULL	String	true
-true	Bool	true
+42	Int64
+42.42	Float64
+[1, 2, 3]	String
+2020-01-01	String
+2020-01-01 10:00:00	String
+\N	None
+true	String
diff --git a/tests/queries/0_stateless/03033_dynamic_text_serialization.sql b/tests/queries/0_stateless/03033_dynamic_text_serialization.sql
index 45539cb13eb..d12d110fe28 100644
--- a/tests/queries/0_stateless/03033_dynamic_text_serialization.sql
+++ b/tests/queries/0_stateless/03033_dynamic_text_serialization.sql
@@ -16,7 +16,7 @@ select d, dynamicType(d) from format(JSONEachRow, 'd Dynamic', $$
 {"d" : true}
 $$) format JSONEachRow;
 
-select d, dynamicType(d), isDynamicElementInSharedData(d) from format(JSONEachRow, 'd Dynamic(max_types=2)', $$
+select d, dynamicType(d) from format(JSONEachRow, 'd Dynamic(max_types=2)', $$
 {"d" : 42}
 {"d" : 42.42}
 {"d" : "str"}
@@ -69,6 +69,6 @@ create table test (s String) engine=Memory;
 insert into test values ('42'), ('42.42'), ('[1, 2, 3]'), ('2020-01-01'), ('2020-01-01 10:00:00'), ('NULL'), ('true');
 set cast_string_to_dynamic_use_inference=1;
 select s::Dynamic as d, dynamicType(d) from test;
-select s::Dynamic(max_types=3) as d, dynamicType(d), isDynamicElementInSharedData(d) from test;
+select s::Dynamic(max_types=3) as d, dynamicType(d) from test;
 drop table test;
 
diff --git a/tests/queries/0_stateless/03033_recursive_cte_basic.reference b/tests/queries/0_stateless/03033_recursive_cte_basic.reference
index dc6a9cd8f89..a890fccef2b 100644
--- a/tests/queries/0_stateless/03033_recursive_cte_basic.reference
+++ b/tests/queries/0_stateless/03033_recursive_cte_basic.reference
@@ -1,6 +1,6 @@
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 WITH RECURSIVE recursive_cte AS (SELECT 1 AS n UNION ALL SELECT n + 1 FROM recursive_cte WHERE n < 10)
 SELECT n FROM recursive_cte;
 1
diff --git a/tests/queries/0_stateless/03033_recursive_cte_basic.sql b/tests/queries/0_stateless/03033_recursive_cte_basic.sql
index 63014e9ccd4..f85e1ffe0bd 100644
--- a/tests/queries/0_stateless/03033_recursive_cte_basic.sql
+++ b/tests/queries/0_stateless/03033_recursive_cte_basic.sql
@@ -1,6 +1,6 @@
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 WITH RECURSIVE recursive_cte AS (SELECT 1 AS n UNION ALL SELECT n + 1 FROM recursive_cte WHERE n < 10)
 SELECT n FROM recursive_cte;
diff --git a/tests/queries/0_stateless/03033_with_fill_interpolate.sql b/tests/queries/0_stateless/03033_with_fill_interpolate.sql
index 48457341e0d..0ec0050a922 100644
--- a/tests/queries/0_stateless/03033_with_fill_interpolate.sql
+++ b/tests/queries/0_stateless/03033_with_fill_interpolate.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/55794
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 DROP TABLE IF EXISTS 03033_example_table;
 
 CREATE TABLE 03033_example_table
diff --git a/tests/queries/0_stateless/03034_dynamic_conversions.reference b/tests/queries/0_stateless/03034_dynamic_conversions.reference
index e22b64701a3..45f94f7ecc4 100644
--- a/tests/queries/0_stateless/03034_dynamic_conversions.reference
+++ b/tests/queries/0_stateless/03034_dynamic_conversions.reference
@@ -1,9 +1,9 @@
 0	UInt64
 1	UInt64
 2	UInt64
-0	UInt64
-1	UInt64
-2	UInt64
+0	String
+1	String
+2	String
 0
 1
 2
@@ -25,15 +25,15 @@ str_1	String
 \N	None
 4	UInt64
 str_5	String
-0	UInt64
+0	String
 str_1	String
-[0,1]	Array(UInt64)
+[0,1]	String
 \N	None
-4	UInt64
+4	String
 str_5	String
 0	UInt64
 str_1	String
-[0,1]	Array(UInt64)
+[0,1]	String
 \N	None
 4	UInt64
 str_5	String
@@ -51,13 +51,13 @@ str_5	String
 2
 0	UInt64
 str_1	String
-[0,1]	Array(UInt64)
+[0,1]	String
 \N	None
 4	UInt64
 str_5	String
 0	UInt64
 1970-01-02	Date
-[0,1]	Array(UInt64)
+[0,1]	String
 \N	None
 4	UInt64
 1970-01-06	Date
diff --git a/tests/queries/0_stateless/03034_dynamic_conversions.sql b/tests/queries/0_stateless/03034_dynamic_conversions.sql
index c0b470f29c5..ed75fbf2377 100644
--- a/tests/queries/0_stateless/03034_dynamic_conversions.sql
+++ b/tests/queries/0_stateless/03034_dynamic_conversions.sql
@@ -3,7 +3,7 @@ set allow_experimental_variant_type=1;
 set use_variant_as_common_type=1;
 
 select number::Dynamic as d, dynamicType(d) from numbers(3);
-select number::Dynamic(max_types=0) as d, dynamicType(d) from numbers(3);
+select number::Dynamic(max_types=1) as d, dynamicType(d) from numbers(3);
 select number::Dynamic::UInt64 as v from numbers(3);
 select number::Dynamic::String as v from numbers(3);
 select number::Dynamic::Date as v from numbers(3);
@@ -12,13 +12,13 @@ select number::Dynamic::Variant(UInt64, String) as v, variantType(v) from number
 select (number % 2 ? NULL : number)::Dynamic as d, dynamicType(d) from numbers(3);
 
 select multiIf(number % 4 == 0, number, number % 4 == 1, 'str_' || toString(number), number % 4 == 2, range(number), NULL)::Dynamic as d, dynamicType(d) from numbers(6);
-select multiIf(number % 4 == 0, number, number % 4 == 1, 'str_' || toString(number), number % 4 == 2, range(number), NULL)::Dynamic(max_types=0) as d, dynamicType(d) from numbers(6);
 select multiIf(number % 4 == 0, number, number % 4 == 1, 'str_' || toString(number), number % 4 == 2, range(number), NULL)::Dynamic(max_types=1) as d, dynamicType(d) from numbers(6);
 select multiIf(number % 4 == 0, number, number % 4 == 1, 'str_' || toString(number), number % 4 == 2, range(number), NULL)::Dynamic(max_types=2) as d, dynamicType(d) from numbers(6);
+select multiIf(number % 4 == 0, number, number % 4 == 1, 'str_' || toString(number), number % 4 == 2, range(number), NULL)::Dynamic(max_types=3) as d, dynamicType(d) from numbers(6);
 
 select number::Dynamic(max_types=2)::Dynamic(max_types=3) as d from numbers(3);
 select number::Dynamic(max_types=2)::Dynamic(max_types=1) as d from numbers(3);
-select multiIf(number % 4 == 0, number, number % 4 == 1, 'str_' || toString(number), number % 4 == 2, range(number), NULL)::Dynamic(max_types=2)::Dynamic(max_types=1) as d, dynamicType(d) from numbers(6);
+select multiIf(number % 4 == 0, number, number % 4 == 1, 'str_' || toString(number), number % 4 == 2, range(number), NULL)::Dynamic(max_types=3)::Dynamic(max_types=2) as d, dynamicType(d) from numbers(6);
 select multiIf(number % 4 == 0, number, number % 4 == 1, toDate(number), number % 4 == 2, range(number), NULL)::Dynamic(max_types=4)::Dynamic(max_types=3) as d, dynamicType(d) from numbers(6);
 
 
diff --git a/tests/queries/0_stateless/03034_normalized_ast.sql b/tests/queries/0_stateless/03034_normalized_ast.sql
index 8b518d6d11b..385af4e2c34 100644
--- a/tests/queries/0_stateless/03034_normalized_ast.sql
+++ b/tests/queries/0_stateless/03034_normalized_ast.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/49472
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SELECT
     concat(database, table) AS name,
     count()
diff --git a/tests/queries/0_stateless/03034_recursive_cte_tree.sql b/tests/queries/0_stateless/03034_recursive_cte_tree.sql
index fa62298939a..a3ff43e435a 100644
--- a/tests/queries/0_stateless/03034_recursive_cte_tree.sql
+++ b/tests/queries/0_stateless/03034_recursive_cte_tree.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS tree;
 CREATE TABLE tree
diff --git a/tests/queries/0_stateless/03034_recursive_cte_tree_fuzz_crash_fix.sql b/tests/queries/0_stateless/03034_recursive_cte_tree_fuzz_crash_fix.sql
index 1e26c53769b..ae04fa8f377 100644
--- a/tests/queries/0_stateless/03034_recursive_cte_tree_fuzz_crash_fix.sql
+++ b/tests/queries/0_stateless/03034_recursive_cte_tree_fuzz_crash_fix.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET enable_global_with_statement=1;
 SET session_timezone = 'Etc/UTC';
 
diff --git a/tests/queries/0_stateless/03034_recursive_cte_tree_merge_tree.reference b/tests/queries/0_stateless/03034_recursive_cte_tree_merge_tree.reference
index f5b950db867..85f8c3267c6 100644
--- a/tests/queries/0_stateless/03034_recursive_cte_tree_merge_tree.reference
+++ b/tests/queries/0_stateless/03034_recursive_cte_tree_merge_tree.reference
@@ -1,6 +1,6 @@
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 DROP TABLE IF EXISTS tree;
 CREATE TABLE tree
 (
diff --git a/tests/queries/0_stateless/03034_recursive_cte_tree_merge_tree.sql b/tests/queries/0_stateless/03034_recursive_cte_tree_merge_tree.sql
index 231aae296e6..15acbaf6da9 100644
--- a/tests/queries/0_stateless/03034_recursive_cte_tree_merge_tree.sql
+++ b/tests/queries/0_stateless/03034_recursive_cte_tree_merge_tree.sql
@@ -1,6 +1,6 @@
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS tree;
 CREATE TABLE tree
diff --git a/tests/queries/0_stateless/03035_alias_column_bug_distributed.sql b/tests/queries/0_stateless/03035_alias_column_bug_distributed.sql
index 8f60808d700..74463743b01 100644
--- a/tests/queries/0_stateless/03035_alias_column_bug_distributed.sql
+++ b/tests/queries/0_stateless/03035_alias_column_bug_distributed.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/44414
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 DROP TABLE IF EXISTS alias_bug;
 DROP TABLE IF EXISTS alias_bug_dist;
 CREATE TABLE alias_bug
diff --git a/tests/queries/0_stateless/03035_dynamic_sorting.reference b/tests/queries/0_stateless/03035_dynamic_sorting.reference
index f253c34ce8a..9b8df11c7a9 100644
--- a/tests/queries/0_stateless/03035_dynamic_sorting.reference
+++ b/tests/queries/0_stateless/03035_dynamic_sorting.reference
@@ -1,442 +1,299 @@
 order by d1 nulls first
-\N	None	false
-\N	None	false
-\N	None	false
-\N	None	false
-\N	None	false
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,4]	Array(Int64)	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-02	Date	true
-42	Int64	false
-42	Int64	false
-42	Int64	false
-42	Int64	false
-42	Int64	false
-42	Int64	false
-43	Int64	false
-abc	String	false
-abc	String	false
-abc	String	false
-abc	String	false
-abc	String	false
-abc	String	false
-abd	String	false
+\N	None
+\N	None
+\N	None
+\N	None
+[1,2,3]	Array(Int64)
+[1,2,3]	Array(Int64)
+[1,2,3]	Array(Int64)
+[1,2,3]	Array(Int64)
+[1,2,3]	Array(Int64)
+[1,2,4]	Array(Int64)
+42	Int64
+42	Int64
+42	Int64
+42	Int64
+42	Int64
+43	Int64
+abc	String
+abc	String
+abc	String
+abc	String
+abc	String
+abd	String
 order by d1 nulls last
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,4]	Array(Int64)	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-02	Date	true
-42	Int64	false
-42	Int64	false
-42	Int64	false
-42	Int64	false
-42	Int64	false
-42	Int64	false
-43	Int64	false
-abc	String	false
-abc	String	false
-abc	String	false
-abc	String	false
-abc	String	false
-abc	String	false
-abd	String	false
-\N	None	false
-\N	None	false
-\N	None	false
-\N	None	false
-\N	None	false
+[1,2,3]	Array(Int64)
+[1,2,3]	Array(Int64)
+[1,2,3]	Array(Int64)
+[1,2,3]	Array(Int64)
+[1,2,3]	Array(Int64)
+[1,2,4]	Array(Int64)
+42	Int64
+42	Int64
+42	Int64
+42	Int64
+42	Int64
+43	Int64
+abc	String
+abc	String
+abc	String
+abc	String
+abc	String
+abd	String
+\N	None
+\N	None
+\N	None
+\N	None
 order by d2 nulls first
-\N	None	false
-\N	None	false
-\N	None	false
-\N	None	false
-\N	None	false
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,4]	Array(Int64)	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-02	Date	true
-42	Int64	false
-42	Int64	false
-42	Int64	false
-42	Int64	false
-42	Int64	false
-42	Int64	false
-43	Int64	false
-abc	String	false
-abc	String	false
-abc	String	false
-abc	String	false
-abc	String	false
-abc	String	false
-abd	String	false
+\N	None
+\N	None
+\N	None
+\N	None
+[1,2,3]	Array(Int64)
+[1,2,3]	Array(Int64)
+[1,2,3]	Array(Int64)
+[1,2,3]	Array(Int64)
+[1,2,3]	Array(Int64)
+[1,2,4]	Array(Int64)
+42	Int64
+42	Int64
+42	Int64
+42	Int64
+42	Int64
+43	Int64
+abc	String
+abc	String
+abc	String
+abc	String
+abc	String
+abd	String
 order by d2 nulls last
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,3]	Array(Int64)	true
-[1,2,4]	Array(Int64)	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-01	Date	true
-2020-01-02	Date	true
-42	Int64	false
-42	Int64	false
-42	Int64	false
-42	Int64	false
-42	Int64	false
-42	Int64	false
-43	Int64	false
-abc	String	false
-abc	String	false
-abc	String	false
-abc	String	false
-abc	String	false
-abc	String	false
-abd	String	false
-\N	None	false
-\N	None	false
-\N	None	false
-\N	None	false
-\N	None	false
+[1,2,3]	Array(Int64)
+[1,2,3]	Array(Int64)
+[1,2,3]	Array(Int64)
+[1,2,3]	Array(Int64)
+[1,2,3]	Array(Int64)
+[1,2,4]	Array(Int64)
+42	Int64
+42	Int64
+42	Int64
+42	Int64
+42	Int64
+43	Int64
+abc	String
+abc	String
+abc	String
+abc	String
+abc	String
+abd	String
+\N	None
+\N	None
+\N	None
+\N	None
 order by d1, d2 nulls first
-[1,2,3]	\N	Array(Int64)	true	None	false
-[1,2,3]	[1,2,3]	Array(Int64)	true	Array(Int64)	true
-[1,2,3]	[1,2,4]	Array(Int64)	true	Array(Int64)	true
-[1,2,3]	2020-01-01	Array(Int64)	true	Date	true
-[1,2,3]	42	Array(Int64)	true	Int64	false
-[1,2,3]	abc	Array(Int64)	true	String	false
-[1,2,4]	[1,2,3]	Array(Int64)	true	Array(Int64)	true
-2020-01-01	\N	Date	true	None	false
-2020-01-01	[1,2,3]	Date	true	Array(Int64)	true
-2020-01-01	2020-01-01	Date	true	Date	true
-2020-01-01	2020-01-02	Date	true	Date	true
-2020-01-01	42	Date	true	Int64	false
-2020-01-01	abc	Date	true	String	false
-2020-01-02	2020-01-01	Date	true	Date	true
-42	\N	Int64	false	None	false
-42	[1,2,3]	Int64	false	Array(Int64)	true
-42	2020-01-01	Int64	false	Date	true
-42	42	Int64	false	Int64	false
-42	43	Int64	false	Int64	false
-42	abc	Int64	false	String	false
-43	42	Int64	false	Int64	false
-abc	\N	String	false	None	false
-abc	[1,2,3]	String	false	Array(Int64)	true
-abc	2020-01-01	String	false	Date	true
-abc	42	String	false	Int64	false
-abc	abc	String	false	String	false
-abc	abd	String	false	String	false
-abd	abc	String	false	String	false
-\N	\N	None	false	None	false
-\N	[1,2,3]	None	false	Array(Int64)	true
-\N	2020-01-01	None	false	Date	true
-\N	42	None	false	Int64	false
-\N	abc	None	false	String	false
+[1,2,3]	\N	Array(Int64)	None
+[1,2,3]	[1,2,3]	Array(Int64)	Array(Int64)
+[1,2,3]	[1,2,4]	Array(Int64)	Array(Int64)
+[1,2,3]	42	Array(Int64)	Int64
+[1,2,3]	abc	Array(Int64)	String
+[1,2,4]	[1,2,3]	Array(Int64)	Array(Int64)
+42	\N	Int64	None
+42	[1,2,3]	Int64	Array(Int64)
+42	42	Int64	Int64
+42	43	Int64	Int64
+42	abc	Int64	String
+43	42	Int64	Int64
+abc	\N	String	None
+abc	[1,2,3]	String	Array(Int64)
+abc	42	String	Int64
+abc	abc	String	String
+abc	abd	String	String
+abd	abc	String	String
+\N	\N	None	None
+\N	[1,2,3]	None	Array(Int64)
+\N	42	None	Int64
+\N	abc	None	String
 order by d1, d2 nulls last
-[1,2,3]	[1,2,3]	Array(Int64)	true	Array(Int64)	true
-[1,2,3]	[1,2,4]	Array(Int64)	true	Array(Int64)	true
-[1,2,3]	2020-01-01	Array(Int64)	true	Date	true
-[1,2,3]	42	Array(Int64)	true	Int64	false
-[1,2,3]	abc	Array(Int64)	true	String	false
-[1,2,3]	\N	Array(Int64)	true	None	false
-[1,2,4]	[1,2,3]	Array(Int64)	true	Array(Int64)	true
-2020-01-01	[1,2,3]	Date	true	Array(Int64)	true
-2020-01-01	2020-01-01	Date	true	Date	true
-2020-01-01	2020-01-02	Date	true	Date	true
-2020-01-01	42	Date	true	Int64	false
-2020-01-01	abc	Date	true	String	false
-2020-01-01	\N	Date	true	None	false
-2020-01-02	2020-01-01	Date	true	Date	true
-42	[1,2,3]	Int64	false	Array(Int64)	true
-42	2020-01-01	Int64	false	Date	true
-42	42	Int64	false	Int64	false
-42	43	Int64	false	Int64	false
-42	abc	Int64	false	String	false
-42	\N	Int64	false	None	false
-43	42	Int64	false	Int64	false
-abc	[1,2,3]	String	false	Array(Int64)	true
-abc	2020-01-01	String	false	Date	true
-abc	42	String	false	Int64	false
-abc	abc	String	false	String	false
-abc	abd	String	false	String	false
-abc	\N	String	false	None	false
-abd	abc	String	false	String	false
-\N	[1,2,3]	None	false	Array(Int64)	true
-\N	2020-01-01	None	false	Date	true
-\N	42	None	false	Int64	false
-\N	abc	None	false	String	false
-\N	\N	None	false	None	false
+[1,2,3]	[1,2,3]	Array(Int64)	Array(Int64)
+[1,2,3]	[1,2,4]	Array(Int64)	Array(Int64)
+[1,2,3]	42	Array(Int64)	Int64
+[1,2,3]	abc	Array(Int64)	String
+[1,2,3]	\N	Array(Int64)	None
+[1,2,4]	[1,2,3]	Array(Int64)	Array(Int64)
+42	[1,2,3]	Int64	Array(Int64)
+42	42	Int64	Int64
+42	43	Int64	Int64
+42	abc	Int64	String
+42	\N	Int64	None
+43	42	Int64	Int64
+abc	[1,2,3]	String	Array(Int64)
+abc	42	String	Int64
+abc	abc	String	String
+abc	abd	String	String
+abc	\N	String	None
+abd	abc	String	String
+\N	[1,2,3]	None	Array(Int64)
+\N	42	None	Int64
+\N	abc	None	String
+\N	\N	None	None
 order by d2, d1 nulls first
-\N	[1,2,3]	None	false	Array(Int64)	true
-[1,2,3]	[1,2,3]	Array(Int64)	true	Array(Int64)	true
-[1,2,4]	[1,2,3]	Array(Int64)	true	Array(Int64)	true
-2020-01-01	[1,2,3]	Date	true	Array(Int64)	true
-42	[1,2,3]	Int64	false	Array(Int64)	true
-abc	[1,2,3]	String	false	Array(Int64)	true
-[1,2,3]	[1,2,4]	Array(Int64)	true	Array(Int64)	true
-\N	2020-01-01	None	false	Date	true
-[1,2,3]	2020-01-01	Array(Int64)	true	Date	true
-2020-01-01	2020-01-01	Date	true	Date	true
-2020-01-02	2020-01-01	Date	true	Date	true
-42	2020-01-01	Int64	false	Date	true
-abc	2020-01-01	String	false	Date	true
-2020-01-01	2020-01-02	Date	true	Date	true
-\N	42	None	false	Int64	false
-[1,2,3]	42	Array(Int64)	true	Int64	false
-2020-01-01	42	Date	true	Int64	false
-42	42	Int64	false	Int64	false
-43	42	Int64	false	Int64	false
-abc	42	String	false	Int64	false
-42	43	Int64	false	Int64	false
-\N	abc	None	false	String	false
-[1,2,3]	abc	Array(Int64)	true	String	false
-2020-01-01	abc	Date	true	String	false
-42	abc	Int64	false	String	false
-abc	abc	String	false	String	false
-abd	abc	String	false	String	false
-abc	abd	String	false	String	false
-\N	\N	None	false	None	false
-[1,2,3]	\N	Array(Int64)	true	None	false
-2020-01-01	\N	Date	true	None	false
-42	\N	Int64	false	None	false
-abc	\N	String	false	None	false
+\N	[1,2,3]	None	Array(Int64)
+[1,2,3]	[1,2,3]	Array(Int64)	Array(Int64)
+[1,2,4]	[1,2,3]	Array(Int64)	Array(Int64)
+42	[1,2,3]	Int64	Array(Int64)
+abc	[1,2,3]	String	Array(Int64)
+[1,2,3]	[1,2,4]	Array(Int64)	Array(Int64)
+\N	42	None	Int64
+[1,2,3]	42	Array(Int64)	Int64
+42	42	Int64	Int64
+43	42	Int64	Int64
+abc	42	String	Int64
+42	43	Int64	Int64
+\N	abc	None	String
+[1,2,3]	abc	Array(Int64)	String
+42	abc	Int64	String
+abc	abc	String	String
+abd	abc	String	String
+abc	abd	String	String
+\N	\N	None	None
+[1,2,3]	\N	Array(Int64)	None
+42	\N	Int64	None
+abc	\N	String	None
 order by d2, d1 nulls last
-[1,2,3]	[1,2,3]	Array(Int64)	true	Array(Int64)	true
-[1,2,4]	[1,2,3]	Array(Int64)	true	Array(Int64)	true
-2020-01-01	[1,2,3]	Date	true	Array(Int64)	true
-42	[1,2,3]	Int64	false	Array(Int64)	true
-abc	[1,2,3]	String	false	Array(Int64)	true
-\N	[1,2,3]	None	false	Array(Int64)	true
-[1,2,3]	[1,2,4]	Array(Int64)	true	Array(Int64)	true
-[1,2,3]	2020-01-01	Array(Int64)	true	Date	true
-2020-01-01	2020-01-01	Date	true	Date	true
-2020-01-02	2020-01-01	Date	true	Date	true
-42	2020-01-01	Int64	false	Date	true
-abc	2020-01-01	String	false	Date	true
-\N	2020-01-01	None	false	Date	true
-2020-01-01	2020-01-02	Date	true	Date	true
-[1,2,3]	42	Array(Int64)	true	Int64	false
-2020-01-01	42	Date	true	Int64	false
-42	42	Int64	false	Int64	false
-43	42	Int64	false	Int64	false
-abc	42	String	false	Int64	false
-\N	42	None	false	Int64	false
-42	43	Int64	false	Int64	false
-[1,2,3]	abc	Array(Int64)	true	String	false
-2020-01-01	abc	Date	true	String	false
-42	abc	Int64	false	String	false
-abc	abc	String	false	String	false
-abd	abc	String	false	String	false
-\N	abc	None	false	String	false
-abc	abd	String	false	String	false
-[1,2,3]	\N	Array(Int64)	true	None	false
-2020-01-01	\N	Date	true	None	false
-42	\N	Int64	false	None	false
-abc	\N	String	false	None	false
-\N	\N	None	false	None	false
+[1,2,3]	[1,2,3]	Array(Int64)	Array(Int64)
+[1,2,4]	[1,2,3]	Array(Int64)	Array(Int64)
+42	[1,2,3]	Int64	Array(Int64)
+abc	[1,2,3]	String	Array(Int64)
+\N	[1,2,3]	None	Array(Int64)
+[1,2,3]	[1,2,4]	Array(Int64)	Array(Int64)
+[1,2,3]	42	Array(Int64)	Int64
+42	42	Int64	Int64
+43	42	Int64	Int64
+abc	42	String	Int64
+\N	42	None	Int64
+42	43	Int64	Int64
+[1,2,3]	abc	Array(Int64)	String
+42	abc	Int64	String
+abc	abc	String	String
+abd	abc	String	String
+\N	abc	None	String
+abc	abd	String	String
+[1,2,3]	\N	Array(Int64)	None
+42	\N	Int64	None
+abc	\N	String	None
+\N	\N	None	None
 d1 = d2
-[1,2,3]	[1,2,3]	1	Array(Int64)	true	Array(Int64)	true
-[1,2,3]	[1,2,4]	0	Array(Int64)	true	Array(Int64)	true
-[1,2,3]	2020-01-01	0	Array(Int64)	true	Date	true
-[1,2,3]	42	0	Array(Int64)	true	Int64	false
-[1,2,3]	abc	0	Array(Int64)	true	String	false
-[1,2,3]	\N	0	Array(Int64)	true	None	false
-[1,2,4]	[1,2,3]	0	Array(Int64)	true	Array(Int64)	true
-2020-01-01	[1,2,3]	0	Date	true	Array(Int64)	true
-2020-01-01	2020-01-01	1	Date	true	Date	true
-2020-01-01	2020-01-02	0	Date	true	Date	true
-2020-01-01	42	0	Date	true	Int64	false
-2020-01-01	abc	0	Date	true	String	false
-2020-01-01	\N	0	Date	true	None	false
-2020-01-02	2020-01-01	0	Date	true	Date	true
-42	[1,2,3]	0	Int64	false	Array(Int64)	true
-42	2020-01-01	0	Int64	false	Date	true
-42	42	1	Int64	false	Int64	false
-42	43	0	Int64	false	Int64	false
-42	abc	0	Int64	false	String	false
-42	\N	0	Int64	false	None	false
-43	42	0	Int64	false	Int64	false
-abc	[1,2,3]	0	String	false	Array(Int64)	true
-abc	2020-01-01	0	String	false	Date	true
-abc	42	0	String	false	Int64	false
-abc	abc	1	String	false	String	false
-abc	abd	0	String	false	String	false
-abc	\N	0	String	false	None	false
-abd	abc	0	String	false	String	false
-\N	[1,2,3]	0	None	false	Array(Int64)	true
-\N	2020-01-01	0	None	false	Date	true
-\N	42	0	None	false	Int64	false
-\N	abc	0	None	false	String	false
-\N	\N	1	None	false	None	false
+[1,2,3]	[1,2,3]	1	Array(Int64)	Array(Int64)
+[1,2,3]	[1,2,4]	0	Array(Int64)	Array(Int64)
+[1,2,3]	42	0	Array(Int64)	Int64
+[1,2,3]	abc	0	Array(Int64)	String
+[1,2,3]	\N	0	Array(Int64)	None
+[1,2,4]	[1,2,3]	0	Array(Int64)	Array(Int64)
+42	[1,2,3]	0	Int64	Array(Int64)
+42	42	1	Int64	Int64
+42	43	0	Int64	Int64
+42	abc	0	Int64	String
+42	\N	0	Int64	None
+43	42	0	Int64	Int64
+abc	[1,2,3]	0	String	Array(Int64)
+abc	42	0	String	Int64
+abc	abc	1	String	String
+abc	abd	0	String	String
+abc	\N	0	String	None
+abd	abc	0	String	String
+\N	[1,2,3]	0	None	Array(Int64)
+\N	42	0	None	Int64
+\N	abc	0	None	String
+\N	\N	1	None	None
 d1 < d2
-[1,2,3]	[1,2,3]	0	Array(Int64)	true	Array(Int64)	true
-[1,2,3]	[1,2,4]	1	Array(Int64)	true	Array(Int64)	true
-[1,2,3]	2020-01-01	1	Array(Int64)	true	Date	true
-[1,2,3]	42	1	Array(Int64)	true	Int64	false
-[1,2,3]	abc	1	Array(Int64)	true	String	false
-[1,2,3]	\N	1	Array(Int64)	true	None	false
-[1,2,4]	[1,2,3]	0	Array(Int64)	true	Array(Int64)	true
-2020-01-01	[1,2,3]	0	Date	true	Array(Int64)	true
-2020-01-01	2020-01-01	0	Date	true	Date	true
-2020-01-01	2020-01-02	1	Date	true	Date	true
-2020-01-01	42	1	Date	true	Int64	false
-2020-01-01	abc	1	Date	true	String	false
-2020-01-01	\N	1	Date	true	None	false
-2020-01-02	2020-01-01	0	Date	true	Date	true
-42	[1,2,3]	0	Int64	false	Array(Int64)	true
-42	2020-01-01	0	Int64	false	Date	true
-42	42	0	Int64	false	Int64	false
-42	43	1	Int64	false	Int64	false
-42	abc	1	Int64	false	String	false
-42	\N	1	Int64	false	None	false
-43	42	0	Int64	false	Int64	false
-abc	[1,2,3]	0	String	false	Array(Int64)	true
-abc	2020-01-01	0	String	false	Date	true
-abc	42	0	String	false	Int64	false
-abc	abc	0	String	false	String	false
-abc	abd	1	String	false	String	false
-abc	\N	1	String	false	None	false
-abd	abc	0	String	false	String	false
-\N	[1,2,3]	0	None	false	Array(Int64)	true
-\N	2020-01-01	0	None	false	Date	true
-\N	42	0	None	false	Int64	false
-\N	abc	0	None	false	String	false
-\N	\N	0	None	false	None	false
+[1,2,3]	[1,2,3]	0	Array(Int64)	Array(Int64)
+[1,2,3]	[1,2,4]	1	Array(Int64)	Array(Int64)
+[1,2,3]	42	1	Array(Int64)	Int64
+[1,2,3]	abc	1	Array(Int64)	String
+[1,2,3]	\N	1	Array(Int64)	None
+[1,2,4]	[1,2,3]	0	Array(Int64)	Array(Int64)
+42	[1,2,3]	0	Int64	Array(Int64)
+42	42	0	Int64	Int64
+42	43	1	Int64	Int64
+42	abc	1	Int64	String
+42	\N	1	Int64	None
+43	42	0	Int64	Int64
+abc	[1,2,3]	0	String	Array(Int64)
+abc	42	0	String	Int64
+abc	abc	0	String	String
+abc	abd	1	String	String
+abc	\N	1	String	None
+abd	abc	0	String	String
+\N	[1,2,3]	0	None	Array(Int64)
+\N	42	0	None	Int64
+\N	abc	0	None	String
+\N	\N	0	None	None
 d1 <= d2
-[1,2,3]	[1,2,3]	1	Array(Int64)	true	Array(Int64)	true
-[1,2,3]	[1,2,4]	1	Array(Int64)	true	Array(Int64)	true
-[1,2,3]	2020-01-01	1	Array(Int64)	true	Date	true
-[1,2,3]	42	1	Array(Int64)	true	Int64	false
-[1,2,3]	abc	1	Array(Int64)	true	String	false
-[1,2,3]	\N	1	Array(Int64)	true	None	false
-[1,2,4]	[1,2,3]	0	Array(Int64)	true	Array(Int64)	true
-2020-01-01	[1,2,3]	0	Date	true	Array(Int64)	true
-2020-01-01	2020-01-01	1	Date	true	Date	true
-2020-01-01	2020-01-02	1	Date	true	Date	true
-2020-01-01	42	1	Date	true	Int64	false
-2020-01-01	abc	1	Date	true	String	false
-2020-01-01	\N	1	Date	true	None	false
-2020-01-02	2020-01-01	0	Date	true	Date	true
-42	[1,2,3]	0	Int64	false	Array(Int64)	true
-42	2020-01-01	0	Int64	false	Date	true
-42	42	1	Int64	false	Int64	false
-42	43	1	Int64	false	Int64	false
-42	abc	1	Int64	false	String	false
-42	\N	1	Int64	false	None	false
-43	42	0	Int64	false	Int64	false
-abc	[1,2,3]	0	String	false	Array(Int64)	true
-abc	2020-01-01	0	String	false	Date	true
-abc	42	0	String	false	Int64	false
-abc	abc	1	String	false	String	false
-abc	abd	1	String	false	String	false
-abc	\N	1	String	false	None	false
-abd	abc	0	String	false	String	false
-\N	[1,2,3]	0	None	false	Array(Int64)	true
-\N	2020-01-01	0	None	false	Date	true
-\N	42	0	None	false	Int64	false
-\N	abc	0	None	false	String	false
-\N	\N	1	None	false	None	false
+[1,2,3]	[1,2,3]	1	Array(Int64)	Array(Int64)
+[1,2,3]	[1,2,4]	1	Array(Int64)	Array(Int64)
+[1,2,3]	42	1	Array(Int64)	Int64
+[1,2,3]	abc	1	Array(Int64)	String
+[1,2,3]	\N	1	Array(Int64)	None
+[1,2,4]	[1,2,3]	0	Array(Int64)	Array(Int64)
+42	[1,2,3]	0	Int64	Array(Int64)
+42	42	1	Int64	Int64
+42	43	1	Int64	Int64
+42	abc	1	Int64	String
+42	\N	1	Int64	None
+43	42	0	Int64	Int64
+abc	[1,2,3]	0	String	Array(Int64)
+abc	42	0	String	Int64
+abc	abc	1	String	String
+abc	abd	1	String	String
+abc	\N	1	String	None
+abd	abc	0	String	String
+\N	[1,2,3]	0	None	Array(Int64)
+\N	42	0	None	Int64
+\N	abc	0	None	String
+\N	\N	1	None	None
 d1 > d2
-[1,2,3]	[1,2,3]	0	Array(Int64)	true	Array(Int64)	true
-[1,2,3]	[1,2,4]	0	Array(Int64)	true	Array(Int64)	true
-[1,2,3]	2020-01-01	0	Array(Int64)	true	Date	true
-[1,2,3]	42	0	Array(Int64)	true	Int64	false
-[1,2,3]	abc	0	Array(Int64)	true	String	false
-[1,2,3]	\N	0	Array(Int64)	true	None	false
-[1,2,4]	[1,2,3]	1	Array(Int64)	true	Array(Int64)	true
-2020-01-01	[1,2,3]	1	Date	true	Array(Int64)	true
-2020-01-01	2020-01-01	0	Date	true	Date	true
-2020-01-01	2020-01-02	0	Date	true	Date	true
-2020-01-01	42	0	Date	true	Int64	false
-2020-01-01	abc	0	Date	true	String	false
-2020-01-01	\N	0	Date	true	None	false
-2020-01-02	2020-01-01	1	Date	true	Date	true
-42	[1,2,3]	1	Int64	false	Array(Int64)	true
-42	2020-01-01	1	Int64	false	Date	true
-42	42	0	Int64	false	Int64	false
-42	43	0	Int64	false	Int64	false
-42	abc	0	Int64	false	String	false
-42	\N	0	Int64	false	None	false
-43	42	1	Int64	false	Int64	false
-abc	[1,2,3]	1	String	false	Array(Int64)	true
-abc	2020-01-01	1	String	false	Date	true
-abc	42	1	String	false	Int64	false
-abc	abc	0	String	false	String	false
-abc	abd	0	String	false	String	false
-abc	\N	0	String	false	None	false
-abd	abc	1	String	false	String	false
-\N	[1,2,3]	1	None	false	Array(Int64)	true
-\N	2020-01-01	1	None	false	Date	true
-\N	42	1	None	false	Int64	false
-\N	abc	1	None	false	String	false
-\N	\N	0	None	false	None	false
+[1,2,3]	[1,2,3]	0	Array(Int64)	Array(Int64)
+[1,2,3]	[1,2,4]	0	Array(Int64)	Array(Int64)
+[1,2,3]	42	0	Array(Int64)	Int64
+[1,2,3]	abc	0	Array(Int64)	String
+[1,2,3]	\N	0	Array(Int64)	None
+[1,2,4]	[1,2,3]	1	Array(Int64)	Array(Int64)
+42	[1,2,3]	1	Int64	Array(Int64)
+42	42	0	Int64	Int64
+42	43	0	Int64	Int64
+42	abc	0	Int64	String
+42	\N	0	Int64	None
+43	42	1	Int64	Int64
+abc	[1,2,3]	1	String	Array(Int64)
+abc	42	1	String	Int64
+abc	abc	0	String	String
+abc	abd	0	String	String
+abc	\N	0	String	None
+abd	abc	1	String	String
+\N	[1,2,3]	1	None	Array(Int64)
+\N	42	1	None	Int64
+\N	abc	1	None	String
+\N	\N	0	None	None
 d1 >= d2
-[1,2,3]	[1,2,3]	1	Array(Int64)	true	Array(Int64)	true
-[1,2,3]	[1,2,4]	1	Array(Int64)	true	Array(Int64)	true
-[1,2,3]	2020-01-01	1	Array(Int64)	true	Date	true
-[1,2,3]	42	1	Array(Int64)	true	Int64	false
-[1,2,3]	abc	1	Array(Int64)	true	String	false
-[1,2,3]	\N	1	Array(Int64)	true	None	false
-[1,2,4]	[1,2,3]	1	Array(Int64)	true	Array(Int64)	true
-2020-01-01	[1,2,3]	1	Date	true	Array(Int64)	true
-2020-01-01	2020-01-01	1	Date	true	Date	true
-2020-01-01	2020-01-02	1	Date	true	Date	true
-2020-01-01	42	1	Date	true	Int64	false
-2020-01-01	abc	1	Date	true	String	false
-2020-01-01	\N	1	Date	true	None	false
-2020-01-02	2020-01-01	1	Date	true	Date	true
-42	[1,2,3]	1	Int64	false	Array(Int64)	true
-42	2020-01-01	1	Int64	false	Date	true
-42	42	1	Int64	false	Int64	false
-42	43	1	Int64	false	Int64	false
-42	abc	1	Int64	false	String	false
-42	\N	1	Int64	false	None	false
-43	42	1	Int64	false	Int64	false
-abc	[1,2,3]	1	String	false	Array(Int64)	true
-abc	2020-01-01	1	String	false	Date	true
-abc	42	1	String	false	Int64	false
-abc	abc	1	String	false	String	false
-abc	abd	1	String	false	String	false
-abc	\N	1	String	false	None	false
-abd	abc	1	String	false	String	false
-\N	[1,2,3]	1	None	false	Array(Int64)	true
-\N	2020-01-01	1	None	false	Date	true
-\N	42	1	None	false	Int64	false
-\N	abc	1	None	false	String	false
-\N	\N	1	None	false	None	false
+[1,2,3]	[1,2,3]	1	Array(Int64)	Array(Int64)
+[1,2,3]	[1,2,4]	1	Array(Int64)	Array(Int64)
+[1,2,3]	42	1	Array(Int64)	Int64
+[1,2,3]	abc	1	Array(Int64)	String
+[1,2,3]	\N	1	Array(Int64)	None
+[1,2,4]	[1,2,3]	1	Array(Int64)	Array(Int64)
+42	[1,2,3]	1	Int64	Array(Int64)
+42	42	1	Int64	Int64
+42	43	1	Int64	Int64
+42	abc	1	Int64	String
+42	\N	1	Int64	None
+43	42	1	Int64	Int64
+abc	[1,2,3]	1	String	Array(Int64)
+abc	42	1	String	Int64
+abc	abc	1	String	String
+abc	abd	1	String	String
+abc	\N	1	String	None
+abd	abc	1	String	String
+\N	[1,2,3]	1	None	Array(Int64)
+\N	42	1	None	Int64
+\N	abc	1	None	String
+\N	\N	1	None	None
diff --git a/tests/queries/0_stateless/03035_dynamic_sorting.sql b/tests/queries/0_stateless/03035_dynamic_sorting.sql
index e0039a348c6..0487fafc955 100644
--- a/tests/queries/0_stateless/03035_dynamic_sorting.sql
+++ b/tests/queries/0_stateless/03035_dynamic_sorting.sql
@@ -1,55 +1,80 @@
 set allow_experimental_dynamic_type = 1;
 
 drop table if exists test;
-create table test (d1 Dynamic(max_types=2), d2 Dynamic(max_types=2)) engine=Memory;
+create table test (d1 Dynamic, d2 Dynamic) 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]);
 
-insert into test values (42, 42), (42, 43), (43, 42), ('abc', 'abc'), ('abc', 'abd'), ('abd', 'abc'),
-([1,2,3], [1,2,3]), ([1,2,3], [1,2,4]), ([1,2,4], [1,2,3]),
-('2020-01-01', '2020-01-01'), ('2020-01-01', '2020-01-02'), ('2020-01-02', '2020-01-01'),
-(NULL, NULL), (42, 'abc'), ('abc', 42), (42, [1,2,3]), ([1,2,3], 42), (42, NULL), (NULL, 42),
-('abc', [1,2,3]), ([1,2,3], 'abc'), ('abc', NULL), (NULL, 'abc'), ([1,2,3], NULL), (NULL, [1,2,3]),
-(42, '2020-01-01'), ('2020-01-01', 42), ('2020-01-01', 'abc'), ('abc', '2020-01-01'),
-('2020-01-01', [1,2,3]), ([1,2,3], '2020-01-01'), ('2020-01-01', NULL), (NULL, '2020-01-01');
 
 select 'order by d1 nulls first';
-select d1, dynamicType(d1), isDynamicElementInSharedData(d1) from test order by d1 nulls first;
+select d1, dynamicType(d1) from test order by d1 nulls first;
 
 select 'order by d1 nulls last';
-select d1, dynamicType(d1), isDynamicElementInSharedData(d1) from test order by d1 nulls last;
+select d1, dynamicType(d1) from test order by d1 nulls last;
 
 select 'order by d2 nulls first';
-select d2, dynamicType(d2), isDynamicElementInSharedData(d2) from test order by d2 nulls first;
+select d2, dynamicType(d2) from test order by d2 nulls first;
 
 select 'order by d2 nulls last';
-select d2, dynamicType(d2), isDynamicElementInSharedData(d2) from test order by d2 nulls last;
+select d2, dynamicType(d2) from test order by d2 nulls last;
 
 
 select 'order by d1, d2 nulls first';
-select d1, d2, dynamicType(d1), isDynamicElementInSharedData(d1), dynamicType(d2), isDynamicElementInSharedData(d2) from test order by d1, d2 nulls first;
+select d1, d2, dynamicType(d1), dynamicType(d2) from test order by d1, d2 nulls first;
 
 select 'order by d1, d2 nulls last';
-select d1, d2, dynamicType(d1), isDynamicElementInSharedData(d1), dynamicType(d2), isDynamicElementInSharedData(d2) from test order by d1, d2 nulls last;
+select d1, d2, dynamicType(d1), dynamicType(d2) from test order by d1, d2 nulls last;
 
 select 'order by d2, d1 nulls first';
-select d1, d2, dynamicType(d1), isDynamicElementInSharedData(d1), dynamicType(d2), isDynamicElementInSharedData(d2) from test order by d2, d1 nulls first;
+select d1, d2, dynamicType(d1), dynamicType(d2) from test order by d2, d1 nulls first;
 
 select 'order by d2, d1 nulls last';
-select d1, d2, dynamicType(d1), isDynamicElementInSharedData(d1), dynamicType(d2), isDynamicElementInSharedData(d2) from test order by d2, d1 nulls last;
+select d1, d2, dynamicType(d1), dynamicType(d2) from test order by d2, d1 nulls last;
 
 select 'd1 = d2';
-select d1, d2, d1 = d2, dynamicType(d1), isDynamicElementInSharedData(d1), dynamicType(d2), isDynamicElementInSharedData(d2) from test order by d1, d2;
+select d1, d2, d1 = d2, dynamicType(d1), dynamicType(d2) from test order by d1, d2;
 
 select 'd1 < d2';
-select d1, d2, d1 < d2, dynamicType(d1), isDynamicElementInSharedData(d1), dynamicType(d2), isDynamicElementInSharedData(d2) from test order by d1, d2;
+select d1, d2, d1 < d2, dynamicType(d1), dynamicType(d2) from test order by d1, d2;
 
 select 'd1 <= d2';
-select d1, d2, d1 <= d2, dynamicType(d1), isDynamicElementInSharedData(d1), dynamicType(d2), isDynamicElementInSharedData(d2) from test order by d1, d2;
+select d1, d2, d1 <= d2, dynamicType(d1), dynamicType(d2) from test order by d1, d2;
 
 select 'd1 > d2';
-select d1, d2, d1 > d2, dynamicType(d1), isDynamicElementInSharedData(d1), dynamicType(d2), isDynamicElementInSharedData(d2) from test order by d1, d2;
+select d1, d2, d1 > d2, dynamicType(d1), dynamicType(d2) from test order by d1, d2;
 
 select 'd1 >= d2';
-select d1, d2, d2 >= d2, dynamicType(d1), isDynamicElementInSharedData(d1), dynamicType(d2), isDynamicElementInSharedData(d2) from test order by d1, d2;
+select d1, d2, d2 >= d2, dynamicType(d1), dynamicType(d2) from test order by d1, d2;
 
 drop table test;
 
diff --git a/tests/queries/0_stateless/03035_internal_functions_direct_call.sql b/tests/queries/0_stateless/03035_internal_functions_direct_call.sql
index e358e498343..951e0733dbb 100644
--- a/tests/queries/0_stateless/03035_internal_functions_direct_call.sql
+++ b/tests/queries/0_stateless/03035_internal_functions_direct_call.sql
@@ -4,7 +4,7 @@
 
 SELECT __actionName(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 SELECT __actionName('aaa', 'aaa', 'aaa'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
-SELECT __actionName('aaa', '') SETTINGS enable_analyzer = 1; -- { serverError BAD_ARGUMENTS }
+SELECT __actionName('aaa', '') SETTINGS allow_experimental_analyzer = 1; -- { serverError BAD_ARGUMENTS }
 SELECT __actionName('aaa', materialize('aaa')); -- { serverError BAD_ARGUMENTS,ILLEGAL_COLUMN }
 SELECT __actionName(materialize('aaa'), 'aaa'); -- { serverError ILLEGAL_COLUMN }
 SELECT __actionName('aaa', 'aaa');
diff --git a/tests/queries/0_stateless/03035_recursive_cte_postgres_1.reference b/tests/queries/0_stateless/03035_recursive_cte_postgres_1.reference
index 568421f3fba..e6cbdc971eb 100644
--- a/tests/queries/0_stateless/03035_recursive_cte_postgres_1.reference
+++ b/tests/queries/0_stateless/03035_recursive_cte_postgres_1.reference
@@ -32,7 +32,7 @@
 
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 -- WITH RECURSIVE
 
 -- sum of 1..100
diff --git a/tests/queries/0_stateless/03035_recursive_cte_postgres_1.sql b/tests/queries/0_stateless/03035_recursive_cte_postgres_1.sql
index 9a4e313ce90..8026dadc331 100644
--- a/tests/queries/0_stateless/03035_recursive_cte_postgres_1.sql
+++ b/tests/queries/0_stateless/03035_recursive_cte_postgres_1.sql
@@ -32,7 +32,7 @@
 
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 -- WITH RECURSIVE
 
diff --git a/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_compact_merge_tree.sql b/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_compact_merge_tree.sql
deleted file mode 100644
index bff28fb5c90..00000000000
--- a/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_compact_merge_tree.sql
+++ /dev/null
@@ -1,43 +0,0 @@
--- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
-
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type = 1;
-set allow_experimental_dynamic_type = 1;
-
-drop table if exists test;
-create table test (id UInt64, d Dynamic(max_types=2)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000;
-
-insert into test select number, number from numbers(100000) settings min_insert_block_size_rows=50000;
-insert into test select number, 'str_' || toString(number) from numbers(100000, 100000) settings min_insert_block_size_rows=50000;
-insert into test select number, arrayMap(x -> multiIf(number % 9 == 0, NULL, number % 9 == 3, 'str_' || toString(number), number), range(number % 10 + 1)) from numbers(200000, 100000) settings min_insert_block_size_rows=50000;
-insert into test select number, NULL from numbers(300000, 100000) settings min_insert_block_size_rows=50000;
-insert into test select number, multiIf(number % 4 == 3, 'str_' || toString(number), number % 4 == 2, NULL, number % 4 == 1, number, arrayMap(x -> multiIf(number % 9 == 0, NULL, number % 9 == 3, 'str_' || toString(number), number), range(number % 10 + 1))) from numbers(400000, 400000) settings min_insert_block_size_rows=50000;
-insert into test select number, if (number % 5 == 1, [range((number % 10 + 1)::UInt64)]::Array(Array(Dynamic)), number) from numbers(100000, 100000) settings min_insert_block_size_rows=50000;
-insert into test select number, if (number % 5 == 1, ('str_' || number)::LowCardinality(String)::Dynamic, number::Dynamic) from numbers(100000, 100000) settings min_insert_block_size_rows=50000;
-
-select distinct dynamicType(d) as type from test order by type;
-select count() from test where dynamicType(d) == 'UInt64';
-select count() from test where d.UInt64 is not NULL;
-select count() from test where dynamicType(d) == 'String';
-select count() from test where d.String is not NULL;
-select count() from test where dynamicType(d) == 'Date';
-select count() from test where d.Date is not NULL;
-select count() from test where dynamicType(d) == 'LowCardinality(String)';
-select count() from test where d.`LowCardinality(String)` is not NULL;
-select count() from test where dynamicType(d) == 'Array(Variant(String, UInt64))';
-select count() from test where not empty(d.`Array(Variant(String, UInt64))`);
-select count() from test where dynamicType(d) == 'Array(Array(Dynamic))';
-select count() from test where not empty(d.`Array(Array(Dynamic))`);
-select count() from test where d is NULL;
-select count() from test where not empty(d.`Tuple(a Array(Dynamic))`.a.String);
-
-select d, d.UInt64, d.String, d.`Array(Variant(String, UInt64))` from test format Null;
-select d.UInt64, d.String, d.`Array(Variant(String, UInt64))` from test format Null;
-select d.Int8, d.Date, d.`LowCardinality(String)`, d.`Array(String)` from test format Null;
-select d, d.UInt64, d.Date, d.`LowCardinality(String)`, d.`Array(Variant(String, UInt64))`, d.`Array(Variant(String, UInt64))`.size0, d.`Array(Variant(String, UInt64))`.UInt64 from test format Null;
-select d.UInt64, d.Date, d.`LowCardinality(String)`, d.`Array(Variant(String, UInt64))`, d.`Array(Variant(String, UInt64))`.size0, d.`Array(Variant(String, UInt64))`.UInt64, d.`Array(Variant(String, UInt64))`.String from test format Null;
-select d, d.`Tuple(a UInt64, b String)`.a, d.`Array(Dynamic)`.`Variant(String, UInt64)`.UInt64, d.`Array(Variant(String, UInt64))`.UInt64 from test format Null;
-select d.`Array(Dynamic)`.`Variant(String, UInt64)`.UInt64, d.`Array(Dynamic)`.size0, d.`Array(Variant(String, UInt64))`.UInt64 from test format Null;
-select d.`Array(Array(Dynamic))`.size1, d.`Array(Array(Dynamic))`.UInt64, d.`Array(Array(Dynamic))`.`Map(String, Tuple(a UInt64))`.values.a from test format Null;
-    
-drop table test;
diff --git a/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_memory.sql b/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_memory.sql
deleted file mode 100644
index 4eed3d15529..00000000000
--- a/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_memory.sql
+++ /dev/null
@@ -1,43 +0,0 @@
--- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
-
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type = 1;
-set allow_experimental_dynamic_type = 1;
-
-drop table if exists test;
-create table test (id UInt64, d Dynamic(max_types=2)) engine=Memory;
-
-insert into test select number, number from numbers(100000) settings min_insert_block_size_rows=50000;
-insert into test select number, 'str_' || toString(number) from numbers(100000, 100000) settings min_insert_block_size_rows=50000;
-insert into test select number, arrayMap(x -> multiIf(number % 9 == 0, NULL, number % 9 == 3, 'str_' || toString(number), number), range(number % 10 + 1)) from numbers(200000, 100000) settings min_insert_block_size_rows=50000;
-insert into test select number, NULL from numbers(300000, 100000) settings min_insert_block_size_rows=50000;
-insert into test select number, multiIf(number % 4 == 3, 'str_' || toString(number), number % 4 == 2, NULL, number % 4 == 1, number, arrayMap(x -> multiIf(number % 9 == 0, NULL, number % 9 == 3, 'str_' || toString(number), number), range(number % 10 + 1))) from numbers(400000, 400000) settings min_insert_block_size_rows=50000;
-insert into test select number, if (number % 5 == 1, [range((number % 10 + 1)::UInt64)]::Array(Array(Dynamic)), number) from numbers(100000, 100000) settings min_insert_block_size_rows=50000;
-insert into test select number, if (number % 5 == 1, ('str_' || number)::LowCardinality(String)::Dynamic, number::Dynamic) from numbers(100000, 100000) settings min_insert_block_size_rows=50000;
-
-select distinct dynamicType(d) as type from test order by type;
-select count() from test where dynamicType(d) == 'UInt64';
-select count() from test where d.UInt64 is not NULL;
-select count() from test where dynamicType(d) == 'String';
-select count() from test where d.String is not NULL;
-select count() from test where dynamicType(d) == 'Date';
-select count() from test where d.Date is not NULL;
-select count() from test where dynamicType(d) == 'LowCardinality(String)';
-select count() from test where d.`LowCardinality(String)` is not NULL;
-select count() from test where dynamicType(d) == 'Array(Variant(String, UInt64))';
-select count() from test where not empty(d.`Array(Variant(String, UInt64))`);
-select count() from test where dynamicType(d) == 'Array(Array(Dynamic))';
-select count() from test where not empty(d.`Array(Array(Dynamic))`);
-select count() from test where d is NULL;
-select count() from test where not empty(d.`Tuple(a Array(Dynamic))`.a.String);
-
-select d, d.UInt64, d.String, d.`Array(Variant(String, UInt64))` from test format Null;
-select d.UInt64, d.String, d.`Array(Variant(String, UInt64))` from test format Null;
-select d.Int8, d.Date, d.`Array(String)` from test format Null;
-select d, d.UInt64, d.Date, d.`Array(Variant(String, UInt64))`, d.`Array(Variant(String, UInt64))`.size0, d.`Array(Variant(String, UInt64))`.UInt64 from test format Null;
-select d.UInt64, d.Date, d.`Array(Variant(String, UInt64))`, d.`Array(Variant(String, UInt64))`.size0, d.`Array(Variant(String, UInt64))`.UInt64, d.`Array(Variant(String, UInt64))`.String from test format Null;
-select d, d.`Tuple(a UInt64, b String)`.a, d.`Array(Dynamic)`.`Variant(String, UInt64)`.UInt64, d.`Array(Variant(String, UInt64))`.UInt64 from test format Null;
-select d.`Array(Dynamic)`.`Variant(String, UInt64)`.UInt64, d.`Array(Dynamic)`.size0, d.`Array(Variant(String, UInt64))`.UInt64 from test format Null;
-select d.`Array(Array(Dynamic))`.size1, d.`Array(Array(Dynamic))`.UInt64, d.`Array(Array(Dynamic))`.`Map(String, Tuple(a UInt64))`.values.a from test format Null;
-    
-drop table test;
diff --git a/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_small.reference.j2 b/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_small.reference.j2
deleted file mode 100644
index de12c6b8737..00000000000
--- a/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_small.reference.j2
+++ /dev/null
@@ -1,2463 +0,0 @@
-Memory
-Array(Array(Dynamic))
-Array(Variant(String, UInt64))
-LowCardinality(String)
-None
-String
-UInt64
-36
-36
-20
-20
-0
-0
-2
-2
-20
-20
-2
-2
-20
-0
-0	0	\N	[]
-1	1	\N	[]
-2	2	\N	[]
-3	3	\N	[]
-4	4	\N	[]
-5	5	\N	[]
-6	6	\N	[]
-7	7	\N	[]
-8	8	\N	[]
-9	9	\N	[]
-str_10	\N	str_10	[]
-10	10	\N	[]
-10	10	\N	[]
-[[0,1]]	\N	\N	[]
-str_11	\N	\N	[]
-str_11	\N	str_11	[]
-str_12	\N	str_12	[]
-12	12	\N	[]
-12	12	\N	[]
-str_13	\N	str_13	[]
-13	13	\N	[]
-13	13	\N	[]
-str_14	\N	str_14	[]
-14	14	\N	[]
-14	14	\N	[]
-str_15	\N	str_15	[]
-15	15	\N	[]
-15	15	\N	[]
-[[0,1,2,3,4,5,6]]	\N	\N	[]
-str_16	\N	\N	[]
-str_16	\N	str_16	[]
-str_17	\N	str_17	[]
-17	17	\N	[]
-17	17	\N	[]
-str_18	\N	str_18	[]
-18	18	\N	[]
-18	18	\N	[]
-str_19	\N	str_19	[]
-19	19	\N	[]
-19	19	\N	[]
-[20]	\N	\N	[20]
-['str_21','str_21']	\N	\N	['str_21','str_21']
-[22,22,22]	\N	\N	[22,22,22]
-[23,23,23,23]	\N	\N	[23,23,23,23]
-[24,24,24,24,24]	\N	\N	[24,24,24,24,24]
-[25,25,25,25,25,25]	\N	\N	[25,25,25,25,25,25]
-[26,26,26,26,26,26,26]	\N	\N	[26,26,26,26,26,26,26]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	\N	\N	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-[28,28,28,28,28,28,28,28,28]	\N	\N	[28,28,28,28,28,28,28,28,28]
-[29,29,29,29,29,29,29,29,29,29]	\N	\N	[29,29,29,29,29,29,29,29,29,29]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-[40]	\N	\N	[40]
-41	41	\N	[]
-\N	\N	\N	[]
-str_43	\N	str_43	[]
-[44,44,44,44,44]	\N	\N	[44,44,44,44,44]
-45	45	\N	[]
-\N	\N	\N	[]
-str_47	\N	str_47	[]
-['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']	\N	\N	['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']
-49	49	\N	[]
-\N	\N	\N	[]
-str_51	\N	str_51	[]
-[52,52,52]	\N	\N	[52,52,52]
-53	53	\N	[]
-\N	\N	\N	[]
-str_55	\N	str_55	[]
-[56,56,56,56,56,56,56]	\N	\N	[56,56,56,56,56,56,56]
-57	57	\N	[]
-\N	\N	\N	[]
-str_59	\N	str_59	[]
-[60]	\N	\N	[60]
-61	61	\N	[]
-\N	\N	\N	[]
-str_63	\N	str_63	[]
-[64,64,64,64,64]	\N	\N	[64,64,64,64,64]
-65	65	\N	[]
-\N	\N	\N	[]
-str_67	\N	str_67	[]
-[68,68,68,68,68,68,68,68,68]	\N	\N	[68,68,68,68,68,68,68,68,68]
-69	69	\N	[]
-\N	\N	\N	[]
-str_71	\N	str_71	[]
-[NULL,NULL,NULL]	\N	\N	[NULL,NULL,NULL]
-73	73	\N	[]
-\N	\N	\N	[]
-str_75	\N	str_75	[]
-[76,76,76,76,76,76,76]	\N	\N	[76,76,76,76,76,76,76]
-77	77	\N	[]
-\N	\N	\N	[]
-str_79	\N	str_79	[]
-0	\N	[]
-1	\N	[]
-2	\N	[]
-3	\N	[]
-4	\N	[]
-5	\N	[]
-6	\N	[]
-7	\N	[]
-8	\N	[]
-9	\N	[]
-\N	str_10	[]
-10	\N	[]
-10	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	str_11	[]
-\N	str_12	[]
-12	\N	[]
-12	\N	[]
-\N	str_13	[]
-13	\N	[]
-13	\N	[]
-\N	str_14	[]
-14	\N	[]
-14	\N	[]
-\N	str_15	[]
-15	\N	[]
-15	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	str_16	[]
-\N	str_17	[]
-17	\N	[]
-17	\N	[]
-\N	str_18	[]
-18	\N	[]
-18	\N	[]
-\N	str_19	[]
-19	\N	[]
-19	\N	[]
-\N	\N	[20]
-\N	\N	['str_21','str_21']
-\N	\N	[22,22,22]
-\N	\N	[23,23,23,23]
-\N	\N	[24,24,24,24,24]
-\N	\N	[25,25,25,25,25,25]
-\N	\N	[26,26,26,26,26,26,26]
-\N	\N	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[28,28,28,28,28,28,28,28,28]
-\N	\N	[29,29,29,29,29,29,29,29,29,29]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[40]
-41	\N	[]
-\N	\N	[]
-\N	str_43	[]
-\N	\N	[44,44,44,44,44]
-45	\N	[]
-\N	\N	[]
-\N	str_47	[]
-\N	\N	['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']
-49	\N	[]
-\N	\N	[]
-\N	str_51	[]
-\N	\N	[52,52,52]
-53	\N	[]
-\N	\N	[]
-\N	str_55	[]
-\N	\N	[56,56,56,56,56,56,56]
-57	\N	[]
-\N	\N	[]
-\N	str_59	[]
-\N	\N	[60]
-61	\N	[]
-\N	\N	[]
-\N	str_63	[]
-\N	\N	[64,64,64,64,64]
-65	\N	[]
-\N	\N	[]
-\N	str_67	[]
-\N	\N	[68,68,68,68,68,68,68,68,68]
-69	\N	[]
-\N	\N	[]
-\N	str_71	[]
-\N	\N	[NULL,NULL,NULL]
-73	\N	[]
-\N	\N	[]
-\N	str_75	[]
-\N	\N	[76,76,76,76,76,76,76]
-77	\N	[]
-\N	\N	[]
-\N	str_79	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-0	0	\N	[]	0	[]
-1	1	\N	[]	0	[]
-2	2	\N	[]	0	[]
-3	3	\N	[]	0	[]
-4	4	\N	[]	0	[]
-5	5	\N	[]	0	[]
-6	6	\N	[]	0	[]
-7	7	\N	[]	0	[]
-8	8	\N	[]	0	[]
-9	9	\N	[]	0	[]
-str_10	\N	\N	[]	0	[]
-10	10	\N	[]	0	[]
-10	10	\N	[]	0	[]
-[[0,1]]	\N	\N	[]	0	[]
-str_11	\N	\N	[]	0	[]
-str_11	\N	\N	[]	0	[]
-str_12	\N	\N	[]	0	[]
-12	12	\N	[]	0	[]
-12	12	\N	[]	0	[]
-str_13	\N	\N	[]	0	[]
-13	13	\N	[]	0	[]
-13	13	\N	[]	0	[]
-str_14	\N	\N	[]	0	[]
-14	14	\N	[]	0	[]
-14	14	\N	[]	0	[]
-str_15	\N	\N	[]	0	[]
-15	15	\N	[]	0	[]
-15	15	\N	[]	0	[]
-[[0,1,2,3,4,5,6]]	\N	\N	[]	0	[]
-str_16	\N	\N	[]	0	[]
-str_16	\N	\N	[]	0	[]
-str_17	\N	\N	[]	0	[]
-17	17	\N	[]	0	[]
-17	17	\N	[]	0	[]
-str_18	\N	\N	[]	0	[]
-18	18	\N	[]	0	[]
-18	18	\N	[]	0	[]
-str_19	\N	\N	[]	0	[]
-19	19	\N	[]	0	[]
-19	19	\N	[]	0	[]
-[20]	\N	\N	[20]	1	[20]
-['str_21','str_21']	\N	\N	['str_21','str_21']	2	[NULL,NULL]
-[22,22,22]	\N	\N	[22,22,22]	3	[22,22,22]
-[23,23,23,23]	\N	\N	[23,23,23,23]	4	[23,23,23,23]
-[24,24,24,24,24]	\N	\N	[24,24,24,24,24]	5	[24,24,24,24,24]
-[25,25,25,25,25,25]	\N	\N	[25,25,25,25,25,25]	6	[25,25,25,25,25,25]
-[26,26,26,26,26,26,26]	\N	\N	[26,26,26,26,26,26,26]	7	[26,26,26,26,26,26,26]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	\N	\N	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	8	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-[28,28,28,28,28,28,28,28,28]	\N	\N	[28,28,28,28,28,28,28,28,28]	9	[28,28,28,28,28,28,28,28,28]
-[29,29,29,29,29,29,29,29,29,29]	\N	\N	[29,29,29,29,29,29,29,29,29,29]	10	[29,29,29,29,29,29,29,29,29,29]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-[40]	\N	\N	[40]	1	[40]
-41	41	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_43	\N	\N	[]	0	[]
-[44,44,44,44,44]	\N	\N	[44,44,44,44,44]	5	[44,44,44,44,44]
-45	45	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_47	\N	\N	[]	0	[]
-['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']	\N	\N	['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']	9	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-49	49	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_51	\N	\N	[]	0	[]
-[52,52,52]	\N	\N	[52,52,52]	3	[52,52,52]
-53	53	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_55	\N	\N	[]	0	[]
-[56,56,56,56,56,56,56]	\N	\N	[56,56,56,56,56,56,56]	7	[56,56,56,56,56,56,56]
-57	57	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_59	\N	\N	[]	0	[]
-[60]	\N	\N	[60]	1	[60]
-61	61	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_63	\N	\N	[]	0	[]
-[64,64,64,64,64]	\N	\N	[64,64,64,64,64]	5	[64,64,64,64,64]
-65	65	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_67	\N	\N	[]	0	[]
-[68,68,68,68,68,68,68,68,68]	\N	\N	[68,68,68,68,68,68,68,68,68]	9	[68,68,68,68,68,68,68,68,68]
-69	69	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_71	\N	\N	[]	0	[]
-[NULL,NULL,NULL]	\N	\N	[NULL,NULL,NULL]	3	[NULL,NULL,NULL]
-73	73	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_75	\N	\N	[]	0	[]
-[76,76,76,76,76,76,76]	\N	\N	[76,76,76,76,76,76,76]	7	[76,76,76,76,76,76,76]
-77	77	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_79	\N	\N	[]	0	[]
-0	\N	[]	0	[]	[]
-1	\N	[]	0	[]	[]
-2	\N	[]	0	[]	[]
-3	\N	[]	0	[]	[]
-4	\N	[]	0	[]	[]
-5	\N	[]	0	[]	[]
-6	\N	[]	0	[]	[]
-7	\N	[]	0	[]	[]
-8	\N	[]	0	[]	[]
-9	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-10	\N	[]	0	[]	[]
-10	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-12	\N	[]	0	[]	[]
-12	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-13	\N	[]	0	[]	[]
-13	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-14	\N	[]	0	[]	[]
-14	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-15	\N	[]	0	[]	[]
-15	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-17	\N	[]	0	[]	[]
-17	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-18	\N	[]	0	[]	[]
-18	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-19	\N	[]	0	[]	[]
-19	\N	[]	0	[]	[]
-\N	\N	[20]	1	[20]	[NULL]
-\N	\N	['str_21','str_21']	2	[NULL,NULL]	['str_21','str_21']
-\N	\N	[22,22,22]	3	[22,22,22]	[NULL,NULL,NULL]
-\N	\N	[23,23,23,23]	4	[23,23,23,23]	[NULL,NULL,NULL,NULL]
-\N	\N	[24,24,24,24,24]	5	[24,24,24,24,24]	[NULL,NULL,NULL,NULL,NULL]
-\N	\N	[25,25,25,25,25,25]	6	[25,25,25,25,25,25]	[NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[26,26,26,26,26,26,26]	7	[26,26,26,26,26,26,26]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	8	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[28,28,28,28,28,28,28,28,28]	9	[28,28,28,28,28,28,28,28,28]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[29,29,29,29,29,29,29,29,29,29]	10	[29,29,29,29,29,29,29,29,29,29]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[40]	1	[40]	[NULL]
-41	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[44,44,44,44,44]	5	[44,44,44,44,44]	[NULL,NULL,NULL,NULL,NULL]
-45	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']	9	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']
-49	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[52,52,52]	3	[52,52,52]	[NULL,NULL,NULL]
-53	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[56,56,56,56,56,56,56]	7	[56,56,56,56,56,56,56]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-57	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[60]	1	[60]	[NULL]
-61	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[64,64,64,64,64]	5	[64,64,64,64,64]	[NULL,NULL,NULL,NULL,NULL]
-65	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[68,68,68,68,68,68,68,68,68]	9	[68,68,68,68,68,68,68,68,68]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-69	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[NULL,NULL,NULL]	3	[NULL,NULL,NULL]	[NULL,NULL,NULL]
-73	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[76,76,76,76,76,76,76]	7	[76,76,76,76,76,76,76]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-77	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-0	0	[]	[]
-1	0	[]	[]
-2	0	[]	[]
-3	0	[]	[]
-4	0	[]	[]
-5	0	[]	[]
-6	0	[]	[]
-7	0	[]	[]
-8	0	[]	[]
-9	0	[]	[]
-str_10	0	[]	[]
-10	0	[]	[]
-10	0	[]	[]
-[[0,1]]	0	[]	[]
-str_11	0	[]	[]
-str_11	0	[]	[]
-str_12	0	[]	[]
-12	0	[]	[]
-12	0	[]	[]
-str_13	0	[]	[]
-13	0	[]	[]
-13	0	[]	[]
-str_14	0	[]	[]
-14	0	[]	[]
-14	0	[]	[]
-str_15	0	[]	[]
-15	0	[]	[]
-15	0	[]	[]
-[[0,1,2,3,4,5,6]]	0	[]	[]
-str_16	0	[]	[]
-str_16	0	[]	[]
-str_17	0	[]	[]
-17	0	[]	[]
-17	0	[]	[]
-str_18	0	[]	[]
-18	0	[]	[]
-18	0	[]	[]
-str_19	0	[]	[]
-19	0	[]	[]
-19	0	[]	[]
-[20]	0	[]	[20]
-['str_21','str_21']	0	[]	[NULL,NULL]
-[22,22,22]	0	[]	[22,22,22]
-[23,23,23,23]	0	[]	[23,23,23,23]
-[24,24,24,24,24]	0	[]	[24,24,24,24,24]
-[25,25,25,25,25,25]	0	[]	[25,25,25,25,25,25]
-[26,26,26,26,26,26,26]	0	[]	[26,26,26,26,26,26,26]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	0	[]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-[28,28,28,28,28,28,28,28,28]	0	[]	[28,28,28,28,28,28,28,28,28]
-[29,29,29,29,29,29,29,29,29,29]	0	[]	[29,29,29,29,29,29,29,29,29,29]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-[40]	0	[]	[40]
-41	0	[]	[]
-\N	0	[]	[]
-str_43	0	[]	[]
-[44,44,44,44,44]	0	[]	[44,44,44,44,44]
-45	0	[]	[]
-\N	0	[]	[]
-str_47	0	[]	[]
-['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']	0	[]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-49	0	[]	[]
-\N	0	[]	[]
-str_51	0	[]	[]
-[52,52,52]	0	[]	[52,52,52]
-53	0	[]	[]
-\N	0	[]	[]
-str_55	0	[]	[]
-[56,56,56,56,56,56,56]	0	[]	[56,56,56,56,56,56,56]
-57	0	[]	[]
-\N	0	[]	[]
-str_59	0	[]	[]
-[60]	0	[]	[60]
-61	0	[]	[]
-\N	0	[]	[]
-str_63	0	[]	[]
-[64,64,64,64,64]	0	[]	[64,64,64,64,64]
-65	0	[]	[]
-\N	0	[]	[]
-str_67	0	[]	[]
-[68,68,68,68,68,68,68,68,68]	0	[]	[68,68,68,68,68,68,68,68,68]
-69	0	[]	[]
-\N	0	[]	[]
-str_71	0	[]	[]
-[NULL,NULL,NULL]	0	[]	[NULL,NULL,NULL]
-73	0	[]	[]
-\N	0	[]	[]
-str_75	0	[]	[]
-[76,76,76,76,76,76,76]	0	[]	[76,76,76,76,76,76,76]
-77	0	[]	[]
-\N	0	[]	[]
-str_79	0	[]	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[20]
-[]	0	[NULL,NULL]
-[]	0	[22,22,22]
-[]	0	[23,23,23,23]
-[]	0	[24,24,24,24,24]
-[]	0	[25,25,25,25,25,25]
-[]	0	[26,26,26,26,26,26,26]
-[]	0	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-[]	0	[28,28,28,28,28,28,28,28,28]
-[]	0	[29,29,29,29,29,29,29,29,29,29]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[40]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[44,44,44,44,44]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[52,52,52]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[56,56,56,56,56,56,56]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[60]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[64,64,64,64,64]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[68,68,68,68,68,68,68,68,68]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[NULL,NULL,NULL]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[76,76,76,76,76,76,76]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[2]	[[0,1]]	[[[],[]]]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[7]	[[0,1,2,3,4,5,6]]	[[[],[],[],[],[],[],[]]]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000
-Array(Array(Dynamic))
-Array(Variant(String, UInt64))
-LowCardinality(String)
-None
-String
-UInt64
-36
-36
-20
-20
-0
-0
-2
-2
-20
-20
-2
-2
-20
-0
-0	0	\N	[]
-1	1	\N	[]
-2	2	\N	[]
-3	3	\N	[]
-4	4	\N	[]
-5	5	\N	[]
-6	6	\N	[]
-7	7	\N	[]
-8	8	\N	[]
-9	9	\N	[]
-str_10	\N	str_10	[]
-10	10	\N	[]
-10	10	\N	[]
-[[0,1]]	\N	\N	[]
-str_11	\N	\N	[]
-str_11	\N	str_11	[]
-str_12	\N	str_12	[]
-12	12	\N	[]
-12	12	\N	[]
-str_13	\N	str_13	[]
-13	13	\N	[]
-13	13	\N	[]
-str_14	\N	str_14	[]
-14	14	\N	[]
-14	14	\N	[]
-str_15	\N	str_15	[]
-15	15	\N	[]
-15	15	\N	[]
-[[0,1,2,3,4,5,6]]	\N	\N	[]
-str_16	\N	\N	[]
-str_16	\N	str_16	[]
-str_17	\N	str_17	[]
-17	17	\N	[]
-17	17	\N	[]
-str_18	\N	str_18	[]
-18	18	\N	[]
-18	18	\N	[]
-str_19	\N	str_19	[]
-19	19	\N	[]
-19	19	\N	[]
-[20]	\N	\N	[20]
-['str_21','str_21']	\N	\N	['str_21','str_21']
-[22,22,22]	\N	\N	[22,22,22]
-[23,23,23,23]	\N	\N	[23,23,23,23]
-[24,24,24,24,24]	\N	\N	[24,24,24,24,24]
-[25,25,25,25,25,25]	\N	\N	[25,25,25,25,25,25]
-[26,26,26,26,26,26,26]	\N	\N	[26,26,26,26,26,26,26]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	\N	\N	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-[28,28,28,28,28,28,28,28,28]	\N	\N	[28,28,28,28,28,28,28,28,28]
-[29,29,29,29,29,29,29,29,29,29]	\N	\N	[29,29,29,29,29,29,29,29,29,29]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-[40]	\N	\N	[40]
-41	41	\N	[]
-\N	\N	\N	[]
-str_43	\N	str_43	[]
-[44,44,44,44,44]	\N	\N	[44,44,44,44,44]
-45	45	\N	[]
-\N	\N	\N	[]
-str_47	\N	str_47	[]
-['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']	\N	\N	['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']
-49	49	\N	[]
-\N	\N	\N	[]
-str_51	\N	str_51	[]
-[52,52,52]	\N	\N	[52,52,52]
-53	53	\N	[]
-\N	\N	\N	[]
-str_55	\N	str_55	[]
-[56,56,56,56,56,56,56]	\N	\N	[56,56,56,56,56,56,56]
-57	57	\N	[]
-\N	\N	\N	[]
-str_59	\N	str_59	[]
-[60]	\N	\N	[60]
-61	61	\N	[]
-\N	\N	\N	[]
-str_63	\N	str_63	[]
-[64,64,64,64,64]	\N	\N	[64,64,64,64,64]
-65	65	\N	[]
-\N	\N	\N	[]
-str_67	\N	str_67	[]
-[68,68,68,68,68,68,68,68,68]	\N	\N	[68,68,68,68,68,68,68,68,68]
-69	69	\N	[]
-\N	\N	\N	[]
-str_71	\N	str_71	[]
-[NULL,NULL,NULL]	\N	\N	[NULL,NULL,NULL]
-73	73	\N	[]
-\N	\N	\N	[]
-str_75	\N	str_75	[]
-[76,76,76,76,76,76,76]	\N	\N	[76,76,76,76,76,76,76]
-77	77	\N	[]
-\N	\N	\N	[]
-str_79	\N	str_79	[]
-0	\N	[]
-1	\N	[]
-2	\N	[]
-3	\N	[]
-4	\N	[]
-5	\N	[]
-6	\N	[]
-7	\N	[]
-8	\N	[]
-9	\N	[]
-\N	str_10	[]
-10	\N	[]
-10	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	str_11	[]
-\N	str_12	[]
-12	\N	[]
-12	\N	[]
-\N	str_13	[]
-13	\N	[]
-13	\N	[]
-\N	str_14	[]
-14	\N	[]
-14	\N	[]
-\N	str_15	[]
-15	\N	[]
-15	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	str_16	[]
-\N	str_17	[]
-17	\N	[]
-17	\N	[]
-\N	str_18	[]
-18	\N	[]
-18	\N	[]
-\N	str_19	[]
-19	\N	[]
-19	\N	[]
-\N	\N	[20]
-\N	\N	['str_21','str_21']
-\N	\N	[22,22,22]
-\N	\N	[23,23,23,23]
-\N	\N	[24,24,24,24,24]
-\N	\N	[25,25,25,25,25,25]
-\N	\N	[26,26,26,26,26,26,26]
-\N	\N	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[28,28,28,28,28,28,28,28,28]
-\N	\N	[29,29,29,29,29,29,29,29,29,29]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[40]
-41	\N	[]
-\N	\N	[]
-\N	str_43	[]
-\N	\N	[44,44,44,44,44]
-45	\N	[]
-\N	\N	[]
-\N	str_47	[]
-\N	\N	['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']
-49	\N	[]
-\N	\N	[]
-\N	str_51	[]
-\N	\N	[52,52,52]
-53	\N	[]
-\N	\N	[]
-\N	str_55	[]
-\N	\N	[56,56,56,56,56,56,56]
-57	\N	[]
-\N	\N	[]
-\N	str_59	[]
-\N	\N	[60]
-61	\N	[]
-\N	\N	[]
-\N	str_63	[]
-\N	\N	[64,64,64,64,64]
-65	\N	[]
-\N	\N	[]
-\N	str_67	[]
-\N	\N	[68,68,68,68,68,68,68,68,68]
-69	\N	[]
-\N	\N	[]
-\N	str_71	[]
-\N	\N	[NULL,NULL,NULL]
-73	\N	[]
-\N	\N	[]
-\N	str_75	[]
-\N	\N	[76,76,76,76,76,76,76]
-77	\N	[]
-\N	\N	[]
-\N	str_79	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-0	0	\N	[]	0	[]
-1	1	\N	[]	0	[]
-2	2	\N	[]	0	[]
-3	3	\N	[]	0	[]
-4	4	\N	[]	0	[]
-5	5	\N	[]	0	[]
-6	6	\N	[]	0	[]
-7	7	\N	[]	0	[]
-8	8	\N	[]	0	[]
-9	9	\N	[]	0	[]
-str_10	\N	\N	[]	0	[]
-10	10	\N	[]	0	[]
-10	10	\N	[]	0	[]
-[[0,1]]	\N	\N	[]	0	[]
-str_11	\N	\N	[]	0	[]
-str_11	\N	\N	[]	0	[]
-str_12	\N	\N	[]	0	[]
-12	12	\N	[]	0	[]
-12	12	\N	[]	0	[]
-str_13	\N	\N	[]	0	[]
-13	13	\N	[]	0	[]
-13	13	\N	[]	0	[]
-str_14	\N	\N	[]	0	[]
-14	14	\N	[]	0	[]
-14	14	\N	[]	0	[]
-str_15	\N	\N	[]	0	[]
-15	15	\N	[]	0	[]
-15	15	\N	[]	0	[]
-[[0,1,2,3,4,5,6]]	\N	\N	[]	0	[]
-str_16	\N	\N	[]	0	[]
-str_16	\N	\N	[]	0	[]
-str_17	\N	\N	[]	0	[]
-17	17	\N	[]	0	[]
-17	17	\N	[]	0	[]
-str_18	\N	\N	[]	0	[]
-18	18	\N	[]	0	[]
-18	18	\N	[]	0	[]
-str_19	\N	\N	[]	0	[]
-19	19	\N	[]	0	[]
-19	19	\N	[]	0	[]
-[20]	\N	\N	[20]	1	[20]
-['str_21','str_21']	\N	\N	['str_21','str_21']	2	[NULL,NULL]
-[22,22,22]	\N	\N	[22,22,22]	3	[22,22,22]
-[23,23,23,23]	\N	\N	[23,23,23,23]	4	[23,23,23,23]
-[24,24,24,24,24]	\N	\N	[24,24,24,24,24]	5	[24,24,24,24,24]
-[25,25,25,25,25,25]	\N	\N	[25,25,25,25,25,25]	6	[25,25,25,25,25,25]
-[26,26,26,26,26,26,26]	\N	\N	[26,26,26,26,26,26,26]	7	[26,26,26,26,26,26,26]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	\N	\N	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	8	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-[28,28,28,28,28,28,28,28,28]	\N	\N	[28,28,28,28,28,28,28,28,28]	9	[28,28,28,28,28,28,28,28,28]
-[29,29,29,29,29,29,29,29,29,29]	\N	\N	[29,29,29,29,29,29,29,29,29,29]	10	[29,29,29,29,29,29,29,29,29,29]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-[40]	\N	\N	[40]	1	[40]
-41	41	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_43	\N	\N	[]	0	[]
-[44,44,44,44,44]	\N	\N	[44,44,44,44,44]	5	[44,44,44,44,44]
-45	45	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_47	\N	\N	[]	0	[]
-['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']	\N	\N	['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']	9	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-49	49	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_51	\N	\N	[]	0	[]
-[52,52,52]	\N	\N	[52,52,52]	3	[52,52,52]
-53	53	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_55	\N	\N	[]	0	[]
-[56,56,56,56,56,56,56]	\N	\N	[56,56,56,56,56,56,56]	7	[56,56,56,56,56,56,56]
-57	57	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_59	\N	\N	[]	0	[]
-[60]	\N	\N	[60]	1	[60]
-61	61	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_63	\N	\N	[]	0	[]
-[64,64,64,64,64]	\N	\N	[64,64,64,64,64]	5	[64,64,64,64,64]
-65	65	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_67	\N	\N	[]	0	[]
-[68,68,68,68,68,68,68,68,68]	\N	\N	[68,68,68,68,68,68,68,68,68]	9	[68,68,68,68,68,68,68,68,68]
-69	69	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_71	\N	\N	[]	0	[]
-[NULL,NULL,NULL]	\N	\N	[NULL,NULL,NULL]	3	[NULL,NULL,NULL]
-73	73	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_75	\N	\N	[]	0	[]
-[76,76,76,76,76,76,76]	\N	\N	[76,76,76,76,76,76,76]	7	[76,76,76,76,76,76,76]
-77	77	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_79	\N	\N	[]	0	[]
-0	\N	[]	0	[]	[]
-1	\N	[]	0	[]	[]
-2	\N	[]	0	[]	[]
-3	\N	[]	0	[]	[]
-4	\N	[]	0	[]	[]
-5	\N	[]	0	[]	[]
-6	\N	[]	0	[]	[]
-7	\N	[]	0	[]	[]
-8	\N	[]	0	[]	[]
-9	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-10	\N	[]	0	[]	[]
-10	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-12	\N	[]	0	[]	[]
-12	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-13	\N	[]	0	[]	[]
-13	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-14	\N	[]	0	[]	[]
-14	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-15	\N	[]	0	[]	[]
-15	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-17	\N	[]	0	[]	[]
-17	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-18	\N	[]	0	[]	[]
-18	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-19	\N	[]	0	[]	[]
-19	\N	[]	0	[]	[]
-\N	\N	[20]	1	[20]	[NULL]
-\N	\N	['str_21','str_21']	2	[NULL,NULL]	['str_21','str_21']
-\N	\N	[22,22,22]	3	[22,22,22]	[NULL,NULL,NULL]
-\N	\N	[23,23,23,23]	4	[23,23,23,23]	[NULL,NULL,NULL,NULL]
-\N	\N	[24,24,24,24,24]	5	[24,24,24,24,24]	[NULL,NULL,NULL,NULL,NULL]
-\N	\N	[25,25,25,25,25,25]	6	[25,25,25,25,25,25]	[NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[26,26,26,26,26,26,26]	7	[26,26,26,26,26,26,26]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	8	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[28,28,28,28,28,28,28,28,28]	9	[28,28,28,28,28,28,28,28,28]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[29,29,29,29,29,29,29,29,29,29]	10	[29,29,29,29,29,29,29,29,29,29]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[40]	1	[40]	[NULL]
-41	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[44,44,44,44,44]	5	[44,44,44,44,44]	[NULL,NULL,NULL,NULL,NULL]
-45	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']	9	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']
-49	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[52,52,52]	3	[52,52,52]	[NULL,NULL,NULL]
-53	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[56,56,56,56,56,56,56]	7	[56,56,56,56,56,56,56]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-57	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[60]	1	[60]	[NULL]
-61	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[64,64,64,64,64]	5	[64,64,64,64,64]	[NULL,NULL,NULL,NULL,NULL]
-65	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[68,68,68,68,68,68,68,68,68]	9	[68,68,68,68,68,68,68,68,68]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-69	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[NULL,NULL,NULL]	3	[NULL,NULL,NULL]	[NULL,NULL,NULL]
-73	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[76,76,76,76,76,76,76]	7	[76,76,76,76,76,76,76]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-77	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-0	0	[]	[]
-1	0	[]	[]
-2	0	[]	[]
-3	0	[]	[]
-4	0	[]	[]
-5	0	[]	[]
-6	0	[]	[]
-7	0	[]	[]
-8	0	[]	[]
-9	0	[]	[]
-str_10	0	[]	[]
-10	0	[]	[]
-10	0	[]	[]
-[[0,1]]	0	[]	[]
-str_11	0	[]	[]
-str_11	0	[]	[]
-str_12	0	[]	[]
-12	0	[]	[]
-12	0	[]	[]
-str_13	0	[]	[]
-13	0	[]	[]
-13	0	[]	[]
-str_14	0	[]	[]
-14	0	[]	[]
-14	0	[]	[]
-str_15	0	[]	[]
-15	0	[]	[]
-15	0	[]	[]
-[[0,1,2,3,4,5,6]]	0	[]	[]
-str_16	0	[]	[]
-str_16	0	[]	[]
-str_17	0	[]	[]
-17	0	[]	[]
-17	0	[]	[]
-str_18	0	[]	[]
-18	0	[]	[]
-18	0	[]	[]
-str_19	0	[]	[]
-19	0	[]	[]
-19	0	[]	[]
-[20]	0	[]	[20]
-['str_21','str_21']	0	[]	[NULL,NULL]
-[22,22,22]	0	[]	[22,22,22]
-[23,23,23,23]	0	[]	[23,23,23,23]
-[24,24,24,24,24]	0	[]	[24,24,24,24,24]
-[25,25,25,25,25,25]	0	[]	[25,25,25,25,25,25]
-[26,26,26,26,26,26,26]	0	[]	[26,26,26,26,26,26,26]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	0	[]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-[28,28,28,28,28,28,28,28,28]	0	[]	[28,28,28,28,28,28,28,28,28]
-[29,29,29,29,29,29,29,29,29,29]	0	[]	[29,29,29,29,29,29,29,29,29,29]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-[40]	0	[]	[40]
-41	0	[]	[]
-\N	0	[]	[]
-str_43	0	[]	[]
-[44,44,44,44,44]	0	[]	[44,44,44,44,44]
-45	0	[]	[]
-\N	0	[]	[]
-str_47	0	[]	[]
-['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']	0	[]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-49	0	[]	[]
-\N	0	[]	[]
-str_51	0	[]	[]
-[52,52,52]	0	[]	[52,52,52]
-53	0	[]	[]
-\N	0	[]	[]
-str_55	0	[]	[]
-[56,56,56,56,56,56,56]	0	[]	[56,56,56,56,56,56,56]
-57	0	[]	[]
-\N	0	[]	[]
-str_59	0	[]	[]
-[60]	0	[]	[60]
-61	0	[]	[]
-\N	0	[]	[]
-str_63	0	[]	[]
-[64,64,64,64,64]	0	[]	[64,64,64,64,64]
-65	0	[]	[]
-\N	0	[]	[]
-str_67	0	[]	[]
-[68,68,68,68,68,68,68,68,68]	0	[]	[68,68,68,68,68,68,68,68,68]
-69	0	[]	[]
-\N	0	[]	[]
-str_71	0	[]	[]
-[NULL,NULL,NULL]	0	[]	[NULL,NULL,NULL]
-73	0	[]	[]
-\N	0	[]	[]
-str_75	0	[]	[]
-[76,76,76,76,76,76,76]	0	[]	[76,76,76,76,76,76,76]
-77	0	[]	[]
-\N	0	[]	[]
-str_79	0	[]	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[20]
-[]	0	[NULL,NULL]
-[]	0	[22,22,22]
-[]	0	[23,23,23,23]
-[]	0	[24,24,24,24,24]
-[]	0	[25,25,25,25,25,25]
-[]	0	[26,26,26,26,26,26,26]
-[]	0	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-[]	0	[28,28,28,28,28,28,28,28,28]
-[]	0	[29,29,29,29,29,29,29,29,29,29]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[40]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[44,44,44,44,44]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[52,52,52]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[56,56,56,56,56,56,56]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[60]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[64,64,64,64,64]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[68,68,68,68,68,68,68,68,68]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[NULL,NULL,NULL]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[76,76,76,76,76,76,76]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[2]	[[0,1]]	[[[],[]]]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[7]	[[0,1,2,3,4,5,6]]	[[[],[],[],[],[],[],[]]]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1
-Array(Array(Dynamic))
-Array(Variant(String, UInt64))
-LowCardinality(String)
-None
-String
-UInt64
-36
-36
-20
-20
-0
-0
-2
-2
-20
-20
-2
-2
-20
-0
-0	0	\N	[]
-1	1	\N	[]
-2	2	\N	[]
-3	3	\N	[]
-4	4	\N	[]
-5	5	\N	[]
-6	6	\N	[]
-7	7	\N	[]
-8	8	\N	[]
-9	9	\N	[]
-str_10	\N	str_10	[]
-10	10	\N	[]
-10	10	\N	[]
-[[0,1]]	\N	\N	[]
-str_11	\N	\N	[]
-str_11	\N	str_11	[]
-str_12	\N	str_12	[]
-12	12	\N	[]
-12	12	\N	[]
-str_13	\N	str_13	[]
-13	13	\N	[]
-13	13	\N	[]
-str_14	\N	str_14	[]
-14	14	\N	[]
-14	14	\N	[]
-str_15	\N	str_15	[]
-15	15	\N	[]
-15	15	\N	[]
-[[0,1,2,3,4,5,6]]	\N	\N	[]
-str_16	\N	\N	[]
-str_16	\N	str_16	[]
-str_17	\N	str_17	[]
-17	17	\N	[]
-17	17	\N	[]
-str_18	\N	str_18	[]
-18	18	\N	[]
-18	18	\N	[]
-str_19	\N	str_19	[]
-19	19	\N	[]
-19	19	\N	[]
-[20]	\N	\N	[20]
-['str_21','str_21']	\N	\N	['str_21','str_21']
-[22,22,22]	\N	\N	[22,22,22]
-[23,23,23,23]	\N	\N	[23,23,23,23]
-[24,24,24,24,24]	\N	\N	[24,24,24,24,24]
-[25,25,25,25,25,25]	\N	\N	[25,25,25,25,25,25]
-[26,26,26,26,26,26,26]	\N	\N	[26,26,26,26,26,26,26]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	\N	\N	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-[28,28,28,28,28,28,28,28,28]	\N	\N	[28,28,28,28,28,28,28,28,28]
-[29,29,29,29,29,29,29,29,29,29]	\N	\N	[29,29,29,29,29,29,29,29,29,29]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-\N	\N	\N	[]
-[40]	\N	\N	[40]
-41	41	\N	[]
-\N	\N	\N	[]
-str_43	\N	str_43	[]
-[44,44,44,44,44]	\N	\N	[44,44,44,44,44]
-45	45	\N	[]
-\N	\N	\N	[]
-str_47	\N	str_47	[]
-['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']	\N	\N	['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']
-49	49	\N	[]
-\N	\N	\N	[]
-str_51	\N	str_51	[]
-[52,52,52]	\N	\N	[52,52,52]
-53	53	\N	[]
-\N	\N	\N	[]
-str_55	\N	str_55	[]
-[56,56,56,56,56,56,56]	\N	\N	[56,56,56,56,56,56,56]
-57	57	\N	[]
-\N	\N	\N	[]
-str_59	\N	str_59	[]
-[60]	\N	\N	[60]
-61	61	\N	[]
-\N	\N	\N	[]
-str_63	\N	str_63	[]
-[64,64,64,64,64]	\N	\N	[64,64,64,64,64]
-65	65	\N	[]
-\N	\N	\N	[]
-str_67	\N	str_67	[]
-[68,68,68,68,68,68,68,68,68]	\N	\N	[68,68,68,68,68,68,68,68,68]
-69	69	\N	[]
-\N	\N	\N	[]
-str_71	\N	str_71	[]
-[NULL,NULL,NULL]	\N	\N	[NULL,NULL,NULL]
-73	73	\N	[]
-\N	\N	\N	[]
-str_75	\N	str_75	[]
-[76,76,76,76,76,76,76]	\N	\N	[76,76,76,76,76,76,76]
-77	77	\N	[]
-\N	\N	\N	[]
-str_79	\N	str_79	[]
-0	\N	[]
-1	\N	[]
-2	\N	[]
-3	\N	[]
-4	\N	[]
-5	\N	[]
-6	\N	[]
-7	\N	[]
-8	\N	[]
-9	\N	[]
-\N	str_10	[]
-10	\N	[]
-10	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	str_11	[]
-\N	str_12	[]
-12	\N	[]
-12	\N	[]
-\N	str_13	[]
-13	\N	[]
-13	\N	[]
-\N	str_14	[]
-14	\N	[]
-14	\N	[]
-\N	str_15	[]
-15	\N	[]
-15	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	str_16	[]
-\N	str_17	[]
-17	\N	[]
-17	\N	[]
-\N	str_18	[]
-18	\N	[]
-18	\N	[]
-\N	str_19	[]
-19	\N	[]
-19	\N	[]
-\N	\N	[20]
-\N	\N	['str_21','str_21']
-\N	\N	[22,22,22]
-\N	\N	[23,23,23,23]
-\N	\N	[24,24,24,24,24]
-\N	\N	[25,25,25,25,25,25]
-\N	\N	[26,26,26,26,26,26,26]
-\N	\N	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[28,28,28,28,28,28,28,28,28]
-\N	\N	[29,29,29,29,29,29,29,29,29,29]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[40]
-41	\N	[]
-\N	\N	[]
-\N	str_43	[]
-\N	\N	[44,44,44,44,44]
-45	\N	[]
-\N	\N	[]
-\N	str_47	[]
-\N	\N	['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']
-49	\N	[]
-\N	\N	[]
-\N	str_51	[]
-\N	\N	[52,52,52]
-53	\N	[]
-\N	\N	[]
-\N	str_55	[]
-\N	\N	[56,56,56,56,56,56,56]
-57	\N	[]
-\N	\N	[]
-\N	str_59	[]
-\N	\N	[60]
-61	\N	[]
-\N	\N	[]
-\N	str_63	[]
-\N	\N	[64,64,64,64,64]
-65	\N	[]
-\N	\N	[]
-\N	str_67	[]
-\N	\N	[68,68,68,68,68,68,68,68,68]
-69	\N	[]
-\N	\N	[]
-\N	str_71	[]
-\N	\N	[NULL,NULL,NULL]
-73	\N	[]
-\N	\N	[]
-\N	str_75	[]
-\N	\N	[76,76,76,76,76,76,76]
-77	\N	[]
-\N	\N	[]
-\N	str_79	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-\N	\N	[]
-0	0	\N	[]	0	[]
-1	1	\N	[]	0	[]
-2	2	\N	[]	0	[]
-3	3	\N	[]	0	[]
-4	4	\N	[]	0	[]
-5	5	\N	[]	0	[]
-6	6	\N	[]	0	[]
-7	7	\N	[]	0	[]
-8	8	\N	[]	0	[]
-9	9	\N	[]	0	[]
-str_10	\N	\N	[]	0	[]
-10	10	\N	[]	0	[]
-10	10	\N	[]	0	[]
-[[0,1]]	\N	\N	[]	0	[]
-str_11	\N	\N	[]	0	[]
-str_11	\N	\N	[]	0	[]
-str_12	\N	\N	[]	0	[]
-12	12	\N	[]	0	[]
-12	12	\N	[]	0	[]
-str_13	\N	\N	[]	0	[]
-13	13	\N	[]	0	[]
-13	13	\N	[]	0	[]
-str_14	\N	\N	[]	0	[]
-14	14	\N	[]	0	[]
-14	14	\N	[]	0	[]
-str_15	\N	\N	[]	0	[]
-15	15	\N	[]	0	[]
-15	15	\N	[]	0	[]
-[[0,1,2,3,4,5,6]]	\N	\N	[]	0	[]
-str_16	\N	\N	[]	0	[]
-str_16	\N	\N	[]	0	[]
-str_17	\N	\N	[]	0	[]
-17	17	\N	[]	0	[]
-17	17	\N	[]	0	[]
-str_18	\N	\N	[]	0	[]
-18	18	\N	[]	0	[]
-18	18	\N	[]	0	[]
-str_19	\N	\N	[]	0	[]
-19	19	\N	[]	0	[]
-19	19	\N	[]	0	[]
-[20]	\N	\N	[20]	1	[20]
-['str_21','str_21']	\N	\N	['str_21','str_21']	2	[NULL,NULL]
-[22,22,22]	\N	\N	[22,22,22]	3	[22,22,22]
-[23,23,23,23]	\N	\N	[23,23,23,23]	4	[23,23,23,23]
-[24,24,24,24,24]	\N	\N	[24,24,24,24,24]	5	[24,24,24,24,24]
-[25,25,25,25,25,25]	\N	\N	[25,25,25,25,25,25]	6	[25,25,25,25,25,25]
-[26,26,26,26,26,26,26]	\N	\N	[26,26,26,26,26,26,26]	7	[26,26,26,26,26,26,26]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	\N	\N	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	8	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-[28,28,28,28,28,28,28,28,28]	\N	\N	[28,28,28,28,28,28,28,28,28]	9	[28,28,28,28,28,28,28,28,28]
-[29,29,29,29,29,29,29,29,29,29]	\N	\N	[29,29,29,29,29,29,29,29,29,29]	10	[29,29,29,29,29,29,29,29,29,29]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-[40]	\N	\N	[40]	1	[40]
-41	41	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_43	\N	\N	[]	0	[]
-[44,44,44,44,44]	\N	\N	[44,44,44,44,44]	5	[44,44,44,44,44]
-45	45	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_47	\N	\N	[]	0	[]
-['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']	\N	\N	['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']	9	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-49	49	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_51	\N	\N	[]	0	[]
-[52,52,52]	\N	\N	[52,52,52]	3	[52,52,52]
-53	53	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_55	\N	\N	[]	0	[]
-[56,56,56,56,56,56,56]	\N	\N	[56,56,56,56,56,56,56]	7	[56,56,56,56,56,56,56]
-57	57	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_59	\N	\N	[]	0	[]
-[60]	\N	\N	[60]	1	[60]
-61	61	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_63	\N	\N	[]	0	[]
-[64,64,64,64,64]	\N	\N	[64,64,64,64,64]	5	[64,64,64,64,64]
-65	65	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_67	\N	\N	[]	0	[]
-[68,68,68,68,68,68,68,68,68]	\N	\N	[68,68,68,68,68,68,68,68,68]	9	[68,68,68,68,68,68,68,68,68]
-69	69	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_71	\N	\N	[]	0	[]
-[NULL,NULL,NULL]	\N	\N	[NULL,NULL,NULL]	3	[NULL,NULL,NULL]
-73	73	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_75	\N	\N	[]	0	[]
-[76,76,76,76,76,76,76]	\N	\N	[76,76,76,76,76,76,76]	7	[76,76,76,76,76,76,76]
-77	77	\N	[]	0	[]
-\N	\N	\N	[]	0	[]
-str_79	\N	\N	[]	0	[]
-0	\N	[]	0	[]	[]
-1	\N	[]	0	[]	[]
-2	\N	[]	0	[]	[]
-3	\N	[]	0	[]	[]
-4	\N	[]	0	[]	[]
-5	\N	[]	0	[]	[]
-6	\N	[]	0	[]	[]
-7	\N	[]	0	[]	[]
-8	\N	[]	0	[]	[]
-9	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-10	\N	[]	0	[]	[]
-10	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-12	\N	[]	0	[]	[]
-12	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-13	\N	[]	0	[]	[]
-13	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-14	\N	[]	0	[]	[]
-14	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-15	\N	[]	0	[]	[]
-15	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-17	\N	[]	0	[]	[]
-17	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-18	\N	[]	0	[]	[]
-18	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-19	\N	[]	0	[]	[]
-19	\N	[]	0	[]	[]
-\N	\N	[20]	1	[20]	[NULL]
-\N	\N	['str_21','str_21']	2	[NULL,NULL]	['str_21','str_21']
-\N	\N	[22,22,22]	3	[22,22,22]	[NULL,NULL,NULL]
-\N	\N	[23,23,23,23]	4	[23,23,23,23]	[NULL,NULL,NULL,NULL]
-\N	\N	[24,24,24,24,24]	5	[24,24,24,24,24]	[NULL,NULL,NULL,NULL,NULL]
-\N	\N	[25,25,25,25,25,25]	6	[25,25,25,25,25,25]	[NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[26,26,26,26,26,26,26]	7	[26,26,26,26,26,26,26]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	8	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[28,28,28,28,28,28,28,28,28]	9	[28,28,28,28,28,28,28,28,28]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[29,29,29,29,29,29,29,29,29,29]	10	[29,29,29,29,29,29,29,29,29,29]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[40]	1	[40]	[NULL]
-41	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[44,44,44,44,44]	5	[44,44,44,44,44]	[NULL,NULL,NULL,NULL,NULL]
-45	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']	9	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']
-49	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[52,52,52]	3	[52,52,52]	[NULL,NULL,NULL]
-53	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[56,56,56,56,56,56,56]	7	[56,56,56,56,56,56,56]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-57	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[60]	1	[60]	[NULL]
-61	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[64,64,64,64,64]	5	[64,64,64,64,64]	[NULL,NULL,NULL,NULL,NULL]
-65	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[68,68,68,68,68,68,68,68,68]	9	[68,68,68,68,68,68,68,68,68]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-69	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[NULL,NULL,NULL]	3	[NULL,NULL,NULL]	[NULL,NULL,NULL]
-73	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[76,76,76,76,76,76,76]	7	[76,76,76,76,76,76,76]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-77	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-\N	\N	[]	0	[]	[]
-0	0	[]	[]
-1	0	[]	[]
-2	0	[]	[]
-3	0	[]	[]
-4	0	[]	[]
-5	0	[]	[]
-6	0	[]	[]
-7	0	[]	[]
-8	0	[]	[]
-9	0	[]	[]
-str_10	0	[]	[]
-10	0	[]	[]
-10	0	[]	[]
-[[0,1]]	0	[]	[]
-str_11	0	[]	[]
-str_11	0	[]	[]
-str_12	0	[]	[]
-12	0	[]	[]
-12	0	[]	[]
-str_13	0	[]	[]
-13	0	[]	[]
-13	0	[]	[]
-str_14	0	[]	[]
-14	0	[]	[]
-14	0	[]	[]
-str_15	0	[]	[]
-15	0	[]	[]
-15	0	[]	[]
-[[0,1,2,3,4,5,6]]	0	[]	[]
-str_16	0	[]	[]
-str_16	0	[]	[]
-str_17	0	[]	[]
-17	0	[]	[]
-17	0	[]	[]
-str_18	0	[]	[]
-18	0	[]	[]
-18	0	[]	[]
-str_19	0	[]	[]
-19	0	[]	[]
-19	0	[]	[]
-[20]	0	[]	[20]
-['str_21','str_21']	0	[]	[NULL,NULL]
-[22,22,22]	0	[]	[22,22,22]
-[23,23,23,23]	0	[]	[23,23,23,23]
-[24,24,24,24,24]	0	[]	[24,24,24,24,24]
-[25,25,25,25,25,25]	0	[]	[25,25,25,25,25,25]
-[26,26,26,26,26,26,26]	0	[]	[26,26,26,26,26,26,26]
-[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]	0	[]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-[28,28,28,28,28,28,28,28,28]	0	[]	[28,28,28,28,28,28,28,28,28]
-[29,29,29,29,29,29,29,29,29,29]	0	[]	[29,29,29,29,29,29,29,29,29,29]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-\N	0	[]	[]
-[40]	0	[]	[40]
-41	0	[]	[]
-\N	0	[]	[]
-str_43	0	[]	[]
-[44,44,44,44,44]	0	[]	[44,44,44,44,44]
-45	0	[]	[]
-\N	0	[]	[]
-str_47	0	[]	[]
-['str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48','str_48']	0	[]	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-49	0	[]	[]
-\N	0	[]	[]
-str_51	0	[]	[]
-[52,52,52]	0	[]	[52,52,52]
-53	0	[]	[]
-\N	0	[]	[]
-str_55	0	[]	[]
-[56,56,56,56,56,56,56]	0	[]	[56,56,56,56,56,56,56]
-57	0	[]	[]
-\N	0	[]	[]
-str_59	0	[]	[]
-[60]	0	[]	[60]
-61	0	[]	[]
-\N	0	[]	[]
-str_63	0	[]	[]
-[64,64,64,64,64]	0	[]	[64,64,64,64,64]
-65	0	[]	[]
-\N	0	[]	[]
-str_67	0	[]	[]
-[68,68,68,68,68,68,68,68,68]	0	[]	[68,68,68,68,68,68,68,68,68]
-69	0	[]	[]
-\N	0	[]	[]
-str_71	0	[]	[]
-[NULL,NULL,NULL]	0	[]	[NULL,NULL,NULL]
-73	0	[]	[]
-\N	0	[]	[]
-str_75	0	[]	[]
-[76,76,76,76,76,76,76]	0	[]	[76,76,76,76,76,76,76]
-77	0	[]	[]
-\N	0	[]	[]
-str_79	0	[]	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[20]
-[]	0	[NULL,NULL]
-[]	0	[22,22,22]
-[]	0	[23,23,23,23]
-[]	0	[24,24,24,24,24]
-[]	0	[25,25,25,25,25,25]
-[]	0	[26,26,26,26,26,26,26]
-[]	0	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-[]	0	[28,28,28,28,28,28,28,28,28]
-[]	0	[29,29,29,29,29,29,29,29,29,29]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[40]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[44,44,44,44,44]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[52,52,52]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[56,56,56,56,56,56,56]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[60]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[64,64,64,64,64]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[68,68,68,68,68,68,68,68,68]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[NULL,NULL,NULL]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	0	[76,76,76,76,76,76,76]
-[]	0	[]
-[]	0	[]
-[]	0	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[2]	[[0,1]]	[[[],[]]]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[7]	[[0,1,2,3,4,5,6]]	[[[],[],[],[],[],[],[]]]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
-[]	[]	[]
diff --git a/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_small.sql.j2 b/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_small.sql.j2
deleted file mode 100644
index dde4f3f53c3..00000000000
--- a/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_small.sql.j2
+++ /dev/null
@@ -1,47 +0,0 @@
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type = 1;
-set allow_experimental_dynamic_type = 1;
-
-drop table if exists test;
-
-{% for engine in ['Memory', 'MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000', 'MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1'] -%}
-
-select '{{ engine }}';
-create table test (id UInt64, d Dynamic(max_types=2)) engine={{ engine }};
-
-insert into test select number, number from numbers(10);
-insert into test select number, 'str_' || toString(number) from numbers(10, 10);
-insert into test select number, arrayMap(x -> multiIf(number % 9 == 0, NULL, number % 9 == 3, 'str_' || toString(number), number), range(number % 10 + 1)) from numbers(20, 10);
-insert into test select number, NULL from numbers(30, 10);
-insert into test select number, multiIf(number % 4 == 3, 'str_' || toString(number), number % 4 == 2, NULL, number % 4 == 1, number, arrayMap(x -> multiIf(number % 9 == 0, NULL, number % 9 == 3, 'str_' || toString(number), number), range(number % 10 + 1))) from numbers(40, 40);
-insert into test select number, if(number % 5 == 1, [range((number % 10 + 1)::UInt64)]::Array(Array(Dynamic)), number) from numbers(10, 10);
-insert into test select number, if(number % 5 == 1, ('str_' || number)::LowCardinality(String)::Dynamic, number::Dynamic) from numbers(10, 10);
-
-select distinct dynamicType(d) as type from test order by type;
-select count() from test where dynamicType(d) == 'UInt64';
-select count() from test where d.UInt64 is not NULL;
-select count() from test where dynamicType(d) == 'String';
-select count() from test where d.String is not NULL;
-select count() from test where dynamicType(d) == 'Date';
-select count() from test where d.Date is not NULL;
-select count() from test where dynamicType(d) == 'LowCardinality(String)';
-select count() from test where d.`LowCardinality(String)` is not NULL;
-select count() from test where dynamicType(d) == 'Array(Variant(String, UInt64))';
-select count() from test where not empty(d.`Array(Variant(String, UInt64))`);
-select count() from test where dynamicType(d) == 'Array(Array(Dynamic))';
-select count() from test where not empty(d.`Array(Array(Dynamic))`);
-select count() from test where d is NULL;
-select count() from test where not empty(d.`Tuple(a Array(Dynamic))`.a.String);
-
-select d, d.UInt64, d.String, d.`Array(Variant(String, UInt64))` from test order by id, d;
-select d.UInt64, d.String, d.`Array(Variant(String, UInt64))` from test order by id, d;
-select d.Int8, d.Date, d.`Array(String)` from test order by id, d;
-select d, d.UInt64, d.Date, d.`Array(Variant(String, UInt64))`, d.`Array(Variant(String, UInt64))`.size0, d.`Array(Variant(String, UInt64))`.UInt64 from test order by id, d;
-select d.UInt64, d.Date, d.`Array(Variant(String, UInt64))`, d.`Array(Variant(String, UInt64))`.size0, d.`Array(Variant(String, UInt64))`.UInt64, d.`Array(Variant(String, UInt64))`.String from test order by id, d;
-select d, d.`Tuple(a UInt64, b String)`.a, d.`Array(Dynamic)`.`Variant(String, UInt64)`.UInt64, d.`Array(Variant(String, UInt64))`.UInt64 from test order by id, d;
-select d.`Array(Dynamic)`.`Variant(String, UInt64)`.UInt64, d.`Array(Dynamic)`.size0, d.`Array(Variant(String, UInt64))`.UInt64 from test order by id, d;
-select d.`Array(Array(Dynamic))`.size1, d.`Array(Array(Dynamic))`.UInt64, d.`Array(Array(Dynamic))`.`Map(String, Tuple(a UInt64))`.values.a from test order by id, d;
-
-drop table test;
-
-{% endfor -%}
diff --git a/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_wide_merge_tree.sql b/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_wide_merge_tree.sql
deleted file mode 100644
index 9e6e0652127..00000000000
--- a/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_wide_merge_tree.sql
+++ /dev/null
@@ -1,45 +0,0 @@
--- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
-
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type = 1;
-set allow_experimental_dynamic_type = 1;
-
-set min_bytes_to_use_direct_io = 0; -- min_bytes_to_use_direct_io > 0 is broken
-
-drop table if exists test;
-create table test (id UInt64, d Dynamic(max_types=2)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;
-
-insert into test select number, number from numbers(100000) settings min_insert_block_size_rows=50000;
-insert into test select number, 'str_' || toString(number) from numbers(100000, 100000) settings min_insert_block_size_rows=50000;
-insert into test select number, arrayMap(x -> multiIf(number % 9 == 0, NULL, number % 9 == 3, 'str_' || toString(number), number), range(number % 10 + 1)) from numbers(200000, 100000) settings min_insert_block_size_rows=50000;
-insert into test select number, NULL from numbers(300000, 100000) settings min_insert_block_size_rows=50000;
-insert into test select number, multiIf(number % 4 == 3, 'str_' || toString(number), number % 4 == 2, NULL, number % 4 == 1, number, arrayMap(x -> multiIf(number % 9 == 0, NULL, number % 9 == 3, 'str_' || toString(number), number), range(number % 10 + 1))) from numbers(400000, 400000) settings min_insert_block_size_rows=50000;
-insert into test select number, if (number % 5 == 1, [range((number % 10 + 1)::UInt64)]::Array(Array(Dynamic)), number) from numbers(100000, 100000) settings min_insert_block_size_rows=50000;
-insert into test select number, if (number % 5 == 1, ('str_' || number)::LowCardinality(String)::Dynamic, number::Dynamic) from numbers(100000, 100000) settings min_insert_block_size_rows=50000;
-
-select distinct dynamicType(d) as type from test order by type;
-select count() from test where dynamicType(d) == 'UInt64';
-select count() from test where d.UInt64 is not NULL;
-select count() from test where dynamicType(d) == 'String';
-select count() from test where d.String is not NULL;
-select count() from test where dynamicType(d) == 'Date';
-select count() from test where d.Date is not NULL;
-select count() from test where dynamicType(d) == 'LowCardinality(String)';
-select count() from test where d.`LowCardinality(String)` is not NULL;
-select count() from test where dynamicType(d) == 'Array(Variant(String, UInt64))';
-select count() from test where not empty(d.`Array(Variant(String, UInt64))`);
-select count() from test where dynamicType(d) == 'Array(Array(Dynamic))';
-select count() from test where not empty(d.`Array(Array(Dynamic))`);
-select count() from test where d is NULL;
-select count() from test where not empty(d.`Tuple(a Array(Dynamic))`.a.String);
-
-select d, d.UInt64, d.String, d.`Array(Variant(String, UInt64))` from test format Null;
-select d.UInt64, d.String, d.`Array(Variant(String, UInt64))` from test format Null;
-select d.Int8, d.Date, d.`Array(String)` from test format Null;
-select d, d.UInt64, d.Date, d.`Array(Variant(String, UInt64))`, d.`Array(Variant(String, UInt64))`.size0, d.`Array(Variant(String, UInt64))`.UInt64 from test format Null;
-select d.UInt64, d.Date, d.`Array(Variant(String, UInt64))`, d.`Array(Variant(String, UInt64))`.size0, d.`Array(Variant(String, UInt64))`.UInt64, d.`Array(Variant(String, UInt64))`.String from test format Null;
-select d, d.`Tuple(a UInt64, b String)`.a, d.`Array(Dynamic)`.`Variant(String, UInt64)`.UInt64, d.`Array(Variant(String, UInt64))`.UInt64 from test format Null;
-select d.`Array(Dynamic)`.`Variant(String, UInt64)`.UInt64, d.`Array(Dynamic)`.size0, d.`Array(Variant(String, UInt64))`.UInt64 from test format Null;
-select d.`Array(Array(Dynamic))`.size1, d.`Array(Array(Dynamic))`.UInt64, d.`Array(Array(Dynamic))`.`Map(String, Tuple(a UInt64))`.values.a from test format Null;
-    
-drop table test;
diff --git a/tests/queries/0_stateless/03036_dynamic_read_subcolumns.lib b/tests/queries/0_stateless/03036_dynamic_read_subcolumns.lib
new file mode 100755
index 00000000000..4914051db82
--- /dev/null
+++ b/tests/queries/0_stateless/03036_dynamic_read_subcolumns.lib
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+function test()
+{
+    echo "test"
+    $CH_CLIENT -q "insert into test select number, number from numbers(100000) settings min_insert_block_size_rows=50000"
+    $CH_CLIENT -q "insert into test select number, 'str_' || toString(number) from numbers(100000, 100000) settings min_insert_block_size_rows=50000"
+    $CH_CLIENT -q "insert into test select number, arrayMap(x -> multiIf(number % 9 == 0, NULL, number % 9 == 3, 'str_' || toString(number), number), range(number % 10 + 1)) from numbers(200000, 100000) settings min_insert_block_size_rows=50000"
+    $CH_CLIENT -q "insert into test select number, NULL from numbers(300000, 100000) settings min_insert_block_size_rows=50000"
+    $CH_CLIENT -q "insert into test select number, multiIf(number % 4 == 3, 'str_' || toString(number), number % 4 == 2, NULL, number % 4 == 1, number, arrayMap(x -> multiIf(number % 9 == 0, NULL, number % 9 == 3, 'str_' || toString(number), number), range(number % 10 + 1))) from numbers(400000, 400000) settings min_insert_block_size_rows=50000"
+    $CH_CLIENT -q "insert into test select number, [range((number % 10 + 1)::UInt64)]::Array(Array(Dynamic)) from numbers(100000, 100000) settings min_insert_block_size_rows=50000"
+
+    $CH_CLIENT -q "select distinct dynamicType(d) as type from test order by type"
+    $CH_CLIENT -q "select count() from test where dynamicType(d) == 'UInt64'"
+    $CH_CLIENT -q "select count() from test where d.UInt64 is not NULL"
+    $CH_CLIENT -q "select count() from test where dynamicType(d) == 'String'"
+    $CH_CLIENT -q "select count() from test where d.String is not NULL"
+    $CH_CLIENT -q "select count() from test where dynamicType(d) == 'Date'"
+    $CH_CLIENT -q "select count() from test where d.Date is not NULL"
+    $CH_CLIENT -q "select count() from test where dynamicType(d) == 'Array(Variant(String, UInt64))'"
+    $CH_CLIENT -q "select count() from test where not empty(d.\`Array(Variant(String, UInt64))\`)"
+    $CH_CLIENT -q "select count() from test where dynamicType(d) == 'Array(Array(Dynamic))'"
+    $CH_CLIENT -q "select count() from test where not empty(d.\`Array(Array(Dynamic))\`)"
+    $CH_CLIENT -q "select count() from test where d is NULL"
+    $CH_CLIENT -q "select count() from test where not empty(d.\`Tuple(a Array(Dynamic))\`.a.String)"
+
+    $CH_CLIENT -q "select d, d.UInt64, d.String, d.\`Array(Variant(String, UInt64))\` from test format Null"
+    $CH_CLIENT -q "select d.UInt64, d.String, d.\`Array(Variant(String, UInt64))\` from test format Null"
+    $CH_CLIENT -q "select d.Int8, d.Date, d.\`Array(String)\` from test format Null"
+    $CH_CLIENT -q "select d, d.UInt64, d.Date, d.\`Array(Variant(String, UInt64))\`, d.\`Array(Variant(String, UInt64))\`.size0, d.\`Array(Variant(String, UInt64))\`.UInt64 from test format Null"
+    $CH_CLIENT -q "select d.UInt64, d.Date, d.\`Array(Variant(String, UInt64))\`, d.\`Array(Variant(String, UInt64))\`.size0, d.\`Array(Variant(String, UInt64))\`.UInt64, d.\`Array(Variant(String, UInt64))\`.String from test format Null"
+    $CH_CLIENT -q "select d, d.\`Tuple(a UInt64, b String)\`.a, d.\`Array(Dynamic)\`.\`Variant(String, UInt64)\`.UInt64, d.\`Array(Variant(String, UInt64))\`.UInt64 from test format Null"
+    $CH_CLIENT -q "select d.\`Array(Dynamic)\`.\`Variant(String, UInt64)\`.UInt64, d.\`Array(Dynamic)\`.size0, d.\`Array(Variant(String, UInt64))\`.UInt64 from test format Null"
+    $CH_CLIENT -q "select d.\`Array(Array(Dynamic))\`.size1, d.\`Array(Array(Dynamic))\`.UInt64, d.\`Array(Array(Dynamic))\`.\`Map(String, Tuple(a UInt64))\`.values.a from test format Null"
+}
diff --git a/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_compact_merge_tree.reference b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_1.reference
similarity index 64%
rename from tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_compact_merge_tree.reference
rename to tests/queries/0_stateless/03036_dynamic_read_subcolumns_1.reference
index ca6c5dbba82..0d51ecfac3b 100644
--- a/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_compact_merge_tree.reference
+++ b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_1.reference
@@ -1,20 +1,19 @@
+Memory
+test
 Array(Array(Dynamic))
 Array(Variant(String, UInt64))
-LowCardinality(String)
 None
 String
 UInt64
-360000
-360000
+200000
+200000
 200000
 200000
 0
 0
-20000
-20000
 200000
 200000
-20000
-20000
+100000
+100000
 200000
 0
diff --git a/tests/queries/0_stateless/03036_dynamic_read_subcolumns_1.sh b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_1.sh
new file mode 100755
index 00000000000..aabba731816
--- /dev/null
+++ b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_1.sh
@@ -0,0 +1,21 @@
+#!/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
+
+
+# shellcheck source=./03036_dynamic_read_subcolumns.lib
+. "$CUR_DIR"/03036_dynamic_read_subcolumns.lib
+
+CH_CLIENT="$CLICKHOUSE_CLIENT --allow_experimental_variant_type=1 --use_variant_as_common_type=1 --allow_experimental_dynamic_type=1"
+
+$CH_CLIENT -q "drop table if exists test;"
+
+echo "Memory"
+$CH_CLIENT -q "create table test (id UInt64, d Dynamic) engine=Memory"
+test
+$CH_CLIENT -q "drop table test;"
diff --git a/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_memory.reference b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_2.reference
similarity index 64%
rename from tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_memory.reference
rename to tests/queries/0_stateless/03036_dynamic_read_subcolumns_2.reference
index ca6c5dbba82..099b7574566 100644
--- a/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_memory.reference
+++ b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_2.reference
@@ -1,20 +1,19 @@
+MergeTree compact
+test
 Array(Array(Dynamic))
 Array(Variant(String, UInt64))
-LowCardinality(String)
 None
 String
 UInt64
-360000
-360000
+200000
+200000
 200000
 200000
 0
 0
-20000
-20000
 200000
 200000
-20000
-20000
+100000
+100000
 200000
 0
diff --git a/tests/queries/0_stateless/03036_dynamic_read_subcolumns_2.sh b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_2.sh
new file mode 100755
index 00000000000..872f4c20a98
--- /dev/null
+++ b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_2.sh
@@ -0,0 +1,21 @@
+#!/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
+
+
+# shellcheck source=./03036_dynamic_read_subcolumns.lib
+. "$CUR_DIR"/03036_dynamic_read_subcolumns.lib
+
+CH_CLIENT="$CLICKHOUSE_CLIENT --allow_experimental_variant_type=1 --use_variant_as_common_type=1 --allow_experimental_dynamic_type=1"
+
+$CH_CLIENT -q "drop table if exists test;"
+
+echo "MergeTree compact"
+$CH_CLIENT -q "create table test (id UInt64, d Dynamic) 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;"
diff --git a/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_wide_merge_tree.reference b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_3.reference
similarity index 64%
rename from tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_wide_merge_tree.reference
rename to tests/queries/0_stateless/03036_dynamic_read_subcolumns_3.reference
index ca6c5dbba82..35db4a22b4c 100644
--- a/tests/queries/0_stateless/03036_dynamic_read_shared_subcolumns_wide_merge_tree.reference
+++ b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_3.reference
@@ -1,20 +1,19 @@
+MergeTree wide
+test
 Array(Array(Dynamic))
 Array(Variant(String, UInt64))
-LowCardinality(String)
 None
 String
 UInt64
-360000
-360000
+200000
+200000
 200000
 200000
 0
 0
-20000
-20000
 200000
 200000
-20000
-20000
+100000
+100000
 200000
 0
diff --git a/tests/queries/0_stateless/03036_dynamic_read_subcolumns_3.sh b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_3.sh
new file mode 100755
index 00000000000..96276c96add
--- /dev/null
+++ b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_3.sh
@@ -0,0 +1,21 @@
+#!/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
+
+
+# shellcheck source=./03036_dynamic_read_subcolumns.lib
+. "$CUR_DIR"/03036_dynamic_read_subcolumns.lib
+
+CH_CLIENT="$CLICKHOUSE_CLIENT --allow_experimental_variant_type=1 --use_variant_as_common_type=1 --allow_experimental_dynamic_type=1"
+
+$CH_CLIENT -q "drop table if exists test;"
+
+echo "MergeTree wide"
+$CH_CLIENT -q "create table test (id UInt64, d Dynamic) 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/03036_dynamic_read_subcolumns_compact_merge_tree.sql b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_compact_merge_tree.sql
index 822393d3c78..ddfba4418bd 100644
--- a/tests/queries/0_stateless/03036_dynamic_read_subcolumns_compact_merge_tree.sql
+++ b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_compact_merge_tree.sql
@@ -1,5 +1,4 @@
 -- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
--- Random settings limits: index_granularity=(100, None)
 
 set allow_experimental_variant_type = 1;
 set use_variant_as_common_type = 1;
diff --git a/tests/queries/0_stateless/03036_dynamic_read_subcolumns_wide_merge_tree.sql b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_wide_merge_tree.sql
index 85f5cc57efc..5aac5f7b72f 100644
--- a/tests/queries/0_stateless/03036_dynamic_read_subcolumns_wide_merge_tree.sql
+++ b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_wide_merge_tree.sql
@@ -1,12 +1,9 @@
 -- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
--- Random settings limits: index_granularity=(100, None)
 
 set allow_experimental_variant_type = 1;
 set use_variant_as_common_type = 1;
 set allow_experimental_dynamic_type = 1;
 
-set min_bytes_to_use_direct_io = 0; -- min_bytes_to_use_direct_io > 0 is broken
-
 drop table if exists test;
 create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;
 
diff --git a/tests/queries/0_stateless/03036_join_filter_push_down_equivalent_sets.sql b/tests/queries/0_stateless/03036_join_filter_push_down_equivalent_sets.sql
index e1a13d1ce71..d94a68aa4d8 100644
--- a/tests/queries/0_stateless/03036_join_filter_push_down_equivalent_sets.sql
+++ b/tests/queries/0_stateless/03036_join_filter_push_down_equivalent_sets.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET optimize_move_to_prewhere = 0;
 SET query_plan_convert_outer_join_to_inner_join = 0;
 
diff --git a/tests/queries/0_stateless/03036_recursive_cte_postgres_2.reference b/tests/queries/0_stateless/03036_recursive_cte_postgres_2.reference
index a10e1da6907..adc06d2edd2 100644
--- a/tests/queries/0_stateless/03036_recursive_cte_postgres_2.reference
+++ b/tests/queries/0_stateless/03036_recursive_cte_postgres_2.reference
@@ -32,7 +32,7 @@
 
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 --
 -- Some examples with a tree
 --
diff --git a/tests/queries/0_stateless/03036_recursive_cte_postgres_2.sql b/tests/queries/0_stateless/03036_recursive_cte_postgres_2.sql
index b8e850b4721..f06b1c62426 100644
--- a/tests/queries/0_stateless/03036_recursive_cte_postgres_2.sql
+++ b/tests/queries/0_stateless/03036_recursive_cte_postgres_2.sql
@@ -32,7 +32,7 @@
 
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 --
 -- Some examples with a tree
diff --git a/tests/queries/0_stateless/03036_with_numbers.sql b/tests/queries/0_stateless/03036_with_numbers.sql
index bd0f6b6179c..3463ce826e2 100644
--- a/tests/queries/0_stateless/03036_with_numbers.sql
+++ b/tests/queries/0_stateless/03036_with_numbers.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/13843
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 WITH 10 AS n
 SELECT *
 FROM numbers(n);
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_merge_tree.reference b/tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_merge_tree.reference
index b0be05f07a2..d0d777a5a38 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_merge_tree.reference
+++ b/tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_merge_tree.reference
@@ -1,66 +1,28 @@
-50000	DateTime	false
-60000	Date	false
-70000	Array(UInt16)	false
-80000	String	false
-100000	None	false
-100000	UInt64	false
----------------------
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	false
-100000	None	false
-100000	UInt64	false
----------------------
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	false
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	true
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-10000	Tuple(UInt64, UInt64)	false
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	true
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-10000	Tuple(UInt64, UInt64)	true
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	true
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-10000	Tuple(UInt64, UInt64)	true
-30000	String	false
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	true
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-10000	Tuple(UInt64, UInt64)	true
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-100000	None	false
-100000	UInt64	true
-110000	String	false
-200000	Map(UInt64, UInt64)	false
+50000	DateTime
+60000	Date
+70000	Array(UInt16)
+80000	String
+100000	None
+100000	UInt64
+70000	Array(UInt16)
+100000	None
+100000	UInt64
+190000	String
+70000	Array(UInt16)
+100000	None
+100000	UInt64
+190000	String
+200000	Map(UInt64, UInt64)
+100000	None
+100000	UInt64
+200000	Map(UInt64, UInt64)
+260000	String
+10000	Tuple(UInt64, UInt64)
+100000	None
+100000	UInt64
+200000	Map(UInt64, UInt64)
+260000	String
+100000	None
+100000	UInt64
+200000	Map(UInt64, UInt64)
+270000	String
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_merge_tree.sql b/tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_merge_tree.sql
index 9bd2aee06ae..879ce8e9e95 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_merge_tree.sql
+++ b/tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_merge_tree.sql
@@ -1,10 +1,8 @@
 -- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
--- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
-
 set allow_experimental_dynamic_type=1;
 
 drop table if exists test;
-create table test (id UInt64, d Dynamic(max_types=2)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_columns_to_activate=10, index_granularity_bytes=10485760, index_granularity=8192, merge_max_block_size=8192, merge_max_block_size_bytes=10485760, lock_acquire_timeout_for_background_operations=600;
+create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_columns_to_activate=10, index_granularity_bytes=10485760, index_granularity=8192, merge_max_block_size=8192, merge_max_block_size_bytes=10485760;
 
 system stop merges test;
 insert into test select number, number from numbers(100000);
@@ -14,37 +12,22 @@ insert into test select number, toDate(number) from numbers(60000);
 insert into test select number, toDateTime(number) from numbers(50000);
 insert into test select number, NULL from numbers(100000);
 
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 system start merges test; optimize table test final;;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 
 system stop merges test;
 insert into test select number, map(number, number) from numbers(200000);
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 
 system stop merges test;
 insert into test select number, tuple(number, number) from numbers(10000);
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
-
-system stop merges test;
-insert into test select number, 'str_' || number from numbers(30000);
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
-system start merges test;
-optimize table test final;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
-
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 
 drop table test;
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_wide_tree.reference b/tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_wide_tree.reference
index b0be05f07a2..d0d777a5a38 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_wide_tree.reference
+++ b/tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_wide_tree.reference
@@ -1,66 +1,28 @@
-50000	DateTime	false
-60000	Date	false
-70000	Array(UInt16)	false
-80000	String	false
-100000	None	false
-100000	UInt64	false
----------------------
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	false
-100000	None	false
-100000	UInt64	false
----------------------
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	false
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	true
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-10000	Tuple(UInt64, UInt64)	false
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	true
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-10000	Tuple(UInt64, UInt64)	true
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	true
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-10000	Tuple(UInt64, UInt64)	true
-30000	String	false
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	true
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-10000	Tuple(UInt64, UInt64)	true
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-100000	None	false
-100000	UInt64	true
-110000	String	false
-200000	Map(UInt64, UInt64)	false
+50000	DateTime
+60000	Date
+70000	Array(UInt16)
+80000	String
+100000	None
+100000	UInt64
+70000	Array(UInt16)
+100000	None
+100000	UInt64
+190000	String
+70000	Array(UInt16)
+100000	None
+100000	UInt64
+190000	String
+200000	Map(UInt64, UInt64)
+100000	None
+100000	UInt64
+200000	Map(UInt64, UInt64)
+260000	String
+10000	Tuple(UInt64, UInt64)
+100000	None
+100000	UInt64
+200000	Map(UInt64, UInt64)
+260000	String
+100000	None
+100000	UInt64
+200000	Map(UInt64, UInt64)
+270000	String
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_wide_tree.sql b/tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_wide_tree.sql
index ee2dadd308c..e46c7e93a5a 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_wide_tree.sql
+++ b/tests/queries/0_stateless/03037_dynamic_merges_1_horizontal_compact_wide_tree.sql
@@ -1,10 +1,8 @@
 -- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
--- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
-
 set allow_experimental_dynamic_type=1;
 
 drop table if exists test;
-create table test (id UInt64, d Dynamic(max_types=2)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_columns_to_activate=10, index_granularity_bytes=10485760, index_granularity=8192, merge_max_block_size=8192, merge_max_block_size_bytes=10485760, lock_acquire_timeout_for_background_operations=600;
+create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_columns_to_activate=10, index_granularity_bytes=10485760, index_granularity=8192, merge_max_block_size=8192, merge_max_block_size_bytes=10485760;
 
 system stop merges test;
 insert into test select number, number from numbers(100000);
@@ -14,36 +12,22 @@ insert into test select number, toDate(number) from numbers(60000);
 insert into test select number, toDateTime(number) from numbers(50000);
 insert into test select number, NULL from numbers(100000);
 
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 system start merges test; optimize table test final;;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 
 system stop merges test;
 insert into test select number, map(number, number) from numbers(200000);
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 
 system stop merges test;
 insert into test select number, tuple(number, number) from numbers(10000);
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
-
-system stop merges test;
-insert into test select number, 'str_' || number from numbers(30000);
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
-system start merges test;
-optimize table test final;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 
 drop table test;
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_1_vertical_compact_merge_tree.reference b/tests/queries/0_stateless/03037_dynamic_merges_1_vertical_compact_merge_tree.reference
index b0be05f07a2..d0d777a5a38 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_1_vertical_compact_merge_tree.reference
+++ b/tests/queries/0_stateless/03037_dynamic_merges_1_vertical_compact_merge_tree.reference
@@ -1,66 +1,28 @@
-50000	DateTime	false
-60000	Date	false
-70000	Array(UInt16)	false
-80000	String	false
-100000	None	false
-100000	UInt64	false
----------------------
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	false
-100000	None	false
-100000	UInt64	false
----------------------
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	false
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	true
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-10000	Tuple(UInt64, UInt64)	false
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	true
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-10000	Tuple(UInt64, UInt64)	true
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	true
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-10000	Tuple(UInt64, UInt64)	true
-30000	String	false
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	true
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-10000	Tuple(UInt64, UInt64)	true
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-100000	None	false
-100000	UInt64	true
-110000	String	false
-200000	Map(UInt64, UInt64)	false
+50000	DateTime
+60000	Date
+70000	Array(UInt16)
+80000	String
+100000	None
+100000	UInt64
+70000	Array(UInt16)
+100000	None
+100000	UInt64
+190000	String
+70000	Array(UInt16)
+100000	None
+100000	UInt64
+190000	String
+200000	Map(UInt64, UInt64)
+100000	None
+100000	UInt64
+200000	Map(UInt64, UInt64)
+260000	String
+10000	Tuple(UInt64, UInt64)
+100000	None
+100000	UInt64
+200000	Map(UInt64, UInt64)
+260000	String
+100000	None
+100000	UInt64
+200000	Map(UInt64, UInt64)
+270000	String
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_1_vertical_compact_merge_tree.sql b/tests/queries/0_stateless/03037_dynamic_merges_1_vertical_compact_merge_tree.sql
index 6c2ce8f9e6a..d596f3a1fad 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_1_vertical_compact_merge_tree.sql
+++ b/tests/queries/0_stateless/03037_dynamic_merges_1_vertical_compact_merge_tree.sql
@@ -1,10 +1,8 @@
 -- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
--- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
-
 set allow_experimental_dynamic_type=1;
 
 drop table if exists test;
-create table test (id UInt64, d Dynamic(max_types=2)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1, index_granularity_bytes=10485760, index_granularity=8192, merge_max_block_size=8192, merge_max_block_size_bytes=10485760, lock_acquire_timeout_for_background_operations=600;
+create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1, index_granularity_bytes=10485760, index_granularity=8192, merge_max_block_size=8192, merge_max_block_size_bytes=10485760;
 
 system stop merges test;
 insert into test select number, number from numbers(100000);
@@ -14,36 +12,22 @@ insert into test select number, toDate(number) from numbers(60000);
 insert into test select number, toDateTime(number) from numbers(50000);
 insert into test select number, NULL from numbers(100000);
 
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 system start merges test; optimize table test final;;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 
 system stop merges test;
 insert into test select number, map(number, number) from numbers(200000);
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 
 system stop merges test;
 insert into test select number, tuple(number, number) from numbers(10000);
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
-
-system stop merges test;
-insert into test select number, 'str_' || number from numbers(30000);
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
-system start merges test;
-optimize table test final;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 
 drop table test;
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_1_vertical_wide_merge_tree.reference b/tests/queries/0_stateless/03037_dynamic_merges_1_vertical_wide_merge_tree.reference
index b0be05f07a2..d0d777a5a38 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_1_vertical_wide_merge_tree.reference
+++ b/tests/queries/0_stateless/03037_dynamic_merges_1_vertical_wide_merge_tree.reference
@@ -1,66 +1,28 @@
-50000	DateTime	false
-60000	Date	false
-70000	Array(UInt16)	false
-80000	String	false
-100000	None	false
-100000	UInt64	false
----------------------
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	false
-100000	None	false
-100000	UInt64	false
----------------------
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	false
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	true
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-10000	Tuple(UInt64, UInt64)	false
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	true
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-10000	Tuple(UInt64, UInt64)	true
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	true
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-10000	Tuple(UInt64, UInt64)	true
-30000	String	false
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-80000	String	true
-100000	None	false
-100000	UInt64	false
-200000	Map(UInt64, UInt64)	false
----------------------
-10000	Tuple(UInt64, UInt64)	true
-50000	DateTime	true
-60000	Date	true
-70000	Array(UInt16)	true
-100000	None	false
-100000	UInt64	true
-110000	String	false
-200000	Map(UInt64, UInt64)	false
+50000	DateTime
+60000	Date
+70000	Array(UInt16)
+80000	String
+100000	None
+100000	UInt64
+70000	Array(UInt16)
+100000	None
+100000	UInt64
+190000	String
+70000	Array(UInt16)
+100000	None
+100000	UInt64
+190000	String
+200000	Map(UInt64, UInt64)
+100000	None
+100000	UInt64
+200000	Map(UInt64, UInt64)
+260000	String
+10000	Tuple(UInt64, UInt64)
+100000	None
+100000	UInt64
+200000	Map(UInt64, UInt64)
+260000	String
+100000	None
+100000	UInt64
+200000	Map(UInt64, UInt64)
+270000	String
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_1_vertical_wide_merge_tree.sql b/tests/queries/0_stateless/03037_dynamic_merges_1_vertical_wide_merge_tree.sql
index 2350cddd21c..aa5abb05be7 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_1_vertical_wide_merge_tree.sql
+++ b/tests/queries/0_stateless/03037_dynamic_merges_1_vertical_wide_merge_tree.sql
@@ -1,10 +1,8 @@
 -- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
--- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
-
 set allow_experimental_dynamic_type=1;
 
 drop table if exists test;
-create table test (id UInt64, d Dynamic(max_types=2)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1, index_granularity_bytes=10485760, index_granularity=8192, merge_max_block_size=8192, merge_max_block_size_bytes=10485760, lock_acquire_timeout_for_background_operations=600;
+create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1, index_granularity_bytes=10485760, index_granularity=8192, merge_max_block_size=8192, merge_max_block_size_bytes=10485760;
 
 system stop merges test;
 insert into test select number, number from numbers(100000);
@@ -14,36 +12,22 @@ insert into test select number, toDate(number) from numbers(60000);
 insert into test select number, toDateTime(number) from numbers(50000);
 insert into test select number, NULL from numbers(100000);
 
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 system start merges test; optimize table test final;;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 
 system stop merges test;
 insert into test select number, map(number, number) from numbers(200000);
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 
 system stop merges test;
 insert into test select number, tuple(number, number) from numbers(10000);
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
-
-system stop merges test;
-insert into test select number, 'str_' || number from numbers(30000);
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
-system start merges test;
-optimize table test final;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 
 drop table test;
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_compact_merge_tree.reference b/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_compact_merge_tree.reference
index 253d87de5f0..afd392002e5 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_compact_merge_tree.reference
+++ b/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_compact_merge_tree.reference
@@ -1,3 +1,3 @@
-200000	Array(UInt16)
-200000	String
-200000	UInt64
+1000000	Array(UInt16)
+1000000	String
+1000000	UInt64
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_compact_merge_tree.sql b/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_compact_merge_tree.sql
index 7f1934091f2..28e6c5823a3 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_compact_merge_tree.sql
+++ b/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_compact_merge_tree.sql
@@ -1,14 +1,13 @@
 -- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
--- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
 
 set allow_experimental_dynamic_type = 1;
 
 drop table if exists test;
-create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, lock_acquire_timeout_for_background_operations=600;
+create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000;
 system stop merges test;
-insert into test select number, number from numbers(200000);
-insert into test select number, 'str_' || toString(number) from numbers(200000, 200000);
-insert into test select number, range(number % 10 + 1) from numbers(400000, 200000);
+insert into test select number, number from numbers(1000000);
+insert into test select number, 'str_' || toString(number) from numbers(1000000, 1000000);
+insert into test select number, range(number % 10 + 1) from numbers(2000000, 1000000);
 system start merges test;
 optimize table test final;
 select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_wide_merge_tree.reference b/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_wide_merge_tree.reference
index 253d87de5f0..afd392002e5 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_wide_merge_tree.reference
+++ b/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_wide_merge_tree.reference
@@ -1,3 +1,3 @@
-200000	Array(UInt16)
-200000	String
-200000	UInt64
+1000000	Array(UInt16)
+1000000	String
+1000000	UInt64
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_wide_merge_tree.sql b/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_wide_merge_tree.sql
index f1f387fae9d..6046dada689 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_wide_merge_tree.sql
+++ b/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_wide_merge_tree.sql
@@ -1,14 +1,13 @@
 -- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
--- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
 
 set allow_experimental_dynamic_type = 1;
 
 drop table if exists test;
-create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, lock_acquire_timeout_for_background_operations=600;
+create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;
 system stop merges test;
-insert into test select number, number from numbers(200000);
-insert into test select number, 'str_' || toString(number) from numbers(200000, 200000);
-insert into test select number, range(number % 10 + 1) from numbers(400000, 200000);
+insert into test select number, number from numbers(1000000);
+insert into test select number, 'str_' || toString(number) from numbers(1000000, 1000000);
+insert into test select number, range(number % 10 + 1) from numbers(2000000, 1000000);
 system start merges test;
 optimize table test final;
 select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_2_vertical_compact_merge_tree.reference b/tests/queries/0_stateless/03037_dynamic_merges_2_vertical_compact_merge_tree.reference
index 253d87de5f0..afd392002e5 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_2_vertical_compact_merge_tree.reference
+++ b/tests/queries/0_stateless/03037_dynamic_merges_2_vertical_compact_merge_tree.reference
@@ -1,3 +1,3 @@
-200000	Array(UInt16)
-200000	String
-200000	UInt64
+1000000	Array(UInt16)
+1000000	String
+1000000	UInt64
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_2_vertical_compact_merge_tree.sql b/tests/queries/0_stateless/03037_dynamic_merges_2_vertical_compact_merge_tree.sql
index cc11c454d38..79ae2eb5aeb 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_2_vertical_compact_merge_tree.sql
+++ b/tests/queries/0_stateless/03037_dynamic_merges_2_vertical_compact_merge_tree.sql
@@ -1,14 +1,13 @@
 -- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
--- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
 
 set allow_experimental_dynamic_type = 1;
 
 drop table if exists test;
-create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1, lock_acquire_timeout_for_background_operations=600;
+create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;
 system stop merges test;
-insert into test select number, number from numbers(200000);
-insert into test select number, 'str_' || toString(number) from numbers(200000, 200000);
-insert into test select number, range(number % 10 + 1) from numbers(400000, 200000);
+insert into test select number, number from numbers(1000000);
+insert into test select number, 'str_' || toString(number) from numbers(1000000, 1000000);
+insert into test select number, range(number % 10 + 1) from numbers(2000000, 1000000);
 system start merges test;
 optimize table test final;
 select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_2_vertical_wide_merge_tree.reference b/tests/queries/0_stateless/03037_dynamic_merges_2_vertical_wide_merge_tree.reference
index 253d87de5f0..afd392002e5 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_2_vertical_wide_merge_tree.reference
+++ b/tests/queries/0_stateless/03037_dynamic_merges_2_vertical_wide_merge_tree.reference
@@ -1,3 +1,3 @@
-200000	Array(UInt16)
-200000	String
-200000	UInt64
+1000000	Array(UInt16)
+1000000	String
+1000000	UInt64
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_2_vertical_wide_merge_tree.sql b/tests/queries/0_stateless/03037_dynamic_merges_2_vertical_wide_merge_tree.sql
index ffb2aca8b35..4ab957d2fb9 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_2_vertical_wide_merge_tree.sql
+++ b/tests/queries/0_stateless/03037_dynamic_merges_2_vertical_wide_merge_tree.sql
@@ -1,14 +1,13 @@
 -- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
--- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
 
 set allow_experimental_dynamic_type = 1;
 
 drop table if exists test;
-create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1, lock_acquire_timeout_for_background_operations=600;
+create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;
 system stop merges test;
-insert into test select number, number from numbers(200000);
-insert into test select number, 'str_' || toString(number) from numbers(200000, 200000);
-insert into test select number, range(number % 10 + 1) from numbers(400000, 200000);
+insert into test select number, number from numbers(1000000);
+insert into test select number, 'str_' || toString(number) from numbers(1000000, 1000000);
+insert into test select number, range(number % 10 + 1) from numbers(2000000, 1000000);
 system start merges test;
 optimize table test final;
 select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_small.reference.j2 b/tests/queries/0_stateless/03037_dynamic_merges_small.reference.j2
index 7d3bc371e36..96a854630ed 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_small.reference.j2
+++ b/tests/queries/0_stateless/03037_dynamic_merges_small.reference.j2
@@ -1,264 +1,112 @@
-5	DateTime	false
-6	Date	false
-7	Array(UInt16)	false
-8	String	false
-10	None	false
-10	UInt64	false
----------------------
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	false
-10	None	false
-10	UInt64	false
----------------------
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	false
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	true
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-1	Tuple(UInt64, UInt64)	false
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	true
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-1	Tuple(UInt64, UInt64)	true
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	true
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-1	Tuple(UInt64, UInt64)	true
-3	String	false
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	true
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-1	Tuple(UInt64, UInt64)	true
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-10	None	false
-10	UInt64	true
-11	String	false
-20	Map(UInt64, UInt64)	false
-5	DateTime	false
-6	Date	false
-7	Array(UInt16)	false
-8	String	false
-10	None	false
-10	UInt64	false
----------------------
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	false
-10	None	false
-10	UInt64	false
----------------------
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	false
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	true
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-1	Tuple(UInt64, UInt64)	false
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	true
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-1	Tuple(UInt64, UInt64)	true
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	true
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-1	Tuple(UInt64, UInt64)	true
-3	String	false
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	true
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-1	Tuple(UInt64, UInt64)	true
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-10	None	false
-10	UInt64	true
-11	String	false
-20	Map(UInt64, UInt64)	false
-5	DateTime	false
-6	Date	false
-7	Array(UInt16)	false
-8	String	false
-10	None	false
-10	UInt64	false
----------------------
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	false
-10	None	false
-10	UInt64	false
----------------------
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	false
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	true
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-1	Tuple(UInt64, UInt64)	false
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	true
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-1	Tuple(UInt64, UInt64)	true
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	true
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-1	Tuple(UInt64, UInt64)	true
-3	String	false
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	true
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-1	Tuple(UInt64, UInt64)	true
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-10	None	false
-10	UInt64	true
-11	String	false
-20	Map(UInt64, UInt64)	false
-5	DateTime	false
-6	Date	false
-7	Array(UInt16)	false
-8	String	false
-10	None	false
-10	UInt64	false
----------------------
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	false
-10	None	false
-10	UInt64	false
----------------------
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	false
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	true
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-1	Tuple(UInt64, UInt64)	false
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	true
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-1	Tuple(UInt64, UInt64)	true
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	true
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-1	Tuple(UInt64, UInt64)	true
-3	String	false
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-8	String	true
-10	None	false
-10	UInt64	false
-20	Map(UInt64, UInt64)	false
----------------------
-1	Tuple(UInt64, UInt64)	true
-5	DateTime	true
-6	Date	true
-7	Array(UInt16)	true
-10	None	false
-10	UInt64	true
-11	String	false
-20	Map(UInt64, UInt64)	false
+5	DateTime
+6	Date
+7	Array(UInt16)
+8	String
+10	None
+10	UInt64
+7	Array(UInt16)
+10	None
+10	UInt64
+19	String
+7	Array(UInt16)
+10	None
+10	UInt64
+19	String
+20	Map(UInt64, UInt64)
+10	None
+10	UInt64
+20	Map(UInt64, UInt64)
+26	String
+1	Tuple(UInt64, UInt64)
+10	None
+10	UInt64
+20	Map(UInt64, UInt64)
+26	String
+10	None
+10	UInt64
+20	Map(UInt64, UInt64)
+27	String
+5	DateTime
+6	Date
+7	Array(UInt16)
+8	String
+10	None
+10	UInt64
+7	Array(UInt16)
+10	None
+10	UInt64
+19	String
+7	Array(UInt16)
+10	None
+10	UInt64
+19	String
+20	Map(UInt64, UInt64)
+10	None
+10	UInt64
+20	Map(UInt64, UInt64)
+26	String
+1	Tuple(UInt64, UInt64)
+10	None
+10	UInt64
+20	Map(UInt64, UInt64)
+26	String
+10	None
+10	UInt64
+20	Map(UInt64, UInt64)
+27	String
+5	DateTime
+6	Date
+7	Array(UInt16)
+8	String
+10	None
+10	UInt64
+7	Array(UInt16)
+10	None
+10	UInt64
+19	String
+7	Array(UInt16)
+10	None
+10	UInt64
+19	String
+20	Map(UInt64, UInt64)
+10	None
+10	UInt64
+20	Map(UInt64, UInt64)
+26	String
+1	Tuple(UInt64, UInt64)
+10	None
+10	UInt64
+20	Map(UInt64, UInt64)
+26	String
+10	None
+10	UInt64
+20	Map(UInt64, UInt64)
+27	String
+5	DateTime
+6	Date
+7	Array(UInt16)
+8	String
+10	None
+10	UInt64
+7	Array(UInt16)
+10	None
+10	UInt64
+19	String
+7	Array(UInt16)
+10	None
+10	UInt64
+19	String
+20	Map(UInt64, UInt64)
+10	None
+10	UInt64
+20	Map(UInt64, UInt64)
+26	String
+1	Tuple(UInt64, UInt64)
+10	None
+10	UInt64
+20	Map(UInt64, UInt64)
+26	String
+10	None
+10	UInt64
+20	Map(UInt64, UInt64)
+27	String
diff --git a/tests/queries/0_stateless/03037_dynamic_merges_small.sql.j2 b/tests/queries/0_stateless/03037_dynamic_merges_small.sql.j2
index 71d6fc2540c..263e92be403 100644
--- a/tests/queries/0_stateless/03037_dynamic_merges_small.sql.j2
+++ b/tests/queries/0_stateless/03037_dynamic_merges_small.sql.j2
@@ -2,7 +2,6 @@ set allow_experimental_variant_type = 1;
 set use_variant_as_common_type = 1;
 set allow_experimental_dynamic_type = 1;
 
-
 drop table if exists test;
 
 {% for engine in ['MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000',
@@ -10,7 +9,7 @@ drop table if exists test;
                   'MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1',
                   'MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1'] -%}
 
-create table test (id UInt64, d Dynamic(max_types=2)) engine={{ engine }};
+create table test (id UInt64, d Dynamic(max_types=3)) engine={{ engine }};
 
 system stop merges test;
 insert into test select number, number from numbers(10);
@@ -20,37 +19,23 @@ insert into test select number, toDate(number) from numbers(6);
 insert into test select number, toDateTime(number) from numbers(5);
 insert into test select number, NULL from numbers(10);
 
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 system start merges test; optimize table test final;;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 
 system stop merges test;
 insert into test select number, map(number, number) from numbers(20);
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 
 system stop merges test;
 insert into test select number, tuple(number, number) from numbers(1);
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
-
-system stop merges test;
-insert into test select number, 'str_' || number from numbers(3);
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
-system start merges test;
-optimize table test final;
-select '---------------------';
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 
 drop table test;
 
diff --git a/tests/queries/0_stateless/03037_recursive_cte_postgres_3.reference b/tests/queries/0_stateless/03037_recursive_cte_postgres_3.reference
index f0ff70a7c60..3f8f47ac23e 100644
--- a/tests/queries/0_stateless/03037_recursive_cte_postgres_3.reference
+++ b/tests/queries/0_stateless/03037_recursive_cte_postgres_3.reference
@@ -32,7 +32,7 @@
 
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 --
 -- different tree example
 --
diff --git a/tests/queries/0_stateless/03037_recursive_cte_postgres_3.sql b/tests/queries/0_stateless/03037_recursive_cte_postgres_3.sql
index 213e8bc995d..3c74ee889c4 100644
--- a/tests/queries/0_stateless/03037_recursive_cte_postgres_3.sql
+++ b/tests/queries/0_stateless/03037_recursive_cte_postgres_3.sql
@@ -32,7 +32,7 @@
 
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 --
 -- different tree example
diff --git a/tests/queries/0_stateless/03037_union_view.sql b/tests/queries/0_stateless/03037_union_view.sql
index d963444fd91..3ea81b829ba 100644
--- a/tests/queries/0_stateless/03037_union_view.sql
+++ b/tests/queries/0_stateless/03037_union_view.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/55803
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 DROP TABLE IF EXISTS broken_table;
 DROP TABLE IF EXISTS broken_view;
 
@@ -28,4 +28,4 @@ FROM broken_view v FINAL
 WHERE v.start IS NOT NULL;
 
 DROP TABLE IF EXISTS broken_table;
-DROP TABLE IF EXISTS broken_view;
+DROP TABLE IF EXISTS broken_view;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03038_ambiguous_column.sql b/tests/queries/0_stateless/03038_ambiguous_column.sql
index 131bc552f56..9df3cd9bc9b 100644
--- a/tests/queries/0_stateless/03038_ambiguous_column.sql
+++ b/tests/queries/0_stateless/03038_ambiguous_column.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/48308
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 DROP TABLE IF EXISTS 03038_table;
 
 CREATE TABLE 03038_table
diff --git a/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_horizontal.reference b/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_horizontal.reference
index a4c2df74a74..4be740f6050 100644
--- a/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_horizontal.reference
+++ b/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_horizontal.reference
@@ -1,63 +1,21 @@
-6667	Tuple(a Dynamic(max_types=2)):DateTime	false
-13333	Tuple(a Dynamic(max_types=2)):IPv4	false
-16667	Tuple(a Dynamic(max_types=2)):Date	false
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	false
-33334	Tuple(a Dynamic(max_types=2)):UInt64	false
-40000	String:None	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-140000	UInt64:None	false
----------------------
-6667	Tuple(a Dynamic(max_types=2)):DateTime	true
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	false
-40000	String:None	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-140000	UInt64:None	false
----------------------
-6667	Tuple(a Dynamic(max_types=2)):DateTime	true
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-16667	Tuple(a Dynamic(max_types=2)):DateTime	false
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	false
-40000	String:None	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-100000	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-133333	Tuple(a Dynamic(max_types=2)):None	false
-140000	UInt64:None	false
----------------------
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-23334	Tuple(a Dynamic(max_types=2)):DateTime	true
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	true
-40000	String:None	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-100000	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-133333	Tuple(a Dynamic(max_types=2)):None	false
-140000	UInt64:None	false
----------------------
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-23334	Tuple(a Dynamic(max_types=2)):DateTime	true
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	true
-40000	String:None	false
-40000	Tuple(a Dynamic(max_types=2)):DateTime	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-100000	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-133333	Tuple(a Dynamic(max_types=2)):None	false
-140000	UInt64:None	false
----------------------
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	true
-40000	String:None	false
-63334	Tuple(a Dynamic(max_types=2)):DateTime	true
-66666	Tuple(a Dynamic(max_types=2)):String	false
-100000	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-133333	Tuple(a Dynamic(max_types=2)):None	false
-140000	UInt64:None	false
+16667	Tuple(a Dynamic(max_types=3)):Date
+33333	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+50000	Tuple(a Dynamic(max_types=3)):String
+50000	Tuple(a Dynamic(max_types=3)):UInt64
+100000	UInt64:None
+33333	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+50000	Tuple(a Dynamic(max_types=3)):UInt64
+66667	Tuple(a Dynamic(max_types=3)):String
+100000	UInt64:None
+16667	Tuple(a Dynamic(max_types=3)):DateTime
+33333	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+50000	Tuple(a Dynamic(max_types=3)):UInt64
+66667	Tuple(a Dynamic(max_types=3)):String
+100000	Tuple(a Dynamic(max_types=3)):Tuple(UInt64)
+100000	UInt64:None
+133333	Tuple(a Dynamic(max_types=3)):None
+50000	Tuple(a Dynamic(max_types=3)):UInt64
+100000	Tuple(a Dynamic(max_types=3)):Tuple(UInt64)
+100000	UInt64:None
+116667	Tuple(a Dynamic(max_types=3)):String
+133333	Tuple(a Dynamic(max_types=3)):None
diff --git a/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_horizontal.sql b/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_horizontal.sql
index e3b8ea63582..ff1dc5e7ded 100644
--- a/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_horizontal.sql
+++ b/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_horizontal.sql
@@ -1,5 +1,4 @@
--- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
--- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
+-- Tags: long
 
 set allow_experimental_variant_type = 1;
 set use_variant_as_common_type = 1;
@@ -7,39 +6,24 @@ set allow_experimental_dynamic_type = 1;
 set enable_named_columns_in_function_tuple = 0;
 
 drop table if exists test;;
-create table test (id UInt64, d Dynamic(max_types=2)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, lock_acquire_timeout_for_background_operations=600;
+create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000;;
 
 system stop merges test;
 insert into test select number, number from numbers(100000);
-insert into test select number, tuple(if(number % 3 == 0, number, 'str_' || toString(number)))::Tuple(a Dynamic(max_types=2)) from numbers(100000);
-insert into test select number, tuple(if(number % 3 == 0, toDate(number), range(number % 10)))::Tuple(a Dynamic(max_types=2)) from numbers(50000);
-insert into test select number, multiIf(number % 5 == 0, tuple(if(number % 3 == 0, toDateTime(number), toIPv4(number)))::Tuple(a Dynamic(max_types=2)), number % 5 == 1 or number % 5 == 2, number, 'str_' || number) from numbers(100000);
+insert into test select number, tuple(if(number % 2 == 0, number, 'str_' || toString(number)))::Tuple(a Dynamic(max_types=3)) from numbers(100000);
+insert into test select number, tuple(if(number % 3 == 0, toDate(number), range(number % 10)))::Tuple(a Dynamic(max_types=3)) from numbers(50000);
 
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
+select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
+select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
 
-system stop merges test;
-insert into test select number, tuple(if(number % 3 == 0, toDateTime(number), NULL))::Tuple(a Dynamic(max_types=2)) from numbers(50000);
-insert into test select number, tuple(if(number % 2 == 0, tuple(number), NULL))::Tuple(a Dynamic(max_types=2)) from numbers(200000);
+insert into test select number, tuple(if(number % 3 == 0, toDateTime(number), NULL))::Tuple(a Dynamic(max_types=3)) from numbers(50000);
+insert into test select number, tuple(if(number % 2 == 0, tuple(number), NULL))::Tuple(a Dynamic(max_types=3)) from numbers(200000);
 
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
+select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
-
-system stop merges test;
-insert into test select number, tuple(toDateTime(number))::Tuple(a Dynamic(max_types=2)) from numbers(40000);
-
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
-system start merges test;
-optimize table test final;
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
+select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
 
 drop table test;
diff --git a/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_vertical.reference b/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_vertical.reference
index a4c2df74a74..4be740f6050 100644
--- a/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_vertical.reference
+++ b/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_vertical.reference
@@ -1,63 +1,21 @@
-6667	Tuple(a Dynamic(max_types=2)):DateTime	false
-13333	Tuple(a Dynamic(max_types=2)):IPv4	false
-16667	Tuple(a Dynamic(max_types=2)):Date	false
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	false
-33334	Tuple(a Dynamic(max_types=2)):UInt64	false
-40000	String:None	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-140000	UInt64:None	false
----------------------
-6667	Tuple(a Dynamic(max_types=2)):DateTime	true
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	false
-40000	String:None	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-140000	UInt64:None	false
----------------------
-6667	Tuple(a Dynamic(max_types=2)):DateTime	true
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-16667	Tuple(a Dynamic(max_types=2)):DateTime	false
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	false
-40000	String:None	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-100000	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-133333	Tuple(a Dynamic(max_types=2)):None	false
-140000	UInt64:None	false
----------------------
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-23334	Tuple(a Dynamic(max_types=2)):DateTime	true
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	true
-40000	String:None	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-100000	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-133333	Tuple(a Dynamic(max_types=2)):None	false
-140000	UInt64:None	false
----------------------
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-23334	Tuple(a Dynamic(max_types=2)):DateTime	true
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	true
-40000	String:None	false
-40000	Tuple(a Dynamic(max_types=2)):DateTime	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-100000	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-133333	Tuple(a Dynamic(max_types=2)):None	false
-140000	UInt64:None	false
----------------------
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	true
-40000	String:None	false
-63334	Tuple(a Dynamic(max_types=2)):DateTime	true
-66666	Tuple(a Dynamic(max_types=2)):String	false
-100000	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-133333	Tuple(a Dynamic(max_types=2)):None	false
-140000	UInt64:None	false
+16667	Tuple(a Dynamic(max_types=3)):Date
+33333	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+50000	Tuple(a Dynamic(max_types=3)):String
+50000	Tuple(a Dynamic(max_types=3)):UInt64
+100000	UInt64:None
+33333	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+50000	Tuple(a Dynamic(max_types=3)):UInt64
+66667	Tuple(a Dynamic(max_types=3)):String
+100000	UInt64:None
+16667	Tuple(a Dynamic(max_types=3)):DateTime
+33333	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+50000	Tuple(a Dynamic(max_types=3)):UInt64
+66667	Tuple(a Dynamic(max_types=3)):String
+100000	Tuple(a Dynamic(max_types=3)):Tuple(UInt64)
+100000	UInt64:None
+133333	Tuple(a Dynamic(max_types=3)):None
+50000	Tuple(a Dynamic(max_types=3)):UInt64
+100000	Tuple(a Dynamic(max_types=3)):Tuple(UInt64)
+100000	UInt64:None
+116667	Tuple(a Dynamic(max_types=3)):String
+133333	Tuple(a Dynamic(max_types=3)):None
diff --git a/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_vertical.sql b/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_vertical.sql
index db11dfc93e2..f9b0101cb87 100644
--- a/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_vertical.sql
+++ b/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_vertical.sql
@@ -1,5 +1,4 @@
--- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
--- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
+-- Tags: long
 
 set allow_experimental_variant_type = 1;
 set use_variant_as_common_type = 1;
@@ -7,39 +6,24 @@ set allow_experimental_dynamic_type = 1;
 set enable_named_columns_in_function_tuple = 0;
 
 drop table if exists test;;
-create table test (id UInt64, d Dynamic(max_types=2)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1, lock_acquire_timeout_for_background_operations=600;
+create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;
 
 system stop merges test;
 insert into test select number, number from numbers(100000);
-insert into test select number, tuple(if(number % 3 == 0, number, 'str_' || toString(number)))::Tuple(a Dynamic(max_types=2)) from numbers(100000);
-insert into test select number, tuple(if(number % 3 == 0, toDate(number), range(number % 10)))::Tuple(a Dynamic(max_types=2)) from numbers(50000);
-insert into test select number, multiIf(number % 5 == 0, tuple(if(number % 3 == 0, toDateTime(number), toIPv4(number)))::Tuple(a Dynamic(max_types=2)), number % 5 == 1 or number % 5 == 2, number, 'str_' || number) from numbers(100000);
+insert into test select number, tuple(if(number % 2 == 0, number, 'str_' || toString(number)))::Tuple(a Dynamic(max_types=3)) from numbers(100000);
+insert into test select number, tuple(if(number % 3 == 0, toDate(number), range(number % 10)))::Tuple(a Dynamic(max_types=3)) from numbers(50000);
 
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
+select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
+select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
 
-system stop merges test;
-insert into test select number, tuple(if(number % 3 == 0, toDateTime(number), NULL))::Tuple(a Dynamic(max_types=2)) from numbers(50000);
-insert into test select number, tuple(if(number % 2 == 0, tuple(number), NULL))::Tuple(a Dynamic(max_types=2)) from numbers(200000);
+insert into test select number, tuple(if(number % 3 == 0, toDateTime(number), NULL))::Tuple(a Dynamic(max_types=3)) from numbers(50000);
+insert into test select number, tuple(if(number % 2 == 0, tuple(number), NULL))::Tuple(a Dynamic(max_types=3)) from numbers(200000);
 
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
+select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
-
-system stop merges test;
-insert into test select number, tuple(toDateTime(number))::Tuple(a Dynamic(max_types=2)) from numbers(40000);
-
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
-system start merges test;
-optimize table test final;
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
+select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
 
 drop table test;
diff --git a/tests/queries/0_stateless/03038_nested_dynamic_merges_small.reference.j2 b/tests/queries/0_stateless/03038_nested_dynamic_merges_small.reference.j2
deleted file mode 100644
index 3d7e8b60f73..00000000000
--- a/tests/queries/0_stateless/03038_nested_dynamic_merges_small.reference.j2
+++ /dev/null
@@ -1,256 +0,0 @@
-test
-2	Tuple(a Dynamic(max_types=2)):DateTime	false
-2	Tuple(a Dynamic(max_types=2)):IPv4	false
-4	Tuple(a Dynamic(max_types=2)):Date	false
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	false
-7	Tuple(a Dynamic(max_types=2)):UInt64	false
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):DateTime	true
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	false
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):DateTime	true
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-4	Tuple(a Dynamic(max_types=2)):DateTime	false
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	false
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-20	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-26	Tuple(a Dynamic(max_types=2)):None	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-6	Tuple(a Dynamic(max_types=2)):DateTime	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	true
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-20	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-26	Tuple(a Dynamic(max_types=2)):None	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-6	Tuple(a Dynamic(max_types=2)):DateTime	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	true
-8	String:None	false
-8	Tuple(a Dynamic(max_types=2)):DateTime	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-20	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-26	Tuple(a Dynamic(max_types=2)):None	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	true
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-14	Tuple(a Dynamic(max_types=2)):DateTime	true
-20	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-26	Tuple(a Dynamic(max_types=2)):None	false
-28	UInt64:None	false
-test
-2	Tuple(a Dynamic(max_types=2)):DateTime	false
-2	Tuple(a Dynamic(max_types=2)):IPv4	false
-4	Tuple(a Dynamic(max_types=2)):Date	false
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	false
-7	Tuple(a Dynamic(max_types=2)):UInt64	false
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):DateTime	true
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	false
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):DateTime	true
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-4	Tuple(a Dynamic(max_types=2)):DateTime	false
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	false
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-20	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-26	Tuple(a Dynamic(max_types=2)):None	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-6	Tuple(a Dynamic(max_types=2)):DateTime	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	true
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-20	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-26	Tuple(a Dynamic(max_types=2)):None	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-6	Tuple(a Dynamic(max_types=2)):DateTime	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	true
-8	String:None	false
-8	Tuple(a Dynamic(max_types=2)):DateTime	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-20	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-26	Tuple(a Dynamic(max_types=2)):None	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	true
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-14	Tuple(a Dynamic(max_types=2)):DateTime	true
-20	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-26	Tuple(a Dynamic(max_types=2)):None	false
-28	UInt64:None	false
-test
-2	Tuple(a Dynamic(max_types=2)):DateTime	false
-2	Tuple(a Dynamic(max_types=2)):IPv4	false
-4	Tuple(a Dynamic(max_types=2)):Date	false
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	false
-7	Tuple(a Dynamic(max_types=2)):UInt64	false
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):DateTime	true
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	false
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):DateTime	true
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-4	Tuple(a Dynamic(max_types=2)):DateTime	false
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	false
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-20	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-26	Tuple(a Dynamic(max_types=2)):None	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-6	Tuple(a Dynamic(max_types=2)):DateTime	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	true
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-20	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-26	Tuple(a Dynamic(max_types=2)):None	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-6	Tuple(a Dynamic(max_types=2)):DateTime	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	true
-8	String:None	false
-8	Tuple(a Dynamic(max_types=2)):DateTime	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-20	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-26	Tuple(a Dynamic(max_types=2)):None	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	true
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	true
-14	Tuple(a Dynamic(max_types=2)):DateTime	false
-20	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-26	Tuple(a Dynamic(max_types=2)):None	false
-28	UInt64:None	false
-test
-2	Tuple(a Dynamic(max_types=2)):DateTime	false
-2	Tuple(a Dynamic(max_types=2)):IPv4	false
-4	Tuple(a Dynamic(max_types=2)):Date	false
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	false
-7	Tuple(a Dynamic(max_types=2)):UInt64	false
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):DateTime	true
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	false
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):DateTime	true
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-4	Tuple(a Dynamic(max_types=2)):DateTime	false
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	false
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-20	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-26	Tuple(a Dynamic(max_types=2)):None	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-6	Tuple(a Dynamic(max_types=2)):DateTime	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	true
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-20	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-26	Tuple(a Dynamic(max_types=2)):None	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-6	Tuple(a Dynamic(max_types=2)):DateTime	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	true
-8	String:None	false
-8	Tuple(a Dynamic(max_types=2)):DateTime	false
-13	Tuple(a Dynamic(max_types=2)):String	false
-20	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-26	Tuple(a Dynamic(max_types=2)):None	false
-28	UInt64:None	false
----------------------
-2	Tuple(a Dynamic(max_types=2)):IPv4	true
-4	Tuple(a Dynamic(max_types=2)):Date	true
-6	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-7	Tuple(a Dynamic(max_types=2)):UInt64	true
-8	String:None	false
-13	Tuple(a Dynamic(max_types=2)):String	true
-14	Tuple(a Dynamic(max_types=2)):DateTime	false
-20	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-26	Tuple(a Dynamic(max_types=2)):None	false
-28	UInt64:None	false
diff --git a/tests/queries/0_stateless/03038_nested_dynamic_merges_small.sql.j2 b/tests/queries/0_stateless/03038_nested_dynamic_merges_small.sql.j2
deleted file mode 100644
index 8682b6cef81..00000000000
--- a/tests/queries/0_stateless/03038_nested_dynamic_merges_small.sql.j2
+++ /dev/null
@@ -1,51 +0,0 @@
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type = 1;
-set allow_experimental_dynamic_type = 1;
-set enable_named_columns_in_function_tuple = 0;
-
-drop table if exists test;
-
-{% for engine in ['MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000',
-                  'MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1',
-                  'MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1',
-                  'MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1'] -%}
-
-select 'test';
-create table test (id UInt64, d Dynamic(max_types=2)) engine={{ engine }};
-
-system stop merges test;
-insert into test select number, number from numbers(20);
-insert into test select number, tuple(if(number % 3 == 0, number, 'str_' || toString(number)))::Tuple(a Dynamic(max_types=2)) from numbers(20);
-insert into test select number, tuple(if(number % 3 == 0, toDate(number), range(number % 10)))::Tuple(a Dynamic(max_types=2)) from numbers(10);
-insert into test select number, multiIf(number % 5 == 0, tuple(if(number % 3 == 0, toDateTime(number), toIPv4(number)))::Tuple(a Dynamic(max_types=2)), number % 5 == 1 or number % 5 == 2, number, 'str_' || number) from numbers(20);
-
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
-system start merges test;
-optimize table test final;
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
-
-system stop merges test;
-insert into test select number, tuple(if(number % 3 == 0, toDateTime(number), NULL))::Tuple(a Dynamic(max_types=2)) from numbers(10);
-insert into test select number, tuple(if(number % 2 == 0, tuple(number), NULL))::Tuple(a Dynamic(max_types=2)) from numbers(40);
-
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
-system start merges test;
-optimize table test final;
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
-
-system stop merges test;
-insert into test select number, tuple(toDateTime(number))::Tuple(a Dynamic(max_types=2)) from numbers(8);
-
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
-system start merges test;
-optimize table test final;
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
-
-drop table test;
-
-{% endfor -%}
diff --git a/tests/queries/0_stateless/03038_nested_dynamic_merges_wide_horizontal.reference b/tests/queries/0_stateless/03038_nested_dynamic_merges_wide_horizontal.reference
index a4c2df74a74..4be740f6050 100644
--- a/tests/queries/0_stateless/03038_nested_dynamic_merges_wide_horizontal.reference
+++ b/tests/queries/0_stateless/03038_nested_dynamic_merges_wide_horizontal.reference
@@ -1,63 +1,21 @@
-6667	Tuple(a Dynamic(max_types=2)):DateTime	false
-13333	Tuple(a Dynamic(max_types=2)):IPv4	false
-16667	Tuple(a Dynamic(max_types=2)):Date	false
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	false
-33334	Tuple(a Dynamic(max_types=2)):UInt64	false
-40000	String:None	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-140000	UInt64:None	false
----------------------
-6667	Tuple(a Dynamic(max_types=2)):DateTime	true
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	false
-40000	String:None	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-140000	UInt64:None	false
----------------------
-6667	Tuple(a Dynamic(max_types=2)):DateTime	true
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-16667	Tuple(a Dynamic(max_types=2)):DateTime	false
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	false
-40000	String:None	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-100000	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-133333	Tuple(a Dynamic(max_types=2)):None	false
-140000	UInt64:None	false
----------------------
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-23334	Tuple(a Dynamic(max_types=2)):DateTime	true
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	true
-40000	String:None	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-100000	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-133333	Tuple(a Dynamic(max_types=2)):None	false
-140000	UInt64:None	false
----------------------
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-23334	Tuple(a Dynamic(max_types=2)):DateTime	true
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	true
-40000	String:None	false
-40000	Tuple(a Dynamic(max_types=2)):DateTime	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-100000	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-133333	Tuple(a Dynamic(max_types=2)):None	false
-140000	UInt64:None	false
----------------------
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	true
-40000	String:None	false
-63334	Tuple(a Dynamic(max_types=2)):DateTime	true
-66666	Tuple(a Dynamic(max_types=2)):String	false
-100000	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-133333	Tuple(a Dynamic(max_types=2)):None	false
-140000	UInt64:None	false
+16667	Tuple(a Dynamic(max_types=3)):Date
+33333	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+50000	Tuple(a Dynamic(max_types=3)):String
+50000	Tuple(a Dynamic(max_types=3)):UInt64
+100000	UInt64:None
+33333	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+50000	Tuple(a Dynamic(max_types=3)):UInt64
+66667	Tuple(a Dynamic(max_types=3)):String
+100000	UInt64:None
+16667	Tuple(a Dynamic(max_types=3)):DateTime
+33333	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+50000	Tuple(a Dynamic(max_types=3)):UInt64
+66667	Tuple(a Dynamic(max_types=3)):String
+100000	Tuple(a Dynamic(max_types=3)):Tuple(UInt64)
+100000	UInt64:None
+133333	Tuple(a Dynamic(max_types=3)):None
+50000	Tuple(a Dynamic(max_types=3)):UInt64
+100000	Tuple(a Dynamic(max_types=3)):Tuple(UInt64)
+100000	UInt64:None
+116667	Tuple(a Dynamic(max_types=3)):String
+133333	Tuple(a Dynamic(max_types=3)):None
diff --git a/tests/queries/0_stateless/03038_nested_dynamic_merges_wide_horizontal.sql b/tests/queries/0_stateless/03038_nested_dynamic_merges_wide_horizontal.sql
index 4ed4d00fe95..5f373d41c7d 100644
--- a/tests/queries/0_stateless/03038_nested_dynamic_merges_wide_horizontal.sql
+++ b/tests/queries/0_stateless/03038_nested_dynamic_merges_wide_horizontal.sql
@@ -1,5 +1,4 @@
--- Tags: long, no-tsan, no-msan, no-ubsan, no-asan
--- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
+-- Tags: long
 
 set allow_experimental_variant_type = 1;
 set use_variant_as_common_type = 1;
@@ -7,39 +6,24 @@ set allow_experimental_dynamic_type = 1;
 set enable_named_columns_in_function_tuple = 0;
 
 drop table if exists test;;
-create table test (id UInt64, d Dynamic(max_types=2)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, lock_acquire_timeout_for_background_operations=600;
+create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;
 
 system stop merges test;
 insert into test select number, number from numbers(100000);
-insert into test select number, tuple(if(number % 3 == 0, number, 'str_' || toString(number)))::Tuple(a Dynamic(max_types=2)) from numbers(100000);
-insert into test select number, tuple(if(number % 3 == 0, toDate(number), range(number % 10)))::Tuple(a Dynamic(max_types=2)) from numbers(50000);
-insert into test select number, multiIf(number % 5 == 0, tuple(if(number % 3 == 0, toDateTime(number), toIPv4(number)))::Tuple(a Dynamic(max_types=2)), number % 5 == 1 or number % 5 == 2, number, 'str_' || number) from numbers(100000);
+insert into test select number, tuple(if(number % 2 == 0, number, 'str_' || toString(number)))::Tuple(a Dynamic(max_types=3)) from numbers(100000);
+insert into test select number, tuple(if(number % 3 == 0, toDate(number), range(number % 10)))::Tuple(a Dynamic(max_types=3)) from numbers(50000);
 
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
+select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
+select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
 
-system stop merges test;
-insert into test select number, tuple(if(number % 3 == 0, toDateTime(number), NULL))::Tuple(a Dynamic(max_types=2)) from numbers(50000);
-insert into test select number, tuple(if(number % 2 == 0, tuple(number), NULL))::Tuple(a Dynamic(max_types=2)) from numbers(200000);
+insert into test select number, tuple(if(number % 3 == 0, toDateTime(number), NULL))::Tuple(a Dynamic(max_types=3)) from numbers(50000);
+insert into test select number, tuple(if(number % 2 == 0, tuple(number), NULL))::Tuple(a Dynamic(max_types=3)) from numbers(200000);
 
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
+select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
-
-system stop merges test;
-insert into test select number, tuple(toDateTime(number))::Tuple(a Dynamic(max_types=2)) from numbers(40000);
-
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
-system start merges test;
-optimize table test final;
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
+select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
 
 drop table test;
diff --git a/tests/queries/0_stateless/03038_nested_dynamic_merges_wide_vertical.reference b/tests/queries/0_stateless/03038_nested_dynamic_merges_wide_vertical.reference
index a4c2df74a74..4be740f6050 100644
--- a/tests/queries/0_stateless/03038_nested_dynamic_merges_wide_vertical.reference
+++ b/tests/queries/0_stateless/03038_nested_dynamic_merges_wide_vertical.reference
@@ -1,63 +1,21 @@
-6667	Tuple(a Dynamic(max_types=2)):DateTime	false
-13333	Tuple(a Dynamic(max_types=2)):IPv4	false
-16667	Tuple(a Dynamic(max_types=2)):Date	false
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	false
-33334	Tuple(a Dynamic(max_types=2)):UInt64	false
-40000	String:None	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-140000	UInt64:None	false
----------------------
-6667	Tuple(a Dynamic(max_types=2)):DateTime	true
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	false
-40000	String:None	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-140000	UInt64:None	false
----------------------
-6667	Tuple(a Dynamic(max_types=2)):DateTime	true
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-16667	Tuple(a Dynamic(max_types=2)):DateTime	false
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	false
-40000	String:None	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-100000	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-133333	Tuple(a Dynamic(max_types=2)):None	false
-140000	UInt64:None	false
----------------------
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-23334	Tuple(a Dynamic(max_types=2)):DateTime	true
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	true
-40000	String:None	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-100000	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-133333	Tuple(a Dynamic(max_types=2)):None	false
-140000	UInt64:None	false
----------------------
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-23334	Tuple(a Dynamic(max_types=2)):DateTime	true
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	true
-40000	String:None	false
-40000	Tuple(a Dynamic(max_types=2)):DateTime	false
-66666	Tuple(a Dynamic(max_types=2)):String	false
-100000	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-133333	Tuple(a Dynamic(max_types=2)):None	false
-140000	UInt64:None	false
----------------------
-13333	Tuple(a Dynamic(max_types=2)):IPv4	true
-16667	Tuple(a Dynamic(max_types=2)):Date	true
-33333	Tuple(a Dynamic(max_types=2)):Array(UInt8)	true
-33334	Tuple(a Dynamic(max_types=2)):UInt64	true
-40000	String:None	false
-63334	Tuple(a Dynamic(max_types=2)):DateTime	true
-66666	Tuple(a Dynamic(max_types=2)):String	false
-100000	Tuple(a Dynamic(max_types=2)):Tuple(UInt64)	false
-133333	Tuple(a Dynamic(max_types=2)):None	false
-140000	UInt64:None	false
+16667	Tuple(a Dynamic(max_types=3)):Date
+33333	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+50000	Tuple(a Dynamic(max_types=3)):String
+50000	Tuple(a Dynamic(max_types=3)):UInt64
+100000	UInt64:None
+33333	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+50000	Tuple(a Dynamic(max_types=3)):UInt64
+66667	Tuple(a Dynamic(max_types=3)):String
+100000	UInt64:None
+16667	Tuple(a Dynamic(max_types=3)):DateTime
+33333	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+50000	Tuple(a Dynamic(max_types=3)):UInt64
+66667	Tuple(a Dynamic(max_types=3)):String
+100000	Tuple(a Dynamic(max_types=3)):Tuple(UInt64)
+100000	UInt64:None
+133333	Tuple(a Dynamic(max_types=3)):None
+50000	Tuple(a Dynamic(max_types=3)):UInt64
+100000	Tuple(a Dynamic(max_types=3)):Tuple(UInt64)
+100000	UInt64:None
+116667	Tuple(a Dynamic(max_types=3)):String
+133333	Tuple(a Dynamic(max_types=3)):None
diff --git a/tests/queries/0_stateless/03038_nested_dynamic_merges_wide_vertical.sql b/tests/queries/0_stateless/03038_nested_dynamic_merges_wide_vertical.sql
index 2f8b258ba8e..36bbc76b8cb 100644
--- a/tests/queries/0_stateless/03038_nested_dynamic_merges_wide_vertical.sql
+++ b/tests/queries/0_stateless/03038_nested_dynamic_merges_wide_vertical.sql
@@ -1,5 +1,4 @@
--- Tags: long,  no-tsan, no-msan, no-ubsan, no-asan
--- Random settings limits: index_granularity=(100, None); merge_max_block_size=(100, None)
+-- Tags: long
 
 set allow_experimental_variant_type = 1;
 set use_variant_as_common_type = 1;
@@ -7,39 +6,24 @@ set allow_experimental_dynamic_type = 1;
 set enable_named_columns_in_function_tuple = 0;
 
 drop table if exists test;;
-create table test (id UInt64, d Dynamic(max_types=2)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1, lock_acquire_timeout_for_background_operations=600;
+create table test (id UInt64, d Dynamic(max_types=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;
 
 system stop merges test;
 insert into test select number, number from numbers(100000);
-insert into test select number, tuple(if(number % 3 == 0, number, 'str_' || toString(number)))::Tuple(a Dynamic(max_types=2)) from numbers(100000);
-insert into test select number, tuple(if(number % 3 == 0, toDate(number), range(number % 10)))::Tuple(a Dynamic(max_types=2)) from numbers(50000);
-insert into test select number, multiIf(number % 5 == 0, tuple(if(number % 3 == 0, toDateTime(number), toIPv4(number)))::Tuple(a Dynamic(max_types=2)), number % 5 == 1 or number % 5 == 2, number, 'str_' || number) from numbers(100000);
+insert into test select number, tuple(if(number % 2 == 0, number, 'str_' || toString(number)))::Tuple(a Dynamic(max_types=3)) from numbers(100000);
+insert into test select number, tuple(if(number % 3 == 0, toDate(number), range(number % 10)))::Tuple(a Dynamic(max_types=3)) from numbers(50000);
 
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
+select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
+select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
 
-system stop merges test;
-insert into test select number, tuple(if(number % 3 == 0, toDateTime(number), NULL))::Tuple(a Dynamic(max_types=2)) from numbers(50000);
-insert into test select number, tuple(if(number % 2 == 0, tuple(number), NULL))::Tuple(a Dynamic(max_types=2)) from numbers(200000);
+insert into test select number, tuple(if(number % 3 == 0, toDateTime(number), NULL))::Tuple(a Dynamic(max_types=3)) from numbers(50000);
+insert into test select number, tuple(if(number % 2 == 0, tuple(number), NULL))::Tuple(a Dynamic(max_types=3)) from numbers(200000);
 
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
+select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
 system start merges test;
 optimize table test final;
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
-
-system stop merges test;
-insert into test select number, tuple(toDateTime(number))::Tuple(a Dynamic(max_types=2)) from numbers(40000);
-
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
-system start merges test;
-optimize table test final;
-select '---------------------';
-select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=2))`.a) as type, isDynamicElementInSharedData(d.`Tuple(a Dynamic(max_types=2))`.a) as flag from test group by type, flag order by count(), type;
+select count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
 
 drop table test;
diff --git a/tests/queries/0_stateless/03038_recursive_cte_postgres_4.reference b/tests/queries/0_stateless/03038_recursive_cte_postgres_4.reference
index cf070eebc38..b920fc298b3 100644
--- a/tests/queries/0_stateless/03038_recursive_cte_postgres_4.reference
+++ b/tests/queries/0_stateless/03038_recursive_cte_postgres_4.reference
@@ -32,7 +32,7 @@
 
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 --
 -- test cycle detection
 --
diff --git a/tests/queries/0_stateless/03038_recursive_cte_postgres_4.sql b/tests/queries/0_stateless/03038_recursive_cte_postgres_4.sql
index 7dad74893b9..a6fe3b1e55c 100644
--- a/tests/queries/0_stateless/03038_recursive_cte_postgres_4.sql
+++ b/tests/queries/0_stateless/03038_recursive_cte_postgres_4.sql
@@ -32,7 +32,7 @@
 
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 --
 -- test cycle detection
diff --git a/tests/queries/0_stateless/03039_dynamic_aggregating_merge_tree.sh b/tests/queries/0_stateless/03039_dynamic_aggregating_merge_tree.sh
index 9ea86105a3a..b8760ec0e1d 100755
--- a/tests/queries/0_stateless/03039_dynamic_aggregating_merge_tree.sh
+++ b/tests/queries/0_stateless/03039_dynamic_aggregating_merge_tree.sh
@@ -2,6 +2,8 @@
 # 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
 
diff --git a/tests/queries/0_stateless/03039_dynamic_collapsing_merge_tree.sh b/tests/queries/0_stateless/03039_dynamic_collapsing_merge_tree.sh
index 9a2a6dd957c..881c9ec64cc 100755
--- a/tests/queries/0_stateless/03039_dynamic_collapsing_merge_tree.sh
+++ b/tests/queries/0_stateless/03039_dynamic_collapsing_merge_tree.sh
@@ -2,6 +2,8 @@
 # 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
 
diff --git a/tests/queries/0_stateless/03039_dynamic_replacing_merge_tree.sh b/tests/queries/0_stateless/03039_dynamic_replacing_merge_tree.sh
index 0199035a3df..fc9039ac98c 100755
--- a/tests/queries/0_stateless/03039_dynamic_replacing_merge_tree.sh
+++ b/tests/queries/0_stateless/03039_dynamic_replacing_merge_tree.sh
@@ -2,6 +2,8 @@
 # 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
 
diff --git a/tests/queries/0_stateless/03039_dynamic_summing_merge_tree.sh b/tests/queries/0_stateless/03039_dynamic_summing_merge_tree.sh
index e2ea5bc3466..f9da70e95ca 100755
--- a/tests/queries/0_stateless/03039_dynamic_summing_merge_tree.sh
+++ b/tests/queries/0_stateless/03039_dynamic_summing_merge_tree.sh
@@ -2,6 +2,8 @@
 # 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
 
diff --git a/tests/queries/0_stateless/03039_dynamic_versioned_collapsing_merge_tree.sh b/tests/queries/0_stateless/03039_dynamic_versioned_collapsing_merge_tree.sh
index 43607cf95a8..60248f4453a 100755
--- a/tests/queries/0_stateless/03039_dynamic_versioned_collapsing_merge_tree.sh
+++ b/tests/queries/0_stateless/03039_dynamic_versioned_collapsing_merge_tree.sh
@@ -2,6 +2,8 @@
 # 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
 
diff --git a/tests/queries/0_stateless/03039_recursive_cte_postgres_5.reference b/tests/queries/0_stateless/03039_recursive_cte_postgres_5.reference
index 43399a0ab95..2910ac174e7 100644
--- a/tests/queries/0_stateless/03039_recursive_cte_postgres_5.reference
+++ b/tests/queries/0_stateless/03039_recursive_cte_postgres_5.reference
@@ -32,7 +32,7 @@
 
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 --
 -- test multiple WITH queries
 --
diff --git a/tests/queries/0_stateless/03039_recursive_cte_postgres_5.sql b/tests/queries/0_stateless/03039_recursive_cte_postgres_5.sql
index eb4043cca42..e188a455434 100644
--- a/tests/queries/0_stateless/03039_recursive_cte_postgres_5.sql
+++ b/tests/queries/0_stateless/03039_recursive_cte_postgres_5.sql
@@ -33,7 +33,7 @@
 
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 --
 -- test multiple WITH queries
diff --git a/tests/queries/0_stateless/03039_unknown_identifier_window_function.sql b/tests/queries/0_stateless/03039_unknown_identifier_window_function.sql
index 652085d9f5a..640d217d2f9 100644
--- a/tests/queries/0_stateless/03039_unknown_identifier_window_function.sql
+++ b/tests/queries/0_stateless/03039_unknown_identifier_window_function.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/45535
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 SELECT
   *,
diff --git a/tests/queries/0_stateless/03040_alias_column_join.sql b/tests/queries/0_stateless/03040_alias_column_join.sql
index 6ffd749a6c4..54f579c0feb 100644
--- a/tests/queries/0_stateless/03040_alias_column_join.sql
+++ b/tests/queries/0_stateless/03040_alias_column_join.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/44365
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 DROP TABLE IF EXISTS 03040_test;
 
 CREATE TABLE 03040_test
diff --git a/tests/queries/0_stateless/03040_array_sum_and_join.sql b/tests/queries/0_stateless/03040_array_sum_and_join.sql
index 90d3d83c9a2..9aeddc9f765 100644
--- a/tests/queries/0_stateless/03040_array_sum_and_join.sql
+++ b/tests/queries/0_stateless/03040_array_sum_and_join.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 select t.1 as cnt,
        t.2 as name,
diff --git a/tests/queries/0_stateless/03040_dynamic_type_alters_1_compact_merge_tree.reference b/tests/queries/0_stateless/03040_dynamic_type_alters_1_compact_merge_tree.reference
index 9386548c74d..2ec301b747b 100644
--- a/tests/queries/0_stateless/03040_dynamic_type_alters_1_compact_merge_tree.reference
+++ b/tests/queries/0_stateless/03040_dynamic_type_alters_1_compact_merge_tree.reference
@@ -1,13 +1,13 @@
 initial insert
 alter add column 1
-3	None	false
+3	None
 0	0	\N	\N	\N	0
 1	1	\N	\N	\N	0
 2	2	\N	\N	\N	0
 insert after alter add column 1
-4	String	false
-4	UInt64	false
-7	None	false
+4	String
+4	UInt64
+7	None
 0	0	\N	\N	\N	\N	0
 1	1	\N	\N	\N	\N	0
 2	2	\N	\N	\N	\N	0
@@ -24,158 +24,147 @@ insert after alter add column 1
 13	13	str_13	str_13	\N	\N	0
 14	14	\N	\N	\N	\N	0
 alter modify column 1
-4	String	true
-4	UInt64	true
-7	None	false
+7	None
+8	String
 0	0	\N	\N	\N	\N	0
 1	1	\N	\N	\N	\N	0
 2	2	\N	\N	\N	\N	0
-3	3	3	\N	3	\N	0
-4	4	4	\N	4	\N	0
-5	5	5	\N	5	\N	0
+3	3	3	3	\N	\N	0
+4	4	4	4	\N	\N	0
+5	5	5	5	\N	\N	0
 6	6	str_6	str_6	\N	\N	0
 7	7	str_7	str_7	\N	\N	0
 8	8	str_8	str_8	\N	\N	0
 9	9	\N	\N	\N	\N	0
 10	10	\N	\N	\N	\N	0
 11	11	\N	\N	\N	\N	0
-12	12	12	\N	12	\N	0
+12	12	12	12	\N	\N	0
 13	13	str_13	str_13	\N	\N	0
 14	14	\N	\N	\N	\N	0
 insert after alter modify column 1
-1	Date	true
-5	String	true
-5	UInt64	true
-8	None	false
+8	None
+11	String
 0	0	\N	\N	\N	\N	0
 1	1	\N	\N	\N	\N	0
 2	2	\N	\N	\N	\N	0
-3	3	3	\N	3	\N	0
-4	4	4	\N	4	\N	0
-5	5	5	\N	5	\N	0
+3	3	3	3	\N	\N	0
+4	4	4	4	\N	\N	0
+5	5	5	5	\N	\N	0
 6	6	str_6	str_6	\N	\N	0
 7	7	str_7	str_7	\N	\N	0
 8	8	str_8	str_8	\N	\N	0
 9	9	\N	\N	\N	\N	0
 10	10	\N	\N	\N	\N	0
 11	11	\N	\N	\N	\N	0
-12	12	12	\N	12	\N	0
+12	12	12	12	\N	\N	0
 13	13	str_13	str_13	\N	\N	0
 14	14	\N	\N	\N	\N	0
 15	15	\N	\N	\N	\N	0
-16	16	16	\N	16	\N	0
+16	16	16	16	\N	\N	0
 17	17	str_17	str_17	\N	\N	0
-18	18	1970-01-19	\N	\N	1970-01-19	0
+18	18	1970-01-19	1970-01-19	\N	\N	0
 alter modify column 2
-1	Date	true
-5	String	true
-5	UInt64	true
-8	None	false
+8	None
+11	String
 0	0	\N	\N	\N	\N	0
 1	1	\N	\N	\N	\N	0
 2	2	\N	\N	\N	\N	0
-3	3	3	\N	3	\N	0
-4	4	4	\N	4	\N	0
-5	5	5	\N	5	\N	0
+3	3	3	3	\N	\N	0
+4	4	4	4	\N	\N	0
+5	5	5	5	\N	\N	0
 6	6	str_6	str_6	\N	\N	0
 7	7	str_7	str_7	\N	\N	0
 8	8	str_8	str_8	\N	\N	0
 9	9	\N	\N	\N	\N	0
 10	10	\N	\N	\N	\N	0
 11	11	\N	\N	\N	\N	0
-12	12	12	\N	12	\N	0
+12	12	12	12	\N	\N	0
 13	13	str_13	str_13	\N	\N	0
 14	14	\N	\N	\N	\N	0
 15	15	\N	\N	\N	\N	0
-16	16	16	\N	16	\N	0
+16	16	16	16	\N	\N	0
 17	17	str_17	str_17	\N	\N	0
-18	18	1970-01-19	\N	\N	1970-01-19	0
+18	18	1970-01-19	1970-01-19	\N	\N	0
 insert after alter modify column 2
-1	String	false
-1	UInt64	false
-2	Date	true
-5	String	true
-5	UInt64	true
-9	None	false
+1	Date
+1	UInt64
+9	None
+12	String
 0	0	\N	\N	\N	\N	0
 1	1	\N	\N	\N	\N	0
 2	2	\N	\N	\N	\N	0
-3	3	3	\N	3	\N	0
-4	4	4	\N	4	\N	0
-5	5	5	\N	5	\N	0
+3	3	3	3	\N	\N	0
+4	4	4	4	\N	\N	0
+5	5	5	5	\N	\N	0
 6	6	str_6	str_6	\N	\N	0
 7	7	str_7	str_7	\N	\N	0
 8	8	str_8	str_8	\N	\N	0
 9	9	\N	\N	\N	\N	0
 10	10	\N	\N	\N	\N	0
 11	11	\N	\N	\N	\N	0
-12	12	12	\N	12	\N	0
+12	12	12	12	\N	\N	0
 13	13	str_13	str_13	\N	\N	0
 14	14	\N	\N	\N	\N	0
 15	15	\N	\N	\N	\N	0
-16	16	16	\N	16	\N	0
+16	16	16	16	\N	\N	0
 17	17	str_17	str_17	\N	\N	0
-18	18	1970-01-19	\N	\N	1970-01-19	0
+18	18	1970-01-19	1970-01-19	\N	\N	0
 19	19	\N	\N	\N	\N	0
 20	20	20	\N	20	\N	0
 21	21	str_21	str_21	\N	\N	0
 22	22	1970-01-23	\N	\N	1970-01-23	0
 alter modify column 3
-1	String	false
-1	UInt64	false
-2	Date	true
-5	String	true
-5	UInt64	true
-9	None	false
+1	Date
+1	UInt64
+9	None
+12	String
 0	0	0	\N	0	\N	\N	\N	0
 1	1	1	\N	0	\N	\N	\N	0
 2	2	2	\N	0	\N	\N	\N	0
-3	3	3	\N	0	\N	3	\N	0
-4	4	4	\N	0	\N	4	\N	0
-5	5	5	\N	0	\N	5	\N	0
+3	3	3	\N	0	3	\N	\N	0
+4	4	4	\N	0	4	\N	\N	0
+5	5	5	\N	0	5	\N	\N	0
 6	6	6	\N	0	str_6	\N	\N	0
 7	7	7	\N	0	str_7	\N	\N	0
 8	8	8	\N	0	str_8	\N	\N	0
 9	9	9	\N	0	\N	\N	\N	0
 10	10	10	\N	0	\N	\N	\N	0
 11	11	11	\N	0	\N	\N	\N	0
-12	12	12	\N	0	\N	12	\N	0
+12	12	12	\N	0	12	\N	\N	0
 13	13	13	\N	0	str_13	\N	\N	0
 14	14	14	\N	0	\N	\N	\N	0
 15	15	15	\N	0	\N	\N	\N	0
-16	16	16	\N	0	\N	16	\N	0
+16	16	16	\N	0	16	\N	\N	0
 17	17	17	\N	0	str_17	\N	\N	0
-18	18	18	\N	0	\N	\N	1970-01-19	0
+18	18	18	\N	0	1970-01-19	\N	\N	0
 19	19	19	\N	0	\N	\N	\N	0
 20	20	20	\N	0	\N	20	\N	0
 21	21	21	\N	0	str_21	\N	\N	0
 22	22	22	\N	0	\N	\N	1970-01-23	0
 insert after alter modify column 3
-1	String	false
-1	UInt64	false
-2	Date	true
-5	String	true
-5	UInt64	true
-12	None	false
+1	Date
+1	UInt64
+12	None
+12	String
 0	0	0	\N	0	\N	\N	\N	0
 1	1	1	\N	0	\N	\N	\N	0
 2	2	2	\N	0	\N	\N	\N	0
-3	3	3	\N	0	\N	3	\N	0
-4	4	4	\N	0	\N	4	\N	0
-5	5	5	\N	0	\N	5	\N	0
+3	3	3	\N	0	3	\N	\N	0
+4	4	4	\N	0	4	\N	\N	0
+5	5	5	\N	0	5	\N	\N	0
 6	6	6	\N	0	str_6	\N	\N	0
 7	7	7	\N	0	str_7	\N	\N	0
 8	8	8	\N	0	str_8	\N	\N	0
 9	9	9	\N	0	\N	\N	\N	0
 10	10	10	\N	0	\N	\N	\N	0
 11	11	11	\N	0	\N	\N	\N	0
-12	12	12	\N	0	\N	12	\N	0
+12	12	12	\N	0	12	\N	\N	0
 13	13	13	\N	0	str_13	\N	\N	0
 14	14	14	\N	0	\N	\N	\N	0
 15	15	15	\N	0	\N	\N	\N	0
-16	16	16	\N	0	\N	16	\N	0
+16	16	16	\N	0	16	\N	\N	0
 17	17	17	\N	0	str_17	\N	\N	0
-18	18	18	\N	0	\N	\N	1970-01-19	0
+18	18	18	\N	0	1970-01-19	\N	\N	0
 19	19	19	\N	0	\N	\N	\N	0
 20	20	20	\N	0	\N	20	\N	0
 21	21	21	\N	0	str_21	\N	\N	0
diff --git a/tests/queries/0_stateless/03040_dynamic_type_alters_1_compact_merge_tree.sql b/tests/queries/0_stateless/03040_dynamic_type_alters_1_compact_merge_tree.sql
index de05ba36177..4ab700306d4 100644
--- a/tests/queries/0_stateless/03040_dynamic_type_alters_1_compact_merge_tree.sql
+++ b/tests/queries/0_stateless/03040_dynamic_type_alters_1_compact_merge_tree.sql
@@ -9,7 +9,7 @@ insert into test select number, number from numbers(3);
 
 select 'alter add column 1';
 alter table test add column d Dynamic(max_types=3) settings mutations_sync=1;
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 select x, y, d, d.String, d.UInt64, d.`Tuple(a UInt64)`.a from test order by x;
 
 select 'insert after alter add column 1';
@@ -17,37 +17,37 @@ insert into test select number, number, number from numbers(3, 3);
 insert into test select number, number, 'str_' || toString(number) from numbers(6, 3);
 insert into test select number, number, NULL from numbers(9, 3);
 insert into test select number, number, multiIf(number % 3 == 0, number, number % 3 == 1, 'str_' || toString(number), NULL) from numbers(12, 3);
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 select x, y, d, d.String, d.UInt64, d.Date, d.`Tuple(a UInt64)`.a from test order by x;
 
 select 'alter modify column 1';
-alter table test modify column d Dynamic(max_types=0) settings mutations_sync=1;
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+alter table test modify column d Dynamic(max_types=1) settings mutations_sync=1;
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 select x, y, d, d.String, d.UInt64, d.Date, d.`Tuple(a UInt64)`.a from test order by x;
 
 select 'insert after alter modify column 1';
 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(15, 4);
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 select x, y, d, d.String, d.UInt64, d.Date, d.`Tuple(a UInt64)`.a from test order by x;
 
 select 'alter modify column 2';
-alter table test modify column d Dynamic(max_types=2) settings mutations_sync=1;
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+alter table test modify column d Dynamic(max_types=3) settings mutations_sync=1;
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 select x, y, d, d.String, d.UInt64, d.Date, d.`Tuple(a UInt64)`.a from test order by x;
 
 select 'insert after alter modify column 2';
 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(19, 4);
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 select x, y, d, d.String, d.UInt64, d.Date, d.`Tuple(a UInt64)`.a from test order by x;
 
 select 'alter modify column 3';
 alter table test modify column y Dynamic settings mutations_sync=1;
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 select x, y, y.UInt64, y.String, y.`Tuple(a UInt64)`.a, d.String, d.UInt64, d.Date, d.`Tuple(a UInt64)`.a from test order by x;
 
 select 'insert after alter modify column 3';
 insert into test select number, multiIf(number % 3 == 0, number, number % 3 == 1, 'str_' || toString(number), NULL), NULL from numbers(23, 3);
-select count(), dynamicType(d), isDynamicElementInSharedData(d) from test group by dynamicType(d), isDynamicElementInSharedData(d) order by count(), dynamicType(d);
+select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d);
 select x, y, y.UInt64, y.String, y.`Tuple(a UInt64)`.a, d.String, d.UInt64, d.Date, d.`Tuple(a UInt64)`.a from test order by x;
 
 drop table test;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03040_dynamic_type_alters_1_memory.reference b/tests/queries/0_stateless/03040_dynamic_type_alters_1_memory.reference
index d7123288280..c592528c3cd 100644
--- a/tests/queries/0_stateless/03040_dynamic_type_alters_1_memory.reference
+++ b/tests/queries/0_stateless/03040_dynamic_type_alters_1_memory.reference
@@ -24,52 +24,48 @@ insert after alter add column 1
 13	13	str_13	str_13	\N	\N	0
 14	14	\N	\N	\N	\N	0
 alter modify column 1
-4	String
-4	UInt64
 7	None
+8	String
 0	0	\N	\N	\N	\N	0
 1	1	\N	\N	\N	\N	0
 2	2	\N	\N	\N	\N	0
-3	3	3	\N	3	\N	0
-4	4	4	\N	4	\N	0
-5	5	5	\N	5	\N	0
+3	3	3	3	\N	\N	0
+4	4	4	4	\N	\N	0
+5	5	5	5	\N	\N	0
 6	6	str_6	str_6	\N	\N	0
 7	7	str_7	str_7	\N	\N	0
 8	8	str_8	str_8	\N	\N	0
 9	9	\N	\N	\N	\N	0
 10	10	\N	\N	\N	\N	0
 11	11	\N	\N	\N	\N	0
-12	12	12	\N	12	\N	0
+12	12	12	12	\N	\N	0
 13	13	str_13	str_13	\N	\N	0
 14	14	\N	\N	\N	\N	0
 insert after alter modify column 1
-1	Date
-5	String
-5	UInt64
 8	None
+11	String
 0	0	\N	\N	\N	\N	0
 1	1	\N	\N	\N	\N	0
 2	2	\N	\N	\N	\N	0
-3	3	3	\N	3	\N	0
-4	4	4	\N	4	\N	0
-5	5	5	\N	5	\N	0
+3	3	3	3	\N	\N	0
+4	4	4	4	\N	\N	0
+5	5	5	5	\N	\N	0
 6	6	str_6	str_6	\N	\N	0
 7	7	str_7	str_7	\N	\N	0
 8	8	str_8	str_8	\N	\N	0
 9	9	\N	\N	\N	\N	0
 10	10	\N	\N	\N	\N	0
 11	11	\N	\N	\N	\N	0
-12	12	12	\N	12	\N	0
+12	12	12	12	\N	\N	0
 13	13	str_13	str_13	\N	\N	0
 14	14	\N	\N	\N	\N	0
 15	15	\N	\N	\N	\N	0
-16	16	16	\N	16	\N	0
+16	16	16	16	\N	\N	0
 17	17	str_17	str_17	\N	\N	0
-18	18	1970-01-19	\N	\N	1970-01-19	0
+18	18	1970-01-19	1970-01-19	\N	\N	0
 alter modify column 2
-1	Date
-5	String
-5	UInt64
+4	UInt64
+7	String
 8	None
 0	0	\N	\N	\N	\N	0
 1	1	\N	\N	\N	\N	0
@@ -87,13 +83,13 @@ alter modify column 2
 13	13	str_13	str_13	\N	\N	0
 14	14	\N	\N	\N	\N	0
 15	15	\N	\N	\N	\N	0
-16	16	16	\N	16	\N	0
+16	16	16	16	\N	\N	0
 17	17	str_17	str_17	\N	\N	0
-18	18	1970-01-19	\N	\N	1970-01-19	0
+18	18	1970-01-19	1970-01-19	\N	\N	0
 insert after alter modify column 2
-2	Date
-6	String
-6	UInt64
+1	Date
+5	UInt64
+8	String
 9	None
 0	0	\N	\N	\N	\N	0
 1	1	\N	\N	\N	\N	0
@@ -111,17 +107,17 @@ insert after alter modify column 2
 13	13	str_13	str_13	\N	\N	0
 14	14	\N	\N	\N	\N	0
 15	15	\N	\N	\N	\N	0
-16	16	16	\N	16	\N	0
+16	16	16	16	\N	\N	0
 17	17	str_17	str_17	\N	\N	0
-18	18	1970-01-19	\N	\N	1970-01-19	0
+18	18	1970-01-19	1970-01-19	\N	\N	0
 19	19	\N	\N	\N	\N	0
 20	20	20	\N	20	\N	0
 21	21	str_21	str_21	\N	\N	0
 22	22	1970-01-23	\N	\N	1970-01-23	0
 alter modify column 3
-2	Date
-6	String
-6	UInt64
+1	Date
+5	UInt64
+8	String
 9	None
 0	0	0	\N	0	\N	\N	\N	0
 1	1	1	\N	0	\N	\N	\N	0
@@ -139,17 +135,17 @@ alter modify column 3
 13	13	13	\N	0	str_13	\N	\N	0
 14	14	14	\N	0	\N	\N	\N	0
 15	15	15	\N	0	\N	\N	\N	0
-16	16	16	\N	0	\N	16	\N	0
+16	16	16	\N	0	16	\N	\N	0
 17	17	17	\N	0	str_17	\N	\N	0
-18	18	18	\N	0	\N	\N	1970-01-19	0
+18	18	18	\N	0	1970-01-19	\N	\N	0
 19	19	19	\N	0	\N	\N	\N	0
 20	20	20	\N	0	\N	20	\N	0
 21	21	21	\N	0	str_21	\N	\N	0
 22	22	22	\N	0	\N	\N	1970-01-23	0
 insert after alter modify column 3
-2	Date
-6	String
-6	UInt64
+1	Date
+5	UInt64
+8	String
 12	None
 0	0	0	\N	0	\N	\N	\N	0
 1	1	1	\N	0	\N	\N	\N	0
@@ -167,9 +163,9 @@ insert after alter modify column 3
 13	13	13	\N	0	str_13	\N	\N	0
 14	14	14	\N	0	\N	\N	\N	0
 15	15	15	\N	0	\N	\N	\N	0
-16	16	16	\N	0	\N	16	\N	0
+16	16	16	\N	0	16	\N	\N	0
 17	17	17	\N	0	str_17	\N	\N	0
-18	18	18	\N	0	\N	\N	1970-01-19	0
+18	18	18	\N	0	1970-01-19	\N	\N	0
 19	19	19	\N	0	\N	\N	\N	0
 20	20	20	\N	0	\N	20	\N	0
 21	21	21	\N	0	str_21	\N	\N	0
diff --git a/tests/queries/0_stateless/03040_dynamic_type_alters_1_wide_merge_tree.reference b/tests/queries/0_stateless/03040_dynamic_type_alters_1_wide_merge_tree.reference
index d7123288280..2ec301b747b 100644
--- a/tests/queries/0_stateless/03040_dynamic_type_alters_1_wide_merge_tree.reference
+++ b/tests/queries/0_stateless/03040_dynamic_type_alters_1_wide_merge_tree.reference
@@ -24,152 +24,147 @@ insert after alter add column 1
 13	13	str_13	str_13	\N	\N	0
 14	14	\N	\N	\N	\N	0
 alter modify column 1
-4	String
-4	UInt64
 7	None
+8	String
 0	0	\N	\N	\N	\N	0
 1	1	\N	\N	\N	\N	0
 2	2	\N	\N	\N	\N	0
-3	3	3	\N	3	\N	0
-4	4	4	\N	4	\N	0
-5	5	5	\N	5	\N	0
+3	3	3	3	\N	\N	0
+4	4	4	4	\N	\N	0
+5	5	5	5	\N	\N	0
 6	6	str_6	str_6	\N	\N	0
 7	7	str_7	str_7	\N	\N	0
 8	8	str_8	str_8	\N	\N	0
 9	9	\N	\N	\N	\N	0
 10	10	\N	\N	\N	\N	0
 11	11	\N	\N	\N	\N	0
-12	12	12	\N	12	\N	0
+12	12	12	12	\N	\N	0
 13	13	str_13	str_13	\N	\N	0
 14	14	\N	\N	\N	\N	0
 insert after alter modify column 1
-1	Date
-5	String
-5	UInt64
 8	None
+11	String
 0	0	\N	\N	\N	\N	0
 1	1	\N	\N	\N	\N	0
 2	2	\N	\N	\N	\N	0
-3	3	3	\N	3	\N	0
-4	4	4	\N	4	\N	0
-5	5	5	\N	5	\N	0
+3	3	3	3	\N	\N	0
+4	4	4	4	\N	\N	0
+5	5	5	5	\N	\N	0
 6	6	str_6	str_6	\N	\N	0
 7	7	str_7	str_7	\N	\N	0
 8	8	str_8	str_8	\N	\N	0
 9	9	\N	\N	\N	\N	0
 10	10	\N	\N	\N	\N	0
 11	11	\N	\N	\N	\N	0
-12	12	12	\N	12	\N	0
+12	12	12	12	\N	\N	0
 13	13	str_13	str_13	\N	\N	0
 14	14	\N	\N	\N	\N	0
 15	15	\N	\N	\N	\N	0
-16	16	16	\N	16	\N	0
+16	16	16	16	\N	\N	0
 17	17	str_17	str_17	\N	\N	0
-18	18	1970-01-19	\N	\N	1970-01-19	0
+18	18	1970-01-19	1970-01-19	\N	\N	0
 alter modify column 2
-1	Date
-5	String
-5	UInt64
 8	None
+11	String
 0	0	\N	\N	\N	\N	0
 1	1	\N	\N	\N	\N	0
 2	2	\N	\N	\N	\N	0
-3	3	3	\N	3	\N	0
-4	4	4	\N	4	\N	0
-5	5	5	\N	5	\N	0
+3	3	3	3	\N	\N	0
+4	4	4	4	\N	\N	0
+5	5	5	5	\N	\N	0
 6	6	str_6	str_6	\N	\N	0
 7	7	str_7	str_7	\N	\N	0
 8	8	str_8	str_8	\N	\N	0
 9	9	\N	\N	\N	\N	0
 10	10	\N	\N	\N	\N	0
 11	11	\N	\N	\N	\N	0
-12	12	12	\N	12	\N	0
+12	12	12	12	\N	\N	0
 13	13	str_13	str_13	\N	\N	0
 14	14	\N	\N	\N	\N	0
 15	15	\N	\N	\N	\N	0
-16	16	16	\N	16	\N	0
+16	16	16	16	\N	\N	0
 17	17	str_17	str_17	\N	\N	0
-18	18	1970-01-19	\N	\N	1970-01-19	0
+18	18	1970-01-19	1970-01-19	\N	\N	0
 insert after alter modify column 2
-2	Date
-6	String
-6	UInt64
+1	Date
+1	UInt64
 9	None
+12	String
 0	0	\N	\N	\N	\N	0
 1	1	\N	\N	\N	\N	0
 2	2	\N	\N	\N	\N	0
-3	3	3	\N	3	\N	0
-4	4	4	\N	4	\N	0
-5	5	5	\N	5	\N	0
+3	3	3	3	\N	\N	0
+4	4	4	4	\N	\N	0
+5	5	5	5	\N	\N	0
 6	6	str_6	str_6	\N	\N	0
 7	7	str_7	str_7	\N	\N	0
 8	8	str_8	str_8	\N	\N	0
 9	9	\N	\N	\N	\N	0
 10	10	\N	\N	\N	\N	0
 11	11	\N	\N	\N	\N	0
-12	12	12	\N	12	\N	0
+12	12	12	12	\N	\N	0
 13	13	str_13	str_13	\N	\N	0
 14	14	\N	\N	\N	\N	0
 15	15	\N	\N	\N	\N	0
-16	16	16	\N	16	\N	0
+16	16	16	16	\N	\N	0
 17	17	str_17	str_17	\N	\N	0
-18	18	1970-01-19	\N	\N	1970-01-19	0
+18	18	1970-01-19	1970-01-19	\N	\N	0
 19	19	\N	\N	\N	\N	0
 20	20	20	\N	20	\N	0
 21	21	str_21	str_21	\N	\N	0
 22	22	1970-01-23	\N	\N	1970-01-23	0
 alter modify column 3
-2	Date
-6	String
-6	UInt64
+1	Date
+1	UInt64
 9	None
+12	String
 0	0	0	\N	0	\N	\N	\N	0
 1	1	1	\N	0	\N	\N	\N	0
 2	2	2	\N	0	\N	\N	\N	0
-3	3	3	\N	0	\N	3	\N	0
-4	4	4	\N	0	\N	4	\N	0
-5	5	5	\N	0	\N	5	\N	0
+3	3	3	\N	0	3	\N	\N	0
+4	4	4	\N	0	4	\N	\N	0
+5	5	5	\N	0	5	\N	\N	0
 6	6	6	\N	0	str_6	\N	\N	0
 7	7	7	\N	0	str_7	\N	\N	0
 8	8	8	\N	0	str_8	\N	\N	0
 9	9	9	\N	0	\N	\N	\N	0
 10	10	10	\N	0	\N	\N	\N	0
 11	11	11	\N	0	\N	\N	\N	0
-12	12	12	\N	0	\N	12	\N	0
+12	12	12	\N	0	12	\N	\N	0
 13	13	13	\N	0	str_13	\N	\N	0
 14	14	14	\N	0	\N	\N	\N	0
 15	15	15	\N	0	\N	\N	\N	0
-16	16	16	\N	0	\N	16	\N	0
+16	16	16	\N	0	16	\N	\N	0
 17	17	17	\N	0	str_17	\N	\N	0
-18	18	18	\N	0	\N	\N	1970-01-19	0
+18	18	18	\N	0	1970-01-19	\N	\N	0
 19	19	19	\N	0	\N	\N	\N	0
 20	20	20	\N	0	\N	20	\N	0
 21	21	21	\N	0	str_21	\N	\N	0
 22	22	22	\N	0	\N	\N	1970-01-23	0
 insert after alter modify column 3
-2	Date
-6	String
-6	UInt64
+1	Date
+1	UInt64
 12	None
+12	String
 0	0	0	\N	0	\N	\N	\N	0
 1	1	1	\N	0	\N	\N	\N	0
 2	2	2	\N	0	\N	\N	\N	0
-3	3	3	\N	0	\N	3	\N	0
-4	4	4	\N	0	\N	4	\N	0
-5	5	5	\N	0	\N	5	\N	0
+3	3	3	\N	0	3	\N	\N	0
+4	4	4	\N	0	4	\N	\N	0
+5	5	5	\N	0	5	\N	\N	0
 6	6	6	\N	0	str_6	\N	\N	0
 7	7	7	\N	0	str_7	\N	\N	0
 8	8	8	\N	0	str_8	\N	\N	0
 9	9	9	\N	0	\N	\N	\N	0
 10	10	10	\N	0	\N	\N	\N	0
 11	11	11	\N	0	\N	\N	\N	0
-12	12	12	\N	0	\N	12	\N	0
+12	12	12	\N	0	12	\N	\N	0
 13	13	13	\N	0	str_13	\N	\N	0
 14	14	14	\N	0	\N	\N	\N	0
 15	15	15	\N	0	\N	\N	\N	0
-16	16	16	\N	0	\N	16	\N	0
+16	16	16	\N	0	16	\N	\N	0
 17	17	17	\N	0	str_17	\N	\N	0
-18	18	18	\N	0	\N	\N	1970-01-19	0
+18	18	18	\N	0	1970-01-19	\N	\N	0
 19	19	19	\N	0	\N	\N	\N	0
 20	20	20	\N	0	\N	20	\N	0
 21	21	21	\N	0	str_21	\N	\N	0
diff --git a/tests/queries/0_stateless/03040_recursive_cte_postgres_6.reference b/tests/queries/0_stateless/03040_recursive_cte_postgres_6.reference
index 7ccc3df9f0d..2d9d7bb9f6c 100644
--- a/tests/queries/0_stateless/03040_recursive_cte_postgres_6.reference
+++ b/tests/queries/0_stateless/03040_recursive_cte_postgres_6.reference
@@ -32,7 +32,7 @@
 
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 --
 -- error cases
 --
diff --git a/tests/queries/0_stateless/03040_recursive_cte_postgres_6.sql b/tests/queries/0_stateless/03040_recursive_cte_postgres_6.sql
index 6a6044198c8..bff2ece6ece 100644
--- a/tests/queries/0_stateless/03040_recursive_cte_postgres_6.sql
+++ b/tests/queries/0_stateless/03040_recursive_cte_postgres_6.sql
@@ -32,7 +32,7 @@
 
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 --
 -- error cases
diff --git a/tests/queries/0_stateless/03041_analyzer_gigachad_join.sql b/tests/queries/0_stateless/03041_analyzer_gigachad_join.sql
index 88f7fc562b1..7906e65f8b8 100644
--- a/tests/queries/0_stateless/03041_analyzer_gigachad_join.sql
+++ b/tests/queries/0_stateless/03041_analyzer_gigachad_join.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer=1;
+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;
 
diff --git a/tests/queries/0_stateless/03041_dynamic_type_check_table.sh b/tests/queries/0_stateless/03041_dynamic_type_check_table.sh
index da24b892cbd..3d802485be3 100755
--- a/tests/queries/0_stateless/03041_dynamic_type_check_table.sh
+++ b/tests/queries/0_stateless/03041_dynamic_type_check_table.sh
@@ -2,6 +2,8 @@
 # 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
 
@@ -13,7 +15,7 @@ function run()
     $CH_CLIENT -q "insert into test select number, number from numbers(3)"
 
     echo "alter add column"
-    $CH_CLIENT -q "alter table test add column d Dynamic(max_types=2) settings mutations_sync=1"
+    $CH_CLIENT -q "alter table test add column d Dynamic(max_types=3) settings mutations_sync=1"
     $CH_CLIENT -q "select count(), dynamicType(d) from test group by dynamicType(d) order by count(), dynamicType(d)"
     $CH_CLIENT -q "select x, y, d, d.String, d.UInt64, d.\`Tuple(a UInt64)\`.a from test order by x"
 
@@ -40,3 +42,4 @@ 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/03041_recursive_cte_postgres_7.reference b/tests/queries/0_stateless/03041_recursive_cte_postgres_7.reference
index b98b2ec7e89..6bcc3f89dcb 100644
--- a/tests/queries/0_stateless/03041_recursive_cte_postgres_7.reference
+++ b/tests/queries/0_stateless/03041_recursive_cte_postgres_7.reference
@@ -32,7 +32,7 @@
 
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 WITH RECURSIVE foo AS
     (SELECT 1 AS i
     UNION ALL
diff --git a/tests/queries/0_stateless/03041_recursive_cte_postgres_7.sql b/tests/queries/0_stateless/03041_recursive_cte_postgres_7.sql
index 5f4455efcc6..71c34b7361f 100644
--- a/tests/queries/0_stateless/03041_recursive_cte_postgres_7.sql
+++ b/tests/queries/0_stateless/03041_recursive_cte_postgres_7.sql
@@ -32,7 +32,7 @@
 
 -- { echoOn }
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 WITH RECURSIVE foo AS
     (SELECT 1 AS i
diff --git a/tests/queries/0_stateless/03041_select_with_query_result.sql b/tests/queries/0_stateless/03041_select_with_query_result.sql
index e5897ea12cf..061223b43e1 100644
--- a/tests/queries/0_stateless/03041_select_with_query_result.sql
+++ b/tests/queries/0_stateless/03041_select_with_query_result.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/44153
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 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.sql b/tests/queries/0_stateless/03042_analyzer_alias_join.sql
index d9a8d8b4c7b..dac3b6a4983 100644
--- a/tests/queries/0_stateless/03042_analyzer_alias_join.sql
+++ b/tests/queries/0_stateless/03042_analyzer_alias_join.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/14978
-SET enable_analyzer=1;
+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();
 
diff --git a/tests/queries/0_stateless/03042_not_found_column_c1.sql b/tests/queries/0_stateless/03042_not_found_column_c1.sql
index 08202dc0dca..b4dce2af489 100644
--- a/tests/queries/0_stateless/03042_not_found_column_c1.sql
+++ b/tests/queries/0_stateless/03042_not_found_column_c1.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/42399
-SET enable_analyzer=1;
+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() ;
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
index e2c79e5c41e..5311927ae3c 100644
--- a/tests/queries/0_stateless/03043_group_array_result_is_expected.sql
+++ b/tests/queries/0_stateless/03043_group_array_result_is_expected.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/27115
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 drop table if exists fill_ex;
 
 create table fill_ex (
diff --git a/tests/queries/0_stateless/03044_analyzer_alias_join.sql b/tests/queries/0_stateless/03044_analyzer_alias_join.sql
index 7636edbb411..3ab8edb005f 100644
--- a/tests/queries/0_stateless/03044_analyzer_alias_join.sql
+++ b/tests/queries/0_stateless/03044_analyzer_alias_join.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/17319
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 CREATE TEMPORARY TABLE hits (date Date, data Float64) engine=Memory();
 
 SELECT
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
index 4885b7e3f81..0cf05763202 100644
--- 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
@@ -1,3 +1,3 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/11813
-SET enable_analyzer=1;
+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.sql b/tests/queries/0_stateless/03045_analyzer_alias_join_with_if.sql
index cbc46726467..ee8756b9460 100644
--- a/tests/queries/0_stateless/03045_analyzer_alias_join_with_if.sql
+++ b/tests/queries/0_stateless/03045_analyzer_alias_join_with_if.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/13210
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 CREATE TABLE test_a_table (
     name String,
     a_col String
diff --git a/tests/queries/0_stateless/03045_unknown_identifier_alias_substitution.sql b/tests/queries/0_stateless/03045_unknown_identifier_alias_substitution.sql
index 967b7b24787..d97dfc880b3 100644
--- a/tests/queries/0_stateless/03045_unknown_identifier_alias_substitution.sql
+++ b/tests/queries/0_stateless/03045_unknown_identifier_alias_substitution.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/23053
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 DROP TABLE IF EXISTS repl_tbl;
 
 CREATE TEMPORARY TABLE repl_tbl
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
index f91a18da831..c6b4613af3f 100644
--- a/tests/queries/0_stateless/03046_column_in_block_array_join.sql
+++ b/tests/queries/0_stateless/03046_column_in_block_array_join.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/37729
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 DROP TABLE IF EXISTS nested_test;
 DROP TABLE IF EXISTS join_test;
diff --git a/tests/queries/0_stateless/03047_analyzer_alias_join.sql b/tests/queries/0_stateless/03047_analyzer_alias_join.sql
index 29fc711aaf4..7d44c92b6f1 100644
--- a/tests/queries/0_stateless/03047_analyzer_alias_join.sql
+++ b/tests/queries/0_stateless/03047_analyzer_alias_join.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SELECT
     1 AS value,
     *
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
index d12e85ca03d..cfaf1df44bd 100644
--- a/tests/queries/0_stateless/03047_group_by_field_identified_aggregation.sql
+++ b/tests/queries/0_stateless/03047_group_by_field_identified_aggregation.sql
@@ -1,4 +1,4 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/32639
-SET enable_analyzer=1;
+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.sql b/tests/queries/0_stateless/03048_not_found_column_xxx_in_block.sql
index f511ea81e26..42fd581e142 100644
--- 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
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/41964
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 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.sql b/tests/queries/0_stateless/03049_analyzer_group_by_alias.sql
index 712d1c27e6e..d25babe6788 100644
--- a/tests/queries/0_stateless/03049_analyzer_group_by_alias.sql
+++ b/tests/queries/0_stateless/03049_analyzer_group_by_alias.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/7520
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 CREATE TABLE test (`a` UInt32, `b` UInt32) ENGINE = Memory;
 
 INSERT INTO test VALUES (1,2), (1,3), (2,4);
diff --git a/tests/queries/0_stateless/03049_unknown_identifier_materialized_column.sql b/tests/queries/0_stateless/03049_unknown_identifier_materialized_column.sql
index 0efe59a1f1c..938f270b9e4 100644
--- a/tests/queries/0_stateless/03049_unknown_identifier_materialized_column.sql
+++ b/tests/queries/0_stateless/03049_unknown_identifier_materialized_column.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/54317
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
 
 CREATE DATABASE {CLICKHOUSE_DATABASE:Identifier};
diff --git a/tests/queries/0_stateless/03050_select_one_one_one.sql b/tests/queries/0_stateless/03050_select_one_one_one.sql
index 09f3f20c35d..28a55e0c471 100644
--- a/tests/queries/0_stateless/03050_select_one_one_one.sql
+++ b/tests/queries/0_stateless/03050_select_one_one_one.sql
@@ -1,4 +1,4 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/36973
-SET enable_analyzer=1;
+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.sql b/tests/queries/0_stateless/03051_many_ctes.sql
index e442813b6a2..d4e613bd279 100644
--- a/tests/queries/0_stateless/03051_many_ctes.sql
+++ b/tests/queries/0_stateless/03051_many_ctes.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/40955
-SET enable_analyzer=1;
+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;
diff --git a/tests/queries/0_stateless/03052_query_hash_includes_aliases.sql b/tests/queries/0_stateless/03052_query_hash_includes_aliases.sql
index 55993175bf3..24e9ab0f36e 100644
--- a/tests/queries/0_stateless/03052_query_hash_includes_aliases.sql
+++ b/tests/queries/0_stateless/03052_query_hash_includes_aliases.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/pull/40065
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 SELECT
 (
diff --git a/tests/queries/0_stateless/03053_analyzer_join_alias.sql b/tests/queries/0_stateless/03053_analyzer_join_alias.sql
index 677cf9d4d5e..894b8af7c6f 100644
--- a/tests/queries/0_stateless/03053_analyzer_join_alias.sql
+++ b/tests/queries/0_stateless/03053_analyzer_join_alias.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/23104
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
 CREATE DATABASE {CLICKHOUSE_DATABASE:Identifier};
 
diff --git a/tests/queries/0_stateless/03054_analyzer_join_alias.sql b/tests/queries/0_stateless/03054_analyzer_join_alias.sql
index f018f57cc6f..e124aa33a9b 100644
--- a/tests/queries/0_stateless/03054_analyzer_join_alias.sql
+++ b/tests/queries/0_stateless/03054_analyzer_join_alias.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/21584
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SELECT count()
 FROM
 (
diff --git a/tests/queries/0_stateless/03055_analyzer_subquery_group_array.sql b/tests/queries/0_stateless/03055_analyzer_subquery_group_array.sql
index 29ba1dd7c5b..25b6dcb3564 100644
--- a/tests/queries/0_stateless/03055_analyzer_subquery_group_array.sql
+++ b/tests/queries/0_stateless/03055_analyzer_subquery_group_array.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/23344
-SET enable_analyzer=1;
+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/03057_analyzer_subquery_alias_join.sql b/tests/queries/0_stateless/03057_analyzer_subquery_alias_join.sql
index 92f603ed595..2217af327fa 100644
--- a/tests/queries/0_stateless/03057_analyzer_subquery_alias_join.sql
+++ b/tests/queries/0_stateless/03057_analyzer_subquery_alias_join.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/10276
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SELECT
     sum(x.n) as n,
     sum(z.n) as n2
diff --git a/tests/queries/0_stateless/03058_analyzer_ambiguous_columns.sql b/tests/queries/0_stateless/03058_analyzer_ambiguous_columns.sql
index ef3c0e5f63d..3cce77f0240 100644
--- a/tests/queries/0_stateless/03058_analyzer_ambiguous_columns.sql
+++ b/tests/queries/0_stateless/03058_analyzer_ambiguous_columns.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/4567
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 DROP TABLE IF EXISTS fact;
 DROP TABLE IF EXISTS animals;
 DROP TABLE IF EXISTS colors;
@@ -23,3 +23,4 @@ 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.sql b/tests/queries/0_stateless/03059_analyzer_join_engine_missing_column.sql
index 164a42e5ba3..27782462075 100644
--- a/tests/queries/0_stateless/03059_analyzer_join_engine_missing_column.sql
+++ b/tests/queries/0_stateless/03059_analyzer_join_engine_missing_column.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/17710
-SET enable_analyzer=1;
+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;
diff --git a/tests/queries/0_stateless/03060_analyzer_regular_view_alias.sql b/tests/queries/0_stateless/03060_analyzer_regular_view_alias.sql
index 0556683b97a..f8cd8690ee5 100644
--- a/tests/queries/0_stateless/03060_analyzer_regular_view_alias.sql
+++ b/tests/queries/0_stateless/03060_analyzer_regular_view_alias.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/11068
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 create table vt(datetime_value DateTime, value Float64) Engine=Memory;
 
 create view computed_datum_hours as
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
index a1b50967a46..6fee6d1f73d 100644
--- 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
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/24395
-SET enable_analyzer=1;
+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);
 
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
index 487d74b3317..9748175e4d4 100644
--- a/tests/queries/0_stateless/03062_analyzer_join_engine_missing_column.sql
+++ b/tests/queries/0_stateless/03062_analyzer_join_engine_missing_column.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/23416
-SET enable_analyzer=1;
+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;
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
index 5655d4a0110..7eab1fa846a 100644
--- 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
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/23162
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 CREATE TABLE t1 ( k Int64, x Int64) ENGINE = Memory;
 
 CREATE TABLE t2( x Int64 ) ENGINE = Memory;
@@ -14,3 +14,4 @@ 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.sql b/tests/queries/0_stateless/03064_analyzer_named_subqueries.sql
index d5696411091..59ebb9d9af3 100644
--- a/tests/queries/0_stateless/03064_analyzer_named_subqueries.sql
+++ b/tests/queries/0_stateless/03064_analyzer_named_subqueries.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/25655
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SELECT
   sum(t.b) / 1 a,
   sum(t.a)
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
index 5034e2eed8f..7e6befe181e 100644
--- 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
@@ -1,3 +1,3 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/11757
-SET enable_analyzer=1;
+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.sql b/tests/queries/0_stateless/03066_analyzer_global_with_statement.sql
index 2b879ed73da..8983be242c3 100644
--- a/tests/queries/0_stateless/03066_analyzer_global_with_statement.sql
+++ b/tests/queries/0_stateless/03066_analyzer_global_with_statement.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 WITH 0 AS test
 SELECT *
 FROM
diff --git a/tests/queries/0_stateless/03067_analyzer_complex_alias_join.sql b/tests/queries/0_stateless/03067_analyzer_complex_alias_join.sql
index 58845b93771..052a9eaf734 100644
--- a/tests/queries/0_stateless/03067_analyzer_complex_alias_join.sql
+++ b/tests/queries/0_stateless/03067_analyzer_complex_alias_join.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 with d as (select 'key'::Varchar(255) c, 'x'::Varchar(255) s)
 SELECT r1, c as r2
 FROM (
diff --git a/tests/queries/0_stateless/03068_analyzer_distributed_join.sql b/tests/queries/0_stateless/03068_analyzer_distributed_join.sql
index 459c8f5e8ac..542380feb7c 100644
--- a/tests/queries/0_stateless/03068_analyzer_distributed_join.sql
+++ b/tests/queries/0_stateless/03068_analyzer_distributed_join.sql
@@ -1,7 +1,7 @@
 -- Tags: no-replicated-database
 -- Closes: https://github.com/ClickHouse/ClickHouse/issues/6571
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 CREATE TABLE LINEITEM_shard ON CLUSTER test_shard_localhost
 (
     L_ORDERKEY UInt64,
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
index 5ec04cbc0f5..09d2985fe60 100644
--- 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
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/4432
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 WITH [1, 2] AS zz
 SELECT x
 FROM system.one
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
index a94ae811476..7aadab2ca73 100644
--- a/tests/queries/0_stateless/03070_analyzer_CTE_scalar_as_numbers.sql
+++ b/tests/queries/0_stateless/03070_analyzer_CTE_scalar_as_numbers.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/8259
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 with
     (select 25) as something
 select *, something
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
index 211fa2a3119..e2eb758d649 100644
--- 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
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/9233
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SELECT *
 FROM
 (
diff --git a/tests/queries/0_stateless/03071_fix_short_circuit_logic.sql b/tests/queries/0_stateless/03071_fix_short_circuit_logic.sql
index dc5fb5085fb..7745bceca0b 100644
--- a/tests/queries/0_stateless/03071_fix_short_circuit_logic.sql
+++ b/tests/queries/0_stateless/03071_fix_short_circuit_logic.sql
@@ -59,4 +59,4 @@ FROM
     )
     WHERE (address = hex2bytes('0xd387a6e4e84a6c86bd90c158c6028a58cc8ac459')) AND (transfer_id NOT LIKE 'gas%') AND (value > 0) AND (dictGetOrDefault(token_data_map, 'is_blacklisted', (token_address_hex, 'zksync'), true))
 )
-SETTINGS max_threads = 1, short_circuit_function_evaluation = 'enable', enable_analyzer = 0;
+SETTINGS max_threads = 1, short_circuit_function_evaluation = 'enable', allow_experimental_analyzer = 0;
\ No newline at end of file
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
index ec3b067cbdf..e2846033913 100644
--- a/tests/queries/0_stateless/03072_analyzer_missing_columns_from_subquery.sql
+++ b/tests/queries/0_stateless/03072_analyzer_missing_columns_from_subquery.sql
@@ -1,3 +1,3 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/14699
-SET enable_analyzer=1;
+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.sql b/tests/queries/0_stateless/03073_analyzer_alias_as_column_name.sql
index bba51e28ba3..5599324c62b 100644
--- a/tests/queries/0_stateless/03073_analyzer_alias_as_column_name.sql
+++ b/tests/queries/0_stateless/03073_analyzer_alias_as_column_name.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/27068
-SET enable_analyzer=1;
+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');
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
index 314b6c0e8d6..4df5f6f48e6 100644
--- a/tests/queries/0_stateless/03074_analyzer_alias_column_in_view.sql
+++ b/tests/queries/0_stateless/03074_analyzer_alias_column_in_view.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/28687
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 create view alias (dummy int, n alias dummy) as select * from system.one;
 
 select n from alias;
diff --git a/tests/queries/0_stateless/03075_analyzer_subquery_alias.sql b/tests/queries/0_stateless/03075_analyzer_subquery_alias.sql
index 4f097350da6..416815e761b 100644
--- a/tests/queries/0_stateless/03075_analyzer_subquery_alias.sql
+++ b/tests/queries/0_stateless/03075_analyzer_subquery_alias.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/28777
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SELECT
     sum(q0.a2) AS a1,
     sum(q0.a1) AS a9
diff --git a/tests/queries/0_stateless/03076_analyzer_multiple_joins_alias.sql b/tests/queries/0_stateless/03076_analyzer_multiple_joins_alias.sql
index 894e3bc56ee..7ac9fe6b446 100644
--- a/tests/queries/0_stateless/03076_analyzer_multiple_joins_alias.sql
+++ b/tests/queries/0_stateless/03076_analyzer_multiple_joins_alias.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/29734
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SELECT *
 FROM
 (
@@ -49,3 +49,4 @@ 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.sql b/tests/queries/0_stateless/03077_analyzer_multi_scalar_subquery_aliases.sql
index d4335d35e51..5a181023c57 100644
--- a/tests/queries/0_stateless/03077_analyzer_multi_scalar_subquery_aliases.sql
+++ b/tests/queries/0_stateless/03077_analyzer_multi_scalar_subquery_aliases.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/33825
-SET enable_analyzer=1;
+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
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
index b9b850619ea..d91a9ed106d 100644
--- a/tests/queries/0_stateless/03078_analyzer_multi_scalar_subquery_aliases.sql
+++ b/tests/queries/0_stateless/03078_analyzer_multi_scalar_subquery_aliases.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/33825
-SET enable_analyzer=1;
+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;
 
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
index 80e681c0776..955d3b49a00 100644
--- 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
@@ -1,4 +1,4 @@
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 CREATE TABLE testdata (`1` String) ENGINE=MergeTree ORDER BY tuple();
 INSERT INTO testdata VALUES ('testdata');
 
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
index 2138828cd27..01ab868f9ea 100644
--- 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
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/35652
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 CREATE TABLE test (
   id UInt64
 )
diff --git a/tests/queries/0_stateless/03080_incorrect_join_with_merge.sql b/tests/queries/0_stateless/03080_incorrect_join_with_merge.sql
index a34c71a44e2..7682e6ce866 100644
--- a/tests/queries/0_stateless/03080_incorrect_join_with_merge.sql
+++ b/tests/queries/0_stateless/03080_incorrect_join_with_merge.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/29838
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SET distributed_foreground_insert=1;
 
 CREATE TABLE first_table_lr
diff --git a/tests/queries/0_stateless/03081_analyzer_agg_func_CTE.sql b/tests/queries/0_stateless/03081_analyzer_agg_func_CTE.sql
index 3cb02512a7f..e6a540dc5df 100644
--- a/tests/queries/0_stateless/03081_analyzer_agg_func_CTE.sql
+++ b/tests/queries/0_stateless/03081_analyzer_agg_func_CTE.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/36189
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 CREATE TABLE test
 (
     `dt` Date,
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
index 3b83f978326..8f17248ed0d 100644
--- a/tests/queries/0_stateless/03082_analyzer_left_join_correct_column.sql
+++ b/tests/queries/0_stateless/03082_analyzer_left_join_correct_column.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/39634
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 CREATE TABLE test1
 (
     `pk` String,
diff --git a/tests/queries/0_stateless/03084_analyzer_join_column_alias.sql b/tests/queries/0_stateless/03084_analyzer_join_column_alias.sql
index 8a7258f5838..930726898b5 100644
--- a/tests/queries/0_stateless/03084_analyzer_join_column_alias.sql
+++ b/tests/queries/0_stateless/03084_analyzer_join_column_alias.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/47432
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 create table t1
 engine = MergeTree()
 order by tuple()
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
index c360e86197f..fd67194b08b 100644
--- a/tests/queries/0_stateless/03085_analyzer_alias_column_group_by.sql
+++ b/tests/queries/0_stateless/03085_analyzer_alias_column_group_by.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/54910
-SET enable_analyzer=1;
+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.sql b/tests/queries/0_stateless/03086_analyzer_window_func_part_of_group_by.sql
index 7e44b37f865..31747328d1f 100644
--- 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
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/57321
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SELECT
     ver,
     max(ver) OVER () AS ver_max
diff --git a/tests/queries/0_stateless/03087_analyzer_subquery_with_alias.sql b/tests/queries/0_stateless/03087_analyzer_subquery_with_alias.sql
index a00ca4960d7..6546e50c99e 100644
--- a/tests/queries/0_stateless/03087_analyzer_subquery_with_alias.sql
+++ b/tests/queries/0_stateless/03087_analyzer_subquery_with_alias.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/59154
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SELECT *
 FROM
 (
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
index 3670404d124..e6f1ed81f91 100644
--- a/tests/queries/0_stateless/03088_analyzer_ambiguous_column_multi_call.sql
+++ b/tests/queries/0_stateless/03088_analyzer_ambiguous_column_multi_call.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/61014
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
 create database {CLICKHOUSE_DATABASE:Identifier};
diff --git a/tests/queries/0_stateless/03089_analyzer_alias_replacement.sql b/tests/queries/0_stateless/03089_analyzer_alias_replacement.sql
index 5526e1aaf7d..069da5fdd65 100644
--- a/tests/queries/0_stateless/03089_analyzer_alias_replacement.sql
+++ b/tests/queries/0_stateless/03089_analyzer_alias_replacement.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/61950
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 with dummy + 1 as dummy select dummy from system.one;
 
diff --git a/tests/queries/0_stateless/03090_analyzer_multiple_using_statements.sql b/tests/queries/0_stateless/03090_analyzer_multiple_using_statements.sql
index 08ea103d3c9..c35f33782ff 100644
--- a/tests/queries/0_stateless/03090_analyzer_multiple_using_statements.sql
+++ b/tests/queries/0_stateless/03090_analyzer_multiple_using_statements.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/55647
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 SELECT
 *
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
index 11984aec496..599275c66e8 100644
--- 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
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/61947
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
 DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE_1:Identifier};
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
index 83b1a902721..10d18324c3c 100644
--- 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
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/61947
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
 DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE_1:Identifier};
diff --git a/tests/queries/0_stateless/03093_analyzer_column_alias.sql b/tests/queries/0_stateless/03093_analyzer_column_alias.sql
index edf89108b56..9ff0f78ba24 100644
--- a/tests/queries/0_stateless/03093_analyzer_column_alias.sql
+++ b/tests/queries/0_stateless/03093_analyzer_column_alias.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/26674
-SET enable_analyzer = true;
+SET allow_experimental_analyzer = true;
 
 SELECT
     Carrier,
diff --git a/tests/queries/0_stateless/03093_analyzer_miel_test.sql b/tests/queries/0_stateless/03093_analyzer_miel_test.sql
index 4915864bb51..f408882dcd5 100644
--- a/tests/queries/0_stateless/03093_analyzer_miel_test.sql
+++ b/tests/queries/0_stateless/03093_analyzer_miel_test.sql
@@ -8,7 +8,7 @@ INSERT INTO test_03093 VALUES ('x1', 123, {'k1': ''});
 INSERT INTO test_03093 VALUES ('x1', 123, {'k1': '', 'k11': ''});
 INSERT INTO test_03093 VALUES ('x1', 12,  {'k1': ''});
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 select app, arrayZip(untuple(sumMap(k.keys, replicate(1, k.keys)))) from test_03093 PREWHERE c > 1 group by app;
 select app, arrayZip(untuple(sumMap(k.keys, replicate(1, k.keys)))) from test_03093 WHERE c > 1 group by app;
diff --git a/tests/queries/0_stateless/03093_bug37909_query_does_not_finish.sql b/tests/queries/0_stateless/03093_bug37909_query_does_not_finish.sql
index 90f0a8a3b8e..62fa3f437af 100644
--- a/tests/queries/0_stateless/03093_bug37909_query_does_not_finish.sql
+++ b/tests/queries/0_stateless/03093_bug37909_query_does_not_finish.sql
@@ -75,4 +75,4 @@ FROM
 /* WHERE (v_date >= '2022-05-08') AND (v_date <= '2022-06-07') placing condition has same effect */
 GROUP BY vDate
 ORDER BY vDate ASC
-SETTINGS enable_analyzer = 1; -- the query times out if enable_analyzer = 0
+SETTINGS allow_experimental_analyzer = 1; -- the query times out if allow_experimental_analyzer = 0
diff --git a/tests/queries/0_stateless/03094_analyzer_fiddle_multiif.sql b/tests/queries/0_stateless/03094_analyzer_fiddle_multiif.sql
index 8426749917a..1b1603be18e 100644
--- a/tests/queries/0_stateless/03094_analyzer_fiddle_multiif.sql
+++ b/tests/queries/0_stateless/03094_analyzer_fiddle_multiif.sql
@@ -5,7 +5,7 @@ INSERT INTO users_03094 VALUES ('John', 33);
 INSERT INTO users_03094 VALUES ('Ksenia', 48);
 INSERT INTO users_03094 VALUES ('Alice', 50);
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 SELECT
     multiIf((age > 30) or (true), '1', '2') AS a,
diff --git a/tests/queries/0_stateless/03094_named_tuple_bug24607.sql b/tests/queries/0_stateless/03094_named_tuple_bug24607.sql
index 698c339e53e..e3c97f3fe41 100644
--- a/tests/queries/0_stateless/03094_named_tuple_bug24607.sql
+++ b/tests/queries/0_stateless/03094_named_tuple_bug24607.sql
@@ -1,4 +1,4 @@
 SELECT
     JSONExtract('{"a":1, "b":"test"}', 'Tuple(a UInt8, b String)') AS x,
     x.a
-SETTINGS enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/03094_one_thousand_joins.sql b/tests/queries/0_stateless/03094_one_thousand_joins.sql
index 6ae4e4d4d3c..1f6bd99df7f 100644
--- a/tests/queries/0_stateless/03094_one_thousand_joins.sql
+++ b/tests/queries/0_stateless/03094_one_thousand_joins.sql
@@ -2,7 +2,7 @@
 -- (no-tsan because it has a small maximum stack size and the test would fail with TOO_DEEP_RECURSION)
 
 SET join_algorithm = 'default'; -- for 'full_sorting_merge' the query is 10x slower
-SET enable_analyzer = 1; -- old analyzer returns TOO_DEEP_SUBQUERIES
+SET allow_experimental_analyzer = 1; -- old analyzer returns TOO_DEEP_SUBQUERIES
 
 -- Bug 33446, marked as 'long' because it still runs around 10 sec
 SELECT * FROM (SELECT 1 AS x) t1 JOIN (SELECT 1 AS x) t2 ON t1.x = t2.x JOIN (SELECT 1 AS x) t3 ON t1.x = t3.x JOIN (SELECT 1 AS x) t4 ON t1.x = t4.x JOIN (SELECT 1 AS x) t5 ON t1.x = t5.x JOIN (SELECT 1 AS x) t6 ON t1.x = t6.x JOIN (SELECT 1 AS x) t7 ON t1.x = t7.x JOIN (SELECT 1 AS x) t8 ON t1.x = t8.x JOIN (SELECT 1 AS x) t9 ON t1.x = t9.x JOIN (SELECT 1 AS x) t10 ON t1.x = t10.x JOIN (SELECT 1 AS x) t11 ON t1.x = t11.x JOIN (SELECT 1 AS x) t12 ON t1.x = t12.x JOIN (SELECT 1 AS x) t13 ON t1.x = t13.x JOIN (SELECT 1 AS x) t14 ON t1.x = t14.x JOIN (SELECT 1 AS x) t15 ON t1.x = t15.x JOIN (SELECT 1 AS x) t16 ON t1.x = t16.x JOIN (SELECT 1 AS x) t17 ON t1.x = t17.x JOIN (SELECT 1 AS x) t18 ON t1.x = t18.x JOIN (SELECT 1 AS x) t19 ON t1.x = t19.x JOIN (SELECT 1 AS x) t20 ON t1.x = t20.x JOIN (SELECT 1 AS x) t21 ON t1.x = t21.x JOIN (SELECT 1 AS x) t22 ON t1.x = t22.x JOIN (SELECT 1 AS x) t23 ON t1.x = t23.x JOIN (SELECT 1 AS x) t24 ON t1.x = t24.x JOIN (SELECT 1 AS x) t25 ON t1.x = t25.x JOIN (SELECT 1 AS x) t26 ON t1.x = t26.x JOIN (SELECT 1 AS x) t27 ON t1.x = t27.x JOIN (SELECT 1 AS x) t28 ON t1.x = t28.x JOIN (SELECT 1 AS x) t29 ON t1.x = t29.x JOIN (SELECT 1 AS x) t30 ON t1.x = t30.x JOIN (SELECT 1 AS x) t31 ON t1.x = t31.x JOIN (SELECT 1 AS x) t32 ON t1.x = t32.x JOIN (SELECT 1 AS x) t33 ON t1.x = t33.x JOIN (SELECT 1 AS x) t34 ON t1.x = t34.x JOIN (SELECT 1 AS x) t35 ON t1.x = t35.x JOIN (SELECT 1 AS x) t36 ON t1.x = t36.x JOIN (SELECT 1 AS x) t37 ON t1.x = t37.x JOIN (SELECT 1 AS x) t38 ON t1.x = t38.x JOIN (SELECT 1 AS x) t39 ON t1.x = t39.x JOIN (SELECT 1 AS x) t40 ON t1.x = t40.x JOIN (SELECT 1 AS x) t41 ON t1.x = t41.x JOIN (SELECT 1 AS x) t42 ON t1.x = t42.x JOIN (SELECT 1 AS x) t43 ON t1.x = t43.x JOIN (SELECT 1 AS x) t44 ON t1.x = t44.x JOIN (SELECT 1 AS x) t45 ON t1.x = t45.x JOIN (SELECT 1 AS x) t46 ON t1.x = t46.x JOIN (SELECT 1 AS x) t47 ON t1.x = t47.x JOIN (SELECT 1 AS x) t48 ON t1.x = t48.x JOIN (SELECT 1 AS x) t49 ON t1.x = t49.x JOIN (SELECT 1 AS x) t50 ON t1.x = t50.x JOIN (SELECT 1 AS x) t51 ON t1.x = t51.x JOIN (SELECT 1 AS x) t52 ON t1.x = t52.x JOIN (SELECT 1 AS x) t53 ON t1.x = t53.x JOIN (SELECT 1 AS x) t54 ON t1.x = t54.x JOIN (SELECT 1 AS x) t55 ON t1.x = t55.x JOIN (SELECT 1 AS x) t56 ON t1.x = t56.x JOIN (SELECT 1 AS x) t57 ON t1.x = t57.x JOIN (SELECT 1 AS x) t58 ON t1.x = t58.x JOIN (SELECT 1 AS x) t59 ON t1.x = t59.x JOIN (SELECT 1 AS x) t60 ON t1.x = t60.x JOIN (SELECT 1 AS x) t61 ON t1.x = t61.x JOIN (SELECT 1 AS x) t62 ON t1.x = t62.x JOIN (SELECT 1 AS x) t63 ON t1.x = t63.x JOIN (SELECT 1 AS x) t64 ON t1.x = t64.x JOIN (SELECT 1 AS x) t65 ON t1.x = t65.x JOIN (SELECT 1 AS x) t66 ON t1.x = t66.x JOIN (SELECT 1 AS x) t67 ON t1.x = t67.x JOIN (SELECT 1 AS x) t68 ON t1.x = t68.x JOIN (SELECT 1 AS x) t69 ON t1.x = t69.x JOIN (SELECT 1 AS x) t70 ON t1.x = t70.x JOIN (SELECT 1 AS x) t71 ON t1.x = t71.x JOIN (SELECT 1 AS x) t72 ON t1.x = t72.x JOIN (SELECT 1 AS x) t73 ON t1.x = t73.x JOIN (SELECT 1 AS x) t74 ON t1.x = t74.x JOIN (SELECT 1 AS x) t75 ON t1.x = t75.x JOIN (SELECT 1 AS x) t76 ON t1.x = t76.x JOIN (SELECT 1 AS x) t77 ON t1.x = t77.x JOIN (SELECT 1 AS x) t78 ON t1.x = t78.x JOIN (SELECT 1 AS x) t79 ON t1.x = t79.x JOIN (SELECT 1 AS x) t80 ON t1.x = t80.x JOIN (SELECT 1 AS x) t81 ON t1.x = t81.x JOIN (SELECT 1 AS x) t82 ON t1.x = t82.x JOIN (SELECT 1 AS x) t83 ON t1.x = t83.x JOIN (SELECT 1 AS x) t84 ON t1.x = t84.x JOIN (SELECT 1 AS x) t85 ON t1.x = t85.x JOIN (SELECT 1 AS x) t86 ON t1.x = t86.x JOIN (SELECT 1 AS x) t87 ON t1.x = t87.x JOIN (SELECT 1 AS x) t88 ON t1.x = t88.x JOIN (SELECT 1 AS x) t89 ON t1.x = t89.x JOIN (SELECT 1 AS x) t90 ON t1.x = t90.x JOIN (SELECT 1 AS x) t91 ON t1.x = t91.x JOIN (SELECT 1 AS x) t92 ON t1.x = t92.x JOIN (SELECT 1 AS x) t93 ON t1.x = t93.x JOIN (SELECT 1 AS x) t94 ON t1.x = t94.x JOIN (SELECT 1 AS x) t95 ON t1.x = t95.x JOIN (SELECT 1 AS x) t96 ON t1.x = t96.x JOIN (SELECT 1 AS x) t97 ON t1.x = t97.x JOIN (SELECT 1 AS x) t98 ON t1.x = t98.x JOIN (SELECT 1 AS x) t99 ON t1.x = t99.x JOIN (SELECT 1 AS x) t100 ON t1.x = t100.x JOIN (SELECT 1 AS x) t101 ON t1.x = t101.x JOIN (SELECT 1 AS x) t102 ON t1.x = t102.x JOIN (SELECT 1 AS x) t103 ON t1.x = t103.x JOIN (SELECT 1 AS x) t104 ON t1.x = t104.x JOIN (SELECT 1 AS x) t105 ON t1.x = t105.x JOIN (SELECT 1 AS x) t106 ON t1.x = t106.x JOIN (SELECT 1 AS x) t107 ON t1.x = t107.x JOIN (SELECT 1 AS x) t108 ON t1.x = t108.x JOIN (SELECT 1 AS x) t109 ON t1.x = t109.x JOIN (SELECT 1 AS x) t110 ON t1.x = t110.x JOIN (SELECT 1 AS x) t111 ON t1.x = t111.x JOIN (SELECT 1 AS x) t112 ON t1.x = t112.x JOIN (SELECT 1 AS x) t113 ON t1.x = t113.x JOIN (SELECT 1 AS x) t114 ON t1.x = t114.x JOIN (SELECT 1 AS x) t115 ON t1.x = t115.x JOIN (SELECT 1 AS x) t116 ON t1.x = t116.x JOIN (SELECT 1 AS x) t117 ON t1.x = t117.x JOIN (SELECT 1 AS x) t118 ON t1.x = t118.x JOIN (SELECT 1 AS x) t119 ON t1.x = t119.x JOIN (SELECT 1 AS x) t120 ON t1.x = t120.x JOIN (SELECT 1 AS x) t121 ON t1.x = t121.x JOIN (SELECT 1 AS x) t122 ON t1.x = t122.x JOIN (SELECT 1 AS x) t123 ON t1.x = t123.x JOIN (SELECT 1 AS x) t124 ON t1.x = t124.x JOIN (SELECT 1 AS x) t125 ON t1.x = t125.x JOIN (SELECT 1 AS x) t126 ON t1.x = t126.x JOIN (SELECT 1 AS x) t127 ON t1.x = t127.x JOIN (SELECT 1 AS x) t128 ON t1.x = t128.x JOIN (SELECT 1 AS x) t129 ON t1.x = t129.x JOIN (SELECT 1 AS x) t130 ON t1.x = t130.x JOIN (SELECT 1 AS x) t131 ON t1.x = t131.x JOIN (SELECT 1 AS x) t132 ON t1.x = t132.x JOIN (SELECT 1 AS x) t133 ON t1.x = t133.x JOIN (SELECT 1 AS x) t134 ON t1.x = t134.x JOIN (SELECT 1 AS x) t135 ON t1.x = t135.x JOIN (SELECT 1 AS x) t136 ON t1.x = t136.x JOIN (SELECT 1 AS x) t137 ON t1.x = t137.x JOIN (SELECT 1 AS x) t138 ON t1.x = t138.x JOIN (SELECT 1 AS x) t139 ON t1.x = t139.x JOIN (SELECT 1 AS x) t140 ON t1.x = t140.x JOIN (SELECT 1 AS x) t141 ON t1.x = t141.x JOIN (SELECT 1 AS x) t142 ON t1.x = t142.x JOIN (SELECT 1 AS x) t143 ON t1.x = t143.x JOIN (SELECT 1 AS x) t144 ON t1.x = t144.x JOIN (SELECT 1 AS x) t145 ON t1.x = t145.x JOIN (SELECT 1 AS x) t146 ON t1.x = t146.x JOIN (SELECT 1 AS x) t147 ON t1.x = t147.x JOIN (SELECT 1 AS x) t148 ON t1.x = t148.x JOIN (SELECT 1 AS x) t149 ON t1.x = t149.x JOIN (SELECT 1 AS x) t150 ON t1.x = t150.x JOIN (SELECT 1 AS x) t151 ON t1.x = t151.x JOIN (SELECT 1 AS x) t152 ON t1.x = t152.x JOIN (SELECT 1 AS x) t153 ON t1.x = t153.x JOIN (SELECT 1 AS x) t154 ON t1.x = t154.x JOIN (SELECT 1 AS x) t155 ON t1.x = t155.x JOIN (SELECT 1 AS x) t156 ON t1.x = t156.x JOIN (SELECT 1 AS x) t157 ON t1.x = t157.x JOIN (SELECT 1 AS x) t158 ON t1.x = t158.x JOIN (SELECT 1 AS x) t159 ON t1.x = t159.x JOIN (SELECT 1 AS x) t160 ON t1.x = t160.x JOIN (SELECT 1 AS x) t161 ON t1.x = t161.x JOIN (SELECT 1 AS x) t162 ON t1.x = t162.x JOIN (SELECT 1 AS x) t163 ON t1.x = t163.x JOIN (SELECT 1 AS x) t164 ON t1.x = t164.x JOIN (SELECT 1 AS x) t165 ON t1.x = t165.x JOIN (SELECT 1 AS x) t166 ON t1.x = t166.x JOIN (SELECT 1 AS x) t167 ON t1.x = t167.x JOIN (SELECT 1 AS x) t168 ON t1.x = t168.x JOIN (SELECT 1 AS x) t169 ON t1.x = t169.x JOIN (SELECT 1 AS x) t170 ON t1.x = t170.x JOIN (SELECT 1 AS x) t171 ON t1.x = t171.x JOIN (SELECT 1 AS x) t172 ON t1.x = t172.x JOIN (SELECT 1 AS x) t173 ON t1.x = t173.x JOIN (SELECT 1 AS x) t174 ON t1.x = t174.x JOIN (SELECT 1 AS x) t175 ON t1.x = t175.x JOIN (SELECT 1 AS x) t176 ON t1.x = t176.x JOIN (SELECT 1 AS x) t177 ON t1.x = t177.x JOIN (SELECT 1 AS x) t178 ON t1.x = t178.x JOIN (SELECT 1 AS x) t179 ON t1.x = t179.x JOIN (SELECT 1 AS x) t180 ON t1.x = t180.x JOIN (SELECT 1 AS x) t181 ON t1.x = t181.x JOIN (SELECT 1 AS x) t182 ON t1.x = t182.x JOIN (SELECT 1 AS x) t183 ON t1.x = t183.x JOIN (SELECT 1 AS x) t184 ON t1.x = t184.x JOIN (SELECT 1 AS x) t185 ON t1.x = t185.x JOIN (SELECT 1 AS x) t186 ON t1.x = t186.x JOIN (SELECT 1 AS x) t187 ON t1.x = t187.x JOIN (SELECT 1 AS x) t188 ON t1.x = t188.x JOIN (SELECT 1 AS x) t189 ON t1.x = t189.x JOIN (SELECT 1 AS x) t190 ON t1.x = t190.x JOIN (SELECT 1 AS x) t191 ON t1.x = t191.x JOIN (SELECT 1 AS x) t192 ON t1.x = t192.x JOIN (SELECT 1 AS x) t193 ON t1.x = t193.x JOIN (SELECT 1 AS x) t194 ON t1.x = t194.x JOIN (SELECT 1 AS x) t195 ON t1.x = t195.x JOIN (SELECT 1 AS x) t196 ON t1.x = t196.x JOIN (SELECT 1 AS x) t197 ON t1.x = t197.x JOIN (SELECT 1 AS x) t198 ON t1.x = t198.x JOIN (SELECT 1 AS x) t199 ON t1.x = t199.x JOIN (SELECT 1 AS x) t200 ON t1.x = t200.x JOIN (SELECT 1 AS x) t201 ON t1.x = t201.x JOIN (SELECT 1 AS x) t202 ON t1.x = t202.x JOIN (SELECT 1 AS x) t203 ON t1.x = t203.x JOIN (SELECT 1 AS x) t204 ON t1.x = t204.x JOIN (SELECT 1 AS x) t205 ON t1.x = t205.x JOIN (SELECT 1 AS x) t206 ON t1.x = t206.x JOIN (SELECT 1 AS x) t207 ON t1.x = t207.x JOIN (SELECT 1 AS x) t208 ON t1.x = t208.x JOIN (SELECT 1 AS x) t209 ON t1.x = t209.x JOIN (SELECT 1 AS x) t210 ON t1.x = t210.x JOIN (SELECT 1 AS x) t211 ON t1.x = t211.x JOIN (SELECT 1 AS x) t212 ON t1.x = t212.x JOIN (SELECT 1 AS x) t213 ON t1.x = t213.x JOIN (SELECT 1 AS x) t214 ON t1.x = t214.x JOIN (SELECT 1 AS x) t215 ON t1.x = t215.x JOIN (SELECT 1 AS x) t216 ON t1.x = t216.x JOIN (SELECT 1 AS x) t217 ON t1.x = t217.x JOIN (SELECT 1 AS x) t218 ON t1.x = t218.x JOIN (SELECT 1 AS x) t219 ON t1.x = t219.x JOIN (SELECT 1 AS x) t220 ON t1.x = t220.x JOIN (SELECT 1 AS x) t221 ON t1.x = t221.x JOIN (SELECT 1 AS x) t222 ON t1.x = t222.x JOIN (SELECT 1 AS x) t223 ON t1.x = t223.x JOIN (SELECT 1 AS x) t224 ON t1.x = t224.x JOIN (SELECT 1 AS x) t225 ON t1.x = t225.x JOIN (SELECT 1 AS x) t226 ON t1.x = t226.x JOIN (SELECT 1 AS x) t227 ON t1.x = t227.x JOIN (SELECT 1 AS x) t228 ON t1.x = t228.x JOIN (SELECT 1 AS x) t229 ON t1.x = t229.x JOIN (SELECT 1 AS x) t230 ON t1.x = t230.x JOIN (SELECT 1 AS x) t231 ON t1.x = t231.x JOIN (SELECT 1 AS x) t232 ON t1.x = t232.x JOIN (SELECT 1 AS x) t233 ON t1.x = t233.x JOIN (SELECT 1 AS x) t234 ON t1.x = t234.x JOIN (SELECT 1 AS x) t235 ON t1.x = t235.x JOIN (SELECT 1 AS x) t236 ON t1.x = t236.x JOIN (SELECT 1 AS x) t237 ON t1.x = t237.x JOIN (SELECT 1 AS x) t238 ON t1.x = t238.x JOIN (SELECT 1 AS x) t239 ON t1.x = t239.x JOIN (SELECT 1 AS x) t240 ON t1.x = t240.x JOIN (SELECT 1 AS x) t241 ON t1.x = t241.x JOIN (SELECT 1 AS x) t242 ON t1.x = t242.x JOIN (SELECT 1 AS x) t243 ON t1.x = t243.x JOIN (SELECT 1 AS x) t244 ON t1.x = t244.x JOIN (SELECT 1 AS x) t245 ON t1.x = t245.x JOIN (SELECT 1 AS x) t246 ON t1.x = t246.x JOIN (SELECT 1 AS x) t247 ON t1.x = t247.x JOIN (SELECT 1 AS x) t248 ON t1.x = t248.x JOIN (SELECT 1 AS x) t249 ON t1.x = t249.x JOIN (SELECT 1 AS x) t250 ON t1.x = t250.x JOIN (SELECT 1 AS x) t251 ON t1.x = t251.x JOIN (SELECT 1 AS x) t252 ON t1.x = t252.x JOIN (SELECT 1 AS x) t253 ON t1.x = t253.x JOIN (SELECT 1 AS x) t254 ON t1.x = t254.x JOIN (SELECT 1 AS x) t255 ON t1.x = t255.x JOIN (SELECT 1 AS x) t256 ON t1.x = t256.x JOIN (SELECT 1 AS x) t257 ON t1.x = t257.x JOIN (SELECT 1 AS x) t258 ON t1.x = t258.x JOIN (SELECT 1 AS x) t259 ON t1.x = t259.x JOIN (SELECT 1 AS x) t260 ON t1.x = t260.x JOIN (SELECT 1 AS x) t261 ON t1.x = t261.x JOIN (SELECT 1 AS x) t262 ON t1.x = t262.x JOIN (SELECT 1 AS x) t263 ON t1.x = t263.x JOIN (SELECT 1 AS x) t264 ON t1.x = t264.x JOIN (SELECT 1 AS x) t265 ON t1.x = t265.x JOIN (SELECT 1 AS x) t266 ON t1.x = t266.x JOIN (SELECT 1 AS x) t267 ON t1.x = t267.x JOIN (SELECT 1 AS x) t268 ON t1.x = t268.x JOIN (SELECT 1 AS x) t269 ON t1.x = t269.x JOIN (SELECT 1 AS x) t270 ON t1.x = t270.x JOIN (SELECT 1 AS x) t271 ON t1.x = t271.x JOIN (SELECT 1 AS x) t272 ON t1.x = t272.x JOIN (SELECT 1 AS x) t273 ON t1.x = t273.x JOIN (SELECT 1 AS x) t274 ON t1.x = t274.x JOIN (SELECT 1 AS x) t275 ON t1.x = t275.x JOIN (SELECT 1 AS x) t276 ON t1.x = t276.x JOIN (SELECT 1 AS x) t277 ON t1.x = t277.x JOIN (SELECT 1 AS x) t278 ON t1.x = t278.x JOIN (SELECT 1 AS x) t279 ON t1.x = t279.x JOIN (SELECT 1 AS x) t280 ON t1.x = t280.x JOIN (SELECT 1 AS x) t281 ON t1.x = t281.x JOIN (SELECT 1 AS x) t282 ON t1.x = t282.x JOIN (SELECT 1 AS x) t283 ON t1.x = t283.x JOIN (SELECT 1 AS x) t284 ON t1.x = t284.x JOIN (SELECT 1 AS x) t285 ON t1.x = t285.x JOIN (SELECT 1 AS x) t286 ON t1.x = t286.x JOIN (SELECT 1 AS x) t287 ON t1.x = t287.x JOIN (SELECT 1 AS x) t288 ON t1.x = t288.x JOIN (SELECT 1 AS x) t289 ON t1.x = t289.x JOIN (SELECT 1 AS x) t290 ON t1.x = t290.x JOIN (SELECT 1 AS x) t291 ON t1.x = t291.x JOIN (SELECT 1 AS x) t292 ON t1.x = t292.x JOIN (SELECT 1 AS x) t293 ON t1.x = t293.x JOIN (SELECT 1 AS x) t294 ON t1.x = t294.x JOIN (SELECT 1 AS x) t295 ON t1.x = t295.x JOIN (SELECT 1 AS x) t296 ON t1.x = t296.x JOIN (SELECT 1 AS x) t297 ON t1.x = t297.x JOIN (SELECT 1 AS x) t298 ON t1.x = t298.x JOIN (SELECT 1 AS x) t299 ON t1.x = t299.x JOIN (SELECT 1 AS x) t300 ON t1.x = t300.x JOIN (SELECT 1 AS x) t301 ON t1.x = t301.x JOIN (SELECT 1 AS x) t302 ON t1.x = t302.x JOIN (SELECT 1 AS x) t303 ON t1.x = t303.x JOIN (SELECT 1 AS x) t304 ON t1.x = t304.x JOIN (SELECT 1 AS x) t305 ON t1.x = t305.x JOIN (SELECT 1 AS x) t306 ON t1.x = t306.x JOIN (SELECT 1 AS x) t307 ON t1.x = t307.x JOIN (SELECT 1 AS x) t308 ON t1.x = t308.x JOIN (SELECT 1 AS x) t309 ON t1.x = t309.x JOIN (SELECT 1 AS x) t310 ON t1.x = t310.x JOIN (SELECT 1 AS x) t311 ON t1.x = t311.x JOIN (SELECT 1 AS x) t312 ON t1.x = t312.x JOIN (SELECT 1 AS x) t313 ON t1.x = t313.x JOIN (SELECT 1 AS x) t314 ON t1.x = t314.x JOIN (SELECT 1 AS x) t315 ON t1.x = t315.x JOIN (SELECT 1 AS x) t316 ON t1.x = t316.x JOIN (SELECT 1 AS x) t317 ON t1.x = t317.x JOIN (SELECT 1 AS x) t318 ON t1.x = t318.x JOIN (SELECT 1 AS x) t319 ON t1.x = t319.x JOIN (SELECT 1 AS x) t320 ON t1.x = t320.x JOIN (SELECT 1 AS x) t321 ON t1.x = t321.x JOIN (SELECT 1 AS x) t322 ON t1.x = t322.x JOIN (SELECT 1 AS x) t323 ON t1.x = t323.x JOIN (SELECT 1 AS x) t324 ON t1.x = t324.x JOIN (SELECT 1 AS x) t325 ON t1.x = t325.x JOIN (SELECT 1 AS x) t326 ON t1.x = t326.x JOIN (SELECT 1 AS x) t327 ON t1.x = t327.x JOIN (SELECT 1 AS x) t328 ON t1.x = t328.x JOIN (SELECT 1 AS x) t329 ON t1.x = t329.x JOIN (SELECT 1 AS x) t330 ON t1.x = t330.x JOIN (SELECT 1 AS x) t331 ON t1.x = t331.x JOIN (SELECT 1 AS x) t332 ON t1.x = t332.x JOIN (SELECT 1 AS x) t333 ON t1.x = t333.x JOIN (SELECT 1 AS x) t334 ON t1.x = t334.x JOIN (SELECT 1 AS x) t335 ON t1.x = t335.x JOIN (SELECT 1 AS x) t336 ON t1.x = t336.x JOIN (SELECT 1 AS x) t337 ON t1.x = t337.x JOIN (SELECT 1 AS x) t338 ON t1.x = t338.x JOIN (SELECT 1 AS x) t339 ON t1.x = t339.x JOIN (SELECT 1 AS x) t340 ON t1.x = t340.x JOIN (SELECT 1 AS x) t341 ON t1.x = t341.x JOIN (SELECT 1 AS x) t342 ON t1.x = t342.x JOIN (SELECT 1 AS x) t343 ON t1.x = t343.x JOIN (SELECT 1 AS x) t344 ON t1.x = t344.x JOIN (SELECT 1 AS x) t345 ON t1.x = t345.x JOIN (SELECT 1 AS x) t346 ON t1.x = t346.x JOIN (SELECT 1 AS x) t347 ON t1.x = t347.x JOIN (SELECT 1 AS x) t348 ON t1.x = t348.x JOIN (SELECT 1 AS x) t349 ON t1.x = t349.x JOIN (SELECT 1 AS x) t350 ON t1.x = t350.x JOIN (SELECT 1 AS x) t351 ON t1.x = t351.x JOIN (SELECT 1 AS x) t352 ON t1.x = t352.x JOIN (SELECT 1 AS x) t353 ON t1.x = t353.x JOIN (SELECT 1 AS x) t354 ON t1.x = t354.x JOIN (SELECT 1 AS x) t355 ON t1.x = t355.x JOIN (SELECT 1 AS x) t356 ON t1.x = t356.x JOIN (SELECT 1 AS x) t357 ON t1.x = t357.x JOIN (SELECT 1 AS x) t358 ON t1.x = t358.x JOIN (SELECT 1 AS x) t359 ON t1.x = t359.x JOIN (SELECT 1 AS x) t360 ON t1.x = t360.x JOIN (SELECT 1 AS x) t361 ON t1.x = t361.x JOIN (SELECT 1 AS x) t362 ON t1.x = t362.x JOIN (SELECT 1 AS x) t363 ON t1.x = t363.x JOIN (SELECT 1 AS x) t364 ON t1.x = t364.x JOIN (SELECT 1 AS x) t365 ON t1.x = t365.x JOIN (SELECT 1 AS x) t366 ON t1.x = t366.x JOIN (SELECT 1 AS x) t367 ON t1.x = t367.x JOIN (SELECT 1 AS x) t368 ON t1.x = t368.x JOIN (SELECT 1 AS x) t369 ON t1.x = t369.x JOIN (SELECT 1 AS x) t370 ON t1.x = t370.x JOIN (SELECT 1 AS x) t371 ON t1.x = t371.x JOIN (SELECT 1 AS x) t372 ON t1.x = t372.x JOIN (SELECT 1 AS x) t373 ON t1.x = t373.x JOIN (SELECT 1 AS x) t374 ON t1.x = t374.x JOIN (SELECT 1 AS x) t375 ON t1.x = t375.x JOIN (SELECT 1 AS x) t376 ON t1.x = t376.x JOIN (SELECT 1 AS x) t377 ON t1.x = t377.x JOIN (SELECT 1 AS x) t378 ON t1.x = t378.x JOIN (SELECT 1 AS x) t379 ON t1.x = t379.x JOIN (SELECT 1 AS x) t380 ON t1.x = t380.x JOIN (SELECT 1 AS x) t381 ON t1.x = t381.x JOIN (SELECT 1 AS x) t382 ON t1.x = t382.x JOIN (SELECT 1 AS x) t383 ON t1.x = t383.x JOIN (SELECT 1 AS x) t384 ON t1.x = t384.x JOIN (SELECT 1 AS x) t385 ON t1.x = t385.x JOIN (SELECT 1 AS x) t386 ON t1.x = t386.x JOIN (SELECT 1 AS x) t387 ON t1.x = t387.x JOIN (SELECT 1 AS x) t388 ON t1.x = t388.x JOIN (SELECT 1 AS x) t389 ON t1.x = t389.x JOIN (SELECT 1 AS x) t390 ON t1.x = t390.x JOIN (SELECT 1 AS x) t391 ON t1.x = t391.x JOIN (SELECT 1 AS x) t392 ON t1.x = t392.x JOIN (SELECT 1 AS x) t393 ON t1.x = t393.x JOIN (SELECT 1 AS x) t394 ON t1.x = t394.x JOIN (SELECT 1 AS x) t395 ON t1.x = t395.x JOIN (SELECT 1 AS x) t396 ON t1.x = t396.x JOIN (SELECT 1 AS x) t397 ON t1.x = t397.x JOIN (SELECT 1 AS x) t398 ON t1.x = t398.x JOIN (SELECT 1 AS x) t399 ON t1.x = t399.x JOIN (SELECT 1 AS x) t400 ON t1.x = t400.x JOIN (SELECT 1 AS x) t401 ON t1.x = t401.x JOIN (SELECT 1 AS x) t402 ON t1.x = t402.x JOIN (SELECT 1 AS x) t403 ON t1.x = t403.x JOIN (SELECT 1 AS x) t404 ON t1.x = t404.x JOIN (SELECT 1 AS x) t405 ON t1.x = t405.x JOIN (SELECT 1 AS x) t406 ON t1.x = t406.x JOIN (SELECT 1 AS x) t407 ON t1.x = t407.x JOIN (SELECT 1 AS x) t408 ON t1.x = t408.x JOIN (SELECT 1 AS x) t409 ON t1.x = t409.x JOIN (SELECT 1 AS x) t410 ON t1.x = t410.x JOIN (SELECT 1 AS x) t411 ON t1.x = t411.x JOIN (SELECT 1 AS x) t412 ON t1.x = t412.x JOIN (SELECT 1 AS x) t413 ON t1.x = t413.x JOIN (SELECT 1 AS x) t414 ON t1.x = t414.x JOIN (SELECT 1 AS x) t415 ON t1.x = t415.x JOIN (SELECT 1 AS x) t416 ON t1.x = t416.x JOIN (SELECT 1 AS x) t417 ON t1.x = t417.x JOIN (SELECT 1 AS x) t418 ON t1.x = t418.x JOIN (SELECT 1 AS x) t419 ON t1.x = t419.x JOIN (SELECT 1 AS x) t420 ON t1.x = t420.x JOIN (SELECT 1 AS x) t421 ON t1.x = t421.x JOIN (SELECT 1 AS x) t422 ON t1.x = t422.x JOIN (SELECT 1 AS x) t423 ON t1.x = t423.x JOIN (SELECT 1 AS x) t424 ON t1.x = t424.x JOIN (SELECT 1 AS x) t425 ON t1.x = t425.x JOIN (SELECT 1 AS x) t426 ON t1.x = t426.x JOIN (SELECT 1 AS x) t427 ON t1.x = t427.x JOIN (SELECT 1 AS x) t428 ON t1.x = t428.x JOIN (SELECT 1 AS x) t429 ON t1.x = t429.x JOIN (SELECT 1 AS x) t430 ON t1.x = t430.x JOIN (SELECT 1 AS x) t431 ON t1.x = t431.x JOIN (SELECT 1 AS x) t432 ON t1.x = t432.x JOIN (SELECT 1 AS x) t433 ON t1.x = t433.x JOIN (SELECT 1 AS x) t434 ON t1.x = t434.x JOIN (SELECT 1 AS x) t435 ON t1.x = t435.x JOIN (SELECT 1 AS x) t436 ON t1.x = t436.x JOIN (SELECT 1 AS x) t437 ON t1.x = t437.x JOIN (SELECT 1 AS x) t438 ON t1.x = t438.x JOIN (SELECT 1 AS x) t439 ON t1.x = t439.x JOIN (SELECT 1 AS x) t440 ON t1.x = t440.x JOIN (SELECT 1 AS x) t441 ON t1.x = t441.x JOIN (SELECT 1 AS x) t442 ON t1.x = t442.x JOIN (SELECT 1 AS x) t443 ON t1.x = t443.x JOIN (SELECT 1 AS x) t444 ON t1.x = t444.x JOIN (SELECT 1 AS x) t445 ON t1.x = t445.x JOIN (SELECT 1 AS x) t446 ON t1.x = t446.x JOIN (SELECT 1 AS x) t447 ON t1.x = t447.x JOIN (SELECT 1 AS x) t448 ON t1.x = t448.x JOIN (SELECT 1 AS x) t449 ON t1.x = t449.x JOIN (SELECT 1 AS x) t450 ON t1.x = t450.x JOIN (SELECT 1 AS x) t451 ON t1.x = t451.x JOIN (SELECT 1 AS x) t452 ON t1.x = t452.x JOIN (SELECT 1 AS x) t453 ON t1.x = t453.x JOIN (SELECT 1 AS x) t454 ON t1.x = t454.x JOIN (SELECT 1 AS x) t455 ON t1.x = t455.x JOIN (SELECT 1 AS x) t456 ON t1.x = t456.x JOIN (SELECT 1 AS x) t457 ON t1.x = t457.x JOIN (SELECT 1 AS x) t458 ON t1.x = t458.x JOIN (SELECT 1 AS x) t459 ON t1.x = t459.x JOIN (SELECT 1 AS x) t460 ON t1.x = t460.x JOIN (SELECT 1 AS x) t461 ON t1.x = t461.x JOIN (SELECT 1 AS x) t462 ON t1.x = t462.x JOIN (SELECT 1 AS x) t463 ON t1.x = t463.x JOIN (SELECT 1 AS x) t464 ON t1.x = t464.x JOIN (SELECT 1 AS x) t465 ON t1.x = t465.x JOIN (SELECT 1 AS x) t466 ON t1.x = t466.x JOIN (SELECT 1 AS x) t467 ON t1.x = t467.x JOIN (SELECT 1 AS x) t468 ON t1.x = t468.x JOIN (SELECT 1 AS x) t469 ON t1.x = t469.x JOIN (SELECT 1 AS x) t470 ON t1.x = t470.x JOIN (SELECT 1 AS x) t471 ON t1.x = t471.x JOIN (SELECT 1 AS x) t472 ON t1.x = t472.x JOIN (SELECT 1 AS x) t473 ON t1.x = t473.x JOIN (SELECT 1 AS x) t474 ON t1.x = t474.x JOIN (SELECT 1 AS x) t475 ON t1.x = t475.x JOIN (SELECT 1 AS x) t476 ON t1.x = t476.x JOIN (SELECT 1 AS x) t477 ON t1.x = t477.x JOIN (SELECT 1 AS x) t478 ON t1.x = t478.x JOIN (SELECT 1 AS x) t479 ON t1.x = t479.x JOIN (SELECT 1 AS x) t480 ON t1.x = t480.x JOIN (SELECT 1 AS x) t481 ON t1.x = t481.x JOIN (SELECT 1 AS x) t482 ON t1.x = t482.x JOIN (SELECT 1 AS x) t483 ON t1.x = t483.x JOIN (SELECT 1 AS x) t484 ON t1.x = t484.x JOIN (SELECT 1 AS x) t485 ON t1.x = t485.x JOIN (SELECT 1 AS x) t486 ON t1.x = t486.x JOIN (SELECT 1 AS x) t487 ON t1.x = t487.x JOIN (SELECT 1 AS x) t488 ON t1.x = t488.x JOIN (SELECT 1 AS x) t489 ON t1.x = t489.x JOIN (SELECT 1 AS x) t490 ON t1.x = t490.x JOIN (SELECT 1 AS x) t491 ON t1.x = t491.x JOIN (SELECT 1 AS x) t492 ON t1.x = t492.x JOIN (SELECT 1 AS x) t493 ON t1.x = t493.x JOIN (SELECT 1 AS x) t494 ON t1.x = t494.x JOIN (SELECT 1 AS x) t495 ON t1.x = t495.x JOIN (SELECT 1 AS x) t496 ON t1.x = t496.x JOIN (SELECT 1 AS x) t497 ON t1.x = t497.x JOIN (SELECT 1 AS x) t498 ON t1.x = t498.x JOIN (SELECT 1 AS x) t499 ON t1.x = t499.x JOIN (SELECT 1 AS x) t500 ON t1.x = t500.x JOIN (SELECT 1 AS x) t501 ON t1.x = t501.x JOIN (SELECT 1 AS x) t502 ON t1.x = t502.x JOIN (SELECT 1 AS x) t503 ON t1.x = t503.x JOIN (SELECT 1 AS x) t504 ON t1.x = t504.x JOIN (SELECT 1 AS x) t505 ON t1.x = t505.x JOIN (SELECT 1 AS x) t506 ON t1.x = t506.x JOIN (SELECT 1 AS x) t507 ON t1.x = t507.x JOIN (SELECT 1 AS x) t508 ON t1.x = t508.x JOIN (SELECT 1 AS x) t509 ON t1.x = t509.x JOIN (SELECT 1 AS x) t510 ON t1.x = t510.x JOIN (SELECT 1 AS x) t511 ON t1.x = t511.x JOIN (SELECT 1 AS x) t512 ON t1.x = t512.x JOIN (SELECT 1 AS x) t513 ON t1.x = t513.x JOIN (SELECT 1 AS x) t514 ON t1.x = t514.x JOIN (SELECT 1 AS x) t515 ON t1.x = t515.x JOIN (SELECT 1 AS x) t516 ON t1.x = t516.x JOIN (SELECT 1 AS x) t517 ON t1.x = t517.x JOIN (SELECT 1 AS x) t518 ON t1.x = t518.x JOIN (SELECT 1 AS x) t519 ON t1.x = t519.x JOIN (SELECT 1 AS x) t520 ON t1.x = t520.x JOIN (SELECT 1 AS x) t521 ON t1.x = t521.x JOIN (SELECT 1 AS x) t522 ON t1.x = t522.x JOIN (SELECT 1 AS x) t523 ON t1.x = t523.x JOIN (SELECT 1 AS x) t524 ON t1.x = t524.x JOIN (SELECT 1 AS x) t525 ON t1.x = t525.x JOIN (SELECT 1 AS x) t526 ON t1.x = t526.x JOIN (SELECT 1 AS x) t527 ON t1.x = t527.x JOIN (SELECT 1 AS x) t528 ON t1.x = t528.x JOIN (SELECT 1 AS x) t529 ON t1.x = t529.x JOIN (SELECT 1 AS x) t530 ON t1.x = t530.x JOIN (SELECT 1 AS x) t531 ON t1.x = t531.x JOIN (SELECT 1 AS x) t532 ON t1.x = t532.x JOIN (SELECT 1 AS x) t533 ON t1.x = t533.x JOIN (SELECT 1 AS x) t534 ON t1.x = t534.x JOIN (SELECT 1 AS x) t535 ON t1.x = t535.x JOIN (SELECT 1 AS x) t536 ON t1.x = t536.x JOIN (SELECT 1 AS x) t537 ON t1.x = t537.x JOIN (SELECT 1 AS x) t538 ON t1.x = t538.x JOIN (SELECT 1 AS x) t539 ON t1.x = t539.x JOIN (SELECT 1 AS x) t540 ON t1.x = t540.x JOIN (SELECT 1 AS x) t541 ON t1.x = t541.x JOIN (SELECT 1 AS x) t542 ON t1.x = t542.x JOIN (SELECT 1 AS x) t543 ON t1.x = t543.x JOIN (SELECT 1 AS x) t544 ON t1.x = t544.x JOIN (SELECT 1 AS x) t545 ON t1.x = t545.x JOIN (SELECT 1 AS x) t546 ON t1.x = t546.x JOIN (SELECT 1 AS x) t547 ON t1.x = t547.x JOIN (SELECT 1 AS x) t548 ON t1.x = t548.x JOIN (SELECT 1 AS x) t549 ON t1.x = t549.x JOIN (SELECT 1 AS x) t550 ON t1.x = t550.x JOIN (SELECT 1 AS x) t551 ON t1.x = t551.x JOIN (SELECT 1 AS x) t552 ON t1.x = t552.x JOIN (SELECT 1 AS x) t553 ON t1.x = t553.x JOIN (SELECT 1 AS x) t554 ON t1.x = t554.x JOIN (SELECT 1 AS x) t555 ON t1.x = t555.x JOIN (SELECT 1 AS x) t556 ON t1.x = t556.x JOIN (SELECT 1 AS x) t557 ON t1.x = t557.x JOIN (SELECT 1 AS x) t558 ON t1.x = t558.x JOIN (SELECT 1 AS x) t559 ON t1.x = t559.x JOIN (SELECT 1 AS x) t560 ON t1.x = t560.x JOIN (SELECT 1 AS x) t561 ON t1.x = t561.x JOIN (SELECT 1 AS x) t562 ON t1.x = t562.x JOIN (SELECT 1 AS x) t563 ON t1.x = t563.x JOIN (SELECT 1 AS x) t564 ON t1.x = t564.x JOIN (SELECT 1 AS x) t565 ON t1.x = t565.x JOIN (SELECT 1 AS x) t566 ON t1.x = t566.x JOIN (SELECT 1 AS x) t567 ON t1.x = t567.x JOIN (SELECT 1 AS x) t568 ON t1.x = t568.x JOIN (SELECT 1 AS x) t569 ON t1.x = t569.x JOIN (SELECT 1 AS x) t570 ON t1.x = t570.x JOIN (SELECT 1 AS x) t571 ON t1.x = t571.x JOIN (SELECT 1 AS x) t572 ON t1.x = t572.x JOIN (SELECT 1 AS x) t573 ON t1.x = t573.x JOIN (SELECT 1 AS x) t574 ON t1.x = t574.x JOIN (SELECT 1 AS x) t575 ON t1.x = t575.x JOIN (SELECT 1 AS x) t576 ON t1.x = t576.x JOIN (SELECT 1 AS x) t577 ON t1.x = t577.x JOIN (SELECT 1 AS x) t578 ON t1.x = t578.x JOIN (SELECT 1 AS x) t579 ON t1.x = t579.x JOIN (SELECT 1 AS x) t580 ON t1.x = t580.x JOIN (SELECT 1 AS x) t581 ON t1.x = t581.x JOIN (SELECT 1 AS x) t582 ON t1.x = t582.x JOIN (SELECT 1 AS x) t583 ON t1.x = t583.x JOIN (SELECT 1 AS x) t584 ON t1.x = t584.x JOIN (SELECT 1 AS x) t585 ON t1.x = t585.x JOIN (SELECT 1 AS x) t586 ON t1.x = t586.x JOIN (SELECT 1 AS x) t587 ON t1.x = t587.x JOIN (SELECT 1 AS x) t588 ON t1.x = t588.x JOIN (SELECT 1 AS x) t589 ON t1.x = t589.x JOIN (SELECT 1 AS x) t590 ON t1.x = t590.x JOIN (SELECT 1 AS x) t591 ON t1.x = t591.x JOIN (SELECT 1 AS x) t592 ON t1.x = t592.x JOIN (SELECT 1 AS x) t593 ON t1.x = t593.x JOIN (SELECT 1 AS x) t594 ON t1.x = t594.x JOIN (SELECT 1 AS x) t595 ON t1.x = t595.x JOIN (SELECT 1 AS x) t596 ON t1.x = t596.x JOIN (SELECT 1 AS x) t597 ON t1.x = t597.x JOIN (SELECT 1 AS x) t598 ON t1.x = t598.x JOIN (SELECT 1 AS x) t599 ON t1.x = t599.x JOIN (SELECT 1 AS x) t600 ON t1.x = t600.x JOIN (SELECT 1 AS x) t601 ON t1.x = t601.x JOIN (SELECT 1 AS x) t602 ON t1.x = t602.x JOIN (SELECT 1 AS x) t603 ON t1.x = t603.x JOIN (SELECT 1 AS x) t604 ON t1.x = t604.x JOIN (SELECT 1 AS x) t605 ON t1.x = t605.x JOIN (SELECT 1 AS x) t606 ON t1.x = t606.x JOIN (SELECT 1 AS x) t607 ON t1.x = t607.x JOIN (SELECT 1 AS x) t608 ON t1.x = t608.x JOIN (SELECT 1 AS x) t609 ON t1.x = t609.x JOIN (SELECT 1 AS x) t610 ON t1.x = t610.x JOIN (SELECT 1 AS x) t611 ON t1.x = t611.x JOIN (SELECT 1 AS x) t612 ON t1.x = t612.x JOIN (SELECT 1 AS x) t613 ON t1.x = t613.x JOIN (SELECT 1 AS x) t614 ON t1.x = t614.x JOIN (SELECT 1 AS x) t615 ON t1.x = t615.x JOIN (SELECT 1 AS x) t616 ON t1.x = t616.x JOIN (SELECT 1 AS x) t617 ON t1.x = t617.x JOIN (SELECT 1 AS x) t618 ON t1.x = t618.x JOIN (SELECT 1 AS x) t619 ON t1.x = t619.x JOIN (SELECT 1 AS x) t620 ON t1.x = t620.x JOIN (SELECT 1 AS x) t621 ON t1.x = t621.x JOIN (SELECT 1 AS x) t622 ON t1.x = t622.x JOIN (SELECT 1 AS x) t623 ON t1.x = t623.x JOIN (SELECT 1 AS x) t624 ON t1.x = t624.x JOIN (SELECT 1 AS x) t625 ON t1.x = t625.x JOIN (SELECT 1 AS x) t626 ON t1.x = t626.x JOIN (SELECT 1 AS x) t627 ON t1.x = t627.x JOIN (SELECT 1 AS x) t628 ON t1.x = t628.x JOIN (SELECT 1 AS x) t629 ON t1.x = t629.x JOIN (SELECT 1 AS x) t630 ON t1.x = t630.x JOIN (SELECT 1 AS x) t631 ON t1.x = t631.x JOIN (SELECT 1 AS x) t632 ON t1.x = t632.x JOIN (SELECT 1 AS x) t633 ON t1.x = t633.x JOIN (SELECT 1 AS x) t634 ON t1.x = t634.x JOIN (SELECT 1 AS x) t635 ON t1.x = t635.x JOIN (SELECT 1 AS x) t636 ON t1.x = t636.x JOIN (SELECT 1 AS x) t637 ON t1.x = t637.x JOIN (SELECT 1 AS x) t638 ON t1.x = t638.x JOIN (SELECT 1 AS x) t639 ON t1.x = t639.x JOIN (SELECT 1 AS x) t640 ON t1.x = t640.x JOIN (SELECT 1 AS x) t641 ON t1.x = t641.x JOIN (SELECT 1 AS x) t642 ON t1.x = t642.x JOIN (SELECT 1 AS x) t643 ON t1.x = t643.x JOIN (SELECT 1 AS x) t644 ON t1.x = t644.x JOIN (SELECT 1 AS x) t645 ON t1.x = t645.x JOIN (SELECT 1 AS x) t646 ON t1.x = t646.x JOIN (SELECT 1 AS x) t647 ON t1.x = t647.x JOIN (SELECT 1 AS x) t648 ON t1.x = t648.x JOIN (SELECT 1 AS x) t649 ON t1.x = t649.x JOIN (SELECT 1 AS x) t650 ON t1.x = t650.x JOIN (SELECT 1 AS x) t651 ON t1.x = t651.x JOIN (SELECT 1 AS x) t652 ON t1.x = t652.x JOIN (SELECT 1 AS x) t653 ON t1.x = t653.x JOIN (SELECT 1 AS x) t654 ON t1.x = t654.x JOIN (SELECT 1 AS x) t655 ON t1.x = t655.x JOIN (SELECT 1 AS x) t656 ON t1.x = t656.x JOIN (SELECT 1 AS x) t657 ON t1.x = t657.x JOIN (SELECT 1 AS x) t658 ON t1.x = t658.x JOIN (SELECT 1 AS x) t659 ON t1.x = t659.x JOIN (SELECT 1 AS x) t660 ON t1.x = t660.x JOIN (SELECT 1 AS x) t661 ON t1.x = t661.x JOIN (SELECT 1 AS x) t662 ON t1.x = t662.x JOIN (SELECT 1 AS x) t663 ON t1.x = t663.x JOIN (SELECT 1 AS x) t664 ON t1.x = t664.x JOIN (SELECT 1 AS x) t665 ON t1.x = t665.x JOIN (SELECT 1 AS x) t666 ON t1.x = t666.x
diff --git a/tests/queries/0_stateless/03095_window_functions_qualify.sql b/tests/queries/0_stateless/03095_window_functions_qualify.sql
index 72903992745..adedff2e2cf 100644
--- a/tests/queries/0_stateless/03095_window_functions_qualify.sql
+++ b/tests/queries/0_stateless/03095_window_functions_qualify.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT number, COUNT() OVER (PARTITION BY number % 3) AS partition_count FROM numbers(10) QUALIFY partition_count = 4 ORDER BY number;
 
diff --git a/tests/queries/0_stateless/03096_http_interface_role_query_param.sh b/tests/queries/0_stateless/03096_http_interface_role_query_param.sh
index db42ee6bb41..5ae2d5f2f18 100755
--- a/tests/queries/0_stateless/03096_http_interface_role_query_param.sh
+++ b/tests/queries/0_stateless/03096_http_interface_role_query_param.sh
@@ -21,7 +21,7 @@ CHANGED_SETTING_VALUE="42"
 SHOW_CURRENT_ROLES_QUERY="SELECT role_name FROM system.current_roles ORDER BY role_name ASC"
 SHOW_CHANGED_SETTINGS_QUERY="SELECT name, value FROM system.settings WHERE changed = 1 AND name = '$CHANGED_SETTING_NAME' ORDER BY name ASC"
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT -n --query "
 DROP USER IF EXISTS $TEST_USER;
 DROP ROLE IF EXISTS $TEST_ROLE1;
 DROP ROLE IF EXISTS $TEST_ROLE2;
@@ -94,7 +94,7 @@ OUT=$($CLICKHOUSE_CURL -u $TEST_USER_AUTH -sS "$CLICKHOUSE_URL&role=$TEST_ROLE1&
 echo -ne $OUT | grep -o "Code: 512"            || echo "expected code 512, got: $OUT"
 echo -ne $OUT | grep -o "SET_NON_GRANTED_ROLE" || echo "expected SET_NON_GRANTED_ROLE error, got: $OUT"
 
-$CLICKHOUSE_CLIENT --query "
+$CLICKHOUSE_CLIENT -n --query "
 DROP USER $TEST_USER;
 DROP ROLE $TEST_ROLE1;
 DROP ROLE $TEST_ROLE2;
diff --git a/tests/queries/0_stateless/03096_text_log_format_string_args_not_empty.sql b/tests/queries/0_stateless/03096_text_log_format_string_args_not_empty.sql
index 0e60ee77fe5..b1ddd141e04 100644
--- a/tests/queries/0_stateless/03096_text_log_format_string_args_not_empty.sql
+++ b/tests/queries/0_stateless/03096_text_log_format_string_args_not_empty.sql
@@ -1,4 +1,4 @@
-set enable_analyzer = true;
+set allow_experimental_analyzer = true;
 
 select count; -- { serverError UNKNOWN_IDENTIFIER }
 
diff --git a/tests/queries/0_stateless/03097_query_log_join_processes.sql b/tests/queries/0_stateless/03097_query_log_join_processes.sql
index 135160f4709..daf3136e3fe 100644
--- a/tests/queries/0_stateless/03097_query_log_join_processes.sql
+++ b/tests/queries/0_stateless/03097_query_log_join_processes.sql
@@ -2,6 +2,6 @@
 
 SYSTEM FLUSH LOGS;
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 SELECT count(1) as num, hostName() as hostName FROM system.query_log as a INNER JOIN system.processes as b on a.query_id = b.query_id and type = 'QueryStart' and dateDiff('second', event_time, now()) > 5 and current_database = currentDatabase() FORMAT Null;
diff --git a/tests/queries/0_stateless/03098_prefer_column_to_alias_subquery.sql b/tests/queries/0_stateless/03098_prefer_column_to_alias_subquery.sql
index cb41151b9c9..cf3768e2f29 100644
--- a/tests/queries/0_stateless/03098_prefer_column_to_alias_subquery.sql
+++ b/tests/queries/0_stateless/03098_prefer_column_to_alias_subquery.sql
@@ -13,7 +13,7 @@ CREATE TABLE clickhouse_alias_issue_2 (
     column_2 Nullable(Float32)
 ) Engine=Memory;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 INSERT INTO `clickhouse_alias_issue_1`
 VALUES (1, 100), (2, 200), (3, 300);
@@ -28,7 +28,7 @@ VALUES (1, 10), (2, 20), (3, 30);
 -- \N	30	3
 -- \N	20	2
 -- \N	10	1
-SELECT *
+SELECT * 
 FROM
 (
 SELECT
diff --git a/tests/queries/0_stateless/03099_analyzer_multi_join.sql b/tests/queries/0_stateless/03099_analyzer_multi_join.sql
index dfdaeeea770..67985962ba8 100644
--- a/tests/queries/0_stateless/03099_analyzer_multi_join.sql
+++ b/tests/queries/0_stateless/03099_analyzer_multi_join.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/56503
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT
     tb1.owner_id AS owner_id,
diff --git a/tests/queries/0_stateless/03100_analyzer_constants_in_multiif.sql b/tests/queries/0_stateless/03100_analyzer_constants_in_multiif.sql
index c9a4000d25e..04666411760 100644
--- a/tests/queries/0_stateless/03100_analyzer_constants_in_multiif.sql
+++ b/tests/queries/0_stateless/03100_analyzer_constants_in_multiif.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/59101
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 CREATE TABLE users (name String, age Int16) ENGINE=Memory;
 INSERT INTO users VALUES ('John', 33);
diff --git a/tests/queries/0_stateless/03101_analyzer_identifiers_1.sql b/tests/queries/0_stateless/03101_analyzer_identifiers_1.sql
index 499f712e57a..2e0ad7d8a5b 100644
--- a/tests/queries/0_stateless/03101_analyzer_identifiers_1.sql
+++ b/tests/queries/0_stateless/03101_analyzer_identifiers_1.sql
@@ -1,6 +1,6 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/23194
 -- This test add query-templates for fuzzer
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
 CREATE DATABASE {CLICKHOUSE_DATABASE:Identifier};
diff --git a/tests/queries/0_stateless/03101_analyzer_identifiers_2.sql b/tests/queries/0_stateless/03101_analyzer_identifiers_2.sql
index 92c3e98265f..35f34e33689 100644
--- a/tests/queries/0_stateless/03101_analyzer_identifiers_2.sql
+++ b/tests/queries/0_stateless/03101_analyzer_identifiers_2.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/23194
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 CREATE TEMPORARY TABLE test1 (a String, nest Nested(x String, y String));
 
diff --git a/tests/queries/0_stateless/03101_analyzer_identifiers_3.sql b/tests/queries/0_stateless/03101_analyzer_identifiers_3.sql
index 997fee91930..77a0f040e88 100644
--- a/tests/queries/0_stateless/03101_analyzer_identifiers_3.sql
+++ b/tests/queries/0_stateless/03101_analyzer_identifiers_3.sql
@@ -1,7 +1,7 @@
 -- Tags: no-parallel
 -- Looks like you cannot use the query parameter as a column name.
 -- https://github.com/ClickHouse/ClickHouse/issues/23194
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP DATABASE IF EXISTS db1_03101;
 DROP DATABASE IF EXISTS db2_03101;
diff --git a/tests/queries/0_stateless/03101_analyzer_identifiers_4.sql b/tests/queries/0_stateless/03101_analyzer_identifiers_4.sql
index 869310aa181..eba6ad09a3f 100644
--- a/tests/queries/0_stateless/03101_analyzer_identifiers_4.sql
+++ b/tests/queries/0_stateless/03101_analyzer_identifiers_4.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/23194
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
 CREATE DATABASE {CLICKHOUSE_DATABASE:Identifier};
diff --git a/tests/queries/0_stateless/03101_analyzer_invalid_join_on.sql b/tests/queries/0_stateless/03101_analyzer_invalid_join_on.sql
index d7e26862d36..8539376e136 100644
--- a/tests/queries/0_stateless/03101_analyzer_invalid_join_on.sql
+++ b/tests/queries/0_stateless/03101_analyzer_invalid_join_on.sql
@@ -3,23 +3,23 @@
 drop table if exists t1;
 drop table if exists t2;
 
-set enable_analyzer=1;
+set allow_experimental_analyzer=1;
 
 create table t1 (c3 String, primary key(c3)) engine = MergeTree;
 create table t2 (c11 String, primary key(c11)) engine = MergeTree;
 insert into t1 values ('succeed');
 insert into t2 values ('succeed');
 
-select
+select 
     ref_0.c11 as c_2_c30_0
-  from
+  from 
     t2 as ref_0
-      cross join (select
-            ref_1.c3 as c_6_c28_15
-          from
+      cross join (select 
+            ref_1.c3 as c_6_c28_15 
+          from 
             t1 as ref_1
        ) as subq_0
   where subq_0.c_6_c28_15 = (select c11 from t2 order by c11 limit 1);
 
 drop table if exists t1;
-drop table if exists t2;
+drop table if exists t2;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03102_prefer_column_name_to_alias.sql b/tests/queries/0_stateless/03102_prefer_column_name_to_alias.sql
index fafdb660e44..48e97fd0841 100644
--- a/tests/queries/0_stateless/03102_prefer_column_name_to_alias.sql
+++ b/tests/queries/0_stateless/03102_prefer_column_name_to_alias.sql
@@ -4,7 +4,7 @@ DROP TABLE IF EXISTS loans;
 
 CREATE TABLE loans (loan_number int, security_id text) ENGINE=Memory;
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 INSERT INTO loans VALUES (1, 'AAA');
 INSERT INTO loans VALUES (1, 'AAA');
diff --git a/tests/queries/0_stateless/03103_positional_arguments.sql b/tests/queries/0_stateless/03103_positional_arguments.sql
index eecaa3f4ea6..ad30719dc3e 100644
--- a/tests/queries/0_stateless/03103_positional_arguments.sql
+++ b/tests/queries/0_stateless/03103_positional_arguments.sql
@@ -1,6 +1,6 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/56466
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 DROP TABLE IF EXISTS users;
 
diff --git a/tests/queries/0_stateless/03104_create_view_join.sql b/tests/queries/0_stateless/03104_create_view_join.sql
index a39be92b1f1..bed3d81c9a8 100644
--- a/tests/queries/0_stateless/03104_create_view_join.sql
+++ b/tests/queries/0_stateless/03104_create_view_join.sql
@@ -4,7 +4,7 @@ DROP TABLE IF EXISTS test_table_01;
 DROP TABLE IF EXISTS test_table_02;
 DROP TABLE IF EXISTS test_view_01;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 CREATE TABLE test_table_01 (
     column Int32
@@ -15,12 +15,12 @@ CREATE TABLE test_table_02 (
 ) ENGINE = Memory();
 
 CREATE VIEW test_view_01 AS
-SELECT
+SELECT 
     t1.column,
     t2.column
-FROM test_table_01 AS t1
+FROM test_table_01 AS t1 
     INNER JOIN test_table_02 AS t2 ON t1.column = t2.column;
 
 DROP TABLE IF EXISTS test_table_01;
 DROP TABLE IF EXISTS test_table_02;
-DROP TABLE IF EXISTS test_view_01;
+DROP TABLE IF EXISTS test_view_01;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03107_ill_formed_select_in_materialized_view.sql b/tests/queries/0_stateless/03107_ill_formed_select_in_materialized_view.sql
index 5f6ec74bdeb..d142bf1662e 100644
--- a/tests/queries/0_stateless/03107_ill_formed_select_in_materialized_view.sql
+++ b/tests/queries/0_stateless/03107_ill_formed_select_in_materialized_view.sql
@@ -6,10 +6,10 @@ DROP TABLE iF EXISTS b;
 CREATE TABLE a ( a UInt64, b UInt64) ENGINE = Memory;
 CREATE TABLE b ( b UInt64) ENGINE = Memory;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET joined_subquery_requires_alias = 0;
 
 CREATE MATERIALIZED VIEW view_4 ( bb UInt64, cnt UInt64) Engine=MergeTree ORDER BY bb POPULATE AS SELECT bb, count() AS cnt FROM (SELECT a, b AS j, b AS bb FROM a INNER JOIN (SELECT b AS j, b AS bb FROM b ) USING (j)) GROUP BY bb; -- { serverError UNKNOWN_IDENTIFIER }
 
 DROP TABLE IF EXISTS a;
-DROP TABLE iF EXISTS b;
+DROP TABLE iF EXISTS b;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03108_describe_union_all.sql b/tests/queries/0_stateless/03108_describe_union_all.sql
index 7e207ae2854..c5172902a2b 100644
--- a/tests/queries/0_stateless/03108_describe_union_all.sql
+++ b/tests/queries/0_stateless/03108_describe_union_all.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/8030
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
-DESCRIBE (SELECT 1, 1 UNION ALL SELECT 1, 2);
+DESCRIBE (SELECT 1, 1 UNION ALL SELECT 1, 2);
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03109_ast_too_big.sql b/tests/queries/0_stateless/03109_ast_too_big.sql
index 1464f90fe83..3eedf305f44 100644
--- a/tests/queries/0_stateless/03109_ast_too_big.sql
+++ b/tests/queries/0_stateless/03109_ast_too_big.sql
@@ -1,6 +1,6 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/32139
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 WITH
   data AS (
@@ -50,4 +50,4 @@ SELECT
   value12 AS v12,
   value13 AS v13,
   value14 AS v14
-FORMAT Null;
+FORMAT Null;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03110_unicode_alias.sql b/tests/queries/0_stateless/03110_unicode_alias.sql
index aa33195ea51..b8cbe7390fa 100644
--- a/tests/queries/0_stateless/03110_unicode_alias.sql
+++ b/tests/queries/0_stateless/03110_unicode_alias.sql
@@ -1,6 +1,6 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/47288
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 select 1 as `c0`
 from (
diff --git a/tests/queries/0_stateless/03111_inner_join_group_by.sql b/tests/queries/0_stateless/03111_inner_join_group_by.sql
index 6ebaacfc3fe..fcc8c55a566 100644
--- a/tests/queries/0_stateless/03111_inner_join_group_by.sql
+++ b/tests/queries/0_stateless/03111_inner_join_group_by.sql
@@ -1,6 +1,6 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/50705
 
-set enable_analyzer=1;
+set allow_experimental_analyzer=1;
 
 SELECT
     count(s0.number),
@@ -15,4 +15,4 @@ INNER JOIN
     LIMIT 10
 ) AS s1 ON s0.number = s1.number
 GROUP BY s0.number > 5
-LIMIT 10 -- {serverError NOT_AN_AGGREGATE}
+LIMIT 10 -- {serverError NOT_AN_AGGREGATE}
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03112_analyzer_not_found_column_in_block.sql b/tests/queries/0_stateless/03112_analyzer_not_found_column_in_block.sql
index cc734b2c49a..eb07ff1d837 100644
--- a/tests/queries/0_stateless/03112_analyzer_not_found_column_in_block.sql
+++ b/tests/queries/0_stateless/03112_analyzer_not_found_column_in_block.sql
@@ -15,7 +15,7 @@ PRIMARY KEY (user_id, timestamp);
 INSERT INTO my_first_table (user_id, message, timestamp, metric) VALUES
     (101, 'Hello, ClickHouse!',                                 now(),       -1.0    ),     (102, 'Insert a lot of rows per batch',                     yesterday(), 1.41421 ),    (102, 'Sort your data based on your commonly-used queries', today(),     2.718   ),    (101, 'Granules are the smallest chunks of data read',      now() + 5,   3.14159 );
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 SELECT
     user_id
@@ -24,4 +24,4 @@ FROM my_first_table
 WHERE timestamp > 0 and user_id IN (101)
 LIMIT 2 BY user_id;
 
-DROP TABLE IF EXISTS my_first_table;
+DROP TABLE IF EXISTS my_first_table;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03113_analyzer_not_found_column_in_block_2.sql b/tests/queries/0_stateless/03113_analyzer_not_found_column_in_block_2.sql
index 4389bdf83fa..7bcc6565ea0 100644
--- a/tests/queries/0_stateless/03113_analyzer_not_found_column_in_block_2.sql
+++ b/tests/queries/0_stateless/03113_analyzer_not_found_column_in_block_2.sql
@@ -4,11 +4,11 @@ drop table if exists t;
 
 create table t  (ID String) Engine= Memory() ;
 insert into t values('a'),('b'),('c');
-
+     
 -- This optimization is disabled by default and even its description says that it could lead to
 -- inconsistencies for distributed queries.
 set optimize_if_transform_strings_to_enum=0;
-set enable_analyzer=1;
+set allow_experimental_analyzer=1;
 
 SELECT multiIf( ((multiIf(ID='' AND (ID = 'a' OR ID = 'c' OR ID = 'b'),'a','x') as y) = 'c') OR
                 (multiIf(ID='' AND (ID = 'a' OR ID = 'c' OR ID = 'b'),'a','x') = 'b') OR
@@ -18,4 +18,4 @@ SELECT multiIf( ((multiIf(ID='' AND (ID = 'a' OR ID = 'c' OR ID = 'b'),'a','x')
 FROM remote('127.0.0.{1,2}', currentDatabase(), t)
 GROUP BY alias;
 
-drop table if exists t;
+drop table if exists t;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03114_analyzer_cte_with_join.sql b/tests/queries/0_stateless/03114_analyzer_cte_with_join.sql
index 65dd3cb66b6..140197c7104 100644
--- a/tests/queries/0_stateless/03114_analyzer_cte_with_join.sql
+++ b/tests/queries/0_stateless/03114_analyzer_cte_with_join.sql
@@ -1,7 +1,7 @@
 -- Tags: no-replicated-database
 -- https://github.com/ClickHouse/ClickHouse/issues/58500
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 drop table if exists t;
 
diff --git a/tests/queries/0_stateless/03115_alias_exists_column.sql b/tests/queries/0_stateless/03115_alias_exists_column.sql
index 65fc0d8f9a9..654cdd71175 100644
--- a/tests/queries/0_stateless/03115_alias_exists_column.sql
+++ b/tests/queries/0_stateless/03115_alias_exists_column.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/44412
 
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 SELECT EXISTS(SELECT 1) AS mycheck FORMAT TSVWithNames;
diff --git a/tests/queries/0_stateless/03116_analyzer_explicit_alias_as_column_name.sql b/tests/queries/0_stateless/03116_analyzer_explicit_alias_as_column_name.sql
index d3e3a29077a..16035b8e72a 100644
--- a/tests/queries/0_stateless/03116_analyzer_explicit_alias_as_column_name.sql
+++ b/tests/queries/0_stateless/03116_analyzer_explicit_alias_as_column_name.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/39923
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 SELECT
     errors.name AS labels,
diff --git a/tests/queries/0_stateless/03117_analyzer_same_column_name_as_func.sql b/tests/queries/0_stateless/03117_analyzer_same_column_name_as_func.sql
index a3f4da89525..43f428a1bf9 100644
--- a/tests/queries/0_stateless/03117_analyzer_same_column_name_as_func.sql
+++ b/tests/queries/0_stateless/03117_analyzer_same_column_name_as_func.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/39855
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 create table x(
     a UInt64,
diff --git a/tests/queries/0_stateless/03118_analyzer_multi_join_prewhere.sql b/tests/queries/0_stateless/03118_analyzer_multi_join_prewhere.sql
index 84f89c2c647..8680e9215c3 100644
--- a/tests/queries/0_stateless/03118_analyzer_multi_join_prewhere.sql
+++ b/tests/queries/0_stateless/03118_analyzer_multi_join_prewhere.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/4596
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 CREATE TABLE a1 ( ANIMAL Nullable(String) ) engine = MergeTree order by tuple();
 insert into a1 values('CROCO');
diff --git a/tests/queries/0_stateless/03119_analyzer_window_function_in_CTE_alias.sql b/tests/queries/0_stateless/03119_analyzer_window_function_in_CTE_alias.sql
index edbb324bda2..2eb2c66b551 100644
--- a/tests/queries/0_stateless/03119_analyzer_window_function_in_CTE_alias.sql
+++ b/tests/queries/0_stateless/03119_analyzer_window_function_in_CTE_alias.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/47422
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 DROP TEMPORARY TABLE IF EXISTS test;
 CREATE TEMPORARY TABLE test (a Float32, id UInt64);
diff --git a/tests/queries/0_stateless/03120_analyzer_dist_join.sql b/tests/queries/0_stateless/03120_analyzer_dist_join.sql
index e40df56c5ac..624da39c69b 100644
--- a/tests/queries/0_stateless/03120_analyzer_dist_join.sql
+++ b/tests/queries/0_stateless/03120_analyzer_dist_join.sql
@@ -1,6 +1,6 @@
 -- Tags: no-replicated-database
 -- https://github.com/ClickHouse/ClickHouse/issues/8547
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SET distributed_foreground_insert=1;
 
 CREATE TABLE a1_replicated ON CLUSTER test_shard_localhost (
diff --git a/tests/queries/0_stateless/03120_analyzer_param_in_CTE_alias.sql b/tests/queries/0_stateless/03120_analyzer_param_in_CTE_alias.sql
index d1e3d5a2ffa..16fffae4737 100644
--- a/tests/queries/0_stateless/03120_analyzer_param_in_CTE_alias.sql
+++ b/tests/queries/0_stateless/03120_analyzer_param_in_CTE_alias.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/33000
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 SET param_test_a=30;
 
diff --git a/tests/queries/0_stateless/03121_analyzer_filed_redefenition_in_subquery.sql b/tests/queries/0_stateless/03121_analyzer_filed_redefenition_in_subquery.sql
index 891eb7aac1c..fe05259a320 100644
--- a/tests/queries/0_stateless/03121_analyzer_filed_redefenition_in_subquery.sql
+++ b/tests/queries/0_stateless/03121_analyzer_filed_redefenition_in_subquery.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/14739
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 drop table if exists test_subquery;
 
diff --git a/tests/queries/0_stateless/03122_analyzer_collate_in_window_function.sql b/tests/queries/0_stateless/03122_analyzer_collate_in_window_function.sql
index efd2e2fc873..707c5d889f7 100644
--- a/tests/queries/0_stateless/03122_analyzer_collate_in_window_function.sql
+++ b/tests/queries/0_stateless/03122_analyzer_collate_in_window_function.sql
@@ -1,6 +1,6 @@
 -- Tags: no-fasttest
 -- https://github.com/ClickHouse/ClickHouse/issues/44039
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 create table test_window_collate(c1 String, c2 String) engine=MergeTree order by c1;
 insert into test_window_collate values('1', '上海');
diff --git a/tests/queries/0_stateless/03123_analyzer_dist_join_CTE.sql b/tests/queries/0_stateless/03123_analyzer_dist_join_CTE.sql
index 4d9f5e2971a..4fb8e0b91c4 100644
--- a/tests/queries/0_stateless/03123_analyzer_dist_join_CTE.sql
+++ b/tests/queries/0_stateless/03123_analyzer_dist_join_CTE.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/22923
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SET prefer_localhost_replica=0;
 
 create table "t0" (a Int64, b Int64) engine = MergeTree() partition by a order by a;
diff --git a/tests/queries/0_stateless/03124_analyzer_nested_CTE_dist_in.sql b/tests/queries/0_stateless/03124_analyzer_nested_CTE_dist_in.sql
index be5346efa1c..406a50c6d16 100644
--- a/tests/queries/0_stateless/03124_analyzer_nested_CTE_dist_in.sql
+++ b/tests/queries/0_stateless/03124_analyzer_nested_CTE_dist_in.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/23865
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 create table table_local engine = Memory AS select * from numbers(10);
 
diff --git a/tests/queries/0_stateless/03125_analyzer_CTE_two_joins.sql b/tests/queries/0_stateless/03125_analyzer_CTE_two_joins.sql
index 934e2bc3656..f7d5bb5f195 100644
--- a/tests/queries/0_stateless/03125_analyzer_CTE_two_joins.sql
+++ b/tests/queries/0_stateless/03125_analyzer_CTE_two_joins.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/29748
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 create table events ( distinct_id String ) engine = Memory;
 
diff --git a/tests/queries/0_stateless/03126_column_not_under_group_by.sql b/tests/queries/0_stateless/03126_column_not_under_group_by.sql
index 516126c899c..890a4e823a9 100644
--- a/tests/queries/0_stateless/03126_column_not_under_group_by.sql
+++ b/tests/queries/0_stateless/03126_column_not_under_group_by.sql
@@ -1,6 +1,7 @@
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 SELECT v.x, r.a, sum(c)
 FROM (select 1 x, 2 c) AS v
 ANY LEFT JOIN (SELECT 1 x, 2 a) AS r ON v.x = r.x
 GROUP BY v.x; -- { serverError NOT_AN_AGGREGATE}
+
diff --git a/tests/queries/0_stateless/03127_system_unload_primary_key_table.reference b/tests/queries/0_stateless/03127_system_unload_primary_key_table.reference
index 2d33f7f6683..3ac6127fb21 100644
--- a/tests/queries/0_stateless/03127_system_unload_primary_key_table.reference
+++ b/tests/queries/0_stateless/03127_system_unload_primary_key_table.reference
@@ -1,8 +1,8 @@
-100000000	100000000
-100000000	100000000
-100000000	100000000
+100000000	140000000
+100000000	140000000
+100000000	140000000
 0	0
-100000000	100000000
+100000000	140000000
 0	0
 0	0
 1
diff --git a/tests/queries/0_stateless/03128_system_unload_primary_key.reference b/tests/queries/0_stateless/03128_system_unload_primary_key.reference
index 2646dc7247f..c7b40ae5b06 100644
--- a/tests/queries/0_stateless/03128_system_unload_primary_key.reference
+++ b/tests/queries/0_stateless/03128_system_unload_primary_key.reference
@@ -1,4 +1,4 @@
-100000000	100000000
-100000000	100000000
+100000000	140000000
+100000000	140000000
 0	0
 0	0
diff --git a/tests/queries/0_stateless/03129_cte_with_final.sql b/tests/queries/0_stateless/03129_cte_with_final.sql
index 2a0714ec571..01e1ca6dfb0 100644
--- a/tests/queries/0_stateless/03129_cte_with_final.sql
+++ b/tests/queries/0_stateless/03129_cte_with_final.sql
@@ -12,7 +12,7 @@ ORDER BY key;
 INSERT INTO t Values (1, 'first', '2024-04-19 01:01:01');
 INSERT INTO t Values (1, 'first', '2024-04-19 01:01:01');
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 EXPLAIN QUERY TREE passes=1
 WITH merged_test AS(
diff --git a/tests/queries/0_stateless/03130_analyzer_self_join_group_by.sql b/tests/queries/0_stateless/03130_analyzer_self_join_group_by.sql
index 81af10c4a64..66b6b99981b 100644
--- a/tests/queries/0_stateless/03130_analyzer_self_join_group_by.sql
+++ b/tests/queries/0_stateless/03130_analyzer_self_join_group_by.sql
@@ -2,7 +2,7 @@ DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (x Int32) ENGINE = MergeTree ORDER BY x;
 INSERT INTO t1 VALUES (1), (2), (3);
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT t2.x FROM t1 JOIN t1 as t2 ON t1.x = t2.x GROUP BY t1.x; -- { serverError NOT_AN_AGGREGATE }
 SELECT t2.number FROM numbers(10) as t1 JOIN numbers(10) as t2 ON t1.number = t2.number GROUP BY t1.number; -- { serverError NOT_AN_AGGREGATE }
diff --git a/tests/queries/0_stateless/03130_convert_outer_join_to_inner_join.sql b/tests/queries/0_stateless/03130_convert_outer_join_to_inner_join.sql
index b3d1827d98f..28362f1f469 100644
--- a/tests/queries/0_stateless/03130_convert_outer_join_to_inner_join.sql
+++ b/tests/queries/0_stateless/03130_convert_outer_join_to_inner_join.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET join_algorithm = 'hash';
 
 DROP TABLE IF EXISTS test_table_1;
@@ -6,18 +6,14 @@ CREATE TABLE test_table_1
 (
     id UInt64,
     value String
-) ENGINE=MergeTree ORDER BY id
-SETTINGS index_granularity = 16 # We have number of granules in the `EXPLAIN` output in reference file
-;
+) ENGINE=MergeTree ORDER BY id;
 
 DROP TABLE IF EXISTS test_table_2;
 CREATE TABLE test_table_2
 (
     id UInt64,
     value String
-) ENGINE=MergeTree ORDER BY id
-SETTINGS index_granularity = 16
-;
+) ENGINE=MergeTree ORDER BY id;
 
 INSERT INTO test_table_1 VALUES (1, 'Value_1'), (2, 'Value_2');
 INSERT INTO test_table_2 VALUES (2, 'Value_2'), (3, 'Value_3');
diff --git a/tests/queries/0_stateless/03131_hilbert_coding.sql b/tests/queries/0_stateless/03131_hilbert_coding.sql
index b16a0efad5d..ed293dc6910 100644
--- a/tests/queries/0_stateless/03131_hilbert_coding.sql
+++ b/tests/queries/0_stateless/03131_hilbert_coding.sql
@@ -46,7 +46,6 @@ drop table if exists hilbert_numbers_1_03131;
 
 select '----- ERRORS -----';
 select hilbertEncode(); -- { serverError TOO_FEW_ARGUMENTS_FOR_FUNCTION }
-select hilbertEncode(1, 2, 3); -- { serverError TOO_MANY_ARGUMENTS_FOR_FUNCTION }
 select hilbertDecode(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 select hilbertEncode('text'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 select hilbertDecode('text', 'text'); -- { serverError ILLEGAL_COLUMN }
diff --git a/tests/queries/0_stateless/03132_rewrite_aggregate_function_with_if_implicit_cast.reference b/tests/queries/0_stateless/03132_rewrite_aggregate_function_with_if_implicit_cast.reference
index 8289ab68ae4..070a6c9e21c 100644
--- a/tests/queries/0_stateless/03132_rewrite_aggregate_function_with_if_implicit_cast.reference
+++ b/tests/queries/0_stateless/03132_rewrite_aggregate_function_with_if_implicit_cast.reference
@@ -30,14 +30,14 @@ QUERY id: 0
       FUNCTION id: 15, function_name: toTypeName, function_type: ordinary, result_type: String
         ARGUMENTS
           LIST id: 16, nodes: 1
-            FUNCTION id: 17, function_name: anyIf, function_type: aggregate, result_type: Nullable(Int128)
+            FUNCTION id: 2, function_name: anyIf, function_type: aggregate, result_type: Nullable(Int128)
               ARGUMENTS
-                LIST id: 18, nodes: 2
-                  FUNCTION id: 19, function_name: _CAST, function_type: ordinary, result_type: Nullable(Int128)
+                LIST id: 3, nodes: 2
+                  FUNCTION id: 4, function_name: _CAST, function_type: ordinary, result_type: Nullable(Int128)
                     ARGUMENTS
-                      LIST id: 20, nodes: 2
+                      LIST id: 5, nodes: 2
                         COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
-                        CONSTANT id: 21, constant_value: \'Nullable(Int128)\', constant_value_type: String
+                        CONSTANT id: 8, constant_value: \'Nullable(Int128)\', constant_value_type: String
                   FUNCTION id: 9, function_name: equals, function_type: ordinary, result_type: UInt8
                     ARGUMENTS
                       LIST id: 10, nodes: 2
@@ -50,8 +50,8 @@ QUERY id: 0
   JOIN TREE
     TABLE_FUNCTION id: 7, alias: __table1, table_function_name: numbers
       ARGUMENTS
-        LIST id: 22, nodes: 1
-          CONSTANT id: 23, constant_value: UInt64_100, constant_value_type: UInt8
+        LIST id: 17, nodes: 1
+          CONSTANT id: 18, constant_value: UInt64_100, constant_value_type: UInt8
 SELECT any(if((number % 10) = 5, CAST(NULL, 'Nullable(Int128)'), number)) AS a, toTypeName(a) FROM numbers(100) AS a;
 0	Nullable(Int128)
 EXPLAIN QUERY TREE SELECT any(if((number % 10) = 5, CAST(NULL, 'Nullable(Int128)'), number)) AS a, toTypeName(a) FROM numbers(100);
@@ -84,17 +84,17 @@ QUERY id: 0
       FUNCTION id: 17, function_name: toTypeName, function_type: ordinary, result_type: String
         ARGUMENTS
           LIST id: 18, nodes: 1
-            FUNCTION id: 19, function_name: anyIf, function_type: aggregate, result_type: Nullable(Int128)
+            FUNCTION id: 2, function_name: anyIf, function_type: aggregate, result_type: Nullable(Int128)
               ARGUMENTS
-                LIST id: 20, nodes: 2
-                  FUNCTION id: 21, function_name: _CAST, function_type: ordinary, result_type: Nullable(Int128)
+                LIST id: 3, nodes: 2
+                  FUNCTION id: 4, function_name: _CAST, function_type: ordinary, result_type: Nullable(Int128)
                     ARGUMENTS
-                      LIST id: 22, nodes: 2
+                      LIST id: 5, nodes: 2
                         COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
-                        CONSTANT id: 23, constant_value: \'Nullable(Int128)\', constant_value_type: String
-                  FUNCTION id: 24, function_name: not, function_type: ordinary, result_type: UInt8
+                        CONSTANT id: 8, constant_value: \'Nullable(Int128)\', constant_value_type: String
+                  FUNCTION id: 9, function_name: not, function_type: ordinary, result_type: UInt8
                     ARGUMENTS
-                      LIST id: 25, nodes: 1
+                      LIST id: 10, nodes: 1
                         FUNCTION id: 11, function_name: equals, function_type: ordinary, result_type: UInt8
                           ARGUMENTS
                             LIST id: 12, nodes: 2
@@ -107,5 +107,5 @@ QUERY id: 0
   JOIN TREE
     TABLE_FUNCTION id: 7, alias: __table1, table_function_name: numbers
       ARGUMENTS
-        LIST id: 26, nodes: 1
-          CONSTANT id: 27, constant_value: UInt64_100, constant_value_type: UInt8
+        LIST id: 19, nodes: 1
+          CONSTANT id: 20, constant_value: UInt64_100, constant_value_type: UInt8
diff --git a/tests/queries/0_stateless/03132_rewrite_aggregate_function_with_if_implicit_cast.sql b/tests/queries/0_stateless/03132_rewrite_aggregate_function_with_if_implicit_cast.sql
index 7b7237ea7d1..4e8096fbed1 100644
--- a/tests/queries/0_stateless/03132_rewrite_aggregate_function_with_if_implicit_cast.sql
+++ b/tests/queries/0_stateless/03132_rewrite_aggregate_function_with_if_implicit_cast.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 -- { echoOn }
 SELECT concat(1, sum(if(0, toUInt128(concat('%', toLowCardinality(toNullable(1)), toUInt256(1))), materialize(0))));
 SELECT any(if((number % 10) = 5, number, CAST(NULL, 'Nullable(Int128)'))) AS a, toTypeName(a) FROM numbers(100) AS a;
diff --git a/tests/queries/0_stateless/03132_sqlancer_union_all.sql b/tests/queries/0_stateless/03132_sqlancer_union_all.sql
index 2502ce31ec3..576da9e53d5 100644
--- a/tests/queries/0_stateless/03132_sqlancer_union_all.sql
+++ b/tests/queries/0_stateless/03132_sqlancer_union_all.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS t0;
 DROP TABLE IF EXISTS t1;
diff --git a/tests/queries/0_stateless/03140_client_subsequent_external_tables.sh b/tests/queries/0_stateless/03140_client_subsequent_external_tables.sh
index 64398a515f5..af75bf42172 100755
--- a/tests/queries/0_stateless/03140_client_subsequent_external_tables.sh
+++ b/tests/queries/0_stateless/03140_client_subsequent_external_tables.sh
@@ -7,7 +7,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 INPUT_FILE=$CUR_DIR/$CLICKHOUSE_DATABASE.tsv
 echo "foo" > "$INPUT_FILE"
 
-$CLICKHOUSE_CLIENT --external --file="$INPUT_FILE" --name=t --structure='x String' -m -q "
+$CLICKHOUSE_CLIENT --external --file="$INPUT_FILE" --name=t --structure='x String' -nm -q "
 select * from t;
 select * from t;
 "
diff --git a/tests/queries/0_stateless/03142_untuple_crash.sql b/tests/queries/0_stateless/03142_untuple_crash.sql
index 45106973271..ac5dbba0de1 100644
--- a/tests/queries/0_stateless/03142_untuple_crash.sql
+++ b/tests/queries/0_stateless/03142_untuple_crash.sql
@@ -1,2 +1,2 @@
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SELECT untuple(x -> 0) -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
diff --git a/tests/queries/0_stateless/03142_window_function_limit_by.sql b/tests/queries/0_stateless/03142_window_function_limit_by.sql
index a3f6b56aee5..44dd890db41 100644
--- a/tests/queries/0_stateless/03142_window_function_limit_by.sql
+++ b/tests/queries/0_stateless/03142_window_function_limit_by.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 
 -- https://github.com/ClickHouse/ClickHouse/issues/55965
@@ -8,7 +8,7 @@ CREATE TABLE error_win_func
     `k` String,
     `in` UInt64,
     `out` UInt64
-)
+) 
 ENGINE = MergeTree
 ORDER BY k AS
 SELECT * from VALUES (('a', 2, 4), ('a', 4, 2), ('a', 6, 3), ('a', 8, 4));
@@ -16,7 +16,7 @@ SELECT * from VALUES (('a', 2, 4), ('a', 4, 2), ('a', 6, 3), ('a', 8, 4));
 SELECT
     k,
     in / out AS ratio,
-    count(*) OVER w AS count_rows_w
+    count(*) OVER w AS count_rows_w    
 FROM error_win_func
 WINDOW
     w AS (ROWS BETWEEN CURRENT ROW AND 3 FOLLOWING)
@@ -38,3 +38,4 @@ WHERE st IN ('x', 'y')
 LIMIT 1 BY m;
 
 DROP TABLE t;
+
diff --git a/tests/queries/0_stateless/03143_asof_join_ddb_long.reference b/tests/queries/0_stateless/03143_asof_join_ddb_long.reference
index ae7f7c805f2..2850a8aba98 100644
--- a/tests/queries/0_stateless/03143_asof_join_ddb_long.reference
+++ b/tests/queries/0_stateless/03143_asof_join_ddb_long.reference
@@ -1,2 +1,2 @@
-7999995751397	4000032
-7999995751397	4000032
+49999983751397	10000032
+49999983751397	10000032
diff --git a/tests/queries/0_stateless/03143_asof_join_ddb_long.sql b/tests/queries/0_stateless/03143_asof_join_ddb_long.sql
index c93e6618ba9..0b17ade5d1c 100644
--- a/tests/queries/0_stateless/03143_asof_join_ddb_long.sql
+++ b/tests/queries/0_stateless/03143_asof_join_ddb_long.sql
@@ -1,4 +1,4 @@
--- Tags: long, no-random-merge-tree-settings, no-distributed-cache
+-- Tags: long, no-random-merge-tree-settings
 -- no-random-merge-tree-settings - times out in private
 
 DROP TABLE IF EXISTS build;
@@ -12,7 +12,7 @@ AS
         toDateTime('1990-03-21 13:00:00') + INTERVAL number MINUTE AS begin,
         number % 4 AS key,
         number AS value
-    FROM numbers(0, 4000000);
+    FROM numbers(0, 10000000);
 
 CREATE TABLE skewed_probe ENGINE = MergeTree ORDER BY (key, begin)
 AS
@@ -34,9 +34,8 @@ AS
     SELECT
         toDateTime('1990-03-21 13:00:01') + INTERVAL number MINUTE AS begin,
         3 AS key
-    FROM numbers(0, 4000000);
+    FROM numbers(0, 10000000);
 
-SET max_rows_to_read = 0;
 
 SELECT SUM(value), COUNT(*)
 FROM skewed_probe
diff --git a/tests/queries/0_stateless/03143_cte_scope.sql b/tests/queries/0_stateless/03143_cte_scope.sql
index cf4478e2ff9..1b1d9444651 100644
--- a/tests/queries/0_stateless/03143_cte_scope.sql
+++ b/tests/queries/0_stateless/03143_cte_scope.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/56287
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 DROP TABLE IF EXISTS tmp_a;
 DROP TABLE IF EXISTS tmp_b;
 
diff --git a/tests/queries/0_stateless/03143_group_by_constant_secondary.sql b/tests/queries/0_stateless/03143_group_by_constant_secondary.sql
index 099160dd522..030e3212748 100644
--- a/tests/queries/0_stateless/03143_group_by_constant_secondary.sql
+++ b/tests/queries/0_stateless/03143_group_by_constant_secondary.sql
@@ -3,6 +3,6 @@ SELECT count()
 FROM remote(test_cluster_two_shards, system, one)
 GROUP BY 'hi'
 SETTINGS
-    enable_analyzer = 1,
+    allow_experimental_analyzer = 1,
     group_by_two_level_threshold = 1,
     group_by_two_level_threshold_bytes = 33950592;
diff --git a/tests/queries/0_stateless/03143_parallel_replicas_mat_view_bug.sql b/tests/queries/0_stateless/03143_parallel_replicas_mat_view_bug.sql
index 02a8a2f3ce0..97ed29802c7 100644
--- a/tests/queries/0_stateless/03143_parallel_replicas_mat_view_bug.sql
+++ b/tests/queries/0_stateless/03143_parallel_replicas_mat_view_bug.sql
@@ -2,7 +2,7 @@ DROP TABLE IF EXISTS mv_table;
 DROP TABLE IF EXISTS null_table;
 
 SET cluster_for_parallel_replicas='parallel_replicas', max_parallel_replicas=4, allow_experimental_parallel_reading_from_replicas=1;
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 CREATE TABLE null_table (str String) ENGINE = Null;
 CREATE MATERIALIZED VIEW mv_table (str String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/03143_parallel_replicas_mat_view_bug', '{replica}') ORDER BY str AS SELECT str AS str FROM null_table;
diff --git a/tests/queries/0_stateless/03143_prewhere_profile_events.sh b/tests/queries/0_stateless/03143_prewhere_profile_events.sh
index 6a6b993e5f8..00daa0fe7cc 100755
--- a/tests/queries/0_stateless/03143_prewhere_profile_events.sh
+++ b/tests/queries/0_stateless/03143_prewhere_profile_events.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -nq "
   DROP TABLE IF EXISTS t;
 
   CREATE TABLE t(a UInt32, b UInt32, c UInt32, d UInt32) ENGINE=MergeTree ORDER BY a SETTINGS min_bytes_for_wide_part=0, min_rows_for_wide_part=0;
@@ -25,7 +25,7 @@ client_opts=(
   --max_threads    8
 )
 
-${CLICKHOUSE_CLIENT} "${client_opts[@]}" --query_id "$query_id_1" -q "
+${CLICKHOUSE_CLIENT} "${client_opts[@]}" --query_id "$query_id_1" -nq "
   SELECT *
     FROM t
 PREWHERE (b % 8192) = 42
@@ -33,7 +33,7 @@ PREWHERE (b % 8192) = 42
   FORMAT Null
 "
 
-${CLICKHOUSE_CLIENT} "${client_opts[@]}" --query_id "$query_id_2" -q "
+${CLICKHOUSE_CLIENT} "${client_opts[@]}" --query_id "$query_id_2" -nq "
   SELECT *
     FROM t
 PREWHERE (b % 8192) = 42 AND (c % 8192) = 42
@@ -42,7 +42,7 @@ PREWHERE (b % 8192) = 42 AND (c % 8192) = 42
 settings enable_multiple_prewhere_read_steps=1;
 "
 
-${CLICKHOUSE_CLIENT} "${client_opts[@]}" --query_id "$query_id_3" -q "
+${CLICKHOUSE_CLIENT} "${client_opts[@]}" --query_id "$query_id_3" -nq "
   SELECT *
     FROM t
 PREWHERE (b % 8192) = 42 AND (c % 16384) = 42
@@ -51,7 +51,7 @@ PREWHERE (b % 8192) = 42 AND (c % 16384) = 42
 settings enable_multiple_prewhere_read_steps=0;
 "
 
-${CLICKHOUSE_CLIENT} "${client_opts[@]}" --query_id "$query_id_4" -q "
+${CLICKHOUSE_CLIENT} "${client_opts[@]}" --query_id "$query_id_4" -nq "
   SELECT b, c
     FROM t
 PREWHERE (b % 8192) = 42 AND (c % 8192) = 42
@@ -59,7 +59,7 @@ PREWHERE (b % 8192) = 42 AND (c % 8192) = 42
 settings enable_multiple_prewhere_read_steps=1;
 "
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -nq "
   SYSTEM FLUSH LOGS;
 
   -- 52503 which is 43 * number of granules, 10000000
diff --git a/tests/queries/0_stateless/03144_aggregate_states_with_different_types.sql b/tests/queries/0_stateless/03144_aggregate_states_with_different_types.sql
index 4445d5b8449..5bb4a8c9c9c 100644
--- a/tests/queries/0_stateless/03144_aggregate_states_with_different_types.sql
+++ b/tests/queries/0_stateless/03144_aggregate_states_with_different_types.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 select * APPLY hex
 from (
diff --git a/tests/queries/0_stateless/03144_invalid_filter.sql b/tests/queries/0_stateless/03144_invalid_filter.sql
index 5b434972cc7..deb8d7b96b3 100644
--- a/tests/queries/0_stateless/03144_invalid_filter.sql
+++ b/tests/queries/0_stateless/03144_invalid_filter.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/48049
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 CREATE TABLE test_table (`id` UInt64, `value` String) ENGINE = TinyLog() AS Select number, number::String from numbers(10);
 
diff --git a/tests/queries/0_stateless/03145_non_loaded_projection_backup.sh b/tests/queries/0_stateless/03145_non_loaded_projection_backup.sh
index 4e7b318e202..7df2118ad0c 100755
--- a/tests/queries/0_stateless/03145_non_loaded_projection_backup.sh
+++ b/tests/queries/0_stateless/03145_non_loaded_projection_backup.sh
@@ -4,9 +4,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 drop table if exists tp_1;
-create table tp_1 (x Int32, y Int32, projection p (select x, y order by x)) engine = MergeTree order by y partition by intDiv(y, 100) settings max_parts_to_merge_at_once=1;
+create table tp_1 (x Int32, y Int32, projection p (select x, y order by x)) engine = MergeTree order by y partition by intDiv(y, 100);
+system stop merges tp_1;
 insert into tp_1 select number, number from numbers(3);
 
 set mutations_sync = 2;
@@ -25,7 +26,7 @@ alter table tp_1 drop projection pp;
 alter table tp_1 attach partition '0';
 "
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 set send_logs_level='fatal';
 check table tp_1 settings check_query_single_value_result = 0;" | grep -o "Found unexpected projection directories: pp.proj"
 
@@ -34,19 +35,20 @@ $CLICKHOUSE_CLIENT -q "
 backup table tp_1 to Disk('backups', '$backup_id');
 " | grep -o "BACKUP_CREATED"
 
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 set send_logs_level='fatal';
 drop table tp_1;
 restore table tp_1 from Disk('backups', '$backup_id');
+system stop merges tp_1;
 " | grep -o "RESTORED"
 
 $CLICKHOUSE_CLIENT -q "select count() from tp_1;"
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 set send_logs_level='fatal';
 check table tp_1 settings check_query_single_value_result = 0;" | grep -o "Found unexpected projection directories: pp.proj"
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 set send_logs_level='fatal';
 check table tp_1"
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -nm -q "
 set send_logs_level='fatal';
 drop table tp_1"
diff --git a/tests/queries/0_stateless/03146_bug47862.sql b/tests/queries/0_stateless/03146_bug47862.sql
index 0f411400618..918f2316bea 100644
--- a/tests/queries/0_stateless/03146_bug47862.sql
+++ b/tests/queries/0_stateless/03146_bug47862.sql
@@ -9,4 +9,4 @@ FROM (
     WHERE val_idx != 0
 )
 WHERE cast_res > 0
-SETTINGS enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/03146_tpc_ds_grouping.sql b/tests/queries/0_stateless/03146_tpc_ds_grouping.sql
index cb290086b51..f48c40e9bc4 100644
--- a/tests/queries/0_stateless/03146_tpc_ds_grouping.sql
+++ b/tests/queries/0_stateless/03146_tpc_ds_grouping.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/46335
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SELECT
     key_a + key_b AS d,
     rank() OVER () AS f
diff --git a/tests/queries/0_stateless/03147_system_columns_access_checks.sh b/tests/queries/0_stateless/03147_system_columns_access_checks.sh
index 9887c29cff7..b027ea28504 100755
--- a/tests/queries/0_stateless/03147_system_columns_access_checks.sh
+++ b/tests/queries/0_stateless/03147_system_columns_access_checks.sh
@@ -18,7 +18,7 @@ seq 1 $NUM_TABLES | xargs -P "${THREADS}" -I{} bash -c "
 "
 echo
 
-$CLICKHOUSE_CLIENT "
+$CLICKHOUSE_CLIENT --multiquery "
 DROP USER IF EXISTS test_03147;
 CREATE USER test_03147;
 GRANT SELECT (end) ON ${CLICKHOUSE_DATABASE}.test1 TO test_03147;
@@ -31,6 +31,6 @@ GRANT SELECT (end) ON ${CLICKHOUSE_DATABASE}.test1 TO test_03147;
 # The test could succeed even on the previous version, but it will show up as being too slow.
 $CLICKHOUSE_CLIENT --user test_03147 --query "SELECT name FROM system.columns WHERE database = currentDatabase()"
 
-$CLICKHOUSE_CLIENT "
+$CLICKHOUSE_CLIENT --multiquery "
 DROP USER test_03147;
 "
diff --git a/tests/queries/0_stateless/03147_table_function_loop.sql b/tests/queries/0_stateless/03147_table_function_loop.sql
index e10155fe8b3..aa3c8e2def5 100644
--- a/tests/queries/0_stateless/03147_table_function_loop.sql
+++ b/tests/queries/0_stateless/03147_table_function_loop.sql
@@ -3,11 +3,14 @@
 SELECT * FROM loop(numbers(3)) LIMIT 10;
 SELECT * FROM loop (numbers(3)) LIMIT 10 settings max_block_size = 1;
 
-CREATE TABLE t (n Int8) ENGINE=MergeTree ORDER BY n;
-INSERT INTO t SELECT * FROM numbers(10);
+DROP DATABASE IF EXISTS 03147_db;
+CREATE DATABASE IF NOT EXISTS 03147_db;
+CREATE TABLE 03147_db.t (n Int8) ENGINE=MergeTree ORDER BY n;
+INSERT INTO 03147_db.t SELECT * FROM numbers(10);
+USE 03147_db;
 
-SELECT * FROM loop({CLICKHOUSE_DATABASE:Identifier}.t) LIMIT 15;
+SELECT * FROM loop(03147_db.t) LIMIT 15;
 SELECT * FROM loop(t) LIMIT 15;
-SELECT * FROM loop({CLICKHOUSE_DATABASE:Identifier}, t) LIMIT 15;
+SELECT * FROM loop(03147_db, t) LIMIT 15;
 
 SELECT * FROM loop('', '') -- { serverError UNKNOWN_TABLE }
diff --git a/tests/queries/0_stateless/03148_async_queries_in_query_log_errors.reference b/tests/queries/0_stateless/03148_async_queries_in_query_log_errors.reference
index 7cc2efd50ec..685d28268f6 100644
--- a/tests/queries/0_stateless/03148_async_queries_in_query_log_errors.reference
+++ b/tests/queries/0_stateless/03148_async_queries_in_query_log_errors.reference
@@ -4,7 +4,7 @@ Row 1:
 ──────
 database:                 default
 table:                    async_insert_landing
-query:                    INSERT INTO default.async_insert_landing (id) SETTINGS wait_for_async_insert = 0, async_insert = 1 FORMAT Values
+query:                    INSERT INTO default.async_insert_landing SETTINGS wait_for_async_insert = 0, async_insert = 1 FORMAT Values
 format:                   Values
 error:                    DB::Exc*****on: Cannot parse string 'Invalid' as UInt32:
 populated_flush_query_id: 1
@@ -18,7 +18,7 @@ written_rows:   0
 written_bytes:  0
 result_rows:    0
 result_bytes:   0
-query:          INSERT INTO default.async_insert_landing (id) SETTINGS wait_for_async_insert = 0, async_insert = 1 FORMAT Values
+query:          INSERT INTO default.async_insert_landing SETTINGS wait_for_async_insert = 0, async_insert = 1 FORMAT Values
 query_kind:     AsyncInsertFlush
 databases:      ['default']
 tables:         ['default.async_insert_landing']
@@ -35,7 +35,7 @@ written_rows:   0
 written_bytes:  0
 result_rows:    0
 result_bytes:   0
-query:          INSERT INTO default.async_insert_landing (id) SETTINGS wait_for_async_insert = 0, async_insert = 1 FORMAT Values
+query:          INSERT INTO default.async_insert_landing SETTINGS wait_for_async_insert = 0, async_insert = 1 FORMAT Values
 query_kind:     AsyncInsertFlush
 databases:      ['default']
 tables:         ['default.async_insert_landing']
diff --git a/tests/queries/0_stateless/03148_async_queries_in_query_log_errors.sh b/tests/queries/0_stateless/03148_async_queries_in_query_log_errors.sh
index 9c290133bf9..2b4b96a9cbf 100755
--- a/tests/queries/0_stateless/03148_async_queries_in_query_log_errors.sh
+++ b/tests/queries/0_stateless/03148_async_queries_in_query_log_errors.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/03148_query_log_used_dictionaries.sql b/tests/queries/0_stateless/03148_query_log_used_dictionaries.sql
index 75b7489ae5b..1b647a7ee62 100644
--- a/tests/queries/0_stateless/03148_query_log_used_dictionaries.sql
+++ b/tests/queries/0_stateless/03148_query_log_used_dictionaries.sql
@@ -15,7 +15,7 @@ SELECT
     dictGet('03148_dictionary', 'name', number) as dict_value
 FROM numbers(1)
 SETTINGS
-    enable_analyzer = 1,
+    allow_experimental_analyzer = 1,
     log_comment = 'simple_with_analyzer'
 FORMAT Null;
 
@@ -34,7 +34,7 @@ FROM (
     FROM numbers(1)
 ) t
 SETTINGS
-    enable_analyzer = 1,
+    allow_experimental_analyzer = 1,
     log_comment = 'nested_with_analyzer'
 FORMAT Null;
 
@@ -50,7 +50,7 @@ SELECT
     dictGet('03148_dictionary', 'name', number) as dict_value
 FROM numbers(1)
 SETTINGS
-    enable_analyzer = 0,
+    allow_experimental_analyzer = 0,
     log_comment = 'simple_without_analyzer'
 FORMAT Null;
 
@@ -69,7 +69,7 @@ FROM (
     FROM numbers(1)
 ) t
 SETTINGS
-    enable_analyzer = 0,
+    allow_experimental_analyzer = 0,
     log_comment = 'nested_without_analyzer'
 FORMAT Null;
 
diff --git a/tests/queries/0_stateless/03148_setting_max_streams_to_max_threads_ratio_overflow.sql b/tests/queries/0_stateless/03148_setting_max_streams_to_max_threads_ratio_overflow.sql
index 38f25f60e09..af326c15bd8 100644
--- a/tests/queries/0_stateless/03148_setting_max_streams_to_max_threads_ratio_overflow.sql
+++ b/tests/queries/0_stateless/03148_setting_max_streams_to_max_threads_ratio_overflow.sql
@@ -7,8 +7,8 @@ CREATE TABLE test_table
 
 INSERT INTO test_table VALUES (0, 'Value_0');
 
-SELECT * FROM test_table SETTINGS max_threads = 1025, max_streams_to_max_threads_ratio = -9223372036854775808, enable_analyzer = 1; -- { serverError PARAMETER_OUT_OF_BOUND }
+SELECT * FROM test_table SETTINGS max_threads = 1025, max_streams_to_max_threads_ratio = -9223372036854775808, allow_experimental_analyzer = 1; -- { serverError PARAMETER_OUT_OF_BOUND }
 
-SELECT * FROM test_table SETTINGS max_threads = 1025, max_streams_to_max_threads_ratio = -9223372036854775808, enable_analyzer = 0; -- { serverError PARAMETER_OUT_OF_BOUND }
+SELECT * FROM test_table SETTINGS max_threads = 1025, max_streams_to_max_threads_ratio = -9223372036854775808, allow_experimental_analyzer = 0; -- { serverError PARAMETER_OUT_OF_BOUND }
 
 DROP TABLE test_table;
diff --git a/tests/queries/0_stateless/03149_numbers_max_block_size_zero.sh b/tests/queries/0_stateless/03149_numbers_max_block_size_zero.sh
index 7f606d889a7..6f70a0d2536 100755
--- a/tests/queries/0_stateless/03149_numbers_max_block_size_zero.sh
+++ b/tests/queries/0_stateless/03149_numbers_max_block_size_zero.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
-# shellcheck disable=SC2266
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -q "SELECT count(*) FROM numbers(10) AS a, numbers(11) AS b, numbers(12) AS c SETTINGS max_block_size = 0" 2>&1 |
-    [ "$(grep -c "Sanity check: 'max_block_size' cannot be 0. Set to default value")" -gt 0 ] && echo "OK" || echo "FAIL"
+$CLICKHOUSE_CLIENT -q "SELECT count(*) FROM numbers(10) AS a, numbers(11) AS b, numbers(12) AS c SETTINGS max_block_size = 0" 2>&1 | grep -q "Sanity check: 'max_block_size' cannot be 0. Set to default value" && echo "OK" || echo "FAIL"
diff --git a/tests/queries/0_stateless/03150_dynamic_type_mv_insert.reference b/tests/queries/0_stateless/03150_dynamic_type_mv_insert.reference
index 370e6352657..0b76d30953e 100644
--- a/tests/queries/0_stateless/03150_dynamic_type_mv_insert.reference
+++ b/tests/queries/0_stateless/03150_dynamic_type_mv_insert.reference
@@ -1,35 +1,35 @@
 1	2024-01-01	Date
 2	1704056400	Decimal(18, 3)
-3	1	Float32
-4	2	Float64
+3	1	String
+4	2	String
 
 1	2024-01-01	Date
 1	2024-01-01	Date
 2	1704056400	Decimal(18, 3)
 2	1704056400	Decimal(18, 3)
-3	1	Float32
-3	1	Float32
-4	2	Float64
-4	2	Float64
+3	1	String
+3	1	String
+4	2	String
+4	2	String
+
+1	2024-01-01	String
+1	2024-01-01	String
+2	1704056400	String
+2	1704056400	String
+3	1	String
+3	1	String
+4	2	String
+4	2	String
 
 1	2024-01-01	Date
-1	2024-01-01	Date
+1	2024-01-01	String
+1	2024-01-01	String
 2	1704056400	Decimal(18, 3)
-2	1704056400	Decimal(18, 3)
-3	1	Float32
-3	1	Float32
-4	2	Float64
-4	2	Float64
-
-1	2024-01-01	Date
-1	2024-01-01	Date
-1	2024-01-01	Date
-2	1704056400	Decimal(18, 3)
-2	1704056400	Decimal(18, 3)
-2	1704056400	Decimal(18, 3)
-3	1	Float32
-3	1	Float32
-3	1	Float32
-4	2	Float64
-4	2	Float64
-4	2	Float64
+2	1704056400	String
+2	1704056400	String
+3	1	String
+3	1	String
+3	1	String
+4	2	String
+4	2	String
+4	2	String
diff --git a/tests/queries/0_stateless/03150_dynamic_type_mv_insert.sql b/tests/queries/0_stateless/03150_dynamic_type_mv_insert.sql
index 71d5dd4abd1..ad5ea9512c6 100644
--- a/tests/queries/0_stateless/03150_dynamic_type_mv_insert.sql
+++ b/tests/queries/0_stateless/03150_dynamic_type_mv_insert.sql
@@ -1,6 +1,5 @@
 SET allow_experimental_dynamic_type=1;
 
-DROP TABLE IF EXISTS null_table;
 CREATE TABLE null_table
 (
     n1 UInt8,
@@ -8,11 +7,9 @@ CREATE TABLE null_table
 )
 ENGINE = Null;
 
-DROP VIEW IF EXISTS dummy_rmv;
 CREATE MATERIALIZED VIEW dummy_rmv TO to_table
 AS SELECT * FROM null_table;
 
-DROP TABLE IF EXISTS to_table;
 CREATE TABLE to_table
 (
     n1 UInt8,
@@ -35,7 +32,3 @@ select '';
 ALTER TABLE to_table MODIFY COLUMN n2 Dynamic(max_types=10);
 INSERT INTO null_table ( n1, n2 ) VALUES (1, '2024-01-01'), (2, toDateTime64('2024-01-01', 3, 'Asia/Istanbul')), (3, toFloat32(1)), (4, toFloat64(2));
 SELECT *, dynamicType(n2) FROM to_table ORDER BY ALL;
-
-DROP TABLE null_table;
-DROP VIEW dummy_rmv;
-DROP TABLE to_table;
diff --git a/tests/queries/0_stateless/03150_grouping_sets_use_nulls_pushdown.sql b/tests/queries/0_stateless/03150_grouping_sets_use_nulls_pushdown.sql
index c39143216d4..a0bd1381351 100644
--- a/tests/queries/0_stateless/03150_grouping_sets_use_nulls_pushdown.sql
+++ b/tests/queries/0_stateless/03150_grouping_sets_use_nulls_pushdown.sql
@@ -21,21 +21,21 @@ SELECT *
 FROM ( SELECT day_ FROM test_grouping_sets_predicate GROUP BY GROUPING SETS ( (day_, type_1), (day_) ) )
 WHERE day_ = '2023-01-05'
 ORDER BY *
-SETTINGS enable_analyzer=1;
+SETTINGS allow_experimental_analyzer=1;
 
 SELECT *
 FROM ( SELECT * FROM test_grouping_sets_predicate GROUP BY GROUPING SETS ( (day_, type_1), (day_) ) )
 WHERE day_ = '2023-01-05'
 GROUP BY *
 ORDER BY ALL
-SETTINGS enable_analyzer=1;
+SETTINGS allow_experimental_analyzer=1;
 
 SELECT *
 FROM ( SELECT * FROM test_grouping_sets_predicate GROUP BY GROUPING SETS ( (*), (day_) ) )
 WHERE day_ = '2023-01-05'
 GROUP BY GROUPING SETS (*)
 ORDER BY type_1
-SETTINGS enable_analyzer=1;
+SETTINGS allow_experimental_analyzer=1;
 
 SELECT *
 FROM ( SELECT day_, COUNT(*) FROM test_grouping_sets_predicate GROUP BY GROUPING SETS ( (day_, type_1), (day_) ) )
diff --git a/tests/queries/0_stateless/03150_infer_type_variant.reference b/tests/queries/0_stateless/03150_infer_type_variant.reference
deleted file mode 100644
index a43fa1e1227..00000000000
--- a/tests/queries/0_stateless/03150_infer_type_variant.reference
+++ /dev/null
@@ -1,31 +0,0 @@
-   ┏━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-   ┃ arr                ┃ toTypeName(arr)                                      ┃
-   ┡━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
-1. │ ['1','Hello',(32)] │ Array(Variant(String, Tuple(
-    a Nullable(Int64)))) │
-   └────────────────────┴──────────────────────────────────────────────────────┘
-   ┏━━━━━━━┳━━━━━━━━━━━━━━━━━━┓
-   ┃ x     ┃ toTypeName(x)    ┃
-   ┡━━━━━━━╇━━━━━━━━━━━━━━━━━━┩
-1. │ 42    │ Nullable(String) │
-   ├───────┼──────────────────┤
-2. │ Hello │ Nullable(String) │
-   └───────┴──────────────────┘
-   ┏━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-   ┃ x       ┃ toTypeName(x)                                                 ┃
-   ┡━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
-1. │ [1,2,3] │ Variant(Array(Nullable(Int64)), Tuple(
-    a Nullable(Int64))) │
-   ├─────────┼───────────────────────────────────────────────────────────────┤
-2. │ (42)    │ Variant(Array(Nullable(Int64)), Tuple(
-    a Nullable(Int64))) │
-   └─────────┴───────────────────────────────────────────────────────────────┘
-   ┏━━━━┳━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-   ┃ c1 ┃ toTypeName(c1)  ┃ c2           ┃ toTypeName(c2)                          ┃
-   ┡━━━━╇━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
-1. │  1 │ Nullable(Int64) │ Hello World! │ Variant(Array(Nullable(Int64)), String) │
-   ├────┼─────────────────┼──────────────┼─────────────────────────────────────────┤
-2. │  2 │ Nullable(Int64) │ [1,2,3]      │ Variant(Array(Nullable(Int64)), String) │
-   ├────┼─────────────────┼──────────────┼─────────────────────────────────────────┤
-3. │  3 │ Nullable(Int64) │ 2020-01-01   │ Variant(Array(Nullable(Int64)), String) │
-   └────┴─────────────────┴──────────────┴─────────────────────────────────────────┘
diff --git a/tests/queries/0_stateless/03150_infer_type_variant.sql b/tests/queries/0_stateless/03150_infer_type_variant.sql
deleted file mode 100644
index 45126ccd471..00000000000
--- a/tests/queries/0_stateless/03150_infer_type_variant.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-SET input_format_try_infer_variants=1;
-SELECT arr, toTypeName(arr) FROM format('JSONEachRow', '{"arr" : [1, "Hello", {"a" : 32}]}') FORMAT Pretty;
-SELECT x, toTypeName(x) FROM format('JSONEachRow', '{"x" : 42}, {"x" : "Hello"}') FORMAT Pretty;
-SELECT x, toTypeName(x) FROM format('JSONEachRow', '{"x" : [1, 2, 3]}, {"x" : {"a" : 42}}') FORMAT Pretty;
-SELECT c1, toTypeName(c1), c2, toTypeName(c2) FROM format('CSV', '1,Hello World!\n2,"[1,2,3]"\n3,"2020-01-01"\n') FORMAT Pretty;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03151_analyzer_view_read_only_necessary_columns.sql b/tests/queries/0_stateless/03151_analyzer_view_read_only_necessary_columns.sql
index ac86a8705d5..40204b5cd03 100644
--- a/tests/queries/0_stateless/03151_analyzer_view_read_only_necessary_columns.sql
+++ b/tests/queries/0_stateless/03151_analyzer_view_read_only_necessary_columns.sql
@@ -8,7 +8,7 @@ CREATE TABLE test_table
 DROP VIEW IF EXISTS test_view;
 CREATE VIEW test_view AS SELECT id, value FROM test_table;
 
-EXPLAIN header = 1 SELECT sum(id) FROM test_view settings enable_analyzer=1;
+EXPLAIN header = 1 SELECT sum(id) FROM test_view settings allow_experimental_analyzer=1;
 
 DROP VIEW test_view;
 DROP TABLE test_table;
diff --git a/tests/queries/0_stateless/03151_dynamic_type_scale_max_types.reference b/tests/queries/0_stateless/03151_dynamic_type_scale_max_types.reference
index 2d3b2f118f6..d96fbf658d8 100644
--- a/tests/queries/0_stateless/03151_dynamic_type_scale_max_types.reference
+++ b/tests/queries/0_stateless/03151_dynamic_type_scale_max_types.reference
@@ -1,26 +1,26 @@
-1	2024-01-01	Date	false
-2	1704056400	Decimal(18, 3)	false
-3	1	Float32	true
-4	2	Float64	true
+1	2024-01-01	Date
+2	1704056400	String
+3	1	String
+4	2	String
 
-1	2024-01-01	Date	false
-1	2024-01-01	Date	false
-2	1704056400	Decimal(18, 3)	false
-2	1704056400	Decimal(18, 3)	false
-3	1	Float32	false
-3	1	Float32	false
-4	2	Float64	false
-4	2	Float64	false
+1	2024-01-01	Date
+1	2024-01-01	Date
+2	1704056400	Decimal(18, 3)
+2	1704056400	String
+3	1	Float32
+3	1	String
+4	2	Float64
+4	2	String
 
-1	2024-01-01	Date	true
-1	2024-01-01	Date	true
-1	2024-01-01	Date	true
-2	1704056400	Decimal(18, 3)	true
-2	1704056400	Decimal(18, 3)	true
-2	1704056400	Decimal(18, 3)	true
-3	1	Float32	true
-3	1	Float32	true
-3	1	Float32	true
-4	2	Float64	true
-4	2	Float64	true
-4	2	Float64	true
+1	2024-01-01	String
+1	2024-01-01	String
+1	2024-01-01	String
+2	1704056400	String
+2	1704056400	String
+2	1704056400	String
+3	1	String
+3	1	String
+3	1	String
+4	2	String
+4	2	String
+4	2	String
diff --git a/tests/queries/0_stateless/03151_dynamic_type_scale_max_types.sql b/tests/queries/0_stateless/03151_dynamic_type_scale_max_types.sql
index e476d34a1db..632f3504fdb 100644
--- a/tests/queries/0_stateless/03151_dynamic_type_scale_max_types.sql
+++ b/tests/queries/0_stateless/03151_dynamic_type_scale_max_types.sql
@@ -11,16 +11,16 @@ CREATE TABLE to_table
 ENGINE = MergeTree ORDER BY n1;
 
 INSERT INTO to_table ( n1, n2 ) VALUES (1, '2024-01-01'), (2, toDateTime64('2024-01-01', 3, 'Asia/Istanbul')), (3, toFloat32(1)), (4, toFloat64(2));
-SELECT *, dynamicType(n2), isDynamicElementInSharedData(n2) FROM to_table ORDER BY ALL;
+SELECT *, dynamicType(n2) FROM to_table ORDER BY ALL;
 
 select '';
 ALTER TABLE to_table MODIFY COLUMN n2 Dynamic(max_types=5);
 INSERT INTO to_table ( n1, n2 ) VALUES (1, '2024-01-01'), (2, toDateTime64('2024-01-01', 3, 'Asia/Istanbul')), (3, toFloat32(1)), (4, toFloat64(2));
-SELECT *, dynamicType(n2), isDynamicElementInSharedData(n2) FROM to_table ORDER BY ALL;
+SELECT *, dynamicType(n2) FROM to_table ORDER BY ALL;
 
 select '';
-ALTER TABLE to_table MODIFY COLUMN n2 Dynamic(max_types=0);
+ALTER TABLE to_table MODIFY COLUMN n2 Dynamic(max_types=1);
 INSERT INTO to_table ( n1, n2 ) VALUES (1, '2024-01-01'), (2, toDateTime64('2024-01-01', 3, 'Asia/Istanbul')), (3, toFloat32(1)), (4, toFloat64(2));
-SELECT *, dynamicType(n2), isDynamicElementInSharedData(n2) FROM to_table ORDER BY ALL;
+SELECT *, dynamicType(n2) FROM to_table ORDER BY ALL;
 
 ALTER TABLE to_table MODIFY COLUMN n2 Dynamic(max_types=500); -- { serverError UNEXPECTED_AST_STRUCTURE }
diff --git a/tests/queries/0_stateless/03152_dynamic_type_simple.reference b/tests/queries/0_stateless/03152_dynamic_type_simple.reference
index e508bdd1990..5f243209ff3 100644
--- a/tests/queries/0_stateless/03152_dynamic_type_simple.reference
+++ b/tests/queries/0_stateless/03152_dynamic_type_simple.reference
@@ -7,7 +7,7 @@ string2	String
 
 \N	None	42	Int64
 42	Int64	string	String
-string	String	[1,2]	Array(Int64)
+string	String	[1, 2]	String
 [1,2]	Array(Int64)	\N	None
     ┌─d────────────────────────┬─dynamicType(d)─┬─d.Int64─┬─d.String─┬─────d.Date─┬─d.Float64─┬──────────d.DateTime─┬─d.Array(Int64)─┬─d.Array(String)──────────┐
  1. │ 42                       │ Int64          │      42 │ ᴺᵁᴸᴸ     │       ᴺᵁᴸᴸ │      ᴺᵁᴸᴸ │                ᴺᵁᴸᴸ │ []             │ []                       │
diff --git a/tests/queries/0_stateless/03152_dynamic_type_simple.sql b/tests/queries/0_stateless/03152_dynamic_type_simple.sql
index ed24b213b1c..fd5328faf15 100644
--- a/tests/queries/0_stateless/03152_dynamic_type_simple.sql
+++ b/tests/queries/0_stateless/03152_dynamic_type_simple.sql
@@ -1,17 +1,14 @@
 SET allow_experimental_dynamic_type=1;
 
-DROP TABLE IF EXISTS test_max_types;
 CREATE TABLE test_max_types (d Dynamic(max_types=5)) ENGINE = Memory;
 INSERT INTO test_max_types VALUES ('string1'), (42), (3.14), ([1, 2]), (toDate('2021-01-01')), ('string2');
 SELECT d, dynamicType(d) FROM test_max_types;
 
 SELECT '';
-DROP TABLE IF EXISTS test_nested_dynamic;
 CREATE TABLE test_nested_dynamic (d1 Dynamic, d2 Dynamic(max_types=2)) ENGINE = Memory;
 INSERT INTO test_nested_dynamic VALUES (NULL, 42), (42, 'string'), ('string', [1, 2]), ([1, 2], NULL);
 SELECT d1, dynamicType(d1), d2, dynamicType(d2) FROM test_nested_dynamic;
 
-DROP TABLE IF EXISTS test_rapid_schema;
 CREATE TABLE test_rapid_schema (d Dynamic) ENGINE = Memory;
 INSERT INTO test_rapid_schema VALUES (42), ('string1'), (toDate('2021-01-01')), ([1, 2, 3]), (3.14), ('string2'), (toDateTime('2021-01-01 12:00:00')), (['array', 'of', 'strings']), (NULL), (toFloat64(42.42));
 
@@ -30,8 +27,3 @@ FROM
         FROM numbers(10000)
     )
 );
-
-DROP TABLE test_max_types;
-DROP TABLE test_nested_dynamic;
-DROP TABLE test_rapid_schema;
-
diff --git a/tests/queries/0_stateless/03152_join_filter_push_down_equivalent_columns.sql b/tests/queries/0_stateless/03152_join_filter_push_down_equivalent_columns.sql
index ea8a9e1f8d7..645e89034d7 100644
--- a/tests/queries/0_stateless/03152_join_filter_push_down_equivalent_columns.sql
+++ b/tests/queries/0_stateless/03152_join_filter_push_down_equivalent_columns.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS users;
 CREATE TABLE users (uid Int16, name String, age Int16) ENGINE=MergeTree order by (uid, name);
diff --git a/tests/queries/0_stateless/03153_dynamic_type_empty.sql b/tests/queries/0_stateless/03153_dynamic_type_empty.sql
index 3a0c98e63ee..8e942fe6f6e 100644
--- a/tests/queries/0_stateless/03153_dynamic_type_empty.sql
+++ b/tests/queries/0_stateless/03153_dynamic_type_empty.sql
@@ -1,7 +1,5 @@
 SET allow_experimental_dynamic_type=1;
 
-DROP TABLE IF EXISTS test_null_empty;
 CREATE TABLE test_null_empty (d Dynamic) ENGINE = Memory;
 INSERT INTO test_null_empty VALUES ([]), ([1]), ([]), (['1']), ([]), (()),((1)), (()), (('1')), (()), ({}), ({1:2}), ({}), ({'1':'2'}), ({});
 SELECT d, dynamicType(d) FROM test_null_empty;
-DROP TABLE test_null_empty;
diff --git a/tests/queries/0_stateless/03154_recursive_cte_distributed.sql b/tests/queries/0_stateless/03154_recursive_cte_distributed.sql
index 47e0b9aad0b..b8c3356d5d6 100644
--- a/tests/queries/0_stateless/03154_recursive_cte_distributed.sql
+++ b/tests/queries/0_stateless/03154_recursive_cte_distributed.sql
@@ -1,6 +1,6 @@
 -- Tags: shard
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table
diff --git a/tests/queries/0_stateless/03155_analyzer_interpolate.sql b/tests/queries/0_stateless/03155_analyzer_interpolate.sql
index 42c5f5ef65f..30423cb86ff 100644
--- a/tests/queries/0_stateless/03155_analyzer_interpolate.sql
+++ b/tests/queries/0_stateless/03155_analyzer_interpolate.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/62464
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT n, [number] AS inter FROM (
    SELECT toFloat32(number % 10) AS n, number
diff --git a/tests/queries/0_stateless/03155_in_nested_subselects.sql b/tests/queries/0_stateless/03155_in_nested_subselects.sql
index faecb73040d..4f5ccd30aa3 100644
--- a/tests/queries/0_stateless/03155_in_nested_subselects.sql
+++ b/tests/queries/0_stateless/03155_in_nested_subselects.sql
@@ -1,5 +1,5 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/63833
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 create table Example (id Int32) engine = MergeTree ORDER BY id;
 INSERT INTO Example SELECT number AS id FROM numbers(2);
@@ -8,10 +8,10 @@ create table Null engine=Null as Example ;
 --create table Null engine=MergeTree order by id as Example ;
 
 create materialized view Transform to Example as
-select * from Null
-join ( select * FROM Example
+select * from Null 
+join ( select * FROM Example 
        WHERE id IN (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM Null)))))
-     ) as old
+     ) as old  
 using id;
 
 INSERT INTO Null SELECT number AS id FROM numbers(2);
diff --git a/tests/queries/0_stateless/03155_test_move_to_prewhere.sh b/tests/queries/0_stateless/03155_test_move_to_prewhere.sh
index f33a6b3ef27..b6980b3a23a 100755
--- a/tests/queries/0_stateless/03155_test_move_to_prewhere.sh
+++ b/tests/queries/0_stateless/03155_test_move_to_prewhere.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -nq "
   CREATE TABLE event_envoy
   (
       timestamp_interval DateTime CODEC(DoubleDelta),
@@ -18,7 +18,7 @@ ${CLICKHOUSE_CLIENT} -q "
   INSERT INTO event_envoy SELECT now() - number, 'us-east-1', 'ch_super_fast' FROM numbers_mt(1e5);
 "
 
-${CLICKHOUSE_CLIENT} -q "
+${CLICKHOUSE_CLIENT} -nq "
   CREATE TABLE event_envoy_remote
   (
       timestamp_interval DateTime CODEC(DoubleDelta),
diff --git a/tests/queries/0_stateless/03156_default_multiquery_split.reference b/tests/queries/0_stateless/03156_default_multiquery_split.reference
deleted file mode 100644
index 02a3a522ecd..00000000000
--- a/tests/queries/0_stateless/03156_default_multiquery_split.reference
+++ /dev/null
@@ -1,14 +0,0 @@
-Syntax error
-101
-102
-1
-2;
-3
-4
-7
-8
-9
-InsertQuery   (children 1)
- Identifier TEST2
-InsertQuery   (children 1)
- Identifier TEST1
diff --git a/tests/queries/0_stateless/03156_default_multiquery_split.sh b/tests/queries/0_stateless/03156_default_multiquery_split.sh
deleted file mode 100755
index 08ee9bcad63..00000000000
--- a/tests/queries/0_stateless/03156_default_multiquery_split.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env bash
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-SQL_FILE_NAME=$"03156_default_multiquery_split_${CLICKHOUSE_DATABASE}.sql"
-
-# The old multiquery implementation uses '\n' to split INSERT query segmentation
-# this case is mainly to test the following situations
-# 1. INSERT(format=Values) query: split by ';'
-# 2. INSERT(format is not Values) query: split by '\n\n' instead of ';', then discard the ramaining data
-# 3. INSERT(format is not Values) query: split by '\n\n', causing the trailing ';'' to be treated as the part of last value
-# 4. The client uses multiquery by default, regardless of whether multiquery option is used.
-
-# create table test1, test2, then
-# 1. insert 101, 102 into test1
-# 2. insert 1, 2; into test2, ';' will be treated as a part of a value
-# 3. insert 3, 4; '6' will be treated as the next query because of the empty line, we use empty line to determine the end of insert query(format IS NOT VALUES)
-#     '6' will cause Syntax error
-cat << EOF > "$SQL_FILE_NAME"
-DROP TABLE IF EXISTS TEST1;
-DROP TABLE IF EXISTS TEST2;
-CREATE TABLE TEST1 (value Float64) ENGINE=MergeTree ORDER BY tuple();
-CREATE TABLE TEST2 (value String)  ENGINE=MergeTree ORDER BY tuple();
-INSERT INTO TEST1 VALUES
-(101),
-(102);
-INSERT INTO TEST2 FORMAT CSV
-1
-2;
-
-INSERT INTO TEST2 FORMAT CSV
-3
-4
-
-6
-EOF
-
-$CLICKHOUSE_CLIENT -m < "$SQL_FILE_NAME" 2>&1 | grep -o 'Syntax error'
-
-# insert 7, 8, 9 into test2, because we use semicolon to determine the end of insert query(format is VALUES)
-# then select all data from test1 and test2
-cat << EOF > "$SQL_FILE_NAME"
-INSERT INTO TEST2 VALUES
-('7'),
-('8'),
-
-('9');
-
-SELECT * FROM TEST1 ORDER BY value;
-SELECT * FROM TEST2 ORDER BY value;
-DROP TABLE TEST1; DROP TABLE TEST2;
-
-EXPLAIN AST INSERT INTO TEST2 FORMAT CSV
-1
-2
-
-EXPLAIN AST INSERT INTO TEST1 VALUES (101),(102);
-
-EOF
-
-$CLICKHOUSE_CLIENT -m < "$SQL_FILE_NAME"
-
-rm "$SQL_FILE_NAME"
diff --git a/tests/queries/0_stateless/03157_dynamic_type_json.reference b/tests/queries/0_stateless/03157_dynamic_type_json.reference
index 14e851bdbc7..38bca12bb95 100644
--- a/tests/queries/0_stateless/03157_dynamic_type_json.reference
+++ b/tests/queries/0_stateless/03157_dynamic_type_json.reference
@@ -1,5 +1,5 @@
-1	{"level1":{"level2":{"level3":{"level4":{"level5":{"level6":{"level7":{"level8":{"level9":{"level10":"deep_value"}}}}}}}}}}
-2	{"level1":{"level2":{"level3":{"level4":{"level5":{"level6":{"level7":{"level8":{"level9":{"level10":"deep_array_value"}}}}}}}}}}
+1	(((((((((('deep_value'))))))))))
+2	(((((((((('deep_array_value'))))))))))
 
-{"level1":{"level2":{"level3":{"level4":{"level5":{"level6":{"level7":{"level8":{"level9":{"level10":"deep_value"}}}}}}}}}}	JSON
-{"level1":{"level2":{"level3":{"level4":{"level5":{"level6":{"level7":{"level8":{"level9":{"level10":"deep_array_value"}}}}}}}}}}	JSON
+(((((((((('deep_value'))))))))))	Tuple(level1 Tuple(level2 Tuple(level3 Tuple(level4 Tuple(level5 Tuple(level6 Tuple(level7 Tuple(level8 Tuple(level9 Tuple(level10 String))))))))))
+(((((((((('deep_array_value'))))))))))	Tuple(level1 Tuple(level2 Tuple(level3 Tuple(level4 Tuple(level5 Tuple(level6 Tuple(level7 Tuple(level8 Tuple(level9 Tuple(level10 String))))))))))
diff --git a/tests/queries/0_stateless/03157_dynamic_type_json.sql b/tests/queries/0_stateless/03157_dynamic_type_json.sql
index 91af7942718..cb1a5987104 100644
--- a/tests/queries/0_stateless/03157_dynamic_type_json.sql
+++ b/tests/queries/0_stateless/03157_dynamic_type_json.sql
@@ -1,8 +1,7 @@
 SET allow_experimental_dynamic_type=1;
-SET allow_experimental_json_type=1;
+SET allow_experimental_object_type=1;
 SET allow_experimental_variant_type=1;
 
-DROP TABLE IF EXISTS test_deep_nested_json;
 CREATE TABLE test_deep_nested_json (i UInt16, d JSON) ENGINE = Memory;
 
 INSERT INTO test_deep_nested_json VALUES (1, '{"level1": {"level2": {"level3": {"level4": {"level5": {"level6": {"level7": {"level8": {"level9": {"level10": "deep_value"}}}}}}}}}}');
@@ -12,4 +11,3 @@ SELECT * FROM test_deep_nested_json ORDER BY i;
 
 SELECT '';
 SELECT d::Dynamic d1, dynamicType(d1) FROM test_deep_nested_json ORDER BY i;
-DROP TABLE test_deep_nested_json;
diff --git a/tests/queries/0_stateless/03158_dynamic_type_from_variant.sql b/tests/queries/0_stateless/03158_dynamic_type_from_variant.sql
index a18f985f217..20a9e17a148 100644
--- a/tests/queries/0_stateless/03158_dynamic_type_from_variant.sql
+++ b/tests/queries/0_stateless/03158_dynamic_type_from_variant.sql
@@ -1,4 +1,5 @@
 SET allow_experimental_dynamic_type=1;
+SET allow_experimental_object_type=1;
 SET allow_experimental_variant_type=1;
 
 CREATE TABLE test_variable (v Variant(String, UInt32, IPv6, Bool, DateTime64)) ENGINE = Memory;
diff --git a/tests/queries/0_stateless/03159_dynamic_type_all_types.sql b/tests/queries/0_stateless/03159_dynamic_type_all_types.sql
index 28b679e2214..d302205ca23 100644
--- a/tests/queries/0_stateless/03159_dynamic_type_all_types.sql
+++ b/tests/queries/0_stateless/03159_dynamic_type_all_types.sql
@@ -1,11 +1,12 @@
 -- Tags: no-random-settings
 
 SET allow_experimental_dynamic_type=1;
+SET allow_experimental_object_type=1;
 SET allow_experimental_variant_type=1;
 SET allow_suspicious_low_cardinality_types=1;
 
 
-CREATE TABLE t (d Dynamic(max_types=254)) ENGINE = Memory;
+CREATE TABLE t (d Dynamic(max_types=255)) ENGINE = Memory;
 -- Integer types: signed and unsigned integers (UInt8, UInt16, UInt32, UInt64, UInt128, UInt256, Int8, Int16, Int32, Int64, Int128, Int256)
 INSERT INTO t VALUES (-128::Int8), (-127::Int8), (-1::Int8), (0::Int8), (1::Int8), (126::Int8), (127::Int8);
 INSERT INTO t VALUES (-128::Int8), (-127::Int8), (-1::Int8), (0::Int8), (1::Int8), (126::Int8), (127::Int8);
@@ -83,7 +84,7 @@ INSERT INTO t VALUES ([(1, (2, ['aa', 'bb']), [(3, 'cc'), (4, 'dd')]), (5, (6, [
 
 SELECT dynamicType(d), d FROM t ORDER BY substring(dynamicType(d),1,1), length(dynamicType(d)), d;
 
-CREATE TABLE t2 (d Dynamic(max_types=254)) ENGINE = Memory;
+CREATE TABLE t2 (d Dynamic(max_types=255)) ENGINE = Memory;
 INSERT INTO t2 SELECT * FROM t;
 
 SELECT '';
diff --git a/tests/queries/0_stateless/03161_cnf_reduction.reference b/tests/queries/0_stateless/03161_cnf_reduction.reference
index 41051af362f..5e39c0f3223 100644
--- a/tests/queries/0_stateless/03161_cnf_reduction.reference
+++ b/tests/queries/0_stateless/03161_cnf_reduction.reference
@@ -2,7 +2,7 @@
 SELECT id
 FROM `03161_table`
 WHERE f
-SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, enable_analyzer = 1
+SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, allow_experimental_analyzer = 1
 
 -- Expected result with analyzer:
 1
@@ -11,7 +11,7 @@ SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, enable_analyz
 SELECT id
 FROM `03161_table`
 WHERE f
-SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, enable_analyzer = 0
+SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, allow_experimental_analyzer = 0
 
 -- Expected result w/o analyzer:
 1
diff --git a/tests/queries/0_stateless/03161_cnf_reduction.sql b/tests/queries/0_stateless/03161_cnf_reduction.sql
index c232823e9cd..b34e9171d45 100644
--- a/tests/queries/0_stateless/03161_cnf_reduction.sql
+++ b/tests/queries/0_stateless/03161_cnf_reduction.sql
@@ -10,7 +10,7 @@ EXPLAIN SYNTAX
 SELECT id
 FROM 03161_table
 WHERE f AND (NOT(f) OR f)
-SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, enable_analyzer = 1;
+SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, allow_experimental_analyzer = 1;
 
 SELECT '';
 
@@ -19,7 +19,7 @@ SELECT '-- Expected result with analyzer:';
 SELECT id
 FROM 03161_table
 WHERE f AND (NOT(f) OR f)
-SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, enable_analyzer = 1;
+SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, allow_experimental_analyzer = 1;
 
 SELECT '';
 
@@ -29,7 +29,7 @@ EXPLAIN SYNTAX
 SELECT id
 FROM 03161_table
 WHERE f AND (NOT(f) OR f)
-SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, enable_analyzer = 0;
+SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, allow_experimental_analyzer = 0;
 
 SELECT '';
 
@@ -38,7 +38,7 @@ SELECT '-- Expected result w/o analyzer:';
 SELECT id
 FROM 03161_table
 WHERE f AND (NOT(f) OR f)
-SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, enable_analyzer = 0;
+SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, allow_experimental_analyzer = 0;
 
 DROP TABLE IF EXISTS 03161_table;
 
@@ -58,7 +58,7 @@ SELECT '-- Reproducer from the issue with analyzer';
 SELECT count()
 FROM 03161_reproducer
 WHERE ((NOT c2) AND c2 AND (NOT c1)) OR ((NOT c2) AND c3 AND (NOT c5)) OR ((NOT c7) AND (NOT c8)) OR (c9 AND c6 AND c8 AND (NOT c8) AND (NOT c7))
-SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, enable_analyzer = 1;
+SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, allow_experimental_analyzer = 1;
 
 SELECT '';
 
@@ -67,6 +67,6 @@ SELECT '-- Reproducer from the issue w/o analyzer';
 SELECT count()
 FROM 03161_reproducer
 WHERE ((NOT c2) AND c2 AND (NOT c1)) OR ((NOT c2) AND c3 AND (NOT c5)) OR ((NOT c7) AND (NOT c8)) OR (c9 AND c6 AND c8 AND (NOT c8) AND (NOT c7))
-SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, enable_analyzer = 0;
+SETTINGS convert_query_to_cnf = 1, optimize_using_constraints = 1, allow_experimental_analyzer = 0;
 
 DROP TABLE IF EXISTS 03161_reproducer;
diff --git a/tests/queries/0_stateless/03161_lightweight_delete_projection.reference b/tests/queries/0_stateless/03161_lightweight_delete_projection.reference
index 8edf541c2a0..c5a6cbab0bc 100644
--- a/tests/queries/0_stateless/03161_lightweight_delete_projection.reference
+++ b/tests/queries/0_stateless/03161_lightweight_delete_projection.reference
@@ -1,90 +1,2 @@
-compact part
-testing throw default mode
--- { echoOn }
-
-ALTER TABLE users_compact MODIFY SETTING lightweight_mutation_projection_mode = 'throw';
-DELETE FROM users_compact WHERE uid = 1231;  -- { serverError SUPPORT_IS_DISABLED }
-SELECT 'testing drop mode';
-testing drop mode
-ALTER TABLE users_compact MODIFY SETTING lightweight_mutation_projection_mode = 'drop';
-DELETE FROM users_compact WHERE uid = 1231;
-SELECT * FROM users_compact ORDER BY uid;
-SYSTEM FLUSH LOGS;
--- all_1_1_0_2
-SELECT
-    name
-FROM system.parts
-WHERE (database = currentDatabase()) AND (`table` = 'users_compact') AND (active = 1);
-all_1_1_0_2
--- expecting no projection
-SELECT
-    name, parent_name
-FROM system.projection_parts
-WHERE (database = currentDatabase()) AND (`table` = 'users_compact') AND (active = 1);
-SELECT 'testing rebuild mode';
-testing rebuild mode
-INSERT INTO users_compact VALUES (6666, 'Ksenia', 48), (8888, 'Alice', 50);
-ALTER TABLE users_compact MODIFY SETTING lightweight_mutation_projection_mode = 'rebuild';
-DELETE FROM users_compact WHERE uid = 6666;
-SELECT * FROM users_compact ORDER BY uid;
+1231	John	33
 8888	Alice	50
-SYSTEM FLUSH LOGS;
--- all_1_1_0_4, all_3_3_0_4
-SELECT
-    name
-FROM system.parts
-WHERE (database = currentDatabase()) AND (`table` = 'users_compact') AND (active = 1);
-all_1_1_0_4
-all_3_3_0_4
--- expecting projection p1, p2
-SELECT
-    name, parent_name
-FROM system.projection_parts
-WHERE (database = currentDatabase()) AND (`table` = 'users_compact') AND (active = 1) AND parent_name like 'all_3_3%';
-p1	all_3_3_0_4
-p2	all_3_3_0_4
-wide part
-testing throw default mode
--- { echoOn }
-
-ALTER TABLE users_wide MODIFY SETTING lightweight_mutation_projection_mode = 'throw';
-DELETE FROM users_wide WHERE uid = 1231;  -- { serverError SUPPORT_IS_DISABLED }
-SELECT 'testing drop mode';
-testing drop mode
-ALTER TABLE users_wide MODIFY SETTING lightweight_mutation_projection_mode = 'drop';
-DELETE FROM users_wide WHERE uid = 1231;
-SELECT * FROM users_wide ORDER BY uid;
-SYSTEM FLUSH LOGS;
--- all_1_1_0_2
-SELECT
-    name
-FROM system.parts
-WHERE (database = currentDatabase()) AND (`table` = 'users_wide') AND (active = 1);
-all_1_1_0_2
--- expecting no projection
-SELECT
-    name, parent_name
-FROM system.projection_parts
-WHERE (database = currentDatabase()) AND (`table` = 'users_wide') AND (active = 1);
-SELECT 'testing rebuild mode';
-testing rebuild mode
-INSERT INTO users_wide VALUES (6666, 'Ksenia', 48), (8888, 'Alice', 50);
-ALTER TABLE users_wide MODIFY SETTING lightweight_mutation_projection_mode = 'rebuild';
-DELETE FROM users_wide WHERE uid = 6666;
-SELECT * FROM users_wide ORDER BY uid;
-8888	Alice	50
-SYSTEM FLUSH LOGS;
--- all_1_1_0_4, all_3_3_0_4
-SELECT
-    name
-FROM system.parts
-WHERE (database = currentDatabase()) AND (`table` = 'users_wide') AND (active = 1);
-all_1_1_0_4
-all_3_3_0_4
--- expecting projection p1, p2
-SELECT
-    name, parent_name
-FROM system.projection_parts
-WHERE (database = currentDatabase()) AND (`table` = 'users_wide') AND (active = 1) AND parent_name like 'all_3_3%';
-p1	all_3_3_0_4
-p2	all_3_3_0_4
diff --git a/tests/queries/0_stateless/03161_lightweight_delete_projection.sql b/tests/queries/0_stateless/03161_lightweight_delete_projection.sql
index da6427cbf22..b189388e356 100644
--- a/tests/queries/0_stateless/03161_lightweight_delete_projection.sql
+++ b/tests/queries/0_stateless/03161_lightweight_delete_projection.sql
@@ -1,145 +1,31 @@
--- For cloud version, should also consider min_bytes_for_full_part_storage since packed storage exists,
--- but for less redundancy, just let CI test the parameter.
 
-SET lightweight_deletes_sync = 2, alter_sync = 2;
+DROP TABLE IF EXISTS users;
 
-DROP TABLE IF EXISTS users_compact;
-
-
-SELECT 'compact part';
-
-CREATE TABLE users_compact (
+CREATE TABLE users (
     uid Int16,
     name String,
     age Int16,
     projection p1 (select count(), age group by age),
     projection p2 (select age, name group by age, name)
-) ENGINE = MergeTree order by uid
-SETTINGS min_bytes_for_wide_part = 10485760;
+) ENGINE = MergeTree order by uid;
 
-INSERT INTO users_compact VALUES (1231, 'John', 33);
+INSERT INTO users VALUES (1231, 'John', 33);
+INSERT INTO users VALUES (6666, 'Ksenia', 48);
+INSERT INTO users VALUES (8888, 'Alice', 50);
 
-SELECT 'testing throw default mode';
+DELETE FROM users WHERE 1; -- { serverError NOT_IMPLEMENTED }
 
--- { echoOn }
+DELETE FROM users WHERE uid = 8888 SETTINGS lightweight_mutation_projection_mode = 'throw';  -- { serverError NOT_IMPLEMENTED }
 
-ALTER TABLE users_compact MODIFY SETTING lightweight_mutation_projection_mode = 'throw';
-
-DELETE FROM users_compact WHERE uid = 1231;  -- { serverError SUPPORT_IS_DISABLED }
-
-SELECT 'testing drop mode';
-ALTER TABLE users_compact MODIFY SETTING lightweight_mutation_projection_mode = 'drop';
-
-DELETE FROM users_compact WHERE uid = 1231;
-
-SELECT * FROM users_compact ORDER BY uid;
-
-SYSTEM FLUSH LOGS;
-
--- all_1_1_0_2
-SELECT
-    name
-FROM system.parts
-WHERE (database = currentDatabase()) AND (`table` = 'users_compact') AND (active = 1);
+DELETE FROM users WHERE uid = 6666 SETTINGS lightweight_mutation_projection_mode = 'drop';
 
 -- expecting no projection
 SELECT
-    name, parent_name
+    name,
+    `table`
 FROM system.projection_parts
-WHERE (database = currentDatabase()) AND (`table` = 'users_compact') AND (active = 1);
+WHERE (database = currentDatabase()) AND (`table` = 'users');
 
-SELECT 'testing rebuild mode';
-INSERT INTO users_compact VALUES (6666, 'Ksenia', 48), (8888, 'Alice', 50);
+SELECT * FROM users ORDER BY uid;
 
-ALTER TABLE users_compact MODIFY SETTING lightweight_mutation_projection_mode = 'rebuild';
-
-DELETE FROM users_compact WHERE uid = 6666;
-
-SELECT * FROM users_compact ORDER BY uid;
-
-SYSTEM FLUSH LOGS;
-
--- all_1_1_0_4, all_3_3_0_4
-SELECT
-    name
-FROM system.parts
-WHERE (database = currentDatabase()) AND (`table` = 'users_compact') AND (active = 1);
-
--- expecting projection p1, p2
-SELECT
-    name, parent_name
-FROM system.projection_parts
-WHERE (database = currentDatabase()) AND (`table` = 'users_compact') AND (active = 1) AND parent_name like 'all_3_3%';
-
--- { echoOff }
-
-DROP TABLE users_compact;
-
-
-SELECT 'wide part';
-CREATE TABLE users_wide (
-    uid Int16,
-    name String,
-    age Int16,
-    projection p1 (select count(), age group by age),
-    projection p2 (select age, name group by age, name)
-) ENGINE = MergeTree order by uid
-SETTINGS min_bytes_for_wide_part = 0;
-
-INSERT INTO users_wide VALUES (1231, 'John', 33);
-
-SELECT 'testing throw default mode';
-
--- { echoOn }
-
-ALTER TABLE users_wide MODIFY SETTING lightweight_mutation_projection_mode = 'throw';
-
-DELETE FROM users_wide WHERE uid = 1231;  -- { serverError SUPPORT_IS_DISABLED }
-
-SELECT 'testing drop mode';
-ALTER TABLE users_wide MODIFY SETTING lightweight_mutation_projection_mode = 'drop';
-
-DELETE FROM users_wide WHERE uid = 1231;
-
-SELECT * FROM users_wide ORDER BY uid;
-
-SYSTEM FLUSH LOGS;
-
--- all_1_1_0_2
-SELECT
-    name
-FROM system.parts
-WHERE (database = currentDatabase()) AND (`table` = 'users_wide') AND (active = 1);
-
--- expecting no projection
-SELECT
-    name, parent_name
-FROM system.projection_parts
-WHERE (database = currentDatabase()) AND (`table` = 'users_wide') AND (active = 1);
-
-SELECT 'testing rebuild mode';
-INSERT INTO users_wide VALUES (6666, 'Ksenia', 48), (8888, 'Alice', 50);
-
-ALTER TABLE users_wide MODIFY SETTING lightweight_mutation_projection_mode = 'rebuild';
-
-DELETE FROM users_wide WHERE uid = 6666;
-
-SELECT * FROM users_wide ORDER BY uid;
-
-SYSTEM FLUSH LOGS;
-
--- all_1_1_0_4, all_3_3_0_4
-SELECT
-    name
-FROM system.parts
-WHERE (database = currentDatabase()) AND (`table` = 'users_wide') AND (active = 1);
-
--- expecting projection p1, p2
-SELECT
-    name, parent_name
-FROM system.projection_parts
-WHERE (database = currentDatabase()) AND (`table` = 'users_wide') AND (active = 1) AND parent_name like 'all_3_3%';
-
--- { echoOff }
-
-DROP TABLE users_wide;
+DROP TABLE users;
diff --git a/tests/queries/0_stateless/03164_adapting_parquet_reader_output_size.sql b/tests/queries/0_stateless/03164_adapting_parquet_reader_output_size.sql
index e6b13510301..fa098b64702 100644
--- a/tests/queries/0_stateless/03164_adapting_parquet_reader_output_size.sql
+++ b/tests/queries/0_stateless/03164_adapting_parquet_reader_output_size.sql
@@ -1,4 +1,4 @@
--- Tags: no-fasttest, no-random-settings
+-- Tags: no-fasttest, no-parallel, no-random-settings
 
 set max_insert_threads=1;
 
@@ -22,4 +22,4 @@ CREATE TABLE test_parquet (col1 String, col2 String, col3 String, col4 String, c
 INSERT INTO test_parquet SELECT rand(),rand(),rand(),rand(),rand(),rand(),rand() FROM numbers(100000);
 SELECT max(blockSize()) FROM test_parquet;
 
-DROP TABLE IF EXISTS test_parquet;
+DROP TABLE IF EXISTS test_parquet;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03164_analyzer_global_in_alias.sql b/tests/queries/0_stateless/03164_analyzer_global_in_alias.sql
index ccfacd12d98..00c293334ee 100644
--- a/tests/queries/0_stateless/03164_analyzer_global_in_alias.sql
+++ b/tests/queries/0_stateless/03164_analyzer_global_in_alias.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 SELECT 1 GLOBAL IN (SELECT 1) AS s, s FROM remote('127.0.0.{2,3}', system.one) GROUP BY 1;
 SELECT 1 GLOBAL IN (SELECT 1) AS s FROM remote('127.0.0.{2,3}', system.one) GROUP BY 1;
 
diff --git a/tests/queries/0_stateless/03164_early_constant_folding_analyzer.sql b/tests/queries/0_stateless/03164_early_constant_folding_analyzer.sql
index b1018d00082..dbffbc1af71 100644
--- a/tests/queries/0_stateless/03164_early_constant_folding_analyzer.sql
+++ b/tests/queries/0_stateless/03164_early_constant_folding_analyzer.sql
@@ -27,4 +27,4 @@ ENGINE = MergeTree ORDER BY (date, pull_request_number, commit_sha, check_name,
 insert into checks select * from generateRandom() limit 1;
 
 
-select trimLeft(explain) from (explain SELECT count(1) FROM checks WHERE test_name IS NOT NULL) where explain like '%ReadFromPreparedSource%' SETTINGS enable_analyzer = 1, allow_experimental_parallel_reading_from_replicas = 0;
+select trimLeft(explain) from (explain SELECT count(1) FROM checks WHERE test_name IS NOT NULL) where explain like '%ReadFromPreparedSource%' SETTINGS allow_experimental_analyzer = 1, allow_experimental_parallel_reading_from_replicas = 0;
diff --git a/tests/queries/0_stateless/03164_materialize_skip_index.sql b/tests/queries/0_stateless/03164_materialize_skip_index.sql
index 0443872596d..4e59ef6b6cd 100644
--- a/tests/queries/0_stateless/03164_materialize_skip_index.sql
+++ b/tests/queries/0_stateless/03164_materialize_skip_index.sql
@@ -9,7 +9,7 @@ CREATE TABLE t_skip_index_insert
 )
 ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity = 4;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SET materialize_skip_indexes_on_insert = 0;
 
 SYSTEM STOP MERGES t_skip_index_insert;
diff --git a/tests/queries/0_stateless/03164_s3_settings_for_queries_and_merges.sql b/tests/queries/0_stateless/03164_s3_settings_for_queries_and_merges.sql
index a6932e0536c..ac2070fbd76 100644
--- a/tests/queries/0_stateless/03164_s3_settings_for_queries_and_merges.sql
+++ b/tests/queries/0_stateless/03164_s3_settings_for_queries_and_merges.sql
@@ -21,9 +21,8 @@ SYSTEM DROP MARK CACHE;
 SELECT count() FROM t_compact_bytes_s3 WHERE NOT ignore(c2, c4);
 SYSTEM FLUSH LOGS;
 
--- Errors in S3 requests will be automatically retried, however ProfileEvents can be wrong. That is why we subtract errors.
 SELECT
-    ProfileEvents['S3ReadRequestsCount'] - ProfileEvents['S3ReadRequestsErrors'],
+    ProfileEvents['S3ReadRequestsCount'],
     ProfileEvents['ReadBufferFromS3Bytes'] < ProfileEvents['ReadCompressedBytes'] * 1.1
 FROM system.query_log
 WHERE event_date >= yesterday() AND type = 'QueryFinish'
@@ -31,7 +30,7 @@ WHERE event_date >= yesterday() AND type = 'QueryFinish'
     AND query ilike '%INSERT INTO t_compact_bytes_s3 SELECT number, number, number%';
 
 SELECT
-    ProfileEvents['S3ReadRequestsCount'] - ProfileEvents['S3ReadRequestsErrors'],
+    ProfileEvents['S3ReadRequestsCount'],
     ProfileEvents['ReadBufferFromS3Bytes'] < ProfileEvents['ReadCompressedBytes'] * 1.1
 FROM system.query_log
 WHERE event_date >= yesterday() AND type = 'QueryFinish'
diff --git a/tests/queries/0_stateless/03164_selects_with_pk_usage_profile_event.sh b/tests/queries/0_stateless/03164_selects_with_pk_usage_profile_event.sh
index 75efc3f057a..29d4c877909 100755
--- a/tests/queries/0_stateless/03164_selects_with_pk_usage_profile_event.sh
+++ b/tests/queries/0_stateless/03164_selects_with_pk_usage_profile_event.sh
@@ -33,7 +33,7 @@ $CLICKHOUSE_CLIENT -q "
 query_id="$(random_str 10)"
 $CLICKHOUSE_CLIENT --query_id "$query_id" -q "
     SELECT count(*) FROM table_$table_id FORMAT Null;"
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -mn -q "
     SYSTEM FLUSH LOGS;
     SELECT
         ProfileEvents['SelectQueriesWithPrimaryKeyUsage'] AS selects_with_pk_usage
@@ -50,7 +50,7 @@ $CLICKHOUSE_CLIENT -m -q "
 query_id="$(random_str 10)"
 $CLICKHOUSE_CLIENT --query_id "$query_id" -q "
     SELECT count(*) FROM table_$table_id WHERE col2 >= 50000 FORMAT Null;"
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -mn -q "
     SYSTEM FLUSH LOGS;
     SELECT
         ProfileEvents['SelectQueriesWithPrimaryKeyUsage'] AS selects_with_pk_usage
@@ -67,7 +67,7 @@ $CLICKHOUSE_CLIENT -m -q "
 query_id="$(random_str 10)"
 $CLICKHOUSE_CLIENT --query_id "$query_id" -q "
     SELECT count(*) FROM table_$table_id WHERE pk >= 50000 FORMAT Null;"
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -mn -q "
     SYSTEM FLUSH LOGS;
     SELECT
         ProfileEvents['SelectQueriesWithPrimaryKeyUsage'] AS selects_with_pk_usage
@@ -84,7 +84,7 @@ $CLICKHOUSE_CLIENT -m -q "
 query_id="$(random_str 10)"
 $CLICKHOUSE_CLIENT --query_id "$query_id" -q "
     SELECT count(*) FROM table_$table_id WHERE col1 >= 50000 FORMAT Null;"
-$CLICKHOUSE_CLIENT -m -q "
+$CLICKHOUSE_CLIENT -mn -q "
     SYSTEM FLUSH LOGS;
     SELECT
         ProfileEvents['SelectQueriesWithPrimaryKeyUsage'] AS selects_with_pk_usage
diff --git a/tests/queries/0_stateless/03165_order_by_duplicate.reference b/tests/queries/0_stateless/03165_order_by_duplicate.reference
index 93d312d5d02..5d5e7a33f4a 100644
--- a/tests/queries/0_stateless/03165_order_by_duplicate.reference
+++ b/tests/queries/0_stateless/03165_order_by_duplicate.reference
@@ -36,4 +36,4 @@ QUERY id: 0
   LIMIT BY
     LIST id: 16, nodes: 1
       COLUMN id: 2, column_name: id, result_type: UInt64, source_id: 3
-  SETTINGS enable_analyzer=1
+  SETTINGS allow_experimental_analyzer=1
diff --git a/tests/queries/0_stateless/03165_order_by_duplicate.sql b/tests/queries/0_stateless/03165_order_by_duplicate.sql
index b8bcc10e119..0054cbc36a6 100644
--- a/tests/queries/0_stateless/03165_order_by_duplicate.sql
+++ b/tests/queries/0_stateless/03165_order_by_duplicate.sql
@@ -13,4 +13,4 @@ WHERE id IN (
 )
 ORDER BY id ASC
 LIMIT 1 BY id
-SETTINGS enable_analyzer = 1;
+SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/03166_mv_prewhere_duplicating_name_bug.sql b/tests/queries/0_stateless/03166_mv_prewhere_duplicating_name_bug.sql
index e27e8645466..e32d23920dd 100644
--- a/tests/queries/0_stateless/03166_mv_prewhere_duplicating_name_bug.sql
+++ b/tests/queries/0_stateless/03166_mv_prewhere_duplicating_name_bug.sql
@@ -3,5 +3,5 @@ create table dst (s String, lc LowCardinality(String)) engine MergeTree order by
 create materialized view mv to dst (s String, lc String) as select 'a' as s, toLowCardinality('b') as lc from src;
 insert into src values (1);
 
-select s, lc from mv where not ignore(lc) settings enable_analyzer=0;
-select s, lc from mv where not ignore(lc) settings enable_analyzer=1;
+select s, lc from mv where not ignore(lc) settings allow_experimental_analyzer=0;
+select s, lc from mv where not ignore(lc) settings allow_experimental_analyzer=1;
diff --git a/tests/queries/0_stateless/03166_skip_indexes_vertical_merge_1.sql b/tests/queries/0_stateless/03166_skip_indexes_vertical_merge_1.sql
index 96221f27e73..d3e3b38a3cb 100644
--- a/tests/queries/0_stateless/03166_skip_indexes_vertical_merge_1.sql
+++ b/tests/queries/0_stateless/03166_skip_indexes_vertical_merge_1.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS t_ind_merge_1;
 
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 CREATE TABLE t_ind_merge_1 (a UInt64, b UInt64, c UInt64, d UInt64, INDEX idx_b b TYPE minmax)
 ENGINE = MergeTree
diff --git a/tests/queries/0_stateless/03167_parametrized_view_with_cte.sql b/tests/queries/0_stateless/03167_parametrized_view_with_cte.sql
index ae6ab586415..1ac5540047a 100644
--- a/tests/queries/0_stateless/03167_parametrized_view_with_cte.sql
+++ b/tests/queries/0_stateless/03167_parametrized_view_with_cte.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 CREATE OR REPLACE VIEW param_test AS SELECT {test_str:String} as s_result;
 WITH 'OK' AS s SELECT * FROM param_test(test_str=s);
 WITH (SELECT 123) AS s SELECT * FROM param_test(test_str=s);
diff --git a/tests/queries/0_stateless/03168_query_log_privileges_not_empty.reference b/tests/queries/0_stateless/03168_query_log_privileges_not_empty.reference
index f4ada41d77d..e3ac97f9945 100644
--- a/tests/queries/0_stateless/03168_query_log_privileges_not_empty.reference
+++ b/tests/queries/0_stateless/03168_query_log_privileges_not_empty.reference
@@ -1,3 +1,4 @@
+1
 3168	8613
 []	['SELECT(a, b) ON default.d_03168_query_log']
 []	[]
diff --git a/tests/queries/0_stateless/03168_query_log_privileges_not_empty.sh b/tests/queries/0_stateless/03168_query_log_privileges_not_empty.sh
index b817052e355..9abc635a874 100755
--- a/tests/queries/0_stateless/03168_query_log_privileges_not_empty.sh
+++ b/tests/queries/0_stateless/03168_query_log_privileges_not_empty.sh
@@ -1,28 +1,32 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-user_name="u_03168_query_log_${CLICKHOUSE_DATABASE}"
-table_name="d_03168_query_log"
+user_name="u_03168_query_log"
+table_name="default.d_03168_query_log"
 test_query="select a, b from ${table_name}"
 
-${CLICKHOUSE_CLIENT} --query "drop user if exists ${user_name}"
-${CLICKHOUSE_CLIENT} --query "create user ${user_name}"
-${CLICKHOUSE_CLIENT} --query "drop table if exists ${table_name}"
-${CLICKHOUSE_CLIENT} --query "create table ${table_name} (a UInt64, b UInt64) order by a"
-${CLICKHOUSE_CLIENT} --query "insert into table ${table_name} values (3168, 8613)"
+${CLICKHOUSE_CLIENT_BINARY} --query "drop user if exists ${user_name}"
+${CLICKHOUSE_CLIENT_BINARY} --query "create user ${user_name}"
+${CLICKHOUSE_CLIENT_BINARY} --query "drop table if exists ${table_name}"
+${CLICKHOUSE_CLIENT_BINARY} --query "create table ${table_name} (a UInt64, b UInt64) order by a"
 
-${CLICKHOUSE_CLIENT} --user ${user_name} --query "${test_query}" 2>&1 >/dev/null | (grep -q "ACCESS_DENIED" || echo "Expected ACCESS_DENIED error not found")
+${CLICKHOUSE_CLIENT_BINARY} --query "insert into table ${table_name} values (3168, 8613)"
 
-${CLICKHOUSE_CLIENT} --query "grant select(a, b) on ${table_name} to ${user_name}"
-${CLICKHOUSE_CLIENT} --user ${user_name} --query "${test_query}"
+error="$(${CLICKHOUSE_CLIENT_BINARY} --user ${user_name} --query "${test_query}" 2>&1 >/dev/null)"
+echo "${error}" | grep -Fc "ACCESS_DENIED"
 
-${CLICKHOUSE_CLIENT} --query "system flush logs"
-${CLICKHOUSE_CLIENT} --query "select used_privileges, missing_privileges from system.query_log where query = '${test_query}' and type = 'ExceptionBeforeStart' and current_database = currentDatabase() order by event_time desc limit 1"
-${CLICKHOUSE_CLIENT} --query "select used_privileges, missing_privileges from system.query_log where query = '${test_query}' and type = 'QueryStart' and current_database = currentDatabase() order by event_time desc limit 1"
-${CLICKHOUSE_CLIENT} --query "select used_privileges, missing_privileges from system.query_log where query = '${test_query}' and type = 'QueryFinish' and current_database = currentDatabase() order by event_time desc limit 1"
+${CLICKHOUSE_CLIENT_BINARY} --query "grant select(a, b) on ${table_name} to ${user_name}"
 
-${CLICKHOUSE_CLIENT} --query "drop table ${table_name}"
-${CLICKHOUSE_CLIENT} --query "drop user ${user_name}"
+${CLICKHOUSE_CLIENT_BINARY} --user ${user_name} --query "${test_query}"
+
+${CLICKHOUSE_CLIENT_BINARY} --query "system flush logs"
+${CLICKHOUSE_CLIENT_BINARY} --query "select used_privileges, missing_privileges from system.query_log where query = '${test_query}' and type = 'ExceptionBeforeStart' and current_database = currentDatabase() order by event_time desc limit 1"
+${CLICKHOUSE_CLIENT_BINARY} --query "select used_privileges, missing_privileges from system.query_log where query = '${test_query}' and type = 'QueryStart' and current_database = currentDatabase() order by event_time desc limit 1"
+${CLICKHOUSE_CLIENT_BINARY} --query "select used_privileges, missing_privileges from system.query_log where query = '${test_query}' and type = 'QueryFinish' and current_database = currentDatabase() order by event_time desc limit 1"
+
+${CLICKHOUSE_CLIENT_BINARY} --query "drop table ${table_name}"
+${CLICKHOUSE_CLIENT_BINARY} --query "drop user ${user_name}"
diff --git a/tests/queries/0_stateless/03169_optimize_injective_functions_inside_uniq_crash.sql b/tests/queries/0_stateless/03169_optimize_injective_functions_inside_uniq_crash.sql
index 5ab32415f1c..50d99b851a6 100644
--- a/tests/queries/0_stateless/03169_optimize_injective_functions_inside_uniq_crash.sql
+++ b/tests/queries/0_stateless/03169_optimize_injective_functions_inside_uniq_crash.sql
@@ -7,7 +7,7 @@ FROM
     FROM numbers(4096 * 100)
     GROUP BY k
 )
-SETTINGS enable_analyzer = 1, optimize_injective_functions_inside_uniq=0;
+SETTINGS allow_experimental_analyzer = 1, optimize_injective_functions_inside_uniq=0;
 
 SELECT sum(u)
 FROM
@@ -18,4 +18,4 @@ FROM
     FROM numbers(4096 * 100)
     GROUP BY k
 )
-SETTINGS enable_analyzer = 1, optimize_injective_functions_inside_uniq=1;
+SETTINGS allow_experimental_analyzer = 1, optimize_injective_functions_inside_uniq=1;
diff --git a/tests/queries/0_stateless/03169_time_virtual_column.sh b/tests/queries/0_stateless/03169_time_virtual_column.sh
index b289f39accb..fef1de8c6f2 100755
--- a/tests/queries/0_stateless/03169_time_virtual_column.sh
+++ b/tests/queries/0_stateless/03169_time_virtual_column.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 echo "1,2" > $CLICKHOUSE_TEST_UNIQUE_NAME.csv
 sleep 1
-$CLICKHOUSE_LOCAL -m -q "
+$CLICKHOUSE_LOCAL -nm -q "
 select _size, (dateDiff('millisecond', _time, now()) < 600000 AND dateDiff('millisecond', _time, now()) > 0) from file('$CLICKHOUSE_TEST_UNIQUE_NAME.csv');
 "
 rm $CLICKHOUSE_TEST_UNIQUE_NAME.csv
diff --git a/tests/queries/0_stateless/03170_ecs_crash.reference b/tests/queries/0_stateless/03170_ecs_crash.reference
deleted file mode 100644
index acd7c60768b..00000000000
--- a/tests/queries/0_stateless/03170_ecs_crash.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-1	2	3
-4	5	6
-7	8	9
-0	0	0
diff --git a/tests/queries/0_stateless/03170_ecs_crash.sh b/tests/queries/0_stateless/03170_ecs_crash.sh
deleted file mode 100755
index fa6870c4cf2..00000000000
--- a/tests/queries/0_stateless/03170_ecs_crash.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-# Previous versions crashed in attempt to use this authentication method (regardless of whether it was able to authenticate):
-AWS_CONTAINER_CREDENTIALS_FULL_URI=http://localhost:1338/latest/meta-data/container/security-credentials $CLICKHOUSE_LOCAL -q "select * from s3('http://localhost:11111/test/a.tsv')"
diff --git a/tests/queries/0_stateless/03170_part_offset_as_table_column.sql b/tests/queries/0_stateless/03170_part_offset_as_table_column.sql
index 7711457f23f..36cbc156744 100644
--- a/tests/queries/0_stateless/03170_part_offset_as_table_column.sql
+++ b/tests/queries/0_stateless/03170_part_offset_as_table_column.sql
@@ -9,12 +9,12 @@ ORDER BY key;
 INSERT INTO test_table (key) SELECT number
 FROM numbers(10);
 
-set enable_analyzer=0;
+set allow_experimental_analyzer=0;
 
 SELECT *
 FROM test_table;
 
-set enable_analyzer=1;
+set allow_experimental_analyzer=1;
 
 SELECT *
 FROM test_table;
diff --git a/tests/queries/0_stateless/03171_condition_pushdown.sql b/tests/queries/0_stateless/03171_condition_pushdown.sql
index fcf5db886e9..9cfe41ce921 100644
--- a/tests/queries/0_stateless/03171_condition_pushdown.sql
+++ b/tests/queries/0_stateless/03171_condition_pushdown.sql
@@ -1,5 +1,5 @@
 -- This query succeeds only if it is correctly optimized.
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 SELECT * FROM (SELECT * FROM numbers(1e19)) AS t1, (SELECT * FROM numbers(1e19)) AS t2 WHERE t1.number IN (123, 456) AND t2.number = t1.number ORDER BY ALL;
 
 -- Still TODO:
diff --git a/tests/queries/0_stateless/03171_function_to_subcolumns_fuzzer.sql b/tests/queries/0_stateless/03171_function_to_subcolumns_fuzzer.sql
index 53476c5bdd1..f10019a78dd 100644
--- a/tests/queries/0_stateless/03171_function_to_subcolumns_fuzzer.sql
+++ b/tests/queries/0_stateless/03171_function_to_subcolumns_fuzzer.sql
@@ -1,5 +1,5 @@
 SET optimize_functions_to_subcolumns = 1;
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS t_func_to_subcolumns_map_2;
 
diff --git a/tests/queries/0_stateless/03171_hashed_dictionary_short_circuit_bug_fix.sql b/tests/queries/0_stateless/03171_hashed_dictionary_short_circuit_bug_fix.sql
index 6d3a63dbadb..e1b5531a442 100644
--- a/tests/queries/0_stateless/03171_hashed_dictionary_short_circuit_bug_fix.sql
+++ b/tests/queries/0_stateless/03171_hashed_dictionary_short_circuit_bug_fix.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE TABLE x ( hash_id UInt64, user_result Decimal(3, 2) ) ENGINE = Memory();
 
 CREATE TABLE y ( hash_id UInt64, user_result  DECIMAL(18, 6) ) ENGINE = Memory();
diff --git a/tests/queries/0_stateless/03172_dynamic_binary_serialization.sh b/tests/queries/0_stateless/03172_dynamic_binary_serialization.sh
index b9bab2bd70b..9b57e5c8718 100755
--- a/tests/queries/0_stateless/03172_dynamic_binary_serialization.sh
+++ b/tests/queries/0_stateless/03172_dynamic_binary_serialization.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 $CLICKHOUSE_CLIENT -q "drop table if exists test"
-$CLICKHOUSE_CLIENT --allow_experimental_dynamic_type=1 -q "create table test (id UInt64, d Dynamic(max_types=254)) engine=Memory"
+$CLICKHOUSE_CLIENT --allow_experimental_dynamic_type=1 -q "create table test (id UInt64, d Dynamic(max_types=255)) engine=Memory"
 
 $CLICKHOUSE_CLIENT -q "insert into test select 0, NULL"
 $CLICKHOUSE_CLIENT -q "insert into test select 1, materialize(42)::UInt8"
@@ -58,6 +58,6 @@ $CLICKHOUSE_CLIENT -q "insert into test select 47, materialize([[(20, 20), (50,
 $CLICKHOUSE_CLIENT -q "insert into test select 48, materialize([[[(0, 0), (10, 0), (10, 10), (0, 10)]], [[(20, 20), (50, 20), (50, 50), (20, 50)],[(30, 30), (50, 50), (50, 30)]]])::MultiPolygon"
 $CLICKHOUSE_CLIENT -q "insert into test select 49, materialize([map(42, tuple(1, [tuple(2, map(1, 2))]))])"
 
-$CLICKHOUSE_CLIENT -q "select * from test format RowBinary" | $CLICKHOUSE_LOCAL --allow_experimental_dynamic_type=1 --input-format RowBinary --structure 'id UInt64, d Dynamic(max_types=254)' -q "select d, dynamicType(d) from table order by id"
+$CLICKHOUSE_CLIENT -q "select * from test format RowBinary" | $CLICKHOUSE_LOCAL --allow_experimental_dynamic_type=1 --input-format RowBinary --structure 'id UInt64, d Dynamic(max_types=255)' -q "select d, dynamicType(d) from table order by id"
 $CLICKHOUSE_CLIENT -q "drop table test"
 
diff --git a/tests/queries/0_stateless/03172_http_content_encoding.reference b/tests/queries/0_stateless/03172_http_content_encoding.reference
deleted file mode 100644
index 1671d148388..00000000000
--- a/tests/queries/0_stateless/03172_http_content_encoding.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-< Content-Encoding: zstd
-< Content-Encoding: zstd
diff --git a/tests/queries/0_stateless/03172_http_content_encoding.sh b/tests/queries/0_stateless/03172_http_content_encoding.sh
deleted file mode 100755
index bc55e6d44cc..00000000000
--- a/tests/queries/0_stateless/03172_http_content_encoding.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-URL="${CLICKHOUSE_PORT_HTTP_PROTO}://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_HTTP}/"
-
-# with progress
-${CLICKHOUSE_CURL} -vsS "${URL}?send_progress_in_http_headers=1&enable_http_compression=1&wait_end_of_query=0" -o /dev/null \
-  -H 'Accept-Encoding: zstd' --compressed --data-binary @- <<< "select distinct sleep(.1),name from generateRandom('name String',1,1000,2) limit 100009 format TSV" 2>&1 \
-  | perl -lnE 'print if /Content-Encoding/';
-# no progress
-${CLICKHOUSE_CURL} -vsS "${URL}?send_progress_in_http_headers=0&enable_http_compression=1&wait_end_of_query=0" -o /dev/null \
-  -H 'Accept-Encoding: zstd' --compressed --data-binary @- <<< "select distinct sleep(.1),name from generateRandom('name String',1,1000,2) limit 100009 format TSV" 2>&1 \
-  | perl -lnE 'print if /Content-Encoding/';
diff --git a/tests/queries/0_stateless/03172_system_detached_tables.reference b/tests/queries/0_stateless/03172_system_detached_tables.reference
index 2fce89e5980..83d1ff13942 100644
--- a/tests/queries/0_stateless/03172_system_detached_tables.reference
+++ b/tests/queries/0_stateless/03172_system_detached_tables.reference
@@ -1,11 +1,11 @@
 database atomic tests
-default_atomic	test_table	0
-default_atomic	test_table_perm	1
-default_atomic	test_table	0
-default_atomic	test_table_perm	1
-default_atomic	test_table	0
+test03172_system_detached_tables	test_table	0
+test03172_system_detached_tables	test_table_perm	1
+test03172_system_detached_tables	test_table	0
+test03172_system_detached_tables	test_table_perm	1
+test03172_system_detached_tables	test_table	0
 -----------------------
 database lazy tests
-before attach	default_lazy	test_table	0
-before attach	default_lazy	test_table_perm	1
+before attach	test03172_system_detached_tables_lazy	test_table	0
+before attach	test03172_system_detached_tables_lazy	test_table_perm	1
 DROP TABLE
diff --git a/tests/queries/0_stateless/03172_system_detached_tables.sh b/tests/queries/0_stateless/03172_system_detached_tables.sh
deleted file mode 100755
index 60e913b62a8..00000000000
--- a/tests/queries/0_stateless/03172_system_detached_tables.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-DATABASE_ATOMIC="${CLICKHOUSE_DATABASE}_atomic"
-DATABASE_LAZY="${CLICKHOUSE_DATABASE}_lazy"
-
-$CLICKHOUSE_CLIENT "
-
-SELECT 'database atomic tests';
-DROP DATABASE IF EXISTS ${DATABASE_ATOMIC};
-CREATE DATABASE IF NOT EXISTS ${DATABASE_ATOMIC} ENGINE=Atomic;
-
-CREATE TABLE ${DATABASE_ATOMIC}.test_table (n Int64) ENGINE=MergeTree ORDER BY n;
-SELECT * FROM system.detached_tables WHERE database='${DATABASE_ATOMIC}';
-
-DETACH TABLE ${DATABASE_ATOMIC}.test_table;
-SELECT database, table, is_permanently FROM system.detached_tables WHERE database='${DATABASE_ATOMIC}';
-
-ATTACH TABLE ${DATABASE_ATOMIC}.test_table;
-
-CREATE TABLE ${DATABASE_ATOMIC}.test_table_perm (n Int64) ENGINE=MergeTree ORDER BY n;
-SELECT * FROM system.detached_tables WHERE database='${DATABASE_ATOMIC}';
-
-DETACH TABLE ${DATABASE_ATOMIC}.test_table_perm PERMANENTLY;
-SELECT database, table, is_permanently FROM system.detached_tables WHERE database='${DATABASE_ATOMIC}';
-
-DETACH TABLE ${DATABASE_ATOMIC}.test_table SYNC;
-SELECT database, table, is_permanently FROM system.detached_tables WHERE database='${DATABASE_ATOMIC}';
-
-SELECT database, table, is_permanently FROM system.detached_tables WHERE database='${DATABASE_ATOMIC}' AND table='test_table';
-
-DROP DATABASE ${DATABASE_ATOMIC} SYNC;
-
-"
-
-$CLICKHOUSE_CLIENT "
-
-SELECT '-----------------------';
-SELECT 'database lazy tests';
-
-DROP DATABASE IF EXISTS ${DATABASE_LAZY};
-CREATE DATABASE ${DATABASE_LAZY} Engine=Lazy(10);
-
-CREATE TABLE ${DATABASE_LAZY}.test_table (number UInt64) engine=Log;
-INSERT INTO ${DATABASE_LAZY}.test_table SELECT * FROM numbers(100);
-DETACH TABLE ${DATABASE_LAZY}.test_table;
-
-CREATE TABLE ${DATABASE_LAZY}.test_table_perm (number UInt64) engine=Log;
-INSERT INTO ${DATABASE_LAZY}.test_table_perm SELECT * FROM numbers(100);
-DETACH table ${DATABASE_LAZY}.test_table_perm PERMANENTLY;
-
-SELECT 'before attach', database, table, is_permanently FROM system.detached_tables WHERE database='${DATABASE_LAZY}';
-
-ATTACH TABLE ${DATABASE_LAZY}.test_table;
-ATTACH TABLE ${DATABASE_LAZY}.test_table_perm;
-
-SELECT 'after attach', database, table, is_permanently FROM system.detached_tables WHERE database='${DATABASE_LAZY}';
-
-SELECT 'DROP TABLE';
-DROP TABLE  ${DATABASE_LAZY}.test_table SYNC;
-DROP TABLE  ${DATABASE_LAZY}.test_table_perm SYNC;
-
-DROP DATABASE ${DATABASE_LAZY} SYNC;
-
-"
diff --git a/tests/queries/0_stateless/03172_system_detached_tables.sql b/tests/queries/0_stateless/03172_system_detached_tables.sql
new file mode 100644
index 00000000000..1a3c2d7cc0f
--- /dev/null
+++ b/tests/queries/0_stateless/03172_system_detached_tables.sql
@@ -0,0 +1,53 @@
+-- Tags: no-parallel
+
+SELECT 'database atomic tests';
+DROP DATABASE IF EXISTS test03172_system_detached_tables;
+CREATE DATABASE IF NOT EXISTS test03172_system_detached_tables ENGINE=Atomic;
+
+CREATE TABLE test03172_system_detached_tables.test_table (n Int64) ENGINE=MergeTree ORDER BY n;
+SELECT * FROM system.detached_tables WHERE database='test03172_system_detached_tables';
+
+DETACH TABLE test03172_system_detached_tables.test_table;
+SELECT database, table, is_permanently FROM system.detached_tables WHERE database='test03172_system_detached_tables';
+
+ATTACH TABLE test03172_system_detached_tables.test_table;
+
+CREATE TABLE test03172_system_detached_tables.test_table_perm (n Int64) ENGINE=MergeTree ORDER BY n;
+SELECT * FROM system.detached_tables WHERE database='test03172_system_detached_tables';
+
+DETACH TABLE test03172_system_detached_tables.test_table_perm PERMANENTLY;
+SELECT database, table, is_permanently FROM system.detached_tables WHERE database='test03172_system_detached_tables';
+
+DETACH TABLE test03172_system_detached_tables.test_table SYNC;
+SELECT database, table, is_permanently FROM system.detached_tables WHERE database='test03172_system_detached_tables';
+
+SELECT database, table, is_permanently FROM system.detached_tables WHERE database='test03172_system_detached_tables' AND table='test_table';
+
+DROP DATABASE test03172_system_detached_tables SYNC;
+
+SELECT '-----------------------';
+SELECT 'database lazy tests';
+
+DROP DATABASE IF EXISTS test03172_system_detached_tables_lazy;
+CREATE DATABASE test03172_system_detached_tables_lazy Engine=Lazy(10);
+
+CREATE TABLE test03172_system_detached_tables_lazy.test_table (number UInt64) engine=Log;
+INSERT INTO test03172_system_detached_tables_lazy.test_table SELECT * FROM numbers(100);
+DETACH TABLE test03172_system_detached_tables_lazy.test_table;
+
+CREATE TABLE test03172_system_detached_tables_lazy.test_table_perm (number UInt64) engine=Log;
+INSERT INTO test03172_system_detached_tables_lazy.test_table_perm SELECT * FROM numbers(100);
+DETACH table test03172_system_detached_tables_lazy.test_table_perm PERMANENTLY;
+
+SELECT 'before attach', database, table, is_permanently FROM system.detached_tables WHERE database='test03172_system_detached_tables_lazy';
+
+ATTACH TABLE test03172_system_detached_tables_lazy.test_table;
+ATTACH TABLE test03172_system_detached_tables_lazy.test_table_perm;
+
+SELECT 'after attach', database, table, is_permanently FROM system.detached_tables WHERE database='test03172_system_detached_tables_lazy';
+
+SELECT 'DROP TABLE';
+DROP TABLE  test03172_system_detached_tables_lazy.test_table SYNC;
+DROP TABLE  test03172_system_detached_tables_lazy.test_table_perm SYNC;
+
+DROP DATABASE test03172_system_detached_tables_lazy SYNC;
diff --git a/tests/queries/0_stateless/03173_forbid_qualify.sql b/tests/queries/0_stateless/03173_forbid_qualify.sql
index 0a41385c52f..d8cb2bad2ea 100644
--- a/tests/queries/0_stateless/03173_forbid_qualify.sql
+++ b/tests/queries/0_stateless/03173_forbid_qualify.sql
@@ -4,8 +4,8 @@ create table test_qualify (number Int64) ENGINE = MergeTree ORDER BY (number);
 insert into test_qualify SELECT * FROM numbers(100);
 
 select count() from test_qualify; -- 100
-select * from test_qualify qualify row_number() over (order by number) = 50 SETTINGS enable_analyzer = 1; -- 49
-select * from test_qualify qualify row_number() over (order by number) = 50 SETTINGS enable_analyzer = 0; -- { serverError NOT_IMPLEMENTED }
+select * from test_qualify qualify row_number() over (order by number) = 50 SETTINGS allow_experimental_analyzer = 1; -- 49
+select * from test_qualify qualify row_number() over (order by number) = 50 SETTINGS allow_experimental_analyzer = 0; -- { serverError NOT_IMPLEMENTED }
 
 delete from test_qualify where number in (select number from test_qualify qualify row_number() over (order by number) = 50); -- { serverError UNFINISHED }
 select count() from test_qualify; -- 100
diff --git a/tests/queries/0_stateless/03173_parallel_replicas_join_bug.sh b/tests/queries/0_stateless/03173_parallel_replicas_join_bug.sh
index d2be9899f86..20a29e2734e 100755
--- a/tests/queries/0_stateless/03173_parallel_replicas_join_bug.sh
+++ b/tests/queries/0_stateless/03173_parallel_replicas_join_bug.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-$CLICKHOUSE_CLIENT -q "
+$CLICKHOUSE_CLIENT -nq "
   CREATE TABLE ids (id UUID, whatever String) Engine=MergeTree ORDER BY tuple();
   INSERT INTO ids VALUES ('a1451105-722e-4fe7-bfaa-65ad2ae249c2', 'whatever');
 
@@ -16,8 +16,8 @@ $CLICKHOUSE_CLIENT -q "
   INSERT INTO data2 VALUES ('a1451105-722e-4fe7-bfaa-65ad2ae249c2', '2000-01-02', 'CREATED');
 "
 
-$CLICKHOUSE_CLIENT -q "
-SET enable_analyzer = 1, cluster_for_parallel_replicas = 'parallel_replicas', max_parallel_replicas = 10, allow_experimental_parallel_reading_from_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, max_threads = 1;
+$CLICKHOUSE_CLIENT -nq "
+SET allow_experimental_analyzer = 1, cluster_for_parallel_replicas = 'parallel_replicas', max_parallel_replicas = 10, allow_experimental_parallel_reading_from_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, max_threads = 1;
 
 SELECT
     id,
diff --git a/tests/queries/0_stateless/03173_row_binary_and_native_with_binary_encoded_types.reference b/tests/queries/0_stateless/03173_row_binary_and_native_with_binary_encoded_types.reference
index 7de0804e0f2..1ba147f9627 100644
--- a/tests/queries/0_stateless/03173_row_binary_and_native_with_binary_encoded_types.reference
+++ b/tests/queries/0_stateless/03173_row_binary_and_native_with_binary_encoded_types.reference
@@ -110,5 +110,5 @@ true	Bool
 [{42:(1,[(2,{1:2})])}]	Dynamic
 [{42:(1,[(2,{1:2})])}]	Dynamic(max_types=10)
 [{42:(1,[(2,{1:2})])}]	Dynamic(max_types=10)
-[{42:(1,[(2,{1:2})])}]	Dynamic(max_types=254)
-[{42:(1,[(2,{1:2})])}]	Dynamic(max_types=254)
+[{42:(1,[(2,{1:2})])}]	Dynamic(max_types=255)
+[{42:(1,[(2,{1:2})])}]	Dynamic(max_types=255)
diff --git a/tests/queries/0_stateless/03173_row_binary_and_native_with_binary_encoded_types.sh b/tests/queries/0_stateless/03173_row_binary_and_native_with_binary_encoded_types.sh
index 1e674a29072..723b11ad620 100755
--- a/tests/queries/0_stateless/03173_row_binary_and_native_with_binary_encoded_types.sh
+++ b/tests/queries/0_stateless/03173_row_binary_and_native_with_binary_encoded_types.sh
@@ -6,8 +6,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 function test
 {
-    $CLICKHOUSE_LOCAL --stacktrace --allow_experimental_dynamic_type=1 --allow_experimental_variant_type=1 --output_format_binary_encode_types_in_binary_format=1 -q "select $1 as value format RowBinaryWithNamesAndTypes" | $CLICKHOUSE_LOCAL --input-format RowBinaryWithNamesAndTypes --input_format_binary_decode_types_in_binary_format=1 -q "select value, toTypeName(value) from table"
-    $CLICKHOUSE_LOCAL --stacktrace --allow_experimental_dynamic_type=1 --allow_experimental_variant_type=1 --output_format_native_encode_types_in_binary_format=1 -q "select $1 as value format Native" | $CLICKHOUSE_LOCAL --input-format Native --input_format_native_decode_types_in_binary_format=1 -q "select value, toTypeName(value) from table"
+  $CLICKHOUSE_LOCAL --allow_experimental_dynamic_type=1 --allow_experimental_variant_type=1 --output_format_binary_encode_types_in_binary_format=1 -q "select $1 as value format RowBinaryWithNamesAndTypes" | $CLICKHOUSE_LOCAL --input-format RowBinaryWithNamesAndTypes --input_format_binary_decode_types_in_binary_format=1 -q "select value, toTypeName(value) from table"
+  $CLICKHOUSE_LOCAL --allow_experimental_dynamic_type=1 --allow_experimental_variant_type=1 --output_format_native_encode_types_in_binary_format=1 -q "select $1 as value format Native" | $CLICKHOUSE_LOCAL --input-format Native --input_format_native_decode_types_in_binary_format=1 -q "select value, toTypeName(value) from table"
 }
 
 test "materialize(42)::UInt8"
@@ -66,4 +66,4 @@ test "materialize([map(42, tuple(1, [tuple(2, map(1, 2))]))])"
 test "materialize(42::UInt32)::Variant(UInt32, String, Tuple(a UInt32, b Array(Map(String, String))))"
 test "materialize([map(42, tuple(1, [tuple(2, map(1, 2))]))])::Dynamic"
 test "materialize([map(42, tuple(1, [tuple(2, map(1, 2))]))])::Dynamic(max_types=10)"
-test "materialize([map(42, tuple(1, [tuple(2, map(1, 2))]))])::Dynamic(max_types=254)"
+test "materialize([map(42, tuple(1, [tuple(2, map(1, 2))]))])::Dynamic(max_types=255)"
diff --git a/tests/queries/0_stateless/03174_exact_rows_before_aggregation.reference b/tests/queries/0_stateless/03174_exact_rows_before_aggregation.reference
deleted file mode 100644
index 5f7fedbbcb3..00000000000
--- a/tests/queries/0_stateless/03174_exact_rows_before_aggregation.reference
+++ /dev/null
@@ -1,548 +0,0 @@
-{
-	"meta":
-	[
-		{
-			"name": "i",
-			"type": "Int32"
-		}
-	],
-
-	"data":
-	[
-		[0],
-		[1],
-		[2],
-		[3],
-		[4],
-		[5],
-		[6],
-		[7],
-		[8],
-		[9]
-	],
-
-	"rows": 10,
-
-	"rows_before_aggregation": 10
-}
-<?xml version='1.0' encoding='UTF-8' ?>
-<result>
-	<meta>
-		<columns>
-			<column>
-				<name>i</name>
-				<type>Int32</type>
-			</column>
-		</columns>
-	</meta>
-	<data>
-		<row>
-			<i>0</i>
-		</row>
-		<row>
-			<i>1</i>
-		</row>
-		<row>
-			<i>2</i>
-		</row>
-		<row>
-			<i>3</i>
-		</row>
-		<row>
-			<i>4</i>
-		</row>
-		<row>
-			<i>5</i>
-		</row>
-		<row>
-			<i>6</i>
-		</row>
-		<row>
-			<i>7</i>
-		</row>
-		<row>
-			<i>8</i>
-		</row>
-		<row>
-			<i>9</i>
-		</row>
-	</data>
-	<rows>10</rows>
-	<rows_before_aggregation>10</rows_before_aggregation>
-</result>
-{
-	"meta":
-	[
-		{
-			"name": "i",
-			"type": "Int32"
-		}
-	],
-
-	"data":
-	[
-		[10],
-		[11],
-		[12]
-	],
-
-	"rows": 3,
-
-	"rows_before_aggregation": 3
-}
-{
-	"meta":
-	[
-		{
-			"name": "i",
-			"type": "Int32"
-		}
-	],
-
-	"data":
-	[
-		[0],
-		[1],
-		[2],
-		[3],
-		[4],
-		[5],
-		[6],
-		[7],
-		[8],
-		[9],
-		[10],
-		[11],
-		[12],
-		[13],
-		[14],
-		[15],
-		[16],
-		[17],
-		[18],
-		[19]
-	],
-
-	"rows": 20,
-
-	"rows_before_aggregation": 20
-}
-{
-	"meta":
-	[
-		{
-			"name": "max(i)",
-			"type": "Int32"
-		}
-	],
-
-	"data":
-	[
-		[19]
-	],
-
-	"rows": 1,
-
-	"rows_before_limit_at_least": 1,
-
-	"rows_before_aggregation": 20
-}
-{
-	"meta":
-	[
-		{
-			"name": "i",
-			"type": "Int32"
-		}
-	],
-
-	"data":
-	[
-		[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]
-	],
-
-	"rows": 30,
-
-	"rows_before_limit_at_least": 60,
-
-	"rows_before_aggregation": 60
-}
-{
-	"meta":
-	[
-		{
-			"name": "i",
-			"type": "Int32"
-		}
-	],
-
-	"data":
-	[
-		[0],
-		[1],
-		[2],
-		[3],
-		[4],
-		[5],
-		[6],
-		[7],
-		[8],
-		[9],
-		[10],
-		[11],
-		[12],
-		[13],
-		[14],
-		[15],
-		[16],
-		[17],
-		[18],
-		[19]
-	],
-
-	"rows": 20,
-
-	"rows_before_limit_at_least": 40,
-
-	"rows_before_aggregation": 40
-}
-{
-	"meta":
-	[
-		{
-			"name": "i",
-			"type": "Int32"
-		}
-	],
-
-	"data":
-	[
-		[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]
-	],
-
-	"rows": 30,
-
-	"rows_before_limit_at_least": 30,
-
-	"rows_before_aggregation": 60
-}
-{
-	"meta":
-	[
-		{
-			"name": "i",
-			"type": "Int32"
-		}
-	],
-
-	"data":
-	[
-		[0],
-		[1],
-		[2],
-		[3],
-		[4],
-		[5],
-		[6],
-		[7],
-		[8],
-		[9],
-		[10],
-		[11],
-		[12],
-		[13],
-		[14],
-		[15],
-		[16],
-		[17],
-		[18],
-		[19]
-	],
-
-	"rows": 20,
-
-	"rows_before_limit_at_least": 20,
-
-	"rows_before_aggregation": 40
-}
-{
-	"meta":
-	[
-		{
-			"name": "max(i)",
-			"type": "Int32"
-		}
-	],
-
-	"data":
-	[
-		[19]
-	],
-
-	"rows": 1,
-
-	"rows_before_limit_at_least": 1,
-
-	"rows_before_aggregation": 40
-}
-{
-	"meta":
-	[
-		{
-			"name": "i",
-			"type": "Int32"
-		}
-	],
-
-	"data":
-	[
-		[0],
-		[1],
-		[2],
-		[3],
-		[4],
-		[5],
-		[6],
-		[7],
-		[8],
-		[9]
-	],
-
-	"rows": 10,
-
-	"rows_before_limit_at_least": 10,
-
-	"rows_before_aggregation": 20
-}
-{
-	"meta":
-	[
-		{
-			"name": "i",
-			"type": "Int32"
-		}
-	],
-
-	"data":
-	[
-		[0],
-		[1],
-		[2],
-		[3],
-		[4],
-		[5],
-		[6],
-		[7],
-		[8],
-		[9]
-	],
-
-	"rows": 10,
-
-	"rows_before_limit_at_least": 10,
-
-	"rows_before_aggregation": 20
-}
-{
-	"meta":
-	[
-		{
-			"name": "i",
-			"type": "Int32"
-		}
-	],
-
-	"data":
-	[
-		[0],
-		[1],
-		[2],
-		[3],
-		[4],
-		[5],
-		[6],
-		[7],
-		[8],
-		[9]
-	],
-
-	"rows": 10,
-
-	"rows_before_aggregation": 10
-}
-{
-	"meta":
-	[
-		{
-			"name": "max(i)",
-			"type": "Int32"
-		}
-	],
-
-	"data":
-	[
-		[19]
-	],
-
-	"rows": 1,
-
-	"rows_before_limit_at_least": 1,
-
-	"rows_before_aggregation": 20
-}
-{
-	"meta":
-	[
-		{
-			"name": "i",
-			"type": "Int32"
-		}
-	],
-
-	"data":
-	[
-		[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]
-	],
-
-	"rows": 30,
-
-	"rows_before_limit_at_least": 60,
-
-	"rows_before_aggregation": 60
-}
-{
-	"meta":
-	[
-		{
-			"name": "i",
-			"type": "Int32"
-		}
-	],
-
-	"data":
-	[
-		[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]
-	],
-
-	"rows": 30,
-
-	"rows_before_limit_at_least": 30,
-
-	"rows_before_aggregation": 60
-}
diff --git a/tests/queries/0_stateless/03174_exact_rows_before_aggregation.sql b/tests/queries/0_stateless/03174_exact_rows_before_aggregation.sql
deleted file mode 100644
index f9fd4ef5a7b..00000000000
--- a/tests/queries/0_stateless/03174_exact_rows_before_aggregation.sql
+++ /dev/null
@@ -1,47 +0,0 @@
--- Tags: no-parallel, no-random-merge-tree-settings
-
-set rows_before_aggregation = 1, exact_rows_before_limit = 1, output_format_write_statistics = 0, max_block_size = 100;
-
-drop table if exists test;
-
-create table test (i int) engine MergeTree order by tuple();
-insert into test select arrayJoin(range(10000));
-
-select * from test where i < 10 group by i order by i FORMAT JSONCompact;
-select * from test where i < 10 group by i order by i FORMAT XML;
-select * from test group by i having i in (10, 11, 12) order by i FORMAT JSONCompact;
-select * from test where i < 20 group by i order by i FORMAT JSONCompact;
-select max(i) from test where i < 20 limit 1 FORMAT JSONCompact;
-
-set prefer_localhost_replica = 0;
-select * from cluster(test_cluster_two_shards, currentDatabase(), test) where i < 30 group by i order by i FORMAT JSONCompact;
-select * from cluster(test_cluster_two_shards, currentDatabase(), test) where i < 20 group by i order by i FORMAT JSONCompact;
-
-set prefer_localhost_replica = 1;
-select * from cluster(test_cluster_two_shards, currentDatabase(), test) where i < 30 group by i order by i FORMAT JSONCompact;
-select * from cluster(test_cluster_two_shards, currentDatabase(), test) where i < 20 group by i order by i FORMAT JSONCompact;
-
-select max(i) from cluster(test_cluster_two_shards, currentDatabase(), test) where i < 20 FORMAT JSONCompact;
-
-select * from (select * from cluster(test_cluster_two_shards, currentDatabase(), test) where i < 10) group by i order by i limit 10 FORMAT JSONCompact;
-set prefer_localhost_replica = 0;
-select * from (select * from cluster(test_cluster_two_shards, currentDatabase(), test) where i < 10) group by i order by i limit 10 FORMAT JSONCompact;
-
-drop table if exists test;
-
-create table test (i int) engine MergeTree order by i;
-
-insert into test select arrayJoin(range(10000));
-
-set optimize_aggregation_in_order=1;
-
-select * from test where i < 10 group by i order by i FORMAT JSONCompact;
-select max(i) from test where i < 20 limit 1 FORMAT JSONCompact;
-
-set prefer_localhost_replica = 0;
-select * from cluster(test_cluster_two_shards, currentDatabase(), test) where i < 30 group by i order by i FORMAT JSONCompact;
-
-set prefer_localhost_replica = 1;
-select * from cluster(test_cluster_two_shards, currentDatabase(), test) where i < 30 group by i order by i FORMAT JSONCompact;
-
-drop table if exists test;
diff --git a/tests/queries/0_stateless/03174_json_compact_with_progress.reference b/tests/queries/0_stateless/03174_json_compact_with_progress.reference
deleted file mode 100644
index cdbe7cfcb3e..00000000000
--- a/tests/queries/0_stateless/03174_json_compact_with_progress.reference
+++ /dev/null
@@ -1,15 +0,0 @@
-1
-{"meta": [{"name":"value", "type":"UInt8"}, {"name":"name", "type":"String"}]}
-{"data":[1, "a"]}
-{"data":[2, "b"]}
-{"data":[3, "c"]}
-{"statistics": {"rows":3, "elapsed":ELAPSED, "rows_read":3, "bytes_read":33}}
-2
-{"meta": [{"name":"name", "type":"String"}, {"name":"c", "type":"UInt64"}]}
-{"data":["a", "1"]}
-{"data":["b", "1"]}
-{"data":["c", "1"]}
-{"totals": ["", "3"]}
-{"statistics": {"rows":3, "elapsed":ELAPSED, "rows_read":3, "bytes_read":30}}
-3
-Value passed to 'throwIf' function is non-zero:
diff --git a/tests/queries/0_stateless/03174_json_compact_with_progress.sh b/tests/queries/0_stateless/03174_json_compact_with_progress.sh
deleted file mode 100755
index b15dc7cfdb2..00000000000
--- a/tests/queries/0_stateless/03174_json_compact_with_progress.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/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_table;"
-
-$CLICKHOUSE_CLIENT -q "SELECT 1;"
-# Check JSONCompactWithProgress Output 
-$CLICKHOUSE_CLIENT -q "CREATE TABLE test_table (value UInt8, name String) ENGINE = MergeTree() ORDER BY value;"
-$CLICKHOUSE_CLIENT -q "INSERT INTO test_table VALUES (1, 'a'), (2, 'b'), (3, 'c');"
-$CLICKHOUSE_CLIENT -q "SELECT * FROM test_table FORMAT JSONCompactWithProgress settings max_block_size=2;" |  grep -v --text "progress" | sed -E 's/"elapsed":[0-9]+\.[0-9]+/"elapsed":ELAPSED/g'
-
-$CLICKHOUSE_CLIENT -q "SELECT 2;"
-# Check Totals 
-$CLICKHOUSE_CLIENT -q "SELECT name, count() AS c FROM test_table GROUP BY name WITH TOTALS ORDER BY name FORMAT JSONCompactWithProgress settings max_block_size=2;" | grep -v --text "progress" | sed -E 's/"elapsed":[0-9]+\.[0-9]+/"elapsed":ELAPSED/g'
-
-$CLICKHOUSE_CLIENT -q "SELECT 3;"
-# Check exceptions
-${CLICKHOUSE_CURL} -sS "$CLICKHOUSE_URL" -d "SELECT throwIf(number = 15), 1::Int64 as a, '\"' from numbers(100) format JSONCompactWithProgress settings output_format_json_quote_64bit_integers=1, max_block_size=10" | grep "exception" | cut -c42-88
-
-$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS test_table;"
diff --git a/tests/queries/0_stateless/03174_low_cardinality_group_by_distributed_plan.reference b/tests/queries/0_stateless/03174_low_cardinality_group_by_distributed_plan.reference
new file mode 100644
index 00000000000..1508c24f410
--- /dev/null
+++ b/tests/queries/0_stateless/03174_low_cardinality_group_by_distributed_plan.reference
@@ -0,0 +1,55 @@
+-- { echoOn }
+SELECT concatWithSeparator('.', toUInt128(6), '666' as b, materialize(toLowCardinality(8)))
+FROM system.one
+GROUP BY '666';
+6.666.8
+SELECT concatWithSeparator('.', toUInt128(6), '666' as b, materialize(toLowCardinality(8)))
+FROM remote('127.0.0.{1,1}', 'system.one')
+GROUP BY '666';
+6.666.8
+-- https://github.com/ClickHouse/ClickHouse/issues/63006
+SELECT
+    6,
+    concat(' World', toUInt128(6), 6, 6, 6, toNullable(6), materialize(toLowCardinality(toNullable(toUInt128(6))))) AS a,
+    concat(concat(' World', 6, toLowCardinality(6), ' World', toUInt256(6), materialize(6), 6, toNullable(6), 6, 6, NULL, 6, 6), ' World', 6, 6, 6, 6, toUInt256(6), NULL, 6, 6) AS b
+FROM system.one
+GROUP BY toNullable(6)
+    WITH ROLLUP
+WITH TOTALS;
+6	 World666666	\N
+6	 World666666	\N
+
+6	 World666666	\N
+SELECT
+    6,
+    concat(' World', toUInt128(6), 6, 6, 6, toNullable(6), materialize(toLowCardinality(toNullable(toUInt128(6))))) AS a,
+    concat(concat(' World', 6, toLowCardinality(6), ' World', toUInt256(6), materialize(6), 6, toNullable(6), 6, 6, NULL, 6, 6), ' World', 6, 6, 6, 6, toUInt256(6), NULL, 6, 6) AS b
+FROM remote('127.0.0.1')
+GROUP BY toNullable(6)
+    WITH ROLLUP
+    WITH TOTALS;
+6	 World666666	\N
+6	 World666666	\N
+
+6	 World666666	\N
+-- { echoOn }
+SELECT
+    '%',
+    tuple(concat('%', 1, toLowCardinality(toLowCardinality(toNullable(materialize(1)))), currentDatabase(), 101., toNullable(13), '%AS%id_02%', toNullable(toNullable(10)), toLowCardinality(toNullable(10)), 10, 10)),
+    (toDecimal128(99.67, 6), 36, 61, 14)
+FROM dist_03174
+WHERE dummy IN (0, '255')
+GROUP BY
+    toNullable(13),
+    (99.67, 61, toLowCardinality(14));
+%	('%11default10113%AS%id_02%10101010')	(99.67,36,61,14)
+-- { echoOn }
+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(CAST(NULL, 'Nullable(Int8)'), toNullable(3)))
+FORMAT Null
+SETTINGS max_threads = 1, allow_experimental_analyzer = 1, cluster_for_parallel_replicas = 'parallel_replicas', max_parallel_replicas = 3, allow_experimental_parallel_reading_from_replicas = 1, parallel_replicas_for_non_replicated_merge_tree = 1, max_threads = 1;
diff --git a/tests/queries/0_stateless/03174_low_cardinality_group_by_distributed_plan.sql b/tests/queries/0_stateless/03174_low_cardinality_group_by_distributed_plan.sql
new file mode 100644
index 00000000000..d397d30e285
--- /dev/null
+++ b/tests/queries/0_stateless/03174_low_cardinality_group_by_distributed_plan.sql
@@ -0,0 +1,80 @@
+-- There are various tests that check that group by keys don't propagate into functions replacing const arguments
+-- by full (empty) columns
+
+DROP TABLE IF EXISTS dist_03174;
+DROP TABLE IF EXISTS set_index_not__fuzz_0;
+
+-- https://github.com/ClickHouse/ClickHouse/issues/63006
+
+SET allow_experimental_analyzer=1;
+
+-- { echoOn }
+SELECT concatWithSeparator('.', toUInt128(6), '666' as b, materialize(toLowCardinality(8)))
+FROM system.one
+GROUP BY '666';
+
+SELECT concatWithSeparator('.', toUInt128(6), '666' as b, materialize(toLowCardinality(8)))
+FROM remote('127.0.0.{1,1}', 'system.one')
+GROUP BY '666';
+
+-- https://github.com/ClickHouse/ClickHouse/issues/63006
+SELECT
+    6,
+    concat(' World', toUInt128(6), 6, 6, 6, toNullable(6), materialize(toLowCardinality(toNullable(toUInt128(6))))) AS a,
+    concat(concat(' World', 6, toLowCardinality(6), ' World', toUInt256(6), materialize(6), 6, toNullable(6), 6, 6, NULL, 6, 6), ' World', 6, 6, 6, 6, toUInt256(6), NULL, 6, 6) AS b
+FROM system.one
+GROUP BY toNullable(6)
+    WITH ROLLUP
+WITH TOTALS;
+
+SELECT
+    6,
+    concat(' World', toUInt128(6), 6, 6, 6, toNullable(6), materialize(toLowCardinality(toNullable(toUInt128(6))))) AS a,
+    concat(concat(' World', 6, toLowCardinality(6), ' World', toUInt256(6), materialize(6), 6, toNullable(6), 6, 6, NULL, 6, 6), ' World', 6, 6, 6, 6, toUInt256(6), NULL, 6, 6) AS b
+FROM remote('127.0.0.1')
+GROUP BY toNullable(6)
+    WITH ROLLUP
+    WITH TOTALS;
+
+-- https://github.com/ClickHouse/ClickHouse/issues/64945
+-- { echoOff }
+CREATE TABLE dist_03174 AS system.one ENGINE = Distributed(test_cluster_two_shards, system, one, dummy);
+
+-- { echoOn }
+SELECT
+    '%',
+    tuple(concat('%', 1, toLowCardinality(toLowCardinality(toNullable(materialize(1)))), currentDatabase(), 101., toNullable(13), '%AS%id_02%', toNullable(toNullable(10)), toLowCardinality(toNullable(10)), 10, 10)),
+    (toDecimal128(99.67, 6), 36, 61, 14)
+FROM dist_03174
+WHERE dummy IN (0, '255')
+GROUP BY
+    toNullable(13),
+    (99.67, 61, toLowCardinality(14));
+
+-- Parallel replicas
+-- { echoOff }
+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;
+
+INSERT INTO set_index_not__fuzz_0 SELECT * FROM generateRandom() LIMIT 10;
+
+-- { echoOn }
+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(CAST(NULL, 'Nullable(Int8)'), toNullable(3)))
+FORMAT Null
+SETTINGS max_threads = 1, allow_experimental_analyzer = 1, cluster_for_parallel_replicas = 'parallel_replicas', max_parallel_replicas = 3, allow_experimental_parallel_reading_from_replicas = 1, parallel_replicas_for_non_replicated_merge_tree = 1, max_threads = 1;
+
+-- { echoOff }
+DROP TABLE IF EXISTS dist_03174;
+DROP TABLE IF EXISTS set_index_not__fuzz_0;
diff --git a/tests/queries/0_stateless/03174_merge_join_bug.sql b/tests/queries/0_stateless/03174_merge_join_bug.sql
index ab3c384765d..ab4cb6cd4a9 100644
--- a/tests/queries/0_stateless/03174_merge_join_bug.sql
+++ b/tests/queries/0_stateless/03174_merge_join_bug.sql
@@ -1,6 +1,6 @@
 -- Tags: no-random-settings
 
-SET enable_analyzer=1, join_algorithm = 'full_sorting_merge';
+SET allow_experimental_analyzer=1, join_algorithm = 'full_sorting_merge';
 CREATE TABLE xxxx_yyy (key UInt32, key_b ALIAS key) ENGINE=MergeTree() ORDER BY key SETTINGS ratio_of_defaults_for_sparse_serialization=0.0;
 INSERT INTO xxxx_yyy SELECT number FROM numbers(10);
 
diff --git a/tests/queries/0_stateless/03174_projection_deduplicate.sql b/tests/queries/0_stateless/03174_projection_deduplicate.sql
index f43f0a1f236..46222b69dc7 100644
--- a/tests/queries/0_stateless/03174_projection_deduplicate.sql
+++ b/tests/queries/0_stateless/03174_projection_deduplicate.sql
@@ -17,7 +17,7 @@ PRIMARY KEY id;
 INSERT INTO test_projection_deduplicate VALUES (1, 'one');
 INSERT INTO test_projection_deduplicate VALUES (1, 'one');
 
-OPTIMIZE TABLE test_projection_deduplicate DEDUPLICATE; -- { serverError SUPPORT_IS_DISABLED }
+OPTIMIZE TABLE test_projection_deduplicate DEDUPLICATE; -- { serverError NOT_IMPLEMENTED }
 
 SELECT * FROM test_projection_deduplicate;
 
diff --git a/tests/queries/0_stateless/03175_sparse_and_skip_index.reference b/tests/queries/0_stateless/03175_sparse_and_skip_index.reference
deleted file mode 100644
index 619e98a152a..00000000000
--- a/tests/queries/0_stateless/03175_sparse_and_skip_index.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-key	Sparse
-value	Sparse
-1000
-1
diff --git a/tests/queries/0_stateless/03175_sparse_and_skip_index.sql b/tests/queries/0_stateless/03175_sparse_and_skip_index.sql
deleted file mode 100644
index 4de6d1ac6df..00000000000
--- a/tests/queries/0_stateless/03175_sparse_and_skip_index.sql
+++ /dev/null
@@ -1,45 +0,0 @@
-DROP TABLE IF EXISTS t_bloom_filter;
-CREATE TABLE t_bloom_filter(
-  key UInt64,
-  value UInt64,
-
-  INDEX key_bf key TYPE bloom_filter(0.01) GRANULARITY 2147483648, -- bloom filter on sorting key column
-  INDEX value_bf value TYPE bloom_filter(0.01) GRANULARITY 2147483648  -- bloom filter on no-sorting column
-) ENGINE=MergeTree ORDER BY key
-SETTINGS
-    -- settings to trigger sparse serialization and vertical merge
-    ratio_of_defaults_for_sparse_serialization = 0.0
-    ,vertical_merge_algorithm_min_rows_to_activate = 1
-    ,vertical_merge_algorithm_min_columns_to_activate = 1
-    ,allow_vertical_merges_from_compact_to_wide_parts = 1
-    ,min_bytes_for_wide_part=0
-;
-
-SYSTEM STOP MERGES t_bloom_filter;
-
--- Create at least one part
-INSERT INTO t_bloom_filter
-SELECT
-    number % 100 as key, -- 100 unique keys
-    rand() % 100 as value -- 100 unique values
-FROM numbers(50_000);
-
--- And another part
-INSERT INTO t_bloom_filter
-SELECT
-    number % 100 as key, -- 100 unique keys
-    rand() % 100 as value -- 100 unique values
-FROM numbers(50_000, 50_000);
-
-SYSTEM START MERGES t_bloom_filter;
-
--- Merge everything into a single part
-OPTIMIZE TABLE t_bloom_filter FINAL;
-
--- Check sparse serialization
-SELECT column, serialization_kind FROM system.parts_columns WHERE database = currentDatabase() AND table = 't_bloom_filter' AND active ORDER BY column;
-
-SELECT COUNT() FROM t_bloom_filter WHERE key = 1;
-
--- Check bloom filter non-zero size
-SELECT COUNT() FROM system.parts WHERE database = currentDatabase() AND table = 't_bloom_filter' AND secondary_indices_uncompressed_bytes > 200 AND active;
diff --git a/tests/queries/0_stateless/03198_dynamic_read_subcolumns.sql b/tests/queries/0_stateless/03198_dynamic_read_subcolumns.sql
index 7bbe2d3c533..bbe701f022b 100644
--- a/tests/queries/0_stateless/03198_dynamic_read_subcolumns.sql
+++ b/tests/queries/0_stateless/03198_dynamic_read_subcolumns.sql
@@ -1,5 +1,4 @@
 -- Tags: no-random-settings, no-object-storage, no-parallel
--- no-parallel: Running `DROP MARK CACHE` can have a big impact on other concurrent tests
 -- Tag no-object-storage: this test relies on the number of opened files in MergeTree that can differ in object storages
 
 SET allow_experimental_dynamic_type = 1;
diff --git a/tests/queries/0_stateless/03198_settings_in_csv_tsv_schema_cache.sh b/tests/queries/0_stateless/03198_settings_in_csv_tsv_schema_cache.sh
index 583257d8fd3..ce53f467823 100755
--- a/tests/queries/0_stateless/03198_settings_in_csv_tsv_schema_cache.sh
+++ b/tests/queries/0_stateless/03198_settings_in_csv_tsv_schema_cache.sh
@@ -5,25 +5,25 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 echo -e 'a,b,c\n1,2,3' > $CLICKHOUSE_TEST_UNIQUE_NAME.csv
-$CLICKHOUSE_LOCAL -m -q "
+$CLICKHOUSE_LOCAL -nm -q "
 DESC file('$CLICKHOUSE_TEST_UNIQUE_NAME.csv') SETTINGS input_format_csv_skip_first_lines=1;
 DESC file('$CLICKHOUSE_TEST_UNIQUE_NAME.csv') SETTINGS input_format_csv_skip_first_lines=0;
 SELECT count() from system.schema_inference_cache where format = 'CSV' and additional_format_info like '%skip_first_lines%';"
 
 echo -e 'a,b,c\n"1",2,3' > $CLICKHOUSE_TEST_UNIQUE_NAME.csv
-$CLICKHOUSE_LOCAL -m -q "
+$CLICKHOUSE_LOCAL -nm -q "
 DESC file('$CLICKHOUSE_TEST_UNIQUE_NAME.csv') SETTINGS input_format_csv_try_infer_numbers_from_strings=1;
 DESC file('$CLICKHOUSE_TEST_UNIQUE_NAME.csv') SETTINGS input_format_csv_try_infer_numbers_from_strings=0;
 SELECT count() from system.schema_inference_cache where format = 'CSV' and additional_format_info like '%try_infer_numbers_from_strings%';"
 
 echo -e 'a,b,c\n"(1,2,3)",2,3' > $CLICKHOUSE_TEST_UNIQUE_NAME.csv
-$CLICKHOUSE_LOCAL -m -q "
+$CLICKHOUSE_LOCAL -nm -q "
 DESC file('$CLICKHOUSE_TEST_UNIQUE_NAME.csv') SETTINGS input_format_csv_try_infer_strings_from_quoted_tuples=1;
 DESC file('$CLICKHOUSE_TEST_UNIQUE_NAME.csv') SETTINGS input_format_csv_try_infer_strings_from_quoted_tuples=0;
 SELECT count() from system.schema_inference_cache where format = 'CSV' and additional_format_info like '%try_infer_strings_from_quoted_tuples%';"
 
 echo -e 'a\tb\tc\n1\t2\t3' > $CLICKHOUSE_TEST_UNIQUE_NAME.tsv
-$CLICKHOUSE_LOCAL -m -q "
+$CLICKHOUSE_LOCAL -nm -q "
 DESC file('$CLICKHOUSE_TEST_UNIQUE_NAME.tsv') SETTINGS input_format_tsv_skip_first_lines=1;
 DESC file('$CLICKHOUSE_TEST_UNIQUE_NAME.tsv') SETTINGS input_format_tsv_skip_first_lines=0;
 SELECT count() from system.schema_inference_cache where format = 'TSV' and additional_format_info like '%skip_first_lines%';"
diff --git a/tests/queries/0_stateless/03198_table_function_directory_path.reference b/tests/queries/0_stateless/03198_table_function_directory_path.reference
index 74cd8c6d31f..19920de3d3c 100644
--- a/tests/queries/0_stateless/03198_table_function_directory_path.reference
+++ b/tests/queries/0_stateless/03198_table_function_directory_path.reference
@@ -1,4 +1,3 @@
 2
 2
 1
-1
diff --git a/tests/queries/0_stateless/03198_table_function_directory_path.sql b/tests/queries/0_stateless/03198_table_function_directory_path.sql
index 90f687ed6a3..9e2791847af 100644
--- a/tests/queries/0_stateless/03198_table_function_directory_path.sql
+++ b/tests/queries/0_stateless/03198_table_function_directory_path.sql
@@ -1,6 +1,5 @@
 -- Tags: no-parallel
 
-INSERT INTO FUNCTION file('data_03198_table_function_directory_path.csv', 'csv') SELECT '1.csv' SETTINGS engine_file_truncate_on_insert=1;
 INSERT INTO FUNCTION file('data_03198_table_function_directory_path/1.csv', 'csv') SELECT '1.csv' SETTINGS engine_file_truncate_on_insert=1;
 INSERT INTO FUNCTION file('data_03198_table_function_directory_path/2.csv', 'csv') SELECT '2.csv' SETTINGS engine_file_truncate_on_insert=1;
 INSERT INTO FUNCTION file('data_03198_table_function_directory_path/dir/3.csv', 'csv') SELECT '3.csv' SETTINGS engine_file_truncate_on_insert=1;
@@ -12,4 +11,3 @@ SELECT COUNT(*) FROM file('data_03198_table_function_directory_path/');
 SELECT COUNT(*) FROM file('data_03198_table_function_directory_path/dir');
 SELECT COUNT(*) FROM file('data_03198_table_function_directory_path/*/dir', 'csv'); -- { serverError 74, 636 }
 SELECT COUNT(*) FROM file('data_03198_table_function_directory_pat'); -- { serverError 400 }
-SELECT COUNT(*) FROM file('data_03198_table_function_directory_path.csv');
diff --git a/tests/queries/0_stateless/03198_unload_primary_key_outdated.sh b/tests/queries/0_stateless/03198_unload_primary_key_outdated.sh
index c759cc34425..4f217935123 100755
--- a/tests/queries/0_stateless/03198_unload_primary_key_outdated.sh
+++ b/tests/queries/0_stateless/03198_unload_primary_key_outdated.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT "
+$CLICKHOUSE_CLIENT -n "
     DROP TABLE IF EXISTS t_unload_primary_key;
 
     CREATE TABLE t_unload_primary_key (a UInt64, b UInt64)
@@ -26,7 +26,7 @@ for _ in {1..100}; do
     sleep 0.3
 done
 
-$CLICKHOUSE_CLIENT "
+$CLICKHOUSE_CLIENT -n "
     SELECT name, active, primary_key_bytes_in_memory FROM system.parts WHERE database = '$CLICKHOUSE_DATABASE' AND table = 't_unload_primary_key' ORDER BY name;
     DROP TABLE IF EXISTS t_unload_primary_key;
 "
diff --git a/tests/queries/0_stateless/03199_dictionary_table_access.sh b/tests/queries/0_stateless/03199_dictionary_table_access.sh
index 14f017c7fbc..952b466b5da 100755
--- a/tests/queries/0_stateless/03199_dictionary_table_access.sh
+++ b/tests/queries/0_stateless/03199_dictionary_table_access.sh
@@ -8,7 +8,7 @@ username="user_${CLICKHOUSE_TEST_UNIQUE_NAME}"
 dictname="dict_${CLICKHOUSE_TEST_UNIQUE_NAME}"
 dicttablename="dict_table_${CLICKHOUSE_TEST_UNIQUE_NAME}"
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
     CREATE DICTIONARY IF NOT EXISTS ${dictname}
     (
         id UInt64,
@@ -26,15 +26,15 @@ ${CLICKHOUSE_CLIENT} -m --query "
     SELECT * FROM ${dicttablename};
 "
 
-$CLICKHOUSE_CLIENT -m --user="${username}" --query "
+$CLICKHOUSE_CLIENT -nm --user="${username}" --query "
     SELECT * FROM ${dictname};
 " 2>&1 | grep -o ACCESS_DENIED | uniq
 
-$CLICKHOUSE_CLIENT -m --user="${username}" --query "
+$CLICKHOUSE_CLIENT -nm --user="${username}" --query "
     SELECT * FROM ${dicttablename};
 " 2>&1 | grep -o ACCESS_DENIED | uniq
 
-${CLICKHOUSE_CLIENT} -m --query "
+${CLICKHOUSE_CLIENT} -nm --query "
     DROP TABLE IF EXISTS ${dicttablename} SYNC;
     DROP DICTIONARY IF EXISTS ${dictname};
     DROP USER IF EXISTS ${username};
diff --git a/tests/queries/0_stateless/03199_join_with_materialized_column.sql b/tests/queries/0_stateless/03199_join_with_materialized_column.sql
index fef171cb9d1..8c53c5b3e66 100644
--- a/tests/queries/0_stateless/03199_join_with_materialized_column.sql
+++ b/tests/queries/0_stateless/03199_join_with_materialized_column.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS table_with_materialized;
 CREATE TABLE table_with_materialized (col String MATERIALIZED 'A') ENGINE = Memory;
diff --git a/tests/queries/0_stateless/03199_json_extract_dynamic.reference b/tests/queries/0_stateless/03199_json_extract_dynamic.reference
index 955106946ea..759b7763cd1 100644
--- a/tests/queries/0_stateless/03199_json_extract_dynamic.reference
+++ b/tests/queries/0_stateless/03199_json_extract_dynamic.reference
@@ -12,7 +12,7 @@ Hello	String
 [1,2,3]	Array(Nullable(Int64))
 ['str1','str2','str3']	Array(Nullable(String))
 [[[1],[2,3,4]],[[5,6],[7]]]	Array(Array(Array(Nullable(Int64))))
-['2020-01-01 00:00:00','2020-01-01 00:00:00']	Array(Nullable(DateTime))
+['2020-01-01 00:00:00.000000000','2020-01-01 00:00:00.000000000']	Array(Nullable(DateTime64(9)))
 ['2020-01-01','2020-01-01 date']	Array(Nullable(String))
 ['2020-01-01','2020-01-01 00:00:00','str']	Array(Nullable(String))
 ['2020-01-01','2020-01-01 00:00:00','42']	Array(Nullable(String))
diff --git a/tests/queries/0_stateless/03199_queries_with_new_analyzer.sql b/tests/queries/0_stateless/03199_queries_with_new_analyzer.sql
index d400a025f76..c32d7524492 100644
--- a/tests/queries/0_stateless/03199_queries_with_new_analyzer.sql
+++ b/tests/queries/0_stateless/03199_queries_with_new_analyzer.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer=1;
+SET allow_experimental_analyzer=1;
 
 SELECT *, ngramMinHash(*) AS minhash, mortonEncode(untuple(ngramMinHash(*))) AS z
 FROM (SELECT toString(number) FROM numbers(10))
@@ -38,3 +38,4 @@ ORDER BY tuple();
 INSERT INTO seq VALUES (0), (6), (7);
 
 WITH (Select min(number), max(number) from seq) as range Select * from numbers(range.1, range.2);
+
diff --git a/tests/queries/0_stateless/03200_memory_engine_alter_dynamic.reference b/tests/queries/0_stateless/03200_memory_engine_alter_dynamic.reference
index 8d2470dea44..6d2c1334d6e 100644
--- a/tests/queries/0_stateless/03200_memory_engine_alter_dynamic.reference
+++ b/tests/queries/0_stateless/03200_memory_engine_alter_dynamic.reference
@@ -1,10 +1,10 @@
-0
-1
-2
-3
-4
-0
-1
-2
-3
-4
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
diff --git a/tests/queries/0_stateless/03200_memory_engine_alter_dynamic.sql b/tests/queries/0_stateless/03200_memory_engine_alter_dynamic.sql
index 939b49e1599..a01a595dbb5 100644
--- a/tests/queries/0_stateless/03200_memory_engine_alter_dynamic.sql
+++ b/tests/queries/0_stateless/03200_memory_engine_alter_dynamic.sql
@@ -1,8 +1,7 @@
 set allow_experimental_dynamic_type=1;
-drop table if exists test;
 create table test (d Dynamic) engine=Memory;
 insert into table test select * from numbers(5);
-alter table test modify column d Dynamic(max_types=0);
-select d.UInt64 from test settings enable_analyzer=1;
-select d.UInt64 from test settings enable_analyzer=0;
-drop table test;
+alter table test modify column d Dynamic(max_types=1);
+select d.UInt64 from test settings allow_experimental_analyzer=1;
+select d.UInt64 from test settings allow_experimental_analyzer=0;
+
diff --git a/tests/queries/0_stateless/03200_subcolumns_join_use_nulls.sql b/tests/queries/0_stateless/03200_subcolumns_join_use_nulls.sql
index 6777a753490..2dd0a37657d 100644
--- a/tests/queries/0_stateless/03200_subcolumns_join_use_nulls.sql
+++ b/tests/queries/0_stateless/03200_subcolumns_join_use_nulls.sql
@@ -8,6 +8,6 @@ SELECT
     count()
 FROM (SELECT number FROM numbers(10)) as tbl LEFT JOIN t_subcolumns_join ON number = id
 WHERE id is null
-SETTINGS enable_analyzer = 1, optimize_functions_to_subcolumns = 1, join_use_nulls = 1;
+SETTINGS allow_experimental_analyzer = 1, optimize_functions_to_subcolumns = 1, join_use_nulls = 1;
 
 DROP TABLE t_subcolumns_join;
diff --git a/tests/queries/0_stateless/03201_avro_negative_block_size_arrays.sh b/tests/queries/0_stateless/03201_avro_negative_block_size_arrays.sh
index f7101989377..dcecd7b3bea 100755
--- a/tests/queries/0_stateless/03201_avro_negative_block_size_arrays.sh
+++ b/tests/queries/0_stateless/03201_avro_negative_block_size_arrays.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-fasttest
-# no-fasttest: Requires libraries
+# Tags: no-parallel, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/03201_local_named_collections.sh b/tests/queries/0_stateless/03201_local_named_collections.sh
index 86135d027f6..809b4b52f41 100755
--- a/tests/queries/0_stateless/03201_local_named_collections.sh
+++ b/tests/queries/0_stateless/03201_local_named_collections.sh
@@ -4,17 +4,17 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} "
+${CLICKHOUSE_CLIENT} --multiquery "
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (s String) ORDER BY ();
 INSERT INTO test VALUES ('Hello, world!');
 "
 
-${CLICKHOUSE_LOCAL} "
+${CLICKHOUSE_LOCAL} --multiquery "
 CREATE NAMED COLLECTION mydb AS host = '${CLICKHOUSE_HOST}', port = ${CLICKHOUSE_PORT_TCP}, user = 'default', password = '', db = '${CLICKHOUSE_DATABASE}';
 SELECT * FROM remote(mydb, table = 'test');
 " 2>&1 | grep --text -F -v "ASan doesn't fully support makecontext/swapcontext functions"
 
-${CLICKHOUSE_CLIENT} "
+${CLICKHOUSE_CLIENT} --multiquery "
 DROP TABLE test;
 "
diff --git a/tests/queries/0_stateless/03201_sumIf_to_countIf_return_type.sql b/tests/queries/0_stateless/03201_sumIf_to_countIf_return_type.sql
index b791f328da4..24369fd6497 100644
--- a/tests/queries/0_stateless/03201_sumIf_to_countIf_return_type.sql
+++ b/tests/queries/0_stateless/03201_sumIf_to_countIf_return_type.sql
@@ -1,2 +1,2 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 EXPLAIN QUERY TREE SELECT tuple(sumIf(toInt64(1), 1)) FROM numbers(100) settings optimize_rewrite_sum_if_to_count_if=1;
diff --git a/tests/queries/0_stateless/03201_variant_null_map_subcolumn.sh b/tests/queries/0_stateless/03201_variant_null_map_subcolumn.sh
index c9dca46f41e..8231691e184 100755
--- a/tests/queries/0_stateless/03201_variant_null_map_subcolumn.sh
+++ b/tests/queries/0_stateless/03201_variant_null_map_subcolumn.sh
@@ -2,6 +2,8 @@
 # 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
 
@@ -15,7 +17,8 @@ function test()
     $CH_CLIENT -q "select v.UInt64.null, v.\`Array(Variant(String, UInt64))\`.null,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null from test order by id"
     $CH_CLIENT -q "select v.\`Array(Variant(String, UInt64))\`.null,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null, v.\`Array(Variant(String, UInt64))\`.String.null from test order by id"
     $CH_CLIENT -q "select id from test where v.UInt64 is null order by id"
-    $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(250000) settings min_insert_block_size_rows=100000, min_insert_block_size_bytes=0"
+    
+    $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.null, v.\`Array(Variant(String, UInt64))\`.null,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null from test order by id format Null"
     $CH_CLIENT -q "select v.UInt64.null, v.\`Array(Variant(String, UInt64))\`.null,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null from test order by id format Null"
     $CH_CLIENT -q "select v.\`Array(Variant(String, UInt64))\`.null,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64.null, v.\`Array(Variant(String, UInt64))\`.String.null from test order by id format Null"
@@ -38,3 +41,4 @@ 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/03203_client_benchmark_options.sh b/tests/queries/0_stateless/03203_client_benchmark_options.sh
index 967db056c0b..a9b9d69822b 100755
--- a/tests/queries/0_stateless/03203_client_benchmark_options.sh
+++ b/tests/queries/0_stateless/03203_client_benchmark_options.sh
@@ -4,23 +4,10 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-output=$(${CLICKHOUSE_CLIENT} -t -q "SELECT sleepEachRow(2) FORMAT Null" 2>&1)
-{ number=$(echo "$output" | grep -o "^[0-9]"); [[ -n "$number" && "$number" -ge 2 ]] && echo "Ok"; } || { echo "Fail"; echo "'$output'"; }
-
-output=$(${CLICKHOUSE_CLIENT} --time -q "SELECT sleepEachRow(2) FORMAT Null" 2>&1)
-{ number=$(echo "$output" | grep -o "^[0-9]"); [[ -n "$number" && "$number" -ge 2 ]] && echo "Ok"; } || { echo "Fail"; echo "'$output'"; }
-
-output=$(${CLICKHOUSE_CLIENT} --memory-usage -q "SELECT sum(number) FROM numbers(10_000) FORMAT Null" 2>&1)
-{ echo "$output" | grep -q "^[0-9]\+$" && echo "Ok"; } || { echo "Fail"; echo "'$output'"; }
-
-output=$(${CLICKHOUSE_CLIENT} --memory-usage=none -q "SELECT sum(number) FROM numbers(10_000) FORMAT Null" 2>&1)
-echo -n "$output" # expected no output
-
-output=$(${CLICKHOUSE_CLIENT} --memory-usage=default -q "SELECT sum(number) FROM numbers(10_000) FORMAT Null" 2>&1)
-{ echo "$output" | grep -q "^[0-9]\+$" && echo "Ok"; } || { echo "Fail"; echo "'$output'"; }
-
-output=$(${CLICKHOUSE_CLIENT} --memory-usage=readable -q "SELECT sum(number) FROM numbers(10_000) FORMAT Null" 2>&1)
-{ echo "$output" | grep -q "^[0-9].*B$" && echo "Ok"; } || { echo "Fail"; echo "'$output'"; }
-
-output=$(${CLICKHOUSE_CLIENT} --memory-usage=unknown -q "SELECT sum(number) FROM numbers(10_000) FORMAT Null" 2>&1)
-{ echo "$output" | grep -q "BAD_ARGUMENTS" && echo "Ok"; } || { echo "Fail"; echo "'$output'"; }
+${CLICKHOUSE_CLIENT} -t -q "SELECT sleepEachRow(2) FORMAT Null" 2>&1 | grep -q "^2\." && echo "Ok" || echo "Fail"
+${CLICKHOUSE_CLIENT} --time -q "SELECT sleepEachRow(2) FORMAT Null" 2>&1 | grep -q "^2\." && echo "Ok" || echo "Fail"
+${CLICKHOUSE_CLIENT} --memory-usage -q "SELECT sum(number) FROM numbers(10_000) FORMAT Null" 2>&1 | grep -q "^[0-9]\+$" && echo "Ok" || echo "Fail"
+${CLICKHOUSE_CLIENT} --memory-usage=none -q "SELECT sum(number) FROM numbers(10_000) FORMAT Null" # expected no output
+${CLICKHOUSE_CLIENT} --memory-usage=default -q "SELECT sum(number) FROM numbers(10_000) FORMAT Null" 2>&1 | grep -q "^[0-9]\+$" && echo "Ok" || echo "Fail"
+${CLICKHOUSE_CLIENT} --memory-usage=readable -q "SELECT sum(number) FROM numbers(10_000) FORMAT Null" 2>&1 | grep -q "^[0-9].*B$" && echo "Ok" || echo "Fail"
+${CLICKHOUSE_CLIENT} --memory-usage=unknown -q "SELECT sum(number) FROM numbers(10_000) FORMAT Null" 2>&1 | grep -q "BAD_ARGUMENTS" && echo "Ok" || echo "Fail"
diff --git a/tests/queries/0_stateless/03203_drop_detached_partition_all.reference b/tests/queries/0_stateless/03203_drop_detached_partition_all.reference
deleted file mode 100644
index c0f52d1d898..00000000000
--- a/tests/queries/0_stateless/03203_drop_detached_partition_all.reference
+++ /dev/null
@@ -1,5 +0,0 @@
-1	1
-2	2
-3	3
-3
-0
diff --git a/tests/queries/0_stateless/03203_drop_detached_partition_all.sql b/tests/queries/0_stateless/03203_drop_detached_partition_all.sql
deleted file mode 100644
index e29eb4ae36b..00000000000
--- a/tests/queries/0_stateless/03203_drop_detached_partition_all.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-DROP TABLE IF EXISTS t_03203;
-CREATE TABLE t_03203 (p UInt64, v UInt64) ENGINE = MergeTree PARTITION BY p ORDER BY v;
-INSERT INTO t_03203 VALUES (1, 1), (2, 2), (3, 3);
-SELECT * FROM t_03203 ORDER BY p, v;
-ALTER TABLE t_03203 DETACH PARTITION ALL;
-SELECT count() FROM system.detached_parts WHERE database = currentDatabase() AND table = 't_03203';
-ALTER TABLE t_03203 DROP DETACHED PARTITION ALL SETTINGS allow_drop_detached = 1;
-SELECT count() FROM system.detached_parts WHERE database = currentDatabase() AND table = 't_03203';
diff --git a/tests/queries/0_stateless/03203_function_printf.reference b/tests/queries/0_stateless/03203_function_printf.reference
deleted file mode 100644
index 338ecb0183d..00000000000
--- a/tests/queries/0_stateless/03203_function_printf.reference
+++ /dev/null
@@ -1,21 +0,0 @@
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
diff --git a/tests/queries/0_stateless/03203_function_printf.sql b/tests/queries/0_stateless/03203_function_printf.sql
deleted file mode 100644
index 6ff4699c8a7..00000000000
--- a/tests/queries/0_stateless/03203_function_printf.sql
+++ /dev/null
@@ -1,39 +0,0 @@
--- Testing integer formats
-select printf('%%d: %d', 123) = '%d: 123';
-select printf('%%i: %i', 123) = '%i: 123';
-select printf('%%u: %u', 123) = '%u: 123';
-select printf('%%o: %o', 123) = '%o: 173';
-select printf('%%x: %x', 123) = '%x: 7b';
-select printf('%%X: %X', 123) = '%X: 7B';
-
--- Testing floating point formats
-select printf('%%f: %f', 123.456) = '%f: 123.456000';
-select printf('%%F: %F', 123.456) = '%F: 123.456000';
-select printf('%%e: %e', 123.456) = '%e: 1.234560e+02';
-select printf('%%E: %E', 123.456) = '%E: 1.234560E+02';
-select printf('%%g: %g', 123.456) = '%g: 123.456';
-select printf('%%G: %G', 123.456) = '%G: 123.456';
-select printf('%%a: %a', 123.456) = '%a: 0x1.edd2f1a9fbe77p+6';
-select printf('%%A: %A', 123.456) = '%A: 0X1.EDD2F1A9FBE77P+6';
-
--- Testing character formats
-select printf('%%s: %s', 'abc') = '%s: abc';
-
--- Testing the %% specifier
-select printf('%%%%: %%') = '%%: %';
-
--- Testing integer formats with precision
-select printf('%%.5d: %.5d', 123) = '%.5d: 00123';
-
--- Testing floating point formats with precision
-select printf('%%.2f: %.2f', 123.456) = '%.2f: 123.46';
-select printf('%%.2e: %.2e', 123.456) = '%.2e: 1.23e+02';
-select printf('%%.2g: %.2g', 123.456) = '%.2g: 1.2e+02';
-
--- Testing character formats with precision
-select printf('%%.2s: %.2s', 'abc') = '%.2s: ab';
-
-select printf('%%X: %X', 123.123); -- { serverError BAD_ARGUMENTS }
-select printf('%%A: %A', 'abc'); -- { serverError BAD_ARGUMENTS }
-select printf('%%s: %s', 100); -- { serverError BAD_ARGUMENTS }
-select printf('%%n: %n', 100); -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/03203_hive_style_partitioning.reference b/tests/queries/0_stateless/03203_hive_style_partitioning.reference
deleted file mode 100644
index 0fbc1fb556e..00000000000
--- a/tests/queries/0_stateless/03203_hive_style_partitioning.reference
+++ /dev/null
@@ -1,115 +0,0 @@
-TESTING THE FILE HIVE PARTITIONING
- last	Elizabeth
-Frank	Elizabeth
-Moreno	Elizabeth
-Guzman	Elizabeth
-Stephens	Elizabeth
-Franklin	Elizabeth
-Gibson	Elizabeth
-Greer	Elizabeth
-Delgado	Elizabeth
-Cross	Elizabeth
-first	 last	Elizabeth
-Jorge	Frank	Elizabeth
-Hunter	Moreno	Elizabeth
-Esther	Guzman	Elizabeth
-Dennis	Stephens	Elizabeth
-Nettie	Franklin	Elizabeth
-Stanley	Gibson	Elizabeth
-Eugenia	Greer	Elizabeth
-Jeffery	Delgado	Elizabeth
-Clara	Cross	Elizabeth
- last	Elizabeth
-Frank	Elizabeth
-Moreno	Elizabeth
-Guzman	Elizabeth
-Stephens	Elizabeth
-Franklin	Elizabeth
-Gibson	Elizabeth
-Greer	Elizabeth
-Delgado	Elizabeth
-Cross	Elizabeth
-42	2020-01-01
-[1,2,3]	42.42
-Array(Int64)	LowCardinality(Float64)
-101
-2070
-2070
-b
-1
-1
-TESTING THE URL PARTITIONING
- last	Elizabeth
-Frank	Elizabeth
-Moreno	Elizabeth
-Guzman	Elizabeth
-Stephens	Elizabeth
-Franklin	Elizabeth
-Gibson	Elizabeth
-Greer	Elizabeth
-Delgado	Elizabeth
-Cross	Elizabeth
-first	 last	Elizabeth
-Jorge	Frank	Elizabeth
-Hunter	Moreno	Elizabeth
-Esther	Guzman	Elizabeth
-Dennis	Stephens	Elizabeth
-Nettie	Franklin	Elizabeth
-Stanley	Gibson	Elizabeth
-Eugenia	Greer	Elizabeth
-Jeffery	Delgado	Elizabeth
-Clara	Cross	Elizabeth
-1
-TESTING THE S3 PARTITIONING
- last	Elizabeth
-Frank	Elizabeth
-Moreno	Elizabeth
-Guzman	Elizabeth
-Stephens	Elizabeth
-Franklin	Elizabeth
-Gibson	Elizabeth
-Greer	Elizabeth
-Delgado	Elizabeth
-Cross	Elizabeth
-first	 last	Elizabeth
-Jorge	Frank	Elizabeth
-Hunter	Moreno	Elizabeth
-Esther	Guzman	Elizabeth
-Dennis	Stephens	Elizabeth
-Nettie	Franklin	Elizabeth
-Stanley	Gibson	Elizabeth
-Eugenia	Greer	Elizabeth
-Jeffery	Delgado	Elizabeth
-Clara	Cross	Elizabeth
- last	Elizabeth
-Frank	Elizabeth
-Moreno	Elizabeth
-Guzman	Elizabeth
-Stephens	Elizabeth
-Franklin	Elizabeth
-Gibson	Elizabeth
-Greer	Elizabeth
-Delgado	Elizabeth
-Cross	Elizabeth
-OK
-TESTING THE S3CLUSTER PARTITIONING
- last	Elizabeth
-Frank	Elizabeth
-Moreno	Elizabeth
-Guzman	Elizabeth
-Stephens	Elizabeth
-Franklin	Elizabeth
-Gibson	Elizabeth
-Greer	Elizabeth
-Delgado	Elizabeth
-Cross	Elizabeth
- last	Elizabeth
-Frank	Elizabeth
-Moreno	Elizabeth
-Guzman	Elizabeth
-Stephens	Elizabeth
-Franklin	Elizabeth
-Gibson	Elizabeth
-Greer	Elizabeth
-Delgado	Elizabeth
-Cross	Elizabeth
diff --git a/tests/queries/0_stateless/03203_hive_style_partitioning.sh b/tests/queries/0_stateless/03203_hive_style_partitioning.sh
deleted file mode 100755
index 60e8a6e9faa..00000000000
--- a/tests/queries/0_stateless/03203_hive_style_partitioning.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/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 'TESTING THE FILE HIVE PARTITIONING'"
-
-
-$CLICKHOUSE_LOCAL -n -q """
-set use_hive_partitioning = 1;
-
-SELECT *, column0 FROM file('$CURDIR/data_hive/partitioning/column0=Elizabeth/sample.parquet') LIMIT 10;
-
-SELECT *, non_existing_column FROM file('$CURDIR/data_hive/partitioning/non_existing_column=Elizabeth/sample.parquet') LIMIT 10;
-SELECT *, column0 FROM file('$CURDIR/data_hive/partitioning/column0=*/sample.parquet') WHERE column0 = 'Elizabeth' LIMIT 10;
-
-SELECT number, date FROM file('$CURDIR/data_hive/partitioning/number=42/date=2020-01-01/sample.parquet') LIMIT 1;
-SELECT array, float FROM file('$CURDIR/data_hive/partitioning/array=[1,2,3]/float=42.42/sample.parquet') LIMIT 1;
-SELECT toTypeName(array), toTypeName(float) FROM file('$CURDIR/data_hive/partitioning/array=[1,2,3]/float=42.42/sample.parquet') LIMIT 1;
-SELECT count(*) FROM file('$CURDIR/data_hive/partitioning/number=42/date=2020-01-01/sample.parquet') WHERE number = 42;
-"""
-
-$CLICKHOUSE_LOCAL -n -q """
-set use_hive_partitioning = 1;
-
-SELECT identifier FROM file('$CURDIR/data_hive/partitioning/identifier=*/email.csv') LIMIT 2;
-SELECT a FROM file('$CURDIR/data_hive/partitioning/a=b/a=b/sample.parquet') LIMIT 1;
-"""
-
-$CLICKHOUSE_LOCAL -n -q """
-set use_hive_partitioning = 1;
-
-SELECT *, column0 FROM file('$CURDIR/data_hive/partitioning/column0=Elizabeth/column0=Elizabeth1/sample.parquet') LIMIT 10;
-""" 2>&1 | grep -c "INCORRECT_DATA"
-
-$CLICKHOUSE_LOCAL -n -q """
-set use_hive_partitioning = 0;
-
-SELECT *, non_existing_column FROM file('$CURDIR/data_hive/partitioning/non_existing_column=Elizabeth/sample.parquet') LIMIT 10;
-""" 2>&1 | grep -c "UNKNOWN_IDENTIFIER"
-
-
-$CLICKHOUSE_LOCAL -q "SELECT 'TESTING THE URL PARTITIONING'"
-
-
-$CLICKHOUSE_LOCAL -n -q """
-set use_hive_partitioning = 1;
-
-SELECT *, column0 FROM url('http://localhost:11111/test/hive_partitioning/column0=Elizabeth/sample.parquet') LIMIT 10;
-
-SELECT *, non_existing_column FROM url('http://localhost:11111/test/hive_partitioning/non_existing_column=Elizabeth/sample.parquet') LIMIT 10;"""
-
-$CLICKHOUSE_LOCAL -n -q """
-set use_hive_partitioning = 0;
-
-SELECT *, _column0 FROM url('http://localhost:11111/test/hive_partitioning/column0=Elizabeth/sample.parquet') LIMIT 10;
-""" 2>&1 | grep -c "UNKNOWN_IDENTIFIER"
-
-
-$CLICKHOUSE_LOCAL -q "SELECT 'TESTING THE S3 PARTITIONING'"
-
-
-$CLICKHOUSE_CLIENT -n -q """
-set use_hive_partitioning = 1;
-
-SELECT *, column0 FROM s3('http://localhost:11111/test/hive_partitioning/column0=Elizabeth/sample.parquet') LIMIT 10;
-
-SELECT *, non_existing_column FROM s3('http://localhost:11111/test/hive_partitioning/non_existing_column=Elizabeth/sample.parquet') LIMIT 10;
-SELECT *, column0 FROM s3('http://localhost:11111/test/hive_partitioning/column0=*/sample.parquet') WHERE column0 = 'Elizabeth' LIMIT 10;
-"""
-
-$CLICKHOUSE_CLIENT -n -q """
-set use_hive_partitioning = 0;
-
-SELECT *, _column0 FROM s3('http://localhost:11111/test/hive_partitioning/column0=Elizabeth/sample.parquet') LIMIT 10;
-""" 2>&1 | grep -F -q "UNKNOWN_IDENTIFIER" && echo "OK" || echo "FAIL";
-
-$CLICKHOUSE_LOCAL -q "SELECT 'TESTING THE S3CLUSTER PARTITIONING'"
-
-$CLICKHOUSE_CLIENT -n -q """
-set use_hive_partitioning = 1;
-
-SELECT *, column0 FROM s3Cluster(test_cluster_one_shard_three_replicas_localhost, 'http://localhost:11111/test/hive_partitioning/column0=Elizabeth/sample.parquet') LIMIT 10;
-
-SELECT *, column0 FROM s3Cluster(test_cluster_one_shard_three_replicas_localhost, 'http://localhost:11111/test/hive_partitioning/column0=Elizabeth/sample.parquet') WHERE column0 = 'Elizabeth' LIMIT 10;
-"""
diff --git a/tests/queries/0_stateless/03203_variant_convert_field_to_type_bug.reference b/tests/queries/0_stateless/03203_variant_convert_field_to_type_bug.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03203_variant_convert_field_to_type_bug.sql b/tests/queries/0_stateless/03203_variant_convert_field_to_type_bug.sql
deleted file mode 100644
index b73bb8ffa6d..00000000000
--- a/tests/queries/0_stateless/03203_variant_convert_field_to_type_bug.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-set allow_experimental_variant_type=1;
-set use_variant_as_common_type=1;
-
-SELECT * FROM numbers([tuple(1, 2), NULL], 2); -- {serverError ILLEGAL_TYPE_OF_ARGUMENT}
-
diff --git a/tests/queries/0_stateless/03204_format_join_on.reference b/tests/queries/0_stateless/03204_format_join_on.reference
deleted file mode 100644
index 846f36fcca4..00000000000
--- a/tests/queries/0_stateless/03204_format_join_on.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-SELECT * FROM t1 INNER JOIN t2 ON ((t1.x = t2.x) AND (t1.x IS NULL) AS e2)
-SELECT * FROM t1 INNER JOIN t2 ON ((t1.x = t2.x) AND (t1.x IS NULL) AS e2)
-SELECT * FROM t1 INNER JOIN t2 ON (t1.x = t2.x) AND ((t1.x IS NULL) AS e2)
-SELECT * FROM t1 INNER JOIN t2 ON t1.x = t2.x
diff --git a/tests/queries/0_stateless/03204_format_join_on.sh b/tests/queries/0_stateless/03204_format_join_on.sh
deleted file mode 100755
index 87b0afac042..00000000000
--- a/tests/queries/0_stateless/03204_format_join_on.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-# regression for the JOIN ON alias for the whole expression
-phase1="$($CLICKHOUSE_FORMAT --oneline --query "SELECT * FROM t1 JOIN t2 ON ((t1.x = t2.x) AND (t1.x IS NULL) AS e2)")"
-echo "$phase1"
-# phase 2
-$CLICKHOUSE_FORMAT --oneline --query "$phase1"
-
-# other test cases
-$CLICKHOUSE_FORMAT --oneline --query "SELECT * FROM t1 JOIN t2 ON (t1.x = t2.x) AND (t1.x IS NULL AS e2)"
-$CLICKHOUSE_FORMAT --oneline --query "SELECT * FROM t1 JOIN t2 ON t1.x = t2.x"
diff --git a/tests/queries/0_stateless/03204_storage_join_optimize.reference b/tests/queries/0_stateless/03204_storage_join_optimize.reference
deleted file mode 100644
index af98bcd6397..00000000000
--- a/tests/queries/0_stateless/03204_storage_join_optimize.reference
+++ /dev/null
@@ -1,10 +0,0 @@
-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/03204_storage_join_optimize.sql b/tests/queries/0_stateless/03204_storage_join_optimize.sql
deleted file mode 100644
index 03a4658ba6c..00000000000
--- a/tests/queries/0_stateless/03204_storage_join_optimize.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE TABLE dict_03204 (k UInt64, v UInt64) ENGINE = Join(ANY, LEFT, k);
-INSERT INTO dict_03204 SELECT number, number FROM numbers(10);
-OPTIMIZE TABLE dict_03204;
-SELECT * FROM dict_03204 ORDER BY k;
-DROP TABLE dict_03204;
diff --git a/tests/queries/0_stateless/03205_json_cast_from_string.reference b/tests/queries/0_stateless/03205_json_cast_from_string.reference
deleted file mode 100644
index b9ac477eef4..00000000000
--- a/tests/queries/0_stateless/03205_json_cast_from_string.reference
+++ /dev/null
@@ -1,18 +0,0 @@
-{}
-{"a":"42","b":"Hello"}
-{"a":{"b":{"c":{"d":"42"},"e":"43"},"f":"44"},"g":"44"}
-{"a":{"b":{"c":{"d":true},"e":"43"},"f":"44"},"g":"44"}
-{"a":{"b":{"e":"43"},"f":"44"},"g":"44"}
-{"a":{"b":{"e":"43"},"f":"44"},"g":"44"}
-{"a":{"f":"44"},"g":"44"}
-{"g":"44"}
-{"a":{"f":"44"},"g":"44"}
-{"g":"44"}
-{}
-{"a":{"b":{"c":{"d":"42"},"e":"43"},"f":"44"},"g":"44"}	{'a.b.c.d':'Int64','a.b.e':'Int64','a.f':'Int64','g':'Int64'}	{'a.b.c.d':'Int64','a.b.e':'Int64','a.f':'Int64','g':'Int64'}	{}
-{"a":{"b":{"c":{"d":"42"},"e":"43"},"f":"44"},"g":"44"}	{'a.b.c.d':'Int64','a.b.e':'Int64','a.f':'Int64','g':'Int64'}	{'a.b.c.d':'Int64','a.b.e':'Int64'}	{'a.f':'Int64','g':'Int64'}
-{"a":{"b":{"c":{"d":"42"},"e":"43"},"f":"44"},"g":"44"}	{'a.b.c.d':'Int64','a.b.e':'Int64','a.f':'Int64','g':'Int64'}	{'a.b.c.d':'Int64'}	{'a.b.e':'Int64','a.f':'Int64','g':'Int64'}
-{"a":{"b":{"c":{"d":"42"},"e":"43"},"f":"44"},"g":"44"}	{'a.b.c.d':'Int64','a.b.e':'Int64','a.f':'Int64','g':'Int64'}	{}	{'a.b.c.d':'Int64','a.b.e':'Int64','a.f':'Int64','g':'Int64'}
-{"a":{"b":{"c":{"d":"42"},"e":"43"},"f":"44"},"g":"44"}	{'a.b.c.d':'Int64','a.b.e':'Int64','a.f':'Int64','g':'Int64'}	{'a.b.c.d':'Int64','a.b.e':'Int64'}	{'a.f':'Int64','g':'Int64'}
-{"a":{"b":{"c":{"d":"42"},"e":"43"},"f":"44"},"g":"44"}	{'a.b.c.d':'Int64','a.b.e':'Int64','a.f':'Int64','g':'Int64'}	{'a.b.c.d':'Int64'}	{'a.b.e':'Int64','a.f':'Int64','g':'Int64'}
-{"a":{"b":{"c":{"d":"42"},"e":"43"},"f":"44"},"g":"44"}	{'a.b.c.d':'Int64','a.b.e':'Int64','a.f':'Int64','g':'Int64'}	{}	{'a.b.c.d':'Int64','a.b.e':'Int64','a.f':'Int64','g':'Int64'}
diff --git a/tests/queries/0_stateless/03205_json_cast_from_string.sql b/tests/queries/0_stateless/03205_json_cast_from_string.sql
deleted file mode 100644
index 5ceee134c51..00000000000
--- a/tests/queries/0_stateless/03205_json_cast_from_string.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- Tags: no-fasttest
-set allow_experimental_json_type=1;
-
-select materialize('{}')::JSON;
-select materialize('{"a" : 42, "b" : "Hello"}')::JSON;
-select materialize('{"a" : {"b" : {"c" : {"d" : 42}, "e" : 43}, "f" : 44}, "g" : 44}')::JSON;
-select materialize('{"a" : {"b" : {"c" : {"d" : 42}, "e" : 43}, "f" : 44}, "g" : 44}')::JSON(a.b.c.d Bool);
-select materialize('{"a" : {"b" : {"c" : {"d" : 42}, "e" : 43}, "f" : 44}, "g" : 44}')::JSON(SKIP a.b.c.d);
-select materialize('{"a" : {"b" : {"c" : {"d" : 42}, "e" : 43}, "f" : 44}, "g" : 44}')::JSON(SKIP a.b.c);
-select materialize('{"a" : {"b" : {"c" : {"d" : 42}, "e" : 43}, "f" : 44}, "g" : 44}')::JSON(SKIP a.b);
-select materialize('{"a" : {"b" : {"c" : {"d" : 42}, "e" : 43}, "f" : 44}, "g" : 44}')::JSON(SKIP a);
-select materialize('{"a" : {"b" : {"c" : {"d" : 42}, "e" : 43}, "f" : 44}, "g" : 44}')::JSON(SKIP REGEXP '.*a.*b');
-select materialize('{"a" : {"b" : {"c" : {"d" : 42}, "e" : 43}, "f" : 44}, "g" : 44}')::JSON(SKIP REGEXP '.*a.*');
-select materialize('{"a" : {"b" : {"c" : {"d" : 42}, "e" : 43}, "f" : 44}, "g" : 44}')::JSON(SKIP REGEXP '.*');
-
-select materialize('{"a" : {"b" : {"c" : {"d" : 42}, "e" : 43}, "f" : 44}, "g" : 44}')::JSON as json, JSONAllPathsWithTypes(json), JSONDynamicPathsWithTypes(json), JSONSharedDataPathsWithTypes(json);
-select materialize('{"a" : {"b" : {"c" : {"d" : 42}, "e" : 43}, "f" : 44}, "g" : 44}')::JSON(max_dynamic_paths = 2) as json, JSONAllPathsWithTypes(json), JSONDynamicPathsWithTypes(json), JSONSharedDataPathsWithTypes(json);
-select materialize('{"a" : {"b" : {"c" : {"d" : 42}, "e" : 43}, "f" : 44}, "g" : 44}')::JSON(max_dynamic_paths = 1) as json, JSONAllPathsWithTypes(json), JSONDynamicPathsWithTypes(json), JSONSharedDataPathsWithTypes(json);
-select materialize('{"a" : {"b" : {"c" : {"d" : 42}, "e" : 43}, "f" : 44}, "g" : 44}')::JSON(max_dynamic_paths = 0) as json, JSONAllPathsWithTypes(json), JSONDynamicPathsWithTypes(json), JSONSharedDataPathsWithTypes(json);
-select materialize('{"a" : {"b" : {"c" : {"d" : 42}, "e" : 43}, "f" : 44}, "g" : 44}')::JSON(max_dynamic_paths = 2, max_dynamic_types=0) as json, JSONAllPathsWithTypes(json), JSONDynamicPathsWithTypes(json), JSONSharedDataPathsWithTypes(json);
-select materialize('{"a" : {"b" : {"c" : {"d" : 42}, "e" : 43}, "f" : 44}, "g" : 44}')::JSON(max_dynamic_paths = 1, max_dynamic_types=0) as json, JSONAllPathsWithTypes(json), JSONDynamicPathsWithTypes(json), JSONSharedDataPathsWithTypes(json);
-select materialize('{"a" : {"b" : {"c" : {"d" : 42}, "e" : 43}, "f" : 44}, "g" : 44}')::JSON(max_dynamic_paths = 0, max_dynamic_types=0) as json, JSONAllPathsWithTypes(json), JSONDynamicPathsWithTypes(json), JSONSharedDataPathsWithTypes(json);
diff --git a/tests/queries/0_stateless/03205_json_syntax.reference b/tests/queries/0_stateless/03205_json_syntax.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03205_json_syntax.sql b/tests/queries/0_stateless/03205_json_syntax.sql
deleted file mode 100644
index e3c88c81d0d..00000000000
--- a/tests/queries/0_stateless/03205_json_syntax.sql
+++ /dev/null
@@ -1,40 +0,0 @@
--- Tags: no-fasttest
-
-set allow_experimental_json_type=1;
-drop table if exists test;
-create table test (json JSON) engine=Memory;
-drop table test;
-create table test (json JSON(max_dynamic_paths=10)) engine=Memory;
-drop table test;
-create table test (json JSON(max_dynamic_types=10)) engine=Memory;
-drop table test;
-create table test (json JSON(a UInt32)) engine=Memory;
-drop table test;
-create table test (json JSON(aaaaa UInt32)) engine=Memory;
-drop table test;
-create table test (json JSON(`a b c d` UInt32)) engine=Memory;
-drop table test;
-create table test (json JSON(a.b.c UInt32)) engine=Memory;
-drop table test;
-create table test (json JSON(aaaa.b.cccc UInt32)) engine=Memory;
-drop table test;
-create table test (json JSON(`some path`.`path some` UInt32)) engine=Memory;
-drop table test;
-create table test (json JSON(a.b.c Tuple(d UInt32, e UInt32))) engine=Memory;
-drop table test;
-create table test (json JSON(SKIP a)) engine=Memory;
-drop table test;
-create table test (json JSON(SKIP aaaa)) engine=Memory;
-drop table test;
-create table test (json JSON(SKIP `a b c d`)) engine=Memory;
-drop table test;
-create table test (json JSON(SKIP a.b.c)) engine=Memory;
-drop table test;
-create table test (json JSON(SKIP aaaa.b.cccc)) engine=Memory;
-drop table test;
-create table test (json JSON(SKIP `some path`.`path some`)) engine=Memory;
-drop table test;
-create table test (json JSON(SKIP REGEXP '.*a.*')) engine=Memory;
-drop table test;
-create table test (json JSON(max_dynamic_paths=10, max_dynamic_types=10, a.b.c UInt32, b.c.d String, SKIP g.d.a, SKIP o.g.a, SKIP REGEXP '.*u.*', SKIP REGEXP 'abc')) engine=Memory;
-drop table test;
diff --git a/tests/queries/0_stateless/03205_overlay.reference b/tests/queries/0_stateless/03205_overlay.reference
deleted file mode 100644
index 4be3baadaea..00000000000
--- a/tests/queries/0_stateless/03205_overlay.reference
+++ /dev/null
@@ -1,68 +0,0 @@
-Negative test of overlay
-Test with 3 arguments and various combinations of const/non-const columns
-Spark_SQL	Spark_SQL和CH
-Spark_SQL	Spark_SQL和CH
-Spark_SQL	Spark_SQL和CH
-Spark_SQL	Spark_SQL和CH
-Spark_SQL	Spark_SQL和CH
-Spark_SQL	Spark_SQL和CH
-Spark_SQL	Spark_SQL和CH
-Spark_SQL	Spark_SQL和CH
-Test with 4 arguments and various combinations of const/non-const columns
-Spark ANSI SQL	Spark ANSI SQL和CH
-Spark ANSI SQL	Spark ANSI SQL和CH
-Spark ANSI SQL	Spark ANSI SQL和CH
-Spark ANSI SQL	Spark ANSI SQL和CH
-Spark ANSI SQL	Spark ANSI SQL和CH
-Spark ANSI SQL	Spark ANSI SQL和CH
-Spark ANSI SQL	Spark ANSI SQL和CH
-Spark ANSI SQL	Spark ANSI SQL和CH
-Spark ANSI SQL	Spark ANSI SQL和CH
-Spark ANSI SQL	Spark ANSI SQL和CH
-Spark ANSI SQL	Spark ANSI SQL和CH
-Spark ANSI SQL	Spark ANSI SQL和CH
-Spark ANSI SQL	Spark ANSI SQL和CH
-Spark ANSI SQL	Spark ANSI SQL和CH
-Spark ANSI SQL	Spark ANSI SQL和CH
-Spark ANSI SQL	Spark ANSI SQL和CH
-Test with special offset values
--12	__ark SQL	之park SQL和CH
--11	__ark SQL	S之ark SQL和CH
--10	__ark SQL	Sp之rk SQL和CH
--9	__ark SQL	Spa之k SQL和CH
--8	S__rk SQL	Spar之 SQL和CH
--7	Sp__k SQL	Spark之SQL和CH
--6	Spa__ SQL	Spark 之QL和CH
--5	Spar__SQL	Spark S之L和CH
--4	Spark__QL	Spark SQ之和CH
--3	Spark __L	Spark SQL之CH
--2	Spark S__	Spark SQL和之H
--1	Spark SQ__	Spark SQL和C之
-0	Spark SQL__	Spark SQL和CH之
-1	__ark SQL	之park SQL和CH
-2	S__rk SQL	S之ark SQL和CH
-3	Sp__k SQL	Sp之rk SQL和CH
-4	Spa__ SQL	Spa之k SQL和CH
-5	Spar__SQL	Spar之 SQL和CH
-6	Spark__QL	Spark之SQL和CH
-7	Spark __L	Spark 之QL和CH
-8	Spark S__	Spark S之L和CH
-9	Spark SQ__	Spark SQ之和CH
-10	Spark SQL__	Spark SQL之CH
-11	Spark SQL__	Spark SQL和之H
-12	Spark SQL__	Spark SQL和C之
-13	Spark SQL__	Spark SQL和CH之
-Test with special length values
--1	Spark ANSI 	Spark ANSI H
-0	Spark ANSI SQL	Spark ANSI SQL和CH
-1	Spark ANSI QL	Spark ANSI QL和CH
-2	Spark ANSI L	Spark ANSI L和CH
-3	Spark ANSI 	Spark ANSI 和CH
-4	Spark ANSI 	Spark ANSI CH
-5	Spark ANSI 	Spark ANSI H
-6	Spark ANSI 	Spark ANSI 
-Test with special input and replace values
-_	_
-Spark SQL	Spark SQL和CH
-ANSI 	ANSI 
-Spark SQL	Spark SQL和CH
diff --git a/tests/queries/0_stateless/03205_overlay.sql b/tests/queries/0_stateless/03205_overlay.sql
deleted file mode 100644
index b692cc0c5ab..00000000000
--- a/tests/queries/0_stateless/03205_overlay.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-SELECT 'Negative test of overlay';
-SELECT overlay('hello', 'world'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
-SELECT overlay('hello', 'world', 2, 3, 'extra'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
-SELECT overlay(123, 'world', 2, 3); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT overlay('hello', 456, 2, 3); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT overlay('hello', 'world', 'two', 3); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-SELECT overlay('hello', 'world', 2, 'three'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-
-SELECT 'Test with 3 arguments and various combinations of const/non-const columns';
-SELECT overlay('Spark SQL', '_', 6), overlayUTF8('Spark SQL和CH', '_', 6);
-SELECT overlay(materialize('Spark SQL'), '_', 6), overlayUTF8(materialize('Spark SQL和CH'), '_', 6);
-SELECT overlay('Spark SQL', materialize('_'), 6), overlayUTF8('Spark SQL和CH', materialize('_'), 6);
-SELECT overlay('Spark SQL', '_', materialize(6)), overlayUTF8('Spark SQL和CH', '_', materialize(6));
-SELECT overlay(materialize('Spark SQL'), materialize('_'), 6), overlayUTF8(materialize('Spark SQL和CH'), materialize('_'), 6);
-SELECT overlay(materialize('Spark SQL'), '_', materialize(6)), overlayUTF8(materialize('Spark SQL和CH'), '_', materialize(6));
-SELECT overlay('Spark SQL', materialize('_'), materialize(6)), overlayUTF8('Spark SQL和CH', materialize('_'), materialize(6));
-SELECT overlay(materialize('Spark SQL'), materialize('_'), materialize(6)), overlayUTF8(materialize('Spark SQL和CH'), materialize('_'), materialize(6));
-
-SELECT 'Test with 4 arguments and various combinations of const/non-const columns';
-SELECT overlay('Spark SQL', 'ANSI ', 7, 0), overlayUTF8('Spark SQL和CH', 'ANSI ', 7, 0);
-SELECT overlay(materialize('Spark SQL'), 'ANSI ', 7, 0), overlayUTF8(materialize('Spark SQL和CH'), 'ANSI ', 7, 0);
-SELECT overlay('Spark SQL', materialize('ANSI '), 7, 0), overlayUTF8('Spark SQL和CH', materialize('ANSI '), 7, 0);
-SELECT overlay('Spark SQL', 'ANSI ', materialize(7), 0), overlayUTF8('Spark SQL和CH', 'ANSI ', materialize(7), 0);
-SELECT overlay('Spark SQL', 'ANSI ', 7, materialize(0)), overlayUTF8('Spark SQL和CH', 'ANSI ', 7, materialize(0));
-SELECT overlay(materialize('Spark SQL'), materialize('ANSI '), 7, 0), overlayUTF8(materialize('Spark SQL和CH'), materialize('ANSI '), 7, 0);
-SELECT overlay(materialize('Spark SQL'), 'ANSI ', materialize(7), 0), overlayUTF8(materialize('Spark SQL和CH'), 'ANSI ', materialize(7), 0);
-SELECT overlay(materialize('Spark SQL'), 'ANSI ', 7, materialize(0)), overlayUTF8(materialize('Spark SQL和CH'), 'ANSI ', 7, materialize(0));
-SELECT overlay('Spark SQL', materialize('ANSI '), materialize(7), 0), overlayUTF8('Spark SQL和CH', materialize('ANSI '), materialize(7), 0);
-SELECT overlay('Spark SQL', materialize('ANSI '), 7, materialize(0)), overlayUTF8('Spark SQL和CH', materialize('ANSI '), 7, materialize(0));
-SELECT overlay('Spark SQL', 'ANSI ', materialize(7), materialize(0)), overlayUTF8('Spark SQL和CH', 'ANSI ', materialize(7), materialize(0));
-SELECT overlay(materialize('Spark SQL'), materialize('ANSI '), materialize(7), 0), overlayUTF8(materialize('Spark SQL和CH'), materialize('ANSI '), materialize(7), 0);
-SELECT overlay(materialize('Spark SQL'), materialize('ANSI '), 7, materialize(0)), overlayUTF8(materialize('Spark SQL和CH'), materialize('ANSI '), 7, materialize(0));
-SELECT overlay(materialize('Spark SQL'), 'ANSI ', materialize(7), materialize(0)), overlayUTF8(materialize('Spark SQL和CH'), 'ANSI ', materialize(7), materialize(0));
-SELECT overlay('Spark SQL', materialize('ANSI '), materialize(7), materialize(0)), overlayUTF8('Spark SQL和CH', materialize('ANSI '), materialize(7), materialize(0));
-SELECT overlay(materialize('Spark SQL'), materialize('ANSI '), materialize(7), materialize(0)), overlayUTF8(materialize('Spark SQL和CH'), materialize('ANSI '), materialize(7), materialize(0));
-
-SELECT 'Test with special offset values';
-WITH number - 12 AS offset SELECT offset, overlay('Spark SQL', '__', offset), overlayUTF8('Spark SQL和CH', '之', offset) FROM numbers(26) ORDER BY number;
-
-SELECT 'Test with special length values';
-WITH number - 1 AS length SELECT length, overlay('Spark SQL', 'ANSI ', 7, length), overlayUTF8('Spark SQL和CH', 'ANSI ', 7, length) FROM numbers(8) ORDER BY number;
-
-SELECT 'Test with special input and replace values';
-SELECT overlay('', '_', 6), overlayUTF8('', '_', 6);
-SELECT overlay('Spark SQL', '', 6), overlayUTF8('Spark SQL和CH', '', 6);
-SELECT overlay('', 'ANSI ', 7, 0), overlayUTF8('', 'ANSI ', 7, 0);
-SELECT overlay('Spark SQL', '', 7, 0), overlayUTF8('Spark SQL和CH', '', 7, 0);
diff --git a/tests/queries/0_stateless/03205_parallel_replicas_alter_select_ubsan.reference b/tests/queries/0_stateless/03205_parallel_replicas_alter_select_ubsan.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03205_parallel_replicas_alter_select_ubsan.sql b/tests/queries/0_stateless/03205_parallel_replicas_alter_select_ubsan.sql
deleted file mode 100644
index 2ec9368327d..00000000000
--- a/tests/queries/0_stateless/03205_parallel_replicas_alter_select_ubsan.sql
+++ /dev/null
@@ -1,35 +0,0 @@
-SET alter_sync = 2;
-SET max_parallel_replicas = 3, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', parallel_replicas_for_non_replicated_merge_tree = true;
-
-DROP TABLE IF EXISTS t1;
-DROP TABLE IF EXISTS t1__fuzz_26;
-
-CREATE TABLE t1__fuzz_26 (`a` Nullable(Float64), `b` Nullable(Float32), `pk` Int64) ENGINE = MergeTree ORDER BY pk;
-CREATE TABLE t1 ( a Float64, b Int64, pk String) Engine = MergeTree() ORDER BY pk;
-
-ALTER TABLE t1
-    (MODIFY COLUMN `a` Float64 TTL toDateTime(b) + toIntervalMonth(viewExplain('EXPLAIN', 'actions = 1', (
-        SELECT
-            toIntervalMonth(1),
-            2
-        FROM t1__fuzz_26
-        GROUP BY
-            toFixedString('%Prewhere%', 10),
-            toNullable(12)
-            WITH ROLLUP
-    )), 1)) settings allow_experimental_parallel_reading_from_replicas = 1; -- { serverError INCORRECT_RESULT_OF_SCALAR_SUBQUERY }
-
-ALTER TABLE t1
-    (MODIFY COLUMN `a` Float64 TTL toDateTime(b) + toIntervalMonth(viewExplain('EXPLAIN', 'actions = 1', (
-        SELECT
-            toIntervalMonth(1),
-            2
-        FROM t1__fuzz_26
-        GROUP BY
-            toFixedString('%Prewhere%', 10),
-            toNullable(12)
-            WITH ROLLUP
-    )), 1)) settings allow_experimental_parallel_reading_from_replicas = 0; -- { serverError INCORRECT_RESULT_OF_SCALAR_SUBQUERY }
-
-DROP TABLE t1;
-DROP TABLE t1__fuzz_26;
diff --git a/tests/queries/0_stateless/03206_json_parsing_and_formatting.reference b/tests/queries/0_stateless/03206_json_parsing_and_formatting.reference
deleted file mode 100644
index 75e55e0376d..00000000000
--- a/tests/queries/0_stateless/03206_json_parsing_and_formatting.reference
+++ /dev/null
@@ -1,195 +0,0 @@
-JSON with no arguments
-{"a":{"b":{"c":"1","d":["0","1"]}},"b":"2020-01-01","c":"42","d":{"e":{"f":["s1","s2"]}}}
-{"a":{"b":{"c":"2","d":["2","3"]}},"b":["1","2","3"],"d":{"e":{"g":"43"}}}
-{"a":{"b":{"c":"3","d":["4","5"]}},"e":"Hello, World!"}
-{"a":{"b":{"c":"4","d":["6","7"]}},"c":"43"}
-{"a":{"b":{"c":"5","d":["8","9"]}},"b":["b1","b2"],"d":{"e":{"f":["s3","s4"],"g":"44","h":"2020-02-02 10:00:00"}}}
-{'a.b.c':'Int64','a.b.d':'Array(Nullable(Int64))','b':'Date','c':'Int64','d.e.f':'Array(Nullable(String))'}	{'a.b.c':'Int64','a.b.d':'Array(Nullable(Int64))','b':'Date','c':'Int64','d.e.f':'Array(Nullable(String))'}	{}
-{'a.b.c':'Int64','a.b.d':'Array(Nullable(Int64))','b':'Array(Nullable(Int64))','d.e.g':'Int64'}	{'a.b.c':'Int64','a.b.d':'Array(Nullable(Int64))','b':'Array(Nullable(Int64))','d.e.g':'Int64'}	{}
-{'a.b.c':'Int64','a.b.d':'Array(Nullable(Int64))','e':'String'}	{'a.b.c':'Int64','a.b.d':'Array(Nullable(Int64))','e':'String'}	{}
-{'a.b.c':'Int64','a.b.d':'Array(Nullable(Int64))','c':'Int64'}	{'a.b.c':'Int64','a.b.d':'Array(Nullable(Int64))','c':'Int64'}	{}
-{'a.b.c':'Int64','a.b.d':'Array(Nullable(Int64))','b':'Array(Nullable(String))','d.e.f':'Array(Nullable(String))','d.e.g':'Int64','d.e.h':'DateTime'}	{'a.b.c':'Int64','a.b.d':'Array(Nullable(Int64))','b':'Array(Nullable(String))','d.e.f':'Array(Nullable(String))','d.e.g':'Int64','d.e.h':'DateTime'}	{}
-1	2020-01-01	{"e":{"f":["s1","s2"]}}
-2	[1,2,3]	{"e":{"g":"43"}}
-3	\N	{}
-4	\N	{}
-5	['b1','b2']	{"e":{"f":["s3","s4"],"g":"44","h":"2020-02-02 10:00:00"}}
-JSON(a.b Tuple(c UInt32, d Array(Bool)), SKIP d.e, SKIP c, SKIP REGEXP '.*h.*')
-{"a":{"b":{"c":1,"d":[false,true]}},"b":"2020-01-01"}
-{"a":{"b":{"c":2,"d":[true,true]}},"b":["1","2","3"]}
-{"a":{"b":{"c":3,"d":[true,true]}},"e":"Hello, World!"}
-{"a":{"b":{"c":4,"d":[true,true]}}}
-{"a":{"b":{"c":5,"d":[true,true]}},"b":["b1","b2"]}
-{'a.b':'Tuple(c UInt32, d Array(Bool))','b':'Date'}	{'b':'Date'}	{}
-{'a.b':'Tuple(c UInt32, d Array(Bool))','b':'Array(Nullable(Int64))'}	{'b':'Array(Nullable(Int64))'}	{}
-{'a.b':'Tuple(c UInt32, d Array(Bool))','e':'String'}	{'e':'String'}	{}
-{'a.b':'Tuple(c UInt32, d Array(Bool))'}	{}	{}
-{'a.b':'Tuple(c UInt32, d Array(Bool))','b':'Array(Nullable(String))'}	{'b':'Array(Nullable(String))'}	{}
-JSON(a.b.c UInt32, max_dynamic_paths=2)
-{"a":{"b":{"c":1,"d":["0","1"]}},"b":"2020-01-01","c":"42","d":{"e":{"f":["s1","s2"]}}}
-{"a":{"b":{"c":2,"d":["2","3"]}},"b":["1","2","3"],"d":{"e":{"g":"43"}}}
-{"a":{"b":{"c":3,"d":["4","5"]}},"e":"Hello, World!"}
-{"a":{"b":{"c":4,"d":["6","7"]}},"c":"43"}
-{"a":{"b":{"c":5,"d":["8","9"]}},"b":["b1","b2"],"d":{"e":{"f":["s3","s4"],"g":"44","h":"2020-02-02 10:00:00"}}}
-{'a.b.c':'UInt32','a.b.d':'Array(Nullable(Int64))','b':'Date','c':'Int64','d.e.f':'Array(Nullable(String))'}	{'a.b.d':'Array(Nullable(Int64))','b':'Date'}	{'c':'Int64','d.e.f':'Array(Nullable(String))'}
-{'a.b.c':'UInt32','a.b.d':'Array(Nullable(Int64))','b':'Array(Nullable(Int64))','d.e.g':'Int64'}	{'a.b.d':'Array(Nullable(Int64))','b':'Array(Nullable(Int64))'}	{'d.e.g':'Int64'}
-{'a.b.c':'UInt32','a.b.d':'Array(Nullable(Int64))','e':'String'}	{'a.b.d':'Array(Nullable(Int64))'}	{'e':'String'}
-{'a.b.c':'UInt32','a.b.d':'Array(Nullable(Int64))','c':'Int64'}	{'a.b.d':'Array(Nullable(Int64))'}	{'c':'Int64'}
-{'a.b.c':'UInt32','a.b.d':'Array(Nullable(Int64))','b':'Array(Nullable(String))','d.e.f':'Array(Nullable(String))','d.e.g':'Int64','d.e.h':'DateTime'}	{'a.b.d':'Array(Nullable(Int64))','b':'Array(Nullable(String))'}	{'d.e.f':'Array(Nullable(String))','d.e.g':'Int64','d.e.h':'DateTime'}
-JSON(a.b.c UInt32, max_dynamic_paths=0)
-{"a":{"b":{"c":1,"d":["0","1"]}},"b":"2020-01-01","c":"42","d":{"e":{"f":["s1","s2"]}}}
-{"a":{"b":{"c":2,"d":["2","3"]}},"b":["1","2","3"],"d":{"e":{"g":"43"}}}
-{"a":{"b":{"c":3,"d":["4","5"]}},"e":"Hello, World!"}
-{"a":{"b":{"c":4,"d":["6","7"]}},"c":"43"}
-{"a":{"b":{"c":5,"d":["8","9"]}},"b":["b1","b2"],"d":{"e":{"f":["s3","s4"],"g":"44","h":"2020-02-02 10:00:00"}}}
-{'a.b.c':'UInt32','a.b.d':'Array(Nullable(Int64))','b':'Date','c':'Int64','d.e.f':'Array(Nullable(String))'}	{}	{'a.b.d':'Array(Nullable(Int64))','b':'Date','c':'Int64','d.e.f':'Array(Nullable(String))'}
-{'a.b.c':'UInt32','a.b.d':'Array(Nullable(Int64))','b':'Array(Nullable(Int64))','d.e.g':'Int64'}	{}	{'a.b.d':'Array(Nullable(Int64))','b':'Array(Nullable(Int64))','d.e.g':'Int64'}
-{'a.b.c':'UInt32','a.b.d':'Array(Nullable(Int64))','e':'String'}	{}	{'a.b.d':'Array(Nullable(Int64))','e':'String'}
-{'a.b.c':'UInt32','a.b.d':'Array(Nullable(Int64))','c':'Int64'}	{}	{'a.b.d':'Array(Nullable(Int64))','c':'Int64'}
-{'a.b.c':'UInt32','a.b.d':'Array(Nullable(Int64))','b':'Array(Nullable(String))','d.e.f':'Array(Nullable(String))','d.e.g':'Int64','d.e.h':'DateTime'}	{}	{'a.b.d':'Array(Nullable(Int64))','b':'Array(Nullable(String))','d.e.f':'Array(Nullable(String))','d.e.g':'Int64','d.e.h':'DateTime'}
-JSON(a.b.c UInt32, max_dynamic_types=1)
-{"a":{"b":{"c":1,"d":["0","1"]}},"b":"2020-01-01","c":"42","d":{"e":{"f":["s1","s2"]}}}
-{"a":{"b":{"c":2,"d":["2","3"]}},"b":["1","2","3"],"d":{"e":{"g":"43"}}}
-{"a":{"b":{"c":3,"d":["4","5"]}},"e":"Hello, World!"}
-{"a":{"b":{"c":4,"d":["6","7"]}},"c":"43"}
-{"a":{"b":{"c":5,"d":["8","9"]}},"b":["b1","b2"],"d":{"e":{"f":["s3","s4"],"g":"44","h":"2020-02-02 10:00:00"}}}
-{'a.b.c':'UInt32','a.b.d':'Array(Nullable(Int64))','b':'Date','c':'Int64','d.e.f':'Array(Nullable(String))'}	{'a.b.d':'Array(Nullable(Int64))','b':'Date','c':'Int64','d.e.f':'Array(Nullable(String))'}	{}
-{'a.b.c':'UInt32','a.b.d':'Array(Nullable(Int64))','b':'Array(Nullable(Int64))','d.e.g':'Int64'}	{'a.b.d':'Array(Nullable(Int64))','b':'Array(Nullable(Int64))','d.e.g':'Int64'}	{}
-{'a.b.c':'UInt32','a.b.d':'Array(Nullable(Int64))','e':'String'}	{'a.b.d':'Array(Nullable(Int64))','e':'String'}	{}
-{'a.b.c':'UInt32','a.b.d':'Array(Nullable(Int64))','c':'Int64'}	{'a.b.d':'Array(Nullable(Int64))','c':'Int64'}	{}
-{'a.b.c':'UInt32','a.b.d':'Array(Nullable(Int64))','b':'Array(Nullable(String))','d.e.f':'Array(Nullable(String))','d.e.g':'Int64','d.e.h':'DateTime'}	{'a.b.d':'Array(Nullable(Int64))','b':'Array(Nullable(String))','d.e.f':'Array(Nullable(String))','d.e.g':'Int64','d.e.h':'DateTime'}	{}
-Test small max_read_buffer_size
-{"a":{"b":{"c":"1","d":["0","1"]}},"b":"2020-01-01","c":"42","d":{"e":{"f":["s1","s2"]}}}
-{"a":{"b":{"c":"2","d":["2","3"]}},"b":["1","2","3"],"d":{"e":{"g":"43"}}}
-{"a":{"b":{"c":"3","d":["4","5"]}},"e":"Hello, World!"}
-{"a":{"b":{"c":"4","d":["6","7"]}},"c":"43"}
-{"a":{"b":{"c":"5","d":["8","9"]}},"b":["b1","b2"],"d":{"e":{"f":["s3","s4"],"g":"44","h":"2020-02-02 10:00:00"}}}
-{"a":{"b":{"c":"1","d":["0","1"]}},"b":"2020-01-01","c":"42","d":{"e":{"f":["s1","s2"]}}}
-{"a":{"b":{"c":"2","d":["2","3"]}},"b":["1","2","3"],"d":{"e":{"g":"43"}}}
-{"a":{"b":{"c":"3","d":["4","5"]}},"e":"Hello, World!"}
-{"a":{"b":{"c":"4","d":["6","7"]}},"c":"43"}
-{"a":{"b":{"c":"5","d":["8","9"]}},"b":["b1","b2"],"d":{"e":{"f":["s3","s4"],"g":"44","h":"2020-02-02 10:00:00"}}}
-{"a":{"b":{"c":"1","d":["0","1"]}},"b":"2020-01-01","c":"42","d":{"e":{"f":["s1","s2"]}}}
-{"a":{"b":{"c":"2","d":["2","3"]}},"b":["1","2","3"],"d":{"e":{"g":"43"}}}
-{"a":{"b":{"c":"3","d":["4","5"]}},"e":"Hello, World!"}
-{"a":{"b":{"c":"4","d":["6","7"]}},"c":"43"}
-{"a":{"b":{"c":"5","d":["8","9"]}},"b":["b1","b2"],"d":{"e":{"f":["s3","s4"],"g":"44","h":"2020-02-02 10:00:00"}}}
-{"a":{"b":{"c":"1","d":["0","1"]}},"b":"2020-01-01","c":"42","d":{"e":{"f":["s1","s2"]}}}
-{"a":{"b":{"c":"2","d":["2","3"]}},"b":["1","2","3"],"d":{"e":{"g":"43"}}}
-{"a":{"b":{"c":"3","d":["4","5"]}},"e":"Hello, World!"}
-{"a":{"b":{"c":"4","d":["6","7"]}},"c":"43"}
-{"a":{"b":{"c":"5","d":["8","9"]}},"b":["b1","b2"],"d":{"e":{"f":["s3","s4"],"g":"44","h":"2020-02-02 10:00:00"}}}
-Test PrettyJSONEachRow
-{
-    "json": {
-        "a" : {
-            "b" : {
-                "c" : "1",
-                "d" : [
-                    "0",
-                    "1"
-                ]
-            }
-        },
-        "b" : "2020-01-01",
-        "c" : "42",
-        "d" : {
-            "e" : {
-                "f" : [
-                    "s1",
-                    "s2"
-                ]
-            }
-        }
-    }
-}
-{
-    "json": {
-        "a" : {
-            "b" : {
-                "c" : "2",
-                "d" : [
-                    "2",
-                    "3"
-                ]
-            }
-        },
-        "b" : [
-            "1",
-            "2",
-            "3"
-        ],
-        "d" : {
-            "e" : {
-                "g" : "43"
-            }
-        }
-    }
-}
-{
-    "json": {
-        "a" : {
-            "b" : {
-                "c" : "3",
-                "d" : [
-                    "4",
-                    "5"
-                ]
-            }
-        },
-        "e" : "Hello, World!"
-    }
-}
-{
-    "json": {
-        "a" : {
-            "b" : {
-                "c" : "4",
-                "d" : [
-                    "6",
-                    "7"
-                ]
-            }
-        },
-        "c" : "43"
-    }
-}
-{
-    "json": {
-        "a" : {
-            "b" : {
-                "c" : "5",
-                "d" : [
-                    "8",
-                    "9"
-                ]
-            }
-        },
-        "b" : [
-            "b1",
-            "b2"
-        ],
-        "d" : {
-            "e" : {
-                "f" : [
-                    "s3",
-                    "s4"
-                ],
-                "g" : "44",
-                "h" : "2020-02-02 10:00:00"
-            }
-        }
-    }
-}
-Test TSV
-{"a":{"b":{"c":"1","d":["0","1"]}},"b":"2020-01-01","c":"42","d":{"e":{"f":["s1","s2"]}}}
-{"a":{"b":{"c":"2","d":["2","3"]}},"b":["1","2","3"],"d":{"e":{"g":"43"}}}
-{"a":{"b":{"c":"3","d":["4","5"]}},"e":"Hello, World!"}
-{"a":{"b":{"c":"4","d":["6","7"]}},"c":"43"}
-{"a":{"b":{"c":"5","d":["8","9"]}},"b":["b1","b2"],"d":{"e":{"f":["s3","s4"],"g":"44","h":"2020-02-02 10:00:00"}}}
-Test CSV
-"{""a"":{""b"":{""c"":""1"",""d"":[""0"",""1""]}},""b"":""2020-01-01"",""c"":""42"",""d"":{""e"":{""f"":[""s1"",""s2""]}}}"
-"{""a"":{""b"":{""c"":""2"",""d"":[""2"",""3""]}},""b"":[""1"",""2"",""3""],""d"":{""e"":{""g"":""43""}}}"
-"{""a"":{""b"":{""c"":""3"",""d"":[""4"",""5""]}},""e"":""Hello, World!""}"
-"{""a"":{""b"":{""c"":""4"",""d"":[""6"",""7""]}},""c"":""43""}"
-"{""a"":{""b"":{""c"":""5"",""d"":[""8"",""9""]}},""b"":[""b1"",""b2""],""d"":{""e"":{""f"":[""s3"",""s4""],""g"":""44"",""h"":""2020-02-02 10:00:00""}}}"
diff --git a/tests/queries/0_stateless/03206_json_parsing_and_formatting.sh b/tests/queries/0_stateless/03206_json_parsing_and_formatting.sh
deleted file mode 100755
index 7e53e4388ec..00000000000
--- a/tests/queries/0_stateless/03206_json_parsing_and_formatting.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/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.json
-
-echo '{"a" : {"b" : {"c" : 1, "d" : [0, 1]}}, "b" : "2020-01-01", "c" : 42, "d" : {"e" : {"f" : ["s1", "s2"]}}}
-{"a" : {"b" : {"c" : 2, "d" : [2, 3]}}, "b" : [1, 2, 3], "c" : null, "d" : {"e" : {"g" : 43}}}
-{"a" : {"b" : {"c" : 3, "d" : [4, 5]}}, "e" : "Hello, World!"}
-{"a" : {"b" : {"c" : 4, "d" : [6, 7]}}, "c" : 43}
-{"a" : {"b" : {"c" : 5, "d" : [8, 9]}}, "b" : ["b1", "b2"], "d" : {"e" : {"f" : ["s3", "s4"], "g" : 44, "h" : "2020-02-02 10:00:00"}}}' > $DATA_FILE
-
-echo "JSON with no arguments"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 -q "select json from file($DATA_FILE, JSONAsObject)"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 -q "select JSONAllPathsWithTypes(json), JSONDynamicPathsWithTypes(json), JSONSharedDataPathsWithTypes(json) from file($DATA_FILE, JSONAsObject)"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 -q "select json.a.b.c, json.b, json.^d from file($DATA_FILE, JSONAsObject)"
-
-echo "JSON(a.b Tuple(c UInt32, d Array(Bool)), SKIP d.e, SKIP c, SKIP REGEXP '.*h.*')"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 -q "select json from file($DATA_FILE, JSONAsObject, 'json JSON(a.b Tuple(c UInt32, d Array(Bool)), SKIP d.e, SKIP c, SKIP REGEXP \'.*h.*\')')"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 -q "select JSONAllPathsWithTypes(json), JSONDynamicPathsWithTypes(json), JSONSharedDataPathsWithTypes(json) from file($DATA_FILE, JSONAsObject, 'json JSON(a.b Tuple(c UInt32, d Array(Bool)), SKIP d.e, SKIP c, SKIP REGEXP \'.*h.*\')')"
-
-echo "JSON(a.b.c UInt32, max_dynamic_paths=2)"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 -q "select json from file($DATA_FILE, JSONAsObject, 'json JSON(a.b.c UInt32, max_dynamic_paths=2)')"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 -q "select JSONAllPathsWithTypes(json), JSONDynamicPathsWithTypes(json), JSONSharedDataPathsWithTypes(json) from file($DATA_FILE, JSONAsObject, 'json JSON(a.b.c UInt32, max_dynamic_paths=2)')"
-
-echo "JSON(a.b.c UInt32, max_dynamic_paths=0)"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 -q "select json from file($DATA_FILE, JSONAsObject, 'json JSON(a.b.c UInt32, max_dynamic_paths=0)')"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 -q "select JSONAllPathsWithTypes(json), JSONDynamicPathsWithTypes(json), JSONSharedDataPathsWithTypes(json) from file($DATA_FILE, JSONAsObject, 'json JSON(a.b.c UInt32, max_dynamic_paths=0)')"
-
-echo "JSON(a.b.c UInt32, max_dynamic_types=1)"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 -q "select json from file($DATA_FILE, JSONAsObject, 'json JSON(a.b.c UInt32, max_dynamic_types=0)')"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 -q "select JSONAllPathsWithTypes(json), JSONDynamicPathsWithTypes(json), JSONSharedDataPathsWithTypes(json) from file($DATA_FILE, JSONAsObject, 'json JSON(a.b.c UInt32, max_dynamic_types=0)')"
-
-echo "Test small max_read_buffer_size"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 --max_read_buffer_size=1 -q "select json from file($DATA_FILE, JSONAsObject)"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 --max_read_buffer_size=2 -q "select json from file($DATA_FILE, JSONAsObject)"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 --max_read_buffer_size=3 -q "select json from file($DATA_FILE, JSONAsObject)"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 --max_read_buffer_size=4 -q "select json from file($DATA_FILE, JSONAsObject)"
-
-echo "Test PrettyJSONEachRow"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 -q "select json from file($DATA_FILE, JSONAsObject) format PrettyJSONEachRow"
-
-echo "Test TSV"
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 -q "select json from file($DATA_FILE, TSV, 'json JSON') format TSV"
-echo "Test CSV"
-echo '"{""a"" : {""b"" : {""c"" : 1, ""d"" : [0, 1]}}, ""b"" : ""2020-01-01"", ""c"" : 42, ""d"" : {""e"" : {""f"" : [""s1"", ""s2""]}}}"
-"{""a"" : {""b"" : {""c"" : 2, ""d"" : [2, 3]}}, ""b"" : [1, 2, 3], ""c"" : null, ""d"" : {""e"" : {""g"" : 43}}}"
-"{""a"" : {""b"" : {""c"" : 3, ""d"" : [4, 5]}}, ""e"" : ""Hello, World!""}"
-"{""a"" : {""b"" : {""c"" : 4, ""d"" : [6, 7]}}, ""c"" : 43}"
-"{""a"" : {""b"" : {""c"" : 5, ""d"" : [8, 9]}}, ""b"" : [""b1"", ""b2""], ""d"" : {""e"" : {""f"" : [""s3"", ""s4""], ""g"" : 44, ""h"" : ""2020-02-02 10:00:00""}}}"' > $DATA_FILE
-$CLICKHOUSE_LOCAL --allow_experimental_json_type=1 -q "select json from file($DATA_FILE, CSV, 'json JSON') format CSV"
-
-rm $DATA_FILE
diff --git a/tests/queries/0_stateless/03206_no_exceptions_clickhouse_local.reference b/tests/queries/0_stateless/03206_no_exceptions_clickhouse_local.reference
deleted file mode 100644
index 11277a62b06..00000000000
--- a/tests/queries/0_stateless/03206_no_exceptions_clickhouse_local.reference
+++ /dev/null
@@ -1 +0,0 @@
-Hello	world
diff --git a/tests/queries/0_stateless/03206_no_exceptions_clickhouse_local.sh b/tests/queries/0_stateless/03206_no_exceptions_clickhouse_local.sh
deleted file mode 100755
index 00efd1f4591..00000000000
--- a/tests/queries/0_stateless/03206_no_exceptions_clickhouse_local.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-CLICKHOUSE_TERMINATE_ON_ANY_EXCEPTION=1 ${CLICKHOUSE_LOCAL} --query "SELECT * FROM table" --input-format CSV <<<"Hello, world"
diff --git a/tests/queries/0_stateless/03206_projection_merge_special_mergetree.reference b/tests/queries/0_stateless/03206_projection_merge_special_mergetree.reference
deleted file mode 100644
index 1a9cc2b7fbf..00000000000
--- a/tests/queries/0_stateless/03206_projection_merge_special_mergetree.reference
+++ /dev/null
@@ -1 +0,0 @@
-p
diff --git a/tests/queries/0_stateless/03206_projection_merge_special_mergetree.sql b/tests/queries/0_stateless/03206_projection_merge_special_mergetree.sql
deleted file mode 100644
index 82684f754b6..00000000000
--- a/tests/queries/0_stateless/03206_projection_merge_special_mergetree.sql
+++ /dev/null
@@ -1,106 +0,0 @@
-DROP TABLE IF EXISTS tp;
-
--- test regular merge tree
-CREATE TABLE tp (
-    type Int32,
-    eventcnt UInt64,
-    PROJECTION p (select sum(eventcnt), type group by type)
-) engine = MergeTree order by type;
-
-INSERT INTO tp SELECT number%3, 1 FROM numbers(3);
-
-OPTIMIZE TABLE tp DEDUPLICATE;  -- { serverError SUPPORT_IS_DISABLED }
-
-DROP TABLE tp;
-
-CREATE TABLE tp (
-    type Int32,
-    eventcnt UInt64,
-    PROJECTION p (select sum(eventcnt), type group by type)
-) engine = MergeTree order by type
-SETTINGS deduplicate_merge_projection_mode = 'drop';
-
-INSERT INTO tp SELECT number%3, 1 FROM numbers(3);
-
-OPTIMIZE TABLE tp DEDUPLICATE;
-
-ALTER TABLE tp MODIFY SETTING deduplicate_merge_projection_mode = 'throw';
-
-OPTIMIZE TABLE tp DEDUPLICATE;  -- { serverError SUPPORT_IS_DISABLED }
-
-DROP TABLE tp;
-
-
--- test irregular merge tree
-CREATE TABLE tp (
-    type Int32,
-    eventcnt UInt64,
-    PROJECTION p (select sum(eventcnt), type group by type)
-) engine = ReplacingMergeTree order by type;  -- { serverError SUPPORT_IS_DISABLED }
-
-CREATE TABLE tp (
-    type Int32,
-    eventcnt UInt64,
-    PROJECTION p (select sum(eventcnt), type group by type)
-) engine = ReplacingMergeTree order by type
-SETTINGS deduplicate_merge_projection_mode = 'throw';  -- { serverError SUPPORT_IS_DISABLED }
-
-CREATE TABLE tp (
-    type Int32,
-    eventcnt UInt64,
-    PROJECTION p (select sum(eventcnt), type group by type)
-) engine = ReplacingMergeTree order by type
-SETTINGS deduplicate_merge_projection_mode = 'drop';
-
-INSERT INTO tp SELECT number%3, 1 FROM numbers(3);
-
-OPTIMIZE TABLE tp FINAL;
-
--- expecting no projection
-SYSTEM FLUSH LOGS;
-SELECT
-    name
-FROM system.projection_parts
-WHERE (database = currentDatabase()) AND (`table` = 'tp') AND (active = 1);
-
-ALTER TABLE tp MODIFY SETTING deduplicate_merge_projection_mode = 'throw';
-
-OPTIMIZE TABLE tp DEDUPLICATE;  -- { serverError SUPPORT_IS_DISABLED }
-
-DROP TABLE tp;
-
-CREATE TABLE tp (
-    type Int32,
-    eventcnt UInt64,
-    PROJECTION p (select sum(eventcnt), type group by type)
-) engine = ReplacingMergeTree order by type
-SETTINGS deduplicate_merge_projection_mode = 'rebuild';
-
-ALTER TABLE tp MODIFY SETTING deduplicate_merge_projection_mode = 'throw';
-
-OPTIMIZE TABLE tp DEDUPLICATE;  -- { serverError SUPPORT_IS_DISABLED }
-
-DROP TABLE tp;
-
--- test alter add projection case
-CREATE TABLE tp (
-    type Int32,
-    eventcnt UInt64
-) engine = ReplacingMergeTree order by type;
-
-ALTER TABLE tp ADD PROJECTION p (SELECT sum(eventcnt), type GROUP BY type);  -- { serverError SUPPORT_IS_DISABLED }
-
-ALTER TABLE tp MODIFY SETTING deduplicate_merge_projection_mode = 'drop';
-
-ALTER TABLE tp ADD PROJECTION p (SELECT sum(eventcnt), type GROUP BY type);
-
-INSERT INTO tp SELECT number%3, 1 FROM numbers(3);
-
-SYSTEM FLUSH LOGS;
--- expecting projection p
-SELECT
-    name
-FROM system.projection_parts
-WHERE (database = currentDatabase()) AND (`table` = 'tp') AND (active = 1);
-
-DROP TABLE tp;
diff --git a/tests/queries/0_stateless/03206_replication_lag_metric.reference b/tests/queries/0_stateless/03206_replication_lag_metric.reference
deleted file mode 100644
index 02f4a7264b1..00000000000
--- a/tests/queries/0_stateless/03206_replication_lag_metric.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-0
-2
-0
-2
diff --git a/tests/queries/0_stateless/03206_replication_lag_metric.sql b/tests/queries/0_stateless/03206_replication_lag_metric.sql
deleted file mode 100644
index 998c332a11c..00000000000
--- a/tests/queries/0_stateless/03206_replication_lag_metric.sql
+++ /dev/null
@@ -1,11 +0,0 @@
--- Tags: no-parallel
-
-CREATE DATABASE rdb1 ENGINE = Replicated('/test/test_replication_lag_metric', 'shard1', 'replica1');
-CREATE DATABASE rdb2 ENGINE = Replicated('/test/test_replication_lag_metric', 'shard1', 'replica2');
-
-SET distributed_ddl_task_timeout = 0;
-CREATE TABLE rdb1.t (id UInt32) ENGINE = ReplicatedMergeTree ORDER BY id;
-SELECT replication_lag FROM system.clusters WHERE cluster IN ('rdb1', 'rdb2') ORDER BY cluster ASC, replica_num ASC;
-
-DROP DATABASE rdb1;
-DROP DATABASE rdb2;
diff --git a/tests/queries/0_stateless/03207_json_read_subcolumns_1_compact_merge_tree.reference.j2 b/tests/queries/0_stateless/03207_json_read_subcolumns_1_compact_merge_tree.reference.j2
deleted file mode 100644
index a93a2259442..00000000000
--- a/tests/queries/0_stateless/03207_json_read_subcolumns_1_compact_merge_tree.reference.j2
+++ /dev/null
@@ -1,826 +0,0 @@
-('a.b.c','UInt32')
-('a.b.d','Array(Nullable(String))')
-('a.b.d','DateTime')
-('a.b.d','Int64')
-('a.b.e','String')
-('b.b._25','Int64')
-('b.b._26','Int64')
-('b.b._27','Int64')
-('b.b._28','Int64')
-('b.b._29','Int64')
-('b.b.d','Int64')
-('b.b.e','String')
-('d.a','Array(Nullable(Int64))')
-('d.a','Int64')
-('d.b','Int64')
-('d.c','Date')
-{
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.e": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.c": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.^`n`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.^`a`.b": [{"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":5}, {"c":6}, {"c":7}, {"c":8}, {"c":9}, {"c":0,"d":"10","e":"str_10"}, {"c":0,"d":"11","e":"str_11"}, {"c":0,"d":"12","e":"str_12"}, {"c":0,"d":"13","e":"str_13"}, {"c":0,"d":"14","e":"str_14"}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":20,"d":"20","e":"str_20"}, {"c":21,"d":"21","e":"str_21"}, {"c":22,"d":"22","e":"str_22"}, {"c":23,"d":"23","e":"str_23"}, {"c":24,"d":"24","e":"str_24"}, {"c":25,"d":"25","e":"str_25"}, {"c":26,"d":"26","e":"str_26"}, {"c":27,"d":"27","e":"str_27"}, {"c":28,"d":"28","e":"str_28"}, {"c":29,"d":"29","e":"str_29"}, {"c":30,"d":[],"e":"str_30"}, {"c":31,"d":[],"e":"str_31"}, {"c":32,"d":[],"e":"str_32"}, {"c":33,"d":[],"e":"str_33"}, {"c":34,"d":[],"e":"str_34"}, {"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}, {"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}, {"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}, {"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}, {"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}],
-	"json.^`b`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"b":{"d":"15","e":"str_15"}}, {"b":{"d":"16","e":"str_16"}}, {"b":{"d":"17","e":"str_17"}}, {"b":{"d":"18","e":"str_18"}}, {"b":{"d":"19","e":"str_19"}}, {}, {}, {}, {}, {}, {"b":{"_25":"25"}}, {"b":{"_26":"26"}}, {"b":{"_27":"27"}}, {"b":{"_28":"28"}}, {"b":{"_29":"29"}}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`d`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"a":"30","c":"1970-01-31"}, {"a":"31","c":"1970-02-01"}, {"a":"32","c":"1970-02-02"}, {"a":"33","c":"1970-02-03"}, {"a":"34","c":"1970-02-04"}, {"a":["0"],"b":"35"}, {"a":["0","1"],"b":"36"}, {"a":["0","1","2"],"b":"37"}, {"a":["0","1","2","3"],"b":"38"}, {"a":["0","1","2","3","4"],"b":"39"}]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.e": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.c": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.^`n`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.^`a`.b": [{"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":5}, {"c":6}, {"c":7}, {"c":8}, {"c":9}, {"c":0,"d":"10","e":"str_10"}, {"c":0,"d":"11","e":"str_11"}, {"c":0,"d":"12","e":"str_12"}, {"c":0,"d":"13","e":"str_13"}, {"c":0,"d":"14","e":"str_14"}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":20,"d":"20","e":"str_20"}, {"c":21,"d":"21","e":"str_21"}, {"c":22,"d":"22","e":"str_22"}, {"c":23,"d":"23","e":"str_23"}, {"c":24,"d":"24","e":"str_24"}, {"c":25,"d":"25","e":"str_25"}, {"c":26,"d":"26","e":"str_26"}, {"c":27,"d":"27","e":"str_27"}, {"c":28,"d":"28","e":"str_28"}, {"c":29,"d":"29","e":"str_29"}, {"c":30,"d":[],"e":"str_30"}, {"c":31,"d":[],"e":"str_31"}, {"c":32,"d":[],"e":"str_32"}, {"c":33,"d":[],"e":"str_33"}, {"c":34,"d":[],"e":"str_34"}, {"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}, {"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}, {"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}, {"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}, {"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}],
-	"json.^`b`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"b":{"d":"15","e":"str_15"}}, {"b":{"d":"16","e":"str_16"}}, {"b":{"d":"17","e":"str_17"}}, {"b":{"d":"18","e":"str_18"}}, {"b":{"d":"19","e":"str_19"}}, {}, {}, {}, {}, {}, {"b":{"_25":"25"}}, {"b":{"_26":"26"}}, {"b":{"_27":"27"}}, {"b":{"_28":"28"}}, {"b":{"_29":"29"}}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`d`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"a":"30","c":"1970-01-31"}, {"a":"31","c":"1970-02-01"}, {"a":"32","c":"1970-02-02"}, {"a":"33","c":"1970-02-03"}, {"a":"34","c":"1970-02-04"}, {"a":["0"],"b":"35"}, {"a":["0","1"],"b":"36"}, {"a":["0","1","2"],"b":"37"}, {"a":["0","1","2","3"],"b":"38"}, {"a":["0","1","2","3","4"],"b":"39"}]
-}
-{
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-('a.b.c','UInt32')
-('a.b.d','Array(Nullable(String))')
-('a.b.d','DateTime')
-('a.b.d','Int64')
-('a.b.e','String')
-('b.b._25','Int64')
-('b.b._26','Int64')
-('b.b._27','Int64')
-('b.b._28','Int64')
-('b.b._29','Int64')
-('b.b.d','Int64')
-('b.b.e','String')
-('d.a','Array(Nullable(Int64))')
-('d.a','Int64')
-('d.b','Int64')
-('d.c','Date')
-{
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.e": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.c": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.^`n`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.^`a`.b": [{"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":5}, {"c":6}, {"c":7}, {"c":8}, {"c":9}, {"c":0,"d":"10","e":"str_10"}, {"c":0,"d":"11","e":"str_11"}, {"c":0,"d":"12","e":"str_12"}, {"c":0,"d":"13","e":"str_13"}, {"c":0,"d":"14","e":"str_14"}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":20,"d":"20","e":"str_20"}, {"c":21,"d":"21","e":"str_21"}, {"c":22,"d":"22","e":"str_22"}, {"c":23,"d":"23","e":"str_23"}, {"c":24,"d":"24","e":"str_24"}, {"c":25,"d":"25","e":"str_25"}, {"c":26,"d":"26","e":"str_26"}, {"c":27,"d":"27","e":"str_27"}, {"c":28,"d":"28","e":"str_28"}, {"c":29,"d":"29","e":"str_29"}, {"c":30,"d":[],"e":"str_30"}, {"c":31,"d":[],"e":"str_31"}, {"c":32,"d":[],"e":"str_32"}, {"c":33,"d":[],"e":"str_33"}, {"c":34,"d":[],"e":"str_34"}, {"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}, {"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}, {"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}, {"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}, {"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}],
-	"json.^`b`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"b":{"d":"15","e":"str_15"}}, {"b":{"d":"16","e":"str_16"}}, {"b":{"d":"17","e":"str_17"}}, {"b":{"d":"18","e":"str_18"}}, {"b":{"d":"19","e":"str_19"}}, {}, {}, {}, {}, {}, {"b":{"_25":"25"}}, {"b":{"_26":"26"}}, {"b":{"_27":"27"}}, {"b":{"_28":"28"}}, {"b":{"_29":"29"}}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`d`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"a":"30","c":"1970-01-31"}, {"a":"31","c":"1970-02-01"}, {"a":"32","c":"1970-02-02"}, {"a":"33","c":"1970-02-03"}, {"a":"34","c":"1970-02-04"}, {"a":["0"],"b":"35"}, {"a":["0","1"],"b":"36"}, {"a":["0","1","2"],"b":"37"}, {"a":["0","1","2","3"],"b":"38"}, {"a":["0","1","2","3","4"],"b":"39"}]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.e": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.c": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.^`n`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.^`a`.b": [{"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":5}, {"c":6}, {"c":7}, {"c":8}, {"c":9}, {"c":0,"d":"10","e":"str_10"}, {"c":0,"d":"11","e":"str_11"}, {"c":0,"d":"12","e":"str_12"}, {"c":0,"d":"13","e":"str_13"}, {"c":0,"d":"14","e":"str_14"}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":20,"d":"20","e":"str_20"}, {"c":21,"d":"21","e":"str_21"}, {"c":22,"d":"22","e":"str_22"}, {"c":23,"d":"23","e":"str_23"}, {"c":24,"d":"24","e":"str_24"}, {"c":25,"d":"25","e":"str_25"}, {"c":26,"d":"26","e":"str_26"}, {"c":27,"d":"27","e":"str_27"}, {"c":28,"d":"28","e":"str_28"}, {"c":29,"d":"29","e":"str_29"}, {"c":30,"d":[],"e":"str_30"}, {"c":31,"d":[],"e":"str_31"}, {"c":32,"d":[],"e":"str_32"}, {"c":33,"d":[],"e":"str_33"}, {"c":34,"d":[],"e":"str_34"}, {"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}, {"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}, {"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}, {"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}, {"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}],
-	"json.^`b`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"b":{"d":"15","e":"str_15"}}, {"b":{"d":"16","e":"str_16"}}, {"b":{"d":"17","e":"str_17"}}, {"b":{"d":"18","e":"str_18"}}, {"b":{"d":"19","e":"str_19"}}, {}, {}, {}, {}, {}, {"b":{"_25":"25"}}, {"b":{"_26":"26"}}, {"b":{"_27":"27"}}, {"b":{"_28":"28"}}, {"b":{"_29":"29"}}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`d`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"a":"30","c":"1970-01-31"}, {"a":"31","c":"1970-02-01"}, {"a":"32","c":"1970-02-02"}, {"a":"33","c":"1970-02-03"}, {"a":"34","c":"1970-02-04"}, {"a":["0"],"b":"35"}, {"a":["0","1"],"b":"36"}, {"a":["0","1","2"],"b":"37"}, {"a":["0","1","2","3"],"b":"38"}, {"a":["0","1","2","3","4"],"b":"39"}]
-}
-{
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
diff --git a/tests/queries/0_stateless/03207_json_read_subcolumns_1_compact_merge_tree.sql.j2 b/tests/queries/0_stateless/03207_json_read_subcolumns_1_compact_merge_tree.sql.j2
deleted file mode 100644
index 0ec1a86372b..00000000000
--- a/tests/queries/0_stateless/03207_json_read_subcolumns_1_compact_merge_tree.sql.j2
+++ /dev/null
@@ -1,93 +0,0 @@
--- Tags: no-fasttest
-
-set allow_experimental_json_type = 1;
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type = 1;
-set session_timezone = 'UTC';
-
-drop table if exists test;
-create table test (id UInt64, json JSON(max_dynamic_paths=2, a.b.c UInt32)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000;
-
-insert into test select number, '{}' from numbers(5);
-insert into test select number, toJSONString(map('a.b.c', number)) from numbers(5, 5);
-insert into test select number, toJSONString(map('a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number))) from numbers(10, 5);
-insert into test select number, toJSONString(map('b.b.d', number::UInt32, 'b.b.e', 'str_' || toString(number))) from numbers(15, 5);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number))) from numbers(20, 5);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number), 'b.b._' || toString(number), number::UInt32)) from numbers(25, 5);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', range(number % + 1)::Array(UInt32), 'a.b.e', 'str_' || toString(number), 'd.a', number::UInt32, 'd.c', toDate(number))) from numbers(30, 5);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', toDateTime(number), 'a.b.e', 'str_' || toString(number), 'd.a', range(number % 5 + 1)::Array(UInt32), 'd.b', number::UInt32)) from numbers(35, 5);
-
-{% for merge_command in ['system stop merges test', 'system start merges test'] -%}
-
-{{ merge_command }};
-
-select distinct arrayJoin(JSONAllPathsWithTypes(json)) as paths_with_types from test order by paths_with_types;
-
-select json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_25`, json.b.b.`_25`.:Int64, json.b.b.`_25`.:UUID, json.b.b.`_26`, json.b.b.`_26`.:Int64, json.b.b.`_26`.:UUID, json.b.b.`_27`, json.b.b.`_27`.:Int64, json.b.b.`_27`.:UUID, json.b.b.`_28`, json.b.b.`_28`.:Int64, json.b.b.`_28`.:UUID, json.b.b.`_29`, json.b.b.`_29`.:Int64,  json.b.b.`_29`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test order by id format JSONColumns;
-select json, json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_25`, json.b.b.`_25`.:Int64, json.b.b.`_25`.:UUID, json.b.b.`_26`, json.b.b.`_26`.:Int64, json.b.b.`_26`.:UUID, json.b.b.`_27`, json.b.b.`_27`.:Int64, json.b.b.`_27`.:UUID, json.b.b.`_28`, json.b.b.`_28`.:Int64, json.b.b.`_28`.:UUID, json.b.b.`_29`, json.b.b.`_29`.:Int64,  json.b.b.`_29`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test order by id format JSONColumns;
-
-select json.non.existing.path from test order by id format JSONColumns;
-select json.non.existing.path.:Int64 from test order by id format JSONColumns;
-select json.non.existing.path, json.non.existing.path.:Int64 from test order by id format JSONColumns;
-select json, json.non.existing.path from test order by id format JSONColumns;
-select json, json.non.existing.path.:Int64 from test order by id format JSONColumns;
-select json, json.non.existing.path, json.non.existing.path.:Int64 from test order by id format JSONColumns;
-
-select json.a.b.c from test order by id format JSONColumns;
-select json, json.a.b.c from test order by id format JSONColumns;
-
-select json.b.b.e from test order by id format JSONColumns;
-select json.b.b.e.:String, json.b.b.e.:Date from test order by id format JSONColumns;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test order by id format JSONColumns;
-select json, json.b.b.e from test order by id format JSONColumns;
-select json, json.b.b.e.:String, json.b.b.e.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test order by id format JSONColumns;
-
-select json.b.b.e, json.a.b.d from test order by id format JSONColumns;
-select json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.a.b.d from test order by id format JSONColumns;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-
-select json.b.b.e, json.d.a from test order by id format JSONColumns;
-select json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format JSONColumns;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.d.a from test order by id format JSONColumns;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format JSONColumns;
-
-select json.b.b.e, json.d.a, json.d.b from test order by id format JSONColumns;
-select json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.d.a, json.d.b from test order by id format JSONColumns;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-
-select json.d.a, json.d.b from test order by id format JSONColumns;
-select json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json, json.d.a, json.d.b from test order by id format JSONColumns;
-select json, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-
-select json.d.a, json.b.b.`_26` from test order by id format JSONColumns;
-select json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_26`.:Int64, json.b.b.`_26`.:Date from test order by id format JSONColumns;
-select json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_26`.:Int64, json.b.b, json.b.b.`_26`.:Date from test order by id format JSONColumns;
-select json, json.d.a, json.b.b.`_26` from test order by id format JSONColumns;
-select json, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_26`.:Int64, json.b.b.`_26`.:Date from test order by id format JSONColumns;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_26`.:Int64, json.b.b, json.b.b.`_26`.:Date from test order by id format JSONColumns;
-
-select json.^a, json.a.b.c from test order by id format JSONColumns;
-select json, json.^a, json.a.b.c from test order by id format JSONColumns;
-
-select json.^a, json.a.b.d from test order by id format JSONColumns;
-select json.^a, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json.^a, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json, json.^a, json.a.b.d from test order by id format JSONColumns;
-select json, json.^a, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json, json.^a, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-
-{% endfor -%}
-
-drop table test;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03207_json_read_subcolumns_1_memory.reference b/tests/queries/0_stateless/03207_json_read_subcolumns_1_memory.reference
deleted file mode 100644
index 6276be52c0d..00000000000
--- a/tests/queries/0_stateless/03207_json_read_subcolumns_1_memory.reference
+++ /dev/null
@@ -1,413 +0,0 @@
-('a.b.c','UInt32')
-('a.b.d','Array(Nullable(String))')
-('a.b.d','DateTime')
-('a.b.d','Int64')
-('a.b.e','String')
-('b.b._25','Int64')
-('b.b._26','Int64')
-('b.b._27','Int64')
-('b.b._28','Int64')
-('b.b._29','Int64')
-('b.b.d','Int64')
-('b.b.e','String')
-('d.a','Array(Nullable(Int64))')
-('d.a','Int64')
-('d.b','Int64')
-('d.c','Date')
-{
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.e": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.c": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.^`n`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.^`a`.b": [{"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":5}, {"c":6}, {"c":7}, {"c":8}, {"c":9}, {"c":0,"d":"10","e":"str_10"}, {"c":0,"d":"11","e":"str_11"}, {"c":0,"d":"12","e":"str_12"}, {"c":0,"d":"13","e":"str_13"}, {"c":0,"d":"14","e":"str_14"}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":20,"d":"20","e":"str_20"}, {"c":21,"d":"21","e":"str_21"}, {"c":22,"d":"22","e":"str_22"}, {"c":23,"d":"23","e":"str_23"}, {"c":24,"d":"24","e":"str_24"}, {"c":25,"d":"25","e":"str_25"}, {"c":26,"d":"26","e":"str_26"}, {"c":27,"d":"27","e":"str_27"}, {"c":28,"d":"28","e":"str_28"}, {"c":29,"d":"29","e":"str_29"}, {"c":30,"d":[],"e":"str_30"}, {"c":31,"d":[],"e":"str_31"}, {"c":32,"d":[],"e":"str_32"}, {"c":33,"d":[],"e":"str_33"}, {"c":34,"d":[],"e":"str_34"}, {"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}, {"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}, {"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}, {"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}, {"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}],
-	"json.^`b`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"b":{"d":"15","e":"str_15"}}, {"b":{"d":"16","e":"str_16"}}, {"b":{"d":"17","e":"str_17"}}, {"b":{"d":"18","e":"str_18"}}, {"b":{"d":"19","e":"str_19"}}, {}, {}, {}, {}, {}, {"b":{"_25":"25"}}, {"b":{"_26":"26"}}, {"b":{"_27":"27"}}, {"b":{"_28":"28"}}, {"b":{"_29":"29"}}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`d`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"a":"30","c":"1970-01-31"}, {"a":"31","c":"1970-02-01"}, {"a":"32","c":"1970-02-02"}, {"a":"33","c":"1970-02-03"}, {"a":"34","c":"1970-02-04"}, {"a":["0"],"b":"35"}, {"a":["0","1"],"b":"36"}, {"a":["0","1","2"],"b":"37"}, {"a":["0","1","2","3"],"b":"38"}, {"a":["0","1","2","3","4"],"b":"39"}]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.e": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.c": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.^`n`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.^`a`.b": [{"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":5}, {"c":6}, {"c":7}, {"c":8}, {"c":9}, {"c":0,"d":"10","e":"str_10"}, {"c":0,"d":"11","e":"str_11"}, {"c":0,"d":"12","e":"str_12"}, {"c":0,"d":"13","e":"str_13"}, {"c":0,"d":"14","e":"str_14"}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":20,"d":"20","e":"str_20"}, {"c":21,"d":"21","e":"str_21"}, {"c":22,"d":"22","e":"str_22"}, {"c":23,"d":"23","e":"str_23"}, {"c":24,"d":"24","e":"str_24"}, {"c":25,"d":"25","e":"str_25"}, {"c":26,"d":"26","e":"str_26"}, {"c":27,"d":"27","e":"str_27"}, {"c":28,"d":"28","e":"str_28"}, {"c":29,"d":"29","e":"str_29"}, {"c":30,"d":[],"e":"str_30"}, {"c":31,"d":[],"e":"str_31"}, {"c":32,"d":[],"e":"str_32"}, {"c":33,"d":[],"e":"str_33"}, {"c":34,"d":[],"e":"str_34"}, {"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}, {"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}, {"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}, {"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}, {"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}],
-	"json.^`b`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"b":{"d":"15","e":"str_15"}}, {"b":{"d":"16","e":"str_16"}}, {"b":{"d":"17","e":"str_17"}}, {"b":{"d":"18","e":"str_18"}}, {"b":{"d":"19","e":"str_19"}}, {}, {}, {}, {}, {}, {"b":{"_25":"25"}}, {"b":{"_26":"26"}}, {"b":{"_27":"27"}}, {"b":{"_28":"28"}}, {"b":{"_29":"29"}}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`d`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"a":"30","c":"1970-01-31"}, {"a":"31","c":"1970-02-01"}, {"a":"32","c":"1970-02-02"}, {"a":"33","c":"1970-02-03"}, {"a":"34","c":"1970-02-04"}, {"a":["0"],"b":"35"}, {"a":["0","1"],"b":"36"}, {"a":["0","1","2"],"b":"37"}, {"a":["0","1","2","3"],"b":"38"}, {"a":["0","1","2","3","4"],"b":"39"}]
-}
-{
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
diff --git a/tests/queries/0_stateless/03207_json_read_subcolumns_1_memory.sql b/tests/queries/0_stateless/03207_json_read_subcolumns_1_memory.sql
deleted file mode 100644
index 51e6970759d..00000000000
--- a/tests/queries/0_stateless/03207_json_read_subcolumns_1_memory.sql
+++ /dev/null
@@ -1,87 +0,0 @@
--- Tags: no-fasttest, long
-set allow_experimental_json_type = 1;
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type=1;
-set session_timezone = 'UTC';
-
-drop table if exists test;
-create table test (id UInt64, json JSON(max_dynamic_paths=2, a.b.c UInt32)) engine=Memory;
-
-truncate table test;
-insert into test select number, '{}' from numbers(5);
-insert into test select number, toJSONString(map('a.b.c', number)) from numbers(5, 5);
-insert into test select number, toJSONString(map('a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number))) from numbers(10, 5);
-insert into test select number, toJSONString(map('b.b.d', number::UInt32, 'b.b.e', 'str_' || toString(number))) from numbers(15, 5);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number))) from numbers(20, 5);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number), 'b.b._' || toString(number), number::UInt32)) from numbers(25, 5);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', range(number % + 1)::Array(UInt32), 'a.b.e', 'str_' || toString(number), 'd.a', number::UInt32, 'd.c', toDate(number))) from numbers(30, 5);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', toDateTime(number), 'a.b.e', 'str_' || toString(number), 'd.a', range(number % 5 + 1)::Array(UInt32), 'd.b', number::UInt32)) from numbers(35, 5);
-
-select distinct arrayJoin(JSONAllPathsWithTypes(json)) as paths_with_types from test order by paths_with_types;
-
-select json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_25`, json.b.b.`_25`.:Int64, json.b.b.`_25`.:UUID, json.b.b.`_26`, json.b.b.`_26`.:Int64, json.b.b.`_26`.:UUID, json.b.b.`_27`, json.b.b.`_27`.:Int64, json.b.b.`_27`.:UUID, json.b.b.`_28`, json.b.b.`_28`.:Int64, json.b.b.`_28`.:UUID, json.b.b.`_29`, json.b.b.`_29`.:Int64,  json.b.b.`_29`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test order by id format JSONColumns;
-select json, json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_25`, json.b.b.`_25`.:Int64, json.b.b.`_25`.:UUID, json.b.b.`_26`, json.b.b.`_26`.:Int64, json.b.b.`_26`.:UUID, json.b.b.`_27`, json.b.b.`_27`.:Int64, json.b.b.`_27`.:UUID, json.b.b.`_28`, json.b.b.`_28`.:Int64, json.b.b.`_28`.:UUID, json.b.b.`_29`, json.b.b.`_29`.:Int64,  json.b.b.`_29`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test order by id format JSONColumns;
-
-select json.non.existing.path from test order by id format JSONColumns;
-select json.non.existing.path.:Int64 from test order by id format JSONColumns;
-select json.non.existing.path, json.non.existing.path.:Int64 from test order by id format JSONColumns;
-select json, json.non.existing.path from test order by id format JSONColumns;
-select json, json.non.existing.path.:Int64 from test order by id format JSONColumns;
-select json, json.non.existing.path, json.non.existing.path.:Int64 from test order by id format JSONColumns;
-
-select json.a.b.c from test order by id format JSONColumns;
-select json, json.a.b.c from test order by id format JSONColumns;
-
-select json.b.b.e from test order by id format JSONColumns;
-select json.b.b.e.:String, json.b.b.e.:Date from test order by id format JSONColumns;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test order by id format JSONColumns;
-select json, json.b.b.e from test order by id format JSONColumns;
-select json, json.b.b.e.:String, json.b.b.e.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test order by id format JSONColumns;
-
-select json.b.b.e, json.a.b.d from test order by id format JSONColumns;
-select json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.a.b.d from test order by id format JSONColumns;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-
-select json.b.b.e, json.d.a from test order by id format JSONColumns;
-select json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format JSONColumns;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.d.a from test order by id format JSONColumns;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format JSONColumns;
-
-select json.b.b.e, json.d.a, json.d.b from test order by id format JSONColumns;
-select json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.d.a, json.d.b from test order by id format JSONColumns;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-
-select json.d.a, json.d.b from test order by id format JSONColumns;
-select json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json, json.d.a, json.d.b from test order by id format JSONColumns;
-select json, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-
-select json.d.a, json.b.b.`_26` from test order by id format JSONColumns;
-select json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_26`.:Int64, json.b.b.`_26`.:Date from test order by id format JSONColumns;
-select json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_26`.:Int64, json.b.b, json.b.b.`_26`.:Date from test order by id format JSONColumns;
-select json, json.d.a, json.b.b.`_26` from test order by id format JSONColumns;
-select json, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_26`.:Int64, json.b.b.`_26`.:Date from test order by id format JSONColumns;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_26`.:Int64, json.b.b, json.b.b.`_26`.:Date from test order by id format JSONColumns;
-
-select json.^a, json.a.b.c from test order by id format JSONColumns;
-select json, json.^a, json.a.b.c from test order by id format JSONColumns;
-
-select json.^a, json.a.b.d from test order by id format JSONColumns;
-select json.^a, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json.^a, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json, json.^a, json.a.b.d from test order by id format JSONColumns;
-select json, json.^a, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json, json.^a, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-
-drop table test;
diff --git a/tests/queries/0_stateless/03207_json_read_subcolumns_1_wide_merge_tree.reference.j2 b/tests/queries/0_stateless/03207_json_read_subcolumns_1_wide_merge_tree.reference.j2
deleted file mode 100644
index a93a2259442..00000000000
--- a/tests/queries/0_stateless/03207_json_read_subcolumns_1_wide_merge_tree.reference.j2
+++ /dev/null
@@ -1,826 +0,0 @@
-('a.b.c','UInt32')
-('a.b.d','Array(Nullable(String))')
-('a.b.d','DateTime')
-('a.b.d','Int64')
-('a.b.e','String')
-('b.b._25','Int64')
-('b.b._26','Int64')
-('b.b._27','Int64')
-('b.b._28','Int64')
-('b.b._29','Int64')
-('b.b.d','Int64')
-('b.b.e','String')
-('d.a','Array(Nullable(Int64))')
-('d.a','Int64')
-('d.b','Int64')
-('d.c','Date')
-{
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.e": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.c": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.^`n`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.^`a`.b": [{"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":5}, {"c":6}, {"c":7}, {"c":8}, {"c":9}, {"c":0,"d":"10","e":"str_10"}, {"c":0,"d":"11","e":"str_11"}, {"c":0,"d":"12","e":"str_12"}, {"c":0,"d":"13","e":"str_13"}, {"c":0,"d":"14","e":"str_14"}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":20,"d":"20","e":"str_20"}, {"c":21,"d":"21","e":"str_21"}, {"c":22,"d":"22","e":"str_22"}, {"c":23,"d":"23","e":"str_23"}, {"c":24,"d":"24","e":"str_24"}, {"c":25,"d":"25","e":"str_25"}, {"c":26,"d":"26","e":"str_26"}, {"c":27,"d":"27","e":"str_27"}, {"c":28,"d":"28","e":"str_28"}, {"c":29,"d":"29","e":"str_29"}, {"c":30,"d":[],"e":"str_30"}, {"c":31,"d":[],"e":"str_31"}, {"c":32,"d":[],"e":"str_32"}, {"c":33,"d":[],"e":"str_33"}, {"c":34,"d":[],"e":"str_34"}, {"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}, {"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}, {"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}, {"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}, {"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}],
-	"json.^`b`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"b":{"d":"15","e":"str_15"}}, {"b":{"d":"16","e":"str_16"}}, {"b":{"d":"17","e":"str_17"}}, {"b":{"d":"18","e":"str_18"}}, {"b":{"d":"19","e":"str_19"}}, {}, {}, {}, {}, {}, {"b":{"_25":"25"}}, {"b":{"_26":"26"}}, {"b":{"_27":"27"}}, {"b":{"_28":"28"}}, {"b":{"_29":"29"}}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`d`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"a":"30","c":"1970-01-31"}, {"a":"31","c":"1970-02-01"}, {"a":"32","c":"1970-02-02"}, {"a":"33","c":"1970-02-03"}, {"a":"34","c":"1970-02-04"}, {"a":["0"],"b":"35"}, {"a":["0","1"],"b":"36"}, {"a":["0","1","2"],"b":"37"}, {"a":["0","1","2","3"],"b":"38"}, {"a":["0","1","2","3","4"],"b":"39"}]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.e": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.c": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.^`n`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.^`a`.b": [{"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":5}, {"c":6}, {"c":7}, {"c":8}, {"c":9}, {"c":0,"d":"10","e":"str_10"}, {"c":0,"d":"11","e":"str_11"}, {"c":0,"d":"12","e":"str_12"}, {"c":0,"d":"13","e":"str_13"}, {"c":0,"d":"14","e":"str_14"}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":20,"d":"20","e":"str_20"}, {"c":21,"d":"21","e":"str_21"}, {"c":22,"d":"22","e":"str_22"}, {"c":23,"d":"23","e":"str_23"}, {"c":24,"d":"24","e":"str_24"}, {"c":25,"d":"25","e":"str_25"}, {"c":26,"d":"26","e":"str_26"}, {"c":27,"d":"27","e":"str_27"}, {"c":28,"d":"28","e":"str_28"}, {"c":29,"d":"29","e":"str_29"}, {"c":30,"d":[],"e":"str_30"}, {"c":31,"d":[],"e":"str_31"}, {"c":32,"d":[],"e":"str_32"}, {"c":33,"d":[],"e":"str_33"}, {"c":34,"d":[],"e":"str_34"}, {"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}, {"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}, {"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}, {"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}, {"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}],
-	"json.^`b`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"b":{"d":"15","e":"str_15"}}, {"b":{"d":"16","e":"str_16"}}, {"b":{"d":"17","e":"str_17"}}, {"b":{"d":"18","e":"str_18"}}, {"b":{"d":"19","e":"str_19"}}, {}, {}, {}, {}, {}, {"b":{"_25":"25"}}, {"b":{"_26":"26"}}, {"b":{"_27":"27"}}, {"b":{"_28":"28"}}, {"b":{"_29":"29"}}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`d`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"a":"30","c":"1970-01-31"}, {"a":"31","c":"1970-02-01"}, {"a":"32","c":"1970-02-02"}, {"a":"33","c":"1970-02-03"}, {"a":"34","c":"1970-02-04"}, {"a":["0"],"b":"35"}, {"a":["0","1"],"b":"36"}, {"a":["0","1","2"],"b":"37"}, {"a":["0","1","2","3"],"b":"38"}, {"a":["0","1","2","3","4"],"b":"39"}]
-}
-{
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-('a.b.c','UInt32')
-('a.b.d','Array(Nullable(String))')
-('a.b.d','DateTime')
-('a.b.d','Int64')
-('a.b.e','String')
-('b.b._25','Int64')
-('b.b._26','Int64')
-('b.b._27','Int64')
-('b.b._28','Int64')
-('b.b._29','Int64')
-('b.b.d','Int64')
-('b.b.e','String')
-('d.a','Array(Nullable(Int64))')
-('d.a','Int64')
-('d.b','Int64')
-('d.c','Date')
-{
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.e": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.c": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.^`n`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.^`a`.b": [{"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":5}, {"c":6}, {"c":7}, {"c":8}, {"c":9}, {"c":0,"d":"10","e":"str_10"}, {"c":0,"d":"11","e":"str_11"}, {"c":0,"d":"12","e":"str_12"}, {"c":0,"d":"13","e":"str_13"}, {"c":0,"d":"14","e":"str_14"}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":20,"d":"20","e":"str_20"}, {"c":21,"d":"21","e":"str_21"}, {"c":22,"d":"22","e":"str_22"}, {"c":23,"d":"23","e":"str_23"}, {"c":24,"d":"24","e":"str_24"}, {"c":25,"d":"25","e":"str_25"}, {"c":26,"d":"26","e":"str_26"}, {"c":27,"d":"27","e":"str_27"}, {"c":28,"d":"28","e":"str_28"}, {"c":29,"d":"29","e":"str_29"}, {"c":30,"d":[],"e":"str_30"}, {"c":31,"d":[],"e":"str_31"}, {"c":32,"d":[],"e":"str_32"}, {"c":33,"d":[],"e":"str_33"}, {"c":34,"d":[],"e":"str_34"}, {"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}, {"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}, {"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}, {"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}, {"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}],
-	"json.^`b`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"b":{"d":"15","e":"str_15"}}, {"b":{"d":"16","e":"str_16"}}, {"b":{"d":"17","e":"str_17"}}, {"b":{"d":"18","e":"str_18"}}, {"b":{"d":"19","e":"str_19"}}, {}, {}, {}, {}, {}, {"b":{"_25":"25"}}, {"b":{"_26":"26"}}, {"b":{"_27":"27"}}, {"b":{"_28":"28"}}, {"b":{"_29":"29"}}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`d`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"a":"30","c":"1970-01-31"}, {"a":"31","c":"1970-02-01"}, {"a":"32","c":"1970-02-02"}, {"a":"33","c":"1970-02-03"}, {"a":"34","c":"1970-02-04"}, {"a":["0"],"b":"35"}, {"a":["0","1"],"b":"36"}, {"a":["0","1","2"],"b":"37"}, {"a":["0","1","2","3"],"b":"38"}, {"a":["0","1","2","3","4"],"b":"39"}]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.e": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, "str_10", "str_11", "str_12", "str_13", "str_14", null, null, null, null, null, "str_20", "str_21", "str_22", "str_23", "str_24", "str_25", "str_26", "str_27", "str_28", "str_29", "str_30", "str_31", "str_32", "str_33", "str_34", "str_35", "str_36", "str_37", "str_38", "str_39"],
-	"json.a.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "25", null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._25.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "27", null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._27.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "28", null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._28.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "29", null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._29.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "15", "16", "17", "18", "19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.d.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.c": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "1970-01-31", "1970-02-01", "1970-02-02", "1970-02-03", "1970-02-04", null, null, null, null, null],
-	"json.d.c.:`UUID`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.^`n`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.^`a`.b": [{"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":5}, {"c":6}, {"c":7}, {"c":8}, {"c":9}, {"c":0,"d":"10","e":"str_10"}, {"c":0,"d":"11","e":"str_11"}, {"c":0,"d":"12","e":"str_12"}, {"c":0,"d":"13","e":"str_13"}, {"c":0,"d":"14","e":"str_14"}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":0}, {"c":20,"d":"20","e":"str_20"}, {"c":21,"d":"21","e":"str_21"}, {"c":22,"d":"22","e":"str_22"}, {"c":23,"d":"23","e":"str_23"}, {"c":24,"d":"24","e":"str_24"}, {"c":25,"d":"25","e":"str_25"}, {"c":26,"d":"26","e":"str_26"}, {"c":27,"d":"27","e":"str_27"}, {"c":28,"d":"28","e":"str_28"}, {"c":29,"d":"29","e":"str_29"}, {"c":30,"d":[],"e":"str_30"}, {"c":31,"d":[],"e":"str_31"}, {"c":32,"d":[],"e":"str_32"}, {"c":33,"d":[],"e":"str_33"}, {"c":34,"d":[],"e":"str_34"}, {"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}, {"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}, {"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}, {"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}, {"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}],
-	"json.^`b`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"b":{"d":"15","e":"str_15"}}, {"b":{"d":"16","e":"str_16"}}, {"b":{"d":"17","e":"str_17"}}, {"b":{"d":"18","e":"str_18"}}, {"b":{"d":"19","e":"str_19"}}, {}, {}, {}, {}, {}, {"b":{"_25":"25"}}, {"b":{"_26":"26"}}, {"b":{"_27":"27"}}, {"b":{"_28":"28"}}, {"b":{"_29":"29"}}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
-	"json.^`d`": [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {"a":"30","c":"1970-01-31"}, {"a":"31","c":"1970-02-01"}, {"a":"32","c":"1970-02-02"}, {"a":"33","c":"1970-02-03"}, {"a":"34","c":"1970-02-04"}, {"a":["0"],"b":"35"}, {"a":["0","1"],"b":"36"}, {"a":["0","1","2"],"b":"37"}, {"a":["0","1","2","3"],"b":"38"}, {"a":["0","1","2","3","4"],"b":"39"}]
-}
-{
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.non.existing.path": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.non.existing.path.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.b.b.e": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`String`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "str_15", "str_16", "str_17", "str_18", "str_19", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b.e.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.d.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "35", "36", "37", "38", "39"],
-	"json.d.b.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.b.b._26": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.d.a": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "30", "31", "32", "33", "34", ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], ["0"], ["0","1"], ["0","1","2"], ["0","1","2","3"], ["0","1","2","3","4"]],
-	"json.d.a.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Int64`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "26", null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-	"json.b.b._26.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.c": [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
-{
-	"json": [{"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":0}}}, {"a":{"b":{"c":5}}}, {"a":{"b":{"c":6}}}, {"a":{"b":{"c":7}}}, {"a":{"b":{"c":8}}}, {"a":{"b":{"c":9}}}, {"a":{"b":{"c":0,"d":"10","e":"str_10"}}}, {"a":{"b":{"c":0,"d":"11","e":"str_11"}}}, {"a":{"b":{"c":0,"d":"12","e":"str_12"}}}, {"a":{"b":{"c":0,"d":"13","e":"str_13"}}}, {"a":{"b":{"c":0,"d":"14","e":"str_14"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"15","e":"str_15"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"16","e":"str_16"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"17","e":"str_17"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"18","e":"str_18"}}}, {"a":{"b":{"c":0}},"b":{"b":{"d":"19","e":"str_19"}}}, {"a":{"b":{"c":20,"d":"20","e":"str_20"}}}, {"a":{"b":{"c":21,"d":"21","e":"str_21"}}}, {"a":{"b":{"c":22,"d":"22","e":"str_22"}}}, {"a":{"b":{"c":23,"d":"23","e":"str_23"}}}, {"a":{"b":{"c":24,"d":"24","e":"str_24"}}}, {"a":{"b":{"c":25,"d":"25","e":"str_25"}},"b":{"b":{"_25":"25"}}}, {"a":{"b":{"c":26,"d":"26","e":"str_26"}},"b":{"b":{"_26":"26"}}}, {"a":{"b":{"c":27,"d":"27","e":"str_27"}},"b":{"b":{"_27":"27"}}}, {"a":{"b":{"c":28,"d":"28","e":"str_28"}},"b":{"b":{"_28":"28"}}}, {"a":{"b":{"c":29,"d":"29","e":"str_29"}},"b":{"b":{"_29":"29"}}}, {"a":{"b":{"c":30,"d":[],"e":"str_30"}},"d":{"a":"30","c":"1970-01-31"}}, {"a":{"b":{"c":31,"d":[],"e":"str_31"}},"d":{"a":"31","c":"1970-02-01"}}, {"a":{"b":{"c":32,"d":[],"e":"str_32"}},"d":{"a":"32","c":"1970-02-02"}}, {"a":{"b":{"c":33,"d":[],"e":"str_33"}},"d":{"a":"33","c":"1970-02-03"}}, {"a":{"b":{"c":34,"d":[],"e":"str_34"}},"d":{"a":"34","c":"1970-02-04"}}, {"a":{"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}},"d":{"a":["0"],"b":"35"}}, {"a":{"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}},"d":{"a":["0","1"],"b":"36"}}, {"a":{"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}},"d":{"a":["0","1","2"],"b":"37"}}, {"a":{"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}},"d":{"a":["0","1","2","3"],"b":"38"}}, {"a":{"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}},"d":{"a":["0","1","2","3","4"],"b":"39"}}],
-	"json.^`a`": [{"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":5}}, {"b":{"c":6}}, {"b":{"c":7}}, {"b":{"c":8}}, {"b":{"c":9}}, {"b":{"c":0,"d":"10","e":"str_10"}}, {"b":{"c":0,"d":"11","e":"str_11"}}, {"b":{"c":0,"d":"12","e":"str_12"}}, {"b":{"c":0,"d":"13","e":"str_13"}}, {"b":{"c":0,"d":"14","e":"str_14"}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":0}}, {"b":{"c":20,"d":"20","e":"str_20"}}, {"b":{"c":21,"d":"21","e":"str_21"}}, {"b":{"c":22,"d":"22","e":"str_22"}}, {"b":{"c":23,"d":"23","e":"str_23"}}, {"b":{"c":24,"d":"24","e":"str_24"}}, {"b":{"c":25,"d":"25","e":"str_25"}}, {"b":{"c":26,"d":"26","e":"str_26"}}, {"b":{"c":27,"d":"27","e":"str_27"}}, {"b":{"c":28,"d":"28","e":"str_28"}}, {"b":{"c":29,"d":"29","e":"str_29"}}, {"b":{"c":30,"d":[],"e":"str_30"}}, {"b":{"c":31,"d":[],"e":"str_31"}}, {"b":{"c":32,"d":[],"e":"str_32"}}, {"b":{"c":33,"d":[],"e":"str_33"}}, {"b":{"c":34,"d":[],"e":"str_34"}}, {"b":{"c":35,"d":"1970-01-01 00:00:35","e":"str_35"}}, {"b":{"c":36,"d":"1970-01-01 00:00:36","e":"str_36"}}, {"b":{"c":37,"d":"1970-01-01 00:00:37","e":"str_37"}}, {"b":{"c":38,"d":"1970-01-01 00:00:38","e":"str_38"}}, {"b":{"c":39,"d":"1970-01-01 00:00:39","e":"str_39"}}],
-	"json.a.b.d": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", [], [], [], [], [], "1970-01-01 00:00:35", "1970-01-01 00:00:36", "1970-01-01 00:00:37", "1970-01-01 00:00:38", "1970-01-01 00:00:39"],
-	"json.a.b.d.:`Int64`": [null, null, null, null, null, null, null, null, null, null, "10", "11", "12", "13", "14", null, null, null, null, null, "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", null, null, null, null, null, null, null, null, null, null],
-	"json.a.b.d.:`Date`": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]
-}
diff --git a/tests/queries/0_stateless/03207_json_read_subcolumns_1_wide_merge_tree.sql.j2 b/tests/queries/0_stateless/03207_json_read_subcolumns_1_wide_merge_tree.sql.j2
deleted file mode 100644
index f571d2417f4..00000000000
--- a/tests/queries/0_stateless/03207_json_read_subcolumns_1_wide_merge_tree.sql.j2
+++ /dev/null
@@ -1,93 +0,0 @@
--- Tags: no-fasttest
-
-set allow_experimental_json_type = 1;
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type = 1;
-set session_timezone = 'UTC';
-
-drop table if exists test;
-create table test (id UInt64, json JSON(max_dynamic_paths=2, a.b.c UInt32)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;
-
-insert into test select number, '{}' from numbers(5);
-insert into test select number, toJSONString(map('a.b.c', number)) from numbers(5, 5);
-insert into test select number, toJSONString(map('a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number))) from numbers(10, 5);
-insert into test select number, toJSONString(map('b.b.d', number::UInt32, 'b.b.e', 'str_' || toString(number))) from numbers(15, 5);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number))) from numbers(20, 5);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number), 'b.b._' || toString(number), number::UInt32)) from numbers(25, 5);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', range(number % + 1)::Array(UInt32), 'a.b.e', 'str_' || toString(number), 'd.a', number::UInt32, 'd.c', toDate(number))) from numbers(30, 5);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', toDateTime(number), 'a.b.e', 'str_' || toString(number), 'd.a', range(number % 5 + 1)::Array(UInt32), 'd.b', number::UInt32)) from numbers(35, 5);
-
-{% for merge_command in ['system stop merges test', 'system start merges test'] -%}
-
-{{ merge_command }};
-
-select distinct arrayJoin(JSONAllPathsWithTypes(json)) as paths_with_types from test order by paths_with_types;
-
-select json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_25`, json.b.b.`_25`.:Int64, json.b.b.`_25`.:UUID, json.b.b.`_26`, json.b.b.`_26`.:Int64, json.b.b.`_26`.:UUID, json.b.b.`_27`, json.b.b.`_27`.:Int64, json.b.b.`_27`.:UUID, json.b.b.`_28`, json.b.b.`_28`.:Int64, json.b.b.`_28`.:UUID, json.b.b.`_29`, json.b.b.`_29`.:Int64,  json.b.b.`_29`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test order by id format JSONColumns;
-select json, json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_25`, json.b.b.`_25`.:Int64, json.b.b.`_25`.:UUID, json.b.b.`_26`, json.b.b.`_26`.:Int64, json.b.b.`_26`.:UUID, json.b.b.`_27`, json.b.b.`_27`.:Int64, json.b.b.`_27`.:UUID, json.b.b.`_28`, json.b.b.`_28`.:Int64, json.b.b.`_28`.:UUID, json.b.b.`_29`, json.b.b.`_29`.:Int64,  json.b.b.`_29`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test order by id format JSONColumns;
-
-select json.non.existing.path from test order by id format JSONColumns;
-select json.non.existing.path.:Int64 from test order by id format JSONColumns;
-select json.non.existing.path, json.non.existing.path.:Int64 from test order by id format JSONColumns;
-select json, json.non.existing.path from test order by id format JSONColumns;
-select json, json.non.existing.path.:Int64 from test order by id format JSONColumns;
-select json, json.non.existing.path, json.non.existing.path.:Int64 from test order by id format JSONColumns;
-
-select json.a.b.c from test order by id format JSONColumns;
-select json, json.a.b.c from test order by id format JSONColumns;
-
-select json.b.b.e from test order by id format JSONColumns;
-select json.b.b.e.:String, json.b.b.e.:Date from test order by id format JSONColumns;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test order by id format JSONColumns;
-select json, json.b.b.e from test order by id format JSONColumns;
-select json, json.b.b.e.:String, json.b.b.e.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test order by id format JSONColumns;
-
-select json.b.b.e, json.a.b.d from test order by id format JSONColumns;
-select json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.a.b.d from test order by id format JSONColumns;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-
-select json.b.b.e, json.d.a from test order by id format JSONColumns;
-select json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format JSONColumns;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.d.a from test order by id format JSONColumns;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format JSONColumns;
-
-select json.b.b.e, json.d.a, json.d.b from test order by id format JSONColumns;
-select json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.d.a, json.d.b from test order by id format JSONColumns;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-
-select json.d.a, json.d.b from test order by id format JSONColumns;
-select json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json, json.d.a, json.d.b from test order by id format JSONColumns;
-select json, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format JSONColumns;
-
-select json.d.a, json.b.b.`_26` from test order by id format JSONColumns;
-select json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_26`.:Int64, json.b.b.`_26`.:Date from test order by id format JSONColumns;
-select json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_26`.:Int64, json.b.b, json.b.b.`_26`.:Date from test order by id format JSONColumns;
-select json, json.d.a, json.b.b.`_26` from test order by id format JSONColumns;
-select json, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_26`.:Int64, json.b.b.`_26`.:Date from test order by id format JSONColumns;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_26`.:Int64, json.b.b, json.b.b.`_26`.:Date from test order by id format JSONColumns;
-
-select json.^a, json.a.b.c from test order by id format JSONColumns;
-select json, json.^a, json.a.b.c from test order by id format JSONColumns;
-
-select json.^a, json.a.b.d from test order by id format JSONColumns;
-select json.^a, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json.^a, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json, json.^a, json.a.b.d from test order by id format JSONColumns;
-select json, json.^a, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-select json, json.^a, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format JSONColumns;
-
-{% endfor -%}
-
-drop table test;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03207_json_read_subcolumns_2_compact_merge_tree.reference.j2 b/tests/queries/0_stateless/03207_json_read_subcolumns_2_compact_merge_tree.reference.j2
deleted file mode 100644
index e1e69879cfb..00000000000
--- a/tests/queries/0_stateless/03207_json_read_subcolumns_2_compact_merge_tree.reference.j2
+++ /dev/null
@@ -1,66 +0,0 @@
-('a.b.c','UInt32')
-('a.b.d','Array(Nullable(String))')
-('a.b.d','DateTime')
-('a.b.d','Int64')
-('a.b.e','String')
-('b.b._0','Int64')
-('b.b._1','Int64')
-('b.b._2','Int64')
-('b.b._3','Int64')
-('b.b._4','Int64')
-('b.b.d','Int64')
-('b.b.e','String')
-('d.a','Array(Nullable(Int64))')
-('d.a','Int64')
-('d.b','Int64')
-('d.c','Date')
-800000
-800000
-300000
-700000
-700000
-200000
-400000
-500000
-600000
-500000
-600000
-600000
-700000
-580000
-680000
-0
-0
-('a.b.c','UInt32')
-('a.b.d','Array(Nullable(String))')
-('a.b.d','DateTime')
-('a.b.d','Int64')
-('a.b.e','String')
-('b.b._0','Int64')
-('b.b._1','Int64')
-('b.b._2','Int64')
-('b.b._3','Int64')
-('b.b._4','Int64')
-('b.b.d','Int64')
-('b.b.e','String')
-('d.a','Array(Nullable(Int64))')
-('d.a','Int64')
-('d.b','Int64')
-('d.c','Date')
-800000
-800000
-300000
-700000
-700000
-200000
-400000
-500000
-600000
-500000
-600000
-600000
-700000
-580000
-680000
-0
-0
diff --git a/tests/queries/0_stateless/03207_json_read_subcolumns_2_compact_merge_tree.sql.j2 b/tests/queries/0_stateless/03207_json_read_subcolumns_2_compact_merge_tree.sql.j2
deleted file mode 100644
index 6c33044b5d8..00000000000
--- a/tests/queries/0_stateless/03207_json_read_subcolumns_2_compact_merge_tree.sql.j2
+++ /dev/null
@@ -1,128 +0,0 @@
--- Tags: no-fasttest, long, no-debug, no-tsan, no-asan, no-msan, no-ubsan
-
-set allow_experimental_json_type = 1;
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type = 1;
-set session_timezone = 'UTC';
-
-drop table if exists test;
-create table test (id UInt64, json JSON(max_dynamic_paths=2, a.b.c UInt32)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000;
-
-insert into test select number, '{}' from numbers(100000);
-insert into test select number, toJSONString(map('a.b.c', number)) from numbers(100000, 100000);
-insert into test select number, toJSONString(map('a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number))) from numbers(200000, 100000);
-insert into test select number, toJSONString(map('b.b.d', number::UInt32, 'b.b.e', 'str_' || toString(number))) from numbers(300000, 100000);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number))) from numbers(400000, 100000);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number), 'b.b._' || toString(number % 5), number::UInt32)) from numbers(500000, 100000);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', range(number % + 1)::Array(UInt32), 'a.b.e', 'str_' || toString(number), 'd.a', number::UInt32, 'd.c', toDate(number))) from numbers(600000, 100000);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', toDateTime(number), 'a.b.e', 'str_' || toString(number), 'd.a', range(number % 5 + 1)::Array(UInt32), 'd.b', number::UInt32)) from numbers(700000, 100000);
-
-{% for merge_command in ['system stop merges test', 'system start merges test'] -%}
-
-{{ merge_command }};
-
-select distinct arrayJoin(JSONAllPathsWithTypes(json)) as paths_with_types from test order by paths_with_types;
-
-select json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_0`, json.b.b.`_0`.:Int64, json.b.b.`_0`.:UUID, json.b.b.`_1`, json.b.b.`_1`.:Int64, json.b.b.`_1`.:UUID, json.b.b.`_2`, json.b.b.`_2`.:Int64, json.b.b.`_2`.:UUID, json.b.b.`_3`, json.b.b.`_3`.:Int64, json.b.b.`_3`.:UUID, json.b.b.`_4`, json.b.b.`_4`.:Int64,  json.b.b.`_4`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test format Null;
-select json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_0`, json.b.b.`_0`.:Int64, json.b.b.`_0`.:UUID, json.b.b.`_1`, json.b.b.`_1`.:Int64, json.b.b.`_1`.:UUID, json.b.b.`_2`, json.b.b.`_2`.:Int64, json.b.b.`_2`.:UUID, json.b.b.`_3`, json.b.b.`_3`.:Int64, json.b.b.`_3`.:UUID, json.b.b.`_4`, json.b.b.`_4`.:Int64,  json.b.b.`_4`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test order by id format Null;
-select json, json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_0`, json.b.b.`_0`.:Int64, json.b.b.`_0`.:UUID, json.b.b.`_1`, json.b.b.`_1`.:Int64, json.b.b.`_1`.:UUID, json.b.b.`_2`, json.b.b.`_2`.:Int64, json.b.b.`_2`.:UUID, json.b.b.`_3`, json.b.b.`_3`.:Int64, json.b.b.`_3`.:UUID, json.b.b.`_4`, json.b.b.`_4`.:Int64,  json.b.b.`_4`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test format Null;
-select json, json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_0`, json.b.b.`_0`.:Int64, json.b.b.`_0`.:UUID, json.b.b.`_1`, json.b.b.`_1`.:Int64, json.b.b.`_1`.:UUID, json.b.b.`_2`, json.b.b.`_2`.:Int64, json.b.b.`_2`.:UUID, json.b.b.`_3`, json.b.b.`_3`.:Int64, json.b.b.`_3`.:UUID, json.b.b.`_4`, json.b.b.`_4`.:Int64,  json.b.b.`_4`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test order by id format Null;
-
-select count() from test where json.non.existing.path is Null;
-select count() from test where json.non.existing.path.:String is Null;
-select json.non.existing.path from test order by id format Null;
-select json.non.existing.path.:Int64 from test order by id format Null;
-select json.non.existing.path, json.non.existing.path.:Int64 from test order by id format Null;
-select json, json.non.existing.path from test order by id format Null;
-select json, json.non.existing.path.:Int64 from test order by id format Null;
-select json, json.non.existing.path, json.non.existing.path.:Int64 from test format Null;
-select json, json.non.existing.path, json.non.existing.path.:Int64 from test order by id format Null;
-
-select count() from test where json.a.b.c == 0;
-select json.a.b.c from test format Null;
-select json.a.b.c from test order by id format Null;
-select json, json.a.b.c from test format Null;
-select json, json.a.b.c from test order by id format Null;
-
-select count() from test where json.b.b.e is Null;
-select count() from test where json.b.b.e.:String is Null;
-select json.b.b.e from test format Null;
-select json.b.b.e from test order by id format Null;
-select json.b.b.e.:String, json.b.b.e.:Date from test format Null;
-select json.b.b.e.:String, json.b.b.e.:Date from test order by id format Null;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test format Null;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test order by id format Null;
-select json, json.b.b.e from test format Null;
-select json, json.b.b.e from test order by id format Null;
-select json, json.b.b.e.:String, json.b.b.e.:Date from test format Null;
-select json, json.b.b.e.:String, json.b.b.e.:Date from test order by id format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test order by id format Null;
-
-select count() from test where json.b.b.e is Null and json.a.b.d is Null ;
-select count() from test where json.b.b.e.:String is Null and json.a.b.d.:Int64 is Null;
-select json.b.b.e, json.a.b.d from test order by id format Null;
-select json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json, json.b.b.e, json.a.b.d from test order by id format Null;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-
-select count() from test where json.b.b.e is Null and json.d.a is Null;
-select count() from test where json.b.b.e.:String is Null and empty(json.d.a.:`Array(Nullable(Int64))`);
-select json.b.b.e, json.d.a from test order by id format Null;
-select json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format Null;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format Null;
-select json, json.b.b.e, json.d.a from test order by id format Null;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format Null;
-
-select count() from test where json.b.b.e is Null and json.d.a is Null and json.d.b is Null;
-select count() from test where json.b.b.e.:String is Null and empty(json.d.a.:`Array(Nullable(Int64))`) and json.d.b.:Int64 is Null;
-select json.b.b.e, json.d.a, json.d.b from test order by id format Null;
-select json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json, json.b.b.e, json.d.a, json.d.b from test order by id format Null;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-
-select count() from test where json.d.a is Null and json.d.b is Null;
-select count() from test where empty(json.d.a.:`Array(Nullable(Int64))`) and json.d.b.:Int64 is Null;
-select json.d.a, json.d.b from test order by id format Null;
-select json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json, json.d.a, json.d.b from test order by id format Null;
-select json, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test format Null;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-
-select count() from test where json.d.a is Null and json.b.b.`_1` is Null;
-select count() from test where empty(json.d.a.:`Array(Nullable(Int64))`) and json.b.b.`_1`.:Int64 is Null;
-select json.d.a, json.b.b.`_1` from test order by id format Null;
-select json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_1`.:Int64, json.b.b.`_1`.:Date from test order by id format Null;
-select json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_1`.:Int64, json.b.b, json.b.b.`_1`.:Date from test order by id format Null;
-select json, json.d.a, json.b.b.`_1` from test order by id format Null;
-select json, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_1`.:Int64, json.b.b.`_1`.:Date from test order by id format Null;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_1`.:Int64, json.b.b, json.b.b.`_1`.:Date from test format Null;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_1`.:Int64, json.b.b, json.b.b.`_1`.:Date from test order by id format Null;
-
-select count() from test where empty(json.^a) and json.a.b.c == 0;
-select json.^a, json.a.b.c from test order by id format Null;
-select json, json.^a, json.a.b.c from test format Null;
-select json, json.^a, json.a.b.c from test order by id format Null;
-
-select count() from test where empty(json.^a) and json.a.b.d is Null;
-select json.^a, json.a.b.d from test order by id format Null;
-select json.^a, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json.^a, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json, json.^a, json.a.b.d from test order by id format Null;
-select json, json.^a, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json, json.^a, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test format Null;
-select json, json.^a, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-
-{% endfor -%}
-
-drop table test;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03207_json_read_subcolumns_2_memory.reference b/tests/queries/0_stateless/03207_json_read_subcolumns_2_memory.reference
deleted file mode 100644
index 1ef53fb5716..00000000000
--- a/tests/queries/0_stateless/03207_json_read_subcolumns_2_memory.reference
+++ /dev/null
@@ -1,33 +0,0 @@
-('a.b.c','UInt32')
-('a.b.d','Array(Nullable(String))')
-('a.b.d','DateTime')
-('a.b.d','Int64')
-('a.b.e','String')
-('b.b._0','Int64')
-('b.b._1','Int64')
-('b.b._2','Int64')
-('b.b._3','Int64')
-('b.b._4','Int64')
-('b.b.d','Int64')
-('b.b.e','String')
-('d.a','Array(Nullable(Int64))')
-('d.a','Int64')
-('d.b','Int64')
-('d.c','Date')
-800000
-800000
-300000
-700000
-700000
-200000
-400000
-500000
-600000
-500000
-600000
-600000
-700000
-580000
-680000
-0
-0
diff --git a/tests/queries/0_stateless/03207_json_read_subcolumns_2_memory.sql b/tests/queries/0_stateless/03207_json_read_subcolumns_2_memory.sql
deleted file mode 100644
index cc646987c80..00000000000
--- a/tests/queries/0_stateless/03207_json_read_subcolumns_2_memory.sql
+++ /dev/null
@@ -1,123 +0,0 @@
--- Tags: no-fasttest, long, no-debug, no-tsan, no-asan, no-msan, no-ubsan
-
-set allow_experimental_json_type = 1;
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type = 1;
-set session_timezone = 'UTC';
-
-drop table if exists test;
-create table test (id UInt64, json JSON(max_dynamic_paths=2, a.b.c UInt32)) engine=Memory;
-
-truncate table test;
-insert into test select number, '{}' from numbers(100000);
-insert into test select number, toJSONString(map('a.b.c', number)) from numbers(100000, 100000);
-insert into test select number, toJSONString(map('a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number))) from numbers(200000, 100000);
-insert into test select number, toJSONString(map('b.b.d', number::UInt32, 'b.b.e', 'str_' || toString(number))) from numbers(300000, 100000);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number))) from numbers(400000, 100000);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number), 'b.b._' || toString(number % 5), number::UInt32)) from numbers(500000, 100000);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', range(number % + 1)::Array(UInt32), 'a.b.e', 'str_' || toString(number), 'd.a', number::UInt32, 'd.c', toDate(number))) from numbers(600000, 100000);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', toDateTime(number), 'a.b.e', 'str_' || toString(number), 'd.a', range(number % 5 + 1)::Array(UInt32), 'd.b', number::UInt32)) from numbers(700000, 100000);
-
-select distinct arrayJoin(JSONAllPathsWithTypes(json)) as paths_with_types from test order by paths_with_types;
-
-select json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_0`, json.b.b.`_0`.:Int64, json.b.b.`_0`.:UUID, json.b.b.`_1`, json.b.b.`_1`.:Int64, json.b.b.`_1`.:UUID, json.b.b.`_2`, json.b.b.`_2`.:Int64, json.b.b.`_2`.:UUID, json.b.b.`_3`, json.b.b.`_3`.:Int64, json.b.b.`_3`.:UUID, json.b.b.`_4`, json.b.b.`_4`.:Int64,  json.b.b.`_4`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test format Null;
-select json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_0`, json.b.b.`_0`.:Int64, json.b.b.`_0`.:UUID, json.b.b.`_1`, json.b.b.`_1`.:Int64, json.b.b.`_1`.:UUID, json.b.b.`_2`, json.b.b.`_2`.:Int64, json.b.b.`_2`.:UUID, json.b.b.`_3`, json.b.b.`_3`.:Int64, json.b.b.`_3`.:UUID, json.b.b.`_4`, json.b.b.`_4`.:Int64,  json.b.b.`_4`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test order by id format Null;
-select json, json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_0`, json.b.b.`_0`.:Int64, json.b.b.`_0`.:UUID, json.b.b.`_1`, json.b.b.`_1`.:Int64, json.b.b.`_1`.:UUID, json.b.b.`_2`, json.b.b.`_2`.:Int64, json.b.b.`_2`.:UUID, json.b.b.`_3`, json.b.b.`_3`.:Int64, json.b.b.`_3`.:UUID, json.b.b.`_4`, json.b.b.`_4`.:Int64,  json.b.b.`_4`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test format Null;
-select json, json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_0`, json.b.b.`_0`.:Int64, json.b.b.`_0`.:UUID, json.b.b.`_1`, json.b.b.`_1`.:Int64, json.b.b.`_1`.:UUID, json.b.b.`_2`, json.b.b.`_2`.:Int64, json.b.b.`_2`.:UUID, json.b.b.`_3`, json.b.b.`_3`.:Int64, json.b.b.`_3`.:UUID, json.b.b.`_4`, json.b.b.`_4`.:Int64,  json.b.b.`_4`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test order by id format Null;
-
-select count() from test where json.non.existing.path is Null;
-select count() from test where json.non.existing.path.:String is Null;
-select json.non.existing.path from test order by id format Null;
-select json.non.existing.path.:Int64 from test order by id format Null;
-select json.non.existing.path, json.non.existing.path.:Int64 from test order by id format Null;
-select json, json.non.existing.path from test order by id format Null;
-select json, json.non.existing.path.:Int64 from test order by id format Null;
-select json, json.non.existing.path, json.non.existing.path.:Int64 from test format Null;
-select json, json.non.existing.path, json.non.existing.path.:Int64 from test order by id format Null;
-
-select count() from test where json.a.b.c == 0;
-select json.a.b.c from test format Null;
-select json.a.b.c from test order by id format Null;
-select json, json.a.b.c from test format Null;
-select json, json.a.b.c from test order by id format Null;
-
-select count() from test where json.b.b.e is Null;
-select count() from test where json.b.b.e.:String is Null;
-select json.b.b.e from test format Null;
-select json.b.b.e from test order by id format Null;
-select json.b.b.e.:String, json.b.b.e.:Date from test format Null;
-select json.b.b.e.:String, json.b.b.e.:Date from test order by id format Null;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test format Null;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test order by id format Null;
-select json, json.b.b.e from test format Null;
-select json, json.b.b.e from test order by id format Null;
-select json, json.b.b.e.:String, json.b.b.e.:Date from test format Null;
-select json, json.b.b.e.:String, json.b.b.e.:Date from test order by id format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test order by id format Null;
-
-select count() from test where json.b.b.e is Null and json.a.b.d is Null ;
-select count() from test where json.b.b.e.:String is Null and json.a.b.d.:Int64 is Null;
-select json.b.b.e, json.a.b.d from test order by id format Null;
-select json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json, json.b.b.e, json.a.b.d from test order by id format Null;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-
-select count() from test where json.b.b.e is Null and json.d.a is Null;
-select count() from test where json.b.b.e.:String is Null and empty(json.d.a.:`Array(Nullable(Int64))`);
-select json.b.b.e, json.d.a from test order by id format Null;
-select json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format Null;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format Null;
-select json, json.b.b.e, json.d.a from test order by id format Null;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format Null;
-
-select count() from test where json.b.b.e is Null and json.d.a is Null and json.d.b is Null;
-select count() from test where json.b.b.e.:String is Null and empty(json.d.a.:`Array(Nullable(Int64))`) and json.d.b.:Int64 is Null;
-select json.b.b.e, json.d.a, json.d.b from test order by id format Null;
-select json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json, json.b.b.e, json.d.a, json.d.b from test order by id format Null;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-
-select count() from test where json.d.a is Null and json.d.b is Null;
-select count() from test where empty(json.d.a.:`Array(Nullable(Int64))`) and json.d.b.:Int64 is Null;
-select json.d.a, json.d.b from test order by id format Null;
-select json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json, json.d.a, json.d.b from test order by id format Null;
-select json, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test format Null;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-
-select count() from test where json.d.a is Null and json.b.b.`_1` is Null;
-select count() from test where empty(json.d.a.:`Array(Nullable(Int64))`) and json.b.b.`_1`.:Int64 is Null;
-select json.d.a, json.b.b.`_1` from test order by id format Null;
-select json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_1`.:Int64, json.b.b.`_1`.:Date from test order by id format Null;
-select json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_1`.:Int64, json.b.b, json.b.b.`_1`.:Date from test order by id format Null;
-select json, json.d.a, json.b.b.`_1` from test order by id format Null;
-select json, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_1`.:Int64, json.b.b.`_1`.:Date from test order by id format Null;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_1`.:Int64, json.b.b, json.b.b.`_1`.:Date from test format Null;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_1`.:Int64, json.b.b, json.b.b.`_1`.:Date from test order by id format Null;
-
-select count() from test where empty(json.^a) and json.a.b.c == 0;
-select json.^a, json.a.b.c from test order by id format Null;
-select json, json.^a, json.a.b.c from test format Null;
-select json, json.^a, json.a.b.c from test order by id format Null;
-
-select count() from test where empty(json.^a) and json.a.b.d is Null;
-select json.^a, json.a.b.d from test order by id format Null;
-select json.^a, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json.^a, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json, json.^a, json.a.b.d from test order by id format Null;
-select json, json.^a, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json, json.^a, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test format Null;
-select json, json.^a, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-
-drop table test;
diff --git a/tests/queries/0_stateless/03207_json_read_subcolumns_2_wide_merge_tree.reference.j2 b/tests/queries/0_stateless/03207_json_read_subcolumns_2_wide_merge_tree.reference.j2
deleted file mode 100644
index e1e69879cfb..00000000000
--- a/tests/queries/0_stateless/03207_json_read_subcolumns_2_wide_merge_tree.reference.j2
+++ /dev/null
@@ -1,66 +0,0 @@
-('a.b.c','UInt32')
-('a.b.d','Array(Nullable(String))')
-('a.b.d','DateTime')
-('a.b.d','Int64')
-('a.b.e','String')
-('b.b._0','Int64')
-('b.b._1','Int64')
-('b.b._2','Int64')
-('b.b._3','Int64')
-('b.b._4','Int64')
-('b.b.d','Int64')
-('b.b.e','String')
-('d.a','Array(Nullable(Int64))')
-('d.a','Int64')
-('d.b','Int64')
-('d.c','Date')
-800000
-800000
-300000
-700000
-700000
-200000
-400000
-500000
-600000
-500000
-600000
-600000
-700000
-580000
-680000
-0
-0
-('a.b.c','UInt32')
-('a.b.d','Array(Nullable(String))')
-('a.b.d','DateTime')
-('a.b.d','Int64')
-('a.b.e','String')
-('b.b._0','Int64')
-('b.b._1','Int64')
-('b.b._2','Int64')
-('b.b._3','Int64')
-('b.b._4','Int64')
-('b.b.d','Int64')
-('b.b.e','String')
-('d.a','Array(Nullable(Int64))')
-('d.a','Int64')
-('d.b','Int64')
-('d.c','Date')
-800000
-800000
-300000
-700000
-700000
-200000
-400000
-500000
-600000
-500000
-600000
-600000
-700000
-580000
-680000
-0
-0
diff --git a/tests/queries/0_stateless/03207_json_read_subcolumns_2_wide_merge_tree.sql.j2 b/tests/queries/0_stateless/03207_json_read_subcolumns_2_wide_merge_tree.sql.j2
deleted file mode 100644
index b31e57753c0..00000000000
--- a/tests/queries/0_stateless/03207_json_read_subcolumns_2_wide_merge_tree.sql.j2
+++ /dev/null
@@ -1,130 +0,0 @@
--- Tags: no-fasttest, long, no-debug, no-tsan, no-asan, no-msan, no-ubsan
-
-set allow_experimental_json_type = 1;
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type = 1;
-set session_timezone = 'UTC';
-
-set min_bytes_to_use_direct_io = 0; -- min_bytes_to_use_direct_io > 0 is broken
-
-drop table if exists test;
-create table test (id UInt64, json JSON(max_dynamic_paths=2, a.b.c UInt32)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;
-
-insert into test select number, '{}' from numbers(100000);
-insert into test select number, toJSONString(map('a.b.c', number)) from numbers(100000, 100000);
-insert into test select number, toJSONString(map('a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number))) from numbers(200000, 100000);
-insert into test select number, toJSONString(map('b.b.d', number::UInt32, 'b.b.e', 'str_' || toString(number))) from numbers(300000, 100000);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number))) from numbers(400000, 100000);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', number::UInt32, 'a.b.e', 'str_' || toString(number), 'b.b._' || toString(number % 5), number::UInt32)) from numbers(500000, 100000);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', range(number % + 1)::Array(UInt32), 'a.b.e', 'str_' || toString(number), 'd.a', number::UInt32, 'd.c', toDate(number))) from numbers(600000, 100000);
-insert into test select number, toJSONString(map('a.b.c', number, 'a.b.d', toDateTime(number), 'a.b.e', 'str_' || toString(number), 'd.a', range(number % 5 + 1)::Array(UInt32), 'd.b', number::UInt32)) from numbers(700000, 100000);
-
-{% for merge_command in ['system stop merges test', 'system start merges test'] -%}
-
-{{ merge_command }};
-
-select distinct arrayJoin(JSONAllPathsWithTypes(json)) as paths_with_types from test order by paths_with_types;
-
-select json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_0`, json.b.b.`_0`.:Int64, json.b.b.`_0`.:UUID, json.b.b.`_1`, json.b.b.`_1`.:Int64, json.b.b.`_1`.:UUID, json.b.b.`_2`, json.b.b.`_2`.:Int64, json.b.b.`_2`.:UUID, json.b.b.`_3`, json.b.b.`_3`.:Int64, json.b.b.`_3`.:UUID, json.b.b.`_4`, json.b.b.`_4`.:Int64,  json.b.b.`_4`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test format Null;
-select json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_0`, json.b.b.`_0`.:Int64, json.b.b.`_0`.:UUID, json.b.b.`_1`, json.b.b.`_1`.:Int64, json.b.b.`_1`.:UUID, json.b.b.`_2`, json.b.b.`_2`.:Int64, json.b.b.`_2`.:UUID, json.b.b.`_3`, json.b.b.`_3`.:Int64, json.b.b.`_3`.:UUID, json.b.b.`_4`, json.b.b.`_4`.:Int64,  json.b.b.`_4`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test order by id format Null;
-select json, json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_0`, json.b.b.`_0`.:Int64, json.b.b.`_0`.:UUID, json.b.b.`_1`, json.b.b.`_1`.:Int64, json.b.b.`_1`.:UUID, json.b.b.`_2`, json.b.b.`_2`.:Int64, json.b.b.`_2`.:UUID, json.b.b.`_3`, json.b.b.`_3`.:Int64, json.b.b.`_3`.:UUID, json.b.b.`_4`, json.b.b.`_4`.:Int64,  json.b.b.`_4`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test format Null;
-select json, json.non.existing.path, json.a.b.c, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:UUID, json.a.b.e, json.a.b.e.:String, json.a.b.e.:UUID, json.b.b.`_0`, json.b.b.`_0`.:Int64, json.b.b.`_0`.:UUID, json.b.b.`_1`, json.b.b.`_1`.:Int64, json.b.b.`_1`.:UUID, json.b.b.`_2`, json.b.b.`_2`.:Int64, json.b.b.`_2`.:UUID, json.b.b.`_3`, json.b.b.`_3`.:Int64, json.b.b.`_3`.:UUID, json.b.b.`_4`, json.b.b.`_4`.:Int64,  json.b.b.`_4`.:UUID, json.b.b.d, json.b.b.d.:Int64, json.b.b.d.:UUID, json.b.b.e, json.b.b.e.:String, json.b.b.e.:UUID, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:UUID, json.d.b, json.d.b.:Int64, json.d.b.:UUID, json.d.c, json.d.c.:Date, json.d.c.:UUID, json.^n, json.^a, json.^a.b, json.^b, json.^d from test order by id format Null;
-
-select count() from test where json.non.existing.path is Null;
-select count() from test where json.non.existing.path.:String is Null;
-select json.non.existing.path from test order by id format Null;
-select json.non.existing.path.:Int64 from test order by id format Null;
-select json.non.existing.path, json.non.existing.path.:Int64 from test order by id format Null;
-select json, json.non.existing.path from test order by id format Null;
-select json, json.non.existing.path.:Int64 from test order by id format Null;
-select json, json.non.existing.path, json.non.existing.path.:Int64 from test format Null;
-select json, json.non.existing.path, json.non.existing.path.:Int64 from test order by id format Null;
-
-select count() from test where json.a.b.c == 0;
-select json.a.b.c from test format Null;
-select json.a.b.c from test order by id format Null;
-select json, json.a.b.c from test format Null;
-select json, json.a.b.c from test order by id format Null;
-
-select count() from test where json.b.b.e is Null;
-select count() from test where json.b.b.e.:String is Null;
-select json.b.b.e from test format Null;
-select json.b.b.e from test order by id format Null;
-select json.b.b.e.:String, json.b.b.e.:Date from test format Null;
-select json.b.b.e.:String, json.b.b.e.:Date from test order by id format Null;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test format Null;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test order by id format Null;
-select json, json.b.b.e from test format Null;
-select json, json.b.b.e from test order by id format Null;
-select json, json.b.b.e.:String, json.b.b.e.:Date from test format Null;
-select json, json.b.b.e.:String, json.b.b.e.:Date from test order by id format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date from test order by id format Null;
-
-select count() from test where json.b.b.e is Null and json.a.b.d is Null ;
-select count() from test where json.b.b.e.:String is Null and json.a.b.d.:Int64 is Null;
-select json.b.b.e, json.a.b.d from test order by id format Null;
-select json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json, json.b.b.e, json.a.b.d from test order by id format Null;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-
-select count() from test where json.b.b.e is Null and json.d.a is Null;
-select count() from test where json.b.b.e.:String is Null and empty(json.d.a.:`Array(Nullable(Int64))`);
-select json.b.b.e, json.d.a from test order by id format Null;
-select json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format Null;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format Null;
-select json, json.b.b.e, json.d.a from test order by id format Null;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date from test order by id format Null;
-
-select count() from test where json.b.b.e is Null and json.d.a is Null and json.d.b is Null;
-select count() from test where json.b.b.e.:String is Null and empty(json.d.a.:`Array(Nullable(Int64))`) and json.d.b.:Int64 is Null;
-select json.b.b.e, json.d.a, json.d.b from test order by id format Null;
-select json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json, json.b.b.e, json.d.a, json.d.b from test order by id format Null;
-select json, json.b.b.e.:String, json.b.b.e.:Date, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test format Null;
-select json, json.b.b.e, json.b.b.e.:String, json.b.b.e.:Date, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-
-select count() from test where json.d.a is Null and json.d.b is Null;
-select count() from test where empty(json.d.a.:`Array(Nullable(Int64))`) and json.d.b.:Int64 is Null;
-select json.d.a, json.d.b from test order by id format Null;
-select json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json, json.d.a, json.d.b from test order by id format Null;
-select json, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test format Null;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.d.b, json.d.b.:Int64, json.d.b.:Date from test order by id format Null;
-
-select count() from test where json.d.a is Null and json.b.b.`_1` is Null;
-select count() from test where empty(json.d.a.:`Array(Nullable(Int64))`) and json.b.b.`_1`.:Int64 is Null;
-select json.d.a, json.b.b.`_1` from test order by id format Null;
-select json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_1`.:Int64, json.b.b.`_1`.:Date from test order by id format Null;
-select json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_1`.:Int64, json.b.b, json.b.b.`_1`.:Date from test order by id format Null;
-select json, json.d.a, json.b.b.`_1` from test order by id format Null;
-select json, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_1`.:Int64, json.b.b.`_1`.:Date from test order by id format Null;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_1`.:Int64, json.b.b, json.b.b.`_1`.:Date from test format Null;
-select json, json.d.a, json.d.a.:`Array(Nullable(Int64))`, json.d.a.:Date, json.b.b.`_1`.:Int64, json.b.b, json.b.b.`_1`.:Date from test order by id format Null;
-
-select count() from test where empty(json.^a) and json.a.b.c == 0;
-select json.^a, json.a.b.c from test order by id format Null;
-select json, json.^a, json.a.b.c from test format Null;
-select json, json.^a, json.a.b.c from test order by id format Null;
-
-select count() from test where empty(json.^a) and json.a.b.d is Null;
-select json.^a, json.a.b.d from test order by id format Null;
-select json.^a, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json.^a, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json, json.^a, json.a.b.d from test order by id format Null;
-select json, json.^a, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-select json, json.^a, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test format Null;
-select json, json.^a, json.a.b.d, json.a.b.d.:Int64, json.a.b.d.:Date from test order by id format Null;
-
-{% endfor -%}
-
-drop table test;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_1.reference.j2 b/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_1.reference.j2
deleted file mode 100644
index 0228ae1e7df..00000000000
--- a/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_1.reference.j2
+++ /dev/null
@@ -1,545 +0,0 @@
-('a.a1','String')
-('a.a2','String')
-('a.a3','String')
-('a.a4','String')
-('a.a5','String')
-('a.a6','String')
-('a.a7','String')
-('a.a8','String')
-('a.b','Array(JSON)')
-('a.r','Array(JSON(max_dynamic_types=16, max_dynamic_paths=2))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-{
-	"json": [{"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}]}}, {"a":{"a1":"15","a2":"15","a3":"15","a4":"15","a5":"15","a6":"15","a7":"15","a8":"15","b":[],"r":[{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}]}}, {"a":{"a1":"16","a2":"16","a3":"16","a4":"16","a5":"16","a6":"16","a7":"16","a8":"16","b":[],"r":[{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}]}}, {"a":{"a1":"17","a2":"17","a3":"17","a4":"17","a5":"17","a6":"17","a7":"17","a8":"17","b":[],"r":[{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}}, {"a":{"a1":"18","a2":"18","a3":"18","a4":"18","a5":"18","a6":"18","a7":"18","a8":"18","b":[],"r":[{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}]}}, {"a":{"a1":"19","a2":"19","a3":"19","a4":"19","a5":"19","a6":"19","a7":"19","a8":"19","b":[],"r":[{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]}}],
-	"json.a.b": [[], [], [], [], [], [{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c.d.e": [[], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_0": [[], [], [], [], [], ["5"], ["6",null], ["7",null,null], ["8",null,null,null], ["9",null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_1": [[], [], [], [], [], [null], [null,"6"], [null,"7",null], [null,"8",null,null], [null,"9",null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_2": [[], [], [], [], [], [null], [null,null], [null,null,"7"], [null,null,"8",null], [null,null,"9",null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_3": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"8"], [null,null,null,"9",null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_4": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"9"], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`": [[], [], [], [], [], [], [], [], [], [], [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_2": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,"12"], [null,null,"13",null], [null,null,"14",null,null], [null], [null,null], [null,null,"17"], [null,null,"18",null], [null,null,"19",null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_3": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"13"], [null,null,null,"14",null], [null], [null,null], [null,null,null], [null,null,null,"18"], [null,null,null,"19",null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_4": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"14"], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"19"]],
-	"json.^`a`": [{"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}]}, {"b":[{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"a1":"15","a2":"15","a3":"15","a4":"15","a5":"15","a6":"15","a7":"15","a8":"15","b":[],"r":[{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}]}, {"a1":"16","a2":"16","a3":"16","a4":"16","a5":"16","a6":"16","a7":"16","a8":"16","b":[],"r":[{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"a1":"17","a2":"17","a3":"17","a4":"17","a5":"17","a6":"17","a7":"17","a8":"17","b":[],"r":[{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"a1":"18","a2":"18","a3":"18","a4":"18","a5":"18","a6":"18","a7":"18","a8":"18","b":[],"r":[{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}]}, {"a1":"19","a2":"19","a3":"19","a4":"19","a5":"19","a6":"19","a7":"19","a8":"19","b":[],"r":[{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]}],
-	"json.a.b.^`b`.c": [[], [], [], [], [], [{"d_0":"5"}], [{"d_0":"6"},{"d_1":"6"}], [{"d_0":"7"},{"d_1":"7"},{"d_2":"7"}], [{"d_0":"8"},{"d_1":"8"},{"d_2":"8"},{"d_3":"8"}], [{"d_0":"9"},{"d_1":"9"},{"d_2":"9"},{"d_3":"9"},{"d_4":"9"}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]]
-}
-{
-	"json.a.b": [[], [], [], [], [], [{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c.d.e": [[], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_0": [[], [], [], [], [], ["5"], ["6",null], ["7",null,null], ["8",null,null,null], ["9",null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_1": [[], [], [], [], [], [null], [null,"6"], [null,"7",null], [null,"8",null,null], [null,"9",null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_2": [[], [], [], [], [], [null], [null,null], [null,null,"7"], [null,null,"8",null], [null,null,"9",null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_3": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"8"], [null,null,null,"9",null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_4": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"9"], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`": [[], [], [], [], [], [], [], [], [], [], [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_2": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,"12"], [null,null,"13",null], [null,null,"14",null,null], [null], [null,null], [null,null,"17"], [null,null,"18",null], [null,null,"19",null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_3": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"13"], [null,null,null,"14",null], [null], [null,null], [null,null,null], [null,null,null,"18"], [null,null,null,"19",null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_4": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"14"], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"19"]],
-	"json.^`a`": [{"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}]}, {"b":[{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"a1":"15","a2":"15","a3":"15","a4":"15","a5":"15","a6":"15","a7":"15","a8":"15","b":[],"r":[{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}]}, {"a1":"16","a2":"16","a3":"16","a4":"16","a5":"16","a6":"16","a7":"16","a8":"16","b":[],"r":[{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"a1":"17","a2":"17","a3":"17","a4":"17","a5":"17","a6":"17","a7":"17","a8":"17","b":[],"r":[{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"a1":"18","a2":"18","a3":"18","a4":"18","a5":"18","a6":"18","a7":"18","a8":"18","b":[],"r":[{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}]}, {"a1":"19","a2":"19","a3":"19","a4":"19","a5":"19","a6":"19","a7":"19","a8":"19","b":[],"r":[{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]}],
-	"json.a.b.^`b`.c": [[], [], [], [], [], [{"d_0":"5"}], [{"d_0":"6"},{"d_1":"6"}], [{"d_0":"7"},{"d_1":"7"},{"d_2":"7"}], [{"d_0":"8"},{"d_1":"8"},{"d_2":"8"},{"d_3":"8"}], [{"d_0":"9"},{"d_1":"9"},{"d_2":"9"},{"d_3":"9"},{"d_4":"9"}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]]
-}
-{
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r.:`Array(JSON)`.c.d.e.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1.:`Int64`": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1.:`Int64`": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-{
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-('a.a1','String')
-('a.a2','String')
-('a.a3','String')
-('a.a4','String')
-('a.a5','String')
-('a.a6','String')
-('a.a7','String')
-('a.a8','String')
-('a.b','Array(JSON)')
-('a.r','Array(JSON(max_dynamic_types=16, max_dynamic_paths=2))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-{
-	"json": [{"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}]}}, {"a":{"a1":"15","a2":"15","a3":"15","a4":"15","a5":"15","a6":"15","a7":"15","a8":"15","b":[],"r":[{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}]}}, {"a":{"a1":"16","a2":"16","a3":"16","a4":"16","a5":"16","a6":"16","a7":"16","a8":"16","b":[],"r":[{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}]}}, {"a":{"a1":"17","a2":"17","a3":"17","a4":"17","a5":"17","a6":"17","a7":"17","a8":"17","b":[],"r":[{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}}, {"a":{"a1":"18","a2":"18","a3":"18","a4":"18","a5":"18","a6":"18","a7":"18","a8":"18","b":[],"r":[{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}]}}, {"a":{"a1":"19","a2":"19","a3":"19","a4":"19","a5":"19","a6":"19","a7":"19","a8":"19","b":[],"r":[{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]}}],
-	"json.a.b": [[], [], [], [], [], [{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c.d.e": [[], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_0": [[], [], [], [], [], ["5"], ["6",null], ["7",null,null], ["8",null,null,null], ["9",null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_1": [[], [], [], [], [], [null], [null,"6"], [null,"7",null], [null,"8",null,null], [null,"9",null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_2": [[], [], [], [], [], [null], [null,null], [null,null,"7"], [null,null,"8",null], [null,null,"9",null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_3": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"8"], [null,null,null,"9",null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_4": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"9"], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`": [[], [], [], [], [], [], [], [], [], [], [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_2": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,"12"], [null,null,"13",null], [null,null,"14",null,null], [null], [null,null], [null,null,"17"], [null,null,"18",null], [null,null,"19",null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_3": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"13"], [null,null,null,"14",null], [null], [null,null], [null,null,null], [null,null,null,"18"], [null,null,null,"19",null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_4": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"14"], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"19"]],
-	"json.^`a`": [{"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}]}, {"b":[{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"a1":"15","a2":"15","a3":"15","a4":"15","a5":"15","a6":"15","a7":"15","a8":"15","b":[],"r":[{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}]}, {"a1":"16","a2":"16","a3":"16","a4":"16","a5":"16","a6":"16","a7":"16","a8":"16","b":[],"r":[{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"a1":"17","a2":"17","a3":"17","a4":"17","a5":"17","a6":"17","a7":"17","a8":"17","b":[],"r":[{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"a1":"18","a2":"18","a3":"18","a4":"18","a5":"18","a6":"18","a7":"18","a8":"18","b":[],"r":[{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}]}, {"a1":"19","a2":"19","a3":"19","a4":"19","a5":"19","a6":"19","a7":"19","a8":"19","b":[],"r":[{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]}],
-	"json.a.b.^`b`.c": [[], [], [], [], [], [{"d_0":"5"}], [{"d_0":"6"},{"d_1":"6"}], [{"d_0":"7"},{"d_1":"7"},{"d_2":"7"}], [{"d_0":"8"},{"d_1":"8"},{"d_2":"8"},{"d_3":"8"}], [{"d_0":"9"},{"d_1":"9"},{"d_2":"9"},{"d_3":"9"},{"d_4":"9"}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]]
-}
-{
-	"json.a.b": [[], [], [], [], [], [{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c.d.e": [[], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_0": [[], [], [], [], [], ["5"], ["6",null], ["7",null,null], ["8",null,null,null], ["9",null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_1": [[], [], [], [], [], [null], [null,"6"], [null,"7",null], [null,"8",null,null], [null,"9",null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_2": [[], [], [], [], [], [null], [null,null], [null,null,"7"], [null,null,"8",null], [null,null,"9",null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_3": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"8"], [null,null,null,"9",null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_4": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"9"], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`": [[], [], [], [], [], [], [], [], [], [], [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_2": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,"12"], [null,null,"13",null], [null,null,"14",null,null], [null], [null,null], [null,null,"17"], [null,null,"18",null], [null,null,"19",null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_3": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"13"], [null,null,null,"14",null], [null], [null,null], [null,null,null], [null,null,null,"18"], [null,null,null,"19",null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_4": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"14"], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"19"]],
-	"json.^`a`": [{"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}]}, {"b":[{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"a1":"15","a2":"15","a3":"15","a4":"15","a5":"15","a6":"15","a7":"15","a8":"15","b":[],"r":[{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}]}, {"a1":"16","a2":"16","a3":"16","a4":"16","a5":"16","a6":"16","a7":"16","a8":"16","b":[],"r":[{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"a1":"17","a2":"17","a3":"17","a4":"17","a5":"17","a6":"17","a7":"17","a8":"17","b":[],"r":[{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"a1":"18","a2":"18","a3":"18","a4":"18","a5":"18","a6":"18","a7":"18","a8":"18","b":[],"r":[{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}]}, {"a1":"19","a2":"19","a3":"19","a4":"19","a5":"19","a6":"19","a7":"19","a8":"19","b":[],"r":[{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]}],
-	"json.a.b.^`b`.c": [[], [], [], [], [], [{"d_0":"5"}], [{"d_0":"6"},{"d_1":"6"}], [{"d_0":"7"},{"d_1":"7"},{"d_2":"7"}], [{"d_0":"8"},{"d_1":"8"},{"d_2":"8"},{"d_3":"8"}], [{"d_0":"9"},{"d_1":"9"},{"d_2":"9"},{"d_3":"9"},{"d_4":"9"}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]]
-}
-{
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r.:`Array(JSON)`.c.d.e.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1.:`Int64`": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1.:`Int64`": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-{
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-('a.a1','String')
-('a.a2','String')
-('a.a3','String')
-('a.a4','String')
-('a.a5','String')
-('a.a6','String')
-('a.a7','String')
-('a.a8','String')
-('a.b','Array(JSON)')
-('a.r','Array(JSON(max_dynamic_types=16, max_dynamic_paths=2))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-{
-	"json": [{"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}]}}, {"a":{"a1":"15","a2":"15","a3":"15","a4":"15","a5":"15","a6":"15","a7":"15","a8":"15","b":[],"r":[{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}]}}, {"a":{"a1":"16","a2":"16","a3":"16","a4":"16","a5":"16","a6":"16","a7":"16","a8":"16","b":[],"r":[{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}]}}, {"a":{"a1":"17","a2":"17","a3":"17","a4":"17","a5":"17","a6":"17","a7":"17","a8":"17","b":[],"r":[{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}}, {"a":{"a1":"18","a2":"18","a3":"18","a4":"18","a5":"18","a6":"18","a7":"18","a8":"18","b":[],"r":[{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}]}}, {"a":{"a1":"19","a2":"19","a3":"19","a4":"19","a5":"19","a6":"19","a7":"19","a8":"19","b":[],"r":[{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]}}],
-	"json.a.b": [[], [], [], [], [], [{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c.d.e": [[], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_0": [[], [], [], [], [], ["5"], ["6",null], ["7",null,null], ["8",null,null,null], ["9",null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_1": [[], [], [], [], [], [null], [null,"6"], [null,"7",null], [null,"8",null,null], [null,"9",null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_2": [[], [], [], [], [], [null], [null,null], [null,null,"7"], [null,null,"8",null], [null,null,"9",null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_3": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"8"], [null,null,null,"9",null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_4": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"9"], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`": [[], [], [], [], [], [], [], [], [], [], [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_2": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,"12"], [null,null,"13",null], [null,null,"14",null,null], [null], [null,null], [null,null,"17"], [null,null,"18",null], [null,null,"19",null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_3": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"13"], [null,null,null,"14",null], [null], [null,null], [null,null,null], [null,null,null,"18"], [null,null,null,"19",null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_4": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"14"], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"19"]],
-	"json.^`a`": [{"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}]}, {"b":[{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"a1":"15","a2":"15","a3":"15","a4":"15","a5":"15","a6":"15","a7":"15","a8":"15","b":[],"r":[{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}]}, {"a1":"16","a2":"16","a3":"16","a4":"16","a5":"16","a6":"16","a7":"16","a8":"16","b":[],"r":[{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"a1":"17","a2":"17","a3":"17","a4":"17","a5":"17","a6":"17","a7":"17","a8":"17","b":[],"r":[{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"a1":"18","a2":"18","a3":"18","a4":"18","a5":"18","a6":"18","a7":"18","a8":"18","b":[],"r":[{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}]}, {"a1":"19","a2":"19","a3":"19","a4":"19","a5":"19","a6":"19","a7":"19","a8":"19","b":[],"r":[{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]}],
-	"json.a.b.^`b`.c": [[], [], [], [], [], [{"d_0":"5"}], [{"d_0":"6"},{"d_1":"6"}], [{"d_0":"7"},{"d_1":"7"},{"d_2":"7"}], [{"d_0":"8"},{"d_1":"8"},{"d_2":"8"},{"d_3":"8"}], [{"d_0":"9"},{"d_1":"9"},{"d_2":"9"},{"d_3":"9"},{"d_4":"9"}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]]
-}
-{
-	"json.a.b": [[], [], [], [], [], [{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c.d.e": [[], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_0": [[], [], [], [], [], ["5"], ["6",null], ["7",null,null], ["8",null,null,null], ["9",null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_1": [[], [], [], [], [], [null], [null,"6"], [null,"7",null], [null,"8",null,null], [null,"9",null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_2": [[], [], [], [], [], [null], [null,null], [null,null,"7"], [null,null,"8",null], [null,null,"9",null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_3": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"8"], [null,null,null,"9",null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_4": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"9"], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`": [[], [], [], [], [], [], [], [], [], [], [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_2": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,"12"], [null,null,"13",null], [null,null,"14",null,null], [null], [null,null], [null,null,"17"], [null,null,"18",null], [null,null,"19",null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_3": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"13"], [null,null,null,"14",null], [null], [null,null], [null,null,null], [null,null,null,"18"], [null,null,null,"19",null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_4": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"14"], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"19"]],
-	"json.^`a`": [{"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}]}, {"b":[{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"a1":"15","a2":"15","a3":"15","a4":"15","a5":"15","a6":"15","a7":"15","a8":"15","b":[],"r":[{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}]}, {"a1":"16","a2":"16","a3":"16","a4":"16","a5":"16","a6":"16","a7":"16","a8":"16","b":[],"r":[{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"a1":"17","a2":"17","a3":"17","a4":"17","a5":"17","a6":"17","a7":"17","a8":"17","b":[],"r":[{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"a1":"18","a2":"18","a3":"18","a4":"18","a5":"18","a6":"18","a7":"18","a8":"18","b":[],"r":[{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}]}, {"a1":"19","a2":"19","a3":"19","a4":"19","a5":"19","a6":"19","a7":"19","a8":"19","b":[],"r":[{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]}],
-	"json.a.b.^`b`.c": [[], [], [], [], [], [{"d_0":"5"}], [{"d_0":"6"},{"d_1":"6"}], [{"d_0":"7"},{"d_1":"7"},{"d_2":"7"}], [{"d_0":"8"},{"d_1":"8"},{"d_2":"8"},{"d_3":"8"}], [{"d_0":"9"},{"d_1":"9"},{"d_2":"9"},{"d_3":"9"},{"d_4":"9"}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]]
-}
-{
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r.:`Array(JSON)`.c.d.e.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1.:`Int64`": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1.:`Int64`": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-{
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-('a.a1','String')
-('a.a2','String')
-('a.a3','String')
-('a.a4','String')
-('a.a5','String')
-('a.a6','String')
-('a.a7','String')
-('a.a8','String')
-('a.b','Array(JSON)')
-('a.r','Array(JSON(max_dynamic_types=16, max_dynamic_paths=2))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-{
-	"json": [{"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}]}}, {"a":{"a1":"15","a2":"15","a3":"15","a4":"15","a5":"15","a6":"15","a7":"15","a8":"15","b":[],"r":[{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}]}}, {"a":{"a1":"16","a2":"16","a3":"16","a4":"16","a5":"16","a6":"16","a7":"16","a8":"16","b":[],"r":[{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}]}}, {"a":{"a1":"17","a2":"17","a3":"17","a4":"17","a5":"17","a6":"17","a7":"17","a8":"17","b":[],"r":[{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}}, {"a":{"a1":"18","a2":"18","a3":"18","a4":"18","a5":"18","a6":"18","a7":"18","a8":"18","b":[],"r":[{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}]}}, {"a":{"a1":"19","a2":"19","a3":"19","a4":"19","a5":"19","a6":"19","a7":"19","a8":"19","b":[],"r":[{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]}}],
-	"json.a.b": [[], [], [], [], [], [{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c.d.e": [[], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_0": [[], [], [], [], [], ["5"], ["6",null], ["7",null,null], ["8",null,null,null], ["9",null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_1": [[], [], [], [], [], [null], [null,"6"], [null,"7",null], [null,"8",null,null], [null,"9",null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_2": [[], [], [], [], [], [null], [null,null], [null,null,"7"], [null,null,"8",null], [null,null,"9",null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_3": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"8"], [null,null,null,"9",null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_4": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"9"], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`": [[], [], [], [], [], [], [], [], [], [], [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_2": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,"12"], [null,null,"13",null], [null,null,"14",null,null], [null], [null,null], [null,null,"17"], [null,null,"18",null], [null,null,"19",null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_3": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"13"], [null,null,null,"14",null], [null], [null,null], [null,null,null], [null,null,null,"18"], [null,null,null,"19",null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_4": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"14"], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"19"]],
-	"json.^`a`": [{"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}]}, {"b":[{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"a1":"15","a2":"15","a3":"15","a4":"15","a5":"15","a6":"15","a7":"15","a8":"15","b":[],"r":[{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}]}, {"a1":"16","a2":"16","a3":"16","a4":"16","a5":"16","a6":"16","a7":"16","a8":"16","b":[],"r":[{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"a1":"17","a2":"17","a3":"17","a4":"17","a5":"17","a6":"17","a7":"17","a8":"17","b":[],"r":[{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"a1":"18","a2":"18","a3":"18","a4":"18","a5":"18","a6":"18","a7":"18","a8":"18","b":[],"r":[{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}]}, {"a1":"19","a2":"19","a3":"19","a4":"19","a5":"19","a6":"19","a7":"19","a8":"19","b":[],"r":[{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]}],
-	"json.a.b.^`b`.c": [[], [], [], [], [], [{"d_0":"5"}], [{"d_0":"6"},{"d_1":"6"}], [{"d_0":"7"},{"d_1":"7"},{"d_2":"7"}], [{"d_0":"8"},{"d_1":"8"},{"d_2":"8"},{"d_3":"8"}], [{"d_0":"9"},{"d_1":"9"},{"d_2":"9"},{"d_3":"9"},{"d_4":"9"}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]]
-}
-{
-	"json.a.b": [[], [], [], [], [], [{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c.d.e": [[], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_0": [[], [], [], [], [], ["5"], ["6",null], ["7",null,null], ["8",null,null,null], ["9",null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_1": [[], [], [], [], [], [null], [null,"6"], [null,"7",null], [null,"8",null,null], [null,"9",null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_2": [[], [], [], [], [], [null], [null,null], [null,null,"7"], [null,null,"8",null], [null,null,"9",null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_3": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"8"], [null,null,null,"9",null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_4": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"9"], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`": [[], [], [], [], [], [], [], [], [], [], [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_2": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,"12"], [null,null,"13",null], [null,null,"14",null,null], [null], [null,null], [null,null,"17"], [null,null,"18",null], [null,null,"19",null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_3": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"13"], [null,null,null,"14",null], [null], [null,null], [null,null,null], [null,null,null,"18"], [null,null,null,"19",null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_4": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"14"], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"19"]],
-	"json.^`a`": [{"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}]}, {"b":[{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"a1":"15","a2":"15","a3":"15","a4":"15","a5":"15","a6":"15","a7":"15","a8":"15","b":[],"r":[{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}]}, {"a1":"16","a2":"16","a3":"16","a4":"16","a5":"16","a6":"16","a7":"16","a8":"16","b":[],"r":[{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"a1":"17","a2":"17","a3":"17","a4":"17","a5":"17","a6":"17","a7":"17","a8":"17","b":[],"r":[{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"a1":"18","a2":"18","a3":"18","a4":"18","a5":"18","a6":"18","a7":"18","a8":"18","b":[],"r":[{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}]}, {"a1":"19","a2":"19","a3":"19","a4":"19","a5":"19","a6":"19","a7":"19","a8":"19","b":[],"r":[{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]}],
-	"json.a.b.^`b`.c": [[], [], [], [], [], [{"d_0":"5"}], [{"d_0":"6"},{"d_1":"6"}], [{"d_0":"7"},{"d_1":"7"},{"d_2":"7"}], [{"d_0":"8"},{"d_1":"8"},{"d_2":"8"},{"d_3":"8"}], [{"d_0":"9"},{"d_1":"9"},{"d_2":"9"},{"d_3":"9"},{"d_4":"9"}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]]
-}
-{
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r.:`Array(JSON)`.c.d.e.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1.:`Int64`": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1.:`Int64`": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-{
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-('a.a1','String')
-('a.a2','String')
-('a.a3','String')
-('a.a4','String')
-('a.a5','String')
-('a.a6','String')
-('a.a7','String')
-('a.a8','String')
-('a.b','Array(JSON)')
-('a.r','Array(JSON(max_dynamic_types=16, max_dynamic_paths=2))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-{
-	"json": [{"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[]}}, {"a":{"b":[{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}]}}, {"a":{"b":[{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}]}}, {"a":{"b":[],"r":[{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}]}}, {"a":{"a1":"15","a2":"15","a3":"15","a4":"15","a5":"15","a6":"15","a7":"15","a8":"15","b":[],"r":[{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}]}}, {"a":{"a1":"16","a2":"16","a3":"16","a4":"16","a5":"16","a6":"16","a7":"16","a8":"16","b":[],"r":[{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}]}}, {"a":{"a1":"17","a2":"17","a3":"17","a4":"17","a5":"17","a6":"17","a7":"17","a8":"17","b":[],"r":[{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}}, {"a":{"a1":"18","a2":"18","a3":"18","a4":"18","a5":"18","a6":"18","a7":"18","a8":"18","b":[],"r":[{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}]}}, {"a":{"a1":"19","a2":"19","a3":"19","a4":"19","a5":"19","a6":"19","a7":"19","a8":"19","b":[],"r":[{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]}}],
-	"json.a.b": [[], [], [], [], [], [{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c.d.e": [[], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_0": [[], [], [], [], [], ["5"], ["6",null], ["7",null,null], ["8",null,null,null], ["9",null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_1": [[], [], [], [], [], [null], [null,"6"], [null,"7",null], [null,"8",null,null], [null,"9",null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_2": [[], [], [], [], [], [null], [null,null], [null,null,"7"], [null,null,"8",null], [null,null,"9",null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_3": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"8"], [null,null,null,"9",null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_4": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"9"], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`": [[], [], [], [], [], [], [], [], [], [], [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_2": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,"12"], [null,null,"13",null], [null,null,"14",null,null], [null], [null,null], [null,null,"17"], [null,null,"18",null], [null,null,"19",null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_3": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"13"], [null,null,null,"14",null], [null], [null,null], [null,null,null], [null,null,null,"18"], [null,null,null,"19",null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_4": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"14"], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"19"]],
-	"json.^`a`": [{"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}]}, {"b":[{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"a1":"15","a2":"15","a3":"15","a4":"15","a5":"15","a6":"15","a7":"15","a8":"15","b":[],"r":[{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}]}, {"a1":"16","a2":"16","a3":"16","a4":"16","a5":"16","a6":"16","a7":"16","a8":"16","b":[],"r":[{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"a1":"17","a2":"17","a3":"17","a4":"17","a5":"17","a6":"17","a7":"17","a8":"17","b":[],"r":[{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"a1":"18","a2":"18","a3":"18","a4":"18","a5":"18","a6":"18","a7":"18","a8":"18","b":[],"r":[{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}]}, {"a1":"19","a2":"19","a3":"19","a4":"19","a5":"19","a6":"19","a7":"19","a8":"19","b":[],"r":[{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]}],
-	"json.a.b.^`b`.c": [[], [], [], [], [], [{"d_0":"5"}], [{"d_0":"6"},{"d_1":"6"}], [{"d_0":"7"},{"d_1":"7"},{"d_2":"7"}], [{"d_0":"8"},{"d_1":"8"},{"d_2":"8"},{"d_3":"8"}], [{"d_0":"9"},{"d_1":"9"},{"d_2":"9"},{"d_3":"9"},{"d_4":"9"}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]]
-}
-{
-	"json.a.b": [[], [], [], [], [], [{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.c.d.e": [[], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_0": [[], [], [], [], [], ["5"], ["6",null], ["7",null,null], ["8",null,null,null], ["9",null,null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_1": [[], [], [], [], [], [null], [null,"6"], [null,"7",null], [null,"8",null,null], [null,"9",null,null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_2": [[], [], [], [], [], [null], [null,null], [null,null,"7"], [null,null,"8",null], [null,null,"9",null,null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_3": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"8"], [null,null,null,"9",null], [], [], [], [], [], [], [], [], [], []],
-	"json.a.b.b.c.d_4": [[], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"9"], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`": [[], [], [], [], [], [], [], [], [], [], [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_2": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,"12"], [null,null,"13",null], [null,null,"14",null,null], [null], [null,null], [null,null,"17"], [null,null,"18",null], [null,null,"19",null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_3": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,"13"], [null,null,null,"14",null], [null], [null,null], [null,null,null], [null,null,null,"18"], [null,null,null,"19",null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_4": [[], [], [], [], [], [], [], [], [], [], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"14"], [null], [null,null], [null,null,null], [null,null,null,null], [null,null,null,null,"19"]],
-	"json.^`a`": [{"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[]}, {"b":[{"b":{"c":{"d_0":"5"}},"c":{"d":{"e":["0"]}}}]}, {"b":[{"b":{"c":{"d_0":"6"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"6"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[{"b":{"c":{"d_0":"7"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"7"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"7"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[{"b":{"c":{"d_0":"8"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"8"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"8"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"8"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[{"b":{"c":{"d_0":"9"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"9"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"9"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"9"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"9"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}]}, {"b":[],"r":[{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}]}, {"a1":"15","a2":"15","a3":"15","a4":"15","a5":"15","a6":"15","a7":"15","a8":"15","b":[],"r":[{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}]}, {"a1":"16","a2":"16","a3":"16","a4":"16","a5":"16","a6":"16","a7":"16","a8":"16","b":[],"r":[{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}]}, {"a1":"17","a2":"17","a3":"17","a4":"17","a5":"17","a6":"17","a7":"17","a8":"17","b":[],"r":[{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}]}, {"a1":"18","a2":"18","a3":"18","a4":"18","a5":"18","a6":"18","a7":"18","a8":"18","b":[],"r":[{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}]}, {"a1":"19","a2":"19","a3":"19","a4":"19","a5":"19","a6":"19","a7":"19","a8":"19","b":[],"r":[{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]}],
-	"json.a.b.^`b`.c": [[], [], [], [], [], [{"d_0":"5"}], [{"d_0":"6"},{"d_1":"6"}], [{"d_0":"7"},{"d_1":"7"},{"d_2":"7"}], [{"d_0":"8"},{"d_1":"8"},{"d_2":"8"},{"d_3":"8"}], [{"d_0":"9"},{"d_1":"9"},{"d_2":"9"},{"d_3":"9"},{"d_4":"9"}], [], [], [], [], [], [], [], [], [], []],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]]
-}
-{
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r.:`Array(JSON)`.c.d.e.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1.:`Int64`": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.c.d.e.:`Array(Nullable(Int64))`": [[], [], [], [], [], [], [], [], [], [], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]], [["0"]], [["0","1"],["0","1","2"]], [["0","1","2"],["0","1","2","3"],["0","1","2","3","4"]], [["0","1","2","3"],["0","1","2","3","4"],["0"],["0","1"]], [["0","1","2","3","4"],["0"],["0","1"],["0","1","2"],["0","1","2","3"]]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]],
-	"json.a.r.:`Array(JSON)`.b.c.d_1.:`Int64`": [[], [], [], [], [], [], [], [], [], [], [null], [null,"11"], [null,"12",null], [null,"13",null,null], [null,"14",null,null,null], [null], [null,"16"], [null,"17",null], [null,"18",null,null], [null,"19",null,null,null]]
-}
-{
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-{
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
-{
-	"json.a.r": [null, null, null, null, null, null, null, null, null, null, [{"b":{"c":{"d_0":"10"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"11"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"11"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"12"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"12"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"12"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"13"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"13"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"13"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"13"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"14"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"14"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"14"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"14"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"14"}},"c":{"d":{"e":["0","1","2","3"]}}}], [{"b":{"c":{"d_0":"15"}},"c":{"d":{"e":["0"]}}}], [{"b":{"c":{"d_0":"16"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_1":"16"}},"c":{"d":{"e":["0","1","2"]}}}], [{"b":{"c":{"d_0":"17"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_1":"17"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_2":"17"}},"c":{"d":{"e":["0","1","2","3","4"]}}}], [{"b":{"c":{"d_0":"18"}},"c":{"d":{"e":["0","1","2","3"]}}},{"b":{"c":{"d_1":"18"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_2":"18"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_3":"18"}},"c":{"d":{"e":["0","1"]}}}], [{"b":{"c":{"d_0":"19"}},"c":{"d":{"e":["0","1","2","3","4"]}}},{"b":{"c":{"d_1":"19"}},"c":{"d":{"e":["0"]}}},{"b":{"c":{"d_2":"19"}},"c":{"d":{"e":["0","1"]}}},{"b":{"c":{"d_3":"19"}},"c":{"d":{"e":["0","1","2"]}}},{"b":{"c":{"d_4":"19"}},"c":{"d":{"e":["0","1","2","3"]}}}]],
-	"json.a.r.:`Array(JSON)`.^`b`": [[], [], [], [], [], [], [], [], [], [], [{"c":{"d_0":"10"}}], [{"c":{"d_0":"11"}},{"c":{"d_1":"11"}}], [{"c":{"d_0":"12"}},{"c":{"d_1":"12"}},{"c":{"d_2":"12"}}], [{"c":{"d_0":"13"}},{"c":{"d_1":"13"}},{"c":{"d_2":"13"}},{"c":{"d_3":"13"}}], [{"c":{"d_0":"14"}},{"c":{"d_1":"14"}},{"c":{"d_2":"14"}},{"c":{"d_3":"14"}},{"c":{"d_4":"14"}}], [{"c":{"d_0":"15"}}], [{"c":{"d_0":"16"}},{"c":{"d_1":"16"}}], [{"c":{"d_0":"17"}},{"c":{"d_1":"17"}},{"c":{"d_2":"17"}}], [{"c":{"d_0":"18"}},{"c":{"d_1":"18"}},{"c":{"d_2":"18"}},{"c":{"d_3":"18"}}], [{"c":{"d_0":"19"}},{"c":{"d_1":"19"}},{"c":{"d_2":"19"}},{"c":{"d_3":"19"}},{"c":{"d_4":"19"}}]],
-	"json.a.r.:`Array(JSON)`.^`b`.c": [[], [], [], [], [], [], [], [], [], [], [{"d_0":"10"}], [{"d_0":"11"},{"d_1":"11"}], [{"d_0":"12"},{"d_1":"12"},{"d_2":"12"}], [{"d_0":"13"},{"d_1":"13"},{"d_2":"13"},{"d_3":"13"}], [{"d_0":"14"},{"d_1":"14"},{"d_2":"14"},{"d_3":"14"},{"d_4":"14"}], [{"d_0":"15"}], [{"d_0":"16"},{"d_1":"16"}], [{"d_0":"17"},{"d_1":"17"},{"d_2":"17"}], [{"d_0":"18"},{"d_1":"18"},{"d_2":"18"},{"d_3":"18"}], [{"d_0":"19"},{"d_1":"19"},{"d_2":"19"},{"d_3":"19"},{"d_4":"19"}]],
-	"json.a.r.:`Array(JSON)`.b.c.d_0.:`Int64`": [[], [], [], [], [], [], [], [], [], [], ["10"], ["11",null], ["12",null,null], ["13",null,null,null], ["14",null,null,null,null], ["15"], ["16",null], ["17",null,null], ["18",null,null,null], ["19",null,null,null,null]]
-}
diff --git a/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_1.sql.j2 b/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_1.sql.j2
deleted file mode 100644
index 1353980cd35..00000000000
--- a/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_1.sql.j2
+++ /dev/null
@@ -1,41 +0,0 @@
--- Tags: no-fasttest, long
-
-set allow_experimental_json_type = 1;
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type = 1;
-
-drop table if exists test;
-
-{% for create_command in ['create table test (id UInt64, json JSON(max_dynamic_paths=8, a.b Array(JSON))) engine=Memory;',
-                         'create table test (id UInt64, json JSON(max_dynamic_paths=8, a.b Array(JSON))) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000; system stop merges test;',
-                         'create table test (id UInt64, json JSON(max_dynamic_paths=8, a.b Array(JSON))) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000; system start merges test;',
-                         'create table test (id UInt64, json JSON(max_dynamic_paths=8, a.b Array(JSON))) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1; system stop merges test;',
-                         'create table test (id UInt64, json JSON(max_dynamic_paths=8, a.b Array(JSON))) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1; system start merges test;'] -%}
-
-{{ create_command }}
-
-insert into test select number, '{}' from numbers(5);
-insert into test select number, toJSONString(map('a.b', arrayMap(x -> map('b.c.d_' || toString(x), number::UInt32, 'c.d.e', range((number + x) % 5 + 1)), range(number % 5 + 1)))) from numbers(5, 5);
-insert into test select number, toJSONString(map('a.r', arrayMap(x -> map('b.c.d_' || toString(x), number::UInt32, 'c.d.e', range((number + x) % 5 + 1)), range(number % 5 + 1)))) from numbers(10, 5);
-insert into test select number, toJSONString(map('a.a1', number, 'a.a2', number, 'a.a3', number, 'a.a4', number, 'a.a5', number, 'a.a6', number, 'a.a7', number, 'a.a8', number, 'a.r', arrayMap(x -> map('b.c.d_' || toString(x), number::UInt32, 'c.d.e', range((number + x) % 5 + 1)), range(number % 5 + 1)))) from numbers(15, 5);
-
-select distinct arrayJoin(JSONAllPathsWithTypes(json)) as paths_with_types from test order by paths_with_types;
-select distinct arrayJoin(JSONAllPathsWithTypes(arrayJoin(json.a.b))) as paths_with_types from test order by paths_with_types;
-select distinct arrayJoin(JSONAllPathsWithTypes(arrayJoin(json.a.r[]))) as paths_with_types from test order by paths_with_types;
-
-select json, json.a.b, json.a.b.c, json.a.b.c.d.e, json.a.b.b.c.d_0, json.a.b.b.c.d_1, json.a.b.b.c.d_2, json.a.b.b.c.d_3, json.a.b.b.c.d_4, json.a.r, json.a.r[], json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1, json.a.r[].b.c.d_2, json.a.r[].b.c.d_3, json.a.r[].b.c.d_4, json.^a, json.a.b.^b.c, json.a.r[].^b.c from test order by id format JSONColumns;
-select json.a.b, json.a.b.c, json.a.b.c.d.e, json.a.b.b.c.d_0, json.a.b.b.c.d_1, json.a.b.b.c.d_2, json.a.b.b.c.d_3, json.a.b.b.c.d_4, json.a.r, json.a.r[], json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1, json.a.r[].b.c.d_2, json.a.r[].b.c.d_3, json.a.r[].b.c.d_4, json.^a, json.a.b.^b.c, json.a.r[].^b.c from test order by id format JSONColumns;
-
-select json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1 from test order by id format JSONColumns;
-select json.a.r[].c.d.e.:`Array(Nullable(Int64))`, json.a.r[].b.c.d_0.:Int64, json.a.r[].b.c.d_1.:Int64 from test order by id format JSONColumns;
-select json.a.r, json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1 from test order by id format JSONColumns;
-select json.a.r, json.a.r[].c.d.e.:`Array(Nullable(Int64))`, json.a.r[].b.c.d_0.:Int64, json.a.r[].b.c.d_1.:Int64 from test order by id format JSONColumns;
-
-select json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0 from test order by id format JSONColumns;
-select json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0.:Int64 from test order by id format JSONColumns;
-select json.a.r, json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0 from test order by id format JSONColumns;
-select json.a.r, json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0.:Int64 from test order by id format JSONColumns;
-
-drop table test;
-
-{% endfor -%}
diff --git a/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_compact_merge_tree.reference.j2 b/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_compact_merge_tree.reference.j2
deleted file mode 100644
index 2fd3437e3d2..00000000000
--- a/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_compact_merge_tree.reference.j2
+++ /dev/null
@@ -1,60 +0,0 @@
-('a.a1','String')
-('a.a2','String')
-('a.a3','String')
-('a.a4','String')
-('a.a5','String')
-('a.a6','String')
-('a.a7','String')
-('a.a8','String')
-('a.b','Array(JSON)')
-('a.r','Array(JSON(max_dynamic_types=16, max_dynamic_paths=2))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-20000
-20000
-0
-0
-20000
-20000
-0
-0
-('a.a1','String')
-('a.a2','String')
-('a.a3','String')
-('a.a4','String')
-('a.a5','String')
-('a.a6','String')
-('a.a7','String')
-('a.a8','String')
-('a.b','Array(JSON)')
-('a.r','Array(JSON(max_dynamic_types=16, max_dynamic_paths=2))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-20000
-20000
-0
-0
-20000
-20000
-0
-0
diff --git a/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_compact_merge_tree.sql.j2 b/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_compact_merge_tree.sql.j2
deleted file mode 100644
index e3930165602..00000000000
--- a/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_compact_merge_tree.sql.j2
+++ /dev/null
@@ -1,57 +0,0 @@
--- Tags: no-fasttest, long, no-debug, no-tsan, no-asan, no-msan, no-ubsan
-
-set allow_experimental_json_type = 1;
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type = 1;
-
-create table test (id UInt64, json JSON(max_dynamic_paths=8, a.b Array(JSON))) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000;
-
-insert into test select number, '{}' from numbers(10000);
-insert into test select number, toJSONString(map('a.b', arrayMap(x -> map('b.c.d_' || toString(x), number::UInt32, 'c.d.e', range((number + x) % 5 + 1)), range(number % 5 + 1)))) from numbers(10000, 10000);
-insert into test select number, toJSONString(map('a.r', arrayMap(x -> map('b.c.d_' || toString(x), number::UInt32, 'c.d.e', range((number + x) % 5 + 1)), range(number % 5 + 1)))) from numbers(20000, 10000);
-insert into test select number, toJSONString(map('a.a1', number, 'a.a2', number, 'a.a3', number, 'a.a4', number, 'a.a5', number, 'a.a6', number, 'a.a7', number, 'a.a8', number, 'a.r', arrayMap(x -> map('b.c.d_' || toString(x), number::UInt32, 'c.d.e', range((number + x) % 5 + 1)), range(number % 5 + 1)))) from numbers(30000, 10000);
-
-{% for merge_command in ['system stop merges test', 'system start merges test'] -%}
-
-{{ merge_command }};
-
-select distinct arrayJoin(JSONAllPathsWithTypes(json)) as paths_with_types from test order by paths_with_types;
-select distinct arrayJoin(JSONAllPathsWithTypes(arrayJoin(json.a.b))) as paths_with_types from test order by paths_with_types;
-select distinct arrayJoin(JSONAllPathsWithTypes(arrayJoin(json.a.r[]))) as paths_with_types from test order by paths_with_types;
-
-select json, json.a.b, json.a.b.c, json.a.b.c.d.e, json.a.b.b.c.d_0, json.a.b.b.c.d_1, json.a.b.b.c.d_2, json.a.b.b.c.d_3, json.a.b.b.c.d_4, json.a.r, json.a.r[], json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1, json.a.r[].b.c.d_2, json.a.r[].b.c.d_3, json.a.r[].b.c.d_4, json.^a, json.a.b.^b.c, json.a.r[].^b.c from test format Null;
-select json, json.a.b, json.a.b.c, json.a.b.c.d.e, json.a.b.b.c.d_0, json.a.b.b.c.d_1, json.a.b.b.c.d_2, json.a.b.b.c.d_3, json.a.b.b.c.d_4, json.a.r, json.a.r[], json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1, json.a.r[].b.c.d_2, json.a.r[].b.c.d_3, json.a.r[].b.c.d_4, json.^a, json.a.b.^b.c, json.a.r[].^b.c from test order by id format Null;
-select json.a.b, json.a.b.c, json.a.b.c.d.e, json.a.b.b.c.d_0, json.a.b.b.c.d_1, json.a.b.b.c.d_2, json.a.b.b.c.d_3, json.a.b.b.c.d_4, json.a.r, json.a.r[], json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1, json.a.r[].b.c.d_2, json.a.r[].b.c.d_3, json.a.r[].b.c.d_4, json.^a, json.a.b.^b.c, json.a.r[].^b.c from test format Null;
-select json.a.b, json.a.b.c, json.a.b.c.d.e, json.a.b.b.c.d_0, json.a.b.b.c.d_1, json.a.b.b.c.d_2, json.a.b.b.c.d_3, json.a.b.b.c.d_4, json.a.r, json.a.r[], json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1, json.a.r[].b.c.d_2, json.a.r[].b.c.d_3, json.a.r[].b.c.d_4, json.^a, json.a.b.^b.c, json.a.r[].^b.c from test order by id format Null;
-
-select count() from test where empty(json.a.r[].c.d.e) and empty(json.a.r[].b.c.d_0) and empty(json.a.r[].b.c.d_1);
-select count() from test where empty(json.a.r[].c.d.e.:`Array(Nullable(Int64))`) and empty(json.a.r[].b.c.d_0.:Int64) and empty(json.a.r[].b.c.d_1.:Int64);
-select count() from test where arrayJoin(json.a.r[].c.d.e) is null and arrayJoin(json.a.r[].b.c.d_0) is null and arrayJoin(json.a.r[].b.c.d_1) is null;
-select count() from test where arrayJoin(json.a.r[].c.d.e.:`Array(Nullable(Int64))`) is null and arrayJoin(json.a.r[].b.c.d_0.:Int64) is null and arrayJoin(json.a.r[].b.c.d_1.:Int64) is null;
-
-select json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1 from test format Null;
-select json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1 from test order by id format Null;
-select json.a.r[].c.d.e.:`Array(Nullable(Int64))`, json.a.r[].b.c.d_0.:Int64, json.a.r[].b.c.d_1.:Int64 from test format Null;
-select json.a.r[].c.d.e.:`Array(Nullable(Int64))`, json.a.r[].b.c.d_0.:Int64, json.a.r[].b.c.d_1.:Int64 from test order by id format Null;
-select json.a.r, json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1 from test format Null;
-select json.a.r, json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1 from test order by id format Null;
-select json.a.r, json.a.r[].c.d.e.:`Array(Nullable(Int64))`, json.a.r[].b.c.d_0.:Int64, json.a.r[].b.c.d_1.:Int64 from test format Null;
-select json.a.r, json.a.r[].c.d.e.:`Array(Nullable(Int64))`, json.a.r[].b.c.d_0.:Int64, json.a.r[].b.c.d_1.:Int64 from test order by id format Null;
-
-select count() from test where empty(json.a.r[].^b) and empty(json.a.r[].^b.c) and empty(json.a.r[].b.c.d_0);
-select count() from test where empty(json.a.r[].^b) and empty(json.a.r[].^b.c) and empty(json.a.r[].b.c.d_0.:Int64);
-select count() from test where empty(arrayJoin(json.a.r[].^b)) and empty(arrayJoin(json.a.r[].^b.c)) and arrayJoin(json.a.r[].b.c.d_0) is null;
-select count() from test where empty(arrayJoin(json.a.r[].^b)) and empty(arrayJoin(json.a.r[].^b.c)) and arrayJoin(json.a.r[].b.c.d_0.:Int64) is null;
-
-select json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0 from test format Null;
-select json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0 from test order by id format Null;
-select json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0.:Int64 from test format Null;
-select json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0.:Int64 from test order by id format Null;
-select json.a.r, json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0 from test format Null;
-select json.a.r, json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0 from test order by id format Null;
-select json.a.r, json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0.:Int64 from test format Null;
-select json.a.r, json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0.:Int64 from test order by id format Null;
-
-{% endfor -%}
-
-drop table test;
diff --git a/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_memory.reference b/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_memory.reference
deleted file mode 100644
index 34557cf60bb..00000000000
--- a/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_memory.reference
+++ /dev/null
@@ -1,30 +0,0 @@
-('a.a1','String')
-('a.a2','String')
-('a.a3','String')
-('a.a4','String')
-('a.a5','String')
-('a.a6','String')
-('a.a7','String')
-('a.a8','String')
-('a.b','Array(JSON)')
-('a.r','Array(JSON(max_dynamic_types=16, max_dynamic_paths=2))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-20000
-20000
-0
-0
-20000
-20000
-0
-0
diff --git a/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_memory.sql b/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_memory.sql
deleted file mode 100644
index 9274b9b9cf7..00000000000
--- a/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_memory.sql
+++ /dev/null
@@ -1,52 +0,0 @@
--- Tags: no-fasttest, long, no-debug, no-tsan, no-asan, no-msan, no-ubsan
-
-set allow_experimental_json_type = 1;
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type = 1;
-
-drop table if exists test;
-create table test (id UInt64, json JSON(max_dynamic_paths=8, a.b Array(JSON))) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000;
-
-insert into test select number, '{}' from numbers(10000);
-insert into test select number, toJSONString(map('a.b', arrayMap(x -> map('b.c.d_' || toString(x), number::UInt32, 'c.d.e', range((number + x) % 5 + 1)), range(number % 5 + 1)))) from numbers(10000, 10000);
-insert into test select number, toJSONString(map('a.r', arrayMap(x -> map('b.c.d_' || toString(x), number::UInt32, 'c.d.e', range((number + x) % 5 + 1)), range(number % 5 + 1)))) from numbers(20000, 10000);
-insert into test select number, toJSONString(map('a.a1', number, 'a.a2', number, 'a.a3', number, 'a.a4', number, 'a.a5', number, 'a.a6', number, 'a.a7', number, 'a.a8', number, 'a.r', arrayMap(x -> map('b.c.d_' || toString(x), number::UInt32, 'c.d.e', range((number + x) % 5 + 1)), range(number % 5 + 1)))) from numbers(30000, 10000);
-
-select distinct arrayJoin(JSONAllPathsWithTypes(json)) as paths_with_types from test order by paths_with_types;
-select distinct arrayJoin(JSONAllPathsWithTypes(arrayJoin(json.a.b))) as paths_with_types from test order by paths_with_types;
-select distinct arrayJoin(JSONAllPathsWithTypes(arrayJoin(json.a.r[]))) as paths_with_types from test order by paths_with_types;
-
-select json, json.a.b, json.a.b.c, json.a.b.c.d.e, json.a.b.b.c.d_0, json.a.b.b.c.d_1, json.a.b.b.c.d_2, json.a.b.b.c.d_3, json.a.b.b.c.d_4, json.a.r, json.a.r[], json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1, json.a.r[].b.c.d_2, json.a.r[].b.c.d_3, json.a.r[].b.c.d_4, json.^a, json.a.b.^b.c, json.a.r[].^b.c from test format Null;
-select json, json.a.b, json.a.b.c, json.a.b.c.d.e, json.a.b.b.c.d_0, json.a.b.b.c.d_1, json.a.b.b.c.d_2, json.a.b.b.c.d_3, json.a.b.b.c.d_4, json.a.r, json.a.r[], json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1, json.a.r[].b.c.d_2, json.a.r[].b.c.d_3, json.a.r[].b.c.d_4, json.^a, json.a.b.^b.c, json.a.r[].^b.c from test order by id format Null;
-select json.a.b, json.a.b.c, json.a.b.c.d.e, json.a.b.b.c.d_0, json.a.b.b.c.d_1, json.a.b.b.c.d_2, json.a.b.b.c.d_3, json.a.b.b.c.d_4, json.a.r, json.a.r[], json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1, json.a.r[].b.c.d_2, json.a.r[].b.c.d_3, json.a.r[].b.c.d_4, json.^a, json.a.b.^b.c, json.a.r[].^b.c from test format Null;
-select json.a.b, json.a.b.c, json.a.b.c.d.e, json.a.b.b.c.d_0, json.a.b.b.c.d_1, json.a.b.b.c.d_2, json.a.b.b.c.d_3, json.a.b.b.c.d_4, json.a.r, json.a.r[], json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1, json.a.r[].b.c.d_2, json.a.r[].b.c.d_3, json.a.r[].b.c.d_4, json.^a, json.a.b.^b.c, json.a.r[].^b.c from test order by id format Null;
-
-select count() from test where empty(json.a.r[].c.d.e) and empty(json.a.r[].b.c.d_0) and empty(json.a.r[].b.c.d_1);
-select count() from test where empty(json.a.r[].c.d.e.:`Array(Nullable(Int64))`) and empty(json.a.r[].b.c.d_0.:Int64) and empty(json.a.r[].b.c.d_1.:Int64);
-select count() from test where arrayJoin(json.a.r[].c.d.e) is null and arrayJoin(json.a.r[].b.c.d_0) is null and arrayJoin(json.a.r[].b.c.d_1) is null;
-select count() from test where arrayJoin(json.a.r[].c.d.e.:`Array(Nullable(Int64))`) is null and arrayJoin(json.a.r[].b.c.d_0.:Int64) is null and arrayJoin(json.a.r[].b.c.d_1.:Int64) is null;
-
-select json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1 from test format Null;
-select json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1 from test order by id format Null;
-select json.a.r[].c.d.e.:`Array(Nullable(Int64))`, json.a.r[].b.c.d_0.:Int64, json.a.r[].b.c.d_1.:Int64 from test format Null;
-select json.a.r[].c.d.e.:`Array(Nullable(Int64))`, json.a.r[].b.c.d_0.:Int64, json.a.r[].b.c.d_1.:Int64 from test order by id format Null;
-select json.a.r, json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1 from test format Null;
-select json.a.r, json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1 from test order by id format Null;
-select json.a.r, json.a.r[].c.d.e.:`Array(Nullable(Int64))`, json.a.r[].b.c.d_0.:Int64, json.a.r[].b.c.d_1.:Int64 from test format Null;
-select json.a.r, json.a.r[].c.d.e.:`Array(Nullable(Int64))`, json.a.r[].b.c.d_0.:Int64, json.a.r[].b.c.d_1.:Int64 from test order by id format Null;
-
-select count() from test where empty(json.a.r[].^b) and empty(json.a.r[].^b.c) and empty(json.a.r[].b.c.d_0);
-select count() from test where empty(json.a.r[].^b) and empty(json.a.r[].^b.c) and empty(json.a.r[].b.c.d_0.:Int64);
-select count() from test where empty(arrayJoin(json.a.r[].^b)) and empty(arrayJoin(json.a.r[].^b.c)) and arrayJoin(json.a.r[].b.c.d_0) is null;
-select count() from test where empty(arrayJoin(json.a.r[].^b)) and empty(arrayJoin(json.a.r[].^b.c)) and arrayJoin(json.a.r[].b.c.d_0.:Int64) is null;
-
-select json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0 from test format Null;
-select json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0 from test order by id format Null;
-select json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0.:Int64 from test format Null;
-select json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0.:Int64 from test order by id format Null;
-select json.a.r, json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0 from test format Null;
-select json.a.r, json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0 from test order by id format Null;
-select json.a.r, json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0.:Int64 from test format Null;
-select json.a.r, json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0.:Int64 from test order by id format Null;
-
-drop table test;
diff --git a/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_wide_merge_tree.reference.j2 b/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_wide_merge_tree.reference.j2
deleted file mode 100644
index 2fd3437e3d2..00000000000
--- a/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_wide_merge_tree.reference.j2
+++ /dev/null
@@ -1,60 +0,0 @@
-('a.a1','String')
-('a.a2','String')
-('a.a3','String')
-('a.a4','String')
-('a.a5','String')
-('a.a6','String')
-('a.a7','String')
-('a.a8','String')
-('a.b','Array(JSON)')
-('a.r','Array(JSON(max_dynamic_types=16, max_dynamic_paths=2))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-20000
-20000
-0
-0
-20000
-20000
-0
-0
-('a.a1','String')
-('a.a2','String')
-('a.a3','String')
-('a.a4','String')
-('a.a5','String')
-('a.a6','String')
-('a.a7','String')
-('a.a8','String')
-('a.b','Array(JSON)')
-('a.r','Array(JSON(max_dynamic_types=16, max_dynamic_paths=2))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-('b.c.d_0','Int64')
-('b.c.d_1','Int64')
-('b.c.d_2','Int64')
-('b.c.d_3','Int64')
-('b.c.d_4','Int64')
-('c.d.e','Array(Nullable(Int64))')
-20000
-20000
-0
-0
-20000
-20000
-0
-0
diff --git a/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_wide_merge_tree.sql.j2 b/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_wide_merge_tree.sql.j2
deleted file mode 100644
index c0f34a8ea61..00000000000
--- a/tests/queries/0_stateless/03208_array_of_json_read_subcolumns_2_wide_merge_tree.sql.j2
+++ /dev/null
@@ -1,59 +0,0 @@
--- Tags: no-fasttest, long, no-debug, no-tsan, no-asan, no-msan, no-ubsan
-
-set allow_experimental_json_type = 1;
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type = 1;
-
-set min_bytes_to_use_direct_io = 0; -- min_bytes_to_use_direct_io > 0 is broken
-
-create table test (id UInt64, json JSON(max_dynamic_paths=8, a.b Array(JSON))) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;
-
-insert into test select number, '{}' from numbers(10000);
-insert into test select number, toJSONString(map('a.b', arrayMap(x -> map('b.c.d_' || toString(x), number::UInt32, 'c.d.e', range((number + x) % 5 + 1)), range(number % 5 + 1)))) from numbers(10000, 10000);
-insert into test select number, toJSONString(map('a.r', arrayMap(x -> map('b.c.d_' || toString(x), number::UInt32, 'c.d.e', range((number + x) % 5 + 1)), range(number % 5 + 1)))) from numbers(20000, 10000);
-insert into test select number, toJSONString(map('a.a1', number, 'a.a2', number, 'a.a3', number, 'a.a4', number, 'a.a5', number, 'a.a6', number, 'a.a7', number, 'a.a8', number, 'a.r', arrayMap(x -> map('b.c.d_' || toString(x), number::UInt32, 'c.d.e', range((number + x) % 5 + 1)), range(number % 5 + 1)))) from numbers(30000, 10000);
-
-{% for merge_command in ['system stop merges test', 'system start merges test'] -%}
-
-{{ merge_command }};
-
-select distinct arrayJoin(JSONAllPathsWithTypes(json)) as paths_with_types from test order by paths_with_types;
-select distinct arrayJoin(JSONAllPathsWithTypes(arrayJoin(json.a.b))) as paths_with_types from test order by paths_with_types;
-select distinct arrayJoin(JSONAllPathsWithTypes(arrayJoin(json.a.r[]))) as paths_with_types from test order by paths_with_types;
-
-select json, json.a.b, json.a.b.c, json.a.b.c.d.e, json.a.b.b.c.d_0, json.a.b.b.c.d_1, json.a.b.b.c.d_2, json.a.b.b.c.d_3, json.a.b.b.c.d_4, json.a.r, json.a.r[], json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1, json.a.r[].b.c.d_2, json.a.r[].b.c.d_3, json.a.r[].b.c.d_4, json.^a, json.a.b.^b.c, json.a.r[].^b.c from test format Null;
-select json, json.a.b, json.a.b.c, json.a.b.c.d.e, json.a.b.b.c.d_0, json.a.b.b.c.d_1, json.a.b.b.c.d_2, json.a.b.b.c.d_3, json.a.b.b.c.d_4, json.a.r, json.a.r[], json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1, json.a.r[].b.c.d_2, json.a.r[].b.c.d_3, json.a.r[].b.c.d_4, json.^a, json.a.b.^b.c, json.a.r[].^b.c from test order by id format Null;
-select json.a.b, json.a.b.c, json.a.b.c.d.e, json.a.b.b.c.d_0, json.a.b.b.c.d_1, json.a.b.b.c.d_2, json.a.b.b.c.d_3, json.a.b.b.c.d_4, json.a.r, json.a.r[], json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1, json.a.r[].b.c.d_2, json.a.r[].b.c.d_3, json.a.r[].b.c.d_4, json.^a, json.a.b.^b.c, json.a.r[].^b.c from test format Null;
-select json.a.b, json.a.b.c, json.a.b.c.d.e, json.a.b.b.c.d_0, json.a.b.b.c.d_1, json.a.b.b.c.d_2, json.a.b.b.c.d_3, json.a.b.b.c.d_4, json.a.r, json.a.r[], json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1, json.a.r[].b.c.d_2, json.a.r[].b.c.d_3, json.a.r[].b.c.d_4, json.^a, json.a.b.^b.c, json.a.r[].^b.c from test order by id format Null;
-
-select count() from test where empty(json.a.r[].c.d.e) and empty(json.a.r[].b.c.d_0) and empty(json.a.r[].b.c.d_1);
-select count() from test where empty(json.a.r[].c.d.e.:`Array(Nullable(Int64))`) and empty(json.a.r[].b.c.d_0.:Int64) and empty(json.a.r[].b.c.d_1.:Int64);
-select count() from test where arrayJoin(json.a.r[].c.d.e) is null and arrayJoin(json.a.r[].b.c.d_0) is null and arrayJoin(json.a.r[].b.c.d_1) is null;
-select count() from test where arrayJoin(json.a.r[].c.d.e.:`Array(Nullable(Int64))`) is null and arrayJoin(json.a.r[].b.c.d_0.:Int64) is null and arrayJoin(json.a.r[].b.c.d_1.:Int64) is null;
-
-select json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1 from test format Null;
-select json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1 from test order by id format Null;
-select json.a.r[].c.d.e.:`Array(Nullable(Int64))`, json.a.r[].b.c.d_0.:Int64, json.a.r[].b.c.d_1.:Int64 from test format Null;
-select json.a.r[].c.d.e.:`Array(Nullable(Int64))`, json.a.r[].b.c.d_0.:Int64, json.a.r[].b.c.d_1.:Int64 from test order by id format Null;
-select json.a.r, json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1 from test format Null;
-select json.a.r, json.a.r[].c.d.e, json.a.r[].b.c.d_0, json.a.r[].b.c.d_1 from test order by id format Null;
-select json.a.r, json.a.r[].c.d.e.:`Array(Nullable(Int64))`, json.a.r[].b.c.d_0.:Int64, json.a.r[].b.c.d_1.:Int64 from test format Null;
-select json.a.r, json.a.r[].c.d.e.:`Array(Nullable(Int64))`, json.a.r[].b.c.d_0.:Int64, json.a.r[].b.c.d_1.:Int64 from test order by id format Null;
-
-select count() from test where empty(json.a.r[].^b) and empty(json.a.r[].^b.c) and empty(json.a.r[].b.c.d_0);
-select count() from test where empty(json.a.r[].^b) and empty(json.a.r[].^b.c) and empty(json.a.r[].b.c.d_0.:Int64);
-select count() from test where empty(arrayJoin(json.a.r[].^b)) and empty(arrayJoin(json.a.r[].^b.c)) and arrayJoin(json.a.r[].b.c.d_0) is null;
-select count() from test where empty(arrayJoin(json.a.r[].^b)) and empty(arrayJoin(json.a.r[].^b.c)) and arrayJoin(json.a.r[].b.c.d_0.:Int64) is null;
-
-select json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0 from test format Null;
-select json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0 from test order by id format Null;
-select json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0.:Int64 from test format Null;
-select json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0.:Int64 from test order by id format Null;
-select json.a.r, json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0 from test format Null;
-select json.a.r, json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0 from test order by id format Null;
-select json.a.r, json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0.:Int64 from test format Null;
-select json.a.r, json.a.r[].^b, json.a.r[].^b.c, json.a.r[].b.c.d_0.:Int64 from test order by id format Null;
-
-{% endfor -%}
-
-drop table test;
diff --git a/tests/queries/0_stateless/03208_buffer_over_distributed_type_mismatch.reference b/tests/queries/0_stateless/03208_buffer_over_distributed_type_mismatch.reference
deleted file mode 100644
index 1dc3acfeccb..00000000000
--- a/tests/queries/0_stateless/03208_buffer_over_distributed_type_mismatch.reference
+++ /dev/null
@@ -1,18 +0,0 @@
-100
-100
-101
-101
-101
-102
-101
-101
-102
-100
-100
-101
-101
-101
-102
-101
-101
-102
diff --git a/tests/queries/0_stateless/03208_buffer_over_distributed_type_mismatch.sql b/tests/queries/0_stateless/03208_buffer_over_distributed_type_mismatch.sql
deleted file mode 100644
index 333c445403d..00000000000
--- a/tests/queries/0_stateless/03208_buffer_over_distributed_type_mismatch.sql
+++ /dev/null
@@ -1,76 +0,0 @@
-
-DROP TABLE IF EXISTS realtimedrep;
-CREATE TABLE realtimedrep (`amount` Int32) ENGINE = MergeTree() ORDER BY tuple();
-INSERT INTO realtimedrep FORMAT Values (100);
-
-DROP TABLE IF EXISTS realtimedistributed;
-CREATE TABLE realtimedistributed (`amount` Int32) ENGINE = Distributed(test_cluster_two_shards, currentDatabase(), realtimedrep, rand());
-
-DROP TABLE IF EXISTS realtimebuff__fuzz_19;
-CREATE TABLE realtimebuff__fuzz_19 (`amount` UInt32) ENGINE = Buffer(currentDatabase(), 'realtimedistributed', 16, 3600, 36000, 10000, 1000000, 10000000, 100000000);
-INSERT INTO realtimebuff__fuzz_19 FORMAT Values (101);
-
-DROP TABLE IF EXISTS realtimebuff__fuzz_20;
-CREATE TABLE realtimebuff__fuzz_20 (`amount` Nullable(Int32)) ENGINE = Buffer(currentDatabase(), 'realtimedistributed', 16, 3600, 36000, 10000, 1000000, 10000000, 100000000);
-INSERT INTO realtimebuff__fuzz_20 FORMAT Values (101);
-
-SELECT amount FROM realtimebuff__fuzz_19 t1 ORDER BY ALL;
-SELECT amount + 1 FROM realtimebuff__fuzz_19 t1 ORDER BY ALL;
-SELECT amount + 1 FROM realtimebuff__fuzz_20 t1 ORDER BY ALL;
-SELECT sum(amount) = 100 FROM realtimebuff__fuzz_19 ORDER BY ALL; -- { serverError CANNOT_CONVERT_TYPE }
-SELECT sum(amount) = 100 FROM realtimebuff__fuzz_20 ORDER BY ALL; -- { serverError CANNOT_CONVERT_TYPE }
-
-SELECT amount FROM realtimebuff__fuzz_19 t1
-JOIN (SELECT number :: UInt32 AS amount FROM numbers(3) ) t2 ON t1.amount = t2.amount
-ORDER BY ALL
-SETTINGS allow_experimental_analyzer = 0; -- { serverError UNKNOWN_IDENTIFIER }
-
-SELECT amount FROM realtimebuff__fuzz_19 t1
-JOIN (SELECT number :: UInt32 AS amount FROM numbers(3) ) t2 ON t1.amount = t2.amount
-ORDER BY ALL
-SETTINGS allow_experimental_analyzer = 1;
-
-SELECT amount FROM realtimebuff__fuzz_19 t1
-JOIN (SELECT number :: UInt32 AS amount FROM numbers(300) ) t2 ON t1.amount = t2.amount
-ORDER BY ALL
-SETTINGS allow_experimental_analyzer = 0; -- { serverError UNKNOWN_IDENTIFIER }
-
-SELECT amount FROM realtimebuff__fuzz_19 t1
-JOIN (SELECT number :: UInt32 AS amount FROM numbers(300) ) t2 ON t1.amount = t2.amount
-ORDER BY ALL
-SETTINGS allow_experimental_analyzer = 1;
-
-SELECT t2.amount + 1 FROM (SELECT number :: UInt32 AS amount FROM numbers(300) ) t1
-JOIN realtimebuff__fuzz_19 t2 USING (amount)
-ORDER BY ALL
-;
-
-SELECT t2.amount + 1 FROM (SELECT number :: UInt32 AS amount FROM numbers(300) ) t1
-JOIN realtimebuff__fuzz_19 t2 ON t1.amount = t2.amount
-ORDER BY ALL
-;
-
-SELECT amount FROM realtimebuff__fuzz_19 t1
-JOIN realtimebuff__fuzz_19 t2 ON t1.amount = t2.amount
-; -- { serverError NOT_IMPLEMENTED,UNKNOWN_IDENTIFIER }
-
-SELECT amount FROM realtimebuff__fuzz_19 t1
-JOIN realtimebuff__fuzz_19 t2 ON t1.amount = t2.amount
-JOIN realtimebuff__fuzz_19 t3 ON t1.amount = t3.amount
-; -- { serverError NOT_IMPLEMENTED,AMBIGUOUS_COLUMN_NAME }
-
-
--- fuzzers:
-
-SELECT
-    toLowCardinality(1) + materialize(toLowCardinality(2))
-FROM realtimebuff__fuzz_19
-GROUP BY toLowCardinality(1)
-FORMAT Null
-;
-
-SELECT intDivOrZero(intDivOrZero(toLowCardinality(-128), toLowCardinality(-1)) = 0, materialize(toLowCardinality(4)))
-FROM realtimebuff__fuzz_19 GROUP BY materialize(toLowCardinality(-127)), intDivOrZero(0, 0) = toLowCardinality(toLowCardinality(0))
-WITH TOTALS ORDER BY ALL DESC NULLS FIRST
-FORMAT Null
-;
diff --git a/tests/queries/0_stateless/03208_multiple_joins_with_storage_join.reference b/tests/queries/0_stateless/03208_multiple_joins_with_storage_join.reference
deleted file mode 100644
index 5ebdaa1c81f..00000000000
--- a/tests/queries/0_stateless/03208_multiple_joins_with_storage_join.reference
+++ /dev/null
@@ -1,23 +0,0 @@
------
-1	1	1	a	1	A	1	A
-2	2	2	b	2	B	2	B
------
-\N	\N	\N		0		3	B
-1	1	1	a	1	A	1	A
-2	2	2	b	2	B	2	B
------
-1	1	1	a	1	A	1	A
-2	2	2	b	2	B	2	B
-\N	\N	\N	\N	3	B	\N	\N
-\N	\N	\N	\N	\N	\N	3	B
------
-\N	\N	\N		3	3	B	0	0	
-\N	\N	\N		0	0		3	3	B
-1	1	1	a	1	1	A	1	1	A
-2	2	2	b	2	2	B	2	2	B
------
-3	3	\N		B	B
-1	1	1	a	A	A
-2	2	2	b	B	B
------
-7
diff --git a/tests/queries/0_stateless/03208_multiple_joins_with_storage_join.sql b/tests/queries/0_stateless/03208_multiple_joins_with_storage_join.sql
deleted file mode 100644
index 83be4c3f1d2..00000000000
--- a/tests/queries/0_stateless/03208_multiple_joins_with_storage_join.sql
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/env -S ${HOME}/clickhouse-client --queries-file
-
-DROP TABLE IF EXISTS tab;
-CREATE TABLE tab ( `k` Nullable(UInt32), `k1` Nullable(UInt32), `k2` Nullable(UInt32), `v` String ) ENGINE = Memory;
-INSERT INTO tab VALUES (1, 1, 1, 'a'), (2, 2, 2, 'b');
-
-DROP TABLE IF EXISTS mem;
-CREATE TABLE mem ( `k` UInt64, `v` String ) ENGINE = Join(ANY, LEFT, k);
-INSERT INTO mem VALUES (1, 'A'), (2, 'B'), (3, 'B');
-
-DROP TABLE IF EXISTS mem2;
-CREATE TABLE mem2 ( `k` UInt64, `v` String ) ENGINE = Join(ANY, RIGHT, k);
-INSERT INTO mem2 VALUES (1, 'A'), (2, 'B'), (3, 'B');
-
-DROP TABLE IF EXISTS mem3;
-CREATE TABLE mem3 ( `k` UInt64, `v` String ) ENGINE = Join(ALL, FULL, k) SETTINGS join_use_nulls = 1;
-INSERT INTO mem3 VALUES (1, 'A'), (2, 'B'), (3, 'B');
-
-DROP TABLE IF EXISTS mem4;
-CREATE TABLE mem4 ( `k1` UInt64, `k2` UInt64, `v` String ) ENGINE = Join(ALL, FULL, k1, k2);
-INSERT INTO mem4 VALUES (1, 1, 'A'), (2, 2, 'B'), (3, 3, 'B');
-
-SET allow_experimental_analyzer = 1;
-
-SELECT '-----';
-
-SELECT *
-FROM tab
-ANY LEFT JOIN mem ON k1 = mem.k
-ANY LEFT JOIN mem AS t ON k2 = t.k
-ORDER BY tab.v
-;
-
-SELECT '-----';
-
-SELECT *
-FROM tab
-ANY LEFT JOIN mem ON k1 = mem.k
-ANY RIGHT JOIN mem2 ON k2 = mem2.k
-ORDER BY tab.v
-;
-
-SELECT '-----';
-
-SELECT *
-FROM tab
-FULL JOIN mem3 AS t1 ON k1 = t1.k
-FULL JOIN mem3 AS t2 ON k2 = t2.k
-ORDER BY tab.v
-SETTINGS join_use_nulls = 1
-;
-SELECT '-----';
-
-SELECT *
-FROM tab
-FULL JOIN mem4 AS t1 ON tab.k1 = t1.k1 AND tab.k2 = t1.k2
-FULL JOIN mem4 AS t2 ON tab.k1 = t2.k1 AND tab.k2 = t2.k2
-ORDER BY tab.v
-;
-
-SELECT '-----';
-
-SELECT *
-FROM tab
-FULL JOIN mem4 AS t1 USING (k1, k2)
-FULL JOIN mem4 AS t2 USING (k1, k2)
-ORDER BY tab.v
-;
-
-SELECT '-----';
-
-SELECT count() FROM (
-    EXPLAIN PLAN
-    SELECT * FROM tab
-    ANY LEFT JOIN mem AS t1 ON tab.k = t1.k
-    ANY LEFT JOIN mem AS t2 ON tab.k = t2.k
-    ANY LEFT JOIN mem AS t3 ON tab.k = t3.k
-    ANY LEFT JOIN mem AS t4 ON tab.k = t4.k
-    ANY RIGHT JOIN mem2 AS t5 ON tab.k = t5.k
-    ANY LEFT JOIN mem AS t6 ON tab.k = t6.k
-    ANY LEFT JOIN mem AS t7 ON tab.k = t7.k
-)
-WHERE explain like '%FilledJoin%'
-;
diff --git a/tests/queries/0_stateless/03208_numbers_total_rows_approx.reference b/tests/queries/0_stateless/03208_numbers_total_rows_approx.reference
deleted file mode 100644
index 0cfbf08886f..00000000000
--- a/tests/queries/0_stateless/03208_numbers_total_rows_approx.reference
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/queries/0_stateless/03208_numbers_total_rows_approx.sql b/tests/queries/0_stateless/03208_numbers_total_rows_approx.sql
deleted file mode 100644
index 7855dfb6207..00000000000
--- a/tests/queries/0_stateless/03208_numbers_total_rows_approx.sql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT number FROM numbers(2, 1) WHERE number % 2 = 0 SETTINGS max_rows_to_read = 10;
diff --git a/tests/queries/0_stateless/03209_json_type_horizontal_merges.reference.j2 b/tests/queries/0_stateless/03209_json_type_horizontal_merges.reference.j2
deleted file mode 100644
index ea4e1da7181..00000000000
--- a/tests/queries/0_stateless/03209_json_type_horizontal_merges.reference.j2
+++ /dev/null
@@ -1,136 +0,0 @@
-create table test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_columns_to_activate=10;
-Dynamic paths
-100000	a
-90000	b
-80000	c
-70000	d
-60000	e
-Shared data paths
-Dynamic paths
-100000	a
-90000	b
-80000	c
-Shared data paths
-70000	d
-60000	e
-Dynamic paths
-200000	f
-100000	a
-90000	b
-80000	c
-Shared data paths
-70000	d
-60000	e
-Dynamic paths
-200000	f
-100000	a
-90000	b
-Shared data paths
-80000	c
-70000	d
-60000	e
-Dynamic paths
-200000	f
-100000	a
-90000	b
-10000	g
-Shared data paths
-80000	c
-70000	d
-60000	e
-Dynamic paths
-200000	f
-100000	a
-90000	b
-Shared data paths
-80000	c
-70000	d
-60000	e
-10000	g
-Dynamic paths
-200000	f
-100000	a
-90000	b
-40000	c
-Shared data paths
-80000	c
-70000	d
-60000	e
-10000	g
-Dynamic paths
-200000	f
-120000	c
-100000	a
-Shared data paths
-90000	b
-70000	d
-60000	e
-10000	g
-create table test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_columns_to_activate=10;
-Dynamic paths
-100000	a
-90000	b
-80000	c
-70000	d
-60000	e
-Shared data paths
-Dynamic paths
-100000	a
-90000	b
-80000	c
-Shared data paths
-70000	d
-60000	e
-Dynamic paths
-200000	f
-100000	a
-90000	b
-80000	c
-Shared data paths
-70000	d
-60000	e
-Dynamic paths
-200000	f
-100000	a
-90000	b
-Shared data paths
-80000	c
-70000	d
-60000	e
-Dynamic paths
-200000	f
-100000	a
-90000	b
-10000	g
-Shared data paths
-80000	c
-70000	d
-60000	e
-Dynamic paths
-200000	f
-100000	a
-90000	b
-Shared data paths
-80000	c
-70000	d
-60000	e
-10000	g
-Dynamic paths
-200000	f
-100000	a
-90000	b
-40000	c
-Shared data paths
-80000	c
-70000	d
-60000	e
-10000	g
-Dynamic paths
-200000	f
-120000	c
-100000	a
-Shared data paths
-90000	b
-70000	d
-60000	e
-10000	g
diff --git a/tests/queries/0_stateless/03209_json_type_horizontal_merges.sql.j2 b/tests/queries/0_stateless/03209_json_type_horizontal_merges.sql.j2
deleted file mode 100644
index cc143e4ceef..00000000000
--- a/tests/queries/0_stateless/03209_json_type_horizontal_merges.sql.j2
+++ /dev/null
@@ -1,74 +0,0 @@
--- Tags: no-fasttest, long, no-debug, no-tsan, no-asan, no-msan, no-ubsan
-
-set allow_experimental_json_type = 1;
-
-drop table if exists test;
-
-{% for create_command in ['create table test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_columns_to_activate=10;',
-                         'create table test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_columns_to_activate=10;'] -%}
-
-select '{{ create_command }}';
-
-{{ create_command }}
-
-system stop merges test;
-insert into test select number, toJSONString(map('a', number)) from numbers(100000);
-insert into test select number, toJSONString(map('b', number)) from numbers(90000);
-insert into test select number, toJSONString(map('c', number)) from numbers(80000);
-insert into test select number, toJSONString(map('d', number)) from numbers(70000);
-insert into test select number, toJSONString(map('e', number)) from numbers(60000);
-insert into test select number, '{}' from numbers(100000);
-
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-
-system stop merges test;
-insert into test select number, toJSONString(map('f', number)) from numbers(200000);
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-
-system stop merges test;
-insert into test select number, toJSONString(map('g', number)) from numbers(10000);
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-
-system stop merges test;
-insert into test select number, toJSONString(map('c', number)) from numbers(40000);
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-
-drop table test;
-
-{% endfor -%}
diff --git a/tests/queries/0_stateless/03209_json_type_merges_small.reference.j2 b/tests/queries/0_stateless/03209_json_type_merges_small.reference.j2
deleted file mode 100644
index f953dee10fe..00000000000
--- a/tests/queries/0_stateless/03209_json_type_merges_small.reference.j2
+++ /dev/null
@@ -1,272 +0,0 @@
-create table test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_columns_to_activate=10;
-Dynamic paths
-10	a
-9	b
-8	c
-7	d
-6	e
-Shared data paths
-Dynamic paths
-10	a
-9	b
-8	c
-Shared data paths
-7	d
-6	e
-Dynamic paths
-20	f
-10	a
-9	b
-8	c
-Shared data paths
-7	d
-6	e
-Dynamic paths
-20	f
-10	a
-9	b
-Shared data paths
-8	c
-7	d
-6	e
-Dynamic paths
-20	f
-10	a
-9	b
-1	g
-Shared data paths
-8	c
-7	d
-6	e
-Dynamic paths
-20	f
-10	a
-9	b
-Shared data paths
-8	c
-7	d
-6	e
-1	g
-Dynamic paths
-20	f
-10	a
-9	b
-4	c
-Shared data paths
-8	c
-7	d
-6	e
-1	g
-Dynamic paths
-20	f
-12	c
-10	a
-Shared data paths
-9	b
-7	d
-6	e
-1	g
-create table test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_columns_to_activate=10;
-Dynamic paths
-10	a
-9	b
-8	c
-7	d
-6	e
-Shared data paths
-Dynamic paths
-10	a
-9	b
-8	c
-Shared data paths
-7	d
-6	e
-Dynamic paths
-20	f
-10	a
-9	b
-8	c
-Shared data paths
-7	d
-6	e
-Dynamic paths
-20	f
-10	a
-9	b
-Shared data paths
-8	c
-7	d
-6	e
-Dynamic paths
-20	f
-10	a
-9	b
-1	g
-Shared data paths
-8	c
-7	d
-6	e
-Dynamic paths
-20	f
-10	a
-9	b
-Shared data paths
-8	c
-7	d
-6	e
-1	g
-Dynamic paths
-20	f
-10	a
-9	b
-4	c
-Shared data paths
-8	c
-7	d
-6	e
-1	g
-Dynamic paths
-20	f
-12	c
-10	a
-Shared data paths
-9	b
-7	d
-6	e
-1	g
-create table test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_columns_to_activate=1;
-Dynamic paths
-10	a
-9	b
-8	c
-7	d
-6	e
-Shared data paths
-Dynamic paths
-10	a
-9	b
-8	c
-Shared data paths
-7	d
-6	e
-Dynamic paths
-20	f
-10	a
-9	b
-8	c
-Shared data paths
-7	d
-6	e
-Dynamic paths
-20	f
-10	a
-9	b
-Shared data paths
-8	c
-7	d
-6	e
-Dynamic paths
-20	f
-10	a
-9	b
-1	g
-Shared data paths
-8	c
-7	d
-6	e
-Dynamic paths
-20	f
-10	a
-9	b
-Shared data paths
-8	c
-7	d
-6	e
-1	g
-Dynamic paths
-20	f
-10	a
-9	b
-4	c
-Shared data paths
-8	c
-7	d
-6	e
-1	g
-Dynamic paths
-20	f
-12	c
-10	a
-Shared data paths
-9	b
-7	d
-6	e
-1	g
-create table test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_columns_to_activate=1;
-Dynamic paths
-10	a
-9	b
-8	c
-7	d
-6	e
-Shared data paths
-Dynamic paths
-10	a
-9	b
-8	c
-Shared data paths
-7	d
-6	e
-Dynamic paths
-20	f
-10	a
-9	b
-8	c
-Shared data paths
-7	d
-6	e
-Dynamic paths
-20	f
-10	a
-9	b
-Shared data paths
-8	c
-7	d
-6	e
-Dynamic paths
-20	f
-10	a
-9	b
-1	g
-Shared data paths
-8	c
-7	d
-6	e
-Dynamic paths
-20	f
-10	a
-9	b
-Shared data paths
-8	c
-7	d
-6	e
-1	g
-Dynamic paths
-20	f
-10	a
-9	b
-4	c
-Shared data paths
-8	c
-7	d
-6	e
-1	g
-Dynamic paths
-20	f
-12	c
-10	a
-Shared data paths
-9	b
-7	d
-6	e
-1	g
diff --git a/tests/queries/0_stateless/03209_json_type_merges_small.sql.j2 b/tests/queries/0_stateless/03209_json_type_merges_small.sql.j2
deleted file mode 100644
index e4b64ac7561..00000000000
--- a/tests/queries/0_stateless/03209_json_type_merges_small.sql.j2
+++ /dev/null
@@ -1,76 +0,0 @@
--- Tags: no-fasttest, long, no-debug, no-tsan, no-asan, no-msan, no-ubsan
-
-set allow_experimental_json_type = 1;
-
-drop table if exists test;
-
-{% for create_command in ['create table test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_columns_to_activate=10;',
-                         'create table test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_columns_to_activate=10;',
-                         'create table test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_columns_to_activate=1;',
-                         'create table test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_columns_to_activate=1;'] -%}
-
-select '{{ create_command }}';
-
-{{ create_command }}
-
-system stop merges test;
-insert into test select number, toJSONString(map('a', number)) from numbers(10);
-insert into test select number, toJSONString(map('b', number)) from numbers(9);
-insert into test select number, toJSONString(map('c', number)) from numbers(8);
-insert into test select number, toJSONString(map('d', number)) from numbers(7);
-insert into test select number, toJSONString(map('e', number)) from numbers(6);
-insert into test select number, '{}' from numbers(100000);
-
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-
-system stop merges test;
-insert into test select number, toJSONString(map('f', number)) from numbers(20);
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-
-system stop merges test;
-insert into test select number, toJSONString(map('g', number)) from numbers(1);
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-
-system stop merges test;
-insert into test select number, toJSONString(map('c', number)) from numbers(4);
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-
-drop table test;
-
-{% endfor -%}
diff --git a/tests/queries/0_stateless/03209_json_type_vertical_merges.reference.j2 b/tests/queries/0_stateless/03209_json_type_vertical_merges.reference.j2
deleted file mode 100644
index d292b1454c6..00000000000
--- a/tests/queries/0_stateless/03209_json_type_vertical_merges.reference.j2
+++ /dev/null
@@ -1,136 +0,0 @@
-create table test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_columns_to_activate=1;
-Dynamic paths
-100000	a
-90000	b
-80000	c
-70000	d
-60000	e
-Shared data paths
-Dynamic paths
-100000	a
-90000	b
-80000	c
-Shared data paths
-70000	d
-60000	e
-Dynamic paths
-200000	f
-100000	a
-90000	b
-80000	c
-Shared data paths
-70000	d
-60000	e
-Dynamic paths
-200000	f
-100000	a
-90000	b
-Shared data paths
-80000	c
-70000	d
-60000	e
-Dynamic paths
-200000	f
-100000	a
-90000	b
-10000	g
-Shared data paths
-80000	c
-70000	d
-60000	e
-Dynamic paths
-200000	f
-100000	a
-90000	b
-Shared data paths
-80000	c
-70000	d
-60000	e
-10000	g
-Dynamic paths
-200000	f
-100000	a
-90000	b
-40000	c
-Shared data paths
-80000	c
-70000	d
-60000	e
-10000	g
-Dynamic paths
-200000	f
-120000	c
-100000	a
-Shared data paths
-90000	b
-70000	d
-60000	e
-10000	g
-create table test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_columns_to_activate=1;
-Dynamic paths
-100000	a
-90000	b
-80000	c
-70000	d
-60000	e
-Shared data paths
-Dynamic paths
-100000	a
-90000	b
-80000	c
-Shared data paths
-70000	d
-60000	e
-Dynamic paths
-200000	f
-100000	a
-90000	b
-80000	c
-Shared data paths
-70000	d
-60000	e
-Dynamic paths
-200000	f
-100000	a
-90000	b
-Shared data paths
-80000	c
-70000	d
-60000	e
-Dynamic paths
-200000	f
-100000	a
-90000	b
-10000	g
-Shared data paths
-80000	c
-70000	d
-60000	e
-Dynamic paths
-200000	f
-100000	a
-90000	b
-Shared data paths
-80000	c
-70000	d
-60000	e
-10000	g
-Dynamic paths
-200000	f
-100000	a
-90000	b
-40000	c
-Shared data paths
-80000	c
-70000	d
-60000	e
-10000	g
-Dynamic paths
-200000	f
-120000	c
-100000	a
-Shared data paths
-90000	b
-70000	d
-60000	e
-10000	g
diff --git a/tests/queries/0_stateless/03209_json_type_vertical_merges.sql.j2 b/tests/queries/0_stateless/03209_json_type_vertical_merges.sql.j2
deleted file mode 100644
index e427db7677f..00000000000
--- a/tests/queries/0_stateless/03209_json_type_vertical_merges.sql.j2
+++ /dev/null
@@ -1,74 +0,0 @@
--- Tags: no-fasttest, long, no-debug, no-tsan, no-asan, no-msan, no-ubsan
-
-set allow_experimental_json_type = 1;
-
-drop table if exists test;
-
-{% for create_command in ['create table test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_columns_to_activate=1;',
-                         'create table test (id UInt64, json JSON(max_dynamic_paths=3)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_columns_to_activate=1;'] -%}
-
-select '{{ create_command }}';
-
-{{ create_command }}
-
-system stop merges test;
-insert into test select number, toJSONString(map('a', number)) from numbers(100000);
-insert into test select number, toJSONString(map('b', number)) from numbers(90000);
-insert into test select number, toJSONString(map('c', number)) from numbers(80000);
-insert into test select number, toJSONString(map('d', number)) from numbers(70000);
-insert into test select number, toJSONString(map('e', number)) from numbers(60000);
-insert into test select number, '{}' from numbers(100000);
-
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-
-system stop merges test;
-insert into test select number, toJSONString(map('f', number)) from numbers(200000);
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-
-system stop merges test;
-insert into test select number, toJSONString(map('g', number)) from numbers(10000);
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-
-system stop merges test;
-insert into test select number, toJSONString(map('c', number)) from numbers(40000);
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(json)) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(json)) as path from test group by path order by count() desc, path;
-
-drop table test;
-
-{% endfor -%}
diff --git a/tests/queries/0_stateless/03209_parallel_replicas_lost_decimal_conversion.reference b/tests/queries/0_stateless/03209_parallel_replicas_lost_decimal_conversion.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03209_parallel_replicas_lost_decimal_conversion.sql b/tests/queries/0_stateless/03209_parallel_replicas_lost_decimal_conversion.sql
deleted file mode 100644
index bcc9dec306b..00000000000
--- a/tests/queries/0_stateless/03209_parallel_replicas_lost_decimal_conversion.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-DROP TABLE IF EXISTS t_03209 SYNC;
-
-CREATE TABLE t_03209 ( `a` Decimal(18, 0), `b` Decimal(18, 1), `c` Decimal(36, 0) ) ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_03209', 'r1') ORDER BY tuple();
-INSERT INTO t_03209 VALUES ('33', '44.4', '35');
-
-SET max_parallel_replicas = 2, cluster_for_parallel_replicas='parallel_replicas';
-
-SELECT * FROM t_03209 WHERE a IN toDecimal32('33.3000', 4) SETTINGS allow_experimental_parallel_reading_from_replicas=0;
-SELECT * FROM t_03209 WHERE a IN toDecimal32('33.3000', 4) SETTINGS allow_experimental_parallel_reading_from_replicas=1;
-
-DROP TABLE t_03209 SYNC;
diff --git a/tests/queries/0_stateless/03209_parallel_replicas_order_by_all.reference b/tests/queries/0_stateless/03209_parallel_replicas_order_by_all.reference
deleted file mode 100644
index fd453d088a6..00000000000
--- a/tests/queries/0_stateless/03209_parallel_replicas_order_by_all.reference
+++ /dev/null
@@ -1,12 +0,0 @@
--- { echoOn }
-SELECT a, b, all FROM order_by_all ORDER BY all SETTINGS enable_order_by_all = 0, allow_experimental_parallel_reading_from_replicas=0;
-B	3	10
-D	1	20
-A	2	30
-C	\N	40
-SELECT a, b, all FROM order_by_all ORDER BY all SETTINGS enable_order_by_all = 0, allow_experimental_parallel_reading_from_replicas=1;
-B	3	10
-D	1	20
-A	2	30
-C	\N	40
-DROP TABLE order_by_all SYNC;
diff --git a/tests/queries/0_stateless/03209_parallel_replicas_order_by_all.sql b/tests/queries/0_stateless/03209_parallel_replicas_order_by_all.sql
deleted file mode 100644
index eb3cddbbe07..00000000000
--- a/tests/queries/0_stateless/03209_parallel_replicas_order_by_all.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-DROP TABLE IF EXISTS order_by_all SYNC;
-CREATE TABLE order_by_all
-(
-    a String,
-    b Nullable(Int32),
-    all UInt64
-)
-ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_03210', 'r1') ORDER BY tuple();
-
-INSERT INTO order_by_all VALUES ('B', 3, 10), ('C', NULL, 40), ('D', 1, 20), ('A', 2, 30);
-
-SET allow_experimental_parallel_reading_from_replicas=1, max_parallel_replicas=3, cluster_for_parallel_replicas='parallel_replicas';
-SET allow_experimental_analyzer=1; -- fix has been done only for the analyzer
-SET enable_order_by_all = 0;
-
--- { echoOn }
-SELECT a, b, all FROM order_by_all ORDER BY all SETTINGS enable_order_by_all = 0, allow_experimental_parallel_reading_from_replicas=0;
-SELECT a, b, all FROM order_by_all ORDER BY all SETTINGS enable_order_by_all = 0, allow_experimental_parallel_reading_from_replicas=1;
-
-DROP TABLE order_by_all SYNC;
diff --git a/tests/queries/0_stateless/03209_parameterized_view_with_non_literal_params.reference b/tests/queries/0_stateless/03209_parameterized_view_with_non_literal_params.reference
deleted file mode 100644
index e4e6c313b85..00000000000
--- a/tests/queries/0_stateless/03209_parameterized_view_with_non_literal_params.reference
+++ /dev/null
@@ -1,31 +0,0 @@
-Test with Date parameter
-1
-2
-1
-3
-3
-3
-2
-Test with Date32 parameter
-1
-2
-1
-3
-5
-3
-4
-Test with UUID parameter
-4
-3
-3
-1
-2
-Test with 2 parameters
-1
-1
-3
-3
-Test with IPv4
-1
-2
-3
diff --git a/tests/queries/0_stateless/03209_parameterized_view_with_non_literal_params.sql b/tests/queries/0_stateless/03209_parameterized_view_with_non_literal_params.sql
deleted file mode 100644
index 7fe84929910..00000000000
--- a/tests/queries/0_stateless/03209_parameterized_view_with_non_literal_params.sql
+++ /dev/null
@@ -1,99 +0,0 @@
-SET allow_experimental_analyzer = 1;
-select 'Test with Date parameter';
-
-drop table if exists date_table_pv;
-create table date_table_pv (id Int32, dt Date) engine = Memory();
-
-insert into date_table_pv values(1, today());
-insert into date_table_pv values(2, yesterday());
-insert into date_table_pv values(3, toDate('1974-04-07'));
-
-drop view if exists date_pv;
-create view date_pv as select * from date_table_pv where dt =  {dtparam:Date};
-
-select id from date_pv(dtparam=today());
-select id from date_pv(dtparam=yesterday());
-select id from date_pv(dtparam=yesterday()+1);
-select id from date_pv(dtparam='1974-04-07');
-select id from date_pv(dtparam=toDate('1974-04-07'));
-select id from date_pv(dtparam=toString(toDate('1974-04-07')));
-select id from date_pv(dtparam=toDate('1975-04-07'));
-select id from date_pv(dtparam=(select dt from date_table_pv where id = 2));
-
-select 'Test with Date32 parameter';
-
-drop table if exists date32_table_pv;
-create table date32_table_pv (id Int32, dt Date32) engine = Memory();
-
-insert into date32_table_pv values(1, today());
-insert into date32_table_pv values(2, yesterday());
-insert into date32_table_pv values(3, toDate32('2199-12-31'));
-insert into date32_table_pv values(4, toDate32('1950-12-25'));
-insert into date32_table_pv values(5, toDate32('1900-01-01'));
-
-drop view if exists date32_pv;
-create view date32_pv as select * from date32_table_pv where dt =  {dtparam:Date32};
-
-select id from date32_pv(dtparam=today());
-select id from date32_pv(dtparam=yesterday());
-select id from date32_pv(dtparam=yesterday()+1);
-select id from date32_pv(dtparam='2199-12-31');
-select id from date32_pv(dtparam=toDate32('1900-01-01'));
-select id from date32_pv(dtparam=(select dt from date32_table_pv where id = 3));
-select id from date32_pv(dtparam=(select dt from date32_table_pv where id = 4));
-
-
-select 'Test with UUID parameter';
-drop table if exists uuid_table_pv;
-create table uuid_table_pv (id Int32, uu UUID) engine = Memory();
-
-insert into uuid_table_pv values(1, generateUUIDv4());
-insert into uuid_table_pv values(2, generateUUIDv7());
-insert into uuid_table_pv values(3, toUUID('11111111-2222-3333-4444-555555555555'));
-insert into uuid_table_pv select 4, serverUUID();
-
-
-drop view if exists uuid_pv;
-create view uuid_pv as select * from uuid_table_pv where uu =  {uuidparam:UUID};
-select id from uuid_pv(uuidparam=serverUUID());
-select id from uuid_pv(uuidparam=toUUID('11111111-2222-3333-4444-555555555555'));
-select id from uuid_pv(uuidparam='11111111-2222-3333-4444-555555555555');
-select id from uuid_pv(uuidparam=(select uu from uuid_table_pv where id = 1));
-select id from uuid_pv(uuidparam=(select uu from uuid_table_pv where id = 2));
--- generateUUIDv4() is not constant foldable, hence cannot be used as parameter value
-select id from uuid_pv(uuidparam=generateUUIDv4()); -- { serverError UNKNOWN_QUERY_PARAMETER }
--- But nested "select generateUUIDv4()"  works!
-select id from uuid_pv(uuidparam=(select generateUUIDv4()));
-
-select 'Test with 2 parameters';
-
-drop view if exists date_pv2;
-create view date_pv2 as select * from date_table_pv where dt = {dtparam:Date} and id = {intparam:Int32};
-select id from date_pv2(dtparam=today(),intparam=1);
-select id from date_pv2(dtparam=today(),intparam=length('A'));
-select id from date_pv2(dtparam='1974-04-07',intparam=length('AAA'));
-select id from date_pv2(dtparam=toDate('1974-04-07'),intparam=length('BBB'));
-
-select 'Test with IPv4';
-
-drop table if exists ipv4_table_pv;
-create table ipv4_table_pv (id Int32, ipaddr IPv4) ENGINE = Memory();
-insert into ipv4_table_pv values (1, '116.106.34.242');
-insert into ipv4_table_pv values (2, '116.106.34.243');
-insert into ipv4_table_pv values (3, '116.106.34.244');
-
-drop view if exists ipv4_pv;
-create view ipv4_pv as select * from ipv4_table_pv where ipaddr = {ipv4param:IPv4};
-select id from ipv4_pv(ipv4param='116.106.34.242');
-select id from ipv4_pv(ipv4param=toIPv4('116.106.34.243'));
-select id from ipv4_pv(ipv4param=(select ipaddr from ipv4_table_pv where id=3));
-
-drop view date_pv;
-drop view date_pv2;
-drop view date32_pv;
-drop view uuid_pv;
-drop view ipv4_pv;
-drop table date_table_pv;
-drop table date32_table_pv;
-drop table uuid_table_pv;
-drop table ipv4_table_pv;
diff --git a/tests/queries/0_stateless/03210_dynamic_squashing.reference b/tests/queries/0_stateless/03210_dynamic_squashing.reference
deleted file mode 100644
index 1c23c22f550..00000000000
--- a/tests/queries/0_stateless/03210_dynamic_squashing.reference
+++ /dev/null
@@ -1,12 +0,0 @@
-1
-Array(UInt8)	true
-None	false
-UInt64	false
-2
-Array(UInt8)	true
-None	false
-UInt64	false
-3
-Array(UInt8)	true
-String	false
-UInt64	true
diff --git a/tests/queries/0_stateless/03210_dynamic_squashing.sql b/tests/queries/0_stateless/03210_dynamic_squashing.sql
deleted file mode 100644
index 71d09263fda..00000000000
--- a/tests/queries/0_stateless/03210_dynamic_squashing.sql
+++ /dev/null
@@ -1,25 +0,0 @@
--- Tags: long
-
-set allow_experimental_dynamic_type = 1;
-set max_block_size = 1000;
-
-drop table if exists test;
-
-create table test (d Dynamic) engine=MergeTree order by tuple();
-insert into test select multiIf(number < 1000, NULL::Dynamic(max_types=1), number < 3000, range(number % 5)::Dynamic(max_types=1), number::Dynamic(max_types=1)) from numbers(100000);
-select '1';
-select distinct dynamicType(d) as type, isDynamicElementInSharedData(d) as flag from test order by type;
-
-drop table test;
-create table test (d Dynamic(max_types=1)) engine=MergeTree order by tuple();
-insert into test select multiIf(number < 1000, NULL::Dynamic(max_types=1), number < 3000, range(number % 5)::Dynamic(max_types=1), number::Dynamic(max_types=1)) from numbers(100000);
-select '2';
-select distinct dynamicType(d) as type, isDynamicElementInSharedData(d) as flag from test order by type;
-
-truncate table test;
-insert into test select multiIf(number < 1000, 'Str'::Dynamic(max_types=1), number < 3000, range(number % 5)::Dynamic(max_types=1), number::Dynamic(max_types=1)) from numbers(100000);
-select '3';
-select distinct dynamicType(d) as type, isDynamicElementInSharedData(d) as flag from test order by type;
-
-drop table test;
-
diff --git a/tests/queries/0_stateless/03210_empty_tuple_lhs_of_in.reference b/tests/queries/0_stateless/03210_empty_tuple_lhs_of_in.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03210_empty_tuple_lhs_of_in.sql b/tests/queries/0_stateless/03210_empty_tuple_lhs_of_in.sql
deleted file mode 100644
index 0fc5f072da5..00000000000
--- a/tests/queries/0_stateless/03210_empty_tuple_lhs_of_in.sql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT tuple() IN tuple(1) SETTINGS allow_experimental_map_type = 1; -- { serverError INCORRECT_ELEMENT_OF_SET }
diff --git a/tests/queries/0_stateless/03210_fix_single_value_data_assertion.reference b/tests/queries/0_stateless/03210_fix_single_value_data_assertion.reference
deleted file mode 100644
index d8f7e13db55..00000000000
--- a/tests/queries/0_stateless/03210_fix_single_value_data_assertion.reference
+++ /dev/null
@@ -1,12 +0,0 @@
-0	1	1	1	0	0	0
-1	3	3	3	2	2	2
-2	5	5	5	4	4	4
-3	7	7	7	6	6	6
-4	9	9	9	8	8	8
-5	11	11	11	10	10	10
-6	13	13	13	12	12	12
-7	15	15	15	14	14	14
-8	17	17	17	16	16	16
-9	19	19	19	18	18	18
-
-0	107351244	107351244	107351244	107354520	107354520	107354520
diff --git a/tests/queries/0_stateless/03210_fix_single_value_data_assertion.sql b/tests/queries/0_stateless/03210_fix_single_value_data_assertion.sql
deleted file mode 100644
index a1243ef0b25..00000000000
--- a/tests/queries/0_stateless/03210_fix_single_value_data_assertion.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-SELECT
-    intDiv(number, 2) AS k,
-    sumArgMax(number, number % 20),
-    sumArgMax(number, leftPad(toString(number % 20), 5, '0')), -- Pad with 0 to preserve number ordering
-    sumArgMax(number, [number % 20, number % 20]),
-    sumArgMin(number, number % 20),
-    sumArgMin(number, leftPad(toString(number % 20), 5, '0')),
-    sumArgMin(number, [number % 20, number % 20]),
-FROM
-(
-    SELECT number
-    FROM system.numbers
-    LIMIT 65537
-)
-GROUP BY k
-    WITH TOTALS
-ORDER BY k ASC
-    LIMIT 10
-SETTINGS group_by_overflow_mode = 'any', totals_mode = 'before_having', max_rows_to_group_by = 100000;
diff --git a/tests/queries/0_stateless/03210_inconsistent_formatting_of_data_types.reference b/tests/queries/0_stateless/03210_inconsistent_formatting_of_data_types.reference
deleted file mode 100644
index 836b526905a..00000000000
--- a/tests/queries/0_stateless/03210_inconsistent_formatting_of_data_types.reference
+++ /dev/null
@@ -1,7 +0,0 @@
-ALTER TABLE columns_with_multiple_streams MODIFY COLUMN `field1` Nullable(tupleElement(x, 2), UInt8)
-ALTER TABLE t_update_empty_nested ADD COLUMN `nested.arr2` Array(tuple('- ON NULL -', toLowCardinality(11), 11, 11, toLowCardinality(11), 11), UInt64)
-ALTER TABLE t ADD COLUMN `x` Array(tuple(1), UInt8)
-ALTER TABLE enum_alter_issue MODIFY COLUMN `a` Enum8(equals('one', timeSlots(timeSlots(arrayEnumerateDense(tuple('0.2147483646', toLowCardinality(toUInt128)), NULL), 4, 12.34, materialize(73), 2)), 1))
-ALTER TABLE t_sparse_mutations_3 MODIFY COLUMN `s` Tuple(Nullable(tupleElement(s, 1), UInt64), Nullable(UInt64), Nullable(UInt64), Nullable(UInt64), Nullable(String))
-Syntax error
-Syntax error
diff --git a/tests/queries/0_stateless/03210_inconsistent_formatting_of_data_types.sh b/tests/queries/0_stateless/03210_inconsistent_formatting_of_data_types.sh
deleted file mode 100755
index 86c7a5469ca..00000000000
--- a/tests/queries/0_stateless/03210_inconsistent_formatting_of_data_types.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-# Ensure that these (possibly incorrect) queries can at least be parsed back after formatting.
-$CLICKHOUSE_FORMAT --oneline --query "ALTER TABLE columns_with_multiple_streams MODIFY COLUMN field1 Nullable(tupleElement(x, 2), UInt8)" | $CLICKHOUSE_FORMAT --oneline
-$CLICKHOUSE_FORMAT --oneline --query "ALTER TABLE t_update_empty_nested ADD COLUMN \`nested.arr2\` Array(tuple('- ON NULL -', toLowCardinality(11), 11, 11, toLowCardinality(11), 11), UInt64)" | $CLICKHOUSE_FORMAT --oneline
-$CLICKHOUSE_FORMAT --oneline --query "ALTER TABLE t ADD COLUMN x Array((1), UInt8)" | $CLICKHOUSE_FORMAT --oneline
-$CLICKHOUSE_FORMAT --oneline --query "ALTER TABLE enum_alter_issue (MODIFY COLUMN a Enum8(equals('one', timeSlots(timeSlots(arrayEnumerateDense(tuple('0.2147483646', toLowCardinality(toUInt128(12))), NULL), 4, 12.34, materialize(73), 2)), 1)))" | $CLICKHOUSE_FORMAT --oneline
-$CLICKHOUSE_FORMAT --oneline --query "ALTER TABLE t_sparse_mutations_3 MODIFY COLUMN s Tuple(Nullable(tupleElement(s, 1), UInt64), Nullable(UInt64), Nullable(UInt64), Nullable(UInt64), Nullable(String))" | $CLICKHOUSE_FORMAT --oneline
-
-# These invalid queries don't parse and this is normal.
-$CLICKHOUSE_FORMAT --oneline --query "ALTER TABLE alter_compression_codec1 MODIFY COLUMN alter_column CODEC((2 + ignore(1, toUInt128(materialize(2)), 2 + toNullable(toNullable(3))), 3), NONE)" 2>&1 | grep -o -F 'Syntax error'
-$CLICKHOUSE_FORMAT --oneline --query "ALTER TABLE test_table ADD COLUMN \`array\` Array(('110', 3, toLowCardinality(3), 3, toNullable(3), toLowCardinality(toNullable(3)), 3), UInt8) DEFAULT [1, 2, 3]" 2>&1 | grep -o -F 'Syntax error'
diff --git a/tests/queries/0_stateless/03210_json_type_alter_add_column.reference.j2 b/tests/queries/0_stateless/03210_json_type_alter_add_column.reference.j2
deleted file mode 100644
index 37b6854938a..00000000000
--- a/tests/queries/0_stateless/03210_json_type_alter_add_column.reference.j2
+++ /dev/null
@@ -1,72 +0,0 @@
-initial insert
-alter add column 1
-0	{}	\N	{}	\N	\N
-1	{}	\N	{}	\N	\N
-2	{}	\N	{}	\N	\N
-insert after alter add column
-3	a.b
-3	b.c
-3	c.d
-0	{}	\N	{}	\N	\N
-1	{}	\N	{}	\N	\N
-2	{}	\N	{}	\N	\N
-3	{"a":{"b":"3"}}	3	{"b":"3"}	\N	\N
-4	{"a":{"b":"4"}}	4	{"b":"4"}	\N	\N
-5	{"a":{"b":"5"}}	5	{"b":"5"}	\N	\N
-6	{"b":{"c":"6"}}	\N	{}	6	\N
-7	{"b":{"c":"7"}}	\N	{}	7	\N
-8	{"b":{"c":"8"}}	\N	{}	8	\N
-9	{"c":{"d":"9"}}	\N	{}	\N	9
-10	{"c":{"d":"10"}}	\N	{}	\N	10
-11	{"c":{"d":"11"}}	\N	{}	\N	11
-12	{}	\N	{}	\N	\N
-13	{}	\N	{}	\N	\N
-14	{}	\N	{}	\N	\N
-initial insert
-alter add column 1
-0	{}	\N	{}	\N	\N
-1	{}	\N	{}	\N	\N
-2	{}	\N	{}	\N	\N
-insert after alter add column
-3	a.b
-3	b.c
-3	c.d
-0	{}	\N	{}	\N	\N
-1	{}	\N	{}	\N	\N
-2	{}	\N	{}	\N	\N
-3	{"a":{"b":"3"}}	3	{"b":"3"}	\N	\N
-4	{"a":{"b":"4"}}	4	{"b":"4"}	\N	\N
-5	{"a":{"b":"5"}}	5	{"b":"5"}	\N	\N
-6	{"b":{"c":"6"}}	\N	{}	6	\N
-7	{"b":{"c":"7"}}	\N	{}	7	\N
-8	{"b":{"c":"8"}}	\N	{}	8	\N
-9	{"c":{"d":"9"}}	\N	{}	\N	9
-10	{"c":{"d":"10"}}	\N	{}	\N	10
-11	{"c":{"d":"11"}}	\N	{}	\N	11
-12	{}	\N	{}	\N	\N
-13	{}	\N	{}	\N	\N
-14	{}	\N	{}	\N	\N
-initial insert
-alter add column 1
-0	{}	\N	{}	\N	\N
-1	{}	\N	{}	\N	\N
-2	{}	\N	{}	\N	\N
-insert after alter add column
-3	a.b
-3	b.c
-3	c.d
-0	{}	\N	{}	\N	\N
-1	{}	\N	{}	\N	\N
-2	{}	\N	{}	\N	\N
-3	{"a":{"b":"3"}}	3	{"b":"3"}	\N	\N
-4	{"a":{"b":"4"}}	4	{"b":"4"}	\N	\N
-5	{"a":{"b":"5"}}	5	{"b":"5"}	\N	\N
-6	{"b":{"c":"6"}}	\N	{}	6	\N
-7	{"b":{"c":"7"}}	\N	{}	7	\N
-8	{"b":{"c":"8"}}	\N	{}	8	\N
-9	{"c":{"d":"9"}}	\N	{}	\N	9
-10	{"c":{"d":"10"}}	\N	{}	\N	10
-11	{"c":{"d":"11"}}	\N	{}	\N	11
-12	{}	\N	{}	\N	\N
-13	{}	\N	{}	\N	\N
-14	{}	\N	{}	\N	\N
diff --git a/tests/queries/0_stateless/03210_json_type_alter_add_column.sql.j2 b/tests/queries/0_stateless/03210_json_type_alter_add_column.sql.j2
deleted file mode 100644
index add57928804..00000000000
--- a/tests/queries/0_stateless/03210_json_type_alter_add_column.sql.j2
+++ /dev/null
@@ -1,34 +0,0 @@
--- Tags: no-fasttest, long
-
-set allow_experimental_dynamic_type = 1;
-set allow_experimental_variant_type = 1;
-set allow_experimental_json_type = 1;
-set use_variant_as_common_type = 1;
-
-drop table if exists test;
-
-{% for create_command in ['create table test (x UInt64) engine=Memory;',
-                          'create table test (x UInt64) engine=MergeTree order by x settings min_rows_for_wide_part=100000000, min_bytes_for_wide_part=1000000000;',
-                          'create table test (x UInt64) engine=MergeTree order by x settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;'] -%}
-
-{{ create_command }}
-
-select 'initial insert';
-insert into test select number from numbers(3);
-
-select 'alter add column 1';
-alter table test add column json JSON settings mutations_sync=1;
-select count(), arrayJoin(JSONAllPaths(json)) as path from test group by path order by count() desc, path;
-select x, json, json.a.b, json.^a, json.b.c.:Int64, json.c.d from test order by x;
-
-select 'insert after alter add column';
-insert into test select number, toJSONString(map('a.b', number::UInt32)) from numbers(3, 3);
-insert into test select number, toJSONString(map('b.c', number::UInt32)) from numbers(6, 3);
-insert into test select number, toJSONString(map('c.d', number::UInt32)) from numbers(9, 3);
-insert into test select number, '{}' from numbers(12, 3);
-select count(), arrayJoin(JSONAllPaths(json)) as path from test group by path order by count() desc, path;
-select x, json, json.a.b, json.^a, json.b.c.:Int64, json.c.d from test order by x;
-
-drop table test;
-
-{% endfor -%}
diff --git a/tests/queries/0_stateless/03210_lag_lead_inframe_types.reference b/tests/queries/0_stateless/03210_lag_lead_inframe_types.reference
deleted file mode 100644
index 4ecf7f56b07..00000000000
--- a/tests/queries/0_stateless/03210_lag_lead_inframe_types.reference
+++ /dev/null
@@ -1,56 +0,0 @@
-0
-1
-2
-2
-2
-2
-2
-2
-2
-2
-0
-1
-2
-3
-4
-5
-6
-7
-8
-9
-0
-1
-2
-2
-2
-2
-2
-2
-2
-2
-0
-1
-2
-3
-4
-5
-6
-7
-8
-9
-15	\N	3	15	15	15	15
-14	\N	2	10	10	10	154
-13	\N	2	10	10	10	143
-12	\N	2	10	10	10	14
-11	\N	2	10	10	10	12
-10	\N	2	10	10	10	10
-9	\N	1	5	5	5	99
-8	\N	1	5	5	5	88
-7	\N	1	5	5	5	9
-6	\N	1	5	5	5	7
-5	\N	1	5	5	5	5
-4	\N	0	0	0	0	44
-3	\N	0	0	0	0	33
-2	\N	0	0	0	0	4
-1	\N	0	0	0	0	2
-0	\N	0	0	0	0	0
diff --git a/tests/queries/0_stateless/03210_lag_lead_inframe_types.sql b/tests/queries/0_stateless/03210_lag_lead_inframe_types.sql
deleted file mode 100644
index cc6746e428f..00000000000
--- a/tests/queries/0_stateless/03210_lag_lead_inframe_types.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-SELECT lagInFrame(2::UInt128, 2, number) OVER w FROM numbers(10) WINDOW w AS (ORDER BY number);
-SELECT leadInFrame(2::UInt128, 2, number) OVER w FROM numbers(10) WINDOW w AS (ORDER BY number);
-SELECT lagInFrame(2::UInt64, 2, number) OVER w FROM numbers(10) WINDOW w AS (ORDER BY number);
-SELECT leadInFrame(2::UInt64, 2, number) OVER w FROM numbers(10) WINDOW w AS (ORDER BY number);
-
-SELECT
-    number,
-    YYYYMMDDToDate(1, toLowCardinality(11), max(YYYYMMDDToDate(YYYYMMDDToDate(toLowCardinality(1), 11, materialize(NULL), 19700101.1, 1, 27, 7, materialize(toUInt256(37)), 9, 19, 9), 1, toUInt128(11), NULL, 19700101.1, 1, 27, 7, 37, 9, 19, 9), toUInt256(30)) IGNORE NULLS OVER w, NULL, 19700101.1, toNullable(1), 27, materialize(7), 37, 9, 19, 9),
-    p,
-    pp,
-    lagInFrame(number, number - pp) OVER w AS lag2,
-    lagInFrame(number, number - pp, number * 11) OVER w AS lag,
-    leadInFrame(number, number - pp, number * 11) OVER w AS lead
-FROM
-(
-    SELECT
-        number,
-        intDiv(number, 5) AS p,
-        p * 5 AS pp
-    FROM numbers(16)
-)
-WHERE toLowCardinality(1)
-WINDOW w AS (PARTITION BY p ORDER BY number ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)
-ORDER BY number DESC NULLS LAST;
diff --git a/tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.reference b/tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.reference
deleted file mode 100644
index 0693acb9168..00000000000
--- a/tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.reference
+++ /dev/null
@@ -1,9 +0,0 @@
-03
-AggregateFunction(count, Nullable(UInt64))
-function_name: _CAST, function_type: ordinary, result_type: AggregateFunction(count, Nullable(UInt64))
-function_name: countStateIf, function_type: aggregate, result_type: AggregateFunction(count, UInt64)
-constant_value: \'AggregateFunction(count, Nullable(UInt64))\', constant_value_type: String
-AggregateFunction(uniq, Nullable(UInt64))
-010003000000007518F0A8E7830665
-function_name: uniqState, function_type: aggregate, result_type: AggregateFunction(uniq, Nullable(UInt64))
-----
diff --git a/tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.sql b/tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.sql
deleted file mode 100644
index 565a481940a..00000000000
--- a/tests/queries/0_stateless/03210_optimize_rewrite_aggregate_function_with_if_return_type_bug.sql
+++ /dev/null
@@ -1,39 +0,0 @@
-SET allow_experimental_analyzer = 1;
-
--- For function count, rewrite countState to countStateIf changes the type from AggregateFunction(count, Nullable(UInt64)) to AggregateFunction(count, UInt64)
--- We can cast AggregateFunction(count, UInt64) back to AggregateFunction(count, Nullable(UInt64)) with additional _CAST
-select hex(countState(if(toNullable(number % 2 = 0), number, null))) from numbers(5) settings optimize_rewrite_aggregate_function_with_if=1;
-select toTypeName(countState(if(toNullable(number % 2 = 0), number, null))) from numbers(5) settings optimize_rewrite_aggregate_function_with_if=1;
-select arrayStringConcat(arraySlice(splitByString(', ', trimLeft(explain)), 2), ', ') from (explain query tree select hex(countState(if(toNullable(number % 2 = 0), number, null))) from numbers(5) settings optimize_rewrite_aggregate_function_with_if=1) where explain like '%AggregateFunction%';
-
--- For function uniq, rewrite uniqState to uniqStateIf changes the type from AggregateFunction(uniq, Nullable(UInt64)) to AggregateFunction(uniq, UInt64)
--- We can't cast AggregateFunction(uniq, UInt64) back to AggregateFunction(uniq, Nullable(UInt64)) so rewrite is not happening.
-select toTypeName(uniqState(if(toNullable(number % 2 = 0), number, null))) from numbers(5) settings optimize_rewrite_aggregate_function_with_if=1;
-select hex(uniqState(if(toNullable(number % 2 = 0), number, null))) from numbers(5) settings optimize_rewrite_aggregate_function_with_if=1;
-select arrayStringConcat(arraySlice(splitByString(', ', trimLeft(explain)), 2), ', ') from (explain query tree select hex(uniqState(if(toNullable(number % 2 = 0), number, null))) from numbers(5) settings optimize_rewrite_aggregate_function_with_if=1) where explain like '%AggregateFunction%';
-
-select '----';
-
-CREATE TABLE a
-(
-    `a_id` String
-)
-ENGINE = MergeTree
-PARTITION BY tuple()
-ORDER BY tuple();
-
-
-CREATE TABLE b
-(
-    `b_id` AggregateFunction(uniq, Nullable(String))
-)
-ENGINE = AggregatingMergeTree
-PARTITION BY tuple()
-ORDER BY tuple();
-
-CREATE MATERIALIZED VIEW mv TO b
-(
-    `b_id` AggregateFunction(uniq, Nullable(String))
-)
-AS SELECT uniqState(if(a_id != '', a_id, NULL)) AS b_id
-FROM a;
diff --git a/tests/queries/0_stateless/03211_nested_json_merges.reference.j2 b/tests/queries/0_stateless/03211_nested_json_merges.reference.j2
deleted file mode 100644
index 9b6ed82abed..00000000000
--- a/tests/queries/0_stateless/03211_nested_json_merges.reference.j2
+++ /dev/null
@@ -1,136 +0,0 @@
-create table test (id UInt64, json JSON(max_dynamic_paths=4)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000;
-Dynamic paths
-300000	c
-150000	d
-Shared data paths
-Dynamic paths
-300000	c
-Shared data paths
-150000	d
-Dynamic paths
-600000	f
-300000	c
-150000	e
-Shared data paths
-150000	d
-Dynamic paths
-600000	f
-Shared data paths
-300000	c
-150000	d
-150000	e
-Dynamic paths
-600000	f
-450000	c
-Shared data paths
-300000	c
-150000	d
-150000	e
-Dynamic paths
-750000	c
-Shared data paths
-600000	f
-150000	d
-150000	e
-create table test (id UInt64, json JSON(max_dynamic_paths=4)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;
-Dynamic paths
-300000	c
-150000	d
-Shared data paths
-Dynamic paths
-300000	c
-Shared data paths
-150000	d
-Dynamic paths
-600000	f
-300000	c
-150000	e
-Shared data paths
-150000	d
-Dynamic paths
-600000	f
-Shared data paths
-300000	c
-150000	d
-150000	e
-Dynamic paths
-600000	f
-450000	c
-Shared data paths
-300000	c
-150000	d
-150000	e
-Dynamic paths
-750000	c
-Shared data paths
-600000	f
-150000	d
-150000	e
-create table test (id UInt64, json JSON(max_dynamic_paths=4)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;
-Dynamic paths
-300000	c
-150000	d
-Shared data paths
-Dynamic paths
-300000	c
-Shared data paths
-150000	d
-Dynamic paths
-600000	f
-300000	c
-150000	e
-Shared data paths
-150000	d
-Dynamic paths
-600000	f
-Shared data paths
-300000	c
-150000	d
-150000	e
-Dynamic paths
-600000	f
-450000	c
-Shared data paths
-300000	c
-150000	d
-150000	e
-Dynamic paths
-750000	c
-Shared data paths
-600000	f
-150000	d
-150000	e
-create table test (id UInt64, json JSON(max_dynamic_paths=4)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;
-Dynamic paths
-300000	c
-150000	d
-Shared data paths
-Dynamic paths
-300000	c
-Shared data paths
-150000	d
-Dynamic paths
-600000	f
-300000	c
-150000	e
-Shared data paths
-150000	d
-Dynamic paths
-600000	f
-Shared data paths
-300000	c
-150000	d
-150000	e
-Dynamic paths
-600000	f
-450000	c
-Shared data paths
-300000	c
-150000	d
-150000	e
-Dynamic paths
-750000	c
-Shared data paths
-600000	f
-150000	d
-150000	e
diff --git a/tests/queries/0_stateless/03211_nested_json_merges.sql.j2 b/tests/queries/0_stateless/03211_nested_json_merges.sql.j2
deleted file mode 100644
index 0af998e22bb..00000000000
--- a/tests/queries/0_stateless/03211_nested_json_merges.sql.j2
+++ /dev/null
@@ -1,63 +0,0 @@
--- Tags: no-fasttest, long, no-tsan, no-asan, no-msan, no-ubsan
-
-set allow_experimental_json_type = 1;
-
-drop table if exists test;
-
-{% for create_command in ['create table test (id UInt64, json JSON(max_dynamic_paths=4)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000;',
-                          'create table test (id UInt64, json JSON(max_dynamic_paths=4)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;',
-                          'create table test (id UInt64, json JSON(max_dynamic_paths=4)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;',
-                          'create table test (id UInt64, json JSON(max_dynamic_paths=4)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;'] -%}
-
-select '{{ create_command }}';
-
-{{ create_command }}
-
-system stop merges test;
-insert into test select number, toJSONString(map('a', number)) from numbers(100000);
-insert into test select number, toJSONString(map('b', arrayMap(x -> map('c', x), range(number % 5 + 1)))) from numbers(100000);
-insert into test select number, toJSONString(map('b', arrayMap(x -> map('d', x), range(number % 5 + 1)))) from numbers(50000);
-
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-
-system stop merges test;
-insert into test select number, toJSONString(map('b', arrayMap(x -> map('e', x), range(number % 5 + 1)))) from numbers(50000);
-insert into test select number, toJSONString(map('b', arrayMap(x -> map('f', x), range(number % 5 + 1)))) from numbers(200000);
-
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-
-system stop merges test;
-insert into test select number, toJSONString(map('b', arrayMap(x -> map('c', x), range(number % 5 + 1)))) from numbers(150000);
-
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-
-drop table test;
-
-{% endfor -%}
diff --git a/tests/queries/0_stateless/03211_nested_json_merges_small.reference.j2 b/tests/queries/0_stateless/03211_nested_json_merges_small.reference.j2
deleted file mode 100644
index 76339dba3e3..00000000000
--- a/tests/queries/0_stateless/03211_nested_json_merges_small.reference.j2
+++ /dev/null
@@ -1,136 +0,0 @@
-create table test (id UInt64, json JSON(max_dynamic_paths=4)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000;
-Dynamic paths
-30	c
-15	d
-Shared data paths
-Dynamic paths
-30	c
-Shared data paths
-15	d
-Dynamic paths
-60	f
-30	c
-15	e
-Shared data paths
-15	d
-Dynamic paths
-60	f
-Shared data paths
-30	c
-15	d
-15	e
-Dynamic paths
-60	f
-45	c
-Shared data paths
-30	c
-15	d
-15	e
-Dynamic paths
-75	c
-Shared data paths
-60	f
-15	d
-15	e
-create table test (id UInt64, json JSON(max_dynamic_paths=4)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;
-Dynamic paths
-30	c
-15	d
-Shared data paths
-Dynamic paths
-30	c
-Shared data paths
-15	d
-Dynamic paths
-60	f
-30	c
-15	e
-Shared data paths
-15	d
-Dynamic paths
-60	f
-Shared data paths
-30	c
-15	d
-15	e
-Dynamic paths
-60	f
-45	c
-Shared data paths
-30	c
-15	d
-15	e
-Dynamic paths
-75	c
-Shared data paths
-60	f
-15	d
-15	e
-create table test (id UInt64, json JSON(max_dynamic_paths=4)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;
-Dynamic paths
-30	c
-15	d
-Shared data paths
-Dynamic paths
-30	c
-Shared data paths
-15	d
-Dynamic paths
-60	f
-30	c
-15	e
-Shared data paths
-15	d
-Dynamic paths
-60	f
-Shared data paths
-30	c
-15	d
-15	e
-Dynamic paths
-60	f
-45	c
-Shared data paths
-30	c
-15	d
-15	e
-Dynamic paths
-75	c
-Shared data paths
-60	f
-15	d
-15	e
-create table test (id UInt64, json JSON(max_dynamic_paths=4)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;
-Dynamic paths
-30	c
-15	d
-Shared data paths
-Dynamic paths
-30	c
-Shared data paths
-15	d
-Dynamic paths
-60	f
-30	c
-15	e
-Shared data paths
-15	d
-Dynamic paths
-60	f
-Shared data paths
-30	c
-15	d
-15	e
-Dynamic paths
-60	f
-45	c
-Shared data paths
-30	c
-15	d
-15	e
-Dynamic paths
-75	c
-Shared data paths
-60	f
-15	d
-15	e
diff --git a/tests/queries/0_stateless/03211_nested_json_merges_small.sql.j2 b/tests/queries/0_stateless/03211_nested_json_merges_small.sql.j2
deleted file mode 100644
index 86e5a6c71c9..00000000000
--- a/tests/queries/0_stateless/03211_nested_json_merges_small.sql.j2
+++ /dev/null
@@ -1,63 +0,0 @@
--- Tags: no-fasttest, long, no-tsan, no-asan, no-msan, no-ubsan
-
-set allow_experimental_json_type = 1;
-
-drop table if exists test;
-
-{% for create_command in ['create table test (id UInt64, json JSON(max_dynamic_paths=4)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000;',
-                          'create table test (id UInt64, json JSON(max_dynamic_paths=4)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;',
-                          'create table test (id UInt64, json JSON(max_dynamic_paths=4)) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;',
-                          'create table test (id UInt64, json JSON(max_dynamic_paths=4)) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;'] -%}
-
-select '{{ create_command }}';
-
-{{ create_command }}
-
-system stop merges test;
-insert into test select number, toJSONString(map('a', number)) from numbers(10);
-insert into test select number, toJSONString(map('b', arrayMap(x -> map('c', x), range(number % 5 + 1)))) from numbers(10);
-insert into test select number, toJSONString(map('b', arrayMap(x -> map('d', x), range(number % 5 + 1)))) from numbers(5);
-
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-
-system stop merges test;
-insert into test select number, toJSONString(map('b', arrayMap(x -> map('e', x), range(number % 5 + 1)))) from numbers(5);
-insert into test select number, toJSONString(map('b', arrayMap(x -> map('f', x), range(number % 5 + 1)))) from numbers(20);
-
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-
-system stop merges test;
-insert into test select number, toJSONString(map('b', arrayMap(x -> map('c', x), range(number % 5 + 1)))) from numbers(15);
-
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-system start merges test;
-optimize table test final;
-select 'Dynamic paths';
-select count(), arrayJoin(JSONDynamicPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-select 'Shared data paths';
-select count(), arrayJoin(JSONSharedDataPaths(arrayJoin(json.b[]))) as path from test group by path order by count() desc, path;
-
-drop table test;
-
-{% endfor -%}
diff --git a/tests/queries/0_stateless/03212_max_bytes_to_read_for_schema_inference_in_cache.reference b/tests/queries/0_stateless/03212_max_bytes_to_read_for_schema_inference_in_cache.reference
deleted file mode 100644
index 026a7fa2c88..00000000000
--- a/tests/queries/0_stateless/03212_max_bytes_to_read_for_schema_inference_in_cache.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-x	Nullable(Int64)					
-schema_inference_hints=, max_rows_to_read_for_schema_inference=25000, max_bytes_to_read_for_schema_inference=1000, schema_inference_make_columns_nullable=1, try_infer_integers=true, try_infer_dates=true, try_infer_datetimes=true, try_infer_datetimes_only_datetime64=false, try_infer_numbers_from_strings=false, read_bools_as_numbers=true, read_bools_as_strings=true, read_objects_as_strings=true, read_numbers_as_strings=true, read_arrays_as_strings=true, try_infer_objects_as_tuples=true, infer_incomplete_types_as_strings=true, try_infer_objects=false, use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects=false
diff --git a/tests/queries/0_stateless/03212_max_bytes_to_read_for_schema_inference_in_cache.sh b/tests/queries/0_stateless/03212_max_bytes_to_read_for_schema_inference_in_cache.sh
deleted file mode 100755
index adbb0cb6de0..00000000000
--- a/tests/queries/0_stateless/03212_max_bytes_to_read_for_schema_inference_in_cache.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-echo '{"x" : 42}' > $CLICKHOUSE_TEST_UNIQUE_NAME.json
-$CLICKHOUSE_LOCAL -m -q "
-DESC file('$CLICKHOUSE_TEST_UNIQUE_NAME.json') SETTINGS input_format_max_bytes_to_read_for_schema_inference=1000; 
-SELECT additional_format_info from system.schema_inference_cache"
-
-rm $CLICKHOUSE_TEST_UNIQUE_NAME.json
-
diff --git a/tests/queries/0_stateless/03212_optimize_with_constraints_logical_error.reference b/tests/queries/0_stateless/03212_optimize_with_constraints_logical_error.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03212_optimize_with_constraints_logical_error.sql b/tests/queries/0_stateless/03212_optimize_with_constraints_logical_error.sql
deleted file mode 100644
index 16a27af986b..00000000000
--- a/tests/queries/0_stateless/03212_optimize_with_constraints_logical_error.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-DROP TABLE IF EXISTS test_table;
-CREATE TABLE test_table
-(
-    id UInt64,
-    value String
-) ENGINE=TinyLog;
-
-EXPLAIN SYNTAX
-WITH 1 AS compound_value SELECT * APPLY (x -> compound_value.*)
-FROM test_table WHERE x > 0
-SETTINGS convert_query_to_cnf = true, optimize_using_constraints = true, optimize_substitute_columns = true; -- { serverError UNKNOWN_IDENTIFIER }
-
-DROP TABLE test_table;
diff --git a/tests/queries/0_stateless/03212_thousand_exceptions.reference b/tests/queries/0_stateless/03212_thousand_exceptions.reference
deleted file mode 100644
index 2409ba16fcb..00000000000
--- a/tests/queries/0_stateless/03212_thousand_exceptions.reference
+++ /dev/null
@@ -1 +0,0 @@
-('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')('.')
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03212_thousand_exceptions.sh b/tests/queries/0_stateless/03212_thousand_exceptions.sh
deleted file mode 100755
index 1237cbf537f..00000000000
--- a/tests/queries/0_stateless/03212_thousand_exceptions.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# Tags: long
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-# This should not be too slow, even under sanitizers.
-yes "SELECT throwIf(1); SELECT '.' FORMAT Values;" | head -n 1000 | $CLICKHOUSE_CLIENT --ignore-error 2>/dev/null
diff --git a/tests/queries/0_stateless/03212_variant_dynamic_cast_or_default.reference b/tests/queries/0_stateless/03212_variant_dynamic_cast_or_default.reference
deleted file mode 100644
index fd16d020019..00000000000
--- a/tests/queries/0_stateless/03212_variant_dynamic_cast_or_default.reference
+++ /dev/null
@@ -1,516 +0,0 @@
-0	\N
-1	1
-0	str_2
-0	[0,1,2]
-0	\N
-5	5
-0	str_6
-0	[0,1,2,3,4,5,6]
-\N	\N
-1	1
-\N	str_2
-\N	[0,1,2]
-\N	\N
-5	5
-\N	str_6
-\N	[0,1,2,3,4,5,6]
-0	\N
-1	1
-0	str_2
-0	[0,1,2]
-0	\N
-5	5
-0	str_6
-0	[0,1,2,3,4,5,6]
-\N	\N
-1	1
-\N	str_2
-\N	[0,1,2]
-\N	\N
-5	5
-\N	str_6
-\N	[0,1,2,3,4,5,6]
--128
--127
--1
-0
-1
-2
-3
-126
-127
-0
-1
-2
-3
-126
-127
-254
-255
--32768
--32767
--128
--127
--1
-0
-1
-2
-3
-126
-127
-254
-255
-32766
-32767
-0
-1
-2
-3
-126
-127
-254
-255
-32766
-32767
-65534
-65535
--2147483648
--2147483647
--32768
--32767
--128
--127
--1
-0
-1
-2
-3
-126
-127
-254
-255
-32766
-32767
-65534
-65535
-2147483646
-2147483647
-0
-1
-2
-3
-126
-127
-254
-255
-32766
-32767
-65534
-65535
-2147483646
-2147483647
-3232235521
-4294967294
-4294967295
--9223372036854775808
--9223372036854775807
--2147483648
--2147483647
--32768
--32767
--128
--127
--1
-0
-1
-2
-3
-126
-127
-254
-255
-32766
-32767
-65534
-65535
-2147483646
-2147483647
-4294967294
-4294967295
-9223372036854775806
-9223372036854775807
-0
-1
-2
-3
-126
-127
-254
-255
-32766
-32767
-65534
-65535
-2147483646
-2147483647
-3232235521
-4294967294
-4294967295
-9223372036854775806
-9223372036854775807
-18446744073709551614
-18446744073709551615
--170141183460469231731687303715884105728
--170141183460469231731687303715884105727
--9223372036854775808
--9223372036854775807
--2147483648
--2147483647
--32768
--32767
--128
--127
--1
-0
-1
-2
-3
-126
-127
-254
-255
-32766
-32767
-65534
-65535
-2147483646
-2147483647
-4294967294
-4294967295
-9223372036854775806
-9223372036854775807
-18446744073709551614
-18446744073709551615
-170141183460469231731687303715884105726
-170141183460469231731687303715884105727
-0
-1
-2
-3
-126
-127
-254
-255
-32766
-32767
-65534
-65535
-2147483646
-2147483647
-3232235521
-4294967294
-4294967295
-9223372036854775806
-9223372036854775807
-18446744073709551614
-18446744073709551615
-170141183460469231731687303715884105726
-170141183460469231731687303715884105727
-296245801836096677496328508227807879401
-340282366920938463463374607431768211454
-340282366920938463463374607431768211455
--57896044618658097711785492504343953926634992332820282019728792003956564819968
--57896044618658097711785492504343953926634992332820282019728792003956564819967
--170141183460469231731687303715884105728
--170141183460469231731687303715884105727
--9223372036854775808
--9223372036854775807
--2147483648
--2147483647
--32768
--32767
--128
--127
--1
-0
-1
-2
-3
-126
-127
-254
-255
-32766
-32767
-65534
-65535
-2147483646
-2147483647
-4294967294
-4294967295
-9223372036854775806
-9223372036854775807
-18446744073709551614
-18446744073709551615
-170141183460469231731687303715884105726
-170141183460469231731687303715884105727
-340282366920938463463374607431768211454
-340282366920938463463374607431768211455
-57896044618658097711785492504343953926634992332820282019728792003956564819966
-57896044618658097711785492504343953926634992332820282019728792003956564819967
-0
-1
-2
-3
-126
-127
-254
-255
-32766
-32767
-65534
-65535
-2147483646
-2147483647
-3232235521
-4294967294
-4294967295
-9223372036854775806
-9223372036854775807
-18446744073709551614
-18446744073709551615
-170141183460469231731687303715884105726
-170141183460469231731687303715884105727
-340282366920938463463374607431768211454
-340282366920938463463374607431768211455
-57896044618658097711785492504343953926634992332820282019728792003956564819966
-57896044618658097711785492504343953926634992332820282019728792003956564819967
-115792089237316195423570985008687907853269984665640564039457584007913129639934
-115792089237316195423570985008687907853269984665640564039457584007913129639935
--inf
--3.4028233e38
--1.7014118e38
--9223372000000000000
--2147483600
--32768
--32767
--128
--127
--1
--1.1754942e-38
--1e-45
-0
-1e-45
-1.1754942e-38
-1
-2
-3
-126
-127
-254
-255
-32766
-32767
-65534
-65535
-3.4028233e38
-inf
-nan
--inf
--1.7976931348623157e308
--5.78960446186581e76
--3.40282347e38
--3.4028232635611926e38
--1.7014118346046923e38
--9223372036854776000
--2147483648
--2147483647
--32768
--32767
--128
--127
--1
--1.1754943499999998e-38
--1.1754942106924411e-38
--1.401298464324817e-45
--1.3999999999999999e-45
--2.2250738585072014e-308
-0
-2.2250738585072014e-308
-1.3999999999999999e-45
-1.401298464324817e-45
-1.1754942106924411e-38
-1.1754943499999998e-38
-1
-2
-3
-126
-127
-254
-255
-32766
-32767
-65534
-65535
-2147483646
-2147483647
-4294967294
-4294967295
-3.4028232635611926e38
-3.40282347e38
-1.7976931348623157e308
-inf
-nan
--32768
--32767
--128
--127
--1
-0
-1
-126
-127
-254
-255
-32766
-32767
-65534
-65535
--2147483648
--2147483647
--32768
--32767
--128
--127
--1
-0
-1
-126
-127
-254
-255
-32766
-32767
-65534
-65535
-2147483646
-2147483647
-4294967294
-4294967295
--9223372036854775808
--9223372036854775807
--18446744073709551.616
--2147483648
--2147483647
--32768
--32767
--128
--127
--1
-0
-1
-126
-127
-254
-255
-32766
-32767
-65534
-65535
-2147483646
-2147483647
-4294967294
-4294967295
-9223372036854775806
-9223372036854775807
-18446744073709551614
-18446744073709551615
--340282347000000000977176926486249829565.415
--9223372036854775808
--9223372036854775807
--18446744073709551.616
--2147483648
--2147483647
--32768
--32767
--128
--127
--1
-0
-1
-126
-127
-254
-255
-32766
-32767
-65534
-65535
-2147483646
-2147483647
-4294967294
-4294967295
-9223372036854775806
-9223372036854775807
-18446744073709551614
-18446744073709551615
-340282347000000000977176926486249829565.415
-1970-01-01
-1970-01-02
-1970-01-03
-1970-01-04
-1970-05-07
-1970-05-08
-1970-09-12
-1970-09-13
-2038-01-19
-2059-09-17
-2059-09-18
-2106-02-07
-2149-06-05
-2149-06-06
-2299-12-31
-2299-12-31
-1900-01-01
-1969-08-26
-1969-08-27
-1969-12-30
-1969-12-31
-1970-01-01
-1970-01-02
-1970-01-03
-1970-01-04
-1970-05-07
-1970-05-08
-1970-09-12
-1970-09-13
-2038-01-19
-2059-09-17
-2059-09-18
-2106-02-07
-2149-06-05
-2149-06-06
-2299-12-31
-1970-01-01 00:00:00
-1970-01-01 00:00:01
-1970-01-01 00:00:02
-1970-01-01 00:00:03
-1970-01-01 00:02:06
-1970-01-01 00:02:07
-1970-01-01 00:04:14
-1970-01-01 00:04:15
-1970-01-01 09:06:06
-1970-01-01 09:06:07
-1970-01-01 18:12:14
-1970-01-01 18:12:15
-2038-01-19 03:14:06
-2038-01-19 03:14:07
-2106-02-07 06:28:14
-2106-02-07 06:28:15
-0.0.0.0
-192.168.0.1
-::
-::1
-::ffff:192.168.0.1
-00000000-0000-0000-0000-000000000000
-dededdb6-7835-4ce4-8d11-b5de6f2820e9
diff --git a/tests/queries/0_stateless/03212_variant_dynamic_cast_or_default.sql b/tests/queries/0_stateless/03212_variant_dynamic_cast_or_default.sql
deleted file mode 100644
index f227bbdac77..00000000000
--- a/tests/queries/0_stateless/03212_variant_dynamic_cast_or_default.sql
+++ /dev/null
@@ -1,117 +0,0 @@
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type = 1;
-set allow_experimental_dynamic_type = 1;
-set allow_suspicious_low_cardinality_types = 1;
-set session_timezone = 'UTC';
-
-select accurateCastOrDefault(variant, 'UInt32'), multiIf(number % 4 == 0, NULL, number % 4 == 1, number, number % 4 == 2, 'str_' || toString(number), range(number)) as variant from numbers(8);
-select accurateCastOrNull(variant, 'UInt32'), multiIf(number % 4 == 0, NULL, number % 4 == 1, number, number % 4 == 2, 'str_' || toString(number), range(number)) as variant from numbers(8);
-
-select accurateCastOrDefault(dynamic, 'UInt32'), multiIf(number % 4 == 0, NULL, number % 4 == 1, number, number % 4 == 2, 'str_' || toString(number), range(number))::Dynamic as dynamic from numbers(8);
-select accurateCastOrNull(dynamic, 'UInt32'), multiIf(number % 4 == 0, NULL, number % 4 == 1, number, number % 4 == 2, 'str_' || toString(number), range(number))::Dynamic as dynamic from numbers(8);
-
-drop table if exists t;
-create table t (d Dynamic) engine=MergeTree order by tuple();
-
--- Integer types: signed and unsigned integers (UInt8, UInt16, UInt32, UInt64, UInt128, UInt256, Int8, Int16, Int32, Int64, Int128, Int256)
-INSERT INTO t VALUES (-128::Int8), (-127::Int8), (-1::Int8), (0::Int8), (1::Int8), (126::Int8), (127::Int8);
-INSERT INTO t VALUES (-128::Int8), (-127::Int8), (-1::Int8), (0::Int8), (1::Int8), (126::Int8), (127::Int8);
-INSERT INTO t VALUES (-128::Int8), (-127::Int8), (-1::Int8), (0::Int8), (1::Int8), (126::Int8), (127::Int8);
-INSERT INTO t VALUES (-32768::Int16), (-32767::Int16), (-1::Int16), (0::Int16), (1::Int16), (32766::Int16), (32767::Int16);
-INSERT INTO t VALUES (-2147483648::Int32), (-2147483647::Int32), (-1::Int32), (0::Int32), (1::Int32), (2147483646::Int32), (2147483647::Int32);
-INSERT INTO t VALUES (-9223372036854775808::Int64), (-9223372036854775807::Int64), (-1::Int64), (0::Int64), (1::Int64), (9223372036854775806::Int64), (9223372036854775807::Int64);
-INSERT INTO t VALUES (-170141183460469231731687303715884105728::Int128), (-170141183460469231731687303715884105727::Int128), (-1::Int128), (0::Int128), (1::Int128), (170141183460469231731687303715884105726::Int128), (170141183460469231731687303715884105727::Int128);
-INSERT INTO t VALUES (-57896044618658097711785492504343953926634992332820282019728792003956564819968::Int256), (-57896044618658097711785492504343953926634992332820282019728792003956564819967::Int256), (-1::Int256), (0::Int256), (1::Int256), (57896044618658097711785492504343953926634992332820282019728792003956564819966::Int256), (57896044618658097711785492504343953926634992332820282019728792003956564819967::Int256);
-
-INSERT INTO t VALUES (0::UInt8), (1::UInt8), (254::UInt8), (255::UInt8);
-INSERT INTO t VALUES (0::UInt16), (1::UInt16), (65534::UInt16), (65535::UInt16);
-INSERT INTO t VALUES (0::UInt32), (1::UInt32), (4294967294::UInt32), (4294967295::UInt32);
-INSERT INTO t VALUES (0::UInt64), (1::UInt64), (18446744073709551614::UInt64), (18446744073709551615::UInt64);
-INSERT INTO t VALUES (0::UInt128), (1::UInt128), (340282366920938463463374607431768211454::UInt128), (340282366920938463463374607431768211455::UInt128);
-INSERT INTO t VALUES (0::UInt256), (1::UInt256), (115792089237316195423570985008687907853269984665640564039457584007913129639934::UInt256), (115792089237316195423570985008687907853269984665640564039457584007913129639935::UInt256);
-
--- Floating-point numbers: floats(Float32 and Float64) values
-INSERT INTO t VALUES (1.17549435e-38::Float32), (3.40282347e+38::Float32), (-3.40282347e+38::Float32), (-1.17549435e-38::Float32), (1.4e-45::Float32), (-1.4e-45::Float32);
-INSERT INTO t VALUES (inf::Float32), (-inf::Float32), (nan::Float32);
-INSERT INTO t VALUES (inf::FLOAT(12)), (-inf::FLOAT(12)), (nan::FLOAT(12));
-INSERT INTO t VALUES (inf::FLOAT(15,22)), (-inf::FLOAT(15,22)), (nan::FLOAT(15,22));
-
-INSERT INTO t VALUES (1.17549435e-38::Float64), (3.40282347e+38::Float64), (-3.40282347e+38::Float64), (-1.17549435e-38::Float64), (1.4e-45::Float64), (-1.4e-45::Float64);
-INSERT INTO t VALUES (2.2250738585072014e-308::Float64), (1.7976931348623157e+308::Float64), (-1.7976931348623157e+308::Float64), (-2.2250738585072014e-308::Float64);
-INSERT INTO t VALUES (inf::Float64), (-inf::Float64), (nan::Float64);
-INSERT INTO t VALUES (inf::DOUBLE(12)), (-inf::DOUBLE(12)), (nan::DOUBLE(12));
-INSERT INTO t VALUES (inf::DOUBLE(15,22)), (-inf::DOUBLE(15,22)), (nan::DOUBLE(15,22));
-
--- Strings: String and FixedString
-INSERT INTO t VALUES ('string'::String), ('1'::FixedString(1)), ('1'::FixedString(2)), ('1'::FixedString(10)); --(''::String),
-
--- Boolean
-INSERT INTO t VALUES ('1'::Bool), (0::Bool);
-
--- UUID
-INSERT INTO t VALUES ('dededdb6-7835-4ce4-8d11-b5de6f2820e9'::UUID);
-INSERT INTO t VALUES ('00000000-0000-0000-0000-000000000000'::UUID);
-
--- LowCardinality
-INSERT INTO t VALUES ('1'::LowCardinality(String)), ('1'::LowCardinality(String)), (0::LowCardinality(UInt16));
-
--- Arrays
-INSERT INTO t VALUES ([]::Array(Dynamic)), ([[]]::Array(Array(Dynamic))), ([[[]]]::Array(Array(Array(Dynamic))));
-
--- Tuple
-INSERT INTO t VALUES (()::Tuple(Dynamic)), ((())::Tuple(Tuple(Dynamic))), (((()))::Tuple(Tuple(Tuple(Dynamic))));
-
--- Map.
-INSERT INTO t VALUES (map(11::Dynamic, 'v1'::Dynamic, '22'::Dynamic, 1::Dynamic));
-
--- SimpleAggregateFunction
-INSERT INTO t VALUES ([1,2]::SimpleAggregateFunction(anyLast, Array(Int16)));
-
--- IPs
-INSERT INTO t VALUES (toIPv4('192.168.0.1')), (toIPv6('::1'));
-
--- Geo
-INSERT INTO t VALUES ((1.23, 4.56)::Point), (([(1.23, 4.56)::Point, (2.34, 5.67)::Point])::Ring);
-INSERT INTO t VALUES ([[[(0, 0), (10, 0), (10, 10), (0, 10)]], [[(20, 20), (50, 20), (50, 50), (20, 50)],[(30, 30), (50, 50), (50, 30)]]]::MultiPolygon);
-
--- Interval
-INSERT INTO t VALUES (interval '1' day), (interval '2' month), (interval '3' year);
-
--- Nested
-INSERT INTO t VALUES ([(1, 'aa'), (2, 'bb')]::Nested(x UInt32, y String));
-INSERT INTO t VALUES ([(1, (2, ['aa', 'bb']), [(3, 'cc'), (4, 'dd')]), (5, (6, ['ee', 'ff']), [(7, 'gg'), (8, 'hh')])]::Nested(x UInt32, y Tuple(y1 UInt32, y2 Array(String)), z Nested(z1 UInt32, z2 String)));
-
-optimize table t final;
-
-select distinct toInt8OrDefault(d) as res from t order by res;
-select distinct toUInt8OrDefault(d) as res from t order by res;
-select distinct toInt16OrDefault(d) as res from t order by res;
-select distinct toUInt16OrDefault(d) as res from t order by res;
-select distinct toInt32OrDefault(d) as res from t order by res;
-select distinct toUInt32OrDefault(d) as res from t order by res;
-select distinct toInt64OrDefault(d) as res from t order by res;
-select distinct toUInt64OrDefault(d) as res from t order by res;
-select distinct toInt128OrDefault(d) as res from t order by res;
-select distinct toUInt128OrDefault(d) as res from t order by res;
-select distinct toInt256OrDefault(d) as res from t order by res;
-select distinct toUInt256OrDefault(d) as res from t order by res;
-
-select distinct toFloat32OrDefault(d) as res from t order by res;
-select distinct toFloat64OrDefault(d) as res from t order by res;
-
-select distinct toDecimal32OrDefault(d, 3) as res from t order by res;
-select distinct toDecimal64OrDefault(d, 3) as res from t order by res;
-select distinct toDecimal128OrDefault(d, 3) as res from t order by res;
-select distinct toDecimal256OrDefault(d, 3) as res from t order by res;
-
-select distinct toDateOrDefault(d) as res from t order by res;
-select distinct toDate32OrDefault(d) as res from t order by res;
-select distinct toDateTimeOrDefault(d) as res from t order by res;
-
-select distinct toIPv4OrDefault(d) as res from t order by res;
-select distinct toIPv6OrDefault(d) as res from t order by res;
-
-select distinct toUUIDOrDefault(d) as res from t order by res;
-
-drop table t;
-
diff --git a/tests/queries/0_stateless/03213_array_element_msan.reference b/tests/queries/0_stateless/03213_array_element_msan.reference
deleted file mode 100644
index 6844e39d0aa..00000000000
--- a/tests/queries/0_stateless/03213_array_element_msan.reference
+++ /dev/null
@@ -1,5 +0,0 @@
-10
--- system.settings_profiles
--- system.settings_profiles
--- system.settings_profiles
--- system.settings_profiles
diff --git a/tests/queries/0_stateless/03213_array_element_msan.sql b/tests/queries/0_stateless/03213_array_element_msan.sql
deleted file mode 100644
index 68955856792..00000000000
--- a/tests/queries/0_stateless/03213_array_element_msan.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT [[10, 2, 13, 15][toNullable(toLowCardinality(1))]][materialize(toLowCardinality(1))];
-SELECT '-- system.settings_profiles' GROUP BY [[[[[[[[[[10, toNullable(10)][1], [materialize(toLowCardinality(10)), 2][materialize(toLowCardinality(1))]][1]][materialize(materialize(1))], [10, 2, 1][1]][1]][1], 1][toLowCardinality(1)]][1], 1][1], 10][1], [[10, toLowCardinality(2)][toNullable(toLowCardinality(1))]][materialize(toLowCardinality(1))]][1], [[[[10, 2][1]][1]][1], [10, 2][materialize(1)], [[[2][1]][materialize(1)], 2, 1][1], [2, 10, toNullable(1)][1]] WITH CUBE;
diff --git a/tests/queries/0_stateless/03213_deep_json.reference b/tests/queries/0_stateless/03213_deep_json.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03213_deep_json.sql b/tests/queries/0_stateless/03213_deep_json.sql
deleted file mode 100644
index 2a9476381ff..00000000000
--- a/tests/queries/0_stateless/03213_deep_json.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- The default limit works.
-SELECT * FROM format("JSONCompactEachRow", 'x UInt32, y UInt32', REPEAT('[1,1,', 100000)) SETTINGS input_format_json_compact_allow_variable_number_of_columns = 1; -- { serverError TOO_DEEP_RECURSION, INCORRECT_DATA }
--- Even if we relax the limit, it is also safe.
-SET input_format_json_max_depth = 100000;
-SELECT * FROM format("JSONCompactEachRow", 'x UInt32, y UInt32', REPEAT('[1,1,', 100000)) SETTINGS input_format_json_compact_allow_variable_number_of_columns = 1; -- { serverError TOO_DEEP_RECURSION, INCORRECT_DATA }
diff --git a/tests/queries/0_stateless/03213_denseRank_percentRank_alias.reference b/tests/queries/0_stateless/03213_denseRank_percentRank_alias.reference
deleted file mode 100644
index b49e179df68..00000000000
--- a/tests/queries/0_stateless/03213_denseRank_percentRank_alias.reference
+++ /dev/null
@@ -1,45 +0,0 @@
----- denseRank() ----
-0	0	0	1	1	1	1
-3	0	0	2	2	2	2
-1	0	1	3	3	3	3
-4	0	1	4	4	4	4
-2	0	2	5	5	5	5
-6	1	0	1	1	1	1
-9	1	0	2	2	2	2
-7	1	1	3	3	3	3
-5	1	2	4	4	4	4
-8	1	2	5	5	5	5
-12	2	0	1	1	1	1
-10	2	1	2	2	2	2
-13	2	1	3	3	3	3
-11	2	2	4	4	4	4
-14	2	2	5	5	5	5
-15	3	0	1	1	1	1
-18	3	0	2	2	2	2
-16	3	1	3	3	3	3
-19	3	1	4	4	4	4
-17	3	2	5	5	5	5
-21	4	0	1	1	1	1
-24	4	0	2	2	2	2
-22	4	1	3	3	3	3
-20	4	2	4	4	4	4
-23	4	2	5	5	5	5
-27	5	0	1	1	1	1
-25	5	1	2	2	2	2
-28	5	1	3	3	3	3
-26	5	2	4	4	4	4
-29	5	2	5	5	5	5
-30	6	0	1	1	1	1
----- percentRank() ----
-Lenovo Thinkpad	Laptop	700	1	0
-Sony VAIO	Laptop	700	1	0
-Dell Vostro	Laptop	800	3	0.6666666666666666
-HP Elite	Laptop	1200	4	1
-Microsoft Lumia	Smartphone	200	1	0
-HTC One	Smartphone	400	2	0.3333333333333333
-Nexus	Smartphone	500	3	0.6666666666666666
-iPhone	Smartphone	900	4	1
-Kindle Fire	Tablet	150	1	0
-Samsung Galaxy Tab	Tablet	200	2	0.5
-iPad	Tablet	700	3	1
-Others	Unknow	200	1	0
diff --git a/tests/queries/0_stateless/03213_denseRank_percentRank_alias.sql b/tests/queries/0_stateless/03213_denseRank_percentRank_alias.sql
deleted file mode 100644
index ff841294eb1..00000000000
--- a/tests/queries/0_stateless/03213_denseRank_percentRank_alias.sql
+++ /dev/null
@@ -1,59 +0,0 @@
--- https://github.com/ClickHouse/ClickHouse/issues/67042
--- Reference generated using percent_rank() and dense_rank()
-
--- From ClickHouse/tests/queries/0_stateless/01591_window_functions.sql  (for deterministic query)
-SELECT '---- denseRank() ----';
-select number, p, o,
-    count(*) over w,
-    rank() over w,
-    denseRank() over w,
-    row_number() over w
-from (select number, intDiv(number, 5) p, mod(number, 3) o
-    from numbers(31) order by o, number) t
-window w as (partition by p order by o, number)
-order by p, o, number
-settings max_block_size = 2;
-
--- Modifed from ClickHouse/tests/queries/0_stateless/01592_window_functions.sql (for deterministic query)
-SELECT '---- percentRank() ----';
-
-drop table if exists product_groups;
-drop table if exists products;
-
-CREATE TABLE product_groups (
-	group_id Int64,
-	group_name String
-) Engine = Memory;
-
-CREATE TABLE products (
-	product_id Int64,
-	product_name String,
-	price DECIMAL(11, 2),
-	group_id Int64
-) Engine = Memory;
-
-INSERT INTO product_groups  VALUES	(1, 'Smartphone'),(2, 'Laptop'),(3, 'Tablet');
-INSERT INTO products (product_id,product_name, group_id,price) VALUES (1, 'Microsoft Lumia', 1, 200), (2, 'HTC One', 1, 400), (3, 'Nexus', 1, 500), (4, 'iPhone', 1, 900),(5, 'HP Elite', 2, 1200),(6, 'Lenovo Thinkpad', 2, 700),(7, 'Sony VAIO', 2, 700),(8, 'Dell Vostro', 2, 800),(9, 'iPad', 3, 700),(10, 'Kindle Fire', 3, 150),(11, 'Samsung Galaxy Tab', 3, 200);
-INSERT INTO product_groups  VALUES	(4, 'Unknow');
-INSERT INTO products (product_id,product_name, group_id,price) VALUES (12, 'Others', 4, 200);
-
-
-SELECT *
-FROM
-(
-    SELECT
-        product_name,
-        group_name,
-        price,
-        rank() OVER (PARTITION BY group_name ORDER BY price ASC) AS rank,
-        percentRank() OVER (PARTITION BY group_name ORDER BY price ASC) AS percent
-    FROM products
-    INNER JOIN product_groups USING (group_id)
-) AS t
-ORDER BY
-    group_name ASC,
-    price ASC,
-    product_name ASC;
-
-drop table product_groups;
-drop table products;
diff --git a/tests/queries/0_stateless/03213_distributed_analyzer.reference b/tests/queries/0_stateless/03213_distributed_analyzer.reference
deleted file mode 100644
index 9d63c0a7a5e..00000000000
--- a/tests/queries/0_stateless/03213_distributed_analyzer.reference
+++ /dev/null
@@ -1 +0,0 @@
-['digraph','{','  rankdir="LR";','  { node [shape = rect]','        n1 [label="Remote"];','  }','}','digraph','{','  rankdir="LR";','  { node [shape = rect]','        n1 [label="Remote"];','  }','}']
diff --git a/tests/queries/0_stateless/03213_distributed_analyzer.sql b/tests/queries/0_stateless/03213_distributed_analyzer.sql
deleted file mode 100644
index ae0f13f08f0..00000000000
--- a/tests/queries/0_stateless/03213_distributed_analyzer.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- This triggered a nullptr dereference due to the confusion between old and new analyzers:
-SELECT sum(*) FROM remote('127.0.0.4', currentDatabase(), viewExplain('EXPLAIN PIPELINE', 'graph = 1', (SELECT * FROM remote('127.0.0.4', system, one)))); -- { serverError UNKNOWN_FUNCTION }
-SELECT groupArray(*) FROM cluster(test_cluster_two_shards, viewExplain('EXPLAIN PIPELINE', 'graph = 1', (SELECT * FROM remote('127.0.0.4', system, one))));
diff --git a/tests/queries/0_stateless/03213_rand_dos.reference b/tests/queries/0_stateless/03213_rand_dos.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03213_rand_dos.sql b/tests/queries/0_stateless/03213_rand_dos.sql
deleted file mode 100644
index 1250995bfe5..00000000000
--- a/tests/queries/0_stateless/03213_rand_dos.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT randChiSquared(-0.0000001); -- { serverError BAD_ARGUMENTS }
-SELECT randChiSquared(-0.0); -- { serverError BAD_ARGUMENTS }
-SELECT randStudentT(-0.); -- { serverError BAD_ARGUMENTS }
-SELECT randFisherF(-0., 1); -- { serverError BAD_ARGUMENTS }
-SELECT randFisherF(1, -0.); -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/03214_backup_and_clear_old_temporary_directories.reference b/tests/queries/0_stateless/03214_backup_and_clear_old_temporary_directories.reference
deleted file mode 100644
index 3f3fbd9ab58..00000000000
--- a/tests/queries/0_stateless/03214_backup_and_clear_old_temporary_directories.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-RESTORED
-250	31375
diff --git a/tests/queries/0_stateless/03214_backup_and_clear_old_temporary_directories.sh b/tests/queries/0_stateless/03214_backup_and_clear_old_temporary_directories.sh
deleted file mode 100755
index e0c8f08e695..00000000000
--- a/tests/queries/0_stateless/03214_backup_and_clear_old_temporary_directories.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-# In this test we restore from "/tests/queries/0_stateless/backups/mt_250_parts.zip"
-backup_name="$($CURDIR/helpers/install_predefined_backup.sh mt_250_parts.zip)"
-
-${CLICKHOUSE_CLIENT} -nm --query "
-DROP TABLE IF EXISTS manyparts;
-CREATE TABLE manyparts (x Int64) ENGINE=MergeTree ORDER BY tuple() SETTINGS merge_tree_clear_old_temporary_directories_interval_seconds=1, temporary_directories_lifetime=1;
-"
-
-# RESTORE must protect its temporary directories from removing.
-${CLICKHOUSE_CLIENT} --query "RESTORE TABLE default.mt_250_parts AS manyparts FROM Disk('backups', '${backup_name}') SETTINGS allow_different_table_def=true" | grep -o "RESTORED"
-
-${CLICKHOUSE_CLIENT} -nm --query "
-SELECT count(), sum(x) FROM manyparts;
-DROP TABLE manyparts;
-"
diff --git a/tests/queries/0_stateless/03214_bitslice_argument_evaluation.reference b/tests/queries/0_stateless/03214_bitslice_argument_evaluation.reference
deleted file mode 100644
index 1731dfa0d79..00000000000
--- a/tests/queries/0_stateless/03214_bitslice_argument_evaluation.reference
+++ /dev/null
@@ -1,11 +0,0 @@
--- { echo }
--- No arguments passed
-SELECT bitSlice(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
--- Invalid 1st argument passed
-SELECT bitSlice(1, 1); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
--- Valid 1st argument, invalid 2nd argument passed
-SELECT bitSlice('Hello', 'World'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
--- Valid 1st argument & 2nd argument, invalid 3rd argument passed
-SELECT bitSlice('Hello', 1, 'World'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
--- More arguments then expected
-SELECT bitSlice('Hello', 1, 1, 'World'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
diff --git a/tests/queries/0_stateless/03214_bitslice_argument_evaluation.sql b/tests/queries/0_stateless/03214_bitslice_argument_evaluation.sql
deleted file mode 100644
index 1731dfa0d79..00000000000
--- a/tests/queries/0_stateless/03214_bitslice_argument_evaluation.sql
+++ /dev/null
@@ -1,11 +0,0 @@
--- { echo }
--- No arguments passed
-SELECT bitSlice(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
--- Invalid 1st argument passed
-SELECT bitSlice(1, 1); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
--- Valid 1st argument, invalid 2nd argument passed
-SELECT bitSlice('Hello', 'World'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
--- Valid 1st argument & 2nd argument, invalid 3rd argument passed
-SELECT bitSlice('Hello', 1, 'World'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
--- More arguments then expected
-SELECT bitSlice('Hello', 1, 1, 'World'); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
diff --git a/tests/queries/0_stateless/03214_count_distinct_null_key_memory_leak.reference b/tests/queries/0_stateless/03214_count_distinct_null_key_memory_leak.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03214_count_distinct_null_key_memory_leak.sql b/tests/queries/0_stateless/03214_count_distinct_null_key_memory_leak.sql
deleted file mode 100644
index 84804e4e016..00000000000
--- a/tests/queries/0_stateless/03214_count_distinct_null_key_memory_leak.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- Tags: no-fasttest
-
-DROP TABLE IF EXISTS testnull;
-CREATE TABLE testnull
-(
-    `a` Nullable(String),
-    `b` Nullable(String),
-    `c` Nullable(String)
-)
-ENGINE = MergeTree
-PARTITION BY tuple()
-ORDER BY c
-SETTINGS index_granularity = 8192, allow_nullable_key=1;
-
-INSERT INTO testnull(b,c) SELECT toString(rand64()) AS b, toString(rand64()) AS c FROM numbers(1000000);
-SELECT count(distinct b) FROM testnull GROUP BY a  SETTINGS max_memory_usage = 10000000; -- {serverError MEMORY_LIMIT_EXCEEDED}
-
-DROP TABLE testnull;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03214_inconsistent_formatting_of_codecs_statistics.reference b/tests/queries/0_stateless/03214_inconsistent_formatting_of_codecs_statistics.reference
deleted file mode 100644
index 7213baa3e5b..00000000000
--- a/tests/queries/0_stateless/03214_inconsistent_formatting_of_codecs_statistics.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE t MODIFY COLUMN `c` CODEC(in(1, 2))
-ALTER TABLE t MODIFY COLUMN `c` STATISTICS(plus(1, 2))
diff --git a/tests/queries/0_stateless/03214_inconsistent_formatting_of_codecs_statistics.sh b/tests/queries/0_stateless/03214_inconsistent_formatting_of_codecs_statistics.sh
deleted file mode 100755
index c3f8d89b9a4..00000000000
--- a/tests/queries/0_stateless/03214_inconsistent_formatting_of_codecs_statistics.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-# Ensure that these (possibly incorrect) queries can at least be parsed back after formatting.
-$CLICKHOUSE_FORMAT --oneline --query "ALTER TABLE t MODIFY COLUMN c CODEC(in(1, 2))" | $CLICKHOUSE_FORMAT --oneline
-$CLICKHOUSE_FORMAT --oneline --query "ALTER TABLE t MODIFY COLUMN c STATISTICS(plus(1, 2))" | $CLICKHOUSE_FORMAT --oneline
diff --git a/tests/queries/0_stateless/03214_join_on_tuple_comparison_elimination_bug.reference b/tests/queries/0_stateless/03214_join_on_tuple_comparison_elimination_bug.reference
deleted file mode 100644
index c90a64e4a47..00000000000
--- a/tests/queries/0_stateless/03214_join_on_tuple_comparison_elimination_bug.reference
+++ /dev/null
@@ -1,8 +0,0 @@
-1
-\N
-1
-\N
-1
-\N
-1
-\N
diff --git a/tests/queries/0_stateless/03214_join_on_tuple_comparison_elimination_bug.sql b/tests/queries/0_stateless/03214_join_on_tuple_comparison_elimination_bug.sql
deleted file mode 100644
index 7ef98f88cc7..00000000000
--- a/tests/queries/0_stateless/03214_join_on_tuple_comparison_elimination_bug.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-DROP TABLE IF EXISTS a;
-DROP TABLE IF EXISTS b;
-
-CREATE TABLE a (key Nullable(String)) ENGINE = MergeTree ORDER BY tuple();
-INSERT INTO a VALUES (NULL), ('1');
-
-CREATE TABLE b (key Nullable(String)) ENGINE = MergeTree ORDER BY tuple();
-INSERT INTO b VALUES (NULL), ('1');
-
-SELECT a.key FROM a LEFT SEMI JOIN b ON tuple(a.key) = tuple(b.key) ORDER BY a.key;
-SELECT a.key FROM a LEFT SEMI JOIN b ON a.key IS NOT DISTINCT FROM b.key ORDER BY a.key;
-SELECT a.key FROM a LEFT SEMI JOIN b ON tuple(a.key) = tuple(b.key) ORDER BY a.key;
-SELECT a.key FROM a LEFT ANY JOIN b ON tuple(a.key) = tuple(b.key) ORDER BY a.key;
-
-DROP TABLE IF EXISTS a;
-DROP TABLE IF EXISTS b;
diff --git a/tests/queries/0_stateless/03214_json_typed_dynamic_path.reference b/tests/queries/0_stateless/03214_json_typed_dynamic_path.reference
deleted file mode 100644
index 1b3e6b7a8db..00000000000
--- a/tests/queries/0_stateless/03214_json_typed_dynamic_path.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-{"a":"42"}
-{"a":["1","2","3"]}
-{"a":"42"}
-{"a":["1","2","3"]}
diff --git a/tests/queries/0_stateless/03214_json_typed_dynamic_path.sql b/tests/queries/0_stateless/03214_json_typed_dynamic_path.sql
deleted file mode 100644
index 1f6a025825a..00000000000
--- a/tests/queries/0_stateless/03214_json_typed_dynamic_path.sql
+++ /dev/null
@@ -1,17 +0,0 @@
--- Tags: no-fasttest
-
-set allow_experimental_json_type = 1;
-drop table if exists test;
-create table test (json JSON(a Dynamic)) engine=MergeTree order by tuple() settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;
-insert into test select '{"a" : 42}';
-insert into test select '{"a" : [1, 2, 3]}';
-optimize table test;
-select * from test order by toString(json);
-drop table test;
-
-create table test (json JSON(a Dynamic)) engine=MergeTree order by tuple() settings min_rows_for_wide_part=10000000, min_bytes_for_wide_part=10000000;
-insert into test select '{"a" : 42}';
-insert into test select '{"a" : [1, 2, 3]}';
-optimize table test;
-select * from test order by toString(json);
-drop table test;
diff --git a/tests/queries/0_stateless/03215_analyzer_materialized_constants_bug.reference b/tests/queries/0_stateless/03215_analyzer_materialized_constants_bug.reference
deleted file mode 100644
index 584e34c0cde..00000000000
--- a/tests/queries/0_stateless/03215_analyzer_materialized_constants_bug.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-ba
-\N
-1	111111111111111111111111111111111111111
diff --git a/tests/queries/0_stateless/03215_analyzer_materialized_constants_bug.sql b/tests/queries/0_stateless/03215_analyzer_materialized_constants_bug.sql
deleted file mode 100644
index b2fd69d75d0..00000000000
--- a/tests/queries/0_stateless/03215_analyzer_materialized_constants_bug.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-SET allow_experimental_analyzer = 1;
-
-SELECT concat(materialize(toLowCardinality('b')), 'a') FROM remote('127.0.0.{1,2}', system, one) GROUP BY 'a';
-
-SELECT concat(NULLIF(1, materialize(toLowCardinality(1))), concat(NULLIF(1, 1))) FROM remote('127.0.0.{1,2}', system, one) GROUP BY concat(NULLIF(1, 1));
-
-DROP TABLE IF EXISTS test__fuzz_21;
-CREATE TABLE test__fuzz_21
-(
-    `x` Decimal(18, 10)
-)
-ENGINE = MergeTree
-ORDER BY x;
-
-INSERT INTO test__fuzz_21 VALUES (1), (2), (3);
-
-WITH (
-        SELECT CAST(toFixedString(toFixedString(materialize(toFixedString('111111111111111111111111111111111111111', 39)), 39), 39), 'UInt128')
-    ) AS v
-SELECT
-    coalesce(materialize(toLowCardinality(toNullable(1))), 10, NULL),
-    max(v)
-FROM remote('127.0.0.{1,2}', currentDatabase(), test__fuzz_21)
-GROUP BY
-    coalesce(NULL),
-    coalesce(1, 10, 10, materialize(NULL));
diff --git a/tests/queries/0_stateless/03215_grant_current_grants.reference b/tests/queries/0_stateless/03215_grant_current_grants.reference
deleted file mode 100644
index e4f6850b806..00000000000
--- a/tests/queries/0_stateless/03215_grant_current_grants.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-GRANT SELECT, CREATE TABLE, CREATE VIEW ON default.*
-GRANT SELECT ON default.*
diff --git a/tests/queries/0_stateless/03215_grant_current_grants.sh b/tests/queries/0_stateless/03215_grant_current_grants.sh
deleted file mode 100755
index 68af4a62bba..00000000000
--- a/tests/queries/0_stateless/03215_grant_current_grants.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-
-user1="user03215_1_${CLICKHOUSE_DATABASE}_$RANDOM"
-user2="user03215_2_${CLICKHOUSE_DATABASE}_$RANDOM"
-user3="user03215_3_${CLICKHOUSE_DATABASE}_$RANDOM"
-db=${CLICKHOUSE_DATABASE}
-
-
-${CLICKHOUSE_CLIENT} --query "CREATE USER $user1, $user2, $user3;";
-${CLICKHOUSE_CLIENT} --query "GRANT SELECT, CREATE TABLE, CREATE VIEW ON $db.* TO $user1 WITH GRANT OPTION;";
-
-${CLICKHOUSE_CLIENT} --query "GRANT CURRENT GRANTS ON $db.* TO $user2" --user $user1;
-${CLICKHOUSE_CLIENT} --query "GRANT CURRENT GRANTS ON $db.* TO $user3" --user $user2;
-
-${CLICKHOUSE_CLIENT} --query "SHOW GRANTS FOR $user2" | sed 's/ TO.*//';
-${CLICKHOUSE_CLIENT} --query "SHOW GRANTS FOR $user3" | sed 's/ TO.*//';
-
-${CLICKHOUSE_CLIENT} --query "GRANT CURRENT GRANTS(SELECT ON $db.*) TO $user3" --user $user1;
-${CLICKHOUSE_CLIENT} --query "SHOW GRANTS FOR $user3" | sed 's/ TO.*//';
-
-${CLICKHOUSE_CLIENT} --query "DROP USER IF EXISTS $user1, $user2, $user3";
diff --git a/tests/queries/0_stateless/03215_key_condition_bug.reference b/tests/queries/0_stateless/03215_key_condition_bug.reference
deleted file mode 100644
index 84ab67a85e0..00000000000
--- a/tests/queries/0_stateless/03215_key_condition_bug.reference
+++ /dev/null
@@ -1 +0,0 @@
-(0)
diff --git a/tests/queries/0_stateless/03215_key_condition_bug.sql b/tests/queries/0_stateless/03215_key_condition_bug.sql
deleted file mode 100644
index ef2113e81f8..00000000000
--- a/tests/queries/0_stateless/03215_key_condition_bug.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-CREATE TABLE t (x Int8) ENGINE MergeTree ORDER BY x;
-INSERT INTO t VALUES (1);
-SELECT arrayJoin([tuple((toNullable(10) * toLowCardinality(20)) < materialize(30))]) AS row FROM t WHERE row.1 = 0;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03215_multilinestring_geometry.reference b/tests/queries/0_stateless/03215_multilinestring_geometry.reference
deleted file mode 100644
index 9702dd6d6f8..00000000000
--- a/tests/queries/0_stateless/03215_multilinestring_geometry.reference
+++ /dev/null
@@ -1,30 +0,0 @@
--- { echoOn }
-SELECT readWKTMultiLineString('MULTILINESTRING ((1 1, 2 2, 3 3, 1 1))');
-[[(1,1),(2,2),(3,3),(1,1)]]
-SELECT toTypeName(readWKTMultiLineString('MULTILINESTRING ((1 1, 2 2, 3 3, 1 1))'));
-MultiLineString
-SELECT wkt(readWKTMultiLineString('MULTILINESTRING ((1 1, 2 2, 3 3, 1 1))'));
-MULTILINESTRING((1 1,2 2,3 3,1 1))
-SELECT readWKTMultiLineString('MULTILINESTRING ((1 1, 2 2, 3 3, 1 1), (1 0, 2 0, 3 0))');
-[[(1,1),(2,2),(3,3),(1,1)],[(1,0),(2,0),(3,0)]]
-SELECT toTypeName(readWKTMultiLineString('MULTILINESTRING ((1 1, 2 2, 3 3, 1 1), (1 0, 2 0, 3 0))'));
-MultiLineString
-SELECT wkt(readWKTMultiLineString('MULTILINESTRING ((1 1, 2 2, 3 3, 1 1), (1 0, 2 0, 3 0))'));
-MULTILINESTRING((1 1,2 2,3 3,1 1),(1 0,2 0,3 0))
--- Native Array(Array(Tuple(Float64, Float64))) is treated as Polygon, not as MultiLineString.
-WITH wkt(CAST([[(1, 1), (2, 2), (3, 3), (1, 1)]], 'Array(Array(Tuple(Float64, Float64)))')) as x
-SELECT x, toTypeName(x), readWKTPolygon(x) as y, toTypeName(y);
-POLYGON((1 1,2 2,3 3,1 1))	String	[[(1,1),(2,2),(3,3),(1,1)]]	Polygon
--- Non constant tests
-
-DROP TABLE IF EXISTS t;
-CREATE TABLE IF NOT EXISTS t (shape Array(Array(Tuple(Float64, Float64))), wkt_string String, ord Float64) Engine = Memory;
-INSERT INTO t (ord, shape, wkt_string) VALUES (1, [[(1, 1), (2, 2), (3, 3), (1, 1)]], 'MULTILINESTRING ((1 1, 2 2, 3 3, 1 1))');
-INSERT INTO t (ord, shape, wkt_string) VALUES (2, [[(1, 1), (2, 2), (3, 3), (1, 1)], [(1, 0), (2, 0), (3, 0)]], 'MULTILINESTRING ((1 1, 2 2, 3 3, 1 1), (1 0, 2 0, 3 0))');
-INSERT INTO t (ord, shape, wkt_string) VALUES (3, [[(1, 0), (2, 1), (3, 0), (4, 1), (5, 0), (6, 1), (7, 0), (8, 1), (9, 0), (10, 1)]], 'MULTILINESTRING ((1 0, 2 1, 3 0, 4 1, 5 0, 6 1, 7 0, 8 1, 9 0, 10 1))');
--- Native Array(Array(Tuple(Float64, Float64))) is treated as Polygon, not as MultiLineString.
--- but reading MultiLineString should still return an Array(Array(Tuple(Float64, Float64)))
-select wkt(shape), readWKTMultiLineString(wkt_string), readWKTMultiLineString(wkt_string) = shape from t order by ord;
-POLYGON((1 1,2 2,3 3,1 1))	[[(1,1),(2,2),(3,3),(1,1)]]	1
-POLYGON((1 1,2 2,3 3,1 1),(1 0,2 0,3 0,1 0))	[[(1,1),(2,2),(3,3),(1,1)],[(1,0),(2,0),(3,0)]]	1
-POLYGON((1 0,2 1,3 0,4 1,5 0,6 1,7 0,8 1,9 0,10 1,1 0))	[[(1,0),(2,1),(3,0),(4,1),(5,0),(6,1),(7,0),(8,1),(9,0),(10,1)]]	1
diff --git a/tests/queries/0_stateless/03215_multilinestring_geometry.sql b/tests/queries/0_stateless/03215_multilinestring_geometry.sql
deleted file mode 100644
index cf4ef15f63d..00000000000
--- a/tests/queries/0_stateless/03215_multilinestring_geometry.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- { echoOn }
-SELECT readWKTMultiLineString('MULTILINESTRING ((1 1, 2 2, 3 3, 1 1))');
-SELECT toTypeName(readWKTMultiLineString('MULTILINESTRING ((1 1, 2 2, 3 3, 1 1))'));
-SELECT wkt(readWKTMultiLineString('MULTILINESTRING ((1 1, 2 2, 3 3, 1 1))'));
-
-SELECT readWKTMultiLineString('MULTILINESTRING ((1 1, 2 2, 3 3, 1 1), (1 0, 2 0, 3 0))');
-SELECT toTypeName(readWKTMultiLineString('MULTILINESTRING ((1 1, 2 2, 3 3, 1 1), (1 0, 2 0, 3 0))'));
-SELECT wkt(readWKTMultiLineString('MULTILINESTRING ((1 1, 2 2, 3 3, 1 1), (1 0, 2 0, 3 0))'));
-
--- Native Array(Array(Tuple(Float64, Float64))) is treated as Polygon, not as MultiLineString.
-WITH wkt(CAST([[(1, 1), (2, 2), (3, 3), (1, 1)]], 'Array(Array(Tuple(Float64, Float64)))')) as x
-SELECT x, toTypeName(x), readWKTPolygon(x) as y, toTypeName(y);
-
--- Non constant tests
-
-DROP TABLE IF EXISTS t;
-CREATE TABLE IF NOT EXISTS t (shape Array(Array(Tuple(Float64, Float64))), wkt_string String, ord Float64) Engine = Memory;
-INSERT INTO t (ord, shape, wkt_string) VALUES (1, [[(1, 1), (2, 2), (3, 3), (1, 1)]], 'MULTILINESTRING ((1 1, 2 2, 3 3, 1 1))');
-INSERT INTO t (ord, shape, wkt_string) VALUES (2, [[(1, 1), (2, 2), (3, 3), (1, 1)], [(1, 0), (2, 0), (3, 0)]], 'MULTILINESTRING ((1 1, 2 2, 3 3, 1 1), (1 0, 2 0, 3 0))');
-INSERT INTO t (ord, shape, wkt_string) VALUES (3, [[(1, 0), (2, 1), (3, 0), (4, 1), (5, 0), (6, 1), (7, 0), (8, 1), (9, 0), (10, 1)]], 'MULTILINESTRING ((1 0, 2 1, 3 0, 4 1, 5 0, 6 1, 7 0, 8 1, 9 0, 10 1))');
-
--- Native Array(Array(Tuple(Float64, Float64))) is treated as Polygon, not as MultiLineString.
--- but reading MultiLineString should still return an Array(Array(Tuple(Float64, Float64)))
-select wkt(shape), readWKTMultiLineString(wkt_string), readWKTMultiLineString(wkt_string) = shape from t order by ord;
-
-
diff --git a/tests/queries/0_stateless/03215_parquet_index.reference b/tests/queries/0_stateless/03215_parquet_index.reference
deleted file mode 100644
index 334f2f3824e..00000000000
--- a/tests/queries/0_stateless/03215_parquet_index.reference
+++ /dev/null
@@ -1,300 +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
-50	50
-51	51
-52	52
-53	53
-54	54
-55	55
-56	56
-57	57
-58	58
-59	59
-60	60
-61	61
-62	62
-63	63
-64	64
-65	65
-66	66
-67	67
-68	68
-69	69
-70	70
-71	71
-72	72
-73	73
-74	74
-75	75
-76	76
-77	77
-78	78
-79	79
-80	80
-81	81
-82	82
-83	83
-84	84
-85	85
-86	86
-87	87
-88	88
-89	89
-90	90
-91	91
-92	92
-93	93
-94	94
-95	95
-96	96
-97	97
-98	98
-99	99
-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
-50	50
-51	51
-52	52
-53	53
-54	54
-55	55
-56	56
-57	57
-58	58
-59	59
-60	60
-61	61
-62	62
-63	63
-64	64
-65	65
-66	66
-67	67
-68	68
-69	69
-70	70
-71	71
-72	72
-73	73
-74	74
-75	75
-76	76
-77	77
-78	78
-79	79
-80	80
-81	81
-82	82
-83	83
-84	84
-85	85
-86	86
-87	87
-88	88
-89	89
-90	90
-91	91
-92	92
-93	93
-94	94
-95	95
-96	96
-97	97
-98	98
-99	99
-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
-50	50
-51	51
-52	52
-53	53
-54	54
-55	55
-56	56
-57	57
-58	58
-59	59
-60	60
-61	61
-62	62
-63	63
-64	64
-65	65
-66	66
-67	67
-68	68
-69	69
-70	70
-71	71
-72	72
-73	73
-74	74
-75	75
-76	76
-77	77
-78	78
-79	79
-80	80
-81	81
-82	82
-83	83
-84	84
-85	85
-86	86
-87	87
-88	88
-89	89
-90	90
-91	91
-92	92
-93	93
-94	94
-95	95
-96	96
-97	97
-98	98
-99	99
diff --git a/tests/queries/0_stateless/03215_parquet_index.sql b/tests/queries/0_stateless/03215_parquet_index.sql
deleted file mode 100644
index 5766f40f021..00000000000
--- a/tests/queries/0_stateless/03215_parquet_index.sql
+++ /dev/null
@@ -1,21 +0,0 @@
--- Tags: no-fasttest
-
--- default settings.
-DROP TABLE IF EXISTS test_parquet;
-CREATE TABLE test_parquet (col1 int, col2 String) ENGINE=File(Parquet);
-INSERT INTO test_parquet SELECT number, toString(number) FROM numbers(100);
-SELECT col1, col2 FROM test_parquet;
-
-
--- Parquet will have indexes in columns. We are not checking that indexes exist here, there is an integration test test_parquet_page_index for that. We just check that a setting doesn't break the SELECT
-DROP TABLE IF EXISTS test_parquet;
-CREATE TABLE test_parquet (col1 int, col2 String) ENGINE=File(Parquet)  SETTINGS output_format_parquet_use_custom_encoder=false, output_format_parquet_write_page_index=true;
-INSERT INTO test_parquet SELECT number, toString(number) FROM numbers(100);
-SELECT col1, col2 FROM test_parquet;
-
-
--- Parquet will not have indexes in columns.
-DROP TABLE IF EXISTS test_parquet;
-CREATE TABLE test_parquet (col1 int, col2 String) ENGINE=File(Parquet)  SETTINGS output_format_parquet_use_custom_encoder=false, output_format_parquet_write_page_index=false;
-INSERT INTO test_parquet SELECT number, toString(number) FROM numbers(100);
-SELECT col1, col2 FROM test_parquet;
diff --git a/tests/queries/0_stateless/03215_parsing_archive_name_s3.sql b/tests/queries/0_stateless/03215_parsing_archive_name_s3.sql
index e0d63d313fa..e34be475c5a 100644
--- a/tests/queries/0_stateless/03215_parsing_archive_name_s3.sql
+++ b/tests/queries/0_stateless/03215_parsing_archive_name_s3.sql
@@ -1,15 +1,7 @@
 -- Tags: no-fasttest
 -- Tag no-fasttest: Depends on AWS
 
-SET s3_truncate_on_insert=1;
-
-INSERT INTO FUNCTION s3(s3_conn, filename='::03215_archive.csv') SELECT 1;
 SELECT _file, _path FROM s3(s3_conn, filename='::03215_archive.csv') ORDER BY (_file, _path);
-
 SELECT _file, _path FROM s3(s3_conn, filename='test :: 03215_archive.csv') ORDER BY (_file, _path); -- { serverError S3_ERROR }
-
-INSERT INTO FUNCTION s3(s3_conn, filename='test::03215_archive.csv') SELECT 1;
 SELECT _file, _path FROM s3(s3_conn, filename='test::03215_archive.csv') ORDER BY (_file, _path);
-
-INSERT INTO FUNCTION s3(s3_conn, filename='test.zip::03215_archive.csv') SETTINGS allow_archive_path_syntax=0 SELECT 1;
 SELECT _file, _path FROM s3(s3_conn, filename='test.zip::03215_archive.csv') ORDER BY (_file, _path) SETTINGS allow_archive_path_syntax=0;
diff --git a/tests/queries/0_stateless/03215_toStartOfWeek_with_dateTime64_fix.reference b/tests/queries/0_stateless/03215_toStartOfWeek_with_dateTime64_fix.reference
deleted file mode 100644
index fd698107f22..00000000000
--- a/tests/queries/0_stateless/03215_toStartOfWeek_with_dateTime64_fix.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-1970-01-01
-1970-01-01
diff --git a/tests/queries/0_stateless/03215_toStartOfWeek_with_dateTime64_fix.sql b/tests/queries/0_stateless/03215_toStartOfWeek_with_dateTime64_fix.sql
deleted file mode 100644
index 1769d96aa8d..00000000000
--- a/tests/queries/0_stateless/03215_toStartOfWeek_with_dateTime64_fix.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT toStartOfWeek(toDateTime64('1970-01-01', 6));
-SELECT toStartOfWeek(toDateTime('1970-01-01'));
diff --git a/tests/queries/0_stateless/03215_varian_as_common_type_integers.reference b/tests/queries/0_stateless/03215_varian_as_common_type_integers.reference
deleted file mode 100644
index c5edc9e9963..00000000000
--- a/tests/queries/0_stateless/03215_varian_as_common_type_integers.reference
+++ /dev/null
@@ -1,8 +0,0 @@
-0	Variant(Int64, UInt64)
-1	Variant(Int64, UInt64)
-0	Variant(Int32, UInt64)
-1	Variant(Int32, UInt64)
-0	Variant(Int16, UInt64)
-1	Variant(Int16, UInt64)
-0	Variant(Int8, UInt64)
-1	Variant(Int8, UInt64)
diff --git a/tests/queries/0_stateless/03215_varian_as_common_type_integers.sql b/tests/queries/0_stateless/03215_varian_as_common_type_integers.sql
deleted file mode 100644
index dcc69735534..00000000000
--- a/tests/queries/0_stateless/03215_varian_as_common_type_integers.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-set use_variant_as_common_type = 1;
-set allow_experimental_variant_type = 1;
-
-SELECT if(number % 2, number::Int64, number::UInt64) as res, toTypeName(res) FROM numbers(2);
-SELECT if(number % 2, number::Int32, number::UInt64) as res, toTypeName(res) FROM numbers(2);
-SELECT if(number % 2, number::Int16, number::UInt64) as res, toTypeName(res) FROM numbers(2);
-SELECT if(number % 2, number::Int8, number::UInt64) as res, toTypeName(res) FROM numbers(2);
-
diff --git a/tests/queries/0_stateless/03215_varian_as_common_type_tuple_map.reference b/tests/queries/0_stateless/03215_varian_as_common_type_tuple_map.reference
deleted file mode 100644
index 7dabd5388f4..00000000000
--- a/tests/queries/0_stateless/03215_varian_as_common_type_tuple_map.reference
+++ /dev/null
@@ -1,10 +0,0 @@
-('0')	Variant(Tuple(String), Tuple(\n    number UInt64))
-(1)	Variant(Tuple(String), Tuple(\n    number UInt64))
-('2')	Variant(Tuple(String), Tuple(\n    number UInt64))
-(3)	Variant(Tuple(String), Tuple(\n    number UInt64))
-('4')	Variant(Tuple(String), Tuple(\n    number UInt64))
-{'0':'0'}	Variant(Map(String, String), Map(UInt64, UInt64))
-{1:1}	Variant(Map(String, String), Map(UInt64, UInt64))
-{'2':'2'}	Variant(Map(String, String), Map(UInt64, UInt64))
-{3:3}	Variant(Map(String, String), Map(UInt64, UInt64))
-{'4':'4'}	Variant(Map(String, String), Map(UInt64, UInt64))
diff --git a/tests/queries/0_stateless/03215_varian_as_common_type_tuple_map.sql b/tests/queries/0_stateless/03215_varian_as_common_type_tuple_map.sql
deleted file mode 100644
index 4a9a788ab18..00000000000
--- a/tests/queries/0_stateless/03215_varian_as_common_type_tuple_map.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-set use_variant_as_common_type = 1;
-set allow_experimental_variant_type = 1;
-
-SELECT if(number % 2, tuple(number), tuple(toString(number))) as res, toTypeName(res) FROM numbers(5);
-SELECT if(number % 2, map(number, number), map(toString(number), toString(number))) as res, toTypeName(res) FROM numbers(5);
-
-
diff --git a/tests/queries/0_stateless/03216_arrayWithConstant_limits.reference b/tests/queries/0_stateless/03216_arrayWithConstant_limits.reference
deleted file mode 100644
index 825319e1c5b..00000000000
--- a/tests/queries/0_stateless/03216_arrayWithConstant_limits.reference
+++ /dev/null
@@ -1 +0,0 @@
-10000000
diff --git a/tests/queries/0_stateless/03216_arrayWithConstant_limits.sql b/tests/queries/0_stateless/03216_arrayWithConstant_limits.sql
deleted file mode 100644
index c46524c50e6..00000000000
--- a/tests/queries/0_stateless/03216_arrayWithConstant_limits.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT arrayWithConstant(96142475, ['qMUF']); -- { serverError TOO_LARGE_ARRAY_SIZE }
-SELECT arrayWithConstant(100000000, materialize([[[[[[[[[['Hello, world!']]]]]]]]]])); -- { serverError TOO_LARGE_ARRAY_SIZE }
-SELECT length(arrayWithConstant(10000000, materialize([[[[[[[[[['Hello world']]]]]]]]]])));
diff --git a/tests/queries/0_stateless/03217_datetime64_constant_to_ast.reference b/tests/queries/0_stateless/03217_datetime64_constant_to_ast.reference
deleted file mode 100644
index c20baa0d261..00000000000
--- a/tests/queries/0_stateless/03217_datetime64_constant_to_ast.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-1970-01-01 00:00:01.000
-1970-01-01 00:00:01.000
diff --git a/tests/queries/0_stateless/03217_datetime64_constant_to_ast.sql b/tests/queries/0_stateless/03217_datetime64_constant_to_ast.sql
deleted file mode 100644
index 63334a511c7..00000000000
--- a/tests/queries/0_stateless/03217_datetime64_constant_to_ast.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-
-SET session_timezone = 'UTC';
-
-SELECT toDateTime64('1970-01-01 00:00:01', 3)
-FROM remote('127.0.0.{1,2}', system, one)
-;
diff --git a/tests/queries/0_stateless/03217_fliter_pushdown_no_keys.reference b/tests/queries/0_stateless/03217_fliter_pushdown_no_keys.reference
deleted file mode 100644
index 9838dd1b936..00000000000
--- a/tests/queries/0_stateless/03217_fliter_pushdown_no_keys.reference
+++ /dev/null
@@ -1,6 +0,0 @@
----
-1	1
----
-3	3
----
----
diff --git a/tests/queries/0_stateless/03217_fliter_pushdown_no_keys.sql b/tests/queries/0_stateless/03217_fliter_pushdown_no_keys.sql
deleted file mode 100644
index cb8bf59e790..00000000000
--- a/tests/queries/0_stateless/03217_fliter_pushdown_no_keys.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-select * from ( select sum(last_seen) as dates_seen, materialize(1) as last_seen ) where last_seen > 2;
-select * from ( select sum(last_seen) as dates_seen, materialize(2) as last_seen ) where last_seen < 2;
-select * from ( select sum(last_seen) as dates_seen, materialize(2) as last_seen GROUP BY 'a' ) where last_seen < 2;
-
-select '---';
-select * from ( select sum(last_seen) as dates_seen, 1 as last_seen UNION ALL select sum(last_seen) as dates_seen, 3 as last_seen ) where last_seen < 2;
-
-select '---';
-select * from ( select sum(last_seen) as dates_seen, 1 as last_seen UNION ALL select sum(last_seen) as dates_seen, 3 as last_seen ) where last_seen > 2;
-
-select '---';
-with activity as (
-  select
-    groupUniqArrayState(toDate('2025-01-01 01:00:00')) as dates_seen,
-    toDateTime('2025-01-01 01:00:00') as last_seen
-  union all
-  select
-    groupUniqArrayState(toDate('2023-11-11 11:11:11')) as dates_seen,
-    toDateTime('2023-11-11 11:11:11') as last_seen
-)
-select last_seen from activity
-where last_seen < toDateTime('2020-01-01 00:00:00');
-select '---';
diff --git a/tests/queries/0_stateless/03217_primary_index_memory_leak.reference b/tests/queries/0_stateless/03217_primary_index_memory_leak.reference
deleted file mode 100644
index 4913dd5e690..00000000000
--- a/tests/queries/0_stateless/03217_primary_index_memory_leak.reference
+++ /dev/null
@@ -1 +0,0 @@
-150000
diff --git a/tests/queries/0_stateless/03217_primary_index_memory_leak.sql b/tests/queries/0_stateless/03217_primary_index_memory_leak.sql
deleted file mode 100644
index d5a553c7d72..00000000000
--- a/tests/queries/0_stateless/03217_primary_index_memory_leak.sql
+++ /dev/null
@@ -1,15 +0,0 @@
--- Tags: no-debug, no-tsan, no-msan, no-asan, no-random-settings, no-random-merge-tree-settings
-
-DROP TABLE IF EXISTS t_primary_index_memory;
-CREATE TABLE t_primary_index_memory (s String) ENGINE = MergeTree
-ORDER BY s SETTINGS index_granularity = 1;
-
-INSERT INTO t_primary_index_memory SELECT repeat('a', 10000) FROM numbers(150000)
-SETTINGS
-    max_block_size = 32,
-    max_memory_usage = '100M',
-    max_insert_block_size = 1024,
-    min_insert_block_size_rows = 1024;
-
-SELECT count() FROM t_primary_index_memory;
-DROP TABLE t_primary_index_memory;
diff --git a/tests/queries/0_stateless/03218_materialize_msan.reference b/tests/queries/0_stateless/03218_materialize_msan.reference
deleted file mode 100644
index eb84f35f9f4..00000000000
--- a/tests/queries/0_stateless/03218_materialize_msan.reference
+++ /dev/null
@@ -1 +0,0 @@
-[(NULL,'11\01111111\011111','1111')]		-2147483648	\N
diff --git a/tests/queries/0_stateless/03218_materialize_msan.sql b/tests/queries/0_stateless/03218_materialize_msan.sql
deleted file mode 100644
index 7e7043e687b..00000000000
--- a/tests/queries/0_stateless/03218_materialize_msan.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-SET enable_analyzer = 1;
-
-SELECT
-    materialize([(NULL, '11\01111111\011111', '1111')]) AS t,
-    (t[1048576]).2,
-    materialize(-2147483648),
-    (t[-2147483648]).1
-GROUP BY
-    materialize([(NULL, '1')]),
-    '',
-    (materialize((t[1023]).2), (materialize(''), (t[2147483647]).1, materialize(9223372036854775807)), (materialize(''), materialize(NULL, 2147483647, t[65535], 256)), materialize(NULL))
-; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
-
-SELECT
-    materialize([(NULL, '11\01111111\011111', '1111')]) AS t,
-    (t[1048576]).2,
-    materialize(-2147483648),
-    (t[-2147483648]).1
-GROUP BY
-    materialize([(NULL, '1')]),
-    '',
-    (materialize((t[1023]).2), (materialize(''), (t[2147483647]).1, materialize(9223372036854775807)), (materialize(''), materialize(NULL), materialize(2147483647), materialize(t[65535]), materialize(256)), materialize(NULL))
-;
diff --git a/tests/queries/0_stateless/03220_replace_formatting.reference b/tests/queries/0_stateless/03220_replace_formatting.reference
deleted file mode 100644
index cbcd63839b1..00000000000
--- a/tests/queries/0_stateless/03220_replace_formatting.reference
+++ /dev/null
@@ -1,16 +0,0 @@
-SELECT * REPLACE ((1 / 3) / 3 AS dummy)
-SELECT * REPLACE ((1 / 3) / 3 AS dummy)
-SELECT * REPLACE STRICT (1 AS id, 2 AS value)
-FROM
-(
-    SELECT
-        0 AS id,
-        1 AS value
-)
-SELECT * REPLACE STRICT (1 AS id, 2 AS value)
-FROM
-(
-    SELECT
-        0 AS id,
-        1 AS value
-)
diff --git a/tests/queries/0_stateless/03220_replace_formatting.sh b/tests/queries/0_stateless/03220_replace_formatting.sh
deleted file mode 100755
index 1c11ed6da8d..00000000000
--- a/tests/queries/0_stateless/03220_replace_formatting.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-q=$($CLICKHOUSE_FORMAT <<<"SELECT * REPLACE(1/3/3 AS dummy)")
-echo "$q"
-$CLICKHOUSE_FORMAT <<<"$q"
-
-# multiple columns
-q=$($CLICKHOUSE_FORMAT <<<"SELECT * REPLACE STRICT (1 AS id, 2 AS value) FROM (SELECT 0 id, 1 value)")
-echo "$q"
-$CLICKHOUSE_FORMAT <<<"$q"
diff --git a/tests/queries/0_stateless/03221_create_if_not_exists_setting.reference b/tests/queries/0_stateless/03221_create_if_not_exists_setting.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03221_create_if_not_exists_setting.sql b/tests/queries/0_stateless/03221_create_if_not_exists_setting.sql
deleted file mode 100644
index 18b3ed7bcec..00000000000
--- a/tests/queries/0_stateless/03221_create_if_not_exists_setting.sql
+++ /dev/null
@@ -1,24 +0,0 @@
--- Tags: no-parallel
-
-SET create_if_not_exists=0;  -- Default
-
-DROP TABLE IF EXISTS example_table;
-CREATE TABLE example_table (id UInt32) ENGINE=MergeTree() ORDER BY id;
-CREATE TABLE example_table (id UInt32) ENGINE=MergeTree() ORDER BY id; -- { serverError TABLE_ALREADY_EXISTS }
-
-DROP DATABASE IF EXISTS example_database;
-CREATE DATABASE example_database;
-CREATE DATABASE example_database; -- { serverError DATABASE_ALREADY_EXISTS }
-
-SET create_if_not_exists=1;
-
-DROP TABLE IF EXISTS example_table;
-CREATE TABLE example_table (id UInt32) ENGINE=MergeTree() ORDER BY id;
-CREATE TABLE example_table (id UInt32) ENGINE=MergeTree() ORDER BY id;
-
-DROP DATABASE IF EXISTS example_database;
-CREATE DATABASE example_database;
-CREATE DATABASE example_database;
-
-DROP DATABASE IF EXISTS example_database;
-DROP TABLE IF EXISTS example_table;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03221_incomplete_utf8_sequence.reference b/tests/queries/0_stateless/03221_incomplete_utf8_sequence.reference
deleted file mode 100644
index 4577427251d..00000000000
--- a/tests/queries/0_stateless/03221_incomplete_utf8_sequence.reference
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"meta":
-	[
-		{
-			"name": "unhex('f0')",
-			"type": "String"
-		}
-	],
-
-	"data":
-	[
-		["�"]
-	],
-
-	"rows": 1
-}
diff --git a/tests/queries/0_stateless/03221_incomplete_utf8_sequence.sql b/tests/queries/0_stateless/03221_incomplete_utf8_sequence.sql
deleted file mode 100644
index ee4f25f3b4a..00000000000
--- a/tests/queries/0_stateless/03221_incomplete_utf8_sequence.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SET output_format_write_statistics = 0;
-SELECT unhex('f0') FORMAT JSONCompact;
diff --git a/tests/queries/0_stateless/03221_insert_timeout_overflow_mode.reference b/tests/queries/0_stateless/03221_insert_timeout_overflow_mode.reference
deleted file mode 100644
index 68538c3f75b..00000000000
--- a/tests/queries/0_stateless/03221_insert_timeout_overflow_mode.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-QUERY_WAS_CANCELLED
-QUERY_WAS_CANCELLED
diff --git a/tests/queries/0_stateless/03221_insert_timeout_overflow_mode.sh b/tests/queries/0_stateless/03221_insert_timeout_overflow_mode.sh
deleted file mode 100755
index db943a665cb..00000000000
--- a/tests/queries/0_stateless/03221_insert_timeout_overflow_mode.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-${CLICKHOUSE_CLIENT} --query "create table null_t (number UInt64) engine = Null;"
-${CLICKHOUSE_CLIENT} --query "select sleep(0.1) from system.numbers settings max_block_size = 1 format Native" 2>/dev/null | ${CLICKHOUSE_CLIENT} --max_execution_time 0.3 --timeout_overflow_mode break --query "insert into null_t format Native" 2>&1 | grep -o "QUERY_WAS_CANCELLED"
diff --git a/tests/queries/0_stateless/03221_key_condition_bug.reference b/tests/queries/0_stateless/03221_key_condition_bug.reference
deleted file mode 100644
index e373ee695f6..00000000000
--- a/tests/queries/0_stateless/03221_key_condition_bug.reference
+++ /dev/null
@@ -1 +0,0 @@
-50
diff --git a/tests/queries/0_stateless/03221_key_condition_bug.sql b/tests/queries/0_stateless/03221_key_condition_bug.sql
deleted file mode 100644
index bac3e631a81..00000000000
--- a/tests/queries/0_stateless/03221_key_condition_bug.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-CREATE TABLE IF NOT EXISTS report_metrics_v2
-(
-	`a` UInt64
-) Engine = MergeTree()
-ORDER BY a;
-
-insert into report_metrics_v2 SELECT * FROM system.numbers LIMIT 50000;
-
-SELECT count(*) from report_metrics_v2 WHERE (intDiv(a, 50) = 200) AND (intDiv(a, 50000) = 0);
-
-DROP TABLE report_metrics_v2;
diff --git a/tests/queries/0_stateless/03221_merge_profile_events.reference b/tests/queries/0_stateless/03221_merge_profile_events.reference
deleted file mode 100644
index d969717336b..00000000000
--- a/tests/queries/0_stateless/03221_merge_profile_events.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-Horizontal	1	20000	3	0	480000	1	1	1	1
-Vertical	1	20000	1	2	480000	1	1	1	1	1	1
-Vertical	2	400000	2	6	12800000	1	1	1	1	1	1	1	1	1	1
diff --git a/tests/queries/0_stateless/03221_merge_profile_events.sql b/tests/queries/0_stateless/03221_merge_profile_events.sql
deleted file mode 100644
index 1aa3dd266f8..00000000000
--- a/tests/queries/0_stateless/03221_merge_profile_events.sql
+++ /dev/null
@@ -1,90 +0,0 @@
--- Tags: no-random-settings, no-random-merge-tree-settings
-
-DROP TABLE IF EXISTS t_merge_profile_events_1;
-
-CREATE TABLE t_merge_profile_events_1 (id UInt64, v1 UInt64, v2 UInt64)
-ENGINE = MergeTree ORDER BY id
-SETTINGS min_bytes_for_wide_part = 0;
-
-INSERT INTO t_merge_profile_events_1 SELECT number, number, number FROM numbers(10000);
-INSERT INTO t_merge_profile_events_1 SELECT number, number, number FROM numbers(10000);
-
-OPTIMIZE TABLE t_merge_profile_events_1 FINAL;
-SYSTEM FLUSH LOGS;
-
-SELECT
-    merge_algorithm,
-    ProfileEvents['Merge'],
-    ProfileEvents['MergedRows'],
-    ProfileEvents['MergedColumns'],
-    ProfileEvents['GatheredColumns'],
-    ProfileEvents['MergedUncompressedBytes'],
-    ProfileEvents['MergeTotalMilliseconds'] > 0,
-    ProfileEvents['MergeExecuteMilliseconds'] > 0,
-    ProfileEvents['MergeHorizontalStageTotalMilliseconds'] > 0,
-    ProfileEvents['MergeHorizontalStageExecuteMilliseconds'] > 0
-FROM system.part_log WHERE database = currentDatabase() AND table = 't_merge_profile_events_1' AND event_type = 'MergeParts' AND part_name = 'all_1_2_1';
-
-DROP TABLE IF EXISTS t_merge_profile_events_1;
-
-DROP TABLE IF EXISTS t_merge_profile_events_2;
-
-CREATE TABLE t_merge_profile_events_2 (id UInt64, v1 UInt64, v2 UInt64)
-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;
-
-INSERT INTO t_merge_profile_events_2 SELECT number, number, number FROM numbers(10000);
-INSERT INTO t_merge_profile_events_2 SELECT number, number, number FROM numbers(10000);
-
-OPTIMIZE TABLE t_merge_profile_events_2 FINAL;
-SYSTEM FLUSH LOGS;
-
-SELECT
-    merge_algorithm,
-    ProfileEvents['Merge'],
-    ProfileEvents['MergedRows'],
-    ProfileEvents['MergedColumns'],
-    ProfileEvents['GatheredColumns'],
-    ProfileEvents['MergedUncompressedBytes'],
-    ProfileEvents['MergeTotalMilliseconds'] > 0,
-    ProfileEvents['MergeExecuteMilliseconds'] > 0,
-    ProfileEvents['MergeHorizontalStageTotalMilliseconds'] > 0,
-    ProfileEvents['MergeHorizontalStageExecuteMilliseconds'] > 0,
-    ProfileEvents['MergeVerticalStageTotalMilliseconds'] > 0,
-    ProfileEvents['MergeVerticalStageExecuteMilliseconds'] > 0,
-FROM system.part_log WHERE database = currentDatabase() AND table = 't_merge_profile_events_2' AND event_type = 'MergeParts' AND part_name = 'all_1_2_1';
-
-DROP TABLE IF EXISTS t_merge_profile_events_2;
-
-DROP TABLE IF EXISTS t_merge_profile_events_3;
-
-CREATE TABLE t_merge_profile_events_3 (id UInt64, v1 UInt64, v2 UInt64, PROJECTION p (SELECT v2, v2 * v2, v2 * 2, v2 * 10, v1 ORDER BY v1))
-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;
-
-INSERT INTO t_merge_profile_events_3 SELECT number, number, number FROM numbers(100000);
-INSERT INTO t_merge_profile_events_3 SELECT number, number, number FROM numbers(100000);
-
-OPTIMIZE TABLE t_merge_profile_events_3 FINAL;
-SYSTEM FLUSH LOGS;
-
-SELECT
-    merge_algorithm,
-    ProfileEvents['Merge'],
-    ProfileEvents['MergedRows'],
-    ProfileEvents['MergedColumns'],
-    ProfileEvents['GatheredColumns'],
-    ProfileEvents['MergedUncompressedBytes'],
-    ProfileEvents['MergeTotalMilliseconds'] > 0,
-    ProfileEvents['MergeExecuteMilliseconds'] > 0,
-    ProfileEvents['MergeHorizontalStageTotalMilliseconds'] > 0,
-    ProfileEvents['MergeHorizontalStageExecuteMilliseconds'] > 0,
-    ProfileEvents['MergeVerticalStageTotalMilliseconds'] > 0,
-    ProfileEvents['MergeVerticalStageExecuteMilliseconds'] > 0,
-    ProfileEvents['MergeProjectionStageTotalMilliseconds'] > 0,
-    ProfileEvents['MergeProjectionStageExecuteMilliseconds'] > 0,
-    ProfileEvents['MergeExecuteMilliseconds'] <= duration_ms,
-    ProfileEvents['MergeTotalMilliseconds'] <= duration_ms
-FROM system.part_log WHERE database = currentDatabase() AND table = 't_merge_profile_events_3' AND event_type = 'MergeParts' AND part_name = 'all_1_2_1';
-
-DROP TABLE IF EXISTS t_merge_profile_events_3;
diff --git a/tests/queries/0_stateless/03221_mutate_profile_events.reference b/tests/queries/0_stateless/03221_mutate_profile_events.reference
deleted file mode 100644
index d094c37ff88..00000000000
--- a/tests/queries/0_stateless/03221_mutate_profile_events.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-3	2	1	10000	160000	0	1	1	1
-4	2	1	10000	320000	1	0	1	1
diff --git a/tests/queries/0_stateless/03221_mutate_profile_events.sh b/tests/queries/0_stateless/03221_mutate_profile_events.sh
deleted file mode 100755
index 3758db905e0..00000000000
--- a/tests/queries/0_stateless/03221_mutate_profile_events.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-random-settings, no-random-merge-tree-settings
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-${CLICKHOUSE_CLIENT} --query "
-    DROP TABLE IF EXISTS t_mutate_profile_events;
-
-    CREATE TABLE t_mutate_profile_events (key UInt64, id UInt64, v1 UInt64, v2 UInt64)
-    ENGINE = MergeTree ORDER BY id PARTITION BY key
-    SETTINGS min_bytes_for_wide_part = 0;
-
-    INSERT INTO t_mutate_profile_events SELECT 1, number, number, number FROM numbers(10000);
-    INSERT INTO t_mutate_profile_events SELECT 2, number, number, number FROM numbers(10000);
-
-    SET mutations_sync = 2;
-
-    ALTER TABLE t_mutate_profile_events UPDATE v1 = 1000 WHERE key = 1;
-    ALTER TABLE t_mutate_profile_events DELETE WHERE key = 2 AND v2 % 10 = 0;
-"
-
-# Mutation query may return before the entry is added to part log.
-# So, we may have to retry the flush of logs until all entries are actually flushed.
-for _ in {1..10}; do
-    ${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS"
-    res=$(${CLICKHOUSE_CLIENT} --query "SELECT count() FROM system.part_log WHERE database = currentDatabase() AND table = 't_mutate_profile_events' AND event_type = 'MutatePart'")
-
-    if [[ $res -eq 4 ]]; then
-        break
-    fi
-
-    sleep 2.0
-done
-
-${CLICKHOUSE_CLIENT} --query "
-    SELECT
-        splitByChar('_', part_name)[-1] AS version,
-        sum(ProfileEvents['MutationTotalParts']),
-        sum(ProfileEvents['MutationUntouchedParts']),
-        sum(ProfileEvents['MutatedRows']),
-        sum(ProfileEvents['MutatedUncompressedBytes']),
-        sum(ProfileEvents['MutationAllPartColumns']),
-        sum(ProfileEvents['MutationSomePartColumns']),
-        sum(ProfileEvents['MutationTotalMilliseconds']) > 0,
-        sum(ProfileEvents['MutationExecuteMilliseconds']) > 0,
-    FROM system.part_log
-    WHERE database = currentDatabase() AND table = 't_mutate_profile_events' AND event_type = 'MutatePart'
-    GROUP BY version ORDER BY version;
-
-    DROP TABLE IF EXISTS t_mutate_profile_events;
-"
diff --git a/tests/queries/0_stateless/03221_mutation_analyzer_skip_part.sh b/tests/queries/0_stateless/03221_mutation_analyzer_skip_part.sh
deleted file mode 100755
index 03fd15f54e2..00000000000
--- a/tests/queries/0_stateless/03221_mutation_analyzer_skip_part.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-random-settings, no-random-merge-tree-settings
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-${CLICKHOUSE_CLIENT} --query "
-    DROP TABLE IF EXISTS t_mutate_skip_part;
-
-    CREATE TABLE t_mutate_skip_part (key UInt64, id UInt64, v1 UInt64, v2 UInt64)
-    ENGINE = MergeTree ORDER BY id PARTITION BY key
-    SETTINGS min_bytes_for_wide_part = 0;
-
-    INSERT INTO t_mutate_skip_part SELECT 1, number, number, number FROM numbers(10000);
-    INSERT INTO t_mutate_skip_part SELECT 2, number, number, number FROM numbers(10000);
-
-    SET mutations_sync = 2;
-    ALTER TABLE t_mutate_skip_part UPDATE v1 = 1000 WHERE key = 1;
-    ALTER TABLE t_mutate_skip_part DELETE WHERE key = 2 AND v2 % 10 = 0;
-"
-
-# Mutation query may return before the entry is added to part log.
-# So, we may have to retry the flush of logs until all entries are actually flushed.
-for _ in {1..10}; do
-    ${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS"
-    res=$(${CLICKHOUSE_CLIENT} --query "SELECT count() FROM system.part_log WHERE database = currentDatabase() AND table = 't_mutate_skip_part' AND event_type = 'MutatePart'")
-
-    if [[ $res -eq 4 ]]; then
-        break
-    fi
-
-    sleep 2.0
-done
-
-${CLICKHOUSE_CLIENT} --query "
-    SYSTEM FLUSH LOGS;
-
-    -- If part is skipped in mutation and hardlinked then read_rows must be 0.
-    SELECT part_name, read_rows
-    FROM system.part_log
-    WHERE database = currentDatabase() AND table = 't_mutate_skip_part' AND event_type = 'MutatePart'
-    ORDER BY part_name;
-
-    DROP TABLE IF EXISTS t_mutate_skip_part;
-"
diff --git a/tests/queries/0_stateless/03221_mutation_analyzer_skip_part.sql b/tests/queries/0_stateless/03221_mutation_analyzer_skip_part.sql
new file mode 100644
index 00000000000..bf9a10e2af4
--- /dev/null
+++ b/tests/queries/0_stateless/03221_mutation_analyzer_skip_part.sql
@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS t_mutate_skip_part;
+
+CREATE TABLE t_mutate_skip_part (key UInt64, id UInt64, v1 UInt64, v2 UInt64) ENGINE = MergeTree ORDER BY id PARTITION BY key;
+
+INSERT INTO t_mutate_skip_part SELECT 1, number, number, number FROM numbers(10000);
+INSERT INTO t_mutate_skip_part SELECT 2, number, number, number FROM numbers(10000);
+
+SET mutations_sync = 2;
+
+ALTER TABLE t_mutate_skip_part UPDATE v1 = 1000 WHERE key = 1;
+ALTER TABLE t_mutate_skip_part DELETE WHERE key = 2 AND v2 % 10 = 0;
+
+SYSTEM FLUSH LOGS;
+
+-- If part is skipped in mutation and hardlinked then read_rows must be 0.
+SELECT part_name, read_rows
+FROM system.part_log
+WHERE database = currentDatabase() AND table = 't_mutate_skip_part' AND event_type = 'MutatePart'
+ORDER BY part_name;
+
+DROP TABLE IF EXISTS t_mutate_skip_part;
diff --git a/tests/queries/0_stateless/03221_refreshable_matview_progress.reference b/tests/queries/0_stateless/03221_refreshable_matview_progress.reference
deleted file mode 100644
index 5ed392e61c7..00000000000
--- a/tests/queries/0_stateless/03221_refreshable_matview_progress.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-0
-4	4	1
diff --git a/tests/queries/0_stateless/03221_refreshable_matview_progress.sql b/tests/queries/0_stateless/03221_refreshable_matview_progress.sql
deleted file mode 100644
index 98e1c48478d..00000000000
--- a/tests/queries/0_stateless/03221_refreshable_matview_progress.sql
+++ /dev/null
@@ -1,20 +0,0 @@
--- Tags: no-replicated-database, no-ordinary-database
-
-set allow_experimental_refreshable_materialized_view=1;
-
-CREATE MATERIALIZED VIEW 03221_rmv
-REFRESH AFTER 10 SECOND
-(
-x UInt64
-)
-ENGINE = Memory
-AS SELECT number AS x
-FROM numbers(3)
-UNION ALL
-SELECT rand64() AS x;
-
-SELECT sleep(2);
-
-SELECT read_rows, total_rows, progress FROM system.view_refreshes WHERE database = currentDatabase() and view = '03221_rmv';
-
-DROP TABLE 03221_rmv;
diff --git a/tests/queries/0_stateless/03221_s3_imds_decent_timeout.sh b/tests/queries/0_stateless/03221_s3_imds_decent_timeout.sh
deleted file mode 100755
index 021278955cd..00000000000
--- a/tests/queries/0_stateless/03221_s3_imds_decent_timeout.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest, no-asan, no-msan, no-tsan
-# ^ requires S3
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-# Inaccessible IMDS should not introduce large delays, so this query should reply quickly at least sometimes:
-while true
-do
-    # This host (likely) drops packets sent to it (does not reply), so it is good for testing timeouts.
-    # At the same time, we expect that the clickhouse host does not drop packets and quickly replies with 4xx, which is a non-retriable error for S3.
-    AWS_EC2_METADATA_SERVICE_ENDPOINT='https://10.255.255.255/' ${CLICKHOUSE_LOCAL} --time --query "SELECT * FROM s3('${CLICKHOUSE_PORT_HTTP_PROTO}://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_HTTP}/nonexistent')" |& grep -v -F 404 |
-        ${CLICKHOUSE_LOCAL} --input-format TSV "SELECT c1::Float64 < 1 FROM table" | grep 1 && break
-done
diff --git a/tests/queries/0_stateless/03222_create_timeseries_table.reference b/tests/queries/0_stateless/03222_create_timeseries_table.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03222_create_timeseries_table.sql b/tests/queries/0_stateless/03222_create_timeseries_table.sql
deleted file mode 100644
index bdb29e7d366..00000000000
--- a/tests/queries/0_stateless/03222_create_timeseries_table.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-SET allow_experimental_time_series_table = 1;
-
-CREATE TABLE 03222_timeseries_table1 ENGINE = TimeSeries FORMAT Null;
-CREATE TABLE 03222_timeseries_table2 ENGINE = TimeSeries SETTINGS store_min_time_and_max_time = 1, aggregate_min_time_and_max_time = 1 FORMAT Null;
---- This doesn't work because allow_nullable_key cannot be set in query for the internal MergeTree tables
---- CREATE TABLE 03222_timeseries_table3 ENGINE = TimeSeries SETTINGS store_min_time_and_max_time = 1, aggregate_min_time_and_max_time = 0;
-CREATE TABLE 03222_timeseries_table4 ENGINE = TimeSeries SETTINGS store_min_time_and_max_time = 0 FORMAT Null;
diff --git a/tests/queries/0_stateless/03222_date_time_inference.reference b/tests/queries/0_stateless/03222_date_time_inference.reference
deleted file mode 100644
index 221ab1fe5f5..00000000000
--- a/tests/queries/0_stateless/03222_date_time_inference.reference
+++ /dev/null
@@ -1,273 +0,0 @@
-Date
-2020-01-01	Date
-2020-01-01	Date
-2020-01-01	Date
-2020-01-01	Date
-2020-01-01	Date
-2020-01-01	Date
-2020-01-01	Date
-2020-01-01	Date
-2020-01-01	Date
-2020-01-01	Date
-2020-01-01	Date
-2020-01-01	Date
-String
-2020_01_01	String
-2020_1_01	String
-2020_01_1	String
-2020_1_1	String
-2020a01a01	String
-2020a1a01	String
-2020a01a1	String
-2020a1a1	String
-20200101	String
-DateTime
-2020-01-02 18:42:42	DateTime
-2020-01-02 18:42:42	DateTime
-2020-01-02 18:42:42	DateTime
-String
-2020_01_01 42:42:42	String
-2020a01a01 42:42:42	String
-2020-01-01 42.42.42	String
-2020-01-01 42 42 42	String
-2020-01-01 42a42a42	String
-DateTime64
-2020-01-02 18:42:42.424200000	DateTime64(9)
-2020-01-02 18:42:42.424200000	DateTime64(9)
-2020-01-02 18:42:42.424200000	DateTime64(9)
-String
-2020_01_01 42:42:42.4242	String
-2020a01a01 42:42:42.4242	String
-2020-01-01 42.42.42.4242	String
-2020-01-01 42 42 42.4242	String
-2020-01-01 42a42a42.4242	String
-DateTime/DateTime64 best effort
-2000-01-01 00:00:00	DateTime
-2000-01-01 01:00:00	DateTime
-2000-01-01 01:00:00.000000000	DateTime64(9)
-02/01/17 010203 MSK	String
-02/01/17 010203.000 MSK	String
-02/01/17 010203 MSK+0100	String
-02/01/17 010203.000 MSK+0100	String
-02/01/17 010203 UTC+0300	String
-02/01/17 010203.000 UTC+0300	String
-02/01/17 010203Z	String
-02/01/17 010203.000Z	String
-02/01/1970 010203Z	String
-02/01/1970 010203.000Z	String
-02/01/70 010203Z	String
-02/01/70 010203.000Z	String
-2018-02-11 03:40:50	DateTime
-2018-02-11 03:40:50.000000000	DateTime64(9)
-2000-04-17 01:02:03	DateTime
-2000-04-17 01:02:03.000000000	DateTime64(9)
-19700102 01:00:00	String
-19700102 01:00:00.000	String
-19700102010203Z	String
-19700102010203Z.000	String
-1970/01/02 010203Z	String
-1970/01/02 010203.000Z	String
-2015-12-31 20:00:00	DateTime
-2015-12-31 20:00:00	DateTime
-2016-01-01 00:00:00	DateTime
-2016-01-01 00:00:00	DateTime
-201701 02 010203 UTC+0300	String
-201701 02 010203.000 UTC+0300	String
-2017-01-02 03:04:05	DateTime
-2017-01-02 03:04:05.000000000	DateTime64(9)
-2017-01-02 03:04:05	DateTime
-2017-01-02 03:04:05.000000000	DateTime64(9)
-2017-01-02 03:04:05	DateTime
-2017-01-02 03:04:05.000000000	DateTime64(9)
-2017-01-02 03:04:05	DateTime
-2017-01-02 03:04:05.000000000	DateTime64(9)
-2017-01-02 04:04:05	DateTime
-2017-01-02 04:04:05.000000000	DateTime64(9)
-2017-01-02 02:34:05	DateTime
-2017-01-02 02:34:05.000000000	DateTime64(9)
-2017-01-02 00:04:05	DateTime
-2017-01-02 00:04:05.000000000	DateTime64(9)
-2017-01-02 02:04:05	DateTime
-2017-01-02 02:04:05.000000000	DateTime64(9)
-2017-01-02 00:04:05	DateTime
-2017-01-02 00:04:05.000000000	DateTime64(9)
-2017-01-01 18:04:05	DateTime
-2017-01-01 18:04:05.000000000	DateTime64(9)
-2017-01-02 03:04:05	DateTime
-2017-01-02 03:04:05.000000000	DateTime64(9)
-2017-01-01 23:04:05	DateTime
-2017-01-01 23:04:05.000000000	DateTime64(9)
-2017-02-01 23:04:05	DateTime
-2017-02-01 23:04:05.000000000	DateTime64(9)
-2017-06-01 23:04:05	DateTime
-2017-06-01 23:04:05.000000000	DateTime64(9)
-2017-01-02 00:04:05	DateTime
-2017-01-02 00:04:05.000000000	DateTime64(9)
-2017-01-02 03:04:05	DateTime
-2017-01-02 03:04:05.000000000	DateTime64(9)
-2017-01-02 03:04:05	DateTime
-2017-01-02 03:04:05.000000000	DateTime64(9)
-2017-01-02 04:04:05	DateTime
-2017-01-02 04:04:05.000000000	DateTime64(9)
-2017-01-02 04:04:05	DateTime
-2017-01-02 04:04:05.000000000	DateTime64(9)
-2017-01-02 02:04:05	DateTime
-2017-01-02 02:04:05.000000000	DateTime64(9)
-2017-01-02 03:04:05	DateTime
-2017-01-02 03:04:05.000000000	DateTime64(9)
-2017-04-01 11:22:33	DateTime
-2017-04-01 11:22:33.000000000	DateTime64(9)
-2017 Apr 02 010203 UTC+0300	String
-2017 Apr 02 010203.000 UTC+0300	String
-2017-04-01 22:02:03	DateTime
-2017-04-01 22:02:03.000000000	DateTime64(9)
-2017-04-02 01:02:03	DateTime
-2017-04-02 01:02:03.000000000	DateTime64(9)
-2017-04-02 11:22:33	DateTime
-2017-04-02 11:22:33.000000000	DateTime64(9)
-2017-04-02 01:02:03	DateTime
-2017-04-02 01:02:03.000000000	DateTime64(9)
-2017-04-02 01:22:33	DateTime
-2017-04-02 01:22:33.000000000	DateTime64(9)
-2017-04-02 01:02:03	DateTime
-2017-04-02 01:02:03.000000000	DateTime64(9)
-2017-04-02 01:02:33	DateTime
-2017-04-02 01:02:33.000000000	DateTime64(9)
-2017-04-01 22:02:03	DateTime
-2017-04-01 22:02:03.000000000	DateTime64(9)
-2017-04-02 01:02:03	DateTime
-2017-04-02 01:02:03.000000000	DateTime64(9)
-2017-04-01 22:02:03	DateTime
-2017-04-01 22:02:03.000000000	DateTime64(9)
-2017-04-01 21:02:03	DateTime
-2017-04-01 21:02:03.000000000	DateTime64(9)
-2017-04-02 01:02:03	DateTime
-2017-04-02 01:02:03.000000000	DateTime64(9)
-2017 Jan 02 010203 UTC+0300	String
-2017 Jan 02 010203.000 UTC+0300	String
-2017-04-25 01:02:03	DateTime
-2017-04-25 01:02:03.000000000	DateTime64(9)
-2017-04-25 01:02:03	DateTime
-2017-04-25 01:02:03.000000000	DateTime64(9)
-2017-01-25 01:02:03	DateTime
-2017-01-25 01:02:03.000000000	DateTime64(9)
-2017-01-24 22:02:03	DateTime
-2017-01-24 22:02:03.000000000	DateTime64(9)
-2017-01-25 13:02:03	DateTime
-2017-01-25 13:02:03.000000000	DateTime64(9)
-2017-01-25 01:02:03	DateTime
-2017-01-25 01:02:03.000000000	DateTime64(9)
-2017-01-25 01:02:03	DateTime
-2017-01-25 01:02:03.000000000	DateTime64(9)
-2017-01-24 22:02:03	DateTime
-2017-01-24 22:02:03.000000000	DateTime64(9)
-2017-01-24 22:02:03	DateTime
-2017-01-24 22:02:03.000000000	DateTime64(9)
-2017-01-25 10:02:03	DateTime
-2017-01-25 10:02:03.000000000	DateTime64(9)
-2017-01-25 10:02:03	DateTime
-2017-01-25 10:02:03.000000000	DateTime64(9)
-2017-01-25 10:02:03	DateTime
-2017-01-25 10:02:03.000000000	DateTime64(9)
-2017-01-25 09:32:03	DateTime
-2017-01-25 09:32:03.000000000	DateTime64(9)
-2017-01-25 01:02:03	DateTime
-2017-01-25 01:02:03.000000000	DateTime64(9)
-2017-01-25 13:02:03	DateTime
-2017-01-25 13:02:03.000000000	DateTime64(9)
-2017-01-25 13:02:03	DateTime
-2017-01-25 13:02:03.000000000	DateTime64(9)
-2017-01-25 10:02:03	DateTime
-2017-01-25 10:02:03.000000000	DateTime64(9)
-2018-02-11 03:40:50	DateTime
-2018-02-11 03:40:50.000000000	DateTime64(9)
-2018-02-11 03:40:50	DateTime
-2018-02-11 03:40:50.000000000	DateTime64(9)
-String
-2	String
-20	String
-200	String
-2000	String
-20000	String
-200001	String
-2000010	String
-20000101	String
-200001010	String
-2000010101	String
-20000101010	String
-200001010101	String
-2000010101010	String
-20000101010101	String
-2.1	String
-20.1	String
-200.1	String
-2000.1	String
-20000.1	String
-200001.1	String
-2000010.1	String
-20000101.1	String
-200001010.1	String
-2000010101.1	String
-20000101010.1	String
-200001010101.1	String
-2000010101010.1	String
-20000101010101.1	String
-Mar	String
-Mar1	String
-Mar 1	String
-Mar01	String
-Mar 01	String
-Mar2020	String
-Mar 2020	String
-Mar012020	String
-Mar 012020	String
-Mar01012020	String
-Mar 01012020	String
-Mar0101202001	String
-Mar 0101202001	String
-Mar010120200101	String
-Mar 010120200101	String
-Mar01012020010101	String
-Mar 01012020010101	String
-Mar01012020010101.000	String
-Mar 0101202001010101.000	String
-Sun	String
-Sun1	String
-Sun 1	String
-Sun01	String
-Sun 01	String
-Sun2020	String
-Sun 2020	String
-Sun012020	String
-Sun 012020	String
-Sun01012020	String
-Sun 01012020	String
-Sun0101202001	String
-Sun 0101202001	String
-Sun010120200101	String
-Sun 010120200101	String
-Sun01012020010101	String
-Sun 01012020010101	String
-Sun01012020010101.000	String
-Sun 0101202001010101.000	String
-2000 01 01 01:00:00	String
-2000 01 01 01:00:00.000	String
-2000a01a01 01:00:00	String
-2000a01a01 01:00:00.000	String
-2000-01-01 01 00 00	String
-2000-01-01 01 00 00.000	String
-2000-01-01 01-00-00	String
-2000-01-01 01-00-00.000	String
-2000-01-01 01a00a00	String
-2000-01-01 01a00a00.000	String
-2000-01 01:00:00	String
-2000-01 01:00:00.000	String
-2000 01	String
-2000-01	String
-Mar 2000 00:00:00	String
-Mar 2000 00:00:00.000	String
-2000 00:00:00	String
-2000 00:00:00.000	String
-Mar 2000-01-01 00:00:00	String
-Mar 2000-01-01 00:00:00.000	String
-1.7.10	String
diff --git a/tests/queries/0_stateless/03222_date_time_inference.sql b/tests/queries/0_stateless/03222_date_time_inference.sql
deleted file mode 100644
index b16f72c72f4..00000000000
--- a/tests/queries/0_stateless/03222_date_time_inference.sql
+++ /dev/null
@@ -1,288 +0,0 @@
-set input_format_try_infer_datetimes = 1;
-set input_format_try_infer_dates = 1;
-set schema_inference_make_columns_nullable = 0;
-set input_format_json_try_infer_numbers_from_strings = 0;
-set session_timezone = 'UTC';
-
-select 'Date';
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020:01:01"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020:1:01"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020:01:1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020:1:1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020-01-01"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020-1-01"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020-01-1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020-1-1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020/01/01"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020/1/01"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020/01/1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020/1/1"}');
-
-select 'String';
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020_01_01"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020_1_01"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020_01_1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020_1_1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020a01a01"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020a1a01"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020a01a1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020a1a1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "20200101"}');
-
-select 'DateTime';
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020:01:01 42:42:42"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020/01/01 42:42:42"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020-01-01 42:42:42"}');
-
-select 'String';
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020_01_01 42:42:42"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020a01a01 42:42:42"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020-01-01 42.42.42"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020-01-01 42 42 42"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020-01-01 42a42a42"}');
-
-select 'DateTime64';
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020:01:01 42:42:42.4242"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020/01/01 42:42:42.4242"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020-01-01 42:42:42.4242"}');
-
-select 'String';
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020_01_01 42:42:42.4242"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020a01a01 42:42:42.4242"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020-01-01 42.42.42.4242"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020-01-01 42 42 42.4242"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2020-01-01 42a42a42.4242"}');
-
-set date_time_input_format='best_effort';
-select 'DateTime/DateTime64 best effort';
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000-01-01 00:00:00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000-01-01 01:00:00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000-01-01 01:00:00.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "02/01/17 010203 MSK"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "02/01/17 010203.000 MSK"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "02/01/17 010203 MSK+0100"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "02/01/17 010203.000 MSK+0100"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "02/01/17 010203 UTC+0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "02/01/17 010203.000 UTC+0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "02/01/17 010203Z"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "02/01/17 010203.000Z"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "02/01/1970 010203Z"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "02/01/1970 010203.000Z"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "02/01/70 010203Z"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "02/01/70 010203.000Z"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "11 Feb 2018 06:40:50 +0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "11 Feb 2018 06:40:50.000 +0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "17 Apr 2000 2 1:2:3"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "17 Apr 2000 2 1:2:3.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "19700102 01:00:00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "19700102 01:00:00.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "19700102010203Z"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "19700102010203Z.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "1970/01/02 010203Z"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "1970/01/02 010203.000Z"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2016-01-01MSD"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2016-01-01 MSD"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2016-01-01UTC"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2016-01-01Z"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "201701 02 010203 UTC+0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "201701 02 010203.000 UTC+0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05+0"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05.000+0"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05+00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05.000+00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05+0000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05.000+0000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05 -0100"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05.000 -0100"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05+030"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05.000+030"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05+0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05.000+0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05+1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05.000+1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05+300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05.000+300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05+900"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05.000+900"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05GMT"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05.000GMT"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05 MSD"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05.000 MSD"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05 MSD Feb"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05.000 MSD Feb"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05 MSD Jun"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05.000 MSD Jun"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05 MSK"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02 03:04:05.000 MSK"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02T03:04:05"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02T03:04:05.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02T03:04:05+00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02T03:04:05.000+00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02T03:04:05 -0100"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02T03:04:05.000 -0100"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02T03:04:05-0100"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02T03:04:05.000-0100"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02T03:04:05+0100"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02T03:04:05.000+0100"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02T03:04:05Z"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017-01-02T03:04:05.000Z"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 01 11:22:33"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 01 11:22:33.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 010203 UTC+0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 010203.000 UTC+0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 01:2:3 UTC+0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 01:2:3.000 UTC+0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:02:3"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:02:3.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 11:22:33"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 11:22:33.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:2:03"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:2:03.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:22:33"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:22:33.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:2:3"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:2:3.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:2:33"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:2:33.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:2:3 MSK"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:2:3.000 MSK"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:2:3 UTC+0000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:2:3.000 UTC+0000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:2:3 UTC+0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:2:3.000 UTC+0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:2:3 UTC+0400"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 02 1:2:3.000 UTC+0400"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 2 1:2:3"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Apr 2 1:2:3.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Jan 02 010203 UTC+0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2017 Jan 02 010203.000 UTC+0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Apr 2017 01:02:03"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Apr 2017 01:02:03.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Apr 2017 1:2:3"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Apr 2017 1:2:3.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3 MSK"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3.000 MSK"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3 PM"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3.000 PM"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3Z"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3.000Z"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3 Z"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3.000 Z"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3 Z +0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3.000 Z +0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3 Z+03:00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3.000 Z+03:00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3 Z +03:00 PM"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3.000 Z +03:00 PM"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3 Z +0300 PM"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3.000 Z +0300 PM"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3 Z+03:00 PM"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3.000 Z+03:00 PM"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3 Z +03:30 PM"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3.000 Z +03:30 PM"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3Z Mon"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3.000Z Mon"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3 Z PM"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3.000 Z PM"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3Z PM"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3.000Z PM"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3 Z PM +03:00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "25 Jan 2017 1:2:3.000 Z PM +03:00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun 11 Feb 2018 06:40:50 +0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun 11 Feb 2018 06:40:50.000 +0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun, 11 Feb 2018 06:40:50 +0300"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun, 11 Feb 2018 06:40:50.000 +0300"}');
-
-select 'String';
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "20"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "200"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "20000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "200001"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000010"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "20000101"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "200001010"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000010101"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "20000101010"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "200001010101"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000010101010"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "20000101010101"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2.1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "20.1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "200.1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000.1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "20000.1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "200001.1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000010.1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "20000101.1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "200001010.1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000010101.1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "20000101010.1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "200001010101.1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000010101010.1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "20000101010101.1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar 1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar01"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar 01"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar2020"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar 2020"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar012020"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar 012020"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar01012020"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar 01012020"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar0101202001"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar 0101202001"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar010120200101"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar 010120200101"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar01012020010101"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar 01012020010101"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar01012020010101.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar 0101202001010101.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun 1"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun01"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun 01"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun2020"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun 2020"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun012020"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun 012020"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun01012020"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun 01012020"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun0101202001"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun 0101202001"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun010120200101"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun 010120200101"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun01012020010101"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun 01012020010101"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun01012020010101.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Sun 0101202001010101.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000 01 01 01:00:00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000 01 01 01:00:00.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000a01a01 01:00:00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000a01a01 01:00:00.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000-01-01 01 00 00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000-01-01 01 00 00.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000-01-01 01-00-00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000-01-01 01-00-00.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000-01-01 01a00a00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000-01-01 01a00a00.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000-01 01:00:00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000-01 01:00:00.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000 01"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000-01"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar 2000 00:00:00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar 2000 00:00:00.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000 00:00:00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "2000 00:00:00.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar 2000-01-01 00:00:00"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "Mar 2000-01-01 00:00:00.000"}');
-select x, toTypeName(x) from format(JSONEachRow, '{"x" : "1.7.10"}');
-
diff --git a/tests/queries/0_stateless/03222_json_squashing.reference b/tests/queries/0_stateless/03222_json_squashing.reference
deleted file mode 100644
index d0c19d8239a..00000000000
--- a/tests/queries/0_stateless/03222_json_squashing.reference
+++ /dev/null
@@ -1,102 +0,0 @@
-All paths
-a
-b
-c
-d
-Dynamic paths
-a
-b
-c
-d
-Shared data paths
-All paths
-a
-b
-c
-d
-e
-f
-Dynamic paths
-a
-b
-c
-d
-e
-f
-Shared data paths
-All paths
-a
-b
-c
-d
-Dynamic paths
-c
-d
-Shared data paths
-a
-b
-All paths
-a
-b
-c
-d
-e
-f
-Dynamic paths
-a
-b
-Shared data paths
-c
-d
-e
-f
-All paths
-a
-b
-c
-d
-e
-Dynamic paths
-a
-e
-Shared data paths
-b
-c
-d
-All paths
-b
-c
-d
-e
-Dynamic paths
-d
-e
-Shared data paths
-b
-c
-All paths
-b
-c
-d
-e
-f
-g
-Dynamic paths
-b
-c
-Shared data paths
-d
-e
-f
-g
-All paths
-b
-d
-e
-f
-Dynamic paths
-b
-f
-Shared data paths
-d
-e
diff --git a/tests/queries/0_stateless/03222_json_squashing.sql b/tests/queries/0_stateless/03222_json_squashing.sql
deleted file mode 100644
index 53090c5cb88..00000000000
--- a/tests/queries/0_stateless/03222_json_squashing.sql
+++ /dev/null
@@ -1,82 +0,0 @@
--- Tags: long
-
-set allow_experimental_json_type = 1;
-set max_block_size = 1000;
-
-drop table if exists test;
-
-create table test (json JSON) engine=MergeTree order by tuple();
-insert into test select multiIf(number < 1000, '{}'::JSON, number < 3000, '{"a" : 42, "b" : "Hello"}'::JSON, '{"c" : [1, 2, 3], "d" : "2020-01-01"}'::JSON) from numbers(20000);
-select 'All paths';
-select distinct arrayJoin(JSONAllPaths(json)) as path from test order by path;
-select 'Dynamic paths';
-select distinct arrayJoin(JSONDynamicPaths(json)) as path from test order by path;
-select 'Shared data paths';
-select distinct arrayJoin(JSONSharedDataPaths(json)) as path from test order by path;
-
-truncate table test;
-insert into test select multiIf(number < 1000, '{"a" : 42, "b" : "Hello"}'::JSON, number < 3000, '{"c" : [1, 2, 3], "d" : "2020-01-01"}'::JSON, '{"e" : 43, "f" : ["s1", "s2", "s3"]}'::JSON) from numbers(20000);
-select 'All paths';
-select distinct arrayJoin(JSONAllPaths(json)) as path from test order by path;
-select 'Dynamic paths';
-select distinct arrayJoin(JSONDynamicPaths(json)) as path from test order by path;
-select 'Shared data paths';
-select distinct arrayJoin(JSONSharedDataPaths(json)) as path from test order by path;
-
-drop table test;
-create table test (json JSON(max_dynamic_paths=2)) engine=MergeTree order by tuple();
-insert into test select multiIf(number < 1000, '{}'::JSON(max_dynamic_paths=2), number < 3000, '{"a" : 42, "b" : "Hello"}'::JSON(max_dynamic_paths=2), '{"c" : [1, 2, 3], "d" : "2020-01-01"}'::JSON(max_dynamic_paths=2)) from numbers(20000);
-select 'All paths';
-select distinct arrayJoin(JSONAllPaths(json)) as path from test order by path;
-select 'Dynamic paths';
-select distinct arrayJoin(JSONDynamicPaths(json)) as path from test order by path;
-select 'Shared data paths';
-select distinct arrayJoin(JSONSharedDataPaths(json)) as path from test order by path;
-
-truncate table test;
-insert into test select multiIf(number < 1000, '{"a" : 42, "b" : "Hello"}'::JSON(max_dynamic_paths=2), number < 3000, '{"c" : [1, 2, 3], "d" : "2020-01-01"}'::JSON(max_dynamic_paths=2), '{"e" : 43, "f" : ["s1", "s2", "s3"]}'::JSON(max_dynamic_paths=2)) from numbers(20000);
-select 'All paths';
-select distinct arrayJoin(JSONAllPaths(json)) as path from test order by path;
-select 'Dynamic paths';
-select distinct arrayJoin(JSONDynamicPaths(json)) as path from test order by path;
-select 'Shared data paths';
-select distinct arrayJoin(JSONSharedDataPaths(json)) as path from test order by path;
-
-truncate table test;
-insert into test select multiIf(number < 1000, '{"a" : 42}'::JSON(max_dynamic_paths=2), number < 3000, '{"b" : "Hello", "c" : [1, 2, 3], "d" : "2020-01-01"}'::JSON(max_dynamic_paths=2), '{"e" : 43}'::JSON(max_dynamic_paths=2)) from numbers(20000);
-select 'All paths';
-select distinct arrayJoin(JSONAllPaths(json)) as path from test order by path;
-select 'Dynamic paths';
-select distinct arrayJoin(JSONDynamicPaths(json)) as path from test order by path;
-select 'Shared data paths';
-select distinct arrayJoin(JSONSharedDataPaths(json)) as path from test order by path;
-
-drop table test;
-create table test (json JSON(max_dynamic_paths=8)) engine=MergeTree order by tuple();
-insert into test select multiIf(number < 1000, '{}'::JSON(max_dynamic_paths=8), number < 3000, materialize('{"a" : [{"b" : 42, "c" : [1, 2, 3]}]}')::JSON(max_dynamic_paths=8), materialize('{"a" : [{"d" : "2020-01-01", "e" : "Hello"}]}')::JSON(max_dynamic_paths=8)) from numbers(20000);
-select 'All paths';
-select distinct arrayJoin(JSONAllPaths(arrayJoin(json.a[]))) as path from test order by path;
-select 'Dynamic paths';
-select distinct arrayJoin(JSONDynamicPaths(arrayJoin(json.a[]))) as path from test order by path;
-select 'Shared data paths';
-select distinct arrayJoin(JSONSharedDataPaths(arrayJoin(json.a[]))) as path from test order by path;
-
-truncate table test;
-insert into test select multiIf(number < 1000,  materialize('{"a" : [{"b" : 42, "c" : [1, 2, 3]}]}')::JSON(max_dynamic_paths=8), number < 3000, materialize('{"a" : [{"d" : "2020-01-01", "e" : "Hello"}]}')::JSON(max_dynamic_paths=8), materialize('{"a" : [{"f" : "2020-01-01 00:00:00", "g" : "Hello2"}]}')::JSON(max_dynamic_paths=8)) from numbers(20000);
-select 'All paths';
-select distinct arrayJoin(JSONAllPaths(arrayJoin(json.a[]))) as path from test order by path;
-select 'Dynamic paths';
-select distinct arrayJoin(JSONDynamicPaths(arrayJoin(json.a[]))) as path from test order by path;
-select 'Shared data paths';
-select distinct arrayJoin(JSONSharedDataPaths(arrayJoin(json.a[]))) as path from test order by path;
-
-truncate table test;
-insert into test select multiIf(number < 1000,  materialize('{"a" : [{"b" : 42}]}')::JSON(max_dynamic_paths=8), number < 3000, materialize('{"a" : [{"d" : "2020-01-01", "e" : "Hello"}]}')::JSON(max_dynamic_paths=8), materialize('{"a" : [{"f" : "2020-01-01 00:00:00"}]}')::JSON(max_dynamic_paths=8)) from numbers(20000);
-select 'All paths';
-select distinct arrayJoin(JSONAllPaths(arrayJoin(json.a[]))) as path from test order by path;
-select 'Dynamic paths';
-select distinct arrayJoin(JSONDynamicPaths(arrayJoin(json.a[]))) as path from test order by path;
-select 'Shared data paths';
-select distinct arrayJoin(JSONSharedDataPaths(arrayJoin(json.a[]))) as path from test order by path;
-
-drop table test;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03222_parallel_replicas_final_in_subquery.reference b/tests/queries/0_stateless/03222_parallel_replicas_final_in_subquery.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03222_parallel_replicas_final_in_subquery.sql b/tests/queries/0_stateless/03222_parallel_replicas_final_in_subquery.sql
deleted file mode 100644
index 6c2e05c12a9..00000000000
--- a/tests/queries/0_stateless/03222_parallel_replicas_final_in_subquery.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-DROP TABLE IF EXISTS test_00808;
-
-CREATE TABLE test_00808
-(
-    `date` Date,
-    `id` Int8,
-    `name` String,
-    `value` Int64,
-    `sign` Int8
-)
-ENGINE = CollapsingMergeTree(sign)
-ORDER BY (id, date);
-
-INSERT INTO test_00808 VALUES('2000-01-01', 1, 'test string 1', 1, 1);
-INSERT INTO test_00808 VALUES('2000-01-01', 2, 'test string 2', 2, 1);
-
-SET allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 3, parallel_replicas_for_non_replicated_merge_tree=1, cluster_for_parallel_replicas='test_cluster_one_shard_three_replicas_localhost';
-
-SELECT * FROM (SELECT * FROM test_00808 FINAL) WHERE id = 1; -- { serverError SUPPORT_IS_DISABLED }
-
-DROP TABLE test_00808;
diff --git a/tests/queries/0_stateless/03222_parallel_replicas_min_marks_to_read_overflow.reference b/tests/queries/0_stateless/03222_parallel_replicas_min_marks_to_read_overflow.reference
deleted file mode 100644
index b6c452ba328..00000000000
--- a/tests/queries/0_stateless/03222_parallel_replicas_min_marks_to_read_overflow.reference
+++ /dev/null
@@ -1,21 +0,0 @@
-1006
-1007
-1008
-1009
-101
-1010
-1011
-1012
-1013
-1014
----
-100	100
-101	101
-102	102
-103	103
-104	104
-105	105
-106	106
-107	107
-108	108
-109	109
diff --git a/tests/queries/0_stateless/03222_parallel_replicas_min_marks_to_read_overflow.sql b/tests/queries/0_stateless/03222_parallel_replicas_min_marks_to_read_overflow.sql
deleted file mode 100644
index 6f486f8f0fe..00000000000
--- a/tests/queries/0_stateless/03222_parallel_replicas_min_marks_to_read_overflow.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-DROP TABLE IF EXISTS test__fuzz_22 SYNC;
-
-CREATE TABLE test__fuzz_22 (k Float32, v String) ENGINE = ReplicatedMergeTree('/clickhouse/03222/{database}/test__fuzz_22', 'r1') ORDER BY k SETTINGS index_granularity = 1;
-
-INSERT INTO test__fuzz_22 SELECT number, toString(number) FROM numbers(10_000);
-
-SET allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 3, cluster_for_parallel_replicas='test_cluster_one_shard_three_replicas_localhost';
-
-SELECT v
-FROM test__fuzz_22
-ORDER BY v
-LIMIT 10, 10
-SETTINGS merge_tree_min_rows_for_concurrent_read = 9223372036854775806;
-
-SELECT '---';
-
-SELECT k, v
-FROM test__fuzz_22
-ORDER BY k
-LIMIT 100, 10
-SETTINGS optimize_read_in_order=1, merge_tree_min_rows_for_concurrent_read = 9223372036854775806;
-
-DROP TABLE test__fuzz_22 SYNC;
diff --git a/tests/queries/0_stateless/03222_pr_asan_index_granularity.reference b/tests/queries/0_stateless/03222_pr_asan_index_granularity.reference
deleted file mode 100644
index 662880055bd..00000000000
--- a/tests/queries/0_stateless/03222_pr_asan_index_granularity.reference
+++ /dev/null
@@ -1,100 +0,0 @@
-0	18	9899
-0	18	9898
-0	18	9897
-0	18	9896
-0	18	9895
-0	18	9894
-0	18	9893
-0	18	9892
-0	18	9891
-0	18	9890
-0	18	9889
-0	18	9888
-0	18	9887
-0	18	9886
-0	18	9885
-0	18	9884
-0	18	9883
-0	18	9882
-0	18	9881
-0	18	9880
-0	18	9879
-0	18	9878
-0	18	9877
-0	18	9876
-0	18	9875
-0	18	9874
-0	18	9873
-0	18	9872
-0	18	9871
-0	18	9870
-0	18	9869
-0	18	9868
-0	18	9867
-0	18	9866
-0	18	9865
-0	18	9864
-0	18	9863
-0	18	9862
-0	18	9861
-0	18	9860
-0	18	9859
-0	18	9858
-0	18	9857
-0	18	9856
-0	18	9855
-0	18	9854
-0	18	9853
-0	18	9852
-0	18	9851
-0	18	9850
-0	18	9849
-0	18	9848
-0	18	9847
-0	18	9846
-0	18	9845
-0	18	9844
-0	18	9843
-0	18	9842
-0	18	9841
-0	18	9840
-0	18	9839
-0	18	9838
-0	18	9837
-0	18	9836
-0	18	9835
-0	18	9834
-0	18	9833
-0	18	9832
-0	18	9831
-0	18	9830
-0	18	9829
-0	18	9828
-0	18	9827
-0	18	9826
-0	18	9825
-0	18	9824
-0	18	9823
-0	18	9822
-0	18	9821
-0	18	9820
-0	18	9819
-0	18	9818
-0	18	9817
-0	18	9816
-0	18	9815
-0	18	9814
-0	18	9813
-0	18	9812
-0	18	9811
-0	18	9810
-0	18	9809
-0	18	9808
-0	18	9807
-0	18	9806
-0	18	9805
-0	18	9804
-0	18	9803
-0	18	9802
-0	18	9801
-0	18	9800
diff --git a/tests/queries/0_stateless/03222_pr_asan_index_granularity.sql b/tests/queries/0_stateless/03222_pr_asan_index_granularity.sql
deleted file mode 100644
index b7f37dd2856..00000000000
--- a/tests/queries/0_stateless/03222_pr_asan_index_granularity.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-DROP TABLE IF EXISTS test;
-
-CREATE TABLE test (k UInt64, v String)
-ENGINE = MergeTree
-ORDER BY k
-SETTINGS index_granularity=1;
-
-INSERT INTO test SELECT number, toString(number) FROM numbers(10_000);
-
-SET allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 3, parallel_replicas_for_non_replicated_merge_tree=1, cluster_for_parallel_replicas='test_cluster_one_shard_three_replicas_localhost';
-
-SELECT 0, materialize(18), k FROM test PREWHERE toNullable(toNullable(11)) WHERE toNullable(11) ORDER BY k DESC NULLS LAST LIMIT 100, 100 SETTINGS optimize_read_in_order = 1, merge_tree_min_rows_for_concurrent_read = 9223372036854775806, max_threads = 1;
-
--- DROP TABLE test;
diff --git a/tests/queries/0_stateless/03222_ripeMD160.reference b/tests/queries/0_stateless/03222_ripeMD160.reference
deleted file mode 100644
index f0db55dc8e1..00000000000
--- a/tests/queries/0_stateless/03222_ripeMD160.reference
+++ /dev/null
@@ -1,5 +0,0 @@
-37F332F68DB77BD9D7EDD4969571AD671CF9DD3B
-132072DF690933835EB8B6AD0B77E7B6F14ACAD7
-9C1185A5C5E9FC54612808977EE8F548B2258D31
-13920F39C93D503A0AC02EAB9AA8F672BC523ADA
-3FEDF0C212CCFA54C0EBA676C8A8A2A10BC218BE
diff --git a/tests/queries/0_stateless/03222_ripeMD160.sql b/tests/queries/0_stateless/03222_ripeMD160.sql
deleted file mode 100644
index 9d418376a20..00000000000
--- a/tests/queries/0_stateless/03222_ripeMD160.sql
+++ /dev/null
@@ -1,12 +0,0 @@
--- Tags: no-fasttest
--- Ouput can be verified using: https://emn178.github.io/online-tools/ripemd-160/
-
-SELECT hex(ripeMD160('The quick brown fox jumps over the lazy dog'));
-
-SELECT hex(ripeMD160('The quick brown fox jumps over the lazy cog'));
-
-SELECT hex(ripeMD160(''));
-
-SELECT hex(ripeMD160('CheREpaha1512'));
-
-SELECT hex(ripeMD160('A-very-long-string-that-should-be-hashed-using-ripeMD160'));
diff --git a/tests/queries/0_stateless/03223_analyzer_with_cube_fuzz.reference b/tests/queries/0_stateless/03223_analyzer_with_cube_fuzz.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03223_analyzer_with_cube_fuzz.sql b/tests/queries/0_stateless/03223_analyzer_with_cube_fuzz.sql
deleted file mode 100644
index f3bccc79b3f..00000000000
--- a/tests/queries/0_stateless/03223_analyzer_with_cube_fuzz.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-SET enable_analyzer = 1;
-
-DROP TABLE IF EXISTS t1;
-DROP TABLE IF EXISTS t2;
-
-CREATE TABLE t1 (`a` Int64, `b` Int64) ENGINE = MergeTree ORDER BY a;
-CREATE TABLE t2 (`key` Int32, `val` Int64) ENGINE = MergeTree ORDER BY key;
-insert into t1 Select number, number from numbers(100000);
-insert into t2 Select number, number from numbers(100000);
-
-
-SELECT
-    1 * 1000.0001,
-    (count(1.) = -2147483647) AND (count(a) = 1.1920928955078125e-7) AND (count(val) = 1048577) AND (sum(val) = ((NULL * 1048576) / -9223372036854775807)) AND (sum(a) = ((9223372036854775806 * 10000000000.) / 1048575))
-FROM
-(
-    SELECT
-        a,
-        val
-    FROM t1
-    FULL OUTER JOIN t2 ON (t1.a = t2.key) OR (1 * inf) OR (t1.b = t2.key)
-)
-GROUP BY '65537'
-    WITH CUBE
-FORMAT Null
-SETTINGS max_block_size = 100, join_use_nulls = 1, max_execution_time = 1., max_result_rows = 0, max_result_bytes = 0; -- { serverError TIMEOUT_EXCEEDED }
-
-DROP TABLE t1;
-DROP TABLE t2;
diff --git a/tests/queries/0_stateless/03223_interval_data_type_comparison.reference b/tests/queries/0_stateless/03223_interval_data_type_comparison.reference
deleted file mode 100644
index e98f792e4b2..00000000000
--- a/tests/queries/0_stateless/03223_interval_data_type_comparison.reference
+++ /dev/null
@@ -1,99 +0,0 @@
-Comparing nanoseconds
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-Comparing microseconds
-1
-1
-1
-1
-1
-1
-1
-0
-0
-0
-0
-0
-0
-0
-Comparing milliseconds
-1
-1
-1
-1
-1
-1
-0
-0
-0
-0
-0
-0
-Comparing seconds
-1
-1
-1
-1
-1
-0
-0
-0
-0
-0
-Comparing minutes
-1
-1
-1
-1
-0
-0
-0
-0
-Comparing hours
-1
-1
-1
-0
-0
-0
-Comparing days
-1
-1
-0
-0
-Comparing weeks
-1
-0
-Comparing months
-1
-1
-1
-0
-0
-0
-Comparing quarters
-1
-1
-0
-0
-Comparing years
-1
-0
diff --git a/tests/queries/0_stateless/03223_interval_data_type_comparison.sql b/tests/queries/0_stateless/03223_interval_data_type_comparison.sql
deleted file mode 100644
index 77b6e2fa3dc..00000000000
--- a/tests/queries/0_stateless/03223_interval_data_type_comparison.sql
+++ /dev/null
@@ -1,142 +0,0 @@
-SELECT('Comparing nanoseconds');
-SELECT INTERVAL 500 NANOSECOND > INTERVAL 300 NANOSECOND;
-SELECT INTERVAL 1000 NANOSECOND < INTERVAL 1500 NANOSECOND;
-SELECT INTERVAL 2000 NANOSECOND = INTERVAL 2000 NANOSECOND;
-SELECT INTERVAL 1000 NANOSECOND >= INTERVAL 1 MICROSECOND;
-SELECT INTERVAL 1000001 NANOSECOND > INTERVAL 1 MILLISECOND;
-SELECT INTERVAL 2000000001 NANOSECOND > INTERVAL 2 SECOND;
-SELECT INTERVAL 60000000000 NANOSECOND = INTERVAL 1 MINUTE;
-SELECT INTERVAL 7199999999999 NANOSECOND < INTERVAL 2 HOUR;
-SELECT INTERVAL 1 NANOSECOND < INTERVAL 2 DAY;
-SELECT INTERVAL 5 NANOSECOND < INTERVAL 1 WEEK;
-
-SELECT INTERVAL 500 NANOSECOND < INTERVAL 300 NANOSECOND;
-SELECT INTERVAL 1000 NANOSECOND > INTERVAL 1500 NANOSECOND;
-SELECT INTERVAL 2000 NANOSECOND != INTERVAL 2000 NANOSECOND;
-SELECT INTERVAL 1000 NANOSECOND < INTERVAL 1 MICROSECOND;
-SELECT INTERVAL 1000001 NANOSECOND < INTERVAL 1 MILLISECOND;
-SELECT INTERVAL 2000000001 NANOSECOND < INTERVAL 2 SECOND;
-SELECT INTERVAL 60000000000 NANOSECOND != INTERVAL 1 MINUTE;
-SELECT INTERVAL 7199999999999 NANOSECOND > INTERVAL 2 HOUR;
-SELECT INTERVAL 1 NANOSECOND > INTERVAL 2 DAY;
-SELECT INTERVAL 5 NANOSECOND > INTERVAL 1 WEEK;
-
-SELECT INTERVAL 1 NANOSECOND < INTERVAL 2 MONTH; -- { serverError NO_COMMON_TYPE }
-
-SELECT('Comparing microseconds');
-SELECT INTERVAL 1 MICROSECOND < INTERVAL 999 MICROSECOND;
-SELECT INTERVAL 1001 MICROSECOND > INTERVAL 1 MILLISECOND;
-SELECT INTERVAL 2000000 MICROSECOND = INTERVAL 2 SECOND;
-SELECT INTERVAL 179999999 MICROSECOND < INTERVAL 3 MINUTE;
-SELECT INTERVAL 3600000000 MICROSECOND = INTERVAL 1 HOUR;
-SELECT INTERVAL 36000000000000 MICROSECOND > INTERVAL 2 DAY;
-SELECT INTERVAL 1209600000000 MICROSECOND = INTERVAL 2 WEEK;
-
-SELECT INTERVAL 1 MICROSECOND > INTERVAL 999 MICROSECOND;
-SELECT INTERVAL 1001 MICROSECOND < INTERVAL 1 MILLISECOND;
-SELECT INTERVAL 2000000 MICROSECOND != INTERVAL 2 SECOND;
-SELECT INTERVAL 179999999 MICROSECOND > INTERVAL 3 MINUTE;
-SELECT INTERVAL 3600000000 MICROSECOND != INTERVAL 1 HOUR;
-SELECT INTERVAL 36000000000000 MICROSECOND < INTERVAL 2 DAY;
-SELECT INTERVAL 1209600000000 MICROSECOND != INTERVAL 2 WEEK;
-
-SELECT INTERVAL 36000000000000 MICROSECOND < INTERVAL 1 QUARTER; -- { serverError NO_COMMON_TYPE }
-
-SELECT('Comparing milliseconds');
-SELECT INTERVAL 2000 MILLISECOND > INTERVAL 2 MILLISECOND;
-SELECT INTERVAL 2000 MILLISECOND = INTERVAL 2 SECOND;
-SELECT INTERVAL 170000 MILLISECOND < INTERVAL 3 MINUTE;
-SELECT INTERVAL 144000001 MILLISECOND > INTERVAL 40 HOUR;
-SELECT INTERVAL 1728000000 MILLISECOND = INTERVAL 20 DAY;
-SELECT INTERVAL 1198599999 MILLISECOND < INTERVAL 2 WEEK;
-
-SELECT INTERVAL 2000 MILLISECOND < INTERVAL 2 MILLISECOND;
-SELECT INTERVAL 2000 MILLISECOND != INTERVAL 2 SECOND;
-SELECT INTERVAL 170000 MILLISECOND > INTERVAL 3 MINUTE;
-SELECT INTERVAL 144000001 MILLISECOND < INTERVAL 40 HOUR;
-SELECT INTERVAL 1728000000 MILLISECOND != INTERVAL 20 DAY;
-SELECT INTERVAL 1198599999 MILLISECOND > INTERVAL 2 WEEK;
-
-SELECT INTERVAL 36000000000000 MILLISECOND < INTERVAL 1 YEAR; -- { serverError NO_COMMON_TYPE }
-
-SELECT('Comparing seconds');
-SELECT INTERVAL 120 SECOND > INTERVAL 2 SECOND;
-SELECT INTERVAL 120 SECOND = INTERVAL 2 MINUTE;
-SELECT INTERVAL 1 SECOND < INTERVAL 2 HOUR;
-SELECT INTERVAL 86401 SECOND >= INTERVAL 1 DAY;
-SELECT INTERVAL 1209600 SECOND = INTERVAL 2 WEEK;
-
-SELECT INTERVAL 120 SECOND < INTERVAL 2 SECOND;
-SELECT INTERVAL 120 SECOND != INTERVAL 2 MINUTE;
-SELECT INTERVAL 1 SECOND > INTERVAL 2 HOUR;
-SELECT INTERVAL 86401 SECOND < INTERVAL 1 DAY;
-SELECT INTERVAL 1209600 SECOND != INTERVAL 2 WEEK;
-
-SELECT INTERVAL 36000000000000 SECOND < INTERVAL 1 MONTH; -- { serverError NO_COMMON_TYPE }
-
-SELECT('Comparing minutes');
-SELECT INTERVAL 1 MINUTE < INTERVAL 59 MINUTE;
-SELECT INTERVAL 1 MINUTE < INTERVAL 59 HOUR;
-SELECT INTERVAL 1440 MINUTE = INTERVAL 1 DAY;
-SELECT INTERVAL 30241 MINUTE > INTERVAL 3 WEEK;
-
-SELECT INTERVAL 1 MINUTE > INTERVAL 59 MINUTE;
-SELECT INTERVAL 1 MINUTE > INTERVAL 59 HOUR;
-SELECT INTERVAL 1440 MINUTE != INTERVAL 1 DAY;
-SELECT INTERVAL 30241 MINUTE < INTERVAL 3 WEEK;
-
-SELECT INTERVAL 2 MINUTE = INTERVAL 120 QUARTER; -- { serverError NO_COMMON_TYPE }
-
-SELECT('Comparing hours');
-SELECT INTERVAL 48 HOUR > INTERVAL 2 HOUR;
-SELECT INTERVAL 48 HOUR >= INTERVAL 2 DAY;
-SELECT INTERVAL 672 HOUR = INTERVAL 4 WEEK;
-
-SELECT INTERVAL 48 HOUR < INTERVAL 2 HOUR;
-SELECT INTERVAL 48 HOUR < INTERVAL 2 DAY;
-SELECT INTERVAL 672 HOUR != INTERVAL 4 WEEK;
-
-SELECT INTERVAL 2 HOUR < INTERVAL 1 YEAR; -- { serverError NO_COMMON_TYPE }
-
-SELECT('Comparing days');
-SELECT INTERVAL 1 DAY < INTERVAL 23 DAY;
-SELECT INTERVAL 25 DAY > INTERVAL 3 WEEK;
-
-SELECT INTERVAL 1 DAY > INTERVAL 23 DAY;
-SELECT INTERVAL 25 DAY < INTERVAL 3 WEEK;
-
-SELECT INTERVAL 2 DAY = INTERVAL 48 MONTH; -- { serverError NO_COMMON_TYPE }
-
-SELECT('Comparing weeks');
-SELECT INTERVAL 1 WEEK < INTERVAL 6 WEEK;
-
-SELECT INTERVAL 1 WEEK > INTERVAL 6 WEEK;
-
-SELECT INTERVAL 124 WEEK > INTERVAL 8 QUARTER; -- { serverError NO_COMMON_TYPE }
-
-SELECT('Comparing months');
-SELECT INTERVAL 1 MONTH < INTERVAL 3 MONTH;
-SELECT INTERVAL 124 MONTH > INTERVAL 5 QUARTER;
-SELECT INTERVAL 36 MONTH = INTERVAL 3 YEAR;
-
-SELECT INTERVAL 1 MONTH > INTERVAL 3 MONTH;
-SELECT INTERVAL 124 MONTH < INTERVAL 5 QUARTER;
-SELECT INTERVAL 36 MONTH != INTERVAL 3 YEAR;
-
-SELECT INTERVAL 6 MONTH = INTERVAL 26 MICROSECOND; -- { serverError NO_COMMON_TYPE }
-
-SELECT('Comparing quarters');
-SELECT INTERVAL 5 QUARTER > INTERVAL 4 QUARTER;
-SELECT INTERVAL 20 QUARTER = INTERVAL 5 YEAR;
-
-SELECT INTERVAL 5 QUARTER < INTERVAL 4 QUARTER;
-SELECT INTERVAL 20 QUARTER != INTERVAL 5 YEAR;
-
-SELECT INTERVAL 2 QUARTER = INTERVAL 6 NANOSECOND; -- { serverError NO_COMMON_TYPE }
-
-SELECT('Comparing years');
-SELECT INTERVAL 1 YEAR < INTERVAL 3 YEAR;
-
-SELECT INTERVAL 1 YEAR > INTERVAL 3 YEAR;
-
-SELECT INTERVAL 2 YEAR = INTERVAL 8 SECOND; -- { serverError NO_COMMON_TYPE }
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03223_nested_json_in_shared_data_merges.reference b/tests/queries/0_stateless/03223_nested_json_in_shared_data_merges.reference
deleted file mode 100644
index 6c01506e800..00000000000
--- a/tests/queries/0_stateless/03223_nested_json_in_shared_data_merges.reference
+++ /dev/null
@@ -1,81 +0,0 @@
-All paths
-['b']
-['b']
-['b']
-['b']
-['b']
-['c']
-['c']
-['c']
-['c']
-['c']
-Dynamic paths
-['b']
-['b']
-['b']
-['b']
-['b']
-[]
-[]
-[]
-[]
-[]
-Shared data paths
-[]
-[]
-[]
-[]
-[]
-['c']
-['c']
-['c']
-['c']
-['c']
-All paths
-['b']
-['b']
-['b']
-['b']
-['b']
-['c']
-['c']
-['c']
-['c']
-['c']
-['b']
-['b']
-['b']
-['b']
-['b']
-Dynamic paths
-['b']
-['b']
-['b']
-['b']
-['b']
-['c']
-['c']
-['c']
-['c']
-['c']
-['b']
-['b']
-['b']
-['b']
-['b']
-Shared data paths
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-[]
diff --git a/tests/queries/0_stateless/03223_nested_json_in_shared_data_merges.sql b/tests/queries/0_stateless/03223_nested_json_in_shared_data_merges.sql
deleted file mode 100644
index 311eba37772..00000000000
--- a/tests/queries/0_stateless/03223_nested_json_in_shared_data_merges.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-set allow_experimental_json_type = 1;
-
-drop table if exists test;
-create table test (json JSON(max_dynamic_paths=8)) engine=MergeTree order by tuple() settings min_bytes_for_wide_part=1, min_rows_for_wide_part=1;
-insert into test select materialize('{"a" : [{"b" : 42}]}')::JSON(max_dynamic_paths=8) from numbers(5);
-insert into test select materialize('{"aa1" : 42, "aa2" : 42, "aa3" : 42, "aa4" : 42, "aa5" : 42, "aa6" : 42, "aa7" : 42, "aa8" : 42, "a" : [{"c" : 42}]}') from numbers(5);
-optimize table test final;
-
-select 'All paths';
-select JSONAllPaths(arrayJoin(json.a[])) from test;
-select 'Dynamic paths';
-select JSONDynamicPaths(arrayJoin(json.a[])) from test;
-select 'Shared data paths';
-select JSONSharedDataPaths(arrayJoin(json.a[])) from test;
-
-insert into test select materialize('{"a" : [{"b" : 42}]}')::JSON(max_dynamic_paths=8) from numbers(5);
-optimize table test final;
-
-select 'All paths';
-select JSONAllPaths(arrayJoin(json.a[])) from test;
-select 'Dynamic paths';
-select JSONDynamicPaths(arrayJoin(json.a[])) from test;
-select 'Shared data paths';
-select JSONSharedDataPaths(arrayJoin(json.a[])) from test;
-
-drop table test;
diff --git a/tests/queries/0_stateless/03223_parallel_replicas_read_task_size_overflow_bug.reference b/tests/queries/0_stateless/03223_parallel_replicas_read_task_size_overflow_bug.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03223_parallel_replicas_read_task_size_overflow_bug.sql b/tests/queries/0_stateless/03223_parallel_replicas_read_task_size_overflow_bug.sql
deleted file mode 100644
index 984c7fe0db7..00000000000
--- a/tests/queries/0_stateless/03223_parallel_replicas_read_task_size_overflow_bug.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-DROP TABLE IF EXISTS test__fuzz_22 SYNC;
-
-CREATE TABLE test__fuzz_22 (k Float32, v String) ENGINE = MergeTree ORDER BY k SETTINGS index_granularity = 1;
-
-SYSTEM STOP MERGES test__fuzz_22;
-
-INSERT INTO test__fuzz_22 SELECT number, toString(number) FROM numbers(1);
-INSERT INTO test__fuzz_22 SELECT number, toString(number) FROM numbers(1);
-INSERT INTO test__fuzz_22 SELECT number, toString(number) FROM numbers(1);
-INSERT INTO test__fuzz_22 SELECT number, toString(number) FROM numbers(1);
-
-SET allow_experimental_parallel_reading_from_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, max_parallel_replicas = 3, cluster_for_parallel_replicas='test_cluster_one_shard_three_replicas_localhost',
-    merge_tree_min_rows_for_concurrent_read = 9223372036854775806, merge_tree_min_rows_for_concurrent_read_for_remote_filesystem = 9223372036854775806;
-
-  SELECT v
-    FROM test__fuzz_22
-ORDER BY v
-   LIMIT 10, 10
-SETTINGS max_threads = 4
-  FORMAT Null; -- { serverError BAD_ARGUMENTS }
-
-DROP TABLE test__fuzz_22 SYNC;
diff --git a/tests/queries/0_stateless/03223_system_tables_set_not_ready.reference b/tests/queries/0_stateless/03223_system_tables_set_not_ready.reference
deleted file mode 100644
index e39523ed4f5..00000000000
--- a/tests/queries/0_stateless/03223_system_tables_set_not_ready.reference
+++ /dev/null
@@ -1,5 +0,0 @@
-system.distribution_queue	1
-system.rocksdb	1
-system.databases	1
-system.mutations	1
-system.replication_queue	1
diff --git a/tests/queries/0_stateless/03223_system_tables_set_not_ready.sql b/tests/queries/0_stateless/03223_system_tables_set_not_ready.sql
deleted file mode 100644
index 907fa47143c..00000000000
--- a/tests/queries/0_stateless/03223_system_tables_set_not_ready.sql
+++ /dev/null
@@ -1,30 +0,0 @@
--- Tags: no-fasttest
--- Tag no-fasttest -- due to EmbeddedRocksDB
-
-drop table if exists null;
-drop table if exists dist;
-create table null as system.one engine=Null;
-create table dist as null engine=Distributed(test_cluster_two_shards, currentDatabase(), 'null', rand());
-insert into dist settings prefer_localhost_replica=0 values (1);
-select 'system.distribution_queue', count() from system.distribution_queue where exists(select 1) and database = currentDatabase();
-
-drop table if exists rocksdb;
-create table rocksdb (key Int) engine=EmbeddedRocksDB() primary key key;
-insert into rocksdb values (1);
-select 'system.rocksdb', count()>0 from system.rocksdb where exists(select 1) and database = currentDatabase();
-
-select 'system.databases', count() from system.databases where exists(select 1) and database = currentDatabase();
-
-drop table if exists mt;
-create table mt (key Int) engine=MergeTree() order by key;
-alter table mt delete where 1;
-select 'system.mutations', count() from system.mutations where exists(select 1) and database = currentDatabase();
-
-drop table if exists rep1;
-drop table if exists rep2;
-create table rep1 (key Int) engine=ReplicatedMergeTree('/{database}/rep', '{table}') order by key;
-create table rep2 (key Int) engine=ReplicatedMergeTree('/{database}/rep', '{table}') order by key;
-system stop fetches rep2;
-insert into rep1 values (1);
-system sync replica rep2 pull;
-select 'system.replication_queue', count()>0 from system.replication_queue where exists(select 1) and database = currentDatabase();
diff --git a/tests/queries/0_stateless/03224_json_merges_new_type_in_shared_data.reference b/tests/queries/0_stateless/03224_json_merges_new_type_in_shared_data.reference
deleted file mode 100644
index 9d58b3a35db..00000000000
--- a/tests/queries/0_stateless/03224_json_merges_new_type_in_shared_data.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-Array(Nullable(Int64))	true
-Int64	false
-Array(Nullable(Int64))	false
-Int64	false
diff --git a/tests/queries/0_stateless/03224_json_merges_new_type_in_shared_data.sql b/tests/queries/0_stateless/03224_json_merges_new_type_in_shared_data.sql
deleted file mode 100644
index c96d67c0d47..00000000000
--- a/tests/queries/0_stateless/03224_json_merges_new_type_in_shared_data.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-set allow_experimental_json_type = 1;
-
-drop table if exists test;
-create table test (json JSON(max_dynamic_paths=1)) engine=MergeTree order by tuple() settings min_rows_for_wide_part = 1, min_bytes_for_wide_part = 1;
-insert into test select '{"b" : 42}' from numbers(5);
-insert into test select '{"a" : 42, "b" : [1, 2, 3]}' from numbers(5);
-optimize table test final;
-select distinct dynamicType(json.b) as type, isDynamicElementInSharedData(json.b) from test order by type;
-insert into test select '{"b" : 42}' from numbers(5);
-optimize table test final;
-select distinct dynamicType(json.b) as type, isDynamicElementInSharedData(json.b) from test order by type;
-drop table test;
diff --git a/tests/queries/0_stateless/03224_nested_json_merges_new_type_in_shared_data.reference b/tests/queries/0_stateless/03224_nested_json_merges_new_type_in_shared_data.reference
deleted file mode 100644
index b45d9bb97da..00000000000
--- a/tests/queries/0_stateless/03224_nested_json_merges_new_type_in_shared_data.reference
+++ /dev/null
@@ -1,22 +0,0 @@
-Array(JSON(max_dynamic_types=16, max_dynamic_paths=2))	true
-Int64	false
-Array(JSON(max_dynamic_types=16, max_dynamic_paths=2))	false
-Int64	false
-['c']
-['d']
-Array(JSON(max_dynamic_types=16, max_dynamic_paths=2))	false
-Int64	false
-['c']
-['d']
-Int64	true
-None	false
-Int64	true
-None	false
-Array(JSON(max_dynamic_types=16, max_dynamic_paths=2))	false
-Int64	false
-['c']
-['d']
-Int64	false
-None	false
-Int64	false
-None	false
diff --git a/tests/queries/0_stateless/03224_nested_json_merges_new_type_in_shared_data.sql b/tests/queries/0_stateless/03224_nested_json_merges_new_type_in_shared_data.sql
deleted file mode 100644
index b22b8b4fb75..00000000000
--- a/tests/queries/0_stateless/03224_nested_json_merges_new_type_in_shared_data.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-set allow_experimental_json_type = 1;
-
-drop table if exists test;
-create table test (json JSON(max_dynamic_paths=8)) engine=MergeTree order by tuple() settings min_rows_for_wide_part = 1, min_bytes_for_wide_part = 1;
-insert into test select materialize('{"a" : 42}')::JSON(max_dynamic_paths=8) from numbers(5);
-insert into test select materialize('{"a1" : 42, "a2" : 42, "a3" : 42, "a4" : 42, "a5" : 42, "a6" : 42, "a7" : 42, "a8" : 42, "a" : [{"c" : 42}]}')::JSON(max_dynamic_paths=8) from numbers(5);
-optimize table test final;
-select distinct dynamicType(json.a) as type, isDynamicElementInSharedData(json.a) from test order by type;
-insert into test select materialize('{"a1" : 42, "a2" : 42, "a3" : 42, "a4" : 42, "a5" : 42, "a6" : 42, "a7" : 42, "a8" : 42, "a" : [{"d" : 42}]}')::JSON(max_dynamic_paths=8) from numbers(5);
-optimize table test final;
-select distinct dynamicType(json.a) as type, isDynamicElementInSharedData(json.a) from test order by type;
-select distinct JSONSharedDataPaths(arrayJoin(json.a[])) as path from test order by path;
-insert into test select materialize('{"a" : 42}')::JSON(max_dynamic_paths=8) from numbers(5);
-optimize table test final;
-select distinct dynamicType(json.a) as type, isDynamicElementInSharedData(json.a) from test order by type;
-select distinct JSONDynamicPaths(arrayJoin(json.a[])) as path from test order by path;
-select distinct dynamicType(arrayJoin(json.a[].c)) as type, isDynamicElementInSharedData(arrayJoin(json.a[].c)) from test order by type;
-select distinct dynamicType(arrayJoin(json.a[].d)) as type, isDynamicElementInSharedData(arrayJoin(json.a[].d)) from test order by type;
-insert into test select materialize('{"a" : 42}')::JSON(max_dynamic_paths=8) from numbers(5);
-optimize table test final;
-select distinct dynamicType(json.a) as type, isDynamicElementInSharedData(json.a) from test order by type;
-select distinct JSONDynamicPaths(arrayJoin(json.a[])) as path from test order by path;
-select distinct dynamicType(arrayJoin(json.a[].c)) as type, isDynamicElementInSharedData(arrayJoin(json.a[].c)) from test order by type;
-select distinct dynamicType(arrayJoin(json.a[].d)) as type, isDynamicElementInSharedData(arrayJoin(json.a[].d)) from test order by type;
-drop table test;
diff --git a/tests/queries/0_stateless/03224_tuple_element_identifier.reference b/tests/queries/0_stateless/03224_tuple_element_identifier.reference
deleted file mode 100644
index 0fc9e7410c1..00000000000
--- a/tests/queries/0_stateless/03224_tuple_element_identifier.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-([('wtf')])	[('wtf')]	wtf
-([('wtf')])	[('wtf')]	wtf
-Hello
-('Hello')	Hello	Hello	Hello
diff --git a/tests/queries/0_stateless/03224_tuple_element_identifier.sql b/tests/queries/0_stateless/03224_tuple_element_identifier.sql
deleted file mode 100644
index 2a7fb9a97a3..00000000000
--- a/tests/queries/0_stateless/03224_tuple_element_identifier.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-SET enable_analyzer = 1;
-
-SELECT JSONExtract('{"hello":[{"world":"wtf"}]}', 'Tuple(hello Array(Tuple(world String)))') AS x,
-    x.hello, x.hello[1].world;
-
-SELECT JSONExtract('{"hello":[{" wow ":"wtf"}]}', 'Tuple(hello Array(Tuple(` wow ` String)))') AS x,
-    x.hello, x.hello[1].` wow `;
-
-SELECT JSONExtract('{"hello":[{" wow ":"wtf"}]}', 'Tuple(hello Array(Tuple(` wow ` String)))') AS x,
-    x.hello, x.hello[1].`wow`; -- { serverError NOT_FOUND_COLUMN_IN_BLOCK }
-
-SELECT ('Hello' AS world,).world;
-SELECT ('Hello' AS world,) AS t, t.world, (t).world, identity(t).world;
diff --git a/tests/queries/0_stateless/03225_alter_to_json_not_supported.reference b/tests/queries/0_stateless/03225_alter_to_json_not_supported.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03225_alter_to_json_not_supported.sql b/tests/queries/0_stateless/03225_alter_to_json_not_supported.sql
deleted file mode 100644
index 398494d56de..00000000000
--- a/tests/queries/0_stateless/03225_alter_to_json_not_supported.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-set allow_experimental_json_type = 1;
-
-drop table if exists test;
-create table test (s String) engine=MergeTree order by tuple();
-alter table test modify column s JSON; -- { serverError BAD_ARGUMENTS }
-drop table test;
-
-create table test (s Array(String)) engine=MergeTree order by tuple();
-alter table test modify column s Array(JSON); -- { serverError BAD_ARGUMENTS }
-drop table test;
-
-create table test (s Tuple(String, String)) engine=MergeTree order by tuple();
-alter table test modify column s Tuple(JSON, String); -- { serverError BAD_ARGUMENTS }
-drop table test;
-
diff --git a/tests/queries/0_stateless/03226_alter_update_dynamic_json_not_supported.reference b/tests/queries/0_stateless/03226_alter_update_dynamic_json_not_supported.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03226_alter_update_dynamic_json_not_supported.sql b/tests/queries/0_stateless/03226_alter_update_dynamic_json_not_supported.sql
deleted file mode 100644
index 720f8670c83..00000000000
--- a/tests/queries/0_stateless/03226_alter_update_dynamic_json_not_supported.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-set allow_experimental_dynamic_type = 1;
-set allow_experimental_json_type = 1;
-
-drop table if exists test;
-create table test (d Dynamic, json JSON) engine=MergeTree order by tuple();
-alter table test update d = 42 where 1; -- {serverError CANNOT_UPDATE_COLUMN}
-alter table test update json = '{}' where 1; -- {serverError CANNOT_UPDATE_COLUMN}
-drop table test;
-
diff --git a/tests/queries/0_stateless/03227_distinct_dynamic_types_json_paths.reference b/tests/queries/0_stateless/03227_distinct_dynamic_types_json_paths.reference
deleted file mode 100644
index 891982fdc81..00000000000
--- a/tests/queries/0_stateless/03227_distinct_dynamic_types_json_paths.reference
+++ /dev/null
@@ -1,121 +0,0 @@
-a0
-a1
-a10
-a11
-a12
-a2
-a3
-a4
-a5
-a6
-a7
-a8
-a9
-('a0',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a1',['String'])
-('a10',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a11',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a12',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a2',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a3',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a4',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a5',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a6',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a7',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a8',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a9',['Array(Nullable(Int64))','Bool','Int64','String'])
-Array(Nullable(Int64))
-Bool
-Int64
-String
-Array(Nullable(Int64))
-Bool
-Int64
-String
-Filter
-a1
-a2
-('a1',['String'])
-('a2',['String'])
-String
-If
-a1
-a2
-('a1',['String'])
-('a2',['String'])
-String
-Group by
-Array(Nullable(Int64))	['a1','a2']
-Bool	['a1','a2']
-Int64	['a1','a2']
-None	['a0','a1','a10','a11','a12','a3','a4','a5','a6','a7','a8','a9']
-String	['a1','a2']
-Array(Nullable(Int64))	{'a1':['String'],'a2':['Array(Nullable(Int64))']}
-Bool	{'a1':['String'],'a2':['Bool']}
-Int64	{'a1':['String'],'a2':['Int64']}
-None	{'a0':['Array(Nullable(Int64))','Bool','Int64','String'],'a1':['String'],'a10':['Array(Nullable(Int64))','Bool','Int64','String'],'a11':['Array(Nullable(Int64))','Bool','Int64','String'],'a12':['Array(Nullable(Int64))','Bool','Int64','String'],'a3':['Array(Nullable(Int64))','Bool','Int64','String'],'a4':['Array(Nullable(Int64))','Bool','Int64','String'],'a5':['Array(Nullable(Int64))','Bool','Int64','String'],'a6':['Array(Nullable(Int64))','Bool','Int64','String'],'a7':['Array(Nullable(Int64))','Bool','Int64','String'],'a8':['Array(Nullable(Int64))','Bool','Int64','String'],'a9':['Array(Nullable(Int64))','Bool','Int64','String']}
-String	{'a1':['String'],'a2':['String']}
-Array(Nullable(Int64))	['Array(Nullable(Int64))']
-Bool	['Bool']
-Int64	['Int64']
-None	[]
-String	['String']
-Remote
-a0
-a1
-a10
-a11
-a12
-a2
-a3
-a4
-a5
-a6
-a7
-a8
-a9
-('a0',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a1',['String'])
-('a10',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a11',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a12',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a2',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a3',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a4',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a5',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a6',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a7',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a8',['Array(Nullable(Int64))','Bool','Int64','String'])
-('a9',['Array(Nullable(Int64))','Bool','Int64','String'])
-Array(Nullable(Int64))
-Bool
-Int64
-String
-Remote filter
-a1
-a2
-('a1',['String'])
-('a2',['String'])
-String
-Remote if
-a1
-a2
-('a1',['String'])
-('a2',['String'])
-String
-Remote group by
-Array(Nullable(Int64))	['a1','a2']
-Bool	['a1','a2']
-Int64	['a1','a2']
-None	['a0','a1','a10','a11','a12','a3','a4','a5','a6','a7','a8','a9']
-String	['a1','a2']
-Array(Nullable(Int64))	{'a1':['String'],'a2':['Array(Nullable(Int64))']}
-Bool	{'a1':['String'],'a2':['Bool']}
-Int64	{'a1':['String'],'a2':['Int64']}
-None	{'a0':['Array(Nullable(Int64))','Bool','Int64','String'],'a1':['String'],'a10':['Array(Nullable(Int64))','Bool','Int64','String'],'a11':['Array(Nullable(Int64))','Bool','Int64','String'],'a12':['Array(Nullable(Int64))','Bool','Int64','String'],'a3':['Array(Nullable(Int64))','Bool','Int64','String'],'a4':['Array(Nullable(Int64))','Bool','Int64','String'],'a5':['Array(Nullable(Int64))','Bool','Int64','String'],'a6':['Array(Nullable(Int64))','Bool','Int64','String'],'a7':['Array(Nullable(Int64))','Bool','Int64','String'],'a8':['Array(Nullable(Int64))','Bool','Int64','String'],'a9':['Array(Nullable(Int64))','Bool','Int64','String']}
-String	{'a1':['String'],'a2':['String']}
-Array(Nullable(Int64))	['Array(Nullable(Int64))']
-Bool	['Bool']
-Int64	['Int64']
-None	[]
-String	['String']
diff --git a/tests/queries/0_stateless/03227_distinct_dynamic_types_json_paths.sql b/tests/queries/0_stateless/03227_distinct_dynamic_types_json_paths.sql
deleted file mode 100644
index 3af911e27fa..00000000000
--- a/tests/queries/0_stateless/03227_distinct_dynamic_types_json_paths.sql
+++ /dev/null
@@ -1,63 +0,0 @@
--- Tags: long
-
-set allow_experimental_dynamic_type = 1;
-set allow_experimental_json_type = 1;
-set allow_experimental_variant_type = 1;
-set use_variant_as_common_type = 1;
-set max_block_size = 10000;
-
-drop table if exists test_json_dynamic_aggregate_functions;
-create table test_json_dynamic_aggregate_functions (json JSON(a1 String, max_dynamic_paths=2, max_dynamic_types=2)) engine=Memory;
-insert into test_json_dynamic_aggregate_functions select toJSONString(map('a' || number % 13, multiIf(number % 5 == 0, NULL, number % 5 == 1, number::UInt32, number % 5 == 2, 'str_' || number, number % 5 == 3, range(number % 5), toBool(number % 2)))) from numbers(100000);
-select arrayJoin(distinctJSONPaths(json)) from test_json_dynamic_aggregate_functions;
-select arrayJoin(distinctJSONPathsAndTypes(json)) from test_json_dynamic_aggregate_functions;
-select arrayJoin(distinctDynamicTypes(json.a2)) from test_json_dynamic_aggregate_functions;
-select arrayJoin(distinctDynamicTypes(json.a3)) from test_json_dynamic_aggregate_functions;
-select arrayJoin(distinctDynamicTypes(json.a42)) from test_json_dynamic_aggregate_functions;
-
-select 'Filter';
-select arrayJoin(distinctJSONPaths(json)) from test_json_dynamic_aggregate_functions where dynamicType(json.a2) == 'String';
-select arrayJoin(distinctJSONPathsAndTypes(json)) from test_json_dynamic_aggregate_functions where dynamicType(json.a2) == 'String';
-select arrayJoin(distinctDynamicTypes(json.a2)) from test_json_dynamic_aggregate_functions where dynamicType(json.a2) == 'String';
-
-select 'If';
-select arrayJoin(distinctJSONPathsIf(json, dynamicType(json.a2) == 'String')) from test_json_dynamic_aggregate_functions;
-select arrayJoin(distinctJSONPathsAndTypesIf(json, dynamicType(json.a2) == 'String')) from test_json_dynamic_aggregate_functions;
-select arrayJoin(distinctDynamicTypesIf(json.a2, dynamicType(json.a2) == 'String')) from test_json_dynamic_aggregate_functions;
-
-select 'Group by';
-select dynamicType(json.a2), distinctJSONPaths(json) from test_json_dynamic_aggregate_functions group by dynamicType(json.a2) order by dynamicType(json.a2);
-select dynamicType(json.a2), distinctJSONPathsAndTypes(json) from test_json_dynamic_aggregate_functions group by dynamicType(json.a2) order by dynamicType(json.a2);
-select dynamicType(json.a2), distinctDynamicTypes(json.a2) from test_json_dynamic_aggregate_functions group by dynamicType(json.a2) order by dynamicType(json.a2);
-
-select 'Remote';
-select arrayJoin(distinctJSONPaths(json)) from remote('127.0.0.{1,2,3}', currentDatabase(), test_json_dynamic_aggregate_functions);
-select arrayJoin(distinctJSONPathsAndTypes(json)) from remote('127.0.0.{1,2,3}', currentDatabase(), test_json_dynamic_aggregate_functions);
-select arrayJoin(distinctDynamicTypes(json.a2)) from remote('127.0.0.{1,2,3}', currentDatabase(), test_json_dynamic_aggregate_functions);
-
-select 'Remote filter';
-select arrayJoin(distinctJSONPaths(json)) from remote('127.0.0.{1,2,3}', currentDatabase(), test_json_dynamic_aggregate_functions) where dynamicType(json.a2) == 'String';
-select arrayJoin(distinctJSONPathsAndTypes(json)) from remote('127.0.0.{1,2,3}', currentDatabase(), test_json_dynamic_aggregate_functions) where dynamicType(json.a2) == 'String';
-select arrayJoin(distinctDynamicTypes(json.a2)) from remote('127.0.0.{1,2,3}', currentDatabase(), test_json_dynamic_aggregate_functions) where dynamicType(json.a2) == 'String';
-
-select 'Remote if';
-select arrayJoin(distinctJSONPathsIf(json, dynamicType(json.a2) == 'String')) from remote('127.0.0.{1,2,3}', currentDatabase(), test_json_dynamic_aggregate_functions);
-select arrayJoin(distinctJSONPathsAndTypesIf(json, dynamicType(json.a2) == 'String')) from remote('127.0.0.{1,2,3}', currentDatabase(), test_json_dynamic_aggregate_functions);
-select arrayJoin(distinctDynamicTypesIf(json.a2, dynamicType(json.a2) == 'String')) from remote('127.0.0.{1,2,3}', currentDatabase(), test_json_dynamic_aggregate_functions);
-
-select 'Remote group by';
-select dynamicType(json.a2), distinctJSONPaths(json) from remote('127.0.0.{1,2,3}', currentDatabase(), test_json_dynamic_aggregate_functions) group by dynamicType(json.a2) order by dynamicType(json.a2);
-select dynamicType(json.a2), distinctJSONPathsAndTypes(json) from remote('127.0.0.{1,2,3}', currentDatabase(), test_json_dynamic_aggregate_functions) group by dynamicType(json.a2) order by dynamicType(json.a2);
-select dynamicType(json.a2), distinctDynamicTypes(json.a2) from remote('127.0.0.{1,2,3}', currentDatabase(), test_json_dynamic_aggregate_functions) group by dynamicType(json.a2) order by dynamicType(json.a2);
-
-select distinctJSONPaths() from test_json_dynamic_aggregate_functions; -- {serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
-select distinctJSONPaths(json, 42) from test_json_dynamic_aggregate_functions; -- {serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
-select distinctJSONPaths(42) from test_json_dynamic_aggregate_functions; -- {serverError ILLEGAL_TYPE_OF_ARGUMENT}
-select distinctJSONPathsAndTypes() from test_json_dynamic_aggregate_functions; -- {serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
-select distinctJSONPathsAndTypes(json, 42) from test_json_dynamic_aggregate_functions; -- {serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
-select distinctJSONPathsAndTypes(42) from test_json_dynamic_aggregate_functions; -- {serverError ILLEGAL_TYPE_OF_ARGUMENT}
-select distinctDynamicTypes() from test_json_dynamic_aggregate_functions; -- {serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
-select distinctDynamicTypes(json.a2, 42) from test_json_dynamic_aggregate_functions; -- {serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
-select distinctDynamicTypes(42) from test_json_dynamic_aggregate_functions; -- {serverError ILLEGAL_TYPE_OF_ARGUMENT}
-
-drop table test_json_dynamic_aggregate_functions;
diff --git a/tests/queries/0_stateless/03227_dynamic_subcolumns_enumerate_streams.reference b/tests/queries/0_stateless/03227_dynamic_subcolumns_enumerate_streams.reference
deleted file mode 100644
index b9d711bf9f0..00000000000
--- a/tests/queries/0_stateless/03227_dynamic_subcolumns_enumerate_streams.reference
+++ /dev/null
@@ -1,15 +0,0 @@
-\N
-\N
-\N
-\N
-\N
-str_0
-str_1
-str_2
-str_3
-str_4
-\N
-\N
-\N
-\N
-\N
diff --git a/tests/queries/0_stateless/03227_dynamic_subcolumns_enumerate_streams.sql b/tests/queries/0_stateless/03227_dynamic_subcolumns_enumerate_streams.sql
deleted file mode 100644
index e451521faca..00000000000
--- a/tests/queries/0_stateless/03227_dynamic_subcolumns_enumerate_streams.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-set allow_experimental_json_type=1;
-drop table if exists test;
-create table test (json JSON) engine=Memory;
-insert into test select toJSONString(map('a', 'str_' || number)) from numbers(5);
-select json.a.String from test;
-select json.a.:String from test;
-select json.a.UInt64 from test;
-drop table test;
-
diff --git a/tests/queries/0_stateless/03227_json_invalid_regexp.reference b/tests/queries/0_stateless/03227_json_invalid_regexp.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03227_json_invalid_regexp.sql b/tests/queries/0_stateless/03227_json_invalid_regexp.sql
deleted file mode 100644
index d98e2ade29d..00000000000
--- a/tests/queries/0_stateless/03227_json_invalid_regexp.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-set allow_experimental_json_type = 1;
-create table test (json JSON(SKIP REGEXP '[]')) engine=Memory(); -- {serverError CANNOT_COMPILE_REGEXP}
-create table test (json JSON(SKIP REGEXP '+')) engine=Memory(); -- {serverError CANNOT_COMPILE_REGEXP};
-
diff --git a/tests/queries/0_stateless/03227_print_pretty_tuples_create_query.reference b/tests/queries/0_stateless/03227_print_pretty_tuples_create_query.reference
deleted file mode 100644
index afaaaaa6119..00000000000
--- a/tests/queries/0_stateless/03227_print_pretty_tuples_create_query.reference
+++ /dev/null
@@ -1,56 +0,0 @@
-
-SHOW CREATE TABLE:
-CREATE TABLE default.test
-(
-    `x` Tuple(
-        a String,
-        b Array(Tuple(
-            c Tuple(
-                e String),
-            d String))),
-    `y` String
-)
-ENGINE = MergeTree
-ORDER BY tuple()
-SETTINGS index_granularity = 8192
-CREATE TABLE default.test
-(
-    `x` Tuple(a String, b Array(Tuple(c Tuple(e String), d String))),
-    `y` String
-)
-ENGINE = MergeTree
-ORDER BY tuple()
-SETTINGS index_granularity = 8192
-
-clickhouse-format:
-CREATE TABLE test
-(
-    `x` Tuple(
-        a String,
-        b Array(Tuple(
-            c Tuple(
-                e String),
-            d String))),
-    `y` String
-)
-ORDER BY tuple()
-CREATE TABLE test (`x` Tuple(a String, b Array(Tuple(c Tuple(e String), d String))), `y` String) ORDER BY tuple()
-
-formatQuery:
-CREATE TABLE test
-(
-    `x` Tuple(
-        a String,
-        b Array(Tuple(
-            c Tuple(
-                e String),
-            d String))),
-    `y` String
-)
-ORDER BY tuple()
-CREATE TABLE test
-(
-    `x` Tuple(a String, b Array(Tuple(c Tuple(e String), d String))),
-    `y` String
-)
-ORDER BY tuple()
diff --git a/tests/queries/0_stateless/03227_print_pretty_tuples_create_query.sh b/tests/queries/0_stateless/03227_print_pretty_tuples_create_query.sh
deleted file mode 100755
index e5614f9f228..00000000000
--- a/tests/queries/0_stateless/03227_print_pretty_tuples_create_query.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest, no-asan, no-msan, no-tsan
-# ^ requires S3
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-echo
-echo "SHOW CREATE TABLE:"
-${CLICKHOUSE_CLIENT} --output-format Raw --query "
-    DROP TABLE IF EXISTS test;
-    CREATE TABLE test (x Tuple(a String, b Array(Tuple(c Tuple(e String), d String))), y String) ORDER BY ();
-    SET print_pretty_type_names = 1;
-    SHOW CREATE TABLE test;
-    SET print_pretty_type_names = 0;
-    SHOW CREATE TABLE test;
-    DROP TABLE test;
-"
-
-echo
-echo "clickhouse-format:"
-${CLICKHOUSE_FORMAT} --query "
-    CREATE TABLE test (x Tuple(a String, b Array(Tuple(c Tuple(e String), d String))), y String) ORDER BY ()
-"
-${CLICKHOUSE_FORMAT} --oneline --query "
-    CREATE TABLE test (x Tuple(a String, b Array(Tuple(c Tuple(e String), d String))), y String) ORDER BY ()
-"
-
-echo
-echo "formatQuery:"
-${CLICKHOUSE_CLIENT} --output-format Raw --query "
-    SELECT formatQuery('CREATE TABLE test (x Tuple(a String, b Array(Tuple(c Tuple(e String), d String))), y String) ORDER BY ()') SETTINGS print_pretty_type_names = 1;
-    SELECT formatQuery('CREATE TABLE test (x Tuple(a String, b Array(Tuple(c Tuple(e String), d String))), y String) ORDER BY ()') SETTINGS print_pretty_type_names = 0;
-"
diff --git a/tests/queries/0_stateless/03227_proper_parsing_of_cast_operator.reference b/tests/queries/0_stateless/03227_proper_parsing_of_cast_operator.reference
deleted file mode 100644
index 2127d396bb3..00000000000
--- a/tests/queries/0_stateless/03227_proper_parsing_of_cast_operator.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-414243
-ABC
-A
-{"a": \'A\'}
diff --git a/tests/queries/0_stateless/03227_proper_parsing_of_cast_operator.sql b/tests/queries/0_stateless/03227_proper_parsing_of_cast_operator.sql
deleted file mode 100644
index 0c2e7dc582a..00000000000
--- a/tests/queries/0_stateless/03227_proper_parsing_of_cast_operator.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT '414243'::String;
-SELECT x'414243'::String;
-SELECT b'01000001'::String;
-SELECT '{"a": \'\x41\'}'::String;
-SELECT '{"a": \'\x4\'}'::String; -- { clientError SYNTAX_ERROR }
-SELECT '{"a": \'a\x4\'}'::String; -- { clientError SYNTAX_ERROR }
diff --git a/tests/queries/0_stateless/03227_test_sample_n.reference b/tests/queries/0_stateless/03227_test_sample_n.reference
deleted file mode 100644
index bc051d8d816..00000000000
--- a/tests/queries/0_stateless/03227_test_sample_n.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-50000
-1
diff --git a/tests/queries/0_stateless/03227_test_sample_n.sql b/tests/queries/0_stateless/03227_test_sample_n.sql
deleted file mode 100644
index d38bdd0a3ee..00000000000
--- a/tests/queries/0_stateless/03227_test_sample_n.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-CREATE TABLE IF NOT EXISTS table_name
-(
-id UInt64
-)
-ENGINE = MergeTree()
-ORDER BY cityHash64(id)
-SAMPLE BY cityHash64(id);
-
-INSERT INTO table_name SELECT rand() from system.numbers limit 10000;
-INSERT INTO table_name SELECT rand() from system.numbers limit 10000;
-INSERT INTO table_name SELECT rand() from system.numbers limit 10000;
-INSERT INTO table_name SELECT rand() from system.numbers limit 10000;
-INSERT INTO table_name SELECT rand() from system.numbers limit 10000;
-
-select count() from table_name;
-SELECT count() < 50 * 5 FROM (
-	SELECT * FROM table_name SAMPLE 50
-);
-
-DROP TABLE table_name;
diff --git a/tests/queries/0_stateless/03228_async_insert_query_params.reference b/tests/queries/0_stateless/03228_async_insert_query_params.reference
deleted file mode 100644
index 9de99658a53..00000000000
--- a/tests/queries/0_stateless/03228_async_insert_query_params.reference
+++ /dev/null
@@ -1,13 +0,0 @@
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
diff --git a/tests/queries/0_stateless/03228_async_insert_query_params.sh b/tests/queries/0_stateless/03228_async_insert_query_params.sh
deleted file mode 100755
index 6b130389220..00000000000
--- a/tests/queries/0_stateless/03228_async_insert_query_params.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/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 -q "
-    DROP TABLE IF EXISTS t_async_insert_params;
-    CREATE TABLE t_async_insert_params (id UInt64) ENGINE = Memory;
-"
-cmd_params="--async_insert 1 --async_insert_busy_timeout_max_ms 300000 --async_insert_busy_timeout_min_ms 300000 --wait_for_async_insert 0 --async_insert_use_adaptive_busy_timeout 0"
-
-$CLICKHOUSE_CLIENT $cmd_params -q "SET param_p1 = 11; INSERT INTO t_async_insert_params VALUES ({p1:UInt64});"
-$CLICKHOUSE_CLIENT $cmd_params -q "SET param_p2 = 12; INSERT INTO t_async_insert_params VALUES ({p2:UInt64});"
-$CLICKHOUSE_CLIENT $cmd_params -q "SET param_p2 = 1000; INSERT INTO t_async_insert_params VALUES (13);"
-$CLICKHOUSE_CLIENT $cmd_params -q 'SET param_p2 = 1000; INSERT INTO t_async_insert_params FORMAT JSONEachRow {"id": 14};'
-
-$CLICKHOUSE_CLIENT $cmd_params --param_p1 15 -q "INSERT INTO t_async_insert_params VALUES ({p1:UInt64});"
-$CLICKHOUSE_CLIENT $cmd_params --param_p2 16 -q "INSERT INTO t_async_insert_params VALUES ({p2:UInt64});"
-$CLICKHOUSE_CLIENT $cmd_params --param_p2 1000 -q "INSERT INTO t_async_insert_params VALUES (17);"
-$CLICKHOUSE_CLIENT $cmd_params --param_p2 1000 -q 'INSERT INTO t_async_insert_params FORMAT JSONEachRow {"id": 18};'
-
-url="${CLICKHOUSE_URL}&async_insert=1&async_insert_busy_timeout_max_ms=300000&async_insert_busy_timeout_min_ms=300000&wait_for_async_insert=0&async_insert_use_adaptive_busy_timeout=0"
-
-${CLICKHOUSE_CURL} -sS "$url&param_p1=19" -d "INSERT INTO t_async_insert_params VALUES ({p1:UInt64})"
-${CLICKHOUSE_CURL} -sS "$url&param_p2=20" -d "INSERT INTO t_async_insert_params VALUES ({p2:UInt64})"
-${CLICKHOUSE_CURL} -sS "$url&param_p3=21" -d "INSERT INTO t_async_insert_params VALUES ({p3:UInt64})"
-${CLICKHOUSE_CURL} -sS "$url&param_p2=1000" -d "INSERT INTO t_async_insert_params VALUES (22)"
-${CLICKHOUSE_CURL} -sS "$url&param_p2=1000" -d 'INSERT INTO t_async_insert_params FORMAT JSONEachRow {"id": 23}'
-
-$CLICKHOUSE_CLIENT -q "
-    SYSTEM FLUSH ASYNC INSERT QUEUE;
-    SELECT id FROM t_async_insert_params ORDER BY id;
-    DROP TABLE IF EXISTS t_async_insert_params;
-"
diff --git a/tests/queries/0_stateless/03228_async_insert_query_params_bad_type.reference b/tests/queries/0_stateless/03228_async_insert_query_params_bad_type.reference
deleted file mode 100644
index e965047ad7c..00000000000
--- a/tests/queries/0_stateless/03228_async_insert_query_params_bad_type.reference
+++ /dev/null
@@ -1 +0,0 @@
-Hello
diff --git a/tests/queries/0_stateless/03228_async_insert_query_params_bad_type.sql b/tests/queries/0_stateless/03228_async_insert_query_params_bad_type.sql
deleted file mode 100644
index 359174245cb..00000000000
--- a/tests/queries/0_stateless/03228_async_insert_query_params_bad_type.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-DROP TABLE IF EXISTS t_async_insert_params;
-
-CREATE TABLE t_async_insert_params (id UInt64) ENGINE = MergeTree ORDER BY tuple();
-
-SET param_p1 = 'Hello';
-
-SET async_insert = 1;
-SET wait_for_async_insert = 1;
-
-INSERT INTO t_async_insert_params VALUES ({p1:UInt64}); -- { serverError  BAD_QUERY_PARAMETER }
-INSERT INTO t_async_insert_params VALUES ({p1:String}); -- { serverError  TYPE_MISMATCH }
-
-ALTER TABLE t_async_insert_params MODIFY COLUMN id String;
-
-INSERT INTO t_async_insert_params VALUES ({p1:UInt64}); -- { serverError  BAD_QUERY_PARAMETER }
-INSERT INTO t_async_insert_params VALUES ({p1:String});
-
-SELECT * FROM t_async_insert_params ORDER BY id;
-
-DROP TABLE t_async_insert_params;
diff --git a/tests/queries/0_stateless/03228_dynamic_serializations_uninitialized_value.reference b/tests/queries/0_stateless/03228_dynamic_serializations_uninitialized_value.reference
deleted file mode 100644
index 64c193a8499..00000000000
--- a/tests/queries/0_stateless/03228_dynamic_serializations_uninitialized_value.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-str	3	\N
-str	3	\N
-str	3	\N
-str	3	\N
diff --git a/tests/queries/0_stateless/03228_dynamic_serializations_uninitialized_value.sql b/tests/queries/0_stateless/03228_dynamic_serializations_uninitialized_value.sql
deleted file mode 100644
index 8a565fe36b9..00000000000
--- a/tests/queries/0_stateless/03228_dynamic_serializations_uninitialized_value.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-set allow_experimental_dynamic_type=1;
-set cast_keep_nullable=1;
-SELECT toFixedString('str', 3), 3, CAST(if(1 = 0, toInt8(3), NULL), 'Int32') AS x from numbers(10) GROUP BY GROUPING SETS ((CAST(toInt32(1), 'Int32')), ('str', 3), (CAST(toFixedString('str', 3), 'Dynamic')), (CAST(toFixedString(toFixedString('str', 3), 3), 'Dynamic')));
-
diff --git a/tests/queries/0_stateless/03228_dynamic_subcolumns_from_subquery.reference b/tests/queries/0_stateless/03228_dynamic_subcolumns_from_subquery.reference
deleted file mode 100644
index 153ad78f694..00000000000
--- a/tests/queries/0_stateless/03228_dynamic_subcolumns_from_subquery.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-str
-42
-42
-42
diff --git a/tests/queries/0_stateless/03228_dynamic_subcolumns_from_subquery.sql b/tests/queries/0_stateless/03228_dynamic_subcolumns_from_subquery.sql
deleted file mode 100644
index a10b0cb2809..00000000000
--- a/tests/queries/0_stateless/03228_dynamic_subcolumns_from_subquery.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-set allow_experimental_dynamic_type=1;
-set allow_experimental_json_type=1;
-set allow_experimental_analyzer=1;
-
-select d.String from (select 'str'::Dynamic as d);
-select json.a from (select '{"a" : 42}'::JSON as json);
-select json.a from (select '{"a" : 42}'::JSON(a UInt32) as json);
-select json.a.:Int64 from (select materialize('{"a" : 42}')::JSON as json);
-
diff --git a/tests/queries/0_stateless/03228_full_text_with_multi_col.reference b/tests/queries/0_stateless/03228_full_text_with_multi_col.reference
deleted file mode 100644
index 9f721a82e59..00000000000
--- a/tests/queries/0_stateless/03228_full_text_with_multi_col.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-Query column at granularity boundary
-0,0	0,1
diff --git a/tests/queries/0_stateless/03228_full_text_with_multi_col.sql b/tests/queries/0_stateless/03228_full_text_with_multi_col.sql
deleted file mode 100644
index e1c78c5ffda..00000000000
--- a/tests/queries/0_stateless/03228_full_text_with_multi_col.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-SET allow_experimental_full_text_index=1;
-
-DROP TABLE IF EXISTS multi_col_ivt;
-
-CREATE TABLE tab (
-    v0 String,
-    v1 String,
-    INDEX idx (v0, v1) TYPE full_text GRANULARITY 1)
-ENGINE = MergeTree
-ORDER BY tuple()
-SETTINGS index_granularity = 1;
-
-INSERT INTO tab VALUES('0,0', '0,1')('2,2','2,3');
-
-SELECT 'Query column at granularity boundary';
-SELECT * FROM tab WHERE hasToken(v1, '1');
-
-DROP TABLE tab;
diff --git a/tests/queries/0_stateless/03228_join_to_rerange_right_table.reference b/tests/queries/0_stateless/03228_join_to_rerange_right_table.reference
deleted file mode 100644
index b62923296e5..00000000000
--- a/tests/queries/0_stateless/03228_join_to_rerange_right_table.reference
+++ /dev/null
@@ -1,2 +0,0 @@
-9
-9
diff --git a/tests/queries/0_stateless/03228_join_to_rerange_right_table.sql b/tests/queries/0_stateless/03228_join_to_rerange_right_table.sql
deleted file mode 100644
index f3ee0f0b933..00000000000
--- a/tests/queries/0_stateless/03228_join_to_rerange_right_table.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-drop table if exists test_left;
-drop table if exists test_right;
-
-CREATE TABLE test_left (a Int64, b String, c LowCardinality(String)) ENGINE = MergeTree() ORDER BY a;
-CREATE TABLE test_right (a Int64, b String, c LowCardinality(String)) ENGINE = MergeTree() ORDER BY a;
-
-INSERT INTO test_left SELECT number % 10000, number % 10000, number % 10000 FROM numbers(100000);
-INSERT INTO test_right SELECT number % 10 , number % 10, number % 10 FROM numbers(10000);
-
-SELECT MAX(test_right.a) FROM test_left INNER JOIN test_right on test_left.b = test_right.b SETTINGS allow_experimental_join_right_table_sorting=true;
-SELECT MAX(test_right.a) FROM test_left LEFT JOIN test_right on test_left.b = test_right.b SETTINGS allow_experimental_join_right_table_sorting=true;
-
-drop table test_left;
-drop table test_right;
diff --git a/tests/queries/0_stateless/03228_pr_subquery_view_order_by.reference b/tests/queries/0_stateless/03228_pr_subquery_view_order_by.reference
deleted file mode 100644
index aad720e27cf..00000000000
--- a/tests/queries/0_stateless/03228_pr_subquery_view_order_by.reference
+++ /dev/null
@@ -1,20 +0,0 @@
-300
-299
-298
-297
-296
-295
-294
-293
-292
-291
-290
-289
-288
-287
-286
-285
-284
-283
-282
-281
diff --git a/tests/queries/0_stateless/03228_pr_subquery_view_order_by.sql b/tests/queries/0_stateless/03228_pr_subquery_view_order_by.sql
deleted file mode 100644
index 804a97f737f..00000000000
--- a/tests/queries/0_stateless/03228_pr_subquery_view_order_by.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-DROP TABLE IF EXISTS view1;
-DROP TABLE IF EXISTS table1;
-CREATE TABLE table1 (number UInt64) ENGINE=MergeTree ORDER BY number SETTINGS index_granularity=1;
-INSERT INTO table1 SELECT number FROM numbers(1, 300);
-CREATE VIEW view1 AS SELECT number FROM table1;
-
-SELECT *
-FROM
-(
-    SELECT *
-    FROM view1
-)
-ORDER BY number DESC
-LIMIT 20
-SETTINGS cluster_for_parallel_replicas = 'parallel_replicas', allow_experimental_parallel_reading_from_replicas = 1, max_parallel_replicas = 3, parallel_replicas_for_non_replicated_merge_tree = 1, parallel_replicas_local_plan = 1;
-
-DROP TABLE view1;
-DROP TABLE table1;
diff --git a/tests/queries/0_stateless/03228_url_engine_response_headers.reference b/tests/queries/0_stateless/03228_url_engine_response_headers.reference
deleted file mode 100644
index 84b499f5a8c..00000000000
--- a/tests/queries/0_stateless/03228_url_engine_response_headers.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-Map(LowCardinality(String), LowCardinality(String))
-1	1
-3	100	1
diff --git a/tests/queries/0_stateless/03228_url_engine_response_headers.sql b/tests/queries/0_stateless/03228_url_engine_response_headers.sql
deleted file mode 100644
index 41a1a2406da..00000000000
--- a/tests/queries/0_stateless/03228_url_engine_response_headers.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-SELECT toTypeName(_headers)
-FROM url('http://127.0.0.1:8123/?query=select+1&user=default', LineAsString, 's String');
-
-SELECT
-    *,
-    mapFromString(_headers['X-ClickHouse-Summary'])['read_rows']
-FROM url('http://127.0.0.1:8123/?query=select+1&user=default', LineAsString, 's String');
-
--- The real_time_microseconds is not available in the `X-ClickHouse-Progress` header (it is only available in the `X-ClickHouse-Summary` header).
--- We need to wait until the query is finished to get the real_time_microseconds.
-SELECT
-    *,
-    mapFromString(_headers['X-ClickHouse-Summary'])['read_rows'],
-    toUInt64OrZero(mapFromString(_headers['X-ClickHouse-Summary'])['real_time_microseconds']) >= 0 ? 1 : 0
-FROM url('http://127.0.0.1:8123/?query=SELECT%20uniq%28number%253%29%20FROM%20numbers%28100%29&user=default&wait_end_of_query=1', LineAsString, 's String');
diff --git a/tests/queries/0_stateless/03228_variant_permutation_issue.reference b/tests/queries/0_stateless/03228_variant_permutation_issue.reference
index be9cdedaf07..e69de29bb2d 100644
--- a/tests/queries/0_stateless/03228_variant_permutation_issue.reference
+++ b/tests/queries/0_stateless/03228_variant_permutation_issue.reference
@@ -1,8 +0,0 @@
-2	{"foo2":"bar"}	1
-3	{"foo2":"bar"}	1
-2	{"foo2":"baz"}	2
-3	{"foo2":"bar"}	1
-2	{"foo2":"bar"}	1
-3	{"foo2":"bar"}	1
-2	{"foo2":"baz"}	2
-3	{"foo2":"bar"}	1
diff --git a/tests/queries/0_stateless/03228_variant_permutation_issue.sql b/tests/queries/0_stateless/03228_variant_permutation_issue.sql
index 81eb2ed69af..d5c84a8b7db 100644
--- a/tests/queries/0_stateless/03228_variant_permutation_issue.sql
+++ b/tests/queries/0_stateless/03228_variant_permutation_issue.sql
@@ -1,33 +1,8 @@
-SET allow_experimental_json_type = 1;
-
-DROP TABLE IF EXISTS test_new_json_type;
-CREATE TABLE test_new_json_type(id UInt32, data JSON, version UInt64) ENGINE=ReplacingMergeTree(version) ORDER BY id;
-INSERT INTO test_new_json_type format JSONEachRow
-{"id":1,"data":{"foo1":"bar"},"version":1}
-{"id":2,"data":{"foo2":"bar"},"version":1}
-{"id":3,"data":{"foo2":"bar"},"version":1}
-;
-
-SELECT * FROM test_new_json_type FINAL WHERE data.foo2 is not null ORDER BY id;
-
-INSERT INTO test_new_json_type SELECT id, '{"foo2":"baz"}' AS _data, version+1 AS _version FROM test_new_json_type where id=2;
-
-SELECT * FROM test_new_json_type FINAL WHERE data.foo2 is not null ORDER BY id;
-
-DROP TABLE test_new_json_type;
-
-CREATE TABLE test_new_json_type(id Nullable(UInt32), data JSON, version UInt64) ENGINE=ReplacingMergeTree(version) ORDER BY id settings allow_nullable_key=1;
-INSERT INTO test_new_json_type format JSONEachRow
-{"id":1,"data":{"foo1":"bar"},"version":1}
-{"id":2,"data":{"foo2":"bar"},"version":1}
-{"id":3,"data":{"foo2":"bar"},"version":1}
-;
-
-SELECT * FROM test_new_json_type FINAL WHERE data.foo2 is not null ORDER BY id;
-
-INSERT INTO test_new_json_type SELECT id, '{"foo2":"baz"}' AS _data, version+1 AS _version FROM test_new_json_type where id=2;
-
-SELECT * FROM test_new_json_type FINAL PREWHERE data.foo2 IS NOT NULL WHERE data.foo2 IS NOT NULL ORDER BY id ASC NULLS FIRST;
-
-DROP TABLE test_new_json_type;
+SET allow_experimental_variant_type = 1;
 
+drop table if exists test;
+create table test (id UInt32, data Variant(String), version UInt64) engine=ReplacingMergeTree(version) order by id;
+insert into test values (1, NULL, 1), (2, 'bar', 1), (3, 'bar', 1);
+insert into test select id, 'baz' as _data, version+1 as _version from test where id=2;
+select * from test final WHERE data is not null format Null;
+drop table test;
diff --git a/tests/queries/0_stateless/03228_virtual_column_merge_dist.sql b/tests/queries/0_stateless/03228_virtual_column_merge_dist.sql
index e58c7f38d3b..caf00a2e407 100644
--- a/tests/queries/0_stateless/03228_virtual_column_merge_dist.sql
+++ b/tests/queries/0_stateless/03228_virtual_column_merge_dist.sql
@@ -1,6 +1,3 @@
--- There is a bug in old analyzer with currentDatabase() and distributed query.
-SET enable_analyzer = 1;
-
 DROP TABLE IF EXISTS t_local_1;
 DROP TABLE IF EXISTS t_local_2;
 DROP TABLE IF EXISTS t_merge;
@@ -13,7 +10,7 @@ INSERT INTO t_local_1 VALUES (1);
 INSERT INTO t_local_2 VALUES (2);
 
 CREATE TABLE t_merge AS t_local_1 ENGINE = Merge(currentDatabase(), '^(t_local_1|t_local_2)$');
-CREATE TABLE t_distr AS t_local_1 ENGINE = Distributed('test_shard_localhost', currentDatabase(), t_merge, rand());
+CREATE TABLE t_distr AS t_local_1 engine=Distributed('test_shard_localhost', currentDatabase(), t_merge, rand());
 
 SELECT a, _table FROM t_merge ORDER BY a;
 SELECT a, _table FROM t_distr ORDER BY a;
diff --git a/tests/queries/0_stateless/03229_async_insert_alter.reference b/tests/queries/0_stateless/03229_async_insert_alter.reference
deleted file mode 100644
index f66021d0bfe..00000000000
--- a/tests/queries/0_stateless/03229_async_insert_alter.reference
+++ /dev/null
@@ -1,8 +0,0 @@
-42	24	0
-42	24	0
-43	34	55
-42	24
-43	34
-INSERT INTO default.t_async_insert_alter (id, v1) FORMAT Values	Preprocessed	Ok
-INSERT INTO default.t_async_insert_alter (id, v1, value2) FORMAT Values	Preprocessed	Ok
-INSERT INTO default.t_async_insert_alter (id, v1, value2) FORMAT Values	Preprocessed	FlushError
diff --git a/tests/queries/0_stateless/03229_async_insert_alter.sql b/tests/queries/0_stateless/03229_async_insert_alter.sql
deleted file mode 100644
index 022e386bef0..00000000000
--- a/tests/queries/0_stateless/03229_async_insert_alter.sql
+++ /dev/null
@@ -1,47 +0,0 @@
--- Tags: no-parallel
--- no-parallel because the test uses FLUSH ASYNC INSERT QUEUE
-
-SET wait_for_async_insert = 0;
-SET async_insert_busy_timeout_max_ms = 300000;
-SET async_insert_busy_timeout_min_ms = 300000;
-SET async_insert_use_adaptive_busy_timeout = 0;
-
-DROP TABLE IF EXISTS t_async_insert_alter;
-
-CREATE TABLE t_async_insert_alter (id Int64, v1 Int64) ENGINE = MergeTree ORDER BY id SETTINGS async_insert = 1;
-
--- ADD COLUMN
-
-INSERT INTO t_async_insert_alter VALUES (42, 24);
-
-ALTER TABLE t_async_insert_alter ADD COLUMN value2 Int64;
-
-SYSTEM FLUSH ASYNC INSERT QUEUE;
-SYSTEM FLUSH LOGS;
-
-SELECT * FROM t_async_insert_alter ORDER BY id;
-
--- MODIFY COLUMN
-
-INSERT INTO t_async_insert_alter VALUES (43, 34, 55);
-
-ALTER TABLE t_async_insert_alter MODIFY COLUMN value2 String;
-
-SYSTEM FLUSH ASYNC INSERT QUEUE;
-SYSTEM FLUSH LOGS;
-
-SELECT * FROM t_async_insert_alter ORDER BY id;
-
--- DROP COLUMN
-
-INSERT INTO t_async_insert_alter VALUES ('100', '200', '300');
-
-ALTER TABLE t_async_insert_alter DROP COLUMN value2;
-
-SYSTEM FLUSH ASYNC INSERT QUEUE;
-SYSTEM FLUSH LOGS;
-
-SELECT * FROM t_async_insert_alter ORDER BY id;
-SELECT query, data_kind, status FROM system.asynchronous_insert_log WHERE database = currentDatabase() AND table = 't_async_insert_alter' ORDER BY event_time_microseconds;
-
-DROP TABLE t_async_insert_alter;
diff --git a/tests/queries/0_stateless/03229_async_insert_alter_http.reference b/tests/queries/0_stateless/03229_async_insert_alter_http.reference
deleted file mode 100644
index 195701d2b82..00000000000
--- a/tests/queries/0_stateless/03229_async_insert_alter_http.reference
+++ /dev/null
@@ -1,8 +0,0 @@
-42	24	0
-42	24	0
-43	34	55
-42	24
-43	34
-INSERT INTO default.t_async_insert_alter (id, v1) FORMAT Values	Parsed	Ok
-INSERT INTO default.t_async_insert_alter (id, v1, value2) FORMAT Values	Parsed	Ok
-INSERT INTO default.t_async_insert_alter (id, v1, value2) FORMAT Values	Parsed	FlushError
diff --git a/tests/queries/0_stateless/03229_async_insert_alter_http.sh b/tests/queries/0_stateless/03229_async_insert_alter_http.sh
deleted file mode 100755
index fe72ed3299a..00000000000
--- a/tests/queries/0_stateless/03229_async_insert_alter_http.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-parallel
-# no-parallel because the test uses FLUSH ASYNC INSERT QUEUE
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-$CLICKHOUSE_CLIENT -q "
-    DROP TABLE IF EXISTS t_async_insert_alter;
-    CREATE TABLE t_async_insert_alter (id Int64, v1 Int64) ENGINE = MergeTree ORDER BY id SETTINGS async_insert = 1;
-"
-
-url="${CLICKHOUSE_URL}&async_insert=1&async_insert_busy_timeout_max_ms=300000&async_insert_busy_timeout_min_ms=300000&wait_for_async_insert=0&async_insert_use_adaptive_busy_timeout=0"
-
-# ADD COLUMN
-
-${CLICKHOUSE_CURL} -sS "$url" -d "INSERT INTO t_async_insert_alter VALUES (42, 24)"
-
-$CLICKHOUSE_CLIENT -q "
-    ALTER TABLE t_async_insert_alter ADD COLUMN value2 Int64;
-
-    SYSTEM FLUSH ASYNC INSERT QUEUE;
-    SYSTEM FLUSH LOGS;
-
-    SELECT * FROM t_async_insert_alter ORDER BY id;
-"
-
-# MODIFY COLUMN
-
-${CLICKHOUSE_CURL} -sS "$url" -d "INSERT INTO t_async_insert_alter VALUES (43, 34, 55)"
-
-$CLICKHOUSE_CLIENT -q "
-    ALTER TABLE t_async_insert_alter MODIFY COLUMN value2 String;
-
-    SYSTEM FLUSH ASYNC INSERT QUEUE;
-    SYSTEM FLUSH LOGS;
-
-    SELECT * FROM t_async_insert_alter ORDER BY id;
-"
-
-## DROP COLUMN
-
-${CLICKHOUSE_CURL} -sS "$url" -d "INSERT INTO t_async_insert_alter VALUES ('100', '200', '300')"
-
-$CLICKHOUSE_CLIENT -q "
-    ALTER TABLE t_async_insert_alter DROP COLUMN value2;
-
-    SYSTEM FLUSH ASYNC INSERT QUEUE;
-    SYSTEM FLUSH LOGS;
-
-    SELECT * FROM t_async_insert_alter ORDER BY id;
-    SELECT query, data_kind, status FROM system.asynchronous_insert_log WHERE database = currentDatabase() AND table = 't_async_insert_alter' ORDER BY event_time_microseconds;
-
-    DROP TABLE t_async_insert_alter;
-"
diff --git a/tests/queries/0_stateless/03229_empty_tuple_in_array.reference b/tests/queries/0_stateless/03229_empty_tuple_in_array.reference
deleted file mode 100644
index 6a452c185a8..00000000000
--- a/tests/queries/0_stateless/03229_empty_tuple_in_array.reference
+++ /dev/null
@@ -1 +0,0 @@
-()
diff --git a/tests/queries/0_stateless/03229_empty_tuple_in_array.sql b/tests/queries/0_stateless/03229_empty_tuple_in_array.sql
deleted file mode 100644
index 09ba3595a5a..00000000000
--- a/tests/queries/0_stateless/03229_empty_tuple_in_array.sql
+++ /dev/null
@@ -1 +0,0 @@
-select [()][0];
diff --git a/tests/queries/0_stateless/03229_json_null_as_default_for_tuple.reference b/tests/queries/0_stateless/03229_json_null_as_default_for_tuple.reference
deleted file mode 100644
index fbbba67a2b8..00000000000
--- a/tests/queries/0_stateless/03229_json_null_as_default_for_tuple.reference
+++ /dev/null
@@ -1 +0,0 @@
-{"a":[["1",{}],[null,{}]]}	[(1,'{}'),(NULL,'{}')]	Array(Tuple(Nullable(Int64), JSON(max_dynamic_types=16, max_dynamic_paths=256)))
diff --git a/tests/queries/0_stateless/03229_json_null_as_default_for_tuple.sql b/tests/queries/0_stateless/03229_json_null_as_default_for_tuple.sql
deleted file mode 100644
index d405f6232e4..00000000000
--- a/tests/queries/0_stateless/03229_json_null_as_default_for_tuple.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-set allow_experimental_json_type=1;
-
-select materialize('{"a" : [[1, {}], null]}')::JSON as json, getSubcolumn(json, 'a'), dynamicType(getSubcolumn(json, 'a'));
-
diff --git a/tests/queries/0_stateless/03229_json_structure_comparison.reference b/tests/queries/0_stateless/03229_json_structure_comparison.reference
deleted file mode 100644
index c816df4f5c7..00000000000
--- a/tests/queries/0_stateless/03229_json_structure_comparison.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-{"foo1":"bar"}	{"foo1":"bar"}
-{"foo2":"bar"}	{"foo2":"bar"}
-{"foo2":"bar"}	{"foo2":"bar"}
diff --git a/tests/queries/0_stateless/03229_json_structure_comparison.sql b/tests/queries/0_stateless/03229_json_structure_comparison.sql
deleted file mode 100644
index 16db469325d..00000000000
--- a/tests/queries/0_stateless/03229_json_structure_comparison.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-SET allow_experimental_json_type=1;
-
-DROP TABLE IF EXISTS test_new_json_type;
-
-CREATE TABLE test_new_json_type(id UInt32, data JSON, version UInt64) ENGINE=ReplacingMergeTree(version) ORDER BY id;
-
-INSERT INTO test_new_json_type format JSONEachRow
-{"id":1,"data":{"foo1":"bar"},"version":1}
-{"id":2,"data":{"foo2":"bar"},"version":1}
-{"id":3,"data":{"foo2":"bar"},"version":1}
-;
-
-SELECT
-    a.data
-    , b.data
-FROM
-    test_new_json_type a
-    JOIN test_new_json_type b
-        ON a.id = b.id;
-
-DROP TABLE test_new_json_type;
-
diff --git a/tests/queries/0_stateless/03230_alter_with_mixed_mutations_and_remove_materialized.reference b/tests/queries/0_stateless/03230_alter_with_mixed_mutations_and_remove_materialized.reference
deleted file mode 100644
index 66cf66367c1..00000000000
--- a/tests/queries/0_stateless/03230_alter_with_mixed_mutations_and_remove_materialized.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-BEFORE	a	x	String		
-BEFORE	a	y	String	MATERIALIZED	\'str\'
-AFTER	a	x	String		
-AFTER	a	y	String		
diff --git a/tests/queries/0_stateless/03230_alter_with_mixed_mutations_and_remove_materialized.sql b/tests/queries/0_stateless/03230_alter_with_mixed_mutations_and_remove_materialized.sql
deleted file mode 100644
index d8ac3280792..00000000000
--- a/tests/queries/0_stateless/03230_alter_with_mixed_mutations_and_remove_materialized.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-DROP TABLE IF EXISTS a SYNC;
-CREATE TABLE a (x String, y String MATERIALIZED 'str') ENGINE = ReplicatedMergeTree('/clickhouse/{database}/a', 'r1') ORDER BY x;
-
-INSERT INTO a SELECT toString(number) FROM numbers(100);
-SELECT 'BEFORE', table, name, type, default_kind, default_expression FROM system.columns WHERE database = currentDatabase() AND table = 'a' ORDER BY table, name;
-
--- DROP INDEX is important to make the mutation not a pure metadata mutation
-ALTER TABLE a
-	DROP INDEX IF EXISTS some_index,
-	MODIFY COLUMN y REMOVE MATERIALIZED
-SETTINGS alter_sync = 2, mutations_sync = 2;
-
-SELECT 'AFTER', table, name, type, default_kind, default_expression FROM system.columns WHERE database = currentDatabase() AND table = 'a' ORDER BY table, name;
diff --git a/tests/queries/0_stateless/03230_array_zip_unaligned.reference b/tests/queries/0_stateless/03230_array_zip_unaligned.reference
deleted file mode 100644
index 7067f8788e5..00000000000
--- a/tests/queries/0_stateless/03230_array_zip_unaligned.reference
+++ /dev/null
@@ -1,8 +0,0 @@
-[('a','d'),('b','e'),('c','f')]	Array(Tuple(Nullable(String), Nullable(String)))
-[('a','d','g'),('b','e','h'),('c','f','i')]
-[('a','d'),('b','e'),('c','f'),(NULL,'g')]
-[('a',1),(NULL,2),(NULL,3)]
-[('a',1,1.1),('b',2,2.2),('c',NULL,3.3),(NULL,NULL,4.4)]
-[('g'),('h'),('i')]
-[('g'),('h'),('i')]
-[('g'),('h'),('i')]
diff --git a/tests/queries/0_stateless/03230_array_zip_unaligned.sql b/tests/queries/0_stateless/03230_array_zip_unaligned.sql
deleted file mode 100644
index 90b7aa47bfd..00000000000
--- a/tests/queries/0_stateless/03230_array_zip_unaligned.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-SELECT arrayZipUnaligned(['a', 'b', 'c'], ['d', 'e', 'f']) as x, toTypeName(x);
-
-SELECT arrayZipUnaligned(['a', 'b', 'c'], ['d', 'e', 'f'], ['g', 'h', 'i']);
-
-SELECT arrayZipUnaligned(); -- { serverError TOO_FEW_ARGUMENTS_FOR_FUNCTION }
-
-SELECT arrayZipUnaligned('a', 'b', 'c'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
-
-SELECT arrayZipUnaligned(['a', 'b', 'c'], ['d', 'e', 'f', 'g']);
-
-SELECT arrayZipUnaligned(['a'], [1, 2, 3]);
-
-SELECT arrayZipUnaligned(['a', 'b', 'c'], [1, 2], [1.1, 2.2, 3.3, 4.4]);
-
-SELECT arrayZipUnaligned(materialize(['g', 'h', 'i'])) from numbers(3); 
diff --git a/tests/queries/0_stateless/03230_date_trunc_and_to_start_of_interval_on_date32.reference b/tests/queries/0_stateless/03230_date_trunc_and_to_start_of_interval_on_date32.reference
deleted file mode 100644
index ea0c96ab2d2..00000000000
--- a/tests/queries/0_stateless/03230_date_trunc_and_to_start_of_interval_on_date32.reference
+++ /dev/null
@@ -1,33 +0,0 @@
--- { echoOn }
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 YEAR);
-2022-01-01
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 QUARTER);
-2022-07-01
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 MONTH);
-2022-09-01
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 WEEK);
-2022-09-12
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 DAY);
-2022-09-16 00:00:00
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 HOUR); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 MINUTE); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 SECOND); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 MILLISECOND); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 MICROSECOND); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 NANOSECOND); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select date_trunc('YEAR', toDate32('2022-09-16'));
-2022-01-01
-select date_trunc('QUARTER', toDate32('2022-09-16'));
-2022-07-01
-select date_trunc('MONTH', toDate32('2022-09-16'));
-2022-09-01
-select date_trunc('WEEK', toDate32('2022-09-16'));
-2022-09-12
-select date_trunc('DAY', toDate32('2022-09-16'));
-2022-09-16 00:00:00
-select date_trunc('HOUR', toDate32('2022-09-16')); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select date_trunc('MINUTE', toDate32('2022-09-16')); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select date_trunc('SECOND', toDate32('2022-09-16')); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select date_trunc('MILLISECOND', toDate32('2022-09-16')); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select date_trunc('MICROSECOND', toDate32('2022-09-16')); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select date_trunc('NANOSECOND', toDate32('2022-09-16')); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
diff --git a/tests/queries/0_stateless/03230_date_trunc_and_to_start_of_interval_on_date32.sql b/tests/queries/0_stateless/03230_date_trunc_and_to_start_of_interval_on_date32.sql
deleted file mode 100644
index b2b6385f00b..00000000000
--- a/tests/queries/0_stateless/03230_date_trunc_and_to_start_of_interval_on_date32.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- { echoOn }
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 YEAR);
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 QUARTER);
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 MONTH);
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 WEEK);
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 DAY);
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 HOUR); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 MINUTE); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 SECOND); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 MILLISECOND); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 MICROSECOND); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select toStartOfInterval(toDate32('2022-09-16'), INTERVAL 1 NANOSECOND); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-
-select date_trunc('YEAR', toDate32('2022-09-16'));
-select date_trunc('QUARTER', toDate32('2022-09-16'));
-select date_trunc('MONTH', toDate32('2022-09-16'));
-select date_trunc('WEEK', toDate32('2022-09-16'));
-select date_trunc('DAY', toDate32('2022-09-16'));
-select date_trunc('HOUR', toDate32('2022-09-16')); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select date_trunc('MINUTE', toDate32('2022-09-16')); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select date_trunc('SECOND', toDate32('2022-09-16')); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select date_trunc('MILLISECOND', toDate32('2022-09-16')); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select date_trunc('MICROSECOND', toDate32('2022-09-16')); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-select date_trunc('NANOSECOND', toDate32('2022-09-16')); -- {  serverError ILLEGAL_TYPE_OF_ARGUMENT }
-
-
diff --git a/tests/queries/0_stateless/03230_json_alias_new_old_types.reference b/tests/queries/0_stateless/03230_json_alias_new_old_types.reference
deleted file mode 100644
index ad74944e726..00000000000
--- a/tests/queries/0_stateless/03230_json_alias_new_old_types.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-{"a":"42"}	JSON
-{"a":42}	Object(\'json\')
-{"a":"42"}	JSON
diff --git a/tests/queries/0_stateless/03230_json_alias_new_old_types.sql b/tests/queries/0_stateless/03230_json_alias_new_old_types.sql
deleted file mode 100644
index 96d4bda171d..00000000000
--- a/tests/queries/0_stateless/03230_json_alias_new_old_types.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-set allow_experimental_object_type=1;
-set allow_experimental_json_type=1;
-set use_json_alias_for_old_object_type=0;
-select materialize('{"a" : 42}')::JSON as json, toTypeName(json);
-set use_json_alias_for_old_object_type=1;
-select '{"a" : 42}'::JSON as json, toTypeName(json);
-select '{"a" : 42}'::JSON(max_dynamic_paths=100) as json, toTypeName(json); -- {serverError BAD_ARGUMENTS}
-
-set allow_experimental_object_type = 0;
-select materialize('{"a" : 42}')::JSON as json, toTypeName(json);
-
diff --git a/tests/queries/0_stateless/03230_keeper_cp_mv_commands.reference b/tests/queries/0_stateless/03230_keeper_cp_mv_commands.reference
deleted file mode 100644
index f258af94664..00000000000
--- a/tests/queries/0_stateless/03230_keeper_cp_mv_commands.reference
+++ /dev/null
@@ -1,15 +0,0 @@
-initial
-A C
-simple copy
-A C D
-node-A
-simple move
-A C H
-node-A
-move node with childs -- must be error
-Transaction failed (Not empty): Op #2, path: /test-keeper-client-default/A
-A C H
-move node to existing
-Transaction failed (Node exists): Op #1, path: /test-keeper-client-default/A
-A C H
-clean up
diff --git a/tests/queries/0_stateless/03230_keeper_cp_mv_commands.sh b/tests/queries/0_stateless/03230_keeper_cp_mv_commands.sh
deleted file mode 100755
index 59b3547c36e..00000000000
--- a/tests/queries/0_stateless/03230_keeper_cp_mv_commands.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-path="/test-keeper-client-$CLICKHOUSE_DATABASE"
-$CLICKHOUSE_KEEPER_CLIENT -q "rm '$path'" >& /dev/null
-
-$CLICKHOUSE_KEEPER_CLIENT -q "create '$path' 'root'"
-$CLICKHOUSE_KEEPER_CLIENT -q "create '$path/A' 'node-A'"
-$CLICKHOUSE_KEEPER_CLIENT -q "create '$path/A/B' 'node-B'"
-$CLICKHOUSE_KEEPER_CLIENT -q "create '$path/C' 'node-B'"
-
-echo 'initial'
-$CLICKHOUSE_KEEPER_CLIENT -q "ls '$path'"
-
-echo 'simple copy'
-$CLICKHOUSE_KEEPER_CLIENT -q "cp '$path/A' '$path/D'"
-$CLICKHOUSE_KEEPER_CLIENT -q "ls '$path'"
-$CLICKHOUSE_KEEPER_CLIENT -q "get '$path/D'"
-
-echo 'simple move'
-$CLICKHOUSE_KEEPER_CLIENT -q "mv '$path/D' '$path/H'"
-$CLICKHOUSE_KEEPER_CLIENT -q "ls '$path'"
-$CLICKHOUSE_KEEPER_CLIENT -q "get '$path/H'"
-
-echo 'move node with childs -- must be error'
-$CLICKHOUSE_KEEPER_CLIENT -q "mv '$path/A' '$path/ERROR'" 2>&1
-$CLICKHOUSE_KEEPER_CLIENT -q "ls '$path'"
-
-echo 'move node to existing'
-$CLICKHOUSE_KEEPER_CLIENT -q "mv '$path/C' '$path/A'" 2>&1
-$CLICKHOUSE_KEEPER_CLIENT -q "ls '$path'"
-
-echo 'clean up'
-$CLICKHOUSE_KEEPER_CLIENT -q "rmr '$path'"
diff --git a/tests/queries/0_stateless/03230_output_format_identifier_quoting_style.reference b/tests/queries/0_stateless/03230_output_format_identifier_quoting_style.reference
deleted file mode 100644
index c563617a01c..00000000000
--- a/tests/queries/0_stateless/03230_output_format_identifier_quoting_style.reference
+++ /dev/null
@@ -1,40 +0,0 @@
-CREATE TABLE default.uk_price_paid\n(\n    `price` UInt32,\n    `date` Date,\n    `postcode1` LowCardinality(String),\n    `postcode2` LowCardinality(String),\n    `type` Enum8(\'other\' = 0, \'terraced\' = 1, \'semi-detached\' = 2, \'detached\' = 3, \'flat\' = 4),\n    `is_new` UInt8,\n    `duration` Enum8(\'unknown\' = 0, \'freehold\' = 1, \'leasehold\' = 2),\n    `addr1` String,\n    `addr2` String,\n    `street` LowCardinality(String),\n    `locality` LowCardinality(String),\n    `town` LowCardinality(String),\n    `district` LowCardinality(String),\n    `county` LowCardinality(String),\n    INDEX county_index county TYPE set(10) GRANULARITY 1,\n    PROJECTION town_date_projection\n    (\n        SELECT \n            town,\n            date,\n            price\n        ORDER BY \n            town,\n            date\n    ),\n    PROJECTION handy_aggs_projection\n    (\n        SELECT \n            avg(price),\n            max(price),\n            sum(price)\n        GROUP BY town\n    )\n)\nENGINE = MergeTree\nORDER BY (postcode1, postcode2, date)\nSETTINGS index_granularity = 8192
-CREATE MATERIALIZED VIEW default.prices_by_year_view TO default.prices_by_year_dest\n(\n    `price` UInt32,\n    `date` Date,\n    `addr1` String,\n    `addr2` String,\n    `street` LowCardinality(String),\n    `town` LowCardinality(String),\n    `district` LowCardinality(String),\n    `county` LowCardinality(String)\n)\nAS SELECT\n    price,\n    date,\n    addr1,\n    addr2,\n    street,\n    town,\n    district,\n    county\nFROM default.uk_price_paid
-CREATE TABLE default.uk_prices_aggs_dest\n(\n    `month` Date,\n    `min_price` SimpleAggregateFunction(min, UInt32),\n    `max_price` SimpleAggregateFunction(max, UInt32),\n    `volume` AggregateFunction(count, UInt32),\n    `avg_price` AggregateFunction(avg, UInt32)\n)\nENGINE = AggregatingMergeTree\nPRIMARY KEY month\nORDER BY month\nSETTINGS index_granularity = 8192
-CREATE MATERIALIZED VIEW default.uk_prices_aggs_view TO default.uk_prices_aggs_dest\n(\n    `month` Date,\n    `min_price` SimpleAggregateFunction(min, UInt32),\n    `max_price` SimpleAggregateFunction(max, UInt32),\n    `volume` AggregateFunction(count, UInt32),\n    `avg_price` AggregateFunction(avg, UInt32)\n)\nAS WITH toStartOfMonth(date) AS month\nSELECT\n    month,\n    minSimpleState(price) AS min_price,\n    maxSimpleState(price) AS max_price,\n    countState(price) AS volume,\n    avgState(price) AS avg_price\nFROM default.uk_price_paid\nGROUP BY month
-CREATE DICTIONARY default.uk_mortgage_rates_dict\n(\n    `date` DateTime64,\n    `variable` Decimal32(2),\n    `fixed` Decimal32(2),\n    `bank` Decimal32(2)\n)\nPRIMARY KEY date\nSOURCE(CLICKHOUSE(TABLE \'uk_mortgage_rates\'))\nLIFETIME(MIN 0 MAX 2628000000)\nLAYOUT(COMPLEX_KEY_HASHED())
-CREATE TABLE default.uk_price_paid\n(\n    `price` UInt32,\n    `date` Date,\n    `postcode1` LowCardinality(String),\n    `postcode2` LowCardinality(String),\n    `type` Enum8(\'other\' = 0, \'terraced\' = 1, \'semi-detached\' = 2, \'detached\' = 3, \'flat\' = 4),\n    `is_new` UInt8,\n    `duration` Enum8(\'unknown\' = 0, \'freehold\' = 1, \'leasehold\' = 2),\n    `addr1` String,\n    `addr2` String,\n    `street` LowCardinality(String),\n    `locality` LowCardinality(String),\n    `town` LowCardinality(String),\n    `district` LowCardinality(String),\n    `county` LowCardinality(String),\n    INDEX county_index county TYPE set(10) GRANULARITY 1,\n    PROJECTION town_date_projection\n    (\n        SELECT \n            town,\n            date,\n            price\n        ORDER BY \n            town,\n            date\n    ),\n    PROJECTION handy_aggs_projection\n    (\n        SELECT \n            avg(price),\n            max(price),\n            sum(price)\n        GROUP BY town\n    )\n)\nENGINE = MergeTree\nORDER BY (postcode1, postcode2, date)\nSETTINGS index_granularity = 8192
-CREATE MATERIALIZED VIEW default.prices_by_year_view TO default.prices_by_year_dest\n(\n    `price` UInt32,\n    `date` Date,\n    `addr1` String,\n    `addr2` String,\n    `street` LowCardinality(String),\n    `town` LowCardinality(String),\n    `district` LowCardinality(String),\n    `county` LowCardinality(String)\n)\nAS SELECT\n    price,\n    date,\n    addr1,\n    addr2,\n    street,\n    town,\n    district,\n    county\nFROM default.uk_price_paid
-CREATE TABLE default.uk_prices_aggs_dest\n(\n    `month` Date,\n    `min_price` SimpleAggregateFunction(min, UInt32),\n    `max_price` SimpleAggregateFunction(max, UInt32),\n    `volume` AggregateFunction(count, UInt32),\n    `avg_price` AggregateFunction(avg, UInt32)\n)\nENGINE = AggregatingMergeTree\nPRIMARY KEY month\nORDER BY month\nSETTINGS index_granularity = 8192
-CREATE MATERIALIZED VIEW default.uk_prices_aggs_view TO default.uk_prices_aggs_dest\n(\n    `month` Date,\n    `min_price` SimpleAggregateFunction(min, UInt32),\n    `max_price` SimpleAggregateFunction(max, UInt32),\n    `volume` AggregateFunction(count, UInt32),\n    `avg_price` AggregateFunction(avg, UInt32)\n)\nAS WITH toStartOfMonth(date) AS month\nSELECT\n    month,\n    minSimpleState(price) AS min_price,\n    maxSimpleState(price) AS max_price,\n    countState(price) AS volume,\n    avgState(price) AS avg_price\nFROM default.uk_price_paid\nGROUP BY month
-CREATE DICTIONARY default.uk_mortgage_rates_dict\n(\n    `date` DateTime64,\n    `variable` Decimal32(2),\n    `fixed` Decimal32(2),\n    `bank` Decimal32(2)\n)\nPRIMARY KEY date\nSOURCE(CLICKHOUSE(TABLE \'uk_mortgage_rates\'))\nLIFETIME(MIN 0 MAX 2628000000)\nLAYOUT(COMPLEX_KEY_HASHED())
-CREATE TABLE `default`.`uk_price_paid`\n(\n    `price` UInt32,\n    `date` Date,\n    `postcode1` LowCardinality(String),\n    `postcode2` LowCardinality(String),\n    `type` Enum8(\'other\' = 0, \'terraced\' = 1, \'semi-detached\' = 2, \'detached\' = 3, \'flat\' = 4),\n    `is_new` UInt8,\n    `duration` Enum8(\'unknown\' = 0, \'freehold\' = 1, \'leasehold\' = 2),\n    `addr1` String,\n    `addr2` String,\n    `street` LowCardinality(String),\n    `locality` LowCardinality(String),\n    `town` LowCardinality(String),\n    `district` LowCardinality(String),\n    `county` LowCardinality(String),\n    INDEX `county_index` `county` TYPE set(10) GRANULARITY 1,\n    PROJECTION `town_date_projection`\n    (\n        SELECT \n            `town`,\n            `date`,\n            `price`\n        ORDER BY \n            `town`,\n            `date`\n    ),\n    PROJECTION `handy_aggs_projection`\n    (\n        SELECT \n            avg(`price`),\n            max(`price`),\n            sum(`price`)\n        GROUP BY `town`\n    )\n)\nENGINE = MergeTree\nORDER BY (`postcode1`, `postcode2`, `date`)\nSETTINGS index_granularity = 8192
-CREATE MATERIALIZED VIEW `default`.`prices_by_year_view` TO default.prices_by_year_dest\n(\n    `price` UInt32,\n    `date` Date,\n    `addr1` String,\n    `addr2` String,\n    `street` LowCardinality(String),\n    `town` LowCardinality(String),\n    `district` LowCardinality(String),\n    `county` LowCardinality(String)\n)\nAS SELECT\n    `price`,\n    `date`,\n    `addr1`,\n    `addr2`,\n    `street`,\n    `town`,\n    `district`,\n    `county`\nFROM `default`.`uk_price_paid`
-CREATE TABLE `default`.`uk_prices_aggs_dest`\n(\n    `month` Date,\n    `min_price` SimpleAggregateFunction(`min`, UInt32),\n    `max_price` SimpleAggregateFunction(`max`, UInt32),\n    `volume` AggregateFunction(`count`, UInt32),\n    `avg_price` AggregateFunction(`avg`, UInt32)\n)\nENGINE = AggregatingMergeTree\nPRIMARY KEY `month`\nORDER BY `month`\nSETTINGS index_granularity = 8192
-CREATE MATERIALIZED VIEW `default`.`uk_prices_aggs_view` TO default.uk_prices_aggs_dest\n(\n    `month` Date,\n    `min_price` SimpleAggregateFunction(`min`, UInt32),\n    `max_price` SimpleAggregateFunction(`max`, UInt32),\n    `volume` AggregateFunction(`count`, UInt32),\n    `avg_price` AggregateFunction(`avg`, UInt32)\n)\nAS WITH toStartOfMonth(`date`) AS `month`\nSELECT\n    `month`,\n    minSimpleState(`price`) AS `min_price`,\n    maxSimpleState(`price`) AS `max_price`,\n    countState(`price`) AS `volume`,\n    avgState(`price`) AS `avg_price`\nFROM `default`.`uk_price_paid`\nGROUP BY `month`
-CREATE DICTIONARY `default`.`uk_mortgage_rates_dict`\n(\n    `date` DateTime64,\n    `variable` Decimal32(2),\n    `fixed` Decimal32(2),\n    `bank` Decimal32(2)\n)\nPRIMARY KEY `date`\nSOURCE(CLICKHOUSE(TABLE \'uk_mortgage_rates\'))\nLIFETIME(MIN 0 MAX 2628000000)\nLAYOUT(COMPLEX_KEY_HASHED())
-CREATE TABLE default.uk_price_paid\n(\n    `price` UInt32,\n    `date` Date,\n    `postcode1` LowCardinality(String),\n    `postcode2` LowCardinality(String),\n    `type` Enum8(\'other\' = 0, \'terraced\' = 1, \'semi-detached\' = 2, \'detached\' = 3, \'flat\' = 4),\n    `is_new` UInt8,\n    `duration` Enum8(\'unknown\' = 0, \'freehold\' = 1, \'leasehold\' = 2),\n    `addr1` String,\n    `addr2` String,\n    `street` LowCardinality(String),\n    `locality` LowCardinality(String),\n    `town` LowCardinality(String),\n    `district` LowCardinality(String),\n    `county` LowCardinality(String),\n    INDEX county_index county TYPE set(10) GRANULARITY 1,\n    PROJECTION town_date_projection\n    (\n        SELECT \n            town,\n            date,\n            price\n        ORDER BY \n            town,\n            date\n    ),\n    PROJECTION handy_aggs_projection\n    (\n        SELECT \n            avg(price),\n            max(price),\n            sum(price)\n        GROUP BY town\n    )\n)\nENGINE = MergeTree\nORDER BY (postcode1, postcode2, date)\nSETTINGS index_granularity = 8192
-CREATE MATERIALIZED VIEW default.prices_by_year_view TO default.prices_by_year_dest\n(\n    `price` UInt32,\n    `date` Date,\n    `addr1` String,\n    `addr2` String,\n    `street` LowCardinality(String),\n    `town` LowCardinality(String),\n    `district` LowCardinality(String),\n    `county` LowCardinality(String)\n)\nAS SELECT\n    price,\n    date,\n    addr1,\n    addr2,\n    street,\n    town,\n    district,\n    county\nFROM default.uk_price_paid
-CREATE TABLE default.uk_prices_aggs_dest\n(\n    `month` Date,\n    `min_price` SimpleAggregateFunction(min, UInt32),\n    `max_price` SimpleAggregateFunction(max, UInt32),\n    `volume` AggregateFunction(count, UInt32),\n    `avg_price` AggregateFunction(avg, UInt32)\n)\nENGINE = AggregatingMergeTree\nPRIMARY KEY month\nORDER BY month\nSETTINGS index_granularity = 8192
-CREATE MATERIALIZED VIEW default.uk_prices_aggs_view TO default.uk_prices_aggs_dest\n(\n    `month` Date,\n    `min_price` SimpleAggregateFunction(min, UInt32),\n    `max_price` SimpleAggregateFunction(max, UInt32),\n    `volume` AggregateFunction(count, UInt32),\n    `avg_price` AggregateFunction(avg, UInt32)\n)\nAS WITH toStartOfMonth(date) AS month\nSELECT\n    month,\n    minSimpleState(price) AS min_price,\n    maxSimpleState(price) AS max_price,\n    countState(price) AS volume,\n    avgState(price) AS avg_price\nFROM default.uk_price_paid\nGROUP BY month
-CREATE DICTIONARY default.uk_mortgage_rates_dict\n(\n    `date` DateTime64,\n    `variable` Decimal32(2),\n    `fixed` Decimal32(2),\n    `bank` Decimal32(2)\n)\nPRIMARY KEY date\nSOURCE(CLICKHOUSE(TABLE \'uk_mortgage_rates\'))\nLIFETIME(MIN 0 MAX 2628000000)\nLAYOUT(COMPLEX_KEY_HASHED())
-CREATE TABLE "default"."uk_price_paid"\n(\n    "price" UInt32,\n    "date" Date,\n    "postcode1" LowCardinality(String),\n    "postcode2" LowCardinality(String),\n    "type" Enum8(\'other\' = 0, \'terraced\' = 1, \'semi-detached\' = 2, \'detached\' = 3, \'flat\' = 4),\n    "is_new" UInt8,\n    "duration" Enum8(\'unknown\' = 0, \'freehold\' = 1, \'leasehold\' = 2),\n    "addr1" String,\n    "addr2" String,\n    "street" LowCardinality(String),\n    "locality" LowCardinality(String),\n    "town" LowCardinality(String),\n    "district" LowCardinality(String),\n    "county" LowCardinality(String),\n    INDEX "county_index" "county" TYPE set(10) GRANULARITY 1,\n    PROJECTION "town_date_projection"\n    (\n        SELECT \n            "town",\n            "date",\n            "price"\n        ORDER BY \n            "town",\n            "date"\n    ),\n    PROJECTION "handy_aggs_projection"\n    (\n        SELECT \n            avg("price"),\n            max("price"),\n            sum("price")\n        GROUP BY "town"\n    )\n)\nENGINE = MergeTree\nORDER BY ("postcode1", "postcode2", "date")\nSETTINGS index_granularity = 8192
-CREATE MATERIALIZED VIEW "default"."prices_by_year_view" TO default.prices_by_year_dest\n(\n    "price" UInt32,\n    "date" Date,\n    "addr1" String,\n    "addr2" String,\n    "street" LowCardinality(String),\n    "town" LowCardinality(String),\n    "district" LowCardinality(String),\n    "county" LowCardinality(String)\n)\nAS SELECT\n    "price",\n    "date",\n    "addr1",\n    "addr2",\n    "street",\n    "town",\n    "district",\n    "county"\nFROM "default"."uk_price_paid"
-CREATE TABLE "default"."uk_prices_aggs_dest"\n(\n    "month" Date,\n    "min_price" SimpleAggregateFunction("min", UInt32),\n    "max_price" SimpleAggregateFunction("max", UInt32),\n    "volume" AggregateFunction("count", UInt32),\n    "avg_price" AggregateFunction("avg", UInt32)\n)\nENGINE = AggregatingMergeTree\nPRIMARY KEY "month"\nORDER BY "month"\nSETTINGS index_granularity = 8192
-CREATE MATERIALIZED VIEW "default"."uk_prices_aggs_view" TO default.uk_prices_aggs_dest\n(\n    "month" Date,\n    "min_price" SimpleAggregateFunction("min", UInt32),\n    "max_price" SimpleAggregateFunction("max", UInt32),\n    "volume" AggregateFunction("count", UInt32),\n    "avg_price" AggregateFunction("avg", UInt32)\n)\nAS WITH toStartOfMonth("date") AS "month"\nSELECT\n    "month",\n    minSimpleState("price") AS "min_price",\n    maxSimpleState("price") AS "max_price",\n    countState("price") AS "volume",\n    avgState("price") AS "avg_price"\nFROM "default"."uk_price_paid"\nGROUP BY "month"
-CREATE DICTIONARY "default"."uk_mortgage_rates_dict"\n(\n    "date" DateTime64,\n    "variable" Decimal32(2),\n    "fixed" Decimal32(2),\n    "bank" Decimal32(2)\n)\nPRIMARY KEY "date"\nSOURCE(CLICKHOUSE(TABLE \'uk_mortgage_rates\'))\nLIFETIME(MIN 0 MAX 2628000000)\nLAYOUT(COMPLEX_KEY_HASHED())
-CREATE TABLE default.uk_price_paid\n(\n    "price" UInt32,\n    "date" Date,\n    "postcode1" LowCardinality(String),\n    "postcode2" LowCardinality(String),\n    "type" Enum8(\'other\' = 0, \'terraced\' = 1, \'semi-detached\' = 2, \'detached\' = 3, \'flat\' = 4),\n    "is_new" UInt8,\n    "duration" Enum8(\'unknown\' = 0, \'freehold\' = 1, \'leasehold\' = 2),\n    "addr1" String,\n    "addr2" String,\n    "street" LowCardinality(String),\n    "locality" LowCardinality(String),\n    "town" LowCardinality(String),\n    "district" LowCardinality(String),\n    "county" LowCardinality(String),\n    INDEX county_index county TYPE set(10) GRANULARITY 1,\n    PROJECTION town_date_projection\n    (\n        SELECT \n            town,\n            date,\n            price\n        ORDER BY \n            town,\n            date\n    ),\n    PROJECTION handy_aggs_projection\n    (\n        SELECT \n            avg(price),\n            max(price),\n            sum(price)\n        GROUP BY town\n    )\n)\nENGINE = MergeTree\nORDER BY (postcode1, postcode2, date)\nSETTINGS index_granularity = 8192
-CREATE MATERIALIZED VIEW default.prices_by_year_view TO default.prices_by_year_dest\n(\n    "price" UInt32,\n    "date" Date,\n    "addr1" String,\n    "addr2" String,\n    "street" LowCardinality(String),\n    "town" LowCardinality(String),\n    "district" LowCardinality(String),\n    "county" LowCardinality(String)\n)\nAS SELECT\n    price,\n    date,\n    addr1,\n    addr2,\n    street,\n    town,\n    district,\n    county\nFROM default.uk_price_paid
-CREATE TABLE default.uk_prices_aggs_dest\n(\n    "month" Date,\n    "min_price" SimpleAggregateFunction(min, UInt32),\n    "max_price" SimpleAggregateFunction(max, UInt32),\n    "volume" AggregateFunction(count, UInt32),\n    "avg_price" AggregateFunction(avg, UInt32)\n)\nENGINE = AggregatingMergeTree\nPRIMARY KEY month\nORDER BY month\nSETTINGS index_granularity = 8192
-CREATE MATERIALIZED VIEW default.uk_prices_aggs_view TO default.uk_prices_aggs_dest\n(\n    "month" Date,\n    "min_price" SimpleAggregateFunction(min, UInt32),\n    "max_price" SimpleAggregateFunction(max, UInt32),\n    "volume" AggregateFunction(count, UInt32),\n    "avg_price" AggregateFunction(avg, UInt32)\n)\nAS WITH toStartOfMonth(date) AS month\nSELECT\n    month,\n    minSimpleState(price) AS min_price,\n    maxSimpleState(price) AS max_price,\n    countState(price) AS volume,\n    avgState(price) AS avg_price\nFROM default.uk_price_paid\nGROUP BY month
-CREATE DICTIONARY default.uk_mortgage_rates_dict\n(\n    "date" DateTime64,\n    "variable" Decimal32(2),\n    "fixed" Decimal32(2),\n    "bank" Decimal32(2)\n)\nPRIMARY KEY date\nSOURCE(CLICKHOUSE(TABLE \'uk_mortgage_rates\'))\nLIFETIME(MIN 0 MAX 2628000000)\nLAYOUT(COMPLEX_KEY_HASHED())
-CREATE TABLE `default`.`uk_price_paid`\n(\n    `price` UInt32,\n    `date` Date,\n    `postcode1` LowCardinality(String),\n    `postcode2` LowCardinality(String),\n    `type` Enum8(\'other\' = 0, \'terraced\' = 1, \'semi-detached\' = 2, \'detached\' = 3, \'flat\' = 4),\n    `is_new` UInt8,\n    `duration` Enum8(\'unknown\' = 0, \'freehold\' = 1, \'leasehold\' = 2),\n    `addr1` String,\n    `addr2` String,\n    `street` LowCardinality(String),\n    `locality` LowCardinality(String),\n    `town` LowCardinality(String),\n    `district` LowCardinality(String),\n    `county` LowCardinality(String),\n    INDEX `county_index` `county` TYPE set(10) GRANULARITY 1,\n    PROJECTION `town_date_projection`\n    (\n        SELECT \n            `town`,\n            `date`,\n            `price`\n        ORDER BY \n            `town`,\n            `date`\n    ),\n    PROJECTION `handy_aggs_projection`\n    (\n        SELECT \n            avg(`price`),\n            max(`price`),\n            sum(`price`)\n        GROUP BY `town`\n    )\n)\nENGINE = MergeTree\nORDER BY (`postcode1`, `postcode2`, `date`)\nSETTINGS index_granularity = 8192
-CREATE MATERIALIZED VIEW `default`.`prices_by_year_view` TO default.prices_by_year_dest\n(\n    `price` UInt32,\n    `date` Date,\n    `addr1` String,\n    `addr2` String,\n    `street` LowCardinality(String),\n    `town` LowCardinality(String),\n    `district` LowCardinality(String),\n    `county` LowCardinality(String)\n)\nAS SELECT\n    `price`,\n    `date`,\n    `addr1`,\n    `addr2`,\n    `street`,\n    `town`,\n    `district`,\n    `county`\nFROM `default`.`uk_price_paid`
-CREATE TABLE `default`.`uk_prices_aggs_dest`\n(\n    `month` Date,\n    `min_price` SimpleAggregateFunction(`min`, UInt32),\n    `max_price` SimpleAggregateFunction(`max`, UInt32),\n    `volume` AggregateFunction(`count`, UInt32),\n    `avg_price` AggregateFunction(`avg`, UInt32)\n)\nENGINE = AggregatingMergeTree\nPRIMARY KEY `month`\nORDER BY `month`\nSETTINGS index_granularity = 8192
-CREATE MATERIALIZED VIEW `default`.`uk_prices_aggs_view` TO default.uk_prices_aggs_dest\n(\n    `month` Date,\n    `min_price` SimpleAggregateFunction(`min`, UInt32),\n    `max_price` SimpleAggregateFunction(`max`, UInt32),\n    `volume` AggregateFunction(`count`, UInt32),\n    `avg_price` AggregateFunction(`avg`, UInt32)\n)\nAS WITH toStartOfMonth(`date`) AS `month`\nSELECT\n    `month`,\n    minSimpleState(`price`) AS `min_price`,\n    maxSimpleState(`price`) AS `max_price`,\n    countState(`price`) AS `volume`,\n    avgState(`price`) AS `avg_price`\nFROM `default`.`uk_price_paid`\nGROUP BY `month`
-CREATE DICTIONARY `default`.`uk_mortgage_rates_dict`\n(\n    `date` DateTime64,\n    `variable` Decimal32(2),\n    `fixed` Decimal32(2),\n    `bank` Decimal32(2)\n)\nPRIMARY KEY `date`\nSOURCE(CLICKHOUSE(TABLE \'uk_mortgage_rates\'))\nLIFETIME(MIN 0 MAX 2628000000)\nLAYOUT(COMPLEX_KEY_HASHED())
-CREATE TABLE default.uk_price_paid\n(\n    `price` UInt32,\n    `date` Date,\n    `postcode1` LowCardinality(String),\n    `postcode2` LowCardinality(String),\n    `type` Enum8(\'other\' = 0, \'terraced\' = 1, \'semi-detached\' = 2, \'detached\' = 3, \'flat\' = 4),\n    `is_new` UInt8,\n    `duration` Enum8(\'unknown\' = 0, \'freehold\' = 1, \'leasehold\' = 2),\n    `addr1` String,\n    `addr2` String,\n    `street` LowCardinality(String),\n    `locality` LowCardinality(String),\n    `town` LowCardinality(String),\n    `district` LowCardinality(String),\n    `county` LowCardinality(String),\n    INDEX county_index county TYPE set(10) GRANULARITY 1,\n    PROJECTION town_date_projection\n    (\n        SELECT \n            town,\n            date,\n            price\n        ORDER BY \n            town,\n            date\n    ),\n    PROJECTION handy_aggs_projection\n    (\n        SELECT \n            avg(price),\n            max(price),\n            sum(price)\n        GROUP BY town\n    )\n)\nENGINE = MergeTree\nORDER BY (postcode1, postcode2, date)\nSETTINGS index_granularity = 8192
-CREATE MATERIALIZED VIEW default.prices_by_year_view TO default.prices_by_year_dest\n(\n    `price` UInt32,\n    `date` Date,\n    `addr1` String,\n    `addr2` String,\n    `street` LowCardinality(String),\n    `town` LowCardinality(String),\n    `district` LowCardinality(String),\n    `county` LowCardinality(String)\n)\nAS SELECT\n    price,\n    date,\n    addr1,\n    addr2,\n    street,\n    town,\n    district,\n    county\nFROM default.uk_price_paid
-CREATE TABLE default.uk_prices_aggs_dest\n(\n    `month` Date,\n    `min_price` SimpleAggregateFunction(min, UInt32),\n    `max_price` SimpleAggregateFunction(max, UInt32),\n    `volume` AggregateFunction(count, UInt32),\n    `avg_price` AggregateFunction(avg, UInt32)\n)\nENGINE = AggregatingMergeTree\nPRIMARY KEY month\nORDER BY month\nSETTINGS index_granularity = 8192
-CREATE MATERIALIZED VIEW default.uk_prices_aggs_view TO default.uk_prices_aggs_dest\n(\n    `month` Date,\n    `min_price` SimpleAggregateFunction(min, UInt32),\n    `max_price` SimpleAggregateFunction(max, UInt32),\n    `volume` AggregateFunction(count, UInt32),\n    `avg_price` AggregateFunction(avg, UInt32)\n)\nAS WITH toStartOfMonth(date) AS month\nSELECT\n    month,\n    minSimpleState(price) AS min_price,\n    maxSimpleState(price) AS max_price,\n    countState(price) AS volume,\n    avgState(price) AS avg_price\nFROM default.uk_price_paid\nGROUP BY month
-CREATE DICTIONARY default.uk_mortgage_rates_dict\n(\n    `date` DateTime64,\n    `variable` Decimal32(2),\n    `fixed` Decimal32(2),\n    `bank` Decimal32(2)\n)\nPRIMARY KEY date\nSOURCE(CLICKHOUSE(TABLE \'uk_mortgage_rates\'))\nLIFETIME(MIN 0 MAX 2628000000)\nLAYOUT(COMPLEX_KEY_HASHED())
diff --git a/tests/queries/0_stateless/03230_output_format_identifier_quoting_style.sql b/tests/queries/0_stateless/03230_output_format_identifier_quoting_style.sql
deleted file mode 100644
index c500dd4e4c6..00000000000
--- a/tests/queries/0_stateless/03230_output_format_identifier_quoting_style.sql
+++ /dev/null
@@ -1,328 +0,0 @@
-DROP DICTIONARY IF EXISTS uk_mortgage_rates_dict;
-DROP TABLE IF EXISTS uk_mortgage_rates;
-DROP VIEW IF EXISTS uk_prices_aggs_view;
-DROP TABLE IF EXISTS uk_prices_aggs_dest;
-DROP VIEW IF EXISTS prices_by_year_view;
-DROP TABLE IF EXISTS prices_by_year_dest;
-DROP TABLE IF EXISTS uk_price_paid;
-
--- Create tables, views, dictionaries
-
-CREATE TABLE uk_price_paid
-(
-    price UInt32,
-    date Date,
-    postcode1 LowCardinality(String),
-    postcode2 LowCardinality(String),
-    type Enum('terraced' = 1, 'semi-detached' = 2, 'detached' = 3, 'flat' = 4, 'other' = 0),
-    is_new UInt8,
-    duration Enum('freehold' = 1, 'leasehold' = 2, 'unknown' = 0),
-    addr1 String,
-    addr2 String,
-    street LowCardinality(String),
-    locality LowCardinality(String),
-    town LowCardinality(String),
-    district LowCardinality(String),
-    county LowCardinality(String),
-    INDEX county_index county TYPE set(10) GRANULARITY 1,
-    PROJECTION town_date_projection
-    (
-        SELECT 
-            town,
-            date,
-            price
-        ORDER BY 
-            town,
-            date
-    ),
-    PROJECTION handy_aggs_projection
-    (
-        SELECT 
-            avg(price),
-            max(price),
-            sum(price)
-        GROUP BY town
-    )
-)
-ENGINE = MergeTree
-ORDER BY (postcode1, postcode2, date);
-
-CREATE TABLE prices_by_year_dest (
-    price UInt32,
-    date Date,
-    addr1 String,
-    addr2 String,
-    street LowCardinality(String),
-    town LowCardinality(String),
-    district LowCardinality(String),
-    county LowCardinality(String)
-)
-ENGINE = MergeTree
-PRIMARY KEY (town, date)
-PARTITION BY toYear(date);
-
-CREATE MATERIALIZED VIEW prices_by_year_view
-TO prices_by_year_dest
-AS
-    SELECT
-        price,
-        date,
-        addr1,
-        addr2,
-        street,
-        town,
-        district,
-        county
-    FROM uk_price_paid;
-
-CREATE TABLE uk_prices_aggs_dest (
-    month Date,
-    min_price SimpleAggregateFunction(min, UInt32),
-    max_price SimpleAggregateFunction(max, UInt32),
-    volume AggregateFunction(count, UInt32),
-    avg_price AggregateFunction(avg, UInt32)
-)
-ENGINE = AggregatingMergeTree
-PRIMARY KEY month;
-
-CREATE MATERIALIZED VIEW uk_prices_aggs_view
-TO uk_prices_aggs_dest
-AS
-    WITH
-        toStartOfMonth(date) AS month
-    SELECT
-        month,
-        minSimpleState(price) AS min_price,
-        maxSimpleState(price) AS max_price,
-        countState(price) AS volume,
-        avgState(price) AS avg_price
-    FROM uk_price_paid
-    GROUP BY month;
-
-CREATE TABLE uk_mortgage_rates (
-    date DateTime64,
-    variable Decimal32(2),
-    fixed Decimal32(2),
-    bank Decimal32(2)
-)
-ENGINE Memory();
-
-INSERT INTO uk_mortgage_rates VALUES ('2004-02-29', 5.02, 4.9, 4);
-INSERT INTO uk_mortgage_rates VALUES ('2004-03-31', 5.11, 4.91, 4);
-
-CREATE DICTIONARY uk_mortgage_rates_dict (
-    date DateTime64,
-    variable Decimal32(2),
-    fixed Decimal32(2),
-    bank Decimal32(2)
-)
-PRIMARY KEY date
-SOURCE(
-  CLICKHOUSE(TABLE 'uk_mortgage_rates')
-)
-LAYOUT(COMPLEX_KEY_HASHED())
-LIFETIME(2628000000);
-
-
--- Show tables, views, dictionaries with default settings
-SHOW CREATE TABLE uk_price_paid;
-
-SHOW CREATE VIEW prices_by_year_view;
-
-SHOW CREATE uk_prices_aggs_dest;
-
-SHOW CREATE VIEW uk_prices_aggs_view;
-
-SHOW CREATE DICTIONARY uk_mortgage_rates_dict;
-
-
--- Show tables, views, dictionaries with output_format_always_quote_identifiers=false, output_format_identifier_quoting_style='None' 
-SHOW CREATE TABLE uk_price_paid
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='None';
-
-SHOW CREATE VIEW prices_by_year_view
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='None';
-
-SHOW CREATE uk_prices_aggs_dest
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='None';
-
-SHOW CREATE VIEW uk_prices_aggs_view
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='None';
-
-SHOW CREATE DICTIONARY uk_mortgage_rates_dict
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='None';
-
--- Show tables, views, dictionaries with output_format_always_quote_identifiers=true, output_format_identifier_quoting_style='Backticks' 
-SHOW CREATE TABLE uk_price_paid
-SETTINGS
-    output_format_always_quote_identifiers=true,
-    output_format_identifier_quoting_style='Backticks';
-
-SHOW CREATE VIEW prices_by_year_view
-SETTINGS
-    output_format_always_quote_identifiers=true,
-    output_format_identifier_quoting_style='Backticks';
-
-SHOW CREATE uk_prices_aggs_dest
-SETTINGS
-    output_format_always_quote_identifiers=true,
-    output_format_identifier_quoting_style='Backticks';
-
-SHOW CREATE VIEW uk_prices_aggs_view
-SETTINGS
-    output_format_always_quote_identifiers=true,
-    output_format_identifier_quoting_style='Backticks';
-
-SHOW CREATE DICTIONARY uk_mortgage_rates_dict
-SETTINGS
-    output_format_always_quote_identifiers=true,
-    output_format_identifier_quoting_style='Backticks';
-
--- Show tables, views, dictionaries with output_format_always_quote_identifiers=false, output_format_identifier_quoting_style='Backticks' 
-SHOW CREATE TABLE uk_price_paid
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='Backticks';
-
-SHOW CREATE VIEW prices_by_year_view
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='Backticks';
-
-SHOW CREATE uk_prices_aggs_dest
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='Backticks';
-
-SHOW CREATE VIEW uk_prices_aggs_view
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='Backticks';
-
-SHOW CREATE DICTIONARY uk_mortgage_rates_dict
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='Backticks';
-
--- Show tables, views, dictionaries with output_format_always_quote_identifiers=true, output_format_identifier_quoting_style='DoubleQuotes' 
-SHOW CREATE TABLE uk_price_paid
-SETTINGS
-    output_format_always_quote_identifiers=true,
-    output_format_identifier_quoting_style='DoubleQuotes';
-
-SHOW CREATE VIEW prices_by_year_view
-SETTINGS
-    output_format_always_quote_identifiers=true,
-    output_format_identifier_quoting_style='DoubleQuotes';
-
-SHOW CREATE uk_prices_aggs_dest
-SETTINGS
-    output_format_always_quote_identifiers=true,
-    output_format_identifier_quoting_style='DoubleQuotes';
-
-SHOW CREATE VIEW uk_prices_aggs_view
-SETTINGS
-    output_format_always_quote_identifiers=true,
-    output_format_identifier_quoting_style='DoubleQuotes';
-
-SHOW CREATE DICTIONARY uk_mortgage_rates_dict
-SETTINGS
-    output_format_always_quote_identifiers=true,
-    output_format_identifier_quoting_style='DoubleQuotes';
-
--- Show tables, views, dictionaries with output_format_always_quote_identifiers=false, output_format_identifier_quoting_style='DoubleQuotes' 
-SHOW CREATE TABLE uk_price_paid
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='DoubleQuotes';
-
-SHOW CREATE VIEW prices_by_year_view
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='DoubleQuotes';
-
-SHOW CREATE uk_prices_aggs_dest
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='DoubleQuotes';
-
-SHOW CREATE VIEW uk_prices_aggs_view
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='DoubleQuotes';
-
-SHOW CREATE DICTIONARY uk_mortgage_rates_dict
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='DoubleQuotes';
-
-
--- Show tables, views, dictionaries with output_format_always_quote_identifiers=true, output_format_identifier_quoting_style='BackticksMySQL' 
-SHOW CREATE TABLE uk_price_paid
-SETTINGS
-    output_format_always_quote_identifiers=true,
-    output_format_identifier_quoting_style='BackticksMySQL';
-
-SHOW CREATE VIEW prices_by_year_view
-SETTINGS
-    output_format_always_quote_identifiers=true,
-    output_format_identifier_quoting_style='BackticksMySQL';
-
-SHOW CREATE uk_prices_aggs_dest
-SETTINGS
-    output_format_always_quote_identifiers=true,
-    output_format_identifier_quoting_style='BackticksMySQL';
-
-SHOW CREATE VIEW uk_prices_aggs_view
-SETTINGS
-    output_format_always_quote_identifiers=true,
-    output_format_identifier_quoting_style='BackticksMySQL';
-
-SHOW CREATE DICTIONARY uk_mortgage_rates_dict
-SETTINGS
-    output_format_always_quote_identifiers=true,
-    output_format_identifier_quoting_style='BackticksMySQL';
-
--- Show tables, views, dictionaries with output_format_always_quote_identifiers=false, output_format_identifier_quoting_style='BackticksMySQL' 
-SHOW CREATE TABLE uk_price_paid
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='BackticksMySQL';
-
-SHOW CREATE VIEW prices_by_year_view
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='BackticksMySQL';
-
-SHOW CREATE uk_prices_aggs_dest
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='BackticksMySQL';
-
-SHOW CREATE VIEW uk_prices_aggs_view
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='BackticksMySQL';
-
-SHOW CREATE DICTIONARY uk_mortgage_rates_dict
-SETTINGS
-    output_format_always_quote_identifiers=false,
-    output_format_identifier_quoting_style='BackticksMySQL';
-
-DROP DICTIONARY uk_mortgage_rates_dict;
-DROP TABLE uk_mortgage_rates;
-DROP VIEW uk_prices_aggs_view;
-DROP TABLE uk_prices_aggs_dest;
-DROP VIEW prices_by_year_view;
-DROP TABLE prices_by_year_dest;
-DROP TABLE uk_price_paid;
diff --git a/tests/queries/0_stateless/03230_subcolumns_mv.reference b/tests/queries/0_stateless/03230_subcolumns_mv.reference
deleted file mode 100644
index 03528148b49..00000000000
--- a/tests/queries/0_stateless/03230_subcolumns_mv.reference
+++ /dev/null
@@ -1 +0,0 @@
-['key1','key2']	['value1','value2']
diff --git a/tests/queries/0_stateless/03230_subcolumns_mv.sql b/tests/queries/0_stateless/03230_subcolumns_mv.sql
deleted file mode 100644
index e2e577f54c1..00000000000
--- a/tests/queries/0_stateless/03230_subcolumns_mv.sql
+++ /dev/null
@@ -1,37 +0,0 @@
-DROP TABLE IF EXISTS rawtable;
-DROP TABLE IF EXISTS raw_to_attributes_mv;
-DROP TABLE IF EXISTS attributes;
-
-SET optimize_functions_to_subcolumns = 1;
-
-CREATE TABLE rawtable
-(
-  `Attributes` Map(String, String),
-)
-ENGINE = MergeTree
-ORDER BY tuple();
-
-CREATE MATERIALIZED VIEW raw_to_attributes_mv TO attributes
-(
-  `AttributeKeys` Array(String),
-  `AttributeValues` Array(String)
-)
-AS SELECT
-  mapKeys(Attributes) AS AttributeKeys,
-  mapValues(Attributes) AS AttributeValues
-FROM rawtable;
-
-CREATE TABLE attributes
-(
-  `AttributeKeys` Array(String),
-  `AttributeValues` Array(String)
-)
-ENGINE = ReplacingMergeTree
-ORDER BY tuple();
-
-INSERT INTO rawtable VALUES ({'key1': 'value1', 'key2': 'value2'});
-SELECT * FROM raw_to_attributes_mv ORDER BY AttributeKeys;
-
-DROP TABLE IF EXISTS rawtable;
-DROP TABLE IF EXISTS raw_to_attributes_mv;
-DROP TABLE IF EXISTS attributes;
diff --git a/tests/queries/0_stateless/03230_system_projections.reference b/tests/queries/0_stateless/03230_system_projections.reference
deleted file mode 100644
index 22ca272955c..00000000000
--- a/tests/queries/0_stateless/03230_system_projections.reference
+++ /dev/null
@@ -1,6 +0,0 @@
-default	projections	improved_sorting_key	Normal	['d1','key']	SELECT * ORDER BY d1, key
-default	projections_2	agg	Aggregate	['name']	SELECT name, max(frequency) AS max_frequency GROUP BY name
-default	projections_2	agg_no_key	Aggregate	[]	SELECT max(frequency) AS max_frequency
-1
-2
-improved_sorting_key
diff --git a/tests/queries/0_stateless/03230_system_projections.sql b/tests/queries/0_stateless/03230_system_projections.sql
deleted file mode 100644
index 37c1e5df8ef..00000000000
--- a/tests/queries/0_stateless/03230_system_projections.sql
+++ /dev/null
@@ -1,39 +0,0 @@
-DROP TABLE IF EXISTS projections;
-DROP TABLE IF EXISTS projections_2;
-
-CREATE TABLE projections
-(
-    key String,
-    d1 Int,
-    PROJECTION improved_sorting_key (
-        SELECT *
-        ORDER BY d1, key
-    )
-)
-Engine=MergeTree()
-ORDER BY key;
-
-CREATE TABLE projections_2
-(
-    name String,
-    frequency UInt64,
-    PROJECTION agg (
-        SELECT name, max(frequency) max_frequency
-        GROUP BY name
-    ),
-    PROJECTION agg_no_key (
-        SELECT max(frequency) max_frequency
-    )
-)
-Engine=MergeTree()
-ORDER BY name;
-
-SELECT * FROM system.projections WHERE database = currentDatabase();
-
-SELECT count(*) FROM system.projections WHERE table = 'projections' AND database = currentDatabase();
-SELECT count(*) FROM system.projections WHERE table = 'projections_2' AND database = currentDatabase();
-
-SELECT name FROM system.projections WHERE type = 'Normal' AND database = currentDatabase();
-
-DROP TABLE projections;
-DROP TABLE projections_2;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03231_alter_no_properties_before_remove_modify_reset.reference b/tests/queries/0_stateless/03231_alter_no_properties_before_remove_modify_reset.reference
deleted file mode 100644
index 60c67ceac92..00000000000
--- a/tests/queries/0_stateless/03231_alter_no_properties_before_remove_modify_reset.reference
+++ /dev/null
@@ -1,13 +0,0 @@
-REMOVE
-The same, but with type
-MODIFY SETTING
-The same, but with type
-RESET SETTING
-The same, but with type
-All the above, but on server side
-REMOVE
-The same, but with type
-MODIFY SETTING
-The same, but with type
-RESET SETTING
-The same, but with type
diff --git a/tests/queries/0_stateless/03231_alter_no_properties_before_remove_modify_reset.sql b/tests/queries/0_stateless/03231_alter_no_properties_before_remove_modify_reset.sql
deleted file mode 100644
index 692526caeba..00000000000
--- a/tests/queries/0_stateless/03231_alter_no_properties_before_remove_modify_reset.sql
+++ /dev/null
@@ -1,151 +0,0 @@
-DROP TABLE IF EXISTS a SYNC;
-CREATE TABLE a (x Int64, y Int64 MATERIALIZED 1 SETTINGS (max_compress_block_size = 30000)) ENGINE = MergeTree ORDER BY x;
-
--- In cases when the type is not present in column declaration, the parser interprets TTL/COLLATE/SETTINGS as a data type,
--- thus such queries doesn't throw syntax error on client side, just fails to parse. For server side validation these
--- queries still result in an exception of syntax error. Even though the exception is throw for a different reason, they
--- are good safe guards for the future where the parsing of such properties might change.
-SELECT 'REMOVE';
-ALTER TABLE a MODIFY COLUMN y Int64 REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y DEFAULT 2 REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y MATERIALIZED 3 REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y EPHEMERAL 4 REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y COMMENT '5' REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y CODEC(ZSTD) REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y STATISTICS(tdigest) REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y PRIMARY KEY REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-
-SELECT 'The same, but with type';
-ALTER TABLE a MODIFY COLUMN y Int64 DEFAULT 2 REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 MATERIALIZED 3 REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 EPHEMERAL 4 REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 COMMENT '5' REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 CODEC(ZSTD) REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 STATISTICS(tdigest) REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 TTL toDate('2025-01-01') + toIntervalDay(x) REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 COLLATE binary REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 SETTINGS (max_compress_block_size = 20000) REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 PRIMARY KEY REMOVE MATERIALIZED; -- { clientError SYNTAX_ERROR }
-
-SELECT 'MODIFY SETTING';
-ALTER TABLE a MODIFY COLUMN y Int64 MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y DEFAULT 2 MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y MATERIALIZED 3 MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y EPHEMERAL 4 MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y COMMENT '5' MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y CODEC(ZSTD) MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y STATISTICS(tdigest) MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y PRIMARY KEY MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-
-SELECT 'The same, but with type';
-ALTER TABLE a MODIFY COLUMN y Int64 DEFAULT 2 MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 MATERIALIZED 3 MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 EPHEMERAL 4 MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 COMMENT '5' MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 CODEC(ZSTD) MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 STATISTICS(tdigest) MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 TTL toDate('2025-01-01') + toIntervalDay(x) MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 COLLATE binary MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 SETTINGS (some_setting = 2) MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 PRIMARY KEY MODIFY SETTING max_compress_block_size = 20000; -- { clientError SYNTAX_ERROR }
-
-SELECT 'RESET SETTING';
-ALTER TABLE a MODIFY COLUMN y Int64 RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y DEFAULT 2 RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y MATERIALIZED 3 RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y EPHEMERAL 4 RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y COMMENT '5' RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y CODEC(ZSTD) RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y STATISTICS(tdigest) RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y PRIMARY KEY RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-
-SELECT 'The same, but with type';
-ALTER TABLE a MODIFY COLUMN y Int64 DEFAULT 2 RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 MATERIALIZED 3 RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 EPHEMERAL 4 RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 COMMENT '5' RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 CODEC(ZSTD) RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 STATISTICS(tdigest) RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 TTL toDate('2025-01-01') + toIntervalDay(x) RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 COLLATE binary RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 SETTINGS (some_setting = 2) RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-ALTER TABLE a MODIFY COLUMN y Int64 PRIMARY KEY RESET SETTING max_compress_block_size; -- { clientError SYNTAX_ERROR }
-
-
-
-SELECT 'All the above, but on server side';
-
-SELECT 'REMOVE';
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y DEFAULT 2 REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y MATERIALIZED 3 REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y EPHEMERAL 4 REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y COMMENT \'5\' REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y CODEC(ZSTD) REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y STATISTICS(tdigest) REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y TTL toDate(\'2025-01-01\') + toIntervalDay(x) REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y COLLATE binary REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y SETTINGS (max_compress_block_size = 20000) REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y PRIMARY KEY REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-
-SELECT 'The same, but with type';
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 DEFAULT 2 REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 MATERIALIZED 3 REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 EPHEMERAL 4 REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 COMMENT \'5\' REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 CODEC(ZSTD) REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 STATISTICS(tdigest) REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 TTL toDate(\'2025-01-01\') + toIntervalDay(x) REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 COLLATE binary REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 SETTINGS (max_compress_block_size = 20000) REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 PRIMARY KEY REMOVE MATERIALIZED'); -- { serverError SYNTAX_ERROR }
-
-SELECT 'MODIFY SETTING';
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y DEFAULT 2 MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y MATERIALIZED 3 MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y EPHEMERAL 4 MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y COMMENT \'5\' MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y CODEC(ZSTD) MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y STATISTICS(tdigest) MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y TTL toDate(\'2025-01-01\') + toIntervalDay(x) MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y COLLATE binary MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y SETTINGS (some_setting = 2) MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y PRIMARY KEY MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-
-SELECT 'The same, but with type';
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 DEFAULT 2 MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 MATERIALIZED 3 MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 EPHEMERAL 4 MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 COMMENT \'5\' MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 CODEC(ZSTD) MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 STATISTICS(tdigest) MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 TTL toDate(\'2025-01-01\') + toIntervalDay(x) MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 COLLATE binary MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 SETTINGS (some_setting = 2) MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 PRIMARY KEY MODIFY SETTING max_compress_block_size = 20000'); -- { serverError SYNTAX_ERROR }
-
-SELECT 'RESET SETTING';
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y DEFAULT 2 RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y MATERIALIZED 3 RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y EPHEMERAL 4 RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y COMMENT \'5\' RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y CODEC(ZSTD) RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y STATISTICS(tdigest) RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y TTL toDate(\'2025-01-01\') + toIntervalDay(x) RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y COLLATE binary RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y SETTINGS (some_setting = 2) RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y PRIMARY KEY RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-
-SELECT 'The same, but with type';
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 DEFAULT 2 RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 MATERIALIZED 3 RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 EPHEMERAL 4 RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 COMMENT \'5\' RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 CODEC(ZSTD) RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 STATISTICS(tdigest) RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 TTL toDate(\'2025-01-01\') + toIntervalDay(x) RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 COLLATE binary RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 SETTINGS (some_setting = 2) RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
-SELECT formatQuery('ALTER TABLE a MODIFY COLUMN y Int64 PRIMARY KEY RESET SETTING max_compress_block_size'); -- { serverError SYNTAX_ERROR }
diff --git a/tests/queries/0_stateless/03231_csv_dont_infer_bool_from_string.reference b/tests/queries/0_stateless/03231_csv_dont_infer_bool_from_string.reference
deleted file mode 100644
index d23e2d2cbf3..00000000000
--- a/tests/queries/0_stateless/03231_csv_dont_infer_bool_from_string.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-c1	Nullable(Int64)					
-c2	Nullable(Float64)					
-c3	Nullable(String)					
-42	42.42	True
diff --git a/tests/queries/0_stateless/03231_csv_dont_infer_bool_from_string.sql b/tests/queries/0_stateless/03231_csv_dont_infer_bool_from_string.sql
deleted file mode 100644
index e3cf77249eb..00000000000
--- a/tests/queries/0_stateless/03231_csv_dont_infer_bool_from_string.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-set input_format_csv_try_infer_numbers_from_strings = 1;
-desc format(CSV, '"42","42.42","True"');
-select * from format(CSV, '"42","42.42","True"');
-
diff --git a/tests/queries/0_stateless/03231_dynamic_not_safe_primary_key.reference b/tests/queries/0_stateless/03231_dynamic_not_safe_primary_key.reference
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/queries/0_stateless/03231_dynamic_not_safe_primary_key.sql b/tests/queries/0_stateless/03231_dynamic_not_safe_primary_key.sql
deleted file mode 100644
index f207581f482..00000000000
--- a/tests/queries/0_stateless/03231_dynamic_not_safe_primary_key.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-SET allow_experimental_dynamic_type = 1;
-DROP TABLE IF EXISTS t0;
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t0 (c0 Int) ENGINE = AggregatingMergeTree() ORDER BY (c0);
-CREATE TABLE t1 (c0 Array(Dynamic), c1 Int) ENGINE = MergeTree() ORDER BY (c0);
-INSERT INTO t1 (c0, c1) VALUES ([18446717433683171873], 13623876564923702671), ([-4], 6111684076076982207);
-SELECT 1 FROM t0 FINAL JOIN t1 ON TRUE;
-DROP TABLE t0;
-DROP TABLE t1;
-
diff --git a/tests/queries/0_stateless/03231_pr_reverse_in_order.reference b/tests/queries/0_stateless/03231_pr_reverse_in_order.reference
deleted file mode 100644
index a1601578f34..00000000000
--- a/tests/queries/0_stateless/03231_pr_reverse_in_order.reference
+++ /dev/null
@@ -1,151 +0,0 @@
-ReadType: InReverseOrder
-2024-06-11 02:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-11 00:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-10 22:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-10 20:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-10 18:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-10 16:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-10 14:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-10 12:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-10 10:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-10 08:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-10 06:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-10 04:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-10 02:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-10 02:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-10 00:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-10 00:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 22:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 22:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 20:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 20:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 18:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 18:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 16:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 16:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 14:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 14:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 12:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 12:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 10:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 10:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 08:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 08:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 06:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 06:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 04:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 04:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 02:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 02:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 02:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 00:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 00:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-09 00:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 22:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 22:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 22:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 20:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 20:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 20:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 18:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 18:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 18:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 16:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 16:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 16:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 14:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 14:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 14:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 12:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 12:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 12:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 10:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 10:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 10:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 08:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 08:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 08:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 06:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 06:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 06:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 04:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 04:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 04:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 02:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 02:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 02:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 00:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 00:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-08 00:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 22:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 22:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 22:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 20:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 20:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 20:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 18:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 18:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 18:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 16:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 16:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 16:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 14:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 14:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 14:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 12:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 12:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 12:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 10:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 10:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 10:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 08:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 08:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 08:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 06:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 06:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 06:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 04:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 04:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 04:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 02:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 02:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 02:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 00:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 00:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-07 00:00:01	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 22:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 22:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 20:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 20:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 18:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 18:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 16:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 16:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 14:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 14:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 12:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 12:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 10:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 10:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 08:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 08:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 06:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 06:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 04:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 04:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 02:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 02:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 00:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-06 00:00:02	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-05 22:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-05 20:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-05 18:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-05 16:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-05 14:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-05 12:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-05 10:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-05 08:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-05 06:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-05 04:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-05 02:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
-2024-06-05 00:00:03	asan	02221_parallel_replicas_bug	FAIL	fail
diff --git a/tests/queries/0_stateless/03231_pr_reverse_in_order.sql b/tests/queries/0_stateless/03231_pr_reverse_in_order.sql
deleted file mode 100644
index f5a4db44831..00000000000
--- a/tests/queries/0_stateless/03231_pr_reverse_in_order.sql
+++ /dev/null
@@ -1,49 +0,0 @@
-DROP TABLE IF EXISTS checks SYNC;
-
-CREATE TABLE checks
-(
-    `check_name` LowCardinality(String),
-    `check_status` LowCardinality(String),
-    `check_start_time` DateTime,
-    `test_name` LowCardinality(String),
-    `test_status` LowCardinality(String),
-)
-ENGINE = ReplicatedMergeTree('/clickhouse/{database}/checks', '{replica}')
-ORDER BY check_start_time;
-
-SYSTEM STOP MERGES checks;
-
-INSERT INTO checks SELECT 'asan', if(number % 2, 'success', 'fail'), toDateTime('2024-06-07 00:00:01') + INTERVAL number HOUR, '02221_parallel_replicas_bug', 'FAIL' from numbers(100);
-INSERT INTO checks SELECT 'asan', if(number % 2, 'success', 'fail'), toDateTime('2024-06-06 00:00:02') + INTERVAL number HOUR, '02221_parallel_replicas_bug', 'FAIL' from numbers(100);
-INSERT INTO checks SELECT 'asan', if(number % 2, 'success', 'fail'), toDateTime('2024-06-05 00:00:03') + INTERVAL number HOUR, '02221_parallel_replicas_bug', 'FAIL' from numbers(100);
-
-SELECT trimBoth(explain)
-FROM
-(
-    EXPLAIN actions=1 SELECT
-        check_start_time,
-        check_name,
-        test_name,
-        test_status,
-        check_status
-    FROM checks
-    WHERE 1 AND (test_status != 'SKIPPED') AND (test_status != 'OK') AND (check_status != 'success') AND (test_name ILIKE '%parallel_replicas%')
-    ORDER BY
-        check_start_time DESC,
-        check_name ASC,
-        test_name ASC
-    SETTINGS query_plan_read_in_order = 1, optimize_read_in_order = 1, max_parallel_replicas = 1
-)
-WHERE explain LIKE '%InReverseOrder%';
-
-SELECT check_start_time, check_name, test_name, test_status, check_status
-FROM checks
-WHERE 1
-    AND test_status != 'SKIPPED'
-    AND test_status != 'OK'
-    AND check_status != 'success'
-    AND test_name ilike '%parallel_replicas%'
-ORDER BY check_start_time desc, check_name, test_name
-SETTINGS query_plan_read_in_order = 1, optimize_read_in_order = 1, allow_experimental_parallel_reading_from_replicas = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', max_parallel_replicas = 3;
-
-DROP TABLE checks SYNC;
diff --git a/tests/queries/0_stateless/03231_test_incorrect_datetime_msan.reference b/tests/queries/0_stateless/03231_test_incorrect_datetime_msan.reference
deleted file mode 100644
index 346e6731867..00000000000
--- a/tests/queries/0_stateless/03231_test_incorrect_datetime_msan.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-0
-OK
-OK
diff --git a/tests/queries/0_stateless/03231_test_incorrect_datetime_msan.sh b/tests/queries/0_stateless/03231_test_incorrect_datetime_msan.sh
deleted file mode 100755
index c54c69dce58..00000000000
--- a/tests/queries/0_stateless/03231_test_incorrect_datetime_msan.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-${CLICKHOUSE_CLIENT} --query "
-CREATE TABLE tab
-(
-    a DateTime,
-    pk String
-) Engine = MergeTree() ORDER BY pk;
-"
-
-${CLICKHOUSE_CLIENT} --query "SELECT count(*) FROM tab WHERE a = '2024-08-06 09:58:09'"
-
-${CLICKHOUSE_CLIENT} --query "SELECT count(*) FROM tab WHERE a = '2024-08-06 09:58:0'" 2>&1 | grep -F -q "Cannot parse time component of DateTime 09:58:0" && echo "OK" || echo "FAIL";
-
-${CLICKHOUSE_CLIENT} --query "SELECT count(*) FROM tab WHERE a = '2024-08-0 09:58:09'" 2>&1 | grep -F -q "Cannot convert string '2024-08-0 09:58:09" && echo "OK" || echo "FAIL";
diff --git a/tests/queries/0_stateless/03231_values_respect_format_settings_in_fields_conversion.reference b/tests/queries/0_stateless/03231_values_respect_format_settings_in_fields_conversion.reference
deleted file mode 100644
index 8dbf92d6590..00000000000
--- a/tests/queries/0_stateless/03231_values_respect_format_settings_in_fields_conversion.reference
+++ /dev/null
@@ -1 +0,0 @@
-{'Hello':'2020-01-01 00:00:00'}
diff --git a/tests/queries/0_stateless/03231_values_respect_format_settings_in_fields_conversion.sql b/tests/queries/0_stateless/03231_values_respect_format_settings_in_fields_conversion.sql
deleted file mode 100644
index 484a16bb22f..00000000000
--- a/tests/queries/0_stateless/03231_values_respect_format_settings_in_fields_conversion.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-drop table if exists test;
-create table test (map Map(String, DateTime)) engine=Memory;
-set date_time_input_format='best_effort';
-insert into test values (map('Hello', '01/01/2020'));
-select * from test;
-drop table test;
-
diff --git a/tests/queries/0_stateless/03232_file_path_normalizing.reference b/tests/queries/0_stateless/03232_file_path_normalizing.reference
deleted file mode 100644
index 953db2c5dfe..00000000000
--- a/tests/queries/0_stateless/03232_file_path_normalizing.reference
+++ /dev/null
@@ -1 +0,0 @@
-data_hive/partitioning/column0=Elizabeth/sample.parquet
diff --git a/tests/queries/0_stateless/03232_file_path_normalizing.sh b/tests/queries/0_stateless/03232_file_path_normalizing.sh
deleted file mode 100755
index e7a7a65be51..00000000000
--- a/tests/queries/0_stateless/03232_file_path_normalizing.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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 substring(_path, position(_path, 'data_hive')) FROM file('$CURDIR/data_hive/partitioning/column0=*/sample.parquet') LIMIT 1;"
diff --git a/tests/queries/0_stateless/03232_pr_not_ready_set.sql b/tests/queries/0_stateless/03232_pr_not_ready_set.sql
index 3b2d5d28cfb..1a724085903 100644
--- a/tests/queries/0_stateless/03232_pr_not_ready_set.sql
+++ b/tests/queries/0_stateless/03232_pr_not_ready_set.sql
@@ -1,4 +1,3 @@
-SYSTEM FLUSH LOGS;
 SELECT
     is_initial_query,
     count() AS c,
diff --git a/tests/queries/0_stateless/03233_async_insert_infile_format.reference b/tests/queries/0_stateless/03233_async_insert_infile_format.reference
deleted file mode 100644
index ae99738bcc5..00000000000
--- a/tests/queries/0_stateless/03233_async_insert_infile_format.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-1	ClickHouse
-2	HelloWorld
-OK
diff --git a/tests/queries/0_stateless/03233_async_insert_infile_format.sh b/tests/queries/0_stateless/03233_async_insert_infile_format.sh
deleted file mode 100755
index 2c167b42d51..00000000000
--- a/tests/queries/0_stateless/03233_async_insert_infile_format.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-function cleanup()
-{
-    [ -e "${CLICKHOUSE_TMP}"/test_infile.csv ] && rm "${CLICKHOUSE_TMP}"/test_infile.csv
-}
-
-trap cleanup EXIT
-
-cleanup
-
-echo -e "id,\"word\"\n1,\"ClickHouse\"\n2,\"HelloWorld\"" > "${CLICKHOUSE_TMP}"/test_infile.csv
-
-${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS async_insert_infile_data;"
-${CLICKHOUSE_CLIENT} --query "CREATE TABLE async_insert_infile_data (id UInt32, word String) ENGINE=Memory();"
-${CLICKHOUSE_CLIENT} --query "INSERT INTO async_insert_infile_data FROM INFILE '${CLICKHOUSE_TMP}/test_infile.csv' SETTINGS async_insert=1;"
-${CLICKHOUSE_CLIENT} --query "SELECT * FROM async_insert_infile_data ORDER BY id;"
-
-${CLICKHOUSE_CLIENT} --query "INSERT INTO async_insert_infile_data FROM INFILE '${CLICKHOUSE_TMP}/test_infile.csv' SETTINGS async_insert=1 FORMAT NotExists;" 2>&1 | grep -q "UNKNOWN_FORMAT" && echo OK || echo FAIL
-
-${CLICKHOUSE_CLIENT} --query "DROP TABLE async_insert_infile_data SYNC;"
diff --git a/tests/queries/0_stateless/03235_groupArray_string_consistency.sql b/tests/queries/0_stateless/03235_groupArray_string_consistency.sql
deleted file mode 100644
index 618ec6f839b..00000000000
--- a/tests/queries/0_stateless/03235_groupArray_string_consistency.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-CREATE TABLE t (st FixedString(54)) ENGINE=MergeTree ORDER BY ();
-
-INSERT INTO t VALUES 
-('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRTUVWXYZ'),
-('\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0'),
-('IIIIIIIIII\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0');
-
-WITH (SELECT groupConcat(',')(st) FROM t) AS a,
-     (SELECT groupConcat(',')(st :: String) FROM t) AS b
-SELECT equals(a, b);
diff --git a/tests/queries/0_stateless/backups/mt_250_parts.zip b/tests/queries/0_stateless/backups/mt_250_parts.zip
deleted file mode 100644
index 15310b79054..00000000000
Binary files a/tests/queries/0_stateless/backups/mt_250_parts.zip and /dev/null differ
diff --git a/tests/queries/0_stateless/data_hive/partitioning/a=b/a=b/sample.parquet b/tests/queries/0_stateless/data_hive/partitioning/a=b/a=b/sample.parquet
deleted file mode 100644
index 9b6a78cf8cc..00000000000
Binary files a/tests/queries/0_stateless/data_hive/partitioning/a=b/a=b/sample.parquet and /dev/null differ
diff --git a/tests/queries/0_stateless/data_hive/partitioning/array=[1,2,3]/float=42.42/sample.parquet b/tests/queries/0_stateless/data_hive/partitioning/array=[1,2,3]/float=42.42/sample.parquet
deleted file mode 100644
index 9b6a78cf8cc..00000000000
Binary files a/tests/queries/0_stateless/data_hive/partitioning/array=[1,2,3]/float=42.42/sample.parquet and /dev/null differ
diff --git a/tests/queries/0_stateless/data_hive/partitioning/column0=Elizabeth/column0=Elizabeth1/sample.parquet b/tests/queries/0_stateless/data_hive/partitioning/column0=Elizabeth/column0=Elizabeth1/sample.parquet
deleted file mode 100644
index 9b6a78cf8cc..00000000000
Binary files a/tests/queries/0_stateless/data_hive/partitioning/column0=Elizabeth/column0=Elizabeth1/sample.parquet and /dev/null differ
diff --git a/tests/queries/0_stateless/data_hive/partitioning/column0=Elizabeth/column1=Gordon/sample.parquet b/tests/queries/0_stateless/data_hive/partitioning/column0=Elizabeth/column1=Gordon/sample.parquet
deleted file mode 100644
index 9b6a78cf8cc..00000000000
Binary files a/tests/queries/0_stateless/data_hive/partitioning/column0=Elizabeth/column1=Gordon/sample.parquet and /dev/null differ
diff --git a/tests/queries/0_stateless/data_hive/partitioning/column0=Elizabeth/column1=Schmidt/sample.parquet b/tests/queries/0_stateless/data_hive/partitioning/column0=Elizabeth/column1=Schmidt/sample.parquet
deleted file mode 100644
index 9b6a78cf8cc..00000000000
Binary files a/tests/queries/0_stateless/data_hive/partitioning/column0=Elizabeth/column1=Schmidt/sample.parquet and /dev/null differ
diff --git a/tests/queries/0_stateless/data_hive/partitioning/column0=Elizabeth/sample.parquet b/tests/queries/0_stateless/data_hive/partitioning/column0=Elizabeth/sample.parquet
deleted file mode 100644
index 9b6a78cf8cc..00000000000
Binary files a/tests/queries/0_stateless/data_hive/partitioning/column0=Elizabeth/sample.parquet and /dev/null differ
diff --git a/tests/queries/0_stateless/data_hive/partitioning/identifier=2070/email.csv b/tests/queries/0_stateless/data_hive/partitioning/identifier=2070/email.csv
deleted file mode 100644
index 936d995cc64..00000000000
--- a/tests/queries/0_stateless/data_hive/partitioning/identifier=2070/email.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-_login_email,_identifier,_first_name,_last_name
-laura@example.com,2070,Laura,Grey
-craig@example.com,4081,Craig,Johnson
-mary@example.com,9346,Mary,Jenkins
-jamie@example.com,5079,Jamie,Smith
diff --git a/tests/queries/0_stateless/data_hive/partitioning/non_existing_column=Elizabeth/sample.parquet b/tests/queries/0_stateless/data_hive/partitioning/non_existing_column=Elizabeth/sample.parquet
deleted file mode 100644
index 9b6a78cf8cc..00000000000
Binary files a/tests/queries/0_stateless/data_hive/partitioning/non_existing_column=Elizabeth/sample.parquet and /dev/null differ
diff --git a/tests/queries/0_stateless/data_hive/partitioning/number=42/date=2020-01-01/sample.parquet b/tests/queries/0_stateless/data_hive/partitioning/number=42/date=2020-01-01/sample.parquet
deleted file mode 100644
index 9b6a78cf8cc..00000000000
Binary files a/tests/queries/0_stateless/data_hive/partitioning/number=42/date=2020-01-01/sample.parquet and /dev/null differ
diff --git a/tests/queries/0_stateless/data_json/key_ignore_case.json b/tests/queries/0_stateless/data_json/key_ignore_case.json
new file mode 100644
index 00000000000..ad8f7cb4507
Binary files /dev/null and b/tests/queries/0_stateless/data_json/key_ignore_case.json differ
diff --git a/tests/queries/0_stateless/03023_invalid_format_detection.reference b/tests/queries/0_stateless/data_minio/::03215_archive.csv
similarity index 100%
rename from tests/queries/0_stateless/03023_invalid_format_detection.reference
rename to tests/queries/0_stateless/data_minio/::03215_archive.csv
diff --git a/tests/queries/0_stateless/data_minio/hive_partitioning/column0=Elizabeth/column1=Gordon/sample.parquet b/tests/queries/0_stateless/data_minio/hive_partitioning/column0=Elizabeth/column1=Gordon/sample.parquet
deleted file mode 100644
index 9b6a78cf8cc..00000000000
Binary files a/tests/queries/0_stateless/data_minio/hive_partitioning/column0=Elizabeth/column1=Gordon/sample.parquet and /dev/null differ
diff --git a/tests/queries/0_stateless/data_minio/hive_partitioning/column0=Elizabeth/column1=Schmidt/sample.parquet b/tests/queries/0_stateless/data_minio/hive_partitioning/column0=Elizabeth/column1=Schmidt/sample.parquet
deleted file mode 100644
index 9b6a78cf8cc..00000000000
Binary files a/tests/queries/0_stateless/data_minio/hive_partitioning/column0=Elizabeth/column1=Schmidt/sample.parquet and /dev/null differ
diff --git a/tests/queries/0_stateless/data_minio/hive_partitioning/column0=Elizabeth/sample.parquet b/tests/queries/0_stateless/data_minio/hive_partitioning/column0=Elizabeth/sample.parquet
deleted file mode 100644
index 9b6a78cf8cc..00000000000
Binary files a/tests/queries/0_stateless/data_minio/hive_partitioning/column0=Elizabeth/sample.parquet and /dev/null differ
diff --git a/tests/queries/0_stateless/data_minio/hive_partitioning/non_existing_column=Elizabeth/sample.parquet b/tests/queries/0_stateless/data_minio/hive_partitioning/non_existing_column=Elizabeth/sample.parquet
deleted file mode 100644
index 9b6a78cf8cc..00000000000
Binary files a/tests/queries/0_stateless/data_minio/hive_partitioning/non_existing_column=Elizabeth/sample.parquet and /dev/null differ
diff --git a/tests/queries/0_stateless/03221_s3_imds_decent_timeout.reference b/tests/queries/0_stateless/data_minio/test.zip::03215_archive.csv
similarity index 100%
rename from tests/queries/0_stateless/03221_s3_imds_decent_timeout.reference
rename to tests/queries/0_stateless/data_minio/test.zip::03215_archive.csv
diff --git a/tests/queries/0_stateless/03235_groupArray_string_consistency.reference b/tests/queries/0_stateless/data_minio/test::03215_archive.csv
similarity index 100%
rename from tests/queries/0_stateless/03235_groupArray_string_consistency.reference
rename to tests/queries/0_stateless/data_minio/test::03215_archive.csv
diff --git a/tests/queries/0_stateless/data_parquet/68131.parquet b/tests/queries/0_stateless/data_parquet/68131.parquet
deleted file mode 100644
index 169f6152003..00000000000
Binary files a/tests/queries/0_stateless/data_parquet/68131.parquet and /dev/null differ
diff --git a/tests/queries/0_stateless/helpers/install_predefined_backup.sh b/tests/queries/0_stateless/helpers/install_predefined_backup.sh
deleted file mode 100755
index 4445168bc33..00000000000
--- a/tests/queries/0_stateless/helpers/install_predefined_backup.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-# Copies a test predefined backup from "/tests/queries/0_stateless/backups/" folder to the "backups" disk,
-# returns the path to the backup relative to that disk.
-#
-# Usage:
-#     install_predefined_backup.sh <filename_in_backups_folder>
-
-HELPERS_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-
-src_backup_filename="$1"
-src_backup_path="$HELPERS_DIR/../backups/${src_backup_filename}"
-
-backups_disk_root=$($CLICKHOUSE_CLIENT --query "SELECT path FROM system.disks WHERE name='backups'")
-
-if [ -z "${backups_disk_root}" ]; then
-    echo "Disk 'backups' not found"
-    exit 1
-fi
-
-dest_relative_path=${CLICKHOUSE_DATABASE}/${src_backup_filename}
-dest_path=${backups_disk_root}/${dest_relative_path}
-
-mkdir -p "$(dirname "${dest_path}")"
-ln -s "${src_backup_path}" "${dest_path}"
-
-echo "${dest_relative_path}"
diff --git a/tests/queries/0_stateless/helpers/pure_http_client.py b/tests/queries/0_stateless/helpers/pure_http_client.py
index c3c4109ce5b..0e7a4d27f4f 100644
--- a/tests/queries/0_stateless/helpers/pure_http_client.py
+++ b/tests/queries/0_stateless/helpers/pure_http_client.py
@@ -1,8 +1,7 @@
 import os
 import io
+import sys
 import requests
-from requests.adapters import HTTPAdapter
-from requests.packages.urllib3.util.retry import Retry
 import time
 import pandas as pd
 
@@ -19,14 +18,9 @@ class ClickHouseClient:
         self.host = host
 
     def query(
-        self,
-        query,
-        connection_timeout=500,
-        settings=dict(),
-        binary_result=False,
-        with_retries=True,
+        self, query, connection_timeout=1500, settings=dict(), binary_result=False
     ):
-        NUMBER_OF_TRIES = 30 if with_retries else 1
+        NUMBER_OF_TRIES = 30
         DELAY = 10
 
         params = {
@@ -45,8 +39,7 @@ class ClickHouseClient:
             if r.status_code == 200:
                 return r.content if binary_result else r.text
             else:
-                if with_retries:
-                    print("ATTENTION: try #%d failed" % i)
+                print("ATTENTION: try #%d failed" % i)
                 if i != (NUMBER_OF_TRIES - 1):
                     print(query)
                     print(r.text)
@@ -54,12 +47,12 @@ class ClickHouseClient:
                 else:
                     raise ValueError(r.text)
 
-    def query_return_df(self, query, connection_timeout=500):
+    def query_return_df(self, query, connection_timeout=1500):
         data = self.query(query, connection_timeout)
         df = pd.read_csv(io.StringIO(data), sep="\t")
         return df
 
-    def query_with_data(self, query, data, connection_timeout=500, settings=dict()):
+    def query_with_data(self, query, data, connection_timeout=1500, settings=dict()):
         params = {
             "query": query,
             "timeout_before_checking_execution_speed": 120,
@@ -84,17 +77,3 @@ class ClickHouseClient:
             return result
         else:
             raise ValueError(r.text)
-
-
-def requests_session_with_retries(retries=3, timeout=180):
-    session = requests.Session()
-    retry = Retry(
-        total=retries,
-        read=retries,
-        connect=retries,
-    )
-    adapter = HTTPAdapter(max_retries=retry)
-    session.mount("http://", adapter)
-    session.mount("https://", adapter)
-    session.timeout = timeout
-    return session
diff --git a/tests/queries/0_stateless/replication.lib b/tests/queries/0_stateless/replication.lib
index 36309cf0331..05651531fba 100755
--- a/tests/queries/0_stateless/replication.lib
+++ b/tests/queries/0_stateless/replication.lib
@@ -89,7 +89,7 @@ function check_replication_consistency()
     # Touch all data to check that it's readable (and trigger PartCheckThread if needed)
     # it's important to disable prefer warmed unmerged parts because
     # otherwise it can read non-syncrhonized state of replicas
-    while ! $CLICKHOUSE_CLIENT --prefer_warmed_unmerged_parts_seconds=0 --max_result_rows 0 --max_result_bytes 0 --max_rows_to_read 0 --max_bytes_to_read 0 -q "SELECT * FROM merge(currentDatabase(), '$table_name_prefix') FORMAT Null" 2>/dev/null; do
+    while ! $CLICKHOUSE_CLIENT --prefer_warmed_unmerged_parts_seconds=0 -q "SELECT * FROM merge(currentDatabase(), '$table_name_prefix') FORMAT Null" 2>/dev/null; do
         sleep 1;
         num_tries=$((num_tries+1))
         if [ $num_tries -eq 250 ]; then
@@ -114,8 +114,7 @@ function check_replication_consistency()
 
     # it's important to disable prefer warmed unmerged parts because
     # otherwise it can read non-syncrhonized state of replicas
-    # also, disable the limit that is set for tests globally
-    res=$($CLICKHOUSE_CLIENT --prefer_warmed_unmerged_parts_seconds=0 --max_rows_to_read=0 -q \
+    res=$($CLICKHOUSE_CLIENT --prefer_warmed_unmerged_parts_seconds=0 -q \
     "SELECT
         if((countDistinct(data) as c) == 0, 1, c)
     FROM
diff --git a/tests/queries/1_stateful/00067_union_all.sql b/tests/queries/1_stateful/00067_union_all.sql
index 9ee14b36b03..2a1d00e975d 100644
--- a/tests/queries/1_stateful/00067_union_all.sql
+++ b/tests/queries/1_stateful/00067_union_all.sql
@@ -10,5 +10,4 @@ UNION ALL
 	ORDER BY id DESC
 	LIMIT 10
 )
-ORDER BY id, event
-SETTINGS max_rows_to_read = 40_000_000;
+ORDER BY id, event;
diff --git a/tests/queries/1_stateful/00081_group_by_without_key_and_totals.sql b/tests/queries/1_stateful/00081_group_by_without_key_and_totals.sql
index 1d10a2b9212..03e9e0feb40 100644
--- a/tests/queries/1_stateful/00081_group_by_without_key_and_totals.sql
+++ b/tests/queries/1_stateful/00081_group_by_without_key_and_totals.sql
@@ -1,4 +1,4 @@
-SET enable_analyzer = 1;
+SET allow_experimental_analyzer = 1;
 
 SELECT count() AS c FROM test.hits WHERE CounterID = 1704509 WITH TOTALS SETTINGS totals_mode = 'before_having',          max_rows_to_group_by = 100000, group_by_overflow_mode = 'any';
 SELECT count() AS c FROM test.hits WHERE CounterID = 1704509 WITH TOTALS SETTINGS totals_mode = 'after_having_inclusive', max_rows_to_group_by = 100000, group_by_overflow_mode = 'any';
@@ -14,3 +14,4 @@ SELECT TraficSourceID AS k, count() AS c FROM test.hits WHERE CounterID = 170450
 SELECT TraficSourceID AS k, count() AS c FROM test.hits WHERE CounterID = 1704509 GROUP BY k WITH TOTALS ORDER BY k SETTINGS totals_mode = 'after_having_inclusive', max_rows_to_group_by = 100000, group_by_overflow_mode = 'any';
 SELECT TraficSourceID AS k, count() AS c FROM test.hits WHERE CounterID = 1704509 GROUP BY k WITH TOTALS ORDER BY k SETTINGS totals_mode = 'after_having_exclusive', max_rows_to_group_by = 100000, group_by_overflow_mode = 'any';
 SELECT TraficSourceID AS k, count() AS c FROM test.hits WHERE CounterID = 1704509 GROUP BY k WITH TOTALS ORDER BY k SETTINGS totals_mode = 'after_having_auto',      max_rows_to_group_by = 100000, group_by_overflow_mode = 'any';
+
diff --git a/tests/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql b/tests/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql
index 8f18f3740e4..52f9c46997f 100644
--- a/tests/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql
+++ b/tests/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql
@@ -1,4 +1,4 @@
 -- Tags: shard
 
-SET output_format_write_statistics = 0, max_rows_to_read = 50_000_000;
+SET output_format_write_statistics = 0;
 SELECT EventDate, count() FROM remote('127.0.0.1', test.hits) WHERE UserID GLOBAL IN (SELECT UserID FROM test.hits) GROUP BY EventDate ORDER BY EventDate LIMIT 5 FORMAT JSONCompact;
diff --git a/tests/queries/1_stateful/00147_global_in_aggregate_function.sql b/tests/queries/1_stateful/00147_global_in_aggregate_function.sql
index f0b249e9af4..075c01530c6 100644
--- a/tests/queries/1_stateful/00147_global_in_aggregate_function.sql
+++ b/tests/queries/1_stateful/00147_global_in_aggregate_function.sql
@@ -1,5 +1,4 @@
 -- Tags: global
 
-SET max_rows_to_read = 100_000_000;
 SELECT sum(UserID GLOBAL IN (SELECT UserID FROM remote('127.0.0.{1,2}', test.hits))) FROM remote('127.0.0.{1,2}', test.hits);
 SELECT sum(UserID GLOBAL IN (SELECT UserID FROM test.hits)) FROM remote('127.0.0.{1,2}', test.hits);
diff --git a/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql b/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql
index 16b565985ea..6f910646fb7 100644
--- a/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql
+++ b/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql
@@ -1,5 +1,4 @@
 -- Tags: distributed
 
-SET max_rows_to_read = 100_000_000;
 SELECT sum(cityHash64(*)) FROM (SELECT CounterID, quantileTiming(0.5)(SendTiming), count() FROM remote('127.0.0.{1,2,3,4,5,6,7,8,9,10}', test.hits) WHERE SendTiming != -1 GROUP BY CounterID);
 SELECT sum(cityHash64(*)) FROM (SELECT CounterID, quantileTiming(0.5)(SendTiming), count() FROM remote('127.0.0.{1,2,3,4,5,6,7,8,9,10}', test.hits) WHERE SendTiming != -1 GROUP BY CounterID) SETTINGS optimize_aggregation_in_order = 1;
diff --git a/tests/queries/1_stateful/00157_cache_dictionary.sql b/tests/queries/1_stateful/00157_cache_dictionary.sql
index 49e15cd07d8..3621ff82126 100644
--- a/tests/queries/1_stateful/00157_cache_dictionary.sql
+++ b/tests/queries/1_stateful/00157_cache_dictionary.sql
@@ -9,8 +9,7 @@ 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
-SETTINGS min_insert_block_size_rows = 0, min_insert_block_size_bytes = 0, max_block_size = 8192, max_insert_threads = 1, max_threads = 1, max_parallel_replicas=1;
+INSERT INTO test.hits_1m SELECT * FROM test.hits LIMIT 1000000;
 
 CREATE DATABASE IF NOT EXISTS db_dict;
 DROP DICTIONARY IF EXISTS db_dict.cache_hits;
diff --git a/tests/queries/1_stateful/00158_cache_dictionary_has.sql b/tests/queries/1_stateful/00158_cache_dictionary_has.sql
index 631a7751550..32c109417de 100644
--- a/tests/queries/1_stateful/00158_cache_dictionary_has.sql
+++ b/tests/queries/1_stateful/00158_cache_dictionary_has.sql
@@ -10,8 +10,6 @@ SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'hits' PA
 LIFETIME(MIN 300 MAX 600)
 LAYOUT(CACHE(SIZE_IN_CELLS 100 QUERY_WAIT_TIMEOUT_MILLISECONDS 600000));
 
-SET timeout_before_checking_execution_speed = 300;
-
 SELECT sum(flag) FROM (SELECT dictHas('db_dict.cache_hits', toUInt64(WatchID)) as flag FROM test.hits PREWHERE WatchID % 1400 == 0 LIMIT 100);
 SELECT count() from test.hits PREWHERE WatchID % 1400 == 0;
 
@@ -22,4 +20,4 @@ SELECT sum(flag) FROM (SELECT dictHas('db_dict.cache_hits', toUInt64(WatchID)) a
 SELECT count() from test.hits PREWHERE WatchID % 5 == 0;
 
 DROP DICTIONARY IF EXISTS db_dict.cache_hits;
-DROP DATABASE IF EXISTS db_dict;
+DROP DATABASE IF  EXISTS db_dict;
diff --git a/tests/queries/1_stateful/00162_mmap_compression_none.sql b/tests/queries/1_stateful/00162_mmap_compression_none.sql
index 48d6ada821e..d2cbcea8aaa 100644
--- a/tests/queries/1_stateful/00162_mmap_compression_none.sql
+++ b/tests/queries/1_stateful/00162_mmap_compression_none.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS hits_none;
 CREATE TABLE hits_none (Title String CODEC(NONE)) ENGINE = MergeTree ORDER BY tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
-INSERT INTO hits_none SELECT Title FROM test.hits SETTINGS enable_filesystem_cache_on_write_operations=0, max_insert_threads=16;
+INSERT INTO hits_none SELECT Title FROM test.hits;
 
 SET min_bytes_to_use_mmap_io = 1;
 SELECT sum(length(Title)) FROM hits_none;
diff --git a/tests/queries/1_stateful/00167_read_bytes_from_fs.sql b/tests/queries/1_stateful/00167_read_bytes_from_fs.sql
index 184a8edcbcb..7b3f50f8141 100644
--- a/tests/queries/1_stateful/00167_read_bytes_from_fs.sql
+++ b/tests/queries/1_stateful/00167_read_bytes_from_fs.sql
@@ -1,6 +1,5 @@
 -- Tags: no-random-settings
 
-SET max_memory_usage = '10G';
 SELECT sum(cityHash64(*)) FROM test.hits SETTINGS max_threads=40;
 
 -- We had a bug which lead to additional compressed data read. test.hits compressed size is about 1.2Gb, but we read more then 3Gb.
diff --git a/tests/queries/1_stateful/00171_grouping_aggregated_transform_bug.sql b/tests/queries/1_stateful/00171_grouping_aggregated_transform_bug.sql
index b3e4d749328..7068780a1b1 100644
--- a/tests/queries/1_stateful/00171_grouping_aggregated_transform_bug.sql
+++ b/tests/queries/1_stateful/00171_grouping_aggregated_transform_bug.sql
@@ -1,5 +1,4 @@
 -- Tags: distributed
 
-SET max_rows_to_read = '100M';
 SELECT sum(cityHash64(*)) FROM (SELECT CounterID, quantileTiming(0.5)(SendTiming), count() FROM remote('127.0.0.{1,2,3,4,5,6,7,8,9,10}', test.hits) WHERE SendTiming != -1 GROUP BY CounterID) SETTINGS max_block_size = 63169;
 SELECT sum(cityHash64(*)) FROM (SELECT CounterID, quantileTiming(0.5)(SendTiming), count() FROM remote('127.0.0.{1,2,3,4,5,6,7,8,9,10}', test.hits) WHERE SendTiming != -1 GROUP BY CounterID) SETTINGS optimize_aggregation_in_order = 1, max_block_size = 63169;
diff --git a/tests/queries/1_stateful/00172_early_constant_folding.sql b/tests/queries/1_stateful/00172_early_constant_folding.sql
index 343e87a26d1..b4b58ba3cb0 100644
--- a/tests/queries/1_stateful/00172_early_constant_folding.sql
+++ b/tests/queries/1_stateful/00172_early_constant_folding.sql
@@ -2,5 +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 SETTINGS enable_analyzer = 0;
-EXPLAIN PIPELINE SELECT count(JavaEnable) FROM test.hits WHERE WatchID = 1 OR Title = 'next' OR URL = 'prev' OR URL = '???' OR 1 SETTINGS enable_analyzer = 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/00173_group_by_use_nulls.reference b/tests/queries/1_stateful/00173_group_by_use_nulls.reference
index 4f8d10a9221..e82b996ad3c 100644
--- a/tests/queries/1_stateful/00173_group_by_use_nulls.reference
+++ b/tests/queries/1_stateful/00173_group_by_use_nulls.reference
@@ -9,7 +9,7 @@
 33010362	1336
 800784	1336
 -- { echoOn }
-set enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 SELECT
     CounterID AS k,
     quantileBFloat16(0.5)(ResolutionWidth)
diff --git a/tests/queries/1_stateful/00173_group_by_use_nulls.sql b/tests/queries/1_stateful/00173_group_by_use_nulls.sql
index ed537bb289a..8531e9efaf8 100644
--- a/tests/queries/1_stateful/00173_group_by_use_nulls.sql
+++ b/tests/queries/1_stateful/00173_group_by_use_nulls.sql
@@ -21,7 +21,7 @@ LIMIT 10
 SETTINGS group_by_use_nulls = 1 FORMAT Null;
 
 -- { echoOn }
-set enable_analyzer = 1;
+set allow_experimental_analyzer = 1;
 
 SELECT
     CounterID AS k,
diff --git a/tests/queries/1_stateful/00177_memory_bound_merging.reference b/tests/queries/1_stateful/00177_memory_bound_merging.reference
index 4c7505d1123..5689152d60a 100644
--- a/tests/queries/1_stateful/00177_memory_bound_merging.reference
+++ b/tests/queries/1_stateful/00177_memory_bound_merging.reference
@@ -10,8 +10,6 @@ http://auto.ru/chatay-baranta_bound-in-thankYou=ru/tver/zhanny	2014-03-18	http:/
 http://auto.ru/chatay-baranta_bound-in-thankYou=ru/tver/zhanny	2014-03-19	http://auto.ru/chatay-baranta_bound-in-thankYou=ru/tver/zhanny
 http://auto.ru/chatay-baranta_bound-in-thankYou=ru/tver/zhanny	2014-03-20	http://auto.ru/chatay-baranta_bound-in-thankYou=ru/tver/zhanny
 1
+SortingAggregatedTransform
 MergingAggregatedBucketTransform
-FinishAggregatingInOrderTransform
-FinalizeAggregatedTransform
-AggregatingInOrderTransform
-MergeTreeSelect
+GroupingAggregatedTransform
diff --git a/tests/queries/1_stateful/00177_memory_bound_merging.sh b/tests/queries/1_stateful/00177_memory_bound_merging.sh
index 3744d89f354..d5cd1a05cd8 100755
--- a/tests/queries/1_stateful/00177_memory_bound_merging.sh
+++ b/tests/queries/1_stateful/00177_memory_bound_merging.sh
@@ -9,7 +9,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 check_replicas_read_in_order() {
     # NOTE: lack of "current_database = '$CLICKHOUSE_DATABASE'" filter is made on purpose
-    $CLICKHOUSE_CLIENT -q "
+    $CLICKHOUSE_CLIENT -nq "
         SYSTEM FLUSH LOGS;
 
         SELECT COUNT() > 0
@@ -22,7 +22,7 @@ check_replicas_read_in_order() {
 # at some point we had a bug in this logic (see https://github.com/ClickHouse/ClickHouse/pull/45892#issue-1566140414)
 test1() {
     query_id="query_id_memory_bound_merging_$RANDOM$RANDOM"
-    $CLICKHOUSE_CLIENT --query_id="$query_id" -q "
+    $CLICKHOUSE_CLIENT --query_id="$query_id" -nq "
         SET cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost';
 
         SELECT URL, EventDate, max(URL)
@@ -39,7 +39,7 @@ test1() {
 # at some point we had a bug in this logic (see https://github.com/ClickHouse/ClickHouse/pull/45892#issue-1566140414)
 test2() {
     query_id="query_id_memory_bound_merging_$RANDOM$RANDOM"
-    $CLICKHOUSE_CLIENT --query_id="$query_id" -q "
+    $CLICKHOUSE_CLIENT --query_id="$query_id" -nq "
         SET cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost';
 
         SELECT URL, EventDate, max(URL)
@@ -53,9 +53,9 @@ test2() {
 }
 
 test3() {
-    $CLICKHOUSE_CLIENT -q "
+    $CLICKHOUSE_CLIENT -nq "
         SET cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost';
-        SET max_threads = 16, read_in_order_two_level_merge_threshold = 1000, query_plan_aggregation_in_order = 1, distributed_aggregation_memory_efficient = 1;
+        SET max_threads = 16, prefer_localhost_replica = 1, read_in_order_two_level_merge_threshold = 1000, query_plan_aggregation_in_order = 1, distributed_aggregation_memory_efficient = 1;
 
         SELECT replaceRegexpOne(explain, '^ *(\w+).*', '\\1')
         FROM (
@@ -64,7 +64,7 @@ test3() {
             FROM test.hits
             WHERE CounterID = 1704509 AND UserID = 4322253409885123546
             GROUP BY URL, EventDate
-            SETTINGS optimize_aggregation_in_order = 1, enable_memory_bound_merging_of_aggregation_results = 1, allow_experimental_parallel_reading_from_replicas = 1, parallel_replicas_for_non_replicated_merge_tree = 1, max_parallel_replicas = 3, parallel_replicas_local_plan=1
+            SETTINGS optimize_aggregation_in_order = 1, enable_memory_bound_merging_of_aggregation_results = 1, allow_experimental_parallel_reading_from_replicas = 1, parallel_replicas_for_non_replicated_merge_tree = 1, max_parallel_replicas = 3
         )
         WHERE explain LIKE '%Aggr%Transform%' OR explain LIKE '%InOrder%'"
 }
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
index bf44f2d7ce7..2e1b807c496 100755
--- 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
@@ -17,13 +17,13 @@ $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 SETTINGS filesystem_cache_reserve_space_wait_lock_timeout_milliseconds=2000"
-$CLICKHOUSE_CLIENT -q "SELECT * FROM hits_s3_sampled WHERE URL LIKE '%google%' ORDER BY EventTime LIMIT 10 FORMAT Null SETTINGS filesystem_cache_reserve_space_wait_lock_timeout_milliseconds=2000"
+$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 SETTINGS filesystem_cache_reserve_space_wait_lock_timeout_milliseconds=2000"
+$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 -q "
+$CLICKHOUSE_CLIENT -nq "
   SYSTEM FLUSH LOGS;
 
   -- AsynchronousReaderIgnoredBytes = 0: no seek-avoiding happened
diff --git a/tests/queries/1_stateful/00182_simple_squashing_transform_bug.sql b/tests/queries/1_stateful/00182_simple_squashing_transform_bug.sql
index 26e112cff04..e73de4b33fb 100644
--- a/tests/queries/1_stateful/00182_simple_squashing_transform_bug.sql
+++ b/tests/queries/1_stateful/00182_simple_squashing_transform_bug.sql
@@ -1,7 +1,6 @@
 -- Tags: global
 
 set allow_prefetched_read_pool_for_remote_filesystem=0, merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability=0, max_threads=2, max_block_size=65387;
-set max_rows_to_read = '100M';
 
 SELECT sum(UserID GLOBAL IN (SELECT UserID FROM remote('127.0.0.{1,2}', test.hits))) FROM remote('127.0.0.{1,2}', test.hits);
 SELECT sum(UserID GLOBAL IN (SELECT UserID FROM test.hits)) FROM remote('127.0.0.{1,2}', test.hits);
diff --git a/tests/queries/shell_config.sh b/tests/queries/shell_config.sh
index 9e5bf75d335..ef2d89f0218 100644
--- a/tests/queries/shell_config.sh
+++ b/tests/queries/shell_config.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2120
 
+# Don't check for ODR violation, since we may test shared build with ASAN
+export ASAN_OPTIONS=detect_odr_violation=0
+
 # 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"
@@ -129,7 +132,7 @@ export CLICKHOUSE_URL_INTERSERVER=${CLICKHOUSE_URL_INTERSERVER:="${CLICKHOUSE_PO
 export CLICKHOUSE_CURL_COMMAND=${CLICKHOUSE_CURL_COMMAND:="curl"}
 # The queries in CI are prone to sudden delays, and we often don't check for curl
 # errors, so it makes sense to set a relatively generous timeout.
-export CLICKHOUSE_CURL_TIMEOUT=${CLICKHOUSE_CURL_TIMEOUT:="120"}
+export CLICKHOUSE_CURL_TIMEOUT=${CLICKHOUSE_CURL_TIMEOUT:="60"}
 export CLICKHOUSE_CURL=${CLICKHOUSE_CURL:="${CLICKHOUSE_CURL_COMMAND} -q -s --max-time ${CLICKHOUSE_CURL_TIMEOUT}"}
 export CLICKHOUSE_TMP=${CLICKHOUSE_TMP:="."}
 mkdir -p ${CLICKHOUSE_TMP}
diff --git a/tests/tsan_ignorelist.txt b/tests/tsan_ignorelist.txt
index 2a31fc9bc15..96bf6e4251f 100644
--- a/tests/tsan_ignorelist.txt
+++ b/tests/tsan_ignorelist.txt
@@ -5,9 +5,11 @@
 #
 # Caveats for generic entry "fun":
 # - does not work for __attribute__((__always_inline__))
-# - and may not work for functions that had been inlined
 # - requires asterisk at the beginning *and* end for static functions
 #
 [thread]
 # https://github.com/ClickHouse/ClickHouse/issues/55629
 fun:rd_kafka_broker_set_nodename
+# https://github.com/ClickHouse/ClickHouse/issues/60443
+fun:*rd_avg_calc*
+fun:*rd_avg_rollover*
diff --git a/tests/ubsan_ignorelist.txt b/tests/ubsan_ignorelist.txt
index b75819b3f4b..57d6598afa6 100644
--- a/tests/ubsan_ignorelist.txt
+++ b/tests/ubsan_ignorelist.txt
@@ -9,7 +9,6 @@
 #
 # Caveats for generic entry "fun":
 # - does not work for __attribute__((__always_inline__))
-# - and may not work for functions that had been inlined
 # - requires asterisk at the beginning *and* end for static functions
 #
 [undefined]
diff --git a/utils/check-style/aspell-ignore/en/aspell-dict.txt b/utils/check-style/aspell-ignore/en/aspell-dict.txt
index 3467f21c812..8e4e4fafe29 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 2983
+personal_ws-1.1 en 2942 
 AArch
 ACLs
 ALTERs
@@ -24,7 +24,6 @@ Aggregatefunction
 AggregatingMergeTree
 AggregatorThreads
 AggregatorThreadsActive
-AzureQueue
 Akka
 AlertManager
 Alexey
@@ -121,7 +120,6 @@ CMPLNT
 CMake
 CMakeLists
 CODECS
-CountMin
 COVID
 CPUFrequencyMHz
 CPUs
@@ -153,7 +151,6 @@ ChannelID
 Cidr
 Ciphertext
 CityHash
-CKibana
 Clangd
 ClickBench
 ClickCat
@@ -250,8 +247,6 @@ DoubleDelta
 Doxygen
 Durre
 ECMA
-ElasticSearch
-ETag
 Ecto
 EdgeAngle
 EdgeLengthKm
@@ -389,26 +384,12 @@ IntelliJ
 IntelliSense
 InterserverConnection
 InterserverThreads
-IntervalDay
-IntervalHour
-IntervalMicrosecond
-IntervalMillisecond
-IntervalMilliseconds
-IntervalMinute
-IntervalMonth
-IntervalNanosecond
-IntervalQuarter
-IntervalSecond
-IntervalWeek
-IntervalYear
 IsPentagon
 IsResClassIII
 IsValid
 JBOD
 JOINed
 JOINs
-JSONAllPaths
-JSONAllPathsWithTypes
 JSONArrayLength
 JSONAsObject
 JSONAsString
@@ -423,9 +404,6 @@ JSONCompactStrings
 JSONCompactStringsEachRow
 JSONCompactStringsEachRowWithNames
 JSONCompactStringsEachRowWithNamesAndTypes
-JSONDynamicPaths
-JSONDynamicPathsWithTypes
-JSONCompactWithProgress
 JSONEachRow
 JSONEachRowWithProgress
 JSONExtract
@@ -445,8 +423,6 @@ JSONObjectEachRow
 JSONStrings
 JSONStringsEachRow
 JSONStringsEachRowWithProgress
-JSONSharedDataPaths
-JSONSharedDataPathsWithTypes
 JSONType
 JSONs
 Jaeger
@@ -476,7 +452,6 @@ KeeperMap
 KeeperOutstandingRequests
 Kerberos
 Khanna
-Kibana
 KittenHouse
 Klickhouse
 Kolmogorov
@@ -586,7 +561,6 @@ MindsDB
 Mongodb
 Monotonicity
 MsgPack
-MultiLineString
 MultiPolygon
 Multiline
 Multiqueries
@@ -981,8 +955,6 @@ ThreadPoolRemoteFSReaderThreads
 ThreadPoolRemoteFSReaderThreadsActive
 ThreadsActive
 ThreadsInOvercommitTracker
-TimescaleDB's
-TimeSeries
 Timeunit
 TinyLog
 Tkachenko
@@ -1124,12 +1096,12 @@ addressToLineWithInlines
 addressToSymbol
 adviced
 agg
-aggThrow
 aggregatefunction
 aggregatingmergetree
 aggregatio
 aggretate
 aggthrow
+aggThrow
 aiochclient
 allocator
 alphaTokens
@@ -1216,7 +1188,6 @@ arraySum
 arrayUniq
 arrayWithConstant
 arrayZip
-arrayZipUnaligned
 ascii
 asin
 asinh
@@ -1374,7 +1345,6 @@ cipherList
 ciphertext
 cityHash
 cityhash
-ckibana
 ckman
 clangd
 cli
@@ -1573,11 +1543,6 @@ disjunctions
 displayName
 displaySecretsInShowAndSelect
 distro
-distinctdynamictypes
-distinctDynamicTypes
-distinctjsonpaths
-distinctJSONPaths
-distinctJSONPathsAndTypes
 divideDecimal
 dmesg
 doesnt
@@ -1622,7 +1587,6 @@ enum's
 enums
 erfc
 errorCodeToName
-etag
 evalMLMethod
 exFAT
 expiryMsec
@@ -1658,7 +1622,6 @@ filesystem
 filesystemAvailable
 filesystemCapacity
 filesystemFree
-filesystemUnreserved
 filesystems
 finalizeAggregation
 fips
@@ -1708,7 +1671,6 @@ fuzzQuery
 fuzzer
 fuzzers
 gRPC
-gaugehistogram
 gccMurmurHash
 gcem
 generateRandom
@@ -1735,8 +1697,6 @@ getOSKernelVersion
 getServerPort
 getSetting
 getSizeOfEnumType
-getSubcolumn
-getTypeSerializationStreams
 getblockinfo
 getevents
 ghcnd
@@ -1772,7 +1732,6 @@ groupBitmap
 groupBitmapAnd
 groupBitmapOr
 groupBitmapXor
-groupConcat
 groupUniqArray
 grouparray
 grouparrayinsertat
@@ -1789,7 +1748,6 @@ groupbitmapor
 groupbitmapxor
 groupbitor
 groupbitxor
-groupconcat
 groupuniqarray
 grpc
 grpcio
@@ -1907,10 +1865,8 @@ jdbc
 jemalloc
 jeprof
 joinGet
-joinGetOrNull
 json
 jsonMergePatch
-jsonasobject
 jsonasstring
 jsoncolumns
 jsoncolumnsmonoblock
@@ -1923,7 +1879,6 @@ jsoncompactstrings
 jsoncompactstringseachrow
 jsoncompactstringseachrowwithnames
 jsoncompactstringseachrowwithnamesandtypes
-jsoncompactwithprogress
 jsoneachrow
 jsoneachrowwithprogress
 jsonobjecteachrow
@@ -1953,8 +1908,8 @@ kurtSamp
 kurtosis
 kurtpop
 kurtsamp
-lagInFrame
 laion
+lagInFrame
 lang
 laravel
 largestTriangleThreeBuckets
@@ -2056,6 +2011,7 @@ maxMap
 maxintersections
 maxintersectionsposition
 maxmap
+minMappedArrays
 maxmind
 mdadm
 meanZTest
@@ -2126,7 +2082,6 @@ multiSearchFirstPositionUTF
 multibyte
 multidirectory
 multiline
-multilinestring
 multiplyDecimal
 multipolygon
 multisearchany
@@ -2150,14 +2105,11 @@ namenode
 namepassword
 nameprofile
 namequota
-namespace
 namespaces
 natively
 nats
-ness
 nestjs
 netloc
-newjson
 ngram
 ngramDistance
 ngramDistanceCaseInsensitive
@@ -2225,7 +2177,6 @@ outfile
 overcommit
 overcommitted
 overfitting
-overlayUTF
 overparallelization
 packetpool
 packetsize
@@ -2252,8 +2203,8 @@ parseReadableSizeOrZero
 parseTimeDelta
 parseable
 parsers
-partitionID
 partitionId
+partitionID
 pathFull
 pclmulqdq
 pcre
@@ -2326,7 +2277,6 @@ prettyspacemonoblock
 prettyspacenoescapes
 prettyspacenoescapesmonoblock
 prewhere
-printf
 privateKeyFile
 privateKeyPassphraseHandler
 prlimit
@@ -2408,7 +2358,6 @@ rankCorr
 rapidjson
 rawblob
 readWKTLineString
-readWKTMultiLineString
 readWKTMultiPolygon
 readWKTPoint
 readWKTPolygon
@@ -2482,7 +2431,6 @@ rewritable
 rightPad
 rightPadUTF
 rightUTF
-ripeMD
 risc
 riscv
 ro
@@ -2592,7 +2540,6 @@ sqlinsert
 sqlite
 sqrt
 src
-dest
 srcReplicas
 sshkey
 stackoverflow
@@ -2603,7 +2550,6 @@ startsWithUTF
 startswith
 statbox
 stateful
-stateset
 stddev
 stddevPop
 stddevPopStable
@@ -2735,9 +2681,6 @@ themself
 threadpool
 throwIf
 timeDiff
-timeSeriesData
-timeSeriesMetrics
-timeSeriesTags
 timeSlot
 timeSlots
 timeZone
@@ -2746,7 +2689,6 @@ timeZoneOffset
 timezones
 tinylog
 tmp
-toBool
 toColumnTypeName
 toDate
 toDateOrDefault
@@ -2770,17 +2712,6 @@ toISOWeek
 toISOYear
 toInt
 toInterval
-toIntervalDay
-toIntervalHour
-toIntervalMicrosecond
-toIntervalMillisecond
-toIntervalMinute
-toIntervalMonth
-toIntervalNanosecond
-toIntervalQuarter
-toIntervalSecond
-toIntervalWeek
-toIntervalYear
 toJSONString
 toLastDayOfMonth
 toLastDayOfWeek
diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index 46593e85e45..380656cd1ca 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -318,7 +318,6 @@ std_cerr_cout_excludes=(
     src/Interpreters/Context.cpp
     # IProcessor::dump()
     src/Processors/IProcessor.cpp
-    src/Client/ClientApplicationBase.cpp
     src/Client/ClientBase.cpp
     src/Client/LineReader.cpp
     src/Client/QueryFuzzer.cpp
@@ -467,7 +466,3 @@ 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."
-
-PATTERN="allow_";
-DIFF=$(comm -3 <(grep -o "\b$PATTERN\w*\b" $ROOT_PATH/src/Core/Settings.h | sort -u) <(grep -o -h "\b$PATTERN\w*\b" $ROOT_PATH/src/Databases/enableAllExperimentalSettings.cpp $ROOT_PATH/utils/check-style/experimental_settings_ignore.txt | sort -u));
-[ -n "$DIFF" ] && echo "$DIFF" && echo "^^ Detected 'allow_*' settings that might need to be included in src/Databases/enableAllExperimentalSettings.cpp" && echo "Alternatively, consider adding an exception to utils/check-style/experimental_settings_ignore.txt"
diff --git a/utils/check-style/experimental_settings_ignore.txt b/utils/check-style/experimental_settings_ignore.txt
deleted file mode 100644
index 3eda9821799..00000000000
--- a/utils/check-style/experimental_settings_ignore.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-allow_aggregate_partitions_independently
-allow_archive_path_syntax
-allow_asynchronous_read_from_io_pool_for_merge_tree
-allow_changing_replica_until_first_data_packet
-allow_custom_error_code_in_throwif
-allow_ddl
-allow_deprecated_database_ordinary
-allow_deprecated_snowflake_conversion_functions
-allow_distributed_ddl
-allow_drop_detached
-allow_execute_multiif_columnar
-allow_experimental_alter_materialized_view_structure
-allow_experimental_analyzer
-allow_experimental_annoy_index
-allow_experimental_database_atomic
-allow_experimental_database_materialized_mysql
-allow_experimental_database_materialized_postgresql
-allow_experimental_database_replicated
-allow_experimental_join_condition
-allow_experimental_kafka_offsets_storage_in_keeper
-allow_experimental_lightweight_delete
-allow_experimental_materialized_postgresql_table
-allow_experimental_parallel_reading_from_replicas
-allow_experimental_projection_optimization
-allow_experimental_query_cache
-allow_experimental_query_deduplication
-allow_experimental_refreshable_materialized_view
-allow_experimental_shared_merge_tree
-allow_experimental_statistic
-allow_experimental_statistics
-allow_experimental_time_series_table
-allow_experimental_undrop_table_query
-allow_experimental_usearch_index
-allow_experimental_join_right_table_sorting
-allow_get_client_http_header
-allow_introspection_functions
-allow_materialized_view_with_bad_select
-allow_named_collection_override_by_default
-allow_non_metadata_alters
-allow_nonconst_timezone_arguments
-allow_nondeterministic_mutations
-allow_nondeterministic_optimize_skip_unused_shards
-allow_prefetched_read_pool_for_local_filesystem
-allow_prefetched_read_pool_for_remote_filesystem
-allow_push_predicate_when_subquery_contains_with
-allow_settings_after_format_in_insert
-allow_statistic_optimize
-allow_statistics_optimize
-allow_unrestricted_reads_from_keeper
diff --git a/utils/corrector_utf8/CMakeLists.txt b/utils/corrector_utf8/CMakeLists.txt
index 17f047a8cff..4744dd5e0a5 100644
--- a/utils/corrector_utf8/CMakeLists.txt
+++ b/utils/corrector_utf8/CMakeLists.txt
@@ -1,2 +1,2 @@
 clickhouse_add_executable(corrector_utf8 corrector_utf8.cpp)
-target_link_libraries(corrector_utf8 PRIVATE clickhouse_common_io clickhouse_common_config)
+target_link_libraries(corrector_utf8 PRIVATE clickhouse_common_io)
diff --git a/tests/fuzz/runner.py b/utils/libfuzzer/runner.py
similarity index 75%
rename from tests/fuzz/runner.py
rename to utils/libfuzzer/runner.py
index 44259228f60..bbe648dbbc2 100644
--- a/tests/fuzz/runner.py
+++ b/utils/libfuzzer/runner.py
@@ -11,7 +11,7 @@ FUZZER_ARGS = os.getenv("FUZZER_ARGS", "")
 
 
 def run_fuzzer(fuzzer: str):
-    logging.info("Running fuzzer %s...", fuzzer)
+    logging.info(f"Running fuzzer {fuzzer}...")
 
     corpus_dir = f"{fuzzer}.in"
     with Path(corpus_dir) as path:
@@ -29,27 +29,28 @@ def run_fuzzer(fuzzer: str):
 
             if parser.has_section("asan"):
                 os.environ["ASAN_OPTIONS"] = (
-                    f"{os.environ['ASAN_OPTIONS']}:{':'.join(f'{key}={value}' for key, value in parser['asan'].items())}"
+                    f"{os.environ['ASAN_OPTIONS']}:{':'.join('%s=%s' % (key, value) for key, value in parser['asan'].items())}"
                 )
 
             if parser.has_section("msan"):
                 os.environ["MSAN_OPTIONS"] = (
-                    f"{os.environ['MSAN_OPTIONS']}:{':'.join(f'{key}={value}' for key, value in parser['msan'].items())}"
+                    f"{os.environ['MSAN_OPTIONS']}:{':'.join('%s=%s' % (key, value) for key, value in parser['msan'].items())}"
                 )
 
             if parser.has_section("ubsan"):
                 os.environ["UBSAN_OPTIONS"] = (
-                    f"{os.environ['UBSAN_OPTIONS']}:{':'.join(f'{key}={value}' for key, value in parser['ubsan'].items())}"
+                    f"{os.environ['UBSAN_OPTIONS']}:{':'.join('%s=%s' % (key, value) for key, value in parser['ubsan'].items())}"
                 )
 
             if parser.has_section("libfuzzer"):
                 custom_libfuzzer_options = " ".join(
-                    f"-{key}={value}" for key, value in parser["libfuzzer"].items()
+                    "-%s=%s" % (key, value)
+                    for key, value in parser["libfuzzer"].items()
                 )
 
             if parser.has_section("fuzzer_arguments"):
                 fuzzer_arguments = " ".join(
-                    (f"{key}") if value == "" else (f"{key}={value}")
+                    ("%s" % key) if value == "" else ("%s=%s" % (key, value))
                     for key, value in parser["fuzzer_arguments"].items()
                 )
 
@@ -64,7 +65,7 @@ def run_fuzzer(fuzzer: str):
 
     cmd_line += " < /dev/null"
 
-    logging.info("...will execute: %s", cmd_line)
+    logging.info(f"...will execute: {cmd_line}")
     subprocess.check_call(cmd_line, shell=True)
 
 
diff --git a/utils/list-versions/version_date.tsv b/utils/list-versions/version_date.tsv
index a621f5a7ddf..271065a78fb 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -1,39 +1,12 @@
-v24.8.4.13-lts	2024-09-06
-v24.8.3.59-lts	2024-09-03
-v24.8.2.3-lts	2024-08-22
-v24.8.1.2684-lts	2024-08-21
-v24.7.6.8-stable	2024-09-06
-v24.7.5.37-stable	2024-09-03
-v24.7.4.51-stable	2024-08-23
-v24.7.3.47-stable	2024-09-04
-v24.7.3.42-stable	2024-08-08
-v24.7.2.13-stable	2024-08-01
-v24.7.1.2915-stable	2024-07-30
-v24.6.6.6-stable	2024-09-06
-v24.6.5.30-stable	2024-09-03
-v24.6.4.42-stable	2024-08-23
-v24.6.3.95-stable	2024-08-06
-v24.6.3.38-stable	2024-09-04
 v24.6.2.17-stable	2024-07-05
 v24.6.1.4423-stable	2024-07-01
-v24.5.8.10-stable	2024-09-06
-v24.5.7.31-stable	2024-09-03
-v24.5.6.45-stable	2024-08-23
-v24.5.5.78-stable	2024-08-05
 v24.5.4.49-stable	2024-07-01
 v24.5.3.5-stable	2024-06-13
 v24.5.2.34-stable	2024-06-13
 v24.5.1.1763-stable	2024-06-01
-v24.4.4.113-stable	2024-08-02
 v24.4.3.25-stable	2024-06-14
 v24.4.2.141-stable	2024-06-07
 v24.4.1.2088-stable	2024-05-01
-v24.3.11.7-lts	2024-09-06
-v24.3.10.33-lts	2024-09-03
-v24.3.9.5-lts	2024-08-22
-v24.3.8.13-lts	2024-08-20
-v24.3.7.30-lts	2024-08-14
-v24.3.6.48-lts	2024-08-02
 v24.3.5.46-lts	2024-07-03
 v24.3.4.147-lts	2024-06-13
 v24.3.3.102-lts	2024-05-01
@@ -73,7 +46,6 @@ 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.16.40-lts	2024-08-02
 v23.8.15.35-lts	2024-06-14
 v23.8.14.6-lts	2024-05-02
 v23.8.13.25-lts	2024-04-26